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.569 by sf-exg, Sat May 14 08:31:26 2016 UTC vs.
Revision 1.585 by root, Sun Jul 7 08:06:44 2019 UTC

… …
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));
… …
1858 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);
1859 } 1830 }
1860#endif 1831#endif
1861} 1832}
1862 1833
1863#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1834#if ENABLE_PERL
1864void ecb_hot 1835void ecb_hot
1865rxvt_term::rootwin_cb (XEvent &ev) 1836rxvt_term::rootwin_cb (XEvent &ev)
1866{ 1837{
1867 make_current (); 1838 make_current ();
1868 1839
… …
1878 * 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.
1879 */ 1850 */
1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1851 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1852 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1882 { 1853 {
1883#if BG_IMAGE_FROM_ROOT
1884 if (option (Opt_transparent))
1885 {
1886 rxvt_img::new_from_root (this)->replace (root_img);
1887 update_background ();
1888 }
1889#endif
1890 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1854 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1891 } 1855 }
1892 1856
1893 break; 1857 break;
1894 } 1858 }
… …
2390wchar_t ecb_hot 2354wchar_t ecb_hot
2391rxvt_term::next_char () NOTHROW 2355rxvt_term::next_char () NOTHROW
2392{ 2356{
2393 while (cmdbuf_ptr < cmdbuf_endp) 2357 while (cmdbuf_ptr < cmdbuf_endp)
2394 { 2358 {
2395 // assume 7-bit to be ascii ALWAYS 2359 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2396 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2360 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2397 return *cmdbuf_ptr++; 2361 return *cmdbuf_ptr++;
2398 2362
2399 wchar_t wc; 2363 wchar_t wc;
2400 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);
2401 2365
… …
2726 wchar_t nlcr[] = { C0_LF, C0_CR }; 2690 wchar_t nlcr[] = { C0_LF, C0_CR };
2727 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2691 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2728 } 2692 }
2729 break; 2693 break;
2730 2694
2695#if 0 // disabled because embedded newlines can make exploits easier
2731 /* kidnapped escape sequence: Should be 8.3.48 */ 2696 /* kidnapped escape sequence: Should be 8.3.48 */
2732 case C1_ESA: /* ESC G */ 2697 case C1_ESA: /* ESC G */
2733 // used by original rxvt for rob nations own graphics mode 2698 // used by original rxvt for rob nations own graphics mode
2734 if (cmd_getc () == 'Q') 2699 if (cmd_getc () == 'Q' && option (Opt_insecure))
2735 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2700 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2736 break; 2701 break;
2702#endif
2737 2703
2738 /* 8.3.63: CHARACTER TABULATION SET */ 2704 /* 8.3.63: CHARACTER TABULATION SET */
2739 case C1_HTS: /* ESC H */ 2705 case C1_HTS: /* ESC H */
2740 scr_set_tab (1); 2706 scr_set_tab (1);
2741 break; 2707 break;
… …
2948 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2914 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2949 scr_gotorc (arg[0], 0, RELATIVE); 2915 scr_gotorc (arg[0], 0, RELATIVE);
2950 break; 2916 break;
2951 2917
2952 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2918 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2953 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2919 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2954#ifdef ISO6429 2920#ifdef ISO6429
2955 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
2956#else /* emulate common DEC VTs */ 2922#else /* emulate common DEC VTs */
2957 arg[0] = arg[0] ? -arg[0] : -1; 2923 arg[0] = arg[0] ? -arg[0] : -1;
2958#endif 2924#endif
… …
3334 free (s); 3300 free (s);
3335 } 3301 }
3336 } 3302 }
3337} 3303}
3338 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
3339void 3393void
3340rxvt_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)
3341{ 3395{
3342 if (str[0] == '?' && !str[1]) 3396 if (str[0] == '?' && !str[1])
3343 { 3397 {
… …
3480 break; 3534 break;
3481#endif 3535#endif
3482 case URxvt_Color_border: 3536 case URxvt_Color_border:
3483 process_color_seq (op, Color_border, str, resp); 3537 process_color_seq (op, Color_border, str, resp);
3484 break; 3538 break;
3485
3486#if BG_IMAGE_FROM_ROOT
3487 case URxvt_Color_tint:
3488 process_color_seq (op, Color_tint, str, resp);
3489 {
3490 bool changed = false;
3491
3492 if (ISSET_PIXCOLOR (Color_tint))
3493 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3494
3495 if (changed)
3496 update_background ();
3497 }
3498
3499 break;
3500#endif
3501
3502#if BG_IMAGE_FROM_FILE
3503 case Rxvt_Pixmap:
3504 if (!strcmp (str, "?"))
3505 {
3506 char str[256];
3507 int h_scale = fimage.h_scale;
3508 int v_scale = fimage.v_scale;
3509 int h_align = fimage.h_align;
3510 int v_align = fimage.v_align;
3511
3512 sprintf (str, "[%dx%d+%d+%d]",
3513 h_scale, v_scale,
3514 h_align, v_align);
3515 process_xterm_seq (XTerm_title, str, CHAR_ST);
3516 }
3517 else
3518 {
3519 bool changed = false;
3520
3521 if (*str != ';')
3522 {
3523 try
3524 {
3525 fimage.set_file_geometry (this, str);
3526 changed = true;
3527 }
3528 catch (const class rxvt_failure_exception &e)
3529 {
3530 }
3531 }
3532 else
3533 {
3534 str++;
3535 if (fimage.set_geometry (str, true))
3536 changed = true;
3537 }
3538
3539 if (changed)
3540 {
3541 if (bg_window_position_sensitive ())
3542 {
3543 int x, y;
3544 get_window_origin (x, y);
3545 parent_x = x;
3546 parent_y = y;
3547 }
3548 update_background ();
3549 }
3550 }
3551 break;
3552#endif
3553 3539
3554 case XTerm_logfile: 3540 case XTerm_logfile:
3555 // TODO, when secure mode? 3541 // TODO, when secure mode?
3556 break; 3542 break;
3557 3543
… …
3970 case 35: 3956 case 35:
3971 case 36: 3957 case 36:
3972 case 37: 3958 case 37:
3973 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3959 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3974 break; 3960 break;
3975 case 38: // set fg color, ISO 8613-6
3976 if (nargs > i + 2 && arg[i + 1] == 5)
3977 {
3978 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3979 i += 2;
3980 }
3981 break;
3982 case 39: /* default fg */ 3961 case 39: /* default fg */
3983 scr_color (Color_fg, Color_fg); 3962 scr_color (Color_fg, Color_fg);
3984 break; 3963 break;
3985 3964
3986 case 40: 3965 case 40:
… …
3991 case 45: 3970 case 45:
3992 case 46: 3971 case 46:
3993 case 47: 3972 case 47:
3994 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3973 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3995 break; 3974 break;
3996 case 48: // set bg color, ISO 8613-6
3997 if (nargs > i + 2 && arg[i + 1] == 5)
3998 {
3999 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4000 i += 2;
4001 }
4002 break;
4003 case 49: /* default bg */ 3975 case 49: /* default bg */
4004 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 }
4005 break; 4006 break;
4006 4007
4007 //case 50: // not variable spacing 4008 //case 50: // not variable spacing
4008 4009
4009#if !ENABLE_MINIMAL 4010#if !ENABLE_MINIMAL

Diff Legend

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