sdl-ios-xcode: src/video/win32/SDL_win32window.c comparison

comparison src/video/win32/SDL_win32window.c @ 3168:6338b7f2d024

Hi, I have prepared a set of patches to readd WindowsCE support to SDL 1.3. I've created a new GAPI/Rawframebuffer and a DirectDraw renderer. Both renderers are work in progress and there are several unimplemented cases. (Notably RenderLine/RenderPoint/RenderFill/QueryTexturePixels/UpdateTexture and texture blending ) Nevertheless I am successfully using these renderers together with the SDL software renderer. (On most devices the SDL software renderer will be much faster as there are only badly optimized vendor drivers available) I send these patches now in this unpolished state because there seems to be some interest in win ce and someone has to start supporting SDL 1.3 Now on to the patches: wince_events_window_fixes.patch fixes some wince incompatibilities and adds fullscreen support via SHFullScreen. NOTE: This patch shouldn't have any side effects on Windows, but I have NOT tested it on Windows, so please double-check. This patch doesn't dependent on the following ones. wince_renderers_system.patch This patch does all necessary modifications to the SDL system. - it adds the renderers to the configure system - it adds the renderers to win32video SDL_ceddrawrender.c SDL_ceddrawrender.h SDL_gapirender_c.h SDL_gapirender.c SDL_gapirender.h these files add the new render drivers and should be placed in src/video/win32 Some notes to people who want to test this: - I have only compiled sdl with ming32ce, so the VisualC files are not up to date - As mingw32ce has no ddraw.h this file must be taken from the MS SDK and modified to work with gcc - I had to modify line 2611 in configure.in to EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lcoredll -lcommctrl -lmmtimer -Wl,--image-base -Wl,0x10000" otherwise GetCPinfo wouldn't link. If someone knows whats causing this I'd be happy to hear about it. It would be great if these patches could make their way into SVN as this would make collaboration much much easier. I'm out of office for the next week and therefore will be unavailable via email. Regards Stefan

author	Sam Lantinga <slouken@libsdl.org>
date	Sun, 07 Jun 2009 02:44:46 +0000
parents	7f684f249ec9
children	413672b09bb3

comparison

equal deleted inserted replaced

-:0c85abc61e47
+:6338b7f2d024
 #include "SDL_win32video.h"
 /* This is included after SDL_win32video.h, which includes windows.h */
 #include "SDL_syswm.h"
+#define SHFS_SHOWTASKBAR            0x0001
+#define SHFS_HIDETASKBAR            0x0002
+#define SHFS_SHOWSIPBUTTON          0x0004
+#define SHFS_HIDESIPBUTTON          0x0008
+#define SHFS_SHOWSTARTICON          0x0010
+#define SHFS_HIDESTARTICON          0x0020
+#ifdef _WIN32_WCE
+// dynamically load aygshell dll because we want SDL to work on HPC and be300
+int aygshell_loaded = 0;
+BOOL(WINAPI * SHFullScreen) (HWND hwndRequester, DWORD dwState) = 0;
+static BOOL
+CE_SHFullScreen(HWND hwndRequester, DWORD dwState)
+{
+if (SHFullScreen == 0 && aygshell_loaded == 0) {
+aygshell_loaded = 0;
+void *lib = SDL_LoadObject("aygshell.dll");
+if (lib) {
+SHFullScreen =
+(BOOL(WINAPI *) (HWND, DWORD)) SDL_LoadFunction(lib,
+"SHFullScreen");
+}
+}
+if (SHFullScreen) {
+SHFullScreen(hwndRequester, dwState);
+//printf("SHFullscreen(%i)\n",dwState);
+}
+}
+#endif
 extern HCTX *g_hCtx;            /* the table of tablet event contexts, each windows has to have it's own tablet context */
 static Uint32 highestId = 0;    /* the highest id of the tablet context */
 /* Fake window to help with DirectInput events. */
 {
 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
 RECT rect;
 DWORD style;
 HWND top;
+BOOL menu;
 int x, y;
 /* Figure out what the window area will be */
 if (window->flags & SDL_WINDOW_FULLSCREEN) {
 top = HWND_TOPMOST;
 style = GetWindowLong(hwnd, GWL_STYLE);
 rect.left = 0;
 rect.top = 0;
 rect.right = window->w;
 rect.bottom = window->h;
-AdjustWindowRectEx(&rect, style,
+#ifdef _WIN32_WCE
-(style & WS_CHILDWINDOW) ? FALSE : (GetMenu(hwnd) !=
+menu = FALSE;
-NULL), 0);
+#else
+menu = (style & WS_CHILDWINDOW) ? FALSE : (GetMenu(hwnd) != NULL);
+#endif
+AdjustWindowRectEx(&rect, style, menu, 0);
 if ((window->flags & SDL_WINDOW_FULLSCREEN)
 || window->x == SDL_WINDOWPOS_CENTERED) {
 x = (GetSystemMetrics(SM_CXSCREEN) - window->w) / 2;
 } else {
 {
 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
 RECT rect;
 DWORD style;
 HWND top;
+BOOL menu;
 int w, h;
 /* Figure out what the window area will be */
 if (window->flags & SDL_WINDOW_FULLSCREEN) {
 top = HWND_TOPMOST;
 style = GetWindowLong(hwnd, GWL_STYLE);
 rect.left = 0;
 rect.top = 0;
 rect.right = window->w;
 rect.bottom = window->h;
-AdjustWindowRectEx(&rect, style,
+#ifdef _WIN32_WCE
-(style & WS_CHILDWINDOW) ? FALSE : (GetMenu(hwnd) !=
+menu = FALSE;
-NULL), 0);
+#else
+menu = (style & WS_CHILDWINDOW) ? FALSE : (GetMenu(hwnd) != NULL);
+#endif
+AdjustWindowRectEx(&rect, style, menu, 0);
 w = (rect.right - rect.left);
 h = (rect.bottom - rect.top);
 SetWindowPos(hwnd, top, 0, 0, w, h, (SWP_NOCOPYBITS | SWP_NOMOVE));
 }
 WIN_ShowWindow(_THIS, SDL_Window * window)
 {
 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
 ShowWindow(hwnd, SW_SHOW);
+#ifdef _WIN32_WCE
+if (window->flags & SDL_WINDOW_FULLSCREEN) {
+CE_SHFullScreen(hwnd,
+SHFS_HIDESTARTICON | SHFS_HIDETASKBAR |
+SHFS_HIDESIPBUTTON);
+}
+#endif
 }
 void
 WIN_HideWindow(_THIS, SDL_Window * window)
 {
 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
 ShowWindow(hwnd, SW_HIDE);
+#ifdef _WIN32_WCE
+if (window->flags & SDL_WINDOW_FULLSCREEN) {
+CE_SHFullScreen(hwnd,
+SHFS_SHOWSTARTICON | SHFS_SHOWTASKBAR |
+SHFS_SHOWSIPBUTTON);
+}
+#endif
 }
 void
 WIN_RaiseWindow(_THIS, SDL_Window * window)
 {
 top = HWND_TOPMOST;
 } else {
 top = HWND_NOTOPMOST;
 }
 SetWindowPos(hwnd, top, 0, 0, 0, 0, (SWP_NOMOVE | SWP_NOSIZE));
+#ifdef _WIN32_WCE
+if (window->flags & SDL_WINDOW_FULLSCREEN) {
+CE_SHFullScreen(hwnd,
+SHFS_HIDESTARTICON | SHFS_HIDETASKBAR |
+SHFS_HIDESIPBUTTON);
+}
+#endif
 }
 void
 WIN_MaximizeWindow(_THIS, SDL_Window * window)
 {
 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
 ShowWindow(hwnd, SW_MAXIMIZE);
+#ifdef _WIN32_WCE
+if (window->flags & SDL_WINDOW_FULLSCREEN) {
+CE_SHFullScreen(hwnd,
+SHFS_HIDESTARTICON | SHFS_HIDETASKBAR |
+SHFS_HIDESIPBUTTON);
+}
+#endif
 }
 void
 WIN_MinimizeWindow(_THIS, SDL_Window * window)
 {
 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
 ShowWindow(hwnd, SW_MINIMIZE);
+#ifdef _WIN32_WCE
+if (window->flags & SDL_WINDOW_FULLSCREEN) {
+CE_SHFullScreen(hwnd,
+SHFS_SHOWSTARTICON | SHFS_SHOWTASKBAR |
+SHFS_SHOWSIPBUTTON);
+}
+#endif
 }
 void
 WIN_RestoreWindow(_THIS, SDL_Window * window)
 {
 SDL_SetError("Unable to create Helper Window Class: error %d.",
 GetLastError());
 return -1;
 }
+HWND hWndParent = NULL;
+#ifndef _WIN32_WCE
+/* WinCE doesn't have HWND_MESSAGE */
+hWndParent = HWND_MESSAGE;
+#endif
 /* Create the window. */
 SDL_HelperWindow = CreateWindowEx(0, SDL_HelperWindowClassName,
 SDL_HelperWindowName,
-WS_OVERLAPPEDWINDOW, CW_USEDEFAULT,
+WS_OVERLAPPED, CW_USEDEFAULT,
 CW_USEDEFAULT, CW_USEDEFAULT,
-CW_USEDEFAULT, HWND_MESSAGE, NULL,
+CW_USEDEFAULT, hWndParent, NULL,
 hInstance, NULL);
 if (SDL_HelperWindow == NULL) {
 UnregisterClass(SDL_HelperWindowClassName, hInstance);
 SDL_SetError("Unable to create Helper Window: error %d.",
 GetLastError());

Mercurial > sdl-ios-xcode

comparison src/video/win32/SDL_win32window.c @ 3168:6338b7f2d024