From 779367f0d101992e5f3493c097ab52ecedb08dce Mon Sep 17 00:00:00 2001 From: Bert Gijsbers Date: Sun, 4 Aug 2024 22:04:50 +0200 Subject: [PATCH] Dissolve the WM_KEY macros. --- src/CMakeLists.txt | 3 +- src/Makefile.am | 1 + src/bindkey.h | 303 +++++++++++++++------------------------------ src/genpref.cc | 2 - src/movesize.cc | 72 +++++------ src/wmapp.cc | 58 ++++----- src/wmmgr.cc | 110 ++++++++-------- src/wmminiicon.cc | 6 +- src/wmtaskbar.cc | 16 +-- src/wmwinlist.cc | 50 ++++---- src/wmwinmenu.cc | 2 +- 11 files changed, 257 insertions(+), 366 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f4f31ef8c..bd8e509f8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -421,7 +421,8 @@ SET(ICE_COMMON_SRCS udir.cc upath.cc yapp.cc yxapp.cc ytimer.cc yprefs.cc ypipereader.cc yxembed.cc yconfig.cc yfont.cc ysvg.cc ypixmap.cc yimage2.cc yimage_gdk.cc yximage.cc ycolor.cc ytooltip.cc ylocale.cc yarray.cc yfileio.cc ytime.cc - ystring.cc mstring.cc ref.cc keysyms.cc logevent.cc misc.cc) + ystring.cc mstring.cc ref.cc bindkey.cc keysyms.cc + logevent.cc misc.cc) if(CONFIG_XFREETYPE) list(APPEND ICE_COMMON_SRCS yfontxft.cc) diff --git a/src/Makefile.am b/src/Makefile.am index 1599a35a5..291b761a4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -85,6 +85,7 @@ libice_la_SOURCES = \ argument.h \ ascii.h \ base.h \ + bindkey.cc \ bindkey.h \ debug.h \ default.h \ diff --git a/src/bindkey.h b/src/bindkey.h index b4561a2f8..a7f0eb972 100644 --- a/src/bindkey.h +++ b/src/bindkey.h @@ -1,210 +1,101 @@ -#define defgMouseWinMove XK_Pointer_Button1, kfAlt, "Alt+Pointer_Button1" -#define defgMouseWinSize XK_Pointer_Button3, kfAlt, "Alt+Pointer_Button3" -#define defgMouseWinRaise XK_Pointer_Button1, kfCtrl+kfAlt, "Ctrl+Alt+Pointer_Button1" -#define defgMouseWinLower XK_Pointer_Button1, kfCtrl+kfAlt, "Ctrl+Alt+Pointer_Button1" -#define defgMouseWinTabbing XK_Pointer_Button2, kfShift, "Shift+Pointer_Button2" -#define defgKeyWinRaise XK_F1, kfAlt, "Alt+F1" -#define defgKeyWinOccupyAll XK_F2, kfAlt, "Alt+F2" -#define defgKeyWinLower XK_F3, kfAlt, "Alt+F3" -#define defgKeyWinClose XK_F4, kfAlt, "Alt+F4" -#define defgKeyWinRestore XK_F5, kfAlt, "Alt+F5" -#define defgKeyWinNext XK_F6, kfAlt, "Alt+F6" -#define defgKeyWinPrev XK_F6, kfAlt+kfShift, "Alt+Shift+F6" -#define defgKeyWinMove XK_F7, kfAlt, "Alt+F7" -#define defgKeyWinSize XK_F8, kfAlt, "Alt+F8" -#define defgKeyWinMinimize XK_F9, kfAlt, "Alt+F9" -#define defgKeyWinMaximize XK_F10, kfAlt, "Alt+F10" -#define defgKeyWinMaximizeVert XK_F10, kfAlt+kfShift, "Alt+Shift+F10" -#define defgKeyWinMaximizeHoriz 0, 0, "" -#define defgKeyWinFullscreen XK_F11, kfAlt, "Alt+F11" -#define defgKeyWinHide XK_F12, kfAlt+kfShift, "Alt+Shift+F12" -#define defgKeyWinRollup XK_F12, kfAlt, "Alt+F12" -#define defgKeyWinArrangeN XK_KP_Up, kfCtrl+kfAlt, "Ctrl+Alt+KP_Up" -#define defgKeyWinArrangeNE XK_KP_Prior, kfCtrl+kfAlt, "Ctrl+Alt+KP_Prior" -#define defgKeyWinArrangeE XK_KP_Right, kfCtrl+kfAlt, "Ctrl+Alt+KP_Right" -#define defgKeyWinArrangeSE XK_KP_Next, kfCtrl+kfAlt, "Ctrl+Alt+KP_Next" -#define defgKeyWinArrangeS XK_KP_Down, kfCtrl+kfAlt, "Ctrl+Alt+KP_Down" -#define defgKeyWinArrangeSW XK_KP_End, kfCtrl+kfAlt, "Ctrl+Alt+KP_End" -#define defgKeyWinArrangeW XK_KP_Left, kfCtrl+kfAlt, "Ctrl+Alt+KP_Left" -#define defgKeyWinArrangeNW XK_KP_Home, kfCtrl+kfAlt, "Ctrl+Alt+KP_Home" -#define defgKeyWinArrangeC XK_KP_Begin, kfCtrl+kfAlt, "Ctrl+Alt+KP_Begin" -#define defgKeyWinTileLeft 0, 0, "" -#define defgKeyWinTileRight 0, 0, "" -#define defgKeyWinTileTop 0, 0, "" -#define defgKeyWinTileBottom 0, 0, "" -#define defgKeyWinTileTopLeft 0, 0, "" -#define defgKeyWinTileTopRight 0, 0, "" -#define defgKeyWinTileBottomLeft 0, 0, "" -#define defgKeyWinTileBottomRight 0, 0, "" -#define defgKeyWinTileCenter 0, 0, "" -#define defgKeyWinSmartPlace XK_KP_Begin, kfCtrl+kfAlt+kfShift, "Ctrl+Alt+Shift+KP_Begin" -#define defgKeySysSwitchNext XK_Tab, kfAlt, "Alt+Tab" -#define defgKeySysSwitchLast XK_Tab, kfAlt+kfShift, "Alt+Shift+Tab" -#define defgKeySysSwitchClass XK_grave, kfAlt, "Alt+grave" -#define defgKeyTaskBarSwitchNext 0, 0, "" -#define defgKeyTaskBarSwitchPrev 0, 0, "" -#define defgKeyTaskBarMoveNext 0, 0, "" -#define defgKeyTaskBarMovePrev 0, 0, "" -#define defgKeySysWinNext XK_Escape, kfAlt, "Alt+Esc" -#define defgKeySysWinPrev XK_Escape, kfAlt+kfShift, "Alt+Shift+Esc" -#define defgKeySysWinMenu XK_Escape, kfShift, "Shift+Esc" -#define defgKeySysDialog XK_Delete, kfAlt+kfCtrl, "Alt+Ctrl+Del" -#define defgKeySysMenu XK_Escape, kfCtrl, "Ctrl+Esc" -#define defgKeySysWindowList XK_Escape, kfCtrl+kfAlt, "Alt+Ctrl+Esc" -#define defgKeySysWinListMenu 0, 0, "" -#define defgKeySysKeyboardNext 0, 0, "" -#define defgKeySysAddressBar ' ', kfAlt+kfCtrl, "Alt+Ctrl+space" -#define defgKeyWinMenu ' ', kfAlt, "Alt+space" -#define defgKeySysWorkspacePrev XK_Left, kfAlt+kfCtrl, "Alt+Ctrl+Left" -#define defgKeySysWorkspaceNext XK_Right, kfAlt+kfCtrl, "Alt+Ctrl+Right" -#define defgKeySysWorkspaceLast XK_Down, kfAlt+kfCtrl, "Alt+Ctrl+Down" -#define defgKeySysWorkspacePrevTakeWin XK_Left, kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+Left" -#define defgKeySysWorkspaceNextTakeWin XK_Right, kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+Right" -#define defgKeySysWorkspaceLastTakeWin XK_Down, kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+Down" -#define defgKeySysWorkspace1 '1', kfAlt+kfCtrl, "Alt+Ctrl+1" -#define defgKeySysWorkspace2 '2', kfAlt+kfCtrl, "Alt+Ctrl+2" -#define defgKeySysWorkspace3 '3', kfAlt+kfCtrl, "Alt+Ctrl+3" -#define defgKeySysWorkspace4 '4', kfAlt+kfCtrl, "Alt+Ctrl+4" -#define defgKeySysWorkspace5 '5', kfAlt+kfCtrl, "Alt+Ctrl+5" -#define defgKeySysWorkspace6 '6', kfAlt+kfCtrl, "Alt+Ctrl+6" -#define defgKeySysWorkspace7 '7', kfAlt+kfCtrl, "Alt+Ctrl+7" -#define defgKeySysWorkspace8 '8', kfAlt+kfCtrl, "Alt+Ctrl+8" -#define defgKeySysWorkspace9 '9', kfAlt+kfCtrl, "Alt+Ctrl+9" -#define defgKeySysWorkspace10 '0', kfAlt+kfCtrl, "Alt+Ctrl+0" -#define defgKeySysWorkspace11 '-', kfAlt+kfCtrl, "Alt+Ctrl+minus" -#define defgKeySysWorkspace12 '=', kfAlt+kfCtrl, "Alt+Ctrl+equal" -#define defgKeySysWorkspace1TakeWin '1', kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+1" -#define defgKeySysWorkspace2TakeWin '2', kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+2" -#define defgKeySysWorkspace3TakeWin '3', kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+3" -#define defgKeySysWorkspace4TakeWin '4', kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+4" -#define defgKeySysWorkspace5TakeWin '5', kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+5" -#define defgKeySysWorkspace6TakeWin '6', kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+6" -#define defgKeySysWorkspace7TakeWin '7', kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+7" -#define defgKeySysWorkspace8TakeWin '8', kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+8" -#define defgKeySysWorkspace9TakeWin '9', kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+9" -#define defgKeySysWorkspace10TakeWin '0', kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+0" -#define defgKeySysWorkspace11TakeWin '-', kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+minus" -#define defgKeySysWorkspace12TakeWin '=', kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+equal" -#define defgKeySysTileVertical XK_F2, kfAlt+kfShift, "Alt+Shift+F2" -#define defgKeySysTileHorizontal XK_F3, kfAlt+kfShift, "Alt+Shift+F3" -#define defgKeySysCascade XK_F4, kfAlt+kfShift, "Alt+Shift+F4" -#define defgKeySysArrange XK_F5, kfAlt+kfShift, "Alt+Shift+F5" -#define defgKeySysArrangeIcons XK_F8, kfAlt+kfShift, "Alt+Shift+F8" -#define defgKeySysMinimizeAll XK_F9, kfAlt+kfShift, "Alt+Shift+F9" -#define defgKeySysHideAll XK_F11, kfAlt+kfShift, "Alt+Shift+F11" -#define defgKeySysUndoArrange XK_F7, kfAlt+kfShift, "Alt+Shift+F7" -#define defgKeySysShowDesktop 'd', kfAlt+kfCtrl, "Alt+Ctrl+d" -#define defgKeySysCollapseTaskBar 'h', kfAlt+kfCtrl, "Alt+Ctrl+h" +extern WMKey gMouseWinMove; +extern WMKey gMouseWinSize; +extern WMKey gMouseWinRaise; +extern WMKey gMouseWinLower; +extern WMKey gMouseWinTabbing; -#ifdef CFGDEF -#define DEF_WMKEY(k) WMKey k( def##k ) -#else - -#define DEF_WMKEY(k) extern WMKey k -#define IS_WMKEY(k,m,b) b.eq(k,m) -#define KEY_NAME(k) k.name -#endif - -DEF_WMKEY(gMouseWinMove); -DEF_WMKEY(gMouseWinSize); -DEF_WMKEY(gMouseWinRaise); -DEF_WMKEY(gMouseWinLower); -DEF_WMKEY(gMouseWinTabbing); - -DEF_WMKEY(gKeyWinRaise); -DEF_WMKEY(gKeyWinOccupyAll); -DEF_WMKEY(gKeyWinLower); -DEF_WMKEY(gKeyWinClose); -DEF_WMKEY(gKeyWinRestore); -DEF_WMKEY(gKeyWinPrev); -DEF_WMKEY(gKeyWinNext); -DEF_WMKEY(gKeyWinMove); -DEF_WMKEY(gKeyWinSize); -DEF_WMKEY(gKeyWinMinimize); -DEF_WMKEY(gKeyWinMaximize); -DEF_WMKEY(gKeyWinMaximizeVert); -DEF_WMKEY(gKeyWinMaximizeHoriz); -DEF_WMKEY(gKeyWinFullscreen); -DEF_WMKEY(gKeyWinHide); -DEF_WMKEY(gKeyWinRollup); -DEF_WMKEY(gKeyWinArrangeN); -DEF_WMKEY(gKeyWinArrangeNE); -DEF_WMKEY(gKeyWinArrangeE); -DEF_WMKEY(gKeyWinArrangeSE); -DEF_WMKEY(gKeyWinArrangeS); -DEF_WMKEY(gKeyWinArrangeSW); -DEF_WMKEY(gKeyWinArrangeW); -DEF_WMKEY(gKeyWinArrangeNW); -DEF_WMKEY(gKeyWinArrangeC); -DEF_WMKEY(gKeyWinTileLeft); -DEF_WMKEY(gKeyWinTileRight); -DEF_WMKEY(gKeyWinTileTop); -DEF_WMKEY(gKeyWinTileBottom); -DEF_WMKEY(gKeyWinTileTopLeft); -DEF_WMKEY(gKeyWinTileTopRight); -DEF_WMKEY(gKeyWinTileBottomLeft); -DEF_WMKEY(gKeyWinTileBottomRight); -DEF_WMKEY(gKeyWinTileCenter); -DEF_WMKEY(gKeyWinSmartPlace); -DEF_WMKEY(gKeyWinMenu); -DEF_WMKEY(gKeySysSwitchNext); -DEF_WMKEY(gKeySysSwitchLast); -DEF_WMKEY(gKeySysSwitchClass); -DEF_WMKEY(gKeySysWinNext); -DEF_WMKEY(gKeySysWinPrev); -DEF_WMKEY(gKeyTaskBarSwitchNext); -DEF_WMKEY(gKeyTaskBarSwitchPrev); -DEF_WMKEY(gKeyTaskBarMoveNext); -DEF_WMKEY(gKeyTaskBarMovePrev); -DEF_WMKEY(gKeySysWinMenu); -DEF_WMKEY(gKeySysDialog); -DEF_WMKEY(gKeySysMenu); -DEF_WMKEY(gKeySysWindowList); -DEF_WMKEY(gKeySysWinListMenu); -DEF_WMKEY(gKeySysKeyboardNext); -DEF_WMKEY(gKeySysAddressBar); -DEF_WMKEY(gKeySysWorkspacePrev); -DEF_WMKEY(gKeySysWorkspaceNext); -DEF_WMKEY(gKeySysWorkspaceLast); -DEF_WMKEY(gKeySysWorkspacePrevTakeWin); -DEF_WMKEY(gKeySysWorkspaceNextTakeWin); -DEF_WMKEY(gKeySysWorkspaceLastTakeWin); -DEF_WMKEY(gKeySysWorkspace1); -DEF_WMKEY(gKeySysWorkspace2); -DEF_WMKEY(gKeySysWorkspace3); -DEF_WMKEY(gKeySysWorkspace4); -DEF_WMKEY(gKeySysWorkspace5); -DEF_WMKEY(gKeySysWorkspace6); -DEF_WMKEY(gKeySysWorkspace7); -DEF_WMKEY(gKeySysWorkspace8); -DEF_WMKEY(gKeySysWorkspace9); -DEF_WMKEY(gKeySysWorkspace10); -DEF_WMKEY(gKeySysWorkspace11); -DEF_WMKEY(gKeySysWorkspace12); -DEF_WMKEY(gKeySysWorkspace1TakeWin); -DEF_WMKEY(gKeySysWorkspace2TakeWin); -DEF_WMKEY(gKeySysWorkspace3TakeWin); -DEF_WMKEY(gKeySysWorkspace4TakeWin); -DEF_WMKEY(gKeySysWorkspace5TakeWin); -DEF_WMKEY(gKeySysWorkspace6TakeWin); -DEF_WMKEY(gKeySysWorkspace7TakeWin); -DEF_WMKEY(gKeySysWorkspace8TakeWin); -DEF_WMKEY(gKeySysWorkspace9TakeWin); -DEF_WMKEY(gKeySysWorkspace10TakeWin); -DEF_WMKEY(gKeySysWorkspace11TakeWin); -DEF_WMKEY(gKeySysWorkspace12TakeWin); -DEF_WMKEY(gKeySysTileVertical); -DEF_WMKEY(gKeySysTileHorizontal); -DEF_WMKEY(gKeySysCascade); -DEF_WMKEY(gKeySysArrange); -DEF_WMKEY(gKeySysArrangeIcons); -DEF_WMKEY(gKeySysMinimizeAll); -DEF_WMKEY(gKeySysHideAll); -DEF_WMKEY(gKeySysUndoArrange); -DEF_WMKEY(gKeySysShowDesktop); -DEF_WMKEY(gKeySysCollapseTaskBar); - -#undef DEF_WMKEY +extern WMKey gKeyWinRaise; +extern WMKey gKeyWinOccupyAll; +extern WMKey gKeyWinLower; +extern WMKey gKeyWinClose; +extern WMKey gKeyWinRestore; +extern WMKey gKeyWinPrev; +extern WMKey gKeyWinNext; +extern WMKey gKeyWinMove; +extern WMKey gKeyWinSize; +extern WMKey gKeyWinMinimize; +extern WMKey gKeyWinMaximize; +extern WMKey gKeyWinMaximizeVert; +extern WMKey gKeyWinMaximizeHoriz; +extern WMKey gKeyWinFullscreen; +extern WMKey gKeyWinHide; +extern WMKey gKeyWinRollup; +extern WMKey gKeyWinArrangeN; +extern WMKey gKeyWinArrangeNE; +extern WMKey gKeyWinArrangeE; +extern WMKey gKeyWinArrangeSE; +extern WMKey gKeyWinArrangeS; +extern WMKey gKeyWinArrangeSW; +extern WMKey gKeyWinArrangeW; +extern WMKey gKeyWinArrangeNW; +extern WMKey gKeyWinArrangeC; +extern WMKey gKeyWinTileLeft; +extern WMKey gKeyWinTileRight; +extern WMKey gKeyWinTileTop; +extern WMKey gKeyWinTileBottom; +extern WMKey gKeyWinTileTopLeft; +extern WMKey gKeyWinTileTopRight; +extern WMKey gKeyWinTileBottomLeft; +extern WMKey gKeyWinTileBottomRight; +extern WMKey gKeyWinTileCenter; +extern WMKey gKeyWinSmartPlace; +extern WMKey gKeyWinMenu; +extern WMKey gKeySysSwitchNext; +extern WMKey gKeySysSwitchLast; +extern WMKey gKeySysSwitchClass; +extern WMKey gKeySysWinNext; +extern WMKey gKeySysWinPrev; +extern WMKey gKeyTaskBarSwitchNext; +extern WMKey gKeyTaskBarSwitchPrev; +extern WMKey gKeyTaskBarMoveNext; +extern WMKey gKeyTaskBarMovePrev; +extern WMKey gKeySysWinMenu; +extern WMKey gKeySysDialog; +extern WMKey gKeySysMenu; +extern WMKey gKeySysWindowList; +extern WMKey gKeySysWinListMenu; +extern WMKey gKeySysKeyboardNext; +extern WMKey gKeySysAddressBar; +extern WMKey gKeySysWorkspacePrev; +extern WMKey gKeySysWorkspaceNext; +extern WMKey gKeySysWorkspaceLast; +extern WMKey gKeySysWorkspacePrevTakeWin; +extern WMKey gKeySysWorkspaceNextTakeWin; +extern WMKey gKeySysWorkspaceLastTakeWin; +extern WMKey gKeySysWorkspace1; +extern WMKey gKeySysWorkspace2; +extern WMKey gKeySysWorkspace3; +extern WMKey gKeySysWorkspace4; +extern WMKey gKeySysWorkspace5; +extern WMKey gKeySysWorkspace6; +extern WMKey gKeySysWorkspace7; +extern WMKey gKeySysWorkspace8; +extern WMKey gKeySysWorkspace9; +extern WMKey gKeySysWorkspace10; +extern WMKey gKeySysWorkspace11; +extern WMKey gKeySysWorkspace12; +extern WMKey gKeySysWorkspace1TakeWin; +extern WMKey gKeySysWorkspace2TakeWin; +extern WMKey gKeySysWorkspace3TakeWin; +extern WMKey gKeySysWorkspace4TakeWin; +extern WMKey gKeySysWorkspace5TakeWin; +extern WMKey gKeySysWorkspace6TakeWin; +extern WMKey gKeySysWorkspace7TakeWin; +extern WMKey gKeySysWorkspace8TakeWin; +extern WMKey gKeySysWorkspace9TakeWin; +extern WMKey gKeySysWorkspace10TakeWin; +extern WMKey gKeySysWorkspace11TakeWin; +extern WMKey gKeySysWorkspace12TakeWin; +extern WMKey gKeySysTileVertical; +extern WMKey gKeySysTileHorizontal; +extern WMKey gKeySysCascade; +extern WMKey gKeySysArrange; +extern WMKey gKeySysArrangeIcons; +extern WMKey gKeySysMinimizeAll; +extern WMKey gKeySysHideAll; +extern WMKey gKeySysUndoArrange; +extern WMKey gKeySysShowDesktop; +extern WMKey gKeySysCollapseTaskBar; // vim: set sw=4 ts=4 et: diff --git a/src/genpref.cc b/src/genpref.cc index 05a882161..f13d4072b 100644 --- a/src/genpref.cc +++ b/src/genpref.cc @@ -14,8 +14,6 @@ void addKeyboard(const char *, const char *, bool) {} void setLook(const char *, const char *, bool) {} void addBgImage(const char *, const char *, bool) {} -//#include "bindkey.h" -//#include "default.h" #define CFGDEF #define GENPREF #define extern diff --git a/src/movesize.cc b/src/movesize.cc index 9bbc69a6e..0a07914c1 100644 --- a/src/movesize.cc +++ b/src/movesize.cc @@ -706,77 +706,77 @@ bool YFrameWindow::handleKey(const XKeyEvent &key) { key.window != handle()) return true; - if (IS_WMKEY(k, vm, gKeyWinClose)) { + if (gKeyWinClose.eq(k, vm)) { actionPerformed(actionClose); - } else if (IS_WMKEY(k, vm, gKeyWinPrev)) { + } else if (gKeyWinPrev.eq(k, vm)) { wmPrevWindow(); - } else if (IS_WMKEY(k, vm, gKeyWinMaximizeVert)) { + } else if (gKeyWinMaximizeVert.eq(k, vm)) { actionPerformed(actionMaximizeVert); - } else if (IS_WMKEY(k, vm, gKeyWinMaximizeHoriz)) { + } else if (gKeyWinMaximizeHoriz.eq(k, vm)) { actionPerformed(actionMaximizeHoriz); - } else if (IS_WMKEY(k, vm, gKeyWinRaise)) { + } else if (gKeyWinRaise.eq(k, vm)) { actionPerformed(actionRaise); - } else if (IS_WMKEY(k, vm, gKeyWinOccupyAll)) { + } else if (gKeyWinOccupyAll.eq(k, vm)) { actionPerformed(actionOccupyAllOrCurrent); - } else if (IS_WMKEY(k, vm, gKeyWinLower)) { + } else if (gKeyWinLower.eq(k, vm)) { actionPerformed(actionLower); - } else if (IS_WMKEY(k, vm, gKeyWinRestore)) { + } else if (gKeyWinRestore.eq(k, vm)) { actionPerformed(actionRestore); - } else if (IS_WMKEY(k, vm, gKeyWinNext)) { + } else if (gKeyWinNext.eq(k, vm)) { wmNextWindow(); - } else if (IS_WMKEY(k, vm, gKeyWinMove)) { + } else if (gKeyWinMove.eq(k, vm)) { actionPerformed(actionMove); - } else if (IS_WMKEY(k, vm, gKeyWinSize)) { + } else if (gKeyWinSize.eq(k, vm)) { actionPerformed(actionSize); - } else if (IS_WMKEY(k, vm, gKeyWinMinimize)) { + } else if (gKeyWinMinimize.eq(k, vm)) { actionPerformed(actionMinimize); - } else if (IS_WMKEY(k, vm, gKeyWinMaximize)) { + } else if (gKeyWinMaximize.eq(k, vm)) { actionPerformed(actionMaximize); - } else if (IS_WMKEY(k, vm, gKeyWinHide)) { + } else if (gKeyWinHide.eq(k, vm)) { actionPerformed(actionHide); - } else if (IS_WMKEY(k, vm, gKeyWinRollup)) { + } else if (gKeyWinRollup.eq(k, vm)) { actionPerformed(actionRollup); - } else if (IS_WMKEY(k, vm, gKeyWinFullscreen)) { + } else if (gKeyWinFullscreen.eq(k, vm)) { actionPerformed(actionFullscreen); - } else if (IS_WMKEY(k, vm, gKeyWinMenu)) { + } else if (gKeyWinMenu.eq(k, vm)) { popupSystemMenu(this); - } else if (IS_WMKEY(k, vm, gKeyWinArrangeN)) { + } else if (gKeyWinArrangeN.eq(k, vm)) { if (canMove()) wmArrange(waTop, waCenter); - } else if (IS_WMKEY(k, vm, gKeyWinArrangeNE)) { + } else if (gKeyWinArrangeNE.eq(k, vm)) { if (canMove()) wmArrange(waTop, waRight); - } else if (IS_WMKEY(k, vm, gKeyWinArrangeE)) { + } else if (gKeyWinArrangeE.eq(k, vm)) { if (canMove()) wmArrange(waCenter, waRight); - } else if (IS_WMKEY(k, vm, gKeyWinArrangeSE)) { + } else if (gKeyWinArrangeSE.eq(k, vm)) { if (canMove()) wmArrange(waBottom, waRight); - } else if (IS_WMKEY(k, vm, gKeyWinArrangeS)) { + } else if (gKeyWinArrangeS.eq(k, vm)) { if (canMove()) wmArrange(waBottom, waCenter); - } else if (IS_WMKEY(k, vm, gKeyWinArrangeSW)) { + } else if (gKeyWinArrangeSW.eq(k, vm)) { if (canMove()) wmArrange(waBottom, waLeft); - } else if (IS_WMKEY(k, vm, gKeyWinArrangeW)) { + } else if (gKeyWinArrangeW.eq(k, vm)) { if (canMove()) wmArrange(waCenter, waLeft); - } else if (IS_WMKEY(k, vm, gKeyWinArrangeNW)) { + } else if (gKeyWinArrangeNW.eq(k, vm)) { if (canMove()) wmArrange(waTop, waLeft); - } else if (IS_WMKEY(k, vm, gKeyWinArrangeC)) { + } else if (gKeyWinArrangeC.eq(k, vm)) { if (canMove()) wmArrange(waCenter, waCenter); - } else if (IS_WMKEY(k, vm, gKeyWinTileLeft)) { + } else if (gKeyWinTileLeft.eq(k, vm)) { wmTile(actionTileLeft); - } else if (IS_WMKEY(k, vm, gKeyWinTileRight)) { + } else if (gKeyWinTileRight.eq(k, vm)) { wmTile(actionTileRight); - } else if (IS_WMKEY(k, vm, gKeyWinTileTop)) { + } else if (gKeyWinTileTop.eq(k, vm)) { wmTile(actionTileTop); - } else if (IS_WMKEY(k, vm, gKeyWinTileBottom)) { + } else if (gKeyWinTileBottom.eq(k, vm)) { wmTile(actionTileBottom); - } else if (IS_WMKEY(k, vm, gKeyWinTileTopLeft)) { + } else if (gKeyWinTileTopLeft.eq(k, vm)) { wmTile(actionTileTopLeft); - } else if (IS_WMKEY(k, vm, gKeyWinTileTopRight)) { + } else if (gKeyWinTileTopRight.eq(k, vm)) { wmTile(actionTileTopRight); - } else if (IS_WMKEY(k, vm, gKeyWinTileBottomLeft)) { + } else if (gKeyWinTileBottomLeft.eq(k, vm)) { wmTile(actionTileBottomLeft); - } else if (IS_WMKEY(k, vm, gKeyWinTileBottomRight)) { + } else if (gKeyWinTileBottomRight.eq(k, vm)) { wmTile(actionTileBottomRight); - } else if (IS_WMKEY(k, vm, gKeyWinTileCenter)) { + } else if (gKeyWinTileCenter.eq(k, vm)) { wmTile(actionTileCenter); - } else if (IS_WMKEY(k, vm, gKeyWinSmartPlace)) { + } else if (gKeyWinSmartPlace.eq(k, vm)) { if (canMove()) { int newX = x(); int newY = y(); diff --git a/src/wmapp.cc b/src/wmapp.cc index fb8bd0b49..89def814c 100644 --- a/src/wmapp.cc +++ b/src/wmapp.cc @@ -571,18 +571,18 @@ void MoveMenu::updatePopup() { char s[128]; snprintf(s, sizeof s, "%2d. %s ", w, workspaceNames[w - 1]); addItem(s, 1, - w == 1 ? KEY_NAME(gKeySysWorkspace1TakeWin) : - w == 2 ? KEY_NAME(gKeySysWorkspace2TakeWin) : - w == 3 ? KEY_NAME(gKeySysWorkspace3TakeWin) : - w == 4 ? KEY_NAME(gKeySysWorkspace4TakeWin) : - w == 5 ? KEY_NAME(gKeySysWorkspace5TakeWin) : - w == 6 ? KEY_NAME(gKeySysWorkspace6TakeWin) : - w == 7 ? KEY_NAME(gKeySysWorkspace7TakeWin) : - w == 8 ? KEY_NAME(gKeySysWorkspace8TakeWin) : - w == 9 ? KEY_NAME(gKeySysWorkspace9TakeWin) : - w == 10 ? KEY_NAME(gKeySysWorkspace10TakeWin) : - w == 11 ? KEY_NAME(gKeySysWorkspace11TakeWin) : - w == 12 ? KEY_NAME(gKeySysWorkspace12TakeWin) : + w == 1 ? gKeySysWorkspace1TakeWin.name : + w == 2 ? gKeySysWorkspace2TakeWin.name : + w == 3 ? gKeySysWorkspace3TakeWin.name : + w == 4 ? gKeySysWorkspace4TakeWin.name : + w == 5 ? gKeySysWorkspace5TakeWin.name : + w == 6 ? gKeySysWorkspace6TakeWin.name : + w == 7 ? gKeySysWorkspace7TakeWin.name : + w == 8 ? gKeySysWorkspace8TakeWin.name : + w == 9 ? gKeySysWorkspace9TakeWin.name : + w == 10 ? gKeySysWorkspace10TakeWin.name : + w == 11 ? gKeySysWorkspace11TakeWin.name : + w == 12 ? gKeySysWorkspace12TakeWin.name : "", workspaceActionMoveTo[w - 1]); } } @@ -639,34 +639,34 @@ YMenu* YWMApp::getWindowMenu() { windowMenu->setShared(true); if (strchr(winMenuItems, 'r')) - windowMenu->addItem(_("_Restore"), -2, KEY_NAME(gKeyWinRestore), actionRestore); + windowMenu->addItem(_("_Restore"), -2, gKeyWinRestore.name, actionRestore); if (strchr(winMenuItems, 'm')) - windowMenu->addItem(_("_Move"), -2, KEY_NAME(gKeyWinMove), actionMove); + windowMenu->addItem(_("_Move"), -2, gKeyWinMove.name, actionMove); if (strchr(winMenuItems, 's')) - windowMenu->addItem(_("_Size"), -2, KEY_NAME(gKeyWinSize), actionSize); + windowMenu->addItem(_("_Size"), -2, gKeyWinSize.name, actionSize); if (strchr(winMenuItems, 'n')) - windowMenu->addItem(_("Mi_nimize"), -2, KEY_NAME(gKeyWinMinimize), actionMinimize); + windowMenu->addItem(_("Mi_nimize"), -2, gKeyWinMinimize.name, actionMinimize); if (strchr(winMenuItems, 'x')) { - windowMenu->addItem(_("Ma_ximize"), -2, KEY_NAME(gKeyWinMaximize), actionMaximize); - windowMenu->addItem(_("Maximize_Vert"), -2, KEY_NAME(gKeyWinMaximizeVert), actionMaximizeVert); - windowMenu->addItem(_("MaximizeHori_z"), -2, KEY_NAME(gKeyWinMaximizeHoriz), actionMaximizeHoriz); + windowMenu->addItem(_("Ma_ximize"), -2, gKeyWinMaximize.name, actionMaximize); + windowMenu->addItem(_("Maximize_Vert"), -2, gKeyWinMaximizeVert.name, actionMaximizeVert); + windowMenu->addItem(_("MaximizeHori_z"), -2, gKeyWinMaximizeHoriz.name, actionMaximizeHoriz); } if (strchr(winMenuItems,'f') && allowFullscreen) - windowMenu->addItem(_("_Fullscreen"), -2, KEY_NAME(gKeyWinFullscreen), actionFullscreen); + windowMenu->addItem(_("_Fullscreen"), -2, gKeyWinFullscreen.name, actionFullscreen); if (strchr(winMenuItems, 'h')) - windowMenu->addItem(_("_Hide"), -2, KEY_NAME(gKeyWinHide), actionHide); + windowMenu->addItem(_("_Hide"), -2, gKeyWinHide.name, actionHide); if (strchr(winMenuItems, 'u')) - windowMenu->addItem(_("Roll_up"), -2, KEY_NAME(gKeyWinRollup), actionRollup); + windowMenu->addItem(_("Roll_up"), -2, gKeyWinRollup.name, actionRollup); if (strchr(winMenuItems, 'a') || strchr(winMenuItems,'l') || strchr(winMenuItems,'y') || strchr(winMenuItems,'t')) windowMenu->addSeparator(); if (strchr(winMenuItems, 'a')) - windowMenu->addItem(_("R_aise"), -2, KEY_NAME(gKeyWinRaise), actionRaise); + windowMenu->addItem(_("R_aise"), -2, gKeyWinRaise.name, actionRaise); if (strchr(winMenuItems, 'l')) - windowMenu->addItem(_("_Lower"), -2, KEY_NAME(gKeyWinLower), actionLower); + windowMenu->addItem(_("_Lower"), -2, gKeyWinLower.name, actionLower); if (strchr(winMenuItems, 'y')) windowMenu->addSubmenu(_("La_yer"), -2, layerMenu); @@ -676,7 +676,7 @@ YMenu* YWMApp::getWindowMenu() { if (strchr(winMenuItems, 't') && workspaceCount > 1) { windowMenu->addSeparator(); windowMenu->addSubmenu(_("Move _To"), -2, moveMenu); - windowMenu->addItem(_("Occupy _All"), -2, KEY_NAME(gKeyWinOccupyAll), actionOccupyAllOrCurrent); + windowMenu->addItem(_("Occupy _All"), -2, gKeyWinOccupyAll.name, actionOccupyAllOrCurrent); } /// this should probably go away, cause fullscreen will do mostly the same thing @@ -693,12 +693,12 @@ YMenu* YWMApp::getWindowMenu() { if (strchr(winMenuItems, 'c') || strchr(winMenuItems, 'k')) windowMenu->addSeparator(); if (strchr(winMenuItems, 'c')) - windowMenu->addItem(_("_Close"), -2, KEY_NAME(gKeyWinClose), actionClose); + windowMenu->addItem(_("_Close"), -2, gKeyWinClose.name, actionClose); if (strchr(winMenuItems, 'k')) windowMenu->addItem(_("_Kill Client"), -2, null, actionKill); if (strchr(winMenuItems, 'w')) { windowMenu->addSeparator(); - windowMenu->addItem(_("_Window list"), -2, KEY_NAME(gKeySysWindowList), actionWindowList); + windowMenu->addItem(_("_Window list"), -2, gKeySysWindowList.name, actionWindowList); } return windowMenu; @@ -1596,9 +1596,9 @@ void YWMApp::afterWindowEvent(XEvent &xev) { static XEvent lastKeyEvent = { 0 }; if (xev.type == KeyRelease && lastKeyEvent.type == KeyPress) { - KeySym k1 = XkbKeycodeToKeysym(xapp->display(), xev.xkey.keycode, 0, 0); + KeySym k1 = keyCodeToKeySym(xev.xkey.keycode); unsigned int m1 = KEY_MODMASK(lastKeyEvent.xkey.state); - KeySym k2 = XkbKeycodeToKeysym(xapp->display(), lastKeyEvent.xkey.keycode, 0, 0); + KeySym k2 = keyCodeToKeySym(lastKeyEvent.xkey.keycode); if (m1 == 0 && xapp->WinMask && win95keys) { if (k1 == xapp->Win_L && k2 == xapp->Win_L) { diff --git a/src/wmmgr.cc b/src/wmmgr.cc index 6618e2f63..fbc6048c1 100644 --- a/src/wmmgr.cc +++ b/src/wmmgr.cc @@ -335,77 +335,77 @@ bool YWindowManager::switchWindowVisible() const { bool YWindowManager::handleSwitchWorkspaceKey(const XKeyEvent& key, KeySym k, unsigned vm) { - if (IS_WMKEY(k, vm, gKeySysWorkspacePrev)) { + if (gKeySysWorkspacePrev.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToPrevWorkspace(false); return true; } - else if (IS_WMKEY(k, vm, gKeySysWorkspaceNext)) { + else if (gKeySysWorkspaceNext.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToNextWorkspace(false); return true; } - else if (IS_WMKEY(k, vm, gKeySysWorkspaceLast)) { + else if (gKeySysWorkspaceLast.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToLastWorkspace(false); return true; } - else if (IS_WMKEY(k, vm, gKeySysWorkspace1)) { + else if (gKeySysWorkspace1.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(0, false); return true; } - else if (IS_WMKEY(k, vm, gKeySysWorkspace2)) { + else if (gKeySysWorkspace2.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(1, false); return true; } - else if (IS_WMKEY(k, vm, gKeySysWorkspace3)) { + else if (gKeySysWorkspace3.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(2, false); return true; } - else if (IS_WMKEY(k, vm, gKeySysWorkspace4)) { + else if (gKeySysWorkspace4.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(3, false); return true; } - else if (IS_WMKEY(k, vm, gKeySysWorkspace5)) { + else if (gKeySysWorkspace5.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(4, false); return true; } - else if (IS_WMKEY(k, vm, gKeySysWorkspace6)) { + else if (gKeySysWorkspace6.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(5, false); return true; } - else if (IS_WMKEY(k, vm, gKeySysWorkspace7)) { + else if (gKeySysWorkspace7.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(6, false); return true; } - else if (IS_WMKEY(k, vm, gKeySysWorkspace8)) { + else if (gKeySysWorkspace8.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(7, false); return true; } - else if (IS_WMKEY(k, vm, gKeySysWorkspace9)) { + else if (gKeySysWorkspace9.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(8, false); return true; } - else if (IS_WMKEY(k, vm, gKeySysWorkspace10)) { + else if (gKeySysWorkspace10.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(9, false); return true; } - else if (IS_WMKEY(k, vm, gKeySysWorkspace11)) { + else if (gKeySysWorkspace11.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(10, false); return true; } - else if (IS_WMKEY(k, vm, gKeySysWorkspace12)) { + else if (gKeySysWorkspace12.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(11, false); return true; @@ -424,13 +424,13 @@ bool YWindowManager::handleWMKey(const XKeyEvent &key, KeySym k, unsigned vm) { } } - if (IS_WMKEY(k, vm, gKeySysSwitchNext)) { + if (gKeySysSwitchNext.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); if (getSwitchWindow()) getSwitchWindow()->begin(true, key.state); return true; } - else if (IS_WMKEY(k, vm, gKeySysSwitchLast)) { + else if (gKeySysSwitchLast.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); if (getSwitchWindow()) getSwitchWindow()->begin(false, key.state); @@ -445,31 +445,31 @@ bool YWindowManager::handleWMKey(const XKeyEvent &key, KeySym k, unsigned vm) { } return true; } - else if (IS_WMKEY(k, vm, gKeySysWinNext)) { + else if (gKeySysWinNext.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); if (frame) frame->wmNextWindow(); return true; - } else if (IS_WMKEY(k, vm, gKeySysWinPrev)) { + } else if (gKeySysWinPrev.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); if (frame) frame->wmPrevWindow(); return true; - } else if (IS_WMKEY(k, vm, gKeySysWinMenu)) { + } else if (gKeySysWinMenu.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); if (frame) frame->popupSystemMenu(this); return true; - } else if (IS_WMKEY(k, vm, gKeySysDialog)) { + } else if (gKeySysDialog.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); wmActionListener->actionPerformed(actionSysDialog); return true; - } else if (IS_WMKEY(k, vm, gKeySysWinListMenu)) { + } else if (gKeySysWinListMenu.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); popupWindowListMenu(this); return true; - } else if (IS_WMKEY(k, vm, gKeySysMenu)) { + } else if (gKeySysMenu.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); popupStartMenu(this); return true; - } else if (IS_WMKEY(k, vm, gKeySysWindowList)) { + } else if (gKeySysWindowList.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); wmActionListener->actionPerformed(actionWindowList, 0); return true; @@ -477,129 +477,129 @@ bool YWindowManager::handleWMKey(const XKeyEvent &key, KeySym k, unsigned vm) { else if (handleSwitchWorkspaceKey(key, k, vm)) { return true; } - else if (IS_WMKEY(k, vm, gKeySysWorkspacePrevTakeWin)) { + else if (gKeySysWorkspacePrevTakeWin.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToPrevWorkspace(true); return true; - } else if (IS_WMKEY(k, vm, gKeySysWorkspaceNextTakeWin)) { + } else if (gKeySysWorkspaceNextTakeWin.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToNextWorkspace(true); return true; - } else if (IS_WMKEY(k, vm, gKeySysWorkspaceLastTakeWin)) { + } else if (gKeySysWorkspaceLastTakeWin.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToLastWorkspace(true); return true; - } else if (IS_WMKEY(k, vm, gKeySysWorkspace1TakeWin)) { + } else if (gKeySysWorkspace1TakeWin.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(0, true); return true; - } else if (IS_WMKEY(k, vm, gKeySysWorkspace2TakeWin)) { + } else if (gKeySysWorkspace2TakeWin.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(1, true); return true; - } else if (IS_WMKEY(k, vm, gKeySysWorkspace3TakeWin)) { + } else if (gKeySysWorkspace3TakeWin.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(2, true); return true; - } else if (IS_WMKEY(k, vm, gKeySysWorkspace4TakeWin)) { + } else if (gKeySysWorkspace4TakeWin.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(3, true); return true; - } else if (IS_WMKEY(k, vm, gKeySysWorkspace5TakeWin)) { + } else if (gKeySysWorkspace5TakeWin.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(4, true); return true; - } else if (IS_WMKEY(k, vm, gKeySysWorkspace6TakeWin)) { + } else if (gKeySysWorkspace6TakeWin.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(5, true); return true; - } else if (IS_WMKEY(k, vm, gKeySysWorkspace7TakeWin)) { + } else if (gKeySysWorkspace7TakeWin.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(6, true); return true; - } else if (IS_WMKEY(k, vm, gKeySysWorkspace8TakeWin)) { + } else if (gKeySysWorkspace8TakeWin.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(7, true); return true; - } else if (IS_WMKEY(k, vm, gKeySysWorkspace9TakeWin)) { + } else if (gKeySysWorkspace9TakeWin.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(8, true); return true; - } else if (IS_WMKEY(k, vm, gKeySysWorkspace10TakeWin)) { + } else if (gKeySysWorkspace10TakeWin.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(9, true); return true; - } else if (IS_WMKEY(k, vm, gKeySysWorkspace11TakeWin)) { + } else if (gKeySysWorkspace11TakeWin.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(10, true); return true; - } else if (IS_WMKEY(k, vm, gKeySysWorkspace12TakeWin)) { + } else if (gKeySysWorkspace12TakeWin.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); switchToWorkspace(11, true); return true; - } else if (IS_WMKEY(k, vm, gKeySysTileVertical)) { + } else if (gKeySysTileVertical.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); wmActionListener->actionPerformed(actionTileVertical, 0); return true; - } else if (IS_WMKEY(k, vm, gKeySysTileHorizontal)) { + } else if (gKeySysTileHorizontal.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); wmActionListener->actionPerformed(actionTileHorizontal, 0); return true; - } else if (IS_WMKEY(k, vm, gKeySysCascade)) { + } else if (gKeySysCascade.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); wmActionListener->actionPerformed(actionCascade, 0); return true; - } else if (IS_WMKEY(k, vm, gKeySysArrange)) { + } else if (gKeySysArrange.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); wmActionListener->actionPerformed(actionArrange, 0); return true; - } else if (IS_WMKEY(k, vm, gKeySysUndoArrange)) { + } else if (gKeySysUndoArrange.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); wmActionListener->actionPerformed(actionUndoArrange, 0); return true; - } else if (IS_WMKEY(k, vm, gKeySysArrangeIcons)) { + } else if (gKeySysArrangeIcons.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); wmActionListener->actionPerformed(actionArrangeIcons, 0); return true; - } else if (IS_WMKEY(k, vm, gKeySysMinimizeAll)) { + } else if (gKeySysMinimizeAll.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); wmActionListener->actionPerformed(actionMinimizeAll, 0); return true; - } else if (IS_WMKEY(k, vm, gKeySysHideAll)) { + } else if (gKeySysHideAll.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); wmActionListener->actionPerformed(actionHideAll, 0); return true; - } else if (IS_WMKEY(k, vm, gKeySysAddressBar)) { + } else if (gKeySysAddressBar.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); if (taskBar) { taskBar->showAddressBar(); return true; } - } else if (IS_WMKEY(k, vm, gKeySysShowDesktop)) { + } else if (gKeySysShowDesktop.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); wmActionListener->actionPerformed(actionShowDesktop, 0); return true; - } else if (IS_WMKEY(k, vm, gKeySysCollapseTaskBar)) { + } else if (gKeySysCollapseTaskBar.eq(k, vm)) { XAllowEvents(xapp->display(), AsyncKeyboard, key.time); wmActionListener->actionPerformed(actionCollapseTaskbar, 0); return true; - } else if (IS_WMKEY(k, vm, gKeyTaskBarSwitchPrev)) { + } else if (gKeyTaskBarSwitchPrev.eq(k, vm)) { if (taskBar) taskBar->switchToPrev(); return true; - } else if (IS_WMKEY(k, vm, gKeyTaskBarSwitchNext)) { + } else if (gKeyTaskBarSwitchNext.eq(k, vm)) { if (taskBar) taskBar->switchToNext(); return true; - } else if (IS_WMKEY(k, vm, gKeyTaskBarMovePrev)) { + } else if (gKeyTaskBarMovePrev.eq(k, vm)) { if (taskBar) taskBar->movePrev(); return true; - } else if (IS_WMKEY(k, vm, gKeyTaskBarMoveNext)) { + } else if (gKeyTaskBarMoveNext.eq(k, vm)) { if (taskBar) taskBar->moveNext(); return true; - } else if (IS_WMKEY(k, vm, gKeySysKeyboardNext)) { + } else if (gKeySysKeyboardNext.eq(k, vm)) { if (configKeyboards.nonempty()) setKeyboard((fDefaultKeyboard + 1) % configKeyboards.getCount()); return true; diff --git a/src/wmminiicon.cc b/src/wmminiicon.cc index 87e5f3dc5..067b6786b 100644 --- a/src/wmminiicon.cc +++ b/src/wmminiicon.cc @@ -229,13 +229,13 @@ bool MiniIcon::handleKey(const XKeyEvent& key) { KeySym k = keyCodeToKeySym(key.keycode); unsigned int m = KEY_MODMASK(key.state); unsigned int vm = VMod(m); - if (IS_WMKEY(k, vm, gKeyWinClose)) { + if (gKeyWinClose.eq(k, vm)) { fFrame->actionPerformed(actionClose); } - else if (IS_WMKEY(k, vm, gKeyWinLower)) { + else if (gKeyWinLower.eq(k, vm)) { fFrame->actionPerformed(actionLower); } - else if (IS_WMKEY(k, vm, gKeyWinRestore)) { + else if (gKeyWinRestore.eq(k, vm)) { fFrame->actionPerformed(actionRestore); } else if (k == XK_Return || k == XK_KP_Enter) { diff --git a/src/wmtaskbar.cc b/src/wmtaskbar.cc index a545ce843..8cd7ac86b 100644 --- a/src/wmtaskbar.cc +++ b/src/wmtaskbar.cc @@ -212,22 +212,22 @@ class TaskBarMenu : public YMenu { setActionListener(taskBar); // TRANSLATORS: This appears in a group with others items, so please make the hotkeys unique in the set: # T_ile Horizontally, Ca_scade, _Arrange, _Minimize All, _Hide All, _Undo, Arrange _Icons, _Windows, _Refresh, _About, _Logout - addItem(_("Tile _Vertically"), -2, KEY_NAME(gKeySysTileVertical), actionTileVertical); + addItem(_("Tile _Vertically"), -2, gKeySysTileVertical.name, actionTileVertical); // TRANSLATORS: This appears in a group with others items, so please make the hotkeys unique in the set: # T_ile Horizontally, Ca_scade, _Arrange, _Minimize All, _Hide All, _Undo, Arrange _Icons, _Windows, _Refresh, _About, _Logout - addItem(_("T_ile Horizontally"), -2, KEY_NAME(gKeySysTileHorizontal), actionTileHorizontal); + addItem(_("T_ile Horizontally"), -2, gKeySysTileHorizontal.name, actionTileHorizontal); // TRANSLATORS: This appears in a group with others items, so please make the hotkeys unique in the set: # T_ile Horizontally, Ca_scade, _Arrange, _Minimize All, _Hide All, _Undo, Arrange _Icons, _Windows, _Refresh, _About, _Logout - addItem(_("Ca_scade"), -2, KEY_NAME(gKeySysCascade), actionCascade); + addItem(_("Ca_scade"), -2, gKeySysCascade.name, actionCascade); // TRANSLATORS: This appears in a group with others items, so please make the hotkeys unique in the set: # T_ile Horizontally, Ca_scade, _Arrange, _Minimize All, _Hide All, _Undo, Arrange _Icons, _Windows, _Refresh, _About, _Logout - addItem(_("_Arrange"), -2, KEY_NAME(gKeySysArrange), actionArrange); + addItem(_("_Arrange"), -2, gKeySysArrange.name, actionArrange); // TRANSLATORS: This appears in a group with others items, so please make the hotkeys unique in the set: # T_ile Horizontally, Ca_scade, _Arrange, _Minimize All, _Hide All, _Undo, Arrange _Icons, _Windows, _Refresh, _About, _Logout - addItem(_("_Minimize All"), -2, KEY_NAME(gKeySysMinimizeAll), actionMinimizeAll); + addItem(_("_Minimize All"), -2, gKeySysMinimizeAll.name, actionMinimizeAll); // TRANSLATORS: This appears in a group with others items, so please make the hotkeys unique in the set: # T_ile Horizontally, Ca_scade, _Arrange, _Minimize All, _Hide All, _Undo, Arrange _Icons, _Windows, _Refresh, _About, _Logout - addItem(_("_Hide All"), -2, KEY_NAME(gKeySysHideAll), actionHideAll); + addItem(_("_Hide All"), -2, gKeySysHideAll.name, actionHideAll); // TRANSLATORS: This appears in a group with others items, so please make the hotkeys unique in the set: # T_ile Horizontally, Ca_scade, _Arrange, _Minimize All, _Hide All, _Undo, Arrange _Icons, _Windows, _Refresh, _About, _Logout - addItem(_("_Undo"), -2, KEY_NAME(gKeySysUndoArrange), actionUndoArrange); + addItem(_("_Undo"), -2, gKeySysUndoArrange.name, actionUndoArrange); if (minimizeToDesktop) // TRANSLATORS: This appears in a group with others items, so please make the hotkeys unique in the set: # T_ile Horizontally, Ca_scade, _Arrange, _Minimize All, _Hide All, _Undo, Arrange _Icons, _Windows, _Refresh, _About, _Logout - addItem(_("Arrange _Icons"), -2, KEY_NAME(gKeySysArrangeIcons), actionArrangeIcons); + addItem(_("Arrange _Icons"), -2, gKeySysArrangeIcons.name, actionArrangeIcons); addSeparator(); // TRANSLATORS: This appears in a group with others items, so please make the hotkeys unique in the set: # T_ile Horizontally, Ca_scade, _Arrange, _Minimize All, _Hide All, _Undo, Arrange _Icons, _Windows, _Refresh, _About, _Logout addItem(_("_Windows"), -2, actionWindowList, windowListMenu); diff --git a/src/wmwinlist.cc b/src/wmwinlist.cc index 840ed946c..3083d9feb 100644 --- a/src/wmwinlist.cc +++ b/src/wmwinlist.cc @@ -433,33 +433,33 @@ YMenu* WindowList::getWindowListPopup() { } WindowListPopup::WindowListPopup() { - addItem(_("_Restore"), -2, KEY_NAME(gKeyWinRestore), actionRestore); - addItem(_("Mi_nimize"), -2, KEY_NAME(gKeyWinMinimize), actionMinimize); - addItem(_("Ma_ximize"), -2, KEY_NAME(gKeyWinMaximize), actionMaximize); - addItem(_("Maximize_Vert"), -2, KEY_NAME(gKeyWinMaximizeVert), actionMaximizeVert); - addItem(_("MaximizeHori_z"), -2, KEY_NAME(gKeyWinMaximizeHoriz), actionMaximizeHoriz); - addItem(_("_Fullscreen"), -2, KEY_NAME(gKeyWinFullscreen), actionFullscreen); + addItem(_("_Restore"), -2, gKeyWinRestore.name, actionRestore); + addItem(_("Mi_nimize"), -2, gKeyWinMinimize.name, actionMinimize); + addItem(_("Ma_ximize"), -2, gKeyWinMaximize.name, actionMaximize); + addItem(_("Maximize_Vert"), -2, gKeyWinMaximizeVert.name, actionMaximizeVert); + addItem(_("MaximizeHori_z"), -2, gKeyWinMaximizeHoriz.name, actionMaximizeHoriz); + addItem(_("_Fullscreen"), -2, gKeyWinFullscreen.name, actionFullscreen); addItem(_("_Show"), -2, null, actionShow); - addItem(_("_Hide"), -2, KEY_NAME(gKeyWinHide), actionHide); - addItem(_("Roll_up"), -2, KEY_NAME(gKeyWinRollup), actionRollup); - addItem(_("_Raise"), -2, KEY_NAME(gKeyWinRaise), actionRaise); - addItem(_("_Lower"), -2, KEY_NAME(gKeyWinLower), actionLower); + addItem(_("_Hide"), -2, gKeyWinHide.name, actionHide); + addItem(_("Roll_up"), -2, gKeyWinRollup.name, actionRollup); + addItem(_("_Raise"), -2, gKeyWinRaise.name, actionRaise); + addItem(_("_Lower"), -2, gKeyWinLower.name, actionLower); addSubmenu(_("La_yer"), -2, layerMenu); addSubmenu(_("Tile"), -2, tileMenu); addSeparator(); addSubmenu(_("Move _To"), -2, moveMenu); - addItem(_("Occupy _All"), -2, KEY_NAME(gKeyWinOccupyAll), actionOccupyAllOrCurrent); + addItem(_("Occupy _All"), -2, gKeyWinOccupyAll.name, actionOccupyAllOrCurrent); addItem(_("Tray _icon"), -2, null, actionToggleTray); addItem(_("R_ename title"), -2, null, actionRename); addSeparator(); - addItem(_("Tile _Vertically"), -2, KEY_NAME(gKeySysTileVertical), actionTileVertical); - addItem(_("T_ile Horizontally"), -2, KEY_NAME(gKeySysTileHorizontal), actionTileHorizontal); - addItem(_("Ca_scade"), -2, KEY_NAME(gKeySysCascade), actionCascade); - addItem(_("_Arrange"), -2, KEY_NAME(gKeySysArrange), actionArrange); + addItem(_("Tile _Vertically"), -2, gKeySysTileVertical.name, actionTileVertical); + addItem(_("T_ile Horizontally"), -2, gKeySysTileHorizontal.name, actionTileHorizontal); + addItem(_("Ca_scade"), -2, gKeySysCascade.name, actionCascade); + addItem(_("_Arrange"), -2, gKeySysArrange.name, actionArrange); addSeparator(); - addItem(_("_Minimize All"), -2, KEY_NAME(gKeySysMinimizeAll), actionMinimizeAll); - addItem(_("_Hide All"), -2, KEY_NAME(gKeySysHideAll), actionHideAll); - addItem(_("_Undo"), -2, KEY_NAME(gKeySysUndoArrange), actionUndoArrange); + addItem(_("_Minimize All"), -2, gKeySysMinimizeAll.name, actionMinimizeAll); + addItem(_("_Hide All"), -2, gKeySysHideAll.name, actionHideAll); + addItem(_("_Undo"), -2, gKeySysUndoArrange.name, actionUndoArrange); addSeparator(); YMenu *closeSubmenu = new YMenu(); @@ -485,13 +485,13 @@ YMenu* WindowList::getWindowListAllPopup() { } WindowListAllPopup::WindowListAllPopup() { - addItem(_("Tile _Vertically"), -2, KEY_NAME(gKeySysTileVertical), actionTileVertical); - addItem(_("T_ile Horizontally"), -2, KEY_NAME(gKeySysTileHorizontal), actionTileHorizontal); - addItem(_("Ca_scade"), -2, KEY_NAME(gKeySysCascade), actionCascade); - addItem(_("_Arrange"), -2, KEY_NAME(gKeySysArrange), actionArrange); - addItem(_("_Minimize All"), -2, KEY_NAME(gKeySysMinimizeAll), actionMinimizeAll); - addItem(_("_Hide All"), -2, KEY_NAME(gKeySysHideAll), actionHideAll); - addItem(_("_Undo"), -2, KEY_NAME(gKeySysUndoArrange), actionUndoArrange); + addItem(_("Tile _Vertically"), -2, gKeySysTileVertical.name, actionTileVertical); + addItem(_("T_ile Horizontally"), -2, gKeySysTileHorizontal.name, actionTileHorizontal); + addItem(_("Ca_scade"), -2, gKeySysCascade.name, actionCascade); + addItem(_("_Arrange"), -2, gKeySysArrange.name, actionArrange); + addItem(_("_Minimize All"), -2, gKeySysMinimizeAll.name, actionMinimizeAll); + addItem(_("_Hide All"), -2, gKeySysHideAll.name, actionHideAll); + addItem(_("_Undo"), -2, gKeySysUndoArrange.name, actionUndoArrange); } void WindowList::setupClient() { diff --git a/src/wmwinmenu.cc b/src/wmwinmenu.cc index 9db86296b..bad08768b 100644 --- a/src/wmwinmenu.cc +++ b/src/wmwinmenu.cc @@ -138,7 +138,7 @@ void WindowListMenu::updatePopup() { } } addSeparator(); - addItem(_("_Window list"), -2, KEY_NAME(gKeySysWindowList), actionWindowList); + addItem(_("_Window list"), -2, gKeySysWindowList.name, actionWindowList); setActionListener(this); }