projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981021-1
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index d0684ed3d220061fbcb3076b55b6ddd1c97054b2..976974ac58891e6b9c8db2bab1c9057e876dac75 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-20,12
+20,13
@@
#include "misc.h"
#include "tape.h"
#include "joystick.h"
#include "misc.h"
#include "tape.h"
#include "joystick.h"
+#include "network.h"
void EventLoop(void)
{
while(1)
{
void EventLoop(void)
{
while(1)
{
- if (XPending(display)) /* got
an event
*/
+ if (XPending(display)) /* got
event from X server
*/
{
XEvent event;
{
XEvent event;
@@
-61,6
+62,21
@@
void EventLoop(void)
break;
}
}
break;
}
}
+
+ HandleNoXEvent();
+
+ /* don't use all CPU time when idle; the main loop while playing
+ has its own synchronization and is CPU friendly, too */
+
+ if (game_status != PLAYING)
+ {
+ XSync(display, FALSE);
+ Delay(10);
+ }
+
+
+
+#if 0
else /* got no event, but don't be lazy... */
{
HandleNoXEvent();
else /* got no event, but don't be lazy... */
{
HandleNoXEvent();
@@
-74,6
+90,9
@@
void EventLoop(void)
Delay(10);
}
}
Delay(10);
}
}
+#endif
+
+
if (game_status == EXITGAME)
return;
if (game_status == EXITGAME)
return;
@@
-117,7
+136,7
@@
void ClearEventQueue()
void SleepWhileUnmapped()
{
void SleepWhileUnmapped()
{
-
BOOL
window_unmapped = TRUE;
+
boolean
window_unmapped = TRUE;
XAutoRepeatOn(display);
XAutoRepeatOn(display);
@@
-158,7
+177,7
@@
void HandleExposeEvent(XExposeEvent *event)
int x = event->x, y = event->y;
int width = event->width, height = event->height;
int x = event->x, y = event->y;
int width = event->width, height = event->height;
- if (direct_draw_on && game_status==PLAYING)
+ if (
setup.
direct_draw_on && game_status==PLAYING)
{
int xx,yy;
int x1 = (x-SX)/TILEX, y1 = (y-SY)/TILEY;
{
int xx,yy;
int x1 = (x-SX)/TILEX, y1 = (y-SY)/TILEY;
@@
-175,7
+194,7
@@
void HandleExposeEvent(XExposeEvent *event)
SetDrawtoField(DRAW_DIRECT);
}
SetDrawtoField(DRAW_DIRECT);
}
- if (soft_scrolling_on && game_status == PLAYING)
+ if (s
etup.s
oft_scrolling_on && game_status == PLAYING)
{
int fx = FX, fy = FY;
{
int fx = FX, fy = FY;
@@
-244,7
+263,7
@@
void HandleClientMessageEvent(XClientMessageEvent *event)
{
if ((event->window == window) &&
(event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
{
if ((event->window == window) &&
(event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
- CloseAll
(
);
+ CloseAll
AndExit(0
);
}
void HandleButton(int mx, int my, int button)
}
void HandleButton(int mx, int my, int button)
@@
-313,7
+332,13
@@
void HandleButton(int mx, int my, int button)
HandleSetupScreen(mx,my,0,0,button);
break;
case PLAYING:
HandleSetupScreen(mx,my,0,0,button);
break;
case PLAYING:
+
+ /* --> NoXEvent() will follow */
+
+ /*
HandleGameActions(0);
HandleGameActions(0);
+ */
+
break;
default:
break;
break;
default:
break;
@@
-647,7
+672,7
@@
void HandleKey(KeySym key, int key_status)
}
*/
}
*/
- printf("direct_draw_on == %d\n", direct_draw_on);
+ printf("direct_draw_on == %d\n",
setup.
direct_draw_on);
break;
break;
@@
-701,6
+726,9
@@
void HandleNoXEvent()
return;
}
return;
}
+ if (options.network)
+ HandleNetworking();
+
switch(game_status)
{
case MAINMENU:
switch(game_status)
{
case MAINMENU:
@@
-727,11
+755,6
@@
void HandleJoystick()
{
int joystick = Joystick();
int keyboard = key_joystick_mapping;
{
int joystick = Joystick();
int keyboard = key_joystick_mapping;
-
- /*
- int joy = (tape.playing ? TapePlayAction() : (joystick | keyboard));
- */
-
int joy = (joystick | keyboard);
int left = joy & JOY_LEFT;
int right = joy & JOY_RIGHT;
int joy = (joystick | keyboard);
int left = joy & JOY_LEFT;
int right = joy & JOY_RIGHT;
@@
-750,7
+773,7
@@
void HandleJoystick()
{
static long joystickmove_delay = 0;
{
static long joystickmove_delay = 0;
- if (joystick && !button && !DelayReached(&joystickmove_delay,15))
+ if (joystick && !button && !DelayReached(&joystickmove_delay,15
0
))
newbutton = dx = dy = 0;
if (game_status==MAINMENU)
newbutton = dx = dy = 0;
if (game_status==MAINMENU)
@@
-785,7
+808,7
@@
void HandleJoystick()
if (tape.pausing || AllPlayersGone)
joy = 0;
if (tape.pausing || AllPlayersGone)
joy = 0;
- HandleGameActions(joy);
+ HandleGameActions(
(byte)
joy);
break;
default:
break;
default: