qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-06-01 09:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qwaq] Remove now unnecessary union field name

Browse source 
\o/
This commit is contained in:
Bill Currie 2020-03-04 19:10:09 +09:00
parent 269a8a558a
commit d57e05258c
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ruamoko/qwaq/event.h
View file

@ -29,7 +29,7 @@ typedef struct qwaq_event_s {
int key; int key;
qwaq_mevent_t mouse; qwaq_mevent_t mouse;
qwaq_message_t message; qwaq_message_t message;
} e; };
} qwaq_event_t; } qwaq_event_t;
#ifdef __QFCC__ // don't want C gcc to see this :) #ifdef __QFCC__ // don't want C gcc to see this :)

10
ruamoko/qwaq/qwaq-app.r
View file

@ -71,14 +71,14 @@ arp_end (void)
-handleEvent: (qwaq_event_t *) event -handleEvent: (qwaq_event_t *) event
{ {
[screen handleEvent: event]; [screen handleEvent: event];
if (event.event_type == qe_key && event.e.key == '\x18') { if (event.event_type == qe_key && event.key == '\x18') {
event.event_type = qe_command; event.event_type = qe_command;
event.e.message.command = qc_exit; event.message.command = qc_exit;
} }
if (event.event_type == qe_command if (event.event_type == qe_command
&& (event.e.message.command == qc_exit && (event.message.command == qc_exit
|| event.e.message.command == qc_error)) { || event.message.command == qc_error)) {
endState = event.e.message.command; endState = event.message.command;
} }
return self; return self;
} }

8
ruamoko/qwaq/qwaq-curses.c
View file

@ -629,9 +629,9 @@ mouse_event (qwaq_resources_t *res, MEVENT *mevent)
{ {
qwaq_event_t event = {}; qwaq_event_t event = {};
event.event_type = qe_mouse; event.event_type = qe_mouse;
event.e.mouse.x = mevent->x; event.mouse.x = mevent->x;
event.e.mouse.y = mevent->y; event.mouse.y = mevent->y;
event.e.mouse.buttons = mevent->bstate; event.mouse.buttons = mevent->bstate;
add_event (res, &event); add_event (res, &event);
} }
@ -640,7 +640,7 @@ key_event (qwaq_resources_t *res, int key)
{ {
qwaq_event_t event = {}; qwaq_event_t event = {};
event.event_type = qe_key; event.event_type = qe_key;
event.e.key = key; event.key = key;
add_event (res, &event); add_event (res, &event);
} }

2
ruamoko/qwaq/qwaq-screen.r
View file

@ -65,7 +65,7 @@
withObject: (id) event]; withObject: (id) event];
break; break;
case qe_mouse: case qe_mouse:
Point p = { event.e.mouse.x, event.e.mouse.y }; Point p = { event.mouse.x, event.mouse.y };
for (int i = [mouse_handler_rects count]; i-->0; ) { for (int i = [mouse_handler_rects count]; i-->0; ) {
//if (rectContainsPoint((Rect*)mouse_handler_rects._objs[i], &p)) { //if (rectContainsPoint((Rect*)mouse_handler_rects._objs[i], &p)) {
// [mouse_handlers._objs[i] handleEvent: event]; // [mouse_handlers._objs[i] handleEvent: event];

6
ruamoko/qwaq/qwaq-window.r
View file

@ -29,10 +29,10 @@
switch (event.event_type) { switch (event.event_type) {
case qe_mouse: case qe_mouse:
mvwprintf(window, 0, 3, "%2d %2d %08x", mvwprintf(window, 0, 3, "%2d %2d %08x",
event.e.mouse.x, event.e.mouse.y, event.e.mouse.buttons); event.mouse.x, event.mouse.y, event.mouse.buttons);
[self redraw]; [self redraw];
point.x = event.e.mouse.x; point.x = event.mouse.x;
point.y = event.e.mouse.y; point.y = event.mouse.y;
for (int i = [views count]; i--> 0; ) { for (int i = [views count]; i--> 0; ) {
View *v = [views objectAtIndex: i]; View *v = [views objectAtIndex: i];
if (rectContainsPoint (&v.absRect, &point)) { if (rectContainsPoint (&v.absRect, &point)) {