diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-22 13:52:15 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-23 11:53:41 +0000 |
commit | 7ca6bd89776f38b7af5e5e9002c4e82b06c4e995 (patch) | |
tree | f8c13fc0aa2fa9d53be5f9f8cc16d6f33fdce76a /meta/recipes-graphics/xorg-app/xev/diet-x11.patch | |
parent | 1df683df5c2173c3f38cfd24f40a731a4373c88d (diff) | |
download | poky-7ca6bd89776f38b7af5e5e9002c4e82b06c4e995.tar.gz |
xev: Drop diet libx11 related patch
We dropped diet-libx11 back in 2019 in 1a502765db2093e573c9e3ecd6c1bc7621476963.
Drop the patch we don't need from xev to match.
(From OE-Core rev: a9b51a42fc1fd3c01852b51e3f21cf4d4480f3e8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-app/xev/diet-x11.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-app/xev/diet-x11.patch | 114 |
1 files changed, 0 insertions, 114 deletions
diff --git a/meta/recipes-graphics/xorg-app/xev/diet-x11.patch b/meta/recipes-graphics/xorg-app/xev/diet-x11.patch deleted file mode 100644 index 361369b291..0000000000 --- a/meta/recipes-graphics/xorg-app/xev/diet-x11.patch +++ /dev/null | |||
@@ -1,114 +0,0 @@ | |||
1 | From b9b2b8d1af283a13cdccea55562cf332de48dcb9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross@openedhand.com> | ||
3 | Date: Wed, 28 Mar 2007 16:10:50 +0000 | ||
4 | Subject: [PATCH] Add xev | ||
5 | |||
6 | Upstream-Status: Inappropriate [disable feature] | ||
7 | |||
8 | --- | ||
9 | xev.c | 64 +---------------------------------------------------------- | ||
10 | 1 file changed, 1 insertion(+), 63 deletions(-) | ||
11 | |||
12 | diff --git a/xev.c b/xev.c | ||
13 | index ea69234..6d5eb30 100644 | ||
14 | --- a/xev.c | ||
15 | +++ b/xev.c | ||
16 | @@ -175,17 +175,6 @@ do_KeyPress(XEvent *eventp) | ||
17 | nbytes = XLookupString(e, str, 256, &ks, NULL); | ||
18 | |||
19 | /* not supposed to call XmbLookupString on a key release event */ | ||
20 | - if (e->type == KeyPress && xic) { | ||
21 | - do { | ||
22 | - nmbbytes = XmbLookupString(xic, e, buf, bsize - 1, &ks, &status); | ||
23 | - buf[nmbbytes] = '\0'; | ||
24 | - | ||
25 | - if (status == XBufferOverflow) { | ||
26 | - bsize = nmbbytes + 1; | ||
27 | - buf = realloc(buf, bsize); | ||
28 | - } | ||
29 | - } while (status == XBufferOverflow); | ||
30 | - } | ||
31 | |||
32 | if (ks == NoSymbol) | ||
33 | ksname = "NoSymbol"; | ||
34 | @@ -220,16 +209,6 @@ do_KeyPress(XEvent *eventp) | ||
35 | } | ||
36 | |||
37 | /* not supposed to call XmbLookupString on a key release event */ | ||
38 | - if (e->type == KeyPress && xic) { | ||
39 | - output(Indent, "XmbLookupString gives %d bytes: ", nmbbytes); | ||
40 | - if (nmbbytes > 0) { | ||
41 | - dump(buf, nmbbytes); | ||
42 | - output(NewLine, " \"%s\"", buf); | ||
43 | - } | ||
44 | - else { | ||
45 | - output_new_line(); | ||
46 | - } | ||
47 | - } | ||
48 | |||
49 | output(Indent | NewLine, "XFilterEvent returns: %s", | ||
50 | XFilterEvent(eventp, e->window) ? "True" : "False"); | ||
51 | @@ -1211,7 +1190,7 @@ parse_event_mask(const char *s, long event_masks[]) | ||
52 | if (s) | ||
53 | return True; | ||
54 | } | ||
55 | - } | ||
56 | + } | ||
57 | |||
58 | if (s != NULL) | ||
59 | fprintf(stderr, "%s: unrecognized event mask '%s'\n", ProgramName, s); | ||
60 | @@ -1361,37 +1340,6 @@ main(int argc, char **argv) | ||
61 | fprintf(stderr, "%s: XSetLocaleModifiers failed\n", ProgramName); | ||
62 | } | ||
63 | |||
64 | - xim = XOpenIM(dpy, NULL, NULL, NULL); | ||
65 | - if (xim == NULL) { | ||
66 | - fprintf(stderr, "%s: XOpenIM failed\n", ProgramName); | ||
67 | - } | ||
68 | - | ||
69 | - if (xim) { | ||
70 | - imvalret = XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL); | ||
71 | - if (imvalret != NULL || xim_styles == NULL) { | ||
72 | - fprintf(stderr, "%s: input method doesn't support any styles\n", | ||
73 | - ProgramName); | ||
74 | - } | ||
75 | - | ||
76 | - if (xim_styles) { | ||
77 | - xim_style = 0; | ||
78 | - for (i = 0; i < xim_styles->count_styles; i++) { | ||
79 | - if (xim_styles->supported_styles[i] == | ||
80 | - (XIMPreeditNothing | XIMStatusNothing)) { | ||
81 | - xim_style = xim_styles->supported_styles[i]; | ||
82 | - break; | ||
83 | - } | ||
84 | - } | ||
85 | - | ||
86 | - if (xim_style == 0) { | ||
87 | - fprintf(stderr, | ||
88 | - "%s: input method doesn't support the style we support\n", | ||
89 | - ProgramName); | ||
90 | - } | ||
91 | - XFree(xim_styles); | ||
92 | - } | ||
93 | - } | ||
94 | - | ||
95 | screen = DefaultScreen(dpy); | ||
96 | |||
97 | attr.event_mask = event_masks[EVENT_MASK_INDEX_CORE]; | ||
98 | @@ -1446,16 +1394,6 @@ main(int argc, char **argv) | ||
99 | printf("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw); | ||
100 | } | ||
101 | |||
102 | - if (xim && xim_style) { | ||
103 | - xic = XCreateIC(xim, | ||
104 | - XNInputStyle, xim_style, | ||
105 | - XNClientWindow, w, XNFocusWindow, w, NULL); | ||
106 | - | ||
107 | - if (xic == NULL) { | ||
108 | - fprintf(stderr, "XCreateIC failed\n"); | ||
109 | - } | ||
110 | - } | ||
111 | - | ||
112 | have_rr = XRRQueryExtension(dpy, &rr_event_base, &rr_error_base); | ||
113 | if (have_rr) { | ||
114 | int rr_major, rr_minor; | ||