Splitting the Windows-specific input device code into its own file

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@992 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/Common/freeglut_input_devices.c b/src/Common/freeglut_input_devices.c
index 50eeac7..bcc98fb 100644 (file)
--- a/src/Common/freeglut_input_devices.c
+++ b/src/Common/freeglut_input_devices.c
@@ -46,22 +46,16 @@
 #include <termios.h>\r
 #include <fcntl.h>\r
 \r
-typedef struct {\r
+struct {\r
    int fd;\r
    struct termios termio, termio_save;\r
-} SERIALPORT;\r
-\r
-#elif TARGET_HOST_MS_WINDOWS\r
-#include <sys/types.h>\r
-#include <winbase.h>\r
-typedef struct {\r
-   HANDLE fh;\r
-   COMMTIMEOUTS timeouts_save;\r
-   DCB dcb_save;\r
-} SERIALPORT;\r
+} _serialport;\r
 \r
 #endif\r
 \r
+typedef struct _serialport SERIALPORT;\r
+\r
+\r
 /********************* Dialbox definitions ***********************/\r
 \r
 #define DIAL_NUM_VALUATORS 8\r
@@ -99,12 +93,13 @@ typedef struct {
 \r
 /*****************************************************************/\r
 \r
-static SERIALPORT *serial_open ( const char *device );\r
-static void serial_close ( SERIALPORT *port );\r
-static int serial_getchar ( SERIALPORT *port );\r
-static int serial_putchar ( SERIALPORT *port, unsigned char ch );\r
-static void serial_flush ( SERIALPORT *port );\r
+extern SERIALPORT *serial_open ( const char *device );\r
+extern void serial_close ( SERIALPORT *port );\r
+extern int serial_getchar ( SERIALPORT *port );\r
+extern int serial_putchar ( SERIALPORT *port, unsigned char ch );\r
+extern void serial_flush ( SERIALPORT *port );\r
 \r
+extern void fghRegisterDialDevice ( const char *dial_device );\r
 static void send_dial_event(int dial, int value);\r
 static void poll_dials(int id);\r
 \r
@@ -132,26 +127,20 @@ int fgInputDeviceDetect( void )
 /*\r
  * Try initializing the input device(s)\r
  */\r
+#if TARGET_HOST_POSIX_X11\r
+static void fghRegisterDialDevice ( const char *dial_device )\r
+{\r
+}\r
+#endif\r
+\r
 void fgInitialiseInputDevices ( void )\r
 {\r
     if( !fgState.InputDevsInitialised )\r
     {\r
         const char *dial_device=NULL;\r
         dial_device = getenv ( "GLUT_DIALS_SERIAL" );\r
-#if TARGET_HOST_MS_WINDOWS\r
-        if (!dial_device){\r
-            static char devname[256];\r
-            DWORD size=sizeof(devname);\r
-            DWORD type = REG_SZ;\r
-            HKEY key;\r
-            if (RegOpenKeyA(HKEY_LOCAL_MACHINE,"SOFTWARE\\FreeGLUT",&key)==ERROR_SUCCESS) {\r
-                if (RegQueryValueExA(key,"DialboxSerialPort",NULL,&type,(LPBYTE)devname,&size)==ERROR_SUCCESS){\r
-                    dial_device=devname;\r
-                }\r
-                RegCloseKey(key);\r
-            }\r
-        }\r
-#endif\r
+               fghRegisterDialDevice ( dial_device );\r
+\r
         if ( !dial_device ) return;\r
         if ( !( dialbox_port = serial_open ( dial_device ) ) ) return;\r
         serial_putchar(dialbox_port,DIAL_INITIALIZE);\r
@@ -311,68 +300,4 @@ static void serial_flush ( SERIALPORT *port )
     tcflush ( port->fd, TCIOFLUSH );\r
 }\r
 \r
-#elif TARGET_HOST_MS_WINDOWS\r
-\r
-static SERIALPORT *serial_open(const char *device){\r
-    HANDLE fh;\r
-    DCB dcb={sizeof(DCB)};\r
-    COMMTIMEOUTS timeouts;\r
-    SERIALPORT *port;\r
-\r
-    fh = CreateFile(device,GENERIC_READ|GENERIC_WRITE,0,NULL,\r
-      OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);\r
-    if (!fh) return NULL;\r
-\r
-    port = malloc(sizeof(SERIALPORT));\r
-    ZeroMemory(port, sizeof(SERIALPORT));\r
-    port->fh = fh;\r
-\r
-    /* save current port settings */\r
-    GetCommState(fh,&port->dcb_save);\r
-    GetCommTimeouts(fh,&port->timeouts_save);\r
-\r
-    dcb.DCBlength=sizeof(DCB);\r
-    BuildCommDCB("96,n,8,1",&dcb);\r
-    SetCommState(fh,&dcb);\r
-\r
-    ZeroMemory(&timeouts,sizeof(timeouts));\r
-    timeouts.ReadTotalTimeoutConstant=1;\r
-    timeouts.WriteTotalTimeoutConstant=1;\r
-    SetCommTimeouts(fh,&timeouts);\r
-\r
-    serial_flush(port);\r
-\r
-    return port;\r
-}\r
-\r
-static void serial_close(SERIALPORT *port){\r
-    if (port){\r
-        /* restore old port settings */\r
-        SetCommState(port->fh,&port->dcb_save);\r
-        SetCommTimeouts(port->fh,&port->timeouts_save);\r
-        CloseHandle(port->fh);\r
-        free(port);\r
-    }\r
-}\r
-\r
-static int serial_getchar(SERIALPORT *port){\r
-    DWORD n;\r
-    unsigned char ch;\r
-    if (!port) return EOF;\r
-    if (!ReadFile(port->fh,&ch,1,&n,NULL)) return EOF;\r
-    if (n==1) return ch;\r
-    return EOF;\r
-}\r
-\r
-static int serial_putchar(SERIALPORT *port, unsigned char ch){\r
-    DWORD n;\r
-    if (!port) return 0;\r
-    return WriteFile(port->fh,&ch,1,&n,NULL);\r
-}\r
-\r
-static void serial_flush ( SERIALPORT *port )\r
-{\r
-    FlushFileBuffers(port->fh);\r
-}\r
-\r
 #endif\r

diff --git a/src/mswin/freeglut_input_devices_mswin.c b/src/mswin/freeglut_input_devices_mswin.c
index e69de29..aa35de2 100644 (file)
--- a/src/mswin/freeglut_input_devices_mswin.c
+++ b/src/mswin/freeglut_input_devices_mswin.c
@@ -0,0 +1,127 @@
+/*\r
+ * freeglut_input_devices_mswin.c\r
+ *\r
+ * The Windows-specific mouse cursor related stuff.\r
+ *\r
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.\r
+ * Written by John F. Fay, <fayjf@sourceforge.net>\r
+ * Creation date: Sat Jan 21, 2012\r
+ *\r
+ * Permission is hereby granted, free of charge, to any person obtaining a\r
+ * copy of this software and associated documentation files (the "Software"),\r
+ * to deal in the Software without restriction, including without limitation\r
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,\r
+ * and/or sell copies of the Software, and to permit persons to whom the\r
+ * Software is furnished to do so, subject to the following conditions:\r
+ *\r
+ * The above copyright notice and this permission notice shall be included\r
+ * in all copies or substantial portions of the Software.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS\r
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL\r
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\r
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+ */\r
+\r
+#include <GL/freeglut.h>\r
+#include "freeglut_internal_mswin.h"\r
+\r
+#include <sys/types.h>\r
+#include <winbase.h>\r
+\r
+typedef struct {\r
+   HANDLE fh;\r
+   COMMTIMEOUTS timeouts_save;\r
+   DCB dcb_save;\r
+} SERIALPORT;\r
+\r
+/* Serial Port Prototypes */\r
+SERIALPORT *serial_open ( const char *device );\r
+void serial_close ( SERIALPORT *port );\r
+int serial_getchar ( SERIALPORT *port );\r
+int serial_putchar ( SERIALPORT *port, unsigned char ch );\r
+void serial_flush ( SERIALPORT *port );\r
+\r
+\r
+void fghRegisterDialDevice ( const char *dial_device )\r
+{\r
+        if (!dial_device){\r
+            static char devname[256];\r
+            DWORD size=sizeof(devname);\r
+            DWORD type = REG_SZ;\r
+            HKEY key;\r
+            if (RegOpenKeyA(HKEY_LOCAL_MACHINE,"SOFTWARE\\FreeGLUT",&key)==ERROR_SUCCESS) {\r
+                if (RegQueryValueExA(key,"DialboxSerialPort",NULL,&type,(LPBYTE)devname,&size)==ERROR_SUCCESS){\r
+                    dial_device=devname;\r
+                }\r
+                RegCloseKey(key);\r
+            }\r
+        }\r
+}\r
+\r
+\r
+/*  Serial Port Functions */\r
+SERIALPORT *serial_open(const char *device){\r
+    HANDLE fh;\r
+    DCB dcb={sizeof(DCB)};\r
+    COMMTIMEOUTS timeouts;\r
+    SERIALPORT *port;\r
+\r
+    fh = CreateFile(device,GENERIC_READ|GENERIC_WRITE,0,NULL,\r
+      OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);\r
+    if (!fh) return NULL;\r
+\r
+    port = malloc(sizeof(SERIALPORT));\r
+    ZeroMemory(port, sizeof(SERIALPORT));\r
+    port->fh = fh;\r
+\r
+    /* save current port settings */\r
+    GetCommState(fh,&port->dcb_save);\r
+    GetCommTimeouts(fh,&port->timeouts_save);\r
+\r
+    dcb.DCBlength=sizeof(DCB);\r
+    BuildCommDCB("96,n,8,1",&dcb);\r
+    SetCommState(fh,&dcb);\r
+\r
+    ZeroMemory(&timeouts,sizeof(timeouts));\r
+    timeouts.ReadTotalTimeoutConstant=1;\r
+    timeouts.WriteTotalTimeoutConstant=1;\r
+    SetCommTimeouts(fh,&timeouts);\r
+\r
+    serial_flush(port);\r
+\r
+    return port;\r
+}\r
+\r
+void serial_close(SERIALPORT *port){\r
+    if (port){\r
+        /* restore old port settings */\r
+        SetCommState(port->fh,&port->dcb_save);\r
+        SetCommTimeouts(port->fh,&port->timeouts_save);\r
+        CloseHandle(port->fh);\r
+        free(port);\r
+    }\r
+}\r
+\r
+int serial_getchar(SERIALPORT *port){\r
+    DWORD n;\r
+    unsigned char ch;\r
+    if (!port) return EOF;\r
+    if (!ReadFile(port->fh,&ch,1,&n,NULL)) return EOF;\r
+    if (n==1) return ch;\r
+    return EOF;\r
+}\r
+\r
+int serial_putchar(SERIALPORT *port, unsigned char ch){\r
+    DWORD n;\r
+    if (!port) return 0;\r
+    return WriteFile(port->fh,&ch,1,&n,NULL);\r
+}\r
+\r
+void serial_flush ( SERIALPORT *port )\r
+{\r
+    FlushFileBuffers(port->fh);\r
+}\r
+\r