{
motion_status = FALSE;
- if (event->type==ButtonPress)
+ if (event->type == ButtonPress)
button_status = event->button;
else
button_status = MB_RELEASED;
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);
}
old_mx = mx;
old_my = my;
+ /*
HandleVideoButtons(mx,my, button);
HandleSoundButtons(mx,my, button);
HandleGameButtons(mx,my, button);
+ */
}
HandleGadgets(mx, my, button);
break;
case LEVELED:
- LevelEd(mx,my, button);
break;
case HELPSCREEN:
case LEVELED:
HandleLevelEditorKeyInput(key);
- LevelNameTyping(key);
break;
case PLAYING: