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.298 by root, Tue Jan 31 18:36:35 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 ();
… …
2541 if (ISSET_PIXCOLOR (Color_tint)) 2536 if (ISSET_PIXCOLOR (Color_tint))
2542 { 2537 {
2543 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2544 2539
2545 rgba c; 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
… …
3572 if (args[0] >= 24) /* set height (chars) */ 3567 if (args[0] >= 24) /* set height (chars) */
3573 set_widthheight ((unsigned int)width, 3568 set_widthheight ((unsigned int)width,
3574 (unsigned int) (args[1] * fheight)); 3569 (unsigned int) (args[1] * fheight));
3575 break; 3570 break;
3576 3571
3577
3578 /* 3572 /*
3579 * reports - some output format copied from XTerm 3573 * reports - some output format copied from XTerm
3580 */ 3574 */
3581 case 11: /* report window state */ 3575 case 11: /* report window state */
3582 XGetWindowAttributes (xdisp, parent[0], &wattr); 3576 XGetWindowAttributes (xdisp, parent[0], &wattr);
… …
3720rxvt_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)
3721{ 3715{
3722 if (str[0] == '?' && !str[1]) 3716 if (str[0] == '?' && !str[1])
3723 { 3717 {
3724 rgba c; 3718 rgba c;
3725 pix_colors_focused[color].get (this, c); 3719 pix_colors_focused[color].get (c);
3726 3720
3727#if XFT 3721#if XFT
3728 if (c.a != rgba::MAX_CC) 3722 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); 3723 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3730 else 3724 else

Diff Legend

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