tizen 2.4 releasetizen_2.4_mobile_releasesubmit/tizen_2.4/20151028.065550accepted/tizen/2.4/mobile/20151029.025226tizen_2.4accepted/tizen_2.4_mobile

10 files changed, 57 insertions, 864 deletions

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..ce5913e
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,29 @@
+Copyright © 2008 Bart Massey <bart@cs.pdx.edu>
+Copyright © 2008 Ian Osgood <iano@quirkster.com>
+Copyright © 2008 Jamey Sharp <jamey@minilop.net>
+Copyright © 2008 Josh Triplett <josh@freedesktop.org>
+Copyright © 2008-2009 Julien Danjou <julien@danjou.info>
+
+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.
diff --git a/Makefile.am b/Makefile.am
index fbd016c..767fa0e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,3 @@
-
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src
@@ -7,8 +6,7 @@ pkgconfig_DATA =	\
 	xcb-atom.pc	\
 	xcb-aux.pc	\
 	xcb-event.pc	\
-	xcb-util.pc \
-	xcb-renderutil.pc
+	xcb-util.pc
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
@@ -21,3 +19,5 @@ ChangeLog:
 	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog INSTALL
+
+EXTRA_DIST = autogen.sh
diff --git a/NEWS b/NEWS
index 6e05217..a4ba386 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Release 0.3.9 (2012-05-30)
+==========================
+
+- Remove xcb_bitops.h.
+- Do not rely anymore on gperf and m4 following removal of deprecated atoms.
+
 Release 0.3.8 (2010-04-25)
 ==========================
 
diff --git a/autogen.sh b/autogen.sh
index 70429df..904cd67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,12 @@
 #! /bin/sh
-libtoolize --force
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
 autoreconf -v --install || exit 1
-./configure "$@"
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/configure.ac b/configure.ac
index 3272ca0..52da587 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,19 +1,12 @@
-dnl XCB_UTIL_M4_WITH_INCLUDE_PATH requires Autoconf >= 2.62
-AC_PREREQ(2.62)
-AC_INIT([xcb-util],0.3.8,[xcb@lists.freedesktop.org])
+AC_PREREQ(2.59c)
+AC_INIT([xcb-util],0.3.9,[xcb@lists.freedesktop.org])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-XCB_UTIL_M4_WITH_INCLUDE_PATH
 XCB_UTIL_COMMON([1.4], [1.6])
 
-AC_CHECK_PROGS(GPERF, gperf, [no])
-if test $GPERF = "no"; then
-        AC_MSG_ERROR([Can't find gperf, please install it and try again])
-fi
-
 AC_CHECK_FUNCS_ONCE(vasprintf)
 AC_TYPE_SSIZE_T
 
@@ -25,6 +18,5 @@ AC_CONFIG_FILES([Makefile
 		xcb-aux.pc
 		xcb-event.pc
 		xcb-util.pc
-		xcb-renderutil.pc
 		xcb_util_intro])
 AC_OUTPUT
diff --git a/packaging/xcb-util.spec b/packaging/xcb-util.spec
index 6e53c25..5b95d1b 100644
--- a/packaging/xcb-util.spec
+++ b/packaging/xcb-util.spec
@@ -1,7 +1,7 @@
 Name:    xcb-util
 Summary: utility libraries for X C Binding
-Version: 0.3.8
-Release: slp.1.3
+Version: 0.3.9.1
+Release: 1
 Group:   System/Libraries
 License: MIT
 URL:     http://xcb.freedesktop.org/
@@ -42,6 +42,8 @@ make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
+mkdir -p %{buildroot}/usr/share/license
+cp -af COPYING %{buildroot}/usr/share/license/%{name}
 %make_install
 
 %post -p /sbin/ldconfig
@@ -55,7 +57,8 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/libxcb-util.so.0*
+%{_libdir}/libxcb-util.so.1*
+/usr/share/license/%{name}
 
 %files devel
 %defattr(-,root,root,-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 13b5313..2545ad6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,10 @@
-
 lib_LTLIBRARIES = libxcb-util.la
 
 AM_CPPFLAGS = $(XCB_CFLAGS)
 AM_CFLAGS = $(CWARNFLAGS)
 
 libxcb_util_la_LIBADD = $(XCB_LIBS)
-libxcb_util_la_LDFLAGS = -version-info 0:0:0 -no-undefined
+libxcb_util_la_LDFLAGS = -version-info 1:0:0 -no-undefined
 libxcb_util_la_SOURCES = \
 	atoms.c		\
 	event.c		\
@@ -15,19 +14,4 @@ xcbinclude_HEADERS =	\
 	xcb_util.h	\
 	xcb_atom.h	\
 	xcb_aux.h	\
-	xcb_bitops.h	\
 	xcb_event.h
-
-BUILT_SOURCES = atoms.c atoms.gperf xcb_atom.h
-CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = atomlist.m4  atoms.gperf.m4  xcb_atom.h.m4
-
-atoms.c: atoms.gperf
-	$(GPERF) --output-file $@ $<
-
-atoms.gperf: $(srcdir)/atoms.gperf.m4 $(srcdir)/atomlist.m4
-	$(M4) -I$(srcdir) $< >$@
-
-xcb_atom.h: $(srcdir)/xcb_atom.h.m4 $(srcdir)/atomlist.m4
-	$(M4) -I$(srcdir) $< >$@
-
diff --git a/src/atoms.c b/src/atoms.c
index cdd8e38..7b3aec6 100644
--- a/src/atoms.c
+++ b/src/atoms.c
@@ -1,37 +1,3 @@
-/* C code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file atoms.c atoms.gperf  */
-/* Computed positions: -k'3,6,9,$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-#line 1 "atoms.gperf"
-
-
 /* Rely on vasprintf (GNU extension) instead of vsnprintf if
    possible... */
 #ifdef HAVE_VASPRINTF
@@ -44,586 +10,6 @@ error "gperf generated tables don't work with this execution character set. Plea
 #include <stdarg.h>
 #include "xcb_atom.h"
 
-#line 25 "atoms.gperf"
-struct atom_map { int name; xcb_atom_t value; };
-#include <string.h>
-/* maximum key range = 146, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-  static const unsigned char asso_values[] =
-    {
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150,  75,  70,
-       65,  60,  40,  35,  20,   5, 150, 150, 150, 150,
-      150, 150, 150, 150, 150,  35,   0,  45,  15,   0,
-      150,  50,   0,   5, 150, 150,  15,  35,   0,  40,
-        5, 150,  10,  15,   0,  25, 150,  20,  70,  40,
-       55, 150, 150, 150, 150,  15, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
-      150, 150, 150, 150, 150, 150
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[8]];
-      /*FALLTHROUGH*/
-      case 8:
-      case 7:
-      case 6:
-        hval += asso_values[(unsigned char)str[5]];
-      /*FALLTHROUGH*/
-      case 5:
-      case 4:
-      case 3:
-        hval += asso_values[(unsigned char)str[2]];
-        break;
-    }
-  return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-struct stringpool_t
-  {
-    char stringpool_str4[sizeof("FONT")];
-    char stringpool_str6[sizeof("NOTICE")];
-    char stringpool_str9[sizeof("FONT_NAME")];
-    char stringpool_str10[sizeof("POINT")];
-    char stringpool_str11[sizeof("WEIGHT")];
-    char stringpool_str14[sizeof("MIN_SPACE")];
-    char stringpool_str15[sizeof("CAP_HEIGHT")];
-    char stringpool_str16[sizeof("BITMAP")];
-    char stringpool_str17[sizeof("INTEGER")];
-    char stringpool_str19[sizeof("COPYRIGHT")];
-    char stringpool_str24[sizeof("FULL_NAME")];
-    char stringpool_str26[sizeof("STRIKEOUT_ASCENT")];
-    char stringpool_str27[sizeof("STRIKEOUT_DESCENT")];
-    char stringpool_str28[sizeof("RGB_GREEN_MAP")];
-    char stringpool_str29[sizeof("END_SPACE")];
-    char stringpool_str32[sizeof("RGB_BEST_MAP")];
-    char stringpool_str33[sizeof("CARDINAL")];
-    char stringpool_str36[sizeof("CURSOR")];
-    char stringpool_str37[sizeof("WM_CLIENT_MACHINE")];
-    char stringpool_str38[sizeof("WM_HINTS")];
-    char stringpool_str41[sizeof("CUT_BUFFER7")];
-    char stringpool_str42[sizeof("RGB_GRAY_MAP")];
-    char stringpool_str43[sizeof("DRAWABLE")];
-    char stringpool_str45[sizeof("RGB_DEFAULT_MAP")];
-    char stringpool_str46[sizeof("WINDOW")];
-    char stringpool_str47[sizeof("RGB_BLUE_MAP")];
-    char stringpool_str48[sizeof("UNDERLINE_POSITION")];
-    char stringpool_str51[sizeof("RGB_RED_MAP")];
-    char stringpool_str53[sizeof("VISUALID")];
-    char stringpool_str54[sizeof("RECTANGLE")];
-    char stringpool_str56[sizeof("CUT_BUFFER6")];
-    char stringpool_str57[sizeof("WM_NAME")];
-    char stringpool_str58[sizeof("X_HEIGHT")];
-    char stringpool_str61[sizeof("SUBSCRIPT_Y")];
-    char stringpool_str62[sizeof("PRIMARY")];
-    char stringpool_str63[sizeof("COLORMAP")];
-    char stringpool_str64[sizeof("UNDERLINE_THICKNESS")];
-    char stringpool_str65[sizeof("QUAD_WIDTH")];
-    char stringpool_str66[sizeof("RESOURCE_MANAGER")];
-    char stringpool_str67[sizeof("WM_ICON_NAME")];
-    char stringpool_str68[sizeof("RGB_COLOR_MAP")];
-    char stringpool_str70[sizeof("WM_NORMAL_HINTS")];
-    char stringpool_str71[sizeof("CUT_BUFFER5")];
-    char stringpool_str73[sizeof("WM_CLASS")];
-    char stringpool_str75[sizeof("WM_COMMAND")];
-    char stringpool_str76[sizeof("CUT_BUFFER4")];
-    char stringpool_str78[sizeof("SUPERSCRIPT_Y")];
-    char stringpool_str79[sizeof("ATOM")];
-    char stringpool_str80[sizeof("NORM_SPACE")];
-    char stringpool_str81[sizeof("WM_TRANSIENT_FOR")];
-    char stringpool_str82[sizeof("WM_ICON_SIZE")];
-    char stringpool_str83[sizeof("WM_ZOOM_HINTS")];
-    char stringpool_str84[sizeof("MAX_SPACE")];
-    char stringpool_str85[sizeof("POINT_SIZE")];
-    char stringpool_str86[sizeof("PIXMAP")];
-    char stringpool_str90[sizeof("RESOLUTION")];
-    char stringpool_str91[sizeof("SUBSCRIPT_X")];
-    char stringpool_str92[sizeof("ITALIC_ANGLE")];
-    char stringpool_str93[sizeof("ARC")];
-    char stringpool_str96[sizeof("CUT_BUFFER3")];
-    char stringpool_str98[sizeof("WM_SIZE_HINTS")];
-    char stringpool_str101[sizeof("CUT_BUFFER2")];
-    char stringpool_str106[sizeof("CUT_BUFFER1")];
-    char stringpool_str108[sizeof("SUPERSCRIPT_X")];
-    char stringpool_str111[sizeof("CUT_BUFFER0")];
-    char stringpool_str116[sizeof("STRING")];
-    char stringpool_str121[sizeof("FAMILY_NAME")];
-    char stringpool_str149[sizeof("SECONDARY")];
-  };
-static const struct stringpool_t stringpool_contents =
-  {
-    "FONT",
-    "NOTICE",
-    "FONT_NAME",
-    "POINT",
-    "WEIGHT",
-    "MIN_SPACE",
-    "CAP_HEIGHT",
-    "BITMAP",
-    "INTEGER",
-    "COPYRIGHT",
-    "FULL_NAME",
-    "STRIKEOUT_ASCENT",
-    "STRIKEOUT_DESCENT",
-    "RGB_GREEN_MAP",
-    "END_SPACE",
-    "RGB_BEST_MAP",
-    "CARDINAL",
-    "CURSOR",
-    "WM_CLIENT_MACHINE",
-    "WM_HINTS",
-    "CUT_BUFFER7",
-    "RGB_GRAY_MAP",
-    "DRAWABLE",
-    "RGB_DEFAULT_MAP",
-    "WINDOW",
-    "RGB_BLUE_MAP",
-    "UNDERLINE_POSITION",
-    "RGB_RED_MAP",
-    "VISUALID",
-    "RECTANGLE",
-    "CUT_BUFFER6",
-    "WM_NAME",
-    "X_HEIGHT",
-    "SUBSCRIPT_Y",
-    "PRIMARY",
-    "COLORMAP",
-    "UNDERLINE_THICKNESS",
-    "QUAD_WIDTH",
-    "RESOURCE_MANAGER",
-    "WM_ICON_NAME",
-    "RGB_COLOR_MAP",
-    "WM_NORMAL_HINTS",
-    "CUT_BUFFER5",
-    "WM_CLASS",
-    "WM_COMMAND",
-    "CUT_BUFFER4",
-    "SUPERSCRIPT_Y",
-    "ATOM",
-    "NORM_SPACE",
-    "WM_TRANSIENT_FOR",
-    "WM_ICON_SIZE",
-    "WM_ZOOM_HINTS",
-    "MAX_SPACE",
-    "POINT_SIZE",
-    "PIXMAP",
-    "RESOLUTION",
-    "SUBSCRIPT_X",
-    "ITALIC_ANGLE",
-    "ARC",
-    "CUT_BUFFER3",
-    "WM_SIZE_HINTS",
-    "CUT_BUFFER2",
-    "CUT_BUFFER1",
-    "SUPERSCRIPT_X",
-    "CUT_BUFFER0",
-    "STRING",
-    "FAMILY_NAME",
-    "SECONDARY"
-  };
-#define stringpool ((const char *) &stringpool_contents)
-#ifdef __GNUC__
-__inline
-#ifdef __GNUC_STDC_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-const struct atom_map *
-in_word_set (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 68,
-      MIN_WORD_LENGTH = 3,
-      MAX_WORD_LENGTH = 19,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 149
-    };
-
-  static const struct atom_map wordlist[] =
-    {
-      {-1}, {-1}, {-1}, {-1},
-#line 44 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str4,18},
-      {-1},
-#line 88 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str6,62},
-      {-1}, {-1},
-#line 89 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str9,63},
-#line 47 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str10,21},
-#line 84 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str11,58},
-      {-1}, {-1},
-#line 69 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str14,43},
-#line 92 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str15,66},
-#line 31 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str16,5},
-#line 45 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str17,19},
-      {-1},
-#line 87 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str19,61},
-      {-1}, {-1}, {-1}, {-1},
-#line 91 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str24,65},
-      {-1},
-#line 79 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str26,53},
-#line 80 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str27,54},
-#line 55 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str28,29},
-#line 72 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str29,46},
-      {-1}, {-1},
-#line 51 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str32,25},
-#line 32 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str33,6},
-      {-1}, {-1},
-#line 34 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str36,8},
-#line 62 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str37,36},
-#line 61 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str38,35},
-      {-1}, {-1},
-#line 42 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str41,16},
-#line 54 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str42,28},
-#line 43 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str43,17},
-      {-1},
-#line 53 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str45,27},
-#line 59 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str46,33},
-#line 52 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str47,26},
-#line 77 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str48,51},
-      {-1}, {-1},
-#line 56 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str51,30},
-      {-1},
-#line 58 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str53,32},
-#line 48 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str54,22},
-      {-1},
-#line 41 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str56,15},
-#line 65 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str57,39},
-#line 82 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str58,56},
-      {-1}, {-1},
-#line 76 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str61,50},
-#line 27 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str62,1},
-#line 33 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str63,7},
-#line 78 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str64,52},
-#line 83 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str65,57},
-#line 49 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str66,23},
-#line 63 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str67,37},
-#line 50 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str68,24},
-      {-1},
-#line 66 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str70,40},
-#line 40 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str71,14},
-      {-1},
-#line 93 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str73,67},
-      {-1},
-#line 60 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str75,34},
-#line 39 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str76,13},
-      {-1},
-#line 74 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str78,48},
-#line 30 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str79,4},
-#line 70 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str80,44},
-#line 94 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str81,68},
-#line 64 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str82,38},
-#line 68 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str83,42},
-#line 71 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str84,45},
-#line 85 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str85,59},
-#line 46 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str86,20},
-      {-1}, {-1}, {-1},
-#line 86 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str90,60},
-#line 75 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str91,49},
-#line 81 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str92,55},
-#line 29 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str93,3},
-      {-1}, {-1},
-#line 38 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str96,12},
-      {-1},
-#line 67 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str98,41},
-      {-1}, {-1},
-#line 37 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str101,11},
-      {-1}, {-1}, {-1}, {-1},
-#line 36 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str106,10},
-      {-1},
-#line 73 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str108,47},
-      {-1}, {-1},
-#line 35 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str111,9},
-      {-1}, {-1}, {-1}, {-1},
-#line 57 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str116,31},
-      {-1}, {-1}, {-1}, {-1},
-#line 90 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str121,64},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 28 "atoms.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str149,2}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register int o = wordlist[key].name;
-          if (o >= 0)
-            {
-              register const char *s = o + stringpool;
-
-              if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
-                return &wordlist[key];
-            }
-        }
-    }
-  return 0;
-}
-#line 95 "atoms.gperf"
-
-
-static const char atom_names[] =
-	"PRIMARY\0"
-	"SECONDARY\0"
-	"ARC\0"
-	"ATOM\0"
-	"BITMAP\0"
-	"CARDINAL\0"
-	"COLORMAP\0"
-	"CURSOR\0"
-	"CUT_BUFFER0\0"
-	"CUT_BUFFER1\0"
-	"CUT_BUFFER2\0"
-	"CUT_BUFFER3\0"
-	"CUT_BUFFER4\0"
-	"CUT_BUFFER5\0"
-	"CUT_BUFFER6\0"
-	"CUT_BUFFER7\0"
-	"DRAWABLE\0"
-	"FONT\0"
-	"INTEGER\0"
-	"PIXMAP\0"
-	"POINT\0"
-	"RECTANGLE\0"
-	"RESOURCE_MANAGER\0"
-	"RGB_COLOR_MAP\0"
-	"RGB_BEST_MAP\0"
-	"RGB_BLUE_MAP\0"
-	"RGB_DEFAULT_MAP\0"
-	"RGB_GRAY_MAP\0"
-	"RGB_GREEN_MAP\0"
-	"RGB_RED_MAP\0"
-	"STRING\0"
-	"VISUALID\0"
-	"WINDOW\0"
-	"WM_COMMAND\0"
-	"WM_HINTS\0"
-	"WM_CLIENT_MACHINE\0"
-	"WM_ICON_NAME\0"
-	"WM_ICON_SIZE\0"
-	"WM_NAME\0"
-	"WM_NORMAL_HINTS\0"
-	"WM_SIZE_HINTS\0"
-	"WM_ZOOM_HINTS\0"
-	"MIN_SPACE\0"
-	"NORM_SPACE\0"
-	"MAX_SPACE\0"
-	"END_SPACE\0"
-	"SUPERSCRIPT_X\0"
-	"SUPERSCRIPT_Y\0"
-	"SUBSCRIPT_X\0"
-	"SUBSCRIPT_Y\0"
-	"UNDERLINE_POSITION\0"
-	"UNDERLINE_THICKNESS\0"
-	"STRIKEOUT_ASCENT\0"
-	"STRIKEOUT_DESCENT\0"
-	"ITALIC_ANGLE\0"
-	"X_HEIGHT\0"
-	"QUAD_WIDTH\0"
-	"WEIGHT\0"
-	"POINT_SIZE\0"
-	"RESOLUTION\0"
-	"COPYRIGHT\0"
-	"NOTICE\0"
-	"FONT_NAME\0"
-	"FAMILY_NAME\0"
-	"FULL_NAME\0"
-	"CAP_HEIGHT\0"
-	"WM_CLASS\0"
-	"WM_TRANSIENT_FOR\0"
-;
-
-static const uint16_t atom_name_offsets[] = {
-	0,
-	8,
-	18,
-	22,
-	27,
-	34,
-	43,
-	52,
-	59,
-	71,
-	83,
-	95,
-	107,
-	119,
-	131,
-	143,
-	155,
-	164,
-	169,
-	177,
-	184,
-	190,
-	200,
-	217,
-	231,
-	244,
-	257,
-	273,
-	286,
-	300,
-	312,
-	319,
-	328,
-	335,
-	346,
-	355,
-	373,
-	386,
-	399,
-	407,
-	423,
-	437,
-	451,
-	461,
-	472,
-	482,
-	492,
-	506,
-	520,
-	532,
-	544,
-	563,
-	583,
-	600,
-	618,
-	631,
-	640,
-	651,
-	658,
-	669,
-	680,
-	690,
-	697,
-	707,
-	719,
-	729,
-	740,
-	749,
-};
-
-xcb_atom_t xcb_atom_get_predefined(uint16_t name_len, const char *name)
-{
-	const struct atom_map *value = in_word_set(name, name_len);
-	xcb_atom_t ret = XCB_NONE;
-	if(value)
-		ret = value->value;
-	return ret;
-}
-
-const char *xcb_atom_get_name_predefined(xcb_atom_t atom)
-{
-	if(atom <= 0 || atom > (sizeof(atom_name_offsets) / sizeof(*atom_name_offsets)))
-		return 0;
-	return atom_names + atom_name_offsets[atom - 1];
-}
-
 static char *makename(const char *fmt, ...)
 {
 	char *ret;
diff --git a/src/xcb_atom.h b/src/xcb_atom.h
index 27449bd..d5c4d6b 100644
--- a/src/xcb_atom.h
+++ b/src/xcb_atom.h
@@ -7,9 +7,6 @@
 extern "C" {
 #endif
 
-xcb_atom_t xcb_atom_get_predefined(uint16_t name_len, const char *name);
-const char *xcb_atom_get_name_predefined(xcb_atom_t atom);
-
 char *xcb_atom_name_by_screen(const char *base, uint8_t screen);
 char *xcb_atom_name_by_resource(const char *base, uint32_t resource);
 char *xcb_atom_name_unique(const char *base, uint32_t id);
diff --git a/src/xcb_bitops.h b/src/xcb_bitops.h
deleted file mode 100644
index a6872a1..0000000
--- a/src/xcb_bitops.h
+++ /dev/null
@@ -1,212 +0,0 @@
-#ifndef __XCB_BITOPS_H__
-#define __XCB_BITOPS_H__
-
-/* Copyright (C) 2007 Bart Massey
- *
- * 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.
- */
-
-#include <assert.h>
-#include <inttypes.h>
-#include <X11/Xfuncproto.h>
-
-/**
- * @defgroup xcb__bitops XCB Bit Operations
- *
- * Inline functions for common bit ops used in XCB and elsewhere.
- *
- * @{
- */
-
-
-/**
- * Create a low-order bitmask.
- * @param n Mask size.
- * @return Mask.
- *
- * Create a bitmask with the lower @p n bits set and the
- * rest of the word clear.
- * @ingroup xcb__bitops
- */
-_X_INLINE static uint32_t
-xcb_mask(uint32_t n)
-{
-    return n == 32 ? ~0 : (1 << n) - 1;
-}
-
-
-/**
- * Population count.
- * @param n Integer representing a bitset.
- * @return Number of 1 bits in the bitset.
- *
- * This is a reasonably fast algorithm for counting the bits
- * in a 32-bit word.  Currently a classic binary
- * divide-and-conquer popcount: popcount_2() from
- * http://en.wikipedia.org/wiki/Hamming_weight.
- * @ingroup xcb__bitops
- */
-
-
-/* 15 ops, 3 long immediates, 14 stages, 9 alu ops, 9 alu stages */
-_X_INLINE static uint32_t
-xcb_popcount(uint32_t x)
-{
-    uint32_t m1 = 0x55555555;
-    uint32_t m2 = 0x33333333;
-    uint32_t m4 = 0x0f0f0f0f;
-    x -= (x >> 1) & m1;
-    x = (x & m2) + ((x >> 2) & m2);
-    x = (x + (x >> 4)) & m4;
-    x += x >> 8;
-    return (x + (x >> 16)) & 0x3f;
-}
-
-
-/**
- * Round up to the next power-of-two unit size.
- * @param base Number to be rounded up.
- * @param pad Multiple to be rounded to; must be a power of two.
- * @return Rounded-up number.
- *
- * Rounds @p base up to a multiple of @p pad, where @p pad
- * is a power of two.  The more general case is handled by
- * xcb_roundup().
- * @ingroup xcb__bitops
- */
-_X_INLINE static uint32_t
-xcb_roundup_2 (uint32_t base, uint32_t pad)
-{
-    return (base + pad - 1) & -pad;
-}
-
-/**
- * Round down to the next power-of-two unit size.
- * @param base Number to be rounded down.
- * @param pad Multiple to be rounded to; must be a power of two.
- * @return Rounded-down number.
- *
- * Rounds @p base down to a multiple of @p pad, where @p pad
- * is a power of two.  The more general case is handled by
- * xcb_rounddown().
- * @ingroup xcb__bitops
- */
-_X_INLINE static uint32_t
-xcb_rounddown_2 (uint32_t base, uint32_t pad)
-{
-    return base & -pad;
-}
-
-/**
- * Round up to the next unit size.
- * @param base Number to be rounded up.
- * @param pad Multiple to be rounded to.
- * @return Rounded-up number.
- *
- * This is a general routine for rounding @p base up
- * to a multiple of @p pad.  If you know that @p pad
- * is a power of two, you should probably call xcb_roundup_2()
- * instead.
- * @ingroup xcb__bitops
- */
-_X_INLINE static uint32_t
-xcb_roundup (uint32_t base, uint32_t pad)
-{
-    uint32_t b = base + pad - 1;
-    /* faster if pad is a power of two */
-    if (((pad - 1) & pad) == 0)
-	return b & -pad;
-    return b - b % pad;
-}
-
-
-/**
- * Round down to the next unit size.
- * @param base Number to be rounded down.
- * @param pad Multiple to be rounded to.
- * @return Rounded-down number.
- *
- * This is a general routine for rounding @p base down
- * to a multiple of @p pad.  If you know that @p pad
- * is a power of two, you should probably call xcb_rounddown_2()
- * instead.
- * @ingroup xcb__bitops
- */
-_X_INLINE static uint32_t
-xcb_rounddown (uint32_t base, uint32_t pad)
-{
-    /* faster if pad is a power of two */
-    if (((pad - 1) & pad) == 0)
-	return base & -pad;
-    return base - base % pad;
-}
-
-
-/**
- * Reverse bits of word.
- * @param x Target word.
- * @param n Number of low-order bits to reverse.
- * @return Word with low @p n bits reversed, all others 0.
- *
- * Reverses the bottom @p n bits of @p x.
- * @ingroup xcb__bitops
- */
-_X_INLINE static uint32_t
-xcb_bit_reverse(uint32_t x, uint8_t n) {
-    uint32_t m1 = 0x00ff00ff;
-    uint32_t m2 = 0x0f0f0f0f;
-    uint32_t m3 = 0x33333333;
-    uint32_t m4 = 0x55555555;
-    x = ((x << 16) | (x >> 16));
-    x = ((x & m1) << 8) | ((x >> 8) & m1);
-    x = ((x & m2) << 4) | ((x >> 4) & m2);
-    x = ((x & m3) << 2) | ((x >> 2) & m3);
-    x = ((x & m4) << 1) | ((x >> 1) & m4);
-    x >>= 32 - n;
-    return x;
-}
-
-
-/**
- * Host byte order.
- * @return The byte order of the host.
- *
- * Tests the host's byte order and returns either
- * XCB_IMAGE_ORDER_MSB_FIRST or XCB_IMAGE_ORDER_LSB_FIRST
- * as appropriate.
- * @ingroup xcb__bitops
- */
-_X_INLINE static xcb_image_order_t
-xcb_host_byte_order(void) {
-  uint32_t           endian_test = 0x01020304;
-
-  switch (*(char *)&endian_test) {
-  case 0x01:
-      return XCB_IMAGE_ORDER_MSB_FIRST;
-  case 0x04:
-      return XCB_IMAGE_ORDER_LSB_FIRST;
-  }
-  assert(0);
-}
-
-#endif /* __XCB_BITOPS_H__ */