Delay the creation of the X atoms until we really need them, to allow

getting more of them in one call. Use XGetAtomNames to retrieve all the selection atoms at once.

Delay the creation of the X atoms until we really need them, to allow
3f6cb0cc · Alexandre Julliard · 2496c08b · 3f6cb0cc · 3f6cb0cc · 3f6cb0cc
Commit 3f6cb0cc authored Nov 21, 2003 by Alexandre Julliard
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 122 additions and 68 deletions

clipboard.c dlls/x11drv/clipboard.c +120 -66

window.c dlls/x11drv/window.c +1 -1

x11drv.h dlls/x11drv/x11drv.h +1 -1

No files found.
--- a/dlls/x11drv/clipboard.c
+++ b/dlls/x11drv/clipboard.c
--- a/dlls/x11drv/window.c
+++ b/dlls/x11drv/window.c
@@ -726,7 +726,7 @@ static void create_desktop( Display *display, WND *wndPtr )
    SetPropA( wndPtr->hwndSelf, client_window_atom, (HANDLE)root_window );
    SetPropA( wndPtr->hwndSelf, "__wine_x11_visual_id", (HANDLE)XVisualIDFromVisual(visual) );

-    X11DRV_InitClipboard( display );
+    X11DRV_InitClipboard();

    if (root_window != DefaultRootWindow(display)) X11DRV_create_desktop_thread();
 }

--- a/dlls/x11drv/x11drv.h
+++ b/dlls/x11drv/x11drv.h
@@ -448,7 +448,7 @@ typedef struct tagWINE_CLIPFORMAT {
 #define CF_FLAG_BUILTINFMT   1 /* Built-in windows format */
 #define CF_FLAG_SYNTHESIZED  8 /* Implicitly converted data */

-extern void X11DRV_InitClipboard(Display *display);
+extern void X11DRV_InitClipboard(void);
 extern void X11DRV_CLIPBOARD_ReleaseSelection(Atom selType, Window w, HWND hwnd);
 extern INT X11DRV_CountClipboardFormats(void);
 extern UINT X11DRV_EnumClipboardFormats(UINT wFormat);