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.553 by sf-exg, Sat Jul 26 15:58:38 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
… …
676 { 676 {
677 char *ch; 677 char *ch;
678 678
679 for (ch = kbuf; ch < kbuf + len; ch++) 679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80; 680 *ch |= 0x80;
681
682 meta = 0;
683 } 681 }
684#endif 682#endif
685 /* nil */ ; 683 /* nil */ ;
686 } 684 }
687 685
… …
1036 1034
1037#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1038void 1036void
1039rxvt_term::cursor_blink_reset () 1037rxvt_term::cursor_blink_reset ()
1040{ 1038{
1039 if (!focus)
1040 return;
1041
1041 if (hidden_cursor) 1042 if (hidden_cursor)
1042 { 1043 {
1043 hidden_cursor = 0; 1044 hidden_cursor = 0;
1044 want_refresh = 1; 1045 want_refresh = 1;
1045 } 1046 }
1046 1047
1047 if (option (Opt_cursorBlink)) 1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1048 cursor_blink_ev.again (); 1049 cursor_blink_ev.again ();
1049 else 1050 else
1050 cursor_blink_ev.stop (); 1051 cursor_blink_ev.stop ();
1051} 1052}
1052 1053
… …
1241 1242
1242void ecb_cold 1243void ecb_cold
1243rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1244{ 1245{
1245 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1246 recolour_cursor (); 1247 recolor_cursor ();
1247 1248
1248#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1249 hidden_pointer = 0; 1250 hidden_pointer = 0;
1250 1251
1251 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
… …
1611 case MotionNotify: 1612 case MotionNotify:
1612#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1613 if (hidden_pointer) 1614 if (hidden_pointer)
1614 pointer_unblank (); 1615 pointer_unblank ();
1615#endif 1616#endif
1617 if (!bypass_keystate
1616 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1617 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1618 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1619 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1620 break; 1622 break;
1621 1623
1622 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
… …
1634 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1635 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1636 &ev.xbutton.state); 1638 &ev.xbutton.state);
1637#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1638 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1639 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1640 { 1643 {
1641#endif
1642#if ISO_14755 1644#if ISO_14755
1643 // 5.4 1645 // 5.4
1644 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1645 { 1647 {
1646 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1695 * shouldn't be scrolling 1697 * shouldn't be scrolling
1696 */ 1698 */
1697 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1698 } 1700 }
1699#endif 1701#endif
1700#ifdef MOUSE_THRESHOLD
1701 } 1702 }
1702#endif
1703 } 1703 }
1704 } 1704 }
1705 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)
1706 { 1706 {
1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1781#endif 1781#endif
1782#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1783 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1784 { 1784 {
1785 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1786 scr_recolour (); 1786 scr_recolor ();
1787 } 1787 }
1788#endif 1788#endif
1789#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1790 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1791 set_urgency (0); 1791 set_urgency (0);
… …
1828#endif 1828#endif
1829#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1830 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1831 { 1831 {
1832 pix_colors = pix_colors_unfocused; 1832 pix_colors = pix_colors_unfocused;
1833 scr_recolour (); 1833 scr_recolor ();
1834 } 1834 }
1835#endif 1835#endif
1836 1836
1837 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1837 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1838 } 1838 }
1839} 1839}
1840 1840
1841void ecb_cold 1841void ecb_cold
1842rxvt_term::update_fade_color (unsigned int idx) 1842rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1843{ 1843{
1844#if OFF_FOCUS_FADING 1844#if OFF_FOCUS_FADING
1845 if (rs[Rs_fade]) 1845 if (rs[Rs_fade])
1846 { 1846 {
1847 if (!first_time)
1848 pix_colors_focused [idx].free (this);
1849
1847 rgba c; 1850 rgba c;
1848 pix_colors [Color_fade].get (c); 1851 pix_colors [Color_fade].get (c);
1849 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);
1850 } 1853 }
1851#endif 1854#endif
… …
1913 iso14755_54 (ev.x, ev.y); 1916 iso14755_54 (ev.x, ev.y);
1914 return; 1917 return;
1915 } 1918 }
1916#endif 1919#endif
1917 1920
1918 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1921 clickintime = ev.time - MEvent.time < multiClickTime;
1919 1922
1920 if (reportmode) 1923 if (reportmode)
1921 { 1924 {
1922 /* mouse report from vt window */ 1925 /* mouse report from vt window */
1923 /* save the xbutton state (for ButtonRelease) */ 1926 /* save the xbutton state (for ButtonRelease) */
… …
2173#ifdef MOUSE_REPORT_DOUBLECLICK 2176#ifdef MOUSE_REPORT_DOUBLECLICK
2174 /* only report the release of 'slow' single clicks */ 2177 /* only report the release of 'slow' single clicks */
2175 if (MEvent.button != AnyButton 2178 if (MEvent.button != AnyButton
2176 && (ev.button != MEvent.button 2179 && (ev.button != MEvent.button
2177 || (ev.time - MEvent.time 2180 || (ev.time - MEvent.time
2178 > MULTICLICK_TIME / 2))) 2181 > multiClickTime / 2)))
2179 { 2182 {
2180 MEvent.clicks = 0; 2183 MEvent.clicks = 0;
2181 MEvent.button = AnyButton; 2184 MEvent.button = AnyButton;
2182 mouse_report (ev); 2185 mouse_report (ev);
2183 } 2186 }
… …
2573 scr_charset_choose (0); 2576 scr_charset_choose (0);
2574 break; 2577 break;
2575 2578
2576#ifdef EIGHT_BIT_CONTROLS 2579#ifdef EIGHT_BIT_CONTROLS
2577 // 8-bit controls 2580 // 8-bit controls
2578 case 0x90: /* DCS */ 2581 case 0x90: /* DCS */
2579 process_dcs_seq (); 2582 process_dcs_seq ();
2580 break; 2583 break;
2581 case 0x9b: /* CSI */ 2584 case 0x9b: /* CSI */
2582 process_csi_seq (); 2585 process_csi_seq ();
2583 break; 2586 break;
2584 case 0x9d: /* OSC */ 2587 case 0x9d: /* OSC */
2585 process_osc_seq (); 2588 process_osc_seq ();
2586 break; 2589 break;
2587#endif 2590#endif
2588 } 2591 }
2589} 2592}
… …
3094 scr_insert_mode (1); 3097 scr_insert_mode (1);
3095 else if (arg[0] == 20) 3098 else if (arg[0] == 20)
3096 priv_modes |= PrivMode_LFNL; 3099 priv_modes |= PrivMode_LFNL;
3097 break; 3100 break;
3098 3101
3099 case CSI_71: // DESCUSR: set cursor style 3102 case CSI_71: // DECSCUSR: set cursor style
3100 if (prev_ch == ' ') 3103 if (prev_ch == ' ')
3101 set_cursor_style (arg[0]); 3104 set_cursor_style (arg[0]);
3102 break; 3105 break;
3103 3106
3104 /* 3107 /*
… …
3682 { 5, PrivMode_rVideo }, // DECSCNM 3685 { 5, PrivMode_rVideo }, // DECSCNM
3683 { 6, PrivMode_relOrigin }, // DECOM 3686 { 6, PrivMode_relOrigin }, // DECOM
3684 { 7, PrivMode_Autowrap }, // DECAWM 3687 { 7, PrivMode_Autowrap }, // DECAWM
3685 // 8, auto-repeat keys // DECARM 3688 // 8, auto-repeat keys // DECARM
3686 { 9, PrivMode_MouseX10 }, 3689 { 9, PrivMode_MouseX10 },
3690 { 12, PrivMode_BlinkingCursor },
3687 // 18 end FF to printer after print screen 3691 // 18 end FF to printer after print screen
3688 // 19 Print screen prints full screen/scroll region 3692 // 19 Print screen prints full screen/scroll region
3689 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3693 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3690#ifdef scrollBar_esc 3694#ifdef scrollBar_esc
3691 { scrollBar_esc, PrivMode_scrollBar }, 3695 { scrollBar_esc, PrivMode_scrollBar },
… …
3800 scrollBar.map (state); 3804 scrollBar.map (state);
3801 resize_all_windows (0, 0, 0); 3805 resize_all_windows (0, 0, 0);
3802 scr_touch (true); 3806 scr_touch (true);
3803 break; 3807 break;
3804#endif 3808#endif
3809#ifdef CURSOR_BLINK
3810 case 12:
3811 cursor_blink_reset ();
3812 break;
3813#endif
3805 case 25: /* visible/invisible cursor */ 3814 case 25: /* visible/invisible cursor */
3806 scr_cursor_visible (state); 3815 scr_cursor_visible (state);
3807 break; 3816 break;
3808 /* case 35: - shift keys */ 3817 /* case 35: - shift keys */
3809 /* case 40: - 80 <--> 132 mode */ 3818 /* case 40: - 80 <--> 132 mode */
… …
3914 //case 19: // ninth alt font 3923 //case 19: // ninth alt font
3915 //case 20: // gothic 3924 //case 20: // gothic
3916 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3925 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3917 rendset = 0, rendstyle = RS_Bold; 3926 rendset = 0, rendstyle = RS_Bold;
3918 break; 3927 break;
3919 case 22: // normal intensity 3928 case 22: // bold off (vt220)
3920 rendset = 0, rendstyle = RS_Bold; 3929 rendset = 0, rendstyle = RS_Bold;
3921 break; 3930 break;
3922 case 23: // disable italic 3931 case 23: // disable italic
3923 rendset = 0, rendstyle = RS_Italic; 3932 rendset = 0, rendstyle = RS_Italic;
3924 break; 3933 break;
3925 case 24: 3934 case 24: // underline off (vt220)
3926 rendset = 0, rendstyle = RS_Uline; 3935 rendset = 0, rendstyle = RS_Uline;
3927 break; 3936 break;
3928 case 25: 3937 case 25: // blink off (vt220)
3929 rendset = 0, rendstyle = RS_Blink; 3938 rendset = 0, rendstyle = RS_Blink;
3930 break; 3939 break;
3931 case 26: // variable spacing (iso 8613) 3940 case 26: // variable spacing (iso 8613)
3932 rendset = 0, rendstyle = RS_Blink; 3941 rendset = 0, rendstyle = RS_Blink;
3933 break; 3942 break;
3934 case 27: 3943 case 27: // reverse off (vt220)
3935 rendset = 0, rendstyle = RS_RVid; 3944 rendset = 0, rendstyle = RS_RVid;
3936 break; 3945 break;
3937 //case 28: // visible. NYI 3946 //case 28: // visible. NYI
3938 //case 29: // not crossed-out 3947 //case 29: // not crossed-out
3939 } 3948 }
… …
4017} 4026}
4018 4027
4019void 4028void
4020rxvt_term::set_cursor_style (int style) 4029rxvt_term::set_cursor_style (int style)
4021{ 4030{
4022 if (!IN_RANGE_INC (style, 0, 4)) 4031 if (!IN_RANGE_INC (style, 0, 6))
4023 return; 4032 return;
4024 4033
4034 if (style == 0)
4035 style = 1;
4036
4037 cursor_type = (style - 1) / 2;
4025 set_option (Opt_cursorUnderline, style >= 3); 4038 set_option (Opt_cursorUnderline, cursor_type == 1);
4026 4039
4027#ifdef CURSOR_BLINK 4040#ifdef CURSOR_BLINK
4028 set_option (Opt_cursorBlink, !style || (style & 1)); 4041 set_option (Opt_cursorBlink, style & 1);
4029 cursor_blink_reset (); 4042 cursor_blink_reset ();
4030#endif 4043#endif
4031 4044
4032 want_refresh = 1; 4045 want_refresh = 1;
4033} 4046}

Diff Legend

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