diff options
| author | moetunes <moetunes111@gmail.com> | 2011-11-15 08:41:36 +1000 |
|---|---|---|
| committer | moetunes <moetunes111@gmail.com> | 2011-11-15 08:41:36 +1000 |
| commit | d894619568e47306f897c966e383b667b7f80add (patch) | |
| tree | 4fdf9b91d178828905d3bad39cf3a351b1b70eaa | |
| parent | a591a5b97972b80c91ea6a928b40a73b477d80fe (diff) | |
Fix for trying to swap_master with only one window
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rwxr-xr-x | src/config.h | 16 | ||||
| -rw-r--r-- | src/dminiwm.c | 2 |
3 files changed, 13 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d20e4b9..95a0318 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,5 @@ +15/11/11 + Fix for when trying to swap master with only one window 23/10/11 Fine tuned the popup window management so notification windows aren't managed either diff --git a/src/config.h b/src/config.h index 2606201..e6f8f2a 100755 --- a/src/config.h +++ b/src/config.h @@ -27,7 +27,7 @@ /* Mod (Mod1 == alt) (Mod4 == Super/windows) */ #define MOD1 Mod1Mask #define MOD4 Mod4Mask -#define MASTER_SIZE 0.6 +#define MASTER_SIZE 0.52 #define TOP_PANEL 1 /* 1=Don't 0=Have the panel at the top instead of the bottom */ #define PANEL_HEIGHT 18 /* 0 for no space for a panel */ #define BORDER_WIDTH 2 @@ -50,7 +50,7 @@ static const Convenience convenience[] = { \ { "Links", 3, 1 }, { "MPlayer", 4, 1 }, { "Thunderbird", 5, 0 }, - { "Pysol", 6, 0 }, + { "Pysol", 6, 1 }, }; const char* dmenucmd[] = {"dmenu_run","-i","-nb","#666622","-nf","white",NULL}; @@ -62,6 +62,8 @@ const char* webcmd[] = {"links","-g",NULL}; const char* mailcmd[] = {"thunderbird",NULL }; const char* voldowncmd[] = {"/home/pnewm/.bin/voldown",NULL}; const char* volupcmd[] = {"/home/pnewm/.bin/volup",NULL}; +const char* prevoldowncmd[] = {"/home/pnewm/.bin/prevoldown",NULL}; +const char* prevolupcmd[] = {"/home/pnewm/.bin/prevolup",NULL}; const char* vols_what[] = {"/home/pnewm/.bin/volumes_what",NULL}; // for reboot and shutdown const char* rebootcmd[] = {"sudo","reboot",NULL}; @@ -101,12 +103,14 @@ static key keys[] = { // Window key + shortcut { MOD4, XK_Right, next_desktop, {NULL}}, { MOD4, XK_Left, prev_desktop, {NULL}}, - { MOD4, XK_e, spawn, {.com = mailcmd}}, - { MOD4, XK_f, spawn, {.com = firefoxcmd}}, - { MOD4, XK_w, spawn, {.com = webcmd}}, - { MOD4, XK_h, spawn, {.com = thunarcmd}}, + { MOD4, XK_e, spawn, {.com = mailcmd}}, + { MOD4, XK_f, spawn, {.com = firefoxcmd}}, + { MOD4, XK_w, spawn, {.com = webcmd}}, + { MOD4, XK_h, spawn, {.com = thunarcmd}}, { MOD4, XK_t, spawn, {.com = terminalcmd}}, { MOD4, XK_v, spawn, {.com = vols_what}}, + { MOD4, XK_Up, spawn, {.com = prevolupcmd}}, + { MOD4, XK_Down, spawn, {.com = prevoldowncmd}}, DESKTOPCHANGE( XK_1, 0) DESKTOPCHANGE( XK_2, 1) DESKTOPCHANGE( XK_3, 2) diff --git a/src/dminiwm.c b/src/dminiwm.c index 1733eba..8f7e908 100644 --- a/src/dminiwm.c +++ b/src/dminiwm.c @@ -333,7 +333,7 @@ void move_up() { void swap_master() { Window tmp; - if(head != NULL && current != NULL && mode != 1) { + if(head->next != NULL && current != NULL && mode != 1) { if(current == head) { tmp = head->next->win; head->next->win = head->win; |