Merge branch 'master' of git://github.com/topcat/xcb-win32
Conflicts: src/xcb_conn.c src/xcb_util.c Signed-off-by: Peter Harris <pharris@opentext.com>
This commit is contained in:
Peter Harris
commit
20da10490f
|
|
@ -35,7 +35,11 @@
|
|||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
#ifndef _WIN32
|
||||
#include <sys/uio.h>
|
||||
#else
|
||||
#include "xcb_windefs.h"
|
||||
#endif
|
||||
#include <pthread.h>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -27,13 +27,18 @@
|
|||
|
||||
#include <assert.h>
|
||||
#include <X11/Xauth.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <sys/un.h>
|
||||
#include <sys/param.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "xcb_windefs.h"
|
||||
#else
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <sys/un.h>
|
||||
#endif /* _WIN32 */
|
||||
|
||||
#include "xcb.h"
|
||||
#include "xcbint.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <netinet/in.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
|
||||
|
|
@ -38,10 +37,16 @@
|
|||
#include "xcbint.h"
|
||||
#if USE_POLL
|
||||
#include <poll.h>
|
||||
#else
|
||||
#elif !defined _WIN32
|
||||
#include <sys/select.h>
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "xcb_windefs.h"
|
||||
#else
|
||||
#include <netinet/in.h>
|
||||
#endif /* _WIN32 */
|
||||
|
||||
/* SHUT_RDWR is fairly recent and is not available on all platforms */
|
||||
#if !defined(SHUT_RDWR)
|
||||
#define SHUT_RDWR 2
|
||||
|
|
@ -57,6 +62,17 @@ static const int error_connection = 1;
|
|||
|
||||
static int set_fd_flags(const int fd)
|
||||
{
|
||||
/* Win32 doesn't have file descriptors and the fcntl function. This block sets the socket in non-blocking mode */
|
||||
|
||||
#ifdef _WIN32
|
||||
u_long iMode = 1; /* non-zero puts it in non-blocking mode, 0 in blocking mode */
|
||||
int ret = 0;
|
||||
|
||||
ret = ioctlsocket(fd, FIONBIO, &iMode);
|
||||
if(ret != 0)
|
||||
return 0;
|
||||
return 1;
|
||||
#else
|
||||
int flags = fcntl(fd, F_GETFL, 0);
|
||||
if(flags == -1)
|
||||
return 0;
|
||||
|
|
@ -66,6 +82,7 @@ static int set_fd_flags(const int fd)
|
|||
if(fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
|
||||
return 0;
|
||||
return 1;
|
||||
#endif /* _WIN32 */
|
||||
}
|
||||
|
||||
static int write_setup(xcb_connection_t *c, xcb_auth_info_t *auth_info)
|
||||
|
|
@ -158,9 +175,37 @@ static int write_vec(xcb_connection_t *c, struct iovec **vector, int *count)
|
|||
{
|
||||
int n;
|
||||
assert(!c->out.queue_len);
|
||||
|
||||
#ifdef _WIN32
|
||||
int i = 0;
|
||||
int ret = 0,err = 0;
|
||||
struct iovec *vec;
|
||||
n = 0;
|
||||
|
||||
/* Could use the WSASend win32 function for scatter/gather i/o but setting up the WSABUF struct from
|
||||
an iovec would require more work and I'm not sure of the benefit....works for now */
|
||||
vec = *vector;
|
||||
while(i < *count)
|
||||
{
|
||||
ret = send(c->fd,vec->iov_base,vec->iov_len,0);
|
||||
if(ret == SOCKET_ERROR)
|
||||
{
|
||||
err = WSAGetLastError();
|
||||
if(err == WSAEWOULDBLOCK)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
n += ret;
|
||||
*vec++;
|
||||
i++;
|
||||
}
|
||||
#else
|
||||
n = writev(c->fd, *vector, *count);
|
||||
if(n < 0 && errno == EAGAIN)
|
||||
return 1;
|
||||
#endif /* _WIN32 */
|
||||
|
||||
if(n <= 0)
|
||||
{
|
||||
_xcb_conn_shutdown(c);
|
||||
|
|
|
|||
32
src/xcb_in.c
32
src/xcb_in.c
|
|
@ -37,14 +37,25 @@
|
|||
#include "xcbint.h"
|
||||
#if USE_POLL
|
||||
#include <poll.h>
|
||||
#else
|
||||
#include <sys/select.h>
|
||||
#endif
|
||||
#ifndef _WIN32
|
||||
#include <sys/select.h>
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "xcb_windefs.h"
|
||||
#endif /* _WIN32 */
|
||||
|
||||
#define XCB_ERROR 0
|
||||
#define XCB_REPLY 1
|
||||
#define XCB_XGE_EVENT 35
|
||||
|
||||
/* required for compiling for Win32 using MinGW */
|
||||
#ifndef MSG_WAITALL
|
||||
#define MSG_WAITALL 0
|
||||
#endif
|
||||
|
||||
struct event_list {
|
||||
xcb_generic_event_t *event;
|
||||
struct event_list *next;
|
||||
|
|
@ -255,10 +266,14 @@ static int read_block(const int fd, void *buf, const ssize_t len)
|
|||
int done = 0;
|
||||
while(done < len)
|
||||
{
|
||||
int ret = read(fd, ((char *) buf) + done, len - done);
|
||||
int ret = recv(fd, ((char *) buf) + done, len - done,MSG_WAITALL);
|
||||
if(ret > 0)
|
||||
done += ret;
|
||||
#ifndef _WIN32
|
||||
if(ret < 0 && errno == EAGAIN)
|
||||
#else
|
||||
if(ret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK)
|
||||
#endif /* !_Win32 */
|
||||
{
|
||||
#if USE_POLL
|
||||
struct pollfd pfd;
|
||||
|
|
@ -272,10 +287,13 @@ static int read_block(const int fd, void *buf, const ssize_t len)
|
|||
fd_set fds;
|
||||
FD_ZERO(&fds);
|
||||
FD_SET(fd, &fds);
|
||||
|
||||
/* Initializing errno here makes sure that for Win32 this loop will execute only once */
|
||||
errno = 0;
|
||||
do {
|
||||
ret = select(fd + 1, &fds, 0, 0, 0);
|
||||
} while (ret == -1 && errno == EINTR);
|
||||
#endif
|
||||
#endif /* USE_POLL */
|
||||
}
|
||||
if(ret <= 0)
|
||||
return ret;
|
||||
|
|
@ -663,12 +681,16 @@ void _xcb_in_replies_done(xcb_connection_t *c)
|
|||
|
||||
int _xcb_in_read(xcb_connection_t *c)
|
||||
{
|
||||
int n = read(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len);
|
||||
int n = recv(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len,MSG_WAITALL);
|
||||
if(n > 0)
|
||||
c->in.queue_len += n;
|
||||
while(read_packet(c))
|
||||
/* empty */;
|
||||
#ifndef _WIN32
|
||||
if((n > 0) || (n < 0 && errno == EAGAIN))
|
||||
#else
|
||||
if((n > 0) || (n < 0 && WSAGetLastError() == WSAEWOULDBLOCK))
|
||||
#endif /* !_WIN32 */
|
||||
return 1;
|
||||
_xcb_conn_shutdown(c);
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -27,24 +27,29 @@
|
|||
|
||||
#include <assert.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <limits.h>
|
||||
#include <sys/un.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/tcp.h>
|
||||
#ifdef DNETCONN
|
||||
#include <netdnet/dnetdb.h>
|
||||
#include <netdnet/dn.h>
|
||||
#endif
|
||||
#include <netdb.h>
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stddef.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "xcb_windefs.h"
|
||||
#else
|
||||
#include <sys/socket.h>
|
||||
#include <sys/un.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/tcp.h>
|
||||
#include <fcntl.h>
|
||||
#include <netdb.h>
|
||||
#endif /* _WIN32 */
|
||||
|
||||
#include "xcb.h"
|
||||
#include "xcbext.h"
|
||||
#include "xcbint.h"
|
||||
|
|
@ -139,7 +144,9 @@ int xcb_parse_display(const char *name, char **host, int *displayp,
|
|||
}
|
||||
|
||||
static int _xcb_open_tcp(const char *host, char *protocol, const unsigned short port);
|
||||
#ifndef _WIN32
|
||||
static int _xcb_open_unix(char *protocol, const char *file);
|
||||
#endif /* !WIN32 */
|
||||
#ifdef DNETCONN
|
||||
static int _xcb_open_decnet(const char *host, char *protocol, const unsigned short port);
|
||||
#endif
|
||||
|
|
@ -188,6 +195,7 @@ static int _xcb_open(const char *host, char *protocol, const int display)
|
|||
}
|
||||
}
|
||||
|
||||
#ifndef _WIN32
|
||||
filelen = strlen(base) + 1 + sizeof(display) * 3 + 1;
|
||||
file = malloc(filelen);
|
||||
if(file == NULL)
|
||||
|
|
@ -220,6 +228,8 @@ static int _xcb_open(const char *host, char *protocol, const int display)
|
|||
free(file);
|
||||
|
||||
return fd;
|
||||
#endif /* !_WIN32 */
|
||||
return -1; /* if control reaches here then something has gone wrong */
|
||||
}
|
||||
|
||||
static int _xcb_socket(int family, int type, int proto)
|
||||
|
|
@ -232,8 +242,10 @@ static int _xcb_socket(int family, int type, int proto)
|
|||
#endif
|
||||
{
|
||||
fd = socket(family, type, proto);
|
||||
#ifndef _WIN32
|
||||
if (fd >= 0)
|
||||
fcntl(fd, F_SETFD, FD_CLOEXEC);
|
||||
#endif
|
||||
}
|
||||
return fd;
|
||||
}
|
||||
|
|
@ -340,6 +352,7 @@ static int _xcb_open_tcp(const char *host, char *protocol, const unsigned short
|
|||
return fd;
|
||||
}
|
||||
|
||||
#ifndef _WIN32
|
||||
static int _xcb_open_unix(char *protocol, const char *file)
|
||||
{
|
||||
int fd;
|
||||
|
|
@ -362,6 +375,7 @@ static int _xcb_open_unix(char *protocol, const char *file)
|
|||
}
|
||||
return fd;
|
||||
}
|
||||
#endif /* !_WIN32 */
|
||||
|
||||
#ifdef HAVE_ABSTRACT_SOCKETS
|
||||
static int _xcb_open_abstract(char *protocol, const char *file, size_t filelen)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
/* Copyright (C) 2009 Jatin Golani.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef _XCB_WINDEFS_H
|
||||
#define _XCB_WINDEFS_H
|
||||
|
||||
#ifndef WINVER
|
||||
#define WINVER 0x0501 /* required for getaddrinfo/freeaddrinfo defined only for WinXP and above */
|
||||
#endif
|
||||
|
||||
#include <winsock2.h>
|
||||
#include <ws2tcpip.h>
|
||||
#include <windef.h>
|
||||
|
||||
struct iovec {
|
||||
void *iov_base; /* Pointer to data. */
|
||||
int iov_len; /* Length of data. */
|
||||
};
|
||||
|
||||
typedef unsigned int in_addr_t;
|
||||
|
||||
#endif /* xcb_windefs.h */
|
||||
Loading…
Reference in New Issue