From 83208cc516bd1b945c2691c457ecf37189770972 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Sun, 22 Feb 2009 11:29:52 +0000 Subject: [PATCH] add xrender xcb engine test SVN revision: 39137 --- configure.ac | 4 + src/bin/Makefile.am | 5 + src/bin/engine_xrender_xcb.c | 386 +++++++++++++++++++++++++++++++++++ src/bin/engine_xrender_xcb.h | 7 + src/bin/main.c | 7 + src/bin/main.h | 3 + 6 files changed, 412 insertions(+) create mode 100644 src/bin/engine_xrender_xcb.c create mode 100644 src/bin/engine_xrender_xcb.h diff --git a/configure.ac b/configure.ac index 893743a..a225259 100644 --- a/configure.ac +++ b/configure.ac @@ -38,6 +38,9 @@ EXPEDITE_CHECK_ENGINE([opengl-x11], [OpenGL X11], "yes") # Software XCB EXPEDITE_CHECK_ENGINE([software-xcb], [Software XCB], "yes") +# XRender XCB +EXPEDITE_CHECK_ENGINE([xrender-xcb], [XRender XCB], "yes") + # DirectDraw EXPEDITE_CHECK_ENGINE([software-ddraw], [Software DirectDraw], "yes", [ddraw_libs="-lddraw -ldxguid -lgdi32"]) AC_SUBST(ddraw_libs) @@ -205,6 +208,7 @@ echo " Software X11.................: ${have_software_x11}" echo " X Render X11.................: ${have_xrender_x11}" echo " Open GL X11..................: ${have_opengl_x11}" echo " Software XCB.................: ${have_software_xcb}" +echo " X Render XCB.................: ${have_xrender_xcb}" echo " Software DirectDraw..........: ${have_software_ddraw}" echo " Direct3D.....................: ${have_direct3d}" echo " Open GL Glew.................: ${have_opengl_glew}" diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 65810f2..daf9a43 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -97,6 +97,11 @@ expedite_SOURCES += \ engine_software_xcb.c engine_software_xcb.h endif +if BUILD_XRENDER_XCB +expedite_SOURCES += \ +engine_xrender_xcb.c engine_xrender_xcb.h +endif + if BUILD_SOFTWARE_DDRAW expedite_SOURCES += \ engine_software_ddraw.cpp engine_software_ddraw.h diff --git a/src/bin/engine_xrender_xcb.c b/src/bin/engine_xrender_xcb.c new file mode 100644 index 0000000..6733d30 --- /dev/null +++ b/src/bin/engine_xrender_xcb.c @@ -0,0 +1,386 @@ +#include "main.h" + +#include +#include +#include + +#define XK_MISCELLANY +#include + +enum { + XCB_SIZE_US_POSITION_HINT = 1 << 0, + XCB_SIZE_US_SIZE_HINT = 1 << 1, + XCB_SIZE_P_POSITION_HINT = 1 << 2, + XCB_SIZE_P_SIZE_HINT = 1 << 3, + XCB_SIZE_P_MIN_SIZE_HINT = 1 << 4, + XCB_SIZE_P_MAX_SIZE_HINT = 1 << 5, + XCB_SIZE_P_RESIZE_INC_HINT = 1 << 6, + XCB_SIZE_P_ASPECT_HINT = 1 << 7, + XCB_SIZE_BASE_SIZE_HINT = 1 << 8, + XCB_SIZE_P_WIN_GRAVITY_HINT = 1 << 9 +}; + +struct xcb_size_hints_t { + uint32_t flags; + int32_t x, y, width, height; + int32_t min_width, min_height; + int32_t max_width, max_height; + int32_t width_inc, height_inc; + int32_t min_aspect_num, min_aspect_den; + int32_t max_aspect_num, max_aspect_den; + int32_t base_width, base_height; + uint32_t win_gravity; +}; + + +static xcb_connection_t *conn = NULL; +static xcb_screen_t *screen = NULL; +static xcb_window_t win = 0; + +static xcb_visualtype_t * +_engine_xrender_visual_get(xcb_connection_t *conn, xcb_screen_t *screen) +{ + xcb_depth_iterator_t iter_depth; + + iter_depth = xcb_screen_allowed_depths_iterator(screen); + for (; iter_depth.rem; xcb_depth_next (&iter_depth)) + { + xcb_visualtype_iterator_t iter_vis; + + iter_vis = xcb_depth_visuals_iterator(iter_depth.data); + for (; iter_vis.rem; xcb_visualtype_next (&iter_vis)) + { + if (screen->root_visual == iter_vis.data->visual_id) + return iter_vis.data; + } + } +} + +int +engine_xrender_xcb_args(int argc, char **argv) +{ + struct xcb_size_hints_t hints; + uint32_t value_list[6]; + xcb_screen_iterator_t iter; + Evas_Engine_Info_XRender_Xcb *einfo; + xcb_intern_atom_reply_t *reply; + char *str; + xcb_intern_atom_cookie_t cookie1; + xcb_intern_atom_cookie_t cookie2; + xcb_intern_atom_cookie_t cookie3; + xcb_intern_atom_cookie_t cookie4; + xcb_intern_atom_cookie_t cookie5; + xcb_atom_t string; + xcb_atom_t wm_name; + xcb_atom_t wm_class; + xcb_atom_t wm_normal_hint; + xcb_atom_t wm_size_hint; + uint32_t value_mask; + int s; + int s_tmp; + int l1; + int l2; + int i; + int ok = 0; + + for (i = 1; i < argc; i++) + { + if ((!strcmp(argv[i], "-e")) && (i < (argc - 1))) + { + i++; + if (!strcmp(argv[i], "xrxcb")) ok = 1; + } + } + if (!ok) return 0; + + conn = xcb_connect(NULL, &s); + if (!conn) return 0; + + s_tmp = s; + iter = xcb_setup_roots_iterator(xcb_get_setup(conn)); + for (; iter.rem; --s_tmp, xcb_screen_next (&iter)) + if (s_tmp == 0) + { + screen = iter.data; + break; + } + + evas_output_method_set(evas, evas_render_method_lookup("xrender_xcb")); + einfo = (Evas_Engine_Info_XRender_Xcb *)evas_engine_info_get(evas); + if (!einfo) + { + printf("Evas does not support the XRender XCB Engine\n"); + return 0; + } + + einfo->info.conn = conn; + einfo->info.screen = screen; + einfo->info.visual = _engine_xrender_visual_get(conn, screen); + + value_mask = + XCB_CW_BACK_PIXMAP | XCB_CW_BORDER_PIXEL | XCB_CW_BIT_GRAVITY | + XCB_CW_BACKING_STORE | XCB_CW_EVENT_MASK | XCB_CW_COLORMAP; + + value_list[0] = XCB_NONE; + value_list[1] = 0; + value_list[2] = XCB_GRAVITY_BIT_FORGET; + value_list[3] = XCB_BACKING_STORE_NOT_USEFUL; + value_list[4] = + XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE | + XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE | + XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_LEAVE_WINDOW | + XCB_EVENT_MASK_POINTER_MOTION | XCB_EVENT_MASK_EXPOSURE | + XCB_EVENT_MASK_STRUCTURE_NOTIFY; + value_list[5] =screen->default_colormap; + + win = xcb_generate_id(conn); + xcb_create_window(conn, + screen->root_depth, + win, screen->root, 0, 0, win_w, win_h, 0, + XCB_WINDOW_CLASS_INPUT_OUTPUT, + ((xcb_visualtype_t *)einfo->info.visual)->visual_id, + value_mask, + value_list); + einfo->info.drawable = win; + + xcb_map_window(conn, win); + + evas_engine_info_set(evas, (Evas_Engine_Info *) einfo); + +/* XStoreName(disp, win, "Expedite - Evas Test Suite"); */ + + cookie1 = xcb_intern_atom_unchecked(conn, 0, strlen("STRING"), "STRING"); + cookie2 = xcb_intern_atom_unchecked(conn, 0, strlen("WM_NAME"), "WM_NAME"); + cookie3 = xcb_intern_atom_unchecked(conn, 0, strlen("WM_CLASS"), "WM_CLASS"); + cookie4 = xcb_intern_atom_unchecked(conn, 0, strlen("WM_NORMAL_HINTS)"), "WM_NORMAL_HINTS)"); + cookie5 = xcb_intern_atom_unchecked(conn, 0, strlen("WM_SIZE_HINTS)"), "WM_SIZE_HINTS)"); + + reply = xcb_intern_atom_reply(conn, cookie1, NULL); + string = reply->atom; + free(reply); + reply = xcb_intern_atom_reply(conn, cookie2, NULL); + wm_name = reply->atom; + free(reply); + + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win, + wm_name, string, 8, + strlen("Expedite - Evas Test Suite"), "Expedite - Evas Test Suite"); + +/* chint.res_name = "expedite"; */ +/* chint.res_class = "Expedite"; */ +/* XSetClassHint(disp, win, &chint); */ + + l1 = strlen("expedite"); + l2 = strlen("Expedite"); + str = (char *)malloc(l1 + l2 + 1); + memcpy(str, "expedite", l1); + str[l1] = '\0'; + memcpy(str + l1 + 1, "Expedite", l2); + + reply = xcb_intern_atom_reply(conn, cookie3, NULL); + wm_class = reply->atom; + free(reply); + + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win, + wm_class, string, 8, + l1 + l2 + 1, str); + free(str); + +/* szhints.flags = PMinSize | PMaxSize | PSize | USSize; */ +/* szhints.min_width = szhints.max_width = win_w; */ +/* szhints.min_height = szhints.max_height = win_h; */ +/* XSetWMNormalHints(disp, win, &szhints); */ + + memset(&hints, 0, sizeof(hints)); + hints.flags = XCB_SIZE_US_SIZE_HINT | XCB_SIZE_P_SIZE_HINT | XCB_SIZE_P_MIN_SIZE_HINT | XCB_SIZE_P_MAX_SIZE_HINT; + hints.min_width = win_w; + hints.max_width = win_w; + hints.min_height = win_h; + hints.max_height = win_h; + + reply = xcb_intern_atom_reply(conn, cookie4, NULL); + wm_normal_hint = reply->atom; + free(reply); + + reply = xcb_intern_atom_reply(conn, cookie5, NULL); + wm_size_hint = reply->atom; + free(reply); + + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win, + wm_normal_hint, wm_size_hint, 32, + sizeof(hints) / 4, &hints); + + free(xcb_get_input_focus_reply(conn, xcb_get_input_focus_unchecked(conn), NULL)); + + return 1; +} + +void +engine_xrender_xcb_loop(void) +{ + xcb_generic_event_t *ev; + + again: + ev = xcb_poll_for_event(conn); + if (!ev) + return; + + switch (ev->response_type) + { + case XCB_BUTTON_PRESS: + { + xcb_button_press_event_t *e; + + e = (xcb_button_press_event_t *)ev; + + evas_event_feed_mouse_move(evas, e->event_x, e->event_y, 0, NULL); + evas_event_feed_mouse_down(evas, e->detail, EVAS_BUTTON_NONE, 0, NULL); + break; + } + case XCB_BUTTON_RELEASE: + { + xcb_button_release_event_t *e; + + e = (xcb_button_release_event_t *)ev; + + evas_event_feed_mouse_move(evas, e->event_x, e->event_y, 0, NULL); + evas_event_feed_mouse_up(evas, e->detail, EVAS_BUTTON_NONE, 0, NULL); + break; + } + case XCB_MOTION_NOTIFY: + { + xcb_motion_notify_event_t *e; + + e = (xcb_motion_notify_event_t *)ev; + + evas_event_feed_mouse_move(evas, e->event_x, e->event_y, 0, NULL); + break; + } + case XCB_EXPOSE: + { + xcb_expose_event_t *e; + + e = (xcb_expose_event_t *)ev; + + evas_damage_rectangle_add(evas, + e->x, + e->y, + e->width, + e->height); + break; + } + case XCB_CONFIGURE_NOTIFY: + { + xcb_configure_notify_event_t *e; + + e = (xcb_configure_notify_event_t *)ev; + + evas_output_size_set(evas, + e->width, + e->height); + break; + } + case XCB_ENTER_NOTIFY: + evas_event_feed_mouse_in(evas, 0, NULL); + break; + case XCB_LEAVE_NOTIFY: + evas_event_feed_mouse_out(evas, 0, NULL); + break; + case XCB_KEY_PRESS: + { + xcb_key_press_event_t *e; + xcb_key_symbols_t *kss; + xcb_keysym_t ks; + char *str; + + e = (xcb_key_press_event_t *)ev; + + kss = xcb_key_symbols_alloc(conn); + + ks = xcb_key_symbols_get_keysym(kss, e->detail, 0); + + if ((ks == XK_Shift_L) || (ks == XK_Shift_R)) + evas_key_modifier_on(evas, "Shift"); + else if ((ks == XK_Control_L) || (ks == XK_Control_R)) + evas_key_modifier_on(evas, "Control"); + else if ((ks == XK_Alt_L) || (ks == XK_Alt_R)) + evas_key_modifier_on(evas, "Alt"); + else if ((ks == XK_Super_L) || (ks == XK_Super_R)) + evas_key_modifier_on(evas, "Super"); + else if (ks == XK_Caps_Lock) + { + if (evas_key_lock_is_set(evas_key_lock_get(evas), "Caps_Lock")) + evas_key_lock_off(evas, "Caps_Lock"); + else + evas_key_lock_on(evas, "Caps_Lock"); + } + else if (ks == XK_Scroll_Lock) + { + if (evas_key_lock_is_set(evas_key_lock_get(evas), "Scroll_Lock")) + evas_key_lock_off(evas, "Scroll_Lock"); + else + evas_key_lock_on(evas, "Scroll_Lock"); + } + + if (ks == XK_Left) + str = "Left"; + if (ks == XK_Right) + str = "Right"; + if (ks == XK_Escape) + str = "Escape"; + if (ks == XK_Return) + str = "Return"; + if (ks == 71) + str = "q"; + + evas_event_feed_key_down(evas, str, str, NULL, NULL, 0, NULL); + + xcb_key_symbols_free(kss); + break; + } + case XCB_KEY_RELEASE: + { + xcb_key_release_event_t *e; + xcb_key_symbols_t *kss; + xcb_keysym_t ks; + char *str; + + e = (xcb_key_release_event_t *)ev; + + kss = xcb_key_symbols_alloc(conn); + + ks = xcb_key_symbols_get_keysym(kss, e->detail, 0); + + if ((ks == XK_Shift_L) || (ks == XK_Shift_R)) + evas_key_modifier_on(evas, "Shift"); + else if ((ks == XK_Control_L) || (ks == XK_Control_R)) + evas_key_modifier_on(evas, "Control"); + else if ((ks == XK_Alt_L) || (ks == XK_Alt_R)) + evas_key_modifier_on(evas, "Alt"); + else if ((ks == XK_Super_L) || (ks == XK_Super_R)) + evas_key_modifier_on(evas, "Super"); + + if (ks == XK_Left) + str = "Left"; + if (ks == XK_Right) + str = "Right"; + if (ks == XK_Escape) + str = "Escape"; + if (ks == XK_Return) + str = "Return"; + if (ks == 71) + str = "q"; + + evas_event_feed_key_up(evas, str, str, NULL, NULL, 0, NULL); + + xcb_key_symbols_free(kss); + break; + } + default: + free(ev); + return; + } + free(ev); + + goto again; +} diff --git a/src/bin/engine_xrender_xcb.h b/src/bin/engine_xrender_xcb.h new file mode 100644 index 0000000..867b943 --- /dev/null +++ b/src/bin/engine_xrender_xcb.h @@ -0,0 +1,7 @@ +#ifndef ENGINE_XRENDER_XCB_H +#define ENGINE_XRENDER_XCB_H + +int engine_xrender_xcb_args(int argc, char **argv); +void engine_xrender_xcb_loop(void); + +#endif diff --git a/src/bin/main.c b/src/bin/main.c index 90eb892..cabcd34 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -1215,6 +1215,10 @@ _engine_args(int argc, char **argv) if (engine_software_xcb_args(argc, argv)) loop_func = engine_software_xcb_loop; #endif +#if HAVE_EVAS_XRENDER_XCB + if (engine_xrender_xcb_args(argc, argv)) + loop_func = engine_xrender_xcb_loop; +#endif #if HAVE_EVAS_SOFTWARE_DDRAW if (engine_software_ddraw_args(argc, argv)) loop_func = engine_software_ddraw_loop; @@ -1282,6 +1286,9 @@ _engine_args(int argc, char **argv) #if HAVE_EVAS_SOFTWARE_XCB " xcb" #endif +#if HAVE_EVAS_XRENDER_XCB + " xrxcb" +#endif #if HAVE_EVAS_SOFTWARE_DDRAW " ddraw" #endif diff --git a/src/bin/main.h b/src/bin/main.h index cf6143e..e0a35c1 100644 --- a/src/bin/main.h +++ b/src/bin/main.h @@ -33,6 +33,9 @@ #if HAVE_EVAS_SOFTWARE_XCB #include "engine_software_xcb.h" #endif +#if HAVE_EVAS_XRENDER_X11 +#include "engine_xrender_xcb.h" +#endif #if HAVE_EVAS_SOFTWARE_DDRAW #include "engine_software_ddraw.h" #endif