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.566 by sf-exg, Sat Sep 12 14:03:35 2015 UTC vs.
Revision 1.585 by root, Sun Jul 7 08:06:44 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.
… …
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 1483 ;
1484 1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486 1486
1487 bool moved = false;
1488#ifdef HAVE_BG_PIXMAP
1489 if (bg_window_position_sensitive ())
1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change) 1487 if (want_position_change)
1498 { 1488 {
1499 int x, y; 1489 int x, y;
1500 1490
1501 if (ev.xconfigure.send_event) 1491 if (ev.xconfigure.send_event)
… …
1509 if (x != parent_x || y != parent_y) 1499 if (x != parent_x || y != parent_y)
1510 { 1500 {
1511 parent_x = x; 1501 parent_x = x;
1512 parent_y = y; 1502 parent_y = y;
1513 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));
1514 moved = true;
1515 } 1504 }
1516 } 1505 }
1517 1506
1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1507 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1519 { 1508 {
1520 seen_resize = 1; 1509 seen_resize = 1;
1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1510 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1522 } 1511 }
1523 else
1524 {
1525#ifdef HAVE_BG_PIXMAP
1526 if (moved)
1527 update_background ();
1528#endif
1529 }
1530 1512
1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1513 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 } 1514 }
1533 break; 1515 break;
1534 1516
… …
1543 case SelectionRequest: 1525 case SelectionRequest:
1544 selection_send (ev.xselectionrequest); 1526 selection_send (ev.xselectionrequest);
1545 break; 1527 break;
1546 1528
1547 case MapNotify: 1529 case MapNotify:
1548#ifdef HAVE_BG_PIXMAP
1549 // This is needed at startup for the case of no window manager
1550 // or a non-reparenting window manager and also because we
1551 // defer bg image updates if the window is not mapped. The
1552 // short delay is to optimize for multiple ConfigureNotify
1553 // events at startup when the window manager reparents the
1554 // window, so as to perform the computation after we have
1555 // received all of them.
1556 if (bg_img == 0)
1557 update_background_ev.start (0.025);
1558#endif
1559 mapped = 1; 1530 mapped = 1;
1560#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1561 text_blink_ev.start (); 1532 text_blink_ev.start ();
1562#endif 1533#endif
1563 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1787 } 1758 }
1788#endif 1759#endif
1789#if ENABLE_FRILLS 1760#if ENABLE_FRILLS
1790 if (option (Opt_urgentOnBell)) 1761 if (option (Opt_urgentOnBell))
1791 set_urgency (0); 1762 set_urgency (0);
1763
1764 if (priv_modes & PrivMode_FocusEvent)
1765 tt_printf ("\x1b[I");
1792#endif 1766#endif
1793 1767
1794 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1768 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1795 } 1769 }
1796} 1770}
… …
1804 want_refresh = 1; 1778 want_refresh = 1;
1805 1779
1806#if ENABLE_FRILLS 1780#if ENABLE_FRILLS
1807 if (option (Opt_urgentOnBell)) 1781 if (option (Opt_urgentOnBell))
1808 set_urgency (0); 1782 set_urgency (0);
1783
1784 if (priv_modes & PrivMode_FocusEvent)
1785 tt_printf ("\x1b[O");
1809#endif 1786#endif
1810#if ENABLE_FRILLS || ISO_14755 1787#if ENABLE_FRILLS || ISO_14755
1811 if (iso14755buf) 1788 if (iso14755buf)
1812 { 1789 {
1813 iso14755buf = 0; 1790 iso14755buf = 0;
… …
1852 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);
1853 } 1830 }
1854#endif 1831#endif
1855} 1832}
1856 1833
1857#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1834#if ENABLE_PERL
1858void ecb_hot 1835void ecb_hot
1859rxvt_term::rootwin_cb (XEvent &ev) 1836rxvt_term::rootwin_cb (XEvent &ev)
1860{ 1837{
1861 make_current (); 1838 make_current ();
1862 1839
… …
1872 * 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.
1873 */ 1850 */
1874 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1851 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1875 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1852 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1876 { 1853 {
1877#if BG_IMAGE_FROM_ROOT
1878 if (option (Opt_transparent))
1879 {
1880 rxvt_img::new_from_root (this)->replace (root_img);
1881 update_background ();
1882 }
1883#endif
1884 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1854 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1885 } 1855 }
1886 1856
1887 break; 1857 break;
1888 } 1858 }
… …
2384wchar_t ecb_hot 2354wchar_t ecb_hot
2385rxvt_term::next_char () NOTHROW 2355rxvt_term::next_char () NOTHROW
2386{ 2356{
2387 while (cmdbuf_ptr < cmdbuf_endp) 2357 while (cmdbuf_ptr < cmdbuf_endp)
2388 { 2358 {
2389 // assume 7-bit to be ascii ALWAYS 2359 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2390 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2360 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2391 return *cmdbuf_ptr++; 2361 return *cmdbuf_ptr++;
2392 2362
2393 wchar_t wc; 2363 wchar_t wc;
2394 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);
2395 2365
… …
2720 wchar_t nlcr[] = { C0_LF, C0_CR }; 2690 wchar_t nlcr[] = { C0_LF, C0_CR };
2721 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2691 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2722 } 2692 }
2723 break; 2693 break;
2724 2694
2695#if 0 // disabled because embedded newlines can make exploits easier
2725 /* kidnapped escape sequence: Should be 8.3.48 */ 2696 /* kidnapped escape sequence: Should be 8.3.48 */
2726 case C1_ESA: /* ESC G */ 2697 case C1_ESA: /* ESC G */
2727 // used by original rxvt for rob nations own graphics mode 2698 // used by original rxvt for rob nations own graphics mode
2728 if (cmd_getc () == 'Q') 2699 if (cmd_getc () == 'Q' && option (Opt_insecure))
2729 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2700 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2730 break; 2701 break;
2702#endif
2731 2703
2732 /* 8.3.63: CHARACTER TABULATION SET */ 2704 /* 8.3.63: CHARACTER TABULATION SET */
2733 case C1_HTS: /* ESC H */ 2705 case C1_HTS: /* ESC H */
2734 scr_set_tab (1); 2706 scr_set_tab (1);
2735 break; 2707 break;
… …
2942 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2914 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2943 scr_gotorc (arg[0], 0, RELATIVE); 2915 scr_gotorc (arg[0], 0, RELATIVE);
2944 break; 2916 break;
2945 2917
2946 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2918 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2947 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2919 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2948#ifdef ISO6429 2920#ifdef ISO6429
2949 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
2950#else /* emulate common DEC VTs */ 2922#else /* emulate common DEC VTs */
2951 arg[0] = arg[0] ? -arg[0] : -1; 2923 arg[0] = arg[0] ? -arg[0] : -1;
2952#endif 2924#endif
… …
3328 free (s); 3300 free (s);
3329 } 3301 }
3330 } 3302 }
3331} 3303}
3332 3304
3305static unsigned int
3306colorcube_index (unsigned int idx_r,
3307 unsigned int idx_g,
3308 unsigned int idx_b)
3309{
3310 assert (idx_r < Red_levels);
3311 assert (idx_g < Green_levels);
3312 assert (idx_b < Blue_levels);
3313
3314 return idx_r * Blue_levels * Green_levels +
3315 idx_g * Blue_levels +
3316 idx_b;
3317}
3318
3319/*
3320 * Find the nearest color slot in the hidden color cube,
3321 * adapt its value to the 32bit RGBA color.
3322 */
3323unsigned int
3324rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3325{
3326 r &= 0xff;
3327 g &= 0xff;
3328 b &= 0xff;
3329 a &= 0xff;
3330
3331 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3332
3333 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3334 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3335 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3336 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3337
3338 /* we allow one of the 6 directly neighbouring colours */
3339 /* to replace the current color, if they not used recently */
3340 static const signed char dxyz[][3] = {
3341 0, 0, 0,
3342 0, 0, +1,
3343 0, 0, -1,
3344 0, +1, 0,
3345 0, -1, 0,
3346 +1, 0, 0,
3347 -1, 0, 0,
3348 };
3349
3350 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3351 {
3352 int r = idx_r + dxyz[n][0];
3353 int g = idx_g + dxyz[n][1];
3354 int b = idx_b + dxyz[n][2];
3355
3356 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3357 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3358 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3359
3360 unsigned int index = colorcube_index (r, g, b);
3361
3362 if (rgb24_color[index] == color)
3363 {
3364 rgb24_seqno[index] = ++rgb24_sequence;
3365 return index + minTermCOLOR24;
3366 }
3367
3368 // minor issue: could update index 0 few more times
3369 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3370 {
3371 idx = index;
3372 goto update;
3373 }
3374
3375 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3376 // but also handles wrap around values good enough
3377 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3378 idx = index;
3379 }
3380
3381update:
3382 rgb24_color[idx] = color;
3383 rgb24_seqno[idx] = ++rgb24_sequence;
3384
3385 idx += minTermCOLOR24;
3386 pix_colors_focused [idx].free (this);
3387 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3388 update_fade_color (idx, false);
3389
3390 return idx;
3391}
3392
3333void 3393void
3334rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3394rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3335{ 3395{
3336 if (str[0] == '?' && !str[1]) 3396 if (str[0] == '?' && !str[1])
3337 { 3397 {
3338 rgba c; 3398 rgba c;
3339 pix_colors_focused[color].get (c); 3399 pix_colors_focused[color].get (c);
3340 3400
3341#if XFT 3401#if XFT
3342 if (c.a != rgba::MAX_CC) 3402 if (c.a != rgba::MAX_CC)
3343 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3403 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3344 else 3404 else
3345#endif 3405#endif
3346 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3406 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3347 } 3407 }
3348 else 3408 else
… …
3474 break; 3534 break;
3475#endif 3535#endif
3476 case URxvt_Color_border: 3536 case URxvt_Color_border:
3477 process_color_seq (op, Color_border, str, resp); 3537 process_color_seq (op, Color_border, str, resp);
3478 break; 3538 break;
3479
3480#if BG_IMAGE_FROM_ROOT
3481 case URxvt_Color_tint:
3482 process_color_seq (op, Color_tint, str, resp);
3483 {
3484 bool changed = false;
3485
3486 if (ISSET_PIXCOLOR (Color_tint))
3487 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3488
3489 if (changed)
3490 update_background ();
3491 }
3492
3493 break;
3494#endif
3495
3496#if BG_IMAGE_FROM_FILE
3497 case Rxvt_Pixmap:
3498 if (!strcmp (str, "?"))
3499 {
3500 char str[256];
3501 int h_scale = fimage.h_scale;
3502 int v_scale = fimage.v_scale;
3503 int h_align = fimage.h_align;
3504 int v_align = fimage.v_align;
3505
3506 sprintf (str, "[%dx%d+%d+%d]",
3507 h_scale, v_scale,
3508 h_align, v_align);
3509 process_xterm_seq (XTerm_title, str, CHAR_ST);
3510 }
3511 else
3512 {
3513 bool changed = false;
3514
3515 if (*str != ';')
3516 {
3517 try
3518 {
3519 fimage.set_file_geometry (this, str);
3520 changed = true;
3521 }
3522 catch (const class rxvt_failure_exception &e)
3523 {
3524 }
3525 }
3526 else
3527 {
3528 str++;
3529 if (fimage.set_geometry (str, true))
3530 changed = true;
3531 }
3532
3533 if (changed)
3534 {
3535 if (bg_window_position_sensitive ())
3536 {
3537 int x, y;
3538 get_window_origin (x, y);
3539 parent_x = x;
3540 parent_y = y;
3541 }
3542 update_background ();
3543 }
3544 }
3545 break;
3546#endif
3547 3539
3548 case XTerm_logfile: 3540 case XTerm_logfile:
3549 // TODO, when secure mode? 3541 // TODO, when secure mode?
3550 break; 3542 break;
3551 3543
… …
3707#endif 3699#endif
3708 { 1000, PrivMode_MouseX11 }, 3700 { 1000, PrivMode_MouseX11 },
3709 { 1002, PrivMode_MouseBtnEvent }, 3701 { 1002, PrivMode_MouseBtnEvent },
3710 { 1003, PrivMode_MouseAnyEvent }, 3702 { 1003, PrivMode_MouseAnyEvent },
3711#if ENABLE_FRILLS 3703#if ENABLE_FRILLS
3704 { 1004, PrivMode_FocusEvent },
3712 { 1005, PrivMode_ExtModeMouse }, 3705 { 1005, PrivMode_ExtModeMouse },
3713#endif 3706#endif
3714 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3707 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3715 { 1011, PrivMode_Keypress }, // rxvt extension 3708 { 1011, PrivMode_Keypress }, // rxvt extension
3716#if ENABLE_FRILLS 3709#if ENABLE_FRILLS
… …
3963 case 35: 3956 case 35:
3964 case 36: 3957 case 36:
3965 case 37: 3958 case 37:
3966 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3959 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3967 break; 3960 break;
3968 case 38: // set fg color, ISO 8613-6
3969 if (nargs > i + 2 && arg[i + 1] == 5)
3970 {
3971 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3972 i += 2;
3973 }
3974 break;
3975 case 39: /* default fg */ 3961 case 39: /* default fg */
3976 scr_color (Color_fg, Color_fg); 3962 scr_color (Color_fg, Color_fg);
3977 break; 3963 break;
3978 3964
3979 case 40: 3965 case 40:
… …
3984 case 45: 3970 case 45:
3985 case 46: 3971 case 46:
3986 case 47: 3972 case 47:
3987 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3973 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3988 break; 3974 break;
3989 case 48: // set bg color, ISO 8613-6
3990 if (nargs > i + 2 && arg[i + 1] == 5)
3991 {
3992 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3993 i += 2;
3994 }
3995 break;
3996 case 49: /* default bg */ 3975 case 49: /* default bg */
3997 scr_color (Color_bg, Color_bg); 3976 scr_color (Color_bg, Color_bg);
3977 break;
3978
3979 case 38: // set fg color, ISO 8613-6
3980 case 48: // set bg color, ISO 8613-6
3981 {
3982 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
3983 unsigned int idx;
3984
3985 if (nargs > i + 2 && arg[i + 1] == 5)
3986 {
3987 idx = minCOLOR + arg[i + 2];
3988 i += 2;
3989
3990 scr_color (idx, fgbg);
3991 }
3992 else if (nargs > i + 4 && arg[i + 1] == 2)
3993 {
3994 unsigned int r = arg[i + 2];
3995 unsigned int g = arg[i + 3];
3996 unsigned int b = arg[i + 4];
3997 unsigned int a = 0xff;
3998
3999 idx = map_rgb24_color (r, g, b, a);
4000
4001 i += 4;
4002
4003 scr_color (idx, fgbg);
4004 }
4005 }
3998 break; 4006 break;
3999 4007
4000 //case 50: // not variable spacing 4008 //case 50: // not variable spacing
4001 4009
4002#if !ENABLE_MINIMAL 4010#if !ENABLE_MINIMAL

Diff Legend

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