len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 10:07:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

apps: Move action_cur_t and action_last_t to action.c

Browse source 
These types are not needed outside action.c.

Change-Id: I71d25edf30811022fba32a548906755cf46cd694
This commit is contained in:
Aidan MacDonald 2022-07-12 12:11:00 +01:00 • committed by Solomon Peachy
parent 7b1dd6b60a
commit fd4a10719d
2 changed files with 48 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

48
apps/action.c
View file

@ -58,6 +58,54 @@
#define REPEAT_WINDOW_TICKS HZ/4
#define ACTION_FILTER_TICKS HZ/2 /* timeout between filtered actions SL/BL */
/* act_cur holds action state during get_action() call */
typedef struct
{
int action;
int button;
int context;
int timeout;
const struct button_mapping *items;
const struct button_mapping* (*get_context_map)(int);
bool is_prebutton;
} action_cur_t;
/* act_last holds action state between get_action() calls */
typedef struct
{
int action;
long tick;
int button;
int context;
intptr_t data;
#if defined(HAVE_BACKLIGHT)
unsigned int backlight_mask;
long bl_filter_tick;
#endif
#if !defined(HAS_BUTTON_HOLD)
long sl_filter_tick;
unsigned int softlock_mask;
int unlock_combo;
bool keys_locked;
bool screen_has_lock;
#endif
bool repeated;
bool wait_for_release;
#ifndef DISABLE_ACTION_REMAP
int key_remap;
#endif
#ifdef HAVE_TOUCHSCREEN
bool ts_short_press;
int ts_data;
#endif
} action_last_t;
/* holds the action state between calls to get_action \ get_action_custom) */
static action_last_t action_last =
{

48
apps/action.h
View file

@ -379,54 +379,6 @@ enum {
LAST_ACTION_PLACEHOLDER, /* custom actions should be this + something */
};
/* act_cur holds action state during get_action() call */
typedef struct
{
int action;
int button;
int context;
int timeout;
const struct button_mapping *items;
const struct button_mapping* (*get_context_map)(int);
bool is_prebutton;
} action_cur_t;
/* act_last holds action state between get_action() calls */
typedef struct
{
int action;
long tick;
int button;
int context;
intptr_t data;
#if defined(HAVE_BACKLIGHT)
unsigned int backlight_mask;
long bl_filter_tick;
#endif
#if !defined(HAS_BUTTON_HOLD)
long sl_filter_tick;
unsigned int softlock_mask;
int unlock_combo;
bool keys_locked;
bool screen_has_lock;
#endif
bool repeated;
bool wait_for_release;
#ifndef DISABLE_ACTION_REMAP
int key_remap;
#endif
#ifdef HAVE_TOUCHSCREEN
bool ts_short_press;
int ts_data;
#endif
} action_last_t;
struct button_mapping {
int action_code;
int button_code;