| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright © 2013-2014 Collabora, Ltd. | 2 * Copyright 2016 The Chromium Authors. |
| 3 * | 3 * |
| 4 * Permission is hereby granted, free of charge, to any person obtaining a | 4 * Permission is hereby granted, free of charge, to any person obtaining a |
| 5 * copy of this software and associated documentation files (the "Software"), | 5 * copy of this software and associated documentation files (the "Software"), |
| 6 * to deal in the Software without restriction, including without limitation | 6 * to deal in the Software without restriction, including without limitation |
| 7 * the rights to use, copy, modify, merge, publish, distribute, sublicense, | 7 * the rights to use, copy, modify, merge, publish, distribute, sublicense, |
| 8 * and/or sell copies of the Software, and to permit persons to whom the | 8 * and/or sell copies of the Software, and to permit persons to whom the |
| 9 * Software is furnished to do so, subject to the following conditions: | 9 * Software is furnished to do so, subject to the following conditions: |
| 10 * | 10 * |
| 11 * The above copyright notice and this permission notice (including the next | 11 * The above copyright notice and this permission notice (including the next |
| 12 * paragraph) shall be included in all copies or substantial portions of the | 12 * paragraph) shall be included in all copies or substantial portions of the |
| 13 * Software. | 13 * Software. |
| 14 * | 14 * |
| 15 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | 15 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| 16 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | 16 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| 17 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | 17 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
| 18 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | 18 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| 19 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | 19 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
| 20 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 20 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
| 21 * DEALINGS IN THE SOFTWARE. | 21 * DEALINGS IN THE SOFTWARE. |
| 22 */ | 22 */ |
| 23 | 23 |
| 24 #include <stdlib.h> | 24 #include <stdlib.h> |
| 25 #include <stdint.h> | 25 #include <stdint.h> |
| 26 #include "wayland-util.h" | 26 #include "wayland-util.h" |
| 27 | 27 |
| 28 extern const struct wl_interface wl_surface_interface; | 28 extern const struct wl_interface wl_surface_interface; |
| 29 extern const struct wl_interface wl_viewport_interface; | 29 extern const struct wl_interface zwp_security_v1_interface; |
| 30 | 30 |
| 31 static const struct wl_interface *types[] = { | 31 static const struct wl_interface *types[] = { |
| 32 » NULL, | 32 » &zwp_security_v1_interface, |
| 33 » NULL, | |
| 34 » NULL, | |
| 35 » NULL, | |
| 36 » NULL, | |
| 37 » NULL, | |
| 38 » &wl_viewport_interface, | |
| 39 &wl_surface_interface, | 33 &wl_surface_interface, |
| 40 }; | 34 }; |
| 41 | 35 |
| 42 static const struct wl_message wl_scaler_requests[] = { | 36 static const struct wl_message zwp_secure_output_v1_requests[] = { |
| 43 { "destroy", "", types + 0 }, | 37 { "destroy", "", types + 0 }, |
| 44 » { "get_viewport", "no", types + 6 }, | 38 » { "get_security", "no", types + 0 }, |
| 45 }; | 39 }; |
| 46 | 40 |
| 47 WL_EXPORT const struct wl_interface wl_scaler_interface = { | 41 WL_EXPORT const struct wl_interface zwp_secure_output_v1_interface = { |
| 48 » "wl_scaler", 2, | 42 » "zwp_secure_output_v1", 1, |
| 49 » 2, wl_scaler_requests, | 43 » 2, zwp_secure_output_v1_requests, |
| 50 0, NULL, | 44 0, NULL, |
| 51 }; | 45 }; |
| 52 | 46 |
| 53 static const struct wl_message wl_viewport_requests[] = { | 47 static const struct wl_message zwp_security_v1_requests[] = { |
| 54 { "destroy", "", types + 0 }, | 48 { "destroy", "", types + 0 }, |
| 55 » { "set", "ffffii", types + 0 }, | 49 » { "only_visible_on_secure_output", "", types + 0 }, |
| 56 » { "set_source", "2ffff", types + 0 }, | |
| 57 » { "set_destination", "2ii", types + 0 }, | |
| 58 }; | 50 }; |
| 59 | 51 |
| 60 WL_EXPORT const struct wl_interface wl_viewport_interface = { | 52 WL_EXPORT const struct wl_interface zwp_security_v1_interface = { |
| 61 » "wl_viewport", 2, | 53 » "zwp_security_v1", 1, |
| 62 » 4, wl_viewport_requests, | 54 » 2, zwp_security_v1_requests, |
| 63 0, NULL, | 55 0, NULL, |
| 64 }; | 56 }; |
| 65 | 57 |
| OLD | NEW |