Julien Jehannet avatar Julien Jehannet committed 4130dc5

dwm: include cmds using XF86 symbols + refresh patch queue

Comments (0)

Files changed (4)

dwm-5.9-bstack.diff

 # HG changeset patch
-# Parent 28a549109408d26e7bd9b69668e76dfbbe46bace
-# Date 1294702881 -3600
+# Parent 58ab08db498e0bf2ae2deffe8b471362758e4ecc
+# Date 1294784085 -3600
 # User Julien Jehannet <julien@smaf.org>
 
 diff --git a/bstack.c b/bstack.c
  	{ "τ",        tile },    /* first entry is default */
  	{ "≈",        NULL },    /* no layout function means floating behavior */
  	{ "⇔",        monocle },
++	{ "Ⅱ",        bstack },
 +	{ "‗",        bstackhoriz },
-+	{ "Ⅱ",        bstack },
  };
  
  /* key definitions */
-@@ -69,6 +73,8 @@ static Key keys[] = {
- 	//{ MODKEY|ShiftMask,             XK_space,  setlayout,      {0} },
- 	//{ MODKEY|ControlMask,           XK_space,  setlayout,      {.v = &layouts[2]} },
- 	{ MODKEY|ControlMask,           XK_space,  setlayout,      {0} },
-+	{ MODKEY|ShiftMask,             XK_s,      setlayout,      {.v = &layouts[4]} },
-+	{ MODKEY,                       XK_s,      setlayout,      {.v = &layouts[3]} },
- 	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[2]} },
- 	{ MODKEY|ControlMask,           XK_f,      setlayout,      {.v = &layouts[1]} },
- 	{ MODKEY,                       XK_d,      setlayout,      {.v = &layouts[0]} },
+@@ -71,9 +75,9 @@ static Key keys[] = {
+ 	{ MODKEY|ControlMask,           XK_Return,              zoom,           {0} },
+ 	{ MODKEY,                       XK_Tab,                 view,           {0} },
+ 	{ MODKEY,                       XK_space,               zoom,           {0} },
+-	//{ MODKEY|ShiftMask,             XK_space,               setlayout,      {0} },
+-	//{ MODKEY|ControlMask,           XK_space,               setlayout,      {.v = &layouts[2]} },
+ 	{ MODKEY|ControlMask,           XK_space,               setlayout,      {0} },
++	{ MODKEY|ShiftMask,             XK_s,                   setlayout,      {.v = &layouts[4]} },
++	{ MODKEY,                       XK_s,                   setlayout,      {.v = &layouts[3]} },
+ 	{ MODKEY,                       XK_f,                   setlayout,      {.v = &layouts[2]} },
+ 	{ MODKEY|ControlMask,           XK_f,                   setlayout,      {.v = &layouts[1]} },
+ 	{ MODKEY,                       XK_d,                   setlayout,      {.v = &layouts[0]} },
 # HG changeset patch
-# Parent a51cd473aaefc8e7efcf89bbfbf51ac74407c853
-# Date 1294698279 -3600
+# Parent a40a8cb353552ed0e895800c74834a0404c42a10
+# Date 1294783976 -3600
 # User Julien Jehannet <julien@smaf.org>
 
 diff --git a/config.h b/config.h
  static const Bool showbar           = True;     /* False means no bar */
  static const Bool topbar            = True;     /* False means bottom bar */
  
-@@ -65,8 +65,9 @@ static Key keys[] = {
- 	{ MODKEY|ControlMask,           XK_Return, zoom,           {0} },
- 	{ MODKEY,                       XK_Tab,    view,           {0} },
- 	{ MODKEY,                       XK_space,  zoom,           {0} },
+@@ -48,47 +48,59 @@ static const char *dmenucmd[] = { "/bin/
+ static const char *surfcmd[] = { "/bin/zsh", "-fc", "surf $(sselp)", NULL };
+ static const char *termcmd[]  = { "xterm", NULL };
+ static const char *conkycmd[]  = { "conky", NULL };
++static const char *amixercmd[]  = { "amixer", "-q", "set", "Master", NULL };
++static const char *audiomute[]  = { "amixer", "-q", "set", "Master", "toggle", NULL };
++static const char *suspendcmd[]  = { "sudo", "pm-suspend", NULL };
++static const char *scrsavcmd[]  = { "vlock", "-nas", NULL };
++static const char *snapshotcmd[]  = { "import", "-quality", "60", "-comment", "%m:%f %wx%h", "~/screenshot.png", NULL };
+ 
+ static Key keys[] = {
+-	/* modifier                     key        function        argument */
+-	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
+-	{ MODKEY,                       XK_o,      spawn,          {.v = surfcmd } },
+-	{ MODKEY,                       XK_Return, spawn,          {.v = termcmd } },
+-	{ MODKEY,                       XK_Down,   focusstack,     {.i = +1 } },
+-	{ MODKEY,                       XK_Up,     focusstack,     {.i = -1 } },
+-	{ MODKEY,                       XK_Left,   focusstack,     {.i = -1} },
+-	{ MODKEY,                       XK_Right,  focusstack,     {.i = +1} },
+-	{ MODKEY|ShiftMask,             XK_Left,   setmfact,       {.f = -0.02} },
+-	{ MODKEY|ShiftMask,             XK_Right,  setmfact,       {.f = +0.02} },
+-	{ MODKEY|ControlMask,           XK_Left,   zoom,           {0} },
+-	{ MODKEY|ControlMask,           XK_Right,  zoom,           {0} },
+-	{ MODKEY|ControlMask,           XK_Return, zoom,           {0} },
+-	{ MODKEY,                       XK_Tab,    view,           {0} },
+-	{ MODKEY,                       XK_space,  zoom,           {0} },
 -	{ MODKEY|ShiftMask,             XK_space,  setlayout,      {0} },
 -	{ MODKEY|ControlMask,           XK_space,  setlayout,      {.v = &layouts[2]} },
-+	//{ MODKEY|ShiftMask,             XK_space,  setlayout,      {0} },
-+	//{ MODKEY|ControlMask,           XK_space,  setlayout,      {.v = &layouts[2]} },
-+	{ MODKEY|ControlMask,           XK_space,  setlayout,      {0} },
- 	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[2]} },
- 	{ MODKEY|ControlMask,           XK_f,      setlayout,      {.v = &layouts[1]} },
- 	{ MODKEY,                       XK_d,      setlayout,      {.v = &layouts[0]} },
-@@ -74,6 +75,8 @@ static Key keys[] = {
- 	{ MODKEY|ShiftMask,             XK_f,      togglefloating, {0} },
- 	{ MODKEY|ControlMask,           XK_Prior,  focusmon,       {.i = -1 } },
- 	{ MODKEY|ControlMask,           XK_Next,   focusmon,       {.i = +1 } },
-+	//{ MODKEY,                       XK_Prior,  view,           {.i = -1 } },
-+	//{ MODKEY,                       XK_Next,   view,           {.i = +1 } },
- 	{ MODKEY|ShiftMask,             XK_Prior,  tagmon,         {.i = -1 } },
- 	{ MODKEY|ShiftMask,             XK_Next,   tagmon,         {.i = +1 } },
- 	{ MODKEY,                       XK_agrave, view,           {.ui = ~0 } },
-@@ -108,4 +111,3 @@ static Button buttons[] = {
+-	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[2]} },
+-	{ MODKEY|ControlMask,           XK_f,      setlayout,      {.v = &layouts[1]} },
+-	{ MODKEY,                       XK_d,      setlayout,      {.v = &layouts[0]} },
+-	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
+-	{ MODKEY|ShiftMask,             XK_f,      togglefloating, {0} },
+-	{ MODKEY|ControlMask,           XK_Prior,  focusmon,       {.i = -1 } },
+-	{ MODKEY|ControlMask,           XK_Next,   focusmon,       {.i = +1 } },
+-	{ MODKEY|ShiftMask,             XK_Prior,  tagmon,         {.i = -1 } },
+-	{ MODKEY|ShiftMask,             XK_Next,   tagmon,         {.i = +1 } },
+-	{ MODKEY,                       XK_agrave, view,           {.ui = ~0 } },
+-	{ MODKEY|ShiftMask,             XK_agrave, tag,            {.ui = ~0 } },
+-	TAGKEYS(                        XK_ampersand,              0)
+-	TAGKEYS(                        XK_eacute,                 1)
+-	TAGKEYS(                        XK_quotedbl,               2)
+-	TAGKEYS(                        XK_apostrophe,             3)
+-	TAGKEYS(                        XK_parenleft,              4)
+-	TAGKEYS(                        XK_minus,                  5)
+-	TAGKEYS(                        XK_egrave,                 6)
+-	TAGKEYS(                        XK_underscore,             7)
+-	TAGKEYS(                        XK_ccedilla,               8)
+-	{ MODKEY,                       XK_b,      togglebar,      {0} },
+-	{ MODKEY,                       XK_BackSpace, killclient,  {0} },
++	/* modifier                     key                     function        argument */
++	{ MODKEY,                       XK_p,                   spawn,          {.v = dmenucmd } },
++	{ MODKEY,                       XK_o,                   spawn,          {.v = surfcmd } },
++	{ MODKEY,                       XK_Return,              spawn,          {.v = termcmd } },
++	{ MODKEY,                       XK_Down,                focusstack,     {.i = +1 } },
++	{ MODKEY,                       XK_Up,                  focusstack,     {.i = -1 } },
++	{ MODKEY,                       XK_Left,                focusstack,     {.i = -1} },
++	{ MODKEY,                       XK_Right,               focusstack,     {.i = +1} },
++	{ MODKEY|ShiftMask,             XK_Left,                setmfact,       {.f = -0.02} },
++	{ MODKEY|ShiftMask,             XK_Right,               setmfact,       {.f = +0.02} },
++	{ MODKEY|ControlMask,           XK_Left,                zoom,           {0} },
++	{ MODKEY|ControlMask,           XK_Right,               zoom,           {0} },
++	{ MODKEY|ControlMask,           XK_Return,              zoom,           {0} },
++	{ MODKEY,                       XK_Tab,                 view,           {0} },
++	{ MODKEY,                       XK_space,               zoom,           {0} },
++	//{ MODKEY|ShiftMask,             XK_space,               setlayout,      {0} },
++	//{ MODKEY|ControlMask,           XK_space,               setlayout,      {.v = &layouts[2]} },
++	{ MODKEY|ControlMask,           XK_space,               setlayout,      {0} },
++	{ MODKEY,                       XK_f,                   setlayout,      {.v = &layouts[2]} },
++	{ MODKEY|ControlMask,           XK_f,                   setlayout,      {.v = &layouts[1]} },
++	{ MODKEY,                       XK_d,                   setlayout,      {.v = &layouts[0]} },
++	{ MODKEY,                       XK_t,                   setlayout,      {.v = &layouts[0]} },
++	{ MODKEY|ShiftMask,             XK_f,                   togglefloating, {0} },
++	{ MODKEY|ControlMask,           XK_Prior,               focusmon,       { .i = -1 } },
++	{ MODKEY|ControlMask,           XK_Next,                focusmon,       { .i = +1 } },
++	{ MODKEY|ShiftMask,             XK_Prior,               tagmon,         { .i = -1 } },
++	{ MODKEY|ShiftMask,             XK_Next,                tagmon,         { .i = +1 } },
++	{ MODKEY,                       XK_agrave,              view,           { .ui = ~0 } },
++	{ MODKEY|ShiftMask,             XK_agrave,              tag,            { .ui = ~0 } },
++	TAGKEYS(                        XK_ampersand,                           0)
++	TAGKEYS(                        XK_eacute,                              1)
++	TAGKEYS(                        XK_quotedbl,                            2)
++	TAGKEYS(                        XK_apostrophe,                          3)
++	TAGKEYS(                        XK_parenleft,                           4)
++	TAGKEYS(                        XK_minus,                               5)
++	TAGKEYS(                        XK_egrave,                              6)
++	TAGKEYS(                        XK_underscore,                          7)
++	TAGKEYS(                        XK_ccedilla,                            8)
++	{ MODKEY,                       XK_b,                   togglebar,      {0} },
++	{ MODKEY,                       XK_BackSpace,           killclient,     {0} },
++	{ MODKEY,                       XK_Print,               spawn,          {.v = snapshotcmd} },
++	{ 0,                            XF86XK_ScreenSaver,     spawn,          {.v = scrsavcmd} },
++	{ 0,                            XF86XK_AudioMute,       spawn,          {.v = audiomute} },
++	{ 0,                            XF86XK_Standby,         spawn,          {.v = suspendcmd} },
++	{ 0,                            XF86XK_AudioLowerVolume,spawn,          {.v = amixercmd} },
++	{ 0,                            XF86XK_AudioRaiseVolume,spawn,          {.v = amixercmd} },
+ };
+ 
+ /* button definitions */
+@@ -108,4 +120,3 @@ static Button buttons[] = {
  	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
  	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
  };
 diff --git a/dwm.c b/dwm.c
 --- a/dwm.c
 +++ b/dwm.c
-@@ -864,6 +864,7 @@ void
+@@ -32,6 +32,7 @@
+ #include <sys/wait.h>
+ #include <X11/cursorfont.h>
+ #include <X11/keysym.h>
++#include <X11/XF86keysym.h>
+ #include <X11/Xatom.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xproto.h>
+@@ -854,6 +855,7 @@ void
  focusstack(const Arg *arg) {
  	Client *c = NULL, *i;
  

dwm-nextprevtag.inc

 # HG changeset patch
-# Parent 00d22d7eeb23884f01abc1717df513827b5162eb
-# Date 1294702924 -3600
+# Parent 57d6a265c45bab837086acf8bf7c0e5c15c9951c
+# Date 1294784199 -3600
 # User Julien Jehannet <julien@smaf.org>
 
 void
  static const Layout layouts[] = {
  	/* symbol     arrange function */
  	{ "τ",        tile },    /* first entry is default */
-@@ -84,8 +85,8 @@ static Key keys[] = {
- 	{ MODKEY|ShiftMask,             XK_f,      togglefloating, {0} },
- 	{ MODKEY|ControlMask,           XK_Prior,  focusmon,       {.i = -1 } },
- 	{ MODKEY|ControlMask,           XK_Next,   focusmon,       {.i = +1 } },
--	//{ MODKEY,                       XK_Prior,  view,           {.i = -1 } },
--	//{ MODKEY,                       XK_Next,   view,           {.i = +1 } },
-+	{ MODKEY,                       XK_Prior,  view_adjacent,  {.i = -1 } },
-+	{ MODKEY,                       XK_Next,   view_adjacent,  {.i = +1 } },
- 	{ MODKEY|ShiftMask,             XK_Prior,  tagmon,         {.i = -1 } },
- 	{ MODKEY|ShiftMask,             XK_Next,   tagmon,         {.i = +1 } },
- 	{ MODKEY,                       XK_agrave, view,           {.ui = ~0 } },
-@@ -119,4 +120,6 @@ static Button buttons[] = {
+@@ -87,6 +88,8 @@ static Key keys[] = {
+ 	{ MODKEY|ShiftMask,             XK_f,                   togglefloating, {0} },
+ 	{ MODKEY|ControlMask,           XK_Prior,               focusmon,       { .i = -1 } },
+ 	{ MODKEY|ControlMask,           XK_Next,                focusmon,       { .i = +1 } },
++	{ MODKEY,                       XK_Prior,               view_adjacent,  {.i = -1 } },
++	{ MODKEY,                       XK_Next,                view_adjacent,  {.i = +1 } },
+ 	{ MODKEY|ShiftMask,             XK_Prior,               tagmon,         { .i = -1 } },
+ 	{ MODKEY|ShiftMask,             XK_Next,                tagmon,         { .i = +1 } },
+ 	{ MODKEY,                       XK_agrave,              view,           { .ui = ~0 } },
+@@ -126,4 +129,6 @@ static Button buttons[] = {
  	{ ClkTagBar,            0,              Button3,        toggleview,     {0} },
  	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
  	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
 e8e25c2c6db89368bb2e99b271f74443fc48fc65:dwm-current_desktop.diff
 a40a8cb353552ed0e895800c74834a0404c42a10:dwm-config.diff
-7322ad2614e08b58547c6797cc796606a10e1a22:dwm-config.h
-8ca8dc1b0d16c9f4be5d9e13c85019454940c0ee:dwm-panel.diff
-d38fa97935ac47d189e9debfd707c87855cf9b8b:dwm-5.9-bstack.diff
-1751cc0348e3d13e2c0f9fb4bf478b06677ca135:dwm-5.7.2-urgentborder.diff
-f25b9d0164b014ef6d82c47e37c574e54ddef0e3:dwm-r1522-viewontag.diff
-29b5a383236be6e0b1366a9d2fb3874a2b640e45:dwm-nextprevtag.inc
-e8ce1d8315e63b6dc82f721cd410cde1b4898b7d:dwm-5.8.2-monocle_count.diff
-2744acbc0ba753596f58f7fc85483b54862270e4:dwm-r1507-focusatom.diff
+310c1516d636117203967f64563aa755821b1cc5:dwm-config.h
+58ab08db498e0bf2ae2deffe8b471362758e4ecc:dwm-panel.diff
+e75602bbe67fac517b81a5faee54e4ca2213203d:dwm-5.9-bstack.diff
+f3b7ec8e843ab8b31b3f17daab1e13f76c6af36d:dwm-5.7.2-urgentborder.diff
+57d6a265c45bab837086acf8bf7c0e5c15c9951c:dwm-r1522-viewontag.diff
+c6a8fd84e3ec6b5bc6f7ebb13012d83d8347ab0c:dwm-nextprevtag.inc
+496f780d39c96469caa06d5f33f2291bee3c89c5:dwm-5.8.2-monocle_count.diff
+c532bf49341539897f2edb6c2b27a4f2858a75bc:dwm-r1507-focusatom.diff
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.