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

Diff Legend

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