riscos: support creating windows with the SDL_NOFRAME flag set

libsdl-org · Nov 18, 2019 · e87e1ac · e87e1ac
1 parent e783b36
commit e87e1ac
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/README.RISCOS b/README.RISCOS
@@ -99,7 +99,7 @@ This section contains additional notes on some specific commands.
 SDL_SetVideoMode
   On RISC OS a fullscreen mode directly accesses the screen. This can be modified by the environmental variable (SDL$<appname>$BackBuffer) or by using the SDL_SWSURFACE flag to write to an offscreen buffer that is updated using SDL_UpdateRects.
   Open GL is not supported so SDL_OPENGL and SDL_OPENGLBLIT flags fail.
-  SDL_RESIZEABLE and SDL_NOFRAME flags are not supported.
+  SDL_RESIZEABLE flag is not supported.
 
 SDL_SetColors
   In a wimp mode the screen colours are not changed for a hardware palette instead the RISC OS sprite colour mapping is used to get the best matching colours.

diff --git a/WhatsNew b/WhatsNew
@@ -84,6 +84,7 @@ Changes include:
 - RISC OS: support Windows and Menu key input.
 - RISC OS: implement SDL_WM_IconifyWindow()
 - RISC OS: send SDL_APPACTIVE events when iconizing the window.
+- RISC OS: support creating windows with the SDL_NOFRAME flag set.
 - Configuration: fix library detection selecting wrong lib (bug 2795.)
 - Configuration: fix detecting dynamic library support on powerpc64le
   (bug 3481.)

diff --git a/docs.html b/docs.html
@@ -206,6 +206,9 @@ <H2> SDL 1.2.16 Release Notes </H2>
 <P>
   RISC OS: send SDL_APPACTIVE events when iconizing the window.
 </P>
+<P>
+  RISC OS: support creating windows with the SDL_NOFRAME flag set.
+</P>
 <P>
   Configuration: fix library detection selecting wrong lib (bug <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=2795">2795</a>.)
 </P>

diff --git a/src/video/riscos/SDL_wimpvideo.c b/src/video/riscos/SDL_wimpvideo.c
@@ -231,8 +231,11 @@ unsigned int WIMP_SetupWindow(_THIS, SDL_Surface *surface)
    window_block[5] = 0;
    window_block[6] = -1;			  /* Open on top of window stack */
 
-   window_block[7] = 0x85040042;      /* Window flags */
-   if (riscos_closeaction != 0) window_block[7] |= 0x2000000;
+   window_block[7] = 0x80040042;      /* Window flags */
+   if (!(surface->flags & SDL_NOFRAME)) {
+      window_block[7] |= 0x5000000;
+      if (riscos_closeaction != 0) window_block[7] |= 0x2000000;
+   }
 
    /* TODO: Take into account surface->flags */