Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/bin
Modified Files:
evas_software_xcb_main.c evas_software_xcb_perf_load.c
evas_software_xcb_perf_test.c evas_xrender_xcb_main.c
Log Message:
update to the new new api of XCB
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/bin/evas_software_xcb_main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- evas_software_xcb_main.c 1 Oct 2006 18:27:12 -0000 1.12
+++ evas_software_xcb_main.c 10 Oct 2006 19:16:16 -0000 1.13
@@ -25,7 +25,7 @@
iter_vis = xcb_depth_visuals_iterator(iter_depth.data);
for (; iter_vis.rem; --screen, xcb_visualtype_next (&iter_vis))
{
- if (screen->root_visual.id == iter_vis.data->visual_id.id)
+ if (screen->root_visual == iter_vis.data->visual_id)
return iter_vis.data;
}
}
@@ -121,14 +121,14 @@
int pause_me = 0;
xcb_connection_t *conn;
const xcb_query_extension_reply_t *rep_shm;
- xcb_get_input_focus_reply_t *reply;
- xcb_screen_t *screen = NULL;
- xcb_screen_iterator_t iter_screen;
- xcb_drawable_t win;
- xcb_generic_event_t *e;
- uint32_t mask;
- uint32_t value[6];
- int screen_nbr;
+ xcb_get_input_focus_reply_t *reply;
+ xcb_screen_t *screen = NULL;
+ xcb_screen_iterator_t iter_screen;
+ xcb_window_t win;
+ xcb_generic_event_t *e;
+ uint32_t mask;
+ uint32_t value[6];
+ int screen_nbr;
conn = xcb_connect (NULL, &screen_nbr);
if (!conn)
@@ -163,12 +163,12 @@
value[2] = XCB_GRAVITY_BIT_FORGET;
value[3] = XCB_BACKING_STORE_NOT_USEFUL;
value[4] = XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_BUTTON_PRESS |
XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_POINTER_MOTION |
XCB_EVENT_MASK_STRUCTURE_NOTIFY;
- value[5] = screen->default_colormap.xid;
+ value[5] = screen->default_colormap;
- win.window = xcb_window_new(conn);
+ win = xcb_generate_id (conn);
xcb_create_window (conn,
screen->root_depth,
- win.window, screen->root,
+ win, screen->root,
0, 0,
win_w, win_h,
0,
@@ -176,8 +176,8 @@
screen->root_visual,
mask, value);
- title_set (conn, win.window, "Evas Software XCB Test");
- class_set (conn, win.window, "Evas_Software_XCB_Test", "Main");
+ title_set (conn, win, "Evas Software XCB Test");
+ class_set (conn, win, "Evas_Software_XCB_Test", "Main");
#if 0
szhints = AllocSizeHints();
SizeHintsSetMinSize(szhints, win_w, win_h);
@@ -186,7 +186,7 @@
SetWMNormalHints(conn, win.window, szhints);
FreeSizeHints(szhints);
#endif
- xcb_map_window (conn, win.window);
+ xcb_map_window (conn, win);
/* we sync */
reply = xcb_get_input_focus_reply(conn,
xcb_get_input_focus_unchecked(conn),
@@ -319,7 +319,7 @@
while (1)
{
- e = xcb_poll_for_event(conn, NULL);
+ e = xcb_poll_for_event(conn);
if (e) {
switch (e->response_type)
@@ -327,7 +327,7 @@
case XCB_BUTTON_PRESS: {
xcb_button_press_event_t *ev = (xcb_button_press_event_t *)e;
- if (ev->detail.id == 3)
+ if (ev->detail == 3)
{
free(e);
goto exit;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/bin/evas_software_xcb_perf_load.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evas_software_xcb_perf_load.c 1 Oct 2006 18:27:12 -0000 1.6
+++ evas_software_xcb_perf_load.c 10 Oct 2006 19:16:16 -0000 1.7
@@ -16,7 +16,7 @@
#include "Evas_Engine_Software_Xcb.h"
xcb_connection_t *c = NULL;
-xcb_drawable_t win;
+xcb_window_t win;
Evas *evas = NULL;
@@ -39,7 +39,7 @@
iter_vis = xcb_depth_visuals_iterator(iter_depth.data);
for (; iter_vis.rem; --screen, xcb_visualtype_next (&iter_vis))
{
- if (screen->root_visual.id == iter_vis.data->visual_id.id)
+ if (screen->root_visual == iter_vis.data->visual_id)
return iter_vis.data;
}
}
@@ -170,12 +170,12 @@
value[2] = XCB_GRAVITY_BIT_FORGET;
value[3] = XCB_BACKING_STORE_NOT_USEFUL;
value[4] = XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_BUTTON_PRESS |
XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_POINTER_MOTION;
- value[5] = screen->default_colormap.xid;
+ value[5] = screen->default_colormap;
- win.window = xcb_window_new(c);
+ win = xcb_generate_id (c);
xcb_create_window (c,
screen->root_depth,
- win.window, screen->root,
+ win, screen->root,
0, 0,
win_w, win_h,
0,
@@ -183,17 +183,17 @@
screen->root_visual,
mask, value);
- title_set (c, win.window, "Evas XCB Performance Test");
- class_set (c, win.window, "Evas_XCB_Perf_Test", "Main");
+ title_set (c, win, "Evas XCB Performance Test");
+ class_set (c, win, "Evas_XCB_Perf_Test", "Main");
szhints = AllocSizeHints();
SizeHintsSetMinSize(szhints, win_w, win_h);
SizeHintsSetMaxSize(szhints, win_w, win_h);
SizeHintsSetSize(szhints, 0, win_w, win_h);
- SetWMNormalHints(c, win.window, szhints);
+ SetWMNormalHints(c, win, szhints);
FreeSizeHints(szhints);
- xcb_map_window (c, win.window);
+ xcb_map_window (c, win);
evas_init();
evas = evas_new();
@@ -218,7 +218,7 @@
while (1)
{
- e = xcb_poll_for_event(c, NULL);
+ e = xcb_poll_for_event(c);
if (e)
{
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/bin/evas_software_xcb_perf_test.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_software_xcb_perf_test.c 1 Oct 2006 18:27:12 -0000 1.7
+++ evas_software_xcb_perf_test.c 10 Oct 2006 19:16:16 -0000 1.8
@@ -16,7 +16,7 @@
#include "Evas_Engine_Software_Xcb.h"
xcb_connection_t *c = NULL;
-xcb_drawable_t win;
+xcb_window_t win;
Evas *evas = NULL;
@@ -39,7 +39,7 @@
iter_vis = xcb_depth_visuals_iterator(iter_depth.data);
for (; iter_vis.rem; --screen, xcb_visualtype_next (&iter_vis))
{
- if (screen->root_visual.id == iter_vis.data->visual_id.id)
+ if (screen->root_visual == iter_vis.data->visual_id)
return iter_vis.data;
}
}
@@ -172,29 +172,29 @@
value[2] = XCB_GRAVITY_BIT_FORGET;
value[3] = XCB_BACKING_STORE_NOT_USEFUL;
value[4] = XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_BUTTON_PRESS |
XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_POINTER_MOTION;
- value[5] = screen->default_colormap.xid;
+ value[5] = screen->default_colormap;
- win.window = xcb_window_new(c);
+ win = xcb_generate_id (c);
xcb_create_window (c,
screen->root_depth,
- win.window, screen->root,
+ win, screen->root,
0, 0,
win_w, win_h,
0,
XCB_WINDOW_CLASS_INPUT_OUTPUT,
screen->root_visual,
mask, value);
- title_set (c, win.window, "Evas XCB Performance Test");
- class_set (c, win.window, "Evas_XCB_Perf_Test", "Main");
+ title_set (c, win, "Evas XCB Performance Test");
+ class_set (c, win, "Evas_XCB_Perf_Test", "Main");
szhints = AllocSizeHints();
SizeHintsSetMinSize(szhints, win_w, win_h);
SizeHintsSetMaxSize(szhints, win_w, win_h);
SizeHintsSetSize(szhints, 0, win_w, win_h);
- SetWMNormalHints(c, win.window, szhints);
+ SetWMNormalHints(c, win, szhints);
FreeSizeHints(szhints);
- xcb_map_window (c, win.window);
+ xcb_map_window (c, win);
/* we sync */
reply = xcb_get_input_focus_reply(c,
xcb_get_input_focus_unchecked(c),
@@ -225,7 +225,7 @@
while (1)
{
- e = xcb_poll_for_event(c, NULL);
+ e = xcb_poll_for_event(c);
if (e)
{
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/bin/evas_xrender_xcb_main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_xrender_xcb_main.c 1 Oct 2006 18:27:12 -0000 1.5
+++ evas_xrender_xcb_main.c 10 Oct 2006 19:16:16 -0000 1.6
@@ -104,7 +104,7 @@
xcb_get_input_focus_reply_t *reply;
xcb_screen_t *screen = NULL;
xcb_screen_iterator_t iter_screen;
- xcb_drawable_t win;
+ xcb_window_t win;
xcb_generic_event_t *e;
uint32_t mask;
uint32_t value[6];
@@ -145,31 +145,31 @@
value[2] = XCB_GRAVITY_BIT_FORGET;
value[3] = XCB_BACKING_STORE_NOT_USEFUL;
value[4] = XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_BUTTON_PRESS |
XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_POINTER_MOTION |
XCB_EVENT_MASK_STRUCTURE_NOTIFY;
- value[5] = screen->default_colormap.xid;
+ value[5] = screen->default_colormap;
- win.window = xcb_window_new(conn);
+ win = xcb_generate_id (conn);
xcb_create_window (conn,
- screen->root_depth,
- win.window, screen->root,
- 0, 0,
- win_w, win_h,
- 0,
- XCB_WINDOW_CLASS_INPUT_OUTPUT,
- screen->root_visual,
- mask, value);
- title_set (conn, win.window, "Evas XRender Xcb Test");
- class_set (conn, win.window, "Evas_XRender_XCB_Test", "Main");
+ screen->root_depth,
+ win, screen->root,
+ 0, 0,
+ win_w, win_h,
+ 0,
+ XCB_WINDOW_CLASS_INPUT_OUTPUT,
+ screen->root_visual,
+ mask, value);
+ title_set (conn, win, "Evas XRender Xcb Test");
+ class_set (conn, win, "Evas_XRender_XCB_Test", "Main");
#if 0
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);
#endif
- xcb_map_window (conn, win.window);
+ xcb_map_window (conn, win);
/* we sync */
reply = xcb_get_input_focus_reply(conn,
- xcb_get_input_focus_unchecked(conn),
- NULL);
+ xcb_get_input_focus_unchecked(conn),
+ NULL);
free(reply);
/* test evas_free.... :) */
@@ -194,7 +194,7 @@
orig_start_time = start_time = get_time();
while (1)
{
- e = xcb_poll_for_event(conn, NULL);
+ e = xcb_poll_for_event(conn);
if (e) {
switch (e->response_type)
@@ -202,7 +202,7 @@
case XCB_BUTTON_PRESS: {
xcb_button_press_event_t *ev = (xcb_button_press_event_t *)e;
- if (ev->detail.id == 3)
+ if (ev->detail == 3)
{
free(e);
goto exit;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
