window mode

Optional /w parameter to launch as a normal bordered window.

Example: HsvScreensaver.scr /w 640 360

Author: Istador

Windows/C#/HsvScreensaver/AssemblyInfo.tt

@@ -33,8 +33,8 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.4.6.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("0.4.6.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("0.5.0.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("0.5.0.<#= this.RevisionNumber #>")]
 <#+
     int RevisionNumber = (int)(DateTime.UtcNow - new DateTime(2016, 4, 19)).TotalDays;
 #>

Windows/C#/HsvScreensaver/Program.cs

@@ -12,7 +12,7 @@ static void Main(string[] args) {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
 
-            char cmd = getParam(args, 0, 's');
+            char cmd = getCommand(args, 0, 's');
             if ( cmd == 'c' ) {
                 Configure();
             }
@@ -26,6 +26,14 @@ static void Main(string[] args) {
                 Show();
                 #endif
             }
+            else if ( cmd == 'w' ) {
+                Settings.I.Windowed   = true;
+                Settings.I.Maximized  = false;
+                Settings.I.Fullscreen = false;
+                int w = (int.TryParse(getParam(args, 1, ""), out w) ? w : int.MaxValue);
+                int h = (int.TryParse(getParam(args, 2, ""), out h) ? h : int.MaxValue);
+                Show(w, h);
+            }
             else {
                 Configure();
             }
@@ -41,27 +49,33 @@ private static void Preview(string[] args) {
             Application.Run(new PreviewForm(Ptr));
         }
 
-        public static void Show() {
+        public static void Show(int width = int.MaxValue, int height = int.MaxValue) {
             // get resolution
-            int left = int.MaxValue;
-            int right = int.MinValue;
-            int top = int.MaxValue;
+            int left   = int.MaxValue;
+            int right  = int.MinValue;
+            int top    = int.MaxValue;
             int bottom = int.MinValue;
             foreach ( Screen s in Screen.AllScreens ) {
-                left = Math.Min(s.Bounds.Left, left);
-                right = Math.Max(s.Bounds.Right, right);
-                top = Math.Min(s.Bounds.Top, top);
+                left   = Math.Min(s.Bounds.Left,   left);
+                right  = Math.Max(s.Bounds.Right,  right);
+                top    = Math.Min(s.Bounds.Top,    top);
                 bottom = Math.Max(s.Bounds.Bottom, bottom);
             }
-            Rectangle r = new Rectangle(left, top, right - left, bottom - top);
+            width  = Math.Min(width,  right - left);
+            height = Math.Min(height, bottom - top);
+            Rectangle r = new Rectangle(left, top, width, height);
             using ( ScreensaverWindow scr = new ScreensaverWindow(r) ) {
                 scr.Run();
             }
         }
 
-        private static char getParam(string[] args, int index, char _default) {
+        private static string getParam(string[] args, int index, string _default) {
             if ( args.Length <= index || index < 0 ) { return _default; }
-            return args[index].Trim().Substring(1, 1).ToLower()[0];
+            return args[index].Trim();
+        }
+
+        private static char getCommand(string[] args, int index, char _default) {
+            return getParam(args, index, "/" + _default).Substring(1, 1).ToLower()[0];
         }
     }
 }

Windows/C#/HsvScreensaver/ScreensaverWindow.cs

@@ -13,16 +13,18 @@ class ScreensaverWindow : GameWindow {
         public ScreensaverWindow(Rectangle r)
             : base(r.Width, r.Height, GraphicsMode.Default, "HsvScreensaver", GameWindowFlags.FixedWindow) {
             // set up window
-            WindowBorder = WindowBorder.Hidden;
+            WindowBorder = (Settings.I.Windowed ? WindowBorder.Resizable : WindowBorder.Hidden);
             WindowState = (Settings.I.Fullscreen ? WindowState.Fullscreen : (Settings.I.Maximized ? WindowState.Maximized : WindowState.Normal));
             Location = r.Location;
             ClientRectangle = r;
 
             VSync = (Settings.I.VSync ? VSyncMode.On : VSyncMode.Off);
 
-            CursorVisible = false;
-            KeyDown += (sender, ev) => { Close(); };
-            MouseDown += (sender, ev) => { Close(); };
+            if ( ! Settings.I.Windowed ) {
+                CursorVisible = false;
+                KeyDown += (sender, ev) => { Close(); };
+                MouseDown += (sender, ev) => { Close(); };
+            }
 
             gl = new ScreensaverGL();
         }

Windows/C#/HsvScreensaver/Settings.cs

@@ -12,6 +12,8 @@ public class Settings {
         private static Settings instance = null;
         [NonSerialized()]
         private static string settingsDir = null;
+        [NonSerialized()]
+        public bool Windowed = false;
         #endregion
 
         #region serialized attributes