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

Diff Legend

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