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.446 by root, Fri Apr 2 19:27:38 2010 UTC vs.
Revision 1.494 by sf-exg, Mon Aug 22 17:23:56 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}
… …
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 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height);*/
1438 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1439 { 1446 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 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
1442 1468
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1470 {
1445 seen_resize = 1; 1471 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1473 }
1448 else 1474 else
1449 { 1475 {
1450#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ())
1452 {
1453 if (mapped) 1477 if (moved)
1454 update_background (); 1478 update_background ();
1455 else
1456 bgPixmap.invalidate ();
1457 }
1458#endif 1479#endif
1459 } 1480 }
1460 1481
1461 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1462 } 1483 }
1463 break; 1484 break;
1464 1485
1465 case PropertyNotify: 1486 case PropertyNotify:
1466 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1487 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1468 && ev.xproperty.state == PropertyNewValue)
1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1470
1471 break; 1488 break;
1472 1489
1473 case SelectionClear: 1490 case SelectionClear:
1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1475 break; 1492 break;
1476 1493
1477 case SelectionNotify:
1478 if (selection_wait == Sel_normal)
1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 break;
1481
1482 case SelectionRequest: 1494 case SelectionRequest:
1483 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1484 break; 1496 break;
1485 1497
1486 case MapNotify: 1498 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP 1499#ifdef HAVE_BG_PIXMAP
1488 /* This is needed spcifically to fix the case of no window manager or a 1500 /* This is needed specifically to fix the case of no window manager or a
1489 * non-reparenting window manager. In those cases we never get first 1501 * non-reparenting window manager. In those cases we never get first
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1491 * care of multiplicity of ConfigureNotify events arriwing while WM does 1503 * care of multiplicity of ConfigureNotify events arriving while WM does
1492 * reparenting. 1504 * reparenting.
1493 * We should not render background immidiately, as there could be several 1505 * We should not render background immediately, as there could be several
1494 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1495 * 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
1496 * bit of time for ConfigureNotifies to arrive. 1508 * bit of time for ConfigureNotifies to arrive.
1497 * 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
1498 * of ConfigureNotifys for the best results. 1510 * of ConfigureNotifys for the best results.
1499 */ 1511 */
1500 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1512 if (!(bg_flags & BG_IS_VALID))
1501 update_background_ev.start (0.025); 1513 update_background_ev.start (0.025);
1502#endif 1514#endif
1503 mapped = 1; 1515 mapped = 1;
1504#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1505 text_blink_ev.start (); 1517 text_blink_ev.start ();
… …
1520 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1521 { 1533 {
1522 do 1534 do
1523 { 1535 {
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1526 } 1538 }
1527 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1528 1540
1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1530 1542
1531 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1532 { 1544 {
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1535 } 1547 }
1536 1548
1537 want_refresh = 1; 1549 want_refresh = 1;
1538 } 1550 }
1539 else 1551 else
… …
1654 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1655 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1656 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1657 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1658 &unused_mask); 1670 &unused_mask);
1659 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1660 scrollBar.size ()); 1672 scrollBar.size ());
1661 want_refresh = 1; 1673 want_refresh = 1;
1662 scrollBar.show (1); 1674 scrollBar.show (1);
1663 } 1675 }
1664 break; 1676 break;
… …
1699rxvt_term::set_urgency (bool enable) 1711rxvt_term::set_urgency (bool enable)
1700{ 1712{
1701 if (enable == urgency_hint) 1713 if (enable == urgency_hint)
1702 return; 1714 return;
1703 1715
1704 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1705 { 1717 {
1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1707 XSetWMHints (dpy, parent[0], h); 1719 XSetWMHints (dpy, parent, h);
1708 urgency_hint = enable; 1720 urgency_hint = enable;
1709 } 1721 }
1710} 1722}
1711#endif 1723#endif
1712 1724
… …
1719 want_refresh = 1; 1731 want_refresh = 1;
1720 1732
1721#if USE_XIM 1733#if USE_XIM
1722 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1723 { 1735 {
1724 IMSetPosition (); 1736 im_set_position ();
1725 XSetICFocus (Input_Context); 1737 XSetICFocus (Input_Context);
1726 } 1738 }
1727#endif 1739#endif
1728#if CURSOR_BLINK 1740#if CURSOR_BLINK
1729 if (option (Opt_cursorBlink)) 1741 if (option (Opt_cursorBlink))
… …
1820 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1821 */ 1833 */
1822 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1823 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1824 { 1836 {
1825 bgPixmap.set_root_pixmap (); 1837 bg_set_root_pixmap ();
1826 update_background (); 1838 update_background ();
1827 } 1839 }
1828 1840
1829 break; 1841 break;
1830 } 1842 }
… …
1869 /* save the xbutton state (for ButtonRelease) */ 1881 /* save the xbutton state (for ButtonRelease) */
1870 MEvent.state = ev.state; 1882 MEvent.state = ev.state;
1871#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1872 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1873 { 1885 {
1874 /* same button, within alloted time */ 1886 /* same button, within allowed time */
1875 MEvent.clicks++; 1887 MEvent.clicks++;
1876 1888
1877 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1878 { 1890 {
1879 /* only report double clicks */ 1891 /* only report double clicks */
… …
2032 csrO = scrollBar.bot - scrollBar.top; 2044 csrO = scrollBar.bot - scrollBar.top;
2033 break; 2045 break;
2034 } 2046 }
2035 2047
2036 if (scrollBar.style == R_SB_XTERM 2048 if (scrollBar.style == R_SB_XTERM
2037 || scrollbar_above_slider (ev.y) 2049 || scrollBar.above_slider (ev.y)
2038 || scrollbar_below_slider (ev.y)) 2050 || scrollBar.below_slider (ev.y))
2039 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2040 2052
2041 scrollBar.state = STATE_MOTION; 2053 scrollBar.state = STATE_MOTION;
2042 break; 2054 break;
2043 2055
2044 case Button1: 2056 case Button1:
… …
2047 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
2048 2060
2049 case Button3: 2061 case Button3:
2050 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != R_SB_XTERM)
2051 { 2063 {
2052 if (scrollbar_above_slider (ev.y)) 2064 if (scrollBar.above_slider (ev.y))
2053# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
2054 scr_page (UP, nrow - 1); 2066 scr_page (UP, nrow - 1);
2055# else 2067# else
2056 scr_page (UP, nrow / 4); 2068 scr_page (UP, nrow / 4);
2057# endif 2069# endif
2058 else if (scrollbar_below_slider (ev.y)) 2070 else if (scrollBar.below_slider (ev.y))
2059# ifdef RXVT_SCROLL_FULL 2071# ifdef RXVT_SCROLL_FULL
2060 scr_page (DN, nrow - 1); 2072 scr_page (DN, nrow - 1);
2061# else 2073# else
2062 scr_page (DN, nrow / 4); 2074 scr_page (DN, nrow / 4);
2063# endif 2075# endif
… …
2066 } 2078 }
2067 else 2079 else
2068 { 2080 {
2069 scr_page ((ev.button == Button1 ? DN : UP), 2081 scr_page ((ev.button == Button1 ? DN : UP),
2070 (nrow 2082 (nrow
2071 * scrollbar_position (ev.y) 2083 * scrollBar.position (ev.y)
2072 / scrollBar.size ())); 2084 / scrollBar.size ()));
2073 } 2085 }
2074 2086
2075 break; 2087 break;
2076 } 2088 }
… …
2150 selection_make (ev.time); 2162 selection_make (ev.time);
2151 break; 2163 break;
2152 2164
2153 case Button2: 2165 case Button2:
2154 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2166 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2156 break; 2168 break;
2157 2169
2158#ifdef MOUSE_WHEEL 2170#ifdef MOUSE_WHEEL
2159 case Button4: 2171 case Button4:
2160 case Button5: 2172 case Button5:
… …
2202 wchar_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2203 char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2204 2216
2205 for (;;) 2217 for (;;)
2206 { 2218 {
2207 if (expect_false (ch == NOCHAR)) 2219 if (ecb_unlikely (ch == NOCHAR))
2208 { 2220 {
2209 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2210 ch = next_char (); 2222 ch = next_char ();
2211 2223
2212 if (ch == NOCHAR) 2224 if (ch == NOCHAR)
2213 break; 2225 break;
2214 } 2226 }
2215 2227
2216 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2228 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2217 { 2229 {
2218 if (expect_false (!seen_input)) 2230 if (ecb_unlikely (!seen_input))
2219 { 2231 {
2220 seen_input = 1; 2232 seen_input = 1;
2221 // many badly-written programs (e.g. jed) contain a race condition: 2233 // many badly-written programs (e.g. jed) contain a race condition:
2222 // they first read the screensize and then install a SIGWINCH handler. 2234 // they first read the screensize and then install a SIGWINCH handler.
2223 // some window managers resize the window early, and these programs 2235 // some window managers resize the window early, and these programs
… …
2236 wchar_t *str = buf; 2248 wchar_t *str = buf;
2237 wchar_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2238 2250
2239 for (;;) 2251 for (;;)
2240 { 2252 {
2241 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2253 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2242 break; 2254 break;
2243 2255
2244 *str++ = ch; 2256 *str++ = ch;
2245 2257
2246 if (expect_false (ch == C0_LF || str >= eol)) 2258 if (ecb_unlikely (ch == C0_LF || str >= eol))
2247 { 2259 {
2248 if (ch == C0_LF) 2260 if (ch == C0_LF)
2249 nlines++; 2261 nlines++;
2250 2262
2251 refresh_count++; 2263 refresh_count++;
… …
2329rxvt_term::next_char () NOTHROW 2341rxvt_term::next_char () NOTHROW
2330{ 2342{
2331 while (cmdbuf_ptr < cmdbuf_endp) 2343 while (cmdbuf_ptr < cmdbuf_endp)
2332 { 2344 {
2333 // assume 7-bit to be ascii ALWAYS 2345 // assume 7-bit to be ascii ALWAYS
2334 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2346 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2335 return *cmdbuf_ptr++; 2347 return *cmdbuf_ptr++;
2336 2348
2337 wchar_t wc; 2349 wchar_t wc;
2338 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2350 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2339 2351
… …
2367 : NOCHAR; 2379 : NOCHAR;
2368} 2380}
2369 2381
2370static class out_of_input out_of_input; 2382static class out_of_input out_of_input;
2371 2383
2372/* rxvt_cmd_getc () - Return next input character */
2373/*
2374 * Return the next input character after first passing any keyboard input
2375 * to the command.
2376 */
2377wchar_t 2384wchar_t
2378rxvt_term::cmd_getc () THROW ((class out_of_input)) 2385rxvt_term::cmd_getc () THROW ((class out_of_input))
2379{ 2386{
2380 wchar_t c = next_char (); 2387 wchar_t c = next_char ();
2381 2388
… …
2474 pclose_printer (fd); 2481 pclose_printer (fd);
2475} 2482}
2476#endif /* PRINTPIPE */ 2483#endif /* PRINTPIPE */
2477/*}}} */ 2484/*}}} */
2478 2485
2479/* *INDENT-OFF* */
2480enum { 2486enum {
2481 C1_40 = 0x40, 2487 C1_40 = 0x40,
2482 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2488 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2483 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2489 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2484 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2490 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2485 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2491 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2486}; 2492};
2487/* *INDENT-ON* */
2488 2493
2489/*{{{ process non-printing single characters */ 2494/*{{{ process non-printing single characters */
2490void 2495void
2491rxvt_term::process_nonprinting (unicode_t ch) 2496rxvt_term::process_nonprinting (unicode_t ch)
2492{ 2497{
… …
2614 return; 2619 return;
2615 } 2620 }
2616 2621
2617 switch (ch) 2622 switch (ch)
2618 { 2623 {
2619 /* case 1: do_tek_mode (); break; */
2620 case '#': 2624 case '#':
2621 if (cmd_getc () == '8') 2625 if (cmd_getc () == '8')
2622 scr_E (); 2626 scr_E ();
2623 break; 2627 break;
2624 case '(': 2628 case '(':
… …
2647#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2648 case '9': 2652 case '9':
2649 scr_forwardindex (); 2653 scr_forwardindex ();
2650 break; 2654 break;
2651#endif 2655#endif
2656 // DECPAM/DECPNM
2652 case '=': 2657 case '=':
2653 case '>': 2658 case '>':
2654 set_privmode (PrivMode_aplKP, ch == '='); 2659 set_privmode (PrivMode_aplKP, ch == '=');
2655 break; 2660 break;
2656 2661
… …
2663 2668
2664 /* 8.3.87: NEXT LINE */ 2669 /* 8.3.87: NEXT LINE */
2665 case C1_NEL: /* ESC E */ 2670 case C1_NEL: /* ESC E */
2666 { 2671 {
2667 wchar_t nlcr[] = { C0_LF, C0_CR }; 2672 wchar_t nlcr[] = { C0_LF, C0_CR };
2668 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2673 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2669 } 2674 }
2670 break; 2675 break;
2671 2676
2672 /* kidnapped escape sequence: Should be 8.3.48 */ 2677 /* kidnapped escape sequence: Should be 8.3.48 */
2673 case C1_ESA: /* ESC G */ 2678 case C1_ESA: /* ESC G */
2674 process_graphics (); 2679 // used by original rxvt for rob nations own graphics mode
2680 if (cmd_getc () == 'Q')
2681 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2675 break; 2682 break;
2676 2683
2677 /* 8.3.63: CHARACTER TABULATION SET */ 2684 /* 8.3.63: CHARACTER TABULATION SET */
2678 case C1_HTS: /* ESC H */ 2685 case C1_HTS: /* ESC H */
2679 scr_set_tab (1); 2686 scr_set_tab (1);
… …
2683 case C1_RI: /* ESC M */ 2690 case C1_RI: /* ESC M */
2684 scr_index (DN); 2691 scr_index (DN);
2685 break; 2692 break;
2686 2693
2687 /* 8.3.142: SINGLE-SHIFT TWO */ 2694 /* 8.3.142: SINGLE-SHIFT TWO */
2688 /*case C1_SS2: scr_single_shift (2); break; */ 2695 /* case C1_SS2: break; */
2689 2696
2690 /* 8.3.143: SINGLE-SHIFT THREE */ 2697 /* 8.3.143: SINGLE-SHIFT THREE */
2691 /*case C1_SS3: scr_single_shift (3); break; */ 2698 /* case C1_SS3: break; */
2692 2699
2693 /* 8.3.27: DEVICE CONTROL STRING */ 2700 /* 8.3.27: DEVICE CONTROL STRING */
2694 case C1_DCS: /* ESC P */ 2701 case C1_DCS: /* ESC P */
2695 process_dcs_seq (); 2702 process_dcs_seq ();
2696 break; 2703 break;
… …
2729 } 2736 }
2730} 2737}
2731/*}}} */ 2738/*}}} */
2732 2739
2733/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2740/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2734/* *INDENT-OFF* */
2735enum { 2741enum {
2736 CSI_ICH = 0x40, 2742 CSI_ICH = 0x40,
2737 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2743 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2738 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2744 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2739 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2745 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2742 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2748 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2743 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2749 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2744 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2750 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2745}; 2751};
2746 2752
2747#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2753#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2748 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2754 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2749 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2755 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2750#define get_byte_array_bit(array, bit) \ 2756#define get_byte_array_bit(array, bit) \
2751 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2757 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2752 2758
2753const unsigned char csi_defaults[] = 2759static const unsigned char csi_defaults[] =
2754 { 2760 {
2755 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2761 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2756 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2762 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2757 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2763 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2758 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2764 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2759 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2765 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2760 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2766 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2761 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2767 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2762 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2768 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2763 }; 2769 };
2764/* *INDENT-ON* */
2765 2770
2766void 2771void
2767rxvt_term::process_csi_seq () 2772rxvt_term::process_csi_seq ()
2768{ 2773{
2769 unicode_t ch, priv, i; 2774 unicode_t ch, priv, i;
… …
2847 { 2852 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2853 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset (); 2854 scr_soft_reset ();
2850 2855
2851 static const int pm_h[] = { 7, 25 }; 2856 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2857 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2853 2858
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2859 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2860 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2856 } 2861 }
2857 break; 2862 break;
2858 } 2863 }
2859 2864
2860 return; 2865 return;
… …
3079 } 3084 }
3080} 3085}
3081/*}}} */ 3086/*}}} */
3082 3087
3083#if !ENABLE_MINIMAL 3088#if !ENABLE_MINIMAL
3084/* ARGSUSED */
3085void 3089void
3086rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3090rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3087{ 3091{
3088 int x, y; 3092 int x, y;
3089 XWindowAttributes wattr; 3093 XWindowAttributes wattr;
… …
3098 { 3102 {
3099 /* 3103 /*
3100 * commands 3104 * commands
3101 */ 3105 */
3102 case 1: /* deiconify window */ 3106 case 1: /* deiconify window */
3103 XMapWindow (dpy, parent[0]); 3107 XMapWindow (dpy, parent);
3104 break; 3108 break;
3105 case 2: /* iconify window */ 3109 case 2: /* iconify window */
3106 XIconifyWindow (dpy, parent[0], display->screen); 3110 XIconifyWindow (dpy, parent, display->screen);
3107 break; 3111 break;
3108 case 3: /* set position (pixels) */ 3112 case 3: /* set position (pixels) */
3109 XMoveWindow (dpy, parent[0], args[1], args[2]); 3113 XMoveWindow (dpy, parent, args[1], args[2]);
3110 break; 3114 break;
3111 case 4: /* set size (pixels) */ 3115 case 4: /* set size (pixels) */
3112 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3116 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3113 break; 3117 break;
3114 case 5: /* raise window */ 3118 case 5: /* raise window */
3115 XRaiseWindow (dpy, parent[0]); 3119 XRaiseWindow (dpy, parent);
3116 break; 3120 break;
3117 case 6: /* lower window */ 3121 case 6: /* lower window */
3118 XLowerWindow (dpy, parent[0]); 3122 XLowerWindow (dpy, parent);
3119 break; 3123 break;
3120 case 7: /* refresh window */ 3124 case 7: /* refresh window */
3121 scr_touch (true); 3125 scr_touch (true);
3122 break; 3126 break;
3123 case 8: /* set size (chars) */ 3127 case 8: /* set size (chars) */
… …
3134 3138
3135 /* 3139 /*
3136 * reports - some output format copied from XTerm 3140 * reports - some output format copied from XTerm
3137 */ 3141 */
3138 case 11: /* report window state */ 3142 case 11: /* report window state */
3139 XGetWindowAttributes (dpy, parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent, &wattr);
3140 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3141 break; 3145 break;
3142 case 13: /* report window position */ 3146 case 13: /* report window position */
3143 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3144 XTranslateCoordinates (dpy, parent[0], wattr.root, 3148 XTranslateCoordinates (dpy, parent, wattr.root,
3145 -wattr.border_width, -wattr.border_width, 3149 -wattr.border_width, -wattr.border_width,
3146 &x, &y, &wdummy); 3150 &x, &y, &wdummy);
3147 tt_printf ("\033[3;%d;%dt", x, y); 3151 tt_printf ("\033[3;%d;%dt", x, y);
3148 break; 3152 break;
3149 case 14: /* report window size (pixels) */ 3153 case 14: /* report window size (pixels) */
3150 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3151 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3152 break; 3156 break;
3153 case 18: /* report text area size (chars) */ 3157 case 18: /* report text area size (chars) */
3154 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3158 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3155 break; 3159 break;
… …
3157 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3161 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3158 break; 3162 break;
3159 case 20: /* report icon label */ 3163 case 20: /* report icon label */
3160 { 3164 {
3161 char *s; 3165 char *s;
3162 XGetIconName (dpy, parent[0], &s); 3166 XGetIconName (dpy, parent, &s);
3163 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3167 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3164 XFree (s); 3168 XFree (s);
3165 } 3169 }
3166 break; 3170 break;
3167 case 21: /* report window title */ 3171 case 21: /* report window title */
3168 { 3172 {
3169 char *s; 3173 char *s;
3170 XFetchName (dpy, parent[0], &s); 3174 XFetchName (dpy, parent, &s);
3171 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3172 XFree (s); 3176 XFree (s);
3173 } 3177 }
3174 break; 3178 break;
3175 } 3179 }
… …
3231 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3232 */ 3236 */
3233void 3237void
3234rxvt_term::process_dcs_seq () 3238rxvt_term::process_dcs_seq ()
3235{ 3239{
3236 char *s;
3237 unicode_t eh;
3238
3239 /* 3240 /*
3240 * Not handled yet 3241 * Not handled yet
3241 */ 3242 */
3243
3244 unicode_t eh;
3242 s = get_to_st (eh); 3245 char *s = get_to_st (eh);
3243 if (s) 3246 if (s)
3244 free (s); 3247 free (s);
3245 3248
3246 return; 3249 return;
3247} 3250}
… …
3251 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3254 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3252 */ 3255 */
3253void 3256void
3254rxvt_term::process_osc_seq () 3257rxvt_term::process_osc_seq ()
3255{ 3258{
3256 unicode_t ch, eh;
3257 int arg; 3259 int arg;
3258 3260
3259 ch = cmd_getc (); 3261 unicode_t ch = cmd_getc ();
3260 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3262 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3261 arg = arg * 10 + (ch - '0'); 3263 arg = arg * 10 + (ch - '0');
3262 3264
3263 if (ch == ';') 3265 if (ch == ';')
3264 { 3266 {
3267 unicode_t eh;
3265 char *s = get_to_st (eh); 3268 char *s = get_to_st (eh);
3266 3269
3267 if (s) 3270 if (s)
3268 { 3271 {
3269 process_xterm_seq (arg, s, eh); 3272 process_xterm_seq (arg, s, eh);
… …
3330 unsigned long bytes_after; 3333 unsigned long bytes_after;
3331 unsigned char *value = 0; 3334 unsigned char *value = 0;
3332 const char *str = ""; 3335 const char *str = "";
3333 3336
3334 if (prop 3337 if (prop
3335 && XGetWindowProperty (dpy, parent[0], 3338 && XGetWindowProperty (dpy, parent,
3336 prop, 0, 1<<16, 0, AnyPropertyType, 3339 prop, 0, 1<<16, 0, AnyPropertyType,
3337 &actual_type, &actual_format, 3340 &actual_type, &actual_format,
3338 &nitems, &bytes_after, &value) == Success 3341 &nitems, &bytes_after, &value) == Success
3339 && actual_type != None 3342 && actual_type != None
3340 && actual_format == 8) 3343 && actual_format == 8)
… …
3352 { 3355 {
3353 *eq = 0; 3356 *eq = 0;
3354 set_utf8_property (display->atom (str), eq + 1); 3357 set_utf8_property (display->atom (str), eq + 1);
3355 } 3358 }
3356 else 3359 else
3357 XDeleteProperty (dpy, parent[0], 3360 XDeleteProperty (dpy, parent,
3358 display->atom (str)); 3361 display->atom (str));
3359 } 3362 }
3360 break; 3363 break;
3361 3364
3362 case XTerm_Color: 3365 case XTerm_Color:
… …
3394 process_color_seq (op, Color_pointer_fg, str, resp); 3397 process_color_seq (op, Color_pointer_fg, str, resp);
3395 break; 3398 break;
3396 case XTerm_Color_pointer_bg: 3399 case XTerm_Color_pointer_bg:
3397 process_color_seq (op, Color_pointer_bg, str, resp); 3400 process_color_seq (op, Color_pointer_bg, str, resp);
3398 break; 3401 break;
3402#ifdef OPTION_HC
3403 case XTerm_Color_HC:
3404 process_color_seq (op, Color_HC, str, resp);
3405 break;
3406 case XTerm_Color_HTC:
3407 process_color_seq (op, Color_HTC, str, resp);
3408 break;
3409#endif
3399#ifndef NO_BOLD_UNDERLINE_REVERSE 3410#ifndef NO_BOLD_UNDERLINE_REVERSE
3400 case XTerm_Color_RV:
3401 process_color_seq (op, Color_RV, str, resp);
3402 break;
3403 case Rxvt_Color_BD:
3404 case URxvt_Color_BD: 3411 case URxvt_Color_BD:
3405 process_color_seq (op, Color_BD, str, resp); 3412 process_color_seq (op, Color_BD, str, resp);
3406 break; 3413 break;
3407 case Rxvt_Color_UL:
3408 case URxvt_Color_UL: 3414 case URxvt_Color_UL:
3409 process_color_seq (op, Color_UL, str, resp); 3415 process_color_seq (op, Color_UL, str, resp);
3410 break; 3416 break;
3411 case URxvt_Color_IT: 3417 case URxvt_Color_IT:
3412 process_color_seq (op, Color_IT, str, resp); 3418 process_color_seq (op, Color_IT, str, resp);
… …
3420 process_color_seq (op, Color_tint, str, resp); 3426 process_color_seq (op, Color_tint, str, resp);
3421 { 3427 {
3422 bool changed = false; 3428 bool changed = false;
3423 3429
3424 if (ISSET_PIXCOLOR (Color_tint)) 3430 if (ISSET_PIXCOLOR (Color_tint))
3425 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3431 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3426 else
3427 changed = bgPixmap.unset_tint ();
3428 3432
3429 if (changed) 3433 if (changed)
3430 update_background (); 3434 update_background ();
3431 } 3435 }
3432 3436
… …
3438 if (!strcmp (str, "?")) 3442 if (!strcmp (str, "?"))
3439 { 3443 {
3440 char str[256]; 3444 char str[256];
3441 3445
3442 sprintf (str, "[%dx%d+%d+%d]", 3446 sprintf (str, "[%dx%d+%d+%d]",
3443 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3447 min (h_scale, 32767), min (v_scale, 32767),
3444 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3448 min (h_align, 32767), min (v_align, 32767));
3445 process_xterm_seq (XTerm_title, str, CHAR_ST); 3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3446 } 3450 }
3447 else 3451 else
3448 { 3452 {
3449 int changed = 0; 3453 bool changed = false;
3450 3454
3451 if (*str != ';') 3455 if (*str != ';')
3452 { 3456 {
3453 /* reset to default scaling :*/
3454 bgPixmap.unset_geometry ();
3455 if (bgPixmap.set_file (str)) /* change pixmap */ 3457 if (bg_set_file (str)) /* change pixmap */
3456 changed++; 3458 changed = true;
3457 str = strchr (str, ';');
3458 if (str == NULL)
3459 bgPixmap.set_defaultGeometry ();
3460 } 3459 }
3461 3460 else
3462 while (str)
3463 { 3461 {
3464 str++; 3462 str++;
3465 if (bgPixmap.set_geometry (str)) 3463 if (bg_set_geometry (str, true))
3466 changed++; 3464 changed = true;
3467 str = strchr (str, ';');
3468 } 3465 }
3469 3466
3470 if (changed) 3467 if (changed)
3468 {
3469 if (bg_window_position_sensitive ())
3470 {
3471 int x, y;
3472 get_window_origin (x, y);
3473 bg_set_position (x, y);
3474 }
3471 update_background (); 3475 update_background ();
3476 }
3472 } 3477 }
3473 break; 3478 break;
3474#endif 3479#endif
3475 3480
3476 case XTerm_logfile: 3481 case XTerm_logfile:
… …
3579 { 3584 {
3580 if (mode == 'r') 3585 if (mode == 'r')
3581 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3586 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3582 else 3587 else
3583 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3588 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3589
3584 set_privmode (bit, state); 3590 set_privmode (bit, state);
3585 } 3591 }
3586 3592
3587 return state; 3593 return state;
3588} 3594}
3589 3595
3590/* we're not using priv _yet_ */ 3596/* we're not using priv _yet_ */
3591void 3597void
3592rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3598rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3593{ 3599{
3594 unsigned int i, j; 3600 unsigned int i, j;
3595 int state; 3601 int state;
3596 3602
3597 static const struct 3603 static const struct
3598 { 3604 {
3599 const int argval; 3605 const int argval;
3600 const unsigned long bit; 3606 const unsigned long bit;
3601 } argtopriv[] = { 3607 } argtopriv[] = {
3602 { 1, PrivMode_aplCUR }, // DECCKM 3608 { 1, PrivMode_aplCUR }, // DECCKM
3603 { 2, PrivMode_vt52 }, 3609 { 2, PrivMode_vt52 }, // DECANM
3604 { 3, PrivMode_132 }, // DECCOLM 3610 { 3, PrivMode_132 }, // DECCOLM
3605 { 4, PrivMode_smoothScroll }, // DECSCLM 3611 { 4, PrivMode_smoothScroll }, // DECSCLM
3606 { 5, PrivMode_rVideo }, // DECSCNM 3612 { 5, PrivMode_rVideo }, // DECSCNM
3607 { 6, PrivMode_relOrigin }, // DECOM 3613 { 6, PrivMode_relOrigin }, // DECOM
3608 { 7, PrivMode_Autowrap }, // DECAWM 3614 { 7, PrivMode_Autowrap }, // DECAWM
3609 // 8, auto-repeat keys // DECARM 3615 // 8, auto-repeat keys // DECARM
3610 { 9, PrivMode_MouseX10 }, 3616 { 9, PrivMode_MouseX10 },
3611 // 18 end FF to printer after print screen 3617 // 18 end FF to printer after print screen
3612 // 19 Print screen prints full screen/scorll region 3618 // 19 Print screen prints full screen/scroll region
3613 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3619 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3614#ifdef scrollBar_esc 3620#ifdef scrollBar_esc
3615 { scrollBar_esc, PrivMode_scrollBar }, 3621 { scrollBar_esc, PrivMode_scrollBar },
3616#endif 3622#endif
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 3623 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 // 38, tektronix mode // DECTEK 3624 // 38, tektronix mode // DECTEK
3619 { 40, PrivMode_132OK }, 3625 { 40, PrivMode_132OK },
3620 // 41 xterm more fixes NYI 3626 // 41 xterm more fixes NYI
3621 // 45 margin bell NYI 3627 // 45 margin bell NYI
3622 // 46 start logging 3628 // 46 start logging
3623 { 47, PrivMode_Screen }, 3629 { 47, PrivMode_Screen },
3624 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3630 { 66, PrivMode_aplKP }, // DECNKM
3625#ifndef NO_BACKSPACE_KEY 3631#ifndef NO_BACKSPACE_KEY
3626 { 67, PrivMode_BackSpace }, // DECBKM 3632 { 67, PrivMode_BackSpace }, // DECBKM
3627#endif 3633#endif
3628 { 1000, PrivMode_MouseX11 }, 3634 { 1000, PrivMode_MouseX11 },
3629 { 1002, PrivMode_MouseBtnEvent }, 3635 { 1002, PrivMode_MouseBtnEvent },
3630 { 1003, PrivMode_MouseAnyEvent }, 3636 { 1003, PrivMode_MouseAnyEvent },
3637#if ENABLE_FRILLS
3638 { 1005, PrivMode_ExtModeMouse },
3639#endif
3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3632 { 1011, PrivMode_Keypress }, // rxvt extension 3641 { 1011, PrivMode_Keypress }, // rxvt extension
3642#if ENABLE_FRILLS
3643 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3644#endif
3633 // 1035 enable modifiers for alt, numlock NYI 3645 // 1035 enable modifiers for alt, numlock NYI
3634 // 1036 send ESC for meta keys NYI 3646 // 1036 send ESC for meta keys NYI
3635 // 1037 send DEL for keypad delete NYI 3647 // 1037 send DEL for keypad delete NYI
3636 { 1047, PrivMode_Screen }, 3648 { 1047, PrivMode_Screen },
3637 // 1048 save and restore cursor 3649 // 1048 save and restore cursor, implemented in code
3638 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3650 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3639 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3651 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3640 { 2004, PrivMode_BracketPaste }, 3652 { 2004, PrivMode_BracketPaste },
3641 }; 3653 };
3642 3654
… …
3652 for (i = 0; i < nargs; i++) 3664 for (i = 0; i < nargs; i++)
3653 { 3665 {
3654 state = -1; 3666 state = -1;
3655 3667
3656 /* basic handling */ 3668 /* basic handling */
3657 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3669 for (j = 0; j < ecb_array_length (argtopriv); j++)
3658 if (argtopriv[j].argval == arg[i]) 3670 if (argtopriv[j].argval == arg[i])
3659 { 3671 {
3660 state = privcases (mode, argtopriv[j].bit); 3672 state = privcases (mode, argtopriv[j].bit);
3661 break; 3673 break;
3662 } 3674 }
… …
3740 case 1003: 3752 case 1003:
3741 if (state) 3753 if (state)
3742 { 3754 {
3743 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3755 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3744 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3756 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3757 mouse_row = mouse_col = 0;
3745 vt_emask_mouse = PointerMotionMask; 3758 vt_emask_mouse = PointerMotionMask;
3746 } 3759 }
3747 else 3760 else
3748 vt_emask_mouse = NoEventMask; 3761 vt_emask_mouse = NoEventMask;
3749 3762
… …
3934 } 3947 }
3935 } 3948 }
3936} 3949}
3937/*}}} */ 3950/*}}} */
3938 3951
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/* ------------------------------------------------------------------------- */ 3952/* ------------------------------------------------------------------------- */
3959 3953
3960/* 3954/*
3961 * Send printf () formatted output to the command. 3955 * Send printf () formatted output to the command.
3962 * Only use for small amounts of data. 3956 * Only use for small amounts of data.
… …
3975 3969
3976/* ---------------------------------------------------------------------- */ 3970/* ---------------------------------------------------------------------- */
3977/* Write data to the pty as typed by the user, pasted with the mouse, 3971/* 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. 3972 * or generated by us in response to a query ESC sequence.
3979 */ 3973 */
3980const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3974static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3981 3975
3982void 3976void
3983rxvt_term::tt_write (const char *data, unsigned int len) 3977rxvt_term::tt_write (const char *data, unsigned int len)
3984{ 3978{
3985 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3979 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3990 3984
3991 if (v_buflen == 0) 3985 if (v_buflen == 0)
3992 { 3986 {
3993 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3987 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3994 3988
3989 max_it (written, 0);
3990
3995 if ((unsigned int)written == len) 3991 if (written == len)
3996 return; 3992 return;
3997 3993
3998 data += written; 3994 data += written;
3999 len -= written; 3995 len -= written;
4000 } 3996 }
4001 3997
4002 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3998 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4003 3999
4004 memcpy (v_buffer + v_buflen, data, len); 4000 memcpy (v_buffer + v_buflen, data, len);
4005 v_buflen += len; 4001 v_buflen += len;
4006 4002
4007 pty_ev.set (ev::READ | ev::WRITE); 4003 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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