diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-01-17 21:14:34 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-01-17 21:14:34 +0000 |
commit | e6f403f5099bf469a4349ce5613f9ef330cd6240 (patch) | |
tree | cf7a3682edba4f840c3c20d4a5f94c3d45fb799a | |
parent | b96333a114641f27c7f85859f38c5b61b72f4eaa (diff) | |
download | rockbox-e6f403f5099bf469a4349ce5613f9ef330cd6240.tar.gz rockbox-e6f403f5099bf469a4349ce5613f9ef330cd6240.zip |
X11 sim: Button handling adapted to iRiver and reworked a bit. Removed tab chars.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5587 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | uisimulator/x11/button-x11.c | 129 |
1 files changed, 67 insertions, 62 deletions
diff --git a/uisimulator/x11/button-x11.c b/uisimulator/x11/button-x11.c index d6837f640a..a8dd709110 100644 --- a/uisimulator/x11/button-x11.c +++ b/uisimulator/x11/button-x11.c | |||
@@ -60,104 +60,109 @@ static int get_raw_button (void) | |||
60 | int ev=screenhack_handle_events(&release, &repeat); | 60 | int ev=screenhack_handle_events(&release, &repeat); |
61 | switch(ev) | 61 | switch(ev) |
62 | { | 62 | { |
63 | case XK_KP_Left: | 63 | case XK_KP_Left: |
64 | case XK_Left: | 64 | case XK_Left: |
65 | case XK_KP_4: | 65 | case XK_KP_4: |
66 | k = BUTTON_LEFT; | 66 | k = BUTTON_LEFT; |
67 | break; | 67 | break; |
68 | 68 | ||
69 | case XK_KP_Right: | 69 | case XK_KP_Right: |
70 | case XK_Right: | 70 | case XK_Right: |
71 | case XK_KP_6: | 71 | case XK_KP_6: |
72 | k = BUTTON_RIGHT; | 72 | k = BUTTON_RIGHT; |
73 | break; | 73 | break; |
74 | 74 | ||
75 | case XK_KP_Up: | 75 | case XK_KP_Up: |
76 | case XK_Up: | 76 | case XK_Up: |
77 | case XK_KP_8: | 77 | case XK_KP_8: |
78 | #ifdef BUTTON_UP | 78 | #ifdef BUTTON_UP |
79 | k = BUTTON_UP; | 79 | k = BUTTON_UP; |
80 | #elif defined BUTTON_PLAY | 80 | #elif defined BUTTON_PLAY |
81 | k = BUTTON_PLAY; | 81 | k = BUTTON_PLAY; |
82 | #endif | 82 | #endif |
83 | break; | 83 | break; |
84 | 84 | ||
85 | case XK_KP_Down: | 85 | case XK_KP_Down: |
86 | case XK_Down: | 86 | case XK_Down: |
87 | case XK_KP_2: | 87 | case XK_KP_2: |
88 | #ifdef BUTTON_DOWN | 88 | #ifdef BUTTON_DOWN |
89 | k = BUTTON_DOWN; | 89 | k = BUTTON_DOWN; |
90 | #elif defined BUTTON_STOP | 90 | #elif defined BUTTON_STOP |
91 | k = BUTTON_STOP; | 91 | k = BUTTON_STOP; |
92 | #endif | 92 | #endif |
93 | break; | 93 | break; |
94 | 94 | ||
95 | #ifdef BUTTON_PLAY | 95 | #ifdef BUTTON_ON |
96 | case XK_KP_Space: | 96 | case XK_KP_Add: |
97 | case XK_KP_5: | 97 | case XK_Q: |
98 | case XK_KP_Begin: | 98 | case XK_q: |
99 | case XK_space: | 99 | k = BUTTON_ON; |
100 | k = BUTTON_PLAY; | ||
101 | break; | 100 | break; |
102 | #endif | 101 | #endif |
103 | 102 | ||
104 | #ifdef BUTTON_OFF | 103 | #ifdef BUTTON_OFF |
105 | case XK_KP_Enter: | 104 | case XK_KP_Enter: |
106 | case XK_A: | 105 | case XK_A: |
107 | case XK_a: | 106 | case XK_a: |
108 | k = BUTTON_OFF; | 107 | k = BUTTON_OFF; |
109 | break; | ||
110 | #endif | ||
111 | |||
112 | #ifdef BUTTON_ON | ||
113 | case XK_KP_Add: | ||
114 | case XK_Q: | ||
115 | case XK_q: | ||
116 | k = BUTTON_ON; | ||
117 | break; | 108 | break; |
118 | #endif | 109 | #endif |
119 | 110 | ||
120 | #ifdef BUTTON_F1 | 111 | #ifdef BUTTON_F1 |
121 | case XK_KP_Divide: | 112 | case XK_KP_Divide: |
122 | case XK_1: | 113 | case XK_1: |
123 | k = BUTTON_F1; | 114 | k = BUTTON_F1; |
124 | break; | 115 | break; |
125 | 116 | ||
126 | case XK_KP_Multiply: | 117 | case XK_KP_Multiply: |
127 | case XK_2: | 118 | case XK_2: |
128 | k = BUTTON_F2; | 119 | k = BUTTON_F2; |
129 | break; | 120 | break; |
130 | 121 | ||
131 | case XK_KP_Subtract: | 122 | case XK_KP_Subtract: |
132 | case XK_3: | 123 | case XK_3: |
133 | k = BUTTON_F3; | 124 | k = BUTTON_F3; |
134 | break; | 125 | break; |
126 | #elif defined(BUTTON_REC) | ||
127 | case XK_KP_Divide: | ||
128 | case XK_1: | ||
129 | k = BUTTON_REC; | ||
130 | break; | ||
135 | #endif | 131 | #endif |
136 | 132 | ||
137 | #ifdef HAVE_LCD_BITMAP | 133 | case XK_KP_Space: |
138 | case XK_5: | 134 | case XK_KP_5: |
139 | if(!release) | 135 | case XK_KP_Begin: |
140 | { | 136 | case XK_space: |
141 | screen_dump(); | 137 | #ifdef BUTTON_PLAY |
142 | return 0; | 138 | k = BUTTON_PLAY; |
143 | } | 139 | #elif defined(BUTTON_SELECT) |
140 | k = BUTTON_SELECT; | ||
141 | #endif | ||
144 | break; | 142 | break; |
143 | |||
144 | #ifdef HAVE_LCD_BITMAP | ||
145 | case XK_5: | ||
146 | if(!release) | ||
147 | { | ||
148 | screen_dump(); | ||
149 | return 0; | ||
150 | } | ||
151 | break; | ||
145 | #endif | 152 | #endif |
146 | 153 | ||
154 | case XK_KP_Separator: | ||
155 | case XK_KP_Insert: | ||
156 | case XK_Insert: | ||
147 | #ifdef BUTTON_MENU | 157 | #ifdef BUTTON_MENU |
148 | #if CONFIG_KEYPAD == PLAYER_PAD | 158 | k = BUTTON_MENU; |
149 | case XK_KP_Enter: | 159 | #elif defined(BUTTON_MODE) |
150 | case XK_Return: | 160 | k = BUTTON_MODE; |
151 | #elif CONFIG_KEYPAD == ONDIO_PAD | ||
152 | case XK_KP_Insert: | ||
153 | case XK_Control_R: | ||
154 | #endif | 161 | #endif |
155 | k = BUTTON_MENU; | ||
156 | break; | 162 | break; |
157 | #endif | ||
158 | 163 | ||
159 | default: | 164 | default: |
160 | k = 0; | 165 | k = 0; |
161 | if(ev) | 166 | if(ev) |
162 | DEBUGF("received ev %d\n", ev); | 167 | DEBUGF("received ev %d\n", ev); |
163 | break; | 168 | break; |