← Back to branch summary

~ubuntu-branches/ubuntu/quantal/xscreensaver/quantal

« back to all changes in this revision

Viewing changes to driver/xset.c

  • Committer: Bazaar Package Importer
  • Author(s): Ted Gould
  • Date: 2008-08-28 16:15:25 UTC
  • mfrom: (1.1.6 upstream) (2.1.3 lenny)
  • Revision ID: james.westby@ubuntu.com-20080828161525-mxga521aoezxjq8h
Tags: 5.07-0ubuntu1
* Upgrade upstream version
* debian/control: Remove suggest xdaliclock as it is no longer
  included
* Remove 10_jwz-screensaver-randr-patch-3.patch as it has been merged
  upstream.
* Add 24_hacks_xsublim_enable.patch as it seems that xsublim was dropped
  from the build files.  There is nothing in the Changelog about it
  so I believe it was accidental.
* Updating the .desktop files from the XML files using gnome-screensaver's
  utility to do so.  Lots of text updates.  Also:
    * Added: abstractile.desktop
    * Added: cwaves.desktop
    * Added: m6502.desktop
    * Added: skytentacles.desktop
    * Removed: xteevee.desktop
* xscreensaver-gl-extra.files: Added skytentacles
* xscreensaver-data-extra.files: Added abstractile, cwaves and m6502
* xscreensaver-data.files: Remove partial abstractile, m6502 and cwaves

Show diffs side-by-side

added added

removed removed

Lines of Context:
driver/xset.c
1
1
/* xset.c --- interacting with server extensions and the builtin screensaver.
2
 
 * xscreensaver, Copyright (c) 1991-2005 Jamie Zawinski <jwz@jwz.org>
 
2
 * xscreensaver, Copyright (c) 1991-2008 Jamie Zawinski <jwz@jwz.org>
3
3
 *
4
4
 * Permission to use, copy, modify, distribute, and sell this software and its
5
5
 * documentation for any purpose is hereby granted without fee, provided that
42
42
 
43
43
# include <X11/extensions/scrnsaver.h>
44
44
 
45
 
Bool
46
 
query_mit_saver_extension (saver_info *si)
47
 
{
48
 
  return XScreenSaverQueryExtension (si->dpy,
49
 
                                     &si->mit_saver_ext_event_number,
50
 
                                     &si->mit_saver_ext_error_number);
51
 
}
52
 
 
53
45
static int
54
46
ignore_all_errors_ehandler (Display *dpy, XErrorEvent *error)
55
47
{
101
93
 
102
94
# include <X11/extensions/XScreenSaver.h>
103
95
 
104
 
Bool
105
 
query_sgi_saver_extension (saver_info *si)
106
 
{
107
 
  return XScreenSaverQueryExtension (si->dpy,
108
 
                                     &si->sgi_saver_ext_event_number,
109
 
                                     &si->sgi_saver_ext_error_number);
110
 
}
111
 
 
112
96
static void
113
97
init_sgi_saver_extension (saver_info *si)
114
98
{
137
121
 
138
122
#endif /* HAVE_SGI_SAVER_EXTENSION */
139
123
 
140
 
 
141
 
/* XIDLE server extension hackery.
142
 
 */
143
 
 
144
 
#ifdef HAVE_XIDLE_EXTENSION
145
 
 
146
 
# include <X11/extensions/xidle.h>
147
 
 
148
 
Bool
149
 
query_xidle_extension (saver_info *si)
150
 
{
151
 
  int event_number;
152
 
  int error_number;
153
 
  return XidleQueryExtension (si->dpy, &event_number, &error_number);
154
 
}
155
 
 
156
 
#endif /* HAVE_XIDLE_EXTENSION */
157
 
 
158
 
 
159
 
 
160
 
/* Resize and Rotate server extension hackery.
161
 
 */
162
 
 
163
 
#ifdef HAVE_RANDR
164
 
 
165
 
# include <X11/extensions/Xrandr.h>
166
 
 
167
 
Bool
168
 
query_randr_extension (saver_info *si)
169
 
{
170
 
  saver_preferences *p = &si->prefs;
171
 
  Bool ok = XRRQueryExtension (si->dpy,
172
 
                               &si->randr_event_number,
173
 
                               &si->randr_error_number);
174
 
 
175
 
  if (ok)
176
 
    {
177
 
      int nscreens = ScreenCount (si->dpy);  /* number of *real* screens */
178
 
      int i;
179
 
 
180
 
      if (p->verbose_p)
181
 
        fprintf (stderr, "%s: selecting RANDR events\n", blurb());
182
 
      for (i = 0; i < nscreens; i++)
183
 
# ifdef RRScreenChangeNotifyMask                 /* randr.h 1.5, 2002/09/29 */
184
 
        XRRSelectInput (si->dpy, RootWindow (si->dpy, i),
185
 
                        RRScreenChangeNotifyMask);
186
 
# else  /* !RRScreenChangeNotifyMask */          /* Xrandr.h 1.4, 2001/06/07 */
187
 
        XRRScreenChangeSelectInput (si->dpy, RootWindow (si->dpy, i), True);
188
 
# endif /* !RRScreenChangeNotifyMask */
189
 
    }
190
 
 
191
 
  return ok;
192
 
}
193
 
 
194
 
#endif /* HAVE_RANDR */
195
 
 
196
124
 
197
125
 
198
126
/* Figuring out what the appropriate XSetScreenSaver() parameters are