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.241 by root, Fri Jan 6 05:28:55 2006 UTC vs.
Revision 1.283 by root, Tue Jan 24 19:40:12 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.
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76#define ISO_14755_52 0x20000000UL // keycap (section 5.2) 73#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
147 || !IN_RANGE_EXC (y, 0, nrow)) 144 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 145 return;
149 146
150 for (;;) 147 for (;;)
151 { 148 {
152 const line_t &l = ROW(y - view_start); 149 const line_t &l = ROW(y + view_start);
153 150
154 text_t t = l.t[x]; 151 text_t t = l.t[x];
155 152
156 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
157 { 154 {
302rxvt_term::lookup_key (XKeyEvent &ev) 299rxvt_term::lookup_key (XKeyEvent &ev)
303{ 300{
304 int ctrl, meta, shft, len; 301 int ctrl, meta, shft, len;
305 unsigned int newlen; 302 unsigned int newlen;
306 KeySym keysym; 303 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 304 int valid_keysym;
311 char kbuf[KBUFSZ]; 305 char kbuf[KBUFSZ];
312 306
313 /* 307 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
443 scr_move_to (0, 1); 437 scr_move_to (0, 1);
444 return; 438 return;
445 } 439 }
446 else if (keysym == XK_End) 440 else if (keysym == XK_End)
447 { 441 {
448 scr_move_to (1, 0); 442 scr_move_to (1, 1);
449 return; 443 return;
450 } 444 }
451 } 445 }
452#endif 446#endif
453 } 447 }
464 { 458 {
465 switch (keysym) 459 switch (keysym)
466 { 460 {
467 /* normal XTerm key bindings */ 461 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 462 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 463 selection_request (ev.time);
470 return; 464 return;
471#if TODO 465#if TODO
472 /* rxvt extras */ 466 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 467 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 468 change_font (FONT_UP);
867#endif 861#endif
868 /* nil */ ; 862 /* nil */ ;
869 } 863 }
870 } 864 }
871 865
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END))) 866 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 867 return;
874 868
875 if (len <= 0) 869 if (len <= 0)
876 return; /* not mapped */ 870 return; /* not mapped */
877 871
905 { 899 {
906 const char ch = C0_ESC; 900 const char ch = C0_ESC;
907 tt_write (&ch, 1); 901 tt_write (&ch, 1);
908 } 902 }
909 903
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 904 tt_write (kbuf, (unsigned int)len);
921} 905}
922/*}}} */ 906/*}}} */
923 907
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 908#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 909unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 910rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 911{
930 unsigned int n, s; 912 unsigned int n, s;
931 913
972 954
973 if (want_refresh) 955 if (want_refresh)
974 { 956 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 957 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 958 {
977 int row = -view_start; 959 int row = view_start;
960 int end_row = row + nrow;
978 961
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 962 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 963 --row;
981 964
982 while (row < -view_start + nrow) 965 do
983 { 966 {
984 int start_row = row; 967 int start_row = row;
985 line_t *l; 968 line_t *l;
986 969
987 do 970 do
988 { 971 {
989 l = &ROW (row); 972 l = &ROW (row++);
990 973
991 if (!(l->f & LINE_FILTERED)) 974 if (!(l->f & LINE_FILTERED))
992 { 975 {
993 // line not filtered, mark it as filtered 976 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 977 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 978 while (l->is_longer ())
996 { 979 {
997 l = &ROW (++row); 980 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 981 l->f |= LINE_FILTERED;
999 } 982 }
1000 983
1001 // and filter it 984 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 985 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 986
1004 break; 987 break;
1005 } 988 }
1006 } 989 }
1007 while (l->is_longer ()); 990 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 991 }
992 while (row < end_row);
1011 993 }
1012 }
1013 994
1014 scr_refresh (refresh_type); 995 scr_refresh ();
1015 scrollbar_show (1); 996 scrollbar_show (1);
1016#ifdef USE_XIM 997#ifdef USE_XIM
1017 IMSendSpot (); 998 IMSendSpot ();
1018#endif 999#endif
1019 } 1000 }
1022} 1003}
1023 1004
1024void 1005void
1025rxvt_term::check_cb (check_watcher &w) 1006rxvt_term::check_cb (check_watcher &w)
1026{ 1007{
1027 SET_R (this); 1008 make_current ();
1028 SET_LOCALE (locale);
1029 1009
1030 display->flush (); 1010 display->flush ();
1031 1011
1032 if (want_refresh && !flush_ev.active) 1012 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1013 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034} 1014}
1035 1015
1036void 1016void
1037rxvt_term::flush_cb (time_watcher &w) 1017rxvt_term::flush_cb (time_watcher &w)
1038{ 1018{
1039 SET_R (this); 1019 make_current ();
1040 SET_LOCALE (locale);
1041 1020
1042 refresh_limit = 1; 1021 refresh_limit = 1;
1043 refresh_count = 0; 1022 refresh_count = 0;
1044 flush (); 1023 flush ();
1045} 1024}
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1028rxvt_term::cursor_blink_cb (time_watcher &w)
1050{ 1029{
1051 hidden_cursor = !hidden_cursor; 1030 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1031 want_refresh = 1;
1053 1032
1054 w.start (w.at + BLINK_INTERVAL); 1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
1055} 1034}
1056#endif 1035#endif
1057 1036
1058#ifdef TEXT_BLINK 1037#ifdef TEXT_BLINK
1059void 1038void
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1052rxvt_term::cont_scroll_cb (time_watcher &w)
1074{ 1053{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1054 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1055 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 { 1056 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1057 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 } 1059 }
1082} 1060}
1083#endif 1061#endif
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1065rxvt_term::sel_scroll_cb (time_watcher &w)
1088{ 1066{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1067 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1068 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1069 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1070 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1072 }
1096} 1073}
1097#endif 1074#endif
1102{ 1079{
1103 if (mouse_slip_wheel_speed == 0 1080 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1081 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1082 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1083 {
1107 if (view_start == nsaved || 1084 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1085 mouse_slip_wheel_speed = 0;
1110 1086
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1087 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1089 }
1115} 1090}
1116#endif 1091#endif
1146 1121
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1122 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1123 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1124 cmdbuf_endp = cmdbuf_ptr + n;
1150 1125
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1126 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1127
1153 if (r > 0) 1128 if (r > 0)
1154 { 1129 {
1155 cmdbuf_endp += r; 1130 cmdbuf_endp += r;
1156 return true; 1131 return true;
1174} 1149}
1175 1150
1176void 1151void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1152rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1153{
1179 SET_R (this); 1154 make_current ();
1180 SET_LOCALE (locale);
1181 1155
1182 if (revents & EVENT_READ) 1156 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1157 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1158 while (pty_fill ())
1185 if (cmd_parse ()) 1159 if (cmd_parse ())
1217} 1191}
1218 1192
1219void 1193void
1220rxvt_term::pointer_cb (time_watcher &w) 1194rxvt_term::pointer_cb (time_watcher &w)
1221{ 1195{
1222 SET_R (this); 1196 make_current ();
1223 SET_LOCALE (locale);
1224 1197
1225 pointer_blank (); 1198 pointer_blank ();
1226} 1199}
1227#endif 1200#endif
1228 1201
1307 1280
1308/*{{{ process an X event */ 1281/*{{{ process an X event */
1309void 1282void
1310rxvt_term::x_cb (XEvent &ev) 1283rxvt_term::x_cb (XEvent &ev)
1311{ 1284{
1285 make_current ();
1286
1312 dDisp; 1287 dDisp;
1313 1288
1314 SET_R (this); 1289 if (ev.xany.window == vt
1315 SET_LOCALE (locale); 1290 && SHOULD_INVOKE (HOOK_X_EVENT)
1291 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1292 return;
1316 1293
1317#if defined(CURSOR_BLINK) 1294 // for XQueryPointer
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1319 {
1320 if (hidden_cursor)
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1327 }
1328#endif
1329
1330#if defined(POINTER_BLANK)
1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332 {
1333 if (ev.type == MotionNotify
1334 || ev.type == ButtonPress
1335 || ev.type == ButtonRelease)
1336 if (hidden_pointer)
1337 pointer_unblank ();
1338
1339 if (ev.type == KeyPress && hidden_pointer == 0)
1340 pointer_blank ();
1341 }
1342#endif
1343
1344 Window unused_root, unused_child; 1295 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1296 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1297 unsigned int unused_mask;
1347 1298
1348 switch (ev.type) 1299 switch (ev.type)
1355 1306
1356 break; 1307 break;
1357 1308
1358 case KeyRelease: 1309 case KeyRelease:
1359 { 1310 {
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1311#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1361 KeySym ks; 1312 KeySym keysym;
1362 1313
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1314 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif 1315#endif
1365 1316
1366#if ENABLE_FRILLS || ISO_14755 1317#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support 1318 // ISO 14755 support
1368 if (iso14755buf) 1319 if (iso14755buf)
1373# endif 1324# endif
1374# if ISO_14755 1325# if ISO_14755
1375 // iso14755 part 5.2 handling: release time 1326 // iso14755 part 5.2 handling: release time
1376 // first: controls 1327 // first: controls
1377 if ((ev.xkey.state & ControlMask) 1328 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f) 1329 && ((keysym >= 0x40 && keysym <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f))) 1330 || (keysym >= 0x61 && keysym <= 0x7f)))
1380 { 1331 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1332 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1382 commit_iso14755 (); 1333 commit_iso14755 ();
1383 return; // case-break; 1334 goto skip_switch;
1384 } 1335 }
1385 1336
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1337 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks) 1338 if (i[0] == keysym)
1388 { 1339 {
1389 iso14755buf = ISO_14755_51 | i[1]; 1340 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 (); 1341 commit_iso14755 ();
1391 return; // case-break; 1342 goto skip_switch;
1392 } 1343 }
1393 1344
1394 scr_bell (); 1345 scr_bell ();
1395# endif 1346# endif
1396 iso14755buf = 0; 1347 iso14755buf = 0;
1415 else 1366 else
1416 iso14755buf = 0; 1367 iso14755buf = 0;
1417 } 1368 }
1418#endif 1369#endif
1419 1370
1371 if (ev.xany.window == vt
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) 1372 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1421 break; 1373 break;
1422 1374
1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1375#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1424 if (!(ev.xkey.state & ControlMask)) 1376 if (!(ev.xkey.state & ControlMask))
1425 slip_wheel_ev.stop (); 1377 slip_wheel_ev.stop ();
1426 else if (ks == XK_Control_L || ks == XK_Control_R) 1378 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1427 mouse_slip_wheel_speed = 0; 1379 mouse_slip_wheel_speed = 0;
1428#endif 1380#endif
1429 break; 1381 break;
1430 } 1382 }
1431 1383
1437 button_release (ev.xbutton); 1389 button_release (ev.xbutton);
1438 break; 1390 break;
1439 1391
1440 case ClientMessage: 1392 case ClientMessage:
1441 if (ev.xclient.format == 32 1393 if (ev.xclient.format == 32
1442 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1394 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1443 { 1395 {
1396 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1397 {
1398 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1399 {
1444 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1400 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1401 {
1402 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1445 destroy (); 1403 destroy ();
1404 }
1446#if ENABLE_EWMH 1405#if ENABLE_EWMH
1447 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1406 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1448 XSendEvent (disp, ev.xclient.window = display->root, 1407 XSendEvent (disp, ev.xclient.window = display->root,
1449 False, SubstructureRedirectMask | SubstructureNotifyMask, 1408 False, SubstructureRedirectMask | SubstructureNotifyMask,
1450 &ev); 1409 &ev);
1410#endif
1411 }
1412 }
1413#if ENABLE_XEMBED
1414 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1415 {
1416 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1417 focus_in ();
1418 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1419 focus_out ();
1420 }
1451#endif 1421#endif
1452 } 1422 }
1453#if ENABLE_XEMBED
1454 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1455 {
1456 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1457 focus_in ();
1458 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1459 focus_out ();
1460 }
1461#endif
1462#ifdef OFFIX_DND
1463 /* OffiX Dnd (drag 'n' drop) protocol */
1464 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1465 && (ev.xclient.data.l[0] == DndFile
1466 || ev.xclient.data.l[0] == DndDir
1467 || ev.xclient.data.l[0] == DndLink))
1468 {
1469 /* Get Dnd data */
1470 Atom ActualType;
1471 int ActualFormat;
1472 unsigned char *data;
1473 unsigned long Size, RemainingBytes;
1474
1475 XGetWindowProperty (disp, display->root,
1476 xa[XA_DNDSELECTION],
1477 0L, 1000000L,
1478 False, AnyPropertyType,
1479 &ActualType, &ActualFormat,
1480 &Size, &RemainingBytes,
1481 &data);
1482 set_string_property (XA_CUT_BUFFER0, data);
1483 XFree (data);
1484 selection_paste (display->root, XA_CUT_BUFFER0, true);
1485 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1486 }
1487#endif /* OFFIX_DND */
1488 break; 1423 break;
1489 1424
1490 case MappingNotify: 1425 case MappingNotify:
1491 XRefreshKeyboardMapping (&ev.xmapping); 1426 XRefreshKeyboardMapping (&ev.xmapping);
1492 break; 1427 break;
1534 { 1469 {
1535 seen_resize = 1; 1470 seen_resize = 1;
1536 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1537 } 1472 }
1538 1473
1474 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1475
1539#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1476#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1540 if (OPTION (Opt_transparent)) 1477 if (OPTION (Opt_transparent))
1541 check_our_parents (); 1478 check_our_parents ();
1542#endif 1479#endif
1543 } 1480 }
1544 break; 1481 break;
1545 1482
1546 case PropertyNotify: 1483 case PropertyNotify:
1484 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1547 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1485 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1548 && ev.xproperty.state == PropertyNewValue) 1486 && ev.xproperty.state == PropertyNewValue)
1549 selection_property (ev.xproperty.window, ev.xproperty.atom); 1487 selection_property (ev.xproperty.window, ev.xproperty.atom);
1550 1488
1551 break; 1489 break;
1552 1490
1553 case SelectionClear: 1491 case SelectionClear:
1554 selection_clear (); 1492 selection_clear ();
1559 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1497 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1560 break; 1498 break;
1561 1499
1562 case SelectionRequest: 1500 case SelectionRequest:
1563 selection_send (ev.xselectionrequest); 1501 selection_send (ev.xselectionrequest);
1502 break;
1503
1504 case MapNotify:
1505 mapped = 1;
1506#ifdef TEXT_BLINK
1507 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1508#endif
1509 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1564 break; 1510 break;
1565 1511
1566 case UnmapNotify: 1512 case UnmapNotify:
1567 mapped = 0; 1513 mapped = 0;
1568#ifdef TEXT_BLINK 1514#ifdef TEXT_BLINK
1569 text_blink_ev.stop (); 1515 text_blink_ev.stop ();
1570#endif 1516#endif
1571 break; 1517 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1572
1573 case MapNotify:
1574 mapped = 1;
1575#ifdef TEXT_BLINK
1576 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1577#endif
1578 break; 1518 break;
1579 1519
1580#ifdef TRANSPARENT 1520#ifdef TRANSPARENT
1581 case ReparentNotify: 1521 case ReparentNotify:
1582 rootwin_cb (ev); 1522 rootwin_cb (ev);
1596 1536
1597 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1537 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1598 scr_expose (ev.xexpose.x, ev.xexpose.y, 1538 scr_expose (ev.xexpose.x, ev.xexpose.y,
1599 ev.xexpose.width, ev.xexpose.height, False); 1539 ev.xexpose.width, ev.xexpose.height, False);
1600 1540
1601 scr_refresh (refresh_type); 1541 want_refresh = 1;
1602 } 1542 }
1603 else 1543 else
1604 { 1544 {
1605 XEvent unused_event; 1545 XEvent unused_event;
1606 1546
1612 if (isScrollbarWindow (ev.xany.window)) 1552 if (isScrollbarWindow (ev.xany.window))
1613 { 1553 {
1614 scrollBar.setIdle (); 1554 scrollBar.setIdle ();
1615 scrollbar_show (0); 1555 scrollbar_show (0);
1616 } 1556 }
1617#ifdef MENUBAR
1618 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1619 menubar_expose ();
1620#endif
1621 1557
1622#ifdef TRANSPARENT 1558#ifdef TRANSPARENT
1623 if (am_transparent && ev.xany.window == parent[0]) 1559 if (am_transparent && ev.xany.window == parent[0])
1624 XClearWindow (disp, ev.xany.window); 1560 XClearWindow (disp, ev.xany.window);
1625#endif 1561#endif
1629 case MotionNotify: 1565 case MotionNotify:
1630#ifdef POINTER_BLANK 1566#ifdef POINTER_BLANK
1631 if (hidden_pointer) 1567 if (hidden_pointer)
1632 pointer_unblank (); 1568 pointer_unblank ();
1633#endif 1569#endif
1634#if MENUBAR
1635 if (isMenuBarWindow (ev.xany.window))
1636 {
1637 menubar_control (ev.xbutton);
1638 break;
1639 }
1640#endif
1641 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1570 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1642 break; 1571 break;
1643 1572
1644 if (ev.xany.window == vt) 1573 if (ev.xany.window == vt)
1645 { 1574 {
1575 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1576 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop 1577 ; // nop
1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1578 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1649 { 1579 {
1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1580 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1651 ; 1581 ;
1733 &unused_root_x, &unused_root_y, 1663 &unused_root_x, &unused_root_y,
1734 &ev.xbutton.x, &ev.xbutton.y, 1664 &ev.xbutton.x, &ev.xbutton.y,
1735 &unused_mask); 1665 &unused_mask);
1736 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1737 scrollbar_size ()); 1667 scrollbar_size ());
1738 scr_refresh (refresh_type); 1668 want_refresh = 1;
1739 refresh_limit = 0; 1669 refresh_limit = 0;
1740 scrollbar_show (1); 1670 scrollbar_show (1);
1741 } 1671 }
1742 break; 1672 break;
1743 } 1673 }
1674
1675skip_switch: ;
1676
1677#if defined(CURSOR_BLINK)
1678 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1679 {
1680 if (hidden_cursor)
1681 {
1682 hidden_cursor = 0;
1683 want_refresh = 1;
1684 }
1685
1686 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1687 }
1688#endif
1689
1690#if defined(POINTER_BLANK)
1691 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1692 {
1693 if (ev.type == MotionNotify
1694 || ev.type == ButtonPress
1695 || ev.type == ButtonRelease)
1696 if (hidden_pointer)
1697 pointer_unblank ();
1698
1699 if (ev.type == KeyPress && hidden_pointer == 0)
1700 pointer_blank ();
1701 }
1702#endif
1744} 1703}
1745 1704
1746void 1705void
1747rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1748{ 1707{
1760 XSetICFocus (Input_Context); 1719 XSetICFocus (Input_Context);
1761 } 1720 }
1762#endif 1721#endif
1763#if CURSOR_BLINK 1722#if CURSOR_BLINK
1764 if (OPTION (Opt_cursorBlink)) 1723 if (OPTION (Opt_cursorBlink))
1765 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1724 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1766#endif 1725#endif
1767#if OFF_FOCUS_FADING 1726#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1727 if (rs[Rs_fade])
1769 { 1728 {
1770 pix_colors = pix_colors_focused; 1729 pix_colors = pix_colors_focused;
1814 1773
1815#if TRANSPARENT 1774#if TRANSPARENT
1816void 1775void
1817rxvt_term::rootwin_cb (XEvent &ev) 1776rxvt_term::rootwin_cb (XEvent &ev)
1818{ 1777{
1819 SET_R (this); 1778 make_current ();
1820 SET_LOCALE (locale);
1821 1779
1822 switch (ev.type) 1780 switch (ev.type)
1823 { 1781 {
1824 case PropertyNotify: 1782 case PropertyNotify:
1825 /* 1783 /*
1852 /* 1810 /*
1853 * VT window processing of button press 1811 * VT window processing of button press
1854 */ 1812 */
1855 if (ev.window == vt) 1813 if (ev.window == vt)
1856 { 1814 {
1815 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1816 return;
1817
1857#if ISO_14755 1818#if ISO_14755
1858 // 5.4 1819 // 5.4
1859 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1820 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1860 { 1821 {
1861 iso14755_54 (ev.x, ev.y); 1822 iso14755_54 (ev.x, ev.y);
1873#ifdef MOUSE_REPORT_DOUBLECLICK 1834#ifdef MOUSE_REPORT_DOUBLECLICK
1874 if (ev.button == MEvent.button && clickintime) 1835 if (ev.button == MEvent.button && clickintime)
1875 { 1836 {
1876 /* same button, within alloted time */ 1837 /* same button, within alloted time */
1877 MEvent.clicks++; 1838 MEvent.clicks++;
1839
1878 if (MEvent.clicks > 1) 1840 if (MEvent.clicks > 1)
1879 { 1841 {
1880 /* only report double clicks */ 1842 /* only report double clicks */
1881 MEvent.clicks = 2; 1843 MEvent.clicks = 2;
1882 mouse_report (ev); 1844 mouse_report (ev);
1902 else 1864 else
1903 { 1865 {
1904 if (ev.button != MEvent.button) 1866 if (ev.button != MEvent.button)
1905 MEvent.clicks = 0; 1867 MEvent.clicks = 0;
1906 1868
1907 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1908 switch (ev.button) 1869 switch (ev.button)
1909 { 1870 {
1910 case Button1: 1871 case Button1:
1911 /* allow meta + click to select rectangular areas */ 1872 /* allow meta + click to select rectangular areas */
1912 /* should be done in screen.C */ 1873 /* should be done in screen.C */
1913#if ENABLE_FRILLS 1874#if ENABLE_FRILLS
1914 selection.rect = !!(ev.state & ModMetaMask); 1875 selection.rect = !!(ev.state & ModMetaMask);
1915#else 1876#else
1916 selection.rect = false; 1877 selection.rect = false;
1917#endif 1878#endif
1918 1879
1919 /* allow shift+left click to extend selection */ 1880 /* allow shift+left click to extend selection */
1920 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1881 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1921 { 1882 {
1922 if (MEvent.button == Button1 && clickintime) 1883 if (MEvent.button == Button1 && clickintime)
1923 selection_rotate (ev.x, ev.y); 1884 selection_rotate (ev.x, ev.y);
1924 else 1885 else
1925 selection_extend (ev.x, ev.y, 1); 1886 selection_extend (ev.x, ev.y, 1);
1926 } 1887 }
1927 else 1888 else
1928 { 1889 {
1929 if (MEvent.button == Button1 && clickintime) 1890 if (MEvent.button == Button1 && clickintime)
1930 MEvent.clicks++; 1891 MEvent.clicks++;
1931 else 1892 else
1932 MEvent.clicks = 1; 1893 MEvent.clicks = 1;
1933 1894
1934 selection_click (MEvent.clicks, ev.x, ev.y); 1895 selection_click (MEvent.clicks, ev.x, ev.y);
1935 } 1896 }
1936 1897
1937 MEvent.button = Button1; 1898 MEvent.button = Button1;
1938 break; 1899 break;
1939 1900
1940 case Button3: 1901 case Button3:
1941 if (MEvent.button == Button3 && clickintime) 1902 if (MEvent.button == Button3 && clickintime)
1942 selection_rotate (ev.x, ev.y); 1903 selection_rotate (ev.x, ev.y);
1943 else 1904 else
1944 selection_extend (ev.x, ev.y, 1); 1905 selection_extend (ev.x, ev.y, 1);
1945 1906
1946 MEvent.button = Button3; 1907 MEvent.button = Button3;
1947 break; 1908 break;
1948 } 1909 }
1949 } 1910 }
1950 1911
1951 MEvent.time = ev.time; 1912 MEvent.time = ev.time;
1952 return; 1913 return;
1953 } 1914 }
1954 1915
2090 } 2051 }
2091 2052
2092 break; 2053 break;
2093 } 2054 }
2094 } 2055 }
2056
2095 return; 2057 return;
2096 } 2058 }
2097#if MENUBAR
2098 /*
2099 * Menubar window processing of button press
2100 */
2101 if (isMenuBarWindow (ev.window))
2102 menubar_control (ev);
2103#endif
2104} 2059}
2105 2060
2106void 2061void
2107rxvt_term::button_release (XButtonEvent &ev) 2062rxvt_term::button_release (XButtonEvent &ev)
2108{ 2063{
2114 2069
2115 if (scrollbar_isUpDn ()) 2070 if (scrollbar_isUpDn ())
2116 { 2071 {
2117 scrollBar.setIdle (); 2072 scrollBar.setIdle ();
2118 scrollbar_show (0); 2073 scrollbar_show (0);
2119#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2120 refresh_type &= ~SMOOTH_REFRESH;
2121#endif
2122 } 2074 }
2123 2075
2124#ifdef SELECTION_SCROLLING 2076#ifdef SELECTION_SCROLLING
2125 if (sel_scroll_ev.active) 2077 if (sel_scroll_ev.active)
2126 sel_scroll_ev.stop(); 2078 sel_scroll_ev.stop();
2127#endif 2079#endif
2128 2080
2129 if (ev.window == vt) 2081 if (ev.window == vt)
2130 { 2082 {
2083 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2084 return;
2085
2131#if ISO_14755 2086#if ISO_14755
2132 // 5.4 2087 // 5.4
2133 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2088 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2134 return; 2089 return;
2135#endif 2090#endif
2091
2136 if (reportmode) 2092 if (reportmode)
2137 { 2093 {
2138 /* mouse report from vt window */ 2094 /* mouse report from vt window */
2139 /* don't report release of wheel "buttons" */ 2095 /* don't report release of wheel "buttons" */
2140 if (ev.button >= 4) 2096 if (ev.button >= 4)
2164 if (priv_modes & PrivMode_mouse_report 2120 if (priv_modes & PrivMode_mouse_report
2165 && bypass_keystate 2121 && bypass_keystate
2166 && ev.button == Button1 && MEvent.clicks <= 1) 2122 && ev.button == Button1 && MEvent.clicks <= 1)
2167 selection_extend (ev.x, ev.y, 0); 2123 selection_extend (ev.x, ev.y, 0);
2168 2124
2169 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2170 return;
2171
2172 switch (ev.button) 2125 switch (ev.button)
2173 { 2126 {
2174 case Button1: 2127 case Button1:
2175 case Button3: 2128 case Button3:
2176 selection_make (ev.time); 2129 selection_make (ev.time);
2177 break; 2130 break;
2131
2178 case Button2: 2132 case Button2:
2179 selection_request (ev.time, ev.x, ev.y); 2133 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2134 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2180 break; 2135 break;
2136
2181#ifdef MOUSE_WHEEL 2137#ifdef MOUSE_WHEEL
2182 case Button4: 2138 case Button4:
2183 case Button5: 2139 case Button5:
2184 { 2140 {
2185 int i; 2141 int i;
2207 slip_wheel_ev.start (); 2163 slip_wheel_ev.start ();
2208 } 2164 }
2209 else 2165 else
2210 { 2166 {
2211# endif 2167# endif
2212# ifdef JUMP_MOUSE_WHEEL
2213 scr_page (v, i); 2168 scr_page (v, i);
2214 scr_refresh (SMOOTH_REFRESH);
2215 scrollbar_show (1); 2169 scrollbar_show (1);
2216# else
2217 while (i--)
2218 {
2219 scr_page (v, 1);
2220 scr_refresh (SMOOTH_REFRESH);
2221 scrollbar_show (1);
2222 }
2223# endif
2224# ifdef MOUSE_SLIP_WHEELING 2170# ifdef MOUSE_SLIP_WHEELING
2225 } 2171 }
2226#endif 2172# endif
2227 } 2173 }
2228 break; 2174 break;
2229#endif 2175#endif
2230 } 2176 }
2231 } 2177 }
2232#ifdef MENUBAR
2233 else if (isMenuBarWindow (ev.window))
2234 menubar_control (ev);
2235#endif
2236} 2178}
2237 2179
2238#ifdef TRANSPARENT 2180#ifdef TRANSPARENT
2239#if TINTING 2181#if TINTING
2240/* taken from aterm-0.4.2 */ 2182/* taken from aterm-0.4.2 */
2677 am_transparent = 0; 2619 am_transparent = 0;
2678 /* XXX: also turn off Opt_transparent? */ 2620 /* XXX: also turn off Opt_transparent? */
2679 } 2621 }
2680 else 2622 else
2681 { 2623 {
2682#if WAIT_FOR_WM
2683 /* wait (an arbitrary period) for the WM to do its thing
2684 * needed for fvwm2.2.2 (and before?) */
2685 sleep (1);
2686#endif
2687 for (n = 0; n < (unsigned int)i; n++) 2624 for (n = 0; n < (unsigned int)i; n++)
2688 { 2625 {
2689 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2626 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2690 XClearWindow (disp, parent[n]); 2627 XClearWindow (disp, parent[n]);
2691 } 2628 }
2720 2657
2721bool 2658bool
2722rxvt_term::cmd_parse () 2659rxvt_term::cmd_parse ()
2723{ 2660{
2724 bool flag = false; 2661 bool flag = false;
2725 unicode_t ch = NOCHAR; 2662 wchar_t ch = NOCHAR;
2726 char *seq_begin; // remember start of esc-sequence here 2663 char *seq_begin; // remember start of esc-sequence here
2727 2664
2728 for (;;) 2665 for (;;)
2729 { 2666 {
2730 if (ch == NOCHAR) 2667 if (ch == NOCHAR)
2751 if (seen_resize && cmd_pid) 2688 if (seen_resize && cmd_pid)
2752 kill (-cmd_pid, SIGWINCH); 2689 kill (-cmd_pid, SIGWINCH);
2753 } 2690 }
2754 2691
2755 /* Read a text string from the input buffer */ 2692 /* Read a text string from the input buffer */
2756 unicode_t buf[UBUFSIZ]; 2693 wchar_t buf[UBUFSIZ];
2757 bool refreshnow = false; 2694 bool refreshnow = false;
2758 int nlines = 0; 2695 int nlines = 0;
2759 unicode_t *str = buf; 2696 wchar_t *str = buf;
2760 unicode_t *eol = str + min (ncol, UBUFSIZ); 2697 wchar_t *eol = str + min (ncol, UBUFSIZ);
2761 2698
2762 for (;;) 2699 for (;;)
2763 { 2700 {
2764 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2701 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2765 break; 2702 break;
2783 } 2720 }
2784 2721
2785 // scr_add_lines only works for nlines <= nrow - 1. 2722 // scr_add_lines only works for nlines <= nrow - 1.
2786 if (nlines >= nrow - 1) 2723 if (nlines >= nrow - 1)
2787 { 2724 {
2725 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2788 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2726 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2789 scr_add_lines (buf, nlines, str - buf); 2727 scr_add_lines (buf, str - buf, nlines);
2790 2728
2791 nlines = 0; 2729 nlines = 0;
2792 str = buf; 2730 str = buf;
2793 eol = str + min (ncol, UBUFSIZ); 2731 eol = str + min (ncol, UBUFSIZ);
2794 } 2732 }
2808 2746
2809 seq_begin = cmdbuf_ptr; 2747 seq_begin = cmdbuf_ptr;
2810 ch = next_char (); 2748 ch = next_char ();
2811 } 2749 }
2812 2750
2751 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2813 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2752 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2814 scr_add_lines (buf, nlines, str - buf); 2753 scr_add_lines (buf, str - buf, nlines);
2815 2754
2816 /* 2755 /*
2817 * If there have been a lot of new lines, then update the screen 2756 * If there have been a lot of new lines, then update the screen
2818 * What the heck I'll cheat and only refresh less than every page-full. 2757 * What the heck I'll cheat and only refresh less than every page-full.
2819 * the number of pages between refreshes is refresh_limit, which 2758 * the number of pages between refreshes is refresh_limit, which
2824 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2763 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2825 refresh_limit++; 2764 refresh_limit++;
2826 else 2765 else
2827 { 2766 {
2828 flag = true; 2767 flag = true;
2829 scr_refresh (refresh_type); 2768 scr_refresh ();
2830 flush_ev.stop (); 2769 want_refresh = 1;
2831 } 2770 }
2832 } 2771 }
2833 2772
2834 } 2773 }
2835 else 2774 else
2850 } 2789 }
2851 2790
2852 return flag; 2791 return flag;
2853} 2792}
2854 2793
2855// read the next octet
2856unicode_t
2857rxvt_term::next_octet ()
2858{
2859 return cmdbuf_ptr < cmdbuf_endp
2860 ? *cmdbuf_ptr++
2861 : NOCHAR;
2862}
2863
2864// read the next character 2794// read the next character
2865unicode_t 2795wchar_t
2866rxvt_term::next_char () 2796rxvt_term::next_char () NOTHROW
2867{ 2797{
2868 while (cmdbuf_ptr < cmdbuf_endp) 2798 while (cmdbuf_ptr < cmdbuf_endp)
2869 { 2799 {
2870 // assume 7-bit to be ascii ALWAYS 2800 // assume 7-bit to be ascii ALWAYS
2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2801 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2880 cmdbuf_ptr = cmdbuf_endp; 2810 cmdbuf_ptr = cmdbuf_endp;
2881 break; 2811 break;
2882 } 2812 }
2883 2813
2884 if (len == (size_t)-1) 2814 if (len == (size_t)-1)
2885 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2815 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2886 2816
2887 // assume wchar == unicode 2817 // assume wchar == unicode
2888 cmdbuf_ptr += len; 2818 cmdbuf_ptr += len;
2889 return wc & UNICODE_MASK; 2819 return wc & UNICODE_MASK;
2890 } 2820 }
2891 2821
2892 return NOCHAR; 2822 return NOCHAR;
2893} 2823}
2824
2825// read the next octet
2826uint32_t
2827rxvt_term::next_octet () NOTHROW
2828{
2829 return cmdbuf_ptr < cmdbuf_endp
2830 ? (unsigned char)*cmdbuf_ptr++
2831 : NOCHAR;
2832}
2833
2834static class out_of_input out_of_input;
2894 2835
2895/* rxvt_cmd_getc () - Return next input character */ 2836/* rxvt_cmd_getc () - Return next input character */
2896/* 2837/*
2897 * Return the next input character after first passing any keyboard input 2838 * Return the next input character after first passing any keyboard input
2898 * to the command. 2839 * to the command.
2899 */ 2840 */
2900unicode_t 2841wchar_t
2901rxvt_term::cmd_getc () 2842rxvt_term::cmd_getc () THROW ((class out_of_input))
2902{ 2843{
2903 unicode_t c = next_char (); 2844 wchar_t c = next_char ();
2904 2845
2905 if (c == NOCHAR) 2846 if (c == NOCHAR)
2906 throw out_of_input; 2847 throw out_of_input;
2907 2848
2908 return c; 2849 return c;
2909} 2850}
2910 2851
2911unicode_t 2852uint32_t
2912rxvt_term::cmd_get8 () 2853rxvt_term::cmd_get8 () THROW ((class out_of_input))
2913{ 2854{
2914 unicode_t c = next_octet (); 2855 uint32_t c = next_octet ();
2915 2856
2916 if (c == NOCHAR) 2857 if (c == NOCHAR)
2917 throw out_of_input; 2858 throw out_of_input;
2918 2859
2919 return c; 2860 return c;
3186 break; 3127 break;
3187 3128
3188 /* 8.3.87: NEXT LINE */ 3129 /* 8.3.87: NEXT LINE */
3189 case C1_NEL: /* ESC E */ 3130 case C1_NEL: /* ESC E */
3190 { 3131 {
3191 unicode_t nlcr[] = { C0_LF, C0_CR }; 3132 wchar_t nlcr[] = { C0_LF, C0_CR };
3192 scr_add_lines (nlcr, 1, 2); 3133 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3193 } 3134 }
3194 break; 3135 break;
3195 3136
3196 /* kidnapped escape sequence: Should be 8.3.48 */ 3137 /* kidnapped escape sequence: Should be 8.3.48 */
3197 case C1_ESA: /* ESC G */ 3138 case C1_ESA: /* ESC G */
3338 ndef = get_byte_array_bit (csi_defaults, i); 3279 ndef = get_byte_array_bit (csi_defaults, i);
3339 for (p = 0; p < nargs; p++) 3280 for (p = 0; p < nargs; p++)
3340 if (arg[p] == -1) 3281 if (arg[p] == -1)
3341 arg[p] = ndef; 3282 arg[p] = ndef;
3342 3283
3343#ifdef DEBUG_CMD
3344 fprintf (stderr, "CSI ");
3345 for (p = 0; p < nargs; p++)
3346 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3347 fprintf (stderr, "%c\n", ch);
3348#endif
3349
3350 /* 3284 /*
3351 * private mode handling 3285 * private mode handling
3352 */ 3286 */
3353 if (priv) 3287 if (priv)
3354 { 3288 {
3355 switch (priv) 3289 switch (priv)
3356 { 3290 {
3357 case '>': 3291 case '>':
3358 if (ch == CSI_DA) /* secondary device attributes */ 3292 if (ch == CSI_DA) /* secondary device attributes */
3293 {
3294 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3295 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.
3296 //
3297 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3298 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3299 // that we do not support xterm mouse reporting (should be 95 when we do).
3300 //
3359 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3301 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);
3302 }
3360 break; 3303 break;
3361 case '?': 3304 case '?':
3362 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3305 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3363 process_terminal_mode (ch, priv, nargs, arg); 3306 process_terminal_mode (ch, priv, nargs, arg);
3364 break; 3307 break;
3796 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3739 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3797 */ 3740 */
3798void 3741void
3799rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3742rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3800{ 3743{
3801 int changed = 0;
3802 int color; 3744 int color;
3803 char *buf, *name; 3745 char *buf, *name;
3804 bool query = str[0] == '?' && !str[1]; 3746 bool query = str[0] == '?' && !str[1];
3805 int saveop = op; 3747 int saveop = op;
3806 dDisp; 3748 dDisp;
3861 { 3803 {
3862 if ((name = strchr (buf, ';')) == NULL) 3804 if ((name = strchr (buf, ';')) == NULL)
3863 break; 3805 break;
3864 3806
3865 *name++ = '\0'; 3807 *name++ = '\0';
3866 color = atoi (buf); 3808 color = atoi (buf) + minCOLOR;
3867 3809
3868 if (color < 0 || color >= TOTAL_COLORS) 3810 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3869 break; 3811 break;
3870 3812
3871 if ((buf = strchr (name, ';')) != NULL) 3813 if ((buf = strchr (name, ';')) != NULL)
3872 *buf++ = '\0'; 3814 *buf++ = '\0';
3873 3815
3874 if (name[0] == '?' && !name[1]) 3816 if (name[0] == '?' && !name[1])
3875 { 3817 {
3876 unsigned short r, g, b; 3818 unsigned short r, g, b;
3877 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3819 pix_colors_focused[color].get (display, r, g, b);
3878 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3820 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3879 } 3821 }
3880 else 3822 else
3881 set_window_color (color + minCOLOR, name); 3823 set_window_color (color, name);
3882 } 3824 }
3883 break; 3825 break;
3884 case XTerm_Color00: 3826 case XTerm_Color00:
3885 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3827 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3886 break; 3828 break;
3887 case XTerm_Color01: 3829 case XTerm_Color01:
3888 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3830 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3889 break; 3831 break;
3890#ifndef NO_CURSORCOLOR 3832#ifndef NO_CURSORCOLOR
3891 case XTerm_Color_cursor: 3833 case XTerm_Color_cursor:
3892 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3834 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3893 break; 3835 break;
3897 break; 3839 break;
3898 case XTerm_Color_pointer_bg: 3840 case XTerm_Color_pointer_bg:
3899 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3841 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3900 break; 3842 break;
3901#ifndef NO_BOLD_UNDERLINE_REVERSE 3843#ifndef NO_BOLD_UNDERLINE_REVERSE
3902 case XTerm_Color_BD:
3903 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3904 break;
3905 case XTerm_Color_UL:
3906 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3907 break;
3908 case XTerm_Color_RV: 3844 case XTerm_Color_RV:
3909 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3845 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3846 break;
3847 case Rxvt_Color_BD:
3848 case URxvt_Color_BD:
3849 process_color_seq (op, Color_BD, str, resp);
3850 break;
3851 case Rxvt_Color_UL:
3852 case URxvt_Color_UL:
3853 process_color_seq (op, Color_UL, str, resp);
3910 break; 3854 break;
3911 case URxvt_Color_IT: 3855 case URxvt_Color_IT:
3912 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3856 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3913 break; 3857 break;
3914#endif 3858#endif
3919 if (am_transparent) 3863 if (am_transparent)
3920 want_full_refresh = want_refresh = 1; 3864 want_full_refresh = want_refresh = 1;
3921 break; 3865 break;
3922#endif 3866#endif
3923 3867
3924 case XTerm_Pixmap: 3868 case Rxvt_Pixmap:
3869 {
3925 if (*str != ';') 3870 if (*str != ';')
3926 { 3871 {
3927#if XPM_BACKGROUND 3872#if XPM_BACKGROUND
3928 scale_pixmap (""); /* reset to default scaling */ 3873 scale_pixmap (""); /* reset to default scaling */
3929 set_bgPixmap (str); /* change pixmap */ 3874 set_bgPixmap (str); /* change pixmap */
3930#endif
3931 scr_touch (true); 3875 scr_touch (true);
3876#endif
3932 } 3877 }
3878
3879 int changed = 0;
3880
3933 while ((str = strchr (str, ';')) != NULL) 3881 while ((str = strchr (str, ';')) != NULL)
3934 { 3882 {
3935 str++; 3883 str++;
3936#if XPM_BACKGROUND 3884#if XPM_BACKGROUND
3937 changed += scale_pixmap (str); 3885 changed += scale_pixmap (str);
3938#endif 3886#endif
3939 } 3887 }
3940 3888
3941 if (changed) 3889 if (changed)
3942 { 3890 {
3943#ifdef XPM_BACKGROUND 3891#ifdef XPM_BACKGROUND
3944 resize_pixmap (); 3892 resize_pixmap ();
3945#endif
3946 scr_touch (true); 3893 scr_touch (true);
3894#endif
3947 } 3895 }
3896 }
3948 break; 3897 break;
3949 3898
3950 case XTerm_restoreFG: 3899 case Rxvt_restoreFG:
3951 set_window_color (Color_fg, str); 3900 set_window_color (Color_fg, str);
3952 break; 3901 break;
3953 case XTerm_restoreBG: 3902 case Rxvt_restoreBG:
3954 set_window_color (Color_bg, str); 3903 set_window_color (Color_bg, str);
3955 break; 3904 break;
3956 3905
3957 case XTerm_logfile: 3906 case XTerm_logfile:
3958 // TODO, when secure mode? 3907 // TODO, when secure mode?
3959 break; 3908 break;
3960 3909
3961#ifdef MENUBAR
3962 case URxvt_Menu:
3963 if (OPTION (Opt_insecure))
3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3965 break;
3966#endif
3967#if 0 3910#if 0
3968 case XTerm_dumpscreen: /* no error notices */ 3911 case Rxvt_dumpscreen: /* no error notices */
3969 { 3912 {
3970 int fd; 3913 int fd;
3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3914 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3972 { 3915 {
3973 scr_dump (fd); 3916 scr_dump (fd);
4004 if (query) 3947 if (query)
4005 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3948 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4006 else 3949 else
4007 { 3950 {
4008 set_locale (str); 3951 set_locale (str);
4009 pty.set_utf8_mode (enc_utf8); 3952 pty->set_utf8_mode (enc_utf8);
4010 init_xlocale (); 3953 init_xlocale ();
4011 } 3954 }
4012 break; 3955 break;
4013 3956
4014 case URxvt_view_up: 3957 case URxvt_view_up:
4025 break; 3968 break;
4026#endif 3969#endif
4027 3970
4028#if ENABLE_PERL 3971#if ENABLE_PERL
4029 case URxvt_perl: 3972 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3973 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4031 ; // no responses yet 3974 ; // no responses yet
4032 break; 3975 break;
4033#endif 3976#endif
4034 } 3977 }
4035} 3978}
4067 return state; 4010 return state;
4068} 4011}
4069 4012
4070/* we're not using priv _yet_ */ 4013/* we're not using priv _yet_ */
4071void 4014void
4072rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4015rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4073{ 4016{
4074 unsigned int i, j; 4017 unsigned int i, j;
4075 int state; 4018 int state;
4076 4019
4077 static const struct 4020 static const struct
4088 { 5, PrivMode_rVideo }, 4031 { 5, PrivMode_rVideo },
4089 { 6, PrivMode_relOrigin }, 4032 { 6, PrivMode_relOrigin },
4090 { 7, PrivMode_Autowrap }, 4033 { 7, PrivMode_Autowrap },
4091 // 8, bi-directional support mode 4034 // 8, bi-directional support mode
4092 { 9, PrivMode_MouseX10 }, 4035 { 9, PrivMode_MouseX10 },
4093#ifdef menuBar_esc
4094 { menuBar_esc, PrivMode_menuBar },
4095#endif
4096 // 18, 19 printing-related 4036 // 18, 19 printing-related
4097 { 25, PrivMode_VisibleCursor }, 4037 { 25, PrivMode_VisibleCursor },
4098#ifdef scrollBar_esc 4038#ifdef scrollBar_esc
4099 { scrollBar_esc, PrivMode_scrollBar }, 4039 { scrollBar_esc, PrivMode_scrollBar },
4100#endif 4040#endif
4147 /* extra handling for values with state unkept */ 4087 /* extra handling for values with state unkept */
4148 switch (arg[i]) 4088 switch (arg[i])
4149 { 4089 {
4150#if ENABLE_STYLES 4090#if ENABLE_STYLES
4151 case 1021: 4091 case 1021:
4152 if (mode) 4092 set_option (Opt_intensityStyles, mode);
4153 SET_OPTION (Opt_intensityStyles);
4154 else
4155 CLR_OPTION (Opt_intensityStyles);
4156 4093
4157 scr_touch (true); 4094 scr_touch (true);
4158 break; 4095 break;
4159#endif 4096#endif
4160 case 1048: /* alternative cursor save */ 4097 case 1048: /* alternative cursor save */
4182 case 3: /* 80/132 */ 4119 case 3: /* 80/132 */
4183 if (priv_modes & PrivMode_132OK) 4120 if (priv_modes & PrivMode_132OK)
4184 set_widthheight (((state ? 132 : 80) * fwidth), height); 4121 set_widthheight (((state ? 132 : 80) * fwidth), height);
4185 break; 4122 break;
4186 case 4: /* smooth scrolling */ 4123 case 4: /* smooth scrolling */
4187 if (!state) 4124 set_option (Opt_jumpScroll, !state);
4188 SET_OPTION (Opt_jumpScroll);
4189 else
4190 CLR_OPTION (Opt_jumpScroll);
4191 break; 4125 break;
4192 case 5: /* reverse video */ 4126 case 5: /* reverse video */
4193 scr_rvideo_mode (state); 4127 scr_rvideo_mode (state);
4194 break; 4128 break;
4195 case 6: /* relative/absolute origins */ 4129 case 6: /* relative/absolute origins */
4201 /* case 8: - auto repeat, can't do on a per window basis */ 4135 /* case 8: - auto repeat, can't do on a per window basis */
4202 case 9: /* X10 mouse reporting */ 4136 case 9: /* X10 mouse reporting */
4203 if (state) /* orthogonal */ 4137 if (state) /* orthogonal */
4204 priv_modes &= ~PrivMode_MouseX11; 4138 priv_modes &= ~PrivMode_MouseX11;
4205 break; 4139 break;
4206#ifdef menuBar_esc
4207 case menuBar_esc:
4208#ifdef MENUBAR
4209 map_menuBar (state);
4210#endif
4211 break;
4212#endif
4213#ifdef scrollBar_esc 4140#ifdef scrollBar_esc
4214 case scrollBar_esc: 4141 case scrollBar_esc:
4215 if (scrollbar_mapping (state)) 4142 if (scrollbar_mapping (state))
4216 { 4143 {
4217 resize_all_windows (0, 0, 0); 4144 resize_all_windows (0, 0, 0);
4236#if 0 4163#if 0
4237 case 1001: 4164 case 1001:
4238 break; /* X11 mouse highlighting */ 4165 break; /* X11 mouse highlighting */
4239#endif 4166#endif
4240 case 1010: /* scroll to bottom on TTY output inhibit */ 4167 case 1010: /* scroll to bottom on TTY output inhibit */
4241 if (!state) 4168 set_option (Opt_scrollTtyOutput, !state);
4242 SET_OPTION (Opt_scrollTtyOutput);
4243 else
4244 CLR_OPTION (Opt_scrollTtyOutput);
4245 break; 4169 break;
4246 case 1011: /* scroll to bottom on key press */ 4170 case 1011: /* scroll to bottom on key press */
4247 if (state) 4171 set_option (Opt_scrollTtyKeypress, state);
4248 SET_OPTION (Opt_scrollTtyKeypress);
4249 else
4250 CLR_OPTION (Opt_scrollTtyKeypress);
4251 break; 4172 break;
4252 case 1047: /* secondary screen w/ clearing last */ 4173 case 1047: /* secondary screen w/ clearing last */
4253 if (OPTION (Opt_secondaryScreen)) 4174 if (OPTION (Opt_secondaryScreen))
4254 if (current_screen != PRIMARY) 4175 if (current_screen != PRIMARY)
4255 scr_erase_screen (2); 4176 scr_erase_screen (2);
4465const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4386const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4466 4387
4467void 4388void
4468rxvt_term::tt_write (const char *data, unsigned int len) 4389rxvt_term::tt_write (const char *data, unsigned int len)
4469{ 4390{
4470 if (pty.pty < 0) 4391 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4471 return; 4392 return;
4472 4393
4394 if (pty->pty < 0)
4395 return;
4396
4473 if (v_buflen == 0) 4397 if (v_buflen == 0)
4474 { 4398 {
4475 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4399 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4476 4400
4477 if ((unsigned int)written == len) 4401 if ((unsigned int)written == len)
4478 return; 4402 return;
4479 4403
4480 data += written; 4404 data += written;
4489 pty_ev.set (EVENT_READ | EVENT_WRITE); 4413 pty_ev.set (EVENT_READ | EVENT_WRITE);
4490} 4414}
4491 4415
4492void rxvt_term::pty_write () 4416void rxvt_term::pty_write ()
4493{ 4417{
4494 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4418 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4495 4419
4496 if (written > 0) 4420 if (written > 0)
4497 { 4421 {
4498 v_buflen -= written; 4422 v_buflen -= written;
4499 4423

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines