Merge remote-tracking branch 'upstream/master'
This commit is contained in:
48
config.def.h
48
config.def.h
@@ -1030,6 +1030,16 @@ static Key keys[] = {
|
||||
|
||||
{ MODKEY, XK_Tab, view, {0} },
|
||||
|
||||
#if SHIFTTAG_PATCH
|
||||
{ MODKEY|ShiftMask, XK_Left, shifttag, { .i = -1 } }, // note keybinding conflict with focusadjacenttag tagtoleft
|
||||
{ MODKEY|ShiftMask, XK_Right, shifttag, { .i = +1 } }, // note keybinding conflict with focusadjacenttag tagtoright
|
||||
#endif // SHIFTTAG_PATCH
|
||||
|
||||
#if SHIFTTAGCLIENTS_PATCH
|
||||
{ MODKEY|ShiftMask|ControlMask, XK_Left, shifttagclients, { .i = -1 } },
|
||||
{ MODKEY|ShiftMask|ControlMask, XK_Right, shifttagclients, { .i = +1 } },
|
||||
#endif // SHIFTTAGCLIENTS_PATCH
|
||||
|
||||
#if SHIFTVIEW_PATCH
|
||||
{ MODKEY|ShiftMask, XK_Tab, shiftview, { .i = -1 } },
|
||||
{ MODKEY|ShiftMask, XK_backslash, shiftview, { .i = +1 } },
|
||||
@@ -1040,6 +1050,16 @@ static Key keys[] = {
|
||||
{ MODKEY|Mod1Mask, XK_backslash, shiftviewclients, { .i = +1 } },
|
||||
#endif // SHIFTVIEW_CLIENTS_PATCH
|
||||
|
||||
#if SHIFTBOTH_PATCH
|
||||
{ MODKEY|ControlMask, XK_Left, shiftboth, { .i = -1 } }, // note keybinding conflict with focusadjacenttag tagandviewtoleft
|
||||
{ MODKEY|ControlMask, XK_Right, shiftboth, { .i = +1 } }, // note keybinding conflict with focusadjacenttag tagandviewtoright
|
||||
#endif // SHIFTBOTH_PATCH
|
||||
|
||||
#if SHIFTSWAPTAGS_PATCH && SWAPTAGS_PATCH
|
||||
{ MODKEY|Mod4Mask|ShiftMask, XK_Left, shiftswaptags, { .i = -1 } },
|
||||
{ MODKEY|Mod4Mask|ShiftMask, XK_Right, shiftswaptags, { .i = +1 } },
|
||||
#endif // SHIFTSWAPTAGS_PATCH
|
||||
|
||||
#if BAR_WINTITLEACTIONS_PATCH
|
||||
{ MODKEY|ControlMask, XK_z, showhideclient, {0} },
|
||||
#endif // BAR_WINTITLEACTIONS_PATCH
|
||||
@@ -1168,8 +1188,8 @@ static Key keys[] = {
|
||||
#if FOCUSADJACENTTAG_PATCH
|
||||
{ MODKEY, XK_Left, viewtoleft, {0} }, // note keybinding conflict with focusdir
|
||||
{ MODKEY, XK_Right, viewtoright, {0} }, // note keybinding conflict with focusdir
|
||||
{ MODKEY|ShiftMask, XK_Left, tagtoleft, {0} },
|
||||
{ MODKEY|ShiftMask, XK_Right, tagtoright, {0} },
|
||||
{ MODKEY|ShiftMask, XK_Left, tagtoleft, {0} }, // note keybinding conflict with shifttag
|
||||
{ MODKEY|ShiftMask, XK_Right, tagtoright, {0} }, // note keybinding conflict with shifttag
|
||||
{ MODKEY|ControlMask, XK_Left, tagandviewtoleft, {0} },
|
||||
{ MODKEY|ControlMask, XK_Right, tagandviewtoright, {0} },
|
||||
#endif // FOCUSADJACENTTAG_PATCH
|
||||
@@ -1514,12 +1534,24 @@ static Signal signals[] = {
|
||||
{ "viewall", viewallex },
|
||||
{ "viewex", viewex },
|
||||
{ "toggleview", toggleview },
|
||||
#if SHIFTBOTH_PATCH
|
||||
{ "shiftboth", shiftboth },
|
||||
#endif // SHIFTBOTH_PATCH
|
||||
#if SHIFTTAG_PATCH
|
||||
{ "shifttag", shifttag },
|
||||
#endif // SHIFTTAG_PATCH
|
||||
#if SHIFTTAGCLIENTS_PATCH
|
||||
{ "shifttagclients", shifttagclients },
|
||||
#endif // SHIFTTAGCLIENTS_PATCH
|
||||
#if SHIFTVIEW_PATCH
|
||||
{ "shiftview", shiftview },
|
||||
#endif // SHIFTVIEW_PATCH
|
||||
#if SHIFTVIEW_CLIENTS_PATCH
|
||||
{ "shiftviewclients", shiftviewclients },
|
||||
#endif // SHIFTVIEW_CLIENTS_PATCH
|
||||
#if SHIFTSWAPTAGS_PATCH && SWAPTAGS_PATCH
|
||||
{ "shiftswaptags", shiftswaptags },
|
||||
#endif // SHIFTSWAPTAGS_PATCH
|
||||
#if SELFRESTART_PATCH
|
||||
{ "self_restart", self_restart },
|
||||
#endif // SELFRESTART_PATCH
|
||||
@@ -1702,12 +1734,24 @@ static IPCCommand ipccommands[] = {
|
||||
#if SETBORDERPX_PATCH
|
||||
IPCCOMMAND( setborderpx, 1, {ARG_TYPE_SINT} ),
|
||||
#endif // SETBORDERPX_PATCH
|
||||
#if SHIFTBOTH_PATCH
|
||||
IPCCOMMAND( shiftboth, 1, {ARG_TYPE_SINT} ),
|
||||
#endif // SHIFTBOTH_PATCH
|
||||
#if SHIFTTAG_PATCH
|
||||
IPCCOMMAND( shifttag, 1, {ARG_TYPE_SINT} ),
|
||||
#endif // SHIFTTAG_PATCH
|
||||
#if SHIFTTAGCLIENTS_PATCH
|
||||
IPCCOMMAND( shifttagclients, 1, {ARG_TYPE_SINT} ),
|
||||
#endif // SHIFTVIEWCLIENTS_PATCH
|
||||
#if SHIFTVIEW_PATCH
|
||||
IPCCOMMAND( shiftview, 1, {ARG_TYPE_SINT} ),
|
||||
#endif // SHIFTVIEW_PATCH
|
||||
#if SHIFTVIEW_CLIENTS_PATCH
|
||||
IPCCOMMAND( shiftviewclients, 1, {ARG_TYPE_SINT} ),
|
||||
#endif // SHIFTVIEW_CLIENTS_PATCH
|
||||
#if SHIFTSWAPTAGS_PATCH && SWAPTAGS_PATCH
|
||||
IPCCOMMAND( shiftswaptags, 1, {ARG_TYPE_SINT} ),
|
||||
#endif // SHIFTSWAPTAGS_PATCH
|
||||
#if STACKER_PATCH
|
||||
IPCCOMMAND( pushstack, 1, {ARG_TYPE_SINT} ),
|
||||
#endif // STACKER_PATCH
|
||||
|
Reference in New Issue
Block a user