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.461 by root, Tue Nov 23 22:58:08 2010 UTC vs.
Revision 1.479 by root, Fri Feb 25 07:07:41 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
… …
975rxvt_term::flush () 975rxvt_term::flush ()
976{ 976{
977 flush_ev.stop (); 977 flush_ev.stop ();
978 978
979#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
980 if (bgPixmap.flags & bgPixmap_t::hasChanged) 980 if (bg_flags & BG_NEEDS_REFRESH)
981 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 982 bg_flags &= ~BG_NEEDS_REFRESH;
983// scr_clear (true); This needs to be researched further!
984 scr_touch (false); 983 scr_touch (false);
985 } 984 }
986#endif 985#endif
987 986
988 if (want_refresh) 987 if (want_refresh)
… …
1159rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1160{ 1159{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1162 1161
1163 if (CBUFSIZ == n) 1162 if (CBUFSIZ == n)
1164 { 1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1166 n = 0;
1167 }
1168 1164
1169 memmove (cmdbuf_base, cmdbuf_ptr, n); 1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1166 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1167 cmdbuf_endp = cmdbuf_ptr + n;
1172 1168
… …
1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1454 ; 1450 ;
1455 1451
1456#ifdef HAVE_BG_PIXMAP 1452#ifdef HAVE_BG_PIXMAP
1457 bool moved = false; 1453 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ()) 1454 if (bg_window_position_sensitive ())
1459 { 1455 {
1460 int x, y; 1456 int x, y;
1461 if (ev.xconfigure.send_event) 1457 if (ev.xconfigure.send_event)
1462 { 1458 {
1463 x = ev.xconfigure.x; 1459 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y; 1460 y = ev.xconfigure.y;
1465 } 1461 }
1466 else 1462 else
1467 get_window_origin (x, y); 1463 get_window_origin (x, y);
1468 1464
1469 if (bgPixmap.set_position (x, y) 1465 if (bg_set_position (x, y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1466 || !(bg_flags & BG_IS_VALID))
1471 moved = true; 1467 moved = true;
1472 } 1468 }
1473#endif 1469#endif
1474 1470
1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
… …
1483 if (moved) 1479 if (moved)
1484 { 1480 {
1485 if (mapped) 1481 if (mapped)
1486 update_background (); 1482 update_background ();
1487 else 1483 else
1488 bgPixmap.invalidate (); 1484 bg_invalidate ();
1489 } 1485 }
1490#endif 1486#endif
1491 } 1487 }
1492 1488
1493 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1489 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1494 } 1490 }
1495 break; 1491 break;
1496 1492
1497 case PropertyNotify: 1493 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1494 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; 1495 break;
1504 1496
1505 case SelectionClear: 1497 case SelectionClear:
1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1498 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; 1499 break;
1513 1500
1514 case SelectionRequest: 1501 case SelectionRequest:
1515 selection_send (ev.xselectionrequest); 1502 selection_send (ev.xselectionrequest);
1516 break; 1503 break;
… …
1527 * by scheduling background redraw as soon as we can, but giving a short 1514 * by scheduling background redraw as soon as we can, but giving a short
1528 * bit of time for ConfigureNotifies to arrive. 1515 * bit of time for ConfigureNotifies to arrive.
1529 * We should render background PRIOR to drawing any text, but AFTER all 1516 * We should render background PRIOR to drawing any text, but AFTER all
1530 * of ConfigureNotifys for the best results. 1517 * of ConfigureNotifys for the best results.
1531 */ 1518 */
1532 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1519 if (!(bg_flags & BG_IS_VALID))
1533 update_background_ev.start (0.025); 1520 update_background_ev.start (0.025);
1534#endif 1521#endif
1535 mapped = 1; 1522 mapped = 1;
1536#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1537 text_blink_ev.start (); 1524 text_blink_ev.start ();
… …
1552 if (ev.xany.window == vt) 1539 if (ev.xany.window == vt)
1553 { 1540 {
1554 do 1541 do
1555 { 1542 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, false);
1558 } 1545 }
1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1560 1547
1561 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1562 1549
1563 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1564 { 1551 {
1565 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1566 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1567 } 1554 }
1568 1555
1569 want_refresh = 1; 1556 want_refresh = 1;
1570 } 1557 }
1571 else 1558 else
… …
1852 * use the property to determine the pixmap. We use it later on. 1839 * use the property to determine the pixmap. We use it later on.
1853 */ 1840 */
1854 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1841 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1855 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1842 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1856 { 1843 {
1857 bgPixmap.set_root_pixmap (); 1844 bg_set_root_pixmap ();
1858 update_background (); 1845 update_background ();
1859 } 1846 }
1860 1847
1861 break; 1848 break;
1862 } 1849 }
… …
2695 2682
2696 /* 8.3.87: NEXT LINE */ 2683 /* 8.3.87: NEXT LINE */
2697 case C1_NEL: /* ESC E */ 2684 case C1_NEL: /* ESC E */
2698 { 2685 {
2699 wchar_t nlcr[] = { C0_LF, C0_CR }; 2686 wchar_t nlcr[] = { C0_LF, C0_CR };
2700 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2701 } 2688 }
2702 break; 2689 break;
2703 2690
2704 /* kidnapped escape sequence: Should be 8.3.48 */ 2691 /* kidnapped escape sequence: Should be 8.3.48 */
2705 case C1_ESA: /* ESC G */ 2692 case C1_ESA: /* ESC G */
2706 process_graphics (); 2693 // used by original rxvt for rob nations own graphics mode
2694 if (cmd_getc () == 'Q')
2695 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2707 break; 2696 break;
2708 2697
2709 /* 8.3.63: CHARACTER TABULATION SET */ 2698 /* 8.3.63: CHARACTER TABULATION SET */
2710 case C1_HTS: /* ESC H */ 2699 case C1_HTS: /* ESC H */
2711 scr_set_tab (1); 2700 scr_set_tab (1);
… …
2774 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2763 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 , 2764 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 2765 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2777}; 2766};
2778 2767
2779#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2768#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2769 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2770 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2782#define get_byte_array_bit(array, bit) \ 2771#define get_byte_array_bit(array, bit) \
2783 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2772 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2784 2773
2785const unsigned char csi_defaults[] = 2774static const unsigned char csi_defaults[] =
2786 { 2775 {
2787 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2776 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, */ 2777 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, */ 2778 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, [, \, ], ^, _, */ 2779 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2879 { 2868 {
2880 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2869 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2881 scr_soft_reset (); 2870 scr_soft_reset ();
2882 2871
2883 static const int pm_h[] = { 7, 25 }; 2872 static const int pm_h[] = { 7, 25 };
2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2873 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2885 2874
2886 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2875 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); 2876 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2888 } 2877 }
2889 break; 2878 break;
2890 } 2879 }
2891 2880
2892 return; 2881 return;
… …
3454 process_color_seq (op, Color_tint, str, resp); 3443 process_color_seq (op, Color_tint, str, resp);
3455 { 3444 {
3456 bool changed = false; 3445 bool changed = false;
3457 3446
3458 if (ISSET_PIXCOLOR (Color_tint)) 3447 if (ISSET_PIXCOLOR (Color_tint))
3459 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3448 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3460 else
3461 changed = bgPixmap.unset_tint ();
3462 3449
3463 if (changed) 3450 if (changed)
3464 update_background (); 3451 update_background ();
3465 } 3452 }
3466 3453
… …
3472 if (!strcmp (str, "?")) 3459 if (!strcmp (str, "?"))
3473 { 3460 {
3474 char str[256]; 3461 char str[256];
3475 3462
3476 sprintf (str, "[%dx%d+%d+%d]", 3463 sprintf (str, "[%dx%d+%d+%d]",
3477 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3464 min (h_scale, 32767), min (v_scale, 32767),
3478 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3465 min (h_align, 32767), min (v_align, 32767));
3479 process_xterm_seq (XTerm_title, str, CHAR_ST); 3466 process_xterm_seq (XTerm_title, str, CHAR_ST);
3480 } 3467 }
3481 else 3468 else
3482 { 3469 {
3483 int changed = 0; 3470 int changed = 0;
3484 3471
3485 if (*str != ';') 3472 if (*str != ';')
3486 { 3473 {
3487 if (bgPixmap.set_file (str)) /* change pixmap */ 3474 if (bg_set_file (str)) /* change pixmap */
3488 { 3475 {
3489 changed++; 3476 changed++;
3490 str = strchr (str, ';'); 3477 str = strchr (str, ';');
3491 if (str == NULL) 3478 if (str == NULL)
3492 bgPixmap.set_defaultGeometry (); 3479 bg_set_default_geometry ();
3493 else 3480 else
3494 bgPixmap.set_geometry (str+1); 3481 bg_set_geometry (str+1);
3495 } 3482 }
3496 } 3483 }
3497 else 3484 else
3498 { 3485 {
3499 str++; 3486 str++;
3500 if (bgPixmap.set_geometry (str, true)) 3487 if (bg_set_geometry (str, true))
3501 changed++; 3488 changed++;
3502 } 3489 }
3503 3490
3504 if (changed) 3491 if (changed)
3505 { 3492 {
3506 if (bgPixmap.window_position_sensitive ()) 3493 if (bg_window_position_sensitive ())
3507 { 3494 {
3508 int x, y; 3495 int x, y;
3509 get_window_origin (x, y); 3496 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y); 3497 bg_set_position (x, y);
3511 } 3498 }
3512 update_background (); 3499 update_background ();
3513 } 3500 }
3514 } 3501 }
3515 break; 3502 break;
… …
3701 for (i = 0; i < nargs; i++) 3688 for (i = 0; i < nargs; i++)
3702 { 3689 {
3703 state = -1; 3690 state = -1;
3704 3691
3705 /* basic handling */ 3692 /* basic handling */
3706 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3693 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3707 if (argtopriv[j].argval == arg[i]) 3694 if (argtopriv[j].argval == arg[i])
3708 { 3695 {
3709 state = privcases (mode, argtopriv[j].bit); 3696 state = privcases (mode, argtopriv[j].bit);
3710 break; 3697 break;
3711 } 3698 }
… …
3789 case 1003: 3776 case 1003:
3790 if (state) 3777 if (state)
3791 { 3778 {
3792 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3779 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3793 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3780 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3781 mouse_row = mouse_col = 0;
3794 vt_emask_mouse = PointerMotionMask; 3782 vt_emask_mouse = PointerMotionMask;
3795 } 3783 }
3796 else 3784 else
3797 vt_emask_mouse = NoEventMask; 3785 vt_emask_mouse = NoEventMask;
3798 3786
… …
3983 } 3971 }
3984 } 3972 }
3985} 3973}
3986/*}}} */ 3974/*}}} */
3987 3975
3988/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3989void
3990rxvt_term::process_graphics ()
3991{
3992 unicode_t ch, cmd = cmd_getc ();
3993
3994 if (cmd == 'Q')
3995 {
3996 /* query graphics */
3997 tt_printf ("\033G0\012"); /* no graphics */
3998 return;
3999 }
4000 /* swallow other graphics sequences until terminating ':' */
4001 do
4002 ch = cmd_getc ();
4003 while (ch != ':');
4004}
4005/*}}} */
4006
4007/* ------------------------------------------------------------------------- */ 3976/* ------------------------------------------------------------------------- */
4008 3977
4009/* 3978/*
4010 * Send printf () formatted output to the command. 3979 * Send printf () formatted output to the command.
4011 * Only use for small amounts of data. 3980 * Only use for small amounts of data.
… …
4024 3993
4025/* ---------------------------------------------------------------------- */ 3994/* ---------------------------------------------------------------------- */
4026/* Write data to the pty as typed by the user, pasted with the mouse, 3995/* Write data to the pty as typed by the user, pasted with the mouse,
4027 * or generated by us in response to a query ESC sequence. 3996 * or generated by us in response to a query ESC sequence.
4028 */ 3997 */
4029const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3998static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4030 3999
4031void 4000void
4032rxvt_term::tt_write (const char *data, unsigned int len) 4001rxvt_term::tt_write (const char *data, unsigned int len)
4033{ 4002{
4034 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4003 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4046 4015
4047 data += written; 4016 data += written;
4048 len -= written; 4017 len -= written;
4049 } 4018 }
4050 4019
4051 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4020 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4052 4021
4053 memcpy (v_buffer + v_buflen, data, len); 4022 memcpy (v_buffer + v_buflen, data, len);
4054 v_buflen += len; 4023 v_buflen += len;
4055 4024
4056 pty_ev.set (ev::READ | ev::WRITE); 4025 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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