diff --git a/xorg/X11R7.6/rdp/Makefile b/xorg/X11R7.6/rdp/Makefile index d4bbec70..4c434cb8 100644 --- a/xorg/X11R7.6/rdp/Makefile +++ b/xorg/X11R7.6/rdp/Makefile @@ -6,7 +6,7 @@ LIBBASE = $(X11RDPBASE)/lib XSRCBASE = ../build_dir/xorg-server-1.9.3 -OBJS = rdpmain.o rdpdraw.o rdpinput.o rdpmisc.o rdpup.o miinitext.o +OBJS = rdpmain.o rdpdraw.o rdpinput.o rdpmisc.o rdpup.o miinitext.o fbcmap.o # fbcmap.o @@ -25,9 +25,9 @@ LIBS = $(XSRCBASE)/dbe/.libs/libdbe.a \ $(XSRCBASE)/glx/.libs/libglx.a \ $(XSRCBASE)/xfixes/.libs/libxfixes.a \ librdp.a \ - -lfreetype -lz -lm -lXfont -lXau -lXdmcp -lpixman-1 -lrt -ldl -lgcrypt + -lfreetype -lz -lm -lXfont -lXau -lXdmcp -lpixman-1 -lrt -ldl -lcrypto -CFLAGS = -O2 -Wall -fno-strength-reduce \ +CFLAGS = -g -Wall -fno-strength-reduce \ -I../../include \ -I../../cfb \ -I../../mfb \ @@ -44,7 +44,7 @@ CFLAGS = -O2 -Wall -fno-strength-reduce \ -I../xfree86/os-support \ -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_REENTRANT \ -DGLX_USE_MESA -DXRECORD -D_GNU_SOURCE -DXAPPGROUP \ - -DTOGCUP -DSINGLEDEPTH -DXFree86Server \ + -DTOGCUP -DSINGLEDEPTH \ -DDBE -DEVI -DXVMC -DFONTCACHE -DGCCUSESGAS -DSTATIC_COLOR \ -DAVOID_GLYPHBLT -DFUNCPROTO=15 -DNARROWPROTO -DDDXOSFATALERROR \ -DPART_NET -DDDXTIME -D_HAVE_XALLOC_DECLS \ @@ -57,7 +57,7 @@ CFLAGS = -O2 -Wall -fno-strength-reduce \ -DMITSHM -DPIXPRIV -DNDEBUG -DDDXOSINIT -DXKB -DXINPUT # -pedantic -# -DXCSECURITY -DXF86BIGFONT +# -DXCSECURITY -DXF86BIGFONT -DXFree86Server # these are defined in xorg-server.h # -D_XOPEN_SOURCE=500L @@ -86,5 +86,5 @@ clean: miinitext.o: ../build_dir/xorg-server-1.9.3/mi/miinitext.c $(CC) $(CFLAGS) -I../build_dir/xorg-server-1.9.3/Xext -c ../build_dir/xorg-server-1.9.3/mi/miinitext.c -#fbcmap.o: ../../fb/fbcmap.c -# $(CC) $(CFLAGS) -c ../../fb/fbcmap.c +fbcmap.o: ../build_dir/xorg-server-1.9.3/fb/fbcmap.c + $(CC) $(CFLAGS) -c ../build_dir/xorg-server-1.9.3/fb/fbcmap.c diff --git a/xorg/X11R7.6/rdp/rdp.h b/xorg/X11R7.6/rdp/rdp.h index cb489834..e27cac6d 100644 --- a/xorg/X11R7.6/rdp/rdp.h +++ b/xorg/X11R7.6/rdp/rdp.h @@ -80,7 +80,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # endif #endif -#define X11RDPVER "0.5.0" +#define X11RDPVER "0.7.0" #define PixelDPI 100 #define PixelToMM(_size) (((_size) * 254 + (PixelDPI) * 5) / ((PixelDPI) * 10)) @@ -243,6 +243,12 @@ Bool rdpCursorOffScreen(ScreenPtr* ppScreen, int* x, int* y); void rdpCrossScreen(ScreenPtr pScreen, Bool entering); +void +rdpPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScr, int x, int y); +void +rdpPointerEnqueueEvent(DeviceIntPtr pDev, InternalEvent* event); +void +rdpPointerNewEventScreen(DeviceIntPtr pDev, ScreenPtr pScr, Bool fromDIX); Bool rdpSpriteRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScr, CursorPtr pCurs); Bool @@ -252,6 +258,10 @@ rdpSpriteSetCursor(DeviceIntPtr pDev, ScreenPtr pScr, CursorPtr pCurs, int x, int y); void rdpSpriteMoveCursor(DeviceIntPtr pDev, ScreenPtr pScr, int x, int y); +Bool +rdpSpriteDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScr); +void +rdpSpriteDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScr); void PtrAddEvent(int buttonMask, int x, int y); void diff --git a/xorg/X11R7.6/rdp/rdpinput.c b/xorg/X11R7.6/rdp/rdpinput.c index a9a02a04..4d988a12 100644 --- a/xorg/X11R7.6/rdp/rdpinput.c +++ b/xorg/X11R7.6/rdp/rdpinput.c @@ -427,6 +427,28 @@ rdpCrossScreen(ScreenPtr pScreen, Bool entering) DEBUG_OUT_INPUT(("rdpCrossScreen\n")); } +/******************************************************************************/ +void +rdpPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScr, int x, int y) +{ + ErrorF("rdpPointerWarpCursor:\n"); + miPointerWarpCursor(pDev, pScr, x, y); +} + +/******************************************************************************/ +void +rdpPointerEnqueueEvent(DeviceIntPtr pDev, InternalEvent* event) +{ + ErrorF("rdpPointerEnqueueEvent:\n"); +} + +/******************************************************************************/ +void +rdpPointerNewEventScreen(DeviceIntPtr pDev, ScreenPtr pScr, Bool fromDIX) +{ + ErrorF("rdpPointerNewEventScreen:\n"); +} + /******************************************************************************/ Bool rdpSpriteRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScr, CursorPtr pCurs) @@ -598,6 +620,21 @@ rdpSpriteMoveCursor(DeviceIntPtr pDev, ScreenPtr pScr, int x, int y) DEBUG_OUT_INPUT(("hi rdpSpriteMoveCursor\n")); } +/******************************************************************************/ +Bool +rdpSpriteDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScr) +{ + ErrorF("rdpSpriteDeviceCursorInitialize:\n"); + return 1; +} + +/******************************************************************************/ +void +rdpSpriteDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScr) +{ + ErrorF("rdpSpriteDeviceCursorCleanup:\n"); +} + /******************************************************************************/ void PtrAddEvent(int buttonMask, int x, int y) diff --git a/xorg/X11R7.6/rdp/rdpmain.c b/xorg/X11R7.6/rdp/rdpmain.c index 758759ab..dac02e3f 100644 --- a/xorg/X11R7.6/rdp/rdpmain.c +++ b/xorg/X11R7.6/rdp/rdpmain.c @@ -66,15 +66,18 @@ static miPointerSpriteFuncRec g_rdpSpritePointerFuncs = rdpSpriteRealizeCursor, rdpSpriteUnrealizeCursor, rdpSpriteSetCursor, - rdpSpriteMoveCursor + rdpSpriteMoveCursor, + rdpSpriteDeviceCursorInitialize, + rdpSpriteDeviceCursorCleanup }; static miPointerScreenFuncRec g_rdpPointerCursorFuncs = { /* these are in rdpinput.c */ rdpCursorOffScreen, rdpCrossScreen, - miPointerWarpCursor /* don't need to set last 2 funcs - EnqueueEvent and NewEventScreen */ + rdpPointerWarpCursor, + rdpPointerEnqueueEvent, + rdpPointerNewEventScreen }; #define FB_GET_SCREEN_PIXMAP(s) ((PixmapPtr) ((s)->devPrivate)) @@ -169,6 +172,21 @@ rdpWakeupHandler1(pointer blockData, int result, pointer pReadmask) rdpup_check(); } +/******************************************************************************/ +static Bool +rdpDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen) +{ + ErrorF("rdpDeviceCursorInitializeProcPtr:\n"); + return 1; +} + +/******************************************************************************/ +static void +rdpDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen) +{ + ErrorF("rdpDeviceCursorCleanupProcPtr:\n"); +} + /******************************************************************************/ /* returns boolean, true if everything is ok */ static Bool @@ -199,7 +217,7 @@ rdpScreenInit(int index, ScreenPtr pScreen, int argc, char** argv) ErrorF("\n"); ErrorF("X11rdp, an X server for xrdp\n"); ErrorF("Version %s\n", X11RDPVER); - ErrorF("Copyright (C) 2005-2008 Jay Sorg\n"); + ErrorF("Copyright (C) 2005-2012 Jay Sorg\n"); ErrorF("See http://xrdp.sf.net for information on xrdp.\n"); #if defined(XORG_VERSION_CURRENT) && defined (XVENDORNAME) ErrorF("Underlying X server release %d, %s\n", @@ -254,10 +272,12 @@ rdpScreenInit(int index, ScreenPtr pScreen, int argc, char** argv) dpix, dpiy, g_rdpScreen.paddedWidthInBytes / 4, 32); break; default: + ErrorF("rdpScreenInit: error\n"); return 0; } if (!ret) { + ErrorF("rdpScreenInit: error\n"); return 0; } @@ -332,9 +352,13 @@ rdpScreenInit(int index, ScreenPtr pScreen, int argc, char** argv) pScreen->ClearToBackground = rdpClearToBackground; /* Backing store procedures */ pScreen->RestoreAreas = rdpRestoreAreas; + miPointerInitialize(pScreen, &g_rdpSpritePointerFuncs, &g_rdpPointerCursorFuncs, 1); + //pScreen->DeviceCursorInitialize = rdpDeviceCursorInitialize; + //pScreen->DeviceCursorCleanup = rdpDeviceCursorCleanup; + vis_found = 0; vis = g_pScreen->visuals + (g_pScreen->numVisuals - 1); while (vis >= pScreen->visuals) @@ -352,11 +376,11 @@ rdpScreenInit(int index, ScreenPtr pScreen, int argc, char** argv) } if (g_rdpScreen.bitsPerPixel == 1) { - //todo ret = fbCreateDefColormap(pScreen); + ret = fbCreateDefColormap(pScreen); } else { - //todo ret = fbCreateDefColormap(pScreen); + ret = fbCreateDefColormap(pScreen); } if (ret) { @@ -376,6 +400,9 @@ rdpScreenInit(int index, ScreenPtr pScreen, int argc, char** argv) pRRScrPriv->rrGetInfo = rdpRandRGetInfo; pRRScrPriv->rrSetConfig = rdpRandRSetConfig; } + + ErrorF("rdpScreenInit: ret %d\n", ret); + return ret; } @@ -444,6 +471,7 @@ ddxInitGlobals(void) int XkbDDXSwitchScreen(DeviceIntPtr dev, KeyCode key, XkbAction* act) { + ErrorF("XkbDDXSwitchScreen:\n"); return 1; } @@ -451,6 +479,7 @@ XkbDDXSwitchScreen(DeviceIntPtr dev, KeyCode key, XkbAction* act) int XkbDDXPrivate(DeviceIntPtr dev, KeyCode key, XkbAction* act) { + ErrorF("XkbDDXPrivate:\n"); return 0; } @@ -458,6 +487,7 @@ XkbDDXPrivate(DeviceIntPtr dev, KeyCode key, XkbAction* act) int XkbDDXTerminateServer(DeviceIntPtr dev, KeyCode key, XkbAction* act) { + ErrorF("XkbDDXTerminateServer:\n"); GiveUp(1); return 0; } @@ -471,6 +501,7 @@ InitOutput(ScreenInfo* screenInfo, int argc, char** argv) { int i; + ErrorF("InitOutput:\n"); g_initOutputCalled = 1; /* initialize pixmap formats */ screenInfo->imageByteOrder = IMAGE_BYTE_ORDER; @@ -497,6 +528,7 @@ InitOutput(ScreenInfo* screenInfo, int argc, char** argv) { FatalError("Couldn't add screen\n"); } + ErrorF("InitOutput: out\n"); } /******************************************************************************/ @@ -506,6 +538,7 @@ InitInput(int argc, char** argv) DeviceIntPtr p; DeviceIntPtr k; + ErrorF("InitInput:\n"); k = AddInputDevice(serverClient, rdpKeybdProc, 1); p = AddInputDevice(serverClient, rdpMouseProc, 1); RegisterKeyboardDevice(k); @@ -612,54 +645,6 @@ DeleteInputDeviceRequest(DeviceIntPtr dev) ErrorF("DeleteInputDeviceRequest\n"); } -/******************************************************************************/ -Bool -fbInitializeColormap(ColormapPtr pmap) -{ - ErrorF("fbInitializeColormap\n"); - return 1; -} - -/******************************************************************************/ -void -fbInstallColormap(ColormapPtr pmap) -{ - ErrorF("fbInstallColormap\n"); -} - -/******************************************************************************/ -void -fbUninstallColormap(ColormapPtr pmap) -{ - ErrorF("fbUninstallColormap\n"); -} - -/******************************************************************************/ -int -fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) -{ - ErrorF("fbListInstalledColormaps\n"); - return 1; -} - -/******************************************************************************/ -void -fbResolveColor(unsigned short *pred, unsigned short *pgreen, - unsigned short *pblue, VisualPtr pVisual) -{ - ErrorF("fbResolveColor\n"); -} - -/******************************************************************************/ -Bool -fbInitVisuals(VisualPtr* visualp, DepthPtr* depthp, int* nvisualp, - int* ndepthp, int* rootDepthp, VisualID* defaultVisp, unsigned long sizes, - int bitsPerRGB) -{ - ErrorF("fbInitVisuals\n"); - return 1; -} - /******************************************************************************/ /* * Answer queries about the RandR features supported. diff --git a/xorg/X11R7.6/x11_file_list.txt b/xorg/X11R7.6/x11_file_list.txt index add66646..6d6de97c 100644 --- a/xorg/X11R7.6/x11_file_list.txt +++ b/xorg/X11R7.6/x11_file_list.txt @@ -62,7 +62,7 @@ libXext-1.2.0.tar.bz2 : libXext-1.2.0 libICE-1.0.7.tar.bz2 : libICE-1.0.7 : libSM-1.2.0.tar.bz2 : libSM-1.2.0 : libXt-1.0.9.tar.bz2 : libXt-1.0.9 : -MesaLib-7.10.3.tar.bz2 : Mesa-7.10.3 : --with-expat=$PREFIX_DIR +MesaLib-7.10.3.tar.bz2 : Mesa-7.10.3 : --with-expat=$PREFIX_DIR --disable-gallium randrproto-1.3.2.tar.bz2 : randrproto-1.3.2 : renderproto-0.11.1.tar.bz2 : renderproto-0.11.1 : fixesproto-4.1.2.tar.bz2 : fixesproto-4.1.2 : @@ -93,7 +93,7 @@ libXaw-1.0.8.tar.bz2 : libXaw-1.0.8 mkfontdir-1.0.6.tar.bz2 : mkfontdir-1.0.6 : xkbcomp-1.2.0.tar.bz2 : xkbcomp-1.2.0 : xdriinfo-1.0.4.tar.bz2 : xdriinfo-1.0.4 : -xorg-server-1.9.3.tar.bz2 : xorg-server-1.9.3 : +xorg-server-1.9.3.tar.bz2 : xorg-server-1.9.3 : --with-sha1=libcrypto applewmproto-1.4.1.tar.bz2 : applewmproto-1.4.1 : bdftopcf-1.0.3.tar.bz2 : bdftopcf-1.0.3 : intltool-0.41.1.tar.gz : intltool-0.41.1 :