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.455 by sf-exg, Sun Aug 22 09:36:33 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.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
981 { 948 {
982// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
983 scr_touch (false); 950 scr_touch (false);
984 } 951 }
985#endif 952#endif
986 953
987 if (want_refresh) 954 if (want_refresh)
… …
1152 { 1119 {
1153 } 1120 }
1154} event_handler; 1121} event_handler;
1155#endif 1122#endif
1156 1123
1124/* make sure all the cmd data is at beginning of cmdbuf */
1125void
1126rxvt_term::cmdbuf_reify ()
1127{
1128 if (cmdbuf_ptr == cmdbuf_base)
1129 return;
1130
1131 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1132
1133 memmove (cmdbuf_base, cmdbuf_ptr, used);
1134 cmdbuf_ptr = cmdbuf_base;
1135 cmdbuf_endp = cmdbuf_ptr + used;
1136
1137}
1138
1139#if defined (KEYSYM_RESOURCE)
1140void
1141rxvt_term::cmdbuf_append (const char *str, size_t count)
1142{
1143 cmdbuf_reify ();
1144
1145 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1146
1147 if (count > avail)
1148 return;
1149
1150 memcpy (cmdbuf_endp, str, count);
1151 cmdbuf_endp += count;
1152
1153 cmd_parse ();
1154}
1155#endif
1156
1157bool 1157bool
1158rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1159{ 1159{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 cmdbuf_reify ();
1161 1161
1162 if (CBUFSIZ == n) 1162 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1163 { 1163
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1164 if (!avail)
1165 n = 0;
1166 } 1165 {
1167 1166 // normally this indicates a "too long" command sequence - just drop the data we have
1168 memmove (cmdbuf_base, cmdbuf_ptr, n);
1169 cmdbuf_ptr = cmdbuf_base; 1167 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1168 cmdbuf_endp = cmdbuf_ptr;
1169 avail = CBUFSIZ;
1170 }
1171 1171
1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1172 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173 1173
1174 if (r > 0) 1174 if (r > 0)
1175 { 1175 {
1176 cmdbuf_endp += r; 1176 cmdbuf_endp += r;
1177 return true; 1177 return true;
… …
1251{ 1251{
1252 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1253 int x, y; 1253 int x, y;
1254 int code = 32; 1254 int code = 32;
1255 1255
1256 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y) + 1;
1258
1258 if (ev.type == MotionNotify) 1259 if (ev.type == MotionNotify)
1259 { 1260 {
1260 if (x == mouse_row && y == mouse_col) 1261 if (x == mouse_row && y == mouse_col)
1261 return; 1262 return;
1263
1262 mouse_row = x; 1264 mouse_row = x;
1263 mouse_col = y; 1265 mouse_col = y;
1264 code += 32; 1266 code += 32;
1265 } 1267 }
1266 1268
… …
1269 else 1271 else
1270 { 1272 {
1271 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1275 if (button_number >= 3)
1274 button_number += (64 - 3); 1276 button_number += 64 - 3;
1275 } 1277 }
1276 1278
1277 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1278 { 1280 {
1279 /* 1281 /*
… …
1311 fputc ('A', stderr); 1313 fputc ('A', stderr);
1312 if (key_state & 32) 1314 if (key_state & 32)
1313 fputc ('2', stderr); 1315 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1317 button_number,
1316 x + 1, 1318 x,
1317 y + 1); 1319 y);
1318#endif 1320#endif
1319 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1320 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1336 code + button_number + key_state,
1322 (32 + x + 1), 1337 32 + x,
1323 (32 + y + 1)); 1338 32 + y);
1324} 1339}
1325 1340
1326/*{{{ process an X event */ 1341/*{{{ process an X event */
1327void 1342void
1328rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1430 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1446 focus_out ();
1432 break; 1447 break;
1433 1448
1434 case ConfigureNotify: 1449 case ConfigureNotify:
1435 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height);*/
1438 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent)
1439 { 1451 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1453 ;
1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bg_set_position (x, y)
1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true;
1471 }
1472#endif
1442 1473
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1475 {
1445 seen_resize = 1; 1476 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1478 }
1448 else 1479 else
1449 { 1480 {
1450#ifdef HAVE_BG_PIXMAP 1481#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1482 if (moved)
1452 { 1483 {
1453 if (mapped) 1484 if (mapped)
1454 update_background (); 1485 update_background ();
1455 else 1486 else
1456 bgPixmap.invalidate (); 1487 bg_invalidate ();
1457 } 1488 }
1458#endif 1489#endif
1459 } 1490 }
1460 1491
1461 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1462 } 1493 }
1463 break; 1494 break;
1464 1495
1465 case PropertyNotify: 1496 case PropertyNotify:
1466 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1468 && ev.xproperty.state == PropertyNewValue)
1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1470
1471 break; 1498 break;
1472 1499
1473 case SelectionClear: 1500 case SelectionClear:
1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1475 break;
1476
1477 case SelectionNotify:
1478 if (selection_wait == Sel_normal)
1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 break; 1502 break;
1481 1503
1482 case SelectionRequest: 1504 case SelectionRequest:
1483 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1484 break; 1506 break;
… …
1495 * by scheduling background redraw as soon as we can, but giving a short 1517 * by scheduling background redraw as soon as we can, but giving a short
1496 * bit of time for ConfigureNotifies to arrive. 1518 * bit of time for ConfigureNotifies to arrive.
1497 * We should render background PRIOR to drawing any text, but AFTER all 1519 * We should render background PRIOR to drawing any text, but AFTER all
1498 * of ConfigureNotifys for the best results. 1520 * of ConfigureNotifys for the best results.
1499 */ 1521 */
1500 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1522 if (!(bg_flags & BG_IS_VALID))
1501 update_background_ev.start (0.025); 1523 update_background_ev.start (0.025);
1502#endif 1524#endif
1503 mapped = 1; 1525 mapped = 1;
1504#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1505 text_blink_ev.start (); 1527 text_blink_ev.start ();
… …
1520 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1521 { 1543 {
1522 do 1544 do
1523 { 1545 {
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1526 } 1548 }
1527 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1528 1550
1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1530 1552
1531 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1532 { 1554 {
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1535 } 1557 }
1536 1558
1537 want_refresh = 1; 1559 want_refresh = 1;
1538 } 1560 }
1539 else 1561 else
… …
1699rxvt_term::set_urgency (bool enable) 1721rxvt_term::set_urgency (bool enable)
1700{ 1722{
1701 if (enable == urgency_hint) 1723 if (enable == urgency_hint)
1702 return; 1724 return;
1703 1725
1704 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1726 if (XWMHints *h = XGetWMHints (dpy, parent))
1705 { 1727 {
1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1707 XSetWMHints (dpy, parent[0], h); 1729 XSetWMHints (dpy, parent, h);
1708 urgency_hint = enable; 1730 urgency_hint = enable;
1709 } 1731 }
1710} 1732}
1711#endif 1733#endif
1712 1734
… …
1820 * use the property to determine the pixmap. We use it later on. 1842 * use the property to determine the pixmap. We use it later on.
1821 */ 1843 */
1822 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1823 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1824 { 1846 {
1825 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1826 update_background (); 1848 update_background ();
1827 } 1849 }
1828 1850
1829 break; 1851 break;
1830 } 1852 }
… …
2663 2685
2664 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
2665 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
2666 { 2688 {
2667 wchar_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
2668 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2669 } 2691 }
2670 break; 2692 break;
2671 2693
2672 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
2673 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
2674 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 */
2675 break; 2699 break;
2676 2700
2677 /* 8.3.63: CHARACTER TABULATION SET */ 2701 /* 8.3.63: CHARACTER TABULATION SET */
2678 case C1_HTS: /* ESC H */ 2702 case C1_HTS: /* ESC H */
2679 scr_set_tab (1); 2703 scr_set_tab (1);
… …
2742 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,
2743 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 ,
2744 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
2745}; 2769};
2746 2770
2747#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2771#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2748 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2772 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2749 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2773 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2750#define get_byte_array_bit(array, bit) \ 2774#define get_byte_array_bit(array, bit) \
2751 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2775 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2752 2776
2753const unsigned char csi_defaults[] = 2777static const unsigned char csi_defaults[] =
2754 { 2778 {
2755 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, */
2756 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, */
2757 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, */
2758 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, [, \, ], ^, _, */
… …
2847 { 2871 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2872 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset (); 2873 scr_soft_reset ();
2850 2874
2851 static const int pm_h[] = { 7, 25 }; 2875 static const int pm_h[] = { 7, 25 };
2852 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 };
2853 2877
2854 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);
2855 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);
2856 } 2880 }
2857 break; 2881 break;
2858 } 2882 }
2859 2883
2860 return; 2884 return;
… …
3098 { 3122 {
3099 /* 3123 /*
3100 * commands 3124 * commands
3101 */ 3125 */
3102 case 1: /* deiconify window */ 3126 case 1: /* deiconify window */
3103 XMapWindow (dpy, parent[0]); 3127 XMapWindow (dpy, parent);
3104 break; 3128 break;
3105 case 2: /* iconify window */ 3129 case 2: /* iconify window */
3106 XIconifyWindow (dpy, parent[0], display->screen); 3130 XIconifyWindow (dpy, parent, display->screen);
3107 break; 3131 break;
3108 case 3: /* set position (pixels) */ 3132 case 3: /* set position (pixels) */
3109 XMoveWindow (dpy, parent[0], args[1], args[2]); 3133 XMoveWindow (dpy, parent, args[1], args[2]);
3110 break; 3134 break;
3111 case 4: /* set size (pixels) */ 3135 case 4: /* set size (pixels) */
3112 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3136 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3113 break; 3137 break;
3114 case 5: /* raise window */ 3138 case 5: /* raise window */
3115 XRaiseWindow (dpy, parent[0]); 3139 XRaiseWindow (dpy, parent);
3116 break; 3140 break;
3117 case 6: /* lower window */ 3141 case 6: /* lower window */
3118 XLowerWindow (dpy, parent[0]); 3142 XLowerWindow (dpy, parent);
3119 break; 3143 break;
3120 case 7: /* refresh window */ 3144 case 7: /* refresh window */
3121 scr_touch (true); 3145 scr_touch (true);
3122 break; 3146 break;
3123 case 8: /* set size (chars) */ 3147 case 8: /* set size (chars) */
… …
3134 3158
3135 /* 3159 /*
3136 * reports - some output format copied from XTerm 3160 * reports - some output format copied from XTerm
3137 */ 3161 */
3138 case 11: /* report window state */ 3162 case 11: /* report window state */
3139 XGetWindowAttributes (dpy, parent[0], &wattr); 3163 XGetWindowAttributes (dpy, parent, &wattr);
3140 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3164 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3141 break; 3165 break;
3142 case 13: /* report window position */ 3166 case 13: /* report window position */
3143 XGetWindowAttributes (dpy, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent, &wattr);
3144 XTranslateCoordinates (dpy, parent[0], wattr.root, 3168 XTranslateCoordinates (dpy, parent, wattr.root,
3145 -wattr.border_width, -wattr.border_width, 3169 -wattr.border_width, -wattr.border_width,
3146 &x, &y, &wdummy); 3170 &x, &y, &wdummy);
3147 tt_printf ("\033[3;%d;%dt", x, y); 3171 tt_printf ("\033[3;%d;%dt", x, y);
3148 break; 3172 break;
3149 case 14: /* report window size (pixels) */ 3173 case 14: /* report window size (pixels) */
3150 XGetWindowAttributes (dpy, parent[0], &wattr); 3174 XGetWindowAttributes (dpy, parent, &wattr);
3151 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3175 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3152 break; 3176 break;
3153 case 18: /* report text area size (chars) */ 3177 case 18: /* report text area size (chars) */
3154 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3178 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3155 break; 3179 break;
… …
3157 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3158 break; 3182 break;
3159 case 20: /* report icon label */ 3183 case 20: /* report icon label */
3160 { 3184 {
3161 char *s; 3185 char *s;
3162 XGetIconName (dpy, parent[0], &s); 3186 XGetIconName (dpy, parent, &s);
3163 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 */
3164 XFree (s); 3188 XFree (s);
3165 } 3189 }
3166 break; 3190 break;
3167 case 21: /* report window title */ 3191 case 21: /* report window title */
3168 { 3192 {
3169 char *s; 3193 char *s;
3170 XFetchName (dpy, parent[0], &s); 3194 XFetchName (dpy, parent, &s);
3171 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 */
3172 XFree (s); 3196 XFree (s);
3173 } 3197 }
3174 break; 3198 break;
3175 } 3199 }
… …
3329 unsigned long bytes_after; 3353 unsigned long bytes_after;
3330 unsigned char *value = 0; 3354 unsigned char *value = 0;
3331 const char *str = ""; 3355 const char *str = "";
3332 3356
3333 if (prop 3357 if (prop
3334 && XGetWindowProperty (dpy, parent[0], 3358 && XGetWindowProperty (dpy, parent,
3335 prop, 0, 1<<16, 0, AnyPropertyType, 3359 prop, 0, 1<<16, 0, AnyPropertyType,
3336 &actual_type, &actual_format, 3360 &actual_type, &actual_format,
3337 &nitems, &bytes_after, &value) == Success 3361 &nitems, &bytes_after, &value) == Success
3338 && actual_type != None 3362 && actual_type != None
3339 && actual_format == 8) 3363 && actual_format == 8)
… …
3351 { 3375 {
3352 *eq = 0; 3376 *eq = 0;
3353 set_utf8_property (display->atom (str), eq + 1); 3377 set_utf8_property (display->atom (str), eq + 1);
3354 } 3378 }
3355 else 3379 else
3356 XDeleteProperty (dpy, parent[0], 3380 XDeleteProperty (dpy, parent,
3357 display->atom (str)); 3381 display->atom (str));
3358 } 3382 }
3359 break; 3383 break;
3360 3384
3361 case XTerm_Color: 3385 case XTerm_Color:
… …
3422 process_color_seq (op, Color_tint, str, resp); 3446 process_color_seq (op, Color_tint, str, resp);
3423 { 3447 {
3424 bool changed = false; 3448 bool changed = false;
3425 3449
3426 if (ISSET_PIXCOLOR (Color_tint)) 3450 if (ISSET_PIXCOLOR (Color_tint))
3427 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3451 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3428 else
3429 changed = bgPixmap.unset_tint ();
3430 3452
3431 if (changed) 3453 if (changed)
3432 update_background (); 3454 update_background ();
3433 } 3455 }
3434 3456
… …
3440 if (!strcmp (str, "?")) 3462 if (!strcmp (str, "?"))
3441 { 3463 {
3442 char str[256]; 3464 char str[256];
3443 3465
3444 sprintf (str, "[%dx%d+%d+%d]", 3466 sprintf (str, "[%dx%d+%d+%d]",
3445 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3467 min (h_scale, 32767), min (v_scale, 32767),
3446 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3468 min (h_align, 32767), min (v_align, 32767));
3447 process_xterm_seq (XTerm_title, str, CHAR_ST); 3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3448 } 3470 }
3449 else 3471 else
3450 { 3472 {
3451 int changed = 0; 3473 int changed = 0;
3452 3474
3453 if (*str != ';') 3475 if (*str != ';')
3454 { 3476 {
3455 /* reset to default scaling :*/
3456 bgPixmap.unset_geometry ();
3457 if (bgPixmap.set_file (str)) /* change pixmap */ 3477 if (bg_set_file (str)) /* change pixmap */
3478 {
3458 changed++; 3479 changed++;
3459 str = strchr (str, ';'); 3480 str = strchr (str, ';');
3460 if (str == NULL) 3481 if (str == NULL)
3461 bgPixmap.set_defaultGeometry (); 3482 bg_set_default_geometry ();
3483 else
3484 bg_set_geometry (str+1);
3485 }
3462 } 3486 }
3463 3487 else
3464 while (str)
3465 { 3488 {
3466 str++; 3489 str++;
3467 if (bgPixmap.set_geometry (str)) 3490 if (bg_set_geometry (str, true))
3468 changed++; 3491 changed++;
3469 str = strchr (str, ';');
3470 } 3492 }
3471 3493
3472 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 }
3473 update_background (); 3502 update_background ();
3503 }
3474 } 3504 }
3475 break; 3505 break;
3476#endif 3506#endif
3477 3507
3478 case XTerm_logfile: 3508 case XTerm_logfile:
… …
3629 { 67, PrivMode_BackSpace }, // DECBKM 3659 { 67, PrivMode_BackSpace }, // DECBKM
3630#endif 3660#endif
3631 { 1000, PrivMode_MouseX11 }, 3661 { 1000, PrivMode_MouseX11 },
3632 { 1002, PrivMode_MouseBtnEvent }, 3662 { 1002, PrivMode_MouseBtnEvent },
3633 { 1003, PrivMode_MouseAnyEvent }, 3663 { 1003, PrivMode_MouseAnyEvent },
3664#if ENABLE_FRILLS
3665 { 1005, PrivMode_ExtModeMouse },
3666#endif
3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3667 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3635 { 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
3636 // 1035 enable modifiers for alt, numlock NYI 3672 // 1035 enable modifiers for alt, numlock NYI
3637 // 1036 send ESC for meta keys NYI 3673 // 1036 send ESC for meta keys NYI
3638 // 1037 send DEL for keypad delete NYI 3674 // 1037 send DEL for keypad delete NYI
3639 { 1047, PrivMode_Screen }, 3675 { 1047, PrivMode_Screen },
3640 // 1048 save and restore cursor 3676 // 1048 save and restore cursor, implemented in code
3641 { 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 */
3642 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3678 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3643 { 2004, PrivMode_BracketPaste }, 3679 { 2004, PrivMode_BracketPaste },
3644 }; 3680 };
3645 3681
… …
3655 for (i = 0; i < nargs; i++) 3691 for (i = 0; i < nargs; i++)
3656 { 3692 {
3657 state = -1; 3693 state = -1;
3658 3694
3659 /* basic handling */ 3695 /* basic handling */
3660 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3696 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3661 if (argtopriv[j].argval == arg[i]) 3697 if (argtopriv[j].argval == arg[i])
3662 { 3698 {
3663 state = privcases (mode, argtopriv[j].bit); 3699 state = privcases (mode, argtopriv[j].bit);
3664 break; 3700 break;
3665 } 3701 }
… …
3743 case 1003: 3779 case 1003:
3744 if (state) 3780 if (state)
3745 { 3781 {
3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3782 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3747 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;
3748 vt_emask_mouse = PointerMotionMask; 3785 vt_emask_mouse = PointerMotionMask;
3749 } 3786 }
3750 else 3787 else
3751 vt_emask_mouse = NoEventMask; 3788 vt_emask_mouse = NoEventMask;
3752 3789
… …
3937 } 3974 }
3938 } 3975 }
3939} 3976}
3940/*}}} */ 3977/*}}} */
3941 3978
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/* ------------------------------------------------------------------------- */ 3979/* ------------------------------------------------------------------------- */
3962 3980
3963/* 3981/*
3964 * Send printf () formatted output to the command. 3982 * Send printf () formatted output to the command.
3965 * Only use for small amounts of data. 3983 * Only use for small amounts of data.
… …
3978 3996
3979/* ---------------------------------------------------------------------- */ 3997/* ---------------------------------------------------------------------- */
3980/* 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,
3981 * or generated by us in response to a query ESC sequence. 3999 * or generated by us in response to a query ESC sequence.
3982 */ 4000 */
3983const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4001static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3984 4002
3985void 4003void
3986rxvt_term::tt_write (const char *data, unsigned int len) 4004rxvt_term::tt_write (const char *data, unsigned int len)
3987{ 4005{
3988 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)))
… …
3993 4011
3994 if (v_buflen == 0) 4012 if (v_buflen == 0)
3995 { 4013 {
3996 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));
3997 4015
4016 max_it (written, 0);
4017
3998 if ((unsigned int)written == len) 4018 if (written == len)
3999 return; 4019 return;
4000 4020
4001 data += written; 4021 data += written;
4002 len -= written; 4022 len -= written;
4003 } 4023 }
4004 4024
4005 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4025 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4006 4026
4007 memcpy (v_buffer + v_buflen, data, len); 4027 memcpy (v_buffer + v_buflen, data, len);
4008 v_buflen += len; 4028 v_buflen += len;
4009 4029
4010 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