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.473 by sf-exg, Thu Jan 27 17:37:19 2011 UTC vs.
Revision 1.509 by sf-exg, Thu May 17 10:18:32 2012 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
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)
… …
257#endif 257#endif
258 258
259void 259void
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);
… …
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;
… …
830 if (view_start) 840 if (view_start)
831 { 841 {
832 view_start = 0; 842 view_start = 0;
833 want_refresh = 1; 843 want_refresh = 1;
834 } 844 }
835
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 845
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
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
938#endif 934#endif
939} 935}
940 936
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 937void
975rxvt_term::flush () 938rxvt_term::flush ()
976{ 939{
977 flush_ev.stop (); 940 flush_ev.stop ();
978 941
979#ifdef HAVE_BG_PIXMAP 942#ifdef HAVE_BG_PIXMAP
980 if (bg_flags & hasChanged) 943 if (bg_flags & BG_NEEDS_REFRESH)
981 { 944 {
982 bg_flags &= ~hasChanged; 945 bg_flags &= ~BG_NEEDS_REFRESH;
983 scr_touch (false); 946 scr_touch (false);
984 } 947 }
985#endif 948#endif
986 949
987 if (want_refresh) 950 if (want_refresh)
… …
1025 } 988 }
1026 989
1027 scr_refresh (); 990 scr_refresh ();
1028 scrollBar.show (1); 991 scrollBar.show (1);
1029#ifdef USE_XIM 992#ifdef USE_XIM
1030 IMSendSpot (); 993 im_send_spot ();
1031#endif 994#endif
1032 } 995 }
1033 996
1034 display->flush (); 997 display->flush ();
1035} 998}
… …
1052 refresh_count = 0; 1015 refresh_count = 0;
1053 flush (); 1016 flush ();
1054} 1017}
1055 1018
1056#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
1057void 1035void
1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1059{ 1037{
1060 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1061 want_refresh = 1; 1039 want_refresh = 1;
… …
1080 1058
1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082void 1060void
1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084{ 1062{
1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1087 { 1065 {
1088 want_refresh = 1; 1066 want_refresh = 1;
1089 refresh_check (); 1067 refresh_check ();
1090 } 1068 }
1091 else 1069 else
… …
1152 { 1130 {
1153 } 1131 }
1154} event_handler; 1132} event_handler;
1155#endif 1133#endif
1156 1134
1135/* make sure all the cmd data is at beginning of cmdbuf */
1136void
1137rxvt_term::cmdbuf_reify ()
1138{
1139 if (cmdbuf_ptr == cmdbuf_base)
1140 return;
1141
1142 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1143
1144 memmove (cmdbuf_base, cmdbuf_ptr, used);
1145 cmdbuf_ptr = cmdbuf_base;
1146 cmdbuf_endp = cmdbuf_ptr + used;
1147
1148}
1149
1150#if defined (KEYSYM_RESOURCE)
1151void
1152rxvt_term::cmdbuf_append (const char *str, size_t count)
1153{
1154 cmdbuf_reify ();
1155
1156 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1157
1158 if (count > avail)
1159 return;
1160
1161 memcpy (cmdbuf_endp, str, count);
1162 cmdbuf_endp += count;
1163
1164 cmd_parse ();
1165}
1166#endif
1167
1157bool 1168bool
1158rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1159{ 1170{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1161 1172
1162 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1163 { 1174
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1165 n = 0;
1166 } 1176 {
1167 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1168 memmove (cmdbuf_base, cmdbuf_ptr, n);
1169 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1171 1182
1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173 1184
1174 if (r > 0) 1185 if (r > 0)
1175 { 1186 {
1176 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1177 return true; 1188 return true;
… …
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
… …
1464 } 1475 }
1465 else 1476 else
1466 get_window_origin (x, y); 1477 get_window_origin (x, y);
1467 1478
1468 if (bg_set_position (x, y) 1479 if (bg_set_position (x, y)
1469 || !(bg_flags & isValid)) 1480 || !(bg_flags & BG_IS_VALID))
1470 moved = true; 1481 moved = true;
1471 } 1482 }
1472#endif 1483#endif
1473 1484
1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
… …
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 }
1494 break; 1500 break;
1495 1501
1496 case PropertyNotify: 1502 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1503 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1499 && ev.xproperty.state == PropertyNewValue)
1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1501
1502 break; 1504 break;
1503 1505
1504 case SelectionClear: 1506 case SelectionClear:
1505 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1507 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1506 break;
1507
1508 case SelectionNotify:
1509 if (selection_wait == Sel_normal)
1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1511 break; 1508 break;
1512 1509
1513 case SelectionRequest: 1510 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1511 selection_send (ev.xselectionrequest);
1515 break; 1512 break;
… …
1526 * by scheduling background redraw as soon as we can, but giving a short 1523 * by scheduling background redraw as soon as we can, but giving a short
1527 * bit of time for ConfigureNotifies to arrive. 1524 * bit of time for ConfigureNotifies to arrive.
1528 * We should render background PRIOR to drawing any text, but AFTER all 1525 * We should render background PRIOR to drawing any text, but AFTER all
1529 * of ConfigureNotifys for the best results. 1526 * of ConfigureNotifys for the best results.
1530 */ 1527 */
1531 if (!(bg_flags & isValid)) 1528 if (!(bg_flags & BG_IS_VALID))
1532 update_background_ev.start (0.025); 1529 update_background_ev.start (0.025);
1533#endif 1530#endif
1534 mapped = 1; 1531 mapped = 1;
1535#ifdef TEXT_BLINK 1532#ifdef TEXT_BLINK
1536 text_blink_ev.start (); 1533 text_blink_ev.start ();
… …
1551 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1552 { 1549 {
1553 do 1550 do
1554 { 1551 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1557 } 1554 }
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1559 1556
1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1561 1558
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1563 { 1560 {
1564 scr_expose (ev.xexpose.x, ev.xexpose.y, 1561 scr_expose (ev.xexpose.x, ev.xexpose.y,
1565 ev.xexpose.width, ev.xexpose.height, False); 1562 ev.xexpose.width, ev.xexpose.height, false);
1566 } 1563 }
1567 1564
1568 want_refresh = 1; 1565 want_refresh = 1;
1569 } 1566 }
1570 else 1567 else
… …
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1577 ; 1574 ;
1578 1575
1579 if (scrollBar.state && ev.xany.window == scrollBar.win) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1580 { 1577 {
1581 scrollBar.state = STATE_IDLE; 1578 scrollBar.state = SB_STATE_IDLE;
1582 scrollBar.show (0); 1579 scrollBar.show (0);
1583 } 1580 }
1584 } 1581 }
1585 break; 1582 break;
1586 1583
… …
1652 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1653 } 1650 }
1654 else 1651 else
1655 { 1652 {
1656 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1657 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1658 } 1655 }
1659 1656
1660 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1661 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1662 + 1; 1659 + 1;
… …
1674#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1675 } 1672 }
1676#endif 1673#endif
1677 } 1674 }
1678 } 1675 }
1679 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1680 { 1677 {
1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1682 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1683 ; 1680 ;
1684 1681
1685 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1686 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1687 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1688 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1689 &unused_mask); 1686 &unused_mask);
1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1691 scrollBar.size ()); 1688 scrollBar.size ());
1692 want_refresh = 1; 1689 want_refresh = 1;
1693 scrollBar.show (1); 1690 scrollBar.show (1);
1694 } 1691 }
1695 break; 1692 break;
1696 } 1693 }
1697 1694
1698#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1699 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1700 {
1701 if (hidden_cursor)
1702 {
1703 hidden_cursor = 0;
1704 want_refresh = 1;
1705 }
1706
1707 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1708 }
1709#endif 1698#endif
1710 1699
1711#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1713 { 1702 {
… …
1730rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1731{ 1720{
1732 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1733 return; 1722 return;
1734 1723
1735 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1736 { 1725 {
1737 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1738 XSetWMHints (dpy, parent[0], h); 1727 XSetWMHints (dpy, parent, h);
1739 urgency_hint = enable; 1728 urgency_hint = enable;
1729 XFree (h);
1740 } 1730 }
1741} 1731}
1742#endif 1732#endif
1743 1733
1744void 1734void
… …
1750 want_refresh = 1; 1740 want_refresh = 1;
1751 1741
1752#if USE_XIM 1742#if USE_XIM
1753 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1754 { 1744 {
1755 IMSetPosition (); 1745 im_set_position ();
1756 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1757 } 1747 }
1758#endif 1748#endif
1759#if CURSOR_BLINK 1749#if CURSOR_BLINK
1760 if (option (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
… …
1991 if (scrollBar.upButton (ev.y)) 1981 if (scrollBar.upButton (ev.y))
1992 direction = UP; /* up */ 1982 direction = UP; /* up */
1993 else if (scrollBar.dnButton (ev.y)) 1983 else if (scrollBar.dnButton (ev.y))
1994 direction = DN; /* down */ 1984 direction = DN; /* down */
1995 1985
1996 scrollBar.state = STATE_IDLE; 1986 scrollBar.state = SB_STATE_IDLE;
1997 /* 1987 /*
1998 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1999 * move up if mouse is above slider 1989 * move up if mouse is above slider
2000 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
2001 * 1991 *
… …
2040 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2041#endif 2031#endif
2042 if (scr_page (direction, 1)) 2032 if (scr_page (direction, 1))
2043 { 2033 {
2044 if (direction == UP) 2034 if (direction == UP)
2045 scrollBar.state = STATE_UP; 2035 scrollBar.state = SB_STATE_UP;
2046 else 2036 else
2047 scrollBar.state = STATE_DOWN; 2037 scrollBar.state = SB_STATE_DOWN;
2048 } 2038 }
2049 } 2039 }
2050 else 2040 else
2051 switch (ev.button) 2041 switch (ev.button)
2052 { 2042 {
2053 case Button2: 2043 case Button2:
2054 switch (scrollBar.align) 2044 switch (scrollBar.align)
2055 { 2045 {
2056 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2057 csrO = 0; 2047 csrO = 0;
2058 break; 2048 break;
2059 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2060 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2061 break; 2051 break;
2062 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2063 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2064 break; 2054 break;
2065 } 2055 }
2066 2056
2067 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2068 || scrollbar_above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2069 || scrollbar_below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2071 2061
2072 scrollBar.state = STATE_MOTION; 2062 scrollBar.state = SB_STATE_MOTION;
2073 break; 2063 break;
2074 2064
2075 case Button1: 2065 case Button1:
2076 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2077 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2078 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2079 2069
2080 case Button3: 2070 case Button3:
2081 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2082 { 2072 {
2083 if (scrollbar_above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2084# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2085 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2086# else 2076# else
2087 scr_page (UP, nrow / 4); 2077 scr_page (UP, nrow / 4);
2088# endif 2078# endif
2089 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollBar.below_slider (ev.y))
2090# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2091 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2092# else 2082# else
2093 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2094# endif 2084# endif
2095 else 2085 else
2096 scrollBar.state = STATE_MOTION; 2086 scrollBar.state = SB_STATE_MOTION;
2097 } 2087 }
2098 else 2088 else
2099 { 2089 {
2100 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2101 (nrow 2091 (nrow
2102 * scrollbar_position (ev.y) 2092 * scrollBar.position (ev.y)
2103 / scrollBar.size ())); 2093 / scrollBar.size ()));
2104 } 2094 }
2105 2095
2106 break; 2096 break;
2107 } 2097 }
… …
2118 2108
2119 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2120 if (!bypass_keystate) 2110 if (!bypass_keystate)
2121 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2122 2112
2123 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2124 { 2114 {
2125 scrollBar.state = STATE_IDLE; 2115 scrollBar.state = SB_STATE_IDLE;
2126 scrollBar.show (0); 2116 scrollBar.show (0);
2127 } 2117 }
2128 2118
2129#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2130 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
… …
2180 case Button3: 2170 case Button3:
2181 selection_make (ev.time); 2171 selection_make (ev.time);
2182 break; 2172 break;
2183 2173
2184 case Button2: 2174 case Button2:
2185 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?
2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2187 break; 2177 break;
2188 2178
2189#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2190 case Button4: 2180 case Button4:
… …
2233 wchar_t ch = NOCHAR; 2223 wchar_t ch = NOCHAR;
2234 char *seq_begin; // remember start of esc-sequence here 2224 char *seq_begin; // remember start of esc-sequence here
2235 2225
2236 for (;;) 2226 for (;;)
2237 { 2227 {
2238 if (expect_false (ch == NOCHAR)) 2228 if (ecb_unlikely (ch == NOCHAR))
2239 { 2229 {
2240 seq_begin = cmdbuf_ptr; 2230 seq_begin = cmdbuf_ptr;
2241 ch = next_char (); 2231 ch = next_char ();
2242 2232
2243 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2244 break; 2234 break;
2245 } 2235 }
2246 2236
2247 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))
2248 { 2238 {
2249 if (expect_false (!seen_input)) 2239 if (ecb_unlikely (!seen_input))
2250 { 2240 {
2251 seen_input = 1; 2241 seen_input = 1;
2252 // many badly-written programs (e.g. jed) contain a race condition: 2242 // many badly-written programs (e.g. jed) contain a race condition:
2253 // they first read the screensize and then install a SIGWINCH handler. 2243 // they first read the screensize and then install a SIGWINCH handler.
2254 // some window managers resize the window early, and these programs 2244 // some window managers resize the window early, and these programs
… …
2267 wchar_t *str = buf; 2257 wchar_t *str = buf;
2268 wchar_t *eol = str + min (ncol, UBUFSIZ); 2258 wchar_t *eol = str + min (ncol, UBUFSIZ);
2269 2259
2270 for (;;) 2260 for (;;)
2271 { 2261 {
2272 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)))
2273 break; 2263 break;
2274 2264
2275 *str++ = ch; 2265 *str++ = ch;
2276 2266
2277 if (expect_false (ch == C0_LF || str >= eol)) 2267 if (ecb_unlikely (ch == C0_LF || str >= eol))
2278 { 2268 {
2279 if (ch == C0_LF) 2269 if (ch == C0_LF)
2280 nlines++; 2270 nlines++;
2281 2271
2282 refresh_count++; 2272 refresh_count++;
… …
2360rxvt_term::next_char () NOTHROW 2350rxvt_term::next_char () NOTHROW
2361{ 2351{
2362 while (cmdbuf_ptr < cmdbuf_endp) 2352 while (cmdbuf_ptr < cmdbuf_endp)
2363 { 2353 {
2364 // assume 7-bit to be ascii ALWAYS 2354 // assume 7-bit to be ascii ALWAYS
2365 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2355 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2366 return *cmdbuf_ptr++; 2356 return *cmdbuf_ptr++;
2367 2357
2368 wchar_t wc; 2358 wchar_t wc;
2369 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);
2370 2360
… …
2398 : NOCHAR; 2388 : NOCHAR;
2399} 2389}
2400 2390
2401static class out_of_input out_of_input; 2391static class out_of_input out_of_input;
2402 2392
2403/* rxvt_cmd_getc () - Return next input character */
2404/*
2405 * Return the next input character after first passing any keyboard input
2406 * to the command.
2407 */
2408wchar_t 2393wchar_t
2409rxvt_term::cmd_getc () THROW ((class out_of_input)) 2394rxvt_term::cmd_getc () THROW ((class out_of_input))
2410{ 2395{
2411 wchar_t c = next_char (); 2396 wchar_t c = next_char ();
2412 2397
… …
2505 pclose_printer (fd); 2490 pclose_printer (fd);
2506} 2491}
2507#endif /* PRINTPIPE */ 2492#endif /* PRINTPIPE */
2508/*}}} */ 2493/*}}} */
2509 2494
2510/* *INDENT-OFF* */
2511enum { 2495enum {
2512 C1_40 = 0x40, 2496 C1_40 = 0x40,
2513 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,
2514 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,
2515 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,
2516 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,
2517}; 2501};
2518/* *INDENT-ON* */
2519 2502
2520/*{{{ process non-printing single characters */ 2503/*{{{ process non-printing single characters */
2521void 2504void
2522rxvt_term::process_nonprinting (unicode_t ch) 2505rxvt_term::process_nonprinting (unicode_t ch)
2523{ 2506{
… …
2616 break; 2599 break;
2617 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2619 break; 2602 break;
2620 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
2621 set_privmode (PrivMode_vt52, 0); 2604 priv_modes &= ~PrivMode_vt52;
2622 break; 2605 break;
2623 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
2624 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
2625 /* unimplemented */ 2608 /* unimplemented */
2626 break; 2609 break;
… …
2645 return; 2628 return;
2646 } 2629 }
2647 2630
2648 switch (ch) 2631 switch (ch)
2649 { 2632 {
2650 /* case 1: do_tek_mode (); break; */
2651 case '#': 2633 case '#':
2652 if (cmd_getc () == '8') 2634 if (cmd_getc () == '8')
2653 scr_E (); 2635 scr_E ();
2654 break; 2636 break;
2655 case '(': 2637 case '(':
… …
2678#if !ENABLE_MINIMAL 2660#if !ENABLE_MINIMAL
2679 case '9': 2661 case '9':
2680 scr_forwardindex (); 2662 scr_forwardindex ();
2681 break; 2663 break;
2682#endif 2664#endif
2665 // DECPAM/DECPNM
2683 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
2684 case '>': 2669 case '>':
2685 set_privmode (PrivMode_aplKP, ch == '='); 2670 priv_modes &= ~PrivMode_aplKP;
2686 break; 2671 break;
2687 2672
2688 case C1_40: 2673 case C1_40:
2689 cmd_getc (); 2674 cmd_getc ();
2690 break; 2675 break;
… …
2694 2679
2695 /* 8.3.87: NEXT LINE */ 2680 /* 8.3.87: NEXT LINE */
2696 case C1_NEL: /* ESC E */ 2681 case C1_NEL: /* ESC E */
2697 { 2682 {
2698 wchar_t nlcr[] = { C0_LF, C0_CR }; 2683 wchar_t nlcr[] = { C0_LF, C0_CR };
2699 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2684 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2700 } 2685 }
2701 break; 2686 break;
2702 2687
2703 /* kidnapped escape sequence: Should be 8.3.48 */ 2688 /* kidnapped escape sequence: Should be 8.3.48 */
2704 case C1_ESA: /* ESC G */ 2689 case C1_ESA: /* ESC G */
2705 process_graphics (); 2690 // used by original rxvt for rob nations own graphics mode
2691 if (cmd_getc () == 'Q')
2692 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2706 break; 2693 break;
2707 2694
2708 /* 8.3.63: CHARACTER TABULATION SET */ 2695 /* 8.3.63: CHARACTER TABULATION SET */
2709 case C1_HTS: /* ESC H */ 2696 case C1_HTS: /* ESC H */
2710 scr_set_tab (1); 2697 scr_set_tab (1);
… …
2714 case C1_RI: /* ESC M */ 2701 case C1_RI: /* ESC M */
2715 scr_index (DN); 2702 scr_index (DN);
2716 break; 2703 break;
2717 2704
2718 /* 8.3.142: SINGLE-SHIFT TWO */ 2705 /* 8.3.142: SINGLE-SHIFT TWO */
2719 /*case C1_SS2: scr_single_shift (2); break; */ 2706 /* case C1_SS2: break; */
2720 2707
2721 /* 8.3.143: SINGLE-SHIFT THREE */ 2708 /* 8.3.143: SINGLE-SHIFT THREE */
2722 /*case C1_SS3: scr_single_shift (3); break; */ 2709 /* case C1_SS3: break; */
2723 2710
2724 /* 8.3.27: DEVICE CONTROL STRING */ 2711 /* 8.3.27: DEVICE CONTROL STRING */
2725 case C1_DCS: /* ESC P */ 2712 case C1_DCS: /* ESC P */
2726 process_dcs_seq (); 2713 process_dcs_seq ();
2727 break; 2714 break;
… …
2760 } 2747 }
2761} 2748}
2762/*}}} */ 2749/*}}} */
2763 2750
2764/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2751/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2765/* *INDENT-OFF* */
2766enum { 2752enum {
2767 CSI_ICH = 0x40, 2753 CSI_ICH = 0x40,
2768 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,
2769 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 ,
2770 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,
… …
2790 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, */
2791 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, */
2792 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, */
2793 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, {, |, }, ~, */
2794 }; 2780 };
2795/* *INDENT-ON* */
2796 2781
2797void 2782void
2798rxvt_term::process_csi_seq () 2783rxvt_term::process_csi_seq ()
2799{ 2784{
2800 unicode_t ch, priv, i; 2785 unicode_t ch, priv, i;
… …
2880 scr_soft_reset (); 2865 scr_soft_reset ();
2881 2866
2882 static const int pm_h[] = { 7, 25 }; 2867 static const int pm_h[] = { 7, 25 };
2883 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 };
2884 2869
2885 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2870 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2886 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2871 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2887 } 2872 }
2888 break; 2873 break;
2889 } 2874 }
2890 2875
2891 return; 2876 return;
… …
2909 } 2894 }
2910 break; 2895 break;
2911#endif 2896#endif
2912 2897
2913 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2914 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2915 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2916 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2917 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2918 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2919 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2920 break; 2905 break;
2921 2906
2922 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2923 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3110 } 3095 }
3111} 3096}
3112/*}}} */ 3097/*}}} */
3113 3098
3114#if !ENABLE_MINIMAL 3099#if !ENABLE_MINIMAL
3115/* ARGSUSED */
3116void 3100void
3117rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3118{ 3102{
3119 int x, y; 3103 int x, y;
3120 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
… …
3129 { 3113 {
3130 /* 3114 /*
3131 * commands 3115 * commands
3132 */ 3116 */
3133 case 1: /* deiconify window */ 3117 case 1: /* deiconify window */
3134 XMapWindow (dpy, parent[0]); 3118 XMapWindow (dpy, parent);
3135 break; 3119 break;
3136 case 2: /* iconify window */ 3120 case 2: /* iconify window */
3137 XIconifyWindow (dpy, parent[0], display->screen); 3121 XIconifyWindow (dpy, parent, display->screen);
3138 break; 3122 break;
3139 case 3: /* set position (pixels) */ 3123 case 3: /* set position (pixels) */
3140 XMoveWindow (dpy, parent[0], args[1], args[2]); 3124 XMoveWindow (dpy, parent, args[1], args[2]);
3141 break; 3125 break;
3142 case 4: /* set size (pixels) */ 3126 case 4: /* set size (pixels) */
3143 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3144 break; 3128 break;
3145 case 5: /* raise window */ 3129 case 5: /* raise window */
3146 XRaiseWindow (dpy, parent[0]); 3130 XRaiseWindow (dpy, parent);
3147 break; 3131 break;
3148 case 6: /* lower window */ 3132 case 6: /* lower window */
3149 XLowerWindow (dpy, parent[0]); 3133 XLowerWindow (dpy, parent);
3150 break; 3134 break;
3151 case 7: /* refresh window */ 3135 case 7: /* refresh window */
3152 scr_touch (true); 3136 scr_touch (true);
3153 break; 3137 break;
3154 case 8: /* set size (chars) */ 3138 case 8: /* set size (chars) */
… …
3157 break; 3141 break;
3158 3142
3159 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3160 default: 3144 default:
3161 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3162 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3163 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3164 break; 3148 break;
3165 3149
3166 /* 3150 /*
3167 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
3168 */ 3152 */
3169 case 11: /* report window state */ 3153 case 11: /* report window state */
3170 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3171 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3172 break; 3156 break;
3173 case 13: /* report window position */ 3157 case 13: /* report window position */
3174 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3175 XTranslateCoordinates (dpy, parent[0], wattr.root, 3159 XTranslateCoordinates (dpy, parent, wattr.root,
3176 -wattr.border_width, -wattr.border_width, 3160 -wattr.border_width, -wattr.border_width,
3177 &x, &y, &wdummy); 3161 &x, &y, &wdummy);
3178 tt_printf ("\033[3;%d;%dt", x, y); 3162 tt_printf ("\033[3;%d;%dt", x, y);
3179 break; 3163 break;
3180 case 14: /* report window size (pixels) */ 3164 case 14: /* report window size (pixels) */
3181 XGetWindowAttributes (dpy, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent, &wattr);
3182 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3183 break; 3167 break;
3184 case 18: /* report text area size (chars) */ 3168 case 18: /* report text area size (chars) */
3185 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3186 break; 3170 break;
… …
3188 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3172 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3189 break; 3173 break;
3190 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3191 { 3175 {
3192 char *s; 3176 char *s;
3193 XGetIconName (dpy, parent[0], &s); 3177 XGetIconName (dpy, parent, &s);
3194 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 */
3195 XFree (s); 3179 XFree (s);
3196 } 3180 }
3197 break; 3181 break;
3198 case 21: /* report window title */ 3182 case 21: /* report window title */
3199 { 3183 {
3200 char *s; 3184 char *s;
3201 XFetchName (dpy, parent[0], &s); 3185 XFetchName (dpy, parent, &s);
3202 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 */
3203 XFree (s); 3187 XFree (s);
3204 } 3188 }
3205 break; 3189 break;
3206 } 3190 }
… …
3360 unsigned long bytes_after; 3344 unsigned long bytes_after;
3361 unsigned char *value = 0; 3345 unsigned char *value = 0;
3362 const char *str = ""; 3346 const char *str = "";
3363 3347
3364 if (prop 3348 if (prop
3365 && XGetWindowProperty (dpy, parent[0], 3349 && XGetWindowProperty (dpy, parent,
3366 prop, 0, 1<<16, 0, AnyPropertyType, 3350 prop, 0, 1<<16, 0, AnyPropertyType,
3367 &actual_type, &actual_format, 3351 &actual_type, &actual_format,
3368 &nitems, &bytes_after, &value) == Success 3352 &nitems, &bytes_after, &value) == Success
3369 && actual_type != None 3353 && actual_type != None
3370 && actual_format == 8) 3354 && actual_format == 8)
… …
3382 { 3366 {
3383 *eq = 0; 3367 *eq = 0;
3384 set_utf8_property (display->atom (str), eq + 1); 3368 set_utf8_property (display->atom (str), eq + 1);
3385 } 3369 }
3386 else 3370 else
3387 XDeleteProperty (dpy, parent[0], 3371 XDeleteProperty (dpy, parent,
3388 display->atom (str)); 3372 display->atom (str));
3389 } 3373 }
3390 break; 3374 break;
3391 3375
3392 case XTerm_Color: 3376 case XTerm_Color:
… …
3469 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3470 { 3454 {
3471 char str[256]; 3455 char str[256];
3472 3456
3473 sprintf (str, "[%dx%d+%d+%d]", 3457 sprintf (str, "[%dx%d+%d+%d]",
3474 min (h_scale, 32767), min (v_scale, 32767), 3458 min (bg_image.h_scale, 32767), min (bg_image.v_scale, 32767),
3475 min (h_align, 32767), min (v_align, 32767)); 3459 min (bg_image.h_align, 32767), min (bg_image.v_align, 32767));
3476 process_xterm_seq (XTerm_title, str, CHAR_ST); 3460 process_xterm_seq (XTerm_title, str, CHAR_ST);
3477 } 3461 }
3478 else 3462 else
3479 { 3463 {
3480 int changed = 0; 3464 bool changed = false;
3481 3465
3482 if (*str != ';') 3466 if (*str != ';')
3483 { 3467 {
3484 if (bg_set_file (str)) /* change pixmap */ 3468 if (bg_image.set_file (str)) /* change pixmap */
3485 {
3486 changed++; 3469 changed = true;
3487 str = strchr (str, ';');
3488 if (str == NULL)
3489 bg_set_default_geometry ();
3490 else
3491 bg_set_geometry (str+1);
3492 }
3493 } 3470 }
3494 else 3471 else
3495 { 3472 {
3496 str++; 3473 str++;
3497 if (bg_set_geometry (str, true)) 3474 if (bg_image.set_geometry (str, true))
3498 changed++; 3475 changed = true;
3499 } 3476 }
3500 3477
3501 if (changed) 3478 if (changed)
3502 { 3479 {
3503 if (bg_window_position_sensitive ()) 3480 if (bg_window_position_sensitive ())
… …
3609{ 3586{
3610 int state; 3587 int state;
3611 3588
3612 if (mode == 's') 3589 if (mode == 's')
3613 { 3590 {
3614 SavedModes |= (priv_modes & bit); 3591 if (priv_modes & bit)
3592 SavedModes |= bit;
3593 else
3594 SavedModes &= ~bit;
3615 return -1; 3595 return -1;
3616 } 3596 }
3617 else 3597 else
3618 { 3598 {
3619 if (mode == 'r') 3599 if (mode == 'r')
3620 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3621 else 3601 else
3622 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3602 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3623 3603
3624 set_privmode (bit, state); 3604 if (state)
3605 priv_modes |= bit;
3606 else
3607 priv_modes &= ~bit;
3625 } 3608 }
3626 3609
3627 return state; 3610 return state;
3628} 3611}
3629 3612
3630/* we're not using priv _yet_ */ 3613/* we're not using priv _yet_ */
3631void 3614void
3632rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3615rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3633{ 3616{
3634 unsigned int i, j; 3617 unsigned int i, j;
3635 int state; 3618 int state;
3636 3619
3637 static const struct 3620 static const struct
3638 { 3621 {
3639 const int argval; 3622 const int argval;
3640 const unsigned long bit; 3623 const unsigned long bit;
3641 } argtopriv[] = { 3624 } argtopriv[] = {
3642 { 1, PrivMode_aplCUR }, // DECCKM 3625 { 1, PrivMode_aplCUR }, // DECCKM
3643 { 2, PrivMode_vt52 }, 3626 { 2, PrivMode_vt52 }, // DECANM
3644 { 3, PrivMode_132 }, // DECCOLM 3627 { 3, PrivMode_132 }, // DECCOLM
3645 { 4, PrivMode_smoothScroll }, // DECSCLM 3628 { 4, PrivMode_smoothScroll }, // DECSCLM
3646 { 5, PrivMode_rVideo }, // DECSCNM 3629 { 5, PrivMode_rVideo }, // DECSCNM
3647 { 6, PrivMode_relOrigin }, // DECOM 3630 { 6, PrivMode_relOrigin }, // DECOM
3648 { 7, PrivMode_Autowrap }, // DECAWM 3631 { 7, PrivMode_Autowrap }, // DECAWM
3649 // 8, auto-repeat keys // DECARM 3632 // 8, auto-repeat keys // DECARM
3650 { 9, PrivMode_MouseX10 }, 3633 { 9, PrivMode_MouseX10 },
3651 // 18 end FF to printer after print screen 3634 // 18 end FF to printer after print screen
3652 // 19 Print screen prints full screen/scroll region 3635 // 19 Print screen prints full screen/scroll region
3653 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3636 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3654#ifdef scrollBar_esc 3637#ifdef scrollBar_esc
3655 { scrollBar_esc, PrivMode_scrollBar }, 3638 { scrollBar_esc, PrivMode_scrollBar },
3656#endif 3639#endif
3657 { 35, PrivMode_ShiftKeys }, // rxvt extension 3640 { 35, PrivMode_ShiftKeys }, // rxvt extension
3658 // 38, tektronix mode // DECTEK 3641 // 38, tektronix mode // DECTEK
3659 { 40, PrivMode_132OK }, 3642 { 40, PrivMode_132OK },
3660 // 41 xterm more fixes NYI 3643 // 41 xterm more fixes NYI
3661 // 45 margin bell NYI 3644 // 45 margin bell NYI
3662 // 46 start logging 3645 // 46 start logging
3663 { 47, PrivMode_Screen }, 3646 { 47, PrivMode_Screen },
3664 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3647 { 66, PrivMode_aplKP }, // DECNKM
3665#ifndef NO_BACKSPACE_KEY 3648#ifndef NO_BACKSPACE_KEY
3666 { 67, PrivMode_BackSpace }, // DECBKM 3649 { 67, PrivMode_BackSpace }, // DECBKM
3667#endif 3650#endif
3668 { 1000, PrivMode_MouseX11 }, 3651 { 1000, PrivMode_MouseX11 },
3669 { 1002, PrivMode_MouseBtnEvent }, 3652 { 1002, PrivMode_MouseBtnEvent },
… …
3698 for (i = 0; i < nargs; i++) 3681 for (i = 0; i < nargs; i++)
3699 { 3682 {
3700 state = -1; 3683 state = -1;
3701 3684
3702 /* basic handling */ 3685 /* basic handling */
3703 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3686 for (j = 0; j < ecb_array_length (argtopriv); j++)
3704 if (argtopriv[j].argval == arg[i]) 3687 if (argtopriv[j].argval == arg[i])
3705 { 3688 {
3706 state = privcases (mode, argtopriv[j].bit); 3689 state = privcases (mode, argtopriv[j].bit);
3707 break; 3690 break;
3708 } 3691 }
… …
3734 case 2: /* VT52 mode */ 3717 case 2: /* VT52 mode */
3735 /* oddball mode. should be set regardless of set/reset 3718 /* oddball mode. should be set regardless of set/reset
3736 * parameter. Return from VT52 mode with an ESC < from 3719 * parameter. Return from VT52 mode with an ESC < from
3737 * within VT52 mode 3720 * within VT52 mode
3738 */ 3721 */
3739 set_privmode (PrivMode_vt52, 1); 3722 priv_modes |= PrivMode_vt52;
3740 break; 3723 break;
3741 case 3: /* 80/132 */ 3724 case 3: /* 80/132 */
3742 if (priv_modes & PrivMode_132OK) 3725 if (priv_modes & PrivMode_132OK)
3743 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3726 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3744 break; 3727 break;
… …
3759 if (state) /* orthogonal */ 3742 if (state) /* orthogonal */
3760 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3743 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3761 break; 3744 break;
3762#ifdef scrollBar_esc 3745#ifdef scrollBar_esc
3763 case scrollBar_esc: 3746 case scrollBar_esc:
3764 if (scrollBar.map (state)) 3747 scrollBar.map (state);
3765 {
3766 resize_all_windows (0, 0, 0); 3748 resize_all_windows (0, 0, 0);
3767 scr_touch (true); 3749 scr_touch (true);
3768 }
3769 break; 3750 break;
3770#endif 3751#endif
3771 case 25: /* visible/invisible cursor */ 3752 case 25: /* visible/invisible cursor */
3772 scr_cursor_visible (state); 3753 scr_cursor_visible (state);
3773 break; 3754 break;
… …
3981 } 3962 }
3982 } 3963 }
3983} 3964}
3984/*}}} */ 3965/*}}} */
3985 3966
3986/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3987void
3988rxvt_term::process_graphics ()
3989{
3990 unicode_t ch, cmd = cmd_getc ();
3991
3992 if (cmd == 'Q')
3993 {
3994 /* query graphics */
3995 tt_printf ("\033G0\012"); /* no graphics */
3996 return;
3997 }
3998 /* swallow other graphics sequences until terminating ':' */
3999 do
4000 ch = cmd_getc ();
4001 while (ch != ':');
4002}
4003/*}}} */
4004
4005/* ------------------------------------------------------------------------- */ 3967/* ------------------------------------------------------------------------- */
4006 3968
4007/* 3969/*
4008 * Send printf () formatted output to the command. 3970 * Send printf () formatted output to the command.
4009 * Only use for small amounts of data. 3971 * Only use for small amounts of data.
… …
4037 3999
4038 if (v_buflen == 0) 4000 if (v_buflen == 0)
4039 { 4001 {
4040 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4002 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4041 4003
4004 max_it (written, 0);
4005
4042 if ((unsigned int)written == len) 4006 if (written == len)
4043 return; 4007 return;
4044 4008
4045 data += written; 4009 data += written;
4046 len -= written; 4010 len -= written;
4047 } 4011 }

Diff Legend

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