Changeset 3080 for trunk/src


Ignore:
Timestamp:
Mar 11, 2000, 10:09:55 AM (25 years ago)
Author:
jeroen
Message:

* empty log message *

Location:
trunk/src/opengl
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/opengl/glut/glut_event.c

    r3079 r3080  
    1 /* $Id: glut_event.c,v 1.6 2000-03-11 09:05:04 jeroen Exp $ */
     1/* $Id: glut_event.c,v 1.7 2000-03-11 09:07:12 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1997, 1998. */
    33
    … …  
    321321processEventsAndTimeouts(void)
    322322{
    323   WriteLog("processEventsAndTimeouts() entry\n");
    324323  do {
    325324#if defined(_WIN32) || defined(__WIN32OS2__)
    … …  
    827826#endif /* _WIN32 */
    828827    if (__glutTimerList) {
    829   WriteLog("processEventsAndTimeouts -> Calling handleTimeouts\n");
    830828      handleTimeouts();
    831   WriteLog("processEventsAndTimeouts -> Call handleTimeouts returned\n");
    832829    }
    833830  }
    … …  
    934931  if (XPending(__glutDisplay)) {
    935932  immediatelyHandleXinput:
    936     WriteLog("waitForSmoething: Calling processEventsAndTimeouts\n");
    937933    processEventsAndTimeouts();
    938     WriteLog("waitForSmoething: Call processEventsAndTimeouts returned\n");
    939934  } else {
    940935    if (__glutTimerList)
    … …  
    947942{
    948943  if (XPending(__glutDisplay)) {
    949     WriteLog("idleWait: Calling processEventsAndTimeouts\n");
    950944    processEventsAndTimeouts();
    951     WriteLog("idleWait: Call processEventsAndTimeouts returned\n");
    952945  } else {
    953946    if (__glutTimerList) {
    … …  
    13781371        waitForSomething();
    13791372      } else {
    1380     WriteLog("glutMainLoop: Calling processEventsAndTimeouts\n");
    13811373        processEventsAndTimeouts();
    1382     WriteLog("glutMainLoop: Call processEventsAndTimeouts returned\n");
    13831374      }
    13841375    }

  • trunk/src/opengl/mesa/GL/glut.h

    r3023 r3080  
    1 /* $Id: glut.h,v 1.2 2000-03-05 10:26:18 jeroen Exp $ */
     1/* $Id: glut.h,v 1.3 2000-03-11 09:05:07 jeroen Exp $ */
    22#ifndef __glut_h__
    33#define __glut_h__
    … …  
    467467
    468468/* GLUT window callback sub-API. */
    469 extern void GLAPIENTRY glutDisplayFunc(void (* CDECL func)(void));
    470 extern void GLAPIENTRY glutReshapeFunc(void (* CDECL func)(int width, int height));
    471 extern void GLAPIENTRY glutKeyboardFunc(void (* CDECL func)(unsigned char key, int x, int y));
    472 extern void GLAPIENTRY glutMouseFunc(void (* CDECL func)(int button, int state, int x, int y));
    473 extern void GLAPIENTRY glutMotionFunc(void (* CDECL func)(int x, int y));
    474 extern void GLAPIENTRY glutPassiveMotionFunc(void (* CDECL func)(int x, int y));
    475 extern void GLAPIENTRY glutEntryFunc(void (* CDECL func)(int state));
    476 extern void GLAPIENTRY glutVisibilityFunc(void (* CDECL func)(int state));
    477 extern void GLAPIENTRY glutIdleFunc(void (* CDECL func)(void));
    478 extern void GLAPIENTRY glutTimerFunc(unsigned int millis, void (* CDECL func)(int value), int value);
    479 extern void GLAPIENTRY glutMenuStateFunc(void (* CDECL func)(int state));
     469extern void GLAPIENTRY glutDisplayFunc(void (* GLCALLBACK func)(void));
     470extern void GLAPIENTRY glutReshapeFunc(void (* GLCALLBACK func)(int width, int height));
     471extern void GLAPIENTRY glutKeyboardFunc(void (* GLCALLBACK func)(unsigned char key, int x, int y));
     472extern void GLAPIENTRY glutMouseFunc(void (* GLCALLBACK func)(int button, int state, int x, int y));
     473extern void GLAPIENTRY glutMotionFunc(void (* GLCALLBACK func)(int x, int y));
     474extern void GLAPIENTRY glutPassiveMotionFunc(void (* GLCALLBACK func)(int x, int y));
     475extern void GLAPIENTRY glutEntryFunc(void (* GLCALLBACK func)(int state));
     476extern void GLAPIENTRY glutVisibilityFunc(void (* GLCALLBACK func)(int state));
     477extern void GLAPIENTRY glutIdleFunc(void (* GLCALLBACK func)(void));
     478extern void GLAPIENTRY glutTimerFunc(unsigned int millis, void (* GLCALLBACK func)(int value), int value);
     479extern void GLAPIENTRY glutMenuStateFunc(void (* GLCALLBACK func)(int state));
    480480#if (GLUT_API_VERSION >= 2)
    481 extern void GLAPIENTRY glutSpecialFunc(void (* CDECL func)(int key, int x, int y));
    482 extern void GLAPIENTRY glutSpaceballMotionFunc(void (* CDECL func)(int x, int y, int z));
    483 extern void GLAPIENTRY glutSpaceballRotateFunc(void (* CDECL func)(int x, int y, int z));
    484 extern void GLAPIENTRY glutSpaceballButtonFunc(void (* CDECL func)(int button, int state));
    485 extern void GLAPIENTRY glutButtonBoxFunc(void (* CDECL func)(int button, int state));
    486 extern void GLAPIENTRY glutDialsFunc(void (* CDECL func)(int dial, int value));
    487 extern void GLAPIENTRY glutTabletMotionFunc(void (* CDECL func)(int x, int y));
    488 extern void GLAPIENTRY glutTabletButtonFunc(void (* CDECL func)(int button, int state, int x, int y));
    489 #if (GLUT_API_VERSION >= 3)
    490 extern void GLAPIENTRY glutMenuStatusFunc(void (* CDECL func)(int status, int x, int y));
    491 extern void GLAPIENTRY glutOverlayDisplayFunc(void (* CDECL func)(void));
     481extern void GLAPIENTRY glutSpecialFunc(void (* GLCALLBACK func)(int key, int x, int y));
     482extern void GLAPIENTRY glutSpaceballMotionFunc(void (* GLCALLBACK func)(int x, int y, int z));
     483extern void GLAPIENTRY glutSpaceballRotateFunc(void (* GLCALLBACK func)(int x, int y, int z));
     484extern void GLAPIENTRY glutSpaceballButtonFunc(void (* GLCALLBACK func)(int button, int state));
     485extern void GLAPIENTRY glutButtonBoxFunc(void (* GLCALLBACK func)(int button, int state));
     486extern void GLAPIENTRY glutDialsFunc(void (* GLCALLBACK func)(int dial, int value));
     487extern void GLAPIENTRY glutTabletMotionFunc(void (* GLCALLBACK func)(int x, int y));
     488extern void GLAPIENTRY glutTabletButtonFunc(void (* GLCALLBACK func)(int button, int state, int x, int y));
     489#if (GLUT_API_VERSION >= 3)
     490extern void GLAPIENTRY glutMenuStatusFunc(void (* GLCALLBACK func)(int status, int x, int y));
     491extern void GLAPIENTRY glutOverlayDisplayFunc(void (* GLCALLBACK func)(void));
    492492#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
    493 extern void GLAPIENTRY glutWindowStatusFunc(void (* CDECL func)(int state));
     493extern void GLAPIENTRY glutWindowStatusFunc(void (* GLCALLBACK func)(int state));
    494494#endif
    495495#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13)
    496 extern void GLAPIENTRY glutKeyboardUpFunc(void (* CDECL func)(unsigned char key, int x, int y));
    497 extern void GLAPIENTRY glutSpecialUpFunc(void (* CDECL func)(int key, int x, int y));
    498 extern void GLAPIENTRY glutJoystickFunc(void (* CDECL func)(unsigned int buttonMask, int x, int y, int z), int pollInterval);
     496extern void GLAPIENTRY glutKeyboardUpFunc(void (* GLCALLBACK func)(unsigned char key, int x, int y));
     497extern void GLAPIENTRY glutSpecialUpFunc(void (* GLCALLBACK func)(int key, int x, int y));
     498extern void GLAPIENTRY glutJoystickFunc(void (* GLCALLBACK func)(unsigned int buttonMask, int x, int y, int z), int pollInterval);
    499499#endif
    500500#endif

  • trunk/src/opengl/mesa/api1.c

    r3079 r3080  
    1 /* $Id: api1.c,v 1.2 2000-03-11 09:05:06 jeroen Exp $ */
     1/* $Id: api1.c,v 1.3 2000-03-11 09:07:13 jeroen Exp $ */
    22
    33/*
    … …  
    966966   IM->Flag[count] |= VERT_EVAL_C2;                     \
    967967   ASSIGN_4V(IM->Obj[count], x, y, 0, 1);               \
    968    WriteLog("OPENGL32: EVALCOORD2 (%f,%f) IM: %08X - cnt %d\n",x,y,IM,count); \
    969968   if (count == VB_MAX-1)                               \
    970    {WriteLog("OPENGL32: EVALCOORD2 is calling maybe_transform\n"); \
    971969      IM->maybe_transform_vb( IM );                     }\
    972970}
Note: See TracChangeset for help on using the changeset viewer.