[ViewVC] Diff of: cvs/rxvt-unicode/src/screen.C

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.354 by root, Fri Oct 15 21:14:12 2010 UTC vs.
Revision 1.369 by sf-exg, Sun Feb 6 11:42:03 2011 UTC

…		…
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 everywhere 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 its 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
…		…
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
2512	void	2510	void
2513	rxvt_term::scr_recolour () NOTHROW	2511	rxvt_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	/* ------------------------------------------------------------------------- */
2539	void	2561	void
…		…
2627	void	2649	void
2628	rxvt_term::scr_dump (int fd) NOTHROW	2650	rxvt_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
…		…
2718	void	2740	void
2719	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW	2741	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2720	{	2742	{
2721	if (prop == None) /* check for failed XConvertSelection */	2743	if (prop == None) /* check for failed XConvertSelection */
2722	{	2744	{
		2745	int selnum = selection_type & Sel_whereMask;
		2746
		2747	if (selnum == Sel_direct)
		2748	selection_type = 0;
		2749
2723	if ((selection_type & Sel_CompoundText))	2750	if ((selection_type & Sel_CompoundText))
2724	{	2751	{
2725	int selnum = selection_type & Sel_whereMask;
2726
2727	selection_type = 0;	2752	selection_type = 0;
2728	if (selnum != Sel_direct)
2729	selection_request_other (XA_STRING, selnum);	2753	selection_request_other (XA_STRING, selnum);
2730	}	2754	}
2731		2755
2732	if ((selection_type & Sel_UTF8String))	2756	if ((selection_type & Sel_UTF8String))
2733	{	2757	{
2734	int selnum = selection_type & Sel_whereMask;
2735
2736	selection_type = Sel_CompoundText;	2758	selection_type = Sel_CompoundText;
2737	if (selnum != Sel_direct)
2738	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);	2759	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2739	else
2740	selection_type = 0;
2741	}	2760	}
2742		2761
2743	return;	2762	return;
2744	}	2763	}
2745		2764
2746	unsigned long bytes_after;	2765	unsigned long bytes_after;
2747	XTextProperty ct;	2766	XTextProperty ct;
2748		2767
		2768	// length == (2^31 - 1) / 4, as gdk
2749	if (XGetWindowProperty (dpy, win, prop,	2769	if (XGetWindowProperty (dpy, win, prop,
2750	0, PROP_SIZE / 4,	2770	0, 0x1fffffff,
2751	delete_prop, AnyPropertyType,	2771	delete_prop, AnyPropertyType,
2752	&ct.encoding, &ct.format,	2772	&ct.encoding, &ct.format,
2753	&ct.nitems, &bytes_after,	2773	&ct.nitems, &bytes_after,
2754	&ct.value) != Success)	2774	&ct.value) != Success)
2755	{	2775	{
…		…
2757	goto bailout;	2777	goto bailout;
2758	}	2778	}
2759		2779
2760	if (ct.encoding == None)	2780	if (ct.encoding == None)
2761	goto bailout;	2781	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		2782
2784	if (ct.value == 0)	2783	if (ct.value == 0)
2785	goto bailout;	2784	goto bailout;
2786		2785
2787	if (ct.encoding == xa[XA_INCR])	2786	if (ct.encoding == xa[XA_INCR])
…		…
2818	{	2817	{
2819	/*	2818	/*
2820	* pass through again trying CUT_BUFFER0 if we've come from	2819	* pass through again trying CUT_BUFFER0 if we've come from
2821	* XConvertSelection () but nothing was presented	2820	* XConvertSelection () but nothing was presented
2822	*/	2821	*/
2823	selection_paste (display->root, XA_CUT_BUFFER0, False);	2822	selection_paste (display->root, XA_CUT_BUFFER0, false);
2824	}	2823	}
2825		2824
2826	goto bailout;	2825	goto bailout;
2827	}	2826	}
2828	}	2827	}
…		…
2831	incr_ev.start (10);	2830	incr_ev.start (10);
2832		2831
2833	while (incr_buf_fill + ct.nitems > incr_buf_size)	2832	while (incr_buf_fill + ct.nitems > incr_buf_size)
2834	{	2833	{
2835	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;	2834	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2836	incr_buf = (char *)realloc (incr_buf, incr_buf_size);	2835	incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2837	}	2836	}
2838		2837
2839	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);	2838	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2840	incr_buf_fill += ct.nitems;	2839	incr_buf_fill += ct.nitems;
2841		2840
…		…
2998	* EXT: button 1 or 3 release	2997	* EXT: button 1 or 3 release
2999	*/	2998	*/
3000	void	2999	void
3001	rxvt_term::selection_make (Time tm)	3000	rxvt_term::selection_make (Time tm)
3002	{	3001	{
3003	int i;	3002	int size;
3004	wchar_t *new_selection_text;	3003	wchar_t *new_selection_text;
3005	text_t *t;	3004	text_t *t;
3006		3005
3007	switch (selection.op)	3006	switch (selection.op)
3008	{	3007	{
…		…
3024	return; /* nothing selected, go away */	3023	return; /* nothing selected, go away */
3025		3024
3026	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	3025	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3027	return;	3026	return;
3028		3027
3029	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	3028	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3030	new_selection_text = (wchar_t )rxvt_malloc ((i + 4) sizeof (wchar_t));	3029	new_selection_text = (wchar_t )rxvt_malloc ((size + 4) sizeof (wchar_t));
3031		3030
3032	int ofs = 0;	3031	int ofs = 0;
3033	int extra = 0;	3032	int extra = 0;
3034		3033
3035	int col = selection.beg.col;	3034	int col = selection.beg.col;
…		…
3041	{	3040	{
3042	#if !ENABLE_MINIMAL	3041	#if !ENABLE_MINIMAL
3043	if (selection.rect)	3042	if (selection.rect)
3044	{	3043	{
3045	col = selection.beg.col;	3044	col = selection.beg.col;
3046	end_col = ncol + 1;	3045	end_col = selection.end.col;
3047	}	3046	}
3048	else	3047	else
3049	#endif	3048	#endif
3050	end_col = ROW(row).l;	3049	end_col = ROW(row).l;
3051		3050
3052	col = max (col, 0);	3051	col = max (col, 0);
3053		3052
3054	if (row == selection.end.row	3053	if (row == selection.end.row)
3055	#if !ENABLE_MINIMAL
3056	\|\| selection.rect
3057	#endif
3058	)
3059	min_it (end_col, selection.end.col);	3054	min_it (end_col, selection.end.col);
3060		3055
3061	t = ROW(row).t + col;	3056	t = ROW(row).t + col;
3062		3057
3063	for (; col < end_col; col++)	3058	for (; col < end_col; col++)
…		…
3071		3066
3072	extra -= (len - 1);	3067	extra -= (len - 1);
3073		3068
3074	if (extra < 0)	3069	if (extra < 0)
3075	{	3070	{
3076	extra += i;	3071	extra += size;
3077	i += i;	3072	size += size;
3078	new_selection_text = (wchar_t )rxvt_realloc (new_selection_text, (i + 4) sizeof (wchar_t));	3073	new_selection_text = (wchar_t )rxvt_realloc (new_selection_text, (size + 4) sizeof (wchar_t));
3079	}	3074	}
3080		3075
3081	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	3076	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3082	}	3077	}
3083	#endif	3078	#endif
…		…
3095		3090
3096	new_selection_text[ofs++] = C0_LF;	3091	new_selection_text[ofs++] = C0_LF;
3097	}	3092	}
3098	else	3093	else
3099	#endif	3094	#endif
3100	if (!ROW(row).is_longer () && row != selection.end.row)	3095	if (!ROW(row).is_longer ()
		3096	&& (row != selection.end.row \|\| end_col != selection.end.col)
		3097	&& (row != selection.beg.row \|\| selection.beg.col < ncol))
3101	new_selection_text[ofs++] = C0_LF;	3098	new_selection_text[ofs++] = C0_LF;
3102	}	3099	}
3103
3104	if (end_col != selection.end.col)
3105	new_selection_text[ofs++] = C0_LF;
3106		3100
3107	new_selection_text[ofs] = 0;	3101	new_selection_text[ofs] = 0;
3108		3102
3109	if (ofs == 0)	3103	if (ofs == 0)
3110	{	3104	{

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.354 by root, Fri Oct 15 21:14:12 2010 UTC vs. Revision 1.369 by sf-exg, Sun Feb 6 11:42:03 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.354 by root, Fri Oct 15 21:14:12 2010 UTC vs.
Revision 1.369 by sf-exg, Sun Feb 6 11:42:03 2011 UTC