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.234 by root, Wed Jan 4 04:42:45 2006 UTC vs.
Revision 1.276 by root, Fri Jan 20 11:02:46 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 {
… …
443 scr_move_to (0, 1); 440 scr_move_to (0, 1);
444 return; 441 return;
445 } 442 }
446 else if (keysym == XK_End) 443 else if (keysym == XK_End)
447 { 444 {
448 scr_move_to (1, 0); 445 scr_move_to (1, 1);
449 return; 446 return;
450 } 447 }
451 } 448 }
452#endif 449#endif
453 } 450 }
… …
464 { 461 {
465 switch (keysym) 462 switch (keysym)
466 { 463 {
467 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 466 selection_request (ev.time);
470 return; 467 return;
471#if TODO 468#if TODO
472 /* rxvt extras */ 469 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 471 change_font (FONT_UP);
… …
867#endif 864#endif
868 /* nil */ ; 865 /* nil */ ;
869 } 866 }
870 } 867 }
871 868
869 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
870 return;
871
872 if (len <= 0) 872 if (len <= 0)
873 return; /* not mapped */ 873 return; /* not mapped */
874 874
875 if (OPTION (Opt_scrollTtyKeypress)) 875 if (OPTION (Opt_scrollTtyKeypress))
876 if (view_start) 876 if (view_start)
… …
916#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
918} 918}
919/*}}} */ 919/*}}} */
920 920
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */
924unsigned int 922unsigned int
925rxvt_term::cmd_write (const char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 924{
927 unsigned int n, s; 925 unsigned int n, s;
928 926
… …
967 } 965 }
968#endif 966#endif
969 967
970 if (want_refresh) 968 if (want_refresh)
971 { 969 {
970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971 {
972 int row = view_start;
973 int end_row = row + nrow;
974
975 while (row > top_row && ROW (row - 1).is_longer ())
976 --row;
977
978 do
979 {
980 int start_row = row;
981 line_t *l;
982
983 do
984 {
985 l = &ROW (row++);
986
987 if (!(l->f & LINE_FILTERED))
988 {
989 // line not filtered, mark it as filtered
990 l->f |= LINE_FILTERED;
991 while (l->is_longer ())
992 {
993 l = &ROW (row++);
994 l->f |= LINE_FILTERED;
995 }
996
997 // and filter it
998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
999
1000 break;
1001 }
1002 }
1003 while (l->is_longer () && row < end_row);
1004 }
1005 while (row < end_row);
1006 }
1007
972 scr_refresh (refresh_type); 1008 scr_refresh ();
973 scrollbar_show (1); 1009 scrollbar_show (1);
974#ifdef USE_XIM 1010#ifdef USE_XIM
975 IMSendSpot (); 1011 IMSendSpot ();
976#endif 1012#endif
977 } 1013 }
… …
980} 1016}
981 1017
982void 1018void
983rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
984{ 1020{
985 SET_R (this); 1021 make_current ();
986 SET_LOCALE (locale);
987 1022
988 display->flush (); 1023 display->flush ();
989 1024
990 if (want_refresh && !flush_ev.active) 1025 if (want_refresh && !flush_ev.active)
991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
992} 1027}
993 1028
994void 1029void
995rxvt_term::flush_cb (time_watcher &w) 1030rxvt_term::flush_cb (time_watcher &w)
996{ 1031{
997 SET_R (this); 1032 make_current ();
998 SET_LOCALE (locale);
999 1033
1000 refresh_limit = 1; 1034 refresh_limit = 1;
1001 refresh_count = 0; 1035 refresh_count = 0;
1002 flush (); 1036 flush ();
1003} 1037}
… …
1007rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
1008{ 1042{
1009 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
1010 want_refresh = 1; 1044 want_refresh = 1;
1011 1045
1012 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1013} 1047}
1014#endif 1048#endif
1015 1049
1016#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
1017void 1051void
… …
1031rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
1032{ 1066{
1033 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1034 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1035 { 1069 {
1036 refresh_type |= SMOOTH_REFRESH;
1037 want_refresh = 1; 1070 want_refresh = 1;
1038 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1039 } 1072 }
1040} 1073}
1041#endif 1074#endif
… …
1045rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
1046{ 1079{
1047 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1048 { 1081 {
1049 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1050 refresh_type |= SMOOTH_REFRESH;
1051 want_refresh = 1; 1083 want_refresh = 1;
1052 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1053 } 1085 }
1054} 1086}
1055#endif 1087#endif
… …
1060{ 1092{
1061 if (mouse_slip_wheel_speed == 0 1093 if (mouse_slip_wheel_speed == 0
1062 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1063 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1064 { 1096 {
1065 if (view_start == nsaved || 1097 if (view_start == top_row || view_start == 0)
1066 view_start == 0)
1067 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1068 1099
1069 refresh_type |= SMOOTH_REFRESH;
1070 want_refresh = 1; 1100 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1072 } 1102 }
1073} 1103}
1074#endif 1104#endif
… …
1104 1134
1105 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1106 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1107 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1108 1138
1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1110 1140
1111 if (r > 0) 1141 if (r > 0)
1112 { 1142 {
1113 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1114 return true; 1144 return true;
… …
1132} 1162}
1133 1163
1134void 1164void
1135rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1136{ 1166{
1137 SET_R (this); 1167 make_current ();
1138 SET_LOCALE (locale);
1139 1168
1140 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1141 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1171 while (pty_fill ())
1143 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1163 1192
1164#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
1165void 1194void
1166rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1167{ 1196{
1168 if (! OPTION (Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1169 return; 1198 return;
1170 1199
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1200 XDefineCursor (display->display, vt, display->blank_cursor);
1172 XFlush (display->display); 1201 XFlush (display->display);
1173 1202
… …
1175} 1204}
1176 1205
1177void 1206void
1178rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1179{ 1208{
1180 SET_R (this); 1209 make_current ();
1181 SET_LOCALE (locale);
1182 1210
1183 pointer_blank (); 1211 pointer_blank ();
1184} 1212}
1185#endif 1213#endif
1186 1214
… …
1265 1293
1266/*{{{ process an X event */ 1294/*{{{ process an X event */
1267void 1295void
1268rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1269{ 1297{
1298 make_current ();
1299
1270 dDisp; 1300 dDisp;
1271 1301
1272 SET_R (this); 1302 if (ev.xany.window == vt
1273 SET_LOCALE (locale); 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return;
1274 1306
1275#if defined(CURSOR_BLINK) 1307 // for XQueryPointer
1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1277 {
1278 if (hidden_cursor)
1279 {
1280 hidden_cursor = 0;
1281 want_refresh = 1;
1282 }
1283
1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1285 }
1286#endif
1287
1288#if defined(POINTER_BLANK)
1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1290 {
1291 if (ev.type == MotionNotify
1292 || ev.type == ButtonPress
1293 || ev.type == ButtonRelease)
1294 if (hidden_pointer)
1295 pointer_unblank ();
1296
1297 if (ev.type == KeyPress && hidden_pointer == 0)
1298 pointer_blank ();
1299 }
1300#endif
1301
1302 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1310 unsigned int unused_mask;
1305 1311
1306 switch (ev.type) 1312 switch (ev.type)
… …
1313 1319
1314 break; 1320 break;
1315 1321
1316 case KeyRelease: 1322 case KeyRelease:
1317 { 1323 {
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1319 KeySym ks; 1325 KeySym keysym;
1320 1326
1321 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1322#endif 1328#endif
1323 1329
1324#if ENABLE_FRILLS || ISO_14755 1330#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support 1331 // ISO 14755 support
1326 if (iso14755buf) 1332 if (iso14755buf)
… …
1331# endif 1337# endif
1332# if ISO_14755 1338# if ISO_14755
1333 // iso14755 part 5.2 handling: release time 1339 // iso14755 part 5.2 handling: release time
1334 // first: controls 1340 // first: controls
1335 if ((ev.xkey.state & ControlMask) 1341 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f) 1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f))) 1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1338 { 1344 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1340 commit_iso14755 (); 1346 commit_iso14755 ();
1341 return; // case-break; 1347 goto skip_switch;
1342 } 1348 }
1343 1349
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks) 1351 if (i[0] == keysym)
1346 { 1352 {
1347 iso14755buf = ISO_14755_51 | i[1]; 1353 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 (); 1354 commit_iso14755 ();
1349 return; // case-break; 1355 goto skip_switch;
1350 } 1356 }
1351 1357
1352 scr_bell (); 1358 scr_bell ();
1353# endif 1359# endif
1354 iso14755buf = 0; 1360 iso14755buf = 0;
… …
1373 else 1379 else
1374 iso14755buf = 0; 1380 iso14755buf = 0;
1375 } 1381 }
1376#endif 1382#endif
1377 1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop (); 1390 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R) 1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
1383#endif 1393#endif
1384 break; 1394 break;
1385 } 1395 }
1386 1396
… …
1391 case ButtonRelease: 1401 case ButtonRelease:
1392 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1393 break; 1403 break;
1394 1404
1395 case ClientMessage: 1405 case ClientMessage:
1396 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32)
1397 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1398 { 1407 {
1408 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1409 {
1399 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1410 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1411 {
1412 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, ev, DT_END)))
1400 destroy (); 1413 destroy ();
1414 }
1401#if ENABLE_EWMH 1415#if ENABLE_EWMH
1402 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1416 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1403 XSendEvent (disp, ev.xclient.window = display->root, 1417 XSendEvent (disp, ev.xclient.window = display->root,
1404 False, SubstructureRedirectMask | SubstructureNotifyMask, 1418 False, SubstructureRedirectMask | SubstructureNotifyMask,
1405 &ev); 1419 &ev);
1420#endif
1421 }
1422#if ENABLE_XEMBED
1423 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1424 {
1425 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1426 focus_in ();
1427 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1428 focus_out ();
1429 }
1406#endif 1430#endif
1407 } 1431 }
1408#if ENABLE_XEMBED
1409 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1410 {
1411 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1412 focus_in ();
1413 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1414 focus_out ();
1415 }
1416#endif
1417#ifdef OFFIX_DND
1418 /* OffiX Dnd (drag 'n' drop) protocol */
1419 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1420 && (ev.xclient.data.l[0] == DndFile
1421 || ev.xclient.data.l[0] == DndDir
1422 || ev.xclient.data.l[0] == DndLink))
1423 {
1424 /* Get Dnd data */
1425 Atom ActualType;
1426 int ActualFormat;
1427 unsigned char *data;
1428 unsigned long Size, RemainingBytes;
1429
1430 XGetWindowProperty (disp, display->root,
1431 xa[XA_DNDSELECTION],
1432 0L, 1000000L,
1433 False, AnyPropertyType,
1434 &ActualType, &ActualFormat,
1435 &Size, &RemainingBytes,
1436 &data);
1437 set_string_property (XA_CUT_BUFFER0, data);
1438 XFree (data);
1439 selection_paste (display->root, XA_CUT_BUFFER0, true);
1440 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1441 }
1442#endif /* OFFIX_DND */
1443 break; 1432 break;
1444 1433
1445 case MappingNotify: 1434 case MappingNotify:
1446 XRefreshKeyboardMapping (&ev.xmapping); 1435 XRefreshKeyboardMapping (&ev.xmapping);
1447 break; 1436 break;
… …
1489 { 1478 {
1490 seen_resize = 1; 1479 seen_resize = 1;
1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1480 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1492 } 1481 }
1493 1482
1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1484
1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1485#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1495 if (OPTION (Opt_transparent)) 1486 if (OPTION (Opt_transparent))
1496 check_our_parents (); 1487 check_our_parents ();
1497#endif 1488#endif
1498 } 1489 }
… …
1516 1507
1517 case SelectionRequest: 1508 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1509 selection_send (ev.xselectionrequest);
1519 break; 1510 break;
1520 1511
1512 case MapNotify:
1513 mapped = 1;
1514#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1516#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break;
1519
1521 case UnmapNotify: 1520 case UnmapNotify:
1522 mapped = 0; 1521 mapped = 0;
1523#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1525#endif 1524#endif
1526 break; 1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1527
1528 case MapNotify:
1529 mapped = 1;
1530#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1532#endif
1533 break; 1526 break;
1534 1527
1535#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1536 case ReparentNotify: 1529 case ReparentNotify:
1537 rootwin_cb (ev); 1530 rootwin_cb (ev);
… …
1551 1544
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1555 1548
1556 scr_refresh (refresh_type); 1549 want_refresh = 1;
1557 } 1550 }
1558 else 1551 else
1559 { 1552 {
1560 XEvent unused_event; 1553 XEvent unused_event;
1561 1554
… …
1567 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1568 { 1561 {
1569 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1570 scrollbar_show (0); 1563 scrollbar_show (0);
1571 } 1564 }
1572#ifdef MENUBAR
1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1574 menubar_expose ();
1575#endif
1576 1565
1577#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1578 if (am_transparent && ev.xany.window == parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1579 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (disp, ev.xany.window);
1580#endif 1569#endif
… …
1584 case MotionNotify: 1573 case MotionNotify:
1585#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1575 if (hidden_pointer)
1587 pointer_unblank (); 1576 pointer_unblank ();
1588#endif 1577#endif
1589#if MENUBAR
1590 if (isMenuBarWindow (ev.xany.window))
1591 {
1592 menubar_control (ev.xbutton);
1593 break;
1594 }
1595#endif
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1579 break;
1598 1580
1599 if (ev.xany.window == vt) 1581 if (ev.xany.window == vt)
1600 { 1582 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1585 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1587 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1604 ; 1589 ;
1605 1590
1606 XQueryPointer (disp, vt, 1591 XQueryPointer (disp, vt,
… …
1686 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1673 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1675 scrollbar_size ());
1691 scr_refresh (refresh_type); 1676 want_refresh = 1;
1692 refresh_limit = 0; 1677 refresh_limit = 0;
1693 scrollbar_show (1); 1678 scrollbar_show (1);
1694 } 1679 }
1695 break; 1680 break;
1696 } 1681 }
1682
1683skip_switch: ;
1684
1685#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1687 {
1688 if (hidden_cursor)
1689 {
1690 hidden_cursor = 0;
1691 want_refresh = 1;
1692 }
1693
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1695 }
1696#endif
1697
1698#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 {
1701 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease)
1704 if (hidden_pointer)
1705 pointer_unblank ();
1706
1707 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank ();
1709 }
1710#endif
1697} 1711}
1698 1712
1699void 1713void
1700rxvt_term::focus_in () 1714rxvt_term::focus_in ()
1701{ 1715{
1702 if (!focus) 1716 if (!focus)
1703 { 1717 {
1704 focus = 1; 1718 focus = 1;
1705 want_refresh = 1; 1719 want_refresh = 1;
1706 1720
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1721 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708 1722
1709#if USE_XIM 1723#if USE_XIM
1710 if (Input_Context != NULL) 1724 if (Input_Context != NULL)
1711 { 1725 {
1712 IMSetStatusPosition (); 1726 IMSetStatusPosition ();
1713 XSetICFocus (Input_Context); 1727 XSetICFocus (Input_Context);
1714 } 1728 }
1715#endif 1729#endif
1716#if CURSOR_BLINK 1730#if CURSOR_BLINK
1717 if (OPTION (Opt_cursorBlink)) 1731 if (OPTION (Opt_cursorBlink))
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719#endif 1733#endif
1720#if OFF_FOCUS_FADING 1734#if OFF_FOCUS_FADING
1721 if (rs[Rs_fade]) 1735 if (rs[Rs_fade])
1722 { 1736 {
1723 pix_colors = pix_colors_focused; 1737 pix_colors = pix_colors_focused;
… …
1733 if (focus) 1747 if (focus)
1734 { 1748 {
1735 focus = 0; 1749 focus = 0;
1736 want_refresh = 1; 1750 want_refresh = 1;
1737 1751
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1752 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1753
1740#if ENABLE_FRILLS || ISO_14755 1754#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1755 if (iso14755buf)
1742 { 1756 {
1743 iso14755buf = 0; 1757 iso14755buf = 0;
… …
1767 1781
1768#if TRANSPARENT 1782#if TRANSPARENT
1769void 1783void
1770rxvt_term::rootwin_cb (XEvent &ev) 1784rxvt_term::rootwin_cb (XEvent &ev)
1771{ 1785{
1772 SET_R (this); 1786 make_current ();
1773 SET_LOCALE (locale);
1774 1787
1775 switch (ev.type) 1788 switch (ev.type)
1776 { 1789 {
1777 case PropertyNotify: 1790 case PropertyNotify:
1778 /* 1791 /*
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1839#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1840 if (ev.button == MEvent.button && clickintime)
1828 { 1841 {
1829 /* same button, within alloted time */ 1842 /* same button, within alloted time */
1830 MEvent.clicks++; 1843 MEvent.clicks++;
1844
1831 if (MEvent.clicks > 1) 1845 if (MEvent.clicks > 1)
1832 { 1846 {
1833 /* only report double clicks */ 1847 /* only report double clicks */
1834 MEvent.clicks = 2; 1848 MEvent.clicks = 2;
1835 mouse_report (ev); 1849 mouse_report (ev);
… …
1855 else 1869 else
1856 { 1870 {
1857 if (ev.button != MEvent.button) 1871 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1872 MEvent.clicks = 0;
1859 1873
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1874 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1875 switch (ev.button)
1862 { 1876 {
1863 case Button1: 1877 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1878 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1879 /* should be done in screen.C */
… …
1868#else 1882#else
1869 selection.rect = false; 1883 selection.rect = false;
1870#endif 1884#endif
1871 1885
1872 /* allow shift+left click to extend selection */ 1886 /* allow shift+left click to extend selection */
1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1874 { 1888 {
1875 if (MEvent.button == Button1 && clickintime) 1889 if (MEvent.button == Button1 && clickintime)
1876 selection_rotate (ev.x, ev.y); 1890 selection_rotate (ev.x, ev.y);
1877 else 1891 else
1878 selection_extend (ev.x, ev.y, 1); 1892 selection_extend (ev.x, ev.y, 1);
… …
2043 } 2057 }
2044 2058
2045 break; 2059 break;
2046 } 2060 }
2047 } 2061 }
2062
2048 return; 2063 return;
2049 } 2064 }
2050#if MENUBAR
2051 /*
2052 * Menubar window processing of button press
2053 */
2054 if (isMenuBarWindow (ev.window))
2055 menubar_control (ev);
2056#endif
2057} 2065}
2058 2066
2059void 2067void
2060rxvt_term::button_release (XButtonEvent &ev) 2068rxvt_term::button_release (XButtonEvent &ev)
2061{ 2069{
… …
2067 2075
2068 if (scrollbar_isUpDn ()) 2076 if (scrollbar_isUpDn ())
2069 { 2077 {
2070 scrollBar.setIdle (); 2078 scrollBar.setIdle ();
2071 scrollbar_show (0); 2079 scrollbar_show (0);
2072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2073 refresh_type &= ~SMOOTH_REFRESH;
2074#endif
2075 } 2080 }
2076 2081
2077#ifdef SELECTION_SCROLLING 2082#ifdef SELECTION_SCROLLING
2078 if (sel_scroll_ev.active) 2083 if (sel_scroll_ev.active)
2079 sel_scroll_ev.stop(); 2084 sel_scroll_ev.stop();
… …
2117 if (priv_modes & PrivMode_mouse_report 2122 if (priv_modes & PrivMode_mouse_report
2118 && bypass_keystate 2123 && bypass_keystate
2119 && ev.button == Button1 && MEvent.clicks <= 1) 2124 && ev.button == Button1 && MEvent.clicks <= 1)
2120 selection_extend (ev.x, ev.y, 0); 2125 selection_extend (ev.x, ev.y, 0);
2121 2126
2127 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2128 return;
2129
2122 switch (ev.button) 2130 switch (ev.button)
2123 { 2131 {
2124 case Button1: 2132 case Button1:
2125 case Button3: 2133 case Button3:
2126 selection_make (ev.time); 2134 selection_make (ev.time);
2127 break; 2135 break;
2136
2128 case Button2: 2137 case Button2:
2129 selection_request (ev.time, ev.x, ev.y); 2138 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2139 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2130 break; 2140 break;
2141
2131#ifdef MOUSE_WHEEL 2142#ifdef MOUSE_WHEEL
2132 case Button4: 2143 case Button4:
2133 case Button5: 2144 case Button5:
2134 { 2145 {
2135 int i; 2146 int i;
… …
2157 slip_wheel_ev.start (); 2168 slip_wheel_ev.start ();
2158 } 2169 }
2159 else 2170 else
2160 { 2171 {
2161# endif 2172# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2173 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2174 scrollbar_show (1);
2166# else
2167 while (i--)
2168 {
2169 scr_page (v, 1);
2170 scr_refresh (SMOOTH_REFRESH);
2171 scrollbar_show (1);
2172 }
2173# endif
2174# ifdef MOUSE_SLIP_WHEELING 2175# ifdef MOUSE_SLIP_WHEELING
2175 } 2176 }
2176#endif 2177# endif
2177 } 2178 }
2178 break; 2179 break;
2179#endif 2180#endif
2180 } 2181 }
2181 } 2182 }
2182#ifdef MENUBAR
2183 else if (isMenuBarWindow (ev.window))
2184 menubar_control (ev);
2185#endif
2186} 2183}
2187 2184
2188#ifdef TRANSPARENT 2185#ifdef TRANSPARENT
2189#if TINTING 2186#if TINTING
2190/* taken from aterm-0.4.2 */ 2187/* taken from aterm-0.4.2 */
… …
2670 2667
2671bool 2668bool
2672rxvt_term::cmd_parse () 2669rxvt_term::cmd_parse ()
2673{ 2670{
2674 bool flag = false; 2671 bool flag = false;
2675 unicode_t ch = NOCHAR; 2672 wchar_t ch = NOCHAR;
2676 char *seq_begin; // remember start of esc-sequence here 2673 char *seq_begin; // remember start of esc-sequence here
2677 2674
2678 for (;;) 2675 for (;;)
2679 { 2676 {
2680 if (ch == NOCHAR) 2677 if (ch == NOCHAR)
2681 { 2678 {
2682 seq_begin = cmdbuf_ptr; 2679 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2680 ch = next_char ();
2684 }
2685 2681
2686 if (ch == NOCHAR) // TODO: improve 2682 if (ch == NOCHAR)
2687 break; 2683 break;
2684 }
2688 2685
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2686 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2687 {
2691 if (!seen_input) 2688 if (!seen_input)
2692 { 2689 {
… …
2701 if (seen_resize && cmd_pid) 2698 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2699 kill (-cmd_pid, SIGWINCH);
2703 } 2700 }
2704 2701
2705 /* Read a text string from the input buffer */ 2702 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2703 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2704 bool refreshnow = false;
2708 int nlines = 0; 2705 int nlines = 0;
2709 unicode_t *str = buf; 2706 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2707 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2708
2712 for (;;) 2709 for (;;)
2713 { 2710 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2711 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break; 2712 break;
… …
2733 } 2730 }
2734 2731
2735 // scr_add_lines only works for nlines <= nrow - 1. 2732 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2733 if (nlines >= nrow - 1)
2737 { 2734 {
2735 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2736 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2738 scr_add_lines (buf, nlines, str - buf); 2737 scr_add_lines (buf, str - buf, nlines);
2738
2739 nlines = 0; 2739 nlines = 0;
2740 str = buf; 2740 str = buf;
2741 eol = str + min (ncol, UBUFSIZ); 2741 eol = str + min (ncol, UBUFSIZ);
2742 } 2742 }
2743 2743
… …
2756 2756
2757 seq_begin = cmdbuf_ptr; 2757 seq_begin = cmdbuf_ptr;
2758 ch = next_char (); 2758 ch = next_char ();
2759 } 2759 }
2760 2760
2761 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2762 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2761 scr_add_lines (buf, nlines, str - buf); 2763 scr_add_lines (buf, str - buf, nlines);
2762 2764
2763 /* 2765 /*
2764 * If there have been a lot of new lines, then update the screen 2766 * If there have been a lot of new lines, then update the screen
2765 * What the heck I'll cheat and only refresh less than every page-full. 2767 * What the heck I'll cheat and only refresh less than every page-full.
2766 * the number of pages between refreshes is refresh_limit, which 2768 * the number of pages between refreshes is refresh_limit, which
… …
2771 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2773 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2772 refresh_limit++; 2774 refresh_limit++;
2773 else 2775 else
2774 { 2776 {
2775 flag = true; 2777 flag = true;
2776 scr_refresh (refresh_type); 2778 scr_refresh ();
2777 flush_ev.stop (); 2779 want_refresh = 1;
2778 } 2780 }
2779 } 2781 }
2780 2782
2781 } 2783 }
2782 else 2784 else
… …
2797 } 2799 }
2798 2800
2799 return flag; 2801 return flag;
2800} 2802}
2801 2803
2802// read the next octet
2803unicode_t
2804rxvt_term::next_octet ()
2805{
2806 return cmdbuf_ptr < cmdbuf_endp
2807 ? *cmdbuf_ptr++
2808 : NOCHAR;
2809}
2810
2811// read the next character 2804// read the next character
2812unicode_t 2805wchar_t
2813rxvt_term::next_char () 2806rxvt_term::next_char () NOTHROW
2814{ 2807{
2815 while (cmdbuf_ptr < cmdbuf_endp) 2808 while (cmdbuf_ptr < cmdbuf_endp)
2816 { 2809 {
2817 // assume 7-bit to be ascii ALWAYS 2810 // assume 7-bit to be ascii ALWAYS
2818 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2811 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2827 cmdbuf_ptr = cmdbuf_endp; 2820 cmdbuf_ptr = cmdbuf_endp;
2828 break; 2821 break;
2829 } 2822 }
2830 2823
2831 if (len == (size_t)-1) 2824 if (len == (size_t)-1)
2832 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2825 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2833 2826
2834 // assume wchar == unicode 2827 // assume wchar == unicode
2835 cmdbuf_ptr += len; 2828 cmdbuf_ptr += len;
2836 return wc & UNICODE_MASK; 2829 return wc & UNICODE_MASK;
2837 } 2830 }
2838 2831
2839 return NOCHAR; 2832 return NOCHAR;
2840} 2833}
2834
2835// read the next octet
2836uint32_t
2837rxvt_term::next_octet () NOTHROW
2838{
2839 return cmdbuf_ptr < cmdbuf_endp
2840 ? (unsigned char)*cmdbuf_ptr++
2841 : NOCHAR;
2842}
2843
2844static class out_of_input out_of_input;
2841 2845
2842/* rxvt_cmd_getc () - Return next input character */ 2846/* rxvt_cmd_getc () - Return next input character */
2843/* 2847/*
2844 * Return the next input character after first passing any keyboard input 2848 * Return the next input character after first passing any keyboard input
2845 * to the command. 2849 * to the command.
2846 */ 2850 */
2847unicode_t 2851wchar_t
2848rxvt_term::cmd_getc () 2852rxvt_term::cmd_getc () THROW ((class out_of_input))
2849{ 2853{
2850 unicode_t c = next_char (); 2854 wchar_t c = next_char ();
2851 2855
2852 if (c == NOCHAR) 2856 if (c == NOCHAR)
2853 throw out_of_input; 2857 throw out_of_input;
2854 2858
2855 return c; 2859 return c;
2856} 2860}
2857 2861
2858unicode_t 2862uint32_t
2859rxvt_term::cmd_get8 () 2863rxvt_term::cmd_get8 () THROW ((class out_of_input))
2860{ 2864{
2861 unicode_t c = next_octet (); 2865 uint32_t c = next_octet ();
2862 2866
2863 if (c == NOCHAR) 2867 if (c == NOCHAR)
2864 throw out_of_input; 2868 throw out_of_input;
2865 2869
2866 return c; 2870 return c;
… …
3133 break; 3137 break;
3134 3138
3135 /* 8.3.87: NEXT LINE */ 3139 /* 8.3.87: NEXT LINE */
3136 case C1_NEL: /* ESC E */ 3140 case C1_NEL: /* ESC E */
3137 { 3141 {
3138 unicode_t nlcr[] = { C0_LF, C0_CR }; 3142 wchar_t nlcr[] = { C0_LF, C0_CR };
3139 scr_add_lines (nlcr, 1, 2); 3143 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3140 } 3144 }
3141 break; 3145 break;
3142 3146
3143 /* kidnapped escape sequence: Should be 8.3.48 */ 3147 /* kidnapped escape sequence: Should be 8.3.48 */
3144 case C1_ESA: /* ESC G */ 3148 case C1_ESA: /* ESC G */
… …
3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3744 */ 3748 */
3745void 3749void
3746rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3750rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3747{ 3751{
3748 int changed = 0;
3749 int color; 3752 int color;
3750 char *buf, *name; 3753 char *buf, *name;
3751 bool query = str[0] == '?' && !str[1]; 3754 bool query = str[0] == '?' && !str[1];
3752 int saveop = op; 3755 int saveop = op;
3753 dDisp; 3756 dDisp;
… …
3808 { 3811 {
3809 if ((name = strchr (buf, ';')) == NULL) 3812 if ((name = strchr (buf, ';')) == NULL)
3810 break; 3813 break;
3811 3814
3812 *name++ = '\0'; 3815 *name++ = '\0';
3813 color = atoi (buf); 3816 color = atoi (buf) + minCOLOR;
3814 3817
3815 if (color < 0 || color >= TOTAL_COLORS) 3818 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3816 break; 3819 break;
3817 3820
3818 if ((buf = strchr (name, ';')) != NULL) 3821 if ((buf = strchr (name, ';')) != NULL)
3819 *buf++ = '\0'; 3822 *buf++ = '\0';
3820 3823
3821 if (name[0] == '?' && !name[1]) 3824 if (name[0] == '?' && !name[1])
3822 { 3825 {
3823 unsigned short r, g, b; 3826 unsigned short r, g, b;
3824 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3827 pix_colors_focused[color].get (display, r, g, b);
3825 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3826 } 3829 }
3827 else 3830 else
3828 set_window_color (color + minCOLOR, name); 3831 set_window_color (color, name);
3829 } 3832 }
3830 break; 3833 break;
3831 case XTerm_Color00: 3834 case XTerm_Color00:
3832 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3835 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3833 break; 3836 break;
3834 case XTerm_Color01: 3837 case XTerm_Color01:
3835 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3838 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3836 break; 3839 break;
3837#ifndef NO_CURSORCOLOR 3840#ifndef NO_CURSORCOLOR
3838 case XTerm_Color_cursor: 3841 case XTerm_Color_cursor:
3839 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3840 break; 3843 break;
… …
3844 break; 3847 break;
3845 case XTerm_Color_pointer_bg: 3848 case XTerm_Color_pointer_bg:
3846 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3847 break; 3850 break;
3848#ifndef NO_BOLD_UNDERLINE_REVERSE 3851#ifndef NO_BOLD_UNDERLINE_REVERSE
3849 case XTerm_Color_BD:
3850 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3851 break;
3852 case XTerm_Color_UL:
3853 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3854 break;
3855 case XTerm_Color_RV: 3852 case XTerm_Color_RV:
3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3853 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3854 break;
3855 case Rxvt_Color_BD:
3856 case URxvt_Color_BD:
3857 process_color_seq (op, Color_BD, str, resp);
3858 break;
3859 case Rxvt_Color_UL:
3860 case URxvt_Color_UL:
3861 process_color_seq (op, Color_UL, str, resp);
3857 break; 3862 break;
3858 case URxvt_Color_IT: 3863 case URxvt_Color_IT:
3859 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3864 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3860 break; 3865 break;
3861#endif 3866#endif
… …
3866 if (am_transparent) 3871 if (am_transparent)
3867 want_full_refresh = want_refresh = 1; 3872 want_full_refresh = want_refresh = 1;
3868 break; 3873 break;
3869#endif 3874#endif
3870 3875
3871 case XTerm_Pixmap: 3876 case Rxvt_Pixmap:
3877 {
3872 if (*str != ';') 3878 if (*str != ';')
3873 { 3879 {
3874#if XPM_BACKGROUND 3880#if XPM_BACKGROUND
3875 scale_pixmap (""); /* reset to default scaling */ 3881 scale_pixmap (""); /* reset to default scaling */
3876 set_bgPixmap (str); /* change pixmap */ 3882 set_bgPixmap (str); /* change pixmap */
3877#endif
3878 scr_touch (true); 3883 scr_touch (true);
3884#endif
3879 } 3885 }
3886
3887 int changed = 0;
3888
3880 while ((str = strchr (str, ';')) != NULL) 3889 while ((str = strchr (str, ';')) != NULL)
3881 { 3890 {
3882 str++; 3891 str++;
3883#if XPM_BACKGROUND 3892#if XPM_BACKGROUND
3884 changed += scale_pixmap (str); 3893 changed += scale_pixmap (str);
3885#endif 3894#endif
3886 } 3895 }
3887 3896
3888 if (changed) 3897 if (changed)
3889 { 3898 {
3890#ifdef XPM_BACKGROUND 3899#ifdef XPM_BACKGROUND
3891 resize_pixmap (); 3900 resize_pixmap ();
3892#endif
3893 scr_touch (true); 3901 scr_touch (true);
3902#endif
3894 } 3903 }
3904 }
3895 break; 3905 break;
3896 3906
3897 case XTerm_restoreFG: 3907 case Rxvt_restoreFG:
3898 set_window_color (Color_fg, str); 3908 set_window_color (Color_fg, str);
3899 break; 3909 break;
3900 case XTerm_restoreBG: 3910 case Rxvt_restoreBG:
3901 set_window_color (Color_bg, str); 3911 set_window_color (Color_bg, str);
3902 break; 3912 break;
3903 3913
3904 case XTerm_logfile: 3914 case XTerm_logfile:
3905 // TODO, when secure mode? 3915 // TODO, when secure mode?
3906 break; 3916 break;
3907 3917
3908#ifdef MENUBAR
3909 case URxvt_Menu:
3910 if (OPTION (Opt_insecure))
3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3912 break;
3913#endif
3914#if 0 3918#if 0
3915 case XTerm_dumpscreen: /* no error notices */ 3919 case Rxvt_dumpscreen: /* no error notices */
3916 { 3920 {
3917 int fd; 3921 int fd;
3918 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3922 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3919 { 3923 {
3920 scr_dump (fd); 3924 scr_dump (fd);
… …
3951 if (query) 3955 if (query)
3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3953 else 3957 else
3954 { 3958 {
3955 set_locale (str); 3959 set_locale (str);
3956 pty.set_utf8_mode (enc_utf8); 3960 pty->set_utf8_mode (enc_utf8);
3957 init_xlocale (); 3961 init_xlocale ();
3958 } 3962 }
3959 break; 3963 break;
3960 3964
3961 case URxvt_view_up: 3965 case URxvt_view_up:
… …
3972 break; 3976 break;
3973#endif 3977#endif
3974 3978
3975#if ENABLE_PERL 3979#if ENABLE_PERL
3976 case URxvt_perl: 3980 case URxvt_perl:
3977 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3981 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3978 ; // no responses yet 3982 ; // no responses yet
3979 break; 3983 break;
3980#endif 3984#endif
3981 } 3985 }
3982} 3986}
… …
4014 return state; 4018 return state;
4015} 4019}
4016 4020
4017/* we're not using priv _yet_ */ 4021/* we're not using priv _yet_ */
4018void 4022void
4019rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4023rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4020{ 4024{
4021 unsigned int i, j; 4025 unsigned int i, j;
4022 int state; 4026 int state;
4023 4027
4024 static const struct 4028 static const struct
… …
4035 { 5, PrivMode_rVideo }, 4039 { 5, PrivMode_rVideo },
4036 { 6, PrivMode_relOrigin }, 4040 { 6, PrivMode_relOrigin },
4037 { 7, PrivMode_Autowrap }, 4041 { 7, PrivMode_Autowrap },
4038 // 8, bi-directional support mode 4042 // 8, bi-directional support mode
4039 { 9, PrivMode_MouseX10 }, 4043 { 9, PrivMode_MouseX10 },
4040#ifdef menuBar_esc
4041 { menuBar_esc, PrivMode_menuBar },
4042#endif
4043 // 18, 19 printing-related 4044 // 18, 19 printing-related
4044 { 25, PrivMode_VisibleCursor }, 4045 { 25, PrivMode_VisibleCursor },
4045#ifdef scrollBar_esc 4046#ifdef scrollBar_esc
4046 { scrollBar_esc, PrivMode_scrollBar }, 4047 { scrollBar_esc, PrivMode_scrollBar },
4047#endif 4048#endif
… …
4094 /* extra handling for values with state unkept */ 4095 /* extra handling for values with state unkept */
4095 switch (arg[i]) 4096 switch (arg[i])
4096 { 4097 {
4097#if ENABLE_STYLES 4098#if ENABLE_STYLES
4098 case 1021: 4099 case 1021:
4099 if (mode) 4100 set_option (Opt_intensityStyles, mode);
4100 SET_OPTION (Opt_intensityStyles);
4101 else
4102 CLR_OPTION (Opt_intensityStyles);
4103 4101
4104 scr_touch (true); 4102 scr_touch (true);
4105 break; 4103 break;
4106#endif 4104#endif
4107 case 1048: /* alternative cursor save */ 4105 case 1048: /* alternative cursor save */
… …
4129 case 3: /* 80/132 */ 4127 case 3: /* 80/132 */
4130 if (priv_modes & PrivMode_132OK) 4128 if (priv_modes & PrivMode_132OK)
4131 set_widthheight (((state ? 132 : 80) * fwidth), height); 4129 set_widthheight (((state ? 132 : 80) * fwidth), height);
4132 break; 4130 break;
4133 case 4: /* smooth scrolling */ 4131 case 4: /* smooth scrolling */
4134 if (!state) 4132 set_option (Opt_jumpScroll, !state);
4135 SET_OPTION (Opt_jumpScroll);
4136 else
4137 CLR_OPTION (Opt_jumpScroll);
4138 break; 4133 break;
4139 case 5: /* reverse video */ 4134 case 5: /* reverse video */
4140 scr_rvideo_mode (state); 4135 scr_rvideo_mode (state);
4141 break; 4136 break;
4142 case 6: /* relative/absolute origins */ 4137 case 6: /* relative/absolute origins */
… …
4148 /* case 8: - auto repeat, can't do on a per window basis */ 4143 /* case 8: - auto repeat, can't do on a per window basis */
4149 case 9: /* X10 mouse reporting */ 4144 case 9: /* X10 mouse reporting */
4150 if (state) /* orthogonal */ 4145 if (state) /* orthogonal */
4151 priv_modes &= ~PrivMode_MouseX11; 4146 priv_modes &= ~PrivMode_MouseX11;
4152 break; 4147 break;
4153#ifdef menuBar_esc
4154 case menuBar_esc:
4155#ifdef MENUBAR
4156 map_menuBar (state);
4157#endif
4158 break;
4159#endif
4160#ifdef scrollBar_esc 4148#ifdef scrollBar_esc
4161 case scrollBar_esc: 4149 case scrollBar_esc:
4162 if (scrollbar_mapping (state)) 4150 if (scrollbar_mapping (state))
4163 { 4151 {
4164 resize_all_windows (0, 0, 0); 4152 resize_all_windows (0, 0, 0);
… …
4183#if 0 4171#if 0
4184 case 1001: 4172 case 1001:
4185 break; /* X11 mouse highlighting */ 4173 break; /* X11 mouse highlighting */
4186#endif 4174#endif
4187 case 1010: /* scroll to bottom on TTY output inhibit */ 4175 case 1010: /* scroll to bottom on TTY output inhibit */
4188 if (!state) 4176 set_option (Opt_scrollTtyOutput, !state);
4189 SET_OPTION (Opt_scrollTtyOutput);
4190 else
4191 CLR_OPTION (Opt_scrollTtyOutput);
4192 break; 4177 break;
4193 case 1011: /* scroll to bottom on key press */ 4178 case 1011: /* scroll to bottom on key press */
4194 if (state) 4179 set_option (Opt_scrollTtyKeypress, state);
4195 SET_OPTION (Opt_scrollTtyKeypress);
4196 else
4197 CLR_OPTION (Opt_scrollTtyKeypress);
4198 break; 4180 break;
4199 case 1047: /* secondary screen w/ clearing last */ 4181 case 1047: /* secondary screen w/ clearing last */
4200 if (OPTION (Opt_secondaryScreen)) 4182 if (OPTION (Opt_secondaryScreen))
4201 if (current_screen != PRIMARY) 4183 if (current_screen != PRIMARY)
4202 scr_erase_screen (2); 4184 scr_erase_screen (2);
… …
4340 scr_color (Color_bg, Color_bg); 4322 scr_color (Color_bg, Color_bg);
4341 break; 4323 break;
4342 4324
4343 //case 50: // not variable spacing 4325 //case 50: // not variable spacing
4344 4326
4345#ifndef NO_BRIGHTCOLOR 4327#if ENABLE_FRILLS
4346 case 90: 4328 case 90:
4347 case 91: /* set bright fg color */ 4329 case 91: /* set bright fg color */
4348 case 92: 4330 case 92:
4349 case 93: 4331 case 93:
4350 case 94: 4332 case 94:
… …
4412const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4394const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4413 4395
4414void 4396void
4415rxvt_term::tt_write (const char *data, unsigned int len) 4397rxvt_term::tt_write (const char *data, unsigned int len)
4416{ 4398{
4399 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4400 return;
4401
4402 if (pty->pty < 0)
4403 return;
4404
4417 if (v_buflen == 0) 4405 if (v_buflen == 0)
4418 { 4406 {
4419 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4407 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4420 4408
4421 if ((unsigned int)written == len) 4409 if ((unsigned int)written == len)
4422 return; 4410 return;
4423 4411
4424 data += written; 4412 data += written;
… …
4433 pty_ev.set (EVENT_READ | EVENT_WRITE); 4421 pty_ev.set (EVENT_READ | EVENT_WRITE);
4434} 4422}
4435 4423
4436void rxvt_term::pty_write () 4424void rxvt_term::pty_write ()
4437{ 4425{
4438 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4426 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4439 4427
4440 if (written > 0) 4428 if (written > 0)
4441 { 4429 {
4442 v_buflen -= written; 4430 v_buflen -= written;
4443 4431

Diff Legend

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