diff options
author | Will Robertson <aliask@rockbox.org> | 2007-08-02 13:34:34 +0000 |
---|---|---|
committer | Will Robertson <aliask@rockbox.org> | 2007-08-02 13:34:34 +0000 |
commit | cc57190a429ed770032451a864ebd081185c6b8f (patch) | |
tree | 5321c3eabcc7a00a075f20eae7cf3af736349e13 | |
parent | 2129d0f5e30f1969dc64c9fa61ca489f2a38600d (diff) | |
download | rockbox-cc57190a429ed770032451a864ebd081185c6b8f.tar.gz rockbox-cc57190a429ed770032451a864ebd081185c6b8f.zip |
The obligatory "oops" commit. :)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14146 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/SOURCES | 3 | ||||
-rw-r--r-- | apps/plugins/superdom.c | 16 |
2 files changed, 11 insertions, 8 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 06c4b7ccdc..eb794296c6 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -133,6 +133,7 @@ iriver_flash.c | |||
133 | #endif | 133 | #endif |
134 | 134 | ||
135 | #endif /* iFP7xx */ | 135 | #endif /* iFP7xx */ |
136 | #if (LCD_WIDTH == 220) || (LCD_WIDTH == 176) || (LCD_WIDTH == 160) || (LCD_WIDTH == 320) || (LCD_WIDTH == 240) | 136 | #if (LCD_WIDTH > 128) |
137 | /* Built for all bitmap targets except H10 5/6gb, Archoses, and ifp */ | ||
137 | superdom.c | 138 | superdom.c |
138 | #endif | 139 | #endif |
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index 7c70aa7d96..3a0a2d25d7 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c | |||
@@ -73,11 +73,13 @@ char buf[255]; | |||
73 | #define NUM_MARGIN_X (LCD_WIDTH-3*NUM_BOX_WIDTH)/2 | 73 | #define NUM_MARGIN_X (LCD_WIDTH-3*NUM_BOX_WIDTH)/2 |
74 | #define NUM_MARGIN_Y (LCD_HEIGHT-4*NUM_BOX_HEIGHT)/2 | 74 | #define NUM_MARGIN_Y (LCD_HEIGHT-4*NUM_BOX_HEIGHT)/2 |
75 | 75 | ||
76 | #if CONFIG_KEYPAD == IPOD_4G_PAD | 76 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
77 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
77 | #define SUPERDOM_OK BUTTON_SELECT | 78 | #define SUPERDOM_OK BUTTON_SELECT |
78 | #define SUPERDOM_CANCEL BUTTON_MENU | 79 | #define SUPERDOM_CANCEL BUTTON_MENU |
79 | #define SUPERDOM_LEFT BUTTON_LEFT | 80 | #define SUPERDOM_LEFT BUTTON_LEFT |
80 | #define SUPERDOM_RIGHT BUTTON_RIGHT | 81 | #define SUPERDOM_RIGHT BUTTON_RIGHT |
82 | #define IPOD_STYLE | ||
81 | 83 | ||
82 | #elif CONFIG_KEYPAD == IRIVER_H300_PAD || CONFIG_KEYPAD == IRIVER_H100_PAD | 84 | #elif CONFIG_KEYPAD == IRIVER_H300_PAD || CONFIG_KEYPAD == IRIVER_H100_PAD |
83 | #define SUPERDOM_OK BUTTON_SELECT | 85 | #define SUPERDOM_OK BUTTON_SELECT |
@@ -816,7 +818,7 @@ int get_number(char* param, int* value) { | |||
816 | NUM_BOX_WIDTH+1, NUM_BOX_HEIGHT+1); | 818 | NUM_BOX_WIDTH+1, NUM_BOX_HEIGHT+1); |
817 | rb->lcd_set_drawmode(DRMODE_SOLID); | 819 | rb->lcd_set_drawmode(DRMODE_SOLID); |
818 | if(x==0) { | 820 | if(x==0) { |
819 | #if CONFIG_KEYPAD == IPOD_4G_PAD | 821 | #ifdef IPOD_STYLE |
820 | if(y>0) | 822 | if(y>0) |
821 | y--; | 823 | y--; |
822 | else | 824 | else |
@@ -839,7 +841,7 @@ int get_number(char* param, int* value) { | |||
839 | NUM_BOX_WIDTH+1, NUM_BOX_HEIGHT+1); | 841 | NUM_BOX_WIDTH+1, NUM_BOX_HEIGHT+1); |
840 | rb->lcd_set_drawmode(DRMODE_SOLID); | 842 | rb->lcd_set_drawmode(DRMODE_SOLID); |
841 | if(x==2) { | 843 | if(x==2) { |
842 | #if CONFIG_KEYPAD == IPOD_4G_PAD | 844 | #ifdef IPOD_STYLE |
843 | if(y==3) | 845 | if(y==3) |
844 | y=0; | 846 | y=0; |
845 | else | 847 | else |
@@ -856,7 +858,7 @@ int get_number(char* param, int* value) { | |||
856 | rb->lcd_set_drawmode(DRMODE_SOLID); | 858 | rb->lcd_set_drawmode(DRMODE_SOLID); |
857 | break; | 859 | break; |
858 | #endif | 860 | #endif |
859 | #if CONFIG_KEYPAD != IPOD_4G_PAD | 861 | #ifndef IPOD_STYLE |
860 | case SUPERDOM_UP: | 862 | case SUPERDOM_UP: |
861 | rb->lcd_set_drawmode(DRMODE_COMPLEMENT); | 863 | rb->lcd_set_drawmode(DRMODE_COMPLEMENT); |
862 | rb->lcd_fillrect(NUM_MARGIN_X+(NUM_BOX_WIDTH*x), | 864 | rb->lcd_fillrect(NUM_MARGIN_X+(NUM_BOX_WIDTH*x), |
@@ -1475,7 +1477,7 @@ int select_square(void) { | |||
1475 | if(cursor.x>1) { | 1477 | if(cursor.x>1) { |
1476 | cursor.x--; | 1478 | cursor.x--; |
1477 | } else { | 1479 | } else { |
1478 | #if CONFIG_KEYPAD == IPOD_4G_PAD | 1480 | #ifdef IPOD_STYLE |
1479 | if(cursor.y>1) | 1481 | if(cursor.y>1) |
1480 | cursor.y--; | 1482 | cursor.y--; |
1481 | else | 1483 | else |
@@ -1492,7 +1494,7 @@ int select_square(void) { | |||
1492 | if(cursor.x<10) { | 1494 | if(cursor.x<10) { |
1493 | cursor.x++; | 1495 | cursor.x++; |
1494 | } else { | 1496 | } else { |
1495 | #if CONFIG_KEYPAD == IPOD_4G_PAD | 1497 | #ifdef IPOD_STYLE |
1496 | if(cursor.y<10) | 1498 | if(cursor.y<10) |
1497 | cursor.y++; | 1499 | cursor.y++; |
1498 | else | 1500 | else |
@@ -1504,7 +1506,7 @@ int select_square(void) { | |||
1504 | draw_cursor(); | 1506 | draw_cursor(); |
1505 | break; | 1507 | break; |
1506 | #endif | 1508 | #endif |
1507 | #if CONFIG_KEYPAD != IPOD_4G_PAD | 1509 | #ifndef IPOD_STYLE |
1508 | case SUPERDOM_UP: | 1510 | case SUPERDOM_UP: |
1509 | case (SUPERDOM_UP|BUTTON_REPEAT): | 1511 | case (SUPERDOM_UP|BUTTON_REPEAT): |
1510 | draw_cursor(); /* Deselect the current tile */ | 1512 | draw_cursor(); /* Deselect the current tile */ |