diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2010-10-01 17:02:12 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2010-10-01 17:02:12 +0200 |
| commit | c6e9c52a2a588fa11f516e96f3ba5fea3cd67274 (patch) | |
| tree | 23ce390bf9a60a2a9ad440718cae9bdeb44d28c6 /client | |
| parent | b8824160707ba276e0fcaed8b68aa9e356b534ba (diff) | |
| download | spice-c6e9c52a2a588fa11f516e96f3ba5fea3cd67274.tar.gz spice-c6e9c52a2a588fa11f516e96f3ba5fea3cd67274.tar.xz spice-c6e9c52a2a588fa11f516e96f3ba5fea3cd67274.zip | |
Call intern_atoms() earlier
We call XFixesSelectSelectionInput with the clipboard_atom, so we musr
initialize the atoms before calling XFixesSelectSelectionInput.
Diffstat (limited to 'client')
| -rw-r--r-- | client/x11/platform.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/x11/platform.cpp b/client/x11/platform.cpp index 98112331..8f4ed2de 100644 --- a/client/x11/platform.cpp +++ b/client/x11/platform.cpp @@ -830,6 +830,7 @@ DynamicScreen::DynamicScreen(Display* display, int screen, int& next_mon_id) X_DEBUG_SYNC(display); //FIXME: replace RootWindow() in other refs as well? platform_win = XCreateSimpleWindow(display, RootWindow(display, screen), 0, 0, 1, 1, 0, 0, 0); + intern_clipboard_atoms(); XSelectInput(display, platform_win, StructureNotifyMask); XRRSelectInput(display, platform_win, RRScreenChangeNotifyMask); if (using_xfixes_1_0) { @@ -843,7 +844,6 @@ DynamicScreen::DynamicScreen(Display* display, int screen, int& next_mon_id) process_monitor_configure_events(platform_win); Monitor::self_monitors_change--; - intern_clipboard_atoms(); XPlatform::set_win_proc(platform_win, root_win_proc); X_DEBUG_SYNC(display); } @@ -1106,6 +1106,7 @@ MultyMonScreen::MultyMonScreen(Display* display, int screen, int& next_mon_id) } platform_win = XCreateSimpleWindow(display, RootWindow(display, screen), 0, 0, 1, 1, 0, 0, 0); + intern_clipboard_atoms(); XSelectInput(display, platform_win, StructureNotifyMask); X_DEBUG_SYNC(get_display()); XRRSelectInput(display, platform_win, RRScreenChangeNotifyMask); @@ -1121,7 +1122,6 @@ MultyMonScreen::MultyMonScreen(Display* display, int screen, int& next_mon_id) process_monitor_configure_events(platform_win); XMonitor::dec_change_ref(); - intern_clipboard_atoms(); XPlatform::set_win_proc(platform_win, root_win_proc); X_DEBUG_SYNC(get_display()); } |