projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://ftp.ksu.edu.tw/FTP/FreeBSD/distfiles/xscreensaver-4.20.tar.gz
[xscreensaver]
/
hacks
/
glx
/
gltext.c
diff --git
a/hacks/glx/gltext.c
b/hacks/glx/gltext.c
index a537c374299fe7f09e6e98fb1dfa0705bdfb67e1..3dd7922489892af444c8bb1a72e88083ed5f9999 100644
(file)
--- a/
hacks/glx/gltext.c
+++ b/
hacks/glx/gltext.c
@@
-1,4
+1,4
@@
-/* gltext, Copyright (c) 2001
, 2002, 2003, 2004
Jamie Zawinski <jwz@jwz.org>
+/* gltext, Copyright (c) 2001
-2005
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
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@
-54,6
+54,10
@@
extern XtAppContext app;
#include <sys/time.h>
#include <ctype.h>
#include <sys/time.h>
#include <ctype.h>
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif /* HAVE_LOCALE_H */
+
#ifdef USE_GL /* whole file */
#ifdef HAVE_UNAME
#ifdef USE_GL /* whole file */
#ifdef HAVE_UNAME
@@
-248,7
+252,7
@@
text_handle_event (ModeInfo *mi, XEvent *event)
text_configuration *tp = &tps[MI_SCREEN(mi)];
if (event->xany.type == ButtonPress &&
text_configuration *tp = &tps[MI_SCREEN(mi)];
if (event->xany.type == ButtonPress &&
- event->xbutton.button
&
Button1)
+ event->xbutton.button
==
Button1)
{
tp->button_down_p = True;
gltrackball_start (tp->trackball,
{
tp->button_down_p = True;
gltrackball_start (tp->trackball,
@@
-257,11
+261,19
@@
text_handle_event (ModeInfo *mi, XEvent *event)
return True;
}
else if (event->xany.type == ButtonRelease &&
return True;
}
else if (event->xany.type == ButtonRelease &&
- event->xbutton.button
&
Button1)
+ event->xbutton.button
==
Button1)
{
tp->button_down_p = False;
return True;
}
{
tp->button_down_p = False;
return True;
}
+ else if (event->xany.type == ButtonPress &&
+ (event->xbutton.button == Button4 ||
+ event->xbutton.button == Button5))
+ {
+ gltrackball_mousewheel (tp->trackball, event->xbutton.button, 10,
+ !!event->xbutton.state);
+ return True;
+ }
else if (event->xany.type == MotionNotify &&
tp->button_down_p)
{
else if (event->xany.type == MotionNotify &&
tp->button_down_p)
{
@@
-281,6
+293,10
@@
init_text (ModeInfo *mi)
text_configuration *tp;
int i;
text_configuration *tp;
int i;
+# ifdef HAVE_SETLOCALE
+ setlocale (LC_TIME, ""); /* for strftime() calls */
+# endif
+
if (!tps) {
tps = (text_configuration *)
calloc (MI_NUM_SCREENS(mi), sizeof (text_configuration));
if (!tps) {
tps = (text_configuration *)
calloc (MI_NUM_SCREENS(mi), sizeof (text_configuration));
@@
-388,7
+404,7
@@
fill_character (GLUTstrokeFont font, int c, Bool wire)
ly = coord->y;
}
}
ly = coord->y;
}
}
- return (int) (ch->right + tube_width
/2
);
+ return (int) (ch->right + tube_width);
}
return 0;
}
}
return 0;
}