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.203 by root, Sat Dec 31 19:30:25 2005 UTC vs.
Revision 1.209 by root, Thu Jan 5 01:04:10 2006 UTC

… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
417 418
418 for (int col = ncol; col--; ) 419 for (int col = ncol; col--; )
419 tabs [col] = col % TABSIZE == 0; 420 tabs [col] = col % TABSIZE == 0;
420 421
421 tt_winch (); 422 tt_winch ();
423
424 PERL_INVOKE ((this, HOOK_RESET, DT_END));
422} 425}
423 426
424/* ------------------------------------------------------------------------- */ 427/* ------------------------------------------------------------------------- */
425/* 428/*
426 * Free everything. That way malloc debugging can find leakage. 429 * Free everything. That way malloc debugging can find leakage.
… …
619 && row1 == 0 622 && row1 == 0
620 && row2 == nrow - 1 623 && row2 == nrow - 1
621 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 624 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
622 { 625 {
623 nsaved = min (nsaved + count, saveLines); 626 nsaved = min (nsaved + count, saveLines);
627
628 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
629
624 term_start = (term_start + count) % total_rows; 630 term_start = (term_start + count) % total_rows;
625 631
626 if (selection.op && current_screen == selection.screen) 632 if (selection.op && current_screen == selection.screen)
627 { 633 {
628 selection.beg.row -= count; 634 selection.beg.row -= count;
… …
716 last_col = ncol; 722 last_col = ncol;
717 723
718 if (nlines > 0) 724 if (nlines > 0)
719 { 725 {
720 nlines += screen.cur.row - screen.bscroll; 726 nlines += screen.cur.row - screen.bscroll;
727
721 if (nlines > 0 728 if (nlines > 0
722 && screen.tscroll == 0 729 && screen.tscroll == 0
723 && screen.bscroll == (nrow - 1)) 730 && screen.bscroll == (nrow - 1))
724 { 731 {
725 /* _at least_ this many lines need to be scrolled */ 732 /* _at least_ this many lines need to be scrolled */
… …
1819} 1826}
1820 1827
1821int 1828int
1822rxvt_term::scr_changeview (unsigned int oldviewstart) 1829rxvt_term::scr_changeview (unsigned int oldviewstart)
1823{ 1830{
1831 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1832
1824 if (view_start != oldviewstart) 1833 if (view_start != oldviewstart)
1825 { 1834 {
1826 want_refresh = 1; 1835 want_refresh = 1;
1827 num_scr -= (view_start - oldviewstart); 1836 num_scr -= (view_start - oldviewstart);
1828 } 1837 }
… …
2039 oldcursor.col = screen.cur.col; 2048 oldcursor.col = screen.cur.col;
2040 } 2049 }
2041 } 2050 }
2042 } 2051 }
2043 2052
2053 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY 2054#if ENABLE_OVERLAY
2045 scr_swap_overlay (); 2055 scr_swap_overlay ();
2046#endif 2056#endif
2047 2057
2048#ifndef NO_SLOW_LINK_SUPPORT 2058#ifndef NO_SLOW_LINK_SUPPORT
… …
2098 if (wlen < len) 2108 if (wlen < len)
2099 ::swap (wlen, len); 2109 ::swap (wlen, len);
2100 2110
2101 XCopyArea (display->display, vt, vt, 2111 XCopyArea (display->display, vt, vt,
2102 gc, 0, Row2Pixel (len + i), 2112 gc, 0, Row2Pixel (len + i),
2103 (unsigned int)TermWin_TotalWidth (), 2113 (unsigned int)this->width,
2104 (unsigned int)Height2Pixel (wlen - len + 1), 2114 (unsigned int)Height2Pixel (wlen - len + 1),
2105 0, Row2Pixel (len)); 2115 0, Row2Pixel (len));
2106 len = -1; 2116 len = -1;
2107 } 2117 }
2108 } 2118 }
… …
2311 } /* for (row....) */ 2321 } /* for (row....) */
2312 2322
2313#if ENABLE_OVERLAY 2323#if ENABLE_OVERLAY
2314 scr_swap_overlay (); 2324 scr_swap_overlay ();
2315#endif 2325#endif
2326 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2316 2327
2317 /* 2328 /*
2318 * G: cleanup cursor and display outline cursor if necessary 2329 * G: cleanup cursor and display outline cursor if necessary
2319 */ 2330 */
2320 if (showcursor) 2331 if (showcursor)
… …
2554/* ------------------------------------------------------------------------- */ 2565/* ------------------------------------------------------------------------- */
2555/* 2566/*
2556 * Paste a selection direct to the command fd 2567 * Paste a selection direct to the command fd
2557 */ 2568 */
2558void 2569void
2559rxvt_term::paste (unsigned char *data, unsigned int len) 2570rxvt_term::paste (char *data, unsigned int len)
2560{ 2571{
2561 /* convert normal newline chars into common keyboard Return key sequence */ 2572 /* convert normal newline chars into common keyboard Return key sequence */
2562 for (unsigned int i = 0; i < len; i++) 2573 for (unsigned int i = 0; i < len; i++)
2563 if (data[i] == C0_LF) 2574 if (data[i] == C0_LF)
2564 data[i] = C0_CR; 2575 data[i] = C0_CR;
… …
2708 { 2719 {
2709 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2720 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2710 char *s = rxvt_wcstombs (w); 2721 char *s = rxvt_wcstombs (w);
2711 free (w); 2722 free (w);
2712 // TODO: strlen == only the first element will be converted. well... 2723 // TODO: strlen == only the first element will be converted. well...
2713 paste ((unsigned char *)s, strlen (s)); 2724 paste (s, strlen (s));
2714 free (s); 2725 free (s);
2715 } 2726 }
2716 else 2727 else
2717#endif 2728#endif
2718 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2729 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2719 && cl) 2730 && cl)
2720 { 2731 {
2721 for (int i = 0; i < cr; i++) 2732 for (int i = 0; i < cr; i++)
2722 paste ((unsigned char *)cl[i], strlen (cl[i])); 2733 paste (cl[i], strlen (cl[i]));
2723 2734
2724 XFreeStringList (cl); 2735 XFreeStringList (cl);
2725 } 2736 }
2726 else 2737 else
2727 paste (ct.value, ct.nitems); // paste raw 2738 paste ((char *)ct.value, ct.nitems); // paste raw
2728 2739
2729bailout: 2740bailout:
2730 XFree (ct.value); 2741 XFree (ct.value);
2731 2742
2732 if (selection_wait == Sel_normal) 2743 if (selection_wait == Sel_normal)
… …
2770 return; /* outside window */ 2781 return; /* outside window */
2771 2782
2772 if (selection.text) 2783 if (selection.text)
2773 { /* internal selection */ 2784 { /* internal selection */
2774 char *str = rxvt_wcstombs (selection.text, selection.len); 2785 char *str = rxvt_wcstombs (selection.text, selection.len);
2775 paste ((unsigned char *)str, strlen (str)); 2786 paste (str, strlen (str));
2776 free (str); 2787 free (str);
2777 return; 2788 return;
2778 } 2789 }
2779 else 2790 else
2780 { 2791 {
… …
2872 selection.op = SELECTION_DONE; 2883 selection.op = SELECTION_DONE;
2873 2884
2874 if (selection.clicks == 4) 2885 if (selection.clicks == 4)
2875 return; /* nothing selected, go away */ 2886 return; /* nothing selected, go away */
2876 2887
2888 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2889 return;
2890
2877 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2891 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2878 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2892 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2879 2893
2880 int ofs = 0; 2894 int ofs = 0;
2881 int extra = 0; 2895 int extra = 0;
… …
2963 2977
2964 // we usually allocate much more than necessary, so realloc it smaller again 2978 // we usually allocate much more than necessary, so realloc it smaller again
2965 selection.len = ofs; 2979 selection.len = ofs;
2966 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2980 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2967 2981
2982 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2983 return;
2984
2985 selection_grab (tm);
2986}
2987
2988bool
2989rxvt_term::selection_grab (Time tm)
2990{
2991 selection_time = tm;
2992
2968 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 2993 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2969 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 2994 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2995 {
2970 display->set_selection_owner (this); 2996 display->set_selection_owner (this);
2997 return true;
2998 }
2971 else 2999 else
2972 rxvt_warn ("can't get primary selection, ignoring.\n"); 3000 return false;
2973 3001
2974#if 0 3002#if 0
2975 XTextProperty ct; 3003 XTextProperty ct;
2976 3004
2977 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3005 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2978 { 3006 {
2979 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3007 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2980 XFree (ct.value); 3008 XFree (ct.value);
2981 } 3009 }
2982#endif 3010#endif
2983
2984 selection_time = tm;
2985} 3011}
2986 3012
2987/* ------------------------------------------------------------------------- */ 3013/* ------------------------------------------------------------------------- */
2988/* 3014/*
2989 * Mark or select text based upon number of clicks: 1, 2, or 3 3015 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3111 } 3137 }
3112 } 3138 }
3113 break; 3139 break;
3114 } 3140 }
3115 3141
3116Old_Word_Selection_You_Die:
3117 if (dirn == DN) 3142 if (dirn == DN)
3118 col++; /* put us on one past the end */ 3143 col++; /* put us on one past the end */
3119 3144
3120 /* Poke the values back in */ 3145 /* Poke the values back in */
3121 ret->row = row; 3146 ret->row = row;
… …
3298 else if (selection.clicks == 2) 3323 else if (selection.clicks == 2)
3299 { 3324 {
3300 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3325 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3301 selection.end.col--; 3326 selection.end.col--;
3302 3327
3328 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3329 {
3303 selection_delimit_word (UP, &selection.beg, &selection.beg); 3330 selection_delimit_word (UP, &selection.beg, &selection.beg);
3304 selection_delimit_word (DN, &selection.end, &selection.end); 3331 selection_delimit_word (DN, &selection.end, &selection.end);
3332 }
3305 } 3333 }
3306 else if (selection.clicks == 3) 3334 else if (selection.clicks == 3)
3307 { 3335 {
3308#if ENABLE_FRILLS 3336#if ENABLE_FRILLS
3309 if (OPTION (Opt_tripleclickwords)) 3337 if (OPTION (Opt_tripleclickwords))
… …
3585 3613
3586#if ENABLE_OVERLAY 3614#if ENABLE_OVERLAY
3587void 3615void
3588rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3616rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3589{ 3617{
3590 if (nrow < 3 || ncol < 3) 3618 if (nrow < 1 || ncol < 1)
3591 return; 3619 return;
3592 3620
3593 want_refresh = 1; 3621 want_refresh = 1;
3594 3622
3595 scr_overlay_off (); 3623 scr_overlay_off ();

Diff Legend

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