/*
- * Copyright © 2001 Red Hat, Inc.
+ * Copyright © 2001, 2007 Red Hat, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
*
* Author: Owen Taylor, Red Hat, Inc.
*/
+
+#include "config.h"
+
+#include "xsettings-client.h"
+
+#include <glib.h>
+
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <X11/Xlib.h>
#include <X11/Xmd.h> /* For CARD16 */
-#include "xsettings-client.h"
-
struct _XSettingsClient
{
Display *display;
Atom selection_atom;
Atom xsettings_atom;
- XSettingsList *settings;
+ GHashTable *settings; /* string => XSettingsSetting */
};
static void
notify_changes (XSettingsClient *client,
- XSettingsList *old_list)
+ GHashTable *old_list)
{
- XSettingsList *old_iter = old_list;
- XSettingsList *new_iter = client->settings;
+ GHashTableIter iter;
+ XSettingsSetting *setting, *old_setting;
if (!client->notify)
return;
- while (old_iter || new_iter)
+ if (client->settings != NULL)
{
- int cmp;
-
- if (old_iter && new_iter)
- cmp = strcmp (old_iter->setting->name, new_iter->setting->name);
- else if (old_iter)
- cmp = -1;
- else
- cmp = 1;
-
- if (cmp < 0)
- {
- client->notify (old_iter->setting->name,
- XSETTINGS_ACTION_DELETED,
- NULL,
- client->cb_data);
- }
- else if (cmp == 0)
+ g_hash_table_iter_init (&iter, client->settings);
+ while (g_hash_table_iter_next (&iter, NULL, (gpointer*) &setting))
{
- if (!xsettings_setting_equal (old_iter->setting,
- new_iter->setting))
- client->notify (old_iter->setting->name,
- XSETTINGS_ACTION_CHANGED,
- new_iter->setting,
- client->cb_data);
- }
- else
- {
- client->notify (new_iter->setting->name,
- XSETTINGS_ACTION_NEW,
- new_iter->setting,
- client->cb_data);
+ old_setting = old_list ? g_hash_table_lookup (old_list, setting->name) : NULL;
+
+ if (old_setting == NULL)
+ client->notify (setting->name, XSETTINGS_ACTION_NEW, setting, client->cb_data);
+ else if (!xsettings_setting_equal (setting, old_setting))
+ client->notify (setting->name, XSETTINGS_ACTION_CHANGED, setting, client->cb_data);
+
+ /* remove setting from old_list */
+ if (old_setting != NULL)
+ g_hash_table_remove (old_list, setting->name);
}
+ }
- if (old_iter)
- old_iter = old_iter->next;
- if (new_iter)
- new_iter = new_iter->next;
+ if (old_list != NULL)
+ {
+ /* old_list now contains only deleted settings */
+ g_hash_table_iter_init (&iter, old_list);
+ while (g_hash_table_iter_next (&iter, NULL, (gpointer*) &old_setting))
+ client->notify (old_setting->name, XSETTINGS_ACTION_DELETED, NULL, client->cb_data);
}
}
return True;
}
-static char local_byte_order = '\0';
-
#define BYTES_LEFT(buffer) ((buffer)->data + (buffer)->len - (buffer)->pos)
static XSettingsResult
x = *(CARD16 *)buffer->pos;
buffer->pos += 2;
- if (buffer->byte_order == local_byte_order)
- *result = x;
+ if (buffer->byte_order == MSBFirst)
+ *result = GUINT16_FROM_BE (x);
else
- *result = (x << 8) | (x >> 8);
+ *result = GUINT16_FROM_LE (x);
return XSETTINGS_SUCCESS;
}
x = *(CARD32 *)buffer->pos;
buffer->pos += 4;
- if (buffer->byte_order == local_byte_order)
- *result = x;
+ if (buffer->byte_order == MSBFirst)
+ *result = GUINT32_FROM_BE (x);
else
- *result = (x << 24) | ((x & 0xff00) << 8) | ((x & 0xff0000) >> 8) | (x >> 24);
+ *result = GUINT32_FROM_LE (x);
return XSETTINGS_SUCCESS;
}
#define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1)))
-static XSettingsList *
+static GHashTable *
parse_settings (unsigned char *data,
size_t len)
{
XSettingsBuffer buffer;
XSettingsResult result = XSETTINGS_SUCCESS;
- XSettingsList *settings = NULL;
+ GHashTable *settings = NULL;
CARD32 serial;
CARD32 n_entries;
CARD32 i;
XSettingsSetting *setting = NULL;
- local_byte_order = xsettings_byte_order ();
-
buffer.pos = buffer.data = data;
buffer.len = len;
- result = fetch_card8 (&buffer, (char *)&buffer.byte_order);
+ result = fetch_card8 (&buffer, (unsigned char *)&buffer.byte_order);
if (buffer.byte_order != MSBFirst &&
buffer.byte_order != LSBFirst)
{
setting->name[name_len] = '\0';
buffer.pos += pad_len;
+ /* last change serial (we ignore it) */
result = fetch_card32 (&buffer, &v_int);
if (result != XSETTINGS_SUCCESS)
goto out;
- setting->last_change_serial = v_int;
switch (type)
{
setting->type = type;
- result = xsettings_list_insert (&settings, setting);
- if (result != XSETTINGS_SUCCESS)
- goto out;
+ if (settings == NULL)
+ settings = g_hash_table_new_full (g_str_hash, g_str_equal,
+ NULL,
+ (GDestroyNotify) xsettings_setting_free);
+
+ if (g_hash_table_lookup (settings, setting->name) != NULL)
+ {
+ result = XSETTINGS_DUPLICATE_ENTRY;
+ goto out;
+ }
+ g_hash_table_insert (settings, setting->name, setting);
setting = NULL;
}
if (setting)
xsettings_setting_free (setting);
- xsettings_list_free (settings);
+ if (settings)
+ g_hash_table_unref (settings);
settings = NULL;
-
}
return settings;
int (*old_handler) (Display *, XErrorEvent *);
- XSettingsList *old_list = client->settings;
+ GHashTable *old_list = client->settings;
client->settings = NULL;
{
fprintf (stderr, "Invalid type for XSETTINGS property");
}
- eles if (format != 8)
+ else if (format != 8)
{
fprintf (stderr, "Invalid format for XSETTINGS property %d", format);
}
}
notify_changes (client, old_list);
- xsettings_list_free (old_list);
+ if (old_list)
+ g_hash_table_unref (old_list);
}
static void
XFlush (client->display);
if (client->manager_window && client->watch)
- client->watch (client->manager_window, True,
- PropertyChangeMask | StructureNotifyMask,
- client->cb_data);
+ {
+ if (!client->watch (client->manager_window, True,
+ PropertyChangeMask | StructureNotifyMask,
+ client->cb_data))
+ {
+ /* Inability to watch the window probably means that it was destroyed
+ * after we ungrabbed
+ */
+ client->manager_window = None;
+ return;
+ }
+ }
+
read_settings (client);
}
int screen,
XSettingsNotifyFunc notify,
XSettingsWatchFunc watch,
- void *cb_data)
+ void *cb_data,
+ XSettingsGrabFunc grab,
+ XSettingsGrabFunc ungrab)
{
XSettingsClient *client;
char buffer[256];
client->notify = notify;
client->watch = watch;
client->cb_data = cb_data;
- client->grab = NULL;
- client->ungrab = NULL;
-
+ client->grab = grab;
+ client->ungrab = ungrab;
client->manager_window = None;
client->settings = NULL;
atom_names[2] = "MANAGER";
XInternAtoms (display, atom_names, 3, False, atoms);
-
+
client->selection_atom = atoms[0];
client->xsettings_atom = atoms[1];
client->manager_atom = atoms[2];
return client;
}
+
void
xsettings_client_set_grab_func (XSettingsClient *client,
XSettingsGrabFunc grab)
if (client->manager_window && client->watch)
client->watch (client->manager_window, False, 0, client->cb_data);
- xsettings_list_free (client->settings);
+ if (client->settings)
+ g_hash_table_unref (client->settings);
free (client);
}
-XSettingsResult
+const XSettingsSetting *
xsettings_client_get_setting (XSettingsClient *client,
- const char *name,
- XSettingsSetting **setting)
+ const char *name)
{
- XSettingsSetting *search = xsettings_list_lookup (client->settings, name);
- if (search)
- {
- *setting = xsettings_setting_copy (search);
- return *setting ? XSETTINGS_SUCCESS : XSETTINGS_NO_MEM;
- }
- else
- return XSETTINGS_NO_ENTRY;
+ return g_hash_table_lookup (client->settings, name);
}
Bool
if (xev->xany.type == DestroyNotify)
{
check_manager_window (client);
- return True;
+ /* let GDK do its cleanup */
+ return False;
}
else if (xev->xany.type == PropertyNotify)
{
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)
+ free (setting->data.v_string);
+
+ if (setting->name)
+ free (setting->name);
+
+ free (setting);
+}
+
projects / ~andy / gtk / blobdiff