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

Timestamp:

Mar 5, 2000, 11:21:10 AM (25 years ago)

Author:

jeroen

Message:

* empty log message *

File:

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

trunk/src/opengl/glut/glut_event.c

@@ -1 @@
-/* $Id: glut_event.c,v 1.4 2000-03-04 19:33:43 jeroen Exp $ */
+/* $Id: glut_event.c,v 1.5 2000-03-05 10:19:38 jeroen Exp $ */
 /* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1997, 1998. */
 
@@ -161 +161 @@
   while (IS_AT_OR_AFTER(__glutTimerList->timeout, now)) {
     timer = __glutTimerList;
-    timer->func(timer->value);
+    ((GLUTtimerCB)(timer->func))(timer->value);
     __glutTimerList = timer->next;
     timer->next = freeTimerList;
@@ -245 +245 @@
       window->visState = GLUT_HIDDEN;
       __glutSetWindow(window);
-      window->windowStatus(GLUT_HIDDEN);
+      ((GLUTwindowStatusCB)(window->windowStatus))(GLUT_HIDDEN);
     }
     /* An unmap is only reported on a single window; its
@@ -375 +375 @@
                respect to the XResizeWindow request! */
             glXWaitX();
-            window->reshape(width, height);
+            ((GLUTreshapeCB)(window->reshape))(width, height);
             window->forceReshape = False;
             /* A reshape should be considered like posting a
@@ -449 +449 @@
               __glutSetWindow(window);
               __glutModifierMask = event.xbutton.state;
-              window->mouse(event.xbutton.button - 1,
+              ((GLUTmouseCB)(window->mouse))(event.xbutton.button - 1,
                 event.type == ButtonRelease ?
                 GLUT_UP : GLUT_DOWN,
@@ -472 +472 @@
               (Button1Mask | Button2Mask | Button3Mask)) {
               __glutSetWindow(window);
-              window->motion(event.xmotion.x, event.xmotion.y);
+              ((GLUTmotionCB)(window->motion))(event.xmotion.x, event.xmotion.y);
             }
             /* If passive motion function registered _and_
@@ -482 +482 @@
                 0)) {
               __glutSetWindow(window);
-              window->passive(event.xmotion.x,
+              ((GLUTpassiveCB)(window->passive))(event.xmotion.x,
                 event.xmotion.y);
             }
@@ -532 +532 @@
             __glutSetWindow(window);
             __glutModifierMask = event.xkey.state;
-            keyboard(tmp[0],
+            ((GLUTkeyboardCB)(keyboard))(tmp[0],
               event.xkey.x, event.xkey.y);
             __glutModifierMask = ~0;
@@ -644 +644 @@
             /* The Delete character is really an ASCII key. */
             __glutSetWindow(window);
-            keyboard(127,  /* ASCII Delete character. */
+            ((GLUTkeyboardCB)(keyboard))(127,  /* ASCII Delete character. */
               event.xkey.x, event.xkey.y);
             goto skip;
@@ -700 +700 @@
                 window->entryState = EnterNotify;
                 __glutSetWindow(window);
-                window->entry(GLUT_ENTERED);
+                ((GLUTentryCB)(window->entry))(GLUT_ENTERED);
 
                 if (__glutMappedMenu) {
@@ -719 +719 @@
                   if (window && window->passive && window->win == xid) {
                     __glutSetWindow(window);
-                    window->passive(event.xcrossing.x, event.xcrossing.y);
+                    ((GLUTpassiveCB)(window->passive))(event.xcrossing.x, event.xcrossing.y);
                   }
                 }
@@ -748 +748 @@
                 window->entryState = LeaveNotify;
                 __glutSetWindow(window);
-                window->entry(GLUT_LEFT);
+                ((GLUTentryCB)(window->entry))(GLUT_LEFT);
               }
             }
           } else if (window->passive) {
             __glutSetWindow(window);
-            window->passive(event.xcrossing.x, event.xcrossing.y);
+            ((GLUTpassiveCB)(window->passive))(event.xcrossing.x, event.xcrossing.y);
           }
         }
@@ -789 +789 @@
               window->visState = visState;
               __glutSetWindow(window);
-              window->windowStatus(visState);
+              ((GLUTwindowStatusCB)(window->windowStatus))(visState);
             }
           }
@@ -950 +950 @@
   /* Make sure idle func still exists! */
   if (__glutIdleFunc) {
-    __glutIdleFunc();
+    ((GLUTidleCB)(__glutIdleFunc))();
   }
 }
@@ -959 +959 @@
 processWindowWorkList(GLUTwindow * window)
 {
+//_interrupt(3);
+
   int workMask;
 
@@ -1205 +1207 @@
       __glutSetWindow(window);
 
-      /* 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;
@@ -1262 +1260 @@
         __glutSetWindow(window);
         window->usedSwapBuffers = 0;
-        window->display();
+        ((GLUTdisplayCB)(window->display))();
         __glutWindowDamaged = 0;
 
@@ -1281 +1279 @@
           __glutWindowDamaged = (workMask & GLUT_OVERLAY_REPAIR_WORK);
           __glutSetWindow(window);
-          window->overlay->display();
+          ((GLUTdisplayCB)(window->overlay->display))();
           __glutWindowDamaged = 0;
         } else {
@@ -1304 +1302 @@
       __glutSetWindow(window);
       window->usedSwapBuffers = 0;
-      window->display();
+      ((GLUTdisplayCB)(window->display))();
       __glutWindowDamaged = 0;