projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19980906
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index 69b67685b87b95f7503fdd6a75843f12fc531076..5f85101eb06ef4b6764c38034d140e0620b771f7 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-13,6
+13,7
@@
***********************************************************/
#include "events.h"
***********************************************************/
#include "events.h"
+#include "init.h"
#include "screens.h"
#include "tools.h"
#include "game.h"
#include "screens.h"
#include "tools.h"
#include "game.h"
@@
-54,6
+55,9
@@
void EventLoop(void)
case FocusOut:
HandleFocusEvent((XFocusChangeEvent *) &event);
break;
case FocusOut:
HandleFocusEvent((XFocusChangeEvent *) &event);
break;
+ case ClientMessage:
+ HandleClientMessageEvent((XClientMessageEvent *) &event);
+ break;
default:
break;
}
default:
break;
}
@@
-61,7
+65,7
@@
void EventLoop(void)
else /* got no event, but don't be lazy... */
{
HandleNoXEvent();
else /* got no event, but don't be lazy... */
{
HandleNoXEvent();
- Delay(1000
0);
/* don't use all CPU time when idle */
+ Delay(1000
);
/* don't use all CPU time when idle */
}
XSync(display,FALSE);
}
XSync(display,FALSE);
@@
-97,6
+101,9
@@
void ClearEventQueue()
case FocusOut:
HandleFocusEvent((XFocusChangeEvent *) &event);
break;
case FocusOut:
HandleFocusEvent((XFocusChangeEvent *) &event);
break;
+ case ClientMessage:
+ HandleClientMessageEvent((XClientMessageEvent *) &event);
+ break;
default:
break;
}
default:
break;
}
@@
-129,6
+136,9
@@
void SleepWhileUnmapped()
case MapNotify:
window_unmapped = FALSE;
break;
case MapNotify:
window_unmapped = FALSE;
break;
+ case ClientMessage:
+ HandleClientMessageEvent((XClientMessageEvent *) &event);
+ break;
default:
break;
}
default:
break;
}
@@
-149,7
+159,7
@@
void HandleExposeEvent(XExposeEvent *event)
int x1 = (x-SX)/TILEX, y1 = (y-SY)/TILEY;
int x2 = (x-SX+width)/TILEX, y2 = (y-SY+height)/TILEY;
int x1 = (x-SX)/TILEX, y1 = (y-SY)/TILEY;
int x2 = (x-SX+width)/TILEX, y2 = (y-SY+height)/TILEY;
-
drawto_field = backbuffer
;
+
SetDrawtoField(DRAW_BACKBUFFER)
;
for(xx=0;xx<SCR_FIELDX;xx++)
for(yy=0;yy<SCR_FIELDY;yy++)
for(xx=0;xx<SCR_FIELDX;xx++)
for(yy=0;yy<SCR_FIELDY;yy++)
@@
-157,9
+167,14
@@
void HandleExposeEvent(XExposeEvent *event)
DrawScreenField(xx,yy);
DrawPlayerField();
DrawScreenField(xx,yy);
DrawPlayerField();
-
drawto_field = window
;
+
SetDrawtoField(DRAW_DIRECT)
;
}
}
+ if (soft_scrolling_on && game_status==PLAYING)
+ XCopyArea(display,fieldbuffer,backbuffer,gc,
+ FX,FY, SXSIZE,SYSIZE,
+ SX,SY);
+
XCopyArea(display,drawto,window,gc, x,y, width,height, x,y);
XFlush(display);
XCopyArea(display,drawto,window,gc, x,y, width,height, x,y);
XFlush(display);
@@
-202,6
+217,7
@@
void HandleFocusEvent(XFocusChangeEvent *event)
XAutoRepeatOn(display);
old_joystick_status = joystick_status;
joystick_status = JOYSTICK_OFF;
XAutoRepeatOn(display);
old_joystick_status = joystick_status;
joystick_status = JOYSTICK_OFF;
+ key_joystick_mapping = 0;
}
else if (event->type == FocusIn)
{
}
else if (event->type == FocusIn)
{
@@
-212,6
+228,13
@@
void HandleFocusEvent(XFocusChangeEvent *event)
}
}
}
}
+void HandleClientMessageEvent(XClientMessageEvent *event)
+{
+ if ((event->window == window) &&
+ (event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
+ CloseAll();
+}
+
void HandleButton(int mx, int my, int button)
{
static int old_mx = 0, old_my = 0;
void HandleButton(int mx, int my, int button)
{
static int old_mx = 0, old_my = 0;
@@
-262,10
+285,8
@@
void HandleButton(int mx, int my, int button)
}
}
}
}
-int Gamespeed = 4;
-int Movemethod = 0;
-int Movespeed[2] = { 10, 3 };
-char *Movespeed_text[2] = { "asynchron", "syncron" };
+int GameSpeed = 2;
+int MoveSpeed = 8;
void HandleKey(KeySym key, int key_status)
{
void HandleKey(KeySym key, int key_status)
{
@@
-280,7
+301,9
@@
void HandleKey(KeySym key, int key_status)
case XK_KP_Left:
#endif
case XK_KP_4:
case XK_KP_Left:
#endif
case XK_KP_4:
+#ifndef MSDOS
case XK_J:
case XK_J:
+#endif
case XK_j:
joy |= JOY_LEFT;
break;
case XK_j:
joy |= JOY_LEFT;
break;
@@
-289,7
+312,9
@@
void HandleKey(KeySym key, int key_status)
case XK_KP_Right:
#endif
case XK_KP_6:
case XK_KP_Right:
#endif
case XK_KP_6:
+#ifndef MSDOS
case XK_K:
case XK_K:
+#endif
case XK_k:
joy |= JOY_RIGHT;
break;
case XK_k:
joy |= JOY_RIGHT;
break;
@@
-298,7
+323,9
@@
void HandleKey(KeySym key, int key_status)
case XK_KP_Up:
#endif
case XK_KP_8:
case XK_KP_Up:
#endif
case XK_KP_8:
+#ifndef MSDOS
case XK_I:
case XK_I:
+#endif
case XK_i:
joy |= JOY_UP;
break;
case XK_i:
joy |= JOY_UP;
break;
@@
-307,7
+334,9
@@
void HandleKey(KeySym key, int key_status)
case XK_KP_Down:
#endif
case XK_KP_2:
case XK_KP_Down:
#endif
case XK_KP_2:
+#ifndef MSDOS
case XK_M:
case XK_M:
+#endif
case XK_m:
joy |= JOY_DOWN;
break;
case XK_m:
joy |= JOY_DOWN;
break;
@@
-335,33
+364,47
@@
void HandleKey(KeySym key, int key_status)
case XK_KP_3:
joy |= JOY_DOWN | JOY_RIGHT;
break;
case XK_KP_3:
joy |= JOY_DOWN | JOY_RIGHT;
break;
+#ifndef MSDOS
case XK_S: /* Feld entfernen */
case XK_S: /* Feld entfernen */
+#endif
case XK_s:
joy |= JOY_BUTTON_1 | JOY_LEFT;
break;
case XK_s:
joy |= JOY_BUTTON_1 | JOY_LEFT;
break;
+#ifndef MSDOS
case XK_D:
case XK_D:
+#endif
case XK_d:
joy |= JOY_BUTTON_1 | JOY_RIGHT;
break;
case XK_d:
joy |= JOY_BUTTON_1 | JOY_RIGHT;
break;
+#ifndef MSDOS
case XK_E:
case XK_E:
+#endif
case XK_e:
joy |= JOY_BUTTON_1 | JOY_UP;
break;
case XK_e:
joy |= JOY_BUTTON_1 | JOY_UP;
break;
+#ifndef MSDOS
case XK_X:
case XK_X:
+#endif
case XK_x:
joy |= JOY_BUTTON_1 | JOY_DOWN;
break;
case XK_Shift_L: /* Linker Feuerknopf */
case XK_x:
joy |= JOY_BUTTON_1 | JOY_DOWN;
break;
case XK_Shift_L: /* Linker Feuerknopf */
+#ifndef MSDOS
case XK_Control_L:
case XK_Alt_L:
case XK_Meta_L:
case XK_Control_L:
case XK_Alt_L:
case XK_Meta_L:
+#endif
joy |= JOY_BUTTON_1;
break;
case XK_Shift_R: /* Rechter Feuerknopf */
joy |= JOY_BUTTON_1;
break;
case XK_Shift_R: /* Rechter Feuerknopf */
+#ifndef MSDOS
case XK_Control_R:
case XK_Alt_R:
case XK_Meta_R:
case XK_Control_R:
case XK_Alt_R:
case XK_Meta_R:
+ case XK_Mode_switch:
+ case XK_Multi_key:
case XK_B: /* (Bombe legen) */
case XK_B: /* (Bombe legen) */
+#endif
case XK_b:
joy |= JOY_BUTTON_2;
break;
case XK_b:
joy |= JOY_BUTTON_2;
break;
@@
-377,11
+420,11
@@
void HandleKey(KeySym key, int key_status)
key_joystick_mapping &= ~joy;
HandleJoystick();
key_joystick_mapping &= ~joy;
HandleJoystick();
-
- if (game_status != PLAYING)
- key_joystick_mapping = 0;
}
}
+ if (game_status != PLAYING)
+ key_joystick_mapping = 0;
+
if (key_status == KEY_RELEASED)
return;
if (key_status == KEY_RELEASED)
return;
@@
-462,52
+505,55
@@
void HandleKey(KeySym key, int key_status)
case XK_7:
case XK_8:
case XK_9:
case XK_7:
case XK_8:
case XK_9:
- Movespeed[Movemethod] = (Movemethod == 0 ? 4 : 0) + (key - XK_0);
- printf("method == %d, speed == %d (%s)\n",
- Movemethod, Movespeed[Movemethod],
- Movespeed_text[Movemethod]);
+ if (key == XK_0)
+ GameSpeed = 50;
+ else
+ GameSpeed = key - XK_0;
+ printf("GameSpeed == %d\n", GameSpeed);
break;
case XK_a:
break;
case XK_a:
- Movemethod = !Movemethod;
- printf("method == %d, speed == %d (%s)\n",
- Movemethod, Movespeed[Movemethod],
- Movespeed_text[Movemethod]);
+ if (ScrollStepSize == TILEX/8)
+ ScrollStepSize = TILEX/4;
+ else
+ ScrollStepSize = TILEX/8;
+ printf("ScrollStepSize == %d\n", ScrollStepSize);
break;
case XK_f:
break;
case XK_f:
-
Gamespeed = 2
;
- printf("
gamespeed == %d\n", Gamespeed
);
+
ScrollStepSize = TILEX/8
;
+ printf("
ScrollStepSize == %d (1/8)\n", ScrollStepSize
);
break;
case XK_g:
break;
case XK_g:
-
Gamespeed = 3
;
- printf("
gamespeed == %d\n", Gamespeed
);
+
ScrollStepSize = TILEX/4
;
+ printf("
ScrollStepSize == %d (1/4)\n", ScrollStepSize
);
break;
case XK_h:
break;
case XK_h:
-
Gamespeed = 4
;
- printf("
gamespeed == %d\n", Gamespeed
);
+
ScrollStepSize = TILEX/2
;
+ printf("
ScrollStepSize == %d (1/2)\n", ScrollStepSize
);
break;
case XK_l:
break;
case XK_l:
-
Gamespeed = 10
;
- printf("
gamespeed == %d\n", Gamespeed
);
+
ScrollStepSize = TILEX
;
+ printf("
ScrollStepSize == %d (1/1)\n", ScrollStepSize
);
break;
break;
+#ifndef MSDOS
case XK_Q:
case XK_Q:
+#endif
case XK_q:
Dynamite = 1000;
break;
case XK_q:
Dynamite = 1000;
break;
-#endif
case XK_x:
{
case XK_x:
{
- int i,j,k, num_steps =
16
, step_size = TILEX / num_steps;
+ int i,j,k, num_steps =
8
, step_size = TILEX / num_steps;
static long scroll_delay=0;
long scroll_delay_value = 4*4 / num_steps;
printf("Scroll test\n");
static long scroll_delay=0;
long scroll_delay_value = 4*4 / num_steps;
printf("Scroll test\n");
- for(i=0;i<
10
;i++)
+ for(i=0;i<
3
;i++)
{
for(j=0;j<SCR_FIELDX;j++)
{
{
for(j=0;j<SCR_FIELDX;j++)
{
@@
-520,11
+566,11
@@
void HandleKey(KeySym key, int key_status)
{
if (DelayReached(&scroll_delay, scroll_delay_value))
{
{
if (DelayReached(&scroll_delay, scroll_delay_value))
{
- XCopyArea(display,
back
buffer,window,gc,
+ XCopyArea(display,
field
buffer,window,gc,
SX+xxx,SY,
SXSIZE-xxx,SYSIZE,
SX,SY);
SX+xxx,SY,
SXSIZE-xxx,SYSIZE,
SX,SY);
- XCopyArea(display,
back
buffer,window,gc,
+ XCopyArea(display,
field
buffer,window,gc,
SX,SY,
xxx,SYSIZE,
SX+SXSIZE-xxx,SY);
SX,SY,
xxx,SYSIZE,
SX+SXSIZE-xxx,SY);
@@
-553,6
+599,22
@@
void HandleKey(KeySym key, int key_status)
break;
break;
+ case XK_y:
+ {
+ printf("FX = %d, FY = %d\n", FX,FY);
+
+ XCopyArea(display,fieldbuffer,window,gc,
+ 0,0,
+ MIN(WIN_XSIZE,FXSIZE),MIN(WIN_YSIZE,FYSIZE),
+ 0,0);
+ XFlush(display);
+ XSync(display,FALSE);
+ Delay(1000000);
+ }
+
+ break;
+#endif
+
default:
break;
}
default:
break;
}
@@
-565,7
+627,7
@@
void HandleKey(KeySym key, int key_status)
void HandleNoXEvent()
{
void HandleNoXEvent()
{
- if (button_status && game_status
!=
PLAYING)
+ if (button_status && game_status
!=
PLAYING)
{
HandleButton(-1,-1,button_status);
return;
{
HandleButton(-1,-1,button_status);
return;
@@
-645,13
+707,6
@@
void HandleJoystick()
return;
}
return;
}
-
-
- if (PlayerMovPos)
- ScrollFigure(0);
-
-
-
if (tape.pausing || PlayerGone)
joy = 0;
if (tape.pausing || PlayerGone)
joy = 0;
@@
-705,9
+760,6
@@
void HandleJoystick()
}
}
}
}
}
}
-
- DrawPlayerField();
-
break;
}
default:
break;
}
default: