-
Notifications
You must be signed in to change notification settings - Fork 971
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add clipboard support to x0vncserver #1831
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,195 @@ | ||
| /* Copyright (C) 2024 Gaurav Ujjwal. All Rights Reserved. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this software; if not, write to the Free Software | ||
| * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | ||
| * USA. | ||
| */ | ||
|
|
||
| #include <X11/Xatom.h> | ||
| #include <rfb/Configuration.h> | ||
| #include <rfb/LogWriter.h> | ||
| #include <rfb/util.h> | ||
| #include <x0vncserver/XSelection.h> | ||
|
|
||
| rfb::BoolParameter setPrimary("SetPrimary", | ||
| "Set the PRIMARY as well as the CLIPBOARD selection", | ||
| true); | ||
| rfb::BoolParameter sendPrimary("SendPrimary", | ||
| "Send the PRIMARY as well as the CLIPBOARD selection", | ||
| true); | ||
|
|
||
| static rfb::LogWriter vlog("XSelection"); | ||
|
|
||
| XSelection::XSelection(Display* dpy_, XSelectionHandler* handler_) | ||
| : TXWindow(dpy_, 1, 1, nullptr), handler(handler_), announcedSelection(None) | ||
| { | ||
| probeProperty = XInternAtom(dpy, "TigerVNC_ProbeProperty", False); | ||
| transferProperty = XInternAtom(dpy, "TigerVNC_TransferProperty", False); | ||
| timestampProperty = XInternAtom(dpy, "TigerVNC_TimestampProperty", False); | ||
| setName("TigerVNC Clipboard (x0vncserver)"); | ||
| addEventMask(PropertyChangeMask); // Required for PropertyNotify events | ||
| } | ||
|
|
||
| static Bool PropertyEventMatcher(Display* /* dpy */, XEvent* ev, XPointer prop) | ||
| { | ||
| if (ev->type == PropertyNotify && ev->xproperty.atom == *((Atom*)prop)) | ||
| return True; | ||
| else | ||
| return False; | ||
| } | ||
|
|
||
| Time XSelection::getXServerTime() | ||
| { | ||
| XEvent ev; | ||
| uint8_t data = 0; | ||
|
|
||
| // Trigger a PropertyNotify event to extract server time | ||
| XChangeProperty(dpy, win(), timestampProperty, XA_STRING, 8, PropModeReplace, | ||
| &data, sizeof(data)); | ||
| XIfEvent(dpy, &ev, &PropertyEventMatcher, (XPointer)×tampProperty); | ||
| return ev.xproperty.time; | ||
CendioOssman marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| // Takes ownership of selections, backed by given data. | ||
| void XSelection::handleClientClipboardData(const char* data) | ||
| { | ||
| vlog.debug("Received client clipboard data, taking selection ownership"); | ||
|
|
||
| Time time = getXServerTime(); | ||
| ownSelection(xaCLIPBOARD, time); | ||
| if (!selectionOwner(xaCLIPBOARD)) | ||
| vlog.error("Unable to own CLIPBOARD selection"); | ||
|
|
||
| if (setPrimary) { | ||
| ownSelection(XA_PRIMARY, time); | ||
| if (!selectionOwner(XA_PRIMARY)) | ||
| vlog.error("Unable to own PRIMARY selection"); | ||
| } | ||
|
|
||
| if (selectionOwner(xaCLIPBOARD) || selectionOwner(XA_PRIMARY)) | ||
| clientData = data; | ||
| } | ||
|
|
||
| // We own the selection and another X app has asked for data | ||
| bool XSelection::selectionRequest(Window requestor, Atom selection, Atom target, | ||
| Atom property) | ||
| { | ||
| if (clientData.empty() || requestor == win() || !selectionOwner(selection)) | ||
| return false; | ||
|
|
||
| if (target == XA_STRING) { | ||
| std::string latin1 = rfb::utf8ToLatin1(clientData.data(), clientData.length()); | ||
| XChangeProperty(dpy, requestor, property, XA_STRING, 8, PropModeReplace, | ||
| (unsigned char*)latin1.data(), latin1.length()); | ||
| return true; | ||
| } | ||
|
|
||
| if (target == xaUTF8_STRING) { | ||
| XChangeProperty(dpy, requestor, property, xaUTF8_STRING, 8, PropModeReplace, | ||
| (unsigned char*)clientData.data(), clientData.length()); | ||
| return true; | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| // Selection-owner change implies a change in selection data. | ||
| void XSelection::handleSelectionOwnerChange(Window owner, Atom selection, Time time) | ||
| { | ||
| if (selection != XA_PRIMARY && selection != xaCLIPBOARD) | ||
| return; | ||
| if (selection == XA_PRIMARY && !sendPrimary) | ||
| return; | ||
|
|
||
| if (selection == announcedSelection) | ||
| announceSelection(None); | ||
|
|
||
| if (owner == None || owner == win()) | ||
| return; | ||
|
|
||
| if (!selectionOwner(XA_PRIMARY) && !selectionOwner(xaCLIPBOARD)) | ||
| clientData = ""; | ||
|
|
||
| XConvertSelection(dpy, selection, xaTARGETS, probeProperty, win(), time); | ||
| } | ||
|
|
||
| void XSelection::announceSelection(Atom selection) | ||
| { | ||
| announcedSelection = selection; | ||
| handler->handleXSelectionAnnounce(selection != None); | ||
| } | ||
|
|
||
| void XSelection::requestSelectionData() | ||
| { | ||
| if (announcedSelection != None) | ||
| XConvertSelection(dpy, announcedSelection, xaTARGETS, transferProperty, win(), | ||
| CurrentTime); | ||
| } | ||
|
|
||
| // Some information about selection is received from current owner | ||
| void XSelection::selectionNotify(XSelectionEvent* ev, Atom type, int format, | ||
| int nitems, void* data) | ||
| { | ||
| if (!ev || !data || type == None) | ||
| return; | ||
|
|
||
| if (ev->target == xaTARGETS) { | ||
| if (format != 32 || type != XA_ATOM) | ||
| return; | ||
|
|
||
| Atom* targets = (Atom*)data; | ||
| bool utf8Supported = false; | ||
| bool stringSupported = false; | ||
|
|
||
| for (int i = 0; i < nitems; i++) { | ||
| if (targets[i] == xaUTF8_STRING) | ||
| utf8Supported = true; | ||
| else if (targets[i] == XA_STRING) | ||
| stringSupported = true; | ||
| } | ||
|
|
||
| if (ev->property == probeProperty) { | ||
| // Only probing for now, will issue real request when client asks for data | ||
| if (stringSupported || utf8Supported) | ||
| announceSelection(ev->selection); | ||
| return; | ||
| } | ||
|
|
||
| // Prefer UTF-8 if available | ||
| if (utf8Supported) | ||
| XConvertSelection(dpy, ev->selection, xaUTF8_STRING, transferProperty, win(), | ||
| ev->time); | ||
| else if (stringSupported) | ||
| XConvertSelection(dpy, ev->selection, XA_STRING, transferProperty, win(), | ||
| ev->time); | ||
| } else if (ev->target == xaUTF8_STRING || ev->target == XA_STRING) { | ||
| if (type == xaINCR) { | ||
| // Incremental transfer is not supported | ||
| vlog.debug("Selected data is too big!"); | ||
| return; | ||
| } | ||
|
|
||
| if (format != 8) | ||
| return; | ||
|
|
||
| if (type == xaUTF8_STRING) { | ||
| std::string result = rfb::convertLF((char*)data, nitems); | ||
| handler->handleXSelectionData(result.c_str()); | ||
| } else if (type == XA_STRING) { | ||
| std::string result = rfb::convertLF((char*)data, nitems); | ||
| result = rfb::latin1ToUTF8(result.data(), result.length()); | ||
| handler->handleXSelectionData(result.c_str()); | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How difficult would it be to also support the selection clipboard?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should not be very difficult, but it does brings in this problem. So a similar approach will be needed here.