Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-25 14:57:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] x11: update to support new spice clipboard type list

Browse Source
This commit is contained in:
Geoffrey McRae 2021-05-30 11:37:31 +10:00
parent 28640295f1
commit 9ddfacc1a8
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
client/displayservers/X11/clipboard.c
View File

@ -233,7 +233,7 @@ static void x11CBSelectionIncr(const XPropertyEvent e)
&data) != Success) &data) != Success)
{ {
DEBUG_INFO("GetProp Failed"); DEBUG_INFO("GetProp Failed");
app_clipboardNotify(LG_CLIPBOARD_DATA_NONE, 0); app_clipboardNotifySize(LG_CLIPBOARD_DATA_NONE, 0);
goto out; goto out;
} }
@ -248,13 +248,13 @@ static void x11CBSelectionIncr(const XPropertyEvent e)
XGetAtomName(x11.display, type)); XGetAtomName(x11.display, type));
x11cb.lowerBound = 0; x11cb.lowerBound = 0;
app_clipboardNotify(LG_CLIPBOARD_DATA_NONE, 0); app_clipboardNotifySize(LG_CLIPBOARD_DATA_NONE, 0);
goto out; goto out;
} }
if (x11cb.incrStart) if (x11cb.incrStart)
{ {
app_clipboardNotify(dataType, x11cb.lowerBound); app_clipboardNotifySize(dataType, x11cb.lowerBound);
x11cb.incrStart = false; x11cb.incrStart = false;
} }
@ -275,7 +275,7 @@ static void x11CBSelectionIncr(const XPropertyEvent e)
&data) != Success) &data) != Success)
{ {
DEBUG_ERROR("XGetWindowProperty Failed"); DEBUG_ERROR("XGetWindowProperty Failed");
app_clipboardNotify(LG_CLIPBOARD_DATA_NONE, 0); app_clipboardNotifySize(LG_CLIPBOARD_DATA_NONE, 0);
goto out; goto out;
} }
@ -332,7 +332,7 @@ static void x11CBSelectionNotify(const XSelectionEvent e)
&after, &after,
&data) != Success) &data) != Success)
{ {
app_clipboardNotify(LG_CLIPBOARD_DATA_NONE, 0); app_clipboardNotifySize(LG_CLIPBOARD_DATA_NONE, 0);
goto out; goto out;
} }
@ -352,21 +352,19 @@ static void x11CBSelectionNotify(const XSelectionEvent e)
if (!data || format != 32) if (!data || format != 32)
goto out; goto out;
int typeCount = 0;
LG_ClipboardData types[itemCount];
// see if we support any of the targets listed // see if we support any of the targets listed
const uint64_t * targets = (const uint64_t *)data; const uint64_t * targets = (const uint64_t *)data;
for(unsigned long i = 0; i < itemCount; ++i) for(unsigned long i = 0; i < itemCount; ++i)
{ {
for(int n = 0; n < LG_CLIPBOARD_DATA_NONE; ++n) for(int n = 0; n < LG_CLIPBOARD_DATA_NONE; ++n)
if (x11cb.aTypes[n] == targets[i]) if (x11cb.aTypes[n] == targets[i])
{ types[typeCount++] = n;
// we have a match, so send the notification
app_clipboardNotify(n, 0);
goto out;
}
} }
// no matches app_clipboardNotifyTypes(types, typeCount);
app_clipboardNotify(LG_CLIPBOARD_DATA_NONE, 0);
goto out; goto out;
} }