diff options
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/app.c | 1 | ||||
-rw-r--r-- | uisimulator/common/mpegplay.c | 1 | ||||
-rw-r--r-- | uisimulator/menu.c | 1 | ||||
-rw-r--r-- | uisimulator/play.c | 7 | ||||
-rw-r--r-- | uisimulator/screensaver.c | 1 | ||||
-rw-r--r-- | uisimulator/tetris.c | 36 | ||||
-rw-r--r-- | uisimulator/tree.c | 22 | ||||
-rw-r--r-- | uisimulator/x11/button-x11.c | 1 |
8 files changed, 31 insertions, 39 deletions
diff --git a/uisimulator/app.c b/uisimulator/app.c index 5c96ab8c43..c5149d8171 100644 --- a/uisimulator/app.c +++ b/uisimulator/app.c | |||
@@ -17,7 +17,6 @@ | |||
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #include "types.h" | ||
21 | #include "lcd.h" | 20 | #include "lcd.h" |
22 | #include "button.h" | 21 | #include "button.h" |
23 | #include "kernel.h" | 22 | #include "kernel.h" |
diff --git a/uisimulator/common/mpegplay.c b/uisimulator/common/mpegplay.c index aaaddfa014..5ecfca9e97 100644 --- a/uisimulator/common/mpegplay.c +++ b/uisimulator/common/mpegplay.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <string.h> | 26 | #include <string.h> |
27 | #include <stdlib.h> | 27 | #include <stdlib.h> |
28 | #include <file.h> | 28 | #include <file.h> |
29 | #include <types.h> | ||
30 | #include <lcd.h> | 29 | #include <lcd.h> |
31 | #include <button.h> | 30 | #include <button.h> |
32 | #include "id3.h" | 31 | #include "id3.h" |
diff --git a/uisimulator/menu.c b/uisimulator/menu.c index dcaa1f5fca..6a6b61e755 100644 --- a/uisimulator/menu.c +++ b/uisimulator/menu.c | |||
@@ -17,7 +17,6 @@ | |||
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #include "types.h" | ||
21 | #include "lcd.h" | 20 | #include "lcd.h" |
22 | #include "menu.h" | 21 | #include "menu.h" |
23 | 22 | ||
diff --git a/uisimulator/play.c b/uisimulator/play.c index 3681a7e133..e93f17672e 100644 --- a/uisimulator/play.c +++ b/uisimulator/play.c | |||
@@ -20,10 +20,9 @@ | |||
20 | #include <string.h> | 20 | #include <string.h> |
21 | #include <stdlib.h> | 21 | #include <stdlib.h> |
22 | 22 | ||
23 | #include <file.h> | 23 | #include "file.h" |
24 | #include <types.h> | 24 | #include "lcd.h" |
25 | #include <lcd.h> | 25 | #include "button.h" |
26 | #include <button.h> | ||
27 | #include "kernel.h" | 26 | #include "kernel.h" |
28 | #include "tree.h" | 27 | #include "tree.h" |
29 | #include "debug.h" | 28 | #include "debug.h" |
diff --git a/uisimulator/screensaver.c b/uisimulator/screensaver.c index a85ccf965d..b8144478e2 100644 --- a/uisimulator/screensaver.c +++ b/uisimulator/screensaver.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #ifdef HAVE_LCD_BITMAP | 20 | #ifdef HAVE_LCD_BITMAP |
21 | 21 | ||
22 | #include "screensaver.h" | 22 | #include "screensaver.h" |
23 | #include "types.h" | ||
24 | #include "lcd.h" | 23 | #include "lcd.h" |
25 | #include "button.h" | 24 | #include "button.h" |
26 | #include "kernel.h" | 25 | #include "kernel.h" |
diff --git a/uisimulator/tetris.c b/uisimulator/tetris.c index 8884fd8964..24090eb67e 100644 --- a/uisimulator/tetris.c +++ b/uisimulator/tetris.c | |||
@@ -20,8 +20,7 @@ | |||
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | #ifdef HAVE_LCD_BITMAP | 22 | #ifdef HAVE_LCD_BITMAP |
23 | 23 | #include <stdbool.h> | |
24 | #include "types.h" | ||
25 | #include "lcd.h" | 24 | #include "lcd.h" |
26 | #include "button.h" | 25 | #include "button.h" |
27 | #include "kernel.h" | 26 | #include "kernel.h" |
@@ -121,7 +120,7 @@ void draw_frame(int fstart_x,int fstop_x,int fstart_y,int fstop_y) | |||
121 | lcd_drawline(fstop_x, fstart_y, fstop_x, fstop_y); | 120 | lcd_drawline(fstop_x, fstart_y, fstop_x, fstop_y); |
122 | } | 121 | } |
123 | 122 | ||
124 | void draw_block(int x,int y,int block,int frame,int clear) | 123 | void draw_block(int x,int y,int block,int frame,bool clear) |
125 | { | 124 | { |
126 | int i; | 125 | int i; |
127 | for(i=0;i < 4;i++) { | 126 | for(i=0;i < 4;i++) { |
@@ -143,7 +142,7 @@ void to_virtual() | |||
143 | (current_x+block_data[current_b][current_f][0][i])) = current_b+1; | 142 | (current_x+block_data[current_b][current_f][0][i])) = current_b+1; |
144 | } | 143 | } |
145 | 144 | ||
146 | int gameover() | 145 | bool gameover() |
147 | { | 146 | { |
148 | int i; | 147 | int i; |
149 | int frame, block, y, x; | 148 | int frame, block, y, x; |
@@ -162,14 +161,14 @@ int gameover() | |||
162 | if(y+block_data[block][frame][1][i] < start_y) | 161 | if(y+block_data[block][frame][1][i] < start_y) |
163 | { | 162 | { |
164 | /* Game over ;) */ | 163 | /* Game over ;) */ |
165 | return TRUE; | 164 | return true; |
166 | } | 165 | } |
167 | } | 166 | } |
168 | } | 167 | } |
169 | return FALSE; | 168 | return false; |
170 | } | 169 | } |
171 | 170 | ||
172 | int valid_position(int x,int y,int block,int frame) | 171 | bool valid_position(int x,int y,int block,int frame) |
173 | { | 172 | { |
174 | int i; | 173 | int i; |
175 | for(i=0;i < 4;i++) | 174 | for(i=0;i < 4;i++) |
@@ -179,8 +178,8 @@ int valid_position(int x,int y,int block,int frame) | |||
179 | (x+block_data[block][frame][0][i] > max_x-1) || | 178 | (x+block_data[block][frame][0][i] > max_x-1) || |
180 | (y+block_data[block][frame][1][i] < 0) || | 179 | (y+block_data[block][frame][1][i] < 0) || |
181 | (y+block_data[block][frame][1][i] > max_y-1)) | 180 | (y+block_data[block][frame][1][i] > max_y-1)) |
182 | return FALSE; | 181 | return false; |
183 | return TRUE; | 182 | return true; |
184 | } | 183 | } |
185 | 184 | ||
186 | void from_virtual() | 185 | void from_virtual() |
@@ -207,10 +206,10 @@ void move_block(int x,int y,int f) | |||
207 | } | 206 | } |
208 | if(valid_position(current_x+x,current_y+y,current_b,current_f)) | 207 | if(valid_position(current_x+x,current_y+y,current_b,current_f)) |
209 | { | 208 | { |
210 | draw_block(current_x,current_y,current_b,last_frame,TRUE); | 209 | draw_block(current_x,current_y,current_b,last_frame,true); |
211 | current_x += x; | 210 | current_x += x; |
212 | current_y += y; | 211 | current_y += y; |
213 | draw_block(current_x,current_y,current_b,current_f,FALSE); | 212 | draw_block(current_x,current_y,current_b,current_f,false); |
214 | lcd_update(); | 213 | lcd_update(); |
215 | } | 214 | } |
216 | else | 215 | else |
@@ -225,27 +224,28 @@ void new_block() | |||
225 | current_y = 0; | 224 | current_y = 0; |
226 | next_b = t_rand(blocks); | 225 | next_b = t_rand(blocks); |
227 | next_f = t_rand(block_frames[next_b]); | 226 | next_f = t_rand(block_frames[next_b]); |
228 | draw_block(max_x+2,start_y-1,current_b,current_f,TRUE); | 227 | draw_block(max_x+2,start_y-1,current_b,current_f,true); |
229 | draw_block(max_x+2,start_y-1,next_b,next_f,FALSE); | 228 | draw_block(max_x+2,start_y-1,next_b,next_f,false); |
230 | if(!valid_position(current_x,current_y,current_b,current_f)) | 229 | if(!valid_position(current_x,current_y,current_b,current_f)) |
231 | { | 230 | { |
232 | draw_block(current_x,current_y,current_b,current_f,FALSE); | 231 | draw_block(current_x,current_y,current_b,current_f,false); |
233 | lcd_update(); | 232 | lcd_update(); |
234 | } | 233 | } |
235 | else | 234 | else |
236 | draw_block(current_x,current_y,current_b,current_f,FALSE); | 235 | draw_block(current_x,current_y,current_b,current_f,false); |
237 | } | 236 | } |
238 | 237 | ||
239 | int check_lines() | 238 | int check_lines() |
240 | { | 239 | { |
241 | int x,y,line,i; | 240 | int x,y,i; |
241 | bool line; | ||
242 | int lines = 0; | 242 | int lines = 0; |
243 | for(y=0;y < max_y;y++) | 243 | for(y=0;y < max_y;y++) |
244 | { | 244 | { |
245 | line = TRUE; | 245 | line = true; |
246 | for(x=0;x < max_x;x++) | 246 | for(x=0;x < max_x;x++) |
247 | if(virtual[y*max_x+x] == 0) | 247 | if(virtual[y*max_x+x] == 0) |
248 | line = FALSE; | 248 | line = false; |
249 | if(line) | 249 | if(line) |
250 | { | 250 | { |
251 | lines++; | 251 | lines++; |
diff --git a/uisimulator/tree.c b/uisimulator/tree.c index 0382547590..1941661bb7 100644 --- a/uisimulator/tree.c +++ b/uisimulator/tree.c | |||
@@ -19,24 +19,22 @@ | |||
19 | 19 | ||
20 | #include <string.h> | 20 | #include <string.h> |
21 | #include <stdlib.h> | 21 | #include <stdlib.h> |
22 | #include <stdbool.h> | ||
22 | 23 | ||
23 | #include <dir.h> | 24 | #include "dir.h" |
24 | #include <file.h> | 25 | #include "file.h" |
25 | #include <types.h> | 26 | #include "lcd.h" |
26 | #include <lcd.h> | 27 | #include "button.h" |
27 | #include <button.h> | ||
28 | #include "kernel.h" | 28 | #include "kernel.h" |
29 | #include "tree.h" | 29 | #include "tree.h" |
30 | |||
31 | #include "icons.h" | 30 | #include "icons.h" |
32 | |||
33 | #include "play.h" | 31 | #include "play.h" |
34 | 32 | ||
35 | 33 | ||
36 | #define TREE_MAX_FILENAMELEN 128 | 34 | #define TREE_MAX_FILENAMELEN 128 |
37 | 35 | ||
38 | struct entry { | 36 | struct entry { |
39 | int file; /* TRUE if file, FALSE if dir */ | 37 | int file; /* true if file, false if dir */ |
40 | char name[TREE_MAX_FILENAMELEN]; | 38 | char name[TREE_MAX_FILENAMELEN]; |
41 | int namelen; | 39 | int namelen; |
42 | }; | 40 | }; |
@@ -110,7 +108,7 @@ int static showdir(char *path, struct entry *buffer, int start, | |||
110 | else | 108 | else |
111 | icon_type=Folder; | 109 | icon_type=Folder; |
112 | lcd_bitmap(bitmap_icons_6x8[icon_type], 6, MARGIN_Y+i*LINE_HEIGTH, 6, | 110 | lcd_bitmap(bitmap_icons_6x8[icon_type], 6, MARGIN_Y+i*LINE_HEIGTH, 6, |
113 | 8, TRUE); | 111 | 8, true); |
114 | #endif | 112 | #endif |
115 | 113 | ||
116 | if(len < TREE_MAX_LEN_DISPLAY) | 114 | if(len < TREE_MAX_LEN_DISPLAY) |
@@ -177,13 +175,13 @@ bool dirbrowse(char *root) | |||
177 | } | 175 | } |
178 | switch(key) { | 176 | switch(key) { |
179 | case BUTTON_OFF: | 177 | case BUTTON_OFF: |
180 | return FALSE; | 178 | return false; |
181 | break; | 179 | break; |
182 | 180 | ||
183 | case BUTTON_LEFT: | 181 | case BUTTON_LEFT: |
184 | i=strlen(currdir); | 182 | i=strlen(currdir); |
185 | if (i==1) { | 183 | if (i==1) { |
186 | return FALSE; | 184 | return false; |
187 | } | 185 | } |
188 | else { | 186 | else { |
189 | while (currdir[i-1]!='/') | 187 | while (currdir[i-1]!='/') |
@@ -286,5 +284,5 @@ bool dirbrowse(char *root) | |||
286 | } | 284 | } |
287 | } | 285 | } |
288 | 286 | ||
289 | return FALSE; | 287 | return false; |
290 | } | 288 | } |
diff --git a/uisimulator/x11/button-x11.c b/uisimulator/x11/button-x11.c index dc077f03b1..c3afa4b42a 100644 --- a/uisimulator/x11/button-x11.c +++ b/uisimulator/x11/button-x11.c | |||
@@ -16,7 +16,6 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #include "types.h" | ||
20 | #include "button.h" | 19 | #include "button.h" |
21 | 20 | ||
22 | #include "X11/keysym.h" | 21 | #include "X11/keysym.h" |