Commit 684d3ec3 authored by Nalin Dahyabhai's avatar Nalin Dahyabhai

don't steal keys from the input method. toggle the IUTF8 flag, if it was

* src/vte.c(vte_terminal_key_press): don't steal keys from the input method.
* src/pty.c(_vte_pty_set_utf8): toggle the IUTF8 flag, if it was defined at
	compile-time (maybe for #129317).
parent d0c8c47d
2004-04-19 nalin
* src/vte.c(vte_terminal_key_press): don't steal keys from the input
method.
2004-04-19 nalin
* src/pty.c(_vte_pty_set_utf8): toggle the IUTF8 flag, if
it was defined at compile-time (maybe for #129317).
......
......@@ -37,9 +37,6 @@
#ifdef HAVE_STROPTS_H
#include <stropts.h>
#endif
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
#include <glib.h>
#include "debug.h"
#include "pty.h"
......
......@@ -8057,7 +8057,7 @@ vte_terminal_im_preedit_end(GtkIMContext *im_context, gpointer data)
fprintf(stderr, "Input method pre-edit ended.\n");
}
#endif
terminal->pvt->im_preedit_active = TRUE;
terminal->pvt->im_preedit_active = FALSE;
}
/* The pre-edit string changed. */
......@@ -8249,19 +8249,48 @@ vte_terminal_key_press(GtkWidget *widget, GdkEventKey *event)
#endif
/* We steal many keypad keys here. */
switch (keyval) {
case GDK_KP_Add:
case GDK_KP_Subtract:
case GDK_KP_Multiply:
case GDK_KP_Divide:
case GDK_KP_Enter:
steal = TRUE;
break;
default:
break;
}
if (modifiers & VTE_META_MASK) {
steal = TRUE;
if (!terminal->pvt->im_preedit_active) {
switch (keyval) {
case GDK_KP_Add:
case GDK_KP_Subtract:
case GDK_KP_Multiply:
case GDK_KP_Divide:
case GDK_KP_Enter:
steal = TRUE;
break;
default:
break;
}
if (modifiers & VTE_META_MASK) {
steal = TRUE;
}
switch (keyval) {
case GDK_Multi_key:
case GDK_Codeinput:
case GDK_SingleCandidate:
case GDK_MultipleCandidate:
case GDK_PreviousCandidate:
case GDK_Kanji:
case GDK_Muhenkan:
case GDK_Henkan:
case GDK_Romaji:
case GDK_Hiragana:
case GDK_Katakana:
case GDK_Hiragana_Katakana:
case GDK_Zenkaku:
case GDK_Hankaku:
case GDK_Zenkaku_Hankaku:
case GDK_Touroku:
case GDK_Massyo:
case GDK_Kana_Lock:
case GDK_Kana_Shift:
case GDK_Eisu_Shift:
case GDK_Eisu_toggle:
steal = FALSE;
break;
default:
break;
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment