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.222 by root, Sat Dec 31 19:35:56 2005 UTC vs.
Revision 1.268 by root, Tue Jan 17 05:47:42 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(y - 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 {
… …
262 mb[0] = ch[0]; 268 mb[0] = ch[0];
263 len = 1; 269 len = 1;
264 } 270 }
265 271
266 if (len > 0) 272 if (len > 0)
267 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
268 else 274 else
269 scr_bell (); 275 scr_bell ();
270 } 276 }
271 277
272 iso14755buf = 0; 278 iso14755buf = 0;
… …
300 KeySym keysym; 306 KeySym keysym;
301#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
302 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
303#endif 309#endif
304 int valid_keysym; 310 int valid_keysym;
305 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
306 312
307 /* 313 /*
308 * 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
309 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
310 * 316 *
… …
328 Status status_return; 334 Status status_return;
329 335
330#if 0 336#if 0
331#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
332 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
333 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
334 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
335 else 341 else
336#endif 342#endif
337#endif 343#endif
338 { 344 {
… …
375 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
376 } 382 }
377 else 383 else
378#endif 384#endif
379 { 385 {
380 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
381 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
382 } 388 }
383 389
384 if (valid_keysym) 390 if (valid_keysym)
385 { 391 {
… …
437 scr_move_to (0, 1); 443 scr_move_to (0, 1);
438 return; 444 return;
439 } 445 }
440 else if (keysym == XK_End) 446 else if (keysym == XK_End)
441 { 447 {
442 scr_move_to (1, 0); 448 scr_move_to (1, 1);
443 return; 449 return;
444 } 450 }
445 } 451 }
446#endif 452#endif
447 } 453 }
… …
849 { 855 {
850#ifdef META8_OPTION 856#ifdef META8_OPTION
851 /* set 8-bit on */ 857 /* set 8-bit on */
852 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
853 { 859 {
854 unsigned char *ch; 860 char *ch;
855 861
856 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
857 *ch |= 0x80; 863 *ch |= 0x80;
858 864
859 meta = 0; 865 meta = 0;
860 } 866 }
861#endif 867#endif
862 /* nil */ ; 868 /* nil */ ;
863 } 869 }
864 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
865 874
866 if (len <= 0) 875 if (len <= 0)
867 return; /* not mapped */ 876 return; /* not mapped */
868 877
869 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
892#ifdef META8_OPTION 901#ifdef META8_OPTION
893 && meta_char == C0_ESC 902 && meta_char == C0_ESC
894#endif 903#endif
895 ) 904 )
896 { 905 {
897 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
898 tt_write (&ch, 1); 907 tt_write (&ch, 1);
899 } 908 }
900 909
901#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
902 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
910#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
911 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
912} 921}
913/*}}} */ 922/*}}} */
914 923
915#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if defined (KEYSYM_RESOURCE)
916/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
917/* attempt to `write' count to the input buffer */
918unsigned int 925unsigned int
919rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
920{ 927{
921 unsigned int n, s; 928 unsigned int n, s;
922 929
923 n = cmdbuf_ptr - cmdbuf_base; 930 n = cmdbuf_ptr - cmdbuf_base;
924 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 931 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
961 } 968 }
962#endif 969#endif
963 970
964 if (want_refresh) 971 if (want_refresh)
965 { 972 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 {
975 int row = view_start;
976 int end_row = row + nrow;
977
978 while (row > top_row && ROW (row - 1).is_longer ())
979 --row;
980
981 do
982 {
983 int start_row = row;
984 line_t *l;
985
986 do
987 {
988 l = &ROW (row++);
989
990 if (!(l->f & LINE_FILTERED))
991 {
992 // line not filtered, mark it as filtered
993 l->f |= LINE_FILTERED;
994 while (l->is_longer ())
995 {
996 l = &ROW (row++);
997 l->f |= LINE_FILTERED;
998 }
999
1000 // and filter it
1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1002
1003 break;
1004 }
1005 }
1006 while (l->is_longer () && row < end_row);
1007 }
1008 while (row < end_row);
1009 }
1010
966 scr_refresh (refresh_type); 1011 scr_refresh ();
967 scrollbar_show (1); 1012 scrollbar_show (1);
968#ifdef USE_XIM 1013#ifdef USE_XIM
969 IMSendSpot (); 1014 IMSendSpot ();
970#endif 1015#endif
971 } 1016 }
… …
974} 1019}
975 1020
976void 1021void
977rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
978{ 1023{
979 SET_R (this); 1024 make_current ();
980 SET_LOCALE (locale);
981 1025
982 display->flush (); 1026 display->flush ();
983 1027
984 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
985 flush_ev.start (NOW + 0.01); 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
986} 1030}
987 1031
988void 1032void
989rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
990{ 1034{
991 SET_R (this); 1035 make_current ();
992 SET_LOCALE (locale);
993 1036
994 refresh_limit = 1; 1037 refresh_limit = 1;
995 refresh_count = 0; 1038 refresh_count = 0;
996 flush (); 1039 flush ();
997} 1040}
… …
1025rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
1026{ 1069{
1027 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1028 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1029 { 1072 {
1030 refresh_type |= SMOOTH_REFRESH;
1031 want_refresh = 1; 1073 want_refresh = 1;
1032 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1033 } 1075 }
1034} 1076}
1035#endif 1077#endif
… …
1039rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
1040{ 1082{
1041 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1042 { 1084 {
1043 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1044 refresh_type |= SMOOTH_REFRESH;
1045 want_refresh = 1; 1086 want_refresh = 1;
1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1047 } 1088 }
1048} 1089}
1049#endif 1090#endif
… …
1054{ 1095{
1055 if (mouse_slip_wheel_speed == 0 1096 if (mouse_slip_wheel_speed == 0
1056 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1057 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1058 { 1099 {
1059 if (view_start == nsaved || 1100 if (view_start == top_row || view_start == 0)
1060 view_start == 0)
1061 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1062 1102
1063 refresh_type |= SMOOTH_REFRESH;
1064 want_refresh = 1; 1103 want_refresh = 1;
1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1066 } 1105 }
1067} 1106}
1068#endif 1107#endif
1069 1108
1109#if HAVE_SCHED_YIELD
1110static struct event_handler
1111{
1112 check_watcher cw_yield;
1113
1114 void yield (check_watcher &w)
1115 {
1116 sched_yield ();
1117 w.stop ();
1118 }
1119
1120 event_handler ()
1121 : cw_yield (this, &event_handler::yield)
1122 {
1123 }
1124} event_handler;
1125#endif
1126
1070bool 1127bool
1071rxvt_term::pty_fill () 1128rxvt_term::pty_fill ()
1072{ 1129{
1073 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1130 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1074 1131
1075 if (CBUFSIZ == n) 1132 if (CBUFSIZ == n)
1076 { 1133 {
1077 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1134 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1078 n = 0; 1135 n = 0;
1079 } 1136 }
1080 1137
1081 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
1082 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
1083 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
1084 1141
1085 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1142 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1086 1143
1087 if (n > 0) 1144 if (r > 0)
1088 { 1145 {
1089 cmdbuf_endp += n; 1146 cmdbuf_endp += r;
1090 return true; 1147 return true;
1091 } 1148 }
1092 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 {
1151#if HAVE_SCHED_YIELD
1152 if (display->is_local)
1153 event_handler.cw_yield.start ();
1154#endif
1155 }
1156 else
1093 { 1157 {
1094 pty_ev.stop (); 1158 pty_ev.stop ();
1095 1159
1096 if (!OPTION (Opt_hold)) 1160 if (!OPTION (Opt_hold))
1097 destroy (); 1161 destroy ();
… …
1101} 1165}
1102 1166
1103void 1167void
1104rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
1105{ 1169{
1106 SET_R (this); 1170 make_current ();
1107 SET_LOCALE (locale);
1108 1171
1109 if (revents & EVENT_READ) 1172 if (revents & EVENT_READ)
1110 // loop, but don't allow a single term to monopolize us 1173 // loop, but don't allow a single term to monopolize us
1111 while (pty_fill ()) 1174 while (pty_fill ())
1112 if (cmd_parse ()) 1175 if (cmd_parse ())
… …
1132 1195
1133#ifdef POINTER_BLANK 1196#ifdef POINTER_BLANK
1134void 1197void
1135rxvt_term::pointer_blank () 1198rxvt_term::pointer_blank ()
1136{ 1199{
1137 if (! OPTION (Opt_pointerBlank)) 1200 if (!OPTION (Opt_pointerBlank))
1138 return; 1201 return;
1139 1202
1140 XDefineCursor (display->display, vt, display->blank_cursor); 1203 XDefineCursor (display->display, vt, display->blank_cursor);
1141 XFlush (display->display); 1204 XFlush (display->display);
1142 1205
… …
1144} 1207}
1145 1208
1146void 1209void
1147rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
1148{ 1211{
1149 SET_R (this); 1212 make_current ();
1150 SET_LOCALE (locale);
1151 1213
1152 pointer_blank (); 1214 pointer_blank ();
1153} 1215}
1154#endif 1216#endif
1155 1217
… …
1234 1296
1235/*{{{ process an X event */ 1297/*{{{ process an X event */
1236void 1298void
1237rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1238{ 1300{
1301 make_current ();
1302
1239 dDisp; 1303 dDisp;
1240 1304
1241 SET_R (this); 1305 if (ev.xany.window == vt
1242 SET_LOCALE (locale); 1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return;
1243 1309
1244#if defined(CURSOR_BLINK) 1310 // for XQueryPointer
1245 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1246 {
1247 if (hidden_cursor)
1248 {
1249 hidden_cursor = 0;
1250 want_refresh = 1;
1251 }
1252
1253 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1254 }
1255#endif
1256
1257#if defined(POINTER_BLANK)
1258 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1259 {
1260 if (ev.type == MotionNotify
1261 || ev.type == ButtonPress
1262 || ev.type == ButtonRelease)
1263 if (hidden_pointer)
1264 pointer_unblank ();
1265
1266 if (ev.type == KeyPress && hidden_pointer == 0)
1267 pointer_blank ();
1268 }
1269#endif
1270
1271 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
1272 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
1273 unsigned int unused_mask; 1313 unsigned int unused_mask;
1274 1314
1275 switch (ev.type) 1315 switch (ev.type)
… …
1282 1322
1283 break; 1323 break;
1284 1324
1285 case KeyRelease: 1325 case KeyRelease:
1286 { 1326 {
1287#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1288 KeySym ks; 1328 KeySym keysym;
1289 1329
1290 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1291#endif 1331#endif
1292 1332
1293#if ENABLE_FRILLS || ISO_14755 1333#if ENABLE_FRILLS || ISO_14755
1294 // ISO 14755 support 1334 // ISO 14755 support
1295 if (iso14755buf) 1335 if (iso14755buf)
… …
1300# endif 1340# endif
1301# if ISO_14755 1341# if ISO_14755
1302 // iso14755 part 5.2 handling: release time 1342 // iso14755 part 5.2 handling: release time
1303 // first: controls 1343 // first: controls
1304 if ((ev.xkey.state & ControlMask) 1344 if ((ev.xkey.state & ControlMask)
1305 && ((ks >= 0x40 && ks <= 0x5f) 1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1306 || (ks >= 0x61 && ks <= 0x7f))) 1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1307 { 1347 {
1308 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1309 commit_iso14755 (); 1349 commit_iso14755 ();
1310 return; // case-break; 1350 goto skip_switch;
1311 } 1351 }
1312 1352
1313 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1314 if (i[0] == ks) 1354 if (i[0] == keysym)
1315 { 1355 {
1316 iso14755buf = ISO_14755_51 | i[1]; 1356 iso14755buf = ISO_14755_51 | i[1];
1317 commit_iso14755 (); 1357 commit_iso14755 ();
1318 return; // case-break; 1358 goto skip_switch;
1319 } 1359 }
1320 1360
1321 scr_bell (); 1361 scr_bell ();
1322# endif 1362# endif
1323 iso14755buf = 0; 1363 iso14755buf = 0;
… …
1342 else 1382 else
1343 iso14755buf = 0; 1383 iso14755buf = 0;
1344 } 1384 }
1345#endif 1385#endif
1346 1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1347#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1348 if (!(ev.xkey.state & ControlMask)) 1392 if (!(ev.xkey.state & ControlMask))
1349 slip_wheel_ev.stop (); 1393 slip_wheel_ev.stop ();
1350 else if (ks == XK_Control_L || ks == XK_Control_R) 1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1351 mouse_slip_wheel_speed = 0; 1395 mouse_slip_wheel_speed = 0;
1352#endif 1396#endif
1353 break; 1397 break;
1354 } 1398 }
1355 1399
… …
1485 1529
1486 case SelectionRequest: 1530 case SelectionRequest:
1487 selection_send (ev.xselectionrequest); 1531 selection_send (ev.xselectionrequest);
1488 break; 1532 break;
1489 1533
1534 case MapNotify:
1535 mapped = 1;
1536#ifdef TEXT_BLINK
1537 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1538#endif
1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1540 break;
1541
1490 case UnmapNotify: 1542 case UnmapNotify:
1491 mapped = 0; 1543 mapped = 0;
1492#ifdef TEXT_BLINK 1544#ifdef TEXT_BLINK
1493 text_blink_ev.stop (); 1545 text_blink_ev.stop ();
1494#endif 1546#endif
1495 break; 1547 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1496
1497 case MapNotify:
1498 mapped = 1;
1499#ifdef TEXT_BLINK
1500 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1501#endif
1502 break; 1548 break;
1503 1549
1504#ifdef TRANSPARENT 1550#ifdef TRANSPARENT
1505 case ReparentNotify: 1551 case ReparentNotify:
1506 rootwin_cb (ev); 1552 rootwin_cb (ev);
… …
1520 1566
1521 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1568 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1569 ev.xexpose.width, ev.xexpose.height, False);
1524 1570
1525 scr_refresh (refresh_type); 1571 want_refresh = 1;
1526 } 1572 }
1527 else 1573 else
1528 { 1574 {
1529 XEvent unused_event; 1575 XEvent unused_event;
1530 1576
… …
1536 if (isScrollbarWindow (ev.xany.window)) 1582 if (isScrollbarWindow (ev.xany.window))
1537 { 1583 {
1538 scrollBar.setIdle (); 1584 scrollBar.setIdle ();
1539 scrollbar_show (0); 1585 scrollbar_show (0);
1540 } 1586 }
1541#ifdef MENUBAR
1542 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1543 menubar_expose ();
1544#endif
1545 1587
1546#ifdef TRANSPARENT 1588#ifdef TRANSPARENT
1547 if (am_transparent && ev.xany.window == parent[0]) 1589 if (am_transparent && ev.xany.window == parent[0])
1548 XClearWindow (disp, ev.xany.window); 1590 XClearWindow (disp, ev.xany.window);
1549#endif 1591#endif
… …
1553 case MotionNotify: 1595 case MotionNotify:
1554#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1555 if (hidden_pointer) 1597 if (hidden_pointer)
1556 pointer_unblank (); 1598 pointer_unblank ();
1557#endif 1599#endif
1558#if MENUBAR
1559 if (isMenuBarWindow (ev.xany.window))
1560 {
1561 menubar_control (ev.xbutton);
1562 break;
1563 }
1564#endif
1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1600 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1566 break; 1601 break;
1567 1602
1568 if (ev.xany.window == vt) 1603 if (ev.xany.window == vt)
1569 { 1604 {
1605 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1606 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1607 ; // nop
1570 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1608 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1571 { 1609 {
1572 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1610 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1573 ; 1611 ;
1574 1612
1575 XQueryPointer (disp, vt, 1613 XQueryPointer (disp, vt,
… …
1655 &unused_root_x, &unused_root_y, 1693 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1694 &ev.xbutton.x, &ev.xbutton.y,
1657 &unused_mask); 1695 &unused_mask);
1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1696 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1659 scrollbar_size ()); 1697 scrollbar_size ());
1660 scr_refresh (refresh_type); 1698 want_refresh = 1;
1661 refresh_limit = 0; 1699 refresh_limit = 0;
1662 scrollbar_show (1); 1700 scrollbar_show (1);
1663 } 1701 }
1664 break; 1702 break;
1665 } 1703 }
1704
1705skip_switch: ;
1706
1707#if defined(CURSOR_BLINK)
1708 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1709 {
1710 if (hidden_cursor)
1711 {
1712 hidden_cursor = 0;
1713 want_refresh = 1;
1714 }
1715
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1717 }
1718#endif
1719
1720#if defined(POINTER_BLANK)
1721 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1722 {
1723 if (ev.type == MotionNotify
1724 || ev.type == ButtonPress
1725 || ev.type == ButtonRelease)
1726 if (hidden_pointer)
1727 pointer_unblank ();
1728
1729 if (ev.type == KeyPress && hidden_pointer == 0)
1730 pointer_blank ();
1731 }
1732#endif
1666} 1733}
1667 1734
1668void 1735void
1669rxvt_term::focus_in () 1736rxvt_term::focus_in ()
1670{ 1737{
1671 if (!focus) 1738 if (!focus)
1672 { 1739 {
1673 focus = 1; 1740 focus = 1;
1674 want_refresh = 1; 1741 want_refresh = 1;
1742
1743 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1744
1675#if USE_XIM 1745#if USE_XIM
1676 if (Input_Context != NULL) 1746 if (Input_Context != NULL)
1677 { 1747 {
1678 IMSetStatusPosition (); 1748 IMSetStatusPosition ();
1679 XSetICFocus (Input_Context); 1749 XSetICFocus (Input_Context);
… …
1699 if (focus) 1769 if (focus)
1700 { 1770 {
1701 focus = 0; 1771 focus = 0;
1702 want_refresh = 1; 1772 want_refresh = 1;
1703 1773
1774 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1775
1704#if ENABLE_FRILLS || ISO_14755 1776#if ENABLE_FRILLS || ISO_14755
1777 if (iso14755buf)
1778 {
1705 iso14755buf = 0; 1779 iso14755buf = 0;
1706#endif
1707#if ENABLE_OVERLAY 1780# if ENABLE_OVERLAY
1708 scr_overlay_off (); 1781 scr_overlay_off ();
1782# endif
1783 }
1709#endif 1784#endif
1710#if USE_XIM 1785#if USE_XIM
1711 if (Input_Context != NULL) 1786 if (Input_Context != NULL)
1712 XUnsetICFocus (Input_Context); 1787 XUnsetICFocus (Input_Context);
1713#endif 1788#endif
… …
1728 1803
1729#if TRANSPARENT 1804#if TRANSPARENT
1730void 1805void
1731rxvt_term::rootwin_cb (XEvent &ev) 1806rxvt_term::rootwin_cb (XEvent &ev)
1732{ 1807{
1733 SET_R (this); 1808 make_current ();
1734 SET_LOCALE (locale);
1735 1809
1736 switch (ev.type) 1810 switch (ev.type)
1737 { 1811 {
1738 case PropertyNotify: 1812 case PropertyNotify:
1739 /* 1813 /*
… …
1757rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
1758{ 1832{
1759 int reportmode = 0, clickintime; 1833 int reportmode = 0, clickintime;
1760 1834
1761 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1835 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1836
1762 if (!bypass_keystate) 1837 if (!bypass_keystate)
1763 reportmode = !! (priv_modes & PrivMode_mouse_report); 1838 reportmode = !! (priv_modes & PrivMode_mouse_report);
1764 1839
1765 /* 1840 /*
1766 * VT window processing of button press 1841 * VT window processing of button press
… …
1786#ifdef MOUSE_REPORT_DOUBLECLICK 1861#ifdef MOUSE_REPORT_DOUBLECLICK
1787 if (ev.button == MEvent.button && clickintime) 1862 if (ev.button == MEvent.button && clickintime)
1788 { 1863 {
1789 /* same button, within alloted time */ 1864 /* same button, within alloted time */
1790 MEvent.clicks++; 1865 MEvent.clicks++;
1866
1791 if (MEvent.clicks > 1) 1867 if (MEvent.clicks > 1)
1792 { 1868 {
1793 /* only report double clicks */ 1869 /* only report double clicks */
1794 MEvent.clicks = 2; 1870 MEvent.clicks = 2;
1795 mouse_report (ev); 1871 mouse_report (ev);
… …
1815 else 1891 else
1816 { 1892 {
1817 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
1818 MEvent.clicks = 0; 1894 MEvent.clicks = 0;
1819 1895
1896 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1820 switch (ev.button) 1897 switch (ev.button)
1821 { 1898 {
1822 case Button1: 1899 case Button1:
1823 /* allow meta + click to select rectangular areas */ 1900 /* allow meta + click to select rectangular areas */
1824 /* should be done in screen.C */ 1901 /* should be done in screen.C */
1825#if ENABLE_FRILLS 1902#if ENABLE_FRILLS
1826 selection.rect = !!(ev.state & ModMetaMask); 1903 selection.rect = !!(ev.state & ModMetaMask);
1827#else 1904#else
1828 selection.rect = false; 1905 selection.rect = false;
1829#endif 1906#endif
1830 1907
1831 /* allow shift+left click to extend selection */ 1908 /* allow shift+left click to extend selection */
1832 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1833 { 1910 {
1834 if (MEvent.button == Button1 && clickintime) 1911 if (MEvent.button == Button1 && clickintime)
1835 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1836 else 1913 else
1837 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
1838 } 1915 }
1839 else 1916 else
1840 { 1917 {
1841 if (MEvent.button == Button1 && clickintime) 1918 if (MEvent.button == Button1 && clickintime)
1842 MEvent.clicks++; 1919 MEvent.clicks++;
1843 else 1920 else
1844 MEvent.clicks = 1; 1921 MEvent.clicks = 1;
1845 1922
1846 selection_click (MEvent.clicks, ev.x, ev.y); 1923 selection_click (MEvent.clicks, ev.x, ev.y);
1847 } 1924 }
1848 1925
1849 MEvent.button = Button1; 1926 MEvent.button = Button1;
1850 break; 1927 break;
1851 1928
1852 case Button3: 1929 case Button3:
1853 if (MEvent.button == Button3 && clickintime) 1930 if (MEvent.button == Button3 && clickintime)
1854 selection_rotate (ev.x, ev.y); 1931 selection_rotate (ev.x, ev.y);
1855 else 1932 else
1856 selection_extend (ev.x, ev.y, 1); 1933 selection_extend (ev.x, ev.y, 1);
1857 1934
1858 MEvent.button = Button3; 1935 MEvent.button = Button3;
1859 break; 1936 break;
1860 } 1937 }
1861 } 1938 }
1862 1939
1863 MEvent.time = ev.time; 1940 MEvent.time = ev.time;
1864 return; 1941 return;
1865 } 1942 }
1866 1943
… …
2002 } 2079 }
2003 2080
2004 break; 2081 break;
2005 } 2082 }
2006 } 2083 }
2084
2007 return; 2085 return;
2008 } 2086 }
2009#if MENUBAR
2010 /*
2011 * Menubar window processing of button press
2012 */
2013 if (isMenuBarWindow (ev.window))
2014 menubar_control (ev);
2015#endif
2016} 2087}
2017 2088
2018void 2089void
2019rxvt_term::button_release (XButtonEvent &ev) 2090rxvt_term::button_release (XButtonEvent &ev)
2020{ 2091{
… …
2026 2097
2027 if (scrollbar_isUpDn ()) 2098 if (scrollbar_isUpDn ())
2028 { 2099 {
2029 scrollBar.setIdle (); 2100 scrollBar.setIdle ();
2030 scrollbar_show (0); 2101 scrollbar_show (0);
2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2032 refresh_type &= ~SMOOTH_REFRESH;
2033#endif
2034 } 2102 }
2035 2103
2036#ifdef SELECTION_SCROLLING 2104#ifdef SELECTION_SCROLLING
2037 if (sel_scroll_ev.active) 2105 if (sel_scroll_ev.active)
2038 sel_scroll_ev.stop(); 2106 sel_scroll_ev.stop();
… …
2076 if (priv_modes & PrivMode_mouse_report 2144 if (priv_modes & PrivMode_mouse_report
2077 && bypass_keystate 2145 && bypass_keystate
2078 && ev.button == Button1 && MEvent.clicks <= 1) 2146 && ev.button == Button1 && MEvent.clicks <= 1)
2079 selection_extend (ev.x, ev.y, 0); 2147 selection_extend (ev.x, ev.y, 0);
2080 2148
2149 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150 return;
2151
2081 switch (ev.button) 2152 switch (ev.button)
2082 { 2153 {
2083 case Button1: 2154 case Button1:
2084 case Button3: 2155 case Button3:
2085 selection_make (ev.time); 2156 selection_make (ev.time);
… …
2116 slip_wheel_ev.start (); 2187 slip_wheel_ev.start ();
2117 } 2188 }
2118 else 2189 else
2119 { 2190 {
2120# endif 2191# endif
2121# ifdef JUMP_MOUSE_WHEEL
2122 scr_page (v, i); 2192 scr_page (v, i);
2123 scr_refresh (SMOOTH_REFRESH);
2124 scrollbar_show (1); 2193 scrollbar_show (1);
2125# else
2126 while (i--)
2127 {
2128 scr_page (v, 1);
2129 scr_refresh (SMOOTH_REFRESH);
2130 scrollbar_show (1);
2131 }
2132# endif
2133# ifdef MOUSE_SLIP_WHEELING 2194# ifdef MOUSE_SLIP_WHEELING
2134 } 2195 }
2135#endif 2196# endif
2136 } 2197 }
2137 break; 2198 break;
2138#endif 2199#endif
2139 } 2200 }
2140 } 2201 }
2141#ifdef MENUBAR
2142 else if (isMenuBarWindow (ev.window))
2143 menubar_control (ev);
2144#endif
2145} 2202}
2146 2203
2147#ifdef TRANSPARENT 2204#ifdef TRANSPARENT
2148#if TINTING 2205#if TINTING
2149/* taken from aterm-0.4.2 */ 2206/* taken from aterm-0.4.2 */
… …
2629 2686
2630bool 2687bool
2631rxvt_term::cmd_parse () 2688rxvt_term::cmd_parse ()
2632{ 2689{
2633 bool flag = false; 2690 bool flag = false;
2634 unicode_t ch = NOCHAR; 2691 wchar_t ch = NOCHAR;
2635 unsigned char *seq_begin; // remember start of esc-sequence here 2692 char *seq_begin; // remember start of esc-sequence here
2636 2693
2637 for (;;) 2694 for (;;)
2638 { 2695 {
2639 if (ch == NOCHAR) 2696 if (ch == NOCHAR)
2640 { 2697 {
2641 seq_begin = cmdbuf_ptr; 2698 seq_begin = cmdbuf_ptr;
2642 ch = next_char (); 2699 ch = next_char ();
2643 }
2644 2700
2645 if (ch == NOCHAR) // TODO: improve 2701 if (ch == NOCHAR)
2646 break; 2702 break;
2703 }
2647 2704
2648 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2705 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2649 { 2706 {
2650 if (!seen_input) 2707 if (!seen_input)
2651 { 2708 {
… …
2660 if (seen_resize && cmd_pid) 2717 if (seen_resize && cmd_pid)
2661 kill (-cmd_pid, SIGWINCH); 2718 kill (-cmd_pid, SIGWINCH);
2662 } 2719 }
2663 2720
2664 /* Read a text string from the input buffer */ 2721 /* Read a text string from the input buffer */
2665 unicode_t buf[UBUFSIZ]; 2722 wchar_t buf[UBUFSIZ];
2666 bool refreshnow = false; 2723 bool refreshnow = false;
2667 int nlines = 0; 2724 int nlines = 0;
2668 unicode_t *str = buf; 2725 wchar_t *str = buf;
2669 unicode_t *eol = str + min (ncol, UBUFSIZ); 2726 wchar_t *eol = str + min (ncol, UBUFSIZ);
2670 2727
2671 for (;;) 2728 for (;;)
2672 { 2729 {
2673 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2730 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2674 break; 2731 break;
… …
2684 2741
2685 if (!OPTION (Opt_jumpScroll) 2742 if (!OPTION (Opt_jumpScroll)
2686 || (refresh_count >= refresh_limit * (nrow - 1))) 2743 || (refresh_count >= refresh_limit * (nrow - 1)))
2687 { 2744 {
2688 refreshnow = true; 2745 refreshnow = true;
2746 refresh_count = 0;
2689 ch = NOCHAR; 2747 ch = NOCHAR;
2690 break; 2748 break;
2691 } 2749 }
2692 2750
2693 // scr_add_lines only works for nlines <= nrow - 1. 2751 // scr_add_lines only works for nlines <= nrow - 1.
2694 if (nlines >= nrow - 1) 2752 if (nlines >= nrow - 1)
2695 { 2753 {
2754 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2755 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2696 scr_add_lines (buf, nlines, str - buf); 2756 scr_add_lines (buf, str - buf, nlines);
2757
2697 nlines = 0; 2758 nlines = 0;
2698 str = buf; 2759 str = buf;
2699 eol = str + min (ncol, UBUFSIZ); 2760 eol = str + min (ncol, UBUFSIZ);
2700 } 2761 }
2701 2762
… …
2714 2775
2715 seq_begin = cmdbuf_ptr; 2776 seq_begin = cmdbuf_ptr;
2716 ch = next_char (); 2777 ch = next_char ();
2717 } 2778 }
2718 2779
2780 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2781 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2719 scr_add_lines (buf, nlines, str - buf); 2782 scr_add_lines (buf, str - buf, nlines);
2720 2783
2721 /* 2784 /*
2722 * If there have been a lot of new lines, then update the screen 2785 * If there have been a lot of new lines, then update the screen
2723 * What the heck I'll cheat and only refresh less than every page-full. 2786 * What the heck I'll cheat and only refresh less than every page-full.
2724 * the number of pages between refreshes is refresh_limit, which 2787 * the number of pages between refreshes is refresh_limit, which
… …
2729 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2792 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2730 refresh_limit++; 2793 refresh_limit++;
2731 else 2794 else
2732 { 2795 {
2733 flag = true; 2796 flag = true;
2734 scr_refresh (refresh_type); 2797 scr_refresh ();
2798 want_refresh = 1;
2735 } 2799 }
2736 } 2800 }
2737 2801
2738 } 2802 }
2739 else 2803 else
… …
2754 } 2818 }
2755 2819
2756 return flag; 2820 return flag;
2757} 2821}
2758 2822
2759// read the next octet
2760unicode_t
2761rxvt_term::next_octet ()
2762{
2763 return cmdbuf_ptr < cmdbuf_endp
2764 ? *cmdbuf_ptr++
2765 : NOCHAR;
2766}
2767
2768// read the next character 2823// read the next character
2769unicode_t 2824wchar_t
2770rxvt_term::next_char () 2825rxvt_term::next_char ()
2771{ 2826{
2772 while (cmdbuf_ptr < cmdbuf_endp) 2827 while (cmdbuf_ptr < cmdbuf_endp)
2773 { 2828 {
2774 // assume 7-bit to be ascii ALWAYS 2829 // assume 7-bit to be ascii ALWAYS
2775 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2830 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2776 return *cmdbuf_ptr++; 2831 return *cmdbuf_ptr++;
2777 2832
2778 wchar_t wc; 2833 wchar_t wc;
2779 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2834 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2780 2835
2781 if (len == (size_t)-2) 2836 if (len == (size_t)-2)
2782 { 2837 {
2783 // the mbstate stores incomplete sequences. didn't know this :/ 2838 // the mbstate stores incomplete sequences. didn't know this :/
2784 cmdbuf_ptr = cmdbuf_endp; 2839 cmdbuf_ptr = cmdbuf_endp;
2785 break; 2840 break;
2786 } 2841 }
2787 2842
2788 if (len == (size_t)-1) 2843 if (len == (size_t)-1)
2789 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2844 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2790 2845
2791 // assume wchar == unicode 2846 // assume wchar == unicode
2792 cmdbuf_ptr += len; 2847 cmdbuf_ptr += len;
2793 return wc & UNICODE_MASK; 2848 return wc & UNICODE_MASK;
2794 } 2849 }
2795 2850
2796 return NOCHAR; 2851 return NOCHAR;
2852}
2853
2854// read the next octet
2855uint32_t
2856rxvt_term::next_octet ()
2857{
2858 return cmdbuf_ptr < cmdbuf_endp
2859 ? (unsigned char)*cmdbuf_ptr++
2860 : NOCHAR;
2797} 2861}
2798 2862
2799/* rxvt_cmd_getc () - Return next input character */ 2863/* rxvt_cmd_getc () - Return next input character */
2800/* 2864/*
2801 * Return the next input character after first passing any keyboard input 2865 * Return the next input character after first passing any keyboard input
2802 * to the command. 2866 * to the command.
2803 */ 2867 */
2804unicode_t 2868wchar_t
2805rxvt_term::cmd_getc () 2869rxvt_term::cmd_getc ()
2806{ 2870{
2807 unicode_t c = next_char (); 2871 wchar_t c = next_char ();
2808 2872
2809 if (c == NOCHAR) 2873 if (c == NOCHAR)
2810 throw out_of_input; 2874 throw out_of_input;
2811 2875
2812 return c; 2876 return c;
2813} 2877}
2814 2878
2815unicode_t 2879uint32_t
2816rxvt_term::cmd_get8 () 2880rxvt_term::cmd_get8 ()
2817{ 2881{
2818 unicode_t c = next_octet (); 2882 uint32_t c = next_octet ();
2819 2883
2820 if (c == NOCHAR) 2884 if (c == NOCHAR)
2821 throw out_of_input; 2885 throw out_of_input;
2822 2886
2823 return c; 2887 return c;
… …
2923 case C0_ESC: 2987 case C0_ESC:
2924 process_escape_seq (); 2988 process_escape_seq ();
2925 break; 2989 break;
2926 case C0_ENQ: /* terminal Status */ 2990 case C0_ENQ: /* terminal Status */
2927 if (rs[Rs_answerbackstring]) 2991 if (rs[Rs_answerbackstring])
2928 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2992 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2929 (unsigned int)strlen (rs[Rs_answerbackstring]));
2930 else 2993 else
2931 tt_write ((unsigned char *)VT100_ANS, 2994 tt_write (VT100_ANS, strlen (VT100_ANS));
2932 (unsigned int)strlen (VT100_ANS));
2933 break; 2995 break;
2934 case C0_BEL: /* bell */ 2996 case C0_BEL: /* bell */
2935 scr_bell (); 2997 scr_bell ();
2936 break; 2998 break;
2937 case C0_BS: /* backspace */ 2999 case C0_BS: /* backspace */
… …
3092 break; 3154 break;
3093 3155
3094 /* 8.3.87: NEXT LINE */ 3156 /* 8.3.87: NEXT LINE */
3095 case C1_NEL: /* ESC E */ 3157 case C1_NEL: /* ESC E */
3096 { 3158 {
3097 unicode_t nlcr[] = { C0_LF, C0_CR }; 3159 wchar_t nlcr[] = { C0_LF, C0_CR };
3098 scr_add_lines (nlcr, 1, 2); 3160 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3099 } 3161 }
3100 break; 3162 break;
3101 3163
3102 /* kidnapped escape sequence: Should be 8.3.48 */ 3164 /* kidnapped escape sequence: Should be 8.3.48 */
3103 case C1_ESA: /* ESC G */ 3165 case C1_ESA: /* ESC G */
… …
3125 process_dcs_seq (); 3187 process_dcs_seq ();
3126 break; 3188 break;
3127 3189
3128 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3190 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3129 case C1_SCI: /* ESC Z */ 3191 case C1_SCI: /* ESC Z */
3130 tt_write ((const unsigned char *)ESCZ_ANSWER, 3192 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3131 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3132 break; /* steal obsolete ESC [ c */ 3193 break; /* steal obsolete ESC [ c */
3133 3194
3134 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3195 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3135 case C1_CSI: /* ESC [ */ 3196 case C1_CSI: /* ESC [ */
3136 process_csi_seq (); 3197 process_csi_seq ();
… …
3380 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3441 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3381 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3442 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3382 break; 3443 break;
3383 3444
3384 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3445 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3385 tt_write ((const unsigned char *)VT100_ANS, 3446 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3386 (unsigned int) (sizeof (VT100_ANS) - 1));
3387 break; 3447 break;
3388 3448
3389 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3449 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3390 process_sgr_mode (nargs, arg); 3450 process_sgr_mode (nargs, arg);
3391 break; 3451 break;
… …
3593/*----------------------------------------------------------------------*/ 3653/*----------------------------------------------------------------------*/
3594/* 3654/*
3595 * get input up until STRING TERMINATOR (or BEL) 3655 * get input up until STRING TERMINATOR (or BEL)
3596 * ends_how is terminator used. returned input must be free()'d 3656 * ends_how is terminator used. returned input must be free()'d
3597 */ 3657 */
3598unsigned char * 3658char *
3599rxvt_term::get_to_st (unicode_t &ends_how) 3659rxvt_term::get_to_st (unicode_t &ends_how)
3600{ 3660{
3601 unicode_t ch; 3661 unicode_t ch;
3602 bool seen_esc = false; 3662 bool seen_esc = false;
3603 unsigned int n = 0; 3663 unsigned int n = 0;
… …
3636 3696
3637 string[n++] = '\0'; 3697 string[n++] = '\0';
3638 3698
3639 ends_how = (ch == 0x5c ? C0_ESC : ch); 3699 ends_how = (ch == 0x5c ? C0_ESC : ch);
3640 3700
3641 return (unsigned char *)rxvt_wcstombs (string); 3701 return rxvt_wcstombs (string);
3642} 3702}
3643 3703
3644/*----------------------------------------------------------------------*/ 3704/*----------------------------------------------------------------------*/
3645/* 3705/*
3646 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3706 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3647 */ 3707 */
3648void 3708void
3649rxvt_term::process_dcs_seq () 3709rxvt_term::process_dcs_seq ()
3650{ 3710{
3651 unsigned char *s; 3711 char *s;
3652 unicode_t eh; 3712 unicode_t eh;
3653 3713
3654 /* 3714 /*
3655 * Not handled yet 3715 * Not handled yet
3656 */ 3716 */
… …
3675 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3735 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3676 arg = arg * 10 + (ch - '0'); 3736 arg = arg * 10 + (ch - '0');
3677 3737
3678 if (ch == ';') 3738 if (ch == ';')
3679 { 3739 {
3680 unsigned char *s = get_to_st (eh); 3740 char *s = get_to_st (eh);
3681 3741
3682 if (s) 3742 if (s)
3683 { 3743 {
3684 process_xterm_seq (arg, (char *)s, eh); 3744 process_xterm_seq (arg, s, eh);
3685 free (s); 3745 free (s);
3686 } 3746 }
3687 } 3747 }
3688} 3748}
3689 3749
3690void 3750void
3691rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3751rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3692{ 3752{
3693 if (str[0] == '?' && !str[1]) 3753 if (str[0] == '?' && !str[1])
3694 { 3754 {
3695 unsigned short r, g, b; 3755 unsigned short r, g, b;
3696 pix_colors_focused[color].get (display, r, g, b); 3756 pix_colors_focused[color].get (display, r, g, b);
… …
3702 3762
3703/* 3763/*
3704 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3764 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3705 */ 3765 */
3706void 3766void
3707rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3767rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3708{ 3768{
3709 int changed = 0; 3769 int changed = 0;
3710 int color; 3770 int color;
3711 char *buf, *name; 3771 char *buf, *name;
3712 bool query = str[0] == '?' && !str[1]; 3772 bool query = str[0] == '?' && !str[1];
… …
3769 { 3829 {
3770 if ((name = strchr (buf, ';')) == NULL) 3830 if ((name = strchr (buf, ';')) == NULL)
3771 break; 3831 break;
3772 3832
3773 *name++ = '\0'; 3833 *name++ = '\0';
3774 color = atoi (buf); 3834 color = atoi (buf) + minCOLOR;
3775 3835
3776 if (color < 0 || color >= TOTAL_COLORS) 3836 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3777 break; 3837 break;
3778 3838
3779 if ((buf = strchr (name, ';')) != NULL) 3839 if ((buf = strchr (name, ';')) != NULL)
3780 *buf++ = '\0'; 3840 *buf++ = '\0';
3781 3841
3782 if (name[0] == '?' && !name[1]) 3842 if (name[0] == '?' && !name[1])
3783 { 3843 {
3784 unsigned short r, g, b; 3844 unsigned short r, g, b;
3785 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3845 pix_colors_focused[color].get (display, r, g, b);
3786 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3846 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3787 } 3847 }
3788 else 3848 else
3789 set_window_color (color + minCOLOR, name); 3849 set_window_color (color, name);
3790 } 3850 }
3791 break; 3851 break;
3792 case XTerm_Color00: 3852 case XTerm_Color00:
3793 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3853 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3794 break; 3854 break;
3795 case XTerm_Color01: 3855 case XTerm_Color01:
3796 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3856 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3797 break; 3857 break;
3798#ifndef NO_CURSORCOLOR 3858#ifndef NO_CURSORCOLOR
3799 case XTerm_Color_cursor: 3859 case XTerm_Color_cursor:
3800 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3860 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3801 break; 3861 break;
… …
3805 break; 3865 break;
3806 case XTerm_Color_pointer_bg: 3866 case XTerm_Color_pointer_bg:
3807 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3867 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3808 break; 3868 break;
3809#ifndef NO_BOLD_UNDERLINE_REVERSE 3869#ifndef NO_BOLD_UNDERLINE_REVERSE
3810 case XTerm_Color_BD:
3811 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3812 break;
3813 case XTerm_Color_UL:
3814 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3815 break;
3816 case XTerm_Color_RV: 3870 case XTerm_Color_RV:
3817 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3871 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3872 break;
3873 case Rxvt_Color_BD:
3874 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp);
3876 break;
3877 case Rxvt_Color_UL:
3878 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp);
3818 break; 3880 break;
3819 case URxvt_Color_IT: 3881 case URxvt_Color_IT:
3820 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3882 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3821 break; 3883 break;
3822#endif 3884#endif
… …
3827 if (am_transparent) 3889 if (am_transparent)
3828 want_full_refresh = want_refresh = 1; 3890 want_full_refresh = want_refresh = 1;
3829 break; 3891 break;
3830#endif 3892#endif
3831 3893
3832 case XTerm_Pixmap: 3894 case Rxvt_Pixmap:
3833 if (*str != ';') 3895 if (*str != ';')
3834 { 3896 {
3835#if XPM_BACKGROUND 3897#if XPM_BACKGROUND
3836 scale_pixmap (""); /* reset to default scaling */ 3898 scale_pixmap (""); /* reset to default scaling */
3837 set_bgPixmap (str); /* change pixmap */ 3899 set_bgPixmap (str); /* change pixmap */
3838#endif
3839 scr_touch (true); 3900 scr_touch (true);
3901#endif
3840 } 3902 }
3903
3841 while ((str = strchr (str, ';')) != NULL) 3904 while ((str = strchr (str, ';')) != NULL)
3842 { 3905 {
3843 str++; 3906 str++;
3844#if XPM_BACKGROUND 3907#if XPM_BACKGROUND
3845 changed += scale_pixmap (str); 3908 changed += scale_pixmap (str);
… …
3848 3911
3849 if (changed) 3912 if (changed)
3850 { 3913 {
3851#ifdef XPM_BACKGROUND 3914#ifdef XPM_BACKGROUND
3852 resize_pixmap (); 3915 resize_pixmap ();
3853#endif
3854 scr_touch (true); 3916 scr_touch (true);
3917#endif
3855 } 3918 }
3856 break; 3919 break;
3857 3920
3858 case XTerm_restoreFG: 3921 case Rxvt_restoreFG:
3859 set_window_color (Color_fg, str); 3922 set_window_color (Color_fg, str);
3860 break; 3923 break;
3861 case XTerm_restoreBG: 3924 case Rxvt_restoreBG:
3862 set_window_color (Color_bg, str); 3925 set_window_color (Color_bg, str);
3863 break; 3926 break;
3864 3927
3865 case XTerm_logfile: 3928 case XTerm_logfile:
3866 // TODO, when secure mode? 3929 // TODO, when secure mode?
3867 break; 3930 break;
3868 3931
3869#ifdef MENUBAR
3870 case URxvt_Menu:
3871 if (OPTION (Opt_insecure))
3872 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3873 break;
3874#endif
3875#if 0 3932#if 0
3876 case XTerm_dumpscreen: /* no error notices */ 3933 case Rxvt_dumpscreen: /* no error notices */
3877 { 3934 {
3878 int fd; 3935 int fd;
3879 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3936 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3880 { 3937 {
3881 scr_dump (fd); 3938 scr_dump (fd);
… …
3919 } 3976 }
3920 break; 3977 break;
3921 3978
3922 case URxvt_view_up: 3979 case URxvt_view_up:
3923 case URxvt_view_down: 3980 case URxvt_view_down:
3981 {
3924 int lines = atoi (str); 3982 int lines = atoi (str);
3925 3983
3926 if (lines) 3984 if (lines)
3927 scr_page (op == URxvt_view_up ? UP : DN, lines); 3985 scr_page (op == URxvt_view_up ? UP : DN, lines);
3928 else 3986 else
3929 {
3930 scr_erase_savelines (); 3987 scr_erase_savelines ();
3931 } 3988 }
3932 3989
3990 break;
3991#endif
3992
3993#if ENABLE_PERL
3994 case URxvt_perl:
3995 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3996 ; // no responses yet
3933 break; 3997 break;
3934#endif 3998#endif
3935 } 3999 }
3936} 4000}
3937/*----------------------------------------------------------------------*/ 4001/*----------------------------------------------------------------------*/
… …
3989 { 5, PrivMode_rVideo }, 4053 { 5, PrivMode_rVideo },
3990 { 6, PrivMode_relOrigin }, 4054 { 6, PrivMode_relOrigin },
3991 { 7, PrivMode_Autowrap }, 4055 { 7, PrivMode_Autowrap },
3992 // 8, bi-directional support mode 4056 // 8, bi-directional support mode
3993 { 9, PrivMode_MouseX10 }, 4057 { 9, PrivMode_MouseX10 },
3994#ifdef menuBar_esc
3995 { menuBar_esc, PrivMode_menuBar },
3996#endif
3997 // 18, 19 printing-related 4058 // 18, 19 printing-related
3998 { 25, PrivMode_VisibleCursor }, 4059 { 25, PrivMode_VisibleCursor },
3999#ifdef scrollBar_esc 4060#ifdef scrollBar_esc
4000 { scrollBar_esc, PrivMode_scrollBar }, 4061 { scrollBar_esc, PrivMode_scrollBar },
4001#endif 4062#endif
… …
4048 /* extra handling for values with state unkept */ 4109 /* extra handling for values with state unkept */
4049 switch (arg[i]) 4110 switch (arg[i])
4050 { 4111 {
4051#if ENABLE_STYLES 4112#if ENABLE_STYLES
4052 case 1021: 4113 case 1021:
4053 if (mode) 4114 set_option (Opt_intensityStyles, mode);
4054 SET_OPTION (Opt_intensityStyles);
4055 else
4056 CLR_OPTION (Opt_intensityStyles);
4057 4115
4058 want_refresh = 1; 4116 scr_touch (true);
4059 want_full_refresh = 1;
4060 break; 4117 break;
4061#endif 4118#endif
4062 case 1048: /* alternative cursor save */ 4119 case 1048: /* alternative cursor save */
4063 case 1049: 4120 case 1049:
4064 if (OPTION (Opt_secondaryScreen)) 4121 if (OPTION (Opt_secondaryScreen))
… …
4084 case 3: /* 80/132 */ 4141 case 3: /* 80/132 */
4085 if (priv_modes & PrivMode_132OK) 4142 if (priv_modes & PrivMode_132OK)
4086 set_widthheight (((state ? 132 : 80) * fwidth), height); 4143 set_widthheight (((state ? 132 : 80) * fwidth), height);
4087 break; 4144 break;
4088 case 4: /* smooth scrolling */ 4145 case 4: /* smooth scrolling */
4089 if (!state) 4146 set_option (Opt_jumpScroll, !state);
4090 SET_OPTION (Opt_jumpScroll);
4091 else
4092 CLR_OPTION (Opt_jumpScroll);
4093 break; 4147 break;
4094 case 5: /* reverse video */ 4148 case 5: /* reverse video */
4095 scr_rvideo_mode (state); 4149 scr_rvideo_mode (state);
4096 break; 4150 break;
4097 case 6: /* relative/absolute origins */ 4151 case 6: /* relative/absolute origins */
… …
4103 /* case 8: - auto repeat, can't do on a per window basis */ 4157 /* case 8: - auto repeat, can't do on a per window basis */
4104 case 9: /* X10 mouse reporting */ 4158 case 9: /* X10 mouse reporting */
4105 if (state) /* orthogonal */ 4159 if (state) /* orthogonal */
4106 priv_modes &= ~PrivMode_MouseX11; 4160 priv_modes &= ~PrivMode_MouseX11;
4107 break; 4161 break;
4108#ifdef menuBar_esc
4109 case menuBar_esc:
4110#ifdef MENUBAR
4111 map_menuBar (state);
4112#endif
4113 break;
4114#endif
4115#ifdef scrollBar_esc 4162#ifdef scrollBar_esc
4116 case scrollBar_esc: 4163 case scrollBar_esc:
4117 if (scrollbar_mapping (state)) 4164 if (scrollbar_mapping (state))
4118 { 4165 {
4119 resize_all_windows (0, 0, 0); 4166 resize_all_windows (0, 0, 0);
… …
4138#if 0 4185#if 0
4139 case 1001: 4186 case 1001:
4140 break; /* X11 mouse highlighting */ 4187 break; /* X11 mouse highlighting */
4141#endif 4188#endif
4142 case 1010: /* scroll to bottom on TTY output inhibit */ 4189 case 1010: /* scroll to bottom on TTY output inhibit */
4143 if (!state) 4190 set_option (Opt_scrollTtyOutput, !state);
4144 SET_OPTION (Opt_scrollTtyOutput);
4145 else
4146 CLR_OPTION (Opt_scrollTtyOutput);
4147 break; 4191 break;
4148 case 1011: /* scroll to bottom on key press */ 4192 case 1011: /* scroll to bottom on key press */
4149 if (state) 4193 set_option (Opt_scrollTtyKeypress, state);
4150 SET_OPTION (Opt_scrollTtyKeypress);
4151 else
4152 CLR_OPTION (Opt_scrollTtyKeypress);
4153 break; 4194 break;
4154 case 1047: /* secondary screen w/ clearing last */ 4195 case 1047: /* secondary screen w/ clearing last */
4155 if (OPTION (Opt_secondaryScreen)) 4196 if (OPTION (Opt_secondaryScreen))
4156 if (current_screen != PRIMARY) 4197 if (current_screen != PRIMARY)
4157 scr_erase_screen (2); 4198 scr_erase_screen (2);
… …
4295 scr_color (Color_bg, Color_bg); 4336 scr_color (Color_bg, Color_bg);
4296 break; 4337 break;
4297 4338
4298 //case 50: // not variable spacing 4339 //case 50: // not variable spacing
4299 4340
4300#ifndef NO_BRIGHTCOLOR 4341#if ENABLE_FRILLS
4301 case 90: 4342 case 90:
4302 case 91: /* set bright fg color */ 4343 case 91: /* set bright fg color */
4303 case 92: 4344 case 92:
4304 case 93: 4345 case 93:
4305 case 94: 4346 case 94:
… …
4350 */ 4391 */
4351void 4392void
4352rxvt_term::tt_printf (const char *fmt,...) 4393rxvt_term::tt_printf (const char *fmt,...)
4353{ 4394{
4354 va_list arg_ptr; 4395 va_list arg_ptr;
4355 unsigned char buf[256]; 4396 char buf[256];
4356 4397
4357 va_start (arg_ptr, fmt); 4398 va_start (arg_ptr, fmt);
4358 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4399 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4359 va_end (arg_ptr); 4400 va_end (arg_ptr);
4360 tt_write (buf, strlen (buf)); 4401 tt_write (buf, strlen (buf));
… …
4365 * or generated by us in response to a query ESC sequence. 4406 * or generated by us in response to a query ESC sequence.
4366 */ 4407 */
4367const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4408const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4368 4409
4369void 4410void
4370rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4411rxvt_term::tt_write (const char *data, unsigned int len)
4371{ 4412{
4413 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414 return;
4415
4416 if (pty.pty < 0)
4417 return;
4418
4372 if (v_buflen == 0) 4419 if (v_buflen == 0)
4373 { 4420 {
4374 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4421 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4375 4422
4376 if ((unsigned int)written == len) 4423 if ((unsigned int)written == len)
… …
4378 4425
4379 data += written; 4426 data += written;
4380 len -= written; 4427 len -= written;
4381 } 4428 }
4382 4429
4383 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4430 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4384 4431
4385 memcpy (v_buffer + v_buflen, data, len); 4432 memcpy (v_buffer + v_buflen, data, len);
4386 v_buflen += len; 4433 v_buflen += len;
4387 4434
4388 pty_ev.set (EVENT_READ | EVENT_WRITE); 4435 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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