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.219 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.231 by root, Wed Jan 4 00:13:22 2006 UTC

… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
53
54#if HAVE_SCHED_YIELD
55# include <sched.h>
56#endif
52 57
53#ifdef KEYSYM_RESOURCE 58#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 59# include "keyboard.h"
55#endif 60#endif
56 61
… …
155 } 160 }
156 161
157 x--; 162 x--;
158 } 163 }
159} 164}
160#endif
161 165
162void 166void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 167rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{ 168{
165#if ENABLE_OVERLAY
166 rxvt_fontset *fs = FONTSET (r); 169 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 170 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 171 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 172 int len;
170 173
… …
238 241
239# if ENABLE_COMBINING 242# if ENABLE_COMBINING
240 if (alloc) 243 if (alloc)
241 delete [] alloc; 244 delete [] alloc;
242# endif 245# endif
243#endif
244} 246}
247#endif
245 248
246void 249void
247rxvt_term::commit_iso14755 () 250rxvt_term::commit_iso14755 ()
248{ 251{
249 wchar_t ch[2]; 252 wchar_t ch[2];
… …
982 SET_LOCALE (locale); 985 SET_LOCALE (locale);
983 986
984 display->flush (); 987 display->flush ();
985 988
986 if (want_refresh && !flush_ev.active) 989 if (want_refresh && !flush_ev.active)
987 flush_ev.start (NOW + 0.01); 990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
988} 991}
989 992
990void 993void
991rxvt_term::flush_cb (time_watcher &w) 994rxvt_term::flush_cb (time_watcher &w)
992{ 995{
… …
1067 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1068 } 1071 }
1069} 1072}
1070#endif 1073#endif
1071 1074
1075#if HAVE_SCHED_YIELD
1076static struct event_handler
1077{
1078 check_watcher cw_yield;
1079
1080 void yield (check_watcher &w)
1081 {
1082 sched_yield ();
1083 w.stop ();
1084 }
1085
1086 event_handler ()
1087 : cw_yield (this, &event_handler::yield)
1088 {
1089 }
1090} event_handler;
1091#endif
1092
1072bool 1093bool
1073rxvt_term::pty_fill () 1094rxvt_term::pty_fill ()
1074{ 1095{
1075 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1076 1097
… …
1082 1103
1083 memmove (cmdbuf_base, cmdbuf_ptr, n); 1104 memmove (cmdbuf_base, cmdbuf_ptr, n);
1084 cmdbuf_ptr = cmdbuf_base; 1105 cmdbuf_ptr = cmdbuf_base;
1085 cmdbuf_endp = cmdbuf_ptr + n; 1106 cmdbuf_endp = cmdbuf_ptr + n;
1086 1107
1087 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1088 1109
1089 if (n > 0) 1110 if (r > 0)
1090 { 1111 {
1091 cmdbuf_endp += n; 1112 cmdbuf_endp += r;
1092 return true; 1113 return true;
1093 } 1114 }
1094 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 {
1117#if HAVE_SCHED_YIELD
1118 if (display->is_local)
1119 event_handler.cw_yield.start ();
1120#endif
1121 }
1122 else
1095 { 1123 {
1096 pty_ev.stop (); 1124 pty_ev.stop ();
1097 1125
1098 if (!OPTION (Opt_hold)) 1126 if (!OPTION (Opt_hold))
1099 destroy (); 1127 destroy ();
… …
1672{ 1700{
1673 if (!focus) 1701 if (!focus)
1674 { 1702 {
1675 focus = 1; 1703 focus = 1;
1676 want_refresh = 1; 1704 want_refresh = 1;
1705
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1707
1677#if USE_XIM 1708#if USE_XIM
1678 if (Input_Context != NULL) 1709 if (Input_Context != NULL)
1679 { 1710 {
1680 IMSetStatusPosition (); 1711 IMSetStatusPosition ();
1681 XSetICFocus (Input_Context); 1712 XSetICFocus (Input_Context);
… …
1701 if (focus) 1732 if (focus)
1702 { 1733 {
1703 focus = 0; 1734 focus = 0;
1704 want_refresh = 1; 1735 want_refresh = 1;
1705 1736
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738
1706#if ENABLE_FRILLS || ISO_14755 1739#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf)
1741 {
1707 iso14755buf = 0; 1742 iso14755buf = 0;
1708#endif
1709#if ENABLE_OVERLAY 1743# if ENABLE_OVERLAY
1710 scr_overlay_off (); 1744 scr_overlay_off ();
1745# endif
1746 }
1711#endif 1747#endif
1712#if USE_XIM 1748#if USE_XIM
1713 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1714 XUnsetICFocus (Input_Context); 1750 XUnsetICFocus (Input_Context);
1715#endif 1751#endif
… …
1759rxvt_term::button_press (XButtonEvent &ev) 1795rxvt_term::button_press (XButtonEvent &ev)
1760{ 1796{
1761 int reportmode = 0, clickintime; 1797 int reportmode = 0, clickintime;
1762 1798
1763 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1800
1764 if (!bypass_keystate) 1801 if (!bypass_keystate)
1765 reportmode = !! (priv_modes & PrivMode_mouse_report); 1802 reportmode = !! (priv_modes & PrivMode_mouse_report);
1766 1803
1767 /* 1804 /*
1768 * VT window processing of button press 1805 * VT window processing of button press
… …
1817 else 1854 else
1818 { 1855 {
1819 if (ev.button != MEvent.button) 1856 if (ev.button != MEvent.button)
1820 MEvent.clicks = 0; 1857 MEvent.clicks = 0;
1821 1858
1859 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1822 switch (ev.button) 1860 switch (ev.button)
1823 { 1861 {
1824 case Button1: 1862 case Button1:
1825 /* allow meta + click to select rectangular areas */ 1863 /* allow meta + click to select rectangular areas */
1826 /* should be done in screen.C */ 1864 /* should be done in screen.C */
1827#if ENABLE_FRILLS 1865#if ENABLE_FRILLS
1828 selection.rect = !!(ev.state & ModMetaMask); 1866 selection.rect = !!(ev.state & ModMetaMask);
1829#else 1867#else
1830 selection.rect = false; 1868 selection.rect = false;
1831#endif 1869#endif
1832 1870
1833 /* allow shift+left click to extend selection */ 1871 /* allow shift+left click to extend selection */
1834 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1872 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1835 { 1873 {
1836 if (MEvent.button == Button1 && clickintime) 1874 if (MEvent.button == Button1 && clickintime)
1837 selection_rotate (ev.x, ev.y); 1875 selection_rotate (ev.x, ev.y);
1838 else 1876 else
1839 selection_extend (ev.x, ev.y, 1); 1877 selection_extend (ev.x, ev.y, 1);
1840 } 1878 }
1841 else 1879 else
1842 { 1880 {
1843 if (MEvent.button == Button1 && clickintime) 1881 if (MEvent.button == Button1 && clickintime)
1844 MEvent.clicks++; 1882 MEvent.clicks++;
1845 else 1883 else
1846 MEvent.clicks = 1; 1884 MEvent.clicks = 1;
1847 1885
1848 selection_click (MEvent.clicks, ev.x, ev.y); 1886 selection_click (MEvent.clicks, ev.x, ev.y);
1849 } 1887 }
1850 1888
1851 MEvent.button = Button1; 1889 MEvent.button = Button1;
1852 break; 1890 break;
1853 1891
1854 case Button3: 1892 case Button3:
1855 if (MEvent.button == Button3 && clickintime) 1893 if (MEvent.button == Button3 && clickintime)
1856 selection_rotate (ev.x, ev.y); 1894 selection_rotate (ev.x, ev.y);
1857 else 1895 else
1858 selection_extend (ev.x, ev.y, 1); 1896 selection_extend (ev.x, ev.y, 1);
1859 1897
1860 MEvent.button = Button3; 1898 MEvent.button = Button3;
1861 break; 1899 break;
1862 } 1900 }
1863 } 1901 }
1864 1902
1865 MEvent.time = ev.time; 1903 MEvent.time = ev.time;
1866 return; 1904 return;
1867 } 1905 }
1868 1906
… …
2686 2724
2687 if (!OPTION (Opt_jumpScroll) 2725 if (!OPTION (Opt_jumpScroll)
2688 || (refresh_count >= refresh_limit * (nrow - 1))) 2726 || (refresh_count >= refresh_limit * (nrow - 1)))
2689 { 2727 {
2690 refreshnow = true; 2728 refreshnow = true;
2729 refresh_count = 0;
2691 ch = NOCHAR; 2730 ch = NOCHAR;
2692 break; 2731 break;
2693 } 2732 }
2694 2733
2695 // scr_add_lines only works for nlines <= nrow - 1. 2734 // scr_add_lines only works for nlines <= nrow - 1.
… …
2732 refresh_limit++; 2771 refresh_limit++;
2733 else 2772 else
2734 { 2773 {
2735 flag = true; 2774 flag = true;
2736 scr_refresh (refresh_type); 2775 scr_refresh (refresh_type);
2776 flush_ev.stop ();
2737 } 2777 }
2738 } 2778 }
2739 2779
2740 } 2780 }
2741 else 2781 else
… …
3921 } 3961 }
3922 break; 3962 break;
3923 3963
3924 case URxvt_view_up: 3964 case URxvt_view_up:
3925 case URxvt_view_down: 3965 case URxvt_view_down:
3966 {
3926 int lines = atoi (str); 3967 int lines = atoi (str);
3927 3968
3928 if (lines) 3969 if (lines)
3929 scr_page (op == URxvt_view_up ? UP : DN, lines); 3970 scr_page (op == URxvt_view_up ? UP : DN, lines);
3930 else 3971 else
3931 {
3932 scr_erase_savelines (); 3972 scr_erase_savelines ();
3933 } 3973 }
3934 3974
3975 break;
3976#endif
3977
3978#if ENABLE_PERL
3979 case URxvt_perl:
3980 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3981 ; // no responses yet
3935 break; 3982 break;
3936#endif 3983#endif
3937 } 3984 }
3938} 3985}
3939/*----------------------------------------------------------------------*/ 3986/*----------------------------------------------------------------------*/
… …
4048 } 4095 }
4049 4096
4050 /* extra handling for values with state unkept */ 4097 /* extra handling for values with state unkept */
4051 switch (arg[i]) 4098 switch (arg[i])
4052 { 4099 {
4100#if ENABLE_STYLES
4101 case 1021:
4102 if (mode)
4103 SET_OPTION (Opt_intensityStyles);
4104 else
4105 CLR_OPTION (Opt_intensityStyles);
4106
4107 scr_touch (true);
4108 break;
4109#endif
4053 case 1048: /* alternative cursor save */ 4110 case 1048: /* alternative cursor save */
4054 case 1049: 4111 case 1049:
4055 if (OPTION (Opt_secondaryScreen)) 4112 if (OPTION (Opt_secondaryScreen))
4056 if (mode == 0) 4113 if (mode == 0)
4057 scr_cursor (RESTORE); 4114 scr_cursor (RESTORE);
… …
4140 if (state) 4197 if (state)
4141 SET_OPTION (Opt_scrollTtyKeypress); 4198 SET_OPTION (Opt_scrollTtyKeypress);
4142 else 4199 else
4143 CLR_OPTION (Opt_scrollTtyKeypress); 4200 CLR_OPTION (Opt_scrollTtyKeypress);
4144 break; 4201 break;
4145#if ENABLE_STYLES
4146 case 1021:
4147 if (state)
4148 SET_OPTION (Opt_intensityStyles);
4149 else
4150 CLR_OPTION (Opt_intensityStyles);
4151#endif
4152 case 1047: /* secondary screen w/ clearing last */ 4202 case 1047: /* secondary screen w/ clearing last */
4153 if (OPTION (Opt_secondaryScreen)) 4203 if (OPTION (Opt_secondaryScreen))
4154 if (current_screen != PRIMARY) 4204 if (current_screen != PRIMARY)
4155 scr_erase_screen (2); 4205 scr_erase_screen (2);
4156 scr_change_screen (state); 4206 scr_change_screen (state);
… …
4315 case 106: 4365 case 106:
4316 case 107: 4366 case 107:
4317 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4367 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4318 break; 4368 break;
4319#endif 4369#endif
4320
4321 } 4370 }
4322 } 4371 }
4323} 4372}
4324/*}}} */ 4373/*}}} */
4325 4374

Diff Legend

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