mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-02 09:01:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

view: Add view_move_to_front/back().

Browse source 
This avoids calling view->impl functions from cursor.c and desktop.c.

v2: Add an explicit recursion guard in cursor_update_focus().
This commit is contained in:
John Lindgren 2023-04-01 14:06:52 -04:00 • committed by Consolatis
parent 12f3314595
commit d7dd366bad
11 changed files with 52 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/cursor.c
View file

@ -481,7 +481,7 @@ process_cursor_motion(struct server *server, uint32_t time)
if (ctx.view && rc.focus_follow_mouse) {
desktop_focus_and_activate_view(seat, ctx.view);
if (rc.raise_on_focus) {
desktop_move_to_front(ctx.view);
view_move_to_front(ctx.view);
}
}
@ -510,8 +510,8 @@ msec(const struct timespec *t)
return t->tv_sec * 1000 + t->tv_nsec / 1000000;
}
void
cursor_update_focus(struct server *server)
static void
_cursor_update_focus(struct server *server)
{
struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now);
@ -523,12 +523,7 @@ cursor_update_focus(struct server *server)
/* Prevent changing keyboard focus during A-Tab */
desktop_focus_and_activate_view(&server->seat, ctx.view);
if (rc.raise_on_focus) {
/*
* Call view method directly as desktop_move_to_front()
* contains a call to cursor_update_focus() and thus
* loops inifinitely
*/
ctx.view->impl->move_to_front(ctx.view);
view_move_to_front(ctx.view);
}
}
@ -536,6 +531,18 @@ cursor_update_focus(struct server *server)
/*cursor_has_moved*/ false);
}
void
cursor_update_focus(struct server *server)
{
/* Prevent recursion via view_move_to_front() */
static bool updating_focus = false;
if (!updating_focus) {
updating_focus = true;
_cursor_update_focus(server);
updating_focus = false;
}
}
static void
handle_constraint_commit(struct wl_listener *listener, void *data)
{