#include "misc.h"
#include "tape.h"
#include "joystick.h"
+#include "buttons.h"
#include "network.h"
/* values for key_status */
Delay(10);
}
+ /* refresh window contents from drawing buffer, if needed */
+ BackToFront();
+
if (game_status == EXITGAME)
return;
}
void HandleMotionEvent(XMotionEvent *event)
{
+ Window root, child;
+ int root_x, root_y;
+ int win_x, win_y;
+ unsigned int mask;
+
+ if (!XQueryPointer(display, window, &root, &child, &root_x, &root_y,
+ &win_x, &win_y, &mask))
+ return;
+
+ if (!button_status && game_status != LEVELED)
+ return;
+
motion_status = TRUE;
- HandleButton(event->x, event->y, button_status);
+ HandleButton(win_x, win_y, button_status);
}
void HandleKeyEvent(XKeyEvent *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);
+ KeySym key;
+
+ if (game_status == PLAYING)
+ {
+ /* use '0' instead of 'event->state' to get the key without modifiers */
+ key = XLookupKeysym(event, 0);
+ }
+ else
+ {
+ /* get the key with all modifiers */
+ char buffer[10];
+ int buffer_size = 10;
+ XComposeStatus compose;
+ int char_count;
+
+ char_count = XLookupString(event, buffer, buffer_size, &key, &compose);
+ buffer[char_count] = '\0';
+ }
HandleKey(key, key_status);
}
{
static int old_mx = 0, old_my = 0;
- if (mx<0 || my<0)
+ if (button < 0)
{
mx = old_mx;
my = old_my;
+ button = -button;
}
else
{
HandleGameButtons(mx,my, button);
}
+ HandleGadgets(mx, my, button);
+
switch(game_status)
{
case MAINMENU:
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]);
/* allow quick escape to the main menu with the Escape key */
if (key == XK_Escape && game_status != MAINMENU)
{
- CloseDoor(DOOR_CLOSE_1 | DOOR_NO_DELAY);
+ 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();
return;
+ HandleGadgetsKeyInput(key);
+
switch(game_status)
{
case TYPENAME:
break;
case LEVELED:
+ HandleLevelEditorKeyInput(key);
LevelNameTyping(key);
break;
break;
#endif
+#if 1
+ case XK_m:
+ if (MoveSpeed == 8)
+ {
+ MoveSpeed = 4;
+ ScrollStepSize = TILEX/4;
+ }
+ else
+ {
+ MoveSpeed = 8;
+ ScrollStepSize = TILEX/8;
+ }
+ printf("MoveSpeed == %d\n", MoveSpeed);
+ break;
+#endif
+
case XK_f:
ScrollStepSize = TILEX/8;
printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize);
{
if (button_status && game_status != PLAYING)
{
- HandleButton(-1,-1, button_status);
+ HandleButton(0, 0, -button_status);
return;
}
{
byte joy_action = 0;
+ /*
if (!setup.input[i].use_joystick)
continue;
+ */
joy_action = Joystick(i);
result |= joy_action;
+
+ if (!setup.input[i].use_joystick)
+ continue;
+
+
stored_player[i].action = joy_action;
}
case SETUP:
case SETUPINPUT:
{
- static long joystickmove_delay = 0;
+ static unsigned long joystickmove_delay = 0;
- if (joystick && !button && !DelayReached(&joystickmove_delay, 150))
+ if (joystick && !button &&
+ !DelayReached(&joystickmove_delay, GADGET_FRAME_DELAY))
newbutton = dx = dy = 0;
if (game_status==MAINMENU)