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

s/focused_view()/desktop_focused_view()

Browse source
This commit is contained in:
Johan Malm 2021-09-20 22:12:34 +01:00
parent e4b51fc5e8
commit 119ef87373
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/labwc.h
View file

@ -337,7 +337,7 @@ void desktop_focus_view(struct seat *seat, struct view *view);
* Note: If !current, the server->views second focusable view is returned * Note: If !current, the server->views second focusable view is returned
*/ */
struct view *desktop_cycle_view(struct server *server, struct view *current); struct view *desktop_cycle_view(struct server *server, struct view *current);
struct view *focused_view(struct server *server); struct view *desktop_focused_view(struct server *server);
void desktop_focus_topmost_mapped_view(struct server *server); void desktop_focus_topmost_mapped_view(struct server *server);
bool isfocusable(struct view *view); bool isfocusable(struct view *view);

12
src/action.c
View file

@ -24,7 +24,7 @@ action(struct server *server, const char *action, const char *command)
if (!action) if (!action)
return; return;
if (!strcasecmp(action, "Close")) { if (!strcasecmp(action, "Close")) {
struct view *view = focused_view(server); struct view *view = desktop_focused_view(server);
if (view) { if (view) {
view->impl->close(view); view->impl->close(view);
} }
@ -40,7 +40,7 @@ action(struct server *server, const char *action, const char *command)
} else if (!strcasecmp(action, "Exit")) { } else if (!strcasecmp(action, "Exit")) {
wl_display_terminate(server->wl_display); wl_display_terminate(server->wl_display);
} else if (!strcasecmp(action, "MoveToEdge")) { } else if (!strcasecmp(action, "MoveToEdge")) {
view_move_to_edge(focused_view(server), command); view_move_to_edge(desktop_focused_view(server), command);
} else if (!strcasecmp(action, "NextWindow")) { } else if (!strcasecmp(action, "NextWindow")) {
server->cycle_view = server->cycle_view =
desktop_cycle_view(server, server->cycle_view); desktop_cycle_view(server, server->cycle_view);
@ -50,22 +50,22 @@ action(struct server *server, const char *action, const char *command)
} else if (!strcasecmp(action, "ShowMenu")) { } else if (!strcasecmp(action, "ShowMenu")) {
show_menu(server, command); show_menu(server, command);
} else if (!strcasecmp(action, "ToggleMaximize")) { } else if (!strcasecmp(action, "ToggleMaximize")) {
struct view *view = focused_view(server); struct view *view = desktop_focused_view(server);
if (view) { if (view) {
view_toggle_maximize(view); view_toggle_maximize(view);
} }
} else if (!strcasecmp(action, "ToggleFullscreen")) { } else if (!strcasecmp(action, "ToggleFullscreen")) {
struct view *view = focused_view(server); struct view *view = desktop_focused_view(server);
if (view) { if (view) {
view_toggle_fullscreen(view); view_toggle_fullscreen(view);
} }
} else if (!strcasecmp(action, "ToggleDecorations")) { } else if (!strcasecmp(action, "ToggleDecorations")) {
struct view *view = focused_view(server); struct view *view = desktop_focused_view(server);
if (view) { if (view) {
view_toggle_decorations(view); view_toggle_decorations(view);
} }
} else if (!strcasecmp(action, "Iconify")) { } else if (!strcasecmp(action, "Iconify")) {
struct view *view = focused_view(server); struct view *view = desktop_focused_view(server);
if (view) { if (view) {
view_minimize(view, true); view_minimize(view, true);
} }

2
src/desktop.c
View file

@ -213,7 +213,7 @@ topmost_mapped_view(struct server *server)
} }
struct view * struct view *
focused_view(struct server *server) desktop_focused_view(struct server *server)
{ {
struct seat *seat = &server->seat; struct seat *seat = &server->seat;
struct wlr_surface *focused_surface; struct wlr_surface *focused_surface;