Zynh0722/dwl
1
0
Fork 0
forked from mirror/dwl
Code Pull requests Activity

dwl: use a dedicated layer for input popups

Browse source 
Otherwise we seem to have conflicts with other floating clients.
This commit is contained in:
Silvan Jegen 2022-06-12 14:50:47 +02:00
parent f342b7d412
commit 5493e0bbf2
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dwl.c
View file

@ -71,7 +71,7 @@
/* enums */ /* enums */
enum { CurNormal, CurMove, CurResize }; /* cursor */ enum { CurNormal, CurMove, CurResize }; /* cursor */
enum { XDGShell, LayerShell, X11Managed, X11Unmanaged }; /* client types */ enum { XDGShell, LayerShell, X11Managed, X11Unmanaged }; /* client types */
enum { LyrBg, LyrBottom, LyrTop, LyrOverlay, LyrTile, LyrFloat, LyrNoFocus, NUM_LAYERS }; /* scene layers */ enum { LyrBg, LyrBottom, LyrTop, LyrOverlay, LyrTile, LyrFloat, LyrNoFocus, LyrInputPopup, NUM_LAYERS }; /* scene layers */
#ifdef XWAYLAND #ifdef XWAYLAND
enum { NetWMWindowTypeDialog, NetWMWindowTypeSplash, NetWMWindowTypeToolbar, enum { NetWMWindowTypeDialog, NetWMWindowTypeSplash, NetWMWindowTypeToolbar,
NetWMWindowTypeUtility, NetLast }; /* EWMH atoms */ NetWMWindowTypeUtility, NetLast }; /* EWMH atoms */
@ -2432,7 +2432,7 @@ static void handle_im_popup_map(struct wl_listener *listener, void *data) {
struct dwl_input_popup *popup = struct dwl_input_popup *popup =
wl_container_of(listener, popup, popup_map); wl_container_of(listener, popup, popup_map);
popup->scene = &wlr_scene_tree_create(layers[LyrFloat])->node; popup->scene = &wlr_scene_tree_create(layers[LyrInputPopup])->node;
popup->scene_surface = wlr_scene_subsurface_tree_create(popup->scene, popup->scene_surface = wlr_scene_subsurface_tree_create(popup->scene,
popup->popup_surface->surface); popup->popup_surface->surface);
popup->scene_surface->data = popup; popup->scene_surface->data = popup;
@ -2648,6 +2648,7 @@ setup(void)
layers[LyrTop] = &wlr_scene_tree_create(&scene->node)->node; layers[LyrTop] = &wlr_scene_tree_create(&scene->node)->node;
layers[LyrOverlay] = &wlr_scene_tree_create(&scene->node)->node; layers[LyrOverlay] = &wlr_scene_tree_create(&scene->node)->node;
layers[LyrNoFocus] = &wlr_scene_tree_create(&scene->node)->node; layers[LyrNoFocus] = &wlr_scene_tree_create(&scene->node)->node;
layers[LyrInputPopup] = &wlr_scene_tree_create(&scene->node)->node;
/* Create a renderer with the default implementation */ /* Create a renderer with the default implementation */
if (!(drw = wlr_renderer_autocreate(backend))) if (!(drw = wlr_renderer_autocreate(backend)))
@ -3070,7 +3071,8 @@ xytonode(double x, double y, struct wlr_surface **psurface,
Client *c = NULL; Client *c = NULL;
LayerSurface *l = NULL; LayerSurface *l = NULL;
const int *layer; const int *layer;
int focus_order[] = { LyrOverlay, LyrTop, LyrFloat, LyrTile, LyrBottom, LyrBg }; int focus_order[] = { LyrOverlay, LyrTop, LyrFloat, LyrInputPopup, LyrTile,
LyrBottom, LyrBg };
for (layer = focus_order; layer < END(focus_order); layer++) { for (layer = focus_order; layer < END(focus_order); layer++) {
if ((node = wlr_scene_node_at(layers[*layer], x, y, nx, ny))) { if ((node = wlr_scene_node_at(layers[*layer], x, y, nx, ny))) {