rnd-20000806-1-src

[rocksndiamonds.git] / src / system.c

diff --git a/src/system.c b/src/system.c
index 5fbf9efec2a83b7bc555823d81994a4e23e84340..6b85ccb38c219d7fe790031bdbf817a355c179d6 100644 (file)
--- a/src/system.c
+++ b/src/system.c
@@ -14,10 +14,6 @@
 
 #include "main.h"
 
-#ifdef USE_SDL_LIBRARY
-#include "sdl.h"
-#endif
-
 inline void ClearRectangle(Bitmap bitmap, int x, int y, int width, int height)
 {
 #ifdef USE_SDL_LIBRARY
@@ -124,20 +120,20 @@ inline void KeyboardAutoRepeatOff()
 #endif
 }
 
-inline boolean QueryPointer(DrawWindow window, int *win_x, int *win_y)
+inline boolean PointerInWindow(DrawWindow window)
 {
 #ifdef USE_SDL_LIBRARY
-  SDL_GetMouseState(win_x, win_y);
   return TRUE;
 #else
   DrawWindow root, child;
   int root_x, root_y;
   unsigned int mask;
+  int win_x, win_y;
 
   /* if XQueryPointer() returns False, the pointer
      is not on the same screen as the specified window */
   return XQueryPointer(display, window, &root, &child, &root_x, &root_y,
-                      win_x, win_y, &mask);
+                      &win_x, &win_y, &mask);
 #endif
 }
 
@@ -162,20 +158,11 @@ inline void NextEvent(Event *event)
 inline Key GetEventKey(KeyEvent *event, boolean with_modifiers)
 {
 #ifdef USE_SDL_LIBRARY
-#if 0
-  printf("0x%x, 0x%x\n",
-        event->keysym.sym, event->keysym.unicode);
-#endif
   if (with_modifiers && event->keysym.unicode != 0)
     return event->keysym.unicode;
   else
     return event->keysym.sym;
 #else
-#if 0
-  printf("0x%x, 0x%x\n",
-        (unsigned int)XLookupKeysym(event, 0),
-        (unsigned int)XLookupKeysym(event, event->state));
-#endif
   if (with_modifiers)
     return XLookupKeysym(event, event->state);
   else