mirror of
https://github.com/labwc/labwc.git
synced 2026-02-22 01:40:25 -05:00
Use "cycle" instead of "osd" across the codebase
We were using the word "osd" to describe the window switcher, but it can be used with on-screen display (OSD) disabled by `<windowSwitcher><osd show="false">`. Let's use "cycle" instead to avoid confusion.
This commit is contained in:
tokyo4j
Hiroaki Yamamoto
parent
65cc2e40ba
commit
4fcb873f6f
21 changed files with 265 additions and 266 deletions
|
|
@ -17,32 +17,32 @@
|
|||
#include "theme.h"
|
||||
#include "view.h"
|
||||
|
||||
static void update_osd(struct server *server);
|
||||
static void update_cycle(struct server *server);
|
||||
|
||||
static void
|
||||
destroy_osd_scenes(struct server *server)
|
||||
{
|
||||
struct output *output;
|
||||
wl_list_for_each(output, &server->outputs, link) {
|
||||
struct osd_item *item, *tmp;
|
||||
wl_list_for_each_safe(item, tmp, &output->osd_scene.items, link) {
|
||||
struct cycle_osd_item *item, *tmp;
|
||||
wl_list_for_each_safe(item, tmp, &output->cycle_osd.items, link) {
|
||||
wl_list_remove(&item->link);
|
||||
free(item);
|
||||
}
|
||||
if (output->osd_scene.tree) {
|
||||
wlr_scene_node_destroy(&output->osd_scene.tree->node);
|
||||
output->osd_scene.tree = NULL;
|
||||
if (output->cycle_osd.tree) {
|
||||
wlr_scene_node_destroy(&output->cycle_osd.tree->node);
|
||||
output->cycle_osd.tree = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
osd_update_preview_outlines(struct view *view)
|
||||
update_preview_outlines(struct view *view)
|
||||
{
|
||||
/* Create / Update preview outline tree */
|
||||
struct server *server = view->server;
|
||||
struct theme *theme = server->theme;
|
||||
struct lab_scene_rect *rect = view->server->osd_state.preview_outline;
|
||||
struct lab_scene_rect *rect = view->server->cycle.preview_outline;
|
||||
if (!rect) {
|
||||
struct lab_scene_rect_options opts = {
|
||||
.border_colors = (float *[3]) {
|
||||
|
|
@ -55,7 +55,7 @@ osd_update_preview_outlines(struct view *view)
|
|||
};
|
||||
rect = lab_scene_rect_create(&server->scene->tree, &opts);
|
||||
wlr_scene_node_place_above(&rect->tree->node, &server->menu_tree->node);
|
||||
server->osd_state.preview_outline = rect;
|
||||
server->cycle.preview_outline = rect;
|
||||
}
|
||||
|
||||
struct wlr_box geo = ssd_max_extents(view);
|
||||
|
|
@ -68,7 +68,7 @@ osd_update_preview_outlines(struct view *view)
|
|||
* If !start_view, the second focusable view is returned.
|
||||
*/
|
||||
static struct view *
|
||||
get_next_cycle_view(struct server *server, struct view *start_view,
|
||||
get_next_selected_view(struct server *server, struct view *start_view,
|
||||
enum lab_cycle_dir dir)
|
||||
{
|
||||
struct view *(*iter)(struct wl_list *head, struct view *view,
|
||||
|
|
@ -96,127 +96,128 @@ get_next_cycle_view(struct server *server, struct view *start_view,
|
|||
}
|
||||
|
||||
void
|
||||
osd_on_view_destroy(struct view *view)
|
||||
cycle_on_view_destroy(struct view *view)
|
||||
{
|
||||
assert(view);
|
||||
struct osd_state *osd_state = &view->server->osd_state;
|
||||
struct server *server = view->server;
|
||||
struct cycle_state *cycle = &server->cycle;
|
||||
|
||||
if (view->server->input_mode != LAB_INPUT_STATE_WINDOW_SWITCHER) {
|
||||
if (server->input_mode != LAB_INPUT_STATE_CYCLE) {
|
||||
/* OSD not active, no need for clean up */
|
||||
return;
|
||||
}
|
||||
|
||||
if (osd_state->cycle_view == view) {
|
||||
if (cycle->selected_view == view) {
|
||||
/*
|
||||
* If we are the current OSD selected view, cycle
|
||||
* to the next because we are dying.
|
||||
*/
|
||||
|
||||
/* Also resets preview node */
|
||||
osd_state->cycle_view = get_next_cycle_view(view->server,
|
||||
osd_state->cycle_view, LAB_CYCLE_DIR_BACKWARD);
|
||||
cycle->selected_view = get_next_selected_view(server,
|
||||
cycle->selected_view, LAB_CYCLE_DIR_BACKWARD);
|
||||
|
||||
/*
|
||||
* If we cycled back to ourselves, then we have no more windows.
|
||||
* Just close the OSD for good.
|
||||
*/
|
||||
if (osd_state->cycle_view == view || !osd_state->cycle_view) {
|
||||
/* osd_finish() additionally resets cycle_view to NULL */
|
||||
osd_finish(view->server, /*switch_focus*/ false);
|
||||
if (cycle->selected_view == view
|
||||
|| !cycle->selected_view) {
|
||||
/* cycle_finish() additionally resets selected_view to NULL */
|
||||
cycle_finish(server, /*switch_focus*/ false);
|
||||
}
|
||||
}
|
||||
|
||||
if (osd_state->cycle_view) {
|
||||
if (cycle->selected_view) {
|
||||
/* Recreate the OSD to reflect the view has now gone. */
|
||||
destroy_osd_scenes(view->server);
|
||||
update_osd(view->server);
|
||||
destroy_osd_scenes(server);
|
||||
update_cycle(server);
|
||||
}
|
||||
|
||||
if (view->scene_tree) {
|
||||
struct wlr_scene_node *node = &view->scene_tree->node;
|
||||
if (osd_state->preview_anchor == node) {
|
||||
if (cycle->preview_anchor == node) {
|
||||
/*
|
||||
* If we are the anchor for the current OSD selected view,
|
||||
* replace the anchor with the node before us.
|
||||
*/
|
||||
osd_state->preview_anchor = lab_wlr_scene_get_prev_node(node);
|
||||
cycle->preview_anchor = lab_wlr_scene_get_prev_node(node);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
osd_on_cursor_release(struct server *server, struct wlr_scene_node *node)
|
||||
cycle_on_cursor_release(struct server *server, struct wlr_scene_node *node)
|
||||
{
|
||||
assert(server->input_mode == LAB_INPUT_STATE_WINDOW_SWITCHER);
|
||||
assert(server->input_mode == LAB_INPUT_STATE_CYCLE);
|
||||
|
||||
struct osd_item *item = node_osd_item_from_node(node);
|
||||
server->osd_state.cycle_view = item->view;
|
||||
osd_finish(server, /*switch_focus*/ true);
|
||||
struct cycle_osd_item *item = node_cycle_osd_item_from_node(node);
|
||||
server->cycle.selected_view = item->view;
|
||||
cycle_finish(server, /*switch_focus*/ true);
|
||||
}
|
||||
|
||||
static void
|
||||
restore_preview_node(struct server *server)
|
||||
{
|
||||
struct osd_state *osd_state = &server->osd_state;
|
||||
if (osd_state->preview_node) {
|
||||
wlr_scene_node_reparent(osd_state->preview_node,
|
||||
osd_state->preview_parent);
|
||||
if (server->cycle.preview_node) {
|
||||
wlr_scene_node_reparent(server->cycle.preview_node,
|
||||
server->cycle.preview_parent);
|
||||
|
||||
if (osd_state->preview_anchor) {
|
||||
wlr_scene_node_place_above(osd_state->preview_node,
|
||||
osd_state->preview_anchor);
|
||||
if (server->cycle.preview_anchor) {
|
||||
wlr_scene_node_place_above(server->cycle.preview_node,
|
||||
server->cycle.preview_anchor);
|
||||
} else {
|
||||
/* Selected view was the first node */
|
||||
wlr_scene_node_lower_to_bottom(osd_state->preview_node);
|
||||
wlr_scene_node_lower_to_bottom(server->cycle.preview_node);
|
||||
}
|
||||
|
||||
/* Node was disabled / minimized before, disable again */
|
||||
if (!osd_state->preview_was_enabled) {
|
||||
wlr_scene_node_set_enabled(osd_state->preview_node, false);
|
||||
if (!server->cycle.preview_was_enabled) {
|
||||
wlr_scene_node_set_enabled(server->cycle.preview_node, false);
|
||||
}
|
||||
if (osd_state->preview_was_shaded) {
|
||||
struct view *view = node_view_from_node(osd_state->preview_node);
|
||||
if (server->cycle.preview_was_shaded) {
|
||||
struct view *view = node_view_from_node(server->cycle.preview_node);
|
||||
view_set_shade(view, true);
|
||||
}
|
||||
osd_state->preview_node = NULL;
|
||||
osd_state->preview_parent = NULL;
|
||||
osd_state->preview_anchor = NULL;
|
||||
osd_state->preview_was_shaded = false;
|
||||
server->cycle.preview_node = NULL;
|
||||
server->cycle.preview_parent = NULL;
|
||||
server->cycle.preview_anchor = NULL;
|
||||
server->cycle.preview_was_shaded = false;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
osd_begin(struct server *server, enum lab_cycle_dir direction)
|
||||
cycle_begin(struct server *server, enum lab_cycle_dir direction)
|
||||
{
|
||||
if (server->input_mode != LAB_INPUT_STATE_PASSTHROUGH) {
|
||||
return;
|
||||
}
|
||||
|
||||
server->osd_state.cycle_view = get_next_cycle_view(server,
|
||||
server->osd_state.cycle_view, direction);
|
||||
server->cycle.selected_view = get_next_selected_view(server,
|
||||
server->cycle.selected_view, direction);
|
||||
|
||||
seat_focus_override_begin(&server->seat,
|
||||
LAB_INPUT_STATE_WINDOW_SWITCHER, LAB_CURSOR_DEFAULT);
|
||||
update_osd(server);
|
||||
LAB_INPUT_STATE_CYCLE, LAB_CURSOR_DEFAULT);
|
||||
update_cycle(server);
|
||||
|
||||
/* Update cursor, in case it is within the area covered by OSD */
|
||||
cursor_update_focus(server);
|
||||
}
|
||||
|
||||
void
|
||||
osd_cycle(struct server *server, enum lab_cycle_dir direction)
|
||||
cycle_step(struct server *server, enum lab_cycle_dir direction)
|
||||
{
|
||||
assert(server->input_mode == LAB_INPUT_STATE_WINDOW_SWITCHER);
|
||||
assert(server->input_mode == LAB_INPUT_STATE_CYCLE);
|
||||
|
||||
server->osd_state.cycle_view = get_next_cycle_view(server,
|
||||
server->osd_state.cycle_view, direction);
|
||||
update_osd(server);
|
||||
server->cycle.selected_view = get_next_selected_view(server,
|
||||
server->cycle.selected_view, direction);
|
||||
update_cycle(server);
|
||||
}
|
||||
|
||||
void
|
||||
osd_finish(struct server *server, bool switch_focus)
|
||||
cycle_finish(struct server *server, bool switch_focus)
|
||||
{
|
||||
if (server->input_mode != LAB_INPUT_STATE_WINDOW_SWITCHER) {
|
||||
if (server->input_mode != LAB_INPUT_STATE_CYCLE) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -224,62 +225,63 @@ osd_finish(struct server *server, bool switch_focus)
|
|||
/* FIXME: this sets focus to the old surface even with switch_focus=true */
|
||||
seat_focus_override_end(&server->seat);
|
||||
|
||||
struct view *cycle_view = server->osd_state.cycle_view;
|
||||
server->osd_state.preview_node = NULL;
|
||||
server->osd_state.preview_anchor = NULL;
|
||||
server->osd_state.cycle_view = NULL;
|
||||
server->osd_state.preview_was_shaded = false;
|
||||
struct view *selected_view = server->cycle.selected_view;
|
||||
server->cycle.preview_node = NULL;
|
||||
server->cycle.preview_anchor = NULL;
|
||||
server->cycle.selected_view = NULL;
|
||||
server->cycle.preview_was_shaded = false;
|
||||
|
||||
destroy_osd_scenes(server);
|
||||
|
||||
if (server->osd_state.preview_outline) {
|
||||
if (server->cycle.preview_outline) {
|
||||
/* Destroy the whole multi_rect so we can easily react to new themes */
|
||||
wlr_scene_node_destroy(&server->osd_state.preview_outline->tree->node);
|
||||
server->osd_state.preview_outline = NULL;
|
||||
wlr_scene_node_destroy(&server->cycle.preview_outline->tree->node);
|
||||
server->cycle.preview_outline = NULL;
|
||||
}
|
||||
|
||||
/* Hiding OSD may need a cursor change */
|
||||
cursor_update_focus(server);
|
||||
|
||||
if (switch_focus && cycle_view) {
|
||||
if (switch_focus && selected_view) {
|
||||
if (rc.window_switcher.unshade) {
|
||||
view_set_shade(cycle_view, false);
|
||||
view_set_shade(selected_view, false);
|
||||
}
|
||||
desktop_focus_view(cycle_view, /*raise*/ true);
|
||||
desktop_focus_view(selected_view, /*raise*/ true);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
preview_cycled_view(struct view *view)
|
||||
preview_selected_view(struct view *view)
|
||||
{
|
||||
assert(view);
|
||||
assert(view->scene_tree);
|
||||
struct osd_state *osd_state = &view->server->osd_state;
|
||||
struct server *server = view->server;
|
||||
struct cycle_state *cycle = &server->cycle;
|
||||
|
||||
/* Move previous selected node back to its original place */
|
||||
restore_preview_node(view->server);
|
||||
restore_preview_node(server);
|
||||
|
||||
/* Store some pointers so we can reset the preview later on */
|
||||
osd_state->preview_node = &view->scene_tree->node;
|
||||
osd_state->preview_parent = view->scene_tree->node.parent;
|
||||
cycle->preview_node = &view->scene_tree->node;
|
||||
cycle->preview_parent = view->scene_tree->node.parent;
|
||||
|
||||
/* Remember the sibling right before the selected node */
|
||||
osd_state->preview_anchor = lab_wlr_scene_get_prev_node(
|
||||
osd_state->preview_node);
|
||||
while (osd_state->preview_anchor && !osd_state->preview_anchor->data) {
|
||||
cycle->preview_anchor = lab_wlr_scene_get_prev_node(
|
||||
cycle->preview_node);
|
||||
while (cycle->preview_anchor && !cycle->preview_anchor->data) {
|
||||
/* Ignore non-view nodes */
|
||||
osd_state->preview_anchor = lab_wlr_scene_get_prev_node(
|
||||
osd_state->preview_anchor);
|
||||
cycle->preview_anchor = lab_wlr_scene_get_prev_node(
|
||||
cycle->preview_anchor);
|
||||
}
|
||||
|
||||
/* Store node enabled / minimized state and force-enable if disabled */
|
||||
osd_state->preview_was_enabled = osd_state->preview_node->enabled;
|
||||
if (!osd_state->preview_was_enabled) {
|
||||
wlr_scene_node_set_enabled(osd_state->preview_node, true);
|
||||
cycle->preview_was_enabled = cycle->preview_node->enabled;
|
||||
if (!cycle->preview_was_enabled) {
|
||||
wlr_scene_node_set_enabled(cycle->preview_node, true);
|
||||
}
|
||||
if (rc.window_switcher.unshade && view->shaded) {
|
||||
view_set_shade(view, false);
|
||||
osd_state->preview_was_shaded = true;
|
||||
cycle->preview_was_shaded = true;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -287,64 +289,64 @@ preview_cycled_view(struct view *view)
|
|||
* Create a permanent server->osd_preview_tree instead that can
|
||||
* also be used as parent for the preview outlines.
|
||||
*/
|
||||
wlr_scene_node_reparent(osd_state->preview_node,
|
||||
wlr_scene_node_reparent(cycle->preview_node,
|
||||
view->server->view_tree_always_on_top);
|
||||
|
||||
/* Finally raise selected node to the top */
|
||||
wlr_scene_node_raise_to_top(osd_state->preview_node);
|
||||
wlr_scene_node_raise_to_top(cycle->preview_node);
|
||||
}
|
||||
|
||||
static void
|
||||
update_osd_on_output(struct server *server, struct output *output,
|
||||
struct osd_impl *osd_impl, struct wl_array *views)
|
||||
struct cycle_osd_impl *osd_impl, struct wl_array *views)
|
||||
{
|
||||
if (!output_is_usable(output)) {
|
||||
return;
|
||||
}
|
||||
if (!output->osd_scene.tree) {
|
||||
if (!output->cycle_osd.tree) {
|
||||
osd_impl->create(output, views);
|
||||
assert(output->osd_scene.tree);
|
||||
assert(output->cycle_osd.tree);
|
||||
}
|
||||
osd_impl->update(output);
|
||||
}
|
||||
|
||||
static void
|
||||
update_osd(struct server *server)
|
||||
update_cycle(struct server *server)
|
||||
{
|
||||
struct wl_array views;
|
||||
wl_array_init(&views);
|
||||
view_array_append(server, &views, rc.window_switcher.criteria);
|
||||
|
||||
struct osd_impl *osd_impl = NULL;
|
||||
struct cycle_osd_impl *osd_impl = NULL;
|
||||
switch (rc.window_switcher.style) {
|
||||
case WINDOW_SWITCHER_CLASSIC:
|
||||
osd_impl = &osd_classic_impl;
|
||||
case CYCLE_OSD_STYLE_CLASSIC:
|
||||
osd_impl = &cycle_osd_classic_impl;
|
||||
break;
|
||||
case WINDOW_SWITCHER_THUMBNAIL:
|
||||
osd_impl = &osd_thumbnail_impl;
|
||||
case CYCLE_OSD_STYLE_THUMBNAIL:
|
||||
osd_impl = &cycle_osd_thumbnail_impl;
|
||||
break;
|
||||
}
|
||||
|
||||
if (!wl_array_len(&views) || !server->osd_state.cycle_view) {
|
||||
osd_finish(server, /*switch_focus*/ false);
|
||||
if (!wl_array_len(&views) || !server->cycle.selected_view) {
|
||||
cycle_finish(server, /*switch_focus*/ false);
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (rc.window_switcher.show) {
|
||||
/* Display the actual OSD */
|
||||
switch (rc.window_switcher.output_criteria) {
|
||||
case OSD_OUTPUT_ALL: {
|
||||
case CYCLE_OSD_OUTPUT_ALL: {
|
||||
struct output *output;
|
||||
wl_list_for_each(output, &server->outputs, link) {
|
||||
update_osd_on_output(server, output, osd_impl, &views);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case OSD_OUTPUT_POINTER:
|
||||
case CYCLE_OSD_OUTPUT_POINTER:
|
||||
update_osd_on_output(server,
|
||||
output_nearest_to_cursor(server), osd_impl, &views);
|
||||
break;
|
||||
case OSD_OUTPUT_KEYBOARD: {
|
||||
case CYCLE_OSD_OUTPUT_KEYBOARD: {
|
||||
struct output *output;
|
||||
if (server->active_view) {
|
||||
output = server->active_view->output;
|
||||
|
|
@ -359,13 +361,13 @@ update_osd(struct server *server)
|
|||
}
|
||||
|
||||
if (rc.window_switcher.preview) {
|
||||
preview_cycled_view(server->osd_state.cycle_view);
|
||||
preview_selected_view(server->cycle.selected_view);
|
||||
}
|
||||
|
||||
/* Outline current window */
|
||||
if (rc.window_switcher.outlines) {
|
||||
if (view_is_focusable(server->osd_state.cycle_view)) {
|
||||
osd_update_preview_outlines(server->osd_state.cycle_view);
|
||||
if (view_is_focusable(server->cycle.selected_view)) {
|
||||
update_preview_outlines(server->cycle.selected_view);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
#include "theme.h"
|
||||
#include "workspaces.h"
|
||||
|
||||
struct osd_classic_item {
|
||||
struct osd_item base;
|
||||
struct cycle_osd_classic_item {
|
||||
struct cycle_osd_item base;
|
||||
struct wlr_scene_tree *normal_tree, *active_tree;
|
||||
};
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ create_fields_scene(struct server *server, struct view *view,
|
|||
struct window_switcher_classic_theme *switcher_theme =
|
||||
&theme->osd_window_switcher_classic;
|
||||
|
||||
struct window_switcher_field *field;
|
||||
struct cycle_osd_field *field;
|
||||
wl_list_for_each(field, &rc.window_switcher.fields, link) {
|
||||
int field_width = field_widths_sum * field->width / 100.0;
|
||||
struct wlr_scene_node *node = NULL;
|
||||
|
|
@ -51,7 +51,7 @@ create_fields_scene(struct server *server, struct view *view,
|
|||
height = icon_size;
|
||||
} else {
|
||||
struct buf buf = BUF_INIT;
|
||||
osd_field_get_content(field, &buf, view);
|
||||
cycle_osd_field_get_content(field, &buf, view);
|
||||
|
||||
if (!string_null_or_empty(buf.data)) {
|
||||
struct scaled_font_buffer *font_buffer =
|
||||
|
|
@ -76,9 +76,9 @@ create_fields_scene(struct server *server, struct view *view,
|
|||
}
|
||||
|
||||
static void
|
||||
osd_classic_create(struct output *output, struct wl_array *views)
|
||||
cycle_osd_classic_create(struct output *output, struct wl_array *views)
|
||||
{
|
||||
assert(!output->osd_scene.tree && wl_list_empty(&output->osd_scene.items));
|
||||
assert(!output->cycle_osd.tree && wl_list_empty(&output->cycle_osd.items));
|
||||
|
||||
struct server *server = output->server;
|
||||
struct theme *theme = server->theme;
|
||||
|
|
@ -102,7 +102,7 @@ osd_classic_create(struct output *output, struct wl_array *views)
|
|||
h += switcher_theme->item_height;
|
||||
}
|
||||
|
||||
output->osd_scene.tree = wlr_scene_tree_create(output->osd_tree);
|
||||
output->cycle_osd.tree = wlr_scene_tree_create(output->cycle_osd_tree);
|
||||
|
||||
float *text_color = theme->osd_label_text_color;
|
||||
float *bg_color = theme->osd_bg_color;
|
||||
|
|
@ -116,7 +116,7 @@ osd_classic_create(struct output *output, struct wl_array *views)
|
|||
.width = w,
|
||||
.height = h,
|
||||
};
|
||||
lab_scene_rect_create(output->osd_scene.tree, &bg_opts);
|
||||
lab_scene_rect_create(output->cycle_osd.tree, &bg_opts);
|
||||
|
||||
int y = padding;
|
||||
|
||||
|
|
@ -134,7 +134,7 @@ osd_classic_create(struct output *output, struct wl_array *views)
|
|||
}
|
||||
|
||||
struct scaled_font_buffer *font_buffer =
|
||||
scaled_font_buffer_create(output->osd_scene.tree);
|
||||
scaled_font_buffer_create(output->cycle_osd.tree);
|
||||
wlr_scene_node_set_position(&font_buffer->scene_buffer->node,
|
||||
x, y + (switcher_theme->item_height - font_height(&font)) / 2);
|
||||
scaled_font_buffer_update(font_buffer, workspace_name, 0,
|
||||
|
|
@ -157,12 +157,12 @@ osd_classic_create(struct output *output, struct wl_array *views)
|
|||
/* Draw text for each node */
|
||||
struct view **view;
|
||||
wl_array_for_each(view, views) {
|
||||
struct osd_classic_item *item = znew(*item);
|
||||
wl_list_append(&output->osd_scene.items, &item->base.link);
|
||||
struct cycle_osd_classic_item *item = znew(*item);
|
||||
wl_list_append(&output->cycle_osd.items, &item->base.link);
|
||||
item->base.view = *view;
|
||||
item->base.tree = wlr_scene_tree_create(output->osd_scene.tree);
|
||||
item->base.tree = wlr_scene_tree_create(output->cycle_osd.tree);
|
||||
node_descriptor_create(&item->base.tree->node,
|
||||
LAB_NODE_OSD_ITEM, NULL, item);
|
||||
LAB_NODE_CYCLE_OSD_ITEM, NULL, item);
|
||||
/*
|
||||
* OSD border
|
||||
* +---------------------------------+
|
||||
|
|
@ -218,23 +218,23 @@ osd_classic_create(struct output *output, struct wl_array *views)
|
|||
|
||||
error:;
|
||||
/* Center OSD */
|
||||
wlr_scene_node_set_position(&output->osd_scene.tree->node,
|
||||
wlr_scene_node_set_position(&output->cycle_osd.tree->node,
|
||||
output_box.x + (output_box.width - w) / 2,
|
||||
output_box.y + (output_box.height - h) / 2);
|
||||
}
|
||||
|
||||
static void
|
||||
osd_classic_update(struct output *output)
|
||||
cycle_osd_classic_update(struct output *output)
|
||||
{
|
||||
struct osd_classic_item *item;
|
||||
wl_list_for_each(item, &output->osd_scene.items, base.link) {
|
||||
bool active = item->base.view == output->server->osd_state.cycle_view;
|
||||
struct cycle_osd_classic_item *item;
|
||||
wl_list_for_each(item, &output->cycle_osd.items, base.link) {
|
||||
bool active = item->base.view == output->server->cycle.selected_view;
|
||||
wlr_scene_node_set_enabled(&item->normal_tree->node, !active);
|
||||
wlr_scene_node_set_enabled(&item->active_tree->node, active);
|
||||
}
|
||||
}
|
||||
|
||||
struct osd_impl osd_classic_impl = {
|
||||
.create = osd_classic_create,
|
||||
.update = osd_classic_update,
|
||||
struct cycle_osd_impl cycle_osd_classic_impl = {
|
||||
.create = cycle_osd_classic_create,
|
||||
.update = cycle_osd_classic_update,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -204,11 +204,11 @@ static const struct field_converter field_converter[LAB_FIELD_COUNT] = {
|
|||
[LAB_FIELD_TITLE] = { 'T', field_set_title },
|
||||
[LAB_FIELD_TITLE_SHORT] = { 't', field_set_title_short },
|
||||
/* fmt_char can never be matched so prevents LAB_FIELD_CUSTOM recursion */
|
||||
[LAB_FIELD_CUSTOM] = { '\0', osd_field_set_custom },
|
||||
[LAB_FIELD_CUSTOM] = { '\0', cycle_osd_field_set_custom },
|
||||
};
|
||||
|
||||
void
|
||||
osd_field_set_custom(struct buf *buf, struct view *view, const char *format)
|
||||
cycle_osd_field_set_custom(struct buf *buf, struct view *view, const char *format)
|
||||
{
|
||||
if (!format) {
|
||||
wlr_log(WLR_ERROR, "Missing format for custom window switcher field");
|
||||
|
|
@ -286,7 +286,7 @@ reset_format:
|
|||
}
|
||||
|
||||
void
|
||||
osd_field_arg_from_xml_node(struct window_switcher_field *field,
|
||||
cycle_osd_field_arg_from_xml_node(struct cycle_osd_field *field,
|
||||
const char *nodename, const char *content)
|
||||
{
|
||||
if (!strcmp(nodename, "content")) {
|
||||
|
|
@ -332,7 +332,7 @@ osd_field_arg_from_xml_node(struct window_switcher_field *field,
|
|||
}
|
||||
|
||||
bool
|
||||
osd_field_is_valid(struct window_switcher_field *field)
|
||||
cycle_osd_field_is_valid(struct cycle_osd_field *field)
|
||||
{
|
||||
if (field->content == LAB_FIELD_NONE) {
|
||||
wlr_log(WLR_ERROR, "Invalid OSD field: no content set");
|
||||
|
|
@ -350,7 +350,7 @@ osd_field_is_valid(struct window_switcher_field *field)
|
|||
}
|
||||
|
||||
void
|
||||
osd_field_get_content(struct window_switcher_field *field,
|
||||
cycle_osd_field_get_content(struct cycle_osd_field *field,
|
||||
struct buf *buf, struct view *view)
|
||||
{
|
||||
if (field->content == LAB_FIELD_NONE) {
|
||||
|
|
@ -363,7 +363,7 @@ osd_field_get_content(struct window_switcher_field *field,
|
|||
}
|
||||
|
||||
void
|
||||
osd_field_free(struct window_switcher_field *field)
|
||||
cycle_osd_field_free(struct cycle_osd_field *field)
|
||||
{
|
||||
zfree(field->format);
|
||||
zfree(field);
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
#include "theme.h"
|
||||
#include "view.h"
|
||||
|
||||
struct osd_thumbnail_item {
|
||||
struct osd_item base;
|
||||
struct cycle_osd_thumbnail_item {
|
||||
struct cycle_osd_item base;
|
||||
struct scaled_font_buffer *normal_label;
|
||||
struct scaled_font_buffer *active_label;
|
||||
struct lab_scene_rect *active_bg;
|
||||
|
|
@ -102,7 +102,7 @@ create_label(struct wlr_scene_tree *parent, struct view *view,
|
|||
const float *text_color, const float *bg_color, int y)
|
||||
{
|
||||
struct buf buf = BUF_INIT;
|
||||
osd_field_set_custom(&buf, view,
|
||||
cycle_osd_field_set_custom(&buf, view,
|
||||
rc.window_switcher.thumbnail_label_format);
|
||||
struct scaled_font_buffer *buffer =
|
||||
scaled_font_buffer_create(parent);
|
||||
|
|
@ -115,7 +115,7 @@ create_label(struct wlr_scene_tree *parent, struct view *view,
|
|||
return buffer;
|
||||
}
|
||||
|
||||
static struct osd_thumbnail_item *
|
||||
static struct cycle_osd_thumbnail_item *
|
||||
create_item_scene(struct wlr_scene_tree *parent, struct view *view,
|
||||
struct output *output)
|
||||
{
|
||||
|
|
@ -136,10 +136,10 @@ create_item_scene(struct wlr_scene_tree *parent, struct view *view,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
struct osd_thumbnail_item *item = znew(*item);
|
||||
wl_list_append(&output->osd_scene.items, &item->base.link);
|
||||
struct cycle_osd_thumbnail_item *item = znew(*item);
|
||||
wl_list_append(&output->cycle_osd.items, &item->base.link);
|
||||
struct wlr_scene_tree *tree = wlr_scene_tree_create(parent);
|
||||
node_descriptor_create(&tree->node, LAB_NODE_OSD_ITEM, NULL, item);
|
||||
node_descriptor_create(&tree->node, LAB_NODE_CYCLE_OSD_ITEM, NULL, item);
|
||||
item->base.tree = tree;
|
||||
item->base.view = view;
|
||||
|
||||
|
|
@ -226,9 +226,9 @@ get_items_geometry(struct output *output, struct theme *theme,
|
|||
}
|
||||
|
||||
static void
|
||||
osd_thumbnail_create(struct output *output, struct wl_array *views)
|
||||
cycle_osd_thumbnail_create(struct output *output, struct wl_array *views)
|
||||
{
|
||||
assert(!output->osd_scene.tree && wl_list_empty(&output->osd_scene.items));
|
||||
assert(!output->cycle_osd.tree && wl_list_empty(&output->cycle_osd.items));
|
||||
|
||||
struct server *server = output->server;
|
||||
struct theme *theme = server->theme;
|
||||
|
|
@ -236,7 +236,7 @@ osd_thumbnail_create(struct output *output, struct wl_array *views)
|
|||
&theme->osd_window_switcher_thumbnail;
|
||||
int padding = theme->osd_border_width + switcher_theme->padding;
|
||||
|
||||
output->osd_scene.tree = wlr_scene_tree_create(output->osd_tree);
|
||||
output->cycle_osd.tree = wlr_scene_tree_create(output->cycle_osd_tree);
|
||||
|
||||
int nr_views = wl_array_len(views);
|
||||
assert(nr_views > 0);
|
||||
|
|
@ -247,8 +247,8 @@ osd_thumbnail_create(struct output *output, struct wl_array *views)
|
|||
struct view **view;
|
||||
int index = 0;
|
||||
wl_array_for_each(view, views) {
|
||||
struct osd_thumbnail_item *item = create_item_scene(
|
||||
output->osd_scene.tree, *view, output);
|
||||
struct cycle_osd_thumbnail_item *item = create_item_scene(
|
||||
output->cycle_osd.tree, *view, output);
|
||||
if (!item) {
|
||||
break;
|
||||
}
|
||||
|
|
@ -268,7 +268,7 @@ osd_thumbnail_create(struct output *output, struct wl_array *views)
|
|||
.height = nr_rows * switcher_theme->item_height + 2 * padding,
|
||||
};
|
||||
struct lab_scene_rect *bg =
|
||||
lab_scene_rect_create(output->osd_scene.tree, &bg_opts);
|
||||
lab_scene_rect_create(output->cycle_osd.tree, &bg_opts);
|
||||
wlr_scene_node_lower_to_bottom(&bg->tree->node);
|
||||
|
||||
/* center */
|
||||
|
|
@ -277,15 +277,15 @@ osd_thumbnail_create(struct output *output, struct wl_array *views)
|
|||
&output_box);
|
||||
int lx = output_box.x + (output_box.width - bg_opts.width) / 2;
|
||||
int ly = output_box.y + (output_box.height - bg_opts.height) / 2;
|
||||
wlr_scene_node_set_position(&output->osd_scene.tree->node, lx, ly);
|
||||
wlr_scene_node_set_position(&output->cycle_osd.tree->node, lx, ly);
|
||||
}
|
||||
|
||||
static void
|
||||
osd_thumbnail_update(struct output *output)
|
||||
cycle_osd_thumbnail_update(struct output *output)
|
||||
{
|
||||
struct osd_thumbnail_item *item;
|
||||
wl_list_for_each(item, &output->osd_scene.items, base.link) {
|
||||
bool active = (item->base.view == output->server->osd_state.cycle_view);
|
||||
struct cycle_osd_thumbnail_item *item;
|
||||
wl_list_for_each(item, &output->cycle_osd.items, base.link) {
|
||||
bool active = (item->base.view == output->server->cycle.selected_view);
|
||||
wlr_scene_node_set_enabled(&item->active_bg->tree->node, active);
|
||||
wlr_scene_node_set_enabled(
|
||||
&item->active_label->scene_buffer->node, active);
|
||||
|
|
@ -294,7 +294,7 @@ osd_thumbnail_update(struct output *output)
|
|||
}
|
||||
}
|
||||
|
||||
struct osd_impl osd_thumbnail_impl = {
|
||||
.create = osd_thumbnail_create,
|
||||
.update = osd_thumbnail_update,
|
||||
struct cycle_osd_impl cycle_osd_thumbnail_impl = {
|
||||
.create = cycle_osd_thumbnail_create,
|
||||
.update = cycle_osd_thumbnail_update,
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue