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.353 by root, Fri Oct 15 21:13:44 2010 UTC vs.
Revision 1.377 by root, Mon Mar 21 13:46:17 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 * ------------------------------------------------------------------------- */
… …
400 } 398 }
401 399
402 free (tabs); 400 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol); 401 tabs = (char *)rxvt_malloc (ncol);
404 402
405 for (int col = ncol; --col; ) 403 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0; 404 tabs [col] = col % TABSIZE == 0;
407 405
408 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
409 407
410 prev_nrow = nrow; 408 prev_nrow = nrow;
… …
917 else 915 else
918 screen.cur.col = ncol - width; 916 screen.cur.col = ncol - width;
919 } 917 }
920 918
921 // nuke the character at this position, if required 919 // nuke the character at this position, if required
922 // due to wonderful coincidents everywehere else in this loop 920 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself, 921 // we never have to check for overwriting a wide char itself,
924 // only it's tail. 922 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 923 if (expect_false (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col); 924 scr_kill_char (*line, screen.cur.col);
927 925
928 line->touch (); 926 line->touch ();
929 927
… …
1685 { 1683 {
1686 rvideo_state = on; 1684 rvideo_state = on;
1687 1685
1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1690 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1691#endif 1689#endif
1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693 1691
1694 XGCValues gcvalue; 1692 XGCValues gcvalue;
1695 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
2031 refresh_count = 0; 2029 refresh_count = 0;
2032 2030
2033 unsigned int old_screen_flags = screen.flags; 2031 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2032 char have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2036 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2037#endif 2035#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2037
2040 /* 2038 /*
2041 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
… …
2508 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2509 } 2507 }
2510} 2508}
2511 2509
2512void 2510void
2513rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2514{ 2512{
2513 bool transparent = false;
2514
2515#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2516 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2517#else 2517 {
2518# ifdef ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT)
2520 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2518 2523
2524 transparent = true;
2525 }
2526 else
2527# endif
2528 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2531 }
2532 }
2533 else
2534#endif
2535 {
2519 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 }
2539
2520 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2522 2541
2523 if (scrollBar.win) 2542 if (scrollBar.win)
2524 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2526 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2527 scrollBar.show (0); 2549 scrollBar.show (0);
2528 } 2550 }
2529 2551
2530#endif 2552 if (refresh)
2531 2553 {
2532 /* bgPixmap.apply () does not do the following : */
2533 scr_clear (); 2554 scr_clear ();
2534 scr_touch (true); 2555 scr_touch (true);
2556 }
2535 want_refresh = 1; 2557 want_refresh = 1;
2536} 2558}
2537 2559
2538/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2539void 2561void
… …
2627void 2649void
2628rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2629{ 2651{
2630 int row, wrote; 2652 int row, wrote;
2631 unsigned int width, towrite; 2653 unsigned int width, towrite;
2632 char r1[] = "\n"; 2654 const char r1[] = "\n";
2633 2655
2634 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2635 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2636 { 2658 {
2637 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2710 tt_paste (data, len); 2732 tt_paste (data, len);
2711} 2733}
2712 2734
2713/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2714/* 2736/*
2715 * Respond to a notification that a primary selection has been sent
2716 * EXT: SelectionNotify
2717 */
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: 2737 * Request the current selection:
2903 * Order: > internal selection if available 2738 * Order: > internal selection if available
2904 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2739 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2905 * > CUT_BUFFER0 2740 * > CUT_BUFFER0
2906 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2741 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
… …
2914 { 2749 {
2915 /* internal selection */ 2750 /* internal selection */
2916 char *str = rxvt_wcstombs (selection.text, selection.len); 2751 char *str = rxvt_wcstombs (selection.text, selection.len);
2917 paste (str, strlen (str)); 2752 paste (str, strlen (str));
2918 free (str); 2753 free (str);
2919 return;
2920 }
2921 else
2922 { 2754 }
2923 selection_request_time = tm; 2755 else if (!selection_req)
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 } 2756 {
2936 2757 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2937 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2758 selection_req->run ();
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 { 2759 }
2957 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2958 vt, selection_request_time);
2959 return 1;
2960 }
2961
2962 return 0;
2963} 2760}
2964 2761
2965/* ------------------------------------------------------------------------- */ 2762/* ------------------------------------------------------------------------- */
2966/* 2763/*
2967 * Clear all selected text 2764 * Clear all selected text
… …
2998 * EXT: button 1 or 3 release 2795 * EXT: button 1 or 3 release
2999 */ 2796 */
3000void 2797void
3001rxvt_term::selection_make (Time tm) 2798rxvt_term::selection_make (Time tm)
3002{ 2799{
3003 int i; 2800 int size;
3004 wchar_t *new_selection_text; 2801 wchar_t *new_selection_text;
3005 text_t *t; 2802 text_t *t;
3006 2803
3007 switch (selection.op) 2804 switch (selection.op)
3008 { 2805 {
… …
3024 return; /* nothing selected, go away */ 2821 return; /* nothing selected, go away */
3025 2822
3026 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2823 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3027 return; 2824 return;
3028 2825
3029 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2826 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3030 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2827 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3031 2828
3032 int ofs = 0; 2829 int ofs = 0;
3033 int extra = 0; 2830 int extra = 0;
3034 2831
3035 int col = selection.beg.col; 2832 int col = selection.beg.col;
… …
3041 { 2838 {
3042#if !ENABLE_MINIMAL 2839#if !ENABLE_MINIMAL
3043 if (selection.rect) 2840 if (selection.rect)
3044 { 2841 {
3045 col = selection.beg.col; 2842 col = selection.beg.col;
3046 end_col = ncol + 1; 2843 end_col = selection.end.col;
3047 } 2844 }
3048 else 2845 else
3049#endif 2846#endif
3050 end_col = ROW(row).l; 2847 end_col = ROW(row).l;
3051 2848
3052 col = max (col, 0); 2849 col = max (col, 0);
3053 2850
3054 if (row == selection.end.row 2851 if (row == selection.end.row)
3055#if !ENABLE_MINIMAL
3056 || selection.rect
3057#endif
3058 )
3059 min_it (end_col, selection.end.col); 2852 min_it (end_col, selection.end.col);
3060 2853
3061 t = ROW(row).t + col; 2854 t = ROW(row).t + col;
3062 2855
3063 for (; col < end_col; col++) 2856 for (; col < end_col; col++)
… …
3071 2864
3072 extra -= (len - 1); 2865 extra -= (len - 1);
3073 2866
3074 if (extra < 0) 2867 if (extra < 0)
3075 { 2868 {
3076 extra += i; 2869 extra += size;
3077 i += i; 2870 size += size;
3078 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2871 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3079 } 2872 }
3080 2873
3081 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2874 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3082 } 2875 }
3083#endif 2876#endif
… …
3095 2888
3096 new_selection_text[ofs++] = C0_LF; 2889 new_selection_text[ofs++] = C0_LF;
3097 } 2890 }
3098 else 2891 else
3099#endif 2892#endif
3100 if (!ROW(row).is_longer () && row != selection.end.row) 2893 if (!ROW(row).is_longer ()
2894 && (row != selection.end.row || end_col != selection.end.col)
2895 && (row != selection.beg.row || selection.beg.col < ncol))
3101 new_selection_text[ofs++] = C0_LF; 2896 new_selection_text[ofs++] = C0_LF;
3102 } 2897 }
3103
3104 if (end_col != selection.end.col)
3105 new_selection_text[ofs++] = C0_LF;
3106 2898
3107 new_selection_text[ofs] = 0; 2899 new_selection_text[ofs] = 0;
3108 2900
3109 if (ofs == 0) 2901 if (ofs == 0)
3110 { 2902 {

Diff Legend

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