VARCem/PDCurses
1
0
Fork 0
mirror of https://github.com/VARCem/PDCurses.git synced 2026-09-23 07:15:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

In x11new, PDC_getclipboard() now reads from CLIPBORAD instead of

Browse Source 
PRIMARY, while PDC_setclipboard() sets both; plus fixes for
_convert_proc(). Works on Mac, still not quite right on Linux.
This commit is contained in:
William McBrine
2019-08-19 10:36:12 -04:00
parent 0ab3964f6a
commit e47e31c425
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
x11new/x11.c
View File

@@ -1168,7 +1168,7 @@ static Boolean _convert_proc(Widget w, Atom *selection, Atom *target,
XtFree((char *)std_targets);
*type_return = XA_ATOM;
*format_return = sizeof(Atom) * 8;
*format_return = 8;
return True;
}
@@ -1189,7 +1189,7 @@ static Boolean _convert_proc(Widget w, Atom *selection, Atom *target,
while (*tmp)
data[ret_length++] = *tmp++ & 0xff;
data[ret_length++] = '\0';
data[ret_length] = '\0';
*value_return = data;
*length_return = ret_length;
@@ -1730,9 +1730,11 @@ static void _get_selection_utf8(Widget w, XtPointer data, Atom *selection,
void XC_get_selection(void)
{
Atom XA_CLIPBOARD = XInternAtom(XtDisplay(topLevel), "CLIPBOARD", 0);
XC_LOG(("XC_get_selection() - called\n"));
XtGetSelectionValue(topLevel, XA_PRIMARY,
XtGetSelectionValue(topLevel, XA_CLIPBOARD,
#ifdef PDC_WIDE
XA_UTF8_STRING(XtDisplay(topLevel)),
_get_selection_utf8,
@@ -1748,6 +1750,7 @@ int XC_set_selection(const char *contents, long length)
{
long pos;
int status;
Atom XA_CLIPBOARD = XInternAtom(XtDisplay(topLevel), "CLIPBOARD", 0);
XC_LOG(("XC_set_selection() - called\n"));
@@ -1765,7 +1768,9 @@ int XC_set_selection(const char *contents, long length)
tmpsel_length = length;
tmpsel[length] = 0;
if (XtOwnSelection(topLevel, XA_PRIMARY, CurrentTime,
if (XtOwnSelection(topLevel, XA_CLIPBOARD, CurrentTime,
_convert_proc, _lose_ownership, NULL) == False ||
XtOwnSelection(topLevel, XA_PRIMARY, CurrentTime,
_convert_proc, _lose_ownership, NULL) == False)
{
status = PDC_CLIP_ACCESS_ERROR;