feat: remove wayland-scanner dependency by generating needed C code, improve listeners

Author: dy-tea

build.vsh

@@ -1,5 +1,6 @@
 #!/usr/bin/env -S v
 
+import os
 import term
 
 fn sh(cmd string) string {
@@ -51,7 +52,6 @@ if arguments().contains('clean') {
 }
 
 program_installed('pkg-config')
-program_installed('wayland-scanner')
 
 pkg_installed('wayland-protocols', '1.41')
 pkg_installed('wayland-client', none)
@@ -79,22 +79,17 @@ protocols := [
 
 sh('mkdir -p ${protocols_dir}')
 
+if !os.exists('${protocols_dir}/vscanner_wl_types.h') {
+	sh('cp ./protocols/vscanner_wl_types.h ${protocols_dir}/')
+}
+
 for protocol in protocols {
 	name := base(protocol).replace('.xml', '').replace('-', '_')
 	sh('${vscanner_dir}/vscanner ${protocol} ${protocols_dir}/${name}')
-
-	// Generate C protocol files for non-core protocols
-	if !protocol.contains('wayland.xml') {
-		// Use module name (with underscores) for C files to match vscanner output
-		header_file := '${protocols_dir}/${name}/${name}-client-protocol.h'
-		code_file := '${protocols_dir}/${name}/${name}-protocol.c'
-		sh('wayland-scanner client-header ${protocol} ${header_file}')
-		sh('wayland-scanner private-code ${protocol} ${code_file}')
-	}
 }
 
 if arguments().contains('install') {
-	sh('v -prod .')
+	sh('v -enable-globals -prod .')
 	user := sh('logname').trim_space()
 	sh('chown ${user}:${user} ./${exe_name}')
 	sh('chown -R ${user}:${user} ./${protocols_dir}')

color_management.v

@@ -2,52 +2,56 @@ module main
 
 import protocols.color_management_v1 as cm
 
-fn handle_cm_image_description_info_done(mut state State, proxy voidptr) {
-    state.n_cm_done++
+fn handle_cm_image_description_info_done(data voidptr, obj voidptr) {
+	mut state := unsafe { &State(data) }
+	state.n_cm_done++
 }
 
-fn handle_cm_image_description_info_tf_named(mut state State, info &cm.WpImageDescriptionInfoV1, tf u32) {
+fn handle_cm_image_description_info_tf_named(data voidptr, obj voidptr, tf u32) {
+	mut state := unsafe { &State(data) }
 	state.is_hdr = tf & u32(cm.WpColorManagerV1_TransferFunction.st2084_pq) != 0
 }
 
-const cm_image_description_info_listener = C.wp_image_description_info_v1_listener{
-	done:             handle_cm_image_description_info_done
-	icc_file:         fn (_ voidptr, _ voidptr, _ int, _ u32) {}
-	primaries:        fn (_ voidptr, _ voidptr, _ int, _ int, _ int, _ int, _ int, _ int, _ int, _ int) {}
-	primaries_named:  fn (_ voidptr, _ voidptr, _ u32) {}
-	tf_power:         fn (_ voidptr, _ voidptr, _ u32) {}
-	tf_named:         handle_cm_image_description_info_tf_named
-	luminances:       fn (_ voidptr, _ voidptr, _ u32, _ u32, _ u32) {}
-	target_primaries: fn (_ voidptr, _ voidptr, _ int, _ int, _ int, _ int, _ int, _ int, _ int, _ int) {}
-	target_luminance: fn (_ voidptr, _ voidptr, _ u32, _ u32) {}
-	target_max_cll:   fn (_ voidptr, _ voidptr, _ u32) {}
-	target_max_fall:  fn (_ voidptr, _ voidptr, _ u32) {}
-}
-
-fn handle_cm_image_description_ready(mut state State, description_proxy voidptr, identity u32) {
+const cm_image_description_info_listener = cm.wpimagedescriptioninfov1_listener(
+	handle_cm_image_description_info_done, // done
+	none, // icc_file
+	none, // primaries
+	none, // primaries_named
+	none, // tf_power
+	handle_cm_image_description_info_tf_named, // tf_named
+	none, // luminances
+	none, // target_primaries
+	none, // target_luminance
+	none, // target_max_cll
+	none // target_max_fall
+)
+
+fn handle_cm_image_description_ready(data voidptr, description_proxy voidptr, identity u32) {
+	mut state := unsafe { &State(data) }
 	mut desc := &cm.WpImageDescriptionV1{
 		proxy: description_proxy
 	}
 	mut info := desc.get_information()
 	info.add_listener(&cm_image_description_info_listener, state)
 }
 
-fn handle_cm_image_description_failed(mut state State, description &cm.WpImageDescriptionV1, cause u32, msg &char) {
+fn handle_cm_image_description_failed(data voidptr, description &cm.WpImageDescriptionV1, cause u32, msg &char) {
 	msg_str := unsafe { msg.vstring() }
 	eprintln('Image description failed: ${msg_str} (cause: ${cause})')
 }
 
-const cm_image_description_listener = C.wp_image_description_v1_listener{
-	failed: handle_cm_image_description_failed
-	ready:  handle_cm_image_description_ready
-	ready2: fn (_ voidptr, _ voidptr, _ u32, _ u32) {}
-}
+const cm_image_description_listener = cm.wpimagedescriptionv1_listener(
+	handle_cm_image_description_failed, // failed
+	handle_cm_image_description_ready, // ready
+	none // ready2
+)
 
-fn handle_cm_output_image_description_changed(mut state State, mut cm_output cm.WpColorManagementOutputV1) {
+fn handle_cm_output_image_description_changed(data voidptr, mut cm_output cm.WpColorManagementOutputV1) {
+	mut state := unsafe { &State(data) }
 	mut description := cm_output.get_image_description()
 	description.add_listener(&cm_image_description_listener, state)
 }
 
-const cm_output_listener = C.wp_color_management_output_v1_listener{
-	image_description_changed: handle_cm_output_image_description_changed
-}
+const cm_output_listener = cm.wpcolormanagementoutputv1_listener(
+	handle_cm_output_image_description_changed // image_description_changed
+)

copy_capture.v

@@ -4,28 +4,32 @@ import math
 import protocols.wayland as wlp
 import protocols.ext_image_copy_capture_v1 as cc
 
-fn frame_handle_transform(mut capture Capture, frame &cc.ExtImageCopyCaptureFrameV1, transform u32) {
+fn frame_handle_transform(data voidptr, obj voidptr, transform u32) {
+	mut capture := unsafe { &Capture(data) }
 	capture.transform = unsafe { wlp.WlOutput_Transform(transform) }
 }
 
-fn frame_handle_ready(mut capture Capture, frame &cc.ExtImageCopyCaptureFrameV1) {
+fn frame_handle_ready(data voidptr, obj voidptr) {
+	mut capture := unsafe { &Capture(data) }
 	capture.state.n_done++
 }
 
-fn frame_handle_failed(capture &Capture, frame &cc.ExtImageCopyCaptureFrameV1, reason u32) {
+fn frame_handle_failed(data voidptr, obj voidptr, reason u32) {
+	capture := unsafe { &Capture(data) }
 	name := if output := capture.output { output.name } else { 'unknown' }
 	panic('failed to copy output ${name}, reason: ${reason}')
 }
 
-const frame_listener = C.ext_image_copy_capture_frame_v1_listener{
-	transform:         frame_handle_transform
-	damage:            fn (_ voidptr, _ voidptr, _ int, _ int, _ int, _ int) {}
-	presentation_time: fn (_ voidptr, _ voidptr, _ u32, _ u32, _ u32) {}
-	ready:             frame_handle_ready
-	failed:            frame_handle_failed
-}
+const frame_listener = cc.extimagecopycaptureframev1_listener(
+	frame_handle_transform, // transform
+	none, // damage
+	none, // presentation_time
+	frame_handle_ready, // ready
+	frame_handle_failed // failed
+)
 
-fn session_handle_buffer_size(mut capture Capture, session &cc.ExtImageCopyCaptureSessionV1, width u32, height u32) {
+fn session_handle_buffer_size(data voidptr, obj voidptr, width u32, height u32) {
+	mut capture := unsafe { &Capture(data) }
 	capture.buffer_width = width
 	capture.buffer_height = height
 	if capture.output == none {
@@ -34,7 +38,8 @@ fn session_handle_buffer_size(mut capture Capture, session &cc.ExtImageCopyCaptu
 	}
 }
 
-fn session_handle_shm_format(mut capture Capture, session &cc.ExtImageCopyCaptureSessionV1, format u32) {
+fn session_handle_shm_format(data voidptr, obj voidptr, format u32) {
+	mut capture := unsafe { &Capture(data) }
 	fmt := unsafe { wlp.WlShm_Format(format) }
 	is_toplevel := capture.toplevel != none
 	if current_fmt := capture.shm_format {
@@ -50,7 +55,8 @@ fn session_handle_shm_format(mut capture Capture, session &cc.ExtImageCopyCaptur
 	capture.shm_format = fmt
 }
 
-fn session_handle_done(mut capture Capture, session &cc.ExtImageCopyCaptureSessionV1) {
+fn session_handle_done(data voidptr, obj voidptr) {
+	mut capture := unsafe { &Capture(data) }
 	if capture.ext_image_copy_capture_frame_v1 != none {
 		return
 	}
@@ -73,14 +79,14 @@ fn session_handle_done(mut capture Capture, session &cc.ExtImageCopyCaptureSessi
 	frame.capture()
 }
 
-const session_listener = C.ext_image_copy_capture_session_v1_listener{
-	buffer_size:   session_handle_buffer_size
-	shm_format:    session_handle_shm_format
-	dmabuf_device: fn (_ voidptr, _ voidptr, _ voidptr) {}
-	dmabuf_format: fn (_ voidptr, _ voidptr, _ u32, _ voidptr) {}
-	done:          session_handle_done
-	stopped:       fn (_ voidptr, _ voidptr) {}
-}
+const session_listener = cc.extimagecopycapturesessionv1_listener(
+	session_handle_buffer_size, // buffer_size
+	session_handle_shm_format, // shm_format
+	none, // dmabuf_device
+	none, // dmabuf_format
+	session_handle_done, // done
+	none // stopped
+)
 
 fn is_alpha_format(format wlp.WlShm_Format) bool {
 	alpha_formats := [wlp.WlShm_Format.argb8888, .abgr8888, .bgra8888, .rgba8888, .argb2101010, .abgr2101010]

foreign_toplevel.v

@@ -2,19 +2,21 @@ module main
 
 import protocols.ext_foreign_toplevel_list_v1 as ft
 
-fn foreign_toplevel_handle_identifier(mut toplevel &Toplevel, toplevel_handle voidptr, identifier &char) {
+fn foreign_toplevel_handle_identifier(data voidptr, obj voidptr, identifier &char) {
+	mut toplevel := unsafe { &Toplevel(data) }
 	toplevel.identifier = unsafe { identifier.vstring() }
 }
 
-const foreign_toplevel_listener = C.ext_foreign_toplevel_handle_v1_listener{
-	closed:     fn (_ voidptr, _ voidptr) {}
-	done:       fn (_ voidptr, _ voidptr) {}
-	title:      fn (_ voidptr, _ voidptr, _ &char) {}
-	app_id:     fn (_ voidptr, _ voidptr, _ &char) {}
-	identifier: foreign_toplevel_handle_identifier
-}
+const foreign_toplevel_listener = ft.extforeigntoplevelhandlev1_listener(
+	none, // closed
+	none, // done
+	none, // title
+	none, // app_id
+	foreign_toplevel_handle_identifier // identifier
+)
 
-fn foreign_toplevel_list_handle_toplevel(mut state &State, list voidptr, toplevel_handle voidptr) {
+fn foreign_toplevel_list_handle_toplevel(data voidptr, obj voidptr, toplevel_handle voidptr) {
+	mut state := unsafe { &State(data) }
 	mut handle := &ft.ExtForeignToplevelHandleV1{
 		proxy: toplevel_handle
 	}
@@ -25,7 +27,7 @@ fn foreign_toplevel_list_handle_toplevel(mut state &State, list voidptr, topleve
 	state.toplevels << toplevel
 }
 
-const foreign_toplevel_list_listener = C.ext_foreign_toplevel_list_v1_listener{
-	toplevel: foreign_toplevel_list_handle_toplevel
-	finished: fn (_ voidptr, _ voidptr) {}
-}
+const foreign_toplevel_list_listener = ft.extforeigntoplevellistv1_listener(
+	foreign_toplevel_list_handle_toplevel, // toplevel
+	none // finished
+)

overlay.v

@@ -1,12 +1,14 @@
 module main
 
 import wl
+import protocols.wayland as wlp
 import protocols.wlr_layer_shell_unstable_v1 as ls
 
 // needed for xdg_popup interface
 import protocols.xdg_shell as _
 
-fn layer_surface_v1_configure(mut overlay Overlay, _ voidptr, serial u32, _ u32, _ u32) {
+fn layer_surface_v1_configure(data voidptr, obj voidptr, serial u32, width u32, height u32) {
+	mut overlay := unsafe { &Overlay(data) }
 	if mut layer_surface := overlay.layer_surface_v1 {
 		layer_surface.ack_configure(serial)
 	}
@@ -15,21 +17,26 @@ fn layer_surface_v1_configure(mut overlay Overlay, _ voidptr, serial u32, _ u32,
 	}
 }
 
-fn layer_surface_v1_closed(mut overlay Overlay, _ voidptr) {
+fn layer_surface_v1_closed(data voidptr, obj voidptr) {
 	panic('Layer surface died unexpectedly')
 }
 
-const layer_surface_listener = C.zwlr_layer_surface_v1_listener{
-	configure: layer_surface_v1_configure
-	closed:    layer_surface_v1_closed
-}
+const layer_surface_listener = ls.zwlrlayersurfacev1_listener(
+	layer_surface_v1_configure, // configure
+	layer_surface_v1_closed // closed
+)
 
-const surface_listener = C.wl_surface_listener{
-	enter:                      fn (_ voidptr, _ voidptr, _ voidptr) {}
-	leave:                      fn (_ voidptr, _ voidptr, _ voidptr) {}
-	preferred_buffer_scale:     fn (_ voidptr, _ voidptr, _ int) {}
-	preferred_buffer_transform: fn (_ voidptr, _ voidptr, _ u32) {}
-}
+fn surface_enter(data voidptr, obj voidptr, output voidptr) {}
+fn surface_leave(data voidptr, obj voidptr, output voidptr) {}
+fn surface_preferred_buffer_scale(data voidptr, obj voidptr, factor int) {}
+fn surface_preferred_buffer_transform(data voidptr, obj voidptr, transform u32) {}
+
+const surface_listener = wlp.wlsurface_listener(
+	surface_enter, // enter
+	surface_leave, // leave
+	surface_preferred_buffer_scale, // preferred_buffer_scale
+	surface_preferred_buffer_transform // preferred_buffer_transform
+)
 
 fn Overlay.new(capture &Capture) &Overlay {
 	mut overlay := &Overlay{
@@ -61,7 +68,7 @@ fn Overlay.new(capture &Capture) &Overlay {
 		mut wlr_layer_shell := capture.state.wlr_layer_shell_v1 or { panic('No layer shell init') }
 
 		mut layer_surface := wlr_layer_shell.get_layer_surface(surface.proxy, output.wl_output.proxy,
-			u32(ls.ZwlrLayerShellV1_Layer.overlay), 'mrpenishot')
+			u32(ls.ZwlrLayerShellV1_Layer.overlay), 'mrpenishot'.str)
 		overlay.layer_surface_v1 = layer_surface
 		if layer_surface == unsafe { nil } {
 			panic('Failed to get layer surface')

registry.v

@@ -10,7 +10,8 @@ import protocols.ext_foreign_toplevel_list_v1 as ft
 import protocols.viewporter as vp
 import protocols.wlr_layer_shell_unstable_v1 as ls
 
-fn registry_handle_global(mut state State, registry voidptr, name u32, iface &char, version u32) {
+fn registry_handle_global(data voidptr, obj voidptr, name u32, iface &char, version u32) {
+	mut state := unsafe { &State(data) }
 	interface_name := unsafe { iface.vstring() }
 
 	match interface_name {
@@ -70,7 +71,7 @@ fn registry_handle_global(mut state State, registry voidptr, name u32, iface &ch
 	}
 }
 
-const registry_listener = C.wl_registry_listener{
-	global:        registry_handle_global
-	global_remove: fn (_ voidptr, _ voidptr, _ u32) {}
-}
+const registry_listener = wlp.wlregistry_listener(
+	registry_handle_global, // global
+	none // global_remove
+)