mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Render close, iconify and maximize buttons

Browse source
This commit is contained in:
Johan Malm 2020-07-06 21:58:51 +01:00
parent e1b86555f4
commit f7fa28ab42
10 changed files with 140 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

80
src/deco.c
View file

@ -5,64 +5,84 @@
*/
#include "labwc.h"
#include "theme.h"
/* Based on expected font height of Sans 8 */
#define TITLE_HEIGHT (14)
#define BORDER_WIDTH (1)
struct wlr_box deco_max_extents(struct view *view)
{
struct wlr_box box = {
.x = view->x - XWL_WINDOW_BORDER,
.y = view->y - XWL_TITLEBAR_HEIGHT - XWL_WINDOW_BORDER,
.width = view->surface->current.width + 2 * XWL_WINDOW_BORDER,
.height = view->surface->current.height + XWL_TITLEBAR_HEIGHT +
2 * XWL_WINDOW_BORDER,
.x = view->x - BORDER_WIDTH,
.y = view->y - TITLE_HEIGHT - BORDER_WIDTH,
.width = view->surface->current.width + 2 * BORDER_WIDTH,
.height = view->surface->current.height + TITLE_HEIGHT +
2 * BORDER_WIDTH,
};
return box;
}
struct wlr_box deco_box(struct view *view, enum deco_part deco_part)
{
int margin;
struct wlr_box box = { .x = 0, .y = 0, .width = 0, .height = 0 };
if (!view || !view->surface)
return box;
switch (deco_part) {
case LAB_DECO_ICON_CLOSE:
box.x = view->x + view->surface->current.width - 8 - 1;
box.y = view->y - XWL_TITLEBAR_HEIGHT + 1;
box.width = 8;
box.height = 8;
case LAB_DECO_BUTTON_CLOSE:
wlr_texture_get_size(theme.xbm_close, &box.width, &box.height);
margin = (TITLE_HEIGHT - box.height) / 2;
box.x = view->x + view->surface->current.width + margin -
TITLE_HEIGHT;
box.y = view->y - TITLE_HEIGHT + margin;
break;
case LAB_DECO_BUTTON_MAXIMIZE:
wlr_texture_get_size(theme.xbm_maximize, &box.width,
&box.height);
margin = (TITLE_HEIGHT - box.height) / 2;
box.x = view->x + view->surface->current.width + margin -
TITLE_HEIGHT * 2;
box.y = view->y - TITLE_HEIGHT + margin;
break;
case LAB_DECO_BUTTON_ICONIFY:
wlr_texture_get_size(theme.xbm_iconify, &box.width,
&box.height);
margin = (TITLE_HEIGHT - box.height) / 2;
box.x = view->x + view->surface->current.width + margin -
TITLE_HEIGHT * 3;
box.y = view->y - TITLE_HEIGHT + margin;
break;
case LAB_DECO_PART_TITLE:
box.x = view->x;
box.y = view->y - XWL_TITLEBAR_HEIGHT;
box.y = view->y - TITLE_HEIGHT;
box.width = view->surface->current.width;
box.height = XWL_TITLEBAR_HEIGHT;
box.height = TITLE_HEIGHT;
break;
case LAB_DECO_PART_TOP:
box.x = view->x - XWL_WINDOW_BORDER;
box.y = view->y - XWL_TITLEBAR_HEIGHT - XWL_WINDOW_BORDER;
box.width =
view->surface->current.width + 2 * XWL_WINDOW_BORDER;
box.height = XWL_WINDOW_BORDER;
box.x = view->x - BORDER_WIDTH;
box.y = view->y - TITLE_HEIGHT - BORDER_WIDTH;
box.width = view->surface->current.width + 2 * BORDER_WIDTH;
box.height = BORDER_WIDTH;
break;
case LAB_DECO_PART_RIGHT:
box.x = view->x + view->surface->current.width;
box.y = view->y - XWL_TITLEBAR_HEIGHT;
box.width = XWL_WINDOW_BORDER;
box.height =
view->surface->current.height + XWL_TITLEBAR_HEIGHT;
box.y = view->y - TITLE_HEIGHT;
box.width = BORDER_WIDTH;
box.height = view->surface->current.height + TITLE_HEIGHT;
break;
case LAB_DECO_PART_BOTTOM:
box.x = view->x - XWL_WINDOW_BORDER;
box.x = view->x - BORDER_WIDTH;
box.y = view->y + view->surface->current.height;
box.width =
view->surface->current.width + 2 * XWL_WINDOW_BORDER;
box.height = +XWL_WINDOW_BORDER;
box.width = view->surface->current.width + 2 * BORDER_WIDTH;
box.height = +BORDER_WIDTH;
break;
case LAB_DECO_PART_LEFT:
box.x = view->x - XWL_WINDOW_BORDER;
box.y = view->y - XWL_TITLEBAR_HEIGHT;
box.width = XWL_WINDOW_BORDER;
box.height =
view->surface->current.height + XWL_TITLEBAR_HEIGHT;
box.x = view->x - BORDER_WIDTH;
box.y = view->y - TITLE_HEIGHT;
box.width = BORDER_WIDTH;
box.height = view->surface->current.height + TITLE_HEIGHT;
break;
default:
break;

8
src/output.c
View file

@ -39,6 +39,8 @@ static void render_cycle_box(struct output *output)
static void render_icon(struct draw_data *d, struct wlr_box box,
struct wlr_texture *texture)
{
if (!texture)
return;
float matrix[9];
wlr_matrix_project_box(matrix, &box, WL_OUTPUT_TRANSFORM_NORMAL, 0,
d->transform_matrix);
@ -66,8 +68,12 @@ static void render_decorations(struct wlr_output *output, struct view *view)
ddata.rgba = theme.window_inactive_title_bg_color;
draw_rect(&ddata, deco_box(view, LAB_DECO_PART_TITLE));
render_icon(&ddata, deco_box(view, LAB_DECO_ICON_CLOSE),
render_icon(&ddata, deco_box(view, LAB_DECO_BUTTON_CLOSE),
theme.xbm_close);
render_icon(&ddata, deco_box(view, LAB_DECO_BUTTON_MAXIMIZE),
theme.xbm_maximize);
render_icon(&ddata, deco_box(view, LAB_DECO_BUTTON_ICONIFY),
theme.xbm_iconify);
}
struct render_data {

27
src/theme/xbm/parse.c
View file

@ -36,10 +36,12 @@ static void process_bytes(struct pixmap *pixmap, struct token *tokens)
}
if (!t->type)
return;
int value = (int)strtol(t->name, NULL, 0);
if (t->type != TOKEN_INT)
return;
int bit = 1 << (col % 8);
if (value & bit)
pixmap->data[row * pixmap->width + col] = u32(defaultcolor);
if (t->value & bit)
pixmap->data[row * pixmap->width + col] =
u32(defaultcolor);
}
++t;
}
@ -65,6 +67,25 @@ out:
return pixmap;
}
/* Assuming a 6x6 button for the time being */
/* TODO: pass width, height, vargs bytes */
struct pixmap xbm_create_pixmap_builtin(const char *button)
{
struct pixmap pixmap = { 0 };
pixmap.width = 6;
pixmap.height = 6;
struct token t[7];
for (int i = 0; i < 6; i++) {
t[i].value = button[i];
t[i].type = TOKEN_INT;
}
t[6].type = 0;
process_bytes(&pixmap, t);
return pixmap;
}
char *xbm_read_file(const char *filename)
{
char *line = NULL;

2
src/theme/xbm/tokenize.c
View file

@ -96,6 +96,8 @@ struct token *xbm_tokenize(char *buffer)
case '0' ... '9':
add_token(TOKEN_INT);
get_number_token();
struct token *token = tokens + nr_tokens - 1;
token->value = (int)strtol(token->name, NULL, 0);
continue;
case '{':
add_token(TOKEN_SPECIAL);

46
src/theme/xbm/xbm.c
View file

@ -10,8 +10,38 @@
#include "theme/xbm/xbm.h"
#include "theme/xbm/parse.h"
/* built-in 6x6 buttons */
char close_button_normal[] = { 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 };
char iconify_button_normal[] = { 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f };
char max_button_normal[] = { 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f };
char max_button_toggled[] = { 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f };
/*
* TODO: parse rc.xml theme name and look for icons properly.
* Just using random icon to prove the point.
*/
static char filename[] = "/usr/share/themes/Bear2/openbox-3/close.xbm";
static struct wlr_texture *texture_from_pixmap(struct wlr_renderer *renderer,
struct pixmap *pixmap)
{
if (!pixmap)
return NULL;
return wlr_texture_from_pixels(renderer, WL_SHM_FORMAT_ARGB8888,
pixmap->width * 4, pixmap->width,
pixmap->height, pixmap->data);
}
static struct wlr_texture *builtin(struct wlr_renderer *renderer,
const char *button)
{
struct pixmap pixmap = xbm_create_pixmap_builtin(button);
struct wlr_texture *texture = texture_from_pixmap(renderer, &pixmap);
if (pixmap.data)
free(pixmap.data);
return texture;
}
void xbm_load(struct wlr_renderer *renderer)
{
struct token *tokens;
@ -19,16 +49,20 @@ void xbm_load(struct wlr_renderer *renderer)
char *buffer = xbm_read_file(filename);
if (!buffer) {
fprintf(stderr, "no buffer\n");
return;
goto out;
}
tokens = xbm_tokenize(buffer);
free(buffer);
struct pixmap pixmap = xbm_create_pixmap(tokens);
free(tokens);
theme.xbm_close = wlr_texture_from_pixels(
renderer, WL_SHM_FORMAT_ARGB8888, pixmap.width * 4,
pixmap.width, pixmap.height, pixmap.data);
theme.xbm_close = texture_from_pixmap(renderer, &pixmap);
if (tokens)
free(tokens);
if (pixmap.data)
free(pixmap.data);
out:
if (!theme.xbm_close)
theme.xbm_close = builtin(renderer, close_button_normal);
theme.xbm_maximize = builtin(renderer, max_button_normal);
theme.xbm_iconify = builtin(renderer, iconify_button_normal);
}