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.212 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.258 by root, Thu Jan 12 03:32:56 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
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
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 147 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 148 return;
143 149
144 for (;;) 150 for (;;)
145 { 151 {
146 const line_t &l = ROW(-view_start); 152 const line_t &l = ROW(y - view_start);
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_INT, keysym, DT_STR_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 int end_row = row + nrow;
979
980 while (row > -nsaved && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row++);
991
992 if (!(l->f & LINE_FILTERED))
993 {
994 // line not filtered, mark it as filtered
995 l->f |= LINE_FILTERED;
996 while (l->is_longer ())
997 {
998 l = &ROW (row++);
999 l->f |= LINE_FILTERED;
1000 }
1001
1002 // and filter it
1003 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1004
1005 break;
1006 }
1007 }
1008 while (l->is_longer () && row < end_row);
1009 }
1010 while (row < end_row);
1011 }
1012
946 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
947 scrollbar_show (1); 1014 scrollbar_show (1);
948#ifdef USE_XIM 1015#ifdef USE_XIM
949 IMSendSpot (); 1016 IMSendSpot ();
950#endif 1017#endif
… …
960 SET_LOCALE (locale); 1027 SET_LOCALE (locale);
961 1028
962 display->flush (); 1029 display->flush ();
963 1030
964 if (want_refresh && !flush_ev.active) 1031 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01); 1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
966} 1033}
967 1034
968void 1035void
969rxvt_term::flush_cb (time_watcher &w) 1036rxvt_term::flush_cb (time_watcher &w)
970{ 1037{
… …
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1113 }
1047} 1114}
1048#endif 1115#endif
1049 1116
1117#if HAVE_SCHED_YIELD
1118static struct event_handler
1119{
1120 check_watcher cw_yield;
1121
1122 void yield (check_watcher &w)
1123 {
1124 sched_yield ();
1125 w.stop ();
1126 }
1127
1128 event_handler ()
1129 : cw_yield (this, &event_handler::yield)
1130 {
1131 }
1132} event_handler;
1133#endif
1134
1050bool 1135bool
1051rxvt_term::pty_fill () 1136rxvt_term::pty_fill ()
1052{ 1137{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1139
1055 if (CBUFSIZ == n) 1140 if (CBUFSIZ == n)
1056 { 1141 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1142 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1143 n = 0;
1059 } 1144 }
1060 1145
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1147 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1148 cmdbuf_endp = cmdbuf_ptr + n;
1064 1149
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1066 1151
1067 if (n > 0) 1152 if (r > 0)
1068 { 1153 {
1069 cmdbuf_endp += n; 1154 cmdbuf_endp += r;
1070 return true; 1155 return true;
1071 } 1156 }
1072 else if (n < 0 && errno != EAGAIN) 1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 {
1159#if HAVE_SCHED_YIELD
1160 if (display->is_local)
1161 event_handler.cw_yield.start ();
1162#endif
1163 }
1164 else
1165 {
1166 pty_ev.stop ();
1167
1168 if (!OPTION (Opt_hold))
1073 destroy (); 1169 destroy ();
1170 }
1074 1171
1075 return false; 1172 return false;
1076} 1173}
1077 1174
1078void 1175void
… …
1098 recolour_cursor (); 1195 recolour_cursor ();
1099 1196
1100#ifdef POINTER_BLANK 1197#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1198 hidden_pointer = 0;
1102 1199
1103 if (options & Opt_pointerBlank) 1200 if (OPTION (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1201 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1202#endif
1106} 1203}
1107 1204
1108#ifdef POINTER_BLANK 1205#ifdef POINTER_BLANK
1109void 1206void
1110rxvt_term::pointer_blank () 1207rxvt_term::pointer_blank ()
1111{ 1208{
1112 if (! (options & Opt_pointerBlank)) 1209 if (!OPTION (Opt_pointerBlank))
1113 return; 1210 return;
1114 1211
1115 XDefineCursor (display->display, vt, display->blank_cursor); 1212 XDefineCursor (display->display, vt, display->blank_cursor);
1116 XFlush (display->display); 1213 XFlush (display->display);
1117 1214
… …
1214 dDisp; 1311 dDisp;
1215 1312
1216 SET_R (this); 1313 SET_R (this);
1217 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
1218 1315
1219#if defined(CURSOR_BLINK)
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1221 {
1222 if (hidden_cursor)
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1229 }
1230#endif
1231
1232#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1234 {
1235 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease)
1238 if (hidden_pointer)
1239 pointer_unblank ();
1240
1241 if (ev.type == KeyPress && hidden_pointer == 0)
1242 pointer_blank ();
1243 }
1244#endif
1245
1246 Window unused_root, unused_child; 1316 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1317 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1318 unsigned int unused_mask;
1249 1319
1250 switch (ev.type) 1320 switch (ev.type)
… …
1257 1327
1258 break; 1328 break;
1259 1329
1260 case KeyRelease: 1330 case KeyRelease:
1261 { 1331 {
1262#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1263 KeySym ks; 1333 KeySym keysym;
1264 1334
1265 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1266#endif 1336#endif
1267 1337
1268#if ENABLE_FRILLS || ISO_14755 1338#if ENABLE_FRILLS || ISO_14755
1269 // ISO 14755 support 1339 // ISO 14755 support
1270 if (iso14755buf) 1340 if (iso14755buf)
… …
1275# endif 1345# endif
1276# if ISO_14755 1346# if ISO_14755
1277 // iso14755 part 5.2 handling: release time 1347 // iso14755 part 5.2 handling: release time
1278 // first: controls 1348 // first: controls
1279 if ((ev.xkey.state & ControlMask) 1349 if ((ev.xkey.state & ControlMask)
1280 && ((ks >= 0x40 && ks <= 0x5f) 1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1281 || (ks >= 0x61 && ks <= 0x7f))) 1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1282 { 1352 {
1283 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1284 commit_iso14755 (); 1354 commit_iso14755 ();
1285 return; // case-break; 1355 goto skip_switch;
1286 } 1356 }
1287 1357
1288 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1289 if (i[0] == ks) 1359 if (i[0] == keysym)
1290 { 1360 {
1291 iso14755buf = ISO_14755_51 | i[1]; 1361 iso14755buf = ISO_14755_51 | i[1];
1292 commit_iso14755 (); 1362 commit_iso14755 ();
1293 return; // case-break; 1363 goto skip_switch;
1294 } 1364 }
1295 1365
1296 scr_bell (); 1366 scr_bell ();
1297# endif 1367# endif
1298 iso14755buf = 0; 1368 iso14755buf = 0;
… …
1317 else 1387 else
1318 iso14755buf = 0; 1388 iso14755buf = 0;
1319 } 1389 }
1320#endif 1390#endif
1321 1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break;
1395
1322#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1323 if (!(ev.xkey.state & ControlMask)) 1397 if (!(ev.xkey.state & ControlMask))
1324 slip_wheel_ev.stop (); 1398 slip_wheel_ev.stop ();
1325 else if (ks == XK_Control_L || ks == XK_Control_R) 1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1326 mouse_slip_wheel_speed = 0; 1400 mouse_slip_wheel_speed = 0;
1327#endif 1401#endif
1328 break; 1402 break;
1329 } 1403 }
1330 1404
… …
1434 seen_resize = 1; 1508 seen_resize = 1;
1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1436 } 1510 }
1437 1511
1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1439 if (options & Opt_transparent) 1513 if (OPTION (Opt_transparent))
1440 check_our_parents (); 1514 check_our_parents ();
1441#endif 1515#endif
1442 } 1516 }
1443 break; 1517 break;
1444 1518
… …
1460 1534
1461 case SelectionRequest: 1535 case SelectionRequest:
1462 selection_send (ev.xselectionrequest); 1536 selection_send (ev.xselectionrequest);
1463 break; 1537 break;
1464 1538
1539 case MapNotify:
1540 mapped = 1;
1541#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1543#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break;
1546
1465 case UnmapNotify: 1547 case UnmapNotify:
1466 mapped = 0; 1548 mapped = 0;
1467#ifdef TEXT_BLINK 1549#ifdef TEXT_BLINK
1468 text_blink_ev.stop (); 1550 text_blink_ev.stop ();
1469#endif 1551#endif
1470 break; 1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1471
1472 case MapNotify:
1473 mapped = 1;
1474#ifdef TEXT_BLINK
1475 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1476#endif
1477 break; 1553 break;
1478 1554
1479#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1480 case ReparentNotify: 1556 case ReparentNotify:
1481 rootwin_cb (ev); 1557 rootwin_cb (ev);
… …
1495 1571
1496 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1499 1575
1500 scr_refresh (refresh_type); 1576 want_refresh = 1;
1501 } 1577 }
1502 else 1578 else
1503 { 1579 {
1504 XEvent unused_event; 1580 XEvent unused_event;
1505 1581
… …
1540 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1541 break; 1617 break;
1542 1618
1543 if (ev.xany.window == vt) 1619 if (ev.xany.window == vt)
1544 { 1620 {
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop
1545 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1546 { 1624 {
1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1548 ; 1626 ;
1549 1627
1550 XQueryPointer (disp, vt, 1628 XQueryPointer (disp, vt,
… …
1630 &unused_root_x, &unused_root_y, 1708 &unused_root_x, &unused_root_y,
1631 &ev.xbutton.x, &ev.xbutton.y, 1709 &ev.xbutton.x, &ev.xbutton.y,
1632 &unused_mask); 1710 &unused_mask);
1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1634 scrollbar_size ()); 1712 scrollbar_size ());
1635 scr_refresh (refresh_type); 1713 want_refresh = 1;
1636 refresh_limit = 0; 1714 refresh_limit = 0;
1637 scrollbar_show (1); 1715 scrollbar_show (1);
1638 } 1716 }
1639 break; 1717 break;
1640 } 1718 }
1719
1720skip_switch: ;
1721
1722#if defined(CURSOR_BLINK)
1723 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1724 {
1725 if (hidden_cursor)
1726 {
1727 hidden_cursor = 0;
1728 want_refresh = 1;
1729 }
1730
1731 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1732 }
1733#endif
1734
1735#if defined(POINTER_BLANK)
1736 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1737 {
1738 if (ev.type == MotionNotify
1739 || ev.type == ButtonPress
1740 || ev.type == ButtonRelease)
1741 if (hidden_pointer)
1742 pointer_unblank ();
1743
1744 if (ev.type == KeyPress && hidden_pointer == 0)
1745 pointer_blank ();
1746 }
1747#endif
1641} 1748}
1642 1749
1643void 1750void
1644rxvt_term::focus_in () 1751rxvt_term::focus_in ()
1645{ 1752{
1646 if (!focus) 1753 if (!focus)
1647 { 1754 {
1648 focus = 1; 1755 focus = 1;
1649 want_refresh = 1; 1756 want_refresh = 1;
1757
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1759
1650#if USE_XIM 1760#if USE_XIM
1651 if (Input_Context != NULL) 1761 if (Input_Context != NULL)
1652 { 1762 {
1653 IMSetStatusPosition (); 1763 IMSetStatusPosition ();
1654 XSetICFocus (Input_Context); 1764 XSetICFocus (Input_Context);
1655 } 1765 }
1656#endif 1766#endif
1657#if CURSOR_BLINK 1767#if CURSOR_BLINK
1658 if (options & Opt_cursorBlink) 1768 if (OPTION (Opt_cursorBlink))
1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1769 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1660#endif 1770#endif
1661#if OFF_FOCUS_FADING 1771#if OFF_FOCUS_FADING
1662 if (rs[Rs_fade]) 1772 if (rs[Rs_fade])
1663 { 1773 {
… …
1674 if (focus) 1784 if (focus)
1675 { 1785 {
1676 focus = 0; 1786 focus = 0;
1677 want_refresh = 1; 1787 want_refresh = 1;
1678 1788
1789 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1790
1679#if ENABLE_FRILLS || ISO_14755 1791#if ENABLE_FRILLS || ISO_14755
1792 if (iso14755buf)
1793 {
1680 iso14755buf = 0; 1794 iso14755buf = 0;
1681#endif
1682#if ENABLE_OVERLAY 1795# if ENABLE_OVERLAY
1683 scr_overlay_off (); 1796 scr_overlay_off ();
1797# endif
1798 }
1684#endif 1799#endif
1685#if USE_XIM 1800#if USE_XIM
1686 if (Input_Context != NULL) 1801 if (Input_Context != NULL)
1687 XUnsetICFocus (Input_Context); 1802 XUnsetICFocus (Input_Context);
1688#endif 1803#endif
1689#if CURSOR_BLINK 1804#if CURSOR_BLINK
1690 if (options & Opt_cursorBlink) 1805 if (OPTION (Opt_cursorBlink))
1691 cursor_blink_ev.stop (); 1806 cursor_blink_ev.stop ();
1692 hidden_cursor = 0; 1807 hidden_cursor = 0;
1693#endif 1808#endif
1694#if OFF_FOCUS_FADING 1809#if OFF_FOCUS_FADING
1695 if (rs[Rs_fade]) 1810 if (rs[Rs_fade])
… …
1719 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1720 return; 1835 return;
1721 1836
1722 /* FALLTHROUGH */ 1837 /* FALLTHROUGH */
1723 case ReparentNotify: 1838 case ReparentNotify:
1724 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1725 want_refresh = want_full_refresh = 1; 1840 want_refresh = want_full_refresh = 1;
1726 break; 1841 break;
1727 } 1842 }
1728} 1843}
1729#endif 1844#endif
… …
1732rxvt_term::button_press (XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
1733{ 1848{
1734 int reportmode = 0, clickintime; 1849 int reportmode = 0, clickintime;
1735 1850
1736 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1851 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1852
1737 if (!bypass_keystate) 1853 if (!bypass_keystate)
1738 reportmode = !! (priv_modes & PrivMode_mouse_report); 1854 reportmode = !! (priv_modes & PrivMode_mouse_report);
1739 1855
1740 /* 1856 /*
1741 * VT window processing of button press 1857 * VT window processing of button press
… …
1761#ifdef MOUSE_REPORT_DOUBLECLICK 1877#ifdef MOUSE_REPORT_DOUBLECLICK
1762 if (ev.button == MEvent.button && clickintime) 1878 if (ev.button == MEvent.button && clickintime)
1763 { 1879 {
1764 /* same button, within alloted time */ 1880 /* same button, within alloted time */
1765 MEvent.clicks++; 1881 MEvent.clicks++;
1882
1766 if (MEvent.clicks > 1) 1883 if (MEvent.clicks > 1)
1767 { 1884 {
1768 /* only report double clicks */ 1885 /* only report double clicks */
1769 MEvent.clicks = 2; 1886 MEvent.clicks = 2;
1770 mouse_report (ev); 1887 mouse_report (ev);
… …
1790 else 1907 else
1791 { 1908 {
1792 if (ev.button != MEvent.button) 1909 if (ev.button != MEvent.button)
1793 MEvent.clicks = 0; 1910 MEvent.clicks = 0;
1794 1911
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1795 switch (ev.button) 1913 switch (ev.button)
1796 { 1914 {
1797 case Button1: 1915 case Button1:
1798 /* allow meta + click to select rectangular areas */ 1916 /* allow meta + click to select rectangular areas */
1799 /* should be done in screen.C */ 1917 /* should be done in screen.C */
1800#if ENABLE_FRILLS 1918#if ENABLE_FRILLS
1801 selection.rect = !!(ev.state & ModMetaMask); 1919 selection.rect = !!(ev.state & ModMetaMask);
1802#else 1920#else
1803 selection.rect = false; 1921 selection.rect = false;
1804#endif 1922#endif
1805 1923
1806 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1807 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1808 { 1926 {
1809 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1810 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1811 else 1929 else
1812 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1813 } 1931 }
1814 else 1932 else
1815 { 1933 {
1816 if (MEvent.button == Button1 && clickintime) 1934 if (MEvent.button == Button1 && clickintime)
1817 MEvent.clicks++; 1935 MEvent.clicks++;
1818 else 1936 else
1819 MEvent.clicks = 1; 1937 MEvent.clicks = 1;
1820 1938
1821 selection_click (MEvent.clicks, ev.x, ev.y); 1939 selection_click (MEvent.clicks, ev.x, ev.y);
1822 } 1940 }
1823 1941
1824 MEvent.button = Button1; 1942 MEvent.button = Button1;
1825 break; 1943 break;
1826 1944
1827 case Button3: 1945 case Button3:
1828 if (MEvent.button == Button3 && clickintime) 1946 if (MEvent.button == Button3 && clickintime)
1829 selection_rotate (ev.x, ev.y); 1947 selection_rotate (ev.x, ev.y);
1830 else 1948 else
1831 selection_extend (ev.x, ev.y, 1); 1949 selection_extend (ev.x, ev.y, 1);
1832 1950
1833 MEvent.button = Button3; 1951 MEvent.button = Button3;
1834 break; 1952 break;
1835 } 1953 }
1836 } 1954 }
1837 1955
1838 MEvent.time = ev.time; 1956 MEvent.time = ev.time;
1839 return; 1957 return;
1840 } 1958 }
1841 1959
… …
1977 } 2095 }
1978 2096
1979 break; 2097 break;
1980 } 2098 }
1981 } 2099 }
2100
1982 return; 2101 return;
1983 } 2102 }
2103
1984#if MENUBAR 2104#if MENUBAR
1985 /* 2105 /*
1986 * Menubar window processing of button press 2106 * Menubar window processing of button press
1987 */ 2107 */
1988 if (isMenuBarWindow (ev.window)) 2108 if (isMenuBarWindow (ev.window))
… …
2051 if (priv_modes & PrivMode_mouse_report 2171 if (priv_modes & PrivMode_mouse_report
2052 && bypass_keystate 2172 && bypass_keystate
2053 && ev.button == Button1 && MEvent.clicks <= 1) 2173 && ev.button == Button1 && MEvent.clicks <= 1)
2054 selection_extend (ev.x, ev.y, 0); 2174 selection_extend (ev.x, ev.y, 0);
2055 2175
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2056 switch (ev.button) 2179 switch (ev.button)
2057 { 2180 {
2058 case Button1: 2181 case Button1:
2059 case Button3: 2182 case Button3:
2060 selection_make (ev.time); 2183 selection_make (ev.time);
… …
2071 2194
2072 v = ev.button == Button4 ? UP : DN; 2195 v = ev.button == Button4 ? UP : DN;
2073 2196
2074 if (ev.state & ShiftMask) 2197 if (ev.state & ShiftMask)
2075 i = 1; 2198 i = 1;
2076 else if (options & Opt_mouseWheelScrollPage) 2199 else if (OPTION (Opt_mouseWheelScrollPage))
2077 i = nrow - 1; 2200 i = nrow - 1;
2078 else 2201 else
2079 i = 5; 2202 i = 5;
2080 2203
2081# ifdef MOUSE_SLIP_WHEELING 2204# ifdef MOUSE_SLIP_WHEELING
… …
2091 slip_wheel_ev.start (); 2214 slip_wheel_ev.start ();
2092 } 2215 }
2093 else 2216 else
2094 { 2217 {
2095# endif 2218# endif
2096# ifdef JUMP_MOUSE_WHEEL
2097 scr_page (v, i); 2219 scr_page (v, i);
2098 scr_refresh (SMOOTH_REFRESH);
2099 scrollbar_show (1); 2220 scrollbar_show (1);
2100# else
2101 while (i--)
2102 {
2103 scr_page (v, 1);
2104 scr_refresh (SMOOTH_REFRESH);
2105 scrollbar_show (1);
2106 }
2107# endif
2108# ifdef MOUSE_SLIP_WHEELING 2221# ifdef MOUSE_SLIP_WHEELING
2109 } 2222 }
2110#endif 2223# endif
2111 } 2224 }
2112 break; 2225 break;
2113#endif 2226#endif
2114 } 2227 }
2115 } 2228 }
… …
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
… …
2604 2717
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 wchar_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 {
… …
2635 if (seen_resize && cmd_pid) 2748 if (seen_resize && cmd_pid)
2636 kill (-cmd_pid, SIGWINCH); 2749 kill (-cmd_pid, SIGWINCH);
2637 } 2750 }
2638 2751
2639 /* Read a text string from the input buffer */ 2752 /* Read a text string from the input buffer */
2640 unicode_t buf[UBUFSIZ]; 2753 wchar_t buf[UBUFSIZ];
2641 bool refreshnow = false; 2754 bool refreshnow = false;
2642 int nlines = 0; 2755 int nlines = 0;
2643 unicode_t *str = buf; 2756 wchar_t *str = buf;
2644 unicode_t *eol = str + min (ncol, UBUFSIZ); 2757 wchar_t *eol = str + min (ncol, UBUFSIZ);
2645 2758
2646 for (;;) 2759 for (;;)
2647 { 2760 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2761 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649 break; 2762 break;
… …
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_WCS_LEN, buf, str - buf, DT_END)))
2671 scr_add_lines (buf, nlines, str - buf); 2786 scr_add_lines (buf, str - buf, nlines);
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_WCS_LEN, buf, str - buf, DT_END)))
2694 scr_add_lines (buf, nlines, str - buf); 2811 scr_add_lines (buf, str - buf, nlines);
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 want_refresh = 1;
2710 } 2828 }
2711 } 2829 }
2712 2830
2713 } 2831 }
2714 else 2832 else
… …
2729 } 2847 }
2730 2848
2731 return flag; 2849 return flag;
2732} 2850}
2733 2851
2734// read the next octet
2735unicode_t
2736rxvt_term::next_octet ()
2737{
2738 return cmdbuf_ptr < cmdbuf_endp
2739 ? *cmdbuf_ptr++
2740 : NOCHAR;
2741}
2742
2743// read the next character 2852// read the next character
2744unicode_t 2853wchar_t
2745rxvt_term::next_char () 2854rxvt_term::next_char ()
2746{ 2855{
2747 while (cmdbuf_ptr < cmdbuf_endp) 2856 while (cmdbuf_ptr < cmdbuf_endp)
2748 { 2857 {
2749 // assume 7-bit to be ascii ALWAYS 2858 // assume 7-bit to be ascii ALWAYS
2750 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2859 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2751 return *cmdbuf_ptr++; 2860 return *cmdbuf_ptr++;
2752 2861
2753 wchar_t wc; 2862 wchar_t wc;
2754 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2863 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2755 2864
2756 if (len == (size_t)-2) 2865 if (len == (size_t)-2)
2757 { 2866 {
2758 // the mbstate stores incomplete sequences. didn't know this :/ 2867 // the mbstate stores incomplete sequences. didn't know this :/
2759 cmdbuf_ptr = cmdbuf_endp; 2868 cmdbuf_ptr = cmdbuf_endp;
2760 break; 2869 break;
2761 } 2870 }
2762 2871
2763 if (len == (size_t)-1) 2872 if (len == (size_t)-1)
2764 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2873 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2765 2874
2766 // assume wchar == unicode 2875 // assume wchar == unicode
2767 cmdbuf_ptr += len; 2876 cmdbuf_ptr += len;
2768 return wc & UNICODE_MASK; 2877 return wc & UNICODE_MASK;
2769 } 2878 }
2770 2879
2771 return NOCHAR; 2880 return NOCHAR;
2881}
2882
2883// read the next octet
2884uint32_t
2885rxvt_term::next_octet ()
2886{
2887 return cmdbuf_ptr < cmdbuf_endp
2888 ? (unsigned char)*cmdbuf_ptr++
2889 : NOCHAR;
2772} 2890}
2773 2891
2774/* rxvt_cmd_getc () - Return next input character */ 2892/* rxvt_cmd_getc () - Return next input character */
2775/* 2893/*
2776 * Return the next input character after first passing any keyboard input 2894 * Return the next input character after first passing any keyboard input
2777 * to the command. 2895 * to the command.
2778 */ 2896 */
2779unicode_t 2897wchar_t
2780rxvt_term::cmd_getc () 2898rxvt_term::cmd_getc ()
2781{ 2899{
2782 unicode_t c = next_char (); 2900 wchar_t c = next_char ();
2783 2901
2784 if (c == NOCHAR) 2902 if (c == NOCHAR)
2785 throw out_of_input; 2903 throw out_of_input;
2786 2904
2787 return c; 2905 return c;
2788} 2906}
2789 2907
2790unicode_t 2908uint32_t
2791rxvt_term::cmd_get8 () 2909rxvt_term::cmd_get8 ()
2792{ 2910{
2793 unicode_t c = next_octet (); 2911 uint32_t c = next_octet ();
2794 2912
2795 if (c == NOCHAR) 2913 if (c == NOCHAR)
2796 throw out_of_input; 2914 throw out_of_input;
2797 2915
2798 return c; 2916 return c;
… …
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 */
… …
3067 break; 3183 break;
3068 3184
3069 /* 8.3.87: NEXT LINE */ 3185 /* 8.3.87: NEXT LINE */
3070 case C1_NEL: /* ESC E */ 3186 case C1_NEL: /* ESC E */
3071 { 3187 {
3072 unicode_t nlcr[] = { C0_LF, C0_CR }; 3188 wchar_t nlcr[] = { C0_LF, C0_CR };
3073 scr_add_lines (nlcr, 1, 2); 3189 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3074 } 3190 }
3075 break; 3191 break;
3076 3192
3077 /* kidnapped escape sequence: Should be 8.3.48 */ 3193 /* kidnapped escape sequence: Should be 8.3.48 */
3078 case C1_ESA: /* ESC G */ 3194 case C1_ESA: /* ESC G */
… …
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];
… …
3744 { 3858 {
3745 if ((name = strchr (buf, ';')) == NULL) 3859 if ((name = strchr (buf, ';')) == NULL)
3746 break; 3860 break;
3747 3861
3748 *name++ = '\0'; 3862 *name++ = '\0';
3749 color = atoi (buf); 3863 color = atoi (buf) + minCOLOR;
3750 3864
3751 if (color < 0 || color >= TOTAL_COLORS) 3865 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3752 break; 3866 break;
3753 3867
3754 if ((buf = strchr (name, ';')) != NULL) 3868 if ((buf = strchr (name, ';')) != NULL)
3755 *buf++ = '\0'; 3869 *buf++ = '\0';
3756 3870
3757 if (name[0] == '?' && !name[1]) 3871 if (name[0] == '?' && !name[1])
3758 { 3872 {
3759 unsigned short r, g, b; 3873 unsigned short r, g, b;
3760 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3874 pix_colors_focused[color].get (display, r, g, b);
3761 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3762 } 3876 }
3763 else 3877 else
3764 set_window_color (color + minCOLOR, name); 3878 set_window_color (color, name);
3765 } 3879 }
3766 break; 3880 break;
3767 case XTerm_Color00: 3881 case XTerm_Color00:
3768 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3882 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3769 break; 3883 break;
3770 case XTerm_Color01: 3884 case XTerm_Color01:
3771 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3885 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3772 break; 3886 break;
3773#ifndef NO_CURSORCOLOR 3887#ifndef NO_CURSORCOLOR
3774 case XTerm_Color_cursor: 3888 case XTerm_Color_cursor:
3775 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3776 break; 3890 break;
… …
3780 break; 3894 break;
3781 case XTerm_Color_pointer_bg: 3895 case XTerm_Color_pointer_bg:
3782 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3783 break; 3897 break;
3784#ifndef NO_BOLD_UNDERLINE_REVERSE 3898#ifndef NO_BOLD_UNDERLINE_REVERSE
3785 case XTerm_Color_BD:
3786 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3787 break;
3788 case XTerm_Color_UL:
3789 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3790 break;
3791 case XTerm_Color_RV: 3899 case XTerm_Color_RV:
3792 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3900 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3901 break;
3902 case Rxvt_Color_BD:
3903 case URxvt_Color_BD:
3904 process_color_seq (op, Color_BD, str, resp);
3905 break;
3906 case Rxvt_Color_UL:
3907 case URxvt_Color_UL:
3908 process_color_seq (op, Color_UL, str, resp);
3793 break; 3909 break;
3794 case URxvt_Color_IT: 3910 case URxvt_Color_IT:
3795 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3796 break; 3912 break;
3797#endif 3913#endif
… …
3802 if (am_transparent) 3918 if (am_transparent)
3803 want_full_refresh = want_refresh = 1; 3919 want_full_refresh = want_refresh = 1;
3804 break; 3920 break;
3805#endif 3921#endif
3806 3922
3807 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3808 if (*str != ';') 3924 if (*str != ';')
3809 { 3925 {
3810#if XPM_BACKGROUND 3926#if XPM_BACKGROUND
3811 scale_pixmap (""); /* reset to default scaling */ 3927 scale_pixmap (""); /* reset to default scaling */
3812 set_bgPixmap (str); /* change pixmap */ 3928 set_bgPixmap (str); /* change pixmap */
3813#endif
3814 scr_touch (true); 3929 scr_touch (true);
3930#endif
3815 } 3931 }
3932
3816 while ((str = strchr (str, ';')) != NULL) 3933 while ((str = strchr (str, ';')) != NULL)
3817 { 3934 {
3818 str++; 3935 str++;
3819#if XPM_BACKGROUND 3936#if XPM_BACKGROUND
3820 changed += scale_pixmap (str); 3937 changed += scale_pixmap (str);
… …
3823 3940
3824 if (changed) 3941 if (changed)
3825 { 3942 {
3826#ifdef XPM_BACKGROUND 3943#ifdef XPM_BACKGROUND
3827 resize_pixmap (); 3944 resize_pixmap ();
3828#endif
3829 scr_touch (true); 3945 scr_touch (true);
3946#endif
3830 } 3947 }
3831 break; 3948 break;
3832 3949
3833 case XTerm_restoreFG: 3950 case Rxvt_restoreFG:
3834 set_window_color (Color_fg, str); 3951 set_window_color (Color_fg, str);
3835 break; 3952 break;
3836 case XTerm_restoreBG: 3953 case Rxvt_restoreBG:
3837 set_window_color (Color_bg, str); 3954 set_window_color (Color_bg, str);
3838 break; 3955 break;
3839 3956
3840 case XTerm_logfile: 3957 case XTerm_logfile:
3841 // TODO, when secure mode? 3958 // TODO, when secure mode?
3842 break; 3959 break;
3843 3960
3844#ifdef MENUBAR 3961#ifdef MENUBAR
3845 case URxvt_Menu: 3962 case URxvt_Menu:
3846 if (options & Opt_insecure) 3963 if (OPTION (Opt_insecure))
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3848 break; 3965 break;
3849#endif 3966#endif
3850#if 0 3967#if 0
3851 case XTerm_dumpscreen: /* no error notices */ 3968 case Rxvt_dumpscreen: /* no error notices */
3852 { 3969 {
3853 int fd; 3970 int fd;
3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3855 { 3972 {
3856 scr_dump (fd); 3973 scr_dump (fd);
… …
3867 case URxvt_italicFont: 3984 case URxvt_italicFont:
3868 case URxvt_boldItalicFont: 3985 case URxvt_boldItalicFont:
3869#endif 3986#endif
3870 if (query) 3987 if (query)
3871 tt_printf ("\33]%d;%-.250s%c", saveop, 3988 tt_printf ("\33]%d;%-.250s%c", saveop,
3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3989 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3873 ? fontset[op - URxvt_font]->fontdesc : "", 3990 ? fontset[op - URxvt_font]->fontdesc : "",
3874 resp); 3991 resp);
3875 else 3992 else
3876 { 3993 {
3877 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3994 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3883 break; 4000 break;
3884 4001
3885#if ENABLE_FRILLS 4002#if ENABLE_FRILLS
3886 case URxvt_locale: 4003 case URxvt_locale:
3887 if (query) 4004 if (query)
3888 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 4005 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3889 else 4006 else
3890 { 4007 {
3891 set_locale (str); 4008 set_locale (str);
3892 pty.set_utf8_mode (enc_utf8); 4009 pty.set_utf8_mode (enc_utf8);
3893 init_xlocale (); 4010 init_xlocale ();
3894 } 4011 }
3895 break; 4012 break;
3896 4013
3897 case URxvt_view_up: 4014 case URxvt_view_up:
3898 case URxvt_view_down: 4015 case URxvt_view_down:
4016 {
3899 int lines = atoi (str); 4017 int lines = atoi (str);
3900 4018
3901 if (lines) 4019 if (lines)
3902 scr_page (op == URxvt_view_up ? UP : DN, lines); 4020 scr_page (op == URxvt_view_up ? UP : DN, lines);
3903 else 4021 else
3904 {
3905 scr_erase_savelines (); 4022 scr_erase_savelines ();
3906 } 4023 }
3907 4024
4025 break;
4026#endif
4027
4028#if ENABLE_PERL
4029 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4031 ; // no responses yet
3908 break; 4032 break;
3909#endif 4033#endif
3910 } 4034 }
3911} 4035}
3912/*----------------------------------------------------------------------*/ 4036/*----------------------------------------------------------------------*/
… …
4021 } 4145 }
4022 4146
4023 /* extra handling for values with state unkept */ 4147 /* extra handling for values with state unkept */
4024 switch (arg[i]) 4148 switch (arg[i])
4025 { 4149 {
4150#if ENABLE_STYLES
4151 case 1021:
4152 set_option (Opt_intensityStyles, mode);
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)
4054 options &= ~Opt_jumpScroll;
4055 else
4056 options |= Opt_jumpScroll; 4184 set_option (Opt_jumpScroll, !state);
4057 break; 4185 break;
4058 case 5: /* reverse video */ 4186 case 5: /* reverse video */
4059 scr_rvideo_mode (state); 4187 scr_rvideo_mode (state);
4060 break; 4188 break;
4061 case 6: /* relative/absolute origins */ 4189 case 6: /* relative/absolute origins */
… …
4102#if 0 4230#if 0
4103 case 1001: 4231 case 1001:
4104 break; /* X11 mouse highlighting */ 4232 break; /* X11 mouse highlighting */
4105#endif 4233#endif
4106 case 1010: /* scroll to bottom on TTY output inhibit */ 4234 case 1010: /* scroll to bottom on TTY output inhibit */
4107 if (state)
4108 options &= ~Opt_scrollTtyOutput;
4109 else
4110 options |= Opt_scrollTtyOutput; 4235 set_option (Opt_scrollTtyOutput, !state);
4111 break; 4236 break;
4112 case 1011: /* scroll to bottom on key press */ 4237 case 1011: /* scroll to bottom on key press */
4113 if (state)
4114 options |= Opt_scrollTtyKeypress; 4238 set_option (Opt_scrollTtyKeypress, state);
4115 else
4116 options &= ~Opt_scrollTtyKeypress;
4117 break; 4239 break;
4118 case 1047: /* secondary screen w/ clearing last */ 4240 case 1047: /* secondary screen w/ clearing last */
4119 if (options & Opt_secondaryScreen) 4241 if (OPTION (Opt_secondaryScreen))
4120 if (current_screen != PRIMARY) 4242 if (current_screen != PRIMARY)
4121 scr_erase_screen (2); 4243 scr_erase_screen (2);
4122 scr_change_screen (state); 4244 scr_change_screen (state);
4123 break; 4245 break;
4124 case 1049: /* secondary screen w/ clearing first */ 4246 case 1049: /* secondary screen w/ clearing first */
4125 scr_change_screen (state); 4247 scr_change_screen (state);
4126 if (options & Opt_secondaryScreen) 4248 if (OPTION (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 4249 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 4250 scr_erase_screen (2);
4129 break; 4251 break;
4130 default: 4252 default:
4131 break; 4253 break;
… …
4259 scr_color (Color_bg, Color_bg); 4381 scr_color (Color_bg, Color_bg);
4260 break; 4382 break;
4261 4383
4262 //case 50: // not variable spacing 4384 //case 50: // not variable spacing
4263 4385
4264#ifndef NO_BRIGHTCOLOR 4386#if ENABLE_FRILLS
4265 case 90: 4387 case 90:
4266 case 91: /* set bright fg color */ 4388 case 91: /* set bright fg color */
4267 case 92: 4389 case 92:
4268 case 93: 4390 case 93:
4269 case 94: 4391 case 94:
… …
4281 case 106: 4403 case 106:
4282 case 107: 4404 case 107:
4283 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4405 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4284 break; 4406 break;
4285#endif 4407#endif
4286
4287 } 4408 }
4288 } 4409 }
4289} 4410}
4290/*}}} */ 4411/*}}} */
4291 4412
… …
4315 */ 4436 */
4316void 4437void
4317rxvt_term::tt_printf (const char *fmt,...) 4438rxvt_term::tt_printf (const char *fmt,...)
4318{ 4439{
4319 va_list arg_ptr; 4440 va_list arg_ptr;
4320 unsigned char buf[256]; 4441 char buf[256];
4321 4442
4322 va_start (arg_ptr, fmt); 4443 va_start (arg_ptr, fmt);
4323 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4444 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4324 va_end (arg_ptr); 4445 va_end (arg_ptr);
4325 tt_write (buf, strlen (buf)); 4446 tt_write (buf, strlen (buf));
… …
4330 * or generated by us in response to a query ESC sequence. 4451 * or generated by us in response to a query ESC sequence.
4331 */ 4452 */
4332const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4453const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4333 4454
4334void 4455void
4335rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4456rxvt_term::tt_write (const char *data, unsigned int len)
4336{ 4457{
4458 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4459 return;
4460
4461 if (pty.pty < 0)
4462 return;
4463
4337 if (v_buflen == 0) 4464 if (v_buflen == 0)
4338 { 4465 {
4339 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4466 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4340 4467
4341 if ((unsigned int)written == len) 4468 if ((unsigned int)written == len)
… …
4343 4470
4344 data += written; 4471 data += written;
4345 len -= written; 4472 len -= written;
4346 } 4473 }
4347 4474
4348 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4475 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4349 4476
4350 memcpy (v_buffer + v_buflen, data, len); 4477 memcpy (v_buffer + v_buflen, data, len);
4351 v_buflen += len; 4478 v_buflen += len;
4352 4479
4353 pty_ev.set (EVENT_READ | EVENT_WRITE); 4480 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4372 } 4499 }
4373 4500
4374 memmove (v_buffer, v_buffer + written, v_buflen); 4501 memmove (v_buffer, v_buffer + written, v_buflen);
4375 } 4502 }
4376 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4503 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4377 // original code just ignores this... 4504 pty_ev.set (EVENT_READ);
4378 destroy ();
4379} 4505}
4380 4506
4381/*----------------------- end-of-file (C source) -----------------------*/ 4507/*----------------------- end-of-file (C source) -----------------------*/
4382 4508

Diff Legend

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