summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hopf <mhopf@suse.de>2007-04-18 12:46:08 +0200
committerMatthias Hopf <mhopf@suse.de>2007-04-18 12:46:08 +0200
commit2ec1383a68bf9f4baf7125a7d6544167f38d8d62 (patch)
tree1a8290796045f3e4731a4ba86687568fe9155ec4
parent3abd41625c7d6db6d01f3167d6bac2b7481965cf (diff)
parent158c9b6ba18b39f424bd524fceb66f3fec0d1616 (diff)
Merge branch 'master' of git://anongit.freedesktop.org/git/xcb/libxcb
-rw-r--r--doc/tutorial/index.html9
-rw-r--r--src/c-client.xsl5
2 files changed, 10 insertions, 4 deletions
diff --git a/doc/tutorial/index.html b/doc/tutorial/index.html
index 75e1f75..c540426 100644
--- a/doc/tutorial/index.html
+++ b/doc/tutorial/index.html
@@ -178,8 +178,9 @@
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
@@ -2327,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;
@@ -3740,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;
diff --git a/src/c-client.xsl b/src/c-client.xsl
index be6aa30..c90e94f 100644
--- a/src/c-client.xsl
+++ b/src/c-client.xsl
@@ -449,6 +449,11 @@ authorization from the authors.
</xsl:when>
</xsl:choose>
</xsl:variable>
+ <xsl:choose>
+ <xsl:when test="self::error|self::errorcopy">
+ <constant type="number" name="{xcb:xcb-prefix(concat('Bad', @name))}" value="{@number}" />
+ </xsl:when>
+ </xsl:choose>
<constant type="number" name="{xcb:xcb-prefix(@name)}" value="{@number}" />
<xsl:choose>
<xsl:when test="self::event|self::error">