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.449 by sf-exg, Sun Apr 18 11:06:46 2010 UTC vs.
Revision 1.483 by sf-exg, Tue Apr 26 16:19:45 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
… …
889 commit_iso14755 (); 889 commit_iso14755 ();
890 890
891 return; 891 return;
892 } 892 }
893 893
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 895 if (i[0] == keysym)
896 { 896 {
897 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 898 commit_iso14755 ();
899 899
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
938#endif 938#endif
939} 939}
940 940
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 941void
975rxvt_term::flush () 942rxvt_term::flush ()
976{ 943{
977 flush_ev.stop (); 944 flush_ev.stop ();
978 945
979#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_BG_PIXMAP
980 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
981 { 948 {
982// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
983 scr_touch (false); 950 scr_touch (false);
984 } 951 }
985#endif 952#endif
986 953
987 if (want_refresh) 954 if (want_refresh)
… …
1152 { 1119 {
1153 } 1120 }
1154} event_handler; 1121} event_handler;
1155#endif 1122#endif
1156 1123
1124/* make sure all the cmd data is at beginning of cmdbuf */
1125void
1126rxvt_term::cmdbuf_reify ()
1127{
1128 if (cmdbuf_ptr == cmdbuf_base)
1129 return;
1130
1131 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1132
1133 memmove (cmdbuf_base, cmdbuf_ptr, used);
1134 cmdbuf_ptr = cmdbuf_base;
1135 cmdbuf_endp = cmdbuf_ptr + used;
1136
1137}
1138
1139#if defined (KEYSYM_RESOURCE)
1140void
1141rxvt_term::cmdbuf_append (const char *str, size_t count)
1142{
1143 cmdbuf_reify ();
1144
1145 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1146
1147 if (count > avail)
1148 return;
1149
1150 memcpy (cmdbuf_endp, str, count);
1151 cmdbuf_endp += count;
1152
1153 cmd_parse ();
1154}
1155#endif
1156
1157bool 1157bool
1158rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1159{ 1159{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 cmdbuf_reify ();
1161 1161
1162 if (CBUFSIZ == n) 1162 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1163 { 1163
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1164 if (!avail)
1165 n = 0;
1166 } 1165 {
1167 1166 // 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; 1167 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1168 cmdbuf_endp = cmdbuf_ptr;
1169 avail = CBUFSIZ;
1170 }
1171 1171
1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1172 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173 1173
1174 if (r > 0) 1174 if (r > 0)
1175 { 1175 {
1176 cmdbuf_endp += r; 1176 cmdbuf_endp += r;
1177 return true; 1177 return true;
… …
1251{ 1251{
1252 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1253 int x, y; 1253 int x, y;
1254 int code = 32; 1254 int code = 32;
1255 1255
1256 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y) + 1;
1258
1258 if (ev.type == MotionNotify) 1259 if (ev.type == MotionNotify)
1259 { 1260 {
1260 if (x == mouse_row && y == mouse_col) 1261 if (x == mouse_row && y == mouse_col)
1261 return; 1262 return;
1263
1262 mouse_row = x; 1264 mouse_row = x;
1263 mouse_col = y; 1265 mouse_col = y;
1264 code += 32; 1266 code += 32;
1265 } 1267 }
1266 1268
… …
1269 else 1271 else
1270 { 1272 {
1271 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1275 if (button_number >= 3)
1274 button_number += (64 - 3); 1276 button_number += 64 - 3;
1275 } 1277 }
1276 1278
1277 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1278 { 1280 {
1279 /* 1281 /*
… …
1311 fputc ('A', stderr); 1313 fputc ('A', stderr);
1312 if (key_state & 32) 1314 if (key_state & 32)
1313 fputc ('2', stderr); 1315 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1317 button_number,
1316 x + 1, 1318 x,
1317 y + 1); 1319 y);
1318#endif 1320#endif
1319 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1320 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1336 code + button_number + key_state,
1322 (32 + x + 1), 1337 32 + x,
1323 (32 + y + 1)); 1338 32 + y);
1324} 1339}
1325 1340
1326/*{{{ process an X event */ 1341/*{{{ process an X event */
1327void 1342void
1328rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1430 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1446 focus_out ();
1432 break; 1447 break;
1433 1448
1434 case ConfigureNotify: 1449 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]) 1450 if (ev.xconfigure.window == parent)
1439 { 1451 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1453 ;
1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bg_set_position (x, y)
1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true;
1471 }
1472#endif
1442 1473
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1475 {
1445 seen_resize = 1; 1476 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1478 }
1448 else 1479 else
1449 { 1480 {
1450#ifdef HAVE_BG_PIXMAP 1481#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1482 if (moved)
1452 { 1483 {
1453 if (mapped) 1484 if (mapped)
1454 update_background (); 1485 update_background ();
1455 else 1486 else
1456 bgPixmap.invalidate (); 1487 bg_invalidate ();
1457 } 1488 }
1458#endif 1489#endif
1459 } 1490 }
1460 1491
1461 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1462 } 1493 }
1463 break; 1494 break;
1464 1495
1465 case PropertyNotify: 1496 case PropertyNotify:
1466 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 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; 1498 break;
1472 1499
1473 case SelectionClear: 1500 case SelectionClear:
1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1475 break; 1502 break;
1476 1503
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: 1504 case SelectionRequest:
1483 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1484 break; 1506 break;
1485 1507
1486 case MapNotify: 1508 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP 1509#ifdef HAVE_BG_PIXMAP
1488 /* This is needed spcifically to fix the case of no window manager or a 1510 /* 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 1511 * non-reparenting window manager. In those cases we never get first
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1491 * care of multiplicity of ConfigureNotify events arriwing while WM does 1513 * care of multiplicity of ConfigureNotify events arriving while WM does
1492 * reparenting. 1514 * reparenting.
1493 * We should not render background immidiately, as there could be several 1515 * 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 1516 * 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 1517 * by scheduling background redraw as soon as we can, but giving a short
1496 * bit of time for ConfigureNotifies to arrive. 1518 * bit of time for ConfigureNotifies to arrive.
1497 * We should render background PRIOR to drawing any text, but AFTER all 1519 * We should render background PRIOR to drawing any text, but AFTER all
1498 * of ConfigureNotifys for the best results. 1520 * of ConfigureNotifys for the best results.
1499 */ 1521 */
1500 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1522 if (!(bg_flags & BG_IS_VALID))
1501 update_background_ev.start (0.025); 1523 update_background_ev.start (0.025);
1502#endif 1524#endif
1503 mapped = 1; 1525 mapped = 1;
1504#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1505 text_blink_ev.start (); 1527 text_blink_ev.start ();
… …
1520 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1521 { 1543 {
1522 do 1544 do
1523 { 1545 {
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1526 } 1548 }
1527 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1528 1550
1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1530 1552
1531 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1532 { 1554 {
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1535 } 1557 }
1536 1558
1537 want_refresh = 1; 1559 want_refresh = 1;
1538 } 1560 }
1539 else 1561 else
… …
1699rxvt_term::set_urgency (bool enable) 1721rxvt_term::set_urgency (bool enable)
1700{ 1722{
1701 if (enable == urgency_hint) 1723 if (enable == urgency_hint)
1702 return; 1724 return;
1703 1725
1704 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1726 if (XWMHints *h = XGetWMHints (dpy, parent))
1705 { 1727 {
1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1707 XSetWMHints (dpy, parent[0], h); 1729 XSetWMHints (dpy, parent, h);
1708 urgency_hint = enable; 1730 urgency_hint = enable;
1709 } 1731 }
1710} 1732}
1711#endif 1733#endif
1712 1734
… …
1820 * use the property to determine the pixmap. We use it later on. 1842 * use the property to determine the pixmap. We use it later on.
1821 */ 1843 */
1822 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1823 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1824 { 1846 {
1825 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1826 update_background (); 1848 update_background ();
1827 } 1849 }
1828 1850
1829 break; 1851 break;
1830 } 1852 }
… …
1869 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1870 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1871#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1872 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1873 { 1895 {
1874 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1875 MEvent.clicks++; 1897 MEvent.clicks++;
1876 1898
1877 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1878 { 1900 {
1879 /* only report double clicks */ 1901 /* only report double clicks */
… …
2367 : NOCHAR; 2389 : NOCHAR;
2368} 2390}
2369 2391
2370static class out_of_input out_of_input; 2392static class out_of_input out_of_input;
2371 2393
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 2394wchar_t
2378rxvt_term::cmd_getc () THROW ((class out_of_input)) 2395rxvt_term::cmd_getc () THROW ((class out_of_input))
2379{ 2396{
2380 wchar_t c = next_char (); 2397 wchar_t c = next_char ();
2381 2398
… …
2663 2680
2664 /* 8.3.87: NEXT LINE */ 2681 /* 8.3.87: NEXT LINE */
2665 case C1_NEL: /* ESC E */ 2682 case C1_NEL: /* ESC E */
2666 { 2683 {
2667 wchar_t nlcr[] = { C0_LF, C0_CR }; 2684 wchar_t nlcr[] = { C0_LF, C0_CR };
2668 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2685 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2669 } 2686 }
2670 break; 2687 break;
2671 2688
2672 /* kidnapped escape sequence: Should be 8.3.48 */ 2689 /* kidnapped escape sequence: Should be 8.3.48 */
2673 case C1_ESA: /* ESC G */ 2690 case C1_ESA: /* ESC G */
2674 process_graphics (); 2691 // used by original rxvt for rob nations own graphics mode
2692 if (cmd_getc () == 'Q')
2693 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2675 break; 2694 break;
2676 2695
2677 /* 8.3.63: CHARACTER TABULATION SET */ 2696 /* 8.3.63: CHARACTER TABULATION SET */
2678 case C1_HTS: /* ESC H */ 2697 case C1_HTS: /* ESC H */
2679 scr_set_tab (1); 2698 scr_set_tab (1);
… …
2742 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2761 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 , 2762 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 2763 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2745}; 2764};
2746 2765
2747#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2766#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2748 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2767 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2749 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2768 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2750#define get_byte_array_bit(array, bit) \ 2769#define get_byte_array_bit(array, bit) \
2751 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2770 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2752 2771
2753const unsigned char csi_defaults[] = 2772static const unsigned char csi_defaults[] =
2754 { 2773 {
2755 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2774 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, */ 2775 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, */ 2776 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, [, \, ], ^, _, */ 2777 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2847 { 2866 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2867 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset (); 2868 scr_soft_reset ();
2850 2869
2851 static const int pm_h[] = { 7, 25 }; 2870 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2871 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2853 2872
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2873 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2874 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2856 } 2875 }
2857 break; 2876 break;
2858 } 2877 }
2859 2878
2860 return; 2879 return;
… …
3098 { 3117 {
3099 /* 3118 /*
3100 * commands 3119 * commands
3101 */ 3120 */
3102 case 1: /* deiconify window */ 3121 case 1: /* deiconify window */
3103 XMapWindow (dpy, parent[0]); 3122 XMapWindow (dpy, parent);
3104 break; 3123 break;
3105 case 2: /* iconify window */ 3124 case 2: /* iconify window */
3106 XIconifyWindow (dpy, parent[0], display->screen); 3125 XIconifyWindow (dpy, parent, display->screen);
3107 break; 3126 break;
3108 case 3: /* set position (pixels) */ 3127 case 3: /* set position (pixels) */
3109 XMoveWindow (dpy, parent[0], args[1], args[2]); 3128 XMoveWindow (dpy, parent, args[1], args[2]);
3110 break; 3129 break;
3111 case 4: /* set size (pixels) */ 3130 case 4: /* set size (pixels) */
3112 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3113 break; 3132 break;
3114 case 5: /* raise window */ 3133 case 5: /* raise window */
3115 XRaiseWindow (dpy, parent[0]); 3134 XRaiseWindow (dpy, parent);
3116 break; 3135 break;
3117 case 6: /* lower window */ 3136 case 6: /* lower window */
3118 XLowerWindow (dpy, parent[0]); 3137 XLowerWindow (dpy, parent);
3119 break; 3138 break;
3120 case 7: /* refresh window */ 3139 case 7: /* refresh window */
3121 scr_touch (true); 3140 scr_touch (true);
3122 break; 3141 break;
3123 case 8: /* set size (chars) */ 3142 case 8: /* set size (chars) */
… …
3134 3153
3135 /* 3154 /*
3136 * reports - some output format copied from XTerm 3155 * reports - some output format copied from XTerm
3137 */ 3156 */
3138 case 11: /* report window state */ 3157 case 11: /* report window state */
3139 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3140 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3141 break; 3160 break;
3142 case 13: /* report window position */ 3161 case 13: /* report window position */
3143 XGetWindowAttributes (dpy, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent, &wattr);
3144 XTranslateCoordinates (dpy, parent[0], wattr.root, 3163 XTranslateCoordinates (dpy, parent, wattr.root,
3145 -wattr.border_width, -wattr.border_width, 3164 -wattr.border_width, -wattr.border_width,
3146 &x, &y, &wdummy); 3165 &x, &y, &wdummy);
3147 tt_printf ("\033[3;%d;%dt", x, y); 3166 tt_printf ("\033[3;%d;%dt", x, y);
3148 break; 3167 break;
3149 case 14: /* report window size (pixels) */ 3168 case 14: /* report window size (pixels) */
3150 XGetWindowAttributes (dpy, parent[0], &wattr); 3169 XGetWindowAttributes (dpy, parent, &wattr);
3151 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3152 break; 3171 break;
3153 case 18: /* report text area size (chars) */ 3172 case 18: /* report text area size (chars) */
3154 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3173 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3155 break; 3174 break;
… …
3157 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3176 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3158 break; 3177 break;
3159 case 20: /* report icon label */ 3178 case 20: /* report icon label */
3160 { 3179 {
3161 char *s; 3180 char *s;
3162 XGetIconName (dpy, parent[0], &s); 3181 XGetIconName (dpy, parent, &s);
3163 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3182 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3164 XFree (s); 3183 XFree (s);
3165 } 3184 }
3166 break; 3185 break;
3167 case 21: /* report window title */ 3186 case 21: /* report window title */
3168 { 3187 {
3169 char *s; 3188 char *s;
3170 XFetchName (dpy, parent[0], &s); 3189 XFetchName (dpy, parent, &s);
3171 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3190 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3172 XFree (s); 3191 XFree (s);
3173 } 3192 }
3174 break; 3193 break;
3175 } 3194 }
… …
3231 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3232 */ 3251 */
3233void 3252void
3234rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
3235{ 3254{
3236 char *s;
3237 unicode_t eh;
3238
3239 /* 3255 /*
3240 * Not handled yet 3256 * Not handled yet
3241 */ 3257 */
3258
3259 unicode_t eh;
3242 s = get_to_st (eh); 3260 char *s = get_to_st (eh);
3243 if (s) 3261 if (s)
3244 free (s); 3262 free (s);
3245 3263
3246 return; 3264 return;
3247} 3265}
… …
3251 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3269 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3252 */ 3270 */
3253void 3271void
3254rxvt_term::process_osc_seq () 3272rxvt_term::process_osc_seq ()
3255{ 3273{
3256 unicode_t ch, eh;
3257 int arg; 3274 int arg;
3258 3275
3259 ch = cmd_getc (); 3276 unicode_t ch = cmd_getc ();
3260 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3277 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3261 arg = arg * 10 + (ch - '0'); 3278 arg = arg * 10 + (ch - '0');
3262 3279
3263 if (ch == ';') 3280 if (ch == ';')
3264 { 3281 {
3282 unicode_t eh;
3265 char *s = get_to_st (eh); 3283 char *s = get_to_st (eh);
3266 3284
3267 if (s) 3285 if (s)
3268 { 3286 {
3269 process_xterm_seq (arg, s, eh); 3287 process_xterm_seq (arg, s, eh);
… …
3330 unsigned long bytes_after; 3348 unsigned long bytes_after;
3331 unsigned char *value = 0; 3349 unsigned char *value = 0;
3332 const char *str = ""; 3350 const char *str = "";
3333 3351
3334 if (prop 3352 if (prop
3335 && XGetWindowProperty (dpy, parent[0], 3353 && XGetWindowProperty (dpy, parent,
3336 prop, 0, 1<<16, 0, AnyPropertyType, 3354 prop, 0, 1<<16, 0, AnyPropertyType,
3337 &actual_type, &actual_format, 3355 &actual_type, &actual_format,
3338 &nitems, &bytes_after, &value) == Success 3356 &nitems, &bytes_after, &value) == Success
3339 && actual_type != None 3357 && actual_type != None
3340 && actual_format == 8) 3358 && actual_format == 8)
… …
3352 { 3370 {
3353 *eq = 0; 3371 *eq = 0;
3354 set_utf8_property (display->atom (str), eq + 1); 3372 set_utf8_property (display->atom (str), eq + 1);
3355 } 3373 }
3356 else 3374 else
3357 XDeleteProperty (dpy, parent[0], 3375 XDeleteProperty (dpy, parent,
3358 display->atom (str)); 3376 display->atom (str));
3359 } 3377 }
3360 break; 3378 break;
3361 3379
3362 case XTerm_Color: 3380 case XTerm_Color:
… …
3398 break; 3416 break;
3399#ifdef OPTION_HC 3417#ifdef OPTION_HC
3400 case XTerm_Color_HC: 3418 case XTerm_Color_HC:
3401 process_color_seq (op, Color_HC, str, resp); 3419 process_color_seq (op, Color_HC, str, resp);
3402 break; 3420 break;
3421 case XTerm_Color_HTC:
3422 process_color_seq (op, Color_HTC, str, resp);
3423 break;
3403#endif 3424#endif
3404#ifndef NO_BOLD_UNDERLINE_REVERSE 3425#ifndef NO_BOLD_UNDERLINE_REVERSE
3405 case URxvt_Color_BD: 3426 case URxvt_Color_BD:
3406 process_color_seq (op, Color_BD, str, resp); 3427 process_color_seq (op, Color_BD, str, resp);
3407 break; 3428 break;
… …
3420 process_color_seq (op, Color_tint, str, resp); 3441 process_color_seq (op, Color_tint, str, resp);
3421 { 3442 {
3422 bool changed = false; 3443 bool changed = false;
3423 3444
3424 if (ISSET_PIXCOLOR (Color_tint)) 3445 if (ISSET_PIXCOLOR (Color_tint))
3425 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3446 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3426 else
3427 changed = bgPixmap.unset_tint ();
3428 3447
3429 if (changed) 3448 if (changed)
3430 update_background (); 3449 update_background ();
3431 } 3450 }
3432 3451
… …
3438 if (!strcmp (str, "?")) 3457 if (!strcmp (str, "?"))
3439 { 3458 {
3440 char str[256]; 3459 char str[256];
3441 3460
3442 sprintf (str, "[%dx%d+%d+%d]", 3461 sprintf (str, "[%dx%d+%d+%d]",
3443 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3462 min (h_scale, 32767), min (v_scale, 32767),
3444 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3463 min (h_align, 32767), min (v_align, 32767));
3445 process_xterm_seq (XTerm_title, str, CHAR_ST); 3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3446 } 3465 }
3447 else 3466 else
3448 { 3467 {
3449 int changed = 0; 3468 int changed = 0;
3450 3469
3451 if (*str != ';') 3470 if (*str != ';')
3452 { 3471 {
3453 /* reset to default scaling :*/
3454 bgPixmap.unset_geometry ();
3455 if (bgPixmap.set_file (str)) /* change pixmap */ 3472 if (bg_set_file (str)) /* change pixmap */
3473 {
3456 changed++; 3474 changed++;
3457 str = strchr (str, ';'); 3475 str = strchr (str, ';');
3458 if (str == NULL) 3476 if (str == NULL)
3459 bgPixmap.set_defaultGeometry (); 3477 bg_set_default_geometry ();
3478 else
3479 bg_set_geometry (str+1);
3480 }
3460 } 3481 }
3461 3482 else
3462 while (str)
3463 { 3483 {
3464 str++; 3484 str++;
3465 if (bgPixmap.set_geometry (str)) 3485 if (bg_set_geometry (str, true))
3466 changed++; 3486 changed++;
3467 str = strchr (str, ';');
3468 } 3487 }
3469 3488
3470 if (changed) 3489 if (changed)
3490 {
3491 if (bg_window_position_sensitive ())
3492 {
3493 int x, y;
3494 get_window_origin (x, y);
3495 bg_set_position (x, y);
3496 }
3471 update_background (); 3497 update_background ();
3498 }
3472 } 3499 }
3473 break; 3500 break;
3474#endif 3501#endif
3475 3502
3476 case XTerm_logfile: 3503 case XTerm_logfile:
… …
3579 { 3606 {
3580 if (mode == 'r') 3607 if (mode == 'r')
3581 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3582 else 3609 else
3583 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611
3584 set_privmode (bit, state); 3612 set_privmode (bit, state);
3585 } 3613 }
3586 3614
3587 return state; 3615 return state;
3588} 3616}
… …
3607 { 6, PrivMode_relOrigin }, // DECOM 3635 { 6, PrivMode_relOrigin }, // DECOM
3608 { 7, PrivMode_Autowrap }, // DECAWM 3636 { 7, PrivMode_Autowrap }, // DECAWM
3609 // 8, auto-repeat keys // DECARM 3637 // 8, auto-repeat keys // DECARM
3610 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3611 // 18 end FF to printer after print screen 3639 // 18 end FF to printer after print screen
3612 // 19 Print screen prints full screen/scorll region 3640 // 19 Print screen prints full screen/scroll region
3613 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3614#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3615 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3616#endif 3644#endif
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3626 { 67, PrivMode_BackSpace }, // DECBKM 3654 { 67, PrivMode_BackSpace }, // DECBKM
3627#endif 3655#endif
3628 { 1000, PrivMode_MouseX11 }, 3656 { 1000, PrivMode_MouseX11 },
3629 { 1002, PrivMode_MouseBtnEvent }, 3657 { 1002, PrivMode_MouseBtnEvent },
3630 { 1003, PrivMode_MouseAnyEvent }, 3658 { 1003, PrivMode_MouseAnyEvent },
3659#if ENABLE_FRILLS
3660 { 1005, PrivMode_ExtModeMouse },
3661#endif
3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3662 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3632 { 1011, PrivMode_Keypress }, // rxvt extension 3663 { 1011, PrivMode_Keypress }, // rxvt extension
3664#if ENABLE_FRILLS
3665 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3666#endif
3633 // 1035 enable modifiers for alt, numlock NYI 3667 // 1035 enable modifiers for alt, numlock NYI
3634 // 1036 send ESC for meta keys NYI 3668 // 1036 send ESC for meta keys NYI
3635 // 1037 send DEL for keypad delete NYI 3669 // 1037 send DEL for keypad delete NYI
3636 { 1047, PrivMode_Screen }, 3670 { 1047, PrivMode_Screen },
3637 // 1048 save and restore cursor 3671 // 1048 save and restore cursor, implemented in code
3638 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3672 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3639 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3673 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3640 { 2004, PrivMode_BracketPaste }, 3674 { 2004, PrivMode_BracketPaste },
3641 }; 3675 };
3642 3676
… …
3652 for (i = 0; i < nargs; i++) 3686 for (i = 0; i < nargs; i++)
3653 { 3687 {
3654 state = -1; 3688 state = -1;
3655 3689
3656 /* basic handling */ 3690 /* basic handling */
3657 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3691 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3658 if (argtopriv[j].argval == arg[i]) 3692 if (argtopriv[j].argval == arg[i])
3659 { 3693 {
3660 state = privcases (mode, argtopriv[j].bit); 3694 state = privcases (mode, argtopriv[j].bit);
3661 break; 3695 break;
3662 } 3696 }
… …
3740 case 1003: 3774 case 1003:
3741 if (state) 3775 if (state)
3742 { 3776 {
3743 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3777 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3744 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3778 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3779 mouse_row = mouse_col = 0;
3745 vt_emask_mouse = PointerMotionMask; 3780 vt_emask_mouse = PointerMotionMask;
3746 } 3781 }
3747 else 3782 else
3748 vt_emask_mouse = NoEventMask; 3783 vt_emask_mouse = NoEventMask;
3749 3784
… …
3934 } 3969 }
3935 } 3970 }
3936} 3971}
3937/*}}} */ 3972/*}}} */
3938 3973
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/* ------------------------------------------------------------------------- */ 3974/* ------------------------------------------------------------------------- */
3959 3975
3960/* 3976/*
3961 * Send printf () formatted output to the command. 3977 * Send printf () formatted output to the command.
3962 * Only use for small amounts of data. 3978 * Only use for small amounts of data.
… …
3975 3991
3976/* ---------------------------------------------------------------------- */ 3992/* ---------------------------------------------------------------------- */
3977/* Write data to the pty as typed by the user, pasted with the mouse, 3993/* 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. 3994 * or generated by us in response to a query ESC sequence.
3979 */ 3995 */
3980const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3996static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3981 3997
3982void 3998void
3983rxvt_term::tt_write (const char *data, unsigned int len) 3999rxvt_term::tt_write (const char *data, unsigned int len)
3984{ 4000{
3985 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4001 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3990 4006
3991 if (v_buflen == 0) 4007 if (v_buflen == 0)
3992 { 4008 {
3993 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4009 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3994 4010
4011 max_it (written, 0);
4012
3995 if ((unsigned int)written == len) 4013 if (written == len)
3996 return; 4014 return;
3997 4015
3998 data += written; 4016 data += written;
3999 len -= written; 4017 len -= written;
4000 } 4018 }
4001 4019
4002 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4020 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4003 4021
4004 memcpy (v_buffer + v_buflen, data, len); 4022 memcpy (v_buffer + v_buflen, data, len);
4005 v_buflen += len; 4023 v_buflen += len;
4006 4024
4007 pty_ev.set (ev::READ | ev::WRITE); 4025 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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