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.215 by root, Fri Dec 23 14:46:34 2005 UTC vs.
Revision 1.227 by root, Mon Jan 2 15:35:43 2006 UTC

… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
53
54#if HAVE_SCHED_YIELD
55# include <sched.h>
56#endif
52 57
53#ifdef KEYSYM_RESOURCE 58#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 59# include "keyboard.h"
55#endif 60#endif
56 61
… …
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} 164}
160#endif
161 165
162#if ENABLE_OVERLAY
163void 166void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 167rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 168{
166 rxvt_fontset *fs = FONTSET (r); 169 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 170 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 171 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 172 int len;
170 173
171 fname = rxvt_utf8towcs (f->name); 174 fname = rxvt_utf8towcs (f->name);
172 175
173#if ENABLE_COMBINING 176# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 177 if (IS_COMPOSE (ch))
175 { 178 {
176 len = rxvt_composite.expand (ch, 0); 179 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 180 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 181 rxvt_composite.expand (ch, chr);
179 } 182 }
180 else 183 else
181#endif 184# endif
182 { 185 {
183 ch2 = ch; 186 ch2 = ch;
184 187
185 alloc = 0; 188 alloc = 0;
186 chr = &ch2; 189 chr = &ch2;
187 len = 1; 190 len = 1;
188 } 191 }
189 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
190 int width = wcswidth (fname, wcslen (fname)); 205 int width = wcswidth (fname, wcslen (fname));
191 206
192 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);
193 217
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 218 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 219
196 for (int y = 0; y < len; y++) 220 for (int y = 0; y < len; y++)
197 { 221 {
… …
200 ch = *chr++; 224 ch = *chr++;
201 225
202 sprintf (buf, "%8x", ch); 226 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 227 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 228 scr_overlay_set (9, y, '=');
205#if !UNICODE3 229# if !UNICODE3
206 if (ch >= 0x10000) 230 if (ch >= 0x10000)
207 ch = 0xfffd; 231 ch = 0xfffd;
208#endif 232# endif
209 scr_overlay_set (11, y, ch, r); 233 scr_overlay_set (11, y, ch, r);
210 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
211 } 235 }
212 236
237 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 238 scr_overlay_set (0, len + 1, fname);
214 239
215 free (fname); 240 free (fname);
216 241
217#if ENABLE_COMBINING 242# if ENABLE_COMBINING
218 if (alloc) 243 if (alloc)
219 delete [] alloc; 244 delete [] alloc;
220#endif 245# endif
221} 246}
222#endif 247#endif
223 248
224void 249void
225rxvt_term::commit_iso14755 () 250rxvt_term::commit_iso14755 ()
… …
844 } 869 }
845 870
846 if (len <= 0) 871 if (len <= 0)
847 return; /* not mapped */ 872 return; /* not mapped */
848 873
849 if (options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
850 if (view_start) 875 if (view_start)
851 { 876 {
852 view_start = 0; 877 view_start = 0;
853 want_refresh = 1; 878 want_refresh = 1;
854 } 879 }
… …
960 SET_LOCALE (locale); 985 SET_LOCALE (locale);
961 986
962 display->flush (); 987 display->flush ();
963 988
964 if (want_refresh && !flush_ev.active) 989 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01); 990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
966} 991}
967 992
968void 993void
969rxvt_term::flush_cb (time_watcher &w) 994rxvt_term::flush_cb (time_watcher &w)
970{ 995{
… …
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1071 }
1047} 1072}
1048#endif 1073#endif
1049 1074
1075#if HAVE_SCHED_YIELD
1076static struct event_handler
1077{
1078 check_watcher cw_yield;
1079
1080 void yield (check_watcher &w)
1081 {
1082 sched_yield ();
1083 w.stop ();
1084 }
1085
1086 event_handler ()
1087 : cw_yield (this, &event_handler::yield)
1088 {
1089 }
1090} event_handler;
1091#endif
1092
1050bool 1093bool
1051rxvt_term::pty_fill () 1094rxvt_term::pty_fill ()
1052{ 1095{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1097
… …
1060 1103
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1104 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1105 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1106 cmdbuf_endp = cmdbuf_ptr + n;
1064 1107
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1066 1109
1067 if (n > 0) 1110 if (r > 0)
1068 { 1111 {
1069 cmdbuf_endp += n; 1112 cmdbuf_endp += r;
1070 return true; 1113 return true;
1071 } 1114 }
1072 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 {
1117#if HAVE_SCHED_YIELD
1118 event_handler.cw_yield.start ();
1119#endif
1120 }
1121 else
1073 { 1122 {
1074 pty_ev.stop (); 1123 pty_ev.stop ();
1075 1124
1076 if (!(options & Opt_hold)) 1125 if (!OPTION (Opt_hold))
1077 destroy (); 1126 destroy ();
1078 } 1127 }
1079 1128
1080 return false; 1129 return false;
1081} 1130}
… …
1103 recolour_cursor (); 1152 recolour_cursor ();
1104 1153
1105#ifdef POINTER_BLANK 1154#ifdef POINTER_BLANK
1106 hidden_pointer = 0; 1155 hidden_pointer = 0;
1107 1156
1108 if (options & Opt_pointerBlank) 1157 if (OPTION (Opt_pointerBlank))
1109 pointer_ev.start (NOW + pointerBlankDelay); 1158 pointer_ev.start (NOW + pointerBlankDelay);
1110#endif 1159#endif
1111} 1160}
1112 1161
1113#ifdef POINTER_BLANK 1162#ifdef POINTER_BLANK
1114void 1163void
1115rxvt_term::pointer_blank () 1164rxvt_term::pointer_blank ()
1116{ 1165{
1117 if (! (options & Opt_pointerBlank)) 1166 if (! OPTION (Opt_pointerBlank))
1118 return; 1167 return;
1119 1168
1120 XDefineCursor (display->display, vt, display->blank_cursor); 1169 XDefineCursor (display->display, vt, display->blank_cursor);
1121 XFlush (display->display); 1170 XFlush (display->display);
1122 1171
… …
1220 1269
1221 SET_R (this); 1270 SET_R (this);
1222 SET_LOCALE (locale); 1271 SET_LOCALE (locale);
1223 1272
1224#if defined(CURSOR_BLINK) 1273#if defined(CURSOR_BLINK)
1225 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1274 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1226 { 1275 {
1227 if (hidden_cursor) 1276 if (hidden_cursor)
1228 { 1277 {
1229 hidden_cursor = 0; 1278 hidden_cursor = 0;
1230 want_refresh = 1; 1279 want_refresh = 1;
… …
1233 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1282 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1234 } 1283 }
1235#endif 1284#endif
1236 1285
1237#if defined(POINTER_BLANK) 1286#if defined(POINTER_BLANK)
1238 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1287 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1239 { 1288 {
1240 if (ev.type == MotionNotify 1289 if (ev.type == MotionNotify
1241 || ev.type == ButtonPress 1290 || ev.type == ButtonPress
1242 || ev.type == ButtonRelease) 1291 || ev.type == ButtonRelease)
1243 if (hidden_pointer) 1292 if (hidden_pointer)
… …
1439 seen_resize = 1; 1488 seen_resize = 1;
1440 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1441 } 1490 }
1442 1491
1443#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1492#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1444 if (options & Opt_transparent) 1493 if (OPTION (Opt_transparent))
1445 check_our_parents (); 1494 check_our_parents ();
1446#endif 1495#endif
1447 } 1496 }
1448 break; 1497 break;
1449 1498
… …
1650{ 1699{
1651 if (!focus) 1700 if (!focus)
1652 { 1701 {
1653 focus = 1; 1702 focus = 1;
1654 want_refresh = 1; 1703 want_refresh = 1;
1704
1705 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706
1655#if USE_XIM 1707#if USE_XIM
1656 if (Input_Context != NULL) 1708 if (Input_Context != NULL)
1657 { 1709 {
1658 IMSetStatusPosition (); 1710 IMSetStatusPosition ();
1659 XSetICFocus (Input_Context); 1711 XSetICFocus (Input_Context);
1660 } 1712 }
1661#endif 1713#endif
1662#if CURSOR_BLINK 1714#if CURSOR_BLINK
1663 if (options & Opt_cursorBlink) 1715 if (OPTION (Opt_cursorBlink))
1664 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1665#endif 1717#endif
1666#if OFF_FOCUS_FADING 1718#if OFF_FOCUS_FADING
1667 if (rs[Rs_fade]) 1719 if (rs[Rs_fade])
1668 { 1720 {
… …
1679 if (focus) 1731 if (focus)
1680 { 1732 {
1681 focus = 0; 1733 focus = 0;
1682 want_refresh = 1; 1734 want_refresh = 1;
1683 1735
1736 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737
1684#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf)
1740 {
1685 iso14755buf = 0; 1741 iso14755buf = 0;
1686#endif
1687#if ENABLE_OVERLAY 1742# if ENABLE_OVERLAY
1688 scr_overlay_off (); 1743 scr_overlay_off ();
1744# endif
1745 }
1689#endif 1746#endif
1690#if USE_XIM 1747#if USE_XIM
1691 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1692 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1693#endif 1750#endif
1694#if CURSOR_BLINK 1751#if CURSOR_BLINK
1695 if (options & Opt_cursorBlink) 1752 if (OPTION (Opt_cursorBlink))
1696 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1697 hidden_cursor = 0; 1754 hidden_cursor = 0;
1698#endif 1755#endif
1699#if OFF_FOCUS_FADING 1756#if OFF_FOCUS_FADING
1700 if (rs[Rs_fade]) 1757 if (rs[Rs_fade])
… …
1724 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1781 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1725 return; 1782 return;
1726 1783
1727 /* FALLTHROUGH */ 1784 /* FALLTHROUGH */
1728 case ReparentNotify: 1785 case ReparentNotify:
1729 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1786 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1730 want_refresh = want_full_refresh = 1; 1787 want_refresh = want_full_refresh = 1;
1731 break; 1788 break;
1732 } 1789 }
1733} 1790}
1734#endif 1791#endif
… …
2076 2133
2077 v = ev.button == Button4 ? UP : DN; 2134 v = ev.button == Button4 ? UP : DN;
2078 2135
2079 if (ev.state & ShiftMask) 2136 if (ev.state & ShiftMask)
2080 i = 1; 2137 i = 1;
2081 else if (options & Opt_mouseWheelScrollPage) 2138 else if (OPTION (Opt_mouseWheelScrollPage))
2082 i = nrow - 1; 2139 i = nrow - 1;
2083 else 2140 else
2084 i = 5; 2141 i = 5;
2085 2142
2086# ifdef MOUSE_SLIP_WHEELING 2143# ifdef MOUSE_SLIP_WHEELING
… …
2372 XWindowAttributes wattr, wrootattr; 2429 XWindowAttributes wattr, wrootattr;
2373 dDisp; 2430 dDisp;
2374 2431
2375 pchanged = 0; 2432 pchanged = 0;
2376 2433
2377 if (!(options & Opt_transparent)) 2434 if (!OPTION (Opt_transparent))
2378 return pchanged; /* Don't try any more */ 2435 return pchanged; /* Don't try any more */
2379 2436
2380 XGetWindowAttributes (disp, display->root, &wrootattr); 2437 XGetWindowAttributes (disp, display->root, &wrootattr);
2381 rootdepth = wrootattr.depth; 2438 rootdepth = wrootattr.depth;
2382 2439
… …
2660 if (ch == C0_LF) 2717 if (ch == C0_LF)
2661 nlines++; 2718 nlines++;
2662 2719
2663 refresh_count++; 2720 refresh_count++;
2664 2721
2665 if (!(options & Opt_jumpScroll) 2722 if (!OPTION (Opt_jumpScroll)
2666 || (refresh_count >= refresh_limit * (nrow - 1))) 2723 || (refresh_count >= refresh_limit * (nrow - 1)))
2667 { 2724 {
2668 refreshnow = true; 2725 refreshnow = true;
2726 refresh_count = 0;
2669 ch = NOCHAR; 2727 ch = NOCHAR;
2670 break; 2728 break;
2671 } 2729 }
2672 2730
2673 // scr_add_lines only works for nlines <= nrow - 1. 2731 // scr_add_lines only works for nlines <= nrow - 1.
… …
2704 * the number of pages between refreshes is refresh_limit, which 2762 * the number of pages between refreshes is refresh_limit, which
2705 * is incremented here because we must be doing flat-out scrolling. 2763 * is incremented here because we must be doing flat-out scrolling.
2706 */ 2764 */
2707 if (refreshnow) 2765 if (refreshnow)
2708 { 2766 {
2709 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2767 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2710 refresh_limit++; 2768 refresh_limit++;
2711 else 2769 else
2712 { 2770 {
2713 flag = true; 2771 flag = true;
2714 scr_refresh (refresh_type); 2772 scr_refresh (refresh_type);
2773 flush_ev.stop ();
2715 } 2774 }
2716 } 2775 }
2717 2776
2718 } 2777 }
2719 else 2778 else
… …
3378 break; 3437 break;
3379 case 6: /* CPR requested */ 3438 case 6: /* CPR requested */
3380 scr_report_position (); 3439 scr_report_position ();
3381 break; 3440 break;
3382 case 7: /* unofficial extension */ 3441 case 7: /* unofficial extension */
3383 if (options & Opt_insecure) 3442 if (OPTION (Opt_insecure))
3384 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3443 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3385 break; 3444 break;
3386 case 8: /* unofficial extension */ 3445 case 8: /* unofficial extension */
3387 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3388 break; 3447 break;
… …
3552 break; 3611 break;
3553 case 20: /* report icon label */ 3612 case 20: /* report icon label */
3554 { 3613 {
3555 char *s; 3614 char *s;
3556 XGetIconName (disp, parent[0], &s); 3615 XGetIconName (disp, parent[0], &s);
3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3558 XFree (s); 3617 XFree (s);
3559 } 3618 }
3560 break; 3619 break;
3561 case 21: /* report window title */ 3620 case 21: /* report window title */
3562 { 3621 {
3563 char *s; 3622 char *s;
3564 XFetchName (disp, parent[0], &s); 3623 XFetchName (disp, parent[0], &s);
3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3566 XFree (s); 3625 XFree (s);
3567 } 3626 }
3568 break; 3627 break;
3569 } 3628 }
3570} 3629}
… …
3846 // TODO, when secure mode? 3905 // TODO, when secure mode?
3847 break; 3906 break;
3848 3907
3849#ifdef MENUBAR 3908#ifdef MENUBAR
3850 case URxvt_Menu: 3909 case URxvt_Menu:
3851 if (options & Opt_insecure) 3910 if (OPTION (Opt_insecure))
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break; 3912 break;
3854#endif 3913#endif
3855#if 0 3914#if 0
3856 case XTerm_dumpscreen: /* no error notices */ 3915 case XTerm_dumpscreen: /* no error notices */
… …
3872 case URxvt_italicFont: 3931 case URxvt_italicFont:
3873 case URxvt_boldItalicFont: 3932 case URxvt_boldItalicFont:
3874#endif 3933#endif
3875 if (query) 3934 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", saveop, 3935 tt_printf ("\33]%d;%-.250s%c", saveop,
3877 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3936 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3878 ? fontset[op - URxvt_font]->fontdesc : "", 3937 ? fontset[op - URxvt_font]->fontdesc : "",
3879 resp); 3938 resp);
3880 else 3939 else
3881 { 3940 {
3882 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3941 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3888 break; 3947 break;
3889 3948
3890#if ENABLE_FRILLS 3949#if ENABLE_FRILLS
3891 case URxvt_locale: 3950 case URxvt_locale:
3892 if (query) 3951 if (query)
3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3894 else 3953 else
3895 { 3954 {
3896 set_locale (str); 3955 set_locale (str);
3897 pty.set_utf8_mode (enc_utf8); 3956 pty.set_utf8_mode (enc_utf8);
3898 init_xlocale (); 3957 init_xlocale ();
… …
4026 } 4085 }
4027 4086
4028 /* extra handling for values with state unkept */ 4087 /* extra handling for values with state unkept */
4029 switch (arg[i]) 4088 switch (arg[i])
4030 { 4089 {
4090#if ENABLE_STYLES
4091 case 1021:
4092 if (mode)
4093 SET_OPTION (Opt_intensityStyles);
4094 else
4095 CLR_OPTION (Opt_intensityStyles);
4096
4097 scr_touch (true);
4098 break;
4099#endif
4031 case 1048: /* alternative cursor save */ 4100 case 1048: /* alternative cursor save */
4032 case 1049: 4101 case 1049:
4033 if (options & Opt_secondaryScreen) 4102 if (OPTION (Opt_secondaryScreen))
4034 if (mode == 0) 4103 if (mode == 0)
4035 scr_cursor (RESTORE); 4104 scr_cursor (RESTORE);
4036 else if (mode == 1) 4105 else if (mode == 1)
4037 scr_cursor (SAVE); 4106 scr_cursor (SAVE);
4038 break; 4107 break;
… …
4053 case 3: /* 80/132 */ 4122 case 3: /* 80/132 */
4054 if (priv_modes & PrivMode_132OK) 4123 if (priv_modes & PrivMode_132OK)
4055 set_widthheight (((state ? 132 : 80) * fwidth), height); 4124 set_widthheight (((state ? 132 : 80) * fwidth), height);
4056 break; 4125 break;
4057 case 4: /* smooth scrolling */ 4126 case 4: /* smooth scrolling */
4058 if (state) 4127 if (!state)
4059 options &= ~Opt_jumpScroll; 4128 SET_OPTION (Opt_jumpScroll);
4060 else 4129 else
4061 options |= Opt_jumpScroll; 4130 CLR_OPTION (Opt_jumpScroll);
4062 break; 4131 break;
4063 case 5: /* reverse video */ 4132 case 5: /* reverse video */
4064 scr_rvideo_mode (state); 4133 scr_rvideo_mode (state);
4065 break; 4134 break;
4066 case 6: /* relative/absolute origins */ 4135 case 6: /* relative/absolute origins */
… …
4107#if 0 4176#if 0
4108 case 1001: 4177 case 1001:
4109 break; /* X11 mouse highlighting */ 4178 break; /* X11 mouse highlighting */
4110#endif 4179#endif
4111 case 1010: /* scroll to bottom on TTY output inhibit */ 4180 case 1010: /* scroll to bottom on TTY output inhibit */
4112 if (state) 4181 if (!state)
4113 options &= ~Opt_scrollTtyOutput; 4182 SET_OPTION (Opt_scrollTtyOutput);
4114 else 4183 else
4115 options |= Opt_scrollTtyOutput; 4184 CLR_OPTION (Opt_scrollTtyOutput);
4116 break; 4185 break;
4117 case 1011: /* scroll to bottom on key press */ 4186 case 1011: /* scroll to bottom on key press */
4118 if (state) 4187 if (state)
4119 options |= Opt_scrollTtyKeypress; 4188 SET_OPTION (Opt_scrollTtyKeypress);
4120 else 4189 else
4121 options &= ~Opt_scrollTtyKeypress; 4190 CLR_OPTION (Opt_scrollTtyKeypress);
4122 break; 4191 break;
4123 case 1047: /* secondary screen w/ clearing last */ 4192 case 1047: /* secondary screen w/ clearing last */
4124 if (options & Opt_secondaryScreen) 4193 if (OPTION (Opt_secondaryScreen))
4125 if (current_screen != PRIMARY) 4194 if (current_screen != PRIMARY)
4126 scr_erase_screen (2); 4195 scr_erase_screen (2);
4127 scr_change_screen (state); 4196 scr_change_screen (state);
4128 break; 4197 break;
4129 case 1049: /* secondary screen w/ clearing first */ 4198 case 1049: /* secondary screen w/ clearing first */
4130 scr_change_screen (state); 4199 scr_change_screen (state);
4131 if (options & Opt_secondaryScreen) 4200 if (OPTION (Opt_secondaryScreen))
4132 if (current_screen != PRIMARY) 4201 if (current_screen != PRIMARY)
4133 scr_erase_screen (2); 4202 scr_erase_screen (2);
4134 break; 4203 break;
4135 default: 4204 default:
4136 break; 4205 break;
… …
4286 case 106: 4355 case 106:
4287 case 107: 4356 case 107:
4288 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4357 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4289 break; 4358 break;
4290#endif 4359#endif
4291
4292 } 4360 }
4293 } 4361 }
4294} 4362}
4295/*}}} */ 4363/*}}} */
4296 4364

Diff Legend

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