X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=5f85101eb06ef4b6764c38034d140e0620b771f7;hp=63856e59f6480535de10aa9de2440577df04db7c;hb=3367ba5eaec57086e3c1013708967e8a995ef2e3;hpb=b7d31643c9c84104fb3ebef778e545928610ff65 diff --git a/src/events.c b/src/events.c index 63856e59..5f85101e 100644 --- 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; } @@ -149,7 +159,7 @@ void HandleExposeEvent(XExposeEvent *event) int x1 = (x-SX)/TILEX, y1 = (y-SY)/TILEY; int x2 = (x-SX+width)/TILEX, y2 = (y-SY+height)/TILEY; - drawto_field = backbuffer; + SetDrawtoField(DRAW_BACKBUFFER); for(xx=0;xxtype == 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,9 +285,8 @@ void HandleButton(int mx, int my, int button) } } -int Gamespeed = 4; -int Movemethod = 0; -int Movespeed[2] = { 10, 3 }; +int GameSpeed = 2; +int MoveSpeed = 8; void HandleKey(KeySym key, int key_status) { @@ -279,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; @@ -288,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; @@ -297,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; @@ -306,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; @@ -334,27 +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; @@ -370,11 +420,11 @@ void HandleKey(KeySym key, int key_status) key_joystick_mapping &= ~joy; HandleJoystick(); - - if (game_status != PLAYING) - key_joystick_mapping = 0; } + if (game_status != PLAYING) + key_joystick_mapping = 0; + if (key_status == KEY_RELEASED) return; @@ -455,71 +505,115 @@ 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\n", - Movemethod, Movespeed[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\n", - Movemethod, Movespeed[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 = 10; - 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; -#endif case XK_x: - /* + { - int i,j,k, num_steps = 4, 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