Skip to content

kawa: switch to arrow func syntax proposed in golang/go#21498 #3

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.

Sign up for GitHub

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

Draft
DeedleFake wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

kawa: switch to arrow func syntax proposed in golang/go#21498 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,8 @@ func (server *Server) addKeyboard(dev wlr.InputDevice) {
wkb.SetKeymap(keymap)
wkb.SetRepeatInfo(25, 600)

kb.onModifiersListener = wkb.OnModifiers(func(k wlr.Keyboard) {
server.onKeyboardModifiers(&kb)
})
kb.onKeyListener = wkb.OnKey(func(k wlr.Keyboard, t time.Time, code uint32, update bool, state wlr.KeyState) {
server.onKeyboardKey(&kb, code, update, state, t)
})
kb.onModifiersListener = wkb.OnModifiers((k) => { server.onKeyboardModifiers(&kb) })
kb.onKeyListener = wkb.OnKey((k, t, code, update, state) => { server.onKeyboardKey(&kb, code, update, state, t) })

server.seat.SetKeyboard(dev)
server.keyboards = append(server.keyboards, &kb)
Expand Down
4 changes: 1 addition & 3 deletions output.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@ func (server *Server) onNewOutput(wout wlr.Output) {
out := Output{
Output: wout,
}
out.onFrameListener = wout.OnFrame(func(wout wlr.Output) {
server.onFrame(&out)
})
out.onFrameListener = wout.OnFrame((wout) => { server.onFrame(&out) })
server.addOutput(&out)

wout.Commit()
Expand Down
2 changes: 1 addition & 1 deletion render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (server *Server) renderSelectionBox(out *Output, r geom.Rect[float64], t ti
}

func (server *Server) renderViewSurfaces(out *Output, view *View, t time.Time) {
view.ForEachSurface(func(s wlr.Surface, x, y int) {
view.ForEachSurface((s, x, y) => {
p := geom.Pt(x, y)
server.renderSurface(out, s, geom.PConv[int](view.Coords).Add(p), t)
})
Expand Down
18 changes: 6 additions & 12 deletions server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,7 @@ func (server *Server) exec(to *geom.Rect[float64]) {

server.newViews[cmd.Process.Pid] = NewView{
To: to,
OnStarted: func(view *View) {
server.startBorderResizeFrom(view, wlr.EdgeNone, *to)
},
OnStarted: (view) => { server.startBorderResizeFrom(view, wlr.EdgeNone, *to) },
}
}

Expand Down Expand Up @@ -164,33 +162,29 @@ func (server *Server) onMainMenuNew() {
}

func (server *Server) onMainMenuResize() {
server.startSelectView(wlr.BtnRight, func(view *View) {
server.startResize(view)
})
server.startSelectView(wlr.BtnRight, server.startResize)
}

func (server *Server) onMainMenuTile() {
server.startSelectView(wlr.BtnRight, func(view *View) {
server.startSelectView(wlr.BtnRight, (view) => {
server.toggleViewTiling(view)
server.startNormal()
})
}

func (server *Server) onMainMenuMove() {
server.startSelectView(wlr.BtnRight, func(view *View) {
server.startMove(view)
})
server.startSelectView(wlr.BtnRight, server.startMove)
}

func (server *Server) onMainMenuClose() {
server.startSelectView(wlr.BtnRight, func(view *View) {
server.startSelectView(wlr.BtnRight, (view) => {
server.closeView(view)
server.startNormal()
})
}

func (server *Server) onMainMenuHide() {
server.startSelectView(wlr.BtnRight, func(view *View) {
server.startSelectView(wlr.BtnRight, (view) => {
server.hideView(view)
server.startNormal()
})
Expand Down
4 changes: 2 additions & 2 deletions surface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (s *viewSurfaceXDG) PID() int {
}

func (s *viewSurfaceXDG) HasSurface(surface wlr.Surface) (has bool) {
s.ForEachSurface(func(s wlr.Surface, x, y int) {
s.ForEachSurface((s, x, y) => {
if s == surface {
has = true
}
Expand Down Expand Up @@ -106,7 +106,7 @@ func (s *viewSurfaceXWayland) PID() int {
}

func (s *viewSurfaceXWayland) HasSurface(surface wlr.Surface) (has bool) {
s.ForEachSurface(func(s wlr.Surface, x, y int) {
s.ForEachSurface((s, x, y) => {
if s == surface {
has = true
}
Expand Down
74 changes: 21 additions & 53 deletions view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func (d *Decoration) Release() {

func (server *Server) viewBounds(out *Output, view *View) geom.Rect[int] {
var r geom.Rect[int]
view.ForEachSurface(func(s wlr.Surface, sx, sy int) {
view.ForEachSurface((s, sx, sy) => {
if server.isPopupSurface(s) {
return
}
Expand Down Expand Up @@ -198,29 +198,17 @@ func (server *Server) onNewXWaylandSurface(surface wlr.XWaylandSurface) {
ViewSurface: &viewSurfaceXWayland{s: surface},
Coords: geom.Pt[float64](-1, -1),
}
view.onDestroyListener = surface.OnDestroy(func(s wlr.XWaylandSurface) {
server.onDestroyView(&view)
})
view.onMapListener = surface.OnMap(func(s wlr.XWaylandSurface) {
server.onMapView(&view)
})
view.onRequestMoveListener = surface.OnRequestMove(func(s wlr.XWaylandSurface) {
server.startMove(&view)
})
view.onRequestResizeListener = surface.OnRequestResize(func(s wlr.XWaylandSurface, edges wlr.Edges) {
view.onDestroyListener = surface.OnDestroy((s) => { server.onDestroyView(&view) })
view.onMapListener = surface.OnMap((s) => { server.onMapView(&view) })
view.onRequestMoveListener = surface.OnRequestMove((s) => { server.startMove(&view) })
view.onRequestResizeListener = surface.OnRequestResize((s, edges) => {
if !server.isViewTiled(&view) {
server.startBorderResize(&view, edges)
}
})
view.onRequestMinimizeListener = surface.OnRequestMinimize(func(s wlr.XWaylandSurface) {
server.hideView(&view)
})
view.onRequestMaximizeListener = surface.OnRequestMaximize(func(s wlr.XWaylandSurface) {
server.toggleViewTiling(&view)
})
view.onSetTitleListener = surface.OnSetTitle(func(s wlr.XWaylandSurface, title string) {
server.updateTitles()
})
view.onRequestMinimizeListener = surface.OnRequestMinimize((s) => { server.hideView(&view) })
view.onRequestMaximizeListener = surface.OnRequestMaximize((s) => { server.toggleViewTiling(&view) })
view.onSetTitleListener = surface.OnSetTitle((s, title) => { server.updateTitles() })

server.addView(&view)
}
Expand All @@ -240,16 +228,14 @@ func (server *Server) addXDGPopup(surface wlr.XDGSurface) {
p := Popup{
Surface: surface,
}
p.onDestroyListener = surface.OnDestroy(func(s wlr.XDGSurface) {
server.onDestroyPopup(&p)
})
p.onDestroyListener = surface.OnDestroy((s) => { server.onDestroyPopup(&p) })

server.popups = append(server.popups, &p)
}

func (server *Server) isPopupSurface(surface wlr.Surface) (ok bool) {
for _, p := range server.popups {
p.Surface.ForEachSurface(func(s wlr.Surface, sx, sy int) {
p.Surface.ForEachSurface((s, sx, sy) => {
if s == surface {
ok = true
}
Expand All @@ -273,29 +259,17 @@ func (server *Server) addXDGTopLevel(surface wlr.XDGSurface) {
ViewSurface: &viewSurfaceXDG{s: surface},
Coords: geom.Pt[float64](-1, -1),
}
view.onDestroyListener = surface.OnDestroy(func(s wlr.XDGSurface) {
server.onDestroyView(&view)
})
view.onMapListener = surface.OnMap(func(s wlr.XDGSurface) {
server.onMapView(&view)
})
view.onRequestMoveListener = surface.TopLevel().OnRequestMove(func(t wlr.XDGTopLevel, client wlr.SeatClient, serial uint32) {
server.startMove(&view)
})
view.onRequestResizeListener = surface.TopLevel().OnRequestResize(func(t wlr.XDGTopLevel, client wlr.SeatClient, serial uint32, edges wlr.Edges) {
view.onDestroyListener = surface.OnDestroy((s) => { server.onDestroyView(&view) })
view.onMapListener = surface.OnMap((s) => { server.onMapView(&view) })
view.onRequestMoveListener = surface.TopLevel().OnRequestMove((t, client, serial) => { server.startMove(&view) })
view.onRequestResizeListener = surface.TopLevel().OnRequestResize((t, client, serial, edges) => {
if !server.isViewTiled(&view) {
server.startBorderResize(&view, edges)
}
})
view.onRequestMinimizeListener = surface.TopLevel().OnRequestMinimize(func(t wlr.XDGTopLevel) {
server.hideView(&view)
})
view.onRequestMaximizeListener = surface.TopLevel().OnRequestMaximize(func(t wlr.XDGTopLevel) {
server.toggleViewTiling(&view)
})
view.onSetTitleListener = surface.TopLevel().OnSetTitle(func(t wlr.XDGTopLevel, title string) {
server.updateTitles()
})
view.onRequestMinimizeListener = surface.TopLevel().OnRequestMinimize((t) => { server.hideView(&view) })
view.onRequestMaximizeListener = surface.TopLevel().OnRequestMaximize((t) => { server.toggleViewTiling(&view) })
view.onSetTitleListener = surface.TopLevel().OnSetTitle((t, title) => { server.updateTitles() })

server.addView(&view)
}
Expand Down Expand Up @@ -473,9 +447,7 @@ func (server *Server) hideView(view *View) {
view.SetMinimized(true)

item := NewTextMenuItem(server.renderer, view.Title())
item.OnSelect = func() {
server.unhideView(view)
}
item.OnSelect = () => { server.unhideView(view) }
server.mainMenu.Add(item)
}

Expand Down Expand Up @@ -560,12 +532,8 @@ func (server *Server) onNewDecoration(dm wlr.ServerDecorationManager, d wlr.Serv
deco := Decoration{
Decoration: d,
}
deco.onDestroyListener = d.OnDestroy(func(d wlr.ServerDecoration) {
server.onDestroyDecoration(&deco)
})
deco.onModeListener = d.OnMode(func(d wlr.ServerDecoration) {
server.updateCSDs()
})
deco.onDestroyListener = d.OnDestroy((d) => { server.onDestroyDecoration(&deco) })
deco.onModeListener = d.OnMode((d) => { server.updateCSDs() })

server.decorations = append(server.decorations, &deco)
server.updateCSDs()
Expand All @@ -588,7 +556,7 @@ func (server *Server) updateCSDs() {

func (server *Server) isCSDSurface(surface wlr.Surface) (ok bool) {
for _, d := range server.decorations {
d.Decoration.Surface().ForEachSurface(func(s wlr.Surface, sx, sy int) {
d.Decoration.Surface().ForEachSurface((s, sx, sy) => {
if s == surface {
ok = true
}
Expand Down