Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support f9-f11 as physical keys mirroring the right and left hildon buttons #12

Merged
merged 2 commits into from Apr 13, 2021
Merged

Support f9-f11 as physical keys mirroring the right and left hildon buttons #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61a1a13
Make hildon shortcuts configurable
IMbackK Oct 7, 2020
9ca8087
Revert INSTALL file
IMbackK Feb 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/home/hd-home.c
View file
Open in desktop
Expand Up @@ -1062,13 +1062,6 @@ hd_home_desktop_key_release (XKeyEvent *xev, void *userdata)
(priv->key_sent == KEY_SENT_NONE) && (!STATE_IS_TASK_NAV(hd_render_manager_get_state())))
return;

if((XkbKeycodeToKeysym(clutter_x11_get_default_display(), xev->keycode, 0, 0) == GDK_Control_L) &&
IMbackK marked this conversation as resolved.
Show resolved Hide resolved
(STATE_IS_TASK_NAV(hd_render_manager_get_state())) &&
(conf_ctrl_backspace_in_tasknav==5) && in_alt_tab) {
in_alt_tab=FALSE;
hd_task_navigator_activate(0, 0, 0);
}

if(xev->state & ControlMask) {
priv->fn_state = FN_STATE_NONE;
priv->shift_state = FN_STATE_NONE;
Expand Down
30 changes: 0 additions & 30 deletions src/launcher/hd-app-mgr.c
View file
Open in desktop
Expand Up @@ -220,16 +220,10 @@ G_DEFINE_TYPE_WITH_CODE (HdAppMgr,
#define GCONF_VIEWS_CURRENT_DIR "/apps/osso/hildon-desktop/views"
#define GCONF_VIEWS_CURRENT_KEY "/apps/osso/hildon-desktop/views/current"

gboolean conf_enable_ctrl_backspace;
gboolean conf_enable_preset_shift_ctrl;
gboolean conf_enable_dbus_shift_ctrl;
gboolean conf_enable_home_contacts_phone;
gboolean conf_enable_launcher_navigator_accel;
gboolean conf_enable_dbus_launcher_navigator;
gboolean conf_default_launcher_positions;
gboolean conf_dbus_shortcuts_use_fn;
gboolean conf_dbus_ctrl_shortcuts;
gint conf_ctrl_backspace_in_tasknav;
gboolean conf_disable_edit;
#define GCONF_UI_CAN_ROTATE_KEY "/apps/osso/hildon-desktop/ui_can_rotate"

Expand Down Expand Up @@ -462,12 +456,6 @@ hd_app_mgr_init (HdAppMgr *self)
(gpointer) self,
NULL, NULL);
if(gconf_client_dir_exists(priv->gconf_client, GCONF_KEY_ACTIONS_DIR, NULL)) {
conf_enable_ctrl_backspace = gconf_client_get_bool(priv->gconf_client,
GCONF_KEY_ACTIONS_DIR "/ctrl_backspace", NULL);
conf_enable_preset_shift_ctrl = gconf_client_get_bool(priv->gconf_client,
GCONF_KEY_ACTIONS_DIR "/preset_shift_ctrl", NULL);
conf_enable_dbus_shift_ctrl = gconf_client_get_bool(priv->gconf_client,
GCONF_KEY_ACTIONS_DIR "/dbus_shift_ctrl", NULL);
conf_enable_home_contacts_phone = gconf_client_get_bool(priv->gconf_client,
GCONF_KEY_ACTIONS_DIR "/home_contacts_phone", NULL);
conf_enable_launcher_navigator_accel = gconf_client_get_bool(priv->gconf_client,
Expand All @@ -476,12 +464,6 @@ hd_app_mgr_init (HdAppMgr *self)
GCONF_KEY_ACTIONS_DIR "/dbus_launcher_navigator", NULL);
conf_default_launcher_positions = gconf_client_get_bool(priv->gconf_client,
GCONF_KEY_ACTIONS_DIR "/default_launcher_positions", NULL);
conf_ctrl_backspace_in_tasknav = gconf_client_get_int(priv->gconf_client,
GCONF_KEY_ACTIONS_DIR "/ctrl_backspace_in_tasknav", NULL);
conf_dbus_shortcuts_use_fn = gconf_client_get_bool(priv->gconf_client,
GCONF_KEY_ACTIONS_DIR "/dbus_shortcuts_use_fn", NULL);
conf_dbus_ctrl_shortcuts = gconf_client_get_bool(priv->gconf_client,
GCONF_KEY_ACTIONS_DIR "/dbus_ctrl_shortcuts", NULL);
conf_disable_edit = gconf_client_get_bool(priv->gconf_client,
GCONF_KEY_ACTIONS_DIR "/disable_edit", NULL);
}
Expand Down Expand Up @@ -2318,12 +2300,6 @@ hd_app_mgr_gconf_value_changed (GConfClient *client,
hd_app_mgr_update_portraitness(self);
}
if(gconf_client_dir_exists(priv->gconf_client, GCONF_KEY_ACTIONS_DIR, NULL)) {
conf_enable_ctrl_backspace = gconf_client_get_bool(priv->gconf_client,
GCONF_KEY_ACTIONS_DIR "/ctrl_backspace", NULL);
// conf_enable_preset_shift_ctrl = gconf_client_get_bool(priv->gconf_client,
// GCONF_KEY_ACTIONS_DIR "/preset_shift_ctrl", NULL);
// conf_enable_dbus_shift_ctrl = gconf_client_get_bool(priv->gconf_client,
// GCONF_KEY_ACTIONS_DIR "/dbus_shift_ctrl", NULL);
conf_enable_home_contacts_phone = gconf_client_get_bool(priv->gconf_client,
GCONF_KEY_ACTIONS_DIR "/home_contacts_phone", NULL);
conf_enable_launcher_navigator_accel = gconf_client_get_bool(priv->gconf_client,
Expand All @@ -2332,12 +2308,6 @@ hd_app_mgr_gconf_value_changed (GConfClient *client,
GCONF_KEY_ACTIONS_DIR "/dbus_launcher_navigator", NULL);
conf_default_launcher_positions = gconf_client_get_bool(priv->gconf_client,
GCONF_KEY_ACTIONS_DIR "/default_launcher_positions", NULL);
conf_ctrl_backspace_in_tasknav = gconf_client_get_int(priv->gconf_client,
GCONF_KEY_ACTIONS_DIR "/ctrl_backspace_in_tasknav", NULL);
conf_dbus_shortcuts_use_fn = gconf_client_get_bool(priv->gconf_client,
GCONF_KEY_ACTIONS_DIR "/dbus_shortcuts_use_fn", NULL);
conf_dbus_ctrl_shortcuts = gconf_client_get_bool(priv->gconf_client,
GCONF_KEY_ACTIONS_DIR "/dbus_ctrl_shortcuts", NULL);
conf_disable_edit = gconf_client_get_bool(priv->gconf_client,
GCONF_KEY_ACTIONS_DIR "/disable_edit", NULL);
}
Expand Down
6 changes: 0 additions & 6 deletions src/launcher/hd-app-mgr.h
View file
Open in desktop
Expand Up @@ -104,16 +104,10 @@ gboolean hd_app_mgr_execute (const gchar *exec, GPid *pid, gboolean auto_reap);
gboolean hd_app_mgr_check_show_callui(void);
void hd_app_mgr_mce_activate_accel_if_needed(gboolean update_portraitness);

extern gboolean conf_enable_ctrl_backspace;
extern gboolean conf_enable_preset_shift_ctrl;
extern gboolean conf_enable_dbus_shift_ctrl;
extern gboolean conf_enable_home_contacts_phone;
extern gboolean conf_enable_launcher_navigator_accel;
extern gboolean conf_enable_dbus_launcher_navigator;
extern gboolean conf_default_launcher_positions;
extern gboolean conf_dbus_shortcuts_use_fn;
extern gboolean conf_dbus_ctrl_shortcuts;
extern gint conf_ctrl_backspace_in_tasknav;
extern gboolean conf_disable_edit;
gboolean hd_app_mgr_is_portrait(void);
gboolean hd_app_mgr_slide_is_open (void);
Expand Down