Mercurial > 510Connectbot
comparison src/com/five_ten_sg/connectbot/service/TerminalKeyListener.java @ 437:208b31032318
fix f11 and f12 keys on full hardware keyboards
author | Carl Byington <carl@five-ten-sg.com> |
---|---|
date | Fri, 19 Jun 2015 13:41:57 -0700 |
parents | 071eccdff8ea |
children |
comparison
equal
deleted
inserted
replaced
436:0dd7fbeba5b1 | 437:208b31032318 |
---|---|
319 boolean sendMeta = false; | 319 boolean sendMeta = false; |
320 | 320 |
321 if (k != 0) { | 321 if (k != 0) { |
322 if ((orgMetaState & HC_META_CTRL_ON) != 0) { | 322 if ((orgMetaState & HC_META_CTRL_ON) != 0) { |
323 k = keyAsControl(k); | 323 k = keyAsControl(k); |
324 | 324 if (k != k0) sendCtrl = true; |
325 if (k != k0) | |
326 sendCtrl = true; | |
327 | |
328 // send F1-F10 via CTRL-1 through CTRL-0 | 325 // send F1-F10 via CTRL-1 through CTRL-0 |
329 if (!sendCtrl && sendFunctionKey(keyCode)) | 326 if (!sendCtrl && sendFunctionKey(keyCode)) |
330 return true; | 327 return true; |
331 } | 328 } |
332 else if ((orgMetaState & KeyEvent.META_ALT_ON) != 0) { | 329 else if ((orgMetaState & KeyEvent.META_ALT_ON) != 0) { |
347 int k0 = k; | 344 int k0 = k; |
348 | 345 |
349 if (k != 0) { | 346 if (k != 0) { |
350 if ((orgMetaState & HC_META_CTRL_ON) != 0) { | 347 if ((orgMetaState & HC_META_CTRL_ON) != 0) { |
351 k = keyAsControl(k); | 348 k = keyAsControl(k); |
352 | 349 if (k != k0) buffer.write(k); |
353 if (k != k0) | |
354 buffer.write(k); | |
355 | |
356 return true; | 350 return true; |
357 } | 351 } |
358 else if ((orgMetaState & KeyEvent.META_ALT_ON) != 0) { | 352 else if ((orgMetaState & KeyEvent.META_ALT_ON) != 0) { |
359 sendEscape(); | 353 sendEscape(); |
360 buffer.write(k); | 354 buffer.write(k); |
794 case KeyEvent.KEYCODE_F10: | 788 case KeyEvent.KEYCODE_F10: |
795 buffer.keyPressed(vt320.KEY_F10, ' ', 0); | 789 buffer.keyPressed(vt320.KEY_F10, ' ', 0); |
796 return true; | 790 return true; |
797 | 791 |
798 case KeyEvent.KEYCODE_F11: | 792 case KeyEvent.KEYCODE_F11: |
799 buffer.keyPressed(vt320.KEY_F10, ' ', 0); | 793 buffer.keyPressed(vt320.KEY_F11, ' ', 0); |
800 return true; | 794 return true; |
801 | 795 |
802 case KeyEvent.KEYCODE_F12: | 796 case KeyEvent.KEYCODE_F12: |
803 buffer.keyPressed(vt320.KEY_F10, ' ', 0); | 797 buffer.keyPressed(vt320.KEY_F12, ' ', 0); |
804 return true; | 798 return true; |
805 | 799 |
806 case KeyEvent.KEYCODE_INSERT: | 800 case KeyEvent.KEYCODE_INSERT: |
807 buffer.keyPressed(vt320.KEY_INSERT, ' ', 0); | 801 buffer.keyPressed(vt320.KEY_INSERT, ' ', 0); |
808 return true; | 802 return true; |
1181 return false; | 1175 return false; |
1182 } | 1176 } |
1183 | 1177 |
1184 protected boolean fullKeyboard() { | 1178 protected boolean fullKeyboard() { |
1185 if (customKeyboard.equals(PreferenceConstants.CUSTOM_KEYMAP_FULL) || | 1179 if (customKeyboard.equals(PreferenceConstants.CUSTOM_KEYMAP_FULL) || |
1186 (customKeyboard.equals(PreferenceConstants.CUSTOM_KEYMAP_ASUS_TF))) | 1180 (customKeyboard.equals(PreferenceConstants.CUSTOM_KEYMAP_ASUS_TF))) |
1187 return true; | 1181 return true; |
1188 | 1182 |
1189 return false; | 1183 return false; |
1190 } | 1184 } |
1191 | 1185 |