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

view: try to reduce confusion in focused_view tracking

Browse source 
Our current approach to handling the focused/active view is a bit
confusing. In particular, it's hard to be sure when server->focused_view
is or isn't in sync with the real wlroots keyboard focus.

Try to clean things up a bit. In particular:

- Add comments to server->focused_view and desktop_focused_view() to
  clarify that they should match, but it's not guaranteed.

- desktop_focused_view() now prints a warning if it detects that
  server->focused_view is out of sync. We should keep an eye out for
  this warning, and if we see it, try to figure out why it happened.

- For consistency, use only "focus/defocus" as the verbs in function
  names rather than "activate". This is a bit arbitrary, but the idea is
  that focus is the primary action while the active/inactive state is a
  side effect.

- view_focus/defocus() replace view_set_activated() and now update both
  focus and active/inactive state, to try to keep them in sync.

- Add comments at view_focus/defocus() to warn against calling them
  directly (we should generally call the desktop.c functions).

- desktop_focus_view(NULL) is now forbidden and is no longer handled as
  a special case to clear the focus. This was (at least to me) a
  surprising behavior and caused trouble when working on another change.

- To maintain existing behavior, desktop_focus_topmost_mapped_view() now
  explicitly clears the focus if there are no mapped views.

There should be no behavioral change here.
This commit is contained in:
John Lindgren 2023-09-26 01:35:36 -04:00 • committed by Johan Malm
parent 003d1fd494
commit 3022985ba7
11 changed files with 100 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/labwc.h
View file

@ -246,6 +246,13 @@ struct server {
uint32_t resize_edges;
/* SSD state */
/*
* Currently focused view (cached value). This pointer is used
* primarily to track which view is being drawn with "active"
* SSD coloring. We consider it a bug if this gets out of sync
* with the actual keyboard focus (according to wlroots). See
* also desktop_focused_view().
*/
struct view *focused_view;
struct ssd_hover_state *ssd_hover_state;
@ -370,7 +377,7 @@ void foreign_toplevel_update_outputs(struct view *view);
* cannot assume this means that the window actually has keyboard
* or pointer focus, in this compositor are they called together.
*/
void desktop_focus_and_activate_view(struct seat *seat, struct view *view);
void desktop_focus_view(struct view *view);
void desktop_arrange_all_views(struct server *server);
void desktop_focus_output(struct output *output);
struct view *desktop_topmost_mapped_view(struct server *server);
@ -388,6 +395,13 @@ enum lab_cycle_dir {
*/
struct view *desktop_cycle_view(struct server *server, struct view *start_view,
enum lab_cycle_dir dir);
/**
* desktop_focused_view - return the view that is currently focused
* (determined on-the-fly from the wlroots keyboard focus). The return
* value should ideally match server->focused_view (we consider it a
* bug otherwise) but is guaranteed to be up-to-date even if
* server->focused_view gets out of sync.
*/
struct view *desktop_focused_view(struct server *server);
void desktop_focus_topmost_mapped_view(struct server *server);

3
include/view.h
View file

@ -257,7 +257,8 @@ bool view_isfocusable(struct view *view);
bool view_inhibits_keybinds(struct view *view);
void view_toggle_keybinds(struct view *view);
void view_set_activated(struct view *view);
void view_focus(struct view *view);
void view_defocus(struct view *view);
void view_set_output(struct view *view, struct output *output);
void view_close(struct view *view);