From: TORRI Vincent Date: Sat, 30 Sep 2006 11:06:58 +0000 (+0200) Subject: fix some indentation, remove args of the main function (not needed), xcb_sync ->... X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?p=free-sw%2Fxcb%2Flibxcb;a=commitdiff_plain;h=e7f473afbd02c87cc6b1fc9c7c240d6c5cc26763 fix some indentation, remove args of the main function (not needed), xcb_sync -> xcb_aux_sync. Jamey, it seems that your script transforms XCBGetSetup into a type, instead of a function. Same for XCBSetupVendor. Maybe there are other fuctions that have the same problem. --- diff --git a/doc/tutorial/index.html b/doc/tutorial/index.html index 64f36a4..ea53305 100644 --- a/doc/tutorial/index.html +++ b/doc/tutorial/index.html @@ -687,7 +687,7 @@ xcb_screen_iterator_t xcb_setup_roots_iterator (xcb_setup_t *R); #include <X11/XCB/xcb.h> int -main (int argc, char *argv[]) +main () { xcb_connection_t *c; xcb_screen_t *screen; @@ -747,7 +747,7 @@ xcb_void_cookie_t xcb_create_window (xcb_connection_t *c, /* Pointer uint16_t height, /* Height of the window (in pixels) */ uint16_t border_width, /* Width of the window's border (in pixels) */ uint16_t _class, - xcb_visualid_t visual, + xcb_visualid_t visual, uint32_t value_mask, const uint32_t *value_list); @@ -772,7 +772,7 @@ xcb_void_cookie_t xcb_map_window (xcb_connection_t *c, #include <X11/XCB/xcb.h> int -main (int argc, char *argv[]) +main () { xcb_connection_t *c; xcb_screen_t *screen; @@ -823,7 +823,7 @@ int xcb_flush (xcb_connection_t *c); This function flushes all pending requests to the X server (much like the fflush() function is used to flush standard output). The second function is - xcb_sync(): + xcb_aux_sync(): 

 int xcb_aux_sync (xcb_connection_t *c);
@@ -917,7 +917,7 @@ xcb_void_cookie_t xcb_create_gc (xcb_connection_t *c,
 #include <X11/XCB/xcb.h>
 
 int
-main (int argc, char *argv[])
+main ()
 {
   xcb_connection_t *c;
   xcb_screen_t     *screen;
@@ -1249,7 +1249,7 @@ xcb_void_cookie_t xcb_poly_fill_arc (xcb_connection_t *c,
 #include <X11/XCB/xcb.h>
 
 int
-main (int argc, char *argv[])
+main ()
 {
   xcb_connection_t    *c;
   xcb_screen_t        *screen;
@@ -1912,11 +1912,11 @@ print_modifiers (uint32_t mask)
 }
 
 int
-main (int argc, char *argv[])
+main ()
 {
-  xcb_connection_t   *c;
-  xcb_screen_t       *screen;
-  xcb_drawable_t      win;
+  xcb_connection_t    *c;
+  xcb_screen_t        *screen;
+  xcb_drawable_t       win;
   xcb_generic_event_t *e;
   uint32_t             mask = 0;
   uint32_t             values[2];
@@ -2146,7 +2146,7 @@ xcb_void_cookie_t xcb_change_property (xcb_connection_t *c,       /* Connection
 #include <X11/XCB/xcb_atom.h>
 
 int
-main (int argc, char *argv[])
+main ()
 {
   xcb_connection_t *c;
   xcb_screen_t     *screen;
@@ -2676,7 +2676,7 @@ typedef struct {
 #include <X11/XCB/xcb.h>
 
 int
-main (int argc, char *argv[])
+main ()
 {
   xcb_connection_t *c;
   xcb_screen_t     *screen;
@@ -2721,7 +2721,7 @@ xcb_void_cookie_t xcb_create_colormap (xcb_connection_t *c,       /* Pointer to
 #include <X11/XCB/xcb.h>
 
 int
-main (int argc, char *argv[])
+main ()
 {
   xcb_connection_t *c;
   xcb_screen_t     *screen;
@@ -2822,7 +2822,7 @@ xcb_alloc_color_reply_t *xcb_alloc_color_reply (xcb_connection_t        *c,
 #include <X11/XCB/xcb.h>
 
 int
-main (int argc, char *argv[])
+main ()
 {
   xcb_connection_t        *c;
   xcb_screen_t            *screen;
@@ -2973,12 +2973,12 @@ xcb_void_cookie_t xcb_copy_area (xcb_connection_t *c,             /* Pointer to
                                  xcb_drawable_t    src_drawable,  /* The Drawable we want to paste */
                                  xcb_drawable_t    dst_drawable,  /* The Drawable on which we copy the previous Drawable */
                                  xcb_gcontext_t    gc,            /* A Graphic Context */
-                                 int16_t          src_x,          /* Top left x coordinate of the region we want to copy */
-                                 int16_t          src_y,          /* Top left y coordinate of the region we want to copy */
-                                 int16_t          dst_x,          /* Top left x coordinate of the region where we want to copy */
-                                 int16_t          dst_y,          /* Top left y coordinate of the region where we want to copy */
-                                 uint16_t         width,          /* Width of the region we want to copy */
-                                 uint16_t         height);        /* Height of the region we want to copy */
+                                 int16_t           src_x,         /* Top left x coordinate of the region we want to copy */
+                                 int16_t           src_y,         /* Top left y coordinate of the region we want to copy */
+                                 int16_t           dst_x,         /* Top left x coordinate of the region where we want to copy */
+                                 int16_t           dst_y,         /* Top left y coordinate of the region where we want to copy */
+                                 uint16_t          width,         /* Width of the region we want to copy */
+                                 uint16_t          height);       /* Height of the region we want to copy */

As you can see, we could copy the whole pixmap, as well as @@ -3143,7 +3143,7 @@ xcb_change_window_attributes (conn, window, mask, &value_list); structure. They are obtained by using a function that requires a xcb_connection_t * or a member of the xcb_setup_t structure - (via the function xcb_get_setup_t), or + (via the function xcb_get_setup), or a function that requires that structure.

    @@ -3192,9 +3192,9 @@ c = xcb_connect (display_name, &screen_default_nbr);
  1. ScreenCount

    You get the count of screens with the functions - xcb_get_setup_t + xcb_get_setup and - xcb_setup_roots_iterator_t + xcb_setup_roots_iterator (if you need to iterate): 

    @@ -3225,10 +3225,10 @@ screen_count = xcb_setup_roots_length (xcb_get_setup (c));
           
  2. ServerVendor
           
    
           You get the name of the vendor of the server hardware with
-          the functions xcb_get_setup_t
+          the functions xcb_get_setup
           and
           xcb_setup_vendor_t. Beware
+          class="code">xcb_setup_vendor. Beware
           that, unlike Xlib, the string returned by XCB is not
           necessarily null-terminaled:
           
    
@@ -3250,7 +3250,7 @@ vendor[length] = '\0';
           
    
           You get the major version of the protocol in the
           xcb_setup_t
-          structure, with the function xcb_get_setup_t:
+          structure, with the function xcb_get_setup:
           
    
           
     xcb_connection_t *c;
@@ -3266,7 +3266,7 @@ protocol_major_version = xcb_get_setup (c)->protocol_major_version;
           
    
           You get the minor version of the protocol in the
           xcb_setup_t
-          structure, with the function xcb_get_setup_t:
+          structure, with the function xcb_get_setup:
           
    
           
     xcb_connection_t *c;
@@ -3282,7 +3282,7 @@ protocol_minor_version = xcb_get_setup (c)->protocol_minor_version;
           
    
           You get the number of the release of the server hardware in the
           xcb_setup_t
-          structure, with the function xcb_get_setup_t:
+          structure, with the function xcb_get_setup:
           
    
           
     xcb_connection_t *c;
@@ -3303,7 +3303,7 @@ release_number = xcb_get_setup (c)->release_number;
           
    
           You get the bitmap scanline unit in the
           xcb_setup_t
-          structure, with the function xcb_get_setup_t:
+          structure, with the function xcb_get_setup:
           
    
           
     xcb_connection_t *c;
@@ -3319,7 +3319,7 @@ bitmap_format_scanline_unit = xcb_get_setup (c)->bitmap_format_scanline_unit;
           
    
           You get the bitmap bit order in the
           xcb_setup_t
-          structure, with the function xcb_get_setup_t:
+          structure, with the function xcb_get_setup:
           
    
           
     xcb_connection_t *c;
@@ -3335,7 +3335,7 @@ bitmap_format_bit_order = xcb_get_setup (c)->bitmap_format_bit_order;
           
    
           You get the bitmap scanline pad in the
           xcb_setup_t
-          structure, with the function xcb_get_setup_t:
+          structure, with the function xcb_get_setup:
           
    
           
     xcb_connection_t *c;
@@ -3351,7 +3351,7 @@ bitmap_format_scanline_pad = xcb_get_setup (c)->bitmap_format_scanline_pad;
           
    
           You get the image byte order in the
           xcb_setup_t
-          structure, with the function xcb_get_setup_t:
+          structure, with the function xcb_get_setup:
           
    
           
     xcb_connection_t *c;