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.550 by root, Thu May 22 18:54:32 2014 UTC vs.
Revision 1.566 by sf-exg, Sat Sep 12 14:03:35 2015 UTC

… …
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 + 1]; 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)
… …
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
… …
701 } 698 }
702 699
703 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) 700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
704 return; 701 return;
705 702
706 if (valid_keysym) 703 if (keysym != NoSymbol)
707 { 704 {
708#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
709 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
710 return; 707 return;
711#endif 708#endif
… …
770#endif 767#endif
771 } 768 }
772 769
773 if (shft) 770 if (shft)
774 { 771 {
775 /* Shift + F1 - F10 generates F11 - F20 */
776 if (keysym >= XK_F1 && keysym <= XK_F10)
777 {
778 keysym += (XK_F11 - XK_F1);
779 shft = 0; /* turn off Shift */
780 }
781 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
782 { 773 {
783 switch (keysym) 774 switch (keysym)
784 { 775 {
785 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
786 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
1043 1034
1044#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1045void 1036void
1046rxvt_term::cursor_blink_reset () 1037rxvt_term::cursor_blink_reset ()
1047{ 1038{
1039 if (!focus)
1040 return;
1041
1048 if (hidden_cursor) 1042 if (hidden_cursor)
1049 { 1043 {
1050 hidden_cursor = 0; 1044 hidden_cursor = 0;
1051 want_refresh = 1; 1045 want_refresh = 1;
1052 } 1046 }
1053 1047
1054 if (option (Opt_cursorBlink)) 1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1055 cursor_blink_ev.again (); 1049 cursor_blink_ev.again ();
1056 else 1050 else
1057 cursor_blink_ev.stop (); 1051 cursor_blink_ev.stop ();
1058} 1052}
1059 1053
… …
1248 1242
1249void ecb_cold 1243void ecb_cold
1250rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1251{ 1245{
1252 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1253 recolour_cursor (); 1247 recolor_cursor ();
1254 1248
1255#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1256 hidden_pointer = 0; 1250 hidden_pointer = 0;
1257 1251
1258 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
… …
1618 case MotionNotify: 1612 case MotionNotify:
1619#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1620 if (hidden_pointer) 1614 if (hidden_pointer)
1621 pointer_unblank (); 1615 pointer_unblank ();
1622#endif 1616#endif
1617 if (!bypass_keystate
1623 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1624 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1625 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1626 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1627 break; 1622 break;
1628 1623
1629 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
… …
1641 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1642 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1643 &ev.xbutton.state); 1638 &ev.xbutton.state);
1644#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1645 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1646 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1647 { 1643 {
1648#endif
1649#if ISO_14755 1644#if ISO_14755
1650 // 5.4 1645 // 5.4
1651 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1652 { 1647 {
1653 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1702 * shouldn't be scrolling 1697 * shouldn't be scrolling
1703 */ 1698 */
1704 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1705 } 1700 }
1706#endif 1701#endif
1707#ifdef MOUSE_THRESHOLD
1708 } 1702 }
1709#endif
1710 } 1703 }
1711 } 1704 }
1712 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1713 { 1706 {
1714 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1788#endif 1781#endif
1789#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1791 { 1784 {
1792 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1793 scr_recolour (); 1786 scr_recolor ();
1794 } 1787 }
1795#endif 1788#endif
1796#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1797 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1798 set_urgency (0); 1791 set_urgency (0);
… …
1835#endif 1828#endif
1836#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1837 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1838 { 1831 {
1839 pix_colors = pix_colors_unfocused; 1832 pix_colors = pix_colors_unfocused;
1840 scr_recolour (); 1833 scr_recolor ();
1841 } 1834 }
1842#endif 1835#endif
1843 1836
1844 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1837 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1845 } 1838 }
1846} 1839}
1847 1840
1848void ecb_cold 1841void ecb_cold
1849rxvt_term::update_fade_color (unsigned int idx) 1842rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1850{ 1843{
1851#if OFF_FOCUS_FADING 1844#if OFF_FOCUS_FADING
1852 if (rs[Rs_fade]) 1845 if (rs[Rs_fade])
1853 { 1846 {
1847 if (!first_time)
1848 pix_colors_focused [idx].free (this);
1849
1854 rgba c; 1850 rgba c;
1855 pix_colors [Color_fade].get (c); 1851 pix_colors [Color_fade].get (c);
1856 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1852 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1857 } 1853 }
1858#endif 1854#endif
… …
1920 iso14755_54 (ev.x, ev.y); 1916 iso14755_54 (ev.x, ev.y);
1921 return; 1917 return;
1922 } 1918 }
1923#endif 1919#endif
1924 1920
1925 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1921 clickintime = ev.time - MEvent.time < multiClickTime;
1926 1922
1927 if (reportmode) 1923 if (reportmode)
1928 { 1924 {
1929 /* mouse report from vt window */ 1925 /* mouse report from vt window */
1930 /* save the xbutton state (for ButtonRelease) */ 1926 /* save the xbutton state (for ButtonRelease) */
… …
2180#ifdef MOUSE_REPORT_DOUBLECLICK 2176#ifdef MOUSE_REPORT_DOUBLECLICK
2181 /* only report the release of 'slow' single clicks */ 2177 /* only report the release of 'slow' single clicks */
2182 if (MEvent.button != AnyButton 2178 if (MEvent.button != AnyButton
2183 && (ev.button != MEvent.button 2179 && (ev.button != MEvent.button
2184 || (ev.time - MEvent.time 2180 || (ev.time - MEvent.time
2185 > MULTICLICK_TIME / 2))) 2181 > multiClickTime / 2)))
2186 { 2182 {
2187 MEvent.clicks = 0; 2183 MEvent.clicks = 0;
2188 MEvent.button = AnyButton; 2184 MEvent.button = AnyButton;
2189 mouse_report (ev); 2185 mouse_report (ev);
2190 } 2186 }
… …
2580 scr_charset_choose (0); 2576 scr_charset_choose (0);
2581 break; 2577 break;
2582 2578
2583#ifdef EIGHT_BIT_CONTROLS 2579#ifdef EIGHT_BIT_CONTROLS
2584 // 8-bit controls 2580 // 8-bit controls
2585 case 0x90: /* DCS */ 2581 case 0x90: /* DCS */
2586 process_dcs_seq (); 2582 process_dcs_seq ();
2587 break; 2583 break;
2588 case 0x9b: /* CSI */ 2584 case 0x9b: /* CSI */
2589 process_csi_seq (); 2585 process_csi_seq ();
2590 break; 2586 break;
2591 case 0x9d: /* OSC */ 2587 case 0x9d: /* OSC */
2592 process_osc_seq (); 2588 process_osc_seq ();
2593 break; 2589 break;
2594#endif 2590#endif
2595 } 2591 }
2596} 2592}
… …
3101 scr_insert_mode (1); 3097 scr_insert_mode (1);
3102 else if (arg[0] == 20) 3098 else if (arg[0] == 20)
3103 priv_modes |= PrivMode_LFNL; 3099 priv_modes |= PrivMode_LFNL;
3104 break; 3100 break;
3105 3101
3106 case CSI_71: // DESCUSR: set cursor style 3102 case CSI_71: // DECSCUSR: set cursor style
3107 if (prev_ch == ' ') 3103 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]); 3104 set_cursor_style (arg[0]);
3109 break; 3105 break;
3110 3106
3111 /* 3107 /*
… …
3689 { 5, PrivMode_rVideo }, // DECSCNM 3685 { 5, PrivMode_rVideo }, // DECSCNM
3690 { 6, PrivMode_relOrigin }, // DECOM 3686 { 6, PrivMode_relOrigin }, // DECOM
3691 { 7, PrivMode_Autowrap }, // DECAWM 3687 { 7, PrivMode_Autowrap }, // DECAWM
3692 // 8, auto-repeat keys // DECARM 3688 // 8, auto-repeat keys // DECARM
3693 { 9, PrivMode_MouseX10 }, 3689 { 9, PrivMode_MouseX10 },
3690 { 12, PrivMode_BlinkingCursor },
3694 // 18 end FF to printer after print screen 3691 // 18 end FF to printer after print screen
3695 // 19 Print screen prints full screen/scroll region 3692 // 19 Print screen prints full screen/scroll region
3696 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3693 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3697#ifdef scrollBar_esc 3694#ifdef scrollBar_esc
3698 { scrollBar_esc, PrivMode_scrollBar }, 3695 { scrollBar_esc, PrivMode_scrollBar },
… …
3807 scrollBar.map (state); 3804 scrollBar.map (state);
3808 resize_all_windows (0, 0, 0); 3805 resize_all_windows (0, 0, 0);
3809 scr_touch (true); 3806 scr_touch (true);
3810 break; 3807 break;
3811#endif 3808#endif
3809#ifdef CURSOR_BLINK
3810 case 12:
3811 cursor_blink_reset ();
3812 break;
3813#endif
3812 case 25: /* visible/invisible cursor */ 3814 case 25: /* visible/invisible cursor */
3813 scr_cursor_visible (state); 3815 scr_cursor_visible (state);
3814 break; 3816 break;
3815 /* case 35: - shift keys */ 3817 /* case 35: - shift keys */
3816 /* case 40: - 80 <--> 132 mode */ 3818 /* case 40: - 80 <--> 132 mode */
… …
3921 //case 19: // ninth alt font 3923 //case 19: // ninth alt font
3922 //case 20: // gothic 3924 //case 20: // gothic
3923 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3925 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3924 rendset = 0, rendstyle = RS_Bold; 3926 rendset = 0, rendstyle = RS_Bold;
3925 break; 3927 break;
3926 case 22: // normal intensity 3928 case 22: // bold off (vt220)
3927 rendset = 0, rendstyle = RS_Bold; 3929 rendset = 0, rendstyle = RS_Bold;
3928 break; 3930 break;
3929 case 23: // disable italic 3931 case 23: // disable italic
3930 rendset = 0, rendstyle = RS_Italic; 3932 rendset = 0, rendstyle = RS_Italic;
3931 break; 3933 break;
3932 case 24: 3934 case 24: // underline off (vt220)
3933 rendset = 0, rendstyle = RS_Uline; 3935 rendset = 0, rendstyle = RS_Uline;
3934 break; 3936 break;
3935 case 25: 3937 case 25: // blink off (vt220)
3936 rendset = 0, rendstyle = RS_Blink; 3938 rendset = 0, rendstyle = RS_Blink;
3937 break; 3939 break;
3938 case 26: // variable spacing (iso 8613) 3940 case 26: // variable spacing (iso 8613)
3939 rendset = 0, rendstyle = RS_Blink; 3941 rendset = 0, rendstyle = RS_Blink;
3940 break; 3942 break;
3941 case 27: 3943 case 27: // reverse off (vt220)
3942 rendset = 0, rendstyle = RS_RVid; 3944 rendset = 0, rendstyle = RS_RVid;
3943 break; 3945 break;
3944 //case 28: // visible. NYI 3946 //case 28: // visible. NYI
3945 //case 29: // not crossed-out 3947 //case 29: // not crossed-out
3946 } 3948 }
… …
4024} 4026}
4025 4027
4026void 4028void
4027rxvt_term::set_cursor_style (int style) 4029rxvt_term::set_cursor_style (int style)
4028{ 4030{
4029 if (!IN_RANGE_INC (style, 0, 4)) 4031 if (!IN_RANGE_INC (style, 0, 6))
4030 return; 4032 return;
4031 4033
4034 if (style == 0)
4035 style = 1;
4036
4037 cursor_type = (style - 1) / 2;
4032 set_option (Opt_cursorUnderline, style >= 3); 4038 set_option (Opt_cursorUnderline, cursor_type == 1);
4033 4039
4034#ifdef CURSOR_BLINK 4040#ifdef CURSOR_BLINK
4035 set_option (Opt_cursorBlink, !style || (style & 1)); 4041 set_option (Opt_cursorBlink, style & 1);
4036 cursor_blink_reset (); 4042 cursor_blink_reset ();
4037#endif 4043#endif
4038 4044
4039 want_refresh = 1; 4045 want_refresh = 1;
4040} 4046}

Diff Legend

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