backported fixes from deeprunner
[miniglut] / miniglut.c
index bda9491..16bb7b9 100644 (file)
@@ -1,6 +1,6 @@
 /*
 MiniGLUT - minimal GLUT subset without dependencies
-Copyright (C) 2020  John Tsiombikas <nuclear@member.fsf.org>
+Copyright (C) 2020-2022  John Tsiombikas <nuclear@member.fsf.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#if defined(__unix__)
+#if defined(unix) || defined(__unix__)
 
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
@@ -33,6 +33,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 static Display *dpy;
 static Window win, root;
+static Colormap cmap;
+static int cmap_size;
 static int scr;
 static GLXContext ctx;
 static Atom xa_wm_proto, xa_wm_del_win;
@@ -49,12 +51,14 @@ static int have_netwm_fullscr(void);
 #include <windows.h>
 #define BUILD_WIN32
 
-static HRESULT CALLBACK handle_message(HWND win, unsigned int msg, WPARAM wparam, LPARAM lparam);
+static LRESULT CALLBACK handle_message(HWND win, unsigned int msg, WPARAM wparam, LPARAM lparam);
 
 static HINSTANCE hinst;
 static HWND win;
 static HDC dc;
 static HGLRC ctx;
+static HPALETTE cmap;
+static int cmap_size;
 
 #else
 #error unsupported platform
@@ -62,6 +66,11 @@ static HGLRC ctx;
 #include <GL/gl.h>
 #include "miniglut.h"
 
+#ifdef _MSC_VER
+#pragma warning (disable: 4244 4305)
+#endif
+
+
 struct ctx_info {
        int rsize, gsize, bsize, asize;
        int zsize, ssize;
@@ -88,6 +97,7 @@ static unsigned int init_mode;
 
 static struct ctx_info ctx_info;
 static int cur_cursor = GLUT_CURSOR_INHERIT;
+static int ignore_key_repeat;
 
 static glut_cb cb_display;
 static glut_cb cb_idle;
@@ -205,6 +215,11 @@ void glutPostRedisplay(void)
        upd_pending = 1;
 }
 
+void glutIgnoreKeyRepeat(int ignore)
+{
+       ignore_key_repeat = ignore;
+}
+
 #define UPD_EVMASK(x) \
        do { \
                if(func) { \
@@ -360,6 +375,8 @@ int glutGet(unsigned int s)
                return ctx_info.srgb;
        case GLUT_WINDOW_CURSOR:
                return cur_cursor;
+       case GLUT_WINDOW_COLORMAP_SIZE:
+               return cmap_size;
        case GLUT_SCREEN_WIDTH:
                get_screen_size(&x, &y);
                return x;
@@ -514,7 +531,7 @@ static KeySym translate_keysym(KeySym sym)
        case XK_Linefeed:
                return '\r';
        case XK_Return:
-               return '\n';
+               return '\r';
        case XK_Delete:
                return 127;
        case XK_Tab:
@@ -580,7 +597,22 @@ static void handle_event(XEvent *ev)
                break;
 
        case KeyPress:
+               if(0) {
        case KeyRelease:
+                       if(ignore_key_repeat && XEventsQueued(dpy, QueuedAfterReading)) {
+                               XEvent next;
+                               XPeekEvent(dpy, &next);
+
+                               if(next.type == KeyPress && next.xkey.keycode == ev->xkey.keycode &&
+                                               next.xkey.time == ev->xkey.time) {
+                                       /* this is a key-repeat event, ignore the release and consume
+                                        * the following press
+                                        */
+                                       XNextEvent(dpy, &next);
+                                       break;
+                               }
+                       }
+               }
                modstate = ev->xkey.state & (ShiftMask | ControlMask | Mod1Mask);
                if(!(sym = XLookupKeysym(&ev->xkey, 0))) {
                        break;
@@ -694,18 +726,20 @@ static int have_netwm_fullscr(void)
        int fmt;
        long offs = 0;
        unsigned long i, count, rem;
-       Atom prop[8], type;
+       Atom *prop, type;
        Atom xa_net_supported = XInternAtom(dpy, "_NET_SUPPORTED", False);
 
        do {
                XGetWindowProperty(dpy, root, xa_net_supported, offs, 8, False, AnyPropertyType,
-                               &type, &fmt, &count, &rem, (unsigned char**)prop);
+                               &type, &fmt, &count, &rem, (unsigned char**)&prop);
 
                for(i=0; i<count; i++) {
                        if(prop[i] == xa_net_wm_state_fullscr) {
+                               XFree(prop);
                                return 1;
                        }
                }
+               XFree(prop);
                offs += count;
        } while(rem > 0);
 
@@ -798,6 +832,57 @@ void glutSetCursor(int cidx)
        cur_cursor = cidx;
 }
 
+void glutWarpPointer(int x, int y)
+{
+       XWarpPointer(dpy, None, win, 0, 0, 0, 0, x, y);
+}
+
+void glutSetColor(int idx, float r, float g, float b)
+{
+       XColor color;
+
+       if(idx >= 0 && idx < cmap_size) {
+               color.pixel = idx;
+               color.red = (unsigned short)(r * 65535.0f);
+               color.green = (unsigned short)(g * 65535.0f);
+               color.blue = (unsigned short)(b * 65535.0f);
+               color.flags = DoRed | DoGreen | DoBlue;
+               XStoreColor(dpy, cmap, &color);
+       }
+}
+
+float glutGetColor(int idx, int comp)
+{
+       XColor color;
+
+       if(idx < 0 || idx >= cmap_size) {
+               return -1.0f;
+       }
+
+       color.pixel = idx;
+       XQueryColor(dpy, cmap, &color);
+       switch(comp) {
+       case GLUT_RED:
+               return color.red / 65535.0f;
+       case GLUT_GREEN:
+               return color.green / 65535.0f;
+       case GLUT_BLUE:
+               return color.blue / 65535.0f;
+       default:
+               break;
+       }
+       return -1.0f;
+}
+
+void glutSetKeyRepeat(int repmode)
+{
+       if(repmode) {
+               XAutoRepeatOn(dpy);
+       } else {
+               XAutoRepeatOff(dpy);
+       }
+}
+
 static XVisualInfo *choose_visual(unsigned int mode)
 {
        XVisualInfo *vi;
@@ -814,9 +899,9 @@ static XVisualInfo *choose_visual(unsigned int mode)
                *aptr++ = 1;
        } else {
                *aptr++ = GLX_RGBA;
-               *aptr++ = GLX_RED_SIZE; *aptr++ = 4;
-               *aptr++ = GLX_GREEN_SIZE; *aptr++ = 4;
-               *aptr++ = GLX_BLUE_SIZE; *aptr++ = 4;
+               *aptr++ = GLX_RED_SIZE; *aptr++ = 1;
+               *aptr++ = GLX_GREEN_SIZE; *aptr++ = 1;
+               *aptr++ = GLX_BLUE_SIZE; *aptr++ = 1;
        }
        if(mode & GLUT_ALPHA) {
                *aptr++ = GLX_ALPHA_SIZE;
@@ -824,7 +909,7 @@ static XVisualInfo *choose_visual(unsigned int mode)
        }
        if(mode & GLUT_DEPTH) {
                *aptr++ = GLX_DEPTH_SIZE;
-               *aptr++ = 16;
+               *aptr++ = 8;
        }
        if(mode & GLUT_STENCIL) {
                *aptr++ = GLX_STENCIL_SIZE;
@@ -892,13 +977,21 @@ static void create_window(const char *title)
        glXGetConfig(dpy, vi, GLX_SAMPLES_ARB, &ctx_info.samples);
        glXGetConfig(dpy, vi, GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB, &ctx_info.srgb);
 
+       if(!(cmap = XCreateColormap(dpy, root, vi->visual, mode & GLUT_INDEX ? AllocAll : AllocNone))) {
+               XFree(vi);
+               glXDestroyContext(dpy, ctx);
+               panic("Failed to create colormap\n");
+       }
+       cmap_size = GLUT_INDEX ? vi->colormap_size : 0;
+
        xattr.background_pixel = BlackPixel(dpy, scr);
-       xattr.colormap = XCreateColormap(dpy, root, vi->visual, AllocNone);
+       xattr.colormap = cmap;
        xattr_mask = CWBackPixel | CWColormap | CWBackPixmap | CWBorderPixel;
        if(!(win = XCreateWindow(dpy, root, init_x, init_y, init_width, init_height, 0,
                        vi->depth, InputOutput, vi->visual, xattr_mask, &xattr))) {
                XFree(vi);
                glXDestroyContext(dpy, ctx);
+               XFreeColormap(dpy, cmap);
                panic("Failed to create window\n");
        }
        XFree(vi);
@@ -1065,9 +1158,11 @@ static Window get_daemon_window(Display *dpy)
        win = *(Window*)prop;
        XFree(prop);
 
+       wname.value = 0;
        if(!XGetWMName(dpy, win, &wname) || mglut_strcmp("Magellan Window", (char*)wname.value) != 0) {
-               return 0;
+               win = 0;
        }
+       XFree(wname.value);
 
        return win;
 }
@@ -1168,20 +1263,32 @@ void glutPositionWindow(int x, int y)
        SetWindowPos(win, HWND_NOTOPMOST, x, y, rect.right - rect.left, rect.bottom - rect.top, flags);
 }
 
+static void calc_win_rect(RECT *rect, int x, int y, int w, int h)
+{
+       rect->left = x;
+       rect->top = y;
+       rect->right = x + w;
+       rect->bottom = y + h;
+       AdjustWindowRect(rect, WS_OVERLAPPEDWINDOW, 0);
+}
+
 void glutReshapeWindow(int xsz, int ysz)
 {
        RECT rect;
        unsigned int flags = SWP_SHOWWINDOW;
 
        if(fullscreen) {
-               rect.left = prev_win_x;
-               rect.top = prev_win_y;
+               calc_win_rect(&rect, prev_win_x, prev_win_y, xsz, ysz);
                SetWindowLong(win, GWL_STYLE, WS_OVERLAPPEDWINDOW);
                fullscreen = 0;
                flags |= SWP_FRAMECHANGED;
        } else {
                GetWindowRect(win, &rect);
+               calc_win_rect(&rect, rect.left, rect.top, xsz, ysz);
        }
+
+       xsz = rect.right - rect.left;
+       ysz = rect.bottom - rect.top;
        SetWindowPos(win, HWND_NOTOPMOST, rect.left, rect.top, xsz, ysz, flags);
 }
 
@@ -1229,7 +1336,69 @@ void glutSetCursor(int cidx)
        }
 }
 
+void glutWarpPointer(int x, int y)
+{
+       POINT pt;
+       pt.x = x;
+       pt.y = y;
+
+       ClientToScreen(win, &pt);
+       SetCursorPos(pt.x, pt.y);
+}
+
+void glutSetColor(int idx, float r, float g, float b)
+{
+       PALETTEENTRY col;
+
+       if(idx < 0 || idx >= 256 || !cmap) {
+               return;
+       }
+
+       col.peRed = (int)(r * 255.0f);
+       col.peGreen = (int)(g * 255.0f);
+       col.peBlue = (int)(b * 255.0f);
+       col.peFlags = PC_NOCOLLAPSE;
+
+       SetPaletteEntries(cmap, idx, 1, &col);
+
+       if(dc) {
+               UnrealizeObject(cmap);
+               SelectPalette(dc, cmap, 0);
+               RealizePalette(dc);
+       }
+}
+
+float glutGetColor(int idx, int comp)
+{
+       PALETTEENTRY col;
+
+       if(idx < 0 || idx >= 256 || !cmap) {
+               return -1.0f;
+       }
+
+       if(!GetPaletteEntries(cmap, idx, 1, &col)) {
+               return -1.0f;
+       }
+
+       switch(comp) {
+       case GLUT_RED:
+               return col.peRed / 255.0f;
+       case GLUT_GREEN:
+               return col.peGreen / 255.0f;
+       case GLUT_BLUE:
+               return col.peBlue / 255.0f;
+       default:
+               break;
+       }
+       return -1.0f;
+}
+
+void glutSetKeyRepeat(int repmode)
+{
+}
+
 #define WGL_DRAW_TO_WINDOW     0x2001
+#define WGL_ACCELERATION       0x2003
 #define WGL_SUPPORT_OPENGL     0x2010
 #define WGL_DOUBLE_BUFFER      0x2011
 #define WGL_STEREO                     0x2012
@@ -1242,6 +1411,7 @@ void glutSetCursor(int cidx)
 #define WGL_ACCUM_BITS         0x201d
 #define WGL_DEPTH_BITS         0x2022
 #define WGL_STENCIL_BITS       0x2023
+#define WGL_FULL_ACCELERATION  0x2027
 
 #define WGL_TYPE_RGBA          0x202b
 #define WGL_TYPE_COLORINDEX    0x202c
@@ -1259,9 +1429,11 @@ static PROC wglGetPixelFormatAttribiv;
 static unsigned int choose_pixfmt(unsigned int mode)
 {
        unsigned int num_pixfmt, pixfmt = 0;
-       int attr[32] = { WGL_DRAW_TO_WINDOW, 1, WGL_SUPPORT_OPENGL, 1 };
+       int attr[32] = { WGL_DRAW_TO_WINDOW, 1, WGL_SUPPORT_OPENGL, 1,
+               WGL_ACCELERATION, WGL_FULL_ACCELERATION };
+       float fattr[2] = {0, 0};
 
-       int *aptr = attr;
+       int *aptr = attr + 6;
        int *samples = 0;
 
        if(mode & GLUT_DOUBLE) {
@@ -1269,7 +1441,7 @@ static unsigned int choose_pixfmt(unsigned int mode)
        }
 
        ATTR(WGL_PIXEL_TYPE, mode & GLUT_INDEX ? WGL_TYPE_COLORINDEX : WGL_TYPE_RGBA);
-       ATTR(WGL_COLOR_BITS, 8);
+       ATTR(WGL_COLOR_BITS, mode & GLUT_INDEX ? 8 : 24);
        if(mode & GLUT_ALPHA) {
                ATTR(WGL_ALPHA_BITS, 4);
        }
@@ -1296,7 +1468,7 @@ static unsigned int choose_pixfmt(unsigned int mode)
        }
        *aptr++ = 0;
 
-       while((!wglChoosePixelFormat(dc, attr, 0, 1, &pixfmt, &num_pixfmt) || !num_pixfmt) && samples && *samples) {
+       while((!wglChoosePixelFormat(dc, attr, fattr, 1, &pixfmt, &num_pixfmt) || !num_pixfmt) && samples && *samples) {
                *samples >>= 1;
                if(!*samples) {
                        aptr[-3] = 0;
@@ -1305,6 +1477,7 @@ static unsigned int choose_pixfmt(unsigned int mode)
        return pixfmt;
 }
 
+static PIXELFORMATDESCRIPTOR pfd;
 static PIXELFORMATDESCRIPTOR tmppfd = {
        sizeof tmppfd, 1, PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER,
        PFD_TYPE_RGBA, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 8, 0,
@@ -1380,7 +1553,7 @@ static int create_window_wglext(const char *title, int width, int height)
        if(!(pixfmt = choose_pixfmt(init_mode))) {
                panic("Failed to find suitable pixel format\n");
        }
-       if(!SetPixelFormat(dc, pixfmt, &tmppfd)) {
+       if(!SetPixelFormat(dc, pixfmt, &pfd)) {
                panic("Failed to set the selected pixel format\n");
        }
        if(!(ctx = wglCreateContext(dc))) {
@@ -1397,6 +1570,7 @@ static int create_window_wglext(const char *title, int width, int height)
        GETATTR(WGL_DOUBLE_BUFFER, &ctx_info.dblbuf);
        GETATTR(WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB, &ctx_info.srgb);
        GETATTR(WGL_SAMPLES_ARB, &ctx_info.samples);
+
        return 0;
 
 fail:
@@ -1411,83 +1585,136 @@ fail:
        return -1;
 }
 
-
 static void create_window(const char *title)
 {
-       int pixfmt;
-       PIXELFORMATDESCRIPTOR pfd = {0};
        RECT rect;
-       int width, height;
+       int i, pixfmt, width, height;
+       char palbuf[sizeof(LOGPALETTE) + 255 * sizeof(PALETTEENTRY)];
+       LOGPALETTE *logpal;
 
-       rect.left = init_x;
-       rect.top = init_y;
-       rect.right = init_x + init_width;
-       rect.bottom = init_y + init_height;
-       AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, 0);
+       calc_win_rect(&rect, init_x, init_y, init_width, init_height);
        width = rect.right - rect.left;
        height = rect.bottom - rect.top;
 
-       if(create_window_wglext(title, width, height) == -1) {
-
-               if(!(win = CreateWindow("MiniGLUT", title, WS_OVERLAPPEDWINDOW,
-                                       rect.left, rect.top, width, height, 0, 0, hinst, 0))) {
-                       panic("Failed to create window\n");
-               }
-               dc = GetDC(win);
-
-               pfd.nSize = sizeof pfd;
-               pfd.nVersion = 1;
-               pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER;
-               if(init_mode & GLUT_STEREO) {
-                       pfd.dwFlags |= PFD_STEREO;
-               }
-               pfd.iPixelType = init_mode & GLUT_INDEX ? PFD_TYPE_COLORINDEX : PFD_TYPE_RGBA;
+       memset(&pfd, 0, sizeof pfd);
+       pfd.nSize = sizeof pfd;
+       pfd.nVersion = 1;
+       pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER;
+       if(init_mode & GLUT_STEREO) {
+               pfd.dwFlags |= PFD_STEREO;
+       }
+       if(init_mode & GLUT_INDEX) {
+               pfd.iPixelType = PFD_TYPE_COLORINDEX;
+               pfd.cColorBits = 8;
+       } else {
+               pfd.iPixelType = PFD_TYPE_RGBA;
                pfd.cColorBits = 24;
-               if(init_mode & GLUT_ALPHA) {
-                       pfd.cAlphaBits = 8;
-               }
-               if(init_mode & GLUT_ACCUM) {
-                       pfd.cAccumBits = 24;
-               }
-               if(init_mode & GLUT_DEPTH) {
-                       pfd.cDepthBits = 24;
-               }
-               if(init_mode & GLUT_STENCIL) {
-                       pfd.cStencilBits = 8;
-               }
-               pfd.iLayerType = PFD_MAIN_PLANE;
+       }
+       if(init_mode & GLUT_ALPHA) {
+               pfd.cAlphaBits = 8;
+       }
+       if(init_mode & GLUT_ACCUM) {
+               pfd.cAccumBits = 24;
+       }
+       if(init_mode & GLUT_DEPTH) {
+               pfd.cDepthBits = 24;
+       }
+       if(init_mode & GLUT_STENCIL) {
+               pfd.cStencilBits = 8;
+       }
+       pfd.iLayerType = PFD_MAIN_PLANE;
 
-               if(!(pixfmt = ChoosePixelFormat(dc, &pfd))) {
-                       panic("Failed to find suitable pixel format\n");
-               }
-               if(!SetPixelFormat(dc, pixfmt, &pfd)) {
-                       panic("Failed to set the selected pixel format\n");
-               }
-               if(!(ctx = wglCreateContext(dc))) {
-                       panic("Failed to create the OpenGL context\n");
+       if(init_mode & (GLUT_SRGB | GLUT_MULTISAMPLE)) {
+               if(create_window_wglext(title, width, height) != -1) {
+                       goto ctxdone;
                }
-               wglMakeCurrent(dc, ctx);
+       }
 
-               DescribePixelFormat(dc, pixfmt, sizeof pfd, &pfd);
-               ctx_info.rsize = pfd.cRedBits;
-               ctx_info.gsize = pfd.cGreenBits;
-               ctx_info.bsize = pfd.cBlueBits;
-               ctx_info.asize = pfd.cAlphaBits;
-               ctx_info.zsize = pfd.cDepthBits;
-               ctx_info.ssize = pfd.cStencilBits;
-               ctx_info.dblbuf = pfd.dwFlags & PFD_DOUBLEBUFFER ? 1 : 0;
-               ctx_info.samples = 0;
-               ctx_info.srgb = 0;
+       /* if we don't need sRGB or multisample, or if the wglChoosePixelFormat method
+        * failed, just use the old-style ChoosePixelFormat method instead
+        */
+       if(!(win = CreateWindow("MiniGLUT", title, WS_OVERLAPPEDWINDOW,
+                               rect.left, rect.top, width, height, 0, 0, hinst, 0))) {
+               panic("Failed to create window\n");
        }
+       dc = GetDC(win);
 
+       if(!(pixfmt = ChoosePixelFormat(dc, &pfd))) {
+               panic("Failed to find suitable pixel format\n");
+       }
+       if(!SetPixelFormat(dc, pixfmt, &pfd)) {
+               panic("Failed to set the selected pixel format\n");
+       }
+       if(!(ctx = wglCreateContext(dc))) {
+               panic("Failed to create the OpenGL context\n");
+       }
+       wglMakeCurrent(dc, ctx);
+
+       DescribePixelFormat(dc, pixfmt, sizeof pfd, &pfd);
+       ctx_info.rsize = pfd.cRedBits;
+       ctx_info.gsize = pfd.cGreenBits;
+       ctx_info.bsize = pfd.cBlueBits;
+       ctx_info.asize = pfd.cAlphaBits;
+       ctx_info.zsize = pfd.cDepthBits;
+       ctx_info.ssize = pfd.cStencilBits;
+       ctx_info.dblbuf = pfd.dwFlags & PFD_DOUBLEBUFFER ? 1 : 0;
+       ctx_info.samples = 0;
+       ctx_info.srgb = 0;
+
+ctxdone:
        ShowWindow(win, 1);
        SetForegroundWindow(win);
        SetFocus(win);
+
+       if(init_mode & GLUT_INDEX) {
+               logpal = (LOGPALETTE*)palbuf;
+
+               GetSystemPaletteEntries(dc, 0, 256, logpal->palPalEntry);
+
+               logpal->palVersion = 0x300;
+               logpal->palNumEntries = 256;
+
+               if(!(cmap = CreatePalette(logpal))) {
+                       panic("Failed to create palette in indexed mode");
+               }
+               SelectPalette(dc, cmap, 0);
+               RealizePalette(dc);
+
+               cmap_size = 256;
+       } else {
+               if(GetDeviceCaps(dc, BITSPIXEL) * GetDeviceCaps(dc, PLANES) <= 8) {
+                       /* for RGB mode in 8bpp displays we also need to set up a palette
+                        * with RGB 332 colors
+                        */
+                       logpal = (LOGPALETTE*)palbuf;
+
+                       logpal->palVersion = 0x300;
+                       logpal->palNumEntries = 256;
+
+                       for(i=0; i<256; i++) {
+                               int r = i & 7;
+                               int g = (i >> 3) & 7;
+                               int b = (i >> 5) & 3;
+
+                               logpal->palPalEntry[i].peRed = (r << 5) | (r << 2) | (r >> 1);
+                               logpal->palPalEntry[i].peGreen = (g << 5) | (g << 2) | (g >> 1);
+                               logpal->palPalEntry[i].peBlue = (b << 6) | (b << 4) | (b << 2) | b;
+                               logpal->palPalEntry[i].peFlags = PC_NOCOLLAPSE;
+                       }
+
+                       if((cmap = CreatePalette(logpal))) {
+                               SelectPalette(dc, cmap, 0);
+                               RealizePalette(dc);
+                               cmap_size = 256;
+                       }
+               }
+       }
+
        upd_pending = 1;
        reshape_pending = 1;
 }
 
-static HRESULT CALLBACK handle_message(HWND win, unsigned int msg, WPARAM wparam, LPARAM lparam)
+static LRESULT CALLBACK handle_message(HWND win, unsigned int msg, WPARAM wparam, LPARAM lparam)
 {
        static int mouse_x, mouse_y;
        int x, y, key;
@@ -1614,6 +1841,16 @@ static void update_modkeys(void)
        }
 }
 
+#ifndef VK_OEM_1
+#define VK_OEM_1       0xba
+#define VK_OEM_2       0xbf
+#define VK_OEM_3       0xc0
+#define VK_OEM_4       0xdb
+#define VK_OEM_5       0xdc
+#define VK_OEM_6       0xdd
+#define VK_OEM_7       0xde
+#endif
+
 static int translate_vkey(int vkey)
 {
        switch(vkey) {
@@ -1625,6 +1862,13 @@ static int translate_vkey(int vkey)
        case VK_UP: return GLUT_KEY_UP;
        case VK_RIGHT: return GLUT_KEY_RIGHT;
        case VK_DOWN: return GLUT_KEY_DOWN;
+       case VK_OEM_1: return ';';
+       case VK_OEM_2: return '/';
+       case VK_OEM_3: return '`';
+       case VK_OEM_4: return '[';
+       case VK_OEM_5: return '\\';
+       case VK_OEM_6: return ']';
+       case VK_OEM_7: return '\'';
        default:
                break;
        }
@@ -1674,7 +1918,7 @@ static void get_screen_size(int *scrw, int *scrh)
 }
 #endif /* BUILD_WIN32 */
 
-#if defined(__unix__) || defined(__APPLE__)
+#if defined(unix) || defined(__unix__) || defined(__APPLE__)
 #include <sys/time.h>
 
 #ifdef MINIGLUT_USE_LIBC
@@ -1726,7 +1970,9 @@ static void panic(const char *msg)
 
 #ifdef MINIGLUT_USE_LIBC
 #include <stdlib.h>
-#ifdef __unix__
+#ifdef _WIN32
+#include <io.h>
+#else
 #include <unistd.h>
 #endif