-/* xscreensaver, Copyright (c) 1992-2006 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1992-2008 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
#include "screenhackI.h"
#include "version.h"
#include "vroot.h"
-#include "change_locale.h"
-#if HAVE_SETLOCALE
-#include <locale.h>
-#endif
#ifndef _XSCREENSAVER_VROOT_H_
# error Error! You have an old version of vroot.h! Check -I args.
static int merged_options_size;
static char **merged_defaults;
-static void
-reset_locale (void)
-{
-#ifdef HAVE_SETLOCALE
- const char *current_locale = setlocale(LC_ALL, "");
- const char *cmp_locale;
- int j = 0;
-
- while ((cmp_locale = change_locale[j]))
- {
- if (!strncmp(current_locale, cmp_locale, strlen(cmp_locale)))
- {
- setlocale(LC_ALL, "C");
- break;
- }
- j++;
- }
-#endif /* HAVE_SETLOCALE */
-}
-
-
static void
merge_options (void)
{
{
unsigned long delay = ft->draw_cb (dpy, window, closure);
#ifdef DEBUG_PAIR
- unsigned long delay2;
+ unsigned long delay2 = 0;
if (window2) delay2 = ft->draw_cb (dpy, window2, closure2);
#endif
window = XtWindow (toplevel);
XGetWindowAttributes (dpy, window, &xgwa);
XSelectInput (dpy, window,
- (xgwa.your_event_mask | KeyPressMask |
+ (xgwa.your_event_mask | KeyPressMask | KeyReleaseMask |
ButtonPressMask | ButtonReleaseMask));
XChangeProperty (dpy, window, XA_WM_PROTOCOLS, XA_ATOM, 32,
PropModeReplace,
char version[255];
fix_fds();
- reset_locale();
progname = argv[0]; /* reset later */
progclass = ft->progclass;