… | |
… | |
227 | # if !UNICODE3 |
227 | # if !UNICODE3 |
228 | if (ch >= 0x10000) |
228 | if (ch >= 0x10000) |
229 | ch = 0xfffd; |
229 | ch = 0xfffd; |
230 | # endif |
230 | # endif |
231 | scr_overlay_set (11, y, ch, r); |
231 | scr_overlay_set (11, y, ch, r); |
|
|
232 | |
|
|
233 | if (WCWIDTH (ch) >= 2) |
232 | scr_overlay_set (12, y, NOCHAR, r); |
234 | scr_overlay_set (12, y, NOCHAR, r); |
233 | } |
235 | } |
234 | |
236 | |
|
|
237 | // { |
|
|
238 | // char buf[4+4+3+1]; |
|
|
239 | // snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); |
|
|
240 | // scr_overlay_set (0, 0, buf); |
|
|
241 | // } |
235 | scr_overlay_set (0, len , attr); |
242 | scr_overlay_set (0, len , attr); |
236 | scr_overlay_set (0, len + 1, fname); |
243 | scr_overlay_set (0, len + 1, fname); |
237 | |
244 | |
238 | free (fname); |
245 | free (fname); |
239 | |
246 | |
… | |
… | |
2455 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2462 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2456 | &nitems, &bytes_after, &prop) == Success); |
2463 | &nitems, &bytes_after, &prop) == Success); |
2457 | |
2464 | |
2458 | if (!i || prop == NULL |
2465 | if (!i || prop == NULL |
2459 | #if TINTING |
2466 | #if TINTING |
2460 | || !rs[Rs_color + Color_tint] |
2467 | || !ISSET_PIXCOLOR (Color_tint) |
2461 | #endif |
2468 | #endif |
2462 | ) |
2469 | ) |
2463 | have_pixmap = 0; |
2470 | have_pixmap = 0; |
2464 | else |
2471 | else |
2465 | { |
2472 | { |
… | |
… | |
2531 | XFreePixmap (xdisp, pixmap); |
2538 | XFreePixmap (xdisp, pixmap); |
2532 | |
2539 | |
2533 | #if TINTING |
2540 | #if TINTING |
2534 | if (ISSET_PIXCOLOR (Color_tint)) |
2541 | if (ISSET_PIXCOLOR (Color_tint)) |
2535 | { |
2542 | { |
2536 | unsigned short rm, gm, bm; |
|
|
2537 | int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; |
2543 | int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; |
2538 | |
2544 | |
|
|
2545 | rxvt_rgba c; |
2539 | pix_colors_focused[Color_tint].get (this, rm, gm, bm); |
2546 | pix_colors_focused [Color_tint].get (this, c); |
2540 | |
2547 | |
2541 | ShadeXImage (this, image, shade, rm, gm, bm); |
2548 | ShadeXImage (this, image, shade, c.r, c.g, c.b); |
2542 | } |
2549 | } |
2543 | #endif |
2550 | #endif |
2544 | |
2551 | |
2545 | pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); |
2552 | pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); |
2546 | gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); |
2553 | gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); |
… | |
… | |
3084 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
3091 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
3085 | break; |
3092 | break; |
3086 | case '+': |
3093 | case '+': |
3087 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
3094 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
3088 | break; |
3095 | break; |
3089 | #if ENABLE_FRILLS |
3096 | #if !ENABLE_MINIMAL |
3090 | case '6': |
3097 | case '6': |
3091 | scr_backindex (); |
3098 | scr_backindex (); |
3092 | break; |
3099 | break; |
3093 | #endif |
3100 | #endif |
3094 | case '7': |
3101 | case '7': |
3095 | scr_cursor (SAVE); |
3102 | scr_cursor (SAVE); |
3096 | break; |
3103 | break; |
3097 | case '8': |
3104 | case '8': |
3098 | scr_cursor (RESTORE); |
3105 | scr_cursor (RESTORE); |
3099 | break; |
3106 | break; |
3100 | #if ENABLE_FRILLS |
3107 | #if !ENABLE_MINIMAL |
3101 | case '9': |
3108 | case '9': |
3102 | scr_forwardindex (); |
3109 | scr_forwardindex (); |
3103 | break; |
3110 | break; |
3104 | #endif |
3111 | #endif |
3105 | case '=': |
3112 | case '=': |
… | |
… | |
3498 | break; |
3505 | break; |
3499 | case CSI_75: |
3506 | case CSI_75: |
3500 | scr_cursor (RESTORE); |
3507 | scr_cursor (RESTORE); |
3501 | break; |
3508 | break; |
3502 | |
3509 | |
3503 | #if ENABLE_FRILLS |
3510 | #if !ENABLE_MINIMAL |
3504 | case CSI_74: |
3511 | case CSI_74: |
3505 | process_window_ops (arg, nargs); |
3512 | process_window_ops (arg, nargs); |
3506 | break; |
3513 | break; |
3507 | #endif |
3514 | #endif |
3508 | |
3515 | |
… | |
… | |
3515 | break; |
3522 | break; |
3516 | } |
3523 | } |
3517 | } |
3524 | } |
3518 | /*}}} */ |
3525 | /*}}} */ |
3519 | |
3526 | |
3520 | #if ENABLE_FRILLS |
3527 | #if !ENABLE_MINIMAL |
3521 | /* ARGSUSED */ |
3528 | /* ARGSUSED */ |
3522 | void |
3529 | void |
3523 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3530 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3524 | { |
3531 | { |
3525 | int x, y; |
3532 | int x, y; |
… | |
… | |
3714 | void |
3721 | void |
3715 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3722 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3716 | { |
3723 | { |
3717 | if (str[0] == '?' && !str[1]) |
3724 | if (str[0] == '?' && !str[1]) |
3718 | { |
3725 | { |
3719 | unsigned short r, g, b; |
3726 | rxvt_rgba c; |
3720 | pix_colors_focused[color].get (this, r, g, b); |
3727 | pix_colors_focused[color].get (this, c); |
|
|
3728 | |
|
|
3729 | #if XFT |
|
|
3730 | if (c.a != rxvt_rgba::MAX_CC) |
|
|
3731 | tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); |
|
|
3732 | else |
|
|
3733 | #endif |
3721 | tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); |
3734 | tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); |
3722 | } |
3735 | } |
3723 | else |
3736 | else |
3724 | set_window_color (color, str); |
3737 | set_window_color (color, str); |
3725 | } |
3738 | } |
3726 | |
3739 | |
… | |
… | |
3801 | break; |
3814 | break; |
3802 | |
3815 | |
3803 | if ((buf = strchr (name, ';')) != NULL) |
3816 | if ((buf = strchr (name, ';')) != NULL) |
3804 | *buf++ = '\0'; |
3817 | *buf++ = '\0'; |
3805 | |
3818 | |
3806 | if (name[0] == '?' && !name[1]) |
3819 | process_color_seq (op, color, name, resp); |
3807 | { |
|
|
3808 | unsigned short r, g, b; |
|
|
3809 | pix_colors_focused[color].get (this, r, g, b); |
|
|
3810 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", op, color, r, g, b, resp); |
|
|
3811 | } |
|
|
3812 | else |
|
|
3813 | set_window_color (color, name); |
|
|
3814 | } |
3820 | } |
3815 | break; |
3821 | break; |
3816 | case XTerm_Color00: |
3822 | case XTerm_Color00: |
3817 | process_color_seq (op, Color_fg, str, resp); |
3823 | process_color_seq (op, Color_fg, str, resp); |
3818 | break; |
3824 | break; |
… | |
… | |
3847 | break; |
3853 | break; |
3848 | #endif |
3854 | #endif |
3849 | #if TRANSPARENT && TINTING |
3855 | #if TRANSPARENT && TINTING |
3850 | case URxvt_Color_tint: |
3856 | case URxvt_Color_tint: |
3851 | process_color_seq (op, Color_tint, str, resp); |
3857 | process_color_seq (op, Color_tint, str, resp); |
|
|
3858 | |
3852 | check_our_parents (); |
3859 | check_our_parents (); |
|
|
3860 | |
3853 | if (am_transparent) |
3861 | if (am_transparent) |
3854 | want_full_refresh = want_refresh = 1; |
3862 | want_full_refresh = want_refresh = 1; |
|
|
3863 | |
3855 | break; |
3864 | break; |
3856 | #endif |
3865 | #endif |
3857 | |
3866 | |
3858 | case Rxvt_Pixmap: |
3867 | case Rxvt_Pixmap: |
3859 | { |
3868 | { |
… | |
… | |
3938 | op, |
3947 | op, |
3939 | rs[Rs_name], VERSION[0], VERSION[2], |
3948 | rs[Rs_name], VERSION[0], VERSION[2], |
3940 | resp); |
3949 | resp); |
3941 | break; |
3950 | break; |
3942 | |
3951 | |
3943 | #if ENABLE_FRILLS |
3952 | #if !ENABLE_MINIMAL |
3944 | case URxvt_locale: |
3953 | case URxvt_locale: |
3945 | if (query) |
3954 | if (query) |
3946 | tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); |
3955 | tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); |
3947 | else |
3956 | else |
3948 | { |
3957 | { |
… | |
… | |
4312 | scr_color (Color_bg, Color_bg); |
4321 | scr_color (Color_bg, Color_bg); |
4313 | break; |
4322 | break; |
4314 | |
4323 | |
4315 | //case 50: // not variable spacing |
4324 | //case 50: // not variable spacing |
4316 | |
4325 | |
4317 | #if ENABLE_FRILLS |
4326 | #if !ENABLE_MINIMAL |
4318 | case 90: |
4327 | case 90: |
4319 | case 91: /* set bright fg color */ |
4328 | case 91: /* set bright fg color */ |
4320 | case 92: |
4329 | case 92: |
4321 | case 93: |
4330 | case 93: |
4322 | case 94: |
4331 | case 94: |