wlr: retarget to wlroots 0.20.2

.github/wlroots-version

@@ -1 +1 @@
-0.17.4
+0.20.2

backend.go

@@ -17,8 +17,8 @@ type Backend struct {
 	p *C.struct_wlr_backend
 }
 
-func AutocreateBackend(display Display) Backend {
-	p := C.wlr_backend_autocreate(display.p, nil)
+func AutocreateBackend(loop EventLoop) Backend {
+	p := C.wlr_backend_autocreate(loop.p, nil)
 	return Backend{p: p}
 }
 

cursor.go

@@ -87,7 +87,7 @@ func (c Cursor) OnButton(cb func(p Pointer, time time.Time, button CursorButton,
 	})
 }
 
-func (c Cursor) OnAxis(cb func(p Pointer, time time.Time, source AxisSource, orientation AxisOrientation, delta float64, deltaDiscrete int32)) Listener {
+func (c Cursor) OnAxis(cb func(p Pointer, time time.Time, source AxisSource, orientation AxisOrientation, delta float64, deltaDiscrete int32, relativeDirection AxisRelativeDirection)) Listener {
 	return newListener(&c.p.events.axis, func(lis Listener, data unsafe.Pointer) {
 		event := (*C.struct_wlr_pointer_axis_event)(data)
 		dev := Pointer{p: event.pointer}
@@ -98,6 +98,7 @@ func (c Cursor) OnAxis(cb func(p Pointer, time time.Time, source AxisSource, ori
 			AxisOrientation(event.orientation),
 			float64(event.delta),
 			int32(event.delta_discrete),
+			AxisRelativeDirection(event.relative_direction),
 		)
 	})
 }

input.go

@@ -92,8 +92,12 @@ const (
 	InputDeviceTypeKeyboard   InputDeviceType = C.WLR_INPUT_DEVICE_KEYBOARD
 	InputDeviceTypePointer    InputDeviceType = C.WLR_INPUT_DEVICE_POINTER
 	InputDeviceTypeTouch      InputDeviceType = C.WLR_INPUT_DEVICE_TOUCH
-	InputDeviceTypeTabletTool InputDeviceType = C.WLR_INPUT_DEVICE_TABLET_TOOL
+	InputDeviceTypeTablet     InputDeviceType = C.WLR_INPUT_DEVICE_TABLET
 	InputDeviceTypeTabletPad  InputDeviceType = C.WLR_INPUT_DEVICE_TABLET_PAD
+	InputDeviceTypeSwitch     InputDeviceType = C.WLR_INPUT_DEVICE_SWITCH
+
+	// Deprecated: use InputDeviceTypeTablet.
+	InputDeviceTypeTabletTool = InputDeviceTypeTablet
 )
 
 type ButtonState uint32
@@ -106,25 +110,33 @@ const (
 type AxisSource uint32
 
 const (
-	AxisSourceWheel      AxisSource = C.WLR_AXIS_SOURCE_WHEEL
-	AxisSourceFinger     AxisSource = C.WLR_AXIS_SOURCE_FINGER
-	AxisSourceContinuous AxisSource = C.WLR_AXIS_SOURCE_CONTINUOUS
-	AxisSourceWheelTilt  AxisSource = C.WLR_AXIS_SOURCE_WHEEL_TILT
+	AxisSourceWheel      AxisSource = C.WL_POINTER_AXIS_SOURCE_WHEEL
+	AxisSourceFinger     AxisSource = C.WL_POINTER_AXIS_SOURCE_FINGER
+	AxisSourceContinuous AxisSource = C.WL_POINTER_AXIS_SOURCE_CONTINUOUS
+	AxisSourceWheelTilt  AxisSource = C.WL_POINTER_AXIS_SOURCE_WHEEL_TILT
 )
 
 type AxisOrientation uint32
 
 const (
-	AxisOrientationVertical   AxisOrientation = C.WLR_AXIS_ORIENTATION_VERTICAL
-	AxisOrientationHorizontal AxisOrientation = C.WLR_AXIS_ORIENTATION_HORIZONTAL
+	AxisOrientationVertical   AxisOrientation = C.WL_POINTER_AXIS_VERTICAL_SCROLL
+	AxisOrientationHorizontal AxisOrientation = C.WL_POINTER_AXIS_HORIZONTAL_SCROLL
+)
+
+type AxisRelativeDirection uint32
+
+const (
+	AxisRelativeDirectionIdentical AxisRelativeDirection = C.WL_POINTER_AXIS_RELATIVE_DIRECTION_IDENTICAL
+	AxisRelativeDirectionInverted  AxisRelativeDirection = C.WL_POINTER_AXIS_RELATIVE_DIRECTION_INVERTED
 )
 
 var inputDeviceNames = []string{
-	InputDeviceTypeKeyboard:   "keyboard",
-	InputDeviceTypePointer:    "pointer",
-	InputDeviceTypeTouch:      "touch",
-	InputDeviceTypeTabletTool: "tablet tool",
-	InputDeviceTypeTabletPad:  "tablet pad",
+	InputDeviceTypeKeyboard:  "keyboard",
+	InputDeviceTypePointer:   "pointer",
+	InputDeviceTypeTouch:     "touch",
+	InputDeviceTypeTablet:    "tablet",
+	InputDeviceTypeTabletPad: "tablet pad",
+	InputDeviceTypeSwitch:    "switch",
 }
 
 type InputDevice struct {
@@ -138,8 +150,6 @@ func (d InputDevice) OnDestroy(cb func(InputDevice)) Listener {
 }
 
 func (d InputDevice) Type() InputDeviceType { return InputDeviceType(d.p._type) }
-func (d InputDevice) Vendor() int           { return int(d.p.vendor) }
-func (d InputDevice) Product() int          { return int(d.p.product) }
 func (d InputDevice) Name() string          { return C.GoString(d.p.name) }
 
 func (d InputDevice) Keyboard() Keyboard {

output.go

@@ -1,10 +1,12 @@
 package wlr
 
 /*
+#include <stdlib.h>
 #include <wlr/backend/wayland.h>
 #include <wlr/backend/x11.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_layout.h>
+#include <wlr/util/transform.h>
 */
 import "C"
 
@@ -33,35 +35,30 @@ func (o Output) Scale() float32 {
 	return float32(o.p.scale)
 }
 
-func (o Output) SetScale(scale float32) {
-	C.wlr_output_set_scale(o.p, C.float(scale))
-}
-
 func (o Output) Transform() OutputTransform {
 	return OutputTransform(o.p.transform)
 }
 
-func (o Output) SetTransform(transform OutputTransform) {
-	C.wlr_output_set_transform(o.p, C.enum_wl_output_transform(transform))
-}
-
-func (o Output) TransformMatrix() *Matrix {
-	return matrixFromC(&o.p.transform_matrix)
-}
-
 func (o Output) OnFrame(cb func(Output)) Listener {
 	return newListener(&o.p.events.frame, func(lis Listener, data unsafe.Pointer) {
 		cb(o)
 	})
 }
 
-func (o Output) RenderSoftwareCursors(damage image.Rectangle) {
+func (o Output) OnRequestState(cb func(Output, OutputState)) Listener {
+	return newListener(&o.p.events.request_state, func(lis Listener, data unsafe.Pointer) {
+		event := (*C.struct_wlr_output_event_request_state)(data)
+		cb(o, OutputState{p: event.state})
+	})
+}
+
+func (o Output) AddSoftwareCursorsToRenderPass(pass RenderPass, damage image.Rectangle) {
 	var cd *C.pixman_region32_t
 	if damage != (image.Rectangle{}) {
 		t := rectToC(damage)
 		cd = &t
 	}
-	C.wlr_output_render_software_cursors(o.p, cd)
+	C.wlr_output_add_software_cursors_to_render_pass(o.p, pass.p, cd)
 }
 
 func (o Output) TransformedResolution() (int, int) {
@@ -76,33 +73,36 @@ func (o Output) EffectiveResolution() (int, int) {
 	return int(width), int(height)
 }
 
-func (o Output) InitRender(a Allocator, r Renderer) {
-	C.wlr_output_init_render(o.p, a.p, r.p)
+func (o Output) InitRender(a Allocator, r Renderer) bool {
+	return bool(C.wlr_output_init_render(o.p, a.p, r.p))
 }
 
-func (o Output) AttachRender() (int, error) {
-	var bufferAge C.int
-	if !C.wlr_output_attach_render(o.p, &bufferAge) {
-		return 0, errors.New("can't make output context current")
+func (o Output) BeginRenderPass(state OutputState) (RenderPass, error) {
+	pass := C.wlr_output_begin_render_pass(o.p, state.p, nil)
+	if pass == nil {
+		return RenderPass{}, errors.New("can't begin render pass")
 	}
+	return RenderPass{p: pass}, nil
+}
 
-	return int(bufferAge), nil
+func (o Output) CreateGlobal(display Display) {
+	C.wlr_output_create_global(o.p, display.p)
 }
 
-func (o Output) Rollback() {
-	C.wlr_output_rollback(o.p)
+func (o Output) DestroyGlobal() {
+	C.wlr_output_destroy_global(o.p)
 }
 
-func (o Output) CreateGlobal() {
-	C.wlr_output_create_global(o.p)
+func (o Output) TestState(state OutputState) bool {
+	return bool(C.wlr_output_test_state(o.p, state.p))
 }
 
-func (o Output) DestroyGlobal() {
-	C.wlr_output_destroy_global(o.p)
+func (o Output) CommitState(state OutputState) bool {
+	return bool(C.wlr_output_commit_state(o.p, state.p))
 }
 
-func (o Output) Commit() {
-	C.wlr_output_commit(o.p)
+func (o Output) ScheduleFrame() {
+	C.wlr_output_schedule_frame(o.p)
 }
 
 func (o Output) Modes() iter.Seq[OutputMode] {
@@ -117,14 +117,6 @@ func (o Output) Modes() iter.Seq[OutputMode] {
 	}
 }
 
-func (o Output) SetMode(mode OutputMode) {
-	C.wlr_output_set_mode(o.p, mode.p)
-}
-
-func (o Output) Enable(enable bool) {
-	C.wlr_output_enable(o.p, C.bool(enable))
-}
-
 func (o Output) SetTitle(title string) error {
 	if C.wlr_output_is_wl(o.p) {
 		C.wlr_wl_output_set_title(o.p, C.CString(title))
@@ -150,25 +142,70 @@ func (o Output) Height() int {
 	return int(o.p.height)
 }
 
+func (o Output) Enabled() bool {
+	return bool(o.p.enabled)
+}
+
+type OutputState struct {
+	p *C.struct_wlr_output_state
+}
+
+// NewOutputState allocates and initializes an output state on the Go heap.
+// Call Finish when done.
+func NewOutputState() OutputState {
+	state := OutputState{p: &C.struct_wlr_output_state{}}
+	C.wlr_output_state_init(state.p)
+	return state
+}
+
+func (s OutputState) Valid() bool {
+	return s.p != nil
+}
+
+func (s OutputState) Finish() {
+	if s.p == nil {
+		return
+	}
+	C.wlr_output_state_finish(s.p)
+}
+
+func (s OutputState) SetEnabled(enabled bool) {
+	C.wlr_output_state_set_enabled(s.p, C.bool(enabled))
+}
+
+func (s OutputState) SetMode(mode OutputMode) {
+	C.wlr_output_state_set_mode(s.p, mode.p)
+}
+
+func (s OutputState) SetScale(scale float32) {
+	C.wlr_output_state_set_scale(s.p, C.float(scale))
+}
+
+func (s OutputState) SetTransform(transform OutputTransform) {
+	C.wlr_output_state_set_transform(s.p, C.enum_wl_output_transform(transform))
+}
+
 type OutputLayout struct {
 	p *C.struct_wlr_output_layout
 }
 
-func CreateOutputLayout() OutputLayout {
-	p := C.wlr_output_layout_create()
+func CreateOutputLayout(display Display) OutputLayout {
+	p := C.wlr_output_layout_create(display.p)
 	return OutputLayout{p: p}
 }
 
 func (l OutputLayout) Destroy() {
 	C.wlr_output_layout_destroy(l.p)
 }
 
-func (l OutputLayout) AddAuto(output Output) {
-	C.wlr_output_layout_add_auto(l.p, output.p)
+func (l OutputLayout) AddAuto(output Output) OutputLayoutOutput {
+	p := C.wlr_output_layout_add_auto(l.p, output.p)
+	return OutputLayoutOutput{p: p}
 }
 
-func (l OutputLayout) Add(output Output, lx, ly int) {
-	C.wlr_output_layout_add(l.p, output.p, C.int(lx), C.int(ly))
+func (l OutputLayout) Add(output Output, lx, ly int) OutputLayoutOutput {
+	p := C.wlr_output_layout_add(l.p, output.p, C.int(lx), C.int(ly))
+	return OutputLayoutOutput{p: p}
 }
 
 func (l OutputLayout) OutputCoords(output Output) (x float64, y float64) {
@@ -191,6 +228,10 @@ type OutputLayoutOutput struct {
 	p *C.struct_wlr_output_layout_output
 }
 
+func (o OutputLayoutOutput) Valid() bool {
+	return o.p != nil
+}
+
 func (o OutputLayoutOutput) X() int {
 	return int(o.p.x)
 }

renderer.go

@@ -6,8 +6,6 @@ package wlr
 import "C"
 
 import (
-	"image"
-	"image/color"
 	"unsafe"
 )
 
@@ -37,32 +35,3 @@ func (r Renderer) InitWLDisplay(display Display) {
 func (r Renderer) InitWLSHM(display Display) {
 	C.wlr_renderer_init_wl_shm(r.p, display.p)
 }
-
-func (r Renderer) Begin(output Output, width int, height int) {
-	C.wlr_renderer_begin(r.p, C.uint(width), C.uint(height))
-}
-
-func (r Renderer) Clear(c color.Color) {
-	cc := colorToC(c)
-	C.wlr_renderer_clear(r.p, &cc[0])
-}
-
-func (r Renderer) End() {
-	C.wlr_renderer_end(r.p)
-}
-
-func (r Renderer) RenderTextureWithMatrix(texture Texture, matrix *Matrix, alpha float32) {
-	m := matrix.toC()
-	C.wlr_render_texture_with_matrix(r.p, texture.p, &m[0], C.float(alpha))
-}
-
-func (r *Renderer) RenderRect(box image.Rectangle, c color.Color, projection *Matrix) {
-	cc := colorToC(c)
-	pm := projection.toC()
-	C.wlr_render_rect(
-		r.p,
-		boxToC(box),
-		&cc[0],
-		&pm[0],
-	)
-}