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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.359 by sf-exg, Tue Jan 4 23:06:10 2011 UTC vs.
Revision 1.383 by sf-exg, Fri Apr 29 13:08:24 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
38 while (len--) 38 while (len--)
39 *start++ = value; 39 *start++ = value;
40} 40}
41 41
42/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
46 44
47/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
161 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
162 160
163void 161void
164rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
165{ 163{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
166 view_start = 0; 168 view_start = 0;
167 num_scr = 0; 169 num_scr = 0;
168 170
169 if (ncol == 0) 171 if (ncol == 0)
170 ncol = 80; 172 ncol = 80;
… …
400 } 402 }
401 403
402 free (tabs); 404 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol); 405 tabs = (char *)rxvt_malloc (ncol);
404 406
405 for (int col = ncol; --col; ) 407 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0; 408 tabs [col] = col % TABSIZE == 0;
407 409
408 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
409 411
410 prev_nrow = nrow; 412 prev_nrow = nrow;
… …
1685 { 1687 {
1686 rvideo_state = on; 1688 rvideo_state = on;
1687 1689
1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#ifdef HAVE_BG_PIXMAP 1691#ifdef HAVE_BG_PIXMAP
1690 if (bgPixmap.pixmap == None) 1692 if (bg_pixmap == None)
1691#endif 1693#endif
1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693 1695
1694 XGCValues gcvalue; 1696 XGCValues gcvalue;
1695 gcvalue.foreground = pix_colors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
… …
1922 1924
1923# ifndef NO_MAPALERT 1925# ifndef NO_MAPALERT
1924# ifdef MAPALERT_OPTION 1926# ifdef MAPALERT_OPTION
1925 if (option (Opt_mapAlert)) 1927 if (option (Opt_mapAlert))
1926# endif 1928# endif
1927 XMapWindow (dpy, parent[0]); 1929 XMapWindow (dpy, parent);
1928# endif 1930# endif
1929 1931
1930# if ENABLE_FRILLS 1932# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell)) 1933 if (option (Opt_urgentOnBell))
1932 set_urgency (1); 1934 set_urgency (1);
… …
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1948#endif
1947} 1949}
1948 1950
1949/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */
1951void 1952void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1953rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1954{
1954#ifdef PRINTPIPE 1955#ifdef PRINTPIPE
1955 int nrows, row_start; 1956 int nrows, row_start;
… …
2031 refresh_count = 0; 2032 refresh_count = 0;
2032 2033
2033 unsigned int old_screen_flags = screen.flags; 2034 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2035 char have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2036#ifdef HAVE_BG_PIXMAP
2036 have_bg = bgPixmap.pixmap != None; 2037 have_bg = bg_pixmap != None;
2037#endif 2038#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2040
2040 /* 2041 /*
2041 * B: reverse any characters which are selected 2042 * B: reverse any characters which are selected
… …
2508 scr_remap_chars (swap_buf [i]); 2509 scr_remap_chars (swap_buf [i]);
2509 } 2510 }
2510} 2511}
2511 2512
2512void 2513void
2513rxvt_term::scr_recolour () NOTHROW 2514rxvt_term::scr_recolour (bool refresh) NOTHROW
2514{ 2515{
2516 bool transparent = false;
2517
2515#ifdef HAVE_BG_PIXMAP 2518#ifdef HAVE_BG_PIXMAP
2516 bgPixmap.apply (); 2519 if (bg_pixmap != None)
2517#else 2520 {
2521# ifdef ENABLE_TRANSPARENCY
2522 if (bg_flags & BG_IS_TRANSPARENT)
2523 {
2524 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2525 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2518 2526
2527 transparent = true;
2528 }
2529 else
2530# endif
2531 {
2532 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2533 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2534 }
2535 }
2536 else
2537#endif
2538 {
2519 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2539 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2520 XClearWindow (dpy, parent[0]);
2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2540 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2541 }
2542
2543 XClearWindow (dpy, parent);
2522 2544
2523 if (scrollBar.win) 2545 if (scrollBar.win)
2524 { 2546 {
2547 if (transparent)
2548 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2549 else
2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2550 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2526 scrollBar.state = STATE_IDLE; 2551 scrollBar.state = STATE_IDLE;
2527 scrollBar.show (0); 2552 scrollBar.show (0);
2528 } 2553 }
2529 2554
2530#endif 2555 if (refresh)
2531 2556 {
2532 /* bgPixmap.apply () does not do the following : */
2533 scr_clear (); 2557 scr_clear ();
2534 scr_touch (true); 2558 scr_touch (true);
2559 }
2535 want_refresh = 1; 2560 want_refresh = 1;
2536} 2561}
2537 2562
2538/* ------------------------------------------------------------------------- */ 2563/* ------------------------------------------------------------------------- */
2539void 2564void
… …
2710 tt_paste (data, len); 2735 tt_paste (data, len);
2711} 2736}
2712 2737
2713/* ------------------------------------------------------------------------- */ 2738/* ------------------------------------------------------------------------- */
2714/* 2739/*
2715 * Respond to a notification that a primary selection has been sent 2740 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2716 * EXT: SelectionNotify 2741 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2717 */ 2742 * as fallback
2718void
2719rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2720{
2721 if (prop == None) /* check for failed XConvertSelection */
2722 {
2723 if ((selection_type & Sel_CompoundText))
2724 {
2725 int selnum = selection_type & Sel_whereMask;
2726
2727 selection_type = 0;
2728 if (selnum != Sel_direct)
2729 selection_request_other (XA_STRING, selnum);
2730 }
2731
2732 if ((selection_type & Sel_UTF8String))
2733 {
2734 int selnum = selection_type & Sel_whereMask;
2735
2736 selection_type = Sel_CompoundText;
2737 if (selnum != Sel_direct)
2738 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2739 else
2740 selection_type = 0;
2741 }
2742
2743 return;
2744 }
2745
2746 unsigned long bytes_after;
2747 XTextProperty ct;
2748
2749 if (XGetWindowProperty (dpy, win, prop,
2750 0, PROP_SIZE / 4,
2751 delete_prop, AnyPropertyType,
2752 &ct.encoding, &ct.format,
2753 &ct.nitems, &bytes_after,
2754 &ct.value) != Success)
2755 {
2756 ct.value = 0;
2757 goto bailout;
2758 }
2759
2760 if (ct.encoding == None)
2761 goto bailout;
2762
2763 if (bytes_after)
2764 {
2765 // fetch and append remaining data
2766 XTextProperty ct2;
2767
2768 if (XGetWindowProperty (dpy, win, prop,
2769 ct.nitems / 4, (bytes_after + 3) / 4,
2770 delete_prop, AnyPropertyType,
2771 &ct2.encoding, &ct2.format,
2772 &ct2.nitems, &bytes_after,
2773 &ct2.value) != Success)
2774 goto bailout;
2775
2776 // realloc should be compatible to XFree, here, and elsewhere, too
2777 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2778 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2779 ct.nitems += ct2.nitems;
2780
2781 XFree (ct2.value);
2782 }
2783
2784 if (ct.value == 0)
2785 goto bailout;
2786
2787 if (ct.encoding == xa[XA_INCR])
2788 {
2789 // INCR selection, start handshake
2790 if (!delete_prop)
2791 XDeleteProperty (dpy, win, prop);
2792
2793 selection_wait = Sel_incr;
2794 incr_buf_fill = 0;
2795 incr_ev.start (10);
2796
2797 goto bailout;
2798 }
2799
2800 if (ct.nitems == 0)
2801 {
2802 if (selection_wait == Sel_incr)
2803 {
2804 XFree (ct.value);
2805
2806 // finally complete, now paste the whole thing
2807 selection_wait = Sel_normal;
2808 ct.value = (unsigned char *)incr_buf;
2809 ct.nitems = incr_buf_fill;
2810 incr_buf = 0;
2811 incr_buf_size = 0;
2812 incr_ev.stop ();
2813 }
2814 else
2815 {
2816 if (selection_wait == Sel_normal
2817 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2818 {
2819 /*
2820 * pass through again trying CUT_BUFFER0 if we've come from
2821 * XConvertSelection () but nothing was presented
2822 */
2823 selection_paste (display->root, XA_CUT_BUFFER0, False);
2824 }
2825
2826 goto bailout;
2827 }
2828 }
2829 else if (selection_wait == Sel_incr)
2830 {
2831 incr_ev.start (10);
2832
2833 while (incr_buf_fill + ct.nitems > incr_buf_size)
2834 {
2835 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2836 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2837 }
2838
2839 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2840 incr_buf_fill += ct.nitems;
2841
2842 goto bailout;
2843 }
2844
2845 char **cl;
2846 int cr;
2847
2848#if !ENABLE_MINIMAL
2849 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2850 // so recode it manually
2851 if (ct.encoding == xa[XA_UTF8_STRING])
2852 {
2853 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2854 char *s = rxvt_wcstombs (w);
2855 free (w);
2856 // TODO: strlen == only the first element will be converted. well...
2857 paste (s, strlen (s));
2858 free (s);
2859 }
2860 else
2861#endif
2862 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2863 && cl)
2864 {
2865 for (int i = 0; i < cr; i++)
2866 paste (cl[i], strlen (cl[i]));
2867
2868 XFreeStringList (cl);
2869 }
2870 else
2871 paste ((char *)ct.value, ct.nitems); // paste raw
2872
2873bailout:
2874 XFree (ct.value);
2875
2876 if (selection_wait == Sel_normal)
2877 selection_wait = Sel_none;
2878}
2879
2880void
2881rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2882{
2883 selection_wait = Sel_none;
2884
2885 incr_buf_size = 0;
2886 free (incr_buf);
2887
2888 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2889}
2890
2891void
2892rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2893{
2894 if (prop == None || selection_wait != Sel_incr)
2895 return;
2896
2897 selection_paste (win, prop, true);
2898}
2899
2900/* ------------------------------------------------------------------------- */
2901/*
2902 * Request the current selection:
2903 * Order: > internal selection if available
2904 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2905 * > CUT_BUFFER0
2906 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2907 * will auto fallback to CUT_BUFFER0
2908 * EXT: button 2 release 2743 * EXT: button 2 release
2909 */ 2744 */
2910void 2745void
2911rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2746rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2912{ 2747{
2913 if (selection.text && selnum == Sel_Primary) 2748 if (!selection_req)
2914 {
2915 /* internal selection */
2916 char *str = rxvt_wcstombs (selection.text, selection.len);
2917 paste (str, strlen (str));
2918 free (str);
2919 return;
2920 } 2749 {
2921 else 2750 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2751 selection_req->run ();
2922 { 2752 }
2923 selection_request_time = tm;
2924 selection_wait = Sel_normal;
2925
2926#if X_HAVE_UTF8_STRING
2927 selection_type = Sel_UTF8String;
2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2929 return;
2930#else
2931 selection_type = Sel_CompoundText;
2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2933 return;
2934#endif
2935 }
2936
2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
2939}
2940
2941int
2942rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2943{
2944 Atom sel;
2945
2946 selection_type |= selnum;
2947
2948 if (selnum == Sel_Primary)
2949 sel = XA_PRIMARY;
2950 else if (selnum == Sel_Secondary)
2951 sel = XA_SECONDARY;
2952 else
2953 sel = xa[XA_CLIPBOARD];
2954
2955 if (XGetSelectionOwner (dpy, sel) != None)
2956 {
2957 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2958 vt, selection_request_time);
2959 return 1;
2960 }
2961
2962 return 0;
2963} 2753}
2964 2754
2965/* ------------------------------------------------------------------------- */ 2755/* ------------------------------------------------------------------------- */
2966/* 2756/*
2967 * Clear all selected text 2757 * Clear all selected text
… …
3091 2881
3092 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3093 } 2883 }
3094 else 2884 else
3095#endif 2885#endif
3096 if (!ROW(row).is_longer () && row != selection.end.row 2886 if (!ROW(row).is_longer ()
2887 && (row != selection.end.row || end_col != selection.end.col)
3097 && (row != selection.beg.row || selection.beg.col < ncol)) 2888 && (row != selection.beg.row || selection.beg.col < ncol))
3098 new_selection_text[ofs++] = C0_LF; 2889 new_selection_text[ofs++] = C0_LF;
3099 } 2890 }
3100
3101 if (end_col != selection.end.col)
3102 new_selection_text[ofs++] = C0_LF;
3103 2891
3104 new_selection_text[ofs] = 0; 2892 new_selection_text[ofs] = 0;
3105 2893
3106 if (ofs == 0) 2894 if (ofs == 0)
3107 { 2895 {
… …
3613 * EXT: SelectionRequest 3401 * EXT: SelectionRequest
3614 */ 3402 */
3615void 3403void
3616rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3404rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3617{ 3405{
3406 Atom property = rq.property == None ? rq.target : rq.property;
3618 XSelectionEvent ev; 3407 XSelectionEvent ev;
3619 3408
3620 ev.type = SelectionNotify; 3409 ev.type = SelectionNotify;
3621 ev.property = None; 3410 ev.property = None;
3622 ev.display = rq.display; 3411 ev.display = rq.display;
… …
3637 *target++ = xa[XA_COMPOUND_TEXT]; 3426 *target++ = xa[XA_COMPOUND_TEXT];
3638#if X_HAVE_UTF8_STRING 3427#if X_HAVE_UTF8_STRING
3639 *target++ = xa[XA_UTF8_STRING]; 3428 *target++ = xa[XA_UTF8_STRING];
3640#endif 3429#endif
3641 3430
3642 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3431 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3643 32, PropModeReplace, 3432 32, PropModeReplace,
3644 (unsigned char *)target_list, target - target_list); 3433 (unsigned char *)target_list, target - target_list);
3645 ev.property = rq.property; 3434 ev.property = property;
3646 } 3435 }
3647#if TODO // TODO 3436#if TODO // TODO
3648 else if (rq.target == xa[XA_MULTIPLE]) 3437 else if (rq.target == xa[XA_MULTIPLE])
3649 { 3438 {
3650 /* TODO: Handle MULTIPLE */ 3439 /* TODO: Handle MULTIPLE */
3651 } 3440 }
3652#endif 3441#endif
3653 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3442 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3654 { 3443 {
3655 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3444 XChangeProperty (dpy, rq.requestor, property, rq.target,
3656 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3445 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3657 ev.property = rq.property; 3446 ev.property = property;
3658 } 3447 }
3659 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3448 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3660 { 3449 {
3661 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3450 XChangeProperty (dpy, rq.requestor, property, rq.target,
3662 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3451 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3663 ev.property = rq.property; 3452 ev.property = property;
3664 } 3453 }
3665 else if (rq.target == XA_STRING 3454 else if (rq.target == XA_STRING
3666 || rq.target == xa[XA_TEXT] 3455 || rq.target == xa[XA_TEXT]
3667 || rq.target == xa[XA_COMPOUND_TEXT] 3456 || rq.target == xa[XA_COMPOUND_TEXT]
3668 || rq.target == xa[XA_UTF8_STRING] 3457 || rq.target == xa[XA_UTF8_STRING]
… …
3739 ct.value = (unsigned char *)cl; 3528 ct.value = (unsigned char *)cl;
3740 ct.nitems = selectlen; 3529 ct.nitems = selectlen;
3741 ct.encoding = target; 3530 ct.encoding = target;
3742 } 3531 }
3743 3532
3744 XChangeProperty (dpy, rq.requestor, rq.property, 3533 XChangeProperty (dpy, rq.requestor, property,
3745 ct.encoding, 8, PropModeReplace, 3534 ct.encoding, 8, PropModeReplace,
3746 ct.value, (int)ct.nitems); 3535 ct.value, (int)ct.nitems);
3747 ev.property = rq.property; 3536 ev.property = property;
3748 3537
3749 if (freect) 3538 if (freect)
3750 XFree (ct.value); 3539 XFree (ct.value);
3751 } 3540 }
3752 3541

Diff Legend

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