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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.318 by root, Tue Nov 4 22:44:09 2008 UTC vs.
Revision 1.340 by sf-exg, Sat Apr 17 23:00:45 2010 UTC

…		…
231	selection.text = NULL;	231	selection.text = NULL;
232	selection.len = 0;	232	selection.len = 0;
233	selection.op = SELECTION_CLEAR;	233	selection.op = SELECTION_CLEAR;
234	selection.screen = PRIMARY;	234	selection.screen = PRIMARY;
235	selection.clicks = 0;	235	selection.clicks = 0;
		236	selection.clip_text = NULL;
		237	selection.clip_len = 0;
236	}	238	}
237	else	239	else
238	{	240	{
239	/*	241	/*
240	* add or delete rows as appropriate	242	* add or delete rows as appropriate
…		…
278		280
279	if (top_row)	281	if (top_row)
280	{	282	{
281	// Re-wrap lines. This is rather ugly, possibly because I am too dumb	283	// Re-wrap lines. This is rather ugly, possibly because I am too dumb
282	// to come up with a lean and mean algorithm.	284	// to come up with a lean and mean algorithm.
		285	// TODO: maybe optimise when width didn't change
283		286
284	row_col_t ocur = screen.cur;	287	row_col_t ocur = screen.cur;
285	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	288	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
286		289
287	do	290	do
288	{	291	{
289	p = MOD (p - 1, prev_total_rows);	292	p = MOD (p - 1, prev_total_rows);
290	#ifdef DEBUG_STRICT
291	assert (old_buf [MOD (p, prev_total_rows)].t);	293	assert (old_buf [MOD (p, prev_total_rows)].t);
292	#endif
293	int plines = 1;	294	int plines = 1;
294	int llen = old_buf [MOD (p, prev_total_rows)].l;	295	int llen = old_buf [MOD (p, prev_total_rows)].l;
295		296
296	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	297	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
297	{	298	{
…		…
393		394
394	clamp_it (screen.cur.row, 0, nrow - 1);	395	clamp_it (screen.cur.row, 0, nrow - 1);
395	clamp_it (screen.cur.col, 0, ncol - 1);	396	clamp_it (screen.cur.col, 0, ncol - 1);
396	}	397	}
397		398
		399	free (tabs);
		400	tabs = (char *)rxvt_malloc (ncol);
		401
		402	for (int col = ncol; --col; )
		403	tabs [col] = col % TABSIZE == 0;
		404
398	CLEAR_ALL_SELECTION ();	405	CLEAR_ALL_SELECTION ();
399		406
400	prev_nrow = nrow;	407	prev_nrow = nrow;
401	prev_ncol = ncol;	408	prev_ncol = ncol;
402		409
…		…
434	void	441	void
435	rxvt_term::scr_poweron ()	442	rxvt_term::scr_poweron ()
436	{	443	{
437	scr_release ();	444	scr_release ();
438	prev_nrow = prev_ncol = 0;	445	prev_nrow = prev_ncol = 0;
		446	rvideo_mode = false;
439	scr_soft_reset ();	447	scr_soft_reset ();
440	scr_reset ();	448	scr_reset ();
441		449
442	scr_clear (true);	450	scr_clear (true);
443	scr_refresh ();	451	scr_refresh ();
…		…
448	{	456	{
449	/* only affects modes, nothing drastic such as clearing the screen */	457	/* only affects modes, nothing drastic such as clearing the screen */
450	#if ENABLE_OVERLAY	458	#if ENABLE_OVERLAY
451	scr_overlay_off ();	459	scr_overlay_off ();
452	#endif	460	#endif
453
454	rvideo_mode = false;
455
456	if (current_screen != PRIMARY)
457	scr_swap_screen ();
458
459	free (tabs);
460	tabs = (char *)rxvt_malloc (ncol);
461
462	for (int col = ncol; --col; )
463	tabs [col] = col % TABSIZE == 0;
464		461
465	if (current_screen != PRIMARY)	462	if (current_screen != PRIMARY)
466	scr_swap_screen ();	463	scr_swap_screen ();
467		464
468	scr_scroll_region (0, MAX_ROWS - 1);	465	scr_scroll_region (0, MAX_ROWS - 1);
…		…
513	}	510	}
514		511
515	/* boundary check in case screen size changed between SAVE and RESTORE */	512	/* boundary check in case screen size changed between SAVE and RESTORE */
516	min_it (s->cur.row, nrow - 1);	513	min_it (s->cur.row, nrow - 1);
517	min_it (s->cur.col, ncol - 1);	514	min_it (s->cur.col, ncol - 1);
518	#ifdef DEBUG_STRICT
519	assert (s->cur.row >= 0);	515	assert (s->cur.row >= 0);
520	assert (s->cur.col >= 0);	516	assert (s->cur.col >= 0);
521	#endif
522	}	517	}
523		518
524	void	519	void
525	rxvt_term::scr_swap_screen ()	520	rxvt_term::scr_swap_screen ()
526	{	521	{
…		…
551	want_refresh = 1;	546	want_refresh = 1;
552	view_start = 0;	547	view_start = 0;
553		548
554	selection_check (2); /* check for boundary cross */	549	selection_check (2); /* check for boundary cross */
555		550
556	int i = current_screen; current_screen = scrn; scrn = i;	551	current_screen = scrn;
557		552
558	#if NSCREENS	553	#if NSCREENS
559	if (option (Opt_secondaryScreen))	554	if (option (Opt_secondaryScreen))
560	{	555	{
561	num_scr = 0;	556	num_scr = 0;
…		…
786	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);	781	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
787	screen.cur.row -= minlines;	782	screen.cur.row -= minlines;
788	}	783	}
789	}	784	}
790		785
791	#ifdef DEBUG_STRICT
792	assert (screen.cur.col < ncol);	786	assert (screen.cur.col < ncol);
793	assert (screen.cur.row < nrow	787	assert (screen.cur.row < nrow
794	&& screen.cur.row >= top_row);	788	&& screen.cur.row >= top_row);
795	#endif
796	int row = screen.cur.row;	789	int row = screen.cur.row;
797		790
798	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	791	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
799		792
800	line_t *line = &ROW(row);	793	line_t *line = &ROW(row);
…		…
1004	#endif	997	#endif
1005	}	998	}
1006		999
1007	max_it (line->l, screen.cur.col);	1000	max_it (line->l, screen.cur.col);
1008		1001
1009	#ifdef DEBUG_STRICT
1010	assert (screen.cur.row >= 0);	1002	assert (screen.cur.row >= 0);
1011	#endif
1012	}	1003	}
1013		1004
1014	/* ------------------------------------------------------------------------- */	1005	/* ------------------------------------------------------------------------- */
1015	/*	1006	/*
1016	* Process Backspace. Move back the cursor back a position, wrap if have to	1007	* Process Backspace. Move back the cursor back a position, wrap if have to
…		…
1344	if (row >= nrow) /* Out Of Bounds */	1335	if (row >= nrow) /* Out Of Bounds */
1345	return;	1336	return;
1346		1337
1347	min_it (num, nrow - row);	1338	min_it (num, nrow - row);
1348		1339
1349	/TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details /	1340	// TODO: the code below does not work when view_start != 0
		1341	// the workaround is to disable the clear and use a normal refresh
		1342	// when view_start != 0. mysterious.
1350	if (rstyle & (RS_RVid \| RS_Uline))	1343	if (rstyle & (RS_RVid \| RS_Uline))
1351	ren = (rend_t) ~RS_None;	1344	ren = (rend_t) ~RS_None;
1352	else if (GET_BASEBG (rstyle) == Color_bg)	1345	else if (GET_BASEBG (rstyle) == Color_bg)
1353	{	1346	{
1354	ren = DEFAULT_RSTYLE;	1347	ren = DEFAULT_RSTYLE;
1355		1348
1356	if (mapped)	1349	if (mapped && !view_start)
1357	XClearArea (dpy, vt, 0,	1350	XClearArea (dpy, vt, 0,
1358	Row2Pixel (row), (unsigned int)width,	1351	Row2Pixel (row - view_start), (unsigned int)width,
1359	(unsigned int)Height2Pixel (num), False);	1352	(unsigned int)Height2Pixel (num), False);
1360	}	1353	}
1361	else	1354	else
1362	{	1355	{
1363	ren = rstyle & (RS_fgMask \| RS_bgMask);	1356	ren = rstyle & (RS_fgMask \| RS_bgMask);
1364		1357
		1358	if (mapped && !view_start)
		1359	{
1365	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1360	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1361	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367	XFillRectangle (dpy, vt, gc,	1362	XFillRectangle (dpy, vt, gc,
1368	0, Row2Pixel (row),	1363	0, Row2Pixel (row - view_start),
1369	(unsigned int)width,	1364	(unsigned int)width,
1370	(unsigned int)Height2Pixel (num));	1365	(unsigned int)Height2Pixel (num));
1371	gcvalue.foreground = pix_colors[Color_fg];	1366	gcvalue.foreground = pix_colors[Color_fg];
1372	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1367	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1368	}
1373	}	1369	}
1374		1370
1375	for (; num--; row++)	1371	for (; num--; row++)
1376	{	1372	{
1377	scr_blank_screen_mem (ROW(row), rstyle);	1373	scr_blank_screen_mem (ROW(row), rstyle);
		1374
		1375	if (!view_start)
1378	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1376	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1379	}	1377	}
1380	}	1378	}
1381		1379
1382	#if !ENABLE_MINIMAL	1380	#if !ENABLE_MINIMAL
1383	void	1381	void
…		…
1536	{	1534	{
1537	line->t[col] = line->t[col + count];	1535	line->t[col] = line->t[col + count];
1538	line->r[col] = line->r[col + count];	1536	line->r[col] = line->r[col + count];
1539	}	1537	}
1540		1538
1541	scr_blank_line (*line, ncol - count, count,	1539	scr_blank_line (*line, ncol - count, count, rstyle);
1542	line->r[ncol - 1] & (RS_fgMask \| RS_bgMask \| RS_baseattrMask));
1543		1540
1544	if (selection.op && current_screen == selection.screen	1541	if (selection.op && current_screen == selection.screen
1545	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1542	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1546	{	1543	{
1547	if (selection.end.row != screen.cur.row	1544	if (selection.end.row != screen.cur.row
…		…
1837	for (i = PART_BEG; i < RC_COUNT; i++)	1834	for (i = PART_BEG; i < RC_COUNT; i++)
1838	{	1835	{
1839	min_it (rc[i].col, ncol - 1);	1836	min_it (rc[i].col, ncol - 1);
1840	min_it (rc[i].row, nrow - 1);	1837	min_it (rc[i].row, nrow - 1);
1841	}	1838	}
1842	// TODO: this line somehow causes segfault if scr_expose() is called just after resize	1839
1843	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1840	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1844	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1841	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1845		1842
1846	num_scr_allow = 0;	1843	num_scr_allow = 0;
1847		1844
…		…
1938		1935
1939	bell_ev.start (VISUAL_BELL_DURATION);	1936	bell_ev.start (VISUAL_BELL_DURATION);
1940	}	1937	}
1941	else	1938	else
1942	XBell (dpy, 0);	1939	XBell (dpy, 0);
		1940	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1943	#endif	1941	#endif
1944	}	1942	}
1945		1943
1946	/* ------------------------------------------------------------------------- */	1944	/* ------------------------------------------------------------------------- */
1947	/* ARGSUSED */	1945	/* ARGSUSED */
…		…
1966	row_start = view_start;	1964	row_start = view_start;
1967	}	1965	}
1968		1966
1969	wctomb (0, 0);	1967	wctomb (0, 0);
1970		1968
1971	for (int r1 = 0; r1 < nrows; r1++)	1969	for (int r1 = row_start; r1 < row_start + nrows; r1++)
1972	{	1970	{
1973	text_t *tp = ROW(r1).t;	1971	text_t *tp = ROW(r1).t;
1974	int len = ROW(r1).l;	1972	int len = ROW(r1).l;
1975		1973
1976	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN	1974	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
…		…
2005	* screen.text/screen.rend contain what the screen will change to.	2003	* screen.text/screen.rend contain what the screen will change to.
2006	*/	2004	*/
2007	void	2005	void
2008	rxvt_term::scr_refresh () NOTHROW	2006	rxvt_term::scr_refresh () NOTHROW
2009	{	2007	{
2010	unsigned char have_bg,
2011	showcursor; /* show the cursor */
2012	int16_t col, row, /* column/row we're processing */	2008	int16_t col, row, /* column/row we're processing */
2013	ocrow; /* old cursor row */	2009	ocrow; /* old cursor row */
2014	int i; /* tmp */	2010	int i; /* tmp */
2015	#ifndef NO_CURSORCOLOR	2011	#ifndef NO_CURSORCOLOR
2016	rend_t cc1; /* store colours at cursor position (s) */	2012	rend_t cc1; /* store colours at cursor position (s) */
…		…
2027	/*	2023	/*
2028	* A: set up vars	2024	* A: set up vars
2029	*/	2025	*/
2030	refresh_count = 0;	2026	refresh_count = 0;
2031		2027
		2028	unsigned int old_screen_flags = screen.flags;
2032	have_bg = 0;	2029	char have_bg = 0;
2033	#ifdef HAVE_BG_PIXMAP	2030	#ifdef HAVE_BG_PIXMAP
2034	have_bg = bgPixmap.pixmap != None;	2031	have_bg = bgPixmap.pixmap != None;
2035	#endif	2032	#endif
2036	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2033	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037		2034
2038	/*	2035	/*
2039	* B: reverse any characters which are selected	2036	* B: reverse any characters which are selected
2040	*/	2037	*/
2041	scr_reverse_selection ();	2038	scr_reverse_selection ();
		2039
		2040	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
		2041	#if ENABLE_OVERLAY
		2042	scr_swap_overlay ();
		2043	#endif
		2044
		2045	char showcursor = screen.flags & Screen_VisibleCursor;
2042		2046
2043	/*	2047	/*
2044	* C: set the cursor character (s)	2048	* C: set the cursor character (s)
2045	*/	2049	*/
2046	{	2050	{
2047	unsigned char setoldcursor;	2051	unsigned char setoldcursor;
2048		2052
2049	showcursor = (screen.flags & Screen_VisibleCursor);
2050	#ifdef CURSOR_BLINK	2053	#ifdef CURSOR_BLINK
2051	if (hidden_cursor)	2054	if (hidden_cursor)
2052	showcursor = 0;	2055	showcursor = 0;
2053	#endif	2056	#endif
2054		2057
…		…
2082	ccol2 = bgcolor_of (rstyle);	2085	ccol2 = bgcolor_of (rstyle);
2083	#else	2086	#else
2084	ccol2 = Color_bg;	2087	ccol2 = Color_bg;
2085	#endif	2088	#endif
2086		2089
2087	if (showcursor && focus)	2090	if (focus)
2088	{	2091	{
2089	if (option (Opt_cursorUnderline))	2092	if (option (Opt_cursorUnderline))
2090	*crp ^= RS_Uline;	2093	*crp ^= RS_Uline;
2091	else	2094	else
2092	{	2095	{
…		…
2127	oldcursor.col = screen.cur.col;	2130	oldcursor.col = screen.cur.col;
2128	}	2131	}
2129	}	2132	}
2130	}	2133	}
2131		2134
2132	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2133	#if ENABLE_OVERLAY
2134	scr_swap_overlay ();
2135	#endif
2136
2137	#ifndef NO_SLOW_LINK_SUPPORT	2135	#ifndef NO_SLOW_LINK_SUPPORT
2138	/*	2136	/*
2139	* D: CopyArea pass - very useful for slower links	2137	* D: CopyArea pass - very useful for slower links
2140	* This has been deliberately kept simple.	2138	* This has been deliberately kept simple.
2141	*/	2139	*/
…		…
2233		2231
2234	// seek to the beginning of wide characters	2232	// seek to the beginning of wide characters
2235	while (expect_false (stp[col] == NOCHAR && col > 0))	2233	while (expect_false (stp[col] == NOCHAR && col > 0))
2236	--col;	2234	--col;
2237		2235
2238	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2236	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2239	text_t *text = stp + col;	2237	text_t *text = stp + col;
2240	int count = 1;	2238	int count = 1;
2241		2239
2242	dtp[col] = stp[col];	2240	dtp[col] = stp[col];
2243	drp[col] = rend;	2241	drp[col] = rend;
…		…
2247	for (i = 0; ++col < ncol; )	2245	for (i = 0; ++col < ncol; )
2248	{	2246	{
2249	if (stp[col] == NOCHAR)	2247	if (stp[col] == NOCHAR)
2250	{	2248	{
2251	dtp[col] = stp[col];	2249	dtp[col] = stp[col];
2252	drp[col] = rend;	2250	drp[col] = srp[col];
		2251
2253	count++;	2252	count++;
2254	i++;	2253	i++;
2255		2254
2256	continue;	2255	continue;
2257	}	2256	}
…		…
2287	*/	2286	*/
2288	int fore = fgcolor_of (rend); // desired foreground	2287	int fore = fgcolor_of (rend); // desired foreground
2289	int back = bgcolor_of (rend); // desired background	2288	int back = bgcolor_of (rend); // desired background
2290		2289
2291	// only do special processing if any attributes are set, which is unlikely	2290	// only do special processing if any attributes are set, which is unlikely
2292	if (expect_false (rend & (RS_Bold \| RS_Italic \| RS_Uline \| RS_RVid \| RS_Blink \| RS_Careful)))	2291	if (expect_false (rend & (RS_baseattrMask \| RS_Careful \| RS_Sel)))
2293	{	2292	{
2294	bool invert = rend & RS_RVid;	2293	bool invert = rend & RS_RVid;
2295		2294
2296	#ifndef NO_BOLD_UNDERLINE_REVERSE	2295	#ifndef NO_BOLD_UNDERLINE_REVERSE
2297	if (rend & RS_Bold && fore == Color_fg)	2296	if (rend & RS_Bold && fore == Color_fg)
…		…
2316		2315
2317	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))	2316	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2318	fore = Color_UL;	2317	fore = Color_UL;
2319	#endif	2318	#endif
2320		2319
		2320	#ifdef OPTION_HC
		2321	if (rend & RS_Sel)
		2322	{
		2323	/* invert the column if no highlightColor is set or it is the
		2324	* current cursor column */
		2325	if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
		2326	&& ISSET_PIXCOLOR (Color_HC))
		2327	{
		2328	if (ISSET_PIXCOLOR (Color_HTC))
		2329	fore = Color_HTC;
		2330	// if invert is 0 reverse video is set so we use bg color as fg color
		2331	else if (!invert)
		2332	fore = back;
		2333	back = Color_HC;
		2334	invert = 0;
		2335	}
		2336	}
		2337	#endif
		2338
2321	if (invert)	2339	if (invert)
2322	{	2340	{
2323	#ifdef OPTION_HC
2324	if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2325	\|\| !ISSET_PIXCOLOR (Color_HC))
2326	#endif
2327	/* invert the column if no highlightColor is set or it is the
2328	* current cursor column */
2329	::swap (fore, back);	2341	::swap (fore, back);
2330	#ifdef OPTION_HC
2331	else if (ISSET_PIXCOLOR (Color_HC))
2332	back = Color_HC;
2333	#endif
2334		2342
2335	#ifndef NO_BOLD_UNDERLINE_REVERSE	2343	#ifndef NO_BOLD_UNDERLINE_REVERSE
2336	# ifndef OPTION_HC
2337	if (ISSET_PIXCOLOR (Color_RV))
2338	back = Color_RV;
2339	# endif
2340	if (fore == back)	2344	if (fore == back)
2341	{	2345	{
2342	fore = Color_bg;	2346	fore = Color_bg;
2343	back = Color_fg;	2347	back = Color_fg;
2344	}	2348	}
…		…
2413	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2417	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2414	}	2418	}
2415	} /* for (col....) */	2419	} /* for (col....) */
2416	} /* for (row....) */	2420	} /* for (row....) */
2417		2421
2418	#if ENABLE_OVERLAY
2419	scr_swap_overlay ();
2420	#endif
2421	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2422
2423	/*	2422	/*
2424	* G: cleanup cursor and display outline cursor if necessary	2423	* G: cleanup cursor and display outline cursor if necessary
2425	*/	2424	*/
2426	if (showcursor)	2425	if (showcursor)
2427	{	2426	{
…		…
2465	}	2464	}
2466		2465
2467	/*	2466	/*
2468	* H: cleanup selection	2467	* H: cleanup selection
2469	*/	2468	*/
		2469	#if ENABLE_OVERLAY
		2470	scr_swap_overlay ();
		2471	#endif
		2472	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2473
2470	scr_reverse_selection ();	2474	scr_reverse_selection ();
2471		2475
		2476	screen.flags = old_screen_flags;
2472	num_scr = 0;	2477	num_scr = 0;
2473	num_scr_allow = 1;	2478	num_scr_allow = 1;
2474	}	2479	}
2475		2480
2476	void	2481	void
…		…
2596	{	2601	{
2597	#if !ENABLE_MINIMAL	2602	#if !ENABLE_MINIMAL
2598	if (selection.rect)	2603	if (selection.rect)
2599	scr_xor_rect (selection.beg.row, selection.beg.col,	2604	scr_xor_rect (selection.beg.row, selection.beg.col,
2600	selection.end.row, selection.end.col,	2605	selection.end.row, selection.end.col,
2601	RS_RVid, RS_RVid \| RS_Uline);	2606	RS_Sel \| RS_RVid, RS_Sel \| RS_RVid \| RS_Uline);
2602	else	2607	else
2603	#endif	2608	#endif
2604	scr_xor_span (selection.beg.row, selection.beg.col,	2609	scr_xor_span (selection.beg.row, selection.beg.col,
2605	selection.end.row, selection.end.col,	2610	selection.end.row, selection.end.col,
2606	RS_RVid);	2611	RS_Sel \| RS_RVid);
2607	}	2612	}
2608	}	2613	}
2609		2614
2610	/* ------------------------------------------------------------------------- */	2615	/* ------------------------------------------------------------------------- */
2611	/*	2616	/*
…		…
2904	selection_wait = Sel_normal;	2909	selection_wait = Sel_normal;
2905		2910
2906	#if X_HAVE_UTF8_STRING	2911	#if X_HAVE_UTF8_STRING
2907	selection_type = Sel_UTF8String;	2912	selection_type = Sel_UTF8String;
2908	if (selection_request_other (xa[XA_UTF8_STRING], selnum))	2913	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2909	return;	2914	return;
2910	#else	2915	#else
2911	selection_type = Sel_CompoundText;	2916	selection_type = Sel_CompoundText;
2912	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))	2917	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2913	return;	2918	return;
2914	#endif	2919	#endif
2915	}	2920	}
2916		2921
2917	selection_wait = Sel_none; /* don't loop in selection_paste () */	2922	selection_wait = Sel_none; /* don't loop in selection_paste () */
2918	selection_paste (display->root, XA_CUT_BUFFER0, false);	2923	selection_paste (display->root, XA_CUT_BUFFER0, false);
…		…
2946	/*	2951	/*
2947	* Clear all selected text	2952	* Clear all selected text
2948	* EXT: SelectionClear	2953	* EXT: SelectionClear
2949	*/	2954	*/
2950	void	2955	void
2951	rxvt_term::selection_clear () NOTHROW	2956	rxvt_term::selection_clear (bool clipboard) NOTHROW
2952	{	2957	{
		2958	if (!clipboard)
		2959	{
2953	want_refresh = 1;	2960	want_refresh = 1;
2954	free (selection.text);	2961	free (selection.text);
2955	selection.text = NULL;	2962	selection.text = NULL;
2956	selection.len = 0;	2963	selection.len = 0;
2957	CLEAR_SELECTION ();	2964	CLEAR_SELECTION ();
2958		2965
2959	if (display->selection_owner == this)	2966	if (display->selection_owner == this)
2960	display->selection_owner = 0;	2967	display->selection_owner = 0;
		2968	}
		2969	else
		2970	{
		2971	free (selection.clip_text);
		2972	selection.clip_text = NULL;
		2973	selection.clip_len = 0;
		2974
		2975	if (display->clipboard_owner == this)
		2976	display->clipboard_owner = 0;
		2977	}
		2978	}
		2979
		2980	void
		2981	rxvt_term::clipboard_copy (Time tm)
		2982	{
		2983	if (selection.len > 0)
		2984	{
		2985	free (selection.clip_text);
		2986	selection.clip_len = selection.len;
		2987	selection.clip_text = (wchar_t ) malloc (sizeof (wchar_t) selection.clip_len);
		2988	memcpy (selection.clip_text, selection.text,
		2989	sizeof (wchar_t) * selection.clip_len);
		2990	selection_grab (tm, true);
		2991	}
2961	}	2992	}
2962		2993
2963	/* ------------------------------------------------------------------------- */	2994	/* ------------------------------------------------------------------------- */
2964	/*	2995	/*
2965	* Copy a selection into the cut buffer	2996	* Copy a selection into the cut buffer
…		…
3091		3122
3092	selection_grab (tm);	3123	selection_grab (tm);
3093	}	3124	}
3094		3125
3095	bool	3126	bool
3096	rxvt_term::selection_grab (Time tm) NOTHROW	3127	rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3097	{	3128	{
		3129	Atom sel;
		3130
		3131	if (!clipboard)
		3132	{
3098	selection_time = tm;	3133	selection_time = tm;
		3134	sel = XA_PRIMARY;
		3135	}
		3136	else
		3137	{
		3138	clipboard_time = tm;
		3139	sel = xa[XA_CLIPBOARD];
		3140	}
3099		3141
3100	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);	3142	XSetSelectionOwner (dpy, sel, vt, tm);
3101	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)	3143	if (XGetSelectionOwner (dpy, sel) == vt)
3102	{	3144	{
3103	display->set_selection_owner (this);	3145	display->set_selection_owner (this, clipboard);
3104	return true;	3146	return true;
3105	}	3147	}
3106	else	3148	else
3107	{	3149	{
3108	selection_clear ();	3150	selection_clear (clipboard);
3109	return false;	3151	return false;
3110	}	3152	}
3111		3153
3112	#if 0	3154	#if 0
3113	XTextProperty ct;	3155	XTextProperty ct;
…		…
3608	else if (rq.target == xa[XA_MULTIPLE])	3650	else if (rq.target == xa[XA_MULTIPLE])
3609	{	3651	{
3610	/* TODO: Handle MULTIPLE */	3652	/* TODO: Handle MULTIPLE */
3611	}	3653	}
3612	#endif	3654	#endif
3613	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3655	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3614	{	3656	{
3615	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3657	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3616	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3658	32, PropModeReplace, (unsigned char *)&selection_time, 1);
		3659	ev.property = rq.property;
		3660	}
		3661	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3662	{
		3663	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
		3664	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3617	ev.property = rq.property;	3665	ev.property = rq.property;
3618	}	3666	}
3619	else if (rq.target == XA_STRING	3667	else if (rq.target == XA_STRING
3620	\|\| rq.target == xa[XA_TEXT]	3668	\|\| rq.target == xa[XA_TEXT]
3621	\|\| rq.target == xa[XA_COMPOUND_TEXT]	3669	\|\| rq.target == xa[XA_COMPOUND_TEXT]
…		…
3654	{	3702	{
3655	target = xa[XA_COMPOUND_TEXT];	3703	target = xa[XA_COMPOUND_TEXT];
3656	style = enc_compound_text;	3704	style = enc_compound_text;
3657	}	3705	}
3658		3706
3659	if (selection.text)	3707	if (rq.selection == XA_PRIMARY && selection.text)
3660	{	3708	{
3661	cl = selection.text;	3709	cl = selection.text;
3662	selectlen = selection.len;	3710	selectlen = selection.len;
		3711	}
		3712	else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3713	{
		3714	cl = selection.clip_text;
		3715	selectlen = selection.clip_len;
3663	}	3716	}
3664	else	3717	else
3665	{	3718	{
3666	cl = L"";	3719	cl = L"";
3667	selectlen = 0;	3720	selectlen = 0;
…		…
3735	h += 2; min_it (h, nrow);	3788	h += 2; min_it (h, nrow);
3736		3789
3737	x -= 1; clamp_it (x, 0, ncol - w);	3790	x -= 1; clamp_it (x, 0, ncol - w);
3738	y -= 1; clamp_it (y, 0, nrow - h);	3791	y -= 1; clamp_it (y, 0, nrow - h);
3739		3792
3740	ov_x = x; ov_y = y;	3793	ov.x = x; ov.y = y;
3741	ov_w = w; ov_h = h;	3794	ov.w = w; ov.h = h;
3742		3795
3743	ov_text = new text_t *[h];	3796	ov.text = new text_t *[h];
3744	ov_rend = new rend_t *[h];	3797	ov.rend = new rend_t *[h];
3745		3798
3746	for (y = 0; y < h; y++)	3799	for (y = 0; y < h; y++)
3747	{	3800	{
3748	text_t *tp = ov_text[y] = new text_t[w];	3801	text_t *tp = ov.text[y] = new text_t[w];
3749	rend_t *rp = ov_rend[y] = new rend_t[w];	3802	rend_t *rp = ov.rend[y] = new rend_t[w];
3750		3803
3751	text_t t0, t1, t2;	3804	text_t t0, t1, t2;
3752	rend_t r = OVERLAY_RSTYLE;	3805	rend_t r = OVERLAY_RSTYLE;
3753		3806
3754	if (y == 0)	3807	if (y == 0)
…		…
3773	}	3826	}
3774		3827
3775	void	3828	void
3776	rxvt_term::scr_overlay_off () NOTHROW	3829	rxvt_term::scr_overlay_off () NOTHROW
3777	{	3830	{
3778	if (!ov_text)	3831	if (!ov.text)
3779	return;	3832	return;
3780		3833
3781	want_refresh = 1;	3834	want_refresh = 1;
3782		3835
3783	for (int y = 0; y < ov_h; y++)	3836	for (int y = 0; y < ov.h; y++)
3784	{	3837	{
3785	delete [] ov_text[y];	3838	delete [] ov.text[y];
3786	delete [] ov_rend[y];	3839	delete [] ov.rend[y];
3787	}	3840	}
3788		3841
3789	delete [] ov_text; ov_text = 0;	3842	delete [] ov.text; ov.text = 0;
3790	delete [] ov_rend; ov_rend = 0;	3843	delete [] ov.rend; ov.rend = 0;
3791	}	3844	}
3792		3845
3793	void	3846	void
3794	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW	3847	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3795	{	3848	{
3796	if (!ov_text \|\| x >= ov_w - 2 \|\| y >= ov_h - 2)	3849	if (!ov.text \|\| x >= ov.w - 2 \|\| y >= ov.h - 2)
3797	return;	3850	return;
3798		3851
3799	x++, y++;	3852	x++, y++;
3800		3853
3801	ov_text[y][x] = text;	3854	ov.text[y][x] = text;
3802	ov_rend[y][x] = rend;	3855	ov.rend[y][x] = rend;
3803	}	3856	}
3804		3857
3805	void	3858	void
3806	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW	3859	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3807	{	3860	{
…		…
3826	}	3879	}
3827		3880
3828	void	3881	void
3829	rxvt_term::scr_swap_overlay () NOTHROW	3882	rxvt_term::scr_swap_overlay () NOTHROW
3830	{	3883	{
3831	if (!ov_text)	3884	if (!ov.text)
3832	return;	3885	return;
3833		3886
		3887	// hide cursor if it is within the overlay area
		3888	if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
		3889	&& IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
		3890	screen.flags &= ~Screen_VisibleCursor;
		3891
3834	// swap screen mem with overlay	3892	// swap screen mem with overlay
3835	for (int y = ov_h; y--; )	3893	for (int y = ov.h; y--; )
3836	{	3894	{
3837	text_t *t1 = ov_text[y];	3895	text_t *t1 = ov.text[y];
3838	rend_t *r1 = ov_rend[y];	3896	rend_t *r1 = ov.rend[y];
3839		3897
3840	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;	3898	text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3841	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;	3899	rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3842		3900
3843	for (int x = ov_w; x--; )	3901	for (int x = ov.w; x--; )
3844	{	3902	{
3845	text_t t = t1; t1++ = t2; t2++ = t;	3903	text_t t = t1; t1++ = t2; t2++ = t;
3846	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3904	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3847	}	3905	}
3848	}	3906	}

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.318 by root, Tue Nov 4 22:44:09 2008 UTC vs. Revision 1.340 by sf-exg, Sat Apr 17 23:00:45 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.318 by root, Tue Nov 4 22:44:09 2008 UTC vs.
Revision 1.340 by sf-exg, Sat Apr 17 23:00:45 2010 UTC