diff options
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rwxr-xr-x | src/config.h | 6 | ||||
| -rwxr-xr-x | src/dminiwm.c | 11 |
3 files changed, 13 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2b09ea0..9135117 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,6 @@ +10/10/11 + Reapplied setting master_size relevant to default mode + 8/10/11 For only one window or fullscreen mode there is no border diff --git a/src/config.h b/src/config.h index f403fdd..eb2555e 100755 --- a/src/config.h +++ b/src/config.h @@ -1,4 +1,4 @@ - /* config.h for dminiwm.c [ 0.0.6 ] + /* config.h for dminiwm.c [ 0.1.0 ] * * Started from catwm 31/12/10 * Bad window error checking and numlock checking used from @@ -31,7 +31,7 @@ #define PANEL_HEIGHT 18 /* 0 for no space for a panel */ #define BORDER_WIDTH 2 #define ATTACH_ASIDE 1 /* 0=TRUE, 1=New window is master */ -#define DEFAULT_MODE 0 /* 0 = Vertical, 1 = Fullscreen */ +#define DEFAULT_MODE 0 /* 0=Vertical, 1=Fullscreen 2=Horizontal 3=grid*/ #define FOLLOW_MOUSE 0 /* 1=Don't 0=Focus the window the mouse just entered */ #define FOLLOW_WINDOW 0 /* 1=Don't 0=Follow the window when moved to a different desktop */ #define TOP_PANEL 1 /* 1=Don't 0=Have the panel at the top instead of the bottom */ @@ -40,7 +40,7 @@ #define FOCUS "#664422" // dkorange #define UNFOCUS "#004050" // blueish -const char* dmenucmd[] = {"dmenu_run","-i","-nb","#664422","-nf","white",NULL}; +const char* dmenucmd[] = {"dmenu_run","-i","-nb","#666622","-nf","white",NULL}; const char* urxvtcmd[] = {"urxvtc",NULL}; const char* terminalcmd[] = {"Terminal",NULL}; const char* thunarcmd[] = {"thunar",NULL}; diff --git a/src/dminiwm.c b/src/dminiwm.c index 1b18bb6..7fdb9b2 100755 --- a/src/dminiwm.c +++ b/src/dminiwm.c @@ -1,4 +1,4 @@ -/* dminiwm.c [ 0.0.6 ] +/* dminiwm.c [ 0.1.0 ] * * I started this from catwm 31/12/10 * Bad window error checking and numlock checking used from @@ -648,12 +648,12 @@ void configurerequest(XEvent *e) { wc.width = ev->width; } else { - wc.width = sw-BORDER_WIDTH; + wc.width = sw; } if(ev->height < sh) wc.height = ev->height; else - wc.height = sh-BORDER_WIDTH; + wc.height = sh; wc.border_width = 0; // ev->border_width; wc.sibling = ev->above; wc.stack_mode = ev->detail; @@ -830,7 +830,10 @@ void setup() { current = NULL; // Master size - master_size = sw*MASTER_SIZE; + if(mode == 2) + master_size = sh*MASTER_SIZE; + else + master_size = sw*MASTER_SIZE; // Set up all desktop int i; |