about summary refs log tree commit diff stats
path: root/wm.c
diff options
context:
space:
mode:
authorAnselm R. Garbe <garbeam@wmii.de>2006-07-11 11:50:18 +0200
committerAnselm R. Garbe <garbeam@wmii.de>2006-07-11 11:50:18 +0200
commit366d81e313e6dd4e9e6c61ed8dfca4b4b40ccde6 (patch)
tree78ac7ac7de2fb2b4373dc5d6f67a70e2642ed347 /wm.c
parent8a8b7956b6de80decbfd3bff6d2ad6e5bb69b2bd (diff)
downloaddwm-366d81e313e6dd4e9e6c61ed8dfca4b4b40ccde6.tar.gz
added key handling
Diffstat (limited to 'wm.c')
-rw-r--r--wm.c29
1 files changed, 1 insertions, 28 deletions
diff --git a/wm.c b/wm.c
index a4caf64..038e6b9 100644
--- a/wm.c
+++ b/wm.c
@@ -24,7 +24,6 @@ Client *client = NULL;
 
 char *bartext, tag[256];
 int screen, sel_screen;
-unsigned int lock_mask, numlock_mask;
 
 /* draw structs */
 Brush brush = {0};
@@ -144,32 +143,6 @@ startup_error_handler(Display *dpy, XErrorEvent *error)
 }
 
 static void
-init_lock_keys()
-{
-	XModifierKeymap *modmap;
-	KeyCode numlock;
-	int i;
-	static int masks[] = {
-		ShiftMask, LockMask, ControlMask, Mod1Mask,
-		Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
-	};
-
-	numlock_mask = 0;
-	modmap = XGetModifierMapping(dpy);
-	numlock = XKeysymToKeycode(dpy, XStringToKeysym("Num_Lock"));
-
-	if(modmap && modmap->max_keypermod > 0) {
-		int max = (sizeof(masks) / sizeof(int)) * modmap->max_keypermod;
-		for(i = 0; i < max; i++)
-			if(numlock && (modmap->modifiermap[i] == numlock))
-				numlock_mask = masks[i / modmap->max_keypermod];
-	}
-	XFreeModifiermap(modmap);
-
-	lock_mask = 255 & ~(numlock_mask | LockMask);
-}
-
-static void
 cleanup()
 {
 	/*
@@ -243,7 +216,7 @@ main(int argc, char *argv[])
 	cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
 	cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
-	init_lock_keys();
+	update_keys();
 
 	brush.drawable = XCreatePixmap(dpy, root, rect.width, rect.height,
 			DefaultDepth(dpy, screen));
8f410ae014be2da2334'>^
f4558377 ^
d1a1173d ^



9bc886b2 ^
f4558377 ^
6e152710 ^
d1a1173d ^



6e152710 ^

6e152710 ^
d1a1173d ^




b3d031a9 ^


d1a1173d ^

ce657945 ^







b3d031a9 ^


d1a1173d ^

6e152710 ^

b3d031a9 ^
76791a70 ^
d1a1173d ^
c29059c8 ^




1687e0f4 ^
d1a1173d ^
















51ec08da ^
18223912 ^
d1a1173d ^








51ec08da ^
18223912 ^
d1a1173d ^






b3d031a9 ^
d1a1173d ^





















b3d031a9 ^




d1a1173d ^
b3d031a9 ^








d1a1173d ^











e2325c56 ^
d1a1173d ^








6e152710 ^


d1a1173d ^
9d82571b ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168