Changeset 2689 for trunk/src/opengl/glut


Ignore:
Timestamp:
Feb 9, 2000, 9:51:20 AM (26 years ago)
Author:
jeroen
Message:

* empty log message *

Location:
trunk/src/opengl/glut
Files:
1 added
1 deleted
62 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/opengl/glut/Makefile

    r2595 r2689  
     1# $Id: Makefile,v 1.2 2000-02-09 08:46:06 jeroen Exp $
    12#
    23# PD-Win32 API
    … …  
    1516
    1617!ifdef DEBUG
    17 MAKE_CMD=nmake DEBUG=1
    18 !else
    19 MAKE_CMD=nmake
     18L=/CO
    2019!endif
    2120
    22 CFLAGS = -Tdp $(CFLAGS) -I$(PDWIN32_INCLUDE)
    23 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     21CFLAGS = -Tdp -I..\mesa -I..\glu $(CFLAGS) -I$(PDWIN32_INCLUDE)
     22CXXFLAGS = -Tdp -I..\mesa -I..\glu $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
    2423
    2524TARGET=GLUT32
    … …  
    3635       glut_tr24.obj glut_util.obj glut_vidresize.obj glut_warp.obj glut_win.obj \
    3736       glut_winmisc.obj win32_glx.obj win32_menu.obj win32_util.obj win32_winproc.obj \
    38        win32_x11.obj initterm.obj
     37       win32_x11.obj initterm.obj glut_term.obj
    3938
    4039all     : $(TARGET).DLL
    4140
    4241$(TARGET).DLL: $(OBJS) $(TARGET).def $(TARGET).lrf
    43         ILINK /FREE /NOE @$(TARGET).lrf
     42        ILINK /FREE /NOE $(L) @$(TARGET).lrf
    4443        $(CP) $@ $(PDWIN32_BIN)
    4544
    … …  
    105104/OUT:$(TARGET).DLL /DLL
    106105$(PDWIN32_LIB)\ODINCRT.LIB
    107 CPPOM30O.LIB
     106$(RTLLIB_O)
    108107$(PDWIN32_LIB)\WINMM.LIB
    109108$(PDWIN32_LIB)\KERNEL32.LIB

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

    r2595 r2689  
     1/* $Id: glut.h,v 1.2 2000-02-09 08:46:07 jeroen Exp $ */
    12#ifndef __glut_h__
    23#define __glut_h__

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

    r2595 r2689  
     1; $Id: glut32.def,v 1.2 2000-02-09 08:46:07 jeroen Exp $
    12LIBRARY GLUT32 INITINSTANCE TERMINSTANCE
    23

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

    r2595 r2689  
    1 
     1/* $Id: glut_8x13.c,v 1.2 2000-02-09 08:46:07 jeroen Exp $ */
    22/* GENERATED FILE -- DO NOT MODIFY */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_9x15.c,v 1.2 2000-02-09 08:46:07 jeroen Exp $ */
    22/* GENERATED FILE -- DO NOT MODIFY */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_bitmap.c,v 1.2 2000-02-09 08:46:08 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_bwidth.c,v 1.2 2000-02-09 08:46:08 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_cindex.c,v 1.2 2000-02-09 08:46:08 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994, 1996, 1997. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_cmap.c,v 1.2 2000-02-09 08:46:08 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994, 1996, 1997.  */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_cursor.c,v 1.2 2000-02-09 08:46:08 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1995, 1998. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_dials.c,v 1.2 2000-02-09 08:46:09 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994. */
    33
    … …  
    88#include "glutint.h"
    99
    10 void APIENTRY 
     10void APIENTRY
    1111glutButtonBoxFunc(GLUTbuttonBoxCB buttonBoxFunc)
    1212{
    … …  
    1717}
    1818
    19 void APIENTRY 
     19void APIENTRY
    2020glutDialsFunc(GLUTdialsCB dialsFunc)
    2121{

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

    r2595 r2689  
    1 
     1/* $Id: glut_dstr.c,v 1.2 2000-02-09 08:46:09 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1997. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_event.c,v 1.2 2000-02-09 08:46:09 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1997, 1998. */
    33
    … …  
    333333    TranslateMessage(&event);             /* translate virtual-key messages*/
    334334#if defined(__WIN32OS2__)
    335     DispatchMessageA(&event);                        /* call the window proc*/
     335    DispatchMessageA(&event);                       /* call the window proc*/
    336336#else
    337337    DispatchMessage(&event);                        /* call the window proc*/
    … …  
    10331033    }
    10341034    /* Be sure to configure window BEFORE map window is done. */
    1035 
    10361035    if (workMask & GLUT_CONFIGURE_WORK) {
    10371036#if defined(_WIN32) || defined(__WIN32OS2__)
    … …  
    10831082      /* Do the repositioning, moving, and push/pop. */
    10841083      SetWindowPos(window->win,
    1085         window->desiredStack == Above ? HWND_TOP : HWND_NOTOPMOST,
     1084        window->desiredStack == (Above ? HWND_TOP : HWND_NOTOPMOST),
    10861085        changes.left, changes.top,
    10871086        changes.right - changes.left, changes.bottom - changes.top,
    … …  
    10981097        window->desiredY = point.y;
    10991098      }
    1100 #else /* !_WIN32 */
     1099#else                                  /* !_WIN32                          */
    11011100      XWindowChanges changes;
    11021101
    … …  
    11141113
    11151114            hints.flags = MWM_HINTS_DECORATIONS;
    1116             hints.decorations = 0;  /* Absolutely no
     1115            hints.decorations = 0;                         /* Absolutely no*/
    11171116                                       decorations. */
    11181117            XChangeProperty(__glutDisplay, window->win,
    … …  
    12051204
    12061205      __glutSetWindow(window);
     1206
    12071207      window->reshape(window->width, window->height);
    12081208      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
    12091228
    12101229      /* Setting the redisplay bit on the first reshape is
    … …  
    12161235      workMask |= GLUT_REDISPLAY_WORK;
    12171236    }
     1237
     1238
    12181239    /* The code below is more involved than otherwise necessary
    12191240       because it is paranoid about the overlay or entire window
    … …  
    13031324     finish and debug work there is. */
    13041325
    1305 
    13061326  workMask |= window->workMask;
    13071327

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

    r2595 r2689  
    1 
     1/* $Id: glut_ext.c,v 1.2 2000-02-09 08:46:11 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994, 1997. */
    33
    … …  
    1212
    1313/* CENTRY */
    14 int APIENTRY 
     14int APIENTRY
    1515glutExtensionSupported(const char *extension)
    1616{

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

    r2595 r2689  
    1 
     1/* $Id: glut_fullscrn.c,v 1.2 2000-02-09 08:46:11 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1995, 1998. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_gamemode.c,v 1.2 2000-02-09 08:46:11 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1998. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_get.c,v 1.2 2000-02-09 08:46:12 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994, 1997, 1998. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_hel10.c,v 1.2 2000-02-09 08:46:12 jeroen Exp $ */
    22/* GENERATED FILE -- DO NOT MODIFY */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_hel12.c,v 1.2 2000-02-09 08:46:12 jeroen Exp $ */
    22/* GENERATED FILE -- DO NOT MODIFY */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_hel18.c,v 1.2 2000-02-09 08:46:12 jeroen Exp $ */
    22/* GENERATED FILE -- DO NOT MODIFY */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_init.c,v 1.2 2000-02-09 08:46:13 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994, 1997. */
    33
    … …  
    5959#if defined(_WIN32) || defined(__WIN32OS2__)
    6060
    61 #ifdef __BORLANDC__
     61#if defined(__BORLANDC__) || defined(__WIN32OS2__)
    6262#include <float.h>  /* For masking floating point exceptions. */
    6363#endif
    … …  
    7979    return;
    8080
    81 #ifdef __BORLANDC__
     81#if defined(__BORLANDC__) || defined(__WIN32OS2__)
    8282  /* Under certain conditions (e.g. while rendering solid surfaces with
    8383     lighting enabled) Microsoft OpenGL libraries cause some illegal

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

    r2595 r2689  
    1 
     1/* $Id: glut_input.c,v 1.2 2000-02-09 08:46:13 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994, 1997, 1998. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_joy.c,v 1.2 2000-02-09 08:46:13 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1997, 1998. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_key.c,v 1.2 2000-02-09 08:46:13 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1997. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_keyctrl.c,v 1.2 2000-02-09 08:46:13 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1996, 1997. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_keyup.c,v 1.2 2000-02-09 08:46:14 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1997. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_mesa.c,v 1.2 2000-02-09 08:46:14 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1996. */
    33
    4 /* This program is freely distributable without licensing fees 
    5    and is provided without guarantee or warrantee expressed or 
     4/* This program is freely distributable without licensing fees
     5   and is provided without guarantee or warrantee expressed or
    66   implied. This program is -not- in the public domain. */
    77
    … …  
    2929  static int doneAlready = 0;
    3030  char *env, *vendor, *renderer;
     31
     32/*#ifdef __WIN32OS2__
     33  __glutMesaSwapHackSupport=1;
     34  return;
     35#endif*/
    3136
    3237  if (doneAlready)

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

    r2595 r2689  
    1 
     1/* $Id: glut_modifier.c,v 1.2 2000-02-09 08:46:14 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994. */
    33
    4 /* This program is freely distributable without licensing fees 
    5    and is provided without guarantee or warrantee expressed or 
     4/* This program is freely distributable without licensing fees
     5   and is provided without guarantee or warrantee expressed or
    66   implied. This program is -not- in the public domain. */
    77

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

    r2595 r2689  
    1 
     1/* $Id: glut_mroman.c,v 1.2 2000-02-09 08:46:15 jeroen Exp $ */
    22/* GENERATED FILE -- DO NOT MODIFY */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_overlay.c,v 1.2 2000-02-09 08:46:15 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1996, 1997.  */
    33
    … …  
    456456
    457457  window->overlay = overlay;
    458   glutUseLayer(GLUT_OVERLAY);
     458  glutUseLayer((GLenum)GLUT_OVERLAY);
    459459
    460460  if (overlay->treatAsSingle) {
    … …  
    475475  /* If using overlay, switch to the normal layer. */
    476476  if (window->renderWin == overlay->win) {
    477     glutUseLayer(GLUT_NORMAL);
     477    glutUseLayer((GLenum)GLUT_NORMAL);
    478478  }
    479479#if !defined(_WIN32) && !defined(__WIN32OS2__)

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

    r2595 r2689  
    1 
     1/* $Id: glut_roman.c,v 1.2 2000-02-09 08:46:16 jeroen Exp $ */
    22/* GENERATED FILE -- DO NOT MODIFY */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_shapes.c,v 1.2 2000-02-09 08:46:16 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994, 1997. */
    33
    … …  
    7070{
    7171  QUAD_OBJ_INIT();
    72   gluQuadricDrawStyle(quadObj, GLU_LINE);
    73   gluQuadricNormals(quadObj, GLU_SMOOTH);
     72  gluQuadricDrawStyle(quadObj, (GLenum)GLU_LINE);
     73  gluQuadricNormals(quadObj, (GLenum)GLU_SMOOTH);
    7474  /* If we ever changed/used the texture or orientation state
    7575     of quadObj, we'd need to change it to the defaults here
    … …  
    8282{
    8383  QUAD_OBJ_INIT();
    84   gluQuadricDrawStyle(quadObj, GLU_FILL);
    85   gluQuadricNormals(quadObj, GLU_SMOOTH);
     84  gluQuadricDrawStyle(quadObj, (GLenum)GLU_FILL);
     85  gluQuadricNormals(quadObj, (GLenum)GLU_SMOOTH);
    8686  /* If we ever changed/used the texture or orientation state
    8787     of quadObj, we'd need to change it to the defaults here
    … …  
    9595{
    9696  QUAD_OBJ_INIT();
    97   gluQuadricDrawStyle(quadObj, GLU_LINE);
    98   gluQuadricNormals(quadObj, GLU_SMOOTH);
     97  gluQuadricDrawStyle(quadObj, (GLenum)GLU_LINE);
     98  gluQuadricNormals(quadObj, (GLenum)GLU_SMOOTH);
    9999  /* If we ever changed/used the texture or orientation state
    100100     of quadObj, we'd need to change it to the defaults here
    … …  
    108108{
    109109  QUAD_OBJ_INIT();
    110   gluQuadricDrawStyle(quadObj, GLU_FILL);
    111   gluQuadricNormals(quadObj, GLU_SMOOTH);
     110  gluQuadricDrawStyle(quadObj, (GLenum)GLU_FILL);
     111  gluQuadricNormals(quadObj, (GLenum)GLU_SMOOTH);
    112112  /* If we ever changed/used the texture or orientation state
    113113     of quadObj, we'd need to change it to the defaults here

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

    r2595 r2689  
    1 
     1/* $Id: glut_space.c,v 1.2 2000-02-09 08:46:16 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994. */
    33
    … …  
    88#include "glutint.h"
    99
    10 void APIENTRY 
     10void APIENTRY
    1111glutSpaceballMotionFunc(GLUTspaceMotionCB spaceMotionFunc)
    1212{
    … …  
    1717}
    1818
    19 void APIENTRY 
     19void APIENTRY
    2020glutSpaceballRotateFunc(GLUTspaceRotateCB spaceRotateFunc)
    2121{
    … …  
    2626}
    2727
    28 void APIENTRY 
     28void APIENTRY
    2929glutSpaceballButtonFunc(GLUTspaceButtonCB spaceButtonFunc)
    3030{

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

    r2595 r2689  
    1 
     1/* $Id: glut_stroke.c,v 1.2 2000-02-09 08:46:16 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_swap.c,v 1.2 2000-02-09 08:46:17 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994, 1997.  */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_swidth.c,v 1.2 2000-02-09 08:46:17 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1995. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_tablet.c,v 1.2 2000-02-09 08:46:17 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994. */
    33
    … …  
    1010#include "glutint.h"
    1111
    12 void APIENTRY 
     12void APIENTRY
    1313glutTabletMotionFunc(GLUTtabletMotionCB tabletMotionFunc)
    1414{
    … …  
    2424}
    2525
    26 void APIENTRY 
     26void APIENTRY
    2727glutTabletButtonFunc(GLUTtabletButtonCB tabletButtonFunc)
    2828{

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

    r2595 r2689  
    1 
     1/* $Id: glut_teapot.c,v 1.2 2000-02-09 08:46:17 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994. */
    33
    … …  
    196196
    197197/* CENTRY */
    198 void APIENTRY 
     198void APIENTRY
    199199glutSolidTeapot(GLdouble scale)
    200200{
    … …  
    202202}
    203203
    204 void APIENTRY 
     204void APIENTRY
    205205glutWireTeapot(GLdouble scale)
    206206{

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

    r2595 r2689  
    1 
     1/* $Id: glut_tr10.c,v 1.2 2000-02-09 08:46:18 jeroen Exp $ */
    22/* GENERATED FILE -- DO NOT MODIFY */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_tr24.c,v 1.2 2000-02-09 08:46:18 jeroen Exp $ */
    22/* GENERATED FILE -- DO NOT MODIFY */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_util.c,v 1.2 2000-02-09 08:46:19 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994. */
    33
    … …  
    4444  dprintf(("GLUT32: %s\n",errmsg));
    4545#endif
    46 
    4746  fprintf(stderr, "GLUT: Warning in %s: ",
    4847    __glutProgramName ? __glutProgramName : "(unamed)");

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

    r2595 r2689  
    1 
     1/* $Id: glut_vidresize.c,v 1.2 2000-02-09 08:46:19 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1996. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_warp.c,v 1.2 2000-02-09 08:46:19 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1996, 1997. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_win.c,v 1.2 2000-02-09 08:46:19 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994, 1997.  */
    33

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

    r2595 r2689  
    1 
     1/* $Id: glut_winmisc.c,v 1.2 2000-02-09 08:46:19 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994.  */
    33

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

    r2595 r2689  
     1/* $Id: glutbitmap.h,v 1.2 2000-02-09 08:46:19 jeroen Exp $ */
    12#ifndef __glutbitmap_h__
    23#define __glutbitmap_h__

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

    r2595 r2689  
     1/* $Id: glutint.h,v 1.2 2000-02-09 08:46:19 jeroen Exp $ */
    12#ifndef __glutint_h__
    23#define __glutint_h__

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

    r2595 r2689  
     1/* $Id: glutos2.h,v 1.2 2000-02-09 08:46:20 jeroen Exp $ */
    12#ifndef __glutos2_h__
    23#define __glutos2_h__

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

    r2595 r2689  
     1/* $Id: glutstroke.h,v 1.2 2000-02-09 08:46:20 jeroen Exp $ */
    12#ifndef __glutstroke_h__
    23#define __glutstroke_h__

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

    r2595 r2689  
    1 /* $Id: initterm.cpp,v 1.1 2000-02-01 19:42:07 sandervl Exp $ */
     1/* $Id: initterm.cpp,v 1.2 2000-02-09 08:46:20 jeroen Exp $ */
    22
    33/*
    … …  
    4141}
    4242
     43BOOL WINAPI Glut32LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID ImpLoad);
     44
    4345/*-------------------------------------------------------------------*/
    4446/* A clean up routine registered with DosExitList must be used if    */
    … …  
    4850/*-------------------------------------------------------------------*/
    4951static void APIENTRY cleanup(ULONG reason);
    50 
    5152
    5253/****************************************************************************/
    … …  
    8182         /*******************************************************************/
    8283
    83          if(RegisterLxDll(hModule, 0, 0) == FALSE)
     84         if(RegisterLxDll(hModule, Glut32LibMain, 0) == FALSE)
    8485                return 0UL;
    8586
    86          rc = DosExitList(0x0000F000|EXLST_ADD, cleanup);
     87         rc = DosExitList(0x000F0000|EXLST_ADD, cleanup);
    8788         if(rc)
    8889                return 0UL;

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

    r2595 r2689  
    1 
     1/* $Id: layerutil.c,v 1.2 2000-02-09 08:46:20 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1993, 1994. */
    33

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

    r2595 r2689  
     1/* $Id: layerutil.h,v 1.2 2000-02-09 08:46:21 jeroen Exp $ */
    12#ifndef __layerutil_h__
    23#define __layerutil_h__

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

    r2595 r2689  
     1/* $Id: os2_glx.h,v 1.2 2000-02-09 08:46:21 jeroen Exp $ */
    12#ifndef __os2_glx_h__
    23#define __os2_glx_h__

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

    r2595 r2689  
     1/* $Id: os2_x11.h,v 1.2 2000-02-09 08:46:21 jeroen Exp $ */
    12#ifndef __os2_x11_h__
    23#define __os2_x11_h__

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

    r2595 r2689  
     1/* $Id: pfddefs.h,v 1.2 2000-02-09 08:46:21 jeroen Exp $ */
    12#define PFD_TYPE_RGBA       0
    23#define PFD_TYPE_COLORINDEX 1

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

    r2595 r2689  
     1/* $Id: stroke.h,v 1.2 2000-02-09 08:46:21 jeroen Exp $ */
    12/* $XConsortium: wfont.h,v 5.1 91/02/16 09:46:37 rws Exp $ */
    23
    … …  
    67                        All Rights Reserved
    78
    8 Permission to use, copy, modify, and distribute this software and its 
    9 documentation for any purpose and without fee is hereby granted, 
     9Permission to use, copy, modify, and distribute this software and its
     10documentation for any purpose and without fee is hereby granted,
    1011provided that the above copyright notice appear in all copies and that
    11 both that copyright notice and this permission notice appear in 
     12both that copyright notice and this permission notice appear in
    1213supporting documentation, and that the names of Sun Microsystems,
    13 the X Consortium, and MIT not be used in advertising or publicity 
    14 pertaining to distribution of the software without specific, written 
    15 prior permission. 
     14the X Consortium, and MIT not be used in advertising or publicity
     15pertaining to distribution of the software without specific, written
     16prior permission.
    1617
    17 SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 
    18 INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT 
    19 SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
     18SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
     19INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT
     20SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
    2021DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
    2122WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
    … …  
    8586  Path_pt_ptr pts;              /* pointer to them */
    8687  int closed;                   /* true if the subpath is closed */
    87   int dcmp_flag;                /* flag for pgon dcmp, pgon type 
     88  int dcmp_flag;                /* flag for pgon dcmp, pgon type
    8889                                 * and dcmped triangle type */
    8990} Path_subpath;

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

    r2595 r2689  
    1 /* JvdH - define the wglXXX functions */
     1/* $Id: wgl.h,v 1.2 2000-02-09 08:46:22 jeroen Exp $ */
    22
    33typedef ULONG HGC;

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

    r2595 r2689  
    1 
     1/* $Id: win32_glx.c,v 1.2 2000-02-09 08:46:22 jeroen Exp $ */
    22/* Copyright (c) Nate Robins, 1997. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: win32_menu.c,v 1.2 2000-02-09 08:46:22 jeroen Exp $ */
    22/* Copyright (c) Mark J. Kilgard, 1994, 1997, 1998. */
    33/* Copyright (c) Nate Robins, 1997. */

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

    r2595 r2689  
    1 
     1/* $Id: win32_util.c,v 1.2 2000-02-09 08:46:22 jeroen Exp $ */
    22/* Copyright (c) Nate Robins, 1997. */
    33

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

    r2595 r2689  
    1 
     1/* $Id: win32_winproc.c,v 1.2 2000-02-09 08:46:23 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"
    1213#include <ctype.h>
    1314#endif
    … …  
    5960  LPMINMAXINFO  minmax;                 /* Minimum/maximum info structure. */
    6061  GLUTwindow*   window;                 /* GLUT window associated with message. */
    61   GLUTmenu*     menu;                   /* GLUT menu associated with message. */
     62  GLUTmenu*     menu;                 /* GLUT menu associated with message.*/
    6263  int x, y, width, height, key;
    6364  int button = -1;
     65  int fSendKeyStroke=1;
    6466
    6567  switch(msg) {
    … …  
    6971    PostQuitMessage(0);
    7072    return 0;
    71 #if 0
     73#if defined(__WIN32OS2__)
    7274  case WM_DESTROY:
    7375    /* XXX NVidia's NT OpenGL can have problems closing down
    … …  
    8890#endif
    8991  case WM_PAINT:
     92    dprintf(("GLUT32: WM_PAINT processing...\n"));
    9093    window = __glutGetWindow(hwnd);
    9194    if (window) {
    92       BeginPaint(hwnd, &ps);            /* Must have this for some Win32 reason. */
     95#ifndef __WIN32OS2__
     96      BeginPaint(hwnd, &ps);       /* Must have this for some Win32 reason.*/
    9397      EndPaint(hwnd, &ps);
     98#endif
    9499      if (window->win == hwnd) {
    95100        __glutPostRedisplay(window, GLUT_REPAIR_WORK);
    … …  
    211216      __glutSetWindow(window);
    212217      __glutModifierMask = 0;
    213       if (GetKeyState(VK_SHIFT) < 0)    /* < 0 = high order bit is on */
     218      if (GetKeyState(VK_SHIFT) < 0)          /* < 0 = high order bit is on*/
    214219        __glutModifierMask |= ShiftMask;
    215220      if (GetKeyState(VK_CONTROL) < 0)
    … …  
    293298      __glutSetWindow(window);
    294299      __glutModifierMask = 0;
    295       if (GetKeyState(VK_SHIFT) < 0)    /* < 0 = high order bit is on */
     300      if (GetKeyState(VK_SHIFT) < 0)          /* < 0 = high order bit is on*/
    296301        __glutModifierMask |= ShiftMask;
    297302      if (GetKeyState(VK_CONTROL) < 0)
    … …  
    304309      /* Specially handle any keys that match ASCII values but
    305310         do not generate Windows WM_SYSCHAR or WM_CHAR messages. */
     311
    306312      switch (wParam) {
    307313      case VK_DELETE:
    308314      handleDelete:
    309315        /* Delete is an ASCII character. */
    310         GetCursorPos(&point);
    311         ScreenToClient(window->win, &point);
    312         __glutSetWindow(window);
    313         __glutModifierMask = 0;
    314         if (GetKeyState(VK_SHIFT) < 0)  /* < 0 = high order bit is on */
    315           __glutModifierMask |= ShiftMask;
    316         if (GetKeyState(VK_CONTROL) < 0)
    317           __glutModifierMask |= ControlMask;
    318         if (GetKeyState(VK_MENU) < 0)
    319           __glutModifierMask |= Mod1Mask;
    320         window->keyboard((unsigned char) 127, point.x, point.y);
    321         __glutModifierMask = (unsigned int) ~0;
    322         return 0;
     316        dprintf(("VK_DELETE - wParam is %d\n",wParam));
     317        key=(unsigned char)127;
     318        break;
     319
     320#ifdef __WIN32OS2__
     321        /* For some reason Odin doesn't generate WM_CHARS for 'special' keys */
     322        /* at least - none that are received here. Create 'em here!!         */
     323      case VK_F1:
     324      case VK_F2:
     325      case VK_F3:
     326      case VK_F4:
     327      case VK_F5:
     328      case VK_F6:
     329      case VK_F7:
     330      case VK_F8:
     331      case VK_F9:
     332      case VK_F10:
     333      case VK_F11:
     334      case VK_F12:
     335      case VK_LEFT:
     336      case VK_UP:
     337      case VK_RIGHT:
     338      case VK_DOWN:
     339      case VK_PRIOR:
     340      case VK_NEXT:
     341      case VK_HOME:
     342      case VK_END:
     343      case VK_INSERT:
     344      case VK_ESCAPE:
     345        key=wParam;
     346        break;
     347#endif
     348
    323349      default:
    324350        /* Let the following WM_SYSCHAR or WM_CHAR message generate
    325351           the keyboard callback. */
     352        fSendKeyStroke=0;
    326353        break;
    327354      }
     355
     356      if(fSendKeyStroke)
     357        {
     358          dprintf(("Sending keystroke %d...\n",key));
     359
     360          GetCursorPos(&point);
     361          ScreenToClient(window->win, &point);
     362          __glutSetWindow(window);
     363          __glutModifierMask = 0;
     364          if (GetKeyState(VK_SHIFT) < 0)      /* < 0 = high order bit is on*/
     365            __glutModifierMask |= ShiftMask;
     366          if (GetKeyState(VK_CONTROL) < 0)
     367            __glutModifierMask |= ControlMask;
     368          if (GetKeyState(VK_MENU) < 0)
     369            __glutModifierMask |= Mod1Mask;
     370          window->keyboard(key, point.x, point.y);
     371          __glutModifierMask = (unsigned int) ~0;
     372
     373          return 0;
     374        }
    328375    }
    329376    return 0;
    … …  
    566613
    567614  case WM_SIZE:
     615    dprintf(("GLUT32: Handling WM_SIZE..."));
    568616    window = __glutGetWindow(hwnd);
    569617    if (window) {
    … …  
    586634        /* A reshape should be considered like posting a
    587635           repair request. */
     636        dprintf(("GLUT32: WM_SIZE processing -> GLUT_REPAIR_WORK\n"));
    588637        __glutPostRedisplay(window, GLUT_REPAIR_WORK);
    589638      }
    590639    }
     640    dprintf(("GLUT32: Handled WM_SIZE..."));
    591641    return 0;
    592642

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

    r2595 r2689  
    1 
     1/* $Id: win32_x11.c,v 1.2 2000-02-09 08:46:23 jeroen Exp $ */
    22/* Copyright (c) Nate Robins, 1997. */
    33/* portions Copyright (c) Mark Kilgard, 1998. */
Note: See TracChangeset for help on using the changeset viewer.