mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-04-10 08:21:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Disambiguate tag_(bit|number) and harden get_name_from_tag

Browse source
This commit is contained in:
Gerry Hernandez 2026-03-10 11:25:04 -07:00
parent a4a06ca1d5
commit 923c7add5b
1 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/ext-protocol/ext-workspace.h
View file

@ -1,4 +1,7 @@
#include "wlr_ext_workspace_v1.h" #include "wlr_ext_workspace_v1.h"
#include <assert.h>
#define WORKSPACE_NAME_MAX_SIZE 12
#define EXT_WORKSPACE_ENABLE_CAPS \ #define EXT_WORKSPACE_ENABLE_CAPS \
EXT_WORKSPACE_HANDLE_V1_WORKSPACE_CAPABILITIES_ACTIVATE | \ EXT_WORKSPACE_HANDLE_V1_WORKSPACE_CAPABILITIES_ACTIVATE | \
@ -8,8 +11,8 @@ typedef struct Monitor Monitor;
struct workspace { struct workspace {
struct wl_list link; // Link in global workspaces list struct wl_list link; // Link in global workspaces list
uint32_t tag; // Numeric identifier (1-9, 0=overview) uint32_t tag; // Identifier (tag number) in [0=overview, tag_count]
Monitor *m; // Associated monitor Monitor *m; // Associated monitor
struct wlr_ext_workspace_handle_v1 *ext_workspace; // Protocol object struct wlr_ext_workspace_handle_v1 *ext_workspace; // Protocol object
/* Event listeners */ /* Event listeners */
struct wl_listener activate; struct wl_listener activate;
@ -22,24 +25,24 @@ struct wlr_ext_workspace_manager_v1 *ext_manager;
struct wl_list workspaces; struct wl_list workspaces;
void goto_workspace(struct workspace *target) { void goto_workspace(struct workspace *target) {
uint32_t tag; uint32_t tag_bit;
tag = 1 << (target->tag - 1); tag_bit = 1 << (target->tag - 1);
if (target->tag == 0) { if (target->tag == 0) {
toggleoverview(&(Arg){.i = -1}); toggleoverview(&(Arg){.i = -1});
return; return;
} else { } else {
view(&(Arg){.ui = tag}, true); view(&(Arg){.ui = tag_bit}, true);
} }
} }
void toggle_workspace(struct workspace *target) { void toggle_workspace(struct workspace *target) {
uint32_t tag; uint32_t tag_bit;
tag = 1 << (target->tag - 1); tag_bit = 1 << (target->tag - 1);
if (target->tag == 0) { if (target->tag == 0) {
toggleview(&(Arg){.i = -1}); toggleview(&(Arg){.i = -1});
return; return;
} else { } else {
toggleview(&(Arg){.ui = tag}); toggleview(&(Arg){.ui = tag_bit});
} }
} }
@ -69,13 +72,13 @@ static void handle_ext_workspace_deactivate(struct wl_listener *listener,
wlr_log(WLR_INFO, "ext deactivating workspace %d", workspace->tag); wlr_log(WLR_INFO, "ext deactivating workspace %d", workspace->tag);
} }
static const char *get_name_from_tag(uint32_t tag, char *buf, size_t len) { static void get_name_from_tag_number(char *dst_buf, size_t dst_len,
if (tag == 0) uint32_t tag_number) {
return "overview"; assert(tag_number <= (uint32_t)tag_count);
if (tag > (uint32_t)tag_count) if (tag_number == 0)
return NULL; snprintf(dst_buf, dst_len, "overview");
snprintf(buf, len, "%u", CLAMP_INT(tag, 1, 32)); else
return buf; snprintf(dst_buf, dst_len, "%u", tag_number);
} }
void destroy_workspace(struct workspace *workspace) { void destroy_workspace(struct workspace *workspace) {
@ -105,9 +108,9 @@ static void remove_workspace_by_tag(uint32_t tag, Monitor *m) {
} }
} }
static void add_workspace_by_tag(int32_t tag, Monitor *m) { static void add_workspace_by_tag(uint32_t tag, Monitor *m) {
char name_buf[4]; char name[WORKSPACE_NAME_MAX_SIZE];
const char *name = get_name_from_tag(tag, name_buf, sizeof(name_buf)); get_name_from_tag_number(name, sizeof(name), tag);
struct workspace *workspace = ecalloc(1, sizeof(*workspace)); struct workspace *workspace = ecalloc(1, sizeof(*workspace));
wl_list_append(&workspaces, &workspace->link); wl_list_append(&workspaces, &workspace->link);