brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x11-foreign: Updates to forward X Events to Cogl

Browse Source 
This update the x11-foreign test so that it checks for events on its X
display and forwards them on to Cogl. It will now also quit if any key
of button is pressed.
This commit is contained in:
Robert Bragg 2011-06-13 10:29:05 +01:00
parent 3729bf2769
commit 44e4b13324
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
examples/x11-foreign.c
View File

@ -5,6 +5,15 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#define X11_FOREIGN_EVENT_MASK \
(KeyPressMask | \
KeyReleaseMask | \
ButtonPressMask | \
ButtonReleaseMask | \
PointerMotionMask)
CoglColor black;
static void static void
update_cogl_x11_event_mask (CoglOnscreen *onscreen, update_cogl_x11_event_mask (CoglOnscreen *onscreen,
guint32 event_mask, guint32 event_mask,
@ -14,7 +23,7 @@ update_cogl_x11_event_mask (CoglOnscreen *onscreen,
XSetWindowAttributes attrs; XSetWindowAttributes attrs;
guint32 xwin; guint32 xwin;
attrs.event_mask = event_mask; attrs.event_mask = event_mask | X11_FOREIGN_EVENT_MASK;
xwin = cogl_onscreen_x11_get_window_xid (onscreen); xwin = cogl_onscreen_x11_get_window_xid (onscreen);
XChangeWindowAttributes (xdpy, XChangeWindowAttributes (xdpy,
@ -41,6 +50,13 @@ main (int argc, char **argv)
XSetWindowAttributes xattr; XSetWindowAttributes xattr;
unsigned long mask; unsigned long mask;
Window xwin; Window xwin;
CoglVertexP2C4 triangle_vertices[] = {
{0, 0.7, 0xff, 0x00, 0x00, 0x80},
{-0.7, -0.7, 0x00, 0xff, 0x00, 0xff},
{0.7, -0.7, 0x00, 0x00, 0xff, 0xff}
};
CoglPrimitive *triangle;
/* Since we want to test external ownership of the X display, /* Since we want to test external ownership of the X display,
* connect to X manually... */ * connect to X manually... */
@ -145,10 +161,25 @@ main (int argc, char **argv)
cogl_push_framebuffer (fb); cogl_push_framebuffer (fb);
cogl_set_source_color4f (1, 0, 0, 1); triangle = cogl_primitive_new_p2c4 (COGL_VERTICES_MODE_TRIANGLES,
3, triangle_vertices);
for (;;) for (;;)
{ {
cogl_rectangle (-1, 1, 1, -1); while (XPending (xdpy))
{
XEvent event;
XNextEvent (xdpy, &event);
switch (event.type)
{
case KeyRelease:
case ButtonRelease:
return 0;
}
/* FIXME: This should be replaced with some equivalent cogl_xlib_ typesafe API... */
cogl_renderer_handle_native_event (renderer, &event);
}
cogl_clear (&black, COGL_BUFFER_BIT_COLOR);
cogl_primitive_draw (triangle);
cogl_framebuffer_swap_buffers (fb); cogl_framebuffer_swap_buffers (fb);
} }