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

xorg: work on randr

Browse Source
This commit is contained in:
Jay Sorg 2012-03-13 19:23:13 -07:00
parent 35bc7a1588
commit e075b8cc5d
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xorg/X11R7.6/rdp/rdpmain.c
View File

@ -36,7 +36,6 @@ Bool noXFree86BigfontExtension = FALSE;
rdpScreenInfoRec g_rdpScreen; /* the one screen */
ScreenPtr g_pScreen = 0;
//int g_rdpGCIndex = -1;
DevPrivateKeyRec g_rdpGCIndex;
DeviceIntPtr g_pointer = 0;
@ -326,7 +325,6 @@ rdpScreenInit(int index, ScreenPtr pScreen, int argc, char** argv)
fbPictureInit(pScreen, 0, 0);
}
//if (!miAllocateGCPrivate(pScreen, g_rdpGCIndex, sizeof(rdpGCRec)))
if (!dixRegisterPrivateKey(&g_rdpGCIndex, PRIVATE_GC, sizeof(rdpGCRec)))
{
FatalError("rdpScreenInit: miAllocateGCPrivate failed\n");
@ -340,8 +338,6 @@ rdpScreenInit(int index, ScreenPtr pScreen, int argc, char** argv)
g_rdpScreen.CreatePixmap = pScreen->CreatePixmap;
g_rdpScreen.DestroyPixmap = pScreen->DestroyPixmap;
/* Window Procedures */
//g_rdpScreen.PaintWindowBackground = pScreen->PaintWindowBackground;
//g_rdpScreen.PaintWindowBorder = pScreen->PaintWindowBorder;
g_rdpScreen.CopyWindow = pScreen->CopyWindow;
g_rdpScreen.ClearToBackground = pScreen->ClearToBackground;
/* Backing store procedures */
@ -372,8 +368,6 @@ rdpScreenInit(int index, ScreenPtr pScreen, int argc, char** argv)
/* pScreen->CreatePixmap = rdpCreatePixmap; */
/* pScreen->DestroyPixmap = rdpDestroyPixmap; */
/* Window Procedures */
//pScreen->PaintWindowBackground = rdpPaintWindowBackground;
//pScreen->PaintWindowBorder = rdpPaintWindowBorder;
pScreen->CopyWindow = rdpCopyWindow;
pScreen->ClearToBackground = rdpClearToBackground;
/* Backing store procedures */
@ -435,6 +429,7 @@ rdpScreenInit(int index, ScreenPtr pScreen, int argc, char** argv)
else
{
pRRScrPriv = rrGetScrPriv(pScreen);
ErrorF("pRRScrPriv %p\n", pRRScrPriv);
pRRScrPriv->rrGetInfo = rdpRandRGetInfo;
pRRScrPriv->rrSetConfig = rdpRandRSetConfig;
}
@ -551,11 +546,6 @@ InitOutput(ScreenInfo* screenInfo, int argc, char** argv)
{
screenInfo->formats[i] = g_formats[i];
}
//g_rdpGCIndex = miAllocateGCPrivateIndex();
//if (g_rdpGCIndex < 0)
//{
// FatalError("InitOutput: miAllocateGCPrivateIndex failed\n");
//}
if (!AddCallback(&ClientStateCallback, rdpClientStateChange, NULL))
{
rdpLog("InitOutput: AddCallback failed\n");
@ -616,7 +606,6 @@ void
ProcessInputEvents(void)
{
mieqProcessInputEvents();
//miPointerUpdate();
}
/******************************************************************************/
@ -804,7 +793,7 @@ rdpInvalidateArea(ScreenPtr pScreen, int x, int y, int cx, int cy)
Mask mask;
DEBUG_OUT(("rdpInvalidateArea:\n"));
rootWindow = 0; // GetCurrentRootWindow();
rootWindow = GetCurrentRootWindow(g_keyboard);
if (rootWindow != 0)
{
mask = 0;
@ -846,6 +835,7 @@ rdpRandRSetConfig(ScreenPtr pScreen, Rotation rotateKind, int rate,
WindowPtr rootWindow;
BoxRec box;
ErrorF("rdpRandRSetConfig:\n");
if ((pSize->width < 1) || (pSize->height < 1))
{
ErrorF("rdpRandRSetConfig: error width %d height %d\n",
@ -887,7 +877,7 @@ rdpRandRSetConfig(ScreenPtr pScreen, Rotation rotateKind, int rate,
screenPixmap->drawable.width, screenPixmap->drawable.height));
/* memset(g_rdpScreen.pfbMemory, 0xff, 2048 * 2048 * 4); */
}
rootWindow = 0; // GetCurrentRootWindow();
rootWindow = GetCurrentRootWindow(g_keyboard);
if (rootWindow != 0)
{
DEBUG_OUT(("rdpRandRSetConfig: rootWindow %p\n", (void*)rootWindow));

25
xorg/X11R7.6/rdp/rdpup.c
View File

@ -282,10 +282,10 @@ rdpup_recv_msg(struct stream* s)
static int
process_screen_size_msg(int width, int height, int bpp)
{
//RRScreenSizePtr pSize;
RRScreenSizePtr pSize;
int mmwidth;
int mmheight;
//int error;
int error;
ErrorF("process_screen_size_msg: set width %d height %d bpp %d\n",
width, height, bpp);
@ -314,16 +314,22 @@ process_screen_size_msg(int width, int height, int bpp)
}
mmwidth = PixelToMM(width);
mmheight = PixelToMM(height);
//pSize = RRRegisterSize(g_pScreen, width, height, mmwidth, mmheight);
//RRSetCurrentConfig(g_pScreen, RR_Rotate_0, 0, pSize);
return 0;
pSize = RRRegisterSize(g_pScreen, width, height, mmwidth, mmheight);
RRSetCurrentConfig(g_pScreen, RR_Rotate_0, 0, pSize);
if ((g_rdpScreen.width != width) || (g_rdpScreen.height != height))
{
ErrorF(" calling ProcRRSetScreenConfig\n");
error = 0;
//error = ProcRRSetScreenConfig(serverClient);
//error = RRSetScreenConfig(g_pScreen, RR_Rotate_0, 0, pSize);
//if (error == BadImplementation)
//{
// ErrorF("process_screen_size_msg: RRSetScreenConfig returned "
// "BadImplementation\n");
//}
if (error == BadImplementation)
{
ErrorF("process_screen_size_msg: RRSetScreenConfig returned "
"BadImplementation\n");
}
}
return 0;
}
@ -928,6 +934,7 @@ get_single_color(int x, int y, int w, int h)
unsigned short* i16;
unsigned int* i32;
p = 0;
rv = -1;
if (g_Bpp == 1)
{