Changeset 2996 for trunk/src/opengl/glut


Ignore:
Timestamp:
Mar 4, 2000, 8:10:18 PM (25 years ago)
Author:
jeroen
Message:

* empty log message *

Location:
trunk/src/opengl/glut
Files:
1 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/opengl/glut/Makefile

    r2945 r2996  
    1 # $Id: Makefile,v 1.7 2000-02-29 13:56:51 sandervl Exp $
     1# $Id: Makefile,v 1.8 2000-03-04 19:10:13 jeroen Exp $
    22
    33#
    … …  
    2626CFLAGS = -Tdp -I..\mesa\GL -I..\glu $(CFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa
    2727CXXFLAGS = -Tdp -I..\mesa\GL -I..\glu $(CXXFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa
     28
     29CFLAGS=$(CFLAGS) -O-
    2830
    2931TARGET=GLUT32

  • trunk/src/opengl/glut/glut32.rc

    r2699 r2996  
    1 /* $Id: glut32.rc,v 1.1 2000-02-09 13:44:32 sandervl Exp $ */
     1/* $Id: glut32.rc,v 1.2 2000-03-04 19:10:14 jeroen Exp $ */
    22
    33#include "winuser.h"
    … …  
    2424            VALUE "Comments", "Odin32 System Dll\0"
    2525            VALUE "CompanyName", "\0"
    26             VALUE "FileDescription", "OpenGL Utility Library DLL\0"
     26            VALUE "FileDescription", "OpenGL Utility Toolkit DLL\0"
    2727            VALUE "FileVersion", "4.00\0"
    2828            VALUE "InternalName", "glut32\0"
    … …  
    3636    BLOCK "VarFileInfo"
    3737    BEGIN
    38         VALUE "Translation", 0x409, 0x04E4
     38        VALUE "Translation", 0x409, 0x04E4
    3939    END
    4040END

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

    r2689 r2996  
    1 /* $Id: glut_event.c,v 1.2 2000-02-09 08:46:09 jeroen Exp $ */
     1/* $Id: glut_event.c,v 1.3 2000-03-04 19:10:14 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1997, 1998. */
    33
    … …  
    100100int __glutWindowDamaged = 0;
    101101
    102 void APIENTRY
     102void GLAPIENTRY
    103103glutIdleFunc(GLUTidleCB idleFunc)
    104104{
    … …  
    106106}
    107107
    108 void APIENTRY
     108void GLAPIENTRY
    109109glutTimerFunc(unsigned int interval, GLUTtimerCB timerFunc, int value)
    110110{
    … …  
    204204
    205205/* CENTRY */
    206 void APIENTRY
     206void GLAPIENTRY
    207207glutPostRedisplay(void)
    208208{
    … …  
    214214   particularly useful when multiple windows need redisplays posted at
    215215   the same times.  See also glutPostWindowOverlayRedisplay. */
    216 void APIENTRY
     216void GLAPIENTRY
    217217glutPostWindowRedisplay(int win)
    218218{
    … …  
    12051205      __glutSetWindow(window);
    12061206
    1207       window->reshape(window->width, window->height);
     1207      /* JvdH: DO NOT REMPVE THE EXPLICIT TYPECAST TO THIS GLAPIENTRY   */
     1208      /* FUNCTION, OR THE COMPILER WILL NUKE THE STACK WHEN OPTIMIZING! */
     1209      /* VACPP obviously has a bug, and will adjust the ESP after the   */
     1210      /* call, but the callee has already done so!!!!                   */
     1211      ((GLUTreshapeCB)(window->reshape))(window->width, window->height);
    12081212      window->forceReshape = False;
    1209 
    1210 #ifdef __WIN32OS2__
    1211       /* JvdH - 03/02/2000 */
    1212       /* FIXME: This is a rather stupid hack... */
    1213       /* The client area appears transparent... */
    1214       /* By twice swapping the ZORDER the client area is repainted... */
    1215       /* I'd like a better fix, but for now this seems to work */
    1216       SetWindowPos(window->win,
    1217                    HWND_BOTTOM,
    1218                    0,0,
    1219                    0,0,
    1220                    SWP_NOMOVE | SWP_NOSIZE);
    1221 
    1222       SetWindowPos(window->win,
    1223                    HWND_TOP,
    1224                    0,0,
    1225                    0,0,
    1226                    SWP_NOMOVE | SWP_NOSIZE);
    1227 #endif
    12281213
    12291214      /* Setting the redisplay bit on the first reshape is
    … …  
    12341219         happens to the window. */
    12351220      workMask |= GLUT_REDISPLAY_WORK;
    1236     }
    1237 
     1221
     1222    }
    12381223
    12391224    /* The code below is more involved than otherwise necessary
    … …  
    12601245        if (__glutMesaSwapHackSupport) {
    12611246          if (window->usedSwapBuffers) {
     1247
    12621248            if ((workMask & (GLUT_REPAIR_WORK | GLUT_REDISPLAY_WORK)) == GLUT_REPAIR_WORK) {
    12631249              SWAP_BUFFERS_WINDOW(window);
    … …  
    12821268      }
    12831269      if (workMask & (GLUT_OVERLAY_REDISPLAY_WORK | GLUT_OVERLAY_REPAIR_WORK)) {
     1270
    12841271        window = __glutWindowList[num];
    12851272        if (window && window->overlay &&
    … …  
    13061293        if (!window->overlay && window->usedSwapBuffers) {
    13071294          if ((workMask & (GLUT_REPAIR_WORK | GLUT_REDISPLAY_WORK)) == GLUT_REPAIR_WORK) {
     1295
    13081296            SWAP_BUFFERS_WINDOW(window);
    13091297            goto skippedDisplayCallback2;
    … …  
    13121300      }
    13131301      /* Render to normal plane (and possibly overlay). */
     1302
    13141303      __glutWindowDamaged = (workMask & (GLUT_OVERLAY_REPAIR_WORK | GLUT_REPAIR_WORK));
    13151304      __glutSetWindow(window);
    … …  
    13271316
    13281317  if (workMask & GLUT_FINISH_WORK) {
     1318
    13291319    /* Finish work makes sure a glFinish gets done to indirect
    13301320       rendering contexts.  Indirect contexts tend to have much
    … …  
    13421332  /* Strip out dummy, finish, and debug work bits. */
    13431333  window->workMask &= ~(GLUT_DUMMY_WORK | GLUT_FINISH_WORK | GLUT_DEBUG_WORK);
     1334
     1335    WriteLog("GLUT32: processWindowWorkList -> will now return!\n");
     1336
    13441337  if (window->workMask) {
    13451338    /* Leave on work list. */
    … …  
    13521345
    13531346/* CENTRY */
    1354 void APIENTRY
     1347void GLAPIENTRY
    13551348glutMainLoop(void)
    13561349{
     1350  WriteLog("GLUT32 MainLoop entered\n");
    13571351#if !defined(_WIN32) && !defined(__WIN32OS2__)
    13581352  if (!__glutDisplay)
    … …  
    13631357      "main loop entered with no windows created.");
    13641358  for (;;) {
     1359    WriteLog("GLUT32 --> LOOP in!\n");
    13651360    if (__glutWindowWorkList) {
    13661361      GLUTwindow *remainder, *work;
    … …  
    13731368          *beforeEnd = __glutWindowWorkList;
    13741369          __glutWindowWorkList = remainder;
    1375         }
     1370       }
    13761371      }
    13771372    }
    … …  
    13821377        waitForSomething();
    13831378      } else {
     1379    WriteLog("Calling processEventsAndTimeouts from #1403\n");
    13841380        processEventsAndTimeouts();
    1385       }
    1386     }
    1387   }
     1381    WriteLog("processEventsAndTimeouts from #1403 returned!\n");
     1382      }
     1383    }
     1384  }
     1385
     1386    WriteLog("MainLoop ended... ???\n");
    13881387}
    13891388/* ENDCENTRY */

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

    r2689 r2996  
    1 /* $Id: glut_get.c,v 1.2 2000-02-09 08:46:12 jeroen Exp $ */
     1/* $Id: glut_get.c,v 1.3 2000-03-04 19:10:14 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994, 1997, 1998. */
    33
    … …  
    1111
    1212/* CENTRY */
    13 int APIENTRY
     13int GLAPIENTRY
    1414glutGet(GLenum param)
    1515{

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

    r2689 r2996  
    1 /* $Id: glut_init.c,v 1.2 2000-02-09 08:46:13 jeroen Exp $ */
     1/* $Id: glut_init.c,v 1.3 2000-03-04 19:10:15 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994, 1997. */
    33
    … …  
    1616
    1717#if defined(__WIN32OS2__)
     18#include <windows.h>
    1819#include "winconst.h"
     20#include "GL\gl.h"
    1921#undef WH_NB_HOOKS /* Get rid of copiler warning... */
    2022#endif
    … …  
    199201glutInit(int *argcp, char **argv)
    200202{
     203  dprintf(("GLUT32: glutInit()\n"));
     204
    201205  char *display = NULL;
    202206  char *str, *geometry = NULL;
    … …  
    373377glutInitDisplayMode(unsigned int mask)
    374378{
     379  dprintf(("GLUT32: glutInitDisplayMode()\n"));
    375380  __glutDisplayMode = mask;
    376381}

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

    r2689 r2996  
    1 /* $Id: glut_overlay.c,v 1.2 2000-02-09 08:46:15 jeroen Exp $ */
     1/* $Id: glut_overlay.c,v 1.3 2000-03-04 19:10:15 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1996, 1997.  */
    33
    … …  
    2626#include "layerutil.h"
    2727
    28 #if defined(__WIN32OS2__)
    29 #include "wgl.h"
    30 #endif
     28//#if defined(__WIN32OS2__)
     29//#include "wgl.h"
     30//#endif
    3131
    3232static Criterion requiredOverlayCriteria[] =

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

    r2689 r2996  
    1 /* $Id: glut_term.c,v 1.1 2000-02-09 08:46:18 jeroen Exp $ */
     1/* $Id: glut_term.c,v 1.2 2000-03-04 19:10:15 jeroen Exp $ */
    22/*
    33 * GLUT Termination - on exit cleanup any open windows
    … …  
    1111
    1212
    13 ODINDEBUGCHANNEL (GLUT32-MAIN)
    14 
    15 ODINFUNCTION3(BOOL, Glut32LibMain, HINSTANCE, hinstDLL,
    16                                    DWORD,     fdwReason,
    17                                    LPVOID,    ImpLoad)
     13void CDECL Glut32Terminate(void)
    1814{
    19   if(fdwReason==DLL_PROCESS_DETACH)
    20     {
    2115      /* Our app has ended - close all the open windows! */
    2216      dprintf(("GLUT internal cleanup - numwins %d\n",__glutWindowListSize));
    … …  
    3024          }
    3125      }
    32     }
    33 
    34   return TRUE;
    3526}

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

    r2689 r2996  
    1 /* $Id: glut_win.c,v 1.2 2000-02-09 08:46:19 jeroen Exp $ */
     1/* $Id: glut_win.c,v 1.3 2000-03-04 19:10:16 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994, 1997.  */
    33
    … …  
    1717#include "glutint.h"
    1818
    19 #if defined(__WIN32OS2__)
    20 #include "wgl.h"
    21 #endif
     19//#if defined(__WIN32OS2__)
     20//#include "wgl.h"
     21//#endif
    2222
    2323GLUTwindow *__glutCurrentWindow = NULL;
    … …  
    131131
    132132/* CENTRY */
    133 int APIENTRY
     133int GLAPIENTRY
    134134glutGetWindow(void)
    135135{
    … …  
    178178
    179179/* CENTRY */
    180 void APIENTRY
     180void GLAPIENTRY
    181181glutSetWindow(int win)
    182182{
    … …  
    403403}
    404404
    405 void APIENTRY
     405void GLAPIENTRY
    406406__glutDefaultDisplay(void)
    407407{
    … …  
    413413}
    414414
    415 void APIENTRY
     415void GLAPIENTRY
    416416__glutDefaultReshape(int width, int height)
    417417{
    … …  
    718718
    719719/* CENTRY */
    720 int APIENTRY
     720int GLAPIENTRY
    721721glutCreateWindow(const char *title)
    722722{
    … …  
    768768}
    769769
    770 int APIENTRY
     770int GLAPIENTRY
    771771glutCreateSubWindow(int win, int x, int y, int width, int height)
    772772{
    … …  
    860860
    861861/* CENTRY */
    862 void APIENTRY
     862void GLAPIENTRY
    863863glutDestroyWindow(int win)
    864864{
    … …  
    903903}
    904904
    905 void APIENTRY
     905void GLAPIENTRY
    906906glutDisplayFunc(GLUTdisplayCB displayFunc)
    907907{
    … …  
    912912}
    913913
    914 void APIENTRY
     914void GLAPIENTRY
    915915glutMouseFunc(GLUTmouseCB mouseFunc)
    916916{
    … …  
    934934}
    935935
    936 void APIENTRY
     936void GLAPIENTRY
    937937glutMotionFunc(GLUTmotionCB motionFunc)
    938938{
    … …  
    965965}
    966966
    967 void APIENTRY
     967void GLAPIENTRY
    968968glutPassiveMotionFunc(GLUTpassiveCB passiveMotionFunc)
    969969{
    … …  
    980980}
    981981
    982 void APIENTRY
     982void GLAPIENTRY
    983983glutEntryFunc(GLUTentryCB entryFunc)
    984984{
    … …  
    991991}
    992992
    993 void APIENTRY
     993void GLAPIENTRY
    994994glutWindowStatusFunc(GLUTwindowStatusCB windowStatusFunc)
    995995{
    … …  
    10031003}
    10041004
    1005 static void
    1006 #ifdef __WIN32OS2__
    1007 _Optlink
    1008 #endif
     1005static void GLAPIENTRY
    10091006visibilityHelper(int status)
    10101007{
    … …  
    10151012}
    10161013
    1017 void APIENTRY
     1014void GLAPIENTRY
    10181015glutVisibilityFunc(GLUTvisibilityCB visibilityFunc)
    10191016{
    … …  
    10251022}
    10261023
    1027 void APIENTRY
     1024void GLAPIENTRY
    10281025glutReshapeFunc(GLUTreshapeCB reshapeFunc)
    10291026{
     1027  WriteLog("GLUT32: Setting reshapeFunc to @%08X\n",reshapeFunc);
    10301028  if (reshapeFunc) {
    10311029    __glutCurrentWindow->reshape = reshapeFunc;

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

    r2689 r2996  
    1 /* $Id: glut_winmisc.c,v 1.2 2000-02-09 08:46:19 jeroen Exp $ */
     1/* $Id: glut_winmisc.c,v 1.3 2000-03-04 19:10:16 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994.  */
    33
    … …  
    2020
    2121/* CENTRY */
    22 void APIENTRY
     22void GLAPIENTRY
    2323glutSetWindowTitle(const char *title)
    2424{
    … …  
    3737}
    3838
    39 void APIENTRY
     39void GLAPIENTRY
    4040glutSetIconTitle(const char *title)
    4141{
    … …  
    5353}
    5454
    55 void APIENTRY
     55void GLAPIENTRY
    5656glutPositionWindow(int x, int y)
    5757{
    … …  
    6363}
    6464
    65 void APIENTRY
     65void GLAPIENTRY
    6666glutReshapeWindow(int w, int h)
    6767{
     68  WriteLog("glutReshapeWindow (glut_winmisc)\n");
    6869  IGNORE_IN_GAME_MODE();
    6970  if (w <= 0 || h <= 0)
    … …  
    7677}
    7778
    78 void APIENTRY
     79void GLAPIENTRY
    7980glutPopWindow(void)
    8081{
    … …  
    8586}
    8687
    87 void APIENTRY
     88void GLAPIENTRY
    8889glutPushWindow(void)
    8990{
    … …  
    9495}
    9596
    96 void APIENTRY
     97void GLAPIENTRY
    9798glutIconifyWindow(void)
    9899{
    … …  
    103104}
    104105
    105 void APIENTRY
     106void GLAPIENTRY
    106107glutShowWindow(void)
    107108{
    … …  
    111112}
    112113
    113 void APIENTRY
     114void GLAPIENTRY
    114115glutHideWindow(void)
    115116{

  • trunk/src/opengl/glut/glutint.h

    r2689 r2996  
    1 /* $Id: glutint.h,v 1.2 2000-02-09 08:46:19 jeroen Exp $ */
     1/* $Id: glutint.h,v 1.3 2000-03-04 19:10:16 jeroen Exp $ */
    22#ifndef __glutint_h__
    33#define __glutint_h__
    … …  
    253253
    254254/* GLUT  function types */
    255 typedef void (* APIENTRY GLUTdisplayCB) (void);
    256 typedef void (* APIENTRY GLUTreshapeCB) (int, int);
    257 typedef void (* APIENTRY GLUTkeyboardCB) (unsigned char, int, int);
    258 typedef void (* APIENTRY GLUTmouseCB) (int, int, int, int);
    259 typedef void (* APIENTRY GLUTmotionCB) (int, int);
    260 typedef void (* APIENTRY GLUTpassiveCB) (int, int);
    261 typedef void (* APIENTRY GLUTentryCB) (int);
    262 typedef void (* APIENTRY GLUTvisibilityCB) (int);
    263 typedef void (* APIENTRY GLUTwindowStatusCB) (int);
    264 typedef void (* APIENTRY GLUTidleCB) (void);
    265 typedef void (* APIENTRY GLUTtimerCB) (int);
    266 typedef void (* APIENTRY GLUTmenuStateCB) (int);       /* DEPRICATED.      */
    267 typedef void (* APIENTRY GLUTmenuStatusCB) (int, int, int);
    268 typedef void (* APIENTRY GLUTselectCB) (int);
    269 typedef void (* APIENTRY GLUTspecialCB) (int, int, int);
    270 typedef void (* APIENTRY GLUTspaceMotionCB) (int, int, int);
    271 typedef void (* APIENTRY GLUTspaceRotateCB) (int, int, int);
    272 typedef void (* APIENTRY GLUTspaceButtonCB) (int, int);
    273 typedef void (* APIENTRY GLUTdialsCB) (int, int);
    274 typedef void (* APIENTRY GLUTbuttonBoxCB) (int, int);
    275 typedef void (* APIENTRY GLUTtabletMotionCB) (int, int);
    276 typedef void (* APIENTRY GLUTtabletButtonCB) (int, int, int, int);
    277 typedef void (* APIENTRY GLUTjoystickCB) (unsigned int buttonMask, int x, int y, int z);
     255typedef void (* GLAPIENTRY GLUTdisplayCB) (void);
     256typedef void (* GLAPIENTRY GLUTreshapeCB) (int, int);
     257typedef void (* GLAPIENTRY GLUTkeyboardCB) (unsigned char, int, int);
     258typedef void (* GLAPIENTRY GLUTmouseCB) (int, int, int, int);
     259typedef void (* GLAPIENTRY GLUTmotionCB) (int, int);
     260typedef void (* GLAPIENTRY GLUTpassiveCB) (int, int);
     261typedef void (* GLAPIENTRY GLUTentryCB) (int);
     262typedef void (* GLAPIENTRY GLUTvisibilityCB) (int);
     263typedef void (* GLAPIENTRY GLUTwindowStatusCB) (int);
     264typedef void (* GLAPIENTRY GLUTidleCB) (void);
     265typedef void (* GLAPIENTRY GLUTtimerCB) (int);
     266typedef void (* GLAPIENTRY GLUTmenuStateCB) (int);     /* DEPRICATED.      */
     267typedef void (* GLAPIENTRY GLUTmenuStatusCB) (int, int, int);
     268typedef void (* GLAPIENTRY GLUTselectCB) (int);
     269typedef void (* GLAPIENTRY GLUTspecialCB) (int, int, int);
     270typedef void (* GLAPIENTRY GLUTspaceMotionCB) (int, int, int);
     271typedef void (* GLAPIENTRY GLUTspaceRotateCB) (int, int, int);
     272typedef void (* GLAPIENTRY GLUTspaceButtonCB) (int, int);
     273typedef void (* GLAPIENTRY GLUTdialsCB) (int, int);
     274typedef void (* GLAPIENTRY GLUTbuttonBoxCB) (int, int);
     275typedef void (* GLAPIENTRY GLUTtabletMotionCB) (int, int);
     276typedef void (* GLAPIENTRY GLUTtabletButtonCB) (int, int, int, int);
     277typedef void (* GLAPIENTRY GLUTjoystickCB) (unsigned int buttonMask, int x, int y, int z);
    278278#ifdef SUPPORT_FORTRAN
    279279typedef void (*GLUTdisplayFCB) (void);
    … …  
    664664extern GLUTmenuItem *__glutItemSelected;
    665665extern GLUTmenu **__glutMenuList;
    666 extern void (* APIENTRY __glutMenuStatusFunc) (int, int, int);
     666extern void (* GLAPIENTRY __glutMenuStatusFunc) (int, int, int);
    667667extern void __glutMenuModificationError(void);
    668668extern void __glutSetMenuItem(GLUTmenuItem * item,
    … …  
    746746extern void __glutReshapeFunc(GLUTreshapeCB reshapeFunc,
    747747  int callingConvention);
    748 extern void  APIENTRY __glutDefaultReshape(int, int);
     748extern void  GLAPIENTRY __glutDefaultReshape(int, int);
    749749extern GLUTwindow *__glutCreateWindow(
    750750  GLUTwindow * parent,

  • trunk/src/opengl/glut/initterm.cpp

    r2756 r2996  
    1 /* $Id: initterm.cpp,v 1.7 2000-02-11 13:29:29 bird Exp $ */
     1/* $Id: initterm.cpp,v 1.8 2000-03-04 19:10:16 jeroen Exp $ */
    22
    33/*
    … …  
    3131#include <stdio.h>
    3232#include <string.h>
    33 #include <odin.h>
     33#include <misc.h>
    3434#include <win32type.h>
    3535#include <winconst.h>
    3636#include <odinlx.h>
    37 #include <misc.h>                      /* PLF Wed  98-03-18 23:18:15       */
    3837
    3938
    … …  
    4645}
    4746
    48 BOOL WINAPI Glut32LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID ImpLoad);
     47void CDECL Glut32Terminate(void);
    4948
    50 //******************************************************************************
    51 //******************************************************************************
     49//* ******************************************************************************/
     50//* ******************************************************************************/
    5251BOOL WINAPI LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
    5352{
    5453   switch (fdwReason)
    5554   {
    56    case DLL_PROCESS_ATTACH:
    57    case DLL_THREAD_ATTACH:
    58    case DLL_THREAD_DETACH:
    59         return Glut32LibMain(hinstDLL, fdwReason, fImpLoad);
     55     case DLL_PROCESS_ATTACH:
     56     case DLL_THREAD_ATTACH:
     57     case DLL_THREAD_DETACH:
     58       return TRUE;
    6059
    61    case DLL_PROCESS_DETACH:
    62         Glut32LibMain(hinstDLL, fdwReason, fImpLoad);
    63         _ctordtorTerm();
    64         return TRUE;
     60     case DLL_PROCESS_DETACH:
     61       Glut32Terminate();
     62       _ctordtorTerm();
     63      return TRUE;
    6564   }
    6665   return FALSE;
    … …  
    7675/* calling this function.                                                   */
    7776/****************************************************************************/
    78 unsigned long SYSTEM _DLL_InitTerm(unsigned long hModule, unsigned long
     77unsigned long _System _DLL_InitTerm(unsigned long hModule, unsigned long
    7978                                   ulFlag)
    8079{
    81    size_t i;
    82    APIRET rc;
    83 
    8480   /*-------------------------------------------------------------------------*/
    8581   /* If ulFlag is zero then the DLL is being loaded so initialization should */
    … …  
    9288         _ctordtorInit();
    9389
    94          CheckVersionFromHMOD(PE2LX_VERSION, hModule);/* PLF Wed  98-03-18 05:28:48*/
    95 
    9690         /*******************************************************************/
    9791         /* A DosExitList routine must be used to clean up if runtime calls */
    … …  
    10195         if(RegisterLxDll(hModule, LibMain, (PVOID)&_Resource_PEResTab) == FALSE)
    10296                return 0UL;
     97
     98         CheckVersionFromHMOD(PE2LX_VERSION, hModule);/* PLF Wed  98-03-18 05:28:48*/
    10399
    104100         break;
    … …  
    117113   return 1UL;
    118114}
    119 //******************************************************************************
    120 //******************************************************************************
     115//* ******************************************************************************/
     116//* ******************************************************************************/

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

    r2689 r2996  
    1 /* $Id: win32_glx.c,v 1.2 2000-02-09 08:46:22 jeroen Exp $ */
     1/* $Id: win32_glx.c,v 1.3 2000-03-04 19:10:16 jeroen Exp $ */
    22/* Copyright (c) Nate Robins, 1997. */
    33
    … …  
    99#if defined(__WIN32OS2__)
    1010#include "os2_glx.h"
    11 #include "wgl.h"
     11//#include "wgl.h"
    1212#include "pfddefs.h"
    1313#include <memory.h>

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

    r2689 r2996  
    1 /* $Id: win32_winproc.c,v 1.2 2000-02-09 08:46:23 jeroen Exp $ */
     1/* $Id: win32_winproc.c,v 1.3 2000-03-04 19:10:17 jeroen Exp $ */
    22/* Copyright (c) Nate Robins, 1997. */
    33/* portions Copyright (c) Mark Kilgard, 1997, 1998. */
    … …  
    1010#include "glutint.h"
    1111#if defined(__WIN32OS2__)
    12 #include "wgl.h"
     12//#include "wgl.h"
    1313#include <ctype.h>
    1414#endif
    … …  
    9090#endif
    9191  case WM_PAINT:
    92     dprintf(("GLUT32: WM_PAINT processing...\n"));
    9392    window = __glutGetWindow(hwnd);
    9493    if (window) {
     94/*
    9595#ifndef __WIN32OS2__
    96       BeginPaint(hwnd, &ps);       /* Must have this for some Win32 reason.*/
     96      BeginPaint(hwnd, &ps);
    9797      EndPaint(hwnd, &ps);
    98 #endif
     98#endif */
    9999      if (window->win == hwnd) {
    100100        __glutPostRedisplay(window, GLUT_REPAIR_WORK);
    … …  
    314314      handleDelete:
    315315        /* Delete is an ASCII character. */
    316         dprintf(("VK_DELETE - wParam is %d\n",wParam));
    317316        key=(unsigned char)127;
    318317        break;
    … …  
    356355      if(fSendKeyStroke)
    357356        {
    358           dprintf(("Sending keystroke %d...\n",key));
    359 
    360357          GetCursorPos(&point);
    361358          ScreenToClient(window->win, &point);
    … …  
    390387      /* TODO: take this out once the menu on middle mouse stuff works
    391388         properly. */
     389/*
    392390      if (button == GLUT_MIDDLE_BUTTON)
    393         return 0;
     391        return 0;*/
    394392      GetCursorPos(&point);
    395393      ScreenToClient(hwnd, &point);
    … …  
    613611
    614612  case WM_SIZE:
    615     dprintf(("GLUT32: Handling WM_SIZE..."));
    616613    window = __glutGetWindow(hwnd);
    617614    if (window) {
    … …  
    619616      height = HIWORD(lParam);
    620617      if (width != window->width || height != window->height) {
    621 #if 0  /* Win32 GLUT does not support overlays for now. */
     618#if 0                      /* Win32 GLUT does not support overlays for now.*/
    622619        if (window->overlay) {
    623620          XResizeWindow(__glutDisplay, window->overlay->win, width, height);
    … …  
    630627           to the SetWindowPos request! */
    631628        GdiFlush();
    632         window->reshape(width, height);
     629        ((GLUTreshapeCB)(window->reshape))(width, height);
    633630        window->forceReshape = FALSE;
    634631        /* A reshape should be considered like posting a
    635632           repair request. */
    636         dprintf(("GLUT32: WM_SIZE processing -> GLUT_REPAIR_WORK\n"));
    637633        __glutPostRedisplay(window, GLUT_REPAIR_WORK);
    638634      }
    639635    }
    640     dprintf(("GLUT32: Handled WM_SIZE..."));
    641636    return 0;
    642637
Note: See TracChangeset for help on using the changeset viewer.