Skip to content

Commit

Permalink
sokol_app.h: Add pointer-lock support
Browse files Browse the repository at this point in the history 
- Amend wayland-specific state with appropriate data,
- amend cleanup routine,
- include new temporary header externally,
- bind to the pointer constraint interface,
- create a locked-pointer when requesting the mouse-lock, add the
  appropriate listener, as well as implement their callbacks,
- destroy the locked-pointer when requesting the mouse to unlock.
  • Loading branch information
@fleischie
fleischie committed Dec 2, 2020
1 parent 2554e20 commit b5ee8a6
Showing 1 changed file with 36 additions and 7 deletions.
43 changes: 36 additions & 7 deletions sokol_app.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
windowed | YES | YES | YES² | --- | --- | YES | TODO | YES
fullscreen | YES | YES | YES | YES | YES | YES | TODO | ---
mouse hide | YES | YES | YES | --- | --- | YES | TODO | TODO
mouse lock | YES | YES | YES² | --- | --- | TODO | TODO | YES
mouse lock | YES | YES | YES | --- | --- | TODO | TODO | YES
screen keyboard | --- | --- | --- | YES | TODO | TODO | --- | YES
swap interval | YES | YES | YES² | YES | TODO | --- | TODO | YES
high-dpi | YES | YES | TODO | YES | YES | YES | TODO | YES
Expand Down Expand Up @@ -1564,6 +1564,9 @@ inline int sapp_run(const sapp_desc& desc) { return sapp_run(&desc); }
#if defined(SOKOL_WAYLAND_XDG_SHELL_HEADER_PATH)
#include SOKOL_WAYLAND_XDG_SHELL_HEADER_PATH
#endif /* SOKOL_WAYLAND_XDG_SHELL_HEADER_PATH */
#if defined(SOKOL_WAYLAND_POINTER_CONSTRAINTS_HEADER_PATH)
#include SOKOL_WAYLAND_POINTER_CONSTRAINTS_HEADER_PATH
#endif /* SOKOL_WAYLAND_POINTER_CONSTRAINTS_HEADER_PATH */
#if defined(SOKOL_WAYLAND_RELATIVE_POINTER_HEADER_PATH)
#include SOKOL_WAYLAND_RELATIVE_POINTER_HEADER_PATH
#endif /*SOKOL_WAYLAND_RELATIVE_POINTER_HEADER_PATH*/
Expand Down Expand Up @@ -1954,6 +1957,8 @@ typedef struct {
/* pointer/cursor related data */
struct wl_cursor *cursor;
struct wl_surface *cursor_surface;
struct zwp_locked_pointer_v1 *locked_pointer;
struct zwp_pointer_constraints_v1 *pointer_constraints;
struct zwp_relative_pointer_manager_v1 *relative_pointer_manager;
struct zwp_relative_pointer_v1 *relative_pointer;
uint32_t serial;
Expand Down Expand Up @@ -10430,6 +10435,8 @@ _SOKOL_PRIVATE void _sapp_wl_cleanup(void) {
if (NULL != _sapp.wl.registry) wl_registry_destroy(_sapp.wl.registry);
if (NULL != _sapp.wl.event_queue) wl_event_queue_destroy(_sapp.wl.event_queue);
if (NULL != _sapp.wl.touch) wl_touch_destroy(_sapp.wl.touch);
if (NULL != _sapp.wl.locked_pointer) zwp_locked_pointer_v1_destroy(_sapp.wl.locked_pointer);
if (NULL != _sapp.wl.pointer_constraints) zwp_pointer_constraints_v1_destroy(_sapp.wl.pointer_constraints);
if (NULL != _sapp.wl.relative_pointer) zwp_relative_pointer_v1_destroy(_sapp.wl.relative_pointer);
if (NULL != _sapp.wl.relative_pointer_manager) zwp_relative_pointer_manager_v1_destroy(_sapp.wl.relative_pointer_manager);
if (NULL != _sapp.wl.pointer) wl_pointer_destroy(_sapp.wl.pointer);
Expand All @@ -10455,19 +10462,39 @@ _SOKOL_PRIVATE void _sapp_wl_show_mouse(bool show, uint32_t serial) {
}
}

_SOKOL_PRIVATE void _sapp_wl_locked_pointer_locked(void* data, struct zwp_locked_pointer_v1* locked_pointer) {
_SOKOL_UNUSED(data);
_SOKOL_UNUSED(locked_pointer);
}

_SOKOL_PRIVATE void _sapp_wl_locked_pointer_unlocked(void* data, struct zwp_locked_pointer_v1* locked_pointer) {
_SOKOL_UNUSED(data);
_SOKOL_UNUSED(locked_pointer);
if (NULL != _sapp.wl.locked_pointer) {
zwp_locked_pointer_v1_destroy(_sapp.wl.locked_pointer);
_sapp.wl.locked_pointer = NULL;
}
}

_SOKOL_PRIVATE const struct zwp_locked_pointer_v1_listener _sapp_wl_locked_pointer_listener = {
.locked = _sapp_wl_locked_pointer_locked,
.unlocked = _sapp_wl_locked_pointer_unlocked,
};

_SOKOL_PRIVATE void _sapp_wl_lock_mouse(bool lock) {
if (lock == _sapp.mouse.locked) {
return;
}
_sapp.mouse.dx = 0.0f;
_sapp.mouse.dy = 0.0f;
_sapp.mouse.locked = lock;
if (_sapp.mouse.locked) {
/* WL-TODO: hide/lock cursor
* - use pointer-constaints protocol extension */
} else {
/* WL-TODO: show/unlock cursor
* - use pointer-constaints protocol extension */
if (NULL != _sapp.wl.pointer && NULL != _sapp.wl.pointer_constraints) {
if (_sapp.mouse.locked) {
_sapp.wl.locked_pointer = zwp_pointer_constraints_v1_lock_pointer(_sapp.wl.pointer_constraints, _sapp.wl.surface, _sapp.wl.pointer, NULL, ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_ONESHOT);
zwp_locked_pointer_v1_add_listener(_sapp.wl.locked_pointer, &_sapp_wl_locked_pointer_listener, NULL);
} else {
_sapp_wl_locked_pointer_unlocked(NULL, NULL);
}
}
}

Expand Down Expand Up @@ -11079,6 +11106,8 @@ _SOKOL_PRIVATE void _sapp_wl_registry_handle_global(void* data, struct wl_regist
_sapp.wl.shm = wl_registry_bind(registry, name, &wl_shm_interface, 1);
} else if (0 == strcmp(interface, zwp_relative_pointer_manager_v1_interface.name)) {
_sapp.wl.relative_pointer_manager = wl_registry_bind(registry, name, &zwp_relative_pointer_manager_v1_interface, 1);
} else if (0 == strcmp(interface, zwp_pointer_constraints_v1_interface.name)) {
_sapp.wl.pointer_constraints = wl_registry_bind(registry, name, &zwp_pointer_constraints_v1_interface, 1);
}
}

Expand Down

0 comments on commit b5ee8a6

Please sign in to comment.