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.550 by root, Thu May 22 18:54:32 2014 UTC vs.
Revision 1.584 by root, Sun Jul 7 08:02:15 2019 UTC

… …
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-2014 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.
… …
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 */
… …
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))
… …
1488 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1489 ; 1483 ;
1490 1484
1491 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1492 1486
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) 1487 if (want_position_change)
1504 { 1488 {
1505 int x, y; 1489 int x, y;
1506 1490
1507 if (ev.xconfigure.send_event) 1491 if (ev.xconfigure.send_event)
… …
1515 if (x != parent_x || y != parent_y) 1499 if (x != parent_x || y != parent_y)
1516 { 1500 {
1517 parent_x = x; 1501 parent_x = x;
1518 parent_y = y; 1502 parent_y = y;
1519 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1503 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1520 moved = true;
1521 } 1504 }
1522 } 1505 }
1523 1506
1524 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1507 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1525 { 1508 {
1526 seen_resize = 1; 1509 seen_resize = 1;
1527 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1510 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1528 } 1511 }
1529 else
1530 {
1531#ifdef HAVE_BG_PIXMAP
1532 if (moved)
1533 update_background ();
1534#endif
1535 }
1536 1512
1537 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1513 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 } 1514 }
1539 break; 1515 break;
1540 1516
… …
1549 case SelectionRequest: 1525 case SelectionRequest:
1550 selection_send (ev.xselectionrequest); 1526 selection_send (ev.xselectionrequest);
1551 break; 1527 break;
1552 1528
1553 case MapNotify: 1529 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; 1530 mapped = 1;
1566#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1567 text_blink_ev.start (); 1532 text_blink_ev.start ();
1568#endif 1533#endif
1569 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1618 case MotionNotify: 1583 case MotionNotify:
1619#ifdef POINTER_BLANK 1584#ifdef POINTER_BLANK
1620 if (hidden_pointer) 1585 if (hidden_pointer)
1621 pointer_unblank (); 1586 pointer_unblank ();
1622#endif 1587#endif
1588 if (!bypass_keystate
1623 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1589 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1624 || priv_modes & PrivMode_MouseAnyEvent) 1590 || priv_modes & PrivMode_MouseAnyEvent))
1625 mouse_report (ev.xbutton); 1591 mouse_report (ev.xbutton);
1626 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1627 break; 1593 break;
1628 1594
1629 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
… …
1641 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1642 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1643 &ev.xbutton.state); 1609 &ev.xbutton.state);
1644#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
1645 /* deal with a `jumpy' mouse */ 1611 /* deal with a `jumpy' mouse */
1646 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1612 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1613#endif
1647 { 1614 {
1648#endif
1649#if ISO_14755 1615#if ISO_14755
1650 // 5.4 1616 // 5.4
1651 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1617 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1652 { 1618 {
1653 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1619 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1702 * shouldn't be scrolling 1668 * shouldn't be scrolling
1703 */ 1669 */
1704 sel_scroll_ev.stop(); 1670 sel_scroll_ev.stop();
1705 } 1671 }
1706#endif 1672#endif
1707#ifdef MOUSE_THRESHOLD
1708 } 1673 }
1709#endif
1710 } 1674 }
1711 } 1675 }
1712 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1713 { 1677 {
1714 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1788#endif 1752#endif
1789#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1791 { 1755 {
1792 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1793 scr_recolour (); 1757 scr_recolor ();
1794 } 1758 }
1795#endif 1759#endif
1796#if ENABLE_FRILLS 1760#if ENABLE_FRILLS
1797 if (option (Opt_urgentOnBell)) 1761 if (option (Opt_urgentOnBell))
1798 set_urgency (0); 1762 set_urgency (0);
1763
1764 if (priv_modes & PrivMode_FocusEvent)
1765 tt_printf ("\x1b[I");
1799#endif 1766#endif
1800 1767
1801 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1768 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1802 } 1769 }
1803} 1770}
… …
1811 want_refresh = 1; 1778 want_refresh = 1;
1812 1779
1813#if ENABLE_FRILLS 1780#if ENABLE_FRILLS
1814 if (option (Opt_urgentOnBell)) 1781 if (option (Opt_urgentOnBell))
1815 set_urgency (0); 1782 set_urgency (0);
1783
1784 if (priv_modes & PrivMode_FocusEvent)
1785 tt_printf ("\x1b[O");
1816#endif 1786#endif
1817#if ENABLE_FRILLS || ISO_14755 1787#if ENABLE_FRILLS || ISO_14755
1818 if (iso14755buf) 1788 if (iso14755buf)
1819 { 1789 {
1820 iso14755buf = 0; 1790 iso14755buf = 0;
… …
1835#endif 1805#endif
1836#if OFF_FOCUS_FADING 1806#if OFF_FOCUS_FADING
1837 if (rs[Rs_fade]) 1807 if (rs[Rs_fade])
1838 { 1808 {
1839 pix_colors = pix_colors_unfocused; 1809 pix_colors = pix_colors_unfocused;
1840 scr_recolour (); 1810 scr_recolor ();
1841 } 1811 }
1842#endif 1812#endif
1843 1813
1844 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1814 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1845 } 1815 }
1846} 1816}
1847 1817
1848void ecb_cold 1818void ecb_cold
1849rxvt_term::update_fade_color (unsigned int idx) 1819rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1850{ 1820{
1851#if OFF_FOCUS_FADING 1821#if OFF_FOCUS_FADING
1852 if (rs[Rs_fade]) 1822 if (rs[Rs_fade])
1853 { 1823 {
1824 if (!first_time)
1825 pix_colors_focused [idx].free (this);
1826
1854 rgba c; 1827 rgba c;
1855 pix_colors [Color_fade].get (c); 1828 pix_colors [Color_fade].get (c);
1856 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1829 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1857 } 1830 }
1858#endif 1831#endif
1859} 1832}
1860 1833
1861#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1834#if ENABLE_PERL
1862void ecb_hot 1835void ecb_hot
1863rxvt_term::rootwin_cb (XEvent &ev) 1836rxvt_term::rootwin_cb (XEvent &ev)
1864{ 1837{
1865 make_current (); 1838 make_current ();
1866 1839
… …
1876 * use the property to determine the pixmap. We use it later on. 1849 * use the property to determine the pixmap. We use it later on.
1877 */ 1850 */
1878 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1851 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1879 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1852 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1880 { 1853 {
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)); 1854 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1889 } 1855 }
1890 1856
1891 break; 1857 break;
1892 } 1858 }
… …
1920 iso14755_54 (ev.x, ev.y); 1886 iso14755_54 (ev.x, ev.y);
1921 return; 1887 return;
1922 } 1888 }
1923#endif 1889#endif
1924 1890
1925 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1891 clickintime = ev.time - MEvent.time < multiClickTime;
1926 1892
1927 if (reportmode) 1893 if (reportmode)
1928 { 1894 {
1929 /* mouse report from vt window */ 1895 /* mouse report from vt window */
1930 /* save the xbutton state (for ButtonRelease) */ 1896 /* save the xbutton state (for ButtonRelease) */
… …
2180#ifdef MOUSE_REPORT_DOUBLECLICK 2146#ifdef MOUSE_REPORT_DOUBLECLICK
2181 /* only report the release of 'slow' single clicks */ 2147 /* only report the release of 'slow' single clicks */
2182 if (MEvent.button != AnyButton 2148 if (MEvent.button != AnyButton
2183 && (ev.button != MEvent.button 2149 && (ev.button != MEvent.button
2184 || (ev.time - MEvent.time 2150 || (ev.time - MEvent.time
2185 > MULTICLICK_TIME / 2))) 2151 > multiClickTime / 2)))
2186 { 2152 {
2187 MEvent.clicks = 0; 2153 MEvent.clicks = 0;
2188 MEvent.button = AnyButton; 2154 MEvent.button = AnyButton;
2189 mouse_report (ev); 2155 mouse_report (ev);
2190 } 2156 }
… …
2388wchar_t ecb_hot 2354wchar_t ecb_hot
2389rxvt_term::next_char () NOTHROW 2355rxvt_term::next_char () NOTHROW
2390{ 2356{
2391 while (cmdbuf_ptr < cmdbuf_endp) 2357 while (cmdbuf_ptr < cmdbuf_endp)
2392 { 2358 {
2393 // assume 7-bit to be ascii ALWAYS 2359 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2394 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2360 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2395 return *cmdbuf_ptr++; 2361 return *cmdbuf_ptr++;
2396 2362
2397 wchar_t wc; 2363 wchar_t wc;
2398 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2364 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2399 2365
… …
2580 scr_charset_choose (0); 2546 scr_charset_choose (0);
2581 break; 2547 break;
2582 2548
2583#ifdef EIGHT_BIT_CONTROLS 2549#ifdef EIGHT_BIT_CONTROLS
2584 // 8-bit controls 2550 // 8-bit controls
2585 case 0x90: /* DCS */ 2551 case 0x90: /* DCS */
2586 process_dcs_seq (); 2552 process_dcs_seq ();
2587 break; 2553 break;
2588 case 0x9b: /* CSI */ 2554 case 0x9b: /* CSI */
2589 process_csi_seq (); 2555 process_csi_seq ();
2590 break; 2556 break;
2591 case 0x9d: /* OSC */ 2557 case 0x9d: /* OSC */
2592 process_osc_seq (); 2558 process_osc_seq ();
2593 break; 2559 break;
2594#endif 2560#endif
2595 } 2561 }
2596} 2562}
… …
2727 break; 2693 break;
2728 2694
2729 /* kidnapped escape sequence: Should be 8.3.48 */ 2695 /* kidnapped escape sequence: Should be 8.3.48 */
2730 case C1_ESA: /* ESC G */ 2696 case C1_ESA: /* ESC G */
2731 // used by original rxvt for rob nations own graphics mode 2697 // used by original rxvt for rob nations own graphics mode
2732 if (cmd_getc () == 'Q') 2698 if (cmd_getc () == 'Q' && option (Opt_insecure))
2733 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2699 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2734 break; 2700 break;
2735 2701
2736 /* 8.3.63: CHARACTER TABULATION SET */ 2702 /* 8.3.63: CHARACTER TABULATION SET */
2737 case C1_HTS: /* ESC H */ 2703 case C1_HTS: /* ESC H */
… …
2946 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2912 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2947 scr_gotorc (arg[0], 0, RELATIVE); 2913 scr_gotorc (arg[0], 0, RELATIVE);
2948 break; 2914 break;
2949 2915
2950 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2916 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2951 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2917 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2952#ifdef ISO6429 2918#ifdef ISO6429
2953 arg[0] = -arg[0]; 2919 arg[0] = -arg[0];
2954#else /* emulate common DEC VTs */ 2920#else /* emulate common DEC VTs */
2955 arg[0] = arg[0] ? -arg[0] : -1; 2921 arg[0] = arg[0] ? -arg[0] : -1;
2956#endif 2922#endif
… …
3101 scr_insert_mode (1); 3067 scr_insert_mode (1);
3102 else if (arg[0] == 20) 3068 else if (arg[0] == 20)
3103 priv_modes |= PrivMode_LFNL; 3069 priv_modes |= PrivMode_LFNL;
3104 break; 3070 break;
3105 3071
3106 case CSI_71: // DESCUSR: set cursor style 3072 case CSI_71: // DECSCUSR: set cursor style
3107 if (prev_ch == ' ') 3073 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]); 3074 set_cursor_style (arg[0]);
3109 break; 3075 break;
3110 3076
3111 /* 3077 /*
… …
3332 free (s); 3298 free (s);
3333 } 3299 }
3334 } 3300 }
3335} 3301}
3336 3302
3303static unsigned int
3304colorcube_index (unsigned int idx_r,
3305 unsigned int idx_g,
3306 unsigned int idx_b)
3307{
3308 assert (idx_r < Red_levels);
3309 assert (idx_g < Green_levels);
3310 assert (idx_b < Blue_levels);
3311
3312 return idx_r * Blue_levels * Green_levels +
3313 idx_g * Blue_levels +
3314 idx_b;
3315}
3316
3317/*
3318 * Find the nearest color slot in the hidden color cube,
3319 * adapt its value to the 32bit RGBA color.
3320 */
3321unsigned int
3322rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3323{
3324 r &= 0xff;
3325 g &= 0xff;
3326 b &= 0xff;
3327 a &= 0xff;
3328
3329 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3330
3331 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3332 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3333 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3334 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3335
3336 /* we allow one of the 6 directly neighbouring colours */
3337 /* to replace the current color, if they not used recently */
3338 static const signed char dxyz[][3] = {
3339 0, 0, 0,
3340 0, 0, +1,
3341 0, 0, -1,
3342 0, +1, 0,
3343 0, -1, 0,
3344 +1, 0, 0,
3345 -1, 0, 0,
3346 };
3347
3348 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3349 {
3350 int r = idx_r + dxyz[n][0];
3351 int g = idx_g + dxyz[n][1];
3352 int b = idx_b + dxyz[n][2];
3353
3354 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3355 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3356 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3357
3358 unsigned int index = colorcube_index (r, g, b);
3359
3360 if (rgb24_color[index] == color)
3361 {
3362 rgb24_seqno[index] = ++rgb24_sequence;
3363 return index + minTermCOLOR24;
3364 }
3365
3366 // minor issue: could update index 0 few more times
3367 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3368 {
3369 idx = index;
3370 goto update;
3371 }
3372
3373 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3374 // but also handles wrap around values good enough
3375 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3376 idx = index;
3377 }
3378
3379update:
3380 rgb24_color[idx] = color;
3381 rgb24_seqno[idx] = ++rgb24_sequence;
3382
3383 idx += minTermCOLOR24;
3384 pix_colors_focused [idx].free (this);
3385 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3386 update_fade_color (idx, false);
3387
3388 return idx;
3389}
3390
3337void 3391void
3338rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3392rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3339{ 3393{
3340 if (str[0] == '?' && !str[1]) 3394 if (str[0] == '?' && !str[1])
3341 { 3395 {
3342 rgba c; 3396 rgba c;
3343 pix_colors_focused[color].get (c); 3397 pix_colors_focused[color].get (c);
3344 3398
3345#if XFT 3399#if XFT
3346 if (c.a != rgba::MAX_CC) 3400 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); 3401 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3348 else 3402 else
3349#endif 3403#endif
3350 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3404 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3351 } 3405 }
3352 else 3406 else
… …
3478 break; 3532 break;
3479#endif 3533#endif
3480 case URxvt_Color_border: 3534 case URxvt_Color_border:
3481 process_color_seq (op, Color_border, str, resp); 3535 process_color_seq (op, Color_border, str, resp);
3482 break; 3536 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 3537
3552 case XTerm_logfile: 3538 case XTerm_logfile:
3553 // TODO, when secure mode? 3539 // TODO, when secure mode?
3554 break; 3540 break;
3555 3541
… …
3689 { 5, PrivMode_rVideo }, // DECSCNM 3675 { 5, PrivMode_rVideo }, // DECSCNM
3690 { 6, PrivMode_relOrigin }, // DECOM 3676 { 6, PrivMode_relOrigin }, // DECOM
3691 { 7, PrivMode_Autowrap }, // DECAWM 3677 { 7, PrivMode_Autowrap }, // DECAWM
3692 // 8, auto-repeat keys // DECARM 3678 // 8, auto-repeat keys // DECARM
3693 { 9, PrivMode_MouseX10 }, 3679 { 9, PrivMode_MouseX10 },
3680 { 12, PrivMode_BlinkingCursor },
3694 // 18 end FF to printer after print screen 3681 // 18 end FF to printer after print screen
3695 // 19 Print screen prints full screen/scroll region 3682 // 19 Print screen prints full screen/scroll region
3696 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3683 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3697#ifdef scrollBar_esc 3684#ifdef scrollBar_esc
3698 { scrollBar_esc, PrivMode_scrollBar }, 3685 { scrollBar_esc, PrivMode_scrollBar },
… …
3710#endif 3697#endif
3711 { 1000, PrivMode_MouseX11 }, 3698 { 1000, PrivMode_MouseX11 },
3712 { 1002, PrivMode_MouseBtnEvent }, 3699 { 1002, PrivMode_MouseBtnEvent },
3713 { 1003, PrivMode_MouseAnyEvent }, 3700 { 1003, PrivMode_MouseAnyEvent },
3714#if ENABLE_FRILLS 3701#if ENABLE_FRILLS
3702 { 1004, PrivMode_FocusEvent },
3715 { 1005, PrivMode_ExtModeMouse }, 3703 { 1005, PrivMode_ExtModeMouse },
3716#endif 3704#endif
3717 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3705 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3718 { 1011, PrivMode_Keypress }, // rxvt extension 3706 { 1011, PrivMode_Keypress }, // rxvt extension
3719#if ENABLE_FRILLS 3707#if ENABLE_FRILLS
… …
3807 scrollBar.map (state); 3795 scrollBar.map (state);
3808 resize_all_windows (0, 0, 0); 3796 resize_all_windows (0, 0, 0);
3809 scr_touch (true); 3797 scr_touch (true);
3810 break; 3798 break;
3811#endif 3799#endif
3800#ifdef CURSOR_BLINK
3801 case 12:
3802 cursor_blink_reset ();
3803 break;
3804#endif
3812 case 25: /* visible/invisible cursor */ 3805 case 25: /* visible/invisible cursor */
3813 scr_cursor_visible (state); 3806 scr_cursor_visible (state);
3814 break; 3807 break;
3815 /* case 35: - shift keys */ 3808 /* case 35: - shift keys */
3816 /* case 40: - 80 <--> 132 mode */ 3809 /* case 40: - 80 <--> 132 mode */
… …
3921 //case 19: // ninth alt font 3914 //case 19: // ninth alt font
3922 //case 20: // gothic 3915 //case 20: // gothic
3923 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3916 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3924 rendset = 0, rendstyle = RS_Bold; 3917 rendset = 0, rendstyle = RS_Bold;
3925 break; 3918 break;
3926 case 22: // normal intensity 3919 case 22: // bold off (vt220)
3927 rendset = 0, rendstyle = RS_Bold; 3920 rendset = 0, rendstyle = RS_Bold;
3928 break; 3921 break;
3929 case 23: // disable italic 3922 case 23: // disable italic
3930 rendset = 0, rendstyle = RS_Italic; 3923 rendset = 0, rendstyle = RS_Italic;
3931 break; 3924 break;
3932 case 24: 3925 case 24: // underline off (vt220)
3933 rendset = 0, rendstyle = RS_Uline; 3926 rendset = 0, rendstyle = RS_Uline;
3934 break; 3927 break;
3935 case 25: 3928 case 25: // blink off (vt220)
3936 rendset = 0, rendstyle = RS_Blink; 3929 rendset = 0, rendstyle = RS_Blink;
3937 break; 3930 break;
3938 case 26: // variable spacing (iso 8613) 3931 case 26: // variable spacing (iso 8613)
3939 rendset = 0, rendstyle = RS_Blink; 3932 rendset = 0, rendstyle = RS_Blink;
3940 break; 3933 break;
3941 case 27: 3934 case 27: // reverse off (vt220)
3942 rendset = 0, rendstyle = RS_RVid; 3935 rendset = 0, rendstyle = RS_RVid;
3943 break; 3936 break;
3944 //case 28: // visible. NYI 3937 //case 28: // visible. NYI
3945 //case 29: // not crossed-out 3938 //case 29: // not crossed-out
3946 } 3939 }
… …
3961 case 35: 3954 case 35:
3962 case 36: 3955 case 36:
3963 case 37: 3956 case 37:
3964 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3957 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3965 break; 3958 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 */ 3959 case 39: /* default fg */
3974 scr_color (Color_fg, Color_fg); 3960 scr_color (Color_fg, Color_fg);
3975 break; 3961 break;
3976 3962
3977 case 40: 3963 case 40:
… …
3982 case 45: 3968 case 45:
3983 case 46: 3969 case 46:
3984 case 47: 3970 case 47:
3985 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3971 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3986 break; 3972 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 */ 3973 case 49: /* default bg */
3995 scr_color (Color_bg, Color_bg); 3974 scr_color (Color_bg, Color_bg);
3975 break;
3976
3977 case 38: // set fg color, ISO 8613-6
3978 case 48: // set bg color, ISO 8613-6
3979 {
3980 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
3981 unsigned int idx;
3982
3983 if (nargs > i + 2 && arg[i + 1] == 5)
3984 {
3985 idx = minCOLOR + arg[i + 2];
3986 i += 2;
3987
3988 scr_color (idx, fgbg);
3989 }
3990 else if (nargs > i + 4 && arg[i + 1] == 2)
3991 {
3992 unsigned int r = arg[i + 2];
3993 unsigned int g = arg[i + 3];
3994 unsigned int b = arg[i + 4];
3995 unsigned int a = 0xff;
3996
3997 idx = map_rgb24_color (r, g, b, a);
3998
3999 i += 4;
4000
4001 scr_color (idx, fgbg);
4002 }
4003 }
3996 break; 4004 break;
3997 4005
3998 //case 50: // not variable spacing 4006 //case 50: // not variable spacing
3999 4007
4000#if !ENABLE_MINIMAL 4008#if !ENABLE_MINIMAL
… …
4024} 4032}
4025 4033
4026void 4034void
4027rxvt_term::set_cursor_style (int style) 4035rxvt_term::set_cursor_style (int style)
4028{ 4036{
4029 if (!IN_RANGE_INC (style, 0, 4)) 4037 if (!IN_RANGE_INC (style, 0, 6))
4030 return; 4038 return;
4031 4039
4040 if (style == 0)
4041 style = 1;
4042
4043 cursor_type = (style - 1) / 2;
4032 set_option (Opt_cursorUnderline, style >= 3); 4044 set_option (Opt_cursorUnderline, cursor_type == 1);
4033 4045
4034#ifdef CURSOR_BLINK 4046#ifdef CURSOR_BLINK
4035 set_option (Opt_cursorBlink, !style || (style & 1)); 4047 set_option (Opt_cursorBlink, style & 1);
4036 cursor_blink_reset (); 4048 cursor_blink_reset ();
4037#endif 4049#endif
4038 4050
4039 want_refresh = 1; 4051 want_refresh = 1;
4040} 4052}

Diff Legend

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