mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-09 13:30:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update .clang-format

Browse source 
Align with wlroots style
This commit is contained in:
Johan Malm 2020-09-28 20:41:41 +01:00
parent 96b5ab1fc1
commit 96e05057a3
32 changed files with 669 additions and 515 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/xbm/parse.c
View file

@ -5,32 +5,36 @@
*/
#define _POSIX_C_SOURCE 200809L
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
#include <stdbool.h>
#include "xbm/parse.h"
#include "common/bug-on.h"
#include "xbm/parse.h"
static uint32_t color;
static uint32_t u32(float *rgba)
static uint32_t
u32(float *rgba)
{
uint32_t r[4] = { 0 };
for (int i = 0; i < 4; i++)
for (int i = 0; i < 4; i++) {
r[i] = rgba[i] * 255;
}
return ((r[3] & 0xff) << 24) | ((r[0] & 0xff) << 16) |
((r[1] & 0xff) << 8) | (r[2] & 0xff);
}
void parse_set_color(float *rgba)
void
parse_set_color(float *rgba)
{
color = u32(rgba);
}
static void process_bytes(struct pixmap *pixmap, struct token *tokens)
static void
process_bytes(struct pixmap *pixmap, struct token *tokens)
{
pixmap->data = (uint32_t *)calloc(pixmap->width * pixmap->height,
sizeof(uint32_t));
@ -42,33 +46,39 @@ static void process_bytes(struct pixmap *pixmap, struct token *tokens)
++byte;
++t;
}
if (!t->type)
if (!t->type) {
return;
if (t->type != TOKEN_INT)
}
if (t->type != TOKEN_INT) {
return;
}
int bit = 1 << (col % 8);
if (t->value & bit)
if (t->value & bit) {
pixmap->data[row * pixmap->width + col] = color;
}
}
++t;
}
}
struct pixmap parse_xbm_tokens(struct token *tokens)
struct pixmap
parse_xbm_tokens(struct token *tokens)
{
struct pixmap pixmap = { 0 };
for (struct token *t = tokens; t->type; t++) {
if (pixmap.width && pixmap.height) {
if (t->type != TOKEN_INT)
if (t->type != TOKEN_INT) {
continue;
}
process_bytes(&pixmap, t);
goto out;
}
if (strstr(t->name, "width"))
if (strstr(t->name, "width")) {
pixmap.width = atoi((++t)->name);
else if (strstr(t->name, "height"))
} else if (strstr(t->name, "height")) {
pixmap.height = atoi((++t)->name);
}
}
out:
return pixmap;
@ -79,7 +89,8 @@ out:
* function to cope wit that max size
*/
#define LABWC_BUILTIN_ICON_MAX_SIZE (8)
struct pixmap parse_xbm_builtin(const char *button, int size)
struct pixmap
parse_xbm_builtin(const char *button, int size)
{
struct pixmap pixmap = { 0 };

21
src/xbm/tokenize.c
View file

@ -14,7 +14,8 @@ static char *current_buffer_position;
static struct token *tokens;
static int nr_tokens, alloc_tokens;
static void add_token(enum token_type token_type)
static void
add_token(enum token_type token_type)
{
if (nr_tokens == alloc_tokens) {
alloc_tokens = (alloc_tokens + 16) * 2;
@ -26,13 +27,15 @@ static void add_token(enum token_type token_type)
token->type = token_type;
}
static void get_identifier_token()
static void
get_identifier_token()
{
struct token *token = tokens + nr_tokens - 1;
token->name[token->pos] = current_buffer_position[0];
token->pos++;
if (token->pos == MAX_TOKEN_SIZE - 1)
if (token->pos == MAX_TOKEN_SIZE - 1) {
return;
}
current_buffer_position++;
switch (current_buffer_position[0]) {
case '\0':
@ -49,13 +52,15 @@ static void get_identifier_token()
}
}
static void get_number_token()
static void
get_number_token()
{
struct token *token = tokens + nr_tokens - 1;
token->name[token->pos] = current_buffer_position[0];
token->pos++;
if (token->pos == MAX_TOKEN_SIZE - 1)
if (token->pos == MAX_TOKEN_SIZE - 1) {
return;
}
current_buffer_position++;
switch (current_buffer_position[0]) {
case '\0':
@ -71,14 +76,16 @@ static void get_number_token()
}
}
static void get_special_char_token()
static void
get_special_char_token()
{
struct token *token = tokens + nr_tokens - 1;
token->name[0] = current_buffer_position[0];
current_buffer_position++;
}
struct token *tokenize_xbm(char *buffer)
struct token *
tokenize_xbm(char *buffer)
{
tokens = NULL;
nr_tokens = 0;

65
src/xbm/xbm.c
View file

@ -7,12 +7,12 @@
#include <stdio.h>
#include <stdlib.h>
#include "theme/theme.h"
#include "xbm/xbm.h"
#include "xbm/parse.h"
#include "config/rcxml.h"
#include "common/dir.h"
#include "common/grab-file.h"
#include "config/rcxml.h"
#include "theme/theme.h"
#include "xbm/parse.h"
#include "xbm/xbm.h"
/* built-in 6x6 buttons */
char close_button_normal[] = { 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 };
@ -20,27 +20,30 @@ 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 };
static struct wlr_texture *texture_from_pixmap(struct wlr_renderer *renderer,
struct pixmap *pixmap)
static struct wlr_texture *
texture_from_pixmap(struct wlr_renderer *renderer, struct pixmap *pixmap)
{
if (!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 *texture_from_builtin(struct wlr_renderer *renderer,
const char *button)
static struct wlr_texture *
texture_from_builtin(struct wlr_renderer *renderer, const char *button)
{
struct pixmap pixmap = parse_xbm_builtin(button, 6);
struct wlr_texture *texture = texture_from_pixmap(renderer, &pixmap);
if (pixmap.data)
if (pixmap.data) {
free(pixmap.data);
}
return texture;
}
static char *xbm_path(const char *button)
static char *
xbm_path(const char *button)
{
static char buffer[4096] = { 0 };
snprintf(buffer, sizeof(buffer), "%s/%s", theme_dir(rc.theme_name),
@ -48,38 +51,48 @@ static char *xbm_path(const char *button)
return buffer;
}
static void load_button(struct wlr_renderer *renderer, const char *filename,
struct wlr_texture **texture, char *button)
static void
load_button(struct wlr_renderer *renderer, const char *filename,
struct wlr_texture **texture, char *button)
{
/* Read file into memory as it's easier to tokenzie that way */
char *buffer = grab_file(xbm_path(filename));
if (!buffer)
if (!buffer) {
goto out;
}
struct token *tokens = tokenize_xbm(buffer);
free(buffer);
struct pixmap pixmap = parse_xbm_tokens(tokens);
*texture = texture_from_pixmap(renderer, &pixmap);
if (tokens)
if (tokens) {
free(tokens);
if (pixmap.data)
}
if (pixmap.data) {
free(pixmap.data);
}
out:
if (!(*texture))
if (!(*texture)) {
*texture = texture_from_builtin(renderer, button);
}
}
/* clang-format off */
void xbm_load(struct wlr_renderer *r)
void
xbm_load(struct wlr_renderer *r)
{
parse_set_color(theme.window_active_button_unpressed_image_color);
load_button(r, "close.xbm", &theme.xbm_close_active_unpressed, close_button_normal);
load_button(r, "max.xbm", &theme.xbm_maximize_active_unpressed, max_button_normal);
load_button(r, "iconify.xbm", &theme.xbm_iconify_active_unpressed, iconify_button_normal);
load_button(r, "close.xbm", &theme.xbm_close_active_unpressed,
close_button_normal);
load_button(r, "max.xbm", &theme.xbm_maximize_active_unpressed,
max_button_normal);
load_button(r, "iconify.xbm", &theme.xbm_iconify_active_unpressed,
iconify_button_normal);
parse_set_color(theme.window_inactive_button_unpressed_image_color);
load_button(r, "close.xbm", &theme.xbm_close_inactive_unpressed, close_button_normal);
load_button(r, "max.xbm", &theme.xbm_maximize_inactive_unpressed, max_button_normal);
load_button(r, "iconify.xbm", &theme.xbm_iconify_inactive_unpressed, iconify_button_normal);
load_button(r, "close.xbm", &theme.xbm_close_inactive_unpressed,
close_button_normal);
load_button(r, "max.xbm", &theme.xbm_maximize_inactive_unpressed,
max_button_normal);
load_button(r, "iconify.xbm", &theme.xbm_iconify_inactive_unpressed,
iconify_button_normal);
}
/* clang-format on */