diff options
author | Björn Stenberg <bjorn@haxx.se> | 2004-09-19 21:58:37 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2004-09-19 21:58:37 +0000 |
commit | 6c33c51a4ca9907d23e3154d956fd6781122f492 (patch) | |
tree | f0e598efaf064bb72c33c0a8a2edba4cf9ebb13c /uisimulator/win32 | |
parent | 17f54a40f100a3343a15a431d235699024aa76c8 (diff) | |
download | rockbox-6c33c51a4ca9907d23e3154d956fd6781122f492.tar.gz rockbox-6c33c51a4ca9907d23e3154d956fd6781122f492.zip |
Redesigned the button handling. The code now uses symbolic function defines instead of checking for specific buttons. This makes it easier to add support for new devices with different button layouts.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5091 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/win32')
-rw-r--r-- | uisimulator/win32/Makefile | 3 | ||||
-rw-r--r-- | uisimulator/win32/button.c | 31 |
2 files changed, 32 insertions, 2 deletions
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile index d105076f85..22ce4d65d1 100644 --- a/uisimulator/win32/Makefile +++ b/uisimulator/win32/Makefile | |||
@@ -23,6 +23,7 @@ PLAYDIR = $(APPDIR)/player | |||
23 | PLUGINDIR = $(APPDIR)/plugins | 23 | PLUGINDIR = $(APPDIR)/plugins |
24 | SIMCOMMON = ../common | 24 | SIMCOMMON = ../common |
25 | 25 | ||
26 | ISONDIO := $(findstring ONDIO, $(TARGET)) | ||
26 | ISPLAYER := $(findstring PLAYER, $(TARGET)) | 27 | ISPLAYER := $(findstring PLAYER, $(TARGET)) |
27 | ifeq ($(ISPLAYER), PLAYER) | 28 | ifeq ($(ISPLAYER), PLAYER) |
28 | MACHINEDIR = $(PLAYDIR) | 29 | MACHINEDIR = $(PLAYDIR) |
@@ -124,8 +125,10 @@ SRCS = button.c lcd-win32.c panic-win32.c thread-win32.c \ | |||
124 | 125 | ||
125 | OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o) $(OBJDIR)/uisw32-res.o | 126 | OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o) $(OBJDIR)/uisw32-res.o |
126 | 127 | ||
128 | ifneq ($(ISONDIO),ONDIO) | ||
127 | ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c)) | 129 | ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c)) |
128 | PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c)) | 130 | PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c)) |
131 | endif | ||
129 | 132 | ||
130 | all: $(TOOLSDIR)/convbdf $(EXEFILE) $(ROCKS) | 133 | all: $(TOOLSDIR)/convbdf $(EXEFILE) $(ROCKS) |
131 | 134 | ||
diff --git a/uisimulator/win32/button.c b/uisimulator/win32/button.c index 0af6ff40a6..5d56456f6e 100644 --- a/uisimulator/win32/button.c +++ b/uisimulator/win32/button.c | |||
@@ -59,22 +59,38 @@ void button_event(int key, bool pressed) | |||
59 | case VK_RIGHT: | 59 | case VK_RIGHT: |
60 | new_btn = BUTTON_RIGHT; | 60 | new_btn = BUTTON_RIGHT; |
61 | break; | 61 | break; |
62 | |||
62 | case VK_NUMPAD8: | 63 | case VK_NUMPAD8: |
63 | case VK_UP: | 64 | case VK_UP: |
65 | #ifdef BUTTON_UP | ||
64 | new_btn = BUTTON_UP; | 66 | new_btn = BUTTON_UP; |
67 | #elif defined BUTTON_PLAY | ||
68 | new_btn = BUTTON_PLAY; | ||
69 | #endif | ||
65 | break; | 70 | break; |
71 | |||
66 | case VK_NUMPAD2: | 72 | case VK_NUMPAD2: |
67 | case VK_DOWN: | 73 | case VK_DOWN: |
74 | #ifdef BUTTON_DOWN | ||
68 | new_btn = BUTTON_DOWN; | 75 | new_btn = BUTTON_DOWN; |
76 | #elif defined BUTTON_STOP | ||
77 | new_btn = BUTTON_STOP; | ||
78 | #endif | ||
69 | break; | 79 | break; |
80 | |||
81 | #ifdef BUTTON_ON | ||
70 | case VK_ADD: | 82 | case VK_ADD: |
71 | new_btn = BUTTON_ON; | 83 | new_btn = BUTTON_ON; |
72 | break; | 84 | break; |
85 | #endif | ||
73 | 86 | ||
74 | #ifdef HAVE_RECORDER_KEYPAD | 87 | #ifdef BUTTON_OFF |
75 | case VK_RETURN: | 88 | case VK_RETURN: |
76 | new_btn = BUTTON_OFF; | 89 | new_btn = BUTTON_OFF; |
77 | break; | 90 | break; |
91 | #endif | ||
92 | |||
93 | #ifdef BUTTON_F1 | ||
78 | case VK_DIVIDE: | 94 | case VK_DIVIDE: |
79 | case VK_F1: | 95 | case VK_F1: |
80 | new_btn = BUTTON_F1; | 96 | new_btn = BUTTON_F1; |
@@ -87,11 +103,16 @@ void button_event(int key, bool pressed) | |||
87 | case VK_F3: | 103 | case VK_F3: |
88 | new_btn = BUTTON_F3; | 104 | new_btn = BUTTON_F3; |
89 | break; | 105 | break; |
106 | #endif | ||
107 | |||
108 | #ifdef BUTTON_PLAY | ||
90 | case VK_NUMPAD5: | 109 | case VK_NUMPAD5: |
91 | case VK_SPACE: | 110 | case VK_SPACE: |
92 | new_btn = BUTTON_PLAY; | 111 | new_btn = BUTTON_PLAY; |
93 | break; | 112 | break; |
113 | #endif | ||
94 | 114 | ||
115 | #ifdef HAVE_LCD_BITMAP | ||
95 | case VK_NUMPAD0: | 116 | case VK_NUMPAD0: |
96 | case VK_F5: | 117 | case VK_F5: |
97 | if(pressed) | 118 | if(pressed) |
@@ -100,8 +121,14 @@ void button_event(int key, bool pressed) | |||
100 | return; | 121 | return; |
101 | } | 122 | } |
102 | break; | 123 | break; |
103 | #else | 124 | #endif |
125 | |||
126 | #ifdef BUTTON_MENU | ||
127 | #ifdef HAVE_PLAYER_KEYPAD | ||
104 | case VK_RETURN: | 128 | case VK_RETURN: |
129 | #elif defined HAVE_ONDIO_KEYPAD | ||
130 | case VK_INSERT: | ||
131 | #endif | ||
105 | new_btn = BUTTON_MENU; | 132 | new_btn = BUTTON_MENU; |
106 | break; | 133 | break; |
107 | #endif | 134 | #endif |