diff options
Diffstat (limited to 'src/defs.h')
| -rw-r--r-- | src/defs.h | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -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; |