diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-06-10 17:18:01 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-06-10 17:18:01 +1000 |
| commit | 2cb35d6815a0a12035f4792c266b688c77085620 (patch) | |
| tree | 292ebc4760767d67b41f7f0e0022185afcf05067 /drivers/multiple | |
| parent | 777ec6af7c1b594f7b7a9cbaaf7ead90d8fb7e8f (diff) | |
| download | uGFX-2cb35d6815a0a12035f4792c266b688c77085620.tar.gz uGFX-2cb35d6815a0a12035f4792c266b688c77085620.tar.bz2 uGFX-2cb35d6815a0a12035f4792c266b688c77085620.zip | |
Clean up GWIN Event assignment. Optimise event efficiency.
Diffstat (limited to 'drivers/multiple')
| -rw-r--r-- | drivers/multiple/Win32/gdisp_lld.c | 4 | ||||
| -rw-r--r-- | drivers/multiple/Win32/ginput_lld_toggle_config.h | 30 |
2 files changed, 17 insertions, 17 deletions
diff --git a/drivers/multiple/Win32/gdisp_lld.c b/drivers/multiple/Win32/gdisp_lld.c index a41954a7..b53b3632 100644 --- a/drivers/multiple/Win32/gdisp_lld.c +++ b/drivers/multiple/Win32/gdisp_lld.c @@ -119,8 +119,8 @@ static LRESULT myWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) break; case WM_LBUTTONUP: #if GINPUT_NEED_TOGGLE - if ((toggles & 0xF0)) { - toggles &= 0x0F; + if ((toggles & 0x0F)) { + toggles &= ~0x0F; rect.left = 0; rect.right = wWidth; rect.top = wHeight; diff --git a/drivers/multiple/Win32/ginput_lld_toggle_config.h b/drivers/multiple/Win32/ginput_lld_toggle_config.h index e96380d3..d487ca42 100644 --- a/drivers/multiple/Win32/ginput_lld_toggle_config.h +++ b/drivers/multiple/Win32/ginput_lld_toggle_config.h @@ -1,9 +1,9 @@ -/* - * This file is subject to the terms of the GFX License, v1.0. If a copy of - * the license was not distributed with this file, you can obtain one at: - * - * http://chibios-gfx.com/license.html - */ +/*
+ * This file is subject to the terms of the GFX License, v1.0. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ * http://chibios-gfx.com/license.html
+ */
/**
* @file drivers/multiple/Win32/ginput_lld_toggle_config.h
@@ -20,19 +20,19 @@ #if GFX_USE_GINPUT && GINPUT_NEED_TOGGLE
-#define GINPUT_TOGGLE_POLL_PERIOD TIME_INFINITE // We are interrupt driven (or polled - ether works here)
+#define GINPUT_TOGGLE_POLL_PERIOD TIME_INFINITE // We are interrupt driven (or polled - either works here)
#define GINPUT_TOGGLE_NUM_PORTS 8 // The total number of toggle inputs
#define GINPUT_TOGGLE_CONFIG_ENTRIES 1 // The total number of GToggleConfig entries
-#define GINPUT_TOGGLE_SW1 0 // Switch 1 - Toggle
-#define GINPUT_TOGGLE_SW2 1 // Switch 2 - Toggle
-#define GINPUT_TOGGLE_SW3 2 // Switch 3 - Toggle
-#define GINPUT_TOGGLE_SW4 3 // Switch 4 - Toggle
+#define GINPUT_TOGGLE_MOMENTARY1 0 // Switch 5 - Momentary
+#define GINPUT_TOGGLE_MOMENTARY2 1 // Switch 6 - Momentary
+#define GINPUT_TOGGLE_MOMENTARY3 2 // Switch 7 - Momentary
+#define GINPUT_TOGGLE_MOMENTARY4 3 // Switch 8 - Momentary
-#define GINPUT_TOGGLE_MOMENTARY1 4 // Switch 5 - Momentary
-#define GINPUT_TOGGLE_MOMENTARY2 5 // Switch 6 - Momentary
-#define GINPUT_TOGGLE_MOMENTARY3 6 // Switch 7 - Momentary
-#define GINPUT_TOGGLE_MOMENTARY4 7 // Switch 8 - Momentary
+#define GINPUT_TOGGLE_SW1 4 // Switch 1 - Toggle
+#define GINPUT_TOGGLE_SW2 5 // Switch 2 - Toggle
+#define GINPUT_TOGGLE_SW3 6 // Switch 3 - Toggle
+#define GINPUT_TOGGLE_SW4 7 // Switch 4 - Toggle
#endif /* GFX_USE_GDISP && GINPUT_NEED_TOGGLE */
|