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.215 by root, Fri Dec 23 14:46:34 2005 UTC vs.
Revision 1.238 by root, Fri Jan 6 02:58:02 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#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
52 58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
… …
147 153
148 text_t t = l.t[x]; 154 text_t t = l.t[x];
149 155
150 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
151 { 157 {
152 iso14755_51 (l.t[x], l.r[x]); 158 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
154 break; 160 break;
155 } 161 }
156 162
157 x--; 163 x--;
158 } 164 }
159} 165}
160#endif
161 166
162#if ENABLE_OVERLAY
163void 167void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 169{
166 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 172 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 173 int len;
170 174
171 fname = rxvt_utf8towcs (f->name); 175 fname = rxvt_utf8towcs (f->name);
172 176
173#if ENABLE_COMBINING 177# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
175 { 179 {
176 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
179 } 183 }
180 else 184 else
181#endif 185# endif
182 { 186 {
183 ch2 = ch; 187 ch2 = ch;
184 188
185 alloc = 0; 189 alloc = 0;
186 chr = &ch2; 190 chr = &ch2;
187 len = 1; 191 len = 1;
188 } 192 }
189 193
194 char attr[80]; // plenty
195
196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
190 int width = wcswidth (fname, wcslen (fname)); 206 int width = wcswidth (fname, wcslen (fname));
191 207
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
193 218
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 220
196 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
197 { 222 {
… …
200 ch = *chr++; 225 ch = *chr++;
201 226
202 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
205#if !UNICODE3 230# if !UNICODE3
206 if (ch >= 0x10000) 231 if (ch >= 0x10000)
207 ch = 0xfffd; 232 ch = 0xfffd;
208#endif 233# endif
209 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
210 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
211 } 236 }
212 237
238 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 239 scr_overlay_set (0, len + 1, fname);
214 240
215 free (fname); 241 free (fname);
216 242
217#if ENABLE_COMBINING 243# if ENABLE_COMBINING
218 if (alloc) 244 if (alloc)
219 delete [] alloc; 245 delete [] alloc;
220#endif 246# endif
221} 247}
222#endif 248#endif
223 249
224void 250void
225rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
242 mb[0] = ch[0]; 268 mb[0] = ch[0];
243 len = 1; 269 len = 1;
244 } 270 }
245 271
246 if (len > 0) 272 if (len > 0)
247 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
248 else 274 else
249 scr_bell (); 275 scr_bell ();
250 } 276 }
251 277
252 iso14755buf = 0; 278 iso14755buf = 0;
… …
280 KeySym keysym; 306 KeySym keysym;
281#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
282 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
283#endif 309#endif
284 int valid_keysym; 310 int valid_keysym;
285 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
286 312
287 /* 313 /*
288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
289 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
290 * 316 *
… …
308 Status status_return; 334 Status status_return;
309 335
310#if 0 336#if 0
311#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
312 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
313 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
314 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
315 else 341 else
316#endif 342#endif
317#endif 343#endif
318 { 344 {
… …
355 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
356 } 382 }
357 else 383 else
358#endif 384#endif
359 { 385 {
360 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
361 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
362 } 388 }
363 389
364 if (valid_keysym) 390 if (valid_keysym)
365 { 391 {
… …
829 { 855 {
830#ifdef META8_OPTION 856#ifdef META8_OPTION
831 /* set 8-bit on */ 857 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
833 { 859 {
834 unsigned char *ch; 860 char *ch;
835 861
836 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 863 *ch |= 0x80;
838 864
839 meta = 0; 865 meta = 0;
… …
844 } 870 }
845 871
846 if (len <= 0) 872 if (len <= 0)
847 return; /* not mapped */ 873 return; /* not mapped */
848 874
849 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
850 if (view_start) 876 if (view_start)
851 { 877 {
852 view_start = 0; 878 view_start = 0;
853 want_refresh = 1; 879 want_refresh = 1;
854 } 880 }
… …
872#ifdef META8_OPTION 898#ifdef META8_OPTION
873 && meta_char == C0_ESC 899 && meta_char == C0_ESC
874#endif 900#endif
875 ) 901 )
876 { 902 {
877 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
878 tt_write (&ch, 1); 904 tt_write (&ch, 1);
879 } 905 }
880 906
881#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
882 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
894 920
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */ 923/* attempt to `write' count to the input buffer */
898unsigned int 924unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 925rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 926{
901 unsigned int n, s; 927 unsigned int n, s;
902 928
903 n = cmdbuf_ptr - cmdbuf_base; 929 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 930 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
941 } 967 }
942#endif 968#endif
943 969
944 if (want_refresh) 970 if (want_refresh)
945 { 971 {
972 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973 {
974 int row = -view_start;
975
976 while (row > -nsaved && ROW (row - 1).is_longer ())
977 --row;
978
979 while (row < -view_start + nrow)
980 {
981 int start_row = row;
982 line_t *l;
983
984 do
985 {
986 l = &ROW (row);
987
988 if (!(l->f & LINE_FILTERED))
989 {
990 // line not filtered, mark it as filtered
991 l->f |= LINE_FILTERED;
992 while (l->is_longer ())
993 {
994 l = &ROW (++row);
995 l->f |= LINE_FILTERED;
996 }
997
998 // and filter it
999 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1000
1001 break;
1002 }
1003 }
1004 while (l->is_longer ());
1005
1006 row++;
1007 }
1008
1009 }
1010
946 scr_refresh (refresh_type); 1011 scr_refresh (refresh_type);
947 scrollbar_show (1); 1012 scrollbar_show (1);
948#ifdef USE_XIM 1013#ifdef USE_XIM
949 IMSendSpot (); 1014 IMSendSpot ();
950#endif 1015#endif
… …
960 SET_LOCALE (locale); 1025 SET_LOCALE (locale);
961 1026
962 display->flush (); 1027 display->flush ();
963 1028
964 if (want_refresh && !flush_ev.active) 1029 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01); 1030 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
966} 1031}
967 1032
968void 1033void
969rxvt_term::flush_cb (time_watcher &w) 1034rxvt_term::flush_cb (time_watcher &w)
970{ 1035{
… …
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1110 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1111 }
1047} 1112}
1048#endif 1113#endif
1049 1114
1115#if HAVE_SCHED_YIELD
1116static struct event_handler
1117{
1118 check_watcher cw_yield;
1119
1120 void yield (check_watcher &w)
1121 {
1122 sched_yield ();
1123 w.stop ();
1124 }
1125
1126 event_handler ()
1127 : cw_yield (this, &event_handler::yield)
1128 {
1129 }
1130} event_handler;
1131#endif
1132
1050bool 1133bool
1051rxvt_term::pty_fill () 1134rxvt_term::pty_fill ()
1052{ 1135{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1136 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1137
1055 if (CBUFSIZ == n) 1138 if (CBUFSIZ == n)
1056 { 1139 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1140 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1141 n = 0;
1059 } 1142 }
1060 1143
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1144 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1145 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1146 cmdbuf_endp = cmdbuf_ptr + n;
1064 1147
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1148 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1066 1149
1067 if (n > 0) 1150 if (r > 0)
1068 { 1151 {
1069 cmdbuf_endp += n; 1152 cmdbuf_endp += r;
1070 return true; 1153 return true;
1071 } 1154 }
1072 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1155 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1156 {
1157#if HAVE_SCHED_YIELD
1158 if (display->is_local)
1159 event_handler.cw_yield.start ();
1160#endif
1161 }
1162 else
1073 { 1163 {
1074 pty_ev.stop (); 1164 pty_ev.stop ();
1075 1165
1076 if (!(options & Opt_hold)) 1166 if (!OPTION (Opt_hold))
1077 destroy (); 1167 destroy ();
1078 } 1168 }
1079 1169
1080 return false; 1170 return false;
1081} 1171}
… …
1103 recolour_cursor (); 1193 recolour_cursor ();
1104 1194
1105#ifdef POINTER_BLANK 1195#ifdef POINTER_BLANK
1106 hidden_pointer = 0; 1196 hidden_pointer = 0;
1107 1197
1108 if (options & Opt_pointerBlank) 1198 if (OPTION (Opt_pointerBlank))
1109 pointer_ev.start (NOW + pointerBlankDelay); 1199 pointer_ev.start (NOW + pointerBlankDelay);
1110#endif 1200#endif
1111} 1201}
1112 1202
1113#ifdef POINTER_BLANK 1203#ifdef POINTER_BLANK
1114void 1204void
1115rxvt_term::pointer_blank () 1205rxvt_term::pointer_blank ()
1116{ 1206{
1117 if (! (options & Opt_pointerBlank)) 1207 if (! OPTION (Opt_pointerBlank))
1118 return; 1208 return;
1119 1209
1120 XDefineCursor (display->display, vt, display->blank_cursor); 1210 XDefineCursor (display->display, vt, display->blank_cursor);
1121 XFlush (display->display); 1211 XFlush (display->display);
1122 1212
… …
1220 1310
1221 SET_R (this); 1311 SET_R (this);
1222 SET_LOCALE (locale); 1312 SET_LOCALE (locale);
1223 1313
1224#if defined(CURSOR_BLINK) 1314#if defined(CURSOR_BLINK)
1225 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1315 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1226 { 1316 {
1227 if (hidden_cursor) 1317 if (hidden_cursor)
1228 { 1318 {
1229 hidden_cursor = 0; 1319 hidden_cursor = 0;
1230 want_refresh = 1; 1320 want_refresh = 1;
… …
1233 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1323 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1234 } 1324 }
1235#endif 1325#endif
1236 1326
1237#if defined(POINTER_BLANK) 1327#if defined(POINTER_BLANK)
1238 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1328 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1239 { 1329 {
1240 if (ev.type == MotionNotify 1330 if (ev.type == MotionNotify
1241 || ev.type == ButtonPress 1331 || ev.type == ButtonPress
1242 || ev.type == ButtonRelease) 1332 || ev.type == ButtonRelease)
1243 if (hidden_pointer) 1333 if (hidden_pointer)
… …
1439 seen_resize = 1; 1529 seen_resize = 1;
1440 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1530 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1441 } 1531 }
1442 1532
1443#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1533#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1444 if (options & Opt_transparent) 1534 if (OPTION (Opt_transparent))
1445 check_our_parents (); 1535 check_our_parents ();
1446#endif 1536#endif
1447 } 1537 }
1448 break; 1538 break;
1449 1539
… …
1650{ 1740{
1651 if (!focus) 1741 if (!focus)
1652 { 1742 {
1653 focus = 1; 1743 focus = 1;
1654 want_refresh = 1; 1744 want_refresh = 1;
1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747
1655#if USE_XIM 1748#if USE_XIM
1656 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1657 { 1750 {
1658 IMSetStatusPosition (); 1751 IMSetStatusPosition ();
1659 XSetICFocus (Input_Context); 1752 XSetICFocus (Input_Context);
1660 } 1753 }
1661#endif 1754#endif
1662#if CURSOR_BLINK 1755#if CURSOR_BLINK
1663 if (options & Opt_cursorBlink) 1756 if (OPTION (Opt_cursorBlink))
1664 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1665#endif 1758#endif
1666#if OFF_FOCUS_FADING 1759#if OFF_FOCUS_FADING
1667 if (rs[Rs_fade]) 1760 if (rs[Rs_fade])
1668 { 1761 {
… …
1679 if (focus) 1772 if (focus)
1680 { 1773 {
1681 focus = 0; 1774 focus = 0;
1682 want_refresh = 1; 1775 want_refresh = 1;
1683 1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778
1684#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf)
1781 {
1685 iso14755buf = 0; 1782 iso14755buf = 0;
1686#endif
1687#if ENABLE_OVERLAY 1783# if ENABLE_OVERLAY
1688 scr_overlay_off (); 1784 scr_overlay_off ();
1785# endif
1786 }
1689#endif 1787#endif
1690#if USE_XIM 1788#if USE_XIM
1691 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1692 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1693#endif 1791#endif
1694#if CURSOR_BLINK 1792#if CURSOR_BLINK
1695 if (options & Opt_cursorBlink) 1793 if (OPTION (Opt_cursorBlink))
1696 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1697 hidden_cursor = 0; 1795 hidden_cursor = 0;
1698#endif 1796#endif
1699#if OFF_FOCUS_FADING 1797#if OFF_FOCUS_FADING
1700 if (rs[Rs_fade]) 1798 if (rs[Rs_fade])
… …
1724 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1822 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1725 return; 1823 return;
1726 1824
1727 /* FALLTHROUGH */ 1825 /* FALLTHROUGH */
1728 case ReparentNotify: 1826 case ReparentNotify:
1729 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1827 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1730 want_refresh = want_full_refresh = 1; 1828 want_refresh = want_full_refresh = 1;
1731 break; 1829 break;
1732 } 1830 }
1733} 1831}
1734#endif 1832#endif
… …
1737rxvt_term::button_press (XButtonEvent &ev) 1835rxvt_term::button_press (XButtonEvent &ev)
1738{ 1836{
1739 int reportmode = 0, clickintime; 1837 int reportmode = 0, clickintime;
1740 1838
1741 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1839 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1840
1742 if (!bypass_keystate) 1841 if (!bypass_keystate)
1743 reportmode = !! (priv_modes & PrivMode_mouse_report); 1842 reportmode = !! (priv_modes & PrivMode_mouse_report);
1744 1843
1745 /* 1844 /*
1746 * VT window processing of button press 1845 * VT window processing of button press
… …
1795 else 1894 else
1796 { 1895 {
1797 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1798 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1799 1898
1899 if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1800 switch (ev.button) 1900 switch (ev.button)
1801 { 1901 {
1802 case Button1: 1902 case Button1:
1803 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1804 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1805#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1806 selection.rect = !!(ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1807#else 1907#else
1808 selection.rect = false; 1908 selection.rect = false;
1809#endif 1909#endif
1810 1910
1811 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1812 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1813 { 1913 {
1814 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1815 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1816 else 1916 else
1817 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1818 } 1918 }
1819 else 1919 else
1820 { 1920 {
1821 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1822 MEvent.clicks++; 1922 MEvent.clicks++;
1823 else 1923 else
1824 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1825 1925
1826 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1827 } 1927 }
1828 1928
1829 MEvent.button = Button1; 1929 MEvent.button = Button1;
1830 break; 1930 break;
1831 1931
1832 case Button3: 1932 case Button3:
1833 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1834 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1835 else 1935 else
1836 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1837 1937
1838 MEvent.button = Button3; 1938 MEvent.button = Button3;
1839 break; 1939 break;
1840 } 1940 }
1841 } 1941 }
1842 1942
1843 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1844 return; 1944 return;
1845 } 1945 }
1846 1946
… …
2076 2176
2077 v = ev.button == Button4 ? UP : DN; 2177 v = ev.button == Button4 ? UP : DN;
2078 2178
2079 if (ev.state & ShiftMask) 2179 if (ev.state & ShiftMask)
2080 i = 1; 2180 i = 1;
2081 else if (options & Opt_mouseWheelScrollPage) 2181 else if (OPTION (Opt_mouseWheelScrollPage))
2082 i = nrow - 1; 2182 i = nrow - 1;
2083 else 2183 else
2084 i = 5; 2184 i = 5;
2085 2185
2086# ifdef MOUSE_SLIP_WHEELING 2186# ifdef MOUSE_SLIP_WHEELING
… …
2372 XWindowAttributes wattr, wrootattr; 2472 XWindowAttributes wattr, wrootattr;
2373 dDisp; 2473 dDisp;
2374 2474
2375 pchanged = 0; 2475 pchanged = 0;
2376 2476
2377 if (!(options & Opt_transparent)) 2477 if (!OPTION (Opt_transparent))
2378 return pchanged; /* Don't try any more */ 2478 return pchanged; /* Don't try any more */
2379 2479
2380 XGetWindowAttributes (disp, display->root, &wrootattr); 2480 XGetWindowAttributes (disp, display->root, &wrootattr);
2381 rootdepth = wrootattr.depth; 2481 rootdepth = wrootattr.depth;
2382 2482
… …
2610bool 2710bool
2611rxvt_term::cmd_parse () 2711rxvt_term::cmd_parse ()
2612{ 2712{
2613 bool flag = false; 2713 bool flag = false;
2614 unicode_t ch = NOCHAR; 2714 unicode_t ch = NOCHAR;
2615 unsigned char *seq_begin; // remember start of esc-sequence here 2715 char *seq_begin; // remember start of esc-sequence here
2616 2716
2617 for (;;) 2717 for (;;)
2618 { 2718 {
2619 if (ch == NOCHAR) 2719 if (ch == NOCHAR)
2620 { 2720 {
2621 seq_begin = cmdbuf_ptr; 2721 seq_begin = cmdbuf_ptr;
2622 ch = next_char (); 2722 ch = next_char ();
2623 }
2624 2723
2625 if (ch == NOCHAR) // TODO: improve 2724 if (ch == NOCHAR)
2626 break; 2725 break;
2726 }
2627 2727
2628 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2728 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2629 { 2729 {
2630 if (!seen_input) 2730 if (!seen_input)
2631 { 2731 {
… …
2660 if (ch == C0_LF) 2760 if (ch == C0_LF)
2661 nlines++; 2761 nlines++;
2662 2762
2663 refresh_count++; 2763 refresh_count++;
2664 2764
2665 if (!(options & Opt_jumpScroll) 2765 if (!OPTION (Opt_jumpScroll)
2666 || (refresh_count >= refresh_limit * (nrow - 1))) 2766 || (refresh_count >= refresh_limit * (nrow - 1)))
2667 { 2767 {
2668 refreshnow = true; 2768 refreshnow = true;
2769 refresh_count = 0;
2669 ch = NOCHAR; 2770 ch = NOCHAR;
2670 break; 2771 break;
2671 } 2772 }
2672 2773
2673 // scr_add_lines only works for nlines <= nrow - 1. 2774 // scr_add_lines only works for nlines <= nrow - 1.
2674 if (nlines >= nrow - 1) 2775 if (nlines >= nrow - 1)
2675 { 2776 {
2777 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2676 scr_add_lines (buf, nlines, str - buf); 2778 scr_add_lines (buf, nlines, str - buf);
2779
2677 nlines = 0; 2780 nlines = 0;
2678 str = buf; 2781 str = buf;
2679 eol = str + min (ncol, UBUFSIZ); 2782 eol = str + min (ncol, UBUFSIZ);
2680 } 2783 }
2681 2784
… …
2694 2797
2695 seq_begin = cmdbuf_ptr; 2798 seq_begin = cmdbuf_ptr;
2696 ch = next_char (); 2799 ch = next_char ();
2697 } 2800 }
2698 2801
2802 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2699 scr_add_lines (buf, nlines, str - buf); 2803 scr_add_lines (buf, nlines, str - buf);
2700 2804
2701 /* 2805 /*
2702 * If there have been a lot of new lines, then update the screen 2806 * If there have been a lot of new lines, then update the screen
2703 * What the heck I'll cheat and only refresh less than every page-full. 2807 * What the heck I'll cheat and only refresh less than every page-full.
2704 * the number of pages between refreshes is refresh_limit, which 2808 * the number of pages between refreshes is refresh_limit, which
2705 * is incremented here because we must be doing flat-out scrolling. 2809 * is incremented here because we must be doing flat-out scrolling.
2706 */ 2810 */
2707 if (refreshnow) 2811 if (refreshnow)
2708 { 2812 {
2709 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2813 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2710 refresh_limit++; 2814 refresh_limit++;
2711 else 2815 else
2712 { 2816 {
2713 flag = true; 2817 flag = true;
2714 scr_refresh (refresh_type); 2818 scr_refresh (refresh_type);
2819 flush_ev.stop ();
2715 } 2820 }
2716 } 2821 }
2717 2822
2718 } 2823 }
2719 else 2824 else
… …
2750rxvt_term::next_char () 2855rxvt_term::next_char ()
2751{ 2856{
2752 while (cmdbuf_ptr < cmdbuf_endp) 2857 while (cmdbuf_ptr < cmdbuf_endp)
2753 { 2858 {
2754 // assume 7-bit to be ascii ALWAYS 2859 // assume 7-bit to be ascii ALWAYS
2755 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2860 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2756 return *cmdbuf_ptr++; 2861 return *cmdbuf_ptr++;
2757 2862
2758 wchar_t wc; 2863 wchar_t wc;
2759 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2864 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2760 2865
2761 if (len == (size_t)-2) 2866 if (len == (size_t)-2)
2762 { 2867 {
2763 // the mbstate stores incomplete sequences. didn't know this :/ 2868 // the mbstate stores incomplete sequences. didn't know this :/
2764 cmdbuf_ptr = cmdbuf_endp; 2869 cmdbuf_ptr = cmdbuf_endp;
… …
2903 case C0_ESC: 3008 case C0_ESC:
2904 process_escape_seq (); 3009 process_escape_seq ();
2905 break; 3010 break;
2906 case C0_ENQ: /* terminal Status */ 3011 case C0_ENQ: /* terminal Status */
2907 if (rs[Rs_answerbackstring]) 3012 if (rs[Rs_answerbackstring])
2908 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3013 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2909 (unsigned int)strlen (rs[Rs_answerbackstring]));
2910 else 3014 else
2911 tt_write ((unsigned char *)VT100_ANS, 3015 tt_write (VT100_ANS, strlen (VT100_ANS));
2912 (unsigned int)strlen (VT100_ANS));
2913 break; 3016 break;
2914 case C0_BEL: /* bell */ 3017 case C0_BEL: /* bell */
2915 scr_bell (); 3018 scr_bell ();
2916 break; 3019 break;
2917 case C0_BS: /* backspace */ 3020 case C0_BS: /* backspace */
… …
3105 process_dcs_seq (); 3208 process_dcs_seq ();
3106 break; 3209 break;
3107 3210
3108 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3211 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3109 case C1_SCI: /* ESC Z */ 3212 case C1_SCI: /* ESC Z */
3110 tt_write ((const unsigned char *)ESCZ_ANSWER, 3213 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3111 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3112 break; /* steal obsolete ESC [ c */ 3214 break; /* steal obsolete ESC [ c */
3113 3215
3114 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3216 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3115 case C1_CSI: /* ESC [ */ 3217 case C1_CSI: /* ESC [ */
3116 process_csi_seq (); 3218 process_csi_seq ();
… …
3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3462 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3463 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3362 break; 3464 break;
3363 3465
3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3466 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3365 tt_write ((const unsigned char *)VT100_ANS, 3467 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3366 (unsigned int) (sizeof (VT100_ANS) - 1));
3367 break; 3468 break;
3368 3469
3369 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3470 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3370 process_sgr_mode (nargs, arg); 3471 process_sgr_mode (nargs, arg);
3371 break; 3472 break;
… …
3378 break; 3479 break;
3379 case 6: /* CPR requested */ 3480 case 6: /* CPR requested */
3380 scr_report_position (); 3481 scr_report_position ();
3381 break; 3482 break;
3382 case 7: /* unofficial extension */ 3483 case 7: /* unofficial extension */
3383 if (options & Opt_insecure) 3484 if (OPTION (Opt_insecure))
3384 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3485 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3385 break; 3486 break;
3386 case 8: /* unofficial extension */ 3487 case 8: /* unofficial extension */
3387 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3488 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3388 break; 3489 break;
… …
3552 break; 3653 break;
3553 case 20: /* report icon label */ 3654 case 20: /* report icon label */
3554 { 3655 {
3555 char *s; 3656 char *s;
3556 XGetIconName (disp, parent[0], &s); 3657 XGetIconName (disp, parent[0], &s);
3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3658 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3558 XFree (s); 3659 XFree (s);
3559 } 3660 }
3560 break; 3661 break;
3561 case 21: /* report window title */ 3662 case 21: /* report window title */
3562 { 3663 {
3563 char *s; 3664 char *s;
3564 XFetchName (disp, parent[0], &s); 3665 XFetchName (disp, parent[0], &s);
3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3666 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3566 XFree (s); 3667 XFree (s);
3567 } 3668 }
3568 break; 3669 break;
3569 } 3670 }
3570} 3671}
… …
3573/*----------------------------------------------------------------------*/ 3674/*----------------------------------------------------------------------*/
3574/* 3675/*
3575 * get input up until STRING TERMINATOR (or BEL) 3676 * get input up until STRING TERMINATOR (or BEL)
3576 * ends_how is terminator used. returned input must be free()'d 3677 * ends_how is terminator used. returned input must be free()'d
3577 */ 3678 */
3578unsigned char * 3679char *
3579rxvt_term::get_to_st (unicode_t &ends_how) 3680rxvt_term::get_to_st (unicode_t &ends_how)
3580{ 3681{
3581 unicode_t ch; 3682 unicode_t ch;
3582 bool seen_esc = false; 3683 bool seen_esc = false;
3583 unsigned int n = 0; 3684 unsigned int n = 0;
… …
3616 3717
3617 string[n++] = '\0'; 3718 string[n++] = '\0';
3618 3719
3619 ends_how = (ch == 0x5c ? C0_ESC : ch); 3720 ends_how = (ch == 0x5c ? C0_ESC : ch);
3620 3721
3621 return (unsigned char *)rxvt_wcstombs (string); 3722 return rxvt_wcstombs (string);
3622} 3723}
3623 3724
3624/*----------------------------------------------------------------------*/ 3725/*----------------------------------------------------------------------*/
3625/* 3726/*
3626 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3727 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3627 */ 3728 */
3628void 3729void
3629rxvt_term::process_dcs_seq () 3730rxvt_term::process_dcs_seq ()
3630{ 3731{
3631 unsigned char *s; 3732 char *s;
3632 unicode_t eh; 3733 unicode_t eh;
3633 3734
3634 /* 3735 /*
3635 * Not handled yet 3736 * Not handled yet
3636 */ 3737 */
… …
3655 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3756 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3656 arg = arg * 10 + (ch - '0'); 3757 arg = arg * 10 + (ch - '0');
3657 3758
3658 if (ch == ';') 3759 if (ch == ';')
3659 { 3760 {
3660 unsigned char *s = get_to_st (eh); 3761 char *s = get_to_st (eh);
3661 3762
3662 if (s) 3763 if (s)
3663 { 3764 {
3664 process_xterm_seq (arg, (char *)s, eh); 3765 process_xterm_seq (arg, s, eh);
3665 free (s); 3766 free (s);
3666 } 3767 }
3667 } 3768 }
3668} 3769}
3669 3770
3670void 3771void
3671rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3772rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3672{ 3773{
3673 if (str[0] == '?' && !str[1]) 3774 if (str[0] == '?' && !str[1])
3674 { 3775 {
3675 unsigned short r, g, b; 3776 unsigned short r, g, b;
3676 pix_colors_focused[color].get (display, r, g, b); 3777 pix_colors_focused[color].get (display, r, g, b);
… …
3682 3783
3683/* 3784/*
3684 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3785 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3685 */ 3786 */
3686void 3787void
3687rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3788rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3688{ 3789{
3689 int changed = 0; 3790 int changed = 0;
3690 int color; 3791 int color;
3691 char *buf, *name; 3792 char *buf, *name;
3692 bool query = str[0] == '?' && !str[1]; 3793 bool query = str[0] == '?' && !str[1];
… …
3846 // TODO, when secure mode? 3947 // TODO, when secure mode?
3847 break; 3948 break;
3848 3949
3849#ifdef MENUBAR 3950#ifdef MENUBAR
3850 case URxvt_Menu: 3951 case URxvt_Menu:
3851 if (options & Opt_insecure) 3952 if (OPTION (Opt_insecure))
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3953 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break; 3954 break;
3854#endif 3955#endif
3855#if 0 3956#if 0
3856 case XTerm_dumpscreen: /* no error notices */ 3957 case XTerm_dumpscreen: /* no error notices */
… …
3872 case URxvt_italicFont: 3973 case URxvt_italicFont:
3873 case URxvt_boldItalicFont: 3974 case URxvt_boldItalicFont:
3874#endif 3975#endif
3875 if (query) 3976 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", saveop, 3977 tt_printf ("\33]%d;%-.250s%c", saveop,
3877 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3978 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3878 ? fontset[op - URxvt_font]->fontdesc : "", 3979 ? fontset[op - URxvt_font]->fontdesc : "",
3879 resp); 3980 resp);
3880 else 3981 else
3881 { 3982 {
3882 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3983 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3888 break; 3989 break;
3889 3990
3890#if ENABLE_FRILLS 3991#if ENABLE_FRILLS
3891 case URxvt_locale: 3992 case URxvt_locale:
3892 if (query) 3993 if (query)
3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3994 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3894 else 3995 else
3895 { 3996 {
3896 set_locale (str); 3997 set_locale (str);
3897 pty.set_utf8_mode (enc_utf8); 3998 pty.set_utf8_mode (enc_utf8);
3898 init_xlocale (); 3999 init_xlocale ();
3899 } 4000 }
3900 break; 4001 break;
3901 4002
3902 case URxvt_view_up: 4003 case URxvt_view_up:
3903 case URxvt_view_down: 4004 case URxvt_view_down:
4005 {
3904 int lines = atoi (str); 4006 int lines = atoi (str);
3905 4007
3906 if (lines) 4008 if (lines)
3907 scr_page (op == URxvt_view_up ? UP : DN, lines); 4009 scr_page (op == URxvt_view_up ? UP : DN, lines);
3908 else 4010 else
3909 {
3910 scr_erase_savelines (); 4011 scr_erase_savelines ();
3911 } 4012 }
3912 4013
4014 break;
4015#endif
4016
4017#if ENABLE_PERL
4018 case URxvt_perl:
4019 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
4020 ; // no responses yet
3913 break; 4021 break;
3914#endif 4022#endif
3915 } 4023 }
3916} 4024}
3917/*----------------------------------------------------------------------*/ 4025/*----------------------------------------------------------------------*/
… …
4026 } 4134 }
4027 4135
4028 /* extra handling for values with state unkept */ 4136 /* extra handling for values with state unkept */
4029 switch (arg[i]) 4137 switch (arg[i])
4030 { 4138 {
4139#if ENABLE_STYLES
4140 case 1021:
4141 if (mode)
4142 SET_OPTION (Opt_intensityStyles);
4143 else
4144 CLR_OPTION (Opt_intensityStyles);
4145
4146 scr_touch (true);
4147 break;
4148#endif
4031 case 1048: /* alternative cursor save */ 4149 case 1048: /* alternative cursor save */
4032 case 1049: 4150 case 1049:
4033 if (options & Opt_secondaryScreen) 4151 if (OPTION (Opt_secondaryScreen))
4034 if (mode == 0) 4152 if (mode == 0)
4035 scr_cursor (RESTORE); 4153 scr_cursor (RESTORE);
4036 else if (mode == 1) 4154 else if (mode == 1)
4037 scr_cursor (SAVE); 4155 scr_cursor (SAVE);
4038 break; 4156 break;
… …
4053 case 3: /* 80/132 */ 4171 case 3: /* 80/132 */
4054 if (priv_modes & PrivMode_132OK) 4172 if (priv_modes & PrivMode_132OK)
4055 set_widthheight (((state ? 132 : 80) * fwidth), height); 4173 set_widthheight (((state ? 132 : 80) * fwidth), height);
4056 break; 4174 break;
4057 case 4: /* smooth scrolling */ 4175 case 4: /* smooth scrolling */
4058 if (state) 4176 if (!state)
4059 options &= ~Opt_jumpScroll; 4177 SET_OPTION (Opt_jumpScroll);
4060 else 4178 else
4061 options |= Opt_jumpScroll; 4179 CLR_OPTION (Opt_jumpScroll);
4062 break; 4180 break;
4063 case 5: /* reverse video */ 4181 case 5: /* reverse video */
4064 scr_rvideo_mode (state); 4182 scr_rvideo_mode (state);
4065 break; 4183 break;
4066 case 6: /* relative/absolute origins */ 4184 case 6: /* relative/absolute origins */
… …
4107#if 0 4225#if 0
4108 case 1001: 4226 case 1001:
4109 break; /* X11 mouse highlighting */ 4227 break; /* X11 mouse highlighting */
4110#endif 4228#endif
4111 case 1010: /* scroll to bottom on TTY output inhibit */ 4229 case 1010: /* scroll to bottom on TTY output inhibit */
4112 if (state) 4230 if (!state)
4113 options &= ~Opt_scrollTtyOutput; 4231 SET_OPTION (Opt_scrollTtyOutput);
4114 else 4232 else
4115 options |= Opt_scrollTtyOutput; 4233 CLR_OPTION (Opt_scrollTtyOutput);
4116 break; 4234 break;
4117 case 1011: /* scroll to bottom on key press */ 4235 case 1011: /* scroll to bottom on key press */
4118 if (state) 4236 if (state)
4119 options |= Opt_scrollTtyKeypress; 4237 SET_OPTION (Opt_scrollTtyKeypress);
4120 else 4238 else
4121 options &= ~Opt_scrollTtyKeypress; 4239 CLR_OPTION (Opt_scrollTtyKeypress);
4122 break; 4240 break;
4123 case 1047: /* secondary screen w/ clearing last */ 4241 case 1047: /* secondary screen w/ clearing last */
4124 if (options & Opt_secondaryScreen) 4242 if (OPTION (Opt_secondaryScreen))
4125 if (current_screen != PRIMARY) 4243 if (current_screen != PRIMARY)
4126 scr_erase_screen (2); 4244 scr_erase_screen (2);
4127 scr_change_screen (state); 4245 scr_change_screen (state);
4128 break; 4246 break;
4129 case 1049: /* secondary screen w/ clearing first */ 4247 case 1049: /* secondary screen w/ clearing first */
4130 scr_change_screen (state); 4248 scr_change_screen (state);
4131 if (options & Opt_secondaryScreen) 4249 if (OPTION (Opt_secondaryScreen))
4132 if (current_screen != PRIMARY) 4250 if (current_screen != PRIMARY)
4133 scr_erase_screen (2); 4251 scr_erase_screen (2);
4134 break; 4252 break;
4135 default: 4253 default:
4136 break; 4254 break;
… …
4264 scr_color (Color_bg, Color_bg); 4382 scr_color (Color_bg, Color_bg);
4265 break; 4383 break;
4266 4384
4267 //case 50: // not variable spacing 4385 //case 50: // not variable spacing
4268 4386
4269#ifndef NO_BRIGHTCOLOR 4387#if ENABLE_FRILLS
4270 case 90: 4388 case 90:
4271 case 91: /* set bright fg color */ 4389 case 91: /* set bright fg color */
4272 case 92: 4390 case 92:
4273 case 93: 4391 case 93:
4274 case 94: 4392 case 94:
… …
4286 case 106: 4404 case 106:
4287 case 107: 4405 case 107:
4288 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4406 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4289 break; 4407 break;
4290#endif 4408#endif
4291
4292 } 4409 }
4293 } 4410 }
4294} 4411}
4295/*}}} */ 4412/*}}} */
4296 4413
… …
4320 */ 4437 */
4321void 4438void
4322rxvt_term::tt_printf (const char *fmt,...) 4439rxvt_term::tt_printf (const char *fmt,...)
4323{ 4440{
4324 va_list arg_ptr; 4441 va_list arg_ptr;
4325 unsigned char buf[256]; 4442 char buf[256];
4326 4443
4327 va_start (arg_ptr, fmt); 4444 va_start (arg_ptr, fmt);
4328 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4445 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4329 va_end (arg_ptr); 4446 va_end (arg_ptr);
4330 tt_write (buf, strlen (buf)); 4447 tt_write (buf, strlen (buf));
… …
4335 * or generated by us in response to a query ESC sequence. 4452 * or generated by us in response to a query ESC sequence.
4336 */ 4453 */
4337const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4454const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4338 4455
4339void 4456void
4340rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4457rxvt_term::tt_write (const char *data, unsigned int len)
4341{ 4458{
4342 if (v_buflen == 0) 4459 if (v_buflen == 0)
4343 { 4460 {
4344 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4461 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4345 4462
… …
4348 4465
4349 data += written; 4466 data += written;
4350 len -= written; 4467 len -= written;
4351 } 4468 }
4352 4469
4353 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4470 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4354 4471
4355 memcpy (v_buffer + v_buflen, data, len); 4472 memcpy (v_buffer + v_buflen, data, len);
4356 v_buflen += len; 4473 v_buflen += len;
4357 4474
4358 pty_ev.set (EVENT_READ | EVENT_WRITE); 4475 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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