Commit Graph

208 Commits

Author SHA1 Message Date
rkrolib
8cad52a9c1 Committed two lines from John to help fix the menus a bit.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@222 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-11 11:13:23 +00:00
rkrolib
2dc7f60b59 Check the glutDisplayFunc() callback for being a NULL pointer. This is
illegal and is disallowed in GLUT 3.0+, so we disallow it too in
freeglut 2.0.1+


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@221 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-11 07:44:02 +00:00
rkrolib
45899e5ed9 Applied John's updated ReadConfigFile() changes to the fractals demos.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@220 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-09 16:34:23 +00:00
rkrolib
25545149da Fixed:
* glutInit() ordering w.r.t. glutInit*() and {argv} processing.
 * Aspect ratio.
 * Removed depth-buffer usage.  (Also done for Fractals in previous
   commit...)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@219 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-09 03:05:40 +00:00
rkrolib
8bde679512 A few minor changes:
* glutInit*() calls should preceed glutInit(), per se, generally.
   This is so that glutInit()'s configuration (which picks up on user
   parameters) can override application defaults.
 * glutInit() should be called before ANY attempt to process {argv, argc}.
   This is because there may be GLUT/freeglut parameters (such as
   "-display" on X11).
 * If the window is tall and skinny, rather than short and squat, we need
   to handle aspect ratios differently.

The first is a user-interface bug.  The second is a serious bug (especially
since the demo assumes that argv[1] contains a filename).  The third is a
display bug.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@218 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-09 03:00:04 +00:00
rkrolib
30d1e165a0 Changed CreateNotify (in X11 ONLY) to act like a ConfigureNotify event.
This is done so that subwindows on X11 will get "resize" events when
they are created.  Old GLUT did this---presumably by design in order
to ensure that (a) All windows get notified of their size as soon as
the window exists, and (b) probably more importantly, so that windows
and sub-windows behave as much alike as possible.  I believe that GLUT
was right to do this, and I believe that compatibility requires this
(I have a sample program that breaks in freeglut but not GLUT without
this fix).

I did not touch the Microsoft side, because I don't know what their
OS does---nor if old GLUT was historically system-dependant about this.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@217 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-08 20:17:10 +00:00
sandalle
65f88a4dc4 freeglut_menu.c:217,519,532: Fix menus to stay in the window (John Fay)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@216 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-08 19:17:07 +00:00
rkrolib
5a3594b831 Several updates from John and myself.
The broad outlines are:

 * Color schemes are now in variables, are closer to old GLUT, and
   are system dependant (as old GLUT did).
 * You can change the font to any bitmapped font more easily, which
   can aid in finding a better approximation.  (Old GLUT does not seem
   to have used a GLUT font for the menus, which causes problems for
   us.)  The menus rescale automatically, including the triangle "arrow"
   for sub-menus.
 * Menus have real borders, and the placement of highlighting is
   much improved.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@215 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-08 16:04:58 +00:00
rkrolib
de5aadf9b5 Fixed a bug in the menu callback behavior. Menus were not setting the
current window correctly.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@214 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-08 00:24:33 +00:00
sandalle
8436dd7205 freeglut_menu.c:328 Fix submenu triangle (John Fay)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@213 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-06 16:27:53 +00:00
puggles
c209cc5479 Tweaking for menu behavior in Linux regarding mouse whatnot - John Fay
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@212 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-04 15:06:42 +00:00
rkrolib
400a9b3d11 Applied a patch from "extraeme@netbsd.org" to add joystick support.
Untested, but it compiles for me.

Should also add Joystick support for older FreeBSD systems.  Also
untested.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@211 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-01 16:30:25 +00:00
rkrolib
7a6c02639a Added support for more arbitrary number of mouse buttons (though only the
first three can work with menus), in X.  This closes a compatibility gap
with old GLUT, and leaves us the option of supporting scroll-wheels
properly.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@210 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-01 15:01:58 +00:00
cjp
e7a43013d4 Don't install the demos.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@208 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-27 12:29:03 +00:00
puggles
cae77387e4 Package the demos.dsw file.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@207 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-26 18:44:06 +00:00
puggles
b2f1ae6232 Demos workspace for MSVC users
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@206 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-26 18:43:12 +00:00
rkrolib
34a43b6ae5 Corrected a bug w.r.t. display and joystick events. When getting ready
to sleep, we need to go through ALL windows to check for pending joysticks
and to check for pending redisplays.  I was just going through all TOP-
LEVEL windows.  Eeek.  This won't do.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@205 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-24 06:26:36 +00:00
brianp
29a1cf87af added needClear flag to take care of initial window clear and window resize clears
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@204 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-23 14:17:13 +00:00
rkrolib
a3b3a309dd Per Nigel Stewart's comments, converted
#ifdef TARGET_HOST_...

to:

#if TARGET_HOST_...

in src/freeglut_init.c.  These changes should not have any functional
impact at this time, but you don't want bad examples lying around to
trip people up later.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@203 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-23 01:08:16 +00:00
rkrolib
93d944835a Fixed:
* GLUT_SINGLE now should behave more or less correctly.
   Thanks to Brian Paul!

 * Sleeping is now cognizant of outstanding redisplays.

 * Fractals_random has been restored more or less to as-before, save that
   it uses the more minimal glFlush() rather than glutSwapBuffers().
   glutSwapBuffers() was only required when freeglut was incorrectly
   handling promotion to double-buffering.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@202 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-23 01:03:41 +00:00
rkrolib
4d8a8e7085 Moved the #include/#ifdef/#define stuff up to the top.
Changed #ifdef to #if, per Nigel(?)'s comment.  Ooops.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@201 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-22 19:01:55 +00:00
cjp
a8482d4df4 Fix to allow demos to compile before freeglut has been installed.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@200 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-22 17:40:55 +00:00
puggles
185eab5c78 Add an idle function to ensure that the screen gets drawn even when callbacks are not generated by the mouse/keyboard.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@199 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-22 11:30:33 +00:00
puggles
4e7cf2f8da Note the possible buffer overflow in window_title
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@198 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-21 13:47:36 +00:00
puggles
71fbfebd41 Fix the window title.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@197 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-21 13:36:43 +00:00
puggles
c0f2a92615 Fix window title, and ensure that the random integer is not forced to be zero (Thanks Richard Rauch!)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@196 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-21 13:35:36 +00:00
puggles
84c2c9381e Richard Rauch's patch to ensure that freeglut does not use 100% CPU even while idling.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@195 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-20 19:11:17 +00:00
puggles
2a56a1a4b4 Resolution for bug 809561 reported by Nigel Stewart, regarding a possible array underflow error of -1 in the event of "character" being zero.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@194 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-20 16:18:01 +00:00
cjp
5337925e88 Removed unused AC_PROG_RANLIB from configure.in
Added passing of $(X_CFLAGS) to compiler.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@193 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-14 17:00:28 +00:00
puggles
1a55178f88 Resolve bug 806008 -- let Microsoft's compiler know to use Windows libraries even if not using our project files.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@192 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-14 16:00:24 +00:00
puggles
83532cd6d5 Taking care of keeping things mostly up-to-date
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@191 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-13 16:24:46 +00:00
puggles
bf9ffa7d8c Most everything's been resolved for the 2.0.0 release.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@190 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-13 16:09:22 +00:00
puggles
775808a163 Thierry Thomas said that FreeBSD has no machine/joystick.h, instead a sys/joystick.h. I've made the change -- here's hoping it works.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@189 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-13 15:48:21 +00:00
puggles
b6c81be983 Removed the incorrect relative path for including freeglut.h
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@188 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-13 13:38:04 +00:00
puggles
f5c85fcd2f Made all demos compile. Thanks to Thierry Thomas for reporting bug 802809, which alerted that *none* of the demos compiled automatically!
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@187 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-13 13:29:35 +00:00
puggles
738fa38ef5 Nigel Stewart's joystick fix (for hopefully all platforms), SourceForge bug 805481
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@186 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-13 13:12:26 +00:00
puggles
0cd9efa394 Fix location of the include files from a fixed to relative path. Closes bug 805477
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@185 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-13 13:09:06 +00:00
cjp
f3b61bfa28 A minor fix to that last commit.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@183 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-10 22:33:39 +00:00
cjp
1062695e7d Removed some remaining glib depandancy.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@182 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-10 22:30:29 +00:00
puggles
59e9cae134 Re-add catches for the case in which a menu callback destroys the menu. - John Fay
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@181 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-10 15:46:12 +00:00
cjp
fdd998e66a More to fix a deinitialization related crash.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@180 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-09 17:50:31 +00:00
cjp
1358592415 Fix for a deinitialization related crash.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@179 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-09 17:40:53 +00:00
puggles
18bf7821a6 Menus should deallocate better now - John Fay
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@178 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-08 20:36:23 +00:00
puggles
43736604fb Add freeglut_static.dsp to the releases
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@177 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-05 20:21:50 +00:00
cjp
9c2c2a07ff Moved #ifdef for non XFree86 X11 compile.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@176 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-03 01:56:04 +00:00
cjp
241a32bfe0 Fix to stop fgSetWindow(NULL) crashing on X11.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@175 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-02 17:43:43 +00:00
puggles
652e30fcb9 These change a bunch of assignments to calls to set the current window correctly, and also (possibly) fixes most of the remaining menu problem. - John Fay
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@174 7f0cb862-5218-0410-a997-914c9d46530a
2003-08-29 18:10:06 +00:00
puggles
c27c9a8631 Another typecast bugfix from John Fay
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@173 7f0cb862-5218-0410-a997-914c9d46530a
2003-08-29 15:49:40 +00:00
cjp
af8a4e52ea Changed #ifdef to #if
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@172 7f0cb862-5218-0410-a997-914c9d46530a
2003-08-28 22:43:12 +00:00
puggles
ee0ab03804 change the GLUT stroke function arguments from "const char *" to "const unsigned char *" - John Fay
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@171 7f0cb862-5218-0410-a997-914c9d46530a
2003-08-28 19:22:59 +00:00