X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_util.c;h=d93353b7e563c35a1724dfac7a9b35ec59f089a0;hb=2c8b5994b3fbba343199ef555594a32e29d8bcee;hp=f5c7cecc3ddd6c2eacb7602babcd9616544e236c;hpb=829188cdd6274b5b5271dff5612b30c978a61a38;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_util.c b/src/xcb_util.c
index f5c7cec..d93353b 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -29,6 +29,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <netinet/in.h>
 #ifdef DNETCONN
 #include <netdnet/dnetdb.h>
 #include <netdnet/dn.h>
@@ -44,6 +45,8 @@
 #include "xcbext.h"
 #include "xcbint.h"
 
+static const int error_connection = 1;
+
 int XCBPopcount(CARD32 mask)
 {
     unsigned long y;
@@ -211,11 +214,11 @@ XCBConnection *XCBConnect(const char *displayname, int *screenp)
     XCBAuthInfo auth;
 
     if(!XCBParseDisplay(displayname, &host, &display, screenp))
-        return 0;
+        return (XCBConnection *) &error_connection;
     fd = _xcb_open(host, display);
     free(host);
     if(fd == -1)
-        return 0;
+        return (XCBConnection *) &error_connection;
 
     _xcb_get_auth_info(fd, &auth);
     c = XCBConnectToFD(fd, &auth);
@@ -230,188 +233,11 @@ XCBConnection *XCBConnectToDisplayWithAuthInfo(const char *displayname, XCBAuthI
     char *host;
 
     if(!XCBParseDisplay(displayname, &host, &display, screenp))
-        return 0;
+        return (XCBConnection *) &error_connection;
     fd = _xcb_open(host, display);
     free(host);
     if(fd == -1)
-        return 0;
+        return (XCBConnection *) &error_connection;
 
     return XCBConnectToFD(fd, auth);
 }
-
-/* backwards compatible interfaces: remove before 1.0 release */
-int XCBSync(XCBConnection *c, XCBGenericError **e)
-{
-    XCBGetInputFocusRep *reply = XCBGetInputFocusReply(c, XCBGetInputFocus(c), e);
-    free(reply);
-    return reply != 0;
-}
-
-XCBConnection *XCBConnectBasic()
-{
-    XCBConnection *c = XCBConnect(0, 0);
-    if(c)
-        return c;
-    perror("XCBConnect");
-    abort();
-}
-
-int XCBOpen(const char *host, const int display)
-{
-	return _xcb_open(host, display);
-}
-
-int XCBOpenTCP(const char *host, const unsigned short port)
-{
-	return _xcb_open_tcp(host, port);
-}
-
-int XCBOpenUnix(const char *file)
-{
-	return _xcb_open_unix(file);
-}
-
-int XCBGetAuthInfo(int fd, XCBAuthInfo *info)
-{
-	return _xcb_get_auth_info(fd, info);
-}
-
-char *XCBConnSetupReqAuthorizationProtocolName(XCBSetupReq *R)
-{
-	return XCBSetupReqAuthorizationProtocolName(R);
-}
-
-int XCBConnSetupReqAuthorizationProtocolNameLength(XCBSetupReq *R)
-{
-	return XCBSetupReqAuthorizationProtocolNameLength(R);
-}
-
-XCBGenericIter XCBConnSetupReqAuthorizationProtocolNameEnd(XCBSetupReq *R)
-{
-	return XCBSetupReqAuthorizationProtocolNameEnd(R);
-}
-
-char *XCBConnSetupReqAuthorizationProtocolData(XCBSetupReq *R)
-{
-	return XCBSetupReqAuthorizationProtocolData(R);
-}
-
-int XCBConnSetupReqAuthorizationProtocolDataLength(XCBSetupReq *R)
-{
-	return XCBSetupReqAuthorizationProtocolDataLength(R);
-}
-
-XCBGenericIter XCBConnSetupReqAuthorizationProtocolDataEnd(XCBSetupReq *R)
-{
-	return XCBSetupReqAuthorizationProtocolDataEnd(R);
-}
-
-void XCBConnSetupReqNext(XCBSetupReqIter *i)
-{
-	XCBSetupReqNext(i);
-}
-
-XCBGenericIter XCBConnSetupReqEnd(XCBSetupReqIter i)
-{
-	return XCBSetupReqEnd(i);
-}
-
-char *XCBConnSetupFailedRepReason(XCBSetupFailed *R)
-{
-	return XCBSetupFailedReason(R);
-}
-
-int XCBConnSetupFailedRepReasonLength(XCBSetupFailed *R)
-{
-	return XCBSetupFailedReasonLength(R);
-}
-
-XCBGenericIter XCBConnSetupFailedRepReasonEnd(XCBSetupFailed *R)
-{
-	return XCBSetupFailedReasonEnd(R);
-}
-
-void XCBConnSetupFailedRepNext(XCBSetupFailedIter *i)
-{
-	XCBSetupFailedNext(i);
-}
-
-XCBGenericIter XCBConnSetupFailedRepEnd(XCBSetupFailedIter i)
-{
-	return XCBSetupFailedEnd(i);
-}
-
-char *XCBConnSetupAuthenticateRepReason(XCBSetupAuthenticate *R)
-{
-	return XCBSetupAuthenticateReason(R);
-}
-
-int XCBConnSetupAuthenticateRepReasonLength(XCBSetupAuthenticate *R)
-{
-	return XCBSetupAuthenticateReasonLength(R);
-}
-
-XCBGenericIter XCBConnSetupAuthenticateRepReasonEnd(XCBSetupAuthenticate *R)
-{
-	return XCBSetupAuthenticateReasonEnd(R);
-}
-
-void XCBConnSetupAuthenticateRepNext(XCBSetupAuthenticateIter *i)
-{
-	XCBSetupAuthenticateNext(i);
-}
-
-XCBGenericIter XCBConnSetupAuthenticateRepEnd(XCBSetupAuthenticateIter i)
-{
-	return XCBSetupAuthenticateEnd(i);
-}
-
-char *XCBConnSetupSuccessRepVendor(XCBSetup *R)
-{
-	return XCBSetupVendor(R);
-}
-
-int XCBConnSetupSuccessRepVendorLength(XCBSetup *R)
-{
-	return XCBSetupVendorLength(R);
-}
-
-XCBGenericIter XCBConnSetupSuccessRepVendorEnd(XCBSetup *R)
-{
-	return XCBSetupVendorEnd(R);
-}
-
-XCBFORMAT *XCBConnSetupSuccessRepPixmapFormats(XCBSetup *R)
-{
-	return XCBSetupPixmapFormats(R);
-}
-
-int XCBConnSetupSuccessRepPixmapFormatsLength(XCBSetup *R)
-{
-	return XCBSetupPixmapFormatsLength(R);
-}
-
-XCBFORMATIter XCBConnSetupSuccessRepPixmapFormatsIter(XCBSetup *R)
-{
-	return XCBSetupPixmapFormatsIter(R);
-}
-
-int XCBConnSetupSuccessRepRootsLength(XCBSetup *R)
-{
-	return XCBSetupRootsLength(R);
-}
-
-XCBSCREENIter XCBConnSetupSuccessRepRootsIter(XCBSetup *R)
-{
-	return XCBSetupRootsIter(R);
-}
-
-void XCBConnSetupSuccessRepNext(XCBSetupIter *i)
-{
-	XCBSetupNext(i);
-}
-
-XCBGenericIter XCBConnSetupSuccessRepEnd(XCBSetupIter i)
-{
-	return XCBSetupEnd(i);
-}