1 files changed, 44 insertions, 44 deletions
diff --git a/src/Keys.cc b/src/Keys.cc
index 079bdb6..d52fdbf 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-//$Id: Keys.cc,v 1.10 2002/02/20 23:10:48 fluxgen Exp $
+//$Id: Keys.cc,v 1.11 2002/02/21 00:39:08 fluxgen Exp $
 #ifdef          HAVE_CONFIG_H
 #        include "config.h"
@@ -31,17 +31,17 @@
 #ifdef          HAVE_STDIO_H
 #        include <stdio.h>
-#endif                                                                  // HAVE_STDIO_H
+#endif  // HAVE_STDIO_H
 #ifdef          HAVE_CTYPE_H
 #        include <ctype.h>
-#endif                                                                  // HAVE_CTYPE_H
+#endif  // HAVE_CTYPE_H
 #ifdef          STDC_HEADERS
 #        include <stdlib.h>
 #        include <string.h>
 #  include <errno.h>
-#endif                                                                  // STDC_HEADERS
+#endif  // STDC_HEADERS
 #if HAVE_STRINGS_H
 # include <strings.h>
@@ -49,19 +49,19 @@
 #ifdef          HAVE_SYS_TYPES_H
 #        include <sys/types.h>
-#endif                                                                  // HAVE_SYS_TYPES_H
+#endif  // HAVE_SYS_TYPES_H
 #ifdef          HAVE_SYS_WAIT_H
 #        include <sys/wait.h>
-#endif                                                                  // HAVE_SYS_WAIT_H
+#endif  // HAVE_SYS_WAIT_H
 #ifdef          HAVE_UNISTD_H
 #        include <unistd.h>
-#endif                                                                  // HAVE_UNISTD_H
+#endif  // HAVE_UNISTD_H
 #ifdef          HAVE_SYS_STAT_H
 #        include <sys/stat.h>
-#endif                                                                  // HAVE_SYS_STAT_H
+#endif  // HAVE_SYS_STAT_H
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
@@ -270,41 +270,41 @@ bool Keys::load(char *filename) {
                                        }
                                        
                                        last_key->action = m_actionlist[i].action;
-                    switch(last_key->action) {
+                                        switch(last_key->action) {
-                        case Keys::EXECUTE:
+                                                case Keys::EXECUTE:
                                                last_key->execcommand = 
-                                const_cast<char *>
+                                                                const_cast<char *>
-                                (StringUtil::strcasestr(linebuffer.get(),
+                                                                (StringUtil::strcasestr(linebuffer.get(),
-                                                        getActionStr(Keys::EXECUTE))+
+                                                                        getActionStr(Keys::EXECUTE))+
                                                        strlen(getActionStr(Keys::EXECUTE)));
-                            break;
+                                                break;
-                        case WORKSPACE:
+                                                case WORKSPACE:
-                            if (argc + 1 < val.size())
+                                                        if (argc + 1 < val.size())
-                                last_key->param = atoi( val[argc+1].c_str());
+                                                                last_key->param = atoi( val[argc+1].c_str());
-                            else
+                                                        else
-                                last_key->param = 0;
+                                                                last_key->param = 0;
-                            break;
+                                                break;
-                        case LEFTWORKSPACE:
+                                                case LEFTWORKSPACE:
-                        case RIGHTWORKSPACE:
+                                                case RIGHTWORKSPACE:
-                        case NEXTWORKSPACE:
+                                                case NEXTWORKSPACE:
-                        case PREVWORKSPACE:
+                                                case PREVWORKSPACE:
-                            if (argc + 1 < val.size())
+                                                        if (argc + 1 < val.size())
-                                last_key->param = atoi( val[argc+1].c_str());
+                                                                last_key->param = atoi( val[argc+1].c_str());
-                            else
+                                                        else
-                                last_key->param = 1;
+                                                                last_key->param = 1;
-                            break;
+                                                break;
-                        case NUDGERIGHT:
+                                                case NUDGERIGHT:
-                        case NUDGELEFT:
+                                                case NUDGELEFT:
-                        case NUDGEUP:
+                                                case NUDGEUP:
-                        case NUDGEDOWN:
+                                                case NUDGEDOWN:
-                            if (argc + 1 < val.size())
+                                                        if (argc + 1 < val.size())
-                                last_key->param = atoi( val[argc+1].c_str());
+                                                                last_key->param = atoi( val[argc+1].c_str());
-                            else
+                                                        else
-                                last_key->param = 2;
+                                                                last_key->param = 2;
-                            break;
+                                                break;
-                        default:
+                                                default:
-                            break;
+                                                break;
-                    }
+                                        }
                                        //add the keychain to list                                                                              
                                        if (!mergeTree(current_key))
@@ -453,7 +453,7 @@ Keys::KeyAction Keys::getAction(XKeyEvent *ke) {
                                } else {
                                        if (m_keylist[i]->action == Keys::EXECUTE)
                                                m_execcmdstring = m_keylist[i]->execcommand; //update execcmdstring if action is grabExecute
-                    m_param = m_keylist[i]->param;
+                                        m_param = m_keylist[i]->param;
                                        return m_keylist[i]->action;
                                }
                        }
@@ -593,7 +593,7 @@ Keys::t_key::t_key(unsigned int key_, unsigned int mod_, KeyAction action_) {
        action = action_;
        key = key_;
        mod = mod_;     
-    param = 0;
+        param = 0;
 }
 Keys::t_key::t_key(t_key *k) {
@@ -601,7 +601,7 @@ Keys::t_key::t_key(t_key *k) {
        key = k->key;
        mod = k->mod;
        execcommand = k->execcommand;
-    param = k-> param;
+        param = k-> param;
 }
 Keys::t_key::~t_key() {

diff --git a/src/Keys.cc b/src/Keys.cc index 079bdb6..d52fdbf 100644 --- a/src/Keys.cc +++ b/src/Keys.cc
@@ -19,7 +19,7 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	//$Id: Keys.cc,v 1.10 2002/02/20 23:10:48 fluxgen Exp $	22	//$Id: Keys.cc,v 1.11 2002/02/21 00:39:08 fluxgen Exp $
23		23
24	#ifdef HAVE_CONFIG_H	24	#ifdef HAVE_CONFIG_H
25	# include "config.h"	25	# include "config.h"
@@ -31,17 +31,17 @@
31		31
32	#ifdef HAVE_STDIO_H	32	#ifdef HAVE_STDIO_H
33	# include <stdio.h>	33	# include <stdio.h>
34	#endif // HAVE_STDIO_H	34	#endif // HAVE_STDIO_H
35		35
36	#ifdef HAVE_CTYPE_H	36	#ifdef HAVE_CTYPE_H
37	# include <ctype.h>	37	# include <ctype.h>
38	#endif // HAVE_CTYPE_H	38	#endif // HAVE_CTYPE_H
39		39
40	#ifdef STDC_HEADERS	40	#ifdef STDC_HEADERS
41	# include <stdlib.h>	41	# include <stdlib.h>
42	# include <string.h>	42	# include <string.h>
43	# include <errno.h>	43	# include <errno.h>
44	#endif // STDC_HEADERS	44	#endif // STDC_HEADERS
45		45
46	#if HAVE_STRINGS_H	46	#if HAVE_STRINGS_H
47	# include <strings.h>	47	# include <strings.h>
@@ -49,19 +49,19 @@
49		49
50	#ifdef HAVE_SYS_TYPES_H	50	#ifdef HAVE_SYS_TYPES_H
51	# include <sys/types.h>	51	# include <sys/types.h>
52	#endif // HAVE_SYS_TYPES_H	52	#endif // HAVE_SYS_TYPES_H
53		53
54	#ifdef HAVE_SYS_WAIT_H	54	#ifdef HAVE_SYS_WAIT_H
55	# include <sys/wait.h>	55	# include <sys/wait.h>
56	#endif // HAVE_SYS_WAIT_H	56	#endif // HAVE_SYS_WAIT_H
57		57
58	#ifdef HAVE_UNISTD_H	58	#ifdef HAVE_UNISTD_H
59	# include <unistd.h>	59	# include <unistd.h>
60	#endif // HAVE_UNISTD_H	60	#endif // HAVE_UNISTD_H
61		61
62	#ifdef HAVE_SYS_STAT_H	62	#ifdef HAVE_SYS_STAT_H
63	# include <sys/stat.h>	63	# include <sys/stat.h>
64	#endif // HAVE_SYS_STAT_H	64	#endif // HAVE_SYS_STAT_H
65		65
66	#include <X11/Xlib.h>	66	#include <X11/Xlib.h>
67	#include <X11/Xproto.h>	67	#include <X11/Xproto.h>
@@ -270,41 +270,41 @@ bool Keys::load(char *filename) {
270	}	270	}
271		271
272	last_key->action = m_actionlist[i].action;	272	last_key->action = m_actionlist[i].action;
273	switch(last_key->action) {	273	switch(last_key->action) {
274	case Keys::EXECUTE:	274	case Keys::EXECUTE:
275	last_key->execcommand =	275	last_key->execcommand =
276	const_cast<char *>	276	const_cast<char *>
277	(StringUtil::strcasestr(linebuffer.get(),	277	(StringUtil::strcasestr(linebuffer.get(),
278	getActionStr(Keys::EXECUTE))+	278	getActionStr(Keys::EXECUTE))+
279	strlen(getActionStr(Keys::EXECUTE)));	279	strlen(getActionStr(Keys::EXECUTE)));
280	break;	280	break;
281	case WORKSPACE:	281	case WORKSPACE:
282	if (argc + 1 < val.size())	282	if (argc + 1 < val.size())
283	last_key->param = atoi( val[argc+1].c_str());	283	last_key->param = atoi( val[argc+1].c_str());
284	else	284	else
285	last_key->param = 0;	285	last_key->param = 0;
286	break;	286	break;
287	case LEFTWORKSPACE:	287	case LEFTWORKSPACE:
288	case RIGHTWORKSPACE:	288	case RIGHTWORKSPACE:
289	case NEXTWORKSPACE:	289	case NEXTWORKSPACE:
290	case PREVWORKSPACE:	290	case PREVWORKSPACE:
291	if (argc + 1 < val.size())	291	if (argc + 1 < val.size())
292	last_key->param = atoi( val[argc+1].c_str());	292	last_key->param = atoi( val[argc+1].c_str());
293	else	293	else
294	last_key->param = 1;	294	last_key->param = 1;
295	break;	295	break;
296	case NUDGERIGHT:	296	case NUDGERIGHT:
297	case NUDGELEFT:	297	case NUDGELEFT:
298	case NUDGEUP:	298	case NUDGEUP:
299	case NUDGEDOWN:	299	case NUDGEDOWN:
300	if (argc + 1 < val.size())	300	if (argc + 1 < val.size())
301	last_key->param = atoi( val[argc+1].c_str());	301	last_key->param = atoi( val[argc+1].c_str());
302	else	302	else
303	last_key->param = 2;	303	last_key->param = 2;
304	break;	304	break;
305	default:	305	default:
306	break;	306	break;
307	}	307	}
308		308
309	//add the keychain to list	309	//add the keychain to list
310	if (!mergeTree(current_key))	310	if (!mergeTree(current_key))
@@ -453,7 +453,7 @@ Keys::KeyAction Keys::getAction(XKeyEvent *ke) {
453	} else {	453	} else {
454	if (m_keylist[i]->action == Keys::EXECUTE)	454	if (m_keylist[i]->action == Keys::EXECUTE)
455	m_execcmdstring = m_keylist[i]->execcommand; //update execcmdstring if action is grabExecute	455	m_execcmdstring = m_keylist[i]->execcommand; //update execcmdstring if action is grabExecute
456	m_param = m_keylist[i]->param;	456	m_param = m_keylist[i]->param;
457	return m_keylist[i]->action;	457	return m_keylist[i]->action;
458	}	458	}
459	}	459	}
@@ -593,7 +593,7 @@ Keys::t_key::t_key(unsigned int key_, unsigned int mod_, KeyAction action_) {
593	action = action_;	593	action = action_;
594	key = key_;	594	key = key_;
595	mod = mod_;	595	mod = mod_;
596	param = 0;	596	param = 0;
597	}	597	}
598		598
599	Keys::t_key::t_key(t_key *k) {	599	Keys::t_key::t_key(t_key *k) {
@@ -601,7 +601,7 @@ Keys::t_key::t_key(t_key *k) {
601	key = k->key;	601	key = k->key;
602	mod = k->mod;	602	mod = k->mod;
603	execcommand = k->execcommand;	603	execcommand = k->execcommand;
604	param = k-> param;	604	param = k-> param;
605	}	605	}
606		606
607	Keys::t_key::~t_key() {	607	Keys::t_key::~t_key() {