should be working

1 files changed, 79 insertions, 108 deletions

@@ -1,49 +1,73 @@
 // Source.cpp : Defines the entry point for the application.
 //
 
-#include "stdafx.h"
 #include "resource.h"
-#include "tchar.h"
-#include "Randomizer.h"
 #include <Richedit.h>
-#include <iostream>
 #include <ctime>
 #include <string>
+#include "Randomizer.h"
+#include "windows.h"
 
-#define MAX_LOADSTRING 100
-#define IDC_RANDOMIZE 0x464
-
-HINSTANCE hInst;
-WCHAR szWindowClass[MAX_LOADSTRING];
-HWND hwndSeed, hwndRandomize;
+#define IDC_RANDOMIZE 0x401
+#define IDC_TOGGLESPEED 0x402
 
-// Forward declares
-ATOM                MyRegisterClass(HINSTANCE hInstance);
-BOOL                InitInstance(HINSTANCE, int);
-LRESULT CALLBACK    WndProc(HWND, UINT, WPARAM, LPARAM);
-INT_PTR CALLBACK    About(HWND, UINT, WPARAM, LPARAM);
+HWND hwndSeed, hwndRandomize, hwndSpeedSetting;
 
-int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
+LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-        LoadStringW(hInstance, IDC_SOURCE, szWindowClass, MAX_LOADSTRING);
-    MyRegisterClass(hInstance);
-    if (!InitInstance(hInstance, nCmdShow)) {
-        return FALSE;
-    }
-
-    MSG msg;
-    while (!GetMessage(&msg, nullptr, 0, 0) == 0)
-    {
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
-    }
+        static bool wasSeedRandomlyGenerated;
 
-    return (int) msg.wParam;
+        if (message == WM_DESTROY) {
+                PostQuitMessage(0);
+        } else if (message == WM_COMMAND) {
+                switch (LOWORD(wParam)) {
+                        // Speed checkbox
+                        case IDC_TOGGLESPEED:
+                                if (IsDlgButtonChecked(hwndSpeedSetting, 1)) {
+                                        CheckDlgButton(hwndSpeedSetting, 1, BST_UNCHECKED);
+                                } else {
+                                        CheckDlgButton(hwndSpeedSetting, 1, BST_CHECKED);
+                                }
+                                break;
+
+                        // Randomize button
+                        case IDC_RANDOMIZE:
+                        {
+                                std::wstring text(100, '\0');
+                                GetWindowText(hwndSeed, &text[0], 100);
+                                int seed = 0;
+                                if (wasSeedRandomlyGenerated || wcslen(text.c_str()) == 0) {
+                                        srand(static_cast<unsigned int>(time(nullptr))); // Seed from the time in milliseconds
+                                        rand(); // Increment RNG so that RNG isn't still using the time
+                                        seed = rand() % 100000;
+                                        std::wstring seedString = std::to_wstring(seed);
+                                        SetWindowText(hwndSeed, seedString.c_str());
+                                        wasSeedRandomlyGenerated = true;
+                                } else {
+                                        seed = _wtoi(text.c_str());
+                                        wasSeedRandomlyGenerated = false;
+                                }
+                                srand(seed);
+                                Randomizer randomizer;
+                                randomizer.Randomize();
+                                if (IsDlgButtonChecked(hwndSpeedSetting, 1)) {
+                                        randomizer.AdjustSpeed();
+                                }
+                                SetWindowText(hwndRandomize, L"Randomized!");
+                                break;
+                        }
+                }
+        }
+    return DefWindowProc(hwnd, message, wParam, lParam);
 }
 
-ATOM MyRegisterClass(HINSTANCE hInstance)
+int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
 {
-    WNDCLASSEXW wcex = {
+        #define MAX_LOADSTRING 100
+        WCHAR szWindowClass[MAX_LOADSTRING];
+        LoadStringW(hInstance, IDC_SOURCE, szWindowClass, MAX_LOADSTRING);
+
+        WNDCLASSEXW wcex = {
                 sizeof(WNDCLASSEX),
                 CS_HREDRAW | CS_VREDRAW,
                 WndProc,
@@ -57,95 +81,42 @@ ATOM MyRegisterClass(HINSTANCE hInstance)
                 szWindowClass,
                 LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL)),
         };
-
-    return RegisterClassExW(&wcex);
-}
-
-BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
-{
-        hInst = hInstance; // Store instance handle in our global variable
+    RegisterClassExW(&wcex);
 
         WCHAR szTitle[MAX_LOADSTRING];
         LoadStringW(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
-        HWND hWnd = CreateWindow(szWindowClass, szTitle, WS_OVERLAPPEDWINDOW,
+        HWND hwnd = CreateWindow(szWindowClass, szTitle, WS_OVERLAPPEDWINDOW,
       400, 200, 500, 500, nullptr, nullptr, hInstance, nullptr);
 
-        if (!hWnd) return FALSE;
-
         LoadLibrary(L"Msftedit.dll");
-        HWND label = CreateWindow(L"STATIC", L"Enter a seed:",
-                WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT,
-                10, 15, 90, 16, hWnd, NULL, hInst, NULL);
 
-        hwndSeed = CreateWindowEx(0, MSFTEDIT_CLASS, L"",
-        WS_TABSTOP | WS_VISIBLE | WS_CHILD | WS_BORDER, 
-        100, 10, 50, 26, hWnd, NULL, hInst, NULL);
 
+        CreateWindow(L"STATIC", L"Enter a seed:",
+                WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT,
+                10, 15, 90, 16, hwnd, NULL, hInstance, NULL);
+        hwndSeed = CreateWindow(MSFTEDIT_CLASS, L"",
+        WS_TABSTOP | WS_VISIBLE | WS_CHILD | WS_BORDER, 
+        100, 10, 50, 26, hwnd, NULL, hInstance, NULL);
         hwndRandomize = CreateWindow(L"BUTTON", L"Randomize",
                 WS_TABSTOP | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON,
-                160, 10, 100, 26, hWnd, (HMENU)IDC_RANDOMIZE, hInst, NULL);
-
-        HDC hdc = GetDC(hWnd);
-        RECT rect;
-        GetClientRect(hWnd, &rect);
-        LPCWSTR text = L"this Window cannot be used";
-        DrawText(hdc, text, static_cast<int>(wcslen(text)), &rect, DT_CENTER | DT_VCENTER);
-        ReleaseDC(hWnd, hdc);
-
-        ShowWindow(hWnd, nCmdShow);
-        UpdateWindow(hWnd);
-        return TRUE;
-}
+                160, 10, 100, 26, hwnd, (HMENU)IDC_RANDOMIZE, hInstance, NULL);
 
-LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-        if (message == WM_DESTROY) {
-                PostQuitMessage(0);
-        } else if (message == WM_COMMAND) {
-        int wmId = LOWORD(wParam);
-        // Parse the menu selections:
-                if (wmId == IDC_RANDOMIZE) {
-                        std::wstring text(100, '\0');
-                        GetWindowText(hwndSeed, &text[0], 100);
-                        int seed = 0;
-                        if (wcslen(text.c_str()) == 0) {
-                                srand(static_cast<unsigned int>(time(nullptr))); // Seed from the time in milliseconds
-                                rand();
-                                seed = rand() % 100000;
-                                std::wstring seedString = std::to_wstring(seed);
-                                SetWindowText(hwndSeed, seedString.c_str());
-                        } else {
-                                seed = _wtoi(text.c_str());
-                        }
-                        srand(seed);
-                        Randomizer randomizer;
-                        randomizer.Randomize();
-                        /*
-                        if (adjustSpeed.isChecked()) {
-                                randomizer.AdjustSpeed();
-                        }
-                        */
-                        SetWindowText(hwndRandomize, L"Randomized!");
-        }
-        }
-    return DefWindowProc(hWnd, message, wParam, lParam);
-}
+        hwndSpeedSetting = CreateWindow(L"BUTTON", L"",
+                WS_VISIBLE | WS_CHILD | BS_CHECKBOX,
+                10, 52, 12, 12, hwnd, (HMENU)IDC_TOGGLESPEED, hInstance, NULL);
+        CreateWindow(L"STATIC", L"Speed up various autoscrollers",
+                WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT,
+                27, 50, 205, 16, hwnd, NULL, hInstance, NULL);
 
-INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    UNREFERENCED_PARAMETER(lParam);
-    switch (message)
+        ShowWindow(hwnd, nCmdShow);
+        UpdateWindow(hwnd);
+
+    MSG msg;
+    while (!GetMessage(&msg, nullptr, 0, 0) == 0)
     {
-    case WM_INITDIALOG:
-        return TRUE;
-
-    case WM_COMMAND:
-        if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)
-        {
-            EndDialog(hDlg, LOWORD(wParam));
-            return TRUE;
-        }
-        break;
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);
     }
-    return FALSE;
+
+    return (int) msg.wParam;
 }