Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Thu, 12 Feb 2015 23:37:21 UTC Commit: e613d931878a98118f39c8f2f92fe4ec23508c4c https://github.com/geany/geany/commit/e613d931878a98118f39c8f2f92fe4ec23508c...
Log Message: ----------- Revert some OS X keybinding changes for VTE
While all normal keybindings use the Command key instead of control key on OS X, all the command-line applications and terminal emulators use the Ctrl key like on Linux. This includes Ctrl+C (SIGINT) and Ctrl+D (EOF) for which there is some special handling in the VTE support in Geany and which should use GDK_CONTROL_MASK instead of GEANY_PRIMARY_MOD_MASK.
Modified Paths: -------------- src/vte.c
Modified: src/vte.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -329,7 +329,7 @@ void vte_close(void) static gboolean vte_keyrelease_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) { if (ui_is_keyval_enter_or_return(event->keyval) || - ((event->keyval == GDK_c) && (event->state & GEANY_PRIMARY_MOD_MASK))) + ((event->keyval == GDK_c) && (event->state & GDK_CONTROL_MASK))) { /* assume any text on the prompt has been executed when pressing Enter/Return */ clean = TRUE; @@ -350,7 +350,7 @@ static gboolean vte_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer event->keyval == GDK_d || event->keyval == GDK_C || event->keyval == GDK_D) && - event->state & GEANY_PRIMARY_MOD_MASK && + event->state & GDK_CONTROL_MASK && ! (event->state & GDK_SHIFT_MASK) && ! (event->state & GDK_MOD1_MASK)) { vte_restart(widget);
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).