mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-05-03 06:47:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

desktop: implement delayed auto-raise timer logic

Browse source 
When raiseOnFocus is enabled and raiseOnFocusDelay is > 0, defer
view_move_to_front() until a wl_event_loop timer elapses instead of
raising immediately. The pending view/timer pair lives on struct
server so that at most one raise can be pending per compositor.

Semantics:
  delay_ms == 0            : immediate raise (preserves prior behavior)
  delay_ms >  0, hover A   : schedule raise of A after delay_ms
  another hover before     : timer is reset and the new view becomes
    expiry                   the pending one (brief flyby hovers do
                             not stack up raises)
  focus change, raise=false: pending raise is cancelled

This is most useful with followMouse to avoid brief passes of the
cursor stacking up z-order changes.
This commit is contained in:
Jos Dehaes 2026-04-15 14:36:14 +02:00 • committed by Johan Malm
parent fe6ea66b82
commit 28908adfbe
1 changed files with 51 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/desktop.c
View file

@ -9,6 +9,7 @@
#include <wlr/types/wlr_subcompositor.h>
#include <wlr/types/wlr_xdg_shell.h>
#include "common/scene-helpers.h"
#include "config/rcxml.h"
#include "dnd.h"
#include "labwc.h"
#include "layers.h"
@ -65,6 +66,49 @@ set_or_offer_focus(struct view *view)
}
}
static int
handle_auto_raise_timer(void *data)
{
(void)data;
struct view *view = server.pending_auto_raise_view;
server.pending_auto_raise_view = NULL;
if (view && view->mapped) {
view_move_to_front(view);
}
return 0; /* ignored per wl_event_loop docs */
}
void
desktop_cancel_pending_auto_raise(void)
{
server.pending_auto_raise_view = NULL;
if (server.pending_auto_raise_timer) {
/* Disarm by setting to 0 ms */
wl_event_source_timer_update(server.pending_auto_raise_timer, 0);
}
}
static void
schedule_auto_raise(struct view *view)
{
if (rc.raise_on_focus_delay_ms == 0) {
/* Immediate raise — preserves original behavior */
desktop_cancel_pending_auto_raise();
view_move_to_front(view);
return;
}
server.pending_auto_raise_view = view;
if (!server.pending_auto_raise_timer) {
server.pending_auto_raise_timer =
wl_event_loop_add_timer(server.wl_event_loop,
handle_auto_raise_timer, NULL);
}
wl_event_source_timer_update(server.pending_auto_raise_timer,
rc.raise_on_focus_delay_ms);
}
void
desktop_focus_view(struct view *view, bool raise)
{
@ -104,7 +148,13 @@ desktop_focus_view(struct view *view, bool raise)
}
if (raise) {
view_move_to_front(view);
schedule_auto_raise(view);
} else {
/*
* A new focus change without a raise supersedes any
* pending auto-raise from a previous focus event.
*/
desktop_cancel_pending_auto_raise();
}
/*