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

compile with xfree86 4.5

Browse Source
This commit is contained in:
jsorg71 2006-08-20 05:13:30 +00:00
parent 10d8a61520
commit 823547cfd4
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Xserver/hw/rdp/rdpmain.c
View File

@ -116,19 +116,30 @@ rdpWakeupHandler(int i, pointer blockData, unsigned long err,
/*ErrorF("rdpWakeupHandler %d\n", err);*/ /*ErrorF("rdpWakeupHandler %d\n", err);*/
e = (int)err; e = (int)err;
if (e < 0) if (!(e < 0))
{ {
g_pScreen->WakeupHandler = g_rdpScreen.WakeupHandler; /*rdpup_check();*/
g_pScreen->WakeupHandler(i, blockData, err, pReadmask);
g_pScreen->WakeupHandler = rdpWakeupHandler;
return;
} }
rdpup_check();
g_pScreen->WakeupHandler = g_rdpScreen.WakeupHandler; g_pScreen->WakeupHandler = g_rdpScreen.WakeupHandler;
g_pScreen->WakeupHandler(i, blockData, err, pReadmask); g_pScreen->WakeupHandler(i, blockData, err, pReadmask);
g_pScreen->WakeupHandler = rdpWakeupHandler; g_pScreen->WakeupHandler = rdpWakeupHandler;
} }
/******************************************************************************/
static void
rdpBlockHandler1(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
{
/*ErrorF("hi rdpBlockHandler1\n");*/
}
/******************************************************************************/
static void
rdpWakeupHandler1(pointer blockData, int result, pointer pReadmask)
{
/*ErrorF("hi rdpWakeupHandler1\n");*/
rdpup_check();
}
/******************************************************************************/ /******************************************************************************/
/* returns boolean, true if everything is ok */ /* returns boolean, true if everything is ok */
static Bool static Bool
@ -310,6 +321,10 @@ rdpScreenInit(int index, ScreenPtr pScreen, int argc, char** argv)
{ {
ret = rdpup_init(); ret = rdpup_init();
} }
if (ret)
{
RegisterBlockAndWakeupHandlers(rdpBlockHandler1, rdpWakeupHandler1, NULL);
}
return ret; return ret;
} }
@ -370,6 +385,7 @@ OsVendorInit(void)
/*ErrorF("hi OsVendorInit\n");*/ /*ErrorF("hi OsVendorInit\n");*/
} }
#if 0
/******************************************************************************/ /******************************************************************************/
CARD32 CARD32
GetTimeInMillis(void) GetTimeInMillis(void)
@ -380,6 +396,7 @@ GetTimeInMillis(void)
X_GETTIMEOFDAY(&tp); X_GETTIMEOFDAY(&tp);
return (tp.tv_sec * 1000) + (tp.tv_usec / 1000); return (tp.tv_sec * 1000) + (tp.tv_usec / 1000);
} }
#endif
/* Common pixmap formats */ /* Common pixmap formats */
static PixmapFormatRec formats[MAXFORMATS] = static PixmapFormatRec formats[MAXFORMATS] =
@ -526,3 +543,9 @@ ddxUseMsg(void)
ErrorF("\n"); ErrorF("\n");
exit(1); exit(1);
} }
/******************************************************************************/
void
OsVendorPreInit(void)
{
}