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.210 by root, Tue Dec 20 20:58:31 2005 UTC vs.
Revision 1.223 by root, Sun Jan 1 05:28:28 2006 UTC

… …
54# include "keyboard.h" 54# include "keyboard.h"
55#endif 55#endif
56 56
57#include <csignal> 57#include <csignal>
58 58
59#define HAVE_SCHED_YIELD 1 //D//TODO//FIXME
60#if HAVE_SCHED_YIELD
61# include <sched.h>
62#endif
63
59/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
60 65
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62 67
63// exception thrown when the command parser runs out of input data 68// exception thrown when the command parser runs out of input data
… …
135rxvt_term::iso14755_54 (int x, int y) 140rxvt_term::iso14755_54 (int x, int y)
136{ 141{
137 x = Pixel2Col (x); 142 x = Pixel2Col (x);
138 y = Pixel2Row (y); 143 y = Pixel2Row (y);
139 144
140 if (x < 0 || x >= ncol 145 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= nrow) 146 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 147 return;
143 148
144 for (;;) 149 for (;;)
145 { 150 {
146 const line_t &l = save[y + saveLines - view_start]; 151 const line_t &l = ROW(y - view_start);
147 152
148 text_t t = l.t[x]; 153 text_t t = l.t[x];
149 154
150 if (t != NOCHAR || !x) 155 if (t != NOCHAR || !x)
151 { 156 {
152 iso14755_51 (l.t[x], l.r[x]); 157 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 158 iso14755buf = ISO_14755_54;
154 break; 159 break;
155 } 160 }
156 161
157 x--; 162 x--;
158 } 163 }
159
160} 164}
161#endif
162 165
163#if ENABLE_OVERLAY
164void 166void
165rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 167rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
166{ 168{
167 rxvt_fontset *fs = FONTSET (r); 169 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)]; 170 rxvt_font *f = (*fs)[fs->find_font (ch)];
169 wchar_t *chr, *alloc, ch2, *fname; 171 wchar_t *chr, *alloc, ch2, *fname;
170 int len; 172 int len;
171 173
172 fname = rxvt_utf8towcs (f->name); 174 fname = rxvt_utf8towcs (f->name);
173 175
174#if ENABLE_COMBINING 176# if ENABLE_COMBINING
175 if (IS_COMPOSE (ch)) 177 if (IS_COMPOSE (ch))
176 { 178 {
177 len = rxvt_composite.expand (ch, 0); 179 len = rxvt_composite.expand (ch, 0);
178 alloc = chr = new wchar_t[len]; 180 alloc = chr = new wchar_t[len];
179 rxvt_composite.expand (ch, chr); 181 rxvt_composite.expand (ch, chr);
180 } 182 }
181 else 183 else
182#endif 184# endif
183 { 185 {
184 ch2 = ch; 186 ch2 = ch;
185 187
186 alloc = 0; 188 alloc = 0;
187 chr = &ch2; 189 chr = &ch2;
188 len = 1; 190 len = 1;
189 } 191 }
190 192
193 char attr[80]; // plenty
194
195 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
196 (int)r,
197 fgcolor_of (r), bgcolor_of (r),
198 r & RS_Bold ? " bold" : "",
199 r & RS_Italic ? " italic" : "",
200 r & RS_Blink ? " blink" : "",
201 r & RS_RVid ? " rvid" : "",
202 r & RS_Uline ? " uline" : "",
203 r & RS_Careful ? " careful" : "");
204
191 int width = wcswidth (fname, wcslen (fname)); 205 int width = wcswidth (fname, wcslen (fname));
192 206
193 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 207 max_it (width, 8+5); // for char + hey
208 max_it (width, strlen (attr));
209
210 if (y >= 0)
211 {
212 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
213 x = 0;
214 }
215
216 scr_overlay_new (x, y, width, len + 2);
194 217
195 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 218 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
196 219
197 for (int y = 0; y < len; y++) 220 for (int y = 0; y < len; y++)
198 { 221 {
… …
201 ch = *chr++; 224 ch = *chr++;
202 225
203 sprintf (buf, "%8x", ch); 226 sprintf (buf, "%8x", ch);
204 scr_overlay_set (0, y, buf); 227 scr_overlay_set (0, y, buf);
205 scr_overlay_set (9, y, '='); 228 scr_overlay_set (9, y, '=');
206#if !UNICODE3 229# if !UNICODE3
207 if (ch >= 0x10000) 230 if (ch >= 0x10000)
208 ch = 0xfffd; 231 ch = 0xfffd;
209#endif 232# endif
210 scr_overlay_set (11, y, ch, r); 233 scr_overlay_set (11, y, ch, r);
211 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
212 } 235 }
213 236
237 scr_overlay_set (0, len , attr);
214 scr_overlay_set (0, len, fname); 238 scr_overlay_set (0, len + 1, fname);
215 239
216 free (fname); 240 free (fname);
217 241
218#if ENABLE_COMBINING 242# if ENABLE_COMBINING
219 if (alloc) 243 if (alloc)
220 delete [] alloc; 244 delete [] alloc;
221#endif 245# endif
222} 246}
223#endif 247#endif
224 248
225void 249void
226rxvt_term::commit_iso14755 () 250rxvt_term::commit_iso14755 ()
… …
845 } 869 }
846 870
847 if (len <= 0) 871 if (len <= 0)
848 return; /* not mapped */ 872 return; /* not mapped */
849 873
850 if (options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
851 if (view_start) 875 if (view_start)
852 { 876 {
853 view_start = 0; 877 view_start = 0;
854 want_refresh = 1; 878 want_refresh = 1;
855 } 879 }
… …
1061 1085
1062 memmove (cmdbuf_base, cmdbuf_ptr, n); 1086 memmove (cmdbuf_base, cmdbuf_ptr, n);
1063 cmdbuf_ptr = cmdbuf_base; 1087 cmdbuf_ptr = cmdbuf_base;
1064 cmdbuf_endp = cmdbuf_ptr + n; 1088 cmdbuf_endp = cmdbuf_ptr + n;
1065 1089
1066 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1090 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1067 1091
1068 if (n > 0) 1092 if (r > 0)
1069 { 1093 {
1070 cmdbuf_endp += n; 1094 cmdbuf_endp += r;
1071 return true; 1095 return true;
1072 } 1096 }
1073 else if (n < 0 && errno != EAGAIN) 1097 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1098 {
1099#if HAVE_SCHED_YIELD
1100 sched_yield ();
1101#endif
1102 }
1103 else
1104 {
1105 pty_ev.stop ();
1106
1107 if (!OPTION (Opt_hold))
1074 destroy (); 1108 destroy ();
1109 }
1075 1110
1076 return false; 1111 return false;
1077} 1112}
1078 1113
1079void 1114void
… …
1099 recolour_cursor (); 1134 recolour_cursor ();
1100 1135
1101#ifdef POINTER_BLANK 1136#ifdef POINTER_BLANK
1102 hidden_pointer = 0; 1137 hidden_pointer = 0;
1103 1138
1104 if (options & Opt_pointerBlank) 1139 if (OPTION (Opt_pointerBlank))
1105 pointer_ev.start (NOW + pointerBlankDelay); 1140 pointer_ev.start (NOW + pointerBlankDelay);
1106#endif 1141#endif
1107} 1142}
1108 1143
1109#ifdef POINTER_BLANK 1144#ifdef POINTER_BLANK
1110void 1145void
1111rxvt_term::pointer_blank () 1146rxvt_term::pointer_blank ()
1112{ 1147{
1113 if (! (options & Opt_pointerBlank)) 1148 if (! OPTION (Opt_pointerBlank))
1114 return; 1149 return;
1115 1150
1116 XDefineCursor (display->display, vt, display->blank_cursor); 1151 XDefineCursor (display->display, vt, display->blank_cursor);
1117 XFlush (display->display); 1152 XFlush (display->display);
1118 1153
… …
1216 1251
1217 SET_R (this); 1252 SET_R (this);
1218 SET_LOCALE (locale); 1253 SET_LOCALE (locale);
1219 1254
1220#if defined(CURSOR_BLINK) 1255#if defined(CURSOR_BLINK)
1221 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1256 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1222 { 1257 {
1223 if (hidden_cursor) 1258 if (hidden_cursor)
1224 { 1259 {
1225 hidden_cursor = 0; 1260 hidden_cursor = 0;
1226 want_refresh = 1; 1261 want_refresh = 1;
… …
1229 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1264 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1230 } 1265 }
1231#endif 1266#endif
1232 1267
1233#if defined(POINTER_BLANK) 1268#if defined(POINTER_BLANK)
1234 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1269 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1235 { 1270 {
1236 if (ev.type == MotionNotify 1271 if (ev.type == MotionNotify
1237 || ev.type == ButtonPress 1272 || ev.type == ButtonPress
1238 || ev.type == ButtonRelease) 1273 || ev.type == ButtonRelease)
1239 if (hidden_pointer) 1274 if (hidden_pointer)
… …
1435 seen_resize = 1; 1470 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1472 }
1438 1473
1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1474#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1440 if (options & Opt_transparent) 1475 if (OPTION (Opt_transparent))
1441 check_our_parents (); 1476 check_our_parents ();
1442#endif 1477#endif
1443 } 1478 }
1444 break; 1479 break;
1445 1480
… …
1601 } 1636 }
1602 1637
1603 scroll_selection_lines = Pixel2Height (dist) 1638 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1639 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1640 + 1;
1606 MIN_IT (scroll_selection_lines, 1641 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1642 SELECTION_SCROLL_MAX_LINES);
1608 } 1643 }
1609 else 1644 else
1610 { 1645 {
1611 /* we are within the text window, so we 1646 /* we are within the text window, so we
… …
1654 IMSetStatusPosition (); 1689 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context); 1690 XSetICFocus (Input_Context);
1656 } 1691 }
1657#endif 1692#endif
1658#if CURSOR_BLINK 1693#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink) 1694 if (OPTION (Opt_cursorBlink))
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1695 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif 1696#endif
1662#if OFF_FOCUS_FADING 1697#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade]) 1698 if (rs[Rs_fade])
1664 { 1699 {
… …
1686#if USE_XIM 1721#if USE_XIM
1687 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context); 1723 XUnsetICFocus (Input_Context);
1689#endif 1724#endif
1690#if CURSOR_BLINK 1725#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink) 1726 if (OPTION (Opt_cursorBlink))
1692 cursor_blink_ev.stop (); 1727 cursor_blink_ev.stop ();
1693 hidden_cursor = 0; 1728 hidden_cursor = 0;
1694#endif 1729#endif
1695#if OFF_FOCUS_FADING 1730#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade]) 1731 if (rs[Rs_fade])
… …
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1755 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1721 return; 1756 return;
1722 1757
1723 /* FALLTHROUGH */ 1758 /* FALLTHROUGH */
1724 case ReparentNotify: 1759 case ReparentNotify:
1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1760 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1726 want_refresh = want_full_refresh = 1; 1761 want_refresh = want_full_refresh = 1;
1727 break; 1762 break;
1728 } 1763 }
1729} 1764}
1730#endif 1765#endif
… …
2072 2107
2073 v = ev.button == Button4 ? UP : DN; 2108 v = ev.button == Button4 ? UP : DN;
2074 2109
2075 if (ev.state & ShiftMask) 2110 if (ev.state & ShiftMask)
2076 i = 1; 2111 i = 1;
2077 else if (options & Opt_mouseWheelScrollPage) 2112 else if (OPTION (Opt_mouseWheelScrollPage))
2078 i = nrow - 1; 2113 i = nrow - 1;
2079 else 2114 else
2080 i = 5; 2115 i = 5;
2081 2116
2082# ifdef MOUSE_SLIP_WHEELING 2117# ifdef MOUSE_SLIP_WHEELING
… …
2368 XWindowAttributes wattr, wrootattr; 2403 XWindowAttributes wattr, wrootattr;
2369 dDisp; 2404 dDisp;
2370 2405
2371 pchanged = 0; 2406 pchanged = 0;
2372 2407
2373 if (!(options & Opt_transparent)) 2408 if (!OPTION (Opt_transparent))
2374 return pchanged; /* Don't try any more */ 2409 return pchanged; /* Don't try any more */
2375 2410
2376 XGetWindowAttributes (disp, display->root, &wrootattr); 2411 XGetWindowAttributes (disp, display->root, &wrootattr);
2377 rootdepth = wrootattr.depth; 2412 rootdepth = wrootattr.depth;
2378 2413
… …
2452 nh += sy; 2487 nh += sy;
2453 ny = -sy; 2488 ny = -sy;
2454 sy = 0; 2489 sy = 0;
2455 } 2490 }
2456 2491
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2492 min_it (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2493 min_it (nh, (unsigned int) (wrootattr.height - sy));
2459 2494
2460 XSync (disp, False); 2495 XSync (disp, False);
2461 allowedxerror = -1; 2496 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2497 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463 2498
… …
2656 if (ch == C0_LF) 2691 if (ch == C0_LF)
2657 nlines++; 2692 nlines++;
2658 2693
2659 refresh_count++; 2694 refresh_count++;
2660 2695
2661 if (!(options & Opt_jumpScroll) 2696 if (!OPTION (Opt_jumpScroll)
2662 || (refresh_count >= refresh_limit * (nrow - 1))) 2697 || (refresh_count >= refresh_limit * (nrow - 1)))
2663 { 2698 {
2664 refreshnow = true; 2699 refreshnow = true;
2665 ch = NOCHAR; 2700 ch = NOCHAR;
2666 break; 2701 break;
… …
2700 * the number of pages between refreshes is refresh_limit, which 2735 * the number of pages between refreshes is refresh_limit, which
2701 * is incremented here because we must be doing flat-out scrolling. 2736 * is incremented here because we must be doing flat-out scrolling.
2702 */ 2737 */
2703 if (refreshnow) 2738 if (refreshnow)
2704 { 2739 {
2705 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2740 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2706 refresh_limit++; 2741 refresh_limit++;
2707 else 2742 else
2708 { 2743 {
2709 flag = true; 2744 flag = true;
2710 scr_refresh (refresh_type); 2745 scr_refresh (refresh_type);
… …
3374 break; 3409 break;
3375 case 6: /* CPR requested */ 3410 case 6: /* CPR requested */
3376 scr_report_position (); 3411 scr_report_position ();
3377 break; 3412 break;
3378 case 7: /* unofficial extension */ 3413 case 7: /* unofficial extension */
3379 if (options & Opt_insecure) 3414 if (OPTION (Opt_insecure))
3380 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3415 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3381 break; 3416 break;
3382 case 8: /* unofficial extension */ 3417 case 8: /* unofficial extension */
3383 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3418 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3384 break; 3419 break;
… …
3548 break; 3583 break;
3549 case 20: /* report icon label */ 3584 case 20: /* report icon label */
3550 { 3585 {
3551 char *s; 3586 char *s;
3552 XGetIconName (disp, parent[0], &s); 3587 XGetIconName (disp, parent[0], &s);
3553 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3588 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s); 3589 XFree (s);
3555 } 3590 }
3556 break; 3591 break;
3557 case 21: /* report window title */ 3592 case 21: /* report window title */
3558 { 3593 {
3559 char *s; 3594 char *s;
3560 XFetchName (disp, parent[0], &s); 3595 XFetchName (disp, parent[0], &s);
3561 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3596 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3562 XFree (s); 3597 XFree (s);
3563 } 3598 }
3564 break; 3599 break;
3565 } 3600 }
3566} 3601}
… …
3842 // TODO, when secure mode? 3877 // TODO, when secure mode?
3843 break; 3878 break;
3844 3879
3845#ifdef MENUBAR 3880#ifdef MENUBAR
3846 case URxvt_Menu: 3881 case URxvt_Menu:
3847 if (options & Opt_insecure) 3882 if (OPTION (Opt_insecure))
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3883 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3849 break; 3884 break;
3850#endif 3885#endif
3851#if 0 3886#if 0
3852 case XTerm_dumpscreen: /* no error notices */ 3887 case XTerm_dumpscreen: /* no error notices */
… …
3868 case URxvt_italicFont: 3903 case URxvt_italicFont:
3869 case URxvt_boldItalicFont: 3904 case URxvt_boldItalicFont:
3870#endif 3905#endif
3871 if (query) 3906 if (query)
3872 tt_printf ("\33]%d;%-.250s%c", saveop, 3907 tt_printf ("\33]%d;%-.250s%c", saveop,
3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3908 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3874 ? fontset[op - URxvt_font]->fontdesc : "", 3909 ? fontset[op - URxvt_font]->fontdesc : "",
3875 resp); 3910 resp);
3876 else 3911 else
3877 { 3912 {
3878 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3913 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3884 break; 3919 break;
3885 3920
3886#if ENABLE_FRILLS 3921#if ENABLE_FRILLS
3887 case URxvt_locale: 3922 case URxvt_locale:
3888 if (query) 3923 if (query)
3889 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3924 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3890 else 3925 else
3891 { 3926 {
3892 set_locale (str); 3927 set_locale (str);
3893 pty.set_utf8_mode (enc_utf8); 3928 pty.set_utf8_mode (enc_utf8);
3894 init_xlocale (); 3929 init_xlocale ();
… …
4022 } 4057 }
4023 4058
4024 /* extra handling for values with state unkept */ 4059 /* extra handling for values with state unkept */
4025 switch (arg[i]) 4060 switch (arg[i])
4026 { 4061 {
4062#if ENABLE_STYLES
4063 case 1021:
4064 if (mode)
4065 SET_OPTION (Opt_intensityStyles);
4066 else
4067 CLR_OPTION (Opt_intensityStyles);
4068
4069 want_refresh = 1;
4070 want_full_refresh = 1;
4071 break;
4072#endif
4027 case 1048: /* alternative cursor save */ 4073 case 1048: /* alternative cursor save */
4028 case 1049: 4074 case 1049:
4029 if (options & Opt_secondaryScreen) 4075 if (OPTION (Opt_secondaryScreen))
4030 if (mode == 0) 4076 if (mode == 0)
4031 scr_cursor (RESTORE); 4077 scr_cursor (RESTORE);
4032 else if (mode == 1) 4078 else if (mode == 1)
4033 scr_cursor (SAVE); 4079 scr_cursor (SAVE);
4034 break; 4080 break;
… …
4049 case 3: /* 80/132 */ 4095 case 3: /* 80/132 */
4050 if (priv_modes & PrivMode_132OK) 4096 if (priv_modes & PrivMode_132OK)
4051 set_widthheight (((state ? 132 : 80) * fwidth), height); 4097 set_widthheight (((state ? 132 : 80) * fwidth), height);
4052 break; 4098 break;
4053 case 4: /* smooth scrolling */ 4099 case 4: /* smooth scrolling */
4054 if (state) 4100 if (!state)
4055 options &= ~Opt_jumpScroll; 4101 SET_OPTION (Opt_jumpScroll);
4056 else 4102 else
4057 options |= Opt_jumpScroll; 4103 CLR_OPTION (Opt_jumpScroll);
4058 break; 4104 break;
4059 case 5: /* reverse video */ 4105 case 5: /* reverse video */
4060 scr_rvideo_mode (state); 4106 scr_rvideo_mode (state);
4061 break; 4107 break;
4062 case 6: /* relative/absolute origins */ 4108 case 6: /* relative/absolute origins */
… …
4103#if 0 4149#if 0
4104 case 1001: 4150 case 1001:
4105 break; /* X11 mouse highlighting */ 4151 break; /* X11 mouse highlighting */
4106#endif 4152#endif
4107 case 1010: /* scroll to bottom on TTY output inhibit */ 4153 case 1010: /* scroll to bottom on TTY output inhibit */
4108 if (state) 4154 if (!state)
4109 options &= ~Opt_scrollTtyOutput; 4155 SET_OPTION (Opt_scrollTtyOutput);
4110 else 4156 else
4111 options |= Opt_scrollTtyOutput; 4157 CLR_OPTION (Opt_scrollTtyOutput);
4112 break; 4158 break;
4113 case 1011: /* scroll to bottom on key press */ 4159 case 1011: /* scroll to bottom on key press */
4114 if (state) 4160 if (state)
4115 options |= Opt_scrollTtyKeypress; 4161 SET_OPTION (Opt_scrollTtyKeypress);
4116 else 4162 else
4117 options &= ~Opt_scrollTtyKeypress; 4163 CLR_OPTION (Opt_scrollTtyKeypress);
4118 break; 4164 break;
4119 case 1047: /* secondary screen w/ clearing last */ 4165 case 1047: /* secondary screen w/ clearing last */
4120 if (options & Opt_secondaryScreen) 4166 if (OPTION (Opt_secondaryScreen))
4121 if (current_screen != PRIMARY) 4167 if (current_screen != PRIMARY)
4122 scr_erase_screen (2); 4168 scr_erase_screen (2);
4123 scr_change_screen (state); 4169 scr_change_screen (state);
4124 break; 4170 break;
4125 case 1049: /* secondary screen w/ clearing first */ 4171 case 1049: /* secondary screen w/ clearing first */
4126 scr_change_screen (state); 4172 scr_change_screen (state);
4127 if (options & Opt_secondaryScreen) 4173 if (OPTION (Opt_secondaryScreen))
4128 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
4129 scr_erase_screen (2); 4175 scr_erase_screen (2);
4130 break; 4176 break;
4131 default: 4177 default:
4132 break; 4178 break;
… …
4282 case 106: 4328 case 106:
4283 case 107: 4329 case 107:
4284 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4330 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4285 break; 4331 break;
4286#endif 4332#endif
4287
4288 } 4333 }
4289 } 4334 }
4290} 4335}
4291/*}}} */ 4336/*}}} */
4292 4337
… …
4373 } 4418 }
4374 4419
4375 memmove (v_buffer, v_buffer + written, v_buflen); 4420 memmove (v_buffer, v_buffer + written, v_buflen);
4376 } 4421 }
4377 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4422 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4378 // original code just ignores this... 4423 pty_ev.set (EVENT_READ);
4379 destroy ();
4380} 4424}
4381 4425
4382/*----------------------- end-of-file (C source) -----------------------*/ 4426/*----------------------- end-of-file (C source) -----------------------*/
4383 4427

Diff Legend

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