Mercurial > sdl-ios-xcode
view src/video/directfb/SDL_DirectFB_WM.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 | 62d4992e5a92 |
children | 64ce267332c6 |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2009 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" //#include "SDL_syswm.h" //#include "../SDL_sysvideo.h" //#include "../../events/SDL_keyboard_c.h" #include "SDL_DirectFB_video.h" #define COLOR_EXPAND(col) col.r, col.g, col.b, col.a static DFB_Theme theme_std = { 4, 4, 8, 8, {255, 200, 200, 200}, 24, {255, 0, 0, 255}, 16, {255, 255, 255, 255}, "/usr/share/fonts/truetype/freefont/FreeSans.ttf", {255, 255, 0, 0}, {255, 255, 255, 0}, }; static DFB_Theme theme_none = { 0, 0, 0, 0, {0, 0, 0, 0}, 0, {0, 0, 0, 0}, 0, {0, 0, 0, 0}, NULL }; static void DrTriangle(IDirectFBSurface * s, int down, int x, int y, int w) { int x1, x2, x3; int y1, y2, y3; if (down) { x1 = x + w / 2; x2 = x; x3 = x + w; y1 = y + w; y2 = y; y3 = y; } else { x1 = x + w / 2; x2 = x; x3 = x + w; y1 = y; y2 = y + w; y3 = y + w; } s->FillTriangle(s, x1, y1, x2, y2, x3, y3); } static void DrCaption(IDirectFBSurface * s, int x, int y, char *text) { DFBSurfaceTextFlags flags; flags = DSTF_CENTER | DSTF_TOP; s->DrawString(s, text, -1, x, y, flags); } void DirectFB_WM_RedrawLayout(SDL_Window * window) { SDL_DFB_WINDOWDATA(window); IDirectFBSurface *s = windata->window_surface; DFB_Theme *t = &windata->theme; int i; int d = (t->caption_size - t->font_size) / 2; int x, y, w; if (!windata->is_managed || (window->flags & SDL_WINDOW_FULLSCREEN)) return; //s->SetDrawingFlags(s, DSDRAW_BLEND); s->SetColor(s, COLOR_EXPAND(t->frame_color)); /* top */ for (i = 0; i < t->top_size; i++) s->DrawLine(s, 0, i, windata->size.w, i); /* bottom */ for (i = windata->size.h - t->bottom_size; i < windata->size.h; i++) s->DrawLine(s, 0, i, windata->size.w, i); /* left */ for (i = 0; i < t->left_size; i++) s->DrawLine(s, i, 0, i, windata->size.h); /* right */ for (i = windata->size.w - t->right_size; i < windata->size.w; i++) s->DrawLine(s, i, 0, i, windata->size.h); /* Caption */ s->SetColor(s, COLOR_EXPAND(t->caption_color)); s->FillRectangle(s, t->left_size, t->top_size, windata->client.w, t->caption_size); /* Close Button */ w = t->caption_size; x = windata->size.w - t->right_size - w + d; y = t->top_size + d; s->SetColor(s, COLOR_EXPAND(t->close_color)); DrTriangle(s, 1, x, y, w - 2 * d); /* Max Button */ s->SetColor(s, COLOR_EXPAND(t->max_color)); DrTriangle(s, window->flags & SDL_WINDOW_MAXIMIZED ? 1 : 0, x - w, y, w - 2 * d); /* Caption */ if (window->title) { s->SetColor(s, COLOR_EXPAND(t->font_color)); DrCaption(s, (x - w) / 2, t->top_size + d, window->title); } /* Icon */ if (windata->icon) { DFBRectangle dr; dr.x = t->left_size + d; dr.y = t->top_size + d; dr.w = w - 2 * d; dr.h = w - 2 * d; s->SetBlittingFlags(s, DSBLIT_BLEND_ALPHACHANNEL); s->StretchBlit(s, windata->icon, NULL, &dr); } windata->wm_needs_redraw = 0; } DFBResult DirectFB_WM_GetClientSize(_THIS, SDL_Window * window, int *cw, int *ch) { SDL_DFB_WINDOWDATA(window); DFBResult ret; ret = windata->window->GetSize(windata->window, cw, ch); *cw -= windata->theme.left_size + windata->theme.right_size; *ch -= windata->theme.top_size + windata->theme.caption_size + windata->theme.bottom_size; return ret; } void DirectFB_WM_AdjustWindowLayout(SDL_Window * window) { SDL_DFB_WINDOWDATA(window); if (!windata->is_managed) windata->theme = theme_none; else if (window->flags & SDL_WINDOW_FULLSCREEN) { windata->theme = theme_none; } else if (window->flags & SDL_WINDOW_MAXIMIZED) { windata->theme = theme_std; windata->theme.left_size = 0; windata->theme.right_size = 0; windata->theme.top_size = 0; windata->theme.bottom_size = 0; } else { windata->theme = theme_std; } windata->client.x = windata->theme.left_size; windata->client.y = windata->theme.top_size + windata->theme.caption_size; windata->client.w = window->w; windata->client.h = window->h; windata->size.w = window->w + windata->theme.left_size + windata->theme.right_size; windata->size.h = window->h + windata->theme.top_size + windata->theme.caption_size + windata->theme.bottom_size; } void DirectFB_WM_MaximizeWindow(_THIS, SDL_Window * window) { SDL_DFB_WINDOWDATA(window); SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window); windata->window->GetPosition(windata->window, &windata->restore.x, &windata->restore.y); windata->window->GetSize(windata->window, &windata->restore.w, &windata->restore.h); /* Do this already here */ window->flags |= SDL_WINDOW_MAXIMIZED; DirectFB_WM_AdjustWindowLayout(window); windata->window->MoveTo(windata->window, 0, 0); windata->window->Resize(windata->window, display->current_mode.w, display->current_mode.h); SDL_SendWindowEvent(windata->sdl_id, SDL_WINDOWEVENT_MAXIMIZED, 0, 0); } void DirectFB_WM_RestoreWindow(_THIS, SDL_Window * window) { SDL_DFB_WINDOWDATA(window); /* Do this already here */ //window->flags &= ~(SDL_WINDOW_MAXIMIZED | SDL_WINDOW_MINIMIZED); DirectFB_WM_AdjustWindowLayout(window); windata->window->MoveTo(windata->window, windata->restore.x, windata->restore.y); windata->window->Resize(windata->window, windata->restore.w, windata->restore.h); SDL_SendWindowEvent(windata->sdl_id, SDL_WINDOWEVENT_RESTORED, 0, 0); } enum { WM_POS_NONE = 0x00, WM_POS_CAPTION = 0x01, WM_POS_CLOSE = 0x02, WM_POS_MAX = 0x04, WM_POS_LEFT = 0x08, WM_POS_RIGHT = 0x10, WM_POS_TOP = 0x20, WM_POS_BOTTOM = 0x40, }; static int WMIsClient(DFB_WindowData * p, int x, int y) { x -= p->client.x; y -= p->client.y; if (x < 0 || y < 0) return 0; if (x >= p->client.w || y >= p->client.h) return 0; return 1; } static int WMPos(DFB_WindowData * p, int x, int y) { int pos = WM_POS_NONE; if (!WMIsClient(p, x, y)) { if (y < p->theme.top_size) { pos |= WM_POS_TOP; } else if (y < p->client.y) { if (x < p->size.w - p->theme.right_size - 2 * p->theme.caption_size) { pos |= WM_POS_CAPTION; } else if (x < p->size.w - p->theme.right_size - p->theme.caption_size) { pos |= WM_POS_MAX; } else { pos |= WM_POS_CLOSE; } } else if (y >= p->size.h - p->theme.bottom_size) { pos |= WM_POS_BOTTOM; } if (x < p->theme.left_size) { pos |= WM_POS_LEFT; } else if (x >= p->size.w - p->theme.right_size) { pos |= WM_POS_RIGHT; } } return pos; } static int wm_grab; static int wm_lastx; static int wm_lasty; int DirectFB_WM_ProcessEvent(_THIS, SDL_Window * window, DFBWindowEvent * evt) { SDL_DFB_WINDOWDATA(window); if (!windata->is_managed) return 0; switch (evt->type) { case DWET_BUTTONDOWN: if (evt->buttons & DIBM_LEFT) { int pos = WMPos(windata, evt->x, evt->y); switch (pos) { case WM_POS_NONE: return 0; case WM_POS_CLOSE: SDL_SendWindowEvent(windata->sdl_id, SDL_WINDOWEVENT_CLOSE, 0, 0); return 1; case WM_POS_MAX: if (window->flags & SDL_WINDOW_MAXIMIZED) { DirectFB_WM_RestoreWindow(_this, window); } else { DirectFB_WM_MaximizeWindow(_this, window); } return 1; default: wm_grab = pos; windata->window->GrabPointer(windata->window); wm_lastx = evt->cx; wm_lasty = evt->cy; } } return 1; case DWET_BUTTONUP: break; case DWET_MOTION: if (!wm_grab) return 0; if (evt->buttons & DIBM_LEFT) { int dx = evt->cx - wm_lastx; int dy = evt->cy - wm_lasty; int cw, ch; if (wm_grab & WM_POS_CAPTION) windata->window->Move(windata->window, dx, dy); if (wm_grab & WM_POS_RIGHT) { windata->window->GetSize(windata->window, &cw, &ch); windata->window->Resize(windata->window, cw + dx, ch); } if (wm_grab & WM_POS_BOTTOM) { windata->window->GetSize(windata->window, &cw, &ch); windata->window->Resize(windata->window, cw, ch + dy); } wm_lastx = evt->cx; wm_lasty = evt->cy; return 1; } windata->window->UngrabPointer(windata->window); wm_grab = WM_POS_NONE; break; case DWET_KEYDOWN: break; case DWET_KEYUP: break; default: ; } return 0; }