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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.315 by root, Tue Nov 4 14:38:29 2008 UTC vs.
Revision 1.367 by sf-exg, Mon Jan 31 15:40:22 2011 UTC

…		…
28	#include "rxvt.h" /* NECESSARY */	28	#include "rxvt.h" /* NECESSARY */
29	#include "rxvtperl.h" /* NECESSARY */	29	#include "rxvtperl.h" /* NECESSARY */
30		30
31	#include <inttypes.h>	31	#include <inttypes.h>
32		32
33	#include "salloc.C" // HACK, should be a seperate compile!	33	#include "salloc.C" // HACK, should be a separate compile!
34		34
		35	static inline void
35	static inline void fill_text (text_t *start, text_t value, int len)	36	fill_text (text_t *start, text_t value, int len)
36	{	37	{
37	while (len--)	38	while (len--)
38	*start++ = value;	39	*start++ = value;
39	}	40	}
40		41
…		…
143	col--;	144	col--;
144		145
145	rend_t rend = l.r[col] & ~RS_baseattrMask;	146	rend_t rend = l.r[col] & ~RS_baseattrMask;
146	rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));	147	rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147		148
		149	l.touch ();
		150
148	// found begin, nuke	151	// found start, nuke
149	do {	152	do {
150	l.t[col] = ' ';	153	l.t[col] = ' ';
151	l.r[col] = rend;	154	l.r[col] = rend;
152	col++;	155	col++;
153	} while (col < ncol && l.t[col] == NOCHAR);	156	} while (col < ncol && l.t[col] == NOCHAR);
…		…
158	* ------------------------------------------------------------------------- */	161	* ------------------------------------------------------------------------- */
159		162
160	void	163	void
161	rxvt_term::scr_reset ()	164	rxvt_term::scr_reset ()
162	{	165	{
163	#if ENABLE_OVERLAY
164	scr_overlay_off ();
165	#endif
166
167	rvideo_mode = false;
168	view_start = 0;	166	view_start = 0;
169	num_scr = 0;	167	num_scr = 0;
170		168
171	if (ncol == 0)	169	if (ncol == 0)
172	ncol = 80;	170	ncol = 80;
…		…
174	if (nrow == 0)	172	if (nrow == 0)
175	nrow = 24;	173	nrow = 24;
176		174
177	if (ncol == prev_ncol && nrow == prev_nrow)	175	if (ncol == prev_ncol && nrow == prev_nrow)
178	return;	176	return;
179
180	if (current_screen != PRIMARY)
181	scr_swap_screen ();
182		177
183	// we need at least two lines for wrapping to work correctly	178	// we need at least two lines for wrapping to work correctly
184	while (nrow + saveLines < 2)	179	while (nrow + saveLines < 2)
185	{	180	{
186	//TODO//FIXME	181	//TODO//FIXME
…		…
239	selection.text = NULL;	234	selection.text = NULL;
240	selection.len = 0;	235	selection.len = 0;
241	selection.op = SELECTION_CLEAR;	236	selection.op = SELECTION_CLEAR;
242	selection.screen = PRIMARY;	237	selection.screen = PRIMARY;
243	selection.clicks = 0;	238	selection.clicks = 0;
		239	selection.clip_text = NULL;
		240	selection.clip_len = 0;
244	}	241	}
245	else	242	else
246	{	243	{
247	/*	244	/*
248	* add or delete rows as appropriate	245	* add or delete rows as appropriate
…		…
286		283
287	if (top_row)	284	if (top_row)
288	{	285	{
289	// Re-wrap lines. This is rather ugly, possibly because I am too dumb	286	// Re-wrap lines. This is rather ugly, possibly because I am too dumb
290	// to come up with a lean and mean algorithm.	287	// to come up with a lean and mean algorithm.
		288	// TODO: maybe optimise when width didn't change
291		289
292	row_col_t ocur = screen.cur;	290	row_col_t ocur = screen.cur;
293	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	291	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294		292
295	do	293	do
296	{	294	{
297	p = MOD (p - 1, prev_total_rows);	295	p = MOD (p - 1, prev_total_rows);
298	#ifdef DEBUG_STRICT
299	assert (old_buf [MOD (p, prev_total_rows)].t);	296	assert (old_buf [MOD (p, prev_total_rows)].t);
300	#endif
301	int plines = 1;	297	int plines = 1;
302	int llen = old_buf [MOD (p, prev_total_rows)].l;	298	int llen = old_buf [MOD (p, prev_total_rows)].l;
303		299
304	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	300	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
305	{	301	{
…		…
399	delete old_ta;	395	delete old_ta;
400	delete old_ra;	396	delete old_ra;
401		397
402	clamp_it (screen.cur.row, 0, nrow - 1);	398	clamp_it (screen.cur.row, 0, nrow - 1);
403	clamp_it (screen.cur.col, 0, ncol - 1);	399	clamp_it (screen.cur.col, 0, ncol - 1);
		400	}
404		401
405	free (tabs);	402	free (tabs);
406	}	403	tabs = (char *)rxvt_malloc (ncol);
		404
		405	for (int col = ncol; col--; )
		406	tabs [col] = col % TABSIZE == 0;
407		407
408	CLEAR_ALL_SELECTION ();	408	CLEAR_ALL_SELECTION ();
409		409
410	prev_nrow = nrow;	410	prev_nrow = nrow;
411	prev_ncol = ncol;	411	prev_ncol = ncol;
412
413	tabs = (char *)rxvt_malloc (ncol);
414
415	for (int col = ncol; --col; )
416	tabs [col] = col % TABSIZE == 0;
417
418	if (current_screen != PRIMARY)
419	scr_swap_screen ();
420		412
421	tt_winch ();	413	tt_winch ();
422		414
423	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	415	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
424	}	416	}
…		…
436	delete ralloc; ralloc = 0;	428	delete ralloc; ralloc = 0;
437		429
438	free (row_buf);	430	free (row_buf);
439	free (swap_buf);	431	free (swap_buf);
440	free (drawn_buf);	432	free (drawn_buf);
		433	row_buf = 0; // signal that we freed all the arrays above
		434
441	free (tabs);	435	free (tabs);
442		436	tabs = 0;
443	row_buf = 0; // signal that we freed all the arrays
444	}	437	}
445	}	438	}
446		439
447	/* ------------------------------------------------------------------------- */	440	/* ------------------------------------------------------------------------- */
448	/*	441	/*
449	* Hard reset	442	* Hard/Soft reset
450	*/	443	*/
451	void	444	void
452	rxvt_term::scr_poweron ()	445	rxvt_term::scr_poweron ()
453	{	446	{
454	scr_release ();	447	scr_release ();
455	prev_nrow = prev_ncol = 0;	448	prev_nrow = prev_ncol = 0;
		449	rvideo_mode = false;
		450	scr_soft_reset ();
456	scr_reset ();	451	scr_reset ();
457		452
458	scr_clear (true);	453	scr_clear (true);
459	scr_refresh ();	454	scr_refresh ();
		455	}
		456
		457	void
		458	rxvt_term::scr_soft_reset ()
		459	{
		460	/* only affects modes, nothing drastic such as clearing the screen */
		461	#if ENABLE_OVERLAY
		462	scr_overlay_off ();
		463	#endif
		464
		465	if (current_screen != PRIMARY)
		466	scr_swap_screen ();
		467
		468	scr_scroll_region (0, MAX_ROWS - 1);
		469	scr_rendition (0, ~RS_None);
		470	scr_insert_mode (0);
460	}	471	}
461		472
462	/* ------------------------------------------------------------------------- *	473	/* ------------------------------------------------------------------------- *
463	* PROCESS SCREEN COMMANDS *	474	* PROCESS SCREEN COMMANDS *
464	* ------------------------------------------------------------------------- */	475	* ------------------------------------------------------------------------- */
…		…
502	}	513	}
503		514
504	/* boundary check in case screen size changed between SAVE and RESTORE */	515	/* boundary check in case screen size changed between SAVE and RESTORE */
505	min_it (s->cur.row, nrow - 1);	516	min_it (s->cur.row, nrow - 1);
506	min_it (s->cur.col, ncol - 1);	517	min_it (s->cur.col, ncol - 1);
507	#ifdef DEBUG_STRICT
508	assert (s->cur.row >= 0);	518	assert (s->cur.row >= 0);
509	assert (s->cur.col >= 0);	519	assert (s->cur.col >= 0);
510	#endif
511	}	520	}
512		521
513	void	522	void
514	rxvt_term::scr_swap_screen ()	523	rxvt_term::scr_swap_screen ()
515	{	524	{
…		…
540	want_refresh = 1;	549	want_refresh = 1;
541	view_start = 0;	550	view_start = 0;
542		551
543	selection_check (2); /* check for boundary cross */	552	selection_check (2); /* check for boundary cross */
544		553
545	int i = current_screen; current_screen = scrn; scrn = i;	554	current_screen = scrn;
546		555
547	#if NSCREENS	556	#if NSCREENS
548	if (option (Opt_secondaryScreen))	557	if (option (Opt_secondaryScreen))
549	{	558	{
550	num_scr = 0;	559	num_scr = 0;
…		…
775	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);	784	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776	screen.cur.row -= minlines;	785	screen.cur.row -= minlines;
777	}	786	}
778	}	787	}
779		788
780	#ifdef DEBUG_STRICT
781	assert (screen.cur.col < ncol);	789	assert (screen.cur.col < ncol);
782	assert (screen.cur.row < nrow	790	assert (screen.cur.row < nrow
783	&& screen.cur.row >= top_row);	791	&& screen.cur.row >= top_row);
784	#endif
785	int row = screen.cur.row;	792	int row = screen.cur.row;
786		793
787	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	794	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788		795
789	line_t *line = &ROW(row);	796	line_t *line = &ROW(row);
…		…
893	# else	900	# else
894	c = 0xfffd;	901	c = 0xfffd;
895	# endif	902	# endif
896	#endif	903	#endif
897		904
898	// nuke the character at this position, if required
899	if (expect_false (
900	line->t[screen.cur.col] == NOCHAR
901	\|\| (screen.cur.col < ncol - 1
902	&& line->t[screen.cur.col + 1] == NOCHAR)
903	))
904	scr_kill_char (*line, screen.cur.col);
905
906	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	905	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907		906
908	// if the character doesn't fit into the remaining columns...	907	// if the character doesn't fit into the remaining columns...
909	if (expect_false (screen.cur.col > ncol - width && ncol >= width))	908	if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910	{	909	{
911	// ...output spaces	910	if (screen.flags & Screen_Autowrap)
912	c = ' ';	911	{
		912	// ... artificially enlargen the previous one
		913	c = NOCHAR;
913	// and try the same character next loop iteration	914	// and try the same character next loop iteration
914	--str;	915	--str;
		916	}
		917	else
		918	screen.cur.col = ncol - width;
915	}	919	}
		920
		921	// nuke the character at this position, if required
		922	// due to wonderful coincidences everywhere else in this loop
		923	// we never have to check for overwriting a wide char itself,
		924	// only its tail.
		925	if (expect_false (line->t[screen.cur.col] == NOCHAR))
		926	scr_kill_char (*line, screen.cur.col);
916		927
917	line->touch ();	928	line->touch ();
918		929
919	do	930	do
920	{	931	{
…		…
926	else	937	else
927	{	938	{
928	line->l = ncol;	939	line->l = ncol;
929	if (screen.flags & Screen_Autowrap)	940	if (screen.flags & Screen_Autowrap)
930	screen.flags \|= Screen_WrapNext;	941	screen.flags \|= Screen_WrapNext;
931	break;	942
		943	goto end_of_line;
932	}	944	}
933		945
934	c = NOCHAR;	946	c = NOCHAR;
935	}	947	}
936	while (expect_false (--width > 0));	948	while (expect_false (--width > 0));
937		949
938	// pad with spaces when overwriting wide character with smaller one	950	// pad with spaces when overwriting wide character with smaller one
939	if (expect_false (!width))	951	for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
940	{	952	{
941	line->touch ();
942
943	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
944	{
945	line->t[c] = ' ';	953	line->t[c] = ' ';
946	line->r[c] = rend;	954	line->r[c] = rend;
947	}
948	}	955	}
		956
		957	end_of_line:
		958	;
949	}	959	}
950	#if ENABLE_COMBINING	960	#if ENABLE_COMBINING
951	else // width == 0	961	else // width == 0
952	{	962	{
953	if (c != 0xfeff) // ignore BOM	963	if (c != 0xfeff) // ignore BOM
…		…
993	#endif	1003	#endif
994	}	1004	}
995		1005
996	max_it (line->l, screen.cur.col);	1006	max_it (line->l, screen.cur.col);
997		1007
998	#ifdef DEBUG_STRICT
999	assert (screen.cur.row >= 0);	1008	assert (screen.cur.row >= 0);
1000	#endif
1001	}	1009	}
1002		1010
1003	/* ------------------------------------------------------------------------- */	1011	/* ------------------------------------------------------------------------- */
1004	/*	1012	/*
1005	* Process Backspace. Move back the cursor back a position, wrap if have to	1013	* Process Backspace. Move back the cursor back a position, wrap if have to
…		…
1018		1026
1019	want_refresh = 1;	1027	want_refresh = 1;
1020	#endif	1028	#endif
1021	}	1029	}
1022	}	1030	}
		1031	else if (screen.flags & Screen_WrapNext)
		1032	screen.flags &= ~Screen_WrapNext;
1023	else	1033	else
1024	scr_gotorc (0, -1, RELATIVE);	1034	scr_gotorc (0, -1, RELATIVE);
1025	}	1035	}
1026		1036
1027	/* ------------------------------------------------------------------------- */	1037	/* ------------------------------------------------------------------------- */
…		…
1333	if (row >= nrow) /* Out Of Bounds */	1343	if (row >= nrow) /* Out Of Bounds */
1334	return;	1344	return;
1335		1345
1336	min_it (num, nrow - row);	1346	min_it (num, nrow - row);
1337		1347
1338	/TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details /
1339	if (rstyle & (RS_RVid \| RS_Uline))	1348	if (rstyle & (RS_Blink \| RS_RVid \| RS_Uline))
1340	ren = (rend_t) ~RS_None;	1349	ren = (rend_t) ~RS_None;
1341	else if (GET_BASEBG (rstyle) == Color_bg)	1350	else if (GET_BASEBG (rstyle) == Color_bg)
1342	{	1351	{
1343	ren = DEFAULT_RSTYLE;	1352	ren = DEFAULT_RSTYLE;
1344		1353
1345	if (mapped)	1354	if (mapped)
1346	XClearArea (dpy, vt, 0,	1355	XClearArea (dpy, vt, 0,
1347	Row2Pixel (row), (unsigned int)width,	1356	Row2Pixel (row - view_start), (unsigned int)width,
1348	(unsigned int)Height2Pixel (num), False);	1357	(unsigned int)Height2Pixel (num), False);
1349	}	1358	}
1350	else	1359	else
1351	{	1360	{
1352	ren = rstyle & (RS_fgMask \| RS_bgMask);	1361	ren = rstyle & (RS_fgMask \| RS_bgMask);
1353		1362
		1363	if (mapped)
		1364	{
1354	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1365	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1366	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356	XFillRectangle (dpy, vt, gc,	1367	XFillRectangle (dpy, vt, gc,
1357	0, Row2Pixel (row),	1368	0, Row2Pixel (row - view_start),
1358	(unsigned int)width,	1369	(unsigned int)width,
1359	(unsigned int)Height2Pixel (num));	1370	(unsigned int)Height2Pixel (num));
1360	gcvalue.foreground = pix_colors[Color_fg];	1371	gcvalue.foreground = pix_colors[Color_fg];
1361	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1372	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1373	}
1362	}	1374	}
1363		1375
1364	for (; num--; row++)	1376	for (; num--; row++)
1365	{	1377	{
1366	scr_blank_screen_mem (ROW(row), rstyle);	1378	scr_blank_screen_mem (ROW(row), rstyle);
		1379
		1380	if (row - view_start < nrow)
1367	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1381	scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1368	}	1382	}
1369	}	1383	}
1370		1384
1371	#if !ENABLE_MINIMAL	1385	#if !ENABLE_MINIMAL
1372	void	1386	void
…		…
1464	line_t *line = &ROW(row);	1478	line_t *line = &ROW(row);
1465		1479
1466	line->touch ();	1480	line->touch ();
1467	line->is_longer (0);	1481	line->is_longer (0);
1468		1482
1469	// nuke wide char at beginning	1483	// nuke wide spanning the start
1470	if (line->t[screen.cur.col] == NOCHAR)	1484	if (line->t[screen.cur.col] == NOCHAR)
1471	scr_kill_char (*line, screen.cur.col);	1485	scr_kill_char (*line, screen.cur.col);
1472		1486
1473	switch (insdel)	1487	switch (insdel)
1474	{	1488	{
…		…
1513		1527
1514	scr_blank_line (*line, screen.cur.col, count, rstyle);	1528	scr_blank_line (*line, screen.cur.col, count, rstyle);
1515	break;	1529	break;
1516		1530
1517	case DELETE:	1531	case DELETE:
1518	{
1519	line->l = max (line->l - count, 0);	1532	line->l = max (line->l - count, 0);
1520		1533
1521	rend_t tr = line->r[ncol - 1] & (RS_fgMask \| RS_bgMask \| RS_baseattrMask);	1534	// nuke wide char spanning the end
		1535	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1536	scr_kill_char (*line, screen.cur.col + count);
1522		1537
1523	for (int col = screen.cur.col; (col + count) < ncol; col++)	1538	for (int col = screen.cur.col; (col + count) < ncol; col++)
1524	{	1539	{
1525	line->t[col] = line->t[col + count];	1540	line->t[col] = line->t[col + count];
1526	line->r[col] = line->r[col + count];	1541	line->r[col] = line->r[col + count];
1527	}	1542	}
1528		1543
1529	// nuke wide char at the end
1530	if (line->t[screen.cur.col] == NOCHAR)
1531	scr_kill_char (*line, screen.cur.col);
1532
1533	scr_blank_line (*line, ncol - count, count, tr);	1544	scr_blank_line (*line, ncol - count, count, rstyle);
1534		1545
1535	if (selection.op && current_screen == selection.screen	1546	if (selection.op && current_screen == selection.screen
1536	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1547	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1537	{	1548	{
1538	if (selection.end.row != screen.cur.row	1549	if (selection.end.row != screen.cur.row
1539	\|\| (screen.cur.col >= selection.beg.col - count)	1550	\|\| (screen.cur.col >= selection.beg.col - count)
1540	\|\| selection.end.col >= ncol)	1551	\|\| selection.end.col >= ncol)
1541	CLEAR_SELECTION ();	1552	CLEAR_SELECTION ();
1542	else	1553	else
1543	{	1554	{
1544	/* shift selection */	1555	/* shift selection */
1545	selection.beg.col -= count;	1556	selection.beg.col -= count;
1546	selection.mark.col -= count; /* XXX: yes? */	1557	selection.mark.col -= count; /* XXX: yes? */
1547	selection.end.col -= count;	1558	selection.end.col -= count;
1548	}	1559	}
1549	}
1550	}	1560	}
1551		1561
1552	break;	1562	break;
1553	}	1563	}
1554	}	1564	}
…		…
1675	{	1685	{
1676	rvideo_state = on;	1686	rvideo_state = on;
1677		1687
1678	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1688	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1679	#ifdef HAVE_BG_PIXMAP	1689	#ifdef HAVE_BG_PIXMAP
1680	if (bgPixmap.pixmap == None)	1690	if (bg_pixmap == None)
1681	#endif	1691	#endif
1682	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1692	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1683		1693
1684	XGCValues gcvalue;	1694	XGCValues gcvalue;
1685	gcvalue.foreground = pix_colors[Color_fg];	1695	gcvalue.foreground = pix_colors[Color_fg];
…		…
1829	for (i = PART_BEG; i < RC_COUNT; i++)	1839	for (i = PART_BEG; i < RC_COUNT; i++)
1830	{	1840	{
1831	min_it (rc[i].col, ncol - 1);	1841	min_it (rc[i].col, ncol - 1);
1832	min_it (rc[i].row, nrow - 1);	1842	min_it (rc[i].row, nrow - 1);
1833	}	1843	}
1834	// TODO: this line somehow causes segfault if scr_expose() is called just after resize	1844
1835	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1845	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1836	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1846	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1837		1847
1838	num_scr_allow = 0;	1848	num_scr_allow = 0;
1839		1849
…		…
1930		1940
1931	bell_ev.start (VISUAL_BELL_DURATION);	1941	bell_ev.start (VISUAL_BELL_DURATION);
1932	}	1942	}
1933	else	1943	else
1934	XBell (dpy, 0);	1944	XBell (dpy, 0);
		1945	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1935	#endif	1946	#endif
1936	}	1947	}
1937		1948
1938	/* ------------------------------------------------------------------------- */	1949	/* ------------------------------------------------------------------------- */
1939	/* ARGSUSED */	1950	/* ARGSUSED */
…		…
1958	row_start = view_start;	1969	row_start = view_start;
1959	}	1970	}
1960		1971
1961	wctomb (0, 0);	1972	wctomb (0, 0);
1962		1973
1963	for (int r1 = 0; r1 < nrows; r1++)	1974	for (int r1 = row_start; r1 < row_start + nrows; r1++)
1964	{	1975	{
1965	text_t *tp = ROW(r1).t;	1976	text_t *tp = ROW(r1).t;
1966	int len = ROW(r1).l;	1977	int len = ROW(r1).l;
1967		1978
1968	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN	1979	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
…		…
1997	* screen.text/screen.rend contain what the screen will change to.	2008	* screen.text/screen.rend contain what the screen will change to.
1998	*/	2009	*/
1999	void	2010	void
2000	rxvt_term::scr_refresh () NOTHROW	2011	rxvt_term::scr_refresh () NOTHROW
2001	{	2012	{
2002	unsigned char have_bg,
2003	showcursor; /* show the cursor */
2004	int16_t col, row, /* column/row we're processing */	2013	int16_t col, row, /* column/row we're processing */
2005	ocrow; /* old cursor row */	2014	ocrow; /* old cursor row */
2006	int i; /* tmp */	2015	int i; /* tmp */
2007	#ifndef NO_CURSORCOLOR	2016	#ifndef NO_CURSORCOLOR
2008	rend_t cc1; /* store colours at cursor position (s) */	2017	rend_t cc1; /* store colours at cursor position (s) */
…		…
2019	/*	2028	/*
2020	* A: set up vars	2029	* A: set up vars
2021	*/	2030	*/
2022	refresh_count = 0;	2031	refresh_count = 0;
2023		2032
		2033	unsigned int old_screen_flags = screen.flags;
2024	have_bg = 0;	2034	char have_bg = 0;
2025	#ifdef HAVE_BG_PIXMAP	2035	#ifdef HAVE_BG_PIXMAP
2026	have_bg = bgPixmap.pixmap != None;	2036	have_bg = bg_pixmap != None;
2027	#endif	2037	#endif
2028	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2038	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2029		2039
2030	/*	2040	/*
2031	* B: reverse any characters which are selected	2041	* B: reverse any characters which are selected
2032	*/	2042	*/
2033	scr_reverse_selection ();	2043	scr_reverse_selection ();
		2044
		2045	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
		2046	#if ENABLE_OVERLAY
		2047	scr_swap_overlay ();
		2048	#endif
		2049
		2050	char showcursor = screen.flags & Screen_VisibleCursor;
2034		2051
2035	/*	2052	/*
2036	* C: set the cursor character (s)	2053	* C: set the cursor character (s)
2037	*/	2054	*/
2038	{	2055	{
2039	unsigned char setoldcursor;	2056	unsigned char setoldcursor;
2040		2057
2041	showcursor = (screen.flags & Screen_VisibleCursor);
2042	#ifdef CURSOR_BLINK	2058	#ifdef CURSOR_BLINK
2043	if (hidden_cursor)	2059	if (hidden_cursor)
2044	showcursor = 0;	2060	showcursor = 0;
2045	#endif	2061	#endif
2046		2062
…		…
2074	ccol2 = bgcolor_of (rstyle);	2090	ccol2 = bgcolor_of (rstyle);
2075	#else	2091	#else
2076	ccol2 = Color_bg;	2092	ccol2 = Color_bg;
2077	#endif	2093	#endif
2078		2094
2079	if (showcursor && focus)	2095	if (focus)
2080	{	2096	{
2081	if (option (Opt_cursorUnderline))	2097	if (option (Opt_cursorUnderline))
2082	*crp ^= RS_Uline;	2098	*crp ^= RS_Uline;
2083	else	2099	else
2084	{	2100	{
…		…
2119	oldcursor.col = screen.cur.col;	2135	oldcursor.col = screen.cur.col;
2120	}	2136	}
2121	}	2137	}
2122	}	2138	}
2123		2139
2124	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2125	#if ENABLE_OVERLAY
2126	scr_swap_overlay ();
2127	#endif
2128
2129	#ifndef NO_SLOW_LINK_SUPPORT	2140	#ifndef NO_SLOW_LINK_SUPPORT
2130	/*	2141	/*
2131	* D: CopyArea pass - very useful for slower links	2142	* D: CopyArea pass - very useful for slower links
2132	* This has been deliberately kept simple.	2143	* This has been deliberately kept simple.
2133	*/	2144	*/
…		…
2225		2236
2226	// seek to the beginning of wide characters	2237	// seek to the beginning of wide characters
2227	while (expect_false (stp[col] == NOCHAR && col > 0))	2238	while (expect_false (stp[col] == NOCHAR && col > 0))
2228	--col;	2239	--col;
2229		2240
2230	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2241	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2231	text_t *text = stp + col;	2242	text_t *text = stp + col;
2232	int count = 1;	2243	int count = 1;
2233		2244
2234	dtp[col] = stp[col];	2245	dtp[col] = stp[col];
2235	drp[col] = rend;	2246	drp[col] = rend;
…		…
2239	for (i = 0; ++col < ncol; )	2250	for (i = 0; ++col < ncol; )
2240	{	2251	{
2241	if (stp[col] == NOCHAR)	2252	if (stp[col] == NOCHAR)
2242	{	2253	{
2243	dtp[col] = stp[col];	2254	dtp[col] = stp[col];
2244	drp[col] = rend;	2255	drp[col] = srp[col];
		2256
2245	count++;	2257	count++;
2246	i++;	2258	i++;
2247		2259
2248	continue;	2260	continue;
2249	}	2261	}
…		…
2279	*/	2291	*/
2280	int fore = fgcolor_of (rend); // desired foreground	2292	int fore = fgcolor_of (rend); // desired foreground
2281	int back = bgcolor_of (rend); // desired background	2293	int back = bgcolor_of (rend); // desired background
2282		2294
2283	// only do special processing if any attributes are set, which is unlikely	2295	// only do special processing if any attributes are set, which is unlikely
2284	if (expect_false (rend & (RS_Bold \| RS_Italic \| RS_Uline \| RS_RVid \| RS_Blink \| RS_Careful)))	2296	if (expect_false (rend & (RS_baseattrMask \| RS_Careful \| RS_Sel)))
2285	{	2297	{
2286	bool invert = rend & RS_RVid;	2298	bool invert = rend & RS_RVid;
2287		2299
2288	#ifndef NO_BOLD_UNDERLINE_REVERSE	2300	#ifndef NO_BOLD_UNDERLINE_REVERSE
2289	if (rend & RS_Bold && fore == Color_fg)	2301	if (rend & RS_Bold && fore == Color_fg)
…		…
2308		2320
2309	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))	2321	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2310	fore = Color_UL;	2322	fore = Color_UL;
2311	#endif	2323	#endif
2312		2324
		2325	#ifdef OPTION_HC
		2326	if (rend & RS_Sel)
		2327	{
		2328	/* invert the column if no highlightColor is set or it is the
		2329	* current cursor column */
		2330	if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
		2331	&& ISSET_PIXCOLOR (Color_HC))
		2332	{
		2333	if (ISSET_PIXCOLOR (Color_HTC))
		2334	fore = Color_HTC;
		2335	// if invert is 0 reverse video is set so we use bg color as fg color
		2336	else if (!invert)
		2337	fore = back;
		2338
		2339	back = Color_HC;
		2340	invert = 0;
		2341	}
		2342	}
		2343	#endif
		2344
2313	if (invert)	2345	if (invert)
2314	{	2346	{
2315	#ifdef OPTION_HC
2316	if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2317	\|\| !ISSET_PIXCOLOR (Color_HC))
2318	#endif
2319	/* invert the column if no highlightColor is set or it is the
2320	* current cursor column */
2321	::swap (fore, back);	2347	::swap (fore, back);
2322	#ifdef OPTION_HC
2323	else if (ISSET_PIXCOLOR (Color_HC))
2324	back = Color_HC;
2325	#endif
2326		2348
2327	#ifndef NO_BOLD_UNDERLINE_REVERSE	2349	#ifndef NO_BOLD_UNDERLINE_REVERSE
2328	# ifndef OPTION_HC
2329	if (ISSET_PIXCOLOR (Color_RV))
2330	back = Color_RV;
2331	# endif
2332	if (fore == back)	2350	if (fore == back)
2333	{	2351	{
2334	fore = Color_bg;	2352	fore = Color_bg;
2335	back = Color_fg;	2353	back = Color_fg;
2336	}	2354	}
…		…
2405	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2423	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2406	}	2424	}
2407	} /* for (col....) */	2425	} /* for (col....) */
2408	} /* for (row....) */	2426	} /* for (row....) */
2409		2427
2410	#if ENABLE_OVERLAY
2411	scr_swap_overlay ();
2412	#endif
2413	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2414
2415	/*	2428	/*
2416	* G: cleanup cursor and display outline cursor if necessary	2429	* G: cleanup cursor and display outline cursor if necessary
2417	*/	2430	*/
2418	if (showcursor)	2431	if (showcursor)
2419	{	2432	{
…		…
2457	}	2470	}
2458		2471
2459	/*	2472	/*
2460	* H: cleanup selection	2473	* H: cleanup selection
2461	*/	2474	*/
		2475	#if ENABLE_OVERLAY
		2476	scr_swap_overlay ();
		2477	#endif
		2478	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2479
2462	scr_reverse_selection ();	2480	scr_reverse_selection ();
2463		2481
		2482	screen.flags = old_screen_flags;
2464	num_scr = 0;	2483	num_scr = 0;
2465	num_scr_allow = 1;	2484	num_scr_allow = 1;
2466	}	2485	}
2467		2486
2468	void	2487	void
…		…
2489	scr_remap_chars (swap_buf [i]);	2508	scr_remap_chars (swap_buf [i]);
2490	}	2509	}
2491	}	2510	}
2492		2511
2493	void	2512	void
2494	rxvt_term::scr_recolour () NOTHROW	2513	rxvt_term::scr_recolour (bool refresh) NOTHROW
2495	{	2514	{
		2515	bool transparent = false;
		2516
2496	#ifdef HAVE_BG_PIXMAP	2517	#ifdef HAVE_BG_PIXMAP
2497	bgPixmap.apply ();	2518	if (bg_pixmap != None)
2498	#else	2519	{
		2520	# ifdef ENABLE_TRANSPARENCY
		2521	if (bg_flags & BG_IS_TRANSPARENT)
		2522	{
		2523	XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
		2524	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2499		2525
		2526	transparent = true;
		2527	}
		2528	else
		2529	# endif
		2530	{
		2531	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
		2532	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
		2533	}
		2534	}
		2535	else
		2536	#endif
		2537	{
2500	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2538	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
		2539	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2540	}
		2541
2501	XClearWindow (dpy, parent[0]);	2542	XClearWindow (dpy, parent[0]);
2502	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2503		2543
2504	if (scrollBar.win)	2544	if (scrollBar.win)
2505	{	2545	{
		2546	if (transparent)
		2547	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2548	else
2506	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2549	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2507	scrollBar.state = STATE_IDLE;	2550	scrollBar.state = STATE_IDLE;
2508	scrollBar.show (0);	2551	scrollBar.show (0);
2509	}	2552	}
2510		2553
2511	#endif	2554	if (refresh)
2512		2555	{
2513	/* bgPixmap.apply () does not do the following : */
2514	scr_clear ();	2556	scr_clear ();
2515	scr_touch (true);	2557	scr_touch (true);
		2558	}
2516	want_refresh = 1;	2559	want_refresh = 1;
2517	}	2560	}
2518		2561
2519	/* ------------------------------------------------------------------------- */	2562	/* ------------------------------------------------------------------------- */
2520	void	2563	void
…		…
2588	{	2631	{
2589	#if !ENABLE_MINIMAL	2632	#if !ENABLE_MINIMAL
2590	if (selection.rect)	2633	if (selection.rect)
2591	scr_xor_rect (selection.beg.row, selection.beg.col,	2634	scr_xor_rect (selection.beg.row, selection.beg.col,
2592	selection.end.row, selection.end.col,	2635	selection.end.row, selection.end.col,
2593	RS_RVid, RS_RVid \| RS_Uline);	2636	RS_Sel \| RS_RVid, RS_Sel \| RS_RVid \| RS_Uline);
2594	else	2637	else
2595	#endif	2638	#endif
2596	scr_xor_span (selection.beg.row, selection.beg.col,	2639	scr_xor_span (selection.beg.row, selection.beg.col,
2597	selection.end.row, selection.end.col,	2640	selection.end.row, selection.end.col,
2598	RS_RVid);	2641	RS_Sel \| RS_RVid);
2599	}	2642	}
2600	}	2643	}
2601		2644
2602	/* ------------------------------------------------------------------------- */	2645	/* ------------------------------------------------------------------------- */
2603	/*	2646	/*
…		…
2608	void	2651	void
2609	rxvt_term::scr_dump (int fd) NOTHROW	2652	rxvt_term::scr_dump (int fd) NOTHROW
2610	{	2653	{
2611	int row, wrote;	2654	int row, wrote;
2612	unsigned int width, towrite;	2655	unsigned int width, towrite;
2613	char r1[] = "\n";	2656	const char r1[] = "\n";
2614		2657
2615	for (row = saveLines + top_row;	2658	for (row = saveLines + top_row;
2616	row < saveLines + nrow - 1; row++)	2659	row < saveLines + nrow - 1; row++)
2617	{	2660	{
2618	width = row_buf[row].l >= 0 ? row_buf[row].l	2661	width = row_buf[row].l >= 0 ? row_buf[row].l
…		…
2664	/* ------------------------------------------------------------------------- */	2707	/* ------------------------------------------------------------------------- */
2665	/*	2708	/*
2666	* Paste a selection direct to the command fd	2709	* Paste a selection direct to the command fd
2667	*/	2710	*/
2668	void	2711	void
2669	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2712	rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2670	{	2713	{
2671	/* convert normal newline chars into common keyboard Return key sequence */	2714	/* convert normal newline chars into common keyboard Return key sequence */
2672	for (unsigned int i = 0; i < len; i++)	2715	for (unsigned int i = 0; i < len; i++)
2673	if (data[i] == C0_LF)	2716	if (data[i] == C0_LF)
2674	data[i] = C0_CR;	2717	data[i] = C0_CR;
…		…
2680		2723
2681	if (priv_modes & PrivMode_BracketPaste)	2724	if (priv_modes & PrivMode_BracketPaste)
2682	tt_printf ("\e[201~");	2725	tt_printf ("\e[201~");
2683	}	2726	}
2684		2727
		2728	void
		2729	rxvt_term::paste (char *data, unsigned int len) NOTHROW
		2730	{
		2731	if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
		2732	return;
		2733
		2734	tt_paste (data, len);
		2735	}
		2736
2685	/* ------------------------------------------------------------------------- */	2737	/* ------------------------------------------------------------------------- */
2686	/*	2738	/*
2687	* Respond to a notification that a primary selection has been sent	2739	* Respond to a notification that a primary selection has been sent
2688	* EXT: SelectionNotify	2740	* EXT: SelectionNotify
2689	*/	2741	*/
2690	void	2742	void
2691	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW	2743	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2692	{	2744	{
2693	if (prop == None) /* check for failed XConvertSelection */	2745	if (prop == None) /* check for failed XConvertSelection */
2694	{	2746	{
		2747	int selnum = selection_type & Sel_whereMask;
		2748
		2749	if (selnum == Sel_direct)
		2750	selection_type = 0;
		2751
2695	if ((selection_type & Sel_CompoundText))	2752	if ((selection_type & Sel_CompoundText))
2696	{	2753	{
2697	int selnum = selection_type & Sel_whereMask;
2698
2699	selection_type = 0;	2754	selection_type = 0;
2700	if (selnum != Sel_direct)
2701	selection_request_other (XA_STRING, selnum);	2755	selection_request_other (XA_STRING, selnum);
2702	}	2756	}
2703		2757
2704	if ((selection_type & Sel_UTF8String))	2758	if ((selection_type & Sel_UTF8String))
2705	{	2759	{
2706	int selnum = selection_type & Sel_whereMask;
2707
2708	selection_type = Sel_CompoundText;	2760	selection_type = Sel_CompoundText;
2709	if (selnum != Sel_direct)
2710	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);	2761	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2711	else
2712	selection_type = 0;
2713	}	2762	}
2714		2763
2715	return;	2764	return;
2716	}	2765	}
2717		2766
…		…
2744	&ct2.nitems, &bytes_after,	2793	&ct2.nitems, &bytes_after,
2745	&ct2.value) != Success)	2794	&ct2.value) != Success)
2746	goto bailout;	2795	goto bailout;
2747		2796
2748	// realloc should be compatible to XFree, here, and elsewhere, too	2797	// realloc should be compatible to XFree, here, and elsewhere, too
2749	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);	2798	ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2750	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);	2799	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2751	ct.nitems += ct2.nitems;	2800	ct.nitems += ct2.nitems;
2752		2801
2753	XFree (ct2.value);	2802	XFree (ct2.value);
2754	}	2803	}
…		…
2803	incr_ev.start (10);	2852	incr_ev.start (10);
2804		2853
2805	while (incr_buf_fill + ct.nitems > incr_buf_size)	2854	while (incr_buf_fill + ct.nitems > incr_buf_size)
2806	{	2855	{
2807	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;	2856	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2808	incr_buf = (char *)realloc (incr_buf, incr_buf_size);	2857	incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2809	}	2858	}
2810		2859
2811	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);	2860	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2812	incr_buf_fill += ct.nitems;	2861	incr_buf_fill += ct.nitems;
2813		2862
…		…
2896	selection_wait = Sel_normal;	2945	selection_wait = Sel_normal;
2897		2946
2898	#if X_HAVE_UTF8_STRING	2947	#if X_HAVE_UTF8_STRING
2899	selection_type = Sel_UTF8String;	2948	selection_type = Sel_UTF8String;
2900	if (selection_request_other (xa[XA_UTF8_STRING], selnum))	2949	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2901	return;	2950	return;
2902	#else	2951	#else
2903	selection_type = Sel_CompoundText;	2952	selection_type = Sel_CompoundText;
2904	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))	2953	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2905	return;	2954	return;
2906	#endif	2955	#endif
2907	}	2956	}
2908		2957
2909	selection_wait = Sel_none; /* don't loop in selection_paste () */	2958	selection_wait = Sel_none; /* don't loop in selection_paste () */
2910	selection_paste (display->root, XA_CUT_BUFFER0, false);	2959	selection_paste (display->root, XA_CUT_BUFFER0, false);
…		…
2938	/*	2987	/*
2939	* Clear all selected text	2988	* Clear all selected text
2940	* EXT: SelectionClear	2989	* EXT: SelectionClear
2941	*/	2990	*/
2942	void	2991	void
2943	rxvt_term::selection_clear () NOTHROW	2992	rxvt_term::selection_clear (bool clipboard) NOTHROW
2944	{	2993	{
		2994	if (!clipboard)
		2995	{
2945	want_refresh = 1;	2996	want_refresh = 1;
2946	free (selection.text);	2997	free (selection.text);
2947	selection.text = NULL;	2998	selection.text = NULL;
2948	selection.len = 0;	2999	selection.len = 0;
2949	CLEAR_SELECTION ();	3000	CLEAR_SELECTION ();
2950		3001
2951	if (display->selection_owner == this)	3002	if (display->selection_owner == this)
2952	display->selection_owner = 0;	3003	display->selection_owner = 0;
		3004	}
		3005	else
		3006	{
		3007	free (selection.clip_text);
		3008	selection.clip_text = NULL;
		3009	selection.clip_len = 0;
		3010
		3011	if (display->clipboard_owner == this)
		3012	display->clipboard_owner = 0;
		3013	}
2953	}	3014	}
2954		3015
2955	/* ------------------------------------------------------------------------- */	3016	/* ------------------------------------------------------------------------- */
2956	/*	3017	/*
2957	* Copy a selection into the cut buffer	3018	* Copy a selection into the cut buffer
2958	* EXT: button 1 or 3 release	3019	* EXT: button 1 or 3 release
2959	*/	3020	*/
2960	void	3021	void
2961	rxvt_term::selection_make (Time tm)	3022	rxvt_term::selection_make (Time tm)
2962	{	3023	{
2963	int i;	3024	int size;
2964	wchar_t *new_selection_text;	3025	wchar_t *new_selection_text;
2965	text_t *t;	3026	text_t *t;
2966		3027
2967	switch (selection.op)	3028	switch (selection.op)
2968	{	3029	{
…		…
2984	return; /* nothing selected, go away */	3045	return; /* nothing selected, go away */
2985		3046
2986	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	3047	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2987	return;	3048	return;
2988		3049
2989	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	3050	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2990	new_selection_text = (wchar_t )rxvt_malloc ((i + 4) sizeof (wchar_t));	3051	new_selection_text = (wchar_t )rxvt_malloc ((size + 4) sizeof (wchar_t));
2991		3052
2992	int ofs = 0;	3053	int ofs = 0;
2993	int extra = 0;	3054	int extra = 0;
2994		3055
2995	int col = selection.beg.col;	3056	int col = selection.beg.col;
…		…
3001	{	3062	{
3002	#if !ENABLE_MINIMAL	3063	#if !ENABLE_MINIMAL
3003	if (selection.rect)	3064	if (selection.rect)
3004	{	3065	{
3005	col = selection.beg.col;	3066	col = selection.beg.col;
3006	end_col = ncol + 1;	3067	end_col = selection.end.col;
3007	}	3068	}
3008	else	3069	else
3009	#endif	3070	#endif
3010	end_col = ROW(row).l;	3071	end_col = ROW(row).l;
3011		3072
3012	col = max (col, 0);	3073	col = max (col, 0);
3013		3074
3014	if (row == selection.end.row	3075	if (row == selection.end.row)
3015	#if !ENABLE_MINIMAL
3016	\|\| selection.rect
3017	#endif
3018	)
3019	min_it (end_col, selection.end.col);	3076	min_it (end_col, selection.end.col);
3020		3077
3021	t = ROW(row).t + col;	3078	t = ROW(row).t + col;
3022		3079
3023	for (; col < end_col; col++)	3080	for (; col < end_col; col++)
…		…
3031		3088
3032	extra -= (len - 1);	3089	extra -= (len - 1);
3033		3090
3034	if (extra < 0)	3091	if (extra < 0)
3035	{	3092	{
3036	extra += i;	3093	extra += size;
3037	i += i;	3094	size += size;
3038	new_selection_text = (wchar_t )rxvt_realloc (new_selection_text, (i + 4) sizeof (wchar_t));	3095	new_selection_text = (wchar_t )rxvt_realloc (new_selection_text, (size + 4) sizeof (wchar_t));
3039	}	3096	}
3040		3097
3041	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	3098	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3042	}	3099	}
3043	#endif	3100	#endif
…		…
3055		3112
3056	new_selection_text[ofs++] = C0_LF;	3113	new_selection_text[ofs++] = C0_LF;
3057	}	3114	}
3058	else	3115	else
3059	#endif	3116	#endif
3060	if (!ROW(row).is_longer () && row != selection.end.row)	3117	if (!ROW(row).is_longer ()
		3118	&& (row != selection.end.row \|\| end_col != selection.end.col)
		3119	&& (row != selection.beg.row \|\| selection.beg.col < ncol))
3061	new_selection_text[ofs++] = C0_LF;	3120	new_selection_text[ofs++] = C0_LF;
3062	}	3121	}
3063
3064	if (end_col != selection.end.col)
3065	new_selection_text[ofs++] = C0_LF;
3066		3122
3067	new_selection_text[ofs] = 0;	3123	new_selection_text[ofs] = 0;
3068		3124
3069	if (ofs == 0)	3125	if (ofs == 0)
3070	{	3126	{
…		…
3083		3139
3084	selection_grab (tm);	3140	selection_grab (tm);
3085	}	3141	}
3086		3142
3087	bool	3143	bool
3088	rxvt_term::selection_grab (Time tm) NOTHROW	3144	rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3089	{	3145	{
		3146	Atom sel;
		3147
		3148	if (!clipboard)
		3149	{
3090	selection_time = tm;	3150	selection_time = tm;
		3151	sel = XA_PRIMARY;
		3152	}
		3153	else
		3154	{
		3155	clipboard_time = tm;
		3156	sel = xa[XA_CLIPBOARD];
		3157	}
3091		3158
3092	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);	3159	XSetSelectionOwner (dpy, sel, vt, tm);
3093	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)	3160	if (XGetSelectionOwner (dpy, sel) == vt)
3094	{	3161	{
3095	display->set_selection_owner (this);	3162	display->set_selection_owner (this, clipboard);
3096	return true;	3163	return true;
3097	}	3164	}
3098	else	3165	else
3099	{	3166	{
3100	selection_clear ();	3167	selection_clear (clipboard);
3101	return false;	3168	return false;
3102	}	3169	}
3103		3170
3104	#if 0	3171	#if 0
3105	XTextProperty ct;	3172	XTextProperty ct;
…		…
3600	else if (rq.target == xa[XA_MULTIPLE])	3667	else if (rq.target == xa[XA_MULTIPLE])
3601	{	3668	{
3602	/* TODO: Handle MULTIPLE */	3669	/* TODO: Handle MULTIPLE */
3603	}	3670	}
3604	#endif	3671	#endif
3605	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3672	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3606	{	3673	{
3607	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3674	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3608	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3675	32, PropModeReplace, (unsigned char *)&selection_time, 1);
		3676	ev.property = rq.property;
		3677	}
		3678	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3679	{
		3680	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
		3681	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3609	ev.property = rq.property;	3682	ev.property = rq.property;
3610	}	3683	}
3611	else if (rq.target == XA_STRING	3684	else if (rq.target == XA_STRING
3612	\|\| rq.target == xa[XA_TEXT]	3685	\|\| rq.target == xa[XA_TEXT]
3613	\|\| rq.target == xa[XA_COMPOUND_TEXT]	3686	\|\| rq.target == xa[XA_COMPOUND_TEXT]
…		…
3646	{	3719	{
3647	target = xa[XA_COMPOUND_TEXT];	3720	target = xa[XA_COMPOUND_TEXT];
3648	style = enc_compound_text;	3721	style = enc_compound_text;
3649	}	3722	}
3650		3723
3651	if (selection.text)	3724	if (rq.selection == XA_PRIMARY && selection.text)
3652	{	3725	{
3653	cl = selection.text;	3726	cl = selection.text;
3654	selectlen = selection.len;	3727	selectlen = selection.len;
		3728	}
		3729	else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3730	{
		3731	cl = selection.clip_text;
		3732	selectlen = selection.clip_len;
3655	}	3733	}
3656	else	3734	else
3657	{	3735	{
3658	cl = L"";	3736	cl = L"";
3659	selectlen = 0;	3737	selectlen = 0;
…		…
3727	h += 2; min_it (h, nrow);	3805	h += 2; min_it (h, nrow);
3728		3806
3729	x -= 1; clamp_it (x, 0, ncol - w);	3807	x -= 1; clamp_it (x, 0, ncol - w);
3730	y -= 1; clamp_it (y, 0, nrow - h);	3808	y -= 1; clamp_it (y, 0, nrow - h);
3731		3809
3732	ov_x = x; ov_y = y;	3810	ov.x = x; ov.y = y;
3733	ov_w = w; ov_h = h;	3811	ov.w = w; ov.h = h;
3734		3812
3735	ov_text = new text_t *[h];	3813	ov.text = new text_t *[h];
3736	ov_rend = new rend_t *[h];	3814	ov.rend = new rend_t *[h];
3737		3815
3738	for (y = 0; y < h; y++)	3816	for (y = 0; y < h; y++)
3739	{	3817	{
3740	text_t *tp = ov_text[y] = new text_t[w];	3818	text_t *tp = ov.text[y] = new text_t[w];
3741	rend_t *rp = ov_rend[y] = new rend_t[w];	3819	rend_t *rp = ov.rend[y] = new rend_t[w];
3742		3820
3743	text_t t0, t1, t2;	3821	text_t t0, t1, t2;
3744	rend_t r = OVERLAY_RSTYLE;	3822	rend_t r = OVERLAY_RSTYLE;
3745		3823
3746	if (y == 0)	3824	if (y == 0)
…		…
3765	}	3843	}
3766		3844
3767	void	3845	void
3768	rxvt_term::scr_overlay_off () NOTHROW	3846	rxvt_term::scr_overlay_off () NOTHROW
3769	{	3847	{
3770	if (!ov_text)	3848	if (!ov.text)
3771	return;	3849	return;
3772		3850
3773	want_refresh = 1;	3851	want_refresh = 1;
3774		3852
3775	for (int y = 0; y < ov_h; y++)	3853	for (int y = 0; y < ov.h; y++)
3776	{	3854	{
3777	delete [] ov_text[y];	3855	delete [] ov.text[y];
3778	delete [] ov_rend[y];	3856	delete [] ov.rend[y];
3779	}	3857	}
3780		3858
3781	delete [] ov_text; ov_text = 0;	3859	delete [] ov.text; ov.text = 0;
3782	delete [] ov_rend; ov_rend = 0;	3860	delete [] ov.rend; ov.rend = 0;
3783	}	3861	}
3784		3862
3785	void	3863	void
3786	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW	3864	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3787	{	3865	{
3788	if (!ov_text \|\| x >= ov_w - 2 \|\| y >= ov_h - 2)	3866	if (!ov.text \|\| x >= ov.w - 2 \|\| y >= ov.h - 2)
3789	return;	3867	return;
3790		3868
3791	x++, y++;	3869	x++, y++;
3792		3870
3793	ov_text[y][x] = text;	3871	ov.text[y][x] = text;
3794	ov_rend[y][x] = rend;	3872	ov.rend[y][x] = rend;
3795	}	3873	}
3796		3874
3797	void	3875	void
3798	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW	3876	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3799	{	3877	{
…		…
3818	}	3896	}
3819		3897
3820	void	3898	void
3821	rxvt_term::scr_swap_overlay () NOTHROW	3899	rxvt_term::scr_swap_overlay () NOTHROW
3822	{	3900	{
3823	if (!ov_text)	3901	if (!ov.text)
3824	return;	3902	return;
3825		3903
		3904	// hide cursor if it is within the overlay area
		3905	if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
		3906	&& IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
		3907	screen.flags &= ~Screen_VisibleCursor;
		3908
3826	// swap screen mem with overlay	3909	// swap screen mem with overlay
3827	for (int y = ov_h; y--; )	3910	for (int y = ov.h; y--; )
3828	{	3911	{
3829	text_t *t1 = ov_text[y];	3912	text_t *t1 = ov.text[y];
3830	rend_t *r1 = ov_rend[y];	3913	rend_t *r1 = ov.rend[y];
3831		3914
3832	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;	3915	text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3833	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;	3916	rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3834		3917
3835	for (int x = ov_w; x--; )	3918	for (int x = ov.w; x--; )
3836	{	3919	{
3837	text_t t = t1; t1++ = t2; t2++ = t;	3920	text_t t = t1; t1++ = t2; t2++ = t;
3838	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3921	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3839	}	3922	}
3840	}	3923	}

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.315 by root, Tue Nov 4 14:38:29 2008 UTC vs. Revision 1.367 by sf-exg, Mon Jan 31 15:40:22 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.315 by root, Tue Nov 4 14:38:29 2008 UTC vs.
Revision 1.367 by sf-exg, Mon Jan 31 15:40:22 2011 UTC