callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x11: Pass the GdkScreen to the XSettingsClient

Browse Source
This commit is contained in:
Benjamin Otte
2013-02-10 01:20:38 +01:00
parent bb4953f3e8
commit eb4792128f
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gdk/x11/gdkscreen-x11.c
View File

@ -1731,8 +1731,7 @@ _gdk_x11_screen_init_events (GdkScreen *screen)
/* Keep a flag to avoid extra notifies that we don't need /* Keep a flag to avoid extra notifies that we don't need
*/ */
x11_screen->xsettings_in_init = TRUE; x11_screen->xsettings_in_init = TRUE;
x11_screen->xsettings_client = xsettings_client_new (x11_screen->xdisplay, x11_screen->xsettings_client = xsettings_client_new (screen,
x11_screen->screen_num,
gdk_xsettings_notify_cb, gdk_xsettings_notify_cb,
gdk_xsettings_watch_cb, gdk_xsettings_watch_cb,
screen, screen,

23
gdk/x11/xsettings-client.c
View File

@ -25,7 +25,9 @@
#include "xsettings-client.h" #include "xsettings-client.h"
#include <glib.h> #include <gdk/x11/gdkx11display.h>
#include <gdk/x11/gdkx11screen.h>
#include <gdk/x11/gdkx11window.h>
#include <limits.h> #include <limits.h>
#include <stdio.h> #include <stdio.h>
@ -37,8 +39,8 @@
struct _XSettingsClient struct _XSettingsClient
{ {
GdkScreen *screen;
Display *display; Display *display;
int screen;
XSettingsNotifyFunc notify; XSettingsNotifyFunc notify;
XSettingsWatchFunc watch; XSettingsWatchFunc watch;
void *cb_data; void *cb_data;
@ -453,8 +455,7 @@ check_manager_window (XSettingsClient *client)
} }
XSettingsClient * XSettingsClient *
xsettings_client_new (Display *display, xsettings_client_new (GdkScreen *screen,
int screen,
XSettingsNotifyFunc notify, XSettingsNotifyFunc notify,
XSettingsWatchFunc watch, XSettingsWatchFunc watch,
void *cb_data, void *cb_data,
@ -470,8 +471,8 @@ xsettings_client_new (Display *display,
if (!client) if (!client)
return NULL; return NULL;
client->display = display;
client->screen = screen; client->screen = screen;
client->display = gdk_x11_display_get_xdisplay (gdk_screen_get_display (screen));
client->notify = notify; client->notify = notify;
client->watch = watch; client->watch = watch;
client->cb_data = cb_data; client->cb_data = cb_data;
@ -480,12 +481,12 @@ xsettings_client_new (Display *display,
client->manager_window = None; client->manager_window = None;
client->settings = NULL; client->settings = NULL;
sprintf(buffer, "_XSETTINGS_S%d", screen); sprintf(buffer, "_XSETTINGS_S%d", gdk_x11_screen_get_screen_number (screen));
atom_names[0] = buffer; atom_names[0] = buffer;
atom_names[1] = "_XSETTINGS_SETTINGS"; atom_names[1] = "_XSETTINGS_SETTINGS";
atom_names[2] = "MANAGER"; atom_names[2] = "MANAGER";
XInternAtoms (display, atom_names, 3, False, atoms); XInternAtoms (client->display, atom_names, 3, False, atoms);
client->selection_atom = atoms[0]; client->selection_atom = atoms[0];
client->xsettings_atom = atoms[1]; client->xsettings_atom = atoms[1];
@ -493,10 +494,10 @@ xsettings_client_new (Display *display,
/* Select on StructureNotify so we get MANAGER events /* Select on StructureNotify so we get MANAGER events
*/ */
add_events (display, RootWindow (display, screen), StructureNotifyMask); add_events (client->display, gdk_x11_window_get_xid (gdk_screen_get_root_window (screen)), StructureNotifyMask);
if (client->watch) if (client->watch)
client->watch (RootWindow (display, screen), True, StructureNotifyMask, client->watch (gdk_x11_window_get_xid (gdk_screen_get_root_window (screen)), True, StructureNotifyMask,
client->cb_data); client->cb_data);
check_manager_window (client); check_manager_window (client);
@ -523,7 +524,7 @@ void
xsettings_client_destroy (XSettingsClient *client) xsettings_client_destroy (XSettingsClient *client)
{ {
if (client->watch) if (client->watch)
client->watch (RootWindow (client->display, client->screen), client->watch (gdk_x11_window_get_xid (gdk_screen_get_root_window (client->screen)),
False, 0, client->cb_data); False, 0, client->cb_data);
if (client->manager_window && client->watch) if (client->manager_window && client->watch)
client->watch (client->manager_window, False, 0, client->cb_data); client->watch (client->manager_window, False, 0, client->cb_data);
@ -549,7 +550,7 @@ xsettings_client_process_event (XSettingsClient *client,
* times when the manager changes from A->B. But manager changes * times when the manager changes from A->B. But manager changes
* are going to be pretty rare. * are going to be pretty rare.
*/ */
if (xev->xany.window == RootWindow (client->display, client->screen)) if (xev->xany.window == gdk_x11_window_get_xid (gdk_screen_get_root_window (client->screen)))
{ {
if (xev->xany.type == ClientMessage && if (xev->xany.type == ClientMessage &&
xev->xclient.message_type == client->manager_atom && xev->xclient.message_type == client->manager_atom &&

4
gdk/x11/xsettings-client.h
View File

@ -23,6 +23,7 @@
#ifndef XSETTINGS_CLIENT_H #ifndef XSETTINGS_CLIENT_H
#define XSETTINGS_CLIENT_H #define XSETTINGS_CLIENT_H
#include <gdk/gdkscreen.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#ifdef __cplusplus #ifdef __cplusplus
@ -111,8 +112,7 @@ void xsettings_setting_free (XSettingsSetting *setting)
int xsettings_setting_equal (XSettingsSetting *setting_a, int xsettings_setting_equal (XSettingsSetting *setting_a,
XSettingsSetting *setting_b); XSettingsSetting *setting_b);
XSettingsClient *xsettings_client_new (Display *display, XSettingsClient *xsettings_client_new (GdkScreen *screen,
int screen,
XSettingsNotifyFunc notify, XSettingsNotifyFunc notify,
XSettingsWatchFunc watch, XSettingsWatchFunc watch,
void *cb_data, void *cb_data,