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.507 by sf-exg, Wed Apr 11 13:39:51 2012 UTC vs.
Revision 1.529 by sf-exg, Sun Dec 30 15:05:19 2012 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
263 267
264 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
… …
282 } 286 }
283 287
284 iso14755buf = 0; 288 iso14755buf = 0;
285} 289}
286 290
287static int 291static int ecb_cold
288hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
289{ 293{
290 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
291 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
292 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
301 305
302 return -1; 306 return -1;
303} 307}
304#endif 308#endif
305 309
306static inline KeySym 310static inline KeySym ecb_cold
307translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
308{ 312{
309#ifdef XK_KP_Home 313#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
337# endif 341# endif
338#endif 342#endif
339 return keysym; 343 return keysym;
340} 344}
341 345
342static inline int 346static inline int ecb_cold
343map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
344{ 348{
345 int param = 0; 349 int param = 0;
346 350
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
396 break; 400 break;
397 } 401 }
398 return param; 402 return param;
399} 403}
400 404
401void 405void ecb_cold
402rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
403{ 407{
404 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
405 KeySym keysym; 409 KeySym keysym;
406 int valid_keysym; 410 int valid_keysym;
… …
421 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
422 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
423 427
424 kbuf[0] = 0; 428 kbuf[0] = 0;
425 429
426#ifdef USE_XIM 430#if USE_XIM
427 if (Input_Context) 431 if (Input_Context)
428 { 432 {
429 Status status_return; 433 Status status_return;
430 434
431#if 0 435#if 0
… …
855 } 859 }
856 860
857 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
858} 862}
859 863
860void 864void ecb_cold
861rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
862{ 866{
863#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
864 KeySym keysym; 868 KeySym keysym;
865 869
… …
937void 941void
938rxvt_term::flush () 942rxvt_term::flush ()
939{ 943{
940 flush_ev.stop (); 944 flush_ev.stop ();
941 945
942#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_IMG
943 if (bg_flags & BG_NEEDS_REFRESH) 947 if (bg_flags & BG_NEEDS_REFRESH)
944 { 948 {
945 bg_flags &= ~BG_NEEDS_REFRESH; 949 bg_flags &= ~BG_NEEDS_REFRESH;
946 scr_touch (false); 950 scr_touch (false);
947 } 951 }
… …
987 while (row < end_row); 991 while (row < end_row);
988 } 992 }
989 993
990 scr_refresh (); 994 scr_refresh ();
991 scrollBar.show (1); 995 scrollBar.show (1);
992#ifdef USE_XIM 996#if USE_XIM
993 im_send_spot (); 997 im_send_spot ();
994#endif 998#endif
995 } 999 }
996 1000
997 display->flush (); 1001 display->flush ();
… …
1219 pty_write (); 1223 pty_write ();
1220 1224
1221 refresh_check (); 1225 refresh_check ();
1222} 1226}
1223 1227
1224void 1228void ecb_cold
1225rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1226{ 1230{
1227 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1228 recolour_cursor (); 1232 recolour_cursor ();
1229 1233
… …
1234 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1235#endif 1239#endif
1236} 1240}
1237 1241
1238#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1239void 1243void ecb_cold
1240rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1241{ 1245{
1242 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1243 return; 1247 return;
1244 1248
… …
1246 XFlush (dpy); 1250 XFlush (dpy);
1247 1251
1248 hidden_pointer = 1; 1252 hidden_pointer = 1;
1249} 1253}
1250 1254
1251void 1255void ecb_cold
1252rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1253{ 1257{
1254 make_current (); 1258 make_current ();
1255 1259
1256 pointer_blank (); 1260 pointer_blank ();
… …
1348 32 + x, 1352 32 + x,
1349 32 + y); 1353 32 + y);
1350} 1354}
1351 1355
1352/*{{{ process an X event */ 1356/*{{{ process an X event */
1353void 1357void ecb_hot
1354rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1355{ 1359{
1356 make_current (); 1360 make_current ();
1357 1361
1358 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1461 if (ev.xconfigure.window == parent) 1465 if (ev.xconfigure.window == parent)
1462 { 1466 {
1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1464 ; 1468 ;
1465 1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1466#ifdef HAVE_BG_PIXMAP 1473#ifdef HAVE_BG_PIXMAP
1467 bool moved = false;
1468 if (bg_window_position_sensitive ()) 1474 if (bg_window_position_sensitive ())
1469 { 1475 {
1476 want_position_change = true;
1477 if (!(bg_flags & BG_IS_VALID))
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1470 int x, y; 1484 int x, y;
1485
1471 if (ev.xconfigure.send_event) 1486 if (ev.xconfigure.send_event)
1472 { 1487 {
1473 x = ev.xconfigure.x; 1488 x = ev.xconfigure.x;
1474 y = ev.xconfigure.y; 1489 y = ev.xconfigure.y;
1475 } 1490 }
1476 else 1491 else
1477 get_window_origin (x, y); 1492 get_window_origin (x, y);
1478 1493
1479 if (bg_set_position (x, y) 1494 if (x != parent_x || y != parent_y)
1480 || !(bg_flags & BG_IS_VALID)) 1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1481 moved = true; 1499 moved = true;
1500 }
1482 } 1501 }
1483#endif
1484 1502
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1504 {
1487 seen_resize = 1; 1505 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
… …
1511 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1512 break; 1530 break;
1513 1531
1514 case MapNotify: 1532 case MapNotify:
1515#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1516 /* This is needed specifically to fix the case of no window manager or a 1534 // This is needed at startup for the case of no window manager
1517 * non-reparenting window manager. In those cases we never get first 1535 // or a non-reparenting window manager and also because we
1518 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 // defer bg image updates if the window is not mapped. The
1519 * care of multiplicity of ConfigureNotify events arriving while WM does 1537 // short delay is to optimize for multiple ConfigureNotify
1520 * reparenting. 1538 // events at startup when the window manager reparents the
1521 * We should not render background immediately, as there could be several 1539 // window, so as to perform the computation after we have
1522 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 // received all of them.
1523 * by scheduling background redraw as soon as we can, but giving a short
1524 * bit of time for ConfigureNotifies to arrive.
1525 * We should render background PRIOR to drawing any text, but AFTER all
1526 * of ConfigureNotifys for the best results.
1527 */
1528 if (!(bg_flags & BG_IS_VALID)) 1541 if (!(bg_flags & BG_IS_VALID))
1529 update_background_ev.start (0.025); 1542 update_background_ev.start (0.025);
1530#endif 1543#endif
1531 mapped = 1; 1544 mapped = 1;
1532#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
… …
1713 1726
1714 refresh_check (); 1727 refresh_check ();
1715} 1728}
1716 1729
1717#if ENABLE_FRILLS 1730#if ENABLE_FRILLS
1718void 1731void ecb_cold
1719rxvt_term::set_urgency (bool enable) 1732rxvt_term::set_urgency (bool enable)
1720{ 1733{
1721 if (enable == urgency_hint) 1734 if (enable == urgency_hint)
1722 return; 1735 return;
1723 1736
… …
1729 XFree (h); 1742 XFree (h);
1730 } 1743 }
1731} 1744}
1732#endif 1745#endif
1733 1746
1734void 1747void ecb_cold
1735rxvt_term::focus_in () 1748rxvt_term::focus_in ()
1736{ 1749{
1737 if (!focus) 1750 if (!focus)
1738 { 1751 {
1739 focus = 1; 1752 focus = 1;
… …
1764 1777
1765 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1766 } 1779 }
1767} 1780}
1768 1781
1769void 1782void ecb_cold
1770rxvt_term::focus_out () 1783rxvt_term::focus_out ()
1771{ 1784{
1772 if (focus) 1785 if (focus)
1773 { 1786 {
1774 focus = 0; 1787 focus = 0;
… …
1807 1820
1808 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1809 } 1822 }
1810} 1823}
1811 1824
1812void 1825void ecb_cold
1813rxvt_term::update_fade_color (unsigned int idx) 1826rxvt_term::update_fade_color (unsigned int idx)
1814{ 1827{
1815#if OFF_FOCUS_FADING 1828#if OFF_FOCUS_FADING
1816 if (rs[Rs_fade]) 1829 if (rs[Rs_fade])
1817 { 1830 {
… …
1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1833 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821 } 1834 }
1822#endif 1835#endif
1823} 1836}
1824 1837
1825#if ENABLE_TRANSPARENCY || ENABLE_PERL 1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1826void 1839void ecb_hot
1827rxvt_term::rootwin_cb (XEvent &ev) 1840rxvt_term::rootwin_cb (XEvent &ev)
1828{ 1841{
1829 make_current (); 1842 make_current ();
1830 1843
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1844 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1845 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return; 1846 return;
1834 1847
1835# if ENABLE_TRANSPARENCY
1836 switch (ev.type) 1848 switch (ev.type)
1837 { 1849 {
1838 case PropertyNotify: 1850 case PropertyNotify:
1839 /* 1851 /*
1840 * if user used some Esetroot compatible prog to set the root bg, 1852 * if user used some Esetroot compatible prog to set the root bg,
1841 * use the property to determine the pixmap. We use it later on. 1853 * use the property to determine the pixmap. We use it later on.
1842 */ 1854 */
1843 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845 { 1857 {
1858#if BG_IMAGE_FROM_ROOT
1846 bg_set_root_pixmap (); 1859 bg_set_root_pixmap ();
1847 update_background (); 1860 update_background ();
1861#endif
1862#if ENABLE_PERL
1863 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1864#endif
1848 } 1865 }
1849 1866
1850 break; 1867 break;
1851 } 1868 }
1852# endif
1853 1869
1854 refresh_check (); 1870 refresh_check ();
1855} 1871}
1856#endif 1872#endif
1857 1873
… …
2215 } 2231 }
2216} 2232}
2217 2233
2218/*}}} */ 2234/*}}} */
2219 2235
2220void 2236void ecb_hot
2221rxvt_term::cmd_parse () 2237rxvt_term::cmd_parse ()
2222{ 2238{
2223 wchar_t ch = NOCHAR; 2239 wchar_t ch = NOCHAR;
2224 char *seq_begin; // remember start of esc-sequence here 2240 char *seq_begin; // remember start of esc-sequence here
2225 2241
… …
2344 } 2360 }
2345 } 2361 }
2346} 2362}
2347 2363
2348// read the next character 2364// read the next character
2349wchar_t 2365wchar_t ecb_hot
2350rxvt_term::next_char () NOTHROW 2366rxvt_term::next_char () NOTHROW
2351{ 2367{
2352 while (cmdbuf_ptr < cmdbuf_endp) 2368 while (cmdbuf_ptr < cmdbuf_endp)
2353 { 2369 {
2354 // assume 7-bit to be ascii ALWAYS 2370 // assume 7-bit to be ascii ALWAYS
… …
2366 } 2382 }
2367 2383
2368 if (len == (size_t)-1) 2384 if (len == (size_t)-1)
2369 { 2385 {
2370 mbstate.reset (); // reset now undefined conversion state 2386 mbstate.reset (); // reset now undefined conversion state
2387 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2388 // in which case we "erroneously" return the next byte which might be valid.
2371 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2389 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2372 } 2390 }
2373 2391
2374 // assume wchar == unicode 2392 // assume wchar == unicode
2375 cmdbuf_ptr += len; 2393 cmdbuf_ptr += len;
… …
2378 2396
2379 return NOCHAR; 2397 return NOCHAR;
2380} 2398}
2381 2399
2382// read the next octet 2400// read the next octet
2383uint32_t 2401uint32_t ecb_hot
2384rxvt_term::next_octet () NOTHROW 2402rxvt_term::next_octet () NOTHROW
2385{ 2403{
2386 return cmdbuf_ptr < cmdbuf_endp 2404 return cmdbuf_ptr < cmdbuf_endp
2387 ? (unsigned char)*cmdbuf_ptr++ 2405 ? (unsigned char)*cmdbuf_ptr++
2388 : NOCHAR; 2406 : NOCHAR;
2389} 2407}
2390 2408
2391static class out_of_input out_of_input; 2409static class out_of_input out_of_input;
2392 2410
2393wchar_t 2411wchar_t ecb_hot
2394rxvt_term::cmd_getc () THROW ((class out_of_input)) 2412rxvt_term::cmd_getc () THROW ((class out_of_input))
2395{ 2413{
2396 wchar_t c = next_char (); 2414 wchar_t c = next_char ();
2397 2415
2398 if (c == NOCHAR) 2416 if (c == NOCHAR)
2399 throw out_of_input; 2417 throw out_of_input;
2400 2418
2401 return c; 2419 return c;
2402} 2420}
2403 2421
2404uint32_t 2422uint32_t ecb_hot
2405rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2423rxvt_term::cmd_get8 () THROW ((class out_of_input))
2406{ 2424{
2407 uint32_t c = next_octet (); 2425 uint32_t c = next_octet ();
2408 2426
2409 if (c == NOCHAR) 2427 if (c == NOCHAR)
… …
2413} 2431}
2414 2432
2415/*{{{ print pipe */ 2433/*{{{ print pipe */
2416/*----------------------------------------------------------------------*/ 2434/*----------------------------------------------------------------------*/
2417#ifdef PRINTPIPE 2435#ifdef PRINTPIPE
2418FILE * 2436FILE * ecb_cold
2419rxvt_term::popen_printer () 2437rxvt_term::popen_printer ()
2420{ 2438{
2421 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2439 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2422 2440
2423 if (stream == NULL) 2441 if (stream == NULL)
2424 rxvt_warn ("can't open printer pipe, not printing.\n"); 2442 rxvt_warn ("can't open printer pipe, not printing.\n");
2425 2443
2426 return stream; 2444 return stream;
2427} 2445}
2428 2446
2429int 2447int ecb_cold
2430rxvt_term::pclose_printer (FILE *stream) 2448rxvt_term::pclose_printer (FILE *stream)
2431{ 2449{
2432 fflush (stream); 2450 fflush (stream);
2433 return pclose (stream); 2451 return pclose (stream);
2434} 2452}
2435 2453
2436/* 2454/*
2437 * simulate attached vt100 printer 2455 * simulate attached vt100 printer
2438 */ 2456 */
2439void 2457void ecb_cold
2440rxvt_term::process_print_pipe () 2458rxvt_term::process_print_pipe ()
2441{ 2459{
2442 FILE *fd = popen_printer (); 2460 FILE *fd = popen_printer ();
2443 2461
2444 if (!fd) 2462 if (!fd)
… …
2499 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2517 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2500 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2518 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2501}; 2519};
2502 2520
2503/*{{{ process non-printing single characters */ 2521/*{{{ process non-printing single characters */
2504void 2522void ecb_hot
2505rxvt_term::process_nonprinting (unicode_t ch) 2523rxvt_term::process_nonprinting (unicode_t ch)
2506{ 2524{
2507 switch (ch) 2525 switch (ch)
2508 { 2526 {
2509 case C0_ESC: 2527 case C0_ESC:
… …
2555} 2573}
2556/*}}} */ 2574/*}}} */
2557 2575
2558 2576
2559/*{{{ process VT52 escape sequences */ 2577/*{{{ process VT52 escape sequences */
2560void 2578void ecb_cold
2561rxvt_term::process_escape_vt52 (unicode_t ch) 2579rxvt_term::process_escape_vt52 (unicode_t ch)
2562{ 2580{
2563 int row, col; 2581 int row, col;
2564 2582
2565 switch (ch) 2583 switch (ch)
… …
2615} 2633}
2616/*}}} */ 2634/*}}} */
2617 2635
2618 2636
2619/*{{{ process escape sequences */ 2637/*{{{ process escape sequences */
2620void 2638void ecb_hot
2621rxvt_term::process_escape_seq () 2639rxvt_term::process_escape_seq ()
2622{ 2640{
2623 unicode_t ch = cmd_getc (); 2641 unicode_t ch = cmd_getc ();
2624 2642
2625 if (priv_modes & PrivMode_vt52) 2643 if (priv_modes & PrivMode_vt52)
… …
2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2795 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2796 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2797 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2780 }; 2798 };
2781 2799
2782void 2800void ecb_hot
2783rxvt_term::process_csi_seq () 2801rxvt_term::process_csi_seq ()
2784{ 2802{
2785 unicode_t ch, priv, i; 2803 unicode_t ch, priv, i;
2786 unsigned int nargs, p; 2804 unsigned int nargs, p;
2787 int n, ndef; 2805 int n, ndef;
… …
3430 break; 3448 break;
3431#endif 3449#endif
3432 case URxvt_Color_border: 3450 case URxvt_Color_border:
3433 process_color_seq (op, Color_border, str, resp); 3451 process_color_seq (op, Color_border, str, resp);
3434 break; 3452 break;
3435#if ENABLE_TRANSPARENCY 3453
3454#if BG_IMAGE_FROM_ROOT
3436 case URxvt_Color_tint: 3455 case URxvt_Color_tint:
3437 process_color_seq (op, Color_tint, str, resp); 3456 process_color_seq (op, Color_tint, str, resp);
3438 { 3457 {
3439 bool changed = false; 3458 bool changed = false;
3440 3459
3441 if (ISSET_PIXCOLOR (Color_tint)) 3460 if (ISSET_PIXCOLOR (Color_tint))
3442 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3461 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3443 3462
3444 if (changed) 3463 if (changed)
3445 update_background (); 3464 update_background ();
3446 } 3465 }
3447 3466
… …
3451#if BG_IMAGE_FROM_FILE 3470#if BG_IMAGE_FROM_FILE
3452 case Rxvt_Pixmap: 3471 case Rxvt_Pixmap:
3453 if (!strcmp (str, "?")) 3472 if (!strcmp (str, "?"))
3454 { 3473 {
3455 char str[256]; 3474 char str[256];
3475 int h_scale = fimage.h_scale;
3476 int v_scale = fimage.v_scale;
3477 int h_align = fimage.h_align;
3478 int v_align = fimage.v_align;
3456 3479
3457 sprintf (str, "[%dx%d+%d+%d]", 3480 sprintf (str, "[%dx%d+%d+%d]",
3458 min (h_scale, 32767), min (v_scale, 32767), 3481 h_scale, v_scale,
3459 min (h_align, 32767), min (v_align, 32767)); 3482 h_align, v_align);
3460 process_xterm_seq (XTerm_title, str, CHAR_ST); 3483 process_xterm_seq (XTerm_title, str, CHAR_ST);
3461 } 3484 }
3462 else 3485 else
3463 { 3486 {
3464 bool changed = false; 3487 bool changed = false;
3465 3488
3466 if (*str != ';') 3489 if (*str != ';')
3467 { 3490 {
3468 if (bg_set_file (str)) /* change pixmap */ 3491 try
3492 {
3493 fimage.set_file_geometry (this, str);
3469 changed = true; 3494 changed = true;
3495 }
3496 catch (const class rxvt_failure_exception &e)
3497 {
3498 }
3470 } 3499 }
3471 else 3500 else
3472 { 3501 {
3473 str++; 3502 str++;
3474 if (bg_set_geometry (str, true)) 3503 if (fimage.set_geometry (str, true))
3475 changed = true; 3504 changed = true;
3476 } 3505 }
3477 3506
3478 if (changed) 3507 if (changed)
3479 { 3508 {
3480 if (bg_window_position_sensitive ()) 3509 if (bg_window_position_sensitive ())
3481 { 3510 {
3482 int x, y; 3511 int x, y;
3483 get_window_origin (x, y); 3512 get_window_origin (x, y);
3484 bg_set_position (x, y); 3513 parent_x = x;
3514 parent_y = y;
3485 } 3515 }
3486 update_background (); 3516 update_background ();
3487 } 3517 }
3488 } 3518 }
3489 break; 3519 break;
… …
3579 * 's' = save 3609 * 's' = save
3580 * 'r' = restore 3610 * 'r' = restore
3581 * 't' = toggle 3611 * 't' = toggle
3582 * so no need for fancy checking 3612 * so no need for fancy checking
3583 */ 3613 */
3584int 3614int ecb_cold
3585rxvt_term::privcases (int mode, unsigned long bit) 3615rxvt_term::privcases (int mode, unsigned long bit)
3586{ 3616{
3587 int state; 3617 int state;
3588 3618
3589 if (mode == 's') 3619 if (mode == 's')
3590 { 3620 {
3591 SavedModes |= (priv_modes & bit); 3621 if (priv_modes & bit)
3622 SavedModes |= bit;
3623 else
3624 SavedModes &= ~bit;
3592 return -1; 3625 return -1;
3593 } 3626 }
3594 else 3627 else
3595 { 3628 {
3596 if (mode == 'r') 3629 if (mode == 'r')
… …
3806 } 3839 }
3807} 3840}
3808/*}}} */ 3841/*}}} */
3809 3842
3810/*{{{ process sgr sequences */ 3843/*{{{ process sgr sequences */
3811void 3844void ecb_hot
3812rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3845rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3813{ 3846{
3814 unsigned int i; 3847 unsigned int i;
3815 short rendset; 3848 short rendset;
3816 int rendstyle; 3849 int rendstyle;

Diff Legend

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