diff options
author | pasky <pasky@openttd.org> | 2005-03-26 04:16:39 +0000 |
---|---|---|
committer | pasky <pasky@openttd.org> | 2005-03-26 04:16:39 +0000 |
commit | 9d21e744804dfaf99eeba12621355aee6d2ecbdc (patch) | |
tree | 67eb1caa2844dcdf5266ba40482051839518a165 /window.c | |
parent | 18fc684977f42819af41450100de838cb03e4b42 (diff) | |
download | openttd-9d21e744804dfaf99eeba12621355aee6d2ecbdc.tar.xz |
(svn r2074) MouseLoop -> InputLoop(), factor out a real mouse-specific MouseLoop from the new InitLoop() (more in the spirit of HandleKeypress()).
Diffstat (limited to 'window.c')
-rw-r--r-- | window.c | 61 |
1 files changed, 34 insertions, 27 deletions
@@ -1284,37 +1284,11 @@ static void HandleKeypress(uint32 key) extern void UpdateTileSelection(void); extern bool VpHandlePlaceSizingDrag(void); -void MouseLoop(void) +static void MouseLoop(int click, int mousewheel) { int x,y; Window *w; ViewPort *vp; - int click; - int mousewheel; - - _current_player = _local_player; - - // Handle pressed keys - if (_pressed_key) { - uint32 key = _pressed_key; _pressed_key = 0; - HandleKeypress(key); - } - - // Mouse event? - click = 0; - if (_left_button_down && !_left_button_clicked) { - _left_button_clicked = true; - click = 1; - } else if (_right_button_clicked) { - _right_button_clicked = false; - click = 2; - } - - mousewheel = 0; - if (_cursor.wheel) { - mousewheel = _cursor.wheel; - _cursor.wheel = 0; - } DecreaseWindowCounters(); HandlePlacePresize(); @@ -1410,6 +1384,39 @@ void MouseLoop(void) } } +void InputLoop(void) +{ + int click; + int mousewheel; + + _current_player = _local_player; + + // Handle pressed keys + if (_pressed_key) { + uint32 key = _pressed_key; _pressed_key = 0; + HandleKeypress(key); + } + + // Mouse event? + click = 0; + if (_left_button_down && !_left_button_clicked) { + _left_button_clicked = true; + click = 1; + } else if (_right_button_clicked) { + _right_button_clicked = false; + click = 2; + } + + mousewheel = 0; + if (_cursor.wheel) { + mousewheel = _cursor.wheel; + _cursor.wheel = 0; + } + + MouseLoop(click, mousewheel); +} + + static int _we4_timer; extern uint32 _pixels_redrawn; |