diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
| commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
| tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /x11-terms/aterm/files | |
reinit the tree, so we can have metadata
Diffstat (limited to 'x11-terms/aterm/files')
| -rw-r--r-- | x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch | 35 | ||||
| -rw-r--r-- | x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch | 24 |
2 files changed, 59 insertions, 0 deletions
diff --git a/x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch b/x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch new file mode 100644 index 000000000000..958f40900bcd --- /dev/null +++ b/x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch @@ -0,0 +1,35 @@ +--- aterm-1.0.1~/src/command.c 2006-06-26 20:01:20.000000000 +0200 ++++ aterm-1.0.1/src/command.c 2007-09-26 15:03:19.000000000 +0200 +@@ -1486,19 +1486,21 @@ + numlock_state = (ev->xkey.state & ModNumLockMask); /* numlock toggle */ + PrivMode((!numlock_state), PrivMode_aplKP); + } +-#ifdef USE_XIM ++#if defined(USE_XIM) || !defined(NO_XLOCALE) + len = 0; +- if (Input_Context != NULL) { +- Status status_return; ++ if (!XFilterEvent(ev, *(&ev->xkey.window))) { ++ if (Input_Context != NULL) { ++ Status status_return; + +- kbuf[0] = '\0'; +- len = XmbLookupString(Input_Context, &ev->xkey, kbuf, +- sizeof(kbuf), &keysym, +- &status_return); +- } else { +- len = XLookupString(&ev->xkey, kbuf, +- sizeof(kbuf), &keysym, +- &compose); ++ kbuf[0] = '\0'; ++ len = XmbLookupString(Input_Context, &ev->xkey, kbuf, ++ sizeof(kbuf), &keysym, ++ &status_return); ++ } else { ++ len = XLookupString(&ev->xkey, kbuf, ++ sizeof(kbuf), &keysym, ++ &compose); ++ } + } + #else /* USE_XIM */ + len = XLookupString(&ev->xkey, (char *) kbuf, sizeof(kbuf), &keysym, &compose); diff --git a/x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch b/x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch new file mode 100644 index 000000000000..e44c0b360d21 --- /dev/null +++ b/x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch @@ -0,0 +1,24 @@ +--- aterm-1.0.1/src/main.c 2007-08-01 16:08:29.000000000 +0200 ++++ aterm-1.0.1.new/src/main.c 2008-05-03 14:06:52.000000000 +0200 +@@ -2057,10 +2057,6 @@ + */ + get_options(argc, argv); + +- if( display_name == NULL ) +- if ((display_name = getenv("DISPLAY")) == NULL) +- display_name = ":0"; +- + #ifdef HAVE_AFTERSTEP + #ifdef MyArgs_IS_MACRO + MyArgsPtr = safecalloc(1, sizeof(ASProgArgs) ); +@@ -2102,7 +2098,9 @@ + Xdisplay = XOpenDisplay(display_name); + + if (!Xdisplay) { +- print_error("can't open display %s", display_name); ++ print_error("can't open display %s", display_name?display_name: ++ getenv("DISPLAY")?getenv("DISPLAY"): ++ "as no -d given and DISPLAY not set"); + exit(EXIT_FAILURE); + } + /* changed from _MOTIF_WM_INFO - Vaevictus - gentoo bug #139554 */ |