Changeset 3079 for trunk/src/opengl/glut

Timestamp:

Mar 11, 2000, 10:05:07 AM (25 years ago)

Author:

jeroen

Message:

* empty log message *

Location:

trunk/src/opengl/glut

Files:

• glut_event.c (modified) (6 diffs)
• glut_term.c (modified) (2 diffs)
• glut_win.c (modified) (4 diffs)
• glutint.h (modified) (4 diffs)
• win32_menu.c (modified) (2 diffs)

trunk/src/opengl/glut/glut_event.c

@@ -1 @@
-/* $Id: glut_event.c,v 1.5 2000-03-05 10:19:38 jeroen Exp $ */
+/* $Id: glut_event.c,v 1.6 2000-03-11 09:05:04 jeroen Exp $ */
 /* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1997, 1998. */
 
@@ -321 +321 @@
 processEventsAndTimeouts(void)
 {
+  WriteLog("processEventsAndTimeouts() entry\n");
   do {
 #if defined(_WIN32) || defined(__WIN32OS2__)
@@ -826 +827 @@
 #endif /* _WIN32 */
     if (__glutTimerList) {
+  WriteLog("processEventsAndTimeouts -> Calling handleTimeouts\n");
       handleTimeouts();
+  WriteLog("processEventsAndTimeouts -> Call handleTimeouts returned\n");
     }
   }
@@ -931 +934 @@
   if (XPending(__glutDisplay)) {
   immediatelyHandleXinput:
+    WriteLog("waitForSmoething: Calling processEventsAndTimeouts\n");
     processEventsAndTimeouts();
+    WriteLog("waitForSmoething: Call processEventsAndTimeouts returned\n");
   } else {
     if (__glutTimerList)
@@ -942 +947 @@
 {
   if (XPending(__glutDisplay)) {
+    WriteLog("idleWait: Calling processEventsAndTimeouts\n");
     processEventsAndTimeouts();
+    WriteLog("idleWait: Call processEventsAndTimeouts returned\n");
   } else {
     if (__glutTimerList) {
@@ -1371 +1378 @@
         waitForSomething();
       } else {
+    WriteLog("glutMainLoop: Calling processEventsAndTimeouts\n");
         processEventsAndTimeouts();
+    WriteLog("glutMainLoop: Call processEventsAndTimeouts returned\n");
       }
     }

trunk/src/opengl/glut/glut_term.c

@@ -1 @@
-/* $Id: glut_term.c,v 1.2 2000-03-04 19:10:15 jeroen Exp $ */
+/* $Id: glut_term.c,v 1.3 2000-03-11 09:05:05 jeroen Exp $ */
 /*
  * GLUT Termination - on exit cleanup any open windows
@@ -6 +6 @@
 
 #include <odinwrap.h>
+#include "glut.h"
 #include "glu.h"
-#include "glut.h"
 #include "glutint.h"
 

trunk/src/opengl/glut/glut_win.c

@@ -1 @@
-/* $Id: glut_win.c,v 1.5 2000-03-05 10:19:38 jeroen Exp $ */
+/* $Id: glut_win.c,v 1.6 2000-03-11 09:05:05 jeroen Exp $ */
 /* Copyright (c) Mark J. Kilgard, 1994, 1997.  */
 
@@ -403 +403 @@
 }
 
-void CDECL
+void GLCALLBACK
 __glutDefaultDisplay(void)
 {
@@ -413 +413 @@
 }
 
-void CDECL
+void GLCALLBACK
 __glutDefaultReshape(int width, int height)
 {
@@ -1003 +1003 @@
 }
 
-static void GLAPIENTRY
+static void GLCALLBACK
 visibilityHelper(int status)
 {

trunk/src/opengl/glut/glutint.h

@@ -1 @@
-/* $Id: glutint.h,v 1.4 2000-03-05 10:19:38 jeroen Exp $ */
+/* $Id: glutint.h,v 1.5 2000-03-11 09:05:05 jeroen Exp $ */
 #ifndef __glutint_h__
 #define __glutint_h__
@@ -253 +253 @@
 
 /* GLUT  function types */
-typedef void (* CDECL GLUTdisplayCB) (void);
-typedef void (* CDECL GLUTreshapeCB) (int, int);
-typedef void (* CDECL GLUTkeyboardCB) (unsigned char, int, int);
-typedef void (* CDECL GLUTmouseCB) (int, int, int, int);
-typedef void (* CDECL GLUTmotionCB) (int, int);
-typedef void (* CDECL GLUTpassiveCB) (int, int);
-typedef void (* CDECL GLUTentryCB) (int);
-typedef void (* CDECL GLUTvisibilityCB) (int);
-typedef void (* CDECL GLUTwindowStatusCB) (int);
-typedef void (* CDECL GLUTidleCB) (void);
-typedef void (* CDECL GLUTtimerCB) (int);
-typedef void (* CDECL GLUTmenuStateCB) (int);  /* DEPRICATED.              */
-typedef void (* CDECL GLUTmenuStatusCB) (int, int, int);
-typedef void (* CDECL GLUTselectCB) (int);
-typedef void (* CDECL GLUTspecialCB) (int, int, int);
-typedef void (* CDECL GLUTspaceMotionCB) (int, int, int);
-typedef void (* CDECL GLUTspaceRotateCB) (int, int, int);
-typedef void (* CDECL GLUTspaceButtonCB) (int, int);
-typedef void (* CDECL GLUTdialsCB) (int, int);
-typedef void (* CDECL GLUTbuttonBoxCB) (int, int);
-typedef void (* CDECL GLUTtabletMotionCB) (int, int);
-typedef void (* CDECL GLUTtabletButtonCB) (int, int, int, int);
-typedef void (* CDECL GLUTjoystickCB) (unsigned int buttonMask, int x, int y, int z);
+typedef void (* GLCALLBACK GLUTdisplayCB) (void);
+typedef void (* GLCALLBACK GLUTreshapeCB) (int, int);
+typedef void (* GLCALLBACK GLUTkeyboardCB) (unsigned char, int, int);
+typedef void (* GLCALLBACK GLUTmouseCB) (int, int, int, int);
+typedef void (* GLCALLBACK GLUTmotionCB) (int, int);
+typedef void (* GLCALLBACK GLUTpassiveCB) (int, int);
+typedef void (* GLCALLBACK GLUTentryCB) (int);
+typedef void (* GLCALLBACK GLUTvisibilityCB) (int);
+typedef void (* GLCALLBACK GLUTwindowStatusCB) (int);
+typedef void (* GLCALLBACK GLUTidleCB) (void);
+typedef void (* GLCALLBACK GLUTtimerCB) (int);
+typedef void (* GLCALLBACK GLUTmenuStateCB) (int);  /* DEPRICATED.              */
+typedef void (* GLCALLBACK GLUTmenuStatusCB) (int, int, int);
+typedef void (* GLCALLBACK GLUTselectCB) (int);
+typedef void (* GLCALLBACK GLUTspecialCB) (int, int, int);
+typedef void (* GLCALLBACK GLUTspaceMotionCB) (int, int, int);
+typedef void (* GLCALLBACK GLUTspaceRotateCB) (int, int, int);
+typedef void (* GLCALLBACK GLUTspaceButtonCB) (int, int);
+typedef void (* GLCALLBACK GLUTdialsCB) (int, int);
+typedef void (* GLCALLBACK GLUTbuttonBoxCB) (int, int);
+typedef void (* GLCALLBACK GLUTtabletMotionCB) (int, int);
+typedef void (* GLCALLBACK GLUTtabletButtonCB) (int, int, int, int);
+typedef void (* GLCALLBACK GLUTjoystickCB) (unsigned int buttonMask, int x, int y, int z);
 #ifdef SUPPORT_FORTRAN
 typedef void (*GLUTdisplayFCB) (void);
@@ -664 +664 @@
 extern GLUTmenuItem *__glutItemSelected;
 extern GLUTmenu **__glutMenuList;
-extern void (* CDECL __glutMenuStatusFunc) (int, int, int);
+extern void (* GLCALLBACK __glutMenuStatusFunc) (int, int, int);
 extern void __glutMenuModificationError(void);
 extern void __glutSetMenuItem(GLUTmenuItem * item,
@@ -746 +746 @@
 extern void __glutReshapeFunc(GLUTreshapeCB reshapeFunc,
   int callingConvention);
-extern void  CDECL __glutDefaultReshape(int, int);
+extern void  GLCALLBACK __glutDefaultReshape(int, int);
 extern GLUTwindow *__glutCreateWindow(
   GLUTwindow * parent,

trunk/src/opengl/glut/win32_menu.c

@@ -1 @@
-/* $Id: win32_menu.c,v 1.3 2000-03-05 10:19:39 jeroen Exp $ */
+/* $Id: win32_menu.c,v 1.4 2000-03-11 09:05:05 jeroen Exp $ */
 /* Copyright (c) Mark J. Kilgard, 1994, 1997, 1998. */
 /* Copyright (c) Nate Robins, 1997. */
@@ -19 +19 @@
 #include "glutint.h"
 
-void (* CDECL __glutMenuStatusFunc) (int, int, int);
+void (* GLCALLBACK __glutMenuStatusFunc) (int, int, int);
 extern GLUTmenu *__glutMappedMenu;
 extern GLUTwindow *__glutMenuWindow;