hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed get_event to get_llevent in X11

Browse Source
This commit is contained in:
hyunghwan.chung
2017-06-27 07:36:55 +00:00
parent 246662220f
commit 6a721bb62a
3 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
moo/mod/_x11.h
View File

@ -60,7 +60,7 @@ struct x11_t
MOO_OBJ_HEADER;
moo_oop_t display; /* SMPTR of Display */
oop_x11_llevent_t llevent;
moo_oop_t expose_event;
moo_oop_t key_event;
moo_oop_t mouse_event;

21
moo/mod/x11.c
View File

@ -154,7 +154,7 @@ static moo_pfrc_t pf_get_fd (moo_t* moo, moo_ooi_t nargs)
return MOO_PF_SUCCESS;
}
static moo_pfrc_t pf_get_event (moo_t* moo, moo_ooi_t nargs)
static moo_pfrc_t pf_get_llevent (moo_t* moo, moo_ooi_t nargs)
{
oop_x11_t x11;
x11_trailer_t* tr;
@ -175,13 +175,14 @@ static moo_pfrc_t pf_get_event (moo_t* moo, moo_ooi_t nargs)
XNextEvent (disp, event);
e = x11->llevent;
e = (oop_x11_llevent_t)MOO_STACK_GETARG(moo, nargs, 0);
/* TOOD: check if e is an instance of X11.LLEvent */
e->type = MOO_SMOOI_TO_OOP(event->type);
e->window = MOO_SMOOI_TO_OOP(0);
/* [NOTE] When creating the low-level event object, ensure not to
* trigger GC directly or indirectly as the GC might be a
* copying collector which move objects around during collection */
/* if the following is going to trigger GC directly or indirectly,
* e must be proteced with moo_pushtmp() first */
switch (event->type)
{
case ClientMessage:
@ -203,6 +204,14 @@ static moo_pfrc_t pf_get_event (moo_t* moo, moo_ooi_t nargs)
break;
}
case ButtonPress:
case ButtonRelease:
{
e->window = MOO_SMOOI_TO_OOP(event->xbutton.window);
e->x = MOO_SMOOI_TO_OOP(event->xbutton.x);
e->y = MOO_SMOOI_TO_OOP(event->xbutton.y);
break;
}
}
MOO_STACK_SETRET (moo, nargs, (moo_oop_t)e);
@ -448,8 +457,8 @@ static moo_pfinfo_t x11_pfinfo[] =
{ MI, { '_','d','e','s','t','r','o','y','_','w','i','n','d','o','w','\0' }, 0, { pf_destroy_window, 1, 1 } },
{ MI, { '_','d','r','a','w','_','r','e','c','t','a','n','g','l','e','\0' }, 0, { pf_draw_rectangle, 6, 6 } },
//{ MI, { '_','f','i','l','l','_','r','e','c','t','a','n','g','l','e','\0' }, 0, { pf_fill_rectangle, 6, 6 } },
{ MI, { '_','g','e','t','_','e','v','e','n','t','\0'}, 0, { pf_get_event, 0, 0 } },
{ MI, { '_','g','e','t','_','f','d','\0' }, 0, { pf_get_fd, 0, 0 } },
{ MI, { '_','g','e','t','_','l','l','e','v','e','n','t','\0'}, 0, { pf_get_llevent, 1, 1 } },
{ MI, { '_','o','p','e','n','_','d','i','s','p','l','a','y','\0' }, 0, { pf_open_display, 0, 1 } }
};