| author | Alan Coopersmith <Alan.Coopersmith@Sun.COM> |
| Tue, 17 Apr 2007 16:55:27 -0700 | |
| changeset 143 | a1d0fad37e5a |
| parent 101 | 9cf86bf83343 |
| child 194 | c2b76d8a41f7 |
| permissions | -rw-r--r-- |
|
101
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
1 |
commit 5dcad9e9d7d9993d65f989219bee94a060bbf476 |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
2 |
Author: Alan Coopersmith <[email protected]> |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
3 |
Date: Fri Feb 2 14:44:55 2007 -0800 |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
4 |
|
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
5 |
Fix bus error on startup in 64-bit Xephyr |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
6 |
|
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
7 |
hostx_get_visual_masks takes unsigned long * arguments, but was being |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
8 |
passed pointers to CARD32's. |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
9 |
|
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
10 |
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
11 |
index 7db8675..2ca51c3 100644 |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
12 |
--- a/hw/kdrive/ephyr/ephyr.c |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
13 |
+++ b/hw/kdrive/ephyr/ephyr.c |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
14 |
@@ -81,7 +81,8 @@ Bool |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
15 |
ephyrScreenInitialize (KdScreenInfo *screen, EphyrScrPriv *scrpriv) |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
16 |
{
|
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
17 |
int width = 640, height = 480; |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
18 |
- |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
19 |
+ unsigned long redMask, greenMask, blueMask; |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
20 |
+ |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
21 |
if (hostx_want_screen_size(&width, &height) |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
22 |
|| !screen->width || !screen->height) |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
23 |
{
|
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
24 |
@@ -133,30 +134,24 @@ ephyrScreenInitialize (KdScreenInfo *scr |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
25 |
{
|
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
26 |
screen->fb[0].depth = 15; |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
27 |
screen->fb[0].bitsPerPixel = 16; |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
28 |
- |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
29 |
- hostx_get_visual_masks (&screen->fb[0].redMask, |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
30 |
- &screen->fb[0].greenMask, |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
31 |
- &screen->fb[0].blueMask); |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
32 |
- |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
33 |
} |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
34 |
else if (screen->fb[0].depth <= 16) |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
35 |
{
|
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
36 |
screen->fb[0].depth = 16; |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
37 |
screen->fb[0].bitsPerPixel = 16; |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
38 |
- |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
39 |
- hostx_get_visual_masks (&screen->fb[0].redMask, |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
40 |
- &screen->fb[0].greenMask, |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
41 |
- &screen->fb[0].blueMask); |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
42 |
} |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
43 |
else |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
44 |
{
|
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
45 |
screen->fb[0].depth = 24; |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
46 |
screen->fb[0].bitsPerPixel = 32; |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
47 |
- |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
48 |
- hostx_get_visual_masks (&screen->fb[0].redMask, |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
49 |
- &screen->fb[0].greenMask, |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
50 |
- &screen->fb[0].blueMask); |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
51 |
} |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
52 |
+ |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
53 |
+ hostx_get_visual_masks (&redMask, &greenMask, &blueMask); |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
54 |
+ |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
55 |
+ screen->fb[0].redMask = (Pixel) redMask; |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
56 |
+ screen->fb[0].greenMask = (Pixel) greenMask; |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
57 |
+ screen->fb[0].blueMask = (Pixel) blueMask; |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
58 |
+ |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
59 |
} |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
60 |
|
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
61 |
scrpriv->randr = screen->randr; |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
62 |
|
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
63 |
|
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
64 |
--- xorg-server-1.2.0/hw/kdrive/ephyr/hostx.c~ 2007-01-22 21:39:15.000000000 -0800 |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
65 |
+++ xorg-server-1.2.0/hw/kdrive/ephyr/hostx.c 2007-02-02 16:03:09.840426000 -0800 |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
66 |
@@ -40,6 +40,7 @@ |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
67 |
#include <X11/Xatom.h> |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
68 |
#include <X11/keysym.h> |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
69 |
#include <X11/extensions/XShm.h> |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
70 |
+#include <X11/Xmd.h> |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
71 |
|
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
72 |
/* |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
73 |
* All xlib calls go here, which gets built as its own .a . |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
74 |
@@ -79,7 +80,8 @@ |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
75 |
|
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
76 |
extern KeySym EphyrKeymap[]; |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
77 |
|
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
78 |
-extern KeySym kdKeymap[]; |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
79 |
+extern CARD32 kdKeymap[]; /* really KeySym, but Xlib & Xserver |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
80 |
+ use different sizes for that */ |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
81 |
extern int kdMinScanCode; |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
82 |
extern int kdMaxScanCode; |
|
9cf86bf83343
6520998 64-bit Xephyr crashes on startup
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
83 |
extern int kdMinKeyCode; |
|
143
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
84 |
|
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
85 |
|
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
86 |
Backport to 7.2 of commit 47c1c948e69cfba950ad37a3133fa2db0bd0ff2c |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
87 |
Original Author: Daniel Stone <[email protected]> |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
88 |
Date: Tue Aug 15 15:25:16 2006 +0300 |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
89 |
|
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
90 |
kdrive/input: only run special key behaviours on non-XKB |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
91 |
Only attempt to manually deal with special key behaviours (e.g. terminating |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
92 |
the server) when not using XKB, and leave locking behaviour up to GKVE. |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
93 |
|
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
94 |
--- xorg-server-1.2.0/hw/kdrive/src/kinput.c 2007-01-22 21:39:15.000000000 -0800 |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
95 |
+++ xorg-server-1.2.0/hw/kdrive/src/kinput.c 2007-04-09 18:58:43.562841000 -0700 |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
96 |
@@ -616,15 +616,6 @@ |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
97 |
RegisterKeyboardDevice(pKeyboard); |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
98 |
miRegisterPointerDevice(screenInfo.screens[0], pPointer); |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
99 |
mieqInit(&pKeyboard->public, &pPointer->public); |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
100 |
-#ifdef XINPUT |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
101 |
- {
|
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
102 |
- static long zero1, zero2; |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
103 |
- |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
104 |
- //SetExtInputCheck (&zero1, &zero2); |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
105 |
- ErrorF("Extended Input Devices not yet supported. Impelement it at line %d in %s\n",
|
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
106 |
- __LINE__, __FILE__); |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
107 |
- } |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
108 |
-#endif |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
109 |
} |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
110 |
|
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
111 |
/* |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
112 |
@@ -1303,20 +1294,6 @@ |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
113 |
xE.u.u.type = KeyPress; |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
114 |
xE.u.u.detail = key_code; |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
115 |
|
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
116 |
- switch (KEYCOL1(key_code)) |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
117 |
- {
|
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
118 |
- case XK_Num_Lock: |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
119 |
- case XK_Scroll_Lock: |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
120 |
- case XK_Shift_Lock: |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
121 |
- case XK_Caps_Lock: |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
122 |
- if (xE.u.u.type == KeyRelease) |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
123 |
- return; |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
124 |
- if (IsKeyDown (key_code)) |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
125 |
- xE.u.u.type = KeyRelease; |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
126 |
- else |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
127 |
- xE.u.u.type = KeyPress; |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
128 |
- } |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
129 |
- |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
130 |
/* |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
131 |
* Check pressed keys which are already down |
|
a1d0fad37e5a
6539225 Xephyr has problems with caps lock
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
101
diff
changeset
|
132 |
*/ |