Changeset 2996 for trunk/src/opengl/glut/glut_event.c

Timestamp:

Mar 4, 2000, 8:10:18 PM (25 years ago)

Author:

jeroen

Message:

* empty log message *

File:

• trunk/src/opengl/glut/glut_event.c (modified) (17 diffs)

trunk/src/opengl/glut/glut_event.c

@@ -1 @@
-/* $Id: glut_event.c,v 1.2 2000-02-09 08:46:09 jeroen Exp $ */
+/* $Id: glut_event.c,v 1.3 2000-03-04 19:10:14 jeroen Exp $ */
 /* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1997, 1998. */
 
@@ -100 +100 @@
 int __glutWindowDamaged = 0;
 
-void APIENTRY
+void GLAPIENTRY
 glutIdleFunc(GLUTidleCB idleFunc)
 {
@@ -106 +106 @@
 }
 
-void APIENTRY
+void GLAPIENTRY
 glutTimerFunc(unsigned int interval, GLUTtimerCB timerFunc, int value)
 {
@@ -204 +204 @@
 
 /* CENTRY */
-void APIENTRY
+void GLAPIENTRY
 glutPostRedisplay(void)
 {
@@ -214 +214 @@
    particularly useful when multiple windows need redisplays posted at
    the same times.  See also glutPostWindowOverlayRedisplay. */
-void APIENTRY
+void GLAPIENTRY
 glutPostWindowRedisplay(int win)
 {
@@ -1205 +1205 @@
       __glutSetWindow(window);
 
-      window->reshape(window->width, window->height);
+      /* JvdH: DO NOT REMPVE THE EXPLICIT TYPECAST TO THIS GLAPIENTRY   */
+      /* FUNCTION, OR THE COMPILER WILL NUKE THE STACK WHEN OPTIMIZING! */
+      /* VACPP obviously has a bug, and will adjust the ESP after the   */
+      /* call, but the callee has already done so!!!!                   */
+      ((GLUTreshapeCB)(window->reshape))(window->width, window->height);
       window->forceReshape = False;
-
-#ifdef __WIN32OS2__
-      /* JvdH - 03/02/2000 */
-      /* FIXME: This is a rather stupid hack... */
-      /* The client area appears transparent... */
-      /* By twice swapping the ZORDER the client area is repainted... */
-      /* I'd like a better fix, but for now this seems to work */
-      SetWindowPos(window->win,
-                   HWND_BOTTOM,
-                   0,0,
-                   0,0,
-                   SWP_NOMOVE | SWP_NOSIZE);
-
-      SetWindowPos(window->win,
-                   HWND_TOP,
-                   0,0,
-                   0,0,
-                   SWP_NOMOVE | SWP_NOSIZE);
-#endif
 
       /* Setting the redisplay bit on the first reshape is
@@ -1234 +1219 @@
          happens to the window. */
       workMask |= GLUT_REDISPLAY_WORK;
-    }
-
+
+    }
 
     /* The code below is more involved than otherwise necessary
@@ -1260 +1245 @@
         if (__glutMesaSwapHackSupport) {
           if (window->usedSwapBuffers) {
+
             if ((workMask & (GLUT_REPAIR_WORK | GLUT_REDISPLAY_WORK)) == GLUT_REPAIR_WORK) {
               SWAP_BUFFERS_WINDOW(window);
@@ -1282 +1268 @@
       }
       if (workMask & (GLUT_OVERLAY_REDISPLAY_WORK | GLUT_OVERLAY_REPAIR_WORK)) {
+
         window = __glutWindowList[num];
         if (window && window->overlay &&
@@ -1306 +1293 @@
         if (!window->overlay && window->usedSwapBuffers) {
           if ((workMask & (GLUT_REPAIR_WORK | GLUT_REDISPLAY_WORK)) == GLUT_REPAIR_WORK) {
+
             SWAP_BUFFERS_WINDOW(window);
             goto skippedDisplayCallback2;
@@ -1312 +1300 @@
       }
       /* Render to normal plane (and possibly overlay). */
+
       __glutWindowDamaged = (workMask & (GLUT_OVERLAY_REPAIR_WORK | GLUT_REPAIR_WORK));
       __glutSetWindow(window);
@@ -1327 +1316 @@
 
   if (workMask & GLUT_FINISH_WORK) {
+
     /* Finish work makes sure a glFinish gets done to indirect
        rendering contexts.  Indirect contexts tend to have much
@@ -1342 +1332 @@
   /* Strip out dummy, finish, and debug work bits. */
   window->workMask &= ~(GLUT_DUMMY_WORK | GLUT_FINISH_WORK | GLUT_DEBUG_WORK);
+
+    WriteLog("GLUT32: processWindowWorkList -> will now return!\n");
+
   if (window->workMask) {
     /* Leave on work list. */
@@ -1352 +1345 @@
 
 /* CENTRY */
-void APIENTRY
+void GLAPIENTRY
 glutMainLoop(void)
 {
+  WriteLog("GLUT32 MainLoop entered\n");
 #if !defined(_WIN32) && !defined(__WIN32OS2__)
   if (!__glutDisplay)
@@ -1363 +1357 @@
       "main loop entered with no windows created.");
   for (;;) {
+    WriteLog("GLUT32 --> LOOP in!\n");
     if (__glutWindowWorkList) {
       GLUTwindow *remainder, *work;
@@ -1373 +1368 @@
           *beforeEnd = __glutWindowWorkList;
           __glutWindowWorkList = remainder;
-        }
+       }
       }
     }
@@ -1382 +1377 @@
         waitForSomething();
       } else {
+    WriteLog("Calling processEventsAndTimeouts from #1403\n");
         processEventsAndTimeouts();
-      }
-    }
-  }
+    WriteLog("processEventsAndTimeouts from #1403 returned!\n");
+      }
+    }
+  }
+
+    WriteLog("MainLoop ended... ???\n");
 }
 /* ENDCENTRY */