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.460 by sf-exg, Fri Nov 19 23:29:30 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.flags & bgPixmap_t::hasChanged) 942 if (bg_flags & BG_NEEDS_REFRESH)
981 { 943 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 944 bg_flags &= ~BG_NEEDS_REFRESH;
983// scr_clear (true); This needs to be researched further!
984 scr_touch (false); 945 scr_touch (false);
985 } 946 }
986#endif 947#endif
987 948
988 if (want_refresh) 949 if (want_refresh)
… …
1026 } 987 }
1027 988
1028 scr_refresh (); 989 scr_refresh ();
1029 scrollBar.show (1); 990 scrollBar.show (1);
1030#ifdef USE_XIM 991#ifdef USE_XIM
1031 IMSendSpot (); 992 im_send_spot ();
1032#endif 993#endif
1033 } 994 }
1034 995
1035 display->flush (); 996 display->flush ();
1036} 997}
… …
1081 1042
1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1083void 1044void
1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1085{ 1046{
1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1047 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1088 { 1049 {
1089 want_refresh = 1; 1050 want_refresh = 1;
1090 refresh_check (); 1051 refresh_check ();
1091 } 1052 }
1092 else 1053 else
… …
1153 { 1114 {
1154 } 1115 }
1155} event_handler; 1116} event_handler;
1156#endif 1117#endif
1157 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
1158bool 1152bool
1159rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1160{ 1154{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1162 1156
1163 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1158
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1166 n = 0;
1167 } 1160 {
1168 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1172 1166
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1168
1175 if (r > 0) 1169 if (r > 0)
1176 { 1170 {
1177 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1178 return true; 1172 return true;
… …
1252{ 1246{
1253 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1254 int x, y; 1248 int x, y;
1255 int code = 32; 1249 int code = 32;
1256 1250
1257 x = Pixel2Col (ev.x); 1251 x = Pixel2Col (ev.x) + 1;
1258 y = Pixel2Row (ev.y); 1252 y = Pixel2Row (ev.y) + 1;
1253
1259 if (ev.type == MotionNotify) 1254 if (ev.type == MotionNotify)
1260 { 1255 {
1261 if (x == mouse_row && y == mouse_col) 1256 if (x == mouse_row && y == mouse_col)
1262 return; 1257 return;
1258
1263 mouse_row = x; 1259 mouse_row = x;
1264 mouse_col = y; 1260 mouse_col = y;
1265 code += 32; 1261 code += 32;
1266 } 1262 }
1267 1263
… …
1270 else 1266 else
1271 { 1267 {
1272 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1273 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1274 if (button_number >= 3) 1270 if (button_number >= 3)
1275 button_number += (64 - 3); 1271 button_number += 64 - 3;
1276 } 1272 }
1277 1273
1278 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1279 { 1275 {
1280 /* 1276 /*
… …
1312 fputc ('A', stderr); 1308 fputc ('A', stderr);
1313 if (key_state & 32) 1309 if (key_state & 32)
1314 fputc ('2', stderr); 1310 fputc ('2', stderr);
1315 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1316 button_number, 1312 button_number,
1317 x + 1, 1313 x,
1318 y + 1); 1314 y);
1319#endif 1315#endif
1320 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
1321 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1322 (code + button_number + key_state), 1331 code + button_number + key_state,
1323 (32 + x + 1), 1332 32 + x,
1324 (32 + y + 1)); 1333 32 + y);
1325} 1334}
1326 1335
1327/*{{{ process an X event */ 1336/*{{{ process an X event */
1328void 1337void
1329rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1431 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1432 focus_out (); 1441 focus_out ();
1433 break; 1442 break;
1434 1443
1435 case ConfigureNotify: 1444 case ConfigureNotify:
1436 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1437 { 1446 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1448 ;
1440 1449
1441#ifdef HAVE_BG_PIXMAP 1450#ifdef HAVE_BG_PIXMAP
1442 bool moved = false; 1451 bool moved = false;
1443 if (bgPixmap.window_position_sensitive ()) 1452 if (bg_window_position_sensitive ())
1444 { 1453 {
1445 int x, y; 1454 int x, y;
1446 if (ev.xconfigure.send_event) 1455 if (ev.xconfigure.send_event)
1447 { 1456 {
1448 x = ev.xconfigure.x; 1457 x = ev.xconfigure.x;
1449 y = ev.xconfigure.y; 1458 y = ev.xconfigure.y;
1450 } 1459 }
1451 else 1460 else
1452 get_window_origin (x, y); 1461 get_window_origin (x, y);
1453 1462
1454 if (bgPixmap.set_position (x, y) 1463 if (bg_set_position (x, y)
1455 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1464 || !(bg_flags & BG_IS_VALID))
1456 moved = true; 1465 moved = true;
1457 } 1466 }
1458#endif 1467#endif
1459 1468
1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
… …
1464 } 1473 }
1465 else 1474 else
1466 { 1475 {
1467#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1468 if (moved) 1477 if (moved)
1469 {
1470 if (mapped)
1471 update_background (); 1478 update_background ();
1472 else
1473 bgPixmap.invalidate ();
1474 }
1475#endif 1479#endif
1476 } 1480 }
1477 1481
1478 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1479 } 1483 }
1480 break; 1484 break;
1481 1485
1482 case PropertyNotify: 1486 case PropertyNotify:
1483 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1487 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1485 && ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487
1488 break; 1488 break;
1489 1489
1490 case SelectionClear: 1490 case SelectionClear:
1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1492 break;
1493
1494 case SelectionNotify:
1495 if (selection_wait == Sel_normal)
1496 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1497 break; 1492 break;
1498 1493
1499 case SelectionRequest: 1494 case SelectionRequest:
1500 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1501 break; 1496 break;
… …
1512 * 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
1513 * bit of time for ConfigureNotifies to arrive. 1508 * bit of time for ConfigureNotifies to arrive.
1514 * 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
1515 * of ConfigureNotifys for the best results. 1510 * of ConfigureNotifys for the best results.
1516 */ 1511 */
1517 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1512 if (!(bg_flags & BG_IS_VALID))
1518 update_background_ev.start (0.025); 1513 update_background_ev.start (0.025);
1519#endif 1514#endif
1520 mapped = 1; 1515 mapped = 1;
1521#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1522 text_blink_ev.start (); 1517 text_blink_ev.start ();
… …
1537 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1538 { 1533 {
1539 do 1534 do
1540 { 1535 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1543 } 1538 }
1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1545 1540
1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1547 1542
1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1549 { 1544 {
1550 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1551 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1552 } 1547 }
1553 1548
1554 want_refresh = 1; 1549 want_refresh = 1;
1555 } 1550 }
1556 else 1551 else
… …
1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1558 ;
1564 1559
1565 if (scrollBar.state && ev.xany.window == scrollBar.win) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1561 {
1567 scrollBar.state = STATE_IDLE; 1562 scrollBar.state = SB_STATE_IDLE;
1568 scrollBar.show (0); 1563 scrollBar.show (0);
1569 } 1564 }
1570 } 1565 }
1571 break; 1566 break;
1572 1567
… …
1660#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1661 } 1656 }
1662#endif 1657#endif
1663 } 1658 }
1664 } 1659 }
1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1660 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1661 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1669 ; 1664 ;
1670 1665
1671 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1672 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1670 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677 scrollBar.size ()); 1672 scrollBar.size ());
1678 want_refresh = 1; 1673 want_refresh = 1;
1679 scrollBar.show (1); 1674 scrollBar.show (1);
1680 } 1675 }
1681 break; 1676 break;
… …
1716rxvt_term::set_urgency (bool enable) 1711rxvt_term::set_urgency (bool enable)
1717{ 1712{
1718 if (enable == urgency_hint) 1713 if (enable == urgency_hint)
1719 return; 1714 return;
1720 1715
1721 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 { 1717 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent[0], h); 1719 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable; 1720 urgency_hint = enable;
1721 XFree (h);
1726 } 1722 }
1727} 1723}
1728#endif 1724#endif
1729 1725
1730void 1726void
… …
1736 want_refresh = 1; 1732 want_refresh = 1;
1737 1733
1738#if USE_XIM 1734#if USE_XIM
1739 if (Input_Context != NULL) 1735 if (Input_Context != NULL)
1740 { 1736 {
1741 IMSetPosition (); 1737 im_set_position ();
1742 XSetICFocus (Input_Context); 1738 XSetICFocus (Input_Context);
1743 } 1739 }
1744#endif 1740#endif
1745#if CURSOR_BLINK 1741#if CURSOR_BLINK
1746 if (option (Opt_cursorBlink)) 1742 if (option (Opt_cursorBlink))
… …
1837 * 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.
1838 */ 1834 */
1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1835 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1836 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 { 1837 {
1842 bgPixmap.set_root_pixmap (); 1838 bg_set_root_pixmap ();
1843 update_background (); 1839 update_background ();
1844 } 1840 }
1845 1841
1846 break; 1842 break;
1847 } 1843 }
… …
1977 if (scrollBar.upButton (ev.y)) 1973 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */ 1974 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y)) 1975 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */ 1976 direction = DN; /* down */
1981 1977
1982 scrollBar.state = STATE_IDLE; 1978 scrollBar.state = SB_STATE_IDLE;
1983 /* 1979 /*
1984 * Rxvt-style scrollbar: 1980 * Rxvt-style scrollbar:
1985 * move up if mouse is above slider 1981 * move up if mouse is above slider
1986 * move dn if mouse is below slider 1982 * move dn if mouse is below slider
1987 * 1983 *
… …
2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2022 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027#endif 2023#endif
2028 if (scr_page (direction, 1)) 2024 if (scr_page (direction, 1))
2029 { 2025 {
2030 if (direction == UP) 2026 if (direction == UP)
2031 scrollBar.state = STATE_UP; 2027 scrollBar.state = SB_STATE_UP;
2032 else 2028 else
2033 scrollBar.state = STATE_DOWN; 2029 scrollBar.state = SB_STATE_DOWN;
2034 } 2030 }
2035 } 2031 }
2036 else 2032 else
2037 switch (ev.button) 2033 switch (ev.button)
2038 { 2034 {
2039 case Button2: 2035 case Button2:
2040 switch (scrollBar.align) 2036 switch (scrollBar.align)
2041 { 2037 {
2042 case R_SB_ALIGN_TOP: 2038 case SB_ALIGN_TOP:
2043 csrO = 0; 2039 csrO = 0;
2044 break; 2040 break;
2045 case R_SB_ALIGN_CENTRE: 2041 case SB_ALIGN_CENTRE:
2046 csrO = (scrollBar.bot - scrollBar.top) / 2; 2042 csrO = (scrollBar.bot - scrollBar.top) / 2;
2047 break; 2043 break;
2048 case R_SB_ALIGN_BOTTOM: 2044 case SB_ALIGN_BOTTOM:
2049 csrO = scrollBar.bot - scrollBar.top; 2045 csrO = scrollBar.bot - scrollBar.top;
2050 break; 2046 break;
2051 } 2047 }
2052 2048
2053 if (scrollBar.style == R_SB_XTERM 2049 if (scrollBar.style == SB_STYLE_XTERM
2054 || scrollbar_above_slider (ev.y) 2050 || scrollBar.above_slider (ev.y)
2055 || scrollbar_below_slider (ev.y)) 2051 || scrollBar.below_slider (ev.y))
2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2052 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057 2053
2058 scrollBar.state = STATE_MOTION; 2054 scrollBar.state = SB_STATE_MOTION;
2059 break; 2055 break;
2060 2056
2061 case Button1: 2057 case Button1:
2062 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2058 if (scrollBar.align == SB_ALIGN_CENTRE)
2063 csrO = ev.y - scrollBar.top; 2059 csrO = ev.y - scrollBar.top;
2064 /* FALLTHROUGH */ 2060 /* FALLTHROUGH */
2065 2061
2066 case Button3: 2062 case Button3:
2067 if (scrollBar.style != R_SB_XTERM) 2063 if (scrollBar.style != SB_STYLE_XTERM)
2068 { 2064 {
2069 if (scrollbar_above_slider (ev.y)) 2065 if (scrollBar.above_slider (ev.y))
2070# ifdef RXVT_SCROLL_FULL 2066# ifdef RXVT_SCROLL_FULL
2071 scr_page (UP, nrow - 1); 2067 scr_page (UP, nrow - 1);
2072# else 2068# else
2073 scr_page (UP, nrow / 4); 2069 scr_page (UP, nrow / 4);
2074# endif 2070# endif
2075 else if (scrollbar_below_slider (ev.y)) 2071 else if (scrollBar.below_slider (ev.y))
2076# ifdef RXVT_SCROLL_FULL 2072# ifdef RXVT_SCROLL_FULL
2077 scr_page (DN, nrow - 1); 2073 scr_page (DN, nrow - 1);
2078# else 2074# else
2079 scr_page (DN, nrow / 4); 2075 scr_page (DN, nrow / 4);
2080# endif 2076# endif
2081 else 2077 else
2082 scrollBar.state = STATE_MOTION; 2078 scrollBar.state = SB_STATE_MOTION;
2083 } 2079 }
2084 else 2080 else
2085 { 2081 {
2086 scr_page ((ev.button == Button1 ? DN : UP), 2082 scr_page ((ev.button == Button1 ? DN : UP),
2087 (nrow 2083 (nrow
2088 * scrollbar_position (ev.y) 2084 * scrollBar.position (ev.y)
2089 / scrollBar.size ())); 2085 / scrollBar.size ()));
2090 } 2086 }
2091 2087
2092 break; 2088 break;
2093 } 2089 }
… …
2104 2100
2105 csrO = 0; /* reset csr Offset */ 2101 csrO = 0; /* reset csr Offset */
2106 if (!bypass_keystate) 2102 if (!bypass_keystate)
2107 reportmode = !! (priv_modes & PrivMode_mouse_report); 2103 reportmode = !! (priv_modes & PrivMode_mouse_report);
2108 2104
2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2105 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2110 { 2106 {
2111 scrollBar.state = STATE_IDLE; 2107 scrollBar.state = SB_STATE_IDLE;
2112 scrollBar.show (0); 2108 scrollBar.show (0);
2113 } 2109 }
2114 2110
2115#ifdef SELECTION_SCROLLING 2111#ifdef SELECTION_SCROLLING
2116 sel_scroll_ev.stop(); 2112 sel_scroll_ev.stop();
… …
2219 wchar_t ch = NOCHAR; 2215 wchar_t ch = NOCHAR;
2220 char *seq_begin; // remember start of esc-sequence here 2216 char *seq_begin; // remember start of esc-sequence here
2221 2217
2222 for (;;) 2218 for (;;)
2223 { 2219 {
2224 if (expect_false (ch == NOCHAR)) 2220 if (ecb_unlikely (ch == NOCHAR))
2225 { 2221 {
2226 seq_begin = cmdbuf_ptr; 2222 seq_begin = cmdbuf_ptr;
2227 ch = next_char (); 2223 ch = next_char ();
2228 2224
2229 if (ch == NOCHAR) 2225 if (ch == NOCHAR)
2230 break; 2226 break;
2231 } 2227 }
2232 2228
2233 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))
2234 { 2230 {
2235 if (expect_false (!seen_input)) 2231 if (ecb_unlikely (!seen_input))
2236 { 2232 {
2237 seen_input = 1; 2233 seen_input = 1;
2238 // many badly-written programs (e.g. jed) contain a race condition: 2234 // many badly-written programs (e.g. jed) contain a race condition:
2239 // they first read the screensize and then install a SIGWINCH handler. 2235 // they first read the screensize and then install a SIGWINCH handler.
2240 // some window managers resize the window early, and these programs 2236 // some window managers resize the window early, and these programs
… …
2253 wchar_t *str = buf; 2249 wchar_t *str = buf;
2254 wchar_t *eol = str + min (ncol, UBUFSIZ); 2250 wchar_t *eol = str + min (ncol, UBUFSIZ);
2255 2251
2256 for (;;) 2252 for (;;)
2257 { 2253 {
2258 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)))
2259 break; 2255 break;
2260 2256
2261 *str++ = ch; 2257 *str++ = ch;
2262 2258
2263 if (expect_false (ch == C0_LF || str >= eol)) 2259 if (ecb_unlikely (ch == C0_LF || str >= eol))
2264 { 2260 {
2265 if (ch == C0_LF) 2261 if (ch == C0_LF)
2266 nlines++; 2262 nlines++;
2267 2263
2268 refresh_count++; 2264 refresh_count++;
… …
2346rxvt_term::next_char () NOTHROW 2342rxvt_term::next_char () NOTHROW
2347{ 2343{
2348 while (cmdbuf_ptr < cmdbuf_endp) 2344 while (cmdbuf_ptr < cmdbuf_endp)
2349 { 2345 {
2350 // assume 7-bit to be ascii ALWAYS 2346 // assume 7-bit to be ascii ALWAYS
2351 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2347 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2352 return *cmdbuf_ptr++; 2348 return *cmdbuf_ptr++;
2353 2349
2354 wchar_t wc; 2350 wchar_t wc;
2355 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);
2356 2352
… …
2384 : NOCHAR; 2380 : NOCHAR;
2385} 2381}
2386 2382
2387static class out_of_input out_of_input; 2383static class out_of_input out_of_input;
2388 2384
2389/* rxvt_cmd_getc () - Return next input character */
2390/*
2391 * Return the next input character after first passing any keyboard input
2392 * to the command.
2393 */
2394wchar_t 2385wchar_t
2395rxvt_term::cmd_getc () THROW ((class out_of_input)) 2386rxvt_term::cmd_getc () THROW ((class out_of_input))
2396{ 2387{
2397 wchar_t c = next_char (); 2388 wchar_t c = next_char ();
2398 2389
… …
2491 pclose_printer (fd); 2482 pclose_printer (fd);
2492} 2483}
2493#endif /* PRINTPIPE */ 2484#endif /* PRINTPIPE */
2494/*}}} */ 2485/*}}} */
2495 2486
2496/* *INDENT-OFF* */
2497enum { 2487enum {
2498 C1_40 = 0x40, 2488 C1_40 = 0x40,
2499 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,
2500 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,
2501 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,
2502 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,
2503}; 2493};
2504/* *INDENT-ON* */
2505 2494
2506/*{{{ process non-printing single characters */ 2495/*{{{ process non-printing single characters */
2507void 2496void
2508rxvt_term::process_nonprinting (unicode_t ch) 2497rxvt_term::process_nonprinting (unicode_t ch)
2509{ 2498{
… …
2602 break; 2591 break;
2603 case 'Z': /* identify the terminal type */ 2592 case 'Z': /* identify the terminal type */
2604 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2593 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2605 break; 2594 break;
2606 case '<': /* turn off VT52 mode */ 2595 case '<': /* turn off VT52 mode */
2607 set_privmode (PrivMode_vt52, 0); 2596 priv_modes &= ~PrivMode_vt52;
2608 break; 2597 break;
2609 case 'F': /* use special graphics character set */ 2598 case 'F': /* use special graphics character set */
2610 case 'G': /* use regular character set */ 2599 case 'G': /* use regular character set */
2611 /* unimplemented */ 2600 /* unimplemented */
2612 break; 2601 break;
… …
2631 return; 2620 return;
2632 } 2621 }
2633 2622
2634 switch (ch) 2623 switch (ch)
2635 { 2624 {
2636 /* case 1: do_tek_mode (); break; */
2637 case '#': 2625 case '#':
2638 if (cmd_getc () == '8') 2626 if (cmd_getc () == '8')
2639 scr_E (); 2627 scr_E ();
2640 break; 2628 break;
2641 case '(': 2629 case '(':
… …
2664#if !ENABLE_MINIMAL 2652#if !ENABLE_MINIMAL
2665 case '9': 2653 case '9':
2666 scr_forwardindex (); 2654 scr_forwardindex ();
2667 break; 2655 break;
2668#endif 2656#endif
2657 // DECPAM/DECPNM
2669 case '=': 2658 case '=':
2659 priv_modes |= PrivMode_aplKP;
2660 break;
2670 case '>': 2661 case '>':
2671 set_privmode (PrivMode_aplKP, ch == '='); 2662 priv_modes &= ~PrivMode_aplKP;
2672 break; 2663 break;
2673 2664
2674 case C1_40: 2665 case C1_40:
2675 cmd_getc (); 2666 cmd_getc ();
2676 break; 2667 break;
… …
2680 2671
2681 /* 8.3.87: NEXT LINE */ 2672 /* 8.3.87: NEXT LINE */
2682 case C1_NEL: /* ESC E */ 2673 case C1_NEL: /* ESC E */
2683 { 2674 {
2684 wchar_t nlcr[] = { C0_LF, C0_CR }; 2675 wchar_t nlcr[] = { C0_LF, C0_CR };
2685 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2676 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2686 } 2677 }
2687 break; 2678 break;
2688 2679
2689 /* kidnapped escape sequence: Should be 8.3.48 */ 2680 /* kidnapped escape sequence: Should be 8.3.48 */
2690 case C1_ESA: /* ESC G */ 2681 case C1_ESA: /* ESC G */
2691 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 */
2692 break; 2685 break;
2693 2686
2694 /* 8.3.63: CHARACTER TABULATION SET */ 2687 /* 8.3.63: CHARACTER TABULATION SET */
2695 case C1_HTS: /* ESC H */ 2688 case C1_HTS: /* ESC H */
2696 scr_set_tab (1); 2689 scr_set_tab (1);
… …
2700 case C1_RI: /* ESC M */ 2693 case C1_RI: /* ESC M */
2701 scr_index (DN); 2694 scr_index (DN);
2702 break; 2695 break;
2703 2696
2704 /* 8.3.142: SINGLE-SHIFT TWO */ 2697 /* 8.3.142: SINGLE-SHIFT TWO */
2705 /*case C1_SS2: scr_single_shift (2); break; */ 2698 /* case C1_SS2: break; */
2706 2699
2707 /* 8.3.143: SINGLE-SHIFT THREE */ 2700 /* 8.3.143: SINGLE-SHIFT THREE */
2708 /*case C1_SS3: scr_single_shift (3); break; */ 2701 /* case C1_SS3: break; */
2709 2702
2710 /* 8.3.27: DEVICE CONTROL STRING */ 2703 /* 8.3.27: DEVICE CONTROL STRING */
2711 case C1_DCS: /* ESC P */ 2704 case C1_DCS: /* ESC P */
2712 process_dcs_seq (); 2705 process_dcs_seq ();
2713 break; 2706 break;
… …
2746 } 2739 }
2747} 2740}
2748/*}}} */ 2741/*}}} */
2749 2742
2750/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2743/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2751/* *INDENT-OFF* */
2752enum { 2744enum {
2753 CSI_ICH = 0x40, 2745 CSI_ICH = 0x40,
2754 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,
2755 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 ,
2756 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,
… …
2759 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,
2760 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 ,
2761 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
2762}; 2754};
2763 2755
2764#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2756#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2757 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2758 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2767#define get_byte_array_bit(array, bit) \ 2759#define get_byte_array_bit(array, bit) \
2768 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2760 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2769 2761
2770const unsigned char csi_defaults[] = 2762static const unsigned char csi_defaults[] =
2771 { 2763 {
2772 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, */
2773 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, */
2774 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, */
2775 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, [, \, ], ^, _, */
2776 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, */
2777 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, */
2778 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, */
2779 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, {, |, }, ~, */
2780 }; 2772 };
2781/* *INDENT-ON* */
2782 2773
2783void 2774void
2784rxvt_term::process_csi_seq () 2775rxvt_term::process_csi_seq ()
2785{ 2776{
2786 unicode_t ch, priv, i; 2777 unicode_t ch, priv, i;
… …
2864 { 2855 {
2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2856 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2866 scr_soft_reset (); 2857 scr_soft_reset ();
2867 2858
2868 static const int pm_h[] = { 7, 25 }; 2859 static const int pm_h[] = { 7, 25 };
2869 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 };
2870 2861
2871 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);
2872 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);
2873 } 2864 }
2874 break; 2865 break;
2875 } 2866 }
2876 2867
2877 return; 2868 return;
… …
3096 } 3087 }
3097} 3088}
3098/*}}} */ 3089/*}}} */
3099 3090
3100#if !ENABLE_MINIMAL 3091#if !ENABLE_MINIMAL
3101/* ARGSUSED */
3102void 3092void
3103rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3093rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3104{ 3094{
3105 int x, y; 3095 int x, y;
3106 XWindowAttributes wattr; 3096 XWindowAttributes wattr;
… …
3115 { 3105 {
3116 /* 3106 /*
3117 * commands 3107 * commands
3118 */ 3108 */
3119 case 1: /* deiconify window */ 3109 case 1: /* deiconify window */
3120 XMapWindow (dpy, parent[0]); 3110 XMapWindow (dpy, parent);
3121 break; 3111 break;
3122 case 2: /* iconify window */ 3112 case 2: /* iconify window */
3123 XIconifyWindow (dpy, parent[0], display->screen); 3113 XIconifyWindow (dpy, parent, display->screen);
3124 break; 3114 break;
3125 case 3: /* set position (pixels) */ 3115 case 3: /* set position (pixels) */
3126 XMoveWindow (dpy, parent[0], args[1], args[2]); 3116 XMoveWindow (dpy, parent, args[1], args[2]);
3127 break; 3117 break;
3128 case 4: /* set size (pixels) */ 3118 case 4: /* set size (pixels) */
3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3119 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3130 break; 3120 break;
3131 case 5: /* raise window */ 3121 case 5: /* raise window */
3132 XRaiseWindow (dpy, parent[0]); 3122 XRaiseWindow (dpy, parent);
3133 break; 3123 break;
3134 case 6: /* lower window */ 3124 case 6: /* lower window */
3135 XLowerWindow (dpy, parent[0]); 3125 XLowerWindow (dpy, parent);
3136 break; 3126 break;
3137 case 7: /* refresh window */ 3127 case 7: /* refresh window */
3138 scr_touch (true); 3128 scr_touch (true);
3139 break; 3129 break;
3140 case 8: /* set size (chars) */ 3130 case 8: /* set size (chars) */
… …
3151 3141
3152 /* 3142 /*
3153 * reports - some output format copied from XTerm 3143 * reports - some output format copied from XTerm
3154 */ 3144 */
3155 case 11: /* report window state */ 3145 case 11: /* report window state */
3156 XGetWindowAttributes (dpy, parent[0], &wattr); 3146 XGetWindowAttributes (dpy, parent, &wattr);
3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3147 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3158 break; 3148 break;
3159 case 13: /* report window position */ 3149 case 13: /* report window position */
3160 XGetWindowAttributes (dpy, parent[0], &wattr); 3150 XGetWindowAttributes (dpy, parent, &wattr);
3161 XTranslateCoordinates (dpy, parent[0], wattr.root, 3151 XTranslateCoordinates (dpy, parent, wattr.root,
3162 -wattr.border_width, -wattr.border_width, 3152 -wattr.border_width, -wattr.border_width,
3163 &x, &y, &wdummy); 3153 &x, &y, &wdummy);
3164 tt_printf ("\033[3;%d;%dt", x, y); 3154 tt_printf ("\033[3;%d;%dt", x, y);
3165 break; 3155 break;
3166 case 14: /* report window size (pixels) */ 3156 case 14: /* report window size (pixels) */
3167 XGetWindowAttributes (dpy, parent[0], &wattr); 3157 XGetWindowAttributes (dpy, parent, &wattr);
3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3158 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3169 break; 3159 break;
3170 case 18: /* report text area size (chars) */ 3160 case 18: /* report text area size (chars) */
3171 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3161 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3172 break; 3162 break;
… …
3174 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3164 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3175 break; 3165 break;
3176 case 20: /* report icon label */ 3166 case 20: /* report icon label */
3177 { 3167 {
3178 char *s; 3168 char *s;
3179 XGetIconName (dpy, parent[0], &s); 3169 XGetIconName (dpy, parent, &s);
3180 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 */
3181 XFree (s); 3171 XFree (s);
3182 } 3172 }
3183 break; 3173 break;
3184 case 21: /* report window title */ 3174 case 21: /* report window title */
3185 { 3175 {
3186 char *s; 3176 char *s;
3187 XFetchName (dpy, parent[0], &s); 3177 XFetchName (dpy, parent, &s);
3188 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 */
3189 XFree (s); 3179 XFree (s);
3190 } 3180 }
3191 break; 3181 break;
3192 } 3182 }
… …
3346 unsigned long bytes_after; 3336 unsigned long bytes_after;
3347 unsigned char *value = 0; 3337 unsigned char *value = 0;
3348 const char *str = ""; 3338 const char *str = "";
3349 3339
3350 if (prop 3340 if (prop
3351 && XGetWindowProperty (dpy, parent[0], 3341 && XGetWindowProperty (dpy, parent,
3352 prop, 0, 1<<16, 0, AnyPropertyType, 3342 prop, 0, 1<<16, 0, AnyPropertyType,
3353 &actual_type, &actual_format, 3343 &actual_type, &actual_format,
3354 &nitems, &bytes_after, &value) == Success 3344 &nitems, &bytes_after, &value) == Success
3355 && actual_type != None 3345 && actual_type != None
3356 && actual_format == 8) 3346 && actual_format == 8)
… …
3368 { 3358 {
3369 *eq = 0; 3359 *eq = 0;
3370 set_utf8_property (display->atom (str), eq + 1); 3360 set_utf8_property (display->atom (str), eq + 1);
3371 } 3361 }
3372 else 3362 else
3373 XDeleteProperty (dpy, parent[0], 3363 XDeleteProperty (dpy, parent,
3374 display->atom (str)); 3364 display->atom (str));
3375 } 3365 }
3376 break; 3366 break;
3377 3367
3378 case XTerm_Color: 3368 case XTerm_Color:
… …
3439 process_color_seq (op, Color_tint, str, resp); 3429 process_color_seq (op, Color_tint, str, resp);
3440 { 3430 {
3441 bool changed = false; 3431 bool changed = false;
3442 3432
3443 if (ISSET_PIXCOLOR (Color_tint)) 3433 if (ISSET_PIXCOLOR (Color_tint))
3444 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3434 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3445 else
3446 changed = bgPixmap.unset_tint ();
3447 3435
3448 if (changed) 3436 if (changed)
3449 update_background (); 3437 update_background ();
3450 } 3438 }
3451 3439
… …
3457 if (!strcmp (str, "?")) 3445 if (!strcmp (str, "?"))
3458 { 3446 {
3459 char str[256]; 3447 char str[256];
3460 3448
3461 sprintf (str, "[%dx%d+%d+%d]", 3449 sprintf (str, "[%dx%d+%d+%d]",
3462 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3450 min (h_scale, 32767), min (v_scale, 32767),
3463 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3451 min (h_align, 32767), min (v_align, 32767));
3464 process_xterm_seq (XTerm_title, str, CHAR_ST); 3452 process_xterm_seq (XTerm_title, str, CHAR_ST);
3465 } 3453 }
3466 else 3454 else
3467 { 3455 {
3468 int changed = 0; 3456 bool changed = false;
3469 3457
3470 if (*str != ';') 3458 if (*str != ';')
3471 { 3459 {
3472 if (bgPixmap.set_file (str)) /* change pixmap */ 3460 if (bg_set_file (str)) /* change pixmap */
3473 {
3474 changed++; 3461 changed = true;
3475 str = strchr (str, ';');
3476 if (str == NULL)
3477 bgPixmap.set_defaultGeometry ();
3478 else
3479 bgPixmap.set_geometry (str+1);
3480 }
3481 } 3462 }
3482 else 3463 else
3483 { 3464 {
3484 str++; 3465 str++;
3485 if (bgPixmap.set_geometry (str, true)) 3466 if (bg_set_geometry (str, true))
3486 changed++; 3467 changed = true;
3487 } 3468 }
3488 3469
3489 if (changed) 3470 if (changed)
3490 { 3471 {
3491 if (bgPixmap.window_position_sensitive ()) 3472 if (bg_window_position_sensitive ())
3492 { 3473 {
3493 int x, y; 3474 int x, y;
3494 get_window_origin (x, y); 3475 get_window_origin (x, y);
3495 bgPixmap.set_position (x, y); 3476 bg_set_position (x, y);
3496 } 3477 }
3497 update_background (); 3478 update_background ();
3498 } 3479 }
3499 } 3480 }
3500 break; 3481 break;
… …
3607 if (mode == 'r') 3588 if (mode == 'r')
3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3589 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3609 else 3590 else
3610 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3591 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611 3592
3612 set_privmode (bit, state); 3593 if (state)
3594 priv_modes |= bit;
3595 else
3596 priv_modes &= ~bit;
3613 } 3597 }
3614 3598
3615 return state; 3599 return state;
3616} 3600}
3617 3601
3618/* we're not using priv _yet_ */ 3602/* we're not using priv _yet_ */
3619void 3603void
3620rxvt_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)
3621{ 3605{
3622 unsigned int i, j; 3606 unsigned int i, j;
3623 int state; 3607 int state;
3624 3608
3625 static const struct 3609 static const struct
3626 { 3610 {
3627 const int argval; 3611 const int argval;
3628 const unsigned long bit; 3612 const unsigned long bit;
3629 } argtopriv[] = { 3613 } argtopriv[] = {
3630 { 1, PrivMode_aplCUR }, // DECCKM 3614 { 1, PrivMode_aplCUR }, // DECCKM
3631 { 2, PrivMode_vt52 }, 3615 { 2, PrivMode_vt52 }, // DECANM
3632 { 3, PrivMode_132 }, // DECCOLM 3616 { 3, PrivMode_132 }, // DECCOLM
3633 { 4, PrivMode_smoothScroll }, // DECSCLM 3617 { 4, PrivMode_smoothScroll }, // DECSCLM
3634 { 5, PrivMode_rVideo }, // DECSCNM 3618 { 5, PrivMode_rVideo }, // DECSCNM
3635 { 6, PrivMode_relOrigin }, // DECOM 3619 { 6, PrivMode_relOrigin }, // DECOM
3636 { 7, PrivMode_Autowrap }, // DECAWM 3620 { 7, PrivMode_Autowrap }, // DECAWM
3637 // 8, auto-repeat keys // DECARM 3621 // 8, auto-repeat keys // DECARM
3638 { 9, PrivMode_MouseX10 }, 3622 { 9, PrivMode_MouseX10 },
3639 // 18 end FF to printer after print screen 3623 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region 3624 // 19 Print screen prints full screen/scroll region
3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3625 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3642#ifdef scrollBar_esc 3626#ifdef scrollBar_esc
3643 { scrollBar_esc, PrivMode_scrollBar }, 3627 { scrollBar_esc, PrivMode_scrollBar },
3644#endif 3628#endif
3645 { 35, PrivMode_ShiftKeys }, // rxvt extension 3629 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK 3630 // 38, tektronix mode // DECTEK
3647 { 40, PrivMode_132OK }, 3631 { 40, PrivMode_132OK },
3648 // 41 xterm more fixes NYI 3632 // 41 xterm more fixes NYI
3649 // 45 margin bell NYI 3633 // 45 margin bell NYI
3650 // 46 start logging 3634 // 46 start logging
3651 { 47, PrivMode_Screen }, 3635 { 47, PrivMode_Screen },
3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3636 { 66, PrivMode_aplKP }, // DECNKM
3653#ifndef NO_BACKSPACE_KEY 3637#ifndef NO_BACKSPACE_KEY
3654 { 67, PrivMode_BackSpace }, // DECBKM 3638 { 67, PrivMode_BackSpace }, // DECBKM
3655#endif 3639#endif
3656 { 1000, PrivMode_MouseX11 }, 3640 { 1000, PrivMode_MouseX11 },
3657 { 1002, PrivMode_MouseBtnEvent }, 3641 { 1002, PrivMode_MouseBtnEvent },
3658 { 1003, PrivMode_MouseAnyEvent }, 3642 { 1003, PrivMode_MouseAnyEvent },
3643#if ENABLE_FRILLS
3644 { 1005, PrivMode_ExtModeMouse },
3645#endif
3659 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3646 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3660 { 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
3661 // 1035 enable modifiers for alt, numlock NYI 3651 // 1035 enable modifiers for alt, numlock NYI
3662 // 1036 send ESC for meta keys NYI 3652 // 1036 send ESC for meta keys NYI
3663 // 1037 send DEL for keypad delete NYI 3653 // 1037 send DEL for keypad delete NYI
3664 { 1047, PrivMode_Screen }, 3654 { 1047, PrivMode_Screen },
3665 // 1048 save and restore cursor 3655 // 1048 save and restore cursor, implemented in code
3666 { 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 */
3667 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3657 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3668 { 2004, PrivMode_BracketPaste }, 3658 { 2004, PrivMode_BracketPaste },
3669 }; 3659 };
3670 3660
… …
3680 for (i = 0; i < nargs; i++) 3670 for (i = 0; i < nargs; i++)
3681 { 3671 {
3682 state = -1; 3672 state = -1;
3683 3673
3684 /* basic handling */ 3674 /* basic handling */
3685 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3675 for (j = 0; j < ecb_array_length (argtopriv); j++)
3686 if (argtopriv[j].argval == arg[i]) 3676 if (argtopriv[j].argval == arg[i])
3687 { 3677 {
3688 state = privcases (mode, argtopriv[j].bit); 3678 state = privcases (mode, argtopriv[j].bit);
3689 break; 3679 break;
3690 } 3680 }
… …
3716 case 2: /* VT52 mode */ 3706 case 2: /* VT52 mode */
3717 /* oddball mode. should be set regardless of set/reset 3707 /* oddball mode. should be set regardless of set/reset
3718 * parameter. Return from VT52 mode with an ESC < from 3708 * parameter. Return from VT52 mode with an ESC < from
3719 * within VT52 mode 3709 * within VT52 mode
3720 */ 3710 */
3721 set_privmode (PrivMode_vt52, 1); 3711 priv_modes |= PrivMode_vt52;
3722 break; 3712 break;
3723 case 3: /* 80/132 */ 3713 case 3: /* 80/132 */
3724 if (priv_modes & PrivMode_132OK) 3714 if (priv_modes & PrivMode_132OK)
3725 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3715 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3726 break; 3716 break;
… …
3741 if (state) /* orthogonal */ 3731 if (state) /* orthogonal */
3742 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3732 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3743 break; 3733 break;
3744#ifdef scrollBar_esc 3734#ifdef scrollBar_esc
3745 case scrollBar_esc: 3735 case scrollBar_esc:
3746 if (scrollBar.map (state)) 3736 scrollBar.map (state);
3747 {
3748 resize_all_windows (0, 0, 0); 3737 resize_all_windows (0, 0, 0);
3749 scr_touch (true); 3738 scr_touch (true);
3750 }
3751 break; 3739 break;
3752#endif 3740#endif
3753 case 25: /* visible/invisible cursor */ 3741 case 25: /* visible/invisible cursor */
3754 scr_cursor_visible (state); 3742 scr_cursor_visible (state);
3755 break; 3743 break;
… …
3768 case 1003: 3756 case 1003:
3769 if (state) 3757 if (state)
3770 { 3758 {
3771 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3759 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3772 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;
3773 vt_emask_mouse = PointerMotionMask; 3762 vt_emask_mouse = PointerMotionMask;
3774 } 3763 }
3775 else 3764 else
3776 vt_emask_mouse = NoEventMask; 3765 vt_emask_mouse = NoEventMask;
3777 3766
… …
3962 } 3951 }
3963 } 3952 }
3964} 3953}
3965/*}}} */ 3954/*}}} */
3966 3955
3967/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3968void
3969rxvt_term::process_graphics ()
3970{
3971 unicode_t ch, cmd = cmd_getc ();
3972
3973 if (cmd == 'Q')
3974 {
3975 /* query graphics */
3976 tt_printf ("\033G0\012"); /* no graphics */
3977 return;
3978 }
3979 /* swallow other graphics sequences until terminating ':' */
3980 do
3981 ch = cmd_getc ();
3982 while (ch != ':');
3983}
3984/*}}} */
3985
3986/* ------------------------------------------------------------------------- */ 3956/* ------------------------------------------------------------------------- */
3987 3957
3988/* 3958/*
3989 * Send printf () formatted output to the command. 3959 * Send printf () formatted output to the command.
3990 * Only use for small amounts of data. 3960 * Only use for small amounts of data.
… …
4003 3973
4004/* ---------------------------------------------------------------------- */ 3974/* ---------------------------------------------------------------------- */
4005/* 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,
4006 * or generated by us in response to a query ESC sequence. 3976 * or generated by us in response to a query ESC sequence.
4007 */ 3977 */
4008const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3978static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4009 3979
4010void 3980void
4011rxvt_term::tt_write (const char *data, unsigned int len) 3981rxvt_term::tt_write (const char *data, unsigned int len)
4012{ 3982{
4013 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)))
… …
4018 3988
4019 if (v_buflen == 0) 3989 if (v_buflen == 0)
4020 { 3990 {
4021 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));
4022 3992
3993 max_it (written, 0);
3994
4023 if ((unsigned int)written == len) 3995 if (written == len)
4024 return; 3996 return;
4025 3997
4026 data += written; 3998 data += written;
4027 len -= written; 3999 len -= written;
4028 } 4000 }
4029 4001
4030 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4002 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4031 4003
4032 memcpy (v_buffer + v_buflen, data, len); 4004 memcpy (v_buffer + v_buflen, data, len);
4033 v_buflen += len; 4005 v_buflen += len;
4034 4006
4035 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