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
|
Upstream-Status: Inappropriate [disable feature]
---
xev.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
Index: xev-1.2.3/xev.c
===================================================================
--- xev-1.2.3.orig/xev.c
+++ xev-1.2.3/xev.c
@@ -125,17 +125,6 @@ do_KeyPress(XEvent *eventp)
nbytes = XLookupString(e, str, 256, &ks, NULL);
/* not supposed to call XmbLookupString on a key release event */
- if (e->type == KeyPress && xic) {
- do {
- nmbbytes = XmbLookupString(xic, e, buf, bsize - 1, &ks, &status);
- buf[nmbbytes] = '\0';
-
- if (status == XBufferOverflow) {
- bsize = nmbbytes + 1;
- buf = realloc(buf, bsize);
- }
- } while (status == XBufferOverflow);
- }
if (ks == NoSymbol)
ksname = "NoSymbol";
@@ -168,16 +157,6 @@ do_KeyPress(XEvent *eventp)
}
/* not supposed to call XmbLookupString on a key release event */
- if (e->type == KeyPress && xic) {
- printf(" XmbLookupString gives %d bytes: ", nmbbytes);
- if (nmbbytes > 0) {
- dump(buf, nmbbytes);
- printf(" \"%s\"\n", buf);
- }
- else {
- printf("\n");
- }
- }
printf(" XFilterEvent returns: %s\n",
XFilterEvent(eventp, e->window) ? "True" : "False");
@@ -1141,7 +1120,7 @@ parse_event_mask(const char *s, long eve
if (s)
return True;
}
- }
+ }
if (s != NULL)
fprintf(stderr, "%s: unrecognized event mask '%s'\n", ProgramName, s);
@@ -1288,37 +1267,6 @@ main(int argc, char **argv)
fprintf(stderr, "%s: XSetLocaleModifiers failed\n", ProgramName);
}
- xim = XOpenIM(dpy, NULL, NULL, NULL);
- if (xim == NULL) {
- fprintf(stderr, "%s: XOpenIM failed\n", ProgramName);
- }
-
- if (xim) {
- imvalret = XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL);
- if (imvalret != NULL || xim_styles == NULL) {
- fprintf(stderr, "%s: input method doesn't support any styles\n",
- ProgramName);
- }
-
- if (xim_styles) {
- xim_style = 0;
- for (i = 0; i < xim_styles->count_styles; i++) {
- if (xim_styles->supported_styles[i] ==
- (XIMPreeditNothing | XIMStatusNothing)) {
- xim_style = xim_styles->supported_styles[i];
- break;
- }
- }
-
- if (xim_style == 0) {
- fprintf(stderr,
- "%s: input method doesn't support the style we support\n",
- ProgramName);
- }
- XFree(xim_styles);
- }
- }
-
screen = DefaultScreen(dpy);
attr.event_mask = event_masks[EVENT_MASK_INDEX_CORE];
@@ -1373,16 +1321,6 @@ main(int argc, char **argv)
printf("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw);
}
- if (xim && xim_style) {
- xic = XCreateIC(xim,
- XNInputStyle, xim_style,
- XNClientWindow, w, XNFocusWindow, w, NULL);
-
- if (xic == NULL) {
- fprintf(stderr, "XCreateIC failed\n");
- }
- }
-
have_rr = XRRQueryExtension(dpy, &rr_event_base, &rr_error_base);
if (have_rr) {
int rr_major, rr_minor;
|
