xscreensaver-05-atoms.diff revision 19117
14ea4bb737263733ad80a36b4f73f681c30a6b45sd * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
14ea4bb737263733ad80a36b4f73f681c30a6b45sd * Permission is hereby granted, free of charge, to any person obtaining a
14ea4bb737263733ad80a36b4f73f681c30a6b45sd * copy of this software and associated documentation files (the "Software"),
14ea4bb737263733ad80a36b4f73f681c30a6b45sd * to deal in the Software without restriction, including without limitation
14ea4bb737263733ad80a36b4f73f681c30a6b45sd * the rights to use, copy, modify, merge, publish, distribute, sublicense,
14ea4bb737263733ad80a36b4f73f681c30a6b45sd * and/or sell copies of the Software, and to permit persons to whom the
14ea4bb737263733ad80a36b4f73f681c30a6b45sd * Software is furnished to do so, subject to the following conditions:
14ea4bb737263733ad80a36b4f73f681c30a6b45sd * The above copyright notice and this permission notice (including the next
14ea4bb737263733ad80a36b4f73f681c30a6b45sd * paragraph) shall be included in all copies or substantial portions of the
14ea4bb737263733ad80a36b4f73f681c30a6b45sd * Software.
14ea4bb737263733ad80a36b4f73f681c30a6b45sd * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14ea4bb737263733ad80a36b4f73f681c30a6b45sd * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
14ea4bb737263733ad80a36b4f73f681c30a6b45sd * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
14ea4bb737263733ad80a36b4f73f681c30a6b45sd * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
14ea4bb737263733ad80a36b4f73f681c30a6b45sd * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
14ea4bb737263733ad80a36b4f73f681c30a6b45sd * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
14ea4bb737263733ad80a36b4f73f681c30a6b45sd * DEALINGS IN THE SOFTWARE.
14ea4bb737263733ad80a36b4f73f681c30a6b45sdCentralize atom handling and use XInternAtoms to get the atoms from
14ea4bb737263733ad80a36b4f73f681c30a6b45sdthe server in one round trip instead of a separate synchronous/blocking
535ec645ca371f1ce298eaf76bf8feb73494f923dduvall driver/atoms.c | 113 +++++++++++++++++++++++++++++++++++++++++
14ea4bb737263733ad80a36b4f73f681c30a6b45sddiff --git xscreensaver-5.12/driver/Makefile.in xscreensaver-5.12/driver/Makefile.in
14ea4bb737263733ad80a36b4f73f681c30a6b45sd@@ -190,18 +190,18 @@ SAVER_OBJS_1 = xscreensaver.o windows.o screens.o timers.o subprocs.o \
14ea4bb737263733ad80a36b4f73f681c30a6b45sd SAVER_SRCS = $(SAVER_SRCS_1) prefs.c dpms.c $(LOCK_SRCS) \
14ea4bb737263733ad80a36b4f73f681c30a6b45sd SAVER_OBJS = $(SAVER_OBJS_1) prefs.o dpms.o $(LOCK_OBJS) \
14ea4bb737263733ad80a36b4f73f681c30a6b45sd-DEMO_SRCS = $(DEMO_SRCS_1) remote.c exec.c $(DEMO_UTIL_SRCS)
14ea4bb737263733ad80a36b4f73f681c30a6b45sd-DEMO_OBJS = $(DEMO_OBJS_1) remote.o exec.o $(DEMO_UTIL_OBJS)
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+DEMO_SRCS = $(DEMO_SRCS_1) remote.c atoms.c exec.c $(DEMO_UTIL_SRCS)
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+DEMO_OBJS = $(DEMO_OBJS_1) remote.o atoms.o exec.o $(DEMO_UTIL_OBJS)
25c6ff4b77fcddf4097ce78a8277275ca603b46cstephh@@ -231,7 +231,7 @@ SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@
14ea4bb737263733ad80a36b4f73f681c30a6b45sddiff --git xscreensaver-5.12/driver/atoms.c xscreensaver-5.12/driver/atoms.c
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+/* xscreensaver, Copyright (c) 1991-2010 Jamie Zawinski <jwz@jwz.org>
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+ * Permission to use, copy, modify, distribute, and sell this software and its
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+ * documentation for any purpose is hereby granted without fee, provided that
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+ * the above copyright notice appear in all copies and that both that
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+ * copyright notice and this permission notice appear in supporting
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+ * documentation. No representations are made about the suitability of this
6876da76f91687fee15a706830b990a2c0d55157Trang Do+ * software for any purpose. It is provided "as is" without express or
6876da76f91687fee15a706830b990a2c0d55157Trang Do+ * implied warranty.
6876da76f91687fee15a706830b990a2c0d55157Trang Do+/* Atoms to retrieve info from remote daemon */
6876da76f91687fee15a706830b990a2c0d55157Trang Do+Atom XA_SCREENSAVER, XA_SCREENSAVER_ID, XA_SCREENSAVER_VERSION,
6876da76f91687fee15a706830b990a2c0d55157Trang Do+/* Atoms to send commands to remote daemon */
6876da76f91687fee15a706830b990a2c0d55157Trang Do+Atom XA_ACTIVATE, XA_BLANK, XA_CYCLE, XA_DEACTIVATE, XA_DEMO,
6876da76f91687fee15a706830b990a2c0d55157Trang Do+ XA_EXIT, XA_LOCK, XA_NEXT, XA_PREFS, XA_PREV, XA_RESTART,
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+static const struct atom_request remote_control_atom_list[] =
dd566498928f08e7c9a79797a40db893c6a4b9fbvn+const struct atom_request *remote_control_atoms = remote_control_atom_list;
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+/* Load a list of atoms in a single round trip to the X server instead of
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+ waiting for a synchronous round trip for each and every atom */
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+ const char **names;
dd566498928f08e7c9a79797a40db893c6a4b9fbvn+ /* Count the number of items across all the lists passed in */
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+ return -1;
535ec645ca371f1ce298eaf76bf8feb73494f923dduvall+ result = XInternAtoms( dpy, (char **) names, atom_count, False, atoms );
dd566498928f08e7c9a79797a40db893c6a4b9fbvn+ fprintf (stderr, "atom: %s => %d\n", names[n], atoms[n]);
1557e65f9d0c6fde875d807c12fc03ea20f50280vndiff --git xscreensaver-5.12/driver/atoms.h xscreensaver-5.12/driver/atoms.h
dd566498928f08e7c9a79797a40db893c6a4b9fbvn+/* xscreensaver, Copyright (c) 1991-2010 Jamie Zawinski <jwz@jwz.org>
dd566498928f08e7c9a79797a40db893c6a4b9fbvn+ * Permission to use, copy, modify, distribute, and sell this software and its
dd566498928f08e7c9a79797a40db893c6a4b9fbvn+ * documentation for any purpose is hereby granted without fee, provided that
dd566498928f08e7c9a79797a40db893c6a4b9fbvn+ * the above copyright notice appear in all copies and that both that
dd566498928f08e7c9a79797a40db893c6a4b9fbvn+ * copyright notice and this permission notice appear in supporting
535ec645ca371f1ce298eaf76bf8feb73494f923dduvall+ * documentation. No representations are made about the suitability of this
ef8846857fcf954444cdc77e72249afef48377d2rb+ * software for any purpose. It is provided "as is" without express or
ef8846857fcf954444cdc77e72249afef48377d2rb+ * implied warranty.
25c6ff4b77fcddf4097ce78a8277275ca603b46cstephh+ const char *name;
25c6ff4b77fcddf4097ce78a8277275ca603b46cstephh+extern const struct atom_request *remote_control_atoms;
25c6ff4b77fcddf4097ce78a8277275ca603b46cstephh+/* Atoms to retrieve info from remote daemon */
25c6ff4b77fcddf4097ce78a8277275ca603b46cstephh+extern Atom XA_SCREENSAVER, XA_SCREENSAVER_ID, XA_SCREENSAVER_VERSION,
25c6ff4b77fcddf4097ce78a8277275ca603b46cstephh+/* Atoms to send commands to remote daemon */
25c6ff4b77fcddf4097ce78a8277275ca603b46cstephh+extern Atom XA_ACTIVATE, XA_BLANK, XA_CYCLE, XA_DEACTIVATE, XA_DEMO,
25c6ff4b77fcddf4097ce78a8277275ca603b46cstephh+ XA_EXIT, XA_LOCK, XA_NEXT, XA_PREFS, XA_PREV, XA_RESTART,
25c6ff4b77fcddf4097ce78a8277275ca603b46cstephhdiff --git xscreensaver-5.12/driver/demo-Gtk.c xscreensaver-5.12/driver/demo-Gtk.c
25c6ff4b77fcddf4097ce78a8277275ca603b46cstephh a closure object of our own down into the various widget callbacks. */
25c6ff4b77fcddf4097ce78a8277275ca603b46cstephh-Atom XA_SCREENSAVER, XA_SCREENSAVER_RESPONSE, XA_SCREENSAVER_VERSION;
25c6ff4b77fcddf4097ce78a8277275ca603b46cstephh-Atom XA_SCREENSAVER_ID, XA_SCREENSAVER_STATUS, XA_SELECT, XA_DEMO;
25c6ff4b77fcddf4097ce78a8277275ca603b46cstephh-Atom XA_ACTIVATE, XA_BLANK, XA_LOCK, XA_RESTART, XA_EXIT;
25c6ff4b77fcddf4097ce78a8277275ca603b46cstephh static void populate_demo_window (state *, int list_elt);
dd566498928f08e7c9a79797a40db893c6a4b9fbvn /* Intern the atoms that xscreensaver_command() needs.
dd566498928f08e7c9a79797a40db893c6a4b9fbvn- XA_SCREENSAVER = XInternAtom (dpy, "SCREENSAVER", False);
dd566498928f08e7c9a79797a40db893c6a4b9fbvn- XA_SCREENSAVER_VERSION = XInternAtom (dpy, "_SCREENSAVER_VERSION",False);
dd566498928f08e7c9a79797a40db893c6a4b9fbvn- XA_SCREENSAVER_STATUS = XInternAtom (dpy, "_SCREENSAVER_STATUS", False);
dd566498928f08e7c9a79797a40db893c6a4b9fbvn- XA_SCREENSAVER_ID = XInternAtom (dpy, "_SCREENSAVER_ID", False);
13faa91230bde46da937bf33010b9accc5bdeb59sd- XA_SCREENSAVER_RESPONSE = XInternAtom (dpy, "_SCREENSAVER_RESPONSE", False);
13faa91230bde46da937bf33010b9accc5bdeb59sd+ const struct atom_request *atom_lists[2] = { NULL, NULL };
dd566498928f08e7c9a79797a40db893c6a4b9fbvn /* Create the window and all its widgets.
13faa91230bde46da937bf33010b9accc5bdeb59sddiff --git xscreensaver-5.12/driver/demo-Xm.c xscreensaver-5.12/driver/demo-Xm.c
dd566498928f08e7c9a79797a40db893c6a4b9fbvn-Atom XA_SCREENSAVER, XA_SCREENSAVER_RESPONSE, XA_SCREENSAVER_VERSION;
dd566498928f08e7c9a79797a40db893c6a4b9fbvn-Atom XA_SCREENSAVER_ID, XA_SCREENSAVER_STATUS, XA_SELECT, XA_DEMO;
dd566498928f08e7c9a79797a40db893c6a4b9fbvn-Atom XA_ACTIVATE, XA_BLANK, XA_LOCK, XA_RESTART, XA_EXIT;
dd566498928f08e7c9a79797a40db893c6a4b9fbvn static void populate_prefs_page (Widget top, prefs_pair *pair);
dd566498928f08e7c9a79797a40db893c6a4b9fbvn /* Intern the atoms that xscreensaver_command() needs.
dd566498928f08e7c9a79797a40db893c6a4b9fbvn- XA_SCREENSAVER = XInternAtom (dpy, "SCREENSAVER", False);
dd566498928f08e7c9a79797a40db893c6a4b9fbvn- XA_SCREENSAVER_VERSION = XInternAtom (dpy, "_SCREENSAVER_VERSION",False);
1557e65f9d0c6fde875d807c12fc03ea20f50280vn- XA_SCREENSAVER_STATUS = XInternAtom (dpy, "_SCREENSAVER_STATUS", False);
dd566498928f08e7c9a79797a40db893c6a4b9fbvn- XA_SCREENSAVER_ID = XInternAtom (dpy, "_SCREENSAVER_ID", False);
dd566498928f08e7c9a79797a40db893c6a4b9fbvn- XA_SCREENSAVER_RESPONSE = XInternAtom (dpy, "_SCREENSAVER_RESPONSE", False);
dd566498928f08e7c9a79797a40db893c6a4b9fbvn+ const struct atom_request *atom_lists[2] = { NULL, NULL };
ef8846857fcf954444cdc77e72249afef48377d2rb /* Create the window and all its widgets.
dd566498928f08e7c9a79797a40db893c6a4b9fbvndiff --git xscreensaver-5.12/driver/remote.c xscreensaver-5.12/driver/remote.c
ef8846857fcf954444cdc77e72249afef48377d2rb-extern Atom XA_SCREENSAVER, XA_SCREENSAVER_VERSION, XA_SCREENSAVER_RESPONSE;
9d2d3daa90dc2bc61e6773e7aa4dc4930f1fb20avn-extern Atom XA_SCREENSAVER_ID, XA_SCREENSAVER_STATUS, XA_EXIT;
9d2d3daa90dc2bc61e6773e7aa4dc4930f1fb20avn-extern Atom XA_VROOT, XA_SELECT, XA_DEMO, XA_BLANK, XA_LOCK;
9d2d3daa90dc2bc61e6773e7aa4dc4930f1fb20avndiff --git xscreensaver-5.12/driver/windows.c xscreensaver-5.12/driver/windows.c
dd566498928f08e7c9a79797a40db893c6a4b9fbvn extern int kill (pid_t, int); /* signal() is in sys/signal.h... */
25351652d920ae27c5a56c199da581033ce763f6Vuong Nguyen Atom XA_VROOT, XA_XSETROOT_ID, XA_ESETROOT_PMAP_ID, XA_XROOTPMAP_ID;
dd566498928f08e7c9a79797a40db893c6a4b9fbvn-Atom XA_SCREENSAVER, XA_SCREENSAVER_VERSION, XA_SCREENSAVER_ID;
ef8846857fcf954444cdc77e72249afef48377d2rb extern saver_info *global_si_kludge; /* I hate C so much... */
dd566498928f08e7c9a79797a40db893c6a4b9fbvndiff --git xscreensaver-5.12/driver/xscreensaver-command.c xscreensaver-5.12/driver/xscreensaver-command.c
14ea4bb737263733ad80a36b4f73f681c30a6b45sd@@ -48,13 +49,6 @@ ERROR! you must not include vroot.h in this file
14ea4bb737263733ad80a36b4f73f681c30a6b45sd-Atom XA_SCREENSAVER, XA_SCREENSAVER_VERSION, XA_SCREENSAVER_RESPONSE;
14ea4bb737263733ad80a36b4f73f681c30a6b45sd-Atom XA_SCREENSAVER_ID, XA_SCREENSAVER_STATUS, XA_SELECT, XA_DEMO, XA_EXIT;
14ea4bb737263733ad80a36b4f73f681c30a6b45sd-static Atom XA_ACTIVATE, XA_DEACTIVATE, XA_CYCLE, XA_NEXT, XA_PREV;
14ea4bb737263733ad80a36b4f73f681c30a6b45sd-static Atom XA_RESTART, XA_PREFS, XA_THROTTLE, XA_UNTHROTTLE;
14ea4bb737263733ad80a36b4f73f681c30a6b45sd __extension__ /* don't warn about "string length is greater than the
14ea4bb737263733ad80a36b4f73f681c30a6b45sd@@ -285,28 +279,11 @@ main (int argc, char **argv)
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_VROOT = XInternAtom (dpy, "__SWM_VROOT", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_SCREENSAVER = XInternAtom (dpy, "SCREENSAVER", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_SCREENSAVER_ID = XInternAtom (dpy, "_SCREENSAVER_ID", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_SCREENSAVER_VERSION = XInternAtom (dpy, "_SCREENSAVER_VERSION",False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_SCREENSAVER_STATUS = XInternAtom (dpy, "_SCREENSAVER_STATUS", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_SCREENSAVER_RESPONSE = XInternAtom (dpy, "_SCREENSAVER_RESPONSE", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_ACTIVATE = XInternAtom (dpy, "ACTIVATE", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_DEACTIVATE = XInternAtom (dpy, "DEACTIVATE", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_RESTART = XInternAtom (dpy, "RESTART", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_CYCLE = XInternAtom (dpy, "CYCLE", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_NEXT = XInternAtom (dpy, "NEXT", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_PREV = XInternAtom (dpy, "PREV", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_SELECT = XInternAtom (dpy, "SELECT", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_EXIT = XInternAtom (dpy, "EXIT", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_DEMO = XInternAtom (dpy, "DEMO", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_PREFS = XInternAtom (dpy, "PREFS", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_LOCK = XInternAtom (dpy, "LOCK", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_BLANK = XInternAtom (dpy, "BLANK", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_THROTTLE = XInternAtom (dpy, "THROTTLE", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_UNTHROTTLE = XInternAtom (dpy, "UNTHROTTLE", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XSync (dpy, 0);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+ const struct atom_request *atom_lists[2] = { NULL, NULL };
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+ atom_lists[0] = remote_control_atoms;
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+ request_atoms (dpy, atom_lists);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd if (cmd == &XA_WATCH)
14ea4bb737263733ad80a36b4f73f681c30a6b45sddiff --git xscreensaver-5.12/driver/xscreensaver.c xscreensaver-5.12/driver/xscreensaver.c
14ea4bb737263733ad80a36b4f73f681c30a6b45sd@@ -224,6 +224,7 @@
14ea4bb737263733ad80a36b4f73f681c30a6b45sd #include "visual.h"
14ea4bb737263733ad80a36b4f73f681c30a6b45sd #include "usleep.h"
14ea4bb737263733ad80a36b4f73f681c30a6b45sd #include "auth.h"
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+#include "atoms.h"
dd566498928f08e7c9a79797a40db893c6a4b9fbvn saver_info *global_si_kludge = 0; /* I hate C so much... */
14ea4bb737263733ad80a36b4f73f681c30a6b45sd-static Atom XA_ACTIVATE, XA_DEACTIVATE, XA_CYCLE, XA_NEXT, XA_PREV;
dd566498928f08e7c9a79797a40db893c6a4b9fbvn@@ -628,30 +623,20 @@ connect_to_server (saver_info *si, int *argc, char **argv)
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_SCREENSAVER = XInternAtom (si->dpy, "SCREENSAVER", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_SCREENSAVER_VERSION = XInternAtom (si->dpy, "_SCREENSAVER_VERSION",False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_SCREENSAVER_ID = XInternAtom (si->dpy, "_SCREENSAVER_ID", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_SCREENSAVER_STATUS = XInternAtom (si->dpy, "_SCREENSAVER_STATUS", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_SCREENSAVER_RESPONSE = XInternAtom (si->dpy, "_SCREENSAVER_RESPONSE",
1557e65f9d0c6fde875d807c12fc03ea20f50280vn- XA_XSETROOT_ID = XInternAtom (si->dpy, "_XSETROOT_ID", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_ESETROOT_PMAP_ID = XInternAtom (si->dpy, "ESETROOT_PMAP_ID", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_XROOTPMAP_ID = XInternAtom (si->dpy, "_XROOTPMAP_ID", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_DEACTIVATE = XInternAtom (si->dpy, "DEACTIVATE", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd- XA_UNTHROTTLE = XInternAtom (si->dpy, "UNTHROTTLE", False);
14ea4bb737263733ad80a36b4f73f681c30a6b45sd+ const struct atom_request *atom_lists[3] = { NULL, NULL, NULL };
14ea4bb737263733ad80a36b4f73f681c30a6b45sddiff --git xscreensaver-5.12/driver/xscreensaver.h xscreensaver-5.12/driver/xscreensaver.h
14ea4bb737263733ad80a36b4f73f681c30a6b45sd@@ -200,8 +200,5 @@ Bool safe_XF86VidModeGetViewPort (Display *, int, int *, int *);
dd566498928f08e7c9a79797a40db893c6a4b9fbvn extern Atom XA_VROOT, XA_XSETROOT_ID, XA_ESETROOT_PMAP_ID, XA_XROOTPMAP_ID;