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.290 by root, Sat Jan 28 20:41:38 2006 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC

… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
… …
227# if !UNICODE3 222# if !UNICODE3
228 if (ch >= 0x10000) 223 if (ch >= 0x10000)
229 ch = 0xfffd; 224 ch = 0xfffd;
230# endif 225# endif
231 scr_overlay_set (11, y, ch, r); 226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
233 } 230 }
234 231
232// {
233// char buf[4+4+3+1];
234// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
235// scr_overlay_set (0, 0, buf);
236// }
235 scr_overlay_set (0, len , attr); 237 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 238 scr_overlay_set (0, len + 1, fname);
237 239
238 free (fname); 240 free (fname);
239 241
… …
1086 1088
1087 want_refresh = 1; 1089 want_refresh = 1;
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089 } 1091 }
1090} 1092}
1091#endif
1092
1093#if HAVE_SCHED_YIELD
1094static struct event_handler
1095{
1096 check_watcher cw_yield;
1097
1098 void yield (check_watcher &w)
1099 {
1100 sched_yield ();
1101 w.stop ();
1102 }
1103
1104 event_handler ()
1105 : cw_yield (this, &event_handler::yield)
1106 {
1107 }
1108} event_handler;
1109#endif 1093#endif
1110 1094
1111bool 1095bool
1112rxvt_term::pty_fill () 1096rxvt_term::pty_fill ()
1113{ 1097{
… …
2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2456 &nitems, &bytes_after, &prop) == Success); 2440 &nitems, &bytes_after, &prop) == Success);
2457 2441
2458 if (!i || prop == NULL 2442 if (!i || prop == NULL
2459#if TINTING 2443#if TINTING
2460 || !rs[Rs_color + Color_tint] 2444 || !ISSET_PIXCOLOR (Color_tint)
2461#endif 2445#endif
2462 ) 2446 )
2463 have_pixmap = 0; 2447 have_pixmap = 0;
2464 else 2448 else
2465 { 2449 {
… …
2531 XFreePixmap (xdisp, pixmap); 2515 XFreePixmap (xdisp, pixmap);
2532 2516
2533#if TINTING 2517#if TINTING
2534 if (ISSET_PIXCOLOR (Color_tint)) 2518 if (ISSET_PIXCOLOR (Color_tint))
2535 { 2519 {
2536 unsigned short rm, gm, bm;
2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2538 2521
2522 rgba c;
2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm); 2523 pix_colors_focused [Color_tint].get (c);
2540 2524
2541 ShadeXImage (this, image, shade, rm, gm, bm); 2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2542 } 2526 }
2543#endif 2527#endif
2544 2528
2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); 2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); 2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
… …
2567 * InheritPixmap transparency 2551 * InheritPixmap transparency
2568 */ 2552 */
2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570 { 2554 {
2571 oldp = parent[i]; 2555 oldp = parent[i];
2572 XQueryTree (xdisp, parent[i - 1], &root, 2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2573 &parent[i], &list, &n);
2574 XFree (list); 2557 XFree (list);
2575 2558
2576 if (parent[i] == display->root) 2559 if (parent[i] == display->root)
2577 { 2560 {
2578 if (oldp != None) 2561 if (oldp != None)
… …
2586 } 2569 }
2587 2570
2588 n = 0; 2571 n = 0;
2589 2572
2590 if (pchanged) 2573 if (pchanged)
2591 {
2592 for (; n < (unsigned int)i; n++) 2574 for (; n < (unsigned int)i; n++)
2593 { 2575 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr); 2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596 { 2579 {
2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598 break; 2581 break;
2599 } 2582 }
2600 } 2583 }
2601 }
2602 2584
2603 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2604 { 2586 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0; 2589 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */ 2590 /* XXX: also turn off Opt_transparent? */
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 3066 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 3067 break;
3086 case '+': 3068 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 3069 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 3070 break;
3089#if ENABLE_FRILLS 3071#if !ENABLE_MINIMAL
3090 case '6': 3072 case '6':
3091 scr_backindex (); 3073 scr_backindex ();
3092 break; 3074 break;
3093#endif 3075#endif
3094 case '7': 3076 case '7':
3095 scr_cursor (SAVE); 3077 scr_cursor (SAVE);
3096 break; 3078 break;
3097 case '8': 3079 case '8':
3098 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
3099 break; 3081 break;
3100#if ENABLE_FRILLS 3082#if !ENABLE_MINIMAL
3101 case '9': 3083 case '9':
3102 scr_forwardindex (); 3084 scr_forwardindex ();
3103 break; 3085 break;
3104#endif 3086#endif
3105 case '=': 3087 case '=':
… …
3498 break; 3480 break;
3499 case CSI_75: 3481 case CSI_75:
3500 scr_cursor (RESTORE); 3482 scr_cursor (RESTORE);
3501 break; 3483 break;
3502 3484
3503#if ENABLE_FRILLS 3485#if !ENABLE_MINIMAL
3504 case CSI_74: 3486 case CSI_74:
3505 process_window_ops (arg, nargs); 3487 process_window_ops (arg, nargs);
3506 break; 3488 break;
3507#endif 3489#endif
3508 3490
… …
3515 break; 3497 break;
3516 } 3498 }
3517} 3499}
3518/*}}} */ 3500/*}}} */
3519 3501
3520#if ENABLE_FRILLS 3502#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3503/* ARGSUSED */
3522void 3504void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3505rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3506{
3525 int x, y; 3507 int x, y;
… …
3566 default: 3548 default:
3567 if (args[0] >= 24) /* set height (chars) */ 3549 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3550 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3551 (unsigned int) (args[1] * fheight));
3570 break; 3552 break;
3571
3572 3553
3573 /* 3554 /*
3574 * reports - some output format copied from XTerm 3555 * reports - some output format copied from XTerm
3575 */ 3556 */
3576 case 11: /* report window state */ 3557 case 11: /* report window state */
… …
3714void 3695void
3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3696rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3716{ 3697{
3717 if (str[0] == '?' && !str[1]) 3698 if (str[0] == '?' && !str[1])
3718 { 3699 {
3719 unsigned short r, g, b; 3700 rgba c;
3720 pix_colors_focused[color].get (this, r, g, b); 3701 pix_colors_focused[color].get (c);
3702
3703#if XFT
3704 if (c.a != rgba::MAX_CC)
3705 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3706 else
3707#endif
3721 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3708 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3722 } 3709 }
3723 else 3710 else
3724 set_window_color (color, str); 3711 set_window_color (color, str);
3725} 3712}
3726 3713
… …
3801 break; 3788 break;
3802 3789
3803 if ((buf = strchr (name, ';')) != NULL) 3790 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 3791 *buf++ = '\0';
3805 3792
3806 if (name[0] == '?' && !name[1]) 3793 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 } 3794 }
3815 break; 3795 break;
3816 case XTerm_Color00: 3796 case XTerm_Color00:
3817 process_color_seq (op, Color_fg, str, resp); 3797 process_color_seq (op, Color_fg, str, resp);
3818 break; 3798 break;
… …
3847 break; 3827 break;
3848#endif 3828#endif
3849#if TRANSPARENT && TINTING 3829#if TRANSPARENT && TINTING
3850 case URxvt_Color_tint: 3830 case URxvt_Color_tint:
3851 process_color_seq (op, Color_tint, str, resp); 3831 process_color_seq (op, Color_tint, str, resp);
3832
3852 check_our_parents (); 3833 check_our_parents ();
3834
3853 if (am_transparent) 3835 if (am_transparent)
3854 want_full_refresh = want_refresh = 1; 3836 want_full_refresh = want_refresh = 1;
3837
3855 break; 3838 break;
3856#endif 3839#endif
3857 3840
3858 case Rxvt_Pixmap: 3841 case Rxvt_Pixmap:
3859 { 3842 {
… …
3938 op, 3921 op,
3939 rs[Rs_name], VERSION[0], VERSION[2], 3922 rs[Rs_name], VERSION[0], VERSION[2],
3940 resp); 3923 resp);
3941 break; 3924 break;
3942 3925
3943#if ENABLE_FRILLS 3926#if !ENABLE_MINIMAL
3944 case URxvt_locale: 3927 case URxvt_locale:
3945 if (query) 3928 if (query)
3946 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3947 else 3930 else
3948 { 3931 {
… …
4312 scr_color (Color_bg, Color_bg); 4295 scr_color (Color_bg, Color_bg);
4313 break; 4296 break;
4314 4297
4315 //case 50: // not variable spacing 4298 //case 50: // not variable spacing
4316 4299
4317#if ENABLE_FRILLS 4300#if !ENABLE_MINIMAL
4318 case 90: 4301 case 90:
4319 case 91: /* set bright fg color */ 4302 case 91: /* set bright fg color */
4320 case 92: 4303 case 92:
4321 case 93: 4304 case 93:
4322 case 94: 4305 case 94:

Diff Legend

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