diff --git a/WPrefs.app/KeyboardShortcuts.c b/WPrefs.app/KeyboardShortcuts.c index 11e25749..21e11c75 100644 --- a/WPrefs.app/KeyboardShortcuts.c +++ b/WPrefs.app/KeyboardShortcuts.c @@ -60,7 +60,10 @@ typedef struct _Panel { #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[] = { "RootMenuKey", "WindowListKey", @@ -117,8 +120,6 @@ static char *keyOptions[] = { "VirtualEdgeDownKey", #endif "DockRaiseLowerKey", - "ClipRaiseKey", - "ClipLowerKey", #ifndef XKB_MODELOCK "ClipRaiseLowerKey" #else @@ -524,8 +525,6 @@ static void createPanel(Panel * p) WMAddListItem(panel->actLs, _("Move VirtualDesktop to next bottom edge")); #endif WMAddListItem(panel->actLs, _("Raise/Lower Dock")); - WMAddListItem(panel->actLs, _("Raise Clip")); - WMAddListItem(panel->actLs, _("Lower Clip")); WMAddListItem(panel->actLs, _("Raise/Lower Clip")); #ifdef XKB_MODELOCK WMAddListItem(panel->actLs, _("Toggle keyboard language")); diff --git a/WindowMaker/Defaults/WindowMaker.in b/WindowMaker/Defaults/WindowMaker.in index 7bca457c..3cbc4d7f 100644 --- a/WindowMaker/Defaults/WindowMaker.in +++ b/WindowMaker/Defaults/WindowMaker.in @@ -99,8 +99,6 @@ MiniaturizeKey = "Mod1+M"; NextWorkspaceLayerKey = None; PrevWorkspaceLayerKey = None; - ClipLowerKey = None; - ClipRaiseKey = None; ConstrainWindowSize = NO; DockRaiseLowerKey = None; ClipRaiseLowerKey = None; diff --git a/src/defaults.c b/src/defaults.c index f32c4401..1160a35f 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -561,10 +561,6 @@ WDefaultEntry optionList[] = { NULL, getKeybind, setKeyGrab}, {"DockRaiseLowerKey", "None", (void*)WKBD_DOCKRAISELOWER, NULL, getKeybind, setKeyGrab}, - {"ClipLowerKey", "None", (void *)WKBD_CLIPLOWER, - NULL, getKeybind, setKeyGrab}, - {"ClipRaiseKey", "None", (void *)WKBD_CLIPRAISE, - NULL, getKeybind, setKeyGrab}, {"ClipRaiseLowerKey", "None", (void *)WKBD_CLIPRAISELOWER, NULL, getKeybind, setKeyGrab}, {"MiniaturizeKey", "None", (void *)WKBD_MINIATURIZE, diff --git a/src/event.c b/src/event.c index d1c9ef0c..2762eef8 100644 --- a/src/event.c +++ b/src/event.c @@ -1678,14 +1678,6 @@ static void handleKeyPress(XEvent * event) } } 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: if (!wPreferences.flags.noclip) wDockRaiseLower(scr->workspaces[scr->current_workspace]->clip); diff --git a/src/keybind.h b/src/keybind.h index 7c366957..32eb5cfb 100644 --- a/src/keybind.h +++ b/src/keybind.h @@ -54,8 +54,6 @@ enum { WKBD_DOCKRAISELOWER, /* Clip */ - WKBD_CLIPLOWER, - WKBD_CLIPRAISE, WKBD_CLIPRAISELOWER, /* workspace */