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.214 by root, Thu Dec 22 21:56:19 2005 UTC vs.
Revision 1.240 by root, Fri Jan 6 03:40:19 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;
… …
841#endif 867#endif
842 /* nil */ ; 868 /* nil */ ;
843 } 869 }
844 } 870 }
845 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END)))
873 return;
874
846 if (len <= 0) 875 if (len <= 0)
847 return; /* not mapped */ 876 return; /* not mapped */
848 877
849 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
850 if (view_start) 879 if (view_start)
851 { 880 {
852 view_start = 0; 881 view_start = 0;
853 want_refresh = 1; 882 want_refresh = 1;
854 } 883 }
… …
872#ifdef META8_OPTION 901#ifdef META8_OPTION
873 && meta_char == C0_ESC 902 && meta_char == C0_ESC
874#endif 903#endif
875 ) 904 )
876 { 905 {
877 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
878 tt_write (&ch, 1); 907 tt_write (&ch, 1);
879 } 908 }
880 909
881#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
882 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
894 923
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
898unsigned int 927unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 929{
901 unsigned int n, s; 930 unsigned int n, s;
902 931
903 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
941 } 970 }
942#endif 971#endif
943 972
944 if (want_refresh) 973 if (want_refresh)
945 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978
979 while (row > -nsaved && ROW (row - 1).is_longer ())
980 --row;
981
982 while (row < -view_start + nrow)
983 {
984 int start_row = row;
985 line_t *l;
986
987 do
988 {
989 l = &ROW (row);
990
991 if (!(l->f & LINE_FILTERED))
992 {
993 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED;
995 while (l->is_longer ())
996 {
997 l = &ROW (++row);
998 l->f |= LINE_FILTERED;
999 }
1000
1001 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003
1004 break;
1005 }
1006 }
1007 while (l->is_longer ());
1008
1009 row++;
1010 }
1011
1012 }
1013
946 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
947 scrollbar_show (1); 1015 scrollbar_show (1);
948#ifdef USE_XIM 1016#ifdef USE_XIM
949 IMSendSpot (); 1017 IMSendSpot ();
950#endif 1018#endif
… …
960 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
961 1029
962 display->flush (); 1030 display->flush ();
963 1031
964 if (want_refresh && !flush_ev.active) 1032 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01); 1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
966} 1034}
967 1035
968void 1036void
969rxvt_term::flush_cb (time_watcher &w) 1037rxvt_term::flush_cb (time_watcher &w)
970{ 1038{
… …
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1114 }
1047} 1115}
1048#endif 1116#endif
1049 1117
1118#if HAVE_SCHED_YIELD
1119static struct event_handler
1120{
1121 check_watcher cw_yield;
1122
1123 void yield (check_watcher &w)
1124 {
1125 sched_yield ();
1126 w.stop ();
1127 }
1128
1129 event_handler ()
1130 : cw_yield (this, &event_handler::yield)
1131 {
1132 }
1133} event_handler;
1134#endif
1135
1050bool 1136bool
1051rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
1052{ 1138{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1140
1055 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
1056 { 1142 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1143 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1144 n = 0;
1059 } 1145 }
1060 1146
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1149 cmdbuf_endp = cmdbuf_ptr + n;
1064 1150
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1066 1152
1067 if (n > 0) 1153 if (r > 0)
1068 { 1154 {
1069 cmdbuf_endp += n; 1155 cmdbuf_endp += r;
1070 return true; 1156 return true;
1071 } 1157 }
1072 else if (n < 0 && errno != EAGAIN && errno != EINTR) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 {
1160#if HAVE_SCHED_YIELD
1161 if (display->is_local)
1162 event_handler.cw_yield.start ();
1163#endif
1164 }
1165 else
1166 {
1073 pty_ev.stop (); 1167 pty_ev.stop ();
1168
1169 if (!OPTION (Opt_hold))
1170 destroy ();
1171 }
1074 1172
1075 return false; 1173 return false;
1076} 1174}
1077 1175
1078void 1176void
… …
1098 recolour_cursor (); 1196 recolour_cursor ();
1099 1197
1100#ifdef POINTER_BLANK 1198#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1199 hidden_pointer = 0;
1102 1200
1103 if (options & Opt_pointerBlank) 1201 if (OPTION (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1202 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1203#endif
1106} 1204}
1107 1205
1108#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1109void 1207void
1110rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1111{ 1209{
1112 if (! (options & Opt_pointerBlank)) 1210 if (! OPTION (Opt_pointerBlank))
1113 return; 1211 return;
1114 1212
1115 XDefineCursor (display->display, vt, display->blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1116 XFlush (display->display); 1214 XFlush (display->display);
1117 1215
… …
1215 1313
1216 SET_R (this); 1314 SET_R (this);
1217 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
1218 1316
1219#if defined(CURSOR_BLINK) 1317#if defined(CURSOR_BLINK)
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1221 { 1319 {
1222 if (hidden_cursor) 1320 if (hidden_cursor)
1223 { 1321 {
1224 hidden_cursor = 0; 1322 hidden_cursor = 0;
1225 want_refresh = 1; 1323 want_refresh = 1;
… …
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1229 } 1327 }
1230#endif 1328#endif
1231 1329
1232#if defined(POINTER_BLANK) 1330#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1234 { 1332 {
1235 if (ev.type == MotionNotify 1333 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress 1334 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease) 1335 || ev.type == ButtonRelease)
1238 if (hidden_pointer) 1336 if (hidden_pointer)
… …
1434 seen_resize = 1; 1532 seen_resize = 1;
1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1533 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1436 } 1534 }
1437 1535
1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1536#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1439 if (options & Opt_transparent) 1537 if (OPTION (Opt_transparent))
1440 check_our_parents (); 1538 check_our_parents ();
1441#endif 1539#endif
1442 } 1540 }
1443 break; 1541 break;
1444 1542
… …
1540 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1638 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1541 break; 1639 break;
1542 1640
1543 if (ev.xany.window == vt) 1641 if (ev.xany.window == vt)
1544 { 1642 {
1643 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1644 ; // nop
1545 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1645 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1546 { 1646 {
1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1647 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1548 ; 1648 ;
1549 1649
1550 XQueryPointer (disp, vt, 1650 XQueryPointer (disp, vt,
… …
1645{ 1745{
1646 if (!focus) 1746 if (!focus)
1647 { 1747 {
1648 focus = 1; 1748 focus = 1;
1649 want_refresh = 1; 1749 want_refresh = 1;
1750
1751 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1752
1650#if USE_XIM 1753#if USE_XIM
1651 if (Input_Context != NULL) 1754 if (Input_Context != NULL)
1652 { 1755 {
1653 IMSetStatusPosition (); 1756 IMSetStatusPosition ();
1654 XSetICFocus (Input_Context); 1757 XSetICFocus (Input_Context);
1655 } 1758 }
1656#endif 1759#endif
1657#if CURSOR_BLINK 1760#if CURSOR_BLINK
1658 if (options & Opt_cursorBlink) 1761 if (OPTION (Opt_cursorBlink))
1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1762 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1660#endif 1763#endif
1661#if OFF_FOCUS_FADING 1764#if OFF_FOCUS_FADING
1662 if (rs[Rs_fade]) 1765 if (rs[Rs_fade])
1663 { 1766 {
… …
1674 if (focus) 1777 if (focus)
1675 { 1778 {
1676 focus = 0; 1779 focus = 0;
1677 want_refresh = 1; 1780 want_refresh = 1;
1678 1781
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1783
1679#if ENABLE_FRILLS || ISO_14755 1784#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf)
1786 {
1680 iso14755buf = 0; 1787 iso14755buf = 0;
1681#endif
1682#if ENABLE_OVERLAY 1788# if ENABLE_OVERLAY
1683 scr_overlay_off (); 1789 scr_overlay_off ();
1790# endif
1791 }
1684#endif 1792#endif
1685#if USE_XIM 1793#if USE_XIM
1686 if (Input_Context != NULL) 1794 if (Input_Context != NULL)
1687 XUnsetICFocus (Input_Context); 1795 XUnsetICFocus (Input_Context);
1688#endif 1796#endif
1689#if CURSOR_BLINK 1797#if CURSOR_BLINK
1690 if (options & Opt_cursorBlink) 1798 if (OPTION (Opt_cursorBlink))
1691 cursor_blink_ev.stop (); 1799 cursor_blink_ev.stop ();
1692 hidden_cursor = 0; 1800 hidden_cursor = 0;
1693#endif 1801#endif
1694#if OFF_FOCUS_FADING 1802#if OFF_FOCUS_FADING
1695 if (rs[Rs_fade]) 1803 if (rs[Rs_fade])
… …
1719 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1827 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1720 return; 1828 return;
1721 1829
1722 /* FALLTHROUGH */ 1830 /* FALLTHROUGH */
1723 case ReparentNotify: 1831 case ReparentNotify:
1724 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1832 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1725 want_refresh = want_full_refresh = 1; 1833 want_refresh = want_full_refresh = 1;
1726 break; 1834 break;
1727 } 1835 }
1728} 1836}
1729#endif 1837#endif
… …
1732rxvt_term::button_press (XButtonEvent &ev) 1840rxvt_term::button_press (XButtonEvent &ev)
1733{ 1841{
1734 int reportmode = 0, clickintime; 1842 int reportmode = 0, clickintime;
1735 1843
1736 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1844 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1845
1737 if (!bypass_keystate) 1846 if (!bypass_keystate)
1738 reportmode = !! (priv_modes & PrivMode_mouse_report); 1847 reportmode = !! (priv_modes & PrivMode_mouse_report);
1739 1848
1740 /* 1849 /*
1741 * VT window processing of button press 1850 * VT window processing of button press
… …
1790 else 1899 else
1791 { 1900 {
1792 if (ev.button != MEvent.button) 1901 if (ev.button != MEvent.button)
1793 MEvent.clicks = 0; 1902 MEvent.clicks = 0;
1794 1903
1904 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1795 switch (ev.button) 1905 switch (ev.button)
1796 { 1906 {
1797 case Button1: 1907 case Button1:
1798 /* allow meta + click to select rectangular areas */ 1908 /* allow meta + click to select rectangular areas */
1799 /* should be done in screen.C */ 1909 /* should be done in screen.C */
1800#if ENABLE_FRILLS 1910#if ENABLE_FRILLS
1801 selection.rect = !!(ev.state & ModMetaMask); 1911 selection.rect = !!(ev.state & ModMetaMask);
1802#else 1912#else
1803 selection.rect = false; 1913 selection.rect = false;
1804#endif 1914#endif
1805 1915
1806 /* allow shift+left click to extend selection */ 1916 /* allow shift+left click to extend selection */
1807 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1917 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1808 { 1918 {
1809 if (MEvent.button == Button1 && clickintime) 1919 if (MEvent.button == Button1 && clickintime)
1810 selection_rotate (ev.x, ev.y); 1920 selection_rotate (ev.x, ev.y);
1811 else 1921 else
1812 selection_extend (ev.x, ev.y, 1); 1922 selection_extend (ev.x, ev.y, 1);
1813 } 1923 }
1814 else 1924 else
1815 { 1925 {
1816 if (MEvent.button == Button1 && clickintime) 1926 if (MEvent.button == Button1 && clickintime)
1817 MEvent.clicks++; 1927 MEvent.clicks++;
1818 else 1928 else
1819 MEvent.clicks = 1; 1929 MEvent.clicks = 1;
1820 1930
1821 selection_click (MEvent.clicks, ev.x, ev.y); 1931 selection_click (MEvent.clicks, ev.x, ev.y);
1822 } 1932 }
1823 1933
1824 MEvent.button = Button1; 1934 MEvent.button = Button1;
1825 break; 1935 break;
1826 1936
1827 case Button3: 1937 case Button3:
1828 if (MEvent.button == Button3 && clickintime) 1938 if (MEvent.button == Button3 && clickintime)
1829 selection_rotate (ev.x, ev.y); 1939 selection_rotate (ev.x, ev.y);
1830 else 1940 else
1831 selection_extend (ev.x, ev.y, 1); 1941 selection_extend (ev.x, ev.y, 1);
1832 1942
1833 MEvent.button = Button3; 1943 MEvent.button = Button3;
1834 break; 1944 break;
1835 } 1945 }
1836 } 1946 }
1837 1947
1838 MEvent.time = ev.time; 1948 MEvent.time = ev.time;
1839 return; 1949 return;
1840 } 1950 }
1841 1951
… …
2051 if (priv_modes & PrivMode_mouse_report 2161 if (priv_modes & PrivMode_mouse_report
2052 && bypass_keystate 2162 && bypass_keystate
2053 && ev.button == Button1 && MEvent.clicks <= 1) 2163 && ev.button == Button1 && MEvent.clicks <= 1)
2054 selection_extend (ev.x, ev.y, 0); 2164 selection_extend (ev.x, ev.y, 0);
2055 2165
2166 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2167 return;
2168
2056 switch (ev.button) 2169 switch (ev.button)
2057 { 2170 {
2058 case Button1: 2171 case Button1:
2059 case Button3: 2172 case Button3:
2060 selection_make (ev.time); 2173 selection_make (ev.time);
… …
2071 2184
2072 v = ev.button == Button4 ? UP : DN; 2185 v = ev.button == Button4 ? UP : DN;
2073 2186
2074 if (ev.state & ShiftMask) 2187 if (ev.state & ShiftMask)
2075 i = 1; 2188 i = 1;
2076 else if (options & Opt_mouseWheelScrollPage) 2189 else if (OPTION (Opt_mouseWheelScrollPage))
2077 i = nrow - 1; 2190 i = nrow - 1;
2078 else 2191 else
2079 i = 5; 2192 i = 5;
2080 2193
2081# ifdef MOUSE_SLIP_WHEELING 2194# ifdef MOUSE_SLIP_WHEELING
… …
2367 XWindowAttributes wattr, wrootattr; 2480 XWindowAttributes wattr, wrootattr;
2368 dDisp; 2481 dDisp;
2369 2482
2370 pchanged = 0; 2483 pchanged = 0;
2371 2484
2372 if (!(options & Opt_transparent)) 2485 if (!OPTION (Opt_transparent))
2373 return pchanged; /* Don't try any more */ 2486 return pchanged; /* Don't try any more */
2374 2487
2375 XGetWindowAttributes (disp, display->root, &wrootattr); 2488 XGetWindowAttributes (disp, display->root, &wrootattr);
2376 rootdepth = wrootattr.depth; 2489 rootdepth = wrootattr.depth;
2377 2490
… …
2605bool 2718bool
2606rxvt_term::cmd_parse () 2719rxvt_term::cmd_parse ()
2607{ 2720{
2608 bool flag = false; 2721 bool flag = false;
2609 unicode_t ch = NOCHAR; 2722 unicode_t ch = NOCHAR;
2610 unsigned char *seq_begin; // remember start of esc-sequence here 2723 char *seq_begin; // remember start of esc-sequence here
2611 2724
2612 for (;;) 2725 for (;;)
2613 { 2726 {
2614 if (ch == NOCHAR) 2727 if (ch == NOCHAR)
2615 { 2728 {
2616 seq_begin = cmdbuf_ptr; 2729 seq_begin = cmdbuf_ptr;
2617 ch = next_char (); 2730 ch = next_char ();
2618 }
2619 2731
2620 if (ch == NOCHAR) // TODO: improve 2732 if (ch == NOCHAR)
2621 break; 2733 break;
2734 }
2622 2735
2623 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2736 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2624 { 2737 {
2625 if (!seen_input) 2738 if (!seen_input)
2626 { 2739 {
… …
2655 if (ch == C0_LF) 2768 if (ch == C0_LF)
2656 nlines++; 2769 nlines++;
2657 2770
2658 refresh_count++; 2771 refresh_count++;
2659 2772
2660 if (!(options & Opt_jumpScroll) 2773 if (!OPTION (Opt_jumpScroll)
2661 || (refresh_count >= refresh_limit * (nrow - 1))) 2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2775 {
2663 refreshnow = true; 2776 refreshnow = true;
2777 refresh_count = 0;
2664 ch = NOCHAR; 2778 ch = NOCHAR;
2665 break; 2779 break;
2666 } 2780 }
2667 2781
2668 // scr_add_lines only works for nlines <= nrow - 1. 2782 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= nrow - 1) 2783 if (nlines >= nrow - 1)
2670 { 2784 {
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2671 scr_add_lines (buf, nlines, str - buf); 2786 scr_add_lines (buf, nlines, str - buf);
2787
2672 nlines = 0; 2788 nlines = 0;
2673 str = buf; 2789 str = buf;
2674 eol = str + min (ncol, UBUFSIZ); 2790 eol = str + min (ncol, UBUFSIZ);
2675 } 2791 }
2676 2792
… …
2689 2805
2690 seq_begin = cmdbuf_ptr; 2806 seq_begin = cmdbuf_ptr;
2691 ch = next_char (); 2807 ch = next_char ();
2692 } 2808 }
2693 2809
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2694 scr_add_lines (buf, nlines, str - buf); 2811 scr_add_lines (buf, nlines, str - buf);
2695 2812
2696 /* 2813 /*
2697 * If there have been a lot of new lines, then update the screen 2814 * If there have been a lot of new lines, then update the screen
2698 * What the heck I'll cheat and only refresh less than every page-full. 2815 * What the heck I'll cheat and only refresh less than every page-full.
2699 * the number of pages between refreshes is refresh_limit, which 2816 * the number of pages between refreshes is refresh_limit, which
2700 * is incremented here because we must be doing flat-out scrolling. 2817 * is incremented here because we must be doing flat-out scrolling.
2701 */ 2818 */
2702 if (refreshnow) 2819 if (refreshnow)
2703 { 2820 {
2704 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2821 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2705 refresh_limit++; 2822 refresh_limit++;
2706 else 2823 else
2707 { 2824 {
2708 flag = true; 2825 flag = true;
2709 scr_refresh (refresh_type); 2826 scr_refresh (refresh_type);
2827 flush_ev.stop ();
2710 } 2828 }
2711 } 2829 }
2712 2830
2713 } 2831 }
2714 else 2832 else
… …
2745rxvt_term::next_char () 2863rxvt_term::next_char ()
2746{ 2864{
2747 while (cmdbuf_ptr < cmdbuf_endp) 2865 while (cmdbuf_ptr < cmdbuf_endp)
2748 { 2866 {
2749 // assume 7-bit to be ascii ALWAYS 2867 // assume 7-bit to be ascii ALWAYS
2750 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2868 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2751 return *cmdbuf_ptr++; 2869 return *cmdbuf_ptr++;
2752 2870
2753 wchar_t wc; 2871 wchar_t wc;
2754 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2872 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2755 2873
2756 if (len == (size_t)-2) 2874 if (len == (size_t)-2)
2757 { 2875 {
2758 // the mbstate stores incomplete sequences. didn't know this :/ 2876 // the mbstate stores incomplete sequences. didn't know this :/
2759 cmdbuf_ptr = cmdbuf_endp; 2877 cmdbuf_ptr = cmdbuf_endp;
… …
2898 case C0_ESC: 3016 case C0_ESC:
2899 process_escape_seq (); 3017 process_escape_seq ();
2900 break; 3018 break;
2901 case C0_ENQ: /* terminal Status */ 3019 case C0_ENQ: /* terminal Status */
2902 if (rs[Rs_answerbackstring]) 3020 if (rs[Rs_answerbackstring])
2903 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3021 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2904 (unsigned int)strlen (rs[Rs_answerbackstring]));
2905 else 3022 else
2906 tt_write ((unsigned char *)VT100_ANS, 3023 tt_write (VT100_ANS, strlen (VT100_ANS));
2907 (unsigned int)strlen (VT100_ANS));
2908 break; 3024 break;
2909 case C0_BEL: /* bell */ 3025 case C0_BEL: /* bell */
2910 scr_bell (); 3026 scr_bell ();
2911 break; 3027 break;
2912 case C0_BS: /* backspace */ 3028 case C0_BS: /* backspace */
… …
3100 process_dcs_seq (); 3216 process_dcs_seq ();
3101 break; 3217 break;
3102 3218
3103 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3219 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3104 case C1_SCI: /* ESC Z */ 3220 case C1_SCI: /* ESC Z */
3105 tt_write ((const unsigned char *)ESCZ_ANSWER, 3221 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3106 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3107 break; /* steal obsolete ESC [ c */ 3222 break; /* steal obsolete ESC [ c */
3108 3223
3109 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3224 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3110 case C1_CSI: /* ESC [ */ 3225 case C1_CSI: /* ESC [ */
3111 process_csi_seq (); 3226 process_csi_seq ();
… …
3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3470 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3471 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3357 break; 3472 break;
3358 3473
3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3474 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3360 tt_write ((const unsigned char *)VT100_ANS, 3475 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3361 (unsigned int) (sizeof (VT100_ANS) - 1));
3362 break; 3476 break;
3363 3477
3364 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3478 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3365 process_sgr_mode (nargs, arg); 3479 process_sgr_mode (nargs, arg);
3366 break; 3480 break;
… …
3373 break; 3487 break;
3374 case 6: /* CPR requested */ 3488 case 6: /* CPR requested */
3375 scr_report_position (); 3489 scr_report_position ();
3376 break; 3490 break;
3377 case 7: /* unofficial extension */ 3491 case 7: /* unofficial extension */
3378 if (options & Opt_insecure) 3492 if (OPTION (Opt_insecure))
3379 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3493 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3380 break; 3494 break;
3381 case 8: /* unofficial extension */ 3495 case 8: /* unofficial extension */
3382 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3496 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3383 break; 3497 break;
… …
3547 break; 3661 break;
3548 case 20: /* report icon label */ 3662 case 20: /* report icon label */
3549 { 3663 {
3550 char *s; 3664 char *s;
3551 XGetIconName (disp, parent[0], &s); 3665 XGetIconName (disp, parent[0], &s);
3552 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 */
3553 XFree (s); 3667 XFree (s);
3554 } 3668 }
3555 break; 3669 break;
3556 case 21: /* report window title */ 3670 case 21: /* report window title */
3557 { 3671 {
3558 char *s; 3672 char *s;
3559 XFetchName (disp, parent[0], &s); 3673 XFetchName (disp, parent[0], &s);
3560 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3674 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3561 XFree (s); 3675 XFree (s);
3562 } 3676 }
3563 break; 3677 break;
3564 } 3678 }
3565} 3679}
… …
3568/*----------------------------------------------------------------------*/ 3682/*----------------------------------------------------------------------*/
3569/* 3683/*
3570 * get input up until STRING TERMINATOR (or BEL) 3684 * get input up until STRING TERMINATOR (or BEL)
3571 * ends_how is terminator used. returned input must be free()'d 3685 * ends_how is terminator used. returned input must be free()'d
3572 */ 3686 */
3573unsigned char * 3687char *
3574rxvt_term::get_to_st (unicode_t &ends_how) 3688rxvt_term::get_to_st (unicode_t &ends_how)
3575{ 3689{
3576 unicode_t ch; 3690 unicode_t ch;
3577 bool seen_esc = false; 3691 bool seen_esc = false;
3578 unsigned int n = 0; 3692 unsigned int n = 0;
… …
3611 3725
3612 string[n++] = '\0'; 3726 string[n++] = '\0';
3613 3727
3614 ends_how = (ch == 0x5c ? C0_ESC : ch); 3728 ends_how = (ch == 0x5c ? C0_ESC : ch);
3615 3729
3616 return (unsigned char *)rxvt_wcstombs (string); 3730 return rxvt_wcstombs (string);
3617} 3731}
3618 3732
3619/*----------------------------------------------------------------------*/ 3733/*----------------------------------------------------------------------*/
3620/* 3734/*
3621 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3735 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3622 */ 3736 */
3623void 3737void
3624rxvt_term::process_dcs_seq () 3738rxvt_term::process_dcs_seq ()
3625{ 3739{
3626 unsigned char *s; 3740 char *s;
3627 unicode_t eh; 3741 unicode_t eh;
3628 3742
3629 /* 3743 /*
3630 * Not handled yet 3744 * Not handled yet
3631 */ 3745 */
… …
3650 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3764 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3651 arg = arg * 10 + (ch - '0'); 3765 arg = arg * 10 + (ch - '0');
3652 3766
3653 if (ch == ';') 3767 if (ch == ';')
3654 { 3768 {
3655 unsigned char *s = get_to_st (eh); 3769 char *s = get_to_st (eh);
3656 3770
3657 if (s) 3771 if (s)
3658 { 3772 {
3659 process_xterm_seq (arg, (char *)s, eh); 3773 process_xterm_seq (arg, s, eh);
3660 free (s); 3774 free (s);
3661 } 3775 }
3662 } 3776 }
3663} 3777}
3664 3778
3665void 3779void
3666rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3780rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3667{ 3781{
3668 if (str[0] == '?' && !str[1]) 3782 if (str[0] == '?' && !str[1])
3669 { 3783 {
3670 unsigned short r, g, b; 3784 unsigned short r, g, b;
3671 pix_colors_focused[color].get (display, r, g, b); 3785 pix_colors_focused[color].get (display, r, g, b);
… …
3677 3791
3678/* 3792/*
3679 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3680 */ 3794 */
3681void 3795void
3682rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3683{ 3797{
3684 int changed = 0; 3798 int changed = 0;
3685 int color; 3799 int color;
3686 char *buf, *name; 3800 char *buf, *name;
3687 bool query = str[0] == '?' && !str[1]; 3801 bool query = str[0] == '?' && !str[1];
… …
3841 // TODO, when secure mode? 3955 // TODO, when secure mode?
3842 break; 3956 break;
3843 3957
3844#ifdef MENUBAR 3958#ifdef MENUBAR
3845 case URxvt_Menu: 3959 case URxvt_Menu:
3846 if (options & Opt_insecure) 3960 if (OPTION (Opt_insecure))
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3961 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3848 break; 3962 break;
3849#endif 3963#endif
3850#if 0 3964#if 0
3851 case XTerm_dumpscreen: /* no error notices */ 3965 case XTerm_dumpscreen: /* no error notices */
… …
3867 case URxvt_italicFont: 3981 case URxvt_italicFont:
3868 case URxvt_boldItalicFont: 3982 case URxvt_boldItalicFont:
3869#endif 3983#endif
3870 if (query) 3984 if (query)
3871 tt_printf ("\33]%d;%-.250s%c", saveop, 3985 tt_printf ("\33]%d;%-.250s%c", saveop,
3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3986 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3873 ? fontset[op - URxvt_font]->fontdesc : "", 3987 ? fontset[op - URxvt_font]->fontdesc : "",
3874 resp); 3988 resp);
3875 else 3989 else
3876 { 3990 {
3877 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3991 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3883 break; 3997 break;
3884 3998
3885#if ENABLE_FRILLS 3999#if ENABLE_FRILLS
3886 case URxvt_locale: 4000 case URxvt_locale:
3887 if (query) 4001 if (query)
3888 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 4002 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3889 else 4003 else
3890 { 4004 {
3891 set_locale (str); 4005 set_locale (str);
3892 pty.set_utf8_mode (enc_utf8); 4006 pty.set_utf8_mode (enc_utf8);
3893 init_xlocale (); 4007 init_xlocale ();
3894 } 4008 }
3895 break; 4009 break;
3896 4010
3897 case URxvt_view_up: 4011 case URxvt_view_up:
3898 case URxvt_view_down: 4012 case URxvt_view_down:
4013 {
3899 int lines = atoi (str); 4014 int lines = atoi (str);
3900 4015
3901 if (lines) 4016 if (lines)
3902 scr_page (op == URxvt_view_up ? UP : DN, lines); 4017 scr_page (op == URxvt_view_up ? UP : DN, lines);
3903 else 4018 else
3904 {
3905 scr_erase_savelines (); 4019 scr_erase_savelines ();
3906 } 4020 }
3907 4021
4022 break;
4023#endif
4024
4025#if ENABLE_PERL
4026 case URxvt_perl:
4027 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
4028 ; // no responses yet
3908 break; 4029 break;
3909#endif 4030#endif
3910 } 4031 }
3911} 4032}
3912/*----------------------------------------------------------------------*/ 4033/*----------------------------------------------------------------------*/
… …
4021 } 4142 }
4022 4143
4023 /* extra handling for values with state unkept */ 4144 /* extra handling for values with state unkept */
4024 switch (arg[i]) 4145 switch (arg[i])
4025 { 4146 {
4147#if ENABLE_STYLES
4148 case 1021:
4149 if (mode)
4150 SET_OPTION (Opt_intensityStyles);
4151 else
4152 CLR_OPTION (Opt_intensityStyles);
4153
4154 scr_touch (true);
4155 break;
4156#endif
4026 case 1048: /* alternative cursor save */ 4157 case 1048: /* alternative cursor save */
4027 case 1049: 4158 case 1049:
4028 if (options & Opt_secondaryScreen) 4159 if (OPTION (Opt_secondaryScreen))
4029 if (mode == 0) 4160 if (mode == 0)
4030 scr_cursor (RESTORE); 4161 scr_cursor (RESTORE);
4031 else if (mode == 1) 4162 else if (mode == 1)
4032 scr_cursor (SAVE); 4163 scr_cursor (SAVE);
4033 break; 4164 break;
… …
4048 case 3: /* 80/132 */ 4179 case 3: /* 80/132 */
4049 if (priv_modes & PrivMode_132OK) 4180 if (priv_modes & PrivMode_132OK)
4050 set_widthheight (((state ? 132 : 80) * fwidth), height); 4181 set_widthheight (((state ? 132 : 80) * fwidth), height);
4051 break; 4182 break;
4052 case 4: /* smooth scrolling */ 4183 case 4: /* smooth scrolling */
4053 if (state) 4184 if (!state)
4054 options &= ~Opt_jumpScroll; 4185 SET_OPTION (Opt_jumpScroll);
4055 else 4186 else
4056 options |= Opt_jumpScroll; 4187 CLR_OPTION (Opt_jumpScroll);
4057 break; 4188 break;
4058 case 5: /* reverse video */ 4189 case 5: /* reverse video */
4059 scr_rvideo_mode (state); 4190 scr_rvideo_mode (state);
4060 break; 4191 break;
4061 case 6: /* relative/absolute origins */ 4192 case 6: /* relative/absolute origins */
… …
4102#if 0 4233#if 0
4103 case 1001: 4234 case 1001:
4104 break; /* X11 mouse highlighting */ 4235 break; /* X11 mouse highlighting */
4105#endif 4236#endif
4106 case 1010: /* scroll to bottom on TTY output inhibit */ 4237 case 1010: /* scroll to bottom on TTY output inhibit */
4107 if (state) 4238 if (!state)
4108 options &= ~Opt_scrollTtyOutput; 4239 SET_OPTION (Opt_scrollTtyOutput);
4109 else 4240 else
4110 options |= Opt_scrollTtyOutput; 4241 CLR_OPTION (Opt_scrollTtyOutput);
4111 break; 4242 break;
4112 case 1011: /* scroll to bottom on key press */ 4243 case 1011: /* scroll to bottom on key press */
4113 if (state) 4244 if (state)
4114 options |= Opt_scrollTtyKeypress; 4245 SET_OPTION (Opt_scrollTtyKeypress);
4115 else 4246 else
4116 options &= ~Opt_scrollTtyKeypress; 4247 CLR_OPTION (Opt_scrollTtyKeypress);
4117 break; 4248 break;
4118 case 1047: /* secondary screen w/ clearing last */ 4249 case 1047: /* secondary screen w/ clearing last */
4119 if (options & Opt_secondaryScreen) 4250 if (OPTION (Opt_secondaryScreen))
4120 if (current_screen != PRIMARY) 4251 if (current_screen != PRIMARY)
4121 scr_erase_screen (2); 4252 scr_erase_screen (2);
4122 scr_change_screen (state); 4253 scr_change_screen (state);
4123 break; 4254 break;
4124 case 1049: /* secondary screen w/ clearing first */ 4255 case 1049: /* secondary screen w/ clearing first */
4125 scr_change_screen (state); 4256 scr_change_screen (state);
4126 if (options & Opt_secondaryScreen) 4257 if (OPTION (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 4258 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 4259 scr_erase_screen (2);
4129 break; 4260 break;
4130 default: 4261 default:
4131 break; 4262 break;
… …
4259 scr_color (Color_bg, Color_bg); 4390 scr_color (Color_bg, Color_bg);
4260 break; 4391 break;
4261 4392
4262 //case 50: // not variable spacing 4393 //case 50: // not variable spacing
4263 4394
4264#ifndef NO_BRIGHTCOLOR 4395#if ENABLE_FRILLS
4265 case 90: 4396 case 90:
4266 case 91: /* set bright fg color */ 4397 case 91: /* set bright fg color */
4267 case 92: 4398 case 92:
4268 case 93: 4399 case 93:
4269 case 94: 4400 case 94:
… …
4281 case 106: 4412 case 106:
4282 case 107: 4413 case 107:
4283 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4414 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4284 break; 4415 break;
4285#endif 4416#endif
4286
4287 } 4417 }
4288 } 4418 }
4289} 4419}
4290/*}}} */ 4420/*}}} */
4291 4421
… …
4315 */ 4445 */
4316void 4446void
4317rxvt_term::tt_printf (const char *fmt,...) 4447rxvt_term::tt_printf (const char *fmt,...)
4318{ 4448{
4319 va_list arg_ptr; 4449 va_list arg_ptr;
4320 unsigned char buf[256]; 4450 char buf[256];
4321 4451
4322 va_start (arg_ptr, fmt); 4452 va_start (arg_ptr, fmt);
4323 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4453 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4324 va_end (arg_ptr); 4454 va_end (arg_ptr);
4325 tt_write (buf, strlen (buf)); 4455 tt_write (buf, strlen (buf));
… …
4330 * or generated by us in response to a query ESC sequence. 4460 * or generated by us in response to a query ESC sequence.
4331 */ 4461 */
4332const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4462const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4333 4463
4334void 4464void
4335rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4465rxvt_term::tt_write (const char *data, unsigned int len)
4336{ 4466{
4467 if (pty.pty < 0)
4468 return;
4469
4337 if (v_buflen == 0) 4470 if (v_buflen == 0)
4338 { 4471 {
4339 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4472 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4340 4473
4341 if ((unsigned int)written == len) 4474 if ((unsigned int)written == len)
… …
4343 4476
4344 data += written; 4477 data += written;
4345 len -= written; 4478 len -= written;
4346 } 4479 }
4347 4480
4348 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4481 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4349 4482
4350 memcpy (v_buffer + v_buflen, data, len); 4483 memcpy (v_buffer + v_buflen, data, len);
4351 v_buflen += len; 4484 v_buflen += len;
4352 4485
4353 pty_ev.set (EVENT_READ | EVENT_WRITE); 4486 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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