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.286 by root, Wed Jan 25 21:09:21 2006 UTC vs.
Revision 1.298 by root, Tue Jan 31 18:36:35 2006 UTC

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 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);
2567 * InheritPixmap transparency 2574 * InheritPixmap transparency
2568 */ 2575 */
2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570 { 2577 {
2571 oldp = parent[i]; 2578 oldp = parent[i];
2572 XQueryTree (xdisp, parent[i - 1], &root, 2579 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2573 &parent[i], &list, &n);
2574 XFree (list); 2580 XFree (list);
2575 2581
2576 if (parent[i] == display->root) 2582 if (parent[i] == display->root)
2577 { 2583 {
2578 if (oldp != None) 2584 if (oldp != None)
2586 } 2592 }
2587 2593
2588 n = 0; 2594 n = 0;
2589 2595
2590 if (pchanged) 2596 if (pchanged)
2591 {
2592 for (; n < (unsigned int)i; n++) 2597 for (; n < (unsigned int)i; n++)
2593 { 2598 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr); 2599 XGetWindowAttributes (xdisp, parent[n], &wattr);
2600
2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2601 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596 { 2602 {
2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2603 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598 break; 2604 break;
2599 } 2605 }
2600 } 2606 }
2601 }
2602 2607
2603 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2608 if (n > (sizeof (parent) / sizeof (parent[0])))
2604 { 2609 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2610 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2611 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0; 2612 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */ 2613 /* XXX: also turn off Opt_transparent? */
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 3089 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 3090 break;
3086 case '+': 3091 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 3092 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 3093 break;
3089#if ENABLE_FRILLS 3094#if !ENABLE_MINIMAL
3090 case '6': 3095 case '6':
3091 scr_backindex (); 3096 scr_backindex ();
3092 break; 3097 break;
3093#endif 3098#endif
3094 case '7': 3099 case '7':
3095 scr_cursor (SAVE); 3100 scr_cursor (SAVE);
3096 break; 3101 break;
3097 case '8': 3102 case '8':
3098 scr_cursor (RESTORE); 3103 scr_cursor (RESTORE);
3099 break; 3104 break;
3100#if ENABLE_FRILLS 3105#if !ENABLE_MINIMAL
3101 case '9': 3106 case '9':
3102 scr_forwardindex (); 3107 scr_forwardindex ();
3103 break; 3108 break;
3104#endif 3109#endif
3105 case '=': 3110 case '=':
3278 { 3283 {
3279 case '>': 3284 case '>':
3280 if (ch == CSI_DA) /* secondary device attributes */ 3285 if (ch == CSI_DA) /* secondary device attributes */
3281 { 3286 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 3287 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3283 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 3288 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 // 3289 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 3290 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 3291 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3287 // that we do not support xterm mouse reporting (should be 95 when we do). 3292 // that we do not support xterm mouse reporting (should be 95 when we do).
3288 // 3293 //
3289 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 3294 tt_printf ("\033[>%d;94;0c", 'U');
3290 } 3295 }
3291 break; 3296 break;
3292 case '?': 3297 case '?':
3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3298 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3294 process_terminal_mode (ch, priv, nargs, arg); 3299 process_terminal_mode (ch, priv, nargs, arg);
3498 break; 3503 break;
3499 case CSI_75: 3504 case CSI_75:
3500 scr_cursor (RESTORE); 3505 scr_cursor (RESTORE);
3501 break; 3506 break;
3502 3507
3503#if ENABLE_FRILLS 3508#if !ENABLE_MINIMAL
3504 case CSI_74: 3509 case CSI_74:
3505 process_window_ops (arg, nargs); 3510 process_window_ops (arg, nargs);
3506 break; 3511 break;
3507#endif 3512#endif
3508 3513
3515 break; 3520 break;
3516 } 3521 }
3517} 3522}
3518/*}}} */ 3523/*}}} */
3519 3524
3520#if ENABLE_FRILLS 3525#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3526/* ARGSUSED */
3522void 3527void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3528rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3529{
3525 int x, y; 3530 int x, y;
3714void 3719void
3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3720rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3716{ 3721{
3717 if (str[0] == '?' && !str[1]) 3722 if (str[0] == '?' && !str[1])
3718 { 3723 {
3719 unsigned short r, g, b; 3724 rgba c;
3720 pix_colors_focused[color].get (this, r, g, b); 3725 pix_colors_focused[color].get (this, c);
3726
3727#if XFT
3728 if (c.a != rgba::MAX_CC)
3729 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3730 else
3731#endif
3721 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3732 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3722 } 3733 }
3723 else 3734 else
3724 set_window_color (color, str); 3735 set_window_color (color, str);
3725} 3736}
3726 3737
3767 &nitems, &bytes_after, &value) == Success 3778 &nitems, &bytes_after, &value) == Success
3768 && actual_type != None 3779 && actual_type != None
3769 && actual_format == 8) 3780 && actual_format == 8)
3770 str = (const char *)(value); 3781 str = (const char *)(value);
3771 3782
3772 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3783 tt_printf ("\033]%d;%s%c", op, str, resp);
3773 3784
3774 XFree (value); 3785 XFree (value);
3775 } 3786 }
3776 else 3787 else
3777 { 3788 {
3801 break; 3812 break;
3802 3813
3803 if ((buf = strchr (name, ';')) != NULL) 3814 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 3815 *buf++ = '\0';
3805 3816
3806 if (name[0] == '?' && !name[1]) 3817 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", XTerm_Color, color, r, g, b, resp);
3811 }
3812 else
3813 set_window_color (color, name);
3814 } 3818 }
3815 break; 3819 break;
3816 case XTerm_Color00: 3820 case XTerm_Color00:
3817 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3821 process_color_seq (op, Color_fg, str, resp);
3818 break; 3822 break;
3819 case XTerm_Color01: 3823 case XTerm_Color01:
3820 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3824 process_color_seq (op, Color_bg, str, resp);
3821 break; 3825 break;
3822#ifndef NO_CURSORCOLOR 3826#ifndef NO_CURSORCOLOR
3823 case XTerm_Color_cursor: 3827 case XTerm_Color_cursor:
3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3828 process_color_seq (op, Color_cursor, str, resp);
3825 break; 3829 break;
3826#endif 3830#endif
3827 case XTerm_Color_pointer_fg: 3831 case XTerm_Color_pointer_fg:
3828 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3832 process_color_seq (op, Color_pointer_fg, str, resp);
3829 break; 3833 break;
3830 case XTerm_Color_pointer_bg: 3834 case XTerm_Color_pointer_bg:
3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3835 process_color_seq (op, Color_pointer_bg, str, resp);
3832 break; 3836 break;
3833#ifndef NO_BOLD_UNDERLINE_REVERSE 3837#ifndef NO_BOLD_UNDERLINE_REVERSE
3834 case XTerm_Color_RV: 3838 case XTerm_Color_RV:
3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3839 process_color_seq (op, Color_RV, str, resp);
3836 break; 3840 break;
3837 case Rxvt_Color_BD: 3841 case Rxvt_Color_BD:
3838 case URxvt_Color_BD: 3842 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp); 3843 process_color_seq (op, Color_BD, str, resp);
3840 break; 3844 break;
3841 case Rxvt_Color_UL: 3845 case Rxvt_Color_UL:
3842 case URxvt_Color_UL: 3846 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp); 3847 process_color_seq (op, Color_UL, str, resp);
3844 break; 3848 break;
3845 case URxvt_Color_IT: 3849 case URxvt_Color_IT:
3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3850 process_color_seq (op, Color_IT, str, resp);
3847 break; 3851 break;
3848#endif 3852#endif
3849#if TRANSPARENT && TINTING 3853#if TRANSPARENT && TINTING
3850 case URxvt_Color_tint: 3854 case URxvt_Color_tint:
3851 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3855 process_color_seq (op, Color_tint, str, resp);
3856
3852 check_our_parents (); 3857 check_our_parents ();
3858
3853 if (am_transparent) 3859 if (am_transparent)
3854 want_full_refresh = want_refresh = 1; 3860 want_full_refresh = want_refresh = 1;
3861
3855 break; 3862 break;
3856#endif 3863#endif
3857 3864
3858 case Rxvt_Pixmap: 3865 case Rxvt_Pixmap:
3859 { 3866 {
3930 allocated.push_back ((void *)res); 3937 allocated.push_back ((void *)res);
3931 set_fonts (); 3938 set_fonts ();
3932 } 3939 }
3933 break; 3940 break;
3934 3941
3935#if ENABLE_FRILLS 3942 case URxvt_version:
3943 if (query)
3944 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3945 op,
3946 rs[Rs_name], VERSION[0], VERSION[2],
3947 resp);
3948 break;
3949
3950#if !ENABLE_MINIMAL
3936 case URxvt_locale: 3951 case URxvt_locale:
3937 if (query) 3952 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3953 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3939 else 3954 else
3940 { 3955 {
3941 set_locale (str); 3956 set_locale (str);
3942 pty->set_utf8_mode (enc_utf8); 3957 pty->set_utf8_mode (enc_utf8);
3943 init_xlocale (); 3958 init_xlocale ();
4304 scr_color (Color_bg, Color_bg); 4319 scr_color (Color_bg, Color_bg);
4305 break; 4320 break;
4306 4321
4307 //case 50: // not variable spacing 4322 //case 50: // not variable spacing
4308 4323
4309#if ENABLE_FRILLS 4324#if !ENABLE_MINIMAL
4310 case 90: 4325 case 90:
4311 case 91: /* set bright fg color */ 4326 case 91: /* set bright fg color */
4312 case 92: 4327 case 92:
4313 case 93: 4328 case 93:
4314 case 94: 4329 case 94:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines