X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fxset.c;h=8378e1cf8b0073b3ff172b62fddfb22f47aa8807;hp=99d11c2f96a18ae79a65428cbbed2ba36a6adec6;hb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;hpb=de460e831dc8578acfa8b72251ab9346c99c1f96 diff --git a/driver/xset.c b/driver/xset.c index 99d11c2f..8378e1cf 100644 --- a/driver/xset.c +++ b/driver/xset.c @@ -1,5 +1,5 @@ /* xset.c --- interacting with server extensions and the builtin screensaver. - * xscreensaver, Copyright (c) 1991-2005 Jamie Zawinski + * xscreensaver, Copyright (c) 1991-2008 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -42,14 +42,6 @@ ERROR! You must not include vroot.h in this file. # include -Bool -query_mit_saver_extension (saver_info *si) -{ - return XScreenSaverQueryExtension (si->dpy, - &si->mit_saver_ext_event_number, - &si->mit_saver_ext_error_number); -} - static int ignore_all_errors_ehandler (Display *dpy, XErrorEvent *error) { @@ -101,14 +93,6 @@ init_mit_saver_extension (saver_info *si) # include -Bool -query_sgi_saver_extension (saver_info *si) -{ - return XScreenSaverQueryExtension (si->dpy, - &si->sgi_saver_ext_event_number, - &si->sgi_saver_ext_error_number); -} - static void init_sgi_saver_extension (saver_info *si) { @@ -137,62 +121,6 @@ init_sgi_saver_extension (saver_info *si) #endif /* HAVE_SGI_SAVER_EXTENSION */ - -/* XIDLE server extension hackery. - */ - -#ifdef HAVE_XIDLE_EXTENSION - -# include - -Bool -query_xidle_extension (saver_info *si) -{ - int event_number; - int error_number; - return XidleQueryExtension (si->dpy, &event_number, &error_number); -} - -#endif /* HAVE_XIDLE_EXTENSION */ - - - -/* Resize and Rotate server extension hackery. - */ - -#ifdef HAVE_RANDR - -# include - -Bool -query_randr_extension (saver_info *si) -{ - saver_preferences *p = &si->prefs; - Bool ok = XRRQueryExtension (si->dpy, - &si->randr_event_number, - &si->randr_error_number); - - if (ok) - { - int nscreens = ScreenCount (si->dpy); /* number of *real* screens */ - int i; - - if (p->verbose_p) - fprintf (stderr, "%s: selecting RANDR events\n", blurb()); - for (i = 0; i < nscreens; i++) -# ifdef RRScreenChangeNotifyMask /* randr.h 1.5, 2002/09/29 */ - XRRSelectInput (si->dpy, RootWindow (si->dpy, i), - RRScreenChangeNotifyMask); -# else /* !RRScreenChangeNotifyMask */ /* Xrandr.h 1.4, 2001/06/07 */ - XRRScreenChangeSelectInput (si->dpy, RootWindow (si->dpy, i), True); -# endif /* !RRScreenChangeNotifyMask */ - } - - return ok; -} - -#endif /* HAVE_RANDR */ - /* Figuring out what the appropriate XSetScreenSaver() parameters are