| Adam Tkac | 4c0427f | 2008-03-21 18:56:48 +0000 | [diff] [blame] | 1 | diff -up os/WaitFor.c.orig xorg/os/WaitFor.c |
| 2 | --- os/WaitFor.c.orig 2008-01-28 10:20:35.000000000 +0100 |
| 3 | +++ os/WaitFor.c 2008-01-28 10:21:08.000000000 +0100 |
| 4 | @@ -332,13 +332,11 @@ WaitForSomething(int *pClientsReady) |
| 5 | |
| 6 | if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable)) |
| 7 | break; |
| 8 | -#ifdef WIN32 |
| 9 | /* Windows keyboard and mouse events are added to the input queue |
| 10 | in Block- and WakupHandlers. There is no device to check if |
| 11 | data is ready. So check here if new input is available */ |
| 12 | if (*checkForInput[0] != *checkForInput[1]) |
| 13 | return 0; |
| 14 | -#endif |
| 15 | } |
| 16 | } |
| 17 | |
| 18 | diff -up mi/miinitext.c.orig xorg/mi/miinitext.c |
| 19 | --- mi/miinitext.c.orig 2008-01-28 10:18:46.000000000 +0100 |
| 20 | +++ mi/miinitext.c 2008-01-28 10:18:58.000000000 +0100 |
| 21 | @@ -289,6 +289,7 @@ extern void BigReqExtensionInit(INITARGS |
| 22 | #ifdef MITMISC |
| 23 | extern void MITMiscExtensionInit(INITARGS); |
| 24 | #endif |
| 25 | +extern void vncExtensionInit(INITARGS); |
| 26 | #ifdef XIDLE |
| 27 | extern void XIdleExtensionInit(INITARGS); |
| 28 | #endif |
| 29 | @@ -560,6 +561,7 @@ InitExtensions(argc, argv) |
| 30 | #ifdef MITMISC |
| 31 | if (!noMITMiscExtension) MITMiscExtensionInit(); |
| 32 | #endif |
| 33 | + vncExtensionInit(); |
| 34 | #ifdef XIDLE |
| 35 | if (!noXIdleExtension) XIdleExtensionInit(); |
| 36 | #endif |
| 37 | diff -up hw/Makefile.am.orig xorg/hw/Makefile.am |
| 38 | --- hw/Makefile.am.orig 2008-01-28 10:18:46.000000000 +0100 |
| 39 | +++ hw/Makefile.am 2008-01-28 10:18:58.000000000 +0100 |
| 40 | @@ -43,7 +43,8 @@ SUBDIRS = \ |
| 41 | $(DMX_SUBDIRS) \ |
| 42 | $(KDRIVE_SUBDIRS) \ |
| 43 | $(XQUARTZ_SUBDIRS) \ |
| 44 | - $(XPRINT_SUBDIRS) |
| 45 | + $(XPRINT_SUBDIRS) \ |
| 46 | + vnc |
| 47 | |
| 48 | DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint |
| 49 | |
| 50 | diff -up configure.ac.orig xorg/configure.ac |
| 51 | --- configure.ac.orig 2008-01-28 10:18:45.000000000 +0100 |
| 52 | +++ configure.ac 2008-01-28 10:18:58.000000000 +0100 |
| 53 | @@ -29,7 +29,6 @@ AC_PREREQ(2.57) |
| 54 | AC_INIT([xorg-server], 1.4.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) |
| 55 | AC_CONFIG_SRCDIR([Makefile.am]) |
| 56 | AM_INIT_AUTOMAKE([dist-bzip2 foreign]) |
| 57 | -AM_MAINTAINER_MODE |
| 58 | |
| 59 | dnl this gets generated by autoheader, and thus contains all the defines. we |
| 60 | dnl don't ever actually use it, internally. |
| 61 | @@ -2173,6 +2172,7 @@ hw/dmx/input/Makefile |
| 62 | hw/dmx/glxProxy/Makefile |
| 63 | hw/dmx/Makefile |
| 64 | hw/vfb/Makefile |
| 65 | +hw/vnc/Makefile |
| 66 | hw/xgl/Makefile |
| 67 | hw/xgl/egl/Makefile |
| 68 | hw/xgl/egl/module/Makefile |