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.491 by sf-exg, Fri Aug 19 17:42:09 2011 UTC vs.
Revision 1.512 by root, Mon May 28 16:40:03 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;
… …
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
… …
1015 flush (); 1016 flush ();
1016} 1017}
1017 1018
1018#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1019void 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
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;
1024 refresh_check (); 1040 refresh_check ();
… …
1042 1058
1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044void 1060void
1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046{ 1062{
1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049 { 1065 {
1050 want_refresh = 1; 1066 want_refresh = 1;
1051 refresh_check (); 1067 refresh_check ();
1052 } 1068 }
1053 else 1069 else
… …
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);
… …
1473 } 1489 }
1474 else 1490 else
1475 { 1491 {
1476#ifdef HAVE_BG_PIXMAP 1492#ifdef HAVE_BG_PIXMAP
1477 if (moved) 1493 if (moved)
1478 {
1479 if (mapped)
1480 update_background (); 1494 update_background ();
1481 else
1482 bg_invalidate ();
1483 }
1484#endif 1495#endif
1485 } 1496 }
1486 1497
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 } 1499 }
… …
1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1574 ;
1564 1575
1565 if (scrollBar.state && ev.xany.window == scrollBar.win) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1577 {
1567 scrollBar.state = STATE_IDLE; 1578 scrollBar.state = SB_STATE_IDLE;
1568 scrollBar.show (0); 1579 scrollBar.show (0);
1569 } 1580 }
1570 } 1581 }
1571 break; 1582 break;
1572 1583
… …
1638 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1639 } 1650 }
1640 else 1651 else
1641 { 1652 {
1642 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1643 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1644 } 1655 }
1645 1656
1646 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1647 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1648 + 1; 1659 + 1;
… …
1660#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1661 } 1672 }
1662#endif 1673#endif
1663 } 1674 }
1664 } 1675 }
1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1677 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1669 ; 1680 ;
1670 1681
1671 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1672 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1686 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677 scrollBar.size ()); 1688 scrollBar.size ());
1678 want_refresh = 1; 1689 want_refresh = 1;
1679 scrollBar.show (1); 1690 scrollBar.show (1);
1680 } 1691 }
1681 break; 1692 break;
1682 } 1693 }
1683 1694
1684#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1685 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1686 {
1687 if (hidden_cursor)
1688 {
1689 hidden_cursor = 0;
1690 want_refresh = 1;
1691 }
1692
1693 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1694 }
1695#endif 1698#endif
1696 1699
1697#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1698 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699 { 1702 {
… …
1710 1713
1711 refresh_check (); 1714 refresh_check ();
1712} 1715}
1713 1716
1714#if ENABLE_FRILLS 1717#if ENABLE_FRILLS
1715void 1718void ecb_cold
1716rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1717{ 1720{
1718 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1719 return; 1722 return;
1720 1723
1721 if (XWMHints *h = XGetWMHints (dpy, parent)) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 { 1725 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent, h); 1727 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable; 1728 urgency_hint = enable;
1729 XFree (h);
1726 } 1730 }
1727} 1731}
1728#endif 1732#endif
1729 1733
1730void 1734void ecb_cold
1731rxvt_term::focus_in () 1735rxvt_term::focus_in ()
1732{ 1736{
1733 if (!focus) 1737 if (!focus)
1734 { 1738 {
1735 focus = 1; 1739 focus = 1;
… …
1760 1764
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1765 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762 } 1766 }
1763} 1767}
1764 1768
1765void 1769void ecb_cold
1766rxvt_term::focus_out () 1770rxvt_term::focus_out ()
1767{ 1771{
1768 if (focus) 1772 if (focus)
1769 { 1773 {
1770 focus = 0; 1774 focus = 0;
… …
1803 1807
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1808 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805 } 1809 }
1806} 1810}
1807 1811
1808void 1812void ecb_cold
1809rxvt_term::update_fade_color (unsigned int idx) 1813rxvt_term::update_fade_color (unsigned int idx)
1810{ 1814{
1811#if OFF_FOCUS_FADING 1815#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade]) 1816 if (rs[Rs_fade])
1813 { 1817 {
… …
1817 } 1821 }
1818#endif 1822#endif
1819} 1823}
1820 1824
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL 1825#if ENABLE_TRANSPARENCY || ENABLE_PERL
1822void 1826void ecb_hot
1823rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1828{
1825 make_current (); 1829 make_current ();
1826 1830
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
… …
1977 if (scrollBar.upButton (ev.y)) 1981 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */ 1982 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y)) 1983 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */ 1984 direction = DN; /* down */
1981 1985
1982 scrollBar.state = STATE_IDLE; 1986 scrollBar.state = SB_STATE_IDLE;
1983 /* 1987 /*
1984 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1985 * move up if mouse is above slider 1989 * move up if mouse is above slider
1986 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
1987 * 1991 *
… …
2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027#endif 2031#endif
2028 if (scr_page (direction, 1)) 2032 if (scr_page (direction, 1))
2029 { 2033 {
2030 if (direction == UP) 2034 if (direction == UP)
2031 scrollBar.state = STATE_UP; 2035 scrollBar.state = SB_STATE_UP;
2032 else 2036 else
2033 scrollBar.state = STATE_DOWN; 2037 scrollBar.state = SB_STATE_DOWN;
2034 } 2038 }
2035 } 2039 }
2036 else 2040 else
2037 switch (ev.button) 2041 switch (ev.button)
2038 { 2042 {
2039 case Button2: 2043 case Button2:
2040 switch (scrollBar.align) 2044 switch (scrollBar.align)
2041 { 2045 {
2042 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2043 csrO = 0; 2047 csrO = 0;
2044 break; 2048 break;
2045 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2046 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2047 break; 2051 break;
2048 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2049 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2050 break; 2054 break;
2051 } 2055 }
2052 2056
2053 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2054 || scrollbar_above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2055 || scrollbar_below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057 2061
2058 scrollBar.state = STATE_MOTION; 2062 scrollBar.state = SB_STATE_MOTION;
2059 break; 2063 break;
2060 2064
2061 case Button1: 2065 case Button1:
2062 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2063 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2064 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2065 2069
2066 case Button3: 2070 case Button3:
2067 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2068 { 2072 {
2069 if (scrollbar_above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2070# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2071 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2072# else 2076# else
2073 scr_page (UP, nrow / 4); 2077 scr_page (UP, nrow / 4);
2074# endif 2078# endif
2075 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollBar.below_slider (ev.y))
2076# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2077 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2078# else 2082# else
2079 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2080# endif 2084# endif
2081 else 2085 else
2082 scrollBar.state = STATE_MOTION; 2086 scrollBar.state = SB_STATE_MOTION;
2083 } 2087 }
2084 else 2088 else
2085 { 2089 {
2086 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2087 (nrow 2091 (nrow
2088 * scrollbar_position (ev.y) 2092 * scrollBar.position (ev.y)
2089 / scrollBar.size ())); 2093 / scrollBar.size ()));
2090 } 2094 }
2091 2095
2092 break; 2096 break;
2093 } 2097 }
… …
2104 2108
2105 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2106 if (!bypass_keystate) 2110 if (!bypass_keystate)
2107 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2108 2112
2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2110 { 2114 {
2111 scrollBar.state = STATE_IDLE; 2115 scrollBar.state = SB_STATE_IDLE;
2112 scrollBar.show (0); 2116 scrollBar.show (0);
2113 } 2117 }
2114 2118
2115#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2116 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
… …
2166 case Button3: 2170 case Button3:
2167 selection_make (ev.time); 2171 selection_make (ev.time);
2168 break; 2172 break;
2169 2173
2170 case Button2: 2174 case Button2:
2171 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?
2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2173 break; 2177 break;
2174 2178
2175#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2176 case Button4: 2180 case Button4:
… …
2211 } 2215 }
2212} 2216}
2213 2217
2214/*}}} */ 2218/*}}} */
2215 2219
2216void 2220void ecb_hot
2217rxvt_term::cmd_parse () 2221rxvt_term::cmd_parse ()
2218{ 2222{
2219 wchar_t ch = NOCHAR; 2223 wchar_t ch = NOCHAR;
2220 char *seq_begin; // remember start of esc-sequence here 2224 char *seq_begin; // remember start of esc-sequence here
2221 2225
… …
2340 } 2344 }
2341 } 2345 }
2342} 2346}
2343 2347
2344// read the next character 2348// read the next character
2345wchar_t 2349wchar_t ecb_hot
2346rxvt_term::next_char () NOTHROW 2350rxvt_term::next_char () NOTHROW
2347{ 2351{
2348 while (cmdbuf_ptr < cmdbuf_endp) 2352 while (cmdbuf_ptr < cmdbuf_endp)
2349 { 2353 {
2350 // assume 7-bit to be ascii ALWAYS 2354 // assume 7-bit to be ascii ALWAYS
… …
2374 2378
2375 return NOCHAR; 2379 return NOCHAR;
2376} 2380}
2377 2381
2378// read the next octet 2382// read the next octet
2379uint32_t 2383uint32_t ecb_hot
2380rxvt_term::next_octet () NOTHROW 2384rxvt_term::next_octet () NOTHROW
2381{ 2385{
2382 return cmdbuf_ptr < cmdbuf_endp 2386 return cmdbuf_ptr < cmdbuf_endp
2383 ? (unsigned char)*cmdbuf_ptr++ 2387 ? (unsigned char)*cmdbuf_ptr++
2384 : NOCHAR; 2388 : NOCHAR;
2385} 2389}
2386 2390
2387static class out_of_input out_of_input; 2391static class out_of_input out_of_input;
2388 2392
2389wchar_t 2393wchar_t ecb_hot
2390rxvt_term::cmd_getc () THROW ((class out_of_input)) 2394rxvt_term::cmd_getc () THROW ((class out_of_input))
2391{ 2395{
2392 wchar_t c = next_char (); 2396 wchar_t c = next_char ();
2393 2397
2394 if (c == NOCHAR) 2398 if (c == NOCHAR)
2395 throw out_of_input; 2399 throw out_of_input;
2396 2400
2397 return c; 2401 return c;
2398} 2402}
2399 2403
2400uint32_t 2404uint32_t ecb_hot
2401rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2405rxvt_term::cmd_get8 () THROW ((class out_of_input))
2402{ 2406{
2403 uint32_t c = next_octet (); 2407 uint32_t c = next_octet ();
2404 2408
2405 if (c == NOCHAR) 2409 if (c == NOCHAR)
… …
2409} 2413}
2410 2414
2411/*{{{ print pipe */ 2415/*{{{ print pipe */
2412/*----------------------------------------------------------------------*/ 2416/*----------------------------------------------------------------------*/
2413#ifdef PRINTPIPE 2417#ifdef PRINTPIPE
2414FILE * 2418FILE * ecb_cold
2415rxvt_term::popen_printer () 2419rxvt_term::popen_printer ()
2416{ 2420{
2417 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");
2418 2422
2419 if (stream == NULL) 2423 if (stream == NULL)
2420 rxvt_warn ("can't open printer pipe, not printing.\n"); 2424 rxvt_warn ("can't open printer pipe, not printing.\n");
2421 2425
2422 return stream; 2426 return stream;
2423} 2427}
2424 2428
2425int 2429int ecb_cold
2426rxvt_term::pclose_printer (FILE *stream) 2430rxvt_term::pclose_printer (FILE *stream)
2427{ 2431{
2428 fflush (stream); 2432 fflush (stream);
2429 return pclose (stream); 2433 return pclose (stream);
2430} 2434}
2431 2435
2432/* 2436/*
2433 * simulate attached vt100 printer 2437 * simulate attached vt100 printer
2434 */ 2438 */
2435void 2439void ecb_cold
2436rxvt_term::process_print_pipe () 2440rxvt_term::process_print_pipe ()
2437{ 2441{
2438 FILE *fd = popen_printer (); 2442 FILE *fd = popen_printer ();
2439 2443
2440 if (!fd) 2444 if (!fd)
… …
2495 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,
2496 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,
2497}; 2501};
2498 2502
2499/*{{{ process non-printing single characters */ 2503/*{{{ process non-printing single characters */
2500void 2504void ecb_hot
2501rxvt_term::process_nonprinting (unicode_t ch) 2505rxvt_term::process_nonprinting (unicode_t ch)
2502{ 2506{
2503 switch (ch) 2507 switch (ch)
2504 { 2508 {
2505 case C0_ESC: 2509 case C0_ESC:
… …
2551} 2555}
2552/*}}} */ 2556/*}}} */
2553 2557
2554 2558
2555/*{{{ process VT52 escape sequences */ 2559/*{{{ process VT52 escape sequences */
2556void 2560void ecb_cold
2557rxvt_term::process_escape_vt52 (unicode_t ch) 2561rxvt_term::process_escape_vt52 (unicode_t ch)
2558{ 2562{
2559 int row, col; 2563 int row, col;
2560 2564
2561 switch (ch) 2565 switch (ch)
… …
2595 break; 2599 break;
2596 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
2597 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2598 break; 2602 break;
2599 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
2600 set_privmode (PrivMode_vt52, 0); 2604 priv_modes &= ~PrivMode_vt52;
2601 break; 2605 break;
2602 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
2603 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
2604 /* unimplemented */ 2608 /* unimplemented */
2605 break; 2609 break;
… …
2611} 2615}
2612/*}}} */ 2616/*}}} */
2613 2617
2614 2618
2615/*{{{ process escape sequences */ 2619/*{{{ process escape sequences */
2616void 2620void ecb_hot
2617rxvt_term::process_escape_seq () 2621rxvt_term::process_escape_seq ()
2618{ 2622{
2619 unicode_t ch = cmd_getc (); 2623 unicode_t ch = cmd_getc ();
2620 2624
2621 if (priv_modes & PrivMode_vt52) 2625 if (priv_modes & PrivMode_vt52)
… …
2658 scr_forwardindex (); 2662 scr_forwardindex ();
2659 break; 2663 break;
2660#endif 2664#endif
2661 // DECPAM/DECPNM 2665 // DECPAM/DECPNM
2662 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
2663 case '>': 2669 case '>':
2664 set_privmode (PrivMode_aplKP, ch == '='); 2670 priv_modes &= ~PrivMode_aplKP;
2665 break; 2671 break;
2666 2672
2667 case C1_40: 2673 case C1_40:
2668 cmd_getc (); 2674 cmd_getc ();
2669 break; 2675 break;
… …
2771 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, */
2772 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, */
2773 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, {, |, }, ~, */
2774 }; 2780 };
2775 2781
2776void 2782void ecb_hot
2777rxvt_term::process_csi_seq () 2783rxvt_term::process_csi_seq ()
2778{ 2784{
2779 unicode_t ch, priv, i; 2785 unicode_t ch, priv, i;
2780 unsigned int nargs, p; 2786 unsigned int nargs, p;
2781 int n, ndef; 2787 int n, ndef;
… …
2888 } 2894 }
2889 break; 2895 break;
2890#endif 2896#endif
2891 2897
2892 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2893 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2894 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2895 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2896 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2897 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2898 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2899 break; 2905 break;
2900 2906
2901 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2902 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3135 break; 3141 break;
3136 3142
3137 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3138 default: 3144 default:
3139 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3140 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3141 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3142 break; 3148 break;
3143 3149
3144 /* 3150 /*
3145 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
… …
3445#if BG_IMAGE_FROM_FILE 3451#if BG_IMAGE_FROM_FILE
3446 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3447 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3448 { 3454 {
3449 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 }
3450 3465
3451 sprintf (str, "[%dx%d+%d+%d]", 3466 sprintf (str, "[%dx%d+%d+%d]",
3452 min (h_scale, 32767), min (v_scale, 32767), 3467 h_scale, v_scale,
3453 min (h_align, 32767), min (v_align, 32767)); 3468 h_align, v_align);
3454 process_xterm_seq (XTerm_title, str, CHAR_ST); 3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3455 } 3470 }
3456 else 3471 else
3457 { 3472 {
3458 int changed = 0; 3473 bool changed = false;
3459 3474
3460 if (*str != ';') 3475 if (*str != ';')
3461 { 3476 {
3462 if (bg_set_file (str)) /* change pixmap */ 3477 if (image_vec.size () > 0)
3478 changed = image_vec[0].set_file_geometry (str);
3479 else
3463 { 3480 {
3481 rxvt_image *image = new_image ();
3482 if (!image->set_file_geometry (str))
3483 image_vec.pop_back ();
3484 else
3464 changed++; 3485 changed = true;
3465 } 3486 }
3466 } 3487 }
3467 else 3488 else
3468 { 3489 {
3469 str++; 3490 str++;
3491 if (image_vec.size () > 0)
3470 if (bg_set_geometry (str, true)) 3492 changed = image_vec[0].set_geometry (str, true);
3471 changed++;
3472 } 3493 }
3473 3494
3474 if (changed) 3495 if (changed)
3475 { 3496 {
3476 if (bg_window_position_sensitive ()) 3497 if (bg_window_position_sensitive ())
… …
3575 * 's' = save 3596 * 's' = save
3576 * 'r' = restore 3597 * 'r' = restore
3577 * 't' = toggle 3598 * 't' = toggle
3578 * so no need for fancy checking 3599 * so no need for fancy checking
3579 */ 3600 */
3580int 3601int ecb_cold
3581rxvt_term::privcases (int mode, unsigned long bit) 3602rxvt_term::privcases (int mode, unsigned long bit)
3582{ 3603{
3583 int state; 3604 int state;
3584 3605
3585 if (mode == 's') 3606 if (mode == 's')
3586 { 3607 {
3587 SavedModes |= (priv_modes & bit); 3608 if (priv_modes & bit)
3609 SavedModes |= bit;
3610 else
3611 SavedModes &= ~bit;
3588 return -1; 3612 return -1;
3589 } 3613 }
3590 else 3614 else
3591 { 3615 {
3592 if (mode == 'r') 3616 if (mode == 'r')
3593 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3617 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3594 else 3618 else
3595 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3619 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3596 3620
3597 set_privmode (bit, state); 3621 if (state)
3622 priv_modes |= bit;
3623 else
3624 priv_modes &= ~bit;
3598 } 3625 }
3599 3626
3600 return state; 3627 return state;
3601} 3628}
3602 3629
… …
3707 case 2: /* VT52 mode */ 3734 case 2: /* VT52 mode */
3708 /* oddball mode. should be set regardless of set/reset 3735 /* oddball mode. should be set regardless of set/reset
3709 * parameter. Return from VT52 mode with an ESC < from 3736 * parameter. Return from VT52 mode with an ESC < from
3710 * within VT52 mode 3737 * within VT52 mode
3711 */ 3738 */
3712 set_privmode (PrivMode_vt52, 1); 3739 priv_modes |= PrivMode_vt52;
3713 break; 3740 break;
3714 case 3: /* 80/132 */ 3741 case 3: /* 80/132 */
3715 if (priv_modes & PrivMode_132OK) 3742 if (priv_modes & PrivMode_132OK)
3716 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3743 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3717 break; 3744 break;
… …
3732 if (state) /* orthogonal */ 3759 if (state) /* orthogonal */
3733 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3760 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3734 break; 3761 break;
3735#ifdef scrollBar_esc 3762#ifdef scrollBar_esc
3736 case scrollBar_esc: 3763 case scrollBar_esc:
3737 if (scrollBar.map (state)) 3764 scrollBar.map (state);
3738 {
3739 resize_all_windows (0, 0, 0); 3765 resize_all_windows (0, 0, 0);
3740 scr_touch (true); 3766 scr_touch (true);
3741 }
3742 break; 3767 break;
3743#endif 3768#endif
3744 case 25: /* visible/invisible cursor */ 3769 case 25: /* visible/invisible cursor */
3745 scr_cursor_visible (state); 3770 scr_cursor_visible (state);
3746 break; 3771 break;
… …
3801 } 3826 }
3802} 3827}
3803/*}}} */ 3828/*}}} */
3804 3829
3805/*{{{ process sgr sequences */ 3830/*{{{ process sgr sequences */
3806void 3831void ecb_hot
3807rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3832rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3808{ 3833{
3809 unsigned int i; 3834 unsigned int i;
3810 short rendset; 3835 short rendset;
3811 int rendstyle; 3836 int rendstyle;

Diff Legend

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