diff options
author | Felix Arends <edx@rockbox.org> | 2002-07-30 10:55:26 +0000 |
---|---|---|
committer | Felix Arends <edx@rockbox.org> | 2002-07-30 10:55:26 +0000 |
commit | 8da338e9f02d0bf412985f2c2c40fccb460c2775 (patch) | |
tree | fc32694672c301be291dbe9556998c5451018bcd /uisimulator/win32 | |
parent | 217023ff67281a0315c2582e4a83a4460f55b8b5 (diff) | |
download | rockbox-8da338e9f02d0bf412985f2c2c40fccb460c2775.tar.gz rockbox-8da338e9f02d0bf412985f2c2c40fccb460c2775.zip |
latest fix for win32 simulator
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1495 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/win32')
-rw-r--r-- | uisimulator/win32/button.c | 17 | ||||
-rw-r--r-- | uisimulator/win32/makefile | 3 |
2 files changed, 19 insertions, 1 deletions
diff --git a/uisimulator/win32/button.c b/uisimulator/win32/button.c index da193814e5..700ea14c8d 100644 --- a/uisimulator/win32/button.c +++ b/uisimulator/win32/button.c | |||
@@ -27,12 +27,29 @@ | |||
27 | #define KEY(k) (HIBYTE(GetKeyState (k)) & 1) | 27 | #define KEY(k) (HIBYTE(GetKeyState (k)) & 1) |
28 | 28 | ||
29 | int last_key ; | 29 | int last_key ; |
30 | static int release_mask; | ||
31 | static int repeat_mask; | ||
32 | |||
30 | 33 | ||
31 | void button_init(void) | 34 | void button_init(void) |
32 | { | 35 | { |
33 | last_key = 0 ; | 36 | last_key = 0 ; |
34 | } | 37 | } |
35 | 38 | ||
39 | int button_set_repeat(int newmask) | ||
40 | { | ||
41 | int oldmask = repeat_mask; | ||
42 | repeat_mask = newmask; | ||
43 | return oldmask; | ||
44 | } | ||
45 | |||
46 | int button_set_release(int newmask) | ||
47 | { | ||
48 | int oldmask = release_mask; | ||
49 | release_mask = newmask; | ||
50 | return oldmask; | ||
51 | } | ||
52 | |||
36 | int button_get(bool block) | 53 | int button_get(bool block) |
37 | { | 54 | { |
38 | int func_call = current_tick; | 55 | int func_call = current_tick; |
diff --git a/uisimulator/win32/makefile b/uisimulator/win32/makefile index d3d326836b..68c5c26f5b 100644 --- a/uisimulator/win32/makefile +++ b/uisimulator/win32/makefile | |||
@@ -20,6 +20,7 @@ | |||
20 | FIRMWAREDIR = ../../firmware | 20 | FIRMWAREDIR = ../../firmware |
21 | DRIVERS = $(FIRMWAREDIR)/drivers | 21 | DRIVERS = $(FIRMWAREDIR)/drivers |
22 | COMMON = $(FIRMWAREDIR)/common | 22 | COMMON = $(FIRMWAREDIR)/common |
23 | APPSCOMMON = ../common | ||
23 | SIMDIR = ../win32/ | 24 | SIMDIR = ../win32/ |
24 | APPDIR = ../../apps/ | 25 | APPDIR = ../../apps/ |
25 | RECDIR = $(APPDIR)recorder/ | 26 | RECDIR = $(APPDIR)recorder/ |
@@ -46,7 +47,7 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb" /c | |||
46 | SRCS = *.c \ | 47 | SRCS = *.c \ |
47 | $(DRIVERS)/lcd.c $(DRIVERS)/power.c \ | 48 | $(DRIVERS)/lcd.c $(DRIVERS)/power.c \ |
48 | $(APPDIR)*.c \ | 49 | $(APPDIR)*.c \ |
49 | $(FIRMWAREDIR)/chartables.c $(FIRMWAREDIR)/id3.c $(FIRMWAREDIR)/usb.c \ | 50 | $(FIRMWAREDIR)/chartables.c $(FIRMWAREDIR)/id3.c $(FIRMWAREDIR)/usb.c $(FIRMWAREDIR)/mpeg.c \ |
50 | $(COMMON)/sprintf.c $(COMMON)/strtok.c | 51 | $(COMMON)/sprintf.c $(COMMON)/strtok.c |
51 | 52 | ||
52 | !IF ("$(DISPLAY)" == "-DHAVE_LCD_BITMAP") | 53 | !IF ("$(DISPLAY)" == "-DHAVE_LCD_BITMAP") |