vwatch doesn't work with it :(

Author: aouwt

.gitignore

@@ -1,4 +1,25 @@
 wm
 wm.exe
+
 global
 global.exe
+
+untitled
+untitled.exe
+
+wm.vwatch.bas
+wm.vwatch
+wm.vwatch.exe
+
+global.vwatch.bas
+global.vwatch
+global.vwatch.exe
+
+direntry.h
+timers.h
+vwatch
+vwatch.bas
+
+qb64
+internal/
+source/

README.md

@@ -1,7 +1,8 @@
 # qb-wm
+
 A (very basic <sup><small>no pun intended</small></sup>) window manager, written in [QB64](https://qb64.org)
 
-![gif of it doin stuff](https://raw.githubusercontent.com/all-other-usernames-were-taken/all-other-usernames-were-taken/main/files/qb-wm.gif)
+<img src="https://raw.githubusercontent.com/all-other-usernames-were-taken/all-other-usernames-were-taken/main/files/qb-wm.gif" alt="gif of it doin stuff" data-align="center">
 
 Due to QB64 restrictions, it does not currently support X/Wayland/etc. However, I do intend to make a *thing* that can interface to programs using QB64's TCP functionality, but that would be in the far future. As it stands now, it's merely a proof-of-concept, and not practical by any means.
 
@@ -10,6 +11,7 @@ If you want to contribute, I will happily allow it. I don't have alot of time on
 ---
 
 ## Usage
+
 Simply open `wm.bas` in the [QB64 IDE](https://github.com/QB64Team/qb64/releases/), and press <kbd>F5</kbd> to compile and run!
 
 <br />
@@ -25,11 +27,12 @@ Controls are:
 - Click and drag to move a window,
 - click a window's titlebar to get it's focus,
 - right click and drag to resize,
-- when the log window is in focus, pressing <kbd>Shift</kbd>+<kbd>=</kpd> spawns a new window,
+- when the log window is in focus, pressing <kbd>Shift</kbd>+<kbd>=</kbd> spawns a new window,
 - pressing <kbd>Space</kbd> while left-clicking the title bar opens a context menu, that when clicked, closes the selected window, and
 - the "Text editor" window is a simple text editor, as the name implies.
 
 ---
 
 ## Compiling
+
 It requires using at least version 1.4 of [QB64](https://qb64.org) to compile, because `$NOPREFIX` is not available in versions earlier than that.

global.bh

@@ -15,6 +15,9 @@ Type winType 'Window type definition. QB64 is not object-oriented, so we have to
 
 End Type
 
+'Constants
+Const True = -1
+Const False = 0
 
 'Initialize variables
 Rem $Dynamic
@@ -45,12 +48,22 @@ __image_Background = LoadImage("images/back.png", 32)
 __image_Screen = NewImage(640, 480, 32)
 
 '...and the FONTs
-__font_Header = LoadFont("/usr/share/fonts/truetype/ubuntu/Ubuntu-B.ttf", 14)
-__font_Body = LoadFont("/usr/share/fonts/truetype/ubuntu/Ubuntu-L.ttf", 12)
-__font_Mono = LoadFont("/usr/share/fonts/truetype/ubuntu/UbuntuMono-R.ttf", 12, "DONTBLEND")
-
-__font_Serif = LoadFont("/usr/share/fonts/truetype/liberation/LiberationSerif-Regular.ttf", 12)
-__font_Sans = LoadFont("/usr/share/fonts/truetype/ubuntu/Ubuntu-R.ttf", 12)
+$If LINUX Then
+    __font_Header = LoadFont("/usr/share/fonts/truetype/ubuntu/Ubuntu-B.ttf", 14)
+    __font_Body = LoadFont("/usr/share/fonts/truetype/ubuntu/Ubuntu-L.ttf", 12)
+    __font_Mono = LoadFont("/usr/share/fonts/truetype/ubuntu/UbuntuMono-R.ttf", 12, "DONTBLEND")
+
+    __font_Serif = LoadFont("/usr/share/fonts/truetype/liberation/LiberationSerif-Regular.ttf", 12)
+    __font_Sans = LoadFont("/usr/share/fonts/truetype/ubuntu/Ubuntu-R.ttf", 12)
+$Else
+    'TODO: integrate Windows & MacOS fonts
+    __font_Header = 16
+    __font_Body = 14
+    __font_Mono = 14
+
+    __font_Serif = 14
+    __font_Sans = 14
+$End If
 
 __screenFont = __font_Header
 
@@ -81,6 +94,7 @@ __template_WinOptions.FH = __font_Body
 
 'Initialize the WinOptions template's contents
 Dest __template_WinOptions.IH
+Font __template_WinOptions.FH
 PrintString (0, 0), "Close"
 
 

wm.bas

@@ -53,16 +53,20 @@ Do
 
             Case win_Cat 'Text editor window
                 If w(win_Cat).Z = 0 Then
-                    Select Case __inKey '__inKey is updated when upd is called.
-                        Case Chr$(8): win_Cat_Text = Left$(win_Cat_Text, Len(win_Cat_Text) - 1) 'backspace
-                        Case Else: win_Cat_Text = win_Cat_Text + __inKey 'Append keypress to window
-                    End Select
 
-                    If (w(win).W > 8) And (w(win).H > 8) Then
-                        FreeImage w(win).IH 'Resize the window. Not required every frame, but it should be fine.
-                        w(win).IH = NewImage(w(win).W, w(win).H, 32)
-                        Font w(win).FH, w(win).IH
-                    End If
+                    Do Until __inKey = ""
+                        Select Case __inKey '__inKey is updated when upd is called.
+                            Case Chr$(8): win_Cat_Text = Left$(win_Cat_Text, Len(win_Cat_Text) - 1) 'backspace
+                            Case Else: win_Cat_Text = win_Cat_Text + __inKey 'Append keypress to window
+                        End Select
+                        __inKey = InKey$
+                    Loop
+
+                    'If (w(win).W > 8) And (w(win).H > 8) Then
+                    '    FreeImage w(win).IH 'Resize the window. Not required every frame, but it should be fine.
+                    '    w(win).IH = NewImage(w(win).W, w(win).H, 32)
+                    '    Font w(win).FH, w(win).IH
+                    'End If
 
                     Dest w(win_Cat).IH
                     Print win_Cat_Text;
@@ -250,6 +254,7 @@ Sub updateMouse Static
 
     Dim optMenu As Integer, optWin As Integer
     Dim mLockX As Single, mLockY As Single 'Or as I like to call it, mmmlocks and mmmlockie
+    Dim mouseLatch As Bit
 
     Dim win As Integer, i As Integer
     For win = UBound(winZOrder) To LBound(winZOrder) Step -1
@@ -270,14 +275,18 @@ Sub updateMouse Static
                     grabFocus optMenu
 
                     optWin = i
+                    mouseLatch = True
                 End If
 
-            ElseIf (MouseButton(1) Or MouseButton(2)) And (__focusedWindow <> i) Then
+            ElseIf (MouseButton(1) Or MouseButton(2)) And (mouseLatch = False) Then
                 grabFocus i
+                mouseLatch = True
+
+            ElseIf (__focusedWindow = i) And (Not MouseButton(1)) Then mouseLatch = False
             End If
 
-            'ElseIf (mouseIsOver(i) = 0) And (MouseButton(1)) Then __focusedWindow = 0
-            'ElseIf (mouseIsOver(i)) And (MouseButton(1)) Then grabFocus i
+            Rem ElseIf (mouseIsOver(i) = false) And (MouseButton(1)) Then __focusedWindow = 0
+            Rem ElseIf (mouseIsOver(i)) And (MouseButton(1)) Then grabFocus i
         End If