19117N/A/*
19117N/A * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
19117N/A *
19117N/A * Permission is hereby granted, free of charge, to any person obtaining a
19117N/A * copy of this software and associated documentation files (the "Software"),
19117N/A * to deal in the Software without restriction, including without limitation
19117N/A * the rights to use, copy, modify, merge, publish, distribute, sublicense,
19117N/A * and/or sell copies of the Software, and to permit persons to whom the
19117N/A * Software is furnished to do so, subject to the following conditions:
19117N/A *
19117N/A * The above copyright notice and this permission notice (including the next
19117N/A * paragraph) shall be included in all copies or substantial portions of the
19117N/A * Software.
19117N/A *
19117N/A * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19117N/A * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19117N/A * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
19117N/A * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19117N/A * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19117N/A * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
19117N/A * DEALINGS IN THE SOFTWARE.
19117N/A */
19117N/A
19117N/ACentralize atom handling and use XInternAtoms to get the atoms from
19117N/Athe server in one round trip instead of a separate synchronous/blocking
19117N/Around trip for each XInternAtom individual call.
19117N/A---
19117N/A driver/Makefile.in | 14 +++---
19117N/A driver/atoms.c | 113 +++++++++++++++++++++++++++++++++++++++++
19117N/A driver/atoms.h | 33 ++++++++++++
19117N/A driver/demo-Gtk.c | 26 ++-------
19117N/A driver/demo-Xm.c | 25 ++-------
19117N/A driver/remote.c | 4 +-
19117N/A driver/windows.c | 4 +-
19117N/A driver/xscreensaver-command.c | 35 ++-----------
19117N/A driver/xscreensaver.c | 45 ++++++-----------
19117N/A driver/xscreensaver.h | 3 -
19117N/A 10 files changed, 188 insertions(+), 114 deletions(-)
19117N/A create mode 100644 driver/atoms.c
19117N/A create mode 100644 driver/atoms.h
19117N/A
19117N/Adiff --git xscreensaver-5.12/driver/Makefile.in xscreensaver-5.12/driver/Makefile.in
19117N/A--- xscreensaver-5.12/driver/Makefile.in
19117N/A+++ xscreensaver-5.12/driver/Makefile.in
19117N/A@@ -190,18 +190,18 @@ SAVER_OBJS_1 = xscreensaver.o windows.o screens.o timers.o subprocs.o \
19117N/A exec.o xset.o splash.o setuid.o stderr.o mlstring.o
19117N/A
19117N/A SAVER_SRCS = $(SAVER_SRCS_1) prefs.c dpms.c $(LOCK_SRCS) \
19117N/A- $(SAVER_UTIL_SRCS) $(GL_SRCS)
19117N/A+ $(SAVER_UTIL_SRCS) $(GL_SRCS) atoms.c
19117N/A SAVER_OBJS = $(SAVER_OBJS_1) prefs.o dpms.o $(LOCK_OBJS) \
19117N/A- $(SAVER_UTIL_OBJS) $(GL_OBJS)
19117N/A+ $(SAVER_UTIL_OBJS) $(GL_OBJS) atoms.o
19117N/A
19117N/A-CMD_SRCS = remote.c xscreensaver-command.c
19117N/A-CMD_OBJS = remote.o xscreensaver-command.o
19117N/A+CMD_SRCS = remote.c atoms.c xscreensaver-command.c
19117N/A+CMD_OBJS = remote.o atoms.o xscreensaver-command.o
19117N/A
19117N/A DEMO_SRCS_1 = prefs.c dpms.c
19117N/A DEMO_OBJS_1 = prefs.o dpms.o
19117N/A
19117N/A-DEMO_SRCS = $(DEMO_SRCS_1) remote.c exec.c $(DEMO_UTIL_SRCS)
19117N/A-DEMO_OBJS = $(DEMO_OBJS_1) remote.o exec.o $(DEMO_UTIL_OBJS)
19117N/A+DEMO_SRCS = $(DEMO_SRCS_1) remote.c atoms.c exec.c $(DEMO_UTIL_SRCS)
19117N/A+DEMO_OBJS = $(DEMO_OBJS_1) remote.o atoms.o exec.o $(DEMO_UTIL_OBJS)
19117N/A
19117N/A PDF2JPEG_SRCS = pdf2jpeg.m
19117N/A PDF2JPEG_OBJS = pdf2jpeg.o
19117N/A@@ -231,7 +231,7 @@ SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@
19117N/A HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \
19117N/A xscreensaver.h prefs.h remote.h exec.h \
19117N/A demo-Gtk-widgets.h demo-Gtk-stubs.h demo-Gtk-support.h \
19117N/A- demo-Gtk-conf.h auth.h mlstring.h types.h
19117N/A+ demo-Gtk-conf.h auth.h mlstring.h types.h atoms.h
19117N/A MEN_1 = xscreensaver.man xscreensaver-demo.man \
19117N/A xscreensaver-command.man \
19117N/A xscreensaver-text.man \
19117N/Adiff --git xscreensaver-5.12/driver/atoms.c xscreensaver-5.12/driver/atoms.c
19117N/Anew file mode 100644
19117N/A--- /dev/null
19117N/A+++ xscreensaver-5.12/driver/atoms.c
19117N/A@@ -0,0 +1,113 @@
19117N/A+/* xscreensaver, Copyright (c) 1991-2010 Jamie Zawinski <jwz@jwz.org>
19117N/A+ *
19117N/A+ * Permission to use, copy, modify, distribute, and sell this software and its
19117N/A+ * documentation for any purpose is hereby granted without fee, provided that
19117N/A+ * the above copyright notice appear in all copies and that both that
19117N/A+ * copyright notice and this permission notice appear in supporting
19117N/A+ * documentation. No representations are made about the suitability of this
19117N/A+ * software for any purpose. It is provided "as is" without express or
19117N/A+ * implied warranty.
19117N/A+ */
19117N/A+
19117N/A+#ifdef HAVE_CONFIG_H
19117N/A+# include "config.h"
19117N/A+#endif
19117N/A+
19117N/A+#include <stdio.h>
19117N/A+#include <stdlib.h>
19117N/A+#include <sys/types.h>
19117N/A+
19117N/A+#include <X11/Xproto.h> /* for CARD32 */
19117N/A+#include <X11/Xlib.h>
19117N/A+#include <X11/Xos.h>
19117N/A+
19117N/A+#include "atoms.h"
19117N/A+
19117N/A+/* Atoms to retrieve info from remote daemon */
19117N/A+Atom XA_SCREENSAVER, XA_SCREENSAVER_ID, XA_SCREENSAVER_VERSION,
19117N/A+ XA_SCREENSAVER_RESPONSE, XA_SCREENSAVER_STATUS;
19117N/A+
19117N/A+/* Atoms to send commands to remote daemon */
19117N/A+Atom XA_ACTIVATE, XA_BLANK, XA_CYCLE, XA_DEACTIVATE, XA_DEMO,
19117N/A+ XA_EXIT, XA_LOCK, XA_NEXT, XA_PREFS, XA_PREV, XA_RESTART,
19117N/A+ XA_SELECT, XA_THROTTLE, XA_UNTHROTTLE;
19117N/A+
19117N/A+static const struct atom_request remote_control_atom_list[] =
19117N/A+{
19117N/A+ { &XA_SCREENSAVER, "SCREENSAVER" },
19117N/A+ { &XA_SCREENSAVER_ID, "_SCREENSAVER_ID" },
19117N/A+ { &XA_SCREENSAVER_VERSION, "_SCREENSAVER_VERSION" },
19117N/A+ { &XA_SCREENSAVER_RESPONSE, "_SCREENSAVER_RESPONSE" },
19117N/A+ { &XA_SCREENSAVER_STATUS, "_SCREENSAVER_STATUS" },
19117N/A+ { &XA_ACTIVATE, "ACTIVATE" },
19117N/A+ { &XA_BLANK, "BLANK" },
19117N/A+ { &XA_CYCLE, "CYCLE" },
19117N/A+ { &XA_DEACTIVATE, "DEACTIVATE" },
19117N/A+ { &XA_DEMO, "DEMO" },
19117N/A+ { &XA_EXIT, "EXIT" },
19117N/A+ { &XA_LOCK, "LOCK" },
19117N/A+ { &XA_NEXT, "NEXT" },
19117N/A+ { &XA_PREFS, "PREFS" },
19117N/A+ { &XA_PREV, "PREV" },
19117N/A+ { &XA_RESTART, "RESTART" },
19117N/A+ { &XA_SELECT, "SELECT" },
19117N/A+ { &XA_THROTTLE, "THROTTLE" },
19117N/A+ { &XA_UNTHROTTLE, "UNTHROTTLE" },
19117N/A+ { NULL, NULL } /* Must be last to terminate list */
19117N/A+};
19117N/A+
19117N/A+const struct atom_request *remote_control_atoms = remote_control_atom_list;
19117N/A+
19117N/A+/* Load a list of atoms in a single round trip to the X server instead of
19117N/A+ waiting for a synchronous round trip for each and every atom */
19117N/A+Status request_atoms ( Display *dpy,
19117N/A+ const struct atom_request **request_lists )
19117N/A+{
19117N/A+ int atom_count, n;
19117N/A+ Status result;
19117N/A+ const struct atom_request **l, *r;
19117N/A+ Atom *atoms;
19117N/A+ const char **names;
19117N/A+
19117N/A+ /* Count the number of items across all the lists passed in */
19117N/A+ atom_count = 0;
19117N/A+ for (l = request_lists; l != NULL && *l != NULL; l++)
19117N/A+ {
19117N/A+ for (r = *l; r != NULL && r->name != NULL; r++)
19117N/A+ {
19117N/A+ atom_count++;
19117N/A+ }
19117N/A+ }
19117N/A+
19117N/A+ atoms = calloc(atom_count, sizeof(Atom));
19117N/A+ names = calloc(atom_count, sizeof(char *));
19117N/A+ if (!atoms || !names)
19117N/A+ return -1;
19117N/A+
19117N/A+ n = 0;
19117N/A+ for (l = request_lists; l != NULL && *l != NULL; l++)
19117N/A+ {
19117N/A+ for (r = *l; r != NULL && r->name != NULL; r++)
19117N/A+ {
19117N/A+ names[n++] = r->name;
19117N/A+ }
19117N/A+ }
19117N/A+ result = XInternAtoms( dpy, (char **) names, atom_count, False, atoms );
19117N/A+
19117N/A+ n = 0;
19117N/A+ for (l = request_lists; l != NULL && *l != NULL; l++)
19117N/A+ {
19117N/A+ for (r = *l; r != NULL && r->name != NULL; r++)
19117N/A+ {
19117N/A+#if DEBUG_ATOMS
19117N/A+ fprintf (stderr, "atom: %s => %d\n", names[n], atoms[n]);
19117N/A+#endif
19117N/A+ *(r->atomp) = atoms[n++];
19117N/A+ }
19117N/A+ }
19117N/A+
19117N/A+ free(atoms);
19117N/A+ free(names);
19117N/A+
19117N/A+ return result;
19117N/A+}
19117N/Adiff --git xscreensaver-5.12/driver/atoms.h xscreensaver-5.12/driver/atoms.h
19117N/Anew file mode 100644
19117N/A--- /dev/null
19117N/A+++ xscreensaver-5.12/driver/atoms.h
19117N/A@@ -0,0 +1,33 @@
19117N/A+/* xscreensaver, Copyright (c) 1991-2010 Jamie Zawinski <jwz@jwz.org>
19117N/A+ *
19117N/A+ * Permission to use, copy, modify, distribute, and sell this software and its
19117N/A+ * documentation for any purpose is hereby granted without fee, provided that
19117N/A+ * the above copyright notice appear in all copies and that both that
19117N/A+ * copyright notice and this permission notice appear in supporting
19117N/A+ * documentation. No representations are made about the suitability of this
19117N/A+ * software for any purpose. It is provided "as is" without express or
19117N/A+ * implied warranty.
19117N/A+ */
19117N/A+
19117N/A+#ifndef _XSCREENSAVER_ATOMS_H_
19117N/A+#define _XSCREENSAVER_ATOMS_H_
19117N/A+
19117N/A+struct atom_request {
19117N/A+ Atom *atomp;
19117N/A+ const char *name;
19117N/A+};
19117N/A+
19117N/A+extern const struct atom_request *remote_control_atoms;
19117N/A+extern Status request_atoms ( Display *dpy,
19117N/A+ const struct atom_request **request_lists );
19117N/A+
19117N/A+/* Atoms to retrieve info from remote daemon */
19117N/A+extern Atom XA_SCREENSAVER, XA_SCREENSAVER_ID, XA_SCREENSAVER_VERSION,
19117N/A+ XA_SCREENSAVER_RESPONSE, XA_SCREENSAVER_STATUS;
19117N/A+
19117N/A+/* Atoms to send commands to remote daemon */
19117N/A+extern Atom XA_ACTIVATE, XA_BLANK, XA_CYCLE, XA_DEACTIVATE, XA_DEMO,
19117N/A+ XA_EXIT, XA_LOCK, XA_NEXT, XA_PREFS, XA_PREV, XA_RESTART,
19117N/A+ XA_SELECT, XA_THROTTLE, XA_UNTHROTTLE;
19117N/A+
19117N/A+#endif /* _XSCREENSAVER_ATOMS_H_ */
19117N/Adiff --git xscreensaver-5.12/driver/demo-Gtk.c xscreensaver-5.12/driver/demo-Gtk.c
19117N/A--- xscreensaver-5.12/driver/demo-Gtk.c
19117N/A+++ xscreensaver-5.12/driver/demo-Gtk.c
19117N/A@@ -118,6 +118,7 @@
19117N/A #include "resources.h" /* for parse_time() */
19117N/A #include "visual.h" /* for has_writable_cells() */
19117N/A #include "remote.h" /* for xscreensaver_command() */
19117N/A+#include "atoms.h"
19117N/A #include "usleep.h"
19117N/A
19117N/A #include "logo-50.xpm"
19117N/A@@ -252,12 +253,6 @@ typedef struct {
19117N/A a closure object of our own down into the various widget callbacks. */
19117N/A static state *global_state_kludge;
19117N/A
19117N/A-Atom XA_VROOT;
19117N/A-Atom XA_SCREENSAVER, XA_SCREENSAVER_RESPONSE, XA_SCREENSAVER_VERSION;
19117N/A-Atom XA_SCREENSAVER_ID, XA_SCREENSAVER_STATUS, XA_SELECT, XA_DEMO;
19117N/A-Atom XA_ACTIVATE, XA_BLANK, XA_LOCK, XA_RESTART, XA_EXIT;
19117N/A-
19117N/A-
19117N/A static void populate_demo_window (state *, int list_elt);
19117N/A static void populate_prefs_page (state *);
19117N/A static void populate_popup_window (state *);
19117N/A@@ -5032,20 +5027,11 @@ main (int argc, char **argv)
19117N/A
19117N/A /* Intern the atoms that xscreensaver_command() needs.
19117N/A */
19117N/A- XA_VROOT = XInternAtom (dpy, "__SWM_VROOT", False);
19117N/A- XA_SCREENSAVER = XInternAtom (dpy, "SCREENSAVER", False);
19117N/A- XA_SCREENSAVER_VERSION = XInternAtom (dpy, "_SCREENSAVER_VERSION",False);
19117N/A- XA_SCREENSAVER_STATUS = XInternAtom (dpy, "_SCREENSAVER_STATUS", False);
19117N/A- XA_SCREENSAVER_ID = XInternAtom (dpy, "_SCREENSAVER_ID", False);
19117N/A- XA_SCREENSAVER_RESPONSE = XInternAtom (dpy, "_SCREENSAVER_RESPONSE", False);
19117N/A- XA_SELECT = XInternAtom (dpy, "SELECT", False);
19117N/A- XA_DEMO = XInternAtom (dpy, "DEMO", False);
19117N/A- XA_ACTIVATE = XInternAtom (dpy, "ACTIVATE", False);
19117N/A- XA_BLANK = XInternAtom (dpy, "BLANK", False);
19117N/A- XA_LOCK = XInternAtom (dpy, "LOCK", False);
19117N/A- XA_EXIT = XInternAtom (dpy, "EXIT", False);
19117N/A- XA_RESTART = XInternAtom (dpy, "RESTART", False);
19117N/A-
19117N/A+ {
19117N/A+ const struct atom_request *atom_lists[2] = { NULL, NULL };
19117N/A+ atom_lists[0] = remote_control_atoms;
19117N/A+ request_atoms (dpy, atom_lists);
19117N/A+ }
19117N/A
19117N/A /* Create the window and all its widgets.
19117N/A */
19117N/Adiff --git xscreensaver-5.12/driver/demo-Xm.c xscreensaver-5.12/driver/demo-Xm.c
19117N/A--- xscreensaver-5.12/driver/demo-Xm.c
19117N/A+++ xscreensaver-5.12/driver/demo-Xm.c
19117N/A@@ -82,6 +82,7 @@
19117N/A #include "resources.h" /* for parse_time() */
19117N/A #include "visual.h" /* for has_writable_cells() */
19117N/A #include "remote.h" /* for xscreensaver_command() */
19117N/A+#include "atoms.h"
19117N/A #include "usleep.h"
19117N/A
19117N/A #include <stdio.h>
19117N/A@@ -110,12 +111,6 @@ extern const char *visual_menu[];
19117N/A
19117N/A static char *short_version = 0;
19117N/A
19117N/A-Atom XA_VROOT;
19117N/A-Atom XA_SCREENSAVER, XA_SCREENSAVER_RESPONSE, XA_SCREENSAVER_VERSION;
19117N/A-Atom XA_SCREENSAVER_ID, XA_SCREENSAVER_STATUS, XA_SELECT, XA_DEMO;
19117N/A-Atom XA_ACTIVATE, XA_BLANK, XA_LOCK, XA_RESTART, XA_EXIT;
19117N/A-
19117N/A-
19117N/A static void populate_demo_window (Widget toplevel,
19117N/A int which, prefs_pair *pair);
19117N/A static void populate_prefs_page (Widget top, prefs_pair *pair);
19117N/A@@ -1791,19 +1786,11 @@ main (int argc, char **argv)
19117N/A
19117N/A /* Intern the atoms that xscreensaver_command() needs.
19117N/A */
19117N/A- XA_VROOT = XInternAtom (dpy, "__SWM_VROOT", False);
19117N/A- XA_SCREENSAVER = XInternAtom (dpy, "SCREENSAVER", False);
19117N/A- XA_SCREENSAVER_VERSION = XInternAtom (dpy, "_SCREENSAVER_VERSION",False);
19117N/A- XA_SCREENSAVER_STATUS = XInternAtom (dpy, "_SCREENSAVER_STATUS", False);
19117N/A- XA_SCREENSAVER_ID = XInternAtom (dpy, "_SCREENSAVER_ID", False);
19117N/A- XA_SCREENSAVER_RESPONSE = XInternAtom (dpy, "_SCREENSAVER_RESPONSE", False);
19117N/A- XA_SELECT = XInternAtom (dpy, "SELECT", False);
19117N/A- XA_DEMO = XInternAtom (dpy, "DEMO", False);
19117N/A- XA_ACTIVATE = XInternAtom (dpy, "ACTIVATE", False);
19117N/A- XA_BLANK = XInternAtom (dpy, "BLANK", False);
19117N/A- XA_LOCK = XInternAtom (dpy, "LOCK", False);
19117N/A- XA_EXIT = XInternAtom (dpy, "EXIT", False);
19117N/A- XA_RESTART = XInternAtom (dpy, "RESTART", False);
19117N/A+ {
19117N/A+ const struct atom_request *atom_lists[2] = { NULL, NULL };
19117N/A+ atom_lists[0] = remote_control_atoms;
19117N/A+ request_atoms (dpy, atom_lists);
19117N/A+ }
19117N/A
19117N/A /* Create the window and all its widgets.
19117N/A */
19117N/Adiff --git xscreensaver-5.12/driver/remote.c xscreensaver-5.12/driver/remote.c
19117N/A--- xscreensaver-5.12/driver/remote.c
19117N/A+++ xscreensaver-5.12/driver/remote.c
19117N/A@@ -34,15 +34,13 @@
19117N/A #include <X11/Xos.h>
19117N/A
19117N/A #include "remote.h"
19117N/A+#include "atoms.h"
19117N/A
19117N/A #ifdef _VROOT_H_
19117N/A ERROR! you must not include vroot.h in this file
19117N/A #endif
19117N/A
19117N/A extern char *progname;
19117N/A-extern Atom XA_SCREENSAVER, XA_SCREENSAVER_VERSION, XA_SCREENSAVER_RESPONSE;
19117N/A-extern Atom XA_SCREENSAVER_ID, XA_SCREENSAVER_STATUS, XA_EXIT;
19117N/A-extern Atom XA_VROOT, XA_SELECT, XA_DEMO, XA_BLANK, XA_LOCK;
19117N/A
19117N/A
19117N/A static XErrorHandler old_handler = 0;
19117N/Adiff --git xscreensaver-5.12/driver/windows.c xscreensaver-5.12/driver/windows.c
19117N/A--- xscreensaver-5.12/driver/windows.c
19117N/A+++ xscreensaver-5.12/driver/windows.c
19117N/A@@ -69,14 +69,12 @@ typedef long PROP32;
19117N/A #include "xscreensaver.h"
19117N/A #include "visual.h"
19117N/A #include "fade.h"
19117N/A+#include "atoms.h"
19117N/A
19117N/A
19117N/A extern int kill (pid_t, int); /* signal() is in sys/signal.h... */
19117N/A
19117N/A Atom XA_VROOT, XA_XSETROOT_ID, XA_ESETROOT_PMAP_ID, XA_XROOTPMAP_ID;
19117N/A-Atom XA_SCREENSAVER, XA_SCREENSAVER_VERSION, XA_SCREENSAVER_ID;
19117N/A-Atom XA_SCREENSAVER_STATUS;
19117N/A-
19117N/A
19117N/A extern saver_info *global_si_kludge; /* I hate C so much... */
19117N/A
19117N/Adiff --git xscreensaver-5.12/driver/xscreensaver-command.c xscreensaver-5.12/driver/xscreensaver-command.c
19117N/A--- xscreensaver-5.12/driver/xscreensaver-command.c
19117N/A+++ xscreensaver-5.12/driver/xscreensaver-command.c
19117N/A@@ -40,6 +40,7 @@
19117N/A typedef long PROP32;
19117N/A
19117N/A #include "remote.h"
19117N/A+#include "atoms.h"
19117N/A #include "version.h"
19117N/A
19117N/A #ifdef _VROOT_H_
19117N/A@@ -48,13 +49,6 @@ ERROR! you must not include vroot.h in this file
19117N/A
19117N/A char *progname;
19117N/A
19117N/A-Atom XA_VROOT;
19117N/A-Atom XA_SCREENSAVER, XA_SCREENSAVER_VERSION, XA_SCREENSAVER_RESPONSE;
19117N/A-Atom XA_SCREENSAVER_ID, XA_SCREENSAVER_STATUS, XA_SELECT, XA_DEMO, XA_EXIT;
19117N/A-Atom XA_BLANK, XA_LOCK;
19117N/A-static Atom XA_ACTIVATE, XA_DEACTIVATE, XA_CYCLE, XA_NEXT, XA_PREV;
19117N/A-static Atom XA_RESTART, XA_PREFS, XA_THROTTLE, XA_UNTHROTTLE;
19117N/A-
19117N/A static char *screensaver_version;
19117N/A # ifdef __GNUC__
19117N/A __extension__ /* don't warn about "string length is greater than the
19117N/A@@ -285,28 +279,11 @@ main (int argc, char **argv)
19117N/A exit (1);
19117N/A }
19117N/A
19117N/A- XA_VROOT = XInternAtom (dpy, "__SWM_VROOT", False);
19117N/A- XA_SCREENSAVER = XInternAtom (dpy, "SCREENSAVER", False);
19117N/A- XA_SCREENSAVER_ID = XInternAtom (dpy, "_SCREENSAVER_ID", False);
19117N/A- XA_SCREENSAVER_VERSION = XInternAtom (dpy, "_SCREENSAVER_VERSION",False);
19117N/A- XA_SCREENSAVER_STATUS = XInternAtom (dpy, "_SCREENSAVER_STATUS", False);
19117N/A- XA_SCREENSAVER_RESPONSE = XInternAtom (dpy, "_SCREENSAVER_RESPONSE", False);
19117N/A- XA_ACTIVATE = XInternAtom (dpy, "ACTIVATE", False);
19117N/A- XA_DEACTIVATE = XInternAtom (dpy, "DEACTIVATE", False);
19117N/A- XA_RESTART = XInternAtom (dpy, "RESTART", False);
19117N/A- XA_CYCLE = XInternAtom (dpy, "CYCLE", False);
19117N/A- XA_NEXT = XInternAtom (dpy, "NEXT", False);
19117N/A- XA_PREV = XInternAtom (dpy, "PREV", False);
19117N/A- XA_SELECT = XInternAtom (dpy, "SELECT", False);
19117N/A- XA_EXIT = XInternAtom (dpy, "EXIT", False);
19117N/A- XA_DEMO = XInternAtom (dpy, "DEMO", False);
19117N/A- XA_PREFS = XInternAtom (dpy, "PREFS", False);
19117N/A- XA_LOCK = XInternAtom (dpy, "LOCK", False);
19117N/A- XA_BLANK = XInternAtom (dpy, "BLANK", False);
19117N/A- XA_THROTTLE = XInternAtom (dpy, "THROTTLE", False);
19117N/A- XA_UNTHROTTLE = XInternAtom (dpy, "UNTHROTTLE", False);
19117N/A-
19117N/A- XSync (dpy, 0);
19117N/A+ {
19117N/A+ const struct atom_request *atom_lists[2] = { NULL, NULL };
19117N/A+ atom_lists[0] = remote_control_atoms;
19117N/A+ request_atoms (dpy, atom_lists);
19117N/A+ }
19117N/A
19117N/A if (cmd == &XA_WATCH)
19117N/A {
19117N/Adiff --git xscreensaver-5.12/driver/xscreensaver.c xscreensaver-5.12/driver/xscreensaver.c
19117N/A--- xscreensaver-5.12/driver/xscreensaver.c
19117N/A+++ xscreensaver-5.12/driver/xscreensaver.c
19117N/A@@ -224,6 +224,7 @@
19117N/A #include "visual.h"
19117N/A #include "usleep.h"
19117N/A #include "auth.h"
19117N/A+#include "atoms.h"
19117N/A
19117N/A saver_info *global_si_kludge = 0; /* I hate C so much... */
19117N/A
19117N/A@@ -232,12 +233,6 @@ char *progclass = 0;
19117N/A XrmDatabase db = 0;
19117N/A
19117N/A
19117N/A-static Atom XA_SCREENSAVER_RESPONSE;
19117N/A-static Atom XA_ACTIVATE, XA_DEACTIVATE, XA_CYCLE, XA_NEXT, XA_PREV;
19117N/A-static Atom XA_RESTART, XA_SELECT;
19117N/A-static Atom XA_THROTTLE, XA_UNTHROTTLE;
19117N/A-Atom XA_DEMO, XA_PREFS, XA_EXIT, XA_LOCK, XA_BLANK;
19117N/A-
19117N/A
19117N/A static XrmOptionDescRec options [] = {
19117N/A
19117N/A@@ -628,30 +623,20 @@ connect_to_server (saver_info *si, int *argc, char **argv)
19117N/A
19117N/A db = si->prefs.db; /* resources.c needs this */
19117N/A
19117N/A- XA_VROOT = XInternAtom (si->dpy, "__SWM_VROOT", False);
19117N/A- XA_SCREENSAVER = XInternAtom (si->dpy, "SCREENSAVER", False);
19117N/A- XA_SCREENSAVER_VERSION = XInternAtom (si->dpy, "_SCREENSAVER_VERSION",False);
19117N/A- XA_SCREENSAVER_ID = XInternAtom (si->dpy, "_SCREENSAVER_ID", False);
19117N/A- XA_SCREENSAVER_STATUS = XInternAtom (si->dpy, "_SCREENSAVER_STATUS", False);
19117N/A- XA_SCREENSAVER_RESPONSE = XInternAtom (si->dpy, "_SCREENSAVER_RESPONSE",
19117N/A- False);
19117N/A- XA_XSETROOT_ID = XInternAtom (si->dpy, "_XSETROOT_ID", False);
19117N/A- XA_ESETROOT_PMAP_ID = XInternAtom (si->dpy, "ESETROOT_PMAP_ID", False);
19117N/A- XA_XROOTPMAP_ID = XInternAtom (si->dpy, "_XROOTPMAP_ID", False);
19117N/A- XA_ACTIVATE = XInternAtom (si->dpy, "ACTIVATE", False);
19117N/A- XA_DEACTIVATE = XInternAtom (si->dpy, "DEACTIVATE", False);
19117N/A- XA_RESTART = XInternAtom (si->dpy, "RESTART", False);
19117N/A- XA_CYCLE = XInternAtom (si->dpy, "CYCLE", False);
19117N/A- XA_NEXT = XInternAtom (si->dpy, "NEXT", False);
19117N/A- XA_PREV = XInternAtom (si->dpy, "PREV", False);
19117N/A- XA_SELECT = XInternAtom (si->dpy, "SELECT", False);
19117N/A- XA_EXIT = XInternAtom (si->dpy, "EXIT", False);
19117N/A- XA_DEMO = XInternAtom (si->dpy, "DEMO", False);
19117N/A- XA_PREFS = XInternAtom (si->dpy, "PREFS", False);
19117N/A- XA_LOCK = XInternAtom (si->dpy, "LOCK", False);
19117N/A- XA_BLANK = XInternAtom (si->dpy, "BLANK", False);
19117N/A- XA_THROTTLE = XInternAtom (si->dpy, "THROTTLE", False);
19117N/A- XA_UNTHROTTLE = XInternAtom (si->dpy, "UNTHROTTLE", False);
19117N/A+ {
19117N/A+ const struct atom_request root_atoms[] =
19117N/A+ {
19117N/A+ { &XA_VROOT, "__SWM_VROOT" },
19117N/A+ { &XA_XSETROOT_ID, "_XSETROOT_ID" },
19117N/A+ { &XA_ESETROOT_PMAP_ID, "ESETROOT_PMAP_ID" },
19117N/A+ { &XA_XROOTPMAP_ID, "_XROOTPMAP_ID" },
19117N/A+ { NULL, NULL } /* Must be last to terminate list */
19117N/A+ };
19117N/A+ const struct atom_request *atom_lists[3] = { NULL, NULL, NULL };
19117N/A+ atom_lists[0] = remote_control_atoms;
19117N/A+ atom_lists[1] = root_atoms;
19117N/A+ request_atoms (si->dpy, atom_lists);
19117N/A+ }
19117N/A
19117N/A return toplevel_shell;
19117N/A }
19117N/Adiff --git xscreensaver-5.12/driver/xscreensaver.h xscreensaver-5.12/driver/xscreensaver.h
19117N/A--- xscreensaver-5.12/driver/xscreensaver.h
19117N/A+++ xscreensaver-5.12/driver/xscreensaver.h
19117N/A@@ -200,8 +200,5 @@ Bool safe_XF86VidModeGetViewPort (Display *, int, int *, int *);
19117N/A #endif /* HAVE_XF86VMODE */
19117N/A
19117N/A extern Atom XA_VROOT, XA_XSETROOT_ID, XA_ESETROOT_PMAP_ID, XA_XROOTPMAP_ID;
19117N/A-extern Atom XA_SCREENSAVER, XA_SCREENSAVER_VERSION, XA_SCREENSAVER_ID;
19117N/A-extern Atom XA_SCREENSAVER_STATUS, XA_LOCK, XA_BLANK;
19117N/A-extern Atom XA_DEMO, XA_PREFS;
19117N/A
19117N/A #endif /* __XSCREENSAVER_H__ */
19117N/A