1 files changed, 42 insertions, 42 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 87ff882..ac1ac30 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -785,50 +785,50 @@ void Fluxbox::process_event(XEvent *e) {
                                if (actionstr)
                                        cerr<<"KeyAction("<<actionstr<<")"<<endl;                               
                                #endif
-                                if (action==Keys::lastKeygrab) //if action not found end case
+                                if (action==Keys::LASTKEYGRAB) //if action not found end case
                                        break;
                                switch (action) {                                       
-                                        case Keys::grabWorkspace1:
+                                        case Keys::WORKSPACE1:
                                                screen->changeWorkspaceID(0);
                                                break;
-                                        case Keys::grabWorkspace2:
+                                        case Keys::WORKSPACE2:
                                                screen->changeWorkspaceID(1);
                                                break;
-                                        case Keys::grabWorkspace3:
+                                        case Keys::WORKSPACE3:
                                                screen->changeWorkspaceID(2);
                                                break;
-                                        case Keys::grabWorkspace4:
+                                        case Keys::WORKSPACE4:
                                                screen->changeWorkspaceID(3);
                                                break;
-                                        case Keys::grabWorkspace5:
+                                        case Keys::WORKSPACE5:
                                                screen->changeWorkspaceID(4);
                                                break;
-                                        case Keys::grabWorkspace6:
+                                        case Keys::WORKSPACE6:
                                                screen->changeWorkspaceID(5);
                                                break;
-                                        case Keys::grabWorkspace7:
+                                        case Keys::WORKSPACE7:
                                                screen->changeWorkspaceID(6);
                                                break;
-                                        case Keys::grabWorkspace8:
+                                        case Keys::WORKSPACE8:
                                                screen->changeWorkspaceID(7);
                                                break;
-                                        case Keys::grabWorkspace9:
+                                        case Keys::WORKSPACE9:
                                                screen->changeWorkspaceID(8);
                                                break;
-                                        case Keys::grabWorkspace10:
+                                        case Keys::WORKSPACE10:
                                                screen->changeWorkspaceID(9);
                                                break;
-                                        case Keys::grabWorkspace11:
+                                        case Keys::WORKSPACE11:
                                                screen->changeWorkspaceID(10);
                                                break;
-                                        case Keys::grabWorkspace12:
+                                        case Keys::WORKSPACE12:
                                                screen->changeWorkspaceID(11);
                                                break;
-                                        case Keys::grabNextWorkspace:
+                                        case Keys::NEXTWORKSPACE:
                                                screen->nextWorkspace();
                                                break;
-                                        case Keys::grabPrevWorkspace:
+                                        case Keys::PREVWORKSPACE:
                                                screen->prevWorkspace();
                                                break;
                                        /*case Keys::grabUpWorkspace:
@@ -840,15 +840,15 @@ void Fluxbox::process_event(XEvent *e) {
                                        case Keys::grabRightWorkspace:
                                                break;
                                        */
-                                        case Keys::grabKillWindow: //kill the current window
+                                        case Keys::KILLWINDOW: //kill the current window
                                                break;
-                                        case Keys::grabNextWindow:      //activate next window
+                                        case Keys::NEXTWINDOW:  //activate next window
                                                screen->nextFocus();
                                                break;
-                                        case Keys::grabPrevWindow:      //activate prev window
+                                        case Keys::PREVWINDOW:  //activate prev window
                                                screen->prevFocus();
                                                break;
-                                        case Keys::grabNextTab: 
+                                        case Keys::NEXTTAB: 
                                                if (focused_window && focused_window->getTab()) {
                                                        Tab *tab = focused_window->getTab();
                                                        if (tab->next()) {
@@ -862,7 +862,7 @@ void Fluxbox::process_event(XEvent *e) {
                                                        }       
                                                }
                                                break;                                          
-                                        case Keys::grabPrevTab: 
+                                        case Keys::PREVTAB: 
                                                if (focused_window && focused_window->getTab()) {
                                                        Tab *tab = focused_window->getTab();
                                                        if (tab->prev()) {
@@ -876,7 +876,7 @@ void Fluxbox::process_event(XEvent *e) {
                                                        }
                                                }
                                                break;
-                                        case Keys::grabExecute: //execute command on keypress
+                                        case Keys::EXECUTE: //execute command on keypress
                                        {
                                                #ifndef    __EMX__
                                                char displaystring[MAXPATHLEN];
@@ -1005,28 +1005,28 @@ void Fluxbox::doWindowAction(Keys::KeyAction action) {
                return;
                
        switch (action) {
-                case Keys::grabIconify:
+                case Keys::ICONIFY:
                        focused_window->iconify();
                break;
-                case Keys::grabRaise:
+                case Keys::RAISE:
                        focused_window->getScreen()->getWorkspace(focused_window->getWorkspaceNumber())->raiseWindow(focused_window);   
                break;
-                case Keys::grabLower:
+                case Keys::LOWER:
                        XLowerWindow(getXDisplay(), focused_window->getFrameWindow());
                break;
-                case Keys::grabClose:
+                case Keys::CLOSE:
                        focused_window->close();
                break;
-                case Keys::grabShade:           
+                case Keys::SHADE:               
                        focused_window->shade();
                break;
-                case Keys::grabMaximize:
+                case Keys::MAXIMIZE:
                        focused_window->maximize(0);
                break;
-                case Keys::grabStick:
+                case Keys::STICK:
                        focused_window->stick();
                break;                                                          
-                case Keys::grabVertMax:
+                case Keys::VERTMAX:
                        //!!TODO: fix this
                        if (focused_window->isResizable()) {
                                int w = focused_window->getWidth();
@@ -1036,7 +1036,7 @@ void Fluxbox::doWindowAction(Keys::KeyAction action) {
                                focused_window->configure(x, y, w, focused_window->getHeight());
                        }
                break;
-                case Keys::grabHorizMax:
+                case Keys::HORIZMAX:
                        //!!TODO: fix this
                        if (focused_window->isResizable()) {
                                int h = focused_window->getHeight();
@@ -1046,65 +1046,65 @@ void Fluxbox::doWindowAction(Keys::KeyAction action) {
                                focused_window->configure(x, y, focused_window->getWidth(), h);
                        }
                break;
-                case Keys::grabNudgeRight:      
+                case Keys::NUDGERIGHT:  
                        focused_window->configure(
                                focused_window->getXFrame()+1, focused_window->getYFrame(),
                                focused_window->getWidth(), focused_window->getHeight());
                break;
-                case Keys::grabNudgeLeft:                       
+                case Keys::NUDGELEFT:                   
                        focused_window->configure(
                                focused_window->getXFrame()-1, focused_window->getYFrame(),
                                focused_window->getWidth(), focused_window->getHeight());
                break;
-                case Keys::grabNudgeUp:
+                case Keys::NUDGEUP:
                        focused_window->configure(
                                focused_window->getXFrame(), focused_window->getYFrame()-1,
                                focused_window->getWidth(), focused_window->getHeight());
                break;
-                case Keys::grabNudgeDown:
+                case Keys::NUDGEDOWN:
                        focused_window->configure(
                                focused_window->getXFrame(), focused_window->getYFrame()+1,
                                focused_window->getWidth(), focused_window->getHeight());
                break;
-                case Keys::grabBigNudgeRight:           
+                case Keys::BIGNUDGERIGHT:               
                        focused_window->configure(
                                focused_window->getXFrame()+10, focused_window->getYFrame(),
                                focused_window->getWidth(), focused_window->getHeight());
                break;
-                case Keys::grabBigNudgeLeft:                                            
+                case Keys::BIGNUDGELEFT:                                                
                        focused_window->configure(
                                focused_window->getXFrame()-10, focused_window->getYFrame(),
                                focused_window->getWidth(), focused_window->getHeight());
                break;
-                case Keys::grabBigNudgeUp:                                                              
+                case Keys::BIGNUDGEUP:                                                          
                        focused_window->configure(
                                focused_window->getXFrame(), focused_window->getYFrame()-10,
                                focused_window->getWidth(), focused_window->getHeight());
                break;                                                          
-                case Keys::grabBigNudgeDown:                                    
+                case Keys::BIGNUDGEDOWN:                                        
                        focused_window->configure(
                                focused_window->getXFrame(), focused_window->getYFrame()+10,
                                focused_window->getWidth(), focused_window->getHeight());                                                               
                break;                                                                                          
-                case Keys::grabHorizInc:
+                case Keys::HORIZINC:
                        if (focused_window->isResizable())
                                focused_window->configure(
                                        focused_window->getXFrame(), focused_window->getYFrame(),
                                        focused_window->getWidth()+10, focused_window->getHeight());
                break;                                                          
-                case Keys::grabVertInc:
+                case Keys::VERTINC:
                        if (focused_window->isResizable())
                                focused_window->configure(
                                        focused_window->getXFrame(), focused_window->getYFrame(),
                                        focused_window->getWidth(), focused_window->getHeight()+10);
                break;
-                case Keys::grabHorizDec:                                
+                case Keys::HORIZDEC:                            
                        if (focused_window->isResizable())
                                focused_window->configure(
                                        focused_window->getXFrame(), focused_window->getYFrame(),
                                        focused_window->getWidth()-10, focused_window->getHeight());
                break;                                                          
-                case Keys::grabVertDec:
+                case Keys::VERTDEC:
                        if (focused_window->isResizable())
                                focused_window->configure(
                                        focused_window->getXFrame(), focused_window->getYFrame(),

diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 87ff882..ac1ac30 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc
@@ -785,50 +785,50 @@ void Fluxbox::process_event(XEvent *e) {
785	if (actionstr)	785	if (actionstr)
786	cerr<<"KeyAction("<<actionstr<<")"<<endl;	786	cerr<<"KeyAction("<<actionstr<<")"<<endl;
787	#endif	787	#endif
788	if (action==Keys::lastKeygrab) //if action not found end case	788	if (action==Keys::LASTKEYGRAB) //if action not found end case
789	break;	789	break;
790		790
791	switch (action) {	791	switch (action) {
792	case Keys::grabWorkspace1:	792	case Keys::WORKSPACE1:
793	screen->changeWorkspaceID(0);	793	screen->changeWorkspaceID(0);
794	break;	794	break;
795	case Keys::grabWorkspace2:	795	case Keys::WORKSPACE2:
796	screen->changeWorkspaceID(1);	796	screen->changeWorkspaceID(1);
797	break;	797	break;
798	case Keys::grabWorkspace3:	798	case Keys::WORKSPACE3:
799	screen->changeWorkspaceID(2);	799	screen->changeWorkspaceID(2);
800	break;	800	break;
801	case Keys::grabWorkspace4:	801	case Keys::WORKSPACE4:
802	screen->changeWorkspaceID(3);	802	screen->changeWorkspaceID(3);
803	break;	803	break;
804	case Keys::grabWorkspace5:	804	case Keys::WORKSPACE5:
805	screen->changeWorkspaceID(4);	805	screen->changeWorkspaceID(4);
806	break;	806	break;
807	case Keys::grabWorkspace6:	807	case Keys::WORKSPACE6:
808	screen->changeWorkspaceID(5);	808	screen->changeWorkspaceID(5);
809	break;	809	break;
810	case Keys::grabWorkspace7:	810	case Keys::WORKSPACE7:
811	screen->changeWorkspaceID(6);	811	screen->changeWorkspaceID(6);
812	break;	812	break;
813	case Keys::grabWorkspace8:	813	case Keys::WORKSPACE8:
814	screen->changeWorkspaceID(7);	814	screen->changeWorkspaceID(7);
815	break;	815	break;
816	case Keys::grabWorkspace9:	816	case Keys::WORKSPACE9:
817	screen->changeWorkspaceID(8);	817	screen->changeWorkspaceID(8);
818	break;	818	break;
819	case Keys::grabWorkspace10:	819	case Keys::WORKSPACE10:
820	screen->changeWorkspaceID(9);	820	screen->changeWorkspaceID(9);
821	break;	821	break;
822	case Keys::grabWorkspace11:	822	case Keys::WORKSPACE11:
823	screen->changeWorkspaceID(10);	823	screen->changeWorkspaceID(10);
824	break;	824	break;
825	case Keys::grabWorkspace12:	825	case Keys::WORKSPACE12:
826	screen->changeWorkspaceID(11);	826	screen->changeWorkspaceID(11);
827	break;	827	break;
828	case Keys::grabNextWorkspace:	828	case Keys::NEXTWORKSPACE:
829	screen->nextWorkspace();	829	screen->nextWorkspace();
830	break;	830	break;
831	case Keys::grabPrevWorkspace:	831	case Keys::PREVWORKSPACE:
832	screen->prevWorkspace();	832	screen->prevWorkspace();
833	break;	833	break;
834	/*case Keys::grabUpWorkspace:	834	/*case Keys::grabUpWorkspace:
@@ -840,15 +840,15 @@ void Fluxbox::process_event(XEvent *e) {
840	case Keys::grabRightWorkspace:	840	case Keys::grabRightWorkspace:
841	break;	841	break;
842	*/	842	*/
843	case Keys::grabKillWindow: //kill the current window	843	case Keys::KILLWINDOW: //kill the current window
844	break;	844	break;
845	case Keys::grabNextWindow: //activate next window	845	case Keys::NEXTWINDOW: //activate next window
846	screen->nextFocus();	846	screen->nextFocus();
847	break;	847	break;
848	case Keys::grabPrevWindow: //activate prev window	848	case Keys::PREVWINDOW: //activate prev window
849	screen->prevFocus();	849	screen->prevFocus();
850	break;	850	break;
851	case Keys::grabNextTab:	851	case Keys::NEXTTAB:
852	if (focused_window && focused_window->getTab()) {	852	if (focused_window && focused_window->getTab()) {
853	Tab *tab = focused_window->getTab();	853	Tab *tab = focused_window->getTab();
854	if (tab->next()) {	854	if (tab->next()) {
@@ -862,7 +862,7 @@ void Fluxbox::process_event(XEvent *e) {
862	}	862	}
863	}	863	}
864	break;	864	break;
865	case Keys::grabPrevTab:	865	case Keys::PREVTAB:
866	if (focused_window && focused_window->getTab()) {	866	if (focused_window && focused_window->getTab()) {
867	Tab *tab = focused_window->getTab();	867	Tab *tab = focused_window->getTab();
868	if (tab->prev()) {	868	if (tab->prev()) {
@@ -876,7 +876,7 @@ void Fluxbox::process_event(XEvent *e) {
876	}	876	}
877	}	877	}
878	break;	878	break;
879	case Keys::grabExecute: //execute command on keypress	879	case Keys::EXECUTE: //execute command on keypress
880	{	880	{
881	#ifndef __EMX__	881	#ifndef __EMX__
882	char displaystring[MAXPATHLEN];	882	char displaystring[MAXPATHLEN];
@@ -1005,28 +1005,28 @@ void Fluxbox::doWindowAction(Keys::KeyAction action) {
1005	return;	1005	return;
1006		1006
1007	switch (action) {	1007	switch (action) {
1008	case Keys::grabIconify:	1008	case Keys::ICONIFY:
1009	focused_window->iconify();	1009	focused_window->iconify();
1010	break;	1010	break;
1011	case Keys::grabRaise:	1011	case Keys::RAISE:
1012	focused_window->getScreen()->getWorkspace(focused_window->getWorkspaceNumber())->raiseWindow(focused_window);	1012	focused_window->getScreen()->getWorkspace(focused_window->getWorkspaceNumber())->raiseWindow(focused_window);
1013	break;	1013	break;
1014	case Keys::grabLower:	1014	case Keys::LOWER:
1015	XLowerWindow(getXDisplay(), focused_window->getFrameWindow());	1015	XLowerWindow(getXDisplay(), focused_window->getFrameWindow());
1016	break;	1016	break;
1017	case Keys::grabClose:	1017	case Keys::CLOSE:
1018	focused_window->close();	1018	focused_window->close();
1019	break;	1019	break;
1020	case Keys::grabShade:	1020	case Keys::SHADE:
1021	focused_window->shade();	1021	focused_window->shade();
1022	break;	1022	break;
1023	case Keys::grabMaximize:	1023	case Keys::MAXIMIZE:
1024	focused_window->maximize(0);	1024	focused_window->maximize(0);
1025	break;	1025	break;
1026	case Keys::grabStick:	1026	case Keys::STICK:
1027	focused_window->stick();	1027	focused_window->stick();
1028	break;	1028	break;
1029	case Keys::grabVertMax:	1029	case Keys::VERTMAX:
1030	//!!TODO: fix this	1030	//!!TODO: fix this
1031	if (focused_window->isResizable()) {	1031	if (focused_window->isResizable()) {
1032	int w = focused_window->getWidth();	1032	int w = focused_window->getWidth();
@@ -1036,7 +1036,7 @@ void Fluxbox::doWindowAction(Keys::KeyAction action) {
1036	focused_window->configure(x, y, w, focused_window->getHeight());	1036	focused_window->configure(x, y, w, focused_window->getHeight());
1037	}	1037	}
1038	break;	1038	break;
1039	case Keys::grabHorizMax:	1039	case Keys::HORIZMAX:
1040	//!!TODO: fix this	1040	//!!TODO: fix this
1041	if (focused_window->isResizable()) {	1041	if (focused_window->isResizable()) {
1042	int h = focused_window->getHeight();	1042	int h = focused_window->getHeight();
@@ -1046,65 +1046,65 @@ void Fluxbox::doWindowAction(Keys::KeyAction action) {
1046	focused_window->configure(x, y, focused_window->getWidth(), h);	1046	focused_window->configure(x, y, focused_window->getWidth(), h);
1047	}	1047	}
1048	break;	1048	break;
1049	case Keys::grabNudgeRight:	1049	case Keys::NUDGERIGHT:
1050	focused_window->configure(	1050	focused_window->configure(
1051	focused_window->getXFrame()+1, focused_window->getYFrame(),	1051	focused_window->getXFrame()+1, focused_window->getYFrame(),
1052	focused_window->getWidth(), focused_window->getHeight());	1052	focused_window->getWidth(), focused_window->getHeight());
1053	break;	1053	break;
1054	case Keys::grabNudgeLeft:	1054	case Keys::NUDGELEFT:
1055	focused_window->configure(	1055	focused_window->configure(
1056	focused_window->getXFrame()-1, focused_window->getYFrame(),	1056	focused_window->getXFrame()-1, focused_window->getYFrame(),
1057	focused_window->getWidth(), focused_window->getHeight());	1057	focused_window->getWidth(), focused_window->getHeight());
1058	break;	1058	break;
1059	case Keys::grabNudgeUp:	1059	case Keys::NUDGEUP:
1060	focused_window->configure(	1060	focused_window->configure(
1061	focused_window->getXFrame(), focused_window->getYFrame()-1,	1061	focused_window->getXFrame(), focused_window->getYFrame()-1,
1062	focused_window->getWidth(), focused_window->getHeight());	1062	focused_window->getWidth(), focused_window->getHeight());
1063	break;	1063	break;
1064	case Keys::grabNudgeDown:	1064	case Keys::NUDGEDOWN:
1065	focused_window->configure(	1065	focused_window->configure(
1066	focused_window->getXFrame(), focused_window->getYFrame()+1,	1066	focused_window->getXFrame(), focused_window->getYFrame()+1,
1067	focused_window->getWidth(), focused_window->getHeight());	1067	focused_window->getWidth(), focused_window->getHeight());
1068	break;	1068	break;
1069	case Keys::grabBigNudgeRight:	1069	case Keys::BIGNUDGERIGHT:
1070	focused_window->configure(	1070	focused_window->configure(
1071	focused_window->getXFrame()+10, focused_window->getYFrame(),	1071	focused_window->getXFrame()+10, focused_window->getYFrame(),
1072	focused_window->getWidth(), focused_window->getHeight());	1072	focused_window->getWidth(), focused_window->getHeight());
1073	break;	1073	break;
1074	case Keys::grabBigNudgeLeft:	1074	case Keys::BIGNUDGELEFT:
1075	focused_window->configure(	1075	focused_window->configure(
1076	focused_window->getXFrame()-10, focused_window->getYFrame(),	1076	focused_window->getXFrame()-10, focused_window->getYFrame(),
1077	focused_window->getWidth(), focused_window->getHeight());	1077	focused_window->getWidth(), focused_window->getHeight());
1078	break;	1078	break;
1079	case Keys::grabBigNudgeUp:	1079	case Keys::BIGNUDGEUP:
1080	focused_window->configure(	1080	focused_window->configure(
1081	focused_window->getXFrame(), focused_window->getYFrame()-10,	1081	focused_window->getXFrame(), focused_window->getYFrame()-10,
1082	focused_window->getWidth(), focused_window->getHeight());	1082	focused_window->getWidth(), focused_window->getHeight());
1083	break;	1083	break;
1084	case Keys::grabBigNudgeDown:	1084	case Keys::BIGNUDGEDOWN:
1085	focused_window->configure(	1085	focused_window->configure(
1086	focused_window->getXFrame(), focused_window->getYFrame()+10,	1086	focused_window->getXFrame(), focused_window->getYFrame()+10,
1087	focused_window->getWidth(), focused_window->getHeight());	1087	focused_window->getWidth(), focused_window->getHeight());
1088	break;	1088	break;
1089	case Keys::grabHorizInc:	1089	case Keys::HORIZINC:
1090	if (focused_window->isResizable())	1090	if (focused_window->isResizable())
1091	focused_window->configure(	1091	focused_window->configure(
1092	focused_window->getXFrame(), focused_window->getYFrame(),	1092	focused_window->getXFrame(), focused_window->getYFrame(),
1093	focused_window->getWidth()+10, focused_window->getHeight());	1093	focused_window->getWidth()+10, focused_window->getHeight());
1094	break;	1094	break;
1095	case Keys::grabVertInc:	1095	case Keys::VERTINC:
1096	if (focused_window->isResizable())	1096	if (focused_window->isResizable())
1097	focused_window->configure(	1097	focused_window->configure(
1098	focused_window->getXFrame(), focused_window->getYFrame(),	1098	focused_window->getXFrame(), focused_window->getYFrame(),
1099	focused_window->getWidth(), focused_window->getHeight()+10);	1099	focused_window->getWidth(), focused_window->getHeight()+10);
1100	break;	1100	break;
1101	case Keys::grabHorizDec:	1101	case Keys::HORIZDEC:
1102	if (focused_window->isResizable())	1102	if (focused_window->isResizable())
1103	focused_window->configure(	1103	focused_window->configure(
1104	focused_window->getXFrame(), focused_window->getYFrame(),	1104	focused_window->getXFrame(), focused_window->getYFrame(),
1105	focused_window->getWidth()-10, focused_window->getHeight());	1105	focused_window->getWidth()-10, focused_window->getHeight());
1106	break;	1106	break;
1107	case Keys::grabVertDec:	1107	case Keys::VERTDEC:
1108	if (focused_window->isResizable())	1108	if (focused_window->isResizable())
1109	focused_window->configure(	1109	focused_window->configure(
1110	focused_window->getXFrame(), focused_window->getYFrame(),	1110	focused_window->getXFrame(), focused_window->getYFrame(),