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.464 by sf-exg, Tue Dec 14 08:01:51 2010 UTC vs.
Revision 1.477 by root, Mon Feb 21 07:41:00 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-2007 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
… …
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)
… …
1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1454 ; 1453 ;
1455 1454
1456#ifdef HAVE_BG_PIXMAP 1455#ifdef HAVE_BG_PIXMAP
1457 bool moved = false; 1456 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ()) 1457 if (bg_window_position_sensitive ())
1459 { 1458 {
1460 int x, y; 1459 int x, y;
1461 if (ev.xconfigure.send_event) 1460 if (ev.xconfigure.send_event)
1462 { 1461 {
1463 x = ev.xconfigure.x; 1462 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y; 1463 y = ev.xconfigure.y;
1465 } 1464 }
1466 else 1465 else
1467 get_window_origin (x, y); 1466 get_window_origin (x, y);
1468 1467
1469 if (bgPixmap.set_position (x, y) 1468 if (bg_set_position (x, y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1469 || !(bg_flags & BG_IS_VALID))
1471 moved = true; 1470 moved = true;
1472 } 1471 }
1473#endif 1472#endif
1474 1473
1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
… …
1483 if (moved) 1482 if (moved)
1484 { 1483 {
1485 if (mapped) 1484 if (mapped)
1486 update_background (); 1485 update_background ();
1487 else 1486 else
1488 bgPixmap.invalidate (); 1487 bg_invalidate ();
1489 } 1488 }
1490#endif 1489#endif
1491 } 1490 }
1492 1491
1493 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1494 } 1493 }
1495 break; 1494 break;
1496 1495
1497 case PropertyNotify: 1496 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 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; 1498 break;
1504 1499
1505 case SelectionClear: 1500 case SelectionClear:
1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1501 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; 1502 break;
1513 1503
1514 case SelectionRequest: 1504 case SelectionRequest:
1515 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1516 break; 1506 break;
… …
1527 * 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
1528 * bit of time for ConfigureNotifies to arrive. 1518 * bit of time for ConfigureNotifies to arrive.
1529 * 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
1530 * of ConfigureNotifys for the best results. 1520 * of ConfigureNotifys for the best results.
1531 */ 1521 */
1532 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1522 if (!(bg_flags & BG_IS_VALID))
1533 update_background_ev.start (0.025); 1523 update_background_ev.start (0.025);
1534#endif 1524#endif
1535 mapped = 1; 1525 mapped = 1;
1536#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1537 text_blink_ev.start (); 1527 text_blink_ev.start ();
… …
1552 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1553 { 1543 {
1554 do 1544 do
1555 { 1545 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1558 } 1548 }
1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1560 1550
1561 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1562 1552
1563 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1564 { 1554 {
1565 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1566 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1567 } 1557 }
1568 1558
1569 want_refresh = 1; 1559 want_refresh = 1;
1570 } 1560 }
1571 else 1561 else
… …
1852 * 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.
1853 */ 1843 */
1854 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1855 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1856 { 1846 {
1857 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1858 update_background (); 1848 update_background ();
1859 } 1849 }
1860 1850
1861 break; 1851 break;
1862 } 1852 }
… …
2695 2685
2696 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
2697 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
2698 { 2688 {
2699 wchar_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
2700 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2701 } 2691 }
2702 break; 2692 break;
2703 2693
2704 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
2705 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
… …
2774 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2764 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 , 2765 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 2766 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2777}; 2767};
2778 2768
2779#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2769#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2770 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2771 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2782#define get_byte_array_bit(array, bit) \ 2772#define get_byte_array_bit(array, bit) \
2783 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2773 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2784 2774
2785static const unsigned char csi_defaults[] = 2775static const unsigned char csi_defaults[] =
2786 { 2776 {
2787 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2777 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, */ 2778 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
… …
2881 scr_soft_reset (); 2871 scr_soft_reset ();
2882 2872
2883 static const int pm_h[] = { 7, 25 }; 2873 static const int pm_h[] = { 7, 25 };
2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2874 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2885 2875
2886 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2876 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); 2877 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2888 } 2878 }
2889 break; 2879 break;
2890 } 2880 }
2891 2881
2892 return; 2882 return;
… …
3454 process_color_seq (op, Color_tint, str, resp); 3444 process_color_seq (op, Color_tint, str, resp);
3455 { 3445 {
3456 bool changed = false; 3446 bool changed = false;
3457 3447
3458 if (ISSET_PIXCOLOR (Color_tint)) 3448 if (ISSET_PIXCOLOR (Color_tint))
3459 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3449 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3460 else
3461 changed = bgPixmap.unset_tint ();
3462 3450
3463 if (changed) 3451 if (changed)
3464 update_background (); 3452 update_background ();
3465 } 3453 }
3466 3454
… …
3472 if (!strcmp (str, "?")) 3460 if (!strcmp (str, "?"))
3473 { 3461 {
3474 char str[256]; 3462 char str[256];
3475 3463
3476 sprintf (str, "[%dx%d+%d+%d]", 3464 sprintf (str, "[%dx%d+%d+%d]",
3477 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3465 min (h_scale, 32767), min (v_scale, 32767),
3478 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3466 min (h_align, 32767), min (v_align, 32767));
3479 process_xterm_seq (XTerm_title, str, CHAR_ST); 3467 process_xterm_seq (XTerm_title, str, CHAR_ST);
3480 } 3468 }
3481 else 3469 else
3482 { 3470 {
3483 int changed = 0; 3471 int changed = 0;
3484 3472
3485 if (*str != ';') 3473 if (*str != ';')
3486 { 3474 {
3487 if (bgPixmap.set_file (str)) /* change pixmap */ 3475 if (bg_set_file (str)) /* change pixmap */
3488 { 3476 {
3489 changed++; 3477 changed++;
3490 str = strchr (str, ';'); 3478 str = strchr (str, ';');
3491 if (str == NULL) 3479 if (str == NULL)
3492 bgPixmap.set_defaultGeometry (); 3480 bg_set_default_geometry ();
3493 else 3481 else
3494 bgPixmap.set_geometry (str+1); 3482 bg_set_geometry (str+1);
3495 } 3483 }
3496 } 3484 }
3497 else 3485 else
3498 { 3486 {
3499 str++; 3487 str++;
3500 if (bgPixmap.set_geometry (str, true)) 3488 if (bg_set_geometry (str, true))
3501 changed++; 3489 changed++;
3502 } 3490 }
3503 3491
3504 if (changed) 3492 if (changed)
3505 { 3493 {
3506 if (bgPixmap.window_position_sensitive ()) 3494 if (bg_window_position_sensitive ())
3507 { 3495 {
3508 int x, y; 3496 int x, y;
3509 get_window_origin (x, y); 3497 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y); 3498 bg_set_position (x, y);
3511 } 3499 }
3512 update_background (); 3500 update_background ();
3513 } 3501 }
3514 } 3502 }
3515 break; 3503 break;
… …
3701 for (i = 0; i < nargs; i++) 3689 for (i = 0; i < nargs; i++)
3702 { 3690 {
3703 state = -1; 3691 state = -1;
3704 3692
3705 /* basic handling */ 3693 /* basic handling */
3706 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3694 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3707 if (argtopriv[j].argval == arg[i]) 3695 if (argtopriv[j].argval == arg[i])
3708 { 3696 {
3709 state = privcases (mode, argtopriv[j].bit); 3697 state = privcases (mode, argtopriv[j].bit);
3710 break; 3698 break;
3711 } 3699 }
… …
4047 4035
4048 data += written; 4036 data += written;
4049 len -= written; 4037 len -= written;
4050 } 4038 }
4051 4039
4052 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4040 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4053 4041
4054 memcpy (v_buffer + v_buflen, data, len); 4042 memcpy (v_buffer + v_buflen, data, len);
4055 v_buflen += len; 4043 v_buflen += len;
4056 4044
4057 pty_ev.set (ev::READ | ev::WRITE); 4045 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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