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.499 by root, Wed Nov 16 20:15:45 2011 UTC vs.
Revision 1.514 by root, Mon Jun 4 15:18:52 2012 UTC

… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
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
… …
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)
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;
… …
254 delete [] alloc; 254 delete [] alloc;
255# endif 255# endif
256} 256}
257#endif 257#endif
258 258
259void 259void ecb_cold
260rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
261{ 261{
262 wchar_t ch = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
263 263
264 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
… …
282 } 282 }
283 283
284 iso14755buf = 0; 284 iso14755buf = 0;
285} 285}
286 286
287static int 287static int ecb_cold
288hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
289{ 289{
290 // check whether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
291 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
292 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
… …
301 301
302 return -1; 302 return -1;
303} 303}
304#endif 304#endif
305 305
306static inline KeySym 306static inline KeySym ecb_cold
307translate_keypad (KeySym keysym, bool kp) 307translate_keypad (KeySym keysym, bool kp)
308{ 308{
309#ifdef XK_KP_Home 309#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = { 310 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home 311 XK_KP_7, // XK_KP_Home
… …
337# endif 337# endif
338#endif 338#endif
339 return keysym; 339 return keysym;
340} 340}
341 341
342static inline int 342static inline int ecb_cold
343map_function_key (KeySym keysym) 343map_function_key (KeySym keysym)
344{ 344{
345 int param = 0; 345 int param = 0;
346 346
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
396 break; 396 break;
397 } 397 }
398 return param; 398 return param;
399} 399}
400 400
401void 401void ecb_cold
402rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
403{ 403{
404 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
405 KeySym keysym; 405 KeySym keysym;
406 int valid_keysym; 406 int valid_keysym;
… …
421 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
422 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
423 423
424 kbuf[0] = 0; 424 kbuf[0] = 0;
425 425
426#ifdef USE_XIM 426#if USE_XIM
427 if (Input_Context) 427 if (Input_Context)
428 { 428 {
429 Status status_return; 429 Status status_return;
430 430
431#if 0 431#if 0
… …
776 } 776 }
777 777
778 if (newlen) 778 if (newlen)
779 len = strlen (kbuf); 779 len = strlen (kbuf);
780 780
781 if (len > 0)
782 {
781 /* 783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
782 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
783 */ 797 */
784#ifdef META8_OPTION 798#ifdef META8_OPTION
785 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
786 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
787#endif 801#endif
802 }
788 803
789 } 804 }
790 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
791 { 806 {
792 len = 1; 807 len = 1;
… …
826 { 841 {
827 view_start = 0; 842 view_start = 0;
828 want_refresh = 1; 843 want_refresh = 1;
829 } 844 }
830 845
831 /*
832 * these modifications only affect the static keybuffer
833 * pass Shift/Control indicators for function keys ending with `~'
834 *
835 * eg,
836 * Prior = "ESC[5~"
837 * Shift+Prior = "ESC[5$"
838 * Ctrl+Prior = "ESC[5^"
839 * Ctrl+Shift+Prior = "ESC[5@"
840 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841 */
842 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844
845 /* escape prefix */ 846 /* escape prefix */
846 if (meta 847 if (meta
847#ifdef META8_OPTION 848#ifdef META8_OPTION
848 && meta_char == C0_ESC 849 && meta_char == C0_ESC
849#endif 850#endif
… …
854 } 855 }
855 856
856 tt_write (kbuf, (unsigned int)len); 857 tt_write (kbuf, (unsigned int)len);
857} 858}
858 859
859void 860void ecb_cold
860rxvt_term::key_release (XKeyEvent &ev) 861rxvt_term::key_release (XKeyEvent &ev)
861{ 862{
862#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 863#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863 KeySym keysym; 864 KeySym keysym;
864 865
… …
986 while (row < end_row); 987 while (row < end_row);
987 } 988 }
988 989
989 scr_refresh (); 990 scr_refresh ();
990 scrollBar.show (1); 991 scrollBar.show (1);
991#ifdef USE_XIM 992#if USE_XIM
992 im_send_spot (); 993 im_send_spot ();
993#endif 994#endif
994 } 995 }
995 996
996 display->flush (); 997 display->flush ();
… …
1014 refresh_count = 0; 1015 refresh_count = 0;
1015 flush (); 1016 flush ();
1016} 1017}
1017 1018
1018#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1020void
1021rxvt_term::cursor_blink_reset ()
1022{
1023 if (hidden_cursor)
1024 {
1025 hidden_cursor = 0;
1026 want_refresh = 1;
1027 }
1028
1029 if (option (Opt_cursorBlink))
1030 cursor_blink_ev.again ();
1031 else
1032 cursor_blink_ev.stop ();
1033}
1034
1019void 1035void
1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021{ 1037{
1022 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1023 want_refresh = 1; 1039 want_refresh = 1;
… …
1203 pty_write (); 1219 pty_write ();
1204 1220
1205 refresh_check (); 1221 refresh_check ();
1206} 1222}
1207 1223
1208void 1224void ecb_cold
1209rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1210{ 1226{
1211 XDefineCursor (dpy, vt, TermWin_cursor); 1227 XDefineCursor (dpy, vt, TermWin_cursor);
1212 recolour_cursor (); 1228 recolour_cursor ();
1213 1229
… …
1218 pointer_ev.start (pointerBlankDelay); 1234 pointer_ev.start (pointerBlankDelay);
1219#endif 1235#endif
1220} 1236}
1221 1237
1222#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1223void 1239void ecb_cold
1224rxvt_term::pointer_blank () 1240rxvt_term::pointer_blank ()
1225{ 1241{
1226 if (!option (Opt_pointerBlank)) 1242 if (!option (Opt_pointerBlank))
1227 return; 1243 return;
1228 1244
… …
1230 XFlush (dpy); 1246 XFlush (dpy);
1231 1247
1232 hidden_pointer = 1; 1248 hidden_pointer = 1;
1233} 1249}
1234 1250
1235void 1251void ecb_cold
1236rxvt_term::pointer_cb (ev::timer &w, int revents) 1252rxvt_term::pointer_cb (ev::timer &w, int revents)
1237{ 1253{
1238 make_current (); 1254 make_current ();
1239 1255
1240 pointer_blank (); 1256 pointer_blank ();
… …
1332 32 + x, 1348 32 + x,
1333 32 + y); 1349 32 + y);
1334} 1350}
1335 1351
1336/*{{{ process an X event */ 1352/*{{{ process an X event */
1337void 1353void ecb_hot
1338rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1339{ 1355{
1340 make_current (); 1356 make_current ();
1341 1357
1342 dLocal (Display *, dpy); 1358 dLocal (Display *, dpy);
… …
1633 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1634 } 1650 }
1635 else 1651 else
1636 { 1652 {
1637 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1638 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1639 } 1655 }
1640 1656
1641 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1642 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1643 + 1; 1659 + 1;
… …
1675 } 1691 }
1676 break; 1692 break;
1677 } 1693 }
1678 1694
1679#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1680 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1681 {
1682 if (hidden_cursor)
1683 {
1684 hidden_cursor = 0;
1685 want_refresh = 1;
1686 }
1687
1688 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1689 }
1690#endif 1698#endif
1691 1699
1692#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1702 {
… …
1705 1713
1706 refresh_check (); 1714 refresh_check ();
1707} 1715}
1708 1716
1709#if ENABLE_FRILLS 1717#if ENABLE_FRILLS
1710void 1718void ecb_cold
1711rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1712{ 1720{
1713 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1714 return; 1722 return;
1715 1723
… …
1721 XFree (h); 1729 XFree (h);
1722 } 1730 }
1723} 1731}
1724#endif 1732#endif
1725 1733
1726void 1734void ecb_cold
1727rxvt_term::focus_in () 1735rxvt_term::focus_in ()
1728{ 1736{
1729 if (!focus) 1737 if (!focus)
1730 { 1738 {
1731 focus = 1; 1739 focus = 1;
… …
1756 1764
1757 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1765 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758 } 1766 }
1759} 1767}
1760 1768
1761void 1769void ecb_cold
1762rxvt_term::focus_out () 1770rxvt_term::focus_out ()
1763{ 1771{
1764 if (focus) 1772 if (focus)
1765 { 1773 {
1766 focus = 0; 1774 focus = 0;
… …
1799 1807
1800 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1808 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1801 } 1809 }
1802} 1810}
1803 1811
1804void 1812void ecb_cold
1805rxvt_term::update_fade_color (unsigned int idx) 1813rxvt_term::update_fade_color (unsigned int idx)
1806{ 1814{
1807#if OFF_FOCUS_FADING 1815#if OFF_FOCUS_FADING
1808 if (rs[Rs_fade]) 1816 if (rs[Rs_fade])
1809 { 1817 {
… …
1813 } 1821 }
1814#endif 1822#endif
1815} 1823}
1816 1824
1817#if ENABLE_TRANSPARENCY || ENABLE_PERL 1825#if ENABLE_TRANSPARENCY || ENABLE_PERL
1818void 1826void ecb_hot
1819rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1820{ 1828{
1821 make_current (); 1829 make_current ();
1822 1830
1823 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
… …
2162 case Button3: 2170 case Button3:
2163 selection_make (ev.time); 2171 selection_make (ev.time);
2164 break; 2172 break;
2165 2173
2166 case Button2: 2174 case Button2:
2167 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2175 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2168 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2169 break; 2177 break;
2170 2178
2171#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2172 case Button4: 2180 case Button4:
… …
2207 } 2215 }
2208} 2216}
2209 2217
2210/*}}} */ 2218/*}}} */
2211 2219
2212void 2220void ecb_hot
2213rxvt_term::cmd_parse () 2221rxvt_term::cmd_parse ()
2214{ 2222{
2215 wchar_t ch = NOCHAR; 2223 wchar_t ch = NOCHAR;
2216 char *seq_begin; // remember start of esc-sequence here 2224 char *seq_begin; // remember start of esc-sequence here
2217 2225
… …
2336 } 2344 }
2337 } 2345 }
2338} 2346}
2339 2347
2340// read the next character 2348// read the next character
2341wchar_t 2349wchar_t ecb_hot
2342rxvt_term::next_char () NOTHROW 2350rxvt_term::next_char () NOTHROW
2343{ 2351{
2344 while (cmdbuf_ptr < cmdbuf_endp) 2352 while (cmdbuf_ptr < cmdbuf_endp)
2345 { 2353 {
2346 // assume 7-bit to be ascii ALWAYS 2354 // assume 7-bit to be ascii ALWAYS
… …
2370 2378
2371 return NOCHAR; 2379 return NOCHAR;
2372} 2380}
2373 2381
2374// read the next octet 2382// read the next octet
2375uint32_t 2383uint32_t ecb_hot
2376rxvt_term::next_octet () NOTHROW 2384rxvt_term::next_octet () NOTHROW
2377{ 2385{
2378 return cmdbuf_ptr < cmdbuf_endp 2386 return cmdbuf_ptr < cmdbuf_endp
2379 ? (unsigned char)*cmdbuf_ptr++ 2387 ? (unsigned char)*cmdbuf_ptr++
2380 : NOCHAR; 2388 : NOCHAR;
2381} 2389}
2382 2390
2383static class out_of_input out_of_input; 2391static class out_of_input out_of_input;
2384 2392
2385wchar_t 2393wchar_t ecb_hot
2386rxvt_term::cmd_getc () THROW ((class out_of_input)) 2394rxvt_term::cmd_getc () THROW ((class out_of_input))
2387{ 2395{
2388 wchar_t c = next_char (); 2396 wchar_t c = next_char ();
2389 2397
2390 if (c == NOCHAR) 2398 if (c == NOCHAR)
2391 throw out_of_input; 2399 throw out_of_input;
2392 2400
2393 return c; 2401 return c;
2394} 2402}
2395 2403
2396uint32_t 2404uint32_t ecb_hot
2397rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2405rxvt_term::cmd_get8 () THROW ((class out_of_input))
2398{ 2406{
2399 uint32_t c = next_octet (); 2407 uint32_t c = next_octet ();
2400 2408
2401 if (c == NOCHAR) 2409 if (c == NOCHAR)
… …
2405} 2413}
2406 2414
2407/*{{{ print pipe */ 2415/*{{{ print pipe */
2408/*----------------------------------------------------------------------*/ 2416/*----------------------------------------------------------------------*/
2409#ifdef PRINTPIPE 2417#ifdef PRINTPIPE
2410FILE * 2418FILE * ecb_cold
2411rxvt_term::popen_printer () 2419rxvt_term::popen_printer ()
2412{ 2420{
2413 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2421 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2414 2422
2415 if (stream == NULL) 2423 if (stream == NULL)
2416 rxvt_warn ("can't open printer pipe, not printing.\n"); 2424 rxvt_warn ("can't open printer pipe, not printing.\n");
2417 2425
2418 return stream; 2426 return stream;
2419} 2427}
2420 2428
2421int 2429int ecb_cold
2422rxvt_term::pclose_printer (FILE *stream) 2430rxvt_term::pclose_printer (FILE *stream)
2423{ 2431{
2424 fflush (stream); 2432 fflush (stream);
2425 return pclose (stream); 2433 return pclose (stream);
2426} 2434}
2427 2435
2428/* 2436/*
2429 * simulate attached vt100 printer 2437 * simulate attached vt100 printer
2430 */ 2438 */
2431void 2439void ecb_cold
2432rxvt_term::process_print_pipe () 2440rxvt_term::process_print_pipe ()
2433{ 2441{
2434 FILE *fd = popen_printer (); 2442 FILE *fd = popen_printer ();
2435 2443
2436 if (!fd) 2444 if (!fd)
… …
2491 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2499 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2492 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2500 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2493}; 2501};
2494 2502
2495/*{{{ process non-printing single characters */ 2503/*{{{ process non-printing single characters */
2496void 2504void ecb_hot
2497rxvt_term::process_nonprinting (unicode_t ch) 2505rxvt_term::process_nonprinting (unicode_t ch)
2498{ 2506{
2499 switch (ch) 2507 switch (ch)
2500 { 2508 {
2501 case C0_ESC: 2509 case C0_ESC:
… …
2547} 2555}
2548/*}}} */ 2556/*}}} */
2549 2557
2550 2558
2551/*{{{ process VT52 escape sequences */ 2559/*{{{ process VT52 escape sequences */
2552void 2560void ecb_cold
2553rxvt_term::process_escape_vt52 (unicode_t ch) 2561rxvt_term::process_escape_vt52 (unicode_t ch)
2554{ 2562{
2555 int row, col; 2563 int row, col;
2556 2564
2557 switch (ch) 2565 switch (ch)
… …
2607} 2615}
2608/*}}} */ 2616/*}}} */
2609 2617
2610 2618
2611/*{{{ process escape sequences */ 2619/*{{{ process escape sequences */
2612void 2620void ecb_hot
2613rxvt_term::process_escape_seq () 2621rxvt_term::process_escape_seq ()
2614{ 2622{
2615 unicode_t ch = cmd_getc (); 2623 unicode_t ch = cmd_getc ();
2616 2624
2617 if (priv_modes & PrivMode_vt52) 2625 if (priv_modes & PrivMode_vt52)
… …
2769 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2770 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2771 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2772 }; 2780 };
2773 2781
2774void 2782void ecb_hot
2775rxvt_term::process_csi_seq () 2783rxvt_term::process_csi_seq ()
2776{ 2784{
2777 unicode_t ch, priv, i; 2785 unicode_t ch, priv, i;
2778 unsigned int nargs, p; 2786 unsigned int nargs, p;
2779 int n, ndef; 2787 int n, ndef;
… …
3133 break; 3141 break;
3134 3142
3135 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3136 default: 3144 default:
3137 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3138 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3139 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3140 break; 3148 break;
3141 3149
3142 /* 3150 /*
3143 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
… …
3429 process_color_seq (op, Color_tint, str, resp); 3437 process_color_seq (op, Color_tint, str, resp);
3430 { 3438 {
3431 bool changed = false; 3439 bool changed = false;
3432 3440
3433 if (ISSET_PIXCOLOR (Color_tint)) 3441 if (ISSET_PIXCOLOR (Color_tint))
3434 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3442 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3435 3443
3436 if (changed) 3444 if (changed)
3437 update_background (); 3445 update_background ();
3438 } 3446 }
3439 3447
… …
3443#if BG_IMAGE_FROM_FILE 3451#if BG_IMAGE_FROM_FILE
3444 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3445 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3446 { 3454 {
3447 char str[256]; 3455 char str[256];
3456 int h_scale = 0, v_scale = 0;
3457 int h_align = 0, v_align = 0;
3458 if (image_vec.size () > 0)
3459 {
3460 h_scale = image_vec[0].h_scale;
3461 v_scale = image_vec[0].v_scale;
3462 h_align = image_vec[0].h_align;
3463 v_align = image_vec[0].v_align;
3464 }
3448 3465
3449 sprintf (str, "[%dx%d+%d+%d]", 3466 sprintf (str, "[%dx%d+%d+%d]",
3450 min (h_scale, 32767), min (v_scale, 32767), 3467 h_scale, v_scale,
3451 min (h_align, 32767), min (v_align, 32767)); 3468 h_align, v_align);
3452 process_xterm_seq (XTerm_title, str, CHAR_ST); 3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3453 } 3470 }
3454 else 3471 else
3455 { 3472 {
3456 bool changed = false; 3473 bool changed = false;
3457 3474
3458 if (*str != ';') 3475 if (*str != ';')
3459 { 3476 {
3460 if (bg_set_file (str)) /* change pixmap */ 3477 if (image_vec.size () > 0)
3478 changed = image_vec[0].set_file_geometry (str);
3479 else
3480 {
3481 rxvt_image *image = new_image ();
3482 if (!image->set_file_geometry (str))
3483 image_vec.pop_back ();
3484 else
3461 changed = true; 3485 changed = true;
3486 }
3462 } 3487 }
3463 else 3488 else
3464 { 3489 {
3465 str++; 3490 str++;
3491 if (image_vec.size () > 0)
3466 if (bg_set_geometry (str, true)) 3492 changed = image_vec[0].set_geometry (str, true);
3467 changed = true;
3468 } 3493 }
3469 3494
3470 if (changed) 3495 if (changed)
3471 { 3496 {
3472 if (bg_window_position_sensitive ()) 3497 if (bg_window_position_sensitive ())
… …
3571 * 's' = save 3596 * 's' = save
3572 * 'r' = restore 3597 * 'r' = restore
3573 * 't' = toggle 3598 * 't' = toggle
3574 * so no need for fancy checking 3599 * so no need for fancy checking
3575 */ 3600 */
3576int 3601int ecb_cold
3577rxvt_term::privcases (int mode, unsigned long bit) 3602rxvt_term::privcases (int mode, unsigned long bit)
3578{ 3603{
3579 int state; 3604 int state;
3580 3605
3581 if (mode == 's') 3606 if (mode == 's')
3582 { 3607 {
3583 SavedModes |= (priv_modes & bit); 3608 if (priv_modes & bit)
3609 SavedModes |= bit;
3610 else
3611 SavedModes &= ~bit;
3584 return -1; 3612 return -1;
3585 } 3613 }
3586 else 3614 else
3587 { 3615 {
3588 if (mode == 'r') 3616 if (mode == 'r')
… …
3798 } 3826 }
3799} 3827}
3800/*}}} */ 3828/*}}} */
3801 3829
3802/*{{{ process sgr sequences */ 3830/*{{{ process sgr sequences */
3803void 3831void ecb_hot
3804rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3832rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3805{ 3833{
3806 unsigned int i; 3834 unsigned int i;
3807 short rendset; 3835 short rendset;
3808 int rendstyle; 3836 int rendstyle;

Diff Legend

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