Merge branch 'master' of git://github.com/topcat/xcb-win32

[free-sw/xcb/libxcb] / doc / tutorial / index.html

diff --git a/doc/tutorial/index.html b/doc/tutorial/index.html
index ac173a0..adec0ac 100644 (file)
--- a/doc/tutorial/index.html
+++ b/doc/tutorial/index.html
@@ -173,13 +173,14 @@
       with the <a href="http://xcb.freedesktop.org">XCB</a>
       library. keep in mind that XCB, like the
       <a href="http://tronche.com/gui/x/xlib/introduction">Xlib</a>
-      library, isn't what post programmers wanting to write X
+      library, isn't what most programmers wanting to write X
       applications are looking for. They should use a much higher
       level GUI toolkit like Motif,
       <a href="http://www.lesstif.org">LessTiff</a>,
       <a href="http://www.gtk.org">GTK</a>,
-      <a href="http://www.trolltech.com">QT</a> or
-      <a href="http://www.enlightenment.org">EWL</a>, or use
+      <a href="http://www.trolltech.com">QT</a>,
+      <a href="http://www.enlightenment.org">EWL</a>,
+      <a href="http://www.enlightenment.org">ETK</a>, or use
       <a href="http://cairographics.org">Cairo</a>.
       However,
       we need to start somewhere. More than this, knowing how things
@@ -470,8 +471,6 @@ main ()
   diff = end - start;
 
   /* free var */
-  for (i = 0; i &lt; count; ++i)
-    free (names[i]);
   free (atoms);
   free (cs);
 
@@ -493,6 +492,8 @@ main ()
   printf ("ratio         : %f\n", diff_x / diff);
 
   free (atoms_x);
+  for (i = 0; i &lt; count; ++i)
+    free (names[i]);
   free (names);
 
   XCloseDisplay (disp);
@@ -1452,7 +1453,7 @@ typedef enum {
 </pre>
         <p>
         If the window has already been created, we can use the
-        <span class="code">xcb_configure_window()</span> function to set
+        <span class="code">xcb_change_window_attributes()</span> function to set
         the events that the window will receive. The subsection
         <a href="#winconf">Configuring a window</a> shows its
         prototype. As an example, here is a piece of code that
@@ -1465,7 +1466,7 @@ const static uint32_t values[] = { XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_BUTT
 
 /* The connection c and the window win are supposed to be defined */
 
-xcb_configure_window (c, win, XCB_CW_EVENT_MASK, values);
+xcb_change_window_attributes (c, win, XCB_CW_EVENT_MASK, values);
 </pre>
         <div class="emph">
         <p>
@@ -2063,7 +2064,7 @@ typedef uint32_t xcb_font_t;
         <pre class="code">
 xcb_font_t xcb_generate_id (xcb_connection_t *c);
 </pre>
-        <p>
+        <br>
         <li class="subtitle"><a name="openingfont">Opening a Font</a>
         <p>
         To open a font, we use the following function:
@@ -2140,11 +2141,12 @@ xcb_void_cookie_t xcb_image_text_8 (xcb_connection_t *c,
         This example draw a text at 10 pixels (for the base line) of
         the bottom of a window. Pressing the Esc key exits the program.
         </p>
-        <pre class="code">#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+        <pre class="code">
+#include &lt;stdlib.h&gt;
+#include &lt;stdio.h&gt;
+#include &lt;string.h&gt;
 
-#include <xcb/xcb.h>
+#include &lt;xcb/xcb.h&gt;
 
 #define WIDTH 300
 #define HEIGHT 100
@@ -2266,7 +2268,7 @@ int main ()
   int                   screen_number;
 
   /* getting the connection */
-  c = xcb_connect (NULL, &screen_number);
+  c = xcb_connect (NULL, &amp;screen_number);
   if (!c) {
     fprintf (stderr, "ERROR: can't connect to an X server\n");
     return -1;
@@ -2277,7 +2279,7 @@ int main ()
 
   screen = NULL;
   screen_iter = xcb_setup_roots_iterator (setup);
-  for (; screen_iter.rem != 0; --screen_number, xcb_screen_next (&screen_iter))
+  for (; screen_iter.rem != 0; --screen_number, xcb_screen_next (&amp;screen_iter))
     if (screen_number == 0)
       {
         screen = screen_iter.data;
@@ -2326,7 +2328,7 @@ int main ()
   while (1) {
     e = xcb_poll_for_event(c);
     if (e) {
-      switch (e->response_type) {
+      switch (e->response_type &amp; ~0x80) {
       case XCB_EXPOSE: {
         char *text;
 
@@ -3739,7 +3741,7 @@ int main ()
   while (1) {
     e = xcb_poll_for_event(c);
     if (e) {
-      switch (e->response_type) {
+      switch (e->response_type &amp; ~0x80) {
       case XCB_EXPOSE: {
         char *text;