mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-28 01:40:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

session-lock: allow client to update cursor shape

Browse source
This commit is contained in:
tokyo4j 2024-05-30 00:53:52 +09:00 • committed by Hiroaki Yamamoto
parent 9e5ea88c70
commit d00711bc45
3 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/node.h
View file

@ -15,6 +15,7 @@ enum node_descriptor_type {
LAB_NODE_DESC_XDG_POPUP, LAB_NODE_DESC_XDG_POPUP,
LAB_NODE_DESC_LAYER_SURFACE, LAB_NODE_DESC_LAYER_SURFACE,
LAB_NODE_DESC_LAYER_POPUP, LAB_NODE_DESC_LAYER_POPUP,
LAB_NODE_DESC_SESSION_LOCK_SURFACE,
LAB_NODE_DESC_IME_POPUP, LAB_NODE_DESC_IME_POPUP,
LAB_NODE_DESC_MENUITEM, LAB_NODE_DESC_MENUITEM,
LAB_NODE_DESC_TREE, LAB_NODE_DESC_TREE,

1
src/desktop.c
View file

@ -336,6 +336,7 @@ get_cursor_context(struct server *server)
ret.type = LAB_SSD_CLIENT; ret.type = LAB_SSD_CLIENT;
ret.surface = get_surface_from_layer_node(node); ret.surface = get_surface_from_layer_node(node);
return ret; return ret;
case LAB_NODE_DESC_SESSION_LOCK_SURFACE: /* fallthrough */
case LAB_NODE_DESC_IME_POPUP: case LAB_NODE_DESC_IME_POPUP:
ret.type = LAB_SSD_CLIENT; ret.type = LAB_SSD_CLIENT;
ret.surface = lab_wlr_surface_from_node(ret.node); ret.surface = lab_wlr_surface_from_node(ret.node);

29
src/session-lock.c
View file

@ -3,6 +3,7 @@
#include <assert.h> #include <assert.h>
#include "common/mem.h" #include "common/mem.h"
#include "labwc.h" #include "labwc.h"
#include "node.h"
struct session_lock_output { struct session_lock_output {
struct wlr_scene_tree *tree; struct wlr_scene_tree *tree;
@ -48,14 +49,30 @@ refocus_output(struct session_lock_output *output)
focus_surface(output->manager, NULL); focus_surface(output->manager, NULL);
} }
static void
update_focus(void *data)
{
struct session_lock_output *output = data;
cursor_update_focus(output->manager->server);
if (!output->manager->focused) {
focus_surface(output->manager, output->surface->surface);
}
}
static void static void
handle_surface_map(struct wl_listener *listener, void *data) handle_surface_map(struct wl_listener *listener, void *data)
{ {
struct session_lock_output *output = struct session_lock_output *output =
wl_container_of(listener, output, surface_map); wl_container_of(listener, output, surface_map);
if (!output->manager->focused) { /*
focus_surface(output->manager, output->surface->surface); * In order to update cursor shape on map, the call to
} * cursor_update_focus() should be delayed because only the
* role-specific surface commit/map handler has been processed in
* wlroots at this moment and get_cursor_context() returns NULL as a
* buffer has not been actually attached to the surface.
*/
wl_event_loop_add_idle(
output->manager->server->wl_event_loop, update_focus, output);
} }
static void static void
@ -103,7 +120,10 @@ handle_new_surface(struct wl_listener *listener, void *data)
found_lock_output: found_lock_output:
lock_output->surface = lock_surface; lock_output->surface = lock_surface;
wlr_scene_subsurface_tree_create(lock_output->tree, lock_surface->surface); struct wlr_scene_tree *surface_tree =
wlr_scene_subsurface_tree_create(lock_output->tree, lock_surface->surface);
node_descriptor_create(&surface_tree->node,
LAB_NODE_DESC_SESSION_LOCK_SURFACE, NULL);
lock_output->surface_destroy.notify = handle_surface_destroy; lock_output->surface_destroy.notify = handle_surface_destroy;
wl_signal_add(&lock_surface->events.destroy, &lock_output->surface_destroy); wl_signal_add(&lock_surface->events.destroy, &lock_output->surface_destroy);
@ -247,6 +267,7 @@ handle_lock_unlock(struct wl_listener *listener, void *data)
session_lock_destroy(manager); session_lock_destroy(manager);
manager->locked = false; manager->locked = false;
desktop_focus_topmost_view(manager->server); desktop_focus_topmost_view(manager->server);
cursor_update_focus(manager->server);
} }
static void static void