Changeset 3579 for trunk/src/opengl/glut

Timestamp:

May 20, 2000, 3:48:23 PM (25 years ago)

Author:

jeroen

Message:

* empty log message *

Location:

trunk/src/opengl/glut

Files:

• glut_bitmap.c (modified) (2 diffs)
• glut_cursor.c (modified) (2 diffs)
• glut_event.c (modified) (4 diffs)
• glut_init.c (modified) (2 diffs)
• glut_term.c (modified) (3 diffs)
• glut_util.c (modified) (2 diffs)
• glutint.h (modified) (3 diffs)
• glutos2.h (modified) (2 diffs)

trunk/src/opengl/glut/glut_bitmap.c

@@ -1 @@
-/* $Id: glut_bitmap.c,v 1.3 2000-03-11 15:07:44 sandervl Exp $ */
+/* $Id: glut_bitmap.c,v 1.4 2000-05-20 13:48:22 jeroen Exp $ */
 /* Copyright (c) Mark J. Kilgard, 1994. */
 
@@ -17 +17 @@
   GLint skiprows, skippixels, alignment;
 
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(__WIN32OS2__)
   fontinfo = (BitmapFontPtr) __glutFont(font);
 #else

trunk/src/opengl/glut/glut_cursor.c

@@ -1 @@
-/* $Id: glut_cursor.c,v 1.3 2000-03-11 15:07:44 sandervl Exp $ */
+/* $Id: glut_cursor.c,v 1.4 2000-05-20 13:48:22 jeroen Exp $ */
 /* Copyright (c) Mark J. Kilgard, 1995, 1998. */
 
@@ -165 +165 @@
     case GLUT_CURSOR_FULL_CROSSHAIR:
 #if defined(_WIN32) || defined(__WIN32OS2__)
-      xcursor = IDC_CROSS;
+      xcursor = (Cursor)IDC_CROSS;
 #else
       if (fullCrosshairCusor == None) {

trunk/src/opengl/glut/glut_event.c

@@ -1 @@
-/* $Id: glut_event.c,v 1.9 2000-03-11 17:07:44 sandervl Exp $ */
+/* $Id: glut_event.c,v 1.10 2000-05-20 13:48:22 jeroen Exp $ */
 /* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1997, 1998. */
 
@@ -1073 +1073 @@
 
       /* Do the repositioning, moving, and push/pop. */
+
       SetWindowPos(window->win,
-        window->desiredStack == (Above ? HWND_TOP : HWND_NOTOPMOST),
+        window->desiredStack == Above ? HWND_TOP : HWND_NOTOPMOST,
         changes.left, changes.top,
         changes.right - changes.left, changes.bottom - changes.top,
-        flags);
+        flags & ~SWP_NOSENDCHANGING);
 
       /* Zero out the mask. */
@@ -1198 +1199 @@
 
       ((GLUTreshapeCB)(window->reshape))(window->width, window->height);
+
       window->forceReshape = False;
 
@@ -1304 +1306 @@
 
   if (workMask & GLUT_FINISH_WORK) {
-
     /* Finish work makes sure a glFinish gets done to indirect
        rendering contexts.  Indirect contexts tend to have much

trunk/src/opengl/glut/glut_init.c

@@ -1 @@
-/* $Id: glut_init.c,v 1.4 2000-03-11 15:07:45 sandervl Exp $ */
+/* $Id: glut_init.c,v 1.5 2000-05-20 13:48:23 jeroen Exp $ */
 /* Copyright (c) Mark J. Kilgard, 1994, 1997. */
 
@@ -355 +355 @@
 glutInitDisplayMode(unsigned int mask)
 {
-  dprintf(("GLUT32: glutInitDisplayMode()\n"));
   __glutDisplayMode = mask;
 }

trunk/src/opengl/glut/glut_term.c

@@ -1 @@
-/* $Id: glut_term.c,v 1.4 2000-03-11 15:07:45 sandervl Exp $ */
+/* $Id: glut_term.c,v 1.5 2000-05-20 13:48:23 jeroen Exp $ */
 /*
  * GLUT Termination - on exit cleanup any open windows
@@ -8 +8 @@
 #include "glu.h"
 #include "glutint.h"
-#ifdef __WIN32OS2__
-#include <misc.h>
-#endif
 
 void CDECL Glut32Terminate(void)
@@ -17 +14 @@
 
       /* Our app has ended - close all the open windows! */
-      dprintf(("GLUT internal cleanup - numwins %d\n",__glutWindowListSize));
-
       for (i = 0; i < __glutWindowListSize; i++) {
         if (__glutWindowList[i])
           {
-            dprintf(("GLUT32 internal cleanup: dtr %d\n",i));
             glutDestroyWindow(i+1);
-            dprintf(("GLUT32 internal cleanup: dtr %d com\n",i));
           }
       }

trunk/src/opengl/glut/glut_util.c

@@ -1 @@
-/* $Id: glut_util.c,v 1.3 2000-03-11 15:07:45 sandervl Exp $ */
+/* $Id: glut_util.c,v 1.4 2000-05-20 13:48:23 jeroen Exp $ */
 /* Copyright (c) Mark J. Kilgard, 1994. */
 
@@ -12 +12 @@
 
 #include "glutint.h"
+
+#if defined(__WIN32OS2__)
+#include <misc.h>
+#endif
 
 /* strdup is actually not a standard ANSI C or POSIX routine

trunk/src/opengl/glut/glutint.h

@@ -1 @@
-/* $Id: glutint.h,v 1.7 2000-03-11 17:07:46 sandervl Exp $ */
+/* $Id: glutint.h,v 1.8 2000-05-20 13:48:23 jeroen Exp $ */
 #ifndef __glutint_h__
 #define __glutint_h__
@@ -93 +93 @@
   } else { \
     (dest).tv_sec = (src1).tv_sec + (src2).tv_sec; \
-    if(((dest).tv_sec >= 1) && (((dest).tv_usec <0))) { \
+    if(((dest).tv_sec >= 1) && (((LONG)(dest).tv_usec <0))) { \
       (dest).tv_sec --;(dest).tv_usec += 1000000; \
     } \
@@ -99 +99 @@
 }
 #define TIMEDELTA(dest, src1, src2) { \
-  if(((dest).tv_usec = (src1).tv_usec - (src2).tv_usec) < 0) { \
+  if((LONG)((dest).tv_usec = (src1).tv_usec - (src2).tv_usec) < 0) { \
     (dest).tv_usec += 1000000; \
     (dest).tv_sec = (src1).tv_sec - (src2).tv_sec - 1; \

trunk/src/opengl/glut/glutos2.h

@@ -1 @@
-/* $Id: glutos2.h,v 1.5 2000-03-11 21:52:50 sandervl Exp $ */
+/* $Id: glutos2.h,v 1.6 2000-05-20 13:48:23 jeroen Exp $ */
 #ifndef __glutos2_h__
 #define __glutos2_h__
@@ -11 +11 @@
 #include "os2_x11.h"
 #include "os2_glx.h"
-#include <misc.h>
 /* KSO: Dirty trick to get around problems with gettimeofday being
  * defined in the sys\time.h in the toolkit. (at least in CSD2)