mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

xev: update to 1.2.3

Browse Source 
refactor diet-x11 patch

LIC_FILES_CHKSUM changed to do merging of copyright/license notices

(From OE-Core rev: 7b6383ae8ea8eca0eb4f2de94c419fc617116e7a)

Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Armin Kuster
2019-03-11 14:28:53 -07:00
committed by Richard Purdie
parent 456a03bc74
commit 2bfdddfabf
2 changed files with 82 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/xorg-app/xev/diet-x11.patch
+80 -53
View File
@@ -4,79 +4,106 @@ Upstream-Status: Inappropriate [disable feature]
xev.c | 16 ++++++++-------- xev.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-) 1 file changed, 8 insertions(+), 8 deletions(-)
Index: xev-1.2.0/xev.c Index: xev-1.2.3/xev.c
=================================================================== ===================================================================
--- xev-1.2.0.orig/xev.c --- xev-1.2.3.orig/xev.c
+++ xev-1.2.0/xev.c +++ xev-1.2.3/xev.c
@@ -116,7 +116,7 @@ do_KeyPress (XEvent *eventp) @@ -125,17 +125,6 @@ do_KeyPress(XEvent *eventp)
nbytes = XLookupString (e, str, 256, &ks, NULL); nbytes = XLookupString(e, str, 256, &ks, NULL);
/* not supposed to call XmbLookupString on a key release event */ /* not supposed to call XmbLookupString on a key release event */
- if (e->type == KeyPress && xic) { - if (e->type == KeyPress && xic) {
+ /*if (e->type == KeyPress && xic) { - do {
do { - nmbbytes = XmbLookupString(xic, e, buf, bsize - 1, &ks, &status);
nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status); - buf[nmbbytes] = '\0';
buf[nmbbytes] = '\0'; -
@@ -126,7 +126,7 @@ do_KeyPress (XEvent *eventp) - if (status == XBufferOverflow) {
buf = realloc (buf, bsize); - bsize = nmbbytes + 1;
} - buf = realloc(buf, bsize);
} while (status == XBufferOverflow); - }
- } while (status == XBufferOverflow);
- } - }
+ }*/
if (ks == NoSymbol) if (ks == NoSymbol)
ksname = "NoSymbol"; ksname = "NoSymbol";
@@ -156,7 +156,7 @@ do_KeyPress (XEvent *eventp) @@ -168,16 +157,6 @@ do_KeyPress(XEvent *eventp)
} }
/* not supposed to call XmbLookupString on a key release event */ /* not supposed to call XmbLookupString on a key release event */
- if (e->type == KeyPress && xic) { - if (e->type == KeyPress && xic) {
+ /*if (e->type == KeyPress && xic) { - printf(" XmbLookupString gives %d bytes: ", nmbbytes);
printf (" XmbLookupString gives %d bytes: ", nmbbytes); - if (nmbbytes > 0) {
if (nmbbytes > 0) { - dump(buf, nmbbytes);
dump (buf, nmbbytes); - printf(" \"%s\"\n", buf);
@@ -164,7 +164,7 @@ do_KeyPress (XEvent *eventp) - }
} else { - else {
printf ("\n"); - 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;
} }
- } - }
+ } */ + }
printf (" XFilterEvent returns: %s\n", if (s != NULL)
XFilterEvent (eventp, e->window) ? "True" : "False"); fprintf(stderr, "%s: unrecognized event mask '%s'\n", ProgramName, s);
@@ -1015,7 +1015,7 @@ main (int argc, char **argv) @@ -1288,37 +1267,6 @@ main(int argc, char **argv)
fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName); fprintf(stderr, "%s: XSetLocaleModifiers failed\n", ProgramName);
} }
- xim = XOpenIM (dpy, NULL, NULL, NULL); - xim = XOpenIM(dpy, NULL, NULL, NULL);
+ /*xim = XOpenIM (dpy, NULL, NULL, NULL); - if (xim == NULL) {
if (xim == NULL) { - fprintf(stderr, "%s: XOpenIM failed\n", ProgramName);
fprintf (stderr, "%s: XOpenIM failed\n", ProgramName);
}
@@ -1042,7 +1042,7 @@ main (int argc, char **argv)
}
XFree (xim_styles);
}
- } - }
+ }*/ -
- 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);
screen = DefaultScreen (dpy); attr.event_mask = event_masks[EVENT_MASK_INDEX_CORE];
@@ -1373,16 +1321,6 @@ main(int argc, char **argv)
@@ -1109,7 +1109,7 @@ main (int argc, char **argv) printf("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw);
printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw);
} }
- if (xim && xim_style) { - if (xim && xim_style) {
+ /*if (xim && xim_style) { - xic = XCreateIC(xim,
xic = XCreateIC (xim, - XNInputStyle, xim_style,
XNInputStyle, xim_style, - XNClientWindow, w, XNFocusWindow, w, NULL);
XNClientWindow, w, -
@@ -1119,7 +1119,7 @@ main (int argc, char **argv) - if (xic == NULL) {
if (xic == NULL) { - fprintf(stderr, "XCreateIC failed\n");
fprintf (stderr, "XCreateIC failed\n"); - }
}
- } - }
+ }*/ -
have_rr = XRRQueryExtension(dpy, &rr_event_base, &rr_error_base);
have_rr = XRRQueryExtension (dpy, &rr_event_base, &rr_error_base);
if (have_rr) { if (have_rr) {
int rr_major, rr_minor;
meta/recipes-graphics/xorg-app/xev_1.2.2.bb → meta/recipes-graphics/xorg-app/xev_1.2.3.bb
+2 -2
View File
@@ -14,5 +14,5 @@ DEPENDS += "libxrandr xorgproto"
SRC_URI += "file://diet-x11.patch" SRC_URI += "file://diet-x11.patch"
SRC_URI[md5sum] = "249bdde90f01c0d861af52dc8fec379e" SRC_URI[md5sum] = "eec82a5d4b599736f0fa637e96136746"
SRC_URI[sha256sum] = "d94ae62a6c1af56c2961d71f5782076ac4116f0fa4e401420ac7e0db33dc314f" SRC_URI[sha256sum] = "66bc4f1cfa1946d62612737815c34164e4ce40fcebd2c9e1d7e7a1117ad3ad09"