ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.460 by sf-exg, Fri Nov 19 23:29:30 2010 UTC vs.
Revision 1.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
… …
889 commit_iso14755 (); 889 commit_iso14755 ();
890 890
891 return; 891 return;
892 } 892 }
893 893
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 895 if (i[0] == keysym)
896 { 896 {
897 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 898 commit_iso14755 ();
899 899
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
938#endif 938#endif
939} 939}
940 940
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 941void
975rxvt_term::flush () 942rxvt_term::flush ()
976{ 943{
977 flush_ev.stop (); 944 flush_ev.stop ();
978 945
979#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_BG_PIXMAP
980 if (bgPixmap.flags & bgPixmap_t::hasChanged) 947 if (bg_flags & BG_NEEDS_REFRESH)
981 { 948 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 949 bg_flags &= ~BG_NEEDS_REFRESH;
983// scr_clear (true); This needs to be researched further!
984 scr_touch (false); 950 scr_touch (false);
985 } 951 }
986#endif 952#endif
987 953
988 if (want_refresh) 954 if (want_refresh)
… …
1153 { 1119 {
1154 } 1120 }
1155} event_handler; 1121} event_handler;
1156#endif 1122#endif
1157 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
1158bool 1157bool
1159rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1160{ 1159{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 cmdbuf_reify ();
1162 1161
1163 if (CBUFSIZ == n) 1162 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1163
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1164 if (!avail)
1166 n = 0;
1167 } 1165 {
1168 1166 // 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; 1167 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1168 cmdbuf_endp = cmdbuf_ptr;
1169 avail = CBUFSIZ;
1170 }
1172 1171
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1172 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1173
1175 if (r > 0) 1174 if (r > 0)
1176 { 1175 {
1177 cmdbuf_endp += r; 1176 cmdbuf_endp += r;
1178 return true; 1177 return true;
… …
1252{ 1251{
1253 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1254 int x, y; 1253 int x, y;
1255 int code = 32; 1254 int code = 32;
1256 1255
1257 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x) + 1;
1258 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y) + 1;
1258
1259 if (ev.type == MotionNotify) 1259 if (ev.type == MotionNotify)
1260 { 1260 {
1261 if (x == mouse_row && y == mouse_col) 1261 if (x == mouse_row && y == mouse_col)
1262 return; 1262 return;
1263
1263 mouse_row = x; 1264 mouse_row = x;
1264 mouse_col = y; 1265 mouse_col = y;
1265 code += 32; 1266 code += 32;
1266 } 1267 }
1267 1268
… …
1270 else 1271 else
1271 { 1272 {
1272 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1273 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1274 if (button_number >= 3) 1275 if (button_number >= 3)
1275 button_number += (64 - 3); 1276 button_number += 64 - 3;
1276 } 1277 }
1277 1278
1278 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1279 { 1280 {
1280 /* 1281 /*
… …
1312 fputc ('A', stderr); 1313 fputc ('A', stderr);
1313 if (key_state & 32) 1314 if (key_state & 32)
1314 fputc ('2', stderr); 1315 fputc ('2', stderr);
1315 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1316 button_number, 1317 button_number,
1317 x + 1, 1318 x,
1318 y + 1); 1319 y);
1319#endif 1320#endif
1320 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
1321 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1322 (code + button_number + key_state), 1336 code + button_number + key_state,
1323 (32 + x + 1), 1337 32 + x,
1324 (32 + y + 1)); 1338 32 + y);
1325} 1339}
1326 1340
1327/*{{{ process an X event */ 1341/*{{{ process an X event */
1328void 1342void
1329rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1431 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1432 focus_out (); 1446 focus_out ();
1433 break; 1447 break;
1434 1448
1435 case ConfigureNotify: 1449 case ConfigureNotify:
1436 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent)
1437 { 1451 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1453 ;
1440 1454
1441#ifdef HAVE_BG_PIXMAP 1455#ifdef HAVE_BG_PIXMAP
1442 bool moved = false; 1456 bool moved = false;
1443 if (bgPixmap.window_position_sensitive ()) 1457 if (bg_window_position_sensitive ())
1444 { 1458 {
1445 int x, y; 1459 int x, y;
1446 if (ev.xconfigure.send_event) 1460 if (ev.xconfigure.send_event)
1447 { 1461 {
1448 x = ev.xconfigure.x; 1462 x = ev.xconfigure.x;
1449 y = ev.xconfigure.y; 1463 y = ev.xconfigure.y;
1450 } 1464 }
1451 else 1465 else
1452 get_window_origin (x, y); 1466 get_window_origin (x, y);
1453 1467
1454 if (bgPixmap.set_position (x, y) 1468 if (bg_set_position (x, y)
1455 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1469 || !(bg_flags & BG_IS_VALID))
1456 moved = true; 1470 moved = true;
1457 } 1471 }
1458#endif 1472#endif
1459 1473
1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
… …
1468 if (moved) 1482 if (moved)
1469 { 1483 {
1470 if (mapped) 1484 if (mapped)
1471 update_background (); 1485 update_background ();
1472 else 1486 else
1473 bgPixmap.invalidate (); 1487 bg_invalidate ();
1474 } 1488 }
1475#endif 1489#endif
1476 } 1490 }
1477 1491
1478 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1479 } 1493 }
1480 break; 1494 break;
1481 1495
1482 case PropertyNotify: 1496 case PropertyNotify:
1483 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1485 && ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487
1488 break; 1498 break;
1489 1499
1490 case SelectionClear: 1500 case SelectionClear:
1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1492 break;
1493
1494 case SelectionNotify:
1495 if (selection_wait == Sel_normal)
1496 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1497 break; 1502 break;
1498 1503
1499 case SelectionRequest: 1504 case SelectionRequest:
1500 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1501 break; 1506 break;
… …
1512 * 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
1513 * bit of time for ConfigureNotifies to arrive. 1518 * bit of time for ConfigureNotifies to arrive.
1514 * 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
1515 * of ConfigureNotifys for the best results. 1520 * of ConfigureNotifys for the best results.
1516 */ 1521 */
1517 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1522 if (!(bg_flags & BG_IS_VALID))
1518 update_background_ev.start (0.025); 1523 update_background_ev.start (0.025);
1519#endif 1524#endif
1520 mapped = 1; 1525 mapped = 1;
1521#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1522 text_blink_ev.start (); 1527 text_blink_ev.start ();
… …
1537 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1538 { 1543 {
1539 do 1544 do
1540 { 1545 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1543 } 1548 }
1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1545 1550
1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1547 1552
1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1549 { 1554 {
1550 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1551 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1552 } 1557 }
1553 1558
1554 want_refresh = 1; 1559 want_refresh = 1;
1555 } 1560 }
1556 else 1561 else
… …
1716rxvt_term::set_urgency (bool enable) 1721rxvt_term::set_urgency (bool enable)
1717{ 1722{
1718 if (enable == urgency_hint) 1723 if (enable == urgency_hint)
1719 return; 1724 return;
1720 1725
1721 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1726 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 { 1727 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent[0], h); 1729 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable; 1730 urgency_hint = enable;
1726 } 1731 }
1727} 1732}
1728#endif 1733#endif
1729 1734
… …
1837 * 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.
1838 */ 1843 */
1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 { 1846 {
1842 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1843 update_background (); 1848 update_background ();
1844 } 1849 }
1845 1850
1846 break; 1851 break;
1847 } 1852 }
… …
2680 2685
2681 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
2682 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
2683 { 2688 {
2684 wchar_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
2685 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2686 } 2691 }
2687 break; 2692 break;
2688 2693
2689 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
2690 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
2691 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 */
2692 break; 2699 break;
2693 2700
2694 /* 8.3.63: CHARACTER TABULATION SET */ 2701 /* 8.3.63: CHARACTER TABULATION SET */
2695 case C1_HTS: /* ESC H */ 2702 case C1_HTS: /* ESC H */
2696 scr_set_tab (1); 2703 scr_set_tab (1);
… …
2759 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,
2760 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 ,
2761 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
2762}; 2769};
2763 2770
2764#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2771#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2772 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2773 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2767#define get_byte_array_bit(array, bit) \ 2774#define get_byte_array_bit(array, bit) \
2768 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2775 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2769 2776
2770const unsigned char csi_defaults[] = 2777static const unsigned char csi_defaults[] =
2771 { 2778 {
2772 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, */
2773 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, */
2774 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, */
2775 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, [, \, ], ^, _, */
… …
2864 { 2871 {
2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2872 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2866 scr_soft_reset (); 2873 scr_soft_reset ();
2867 2874
2868 static const int pm_h[] = { 7, 25 }; 2875 static const int pm_h[] = { 7, 25 };
2869 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 };
2870 2877
2871 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);
2872 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);
2873 } 2880 }
2874 break; 2881 break;
2875 } 2882 }
2876 2883
2877 return; 2884 return;
… …
3115 { 3122 {
3116 /* 3123 /*
3117 * commands 3124 * commands
3118 */ 3125 */
3119 case 1: /* deiconify window */ 3126 case 1: /* deiconify window */
3120 XMapWindow (dpy, parent[0]); 3127 XMapWindow (dpy, parent);
3121 break; 3128 break;
3122 case 2: /* iconify window */ 3129 case 2: /* iconify window */
3123 XIconifyWindow (dpy, parent[0], display->screen); 3130 XIconifyWindow (dpy, parent, display->screen);
3124 break; 3131 break;
3125 case 3: /* set position (pixels) */ 3132 case 3: /* set position (pixels) */
3126 XMoveWindow (dpy, parent[0], args[1], args[2]); 3133 XMoveWindow (dpy, parent, args[1], args[2]);
3127 break; 3134 break;
3128 case 4: /* set size (pixels) */ 3135 case 4: /* set size (pixels) */
3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3136 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3130 break; 3137 break;
3131 case 5: /* raise window */ 3138 case 5: /* raise window */
3132 XRaiseWindow (dpy, parent[0]); 3139 XRaiseWindow (dpy, parent);
3133 break; 3140 break;
3134 case 6: /* lower window */ 3141 case 6: /* lower window */
3135 XLowerWindow (dpy, parent[0]); 3142 XLowerWindow (dpy, parent);
3136 break; 3143 break;
3137 case 7: /* refresh window */ 3144 case 7: /* refresh window */
3138 scr_touch (true); 3145 scr_touch (true);
3139 break; 3146 break;
3140 case 8: /* set size (chars) */ 3147 case 8: /* set size (chars) */
… …
3151 3158
3152 /* 3159 /*
3153 * reports - some output format copied from XTerm 3160 * reports - some output format copied from XTerm
3154 */ 3161 */
3155 case 11: /* report window state */ 3162 case 11: /* report window state */
3156 XGetWindowAttributes (dpy, parent[0], &wattr); 3163 XGetWindowAttributes (dpy, parent, &wattr);
3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3164 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3158 break; 3165 break;
3159 case 13: /* report window position */ 3166 case 13: /* report window position */
3160 XGetWindowAttributes (dpy, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent, &wattr);
3161 XTranslateCoordinates (dpy, parent[0], wattr.root, 3168 XTranslateCoordinates (dpy, parent, wattr.root,
3162 -wattr.border_width, -wattr.border_width, 3169 -wattr.border_width, -wattr.border_width,
3163 &x, &y, &wdummy); 3170 &x, &y, &wdummy);
3164 tt_printf ("\033[3;%d;%dt", x, y); 3171 tt_printf ("\033[3;%d;%dt", x, y);
3165 break; 3172 break;
3166 case 14: /* report window size (pixels) */ 3173 case 14: /* report window size (pixels) */
3167 XGetWindowAttributes (dpy, parent[0], &wattr); 3174 XGetWindowAttributes (dpy, parent, &wattr);
3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3175 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3169 break; 3176 break;
3170 case 18: /* report text area size (chars) */ 3177 case 18: /* report text area size (chars) */
3171 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3178 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3172 break; 3179 break;
… …
3174 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3175 break; 3182 break;
3176 case 20: /* report icon label */ 3183 case 20: /* report icon label */
3177 { 3184 {
3178 char *s; 3185 char *s;
3179 XGetIconName (dpy, parent[0], &s); 3186 XGetIconName (dpy, parent, &s);
3180 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 */
3181 XFree (s); 3188 XFree (s);
3182 } 3189 }
3183 break; 3190 break;
3184 case 21: /* report window title */ 3191 case 21: /* report window title */
3185 { 3192 {
3186 char *s; 3193 char *s;
3187 XFetchName (dpy, parent[0], &s); 3194 XFetchName (dpy, parent, &s);
3188 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 */
3189 XFree (s); 3196 XFree (s);
3190 } 3197 }
3191 break; 3198 break;
3192 } 3199 }
… …
3346 unsigned long bytes_after; 3353 unsigned long bytes_after;
3347 unsigned char *value = 0; 3354 unsigned char *value = 0;
3348 const char *str = ""; 3355 const char *str = "";
3349 3356
3350 if (prop 3357 if (prop
3351 && XGetWindowProperty (dpy, parent[0], 3358 && XGetWindowProperty (dpy, parent,
3352 prop, 0, 1<<16, 0, AnyPropertyType, 3359 prop, 0, 1<<16, 0, AnyPropertyType,
3353 &actual_type, &actual_format, 3360 &actual_type, &actual_format,
3354 &nitems, &bytes_after, &value) == Success 3361 &nitems, &bytes_after, &value) == Success
3355 && actual_type != None 3362 && actual_type != None
3356 && actual_format == 8) 3363 && actual_format == 8)
… …
3368 { 3375 {
3369 *eq = 0; 3376 *eq = 0;
3370 set_utf8_property (display->atom (str), eq + 1); 3377 set_utf8_property (display->atom (str), eq + 1);
3371 } 3378 }
3372 else 3379 else
3373 XDeleteProperty (dpy, parent[0], 3380 XDeleteProperty (dpy, parent,
3374 display->atom (str)); 3381 display->atom (str));
3375 } 3382 }
3376 break; 3383 break;
3377 3384
3378 case XTerm_Color: 3385 case XTerm_Color:
… …
3439 process_color_seq (op, Color_tint, str, resp); 3446 process_color_seq (op, Color_tint, str, resp);
3440 { 3447 {
3441 bool changed = false; 3448 bool changed = false;
3442 3449
3443 if (ISSET_PIXCOLOR (Color_tint)) 3450 if (ISSET_PIXCOLOR (Color_tint))
3444 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3451 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3445 else
3446 changed = bgPixmap.unset_tint ();
3447 3452
3448 if (changed) 3453 if (changed)
3449 update_background (); 3454 update_background ();
3450 } 3455 }
3451 3456
… …
3457 if (!strcmp (str, "?")) 3462 if (!strcmp (str, "?"))
3458 { 3463 {
3459 char str[256]; 3464 char str[256];
3460 3465
3461 sprintf (str, "[%dx%d+%d+%d]", 3466 sprintf (str, "[%dx%d+%d+%d]",
3462 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3467 min (h_scale, 32767), min (v_scale, 32767),
3463 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3468 min (h_align, 32767), min (v_align, 32767));
3464 process_xterm_seq (XTerm_title, str, CHAR_ST); 3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3465 } 3470 }
3466 else 3471 else
3467 { 3472 {
3468 int changed = 0; 3473 int changed = 0;
3469 3474
3470 if (*str != ';') 3475 if (*str != ';')
3471 { 3476 {
3472 if (bgPixmap.set_file (str)) /* change pixmap */ 3477 if (bg_set_file (str)) /* change pixmap */
3473 { 3478 {
3474 changed++; 3479 changed++;
3475 str = strchr (str, ';'); 3480 str = strchr (str, ';');
3476 if (str == NULL) 3481 if (str == NULL)
3477 bgPixmap.set_defaultGeometry (); 3482 bg_set_default_geometry ();
3478 else 3483 else
3479 bgPixmap.set_geometry (str+1); 3484 bg_set_geometry (str+1);
3480 } 3485 }
3481 } 3486 }
3482 else 3487 else
3483 { 3488 {
3484 str++; 3489 str++;
3485 if (bgPixmap.set_geometry (str, true)) 3490 if (bg_set_geometry (str, true))
3486 changed++; 3491 changed++;
3487 } 3492 }
3488 3493
3489 if (changed) 3494 if (changed)
3490 { 3495 {
3491 if (bgPixmap.window_position_sensitive ()) 3496 if (bg_window_position_sensitive ())
3492 { 3497 {
3493 int x, y; 3498 int x, y;
3494 get_window_origin (x, y); 3499 get_window_origin (x, y);
3495 bgPixmap.set_position (x, y); 3500 bg_set_position (x, y);
3496 } 3501 }
3497 update_background (); 3502 update_background ();
3498 } 3503 }
3499 } 3504 }
3500 break; 3505 break;
… …
3654 { 67, PrivMode_BackSpace }, // DECBKM 3659 { 67, PrivMode_BackSpace }, // DECBKM
3655#endif 3660#endif
3656 { 1000, PrivMode_MouseX11 }, 3661 { 1000, PrivMode_MouseX11 },
3657 { 1002, PrivMode_MouseBtnEvent }, 3662 { 1002, PrivMode_MouseBtnEvent },
3658 { 1003, PrivMode_MouseAnyEvent }, 3663 { 1003, PrivMode_MouseAnyEvent },
3664#if ENABLE_FRILLS
3665 { 1005, PrivMode_ExtModeMouse },
3666#endif
3659 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3667 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3660 { 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
3661 // 1035 enable modifiers for alt, numlock NYI 3672 // 1035 enable modifiers for alt, numlock NYI
3662 // 1036 send ESC for meta keys NYI 3673 // 1036 send ESC for meta keys NYI
3663 // 1037 send DEL for keypad delete NYI 3674 // 1037 send DEL for keypad delete NYI
3664 { 1047, PrivMode_Screen }, 3675 { 1047, PrivMode_Screen },
3665 // 1048 save and restore cursor 3676 // 1048 save and restore cursor, implemented in code
3666 { 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 */
3667 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3678 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3668 { 2004, PrivMode_BracketPaste }, 3679 { 2004, PrivMode_BracketPaste },
3669 }; 3680 };
3670 3681
… …
3680 for (i = 0; i < nargs; i++) 3691 for (i = 0; i < nargs; i++)
3681 { 3692 {
3682 state = -1; 3693 state = -1;
3683 3694
3684 /* basic handling */ 3695 /* basic handling */
3685 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3696 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3686 if (argtopriv[j].argval == arg[i]) 3697 if (argtopriv[j].argval == arg[i])
3687 { 3698 {
3688 state = privcases (mode, argtopriv[j].bit); 3699 state = privcases (mode, argtopriv[j].bit);
3689 break; 3700 break;
3690 } 3701 }
… …
3768 case 1003: 3779 case 1003:
3769 if (state) 3780 if (state)
3770 { 3781 {
3771 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3782 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3772 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;
3773 vt_emask_mouse = PointerMotionMask; 3785 vt_emask_mouse = PointerMotionMask;
3774 } 3786 }
3775 else 3787 else
3776 vt_emask_mouse = NoEventMask; 3788 vt_emask_mouse = NoEventMask;
3777 3789
… …
3962 } 3974 }
3963 } 3975 }
3964} 3976}
3965/*}}} */ 3977/*}}} */
3966 3978
3967/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3968void
3969rxvt_term::process_graphics ()
3970{
3971 unicode_t ch, cmd = cmd_getc ();
3972
3973 if (cmd == 'Q')
3974 {
3975 /* query graphics */
3976 tt_printf ("\033G0\012"); /* no graphics */
3977 return;
3978 }
3979 /* swallow other graphics sequences until terminating ':' */
3980 do
3981 ch = cmd_getc ();
3982 while (ch != ':');
3983}
3984/*}}} */
3985
3986/* ------------------------------------------------------------------------- */ 3979/* ------------------------------------------------------------------------- */
3987 3980
3988/* 3981/*
3989 * Send printf () formatted output to the command. 3982 * Send printf () formatted output to the command.
3990 * Only use for small amounts of data. 3983 * Only use for small amounts of data.
… …
4003 3996
4004/* ---------------------------------------------------------------------- */ 3997/* ---------------------------------------------------------------------- */
4005/* 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,
4006 * or generated by us in response to a query ESC sequence. 3999 * or generated by us in response to a query ESC sequence.
4007 */ 4000 */
4008const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4001static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4009 4002
4010void 4003void
4011rxvt_term::tt_write (const char *data, unsigned int len) 4004rxvt_term::tt_write (const char *data, unsigned int len)
4012{ 4005{
4013 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)))
… …
4018 4011
4019 if (v_buflen == 0) 4012 if (v_buflen == 0)
4020 { 4013 {
4021 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));
4022 4015
4016 max_it (written, 0);
4017
4023 if ((unsigned int)written == len) 4018 if (written == len)
4024 return; 4019 return;
4025 4020
4026 data += written; 4021 data += written;
4027 len -= written; 4022 len -= written;
4028 } 4023 }
4029 4024
4030 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4025 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4031 4026
4032 memcpy (v_buffer + v_buflen, data, len); 4027 memcpy (v_buffer + v_buflen, data, len);
4033 v_buflen += len; 4028 v_buflen += len;
4034 4029
4035 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