Hi Keith,
This is a refactoring of the X11 <-> Windows clipboard integration code, which
cleans up some cruft, makes it straightforward to build it correctly for 64-bit
targets by undefining _XSERVER64, and perhaps paves the way to moving this code
into a separate library.
Please consider pulling into master.
Thanks.
The following changes since commit d3427717f2c6a473dc3d20631dff653e4e37228e:
xwayland: Snap damage reports to the bounding box (2014-09-11 23:40:30 -0600)
are available in the git repository at:
git://people.freedesktop.org/~jturney/xserver xwin-clipboard-refactoring
for you to fetch changes up to 1d6334dd0ca99923b6b55c5c047ef6b5c325f66c:
hw/xwin: Undefine _XSERVER64 in hw/xwin/winclipboard (2014-09-13 14:19:06
+0100)
----------------------------------------------------------------
Jon TURNEY (30):
hw/xwin: Remove left-over pthread_exit() in clipboard code
hw/xwin: Push winClipboardShutdown() into winclipboardinit.c
hw/xwin: Hoist clipboard thread restart up one level
hw/xwin: winProcEstablishConnection doesn't need to check if clipboard
started
hw/xwin: Hoist setting of g_fClipboardStarted flag up one level
hw/xwin: Remove g_fClipboardLaunched, it's value is identical to
g_fClipboardStarted
hw/xwin: Remove SetSelectionOwner wrapper, use
XFixesSetSelectionOwnerNotify event instead
hw/xwin: Move winClipboardCreateMessagingWindow() to winclipboardthread.c
hw/xwin: Eliminate g_pClipboardDisplay and g_iClipboardWindow globals
hw/xwin: Hoist use of winSetAuthorization() and winGetDisplayName() up
one level
hw/xwin: Add remaining clipboard globals to winglobals.h
hw/xwin: Make g_hwndClipboard static
hw/xwin: Move clipboard integration code down to a subdirectory
hw/xwin: Return a shutdown flag from winClipboardProc() if we should stop
trying
hw/xwin: Separate libwinclipboard interface and internal header files
hw/xwin: Add fUseUnicode as parameter to winClipboardProc()
hw/xwin: Look up atoms in winClipboardProc()
hw/xwin: Changes in error logging to make libwinclipboard more useful as
a library
hw/xwin: Add xwinclip test client
hw/xwin: Remove standard includes from internal.h and add them where
needed
hw/xwin: Remove unused X includes from internal.h and add them where
needed
hw/xwin: Use header for prototypes in textconv.c
hw/xwin: Move WIN_MSG_QUEUE_FNAME to where it's used
hw/xwin: Remove setjmp()/longjmp() error constants
hw/xwin: Improve comment about why we can't XCloseDisplay()
hw/xwin: Remove XOpenDisplay() retry code
hw/xwin: In clipboard function prototypes, use Window type, not int type
hw/xwin: Add a basic manpage for xwinclip
hw/xwin: Only add to XSetIOErrorHandler() handler chain once
hw/xwin: Undefine _XSERVER64 in hw/xwin/winclipboard
configure.ac | 3 +-
hw/xwin/InitInput.c | 1 -
hw/xwin/InitOutput.c | 38 ---
hw/xwin/Makefile.am | 15 +-
hw/xwin/win.h | 2 +-
hw/xwin/winclipboard/Makefile.am | 25 ++
hw/xwin/winclipboard/debug.c | 52 ++++
.../{winclipboard.h => winclipboard/internal.h} | 79 ++----
.../textconv.c} | 18 +-
.../thread.c} | 314 +++++++++++----------
hw/xwin/winclipboard/winclipboard.h | 36 +++
.../wndproc.c} | 126 +++++----
.../xevents.c} | 197 +++++++++++--
hw/xwin/winclipboard/xwinclip.c | 127 +++++++++
hw/xwin/winclipboard/xwinclip.man | 61 ++++
hw/xwin/winclipboardinit.c | 150 +++++-----
hw/xwin/winclipboardwrappers.c | 226 +--------------
hw/xwin/windialogs.c | 7 -
hw/xwin/winglobals.c | 13 -
hw/xwin/winglobals.h | 4 +-
hw/xwin/winwndproc.c | 3 +
21 files changed, 853 insertions(+), 644 deletions(-)
create mode 100644 hw/xwin/winclipboard/Makefile.am
create mode 100644 hw/xwin/winclipboard/debug.c
rename hw/xwin/{winclipboard.h => winclipboard/internal.h} (63%)
rename hw/xwin/{winclipboardtextconv.c => winclipboard/textconv.c} (93%)
rename hw/xwin/{winclipboardthread.c => winclipboard/thread.c} (61%)
create mode 100644 hw/xwin/winclipboard/winclipboard.h
rename hw/xwin/{winclipboardwndproc.c => winclipboard/wndproc.c} (83%)
rename hw/xwin/{winclipboardxevents.c => winclipboard/xevents.c} (82%)
create mode 100644 hw/xwin/winclipboard/xwinclip.c
create mode 100644 hw/xwin/winclipboard/xwinclip.man
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
