sdl-ios-xcode: src/video/photon/SDL_ph

comparison src/video/photon/SDL_ph_video.c @ 692:04dd6c6d7c30

Date: Fri, 15 Aug 2003 09:13:59 +0300 From: "Mike Gorchak" Subject: Patches for tests and QNX6 Here more fixes for the QNX6 in sdlqnx.diff file: - Spellchecked README.QNX (thanks to Julian Kinraid) - Fixed bugs in fullscreen mode: window region wasn't on top by default, so \ it caused some artifacts to be appeared on the screen, prevent window conten\ ts default filler in Photon while in fullscreen mode, it damages the screen. - Added support for the SDL_VIDEO_WINDOW_POS, SDL_VIDEO_CENTERED env variabl\ es. - Some minor code restructurization.

author	Sam Lantinga <slouken@libsdl.org>
date	Sat, 23 Aug 2003 23:20:21 +0000
parents	8bedd6d61642
children	aaf3b8af6616

comparison

equal deleted inserted replaced

-:609543e2b3a1
+:04dd6c6d7c30
 {
 PtArg_t     args[32];
 PhPoint_t   pos = {0, 0};
 PhDim_t     dim = {w, h};
 int         nargs = 0;
+const char* windowpos;
+const char* iscentered;
+int         x, y;
 PtSetArg(&args[nargs++], Pt_ARG_DIM, &dim, 0);
-PtSetArg(&args[nargs++], Pt_ARG_FILL_COLOR, Pg_BLACK, 0);
 if ((flags & SDL_RESIZABLE) == SDL_RESIZABLE)
 {
 PtSetArg(&args[nargs++], Pt_ARG_WINDOW_MANAGED_FLAGS, Pt_FALSE, Ph_WM_RESIZE | Ph_WM_CLOSE);
 PtSetArg(&args[nargs++], Pt_ARG_WINDOW_MANAGED_FLAGS, Pt_TRUE, Ph_WM_MAX | Ph_WM_RESTORE);
 }
 if ((flags & SDL_FULLSCREEN) == SDL_FULLSCREEN)
 {
 PtSetArg(&args[nargs++], Pt_ARG_POS, &pos, 0);
+PtSetArg(&args[nargs++], Pt_ARG_BASIC_FLAGS, Pt_TRUE, Pt_BASIC_PREVENT_FILL);
 PtSetArg(&args[nargs++], Pt_ARG_WINDOW_MANAGED_FLAGS, Pt_TRUE, Ph_WM_FFRONT | Ph_WM_MAX);
-PtSetArg(&args[nargs++], Pt_ARG_WINDOW_STATE, Pt_TRUE, Ph_WM_STATE_ISFRONT | Ph_WM_STATE_ISMAX |
+PtSetArg(&args[nargs++], Pt_ARG_WINDOW_STATE, Pt_TRUE, Ph_WM_STATE_ISFRONT | Ph_WM_STATE_ISFOCUS | Ph_WM_STATE_ISALTKEY);
-Ph_WM_STATE_ISFOCUS | Ph_WM_STATE_ISALTKEY);
+}
-}
+else
-else
+{
-{
+windowpos = getenv("SDL_VIDEO_WINDOW_POS");
+	iscentered = getenv("SDL_VIDEO_CENTERED");
+if ((iscentered) || ((windowpos) && (strcmp(windowpos, "center")==0)))
+{
+pos.x = (desktop_mode.width - w)/2;
+pos.y = (desktop_mode.height - h)/2;
+PtSetArg(&args[nargs++], Pt_ARG_POS, &pos, 0);
+	}
+else
+{
+if (windowpos)
+{
+if (sscanf(windowpos, "%d,%d", &x, &y) == 2 )
+{
+pos.x=x;
+pos.y=y;
+PtSetArg(&args[nargs++], Pt_ARG_POS, &pos, 0);
+}
+	    }
+}
+PtSetArg(&args[nargs++], Pt_ARG_FILL_COLOR, Pg_BLACK, 0);
 PtSetArg(&args[nargs++], Pt_ARG_WINDOW_STATE, Pt_FALSE, Ph_WM_STATE_ISFRONT | Ph_WM_STATE_ISMAX | Ph_WM_STATE_ISALTKEY);
 PtSetArg(&args[nargs++], Pt_ARG_WINDOW_MANAGED_FLAGS, Pt_TRUE, Ph_WM_HIDE);
 PtSetArg(&args[nargs++], Pt_ARG_WINDOW_NOTIFY_FLAGS, Pt_TRUE, Ph_WM_HIDE);
 PtSetArg(&args[nargs++], Pt_ARG_RESIZE_FLAGS, Pt_FALSE, Pt_RESIZE_XY_AS_REQUIRED);
 }
 PtSetResources(window, nargs, args);
 PtRealizeWidget(window);
+PtWindowToFront(window);
 return 0;
 }
 static const struct ColourMasks* ph_GetColourMasks(int bpp)
 return NULL;
 }
 static int ph_VideoInit(_THIS, SDL_PixelFormat *vformat)
 {
-PgVideoModeInfo_t my_mode_info;
 PgHWCaps_t my_hwcaps;
 int i;
 window=NULL;
 desktoppal=SDLPH_PAL_NONE;
 SDL_SetError("ph_VideoInit(): GetGraphicsHWCaps function failed !\n");
 this->FreeWMCursor(this, SDL_BlankCursor);
 return -1;
 }
-if (PgGetVideoModeInfo(my_hwcaps.current_video_mode, &my_mode_info) < 0)
+if (PgGetVideoModeInfo(my_hwcaps.current_video_mode, &desktop_mode) < 0)
 {
 SDL_SetError("ph_VideoInit(): PgGetVideoModeInfo function failed !\n");
 this->FreeWMCursor(this, SDL_BlankCursor);
 return -1;
 }
 /* We need to return BytesPerPixel as it in used by CreateRGBsurface */
-vformat->BitsPerPixel = my_mode_info.bits_per_pixel;
+vformat->BitsPerPixel = desktop_mode.bits_per_pixel;
-vformat->BytesPerPixel = my_mode_info.bytes_per_scanline/my_mode_info.width;
+vformat->BytesPerPixel = desktop_mode.bytes_per_scanline/desktop_mode.width;
-desktopbpp = my_mode_info.bits_per_pixel;
+desktopbpp = desktop_mode.bits_per_pixel;
 /* save current palette */
 if (desktopbpp==8)
 {
 PgGetPalette(savedpal);
 {
 desktoppal=SDLPH_PAL_SYSTEM;
 }
 current->flags &= ~SDL_RESIZABLE; /* no resize for Direct Context */
+current->flags |= SDL_HWSURFACE;
 }
 else
 {
 /* remove this if we'll support non-fullscreen sw/hw+doublebuf */
 current->flags &= ~SDL_DOUBLEBUF;
 /* finish window drawing, if we are not in fullscreen, of course */
 if ((current->flags & SDL_FULLSCREEN) != SDL_FULLSCREEN)
 {
 PtFlush();
+}
+else
+{
+PgFlush();
 }
 SDL_Unlock_EventThread();
 /* We're done! */

Mercurial > sdl-ios-xcode

comparison src/video/photon/SDL_ph_video.c @ 692:04dd6c6d7c30