diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2004-01-15 15:42:01 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2004-01-15 15:42:01 +0000 |
| commit | 375f0a062a853373901f4f5031fb83fccb38c432 (patch) | |
| tree | ca5ecd743b6d01c2960505140f032bf35b7dc700 /x11-terms/aterm/files | |
| parent | unmask and fixes (diff) | |
| download | historical-375f0a062a853373901f4f5031fb83fccb38c432.tar.gz historical-375f0a062a853373901f4f5031fb83fccb38c432.tar.bz2 historical-375f0a062a853373901f4f5031fb83fccb38c432.zip | |
Add qt pasting patch from bug 29232
Diffstat (limited to 'x11-terms/aterm/files')
| -rw-r--r-- | x11-terms/aterm/files/aterm-0.4.2-qtpaste.patch | 70 | ||||
| -rw-r--r-- | x11-terms/aterm/files/digest-aterm-0.4.2-r6 | 2 |
2 files changed, 72 insertions, 0 deletions
diff --git a/x11-terms/aterm/files/aterm-0.4.2-qtpaste.patch b/x11-terms/aterm/files/aterm-0.4.2-qtpaste.patch new file mode 100644 index 000000000000..dff3b995ccdf --- /dev/null +++ b/x11-terms/aterm/files/aterm-0.4.2-qtpaste.patch @@ -0,0 +1,70 @@ +--- aterm-0.4.2-orig/src/screen.c 2001-09-06 12:38:07.000000000 -0400 ++++ aterm-0.4.2/src/screen.c 2003-09-11 02:45:54.000000000 -0400 +@@ -2788,8 +2788,10 @@ + { + Atom prop; + ++#if 0 /* make shift-insert with the mouse outside the window work (#77338) */ + if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) + return; /* outside window */ ++#endif + + if (selection.text != NULL) { + PasteIt(selection.text, selection.len); /* internal selection */ +@@ -3328,10 +3330,21 @@ + void + selection_send(XSelectionRequestEvent * rq) + { ++ /* Changes are from rxvt. This fixes #205040. */ + XEvent ev; +- Atom32 target_list[2]; ++ Atom32 target_list[4]; ++ Atom target; + static Atom xa_targets = None; +- ++ static Atom xa_compound_text = None; ++ static Atom xa_text = None; ++ XTextProperty ct; ++ XICCEncodingStyle style; ++ char *cl[4]; ++ ++ if (xa_text == None) ++ xa_text = XInternAtom(Xdisplay, "TEXT", False); ++ if (xa_compound_text == None) ++ xa_compound_text = XInternAtom(Xdisplay, "COMPOUND_TEXT", False); + if (xa_targets == None) + xa_targets = XInternAtom(Xdisplay, "TARGETS", False); + +@@ -3346,14 +3359,29 @@ + if (rq->target == xa_targets) { + target_list[0] = (Atom32) xa_targets; + target_list[1] = (Atom32) XA_STRING; ++ target_list[2] = (Atom32) xa_text; ++ target_list[3] = (Atom32) xa_compound_text; + XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target, + (8 * sizeof(target_list[0])), PropModeReplace, + (unsigned char *)target_list, + (sizeof(target_list) / sizeof(target_list[0]))); + ev.xselection.property = rq->property; +- } else if (rq->target == XA_STRING) { +- XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target, +- 8, PropModeReplace, selection.text, selection.len); ++ } else if (rq->target == XA_STRING ++ || rq->target == xa_compound_text ++ || rq->target == xa_text) { ++ if (rq->target == XA_STRING) { ++ style = XStringStyle; ++ target = XA_STRING; ++ } else { ++ target = xa_compound_text; ++ style = (rq->target == xa_compound_text) ? XCompoundTextStyle ++ : XStdICCTextStyle; ++ } ++ cl[0] = selection.text; ++ XmbTextListToTextProperty(Xdisplay, cl, 1, style, &ct); ++ XChangeProperty(Xdisplay, rq->requestor, rq->property, ++ target, 8, PropModeReplace, ++ ct.value, ct.nitems); + ev.xselection.property = rq->property; + } + XSendEvent(Xdisplay, rq->requestor, False, 0, &ev); diff --git a/x11-terms/aterm/files/digest-aterm-0.4.2-r6 b/x11-terms/aterm/files/digest-aterm-0.4.2-r6 new file mode 100644 index 000000000000..a1aafd5e085e --- /dev/null +++ b/x11-terms/aterm/files/digest-aterm-0.4.2-r6 @@ -0,0 +1,2 @@ +MD5 5c29d0cde4225bdbd63ccb6a4dd94c56 aterm-0.4.2.tar.bz2 243419 +MD5 2bd8629ea2a1926bca13841b0aca6604 aterm-0.4.2-ja.patch 84282 |