X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=d7466911d0ac044b89be05bc38ee56a1a19013f0;hb=74b5b6c19587f93c45b72b1153154030dc99b50d;hp=f4ab83e3a65b8cf4aa375408ca38e0174428ad42;hpb=1d5a33fc89d071c8e8a242ff3b51258f1b6b0e1e;p=rocksndiamonds.git diff --git a/src/events.c b/src/events.c index f4ab83e3..d7466911 100644 --- a/src/events.c +++ b/src/events.c @@ -28,35 +28,55 @@ #define KEY_RELEASED FALSE #define KEY_PRESSED TRUE + +/* event filter especially needed for SDL event filtering due to + delay problems with lots of mouse motion events when mouse + button not pressed */ + +int EventFilter(const Event *event) +{ + if (event->type != EVENT_MOTIONNOTIFY) + return 1; + + /* get mouse motion events without pressed button only in level editor */ + if (button_status == MB_RELEASED && game_status != LEVELED) + return 0; + else + return 1; +} + void EventLoop(void) { while(1) { - if (XPending(display)) /* got event from X server */ + if (PendingEvent()) /* got event */ { - XEvent event; + Event event; - XNextEvent(display, &event); + NextEvent(&event); - switch(event.type) + if (EventFilter(&event)) { - case ButtonPress: - case ButtonRelease: - HandleButtonEvent((XButtonEvent *) &event); - break; - - case MotionNotify: - HandleMotionEvent((XMotionEvent *) &event); - break; - - case KeyPress: - case KeyRelease: - HandleKeyEvent((XKeyEvent *) &event); - break; - - default: - HandleOtherEvents(&event); - break; + switch(event.type) + { + case EVENT_BUTTONPRESS: + case EVENT_BUTTONRELEASE: + HandleButtonEvent((ButtonEvent *) &event); + break; + + case EVENT_MOTIONNOTIFY: + HandleMotionEvent((MotionEvent *) &event); + break; + + case EVENT_KEYPRESS: + case EVENT_KEYRELEASE: + HandleKeyEvent((KeyEvent *) &event); + break; + + default: + HandleOtherEvents(&event); + break; + } } } @@ -67,8 +87,9 @@ void EventLoop(void) if (game_status != PLAYING) { - XSync(display, FALSE); - Delay(10); + SyncDisplay(); + if (!PendingEvent()) /* delay only if no pending events */ + Delay(10); } /* refresh window contents from drawing buffer, if needed */ @@ -79,26 +100,34 @@ void EventLoop(void) } } -void HandleOtherEvents(XEvent *event) +void HandleOtherEvents(Event *event) { switch(event->type) { - case Expose: - HandleExposeEvent((XExposeEvent *) event); + case EVENT_EXPOSE: + HandleExposeEvent((ExposeEvent *) event); break; - case UnmapNotify: + case EVENT_UNMAPNOTIFY: SleepWhileUnmapped(); break; - case FocusIn: - case FocusOut: - HandleFocusEvent((XFocusChangeEvent *) event); + case EVENT_FOCUSIN: + case EVENT_FOCUSOUT: + HandleFocusEvent((FocusChangeEvent *) event); + break; + + case EVENT_CLIENTMESSAGE: + HandleClientMessageEvent((ClientMessageEvent *) event); break; - case ClientMessage: - HandleClientMessageEvent((XClientMessageEvent *) event); +#ifdef USE_SDL_LIBRARY + case SDL_JOYAXISMOTION: + case SDL_JOYBUTTONDOWN: + case SDL_JOYBUTTONUP: + HandleJoystickEvent(event); break; +#endif default: break; @@ -107,19 +136,19 @@ void HandleOtherEvents(XEvent *event) void ClearEventQueue() { - while(XPending(display)) + while (PendingEvent()) { - XEvent event; + Event event; - XNextEvent(display, &event); + NextEvent(&event); switch(event.type) { - case ButtonRelease: + case EVENT_BUTTONRELEASE: button_status = MB_RELEASED; break; - case KeyRelease: + case EVENT_KEYRELEASE: key_joystick_mapping = 0; break; @@ -134,29 +163,29 @@ void SleepWhileUnmapped() { boolean window_unmapped = TRUE; - XAutoRepeatOn(display); + KeyboardAutoRepeatOn(); while(window_unmapped) { - XEvent event; + Event event; - XNextEvent(display, &event); + NextEvent(&event); switch(event.type) { - case ButtonRelease: + case EVENT_BUTTONRELEASE: button_status = MB_RELEASED; break; - case KeyRelease: + case EVENT_KEYRELEASE: key_joystick_mapping = 0; break; - case MapNotify: + case EVENT_MAPNOTIFY: window_unmapped = FALSE; break; - case UnmapNotify: + case EVENT_UNMAPNOTIFY: /* this is only to surely prevent the 'should not happen' case * of recursively looping between 'SleepWhileUnmapped()' and * 'HandleOtherEvents()' which usually calls this funtion. @@ -169,12 +198,13 @@ void SleepWhileUnmapped() } } - if (game_status==PLAYING) - XAutoRepeatOff(display); + if (game_status == PLAYING) + KeyboardAutoRepeatOff(); } -void HandleExposeEvent(XExposeEvent *event) +void HandleExposeEvent(ExposeEvent *event) { +#ifndef USE_SDL_LIBRARY int x = event->x, y = event->y; int width = event->width, height = event->height; @@ -202,21 +232,20 @@ void HandleExposeEvent(XExposeEvent *event) fx += (ScreenMovDir & (MV_LEFT|MV_RIGHT) ? ScreenGfxPos : 0); fy += (ScreenMovDir & (MV_UP|MV_DOWN) ? ScreenGfxPos : 0); - XCopyArea(display,fieldbuffer,backbuffer,gc, - fx,fy, SXSIZE,SYSIZE, - SX,SY); + BlitBitmap(fieldbuffer, backbuffer, fx,fy, SXSIZE,SYSIZE, SX,SY); } - XCopyArea(display,drawto,window,gc, x,y, width,height, x,y); + BlitBitmap(drawto, window, x,y, width,height, x,y); - XFlush(display); + FlushDisplay(); +#endif } -void HandleButtonEvent(XButtonEvent *event) +void HandleButtonEvent(ButtonEvent *event) { motion_status = FALSE; - if (event->type==ButtonPress) + if (event->type == EVENT_BUTTONPRESS) button_status = event->button; else button_status = MB_RELEASED; @@ -224,49 +253,86 @@ void HandleButtonEvent(XButtonEvent *event) HandleButton(event->x, event->y, button_status); } -void HandleMotionEvent(XMotionEvent *event) +void HandleMotionEvent(MotionEvent *event) { + if (!PointerInWindow(window)) + return; /* window and pointer are on different screens */ + +#if 0 + if (button_status == MB_RELEASED && game_status != LEVELED) + return; +#endif + motion_status = TRUE; HandleButton(event->x, event->y, button_status); } -void HandleKeyEvent(XKeyEvent *event) +void HandleKeyEvent(KeyEvent *event) { - int key_status = (event->type == KeyPress ? KEY_PRESSED : KEY_RELEASED); - unsigned int event_state = (game_status != PLAYING ? event->state : 0); - KeySym key = XLookupKeysym(event, event_state); + int key_status = (event->type==EVENT_KEYPRESS ? KEY_PRESSED : KEY_RELEASED); + boolean with_modifiers = (game_status == PLAYING ? FALSE : TRUE); + Key key = GetEventKey(event, with_modifiers); HandleKey(key, key_status); } -void HandleFocusEvent(XFocusChangeEvent *event) +void HandleFocusEvent(FocusChangeEvent *event) { static int old_joystick_status = -1; - if (event->type == FocusOut) + if (event->type == EVENT_FOCUSOUT) { - XAutoRepeatOn(display); + int i; + + KeyboardAutoRepeatOn(); old_joystick_status = joystick_status; joystick_status = JOYSTICK_OFF; + + /* simulate key release events for still pressed keys */ key_joystick_mapping = 0; + for (i=0; itype == FocusIn) + else if (event->type == EVENT_FOCUSIN) { + /* When there are two Rocks'n'Diamonds windows which overlap and + the player moves the pointer from one game window to the other, + a 'FocusOut' event is generated for the window the pointer is + leaving and a 'FocusIn' event is generated for the window the + pointer is entering. In some cases, it can happen that the + 'FocusIn' event is handled by the one game process before the + 'FocusOut' event by the other game process. In this case the + X11 environment would end up with activated keyboard auto repeat, + because unfortunately this is a global setting and not (which + would be far better) set for each X11 window individually. + The effect would be keyboard auto repeat while playing the game + (game_status == PLAYING), which is not desired. + To avoid this special case, we just wait 1/10 second before + processing the 'FocusIn' event. + */ + if (game_status == PLAYING) - XAutoRepeatOff(display); + { + Delay(100); + KeyboardAutoRepeatOff(); + } if (old_joystick_status != -1) joystick_status = old_joystick_status; } } -void HandleClientMessageEvent(XClientMessageEvent *event) +void HandleClientMessageEvent(ClientMessageEvent *event) { +#ifdef USE_SDL_LIBRARY + CloseAllAndExit(0); /* the only possible message here is SDL_QUIT */ +#else #ifndef MSDOS if ((event->window == window) && (event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE))) CloseAllAndExit(0); #endif +#endif } void HandleButton(int mx, int my, int button) @@ -283,10 +349,6 @@ void HandleButton(int mx, int my, int button) { old_mx = mx; old_my = my; - - HandleVideoButtons(mx,my, button); - HandleSoundButtons(mx,my, button); - HandleGameButtons(mx,my, button); } HandleGadgets(mx, my, button); @@ -298,7 +360,7 @@ void HandleButton(int mx, int my, int button) break; case TYPENAME: - HandleTypeName(0, XK_Return); + HandleTypeName(0, KEY_Return); break; case CHOOSELEVEL: @@ -306,11 +368,10 @@ void HandleButton(int mx, int my, int button) break; case HALLOFFAME: - HandleHallOfFame(button); + HandleHallOfFame(0,0, 0,0, button); break; case LEVELED: - LevelEd(mx,my, button); break; case HELPSCREEN: @@ -337,7 +398,12 @@ void HandleButton(int mx, int my, int button) int x = LEVELX(sx); int y = LEVELY(sy); - printf("INFO: Feld[%d][%d] == %d\n", x,y, Feld[x][y]); + printf("INFO: SCREEN(%d, %d), LEVEL(%d, %d)\n", sx, sy, x, y); + + if (!IN_LEV_FIELD(x, y)) + break; + + printf(" Feld[%d][%d] == %d\n", x,y, Feld[x][y]); printf(" Store[%d][%d] == %d\n", x,y, Store[x][y]); printf(" Store2[%d][%d] == %d\n", x,y, Store2[x][y]); printf(" StorePlayer[%d][%d] == %d\n", x,y, StorePlayer[x][y]); @@ -355,14 +421,14 @@ void HandleButton(int mx, int my, int button) } } -void HandleKey(KeySym key, int key_status) +void HandleKey(Key key, int key_status) { int joy = 0; static struct SetupKeyboardInfo custom_key; static struct { - KeySym *keysym_custom; - KeySym keysym_default; + Key *key_custom; + Key key_default; byte action; } key_info[] = { @@ -389,7 +455,7 @@ void HandleKey(KeySym key, int key_status) custom_key = setup.input[pnr].key; for (i=0; i<6; i++) - if (key == *key_info[i].keysym_custom) + if (key == *key_info[i].key_custom) key_action |= key_info[i].action; if (key_status == KEY_PRESSED) @@ -403,7 +469,7 @@ void HandleKey(KeySym key, int key_status) int i; for (i=0; i<6; i++) - if (key == key_info[i].keysym_default) + if (key == key_info[i].key_default) joy |= key_info[i].action; } @@ -423,7 +489,8 @@ void HandleKey(KeySym key, int key_status) if (key_status == KEY_RELEASED) return; - if (key == XK_Return && game_status == PLAYING && AllPlayersGone) + if ((key == KEY_Return || key == KEY_space) && + game_status == PLAYING && AllPlayersGone) { CloseDoor(DOOR_CLOSE_1); game_status = MAINMENU; @@ -432,18 +499,8 @@ void HandleKey(KeySym key, int key_status) } /* allow quick escape to the main menu with the Escape key */ - if (key == XK_Escape && game_status != MAINMENU) + if (key == KEY_Escape && game_status != MAINMENU) { - if (game_status == LEVELED) - { - /* draw smaller door */ - XCopyArea(display, pix[PIX_DOOR], drawto, gc, - DOOR_GFX_PAGEX7, 64, - 108, 64, - EX - 4, EY - 12); - redraw_mask |= REDRAW_ALL; - } - CloseDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY); game_status = MAINMENU; DrawMainMenu(); @@ -461,6 +518,8 @@ void HandleKey(KeySym key, int key_status) + HandleGadgetsKeyInput(key); + switch(game_status) { case TYPENAME: @@ -473,7 +532,8 @@ void HandleKey(KeySym key, int key_status) case SETUPINPUT: switch(key) { - case XK_Return: + case KEY_Return: + case KEY_space: if (game_status == MAINMENU) HandleMainMenu(0,0, 0,0, MB_MENU_CHOICE); else if (game_status == CHOOSELEVEL) @@ -484,6 +544,16 @@ void HandleKey(KeySym key, int key_status) HandleSetupInputScreen(0,0, 0,0, MB_MENU_CHOICE); break; + case KEY_Page_Up: + if (game_status == CHOOSELEVEL) + HandleChooseLevel(0,0, 0,-SCR_FIELDY, MB_MENU_MARK); + break; + + case KEY_Page_Down: + if (game_status == CHOOSELEVEL) + HandleChooseLevel(0,0, 0,SCR_FIELDY, MB_MENU_MARK); + break; + default: break; } @@ -496,12 +566,21 @@ void HandleKey(KeySym key, int key_status) case HALLOFFAME: switch(key) { - case XK_Return: + case KEY_Return: + case KEY_space: game_status = MAINMENU; DrawMainMenu(); BackToFront(); break; + case KEY_Page_Up: + HandleHallOfFame(0,0, 0,-SCR_FIELDY, MB_MENU_MARK); + break; + + case KEY_Page_Down: + HandleHallOfFame(0,0, 0,SCR_FIELDY, MB_MENU_MARK); + break; + default: break; } @@ -509,7 +588,6 @@ void HandleKey(KeySym key, int key_status) case LEVELED: HandleLevelEditorKeyInput(key); - LevelNameTyping(key); break; case PLAYING: @@ -518,17 +596,17 @@ void HandleKey(KeySym key, int key_status) { #ifdef DEBUG - case XK_0: - case XK_1: - case XK_2: - case XK_3: - case XK_4: - case XK_5: - case XK_6: - case XK_7: - case XK_8: - case XK_9: - if (key == XK_0) + case KEY_0: + case KEY_1: + case KEY_2: + case KEY_3: + case KEY_4: + case KEY_5: + case KEY_6: + case KEY_7: + case KEY_8: + case KEY_9: + if (key == KEY_0) { if (GameFrameDelay == 500) GameFrameDelay = GAME_FRAME_DELAY; @@ -536,14 +614,14 @@ void HandleKey(KeySym key, int key_status) GameFrameDelay = 500; } else - GameFrameDelay = (key - XK_0) * 10; + GameFrameDelay = (key - KEY_0) * 10; printf("Game speed == %d%% (%d ms delay between two frames)\n", GAME_FRAME_DELAY * 100 / GameFrameDelay, GameFrameDelay); break; #if 0 - case XK_a: + case KEY_a: if (ScrollStepSize == TILEX/8) ScrollStepSize = TILEX/4; else @@ -552,8 +630,8 @@ void HandleKey(KeySym key, int key_status) break; #endif -#if 1 - case XK_m: +#if 0 + case KEY_m: if (MoveSpeed == 8) { MoveSpeed = 4; @@ -568,30 +646,30 @@ void HandleKey(KeySym key, int key_status) break; #endif - case XK_f: + case KEY_f: ScrollStepSize = TILEX/8; printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize); break; - case XK_g: + case KEY_g: ScrollStepSize = TILEX/4; printf("ScrollStepSize == %d (1/4)\n", ScrollStepSize); break; - case XK_h: + case KEY_h: ScrollStepSize = TILEX/2; printf("ScrollStepSize == %d (1/2)\n", ScrollStepSize); break; - case XK_l: + case KEY_l: ScrollStepSize = TILEX; printf("ScrollStepSize == %d (1/1)\n", ScrollStepSize); break; #ifndef MSDOS - case XK_Q: + case KEY_Q: #endif - case XK_q: + case KEY_q: local_player->dynamite = 1000; break; @@ -599,7 +677,7 @@ void HandleKey(KeySym key, int key_status) #if 0 - case XK_z: + case KEY_z: { int i; @@ -636,7 +714,7 @@ void HandleNoXEvent() return; } -#ifndef MSDOS +#if !defined(MSDOS) && !defined(WIN32) if (options.network) HandleNetworking(); #endif @@ -715,7 +793,7 @@ void HandleJoystick() } case HALLOFFAME: - HandleHallOfFame(!newbutton); + HandleHallOfFame(0,0, dx,dy, !newbutton); break; case HELPSCREEN: