mirror of
https://github.com/labwc/labwc.git
synced 2026-02-17 22:05:30 -05:00
osd: make osd_update() private
This commit is contained in:
parent
140e913c44
commit
2be149064e
2 changed files with 7 additions and 8 deletions
|
|
@ -44,9 +44,6 @@ void osd_begin(struct server *server, enum lab_cycle_dir direction);
|
||||||
/* Cycle the selected view in the window switcher */
|
/* Cycle the selected view in the window switcher */
|
||||||
void osd_cycle(struct server *server, enum lab_cycle_dir direction);
|
void osd_cycle(struct server *server, enum lab_cycle_dir direction);
|
||||||
|
|
||||||
/* Updates onscreen display 'alt-tab' buffer */
|
|
||||||
void osd_update(struct server *server);
|
|
||||||
|
|
||||||
/* Closes the OSD */
|
/* Closes the OSD */
|
||||||
void osd_finish(struct server *server);
|
void osd_finish(struct server *server);
|
||||||
|
|
||||||
|
|
|
||||||
12
src/osd.c
12
src/osd.c
|
|
@ -21,6 +21,8 @@
|
||||||
#include "window-rules.h"
|
#include "window-rules.h"
|
||||||
#include "workspaces.h"
|
#include "workspaces.h"
|
||||||
|
|
||||||
|
static void update_osd(struct server *server);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
destroy_osd_nodes(struct output *output)
|
destroy_osd_nodes(struct output *output)
|
||||||
{
|
{
|
||||||
|
|
@ -119,7 +121,7 @@ osd_on_view_destroy(struct view *view)
|
||||||
|
|
||||||
if (osd_state->cycle_view) {
|
if (osd_state->cycle_view) {
|
||||||
/* Update the OSD to reflect the view has now gone. */
|
/* Update the OSD to reflect the view has now gone. */
|
||||||
osd_update(view->server);
|
update_osd(view->server);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (view->scene_tree) {
|
if (view->scene_tree) {
|
||||||
|
|
@ -172,7 +174,7 @@ osd_begin(struct server *server, enum lab_cycle_dir direction)
|
||||||
|
|
||||||
seat_focus_override_begin(&server->seat,
|
seat_focus_override_begin(&server->seat,
|
||||||
LAB_INPUT_STATE_WINDOW_SWITCHER, LAB_CURSOR_DEFAULT);
|
LAB_INPUT_STATE_WINDOW_SWITCHER, LAB_CURSOR_DEFAULT);
|
||||||
osd_update(server);
|
update_osd(server);
|
||||||
|
|
||||||
/* Update cursor, in case it is within the area covered by OSD */
|
/* Update cursor, in case it is within the area covered by OSD */
|
||||||
cursor_update_focus(server);
|
cursor_update_focus(server);
|
||||||
|
|
@ -185,7 +187,7 @@ osd_cycle(struct server *server, enum lab_cycle_dir direction)
|
||||||
|
|
||||||
server->osd_state.cycle_view = get_next_cycle_view(server,
|
server->osd_state.cycle_view = get_next_cycle_view(server,
|
||||||
server->osd_state.cycle_view, direction);
|
server->osd_state.cycle_view, direction);
|
||||||
osd_update(server);
|
update_osd(server);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
@ -430,8 +432,8 @@ display_osd(struct output *output, struct wl_array *views)
|
||||||
wlr_scene_node_set_enabled(&output->osd_tree->node, true);
|
wlr_scene_node_set_enabled(&output->osd_tree->node, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
osd_update(struct server *server)
|
update_osd(struct server *server)
|
||||||
{
|
{
|
||||||
struct wl_array views;
|
struct wl_array views;
|
||||||
wl_array_init(&views);
|
wl_array_init(&views);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue