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.250 by root, Sun Jan 8 06:35:23 2006 UTC vs.
Revision 1.284 by root, Wed Jan 25 02:42:06 2006 UTC

… …
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_STR_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;
978 int end_row = row + nrow; 960 int end_row = row + nrow;
979 961
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 962 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 963 --row;
982 964
983 do 965 do
984 { 966 {
985 int start_row = row; 967 int start_row = row;
… …
1005 break; 987 break;
1006 } 988 }
1007 } 989 }
1008 while (l->is_longer () && row < end_row); 990 while (l->is_longer () && row < end_row);
1009 } 991 }
1010 while (++row < end_row); 992 while (row < end_row);
1011 } 993 }
1012 994
1013 scr_refresh (refresh_type); 995 scr_refresh ();
1014 scrollbar_show (1); 996 scrollbar_show (1);
1015#ifdef USE_XIM 997#ifdef USE_XIM
1016 IMSendSpot (); 998 IMSendSpot ();
1017#endif 999#endif
1018 } 1000 }
… …
1021} 1003}
1022 1004
1023void 1005void
1024rxvt_term::check_cb (check_watcher &w) 1006rxvt_term::check_cb (check_watcher &w)
1025{ 1007{
1026 SET_R (this); 1008 make_current ();
1027 SET_LOCALE (locale);
1028 1009
1029 display->flush (); 1010 display->flush ();
1030 1011
1031 if (want_refresh && !flush_ev.active) 1012 if (want_refresh && !flush_ev.active)
1032 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
1033} 1014}
1034 1015
1035void 1016void
1036rxvt_term::flush_cb (time_watcher &w) 1017rxvt_term::flush_cb (time_watcher &w)
1037{ 1018{
1038 SET_R (this); 1019 make_current ();
1039 SET_LOCALE (locale);
1040 1020
1041 refresh_limit = 1; 1021 refresh_limit = 1;
1042 refresh_count = 0; 1022 refresh_count = 0;
1043 flush (); 1023 flush ();
1044} 1024}
… …
1048rxvt_term::cursor_blink_cb (time_watcher &w) 1028rxvt_term::cursor_blink_cb (time_watcher &w)
1049{ 1029{
1050 hidden_cursor = !hidden_cursor; 1030 hidden_cursor = !hidden_cursor;
1051 want_refresh = 1; 1031 want_refresh = 1;
1052 1032
1053 w.start (w.at + BLINK_INTERVAL); 1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
1054} 1034}
1055#endif 1035#endif
1056 1036
1057#ifdef TEXT_BLINK 1037#ifdef TEXT_BLINK
1058void 1038void
… …
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1052rxvt_term::cont_scroll_cb (time_watcher &w)
1073{ 1053{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1054 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1055 scr_page (scrollbar_isUp() ? UP : DN, 1))
1076 { 1056 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1057 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080 } 1059 }
1081} 1060}
1082#endif 1061#endif
… …
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1065rxvt_term::sel_scroll_cb (time_watcher &w)
1087{ 1066{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1067 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1068 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1069 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1070 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094 } 1072 }
1095} 1073}
1096#endif 1074#endif
… …
1101{ 1079{
1102 if (mouse_slip_wheel_speed == 0 1080 if (mouse_slip_wheel_speed == 0
1103 || 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)
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1082 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1083 {
1106 if (view_start == nsaved || 1084 if (view_start == top_row || view_start == 0)
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0; 1085 mouse_slip_wheel_speed = 0;
1109 1086
1110 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1087 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1113 } 1089 }
1114} 1090}
1115#endif 1091#endif
… …
1145 1121
1146 memmove (cmdbuf_base, cmdbuf_ptr, n); 1122 memmove (cmdbuf_base, cmdbuf_ptr, n);
1147 cmdbuf_ptr = cmdbuf_base; 1123 cmdbuf_ptr = cmdbuf_base;
1148 cmdbuf_endp = cmdbuf_ptr + n; 1124 cmdbuf_endp = cmdbuf_ptr + n;
1149 1125
1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1126 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1151 1127
1152 if (r > 0) 1128 if (r > 0)
1153 { 1129 {
1154 cmdbuf_endp += r; 1130 cmdbuf_endp += r;
1155 return true; 1131 return true;
… …
1173} 1149}
1174 1150
1175void 1151void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1152rxvt_term::pty_cb (io_watcher &w, short revents)
1177{ 1153{
1178 SET_R (this); 1154 make_current ();
1179 SET_LOCALE (locale);
1180 1155
1181 if (revents & EVENT_READ) 1156 if (revents & EVENT_READ)
1182 // loop, but don't allow a single term to monopolize us 1157 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1158 while (pty_fill ())
1184 if (cmd_parse ()) 1159 if (cmd_parse ())
… …
1216} 1191}
1217 1192
1218void 1193void
1219rxvt_term::pointer_cb (time_watcher &w) 1194rxvt_term::pointer_cb (time_watcher &w)
1220{ 1195{
1221 SET_R (this); 1196 make_current ();
1222 SET_LOCALE (locale);
1223 1197
1224 pointer_blank (); 1198 pointer_blank ();
1225} 1199}
1226#endif 1200#endif
1227 1201
… …
1292 (32 + button_number + key_state), 1266 (32 + button_number + key_state),
1293 (32 + x + 1), 1267 (32 + x + 1),
1294 (32 + y + 1)); 1268 (32 + y + 1));
1295} 1269}
1296 1270
1297#ifdef USING_W11LIB
1298void
1299rxvt_W11_process_x_event (XEvent *ev)
1300{
1301 rxvt_t *r = rxvt_get_r ();
1302
1303 x_cb (*ev);
1304}
1305#endif
1306
1307/*{{{ process an X event */ 1271/*{{{ process an X event */
1308void 1272void
1309rxvt_term::x_cb (XEvent &ev) 1273rxvt_term::x_cb (XEvent &ev)
1310{ 1274{
1275 make_current ();
1276
1311 dDisp; 1277 dDisp;
1312 1278
1313 SET_R (this); 1279 if (ev.xany.window == vt
1314 SET_LOCALE (locale); 1280 && SHOULD_INVOKE (HOOK_X_EVENT)
1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282 return;
1315 1283
1284 // for XQueryPointer
1316 Window unused_root, unused_child; 1285 Window unused_root, unused_child;
1317 int unused_root_x, unused_root_y; 1286 int unused_root_x, unused_root_y;
1318 unsigned int unused_mask; 1287 unsigned int unused_mask;
1319 1288
1320 switch (ev.type) 1289 switch (ev.type)
… …
1327 1296
1328 break; 1297 break;
1329 1298
1330 case KeyRelease: 1299 case KeyRelease:
1331 { 1300 {
1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1301#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1333 KeySym ks; 1302 KeySym keysym;
1334 1303
1335 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1304 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1336#endif 1305#endif
1337 1306
1338#if ENABLE_FRILLS || ISO_14755 1307#if ENABLE_FRILLS || ISO_14755
1339 // ISO 14755 support 1308 // ISO 14755 support
1340 if (iso14755buf) 1309 if (iso14755buf)
… …
1345# endif 1314# endif
1346# if ISO_14755 1315# if ISO_14755
1347 // iso14755 part 5.2 handling: release time 1316 // iso14755 part 5.2 handling: release time
1348 // first: controls 1317 // first: controls
1349 if ((ev.xkey.state & ControlMask) 1318 if ((ev.xkey.state & ControlMask)
1350 && ((ks >= 0x40 && ks <= 0x5f) 1319 && ((keysym >= 0x40 && keysym <= 0x5f)
1351 || (ks >= 0x61 && ks <= 0x7f))) 1320 || (keysym >= 0x61 && keysym <= 0x7f)))
1352 { 1321 {
1353 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1322 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1354 commit_iso14755 (); 1323 commit_iso14755 ();
1355 goto skip_switch; 1324 goto skip_switch;
1356 } 1325 }
1357 1326
1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1327 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359 if (i[0] == ks) 1328 if (i[0] == keysym)
1360 { 1329 {
1361 iso14755buf = ISO_14755_51 | i[1]; 1330 iso14755buf = ISO_14755_51 | i[1];
1362 commit_iso14755 (); 1331 commit_iso14755 ();
1363 goto skip_switch; 1332 goto skip_switch;
1364 } 1333 }
… …
1388 iso14755buf = 0; 1357 iso14755buf = 0;
1389 } 1358 }
1390#endif 1359#endif
1391 1360
1392 if (ev.xany.window == vt 1361 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) 1362 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break; 1363 break;
1395 1364
1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1365#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1397 if (!(ev.xkey.state & ControlMask)) 1366 if (!(ev.xkey.state & ControlMask))
1398 slip_wheel_ev.stop (); 1367 slip_wheel_ev.stop ();
1399 else if (ks == XK_Control_L || ks == XK_Control_R) 1368 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1400 mouse_slip_wheel_speed = 0; 1369 mouse_slip_wheel_speed = 0;
1401#endif 1370#endif
1402 break; 1371 break;
1403 } 1372 }
1404 1373
… …
1410 button_release (ev.xbutton); 1379 button_release (ev.xbutton);
1411 break; 1380 break;
1412 1381
1413 case ClientMessage: 1382 case ClientMessage:
1414 if (ev.xclient.format == 32 1383 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1384 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416 { 1385 {
1386 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1387 {
1388 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1389 {
1417 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1390 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1391 {
1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1418 destroy (); 1393 destroy ();
1394 }
1419#if ENABLE_EWMH 1395#if ENABLE_EWMH
1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421 XSendEvent (disp, ev.xclient.window = display->root, 1397 XSendEvent (disp, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask, 1398 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &ev); 1399 &ev);
1400#endif
1401 }
1402 }
1403#if ENABLE_XEMBED
1404 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1405 {
1406 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1407 focus_in ();
1408 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1409 focus_out ();
1410 }
1424#endif 1411#endif
1425 } 1412 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1435#ifdef OFFIX_DND
1436 /* OffiX Dnd (drag 'n' drop) protocol */
1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438 && (ev.xclient.data.l[0] == DndFile
1439 || ev.xclient.data.l[0] == DndDir
1440 || ev.xclient.data.l[0] == DndLink))
1441 {
1442 /* Get Dnd data */
1443 Atom ActualType;
1444 int ActualFormat;
1445 unsigned char *data;
1446 unsigned long Size, RemainingBytes;
1447
1448 XGetWindowProperty (disp, display->root,
1449 xa[XA_DNDSELECTION],
1450 0L, 1000000L,
1451 False, AnyPropertyType,
1452 &ActualType, &ActualFormat,
1453 &Size, &RemainingBytes,
1454 &data);
1455 set_string_property (XA_CUT_BUFFER0, data);
1456 XFree (data);
1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459 }
1460#endif /* OFFIX_DND */
1461 break; 1413 break;
1462 1414
1463 case MappingNotify: 1415 case MappingNotify:
1464 XRefreshKeyboardMapping (&ev.xmapping); 1416 XRefreshKeyboardMapping (&ev.xmapping);
1465 break; 1417 break;
… …
1507 { 1459 {
1508 seen_resize = 1; 1460 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 } 1462 }
1511 1463
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513 if (OPTION (Opt_transparent)) 1467 if (OPTION (Opt_transparent))
1514 check_our_parents (); 1468 check_our_parents ();
1515#endif 1469#endif
1516 } 1470 }
1517 break; 1471 break;
1518 1472
1519 case PropertyNotify: 1473 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1475 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521 && ev.xproperty.state == PropertyNewValue) 1476 && ev.xproperty.state == PropertyNewValue)
1522 selection_property (ev.xproperty.window, ev.xproperty.atom); 1477 selection_property (ev.xproperty.window, ev.xproperty.atom);
1523 1478
1524 break; 1479 break;
1525 1480
1526 case SelectionClear: 1481 case SelectionClear:
1527 selection_clear (); 1482 selection_clear ();
… …
1571 1526
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1527 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1573 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1574 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1575 1530
1576 scr_refresh (refresh_type); 1531 want_refresh = 1;
1577 } 1532 }
1578 else 1533 else
1579 { 1534 {
1580 XEvent unused_event; 1535 XEvent unused_event;
1581 1536
… …
1587 if (isScrollbarWindow (ev.xany.window)) 1542 if (isScrollbarWindow (ev.xany.window))
1588 { 1543 {
1589 scrollBar.setIdle (); 1544 scrollBar.setIdle ();
1590 scrollbar_show (0); 1545 scrollbar_show (0);
1591 } 1546 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596 1547
1597#ifdef TRANSPARENT 1548#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0]) 1549 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window); 1550 XClearWindow (disp, ev.xany.window);
1600#endif 1551#endif
… …
1604 case MotionNotify: 1555 case MotionNotify:
1605#ifdef POINTER_BLANK 1556#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1557 if (hidden_pointer)
1607 pointer_unblank (); 1558 pointer_unblank ();
1608#endif 1559#endif
1609#if MENUBAR
1610 if (isMenuBarWindow (ev.xany.window))
1611 {
1612 menubar_control (ev.xbutton);
1613 break;
1614 }
1615#endif
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1560 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1561 break;
1618 1562
1619 if (ev.xany.window == vt) 1563 if (ev.xany.window == vt)
1620 { 1564 {
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop 1567 ; // nop
1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1624 { 1569 {
1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1570 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1626 ; 1571 ;
… …
1708 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1709 &ev.xbutton.x, &ev.xbutton.y, 1654 &ev.xbutton.x, &ev.xbutton.y,
1710 &unused_mask); 1655 &unused_mask);
1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1712 scrollbar_size ()); 1657 scrollbar_size ());
1713 scr_refresh (refresh_type); 1658 want_refresh = 1;
1714 refresh_limit = 0; 1659 refresh_limit = 0;
1715 scrollbar_show (1); 1660 scrollbar_show (1);
1716 } 1661 }
1717 break; 1662 break;
1718 } 1663 }
… …
1726 { 1671 {
1727 hidden_cursor = 0; 1672 hidden_cursor = 0;
1728 want_refresh = 1; 1673 want_refresh = 1;
1729 } 1674 }
1730 1675
1731 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1732 } 1677 }
1733#endif 1678#endif
1734 1679
1735#if defined(POINTER_BLANK) 1680#if defined(POINTER_BLANK)
1736 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1764 XSetICFocus (Input_Context); 1709 XSetICFocus (Input_Context);
1765 } 1710 }
1766#endif 1711#endif
1767#if CURSOR_BLINK 1712#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink)) 1713 if (OPTION (Opt_cursorBlink))
1769 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1770#endif 1715#endif
1771#if OFF_FOCUS_FADING 1716#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade]) 1717 if (rs[Rs_fade])
1773 { 1718 {
1774 pix_colors = pix_colors_focused; 1719 pix_colors = pix_colors_focused;
… …
1818 1763
1819#if TRANSPARENT 1764#if TRANSPARENT
1820void 1765void
1821rxvt_term::rootwin_cb (XEvent &ev) 1766rxvt_term::rootwin_cb (XEvent &ev)
1822{ 1767{
1823 SET_R (this); 1768 make_current ();
1824 SET_LOCALE (locale);
1825 1769
1826 switch (ev.type) 1770 switch (ev.type)
1827 { 1771 {
1828 case PropertyNotify: 1772 case PropertyNotify:
1829 /* 1773 /*
… …
1856 /* 1800 /*
1857 * VT window processing of button press 1801 * VT window processing of button press
1858 */ 1802 */
1859 if (ev.window == vt) 1803 if (ev.window == vt)
1860 { 1804 {
1805 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1861#if ISO_14755 1808#if ISO_14755
1862 // 5.4 1809 // 5.4
1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864 { 1811 {
1865 iso14755_54 (ev.x, ev.y); 1812 iso14755_54 (ev.x, ev.y);
… …
1907 else 1854 else
1908 { 1855 {
1909 if (ev.button != MEvent.button) 1856 if (ev.button != MEvent.button)
1910 MEvent.clicks = 0; 1857 MEvent.clicks = 0;
1911 1858
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913 switch (ev.button) 1859 switch (ev.button)
1914 { 1860 {
1915 case Button1: 1861 case Button1:
1916 /* allow meta + click to select rectangular areas */ 1862 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */ 1863 /* should be done in screen.C */
1918#if ENABLE_FRILLS 1864#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask); 1865 selection.rect = !!(ev.state & ModMetaMask);
1920#else 1866#else
1921 selection.rect = false; 1867 selection.rect = false;
1922#endif 1868#endif
1923 1869
1924 /* allow shift+left click to extend selection */ 1870 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1871 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1872 {
1927 if (MEvent.button == Button1 && clickintime) 1873 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1874 selection_rotate (ev.x, ev.y);
1929 else 1875 else
1930 selection_extend (ev.x, ev.y, 1); 1876 selection_extend (ev.x, ev.y, 1);
1931 } 1877 }
1932 else 1878 else
1933 { 1879 {
1934 if (MEvent.button == Button1 && clickintime) 1880 if (MEvent.button == Button1 && clickintime)
1935 MEvent.clicks++; 1881 MEvent.clicks++;
1936 else 1882 else
1937 MEvent.clicks = 1; 1883 MEvent.clicks = 1;
1938 1884
1939 selection_click (MEvent.clicks, ev.x, ev.y); 1885 selection_click (MEvent.clicks, ev.x, ev.y);
1940 } 1886 }
1941 1887
1942 MEvent.button = Button1; 1888 MEvent.button = Button1;
1943 break; 1889 break;
1944 1890
1945 case Button3: 1891 case Button3:
1946 if (MEvent.button == Button3 && clickintime) 1892 if (MEvent.button == Button3 && clickintime)
1947 selection_rotate (ev.x, ev.y); 1893 selection_rotate (ev.x, ev.y);
1948 else 1894 else
1949 selection_extend (ev.x, ev.y, 1); 1895 selection_extend (ev.x, ev.y, 1);
1950 1896
1951 MEvent.button = Button3; 1897 MEvent.button = Button3;
1952 break; 1898 break;
1953 } 1899 }
1954 } 1900 }
1955 1901
1956 MEvent.time = ev.time; 1902 MEvent.time = ev.time;
1957 return; 1903 return;
1958 } 1904 }
1959 1905
… …
2098 } 2044 }
2099 } 2045 }
2100 2046
2101 return; 2047 return;
2102 } 2048 }
2103
2104#if MENUBAR
2105 /*
2106 * Menubar window processing of button press
2107 */
2108 if (isMenuBarWindow (ev.window))
2109 menubar_control (ev);
2110#endif
2111} 2049}
2112 2050
2113void 2051void
2114rxvt_term::button_release (XButtonEvent &ev) 2052rxvt_term::button_release (XButtonEvent &ev)
2115{ 2053{
… …
2121 2059
2122 if (scrollbar_isUpDn ()) 2060 if (scrollbar_isUpDn ())
2123 { 2061 {
2124 scrollBar.setIdle (); 2062 scrollBar.setIdle ();
2125 scrollbar_show (0); 2063 scrollbar_show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2064 }
2130 2065
2131#ifdef SELECTION_SCROLLING 2066#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active) 2067 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2068 sel_scroll_ev.stop();
2134#endif 2069#endif
2135 2070
2136 if (ev.window == vt) 2071 if (ev.window == vt)
2137 { 2072 {
2073 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2074 return;
2075
2138#if ISO_14755 2076#if ISO_14755
2139 // 5.4 2077 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2078 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return; 2079 return;
2142#endif 2080#endif
2081
2143 if (reportmode) 2082 if (reportmode)
2144 { 2083 {
2145 /* mouse report from vt window */ 2084 /* mouse report from vt window */
2146 /* don't report release of wheel "buttons" */ 2085 /* don't report release of wheel "buttons" */
2147 if (ev.button >= 4) 2086 if (ev.button >= 4)
… …
2171 if (priv_modes & PrivMode_mouse_report 2110 if (priv_modes & PrivMode_mouse_report
2172 && bypass_keystate 2111 && bypass_keystate
2173 && ev.button == Button1 && MEvent.clicks <= 1) 2112 && ev.button == Button1 && MEvent.clicks <= 1)
2174 selection_extend (ev.x, ev.y, 0); 2113 selection_extend (ev.x, ev.y, 0);
2175 2114
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2179 switch (ev.button) 2115 switch (ev.button)
2180 { 2116 {
2181 case Button1: 2117 case Button1:
2182 case Button3: 2118 case Button3:
2183 selection_make (ev.time); 2119 selection_make (ev.time);
2184 break; 2120 break;
2121
2185 case Button2: 2122 case Button2:
2186 selection_request (ev.time, ev.x, ev.y); 2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2124 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2187 break; 2125 break;
2126
2188#ifdef MOUSE_WHEEL 2127#ifdef MOUSE_WHEEL
2189 case Button4: 2128 case Button4:
2190 case Button5: 2129 case Button5:
2191 { 2130 {
2192 int i; 2131 int i;
… …
2214 slip_wheel_ev.start (); 2153 slip_wheel_ev.start ();
2215 } 2154 }
2216 else 2155 else
2217 { 2156 {
2218# endif 2157# endif
2219# ifdef JUMP_MOUSE_WHEEL
2220 scr_page (v, i); 2158 scr_page (v, i);
2221 scr_refresh (SMOOTH_REFRESH);
2222 scrollbar_show (1); 2159 scrollbar_show (1);
2223# else
2224 while (i--)
2225 {
2226 scr_page (v, 1);
2227 scr_refresh (SMOOTH_REFRESH);
2228 scrollbar_show (1);
2229 }
2230# endif
2231# ifdef MOUSE_SLIP_WHEELING 2160# ifdef MOUSE_SLIP_WHEELING
2232 } 2161 }
2233#endif 2162# endif
2234 } 2163 }
2235 break; 2164 break;
2236#endif 2165#endif
2237 } 2166 }
2238 } 2167 }
2239#ifdef MENUBAR
2240 else if (isMenuBarWindow (ev.window))
2241 menubar_control (ev);
2242#endif
2243} 2168}
2244 2169
2245#ifdef TRANSPARENT 2170#ifdef TRANSPARENT
2246#if TINTING 2171#if TINTING
2247/* taken from aterm-0.4.2 */ 2172/* taken from aterm-0.4.2 */
… …
2684 am_transparent = 0; 2609 am_transparent = 0;
2685 /* XXX: also turn off Opt_transparent? */ 2610 /* XXX: also turn off Opt_transparent? */
2686 } 2611 }
2687 else 2612 else
2688 { 2613 {
2689#if WAIT_FOR_WM
2690 /* wait (an arbitrary period) for the WM to do its thing
2691 * needed for fvwm2.2.2 (and before?) */
2692 sleep (1);
2693#endif
2694 for (n = 0; n < (unsigned int)i; n++) 2614 for (n = 0; n < (unsigned int)i; n++)
2695 { 2615 {
2696 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2616 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2697 XClearWindow (disp, parent[n]); 2617 XClearWindow (disp, parent[n]);
2698 } 2618 }
… …
2790 } 2710 }
2791 2711
2792 // scr_add_lines only works for nlines <= nrow - 1. 2712 // scr_add_lines only works for nlines <= nrow - 1.
2793 if (nlines >= nrow - 1) 2713 if (nlines >= nrow - 1)
2794 { 2714 {
2715 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2795 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2716 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2796 scr_add_lines (buf, str - buf, nlines); 2717 scr_add_lines (buf, str - buf, nlines);
2797 2718
2798 nlines = 0; 2719 nlines = 0;
2799 str = buf; 2720 str = buf;
2800 eol = str + min (ncol, UBUFSIZ); 2721 eol = str + min (ncol, UBUFSIZ);
… …
2815 2736
2816 seq_begin = cmdbuf_ptr; 2737 seq_begin = cmdbuf_ptr;
2817 ch = next_char (); 2738 ch = next_char ();
2818 } 2739 }
2819 2740
2741 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2820 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2742 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2821 scr_add_lines (buf, str - buf, nlines); 2743 scr_add_lines (buf, str - buf, nlines);
2822 2744
2823 /* 2745 /*
2824 * If there have been a lot of new lines, then update the screen 2746 * If there have been a lot of new lines, then update the screen
2825 * What the heck I'll cheat and only refresh less than every page-full. 2747 * What the heck I'll cheat and only refresh less than every page-full.
… …
2831 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2753 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2832 refresh_limit++; 2754 refresh_limit++;
2833 else 2755 else
2834 { 2756 {
2835 flag = true; 2757 flag = true;
2836 scr_refresh (refresh_type); 2758 scr_refresh ();
2837 flush_ev.stop (); 2759 want_refresh = 1;
2838 } 2760 }
2839 } 2761 }
2840 2762
2841 } 2763 }
2842 else 2764 else
… …
2859 return flag; 2781 return flag;
2860} 2782}
2861 2783
2862// read the next character 2784// read the next character
2863wchar_t 2785wchar_t
2864rxvt_term::next_char () 2786rxvt_term::next_char () NOTHROW
2865{ 2787{
2866 while (cmdbuf_ptr < cmdbuf_endp) 2788 while (cmdbuf_ptr < cmdbuf_endp)
2867 { 2789 {
2868 // assume 7-bit to be ascii ALWAYS 2790 // assume 7-bit to be ascii ALWAYS
2869 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2791 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2890 return NOCHAR; 2812 return NOCHAR;
2891} 2813}
2892 2814
2893// read the next octet 2815// read the next octet
2894uint32_t 2816uint32_t
2895rxvt_term::next_octet () 2817rxvt_term::next_octet () NOTHROW
2896{ 2818{
2897 return cmdbuf_ptr < cmdbuf_endp 2819 return cmdbuf_ptr < cmdbuf_endp
2898 ? (unsigned char)*cmdbuf_ptr++ 2820 ? (unsigned char)*cmdbuf_ptr++
2899 : NOCHAR; 2821 : NOCHAR;
2900} 2822}
2823
2824static class out_of_input out_of_input;
2901 2825
2902/* rxvt_cmd_getc () - Return next input character */ 2826/* rxvt_cmd_getc () - Return next input character */
2903/* 2827/*
2904 * Return the next input character after first passing any keyboard input 2828 * Return the next input character after first passing any keyboard input
2905 * to the command. 2829 * to the command.
2906 */ 2830 */
2907wchar_t 2831wchar_t
2908rxvt_term::cmd_getc () 2832rxvt_term::cmd_getc () THROW ((class out_of_input))
2909{ 2833{
2910 wchar_t c = next_char (); 2834 wchar_t c = next_char ();
2911 2835
2912 if (c == NOCHAR) 2836 if (c == NOCHAR)
2913 throw out_of_input; 2837 throw out_of_input;
2914 2838
2915 return c; 2839 return c;
2916} 2840}
2917 2841
2918uint32_t 2842uint32_t
2919rxvt_term::cmd_get8 () 2843rxvt_term::cmd_get8 () THROW ((class out_of_input))
2920{ 2844{
2921 uint32_t c = next_octet (); 2845 uint32_t c = next_octet ();
2922 2846
2923 if (c == NOCHAR) 2847 if (c == NOCHAR)
2924 throw out_of_input; 2848 throw out_of_input;
… …
3345 ndef = get_byte_array_bit (csi_defaults, i); 3269 ndef = get_byte_array_bit (csi_defaults, i);
3346 for (p = 0; p < nargs; p++) 3270 for (p = 0; p < nargs; p++)
3347 if (arg[p] == -1) 3271 if (arg[p] == -1)
3348 arg[p] = ndef; 3272 arg[p] = ndef;
3349 3273
3350#ifdef DEBUG_CMD
3351 fprintf (stderr, "CSI ");
3352 for (p = 0; p < nargs; p++)
3353 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3354 fprintf (stderr, "%c\n", ch);
3355#endif
3356
3357 /* 3274 /*
3358 * private mode handling 3275 * private mode handling
3359 */ 3276 */
3360 if (priv) 3277 if (priv)
3361 { 3278 {
3362 switch (priv) 3279 switch (priv)
3363 { 3280 {
3364 case '>': 3281 case '>':
3365 if (ch == CSI_DA) /* secondary device attributes */ 3282 if (ch == CSI_DA) /* secondary device attributes */
3283 {
3284 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3285 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.
3286 //
3287 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3288 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3289 // that we do not support xterm mouse reporting (should be 95 when we do).
3290 //
3366 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3291 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);
3292 }
3367 break; 3293 break;
3368 case '?': 3294 case '?':
3369 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3295 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3370 process_terminal_mode (ch, priv, nargs, arg); 3296 process_terminal_mode (ch, priv, nargs, arg);
3371 break; 3297 break;
… …
3803 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3729 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3804 */ 3730 */
3805void 3731void
3806rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3732rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3807{ 3733{
3808 int changed = 0;
3809 int color; 3734 int color;
3810 char *buf, *name; 3735 char *buf, *name;
3811 bool query = str[0] == '?' && !str[1]; 3736 bool query = str[0] == '?' && !str[1];
3812 int saveop = op; 3737 int saveop = op;
3813 dDisp; 3738 dDisp;
… …
3868 { 3793 {
3869 if ((name = strchr (buf, ';')) == NULL) 3794 if ((name = strchr (buf, ';')) == NULL)
3870 break; 3795 break;
3871 3796
3872 *name++ = '\0'; 3797 *name++ = '\0';
3873 color = atoi (buf); 3798 color = atoi (buf) + minCOLOR;
3874 3799
3875 if (color < 0 || color >= TOTAL_COLORS) 3800 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3876 break; 3801 break;
3877 3802
3878 if ((buf = strchr (name, ';')) != NULL) 3803 if ((buf = strchr (name, ';')) != NULL)
3879 *buf++ = '\0'; 3804 *buf++ = '\0';
3880 3805
3881 if (name[0] == '?' && !name[1]) 3806 if (name[0] == '?' && !name[1])
3882 { 3807 {
3883 unsigned short r, g, b; 3808 unsigned short r, g, b;
3884 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3809 pix_colors_focused[color].get (display, r, g, b);
3885 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3810 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3886 } 3811 }
3887 else 3812 else
3888 set_window_color (color + minCOLOR, name); 3813 set_window_color (color, name);
3889 } 3814 }
3890 break; 3815 break;
3891 case XTerm_Color00: 3816 case XTerm_Color00:
3892 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3817 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3893 break; 3818 break;
3894 case XTerm_Color01: 3819 case XTerm_Color01:
3895 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3820 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3896 break; 3821 break;
3897#ifndef NO_CURSORCOLOR 3822#ifndef NO_CURSORCOLOR
3898 case XTerm_Color_cursor: 3823 case XTerm_Color_cursor:
3899 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3900 break; 3825 break;
… …
3904 break; 3829 break;
3905 case XTerm_Color_pointer_bg: 3830 case XTerm_Color_pointer_bg:
3906 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3907 break; 3832 break;
3908#ifndef NO_BOLD_UNDERLINE_REVERSE 3833#ifndef NO_BOLD_UNDERLINE_REVERSE
3909 case XTerm_Color_BD:
3910 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3911 break;
3912 case XTerm_Color_UL:
3913 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3914 break;
3915 case XTerm_Color_RV: 3834 case XTerm_Color_RV:
3916 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3836 break;
3837 case Rxvt_Color_BD:
3838 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp);
3840 break;
3841 case Rxvt_Color_UL:
3842 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp);
3917 break; 3844 break;
3918 case URxvt_Color_IT: 3845 case URxvt_Color_IT:
3919 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3920 break; 3847 break;
3921#endif 3848#endif
… …
3926 if (am_transparent) 3853 if (am_transparent)
3927 want_full_refresh = want_refresh = 1; 3854 want_full_refresh = want_refresh = 1;
3928 break; 3855 break;
3929#endif 3856#endif
3930 3857
3931 case XTerm_Pixmap: 3858 case Rxvt_Pixmap:
3859 {
3932 if (*str != ';') 3860 if (*str != ';')
3933 { 3861 {
3934#if XPM_BACKGROUND 3862#if XPM_BACKGROUND
3935 scale_pixmap (""); /* reset to default scaling */ 3863 scale_pixmap (""); /* reset to default scaling */
3936 set_bgPixmap (str); /* change pixmap */ 3864 set_bgPixmap (str); /* change pixmap */
3937#endif
3938 scr_touch (true); 3865 scr_touch (true);
3866#endif
3939 } 3867 }
3868
3869 int changed = 0;
3870
3940 while ((str = strchr (str, ';')) != NULL) 3871 while ((str = strchr (str, ';')) != NULL)
3941 { 3872 {
3942 str++; 3873 str++;
3943#if XPM_BACKGROUND 3874#if XPM_BACKGROUND
3944 changed += scale_pixmap (str); 3875 changed += scale_pixmap (str);
3945#endif 3876#endif
3946 } 3877 }
3947 3878
3948 if (changed) 3879 if (changed)
3949 { 3880 {
3950#ifdef XPM_BACKGROUND 3881#ifdef XPM_BACKGROUND
3951 resize_pixmap (); 3882 resize_pixmap ();
3952#endif
3953 scr_touch (true); 3883 scr_touch (true);
3884#endif
3954 } 3885 }
3886 }
3955 break; 3887 break;
3956 3888
3957 case XTerm_restoreFG: 3889 case Rxvt_restoreFG:
3958 set_window_color (Color_fg, str); 3890 set_window_color (Color_fg, str);
3959 break; 3891 break;
3960 case XTerm_restoreBG: 3892 case Rxvt_restoreBG:
3961 set_window_color (Color_bg, str); 3893 set_window_color (Color_bg, str);
3962 break; 3894 break;
3963 3895
3964 case XTerm_logfile: 3896 case XTerm_logfile:
3965 // TODO, when secure mode? 3897 // TODO, when secure mode?
3966 break; 3898 break;
3967 3899
3968#ifdef MENUBAR
3969 case URxvt_Menu:
3970 if (OPTION (Opt_insecure))
3971 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3972 break;
3973#endif
3974#if 0 3900#if 0
3975 case XTerm_dumpscreen: /* no error notices */ 3901 case Rxvt_dumpscreen: /* no error notices */
3976 { 3902 {
3977 int fd; 3903 int fd;
3978 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3904 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3979 { 3905 {
3980 scr_dump (fd); 3906 scr_dump (fd);
… …
4011 if (query) 3937 if (query)
4012 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3938 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4013 else 3939 else
4014 { 3940 {
4015 set_locale (str); 3941 set_locale (str);
4016 pty.set_utf8_mode (enc_utf8); 3942 pty->set_utf8_mode (enc_utf8);
4017 init_xlocale (); 3943 init_xlocale ();
4018 } 3944 }
4019 break; 3945 break;
4020 3946
4021 case URxvt_view_up: 3947 case URxvt_view_up:
… …
4074 return state; 4000 return state;
4075} 4001}
4076 4002
4077/* we're not using priv _yet_ */ 4003/* we're not using priv _yet_ */
4078void 4004void
4079rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4005rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4080{ 4006{
4081 unsigned int i, j; 4007 unsigned int i, j;
4082 int state; 4008 int state;
4083 4009
4084 static const struct 4010 static const struct
… …
4095 { 5, PrivMode_rVideo }, 4021 { 5, PrivMode_rVideo },
4096 { 6, PrivMode_relOrigin }, 4022 { 6, PrivMode_relOrigin },
4097 { 7, PrivMode_Autowrap }, 4023 { 7, PrivMode_Autowrap },
4098 // 8, bi-directional support mode 4024 // 8, bi-directional support mode
4099 { 9, PrivMode_MouseX10 }, 4025 { 9, PrivMode_MouseX10 },
4100#ifdef menuBar_esc
4101 { menuBar_esc, PrivMode_menuBar },
4102#endif
4103 // 18, 19 printing-related 4026 // 18, 19 printing-related
4104 { 25, PrivMode_VisibleCursor }, 4027 { 25, PrivMode_VisibleCursor },
4105#ifdef scrollBar_esc 4028#ifdef scrollBar_esc
4106 { scrollBar_esc, PrivMode_scrollBar }, 4029 { scrollBar_esc, PrivMode_scrollBar },
4107#endif 4030#endif
… …
4202 /* case 8: - auto repeat, can't do on a per window basis */ 4125 /* case 8: - auto repeat, can't do on a per window basis */
4203 case 9: /* X10 mouse reporting */ 4126 case 9: /* X10 mouse reporting */
4204 if (state) /* orthogonal */ 4127 if (state) /* orthogonal */
4205 priv_modes &= ~PrivMode_MouseX11; 4128 priv_modes &= ~PrivMode_MouseX11;
4206 break; 4129 break;
4207#ifdef menuBar_esc
4208 case menuBar_esc:
4209#ifdef MENUBAR
4210 map_menuBar (state);
4211#endif
4212 break;
4213#endif
4214#ifdef scrollBar_esc 4130#ifdef scrollBar_esc
4215 case scrollBar_esc: 4131 case scrollBar_esc:
4216 if (scrollbar_mapping (state)) 4132 if (scrollbar_mapping (state))
4217 { 4133 {
4218 resize_all_windows (0, 0, 0); 4134 resize_all_windows (0, 0, 0);
… …
4460const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4376const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4461 4377
4462void 4378void
4463rxvt_term::tt_write (const char *data, unsigned int len) 4379rxvt_term::tt_write (const char *data, unsigned int len)
4464{ 4380{
4465 if (pty.pty < 0) 4381 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4466 return; 4382 return;
4467 4383
4384 if (pty->pty < 0)
4385 return;
4386
4468 if (v_buflen == 0) 4387 if (v_buflen == 0)
4469 { 4388 {
4470 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4389 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4471 4390
4472 if ((unsigned int)written == len) 4391 if ((unsigned int)written == len)
4473 return; 4392 return;
4474 4393
4475 data += written; 4394 data += written;
… …
4484 pty_ev.set (EVENT_READ | EVENT_WRITE); 4403 pty_ev.set (EVENT_READ | EVENT_WRITE);
4485} 4404}
4486 4405
4487void rxvt_term::pty_write () 4406void rxvt_term::pty_write ()
4488{ 4407{
4489 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4408 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4490 4409
4491 if (written > 0) 4410 if (written > 0)
4492 { 4411 {
4493 v_buflen -= written; 4412 v_buflen -= written;
4494 4413

Diff Legend

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