Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

touchscreen: change odd sentinel value for time of last touch

Browse source 
Using tick 0xffff does not make any sense, use -1 instead.

Change-Id: Id574eb35418c6713c4fc91ed539aadc42fd29aa5
This commit is contained in:
Aidan MacDonald 2021-08-30 01:23:39 +01:00
parent 7e428ad190
commit bff63a4f90
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/gui/skin_engine/skin_parser.c
View file

@ -1187,7 +1187,7 @@ static int parse_progressbar_tag(struct skin_element* element,
region->reverse_bar = false;
region->allow_while_locked = false;
region->press_length = PRESS;
region->last_press = 0xffff;
region->last_press = -1;
region->armed = false;
region->bar = PTRTOSKINOFFSET(skin_buffer, pb);
@ -1602,7 +1602,7 @@ static int parse_touchregion(struct skin_element *element,
region->armed = false;
region->reverse_bar = false;
region->value = 0;
region->last_press = 0xffff;
region->last_press = -1;
region->press_length = PRESS;
region->allow_while_locked = false;
region->bar = PTRTOSKINOFFSET(skin_buffer, NULL);

4
apps/gui/skin_engine/skin_tokens.c
View file

@ -1367,7 +1367,7 @@ const char *get_token_value(struct gui_wps *gwps,
case SKIN_TOKEN_LASTTOUCH:
{
#ifdef HAVE_TOUCHSCREEN
unsigned int last_touch = touchscreen_last_touch();
long last_touch = touchscreen_last_touch();
char *skin_base = get_skin_buffer(data);
struct touchregion_lastpress *data = SKINOFFSETTOPTR(skin_base, token->value.data);
if (!data) return NULL;
@ -1375,7 +1375,7 @@ const char *get_token_value(struct gui_wps *gwps,
if (region)
last_touch = region->last_press;
if (last_touch != 0xffff &&
if (last_touch != -1 &&
TIME_BEFORE(current_tick, data->timeout + last_touch))
return "t";
#endif

6
firmware/drivers/button.c
View file

@ -94,7 +94,7 @@ static int button_read(void);
#endif
#ifdef HAVE_TOUCHSCREEN
static int last_touchscreen_touch;
static long last_touchscreen_touch;
#endif
#if defined(HAVE_HEADPHONE_DETECTION)
static struct timeout hp_detect_timeout; /* Debouncer for headphone plug/unplug */
@ -542,7 +542,7 @@ void button_init(void)
#endif
#endif
#ifdef HAVE_TOUCHSCREEN
last_touchscreen_touch = 0xffff;
last_touchscreen_touch = -1;
#endif
/* Start polling last */
tick_add_task(button_tick);
@ -714,7 +714,7 @@ void button_clear_queue(void)
}
#ifdef HAVE_TOUCHSCREEN
int touchscreen_last_touch(void)
long touchscreen_last_touch(void)
{
return last_touchscreen_touch;
}

2
firmware/export/button.h
View file

@ -107,7 +107,7 @@ int button_apply_acceleration(const unsigned int data);
BUTTON_MULTIMEDIA_FFWD)
#ifdef HAVE_TOUCHSCREEN
int touchscreen_last_touch(void);
long touchscreen_last_touch(void);
#if (!defined(BUTTON_TOPLEFT) || !defined(BUTTON_TOPMIDDLE) \
|| !defined(BUTTON_TOPRIGHT) || !defined(BUTTON_MIDLEFT) \