$NetBSD$ --- gcin-setup-list.c.orig 2013-02-25 17:59:05.000000000 +0000 +++ gcin-setup-list.c @@ -184,7 +184,7 @@ static gboolean toggled (GtkCellRenderer int in_no = gcin_switch_keys_lookup(key[0]); if (in_no < 0) - return; + return FALSE; gcin_flags_im_enabled ^= 1 << in_no; value ^= 1;
// return TRUE if the key press is processed gboolean ProcessKeyPress(KeySym keysym, u_int kev_state) { #if 0 dbg("key press %x %x\n", keysym, kev_state); #endif check_CS(); if (current_CS->client_win) focus_win = current_CS->client_win; if (!test_mode && callback_str_buffer && strlen(callback_str_buffer)) { send_text(callback_str_buffer); callback_str_buffer[0]=0; return TRUE; } if (force_preedit) { force_preedit=0; return 1; } if (keysym == XK_space) { #if 0 dbg("state %x\n", kev->state); dbg("%x\n", Mod4Mask); #endif if ( ((kev_state & (ControlMask|Mod1Mask|ShiftMask))==ControlMask && gcin_im_toggle_keys==Control_Space) || ((kev_state & Mod1Mask) && gcin_im_toggle_keys==Alt_Space) || ((kev_state & ShiftMask) && gcin_im_toggle_keys==Shift_Space) || ((kev_state & Mod4Mask) && gcin_im_toggle_keys==Windows_Space) ) { if (current_method_type() == method_type_TSIN) { tsin_set_eng_ch(1); } toggle_im_enabled(); #if UNIX return TRUE; #else return FALSE; #endif } } if (keysym == XK_space && (kev_state & ShiftMask)) { if (last_keysym != XK_Shift_L && last_keysym != XK_Shift_R) return FALSE; toggle_half_full_char(); return TRUE; } if ((kev_state & (Mod1Mask|ShiftMask)) == (Mod1Mask|ShiftMask)) { if (current_CS->im_state != GCIN_STATE_DISABLED || gcin_eng_phrase_enabled) return feed_phrase(keysym, kev_state); else return 0; } // dbg("state %x\n", kev_state); if ((current_CS->im_state & (GCIN_STATE_ENG_FULL)) ) { return full_char_proc(keysym); } if ((kev_state & ControlMask) && (kev_state&(Mod1Mask|Mod5Mask))) { if (keysym == 'g' || keysym == 'r') { send_output_buffer_bak(); return TRUE; } if (keysym == ',') { #if 1 if (current_CS->im_state == GCIN_STATE_CHINESE) { if (!win_is_visible()) win_sym_enabled=1; else win_sym_enabled^=1; } else win_sym_enabled=0; #else win_sym_enabled^=1; #endif create_win_sym(); if (win_sym_enabled) { force_show = TRUE; if (current_CS->im_state == GCIN_STATE_CHINESE) show_in_win(current_CS); force_show = FALSE; } return TRUE; } if (!gcin_enable_ctrl_alt_switch) return FALSE; int kidx = gcin_switch_keys_lookup(keysym); if (kidx <= 0) return FALSE; if (!inmd[kidx].cname) return FALSE; current_CS->im_state = GCIN_STATE_CHINESE; #if WIN32 if (!test_mode) #endif init_in_method(kidx); return TRUE; } last_keysym = keysym; if (current_CS->im_state == GCIN_STATE_DISABLED) { return FALSE; } if (!current_CS->b_gcin_protocol) { if (((keysym == XK_Control_L || keysym == XK_Control_R) && (kev_state & ShiftMask)) || ((keysym == XK_Shift_L || keysym == XK_Shift_R) && (kev_state & ControlMask))) { cycle_next_in_method(); return TRUE; } } if (current_CS->b_raise_window && keysym>=' ' && keysym < 127) { if (timeout_handle) g_source_remove(timeout_handle); timeout_handle = g_timeout_add(200, timeout_raise_window, NULL); } if (kev_state & ControlMask) { if (feed_phrase(keysym, kev_state)) return TRUE; } switch(current_method_type()) { case method_type_PHO: return feedkey_pho(keysym, kev_state); #if USE_TSIN case method_type_TSIN: return feedkey_pp(keysym, kev_state); #endif case method_type_INT_CODE: return feedkey_intcode(keysym); #if USE_ANTHY case method_type_ANTHY: return feedkey_anthy(keysym, kev_state); #endif default: return feedkey_gtab(keysym, kev_state); } return FALSE; }