diff options
Diffstat (limited to 'xorg-server/hw/kdrive/ephyr/ephyrdriext.c')
| -rw-r--r-- | xorg-server/hw/kdrive/ephyr/ephyrdriext.c | 49 |
1 files changed, 18 insertions, 31 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c index fafe56d1f..a906ad170 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c @@ -32,8 +32,6 @@ #include <kdrive-config.h> #endif -#ifdef XEPHYR_DRI - #include <string.h> #define NEED_REPLIES @@ -94,8 +92,6 @@ static DISPATCH_PROC(SProcXF86DRIQueryVersion); static DISPATCH_PROC(SProcXF86DRIQueryDirectRenderingCapable); static DISPATCH_PROC(SProcXF86DRIDispatch); -static void XF86DRIResetProc(ExtensionEntry* extEntry); - static Bool ephyrDRIScreenInit (ScreenPtr a_screen) ; static Bool ephyrDRICreateWindow (WindowPtr a_win) ; static Bool ephyrDRIDestroyWindow (WindowPtr a_win) ; @@ -115,8 +111,10 @@ static Bool findWindowPairFromLocal (WindowPtr a_local, static unsigned char DRIReqCode = 0; -static DevPrivateKey ephyrDRIWindowKey = &ephyrDRIWindowKey; -static DevPrivateKey ephyrDRIScreenKey = &ephyrDRIScreenKey; +static int ephyrDRIWindowKeyIndex; +static DevPrivateKey ephyrDRIWindowKey = &ephyrDRIWindowKeyIndex; +static int ephyrDRIScreenKeyIndex; +static DevPrivateKey ephyrDRIScreenKey = &ephyrDRIScreenKeyIndex; #define GET_EPHYR_DRI_WINDOW_PRIV(win) ((EphyrDRIWindowPrivPtr) \ dixLookupPrivate(&(win)->devPrivates, ephyrDRIWindowKey)) @@ -152,7 +150,7 @@ ephyrDRIExtensionInit (ScreenPtr a_screen) XF86DRINumberErrors, ProcXF86DRIDispatch, SProcXF86DRIDispatch, - XF86DRIResetProc, + NULL, StandardMinorOpcode))) { DRIReqCode = (unsigned char)extEntry->base; DRIErrorBase = extEntry->errorBase; @@ -221,8 +219,7 @@ ephyrDRICreateWindow (WindowPtr a_win) && screen_priv->CreateWindow, FALSE) ; - EPHYR_LOG ("enter. win:%#x\n", - (unsigned int)a_win) ; + EPHYR_LOG ("enter. win:%p\n", a_win) ; screen->CreateWindow = screen_priv->CreateWindow ; is_ok = (*screen->CreateWindow) (a_win) ; @@ -296,7 +293,7 @@ ephyrDRIMoveWindow (WindowPtr a_win, } screen->MoveWindow = ephyrDRIMoveWindow ; - EPHYR_LOG ("window: %#x\n", (unsigned int)a_win) ; + EPHYR_LOG ("window: %p\n", a_win) ; if (!a_win->parent) { EPHYR_LOG ("cannot move root window\n") ; is_ok = TRUE ; @@ -356,7 +353,7 @@ ephyrDRIPositionWindow (WindowPtr a_win, } screen->PositionWindow = ephyrDRIPositionWindow ; - EPHYR_LOG ("window: %#x\n", (unsigned int)a_win) ; + EPHYR_LOG ("window: %p\n", a_win) ; win_priv = GET_EPHYR_DRI_WINDOW_PRIV (a_win) ; if (!win_priv) { EPHYR_LOG ("not a DRI peered window\n") ; @@ -408,7 +405,7 @@ ephyrDRIClipNotify (WindowPtr a_win, } screen->ClipNotify = ephyrDRIClipNotify ; - EPHYR_LOG ("window: %#x\n", (unsigned int)a_win) ; + EPHYR_LOG ("window: %p\n", a_win) ; win_priv = GET_EPHYR_DRI_WINDOW_PRIV (a_win) ; if (!win_priv) { EPHYR_LOG ("not a DRI peered window\n") ; @@ -615,14 +612,6 @@ out: } -/*ARGSUSED*/ -static void -XF86DRIResetProc ( - ExtensionEntry* extEntry -) -{ -} - static int ProcXF86DRIQueryVersion (register ClientPtr client) { @@ -914,7 +903,7 @@ appendWindowPairToList (WindowPtr a_local, EPHYR_RETURN_VAL_IF_FAIL (a_local, FALSE) ; - EPHYR_LOG ("(local,remote):(%#x, %d)\n", (unsigned int)a_local, a_remote) ; + EPHYR_LOG ("(local,remote):(%p, %d)\n", a_local, a_remote) ; for (i=0; i < NUM_WINDOW_PAIRS; i++) { if (window_pairs[i].local == NULL) { @@ -937,8 +926,8 @@ findWindowPairFromLocal (WindowPtr a_local, for (i=0; i < NUM_WINDOW_PAIRS; i++) { if (window_pairs[i].local == a_local) { *a_pair = &window_pairs[i] ; - EPHYR_LOG ("found (%#x, %d)\n", - (unsigned int)(*a_pair)->local, + EPHYR_LOG ("found (%p, %d)\n", + (*a_pair)->local, (*a_pair)->remote) ; return TRUE ; } @@ -978,7 +967,7 @@ createHostPeerWindow (const WindowPtr a_win, EPHYR_RETURN_VAL_IF_FAIL (a_win->drawable.pScreen, FALSE) ; - EPHYR_LOG ("enter. a_win '%#x'\n", (unsigned int)a_win) ; + EPHYR_LOG ("enter. a_win '%p'\n", a_win) ; if (!getWindowVisual (a_win, &visual)) { EPHYR_LOG_ERROR ("failed to get window visual\n") ; goto out ; @@ -1058,12 +1047,12 @@ ProcXF86DRICreateDrawable (ClientPtr client) EPHYR_LOG_ERROR ("non drawable windows are not yet supported\n") ; return BadImplementation ; } - EPHYR_LOG ("lookedup drawable %#x\n", (unsigned int)drawable) ; + EPHYR_LOG ("lookedup drawable %p\n", drawable) ; window = (WindowPtr)drawable; if (findWindowPairFromLocal (window, &pair) && pair) { remote_win = pair->remote ; - EPHYR_LOG ("found window '%#x' paire with remote '%d'\n", - (unsigned int)window, remote_win) ; + EPHYR_LOG ("found window '%p' paire with remote '%d'\n", + window, remote_win) ; } else if (!createHostPeerWindow (window, &remote_win)) { EPHYR_LOG_ERROR ("failed to create host peer window\n") ; return BadAlloc ; @@ -1084,8 +1073,8 @@ ProcXF86DRICreateDrawable (ClientPtr client) return BadAlloc ; } dixSetPrivate(&window->devPrivates, ephyrDRIWindowKey, win_priv); - EPHYR_LOG ("paired window '%#x' with remote '%d'\n", - (unsigned int)window, remote_win) ; + EPHYR_LOG ("paired window '%p' with remote '%d'\n", + window, remote_win) ; } WriteToClient(client, sizeof(xXF86DRICreateDrawableReply), (char *)&rep); @@ -1439,5 +1428,3 @@ SProcXF86DRIDispatch (register ClientPtr client) } } } - -#endif /*XEPHYR_DRI*/ |