diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-04-03 15:58:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-03 15:58:47 -0400 |
| commit | 2ecce27dd55f66121fc2bca425f45e851bf1ec4c (patch) | |
| tree | 97ba6de65f200d24bacf49a2eaf7a30572896a84 /include/wlr | |
| parent | 1e39c37b3c78ea370e9fd870b63da194fc60d8fc (diff) | |
| parent | 56deff41b6c2c6190894068994ba403978068bad (diff) | |
Merge pull request #807 from swaywm/input-inhibit
Input inhibit
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/backend.h | 2 | ||||
| -rw-r--r-- | include/wlr/types/wlr_input_inhibitor.h | 25 | ||||
| -rw-r--r-- | include/wlr/types/wlr_seat.h | 3 |
3 files changed, 27 insertions, 3 deletions
diff --git a/include/wlr/backend.h b/include/wlr/backend.h index e3b14add..f5482e04 100644 --- a/include/wlr/backend.h +++ b/include/wlr/backend.h @@ -46,6 +46,4 @@ struct wlr_egl *wlr_backend_get_egl(struct wlr_backend *backend); */ struct wlr_renderer *wlr_backend_get_renderer(struct wlr_backend *backend); -uint32_t usec_to_msec(uint64_t usec); - #endif diff --git a/include/wlr/types/wlr_input_inhibitor.h b/include/wlr/types/wlr_input_inhibitor.h new file mode 100644 index 00000000..4416c18f --- /dev/null +++ b/include/wlr/types/wlr_input_inhibitor.h @@ -0,0 +1,25 @@ +#ifndef WLR_TYPES_INPUT_INHIBITOR_H +#define WLR_TYPES_INPUT_INHIBITOR_H +#include <wayland-server.h> + +struct wlr_input_inhibit_manager { + struct wl_global *wl_global; + struct wl_client *active_client; + struct wl_resource *active_inhibitor; + + struct wl_listener display_destroy; + + struct { + struct wl_signal activate; // struct wlr_input_inhibit_manager * + struct wl_signal deactivate; // struct wlr_input_inhibit_manager * + } events; + + void *data; +}; + +struct wlr_input_inhibit_manager *wlr_input_inhibit_manager_create( + struct wl_display *display); +void wlr_input_inhibit_manager_destroy( + struct wlr_input_inhibit_manager *manager); + +#endif diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h index 124c1cb8..4c7e34b9 100644 --- a/include/wlr/types/wlr_seat.h +++ b/include/wlr/types/wlr_seat.h @@ -530,6 +530,7 @@ bool wlr_seat_touch_has_grab(struct wlr_seat *seat); */ bool wlr_seat_validate_grab_serial(struct wlr_seat *seat, uint32_t serial); -struct wlr_seat_client *wlr_seat_client_from_resource(struct wl_resource *resource); +struct wlr_seat_client *wlr_seat_client_from_resource( + struct wl_resource *resource); #endif |