| OLD | NEW |
| 1 /* Generated by wayland-scanner 1.11.0 */ | 1 /* Generated by wayland-scanner 1.11.0 */ |
| 2 | 2 |
| 3 /* | 3 /* |
| 4 * Copyright 2016 The Chromium Authors. | 4 * Copyright 2016 The Chromium Authors. |
| 5 * | 5 * |
| 6 * Permission is hereby granted, free of charge, to any person obtaining a | 6 * Permission is hereby granted, free of charge, to any person obtaining a |
| 7 * copy of this software and associated documentation files (the "Software"), | 7 * copy of this software and associated documentation files (the "Software"), |
| 8 * to deal in the Software without restriction, including without limitation | 8 * to deal in the Software without restriction, including without limitation |
| 9 * the rights to use, copy, modify, merge, publish, distribute, sublicense, | 9 * the rights to use, copy, modify, merge, publish, distribute, sublicense, |
| 10 * and/or sell copies of the Software, and to permit persons to whom the | 10 * and/or sell copies of the Software, and to permit persons to whom the |
| 11 * Software is furnished to do so, subject to the following conditions: | 11 * Software is furnished to do so, subject to the following conditions: |
| 12 * | 12 * |
| 13 * The above copyright notice and this permission notice (including the next | 13 * The above copyright notice and this permission notice (including the next |
| 14 * paragraph) shall be included in all copies or substantial portions of the | 14 * paragraph) shall be included in all copies or substantial portions of the |
| 15 * Software. | 15 * Software. |
| 16 * | 16 * |
| 17 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | 17 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| 18 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | 18 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| 19 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | 19 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
| 20 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | 20 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| 21 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | 21 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
| 22 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
| 23 * DEALINGS IN THE SOFTWARE. | 23 * DEALINGS IN THE SOFTWARE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include <stdlib.h> | 26 #include <stdlib.h> |
| 27 #include <stdint.h> | 27 #include <stdint.h> |
| 28 #include "wayland-util.h" | 28 #include "wayland-util.h" |
| 29 | 29 |
| 30 extern const struct wl_interface wl_pointer_interface; | 30 extern const struct wl_interface wl_touch_interface; |
| 31 extern const struct wl_interface zcr_pointer_stylus_v1_interface; | 31 extern const struct wl_interface zcr_touch_stylus_v2_interface; |
| 32 | 32 |
| 33 static const struct wl_interface *types[] = { | 33 static const struct wl_interface *types[] = { |
| 34 NULL, | 34 NULL, |
| 35 NULL, | 35 NULL, |
| 36 NULL, | 36 NULL, |
| 37 » &zcr_pointer_stylus_v1_interface, | 37 » NULL, |
| 38 » &wl_pointer_interface, | 38 » &zcr_touch_stylus_v2_interface, |
| 39 » &wl_touch_interface, |
| 39 }; | 40 }; |
| 40 | 41 |
| 41 static const struct wl_message zcr_stylus_v1_requests[] = { | 42 static const struct wl_message zcr_stylus_v2_requests[] = { |
| 42 » { "get_pointer_stylus", "no", types + 3 }, | 43 » { "get_touch_stylus", "no", types + 4 }, |
| 43 }; | 44 }; |
| 44 | 45 |
| 45 WL_EXPORT const struct wl_interface zcr_stylus_v1_interface = { | 46 WL_EXPORT const struct wl_interface zcr_stylus_v2_interface = { |
| 46 » "zcr_stylus_v1", 2, | 47 » "zcr_stylus_v2", 1, |
| 47 » 1, zcr_stylus_v1_requests, | 48 » 1, zcr_stylus_v2_requests, |
| 48 0, NULL, | 49 0, NULL, |
| 49 }; | 50 }; |
| 50 | 51 |
| 51 static const struct wl_message zcr_pointer_stylus_v1_requests[] = { | 52 static const struct wl_message zcr_touch_stylus_v2_requests[] = { |
| 52 { "destroy", "", types + 0 }, | 53 { "destroy", "", types + 0 }, |
| 53 }; | 54 }; |
| 54 | 55 |
| 55 static const struct wl_message zcr_pointer_stylus_v1_events[] = { | 56 static const struct wl_message zcr_touch_stylus_v2_events[] = { |
| 56 » { "tool_change", "u", types + 0 }, | 57 » { "tool", "uu", types + 0 }, |
| 57 » { "force", "uf", types + 0 }, | 58 » { "force", "uuf", types + 0 }, |
| 58 » { "tilt", "uff", types + 0 }, | 59 » { "tilt", "uuff", types + 0 }, |
| 59 }; | 60 }; |
| 60 | 61 |
| 61 WL_EXPORT const struct wl_interface zcr_pointer_stylus_v1_interface = { | 62 WL_EXPORT const struct wl_interface zcr_touch_stylus_v2_interface = { |
| 62 » "zcr_pointer_stylus_v1", 1, | 63 » "zcr_touch_stylus_v2", 1, |
| 63 » 1, zcr_pointer_stylus_v1_requests, | 64 » 1, zcr_touch_stylus_v2_requests, |
| 64 » 3, zcr_pointer_stylus_v1_events, | 65 » 3, zcr_touch_stylus_v2_events, |
| 65 }; | 66 }; |
| 66 | 67 |
| OLD | NEW |