Jay Sorg
12 years ago
parent
bb19b8ed57
commit
058e2ecd28
@ -0,0 +1,415 @@
|
||||
/*
|
||||
Copyright 2005-2013 Jay Sorg
|
||||
|
||||
Permission to use, copy, modify, distribute, and sell this software and its
|
||||
documentation for any purpose is hereby granted without fee, provided that
|
||||
the above copyright notice appear in all copies and that both that
|
||||
copyright notice and this permission notice appear in supporting
|
||||
documentation.
|
||||
|
||||
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
|
||||
OPEN GROUP 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.
|
||||
|
||||
the rest
|
||||
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/un.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/stat.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/tcp.h>
|
||||
|
||||
/* this should be before all X11 .h files */
|
||||
#include <xorg-server.h>
|
||||
|
||||
/* all driver need this */
|
||||
#include <xf86.h>
|
||||
#include <xf86_OSproc.h>
|
||||
|
||||
/******************************************************************************/
|
||||
int
|
||||
rdpBitsPerPixel(int depth)
|
||||
{
|
||||
if (depth == 1)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
else if (depth <= 8)
|
||||
{
|
||||
return 8;
|
||||
}
|
||||
else if (depth <= 16)
|
||||
{
|
||||
return 16;
|
||||
}
|
||||
else
|
||||
{
|
||||
return 32;
|
||||
}
|
||||
}
|
||||
|
||||
/* the g_ functions from os_calls.c */
|
||||
|
||||
/*****************************************************************************/
|
||||
int
|
||||
g_tcp_recv(int sck, void *ptr, int len, int flags)
|
||||
{
|
||||
return recv(sck, ptr, len, flags);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void
|
||||
g_tcp_close(int sck)
|
||||
{
|
||||
if (sck == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
shutdown(sck, 2);
|
||||
close(sck);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int
|
||||
g_tcp_last_error_would_block(int sck)
|
||||
{
|
||||
return (errno == EWOULDBLOCK) || (errno == EINPROGRESS);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void
|
||||
g_sleep(int msecs)
|
||||
{
|
||||
usleep(msecs * 1000);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int
|
||||
g_tcp_send(int sck, void *ptr, int len, int flags)
|
||||
{
|
||||
return send(sck, ptr, len, flags);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void *
|
||||
g_malloc(int size, int zero)
|
||||
{
|
||||
char *rv;
|
||||
|
||||
rv = (char *)malloc(size);
|
||||
if (zero)
|
||||
{
|
||||
if (rv != 0)
|
||||
{
|
||||
memset(rv, 0, size);
|
||||
}
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void
|
||||
g_free(void *ptr)
|
||||
{
|
||||
if (ptr != 0)
|
||||
{
|
||||
free(ptr);
|
||||
}
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void
|
||||
g_sprintf(char *dest, char *format, ...)
|
||||
{
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, format);
|
||||
vsprintf(dest, format, ap);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int
|
||||
g_tcp_socket(void)
|
||||
{
|
||||
int rv;
|
||||
int i;
|
||||
|
||||
i = 1;
|
||||
rv = socket(PF_INET, SOCK_STREAM, 0);
|
||||
setsockopt(rv, IPPROTO_TCP, TCP_NODELAY, (void *)&i, sizeof(i));
|
||||
setsockopt(rv, SOL_SOCKET, SO_REUSEADDR, (void *)&i, sizeof(i));
|
||||
return rv;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int
|
||||
g_tcp_local_socket_dgram(void)
|
||||
{
|
||||
return socket(AF_UNIX, SOCK_DGRAM, 0);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int
|
||||
g_tcp_local_socket_stream(void)
|
||||
{
|
||||
return socket(AF_UNIX, SOCK_STREAM, 0);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void
|
||||
g_memcpy(void *d_ptr, const void *s_ptr, int size)
|
||||
{
|
||||
memcpy(d_ptr, s_ptr, size);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void
|
||||
g_memset(void *d_ptr, const unsigned char chr, int size)
|
||||
{
|
||||
memset(d_ptr, chr, size);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int
|
||||
g_tcp_set_no_delay(int sck)
|
||||
{
|
||||
int i;
|
||||
|
||||
i = 1;
|
||||
setsockopt(sck, IPPROTO_TCP, TCP_NODELAY, (void *)&i, sizeof(i));
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int
|
||||
g_tcp_set_non_blocking(int sck)
|
||||
{
|
||||
unsigned long i;
|
||||
|
||||
i = fcntl(sck, F_GETFL);
|
||||
i = i | O_NONBLOCK;
|
||||
fcntl(sck, F_SETFL, i);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int
|
||||
g_tcp_accept(int sck)
|
||||
{
|
||||
struct sockaddr_in s;
|
||||
unsigned int i;
|
||||
|
||||
i = sizeof(struct sockaddr_in);
|
||||
memset(&s, 0, i);
|
||||
return accept(sck, (struct sockaddr *)&s, &i);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int
|
||||
g_tcp_select(int sck1, int sck2, int sck3)
|
||||
{
|
||||
fd_set rfds;
|
||||
struct timeval time;
|
||||
int max;
|
||||
int rv;
|
||||
|
||||
time.tv_sec = 0;
|
||||
time.tv_usec = 0;
|
||||
FD_ZERO(&rfds);
|
||||
|
||||
if (sck1 > 0)
|
||||
{
|
||||
FD_SET(((unsigned int)sck1), &rfds);
|
||||
}
|
||||
|
||||
if (sck2 > 0)
|
||||
{
|
||||
FD_SET(((unsigned int)sck2), &rfds);
|
||||
}
|
||||
|
||||
if (sck3 > 0)
|
||||
{
|
||||
FD_SET(((unsigned int)sck3), &rfds);
|
||||
}
|
||||
|
||||
max = sck1;
|
||||
|
||||
if (sck2 > max)
|
||||
{
|
||||
max = sck2;
|
||||
}
|
||||
|
||||
if (sck3 > max)
|
||||
{
|
||||
max = sck3;
|
||||
}
|
||||
|
||||
rv = select(max + 1, &rfds, 0, 0, &time);
|
||||
|
||||
if (rv > 0)
|
||||
{
|
||||
rv = 0;
|
||||
|
||||
if (FD_ISSET(((unsigned int)sck1), &rfds))
|
||||
{
|
||||
rv = rv | 1;
|
||||
}
|
||||
|
||||
if (FD_ISSET(((unsigned int)sck2), &rfds))
|
||||
{
|
||||
rv = rv | 2;
|
||||
}
|
||||
|
||||
if (FD_ISSET(((unsigned int)sck3), &rfds))
|
||||
{
|
||||
rv = rv | 4;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
rv = 0;
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int
|
||||
g_tcp_bind(int sck, char *port)
|
||||
{
|
||||
struct sockaddr_in s;
|
||||
|
||||
memset(&s, 0, sizeof(struct sockaddr_in));
|
||||
s.sin_family = AF_INET;
|
||||
s.sin_port = htons(atoi(port));
|
||||
s.sin_addr.s_addr = INADDR_ANY;
|
||||
return bind(sck, (struct sockaddr *)&s, sizeof(struct sockaddr_in));
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int
|
||||
g_tcp_local_bind(int sck, char *port)
|
||||
{
|
||||
struct sockaddr_un s;
|
||||
|
||||
memset(&s, 0, sizeof(struct sockaddr_un));
|
||||
s.sun_family = AF_UNIX;
|
||||
strcpy(s.sun_path, port);
|
||||
return bind(sck, (struct sockaddr *)&s, sizeof(struct sockaddr_un));
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int
|
||||
g_tcp_listen(int sck)
|
||||
{
|
||||
return listen(sck, 2);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/* returns boolean */
|
||||
int
|
||||
g_create_dir(const char *dirname)
|
||||
{
|
||||
return mkdir(dirname, (mode_t) - 1) == 0;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/* returns boolean, non zero if the directory exists */
|
||||
int
|
||||
g_directory_exist(const char *dirname)
|
||||
{
|
||||
struct stat st;
|
||||
|
||||
if (stat(dirname, &st) == 0)
|
||||
{
|
||||
return S_ISDIR(st.st_mode);
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/* returns error */
|
||||
int
|
||||
g_chmod_hex(const char *filename, int flags)
|
||||
{
|
||||
int fl;
|
||||
|
||||
fl = 0;
|
||||
fl |= (flags & 0x4000) ? S_ISUID : 0;
|
||||
fl |= (flags & 0x2000) ? S_ISGID : 0;
|
||||
fl |= (flags & 0x1000) ? S_ISVTX : 0;
|
||||
fl |= (flags & 0x0400) ? S_IRUSR : 0;
|
||||
fl |= (flags & 0x0200) ? S_IWUSR : 0;
|
||||
fl |= (flags & 0x0100) ? S_IXUSR : 0;
|
||||
fl |= (flags & 0x0040) ? S_IRGRP : 0;
|
||||
fl |= (flags & 0x0020) ? S_IWGRP : 0;
|
||||
fl |= (flags & 0x0010) ? S_IXGRP : 0;
|
||||
fl |= (flags & 0x0004) ? S_IROTH : 0;
|
||||
fl |= (flags & 0x0002) ? S_IWOTH : 0;
|
||||
fl |= (flags & 0x0001) ? S_IXOTH : 0;
|
||||
return chmod(filename, fl);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/* produce a hex dump */
|
||||
void
|
||||
g_hexdump(unsigned char *p, unsigned int len)
|
||||
{
|
||||
unsigned char *line;
|
||||
int i;
|
||||
int thisline;
|
||||
int offset;
|
||||
|
||||
offset = 0;
|
||||
line = p;
|
||||
|
||||
while (offset < len)
|
||||
{
|
||||
ErrorF("%04x ", offset);
|
||||
thisline = len - offset;
|
||||
|
||||
if (thisline > 16)
|
||||
{
|
||||
thisline = 16;
|
||||
}
|
||||
|
||||
for (i = 0; i < thisline; i++)
|
||||
{
|
||||
ErrorF("%02x ", line[i]);
|
||||
}
|
||||
|
||||
for (; i < 16; i++)
|
||||
{
|
||||
ErrorF(" ");
|
||||
}
|
||||
|
||||
for (i = 0; i < thisline; i++)
|
||||
{
|
||||
ErrorF("%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.');
|
||||
}
|
||||
|
||||
ErrorF("\n");
|
||||
offset += thisline;
|
||||
line += thisline;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,78 @@
|
||||
/*
|
||||
Copyright 2005-2013 Jay Sorg
|
||||
|
||||
Permission to use, copy, modify, distribute, and sell this software and its
|
||||
documentation for any purpose is hereby granted without fee, provided that
|
||||
the above copyright notice appear in all copies and that both that
|
||||
copyright notice and this permission notice appear in supporting
|
||||
documentation.
|
||||
|
||||
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
|
||||
OPEN GROUP 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.
|
||||
|
||||
the rest
|
||||
|
||||
*/
|
||||
|
||||
#ifndef __RDPMISC_H
|
||||
#define __RDPMISC_H
|
||||
|
||||
int
|
||||
rdpBitsPerPixel(int depth);
|
||||
int
|
||||
g_tcp_recv(int sck, void *ptr, int len, int flags);
|
||||
void
|
||||
g_tcp_close(int sck);
|
||||
int
|
||||
g_tcp_last_error_would_block(int sck);
|
||||
void
|
||||
g_sleep(int msecs);
|
||||
int
|
||||
g_tcp_send(int sck, void *ptr, int len, int flags);
|
||||
void *
|
||||
g_malloc(int size, int zero);
|
||||
void
|
||||
g_free(void *ptr);
|
||||
void
|
||||
g_sprintf(char *dest, char *format, ...);
|
||||
int
|
||||
g_tcp_socket(void);
|
||||
int
|
||||
g_tcp_local_socket_dgram(void);
|
||||
int
|
||||
g_tcp_local_socket_stream(void);
|
||||
void
|
||||
g_memcpy(void *d_ptr, const void *s_ptr, int size);
|
||||
void
|
||||
g_memset(void *d_ptr, const unsigned char chr, int size);
|
||||
int
|
||||
g_tcp_set_no_delay(int sck);
|
||||
int
|
||||
g_tcp_set_non_blocking(int sck);
|
||||
int
|
||||
g_tcp_accept(int sck);
|
||||
int
|
||||
g_tcp_select(int sck1, int sck2, int sck3);
|
||||
int
|
||||
g_tcp_bind(int sck, char *port);
|
||||
int
|
||||
g_tcp_local_bind(int sck, char *port);
|
||||
int
|
||||
g_tcp_listen(int sck);
|
||||
int
|
||||
g_create_dir(const char *dirname);
|
||||
int
|
||||
g_directory_exist(const char *dirname);
|
||||
int
|
||||
g_chmod_hex(const char *filename, int flags);
|
||||
void
|
||||
g_hexdump(unsigned char *p, unsigned int len);
|
||||
|
||||
#endif
|
||||
@ -0,0 +1,233 @@
|
||||
/*
|
||||
Copyright 2013 Jay Sorg
|
||||
|
||||
Permission to use, copy, modify, distribute, and sell this software and its
|
||||
documentation for any purpose is hereby granted without fee, provided that
|
||||
the above copyright notice appear in all copies and that both that
|
||||
copyright notice and this permission notice appear in supporting
|
||||
documentation.
|
||||
|
||||
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
|
||||
OPEN GROUP 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.
|
||||
|
||||
to deal with regions changing in xorg versions
|
||||
|
||||
*/
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
/* this should be before all X11 .h files */
|
||||
#include <xorg-server.h>
|
||||
|
||||
/* all driver need this */
|
||||
#include <xf86.h>
|
||||
#include <xf86_OSproc.h>
|
||||
|
||||
/*
|
||||
miRegionCopy -> RegionCopy
|
||||
miTranslateRegion -> RegionTranslate
|
||||
miRegionNotEmpty -> RegionNotEmpty
|
||||
miIntersect -> RegionIntersect
|
||||
miRectIn -> RegionContainsRect
|
||||
miRegionInit -> RegionInit
|
||||
miRegionUninit -> RegionUninit
|
||||
miRectsToRegion -> RegionFromRects
|
||||
miRegionDestroy -> RegionDestroy
|
||||
miRegionCreate -> RegionCreate
|
||||
miUnion -> RegionUnion
|
||||
miRegionExtents -> RegionExtents
|
||||
miRegionReset -> RegionReset
|
||||
miRegionBreak -> RegionBreak
|
||||
*/
|
||||
|
||||
#if XORG_VERSION_CURRENT < (((1) * 10000000) + ((9) * 100000) + ((0) * 1000) + 0)
|
||||
/* 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8 */
|
||||
#define XRDP_REG 1
|
||||
#else
|
||||
/* 1.9, 1.10, 1.11, 1.12 */
|
||||
#define XRDP_REG 2
|
||||
#endif
|
||||
|
||||
/*****************************************************************************/
|
||||
Bool
|
||||
rdpRegionCopy(RegionPtr dst, RegionPtr src)
|
||||
{
|
||||
#if XRDP_REG == 1
|
||||
return miRegionCopy(dst, src);
|
||||
#else
|
||||
return RegionCopy(dst, src);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void
|
||||
rdpRegionTranslate(RegionPtr pReg, int x, int y)
|
||||
{
|
||||
#if XRDP_REG == 1
|
||||
miTranslateRegion(pReg, x, y);
|
||||
#else
|
||||
RegionTranslate(pReg, x, y);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
Bool
|
||||
rdpRegionNotEmpty(RegionPtr pReg)
|
||||
{
|
||||
#if XRDP_REG == 1
|
||||
return miRegionNotEmpty(pReg);
|
||||
#else
|
||||
return RegionNotEmpty(pReg);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
Bool
|
||||
rdpRegionIntersect(RegionPtr newReg, RegionPtr reg1, RegionPtr reg2)
|
||||
{
|
||||
#if XRDP_REG == 1
|
||||
return miIntersect(newReg, reg1, reg2);
|
||||
#else
|
||||
return RegionIntersect(newReg, reg1, reg2);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int
|
||||
rdpRegionContainsRect(RegionPtr region, BoxPtr prect)
|
||||
{
|
||||
#if XRDP_REG == 1
|
||||
return miRectIn(region, prect);
|
||||
#else
|
||||
return RegionContainsRect(region, prect);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void
|
||||
rdpRegionInit(RegionPtr pReg, BoxPtr rect, int size)
|
||||
{
|
||||
#if XRDP_REG == 1
|
||||
miRegionInit(pReg, rect, size);
|
||||
#else
|
||||
RegionInit(pReg, rect, size);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void
|
||||
rdpRegionUninit(RegionPtr pReg)
|
||||
{
|
||||
#if XRDP_REG == 1
|
||||
miRegionUninit(pReg);
|
||||
#else
|
||||
RegionUninit(pReg);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
RegionPtr
|
||||
rdpRegionFromRects(int nrects, xRectanglePtr prect, int ctype)
|
||||
{
|
||||
#if XRDP_REG == 1
|
||||
return miRectsToRegion(nrects, prect, ctype);
|
||||
#else
|
||||
return RegionFromRects(nrects, prect, ctype);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void
|
||||
rdpRegionDestroy(RegionPtr pReg)
|
||||
{
|
||||
#if XRDP_REG == 1
|
||||
miRegionDestroy(pReg);
|
||||
#else
|
||||
RegionDestroy(pReg);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
RegionPtr
|
||||
rdpRegionCreate(BoxPtr rect, int size)
|
||||
{
|
||||
#if XRDP_REG == 1
|
||||
return miRegionCreate(rect, size);
|
||||
#else
|
||||
return RegionCreate(rect, size);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
Bool
|
||||
rdpRegionUnion(RegionPtr newReg, RegionPtr reg1, RegionPtr reg2)
|
||||
{
|
||||
#if XRDP_REG == 1
|
||||
return miUnion(newReg, reg1, reg2);
|
||||
#else
|
||||
return RegionUnion(newReg, reg1, reg2);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
Bool
|
||||
rdpRegionSubtract(RegionPtr newReg, RegionPtr reg1, RegionPtr reg2)
|
||||
{
|
||||
#if XRDP_REG == 1
|
||||
return miSubtract(newReg, reg1, reg2);
|
||||
#else
|
||||
return RegionSubtract(newReg, reg1, reg2);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
Bool
|
||||
rdpRegionInverse(RegionPtr newReg, RegionPtr reg1, BoxPtr invRect)
|
||||
{
|
||||
#if XRDP_REG == 1
|
||||
return miInverse(newReg, reg1, invRect);
|
||||
#else
|
||||
return RegionInverse(newReg, reg1, invRect);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
BoxPtr
|
||||
rdpRegionExtents(RegionPtr pReg)
|
||||
{
|
||||
#if XRDP_REG == 1
|
||||
return miRegionExtents(pReg);
|
||||
#else
|
||||
return RegionExtents(pReg);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void
|
||||
rdpRegionReset(RegionPtr pReg, BoxPtr pBox)
|
||||
{
|
||||
#if XRDP_REG == 1
|
||||
miRegionReset(pReg, pBox);
|
||||
#else
|
||||
RegionReset(pReg, pBox);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
Bool
|
||||
rdpRegionBreak(RegionPtr pReg)
|
||||
{
|
||||
#if XRDP_REG == 1
|
||||
return miRegionBreak(pReg);
|
||||
#else
|
||||
return RegionBreak(pReg);
|
||||
#endif
|
||||
}
|
||||
@ -0,0 +1,60 @@
|
||||
/*
|
||||
Copyright 2013 Jay Sorg
|
||||
|
||||
Permission to use, copy, modify, distribute, and sell this software and its
|
||||
documentation for any purpose is hereby granted without fee, provided that
|
||||
the above copyright notice appear in all copies and that both that
|
||||
copyright notice and this permission notice appear in supporting
|
||||
documentation.
|
||||
|
||||
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
|
||||
OPEN GROUP 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.
|
||||
|
||||
to deal with regions changing in xorg versions
|
||||
|
||||
*/
|
||||
|
||||
#ifndef __RDPREG_H
|
||||
#define __RDPREG_H
|
||||
|
||||
Bool
|
||||
rdpRegionCopy(RegionPtr dst, RegionPtr src);
|
||||
void
|
||||
rdpRegionTranslate(RegionPtr pReg, int x, int y);
|
||||
Bool
|
||||
rdpRegionNotEmpty(RegionPtr pReg);
|
||||
Bool
|
||||
rdpRegionIntersect(RegionPtr newReg, RegionPtr reg1, RegionPtr reg2);
|
||||
int
|
||||
rdpRegionContainsRect(RegionPtr region, BoxPtr prect);
|
||||
void
|
||||
rdpRegionInit(RegionPtr pReg, BoxPtr rect, int size);
|
||||
void
|
||||
rdpRegionUninit(RegionPtr pReg);
|
||||
RegionPtr
|
||||
rdpRegionFromRects(int nrects, xRectanglePtr prect, int ctype);
|
||||
void
|
||||
rdpRegionDestroy(RegionPtr pReg);
|
||||
RegionPtr
|
||||
rdpRegionCreate(BoxPtr rect, int size);
|
||||
Bool
|
||||
rdpRegionUnion(RegionPtr newReg, RegionPtr reg1, RegionPtr reg2);
|
||||
Bool
|
||||
rdpRegionSubtract(RegionPtr newReg, RegionPtr reg1, RegionPtr reg2);
|
||||
Bool
|
||||
rdpRegionInverse(RegionPtr newReg, RegionPtr reg1, BoxPtr invRect);
|
||||
BoxPtr
|
||||
rdpRegionExtents(RegionPtr pReg);
|
||||
void
|
||||
rdpRegionReset(RegionPtr pReg, BoxPtr pBox);
|
||||
Bool
|
||||
rdpRegionBreak(RegionPtr pReg);
|
||||
|
||||
#endif
|
||||
Loading…
Reference in new issue