jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xorg: fixes for building with xserver v1.13+

Browse Source
This commit is contained in:
Jay Sorg 2014-01-28 16:07:36 -08:00
parent 97070b6fd9
commit b4b73056fc
2 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
xorg/server/module/rdpDraw.c
View File

@ -344,6 +344,8 @@ rdpCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr pOldRegion)
rdpRegionUninit(&clip); rdpRegionUninit(&clip);
} }
#if XRDP_CLOSESCR == 1 /* before v1.13 */
/*****************************************************************************/ /*****************************************************************************/
Bool Bool
rdpCloseScreen(int index, ScreenPtr pScreen) rdpCloseScreen(int index, ScreenPtr pScreen)
@ -354,15 +356,30 @@ rdpCloseScreen(int index, ScreenPtr pScreen)
LLOGLN(0, ("rdpCloseScreen:")); LLOGLN(0, ("rdpCloseScreen:"));
dev = rdpGetDevFromScreen(pScreen); dev = rdpGetDevFromScreen(pScreen);
dev->pScreen->CloseScreen = dev->CloseScreen; dev->pScreen->CloseScreen = dev->CloseScreen;
#if XRDP_CLOSESCR == 1 /* before v1.13 */
rv = dev->pScreen->CloseScreen(index, pScreen); rv = dev->pScreen->CloseScreen(index, pScreen);
#else
rv = dev->pScreen->CloseScreen(pScreen);
#endif
dev->pScreen->CloseScreen = rdpCloseScreen; dev->pScreen->CloseScreen = rdpCloseScreen;
return rv; return rv;
} }
#else
/*****************************************************************************/
Bool
rdpCloseScreen(ScreenPtr pScreen)
{
rdpPtr dev;
Bool rv;
LLOGLN(0, ("rdpCloseScreen:"));
dev = rdpGetDevFromScreen(pScreen);
dev->pScreen->CloseScreen = dev->CloseScreen;
rv = dev->pScreen->CloseScreen(pScreen);
dev->pScreen->CloseScreen = rdpCloseScreen;
return rv;
}
#endif
/******************************************************************************/ /******************************************************************************/
WindowPtr WindowPtr
rdpGetRootWindowPtr(ScreenPtr pScreen) rdpGetRootWindowPtr(ScreenPtr pScreen)

26
xorg/server/xrdpdev/xrdpdev.c
View File

@ -411,7 +411,11 @@ rdpWakeupHandler1(pointer blockData, int result, pointer pReadmask)
/*****************************************************************************/ /*****************************************************************************/
static Bool static Bool
#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 13, 0, 0, 0)
rdpScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) rdpScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
#else
rdpScreenInit(ScreenPtr pScreen, int argc, char **argv)
#endif
{ {
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
rdpPtr dev; rdpPtr dev;
@ -419,7 +423,7 @@ rdpScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
Bool vis_found; Bool vis_found;
PictureScreenPtr ps; PictureScreenPtr ps;
pScrn = xf86Screens[scrnIndex]; pScrn = xf86Screens[pScreen->myNum];
dev = XRDPPTR(pScrn); dev = XRDPPTR(pScrn);
dev->pScreen = pScreen; dev->pScreen = pScreen;
@ -556,7 +560,11 @@ rdpScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
/*****************************************************************************/ /*****************************************************************************/
static Bool static Bool
#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 13, 0, 0, 0)
rdpSwitchMode(int a, DisplayModePtr b, int c) rdpSwitchMode(int a, DisplayModePtr b, int c)
#else
rdpSwitchMode(ScrnInfoPtr a, DisplayModePtr b)
#endif
{ {
LLOGLN(0, ("rdpSwitchMode:")); LLOGLN(0, ("rdpSwitchMode:"));
return TRUE; return TRUE;
@ -564,14 +572,22 @@ rdpSwitchMode(int a, DisplayModePtr b, int c)
/*****************************************************************************/ /*****************************************************************************/
static void static void
#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 13, 0, 0, 0)
rdpAdjustFrame(int a, int b, int c, int d) rdpAdjustFrame(int a, int b, int c, int d)
#else
rdpAdjustFrame(ScrnInfoPtr a, int b, int c)
#endif
{ {
LLOGLN(10, ("rdpAdjustFrame:")); LLOGLN(10, ("rdpAdjustFrame:"));
} }
/*****************************************************************************/ /*****************************************************************************/
static Bool static Bool
#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 13, 0, 0, 0)
rdpEnterVT(int a, int b) rdpEnterVT(int a, int b)
#else
rdpEnterVT(ScrnInfoPtr a)
#endif
{ {
LLOGLN(0, ("rdpEnterVT:")); LLOGLN(0, ("rdpEnterVT:"));
return TRUE; return TRUE;
@ -579,14 +595,22 @@ rdpEnterVT(int a, int b)
/*****************************************************************************/ /*****************************************************************************/
static void static void
#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 13, 0, 0, 0)
rdpLeaveVT(int a, int b) rdpLeaveVT(int a, int b)
#else
rdpLeaveVT(ScrnInfoPtr a)
#endif
{ {
LLOGLN(0, ("rdpLeaveVT:")); LLOGLN(0, ("rdpLeaveVT:"));
} }
/*****************************************************************************/ /*****************************************************************************/
static ModeStatus static ModeStatus
#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 13, 0, 0, 0)
rdpValidMode(int a, DisplayModePtr b, Bool c, int d) rdpValidMode(int a, DisplayModePtr b, Bool c, int d)
#else
rdpValidMode(ScrnInfoPtr a, DisplayModePtr b, Bool c, int d)
#endif
{ {
LLOGLN(0, ("rdpValidMode:")); LLOGLN(0, ("rdpValidMode:"));
return 0; return 0;