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.481 by root, Thu Mar 24 17:34:28 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[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 263
267 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
268 { 265 {
269 char mb[16]; 266 char mb[MB_LEN_MAX];
270 int len; 267 int len;
271 268
272 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
275 else 272 else
276 { 273 {
277 mb[0] = ch[0]; 274 mb[0] = ch;
278 len = 1; 275 len = 1;
279 } 276 }
280 277
281 if (len > 0) 278 if (len > 0)
282 tt_write (mb, len); 279 tt_write (mb, len);
… …
285 } 282 }
286 283
287 iso14755buf = 0; 284 iso14755buf = 0;
288} 285}
289 286
290static int 287static int ecb_cold
291hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
292{ 289{
293 // check whether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
… …
304 301
305 return -1; 302 return -1;
306} 303}
307#endif 304#endif
308 305
309static inline KeySym 306static inline KeySym ecb_cold
310translate_keypad (KeySym keysym, bool kp) 307translate_keypad (KeySym keysym, bool kp)
311{ 308{
312#ifdef XK_KP_Home 309#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = { 310 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home 311 XK_KP_7, // XK_KP_Home
… …
340# endif 337# endif
341#endif 338#endif
342 return keysym; 339 return keysym;
343} 340}
344 341
345static inline int 342static inline int ecb_cold
346map_function_key (KeySym keysym) 343map_function_key (KeySym keysym)
347{ 344{
348 int param = 0; 345 int param = 0;
349 346
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
399 break; 396 break;
400 } 397 }
401 return param; 398 return param;
402} 399}
403 400
404void 401void ecb_cold
405rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
406{ 403{
407 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
408 KeySym keysym; 405 KeySym keysym;
409 int valid_keysym; 406 int valid_keysym;
… …
424 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
426 423
427 kbuf[0] = 0; 424 kbuf[0] = 0;
428 425
429#ifdef USE_XIM 426#if USE_XIM
430 if (Input_Context) 427 if (Input_Context)
431 { 428 {
432 Status status_return; 429 Status status_return;
433 430
434#if 0 431#if 0
… …
569 selection_request (ev.time); 566 selection_request (ev.time);
570 return; 567 return;
571#if TODO 568#if TODO
572 /* rxvt extras */ 569 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 571 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 573 return;
579#endif 574#endif
580 } 575 }
581 } 576 }
582 } 577 }
… …
781 } 776 }
782 777
783 if (newlen) 778 if (newlen)
784 len = strlen (kbuf); 779 len = strlen (kbuf);
785 780
781 if (len > 0)
782 {
786 /* 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 /*
787 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
788 */ 797 */
789#ifdef META8_OPTION 798#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
791 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
792#endif 801#endif
802 }
793 803
794 } 804 }
795 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
796 { 806 {
797 len = 1; 807 len = 1;
… …
831 { 841 {
832 view_start = 0; 842 view_start = 0;
833 want_refresh = 1; 843 want_refresh = 1;
834 } 844 }
835 845
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850 /* escape prefix */ 846 /* escape prefix */
851 if (meta 847 if (meta
852#ifdef META8_OPTION 848#ifdef META8_OPTION
853 && meta_char == C0_ESC 849 && meta_char == C0_ESC
854#endif 850#endif
… …
859 } 855 }
860 856
861 tt_write (kbuf, (unsigned int)len); 857 tt_write (kbuf, (unsigned int)len);
862} 858}
863 859
864void 860void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 861rxvt_term::key_release (XKeyEvent &ev)
866{ 862{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 863#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 864 KeySym keysym;
869 865
… …
991 while (row < end_row); 987 while (row < end_row);
992 } 988 }
993 989
994 scr_refresh (); 990 scr_refresh ();
995 scrollBar.show (1); 991 scrollBar.show (1);
996#ifdef USE_XIM 992#if USE_XIM
997 IMSendSpot (); 993 im_send_spot ();
998#endif 994#endif
999 } 995 }
1000 996
1001 display->flush (); 997 display->flush ();
1002} 998}
… …
1020 flush (); 1016 flush ();
1021} 1017}
1022 1018
1023#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1024void 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
1025rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1026{ 1037{
1027 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1028 want_refresh = 1; 1039 want_refresh = 1;
1029 refresh_check (); 1040 refresh_check ();
… …
1047 1058
1048#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1049void 1060void
1050rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1051{ 1062{
1052 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1053 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1054 { 1065 {
1055 want_refresh = 1; 1066 want_refresh = 1;
1056 refresh_check (); 1067 refresh_check ();
1057 } 1068 }
1058 else 1069 else
… …
1208 pty_write (); 1219 pty_write ();
1209 1220
1210 refresh_check (); 1221 refresh_check ();
1211} 1222}
1212 1223
1213void 1224void ecb_cold
1214rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1215{ 1226{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1227 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1228 recolour_cursor ();
1218 1229
… …
1223 pointer_ev.start (pointerBlankDelay); 1234 pointer_ev.start (pointerBlankDelay);
1224#endif 1235#endif
1225} 1236}
1226 1237
1227#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1228void 1239void ecb_cold
1229rxvt_term::pointer_blank () 1240rxvt_term::pointer_blank ()
1230{ 1241{
1231 if (!option (Opt_pointerBlank)) 1242 if (!option (Opt_pointerBlank))
1232 return; 1243 return;
1233 1244
… …
1235 XFlush (dpy); 1246 XFlush (dpy);
1236 1247
1237 hidden_pointer = 1; 1248 hidden_pointer = 1;
1238} 1249}
1239 1250
1240void 1251void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1252rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1253{
1243 make_current (); 1254 make_current ();
1244 1255
1245 pointer_blank (); 1256 pointer_blank ();
… …
1337 32 + x, 1348 32 + x,
1338 32 + y); 1349 32 + y);
1339} 1350}
1340 1351
1341/*{{{ process an X event */ 1352/*{{{ process an X event */
1342void 1353void ecb_hot
1343rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1344{ 1355{
1345 make_current (); 1356 make_current ();
1346 1357
1347 dLocal (Display *, dpy); 1358 dLocal (Display *, dpy);
… …
1445 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1446 focus_out (); 1457 focus_out ();
1447 break; 1458 break;
1448 1459
1449 case ConfigureNotify: 1460 case ConfigureNotify:
1450 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1451 { 1462 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1464 ;
1454 1465
1455#ifdef HAVE_BG_PIXMAP 1466#ifdef HAVE_BG_PIXMAP
… …
1478 } 1489 }
1479 else 1490 else
1480 { 1491 {
1481#ifdef HAVE_BG_PIXMAP 1492#ifdef HAVE_BG_PIXMAP
1482 if (moved) 1493 if (moved)
1483 {
1484 if (mapped)
1485 update_background (); 1494 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1489#endif 1495#endif
1490 } 1496 }
1491 1497
1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 } 1499 }
… …
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1568 ; 1574 ;
1569 1575
1570 if (scrollBar.state && ev.xany.window == scrollBar.win) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1571 { 1577 {
1572 scrollBar.state = STATE_IDLE; 1578 scrollBar.state = SB_STATE_IDLE;
1573 scrollBar.show (0); 1579 scrollBar.show (0);
1574 } 1580 }
1575 } 1581 }
1576 break; 1582 break;
1577 1583
… …
1643 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1644 } 1650 }
1645 else 1651 else
1646 { 1652 {
1647 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1648 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1649 } 1655 }
1650 1656
1651 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1652 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1653 + 1; 1659 + 1;
… …
1665#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1666 } 1672 }
1667#endif 1673#endif
1668 } 1674 }
1669 } 1675 }
1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1671 { 1677 {
1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1674 ; 1680 ;
1675 1681
1676 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1677 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1678 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1679 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1680 &unused_mask); 1686 &unused_mask);
1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1682 scrollBar.size ()); 1688 scrollBar.size ());
1683 want_refresh = 1; 1689 want_refresh = 1;
1684 scrollBar.show (1); 1690 scrollBar.show (1);
1685 } 1691 }
1686 break; 1692 break;
1687 } 1693 }
1688 1694
1689#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1690 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1691 {
1692 if (hidden_cursor)
1693 {
1694 hidden_cursor = 0;
1695 want_refresh = 1;
1696 }
1697
1698 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1699 }
1700#endif 1698#endif
1701 1699
1702#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 { 1702 {
… …
1715 1713
1716 refresh_check (); 1714 refresh_check ();
1717} 1715}
1718 1716
1719#if ENABLE_FRILLS 1717#if ENABLE_FRILLS
1720void 1718void ecb_cold
1721rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1722{ 1720{
1723 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1724 return; 1722 return;
1725 1723
1726 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 { 1725 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent[0], h); 1727 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable; 1728 urgency_hint = enable;
1729 XFree (h);
1731 } 1730 }
1732} 1731}
1733#endif 1732#endif
1734 1733
1735void 1734void ecb_cold
1736rxvt_term::focus_in () 1735rxvt_term::focus_in ()
1737{ 1736{
1738 if (!focus) 1737 if (!focus)
1739 { 1738 {
1740 focus = 1; 1739 focus = 1;
1741 want_refresh = 1; 1740 want_refresh = 1;
1742 1741
1743#if USE_XIM 1742#if USE_XIM
1744 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1745 { 1744 {
1746 IMSetPosition (); 1745 im_set_position ();
1747 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1748 } 1747 }
1749#endif 1748#endif
1750#if CURSOR_BLINK 1749#if CURSOR_BLINK
1751 if (option (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
… …
1765 1764
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1765 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1767 } 1766 }
1768} 1767}
1769 1768
1770void 1769void ecb_cold
1771rxvt_term::focus_out () 1770rxvt_term::focus_out ()
1772{ 1771{
1773 if (focus) 1772 if (focus)
1774 { 1773 {
1775 focus = 0; 1774 focus = 0;
… …
1808 1807
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1808 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1810 } 1809 }
1811} 1810}
1812 1811
1813void 1812void ecb_cold
1814rxvt_term::update_fade_color (unsigned int idx) 1813rxvt_term::update_fade_color (unsigned int idx)
1815{ 1814{
1816#if OFF_FOCUS_FADING 1815#if OFF_FOCUS_FADING
1817 if (rs[Rs_fade]) 1816 if (rs[Rs_fade])
1818 { 1817 {
… …
1822 } 1821 }
1823#endif 1822#endif
1824} 1823}
1825 1824
1826#if ENABLE_TRANSPARENCY || ENABLE_PERL 1825#if ENABLE_TRANSPARENCY || ENABLE_PERL
1827void 1826void ecb_hot
1828rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1829{ 1828{
1830 make_current (); 1829 make_current ();
1831 1830
1832 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
… …
1982 if (scrollBar.upButton (ev.y)) 1981 if (scrollBar.upButton (ev.y))
1983 direction = UP; /* up */ 1982 direction = UP; /* up */
1984 else if (scrollBar.dnButton (ev.y)) 1983 else if (scrollBar.dnButton (ev.y))
1985 direction = DN; /* down */ 1984 direction = DN; /* down */
1986 1985
1987 scrollBar.state = STATE_IDLE; 1986 scrollBar.state = SB_STATE_IDLE;
1988 /* 1987 /*
1989 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1990 * move up if mouse is above slider 1989 * move up if mouse is above slider
1991 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
1992 * 1991 *
… …
2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 2031#endif
2033 if (scr_page (direction, 1)) 2032 if (scr_page (direction, 1))
2034 { 2033 {
2035 if (direction == UP) 2034 if (direction == UP)
2036 scrollBar.state = STATE_UP; 2035 scrollBar.state = SB_STATE_UP;
2037 else 2036 else
2038 scrollBar.state = STATE_DOWN; 2037 scrollBar.state = SB_STATE_DOWN;
2039 } 2038 }
2040 } 2039 }
2041 else 2040 else
2042 switch (ev.button) 2041 switch (ev.button)
2043 { 2042 {
2044 case Button2: 2043 case Button2:
2045 switch (scrollBar.align) 2044 switch (scrollBar.align)
2046 { 2045 {
2047 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2048 csrO = 0; 2047 csrO = 0;
2049 break; 2048 break;
2050 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2051 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2052 break; 2051 break;
2053 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2054 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2055 break; 2054 break;
2056 } 2055 }
2057 2056
2058 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2059 || scrollbar_above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2060 || scrollbar_below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2062 2061
2063 scrollBar.state = STATE_MOTION; 2062 scrollBar.state = SB_STATE_MOTION;
2064 break; 2063 break;
2065 2064
2066 case Button1: 2065 case Button1:
2067 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2068 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2069 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2070 2069
2071 case Button3: 2070 case Button3:
2072 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2073 { 2072 {
2074 if (scrollbar_above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2075# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2076 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2077# else 2076# else
2078 scr_page (UP, nrow / 4); 2077 scr_page (UP, nrow / 4);
2079# endif 2078# endif
2080 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollBar.below_slider (ev.y))
2081# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2082 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2083# else 2082# else
2084 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2085# endif 2084# endif
2086 else 2085 else
2087 scrollBar.state = STATE_MOTION; 2086 scrollBar.state = SB_STATE_MOTION;
2088 } 2087 }
2089 else 2088 else
2090 { 2089 {
2091 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2092 (nrow 2091 (nrow
2093 * scrollbar_position (ev.y) 2092 * scrollBar.position (ev.y)
2094 / scrollBar.size ())); 2093 / scrollBar.size ()));
2095 } 2094 }
2096 2095
2097 break; 2096 break;
2098 } 2097 }
… …
2109 2108
2110 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2111 if (!bypass_keystate) 2110 if (!bypass_keystate)
2112 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2113 2112
2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2115 { 2114 {
2116 scrollBar.state = STATE_IDLE; 2115 scrollBar.state = SB_STATE_IDLE;
2117 scrollBar.show (0); 2116 scrollBar.show (0);
2118 } 2117 }
2119 2118
2120#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2121 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
… …
2171 case Button3: 2170 case Button3:
2172 selection_make (ev.time); 2171 selection_make (ev.time);
2173 break; 2172 break;
2174 2173
2175 case Button2: 2174 case Button2:
2176 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?
2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2178 break; 2177 break;
2179 2178
2180#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2181 case Button4: 2180 case Button4:
… …
2216 } 2215 }
2217} 2216}
2218 2217
2219/*}}} */ 2218/*}}} */
2220 2219
2221void 2220void ecb_hot
2222rxvt_term::cmd_parse () 2221rxvt_term::cmd_parse ()
2223{ 2222{
2224 wchar_t ch = NOCHAR; 2223 wchar_t ch = NOCHAR;
2225 char *seq_begin; // remember start of esc-sequence here 2224 char *seq_begin; // remember start of esc-sequence here
2226 2225
2227 for (;;) 2226 for (;;)
2228 { 2227 {
2229 if (expect_false (ch == NOCHAR)) 2228 if (ecb_unlikely (ch == NOCHAR))
2230 { 2229 {
2231 seq_begin = cmdbuf_ptr; 2230 seq_begin = cmdbuf_ptr;
2232 ch = next_char (); 2231 ch = next_char ();
2233 2232
2234 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2235 break; 2234 break;
2236 } 2235 }
2237 2236
2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2237 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2239 { 2238 {
2240 if (expect_false (!seen_input)) 2239 if (ecb_unlikely (!seen_input))
2241 { 2240 {
2242 seen_input = 1; 2241 seen_input = 1;
2243 // many badly-written programs (e.g. jed) contain a race condition: 2242 // many badly-written programs (e.g. jed) contain a race condition:
2244 // they first read the screensize and then install a SIGWINCH handler. 2243 // they first read the screensize and then install a SIGWINCH handler.
2245 // some window managers resize the window early, and these programs 2244 // some window managers resize the window early, and these programs
… …
2258 wchar_t *str = buf; 2257 wchar_t *str = buf;
2259 wchar_t *eol = str + min (ncol, UBUFSIZ); 2258 wchar_t *eol = str + min (ncol, UBUFSIZ);
2260 2259
2261 for (;;) 2260 for (;;)
2262 { 2261 {
2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2262 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2264 break; 2263 break;
2265 2264
2266 *str++ = ch; 2265 *str++ = ch;
2267 2266
2268 if (expect_false (ch == C0_LF || str >= eol)) 2267 if (ecb_unlikely (ch == C0_LF || str >= eol))
2269 { 2268 {
2270 if (ch == C0_LF) 2269 if (ch == C0_LF)
2271 nlines++; 2270 nlines++;
2272 2271
2273 refresh_count++; 2272 refresh_count++;
… …
2345 } 2344 }
2346 } 2345 }
2347} 2346}
2348 2347
2349// read the next character 2348// read the next character
2350wchar_t 2349wchar_t ecb_hot
2351rxvt_term::next_char () NOTHROW 2350rxvt_term::next_char () NOTHROW
2352{ 2351{
2353 while (cmdbuf_ptr < cmdbuf_endp) 2352 while (cmdbuf_ptr < cmdbuf_endp)
2354 { 2353 {
2355 // assume 7-bit to be ascii ALWAYS 2354 // assume 7-bit to be ascii ALWAYS
2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2355 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2357 return *cmdbuf_ptr++; 2356 return *cmdbuf_ptr++;
2358 2357
2359 wchar_t wc; 2358 wchar_t wc;
2360 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2359 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2361 2360
… …
2379 2378
2380 return NOCHAR; 2379 return NOCHAR;
2381} 2380}
2382 2381
2383// read the next octet 2382// read the next octet
2384uint32_t 2383uint32_t ecb_hot
2385rxvt_term::next_octet () NOTHROW 2384rxvt_term::next_octet () NOTHROW
2386{ 2385{
2387 return cmdbuf_ptr < cmdbuf_endp 2386 return cmdbuf_ptr < cmdbuf_endp
2388 ? (unsigned char)*cmdbuf_ptr++ 2387 ? (unsigned char)*cmdbuf_ptr++
2389 : NOCHAR; 2388 : NOCHAR;
2390} 2389}
2391 2390
2392static class out_of_input out_of_input; 2391static class out_of_input out_of_input;
2393 2392
2394/* rxvt_cmd_getc () - Return next input character */ 2393wchar_t ecb_hot
2395/*
2396 * Return the next input character after first passing any keyboard input
2397 * to the command.
2398 */
2399wchar_t
2400rxvt_term::cmd_getc () THROW ((class out_of_input)) 2394rxvt_term::cmd_getc () THROW ((class out_of_input))
2401{ 2395{
2402 wchar_t c = next_char (); 2396 wchar_t c = next_char ();
2403 2397
2404 if (c == NOCHAR) 2398 if (c == NOCHAR)
2405 throw out_of_input; 2399 throw out_of_input;
2406 2400
2407 return c; 2401 return c;
2408} 2402}
2409 2403
2410uint32_t 2404uint32_t ecb_hot
2411rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2405rxvt_term::cmd_get8 () THROW ((class out_of_input))
2412{ 2406{
2413 uint32_t c = next_octet (); 2407 uint32_t c = next_octet ();
2414 2408
2415 if (c == NOCHAR) 2409 if (c == NOCHAR)
… …
2419} 2413}
2420 2414
2421/*{{{ print pipe */ 2415/*{{{ print pipe */
2422/*----------------------------------------------------------------------*/ 2416/*----------------------------------------------------------------------*/
2423#ifdef PRINTPIPE 2417#ifdef PRINTPIPE
2424FILE * 2418FILE * ecb_cold
2425rxvt_term::popen_printer () 2419rxvt_term::popen_printer ()
2426{ 2420{
2427 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");
2428 2422
2429 if (stream == NULL) 2423 if (stream == NULL)
2430 rxvt_warn ("can't open printer pipe, not printing.\n"); 2424 rxvt_warn ("can't open printer pipe, not printing.\n");
2431 2425
2432 return stream; 2426 return stream;
2433} 2427}
2434 2428
2435int 2429int ecb_cold
2436rxvt_term::pclose_printer (FILE *stream) 2430rxvt_term::pclose_printer (FILE *stream)
2437{ 2431{
2438 fflush (stream); 2432 fflush (stream);
2439 return pclose (stream); 2433 return pclose (stream);
2440} 2434}
2441 2435
2442/* 2436/*
2443 * simulate attached vt100 printer 2437 * simulate attached vt100 printer
2444 */ 2438 */
2445void 2439void ecb_cold
2446rxvt_term::process_print_pipe () 2440rxvt_term::process_print_pipe ()
2447{ 2441{
2448 FILE *fd = popen_printer (); 2442 FILE *fd = popen_printer ();
2449 2443
2450 if (!fd) 2444 if (!fd)
… …
2496 pclose_printer (fd); 2490 pclose_printer (fd);
2497} 2491}
2498#endif /* PRINTPIPE */ 2492#endif /* PRINTPIPE */
2499/*}}} */ 2493/*}}} */
2500 2494
2501/* *INDENT-OFF* */
2502enum { 2495enum {
2503 C1_40 = 0x40, 2496 C1_40 = 0x40,
2504 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2497 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2505 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2498 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2506 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,
2507 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,
2508}; 2501};
2509/* *INDENT-ON* */
2510 2502
2511/*{{{ process non-printing single characters */ 2503/*{{{ process non-printing single characters */
2512void 2504void ecb_hot
2513rxvt_term::process_nonprinting (unicode_t ch) 2505rxvt_term::process_nonprinting (unicode_t ch)
2514{ 2506{
2515 switch (ch) 2507 switch (ch)
2516 { 2508 {
2517 case C0_ESC: 2509 case C0_ESC:
… …
2563} 2555}
2564/*}}} */ 2556/*}}} */
2565 2557
2566 2558
2567/*{{{ process VT52 escape sequences */ 2559/*{{{ process VT52 escape sequences */
2568void 2560void ecb_cold
2569rxvt_term::process_escape_vt52 (unicode_t ch) 2561rxvt_term::process_escape_vt52 (unicode_t ch)
2570{ 2562{
2571 int row, col; 2563 int row, col;
2572 2564
2573 switch (ch) 2565 switch (ch)
… …
2607 break; 2599 break;
2608 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2610 break; 2602 break;
2611 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
2612 set_privmode (PrivMode_vt52, 0); 2604 priv_modes &= ~PrivMode_vt52;
2613 break; 2605 break;
2614 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
2615 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
2616 /* unimplemented */ 2608 /* unimplemented */
2617 break; 2609 break;
… …
2623} 2615}
2624/*}}} */ 2616/*}}} */
2625 2617
2626 2618
2627/*{{{ process escape sequences */ 2619/*{{{ process escape sequences */
2628void 2620void ecb_hot
2629rxvt_term::process_escape_seq () 2621rxvt_term::process_escape_seq ()
2630{ 2622{
2631 unicode_t ch = cmd_getc (); 2623 unicode_t ch = cmd_getc ();
2632 2624
2633 if (priv_modes & PrivMode_vt52) 2625 if (priv_modes & PrivMode_vt52)
… …
2636 return; 2628 return;
2637 } 2629 }
2638 2630
2639 switch (ch) 2631 switch (ch)
2640 { 2632 {
2641 /* case 1: do_tek_mode (); break; */
2642 case '#': 2633 case '#':
2643 if (cmd_getc () == '8') 2634 if (cmd_getc () == '8')
2644 scr_E (); 2635 scr_E ();
2645 break; 2636 break;
2646 case '(': 2637 case '(':
… …
2669#if !ENABLE_MINIMAL 2660#if !ENABLE_MINIMAL
2670 case '9': 2661 case '9':
2671 scr_forwardindex (); 2662 scr_forwardindex ();
2672 break; 2663 break;
2673#endif 2664#endif
2665 // DECPAM/DECPNM
2674 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
2675 case '>': 2669 case '>':
2676 set_privmode (PrivMode_aplKP, ch == '='); 2670 priv_modes &= ~PrivMode_aplKP;
2677 break; 2671 break;
2678 2672
2679 case C1_40: 2673 case C1_40:
2680 cmd_getc (); 2674 cmd_getc ();
2681 break; 2675 break;
… …
2685 2679
2686 /* 8.3.87: NEXT LINE */ 2680 /* 8.3.87: NEXT LINE */
2687 case C1_NEL: /* ESC E */ 2681 case C1_NEL: /* ESC E */
2688 { 2682 {
2689 wchar_t nlcr[] = { C0_LF, C0_CR }; 2683 wchar_t nlcr[] = { C0_LF, C0_CR };
2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2684 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2691 } 2685 }
2692 break; 2686 break;
2693 2687
2694 /* kidnapped escape sequence: Should be 8.3.48 */ 2688 /* kidnapped escape sequence: Should be 8.3.48 */
2695 case C1_ESA: /* ESC G */ 2689 case C1_ESA: /* ESC G */
… …
2707 case C1_RI: /* ESC M */ 2701 case C1_RI: /* ESC M */
2708 scr_index (DN); 2702 scr_index (DN);
2709 break; 2703 break;
2710 2704
2711 /* 8.3.142: SINGLE-SHIFT TWO */ 2705 /* 8.3.142: SINGLE-SHIFT TWO */
2712 /*case C1_SS2: scr_single_shift (2); break; */ 2706 /* case C1_SS2: break; */
2713 2707
2714 /* 8.3.143: SINGLE-SHIFT THREE */ 2708 /* 8.3.143: SINGLE-SHIFT THREE */
2715 /*case C1_SS3: scr_single_shift (3); break; */ 2709 /* case C1_SS3: break; */
2716 2710
2717 /* 8.3.27: DEVICE CONTROL STRING */ 2711 /* 8.3.27: DEVICE CONTROL STRING */
2718 case C1_DCS: /* ESC P */ 2712 case C1_DCS: /* ESC P */
2719 process_dcs_seq (); 2713 process_dcs_seq ();
2720 break; 2714 break;
… …
2753 } 2747 }
2754} 2748}
2755/*}}} */ 2749/*}}} */
2756 2750
2757/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2751/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2758/* *INDENT-OFF* */
2759enum { 2752enum {
2760 CSI_ICH = 0x40, 2753 CSI_ICH = 0x40,
2761 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2754 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2762 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2755 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2763 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2756 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2783 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2776 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2784 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, */
2785 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, */
2786 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, {, |, }, ~, */
2787 }; 2780 };
2788/* *INDENT-ON* */
2789 2781
2790void 2782void ecb_hot
2791rxvt_term::process_csi_seq () 2783rxvt_term::process_csi_seq ()
2792{ 2784{
2793 unicode_t ch, priv, i; 2785 unicode_t ch, priv, i;
2794 unsigned int nargs, p; 2786 unsigned int nargs, p;
2795 int n, ndef; 2787 int n, ndef;
… …
2873 scr_soft_reset (); 2865 scr_soft_reset ();
2874 2866
2875 static const int pm_h[] = { 7, 25 }; 2867 static const int pm_h[] = { 7, 25 };
2876 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2868 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2877 2869
2878 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2870 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2879 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2871 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2880 } 2872 }
2881 break; 2873 break;
2882 } 2874 }
2883 2875
2884 return; 2876 return;
… …
2902 } 2894 }
2903 break; 2895 break;
2904#endif 2896#endif
2905 2897
2906 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2907 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2908 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2909 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2910 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2911 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2912 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2913 break; 2905 break;
2914 2906
2915 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2916 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3103 } 3095 }
3104} 3096}
3105/*}}} */ 3097/*}}} */
3106 3098
3107#if !ENABLE_MINIMAL 3099#if !ENABLE_MINIMAL
3108/* ARGSUSED */
3109void 3100void
3110rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3111{ 3102{
3112 int x, y; 3103 int x, y;
3113 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
… …
3122 { 3113 {
3123 /* 3114 /*
3124 * commands 3115 * commands
3125 */ 3116 */
3126 case 1: /* deiconify window */ 3117 case 1: /* deiconify window */
3127 XMapWindow (dpy, parent[0]); 3118 XMapWindow (dpy, parent);
3128 break; 3119 break;
3129 case 2: /* iconify window */ 3120 case 2: /* iconify window */
3130 XIconifyWindow (dpy, parent[0], display->screen); 3121 XIconifyWindow (dpy, parent, display->screen);
3131 break; 3122 break;
3132 case 3: /* set position (pixels) */ 3123 case 3: /* set position (pixels) */
3133 XMoveWindow (dpy, parent[0], args[1], args[2]); 3124 XMoveWindow (dpy, parent, args[1], args[2]);
3134 break; 3125 break;
3135 case 4: /* set size (pixels) */ 3126 case 4: /* set size (pixels) */
3136 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3137 break; 3128 break;
3138 case 5: /* raise window */ 3129 case 5: /* raise window */
3139 XRaiseWindow (dpy, parent[0]); 3130 XRaiseWindow (dpy, parent);
3140 break; 3131 break;
3141 case 6: /* lower window */ 3132 case 6: /* lower window */
3142 XLowerWindow (dpy, parent[0]); 3133 XLowerWindow (dpy, parent);
3143 break; 3134 break;
3144 case 7: /* refresh window */ 3135 case 7: /* refresh window */
3145 scr_touch (true); 3136 scr_touch (true);
3146 break; 3137 break;
3147 case 8: /* set size (chars) */ 3138 case 8: /* set size (chars) */
… …
3150 break; 3141 break;
3151 3142
3152 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3153 default: 3144 default:
3154 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3155 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3156 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3157 break; 3148 break;
3158 3149
3159 /* 3150 /*
3160 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
3161 */ 3152 */
3162 case 11: /* report window state */ 3153 case 11: /* report window state */
3163 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3164 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3165 break; 3156 break;
3166 case 13: /* report window position */ 3157 case 13: /* report window position */
3167 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3168 XTranslateCoordinates (dpy, parent[0], wattr.root, 3159 XTranslateCoordinates (dpy, parent, wattr.root,
3169 -wattr.border_width, -wattr.border_width, 3160 -wattr.border_width, -wattr.border_width,
3170 &x, &y, &wdummy); 3161 &x, &y, &wdummy);
3171 tt_printf ("\033[3;%d;%dt", x, y); 3162 tt_printf ("\033[3;%d;%dt", x, y);
3172 break; 3163 break;
3173 case 14: /* report window size (pixels) */ 3164 case 14: /* report window size (pixels) */
3174 XGetWindowAttributes (dpy, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent, &wattr);
3175 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3176 break; 3167 break;
3177 case 18: /* report text area size (chars) */ 3168 case 18: /* report text area size (chars) */
3178 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3179 break; 3170 break;
… …
3181 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3172 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3182 break; 3173 break;
3183 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3184 { 3175 {
3185 char *s; 3176 char *s;
3186 XGetIconName (dpy, parent[0], &s); 3177 XGetIconName (dpy, parent, &s);
3187 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3188 XFree (s); 3179 XFree (s);
3189 } 3180 }
3190 break; 3181 break;
3191 case 21: /* report window title */ 3182 case 21: /* report window title */
3192 { 3183 {
3193 char *s; 3184 char *s;
3194 XFetchName (dpy, parent[0], &s); 3185 XFetchName (dpy, parent, &s);
3195 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3196 XFree (s); 3187 XFree (s);
3197 } 3188 }
3198 break; 3189 break;
3199 } 3190 }
… …
3353 unsigned long bytes_after; 3344 unsigned long bytes_after;
3354 unsigned char *value = 0; 3345 unsigned char *value = 0;
3355 const char *str = ""; 3346 const char *str = "";
3356 3347
3357 if (prop 3348 if (prop
3358 && XGetWindowProperty (dpy, parent[0], 3349 && XGetWindowProperty (dpy, parent,
3359 prop, 0, 1<<16, 0, AnyPropertyType, 3350 prop, 0, 1<<16, 0, AnyPropertyType,
3360 &actual_type, &actual_format, 3351 &actual_type, &actual_format,
3361 &nitems, &bytes_after, &value) == Success 3352 &nitems, &bytes_after, &value) == Success
3362 && actual_type != None 3353 && actual_type != None
3363 && actual_format == 8) 3354 && actual_format == 8)
… …
3375 { 3366 {
3376 *eq = 0; 3367 *eq = 0;
3377 set_utf8_property (display->atom (str), eq + 1); 3368 set_utf8_property (display->atom (str), eq + 1);
3378 } 3369 }
3379 else 3370 else
3380 XDeleteProperty (dpy, parent[0], 3371 XDeleteProperty (dpy, parent,
3381 display->atom (str)); 3372 display->atom (str));
3382 } 3373 }
3383 break; 3374 break;
3384 3375
3385 case XTerm_Color: 3376 case XTerm_Color:
… …
3446 process_color_seq (op, Color_tint, str, resp); 3437 process_color_seq (op, Color_tint, str, resp);
3447 { 3438 {
3448 bool changed = false; 3439 bool changed = false;
3449 3440
3450 if (ISSET_PIXCOLOR (Color_tint)) 3441 if (ISSET_PIXCOLOR (Color_tint))
3451 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3442 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3452 3443
3453 if (changed) 3444 if (changed)
3454 update_background (); 3445 update_background ();
3455 } 3446 }
3456 3447
… …
3460#if BG_IMAGE_FROM_FILE 3451#if BG_IMAGE_FROM_FILE
3461 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3462 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3463 { 3454 {
3464 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 }
3465 3465
3466 sprintf (str, "[%dx%d+%d+%d]", 3466 sprintf (str, "[%dx%d+%d+%d]",
3467 min (h_scale, 32767), min (v_scale, 32767), 3467 h_scale, v_scale,
3468 min (h_align, 32767), min (v_align, 32767)); 3468 h_align, v_align);
3469 process_xterm_seq (XTerm_title, str, CHAR_ST); 3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3470 } 3470 }
3471 else 3471 else
3472 { 3472 {
3473 int changed = 0; 3473 bool changed = false;
3474 3474
3475 if (*str != ';') 3475 if (*str != ';')
3476 { 3476 {
3477 if (bg_set_file (str)) /* change pixmap */ 3477 if (image_vec.size () > 0)
3478 changed = image_vec[0].set_file_geometry (str);
3479 else
3478 { 3480 {
3479 changed++; 3481 rxvt_image *image = new_image ();
3480 str = strchr (str, ';'); 3482 if (!image->set_file_geometry (str))
3481 if (str == NULL) 3483 image_vec.pop_back ();
3482 bg_set_default_geometry ();
3483 else 3484 else
3484 bg_set_geometry (str+1); 3485 changed = true;
3485 } 3486 }
3486 } 3487 }
3487 else 3488 else
3488 { 3489 {
3489 str++; 3490 str++;
3491 if (image_vec.size () > 0)
3490 if (bg_set_geometry (str, true)) 3492 changed = image_vec[0].set_geometry (str, true);
3491 changed++;
3492 } 3493 }
3493 3494
3494 if (changed) 3495 if (changed)
3495 { 3496 {
3496 if (bg_window_position_sensitive ()) 3497 if (bg_window_position_sensitive ())
… …
3595 * 's' = save 3596 * 's' = save
3596 * 'r' = restore 3597 * 'r' = restore
3597 * 't' = toggle 3598 * 't' = toggle
3598 * so no need for fancy checking 3599 * so no need for fancy checking
3599 */ 3600 */
3600int 3601int ecb_cold
3601rxvt_term::privcases (int mode, unsigned long bit) 3602rxvt_term::privcases (int mode, unsigned long bit)
3602{ 3603{
3603 int state; 3604 int state;
3604 3605
3605 if (mode == 's') 3606 if (mode == 's')
3606 { 3607 {
3607 SavedModes |= (priv_modes & bit); 3608 if (priv_modes & bit)
3609 SavedModes |= bit;
3610 else
3611 SavedModes &= ~bit;
3608 return -1; 3612 return -1;
3609 } 3613 }
3610 else 3614 else
3611 { 3615 {
3612 if (mode == 'r') 3616 if (mode == 'r')
3613 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3617 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3614 else 3618 else
3615 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3619 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3616 3620
3617 set_privmode (bit, state); 3621 if (state)
3622 priv_modes |= bit;
3623 else
3624 priv_modes &= ~bit;
3618 } 3625 }
3619 3626
3620 return state; 3627 return state;
3621} 3628}
3622 3629
3623/* we're not using priv _yet_ */ 3630/* we're not using priv _yet_ */
3624void 3631void
3625rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3632rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3626{ 3633{
3627 unsigned int i, j; 3634 unsigned int i, j;
3628 int state; 3635 int state;
3629 3636
3630 static const struct 3637 static const struct
3631 { 3638 {
3632 const int argval; 3639 const int argval;
3633 const unsigned long bit; 3640 const unsigned long bit;
3634 } argtopriv[] = { 3641 } argtopriv[] = {
3635 { 1, PrivMode_aplCUR }, // DECCKM 3642 { 1, PrivMode_aplCUR }, // DECCKM
3636 { 2, PrivMode_vt52 }, 3643 { 2, PrivMode_vt52 }, // DECANM
3637 { 3, PrivMode_132 }, // DECCOLM 3644 { 3, PrivMode_132 }, // DECCOLM
3638 { 4, PrivMode_smoothScroll }, // DECSCLM 3645 { 4, PrivMode_smoothScroll }, // DECSCLM
3639 { 5, PrivMode_rVideo }, // DECSCNM 3646 { 5, PrivMode_rVideo }, // DECSCNM
3640 { 6, PrivMode_relOrigin }, // DECOM 3647 { 6, PrivMode_relOrigin }, // DECOM
3641 { 7, PrivMode_Autowrap }, // DECAWM 3648 { 7, PrivMode_Autowrap }, // DECAWM
3642 // 8, auto-repeat keys // DECARM 3649 // 8, auto-repeat keys // DECARM
3643 { 9, PrivMode_MouseX10 }, 3650 { 9, PrivMode_MouseX10 },
3644 // 18 end FF to printer after print screen 3651 // 18 end FF to printer after print screen
3645 // 19 Print screen prints full screen/scroll region 3652 // 19 Print screen prints full screen/scroll region
3646 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3653 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3647#ifdef scrollBar_esc 3654#ifdef scrollBar_esc
3648 { scrollBar_esc, PrivMode_scrollBar }, 3655 { scrollBar_esc, PrivMode_scrollBar },
3649#endif 3656#endif
3650 { 35, PrivMode_ShiftKeys }, // rxvt extension 3657 { 35, PrivMode_ShiftKeys }, // rxvt extension
3651 // 38, tektronix mode // DECTEK 3658 // 38, tektronix mode // DECTEK
3652 { 40, PrivMode_132OK }, 3659 { 40, PrivMode_132OK },
3653 // 41 xterm more fixes NYI 3660 // 41 xterm more fixes NYI
3654 // 45 margin bell NYI 3661 // 45 margin bell NYI
3655 // 46 start logging 3662 // 46 start logging
3656 { 47, PrivMode_Screen }, 3663 { 47, PrivMode_Screen },
3657 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3664 { 66, PrivMode_aplKP }, // DECNKM
3658#ifndef NO_BACKSPACE_KEY 3665#ifndef NO_BACKSPACE_KEY
3659 { 67, PrivMode_BackSpace }, // DECBKM 3666 { 67, PrivMode_BackSpace }, // DECBKM
3660#endif 3667#endif
3661 { 1000, PrivMode_MouseX11 }, 3668 { 1000, PrivMode_MouseX11 },
3662 { 1002, PrivMode_MouseBtnEvent }, 3669 { 1002, PrivMode_MouseBtnEvent },
… …
3691 for (i = 0; i < nargs; i++) 3698 for (i = 0; i < nargs; i++)
3692 { 3699 {
3693 state = -1; 3700 state = -1;
3694 3701
3695 /* basic handling */ 3702 /* basic handling */
3696 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3703 for (j = 0; j < ecb_array_length (argtopriv); j++)
3697 if (argtopriv[j].argval == arg[i]) 3704 if (argtopriv[j].argval == arg[i])
3698 { 3705 {
3699 state = privcases (mode, argtopriv[j].bit); 3706 state = privcases (mode, argtopriv[j].bit);
3700 break; 3707 break;
3701 } 3708 }
… …
3727 case 2: /* VT52 mode */ 3734 case 2: /* VT52 mode */
3728 /* oddball mode. should be set regardless of set/reset 3735 /* oddball mode. should be set regardless of set/reset
3729 * parameter. Return from VT52 mode with an ESC < from 3736 * parameter. Return from VT52 mode with an ESC < from
3730 * within VT52 mode 3737 * within VT52 mode
3731 */ 3738 */
3732 set_privmode (PrivMode_vt52, 1); 3739 priv_modes |= PrivMode_vt52;
3733 break; 3740 break;
3734 case 3: /* 80/132 */ 3741 case 3: /* 80/132 */
3735 if (priv_modes & PrivMode_132OK) 3742 if (priv_modes & PrivMode_132OK)
3736 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3743 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3737 break; 3744 break;
… …
3752 if (state) /* orthogonal */ 3759 if (state) /* orthogonal */
3753 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3760 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3754 break; 3761 break;
3755#ifdef scrollBar_esc 3762#ifdef scrollBar_esc
3756 case scrollBar_esc: 3763 case scrollBar_esc:
3757 if (scrollBar.map (state)) 3764 scrollBar.map (state);
3758 {
3759 resize_all_windows (0, 0, 0); 3765 resize_all_windows (0, 0, 0);
3760 scr_touch (true); 3766 scr_touch (true);
3761 }
3762 break; 3767 break;
3763#endif 3768#endif
3764 case 25: /* visible/invisible cursor */ 3769 case 25: /* visible/invisible cursor */
3765 scr_cursor_visible (state); 3770 scr_cursor_visible (state);
3766 break; 3771 break;
… …
3821 } 3826 }
3822} 3827}
3823/*}}} */ 3828/*}}} */
3824 3829
3825/*{{{ process sgr sequences */ 3830/*{{{ process sgr sequences */
3826void 3831void ecb_hot
3827rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3832rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3828{ 3833{
3829 unsigned int i; 3834 unsigned int i;
3830 short rendset; 3835 short rendset;
3831 int rendstyle; 3836 int rendstyle;

Diff Legend

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