#include "xsettings-client.h"
+#include <gdk/x11/gdkx11display.h>
+#include <gdk/x11/gdkx11screen.h>
+#include <gdk/x11/gdkx11window.h>
+
+#include <gdkinternals.h>
+
#include <limits.h>
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include <X11/Xlib.h>
#include <X11/Xmd.h> /* For CARD16 */
+typedef struct _XSettingsBuffer XSettingsBuffer;
+
+typedef enum
+{
+ XSETTINGS_SUCCESS,
+ XSETTINGS_ACCESS,
+ XSETTINGS_FAILED,
+ XSETTINGS_NO_ENTRY,
+ XSETTINGS_DUPLICATE_ENTRY
+} XSettingsResult;
+
+struct _XSettingsBuffer
+{
+ char byte_order;
+ size_t len;
+ unsigned char *data;
+ unsigned char *pos;
+};
+
struct _XSettingsClient
{
+ GdkScreen *screen;
Display *display;
- int screen;
XSettingsNotifyFunc notify;
XSettingsWatchFunc watch;
void *cb_data;
- XSettingsGrabFunc grab;
- XSettingsGrabFunc ungrab;
-
Window manager_window;
Atom manager_atom;
Atom selection_atom;
#define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1)))
+static XSettingsResult
+fetch_string (XSettingsBuffer *buffer,
+ guint length,
+ char **result)
+{
+ guint pad_len;
+
+ pad_len = XSETTINGS_PAD (length, 4);
+ if (pad_len < length /* guard against overflow */
+ || BYTES_LEFT (buffer) < pad_len)
+ return XSETTINGS_ACCESS;
+
+ *result = g_strndup ((char *) buffer->pos, length);
+ buffer->pos += pad_len;
+
+ return XSETTINGS_SUCCESS;
+}
+
static GHashTable *
parse_settings (unsigned char *data,
size_t len)
if (result != XSETTINGS_SUCCESS)
goto out;
+ GDK_NOTE(SETTINGS, g_print("reading %u settings (serial %u byte order %u)\n", n_entries, serial, buffer.byte_order));
+
for (i = 0; i < n_entries; i++)
{
CARD8 type;
CARD16 name_len;
CARD32 v_int;
- size_t pad_len;
result = fetch_card8 (&buffer, &type);
if (result != XSETTINGS_SUCCESS)
if (result != XSETTINGS_SUCCESS)
goto out;
- pad_len = XSETTINGS_PAD(name_len, 4);
- if (BYTES_LEFT (&buffer) < pad_len)
- {
- result = XSETTINGS_ACCESS;
- goto out;
- }
-
- setting = malloc (sizeof *setting);
- if (!setting)
- {
- result = XSETTINGS_NO_MEM;
- goto out;
- }
+ setting = g_new (XSettingsSetting, 1);
setting->type = XSETTINGS_TYPE_INT; /* No allocated memory */
- setting->name = malloc (name_len + 1);
- if (!setting->name)
- {
- result = XSETTINGS_NO_MEM;
- goto out;
- }
-
- memcpy (setting->name, buffer.pos, name_len);
- setting->name[name_len] = '\0';
- buffer.pos += pad_len;
+ setting->name = NULL;
+ result = fetch_string (&buffer, name_len, &setting->name);
+ if (result != XSETTINGS_SUCCESS)
+ goto out;
/* last change serial (we ignore it) */
result = fetch_card32 (&buffer, &v_int);
goto out;
setting->data.v_int = (INT32)v_int;
+ GDK_NOTE(SETTINGS, g_print(" %s = %d\n", setting->name, (gint) setting->data.v_int));
break;
case XSETTINGS_TYPE_STRING:
result = fetch_card32 (&buffer, &v_int);
if (result != XSETTINGS_SUCCESS)
goto out;
- pad_len = XSETTINGS_PAD (v_int, 4);
- if (v_int + 1 == 0 || /* Guard against wrap-around */
- BYTES_LEFT (&buffer) < pad_len)
- {
- result = XSETTINGS_ACCESS;
- goto out;
- }
-
- setting->data.v_string = malloc (v_int + 1);
- if (!setting->data.v_string)
- {
- result = XSETTINGS_NO_MEM;
- goto out;
- }
+ result = fetch_string (&buffer, v_int, &setting->data.v_string);
+ if (result != XSETTINGS_SUCCESS)
+ goto out;
- memcpy (setting->data.v_string, buffer.pos, v_int);
- setting->data.v_string[v_int] = '\0';
- buffer.pos += pad_len;
-
+ GDK_NOTE(SETTINGS, g_print(" %s = \"%s\"\n", setting->name, setting->data.v_string));
break;
case XSETTINGS_TYPE_COLOR:
result = fetch_ushort (&buffer, &setting->data.v_color.red);
if (result != XSETTINGS_SUCCESS)
goto out;
+ GDK_NOTE(SETTINGS, g_print(" %s = #%02X%02X%02X%02X\n", setting->name,
+ setting->data.v_color.alpha, setting->data.v_color.red,
+ setting->data.v_color.green, setting->data.v_color.blue));
break;
default:
/* Quietly ignore unknown types */
+ GDK_NOTE(SETTINGS, g_print(" %s = ignored (unknown type %u)\n", setting->name, type));
break;
}
{
switch (result)
{
- case XSETTINGS_NO_MEM:
- fprintf(stderr, "Out of memory reading XSETTINGS property\n");
- break;
case XSETTINGS_ACCESS:
fprintf(stderr, "Invalid XSETTINGS property (read off end)\n");
break;
if (client->manager_window && client->watch)
client->watch (client->manager_window, False, 0, client->cb_data);
- if (client->grab)
- client->grab (client->display);
- else
- XGrabServer (client->display);
+ gdk_x11_display_grab (gdk_screen_get_display (client->screen));
client->manager_window = XGetSelectionOwner (client->display,
client->selection_atom);
XSelectInput (client->display, client->manager_window,
PropertyChangeMask | StructureNotifyMask);
- if (client->ungrab)
- client->ungrab (client->display);
- else
- XUngrabServer (client->display);
+ gdk_x11_display_ungrab (gdk_screen_get_display (client->screen));
XFlush (client->display);
}
XSettingsClient *
-xsettings_client_new (Display *display,
- int screen,
+xsettings_client_new (GdkScreen *screen,
XSettingsNotifyFunc notify,
XSettingsWatchFunc watch,
- void *cb_data,
- XSettingsGrabFunc grab,
- XSettingsGrabFunc ungrab)
+ void *cb_data)
{
XSettingsClient *client;
char buffer[256];
char *atom_names[3];
Atom atoms[3];
- client = malloc (sizeof *client);
+ client = g_new (XSettingsClient, 1);
if (!client)
return NULL;
- client->display = display;
client->screen = screen;
+ client->display = gdk_x11_display_get_xdisplay (gdk_screen_get_display (screen));
client->notify = notify;
client->watch = watch;
client->cb_data = cb_data;
- client->grab = grab;
- client->ungrab = ungrab;
client->manager_window = None;
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[1] = "_XSETTINGS_SETTINGS";
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->xsettings_atom = atoms[1];
/* 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)
- 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);
check_manager_window (client);
return client;
}
-
-void
-xsettings_client_set_grab_func (XSettingsClient *client,
- XSettingsGrabFunc grab)
-{
- client->grab = grab;
-}
-
-void
-xsettings_client_set_ungrab_func (XSettingsClient *client,
- XSettingsGrabFunc ungrab)
-{
- client->ungrab = ungrab;
-}
-
void
xsettings_client_destroy (XSettingsClient *client)
{
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);
if (client->manager_window && client->watch)
client->watch (client->manager_window, False, 0, client->cb_data);
if (client->settings)
g_hash_table_unref (client->settings);
- free (client);
+ g_free (client);
}
const XSettingsSetting *
* times when the manager changes from A->B. But manager changes
* 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 &&
xev->xclient.message_type == client->manager_atom &&
return False;
}
+
+int
+xsettings_setting_equal (XSettingsSetting *setting_a,
+ XSettingsSetting *setting_b)
+{
+ if (setting_a->type != setting_b->type)
+ return 0;
+
+ if (strcmp (setting_a->name, setting_b->name) != 0)
+ return 0;
+
+ switch (setting_a->type)
+ {
+ case XSETTINGS_TYPE_INT:
+ return setting_a->data.v_int == setting_b->data.v_int;
+ case XSETTINGS_TYPE_COLOR:
+ return (setting_a->data.v_color.red == setting_b->data.v_color.red &&
+ setting_a->data.v_color.green == setting_b->data.v_color.green &&
+ setting_a->data.v_color.blue == setting_b->data.v_color.blue &&
+ setting_a->data.v_color.alpha == setting_b->data.v_color.alpha);
+ case XSETTINGS_TYPE_STRING:
+ return strcmp (setting_a->data.v_string, setting_b->data.v_string) == 0;
+ }
+
+ return 0;
+}
+
+void
+xsettings_setting_free (XSettingsSetting *setting)
+{
+ if (setting->type == XSETTINGS_TYPE_STRING)
+ g_free (setting->data.v_string);
+
+ if (setting->name)
+ g_free (setting->name);
+
+ g_free (setting);
+}
+
projects / ~andy / gtk / blobdiff