Merge pull request #23 from idietmoran/dev-win32

Added Boarderless Windowed and Fullscreen

CHANGELOG.md

@@ -2,9 +2,14 @@
 All notable changes to this project will be documented in this file
 
 ## [1.0.5]
+### Added
+- Added option for borderless windowed mode
+- Added option for fullscreen mode
 ### Fixed
 - Fixed issue where window could be resized when locked in the window
     - This could create an issue with programs running in elevated permissions
+### Removed
+- Removed the ability for display lock to select the itself
 
 ## [1.0.4]
 ### Added

src/bin/menu.c

@@ -6,7 +6,6 @@
 
 void initMenu(Menu *menu)
 {
-    menu->currentMenu = MAIN;
     menu->windows.count = 0;
     menu->currentSelection = 0;
     menu->active = FALSE;

src/bin/menu.h

@@ -3,6 +3,8 @@
 
 #include "win.h"
 
+typedef struct SETTINGS SETTINGS;
+
 typedef struct Args
 {
     Menu *menu;
@@ -15,6 +17,7 @@ typedef struct winArgs
 {
     HANDLE *mutex;
     WINDOW *window;
+    SETTINGS *settings;
     BOOL *active;
 } winArgs;
 

src/bin/win.c

@@ -7,11 +7,9 @@
 void openWindows(WINDOWLIST *windows)
 {
     //mutex = CreateMutex(NULL, FALSE, NULL);
-
     windows->count = 0;
 
     EnumWindows(&EnumWindowsProc, (LPARAM)windows);
-
 }
 
 // enumerate windows and get current window list
@@ -29,7 +27,7 @@ BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam)
         GetWindowTextA(hwnd, title, sizeof(title));
 
         // if title contains more than 1 character
-        if (strlen(title) != 0)
+        if (strlen(title) != 0 && strcmp(title, "Display Lock") != 0)
         {
             // get rectangle
             //GetWindowRect(hwnd, &win->windows[win->count].size);
@@ -62,19 +60,60 @@ BOOL checkResizeStyle(HWND activeWindow)
     return (GetWindowLongPtr(activeWindow, GWL_STYLE)&WS_SIZEBOX);
 }
 
+void borderlessWindow(HWND activeWindow)
+{
+    SetWindowLongPtr(activeWindow, GWL_STYLE, GetWindowLongPtr(activeWindow, GWL_STYLE)^WS_OVERLAPPED^WS_THICKFRAME^WS_SYSMENU^WS_CAPTION);
+    SetWindowLongPtr(activeWindow, GWL_EXSTYLE, GetWindowLongPtr(activeWindow, GWL_EXSTYLE)^WS_EX_WINDOWEDGE);
+}
+
+void fullScreen(WINDOW activeWindow, PREVIOUSRECT *prev)
+{
+    GetClientRect(activeWindow.hWnd, &activeWindow.size);
+    ClientToScreen(activeWindow.hWnd, &activeWindow.size.left);
+    ClientToScreen(activeWindow.hWnd, &activeWindow.size.right);
+
+    prev->width = activeWindow.size.right - activeWindow.size.left;
+    prev->height = activeWindow.size.bottom - activeWindow.size.top;
+    prev->x = activeWindow.size.left;
+    prev->y = activeWindow.size.top;
+
+    SetWindowPos(activeWindow.hWnd, NULL, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), NULL);
+}
+
+void disableFullScreen(WINDOW activeWindow, PREVIOUSRECT *prev)
+{
+    SetWindowPos(activeWindow.hWnd, NULL, prev->x, prev->y, prev->width, prev->height, NULL);
+}
+
+
 // threaded function to lock the cursor to specified window
 int __stdcall cursorLockEx(void* arguments)
 {
     HANDLE hMessageStop = CreateEvent(NULL, FALSE, FALSE, _T("STOP"));
     HANDLE hMessageEmpty = CreateEvent(NULL, FALSE, TRUE, _T("EMPTY"));
     winArgs *args = (winArgs*)arguments;
     WINDOW activeWindow = *args->window;
-    HWND const currentWindow = activeWindow.hWnd;
+
+    const HWND currentWindow = activeWindow.hWnd;
+
 	POINT cursorPos;
 
     // keeps track if style was changed
     BOOL styleChanged = FALSE;
 
+    SETTINGS *settings = (SETTINGS*)args->settings;
+
+    PREVIOUSRECT previousrect;
+
+    if(settings->borderlessWindow)
+        borderlessWindow(currentWindow);
+
+    if(settings->fullScreen)
+        fullScreen(activeWindow, &previousrect);
+
+    // TODO: bring to foreground
+    // TODO: keep on top (WS_EX_TOP???)
+
     // if window style has WS_SIZEBOX, remove it with EXCLUSIVE OR (^)
     if(checkResizeStyle(activeWindow.hWnd))
     {
@@ -112,6 +151,12 @@ int __stdcall cursorLockEx(void* arguments)
     if(styleChanged)
         SetWindowLongPtr(currentWindow, GWL_STYLE, GetWindowLongPtr(currentWindow, GWL_STYLE)|WS_SIZEBOX);
 
+    if(settings->borderlessWindow)
+        borderlessWindow(currentWindow);
+
+    if (settings->fullScreen)
+        disableFullScreen(activeWindow, &previousrect);
+
     ClipCursor(NULL);	// release the cursor clip
     _endthreadex(1);	// end thread_ex
     return 1;

src/bin/win.h

@@ -4,7 +4,13 @@
 #include <Windows.h>
 //#include "menu.h"
 
-
+typedef struct PREVIOUSRECT
+{
+    int width;
+    int height;
+    int x;
+    int y;
+} PREVIOUSRECT;
 
 typedef struct WINDOW
 {
@@ -28,35 +34,26 @@ typedef struct Menu
     WINDOWLIST windows;
     WINDOW selectedWindow;
     BOOL active;
-    int currentMenu;
     int currentSelection;
     BOOL live;
     DWORD mode;
     INPUT_RECORD event;
 } Menu;
 
-typedef enum MAINMENU
-{
-    MAIN,
-    WINDOWS,
-    DEFAULT,
-    ACTIVE
-} MAINMENU;
 
 BOOL CALLBACK EnumWindowsProc(HWND, LPARAM);
 
 void openWindows(WINDOWLIST*);
 void clearWindows(WINDOWLIST*);
 void getCurrentMousePos(POINT*);
-
 void lockFocused(WINDOW*);
-
 void cursorLock(void*);
-
 BOOL checkClientArea(POINT*, RECT*);
-
 BOOL checkResizeStyle(HWND);
-
+void borderlessWindow(HWND);
+void undoborderlessWindow(HWND);
+void fullScreen(WINDOW, PREVIOUSRECT*);
+void disableFullScreen(WINDOW, PREVIOUSRECT*);
 int __stdcall cursorLockEx(void* arguments);
 
 #endif

src/settings.c

@@ -9,25 +9,36 @@
 void initalizeSettings(HWND hDlg, SETTINGS* settings)
 {
     // get the checkbox
-	HWND checkbox = GetDlgItem(hDlg, IDC_SETTINGS_MINIMIZE);
+	HWND minimize = GetDlgItem(hDlg, IDC_SETTINGS_MINIMIZE);
+    HWND borderless = GetDlgItem(hDlg, IDC_SETTINGS_BORDERLESS);
+    HWND fullScreen = GetDlgItem(hDlg, IDC_SETTINGS_FULLSCREEN);
+
 
-    // check the current setting
-	int checkState;
-	if (!settings->minimize)
-		checkState = BST_UNCHECKED;
-	else
-		checkState = BST_CHECKED;
 
     // update the dialog window
-	SendMessage(checkbox, BM_SETCHECK, checkState, 0);
+	SendMessage(minimize, BM_SETCHECK, settings->minimize, 0);
+    SendMessage(borderless, BM_SETCHECK, settings->borderlessWindow, 0);
+    SendMessage(fullScreen, BM_SETCHECK, settings->fullScreen, 0);
 }
 
 // update settings
 void updateSettings(HWND hDlg, SETTINGS* settings)
 {
     // check the checkbox
-	HWND checkbox = GetDlgItem(hDlg, IDC_SETTINGS_MINIMIZE);
-	settings->minimize = SendMessage(checkbox, BM_GETCHECK, 0, 0);
+	HWND minimize = GetDlgItem(hDlg, IDC_SETTINGS_MINIMIZE);
+    HWND borderless = GetDlgItem(hDlg, IDC_SETTINGS_BORDERLESS);
+    HWND fullScreen = GetDlgItem(hDlg, IDC_SETTINGS_FULLSCREEN);
+
+
+    //WORD wHotKey = LOWORD(SendMessage(GetDlgItem(hDlg, IDC_SETTINGS_HOTKEY), HKM_GETHOTKEY, 0, 0));
+    //settings->hotKeyCount = 0;
+
+	settings->minimize = SendMessage(minimize, BM_GETCHECK, 0, 0);
+    settings->borderlessWindow = SendMessage(borderless, BM_GETCHECK, 0, 0);
+    settings->fullScreen = SendMessage(fullScreen, BM_GETCHECK, 0, 0);
+    //settings->HOTKEY = LOBYTE(wHotKey);
+    //settings->HOTKEY_MODIFIERS[0] = HIBYTE(wHotKey);
+    //settings->hotKeyCount;
 }
 
 void writeSettings(SETTINGS settings)
@@ -61,13 +72,15 @@ void readSettings(SETTINGS *settings)
     FILE *file = _wfopen(path, TEXT("r"));
     if(file != NULL)
     {
-        fread(settings, sizeof(settings), 1, file);
+        fread(settings, sizeof(*settings), 1, file);
         fclose(file);
     } 
     else
     {
         strcpy(settings->header, "DLOCK");
         settings->minimize = 1;
+        settings->borderlessWindow = 0;
+        settings->fullScreen = 0;
     }
     // free memory
     CoTaskMemFree(path);

src/settings.h

@@ -7,6 +7,11 @@ typedef struct SETTINGS
 {
     char header[5];
 	BOOL minimize;
+    BOOL borderlessWindow;
+    BOOL fullScreen;
+    //BYTE HOTKEY;
+    //UINT8 hotKeyCount;
+    //BYTE HOTKEY_MODIFIERS[3];
 } SETTINGS;
 #pragma pack(pop)