diff options
author | okan <okan> | 2016-10-03 14:42:34 +0000 |
---|---|---|
committer | okan <okan> | 2016-10-03 14:42:34 +0000 |
commit | 03f5dc219e20edbcf4b7eac1f733a188ab8f7c29 (patch) | |
tree | f0bde6dbe80ee735314c5a1136c8011d6bda14b0 /calmwm.h | |
parent | 792f85cde97742d0c580ee2354044870d0f8754f (diff) | |
download | cwm-03f5dc219e20edbcf4b7eac1f733a188ab8f7c29.tar.gz cwm-03f5dc219e20edbcf4b7eac1f733a188ab8f7c29.tar.xz cwm-03f5dc219e20edbcf4b7eac1f733a188ab8f7c29.zip |
Defaults are split between defines and conf_init(); normalize these, as
well as give 'sticky' groups its own variable.
Diffstat (limited to 'calmwm.h')
-rw-r--r-- | calmwm.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/calmwm.h b/calmwm.h index 98eb064..f69eab9 100644 --- a/calmwm.h +++ b/calmwm.h @@ -284,34 +284,26 @@ struct conf { struct autogroupwin_q autogroupq; struct ignore_q ignoreq; struct cmd_q cmdq; -#define CONF_STICKY_GROUPS 0x0001 - int flags; -#define CONF_BWIDTH 1 + int stickygroups; int bwidth; -#define CONF_MAMOUNT 1 int mamount; -#define CONF_SNAPDIST 0 int snapdist; struct gap gap; char *color[CWM_COLOR_NITEMS]; char known_hosts[PATH_MAX]; -#define CONF_FONT "sans-serif:pixelsize=14:bold" char *font; Cursor cursor[CF_NITEMS]; }; /* MWM hints */ struct mwm_hints { - unsigned long flags; - unsigned long functions; - unsigned long decorations; -}; #define MWM_HINTS_ELEMENTS 3L +#define MWM_FLAGS_STATUS (1<<3) #define MWM_FLAGS_FUNCTIONS (1<<0) #define MWM_FLAGS_DECORATIONS (1<<1) #define MWM_FLAGS_INPUT_MODE (1<<2) -#define MWM_FLAGS_STATUS (1<<3) + unsigned long flags; #define MWM_FUNCS_ALL (1<<0) #define MWM_FUNCS_RESIZE (1<<1) @@ -319,6 +311,7 @@ struct mwm_hints { #define MWM_FUNCS_MINIMIZE (1<<3) #define MWM_FUNCS_MAXIMIZE (1<<4) #define MWM_FUNCS_CLOSE (1<<5) + unsigned long functions; #define MWM_DECOR_ALL (1<<0) #define MWM_DECOR_BORDER (1<<1) @@ -327,6 +320,8 @@ struct mwm_hints { #define MWM_DECOR_MENU (1<<4) #define MWM_DECOR_MINIMIZE (1<<5) #define MWM_DECOR_MAXIMIZE (1<<6) + unsigned long decorations; +}; extern Display *X_Dpy; extern Time Last_Event_Time; |