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.289 by root, Sat Jan 28 20:36:21 2006 UTC vs.
Revision 1.303 by root, Tue Jan 31 21:47:56 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>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
… …
227# if !UNICODE3 226# if !UNICODE3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089 } 1095 }
1090} 1096}
1091#endif 1097#endif
1092 1098
1093#if HAVE_SCHED_YIELD 1099#if LINUX_YIELD_HACK
1094static struct event_handler 1100static struct event_handler
1095{ 1101{
1096 check_watcher cw_yield; 1102 check_watcher yield_ev;
1097 1103
1098 void yield (check_watcher &w) 1104 void yield_cb (check_watcher &w)
1099 { 1105 {
1100 sched_yield (); 1106 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than
1108 // ones with high nice levels.
1109
1110 struct timespec ts = { 0, 0 };
1111 nanosleep (&ts, 0);
1112
1101 w.stop (); 1113 w.stop ();
1102 } 1114 }
1103 1115
1104 event_handler () 1116 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1117 : yield_ev (this, &event_handler::yield_cb)
1106 { 1118 {
1107 } 1119 }
1108} event_handler; 1120} event_handler;
1109#endif 1121#endif
1110 1122
… …
1130 cmdbuf_endp += r; 1142 cmdbuf_endp += r;
1131 return true; 1143 return true;
1132 } 1144 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1145 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1146 {
1135#if HAVE_SCHED_YIELD 1147#if LINUX_YIELD_HACK
1136 if (display->is_local) 1148 if (display->is_local)
1137 event_handler.cw_yield.start (); 1149 event_handler.yield_ev.start ();
1138#endif 1150#endif
1139 } 1151 }
1140 else 1152 else
1141 { 1153 {
1142 pty_ev.stop (); 1154 pty_ev.stop ();
… …
2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2456 &nitems, &bytes_after, &prop) == Success); 2468 &nitems, &bytes_after, &prop) == Success);
2457 2469
2458 if (!i || prop == NULL 2470 if (!i || prop == NULL
2459#if TINTING 2471#if TINTING
2460 || !rs[Rs_color + Color_tint] 2472 || !ISSET_PIXCOLOR (Color_tint)
2461#endif 2473#endif
2462 ) 2474 )
2463 have_pixmap = 0; 2475 have_pixmap = 0;
2464 else 2476 else
2465 { 2477 {
… …
2531 XFreePixmap (xdisp, pixmap); 2543 XFreePixmap (xdisp, pixmap);
2532 2544
2533#if TINTING 2545#if TINTING
2534 if (ISSET_PIXCOLOR (Color_tint)) 2546 if (ISSET_PIXCOLOR (Color_tint))
2535 { 2547 {
2536 unsigned short rm, gm, bm;
2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2538 2549
2550 rgba c;
2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm); 2551 pix_colors_focused [Color_tint].get (c);
2540 2552
2541 ShadeXImage (this, image, shade, rm, gm, bm); 2553 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2542 } 2554 }
2543#endif 2555#endif
2544 2556
2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); 2557 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); 2558 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
… …
2567 * InheritPixmap transparency 2579 * InheritPixmap transparency
2568 */ 2580 */
2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570 { 2582 {
2571 oldp = parent[i]; 2583 oldp = parent[i];
2572 XQueryTree (xdisp, parent[i - 1], &root, 2584 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2573 &parent[i], &list, &n);
2574 XFree (list); 2585 XFree (list);
2575 2586
2576 if (parent[i] == display->root) 2587 if (parent[i] == display->root)
2577 { 2588 {
2578 if (oldp != None) 2589 if (oldp != None)
… …
2586 } 2597 }
2587 2598
2588 n = 0; 2599 n = 0;
2589 2600
2590 if (pchanged) 2601 if (pchanged)
2591 {
2592 for (; n < (unsigned int)i; n++) 2602 for (; n < (unsigned int)i; n++)
2593 { 2603 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr); 2604 XGetWindowAttributes (xdisp, parent[n], &wattr);
2605
2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2606 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596 { 2607 {
2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2608 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598 break; 2609 break;
2599 } 2610 }
2600 } 2611 }
2601 }
2602 2612
2603 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2613 if (n > (sizeof (parent) / sizeof (parent[0])))
2604 { 2614 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2615 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2616 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0; 2617 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */ 2618 /* XXX: also turn off Opt_transparent? */
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 3094 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 3095 break;
3086 case '+': 3096 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 3097 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 3098 break;
3089#if ENABLE_FRILLS 3099#if !ENABLE_MINIMAL
3090 case '6': 3100 case '6':
3091 scr_backindex (); 3101 scr_backindex ();
3092 break; 3102 break;
3093#endif 3103#endif
3094 case '7': 3104 case '7':
3095 scr_cursor (SAVE); 3105 scr_cursor (SAVE);
3096 break; 3106 break;
3097 case '8': 3107 case '8':
3098 scr_cursor (RESTORE); 3108 scr_cursor (RESTORE);
3099 break; 3109 break;
3100#if ENABLE_FRILLS 3110#if !ENABLE_MINIMAL
3101 case '9': 3111 case '9':
3102 scr_forwardindex (); 3112 scr_forwardindex ();
3103 break; 3113 break;
3104#endif 3114#endif
3105 case '=': 3115 case '=':
… …
3498 break; 3508 break;
3499 case CSI_75: 3509 case CSI_75:
3500 scr_cursor (RESTORE); 3510 scr_cursor (RESTORE);
3501 break; 3511 break;
3502 3512
3503#if ENABLE_FRILLS 3513#if !ENABLE_MINIMAL
3504 case CSI_74: 3514 case CSI_74:
3505 process_window_ops (arg, nargs); 3515 process_window_ops (arg, nargs);
3506 break; 3516 break;
3507#endif 3517#endif
3508 3518
… …
3515 break; 3525 break;
3516 } 3526 }
3517} 3527}
3518/*}}} */ 3528/*}}} */
3519 3529
3520#if ENABLE_FRILLS 3530#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3531/* ARGSUSED */
3522void 3532void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3533rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3534{
3525 int x, y; 3535 int x, y;
… …
3566 default: 3576 default:
3567 if (args[0] >= 24) /* set height (chars) */ 3577 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3578 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3579 (unsigned int) (args[1] * fheight));
3570 break; 3580 break;
3571
3572 3581
3573 /* 3582 /*
3574 * reports - some output format copied from XTerm 3583 * reports - some output format copied from XTerm
3575 */ 3584 */
3576 case 11: /* report window state */ 3585 case 11: /* report window state */
… …
3714void 3723void
3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3724rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3716{ 3725{
3717 if (str[0] == '?' && !str[1]) 3726 if (str[0] == '?' && !str[1])
3718 { 3727 {
3719 unsigned short r, g, b; 3728 rgba c;
3720 pix_colors_focused[color].get (this, r, g, b); 3729 pix_colors_focused[color].get (c);
3730
3731#if XFT
3732 if (c.a != rgba::MAX_CC)
3733 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3734 else
3735#endif
3721 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3736 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3722 } 3737 }
3723 else 3738 else
3724 set_window_color (color, str); 3739 set_window_color (color, str);
3725} 3740}
3726 3741
… …
3767 &nitems, &bytes_after, &value) == Success 3782 &nitems, &bytes_after, &value) == Success
3768 && actual_type != None 3783 && actual_type != None
3769 && actual_format == 8) 3784 && actual_format == 8)
3770 str = (const char *)(value); 3785 str = (const char *)(value);
3771 3786
3772 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3787 tt_printf ("\033]%d;%s%c", op, str, resp);
3773 3788
3774 XFree (value); 3789 XFree (value);
3775 } 3790 }
3776 else 3791 else
3777 { 3792 {
… …
3801 break; 3816 break;
3802 3817
3803 if ((buf = strchr (name, ';')) != NULL) 3818 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 3819 *buf++ = '\0';
3805 3820
3806 if (name[0] == '?' && !name[1]) 3821 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 } 3822 }
3815 break; 3823 break;
3816 case XTerm_Color00: 3824 case XTerm_Color00:
3817 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3825 process_color_seq (op, Color_fg, str, resp);
3818 break; 3826 break;
3819 case XTerm_Color01: 3827 case XTerm_Color01:
3820 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3828 process_color_seq (op, Color_bg, str, resp);
3821 break; 3829 break;
3822#ifndef NO_CURSORCOLOR 3830#ifndef NO_CURSORCOLOR
3823 case XTerm_Color_cursor: 3831 case XTerm_Color_cursor:
3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3832 process_color_seq (op, Color_cursor, str, resp);
3825 break; 3833 break;
3826#endif 3834#endif
3827 case XTerm_Color_pointer_fg: 3835 case XTerm_Color_pointer_fg:
3828 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3836 process_color_seq (op, Color_pointer_fg, str, resp);
3829 break; 3837 break;
3830 case XTerm_Color_pointer_bg: 3838 case XTerm_Color_pointer_bg:
3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3839 process_color_seq (op, Color_pointer_bg, str, resp);
3832 break; 3840 break;
3833#ifndef NO_BOLD_UNDERLINE_REVERSE 3841#ifndef NO_BOLD_UNDERLINE_REVERSE
3834 case XTerm_Color_RV: 3842 case XTerm_Color_RV:
3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3843 process_color_seq (op, Color_RV, str, resp);
3836 break; 3844 break;
3837 case Rxvt_Color_BD: 3845 case Rxvt_Color_BD:
3838 case URxvt_Color_BD: 3846 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp); 3847 process_color_seq (op, Color_BD, str, resp);
3840 break; 3848 break;
3841 case Rxvt_Color_UL: 3849 case Rxvt_Color_UL:
3842 case URxvt_Color_UL: 3850 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp); 3851 process_color_seq (op, Color_UL, str, resp);
3844 break; 3852 break;
3845 case URxvt_Color_IT: 3853 case URxvt_Color_IT:
3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3854 process_color_seq (op, Color_IT, str, resp);
3847 break; 3855 break;
3848#endif 3856#endif
3849#if TRANSPARENT && TINTING 3857#if TRANSPARENT && TINTING
3850 case URxvt_Color_tint: 3858 case URxvt_Color_tint:
3851 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3859 process_color_seq (op, Color_tint, str, resp);
3860
3852 check_our_parents (); 3861 check_our_parents ();
3862
3853 if (am_transparent) 3863 if (am_transparent)
3854 want_full_refresh = want_refresh = 1; 3864 want_full_refresh = want_refresh = 1;
3865
3855 break; 3866 break;
3856#endif 3867#endif
3857 3868
3858 case Rxvt_Pixmap: 3869 case Rxvt_Pixmap:
3859 { 3870 {
… …
3933 break; 3944 break;
3934 3945
3935 case URxvt_version: 3946 case URxvt_version:
3936 if (query) 3947 if (query)
3937 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3948 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3938 URxvt_version, 3949 op,
3939 rs[Rs_name],
3940 VERSION[0], VERSION[2], 3950 rs[Rs_name], VERSION[0], VERSION[2],
3941 resp); 3951 resp);
3942 break; 3952 break;
3943 3953
3944#if ENABLE_FRILLS 3954#if !ENABLE_MINIMAL
3945 case URxvt_locale: 3955 case URxvt_locale:
3946 if (query) 3956 if (query)
3947 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3957 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3948 else 3958 else
3949 { 3959 {
3950 set_locale (str); 3960 set_locale (str);
3951 pty->set_utf8_mode (enc_utf8); 3961 pty->set_utf8_mode (enc_utf8);
3952 init_xlocale (); 3962 init_xlocale ();
… …
4313 scr_color (Color_bg, Color_bg); 4323 scr_color (Color_bg, Color_bg);
4314 break; 4324 break;
4315 4325
4316 //case 50: // not variable spacing 4326 //case 50: // not variable spacing
4317 4327
4318#if ENABLE_FRILLS 4328#if !ENABLE_MINIMAL
4319 case 90: 4329 case 90:
4320 case 91: /* set bright fg color */ 4330 case 91: /* set bright fg color */
4321 case 92: 4331 case 92:
4322 case 93: 4332 case 93:
4323 case 94: 4333 case 94:

Diff Legend

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