update ui

Author: TeaRex-coder

ui/README.md

@@ -1,75 +1,40 @@
 # User Interface
 
-HardwareDDC's goal is to provide and easy and convenient way to adjust monitor settings. Therefore, I prioritized an efficient macro-based UX and have not yet released a first-party GUI.
-
-Currently, HardwareDDC is controlled with hotkeys sending API requests.
+HardwareDDC's goal is to provide and easy and convenient way to adjust monitor settings. Currently, HardwareDDC is controlled through an efficient macro-based UI.
 
 ## macOS
 
-### Lunar
-
-Lunar, _the defacto app for controlling monitors_, can be used as HardwareDDC's interface instead of Hammerspoon for those preferring a GUI.
+Lunar, _the defacto app for controlling monitors_, is used as HardwareDDC's macOS GUI.
 
 1. Install [Lunar](https://static.lunar.fyi/releases/Lunar.dmg)
 2. Disable all controls aside from _Network (Raspberry Pi)_
 3. Reset _Network Control_
 
-### Hammerspoon
-
-1. Install [Hammerspoon](https://www.hammerspoon.org)
-2. Add [hardware-ddc.lua](./macos/hardware-ddc.lua) to your Hammerspoon config `~/.hammerspoon/init.lua`
-
-```lua
-local env = require("hardware-ddc")
-```
-
-### Hotkeys
-
-_Edit macros in [hardware-ddc.lua](./macos/hardware-ddc.lua)_
-
-**Brightness:**
-
-- ^⌘5 = 0%
-- ^⌘1 = 25%
-- ^⌘2 = 50%
-- ^⌘3 = 75%
-- ^⌘4 = 100%
-
-<p></p>
-
-- fn + F1 = -6%
-- fn + F2 = +6%
-
-**Input Source:**
-
-- ^⌘h1 HDMI 1
-- ^⌘h2 HDMI 2
-- ^⌘d1 DisplayPort 1
-- ^⌘d2 DisplayPort 2
-
 ## Windows
 
-1. Install [AutoHotkey](https://www.autohotkey.com)
-2. Create [hardware-ddc.ahk](./windows/hardware-ddc.ahk) shortcut to run at startup in `%APPDATA%\Microsoft\Windows\Start Menu\Programs\Startup`
+1. Install [hardwareddc-amd64-installer.exe](https://github.com/TeaRex-coder/hardwareddc/releases) from the latest GitHub release
 
 ### Hotkeys
 
-_Edit macros in [hardware-ddc.ahk](./windows/hardware-ddc.ahk)_
+_User-modifiable hotkeys to come_
 
 **Brightness:**
 
-- ^⌥1 = 25%
-- ^⌥2 = 50%
-- ^⌥3 = 75%
-- ^⌥4 = 100%
-- ^⌥5 = 0%
+- ⌥⇧- = +10%
+- ⌥⇧= = +10%
+
+- ⌥⇧1 = 25%
+- ⌥⇧2 = 50%
+- ⌥⇧3 = 75%
+- ⌥⇧4 = 100%
+- ⌥⇧5 = 0%
 
 **Input Source:**
 
-- ^⌥h1 HDMI 1
-- ^⌥h2 HDMI 2
-- ^⌥d1 DisplayPort 1
-- ^⌥d2 DisplayPort 2
+- ⌥⇧d1 = DisplayPort 1
+- ⌥⇧d2 = DisplayPort 2
+- ⌥⇧h1 = HDMI 1
+- ⌥⇧h2 = HDMI 2
 
 ## Linux
 

ui/macos/hardware-ddc.lua

@@ -0,0 +1,19 @@
+# README
+
+## About
+
+This is the official Wails React template.
+
+You can configure the project by editing `wails.json`. More information about the project settings can be found
+here: https://wails.io/docs/reference/project-config
+
+## Live Development
+
+To run in live development mode, run `wails dev` in the project directory. This will run a Vite development
+server that will provide very fast hot reload of your frontend changes. If you want to develop in a browser
+and have access to your Go methods, there is also a dev server that runs on http://localhost:34115. Connect
+to this in your browser, and you can call your Go code from devtools.
+
+## Building
+
+To build a redistributable, production mode package, use `wails build`.

ui/windows/README.md

@@ -0,0 +1,103 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"net/http"
+	"strconv"
+
+	hook "github.com/robotn/gohook"
+)
+
+type App struct {
+	ctx context.Context
+}
+
+func NewApp() *App {
+	return &App{}
+}
+
+func (a *App) startup(ctx context.Context) {
+	a.ctx = ctx
+	go a.startKeyListener()
+}
+
+func (a *App) startKeyListener() {
+	// Brightness
+	hook.Register(hook.KeyDown, []string{"alt", "shift", "1"}, func(e hook.Event) {
+		a.setBrightness(25)
+	})
+
+	hook.Register(hook.KeyDown, []string{"alt", "shift", "2"}, func(e hook.Event) {
+		a.setBrightness(50)
+	})
+
+	hook.Register(hook.KeyDown, []string{"alt", "shift", "3"}, func(e hook.Event) {
+		a.setBrightness(75)
+	})
+
+	hook.Register(hook.KeyDown, []string{"alt", "shift", "4"}, func(e hook.Event) {
+		a.setBrightness(100)
+	})
+
+	hook.Register(hook.KeyDown, []string{"alt", "shift", "5"}, func(e hook.Event) {
+		a.setBrightness(0)
+	})
+
+	hook.Register(hook.KeyDown, []string{"alt", "shift", "-"}, func(e hook.Event) {
+		currentBrightness := a.getBrightness()
+		newBrightness := currentBrightness - 10
+		if newBrightness < 0 {
+			newBrightness = 0
+		}
+		a.setBrightness(newBrightness)
+	})
+
+	hook.Register(hook.KeyDown, []string{"alt", "shift", "="}, func(e hook.Event) {
+		currentBrightness := a.getBrightness()
+		newBrightness := currentBrightness + 10
+		if newBrightness > 100 {
+			newBrightness = 100
+		}
+		a.setBrightness(newBrightness)
+	})
+
+	// Input sources
+	hook.Register(hook.KeyDown, []string{"alt", "shift", "d", "1"}, func(e hook.Event) {
+		a.setSource("0x0f")
+	})
+
+	hook.Register(hook.KeyDown, []string{"alt", "shift", "d", "2"}, func(e hook.Event) {
+		a.setSource("0x10")
+	})
+
+	hook.Register(hook.KeyDown, []string{"alt", "shift", "h", "1"}, func(e hook.Event) {
+		a.setSource("0x11")
+	})
+
+	hook.Register(hook.KeyDown, []string{"alt", "shift", "h", "2"}, func(e hook.Event) {
+		a.setSource("0x12")
+	})
+
+	s := hook.Start()
+	for range hook.Process(s) {
+	}
+}
+
+func (a *App) setBrightness(level int) {
+	url := fmt.Sprintf("http://ddcutil.local:3485/1/brightness/%d", level)
+	http.Get(url)
+}
+
+func (a *App) getBrightness() int {
+	resp, _ := http.Get("http://ddcutil.local:3485/1/brightness")
+	body, _ := io.ReadAll(resp.Body)
+	brightness, _ := strconv.Atoi(string(body))
+	return brightness
+}
+
+func (a *App) setSource(source string) {
+	url := fmt.Sprintf("http://ddcutil.local:3485/1/input_source/%s", source)
+	http.Get(url)
+}

ui/windows/app.go

@@ -0,0 +1,35 @@
+# Build Directory
+
+The build directory is used to house all the build files and assets for your application. 
+
+The structure is:
+
+* bin - Output directory
+* darwin - macOS specific files
+* windows - Windows specific files
+
+## Mac
+
+The `darwin` directory holds files specific to Mac builds.
+These may be customised and used as part of the build. To return these files to the default state, simply delete them
+and
+build with `wails build`.
+
+The directory contains the following files:
+
+- `Info.plist` - the main plist file used for Mac builds. It is used when building using `wails build`.
+- `Info.dev.plist` - same as the main plist file but used when building using `wails dev`.
+
+## Windows
+
+The `windows` directory contains the manifest and rc files used when building with `wails build`.
+These may be customised for your application. To return these files to the default state, simply delete them and
+build with `wails build`.
+
+- `icon.ico` - The icon used for the application. This is used when building using `wails build`. If you wish to
+  use a different icon, simply replace this file with your own. If it is missing, a new `icon.ico` file
+  will be created using the `appicon.png` file in the build directory.
+- `installer/*` - The files used to create the Windows installer. These are used when building using `wails build`.
+- `info.json` - Application details used for Windows builds. The data here will be used by the Windows installer,
+  as well as the application itself (right click the exe -> properties -> details)
+- `wails.exe.manifest` - The main application manifest file.