mirror of
https://github.com/labwc/labwc.git
synced 2025-11-04 13:30:07 -05:00
osd: factor drawing out of osd_update
This commit is contained in:
bi4k8
Consolatis
parent
8032769197
commit
4f0b72c341
1 changed files with 159 additions and 149 deletions
156
src/osd.c
156
src/osd.c
|
|
@ -223,84 +223,24 @@ preview_cycled_view(struct view *view)
|
|||
wlr_scene_node_raise_to_top(osd_state->preview_node);
|
||||
}
|
||||
|
||||
void
|
||||
osd_update(struct server *server)
|
||||
static void
|
||||
render_osd(cairo_t *cairo, int w, int h, struct wl_list *node_list,
|
||||
struct view *cycle_view, struct theme *theme, bool show_workspace,
|
||||
const char *workspace_name)
|
||||
{
|
||||
struct wl_list *node_list =
|
||||
&server->workspace_current->tree->children;
|
||||
|
||||
if (wl_list_empty(node_list) || !server->osd_state.cycle_view) {
|
||||
osd_finish(server);
|
||||
return;
|
||||
}
|
||||
|
||||
struct theme *theme = server->theme;
|
||||
bool show_workspace = wl_list_length(&rc.workspace_config.workspaces) > 1;
|
||||
|
||||
struct buf buf;
|
||||
buf_init(&buf);
|
||||
|
||||
struct view *view;
|
||||
struct output *output;
|
||||
struct wlr_scene_node *node;
|
||||
wl_list_for_each(output, &server->outputs, link) {
|
||||
destroy_osd_nodes(output);
|
||||
if (!output->wlr_output->enabled) {
|
||||
continue;
|
||||
}
|
||||
|
||||
float scale = output->wlr_output->scale;
|
||||
int w = OSD_ITEM_WIDTH + (2 * OSD_BORDER_WIDTH);
|
||||
int h = get_osd_height(node_list);
|
||||
if (show_workspace) {
|
||||
/* workspace indicator */
|
||||
h += OSD_ITEM_HEIGHT;
|
||||
}
|
||||
|
||||
if (output->osd_buffer) {
|
||||
wlr_buffer_drop(&output->osd_buffer->base);
|
||||
}
|
||||
output->osd_buffer = buffer_create_cairo(w, h, scale, true);
|
||||
|
||||
cairo_t *cairo = output->osd_buffer->cairo;
|
||||
cairo_surface_t *surf = cairo_get_target(cairo);
|
||||
|
||||
/* background */
|
||||
/* Draw background */
|
||||
set_cairo_color(cairo, theme->osd_bg_color);
|
||||
cairo_rectangle(cairo, 0, 0, w, h);
|
||||
cairo_fill(cairo);
|
||||
|
||||
/* Border */
|
||||
/* Draw border */
|
||||
set_cairo_color(cairo, theme->osd_border_color);
|
||||
draw_cairo_border(cairo, w, h, theme->osd_border_width);
|
||||
|
||||
int y = OSD_BORDER_WIDTH;
|
||||
|
||||
if (show_workspace) {
|
||||
/* workspace indicator */
|
||||
y += OSD_ITEM_HEIGHT;
|
||||
}
|
||||
|
||||
/* highlight current window */
|
||||
wl_list_for_each_reverse(node, node_list, link) {
|
||||
view = node_view_from_node(node);
|
||||
if (!isfocusable(view)) {
|
||||
continue;
|
||||
}
|
||||
if (view == server->osd_state.cycle_view) {
|
||||
set_cairo_color(cairo, theme->osd_label_text_color);
|
||||
cairo_rectangle(cairo, OSD_BORDER_WIDTH, y,
|
||||
OSD_ITEM_WIDTH, OSD_ITEM_HEIGHT);
|
||||
cairo_stroke(cairo);
|
||||
if (rc.cycle_preview_outlines) {
|
||||
osd_update_preview_outlines(view);
|
||||
}
|
||||
break;
|
||||
}
|
||||
y += OSD_ITEM_HEIGHT;
|
||||
}
|
||||
|
||||
/* text */
|
||||
/* Set up text rendering */
|
||||
set_cairo_color(cairo, theme->osd_label_text_color);
|
||||
PangoLayout *layout = pango_cairo_create_layout(cairo);
|
||||
pango_layout_set_width(layout,
|
||||
|
|
@ -317,22 +257,22 @@ osd_update(struct server *server)
|
|||
|
||||
pango_cairo_update_layout(cairo, layout);
|
||||
|
||||
y = OSD_BORDER_WIDTH;
|
||||
int y = OSD_BORDER_WIDTH;
|
||||
|
||||
/* Center text entries on the y axis */
|
||||
int y_offset = (OSD_ITEM_HEIGHT - font_height(&rc.font_osd)) / 2;
|
||||
y += y_offset;
|
||||
|
||||
/* Draw workspace indicator */
|
||||
if (show_workspace) {
|
||||
/* Center workspace indicator on the x axis */
|
||||
int x = font_width(&rc.font_osd, server->workspace_current->name);
|
||||
int x = font_width(&rc.font_osd, workspace_name);
|
||||
x = (OSD_ITEM_WIDTH - x) / 2;
|
||||
cairo_move_to(cairo, x, y);
|
||||
PangoWeight weight = pango_font_description_get_weight(desc);
|
||||
pango_font_description_set_weight(desc, PANGO_WEIGHT_BOLD);
|
||||
pango_layout_set_font_description(layout, desc);
|
||||
pango_layout_set_text(layout,
|
||||
server->workspace_current->name, -1);
|
||||
pango_layout_set_text(layout, workspace_name, -1);
|
||||
pango_cairo_show_layout(cairo, layout);
|
||||
pango_font_description_set_weight(desc, weight);
|
||||
pango_layout_set_font_description(layout, desc);
|
||||
|
|
@ -340,8 +280,12 @@ osd_update(struct server *server)
|
|||
}
|
||||
pango_font_description_free(desc);
|
||||
|
||||
struct buf buf;
|
||||
buf_init(&buf);
|
||||
|
||||
/* Draw text for each node */
|
||||
wl_list_for_each_reverse(node, node_list, link) {
|
||||
view = node_view_from_node(node);
|
||||
struct view *view = node_view_from_node(node);
|
||||
if (!isfocusable(view)) {
|
||||
continue;
|
||||
}
|
||||
|
|
@ -369,10 +313,49 @@ osd_update(struct server *server)
|
|||
|
||||
pango_layout_set_text(layout, buf.buf, -1);
|
||||
pango_cairo_show_layout(cairo, layout);
|
||||
|
||||
if (view == cycle_view) {
|
||||
/* Highlight current window */
|
||||
cairo_rectangle(cairo, OSD_BORDER_WIDTH, y - y_offset,
|
||||
OSD_ITEM_WIDTH, OSD_ITEM_HEIGHT);
|
||||
cairo_stroke(cairo);
|
||||
}
|
||||
|
||||
y += OSD_ITEM_HEIGHT;
|
||||
}
|
||||
free(buf.buf);
|
||||
g_object_unref(layout);
|
||||
|
||||
cairo_surface_flush(surf);
|
||||
}
|
||||
|
||||
static void
|
||||
display_osd(struct output *output)
|
||||
{
|
||||
struct server *server = output->server;
|
||||
struct wl_list *node_list =
|
||||
&server->workspace_current->tree->children;
|
||||
bool show_workspace = wl_list_length(&rc.workspace_config.workspaces) > 1;
|
||||
const char *workspace_name = server->workspace_current->name;
|
||||
|
||||
float scale = output->wlr_output->scale;
|
||||
int w = OSD_ITEM_WIDTH + (2 * OSD_BORDER_WIDTH);
|
||||
int h = get_osd_height(node_list);
|
||||
if (show_workspace) {
|
||||
/* workspace indicator */
|
||||
h += OSD_ITEM_HEIGHT;
|
||||
}
|
||||
|
||||
/* Reset buffer */
|
||||
if (output->osd_buffer) {
|
||||
wlr_buffer_drop(&output->osd_buffer->base);
|
||||
}
|
||||
output->osd_buffer = buffer_create_cairo(w, h, scale, true);
|
||||
|
||||
/* Render OSD image */
|
||||
cairo_t *cairo = output->osd_buffer->cairo;
|
||||
render_osd(cairo, w, h, node_list, server->osd_state.cycle_view,
|
||||
server->theme, show_workspace, workspace_name);
|
||||
|
||||
struct wlr_scene_buffer *scene_buffer = wlr_scene_buffer_create(
|
||||
output->osd_tree, &output->osd_buffer->base);
|
||||
|
|
@ -388,8 +371,35 @@ osd_update(struct server *server)
|
|||
- h / 2 + output_box.y;
|
||||
wlr_scene_node_set_position(&scene_buffer->node, lx, ly);
|
||||
wlr_scene_node_set_enabled(&output->osd_tree->node, true);
|
||||
}
|
||||
|
||||
void
|
||||
osd_update(struct server *server)
|
||||
{
|
||||
struct wl_list *node_list =
|
||||
&server->workspace_current->tree->children;
|
||||
|
||||
if (wl_list_empty(node_list) || !server->osd_state.cycle_view) {
|
||||
osd_finish(server);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Display the actual OSD */
|
||||
struct output *output;
|
||||
wl_list_for_each(output, &server->outputs, link) {
|
||||
destroy_osd_nodes(output);
|
||||
if (!output->wlr_output->enabled) {
|
||||
continue;
|
||||
}
|
||||
display_osd(output);
|
||||
}
|
||||
|
||||
/* Outline current window */
|
||||
if (rc.cycle_preview_outlines) {
|
||||
if (isfocusable(server->osd_state.cycle_view)) {
|
||||
osd_update_preview_outlines(server->osd_state.cycle_view);
|
||||
}
|
||||
}
|
||||
free(buf.buf);
|
||||
|
||||
if (rc.cycle_preview_contents) {
|
||||
preview_cycled_view(server->osd_state.cycle_view);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue