From bc8ef1e14012a2793a5ad92f64987bf8b3eb135b Mon Sep 17 00:00:00 2001 From: Julian Orth Date: Thu, 18 Dec 2025 21:12:36 +0100 Subject: [PATCH] wire: regenerate files from wayland.xml --- wire/wl_buffer.txt | 8 +------- wire/wl_callback.txt | 4 +--- wire/wl_compositor.txt | 6 ++---- wire/wl_data_device.txt | 15 ++++---------- wire/wl_data_device_manager.txt | 6 ++---- wire/wl_data_offer.txt | 14 +++++-------- wire/wl_data_source.txt | 16 ++++----------- wire/wl_display.txt | 8 ++------ wire/wl_fixes.txt | 3 +-- wire/wl_keyboard.txt | 11 +++------- wire/wl_output.txt | 36 ++++++++++++++------------------- wire/wl_pointer.txt | 12 +++-------- wire/wl_region.txt | 5 +---- wire/wl_registry.txt | 4 ---- wire/wl_seat.txt | 22 +++++++++----------- wire/wl_shm.txt | 12 ++++------- wire/wl_shm_pool.txt | 7 ++----- wire/wl_subcompositor.txt | 7 ++----- wire/wl_subsurface.txt | 11 +++++----- wire/wl_surface.txt | 24 +++++++++------------- wire/wl_touch.txt | 11 ++-------- 21 files changed, 79 insertions(+), 163 deletions(-) diff --git a/wire/wl_buffer.txt b/wire/wl_buffer.txt index 690f113e..7ff40042 100644 --- a/wire/wl_buffer.txt +++ b/wire/wl_buffer.txt @@ -1,11 +1,5 @@ -# requests - -request destroy { - +request destroy (destructor) { } -# events - event release { - } diff --git a/wire/wl_callback.txt b/wire/wl_callback.txt index 32f6083a..1f91918e 100644 --- a/wire/wl_callback.txt +++ b/wire/wl_callback.txt @@ -1,5 +1,3 @@ -# events - -event done { +event done (destructor) { callback_data: u32, } diff --git a/wire/wl_compositor.txt b/wire/wl_compositor.txt index c4914638..2a721567 100644 --- a/wire/wl_compositor.txt +++ b/wire/wl_compositor.txt @@ -1,9 +1,7 @@ -# requests - request create_surface { - id: id(wl_surface), + id: id(wl_surface) (new), } request create_region { - id: id(wl_region), + id: id(wl_region) (new), } diff --git a/wire/wl_data_device.txt b/wire/wl_data_device.txt index e3236714..3a4ddb39 100644 --- a/wire/wl_data_device.txt +++ b/wire/wl_data_device.txt @@ -1,5 +1,3 @@ -# requests - request start_drag { source: id(wl_data_source), origin: id(wl_surface), @@ -12,14 +10,8 @@ request set_selection { serial: u32, } -request release (since = 2) { - -} - -# events - event data_offer { - id: id(wl_data_offer), + id: id(wl_data_offer) (new), } event enter { @@ -31,7 +23,6 @@ event enter { } event leave { - } event motion { @@ -41,9 +32,11 @@ event motion { } event drop { - } event selection { id: id(wl_data_offer), } + +request release (destructor, since = 2) { +} diff --git a/wire/wl_data_device_manager.txt b/wire/wl_data_device_manager.txt index d4b5067e..814c4436 100644 --- a/wire/wl_data_device_manager.txt +++ b/wire/wl_data_device_manager.txt @@ -1,10 +1,8 @@ -# requests - request create_data_source { - id: id(wl_data_source), + id: id(wl_data_source) (new), } request get_data_device { - id: id(wl_data_device), + id: id(wl_data_device) (new), seat: id(wl_seat), } diff --git a/wire/wl_data_offer.txt b/wire/wl_data_offer.txt index 92dc40e1..be07c20f 100644 --- a/wire/wl_data_offer.txt +++ b/wire/wl_data_offer.txt @@ -1,5 +1,3 @@ -# requests - request accept { serial: u32, mime_type: optstr, @@ -10,7 +8,11 @@ request receive { fd: fd, } -request destroy { +request destroy (destructor) { +} + +event offer { + mime_type: str, } request finish (since = 3) { @@ -21,12 +23,6 @@ request set_actions (since = 3) { preferred_action: u32, } -# events - -event offer { - mime_type: str, -} - event source_actions (since = 3) { source_actions: u32, } diff --git a/wire/wl_data_source.txt b/wire/wl_data_source.txt index 870da7a1..4eb03658 100644 --- a/wire/wl_data_source.txt +++ b/wire/wl_data_source.txt @@ -1,19 +1,10 @@ -# requests - request offer { mime_type: str, } -request destroy { - +request destroy (destructor) { } -request set_actions (since = 3) { - dnd_actions: u32, -} - -# events - event target { mime_type: optstr, } @@ -24,15 +15,16 @@ event send { } event cancelled { +} +request set_actions (since = 3) { + dnd_actions: u32, } event dnd_drop_performed (since = 3) { - } event dnd_finished (since = 3) { - } event action (since = 3) { diff --git a/wire/wl_display.txt b/wire/wl_display.txt index ec3b3307..e925e030 100644 --- a/wire/wl_display.txt +++ b/wire/wl_display.txt @@ -1,15 +1,11 @@ -# requests - request sync { - callback: id(wl_callback), + callback: id(wl_callback) (new), } request get_registry { - registry: id(wl_registry), + registry: id(wl_registry) (new), } -# events - event error { object_id: id(object), code: u32, diff --git a/wire/wl_fixes.txt b/wire/wl_fixes.txt index a78e7e7f..d78c6bfe 100644 --- a/wire/wl_fixes.txt +++ b/wire/wl_fixes.txt @@ -1,5 +1,4 @@ -request destroy { - +request destroy (destructor) { } request destroy_registry { diff --git a/wire/wl_keyboard.txt b/wire/wl_keyboard.txt index 2ad3264f..ca88b71e 100644 --- a/wire/wl_keyboard.txt +++ b/wire/wl_keyboard.txt @@ -1,11 +1,3 @@ -# requests - -request release (since = 3) { - -} - -# events - event keymap { format: u32, fd: fd, @@ -38,6 +30,9 @@ event modifiers { group: u32, } +request release (destructor, since = 3) { +} + event repeat_info (since = 4) { rate: i32, delay: i32, diff --git a/wire/wl_output.txt b/wire/wl_output.txt index b09c6f2a..050b3f92 100644 --- a/wire/wl_output.txt +++ b/wire/wl_output.txt @@ -1,37 +1,31 @@ -# requests - -request release (since = 3) { - -} - -# events - event geometry { - x : i32, - y : i32, - physical_width : i32, - physical_height : i32, - subpixel : i32, - make : str, - model : str, - transform : i32, + x: i32, + y: i32, + physical_width: i32, + physical_height: i32, + subpixel: i32, + make: str, + model: str, + transform: i32, } event mode { - flags : u32, - width : i32, - height : i32, - refresh : i32, + flags: u32, + width: i32, + height: i32, + refresh: i32, } event done (since = 2) { - } event scale (since = 2) { factor: i32, } +request release (destructor, since = 3) { +} + event name (since = 4) { name: str, } diff --git a/wire/wl_pointer.txt b/wire/wl_pointer.txt index c1c038a9..b92bb0b8 100644 --- a/wire/wl_pointer.txt +++ b/wire/wl_pointer.txt @@ -1,5 +1,3 @@ -# requests - request set_cursor { serial: u32, surface: id(wl_surface), @@ -7,12 +5,6 @@ request set_cursor { hotspot_y: i32, } -request release (since = 3) { - -} - -# events - event enter { serial: u32, surface: id(wl_surface), @@ -44,8 +36,10 @@ event axis { value: fixed, } -event frame (since = 5) { +request release (destructor, since = 3) { +} +event frame (since = 5) { } event axis_source (since = 5) { diff --git a/wire/wl_region.txt b/wire/wl_region.txt index 214c189a..c6b2fc0a 100644 --- a/wire/wl_region.txt +++ b/wire/wl_region.txt @@ -1,7 +1,4 @@ -# requests - -request destroy { - +request destroy (destructor) { } request add { diff --git a/wire/wl_registry.txt b/wire/wl_registry.txt index 5a1a3390..b951da0f 100644 --- a/wire/wl_registry.txt +++ b/wire/wl_registry.txt @@ -1,5 +1,3 @@ -# requests - request bind { name: u32, interface: str, @@ -7,8 +5,6 @@ request bind { id: id(object), } -# events - event global { name: u32, interface: str, diff --git a/wire/wl_seat.txt b/wire/wl_seat.txt index b3b314a5..75c35713 100644 --- a/wire/wl_seat.txt +++ b/wire/wl_seat.txt @@ -1,26 +1,22 @@ -# requests +event capabilities { + capabilities: u32, +} request get_pointer { - id: id(wl_pointer), + id: id(wl_pointer) (new), } request get_keyboard { - id: id(wl_keyboard), + id: id(wl_keyboard) (new), } request get_touch { - id: id(wl_touch), -} - -request release (since = 5) { -} - -# events - -event capabilities { - capabilities: u32, + id: id(wl_touch) (new), } event name (since = 2) { name: str, } + +request release (destructor, since = 5) { +} diff --git a/wire/wl_shm.txt b/wire/wl_shm.txt index 6930df47..4030d30e 100644 --- a/wire/wl_shm.txt +++ b/wire/wl_shm.txt @@ -1,16 +1,12 @@ -# requests - request create_pool { - id: id(wl_shm_pool), + id: id(wl_shm_pool) (new), fd: fd, size: i32, } -request release (since = 2) { -} - -# events - event format { format: u32, } + +request release (destructor, since = 2) { +} diff --git a/wire/wl_shm_pool.txt b/wire/wl_shm_pool.txt index f71882b6..d0f22917 100644 --- a/wire/wl_shm_pool.txt +++ b/wire/wl_shm_pool.txt @@ -1,7 +1,5 @@ -# requests - request create_buffer { - id: id(wl_buffer), + id: id(wl_buffer) (new), offset: i32, width: i32, height: i32, @@ -9,8 +7,7 @@ request create_buffer { format: u32, } -request destroy { - +request destroy (destructor) { } request resize { diff --git a/wire/wl_subcompositor.txt b/wire/wl_subcompositor.txt index 6def9dfa..b23228cd 100644 --- a/wire/wl_subcompositor.txt +++ b/wire/wl_subcompositor.txt @@ -1,11 +1,8 @@ -# requests - -request destroy { - +request destroy (destructor) { } request get_subsurface { - id: id(wl_subsurface), + id: id(wl_subsurface) (new), surface: id(wl_surface), parent: id(wl_surface), } diff --git a/wire/wl_subsurface.txt b/wire/wl_subsurface.txt index d761de40..6eb320af 100644 --- a/wire/wl_subsurface.txt +++ b/wire/wl_subsurface.txt @@ -1,6 +1,5 @@ -# requests - -request destroy { } +request destroy (destructor) { +} request set_position { x: i32, @@ -15,6 +14,8 @@ request place_below { sibling: id(wl_surface), } -request set_sync { } +request set_sync { +} -request set_desync { } +request set_desync { +} diff --git a/wire/wl_surface.txt b/wire/wl_surface.txt index 9d3bad32..8a7e1d2a 100644 --- a/wire/wl_surface.txt +++ b/wire/wl_surface.txt @@ -1,6 +1,4 @@ -# requests - -request destroy { +request destroy (destructor) { } request attach { @@ -17,7 +15,7 @@ request damage { } request frame { - callback: id(wl_callback), + callback: id(wl_callback) (new), } request set_opaque_region { @@ -31,6 +29,14 @@ request set_input_region { request commit { } +event enter { + output: id(wl_output), +} + +event leave { + output: id(wl_output), +} + request set_buffer_transform (since = 2) { transform: i32, } @@ -51,16 +57,6 @@ request offset (since = 5) { y: i32, } -# events - -event enter { - output: id(wl_output), -} - -event leave { - output: id(wl_output), -} - event preferred_buffer_scale (since = 6) { factor: i32, } diff --git a/wire/wl_touch.txt b/wire/wl_touch.txt index d88f4600..3ea44a58 100644 --- a/wire/wl_touch.txt +++ b/wire/wl_touch.txt @@ -1,11 +1,3 @@ -# requests - -request release (since = 3) { - -} - -# events - event down { serial: u32, time: u32, @@ -29,11 +21,12 @@ event motion { } event frame { - } event cancel { +} +request release (destructor, since = 3) { } event shape (since = 6) {