From d8d1c9d63045b8bdecea7c7fecd6a1b35ab9f41c Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 6 Dec 2008 17:46:55 +0000 Subject: [PATCH] Date: Sat, 06 Dec 2008 14:54:10 +0100 From: Couriersud Subject: SDL: DirectFB mouse patch the attached patch (again) properly registers the mouse in the DirectFB driver. --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403302 --- src/video/directfb/SDL_DirectFB_modes.c | 10 ++++++---- src/video/directfb/SDL_DirectFB_mouse.c | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/video/directfb/SDL_DirectFB_modes.c b/src/video/directfb/SDL_DirectFB_modes.c index 4f8d4cc9a..86a47c89e 100644 --- a/src/video/directfb/SDL_DirectFB_modes.c +++ b/src/video/directfb/SDL_DirectFB_modes.c @@ -348,9 +348,11 @@ DirectFB_InitModes(_THIS) display.driverdata = dispdata; #if (DIRECTFB_MAJOR_VERSION == 1) && (DIRECTFB_MINOR_VERSION >= 2) - dlc.flags = DLCONF_WIDTH | DLCONF_HEIGHT | DLCONF_PIXELFORMAT | DLCONF_OPTIONS; - ret = layer->SetConfiguration(layer, &dlc); - #endif + dlc.flags = + DLCONF_WIDTH | DLCONF_HEIGHT | DLCONF_PIXELFORMAT | + DLCONF_OPTIONS; + ret = layer->SetConfiguration(layer, &dlc); +#endif SDL_DFB_CHECKERR(layer->SetCooperativeLevel(layer, DLSCL_SHARED)); @@ -467,7 +469,7 @@ DirectFB_SetDisplayMode(_THIS, SDL_DisplayMode * mode) mode->format); return -1; } - + data->pixelformat = rconfig.pixelformat; data->cw = config.width; data->ch = config.height; diff --git a/src/video/directfb/SDL_DirectFB_mouse.c b/src/video/directfb/SDL_DirectFB_mouse.c index 5531e2de3..b28a511c7 100644 --- a/src/video/directfb/SDL_DirectFB_mouse.c +++ b/src/video/directfb/SDL_DirectFB_mouse.c @@ -49,7 +49,8 @@ DirectFB_InitMouse(_THIS) mouse.WarpMouse = DirectFB_WarpMouse; mouse.FreeMouse = DirectFB_FreeMouse; mouse.cursor_shown = 1; - devdata->mouse = SDL_AddMouse(&mouse, -1, "Mouse", 0, 0, 1); + SDL_SetMouseIndexId(0, 0); /* ID == Index ! */ + devdata->mouse = SDL_AddMouse(&mouse, 0, "Mouse", 0, 0, 1); } void