a0a59ab610
Enabling locked actions for all softlock targets accidentally broke keylock on touchscreens because the generic touchscreen keymap was missed. Trying to lookup CONTEXT_WPS|CONTEXT_LOCKED returned the mapping for CONTEXT_STD because the locked version wasn't explicitly handled. But on almost all cases, a context's keymap does not change when the screen is locked. It makes more sense to mask out the locked flag and only check for it where needed. Change-Id: I65cda2de82950d272d4394fd772286699e7c3779
186 lines
6.7 KiB
C
186 lines
6.7 KiB
C
/***************************************************************************
|
|
* __________ __ ___.
|
|
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
|
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
|
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
|
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
|
* \/ \/ \/ \/ \/
|
|
* $Id$
|
|
*
|
|
* Copyright (C) 2012 Amaury Pouly
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
****************************************************************************/
|
|
|
|
/* Button Code Definitions for the Creative ZEN X-Fi2 target */
|
|
/* NB: Up/Down/Left/Right are not physical buttons - touchscreen emulation */
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "config.h"
|
|
#include "action.h"
|
|
#include "button.h"
|
|
#include "settings.h"
|
|
|
|
/*
|
|
* The format of the list is as follows
|
|
* { Action Code, Button code, Prereq button code }
|
|
* if there's no need to check the previous button's value, use BUTTON_NONE
|
|
* Insert LAST_ITEM_IN_LIST at the end of each mapping
|
|
*/
|
|
|
|
static const struct button_mapping button_context_standard[] = {
|
|
{ ACTION_STD_OK, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
|
|
{ ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
|
|
|
|
{ ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
|
|
|
|
|
|
LAST_ITEM_IN_LIST
|
|
}; /* button_context_standard */
|
|
|
|
|
|
static const struct button_mapping button_context_wps[] = {
|
|
{ ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
|
|
{ ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
|
|
{ ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE },
|
|
|
|
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
|
|
}; /* button_context_wps */
|
|
|
|
static const struct button_mapping button_context_list[] = {
|
|
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
|
|
}; /* button_context_list */
|
|
|
|
static const struct button_mapping button_context_tree[] = {
|
|
|
|
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
|
|
}; /* button_context_tree */
|
|
|
|
static const struct button_mapping button_context_listtree_scroll_with_combo[] = {
|
|
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
|
|
};
|
|
|
|
static const struct button_mapping button_context_listtree_scroll_without_combo[] = {
|
|
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
|
|
};
|
|
|
|
static const struct button_mapping button_context_settings[] = {
|
|
{ ACTION_STD_OK, BUTTON_MENU, BUTTON_NONE },
|
|
{ ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
|
|
|
|
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
|
|
}; /* button_context_settings */
|
|
|
|
static const struct button_mapping button_context_settings_right_is_inc[] = {
|
|
|
|
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
|
|
}; /* button_context_settingsgraphical */
|
|
|
|
static const struct button_mapping button_context_yesno[] = {
|
|
{ ACTION_YESNO_ACCEPT, BUTTON_MENU, BUTTON_NONE },
|
|
|
|
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
|
|
}; /* button_context_settings_yesno */
|
|
|
|
static const struct button_mapping button_context_colorchooser[] = {
|
|
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
|
|
}; /* button_context_colorchooser */
|
|
|
|
static const struct button_mapping button_context_eq[] = {
|
|
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
|
|
}; /* button_context_eq */
|
|
|
|
/** Bookmark Screen **/
|
|
static const struct button_mapping button_context_bmark[] = {
|
|
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
|
|
}; /* button_context_bmark */
|
|
|
|
static const struct button_mapping button_context_time[] = {
|
|
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
|
|
}; /* button_context_time */
|
|
|
|
static const struct button_mapping button_context_quickscreen[] = {
|
|
{ ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE },
|
|
{ ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_NONE },
|
|
|
|
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
|
|
}; /* button_context_quickscreen */
|
|
|
|
static const struct button_mapping button_context_pitchscreen[] = {
|
|
{ ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE },
|
|
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
|
|
}; /* button_context_pitchcreen */
|
|
|
|
static const struct button_mapping button_context_keyboard[] = {
|
|
{ ACTION_KBD_PAGE_FLIP, BUTTON_MENU, BUTTON_NONE },
|
|
|
|
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
|
|
}; /* button_context_keyboard */
|
|
|
|
static const struct button_mapping button_context_radio[] = {
|
|
{ ACTION_FM_EXIT, BUTTON_MENU|BUTTON_REL, BUTTON_NONE },
|
|
{ ACTION_FM_MENU, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE },
|
|
{ ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE },
|
|
|
|
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
|
|
}; /* button_context_radio */
|
|
|
|
const struct button_mapping* target_get_context_mapping(int context)
|
|
{
|
|
switch (context & ~CONTEXT_LOCKED)
|
|
{
|
|
case CONTEXT_STD:
|
|
return button_context_standard;
|
|
case CONTEXT_WPS:
|
|
return button_context_wps;
|
|
|
|
case CONTEXT_LIST:
|
|
return button_context_list;
|
|
case CONTEXT_MAINMENU:
|
|
case CONTEXT_TREE:
|
|
if (global_settings.hold_lr_for_scroll_in_list)
|
|
return button_context_listtree_scroll_without_combo;
|
|
else
|
|
return button_context_listtree_scroll_with_combo;
|
|
case CONTEXT_CUSTOM|CONTEXT_TREE:
|
|
return button_context_tree;
|
|
|
|
case CONTEXT_SETTINGS:
|
|
return button_context_settings;
|
|
case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
|
|
case CONTEXT_SETTINGS_RECTRIGGER:
|
|
return button_context_settings_right_is_inc;
|
|
|
|
case CONTEXT_SETTINGS_COLOURCHOOSER:
|
|
return button_context_colorchooser;
|
|
case CONTEXT_SETTINGS_EQ:
|
|
return button_context_eq;
|
|
|
|
case CONTEXT_SETTINGS_TIME:
|
|
return button_context_time;
|
|
|
|
case CONTEXT_YESNOSCREEN:
|
|
return button_context_yesno;
|
|
case CONTEXT_FM:
|
|
return button_context_radio;
|
|
case CONTEXT_BOOKMARKSCREEN:
|
|
return button_context_bmark;
|
|
case CONTEXT_QUICKSCREEN:
|
|
return button_context_quickscreen;
|
|
case CONTEXT_PITCHSCREEN:
|
|
return button_context_pitchscreen;
|
|
case CONTEXT_KEYBOARD:
|
|
return button_context_keyboard;
|
|
}
|
|
return button_context_standard;
|
|
}
|