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.216 by root, Tue Dec 27 01:25:42 2005 UTC vs.
Revision 1.225 by root, Sun Jan 1 13:35:14 2006 UTC

… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#if HAVE_SCHED_YIELD
54# include <sched.h>
55#endif
56
53#ifdef KEYSYM_RESOURCE 57#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 58# include "keyboard.h"
55#endif 59#endif
56 60
57#include <csignal> 61#include <csignal>
… …
147 151
148 text_t t = l.t[x]; 152 text_t t = l.t[x];
149 153
150 if (t != NOCHAR || !x) 154 if (t != NOCHAR || !x)
151 { 155 {
152 iso14755_51 (l.t[x], l.r[x]); 156 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 157 iso14755buf = ISO_14755_54;
154 break; 158 break;
155 } 159 }
156 160
157 x--; 161 x--;
158 } 162 }
159} 163}
160#endif
161 164
162#if ENABLE_OVERLAY
163void 165void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 166rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 167{
166 rxvt_fontset *fs = FONTSET (r); 168 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 169 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 170 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 171 int len;
170 172
171 fname = rxvt_utf8towcs (f->name); 173 fname = rxvt_utf8towcs (f->name);
172 174
173#if ENABLE_COMBINING 175# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 176 if (IS_COMPOSE (ch))
175 { 177 {
176 len = rxvt_composite.expand (ch, 0); 178 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 179 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 180 rxvt_composite.expand (ch, chr);
179 } 181 }
180 else 182 else
181#endif 183# endif
182 { 184 {
183 ch2 = ch; 185 ch2 = ch;
184 186
185 alloc = 0; 187 alloc = 0;
186 chr = &ch2; 188 chr = &ch2;
… …
189 191
190 char attr[80]; // plenty 192 char attr[80]; // plenty
191 193
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 194 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 195 (int)r,
194 GET_FGCOLOR (r), GET_BGCOLOR (r), 196 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "", 197 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "", 198 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "", 199 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 200 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 201 r & RS_Uline ? " uline" : "",
… …
202 int width = wcswidth (fname, wcslen (fname)); 204 int width = wcswidth (fname, wcslen (fname));
203 205
204 max_it (width, 8+5); // for char + hey 206 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr)); 207 max_it (width, strlen (attr));
206 208
209 if (y >= 0)
210 {
211 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
212 x = 0;
213 }
214
207 scr_overlay_new (0, -1, width, len + 2); 215 scr_overlay_new (x, y, width, len + 2);
208 216
209 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 217 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
210 218
211 for (int y = 0; y < len; y++) 219 for (int y = 0; y < len; y++)
212 { 220 {
… …
215 ch = *chr++; 223 ch = *chr++;
216 224
217 sprintf (buf, "%8x", ch); 225 sprintf (buf, "%8x", ch);
218 scr_overlay_set (0, y, buf); 226 scr_overlay_set (0, y, buf);
219 scr_overlay_set (9, y, '='); 227 scr_overlay_set (9, y, '=');
220#if !UNICODE3 228# if !UNICODE3
221 if (ch >= 0x10000) 229 if (ch >= 0x10000)
222 ch = 0xfffd; 230 ch = 0xfffd;
223#endif 231# endif
224 scr_overlay_set (11, y, ch, r); 232 scr_overlay_set (11, y, ch, r);
225 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
226 } 234 }
227 235
228 scr_overlay_set (0, len , attr); 236 scr_overlay_set (0, len , attr);
229 scr_overlay_set (0, len + 1, fname); 237 scr_overlay_set (0, len + 1, fname);
230 238
231 free (fname); 239 free (fname);
232 240
233#if ENABLE_COMBINING 241# if ENABLE_COMBINING
234 if (alloc) 242 if (alloc)
235 delete [] alloc; 243 delete [] alloc;
236#endif 244# endif
237} 245}
238#endif 246#endif
239 247
240void 248void
241rxvt_term::commit_iso14755 () 249rxvt_term::commit_iso14755 ()
… …
860 } 868 }
861 869
862 if (len <= 0) 870 if (len <= 0)
863 return; /* not mapped */ 871 return; /* not mapped */
864 872
865 if (options & Opt_scrollTtyKeypress) 873 if (OPTION (Opt_scrollTtyKeypress))
866 if (view_start) 874 if (view_start)
867 { 875 {
868 view_start = 0; 876 view_start = 0;
869 want_refresh = 1; 877 want_refresh = 1;
870 } 878 }
… …
1076 1084
1077 memmove (cmdbuf_base, cmdbuf_ptr, n); 1085 memmove (cmdbuf_base, cmdbuf_ptr, n);
1078 cmdbuf_ptr = cmdbuf_base; 1086 cmdbuf_ptr = cmdbuf_base;
1079 cmdbuf_endp = cmdbuf_ptr + n; 1087 cmdbuf_endp = cmdbuf_ptr + n;
1080 1088
1081 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1089 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1082 1090
1083 if (n > 0) 1091 if (r > 0)
1084 { 1092 {
1085 cmdbuf_endp += n; 1093 cmdbuf_endp += r;
1086 return true; 1094 return true;
1087 } 1095 }
1088 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1096 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1097 {
1098#if HAVE_SCHED_YIELD
1099 sched_yield ();
1100#endif
1101 }
1102 else
1089 { 1103 {
1090 pty_ev.stop (); 1104 pty_ev.stop ();
1091 1105
1092 if (!(options & Opt_hold)) 1106 if (!OPTION (Opt_hold))
1093 destroy (); 1107 destroy ();
1094 } 1108 }
1095 1109
1096 return false; 1110 return false;
1097} 1111}
… …
1119 recolour_cursor (); 1133 recolour_cursor ();
1120 1134
1121#ifdef POINTER_BLANK 1135#ifdef POINTER_BLANK
1122 hidden_pointer = 0; 1136 hidden_pointer = 0;
1123 1137
1124 if (options & Opt_pointerBlank) 1138 if (OPTION (Opt_pointerBlank))
1125 pointer_ev.start (NOW + pointerBlankDelay); 1139 pointer_ev.start (NOW + pointerBlankDelay);
1126#endif 1140#endif
1127} 1141}
1128 1142
1129#ifdef POINTER_BLANK 1143#ifdef POINTER_BLANK
1130void 1144void
1131rxvt_term::pointer_blank () 1145rxvt_term::pointer_blank ()
1132{ 1146{
1133 if (! (options & Opt_pointerBlank)) 1147 if (! OPTION (Opt_pointerBlank))
1134 return; 1148 return;
1135 1149
1136 XDefineCursor (display->display, vt, display->blank_cursor); 1150 XDefineCursor (display->display, vt, display->blank_cursor);
1137 XFlush (display->display); 1151 XFlush (display->display);
1138 1152
… …
1236 1250
1237 SET_R (this); 1251 SET_R (this);
1238 SET_LOCALE (locale); 1252 SET_LOCALE (locale);
1239 1253
1240#if defined(CURSOR_BLINK) 1254#if defined(CURSOR_BLINK)
1241 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1255 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1242 { 1256 {
1243 if (hidden_cursor) 1257 if (hidden_cursor)
1244 { 1258 {
1245 hidden_cursor = 0; 1259 hidden_cursor = 0;
1246 want_refresh = 1; 1260 want_refresh = 1;
… …
1249 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1263 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1250 } 1264 }
1251#endif 1265#endif
1252 1266
1253#if defined(POINTER_BLANK) 1267#if defined(POINTER_BLANK)
1254 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1268 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1255 { 1269 {
1256 if (ev.type == MotionNotify 1270 if (ev.type == MotionNotify
1257 || ev.type == ButtonPress 1271 || ev.type == ButtonPress
1258 || ev.type == ButtonRelease) 1272 || ev.type == ButtonRelease)
1259 if (hidden_pointer) 1273 if (hidden_pointer)
… …
1455 seen_resize = 1; 1469 seen_resize = 1;
1456 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1470 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1457 } 1471 }
1458 1472
1459#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1460 if (options & Opt_transparent) 1474 if (OPTION (Opt_transparent))
1461 check_our_parents (); 1475 check_our_parents ();
1462#endif 1476#endif
1463 } 1477 }
1464 break; 1478 break;
1465 1479
… …
1674 IMSetStatusPosition (); 1688 IMSetStatusPosition ();
1675 XSetICFocus (Input_Context); 1689 XSetICFocus (Input_Context);
1676 } 1690 }
1677#endif 1691#endif
1678#if CURSOR_BLINK 1692#if CURSOR_BLINK
1679 if (options & Opt_cursorBlink) 1693 if (OPTION (Opt_cursorBlink))
1680 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1694 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1681#endif 1695#endif
1682#if OFF_FOCUS_FADING 1696#if OFF_FOCUS_FADING
1683 if (rs[Rs_fade]) 1697 if (rs[Rs_fade])
1684 { 1698 {
… …
1706#if USE_XIM 1720#if USE_XIM
1707 if (Input_Context != NULL) 1721 if (Input_Context != NULL)
1708 XUnsetICFocus (Input_Context); 1722 XUnsetICFocus (Input_Context);
1709#endif 1723#endif
1710#if CURSOR_BLINK 1724#if CURSOR_BLINK
1711 if (options & Opt_cursorBlink) 1725 if (OPTION (Opt_cursorBlink))
1712 cursor_blink_ev.stop (); 1726 cursor_blink_ev.stop ();
1713 hidden_cursor = 0; 1727 hidden_cursor = 0;
1714#endif 1728#endif
1715#if OFF_FOCUS_FADING 1729#if OFF_FOCUS_FADING
1716 if (rs[Rs_fade]) 1730 if (rs[Rs_fade])
… …
1740 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1754 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1741 return; 1755 return;
1742 1756
1743 /* FALLTHROUGH */ 1757 /* FALLTHROUGH */
1744 case ReparentNotify: 1758 case ReparentNotify:
1745 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1759 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1746 want_refresh = want_full_refresh = 1; 1760 want_refresh = want_full_refresh = 1;
1747 break; 1761 break;
1748 } 1762 }
1749} 1763}
1750#endif 1764#endif
… …
2092 2106
2093 v = ev.button == Button4 ? UP : DN; 2107 v = ev.button == Button4 ? UP : DN;
2094 2108
2095 if (ev.state & ShiftMask) 2109 if (ev.state & ShiftMask)
2096 i = 1; 2110 i = 1;
2097 else if (options & Opt_mouseWheelScrollPage) 2111 else if (OPTION (Opt_mouseWheelScrollPage))
2098 i = nrow - 1; 2112 i = nrow - 1;
2099 else 2113 else
2100 i = 5; 2114 i = 5;
2101 2115
2102# ifdef MOUSE_SLIP_WHEELING 2116# ifdef MOUSE_SLIP_WHEELING
… …
2388 XWindowAttributes wattr, wrootattr; 2402 XWindowAttributes wattr, wrootattr;
2389 dDisp; 2403 dDisp;
2390 2404
2391 pchanged = 0; 2405 pchanged = 0;
2392 2406
2393 if (!(options & Opt_transparent)) 2407 if (!OPTION (Opt_transparent))
2394 return pchanged; /* Don't try any more */ 2408 return pchanged; /* Don't try any more */
2395 2409
2396 XGetWindowAttributes (disp, display->root, &wrootattr); 2410 XGetWindowAttributes (disp, display->root, &wrootattr);
2397 rootdepth = wrootattr.depth; 2411 rootdepth = wrootattr.depth;
2398 2412
… …
2676 if (ch == C0_LF) 2690 if (ch == C0_LF)
2677 nlines++; 2691 nlines++;
2678 2692
2679 refresh_count++; 2693 refresh_count++;
2680 2694
2681 if (!(options & Opt_jumpScroll) 2695 if (!OPTION (Opt_jumpScroll)
2682 || (refresh_count >= refresh_limit * (nrow - 1))) 2696 || (refresh_count >= refresh_limit * (nrow - 1)))
2683 { 2697 {
2684 refreshnow = true; 2698 refreshnow = true;
2685 ch = NOCHAR; 2699 ch = NOCHAR;
2686 break; 2700 break;
… …
2720 * the number of pages between refreshes is refresh_limit, which 2734 * the number of pages between refreshes is refresh_limit, which
2721 * is incremented here because we must be doing flat-out scrolling. 2735 * is incremented here because we must be doing flat-out scrolling.
2722 */ 2736 */
2723 if (refreshnow) 2737 if (refreshnow)
2724 { 2738 {
2725 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2739 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2726 refresh_limit++; 2740 refresh_limit++;
2727 else 2741 else
2728 { 2742 {
2729 flag = true; 2743 flag = true;
2730 scr_refresh (refresh_type); 2744 scr_refresh (refresh_type);
… …
3394 break; 3408 break;
3395 case 6: /* CPR requested */ 3409 case 6: /* CPR requested */
3396 scr_report_position (); 3410 scr_report_position ();
3397 break; 3411 break;
3398 case 7: /* unofficial extension */ 3412 case 7: /* unofficial extension */
3399 if (options & Opt_insecure) 3413 if (OPTION (Opt_insecure))
3400 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3414 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3401 break; 3415 break;
3402 case 8: /* unofficial extension */ 3416 case 8: /* unofficial extension */
3403 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3417 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3404 break; 3418 break;
… …
3568 break; 3582 break;
3569 case 20: /* report icon label */ 3583 case 20: /* report icon label */
3570 { 3584 {
3571 char *s; 3585 char *s;
3572 XGetIconName (disp, parent[0], &s); 3586 XGetIconName (disp, parent[0], &s);
3573 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3587 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3574 XFree (s); 3588 XFree (s);
3575 } 3589 }
3576 break; 3590 break;
3577 case 21: /* report window title */ 3591 case 21: /* report window title */
3578 { 3592 {
3579 char *s; 3593 char *s;
3580 XFetchName (disp, parent[0], &s); 3594 XFetchName (disp, parent[0], &s);
3581 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3595 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3582 XFree (s); 3596 XFree (s);
3583 } 3597 }
3584 break; 3598 break;
3585 } 3599 }
3586} 3600}
… …
3862 // TODO, when secure mode? 3876 // TODO, when secure mode?
3863 break; 3877 break;
3864 3878
3865#ifdef MENUBAR 3879#ifdef MENUBAR
3866 case URxvt_Menu: 3880 case URxvt_Menu:
3867 if (options & Opt_insecure) 3881 if (OPTION (Opt_insecure))
3868 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3882 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3869 break; 3883 break;
3870#endif 3884#endif
3871#if 0 3885#if 0
3872 case XTerm_dumpscreen: /* no error notices */ 3886 case XTerm_dumpscreen: /* no error notices */
… …
3888 case URxvt_italicFont: 3902 case URxvt_italicFont:
3889 case URxvt_boldItalicFont: 3903 case URxvt_boldItalicFont:
3890#endif 3904#endif
3891 if (query) 3905 if (query)
3892 tt_printf ("\33]%d;%-.250s%c", saveop, 3906 tt_printf ("\33]%d;%-.250s%c", saveop,
3893 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3907 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3894 ? fontset[op - URxvt_font]->fontdesc : "", 3908 ? fontset[op - URxvt_font]->fontdesc : "",
3895 resp); 3909 resp);
3896 else 3910 else
3897 { 3911 {
3898 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3912 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3904 break; 3918 break;
3905 3919
3906#if ENABLE_FRILLS 3920#if ENABLE_FRILLS
3907 case URxvt_locale: 3921 case URxvt_locale:
3908 if (query) 3922 if (query)
3909 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3923 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3910 else 3924 else
3911 { 3925 {
3912 set_locale (str); 3926 set_locale (str);
3913 pty.set_utf8_mode (enc_utf8); 3927 pty.set_utf8_mode (enc_utf8);
3914 init_xlocale (); 3928 init_xlocale ();
… …
4042 } 4056 }
4043 4057
4044 /* extra handling for values with state unkept */ 4058 /* extra handling for values with state unkept */
4045 switch (arg[i]) 4059 switch (arg[i])
4046 { 4060 {
4061#if ENABLE_STYLES
4062 case 1021:
4063 if (mode)
4064 SET_OPTION (Opt_intensityStyles);
4065 else
4066 CLR_OPTION (Opt_intensityStyles);
4067
4068 scr_touch (true);
4069 break;
4070#endif
4047 case 1048: /* alternative cursor save */ 4071 case 1048: /* alternative cursor save */
4048 case 1049: 4072 case 1049:
4049 if (options & Opt_secondaryScreen) 4073 if (OPTION (Opt_secondaryScreen))
4050 if (mode == 0) 4074 if (mode == 0)
4051 scr_cursor (RESTORE); 4075 scr_cursor (RESTORE);
4052 else if (mode == 1) 4076 else if (mode == 1)
4053 scr_cursor (SAVE); 4077 scr_cursor (SAVE);
4054 break; 4078 break;
… …
4069 case 3: /* 80/132 */ 4093 case 3: /* 80/132 */
4070 if (priv_modes & PrivMode_132OK) 4094 if (priv_modes & PrivMode_132OK)
4071 set_widthheight (((state ? 132 : 80) * fwidth), height); 4095 set_widthheight (((state ? 132 : 80) * fwidth), height);
4072 break; 4096 break;
4073 case 4: /* smooth scrolling */ 4097 case 4: /* smooth scrolling */
4074 if (state) 4098 if (!state)
4075 options &= ~Opt_jumpScroll; 4099 SET_OPTION (Opt_jumpScroll);
4076 else 4100 else
4077 options |= Opt_jumpScroll; 4101 CLR_OPTION (Opt_jumpScroll);
4078 break; 4102 break;
4079 case 5: /* reverse video */ 4103 case 5: /* reverse video */
4080 scr_rvideo_mode (state); 4104 scr_rvideo_mode (state);
4081 break; 4105 break;
4082 case 6: /* relative/absolute origins */ 4106 case 6: /* relative/absolute origins */
… …
4123#if 0 4147#if 0
4124 case 1001: 4148 case 1001:
4125 break; /* X11 mouse highlighting */ 4149 break; /* X11 mouse highlighting */
4126#endif 4150#endif
4127 case 1010: /* scroll to bottom on TTY output inhibit */ 4151 case 1010: /* scroll to bottom on TTY output inhibit */
4128 if (state) 4152 if (!state)
4129 options &= ~Opt_scrollTtyOutput; 4153 SET_OPTION (Opt_scrollTtyOutput);
4130 else 4154 else
4131 options |= Opt_scrollTtyOutput; 4155 CLR_OPTION (Opt_scrollTtyOutput);
4132 break; 4156 break;
4133 case 1011: /* scroll to bottom on key press */ 4157 case 1011: /* scroll to bottom on key press */
4134 if (state) 4158 if (state)
4135 options |= Opt_scrollTtyKeypress; 4159 SET_OPTION (Opt_scrollTtyKeypress);
4136 else 4160 else
4137 options &= ~Opt_scrollTtyKeypress; 4161 CLR_OPTION (Opt_scrollTtyKeypress);
4138 break; 4162 break;
4139 case 1047: /* secondary screen w/ clearing last */ 4163 case 1047: /* secondary screen w/ clearing last */
4140 if (options & Opt_secondaryScreen) 4164 if (OPTION (Opt_secondaryScreen))
4141 if (current_screen != PRIMARY) 4165 if (current_screen != PRIMARY)
4142 scr_erase_screen (2); 4166 scr_erase_screen (2);
4143 scr_change_screen (state); 4167 scr_change_screen (state);
4144 break; 4168 break;
4145 case 1049: /* secondary screen w/ clearing first */ 4169 case 1049: /* secondary screen w/ clearing first */
4146 scr_change_screen (state); 4170 scr_change_screen (state);
4147 if (options & Opt_secondaryScreen) 4171 if (OPTION (Opt_secondaryScreen))
4148 if (current_screen != PRIMARY) 4172 if (current_screen != PRIMARY)
4149 scr_erase_screen (2); 4173 scr_erase_screen (2);
4150 break; 4174 break;
4151 default: 4175 default:
4152 break; 4176 break;
… …
4302 case 106: 4326 case 106:
4303 case 107: 4327 case 107:
4304 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4328 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4305 break; 4329 break;
4306#endif 4330#endif
4307
4308 } 4331 }
4309 } 4332 }
4310} 4333}
4311/*}}} */ 4334/*}}} */
4312 4335

Diff Legend

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