X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fgltext.c;h=f9e6f156488bef3026c74a9d5d74072019cc19c2;hp=71e379ad10ec0723eca993d4135fcceea391414f;hb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439

diff --git a/hacks/glx/gltext.c b/hacks/glx/gltext.c
index 71e379ad..f9e6f156 100644
--- a/hacks/glx/gltext.c
+++ b/hacks/glx/gltext.c
@@ -1,4 +1,4 @@
-/* gltext, Copyright (c) 2001-2006 Jamie Zawinski <jwz@jwz.org>
+/* gltext, Copyright (c) 2001-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
@@ -35,10 +35,6 @@
 
 #include <ctype.h>
 
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif /* HAVE_LOCALE_H */
-
 #ifdef USE_GL /* whole file */
 
 #ifdef HAVE_COCOA
@@ -305,7 +301,9 @@ text_handle_event (ModeInfo *mi, XEvent *event)
     }
   else if (event->xany.type == ButtonPress &&
            (event->xbutton.button == Button4 ||
-            event->xbutton.button == Button5))
+            event->xbutton.button == Button5 ||
+            event->xbutton.button == Button6 ||
+            event->xbutton.button == Button7))
     {
       gltrackball_mousewheel (tp->trackball, event->xbutton.button, 10,
                               !!event->xbutton.state);
@@ -330,15 +328,6 @@ init_text (ModeInfo *mi)
   text_configuration *tp;
   int i;
 
-  /* setlocale (LC_TIME, "") only refers to environment:
-     not needed
-   */
-#if 0
-# ifdef HAVE_SETLOCALE
-  setlocale (LC_TIME, "");      /* for strftime() calls */
-# endif
-#endif
-
   if (!tps) {
     tps = (text_configuration *)
       calloc (MI_NUM_SCREENS(mi), sizeof (text_configuration));