gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

Remove [raise,lower]clip shortcut keys

Browse Source 
The raising and lowering of the clip is already taken care of
by the "ClipRaiseLowerKey" shortcut.

wmaker gets a bit smaller for free:
   text    data     bss     dec     hex filename
 449483   17384    8208  475075   73fc3 src/.libs/wmaker.old
 449307   17256    8192  474755   73e83 src/.libs/wmaker.new
This commit is contained in:
Carlos R. Mafra
2010-01-07 16:01:59 +01:00
parent 8a2a0b6adc
commit 643e49f190
5 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
WPrefs.app/KeyboardShortcuts.c
View File

@@ -60,7 +60,10 @@ typedef struct _Panel {
#define ICON_FILE "keyshortcuts" #define ICON_FILE "keyshortcuts"
/* must be in the same order as the corresponding items in actions list */ /*
* Must be in the same order as the corresponding items in
* "actions list" in createPanel()
*/
static char *keyOptions[] = { static char *keyOptions[] = {
"RootMenuKey", "RootMenuKey",
"WindowListKey", "WindowListKey",
@@ -117,8 +120,6 @@ static char *keyOptions[] = {
"VirtualEdgeDownKey", "VirtualEdgeDownKey",
#endif #endif
"DockRaiseLowerKey", "DockRaiseLowerKey",
"ClipRaiseKey",
"ClipLowerKey",
#ifndef XKB_MODELOCK #ifndef XKB_MODELOCK
"ClipRaiseLowerKey" "ClipRaiseLowerKey"
#else #else
@@ -524,8 +525,6 @@ static void createPanel(Panel * p)
WMAddListItem(panel->actLs, _("Move VirtualDesktop to next bottom edge")); WMAddListItem(panel->actLs, _("Move VirtualDesktop to next bottom edge"));
#endif #endif
WMAddListItem(panel->actLs, _("Raise/Lower Dock")); WMAddListItem(panel->actLs, _("Raise/Lower Dock"));
WMAddListItem(panel->actLs, _("Raise Clip"));
WMAddListItem(panel->actLs, _("Lower Clip"));
WMAddListItem(panel->actLs, _("Raise/Lower Clip")); WMAddListItem(panel->actLs, _("Raise/Lower Clip"));
#ifdef XKB_MODELOCK #ifdef XKB_MODELOCK
WMAddListItem(panel->actLs, _("Toggle keyboard language")); WMAddListItem(panel->actLs, _("Toggle keyboard language"));

2
WindowMaker/Defaults/WindowMaker.in
View File

@@ -99,8 +99,6 @@
MiniaturizeKey = "Mod1+M"; MiniaturizeKey = "Mod1+M";
NextWorkspaceLayerKey = None; NextWorkspaceLayerKey = None;
PrevWorkspaceLayerKey = None; PrevWorkspaceLayerKey = None;
ClipLowerKey = None;
ClipRaiseKey = None;
ConstrainWindowSize = NO; ConstrainWindowSize = NO;
DockRaiseLowerKey = None; DockRaiseLowerKey = None;
ClipRaiseLowerKey = None; ClipRaiseLowerKey = None;

4
src/defaults.c
View File

@@ -561,10 +561,6 @@ WDefaultEntry optionList[] = {
NULL, getKeybind, setKeyGrab}, NULL, getKeybind, setKeyGrab},
{"DockRaiseLowerKey", "None", (void*)WKBD_DOCKRAISELOWER, {"DockRaiseLowerKey", "None", (void*)WKBD_DOCKRAISELOWER,
NULL, getKeybind, setKeyGrab}, NULL, getKeybind, setKeyGrab},
{"ClipLowerKey", "None", (void *)WKBD_CLIPLOWER,
NULL, getKeybind, setKeyGrab},
{"ClipRaiseKey", "None", (void *)WKBD_CLIPRAISE,
NULL, getKeybind, setKeyGrab},
{"ClipRaiseLowerKey", "None", (void *)WKBD_CLIPRAISELOWER, {"ClipRaiseLowerKey", "None", (void *)WKBD_CLIPRAISELOWER,
NULL, getKeybind, setKeyGrab}, NULL, getKeybind, setKeyGrab},
{"MiniaturizeKey", "None", (void *)WKBD_MINIATURIZE, {"MiniaturizeKey", "None", (void *)WKBD_MINIATURIZE,

8
src/event.c
View File

@@ -1678,14 +1678,6 @@ static void handleKeyPress(XEvent * event)
} }
} }
break; break;
case WKBD_CLIPLOWER:
if (!wPreferences.flags.noclip)
wDockLower(scr->workspaces[scr->current_workspace]->clip);
break;
case WKBD_CLIPRAISE:
if (!wPreferences.flags.noclip)
wDockRaise(scr->workspaces[scr->current_workspace]->clip);
break;
case WKBD_CLIPRAISELOWER: case WKBD_CLIPRAISELOWER:
if (!wPreferences.flags.noclip) if (!wPreferences.flags.noclip)
wDockRaiseLower(scr->workspaces[scr->current_workspace]->clip); wDockRaiseLower(scr->workspaces[scr->current_workspace]->clip);

2
src/keybind.h
View File

@@ -54,8 +54,6 @@ enum {
WKBD_DOCKRAISELOWER, WKBD_DOCKRAISELOWER,
/* Clip */ /* Clip */
WKBD_CLIPLOWER,
WKBD_CLIPRAISE,
WKBD_CLIPRAISELOWER, WKBD_CLIPRAISELOWER,
/* workspace */ /* workspace */