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.293 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC

… …
48#include "../config.h" 48#include "../config.h"
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
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58 53
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
… …
1093 1088
1094 want_refresh = 1; 1089 want_refresh = 1;
1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1096 } 1091 }
1097} 1092}
1098#endif
1099
1100#if HAVE_SCHED_YIELD
1101static struct event_handler
1102{
1103 check_watcher cw_yield;
1104
1105 void yield (check_watcher &w)
1106 {
1107 sched_yield ();
1108 w.stop ();
1109 }
1110
1111 event_handler ()
1112 : cw_yield (this, &event_handler::yield)
1113 {
1114 }
1115} event_handler;
1116#endif 1093#endif
1117 1094
1118bool 1095bool
1119rxvt_term::pty_fill () 1096rxvt_term::pty_fill ()
1120{ 1097{
… …
2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463 &nitems, &bytes_after, &prop) == Success); 2440 &nitems, &bytes_after, &prop) == Success);
2464 2441
2465 if (!i || prop == NULL 2442 if (!i || prop == NULL
2466#if TINTING 2443#if TINTING
2467 || !rs[Rs_color + Color_tint] 2444 || !ISSET_PIXCOLOR (Color_tint)
2468#endif 2445#endif
2469 ) 2446 )
2470 have_pixmap = 0; 2447 have_pixmap = 0;
2471 else 2448 else
2472 { 2449 {
… …
2538 XFreePixmap (xdisp, pixmap); 2515 XFreePixmap (xdisp, pixmap);
2539 2516
2540#if TINTING 2517#if TINTING
2541 if (ISSET_PIXCOLOR (Color_tint)) 2518 if (ISSET_PIXCOLOR (Color_tint))
2542 { 2519 {
2543 rxvt_rgba c;
2544 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2545 2521
2522 rgba c;
2546 pix_colors_focused[Color_tint].get (this, c); 2523 pix_colors_focused [Color_tint].get (c);
2547 2524
2548 ShadeXImage (this, image, shade, c.r, c.g, c.b); 2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2549 } 2526 }
2550#endif 2527#endif
2551 2528
… …
2574 * InheritPixmap transparency 2551 * InheritPixmap transparency
2575 */ 2552 */
2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2577 { 2554 {
2578 oldp = parent[i]; 2555 oldp = parent[i];
2579 XQueryTree (xdisp, parent[i - 1], &root, 2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2580 &parent[i], &list, &n);
2581 XFree (list); 2557 XFree (list);
2582 2558
2583 if (parent[i] == display->root) 2559 if (parent[i] == display->root)
2584 { 2560 {
2585 if (oldp != None) 2561 if (oldp != None)
… …
2593 } 2569 }
2594 2570
2595 n = 0; 2571 n = 0;
2596 2572
2597 if (pchanged) 2573 if (pchanged)
2598 {
2599 for (; n < (unsigned int)i; n++) 2574 for (; n < (unsigned int)i; n++)
2600 { 2575 {
2601 XGetWindowAttributes (xdisp, parent[n], &wattr); 2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2603 { 2579 {
2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2605 break; 2581 break;
2606 } 2582 }
2607 } 2583 }
2608 }
2609 2584
2610 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2611 { 2586 {
2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2614 am_transparent = 0; 2589 am_transparent = 0;
2615 /* XXX: also turn off Opt_transparent? */ 2590 /* XXX: also turn off Opt_transparent? */
… …
3091 scr_charset_set (2, (unsigned int)cmd_getc ()); 3066 scr_charset_set (2, (unsigned int)cmd_getc ());
3092 break; 3067 break;
3093 case '+': 3068 case '+':
3094 scr_charset_set (3, (unsigned int)cmd_getc ()); 3069 scr_charset_set (3, (unsigned int)cmd_getc ());
3095 break; 3070 break;
3096#if ENABLE_FRILLS 3071#if !ENABLE_MINIMAL
3097 case '6': 3072 case '6':
3098 scr_backindex (); 3073 scr_backindex ();
3099 break; 3074 break;
3100#endif 3075#endif
3101 case '7': 3076 case '7':
3102 scr_cursor (SAVE); 3077 scr_cursor (SAVE);
3103 break; 3078 break;
3104 case '8': 3079 case '8':
3105 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
3106 break; 3081 break;
3107#if ENABLE_FRILLS 3082#if !ENABLE_MINIMAL
3108 case '9': 3083 case '9':
3109 scr_forwardindex (); 3084 scr_forwardindex ();
3110 break; 3085 break;
3111#endif 3086#endif
3112 case '=': 3087 case '=':
… …
3505 break; 3480 break;
3506 case CSI_75: 3481 case CSI_75:
3507 scr_cursor (RESTORE); 3482 scr_cursor (RESTORE);
3508 break; 3483 break;
3509 3484
3510#if ENABLE_FRILLS 3485#if !ENABLE_MINIMAL
3511 case CSI_74: 3486 case CSI_74:
3512 process_window_ops (arg, nargs); 3487 process_window_ops (arg, nargs);
3513 break; 3488 break;
3514#endif 3489#endif
3515 3490
… …
3522 break; 3497 break;
3523 } 3498 }
3524} 3499}
3525/*}}} */ 3500/*}}} */
3526 3501
3527#if ENABLE_FRILLS 3502#if !ENABLE_MINIMAL
3528/* ARGSUSED */ 3503/* ARGSUSED */
3529void 3504void
3530rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3505rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3531{ 3506{
3532 int x, y; 3507 int x, y;
… …
3573 default: 3548 default:
3574 if (args[0] >= 24) /* set height (chars) */ 3549 if (args[0] >= 24) /* set height (chars) */
3575 set_widthheight ((unsigned int)width, 3550 set_widthheight ((unsigned int)width,
3576 (unsigned int) (args[1] * fheight)); 3551 (unsigned int) (args[1] * fheight));
3577 break; 3552 break;
3578
3579 3553
3580 /* 3554 /*
3581 * reports - some output format copied from XTerm 3555 * reports - some output format copied from XTerm
3582 */ 3556 */
3583 case 11: /* report window state */ 3557 case 11: /* report window state */
… …
3721void 3695void
3722rxvt_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)
3723{ 3697{
3724 if (str[0] == '?' && !str[1]) 3698 if (str[0] == '?' && !str[1])
3725 { 3699 {
3726 rxvt_rgba c; 3700 rgba c;
3727 pix_colors_focused[color].get (this, c); 3701 pix_colors_focused[color].get (c);
3728 3702
3729#if XFT 3703#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC) 3704 if (c.a != rgba::MAX_CC)
3731 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3705 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else 3706 else
3733#endif 3707#endif
3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3708 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3735 } 3709 }
… …
3853 break; 3827 break;
3854#endif 3828#endif
3855#if TRANSPARENT && TINTING 3829#if TRANSPARENT && TINTING
3856 case URxvt_Color_tint: 3830 case URxvt_Color_tint:
3857 process_color_seq (op, Color_tint, str, resp); 3831 process_color_seq (op, Color_tint, str, resp);
3832
3858 check_our_parents (); 3833 check_our_parents ();
3834
3859 if (am_transparent) 3835 if (am_transparent)
3860 want_full_refresh = want_refresh = 1; 3836 want_full_refresh = want_refresh = 1;
3837
3861 break; 3838 break;
3862#endif 3839#endif
3863 3840
3864 case Rxvt_Pixmap: 3841 case Rxvt_Pixmap:
3865 { 3842 {
… …
3944 op, 3921 op,
3945 rs[Rs_name], VERSION[0], VERSION[2], 3922 rs[Rs_name], VERSION[0], VERSION[2],
3946 resp); 3923 resp);
3947 break; 3924 break;
3948 3925
3949#if ENABLE_FRILLS 3926#if !ENABLE_MINIMAL
3950 case URxvt_locale: 3927 case URxvt_locale:
3951 if (query) 3928 if (query)
3952 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);
3953 else 3930 else
3954 { 3931 {
… …
4318 scr_color (Color_bg, Color_bg); 4295 scr_color (Color_bg, Color_bg);
4319 break; 4296 break;
4320 4297
4321 //case 50: // not variable spacing 4298 //case 50: // not variable spacing
4322 4299
4323#if ENABLE_FRILLS 4300#if !ENABLE_MINIMAL
4324 case 90: 4301 case 90:
4325 case 91: /* set bright fg color */ 4302 case 91: /* set bright fg color */
4326 case 92: 4303 case 92:
4327 case 93: 4304 case 93:
4328 case 94: 4305 case 94:

Diff Legend

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