randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver

git update 31 Aug 2012

1 files changed, 101 insertions, 97 deletions

diff --git a/libxcb/src/xcb_xid.c b/libxcb/src/xcb_xid.c
index 364662bc1..79a9a27de 100644
--- a/libxcb/src/xcb_xid.c
+++ b/libxcb/src/xcb_xid.c
@@ -1,97 +1,101 @@
-/* Copyright (C) 2001-2008 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.

- */

-

-/* XID allocators. */

-

-#include <assert.h>

-#include <stdlib.h>

-#include "xcb.h"

-#include "xcbext.h"

-#include "xcbint.h"

-#include "xc_misc.h"

-

-/* Public interface */

-

-uint32_t xcb_generate_id(xcb_connection_t *c)

-{

-    uint32_t ret;

-    if(c->has_error)

-        return -1;

-    pthread_mutex_lock(&c->xid.lock);

-    if(c->xid.last >= c->xid.max - c->xid.inc + 1)

-    {

-        xcb_xc_misc_get_xid_range_reply_t *range;

-        assert(c->xid.last == c->xid.max);

-        if (c->xid.last == 0) {

-            /* finish setting up initial range */

-            c->xid.max = c->setup->resource_id_mask;

-        } else {

-            /* check for extension */

-            const xcb_query_extension_reply_t *xc_misc_reply =

-              xcb_get_extension_data(c, &xcb_xc_misc_id);

-            if (!xc_misc_reply) {

-                pthread_mutex_unlock(&c->xid.lock);

-                return -1;

-            }

-            /* get new range */

-            range = xcb_xc_misc_get_xid_range_reply(c,

-                      xcb_xc_misc_get_xid_range(c), 0);

-            /* XXX The latter disjunct is what the server returns

-               when it is out of XIDs.  Sweet. */

-            if(!range || (range->start_id == 0 && range->count == 1))

-            {

-                pthread_mutex_unlock(&c->xid.lock);

-                return -1;

-            }

-            assert(range->count > 0 && range->start_id > 0);

-            c->xid.last = range->start_id;

-            c->xid.max = range->start_id + (range->count - 1) * c->xid.inc;

-            free(range);

-        }

-    } else {

-        c->xid.last += c->xid.inc;

-    }

-    ret = c->xid.last | c->xid.base;

-    pthread_mutex_unlock(&c->xid.lock);

-    return ret;

-}

-

-/* Private interface */

-

-int _xcb_xid_init(xcb_connection_t *c)

-{

-    if(pthread_mutex_init(&c->xid.lock, 0))

-        return 0;

-    c->xid.last = 0;

-    c->xid.max = 0;

-    c->xid.base = c->setup->resource_id_base;

-    c->xid.inc = c->setup->resource_id_mask & -(c->setup->resource_id_mask);

-    return 1;

-}

-

-void _xcb_xid_destroy(xcb_connection_t *c)

-{

-    pthread_mutex_destroy(&c->xid.lock);

-}

+/* Copyright (C) 2001-2008 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.
+ */
+
+/* XID allocators. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <assert.h>
+#include <stdlib.h>
+#include "xcb.h"
+#include "xcbext.h"
+#include "xcbint.h"
+#include "xc_misc.h"
+
+/* Public interface */
+
+uint32_t xcb_generate_id(xcb_connection_t *c)
+{
+    uint32_t ret;
+    if(c->has_error)
+        return -1;
+    pthread_mutex_lock(&c->xid.lock);
+    if(c->xid.last >= c->xid.max - c->xid.inc + 1)
+    {
+        xcb_xc_misc_get_xid_range_reply_t *range;
+        assert(c->xid.last == c->xid.max);
+        if (c->xid.last == 0) {
+            /* finish setting up initial range */
+            c->xid.max = c->setup->resource_id_mask;
+        } else {
+            /* check for extension */
+            const xcb_query_extension_reply_t *xc_misc_reply =
+              xcb_get_extension_data(c, &xcb_xc_misc_id);
+            if (!xc_misc_reply) {
+                pthread_mutex_unlock(&c->xid.lock);
+                return -1;
+            }
+            /* get new range */
+            range = xcb_xc_misc_get_xid_range_reply(c,
+                      xcb_xc_misc_get_xid_range(c), 0);
+            /* XXX The latter disjunct is what the server returns
+               when it is out of XIDs.  Sweet. */
+            if(!range || (range->start_id == 0 && range->count == 1))
+            {
+                pthread_mutex_unlock(&c->xid.lock);
+                return -1;
+            }
+            assert(range->count > 0 && range->start_id > 0);
+            c->xid.last = range->start_id;
+            c->xid.max = range->start_id + (range->count - 1) * c->xid.inc;
+            free(range);
+        }
+    } else {
+        c->xid.last += c->xid.inc;
+    }
+    ret = c->xid.last | c->xid.base;
+    pthread_mutex_unlock(&c->xid.lock);
+    return ret;
+}
+
+/* Private interface */
+
+int _xcb_xid_init(xcb_connection_t *c)
+{
+    if(pthread_mutex_init(&c->xid.lock, 0))
+        return 0;
+    c->xid.last = 0;
+    c->xid.max = 0;
+    c->xid.base = c->setup->resource_id_base;
+    c->xid.inc = c->setup->resource_id_mask & -(c->setup->resource_id_mask);
+    return 1;
+}
+
+void _xcb_xid_destroy(xcb_connection_t *c)
+{
+    pthread_mutex_destroy(&c->xid.lock);
+}