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.229 by root, Tue Jan 3 17:34:44 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;
… …
189 192
190 char attr[80]; // plenty 193 char attr[80]; // plenty
191 194
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 195 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 196 (int)r,
194 GET_FGCOLOR (r), GET_BGCOLOR (r), 197 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "", 198 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "", 199 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "", 200 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 201 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 202 r & RS_Uline ? " uline" : "",
… …
202 int width = wcswidth (fname, wcslen (fname)); 205 int width = wcswidth (fname, wcslen (fname));
203 206
204 max_it (width, 8+5); // for char + hey 207 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr)); 208 max_it (width, strlen (attr));
206 209
210 if (y >= 0)
211 {
212 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
213 x = 0;
214 }
215
207 scr_overlay_new (0, -1, width, len + 2); 216 scr_overlay_new (x, y, width, len + 2);
208 217
209 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 218 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
210 219
211 for (int y = 0; y < len; y++) 220 for (int y = 0; y < len; y++)
212 { 221 {
… …
215 ch = *chr++; 224 ch = *chr++;
216 225
217 sprintf (buf, "%8x", ch); 226 sprintf (buf, "%8x", ch);
218 scr_overlay_set (0, y, buf); 227 scr_overlay_set (0, y, buf);
219 scr_overlay_set (9, y, '='); 228 scr_overlay_set (9, y, '=');
220#if !UNICODE3 229# if !UNICODE3
221 if (ch >= 0x10000) 230 if (ch >= 0x10000)
222 ch = 0xfffd; 231 ch = 0xfffd;
223#endif 232# endif
224 scr_overlay_set (11, y, ch, r); 233 scr_overlay_set (11, y, ch, r);
225 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
226 } 235 }
227 236
228 scr_overlay_set (0, len , attr); 237 scr_overlay_set (0, len , attr);
229 scr_overlay_set (0, len + 1, fname); 238 scr_overlay_set (0, len + 1, fname);
230 239
231 free (fname); 240 free (fname);
232 241
233#if ENABLE_COMBINING 242# if ENABLE_COMBINING
234 if (alloc) 243 if (alloc)
235 delete [] alloc; 244 delete [] alloc;
236#endif 245# endif
237} 246}
238#endif 247#endif
239 248
240void 249void
241rxvt_term::commit_iso14755 () 250rxvt_term::commit_iso14755 ()
… …
860 } 869 }
861 870
862 if (len <= 0) 871 if (len <= 0)
863 return; /* not mapped */ 872 return; /* not mapped */
864 873
865 if (options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
866 if (view_start) 875 if (view_start)
867 { 876 {
868 view_start = 0; 877 view_start = 0;
869 want_refresh = 1; 878 want_refresh = 1;
870 } 879 }
… …
976 SET_LOCALE (locale); 985 SET_LOCALE (locale);
977 986
978 display->flush (); 987 display->flush ();
979 988
980 if (want_refresh && !flush_ev.active) 989 if (want_refresh && !flush_ev.active)
981 flush_ev.start (NOW + 0.01); 990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
982} 991}
983 992
984void 993void
985rxvt_term::flush_cb (time_watcher &w) 994rxvt_term::flush_cb (time_watcher &w)
986{ 995{
… …
1061 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1062 } 1071 }
1063} 1072}
1064#endif 1073#endif
1065 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
1066bool 1093bool
1067rxvt_term::pty_fill () 1094rxvt_term::pty_fill ()
1068{ 1095{
1069 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1070 1097
… …
1076 1103
1077 memmove (cmdbuf_base, cmdbuf_ptr, n); 1104 memmove (cmdbuf_base, cmdbuf_ptr, n);
1078 cmdbuf_ptr = cmdbuf_base; 1105 cmdbuf_ptr = cmdbuf_base;
1079 cmdbuf_endp = cmdbuf_ptr + n; 1106 cmdbuf_endp = cmdbuf_ptr + n;
1080 1107
1081 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1082 1109
1083 if (n > 0) 1110 if (r > 0)
1084 { 1111 {
1085 cmdbuf_endp += n; 1112 cmdbuf_endp += r;
1086 return true; 1113 return true;
1087 } 1114 }
1088 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 if (display->is_local)
1119 event_handler.cw_yield.start ();
1120#endif
1121 }
1122 else
1089 { 1123 {
1090 pty_ev.stop (); 1124 pty_ev.stop ();
1091 1125
1092 if (!(options & Opt_hold)) 1126 if (!OPTION (Opt_hold))
1093 destroy (); 1127 destroy ();
1094 } 1128 }
1095 1129
1096 return false; 1130 return false;
1097} 1131}
… …
1119 recolour_cursor (); 1153 recolour_cursor ();
1120 1154
1121#ifdef POINTER_BLANK 1155#ifdef POINTER_BLANK
1122 hidden_pointer = 0; 1156 hidden_pointer = 0;
1123 1157
1124 if (options & Opt_pointerBlank) 1158 if (OPTION (Opt_pointerBlank))
1125 pointer_ev.start (NOW + pointerBlankDelay); 1159 pointer_ev.start (NOW + pointerBlankDelay);
1126#endif 1160#endif
1127} 1161}
1128 1162
1129#ifdef POINTER_BLANK 1163#ifdef POINTER_BLANK
1130void 1164void
1131rxvt_term::pointer_blank () 1165rxvt_term::pointer_blank ()
1132{ 1166{
1133 if (! (options & Opt_pointerBlank)) 1167 if (! OPTION (Opt_pointerBlank))
1134 return; 1168 return;
1135 1169
1136 XDefineCursor (display->display, vt, display->blank_cursor); 1170 XDefineCursor (display->display, vt, display->blank_cursor);
1137 XFlush (display->display); 1171 XFlush (display->display);
1138 1172
… …
1236 1270
1237 SET_R (this); 1271 SET_R (this);
1238 SET_LOCALE (locale); 1272 SET_LOCALE (locale);
1239 1273
1240#if defined(CURSOR_BLINK) 1274#if defined(CURSOR_BLINK)
1241 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1242 { 1276 {
1243 if (hidden_cursor) 1277 if (hidden_cursor)
1244 { 1278 {
1245 hidden_cursor = 0; 1279 hidden_cursor = 0;
1246 want_refresh = 1; 1280 want_refresh = 1;
… …
1249 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1250 } 1284 }
1251#endif 1285#endif
1252 1286
1253#if defined(POINTER_BLANK) 1287#if defined(POINTER_BLANK)
1254 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1255 { 1289 {
1256 if (ev.type == MotionNotify 1290 if (ev.type == MotionNotify
1257 || ev.type == ButtonPress 1291 || ev.type == ButtonPress
1258 || ev.type == ButtonRelease) 1292 || ev.type == ButtonRelease)
1259 if (hidden_pointer) 1293 if (hidden_pointer)
… …
1455 seen_resize = 1; 1489 seen_resize = 1;
1456 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1457 } 1491 }
1458 1492
1459#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1493#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1460 if (options & Opt_transparent) 1494 if (OPTION (Opt_transparent))
1461 check_our_parents (); 1495 check_our_parents ();
1462#endif 1496#endif
1463 } 1497 }
1464 break; 1498 break;
1465 1499
… …
1666{ 1700{
1667 if (!focus) 1701 if (!focus)
1668 { 1702 {
1669 focus = 1; 1703 focus = 1;
1670 want_refresh = 1; 1704 want_refresh = 1;
1705
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1707
1671#if USE_XIM 1708#if USE_XIM
1672 if (Input_Context != NULL) 1709 if (Input_Context != NULL)
1673 { 1710 {
1674 IMSetStatusPosition (); 1711 IMSetStatusPosition ();
1675 XSetICFocus (Input_Context); 1712 XSetICFocus (Input_Context);
1676 } 1713 }
1677#endif 1714#endif
1678#if CURSOR_BLINK 1715#if CURSOR_BLINK
1679 if (options & Opt_cursorBlink) 1716 if (OPTION (Opt_cursorBlink))
1680 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1717 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1681#endif 1718#endif
1682#if OFF_FOCUS_FADING 1719#if OFF_FOCUS_FADING
1683 if (rs[Rs_fade]) 1720 if (rs[Rs_fade])
1684 { 1721 {
… …
1695 if (focus) 1732 if (focus)
1696 { 1733 {
1697 focus = 0; 1734 focus = 0;
1698 want_refresh = 1; 1735 want_refresh = 1;
1699 1736
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738
1700#if ENABLE_FRILLS || ISO_14755 1739#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf)
1741 {
1701 iso14755buf = 0; 1742 iso14755buf = 0;
1702#endif
1703#if ENABLE_OVERLAY 1743# if ENABLE_OVERLAY
1704 scr_overlay_off (); 1744 scr_overlay_off ();
1745# endif
1746 }
1705#endif 1747#endif
1706#if USE_XIM 1748#if USE_XIM
1707 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1708 XUnsetICFocus (Input_Context); 1750 XUnsetICFocus (Input_Context);
1709#endif 1751#endif
1710#if CURSOR_BLINK 1752#if CURSOR_BLINK
1711 if (options & Opt_cursorBlink) 1753 if (OPTION (Opt_cursorBlink))
1712 cursor_blink_ev.stop (); 1754 cursor_blink_ev.stop ();
1713 hidden_cursor = 0; 1755 hidden_cursor = 0;
1714#endif 1756#endif
1715#if OFF_FOCUS_FADING 1757#if OFF_FOCUS_FADING
1716 if (rs[Rs_fade]) 1758 if (rs[Rs_fade])
… …
1740 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1782 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1741 return; 1783 return;
1742 1784
1743 /* FALLTHROUGH */ 1785 /* FALLTHROUGH */
1744 case ReparentNotify: 1786 case ReparentNotify:
1745 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1787 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1746 want_refresh = want_full_refresh = 1; 1788 want_refresh = want_full_refresh = 1;
1747 break; 1789 break;
1748 } 1790 }
1749} 1791}
1750#endif 1792#endif
… …
1753rxvt_term::button_press (XButtonEvent &ev) 1795rxvt_term::button_press (XButtonEvent &ev)
1754{ 1796{
1755 int reportmode = 0, clickintime; 1797 int reportmode = 0, clickintime;
1756 1798
1757 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1800
1758 if (!bypass_keystate) 1801 if (!bypass_keystate)
1759 reportmode = !! (priv_modes & PrivMode_mouse_report); 1802 reportmode = !! (priv_modes & PrivMode_mouse_report);
1760 1803
1761 /* 1804 /*
1762 * VT window processing of button press 1805 * VT window processing of button press
… …
1811 else 1854 else
1812 { 1855 {
1813 if (ev.button != MEvent.button) 1856 if (ev.button != MEvent.button)
1814 MEvent.clicks = 0; 1857 MEvent.clicks = 0;
1815 1858
1859 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1816 switch (ev.button) 1860 switch (ev.button)
1817 { 1861 {
1818 case Button1: 1862 case Button1:
1819 /* allow meta + click to select rectangular areas */ 1863 /* allow meta + click to select rectangular areas */
1820 /* should be done in screen.C */ 1864 /* should be done in screen.C */
1821#if ENABLE_FRILLS 1865#if ENABLE_FRILLS
1822 selection.rect = !!(ev.state & ModMetaMask); 1866 selection.rect = !!(ev.state & ModMetaMask);
1823#else 1867#else
1824 selection.rect = false; 1868 selection.rect = false;
1825#endif 1869#endif
1826 1870
1827 /* allow shift+left click to extend selection */ 1871 /* allow shift+left click to extend selection */
1828 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1872 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1829 { 1873 {
1830 if (MEvent.button == Button1 && clickintime) 1874 if (MEvent.button == Button1 && clickintime)
1831 selection_rotate (ev.x, ev.y); 1875 selection_rotate (ev.x, ev.y);
1832 else 1876 else
1833 selection_extend (ev.x, ev.y, 1); 1877 selection_extend (ev.x, ev.y, 1);
1834 } 1878 }
1835 else 1879 else
1836 { 1880 {
1837 if (MEvent.button == Button1 && clickintime) 1881 if (MEvent.button == Button1 && clickintime)
1838 MEvent.clicks++; 1882 MEvent.clicks++;
1839 else 1883 else
1840 MEvent.clicks = 1; 1884 MEvent.clicks = 1;
1841 1885
1842 selection_click (MEvent.clicks, ev.x, ev.y); 1886 selection_click (MEvent.clicks, ev.x, ev.y);
1843 } 1887 }
1844 1888
1845 MEvent.button = Button1; 1889 MEvent.button = Button1;
1846 break; 1890 break;
1847 1891
1848 case Button3: 1892 case Button3:
1849 if (MEvent.button == Button3 && clickintime) 1893 if (MEvent.button == Button3 && clickintime)
1850 selection_rotate (ev.x, ev.y); 1894 selection_rotate (ev.x, ev.y);
1851 else 1895 else
1852 selection_extend (ev.x, ev.y, 1); 1896 selection_extend (ev.x, ev.y, 1);
1853 1897
1854 MEvent.button = Button3; 1898 MEvent.button = Button3;
1855 break; 1899 break;
1856 } 1900 }
1857 } 1901 }
1858 1902
1859 MEvent.time = ev.time; 1903 MEvent.time = ev.time;
1860 return; 1904 return;
1861 } 1905 }
1862 1906
… …
2092 2136
2093 v = ev.button == Button4 ? UP : DN; 2137 v = ev.button == Button4 ? UP : DN;
2094 2138
2095 if (ev.state & ShiftMask) 2139 if (ev.state & ShiftMask)
2096 i = 1; 2140 i = 1;
2097 else if (options & Opt_mouseWheelScrollPage) 2141 else if (OPTION (Opt_mouseWheelScrollPage))
2098 i = nrow - 1; 2142 i = nrow - 1;
2099 else 2143 else
2100 i = 5; 2144 i = 5;
2101 2145
2102# ifdef MOUSE_SLIP_WHEELING 2146# ifdef MOUSE_SLIP_WHEELING
… …
2388 XWindowAttributes wattr, wrootattr; 2432 XWindowAttributes wattr, wrootattr;
2389 dDisp; 2433 dDisp;
2390 2434
2391 pchanged = 0; 2435 pchanged = 0;
2392 2436
2393 if (!(options & Opt_transparent)) 2437 if (!OPTION (Opt_transparent))
2394 return pchanged; /* Don't try any more */ 2438 return pchanged; /* Don't try any more */
2395 2439
2396 XGetWindowAttributes (disp, display->root, &wrootattr); 2440 XGetWindowAttributes (disp, display->root, &wrootattr);
2397 rootdepth = wrootattr.depth; 2441 rootdepth = wrootattr.depth;
2398 2442
… …
2676 if (ch == C0_LF) 2720 if (ch == C0_LF)
2677 nlines++; 2721 nlines++;
2678 2722
2679 refresh_count++; 2723 refresh_count++;
2680 2724
2681 if (!(options & Opt_jumpScroll) 2725 if (!OPTION (Opt_jumpScroll)
2682 || (refresh_count >= refresh_limit * (nrow - 1))) 2726 || (refresh_count >= refresh_limit * (nrow - 1)))
2683 { 2727 {
2684 refreshnow = true; 2728 refreshnow = true;
2729 refresh_count = 0;
2685 ch = NOCHAR; 2730 ch = NOCHAR;
2686 break; 2731 break;
2687 } 2732 }
2688 2733
2689 // scr_add_lines only works for nlines <= nrow - 1. 2734 // scr_add_lines only works for nlines <= nrow - 1.
… …
2720 * the number of pages between refreshes is refresh_limit, which 2765 * the number of pages between refreshes is refresh_limit, which
2721 * is incremented here because we must be doing flat-out scrolling. 2766 * is incremented here because we must be doing flat-out scrolling.
2722 */ 2767 */
2723 if (refreshnow) 2768 if (refreshnow)
2724 { 2769 {
2725 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2770 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2726 refresh_limit++; 2771 refresh_limit++;
2727 else 2772 else
2728 { 2773 {
2729 flag = true; 2774 flag = true;
2730 scr_refresh (refresh_type); 2775 scr_refresh (refresh_type);
2776 flush_ev.stop ();
2731 } 2777 }
2732 } 2778 }
2733 2779
2734 } 2780 }
2735 else 2781 else
… …
3394 break; 3440 break;
3395 case 6: /* CPR requested */ 3441 case 6: /* CPR requested */
3396 scr_report_position (); 3442 scr_report_position ();
3397 break; 3443 break;
3398 case 7: /* unofficial extension */ 3444 case 7: /* unofficial extension */
3399 if (options & Opt_insecure) 3445 if (OPTION (Opt_insecure))
3400 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3446 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3401 break; 3447 break;
3402 case 8: /* unofficial extension */ 3448 case 8: /* unofficial extension */
3403 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3449 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3404 break; 3450 break;
… …
3568 break; 3614 break;
3569 case 20: /* report icon label */ 3615 case 20: /* report icon label */
3570 { 3616 {
3571 char *s; 3617 char *s;
3572 XGetIconName (disp, parent[0], &s); 3618 XGetIconName (disp, parent[0], &s);
3573 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3619 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3574 XFree (s); 3620 XFree (s);
3575 } 3621 }
3576 break; 3622 break;
3577 case 21: /* report window title */ 3623 case 21: /* report window title */
3578 { 3624 {
3579 char *s; 3625 char *s;
3580 XFetchName (disp, parent[0], &s); 3626 XFetchName (disp, parent[0], &s);
3581 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3627 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3582 XFree (s); 3628 XFree (s);
3583 } 3629 }
3584 break; 3630 break;
3585 } 3631 }
3586} 3632}
… …
3862 // TODO, when secure mode? 3908 // TODO, when secure mode?
3863 break; 3909 break;
3864 3910
3865#ifdef MENUBAR 3911#ifdef MENUBAR
3866 case URxvt_Menu: 3912 case URxvt_Menu:
3867 if (options & Opt_insecure) 3913 if (OPTION (Opt_insecure))
3868 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3869 break; 3915 break;
3870#endif 3916#endif
3871#if 0 3917#if 0
3872 case XTerm_dumpscreen: /* no error notices */ 3918 case XTerm_dumpscreen: /* no error notices */
… …
3888 case URxvt_italicFont: 3934 case URxvt_italicFont:
3889 case URxvt_boldItalicFont: 3935 case URxvt_boldItalicFont:
3890#endif 3936#endif
3891 if (query) 3937 if (query)
3892 tt_printf ("\33]%d;%-.250s%c", saveop, 3938 tt_printf ("\33]%d;%-.250s%c", saveop,
3893 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3939 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3894 ? fontset[op - URxvt_font]->fontdesc : "", 3940 ? fontset[op - URxvt_font]->fontdesc : "",
3895 resp); 3941 resp);
3896 else 3942 else
3897 { 3943 {
3898 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3944 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3904 break; 3950 break;
3905 3951
3906#if ENABLE_FRILLS 3952#if ENABLE_FRILLS
3907 case URxvt_locale: 3953 case URxvt_locale:
3908 if (query) 3954 if (query)
3909 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3955 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3910 else 3956 else
3911 { 3957 {
3912 set_locale (str); 3958 set_locale (str);
3913 pty.set_utf8_mode (enc_utf8); 3959 pty.set_utf8_mode (enc_utf8);
3914 init_xlocale (); 3960 init_xlocale ();
… …
4042 } 4088 }
4043 4089
4044 /* extra handling for values with state unkept */ 4090 /* extra handling for values with state unkept */
4045 switch (arg[i]) 4091 switch (arg[i])
4046 { 4092 {
4093#if ENABLE_STYLES
4094 case 1021:
4095 if (mode)
4096 SET_OPTION (Opt_intensityStyles);
4097 else
4098 CLR_OPTION (Opt_intensityStyles);
4099
4100 scr_touch (true);
4101 break;
4102#endif
4047 case 1048: /* alternative cursor save */ 4103 case 1048: /* alternative cursor save */
4048 case 1049: 4104 case 1049:
4049 if (options & Opt_secondaryScreen) 4105 if (OPTION (Opt_secondaryScreen))
4050 if (mode == 0) 4106 if (mode == 0)
4051 scr_cursor (RESTORE); 4107 scr_cursor (RESTORE);
4052 else if (mode == 1) 4108 else if (mode == 1)
4053 scr_cursor (SAVE); 4109 scr_cursor (SAVE);
4054 break; 4110 break;
… …
4069 case 3: /* 80/132 */ 4125 case 3: /* 80/132 */
4070 if (priv_modes & PrivMode_132OK) 4126 if (priv_modes & PrivMode_132OK)
4071 set_widthheight (((state ? 132 : 80) * fwidth), height); 4127 set_widthheight (((state ? 132 : 80) * fwidth), height);
4072 break; 4128 break;
4073 case 4: /* smooth scrolling */ 4129 case 4: /* smooth scrolling */
4074 if (state) 4130 if (!state)
4075 options &= ~Opt_jumpScroll; 4131 SET_OPTION (Opt_jumpScroll);
4076 else 4132 else
4077 options |= Opt_jumpScroll; 4133 CLR_OPTION (Opt_jumpScroll);
4078 break; 4134 break;
4079 case 5: /* reverse video */ 4135 case 5: /* reverse video */
4080 scr_rvideo_mode (state); 4136 scr_rvideo_mode (state);
4081 break; 4137 break;
4082 case 6: /* relative/absolute origins */ 4138 case 6: /* relative/absolute origins */
… …
4123#if 0 4179#if 0
4124 case 1001: 4180 case 1001:
4125 break; /* X11 mouse highlighting */ 4181 break; /* X11 mouse highlighting */
4126#endif 4182#endif
4127 case 1010: /* scroll to bottom on TTY output inhibit */ 4183 case 1010: /* scroll to bottom on TTY output inhibit */
4128 if (state) 4184 if (!state)
4129 options &= ~Opt_scrollTtyOutput; 4185 SET_OPTION (Opt_scrollTtyOutput);
4130 else 4186 else
4131 options |= Opt_scrollTtyOutput; 4187 CLR_OPTION (Opt_scrollTtyOutput);
4132 break; 4188 break;
4133 case 1011: /* scroll to bottom on key press */ 4189 case 1011: /* scroll to bottom on key press */
4134 if (state) 4190 if (state)
4135 options |= Opt_scrollTtyKeypress; 4191 SET_OPTION (Opt_scrollTtyKeypress);
4136 else 4192 else
4137 options &= ~Opt_scrollTtyKeypress; 4193 CLR_OPTION (Opt_scrollTtyKeypress);
4138 break; 4194 break;
4139 case 1047: /* secondary screen w/ clearing last */ 4195 case 1047: /* secondary screen w/ clearing last */
4140 if (options & Opt_secondaryScreen) 4196 if (OPTION (Opt_secondaryScreen))
4141 if (current_screen != PRIMARY) 4197 if (current_screen != PRIMARY)
4142 scr_erase_screen (2); 4198 scr_erase_screen (2);
4143 scr_change_screen (state); 4199 scr_change_screen (state);
4144 break; 4200 break;
4145 case 1049: /* secondary screen w/ clearing first */ 4201 case 1049: /* secondary screen w/ clearing first */
4146 scr_change_screen (state); 4202 scr_change_screen (state);
4147 if (options & Opt_secondaryScreen) 4203 if (OPTION (Opt_secondaryScreen))
4148 if (current_screen != PRIMARY) 4204 if (current_screen != PRIMARY)
4149 scr_erase_screen (2); 4205 scr_erase_screen (2);
4150 break; 4206 break;
4151 default: 4207 default:
4152 break; 4208 break;
… …
4302 case 106: 4358 case 106:
4303 case 107: 4359 case 107:
4304 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4360 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4305 break; 4361 break;
4306#endif 4362#endif
4307
4308 } 4363 }
4309 } 4364 }
4310} 4365}
4311/*}}} */ 4366/*}}} */
4312 4367

Diff Legend

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