ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/screen.C

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.273 by ayin, Mon Aug 13 07:18:58 2007 UTC vs.
Revision 1.363 by sf-exg, Thu Jan 20 14:02:35 2011 UTC

1	/*---------------------------------------------------------------------------*	1	/*---------------------------------------------------------------------------*
2	* File: screen.C	2	* File: screen.C
3	*---------------------------------------------------------------------------*	3	*---------------------------------------------------------------------------*
4	*	4	*
5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>	5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
…		…
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	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
…		…
83	ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)	84	ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84	#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \	85	#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85	ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)	86	ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86		87
87	/*	88	/*
88	* CLEAR_ROWS : clear <num> rows starting from row <row>
89	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>	89	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90	* ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91	*/	90	*/
92	#define drawBuffer vt
93
94	#define CLEAR_ROWS(row, num) \
95	if (mapped) \
96	XClearArea (dpy, drawBuffer, 0, \
97	Row2Pixel (row), (unsigned int)width, \
98	(unsigned int)Height2Pixel (num), False)
99
100	#define CLEAR_CHARS(x, y, num) \	91	#define CLEAR_CHARS(x, y, num) \
101	if (mapped) \	92	if (mapped) \
102	XClearArea (dpy, drawBuffer, x, y, \	93	XClearArea (dpy, vt, x, y, \
103	(unsigned int)Width2Pixel (num), \	94	(unsigned int)Width2Pixel (num), \
104	(unsigned int)Height2Pixel (1), False)	95	(unsigned int)Height2Pixel (1), False)
105
106	#define ERASE_ROWS(row, num) \
107	XFillRectangle (dpy, drawBuffer, gc, \
108	0, Row2Pixel (row), \
109	(unsigned int)width, \
110	(unsigned int)Height2Pixel (num))
111		96
112	/* ------------------------------------------------------------------------- *	97	/* ------------------------------------------------------------------------- *
113	* SCREEN `COMMON' ROUTINES *	98	* SCREEN `COMMON' ROUTINES *
114	* ------------------------------------------------------------------------- */	99	* ------------------------------------------------------------------------- */
115		100
…		…
148		133
149	l.l = 0;	134	l.l = 0;
150	l.f = 0;	135	l.f = 0;
151	}	136	}
152		137
		138	// nuke a single wide character at the given column
		139	void
		140	rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
		141	{
		142	// find begin
		143	while (col > 0 && l.t[col] == NOCHAR)
		144	col--;
		145
		146	rend_t rend = l.r[col] & ~RS_baseattrMask;
		147	rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
		148
		149	l.touch ();
		150
		151	// found start, nuke
		152	do {
		153	l.t[col] = ' ';
		154	l.r[col] = rend;
		155	col++;
		156	} while (col < ncol && l.t[col] == NOCHAR);
		157	}
		158
153	/* ------------------------------------------------------------------------- *	159	/* ------------------------------------------------------------------------- *
154	* SCREEN INITIALISATION *	160	* SCREEN INITIALISATION *
155	* ------------------------------------------------------------------------- */	161	* ------------------------------------------------------------------------- */
156		162
157	void	163	void
158	rxvt_term::scr_reset ()	164	rxvt_term::scr_reset ()
159	{	165	{
160	#if ENABLE_OVERLAY
161	scr_overlay_off ();
162	#endif
163
164	rvideo_mode = false;
165	view_start = 0;	166	view_start = 0;
166	num_scr = 0;	167	num_scr = 0;
167		168
168	if (ncol == 0)	169	if (ncol == 0)
169	ncol = 80;	170	ncol = 80;
…		…
171	if (nrow == 0)	172	if (nrow == 0)
172	nrow = 24;	173	nrow = 24;
173		174
174	if (ncol == prev_ncol && nrow == prev_nrow)	175	if (ncol == prev_ncol && nrow == prev_nrow)
175	return;	176	return;
176
177	if (current_screen != PRIMARY)
178	scr_swap_screen ();
179		177
180	// we need at least two lines for wrapping to work correctly	178	// we need at least two lines for wrapping to work correctly
181	while (nrow + saveLines < 2)	179	while (nrow + saveLines < 2)
182	{	180	{
183	//TODO//FIXME	181	//TODO//FIXME
…		…
236	selection.text = NULL;	234	selection.text = NULL;
237	selection.len = 0;	235	selection.len = 0;
238	selection.op = SELECTION_CLEAR;	236	selection.op = SELECTION_CLEAR;
239	selection.screen = PRIMARY;	237	selection.screen = PRIMARY;
240	selection.clicks = 0;	238	selection.clicks = 0;
		239	selection.clip_text = NULL;
		240	selection.clip_len = 0;
241	}	241	}
242	else	242	else
243	{	243	{
244	/*	244	/*
245	* add or delete rows as appropriate	245	* add or delete rows as appropriate
…		…
274	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);	274	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275	}	275	}
276		276
277	line_t *old_buf = row_buf;	277	line_t *old_buf = row_buf;
278	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));	278	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279		279
280	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	280	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281	int pend = MOD (term_start + top_row , prev_total_rows);	281	int pend = MOD (term_start + top_row , prev_total_rows);
282	int q = total_rows; // rewrapped row	282	int q = total_rows; // rewrapped row
283		283
284	if (top_row)	284	if (top_row)
285	{	285	{
286	// 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
287	// 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
288		289
289	row_col_t ocur = screen.cur;	290	row_col_t ocur = screen.cur;
290	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	291	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291		292
292	do	293	do
293	{	294	{
294	p = MOD (p - 1, prev_total_rows);	295	p = MOD (p - 1, prev_total_rows);
295	#ifdef DEBUG_STRICT
296	assert (old_buf [MOD (p, prev_total_rows)].t);	296	assert (old_buf [MOD (p, prev_total_rows)].t);
297	#endif
298	int plines = 1;	297	int plines = 1;
299	int llen = old_buf [MOD (p, prev_total_rows)].l;	298	int llen = old_buf [MOD (p, prev_total_rows)].l;
300		299
301	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 ())
302	{	301	{
…		…
328	int qcol = 0;	327	int qcol = 0;
329		328
330	// see below for cursor adjustment rationale	329	// see below for cursor adjustment rationale
331	if (p == ocur.row)	330	if (p == ocur.row)
332	screen.cur.row = q - (total_rows - nrow);	331	screen.cur.row = q - (total_rows - nrow);
333		332
334	// fill a single destination line	333	// fill a single destination line
335	while (lofs < llen && qcol < ncol)	334	while (lofs < llen && qcol < ncol)
336	{	335	{
337	int prow = lofs / prev_ncol;	336	int prow = lofs / prev_ncol;
338	int pcol = lofs % prev_ncol;	337	int pcol = lofs % prev_ncol;
…		…
364	}	363	}
365	while (p != pend && q > 0);	364	while (p != pend && q > 0);
366		365
367	term_start = total_rows - nrow;	366	term_start = total_rows - nrow;
368	top_row = q - term_start;	367	top_row = q - term_start;
369		368
370	// make sure all terminal lines exist	369	// make sure all terminal lines exist
371	while (top_row > 0)	370	while (top_row > 0)
372	scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);	371	scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
373	}	372	}
374	else	373	else
375	{	374	{
376	// if no scrollback exists (yet), wing, instead of wrap	375	// if no scrollback exists (yet), wing, instead of wrap
377		376
378	for (int row = min (nrow, prev_nrow); row--; )	377	for (int row = min (nrow, prev_nrow); row--; )
379	{	378	{
380	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];	379	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
381	line_t &qline = row_buf [row];	380	line_t &qline = row_buf [row];
382		381
…		…
396	delete old_ta;	395	delete old_ta;
397	delete old_ra;	396	delete old_ra;
398		397
399	clamp_it (screen.cur.row, 0, nrow - 1);	398	clamp_it (screen.cur.row, 0, nrow - 1);
400	clamp_it (screen.cur.col, 0, ncol - 1);	399	clamp_it (screen.cur.col, 0, ncol - 1);
		400	}
401		401
402	free (tabs);	402	free (tabs);
403	}	403	tabs = (char *)rxvt_malloc (ncol);
		404
		405	for (int col = ncol; col--; )
		406	tabs [col] = col % TABSIZE == 0;
404		407
405	CLEAR_ALL_SELECTION ();	408	CLEAR_ALL_SELECTION ();
406		409
407	prev_nrow = nrow;	410	prev_nrow = nrow;
408	prev_ncol = ncol;	411	prev_ncol = ncol;
409
410	tabs = (char *)rxvt_malloc (ncol * sizeof (char));
411
412	for (int col = ncol; --col; )
413	tabs [col] = col % TABSIZE == 0;
414
415	if (current_screen != PRIMARY)
416	scr_swap_screen ();
417		412
418	tt_winch ();	413	tt_winch ();
419		414
420	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	415	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421	}	416	}
…		…
433	delete ralloc; ralloc = 0;	428	delete ralloc; ralloc = 0;
434		429
435	free (row_buf);	430	free (row_buf);
436	free (swap_buf);	431	free (swap_buf);
437	free (drawn_buf);	432	free (drawn_buf);
		433	row_buf = 0; // signal that we freed all the arrays above
		434
438	free (tabs);	435	free (tabs);
439		436	tabs = 0;
440	row_buf = 0; // signal that we freed all the arrays
441	}	437	}
442	}	438	}
443		439
444	/* ------------------------------------------------------------------------- */	440	/* ------------------------------------------------------------------------- */
445	/*	441	/*
446	* Hard reset	442	* Hard/Soft reset
447	*/	443	*/
448	void	444	void
449	rxvt_term::scr_poweron ()	445	rxvt_term::scr_poweron ()
450	{	446	{
451	scr_release ();	447	scr_release ();
452	prev_nrow = prev_ncol = 0;	448	prev_nrow = prev_ncol = 0;
		449	rvideo_mode = false;
		450	scr_soft_reset ();
453	scr_reset ();	451	scr_reset ();
454		452
455	scr_clear (true);	453	scr_clear (true);
456	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);
457	}	471	}
458		472
459	/* ------------------------------------------------------------------------- *	473	/* ------------------------------------------------------------------------- *
460	* PROCESS SCREEN COMMANDS *	474	* PROCESS SCREEN COMMANDS *
461	* ------------------------------------------------------------------------- */	475	* ------------------------------------------------------------------------- */
…		…
499	}	513	}
500		514
501	/* boundary check in case screen size changed between SAVE and RESTORE */	515	/* boundary check in case screen size changed between SAVE and RESTORE */
502	min_it (s->cur.row, nrow - 1);	516	min_it (s->cur.row, nrow - 1);
503	min_it (s->cur.col, ncol - 1);	517	min_it (s->cur.col, ncol - 1);
504	#ifdef DEBUG_STRICT
505	assert (s->cur.row >= 0);	518	assert (s->cur.row >= 0);
506	assert (s->cur.col >= 0);	519	assert (s->cur.col >= 0);
507	#endif
508	}	520	}
509		521
510	void	522	void
511	rxvt_term::scr_swap_screen ()	523	rxvt_term::scr_swap_screen ()
512	{	524	{
…		…
537	want_refresh = 1;	549	want_refresh = 1;
538	view_start = 0;	550	view_start = 0;
539		551
540	selection_check (2); /* check for boundary cross */	552	selection_check (2); /* check for boundary cross */
541		553
542	int i = current_screen; current_screen = scrn; scrn = i;	554	current_screen = scrn;
543		555
544	#if NSCREENS	556	#if NSCREENS
545	if (option (Opt_secondaryScreen))	557	if (option (Opt_secondaryScreen))
546	{	558	{
547	num_scr = 0;	559	num_scr = 0;
…		…
596	/*	608	/*
597	* Change the rendition style for following text	609	* Change the rendition style for following text
598	*/	610	*/
599	void	611	void
600	rxvt_term::scr_rendition (int set, int style) NOTHROW	612	rxvt_term::scr_rendition (int set, int style) NOTHROW
601	{	613	{
602	if (set)	614	if (set)
603	rstyle |= style;	615	rstyle |= style;
604	else if (style == ~RS_None)	616	else if (style == ~RS_None)
605	rstyle = DEFAULT_RSTYLE;	617	rstyle = DEFAULT_RSTYLE;
606	else	618	else
607	rstyle &= ~style;	619	rstyle &= ~style;
608	}	620	}
609		621
610	/* ------------------------------------------------------------------------- */	622	/* ------------------------------------------------------------------------- */
611	/*	623	/*
612	* Scroll text between <row1> and <row2> inclusive, by <count> lines	624	* Scroll text between <row1> and <row2> inclusive, by <count> lines
613	* count positive ==> scroll up	625	* count positive ==> scroll up
…		…
664	line_t &l2 = ROW(i);	676	line_t &l2 = ROW(i);
665		677
666	::swap (l1, l2);	678	::swap (l1, l2);
667	l2.touch ();	679	l2.touch ();
668	}	680	}
669		681
670	// move and/or clear selection, if any	682	// move and/or clear selection, if any
671	if (selection.op && current_screen == selection.screen)	683	if (selection.op && current_screen == selection.screen)
672	{	684	{
673	selection.beg.row -= count;	685	selection.beg.row -= count;
674	selection.end.row -= count;	686	selection.end.row -= count;
…		…
710	{	722	{
711	/* move selected region too */	723	/* move selected region too */
712	selection.beg.row -= count;	724	selection.beg.row -= count;
713	selection.end.row -= count;	725	selection.end.row -= count;
714	selection.mark.row -= count;	726	selection.mark.row -= count;
715		727
716	selection_check (0);	728	selection_check (0);
717	}	729	}
718	}	730	}
719		731
720	// use a simple and robust scrolling algorithm, this	732	// use a simple and robust scrolling algorithm, this
…		…
772	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);	784	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773	screen.cur.row -= minlines;	785	screen.cur.row -= minlines;
774	}	786	}
775	}	787	}
776		788
777	#ifdef DEBUG_STRICT
778	assert (screen.cur.col < ncol);	789	assert (screen.cur.col < ncol);
779	assert (screen.cur.row < nrow	790	assert (screen.cur.row < nrow
780	&& screen.cur.row >= top_row);	791	&& screen.cur.row >= top_row);
781	#endif
782	int row = screen.cur.row;	792	int row = screen.cur.row;
783		793
784	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	794	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785		795
786	line_t *line = &ROW(row);	796	line_t *line = &ROW(row);
787		797
788	while (str < strend)	798	while (str < strend)
789	{	799	{
790	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	800	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791		801
792	if (c < 0x20)	802	if (expect_false (c < 0x20))
793	if (c == C0_LF)	803	if (c == C0_LF)
794	{	804	{
795	max_it (line->l, screen.cur.col);	805	max_it (line->l, screen.cur.col);
796		806
797	screen.flags &= ~Screen_WrapNext;	807	screen.flags &= ~Screen_WrapNext;
…		…
816	{	826	{
817	scr_tab (1, true);	827	scr_tab (1, true);
818	continue;	828	continue;
819	}	829	}
820		830
		831	if (expect_false (
821	if (checksel /* see if we're writing within selection */	832	checksel /* see if we're writing within selection */
822	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	833	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	834	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
		835	))
824	{	836	{
825	checksel = 0;	837	checksel = 0;
826	/*	838	/*
827	* If we wrote anywhere in the selected area, kill the selection	839	* If we wrote anywhere in the selected area, kill the selection
828	* XXX: should we kill the mark too? Possibly, but maybe that	840	* XXX: should we kill the mark too? Possibly, but maybe that
829	* should be a similar check.	841	* should be a similar check.
830	*/	842	*/
831	CLEAR_SELECTION ();	843	CLEAR_SELECTION ();
832	}	844	}
833		845
834	if (screen.flags & Screen_WrapNext)	846	if (expect_false (screen.flags & Screen_WrapNext))
835	{	847	{
836	scr_do_wrap ();	848	scr_do_wrap ();
837		849
838	line->l = ncol;	850	line->l = ncol;
839	line->is_longer (1);	851	line->is_longer (1);
840		852
841	row = screen.cur.row;	853	row = screen.cur.row;
842	line = &ROW(row); /* _must_ refresh */	854	line = &ROW(row); /* _must_ refresh */
843	}	855	}
844		856
845	// some utf-8 decoders "decode" surrogate characters: let's fix this.	857	// some utf-8 decoders "decode" surrogate characters: let's fix this.
846	if (IN_RANGE_INC (c, 0xd800, 0xdfff))	858	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847	c = 0xfffd;	859	c = 0xfffd;
848		860
849	// rely on wcwidth to tell us the character width, do wcwidth before	861	// rely on wcwidth to tell us the character width, do wcwidth before
850	// further replacements, as wcwidth might return -1 for the line	862	// further replacements, as wcwidth might return -1 for the line
851	// drawing characters below as they might be invalid in the current	863	// drawing characters below as they might be invalid in the current
852	// locale.	864	// locale.
853	int width = WCWIDTH (c);	865	int width = WCWIDTH (c);
854		866
855	if (charsets [screen.charset] == '0') // DEC SPECIAL	867	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856	{	868	{
857	// vt100 special graphics and line drawing	869	// vt100 special graphics and line drawing
858	// 5f-7e standard vt100	870	// 5f-7e standard vt100
859	// 40-5e rxvt extension for extra curses acs chars	871	// 40-5e rxvt extension for extra curses acs chars
860	static uint16_t vt100_0[62] = { // 41 .. 7e	872	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
873	c = vt100_0[c - 0x41];	885	c = vt100_0[c - 0x41];
874	width = 1; // vt100 line drawing characters are always single-width	886	width = 1; // vt100 line drawing characters are always single-width
875	}	887	}
876	}	888	}
877		889
878	if (screen.flags & Screen_Insert)	890	if (expect_false (screen.flags & Screen_Insert))
879	scr_insdel_chars (width, INSERT);	891	scr_insdel_chars (width, INSERT);
880		892
881	if (width != 0)	893	if (width != 0)
882	{	894	{
883	#if !UNICODE_3	895	#if !UNICODE_3
…		…
888	# else	900	# else
889	c = 0xfffd;	901	c = 0xfffd;
890	# endif	902	# endif
891	#endif	903	#endif
892		904
		905	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		906
		907	// if the character doesn't fit into the remaining columns...
		908	if (expect_false (screen.cur.col > ncol - width && ncol >= width))
		909	{
		910	if (screen.flags & Screen_Autowrap)
		911	{
		912	// ... artificially enlargen the previous one
		913	c = NOCHAR;
		914	// and try the same character next loop iteration
		915	--str;
		916	}
		917	else
		918	screen.cur.col = ncol - width;
		919	}
		920
893	// nuke the character at this position, if required	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.
894	if (line->t[screen.cur.col] == NOCHAR	925	if (expect_false (line->t[screen.cur.col] == NOCHAR))
895	|| (screen.cur.col < ncol - 1	926	scr_kill_char (*line, screen.cur.col);
896	&& line->t[screen.cur.col + 1] == NOCHAR))
897	{
898	int col = screen.cur.col;
899
900	// find begin
901	while (col > 0 && line->t[col] == NOCHAR)
902	col--;
903
904	rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
905
906	// found begin, nuke
907	do {
908	line->t[col] = ' ';
909	line->r[col] = rend;
910	col++;
911	} while (col < ncol && line->t[col] == NOCHAR);
912	}
913
914	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916	// if the character doesn't fit into the remaining columns...
917	if (screen.cur.col > ncol - width && ncol >= width)
918	{
919	// ...output spaces
920	c = ' ';
921	// and try the same character next loop iteration
922	--str;
923	}
924		927
925	line->touch ();	928	line->touch ();
926		929
927	do	930	do
928	{	931	{
929	line->t[screen.cur.col] = c;	932	line->t[screen.cur.col] = c;
930	line->r[screen.cur.col] = rend;	933	line->r[screen.cur.col] = rend;
931		934
932	if (screen.cur.col < ncol - 1)	935	if (expect_true (screen.cur.col < ncol - 1))
933	screen.cur.col++;	936	screen.cur.col++;
934	else	937	else
935	{	938	{
936	line->l = ncol;	939	line->l = ncol;
937	if (screen.flags & Screen_Autowrap)	940	if (screen.flags & Screen_Autowrap)
938	screen.flags |= Screen_WrapNext;	941	screen.flags |= Screen_WrapNext;
939	break;	942
		943	goto end_of_line;
940	}	944	}
941		945
942	c = NOCHAR;	946	c = NOCHAR;
943	}	947	}
944	while (--width > 0);	948	while (expect_false (--width > 0));
945		949
946	// pad with spaces when overwriting wide character with smaller one	950	// pad with spaces when overwriting wide character with smaller one
947	if (!width)	951	for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
948	{	952	{
949	line->touch ();	953	line->t[c] = ' ';
		954	line->r[c] = rend;
		955	}
950		956
951	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)	957	end_of_line:
		958	;
		959	}
		960	#if ENABLE_COMBINING
		961	else // width == 0
		962	{
		963	if (c != 0xfeff) // ignore BOM
		964	{
		965	// handle combining characters
		966	// we just tag the accent on the previous on-screen character.
		967	// this is arguably not correct, but also arguably not wrong.
		968	// we don't handle double-width characters nicely yet.
		969	line_t *linep;
		970	text_t *tp;
		971	rend_t *rp;
		972
		973	if (screen.cur.col > 0)
952	{	974	{
953	line->t[c] = ' ';
954	line->r[c] = rend;	975	linep = line;
		976	tp = line->t + screen.cur.col - 1;
		977	rp = line->r + screen.cur.col - 1;
955	}	978	}
		979	else if (screen.cur.row > 0
		980	&& ROW(screen.cur.row - 1).is_longer ())
		981	{
		982	linep = &ROW(screen.cur.row - 1);
		983	tp = line->t + ncol - 1;
		984	rp = line->r + ncol - 1;
		985	}
		986	else
		987	continue;
		988
		989	linep->touch ();
		990
		991	while (*tp == NOCHAR && tp > linep->t)
		992	tp--, rp--;
		993
		994	// first try to find a precomposed character
		995	unicode_t n = rxvt_compose (*tp, c);
		996	if (n == NOCHAR)
		997	n = rxvt_composite.compose (*tp, c);
		998
		999	*tp = n;
		1000	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
956	}	1001	}
957	}	1002	}
958	else // width == 0
959	{
960	#if ENABLE_COMBINING
961	// handle combining characters
962	// we just tag the accent on the previous on-screen character.
963	// this is arguably not correct, but also arguably not wrong.
964	// we don't handle double-width characters nicely yet.
965	line_t *linep;
966	text_t *tp;
967	rend_t *rp;
968
969	if (screen.cur.col > 0)
970	{
971	linep = line;
972	tp = line->t + screen.cur.col - 1;
973	rp = line->r + screen.cur.col - 1;
974	}
975	else if (screen.cur.row > 0
976	&& ROW(screen.cur.row - 1).is_longer ())
977	{
978	linep = &ROW(screen.cur.row - 1);
979	tp = line->t + ncol - 1;
980	rp = line->r + ncol - 1;
981	}
982	else
983	continue;
984
985	linep->touch ();
986
987	while (*tp == NOCHAR && tp > linep->t)
988	tp--, rp--;
989
990	// first try to find a precomposed character
991	unicode_t n = rxvt_compose (*tp, c);
992	if (n == NOCHAR)
993	n = rxvt_composite.compose (*tp, c);
994
995	*tp = n;
996	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
997	#endif	1003	#endif
998	}
999	}	1004	}
1000		1005
1001	max_it (line->l, screen.cur.col);	1006	max_it (line->l, screen.cur.col);
1002		1007
1003	#ifdef DEBUG_STRICT
1004	assert (screen.cur.row >= 0);	1008	assert (screen.cur.row >= 0);
1005	#endif
1006	}	1009	}
1007		1010
1008	/* ------------------------------------------------------------------------- */	1011	/* ------------------------------------------------------------------------- */
1009	/*	1012	/*
1010	* 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
1011	* XTERM_SEQ: CTRL-H	1014	* XTERM_SEQ: CTRL-H
1012	*/	1015	*/
1013	void	1016	void
1014	rxvt_term::scr_backspace () NOTHROW	1017	rxvt_term::scr_backspace () NOTHROW
1015	{	1018	{
1016	want_refresh = 1;
1017
1018	if (screen.cur.col == 0)	1019	if (screen.cur.col == 0)
1019	{	1020	{
1020	if (screen.cur.row > 0)	1021	if (screen.cur.row > 0)
1021	{	1022	{
1022	#ifdef TERMCAP_HAS_BW	1023	#ifdef TERMCAP_HAS_BW
1023	screen.cur.col = ncol - 1;	1024	screen.cur.col = ncol - 1;
1024	screen.cur.row--;	1025	--screen.cur.row;
1025	return;	1026
		1027	want_refresh = 1;
1026	#endif	1028	#endif
1027	}	1029	}
1028	}	1030	}
1029	else if (!(screen.flags & Screen_WrapNext))	1031	else if (screen.flags & Screen_WrapNext)
		1032	screen.flags &= ~Screen_WrapNext;
		1033	else
1030	scr_gotorc (0, -1, RELATIVE);	1034	scr_gotorc (0, -1, RELATIVE);
1031
1032	screen.flags &= ~Screen_WrapNext;
1033	}	1035	}
1034		1036
1035	/* ------------------------------------------------------------------------- */	1037	/* ------------------------------------------------------------------------- */
1036	/*	1038	/*
1037	* Process Horizontal Tab	1039	* Process Horizontal Tab
…		…
1060	x = i;	1062	x = i;
1061		1063
1062	if (!--count)	1064	if (!--count)
1063	break;	1065	break;
1064	}	1066	}
1065	else	1067	else
1066	ht &= l.t[i] == ' '	1068	ht &= l.t[i] == ' '
1067	&& RS_SAME (l.r[i], base_rend);	1069	&& RS_SAME (l.r[i], base_rend);
1068		1070
1069	if (count)	1071	if (count)
1070	x = ncol - 1;	1072	x = ncol - 1;
…		…
1186	}	1188	}
1187	}	1189	}
1188	else	1190	else
1189	{	1191	{
1190	if (screen.flags & Screen_Relative)	1192	if (screen.flags & Screen_Relative)
		1193	{
1191	{ /* relative origin mode */	1194	/* relative origin mode */
1192	screen.cur.row = row + screen.tscroll;	1195	screen.cur.row = row + screen.tscroll;
1193	min_it (screen.cur.row, screen.bscroll);	1196	min_it (screen.cur.row, screen.bscroll);
1194	}	1197	}
1195	else	1198	else
1196	screen.cur.row = row;	1199	screen.cur.row = row;
…		…
1229	/*	1232	/*
1230	* Erase part or whole of a line	1233	* Erase part or whole of a line
1231	* XTERM_SEQ: Clear line to right: ESC [ 0 K	1234	* XTERM_SEQ: Clear line to right: ESC [ 0 K
1232	* XTERM_SEQ: Clear line to left : ESC [ 1 K	1235	* XTERM_SEQ: Clear line to left : ESC [ 1 K
1233	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1236	* XTERM_SEQ: Clear whole line : ESC [ 2 K
		1237	* extension: clear to right unless wrapped: ESC [ 3 K
1234	*/	1238	*/
1235	void	1239	void
1236	rxvt_term::scr_erase_line (int mode) NOTHROW	1240	rxvt_term::scr_erase_line (int mode) NOTHROW
1237	{	1241	{
1238	unsigned int col, num;	1242	unsigned int col, num;
…		…
1247	line.touch ();	1251	line.touch ();
1248	line.is_longer (0);	1252	line.is_longer (0);
1249		1253
1250	switch (mode)	1254	switch (mode)
1251	{	1255	{
		1256	case 3:
		1257	if (screen.flags & Screen_WrapNext)
		1258	return;
		1259
		1260	/* fall through */
		1261
1252	case 0: /* erase to end of line */	1262	case 0: /* erase to end of line */
1253	col = screen.cur.col;	1263	col = screen.cur.col;
1254	num = ncol - col;	1264	num = ncol - col;
1255	min_it (line.l, col);	1265	min_it (line.l, col);
		1266
1256	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1267	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1257	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1268	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1258	CLEAR_SELECTION ();	1269	CLEAR_SELECTION ();
1259	break;	1270	break;
		1271
1260	case 1: /* erase to beginning of line */	1272	case 1: /* erase to beginning of line */
1261	col = 0;	1273	col = 0;
1262	num = screen.cur.col + 1;	1274	num = screen.cur.col + 1;
		1275
1263	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)	1276	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1264	|| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))	1277	|| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1265	CLEAR_SELECTION ();	1278	CLEAR_SELECTION ();
1266	break;	1279	break;
		1280
1267	case 2: /* erase whole line */	1281	case 2: /* erase whole line */
1268	col = 0;	1282	col = 0;
1269	num = ncol;	1283	num = ncol;
1270	line.l = 0;	1284	line.l = 0;
1271	if (selection.beg.row <= screen.cur.row	1285	if (selection.beg.row <= screen.cur.row
…		…
1329	if (row >= nrow) /* Out Of Bounds */	1343	if (row >= nrow) /* Out Of Bounds */
1330	return;	1344	return;
1331		1345
1332	min_it (num, nrow - row);	1346	min_it (num, nrow - row);
1333		1347
1334	if (rstyle & (RS_RVid | RS_Uline))	1348	if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1335	ren = (rend_t) ~RS_None;	1349	ren = (rend_t) ~RS_None;
1336	else if (GET_BASEBG (rstyle) == Color_bg)	1350	else if (GET_BASEBG (rstyle) == Color_bg)
1337	{	1351	{
1338	ren = DEFAULT_RSTYLE;	1352	ren = DEFAULT_RSTYLE;
1339	CLEAR_ROWS (row, num);	1353
		1354	if (mapped)
		1355	XClearArea (dpy, vt, 0,
		1356	Row2Pixel (row - view_start), (unsigned int)width,
		1357	(unsigned int)Height2Pixel (num), False);
1340	}	1358	}
1341	else	1359	else
1342	{	1360	{
1343	ren = rstyle & (RS_fgMask | RS_bgMask);	1361	ren = rstyle & (RS_fgMask | RS_bgMask);
		1362
		1363	if (mapped)
		1364	{
1344	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1365	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1345	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1366	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346	ERASE_ROWS (row, num);	1367	XFillRectangle (dpy, vt, gc,
		1368	0, Row2Pixel (row - view_start),
		1369	(unsigned int)width,
		1370	(unsigned int)Height2Pixel (num));
1347	gcvalue.foreground = pix_colors[Color_fg];	1371	gcvalue.foreground = pix_colors[Color_fg];
1348	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1372	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1373	}
1349	}	1374	}
1350		1375
1351	for (; num--; row++)	1376	for (; num--; row++)
1352	{	1377	{
1353	scr_blank_screen_mem (ROW(row), rstyle);	1378	scr_blank_screen_mem (ROW(row), rstyle);
		1379
		1380	if (row - view_start < nrow)
1354	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1381	scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1355	}	1382	}
1356	}	1383	}
1357		1384
1358	#if !ENABLE_MINIMAL	1385	#if !ENABLE_MINIMAL
1359	void	1386	void
…		…
1433	* Insert/Delete <count> characters from the current position	1460	* Insert/Delete <count> characters from the current position
1434	*/	1461	*/
1435	void	1462	void
1436	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW	1463	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1437	{	1464	{
1438	int col, row;
1439	rend_t tr;
1440
1441	want_refresh = 1;	1465	want_refresh = 1;
1442	ZERO_SCROLLBACK ();	1466	ZERO_SCROLLBACK ();
1443		1467
1444	if (count <= 0)	1468	if (count <= 0)
1445	return;	1469	return;
…		…
1447	scr_do_wrap ();	1471	scr_do_wrap ();
1448		1472
1449	selection_check (1);	1473	selection_check (1);
1450	min_it (count, ncol - screen.cur.col);	1474	min_it (count, ncol - screen.cur.col);
1451		1475
1452	row = screen.cur.row;	1476	int row = screen.cur.row;
1453		1477
1454	line_t *line = &ROW(row);	1478	line_t *line = &ROW(row);
1455		1479
1456	line->touch ();	1480	line->touch ();
1457	line->is_longer (0);	1481	line->is_longer (0);
1458		1482
		1483	// nuke wide spanning the start
		1484	if (line->t[screen.cur.col] == NOCHAR)
		1485	scr_kill_char (*line, screen.cur.col);
		1486
1459	switch (insdel)	1487	switch (insdel)
1460	{	1488	{
1461	case INSERT:	1489	case INSERT:
1462	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1490	line->l = min (line->l + count, ncol);
		1491
		1492	if (line->t[screen.cur.col] == NOCHAR)
		1493	scr_kill_char (*line, screen.cur.col);
		1494
		1495	for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1463	{	1496	{
1464	line->t[col] = line->t[col - count];	1497	line->t[col] = line->t[col - count];
1465	line->r[col] = line->r[col - count];	1498	line->r[col] = line->r[col - count];
1466	}	1499	}
1467
1468	line->l = min (line->l + count, ncol);
1469		1500
1470	if (selection.op && current_screen == selection.screen	1501	if (selection.op && current_screen == selection.screen
1471	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1502	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1472	{	1503	{
1473	if (selection.end.row != screen.cur.row	1504	if (selection.end.row != screen.cur.row
1474	|| (selection.end.col + count >= ncol))	1505	|| (selection.end.col + count >= ncol))
1475	CLEAR_SELECTION ();	1506	CLEAR_SELECTION ();
1476	else	1507	else
		1508	{
1477	{ /* shift selection */	1509	/* shift selection */
1478	selection.beg.col += count;	1510	selection.beg.col += count;
1479	selection.mark.col += count; /* XXX: yes? */	1511	selection.mark.col += count; /* XXX: yes? */
1480	selection.end.col += count;	1512	selection.end.col += count;
1481	}	1513	}
1482	}	1514	}
…		…
1487	case ERASE:	1519	case ERASE:
1488	screen.cur.col += count; /* don't worry if > ncol */	1520	screen.cur.col += count; /* don't worry if > ncol */
1489	selection_check (1);	1521	selection_check (1);
1490	screen.cur.col -= count;	1522	screen.cur.col -= count;
1491		1523
1492	line->l = max (line->l - count, 0);	1524	// nuke wide char after the end
		1525	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1526	scr_kill_char (*line, screen.cur.col + count);
		1527
1493	scr_blank_line (*line, screen.cur.col, count, rstyle);	1528	scr_blank_line (*line, screen.cur.col, count, rstyle);
1494	break;	1529	break;
1495		1530
1496	case DELETE:	1531	case DELETE:
1497	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1532	line->l = max (line->l - count, 0);
1498		1533
		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);
		1537
1499	for (col = screen.cur.col; (col + count) < ncol; col++)	1538	for (int col = screen.cur.col; (col + count) < ncol; col++)
1500	{	1539	{
1501	line->t[col] = line->t[col + count];	1540	line->t[col] = line->t[col + count];
1502	line->r[col] = line->r[col + count];	1541	line->r[col] = line->r[col + count];
1503	}	1542	}
1504		1543
1505	line->l = max (line->l - count, 0);
1506	scr_blank_line (*line, ncol - count, count, tr);	1544	scr_blank_line (*line, ncol - count, count, rstyle);
1507		1545
1508	if (selection.op && current_screen == selection.screen	1546	if (selection.op && current_screen == selection.screen
1509	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1547	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510	{	1548	{
1511	if (selection.end.row != screen.cur.row	1549	if (selection.end.row != screen.cur.row
…		…
1621	*/	1659	*/
1622	void	1660	void
1623	rxvt_term::scr_set_tab (int mode) NOTHROW	1661	rxvt_term::scr_set_tab (int mode) NOTHROW
1624	{	1662	{
1625	if (mode < 0)	1663	if (mode < 0)
1626	memset (tabs, 0, ncol * sizeof (char));	1664	memset (tabs, 0, ncol);
1627	else if (screen.cur.col < ncol)	1665	else if (screen.cur.col < ncol)
1628	tabs [screen.cur.col] = !!mode;	1666	tabs [screen.cur.col] = !!mode;
1629	}	1667	}
1630		1668
1631	/* ------------------------------------------------------------------------- */	1669	/* ------------------------------------------------------------------------- */
…		…
1648	rvideo_state = on;	1686	rvideo_state = on;
1649		1687
1650	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1688	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1651	#ifdef HAVE_BG_PIXMAP	1689	#ifdef HAVE_BG_PIXMAP
1652	if (bgPixmap.pixmap == None)	1690	if (bgPixmap.pixmap == None)
1653	#endif
1654	#if ENABLE_TRANSPARENCY
1655	if (!option (Opt_transparent) || am_transparent == 0)
1656	#endif	1691	#endif
1657	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1692	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1658		1693
1659	XGCValues gcvalue;	1694	XGCValues gcvalue;
1660	gcvalue.foreground = pix_colors[Color_fg];	1695	gcvalue.foreground = pix_colors[Color_fg];
…		…
1869	return true;	1904	return true;
1870	}	1905	}
1871		1906
1872	#ifndef NO_BELL	1907	#ifndef NO_BELL
1873	void	1908	void
1874	rxvt_term::bell_cb (time_watcher &w)	1909	rxvt_term::bell_cb (ev::timer &w, int revents)
1875	{	1910	{
1876	rvideo_bell = false;	1911	rvideo_bell = false;
1877	scr_rvideo_mode (rvideo_mode);	1912	scr_rvideo_mode (rvideo_mode);
		1913	refresh_check ();
1878	}	1914	}
1879	#endif	1915	#endif
1880		1916
1881	/* ------------------------------------------------------------------------- */	1917	/* ------------------------------------------------------------------------- */
1882	void	1918	void
…		…
1888	# ifdef MAPALERT_OPTION	1924	# ifdef MAPALERT_OPTION
1889	if (option (Opt_mapAlert))	1925	if (option (Opt_mapAlert))
1890	# endif	1926	# endif
1891	XMapWindow (dpy, parent[0]);	1927	XMapWindow (dpy, parent[0]);
1892	# endif	1928	# endif
		1929
1893	# if ENABLE_FRILLS	1930	# if ENABLE_FRILLS
1894	if (option (Opt_urgentOnBell))	1931	if (option (Opt_urgentOnBell))
1895	{	1932	set_urgency (1);
1896	XWMHints *h;
1897
1898	h = XGetWMHints(dpy, parent[0]);
1899	if (h != NULL)
1900	{
1901	h->flags |= XUrgencyHint;
1902	XSetWMHints(dpy, parent[0], h);
1903	}
1904	}
1905	# endif	1933	# endif
1906		1934
1907	if (option (Opt_visualBell))	1935	if (option (Opt_visualBell))
1908	{	1936	{
1909	rvideo_bell = true;	1937	rvideo_bell = true;
1910	scr_rvideo_mode (rvideo_mode);	1938	scr_rvideo_mode (rvideo_mode);
1911	display->flush ();	1939	flush ();
1912		1940
1913	bell_ev.start (NOW + VISUAL_BELL_DURATION);	1941	bell_ev.start (VISUAL_BELL_DURATION);
1914	}	1942	}
1915	else	1943	else
1916	XBell (dpy, 0);	1944	XBell (dpy, 0);
		1945	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1917	#endif	1946	#endif
1918	}	1947	}
1919		1948
1920	/* ------------------------------------------------------------------------- */	1949	/* ------------------------------------------------------------------------- */
1921	/* ARGSUSED */	1950	/* ARGSUSED */
1922	void	1951	void
1923	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1952	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1924	{	1953	{
1925	#ifdef PRINTPIPE	1954	#ifdef PRINTPIPE
1926	int nrows, row_start;	1955	int nrows, row_start;
1927	FILE *fd;	1956	FILE *fd = popen_printer ();
1928		1957
1929	if ((fd = popen_printer ()) == NULL)	1958	if (!fd)
1930	return;	1959	return;
1931		1960
1932	if (fullhist)	1961	if (fullhist)
1933	{	1962	{
1934	nrows = nrow - top_row;	1963	nrows = nrow - top_row;
…		…
1940	row_start = view_start;	1969	row_start = view_start;
1941	}	1970	}
1942		1971
1943	wctomb (0, 0);	1972	wctomb (0, 0);
1944		1973
1945	for (int r1 = 0; r1 < nrows; r1++)	1974	for (int r1 = row_start; r1 < row_start + nrows; r1++)
1946	{	1975	{
1947	text_t *tp = ROW(r1).t;	1976	text_t *tp = ROW(r1).t;
1948	int len = ROW(r1).l;	1977	int len = ROW(r1).l;
1949		1978
1950	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
…		…
1979	* screen.text/screen.rend contain what the screen will change to.	2008	* screen.text/screen.rend contain what the screen will change to.
1980	*/	2009	*/
1981	void	2010	void
1982	rxvt_term::scr_refresh () NOTHROW	2011	rxvt_term::scr_refresh () NOTHROW
1983	{	2012	{
1984	unsigned char have_bg,
1985	showcursor; /* show the cursor */
1986	int16_t col, row, /* column/row we're processing */	2013	int16_t col, row, /* column/row we're processing */
1987	ocrow; /* old cursor row */	2014	ocrow; /* old cursor row */
1988	int i; /* tmp */	2015	int i; /* tmp */
1989	#ifndef NO_CURSORCOLOR	2016	#ifndef NO_CURSORCOLOR
1990	rend_t cc1; /* store colours at cursor position (s) */	2017	rend_t cc1; /* store colours at cursor position (s) */
…		…
1999	return;	2026	return;
2000		2027
2001	/*	2028	/*
2002	* A: set up vars	2029	* A: set up vars
2003	*/	2030	*/
2004	have_bg = 0;
2005	refresh_count = 0;	2031	refresh_count = 0;
2006		2032
		2033	unsigned int old_screen_flags = screen.flags;
		2034	char have_bg = 0;
2007	#ifdef HAVE_BG_PIXMAP	2035	#ifdef HAVE_BG_PIXMAP
2008	have_bg |= bgPixmap.pixmap != None;	2036	have_bg = bgPixmap.pixmap != None;
2009	#endif
2010	#if ENABLE_TRANSPARENCY
2011	have_bg |= option (Opt_transparent) && am_transparent;
2012	#endif	2037	#endif
2013	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2038	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2014		2039
2015	/*	2040	/*
2016	* B: reverse any characters which are selected	2041	* B: reverse any characters which are selected
2017	*/	2042	*/
2018	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;
2019		2051
2020	/*	2052	/*
2021	* C: set the cursor character (s)	2053	* C: set the cursor character (s)
2022	*/	2054	*/
2023	{	2055	{
2024	unsigned char setoldcursor;	2056	unsigned char setoldcursor;
2025		2057
2026	showcursor = (screen.flags & Screen_VisibleCursor);
2027	#ifdef CURSOR_BLINK	2058	#ifdef CURSOR_BLINK
2028	if (hidden_cursor)	2059	if (hidden_cursor)
2029	showcursor = 0;	2060	showcursor = 0;
2030	#endif	2061	#endif
2031		2062
…		…
2059	ccol2 = bgcolor_of (rstyle);	2090	ccol2 = bgcolor_of (rstyle);
2060	#else	2091	#else
2061	ccol2 = Color_bg;	2092	ccol2 = Color_bg;
2062	#endif	2093	#endif
2063		2094
2064	if (showcursor && focus)	2095	if (focus)
2065	{	2096	{
2066	if (option (Opt_cursorUnderline))	2097	if (option (Opt_cursorUnderline))
2067	*crp ^= RS_Uline;	2098	*crp ^= RS_Uline;
2068	else	2099	else
2069	{	2100	{
…		…
2104	oldcursor.col = screen.cur.col;	2135	oldcursor.col = screen.cur.col;
2105	}	2136	}
2106	}	2137	}
2107	}	2138	}
2108		2139
2109	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2110	#if ENABLE_OVERLAY
2111	scr_swap_overlay ();
2112	#endif
2113
2114	#ifndef NO_SLOW_LINK_SUPPORT	2140	#ifndef NO_SLOW_LINK_SUPPORT
2115	/*	2141	/*
2116	* D: CopyArea pass - very useful for slower links	2142	* D: CopyArea pass - very useful for slower links
2117	* This has been deliberately kept simple.	2143	* This has been deliberately kept simple.
2118	*/	2144	*/
…		…
2207	continue;	2233	continue;
2208		2234
2209	// redraw one or more characters	2235	// redraw one or more characters
2210		2236
2211	// seek to the beginning of wide characters	2237	// seek to the beginning of wide characters
2212	while (stp[col] == NOCHAR && col > 0)	2238	while (expect_false (stp[col] == NOCHAR && col > 0))
2213	--col;	2239	--col;
2214		2240
2215	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2241	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2216	text_t *text = stp + col;	2242	text_t *text = stp + col;
2217	int count = 1;	2243	int count = 1;
2218		2244
2219	dtp[col] = stp[col];	2245	dtp[col] = stp[col];
2220	drp[col] = rend;	2246	drp[col] = rend;
…		…
2224	for (i = 0; ++col < ncol; )	2250	for (i = 0; ++col < ncol; )
2225	{	2251	{
2226	if (stp[col] == NOCHAR)	2252	if (stp[col] == NOCHAR)
2227	{	2253	{
2228	dtp[col] = stp[col];	2254	dtp[col] = stp[col];
2229	drp[col] = rend;	2255	drp[col] = srp[col];
		2256
2230	count++;	2257	count++;
2231	i++;	2258	i++;
2232		2259
2233	continue;	2260	continue;
2234	}	2261	}
…		…
2254		2281
2255	col--; /* went one too far. move back */	2282	col--; /* went one too far. move back */
2256	count -= i; /* dump any matching trailing chars */	2283	count -= i; /* dump any matching trailing chars */
2257		2284
2258	// sometimes we optimize away the trailing NOCHAR's, add them back	2285	// sometimes we optimize away the trailing NOCHAR's, add them back
2259	while (i && text[count] == NOCHAR)	2286	while (expect_false (i && text[count] == NOCHAR))
2260	count++, i--;	2287	count++, i--;
2261		2288
2262	/*	2289	/*
2263	* Determine the attributes for the string	2290	* Determine the attributes for the string
2264	*/	2291	*/
2265	int fore = fgcolor_of (rend); // desired foreground	2292	int fore = fgcolor_of (rend); // desired foreground
2266	int back = bgcolor_of (rend); // desired background	2293	int back = bgcolor_of (rend); // desired background
2267		2294
2268	// 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
2269	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2296	if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2270	{	2297	{
2271	bool invert = rend & RS_RVid;	2298	bool invert = rend & RS_RVid;
2272		2299
2273	#ifndef NO_BOLD_UNDERLINE_REVERSE	2300	#ifndef NO_BOLD_UNDERLINE_REVERSE
2274	if (rend & RS_Bold
2275	&& fore == Color_fg)	2301	if (rend & RS_Bold && fore == Color_fg)
2276	{	2302	{
2277	if (ISSET_PIXCOLOR (Color_BD))	2303	if (ISSET_PIXCOLOR (Color_BD))
2278	fore = Color_BD;	2304	fore = Color_BD;
2279	# if !ENABLE_STYLES	2305	# if !ENABLE_STYLES
2280	else	2306	else
2281	invert = !invert;	2307	invert = !invert;
2282	# endif	2308	# endif
2283	}	2309	}
2284		2310
2285	if (rend & RS_Italic	2311	if (rend & RS_Italic && fore == Color_fg)
2286	&& fore == Color_fg)
2287	{	2312	{
2288	if (ISSET_PIXCOLOR (Color_IT))	2313	if (ISSET_PIXCOLOR (Color_IT))
2289	fore = Color_IT;	2314	fore = Color_IT;
2290	# if !ENABLE_STYLES	2315	# if !ENABLE_STYLES
2291	else	2316	else
…		…
2295		2320
2296	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))	2321	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2297	fore = Color_UL;	2322	fore = Color_UL;
2298	#endif	2323	#endif
2299		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
2300	if (invert)	2345	if (invert)
2301	{	2346	{
2302	#ifdef OPTION_HC
2303	if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2304	|| !ISSET_PIXCOLOR (Color_HC))
2305	#endif
2306	/* invert the column if no highlightColor is set or it is the
2307	* current cursor column */
2308	::swap (fore, back);	2347	::swap (fore, back);
2309	#ifdef OPTION_HC
2310	else if (ISSET_PIXCOLOR (Color_HC))
2311	back = Color_HC;
2312	#endif
2313		2348
2314	#ifndef NO_BOLD_UNDERLINE_REVERSE	2349	#ifndef NO_BOLD_UNDERLINE_REVERSE
2315	# ifndef OPTION_HC
2316	if (ISSET_PIXCOLOR (Color_RV))
2317	back = Color_RV;
2318	# endif
2319	if (fore == back)	2350	if (fore == back)
2320	{	2351	{
2321	fore = Color_bg;	2352	fore = Color_bg;
2322	back = Color_fg;	2353	back = Color_fg;
2323	}	2354	}
…		…
2325	}	2356	}
2326		2357
2327	#ifdef TEXT_BLINK	2358	#ifdef TEXT_BLINK
2328	if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))	2359	if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2329	{	2360	{
2330	if (!text_blink_ev.active)	2361	if (!text_blink_ev.is_active ())
2331	{	2362	{
2332	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	2363	text_blink_ev.again ();
2333	hidden_text = 0;	2364	hidden_text = 0;
2334	}	2365	}
2335	else if (hidden_text)	2366	else if (hidden_text)
2336	fore = back;	2367	fore = back;
2337	}	2368	}
…		…
2359	/*	2390	/*
2360	* Actually do the drawing of the string here	2391	* Actually do the drawing of the string here
2361	*/	2392	*/
2362	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2393	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2363		2394
2364	if (have_bg && back == Color_bg)	2395	if (expect_true (have_bg && back == Color_bg))
2365	{	2396	{
2366	// this is very ugly, maybe push it into ->draw?	2397	// this is very ugly, maybe push it into ->draw?
2367		2398
2368	for (i = 0; i < count; i++) /* don't draw empty strings */	2399	for (i = 0; i < count; i++) /* don't draw empty strings */
2369	if (text[i] != ' ')	2400	if (text[i] != ' ')
…		…
2376	did_clear: ;	2407	did_clear: ;
2377	}	2408	}
2378	else	2409	else
2379	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2410	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2380		2411
2381	if (rend & RS_Uline && font->descent > 1 && fore != back)	2412	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2382	{	2413	{
2383	#if ENABLE_FRILLS	2414	#if ENABLE_FRILLS
2384	if (ISSET_PIXCOLOR (Color_underline))	2415	if (ISSET_PIXCOLOR (Color_underline))
2385	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2416	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2386	else	2417	else
2387	#endif	2418	#endif
2388	XSetForeground (dpy, gc, pix_colors[fore]);	2419	XSetForeground (dpy, gc, pix_colors[fore]);
2389		2420
2390	XDrawLine (dpy, drawBuffer, gc,	2421	XDrawLine (dpy, vt, gc,
2391	xpixel, ypixel + font->ascent + 1,	2422	xpixel, ypixel + font->ascent + 1,
2392	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2423	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2393	}	2424	}
2394	} /* for (col....) */	2425	} /* for (col....) */
2395	} /* for (row....) */	2426	} /* for (row....) */
2396
2397	#if ENABLE_OVERLAY
2398	scr_swap_overlay ();
2399	#endif
2400	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2401		2427
2402	/*	2428	/*
2403	* G: cleanup cursor and display outline cursor if necessary	2429	* G: cleanup cursor and display outline cursor if necessary
2404	*/	2430	*/
2405	if (showcursor)	2431	if (showcursor)
…		…
2433	XSetForeground (dpy, gc, pix_colors[Color_cursor]);	2459	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2434	else	2460	else
2435	#endif	2461	#endif
2436	XSetForeground (dpy, gc, pix_colors[ccol1]);	2462	XSetForeground (dpy, gc, pix_colors[ccol1]);
2437		2463
2438	XDrawRectangle (dpy, drawBuffer, gc,	2464	XDrawRectangle (dpy, vt, gc,
2439	Col2Pixel (col),	2465	Col2Pixel (col),
2440	Row2Pixel (oldcursor.row),	2466	Row2Pixel (oldcursor.row),
2441	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2467	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2442	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2468	(unsigned int) (Height2Pixel (1) - lineSpace - 1));
2443	}	2469	}
2444	}	2470	}
2445		2471
2446	/*	2472	/*
2447	* H: cleanup selection	2473	* H: cleanup selection
2448	*/	2474	*/
		2475	#if ENABLE_OVERLAY
		2476	scr_swap_overlay ();
		2477	#endif
		2478	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2479
2449	scr_reverse_selection ();	2480	scr_reverse_selection ();
2450		2481
		2482	screen.flags = old_screen_flags;
2451	num_scr = 0;	2483	num_scr = 0;
2452	num_scr_allow = 1;	2484	num_scr_allow = 1;
2453	}	2485	}
2454		2486
2455	void	2487	void
…		…
2478	}	2510	}
2479		2511
2480	void	2512	void
2481	rxvt_term::scr_recolour () NOTHROW	2513	rxvt_term::scr_recolour () NOTHROW
2482	{	2514	{
2483	if (1
2484	#if ENABLE_TRANSPARENCY
2485	&& !am_transparent
2486	#endif
2487	#ifdef HAVE_BG_PIXMAP	2515	#ifdef HAVE_BG_PIXMAP
2488	&& !bgPixmap.pixmap	2516	bgPixmap.apply ();
2489	#endif	2517	#else
2490	)	2518
2491	{
2492	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2519	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2493	XClearWindow (dpy, parent[0]);	2520	XClearWindow (dpy, parent[0]);
2494	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2521	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2495	#if HAVE_SCROLLBARS	2522
2496	if (scrollBar.win)	2523	if (scrollBar.win)
2497	{	2524	{
2498	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2525	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2499	scrollBar.setIdle ();	2526	scrollBar.state = STATE_IDLE;
2500	scrollbar_show (0);	2527	scrollBar.show (0);
2501	}
2502	#endif
2503	}	2528	}
2504		2529
		2530	#endif
		2531
		2532	/* bgPixmap.apply () does not do the following : */
2505	scr_clear ();	2533	scr_clear ();
2506	scr_touch (true);	2534	scr_touch (true);
2507	want_refresh = 1;	2535	want_refresh = 1;
2508	}	2536	}
2509		2537
…		…
2579	{	2607	{
2580	#if !ENABLE_MINIMAL	2608	#if !ENABLE_MINIMAL
2581	if (selection.rect)	2609	if (selection.rect)
2582	scr_xor_rect (selection.beg.row, selection.beg.col,	2610	scr_xor_rect (selection.beg.row, selection.beg.col,
2583	selection.end.row, selection.end.col,	2611	selection.end.row, selection.end.col,
2584	RS_RVid, RS_RVid | RS_Uline);	2612	RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2585	else	2613	else
2586	#endif	2614	#endif
2587	scr_xor_span (selection.beg.row, selection.beg.col,	2615	scr_xor_span (selection.beg.row, selection.beg.col,
2588	selection.end.row, selection.end.col,	2616	selection.end.row, selection.end.col,
2589	RS_RVid);	2617	RS_Sel | RS_RVid);
2590	}	2618	}
2591	}	2619	}
2592		2620
2593	/* ------------------------------------------------------------------------- */	2621	/* ------------------------------------------------------------------------- */
2594	/*	2622	/*
…		…
2599	void	2627	void
2600	rxvt_term::scr_dump (int fd) NOTHROW	2628	rxvt_term::scr_dump (int fd) NOTHROW
2601	{	2629	{
2602	int row, wrote;	2630	int row, wrote;
2603	unsigned int width, towrite;	2631	unsigned int width, towrite;
2604	char r1[] = "\n";	2632	const char r1[] = "\n";
2605		2633
2606	for (row = saveLines - nsaved;	2634	for (row = saveLines + top_row;
2607	row < saveLines + nrow - 1; row++)	2635	row < saveLines + nrow - 1; row++)
2608	{	2636	{
2609	width = row_buf[row].l >= 0 ? row_buf[row].l	2637	width = row_buf[row].l >= 0 ? row_buf[row].l
2610	: ncol;	2638	: ncol;
2611	for (towrite = width; towrite; towrite -= wrote)	2639	for (towrite = width; towrite; towrite -= wrote)
…		…
2655	/* ------------------------------------------------------------------------- */	2683	/* ------------------------------------------------------------------------- */
2656	/*	2684	/*
2657	* Paste a selection direct to the command fd	2685	* Paste a selection direct to the command fd
2658	*/	2686	*/
2659	void	2687	void
2660	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2688	rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2661	{	2689	{
2662	/* convert normal newline chars into common keyboard Return key sequence */	2690	/* convert normal newline chars into common keyboard Return key sequence */
2663	for (unsigned int i = 0; i < len; i++)	2691	for (unsigned int i = 0; i < len; i++)
2664	if (data[i] == C0_LF)	2692	if (data[i] == C0_LF)
2665	data[i] = C0_CR;	2693	data[i] = C0_CR;
2666		2694
		2695	if (priv_modes & PrivMode_BracketPaste)
		2696	tt_printf ("\e[200~");
		2697
2667	tt_write (data, len);	2698	tt_write (data, len);
		2699
		2700	if (priv_modes & PrivMode_BracketPaste)
		2701	tt_printf ("\e[201~");
		2702	}
		2703
		2704	void
		2705	rxvt_term::paste (char *data, unsigned int len) NOTHROW
		2706	{
		2707	if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
		2708	return;
		2709
		2710	tt_paste (data, len);
2668	}	2711	}
2669		2712
2670	/* ------------------------------------------------------------------------- */	2713	/* ------------------------------------------------------------------------- */
2671	/*	2714	/*
2672	* Respond to a notification that a primary selection has been sent	2715	* Respond to a notification that a primary selection has been sent
…		…
2729	&ct2.nitems, &bytes_after,	2772	&ct2.nitems, &bytes_after,
2730	&ct2.value) != Success)	2773	&ct2.value) != Success)
2731	goto bailout;	2774	goto bailout;
2732		2775
2733	// realloc should be compatible to XFree, here, and elsewhere, too	2776	// realloc should be compatible to XFree, here, and elsewhere, too
2734	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);	2777	ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2735	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);	2778	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2736	ct.nitems += ct2.nitems;	2779	ct.nitems += ct2.nitems;
2737		2780
2738	XFree (ct2.value);	2781	XFree (ct2.value);
2739	}	2782	}
…		…
2747	if (!delete_prop)	2790	if (!delete_prop)
2748	XDeleteProperty (dpy, win, prop);	2791	XDeleteProperty (dpy, win, prop);
2749		2792
2750	selection_wait = Sel_incr;	2793	selection_wait = Sel_incr;
2751	incr_buf_fill = 0;	2794	incr_buf_fill = 0;
2752	incr_ev.start (NOW + 10);	2795	incr_ev.start (10);
2753		2796
2754	goto bailout;	2797	goto bailout;
2755	}	2798	}
2756		2799
2757	if (ct.nitems == 0)	2800	if (ct.nitems == 0)
…		…
2766	ct.nitems = incr_buf_fill;	2809	ct.nitems = incr_buf_fill;
2767	incr_buf = 0;	2810	incr_buf = 0;
2768	incr_buf_size = 0;	2811	incr_buf_size = 0;
2769	incr_ev.stop ();	2812	incr_ev.stop ();
2770	}	2813	}
2771	else	2814	else
2772	{	2815	{
2773	if (selection_wait == Sel_normal	2816	if (selection_wait == Sel_normal
2774	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion	2817	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2775	{	2818	{
2776	/*	2819	/*
…		…
2783	goto bailout;	2826	goto bailout;
2784	}	2827	}
2785	}	2828	}
2786	else if (selection_wait == Sel_incr)	2829	else if (selection_wait == Sel_incr)
2787	{	2830	{
2788	incr_ev.start (NOW + 10);	2831	incr_ev.start (10);
2789		2832
2790	while (incr_buf_fill + ct.nitems > incr_buf_size)	2833	while (incr_buf_fill + ct.nitems > incr_buf_size)
2791	{	2834	{
2792	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;	2835	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2793	incr_buf = (char *)realloc (incr_buf, incr_buf_size);	2836	incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2794	}	2837	}
2795		2838
2796	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);	2839	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2797	incr_buf_fill += ct.nitems;	2840	incr_buf_fill += ct.nitems;
2798		2841
…		…
2833	if (selection_wait == Sel_normal)	2876	if (selection_wait == Sel_normal)
2834	selection_wait = Sel_none;	2877	selection_wait = Sel_none;
2835	}	2878	}
2836		2879
2837	void	2880	void
2838	rxvt_term::incr_cb (time_watcher &w) NOTHROW	2881	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2839	{	2882	{
2840	selection_wait = Sel_none;	2883	selection_wait = Sel_none;
2841		2884
2842	incr_buf_size = 0;	2885	incr_buf_size = 0;
2843	free (incr_buf);	2886	free (incr_buf);
…		…
2854	selection_paste (win, prop, true);	2897	selection_paste (win, prop, true);
2855	}	2898	}
2856		2899
2857	/* ------------------------------------------------------------------------- */	2900	/* ------------------------------------------------------------------------- */
2858	/*	2901	/*
2859	* Request the current selection:	2902	* Request the current selection:
2860	* Order: > internal selection if available	2903	* Order: > internal selection if available
2861	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)	2904	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2862	* > CUT_BUFFER0	2905	* > CUT_BUFFER0
2863	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()	2906	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2864	* will auto fallback to CUT_BUFFER0	2907	* will auto fallback to CUT_BUFFER0
…		…
2866	*/	2909	*/
2867	void	2910	void
2868	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2911	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2869	{	2912	{
2870	if (selection.text && selnum == Sel_Primary)	2913	if (selection.text && selnum == Sel_Primary)
		2914	{
2871	{ /* internal selection */	2915	/* internal selection */
2872	char *str = rxvt_wcstombs (selection.text, selection.len);	2916	char *str = rxvt_wcstombs (selection.text, selection.len);
2873	paste (str, strlen (str));	2917	paste (str, strlen (str));
2874	free (str);	2918	free (str);
2875	return;	2919	return;
2876	}	2920	}
…		…
2880	selection_wait = Sel_normal;	2924	selection_wait = Sel_normal;
2881		2925
2882	#if X_HAVE_UTF8_STRING	2926	#if X_HAVE_UTF8_STRING
2883	selection_type = Sel_UTF8String;	2927	selection_type = Sel_UTF8String;
2884	if (selection_request_other (xa[XA_UTF8_STRING], selnum))	2928	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2885	return;	2929	return;
2886	#else	2930	#else
2887	selection_type = Sel_CompoundText;	2931	selection_type = Sel_CompoundText;
2888	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))	2932	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2889	return;	2933	return;
2890	#endif	2934	#endif
2891	}	2935	}
2892		2936
2893	selection_wait = Sel_none; /* don't loop in selection_paste () */	2937	selection_wait = Sel_none; /* don't loop in selection_paste () */
2894	selection_paste (display->root, XA_CUT_BUFFER0, false);	2938	selection_paste (display->root, XA_CUT_BUFFER0, false);
…		…
2922	/*	2966	/*
2923	* Clear all selected text	2967	* Clear all selected text
2924	* EXT: SelectionClear	2968	* EXT: SelectionClear
2925	*/	2969	*/
2926	void	2970	void
2927	rxvt_term::selection_clear () NOTHROW	2971	rxvt_term::selection_clear (bool clipboard) NOTHROW
2928	{	2972	{
		2973	if (!clipboard)
		2974	{
2929	want_refresh = 1;	2975	want_refresh = 1;
2930	free (selection.text);	2976	free (selection.text);
2931	selection.text = NULL;	2977	selection.text = NULL;
2932	selection.len = 0;	2978	selection.len = 0;
2933	CLEAR_SELECTION ();	2979	CLEAR_SELECTION ();
2934		2980
2935	if (display->selection_owner == this)	2981	if (display->selection_owner == this)
2936	display->selection_owner = 0;	2982	display->selection_owner = 0;
		2983	}
		2984	else
		2985	{
		2986	free (selection.clip_text);
		2987	selection.clip_text = NULL;
		2988	selection.clip_len = 0;
		2989
		2990	if (display->clipboard_owner == this)
		2991	display->clipboard_owner = 0;
		2992	}
2937	}	2993	}
2938		2994
2939	/* ------------------------------------------------------------------------- */	2995	/* ------------------------------------------------------------------------- */
2940	/*	2996	/*
2941	* Copy a selection into the cut buffer	2997	* Copy a selection into the cut buffer
2942	* EXT: button 1 or 3 release	2998	* EXT: button 1 or 3 release
2943	*/	2999	*/
2944	void	3000	void
2945	rxvt_term::selection_make (Time tm)	3001	rxvt_term::selection_make (Time tm)
2946	{	3002	{
2947	int i;	3003	int size;
2948	wchar_t *new_selection_text;	3004	wchar_t *new_selection_text;
2949	text_t *t;	3005	text_t *t;
2950		3006
2951	switch (selection.op)	3007	switch (selection.op)
2952	{	3008	{
…		…
2968	return; /* nothing selected, go away */	3024	return; /* nothing selected, go away */
2969		3025
2970	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	3026	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2971	return;	3027	return;
2972		3028
2973	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	3029	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2974	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	3030	new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2975		3031
2976	int ofs = 0;	3032	int ofs = 0;
2977	int extra = 0;	3033	int extra = 0;
2978		3034
2979	int col = selection.beg.col;	3035	int col = selection.beg.col;
…		…
2985	{	3041	{
2986	#if !ENABLE_MINIMAL	3042	#if !ENABLE_MINIMAL
2987	if (selection.rect)	3043	if (selection.rect)
2988	{	3044	{
2989	col = selection.beg.col;	3045	col = selection.beg.col;
2990	end_col = ncol + 1;	3046	end_col = selection.end.col;
2991	}	3047	}
2992	else	3048	else
2993	#endif	3049	#endif
2994	end_col = ROW(row).l;	3050	end_col = ROW(row).l;
2995		3051
2996	col = max (col, 0);	3052	col = max (col, 0);
2997		3053
2998	if (row == selection.end.row	3054	if (row == selection.end.row)
2999	#if !ENABLE_MINIMAL
3000	|| selection.rect
3001	#endif
3002	)
3003	min_it (end_col, selection.end.col);	3055	min_it (end_col, selection.end.col);
3004		3056
3005	t = ROW(row).t + col;	3057	t = ROW(row).t + col;
3006		3058
3007	for (; col < end_col; col++)	3059	for (; col < end_col; col++)
…		…
3015		3067
3016	extra -= (len - 1);	3068	extra -= (len - 1);
3017		3069
3018	if (extra < 0)	3070	if (extra < 0)
3019	{	3071	{
3020	extra += i;	3072	extra += size;
3021	i += i;	3073	size += size;
3022	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));	3074	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3023	}	3075	}
3024		3076
3025	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	3077	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3026	}	3078	}
3027	#endif	3079	#endif
…		…
3039		3091
3040	new_selection_text[ofs++] = C0_LF;	3092	new_selection_text[ofs++] = C0_LF;
3041	}	3093	}
3042	else	3094	else
3043	#endif	3095	#endif
3044	if (!ROW(row).is_longer () && row != selection.end.row)	3096	if (!ROW(row).is_longer ()
		3097	&& (row != selection.end.row || end_col != selection.end.col)
		3098	&& (row != selection.beg.row || selection.beg.col < ncol))
3045	new_selection_text[ofs++] = C0_LF;	3099	new_selection_text[ofs++] = C0_LF;
3046	}	3100	}
3047
3048	if (end_col != selection.end.col)
3049	new_selection_text[ofs++] = C0_LF;
3050		3101
3051	new_selection_text[ofs] = 0;	3102	new_selection_text[ofs] = 0;
3052		3103
3053	if (ofs == 0)	3104	if (ofs == 0)
3054	{	3105	{
…		…
3067		3118
3068	selection_grab (tm);	3119	selection_grab (tm);
3069	}	3120	}
3070		3121
3071	bool	3122	bool
3072	rxvt_term::selection_grab (Time tm) NOTHROW	3123	rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3073	{	3124	{
		3125	Atom sel;
		3126
		3127	if (!clipboard)
		3128	{
3074	selection_time = tm;	3129	selection_time = tm;
		3130	sel = XA_PRIMARY;
		3131	}
		3132	else
		3133	{
		3134	clipboard_time = tm;
		3135	sel = xa[XA_CLIPBOARD];
		3136	}
3075		3137
3076	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);	3138	XSetSelectionOwner (dpy, sel, vt, tm);
3077	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)	3139	if (XGetSelectionOwner (dpy, sel) == vt)
3078	{	3140	{
3079	display->set_selection_owner (this);	3141	display->set_selection_owner (this, clipboard);
3080	return true;	3142	return true;
3081	}	3143	}
3082	else	3144	else
3083	{	3145	{
3084	selection_clear ();	3146	selection_clear (clipboard);
3085	return false;	3147	return false;
3086	}	3148	}
3087		3149
3088	#if 0	3150	#if 0
3089	XTextProperty ct;	3151	XTextProperty ct;
…		…
3142	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);	3204	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3143		3205
3144	while (selection.mark.col > 0	3206	while (selection.mark.col > 0
3145	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)	3207	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3146	--selection.mark.col;	3208	--selection.mark.col;
3147		3209
3148	if (selection.op)	3210	if (selection.op)
		3211	{
3149	{ /* clear the old selection */	3212	/* clear the old selection */
3150	selection.beg.row = selection.end.row = selection.mark.row;	3213	selection.beg.row = selection.end.row = selection.mark.row;
3151	selection.beg.col = selection.end.col = selection.mark.col;	3214	selection.beg.col = selection.end.col = selection.mark.col;
3152	}	3215	}
3153		3216
3154	selection.op = SELECTION_INIT;	3217	selection.op = SELECTION_INIT;
…		…
3343	* a point/word/line which is either the start or end of the selection	3406	* a point/word/line which is either the start or end of the selection
3344	* and it was decided by whichever point/word/line was `fixed' at the	3407	* and it was decided by whichever point/word/line was `fixed' at the
3345	* time of the most recent button3 press	3408	* time of the most recent button3 press
3346	*/	3409	*/
3347	if (button3 && buttonpress)	3410	if (button3 && buttonpress)
		3411	{
3348	{ /* button3 press */	3412	/* button3 press */
3349	/*	3413	/*
3350	* first determine which edge of the selection we are closest to	3414	* first determine which edge of the selection we are closest to
3351	*/	3415	*/
3352	if (ROWCOL_IS_BEFORE (pos, selection.beg)	3416	if (ROWCOL_IS_BEFORE (pos, selection.beg)
3353	|| (!ROWCOL_IS_AFTER (pos, selection.end)	3417	|| (!ROWCOL_IS_AFTER (pos, selection.end)
…		…
3371	selection.mark.row = selection.beg.row;	3435	selection.mark.row = selection.beg.row;
3372	selection.mark.col = selection.beg.col;	3436	selection.mark.col = selection.beg.col;
3373	}	3437	}
3374	}	3438	}
3375	else	3439	else
		3440	{
3376	{ /* button1 drag or button3 drag */	3441	/* button1 drag or button3 drag */
3377	if (ROWCOL_IS_AFTER (selection.mark, pos))	3442	if (ROWCOL_IS_AFTER (selection.mark, pos))
3378	{	3443	{
3379	if (selection.mark.row == selection.end.row	3444	if (selection.mark.row == selection.end.row
3380	&& selection.mark.col == selection.end.col	3445	&& selection.mark.col == selection.end.col
3381	&& clickchange	3446	&& clickchange
…		…
3462	selection.end.row++;	3527	selection.end.row++;
3463	}	3528	}
3464	}	3529	}
3465		3530
3466	if (button3 && buttonpress)	3531	if (button3 && buttonpress)
		3532	{
3467	{ /* mark may need to be changed */	3533	/* mark may need to be changed */
3468	if (closeto == LEFT)	3534	if (closeto == LEFT)
3469	{	3535	{
3470	selection.mark.row = selection.end.row;	3536	selection.mark.row = selection.end.row;
3471	selection.mark.col = selection.end.col - (selection.clicks == 2);	3537	selection.mark.col = selection.end.col - (selection.clicks == 2);
3472	}	3538	}
…		…
3580	else if (rq.target == xa[XA_MULTIPLE])	3646	else if (rq.target == xa[XA_MULTIPLE])
3581	{	3647	{
3582	/* TODO: Handle MULTIPLE */	3648	/* TODO: Handle MULTIPLE */
3583	}	3649	}
3584	#endif	3650	#endif
3585	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3651	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3586	{	3652	{
3587	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3653	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3588	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3654	32, PropModeReplace, (unsigned char *)&selection_time, 1);
		3655	ev.property = rq.property;
		3656	}
		3657	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3658	{
		3659	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
		3660	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3589	ev.property = rq.property;	3661	ev.property = rq.property;
3590	}	3662	}
3591	else if (rq.target == XA_STRING	3663	else if (rq.target == XA_STRING
3592	|| rq.target == xa[XA_TEXT]	3664	|| rq.target == xa[XA_TEXT]
3593	|| rq.target == xa[XA_COMPOUND_TEXT]	3665	|| rq.target == xa[XA_COMPOUND_TEXT]
…		…
3626	{	3698	{
3627	target = xa[XA_COMPOUND_TEXT];	3699	target = xa[XA_COMPOUND_TEXT];
3628	style = enc_compound_text;	3700	style = enc_compound_text;
3629	}	3701	}
3630		3702
3631	if (selection.text)	3703	if (rq.selection == XA_PRIMARY && selection.text)
3632	{	3704	{
3633	cl = selection.text;	3705	cl = selection.text;
3634	selectlen = selection.len;	3706	selectlen = selection.len;
		3707	}
		3708	else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3709	{
		3710	cl = selection.clip_text;
		3711	selectlen = selection.clip_len;
3635	}	3712	}
3636	else	3713	else
3637	{	3714	{
3638	cl = L"";	3715	cl = L"";
3639	selectlen = 0;	3716	selectlen = 0;
…		…
3671	XFree (ct.value);	3748	XFree (ct.value);
3672	}	3749	}
3673		3750
3674	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);	3751	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3675	}	3752	}
3676
3677	/* ------------------------------------------------------------------------- *
3678	* MOUSE ROUTINES *
3679	* ------------------------------------------------------------------------- */
3680
3681	/*
3682	* return col/row values corresponding to x/y pixel values
3683	*/
3684	void
3685	rxvt_term::pixel_position (int *x, int *y) NOTHROW
3686	{
3687	*x = Pixel2Col (*x);
3688	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3689	*y = Pixel2Row (*y);
3690	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3691	}
3692		3753
3693	/* ------------------------------------------------------------------------- */	3754	/* ------------------------------------------------------------------------- */
3694	#ifdef USE_XIM	3755	#ifdef USE_XIM
3695	void	3756	void
3696	rxvt_term::im_set_position (XPoint &pos) NOTHROW	3757	rxvt_term::im_set_position (XPoint &pos) NOTHROW
…		…
3723	h += 2; min_it (h, nrow);	3784	h += 2; min_it (h, nrow);
3724		3785
3725	x -= 1; clamp_it (x, 0, ncol - w);	3786	x -= 1; clamp_it (x, 0, ncol - w);
3726	y -= 1; clamp_it (y, 0, nrow - h);	3787	y -= 1; clamp_it (y, 0, nrow - h);
3727		3788
3728	ov_x = x; ov_y = y;	3789	ov.x = x; ov.y = y;
3729	ov_w = w; ov_h = h;	3790	ov.w = w; ov.h = h;
3730		3791
3731	ov_text = new text_t *[h];	3792	ov.text = new text_t *[h];
3732	ov_rend = new rend_t *[h];	3793	ov.rend = new rend_t *[h];
3733		3794
3734	for (y = 0; y < h; y++)	3795	for (y = 0; y < h; y++)
3735	{	3796	{
3736	text_t *tp = ov_text[y] = new text_t[w];	3797	text_t *tp = ov.text[y] = new text_t[w];
3737	rend_t *rp = ov_rend[y] = new rend_t[w];	3798	rend_t *rp = ov.rend[y] = new rend_t[w];
3738		3799
3739	text_t t0, t1, t2;	3800	text_t t0, t1, t2;
3740	rend_t r = OVERLAY_RSTYLE;	3801	rend_t r = OVERLAY_RSTYLE;
3741		3802
3742	if (y == 0)	3803	if (y == 0)
…		…
3761	}	3822	}
3762		3823
3763	void	3824	void
3764	rxvt_term::scr_overlay_off () NOTHROW	3825	rxvt_term::scr_overlay_off () NOTHROW
3765	{	3826	{
3766	if (!ov_text)	3827	if (!ov.text)
3767	return;	3828	return;
3768		3829
3769	want_refresh = 1;	3830	want_refresh = 1;
3770		3831
3771	for (int y = 0; y < ov_h; y++)	3832	for (int y = 0; y < ov.h; y++)
3772	{	3833	{
3773	delete [] ov_text[y];	3834	delete [] ov.text[y];
3774	delete [] ov_rend[y];	3835	delete [] ov.rend[y];
3775	}	3836	}
3776		3837
3777	delete [] ov_text; ov_text = 0;	3838	delete [] ov.text; ov.text = 0;
3778	delete [] ov_rend; ov_rend = 0;	3839	delete [] ov.rend; ov.rend = 0;
3779	}	3840	}
3780		3841
3781	void	3842	void
3782	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW	3843	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3783	{	3844	{
3784	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3845	if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3785	return;	3846	return;
3786		3847
3787	x++, y++;	3848	x++, y++;
3788		3849
3789	ov_text[y][x] = text;	3850	ov.text[y][x] = text;
3790	ov_rend[y][x] = rend;	3851	ov.rend[y][x] = rend;
3791	}	3852	}
3792		3853
3793	void	3854	void
3794	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW	3855	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3795	{	3856	{
…		…
3814	}	3875	}
3815		3876
3816	void	3877	void
3817	rxvt_term::scr_swap_overlay () NOTHROW	3878	rxvt_term::scr_swap_overlay () NOTHROW
3818	{	3879	{
3819	if (!ov_text)	3880	if (!ov.text)
3820	return;	3881	return;
3821		3882
		3883	// hide cursor if it is within the overlay area
		3884	if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
		3885	&& IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
		3886	screen.flags &= ~Screen_VisibleCursor;
		3887
3822	// swap screen mem with overlay	3888	// swap screen mem with overlay
3823	for (int y = ov_h; y--; )	3889	for (int y = ov.h; y--; )
3824	{	3890	{
3825	text_t *t1 = ov_text[y];	3891	text_t *t1 = ov.text[y];
3826	rend_t *r1 = ov_rend[y];	3892	rend_t *r1 = ov.rend[y];
3827		3893
3828	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;	3894	text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3829	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;	3895	rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3830		3896
3831	for (int x = ov_w; x--; )	3897	for (int x = ov.w; x--; )
3832	{	3898	{
3833	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3899	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3834	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3900	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3835	}	3901	}
3836	}	3902	}

Diff Legend

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