summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-06-15Fix return check of XShmQueryExtensionHEADmasterDaniel Martin1-1/+1
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>
2011-10-16Set the keyboard mapping based on the remote server's mapJeremy Huddleston3-8/+125
This works for 32bit servers, but there are still issues with 64bit servers. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-16Properly include config.h in each of our source filesJeremy Huddleston3-0/+8
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-09-19Fix copy/paste error in log messages emitted during early (racey) input.Jamey Sharp1-3/+3
Signed-off-by: Jamey Sharp <jamey@minilop.net>
2011-09-19Drop input events until our device is initializedJeremy Huddleston1-0/+15
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>
2011-09-19Cleanup NestedClientCheckEvents to use switch rather than if-else-fooJeremy Huddleston1-26/+16
This makes the code more readable and makes the following patch cleaner. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-09-19If we fail to NewInputDeviceRequest, FatalError rather than crash later.Jeremy Huddleston1-1/+1
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-09-19Don't ignore errors in NestedInputControlJeremy Huddleston1-3/+13
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-09-19Finish stubbing out various functions that need a returned valueJeremy Huddleston1-0/+3
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-09-19Dead code removal: NestedShadowWindowJeremy Huddleston1-9/+0
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>
2011-09-19NestedCreateScreenResources needs to return a valueJeremy Huddleston1-2/+7
This Fixes error detection in NestedCreateScreenResources. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-09-15Avoid an erroneous free on shutdownJeremy Huddleston1-2/+0
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Jamey Sharp <jamey@minilop.net>
2011-09-15Improve support for servers that do not support MIT-SHMJeremy Huddleston1-48/+62
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>
2011-09-15Quit waking up every 20ms to get events from the backend server.Jamey Sharp4-41/+56
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>
2011-09-14Dead code removalJeremy Huddleston1-57/+0
Remove some #if 0 code. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Jamey Sharp <jamey@minilop.net>
2011-09-14Remove some unused variablesJeremy Huddleston3-6/+0
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>
2011-09-14Change the window title to be the Screen indexJeremy Huddleston1-2/+1
$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>
2011-09-14Nested X screens don't have a RAMDAC.Jamey Sharp1-2/+0
Signed-off-by: Jamey Sharp <jamey@minilop.net>
2011-09-14Don't scale the absolute axis valuators.Jamey Sharp1-1/+1
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>
2011-09-14Fix #includes when xserver is in a non-standard prefix.Jamey Sharp5-21/+21
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>
2011-09-14Update for input ABI 12.2.Jamey Sharp2-32/+10
Signed-off-by: Jamey Sharp <jamey@minilop.net>
2011-09-12Remove and ignore build products.Jamey Sharp42-84982/+78
Signed-off-by: Jamey Sharp <jamey@minilop.net>
2011-04-30initial upload of xorg/driver/xf86-video-nestedTim41-0/+84982
2011-02-27Updated authors.Colin Hill7-23/+59
2011-02-23Got rid of unsightly void pointers.Colin Hill7-47/+114
2011-02-23Fixed wording in README.Colin Hill1-2/+2
2011-02-23Updated README to reflect changes.Colin Hill1-17/+10
2011-02-22Fixed compiler warnings.Colin Hill1-10/+12
2011-02-22Fixed a warning; added window title display of the DISPLAY env. variable ↵Weseung Hwang3-5/+11
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...
2011-02-16Added input.cColin Hill2-0/+302
2011-02-16Massive code clean up. Mouse motion/buttons and keyboard works.Colin Hill5-341/+20
2011-02-16Keyboard works.Colin Hill3-0/+13
2011-02-16Mouse button 1.Colin Hill3-1/+32
2011-02-16Clean up.Colin Hill2-9/+1
2011-02-16Mouse movement works.Colin Hill2-2/+28
2011-02-16Made device pointer shared between input and xlibclient.cColin Hill5-27/+62
2011-02-16Changed input file descriptor to /dev/nullColin Hill1-9/+6
2011-02-15Misc.Colin Hill2-20/+13
2011-02-15Got NestedMousePreInit to invoke.Colin Hill4-73/+65
2011-02-08added button and key press and release loggingtim1-3/+1
2011-02-08Merge branch 'master' of github.com:colinhect/xf86-video-nestedtim3-0/+48
2011-02-08added button and key press and release loggingtim1-2/+34
2011-02-08Input event structures.Colin Hill2-2/+5
2011-02-08Mouse event passing...Colin Hill2-6/+5
2011-02-08Nested input structs.Colin Hill1-0/+14
2011-02-08Worked on input event structs.Colin Hill2-0/+11
2011-02-08Merge branch 'master' of github.com:colinhect/xf86-video-nestedColin Hill1-1/+10
2011-02-08Added structures for passing input data to input driver.Colin Hill2-0/+21
2011-02-08added keypress loggingtim1-1/+10
2011-02-08Moved some delcarations from xNestedMouse.h to xNestedMouse.cColin Hill2-12/+11