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.548 by sf-exg, Tue Apr 29 13:10:06 2014 UTC vs.
Revision 1.601 by sf-exg, Sat May 6 06:47:29 2023 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-2014 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
168 int len; 168 int len;
169 169
170# if ENABLE_COMBINING 170# if ENABLE_COMBINING
171 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
172 { 172 {
173 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch);
174 alloc = chr = new wchar_t[len]; 174 alloc = chr = new wchar_t[len];
175 rxvt_composite.expand (ch, chr); 175 rxvt_composite.expand (ch, chr);
176 } 176 }
177 else 177 else
178# endif 178# endif
… …
210 210
211 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
212 212
213 if (y >= 0) 213 if (y >= 0)
214 { 214 {
215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
216 x = 0; 216 x = 0;
217 } 217 }
218 218
219 scr_overlay_new (x, y, width, len * 2 + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220 220
… …
315 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
329 }; 324 };
330 325
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
376 param = 3; 371 param = 3;
377 break; 372 break;
378 case XK_Select: 373 case XK_Select:
379 param = 4; 374 param = 4;
380 break; 375 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior: 376 case XK_Prior:
383 param = 5; 377 param = 5;
384 break; 378 break;
385 case XK_Next: 379 case XK_Next:
386 param = 6; 380 param = 6;
… …
389 param = 7; 383 param = 7;
390 break; 384 break;
391 case XK_End: 385 case XK_End:
392 param = 8; 386 param = 8;
393 break; 387 break;
394#endif
395 case XK_Help: 388 case XK_Help:
396 param = 28; 389 param = 28;
397 break; 390 break;
398 case XK_Menu: 391 case XK_Menu:
399 param = 29; 392 param = 29;
… …
413 406
414void ecb_cold 407void ecb_cold
415rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
416{ 409{
417 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
418 KeySym keysym; 411 KeySym keysym = NoSymbol;
419 int valid_keysym;
420 char rkbuf[KBUFSZ + 1]; 412 char rkbuf[KBUFSZ + 1];
421 char *kbuf = rkbuf + 1; 413 char *kbuf = rkbuf + 1;
422 414
423#if ISO_14755 415#if ISO_14755
424 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
… …
483 } 475 }
484 } 476 }
485 else 477 else
486 len = 0; 478 len = 0;
487 } 479 }
488
489 valid_keysym = status_return == XLookupKeySym
490 || status_return == XLookupBoth;
491 } 480 }
492 else 481 else
493#endif 482#endif
494 { 483 {
495 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
496 valid_keysym = keysym != NoSymbol;
497 }
498
499 if (valid_keysym)
500 { 485 }
486
487 if (keysym != NoSymbol)
488 {
489 KeySym orig_keysym = keysym;
490
491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
501 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
502 { 499 {
503 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
504 unsigned int newlen = 1; 501 unsigned int newlen = 1;
505 502
… …
679 { 676 {
680 char *ch; 677 char *ch;
681 678
682 for (ch = kbuf; ch < kbuf + len; ch++) 679 for (ch = kbuf; ch < kbuf + len; ch++)
683 *ch |= 0x80; 680 *ch |= 0x80;
684
685 meta = 0;
686 } 681 }
687#endif 682#endif
688 /* nil */ ; 683 /* nil */ ;
689 } 684 }
685
686 keysym = orig_keysym;
690 } 687 }
691 688
692 /* escape prefix */ 689 /* escape prefix */
693 if (len && meta 690 if (len && meta
694#ifdef META8_OPTION 691#ifdef META8_OPTION
… …
701 } 698 }
702 699
703 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) 700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
704 return; 701 return;
705 702
706 if (valid_keysym) 703 if (keysym != NoSymbol)
707 { 704 {
708#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
709 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
710 return; 707 return;
711#endif 708#endif
… …
770#endif 767#endif
771 } 768 }
772 769
773 if (shft) 770 if (shft)
774 { 771 {
775 /* Shift + F1 - F10 generates F11 - F20 */
776 if (keysym >= XK_F1 && keysym <= XK_F10)
777 {
778 keysym += (XK_F11 - XK_F1);
779 shft = 0; /* turn off Shift */
780 }
781 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
782 { 773 {
783 switch (keysym) 774 switch (keysym)
784 { 775 {
785 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
786 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
1025/* checks whether a refresh is requested and starts the refresh timer */ 1016/* checks whether a refresh is requested and starts the refresh timer */
1026void 1017void
1027rxvt_term::refresh_check () 1018rxvt_term::refresh_check ()
1028{ 1019{
1029 if (want_refresh && !flush_ev.is_active ()) 1020 if (want_refresh && !flush_ev.is_active ())
1030 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1021 flush_ev.start ();
1031 1022
1032 display->flush (); 1023 display->flush ();
1033} 1024}
1034 1025
1035void 1026void
… …
1043 1034
1044#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1045void 1036void
1046rxvt_term::cursor_blink_reset () 1037rxvt_term::cursor_blink_reset ()
1047{ 1038{
1039 if (!focus)
1040 return;
1041
1048 if (hidden_cursor) 1042 if (hidden_cursor)
1049 { 1043 {
1050 hidden_cursor = 0; 1044 hidden_cursor = 0;
1051 want_refresh = 1; 1045 want_refresh = 1;
1052 } 1046 }
1053 1047
1054 if (option (Opt_cursorBlink)) 1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1055 cursor_blink_ev.again (); 1049 cursor_blink_ev.again ();
1056 else 1050 else
1057 cursor_blink_ev.stop (); 1051 cursor_blink_ev.stop ();
1058} 1052}
1059 1053
… …
1248 1242
1249void ecb_cold 1243void ecb_cold
1250rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1251{ 1245{
1252 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1253 recolour_cursor (); 1247 recolor_cursor ();
1254 1248
1255#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1256 hidden_pointer = 0; 1250 hidden_pointer = 0;
1257 1251
1258 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
… …
1283#endif 1277#endif
1284 1278
1285void 1279void
1286rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1287{ 1281{
1288 int button_number, key_state = 0; 1282 int button_number, state = 0;
1289 int x, y; 1283 int x, y;
1290 int code = 32; 1284 bool release = ev.type == ButtonRelease;
1291 1285
1292 x = Pixel2Col (ev.x) + 1; 1286 x = Pixel2Col (ev.x) + 1;
1293 y = Pixel2Row (ev.y) + 1; 1287 y = Pixel2Row (ev.y) + 1;
1294 1288
1295 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
… …
1297 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1298 return; 1292 return;
1299 1293
1300 mouse_row = x; 1294 mouse_row = x;
1301 mouse_col = y; 1295 mouse_col = y;
1302 code += 32; 1296 state += 32;
1303 }
1304
1305 if (MEvent.button == AnyButton)
1306 button_number = 3;
1307 else
1308 { 1297 }
1298
1309 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1310 /* add 0x3D for wheel events, like xterm does */ 1300 if (button_number > 10)
1301 return;
1302 else if (button_number >= 7)
1303 button_number += 128 - 7;
1311 if (button_number >= 3) 1304 else if (button_number >= 3)
1312 button_number += 64 - 3; 1305 button_number += 64 - 3;
1313 }
1314 1306
1315 if (priv_modes & PrivMode_MouseX10) 1307 if (priv_modes & PrivMode_MouseX10)
1316 { 1308 {
1317 /* 1309 /*
1318 * do not report ButtonRelease 1310 * do not report ButtonRelease
1319 * no state info allowed 1311 * no state info allowed
1320 */ 1312 */
1321 key_state = 0; 1313 if (release)
1322 if (button_number == 3)
1323 return; 1314 return;
1324 } 1315 }
1325 else 1316 else
1326 { 1317 {
1327 /* XTerm mouse reporting needs these values: 1318 /* XTerm mouse reporting needs these values:
… …
1329 * 8 = Meta 1320 * 8 = Meta
1330 * 16 = Control 1321 * 16 = Control
1331 * plus will add in our own Double-Click reporting 1322 * plus will add in our own Double-Click reporting
1332 * 32 = Double Click 1323 * 32 = Double Click
1333 */ 1324 */
1334 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1325 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1335 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1326 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1336 + ((MEvent.state & ControlMask) ? 16 : 0); 1327 + ((MEvent.state & ControlMask) ? 16 : 0);
1337#ifdef MOUSE_REPORT_DOUBLECLICK 1328#ifdef MOUSE_REPORT_DOUBLECLICK
1338 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1329 state += ((MEvent.clicks > 1) ? 32 : 0);
1339#endif 1330#endif
1340 } 1331 }
1332
1333 int code = 32 + (release ? 3 : button_number) + state;
1341 1334
1342#if DEBUG_MOUSEREPORT 1335#if DEBUG_MOUSEREPORT
1343 fprintf (stderr, "Mouse ["); 1336 fprintf (stderr, "Mouse [");
1344 if (key_state & 16) 1337 if (state & 16)
1345 fputc ('C', stderr); 1338 fputc ('C', stderr);
1346 if (key_state & 4) 1339 if (state & 4)
1347 fputc ('S', stderr); 1340 fputc ('S', stderr);
1348 if (key_state & 8) 1341 if (state & 8)
1349 fputc ('A', stderr); 1342 fputc ('A', stderr);
1350 if (key_state & 32) 1343 if (state & 32)
1351 fputc ('2', stderr); 1344 fputc ('2', stderr);
1352 fprintf (stderr, "]: <%d>, %d/%d\n", 1345 fprintf (stderr, "]: <%d>, %d/%d\n",
1353 button_number, 1346 button_number,
1354 x, 1347 x,
1355 y); 1348 y);
1356#endif 1349#endif
1357 1350
1358#if ENABLE_FRILLS 1351#if ENABLE_FRILLS
1359 if (priv_modes & PrivMode_ExtMouseRight) 1352 if (priv_modes & PrivMode_ExtMouseSGR)
1353 tt_printf ("\033[<%d;%d;%d%c",
1354 button_number + state,
1355 x,
1356 y,
1357 release ? 'm' : 'M');
1358 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1360 tt_printf ("\033[%d;%d;%dM", 1359 tt_printf ("\033[%d;%d;%dM",
1361 code + button_number + key_state, 1360 code,
1362 x, 1361 x,
1363 y); 1362 y);
1364 else if (priv_modes & PrivMode_ExtModeMouse) 1363 else if (priv_modes & PrivMode_ExtMouseUTF8)
1364 if (code < 128)
1365 tt_printf ("\033[M%c%lc%lc", 1365 tt_printf ("\033[M%c%lc%lc",
1366 code + button_number + key_state, 1366 code,
1367 wint_t (32 + x), 1367 wint_t (32 + x),
1368 wint_t (32 + y)); 1368 wint_t (32 + y));
1369 else
1370 tt_printf ("\033[M%c%c%lc%lc",
1371 0xc0 + (code >> 6),
1372 0x80 + (code & 0x3f),
1373 wint_t (32 + x),
1374 wint_t (32 + y));
1369 else 1375 else
1370#endif 1376#endif
1371 tt_printf ("\033[M%c%c%c", 1377 tt_printf ("\033[M%c%c%c",
1372 code + button_number + key_state, 1378 code,
1373 32 + x, 1379 32 + x,
1374 32 + y); 1380 32 + y);
1375} 1381}
1376 1382
1377/*{{{ process an X event */ 1383/*{{{ process an X event */
… …
1488 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1494 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1489 ; 1495 ;
1490 1496
1491 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1497 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1492 1498
1493 bool moved = false;
1494#ifdef HAVE_BG_PIXMAP
1495 if (bg_window_position_sensitive ())
1496 {
1497 want_position_change = true;
1498 if (bg_img == 0)
1499 moved = true;
1500 }
1501#endif
1502
1503 if (want_position_change) 1499 if (want_position_change)
1504 { 1500 {
1505 int x, y; 1501 int x, y;
1506 1502
1507 if (ev.xconfigure.send_event) 1503 if (ev.xconfigure.send_event)
… …
1515 if (x != parent_x || y != parent_y) 1511 if (x != parent_x || y != parent_y)
1516 { 1512 {
1517 parent_x = x; 1513 parent_x = x;
1518 parent_y = y; 1514 parent_y = y;
1519 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1520 moved = true;
1521 } 1516 }
1522 } 1517 }
1523 1518
1524 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1519 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1525 { 1520 {
1526 seen_resize = 1; 1521 seen_resize = 1;
1527 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1522 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1528 } 1523 }
1529 else
1530 {
1531#ifdef HAVE_BG_PIXMAP
1532 if (moved)
1533 update_background ();
1534#endif
1535 }
1536 1524
1537 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1525 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 } 1526 }
1539 break; 1527 break;
1540 1528
… …
1549 case SelectionRequest: 1537 case SelectionRequest:
1550 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1551 break; 1539 break;
1552 1540
1553 case MapNotify: 1541 case MapNotify:
1554#ifdef HAVE_BG_PIXMAP
1555 // This is needed at startup for the case of no window manager
1556 // or a non-reparenting window manager and also because we
1557 // defer bg image updates if the window is not mapped. The
1558 // short delay is to optimize for multiple ConfigureNotify
1559 // events at startup when the window manager reparents the
1560 // window, so as to perform the computation after we have
1561 // received all of them.
1562 if (bg_img == 0)
1563 update_background_ev.start (0.025);
1564#endif
1565 mapped = 1; 1542 mapped = 1;
1566#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1567 text_blink_ev.start (); 1544 text_blink_ev.start ();
1568#endif 1545#endif
1569 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1546 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1618 case MotionNotify: 1595 case MotionNotify:
1619#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1620 if (hidden_pointer) 1597 if (hidden_pointer)
1621 pointer_unblank (); 1598 pointer_unblank ();
1622#endif 1599#endif
1600 if (!bypass_keystate
1623 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1601 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1624 || priv_modes & PrivMode_MouseAnyEvent) 1602 || priv_modes & PrivMode_MouseAnyEvent))
1625 mouse_report (ev.xbutton); 1603 mouse_report (ev.xbutton);
1626 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1604 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1627 break; 1605 break;
1628 1606
1629 if (ev.xany.window == vt) 1607 if (ev.xany.window == vt)
… …
1641 &unused_root_x, &unused_root_y, 1619 &unused_root_x, &unused_root_y,
1642 &ev.xbutton.x, &ev.xbutton.y, 1620 &ev.xbutton.x, &ev.xbutton.y,
1643 &ev.xbutton.state); 1621 &ev.xbutton.state);
1644#ifdef MOUSE_THRESHOLD 1622#ifdef MOUSE_THRESHOLD
1645 /* deal with a `jumpy' mouse */ 1623 /* deal with a `jumpy' mouse */
1646 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1624 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1625#endif
1647 { 1626 {
1648#endif
1649#if ISO_14755 1627#if ISO_14755
1650 // 5.4 1628 // 5.4
1651 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1629 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1652 { 1630 {
1653 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1631 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1702 * shouldn't be scrolling 1680 * shouldn't be scrolling
1703 */ 1681 */
1704 sel_scroll_ev.stop(); 1682 sel_scroll_ev.stop();
1705 } 1683 }
1706#endif 1684#endif
1707#ifdef MOUSE_THRESHOLD
1708 } 1685 }
1709#endif
1710 } 1686 }
1711 } 1687 }
1712 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1688 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1713 { 1689 {
1714 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1690 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1788#endif 1764#endif
1789#if OFF_FOCUS_FADING 1765#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade]) 1766 if (rs[Rs_fade])
1791 { 1767 {
1792 pix_colors = pix_colors_focused; 1768 pix_colors = pix_colors_focused;
1793 scr_recolour (); 1769 scr_recolor ();
1794 } 1770 }
1795#endif 1771#endif
1796#if ENABLE_FRILLS 1772#if ENABLE_FRILLS
1797 if (option (Opt_urgentOnBell)) 1773 if (option (Opt_urgentOnBell))
1798 set_urgency (0); 1774 set_urgency (0);
1775
1776 if (priv_modes & PrivMode_FocusEvent)
1777 tt_printf ("\x1b[I");
1799#endif 1778#endif
1800 1779
1801 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1780 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1802 } 1781 }
1803} 1782}
… …
1811 want_refresh = 1; 1790 want_refresh = 1;
1812 1791
1813#if ENABLE_FRILLS 1792#if ENABLE_FRILLS
1814 if (option (Opt_urgentOnBell)) 1793 if (option (Opt_urgentOnBell))
1815 set_urgency (0); 1794 set_urgency (0);
1795
1796 if (priv_modes & PrivMode_FocusEvent)
1797 tt_printf ("\x1b[O");
1816#endif 1798#endif
1817#if ENABLE_FRILLS || ISO_14755 1799#if ENABLE_FRILLS || ISO_14755
1818 if (iso14755buf) 1800 if (iso14755buf)
1819 { 1801 {
1820 iso14755buf = 0; 1802 iso14755buf = 0;
… …
1835#endif 1817#endif
1836#if OFF_FOCUS_FADING 1818#if OFF_FOCUS_FADING
1837 if (rs[Rs_fade]) 1819 if (rs[Rs_fade])
1838 { 1820 {
1839 pix_colors = pix_colors_unfocused; 1821 pix_colors = pix_colors_unfocused;
1840 scr_recolour (); 1822 scr_recolor ();
1841 } 1823 }
1842#endif 1824#endif
1843 1825
1844 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1845 } 1827 }
1846} 1828}
1847 1829
1848void ecb_cold 1830void ecb_cold
1849rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1850{ 1832{
1851#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1852 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1853 { 1835 {
1836 if (!first_time)
1837 pix_colors_focused [idx].free (this);
1838
1854 rgba c; 1839 rgba c;
1855 pix_colors [Color_fade].get (c); 1840 pix_colors [Color_fade].get (c);
1856 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1841 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1857 } 1842 }
1858#endif 1843#endif
1859} 1844}
1860 1845
1861#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1846#if ENABLE_PERL
1862void ecb_hot 1847void ecb_hot
1863rxvt_term::rootwin_cb (XEvent &ev) 1848rxvt_term::rootwin_cb (XEvent &ev)
1864{ 1849{
1865 make_current (); 1850 make_current ();
1866 1851
… …
1876 * use the property to determine the pixmap. We use it later on. 1861 * use the property to determine the pixmap. We use it later on.
1877 */ 1862 */
1878 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1863 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1879 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1864 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1880 { 1865 {
1881#if BG_IMAGE_FROM_ROOT
1882 if (option (Opt_transparent))
1883 {
1884 rxvt_img::new_from_root (this)->replace (root_img);
1885 update_background ();
1886 }
1887#endif
1888 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1866 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1889 } 1867 }
1890 1868
1891 break; 1869 break;
1892 } 1870 }
… …
1920 iso14755_54 (ev.x, ev.y); 1898 iso14755_54 (ev.x, ev.y);
1921 return; 1899 return;
1922 } 1900 }
1923#endif 1901#endif
1924 1902
1925 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1903 clickintime = ev.time - MEvent.time < multiClickTime;
1926 1904
1927 if (reportmode) 1905 if (reportmode)
1928 { 1906 {
1929 /* mouse report from vt window */ 1907 /* mouse report from vt window */
1930 /* save the xbutton state (for ButtonRelease) */ 1908 /* save the xbutton state (for ButtonRelease) */
… …
2173 2151
2174 if (reportmode) 2152 if (reportmode)
2175 { 2153 {
2176 /* mouse report from vt window */ 2154 /* mouse report from vt window */
2177 /* don't report release of wheel "buttons" */ 2155 /* don't report release of wheel "buttons" */
2178 if (ev.button >= 4) 2156 if (ev.button >= 4 && ev.button <= 7)
2179 return; 2157 return;
2180#ifdef MOUSE_REPORT_DOUBLECLICK 2158#ifdef MOUSE_REPORT_DOUBLECLICK
2181 /* only report the release of 'slow' single clicks */ 2159 /* only report the release of 'slow' single clicks */
2182 if (MEvent.button != AnyButton 2160 if (MEvent.button != AnyButton
2183 && (ev.button != MEvent.button 2161 && (ev.button != MEvent.button
2184 || (ev.time - MEvent.time 2162 || (ev.time - MEvent.time
2185 > MULTICLICK_TIME / 2))) 2163 > multiClickTime / 2)))
2186 { 2164 {
2187 MEvent.clicks = 0; 2165 MEvent.clicks = 0;
2188 MEvent.button = AnyButton; 2166 MEvent.button = ev.button;
2189 mouse_report (ev); 2167 mouse_report (ev);
2190 } 2168 }
2191#else /* MOUSE_REPORT_DOUBLECLICK */ 2169#else /* MOUSE_REPORT_DOUBLECLICK */
2192 MEvent.button = AnyButton; 2170 MEvent.button = ev.button;
2193 mouse_report (ev); 2171 mouse_report (ev);
2194#endif /* MOUSE_REPORT_DOUBLECLICK */ 2172#endif /* MOUSE_REPORT_DOUBLECLICK */
2195 return; 2173 return;
2196 } 2174 }
2197 2175
… …
2384 } 2362 }
2385} 2363}
2386 2364
2387// read the next character 2365// read the next character
2388wchar_t ecb_hot 2366wchar_t ecb_hot
2389rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () noexcept
2390{ 2368{
2391 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2392 { 2370 {
2393 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2394 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2395 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2396 2374
2397 wchar_t wc; 2375 wchar_t wc;
2398 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2399 2377
… …
2420 return NOCHAR; 2398 return NOCHAR;
2421} 2399}
2422 2400
2423// read the next octet 2401// read the next octet
2424uint32_t ecb_hot 2402uint32_t ecb_hot
2425rxvt_term::next_octet () NOTHROW 2403rxvt_term::next_octet () noexcept
2426{ 2404{
2427 return cmdbuf_ptr < cmdbuf_endp 2405 return cmdbuf_ptr < cmdbuf_endp
2428 ? (unsigned char)*cmdbuf_ptr++ 2406 ? (unsigned char)*cmdbuf_ptr++
2429 : NOCHAR; 2407 : NOCHAR;
2430} 2408}
2431 2409
2432static class out_of_input out_of_input; 2410static class out_of_input out_of_input;
2433 2411
2434wchar_t ecb_hot 2412wchar_t ecb_hot
2435rxvt_term::cmd_getc () THROW ((class out_of_input)) 2413rxvt_term::cmd_getc ()
2436{ 2414{
2437 wchar_t c = next_char (); 2415 wchar_t c = next_char ();
2438 2416
2439 if (c == NOCHAR) 2417 if (c == NOCHAR)
2440 throw out_of_input; 2418 throw out_of_input;
2441 2419
2442 return c; 2420 return c;
2443} 2421}
2444 2422
2445uint32_t ecb_hot 2423uint32_t ecb_hot
2446rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2424rxvt_term::cmd_get8 ()
2447{ 2425{
2448 uint32_t c = next_octet (); 2426 uint32_t c = next_octet ();
2449 2427
2450 if (c == NOCHAR) 2428 if (c == NOCHAR)
2451 throw out_of_input; 2429 throw out_of_input;
… …
2580 scr_charset_choose (0); 2558 scr_charset_choose (0);
2581 break; 2559 break;
2582 2560
2583#ifdef EIGHT_BIT_CONTROLS 2561#ifdef EIGHT_BIT_CONTROLS
2584 // 8-bit controls 2562 // 8-bit controls
2585 case 0x90: /* DCS */ 2563 case 0x90: /* DCS */
2586 process_dcs_seq (); 2564 process_dcs_seq ();
2587 break; 2565 break;
2588 case 0x9b: /* CSI */ 2566 case 0x9b: /* CSI */
2589 process_csi_seq (); 2567 process_csi_seq ();
2590 break; 2568 break;
2591 case 0x9d: /* OSC */ 2569 case 0x9d: /* OSC */
2592 process_osc_seq (); 2570 process_osc_seq ();
2593 break; 2571 break;
2594#endif 2572#endif
2595 } 2573 }
2596} 2574}
… …
2724 wchar_t nlcr[] = { C0_LF, C0_CR }; 2702 wchar_t nlcr[] = { C0_LF, C0_CR };
2725 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2703 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2726 } 2704 }
2727 break; 2705 break;
2728 2706
2707#if 0 // disabled because embedded newlines can make exploits easier
2729 /* kidnapped escape sequence: Should be 8.3.48 */ 2708 /* kidnapped escape sequence: Should be 8.3.48 */
2730 case C1_ESA: /* ESC G */ 2709 case C1_ESA: /* ESC G */
2731 // used by original rxvt for rob nations own graphics mode 2710 // used by original rxvt for rob nations own graphics mode
2732 if (cmd_getc () == 'Q') 2711 if (cmd_getc () == 'Q' && option (Opt_insecure))
2733 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2712 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2734 break; 2713 break;
2714#endif
2735 2715
2736 /* 8.3.63: CHARACTER TABULATION SET */ 2716 /* 8.3.63: CHARACTER TABULATION SET */
2737 case C1_HTS: /* ESC H */ 2717 case C1_HTS: /* ESC H */
2738 scr_set_tab (1); 2718 scr_set_tab (1);
2739 break; 2719 break;
… …
2897 break; 2877 break;
2898 2878
2899 case '?': 2879 case '?':
2900 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2880 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2901 process_terminal_mode (ch, priv, nargs, arg); 2881 process_terminal_mode (ch, priv, nargs, arg);
2882 if (prev_ch == '$' && ch == 'p')
2883 process_terminal_mode (ch, priv, nargs, arg);
2902 break; 2884 break;
2903 2885
2904 case '!': 2886 case '!':
2905 if (ch == CSI_70) 2887 if (ch == CSI_70)
2906 { 2888 {
2907 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2889 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2908 scr_soft_reset (); 2890 scr_soft_reset ();
2909 2891
2910 static const int pm_h[] = { 7, 25 }; 2892 static const int pm_h[] = { 7, 25 };
2911 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2893 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2912 2894
2913 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); 2895 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2914 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); 2896 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2915 } 2897 }
2916 break; 2898 break;
… …
2946 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2928 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2947 scr_gotorc (arg[0], 0, RELATIVE); 2929 scr_gotorc (arg[0], 0, RELATIVE);
2948 break; 2930 break;
2949 2931
2950 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2932 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2951 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2933 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2952#ifdef ISO6429 2934#ifdef ISO6429
2953 arg[0] = -arg[0]; 2935 arg[0] = -arg[0];
2954#else /* emulate common DEC VTs */ 2936#else /* emulate common DEC VTs */
2955 arg[0] = arg[0] ? -arg[0] : -1; 2937 arg[0] = arg[0] ? -arg[0] : -1;
2956#endif 2938#endif
… …
3047 case 7: /* unofficial extension */ 3029 case 7: /* unofficial extension */
3048 if (option (Opt_insecure)) 3030 if (option (Opt_insecure))
3049 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3031 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3050 break; 3032 break;
3051 case 8: /* unofficial extension */ 3033 case 8: /* unofficial extension */
3034 {
3035 string_term st;
3036 st.v[0] = CHAR_ST;
3037 st.v[1] = '\0';
3052 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3038 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3053 break; 3039 break;
3040 }
3054 } 3041 }
3055 break; 3042 break;
3056 3043
3057 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3044 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3058 switch (arg[0]) 3045 switch (arg[0])
… …
3101 scr_insert_mode (1); 3088 scr_insert_mode (1);
3102 else if (arg[0] == 20) 3089 else if (arg[0] == 20)
3103 priv_modes |= PrivMode_LFNL; 3090 priv_modes |= PrivMode_LFNL;
3104 break; 3091 break;
3105 3092
3106 case CSI_71: // DESCUSR: set cursor style 3093 case CSI_71: // DECSCUSR: set cursor style
3107 if (prev_ch == ' ') 3094 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]); 3095 set_cursor_style (arg[0]);
3109 break; 3096 break;
3110 3097
3111 /* 3098 /*
… …
3243/* 3230/*
3244 * get input up until STRING TERMINATOR (or BEL) 3231 * get input up until STRING TERMINATOR (or BEL)
3245 * ends_how is terminator used. returned input must be free()'d 3232 * ends_how is terminator used. returned input must be free()'d
3246 */ 3233 */
3247char * 3234char *
3248rxvt_term::get_to_st (unicode_t &ends_how) 3235rxvt_term::get_to_st (string_term &st)
3249{ 3236{
3250 unicode_t ch; 3237 unicode_t ch;
3251 bool seen_esc = false; 3238 bool seen_esc = false;
3252 unsigned int n = 0; 3239 unsigned int n = 0;
3253 wchar_t string[CBUFSIZ]; 3240 wchar_t string[CBUFSIZ];
… …
3282 string[n++] = ch; 3269 string[n++] = ch;
3283 } 3270 }
3284 3271
3285 string[n++] = '\0'; 3272 string[n++] = '\0';
3286 3273
3287 ends_how = (ch == 0x5c ? C0_ESC : ch); 3274 n = 0;
3275 if (ch == 0x5c)
3276 st.v[n++] = C0_ESC;
3277 st.v[n++] = ch;
3278 st.v[n] = '\0';
3288 3279
3289 return rxvt_wcstombs (string); 3280 return rxvt_wcstombs (string);
3290} 3281}
3291 3282
3292/*----------------------------------------------------------------------*/ 3283/*----------------------------------------------------------------------*/
… …
3298{ 3289{
3299 /* 3290 /*
3300 * Not handled yet 3291 * Not handled yet
3301 */ 3292 */
3302 3293
3303 unicode_t eh; 3294 string_term st;
3304 char *s = get_to_st (eh); 3295 char *s = get_to_st (st);
3305 if (s) 3296 if (s)
3306 free (s); 3297 free (s);
3307 3298
3308 return; 3299 return;
3309} 3300}
… …
3321 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3312 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3322 arg = arg * 10 + (ch - '0'); 3313 arg = arg * 10 + (ch - '0');
3323 3314
3324 if (ch == ';') 3315 if (ch == ';')
3325 { 3316 {
3326 unicode_t eh; 3317 string_term st;
3327 char *s = get_to_st (eh); 3318 char *s = get_to_st (st);
3328 3319
3329 if (s) 3320 if (s)
3330 { 3321 {
3331 process_xterm_seq (arg, s, eh); 3322 process_xterm_seq (arg, s, st);
3332 free (s); 3323 free (s);
3333 } 3324 }
3334 } 3325 }
3335} 3326}
3336 3327
3328static unsigned int
3329colorcube_index (unsigned int idx_r,
3330 unsigned int idx_g,
3331 unsigned int idx_b)
3332{
3333 assert (idx_r < Red_levels);
3334 assert (idx_g < Green_levels);
3335 assert (idx_b < Blue_levels);
3336
3337 return idx_r * Blue_levels * Green_levels +
3338 idx_g * Blue_levels +
3339 idx_b;
3340}
3341
3342/*
3343 * Find the nearest color slot in the hidden color cube,
3344 * adapt its value to the 32bit RGBA color.
3345 */
3346unsigned int
3347rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3348{
3349 r &= 0xff;
3350 g &= 0xff;
3351 b &= 0xff;
3352 a &= 0xff;
3353
3354 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3355
3356 /* we allow one of the 6 closest neighbouring colours */
3357 /* to replace the current color, if they not used recently */
3358 #if 0
3359 static const unsigned char dxyz[][3] = {
3360 0, 0, 0,
3361 0, 0, 4,
3362 0, 4, 4,
3363 4, 4, 0,
3364 4, 0, 4,
3365 0, 4, 0,
3366 4, 0, 0,
3367 };
3368 #else
3369 // silly compressed verlapping triplets version of above
3370 static const unsigned char dxyz[] = {
3371 0, 0, 0, 4, 4, 0, 4, 0, 0,
3372 };
3373 #endif
3374
3375 static const unsigned char color_level[8][32] = {
3376 // neighbour index
3377 {0, 0, 1, 0, 0, 1, 1, 2, 2, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3378 {0, 1, 0, 1, 1, 2, 1, 1, 2, 2, 3, 3, 2, 2, 2, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
3379 {0, 0, 1, 2, 1, 1, 2, 3, 3, 2, 2, 3, 3, 4, 4, 3, 3, 3, 4, 4, 5, 5, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5},
3380 {0, 0, 2, 1, 2, 3, 2, 2, 3, 4, 4, 3, 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6},
3381 // Red_levels/Green_levels/Blue_levels index
3382 {0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3383 {0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
3384 {0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5},
3385 {0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6},
3386 };
3387
3388 unsigned int idx;
3389
3390 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3391 {
3392 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3393 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3394 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3395 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3396
3397 if (n == 0)
3398 idx = index;
3399
3400 if (rgb24_color[index] == color)
3401 {
3402 rgb24_seqno[index] = ++rgb24_sequence;
3403 return index + minTermCOLOR24;
3404 }
3405
3406 // minor issue: could update index 0 few more times
3407 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3408 {
3409 idx = index;
3410 goto update;
3411 }
3412
3413 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3414 // but also handles wrap around values well enough
3415 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3416 idx = index;
3417 }
3418
3419update:
3420 rgb24_color[idx] = color;
3421 rgb24_seqno[idx] = ++rgb24_sequence;
3422
3423 idx += minTermCOLOR24;
3424 pix_colors_focused [idx].free (this);
3425 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3426 update_fade_color (idx, false);
3427
3428 return idx;
3429}
3430
3337void 3431void
3338rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3432rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3339{ 3433{
3340 if (str[0] == '?' && !str[1]) 3434 if (str[0] == '?' && !str[1])
3341 { 3435 {
3342 rgba c; 3436 rgba c;
3343 pix_colors_focused[color].get (c); 3437 pix_colors_focused[color].get (c);
3438 char rgba_str[32];
3344 3439
3345#if XFT 3440#if XFT
3346 if (c.a != rgba::MAX_CC) 3441 if (c.a != rgba::MAX_CC)
3347 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3442 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3348 else 3443 else
3349#endif 3444#endif
3350 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3445 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3446
3447 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3448 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3449 else
3450 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3351 } 3451 }
3352 else 3452 else
3353 set_window_color (color, str); 3453 set_window_color (color, str);
3354} 3454}
3355 3455
3356/* 3456/*
3357 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3457 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3358 */ 3458 */
3359void 3459void
3360rxvt_term::process_xterm_seq (int op, char *str, char resp) 3460rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3361{ 3461{
3362 int color; 3462 int color;
3363 char *buf, *name; 3463 char *buf, *name;
3364 bool query = str[0] == '?' && !str[1]; 3464 bool query = str[0] == '?' && !str[1];
3365 int saveop = op; 3465 int saveop = op;
… …
3400 &nitems, &bytes_after, &value) == Success 3500 &nitems, &bytes_after, &value) == Success
3401 && actual_type != None 3501 && actual_type != None
3402 && actual_format == 8) 3502 && actual_format == 8)
3403 str = (const char *)(value); 3503 str = (const char *)(value);
3404 3504
3405 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp); 3505 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3406 3506
3407 XFree (value); 3507 XFree (value);
3408 } 3508 }
3409 else 3509 else
3410 { 3510 {
… …
3434 break; 3534 break;
3435 3535
3436 if ((buf = strchr (name, ';')) != NULL) 3536 if ((buf = strchr (name, ';')) != NULL)
3437 *buf++ = '\0'; 3537 *buf++ = '\0';
3438 3538
3439 process_color_seq (op, color, name, resp); 3539 process_color_seq (op, color, name, st);
3440 } 3540 }
3441 break; 3541 break;
3442 case Rxvt_restoreFG: 3542 case Rxvt_restoreFG:
3443 case XTerm_Color00: 3543 case XTerm_Color00:
3444 process_color_seq (op, Color_fg, str, resp); 3544 process_color_seq (op, Color_fg, str, st);
3445 break; 3545 break;
3446 case Rxvt_restoreBG: 3546 case Rxvt_restoreBG:
3447 case XTerm_Color01: 3547 case XTerm_Color01:
3448 process_color_seq (op, Color_bg, str, resp); 3548 process_color_seq (op, Color_bg, str, st);
3449 break; 3549 break;
3450#ifndef NO_CURSORCOLOR 3550#ifndef NO_CURSORCOLOR
3451 case XTerm_Color_cursor: 3551 case XTerm_Color_cursor:
3452 process_color_seq (op, Color_cursor, str, resp); 3552 process_color_seq (op, Color_cursor, str, st);
3453 break; 3553 break;
3454#endif 3554#endif
3455 case XTerm_Color_pointer_fg: 3555 case XTerm_Color_pointer_fg:
3456 process_color_seq (op, Color_pointer_fg, str, resp); 3556 process_color_seq (op, Color_pointer_fg, str, st);
3457 break; 3557 break;
3458 case XTerm_Color_pointer_bg: 3558 case XTerm_Color_pointer_bg:
3459 process_color_seq (op, Color_pointer_bg, str, resp); 3559 process_color_seq (op, Color_pointer_bg, str, st);
3460 break; 3560 break;
3461#ifdef OPTION_HC 3561#ifdef OPTION_HC
3462 case XTerm_Color_HC: 3562 case XTerm_Color_HC:
3463 process_color_seq (op, Color_HC, str, resp); 3563 process_color_seq (op, Color_HC, str, st);
3464 break; 3564 break;
3465 case XTerm_Color_HTC: 3565 case XTerm_Color_HTC:
3466 process_color_seq (op, Color_HTC, str, resp); 3566 process_color_seq (op, Color_HTC, str, st);
3467 break; 3567 break;
3468#endif 3568#endif
3469#ifndef NO_BOLD_UNDERLINE_REVERSE 3569#ifndef NO_BOLD_UNDERLINE_REVERSE
3470 case URxvt_Color_BD: 3570 case URxvt_Color_BD:
3471 process_color_seq (op, Color_BD, str, resp); 3571 process_color_seq (op, Color_BD, str, st);
3472 break; 3572 break;
3473 case URxvt_Color_UL: 3573 case URxvt_Color_UL:
3474 process_color_seq (op, Color_UL, str, resp); 3574 process_color_seq (op, Color_UL, str, st);
3475 break; 3575 break;
3476 case URxvt_Color_IT: 3576 case URxvt_Color_IT:
3477 process_color_seq (op, Color_IT, str, resp); 3577 process_color_seq (op, Color_IT, str, st);
3478 break; 3578 break;
3479#endif 3579#endif
3480 case URxvt_Color_border: 3580 case URxvt_Color_border:
3481 process_color_seq (op, Color_border, str, resp); 3581 process_color_seq (op, Color_border, str, st);
3482 break; 3582 break;
3483
3484#if BG_IMAGE_FROM_ROOT
3485 case URxvt_Color_tint:
3486 process_color_seq (op, Color_tint, str, resp);
3487 {
3488 bool changed = false;
3489
3490 if (ISSET_PIXCOLOR (Color_tint))
3491 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3492
3493 if (changed)
3494 update_background ();
3495 }
3496
3497 break;
3498#endif
3499
3500#if BG_IMAGE_FROM_FILE
3501 case Rxvt_Pixmap:
3502 if (!strcmp (str, "?"))
3503 {
3504 char str[256];
3505 int h_scale = fimage.h_scale;
3506 int v_scale = fimage.v_scale;
3507 int h_align = fimage.h_align;
3508 int v_align = fimage.v_align;
3509
3510 sprintf (str, "[%dx%d+%d+%d]",
3511 h_scale, v_scale,
3512 h_align, v_align);
3513 process_xterm_seq (XTerm_title, str, CHAR_ST);
3514 }
3515 else
3516 {
3517 bool changed = false;
3518
3519 if (*str != ';')
3520 {
3521 try
3522 {
3523 fimage.set_file_geometry (this, str);
3524 changed = true;
3525 }
3526 catch (const class rxvt_failure_exception &e)
3527 {
3528 }
3529 }
3530 else
3531 {
3532 str++;
3533 if (fimage.set_geometry (str, true))
3534 changed = true;
3535 }
3536
3537 if (changed)
3538 {
3539 if (bg_window_position_sensitive ())
3540 {
3541 int x, y;
3542 get_window_origin (x, y);
3543 parent_x = x;
3544 parent_y = y;
3545 }
3546 update_background ();
3547 }
3548 }
3549 break;
3550#endif
3551 3583
3552 case XTerm_logfile: 3584 case XTerm_logfile:
3553 // TODO, when secure mode? 3585 // TODO, when secure mode?
3554 break; 3586 break;
3555 3587
… …
3572 case URxvt_boldFont: 3604 case URxvt_boldFont:
3573 case URxvt_italicFont: 3605 case URxvt_italicFont:
3574 case URxvt_boldItalicFont: 3606 case URxvt_boldItalicFont:
3575#endif 3607#endif
3576 if (query) 3608 if (query)
3577 tt_printf ("\33]%d;%-.250s%c", saveop, 3609 tt_printf ("\33]%d;%-.250s%s", saveop,
3578 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3610 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3579 ? fontset[op - URxvt_font]->fontdesc : "", 3611 ? fontset[op - URxvt_font]->fontdesc : "",
3580 resp); 3612 st.v);
3581 else 3613 else
3582 { 3614 {
3583 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3615 const char *&res = rs[Rs_font + (op - URxvt_font)];
3584 3616
3585 res = strdup (str); 3617 res = strdup (str);
… …
3588 } 3620 }
3589 break; 3621 break;
3590 3622
3591 case URxvt_version: 3623 case URxvt_version:
3592 if (query) 3624 if (query)
3593 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3625 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3594 op, 3626 op,
3595 rs[Rs_name], VERSION[0], VERSION[2], 3627 rs[Rs_name], VERSION[0], VERSION[2],
3596 resp); 3628 st.v);
3597 break; 3629 break;
3598 3630
3599#if !ENABLE_MINIMAL 3631#if !ENABLE_MINIMAL
3632 case URxvt_cellinfo:
3633 if (query)
3634 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3635 fwidth, fheight, fbase,
3636 st.v);
3637 break;
3638
3600 case URxvt_locale: 3639 case URxvt_locale:
3601 if (query) 3640 if (query)
3602 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3641 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3603 else 3642 else
3604 { 3643 {
3605 set_locale (str); 3644 set_locale (str);
3606 pty->set_utf8_mode (enc_utf8); 3645 pty->set_utf8_mode (enc_utf8);
3607 init_xlocale (); 3646 init_xlocale ();
… …
3622 break; 3661 break;
3623#endif 3662#endif
3624 3663
3625#if ENABLE_PERL 3664#if ENABLE_PERL
3626 case URxvt_perl: 3665 case URxvt_perl:
3627 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END)); 3666 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3628 break; 3667 break;
3629#endif 3668#endif
3630 } 3669 }
3631} 3670}
3632/*----------------------------------------------------------------------*/ 3671/*----------------------------------------------------------------------*/
… …
3689 { 5, PrivMode_rVideo }, // DECSCNM 3728 { 5, PrivMode_rVideo }, // DECSCNM
3690 { 6, PrivMode_relOrigin }, // DECOM 3729 { 6, PrivMode_relOrigin }, // DECOM
3691 { 7, PrivMode_Autowrap }, // DECAWM 3730 { 7, PrivMode_Autowrap }, // DECAWM
3692 // 8, auto-repeat keys // DECARM 3731 // 8, auto-repeat keys // DECARM
3693 { 9, PrivMode_MouseX10 }, 3732 { 9, PrivMode_MouseX10 },
3733 { 12, PrivMode_BlinkingCursor },
3694 // 18 end FF to printer after print screen 3734 // 18 end FF to printer after print screen
3695 // 19 Print screen prints full screen/scroll region 3735 // 19 Print screen prints full screen/scroll region
3696 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3736 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3697#ifdef scrollBar_esc 3737#ifdef scrollBar_esc
3698 { scrollBar_esc, PrivMode_scrollBar }, 3738 { scrollBar_esc, PrivMode_scrollBar },
… …
3710#endif 3750#endif
3711 { 1000, PrivMode_MouseX11 }, 3751 { 1000, PrivMode_MouseX11 },
3712 { 1002, PrivMode_MouseBtnEvent }, 3752 { 1002, PrivMode_MouseBtnEvent },
3713 { 1003, PrivMode_MouseAnyEvent }, 3753 { 1003, PrivMode_MouseAnyEvent },
3714#if ENABLE_FRILLS 3754#if ENABLE_FRILLS
3755 { 1004, PrivMode_FocusEvent },
3715 { 1005, PrivMode_ExtModeMouse }, 3756 { 1005, PrivMode_ExtMouseUTF8 },
3757 { 1006, PrivMode_ExtMouseSGR },
3716#endif 3758#endif
3717 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3759 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3718 { 1011, PrivMode_Keypress }, // rxvt extension 3760 { 1011, PrivMode_Keypress }, // rxvt extension
3719#if ENABLE_FRILLS 3761#if ENABLE_FRILLS
3720 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3762 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3721#endif 3763#endif
3722 // 1035 enable modifiers for alt, numlock NYI 3764 // 1035 enable modifiers for alt, numlock NYI
3723 // 1036 send ESC for meta keys NYI 3765 // 1036 send ESC for meta keys NYI
3724 // 1037 send DEL for keypad delete NYI 3766 // 1037 send DEL for keypad delete NYI
3725 { 1047, PrivMode_Screen }, 3767 { 1047, PrivMode_Screen },
3726 // 1048 save and restore cursor, implemented in code 3768 // 1048 save and restore cursor, implemented in code
3727 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3769 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3728 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3770 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3771#if ENABLE_FRILLS
3729 { 2004, PrivMode_BracketPaste }, 3772 { 2004, PrivMode_BracketPaste },
3773#endif
3730 }; 3774 };
3731 3775
3732 if (nargs == 0) 3776 if (nargs == 0)
3733 return; 3777 return;
3778
3779 // DECRQM
3780 if (mode == 'p')
3781 {
3782 int status = 0;
3783 if (nargs != 1)
3784 return;
3785
3786 for (j = 0; j < ecb_array_length (argtopriv); j++)
3787 if (argtopriv[j].argval == arg[0])
3788 {
3789 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3790 break;
3791 }
3792
3793 tt_printf ("\33[?%d;%d$y", arg[0], status);
3794 return;
3795 }
3734 3796
3735 /* make lo/hi boolean */ 3797 /* make lo/hi boolean */
3736 if (mode == 'l') 3798 if (mode == 'l')
3737 mode = 0; /* reset */ 3799 mode = 0; /* reset */
3738 else if (mode == 'h') 3800 else if (mode == 'h')
… …
3807 scrollBar.map (state); 3869 scrollBar.map (state);
3808 resize_all_windows (0, 0, 0); 3870 resize_all_windows (0, 0, 0);
3809 scr_touch (true); 3871 scr_touch (true);
3810 break; 3872 break;
3811#endif 3873#endif
3874#ifdef CURSOR_BLINK
3875 case 12:
3876 cursor_blink_reset ();
3877 break;
3878#endif
3812 case 25: /* visible/invisible cursor */ 3879 case 25: /* visible/invisible cursor */
3813 scr_cursor_visible (state); 3880 scr_cursor_visible (state);
3814 break; 3881 break;
3815 /* case 35: - shift keys */ 3882 /* case 35: - shift keys */
3816 /* case 40: - 80 <--> 132 mode */ 3883 /* case 40: - 80 <--> 132 mode */
… …
3921 //case 19: // ninth alt font 3988 //case 19: // ninth alt font
3922 //case 20: // gothic 3989 //case 20: // gothic
3923 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3990 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3924 rendset = 0, rendstyle = RS_Bold; 3991 rendset = 0, rendstyle = RS_Bold;
3925 break; 3992 break;
3926 case 22: // normal intensity 3993 case 22: // bold off (vt220)
3927 rendset = 0, rendstyle = RS_Bold; 3994 rendset = 0, rendstyle = RS_Bold;
3928 break; 3995 break;
3929 case 23: // disable italic 3996 case 23: // disable italic
3930 rendset = 0, rendstyle = RS_Italic; 3997 rendset = 0, rendstyle = RS_Italic;
3931 break; 3998 break;
3932 case 24: 3999 case 24: // underline off (vt220)
3933 rendset = 0, rendstyle = RS_Uline; 4000 rendset = 0, rendstyle = RS_Uline;
3934 break; 4001 break;
3935 case 25: 4002 case 25: // blink off (vt220)
3936 rendset = 0, rendstyle = RS_Blink; 4003 rendset = 0, rendstyle = RS_Blink;
3937 break; 4004 break;
3938 case 26: // variable spacing (iso 8613) 4005 case 26: // variable spacing (iso 8613)
3939 rendset = 0, rendstyle = RS_Blink; 4006 rendset = 0, rendstyle = RS_Blink;
3940 break; 4007 break;
3941 case 27: 4008 case 27: // reverse off (vt220)
3942 rendset = 0, rendstyle = RS_RVid; 4009 rendset = 0, rendstyle = RS_RVid;
3943 break; 4010 break;
3944 //case 28: // visible. NYI 4011 //case 28: // visible. NYI
3945 //case 29: // not crossed-out 4012 //case 29: // not crossed-out
3946 } 4013 }
… …
3961 case 35: 4028 case 35:
3962 case 36: 4029 case 36:
3963 case 37: 4030 case 37:
3964 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4031 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3965 break; 4032 break;
3966 case 38: // set fg color, ISO 8613-6
3967 if (nargs > i + 2 && arg[i + 1] == 5)
3968 {
3969 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3970 i += 2;
3971 }
3972 break;
3973 case 39: /* default fg */ 4033 case 39: /* default fg */
3974 scr_color (Color_fg, Color_fg); 4034 scr_color (Color_fg, Color_fg);
3975 break; 4035 break;
3976 4036
3977 case 40: 4037 case 40:
… …
3982 case 45: 4042 case 45:
3983 case 46: 4043 case 46:
3984 case 47: 4044 case 47:
3985 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4045 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3986 break; 4046 break;
3987 case 48: // set bg color, ISO 8613-6
3988 if (nargs > i + 2 && arg[i + 1] == 5)
3989 {
3990 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3991 i += 2;
3992 }
3993 break;
3994 case 49: /* default bg */ 4047 case 49: /* default bg */
3995 scr_color (Color_bg, Color_bg); 4048 scr_color (Color_bg, Color_bg);
4049 break;
4050
4051 case 38: // set fg color, ISO 8613-6
4052 case 48: // set bg color, ISO 8613-6
4053 {
4054 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4055 unsigned int idx;
4056
4057 if (nargs > i + 2 && arg[i + 1] == 5)
4058 {
4059 idx = minCOLOR + arg[i + 2];
4060 i += 2;
4061
4062 scr_color (idx, fgbg);
4063 }
4064 else if (nargs > i + 4 && arg[i + 1] == 2)
4065 {
4066 unsigned int r = arg[i + 2];
4067 unsigned int g = arg[i + 3];
4068 unsigned int b = arg[i + 4];
4069 unsigned int a = 0xff;
4070
4071 idx = map_rgb24_color (r, g, b, a);
4072
4073 i += 4;
4074
4075 scr_color (idx, fgbg);
4076 }
4077 }
3996 break; 4078 break;
3997 4079
3998 //case 50: // not variable spacing 4080 //case 50: // not variable spacing
3999 4081
4000#if !ENABLE_MINIMAL 4082#if !ENABLE_MINIMAL
… …
4024} 4106}
4025 4107
4026void 4108void
4027rxvt_term::set_cursor_style (int style) 4109rxvt_term::set_cursor_style (int style)
4028{ 4110{
4029 if (!IN_RANGE_INC (style, 0, 4)) 4111 if (!IN_RANGE_INC (style, 0, 6))
4030 return; 4112 return;
4031 4113
4114 if (style == 0)
4115 style = 1;
4116
4117 cursor_type = (style - 1) / 2;
4032 set_option (Opt_cursorUnderline, style >= 3); 4118 set_option (Opt_cursorUnderline, cursor_type == 1);
4033 4119
4034#ifdef CURSOR_BLINK 4120#ifdef CURSOR_BLINK
4035 set_option (Opt_cursorBlink, !style || (style & 1)); 4121 set_option (Opt_cursorBlink, style & 1);
4036 cursor_blink_reset (); 4122 cursor_blink_reset ();
4037#endif 4123#endif
4038 4124
4039 want_refresh = 1; 4125 want_refresh = 1;
4040} 4126}
4041/*}}} */ 4127/*}}} */
4042 4128
4043/* ------------------------------------------------------------------------- */ 4129/* ---------------------------------------------------------------------- */
4130/* Write data to the pty as typed by the user, pasted with the mouse,
4131 * or generated by us in response to a query ESC sequence.
4132 */
4044 4133
4045/* 4134/*
4046 * Send printf () formatted output to the command. 4135 * Send printf () formatted output to the command.
4047 * Only use for small amounts of data. 4136 * Only use for small amounts of data.
4048 */ 4137 */
… …
4060 4149
4061/* Write data to the pty as typed by the user. */ 4150/* Write data to the pty as typed by the user. */
4062void 4151void
4063rxvt_term::tt_write_user_input (const char *data, unsigned int len) 4152rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4064{ 4153{
4154 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4155 return;
4156
4065 if (option (Opt_scrollTtyKeypress)) 4157 if (option (Opt_scrollTtyKeypress))
4066 if (view_start) 4158 if (view_start)
4067 { 4159 {
4068 view_start = 0; 4160 view_start = 0;
4069 want_refresh = 1; 4161 want_refresh = 1;
4070 } 4162 }
4071 4163
4072 tt_write (data, len); 4164 tt_write_ (data, len);
4073} 4165}
4074
4075/* ---------------------------------------------------------------------- */
4076/* Write data to the pty as typed by the user, pasted with the mouse,
4077 * or generated by us in response to a query ESC sequence.
4078 */
4079static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4080 4166
4081void 4167void
4082rxvt_term::tt_write (const char *data, unsigned int len) 4168rxvt_term::tt_write (const char *data, unsigned int len)
4083{ 4169{
4084 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4170 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4085 return; 4171 return;
4086 4172
4173 tt_write_ (data, len);
4174}
4175
4176static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4177
4178void
4179rxvt_term::tt_write_ (const char *data, unsigned int len)
4180{
4087 if (pty->pty < 0) 4181 if (pty->pty < 0)
4088 return; 4182 return;
4089 4183
4090 if (v_buflen == 0) 4184 if (v_buflen == 0)
4091 { 4185 {

Diff Legend

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