Age | Commit message (Collapse) | Author |
|
We rely on minium xserver version 1.18
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-nested/-/merge_requests/5>
|
|
Already effectively required by use of XNFcallocarray() introduced in
xorg/xserver@b96dc999 - xserver-1.18.0, released in Nov. 2015.
Allows dropping remnants of code for XAA and pre-pciaccess X servers
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-nested/-/merge_requests/6>
|
|
xnfcalloc is just an alias for XNFcallocarray() that doesn't seem to serve
any practical purpose, so it can go away once all drivers stopped using it.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-nested/-/merge_requests/4>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Removed in xserver commit 76ef102b.
|
|
Block and wakeup handlers have changed function signature.
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
A few const char warnings, plus XNFcalloc is now deprecated
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
first including xorg-server.h
eg:
.../include/xorg/os.h:572:1: error: expected parameter declarator [Parse Issue]
strlcpy(char *dst, const char *src, size_t siz);
^
/usr/include/secure/_string.h:105:44: note: expanded from macro 'strlcpy'
__builtin___strlcpy_chk (dest, src, len, __darwin_obsz (dest))
^
Found-by: Tinderbox
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
This doesn't exist any more, and apparently hasn't done anything since xserver 1.4
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
|
|
XShmQueryExtension returns true if it is supported. Due to a missing "!"
within the if clause the assumption was that there is no MIT-SHM even if
it was.
Regression-from: 26f6ab7cbc4d1d7fcd1de71697d42af97acdf932
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Daniel Martin <daniel.martin@secunet.com>
|
|
This ports nested to the new server compat API.
Signed-off-by: Dave Airlie <airlied@redhat.com>
|
|
This affects only Cygwin, where drivers must be linked against the
Xorg implib. On other systems, XORG_LIBS will be empty.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Rename input to nested_input to avoid conflict with xorg/input.h and
actually include it in the dist tarball.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
I copied the backwards-compatibility functions from xf86-input-joystick.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
|
|
This works for 32bit servers, but there are still issues with 64bit servers.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Signed-off-by: Jamey Sharp <jamey@minilop.net>
|
|
The use of TimerSet() to initialize input is racey, this avoids a crash if
initialization looses the race. This is a good workaround for now, but
we should look into a better way to initialize when we get a chance later.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
This makes the code more readable and makes the following patch cleaner.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
driver.c:669:14: warning: unused function 'NestedShadowWindow'
[-Wunused-function]
static void *NestedShadowWindow(ScreenPtr pScreen, CARD32 row, CARD32 offset,
^
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
This Fixes error detection in NestedCreateScreenResources.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
|
|
If MIT-SHM fails, we should still try to initialize without it.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
|
|
Instead, let the input core monitor the X socket, and also register a
block handler to catch any events that were already read before the
server's main-loop goes to sleep.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Remove some #if 0 code.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
|
|
driver.c:553:9: warning: unused variable 'rc' [-Wunused-variable]
int rc;
^
input.c:188:18: warning: unused variable 'pInfo' [-Wunused-variable]
InputInfoPtr pInfo = device->public.devicePrivate;
^
input.c:210:26: warning: unused variable 'pNestedInput' [-Wunused-variable]
NestedInputDevicePtr pNestedInput = pInfo->private;
^
2 warnings generated.
xlibclient.c:272:11: warning: unused variable 'msg' [-Wunused-variable]
char *msg = "Cursor";
^
xlibclient.c:273:11: warning: unused variable 'msg2' [-Wunused-variable]
char *msg2 = "Root";
^
2 warnings generated.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
|
|
$DISPLAY was not particularly useful and resulted in a crash for long
values of $DISPLAY.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
|
|
Signed-off-by: Jamey Sharp <jamey@minilop.net>
|
|
Peter Hutterer told me I needed to set the valuator ranges, but I don't
want the input core to scale the coordinates. Setting the min and max to
-1 apparently has the right effect.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
|
|
Jeremy Huddleston tried building this with xserver's --prefix set to
/opt/Xorg and found that these #includes only worked so far by
coincidence.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Signed-off-by: Jamey Sharp <jamey@minilop.net>
|
|
Signed-off-by: Jamey Sharp <jamey@minilop.net>
|
|
|
|
|
|
|
|
|
|
that the nested server is running on (and the screen number). Unfortunately, at this point the behavior is incorrect, returning the DISPLAY of the host that invoked the nested instance. Not sure how to pass the info from within the nested server back out to the host client to get the correct information...
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|