Update demos for removal of XID structs and xcb_poll_for_reply error param.

[free-sw/xcb/demo] / tests / julia.c

diff --git a/tests/julia.c b/tests/julia.c
index 27d6823..7f184b7 100644 (file)
--- a/tests/julia.c
+++ b/tests/julia.c
@@ -129,50 +129,50 @@ main (int argc, char *argv[])
   screen = xcb_aux_get_screen (data.conn, screen_num);
   data.depth = xcb_aux_get_depth (data.conn, screen);
 
-  win.window = screen->root;
+  win = screen->root;
 
-  data.gc = xcb_gcontext_new (data.conn);
+  data.gc = xcb_generate_id (data.conn);
   mask = XCB_GC_FOREGROUND | XCB_GC_GRAPHICS_EXPOSURES;
   valgc[0] = screen->black_pixel;
   valgc[1] = 0; /* no graphics exposures */
   xcb_create_gc (data.conn, data.gc, win, mask, valgc);
 
-  bgcolor = xcb_gcontext_new (data.conn);
+  bgcolor = xcb_generate_id (data.conn);
   mask = XCB_GC_FOREGROUND | XCB_GC_GRAPHICS_EXPOSURES;
   valgc[0] = screen->white_pixel;
   valgc[1] = 0; /* no graphics exposures */
   xcb_create_gc (data.conn, bgcolor, win, mask, valgc);
 
-  data.draw.window = xcb_window_new (data.conn);
+  data.draw = xcb_generate_id (data.conn);
   mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK | XCB_CW_DONT_PROPAGATE;
   valwin[0] = screen->white_pixel;
   valwin[1] = XCB_EVENT_MASK_KEY_RELEASE | XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_EXPOSURE;
   valwin[2] = XCB_EVENT_MASK_BUTTON_PRESS;
   xcb_create_window (data.conn, 0,
-                  data.draw.window,
+                  data.draw,
                   screen->root,
                   0, 0, W_W, W_H,
                   10,
                   XCB_WINDOW_CLASS_INPUT_OUTPUT,
                   screen->root_visual,
                   mask, valwin);
-  xcb_map_window (data.conn, data.draw.window);
+  xcb_map_window (data.conn, data.draw);
 
-  rect.pixmap = xcb_pixmap_new (data.conn);
+  rect = xcb_generate_id (data.conn);
   xcb_create_pixmap (data.conn, data.depth,
-                  rect.pixmap, data.draw,
+                  rect, data.draw,
                   W_W, W_H);
   xcb_poly_fill_rectangle(data.conn, rect, bgcolor, 1, &rect_coord);
 
-  xcb_map_window (data.conn, data.draw.window);
+  xcb_map_window (data.conn, data.draw);
 
   data.format = XCB_IMAGE_FORMAT_Z_PIXMAP;
 
-  data.cmap = xcb_colormap_new (data.conn);
+  data.cmap = xcb_generate_id (data.conn);
   xcb_create_colormap (data.conn,
                     XCB_COLORMAP_ALLOC_NONE,
                     data.cmap,
-                    data.draw.window,
+                    data.draw,
                     screen->root_visual);
 
   palette_julia (&data);