Merge pull request #615 from mahkoh/jorth/xml-to-wire

xml-to-wire: add new utility

Cargo.lock

@@ -106,9 +106,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.95"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
 [[package]]
 name = "arrayref"
@@ -1007,18 +1007,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.93"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quick-xml"
-version = "0.38.0"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8927b0664f5c5a98265138b7e3f90aa19a6b21353182469ace36d4ac527b7b1b"
+checksum = "42a232e7487fc2ef313d96dde7948e7a3c05101870d8985e4fd8d26aedd27b89"
 dependencies = [
  "memchr",
 ]
@@ -1352,18 +1352,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.11"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.11"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
+checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1733,6 +1733,14 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "xml-to-wire"
+version = "0.1.0"
+dependencies = [
+ "quick-xml",
+ "thiserror",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"

Cargo.toml

@@ -13,7 +13,7 @@ name = "jay"
 path = "src/main.rs"
 
 [workspace]
-members = ["jay-config", "toml-config", "algorithms", "toml-spec", "wire-to-xml"]
+members = ["jay-config", "toml-config", "algorithms", "toml-spec", "wire-to-xml", "xml-to-wire"]
 
 [profile.release]
 panic = "abort"

src/ifs/wl_seat/zwp_relative_pointer_v1.rs

@@ -25,8 +25,8 @@ impl ZwpRelativePointerV1 {
         time_usec: u64,
         mut dx: Fixed,
         mut dy: Fixed,
-        dx_unaccelerated: Fixed,
-        dy_unaccelerated: Fixed,
+        dx_unaccel: Fixed,
+        dy_unaccel: Fixed,
     ) {
         logical_to_client_wire_scale!(self.client, dx, dy);
         self.client.event(RelativeMotion {
@@ -34,8 +34,8 @@ impl ZwpRelativePointerV1 {
             utime: time_usec,
             dx,
             dy,
-            dx_unaccelerated,
-            dy_unaccelerated,
+            dx_unaccel,
+            dy_unaccel,
         });
     }
 }

wire/ext_data_control_device_v1.txt

@@ -1,21 +1,12 @@
-# requests
-
 request set_selection {
     source: id(ext_data_control_source_v1),
 }
 
-request destroy {
-
+request destroy (destructor) {
 }
 
-request set_primary_selection {
-    source: id(ext_data_control_source_v1),
-}
-
-# events
-
 event data_offer {
-    id: id(ext_data_control_offer_v1),
+    id: id(ext_data_control_offer_v1) (new),
 }
 
 event selection {
@@ -28,3 +19,7 @@ event finished {
 event primary_selection {
     id: id(ext_data_control_offer_v1),
 }
+
+request set_primary_selection {
+    source: id(ext_data_control_source_v1),
+}

wire/ext_data_control_manager_v1.txt

@@ -1,14 +1,11 @@
-# requests
-
 request create_data_source {
-    id: id(ext_data_control_source_v1),
+    id: id(ext_data_control_source_v1) (new),
 }
 
 request get_data_device {
-    id: id(ext_data_control_device_v1),
+    id: id(ext_data_control_device_v1) (new),
     seat: id(wl_seat),
 }
 
-request destroy {
-
+request destroy (destructor) {
 }

wire/ext_data_control_offer_v1.txt

@@ -1,16 +1,11 @@
-# requests
-
 request receive {
     mime_type: str,
     fd: fd,
 }
 
-request destroy {
-
+request destroy (destructor) {
 }
 
-# events
-
 event offer {
     mime_type: str,
 }

wire/ext_data_control_source_v1.txt

@@ -1,20 +1,14 @@
-# requests
-
 request offer {
     mime_type: str,
 }
 
-request destroy {
-
+request destroy (destructor) {
 }
 
-# events
-
 event send {
     mime_type: str,
     fd: fd,
 }
 
 event cancelled {
-
 }

wire/ext_foreign_toplevel_handle_v1.txt

@@ -1,10 +1,6 @@
-# requests
-
-request destroy {
+request destroy (destructor) {
 }
 
-# events
-
 event closed {
 }
 

wire/ext_foreign_toplevel_image_capture_source_manager_v1.txt

@@ -1,8 +1,7 @@
 request create_source {
-    source: id(ext_image_capture_source_v1),
+    source: id(ext_image_capture_source_v1) (new),
     toplevel_handle: id(ext_foreign_toplevel_handle_v1),
 }
 
-request destroy {
-
+request destroy (destructor) {
 }

wire/ext_foreign_toplevel_list_v1.txt

@@ -1,16 +1,12 @@
-# requests
-
-request stop {
-}
-
-request destroy {
-}
-
-# events
-
 event toplevel {
-    toplevel: id(ext_foreign_toplevel_handle_v1),
+    toplevel: id(ext_foreign_toplevel_handle_v1) (new),
 }
 
 event finished {
 }
+
+request stop {
+}
+
+request destroy (destructor) {
+}

wire/ext_idle_notification_v1.txt

@@ -1,10 +1,6 @@
-# requests
-
-request destroy {
+request destroy (destructor) {
 }
 
-# events
-
 event idled {
 }
 

wire/ext_idle_notifier_v1.txt

@@ -1,16 +1,14 @@
-# requests
-
-request destroy {
+request destroy (destructor) {
 }
 
 request get_idle_notification {
-    id: id(ext_idle_notification_v1),
+    id: id(ext_idle_notification_v1) (new),
     timeout: u32,
     seat: id(wl_seat),
 }
 
 request get_input_idle_notification (since = 2) {
-    id: id(ext_idle_notification_v1),
+    id: id(ext_idle_notification_v1) (new),
     timeout: u32,
     seat: id(wl_seat),
 }

wire/ext_image_capture_source_v1.txt

@@ -1,3 +1,2 @@
-request destroy {
-
+request destroy (destructor) {
 }

wire/ext_image_copy_capture_cursor_session_v1.txt

@@ -1,17 +1,14 @@
-request destroy {
-
+request destroy (destructor) {
 }
 
 request get_capture_session {
-    session: id(ext_image_copy_capture_session_v1),
+    session: id(ext_image_copy_capture_session_v1) (new),
 }
 
 event enter {
-
 }
 
 event leave {
-
 }
 
 event position {

wire/ext_image_copy_capture_frame_v1.txt

@@ -1,5 +1,4 @@
-request destroy {
-
+request destroy (destructor) {
 }
 
 request attach_buffer {
@@ -14,7 +13,6 @@ request damage_buffer {
 }
 
 request capture {
-
 }
 
 event transform {
@@ -34,9 +32,8 @@ event presentation_time {
 }
 
 event ready {
-
 }
 
 event failed {
-    reason: i32,
+    reason: u32,
 }

wire/ext_image_copy_capture_manager_v1.txt

@@ -1,15 +1,14 @@
 request create_session {
-    session: id(ext_image_copy_capture_session_v1),
+    session: id(ext_image_copy_capture_session_v1) (new),
     source: id(ext_image_capture_source_v1),
     options: u32,
 }
 
 request create_pointer_cursor_session {
-    session: id(ext_image_copy_capture_cursor_session_v1),
+    session: id(ext_image_copy_capture_cursor_session_v1) (new),
     source: id(ext_image_capture_source_v1),
     pointer: id(wl_pointer),
 }
 
-request destroy {
-
+request destroy (destructor) {
 }

wire/ext_image_copy_capture_session_v1.txt

@@ -1,11 +1,3 @@
-request create_frame {
-    frame: id(ext_image_copy_capture_frame_v1),
-}
-
-request destroy {
-
-}
-
 event buffer_size {
     width: u32,
     height: u32,
@@ -25,9 +17,14 @@ event dmabuf_format {
 }
 
 event done {
-
 }
 
 event stopped {
-
+}
+
+request create_frame {
+    frame: id(ext_image_copy_capture_frame_v1) (new),
+}
+
+request destroy (destructor) {
 }

wire/ext_output_image_capture_source_manager_v1.txt

@@ -1,8 +1,7 @@
 request create_source {
-    source: id(ext_image_capture_source_v1),
+    source: id(ext_image_capture_source_v1) (new),
     output: id(wl_output),
 }
 
-request destroy {
-
+request destroy (destructor) {
 }

wire/ext_session_lock_manager_v1.txt

@@ -1,8 +1,6 @@
-# requests
-
-request destroy {
+request destroy (destructor) {
 }
 
 request lock {
-    id: id(ext_session_lock_v1),
+    id: id(ext_session_lock_v1) (new),
 }

wire/ext_session_lock_surface_v1.txt

@@ -1,15 +1,10 @@
-# request
-
-request destroy {
-
+request destroy (destructor) {
 }
 
 request ack_configure {
     serial: u32,
 }
 
-# events
-
 event configure {
     serial: u32,
     width: u32,

wire/ext_session_lock_v1.txt

@@ -1,25 +1,17 @@
-# requests
+request destroy (destructor) {
+}
 
-request destroy {
+event locked {
+}
 
+event finished {
 }
 
 request get_lock_surface {
-    id: id(ext_session_lock_surface_v1),
+    id: id(ext_session_lock_surface_v1) (new),
     surface: id(wl_surface),
     output: id(wl_output),
 }
 
-request unlock_and_destroy {
-
-}
-
-# events
-
-event locked {
-
-}
-
-event finished {
-
+request unlock_and_destroy (destructor) {
 }

wire/ext_transient_seat_manager_v1.txt

@@ -1,6 +1,6 @@
 request create {
-    seat: id(ext_transient_seat_v1),
+    seat: id(ext_transient_seat_v1) (new),
 }
 
-request destroy {
+request destroy (destructor) {
 }

wire/ext_transient_seat_v1.txt

@@ -1,10 +1,9 @@
-request destroy {
-}
-
 event ready {
     global_name: u32,
 }
 
 event denied {
-
+}
+
+request destroy (destructor) {
 }

wire/ext_workspace_group_handle_v1.txt

@@ -19,13 +19,11 @@ event workspace_leave {
 }
 
 event removed {
-
 }
 
 request create_workspace {
     workspace: str,
 }
 
-request destroy {
-
+request destroy (destructor) {
 }

wire/ext_workspace_handle_v1.txt

@@ -19,19 +19,15 @@ event capabilities {
 }
 
 event removed {
-
 }
 
-request destroy {
-
+request destroy (destructor) {
 }
 
 request activate {
-
 }
 
 request deactivate {
-
 }
 
 request assign {
@@ -39,5 +35,4 @@ request assign {
 }
 
 request remove {
-
 }

wire/ext_workspace_manager_v1.txt

@@ -1,23 +1,19 @@
 event workspace_group {
-    workspace_group: id(ext_workspace_group_handle_v1),
+    workspace_group: id(ext_workspace_group_handle_v1) (new),
 }
 
 event workspace {
-    workspace: id(ext_workspace_handle_v1),
+    workspace: id(ext_workspace_handle_v1) (new),
 }
 
 request commit {
-
 }
 
 event done {
-
 }
 
-event finished {
-
+event finished (destructor) {
 }
 
 request stop {
-
 }

wire/wp_alpha_modifier_surface_v1.txt

@@ -1,4 +1,4 @@
-request destroy {
+request destroy (destructor) {
 }
 
 request set_multiplier {

wire/wp_alpha_modifier_v1.txt

@@ -1,7 +1,7 @@
-request destroy {
+request destroy (destructor) {
 }
 
 request get_surface {
-    id: id(wp_alpha_modifier_surface_v1),
+    id: id(wp_alpha_modifier_surface_v1) (new),
     surface: id(wl_surface),
 }

wire/wp_color_management_output_v1.txt

@@ -1,9 +1,9 @@
-request destroy {
+request destroy (destructor) {
 }
 
 event image_description_changed {
 }
 
 request get_image_description {
-    image_description: id(wp_image_description_v1),
+    image_description: id(wp_image_description_v1) (new),
 }

wire/wp_color_management_surface_feedback_v1.txt

@@ -1,4 +1,4 @@
-request destroy {
+request destroy (destructor) {
 }
 
 event preferred_changed {
@@ -6,9 +6,9 @@ event preferred_changed {
 }
 
 request get_preferred {
-    image_description: id(wp_image_description_v1),
+    image_description: id(wp_image_description_v1) (new),
 }
 
 request get_preferred_parametric {
-    image_description: id(wp_image_description_v1),
+    image_description: id(wp_image_description_v1) (new),
 }

wire/wp_color_management_surface_v1.txt

@@ -1,4 +1,4 @@
-request destroy {
+request destroy (destructor) {
 }
 
 request set_image_description {

wire/wp_color_manager_v1.txt

@@ -1,31 +1,31 @@
-request destroy {
+request destroy (destructor) {
 }
 
 request get_output {
-    id: id(wp_color_management_output_v1),
+    id: id(wp_color_management_output_v1) (new),
     output: id(wl_output),
 }
 
 request get_surface {
-    id: id(wp_color_management_surface_v1),
+    id: id(wp_color_management_surface_v1) (new),
     surface: id(wl_surface),
 }
 
 request get_surface_feedback {
-    id: id(wp_color_management_surface_feedback_v1),
+    id: id(wp_color_management_surface_feedback_v1) (new),
     surface: id(wl_surface),
 }
 
 request create_icc_creator {
-    obj: id(wp_image_description_creator_icc_v1),
+    obj: id(wp_image_description_creator_icc_v1) (new),
 }
 
 request create_parametric_creator {
-    obj: id(wp_image_description_creator_params_v1),
+    obj: id(wp_image_description_creator_params_v1) (new),
 }
 
 request create_windows_scrgb {
-    image_description: id(wp_image_description_v1),
+    image_description: id(wp_image_description_v1) (new),
 }
 
 event supported_intent {

wire/wp_commit_timer_v1.txt

@@ -3,6 +3,5 @@ request set_timestamp {
     tv_nsec: u32,
 }
 
-request destroy {
-
+request destroy (destructor) {
 }

wire/wp_commit_timing_manager_v1.txt

@@ -1,8 +1,7 @@
-request destroy {
-
+request destroy (destructor) {
 }
 
 request get_timer {
-    id: id(wp_commit_timer_v1),
+    id: id(wp_commit_timer_v1) (new),
     surface: id(wl_surface),
 }

wire/wp_content_type_manager_v1.txt

@@ -1,9 +1,7 @@
-# requests
-
-request destroy {
+request destroy (destructor) {
 }
 
 request get_surface_content_type {
-    id: id(wp_content_type_v1),
+    id: id(wp_content_type_v1) (new),
     surface: id(wl_surface),
 }

wire/wp_content_type_v1.txt

@@ -1,6 +1,4 @@
-# requests
-
-request destroy {
+request destroy (destructor) {
 }
 
 request set_content_type {

wire/wp_cursor_shape_device_v1.txt

@@ -1,6 +1,4 @@
-# requests
-
-request destroy {
+request destroy (destructor) {
 }
 
 request set_shape {

wire/wp_cursor_shape_manager_v1.txt

@@ -1,14 +1,12 @@
-# requests
-
-request destroy {
+request destroy (destructor) {
 }
 
 request get_pointer {
-    cursor_shape_device: id(wp_cursor_shape_device_v1),
+    cursor_shape_device: id(wp_cursor_shape_device_v1) (new),
     pointer: id(wl_pointer),
 }
 
 request get_tablet_tool_v2 {
-    cursor_shape_device: id(wp_cursor_shape_device_v1),
+    cursor_shape_device: id(wp_cursor_shape_device_v1) (new),
     tablet_tool: id(zwp_tablet_tool_v2),
 }

wire/wp_drm_lease_connector_v1.txt

@@ -1,7 +1,3 @@
-request destroy {
-
-}
-
 event name {
     name: str,
 }
@@ -15,9 +11,10 @@ event connector_id {
 }
 
 event done {
-
 }
 
 event withdrawn {
-
+}
+
+request destroy (destructor) {
 }

wire/wp_drm_lease_device_v1.txt

@@ -1,9 +1,8 @@
 request create_lease_request {
-    id: id(wp_drm_lease_request_v1),
+    id: id(wp_drm_lease_request_v1) (new),
 }
 
 request release {
-
 }
 
 event drm_fd {
@@ -11,13 +10,11 @@ event drm_fd {
 }
 
 event connector {
-    id: id(wp_drm_lease_connector_v1),
+    id: id(wp_drm_lease_connector_v1) (new),
 }
 
 event done {
-
 }
 
-event released {
-
+event released (destructor) {
 }

wire/wp_drm_lease_request_v1.txt

@@ -2,6 +2,6 @@ request request_connector {
     connector: id(wp_drm_lease_connector_v1),
 }
 
-request submit {
-    id: id(wp_drm_lease_v1),
+request submit (destructor) {
+    id: id(wp_drm_lease_v1) (new),
 }

wire/wp_drm_lease_v1.txt

@@ -1,11 +1,9 @@
-request destroy {
-
-}
-
 event lease_fd {
     leased_fd: fd,
 }
 
 event finished {
-
+}
+
+request destroy (destructor) {
 }

wire/wp_fifo_manager_v1.txt

@@ -1,8 +1,7 @@
-request destroy {
-
+request destroy (destructor) {
 }
 
 request get_fifo {
-    id: id(wp_fifo_v1),
+    id: id(wp_fifo_v1) (new),
     surface: id(wl_surface),
 }

wire/wp_fifo_v1.txt

@@ -1,11 +1,8 @@
 request set_barrier {
-
 }
 
 request wait_barrier {
-
 }
 
-request destroy {
-
+request destroy (destructor) {
 }

wire/wp_fractional_scale_manager_v1.txt

@@ -1,10 +1,7 @@
-# requests
-
-request destroy {
-
+request destroy (destructor) {
 }
 
 request get_fractional_scale {
-    id: id(wp_fractional_scale_v1),
+    id: id(wp_fractional_scale_v1) (new),
     surface: id(wl_surface),
 }

wire/wp_fractional_scale_v1.txt

@@ -1,11 +1,6 @@
-# requests
-
-request destroy {
-
+request destroy (destructor) {
 }
 
-# events
-
 event preferred_scale {
     scale: u32,
 }

wire/wp_image_description_creator_icc_v1.txt

@@ -1,5 +1,5 @@
-request create {
-    image_description: id(wp_image_description_v1),
+request create (destructor) {
+    image_description: id(wp_image_description_v1) (new),
 }
 
 request set_icc_file {

wire/wp_image_description_creator_params_v1.txt

@@ -1,5 +1,5 @@
-request create {
-    image_description: id(wp_image_description_v1),
+request create (destructor) {
+    image_description: id(wp_image_description_v1) (new),
 }
 
 request set_tf_named {

wire/wp_image_description_info_v1.txt

@@ -1,4 +1,4 @@
-event done {
+event done (destructor) {
 }
 
 event icc_file {

wire/wp_image_description_v1.txt

@@ -1,4 +1,4 @@
-request destroy {
+request destroy (destructor) {
 }
 
 event failed {
@@ -11,5 +11,5 @@ event ready {
 }
 
 request get_information {
-    information: id(wp_image_description_info_v1),
+    information: id(wp_image_description_info_v1) (new),
 }

wire/wp_linux_drm_syncobj_manager_v1.txt

@@ -1,15 +1,12 @@
-# requests
-
-request destroy {
-
+request destroy (destructor) {
 }
 
 request get_surface {
-    id: id(wp_linux_drm_syncobj_surface_v1),
+    id: id(wp_linux_drm_syncobj_surface_v1) (new),
     surface: id(wl_surface),
 }
 
 request import_timeline {
-    id: id(wp_linux_drm_syncobj_timeline_v1),
+    id: id(wp_linux_drm_syncobj_timeline_v1) (new),
     fd: fd,
 }

wire/wp_linux_drm_syncobj_surface_v1.txt

@@ -1,7 +1,4 @@
-# requests
-
-request destroy {
-
+request destroy (destructor) {
 }
 
 request set_acquire_point {

wire/wp_linux_drm_syncobj_timeline_v1.txt

@@ -1,5 +1,2 @@
-# requests
-
-request destroy {
-
+request destroy (destructor) {
 }

wire/wp_pointer_warp_v1.txt

@@ -1,5 +1,4 @@
-request destroy {
-
+request destroy (destructor) {
 }
 
 request warp_pointer {

wire/wp_presentation.txt

@@ -1,15 +1,11 @@
-# requests
-
-request destroy {
+request destroy (destructor) {
 }
 
 request feedback {
     surface: id(wl_surface),
-    callback: id(wp_presentation_feedback),
+    callback: id(wp_presentation_feedback) (new),
 }
 
-# events
-
 event clock_id {
     clk_id: u32,
 }

wire/wp_presentation_feedback.txt

@@ -1,17 +1,14 @@
-# events
-
 event sync_output {
     output: id(wl_output),
 }
 
-event presented {
-    tv_sec      : u64,
-    tv_nsec     : u32,
-    refresh     : u32,
-    seq         : u64,
-    flags       : u32,
+event presented (destructor) {
+    tv_sec: u64,
+    tv_nsec: u32,
+    refresh: u32,
+    seq: u64,
+    flags: u32,
 }
 
-event discarded {
-
+event discarded (destructor) {
 }

wire/wp_security_context_manager_v1.txt

@@ -1,9 +1,8 @@
-request destroy {
-
+request destroy (destructor) {
 }
 
 request create_listener {
-    id: id(wp_security_context_v1),
+    id: id(wp_security_context_v1) (new),
     listen_fd: fd,
     close_fd: fd,
 }

wire/wp_security_context_v1.txt

@@ -1,5 +1,4 @@
-request destroy {
-
+request destroy (destructor) {
 }
 
 request set_sandbox_engine {
@@ -15,5 +14,4 @@ request set_instance_id {
 }
 
 request commit {
-
 }

wire/wp_single_pixel_buffer_manager_v1.txt

@@ -1,10 +1,8 @@
-# requests
-
-request destroy {
+request destroy (destructor) {
 }
 
 request create_u32_rgba_buffer {
-    id: id(wl_buffer),
+    id: id(wl_buffer) (new),
     r: u32,
     g: u32,
     b: u32,

wire/wp_tearing_control_manager_v1.txt

@@ -1,11 +1,7 @@
-# requests
-
-request destroy {
-
+request destroy (destructor) {
 }
 
 request get_tearing_control {
-    id: id(wp_tearing_control_v1),
+    id: id(wp_tearing_control_v1) (new),
     surface: id(wl_surface),
 }
-

wire/wp_tearing_control_v1.txt

@@ -1,9 +1,6 @@
-# requests
-
 request set_presentation_hint {
     hint: u32,
 }
 
-request destroy {
-
+request destroy (destructor) {
 }

wire/wp_viewport.txt

@@ -1,6 +1,4 @@
-# requests
-
-request destroy {
+request destroy (destructor) {
 }
 
 request set_source {

wire/wp_viewporter.txt

@@ -1,9 +1,7 @@
-# requests
-
-request destroy {
+request destroy (destructor) {
 }
 
 request get_viewport {
-    id: id(wp_viewport),
+    id: id(wp_viewport) (new),
     surface: id(wl_surface),
 }

wire/xdg_activation_token_v1.txt

@@ -1,5 +1,3 @@
-# requests
-
 request set_serial {
     serial: u32,
     seat: id(wl_seat),
@@ -14,15 +12,11 @@ request set_surface {
 }
 
 request commit {
-
 }
 
-request destroy {
-
-}
-
-# events
-
 event done {
     token: str,
 }
+
+request destroy (destructor) {
+}

wire/xdg_activation_v1.txt

@@ -1,11 +1,8 @@
-# requests
-
-request destroy {
-
+request destroy (destructor) {
 }
 
 request get_activation_token {
-    id: id(xdg_activation_token_v1),
+    id: id(xdg_activation_token_v1) (new),
 }
 
 request activate {

wire/xdg_dialog_v1.txt

@@ -1,11 +1,8 @@
-request destroy {
-
+request destroy (destructor) {
 }
 
 request set_modal {
-
 }
 
 request unset_modal {
-
 }

wire/xdg_popup.txt

@@ -1,19 +1,11 @@
-# requests
-
-request destroy { }
+request destroy (destructor) {
+}
 
 request grab {
     seat: id(wl_seat),
     serial: u32,
 }
 
-request reposition (since = 3) {
-    positioner: id(xdg_positioner),
-    token: u32,
-}
-
-# events
-
 event configure {
     x: i32,
     y: i32,
@@ -22,7 +14,11 @@ event configure {
 }
 
 event popup_done {
+}
 
+request reposition (since = 3) {
+    positioner: id(xdg_positioner),
+    token: u32,
 }
 
 event repositioned (since = 3) {

wire/xdg_positioner.txt

@@ -1,6 +1,5 @@
-# requests
-
-request destroy { }
+request destroy (destructor) {
+}
 
 request set_size {
     width: i32,
@@ -32,7 +31,6 @@ request set_offset {
 }
 
 request set_reactive (since = 3) {
-
 }
 
 request set_parent_size (since = 3) {

wire/xdg_surface.txt

@@ -1,13 +1,12 @@
-# requests
-
-request destroy { }
+request destroy (destructor) {
+}
 
 request get_toplevel {
-    id: id(xdg_toplevel),
+    id: id(xdg_toplevel) (new),
 }
 
 request get_popup {
-    id: id(xdg_popup),
+    id: id(xdg_popup) (new),
     parent: id(xdg_surface),
     positioner: id(xdg_positioner),
 }
@@ -23,8 +22,6 @@ request ack_configure {
     serial: u32,
 }
 
-# events
-
 event configure {
     serial: u32,
 }

wire/xdg_toplevel.txt

@@ -1,7 +1,4 @@
-# requests
-
-request destroy {
-
+request destroy (destructor) {
 }
 
 request set_parent {
@@ -44,21 +41,21 @@ request set_min_size {
     height: i32,
 }
 
-request set_maximized { }
+request set_maximized {
+}
 
-request unset_maximized { }
+request unset_maximized {
+}
 
 request set_fullscreen {
     output: id(wl_output),
 }
 
 request unset_fullscreen {
-
 }
 
-request set_minimized { }
-
-# events
+request set_minimized {
+}
 
 event configure {
     width: i32,
@@ -66,7 +63,8 @@ event configure {
     states: array(u32),
 }
 
-event close { }
+event close {
+}
 
 event configure_bounds (since = 4) {
     width: i32,

wire/xdg_toplevel_drag_manager_v1.txt

@@ -1,10 +1,7 @@
-# requests
-
-request destroy {
-
+request destroy (destructor) {
 }
 
 request get_xdg_toplevel_drag {
-    id: id(xdg_toplevel_drag_v1),
+    id: id(xdg_toplevel_drag_v1) (new),
     data_source: id(wl_data_source),
 }

wire/xdg_toplevel_drag_v1.txt

@@ -1,7 +1,4 @@
-# requests
-
-request destroy {
-
+request destroy (destructor) {
 }
 
 request attach {

wire/xdg_toplevel_tag_manager_v1.txt

@@ -1,5 +1,4 @@
-request destroy {
-
+request destroy (destructor) {
 }
 
 request set_toplevel_tag {

wire/xdg_wm_base.txt

@@ -1,13 +1,12 @@
-# requests
-
-request destroy { }
+request destroy (destructor) {
+}
 
 request create_positioner {
-    id: id(xdg_positioner),
+    id: id(xdg_positioner) (new),
 }
 
 request get_xdg_surface {
-    id: id(xdg_surface),
+    id: id(xdg_surface) (new),
     surface: id(wl_surface),
 }
 
@@ -15,8 +14,6 @@ request pong {
     serial: u32,
 }
 
-# events
-
 event ping {
     serial: u32,
 }

wire/xdg_wm_dialog_v1.txt

@@ -1,8 +1,7 @@
-request destroy {
-
+request destroy (destructor) {
 }
 
 request get_xdg_dialog {
-    id: id(xdg_dialog_v1),
+    id: id(xdg_dialog_v1) (new),
     toplevel: id(xdg_toplevel),
 }

wire/xwayland_shell_v1.txt

@@ -1,8 +1,7 @@
-# requests
-
-request destroy { }
+request destroy (destructor) {
+}
 
 request get_xwayland_surface {
-    id: id(xwayland_surface_v1),
+    id: id(xwayland_surface_v1) (new),
     surface: id(wl_surface),
 }

wire/xwayland_surface_v1.txt

@@ -1,7 +1,6 @@
-# requests
-
 request set_serial {
     serial: u64_rev,
 }
 
-request destroy { }
+request destroy (destructor) {
+}

wire/zwp_confined_pointer_v1.txt

@@ -1,19 +1,12 @@
-# requests
-
-request destroy {
-
+request destroy (destructor) {
 }
 
 request set_region {
     region: id(wl_region),
 }
 
-# events
-
 event confined {
-
 }
 
 event unconfined {
-
 }

wire/zwp_idle_inhibit_manager_v1.txt

@@ -1,8 +1,7 @@
-# requests
-
-request destroy { }
+request destroy (destructor) {
+}
 
 request create_inhibitor {
-    id: id(zwp_idle_inhibitor_v1),
+    id: id(zwp_idle_inhibitor_v1) (new),
     surface: id(wl_surface),
 }

wire/zwp_idle_inhibitor_v1.txt

@@ -1,3 +1,2 @@
-# requests
-
-request destroy { }
+request destroy (destructor) {
+}

wire/zwp_linux_buffer_params_v1.txt

@@ -1,6 +1,5 @@
-# requests
-
-request destroy { }
+request destroy (destructor) {
+}
 
 request add {
     fd: fd,
@@ -17,20 +16,17 @@ request create {
     flags: u32,
 }
 
+event created {
+    buffer: id(wl_buffer) (new),
+}
+
+event failed {
+}
+
 request create_immed (since = 2) {
-    buffer_id: id(wl_buffer),
+    buffer_id: id(wl_buffer) (new),
     width: i32,
     height: i32,
     format: u32,
     flags: u32,
 }
-
-# events
-
-event created {
-    buffer: id(wl_buffer),
-}
-
-event failed {
-
-}

wire/zwp_linux_dmabuf_feedback_v1.txt

@@ -1,10 +1,8 @@
-# requests
+request destroy (destructor) {
+}
 
-request destroy { }
-
-# events
-
-event done { }
+event done {
+}
 
 event format_table {
     fd: fd,
@@ -16,7 +14,6 @@ event main_device {
 }
 
 event tranche_done {
-
 }
 
 event tranche_target_device {

wire/zwp_linux_dmabuf_v1.txt

@@ -1,22 +1,10 @@
-# requests
-
-request destroy { }
+request destroy (destructor) {
+}
 
 request create_params {
-    params_id: id(zwp_linux_buffer_params_v1),
+    params_id: id(zwp_linux_buffer_params_v1) (new),
 }
 
-request get_default_feedback (since = 4) {
-    id: id(zwp_linux_dmabuf_feedback_v1),
-}
-
-request get_surface_feedback (since = 4) {
-    id: id(zwp_linux_dmabuf_feedback_v1),
-    surface: id(wl_surface),
-}
-
-# events
-
 event format {
     format: u32,
 }
@@ -25,3 +13,12 @@ event modifier (since = 3) {
     format: u32,
     modifier: u64,
 }
+
+request get_default_feedback (since = 4) {
+    id: id(zwp_linux_dmabuf_feedback_v1) (new),
+}
+
+request get_surface_feedback (since = 4) {
+    id: id(zwp_linux_dmabuf_feedback_v1) (new),
+    surface: id(wl_surface),
+}

wire/zwp_locked_pointer_v1.txt

@@ -1,6 +1,4 @@
-# requests
-
-request destroy {
+request destroy (destructor) {
 }
 
 request set_cursor_position_hint {
@@ -12,8 +10,6 @@ request set_region {
     region: id(wl_region),
 }
 
-# events
-
 event locked {
 }
 

wire/zwp_pointer_constraints_v1.txt

@@ -1,11 +1,8 @@
-# requests
-
-request destroy {
-
+request destroy (destructor) {
 }
 
 request lock_pointer {
-    id: id(zwp_locked_pointer_v1),
+    id: id(zwp_locked_pointer_v1) (new),
     surface: id(wl_surface),
     pointer: id(wl_pointer),
     region: id(wl_region),
@@ -13,7 +10,7 @@ request lock_pointer {
 }
 
 request confine_pointer {
-    id: id(zwp_confined_pointer_v1),
+    id: id(zwp_confined_pointer_v1) (new),
     surface: id(wl_surface),
     pointer: id(wl_pointer),
     region: id(wl_region),

wire/zwp_pointer_gesture_hold_v1.txt

@@ -1,5 +1,4 @@
-request destroy (since = 3) {
-
+request destroy (destructor, since = 3) {
 }
 
 event begin (since = 3) {

wire/zwp_pointer_gesture_pinch_v1.txt

@@ -1,5 +1,4 @@
-request destroy {
-
+request destroy (destructor) {
 }
 
 event begin {

wire/zwp_pointer_gesture_swipe_v1.txt

@@ -1,5 +1,4 @@
-request destroy {
-
+request destroy (destructor) {
 }
 
 event begin {

wire/zwp_pointer_gestures_v1.txt

@@ -1,18 +1,17 @@
 request get_swipe_gesture {
-    id: id(zwp_pointer_gesture_swipe_v1),
+    id: id(zwp_pointer_gesture_swipe_v1) (new),
     pointer: id(wl_pointer),
 }
 
 request get_pinch_gesture {
-    id: id(zwp_pointer_gesture_pinch_v1),
+    id: id(zwp_pointer_gesture_pinch_v1) (new),
     pointer: id(wl_pointer),
 }
 
-request release (since = 2) {
-
+request release (destructor, since = 2) {
 }
 
 request get_hold_gesture (since = 3) {
-    id: id(zwp_pointer_gesture_hold_v1),
+    id: id(zwp_pointer_gesture_hold_v1) (new),
     pointer: id(wl_pointer),
 }

wire/zwp_primary_selection_device_manager_v1.txt

@@ -1,12 +1,11 @@
-# requests
-
 request create_source {
-    id: id(zwp_primary_selection_source_v1),
+    id: id(zwp_primary_selection_source_v1) (new),
 }
 
-request get_device    {
-    id: id(zwp_primary_selection_device_v1),
+request get_device {
+    id: id(zwp_primary_selection_device_v1) (new),
     seat: id(wl_seat),
 }
 
-request destroy       { }
+request destroy (destructor) {
+}

wire/zwp_primary_selection_device_v1.txt

@@ -1,18 +1,15 @@
-# requests
-
 request set_selection {
     source: id(zwp_primary_selection_source_v1),
     serial: u32,
 }
 
-request destroy       { }
-
-# events
-
-event data_offer    {
-    offer: id(zwp_primary_selection_offer_v1),
+event data_offer {
+    offer: id(zwp_primary_selection_offer_v1) (new),
 }
 
-event selection     {
+event selection {
     id: id(zwp_primary_selection_offer_v1),
 }
+
+request destroy (destructor) {
+}

wire/zwp_primary_selection_offer_v1.txt

@@ -1,14 +1,11 @@
-# requests
-
 request receive {
     mime_type: str,
     fd: fd,
 }
 
-request destroy { }
+request destroy (destructor) {
+}
 
-# events
-
-event offer   {
+event offer {
     mime_type: str,
 }

wire/zwp_primary_selection_source_v1.txt

@@ -1,12 +1,9 @@
-# requests
-
 request offer {
     mime_type: str,
 }
 
-request destroy { }
-
-# events
+request destroy (destructor) {
+}
 
 event send {
     mime_type: str,
@@ -14,5 +11,4 @@ event send {
 }
 
 event cancelled {
-
 }

wire/zwp_relative_pointer_manager_v1.txt

@@ -1,10 +1,7 @@
-# requests
-
-request destroy {
-
+request destroy (destructor) {
 }
 
 request get_relative_pointer {
-    id: id(zwp_relative_pointer_v1),
+    id: id(zwp_relative_pointer_v1) (new),
     pointer: id(wl_pointer),
 }

wire/zwp_relative_pointer_v1.txt

@@ -1,15 +1,10 @@
-# requests
-
-request destroy {
-
+request destroy (destructor) {
 }
 
-# events
-
 event relative_motion {
     utime: u64,
     dx: fixed,
     dy: fixed,
-    dx_unaccelerated: fixed,
-    dy_unaccelerated: fixed,
+    dx_unaccel: fixed,
+    dy_unaccel: fixed,
 }

wire/zwp_tablet_manager_v2.txt

@@ -1,7 +1,7 @@
 request get_tablet_seat {
-    tablet_seat: id(zwp_tablet_seat_v2),
+    tablet_seat: id(zwp_tablet_seat_v2) (new),
     seat: id(wl_seat),
 }
 
-request destroy {
+request destroy (destructor) {
 }

wire/zwp_tablet_pad_dial_v2.txt

@@ -3,7 +3,7 @@ request set_feedback {
     serial: u32,
 }
 
-request destroy {
+request destroy (destructor) {
 }
 
 event delta {

wire/zwp_tablet_pad_group_v2.txt

@@ -1,4 +1,4 @@
-request destroy {
+request destroy (destructor) {
 }
 
 event buttons {
@@ -6,11 +6,11 @@ event buttons {
 }
 
 event ring {
-    ring: id(zwp_tablet_pad_ring_v2),
+    ring: id(zwp_tablet_pad_ring_v2) (new),
 }
 
 event strip {
-    strip: id(zwp_tablet_pad_strip_v2),
+    strip: id(zwp_tablet_pad_strip_v2) (new),
 }
 
 event modes {
@@ -26,6 +26,6 @@ event mode_switch {
     mode: u32,
 }
 
-event dial {
-    dial: id(zwp_tablet_pad_dial_v2),
+event dial (since = 2) {
+    dial: id(zwp_tablet_pad_dial_v2) (new),
 }

wire/zwp_tablet_pad_ring_v2.txt

@@ -3,7 +3,7 @@ request set_feedback {
     serial: u32,
 }
 
-request destroy {
+request destroy (destructor) {
 }
 
 event source {

wire/zwp_tablet_pad_strip_v2.txt

@@ -3,7 +3,7 @@ request set_feedback {
     serial: u32,
 }
 
-request destroy {
+request destroy (destructor) {
 }
 
 event source {