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.573 by root, Thu Jun 30 14:01:11 2016 UTC vs.
Revision 1.584 by root, Sun Jul 7 08:02:15 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
… …
2729 break; 2693 break;
2730 2694
2731 /* kidnapped escape sequence: Should be 8.3.48 */ 2695 /* kidnapped escape sequence: Should be 8.3.48 */
2732 case C1_ESA: /* ESC G */ 2696 case C1_ESA: /* ESC G */
2733 // used by original rxvt for rob nations own graphics mode 2697 // used by original rxvt for rob nations own graphics mode
2734 if (cmd_getc () == 'Q') 2698 if (cmd_getc () == 'Q' && option (Opt_insecure))
2735 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2699 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2736 break; 2700 break;
2737 2701
2738 /* 8.3.63: CHARACTER TABULATION SET */ 2702 /* 8.3.63: CHARACTER TABULATION SET */
2739 case C1_HTS: /* ESC H */ 2703 case C1_HTS: /* ESC H */
… …
2948 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2912 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2949 scr_gotorc (arg[0], 0, RELATIVE); 2913 scr_gotorc (arg[0], 0, RELATIVE);
2950 break; 2914 break;
2951 2915
2952 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2916 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2953 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2917 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2954#ifdef ISO6429 2918#ifdef ISO6429
2955 arg[0] = -arg[0]; 2919 arg[0] = -arg[0];
2956#else /* emulate common DEC VTs */ 2920#else /* emulate common DEC VTs */
2957 arg[0] = arg[0] ? -arg[0] : -1; 2921 arg[0] = arg[0] ? -arg[0] : -1;
2958#endif 2922#endif
… …
3350 idx_b; 3314 idx_b;
3351} 3315}
3352 3316
3353/* 3317/*
3354 * Find the nearest color slot in the hidden color cube, 3318 * Find the nearest color slot in the hidden color cube,
3355 * adapt its value to the 24bit RGB color. 3319 * adapt its value to the 32bit RGBA color.
3356 */ 3320 */
3357unsigned int 3321unsigned int
3358rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b) 3322rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3359{ 3323{
3360 r &= 0xff; 3324 r &= 0xff;
3361 g &= 0xff; 3325 g &= 0xff;
3362 b &= 0xff; 3326 b &= 0xff;
3327 a &= 0xff;
3363 3328
3364 unsigned int color = (r << 16) | (g << 8) | b; 3329 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3330
3365 unsigned int idx_r = r / (0xff / (Red_levels - 1)); 3331 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3366 unsigned int idx_g = g / (0xff / (Green_levels - 1)); 3332 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3367 unsigned int idx_b = b / (0xff / (Blue_levels - 1)); 3333 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3368 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b); 3334 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3369
3370 if (rgb24_color[idx] == color)
3371 return idx + minTermCOLOR24;
3372 3335
3373 /* we allow one of the 6 directly neighbouring colours */ 3336 /* we allow one of the 6 directly neighbouring colours */
3374 /* to replace the current color, if they not used recently */ 3337 /* to replace the current color, if they not used recently */
3375 static const signed char dxyz[][3] = { 3338 static const signed char dxyz[][3] = {
3376 0, 0, 0, 3339 0, 0, 0,
3340 0, 0, +1,
3377 0, 0, -1, 3341 0, 0, -1,
3378 0, 0, +1, 3342 0, +1, 0,
3379 0, -1, 0, 3343 0, -1, 0,
3380 0, +1, 0, 3344 +1, 0, 0,
3381 -1, 0, 0, 3345 -1, 0, 0,
3382 +1, 0, 0,
3383 }; 3346 };
3384 3347
3385 for (int n = 0; n < ecb_array_length (dxyz); ++n) 3348 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3386 { 3349 {
3387 int i = idx_r + dxyz[n][0]; 3350 int r = idx_r + dxyz[n][0];
3388 int j = idx_r + dxyz[n][1]; 3351 int g = idx_g + dxyz[n][1];
3389 int k = idx_r + dxyz[n][2]; 3352 int b = idx_b + dxyz[n][2];
3390 3353
3391 if (!IN_RANGE_EXC (i, 0, Red_levels)) 3354 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3392 continue;
3393
3394 if (!IN_RANGE_EXC (j, 0, Green_levels)) 3355 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3395 continue;
3396
3397 if (!IN_RANGE_EXC (k, 0, Blue_levels)) 3356 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3398 continue;
3399 3357
3400 unsigned int index = colorcube_index (i, j, k); 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 }
3401 3365
3402 // minor issue: could update index 0 few more times 3366 // minor issue: could update index 0 few more times
3403 if ((rgb24_seqno[index] | rgb24_color[index]) == 0) 3367 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3404 { 3368 {
3405 idx = index; 3369 idx = index;
3406 goto update; 3370 goto update;
3407 } 3371 }
3408
3409 if (rgb24_color[index] == color)
3410 return index + minTermCOLOR24;
3411 3372
3412 // like (rgb24_seqno[idx] > rgb24_seqno[index]) 3373 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3413 // but also handles wrap around values good enough 3374 // but also handles wrap around values good enough
3414 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff) 3375 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3415 idx = index; 3376 idx = index;
… …
3419 rgb24_color[idx] = color; 3380 rgb24_color[idx] = color;
3420 rgb24_seqno[idx] = ++rgb24_sequence; 3381 rgb24_seqno[idx] = ++rgb24_sequence;
3421 3382
3422 idx += minTermCOLOR24; 3383 idx += minTermCOLOR24;
3423 pix_colors_focused [idx].free (this); 3384 pix_colors_focused [idx].free (this);
3424 pix_colors_focused [idx].set (this, rgba (r * 0x0101, 3385 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3425 g * 0x0101,
3426 b * 0x0101));
3427 update_fade_color (idx, false); 3386 update_fade_color (idx, false);
3428 3387
3429 return idx; 3388 return idx;
3430} 3389}
3431 3390
… …
3573 break; 3532 break;
3574#endif 3533#endif
3575 case URxvt_Color_border: 3534 case URxvt_Color_border:
3576 process_color_seq (op, Color_border, str, resp); 3535 process_color_seq (op, Color_border, str, resp);
3577 break; 3536 break;
3578
3579#if BG_IMAGE_FROM_ROOT
3580 case URxvt_Color_tint:
3581 process_color_seq (op, Color_tint, str, resp);
3582 {
3583 bool changed = false;
3584
3585 if (ISSET_PIXCOLOR (Color_tint))
3586 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3587
3588 if (changed)
3589 update_background ();
3590 }
3591
3592 break;
3593#endif
3594
3595#if BG_IMAGE_FROM_FILE
3596 case Rxvt_Pixmap:
3597 if (!strcmp (str, "?"))
3598 {
3599 char str[256];
3600 int h_scale = fimage.h_scale;
3601 int v_scale = fimage.v_scale;
3602 int h_align = fimage.h_align;
3603 int v_align = fimage.v_align;
3604
3605 sprintf (str, "[%dx%d+%d+%d]",
3606 h_scale, v_scale,
3607 h_align, v_align);
3608 process_xterm_seq (XTerm_title, str, CHAR_ST);
3609 }
3610 else
3611 {
3612 bool changed = false;
3613
3614 if (*str != ';')
3615 {
3616 try
3617 {
3618 fimage.set_file_geometry (this, str);
3619 changed = true;
3620 }
3621 catch (const class rxvt_failure_exception &e)
3622 {
3623 }
3624 }
3625 else
3626 {
3627 str++;
3628 if (fimage.set_geometry (str, true))
3629 changed = true;
3630 }
3631
3632 if (changed)
3633 {
3634 if (bg_window_position_sensitive ())
3635 {
3636 int x, y;
3637 get_window_origin (x, y);
3638 parent_x = x;
3639 parent_y = y;
3640 }
3641 update_background ();
3642 }
3643 }
3644 break;
3645#endif
3646 3537
3647 case XTerm_logfile: 3538 case XTerm_logfile:
3648 // TODO, when secure mode? 3539 // TODO, when secure mode?
3649 break; 3540 break;
3650 3541
… …
4063 case 35: 3954 case 35:
4064 case 36: 3955 case 36:
4065 case 37: 3956 case 37:
4066 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3957 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4067 break; 3958 break;
4068 case 38: // set fg color, ISO 8613-6
4069 if (nargs > i + 2 && arg[i + 1] == 5)
4070 {
4071 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4072 i += 2;
4073 }
4074 else if (nargs > i + 4 && arg[i + 1] == 2)
4075 {
4076 unsigned int r = arg[i + 2];
4077 unsigned int g = arg[i + 3];
4078 unsigned int b = arg[i + 4];
4079 unsigned int idx = map_rgb24_color (r, g, b);
4080 scr_color (idx, Color_fg);
4081 i += 4;
4082 }
4083 break;
4084 case 39: /* default fg */ 3959 case 39: /* default fg */
4085 scr_color (Color_fg, Color_fg); 3960 scr_color (Color_fg, Color_fg);
4086 break; 3961 break;
4087 3962
4088 case 40: 3963 case 40:
… …
4093 case 45: 3968 case 45:
4094 case 46: 3969 case 46:
4095 case 47: 3970 case 47:
4096 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3971 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4097 break; 3972 break;
4098 case 48: // set bg color, ISO 8613-6
4099 if (nargs > i + 2 && arg[i + 1] == 5)
4100 {
4101 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4102 i += 2;
4103 }
4104 else if (nargs > i + 4 && arg[i + 1] == 2)
4105 {
4106 unsigned int r = arg[i + 2];
4107 unsigned int g = arg[i + 3];
4108 unsigned int b = arg[i + 4];
4109 unsigned int idx = map_rgb24_color (r, g, b);
4110 scr_color (idx, Color_bg);
4111 i += 4;
4112 }
4113 break;
4114 case 49: /* default bg */ 3973 case 49: /* default bg */
4115 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 }
4116 break; 4004 break;
4117 4005
4118 //case 50: // not variable spacing 4006 //case 50: // not variable spacing
4119 4007
4120#if !ENABLE_MINIMAL 4008#if !ENABLE_MINIMAL

Diff Legend

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