Change notification icon when pressing ScrollLock

Author: RamonUnch

altdrag.c

@@ -43,6 +43,7 @@ HINSTANCE hinstDLL = NULL;
 HHOOK keyhook = NULL;
 char elevated = 0;
 char WinVer = 0;
+char ScrollLockState = 0;
 
 // Include stuff
 #include "hooks.h"
@@ -195,6 +196,8 @@ LRESULT CALLBACK WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
     } else if (msg == WM_ADDTRAY) {
         hide = 0;
         UpdateTray();
+    } else if (msg == WM_UPDATETRAY) {
+        UpdateTray();
     } else if (msg == WM_HIDETRAY) {
         hide = 1;
         RemoveTray();
@@ -336,6 +339,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, char *szCmdLine, in
                             NULL, WS_POPUP, 0, 0, 0, 0, NULL, NULL, hInst, NULL);
     LOG("Create main APP Window: %s\n", g_hwnd? "Sucess": "Failed");
     // Tray icon
+
     InitTray();
     UpdateTray();
 

altdrag.rc

@@ -1,7 +1,7 @@
 app_icon ICON "media/icon.ico"
 tray_disabled ICON "media/tray-disabled.ico"
 tray_enabled ICON "media/tray-enabled.ico"
-
+tray_suspended ICON "media/tray-suspended.ico"
 #include "window.rc"
 
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "AltDrag.exe.manifest"

config.c

@@ -251,7 +251,7 @@ static void WriteOptionBoolW(HWND hwnd, WORD id, wchar_t *section, wchar_t *name
     WritePrivateProfileString(section, name,_itow(Button_GetCheck(GetDlgItem(hwnd, id)), txt, 10), inipath);
 }
 #define WriteOptionBool(id, section, name) WriteOptionBoolW(hwnd, id, section, name)
-static void WriteOptionBoolBW(HWND hwnd, WORD id, wchar_t *section, wchar_t *name, int bit)
+static int WriteOptionBoolBW(HWND hwnd, WORD id, wchar_t *section, wchar_t *name, int bit)
 {
     wchar_t txt[8];
     int val = GetPrivateProfileInt(section, name, 0, inipath);
@@ -260,7 +260,8 @@ static void WriteOptionBoolBW(HWND hwnd, WORD id, wchar_t *section, wchar_t *nam
     else
         val = clearBit(val, bit);
 
-    WritePrivateProfileString(section, name,_itow(val, txt, 10), inipath);
+    WritePrivateProfileString(section, name, _itow(val, txt, 10), inipath);
+    return val;
 }
 #define WriteOptionBoolB(id, section, name, bit) WriteOptionBoolBW(hwnd, id, section, name, bit)
 
@@ -718,7 +719,7 @@ INT_PTR CALLBACK KeyboardPageDialogProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
         ReadOptionInt(IDC_AGGRESSIVEPAUSE, L"Input",   L"AggressivePause", 0, -1);
         Button_Enable(GetDlgItem(hwnd, IDC_AGGRESSIVEPAUSE), HaveProc("NTDLL.DLL", "NtResumeProcess"));
         ReadOptionInt(IDC_AGGRESSIVEKILL, L"Input", L"AggressiveKill", 0, -1);
-        ReadOptionInt(IDC_SCROLLLOCKSTATE,  L"Input", L"ScrollLockState",0, -1);
+        ReadOptionInt(IDC_SCROLLLOCKSTATE,  L"Input", L"ScrollLockState",0, 1);
         ReadOptionInt(IDC_KEYCOMBO,       L"Input", L"KeyCombo", 0, -1);
         CheckConfigHotKeys(hotkeys, hwnd, L"Hotkeys", L"A4 A5");
     } else if (msg == WM_COMMAND) {
@@ -752,7 +753,7 @@ INT_PTR CALLBACK KeyboardPageDialogProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
             SetDlgItemText(hwnd, IDC_KEYBOARD_BOX,    l10n->tab_keyboard);
             SetDlgItemText(hwnd, IDC_AGGRESSIVEPAUSE, l10n->input_aggressive_pause);
             SetDlgItemText(hwnd, IDC_AGGRESSIVEKILL,  l10n->input_aggressive_kill);
-            SetDlgItemText(hwnd, IDC_SCROLLLOCKSTATE,   l10n->input_scrolllockstate);
+            SetDlgItemText(hwnd, IDC_SCROLLLOCKSTATE, l10n->input_scrolllockstate);
             SetDlgItemText(hwnd, IDC_HOTKEYS_BOX,     l10n->input_hotkeys_box);
             SetDlgItemText(hwnd, IDC_TOGGLERZMVKEY_H, l10n->input_hotkeys_togglerzmvkey);
             SetDlgItemText(hwnd, IDC_LEFTALT,         l10n->input_hotkeys_leftalt);
@@ -771,7 +772,7 @@ INT_PTR CALLBACK KeyboardPageDialogProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
             WritePrivateProfileString(L"Input", L"GrabWithAlt", kb_actions[i].action, inipath);
             WriteOptionBool(IDC_AGGRESSIVEPAUSE, L"Input", L"AggressivePause");
             WriteOptionBool(IDC_AGGRESSIVEKILL,  L"Input", L"AggressiveKill");
-            WriteOptionBool(IDC_SCROLLLOCKSTATE,   L"Input", L"ScrollLockState");
+            ScrollLockState=WriteOptionBoolB(IDC_SCROLLLOCKSTATE,   L"Input", L"ScrollLockState", 0);
             // Invert move/resize key.
             i = ComboBox_GetCurSel(GetDlgItem(hwnd, IDC_TOGGLERZMVKEY));
             WritePrivateProfileString(L"Input", L"ToggleRzMvKey", togglekeys[i].action, inipath);

hooks.c

@@ -1575,17 +1575,18 @@ static void SetForegroundWindowL(HWND hwnd)
 // otherwise it is enabled by Scroll lock.
 static int ScrollLockState()
 {
-    return conf.ScrollLockState&1
-        &&!( !(GetKeyState(VK_SCROLL)&1) ^ !(conf.ScrollLockState&2) );
+    return (conf.ScrollLockState&1) &&
+        !( !(GetKeyState(VK_SCROLL)&1) ^ !(conf.ScrollLockState&2) );
 }
 ///////////////////////////////////////////////////////////////////////////
 // Keep this one minimalist, it is always on.
 __declspec(dllexport) LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
 {
-    if (nCode != HC_ACTION || state.ignorectrl
-    || ScrollLockState()) return CallNextHookEx(NULL, nCode, wParam, lParam);
+    if (nCode != HC_ACTION || state.ignorectrl) return CallNextHookEx(NULL, nCode, wParam, lParam);
 
     unsigned char vkey = ((PKBDLLHOOKSTRUCT)lParam)->vkCode;
+    if (vkey == VK_SCROLL) PostMessage(g_mainhwnd, WM_UPDATETRAY, 0, 0);
+    if (ScrollLockState()) return CallNextHookEx(NULL, nCode, wParam, lParam);
 
     if (wParam == WM_KEYDOWN || wParam == WM_SYSKEYDOWN) {
         if (!state.alt && (!conf.KeyCombo || (state.alt1 && state.alt1 != vkey)) && IsHotkey(vkey)) {
@@ -2451,7 +2452,7 @@ static int init_movement_and_actions(POINT pt, enum action action, int button)
         state.snap = conf.AutoSnap;
     }
     AddWindowToDB(state.hwnd);
-    
+
     // Set Origin width and height needed for AC_MOVE/RESIZE/CENTER
     if (state.wndentry->restore && !state.origin.maximized) {
         state.origin.width = state.wndentry->width;

hooks.h

@@ -4,6 +4,7 @@
 #define WM_TRAY         (WM_USER+1)
 #define WM_SCLICK       (WM_USER+2)
 #define WM_UPDCFRACTION (WM_USER+3)
+#define WM_UPDATETRAY   (WM_USER+4)
 
 enum action { AC_NONE=0, AC_MOVE, AC_RESIZE, AC_MENU, AC_MINIMIZE, AC_MAXIMIZE, AC_CENTER
             , AC_ALWAYSONTOP, AC_CLOSE, AC_LOWER, AC_BORDERLESS, AC_KILL

languages.h

@@ -386,7 +386,7 @@ struct strings en_US = {
 
  /* Aggressive Pause   */ L"&Pause process on Alt+Shift+Pause (Alt+Pause to resume)",
  /* Aggressive Kill    */ L"&Kill process on Ctrl+Alt+F4\nAlso adds the kill option to the action menu",
- /* scroll lock state  */ L"Enable/Disable AltDrag based on &Scroll lock state",
+ /* scroll lock state  */ L"Suspend/Resume AltDrag based on &Scroll lock state",
  /* KeyCombo           */ L"Use two keys &combo to activate",
  /* GrabWithAlt        */ L"&Action without click:",
 

media/tray-suspended.ico

@@ -7,7 +7,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 struct _NOTIFYICONDATAA tray;
-HICON icon[2];
+HICON icon[3];
 int tray_added = 0;
 int hide = 0;
 
@@ -17,6 +17,9 @@ int InitTray()
     // Load icons
     icon[0] = LoadIconA(g_hinst, "tray_disabled");
     icon[1] = LoadIconA(g_hinst, "tray_enabled");
+    icon[2] = LoadIconA(g_hinst, "tray_suspended");
+
+    ScrollLockState = GetPrivateProfileInt(L"Input", L"ScrollLockState", 0, inipath);
 
     if (icon[0] == NULL || icon[1] == NULL) {
         LOG("Could not Load Icons for tray\n");
@@ -43,8 +46,12 @@ int InitTray()
 /////////////////////////////////////////////////////////////////////////////
 int UpdateTray()
 {
-    strcpy(tray.szTip, ENABLED()? "AltDrag (On)": "AltDrag (Off)");
-    tray.hIcon = icon[!!ENABLED()];
+    int Index = !!ENABLED();
+    if (Index && (ScrollLockState&1))
+        Index += !( !(GetKeyState(VK_SCROLL)&1) ^ !(ScrollLockState&2) );
+
+    strcpy(tray.szTip, Index? "AltDrag (On)": "AltDrag (Off)");
+    tray.hIcon = icon[Index];
 
     // Only add or modify if not hidden or if balloon will be displayed
     if (!hide || tray.uFlags&NIF_INFO) {