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.568 by sf-exg, Tue Oct 13 08:10:43 2015 UTC vs.
Revision 1.583 by root, Thu May 18 02:43:18 2017 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));
… …
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 }
… …
2723 break; 2693 break;
2724 2694
2725 /* kidnapped escape sequence: Should be 8.3.48 */ 2695 /* kidnapped escape sequence: Should be 8.3.48 */
2726 case C1_ESA: /* ESC G */ 2696 case C1_ESA: /* ESC G */
2727 // used by original rxvt for rob nations own graphics mode 2697 // used by original rxvt for rob nations own graphics mode
2728 if (cmd_getc () == 'Q') 2698 if (cmd_getc () == 'Q' && option (Opt_insecure))
2729 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2699 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2730 break; 2700 break;
2731 2701
2732 /* 8.3.63: CHARACTER TABULATION SET */ 2702 /* 8.3.63: CHARACTER TABULATION SET */
2733 case C1_HTS: /* ESC H */ 2703 case C1_HTS: /* ESC H */
… …
2942 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2912 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2943 scr_gotorc (arg[0], 0, RELATIVE); 2913 scr_gotorc (arg[0], 0, RELATIVE);
2944 break; 2914 break;
2945 2915
2946 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2916 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2947 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2917 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2948#ifdef ISO6429 2918#ifdef ISO6429
2949 arg[0] = -arg[0]; 2919 arg[0] = -arg[0];
2950#else /* emulate common DEC VTs */ 2920#else /* emulate common DEC VTs */
2951 arg[0] = arg[0] ? -arg[0] : -1; 2921 arg[0] = arg[0] ? -arg[0] : -1;
2952#endif 2922#endif
… …
3328 free (s); 3298 free (s);
3329 } 3299 }
3330 } 3300 }
3331} 3301}
3332 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
3333void 3391void
3334rxvt_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)
3335{ 3393{
3336 if (str[0] == '?' && !str[1]) 3394 if (str[0] == '?' && !str[1])
3337 { 3395 {
… …
3474 break; 3532 break;
3475#endif 3533#endif
3476 case URxvt_Color_border: 3534 case URxvt_Color_border:
3477 process_color_seq (op, Color_border, str, resp); 3535 process_color_seq (op, Color_border, str, resp);
3478 break; 3536 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 3537
3548 case XTerm_logfile: 3538 case XTerm_logfile:
3549 // TODO, when secure mode? 3539 // TODO, when secure mode?
3550 break; 3540 break;
3551 3541
… …
3707#endif 3697#endif
3708 { 1000, PrivMode_MouseX11 }, 3698 { 1000, PrivMode_MouseX11 },
3709 { 1002, PrivMode_MouseBtnEvent }, 3699 { 1002, PrivMode_MouseBtnEvent },
3710 { 1003, PrivMode_MouseAnyEvent }, 3700 { 1003, PrivMode_MouseAnyEvent },
3711#if ENABLE_FRILLS 3701#if ENABLE_FRILLS
3702 { 1004, PrivMode_FocusEvent },
3712 { 1005, PrivMode_ExtModeMouse }, 3703 { 1005, PrivMode_ExtModeMouse },
3713#endif 3704#endif
3714 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3705 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3715 { 1011, PrivMode_Keypress }, // rxvt extension 3706 { 1011, PrivMode_Keypress }, // rxvt extension
3716#if ENABLE_FRILLS 3707#if ENABLE_FRILLS
… …
3963 case 35: 3954 case 35:
3964 case 36: 3955 case 36:
3965 case 37: 3956 case 37:
3966 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3957 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3967 break; 3958 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 */ 3959 case 39: /* default fg */
3976 scr_color (Color_fg, Color_fg); 3960 scr_color (Color_fg, Color_fg);
3977 break; 3961 break;
3978 3962
3979 case 40: 3963 case 40:
… …
3984 case 45: 3968 case 45:
3985 case 46: 3969 case 46:
3986 case 47: 3970 case 47:
3987 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3971 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3988 break; 3972 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 */ 3973 case 49: /* default bg */
3997 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 }
3998 break; 4004 break;
3999 4005
4000 //case 50: // not variable spacing 4006 //case 50: // not variable spacing
4001 4007
4002#if !ENABLE_MINIMAL 4008#if !ENABLE_MINIMAL

Diff Legend

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