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.560 by sf-exg, Mon Nov 24 21:46:04 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
… …
210 210
211 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
212 212
213 if (y >= 0) 213 if (y >= 0)
214 { 214 {
215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
216 x = 0; 216 x = 0;
217 } 217 }
218 218
219 scr_overlay_new (x, y, width, len * 2 + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220 220
… …
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
… …
679 { 676 {
680 char *ch; 677 char *ch;
681 678
682 for (ch = kbuf; ch < kbuf + len; ch++) 679 for (ch = kbuf; ch < kbuf + len; ch++)
683 *ch |= 0x80; 680 *ch |= 0x80;
684
685 meta = 0;
686 } 681 }
687#endif 682#endif
688 /* nil */ ; 683 /* nil */ ;
689 } 684 }
685
686 keysym = orig_keysym;
690 } 687 }
691 688
692 /* escape prefix */ 689 /* escape prefix */
693 if (len && meta 690 if (len && meta
694#ifdef META8_OPTION 691#ifdef META8_OPTION
… …
698 { 695 {
699 *--kbuf = C0_ESC; 696 *--kbuf = C0_ESC;
700 len++; 697 len++;
701 } 698 }
702 699
703 if (valid_keysym) 700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
704 { 704 {
705#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
707 return; 707 return;
708#endif 708#endif
… …
767#endif 767#endif
768 } 768 }
769 769
770 if (shft) 770 if (shft)
771 { 771 {
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)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
779 { 773 {
780 switch (keysym) 774 switch (keysym)
781 { 775 {
782 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
783 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
871 return; 865 return;
872 } 866 }
873#endif 867#endif
874 } 868 }
875 869
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) 870 if (len <= 0)
880 return; /* not mapped */ 871 return; /* not mapped */
881 872
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); 873 tt_write_user_input (kbuf, (unsigned int)len);
890} 874}
891 875
892void ecb_cold 876void ecb_cold
893rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
894{ 878{
… …
1927 iso14755_54 (ev.x, ev.y); 1911 iso14755_54 (ev.x, ev.y);
1928 return; 1912 return;
1929 } 1913 }
1930#endif 1914#endif
1931 1915
1932 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1916 clickintime = ev.time - MEvent.time < multiClickTime;
1933 1917
1934 if (reportmode) 1918 if (reportmode)
1935 { 1919 {
1936 /* mouse report from vt window */ 1920 /* mouse report from vt window */
1937 /* save the xbutton state (for ButtonRelease) */ 1921 /* save the xbutton state (for ButtonRelease) */
… …
2187#ifdef MOUSE_REPORT_DOUBLECLICK 2171#ifdef MOUSE_REPORT_DOUBLECLICK
2188 /* only report the release of 'slow' single clicks */ 2172 /* only report the release of 'slow' single clicks */
2189 if (MEvent.button != AnyButton 2173 if (MEvent.button != AnyButton
2190 && (ev.button != MEvent.button 2174 && (ev.button != MEvent.button
2191 || (ev.time - MEvent.time 2175 || (ev.time - MEvent.time
2192 > MULTICLICK_TIME / 2))) 2176 > multiClickTime / 2)))
2193 { 2177 {
2194 MEvent.clicks = 0; 2178 MEvent.clicks = 0;
2195 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2196 mouse_report (ev); 2180 mouse_report (ev);
2197 } 2181 }
… …
2587 scr_charset_choose (0); 2571 scr_charset_choose (0);
2588 break; 2572 break;
2589 2573
2590#ifdef EIGHT_BIT_CONTROLS 2574#ifdef EIGHT_BIT_CONTROLS
2591 // 8-bit controls 2575 // 8-bit controls
2592 case 0x90: /* DCS */ 2576 case 0x90: /* DCS */
2593 process_dcs_seq (); 2577 process_dcs_seq ();
2594 break; 2578 break;
2595 case 0x9b: /* CSI */ 2579 case 0x9b: /* CSI */
2596 process_csi_seq (); 2580 process_csi_seq ();
2597 break; 2581 break;
2598 case 0x9d: /* OSC */ 2582 case 0x9d: /* OSC */
2599 process_osc_seq (); 2583 process_osc_seq ();
2600 break; 2584 break;
2601#endif 2585#endif
2602 } 2586 }
2603} 2587}
… …
3108 scr_insert_mode (1); 3092 scr_insert_mode (1);
3109 else if (arg[0] == 20) 3093 else if (arg[0] == 20)
3110 priv_modes |= PrivMode_LFNL; 3094 priv_modes |= PrivMode_LFNL;
3111 break; 3095 break;
3112 3096
3113 case CSI_71: // DESCUSR: set cursor style 3097 case CSI_71: // DECSCUSR: set cursor style
3114 if (prev_ch == ' ') 3098 if (prev_ch == ' ')
3115 set_cursor_style (arg[0]); 3099 set_cursor_style (arg[0]);
3116 break; 3100 break;
3117 3101
3118 /* 3102 /*
… …
3696 { 5, PrivMode_rVideo }, // DECSCNM 3680 { 5, PrivMode_rVideo }, // DECSCNM
3697 { 6, PrivMode_relOrigin }, // DECOM 3681 { 6, PrivMode_relOrigin }, // DECOM
3698 { 7, PrivMode_Autowrap }, // DECAWM 3682 { 7, PrivMode_Autowrap }, // DECAWM
3699 // 8, auto-repeat keys // DECARM 3683 // 8, auto-repeat keys // DECARM
3700 { 9, PrivMode_MouseX10 }, 3684 { 9, PrivMode_MouseX10 },
3685 { 12, PrivMode_BlinkingCursor },
3701 // 18 end FF to printer after print screen 3686 // 18 end FF to printer after print screen
3702 // 19 Print screen prints full screen/scroll region 3687 // 19 Print screen prints full screen/scroll region
3703 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3688 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3704#ifdef scrollBar_esc 3689#ifdef scrollBar_esc
3705 { scrollBar_esc, PrivMode_scrollBar }, 3690 { scrollBar_esc, PrivMode_scrollBar },
… …
3812#ifdef scrollBar_esc 3797#ifdef scrollBar_esc
3813 case scrollBar_esc: 3798 case scrollBar_esc:
3814 scrollBar.map (state); 3799 scrollBar.map (state);
3815 resize_all_windows (0, 0, 0); 3800 resize_all_windows (0, 0, 0);
3816 scr_touch (true); 3801 scr_touch (true);
3802 break;
3803#endif
3804#ifdef CURSOR_BLINK
3805 case 12:
3806 set_option (Opt_cursorBlink, state);
3807 cursor_blink_reset ();
3817 break; 3808 break;
3818#endif 3809#endif
3819 case 25: /* visible/invisible cursor */ 3810 case 25: /* visible/invisible cursor */
3820 scr_cursor_visible (state); 3811 scr_cursor_visible (state);
3821 break; 3812 break;
… …
4031} 4022}
4032 4023
4033void 4024void
4034rxvt_term::set_cursor_style (int style) 4025rxvt_term::set_cursor_style (int style)
4035{ 4026{
4036 if (!IN_RANGE_INC (style, 0, 4)) 4027 if (!IN_RANGE_INC (style, 0, 6))
4037 return; 4028 return;
4038 4029
4030 if (style == 0)
4031 style = 1;
4032
4033 cursor_type = (style - 1) / 2;
4039 set_option (Opt_cursorUnderline, style >= 3); 4034 set_option (Opt_cursorUnderline, cursor_type == 1);
4040 4035
4041#ifdef CURSOR_BLINK 4036#ifdef CURSOR_BLINK
4042 set_option (Opt_cursorBlink, !style || (style & 1)); 4037 set_option (Opt_cursorBlink, style & 1);
4043 cursor_blink_reset (); 4038 cursor_blink_reset ();
4044#endif 4039#endif
4045 4040
4046 want_refresh = 1; 4041 want_refresh = 1;
4047} 4042}
4048/*}}} */ 4043/*}}} */
4049 4044
4050/* ------------------------------------------------------------------------- */ 4045/* ---------------------------------------------------------------------- */
4046/* Write data to the pty as typed by the user, pasted with the mouse,
4047 * or generated by us in response to a query ESC sequence.
4048 */
4051 4049
4052/* 4050/*
4053 * Send printf () formatted output to the command. 4051 * Send printf () formatted output to the command.
4054 * Only use for small amounts of data. 4052 * Only use for small amounts of data.
4055 */ 4053 */
… …
4063 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4061 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4064 va_end (arg_ptr); 4062 va_end (arg_ptr);
4065 tt_write (buf, strlen (buf)); 4063 tt_write (buf, strlen (buf));
4066} 4064}
4067 4065
4068/* ---------------------------------------------------------------------- */
4069/* Write data to the pty as typed by the user, pasted with the mouse, 4066/* Write data to the pty as typed by the user. */
4070 * or generated by us in response to a query ESC sequence. 4067void
4071 */ 4068rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4072static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4069{
4070 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4071 return;
4072
4073 if (option (Opt_scrollTtyKeypress))
4074 if (view_start)
4075 {
4076 view_start = 0;
4077 want_refresh = 1;
4078 }
4079
4080 tt_write_ (data, len);
4081}
4073 4082
4074void 4083void
4075rxvt_term::tt_write (const char *data, unsigned int len) 4084rxvt_term::tt_write (const char *data, unsigned int len)
4076{ 4085{
4077 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4086 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4078 return; 4087 return;
4079 4088
4089 tt_write_ (data, len);
4090}
4091
4092static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4093
4094void
4095rxvt_term::tt_write_ (const char *data, unsigned int len)
4096{
4080 if (pty->pty < 0) 4097 if (pty->pty < 0)
4081 return; 4098 return;
4082 4099
4083 if (v_buflen == 0) 4100 if (v_buflen == 0)
4084 { 4101 {

Diff Legend

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