Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 368 insertions, 0 deletions

diff --git a/libxcb/src/xcb_conn.c b/libxcb/src/xcb_conn.c
new file mode 100644
index 000000000..e7856c355
--- /dev/null
+++ b/libxcb/src/xcb_conn.c
@@ -0,0 +1,368 @@
+/* Copyright (C) 2001-2004 Bart Massey and Jamey Sharp.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ * Except as contained in this notice, the names of the authors or their
+ * institutions shall not be used in advertising or otherwise to promote the
+ * sale, use or other dealings in this Software without prior written
+ * authorization from the authors.
+ */
+
+/* Connection management: the core of XCB. */
+
+#include <assert.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <sys/select.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include "xcb.h"
+#include "xcbint.h"
+
+typedef struct {
+    uint8_t  status;
+    uint8_t  pad0[5];
+    uint16_t length;
+} xcb_setup_generic_t;
+
+static const int error_connection = 1;
+
+static int set_fd_flags(const int fd)
+{
+    int flags = fcntl(fd, F_GETFL, 0);
+    if(flags == -1)
+        return 0;
+    flags |= O_NONBLOCK;
+    if(fcntl(fd, F_SETFL, flags) == -1)
+        return 0;
+    if(fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
+        return 0;
+    return 1;
+}
+
+static int _xcb_xlib_init(_xcb_xlib *xlib)
+{
+    xlib->lock = 0;
+#ifndef NDEBUG
+    xlib->sloppy_lock = (getenv("LIBXCB_ALLOW_SLOPPY_LOCK") != 0);
+#endif
+    pthread_cond_init(&xlib->cond, 0);
+    return 1;
+}
+
+static void _xcb_xlib_destroy(_xcb_xlib *xlib)
+{
+    pthread_cond_destroy(&xlib->cond);
+}
+
+static int write_setup(xcb_connection_t *c, xcb_auth_info_t *auth_info)
+{
+    static const char pad[3];
+    xcb_setup_request_t out;
+    struct iovec parts[6];
+    int count = 0;
+    int endian = 0x01020304;
+    int ret;
+
+    memset(&out, 0, sizeof(out));
+
+    /* B = 0x42 = MSB first, l = 0x6c = LSB first */
+    if(htonl(endian) == endian)
+        out.byte_order = 0x42;
+    else
+        out.byte_order = 0x6c;
+    out.protocol_major_version = X_PROTOCOL;
+    out.protocol_minor_version = X_PROTOCOL_REVISION;
+    out.authorization_protocol_name_len = 0;
+    out.authorization_protocol_data_len = 0;
+    parts[count].iov_len = sizeof(xcb_setup_request_t);
+    parts[count++].iov_base = &out;
+    parts[count].iov_len = XCB_PAD(sizeof(xcb_setup_request_t));
+    parts[count++].iov_base = (char *) pad;
+
+    if(auth_info)
+    {
+        parts[count].iov_len = out.authorization_protocol_name_len = auth_info->namelen;
+        parts[count++].iov_base = auth_info->name;
+        parts[count].iov_len = XCB_PAD(out.authorization_protocol_name_len);
+        parts[count++].iov_base = (char *) pad;
+        parts[count].iov_len = out.authorization_protocol_data_len = auth_info->datalen;
+        parts[count++].iov_base = auth_info->data;
+        parts[count].iov_len = XCB_PAD(out.authorization_protocol_data_len);
+        parts[count++].iov_base = (char *) pad;
+    }
+    assert(count <= sizeof(parts) / sizeof(*parts));
+
+    _xcb_lock_io(c);
+    {
+        struct iovec *parts_ptr = parts;
+        ret = _xcb_out_send(c, &parts_ptr, &count);
+    }
+    _xcb_unlock_io(c);
+    return ret;
+}
+
+static int read_setup(xcb_connection_t *c)
+{
+    /* Read the server response */
+    c->setup = malloc(sizeof(xcb_setup_generic_t));
+    if(!c->setup)
+        return 0;
+
+    if(_xcb_in_read_block(c, c->setup, sizeof(xcb_setup_generic_t)) != sizeof(xcb_setup_generic_t))
+        return 0;
+
+    {
+        void *tmp = realloc(c->setup, c->setup->length * 4 + sizeof(xcb_setup_generic_t));
+        if(!tmp)
+            return 0;
+        c->setup = tmp;
+    }
+
+    if(_xcb_in_read_block(c, (char *) c->setup + sizeof(xcb_setup_generic_t), c->setup->length * 4) <= 0)
+        return 0;
+
+    /* 0 = failed, 2 = authenticate, 1 = success */
+    switch(c->setup->status)
+    {
+    case 0: /* failed */
+        {
+            xcb_setup_failed_t *setup = (xcb_setup_failed_t *) c->setup;
+            write(STDERR_FILENO, xcb_setup_failed_reason(setup), xcb_setup_failed_reason_length(setup));
+            return 0;
+        }
+
+    case 2: /* authenticate */
+        {
+            xcb_setup_authenticate_t *setup = (xcb_setup_authenticate_t *) c->setup;
+            write(STDERR_FILENO, xcb_setup_authenticate_reason(setup), xcb_setup_authenticate_reason_length(setup));
+            return 0;
+        }
+    }
+
+    return 1;
+}
+
+/* precondition: there must be something for us to write. */
+static int write_vec(xcb_connection_t *c, struct iovec **vector, int *count)
+{
+    int n;
+    assert(!c->out.queue_len);
+    n = writev(c->fd, *vector, *count);
+    if(n < 0 && errno == EAGAIN)
+        return 1;
+    if(n <= 0)
+    {
+        _xcb_conn_shutdown(c);
+        return 0;
+    }
+
+    for(; *count; --*count, ++*vector)
+    {
+        int cur = (*vector)->iov_len;
+        if(cur > n)
+            cur = n;
+        (*vector)->iov_len -= cur;
+        (*vector)->iov_base = (char *) (*vector)->iov_base + cur;
+        n -= cur;
+        if((*vector)->iov_len)
+            break;
+    }
+    if(!*count)
+        *vector = 0;
+    assert(n == 0);
+    return 1;
+}
+
+/* Public interface */
+
+const xcb_setup_t *xcb_get_setup(xcb_connection_t *c)
+{
+    if(c->has_error)
+        return 0;
+    /* doesn't need locking because it's never written to. */
+    return c->setup;
+}
+
+int xcb_get_file_descriptor(xcb_connection_t *c)
+{
+    if(c->has_error)
+        return -1;
+    /* doesn't need locking because it's never written to. */
+    return c->fd;
+}
+
+int xcb_connection_has_error(xcb_connection_t *c)
+{
+    /* doesn't need locking because it's read and written atomically. */
+    return c->has_error;
+}
+
+xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info)
+{
+    xcb_connection_t* c;
+
+    c = calloc(1, sizeof(xcb_connection_t));
+    if(!c)
+        return (xcb_connection_t *) &error_connection;
+
+    c->fd = fd;
+
+    if(!(
+        set_fd_flags(fd) &&
+        pthread_mutex_init(&c->iolock, 0) == 0 &&
+        _xcb_xlib_init(&c->xlib) &&
+        _xcb_in_init(&c->in) &&
+        _xcb_out_init(&c->out) &&
+        write_setup(c, auth_info) &&
+        read_setup(c) &&
+        _xcb_ext_init(c) &&
+        _xcb_xid_init(c)
+        ))
+    {
+        xcb_disconnect(c);
+        return (xcb_connection_t *) &error_connection;
+    }
+
+    return c;
+}
+
+void xcb_disconnect(xcb_connection_t *c)
+{
+    if(c->has_error)
+        return;
+
+    free(c->setup);
+    close(c->fd);
+
+    pthread_mutex_destroy(&c->iolock);
+    _xcb_xlib_destroy(&c->xlib);
+    _xcb_in_destroy(&c->in);
+    _xcb_out_destroy(&c->out);
+
+    _xcb_ext_destroy(c);
+    _xcb_xid_destroy(c);
+
+    free(c);
+}
+
+/* Private interface */
+
+void _xcb_conn_shutdown(xcb_connection_t *c)
+{
+    c->has_error = 1;
+}
+
+void _xcb_lock_io(xcb_connection_t *c)
+{
+    pthread_mutex_lock(&c->iolock);
+    while(c->xlib.lock)
+    {
+        if(pthread_equal(c->xlib.thread, pthread_self()))
+            break;
+        pthread_cond_wait(&c->xlib.cond, &c->iolock);
+    }
+}
+
+void _xcb_unlock_io(xcb_connection_t *c)
+{
+    pthread_mutex_unlock(&c->iolock);
+}
+
+void _xcb_wait_io(xcb_connection_t *c, pthread_cond_t *cond)
+{
+    int xlib_locked = c->xlib.lock;
+    if(xlib_locked)
+    {
+        c->xlib.lock = 0;
+        pthread_cond_broadcast(&c->xlib.cond);
+    }
+    pthread_cond_wait(cond, &c->iolock);
+    if(xlib_locked)
+    {
+        while(c->xlib.lock)
+            pthread_cond_wait(&c->xlib.cond, &c->iolock);
+        c->xlib.lock = 1;
+        c->xlib.thread = pthread_self();
+    }
+}
+
+int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count)
+{
+    int ret, xlib_locked;
+    fd_set rfds, wfds;
+
+    /* If the thing I should be doing is already being done, wait for it. */
+    if(count ? c->out.writing : c->in.reading)
+    {
+        _xcb_wait_io(c, cond);
+        return 1;
+    }
+
+    FD_ZERO(&rfds);
+    FD_SET(c->fd, &rfds);
+    ++c->in.reading;
+
+    FD_ZERO(&wfds);
+    if(count)
+    {
+        FD_SET(c->fd, &wfds);
+        ++c->out.writing;
+    }
+
+    xlib_locked = c->xlib.lock;
+    if(xlib_locked)
+    {
+        c->xlib.lock = 0;
+        pthread_cond_broadcast(&c->xlib.cond);
+    }
+    _xcb_unlock_io(c);
+    do {
+	ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
+    } while (ret == -1 && errno == EINTR);
+    if (ret < 0)
+    {
+        _xcb_conn_shutdown(c);
+	ret = 0;
+    }
+    _xcb_lock_io(c);
+    if(xlib_locked)
+    {
+        c->xlib.lock = 1;
+        c->xlib.thread = pthread_self();
+    }
+
+    if(ret)
+    {
+        if(FD_ISSET(c->fd, &rfds))
+            ret = ret && _xcb_in_read(c);
+
+        if(FD_ISSET(c->fd, &wfds))
+            ret = ret && write_vec(c, vector, count);
+    }
+
+    if(count)
+        --c->out.writing;
+    --c->in.reading;
+
+    return ret;
+}