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.551 by sf-exg, Wed Jul 16 14:29:23 2014 UTC vs.
Revision 1.602 by sf-exg, Sat May 6 08:01:35 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 3 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.
… …
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 } 485 }
498 486
499 if (valid_keysym) 487 if (keysym != NoSymbol)
500 { 488 {
501 KeySym orig_keysym = keysym; 489 KeySym orig_keysym = keysym;
502 490
503 /* Shift + F1 - F10 generates F11 - F20 */ 491 /* Shift + F1 - F10 generates F11 - F20 */
504 if (shft && keysym >= XK_F1 && keysym <= XK_F10) 492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
… …
688 { 676 {
689 char *ch; 677 char *ch;
690 678
691 for (ch = kbuf; ch < kbuf + len; ch++) 679 for (ch = kbuf; ch < kbuf + len; ch++)
692 *ch |= 0x80; 680 *ch |= 0x80;
693
694 meta = 0;
695 } 681 }
696#endif 682#endif
697 /* nil */ ; 683 /* nil */ ;
698 } 684 }
699 685
… …
712 } 698 }
713 699
714 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)))
715 return; 701 return;
716 702
717 if (valid_keysym) 703 if (keysym != NoSymbol)
718 { 704 {
719#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
720 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
721 return; 707 return;
722#endif 708#endif
… …
1030/* checks whether a refresh is requested and starts the refresh timer */ 1016/* checks whether a refresh is requested and starts the refresh timer */
1031void 1017void
1032rxvt_term::refresh_check () 1018rxvt_term::refresh_check ()
1033{ 1019{
1034 if (want_refresh && !flush_ev.is_active ()) 1020 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1021 flush_ev.start ();
1036 1022
1037 display->flush (); 1023 display->flush ();
1038} 1024}
1039 1025
1040void 1026void
… …
1048 1034
1049#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1050void 1036void
1051rxvt_term::cursor_blink_reset () 1037rxvt_term::cursor_blink_reset ()
1052{ 1038{
1039 if (!focus)
1040 return;
1041
1053 if (hidden_cursor) 1042 if (hidden_cursor)
1054 { 1043 {
1055 hidden_cursor = 0; 1044 hidden_cursor = 0;
1056 want_refresh = 1; 1045 want_refresh = 1;
1057 } 1046 }
1058 1047
1059 if (option (Opt_cursorBlink)) 1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1060 cursor_blink_ev.again (); 1049 cursor_blink_ev.again ();
1061 else 1050 else
1062 cursor_blink_ev.stop (); 1051 cursor_blink_ev.stop ();
1063} 1052}
1064 1053
… …
1253 1242
1254void ecb_cold 1243void ecb_cold
1255rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1256{ 1245{
1257 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1258 recolour_cursor (); 1247 recolor_cursor ();
1259 1248
1260#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1261 hidden_pointer = 0; 1250 hidden_pointer = 0;
1262 1251
1263 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
… …
1288#endif 1277#endif
1289 1278
1290void 1279void
1291rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1292{ 1281{
1293 int button_number, key_state = 0; 1282 int button_number, state = 0;
1294 int x, y; 1283 int x, y;
1295 int code = 32; 1284 bool release = ev.type == ButtonRelease;
1296 1285
1297 x = Pixel2Col (ev.x) + 1; 1286 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1298 y = Pixel2Row (ev.y) + 1; 1287 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1299 1288
1300 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
1301 { 1290 {
1302 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1303 return; 1292 return;
1304 1293
1305 mouse_row = x; 1294 mouse_row = x;
1306 mouse_col = y; 1295 mouse_col = y;
1307 code += 32; 1296 state += 32;
1308 }
1309
1310 if (MEvent.button == AnyButton)
1311 button_number = 3;
1312 else
1313 { 1297 }
1298
1314 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1315 /* 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;
1316 if (button_number >= 3) 1304 else if (button_number >= 3)
1317 button_number += 64 - 3; 1305 button_number += 64 - 3;
1318 }
1319 1306
1320 if (priv_modes & PrivMode_MouseX10) 1307 if (priv_modes & PrivMode_MouseX10)
1321 { 1308 {
1322 /* 1309 /*
1323 * do not report ButtonRelease 1310 * do not report ButtonRelease
1324 * no state info allowed 1311 * no state info allowed
1325 */ 1312 */
1326 key_state = 0; 1313 if (release)
1327 if (button_number == 3)
1328 return; 1314 return;
1329 } 1315 }
1330 else 1316 else
1331 { 1317 {
1332 /* XTerm mouse reporting needs these values: 1318 /* XTerm mouse reporting needs these values:
… …
1334 * 8 = Meta 1320 * 8 = Meta
1335 * 16 = Control 1321 * 16 = Control
1336 * plus will add in our own Double-Click reporting 1322 * plus will add in our own Double-Click reporting
1337 * 32 = Double Click 1323 * 32 = Double Click
1338 */ 1324 */
1339 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1325 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1340 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1326 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1341 + ((MEvent.state & ControlMask) ? 16 : 0); 1327 + ((MEvent.state & ControlMask) ? 16 : 0);
1342#ifdef MOUSE_REPORT_DOUBLECLICK 1328#ifdef MOUSE_REPORT_DOUBLECLICK
1343 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1329 state += ((MEvent.clicks > 1) ? 32 : 0);
1344#endif 1330#endif
1345 } 1331 }
1332
1333 int code = 32 + (release ? 3 : button_number) + state;
1346 1334
1347#if DEBUG_MOUSEREPORT 1335#if DEBUG_MOUSEREPORT
1348 fprintf (stderr, "Mouse ["); 1336 fprintf (stderr, "Mouse [");
1349 if (key_state & 16) 1337 if (state & 16)
1350 fputc ('C', stderr); 1338 fputc ('C', stderr);
1351 if (key_state & 4) 1339 if (state & 4)
1352 fputc ('S', stderr); 1340 fputc ('S', stderr);
1353 if (key_state & 8) 1341 if (state & 8)
1354 fputc ('A', stderr); 1342 fputc ('A', stderr);
1355 if (key_state & 32) 1343 if (state & 32)
1356 fputc ('2', stderr); 1344 fputc ('2', stderr);
1357 fprintf (stderr, "]: <%d>, %d/%d\n", 1345 fprintf (stderr, "]: <%d>, %d/%d\n",
1358 button_number, 1346 button_number,
1359 x, 1347 x,
1360 y); 1348 y);
1361#endif 1349#endif
1362 1350
1363#if ENABLE_FRILLS 1351#if ENABLE_FRILLS
1364 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)
1365 tt_printf ("\033[%d;%d;%dM", 1359 tt_printf ("\033[%d;%d;%dM",
1366 code + button_number + key_state, 1360 code,
1367 x, 1361 x,
1368 y); 1362 y);
1369 else if (priv_modes & PrivMode_ExtModeMouse) 1363 else if (priv_modes & PrivMode_ExtMouseUTF8)
1364 if (code < 128)
1370 tt_printf ("\033[M%c%lc%lc", 1365 tt_printf ("\033[M%c%lc%lc",
1371 code + button_number + key_state, 1366 code,
1372 wint_t (32 + x), 1367 wint_t (32 + x),
1373 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));
1374 else 1375 else
1375#endif 1376#endif
1376 tt_printf ("\033[M%c%c%c", 1377 tt_printf ("\033[M%c%c%c",
1377 code + button_number + key_state, 1378 code,
1378 32 + x, 1379 32 + x,
1379 32 + y); 1380 32 + y);
1380} 1381}
1381 1382
1382/*{{{ process an X event */ 1383/*{{{ process an X event */
… …
1493 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1494 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1494 ; 1495 ;
1495 1496
1496 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1497 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1497 1498
1498 bool moved = false;
1499#ifdef HAVE_BG_PIXMAP
1500 if (bg_window_position_sensitive ())
1501 {
1502 want_position_change = true;
1503 if (bg_img == 0)
1504 moved = true;
1505 }
1506#endif
1507
1508 if (want_position_change) 1499 if (want_position_change)
1509 { 1500 {
1510 int x, y; 1501 int x, y;
1511 1502
1512 if (ev.xconfigure.send_event) 1503 if (ev.xconfigure.send_event)
… …
1520 if (x != parent_x || y != parent_y) 1511 if (x != parent_x || y != parent_y)
1521 { 1512 {
1522 parent_x = x; 1513 parent_x = x;
1523 parent_y = y; 1514 parent_y = y;
1524 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));
1525 moved = true;
1526 } 1516 }
1527 } 1517 }
1528 1518
1529 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1519 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1530 { 1520 {
1531 seen_resize = 1; 1521 seen_resize = 1;
1532 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1522 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1533 } 1523 }
1534 else
1535 {
1536#ifdef HAVE_BG_PIXMAP
1537 if (moved)
1538 update_background ();
1539#endif
1540 }
1541 1524
1542 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1525 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1543 } 1526 }
1544 break; 1527 break;
1545 1528
… …
1554 case SelectionRequest: 1537 case SelectionRequest:
1555 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1556 break; 1539 break;
1557 1540
1558 case MapNotify: 1541 case MapNotify:
1559#ifdef HAVE_BG_PIXMAP
1560 // This is needed at startup for the case of no window manager
1561 // or a non-reparenting window manager and also because we
1562 // defer bg image updates if the window is not mapped. The
1563 // short delay is to optimize for multiple ConfigureNotify
1564 // events at startup when the window manager reparents the
1565 // window, so as to perform the computation after we have
1566 // received all of them.
1567 if (bg_img == 0)
1568 update_background_ev.start (0.025);
1569#endif
1570 mapped = 1; 1542 mapped = 1;
1571#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1572 text_blink_ev.start (); 1544 text_blink_ev.start ();
1573#endif 1545#endif
1574 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1546 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1623 case MotionNotify: 1595 case MotionNotify:
1624#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1625 if (hidden_pointer) 1597 if (hidden_pointer)
1626 pointer_unblank (); 1598 pointer_unblank ();
1627#endif 1599#endif
1600 if (!bypass_keystate
1628 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1601 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1629 || priv_modes & PrivMode_MouseAnyEvent) 1602 || priv_modes & PrivMode_MouseAnyEvent))
1630 mouse_report (ev.xbutton); 1603 mouse_report (ev.xbutton);
1631 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1604 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1632 break; 1605 break;
1633 1606
1634 if (ev.xany.window == vt) 1607 if (ev.xany.window == vt)
… …
1646 &unused_root_x, &unused_root_y, 1619 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1620 &ev.xbutton.x, &ev.xbutton.y,
1648 &ev.xbutton.state); 1621 &ev.xbutton.state);
1649#ifdef MOUSE_THRESHOLD 1622#ifdef MOUSE_THRESHOLD
1650 /* deal with a `jumpy' mouse */ 1623 /* deal with a `jumpy' mouse */
1651 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1624 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1625#endif
1652 { 1626 {
1653#endif
1654#if ISO_14755 1627#if ISO_14755
1655 // 5.4 1628 // 5.4
1656 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1629 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1657 { 1630 {
1658 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1631 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1707 * shouldn't be scrolling 1680 * shouldn't be scrolling
1708 */ 1681 */
1709 sel_scroll_ev.stop(); 1682 sel_scroll_ev.stop();
1710 } 1683 }
1711#endif 1684#endif
1712#ifdef MOUSE_THRESHOLD
1713 } 1685 }
1714#endif
1715 } 1686 }
1716 } 1687 }
1717 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)
1718 { 1689 {
1719 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1690 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1793#endif 1764#endif
1794#if OFF_FOCUS_FADING 1765#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade]) 1766 if (rs[Rs_fade])
1796 { 1767 {
1797 pix_colors = pix_colors_focused; 1768 pix_colors = pix_colors_focused;
1798 scr_recolour (); 1769 scr_recolor ();
1799 } 1770 }
1800#endif 1771#endif
1801#if ENABLE_FRILLS 1772#if ENABLE_FRILLS
1802 if (option (Opt_urgentOnBell)) 1773 if (option (Opt_urgentOnBell))
1803 set_urgency (0); 1774 set_urgency (0);
1775
1776 if (priv_modes & PrivMode_FocusEvent)
1777 tt_printf ("\x1b[I");
1804#endif 1778#endif
1805 1779
1806 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1780 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1807 } 1781 }
1808} 1782}
… …
1816 want_refresh = 1; 1790 want_refresh = 1;
1817 1791
1818#if ENABLE_FRILLS 1792#if ENABLE_FRILLS
1819 if (option (Opt_urgentOnBell)) 1793 if (option (Opt_urgentOnBell))
1820 set_urgency (0); 1794 set_urgency (0);
1795
1796 if (priv_modes & PrivMode_FocusEvent)
1797 tt_printf ("\x1b[O");
1821#endif 1798#endif
1822#if ENABLE_FRILLS || ISO_14755 1799#if ENABLE_FRILLS || ISO_14755
1823 if (iso14755buf) 1800 if (iso14755buf)
1824 { 1801 {
1825 iso14755buf = 0; 1802 iso14755buf = 0;
… …
1840#endif 1817#endif
1841#if OFF_FOCUS_FADING 1818#if OFF_FOCUS_FADING
1842 if (rs[Rs_fade]) 1819 if (rs[Rs_fade])
1843 { 1820 {
1844 pix_colors = pix_colors_unfocused; 1821 pix_colors = pix_colors_unfocused;
1845 scr_recolour (); 1822 scr_recolor ();
1846 } 1823 }
1847#endif 1824#endif
1848 1825
1849 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1850 } 1827 }
1851} 1828}
1852 1829
1853void ecb_cold 1830void ecb_cold
1854rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1855{ 1832{
1856#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1857 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1858 { 1835 {
1836 if (!first_time)
1837 pix_colors_focused [idx].free (this);
1838
1859 rgba c; 1839 rgba c;
1860 pix_colors [Color_fade].get (c); 1840 pix_colors [Color_fade].get (c);
1861 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);
1862 } 1842 }
1863#endif 1843#endif
1864} 1844}
1865 1845
1866#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1846#if ENABLE_PERL
1867void ecb_hot 1847void ecb_hot
1868rxvt_term::rootwin_cb (XEvent &ev) 1848rxvt_term::rootwin_cb (XEvent &ev)
1869{ 1849{
1870 make_current (); 1850 make_current ();
1871 1851
… …
1881 * 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.
1882 */ 1862 */
1883 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1863 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1884 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1864 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1885 { 1865 {
1886#if BG_IMAGE_FROM_ROOT
1887 if (option (Opt_transparent))
1888 {
1889 rxvt_img::new_from_root (this)->replace (root_img);
1890 update_background ();
1891 }
1892#endif
1893 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1866 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1894 } 1867 }
1895 1868
1896 break; 1869 break;
1897 } 1870 }
… …
1925 iso14755_54 (ev.x, ev.y); 1898 iso14755_54 (ev.x, ev.y);
1926 return; 1899 return;
1927 } 1900 }
1928#endif 1901#endif
1929 1902
1930 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1903 clickintime = ev.time - MEvent.time < multiClickTime;
1931 1904
1932 if (reportmode) 1905 if (reportmode)
1933 { 1906 {
1934 /* mouse report from vt window */ 1907 /* mouse report from vt window */
1935 /* save the xbutton state (for ButtonRelease) */ 1908 /* save the xbutton state (for ButtonRelease) */
… …
2178 2151
2179 if (reportmode) 2152 if (reportmode)
2180 { 2153 {
2181 /* mouse report from vt window */ 2154 /* mouse report from vt window */
2182 /* don't report release of wheel "buttons" */ 2155 /* don't report release of wheel "buttons" */
2183 if (ev.button >= 4) 2156 if (ev.button >= 4 && ev.button <= 7)
2184 return; 2157 return;
2185#ifdef MOUSE_REPORT_DOUBLECLICK 2158#ifdef MOUSE_REPORT_DOUBLECLICK
2186 /* only report the release of 'slow' single clicks */ 2159 /* only report the release of 'slow' single clicks */
2187 if (MEvent.button != AnyButton 2160 if (MEvent.button != AnyButton
2188 && (ev.button != MEvent.button 2161 && (ev.button != MEvent.button
2189 || (ev.time - MEvent.time 2162 || (ev.time - MEvent.time
2190 > MULTICLICK_TIME / 2))) 2163 > multiClickTime / 2)))
2191 { 2164 {
2192 MEvent.clicks = 0; 2165 MEvent.clicks = 0;
2193 MEvent.button = AnyButton; 2166 MEvent.button = ev.button;
2194 mouse_report (ev); 2167 mouse_report (ev);
2195 } 2168 }
2196#else /* MOUSE_REPORT_DOUBLECLICK */ 2169#else /* MOUSE_REPORT_DOUBLECLICK */
2197 MEvent.button = AnyButton; 2170 MEvent.button = ev.button;
2198 mouse_report (ev); 2171 mouse_report (ev);
2199#endif /* MOUSE_REPORT_DOUBLECLICK */ 2172#endif /* MOUSE_REPORT_DOUBLECLICK */
2200 return; 2173 return;
2201 } 2174 }
2202 2175
… …
2389 } 2362 }
2390} 2363}
2391 2364
2392// read the next character 2365// read the next character
2393wchar_t ecb_hot 2366wchar_t ecb_hot
2394rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () noexcept
2395{ 2368{
2396 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2397 { 2370 {
2398 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2399 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2400 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2401 2374
2402 wchar_t wc; 2375 wchar_t wc;
2403 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);
2404 2377
… …
2425 return NOCHAR; 2398 return NOCHAR;
2426} 2399}
2427 2400
2428// read the next octet 2401// read the next octet
2429uint32_t ecb_hot 2402uint32_t ecb_hot
2430rxvt_term::next_octet () NOTHROW 2403rxvt_term::next_octet () noexcept
2431{ 2404{
2432 return cmdbuf_ptr < cmdbuf_endp 2405 return cmdbuf_ptr < cmdbuf_endp
2433 ? (unsigned char)*cmdbuf_ptr++ 2406 ? (unsigned char)*cmdbuf_ptr++
2434 : NOCHAR; 2407 : NOCHAR;
2435} 2408}
2436 2409
2437static class out_of_input out_of_input; 2410static class out_of_input out_of_input;
2438 2411
2439wchar_t ecb_hot 2412wchar_t ecb_hot
2440rxvt_term::cmd_getc () THROW ((class out_of_input)) 2413rxvt_term::cmd_getc ()
2441{ 2414{
2442 wchar_t c = next_char (); 2415 wchar_t c = next_char ();
2443 2416
2444 if (c == NOCHAR) 2417 if (c == NOCHAR)
2445 throw out_of_input; 2418 throw out_of_input;
2446 2419
2447 return c; 2420 return c;
2448} 2421}
2449 2422
2450uint32_t ecb_hot 2423uint32_t ecb_hot
2451rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2424rxvt_term::cmd_get8 ()
2452{ 2425{
2453 uint32_t c = next_octet (); 2426 uint32_t c = next_octet ();
2454 2427
2455 if (c == NOCHAR) 2428 if (c == NOCHAR)
2456 throw out_of_input; 2429 throw out_of_input;
… …
2585 scr_charset_choose (0); 2558 scr_charset_choose (0);
2586 break; 2559 break;
2587 2560
2588#ifdef EIGHT_BIT_CONTROLS 2561#ifdef EIGHT_BIT_CONTROLS
2589 // 8-bit controls 2562 // 8-bit controls
2590 case 0x90: /* DCS */ 2563 case 0x90: /* DCS */
2591 process_dcs_seq (); 2564 process_dcs_seq ();
2592 break; 2565 break;
2593 case 0x9b: /* CSI */ 2566 case 0x9b: /* CSI */
2594 process_csi_seq (); 2567 process_csi_seq ();
2595 break; 2568 break;
2596 case 0x9d: /* OSC */ 2569 case 0x9d: /* OSC */
2597 process_osc_seq (); 2570 process_osc_seq ();
2598 break; 2571 break;
2599#endif 2572#endif
2600 } 2573 }
2601} 2574}
… …
2729 wchar_t nlcr[] = { C0_LF, C0_CR }; 2702 wchar_t nlcr[] = { C0_LF, C0_CR };
2730 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2703 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2731 } 2704 }
2732 break; 2705 break;
2733 2706
2707#if 0 // disabled because embedded newlines can make exploits easier
2734 /* kidnapped escape sequence: Should be 8.3.48 */ 2708 /* kidnapped escape sequence: Should be 8.3.48 */
2735 case C1_ESA: /* ESC G */ 2709 case C1_ESA: /* ESC G */
2736 // used by original rxvt for rob nations own graphics mode 2710 // used by original rxvt for rob nations own graphics mode
2737 if (cmd_getc () == 'Q') 2711 if (cmd_getc () == 'Q' && option (Opt_insecure))
2738 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2712 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2739 break; 2713 break;
2714#endif
2740 2715
2741 /* 8.3.63: CHARACTER TABULATION SET */ 2716 /* 8.3.63: CHARACTER TABULATION SET */
2742 case C1_HTS: /* ESC H */ 2717 case C1_HTS: /* ESC H */
2743 scr_set_tab (1); 2718 scr_set_tab (1);
2744 break; 2719 break;
… …
2902 break; 2877 break;
2903 2878
2904 case '?': 2879 case '?':
2905 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2880 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2906 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);
2907 break; 2884 break;
2908 2885
2909 case '!': 2886 case '!':
2910 if (ch == CSI_70) 2887 if (ch == CSI_70)
2911 { 2888 {
2912 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2889 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2913 scr_soft_reset (); 2890 scr_soft_reset ();
2914 2891
2915 static const int pm_h[] = { 7, 25 }; 2892 static const int pm_h[] = { 7, 25 };
2916 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 };
2917 2894
2918 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);
2919 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);
2920 } 2897 }
2921 break; 2898 break;
… …
2951 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2928 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2952 scr_gotorc (arg[0], 0, RELATIVE); 2929 scr_gotorc (arg[0], 0, RELATIVE);
2953 break; 2930 break;
2954 2931
2955 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2932 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2956 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2933 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2957#ifdef ISO6429 2934#ifdef ISO6429
2958 arg[0] = -arg[0]; 2935 arg[0] = -arg[0];
2959#else /* emulate common DEC VTs */ 2936#else /* emulate common DEC VTs */
2960 arg[0] = arg[0] ? -arg[0] : -1; 2937 arg[0] = arg[0] ? -arg[0] : -1;
2961#endif 2938#endif
… …
3052 case 7: /* unofficial extension */ 3029 case 7: /* unofficial extension */
3053 if (option (Opt_insecure)) 3030 if (option (Opt_insecure))
3054 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3031 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3055 break; 3032 break;
3056 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';
3057 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3038 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3058 break; 3039 break;
3040 }
3059 } 3041 }
3060 break; 3042 break;
3061 3043
3062 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3044 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3063 switch (arg[0]) 3045 switch (arg[0])
… …
3106 scr_insert_mode (1); 3088 scr_insert_mode (1);
3107 else if (arg[0] == 20) 3089 else if (arg[0] == 20)
3108 priv_modes |= PrivMode_LFNL; 3090 priv_modes |= PrivMode_LFNL;
3109 break; 3091 break;
3110 3092
3111 case CSI_71: // DESCUSR: set cursor style 3093 case CSI_71: // DECSCUSR: set cursor style
3112 if (prev_ch == ' ') 3094 if (prev_ch == ' ')
3113 set_cursor_style (arg[0]); 3095 set_cursor_style (arg[0]);
3114 break; 3096 break;
3115 3097
3116 /* 3098 /*
… …
3248/* 3230/*
3249 * get input up until STRING TERMINATOR (or BEL) 3231 * get input up until STRING TERMINATOR (or BEL)
3250 * ends_how is terminator used. returned input must be free()'d 3232 * ends_how is terminator used. returned input must be free()'d
3251 */ 3233 */
3252char * 3234char *
3253rxvt_term::get_to_st (unicode_t &ends_how) 3235rxvt_term::get_to_st (string_term &st)
3254{ 3236{
3255 unicode_t ch; 3237 unicode_t ch;
3256 bool seen_esc = false; 3238 bool seen_esc = false;
3257 unsigned int n = 0; 3239 unsigned int n = 0;
3258 wchar_t string[CBUFSIZ]; 3240 wchar_t string[CBUFSIZ];
… …
3287 string[n++] = ch; 3269 string[n++] = ch;
3288 } 3270 }
3289 3271
3290 string[n++] = '\0'; 3272 string[n++] = '\0';
3291 3273
3292 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';
3293 3279
3294 return rxvt_wcstombs (string); 3280 return rxvt_wcstombs (string);
3295} 3281}
3296 3282
3297/*----------------------------------------------------------------------*/ 3283/*----------------------------------------------------------------------*/
… …
3303{ 3289{
3304 /* 3290 /*
3305 * Not handled yet 3291 * Not handled yet
3306 */ 3292 */
3307 3293
3308 unicode_t eh; 3294 string_term st;
3309 char *s = get_to_st (eh); 3295 char *s = get_to_st (st);
3310 if (s) 3296 if (s)
3311 free (s); 3297 free (s);
3312 3298
3313 return; 3299 return;
3314} 3300}
… …
3326 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3312 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3327 arg = arg * 10 + (ch - '0'); 3313 arg = arg * 10 + (ch - '0');
3328 3314
3329 if (ch == ';') 3315 if (ch == ';')
3330 { 3316 {
3331 unicode_t eh; 3317 string_term st;
3332 char *s = get_to_st (eh); 3318 char *s = get_to_st (st);
3333 3319
3334 if (s) 3320 if (s)
3335 { 3321 {
3336 process_xterm_seq (arg, s, eh); 3322 process_xterm_seq (arg, s, st);
3337 free (s); 3323 free (s);
3338 } 3324 }
3339 } 3325 }
3340} 3326}
3341 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
3342void 3431void
3343rxvt_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)
3344{ 3433{
3345 if (str[0] == '?' && !str[1]) 3434 if (str[0] == '?' && !str[1])
3346 { 3435 {
3347 rgba c; 3436 rgba c;
3348 pix_colors_focused[color].get (c); 3437 pix_colors_focused[color].get (c);
3438 char rgba_str[32];
3349 3439
3350#if XFT 3440#if XFT
3351 if (c.a != rgba::MAX_CC) 3441 if (c.a != rgba::MAX_CC)
3352 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);
3353 else 3443 else
3354#endif 3444#endif
3355 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);
3356 } 3451 }
3357 else 3452 else
3358 set_window_color (color, str); 3453 set_window_color (color, str);
3359} 3454}
3360 3455
3361/* 3456/*
3362 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3457 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3363 */ 3458 */
3364void 3459void
3365rxvt_term::process_xterm_seq (int op, char *str, char resp) 3460rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3366{ 3461{
3367 int color; 3462 int color;
3368 char *buf, *name; 3463 char *buf, *name;
3369 bool query = str[0] == '?' && !str[1]; 3464 bool query = str[0] == '?' && !str[1];
3370 int saveop = op; 3465 int saveop = op;
… …
3405 &nitems, &bytes_after, &value) == Success 3500 &nitems, &bytes_after, &value) == Success
3406 && actual_type != None 3501 && actual_type != None
3407 && actual_format == 8) 3502 && actual_format == 8)
3408 str = (const char *)(value); 3503 str = (const char *)(value);
3409 3504
3410 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);
3411 3506
3412 XFree (value); 3507 XFree (value);
3413 } 3508 }
3414 else 3509 else
3415 { 3510 {
… …
3439 break; 3534 break;
3440 3535
3441 if ((buf = strchr (name, ';')) != NULL) 3536 if ((buf = strchr (name, ';')) != NULL)
3442 *buf++ = '\0'; 3537 *buf++ = '\0';
3443 3538
3444 process_color_seq (op, color, name, resp); 3539 process_color_seq (op, color, name, st);
3445 } 3540 }
3446 break; 3541 break;
3447 case Rxvt_restoreFG: 3542 case Rxvt_restoreFG:
3448 case XTerm_Color00: 3543 case XTerm_Color00:
3449 process_color_seq (op, Color_fg, str, resp); 3544 process_color_seq (op, Color_fg, str, st);
3450 break; 3545 break;
3451 case Rxvt_restoreBG: 3546 case Rxvt_restoreBG:
3452 case XTerm_Color01: 3547 case XTerm_Color01:
3453 process_color_seq (op, Color_bg, str, resp); 3548 process_color_seq (op, Color_bg, str, st);
3454 break; 3549 break;
3455#ifndef NO_CURSORCOLOR 3550#ifndef NO_CURSORCOLOR
3456 case XTerm_Color_cursor: 3551 case XTerm_Color_cursor:
3457 process_color_seq (op, Color_cursor, str, resp); 3552 process_color_seq (op, Color_cursor, str, st);
3458 break; 3553 break;
3459#endif 3554#endif
3460 case XTerm_Color_pointer_fg: 3555 case XTerm_Color_pointer_fg:
3461 process_color_seq (op, Color_pointer_fg, str, resp); 3556 process_color_seq (op, Color_pointer_fg, str, st);
3462 break; 3557 break;
3463 case XTerm_Color_pointer_bg: 3558 case XTerm_Color_pointer_bg:
3464 process_color_seq (op, Color_pointer_bg, str, resp); 3559 process_color_seq (op, Color_pointer_bg, str, st);
3465 break; 3560 break;
3466#ifdef OPTION_HC 3561#ifdef OPTION_HC
3467 case XTerm_Color_HC: 3562 case XTerm_Color_HC:
3468 process_color_seq (op, Color_HC, str, resp); 3563 process_color_seq (op, Color_HC, str, st);
3469 break; 3564 break;
3470 case XTerm_Color_HTC: 3565 case XTerm_Color_HTC:
3471 process_color_seq (op, Color_HTC, str, resp); 3566 process_color_seq (op, Color_HTC, str, st);
3472 break; 3567 break;
3473#endif 3568#endif
3474#ifndef NO_BOLD_UNDERLINE_REVERSE 3569#ifndef NO_BOLD_UNDERLINE_REVERSE
3475 case URxvt_Color_BD: 3570 case URxvt_Color_BD:
3476 process_color_seq (op, Color_BD, str, resp); 3571 process_color_seq (op, Color_BD, str, st);
3477 break; 3572 break;
3478 case URxvt_Color_UL: 3573 case URxvt_Color_UL:
3479 process_color_seq (op, Color_UL, str, resp); 3574 process_color_seq (op, Color_UL, str, st);
3480 break; 3575 break;
3481 case URxvt_Color_IT: 3576 case URxvt_Color_IT:
3482 process_color_seq (op, Color_IT, str, resp); 3577 process_color_seq (op, Color_IT, str, st);
3483 break; 3578 break;
3484#endif 3579#endif
3485 case URxvt_Color_border: 3580 case URxvt_Color_border:
3486 process_color_seq (op, Color_border, str, resp); 3581 process_color_seq (op, Color_border, str, st);
3487 break; 3582 break;
3488
3489#if BG_IMAGE_FROM_ROOT
3490 case URxvt_Color_tint:
3491 process_color_seq (op, Color_tint, str, resp);
3492 {
3493 bool changed = false;
3494
3495 if (ISSET_PIXCOLOR (Color_tint))
3496 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3497
3498 if (changed)
3499 update_background ();
3500 }
3501
3502 break;
3503#endif
3504
3505#if BG_IMAGE_FROM_FILE
3506 case Rxvt_Pixmap:
3507 if (!strcmp (str, "?"))
3508 {
3509 char str[256];
3510 int h_scale = fimage.h_scale;
3511 int v_scale = fimage.v_scale;
3512 int h_align = fimage.h_align;
3513 int v_align = fimage.v_align;
3514
3515 sprintf (str, "[%dx%d+%d+%d]",
3516 h_scale, v_scale,
3517 h_align, v_align);
3518 process_xterm_seq (XTerm_title, str, CHAR_ST);
3519 }
3520 else
3521 {
3522 bool changed = false;
3523
3524 if (*str != ';')
3525 {
3526 try
3527 {
3528 fimage.set_file_geometry (this, str);
3529 changed = true;
3530 }
3531 catch (const class rxvt_failure_exception &e)
3532 {
3533 }
3534 }
3535 else
3536 {
3537 str++;
3538 if (fimage.set_geometry (str, true))
3539 changed = true;
3540 }
3541
3542 if (changed)
3543 {
3544 if (bg_window_position_sensitive ())
3545 {
3546 int x, y;
3547 get_window_origin (x, y);
3548 parent_x = x;
3549 parent_y = y;
3550 }
3551 update_background ();
3552 }
3553 }
3554 break;
3555#endif
3556 3583
3557 case XTerm_logfile: 3584 case XTerm_logfile:
3558 // TODO, when secure mode? 3585 // TODO, when secure mode?
3559 break; 3586 break;
3560 3587
… …
3577 case URxvt_boldFont: 3604 case URxvt_boldFont:
3578 case URxvt_italicFont: 3605 case URxvt_italicFont:
3579 case URxvt_boldItalicFont: 3606 case URxvt_boldItalicFont:
3580#endif 3607#endif
3581 if (query) 3608 if (query)
3582 tt_printf ("\33]%d;%-.250s%c", saveop, 3609 tt_printf ("\33]%d;%-.250s%s", saveop,
3583 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3610 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3584 ? fontset[op - URxvt_font]->fontdesc : "", 3611 ? fontset[op - URxvt_font]->fontdesc : "",
3585 resp); 3612 st.v);
3586 else 3613 else
3587 { 3614 {
3588 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3615 const char *&res = rs[Rs_font + (op - URxvt_font)];
3589 3616
3590 res = strdup (str); 3617 res = strdup (str);
… …
3593 } 3620 }
3594 break; 3621 break;
3595 3622
3596 case URxvt_version: 3623 case URxvt_version:
3597 if (query) 3624 if (query)
3598 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3625 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3599 op, 3626 op,
3600 rs[Rs_name], VERSION[0], VERSION[2], 3627 rs[Rs_name], VERSION[0], VERSION[2],
3601 resp); 3628 st.v);
3602 break; 3629 break;
3603 3630
3604#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
3605 case URxvt_locale: 3639 case URxvt_locale:
3606 if (query) 3640 if (query)
3607 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);
3608 else 3642 else
3609 { 3643 {
3610 set_locale (str); 3644 set_locale (str);
3611 pty->set_utf8_mode (enc_utf8); 3645 pty->set_utf8_mode (enc_utf8);
3612 init_xlocale (); 3646 init_xlocale ();
… …
3627 break; 3661 break;
3628#endif 3662#endif
3629 3663
3630#if ENABLE_PERL 3664#if ENABLE_PERL
3631 case URxvt_perl: 3665 case URxvt_perl:
3632 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));
3633 break; 3667 break;
3634#endif 3668#endif
3635 } 3669 }
3636} 3670}
3637/*----------------------------------------------------------------------*/ 3671/*----------------------------------------------------------------------*/
… …
3694 { 5, PrivMode_rVideo }, // DECSCNM 3728 { 5, PrivMode_rVideo }, // DECSCNM
3695 { 6, PrivMode_relOrigin }, // DECOM 3729 { 6, PrivMode_relOrigin }, // DECOM
3696 { 7, PrivMode_Autowrap }, // DECAWM 3730 { 7, PrivMode_Autowrap }, // DECAWM
3697 // 8, auto-repeat keys // DECARM 3731 // 8, auto-repeat keys // DECARM
3698 { 9, PrivMode_MouseX10 }, 3732 { 9, PrivMode_MouseX10 },
3733 { 12, PrivMode_BlinkingCursor },
3699 // 18 end FF to printer after print screen 3734 // 18 end FF to printer after print screen
3700 // 19 Print screen prints full screen/scroll region 3735 // 19 Print screen prints full screen/scroll region
3701 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3736 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3702#ifdef scrollBar_esc 3737#ifdef scrollBar_esc
3703 { scrollBar_esc, PrivMode_scrollBar }, 3738 { scrollBar_esc, PrivMode_scrollBar },
… …
3715#endif 3750#endif
3716 { 1000, PrivMode_MouseX11 }, 3751 { 1000, PrivMode_MouseX11 },
3717 { 1002, PrivMode_MouseBtnEvent }, 3752 { 1002, PrivMode_MouseBtnEvent },
3718 { 1003, PrivMode_MouseAnyEvent }, 3753 { 1003, PrivMode_MouseAnyEvent },
3719#if ENABLE_FRILLS 3754#if ENABLE_FRILLS
3755 { 1004, PrivMode_FocusEvent },
3720 { 1005, PrivMode_ExtModeMouse }, 3756 { 1005, PrivMode_ExtMouseUTF8 },
3757 { 1006, PrivMode_ExtMouseSGR },
3721#endif 3758#endif
3722 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3759 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3723 { 1011, PrivMode_Keypress }, // rxvt extension 3760 { 1011, PrivMode_Keypress }, // rxvt extension
3724#if ENABLE_FRILLS 3761#if ENABLE_FRILLS
3725 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3762 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3726#endif 3763#endif
3727 // 1035 enable modifiers for alt, numlock NYI 3764 // 1035 enable modifiers for alt, numlock NYI
3728 // 1036 send ESC for meta keys NYI 3765 // 1036 send ESC for meta keys NYI
3729 // 1037 send DEL for keypad delete NYI 3766 // 1037 send DEL for keypad delete NYI
3730 { 1047, PrivMode_Screen }, 3767 { 1047, PrivMode_Screen },
3731 // 1048 save and restore cursor, implemented in code 3768 // 1048 save and restore cursor, implemented in code
3732 { 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 */
3733 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3770 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3771#if ENABLE_FRILLS
3734 { 2004, PrivMode_BracketPaste }, 3772 { 2004, PrivMode_BracketPaste },
3773#endif
3735 }; 3774 };
3736 3775
3737 if (nargs == 0) 3776 if (nargs == 0)
3738 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 }
3739 3796
3740 /* make lo/hi boolean */ 3797 /* make lo/hi boolean */
3741 if (mode == 'l') 3798 if (mode == 'l')
3742 mode = 0; /* reset */ 3799 mode = 0; /* reset */
3743 else if (mode == 'h') 3800 else if (mode == 'h')
… …
3812 scrollBar.map (state); 3869 scrollBar.map (state);
3813 resize_all_windows (0, 0, 0); 3870 resize_all_windows (0, 0, 0);
3814 scr_touch (true); 3871 scr_touch (true);
3815 break; 3872 break;
3816#endif 3873#endif
3874#ifdef CURSOR_BLINK
3875 case 12:
3876 cursor_blink_reset ();
3877 break;
3878#endif
3817 case 25: /* visible/invisible cursor */ 3879 case 25: /* visible/invisible cursor */
3818 scr_cursor_visible (state); 3880 scr_cursor_visible (state);
3819 break; 3881 break;
3820 /* case 35: - shift keys */ 3882 /* case 35: - shift keys */
3821 /* case 40: - 80 <--> 132 mode */ 3883 /* case 40: - 80 <--> 132 mode */
… …
3926 //case 19: // ninth alt font 3988 //case 19: // ninth alt font
3927 //case 20: // gothic 3989 //case 20: // gothic
3928 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3990 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3929 rendset = 0, rendstyle = RS_Bold; 3991 rendset = 0, rendstyle = RS_Bold;
3930 break; 3992 break;
3931 case 22: // normal intensity 3993 case 22: // bold off (vt220)
3932 rendset = 0, rendstyle = RS_Bold; 3994 rendset = 0, rendstyle = RS_Bold;
3933 break; 3995 break;
3934 case 23: // disable italic 3996 case 23: // disable italic
3935 rendset = 0, rendstyle = RS_Italic; 3997 rendset = 0, rendstyle = RS_Italic;
3936 break; 3998 break;
3937 case 24: 3999 case 24: // underline off (vt220)
3938 rendset = 0, rendstyle = RS_Uline; 4000 rendset = 0, rendstyle = RS_Uline;
3939 break; 4001 break;
3940 case 25: 4002 case 25: // blink off (vt220)
3941 rendset = 0, rendstyle = RS_Blink; 4003 rendset = 0, rendstyle = RS_Blink;
3942 break; 4004 break;
3943 case 26: // variable spacing (iso 8613) 4005 case 26: // variable spacing (iso 8613)
3944 rendset = 0, rendstyle = RS_Blink; 4006 rendset = 0, rendstyle = RS_Blink;
3945 break; 4007 break;
3946 case 27: 4008 case 27: // reverse off (vt220)
3947 rendset = 0, rendstyle = RS_RVid; 4009 rendset = 0, rendstyle = RS_RVid;
3948 break; 4010 break;
3949 //case 28: // visible. NYI 4011 //case 28: // visible. NYI
3950 //case 29: // not crossed-out 4012 //case 29: // not crossed-out
3951 } 4013 }
… …
3966 case 35: 4028 case 35:
3967 case 36: 4029 case 36:
3968 case 37: 4030 case 37:
3969 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4031 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3970 break; 4032 break;
3971 case 38: // set fg color, ISO 8613-6
3972 if (nargs > i + 2 && arg[i + 1] == 5)
3973 {
3974 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3975 i += 2;
3976 }
3977 break;
3978 case 39: /* default fg */ 4033 case 39: /* default fg */
3979 scr_color (Color_fg, Color_fg); 4034 scr_color (Color_fg, Color_fg);
3980 break; 4035 break;
3981 4036
3982 case 40: 4037 case 40:
… …
3987 case 45: 4042 case 45:
3988 case 46: 4043 case 46:
3989 case 47: 4044 case 47:
3990 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4045 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3991 break; 4046 break;
3992 case 48: // set bg color, ISO 8613-6
3993 if (nargs > i + 2 && arg[i + 1] == 5)
3994 {
3995 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3996 i += 2;
3997 }
3998 break;
3999 case 49: /* default bg */ 4047 case 49: /* default bg */
4000 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 }
4001 break; 4078 break;
4002 4079
4003 //case 50: // not variable spacing 4080 //case 50: // not variable spacing
4004 4081
4005#if !ENABLE_MINIMAL 4082#if !ENABLE_MINIMAL
… …
4029} 4106}
4030 4107
4031void 4108void
4032rxvt_term::set_cursor_style (int style) 4109rxvt_term::set_cursor_style (int style)
4033{ 4110{
4034 if (!IN_RANGE_INC (style, 0, 4)) 4111 if (!IN_RANGE_INC (style, 0, 6))
4035 return; 4112 return;
4036 4113
4114 if (style == 0)
4115 style = 1;
4116
4117 cursor_type = (style - 1) / 2;
4037 set_option (Opt_cursorUnderline, style >= 3); 4118 set_option (Opt_cursorUnderline, cursor_type == 1);
4038 4119
4039#ifdef CURSOR_BLINK 4120#ifdef CURSOR_BLINK
4040 set_option (Opt_cursorBlink, !style || (style & 1)); 4121 set_option (Opt_cursorBlink, style & 1);
4041 cursor_blink_reset (); 4122 cursor_blink_reset ();
4042#endif 4123#endif
4043 4124
4044 want_refresh = 1; 4125 want_refresh = 1;
4045} 4126}

Diff Legend

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