From: Holger Schemel Date: Wed, 21 Oct 1998 22:13:33 +0000 (+0200) Subject: rnd-19981022-1 X-Git-Tag: 1.2.0^2~48 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=a4d4e8e444b21b58dcc88b52ff22726c545142a4;p=rocksndiamonds.git rnd-19981022-1 --- diff --git a/src/events.c b/src/events.c index 976974ac..a38a6ef0 100644 --- a/src/events.c +++ b/src/events.c @@ -34,31 +34,22 @@ void EventLoop(void) switch(event.type) { - case Expose: - HandleExposeEvent((XExposeEvent *) &event); - break; - case UnmapNotify: - SleepWhileUnmapped(); - break; case ButtonPress: case ButtonRelease: HandleButtonEvent((XButtonEvent *) &event); break; + case MotionNotify: HandleMotionEvent((XMotionEvent *) &event); break; + case KeyPress: case KeyRelease: HandleKeyEvent((XKeyEvent *) &event); break; - case FocusIn: - case FocusOut: - HandleFocusEvent((XFocusChangeEvent *) &event); - break; - case ClientMessage: - HandleClientMessageEvent((XClientMessageEvent *) &event); - break; + default: + HandleOtherEvents(&event); break; } } @@ -99,6 +90,32 @@ void EventLoop(void) } } +void HandleOtherEvents(XEvent *event) +{ + switch(event->type) + { + case Expose: + HandleExposeEvent((XExposeEvent *) event); + break; + + case UnmapNotify: + SleepWhileUnmapped(); + break; + + case FocusIn: + case FocusOut: + HandleFocusEvent((XFocusChangeEvent *) event); + break; + + case ClientMessage: + HandleClientMessageEvent((XClientMessageEvent *) event); + break; + + default: + break; + } +} + void ClearEventQueue() { while(XPending(display)) @@ -109,26 +126,16 @@ void ClearEventQueue() switch(event.type) { - case Expose: - HandleExposeEvent((XExposeEvent *) &event); - break; - case UnmapNotify: - SleepWhileUnmapped(); - break; case ButtonRelease: button_status = MB_RELEASED; break; + case KeyRelease: key_joystick_mapping = 0; break; - case FocusIn: - case FocusOut: - HandleFocusEvent((XFocusChangeEvent *) &event); - break; - case ClientMessage: - HandleClientMessageEvent((XClientMessageEvent *) &event); - break; + default: + HandleOtherEvents(&event); break; } } @@ -148,22 +155,27 @@ void SleepWhileUnmapped() switch(event.type) { - case Expose: - HandleExposeEvent((XExposeEvent *) &event); - break; case ButtonRelease: button_status = MB_RELEASED; break; + case KeyRelease: key_joystick_mapping = 0; break; + case MapNotify: window_unmapped = FALSE; break; - case ClientMessage: - HandleClientMessageEvent((XClientMessageEvent *) &event); + + case UnmapNotify: + /* this is only to surely prevent the 'should not happen' case + * of recursively looping between 'SleepWhileUnmapped()' and + * 'HandleOtherEvents()' which usually calls this funtion. + */ break; + default: + HandleOtherEvents(&event); break; } } @@ -313,24 +325,35 @@ void HandleButton(int mx, int my, int button) case MAINMENU: HandleMainMenu(mx,my,0,0,button); break; + case TYPENAME: HandleTypeName(0,XK_Return); break; + case CHOOSELEVEL: HandleChooseLevel(mx,my,0,0,button); break; + case HALLOFFAME: HandleHallOfFame(button); break; + case LEVELED: LevelEd(mx,my,button); break; + case HELPSCREEN: HandleHelpScreen(button); break; + case SETUP: HandleSetupScreen(mx,my,0,0,button); break; + + case SETUPINPUT: + HandleSetupInputScreen(mx,my,0,0,button); + break; + case PLAYING: /* --> NoXEvent() will follow */ @@ -340,6 +363,7 @@ void HandleButton(int mx, int my, int button) */ break; + default: break; } @@ -364,6 +388,7 @@ void HandleKey(KeySym key, int key_status) case XK_j: joy |= JOY_LEFT; break; + case XK_Right: #ifdef XK_KP_Right case XK_KP_Right: @@ -375,6 +400,7 @@ void HandleKey(KeySym key, int key_status) case XK_k: joy |= JOY_RIGHT; break; + case XK_Up: #ifdef XK_KP_Up case XK_KP_Up: @@ -386,6 +412,7 @@ void HandleKey(KeySym key, int key_status) case XK_i: joy |= JOY_UP; break; + case XK_Down: #ifdef XK_KP_Down case XK_KP_Down: @@ -397,54 +424,63 @@ void HandleKey(KeySym key, int key_status) case XK_m: joy |= JOY_DOWN; break; + #ifdef XK_KP_Home case XK_KP_Home: /* Diagonalrichtungen */ #endif case XK_KP_7: joy |= JOY_UP | JOY_LEFT; break; + #ifdef XK_KP_Page_Up case XK_KP_Page_Up: #endif case XK_KP_9: joy = JOY_UP | JOY_RIGHT; break; + #ifdef XK_KP_End case XK_KP_End: #endif case XK_KP_1: joy |= JOY_DOWN | JOY_LEFT; break; + #ifdef XK_KP_Page_Down case XK_KP_Page_Down: #endif 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: @@ -453,6 +489,7 @@ void HandleKey(KeySym key, int key_status) #endif joy |= JOY_BUTTON_1; break; + case XK_Shift_R: /* Rechter Feuerknopf */ #ifndef MSDOS case XK_Control_R: @@ -465,6 +502,7 @@ void HandleKey(KeySym key, int key_status) case XK_b: joy |= JOY_BUTTON_2; break; + default: break; } @@ -509,10 +547,11 @@ void HandleKey(KeySym key, int key_status) case TYPENAME: HandleTypeName(0,key); break; + case MAINMENU: case CHOOSELEVEL: case SETUP: - { + case SETUPINPUT: switch(key) { case XK_Return: @@ -522,15 +561,19 @@ void HandleKey(KeySym key, int key_status) HandleChooseLevel(0,0,0,0,MB_MENU_CHOICE); else if (game_status==SETUP) HandleSetupScreen(0,0,0,0,MB_MENU_CHOICE); + else if (game_status==SETUPINPUT) + HandleSetupInputScreen(0,0,0,0,MB_MENU_CHOICE); break; + default: break; } break; - } + case HELPSCREEN: HandleHelpScreen(MB_RELEASED); break; + case HALLOFFAME: switch(key) { @@ -539,13 +582,16 @@ void HandleKey(KeySym key, int key_status) DrawMainMenu(); BackToFront(); break; + default: break; } break; + case LEVELED: LevelNameTyping(key); break; + case PLAYING: { switch(key) @@ -582,14 +628,17 @@ void HandleKey(KeySym key, int key_status) ScrollStepSize = TILEX/8; printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize); break; + case XK_g: ScrollStepSize = TILEX/4; printf("ScrollStepSize == %d (1/4)\n", ScrollStepSize); break; + case XK_h: ScrollStepSize = TILEX/2; printf("ScrollStepSize == %d (1/2)\n", ScrollStepSize); break; + case XK_l: ScrollStepSize = TILEX; printf("ScrollStepSize == %d (1/1)\n", ScrollStepSize); @@ -736,8 +785,10 @@ void HandleNoXEvent() case HALLOFFAME: case HELPSCREEN: case SETUP: + case SETUPINPUT: HandleJoystick(); break; + case PLAYING: HandleJoystick(); @@ -746,6 +797,7 @@ void HandleNoXEvent() */ break; + default: break; } @@ -770,6 +822,7 @@ void HandleJoystick() case MAINMENU: case CHOOSELEVEL: case SETUP: + case SETUPINPUT: { static long joystickmove_delay = 0; @@ -782,6 +835,9 @@ void HandleJoystick() HandleChooseLevel(0,0,dx,dy,newbutton ? MB_MENU_CHOICE : MB_MENU_MARK); else if (game_status==SETUP) HandleSetupScreen(0,0,dx,dy,newbutton ? MB_MENU_CHOICE : MB_MENU_MARK); + else if (game_status==SETUPINPUT) + HandleSetupInputScreen(0,0,dx,dy, + newbutton ? MB_MENU_CHOICE : MB_MENU_MARK); break; } diff --git a/src/events.h b/src/events.h index ccf604c3..a7980e5a 100644 --- a/src/events.h +++ b/src/events.h @@ -17,6 +17,7 @@ #include "main.h" void EventLoop(void); +void HandleOtherEvents(XEvent *); void ClearEventQueue(void); void SleepWhileUnmapped(void); diff --git a/src/main.h b/src/main.h index 7fa64257..0d427559 100644 --- a/src/main.h +++ b/src/main.h @@ -1042,7 +1042,8 @@ extern int num_bg_loops; #define TYPENAME 5 #define HALLOFFAME 6 #define SETUP 7 -#define EXITGAME 8 +#define SETUPINPUT 8 +#define EXITGAME 9 /* values for game_emulation */ #define EMU_NONE 0 diff --git a/src/misc.c b/src/misc.c index e2c8d7e0..be689499 100644 --- a/src/misc.c +++ b/src/misc.c @@ -401,11 +401,13 @@ char *getKeySymName(KeySym key) char *name; } translate[] = { + /* normal cursor keys */ { XK_Left, "cursor left" }, { XK_Right, "cursor right" }, { XK_Up, "cursor up" }, { XK_Down, "cursor down" }, + /* keypad cursor keys */ #ifdef XK_KP_Left { XK_KP_Left, "keypad left" }, { XK_KP_Right, "keypad right" }, @@ -413,20 +415,21 @@ char *getKeySymName(KeySym key) { XK_KP_Down, "keypad down" }, #endif - { XK_BackSpace, "backspace" }, - { XK_Delete, "delete" }, - { XK_Insert, "insert" }, - { XK_Tab, "tab" }, - { XK_Home, "home" }, - { XK_End, "end" }, - { XK_Page_Up, "page up" }, - { XK_Page_Down, "page down" }, - { XK_space, "space" }, + /* other keypad keys */ +#ifdef XK_KP_Enter + { XK_KP_Enter, "keypad enter" }, + { XK_KP_Add, "keypad +" }, + { XK_KP_Subtract, "keypad -" }, + { XK_KP_Multiply, "keypad mltply" }, + { XK_KP_Divide, "keypad /" }, + { XK_KP_Separator, "keypad ," }, +#endif + /* modifier keys */ { XK_Shift_L, "left shift" }, { XK_Shift_R, "right shift" }, - { XK_Control_L, "left ctrl" }, - { XK_Control_R, "right ctrl" }, + { XK_Control_L, "left control" }, + { XK_Control_R, "right control" }, { XK_Meta_L, "left meta" }, { XK_Meta_R, "right meta" }, { XK_Alt_L, "left alt" }, @@ -434,6 +437,33 @@ char *getKeySymName(KeySym key) { XK_Mode_switch, "mode switch" }, { XK_Multi_key, "multi key" }, + /* some special keys */ + { XK_BackSpace, "backspace" }, + { XK_Delete, "delete" }, + { XK_Insert, "insert" }, + { XK_Tab, "tab" }, + { XK_Home, "home" }, + { XK_End, "end" }, + { XK_Page_Up, "page up" }, + { XK_Page_Down, "page down" }, + { XK_space, "space" }, + + /* even more special keys */ + { XK_adiaeresis, "ä" }, + { XK_odiaeresis, "ö" }, + { XK_udiaeresis, "ü" }, + { XK_apostrophe, "'" }, + { XK_plus, "+" }, + { XK_minus, "-" }, + { XK_comma, "," }, + { XK_period, "." }, + { XK_numbersign, "#" }, + { XK_less, "less" }, + { XK_greater, "greater" }, + { XK_asciicircum, "circumflex" }, + { XK_ssharp, "sharp s" }, + + /* end-of-array identifier */ { 0, NULL } }; @@ -457,6 +487,11 @@ char *getKeySymName(KeySym key) sprintf(key_name, "keypad %c", '0' + (char)(key - XK_KP_0)); return key_name; } + else if (key >= XK_F1 && key <= XK_F24) + { + sprintf(key_name, "function F%d", (int)(key - XK_F1 + 1)); + return key_name; + } else { int i = 0; diff --git a/src/screens.c b/src/screens.c index ad05d1a6..ec2e0e6d 100644 --- a/src/screens.c +++ b/src/screens.c @@ -895,6 +895,266 @@ void HandleHallOfFame(int button) void DrawSetupScreen() { int i; + static struct setup + { + unsigned int bit; + char *text, *mode[2]; + int color[2]; + } setup[] = + { + {SETUP_SOUND, "Sound:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, + {SETUP_SOUND_LOOPS, " Sound Loops:",{"on", "off"}, {FC_YELLOW,FC_BLUE}}, + {SETUP_SOUND_MUSIC, " Game Music:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, + {SETUP_TOONS, "Toons:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, + {SETUP_DIRECT_DRAW, "Buffered gfx:",{"off","on" }, {FC_BLUE,FC_YELLOW}}, + {SETUP_SCROLL_DELAY,"Scroll Delay:",{"on", "off"}, {FC_YELLOW,FC_BLUE}}, + {SETUP_SOFT_SCROLL, "Soft Scroll.:",{"on", "off"}, {FC_YELLOW,FC_BLUE}}, + {SETUP_FADING, "Fading:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, + {SETUP_QUICK_DOORS, "Quick Doors:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, + {SETUP_AUTO_RECORD, "Auto-Record:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, + {0, "Input Setup", {"", ""}, {0,0}}, + {0, "", {"", ""}, {0,0}}, + {0, "", {"", ""}, {0,0}}, + {0, "Exit", {"", ""}, {0,0}}, + {0, "Save and exit",{"", ""}, {0,0}} + }; + + CloseDoor(DOOR_CLOSE_2); + ClearWindow(); + DrawText(SX+16, SY+16, "SETUP",FS_BIG,FC_YELLOW); + + for(i=SETUP_SCREEN_POS_START;i<=SETUP_SCREEN_POS_END;i++) + { + int base = i - SETUP_SCREEN_POS_START; + + if (!(i >= SETUP_SCREEN_POS_EMPTY1 && i <= SETUP_SCREEN_POS_EMPTY2)) + { + DrawGraphic(0,i,GFX_KUGEL_BLAU); + DrawText(SX+32,SY+i*32, setup[base].text, FS_BIG,FC_GREEN); + } + + if (i < SETUP_SCREEN_POS_EMPTY1) + { + int setting_bit = setup[base].bit; + int setting_pos = ((local_player->setup & setting_bit) != 0 ? 0 : 1); + DrawText(SX+14*32, SY+i*32,setup[base].mode[setting_pos], + FS_BIG,setup[base].color[setting_pos]); + } + } + + FadeToFront(); + InitAnimation(); + HandleSetupScreen(0,0,0,0,MB_MENU_INITIALIZE); +} + +void HandleSetupScreen(int mx, int my, int dx, int dy, int button) +{ + static int choice = 3; + static int redraw = TRUE; + int x = (mx+32-SX)/32, y = (my+32-SY)/32; + int pos_start = SETUP_SCREEN_POS_START + 1; + int pos_empty1 = SETUP_SCREEN_POS_EMPTY1 + 1; + int pos_empty2 = SETUP_SCREEN_POS_EMPTY2 + 1; + int pos_end = SETUP_SCREEN_POS_END + 1; + + if (button == MB_MENU_INITIALIZE) + redraw = TRUE; + + if (redraw) + { + DrawGraphic(0,choice-1,GFX_KUGEL_ROT); + redraw = FALSE; + } + + if (button == MB_MENU_INITIALIZE) + return; + + if (dx || dy) + { + if (dy) + { + x = 1; + y = choice+dy; + } + else + x = y = 0; + + if (y >= pos_empty1 && y <= pos_empty2) + y = (dy > 0 ? pos_empty2 + 1 : pos_empty1 - 1); + + if (y < pos_start) + y = pos_start; + else if (y > pos_end) + y = pos_end; + } + + if (!mx && !my && !dx && !dy) + { + x = 1; + y = choice; + } + + if (x==1 && y >= pos_start && y <= pos_end && + !(y >= pos_empty1 && y <= pos_empty2)) + { + if (button) + { + if (y!=choice) + { + DrawGraphic(0,y-1,GFX_KUGEL_ROT); + DrawGraphic(0,choice-1,GFX_KUGEL_BLAU); + } + choice = y; + } + else + { + int yy = y-1; + + if (y==3 && sound_status==SOUND_AVAILABLE) + { + if (SETUP_SOUND_ON(local_player->setup)) + { + DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); + DrawText(SX+14*32, SY+(yy+1)*32,"off",FS_BIG,FC_BLUE); + DrawText(SX+14*32, SY+(yy+2)*32,"off",FS_BIG,FC_BLUE); + local_player->setup &= ~SETUP_SOUND_LOOPS; + local_player->setup &= ~SETUP_SOUND_MUSIC; + } + else + DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); + local_player->setup ^= SETUP_SOUND; + } + else if (y==4 && sound_loops_allowed) + { + if (SETUP_SOUND_LOOPS_ON(local_player->setup)) + DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); + else + { + DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); + DrawText(SX+14*32, SY+(yy-1)*32,"on ",FS_BIG,FC_YELLOW); + local_player->setup |= SETUP_SOUND; + } + local_player->setup ^= SETUP_SOUND_LOOPS; + } + else if (y==5 && sound_loops_allowed) + { + if (SETUP_SOUND_MUSIC_ON(local_player->setup)) + DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); + else + { + DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); + DrawText(SX+14*32, SY+(yy-2)*32,"on ",FS_BIG,FC_YELLOW); + local_player->setup |= SETUP_SOUND; + } + local_player->setup ^= SETUP_SOUND_MUSIC; + } + else if (y==6) + { + if (SETUP_TOONS_ON(local_player->setup)) + DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); + else + DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); + local_player->setup ^= SETUP_TOONS; + } + else if (y==7) + { + if (!SETUP_DIRECT_DRAW_ON(local_player->setup)) + DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); + else + DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); + local_player->setup ^= SETUP_DIRECT_DRAW; + } + else if (y==8) + { + if (SETUP_SCROLL_DELAY_ON(local_player->setup)) + DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); + else + DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); + local_player->setup ^= SETUP_SCROLL_DELAY; + } + else if (y==9) + { + if (SETUP_SOFT_SCROLL_ON(local_player->setup)) + DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); + else + DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); + local_player->setup ^= SETUP_SOFT_SCROLL; + } + else if (y==10) + { + if (SETUP_FADING_ON(local_player->setup)) + DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); + else + DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); + local_player->setup ^= SETUP_FADING; + } + else if (y==11) + { + if (SETUP_QUICK_DOORS_ON(local_player->setup)) + DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); + else + DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); + local_player->setup ^= SETUP_QUICK_DOORS; + } + else if (y==12) + { + if (SETUP_AUTO_RECORD_ON(local_player->setup)) + DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); + else + DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); + local_player->setup ^= SETUP_AUTO_RECORD; + } + else if (y==13) + { + game_status = SETUPINPUT; + DrawSetupInputScreen(); + redraw = TRUE; + } + +#if 0 + else if (y==13) + { + if (SETUP_2ND_JOYSTICK_ON(local_player->setup)) + DrawText(SX+14*32, SY+yy*32,"1st",FS_BIG,FC_YELLOW); + else + DrawText(SX+14*32, SY+yy*32,"2nd",FS_BIG,FC_YELLOW); + local_player->setup ^= SETUP_2ND_JOYSTICK; + } + else if (y==14) + { + /* + CalibrateJoystick(); + */ + + CustomizeKeyboard(); + + redraw = TRUE; + } +#endif + + else if (y==pos_end-1 || y==pos_end) + { + if (y==pos_end) + { + SavePlayerInfo(PLAYER_SETUP); + SaveJoystickData(); + } + + game_status = MAINMENU; + DrawMainMenu(); + redraw = TRUE; + } + } + } + BackToFront(); + + if (game_status==SETUP) + DoAnimation(); +} + +void DrawSetupInputScreen() +{ +#if 0 static struct setup { unsigned int bit; @@ -918,11 +1178,38 @@ void DrawSetupScreen() {0, "Exit", {"", ""}, {0,0}}, {0, "Save and exit",{"", ""}, {0,0}} }; +#endif - CloseDoor(DOOR_CLOSE_2); ClearWindow(); - DrawText(SX+16, SY+16, "SETUP",FS_BIG,FC_YELLOW); + DrawText(SX+16, SY+16, "SETUP INPUT", FS_BIG, FC_YELLOW); + + DrawGraphic(0, 2, GFX_KUGEL_BLAU); + DrawGraphic(0, 3, GFX_KUGEL_BLAU); + DrawGraphic(0, 4, GFX_KUGEL_BLAU); + DrawText(SX+32, SY+2*32, "Player:", FS_BIG, FC_GREEN); + DrawText(SX+12*32, SY+2*32, "1", FS_BIG, FC_RED); + DrawGraphic(9,2,GFX_PFEIL_L); + DrawGraphic(11,2,GFX_PFEIL_R); + + DrawText(SX+32, SY+3*32, "Inputdevice:", FS_BIG, FC_GREEN); + if (setup.joy_input[0].use_joystick) + { + DrawText(SX+13*32, SY+3*32, + (setup.joy_input[0].joystick_nr == 0 ? "JOY1" : "JOY2"), + FS_BIG, FC_YELLOW); + DrawText(SX+32, SY+4*32, "Calibrate", FS_BIG, FC_GREEN); + } + else + { + DrawText(SX+13*32, SY+3*32, "KEYS", FS_BIG, FC_YELLOW); + DrawText(SX+32, SY+4*32, "Customize", FS_BIG, FC_GREEN); + } + + DrawGraphic(0, 15, GFX_KUGEL_BLAU); + DrawText(SX+32, SY+15*32, "Exit", FS_BIG, FC_GREEN); + +#if 0 for(i=SETUP_SCREEN_POS_START;i<=SETUP_SCREEN_POS_END;i++) { int base = i - SETUP_SCREEN_POS_START; @@ -941,20 +1228,22 @@ void DrawSetupScreen() FS_BIG,setup[base].color[setting_pos]); } } +#endif FadeToFront(); InitAnimation(); - HandleSetupScreen(0,0,0,0,MB_MENU_INITIALIZE); + HandleSetupInputScreen(0,0,0,0,MB_MENU_INITIALIZE); } -void HandleSetupScreen(int mx, int my, int dx, int dy, int button) +void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) { static int choice = 3; static int redraw = TRUE; int x = (mx+32-SX)/32, y = (my+32-SY)/32; - int pos_start = SETUP_SCREEN_POS_START + 1; - int pos_empty = SETUP_SCREEN_POS_EMPTY + 1; - int pos_end = SETUP_SCREEN_POS_END + 1; + int pos_start = SETUPINPUT_SCREEN_POS_START + 1; + int pos_empty1 = SETUPINPUT_SCREEN_POS_EMPTY1 + 1; + int pos_empty2 = SETUPINPUT_SCREEN_POS_EMPTY2 + 1; + int pos_end = SETUPINPUT_SCREEN_POS_END + 1; if (button == MB_MENU_INITIALIZE) redraw = TRUE; @@ -978,8 +1267,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) else x = y = 0; - if (y == pos_empty) - y = (dy>0 ? pos_empty+1 : pos_empty-1); + if (y >= pos_empty1 && y <= pos_empty2) + y = (dy > 0 ? pos_empty2 + 1 : pos_empty1 - 1); if (y < pos_start) y = pos_start; @@ -993,7 +1282,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) y = choice; } - if (x==1 && y>=pos_start && y<=pos_end && y!=pos_empty) + if (x==1 && y >= pos_start && y <= pos_end && + !(y >= pos_empty1 && y <= pos_empty2)) { if (button) { @@ -1006,6 +1296,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) } else { +#if 0 int yy = y-1; if (y==3 && sound_status==SOUND_AVAILABLE) @@ -1132,6 +1423,17 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawMainMenu(); redraw = TRUE; } +#endif + + + if (y==pos_end) + { + game_status = SETUP; + DrawSetupScreen(); + redraw = TRUE; + } + + } } BackToFront(); @@ -1145,6 +1447,7 @@ void CustomizeKeyboard( /* int player_nr */ ) int player_nr = 0; int i; + int step_nr; boolean finished = FALSE; static struct SetupKeyboardInfo custom_key; static struct @@ -1164,16 +1467,18 @@ void CustomizeKeyboard( /* int player_nr */ ) custom_key = setup.key_input[player_nr]; ClearWindow(); - DrawText(SX+16, SY+16, "Keyboard Input", FS_BIG, FC_YELLOW); + DrawText(SX + 16, SY + 16, "Keyboard Input", FS_BIG, FC_YELLOW); BackToFront(); InitAnimation(); - i = 0; - DrawText(SX, SY+(2+2*i)*32, customize_step[i].text, FS_BIG, FC_GREEN); - DrawText(SX, SY+(2+2*i+1)*32, "Key:", FS_BIG, FC_GREEN); - DrawText(SX + 5*32, SY+(2+2*i+1)*32, - getKeySymName(*customize_step[i].keysym), FS_BIG, FC_BLUE); + step_nr = 0; + DrawText(SX, SY + (2+2*step_nr)*32, + customize_step[step_nr].text, FS_BIG, FC_RED); + DrawText(SX, SY + (2+2*step_nr+1)*32, + "Key:", FS_BIG, FC_RED); + DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32, + getKeySymName(*customize_step[step_nr].keysym), FS_BIG, FC_BLUE); while(!finished) { @@ -1182,63 +1487,69 @@ void CustomizeKeyboard( /* int player_nr */ ) XEvent event; XNextEvent(display, &event); + switch(event.type) { - case Expose: - HandleExposeEvent((XExposeEvent *) &event); - break; - case UnmapNotify: - SleepWhileUnmapped(); - break; - case KeyPress: + case KeyPress: { KeySym key = XLookupKeysym((XKeyEvent *)&event, ((XKeyEvent *)&event)->state); - if (key == XK_Escape || (key == XK_Return && i == 6)) + if (key == XK_Escape || (key == XK_Return && step_nr == 6)) { finished = TRUE; break; } - if (key == XK_Return || i == 6) + if (key == XK_Return || step_nr == 6) + break; + + /* check if key already used */ + for (i=0; istate)) @@ -1340,22 +1646,22 @@ void CalibrateJoystick() if (check_remaining == 0) result = 1; break; + case XK_Escape: result = 0; break; + + default: + break; } break; + case KeyRelease: key_joystick_mapping = 0; break; - case FocusIn: - case FocusOut: - HandleFocusEvent((XFocusChangeEvent *) &event); - break; - case ClientMessage: - HandleClientMessageEvent((XClientMessageEvent *) &event); - break; + default: + HandleOtherEvents(&event); break; } } diff --git a/src/screens.h b/src/screens.h index 7c551760..65da0071 100644 --- a/src/screens.h +++ b/src/screens.h @@ -19,7 +19,13 @@ /* for DrawSetupScreen(), HandleSetupScreen() */ #define SETUP_SCREEN_POS_START 2 #define SETUP_SCREEN_POS_END 16 -#define SETUP_SCREEN_POS_EMPTY (SETUP_SCREEN_POS_END - 2) +#define SETUP_SCREEN_POS_EMPTY1 (SETUP_SCREEN_POS_END - 3) +#define SETUP_SCREEN_POS_EMPTY2 (SETUP_SCREEN_POS_END - 2) + +#define SETUPINPUT_SCREEN_POS_START 2 +#define SETUPINPUT_SCREEN_POS_END 15 +#define SETUPINPUT_SCREEN_POS_EMPTY1 (SETUPINPUT_SCREEN_POS_START + 3) +#define SETUPINPUT_SCREEN_POS_EMPTY2 (SETUPINPUT_SCREEN_POS_END - 1) void DrawHeadline(void); void DrawMainMenu(void); @@ -37,6 +43,8 @@ void DrawHallOfFame(int); void HandleHallOfFame(int); void DrawSetupScreen(void); void HandleSetupScreen(int, int, int, int, int); +void DrawSetupInputScreen(void); +void HandleSetupInputScreen(int, int, int, int, int); void CustomizeKeyboard(void); void CalibrateJoystick(void); void HandleGameActions(byte); diff --git a/src/tools.c b/src/tools.c index 9e0ec679..033c75be 100644 --- a/src/tools.c +++ b/src/tools.c @@ -1388,14 +1388,9 @@ boolean Request(char *text, unsigned int req_state) XEvent event; XNextEvent(display, &event); + switch(event.type) { - case Expose: - HandleExposeEvent((XExposeEvent *) &event); - break; - case UnmapNotify: - SleepWhileUnmapped(); - break; case ButtonPress: case ButtonRelease: case MotionNotify: @@ -1437,6 +1432,7 @@ boolean Request(char *text, unsigned int req_state) case BUTTON_CONFIRM: result = TRUE | FALSE; break; + case BUTTON_PLAYER_1: result = 1; break; @@ -1449,11 +1445,13 @@ boolean Request(char *text, unsigned int req_state) case BUTTON_PLAYER_4: result = 4; break; + default: break; } break; } + case KeyPress: switch(XLookupKeysym((XKeyEvent *)&event, ((XKeyEvent *)&event)->state)) @@ -1461,24 +1459,24 @@ boolean Request(char *text, unsigned int req_state) case XK_Return: result = 1; break; + case XK_Escape: result = 0; break; + + default: + break; } if (req_state & REQ_PLAYER) result = 0; break; + case KeyRelease: key_joystick_mapping = 0; break; - case FocusIn: - case FocusOut: - HandleFocusEvent((XFocusChangeEvent *) &event); - break; - case ClientMessage: - HandleClientMessageEvent((XClientMessageEvent *) &event); - break; + default: + HandleOtherEvents(&event); break; } }