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.456 by sf-exg, Fri Oct 22 16:49:26 2010 UTC vs.
Revision 1.498 by sf-exg, Fri Sep 30 13:31:21 2011 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
… …
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 }
… …
889 commit_iso14755 (); 884 commit_iso14755 ();
890 885
891 return; 886 return;
892 } 887 }
893 888
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 890 if (i[0] == keysym)
896 { 891 {
897 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 893 commit_iso14755 ();
899 894
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
938#endif 933#endif
939} 934}
940 935
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 936void
975rxvt_term::flush () 937rxvt_term::flush ()
976{ 938{
977 flush_ev.stop (); 939 flush_ev.stop ();
978 940
979#ifdef HAVE_BG_PIXMAP 941#ifdef HAVE_BG_PIXMAP
980 if (bgPixmap.check_clearChanged ()) 942 if (bg_flags & BG_NEEDS_REFRESH)
981 { 943 {
982// scr_clear (true); This needs to be researched further! 944 bg_flags &= ~BG_NEEDS_REFRESH;
983 scr_touch (false); 945 scr_touch (false);
984 } 946 }
985#endif 947#endif
986 948
987 if (want_refresh) 949 if (want_refresh)
… …
1025 } 987 }
1026 988
1027 scr_refresh (); 989 scr_refresh ();
1028 scrollBar.show (1); 990 scrollBar.show (1);
1029#ifdef USE_XIM 991#ifdef USE_XIM
1030 IMSendSpot (); 992 im_send_spot ();
1031#endif 993#endif
1032 } 994 }
1033 995
1034 display->flush (); 996 display->flush ();
1035} 997}
… …
1080 1042
1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082void 1044void
1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084{ 1046{
1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1047 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1087 { 1049 {
1088 want_refresh = 1; 1050 want_refresh = 1;
1089 refresh_check (); 1051 refresh_check ();
1090 } 1052 }
1091 else 1053 else
… …
1152 { 1114 {
1153 } 1115 }
1154} event_handler; 1116} event_handler;
1155#endif 1117#endif
1156 1118
1119/* make sure all the cmd data is at beginning of cmdbuf */
1120void
1121rxvt_term::cmdbuf_reify ()
1122{
1123 if (cmdbuf_ptr == cmdbuf_base)
1124 return;
1125
1126 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1127
1128 memmove (cmdbuf_base, cmdbuf_ptr, used);
1129 cmdbuf_ptr = cmdbuf_base;
1130 cmdbuf_endp = cmdbuf_ptr + used;
1131
1132}
1133
1134#if defined (KEYSYM_RESOURCE)
1135void
1136rxvt_term::cmdbuf_append (const char *str, size_t count)
1137{
1138 cmdbuf_reify ();
1139
1140 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141
1142 if (count > avail)
1143 return;
1144
1145 memcpy (cmdbuf_endp, str, count);
1146 cmdbuf_endp += count;
1147
1148 cmd_parse ();
1149}
1150#endif
1151
1157bool 1152bool
1158rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1159{ 1154{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1161 1156
1162 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1163 { 1158
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1165 n = 0;
1166 } 1160 {
1167 1161 // 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; 1162 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1171 1166
1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173 1168
1174 if (r > 0) 1169 if (r > 0)
1175 { 1170 {
1176 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1177 return true; 1172 return true;
… …
1251{ 1246{
1252 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1253 int x, y; 1248 int x, y;
1254 int code = 32; 1249 int code = 32;
1255 1250
1256 x = Pixel2Col (ev.x); 1251 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1252 y = Pixel2Row (ev.y) + 1;
1253
1258 if (ev.type == MotionNotify) 1254 if (ev.type == MotionNotify)
1259 { 1255 {
1260 if (x == mouse_row && y == mouse_col) 1256 if (x == mouse_row && y == mouse_col)
1261 return; 1257 return;
1258
1262 mouse_row = x; 1259 mouse_row = x;
1263 mouse_col = y; 1260 mouse_col = y;
1264 code += 32; 1261 code += 32;
1265 } 1262 }
1266 1263
… …
1269 else 1266 else
1270 { 1267 {
1271 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1270 if (button_number >= 3)
1274 button_number += (64 - 3); 1271 button_number += 64 - 3;
1275 } 1272 }
1276 1273
1277 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1278 { 1275 {
1279 /* 1276 /*
… …
1311 fputc ('A', stderr); 1308 fputc ('A', stderr);
1312 if (key_state & 32) 1309 if (key_state & 32)
1313 fputc ('2', stderr); 1310 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1312 button_number,
1316 x + 1, 1313 x,
1317 y + 1); 1314 y);
1318#endif 1315#endif
1319 1316
1317#if ENABLE_FRILLS
1318 if (priv_modes & PrivMode_ExtMouseRight)
1319 tt_printf ("\033[%d;%d;%dM",
1320 code + button_number + key_state,
1321 x,
1322 y);
1323 else if (priv_modes & PrivMode_ExtModeMouse)
1324 tt_printf ("\033[M%c%lc%lc",
1325 code + button_number + key_state,
1326 wint_t (32 + x),
1327 wint_t (32 + y));
1328 else
1329#endif
1320 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1331 code + button_number + key_state,
1322 (32 + x + 1), 1332 32 + x,
1323 (32 + y + 1)); 1333 32 + y);
1324} 1334}
1325 1335
1326/*{{{ process an X event */ 1336/*{{{ process an X event */
1327void 1337void
1328rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1430 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1441 focus_out ();
1432 break; 1442 break;
1433 1443
1434 case ConfigureNotify: 1444 case ConfigureNotify:
1435 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1436 { 1446 {
1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1438 ; 1448 ;
1449
1450#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ())
1453 {
1454 int x, y;
1455 if (ev.xconfigure.send_event)
1456 {
1457 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y;
1459 }
1460 else
1461 get_window_origin (x, y);
1462
1463 if (bg_set_position (x, y)
1464 || !(bg_flags & BG_IS_VALID))
1465 moved = true;
1466 }
1467#endif
1439 1468
1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1441 { 1470 {
1442 seen_resize = 1; 1471 seen_resize = 1;
1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1444 } 1473 }
1445 else 1474 else
1446 { 1475 {
1447#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ())
1449 {
1450 if (mapped) 1477 if (moved)
1451 update_background (); 1478 update_background ();
1452 else
1453 bgPixmap.invalidate ();
1454 }
1455#endif 1479#endif
1456 } 1480 }
1457 1481
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 } 1483 }
1460 break; 1484 break;
1461 1485
1462 case PropertyNotify: 1486 case PropertyNotify:
1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1487 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1465 && ev.xproperty.state == PropertyNewValue)
1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1467
1468 break; 1488 break;
1469 1489
1470 case SelectionClear: 1490 case SelectionClear:
1471 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1472 break;
1473
1474 case SelectionNotify:
1475 if (selection_wait == Sel_normal)
1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1477 break; 1492 break;
1478 1493
1479 case SelectionRequest: 1494 case SelectionRequest:
1480 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1481 break; 1496 break;
… …
1492 * by scheduling background redraw as soon as we can, but giving a short 1507 * by scheduling background redraw as soon as we can, but giving a short
1493 * bit of time for ConfigureNotifies to arrive. 1508 * bit of time for ConfigureNotifies to arrive.
1494 * We should render background PRIOR to drawing any text, but AFTER all 1509 * We should render background PRIOR to drawing any text, but AFTER all
1495 * of ConfigureNotifys for the best results. 1510 * of ConfigureNotifys for the best results.
1496 */ 1511 */
1497 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1512 if (!(bg_flags & BG_IS_VALID))
1498 update_background_ev.start (0.025); 1513 update_background_ev.start (0.025);
1499#endif 1514#endif
1500 mapped = 1; 1515 mapped = 1;
1501#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1502 text_blink_ev.start (); 1517 text_blink_ev.start ();
… …
1517 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1518 { 1533 {
1519 do 1534 do
1520 { 1535 {
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1523 } 1538 }
1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1525 1540
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1542
1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1529 { 1544 {
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1532 } 1547 }
1533 1548
1534 want_refresh = 1; 1549 want_refresh = 1;
1535 } 1550 }
1536 else 1551 else
… …
1542 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1543 ; 1558 ;
1544 1559
1545 if (scrollBar.state && ev.xany.window == scrollBar.win) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1546 { 1561 {
1547 scrollBar.state = STATE_IDLE; 1562 scrollBar.state = SB_STATE_IDLE;
1548 scrollBar.show (0); 1563 scrollBar.show (0);
1549 } 1564 }
1550 } 1565 }
1551 break; 1566 break;
1552 1567
… …
1640#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1641 } 1656 }
1642#endif 1657#endif
1643 } 1658 }
1644 } 1659 }
1645 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1660 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1646 { 1661 {
1647 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1649 ; 1664 ;
1650 1665
1651 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1670 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1657 scrollBar.size ()); 1672 scrollBar.size ());
1658 want_refresh = 1; 1673 want_refresh = 1;
1659 scrollBar.show (1); 1674 scrollBar.show (1);
1660 } 1675 }
1661 break; 1676 break;
… …
1696rxvt_term::set_urgency (bool enable) 1711rxvt_term::set_urgency (bool enable)
1697{ 1712{
1698 if (enable == urgency_hint) 1713 if (enable == urgency_hint)
1699 return; 1714 return;
1700 1715
1701 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1702 { 1717 {
1703 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1704 XSetWMHints (dpy, parent[0], h); 1719 XSetWMHints (dpy, parent, h);
1705 urgency_hint = enable; 1720 urgency_hint = enable;
1721 XFree (h);
1706 } 1722 }
1707} 1723}
1708#endif 1724#endif
1709 1725
1710void 1726void
… …
1716 want_refresh = 1; 1732 want_refresh = 1;
1717 1733
1718#if USE_XIM 1734#if USE_XIM
1719 if (Input_Context != NULL) 1735 if (Input_Context != NULL)
1720 { 1736 {
1721 IMSetPosition (); 1737 im_set_position ();
1722 XSetICFocus (Input_Context); 1738 XSetICFocus (Input_Context);
1723 } 1739 }
1724#endif 1740#endif
1725#if CURSOR_BLINK 1741#if CURSOR_BLINK
1726 if (option (Opt_cursorBlink)) 1742 if (option (Opt_cursorBlink))
… …
1817 * use the property to determine the pixmap. We use it later on. 1833 * use the property to determine the pixmap. We use it later on.
1818 */ 1834 */
1819 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1835 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1836 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 { 1837 {
1822 bgPixmap.set_root_pixmap (); 1838 bg_set_root_pixmap ();
1823 update_background (); 1839 update_background ();
1824 } 1840 }
1825 1841
1826 break; 1842 break;
1827 } 1843 }
… …
1957 if (scrollBar.upButton (ev.y)) 1973 if (scrollBar.upButton (ev.y))
1958 direction = UP; /* up */ 1974 direction = UP; /* up */
1959 else if (scrollBar.dnButton (ev.y)) 1975 else if (scrollBar.dnButton (ev.y))
1960 direction = DN; /* down */ 1976 direction = DN; /* down */
1961 1977
1962 scrollBar.state = STATE_IDLE; 1978 scrollBar.state = SB_STATE_IDLE;
1963 /* 1979 /*
1964 * Rxvt-style scrollbar: 1980 * Rxvt-style scrollbar:
1965 * move up if mouse is above slider 1981 * move up if mouse is above slider
1966 * move dn if mouse is below slider 1982 * move dn if mouse is below slider
1967 * 1983 *
… …
2006 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2022 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2007#endif 2023#endif
2008 if (scr_page (direction, 1)) 2024 if (scr_page (direction, 1))
2009 { 2025 {
2010 if (direction == UP) 2026 if (direction == UP)
2011 scrollBar.state = STATE_UP; 2027 scrollBar.state = SB_STATE_UP;
2012 else 2028 else
2013 scrollBar.state = STATE_DOWN; 2029 scrollBar.state = SB_STATE_DOWN;
2014 } 2030 }
2015 } 2031 }
2016 else 2032 else
2017 switch (ev.button) 2033 switch (ev.button)
2018 { 2034 {
2019 case Button2: 2035 case Button2:
2020 switch (scrollBar.align) 2036 switch (scrollBar.align)
2021 { 2037 {
2022 case R_SB_ALIGN_TOP: 2038 case SB_ALIGN_TOP:
2023 csrO = 0; 2039 csrO = 0;
2024 break; 2040 break;
2025 case R_SB_ALIGN_CENTRE: 2041 case SB_ALIGN_CENTRE:
2026 csrO = (scrollBar.bot - scrollBar.top) / 2; 2042 csrO = (scrollBar.bot - scrollBar.top) / 2;
2027 break; 2043 break;
2028 case R_SB_ALIGN_BOTTOM: 2044 case SB_ALIGN_BOTTOM:
2029 csrO = scrollBar.bot - scrollBar.top; 2045 csrO = scrollBar.bot - scrollBar.top;
2030 break; 2046 break;
2031 } 2047 }
2032 2048
2033 if (scrollBar.style == R_SB_XTERM 2049 if (scrollBar.style == SB_STYLE_XTERM
2034 || scrollbar_above_slider (ev.y) 2050 || scrollBar.above_slider (ev.y)
2035 || scrollbar_below_slider (ev.y)) 2051 || scrollBar.below_slider (ev.y))
2036 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2052 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2037 2053
2038 scrollBar.state = STATE_MOTION; 2054 scrollBar.state = SB_STATE_MOTION;
2039 break; 2055 break;
2040 2056
2041 case Button1: 2057 case Button1:
2042 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2058 if (scrollBar.align == SB_ALIGN_CENTRE)
2043 csrO = ev.y - scrollBar.top; 2059 csrO = ev.y - scrollBar.top;
2044 /* FALLTHROUGH */ 2060 /* FALLTHROUGH */
2045 2061
2046 case Button3: 2062 case Button3:
2047 if (scrollBar.style != R_SB_XTERM) 2063 if (scrollBar.style != SB_STYLE_XTERM)
2048 { 2064 {
2049 if (scrollbar_above_slider (ev.y)) 2065 if (scrollBar.above_slider (ev.y))
2050# ifdef RXVT_SCROLL_FULL 2066# ifdef RXVT_SCROLL_FULL
2051 scr_page (UP, nrow - 1); 2067 scr_page (UP, nrow - 1);
2052# else 2068# else
2053 scr_page (UP, nrow / 4); 2069 scr_page (UP, nrow / 4);
2054# endif 2070# endif
2055 else if (scrollbar_below_slider (ev.y)) 2071 else if (scrollBar.below_slider (ev.y))
2056# ifdef RXVT_SCROLL_FULL 2072# ifdef RXVT_SCROLL_FULL
2057 scr_page (DN, nrow - 1); 2073 scr_page (DN, nrow - 1);
2058# else 2074# else
2059 scr_page (DN, nrow / 4); 2075 scr_page (DN, nrow / 4);
2060# endif 2076# endif
2061 else 2077 else
2062 scrollBar.state = STATE_MOTION; 2078 scrollBar.state = SB_STATE_MOTION;
2063 } 2079 }
2064 else 2080 else
2065 { 2081 {
2066 scr_page ((ev.button == Button1 ? DN : UP), 2082 scr_page ((ev.button == Button1 ? DN : UP),
2067 (nrow 2083 (nrow
2068 * scrollbar_position (ev.y) 2084 * scrollBar.position (ev.y)
2069 / scrollBar.size ())); 2085 / scrollBar.size ()));
2070 } 2086 }
2071 2087
2072 break; 2088 break;
2073 } 2089 }
… …
2084 2100
2085 csrO = 0; /* reset csr Offset */ 2101 csrO = 0; /* reset csr Offset */
2086 if (!bypass_keystate) 2102 if (!bypass_keystate)
2087 reportmode = !! (priv_modes & PrivMode_mouse_report); 2103 reportmode = !! (priv_modes & PrivMode_mouse_report);
2088 2104
2089 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2105 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2090 { 2106 {
2091 scrollBar.state = STATE_IDLE; 2107 scrollBar.state = SB_STATE_IDLE;
2092 scrollBar.show (0); 2108 scrollBar.show (0);
2093 } 2109 }
2094 2110
2095#ifdef SELECTION_SCROLLING 2111#ifdef SELECTION_SCROLLING
2096 sel_scroll_ev.stop(); 2112 sel_scroll_ev.stop();
… …
2199 wchar_t ch = NOCHAR; 2215 wchar_t ch = NOCHAR;
2200 char *seq_begin; // remember start of esc-sequence here 2216 char *seq_begin; // remember start of esc-sequence here
2201 2217
2202 for (;;) 2218 for (;;)
2203 { 2219 {
2204 if (expect_false (ch == NOCHAR)) 2220 if (ecb_unlikely (ch == NOCHAR))
2205 { 2221 {
2206 seq_begin = cmdbuf_ptr; 2222 seq_begin = cmdbuf_ptr;
2207 ch = next_char (); 2223 ch = next_char ();
2208 2224
2209 if (ch == NOCHAR) 2225 if (ch == NOCHAR)
2210 break; 2226 break;
2211 } 2227 }
2212 2228
2213 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2229 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2214 { 2230 {
2215 if (expect_false (!seen_input)) 2231 if (ecb_unlikely (!seen_input))
2216 { 2232 {
2217 seen_input = 1; 2233 seen_input = 1;
2218 // many badly-written programs (e.g. jed) contain a race condition: 2234 // many badly-written programs (e.g. jed) contain a race condition:
2219 // they first read the screensize and then install a SIGWINCH handler. 2235 // they first read the screensize and then install a SIGWINCH handler.
2220 // some window managers resize the window early, and these programs 2236 // some window managers resize the window early, and these programs
… …
2233 wchar_t *str = buf; 2249 wchar_t *str = buf;
2234 wchar_t *eol = str + min (ncol, UBUFSIZ); 2250 wchar_t *eol = str + min (ncol, UBUFSIZ);
2235 2251
2236 for (;;) 2252 for (;;)
2237 { 2253 {
2238 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2254 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2239 break; 2255 break;
2240 2256
2241 *str++ = ch; 2257 *str++ = ch;
2242 2258
2243 if (expect_false (ch == C0_LF || str >= eol)) 2259 if (ecb_unlikely (ch == C0_LF || str >= eol))
2244 { 2260 {
2245 if (ch == C0_LF) 2261 if (ch == C0_LF)
2246 nlines++; 2262 nlines++;
2247 2263
2248 refresh_count++; 2264 refresh_count++;
… …
2326rxvt_term::next_char () NOTHROW 2342rxvt_term::next_char () NOTHROW
2327{ 2343{
2328 while (cmdbuf_ptr < cmdbuf_endp) 2344 while (cmdbuf_ptr < cmdbuf_endp)
2329 { 2345 {
2330 // assume 7-bit to be ascii ALWAYS 2346 // assume 7-bit to be ascii ALWAYS
2331 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2347 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2332 return *cmdbuf_ptr++; 2348 return *cmdbuf_ptr++;
2333 2349
2334 wchar_t wc; 2350 wchar_t wc;
2335 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2351 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2336 2352
… …
2364 : NOCHAR; 2380 : NOCHAR;
2365} 2381}
2366 2382
2367static class out_of_input out_of_input; 2383static class out_of_input out_of_input;
2368 2384
2369/* rxvt_cmd_getc () - Return next input character */
2370/*
2371 * Return the next input character after first passing any keyboard input
2372 * to the command.
2373 */
2374wchar_t 2385wchar_t
2375rxvt_term::cmd_getc () THROW ((class out_of_input)) 2386rxvt_term::cmd_getc () THROW ((class out_of_input))
2376{ 2387{
2377 wchar_t c = next_char (); 2388 wchar_t c = next_char ();
2378 2389
… …
2471 pclose_printer (fd); 2482 pclose_printer (fd);
2472} 2483}
2473#endif /* PRINTPIPE */ 2484#endif /* PRINTPIPE */
2474/*}}} */ 2485/*}}} */
2475 2486
2476/* *INDENT-OFF* */
2477enum { 2487enum {
2478 C1_40 = 0x40, 2488 C1_40 = 0x40,
2479 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2489 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2480 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2490 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2481 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2491 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2482 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2492 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2483}; 2493};
2484/* *INDENT-ON* */
2485 2494
2486/*{{{ process non-printing single characters */ 2495/*{{{ process non-printing single characters */
2487void 2496void
2488rxvt_term::process_nonprinting (unicode_t ch) 2497rxvt_term::process_nonprinting (unicode_t ch)
2489{ 2498{
… …
2582 break; 2591 break;
2583 case 'Z': /* identify the terminal type */ 2592 case 'Z': /* identify the terminal type */
2584 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2593 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2585 break; 2594 break;
2586 case '<': /* turn off VT52 mode */ 2595 case '<': /* turn off VT52 mode */
2587 set_privmode (PrivMode_vt52, 0); 2596 priv_modes &= ~PrivMode_vt52;
2588 break; 2597 break;
2589 case 'F': /* use special graphics character set */ 2598 case 'F': /* use special graphics character set */
2590 case 'G': /* use regular character set */ 2599 case 'G': /* use regular character set */
2591 /* unimplemented */ 2600 /* unimplemented */
2592 break; 2601 break;
… …
2611 return; 2620 return;
2612 } 2621 }
2613 2622
2614 switch (ch) 2623 switch (ch)
2615 { 2624 {
2616 /* case 1: do_tek_mode (); break; */
2617 case '#': 2625 case '#':
2618 if (cmd_getc () == '8') 2626 if (cmd_getc () == '8')
2619 scr_E (); 2627 scr_E ();
2620 break; 2628 break;
2621 case '(': 2629 case '(':
… …
2644#if !ENABLE_MINIMAL 2652#if !ENABLE_MINIMAL
2645 case '9': 2653 case '9':
2646 scr_forwardindex (); 2654 scr_forwardindex ();
2647 break; 2655 break;
2648#endif 2656#endif
2657 // DECPAM/DECPNM
2649 case '=': 2658 case '=':
2659 priv_modes |= PrivMode_aplKP;
2660 break;
2650 case '>': 2661 case '>':
2651 set_privmode (PrivMode_aplKP, ch == '='); 2662 priv_modes &= ~PrivMode_aplKP;
2652 break; 2663 break;
2653 2664
2654 case C1_40: 2665 case C1_40:
2655 cmd_getc (); 2666 cmd_getc ();
2656 break; 2667 break;
… …
2660 2671
2661 /* 8.3.87: NEXT LINE */ 2672 /* 8.3.87: NEXT LINE */
2662 case C1_NEL: /* ESC E */ 2673 case C1_NEL: /* ESC E */
2663 { 2674 {
2664 wchar_t nlcr[] = { C0_LF, C0_CR }; 2675 wchar_t nlcr[] = { C0_LF, C0_CR };
2665 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2676 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2666 } 2677 }
2667 break; 2678 break;
2668 2679
2669 /* kidnapped escape sequence: Should be 8.3.48 */ 2680 /* kidnapped escape sequence: Should be 8.3.48 */
2670 case C1_ESA: /* ESC G */ 2681 case C1_ESA: /* ESC G */
2671 process_graphics (); 2682 // used by original rxvt for rob nations own graphics mode
2683 if (cmd_getc () == 'Q')
2684 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2672 break; 2685 break;
2673 2686
2674 /* 8.3.63: CHARACTER TABULATION SET */ 2687 /* 8.3.63: CHARACTER TABULATION SET */
2675 case C1_HTS: /* ESC H */ 2688 case C1_HTS: /* ESC H */
2676 scr_set_tab (1); 2689 scr_set_tab (1);
… …
2680 case C1_RI: /* ESC M */ 2693 case C1_RI: /* ESC M */
2681 scr_index (DN); 2694 scr_index (DN);
2682 break; 2695 break;
2683 2696
2684 /* 8.3.142: SINGLE-SHIFT TWO */ 2697 /* 8.3.142: SINGLE-SHIFT TWO */
2685 /*case C1_SS2: scr_single_shift (2); break; */ 2698 /* case C1_SS2: break; */
2686 2699
2687 /* 8.3.143: SINGLE-SHIFT THREE */ 2700 /* 8.3.143: SINGLE-SHIFT THREE */
2688 /*case C1_SS3: scr_single_shift (3); break; */ 2701 /* case C1_SS3: break; */
2689 2702
2690 /* 8.3.27: DEVICE CONTROL STRING */ 2703 /* 8.3.27: DEVICE CONTROL STRING */
2691 case C1_DCS: /* ESC P */ 2704 case C1_DCS: /* ESC P */
2692 process_dcs_seq (); 2705 process_dcs_seq ();
2693 break; 2706 break;
… …
2726 } 2739 }
2727} 2740}
2728/*}}} */ 2741/*}}} */
2729 2742
2730/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2743/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2731/* *INDENT-OFF* */
2732enum { 2744enum {
2733 CSI_ICH = 0x40, 2745 CSI_ICH = 0x40,
2734 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2746 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2735 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2747 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2736 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2748 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2739 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2751 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2740 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2752 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2741 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2753 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2742}; 2754};
2743 2755
2744#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2756#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2745 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2757 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2746 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2758 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2747#define get_byte_array_bit(array, bit) \ 2759#define get_byte_array_bit(array, bit) \
2748 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2760 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2749 2761
2750const unsigned char csi_defaults[] = 2762static const unsigned char csi_defaults[] =
2751 { 2763 {
2752 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2764 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2753 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2765 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2754 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2766 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2755 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2767 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2756 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2768 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2757 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2769 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2758 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2770 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2759 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2771 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2760 }; 2772 };
2761/* *INDENT-ON* */
2762 2773
2763void 2774void
2764rxvt_term::process_csi_seq () 2775rxvt_term::process_csi_seq ()
2765{ 2776{
2766 unicode_t ch, priv, i; 2777 unicode_t ch, priv, i;
… …
2844 { 2855 {
2845 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2856 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2846 scr_soft_reset (); 2857 scr_soft_reset ();
2847 2858
2848 static const int pm_h[] = { 7, 25 }; 2859 static const int pm_h[] = { 7, 25 };
2849 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2860 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2850 2861
2851 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2862 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2852 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2863 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2853 } 2864 }
2854 break; 2865 break;
2855 } 2866 }
2856 2867
2857 return; 2868 return;
… …
3076 } 3087 }
3077} 3088}
3078/*}}} */ 3089/*}}} */
3079 3090
3080#if !ENABLE_MINIMAL 3091#if !ENABLE_MINIMAL
3081/* ARGSUSED */
3082void 3092void
3083rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3093rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3084{ 3094{
3085 int x, y; 3095 int x, y;
3086 XWindowAttributes wattr; 3096 XWindowAttributes wattr;
… …
3095 { 3105 {
3096 /* 3106 /*
3097 * commands 3107 * commands
3098 */ 3108 */
3099 case 1: /* deiconify window */ 3109 case 1: /* deiconify window */
3100 XMapWindow (dpy, parent[0]); 3110 XMapWindow (dpy, parent);
3101 break; 3111 break;
3102 case 2: /* iconify window */ 3112 case 2: /* iconify window */
3103 XIconifyWindow (dpy, parent[0], display->screen); 3113 XIconifyWindow (dpy, parent, display->screen);
3104 break; 3114 break;
3105 case 3: /* set position (pixels) */ 3115 case 3: /* set position (pixels) */
3106 XMoveWindow (dpy, parent[0], args[1], args[2]); 3116 XMoveWindow (dpy, parent, args[1], args[2]);
3107 break; 3117 break;
3108 case 4: /* set size (pixels) */ 3118 case 4: /* set size (pixels) */
3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3119 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3110 break; 3120 break;
3111 case 5: /* raise window */ 3121 case 5: /* raise window */
3112 XRaiseWindow (dpy, parent[0]); 3122 XRaiseWindow (dpy, parent);
3113 break; 3123 break;
3114 case 6: /* lower window */ 3124 case 6: /* lower window */
3115 XLowerWindow (dpy, parent[0]); 3125 XLowerWindow (dpy, parent);
3116 break; 3126 break;
3117 case 7: /* refresh window */ 3127 case 7: /* refresh window */
3118 scr_touch (true); 3128 scr_touch (true);
3119 break; 3129 break;
3120 case 8: /* set size (chars) */ 3130 case 8: /* set size (chars) */
… …
3131 3141
3132 /* 3142 /*
3133 * reports - some output format copied from XTerm 3143 * reports - some output format copied from XTerm
3134 */ 3144 */
3135 case 11: /* report window state */ 3145 case 11: /* report window state */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3146 XGetWindowAttributes (dpy, parent, &wattr);
3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3147 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3138 break; 3148 break;
3139 case 13: /* report window position */ 3149 case 13: /* report window position */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3150 XGetWindowAttributes (dpy, parent, &wattr);
3141 XTranslateCoordinates (dpy, parent[0], wattr.root, 3151 XTranslateCoordinates (dpy, parent, wattr.root,
3142 -wattr.border_width, -wattr.border_width, 3152 -wattr.border_width, -wattr.border_width,
3143 &x, &y, &wdummy); 3153 &x, &y, &wdummy);
3144 tt_printf ("\033[3;%d;%dt", x, y); 3154 tt_printf ("\033[3;%d;%dt", x, y);
3145 break; 3155 break;
3146 case 14: /* report window size (pixels) */ 3156 case 14: /* report window size (pixels) */
3147 XGetWindowAttributes (dpy, parent[0], &wattr); 3157 XGetWindowAttributes (dpy, parent, &wattr);
3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3158 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3149 break; 3159 break;
3150 case 18: /* report text area size (chars) */ 3160 case 18: /* report text area size (chars) */
3151 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3161 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3152 break; 3162 break;
… …
3154 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3164 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3155 break; 3165 break;
3156 case 20: /* report icon label */ 3166 case 20: /* report icon label */
3157 { 3167 {
3158 char *s; 3168 char *s;
3159 XGetIconName (dpy, parent[0], &s); 3169 XGetIconName (dpy, parent, &s);
3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3170 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3161 XFree (s); 3171 XFree (s);
3162 } 3172 }
3163 break; 3173 break;
3164 case 21: /* report window title */ 3174 case 21: /* report window title */
3165 { 3175 {
3166 char *s; 3176 char *s;
3167 XFetchName (dpy, parent[0], &s); 3177 XFetchName (dpy, parent, &s);
3168 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 */
3169 XFree (s); 3179 XFree (s);
3170 } 3180 }
3171 break; 3181 break;
3172 } 3182 }
… …
3326 unsigned long bytes_after; 3336 unsigned long bytes_after;
3327 unsigned char *value = 0; 3337 unsigned char *value = 0;
3328 const char *str = ""; 3338 const char *str = "";
3329 3339
3330 if (prop 3340 if (prop
3331 && XGetWindowProperty (dpy, parent[0], 3341 && XGetWindowProperty (dpy, parent,
3332 prop, 0, 1<<16, 0, AnyPropertyType, 3342 prop, 0, 1<<16, 0, AnyPropertyType,
3333 &actual_type, &actual_format, 3343 &actual_type, &actual_format,
3334 &nitems, &bytes_after, &value) == Success 3344 &nitems, &bytes_after, &value) == Success
3335 && actual_type != None 3345 && actual_type != None
3336 && actual_format == 8) 3346 && actual_format == 8)
… …
3348 { 3358 {
3349 *eq = 0; 3359 *eq = 0;
3350 set_utf8_property (display->atom (str), eq + 1); 3360 set_utf8_property (display->atom (str), eq + 1);
3351 } 3361 }
3352 else 3362 else
3353 XDeleteProperty (dpy, parent[0], 3363 XDeleteProperty (dpy, parent,
3354 display->atom (str)); 3364 display->atom (str));
3355 } 3365 }
3356 break; 3366 break;
3357 3367
3358 case XTerm_Color: 3368 case XTerm_Color:
… …
3419 process_color_seq (op, Color_tint, str, resp); 3429 process_color_seq (op, Color_tint, str, resp);
3420 { 3430 {
3421 bool changed = false; 3431 bool changed = false;
3422 3432
3423 if (ISSET_PIXCOLOR (Color_tint)) 3433 if (ISSET_PIXCOLOR (Color_tint))
3424 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3434 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3425 else
3426 changed = bgPixmap.unset_tint ();
3427 3435
3428 if (changed) 3436 if (changed)
3429 update_background (); 3437 update_background ();
3430 } 3438 }
3431 3439
… …
3437 if (!strcmp (str, "?")) 3445 if (!strcmp (str, "?"))
3438 { 3446 {
3439 char str[256]; 3447 char str[256];
3440 3448
3441 sprintf (str, "[%dx%d+%d+%d]", 3449 sprintf (str, "[%dx%d+%d+%d]",
3442 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3450 min (h_scale, 32767), min (v_scale, 32767),
3443 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3451 min (h_align, 32767), min (v_align, 32767));
3444 process_xterm_seq (XTerm_title, str, CHAR_ST); 3452 process_xterm_seq (XTerm_title, str, CHAR_ST);
3445 } 3453 }
3446 else 3454 else
3447 { 3455 {
3448 int changed = 0; 3456 bool changed = false;
3449 3457
3450 if (*str != ';') 3458 if (*str != ';')
3451 { 3459 {
3452 /* reset to default scaling :*/
3453 bgPixmap.unset_geometry ();
3454 if (bgPixmap.set_file (str)) /* change pixmap */ 3460 if (bg_set_file (str)) /* change pixmap */
3455 changed++; 3461 changed = true;
3456 str = strchr (str, ';');
3457 if (str == NULL)
3458 bgPixmap.set_defaultGeometry ();
3459 } 3462 }
3460 3463 else
3461 while (str)
3462 { 3464 {
3463 str++; 3465 str++;
3464 if (bgPixmap.set_geometry (str)) 3466 if (bg_set_geometry (str, true))
3465 changed++; 3467 changed = true;
3466 str = strchr (str, ';');
3467 } 3468 }
3468 3469
3469 if (changed) 3470 if (changed)
3471 {
3472 if (bg_window_position_sensitive ())
3473 {
3474 int x, y;
3475 get_window_origin (x, y);
3476 bg_set_position (x, y);
3477 }
3470 update_background (); 3478 update_background ();
3479 }
3471 } 3480 }
3472 break; 3481 break;
3473#endif 3482#endif
3474 3483
3475 case XTerm_logfile: 3484 case XTerm_logfile:
… …
3579 if (mode == 'r') 3588 if (mode == 'r')
3580 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3589 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3581 else 3590 else
3582 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3591 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3583 3592
3584 set_privmode (bit, state); 3593 if (state)
3594 priv_modes |= bit;
3595 else
3596 priv_modes &= ~bit;
3585 } 3597 }
3586 3598
3587 return state; 3599 return state;
3588} 3600}
3589 3601
3590/* we're not using priv _yet_ */ 3602/* we're not using priv _yet_ */
3591void 3603void
3592rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3604rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3593{ 3605{
3594 unsigned int i, j; 3606 unsigned int i, j;
3595 int state; 3607 int state;
3596 3608
3597 static const struct 3609 static const struct
3598 { 3610 {
3599 const int argval; 3611 const int argval;
3600 const unsigned long bit; 3612 const unsigned long bit;
3601 } argtopriv[] = { 3613 } argtopriv[] = {
3602 { 1, PrivMode_aplCUR }, // DECCKM 3614 { 1, PrivMode_aplCUR }, // DECCKM
3603 { 2, PrivMode_vt52 }, 3615 { 2, PrivMode_vt52 }, // DECANM
3604 { 3, PrivMode_132 }, // DECCOLM 3616 { 3, PrivMode_132 }, // DECCOLM
3605 { 4, PrivMode_smoothScroll }, // DECSCLM 3617 { 4, PrivMode_smoothScroll }, // DECSCLM
3606 { 5, PrivMode_rVideo }, // DECSCNM 3618 { 5, PrivMode_rVideo }, // DECSCNM
3607 { 6, PrivMode_relOrigin }, // DECOM 3619 { 6, PrivMode_relOrigin }, // DECOM
3608 { 7, PrivMode_Autowrap }, // DECAWM 3620 { 7, PrivMode_Autowrap }, // DECAWM
3609 // 8, auto-repeat keys // DECARM 3621 // 8, auto-repeat keys // DECARM
3610 { 9, PrivMode_MouseX10 }, 3622 { 9, PrivMode_MouseX10 },
3611 // 18 end FF to printer after print screen 3623 // 18 end FF to printer after print screen
3612 // 19 Print screen prints full screen/scroll region 3624 // 19 Print screen prints full screen/scroll region
3613 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3625 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3614#ifdef scrollBar_esc 3626#ifdef scrollBar_esc
3615 { scrollBar_esc, PrivMode_scrollBar }, 3627 { scrollBar_esc, PrivMode_scrollBar },
3616#endif 3628#endif
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 3629 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 // 38, tektronix mode // DECTEK 3630 // 38, tektronix mode // DECTEK
3619 { 40, PrivMode_132OK }, 3631 { 40, PrivMode_132OK },
3620 // 41 xterm more fixes NYI 3632 // 41 xterm more fixes NYI
3621 // 45 margin bell NYI 3633 // 45 margin bell NYI
3622 // 46 start logging 3634 // 46 start logging
3623 { 47, PrivMode_Screen }, 3635 { 47, PrivMode_Screen },
3624 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3636 { 66, PrivMode_aplKP }, // DECNKM
3625#ifndef NO_BACKSPACE_KEY 3637#ifndef NO_BACKSPACE_KEY
3626 { 67, PrivMode_BackSpace }, // DECBKM 3638 { 67, PrivMode_BackSpace }, // DECBKM
3627#endif 3639#endif
3628 { 1000, PrivMode_MouseX11 }, 3640 { 1000, PrivMode_MouseX11 },
3629 { 1002, PrivMode_MouseBtnEvent }, 3641 { 1002, PrivMode_MouseBtnEvent },
3630 { 1003, PrivMode_MouseAnyEvent }, 3642 { 1003, PrivMode_MouseAnyEvent },
3643#if ENABLE_FRILLS
3644 { 1005, PrivMode_ExtModeMouse },
3645#endif
3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3646 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3632 { 1011, PrivMode_Keypress }, // rxvt extension 3647 { 1011, PrivMode_Keypress }, // rxvt extension
3648#if ENABLE_FRILLS
3649 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3650#endif
3633 // 1035 enable modifiers for alt, numlock NYI 3651 // 1035 enable modifiers for alt, numlock NYI
3634 // 1036 send ESC for meta keys NYI 3652 // 1036 send ESC for meta keys NYI
3635 // 1037 send DEL for keypad delete NYI 3653 // 1037 send DEL for keypad delete NYI
3636 { 1047, PrivMode_Screen }, 3654 { 1047, PrivMode_Screen },
3637 // 1048 save and restore cursor 3655 // 1048 save and restore cursor, implemented in code
3638 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3656 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3639 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3657 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3640 { 2004, PrivMode_BracketPaste }, 3658 { 2004, PrivMode_BracketPaste },
3641 }; 3659 };
3642 3660
… …
3652 for (i = 0; i < nargs; i++) 3670 for (i = 0; i < nargs; i++)
3653 { 3671 {
3654 state = -1; 3672 state = -1;
3655 3673
3656 /* basic handling */ 3674 /* basic handling */
3657 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3675 for (j = 0; j < ecb_array_length (argtopriv); j++)
3658 if (argtopriv[j].argval == arg[i]) 3676 if (argtopriv[j].argval == arg[i])
3659 { 3677 {
3660 state = privcases (mode, argtopriv[j].bit); 3678 state = privcases (mode, argtopriv[j].bit);
3661 break; 3679 break;
3662 } 3680 }
… …
3688 case 2: /* VT52 mode */ 3706 case 2: /* VT52 mode */
3689 /* oddball mode. should be set regardless of set/reset 3707 /* oddball mode. should be set regardless of set/reset
3690 * parameter. Return from VT52 mode with an ESC < from 3708 * parameter. Return from VT52 mode with an ESC < from
3691 * within VT52 mode 3709 * within VT52 mode
3692 */ 3710 */
3693 set_privmode (PrivMode_vt52, 1); 3711 priv_modes |= PrivMode_vt52;
3694 break; 3712 break;
3695 case 3: /* 80/132 */ 3713 case 3: /* 80/132 */
3696 if (priv_modes & PrivMode_132OK) 3714 if (priv_modes & PrivMode_132OK)
3697 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3715 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3698 break; 3716 break;
… …
3713 if (state) /* orthogonal */ 3731 if (state) /* orthogonal */
3714 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3732 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3715 break; 3733 break;
3716#ifdef scrollBar_esc 3734#ifdef scrollBar_esc
3717 case scrollBar_esc: 3735 case scrollBar_esc:
3718 if (scrollBar.map (state)) 3736 scrollBar.map (state);
3719 {
3720 resize_all_windows (0, 0, 0); 3737 resize_all_windows (0, 0, 0);
3721 scr_touch (true); 3738 scr_touch (true);
3722 }
3723 break; 3739 break;
3724#endif 3740#endif
3725 case 25: /* visible/invisible cursor */ 3741 case 25: /* visible/invisible cursor */
3726 scr_cursor_visible (state); 3742 scr_cursor_visible (state);
3727 break; 3743 break;
… …
3740 case 1003: 3756 case 1003:
3741 if (state) 3757 if (state)
3742 { 3758 {
3743 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3759 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3744 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3760 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3761 mouse_row = mouse_col = 0;
3745 vt_emask_mouse = PointerMotionMask; 3762 vt_emask_mouse = PointerMotionMask;
3746 } 3763 }
3747 else 3764 else
3748 vt_emask_mouse = NoEventMask; 3765 vt_emask_mouse = NoEventMask;
3749 3766
… …
3934 } 3951 }
3935 } 3952 }
3936} 3953}
3937/*}}} */ 3954/*}}} */
3938 3955
3939/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3940void
3941rxvt_term::process_graphics ()
3942{
3943 unicode_t ch, cmd = cmd_getc ();
3944
3945 if (cmd == 'Q')
3946 {
3947 /* query graphics */
3948 tt_printf ("\033G0\012"); /* no graphics */
3949 return;
3950 }
3951 /* swallow other graphics sequences until terminating ':' */
3952 do
3953 ch = cmd_getc ();
3954 while (ch != ':');
3955}
3956/*}}} */
3957
3958/* ------------------------------------------------------------------------- */ 3956/* ------------------------------------------------------------------------- */
3959 3957
3960/* 3958/*
3961 * Send printf () formatted output to the command. 3959 * Send printf () formatted output to the command.
3962 * Only use for small amounts of data. 3960 * Only use for small amounts of data.
… …
3975 3973
3976/* ---------------------------------------------------------------------- */ 3974/* ---------------------------------------------------------------------- */
3977/* Write data to the pty as typed by the user, pasted with the mouse, 3975/* Write data to the pty as typed by the user, pasted with the mouse,
3978 * or generated by us in response to a query ESC sequence. 3976 * or generated by us in response to a query ESC sequence.
3979 */ 3977 */
3980const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3978static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3981 3979
3982void 3980void
3983rxvt_term::tt_write (const char *data, unsigned int len) 3981rxvt_term::tt_write (const char *data, unsigned int len)
3984{ 3982{
3985 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3983 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3990 3988
3991 if (v_buflen == 0) 3989 if (v_buflen == 0)
3992 { 3990 {
3993 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3991 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3994 3992
3993 max_it (written, 0);
3994
3995 if ((unsigned int)written == len) 3995 if (written == len)
3996 return; 3996 return;
3997 3997
3998 data += written; 3998 data += written;
3999 len -= written; 3999 len -= written;
4000 } 4000 }
4001 4001
4002 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4002 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4003 4003
4004 memcpy (v_buffer + v_buflen, data, len); 4004 memcpy (v_buffer + v_buflen, data, len);
4005 v_buflen += len; 4005 v_buflen += len;
4006 4006
4007 pty_ev.set (ev::READ | ev::WRITE); 4007 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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