Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to upstream tinywl #23

Merged
merged 2 commits into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ new wlroots versions.

## Compiling

Go 1.8 or newer is required.
Go 1.21 or newer is required.

Make sure [wlroots](https://github.com/swaywm/wlroots) and its dependencies are
Make sure [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots) 0.17 and its dependencies are
installed.

Run ``make all`` to build everything. Binaries can be found in the 'build'
Expand All @@ -27,4 +27,4 @@ folder.
## License

The source code of this project is licensed under the [MIT license](LICENSE).
>
>
9 changes: 8 additions & 1 deletion cmd/tinywl/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package main
import (
"flag"
"fmt"
"log/slog"
"os"
"os/exec"
"runtime"
Expand All @@ -11,7 +12,9 @@ import (
)

var (
command = flag.String("s", "", "startup command")
command = flag.String("s", "", "startup command")
programLevel = new(slog.LevelVar) // Info by default

)

func fatal(msg string, err error) {
Expand All @@ -26,9 +29,13 @@ func init() {
}

func main() {
// set global logger with custom options
slog.SetDefault(slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: programLevel})))

flag.Parse()

// set up logging
// programLevel.Set(slog.LevelDebug)
wlroots.OnLog(wlroots.LogImportanceDebug, nil)

// start the server
Expand Down
Loading