From fa6f9d06a3d1a90134d9349f5ce4ec5b4eeff5e3 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Fri, 31 Jul 2015 20:12:37 +0100 Subject: [PATCH] hw/xwin: Remove unused HotKeyAltTab engine function This was only ever used by the primaryfb engine, removed in commit c79f824b Signed-off-by: Jon Turney Reviewed-by: Colin Harrison --- hw/xwin/win.h | 3 --- hw/xwin/winshadddnl.c | 2 -- hw/xwin/winshadgdi.c | 2 -- hw/xwin/winwndproc.c | 8 -------- 4 files changed, 15 deletions(-) diff --git a/hw/xwin/win.h b/hw/xwin/win.h index 3b8e93dd2..927a08ee5 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -287,8 +287,6 @@ typedef Bool (*winCreateColormapProcPtr) (ColormapPtr pColormap); typedef Bool (*winDestroyColormapProcPtr) (ColormapPtr pColormap); -typedef Bool (*winHotKeyAltTabProcPtr) (ScreenPtr); - typedef Bool (*winCreatePrimarySurfaceProcPtr) (ScreenPtr); typedef Bool (*winReleasePrimarySurfaceProcPtr) (ScreenPtr); @@ -522,7 +520,6 @@ typedef struct _winPrivScreenRec { winStoreColorsProcPtr pwinStoreColors; winCreateColormapProcPtr pwinCreateColormap; winDestroyColormapProcPtr pwinDestroyColormap; - winHotKeyAltTabProcPtr pwinHotKeyAltTab; winCreatePrimarySurfaceProcPtr pwinCreatePrimarySurface; winReleasePrimarySurfaceProcPtr pwinReleasePrimarySurface; diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c index d4f940ec1..074ebf307 100644 --- a/hw/xwin/winshadddnl.c +++ b/hw/xwin/winshadddnl.c @@ -1211,8 +1211,6 @@ winSetEngineFunctionsShadowDDNL(ScreenPtr pScreen) pScreenPriv->pwinStoreColors = winStoreColorsShadowDDNL; pScreenPriv->pwinCreateColormap = winCreateColormapShadowDDNL; pScreenPriv->pwinDestroyColormap = winDestroyColormapShadowDDNL; - pScreenPriv->pwinHotKeyAltTab = - (winHotKeyAltTabProcPtr) (void (*)(void)) NoopDDA; pScreenPriv->pwinCreatePrimarySurface = winCreatePrimarySurfaceShadowDDNL; pScreenPriv->pwinReleasePrimarySurface = winReleasePrimarySurfaceShadowDDNL; #ifdef XWIN_MULTIWINDOW diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c index bf655174d..ba2e84e1e 100644 --- a/hw/xwin/winshadgdi.c +++ b/hw/xwin/winshadgdi.c @@ -1143,8 +1143,6 @@ winSetEngineFunctionsShadowGDI(ScreenPtr pScreen) pScreenPriv->pwinStoreColors = winStoreColorsShadowGDI; pScreenPriv->pwinCreateColormap = winCreateColormapShadowGDI; pScreenPriv->pwinDestroyColormap = winDestroyColormapShadowGDI; - pScreenPriv->pwinHotKeyAltTab = - (winHotKeyAltTabProcPtr) (void (*)(void)) NoopDDA; pScreenPriv->pwinCreatePrimarySurface = (winCreatePrimarySurfaceProcPtr) (void (*)(void)) NoopDDA; pScreenPriv->pwinReleasePrimarySurface = diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c index a2365a05b..b3b720bb7 100644 --- a/hw/xwin/winwndproc.c +++ b/hw/xwin/winwndproc.c @@ -1107,14 +1107,6 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) winFixShiftKeys(iScanCode); return 0; - case WM_HOTKEY: - if (s_pScreenPriv == NULL) - break; - - /* Call the engine-specific hot key handler */ - (*s_pScreenPriv->pwinHotKeyAltTab) (s_pScreen); - return 0; - case WM_ACTIVATE: if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput) break;