ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.545 by sf-exg, Sat Apr 26 15:05:17 2014 UTC vs.
Revision 1.553 by sf-exg, Sat Jul 26 15:58:38 2014 UTC

… …
30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
315 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
329 }; 324 };
330 325
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
376 param = 3; 371 param = 3;
377 break; 372 break;
378 case XK_Select: 373 case XK_Select:
379 param = 4; 374 param = 4;
380 break; 375 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior: 376 case XK_Prior:
383 param = 5; 377 param = 5;
384 break; 378 break;
385 case XK_Next: 379 case XK_Next:
386 param = 6; 380 param = 6;
… …
389 param = 7; 383 param = 7;
390 break; 384 break;
391 case XK_End: 385 case XK_End:
392 param = 8; 386 param = 8;
393 break; 387 break;
394#endif
395 case XK_Help: 388 case XK_Help:
396 param = 28; 389 param = 28;
397 break; 390 break;
398 case XK_Menu: 391 case XK_Menu:
399 param = 29; 392 param = 29;
… …
413 406
414void ecb_cold 407void ecb_cold
415rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
416{ 409{
417 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
418 KeySym keysym; 411 KeySym keysym = NoSymbol;
419 int valid_keysym;
420 char rkbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
421 char *kbuf = rkbuf + 1; 413 char *kbuf = rkbuf + 1;
422 414
423#if ISO_14755 415#if ISO_14755
424 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
425 return; 417 return;
… …
483 } 475 }
484 } 476 }
485 else 477 else
486 len = 0; 478 len = 0;
487 } 479 }
488
489 valid_keysym = status_return == XLookupKeySym
490 || status_return == XLookupBoth;
491 } 480 }
492 else 481 else
493#endif 482#endif
494 { 483 {
495 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
496 valid_keysym = keysym != NoSymbol;
497 }
498
499 if (valid_keysym)
500 { 485 }
486
487 if (keysym != NoSymbol)
488 {
489 KeySym orig_keysym = keysym;
490
491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
501 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
502 { 499 {
503 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
504 unsigned int newlen = 1; 501 unsigned int newlen = 1;
505 502
… …
685 meta = 0; 682 meta = 0;
686 } 683 }
687#endif 684#endif
688 /* nil */ ; 685 /* nil */ ;
689 } 686 }
687
688 keysym = orig_keysym;
690 } 689 }
691 690
692 /* escape prefix */ 691 /* escape prefix */
693 if (len && meta 692 if (len && meta
694#ifdef META8_OPTION 693#ifdef META8_OPTION
… …
698 { 697 {
699 *--kbuf = C0_ESC; 698 *--kbuf = C0_ESC;
700 len++; 699 len++;
701 } 700 }
702 701
703 if (valid_keysym) 702 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
703 return;
704
705 if (keysym != NoSymbol)
704 { 706 {
705#ifdef KEYSYM_RESOURCE 707#ifdef KEYSYM_RESOURCE
706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len)) 708 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
707 return; 709 return;
708#endif 710#endif
… …
767#endif 769#endif
768 } 770 }
769 771
770 if (shft) 772 if (shft)
771 { 773 {
772 /* Shift + F1 - F10 generates F11 - F20 */
773 if (keysym >= XK_F1 && keysym <= XK_F10)
774 {
775 keysym += (XK_F11 - XK_F1);
776 shft = 0; /* turn off Shift */
777 }
778 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 774 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
779 { 775 {
780 switch (keysym) 776 switch (keysym)
781 { 777 {
782 /* normal XTerm key bindings */ 778 /* normal XTerm key bindings */
783 case XK_Insert: /* Shift+Insert = paste mouse selection */ 779 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
871 return; 867 return;
872 } 868 }
873#endif 869#endif
874 } 870 }
875 871
876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
877 return;
878
879 if (len <= 0) 872 if (len <= 0)
880 return; /* not mapped */ 873 return; /* not mapped */
881 874
882 if (option (Opt_scrollTtyKeypress))
883 if (view_start)
884 {
885 view_start = 0;
886 want_refresh = 1;
887 }
888
889 tt_write (kbuf, (unsigned int)len); 875 tt_write_user_input (kbuf, (unsigned int)len);
890} 876}
891 877
892void ecb_cold 878void ecb_cold
893rxvt_term::key_release (XKeyEvent &ev) 879rxvt_term::key_release (XKeyEvent &ev)
894{ 880{
… …
4045 4031
4046 want_refresh = 1; 4032 want_refresh = 1;
4047} 4033}
4048/*}}} */ 4034/*}}} */
4049 4035
4050/* ------------------------------------------------------------------------- */ 4036/* ---------------------------------------------------------------------- */
4037/* Write data to the pty as typed by the user, pasted with the mouse,
4038 * or generated by us in response to a query ESC sequence.
4039 */
4051 4040
4052/* 4041/*
4053 * Send printf () formatted output to the command. 4042 * Send printf () formatted output to the command.
4054 * Only use for small amounts of data. 4043 * Only use for small amounts of data.
4055 */ 4044 */
… …
4063 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4052 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4064 va_end (arg_ptr); 4053 va_end (arg_ptr);
4065 tt_write (buf, strlen (buf)); 4054 tt_write (buf, strlen (buf));
4066} 4055}
4067 4056
4068/* ---------------------------------------------------------------------- */
4069/* Write data to the pty as typed by the user, pasted with the mouse, 4057/* Write data to the pty as typed by the user. */
4070 * or generated by us in response to a query ESC sequence. 4058void
4071 */ 4059rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4072static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4060{
4061 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4062 return;
4063
4064 if (option (Opt_scrollTtyKeypress))
4065 if (view_start)
4066 {
4067 view_start = 0;
4068 want_refresh = 1;
4069 }
4070
4071 tt_write_ (data, len);
4072}
4073 4073
4074void 4074void
4075rxvt_term::tt_write (const char *data, unsigned int len) 4075rxvt_term::tt_write (const char *data, unsigned int len)
4076{ 4076{
4077 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4077 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4078 return; 4078 return;
4079 4079
4080 tt_write_ (data, len);
4081}
4082
4083static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4084
4085void
4086rxvt_term::tt_write_ (const char *data, unsigned int len)
4087{
4080 if (pty->pty < 0) 4088 if (pty->pty < 0)
4081 return; 4089 return;
4082 4090
4083 if (v_buflen == 0) 4091 if (v_buflen == 0)
4084 { 4092 {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines