rnd-20000722-1-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index adf82efa6c4c0789728569f4fbf7abcd85b9ab04..b21ac5d653cb1dfcd940cd6bec7a0e69758107ed 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -17,30 +17,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-
-#ifndef MSDOS
-#define XK_MISCELLANY
-#define XK_LATIN1
-
-/*
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
-#include <X11/Intrinsic.h>
-#include <X11/keysymdef.h>
-*/
-
-#ifdef   XPM_INCLUDE_FILE
-#define  USE_XPM_LIBRARY
-#include XPM_INCLUDE_FILE
-#endif
-#else  /* MSDOS */
-#include "msdos.h"
-#endif  /* MSDOS */
+#include <unistd.h>
+#include <fcntl.h>
 
 #ifdef DEBUG
 #define DEBUG_TIMING   0
@@ -278,12 +260,12 @@ struct SetupJoystickInfo
 
 struct SetupKeyboardInfo
 {
-  KeySym left;
-  KeySym right;
-  KeySym up;
-  KeySym down;
-  KeySym snap;
-  KeySym bomb;
+  Key left;
+  Key right;
+  Key up;
+  Key down;
+  Key snap;
+  Key bomb;
 };
 
 struct SetupInputInfo
@@ -1608,15 +1590,14 @@ extern char             *element_info[];
 #define NUM_SOUNDS             62
 
 /* default input keys */
-#define KEY_UNDEFINDED         XK_VoidSymbol
-#define DEFAULT_KEY_LEFT       XK_Left
-#define DEFAULT_KEY_RIGHT      XK_Right
-#define DEFAULT_KEY_UP         XK_Up
-#define DEFAULT_KEY_DOWN       XK_Down
-#define DEFAULT_KEY_SNAP       XK_Shift_L
-#define DEFAULT_KEY_BOMB       XK_Shift_R
-#define DEFAULT_KEY_OKAY       XK_Return
-#define DEFAULT_KEY_CANCEL     XK_Escape
+#define DEFAULT_KEY_LEFT       KEY_Left
+#define DEFAULT_KEY_RIGHT      KEY_Right
+#define DEFAULT_KEY_UP         KEY_Up
+#define DEFAULT_KEY_DOWN       KEY_Down
+#define DEFAULT_KEY_SNAP       KEY_Shift_L
+#define DEFAULT_KEY_BOMB       KEY_Shift_R
+#define DEFAULT_KEY_OKAY       KEY_Return
+#define DEFAULT_KEY_CANCEL     KEY_Escape
 
 /* directions for moving */
 #define MV_NO_MOVING           0