diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/skin_engine/skin_touchsupport.c | 5 | ||||
-rw-r--r-- | apps/plugins/brickmania.c | 3 | ||||
-rw-r--r-- | apps/plugins/solitaire.c | 16 |
3 files changed, 16 insertions, 8 deletions
diff --git a/apps/gui/skin_engine/skin_touchsupport.c b/apps/gui/skin_engine/skin_touchsupport.c index beb6780c3c..fb4780c22d 100644 --- a/apps/gui/skin_engine/skin_touchsupport.c +++ b/apps/gui/skin_engine/skin_touchsupport.c | |||
@@ -56,7 +56,6 @@ int skin_get_touchaction(struct wps_data *data, int* edge_offset, | |||
56 | short x,y; | 56 | short x,y; |
57 | short vx, vy; | 57 | short vx, vy; |
58 | int type = action_get_touchscreen_press(&x, &y); | 58 | int type = action_get_touchscreen_press(&x, &y); |
59 | static int last_action = ACTION_NONE; | ||
60 | struct touchregion *r, *temp = NULL; | 59 | struct touchregion *r, *temp = NULL; |
61 | bool repeated = (type == BUTTON_REPEAT); | 60 | bool repeated = (type == BUTTON_REPEAT); |
62 | bool released = (type == BUTTON_REL); | 61 | bool released = (type == BUTTON_REL); |
@@ -109,7 +108,6 @@ int skin_get_touchaction(struct wps_data *data, int* edge_offset, | |||
109 | if (r->armed && ((repeated && needs_repeat) || | 108 | if (r->armed && ((repeated && needs_repeat) || |
110 | (released && !needs_repeat))) | 109 | (released && !needs_repeat))) |
111 | { | 110 | { |
112 | last_action = r->action; | ||
113 | returncode = r->action; | 111 | returncode = r->action; |
114 | temp = r; | 112 | temp = r; |
115 | } | 113 | } |
@@ -270,7 +268,6 @@ int skin_get_touchaction(struct wps_data *data, int* edge_offset, | |||
270 | } | 268 | } |
271 | return returncode; | 269 | return returncode; |
272 | } | 270 | } |
273 | 271 | ||
274 | last_action = ACTION_TOUCHSCREEN; | ||
275 | return ACTION_TOUCHSCREEN; | 272 | return ACTION_TOUCHSCREEN; |
276 | } | 273 | } |
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 379aadfe65..59059b8cc7 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -2235,10 +2235,9 @@ static int brickmania_game_loop(void) | |||
2235 | if( move_button & BUTTON_TOUCHSCREEN) | 2235 | if( move_button & BUTTON_TOUCHSCREEN) |
2236 | { | 2236 | { |
2237 | int data; | 2237 | int data; |
2238 | short touch_x, touch_y; | 2238 | short touch_x; |
2239 | rb->button_status_wdata(&data); | 2239 | rb->button_status_wdata(&data); |
2240 | touch_x = FIXED3(data >> 16); | 2240 | touch_x = FIXED3(data >> 16); |
2241 | touch_y = FIXED3(data & 0xffff); | ||
2242 | 2241 | ||
2243 | if(flip_sides) | 2242 | if(flip_sides) |
2244 | { | 2243 | { |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index a87311035f..01a75df39a 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -629,6 +629,14 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
629 | 629 | ||
630 | #define NOT_A_COL -1 | 630 | #define NOT_A_COL -1 |
631 | 631 | ||
632 | #if defined(SOL_LEFT_PRE) || defined(SOL_RIGHT_PRE) || \ | ||
633 | defined(SOL_DOWN_PRE) || defined(SOL_UP_PRE) || \ | ||
634 | defined(SOL_CUR2STACK_PRE) || defined(SOL_MOVE_PRE) || \ | ||
635 | defined(SOL_REM2CUR_PRE) || defined(SOL_REM2STACK_PRE) || \ | ||
636 | defined(SOL_DRAW_PRE) | ||
637 | # define NEED_LASTBUTTON_VAR | ||
638 | #endif | ||
639 | |||
632 | typedef struct | 640 | typedef struct |
633 | { | 641 | { |
634 | signed char suit; | 642 | signed char suit; |
@@ -1418,7 +1426,10 @@ int solitaire( int skipmenu ) | |||
1418 | { | 1426 | { |
1419 | 1427 | ||
1420 | int i,j; | 1428 | int i,j; |
1421 | int button, lastbutton = 0; | 1429 | int button; |
1430 | #ifdef NEED_LASTBUTTON_VAR | ||
1431 | int lastbutton = 0; | ||
1432 | #endif | ||
1422 | int c,h,prevcard; | 1433 | int c,h,prevcard; |
1423 | int biggest_col_length; | 1434 | int biggest_col_length; |
1424 | 1435 | ||
@@ -1906,8 +1917,9 @@ int solitaire( int skipmenu ) | |||
1906 | break; | 1917 | break; |
1907 | } | 1918 | } |
1908 | 1919 | ||
1909 | if( button != BUTTON_NONE ) | 1920 | #ifdef NEED_LASTBUTTON_VAR |
1910 | lastbutton = button; | 1921 | lastbutton = button; |
1922 | #endif | ||
1911 | 1923 | ||
1912 | /* fix incoherences concerning cur_col and cur_card */ | 1924 | /* fix incoherences concerning cur_col and cur_card */ |
1913 | c = find_card_col( cur_card ); | 1925 | c = find_card_col( cur_card ); |