mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-13 04:27:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

tree-wide: use enum types/constants where appropriate

Browse source 
- add LAB_WINDOW_TYPE_INVALID in place of literal -1
- document more clearly that enum lab_view_criteria is a bitset
- other one-off replacements of integer values/types for consistency

Note: variables of type enum lab_view_criteria are already used
extensively throughout the code to contain combinations of the declared
enum values. I am not introducing any new usage here, just changing the
single uint32_t to be consistent with all the other usages.
This commit is contained in:
John Lindgren 2025-08-26 23:48:05 -04:00 • committed by Hiroaki Yamamoto
parent ef766d16f0
commit 80b28f16c7
10 changed files with 27 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/config/rcxml.c
View file

@ -56,11 +56,11 @@ enum font_place {
static void load_default_key_bindings(void);
static void load_default_mouse_bindings(void);
static int
static enum lab_window_type
parse_window_type(const char *type)
{
if (!type) {
return -1;
return LAB_WINDOW_TYPE_INVALID;
}
if (!strcasecmp(type, "desktop")) {
return LAB_WINDOW_TYPE_DESKTOP;
@ -91,7 +91,7 @@ parse_window_type(const char *type)
} else if (!strcasecmp(type, "normal")) {
return LAB_WINDOW_TYPE_NORMAL;
} else {
return -1;
return LAB_WINDOW_TYPE_INVALID;
}
}
@ -258,7 +258,7 @@ static void
fill_window_rule(xmlNode *node)
{
struct window_rule *window_rule = znew(*window_rule);
window_rule->window_type = -1; // Window types are >= 0
window_rule->window_type = LAB_WINDOW_TYPE_INVALID;
wl_list_append(&rc.window_rules, &window_rule->link);
wl_list_init(&window_rule->actions);
@ -1406,7 +1406,7 @@ rcxml_init(void)
rc.tablet.force_mouse_emulation = false;
rc.tablet.output_name = NULL;
rc.tablet.rotation = 0;
rc.tablet.rotation = LAB_ROTATE_NONE;
rc.tablet.box = (struct wlr_fbox){0};
tablet_load_default_button_mappings();
rc.tablet_tool.motion = LAB_MOTION_ABSOLUTE;

2
src/img/img-xbm.c
View file

@ -251,7 +251,7 @@ parse_xbm_builtin(const char *button, int size, uint32_t color)
t[i].value = button[i];
t[i].type = TOKEN_INT;
}
t[size].type = 0;
t[size].type = TOKEN_NONE;
process_bytes(&pixmap, t, color);
return pixmap;
}

4
src/input/cursor.c
View file

@ -882,7 +882,7 @@ handle_motion(struct wl_listener *listener, void *data)
cursor_set_visible(seat, /* visible */ true);
if (seat->cursor_scroll_wheel_emulation) {
uint32_t orientation;
enum wl_pointer_axis orientation;
double delta;
if (fabs(event->delta_x) > fabs(event->delta_y)) {
orientation = WL_POINTER_AXIS_HORIZONTAL_SCROLL;
@ -1014,7 +1014,7 @@ is_double_click(long double_click_speed, uint32_t button,
*/
last_button = 0;
last_view = NULL;
last_type = 0;
last_type = LAB_SSD_NONE;
return true;
}
return false;

5
src/view.c
View file

@ -79,7 +79,7 @@ view_query_create(void)
{
struct view_query *query = znew(*query);
/* Must be synced with view_matches_criteria() in window-rules.c */
query->window_type = -1;
query->window_type = LAB_WINDOW_TYPE_INVALID;
query->maximized = VIEW_AXIS_INVALID;
query->decoration = LAB_SSD_MODE_INVALID;
return query;
@ -132,7 +132,8 @@ view_matches_query(struct view *view, struct view_query *query)
return false;
}
if (query->window_type >= 0 && !view_contains_window_type(view, query->window_type)) {
if (query->window_type != LAB_WINDOW_TYPE_INVALID
&& !view_contains_window_type(view, query->window_type)) {
return false;
}