alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #606 from mikkeloscar/tabbed-stacking-layout

Browse source 
border: clear buffer on fullscreen views
This commit is contained in:
Drew DeVault 2016-04-27 07:19:47 -04:00
parent 70f0099918 ddd5b69b99
commit 89af3f78b2
3 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/border.h
View file

@ -3,11 +3,19 @@
#include <wlc/wlc.h> #include <wlc/wlc.h>
#include "container.h" #include "container.h"
/**
* Border pixel buffer and corresponding geometry.
*/
struct border { struct border {
unsigned char *buffer; unsigned char *buffer;
struct wlc_geometry geometry; struct wlc_geometry geometry;
}; };
/**
* Clear border buffer.
*/
void border_clear(struct border *border);
void render_view_borders(wlc_handle view); void render_view_borders(wlc_handle view);
void update_view_border(swayc_t *view); void update_view_border(swayc_t *view);
void map_update_view_border(swayc_t *view, void *data); void map_update_view_border(swayc_t *view, void *data);

26
sway/border.c
View file

@ -4,12 +4,11 @@
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <arpa/inet.h>
#include "container.h" #include "container.h"
#include "config.h" #include "config.h"
#include "client/pango.h" #include "client/pango.h"
#include <arpa/inet.h>
void cairo_set_source_u32(cairo_t *cairo, uint32_t color) { void cairo_set_source_u32(cairo_t *cairo, uint32_t color) {
color = htonl(color); color = htonl(color);
@ -20,6 +19,13 @@ void cairo_set_source_u32(cairo_t *cairo, uint32_t color) {
(color >> (3*8) & 0xFF) / 255.0); (color >> (3*8) & 0xFF) / 255.0);
} }
void border_clear(struct border *border) {
if (border && border->buffer) {
free(border->buffer);
border->buffer = NULL;
}
}
static cairo_t *create_border_buffer(swayc_t *view, struct wlc_geometry g, 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) { if (view->border == NULL) {
view->border = malloc(sizeof(struct border)); view->border = malloc(sizeof(struct border));
@ -35,16 +41,14 @@ static cairo_t *create_border_buffer(swayc_t *view, struct wlc_geometry g, cairo
*surface = cairo_image_surface_create_for_data(view->border->buffer, *surface = cairo_image_surface_create_for_data(view->border->buffer,
CAIRO_FORMAT_ARGB32, g.size.w, g.size.h, stride); CAIRO_FORMAT_ARGB32, g.size.w, g.size.h, stride);
if (cairo_surface_status(*surface) != CAIRO_STATUS_SUCCESS) { if (cairo_surface_status(*surface) != CAIRO_STATUS_SUCCESS) {
free(view->border); border_clear(view->border);
view->border->buffer = NULL;
sway_log(L_DEBUG, "Unable to allocate surface"); sway_log(L_DEBUG, "Unable to allocate surface");
return NULL; return NULL;
} }
cr = cairo_create(*surface); cr = cairo_create(*surface);
if (cairo_status(cr) != CAIRO_STATUS_SUCCESS) { if (cairo_status(cr) != CAIRO_STATUS_SUCCESS) {
cairo_surface_destroy(*surface); cairo_surface_destroy(*surface);
free(view->border->buffer); border_clear(view->border);
view->border->buffer = NULL;
sway_log(L_DEBUG, "Unable to create cairo context"); sway_log(L_DEBUG, "Unable to create cairo context");
return NULL; return NULL;
} }
@ -295,10 +299,8 @@ void update_view_border(swayc_t *view) {
cairo_t *cr = NULL; cairo_t *cr = NULL;
cairo_surface_t *surface = NULL; cairo_surface_t *surface = NULL;
if (view->border && view->border->buffer) { // clear previous border buffer.
free(view->border->buffer); border_clear(view->border);
view->border->buffer = NULL;
}
// get focused and focused_inactive views // get focused and focused_inactive views
swayc_t *focused = get_focused_view(&root_container); swayc_t *focused = get_focused_view(&root_container);
@ -315,8 +317,8 @@ void update_view_border(swayc_t *view) {
// for tabbed/stacked layouts the focused view has to draw all the // for tabbed/stacked layouts the focused view has to draw all the
// titlebars of the hidden views. // titlebars of the hidden views.
swayc_t *p = swayc_tabbed_stacked_parent(view); swayc_t *p = NULL;
if (p && view->parent->focused == view) { if (view->parent->focused == view && (p = swayc_tabbed_stacked_parent(view))) {
struct wlc_geometry g = { struct wlc_geometry g = {
.origin = { .origin = {
.x = p->x, .x = p->x,

1
sway/layout.c
View file

@ -555,6 +555,7 @@ void update_geometry(swayc_t *container) {
container->border_geometry = wlc_geometry_zero; container->border_geometry = wlc_geometry_zero;
container->title_bar_geometry = wlc_geometry_zero; container->title_bar_geometry = wlc_geometry_zero;
border_clear(container->border);
} else if (container->is_floating) { // allocate border for floating window } else if (container->is_floating) { // allocate border for floating window
update_border_geometry_floating(container, &geometry); update_border_geometry_floating(container, &geometry);
} else if (!container->is_floating) { // allocate border for titled window } else if (!container->is_floating) { // allocate border for titled window