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.462 by root, Wed Nov 24 04:07:39 2010 UTC vs.
Revision 1.485 by sf-exg, Fri Apr 29 13:08:24 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.flags & bgPixmap_t::hasChanged) 945 if (bg_flags & BG_NEEDS_REFRESH)
981 { 946 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 947 bg_flags &= ~BG_NEEDS_REFRESH;
983// scr_clear (true); This needs to be researched further!
984 scr_touch (false); 948 scr_touch (false);
985 } 949 }
986#endif 950#endif
987 951
988 if (want_refresh) 952 if (want_refresh)
… …
1153 { 1117 {
1154 } 1118 }
1155} event_handler; 1119} event_handler;
1156#endif 1120#endif
1157 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
1158bool 1155bool
1159rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
1160{ 1157{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 cmdbuf_reify ();
1162 1159
1163 if (CBUFSIZ == n) 1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1161
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1162 if (!avail)
1166 n = 0;
1167 } 1163 {
1168 1164 // 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; 1165 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1166 cmdbuf_endp = cmdbuf_ptr;
1167 avail = CBUFSIZ;
1168 }
1172 1169
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1171
1175 if (r > 0) 1172 if (r > 0)
1176 { 1173 {
1177 cmdbuf_endp += r; 1174 cmdbuf_endp += r;
1178 return true; 1175 return true;
… …
1446 && ev.xfocus.mode != NotifyGrab) 1443 && ev.xfocus.mode != NotifyGrab)
1447 focus_out (); 1444 focus_out ();
1448 break; 1445 break;
1449 1446
1450 case ConfigureNotify: 1447 case ConfigureNotify:
1451 if (ev.xconfigure.window == parent[0]) 1448 if (ev.xconfigure.window == parent)
1452 { 1449 {
1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1454 ; 1451 ;
1455 1452
1456#ifdef HAVE_BG_PIXMAP 1453#ifdef HAVE_BG_PIXMAP
1457 bool moved = false; 1454 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ()) 1455 if (bg_window_position_sensitive ())
1459 { 1456 {
1460 int x, y; 1457 int x, y;
1461 if (ev.xconfigure.send_event) 1458 if (ev.xconfigure.send_event)
1462 { 1459 {
1463 x = ev.xconfigure.x; 1460 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y; 1461 y = ev.xconfigure.y;
1465 } 1462 }
1466 else 1463 else
1467 get_window_origin (x, y); 1464 get_window_origin (x, y);
1468 1465
1469 if (bgPixmap.set_position (x, y) 1466 if (bg_set_position (x, y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1467 || !(bg_flags & BG_IS_VALID))
1471 moved = true; 1468 moved = true;
1472 } 1469 }
1473#endif 1470#endif
1474 1471
1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
… …
1483 if (moved) 1480 if (moved)
1484 { 1481 {
1485 if (mapped) 1482 if (mapped)
1486 update_background (); 1483 update_background ();
1487 else 1484 else
1488 bgPixmap.invalidate (); 1485 bg_invalidate ();
1489 } 1486 }
1490#endif 1487#endif
1491 } 1488 }
1492 1489
1493 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1494 } 1491 }
1495 break; 1492 break;
1496 1493
1497 case PropertyNotify: 1494 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1495 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1500 && ev.xproperty.state == PropertyNewValue)
1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1502
1503 break; 1496 break;
1504 1497
1505 case SelectionClear: 1498 case SelectionClear:
1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1499 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1507 break;
1508
1509 case SelectionNotify:
1510 if (selection_wait == Sel_normal)
1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1512 break; 1500 break;
1513 1501
1514 case SelectionRequest: 1502 case SelectionRequest:
1515 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1516 break; 1504 break;
… …
1527 * 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
1528 * bit of time for ConfigureNotifies to arrive. 1516 * bit of time for ConfigureNotifies to arrive.
1529 * 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
1530 * of ConfigureNotifys for the best results. 1518 * of ConfigureNotifys for the best results.
1531 */ 1519 */
1532 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1520 if (!(bg_flags & BG_IS_VALID))
1533 update_background_ev.start (0.025); 1521 update_background_ev.start (0.025);
1534#endif 1522#endif
1535 mapped = 1; 1523 mapped = 1;
1536#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1537 text_blink_ev.start (); 1525 text_blink_ev.start ();
… …
1552 if (ev.xany.window == vt) 1540 if (ev.xany.window == vt)
1553 { 1541 {
1554 do 1542 do
1555 { 1543 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, false);
1558 } 1546 }
1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1560 1548
1561 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1562 1550
1563 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1564 { 1552 {
1565 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1566 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1567 } 1555 }
1568 1556
1569 want_refresh = 1; 1557 want_refresh = 1;
1570 } 1558 }
1571 else 1559 else
… …
1731rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1732{ 1720{
1733 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1734 return; 1722 return;
1735 1723
1736 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1737 { 1725 {
1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1739 XSetWMHints (dpy, parent[0], h); 1727 XSetWMHints (dpy, parent, h);
1740 urgency_hint = enable; 1728 urgency_hint = enable;
1741 } 1729 }
1742} 1730}
1743#endif 1731#endif
1744 1732
… …
1852 * 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.
1853 */ 1841 */
1854 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1855 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1856 { 1844 {
1857 bgPixmap.set_root_pixmap (); 1845 bg_set_root_pixmap ();
1858 update_background (); 1846 update_background ();
1859 } 1847 }
1860 1848
1861 break; 1849 break;
1862 } 1850 }
… …
2399 : NOCHAR; 2387 : NOCHAR;
2400} 2388}
2401 2389
2402static class out_of_input out_of_input; 2390static class out_of_input out_of_input;
2403 2391
2404/* rxvt_cmd_getc () - Return next input character */
2405/*
2406 * Return the next input character after first passing any keyboard input
2407 * to the command.
2408 */
2409wchar_t 2392wchar_t
2410rxvt_term::cmd_getc () THROW ((class out_of_input)) 2393rxvt_term::cmd_getc () THROW ((class out_of_input))
2411{ 2394{
2412 wchar_t c = next_char (); 2395 wchar_t c = next_char ();
2413 2396
… …
2506 pclose_printer (fd); 2489 pclose_printer (fd);
2507} 2490}
2508#endif /* PRINTPIPE */ 2491#endif /* PRINTPIPE */
2509/*}}} */ 2492/*}}} */
2510 2493
2511/* *INDENT-OFF* */
2512enum { 2494enum {
2513 C1_40 = 0x40, 2495 C1_40 = 0x40,
2514 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2496 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2515 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2497 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2516 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2498 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2517 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2499 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2518}; 2500};
2519/* *INDENT-ON* */
2520 2501
2521/*{{{ process non-printing single characters */ 2502/*{{{ process non-printing single characters */
2522void 2503void
2523rxvt_term::process_nonprinting (unicode_t ch) 2504rxvt_term::process_nonprinting (unicode_t ch)
2524{ 2505{
… …
2695 2676
2696 /* 8.3.87: NEXT LINE */ 2677 /* 8.3.87: NEXT LINE */
2697 case C1_NEL: /* ESC E */ 2678 case C1_NEL: /* ESC E */
2698 { 2679 {
2699 wchar_t nlcr[] = { C0_LF, C0_CR }; 2680 wchar_t nlcr[] = { C0_LF, C0_CR };
2700 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2681 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2701 } 2682 }
2702 break; 2683 break;
2703 2684
2704 /* kidnapped escape sequence: Should be 8.3.48 */ 2685 /* kidnapped escape sequence: Should be 8.3.48 */
2705 case C1_ESA: /* ESC G */ 2686 case C1_ESA: /* ESC G */
2706 process_graphics (); 2687 // used by original rxvt for rob nations own graphics mode
2688 if (cmd_getc () == 'Q')
2689 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2707 break; 2690 break;
2708 2691
2709 /* 8.3.63: CHARACTER TABULATION SET */ 2692 /* 8.3.63: CHARACTER TABULATION SET */
2710 case C1_HTS: /* ESC H */ 2693 case C1_HTS: /* ESC H */
2711 scr_set_tab (1); 2694 scr_set_tab (1);
… …
2761 } 2744 }
2762} 2745}
2763/*}}} */ 2746/*}}} */
2764 2747
2765/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2748/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2766/* *INDENT-OFF* */
2767enum { 2749enum {
2768 CSI_ICH = 0x40, 2750 CSI_ICH = 0x40,
2769 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2751 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2770 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2752 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2771 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2753 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2774 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2756 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2775 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2757 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2776 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2758 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2777}; 2759};
2778 2760
2779#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2761#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2762 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2763 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2782#define get_byte_array_bit(array, bit) \ 2764#define get_byte_array_bit(array, bit) \
2783 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2765 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2784 2766
2785const unsigned char csi_defaults[] = 2767static const unsigned char csi_defaults[] =
2786 { 2768 {
2787 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2769 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2788 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2770 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2789 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2771 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2790 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2772 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2791 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2773 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2792 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2774 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2793 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2775 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2794 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2776 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2795 }; 2777 };
2796/* *INDENT-ON* */
2797 2778
2798void 2779void
2799rxvt_term::process_csi_seq () 2780rxvt_term::process_csi_seq ()
2800{ 2781{
2801 unicode_t ch, priv, i; 2782 unicode_t ch, priv, i;
… …
2881 scr_soft_reset (); 2862 scr_soft_reset ();
2882 2863
2883 static const int pm_h[] = { 7, 25 }; 2864 static const int pm_h[] = { 7, 25 };
2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2865 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2885 2866
2886 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2867 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2887 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2868 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2888 } 2869 }
2889 break; 2870 break;
2890 } 2871 }
2891 2872
2892 return; 2873 return;
… …
3111 } 3092 }
3112} 3093}
3113/*}}} */ 3094/*}}} */
3114 3095
3115#if !ENABLE_MINIMAL 3096#if !ENABLE_MINIMAL
3116/* ARGSUSED */
3117void 3097void
3118rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3119{ 3099{
3120 int x, y; 3100 int x, y;
3121 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
… …
3130 { 3110 {
3131 /* 3111 /*
3132 * commands 3112 * commands
3133 */ 3113 */
3134 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3135 XMapWindow (dpy, parent[0]); 3115 XMapWindow (dpy, parent);
3136 break; 3116 break;
3137 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3138 XIconifyWindow (dpy, parent[0], display->screen); 3118 XIconifyWindow (dpy, parent, display->screen);
3139 break; 3119 break;
3140 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3141 XMoveWindow (dpy, parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent, args[1], args[2]);
3142 break; 3122 break;
3143 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3145 break; 3125 break;
3146 case 5: /* raise window */ 3126 case 5: /* raise window */
3147 XRaiseWindow (dpy, parent[0]); 3127 XRaiseWindow (dpy, parent);
3148 break; 3128 break;
3149 case 6: /* lower window */ 3129 case 6: /* lower window */
3150 XLowerWindow (dpy, parent[0]); 3130 XLowerWindow (dpy, parent);
3151 break; 3131 break;
3152 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3153 scr_touch (true); 3133 scr_touch (true);
3154 break; 3134 break;
3155 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
… …
3166 3146
3167 /* 3147 /*
3168 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3169 */ 3149 */
3170 case 11: /* report window state */ 3150 case 11: /* report window state */
3171 XGetWindowAttributes (dpy, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3173 break; 3153 break;
3174 case 13: /* report window position */ 3154 case 13: /* report window position */
3175 XGetWindowAttributes (dpy, parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent, &wattr);
3176 XTranslateCoordinates (dpy, parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent, wattr.root,
3177 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3178 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3179 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3180 break; 3160 break;
3181 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3182 XGetWindowAttributes (dpy, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent, &wattr);
3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3184 break; 3164 break;
3185 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3186 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3187 break; 3167 break;
… …
3189 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3190 break; 3170 break;
3191 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3192 { 3172 {
3193 char *s; 3173 char *s;
3194 XGetIconName (dpy, parent[0], &s); 3174 XGetIconName (dpy, parent, &s);
3195 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3196 XFree (s); 3176 XFree (s);
3197 } 3177 }
3198 break; 3178 break;
3199 case 21: /* report window title */ 3179 case 21: /* report window title */
3200 { 3180 {
3201 char *s; 3181 char *s;
3202 XFetchName (dpy, parent[0], &s); 3182 XFetchName (dpy, parent, &s);
3203 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3204 XFree (s); 3184 XFree (s);
3205 } 3185 }
3206 break; 3186 break;
3207 } 3187 }
… …
3361 unsigned long bytes_after; 3341 unsigned long bytes_after;
3362 unsigned char *value = 0; 3342 unsigned char *value = 0;
3363 const char *str = ""; 3343 const char *str = "";
3364 3344
3365 if (prop 3345 if (prop
3366 && XGetWindowProperty (dpy, parent[0], 3346 && XGetWindowProperty (dpy, parent,
3367 prop, 0, 1<<16, 0, AnyPropertyType, 3347 prop, 0, 1<<16, 0, AnyPropertyType,
3368 &actual_type, &actual_format, 3348 &actual_type, &actual_format,
3369 &nitems, &bytes_after, &value) == Success 3349 &nitems, &bytes_after, &value) == Success
3370 && actual_type != None 3350 && actual_type != None
3371 && actual_format == 8) 3351 && actual_format == 8)
… …
3383 { 3363 {
3384 *eq = 0; 3364 *eq = 0;
3385 set_utf8_property (display->atom (str), eq + 1); 3365 set_utf8_property (display->atom (str), eq + 1);
3386 } 3366 }
3387 else 3367 else
3388 XDeleteProperty (dpy, parent[0], 3368 XDeleteProperty (dpy, parent,
3389 display->atom (str)); 3369 display->atom (str));
3390 } 3370 }
3391 break; 3371 break;
3392 3372
3393 case XTerm_Color: 3373 case XTerm_Color:
… …
3454 process_color_seq (op, Color_tint, str, resp); 3434 process_color_seq (op, Color_tint, str, resp);
3455 { 3435 {
3456 bool changed = false; 3436 bool changed = false;
3457 3437
3458 if (ISSET_PIXCOLOR (Color_tint)) 3438 if (ISSET_PIXCOLOR (Color_tint))
3459 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3439 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3460 else
3461 changed = bgPixmap.unset_tint ();
3462 3440
3463 if (changed) 3441 if (changed)
3464 update_background (); 3442 update_background ();
3465 } 3443 }
3466 3444
… …
3472 if (!strcmp (str, "?")) 3450 if (!strcmp (str, "?"))
3473 { 3451 {
3474 char str[256]; 3452 char str[256];
3475 3453
3476 sprintf (str, "[%dx%d+%d+%d]", 3454 sprintf (str, "[%dx%d+%d+%d]",
3477 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3455 min (h_scale, 32767), min (v_scale, 32767),
3478 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3456 min (h_align, 32767), min (v_align, 32767));
3479 process_xterm_seq (XTerm_title, str, CHAR_ST); 3457 process_xterm_seq (XTerm_title, str, CHAR_ST);
3480 } 3458 }
3481 else 3459 else
3482 { 3460 {
3483 int changed = 0; 3461 int changed = 0;
3484 3462
3485 if (*str != ';') 3463 if (*str != ';')
3486 { 3464 {
3487 if (bgPixmap.set_file (str)) /* change pixmap */ 3465 if (bg_set_file (str)) /* change pixmap */
3488 { 3466 {
3489 changed++; 3467 changed++;
3490 str = strchr (str, ';'); 3468 str = strchr (str, ';');
3491 if (str == NULL) 3469 if (str == NULL)
3492 bgPixmap.set_defaultGeometry (); 3470 bg_set_default_geometry ();
3493 else 3471 else
3494 bgPixmap.set_geometry (str+1); 3472 bg_set_geometry (str+1);
3495 } 3473 }
3496 } 3474 }
3497 else 3475 else
3498 { 3476 {
3499 str++; 3477 str++;
3500 if (bgPixmap.set_geometry (str, true)) 3478 if (bg_set_geometry (str, true))
3501 changed++; 3479 changed++;
3502 } 3480 }
3503 3481
3504 if (changed) 3482 if (changed)
3505 { 3483 {
3506 if (bgPixmap.window_position_sensitive ()) 3484 if (bg_window_position_sensitive ())
3507 { 3485 {
3508 int x, y; 3486 int x, y;
3509 get_window_origin (x, y); 3487 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y); 3488 bg_set_position (x, y);
3511 } 3489 }
3512 update_background (); 3490 update_background ();
3513 } 3491 }
3514 } 3492 }
3515 break; 3493 break;
… …
3701 for (i = 0; i < nargs; i++) 3679 for (i = 0; i < nargs; i++)
3702 { 3680 {
3703 state = -1; 3681 state = -1;
3704 3682
3705 /* basic handling */ 3683 /* basic handling */
3706 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3684 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3707 if (argtopriv[j].argval == arg[i]) 3685 if (argtopriv[j].argval == arg[i])
3708 { 3686 {
3709 state = privcases (mode, argtopriv[j].bit); 3687 state = privcases (mode, argtopriv[j].bit);
3710 break; 3688 break;
3711 } 3689 }
… …
3984 } 3962 }
3985 } 3963 }
3986} 3964}
3987/*}}} */ 3965/*}}} */
3988 3966
3989/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3990void
3991rxvt_term::process_graphics ()
3992{
3993 unicode_t ch, cmd = cmd_getc ();
3994
3995 if (cmd == 'Q')
3996 {
3997 /* query graphics */
3998 tt_printf ("\033G0\012"); /* no graphics */
3999 return;
4000 }
4001 /* swallow other graphics sequences until terminating ':' */
4002 do
4003 ch = cmd_getc ();
4004 while (ch != ':');
4005}
4006/*}}} */
4007
4008/* ------------------------------------------------------------------------- */ 3967/* ------------------------------------------------------------------------- */
4009 3968
4010/* 3969/*
4011 * Send printf () formatted output to the command. 3970 * Send printf () formatted output to the command.
4012 * Only use for small amounts of data. 3971 * Only use for small amounts of data.
… …
4025 3984
4026/* ---------------------------------------------------------------------- */ 3985/* ---------------------------------------------------------------------- */
4027/* Write data to the pty as typed by the user, pasted with the mouse, 3986/* Write data to the pty as typed by the user, pasted with the mouse,
4028 * or generated by us in response to a query ESC sequence. 3987 * or generated by us in response to a query ESC sequence.
4029 */ 3988 */
4030const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3989static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4031 3990
4032void 3991void
4033rxvt_term::tt_write (const char *data, unsigned int len) 3992rxvt_term::tt_write (const char *data, unsigned int len)
4034{ 3993{
4035 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4040 3999
4041 if (v_buflen == 0) 4000 if (v_buflen == 0)
4042 { 4001 {
4043 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4002 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4044 4003
4004 max_it (written, 0);
4005
4045 if ((unsigned int)written == len) 4006 if (written == len)
4046 return; 4007 return;
4047 4008
4048 data += written; 4009 data += written;
4049 len -= written; 4010 len -= written;
4050 } 4011 }
4051 4012
4052 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4013 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4053 4014
4054 memcpy (v_buffer + v_buflen, data, len); 4015 memcpy (v_buffer + v_buflen, data, len);
4055 v_buflen += len; 4016 v_buflen += len;
4056 4017
4057 pty_ev.set (ev::READ | ev::WRITE); 4018 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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