From ec7ff769c7b4da616ebe6bfd90b70350dd39e166 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Fri, 1 Apr 2016 00:04:08 +0200 Subject: Tabbed and stacked layout --- sway/border.c | 138 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 102 insertions(+), 36 deletions(-) (limited to 'sway/border.c') diff --git a/sway/border.c b/sway/border.c index a6ed4238..ada5af2a 100644 --- a/sway/border.c +++ b/sway/border.c @@ -91,7 +91,7 @@ int get_font_text_height(const char *font) { return height; } -static void render_borders(swayc_t *view, cairo_t *cr, struct border_colors *colors) { +static void render_borders(swayc_t *view, cairo_t *cr, struct border_colors *colors, bool top) { struct wlc_geometry *b = &view->border_geometry; struct wlc_geometry *v = &view->actual_geometry; @@ -118,7 +118,7 @@ static void render_borders(swayc_t *view, cairo_t *cr, struct border_colors *col // top border int top_border = v->origin.y - b->origin.y; - if (top_border > 0) { + if (top && top_border > 0) { render_sharp_line(cr, colors->child_border, 0, 0, @@ -138,38 +138,69 @@ static void render_borders(swayc_t *view, cairo_t *cr, struct border_colors *col } } -static void render_with_title_bar(swayc_t *view, cairo_t *cr, struct border_colors *colors) { +static void render_title_bar(swayc_t *view, cairo_t *cr, struct border_colors *colors) { struct wlc_geometry *tb = &view->title_bar_geometry; struct wlc_geometry *b = &view->border_geometry; int title_y = MIN(view->actual_geometry.origin.y - (int)tb->size.h, 0); // borders - render_borders(view, cr, colors); + /* render_borders(view, cr, colors); */ + int x = tb->origin.x - b->origin.x; + int y = tb->origin.y - b->origin.y; + + /* // title bar background */ + /* cairo_set_source_u32(cr, colors->child_border); */ + /* cairo_rectangle(cr, x, y, tb->size.w, tb->size.h); */ + /* cairo_fill(cr); */ // title bar background cairo_set_source_u32(cr, colors->background); cairo_rectangle(cr, 0, title_y, tb->size.w, tb->size.h); cairo_fill(cr); // header top line + /* render_sharp_line(cr, colors->border, x, y, tb->size.w, 1); */ render_sharp_line(cr, colors->border, 0, title_y, tb->size.w, 1); // text if (view->name) { int width, height; get_text_size(cr, config->font, &width, &height, false, "%s", view->name); - int x = MIN(view->actual_geometry.origin.x, view->border_thickness); - int y = MIN(view->actual_geometry.origin.y - height - 2, 2); - cairo_move_to(cr, x, y); + int x_text = MIN(view->actual_geometry.origin.x, view->border_thickness); + int y_text = MIN(view->actual_geometry.origin.y - height - 2, 2); + cairo_move_to(cr, x_text, y_text); cairo_set_source_u32(cr, colors->text); pango_printf(cr, config->font, false, "%s", view->name); } - // header bottom line - render_sharp_line(cr, colors->border, - view->actual_geometry.origin.x - b->origin.x, - title_y + tb->size.h - 1, - view->actual_geometry.size.w, 1); + // titlebars has a border all around for tabbed layouts + if (view->parent->layout == L_TABBED) { + // header bottom line + render_sharp_line(cr, colors->border, x, y + tb->size.h - 1, + tb->size.w, 1); + + // left border + render_sharp_line(cr, colors->border, x, y, 1, tb->size.h); + + // right border + render_sharp_line(cr, colors->border, x + tb->size.w - 1, y, + 1, tb->size.h); + + return; + } + + if ((uint32_t)(view->actual_geometry.origin.y - tb->origin.y) == tb->size.h) { + // header bottom line + render_sharp_line(cr, colors->border, + x + view->actual_geometry.origin.x - b->origin.x, + y + tb->size.h - 1, + view->actual_geometry.size.w, 1); + } else { + // header bottom line + render_sharp_line(cr, colors->border, x, + title_y + tb->size.h - 1, + tb->size.w, 1); + } } void map_update_view_border(swayc_t *view, void *data) { @@ -179,6 +210,10 @@ void map_update_view_border(swayc_t *view, void *data) { } void update_view_border(swayc_t *view) { + if (!view->visible) { + return; + } + cairo_t *cr = NULL; cairo_surface_t *surface = NULL; @@ -187,6 +222,7 @@ void update_view_border(swayc_t *view) { view->border = NULL; } + // get focused and focused_intactive views swayc_t *focused = get_focused_view(&root_container); swayc_t *container = swayc_parent_by_type(view, C_CONTAINER); swayc_t *focused_inactive = NULL; @@ -199,40 +235,70 @@ void update_view_border(swayc_t *view) { } } - switch (view->border_type) { - case B_NONE: - break; - case B_PIXEL: - cr = create_border_buffer(view, view->border_geometry, &surface); - if (!cr) { - break; - } + swayc_t *p = view->parent; + if (p->layout == L_TABBED || p->layout == L_STACKED) { + cr = create_border_buffer(view, view->border_geometry, &surface); if (focused == view) { - render_borders(view, cr, &config->border_colors.focused); + render_borders(view, cr, &config->border_colors.focused, false); } else if (focused_inactive == view) { - render_borders(view, cr, &config->border_colors.focused_inactive); + render_borders(view, cr, &config->border_colors.focused_inactive, false); } else { - render_borders(view, cr, &config->border_colors.unfocused); + render_borders(view, cr, &config->border_colors.unfocused, false); } - break; - case B_NORMAL: - cr = create_border_buffer(view, view->border_geometry, &surface); - if (!cr) { - break; - } + int i; + for (i = 0; i < p->children->length; ++i) { + swayc_t *child = p->children->items[i]; - if (focused == view) { - render_with_title_bar(view, cr, &config->border_colors.focused); - } else if (focused_inactive == view) { - render_with_title_bar(view, cr, &config->border_colors.focused_inactive); - } else { - render_with_title_bar(view, cr, &config->border_colors.unfocused); + if (focused == child) { + render_title_bar(child, cr, &config->border_colors.focused); + } else if (focused_inactive == child) { + render_title_bar(child, cr, &config->border_colors.focused_inactive); + } else { + render_title_bar(child, cr, &config->border_colors.unfocused); + } } + } else { + switch (view->border_type) { + case B_NONE: + break; + case B_PIXEL: + cr = create_border_buffer(view, view->border_geometry, &surface); + if (!cr) { + break; + } + + if (focused == view) { + render_borders(view, cr, &config->border_colors.focused, true); + } else if (focused_inactive == view) { + render_borders(view, cr, &config->border_colors.focused_inactive, true); + } else { + render_borders(view, cr, &config->border_colors.unfocused, true); + } - break; + break; + case B_NORMAL: + cr = create_border_buffer(view, view->border_geometry, &surface); + if (!cr) { + break; + } + + if (focused == view) { + render_borders(view, cr, &config->border_colors.focused, false); + render_title_bar(view, cr, &config->border_colors.focused); + } else if (focused_inactive == view) { + render_borders(view, cr, &config->border_colors.focused_inactive, false); + render_title_bar(view, cr, &config->border_colors.focused_inactive); + } else { + render_borders(view, cr, &config->border_colors.unfocused, false); + render_title_bar(view, cr, &config->border_colors.unfocused); + } + + break; + } } + if (surface) { cairo_surface_flush(surface); cairo_surface_destroy(surface); -- cgit v1.2.3 From 8d700fe008ccf9f7eb4664e236277c9f30a449fb Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Fri, 1 Apr 2016 13:36:36 +0200 Subject: Fix problems with floating windows Makes any tabbed/stacked layout a container to separate from floating windows which may be attached to a workspace. --- sway/border.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sway/border.c') diff --git a/sway/border.c b/sway/border.c index ada5af2a..061c1427 100644 --- a/sway/border.c +++ b/sway/border.c @@ -237,7 +237,7 @@ void update_view_border(swayc_t *view) { swayc_t *p = view->parent; - if (p->layout == L_TABBED || p->layout == L_STACKED) { + if (swayc_is_tabbed_stacked(view)) { cr = create_border_buffer(view, view->border_geometry, &surface); if (focused == view) { render_borders(view, cr, &config->border_colors.focused, false); -- cgit v1.2.3 From 969f76a1a44b5da92a03d9ac3c865109b0ef9f39 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Sun, 3 Apr 2016 13:48:39 +0200 Subject: Make floating border fixes work with tabbed/stacked code --- sway/border.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'sway/border.c') diff --git a/sway/border.c b/sway/border.c index 061c1427..80e51580 100644 --- a/sway/border.c +++ b/sway/border.c @@ -141,34 +141,22 @@ static void render_borders(swayc_t *view, cairo_t *cr, struct border_colors *col static void render_title_bar(swayc_t *view, cairo_t *cr, struct border_colors *colors) { struct wlc_geometry *tb = &view->title_bar_geometry; struct wlc_geometry *b = &view->border_geometry; - int title_y = MIN(view->actual_geometry.origin.y - (int)tb->size.h, 0); + int x = MIN(tb->origin.x, tb->origin.x - b->origin.x); + int y = MIN(tb->origin.y, tb->origin.y - b->origin.y); - // borders - /* render_borders(view, cr, colors); */ - - int x = tb->origin.x - b->origin.x; - int y = tb->origin.y - b->origin.y; - - /* // title bar background */ - /* cairo_set_source_u32(cr, colors->child_border); */ - /* cairo_rectangle(cr, x, y, tb->size.w, tb->size.h); */ - /* cairo_fill(cr); */ // title bar background cairo_set_source_u32(cr, colors->background); - cairo_rectangle(cr, 0, title_y, tb->size.w, tb->size.h); + cairo_rectangle(cr, x, y, tb->size.w, tb->size.h); cairo_fill(cr); // header top line - /* render_sharp_line(cr, colors->border, x, y, tb->size.w, 1); */ - render_sharp_line(cr, colors->border, 0, title_y, tb->size.w, 1); + render_sharp_line(cr, colors->border, x, y, tb->size.w, 1); // text if (view->name) { int width, height; get_text_size(cr, config->font, &width, &height, false, "%s", view->name); - int x_text = MIN(view->actual_geometry.origin.x, view->border_thickness); - int y_text = MIN(view->actual_geometry.origin.y - height - 2, 2); - cairo_move_to(cr, x_text, y_text); + cairo_move_to(cr, x + 2, y + 2); cairo_set_source_u32(cr, colors->text); pango_printf(cr, config->font, false, "%s", view->name); } @@ -192,13 +180,13 @@ static void render_title_bar(swayc_t *view, cairo_t *cr, struct border_colors *c if ((uint32_t)(view->actual_geometry.origin.y - tb->origin.y) == tb->size.h) { // header bottom line render_sharp_line(cr, colors->border, - x + view->actual_geometry.origin.x - b->origin.x, + x + view->actual_geometry.origin.x - tb->origin.x, y + tb->size.h - 1, view->actual_geometry.size.w, 1); } else { // header bottom line render_sharp_line(cr, colors->border, x, - title_y + tb->size.h - 1, + y + tb->size.h - 1, tb->size.w, 1); } } -- cgit v1.2.3 From 3955c66ce80989fa9d784eb9644fd41b096b3338 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Sun, 17 Apr 2016 13:36:17 +0200 Subject: Use tabs for indentation --- sway/border.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sway/border.c') diff --git a/sway/border.c b/sway/border.c index 80e51580..2eefbbf5 100644 --- a/sway/border.c +++ b/sway/border.c @@ -11,13 +11,13 @@ #include void cairo_set_source_u32(cairo_t *cairo, uint32_t color) { - color = htonl(color); + color = htonl(color); - cairo_set_source_rgba(cairo, - (color >> (2*8) & 0xFF) / 255.0, - (color >> (1*8) & 0xFF) / 255.0, - (color >> (0*8) & 0xFF) / 255.0, - (color >> (3*8) & 0xFF) / 255.0); + cairo_set_source_rgba(cairo, + (color >> (2*8) & 0xFF) / 255.0, + (color >> (1*8) & 0xFF) / 255.0, + (color >> (0*8) & 0xFF) / 255.0, + (color >> (3*8) & 0xFF) / 255.0); } static cairo_t *create_border_buffer(swayc_t *view, struct wlc_geometry geo, cairo_surface_t **surface) { -- cgit v1.2.3 From 3e1f78ab26e8bc6b6cefd53ee137e97533c2695e Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Wed, 20 Apr 2016 00:22:15 +0200 Subject: Add support for nested tabbed/stacked containers --- sway/border.c | 131 +++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 83 insertions(+), 48 deletions(-) (limited to 'sway/border.c') diff --git a/sway/border.c b/sway/border.c index 2eefbbf5..cc329b6a 100644 --- a/sway/border.c +++ b/sway/border.c @@ -20,28 +20,31 @@ void cairo_set_source_u32(cairo_t *cairo, uint32_t color) { (color >> (3*8) & 0xFF) / 255.0); } -static cairo_t *create_border_buffer(swayc_t *view, struct wlc_geometry geo, cairo_surface_t **surface) { +static cairo_t *create_border_buffer(swayc_t *view, struct wlc_geometry g, cairo_surface_t **surface) { + if (view->border == NULL) { + view->border = malloc(sizeof(struct border)); + } cairo_t *cr; - view->border_geometry = geo; - int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, geo.size.w); - view->border = calloc(stride * geo.size.h, sizeof(unsigned char)); - if (!view->border) { + int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, g.size.w); + view->border->buffer = calloc(stride * g.size.h, sizeof(unsigned char)); + view->border->geometry = g; + if (!view->border->buffer) { sway_log(L_DEBUG, "Unable to allocate buffer"); return NULL; } - *surface = cairo_image_surface_create_for_data(view->border, - CAIRO_FORMAT_ARGB32, geo.size.w, geo.size.h, stride); + *surface = cairo_image_surface_create_for_data(view->border->buffer, + CAIRO_FORMAT_ARGB32, g.size.w, g.size.h, stride); if (cairo_surface_status(*surface) != CAIRO_STATUS_SUCCESS) { free(view->border); - view->border = NULL; + view->border->buffer = NULL; sway_log(L_DEBUG, "Unable to allocate surface"); return NULL; } cr = cairo_create(*surface); if (cairo_status(cr) != CAIRO_STATUS_SUCCESS) { cairo_surface_destroy(*surface); - free(view->border); - view->border = NULL; + free(view->border->buffer); + view->border->buffer = NULL; sway_log(L_DEBUG, "Unable to create cairo context"); return NULL; } @@ -92,15 +95,19 @@ int get_font_text_height(const char *font) { } static void render_borders(swayc_t *view, cairo_t *cr, struct border_colors *colors, bool top) { + struct wlc_geometry *g = &view->border->geometry; struct wlc_geometry *b = &view->border_geometry; struct wlc_geometry *v = &view->actual_geometry; + int x = b->origin.x - g->origin.x; + int y = b->origin.y - g->origin.y; + // left border int left_border = v->origin.x - b->origin.x; if (left_border > 0) { render_sharp_line(cr, colors->child_border, - 0, 0, + x, y, left_border, b->size.h); } @@ -110,8 +117,8 @@ static void render_borders(swayc_t *view, cairo_t *cr, struct border_colors *col if (right_border > 0) { render_sharp_line(cr, colors->child_border, - b->size.w - right_border, - 0, + x + b->size.w - right_border, + y, right_border, b->size.h); } @@ -121,7 +128,7 @@ static void render_borders(swayc_t *view, cairo_t *cr, struct border_colors *col if (top && top_border > 0) { render_sharp_line(cr, colors->child_border, - 0, 0, + x, y, b->size.w, top_border); } @@ -131,16 +138,15 @@ static void render_borders(swayc_t *view, cairo_t *cr, struct border_colors *col if (bottom_border > 0) { render_sharp_line(cr, colors->child_border, - 0, - b->size.h - bottom_border, + x, + y + b->size.h - bottom_border, b->size.w, bottom_border); } } -static void render_title_bar(swayc_t *view, cairo_t *cr, struct border_colors *colors) { +static void render_title_bar(swayc_t *view, cairo_t *cr, struct wlc_geometry *b, struct border_colors *colors) { struct wlc_geometry *tb = &view->title_bar_geometry; - struct wlc_geometry *b = &view->border_geometry; int x = MIN(tb->origin.x, tb->origin.x - b->origin.x); int y = MIN(tb->origin.y, tb->origin.y - b->origin.y); @@ -197,6 +203,34 @@ void map_update_view_border(swayc_t *view, void *data) { } } +void update_tabbed_stacked_titlebars(swayc_t *c, cairo_t *cr, struct wlc_geometry *g, swayc_t *focused, swayc_t *focused_inactive) { + if (c->type == C_CONTAINER) { + if (c->parent->focused == c) { + render_title_bar(c, cr, g, &config->border_colors.focused_inactive); + } else { + render_title_bar(c, cr, g, &config->border_colors.unfocused); + } + + if (!c->visible) { + return; + } + + int i; + for (i = 0; i < c->children->length; ++i) { + swayc_t *child = c->children->items[i]; + update_tabbed_stacked_titlebars(child, cr, g, focused, focused_inactive); + } + } else { + if (focused == c) { + render_title_bar(c, cr, g, &config->border_colors.focused); + } else if (focused_inactive == c) { + render_title_bar(c, cr, g, &config->border_colors.focused_inactive); + } else { + render_title_bar(c, cr, g, &config->border_colors.unfocused); + } + } +} + void update_view_border(swayc_t *view) { if (!view->visible) { return; @@ -205,12 +239,12 @@ void update_view_border(swayc_t *view) { cairo_t *cr = NULL; cairo_surface_t *surface = NULL; - if (view->border) { - free(view->border); - view->border = NULL; + if (view->border && view->border->buffer) { + free(view->border->buffer); + view->border->buffer = NULL; } - // get focused and focused_intactive views + // get focused and focused_inactive views swayc_t *focused = get_focused_view(&root_container); swayc_t *container = swayc_parent_by_type(view, C_CONTAINER); swayc_t *focused_inactive = NULL; @@ -223,30 +257,27 @@ void update_view_border(swayc_t *view) { } } - swayc_t *p = view->parent; - - if (swayc_is_tabbed_stacked(view)) { - cr = create_border_buffer(view, view->border_geometry, &surface); - if (focused == view) { + // for tabbed/stacked layouts the focused view has to draw all the + // titlebars of the hidden views. + swayc_t *p = swayc_tabbed_stacked_parent(view); + if (p && view->parent->focused == view) { + struct wlc_geometry g = { + .origin = { + .x = p->x, + .y = p->y + }, + .size = { + .w = p->width, + .h = p->height + } + }; + cr = create_border_buffer(view, g, &surface); + if (view == focused) { render_borders(view, cr, &config->border_colors.focused, false); - } else if (focused_inactive == view) { - render_borders(view, cr, &config->border_colors.focused_inactive, false); } else { - render_borders(view, cr, &config->border_colors.unfocused, false); - } - - int i; - for (i = 0; i < p->children->length; ++i) { - swayc_t *child = p->children->items[i]; - - if (focused == child) { - render_title_bar(child, cr, &config->border_colors.focused); - } else if (focused_inactive == child) { - render_title_bar(child, cr, &config->border_colors.focused_inactive); - } else { - render_title_bar(child, cr, &config->border_colors.unfocused); - } + render_borders(view, cr, &config->border_colors.focused_inactive, false); } + update_tabbed_stacked_titlebars(p, cr, &g, focused, focused_inactive); } else { switch (view->border_type) { case B_NONE: @@ -274,13 +305,16 @@ void update_view_border(swayc_t *view) { if (focused == view) { render_borders(view, cr, &config->border_colors.focused, false); - render_title_bar(view, cr, &config->border_colors.focused); + render_title_bar(view, cr, &view->border_geometry, + &config->border_colors.focused); } else if (focused_inactive == view) { render_borders(view, cr, &config->border_colors.focused_inactive, false); - render_title_bar(view, cr, &config->border_colors.focused_inactive); + render_title_bar(view, cr, &view->border_geometry, + &config->border_colors.focused_inactive); } else { render_borders(view, cr, &config->border_colors.unfocused, false); - render_title_bar(view, cr, &config->border_colors.unfocused); + render_title_bar(view, cr, &view->border_geometry, + &config->border_colors.unfocused); } break; @@ -291,6 +325,7 @@ void update_view_border(swayc_t *view) { cairo_surface_flush(surface); cairo_surface_destroy(surface); } + if (cr) { cairo_destroy(cr); } @@ -316,7 +351,7 @@ void render_view_borders(wlc_handle view) { } } - if (c->border) { - wlc_pixels_write(WLC_RGBA8888, &c->border_geometry, c->border); + if (c->border && c->border->buffer) { + wlc_pixels_write(WLC_RGBA8888, &c->border->geometry, c->border->buffer); } } -- cgit v1.2.3 From 6c7ed7e7cb1f25429db05103b98e6fcee11d0362 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Sun, 24 Apr 2016 01:47:57 +0200 Subject: Add title to nested tabbed/stacked containers --- sway/border.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) (limited to 'sway/border.c') diff --git a/sway/border.c b/sway/border.c index cc329b6a..cec443f4 100644 --- a/sway/border.c +++ b/sway/border.c @@ -203,6 +203,62 @@ void map_update_view_border(swayc_t *view, void *data) { } } +/** + * Generate nested container title for tabbed/stacked layouts + */ +static char *generate_container_title(swayc_t *container) { + char layout = 'H'; + char *name, *prev_name = NULL; + switch (container->layout) { + case L_TABBED: + layout = 'T'; + break; + case L_STACKED: + layout = 'S'; + break; + case L_VERT: + layout = 'V'; + break; + default: + layout = 'H'; + } + int len = 9; + name = malloc(len * sizeof(char)); + snprintf(name, len, "sway: %c[", layout); + + int i; + for (i = 0; i < container->children->length; ++i) { + prev_name = name; + swayc_t* child = container->children->items[i]; + const char *title = child->name; + if (child->type == C_CONTAINER) { + title = generate_container_title(child); + } + + len = strlen(name) + strlen(title) + 1; + if (i < container->children->length-1) { + len++; + } + + name = malloc(len * sizeof(char)); + if (i < container->children->length-1) { + snprintf(name, len, "%s%s ", prev_name, title); + } else { + snprintf(name, len, "%s%s", prev_name, title); + } + free(prev_name); + } + + prev_name = name; + len = strlen(name) + 2; + name = malloc(len * sizeof(char)); + snprintf(name, len, "%s]", prev_name); + free(prev_name); + free(container->name); + container->name = name; + return container->name + 6; // don't include "sway: " +} + void update_tabbed_stacked_titlebars(swayc_t *c, cairo_t *cr, struct wlc_geometry *g, swayc_t *focused, swayc_t *focused_inactive) { if (c->type == C_CONTAINER) { if (c->parent->focused == c) { @@ -277,6 +333,16 @@ void update_view_border(swayc_t *view) { } else { render_borders(view, cr, &config->border_colors.focused_inactive, false); } + + // generate container titles + int i; + for (i = 0; i < p->children->length; ++i) { + swayc_t *child = p->children->items[i]; + if (child->type == C_CONTAINER) { + generate_container_title(child); + } + } + update_tabbed_stacked_titlebars(p, cr, &g, focused, focused_inactive); } else { switch (view->border_type) { -- cgit v1.2.3