rnd-19980906

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index ed43f4ec90d015436452eb51ec7fd486ad17c093..5f85101eb06ef4b6764c38034d140e0620b771f7 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -13,6 +13,7 @@
 ***********************************************************/
 
 #include "events.h"
+#include "init.h"
 #include "screens.h"
 #include "tools.h"
 #include "game.h"
@@ -54,6 +55,9 @@ void EventLoop(void)
        case FocusOut:
          HandleFocusEvent((XFocusChangeEvent *) &event);
          break;
+        case ClientMessage:
+         HandleClientMessageEvent((XClientMessageEvent *) &event);
+         break;
        default:
          break;
       }
@@ -61,7 +65,7 @@ void EventLoop(void)
     else                       /* got no event, but don't be lazy... */
     {
       HandleNoXEvent();
-      Delay(10000);            /* don't use all CPU time when idle */
+      Delay(1000);             /* don't use all CPU time when idle */
     }
 
     XSync(display,FALSE);
@@ -97,6 +101,9 @@ void ClearEventQueue()
       case FocusOut:
        HandleFocusEvent((XFocusChangeEvent *) &event);
        break;
+      case ClientMessage:
+       HandleClientMessageEvent((XClientMessageEvent *) &event);
+       break;
       default:
        break;
     }
@@ -129,6 +136,9 @@ void SleepWhileUnmapped()
       case MapNotify:
        window_unmapped = FALSE;
        break;
+      case ClientMessage:
+       HandleClientMessageEvent((XClientMessageEvent *) &event);
+       break;
       default:
        break;
     }
@@ -160,6 +170,11 @@ void HandleExposeEvent(XExposeEvent *event)
     SetDrawtoField(DRAW_DIRECT);
   }
 
+  if (soft_scrolling_on && game_status==PLAYING)
+    XCopyArea(display,fieldbuffer,backbuffer,gc,
+             FX,FY, SXSIZE,SYSIZE,
+             SX,SY);
+
   XCopyArea(display,drawto,window,gc, x,y, width,height, x,y);
 
   XFlush(display);
@@ -202,6 +217,7 @@ void HandleFocusEvent(XFocusChangeEvent *event)
     XAutoRepeatOn(display);
     old_joystick_status = joystick_status;
     joystick_status = JOYSTICK_OFF;
+    key_joystick_mapping = 0;
   }
   else if (event->type == FocusIn)
   {
@@ -212,6 +228,13 @@ void HandleFocusEvent(XFocusChangeEvent *event)
   }
 }
 
+void HandleClientMessageEvent(XClientMessageEvent *event)
+{
+  if ((event->window == window) &&
+      (event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
+    CloseAll();
+}
+
 void HandleButton(int mx, int my, int button)
 {
   static int old_mx = 0, old_my = 0;
@@ -262,10 +285,8 @@ void HandleButton(int mx, int my, int button)
   }
 }
 
-int Gamespeed = 4;
-int Movemethod = 1;
-int Movespeed[2] = { 10, 4 };
-char *Movespeed_text[2] = { "asynchron", "syncron" };
+int GameSpeed = 2;
+int MoveSpeed = 8;
 
 void HandleKey(KeySym key, int key_status)
 {
@@ -280,7 +301,9 @@ void HandleKey(KeySym key, int key_status)
     case XK_KP_Left:
 #endif
     case XK_KP_4:
+#ifndef MSDOS
     case XK_J:
+#endif
     case XK_j:
       joy |= JOY_LEFT;
       break;
@@ -289,7 +312,9 @@ void HandleKey(KeySym key, int key_status)
     case XK_KP_Right:
 #endif
     case XK_KP_6:
+#ifndef MSDOS
     case XK_K:
+#endif
     case XK_k:
       joy |= JOY_RIGHT;
       break;
@@ -298,7 +323,9 @@ void HandleKey(KeySym key, int key_status)
     case XK_KP_Up:
 #endif
     case XK_KP_8:
+#ifndef MSDOS
     case XK_I:
+#endif
     case XK_i:
       joy |= JOY_UP;
       break;
@@ -307,7 +334,9 @@ void HandleKey(KeySym key, int key_status)
     case XK_KP_Down:
 #endif
     case XK_KP_2:
+#ifndef MSDOS
     case XK_M:
+#endif
     case XK_m:
       joy |= JOY_DOWN;
       break;
@@ -335,35 +364,47 @@ void HandleKey(KeySym key, int key_status)
     case XK_KP_3:
       joy |= JOY_DOWN | JOY_RIGHT;
       break;
+#ifndef MSDOS
     case XK_S:                 /* Feld entfernen */
+#endif
     case XK_s:
       joy |= JOY_BUTTON_1 | JOY_LEFT;
       break;
+#ifndef MSDOS
     case XK_D:
+#endif
     case XK_d:
       joy |= JOY_BUTTON_1 | JOY_RIGHT;
       break;
+#ifndef MSDOS
     case XK_E:
+#endif
     case XK_e:
       joy |= JOY_BUTTON_1 | JOY_UP;
       break;
+#ifndef MSDOS
     case XK_X:
+#endif
     case XK_x:
       joy |= JOY_BUTTON_1 | JOY_DOWN;
       break;
     case XK_Shift_L:           /* Linker Feuerknopf */
+#ifndef MSDOS
     case XK_Control_L:
     case XK_Alt_L:
     case XK_Meta_L:
+#endif
       joy |= JOY_BUTTON_1;
       break;
     case XK_Shift_R:           /* Rechter Feuerknopf */
+#ifndef MSDOS
     case XK_Control_R:
     case XK_Alt_R:
     case XK_Meta_R:
     case XK_Mode_switch:
     case XK_Multi_key:
     case XK_B:                 /* (Bombe legen) */
+#endif
     case XK_b:
       joy |= JOY_BUTTON_2;
       break;
@@ -464,37 +505,41 @@ void HandleKey(KeySym key, int key_status)
        case XK_7:
        case XK_8:
        case XK_9:
-         Movespeed[Movemethod] = (Movemethod == 0 ? 4 : 0) + (key - XK_0);
-         printf("method == %d, speed == %d (%s)\n",
-                Movemethod, Movespeed[Movemethod],
-                Movespeed_text[Movemethod]);
+         if (key == XK_0)
+           GameSpeed = 50;
+         else
+           GameSpeed = key - XK_0;
+         printf("GameSpeed == %d\n", GameSpeed);
          break;
 
        case XK_a:
-         Movemethod = !Movemethod;
-         printf("method == %d, speed == %d (%s)\n",
-                Movemethod, Movespeed[Movemethod],
-                Movespeed_text[Movemethod]);
+         if (ScrollStepSize == TILEX/8)
+           ScrollStepSize = TILEX/4;
+         else
+           ScrollStepSize = TILEX/8;
+         printf("ScrollStepSize == %d\n", ScrollStepSize);
          break;
 
        case XK_f:
-         Gamespeed = 2;
-         printf("gamespeed == %d\n", Gamespeed);
+         ScrollStepSize = TILEX/8;
+         printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize);
          break;
        case XK_g:
-         Gamespeed = 3;
-         printf("gamespeed == %d\n", Gamespeed);
+         ScrollStepSize = TILEX/4;
+         printf("ScrollStepSize == %d (1/4)\n", ScrollStepSize);
          break;
        case XK_h:
-         Gamespeed = 4;
-         printf("gamespeed == %d\n", Gamespeed);
+         ScrollStepSize = TILEX/2;
+         printf("ScrollStepSize == %d (1/2)\n", ScrollStepSize);
          break;
        case XK_l:
-         Gamespeed = 50;
-         printf("gamespeed == %d\n", Gamespeed);
+         ScrollStepSize = TILEX;
+         printf("ScrollStepSize == %d (1/1)\n", ScrollStepSize);
          break;
 
+#ifndef MSDOS
        case XK_Q:
+#endif
        case XK_q:
          Dynamite = 1000;
          break;
@@ -502,13 +547,13 @@ void HandleKey(KeySym key, int key_status)
        case XK_x:
 
          {
-           int i,j,k, num_steps = 16, step_size = TILEX / num_steps;
+           int i,j,k, num_steps = 8, step_size = TILEX / num_steps;
            static long scroll_delay=0;
            long scroll_delay_value = 4*4 / num_steps;
 
            printf("Scroll test\n");
 
-           for(i=0;i<10;i++)
+           for(i=0;i<3;i++)
            {
              for(j=0;j<SCR_FIELDX;j++)
              {
@@ -662,18 +707,6 @@ void HandleJoystick()
        return;
       }
 
-
-#if 0
-      if (PlayerMovPos)
-      {
-       ScrollFigure(0);
-       /*
-       BackToFront();
-       */
-      }
-#endif
-
-
       if (tape.pausing || PlayerGone)
        joy = 0;
 
@@ -727,13 +760,6 @@ void HandleJoystick()
          }
        }
       }
-
-
-      /*
-      DrawPlayerField();
-      */
-
-
       break;
     }
     default: