[PATCH] Remove unused function from sn-xutils
Julien Danjou
julien at danjou.info
Thu Jan 29 06:37:35 PST 2009
Signed-off-by: Julien Danjou <julien at danjou.info>
---
libsn/sn-xutils.c | 412 -----------------------------------------------------
libsn/sn-xutils.h | 54 -------
2 files changed, 0 insertions(+), 466 deletions(-)
diff --git a/libsn/sn-xutils.c b/libsn/sn-xutils.c
index ef7f7a1..b40b305 100644
--- a/libsn/sn-xutils.c
+++ b/libsn/sn-xutils.c
@@ -52,415 +52,3 @@ sn_internal_set_utf8_string (SnDisplay *display,
sn_display_error_trap_pop (display);
}
-
-void
-sn_internal_set_string (SnDisplay *display,
- Window xwindow,
- const char *property,
- const char *str)
-{
- sn_display_error_trap_push (display);
-
- XChangeProperty (sn_display_get_x_display (display),
- xwindow,
- sn_internal_atom_get (display, property),
- XA_STRING,
- 8, PropModeReplace, (unsigned char*) str,
- strlen (str));
-
- sn_display_error_trap_pop (display);
-}
-
-void
-sn_internal_set_cardinal (SnDisplay *display,
- Window xwindow,
- const char *property,
- int val)
-{
- unsigned long long_val = val;
-
- sn_display_error_trap_push (display);
-
- XChangeProperty (sn_display_get_x_display (display),
- xwindow,
- sn_internal_atom_get (display, property),
- XA_CARDINAL,
- 32, PropModeReplace, (unsigned char*) &long_val, 1);
-
- sn_display_error_trap_pop (display);
-}
-
-void
-sn_internal_set_window (SnDisplay *display,
- Window xwindow,
- const char *property,
- Window val)
-{
- sn_display_error_trap_push (display);
-
- XChangeProperty (sn_display_get_x_display (display),
- xwindow,
- sn_internal_atom_get (display, property),
- XA_WINDOW,
- 32, PropModeReplace, (unsigned char*) &val, 1);
-
- sn_display_error_trap_pop (display);
-}
-
-void
-sn_internal_set_cardinal_list (SnDisplay *display,
- Window xwindow,
- const char *property,
- int *vals,
- int n_vals)
-{
- sn_display_error_trap_push (display);
-
- XChangeProperty (sn_display_get_x_display (display),
- xwindow,
- sn_internal_atom_get (display, property),
- XA_CARDINAL,
- 32, PropModeReplace, (unsigned char*) vals, n_vals);
-
- sn_display_error_trap_pop (display);
-}
-
-void
-sn_internal_set_atom_list (SnDisplay *display,
- Window xwindow,
- const char *property,
- Atom *vals,
- int n_vals)
-{
- sn_display_error_trap_push (display);
-
- XChangeProperty (sn_display_get_x_display (display),
- xwindow,
- sn_internal_atom_get (display, property),
- XA_ATOM,
- 32, PropModeReplace, (unsigned char*) vals, n_vals);
-
- sn_display_error_trap_pop (display);
-}
-
-sn_bool_t
-sn_internal_get_cardinal (SnDisplay *display,
- Window xwindow,
- const char *property,
- int *val)
-{
- Atom type;
- int format;
- unsigned long nitems;
- unsigned long bytes_after;
- unsigned long *num;
- int result;
-
- *val = 0;
-
- sn_display_error_trap_push (display);
- type = None;
- num = NULL;
- result = XGetWindowProperty (sn_display_get_x_display (display),
- xwindow,
- sn_internal_atom_get (display, property),
- 0, 256, /* 256 = random number */
- False, XA_CARDINAL, &type, &format, &nitems,
- &bytes_after, (unsigned char **)&num);
- sn_display_error_trap_pop (display);
- if (result != Success || num == NULL || nitems == 0)
- {
- if (num)
- XFree (num);
- return FALSE;
- }
-
- if (type != XA_CARDINAL)
- {
- XFree (num);
- return FALSE;
- }
-
- *val = *num;
- XFree (num);
-
- return TRUE;
-}
-
-sn_bool_t
-sn_internal_get_utf8_string (SnDisplay *display,
- Window xwindow,
- const char *property,
- char **val)
-{
- Atom type;
- int format;
- unsigned long nitems;
- unsigned long bytes_after;
- char *str;
- int result;
- Atom utf8_string;
-
- utf8_string = sn_internal_atom_get (display, "UTF8_STRING");
-
- *val = NULL;
-
- sn_display_error_trap_push (display);
- type = None;
- str = NULL;
- result = XGetWindowProperty (sn_display_get_x_display (display),
- xwindow,
- sn_internal_atom_get (display, property),
- 0, 20000, /* 20000 = random number */
- False,
- utf8_string,
- &type, &format, &nitems,
- &bytes_after, (unsigned char **)&str);
- sn_display_error_trap_pop (display);
- if (result != Success || str == NULL)
- {
- if (str)
- XFree (str);
- return FALSE;
- }
-
- if (type != utf8_string ||
- format != 8 ||
- nitems == 0)
- {
- XFree (str);
- return FALSE;
- }
-
- if (!sn_internal_utf8_validate (str, nitems))
- {
- fprintf (stderr, "Warning: invalid UTF-8 in property %s on window 0x%lx\n",
- property, xwindow);
- XFree (str);
- return FALSE;
- }
-
- *val = sn_internal_strdup (str);
- XFree (str);
-
- return TRUE;
-}
-
-sn_bool_t
-sn_internal_get_string (SnDisplay *display,
- Window xwindow,
- const char *property,
- char **val)
-{
- Atom type;
- int format;
- unsigned long nitems;
- unsigned long bytes_after;
- char *str;
- int result;
-
- *val = NULL;
-
- sn_display_error_trap_push (display);
- type = None;
- str = NULL;
- result = XGetWindowProperty (sn_display_get_x_display (display),
- xwindow,
- sn_internal_atom_get (display, property),
- 0, 20000, /* 20000 = random number */
- False,
- XA_STRING,
- &type, &format, &nitems,
- &bytes_after, (unsigned char **)&str);
- sn_display_error_trap_pop (display);
- if (result != Success || str == NULL)
- {
- if (str)
- XFree (str);
- return FALSE;
- }
-
- if (type != XA_STRING ||
- format != 8 ||
- nitems == 0)
- {
- XFree (str);
- return FALSE;
- }
-
- *val = sn_internal_strdup (str);
- XFree (str);
-
- return TRUE;
-}
-
-sn_bool_t
-sn_internal_get_window (SnDisplay *display,
- Window xwindow,
- const char *property,
- Window *val)
-{
- Atom type;
- int format;
- unsigned long nitems;
- unsigned long bytes_after;
- Window *win;
- int result;
-
- *val = 0;
-
- sn_display_error_trap_push (display);
- type = None;
- win = NULL;
- result = XGetWindowProperty (sn_display_get_x_display (display),
- xwindow,
- sn_internal_atom_get (display, property),
- 0, 256, /* 256 = random number */
- False, XA_WINDOW, &type, &format, &nitems,
- &bytes_after, (unsigned char **)&win);
- sn_display_error_trap_pop (display);
- if (result != Success || win == NULL || nitems == 0)
- {
- if (win)
- XFree (win);
- return FALSE;
- }
-
- if (type != XA_WINDOW)
- {
- XFree (win);
- return FALSE;
- }
-
- *val = *win;
- XFree (win);
-
- return TRUE;
-}
-
-sn_bool_t
-sn_internal_get_atom_list (SnDisplay *display,
- Window xwindow,
- const char *property,
- Atom **atoms,
- int *n_atoms)
-{
- Atom type;
- int format;
- unsigned long nitems;
- unsigned long bytes_after;
- Atom *data;
- int result;
-
- *atoms = NULL;
- *n_atoms = 0;
- data = NULL;
-
- sn_display_error_trap_push (display);
- type = None;
- result = XGetWindowProperty (sn_display_get_x_display (display),
- xwindow,
- sn_internal_atom_get (display, property),
- 0, 1000, /* 1000 = random number */
- False, XA_ATOM, &type, &format, &nitems,
- &bytes_after, (unsigned char **)&data);
- sn_display_error_trap_pop (display);
- if (result != Success || data == NULL)
- {
- if (data)
- XFree (data);
- return FALSE;
- }
-
- if (type != XA_ATOM)
- {
- XFree (data);
- return FALSE;
- }
-
- *atoms = sn_new (Atom, nitems);
- memcpy (*atoms, data, sizeof (Atom) * nitems);
- *n_atoms = nitems;
-
- XFree (data);
-
- return TRUE;
-}
-
-sn_bool_t
-sn_internal_get_cardinal_list (SnDisplay *display,
- Window xwindow,
- const char *property,
- int **vals,
- int *n_vals)
-{
- Atom type;
- int format;
- unsigned long nitems;
- unsigned long bytes_after;
- unsigned long *nums;
- int result;
- int i;
-
- *vals = NULL;
- *n_vals = 0;
- nums = NULL;
-
- sn_display_error_trap_push (display);
- type = None;
- result = XGetWindowProperty (sn_display_get_x_display (display),
- xwindow,
- sn_internal_atom_get (display, property),
- 0, 1000, /* 1000 = random number */
- False, XA_CARDINAL, &type, &format, &nitems,
- &bytes_after, (unsigned char **)&nums);
- sn_display_error_trap_pop (display);
- if (result != Success || nums == NULL)
- {
- if (nums)
- XFree (nums);
- return FALSE;
- }
-
- if (type != XA_CARDINAL)
- {
- XFree (nums);
- return FALSE;
- }
-
- *vals = sn_new (int, nitems);
- *n_vals = nitems;
- i = 0;
- while (i < *n_vals)
- {
- (*vals)[i] = nums[i];
- ++i;
- }
-
- XFree (nums);
-
- return TRUE;
-}
-
-void
-sn_internal_send_event_all_screens (SnDisplay *display,
- unsigned long mask,
- XEvent *xevent)
-{
- int i;
- Display *xdisplay;
-
- xdisplay = sn_display_get_x_display (display);
-
- i = 0;
- while (sn_internal_display_get_x_screen (display, i) != NULL)
- {
- XSendEvent (xdisplay,
- RootWindow (xdisplay, i),
- False,
- mask,
- xevent);
-
- ++i;
- }
-}
diff --git a/libsn/sn-xutils.h b/libsn/sn-xutils.h
index 6e4ee13..b28bb36 100644
--- a/libsn/sn-xutils.h
+++ b/libsn/sn-xutils.h
@@ -35,60 +35,6 @@ void sn_internal_set_utf8_string (SnDisplay *display,
Window xwindow,
const char *property,
const char *str);
-void sn_internal_set_string (SnDisplay *display,
- Window xwindow,
- const char *property,
- const char *str);
-void sn_internal_set_cardinal (SnDisplay *display,
- Window xwindow,
- const char *property,
- int val);
-void sn_internal_set_window (SnDisplay *display,
- Window xwindow,
- const char *property,
- Window val);
-void sn_internal_set_cardinal_list (SnDisplay *display,
- Window xwindow,
- const char *property,
- int *vals,
- int n_vals);
-void sn_internal_set_atom_list (SnDisplay *display,
- Window xwindow,
- const char *property,
- Atom *vals,
- int n_vals);
-
-
-sn_bool_t sn_internal_get_utf8_string (SnDisplay *display,
- Window xwindow,
- const char *property,
- char **val);
-sn_bool_t sn_internal_get_string (SnDisplay *display,
- Window xwindow,
- const char *property,
- char **val);
-sn_bool_t sn_internal_get_cardinal (SnDisplay *display,
- Window xwindow,
- const char *property,
- int *val);
-sn_bool_t sn_internal_get_window (SnDisplay *display,
- Window xwindow,
- const char *property,
- Window *val);
-sn_bool_t sn_internal_get_atom_list (SnDisplay *display,
- Window xwindow,
- const char *property,
- Atom **atoms,
- int *n_atoms);
-sn_bool_t sn_internal_get_cardinal_list (SnDisplay *display,
- Window xwindow,
- const char *property,
- int **vals,
- int *n_vals);
-
-void sn_internal_send_event_all_screens (SnDisplay *display,
- unsigned long mask,
- XEvent *xevent);
SN_END_DECLS
--
1.5.6.5
More information about the xdg
mailing list