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.208 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.221 by root, Sat Dec 31 18:27:57 2005 UTC

… …
135rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
136{ 136{
137 x = Pixel2Col (x); 137 x = Pixel2Col (x);
138 y = Pixel2Row (y); 138 y = Pixel2Row (y);
139 139
140 if (x < 0 || x >= ncol 140 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= nrow) 141 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 142 return;
143 143
144 for (;;) 144 for (;;)
145 { 145 {
146 const line_t &l = save[y + saveLines - view_start]; 146 const line_t &l = ROW(y - view_start);
147 147
148 text_t t = l.t[x]; 148 text_t t = l.t[x];
149 149
150 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
151 { 151 {
152 iso14755_51 (l.t[x], l.r[x]); 152 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 153 iso14755buf = ISO_14755_54;
154 break; 154 break;
155 } 155 }
156 156
157 x--; 157 x--;
158 } 158 }
159
160} 159}
161#endif
162 160
163#if ENABLE_OVERLAY
164void 161void
165rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 162rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
166{ 163{
167 rxvt_fontset *fs = FONTSET (r); 164 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)]; 165 rxvt_font *f = (*fs)[fs->find_font (ch)];
169 wchar_t *chr, *alloc, ch2, *fname; 166 wchar_t *chr, *alloc, ch2, *fname;
170 int len; 167 int len;
171 168
172 fname = rxvt_utf8towcs (f->name); 169 fname = rxvt_utf8towcs (f->name);
173 170
174#if ENABLE_COMBINING 171# if ENABLE_COMBINING
175 if (IS_COMPOSE (ch)) 172 if (IS_COMPOSE (ch))
176 { 173 {
177 len = rxvt_composite.expand (ch, 0); 174 len = rxvt_composite.expand (ch, 0);
178 alloc = chr = new wchar_t[len]; 175 alloc = chr = new wchar_t[len];
179 rxvt_composite.expand (ch, chr); 176 rxvt_composite.expand (ch, chr);
180 } 177 }
181 else 178 else
182#endif 179# endif
183 { 180 {
184 ch2 = ch; 181 ch2 = ch;
185 182
186 alloc = 0; 183 alloc = 0;
187 chr = &ch2; 184 chr = &ch2;
188 len = 1; 185 len = 1;
189 } 186 }
190 187
188 char attr[80]; // plenty
189
190 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
191 (int)r,
192 fgcolor_of (r), bgcolor_of (r),
193 r & RS_Bold ? " bold" : "",
194 r & RS_Italic ? " italic" : "",
195 r & RS_Blink ? " blink" : "",
196 r & RS_RVid ? " rvid" : "",
197 r & RS_Uline ? " uline" : "",
198 r & RS_Careful ? " careful" : "");
199
191 int width = wcswidth (fname, wcslen (fname)); 200 int width = wcswidth (fname, wcslen (fname));
192 201
193 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 202 max_it (width, 8+5); // for char + hey
203 max_it (width, strlen (attr));
204
205 if (y >= 0)
206 {
207 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
208 x = 0;
209 }
210
211 scr_overlay_new (x, y, width, len + 2);
194 212
195 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 213 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
196 214
197 for (int y = 0; y < len; y++) 215 for (int y = 0; y < len; y++)
198 { 216 {
… …
201 ch = *chr++; 219 ch = *chr++;
202 220
203 sprintf (buf, "%8x", ch); 221 sprintf (buf, "%8x", ch);
204 scr_overlay_set (0, y, buf); 222 scr_overlay_set (0, y, buf);
205 scr_overlay_set (9, y, '='); 223 scr_overlay_set (9, y, '=');
206#if !UNICODE3 224# if !UNICODE3
207 if (ch >= 0x10000) 225 if (ch >= 0x10000)
208 ch = 0xfffd; 226 ch = 0xfffd;
209#endif 227# endif
210 scr_overlay_set (11, y, ch, r); 228 scr_overlay_set (11, y, ch, r);
211 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
212 } 230 }
213 231
232 scr_overlay_set (0, len , attr);
214 scr_overlay_set (0, len, fname); 233 scr_overlay_set (0, len + 1, fname);
215 234
216 free (fname); 235 free (fname);
217 236
218#if ENABLE_COMBINING 237# if ENABLE_COMBINING
219 if (alloc) 238 if (alloc)
220 delete [] alloc; 239 delete [] alloc;
221#endif 240# endif
222} 241}
223#endif 242#endif
224 243
225void 244void
226rxvt_term::commit_iso14755 () 245rxvt_term::commit_iso14755 ()
… …
845 } 864 }
846 865
847 if (len <= 0) 866 if (len <= 0)
848 return; /* not mapped */ 867 return; /* not mapped */
849 868
850 if (options & Opt_scrollTtyKeypress) 869 if (OPTION (Opt_scrollTtyKeypress))
851 if (view_start) 870 if (view_start)
852 { 871 {
853 view_start = 0; 872 view_start = 0;
854 want_refresh = 1; 873 want_refresh = 1;
855 } 874 }
… …
1035{ 1054{
1036 if (mouse_slip_wheel_speed == 0 1055 if (mouse_slip_wheel_speed == 0
1037 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1056 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1038 : scr_page (UP, mouse_slip_wheel_speed)) 1057 : scr_page (UP, mouse_slip_wheel_speed))
1039 { 1058 {
1040 if (view_start == nscrolled || 1059 if (view_start == nsaved ||
1041 view_start == 0) 1060 view_start == 0)
1042 mouse_slip_wheel_speed = 0; 1061 mouse_slip_wheel_speed = 0;
1043 1062
1044 refresh_type |= SMOOTH_REFRESH; 1063 refresh_type |= SMOOTH_REFRESH;
1045 want_refresh = 1; 1064 want_refresh = 1;
… …
1068 if (n > 0) 1087 if (n > 0)
1069 { 1088 {
1070 cmdbuf_endp += n; 1089 cmdbuf_endp += n;
1071 return true; 1090 return true;
1072 } 1091 }
1073 else if (n < 0 && errno != EAGAIN) 1092 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1093 {
1094 pty_ev.stop ();
1095
1096 if (!OPTION (Opt_hold))
1074 destroy (); 1097 destroy ();
1098 }
1075 1099
1076 return false; 1100 return false;
1077} 1101}
1078 1102
1079void 1103void
… …
1099 recolour_cursor (); 1123 recolour_cursor ();
1100 1124
1101#ifdef POINTER_BLANK 1125#ifdef POINTER_BLANK
1102 hidden_pointer = 0; 1126 hidden_pointer = 0;
1103 1127
1104 if (options & Opt_pointerBlank) 1128 if (OPTION (Opt_pointerBlank))
1105 pointer_ev.start (NOW + pointerBlankDelay); 1129 pointer_ev.start (NOW + pointerBlankDelay);
1106#endif 1130#endif
1107} 1131}
1108 1132
1109#ifdef POINTER_BLANK 1133#ifdef POINTER_BLANK
1110void 1134void
1111rxvt_term::pointer_blank () 1135rxvt_term::pointer_blank ()
1112{ 1136{
1113 if (! (options & Opt_pointerBlank)) 1137 if (! OPTION (Opt_pointerBlank))
1114 return; 1138 return;
1115 1139
1116 XDefineCursor (display->display, vt, display->blank_cursor); 1140 XDefineCursor (display->display, vt, display->blank_cursor);
1117 XFlush (display->display); 1141 XFlush (display->display);
1118 1142
… …
1216 1240
1217 SET_R (this); 1241 SET_R (this);
1218 SET_LOCALE (locale); 1242 SET_LOCALE (locale);
1219 1243
1220#if defined(CURSOR_BLINK) 1244#if defined(CURSOR_BLINK)
1221 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1245 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1222 { 1246 {
1223 if (hidden_cursor) 1247 if (hidden_cursor)
1224 { 1248 {
1225 hidden_cursor = 0; 1249 hidden_cursor = 0;
1226 want_refresh = 1; 1250 want_refresh = 1;
… …
1229 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1253 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1230 } 1254 }
1231#endif 1255#endif
1232 1256
1233#if defined(POINTER_BLANK) 1257#if defined(POINTER_BLANK)
1234 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1258 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1235 { 1259 {
1236 if (ev.type == MotionNotify 1260 if (ev.type == MotionNotify
1237 || ev.type == ButtonPress 1261 || ev.type == ButtonPress
1238 || ev.type == ButtonRelease) 1262 || ev.type == ButtonRelease)
1239 if (hidden_pointer) 1263 if (hidden_pointer)
… …
1435 seen_resize = 1; 1459 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1460 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1461 }
1438 1462
1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1463#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1440 if (options & Opt_transparent) 1464 if (OPTION (Opt_transparent))
1441 check_our_parents (); 1465 check_our_parents ();
1442#endif 1466#endif
1443 } 1467 }
1444 break; 1468 break;
1445 1469
… …
1601 } 1625 }
1602 1626
1603 scroll_selection_lines = Pixel2Height (dist) 1627 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1628 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1629 + 1;
1606 MIN_IT (scroll_selection_lines, 1630 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1631 SELECTION_SCROLL_MAX_LINES);
1608 } 1632 }
1609 else 1633 else
1610 { 1634 {
1611 /* we are within the text window, so we 1635 /* we are within the text window, so we
… …
1654 IMSetStatusPosition (); 1678 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context); 1679 XSetICFocus (Input_Context);
1656 } 1680 }
1657#endif 1681#endif
1658#if CURSOR_BLINK 1682#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink) 1683 if (OPTION (Opt_cursorBlink))
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1684 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif 1685#endif
1662#if OFF_FOCUS_FADING 1686#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade]) 1687 if (rs[Rs_fade])
1664 { 1688 {
… …
1686#if USE_XIM 1710#if USE_XIM
1687 if (Input_Context != NULL) 1711 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context); 1712 XUnsetICFocus (Input_Context);
1689#endif 1713#endif
1690#if CURSOR_BLINK 1714#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink) 1715 if (OPTION (Opt_cursorBlink))
1692 cursor_blink_ev.stop (); 1716 cursor_blink_ev.stop ();
1693 hidden_cursor = 0; 1717 hidden_cursor = 0;
1694#endif 1718#endif
1695#if OFF_FOCUS_FADING 1719#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade]) 1720 if (rs[Rs_fade])
… …
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1744 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1721 return; 1745 return;
1722 1746
1723 /* FALLTHROUGH */ 1747 /* FALLTHROUGH */
1724 case ReparentNotify: 1748 case ReparentNotify:
1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1749 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1726 want_refresh = want_full_refresh = 1; 1750 want_refresh = want_full_refresh = 1;
1727 break; 1751 break;
1728 } 1752 }
1729} 1753}
1730#endif 1754#endif
… …
2072 2096
2073 v = ev.button == Button4 ? UP : DN; 2097 v = ev.button == Button4 ? UP : DN;
2074 2098
2075 if (ev.state & ShiftMask) 2099 if (ev.state & ShiftMask)
2076 i = 1; 2100 i = 1;
2077 else if (options & Opt_mouseWheelScrollPage) 2101 else if (OPTION (Opt_mouseWheelScrollPage))
2078 i = nrow - 1; 2102 i = nrow - 1;
2079 else 2103 else
2080 i = 5; 2104 i = 5;
2081 2105
2082# ifdef MOUSE_SLIP_WHEELING 2106# ifdef MOUSE_SLIP_WHEELING
… …
2368 XWindowAttributes wattr, wrootattr; 2392 XWindowAttributes wattr, wrootattr;
2369 dDisp; 2393 dDisp;
2370 2394
2371 pchanged = 0; 2395 pchanged = 0;
2372 2396
2373 if (!(options & Opt_transparent)) 2397 if (!OPTION (Opt_transparent))
2374 return pchanged; /* Don't try any more */ 2398 return pchanged; /* Don't try any more */
2375 2399
2376 XGetWindowAttributes (disp, display->root, &wrootattr); 2400 XGetWindowAttributes (disp, display->root, &wrootattr);
2377 rootdepth = wrootattr.depth; 2401 rootdepth = wrootattr.depth;
2378 2402
… …
2452 nh += sy; 2476 nh += sy;
2453 ny = -sy; 2477 ny = -sy;
2454 sy = 0; 2478 sy = 0;
2455 } 2479 }
2456 2480
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2481 min_it (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2482 min_it (nh, (unsigned int) (wrootattr.height - sy));
2459 2483
2460 XSync (disp, False); 2484 XSync (disp, False);
2461 allowedxerror = -1; 2485 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2486 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463 2487
… …
2656 if (ch == C0_LF) 2680 if (ch == C0_LF)
2657 nlines++; 2681 nlines++;
2658 2682
2659 refresh_count++; 2683 refresh_count++;
2660 2684
2661 if (!(options & Opt_jumpScroll) 2685 if (!OPTION (Opt_jumpScroll)
2662 || (refresh_count >= refresh_limit * (nrow - 1))) 2686 || (refresh_count >= refresh_limit * (nrow - 1)))
2663 { 2687 {
2664 refreshnow = true; 2688 refreshnow = true;
2665 ch = NOCHAR; 2689 ch = NOCHAR;
2666 break; 2690 break;
… …
2700 * the number of pages between refreshes is refresh_limit, which 2724 * the number of pages between refreshes is refresh_limit, which
2701 * is incremented here because we must be doing flat-out scrolling. 2725 * is incremented here because we must be doing flat-out scrolling.
2702 */ 2726 */
2703 if (refreshnow) 2727 if (refreshnow)
2704 { 2728 {
2705 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2729 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2706 refresh_limit++; 2730 refresh_limit++;
2707 else 2731 else
2708 { 2732 {
2709 flag = true; 2733 flag = true;
2710 scr_refresh (refresh_type); 2734 scr_refresh (refresh_type);
… …
3352 3376
3353 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3377 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3354 arg[0] = -arg[0]; 3378 arg[0] = -arg[0];
3355 /* FALLTHROUGH */ 3379 /* FALLTHROUGH */
3356 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3380 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3357 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3381 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3358 break; 3382 break;
3359 3383
3360 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3384 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3361 tt_write ((const unsigned char *)VT100_ANS, 3385 tt_write ((const unsigned char *)VT100_ANS,
3362 (unsigned int) (sizeof (VT100_ANS) - 1)); 3386 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3374 break; 3398 break;
3375 case 6: /* CPR requested */ 3399 case 6: /* CPR requested */
3376 scr_report_position (); 3400 scr_report_position ();
3377 break; 3401 break;
3378 case 7: /* unofficial extension */ 3402 case 7: /* unofficial extension */
3379 if (options & Opt_insecure) 3403 if (OPTION (Opt_insecure))
3380 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3404 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3381 break; 3405 break;
3382 case 8: /* unofficial extension */ 3406 case 8: /* unofficial extension */
3383 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3407 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3384 break; 3408 break;
… …
3548 break; 3572 break;
3549 case 20: /* report icon label */ 3573 case 20: /* report icon label */
3550 { 3574 {
3551 char *s; 3575 char *s;
3552 XGetIconName (disp, parent[0], &s); 3576 XGetIconName (disp, parent[0], &s);
3553 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3577 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s); 3578 XFree (s);
3555 } 3579 }
3556 break; 3580 break;
3557 case 21: /* report window title */ 3581 case 21: /* report window title */
3558 { 3582 {
3559 char *s; 3583 char *s;
3560 XFetchName (disp, parent[0], &s); 3584 XFetchName (disp, parent[0], &s);
3561 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3585 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3562 XFree (s); 3586 XFree (s);
3563 } 3587 }
3564 break; 3588 break;
3565 } 3589 }
3566} 3590}
… …
3842 // TODO, when secure mode? 3866 // TODO, when secure mode?
3843 break; 3867 break;
3844 3868
3845#ifdef MENUBAR 3869#ifdef MENUBAR
3846 case URxvt_Menu: 3870 case URxvt_Menu:
3847 if (options & Opt_insecure) 3871 if (OPTION (Opt_insecure))
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3872 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3849 break; 3873 break;
3850#endif 3874#endif
3851#if 0 3875#if 0
3852 case XTerm_dumpscreen: /* no error notices */ 3876 case XTerm_dumpscreen: /* no error notices */
… …
3868 case URxvt_italicFont: 3892 case URxvt_italicFont:
3869 case URxvt_boldItalicFont: 3893 case URxvt_boldItalicFont:
3870#endif 3894#endif
3871 if (query) 3895 if (query)
3872 tt_printf ("\33]%d;%-.250s%c", saveop, 3896 tt_printf ("\33]%d;%-.250s%c", saveop,
3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3897 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3874 ? fontset[op - URxvt_font]->fontdesc : "", 3898 ? fontset[op - URxvt_font]->fontdesc : "",
3875 resp); 3899 resp);
3876 else 3900 else
3877 { 3901 {
3878 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3902 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3884 break; 3908 break;
3885 3909
3886#if ENABLE_FRILLS 3910#if ENABLE_FRILLS
3887 case URxvt_locale: 3911 case URxvt_locale:
3888 if (query) 3912 if (query)
3889 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3913 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3890 else 3914 else
3891 { 3915 {
3892 set_locale (str); 3916 set_locale (str);
3893 pty.set_utf8_mode (enc_utf8); 3917 pty.set_utf8_mode (enc_utf8);
3894 init_xlocale (); 3918 init_xlocale ();
… …
4022 } 4046 }
4023 4047
4024 /* extra handling for values with state unkept */ 4048 /* extra handling for values with state unkept */
4025 switch (arg[i]) 4049 switch (arg[i])
4026 { 4050 {
4051#if ENABLE_STYLES
4052 case 1021:
4053 if (mode)
4054 SET_OPTION (Opt_intensityStyles);
4055 else
4056 CLR_OPTION (Opt_intensityStyles);
4057#endif
4027 case 1048: /* alternative cursor save */ 4058 case 1048: /* alternative cursor save */
4028 case 1049: 4059 case 1049:
4029 if (options & Opt_secondaryScreen) 4060 if (OPTION (Opt_secondaryScreen))
4030 if (mode == 0) 4061 if (mode == 0)
4031 scr_cursor (RESTORE); 4062 scr_cursor (RESTORE);
4032 else if (mode == 1) 4063 else if (mode == 1)
4033 scr_cursor (SAVE); 4064 scr_cursor (SAVE);
4034 break; 4065 break;
… …
4049 case 3: /* 80/132 */ 4080 case 3: /* 80/132 */
4050 if (priv_modes & PrivMode_132OK) 4081 if (priv_modes & PrivMode_132OK)
4051 set_widthheight (((state ? 132 : 80) * fwidth), height); 4082 set_widthheight (((state ? 132 : 80) * fwidth), height);
4052 break; 4083 break;
4053 case 4: /* smooth scrolling */ 4084 case 4: /* smooth scrolling */
4054 if (state) 4085 if (!state)
4055 options &= ~Opt_jumpScroll; 4086 SET_OPTION (Opt_jumpScroll);
4056 else 4087 else
4057 options |= Opt_jumpScroll; 4088 CLR_OPTION (Opt_jumpScroll);
4058 break; 4089 break;
4059 case 5: /* reverse video */ 4090 case 5: /* reverse video */
4060 scr_rvideo_mode (state); 4091 scr_rvideo_mode (state);
4061 break; 4092 break;
4062 case 6: /* relative/absolute origins */ 4093 case 6: /* relative/absolute origins */
… …
4103#if 0 4134#if 0
4104 case 1001: 4135 case 1001:
4105 break; /* X11 mouse highlighting */ 4136 break; /* X11 mouse highlighting */
4106#endif 4137#endif
4107 case 1010: /* scroll to bottom on TTY output inhibit */ 4138 case 1010: /* scroll to bottom on TTY output inhibit */
4108 if (state) 4139 if (!state)
4109 options &= ~Opt_scrollTtyOutput; 4140 SET_OPTION (Opt_scrollTtyOutput);
4110 else 4141 else
4111 options |= Opt_scrollTtyOutput; 4142 CLR_OPTION (Opt_scrollTtyOutput);
4112 break; 4143 break;
4113 case 1011: /* scroll to bottom on key press */ 4144 case 1011: /* scroll to bottom on key press */
4114 if (state) 4145 if (state)
4115 options |= Opt_scrollTtyKeypress; 4146 SET_OPTION (Opt_scrollTtyKeypress);
4116 else 4147 else
4117 options &= ~Opt_scrollTtyKeypress; 4148 CLR_OPTION (Opt_scrollTtyKeypress);
4118 break; 4149 break;
4119 case 1047: /* secondary screen w/ clearing last */ 4150 case 1047: /* secondary screen w/ clearing last */
4120 if (options & Opt_secondaryScreen) 4151 if (OPTION (Opt_secondaryScreen))
4121 if (current_screen != PRIMARY) 4152 if (current_screen != PRIMARY)
4122 scr_erase_screen (2); 4153 scr_erase_screen (2);
4123 scr_change_screen (state); 4154 scr_change_screen (state);
4124 break; 4155 break;
4125 case 1049: /* secondary screen w/ clearing first */ 4156 case 1049: /* secondary screen w/ clearing first */
4126 scr_change_screen (state); 4157 scr_change_screen (state);
4127 if (options & Opt_secondaryScreen) 4158 if (OPTION (Opt_secondaryScreen))
4128 if (current_screen != PRIMARY) 4159 if (current_screen != PRIMARY)
4129 scr_erase_screen (2); 4160 scr_erase_screen (2);
4130 break; 4161 break;
4131 default: 4162 default:
4132 break; 4163 break;
… …
4282 case 106: 4313 case 106:
4283 case 107: 4314 case 107:
4284 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4315 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4285 break; 4316 break;
4286#endif 4317#endif
4287
4288 } 4318 }
4289 } 4319 }
4290} 4320}
4291/*}}} */ 4321/*}}} */
4292 4322
… …
4373 } 4403 }
4374 4404
4375 memmove (v_buffer, v_buffer + written, v_buflen); 4405 memmove (v_buffer, v_buffer + written, v_buflen);
4376 } 4406 }
4377 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4407 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4378 // original code just ignores this... 4408 pty_ev.set (EVENT_READ);
4379 destroy ();
4380} 4409}
4381 4410
4382/*----------------------- end-of-file (C source) -----------------------*/ 4411/*----------------------- end-of-file (C source) -----------------------*/
4383 4412

Diff Legend

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