/*
- * 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 <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;
XSettingsWatchFunc watch;
void *cb_data;
+ XSettingsGrabFunc grab;
+ XSettingsGrabFunc ungrab;
+
Window manager_window;
Atom manager_atom;
Atom selection_atom;
notify_changes (XSettingsClient *client,
XSettingsList *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 = xsettings_list_lookup (old_list, setting->name);
+
+ 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;
}
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)
{
XSettingsList *old_list = client->settings;
client->settings = NULL;
-
- old_handler = XSetErrorHandler (ignore_errors);
- result = XGetWindowProperty (client->display, client->manager_window,
- client->xsettings_atom, 0, LONG_MAX,
- False, client->xsettings_atom,
- &type, &format, &n_items, &bytes_after, &data);
- XSetErrorHandler (old_handler);
-
- if (result == Success && type == client->xsettings_atom)
+
+ if (client->manager_window)
{
- if (format != 8)
+ old_handler = XSetErrorHandler (ignore_errors);
+ result = XGetWindowProperty (client->display, client->manager_window,
+ client->xsettings_atom, 0, LONG_MAX,
+ False, client->xsettings_atom,
+ &type, &format, &n_items, &bytes_after, &data);
+ XSetErrorHandler (old_handler);
+
+ if (result == Success && type != None)
{
- fprintf (stderr, "Invalid format for XSETTINGS property %d", format);
+ if (type != client->xsettings_atom)
+ {
+ fprintf (stderr, "Invalid type for XSETTINGS property");
+ }
+ else if (format != 8)
+ {
+ fprintf (stderr, "Invalid format for XSETTINGS property %d", format);
+ }
+ else
+ client->settings = parse_settings (data, n_items);
+
+ XFree (data);
}
- else
- client->settings = parse_settings (data, n_items);
-
- XFree (data);
}
notify_changes (client, old_list);
{
if (client->manager_window && client->watch)
client->watch (client->manager_window, False, 0, client->cb_data);
-
- XGrabServer (client->display);
+
+ if (client->grab)
+ client->grab (client->display);
+ else
+ XGrabServer (client->display);
client->manager_window = XGetSelectionOwner (client->display,
client->selection_atom);
XSelectInput (client->display, client->manager_window,
PropertyChangeMask | StructureNotifyMask);
- XUngrabServer (client->display);
+ if (client->ungrab)
+ client->ungrab (client->display);
+ else
+ XUngrabServer (client->display);
+
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];
-
+ char *atom_names[3];
+ Atom atoms[3];
+
client = malloc (sizeof *client);
if (!client)
return NULL;
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);
- client->selection_atom = XInternAtom (display, buffer, False);
- client->xsettings_atom = XInternAtom (display, "_XSETTINGS_SETTINGS", False);
- client->manager_atom = XInternAtom (display, "MANAGER", False);
+ atom_names[0] = buffer;
+ atom_names[1] = "_XSETTINGS_SETTINGS";
+ 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];
/* Select on StructureNotify so we get MANAGER events
*/
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 (xev->xany.type == DestroyNotify)
{
check_manager_window (client);
- return True;
+ /* let GDK do its cleanup */
+ return False;
}
else if (xev->xany.type == PropertyNotify)
{
projects / ~andy / gtk / blobdiff