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.454 by sf-exg, Sat Aug 21 16:07:15 2010 UTC vs.
Revision 1.482 by sf-exg, Thu Apr 7 12:19:40 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
… …
771 771
772 default: 772 default:
773 { 773 {
774 int param = map_function_key (keysym); 774 int param = map_function_key (keysym);
775 if (param > 0) 775 if (param > 0)
776 {
777 int n = sprintf (kbuf,"\033[%d~", param); 776 sprintf (kbuf,"\033[%d~", param);
778 /*
779 * pass Shift/Control indicators for function keys ending with `~'
780 *
781 * eg,
782 * Prior = "ESC[5~"
783 * Shift+Prior = "ESC[5$"
784 * Ctrl+Prior = "ESC[5^"
785 * Ctrl+Shift+Prior = "ESC[5@"
786 */
787 kbuf[n-1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
788 }
789 else 777 else
790 newlen = 0; 778 newlen = 0;
791 } 779 }
792 break; 780 break;
793 } 781 }
… …
844 view_start = 0; 832 view_start = 0;
845 want_refresh = 1; 833 want_refresh = 1;
846 } 834 }
847 835
848 /* 836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
849 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
850 */ 846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
851 849
852 /* escape prefix */ 850 /* escape prefix */
853 if (meta 851 if (meta
854#ifdef META8_OPTION 852#ifdef META8_OPTION
855 && meta_char == C0_ESC 853 && meta_char == C0_ESC
… …
891 commit_iso14755 (); 889 commit_iso14755 ();
892 890
893 return; 891 return;
894 } 892 }
895 893
896 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
897 if (i[0] == keysym) 895 if (i[0] == keysym)
898 { 896 {
899 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
900 commit_iso14755 (); 898 commit_iso14755 ();
901 899
… …
938 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
939 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
940#endif 938#endif
941} 939}
942 940
943#if defined (KEYSYM_RESOURCE)
944unsigned int
945rxvt_term::cmd_write (const char *str, unsigned int count)
946{
947 unsigned int n, s;
948
949 n = cmdbuf_ptr - cmdbuf_base;
950 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
951
952 if (n > 0 && s < count)
953 {
954 memmove (cmdbuf_base, cmdbuf_ptr,
955 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
956 cmdbuf_ptr = cmdbuf_base;
957 cmdbuf_endp -= n;
958 s += n;
959 }
960
961 if (count > s)
962 {
963 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
964 count = s;
965 }
966
967 for (; count--;)
968 *cmdbuf_endp++ = *str++;
969
970 cmd_parse ();
971
972 return 0;
973}
974#endif
975
976void 941void
977rxvt_term::flush () 942rxvt_term::flush ()
978{ 943{
979 flush_ev.stop (); 944 flush_ev.stop ();
980 945
981#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_BG_PIXMAP
982 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
983 { 948 {
984// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
985 scr_touch (false); 950 scr_touch (false);
986 } 951 }
987#endif 952#endif
988 953
989 if (want_refresh) 954 if (want_refresh)
… …
1154 { 1119 {
1155 } 1120 }
1156} event_handler; 1121} event_handler;
1157#endif 1122#endif
1158 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
1159bool 1157bool
1160rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1161{ 1159{
1162 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 cmdbuf_reify ();
1163 1161
1164 if (CBUFSIZ == n) 1162 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1165 { 1163
1166 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1164 if (!avail)
1167 n = 0;
1168 } 1165 {
1169 1166 // normally this indicates a "too long" command sequence - just drop the data we have
1170 memmove (cmdbuf_base, cmdbuf_ptr, n);
1171 cmdbuf_ptr = cmdbuf_base; 1167 cmdbuf_ptr = cmdbuf_base;
1172 cmdbuf_endp = cmdbuf_ptr + n; 1168 cmdbuf_endp = cmdbuf_ptr;
1169 avail = CBUFSIZ;
1170 }
1173 1171
1174 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1172 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1175 1173
1176 if (r > 0) 1174 if (r > 0)
1177 { 1175 {
1178 cmdbuf_endp += r; 1176 cmdbuf_endp += r;
1179 return true; 1177 return true;
… …
1253{ 1251{
1254 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1255 int x, y; 1253 int x, y;
1256 int code = 32; 1254 int code = 32;
1257 1255
1258 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x) + 1;
1259 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y) + 1;
1258
1260 if (ev.type == MotionNotify) 1259 if (ev.type == MotionNotify)
1261 { 1260 {
1262 if (x == mouse_row && y == mouse_col) 1261 if (x == mouse_row && y == mouse_col)
1263 return; 1262 return;
1263
1264 mouse_row = x; 1264 mouse_row = x;
1265 mouse_col = y; 1265 mouse_col = y;
1266 code += 32; 1266 code += 32;
1267 } 1267 }
1268 1268
… …
1271 else 1271 else
1272 { 1272 {
1273 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1274 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1275 if (button_number >= 3) 1275 if (button_number >= 3)
1276 button_number += (64 - 3); 1276 button_number += 64 - 3;
1277 } 1277 }
1278 1278
1279 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1280 { 1280 {
1281 /* 1281 /*
… …
1313 fputc ('A', stderr); 1313 fputc ('A', stderr);
1314 if (key_state & 32) 1314 if (key_state & 32)
1315 fputc ('2', stderr); 1315 fputc ('2', stderr);
1316 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1317 button_number, 1317 button_number,
1318 x + 1, 1318 x,
1319 y + 1); 1319 y);
1320#endif 1320#endif
1321 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
1322 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1323 (code + button_number + key_state), 1336 code + button_number + key_state,
1324 (32 + x + 1), 1337 32 + x,
1325 (32 + y + 1)); 1338 32 + y);
1326} 1339}
1327 1340
1328/*{{{ process an X event */ 1341/*{{{ process an X event */
1329void 1342void
1330rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1432 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1433 focus_out (); 1446 focus_out ();
1434 break; 1447 break;
1435 1448
1436 case ConfigureNotify: 1449 case ConfigureNotify:
1437 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1438 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1439 szHint.width, szHint.height);*/
1440 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent)
1441 { 1451 {
1442 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1443 ; 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
1444 1473
1445 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1446 { 1475 {
1447 seen_resize = 1; 1476 seen_resize = 1;
1448 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1449 } 1478 }
1450 else 1479 else
1451 { 1480 {
1452#ifdef HAVE_BG_PIXMAP 1481#ifdef HAVE_BG_PIXMAP
1453 if (bgPixmap.window_position_sensitive ()) 1482 if (moved)
1454 { 1483 {
1455 if (mapped) 1484 if (mapped)
1456 update_background (); 1485 update_background ();
1457 else 1486 else
1458 bgPixmap.invalidate (); 1487 bg_invalidate ();
1459 } 1488 }
1460#endif 1489#endif
1461 } 1490 }
1462 1491
1463 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 } 1493 }
1465 break; 1494 break;
1466 1495
1467 case PropertyNotify: 1496 case PropertyNotify:
1468 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1469 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1470 && ev.xproperty.state == PropertyNewValue)
1471 selection_property (ev.xproperty.window, ev.xproperty.atom);
1472
1473 break; 1498 break;
1474 1499
1475 case SelectionClear: 1500 case SelectionClear:
1476 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1477 break;
1478
1479 case SelectionNotify:
1480 if (selection_wait == Sel_normal)
1481 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1482 break; 1502 break;
1483 1503
1484 case SelectionRequest: 1504 case SelectionRequest:
1485 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1486 break; 1506 break;
… …
1497 * 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
1498 * bit of time for ConfigureNotifies to arrive. 1518 * bit of time for ConfigureNotifies to arrive.
1499 * 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
1500 * of ConfigureNotifys for the best results. 1520 * of ConfigureNotifys for the best results.
1501 */ 1521 */
1502 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1522 if (!(bg_flags & BG_IS_VALID))
1503 update_background_ev.start (0.025); 1523 update_background_ev.start (0.025);
1504#endif 1524#endif
1505 mapped = 1; 1525 mapped = 1;
1506#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1507 text_blink_ev.start (); 1527 text_blink_ev.start ();
… …
1522 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1523 { 1543 {
1524 do 1544 do
1525 { 1545 {
1526 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1527 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1528 } 1548 }
1529 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1530 1550
1531 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1532 1552
1533 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1534 { 1554 {
1535 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1536 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1537 } 1557 }
1538 1558
1539 want_refresh = 1; 1559 want_refresh = 1;
1540 } 1560 }
1541 else 1561 else
… …
1701rxvt_term::set_urgency (bool enable) 1721rxvt_term::set_urgency (bool enable)
1702{ 1722{
1703 if (enable == urgency_hint) 1723 if (enable == urgency_hint)
1704 return; 1724 return;
1705 1725
1706 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1726 if (XWMHints *h = XGetWMHints (dpy, parent))
1707 { 1727 {
1708 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1709 XSetWMHints (dpy, parent[0], h); 1729 XSetWMHints (dpy, parent, h);
1710 urgency_hint = enable; 1730 urgency_hint = enable;
1711 } 1731 }
1712} 1732}
1713#endif 1733#endif
1714 1734
… …
1822 * 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.
1823 */ 1843 */
1824 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1825 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1826 { 1846 {
1827 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1828 update_background (); 1848 update_background ();
1829 } 1849 }
1830 1850
1831 break; 1851 break;
1832 } 1852 }
… …
2665 2685
2666 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
2667 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
2668 { 2688 {
2669 wchar_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
2670 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2671 } 2691 }
2672 break; 2692 break;
2673 2693
2674 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
2675 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
2676 process_graphics (); 2696 // used by original rxvt for rob nations own graphics mode
2697 if (cmd_getc () == 'Q')
2698 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2677 break; 2699 break;
2678 2700
2679 /* 8.3.63: CHARACTER TABULATION SET */ 2701 /* 8.3.63: CHARACTER TABULATION SET */
2680 case C1_HTS: /* ESC H */ 2702 case C1_HTS: /* ESC H */
2681 scr_set_tab (1); 2703 scr_set_tab (1);
… …
2744 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2766 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2745 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2767 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2746 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2768 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2747}; 2769};
2748 2770
2749#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2771#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2750 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2772 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2751 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2773 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2752#define get_byte_array_bit(array, bit) \ 2774#define get_byte_array_bit(array, bit) \
2753 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2775 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2754 2776
2755const unsigned char csi_defaults[] = 2777static const unsigned char csi_defaults[] =
2756 { 2778 {
2757 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2779 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2758 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2780 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2759 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2781 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2760 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2782 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2849 { 2871 {
2850 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2872 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2851 scr_soft_reset (); 2873 scr_soft_reset ();
2852 2874
2853 static const int pm_h[] = { 7, 25 }; 2875 static const int pm_h[] = { 7, 25 };
2854 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2876 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2855 2877
2856 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2878 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2857 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2879 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2858 } 2880 }
2859 break; 2881 break;
2860 } 2882 }
2861 2883
2862 return; 2884 return;
… …
3100 { 3122 {
3101 /* 3123 /*
3102 * commands 3124 * commands
3103 */ 3125 */
3104 case 1: /* deiconify window */ 3126 case 1: /* deiconify window */
3105 XMapWindow (dpy, parent[0]); 3127 XMapWindow (dpy, parent);
3106 break; 3128 break;
3107 case 2: /* iconify window */ 3129 case 2: /* iconify window */
3108 XIconifyWindow (dpy, parent[0], display->screen); 3130 XIconifyWindow (dpy, parent, display->screen);
3109 break; 3131 break;
3110 case 3: /* set position (pixels) */ 3132 case 3: /* set position (pixels) */
3111 XMoveWindow (dpy, parent[0], args[1], args[2]); 3133 XMoveWindow (dpy, parent, args[1], args[2]);
3112 break; 3134 break;
3113 case 4: /* set size (pixels) */ 3135 case 4: /* set size (pixels) */
3114 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3136 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3115 break; 3137 break;
3116 case 5: /* raise window */ 3138 case 5: /* raise window */
3117 XRaiseWindow (dpy, parent[0]); 3139 XRaiseWindow (dpy, parent);
3118 break; 3140 break;
3119 case 6: /* lower window */ 3141 case 6: /* lower window */
3120 XLowerWindow (dpy, parent[0]); 3142 XLowerWindow (dpy, parent);
3121 break; 3143 break;
3122 case 7: /* refresh window */ 3144 case 7: /* refresh window */
3123 scr_touch (true); 3145 scr_touch (true);
3124 break; 3146 break;
3125 case 8: /* set size (chars) */ 3147 case 8: /* set size (chars) */
… …
3136 3158
3137 /* 3159 /*
3138 * reports - some output format copied from XTerm 3160 * reports - some output format copied from XTerm
3139 */ 3161 */
3140 case 11: /* report window state */ 3162 case 11: /* report window state */
3141 XGetWindowAttributes (dpy, parent[0], &wattr); 3163 XGetWindowAttributes (dpy, parent, &wattr);
3142 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3164 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3143 break; 3165 break;
3144 case 13: /* report window position */ 3166 case 13: /* report window position */
3145 XGetWindowAttributes (dpy, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent, &wattr);
3146 XTranslateCoordinates (dpy, parent[0], wattr.root, 3168 XTranslateCoordinates (dpy, parent, wattr.root,
3147 -wattr.border_width, -wattr.border_width, 3169 -wattr.border_width, -wattr.border_width,
3148 &x, &y, &wdummy); 3170 &x, &y, &wdummy);
3149 tt_printf ("\033[3;%d;%dt", x, y); 3171 tt_printf ("\033[3;%d;%dt", x, y);
3150 break; 3172 break;
3151 case 14: /* report window size (pixels) */ 3173 case 14: /* report window size (pixels) */
3152 XGetWindowAttributes (dpy, parent[0], &wattr); 3174 XGetWindowAttributes (dpy, parent, &wattr);
3153 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3175 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3154 break; 3176 break;
3155 case 18: /* report text area size (chars) */ 3177 case 18: /* report text area size (chars) */
3156 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3178 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3157 break; 3179 break;
… …
3159 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3160 break; 3182 break;
3161 case 20: /* report icon label */ 3183 case 20: /* report icon label */
3162 { 3184 {
3163 char *s; 3185 char *s;
3164 XGetIconName (dpy, parent[0], &s); 3186 XGetIconName (dpy, parent, &s);
3165 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3187 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3166 XFree (s); 3188 XFree (s);
3167 } 3189 }
3168 break; 3190 break;
3169 case 21: /* report window title */ 3191 case 21: /* report window title */
3170 { 3192 {
3171 char *s; 3193 char *s;
3172 XFetchName (dpy, parent[0], &s); 3194 XFetchName (dpy, parent, &s);
3173 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3174 XFree (s); 3196 XFree (s);
3175 } 3197 }
3176 break; 3198 break;
3177 } 3199 }
… …
3331 unsigned long bytes_after; 3353 unsigned long bytes_after;
3332 unsigned char *value = 0; 3354 unsigned char *value = 0;
3333 const char *str = ""; 3355 const char *str = "";
3334 3356
3335 if (prop 3357 if (prop
3336 && XGetWindowProperty (dpy, parent[0], 3358 && XGetWindowProperty (dpy, parent,
3337 prop, 0, 1<<16, 0, AnyPropertyType, 3359 prop, 0, 1<<16, 0, AnyPropertyType,
3338 &actual_type, &actual_format, 3360 &actual_type, &actual_format,
3339 &nitems, &bytes_after, &value) == Success 3361 &nitems, &bytes_after, &value) == Success
3340 && actual_type != None 3362 && actual_type != None
3341 && actual_format == 8) 3363 && actual_format == 8)
… …
3353 { 3375 {
3354 *eq = 0; 3376 *eq = 0;
3355 set_utf8_property (display->atom (str), eq + 1); 3377 set_utf8_property (display->atom (str), eq + 1);
3356 } 3378 }
3357 else 3379 else
3358 XDeleteProperty (dpy, parent[0], 3380 XDeleteProperty (dpy, parent,
3359 display->atom (str)); 3381 display->atom (str));
3360 } 3382 }
3361 break; 3383 break;
3362 3384
3363 case XTerm_Color: 3385 case XTerm_Color:
… …
3424 process_color_seq (op, Color_tint, str, resp); 3446 process_color_seq (op, Color_tint, str, resp);
3425 { 3447 {
3426 bool changed = false; 3448 bool changed = false;
3427 3449
3428 if (ISSET_PIXCOLOR (Color_tint)) 3450 if (ISSET_PIXCOLOR (Color_tint))
3429 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3451 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3430 else
3431 changed = bgPixmap.unset_tint ();
3432 3452
3433 if (changed) 3453 if (changed)
3434 update_background (); 3454 update_background ();
3435 } 3455 }
3436 3456
… …
3442 if (!strcmp (str, "?")) 3462 if (!strcmp (str, "?"))
3443 { 3463 {
3444 char str[256]; 3464 char str[256];
3445 3465
3446 sprintf (str, "[%dx%d+%d+%d]", 3466 sprintf (str, "[%dx%d+%d+%d]",
3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3467 min (h_scale, 32767), min (v_scale, 32767),
3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3468 min (h_align, 32767), min (v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST); 3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3450 } 3470 }
3451 else 3471 else
3452 { 3472 {
3453 int changed = 0; 3473 int changed = 0;
3454 3474
3455 if (*str != ';') 3475 if (*str != ';')
3456 { 3476 {
3457 /* reset to default scaling :*/
3458 bgPixmap.unset_geometry ();
3459 if (bgPixmap.set_file (str)) /* change pixmap */ 3477 if (bg_set_file (str)) /* change pixmap */
3478 {
3460 changed++; 3479 changed++;
3461 str = strchr (str, ';'); 3480 str = strchr (str, ';');
3462 if (str == NULL) 3481 if (str == NULL)
3463 bgPixmap.set_defaultGeometry (); 3482 bg_set_default_geometry ();
3483 else
3484 bg_set_geometry (str+1);
3485 }
3464 } 3486 }
3465 3487 else
3466 while (str)
3467 { 3488 {
3468 str++; 3489 str++;
3469 if (bgPixmap.set_geometry (str)) 3490 if (bg_set_geometry (str, true))
3470 changed++; 3491 changed++;
3471 str = strchr (str, ';');
3472 } 3492 }
3473 3493
3474 if (changed) 3494 if (changed)
3495 {
3496 if (bg_window_position_sensitive ())
3497 {
3498 int x, y;
3499 get_window_origin (x, y);
3500 bg_set_position (x, y);
3501 }
3475 update_background (); 3502 update_background ();
3503 }
3476 } 3504 }
3477 break; 3505 break;
3478#endif 3506#endif
3479 3507
3480 case XTerm_logfile: 3508 case XTerm_logfile:
… …
3631 { 67, PrivMode_BackSpace }, // DECBKM 3659 { 67, PrivMode_BackSpace }, // DECBKM
3632#endif 3660#endif
3633 { 1000, PrivMode_MouseX11 }, 3661 { 1000, PrivMode_MouseX11 },
3634 { 1002, PrivMode_MouseBtnEvent }, 3662 { 1002, PrivMode_MouseBtnEvent },
3635 { 1003, PrivMode_MouseAnyEvent }, 3663 { 1003, PrivMode_MouseAnyEvent },
3664#if ENABLE_FRILLS
3665 { 1005, PrivMode_ExtModeMouse },
3666#endif
3636 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3667 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3637 { 1011, PrivMode_Keypress }, // rxvt extension 3668 { 1011, PrivMode_Keypress }, // rxvt extension
3669#if ENABLE_FRILLS
3670 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3671#endif
3638 // 1035 enable modifiers for alt, numlock NYI 3672 // 1035 enable modifiers for alt, numlock NYI
3639 // 1036 send ESC for meta keys NYI 3673 // 1036 send ESC for meta keys NYI
3640 // 1037 send DEL for keypad delete NYI 3674 // 1037 send DEL for keypad delete NYI
3641 { 1047, PrivMode_Screen }, 3675 { 1047, PrivMode_Screen },
3642 // 1048 save and restore cursor 3676 // 1048 save and restore cursor, implemented in code
3643 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3677 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3644 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3678 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3645 { 2004, PrivMode_BracketPaste }, 3679 { 2004, PrivMode_BracketPaste },
3646 }; 3680 };
3647 3681
… …
3657 for (i = 0; i < nargs; i++) 3691 for (i = 0; i < nargs; i++)
3658 { 3692 {
3659 state = -1; 3693 state = -1;
3660 3694
3661 /* basic handling */ 3695 /* basic handling */
3662 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3696 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3663 if (argtopriv[j].argval == arg[i]) 3697 if (argtopriv[j].argval == arg[i])
3664 { 3698 {
3665 state = privcases (mode, argtopriv[j].bit); 3699 state = privcases (mode, argtopriv[j].bit);
3666 break; 3700 break;
3667 } 3701 }
… …
3745 case 1003: 3779 case 1003:
3746 if (state) 3780 if (state)
3747 { 3781 {
3748 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3782 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3749 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3783 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3784 mouse_row = mouse_col = 0;
3750 vt_emask_mouse = PointerMotionMask; 3785 vt_emask_mouse = PointerMotionMask;
3751 } 3786 }
3752 else 3787 else
3753 vt_emask_mouse = NoEventMask; 3788 vt_emask_mouse = NoEventMask;
3754 3789
… …
3939 } 3974 }
3940 } 3975 }
3941} 3976}
3942/*}}} */ 3977/*}}} */
3943 3978
3944/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3945void
3946rxvt_term::process_graphics ()
3947{
3948 unicode_t ch, cmd = cmd_getc ();
3949
3950 if (cmd == 'Q')
3951 {
3952 /* query graphics */
3953 tt_printf ("\033G0\012"); /* no graphics */
3954 return;
3955 }
3956 /* swallow other graphics sequences until terminating ':' */
3957 do
3958 ch = cmd_getc ();
3959 while (ch != ':');
3960}
3961/*}}} */
3962
3963/* ------------------------------------------------------------------------- */ 3979/* ------------------------------------------------------------------------- */
3964 3980
3965/* 3981/*
3966 * Send printf () formatted output to the command. 3982 * Send printf () formatted output to the command.
3967 * Only use for small amounts of data. 3983 * Only use for small amounts of data.
… …
3980 3996
3981/* ---------------------------------------------------------------------- */ 3997/* ---------------------------------------------------------------------- */
3982/* Write data to the pty as typed by the user, pasted with the mouse, 3998/* Write data to the pty as typed by the user, pasted with the mouse,
3983 * or generated by us in response to a query ESC sequence. 3999 * or generated by us in response to a query ESC sequence.
3984 */ 4000 */
3985const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4001static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3986 4002
3987void 4003void
3988rxvt_term::tt_write (const char *data, unsigned int len) 4004rxvt_term::tt_write (const char *data, unsigned int len)
3989{ 4005{
3990 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4006 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3995 4011
3996 if (v_buflen == 0) 4012 if (v_buflen == 0)
3997 { 4013 {
3998 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4014 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3999 4015
4016 max_it (written, 0);
4017
4000 if ((unsigned int)written == len) 4018 if (written == len)
4001 return; 4019 return;
4002 4020
4003 data += written; 4021 data += written;
4004 len -= written; 4022 len -= written;
4005 } 4023 }
4006 4024
4007 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4025 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4008 4026
4009 memcpy (v_buffer + v_buflen, data, len); 4027 memcpy (v_buffer + v_buflen, data, len);
4010 v_buflen += len; 4028 v_buflen += len;
4011 4029
4012 pty_ev.set (ev::READ | ev::WRITE); 4030 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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