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.302 by root, Tue Jan 31 21:35:39 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
… …
1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1096 } 1091 }
1097} 1092}
1098#endif 1093#endif
1099 1094
1100#if HAVE_SCHED_YIELD 1095#if LINUX_YIELD_HACK
1101static struct event_handler 1096static struct event_handler
1102{ 1097{
1103 check_watcher cw_yield; 1098 check_watcher yield_ev;
1104 1099
1105 void yield (check_watcher &w) 1100 void yield_cb (check_watcher &w)
1106 { 1101 {
1107 sched_yield (); 1102 usleep (0);
1108 w.stop (); 1103 w.stop ();
1109 } 1104 }
1110 1105
1111 event_handler () 1106 event_handler ()
1112 : cw_yield (this, &event_handler::yield) 1107 : yield_ev (this, &event_handler::yield_cb)
1113 { 1108 {
1114 } 1109 }
1115} event_handler; 1110} event_handler;
1116#endif 1111#endif
1117 1112
… …
1137 cmdbuf_endp += r; 1132 cmdbuf_endp += r;
1138 return true; 1133 return true;
1139 } 1134 }
1140 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1135 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1141 { 1136 {
1142#if HAVE_SCHED_YIELD 1137#if LINUX_YIELD_HACK
1143 if (display->is_local) 1138 if (display->is_local)
1144 event_handler.cw_yield.start (); 1139 event_handler.yield_ev.start ();
1145#endif 1140#endif
1146 } 1141 }
1147 else 1142 else
1148 { 1143 {
1149 pty_ev.stop (); 1144 pty_ev.stop ();
… …
2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2457 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463 &nitems, &bytes_after, &prop) == Success); 2458 &nitems, &bytes_after, &prop) == Success);
2464 2459
2465 if (!i || prop == NULL 2460 if (!i || prop == NULL
2466#if TINTING 2461#if TINTING
2467 || !rs[Rs_color + Color_tint] 2462 || !ISSET_PIXCOLOR (Color_tint)
2468#endif 2463#endif
2469 ) 2464 )
2470 have_pixmap = 0; 2465 have_pixmap = 0;
2471 else 2466 else
2472 { 2467 {
… …
2538 XFreePixmap (xdisp, pixmap); 2533 XFreePixmap (xdisp, pixmap);
2539 2534
2540#if TINTING 2535#if TINTING
2541 if (ISSET_PIXCOLOR (Color_tint)) 2536 if (ISSET_PIXCOLOR (Color_tint))
2542 { 2537 {
2543 rxvt_rgba c;
2544 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2545 2539
2540 rgba c;
2546 pix_colors_focused[Color_tint].get (this, c); 2541 pix_colors_focused [Color_tint].get (c);
2547 2542
2548 ShadeXImage (this, image, shade, c.r, c.g, c.b); 2543 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2549 } 2544 }
2550#endif 2545#endif
2551 2546
… …
2574 * InheritPixmap transparency 2569 * InheritPixmap transparency
2575 */ 2570 */
2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2577 { 2572 {
2578 oldp = parent[i]; 2573 oldp = parent[i];
2579 XQueryTree (xdisp, parent[i - 1], &root, 2574 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2580 &parent[i], &list, &n);
2581 XFree (list); 2575 XFree (list);
2582 2576
2583 if (parent[i] == display->root) 2577 if (parent[i] == display->root)
2584 { 2578 {
2585 if (oldp != None) 2579 if (oldp != None)
… …
2593 } 2587 }
2594 2588
2595 n = 0; 2589 n = 0;
2596 2590
2597 if (pchanged) 2591 if (pchanged)
2598 {
2599 for (; n < (unsigned int)i; n++) 2592 for (; n < (unsigned int)i; n++)
2600 { 2593 {
2601 XGetWindowAttributes (xdisp, parent[n], &wattr); 2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595
2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2596 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2603 { 2597 {
2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2598 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2605 break; 2599 break;
2606 } 2600 }
2607 } 2601 }
2608 }
2609 2602
2610 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2603 if (n > (sizeof (parent) / sizeof (parent[0])))
2611 { 2604 {
2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2614 am_transparent = 0; 2607 am_transparent = 0;
2615 /* XXX: also turn off Opt_transparent? */ 2608 /* XXX: also turn off Opt_transparent? */
… …
3091 scr_charset_set (2, (unsigned int)cmd_getc ()); 3084 scr_charset_set (2, (unsigned int)cmd_getc ());
3092 break; 3085 break;
3093 case '+': 3086 case '+':
3094 scr_charset_set (3, (unsigned int)cmd_getc ()); 3087 scr_charset_set (3, (unsigned int)cmd_getc ());
3095 break; 3088 break;
3096#if ENABLE_FRILLS 3089#if !ENABLE_MINIMAL
3097 case '6': 3090 case '6':
3098 scr_backindex (); 3091 scr_backindex ();
3099 break; 3092 break;
3100#endif 3093#endif
3101 case '7': 3094 case '7':
3102 scr_cursor (SAVE); 3095 scr_cursor (SAVE);
3103 break; 3096 break;
3104 case '8': 3097 case '8':
3105 scr_cursor (RESTORE); 3098 scr_cursor (RESTORE);
3106 break; 3099 break;
3107#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3108 case '9': 3101 case '9':
3109 scr_forwardindex (); 3102 scr_forwardindex ();
3110 break; 3103 break;
3111#endif 3104#endif
3112 case '=': 3105 case '=':
… …
3505 break; 3498 break;
3506 case CSI_75: 3499 case CSI_75:
3507 scr_cursor (RESTORE); 3500 scr_cursor (RESTORE);
3508 break; 3501 break;
3509 3502
3510#if ENABLE_FRILLS 3503#if !ENABLE_MINIMAL
3511 case CSI_74: 3504 case CSI_74:
3512 process_window_ops (arg, nargs); 3505 process_window_ops (arg, nargs);
3513 break; 3506 break;
3514#endif 3507#endif
3515 3508
… …
3522 break; 3515 break;
3523 } 3516 }
3524} 3517}
3525/*}}} */ 3518/*}}} */
3526 3519
3527#if ENABLE_FRILLS 3520#if !ENABLE_MINIMAL
3528/* ARGSUSED */ 3521/* ARGSUSED */
3529void 3522void
3530rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3523rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3531{ 3524{
3532 int x, y; 3525 int x, y;
… …
3573 default: 3566 default:
3574 if (args[0] >= 24) /* set height (chars) */ 3567 if (args[0] >= 24) /* set height (chars) */
3575 set_widthheight ((unsigned int)width, 3568 set_widthheight ((unsigned int)width,
3576 (unsigned int) (args[1] * fheight)); 3569 (unsigned int) (args[1] * fheight));
3577 break; 3570 break;
3578
3579 3571
3580 /* 3572 /*
3581 * reports - some output format copied from XTerm 3573 * reports - some output format copied from XTerm
3582 */ 3574 */
3583 case 11: /* report window state */ 3575 case 11: /* report window state */
… …
3721void 3713void
3722rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3714rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3723{ 3715{
3724 if (str[0] == '?' && !str[1]) 3716 if (str[0] == '?' && !str[1])
3725 { 3717 {
3726 rxvt_rgba c; 3718 rgba c;
3727 pix_colors_focused[color].get (this, c); 3719 pix_colors_focused[color].get (c);
3728 3720
3729#if XFT 3721#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC) 3722 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); 3723 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else 3724 else
3733#endif 3725#endif
3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3726 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3735 } 3727 }
… …
3853 break; 3845 break;
3854#endif 3846#endif
3855#if TRANSPARENT && TINTING 3847#if TRANSPARENT && TINTING
3856 case URxvt_Color_tint: 3848 case URxvt_Color_tint:
3857 process_color_seq (op, Color_tint, str, resp); 3849 process_color_seq (op, Color_tint, str, resp);
3850
3858 check_our_parents (); 3851 check_our_parents ();
3852
3859 if (am_transparent) 3853 if (am_transparent)
3860 want_full_refresh = want_refresh = 1; 3854 want_full_refresh = want_refresh = 1;
3855
3861 break; 3856 break;
3862#endif 3857#endif
3863 3858
3864 case Rxvt_Pixmap: 3859 case Rxvt_Pixmap:
3865 { 3860 {
… …
3944 op, 3939 op,
3945 rs[Rs_name], VERSION[0], VERSION[2], 3940 rs[Rs_name], VERSION[0], VERSION[2],
3946 resp); 3941 resp);
3947 break; 3942 break;
3948 3943
3949#if ENABLE_FRILLS 3944#if !ENABLE_MINIMAL
3950 case URxvt_locale: 3945 case URxvt_locale:
3951 if (query) 3946 if (query)
3952 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3947 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3953 else 3948 else
3954 { 3949 {
… …
4318 scr_color (Color_bg, Color_bg); 4313 scr_color (Color_bg, Color_bg);
4319 break; 4314 break;
4320 4315
4321 //case 50: // not variable spacing 4316 //case 50: // not variable spacing
4322 4317
4323#if ENABLE_FRILLS 4318#if !ENABLE_MINIMAL
4324 case 90: 4319 case 90:
4325 case 91: /* set bright fg color */ 4320 case 91: /* set bright fg color */
4326 case 92: 4321 case 92:
4327 case 93: 4322 case 93:
4328 case 94: 4323 case 94:

Diff Legend

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