docs(xwm): state that Boot takes a component-scoped logger
- commit
- 50a2e955498c9462f8ba6a4fc79ac5c291a60f2f
- author
- brice · · 2026-10-22 12:13 UTC
- committer
- brice · · 2026-10-22 17:54 UTC
- parent
- 01f9a3d
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
1 file · +2 -1
M internal/adapters/wayland/xwm/xwm.go +2 -1
| @@ -81,7 +81,7 @@ type XWM struct { | |||
| 81 | 81 | } | |
| 82 | 82 | ||
| 83 | 83 | func newXWM(conn *xturbo.Conn, log zerowrap.Logger) *XWM { | |
| 84 | - | x := &XWM{conn: conn, log: log.WithField("component", "xwm"), root: conn.Root(), tab: newTable(initialSlots)} | |
| 84 | + | x := &XWM{conn: conn, log: log, root: conn.Root(), tab: newTable(initialSlots)} | |
| 85 | 85 | x.h = xturbo.Handler{OnEvent: x.onEvent, OnReply: x.onReply, OnError: x.onError} | |
| 86 | 86 | x.fit() | |
| 87 | 87 | return x | |
| @@ -145,6 +145,7 @@ func (x *XWM) setProp32(win uint32, prop int, typ xproto.Atom, vals []uint32) { | |||
| 145 | 145 | // blocks (about 25 s at worst) and must not run on the display goroutine: the | |
| 146 | 146 | // handshake needs Xwayland, which needs the display goroutine to serve its | |
| 147 | 147 | // Wayland requests. It takes ownership of wmFD and closes it on failure. | |
| 148 | + | // log is scoped by the caller with logging.For(ctx, "xwm"). | |
| 148 | 149 | func Boot(wmFD int, log zerowrap.Logger) (*XWM, error) { | |
| 149 | 150 | conn, err := xturbo.NewConn(wmFD) | |
| 150 | 151 | if err != nil { | |
| @@ -81,7 +81,7 @@ type XWM struct { | |||||
| 81 | } | 81 | } | ||
| 82 | 82 | ||||
| 83 | func newXWM(conn *xturbo.Conn, log zerowrap.Logger) *XWM { | 83 | func newXWM(conn *xturbo.Conn, log zerowrap.Logger) *XWM { | ||
| 84 | - | x := &XWM{conn: conn, log: log.WithField("component", "xwm"), root: conn.Root(), tab: newTable(initialSlots)} | 84 | + | x := &XWM{conn: conn, log: log, root: conn.Root(), tab: newTable(initialSlots)} |
| 85 | x.h = xturbo.Handler{OnEvent: x.onEvent, OnReply: x.onReply, OnError: x.onError} | 85 | x.h = xturbo.Handler{OnEvent: x.onEvent, OnReply: x.onReply, OnError: x.onError} | ||
| 86 | x.fit() | 86 | x.fit() | ||
| 87 | return x | 87 | return x | ||
| @@ -145,6 +145,7 @@ func (x *XWM) setProp32(win uint32, prop int, typ xproto.Atom, vals []uint32) { | |||||
| 145 | // blocks (about 25 s at worst) and must not run on the display goroutine: the | 145 | // blocks (about 25 s at worst) and must not run on the display goroutine: the | ||
| 146 | // handshake needs Xwayland, which needs the display goroutine to serve its | 146 | // handshake needs Xwayland, which needs the display goroutine to serve its | ||
| 147 | // Wayland requests. It takes ownership of wmFD and closes it on failure. | 147 | // Wayland requests. It takes ownership of wmFD and closes it on failure. | ||
| 148 | + | // log is scoped by the caller with logging.For(ctx, "xwm"). | |||
| 148 | func Boot(wmFD int, log zerowrap.Logger) (*XWM, error) { | 149 | func Boot(wmFD int, log zerowrap.Logger) (*XWM, error) { | ||
| 149 | conn, err := xturbo.NewConn(wmFD) | 150 | conn, err := xturbo.NewConn(wmFD) | ||
| 150 | if err != nil { | 151 | if err != nil { | ||