From ce23bbbe89cb8637765b00b86addee6ca291caef Mon Sep 17 00:00:00 2001 From: dehroox Date: Mon, 1 Sep 2025 14:20:16 +0800 Subject: replace random 20 (???) with MAX_SCRATCHPADS --- src/defs.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/defs.h') diff --git a/src/defs.h b/src/defs.h index 27d16fd..8191746 100644 --- a/src/defs.h +++ b/src/defs.h @@ -20,7 +20,7 @@ #define UDIST(a, b) abs((int)(a) - (int)(b)) #define CLAMP(x, lo, hi) (((x) < (lo)) ? (lo) : ((x) > (hi)) ? (hi) : (x)) #define MAX_CLIENTS 99 -#define MAX_SCRATCHPADS 20 +#define MAX_SCRATCHPADS 32 #define MIN_WINDOW_SIZE 20 #define MAX_ITEMS 256 #define BIND(mod, key, cmdstr) {(mod), XK_##key, {cmdstr}, False} @@ -108,8 +108,13 @@ typedef struct { char **should_float[MAX_ITEMS]; char **start_fullscreen[MAX_ITEMS]; char **can_swallow[MAX_ITEMS]; +<<<<<<< HEAD char **can_be_swallowed[MAX_ITEMS]; char **scratchpads[32]; +======= + char **can_be_swallowed[MAX_ITEMS]; + char **scratchpads[MAX_SCRATCHPADS]; +>>>>>>> e770299 (replace random 20 (???) with MAX_SCRATCHPADS) char **open_in_workspace[MAX_ITEMS]; char *to_run[MAX_ITEMS]; } Config; -- cgit v1.2.3 From bb31e55304ac3a84383ba9bfc6e5de851f2a61b2 Mon Sep 17 00:00:00 2001 From: dehroox Date: Tue, 2 Sep 2025 21:10:19 +0800 Subject: fix git shiz --- src/defs.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/defs.h') diff --git a/src/defs.h b/src/defs.h index 8191746..5750a05 100644 --- a/src/defs.h +++ b/src/defs.h @@ -108,13 +108,8 @@ typedef struct { char **should_float[MAX_ITEMS]; char **start_fullscreen[MAX_ITEMS]; char **can_swallow[MAX_ITEMS]; -<<<<<<< HEAD - char **can_be_swallowed[MAX_ITEMS]; - char **scratchpads[32]; -======= char **can_be_swallowed[MAX_ITEMS]; char **scratchpads[MAX_SCRATCHPADS]; ->>>>>>> e770299 (replace random 20 (???) with MAX_SCRATCHPADS) char **open_in_workspace[MAX_ITEMS]; char *to_run[MAX_ITEMS]; } Config; -- cgit v1.2.3