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.166 by root, Sun Jun 26 20:06:52 2005 UTC vs.
Revision 1.174 by root, Mon Dec 19 02:40:14 2005 UTC

…		…
47	/* ------------------------------------------------------------------------- *	47	/* ------------------------------------------------------------------------- *
48	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *	48	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49	* ------------------------------------------------------------------------- */	49	* ------------------------------------------------------------------------- */
50	#define ZERO_SCROLLBACK() \	50	#define ZERO_SCROLLBACK() \
51	if (options & Opt_scrollTtyOutput) \	51	if (options & Opt_scrollTtyOutput) \
52	TermWin.view_start = 0	52	view_start = 0
53	#define CLEAR_SELECTION() \	53	#define CLEAR_SELECTION() \
54	selection.beg.row = selection.beg.col \	54	selection.beg.row = selection.beg.col \
55	= selection.end.row = selection.end.col = 0	55	= selection.end.row = selection.end.col = 0
56	#define CLEAR_ALL_SELECTION() \	56	#define CLEAR_ALL_SELECTION() \
57	selection.beg.row = selection.beg.col \	57	selection.beg.row = selection.beg.col \
…		…
88	/*	88	/*
89	* CLEAR_ROWS : clear <num> rows starting from row <row>	89	* CLEAR_ROWS : clear <num> rows starting from row <row>
90	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>	90	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91	* ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour	91	* ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92	*/	92	*/
93	#define drawBuffer TermWin.vt	93	#define drawBuffer vt
94		94
95	#define CLEAR_ROWS(row, num) \	95	#define CLEAR_ROWS(row, num) \
96	if (TermWin.mapped) \	96	if (mapped) \
97	XClearArea (display->display, drawBuffer, 0, \	97	XClearArea (display->display, drawBuffer, 0, \
98	Row2Pixel (row), (unsigned int)TermWin.width, \	98	Row2Pixel (row), (unsigned int)width, \
99	(unsigned int)Height2Pixel (num), False)	99	(unsigned int)Height2Pixel (num), False)
100		100
101	#define CLEAR_CHARS(x, y, num) \	101	#define CLEAR_CHARS(x, y, num) \
102	if (TermWin.mapped) \	102	if (mapped) \
103	XClearArea (display->display, drawBuffer, x, y, \	103	XClearArea (display->display, drawBuffer, x, y, \
104	(unsigned int)Width2Pixel (num), \	104	(unsigned int)Width2Pixel (num), \
105	(unsigned int)Height2Pixel (1), False)	105	(unsigned int)Height2Pixel (1), False)
106		106
107	#define ERASE_ROWS(row, num) \	107	#define ERASE_ROWS(row, num) \
108	XFillRectangle (display->display, drawBuffer, TermWin.gc, \	108	XFillRectangle (display->display, drawBuffer, gc, \
109	0, Row2Pixel (row), \	109	0, Row2Pixel (row), \
110	(unsigned int)TermWin.width, \	110	(unsigned int)width, \
111	(unsigned int)Height2Pixel (num))	111	(unsigned int)Height2Pixel (num))
112		112
113	/* ------------------------------------------------------------------------- *	113	/* ------------------------------------------------------------------------- *
114	* SCREEN `COMMON' ROUTINES *	114	* SCREEN `COMMON' ROUTINES *
115	* ------------------------------------------------------------------------- */	115	* ------------------------------------------------------------------------- */
116		116
117	/* Fill part/all of a line with blanks. */	117	/* Fill part/all of a line with blanks. */
118	void	118	void
119	rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)	119	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
120	{	120	{
121	efs &= ~RS_baseattrMask;	121	efs &= ~RS_baseattrMask;
122	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));	122	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123		123
		124	text_t *et = l.t + col;
		125	rend_t *er = l.r + col;
		126
124	while (width--)	127	while (width--)
125	{	128	{
126	*et++ = ' ';	129	*et++ = ' ';
127	*er++ = efs;	130	*er++ = efs;
128	}	131	}
129	}	132	}
130		133
131	/* ------------------------------------------------------------------------- */	134	/* ------------------------------------------------------------------------- */
132	/* Fill a full line with blanks - make sure it is allocated first */	135	/* Fill a full line with blanks - make sure it is allocated first */
133	void	136	void
134	rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs)	137	rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
135	{	138	{
136	#ifdef DEBUG_STRICT	139	if (!l.t)
137	assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));	140	lalloc (l);
138	#endif
139	if (tp[row] == NULL)
140	{
141	tp[row] = (text_t *)talloc->alloc ();
142	rp[row] = (rend_t *)ralloc->alloc ();
143	}
144		141
145	scr_blank_line (tp[row], rp[row], TermWin.ncol, efs);	142	scr_blank_line (l, 0, ncol, efs);
146	}	143	}
147		144
148	/* ------------------------------------------------------------------------- *	145	/* ------------------------------------------------------------------------- *
149	* SCREEN INITIALISATION *	146	* SCREEN INITIALISATION *
150	* ------------------------------------------------------------------------- */	147	* ------------------------------------------------------------------------- */
151	void	148	void
152	rxvt_term::scr_reset ()	149	rxvt_term::scr_reset ()
153	{	150	{
154	unsigned int ncol, nrow, total_rows, prev_total_rows;
155	unsigned int p, q;	151	unsigned int p, q;
156	int k;	152	int k;
157	rend_t setrstyle;
158		153
159	#if ENABLE_OVERLAY	154	#if ENABLE_OVERLAY
160	scr_overlay_off ();	155	scr_overlay_off ();
161	#endif	156	#endif
162		157
163	TermWin.view_start = 0;	158	view_start = 0;
164	num_scr = 0;	159	num_scr = 0;
165		160
166	if (TermWin.ncol == 0)	161	if (ncol == 0)
167	TermWin.ncol = 80;	162	ncol = 80;
168		163
169	if (TermWin.nrow == 0)	164	if (nrow == 0)
170	TermWin.nrow = 24;	165	nrow = 24;
171
172	ncol = TermWin.ncol;
173	nrow = TermWin.nrow;
174		166
175	if (ncol == prev_ncol && nrow == prev_nrow)	167	if (ncol == prev_ncol && nrow == prev_nrow)
176	return;	168	return;
177		169
178	// we need at least two lines for wrapping to work correctly	170	// we need at least two lines for wrapping to work correctly
179	if (nrow + TermWin.saveLines < 2)	171	if (nrow + saveLines < 2)
180	{	172	{
181	TermWin.saveLines++;	173	saveLines++;
182	prev_nrow--;	174	prev_nrow--;
183	TermWin.nscrolled++;	175	nscrolled++;
184	}	176	}
185		177
186	want_refresh = 1;	178	want_refresh = 1;
187		179
188	prev_total_rows = prev_nrow + TermWin.saveLines;	180	int prev_total_rows = prev_nrow + saveLines;
189	total_rows = nrow + TermWin.saveLines;	181	int total_rows = nrow + saveLines;
190		182
191	screen.tscroll = 0;	183	screen.tscroll = 0;
192	screen.bscroll = nrow - 1;	184	screen.bscroll = nrow - 1;
193		185
194	if (!talloc)	186	if (!save)
195	{
196	talloc = new rxvt_salloc (ncol * sizeof (text_t));
197	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198	}
199
200	if (!screen.text)
201	{	187	{
202	/*	188	/*
203	* first time called so just malloc everything: don't rely on realloc	189	* first time called so just malloc everything: don't rely on realloc
204	* Note: this is still needed so that all the scrollback lines are NULL	190	* Note: this is still needed so that all the scrollback lines are NULL
205	*/	191	*/
		192	nscrolled = 0; /* no saved lines */
		193	term_start = 0;
		194	nsaved = 0;
		195
		196	talloc = new rxvt_salloc (ncol * sizeof (text_t));
		197	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
		198
		199	save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
		200	buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
		201	drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
		202	swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
		203
206	screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));	204	screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *));
207	buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
208	drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
209	swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
210		205
211	screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));	206	scr_update_term ();
212	swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
213		207
214	screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
215	buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216	drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
217	swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218
219	for (p = 0; p < nrow; p++)	208	for (p = nrow; p--; )
220	{	209	{
221	q = p + TermWin.saveLines;
222	scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);	210	scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE);
223	scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);	211	scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
224	screen.tlen[q] = swap.tlen[p] = 0;
225	scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);	212	scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
226	}	213	}
227		214
228	memset (charsets, 'B', sizeof (charsets));	215	memset (charsets, 'B', sizeof (charsets));
229	TermWin.nscrolled = 0; /* no saved lines */
230	rstyle = DEFAULT_RSTYLE;	216	rstyle = DEFAULT_RSTYLE;
231	screen.flags = Screen_DefaultFlags;	217	screen.flags = Screen_DefaultFlags;
232	screen.cur.row = screen.cur.col = 0;	218	screen.cur.row = screen.cur.col = 0;
233	screen.charset = 0;	219	screen.charset = 0;
234	current_screen = PRIMARY;	220	current_screen = PRIMARY;
…		…
254	else	240	else
255	{	241	{
256	/*	242	/*
257	* add or delete rows as appropriate	243	* add or delete rows as appropriate
258	*/	244	*/
259	setrstyle = DEFAULT_RSTYLE;	245
		246	rxvt_salloc *old_ta;
		247	rxvt_salloc *old_ra;
260		248
261	if (nrow < prev_nrow)	249	if (nrow < prev_nrow)
262	{	250	{
263	/* delete rows */	251	/* delete rows */
264	k = min (TermWin.nscrolled, prev_nrow - nrow);	252	k = min (nscrolled, prev_nrow - nrow);
		253	// k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
265	scr_scroll_text (0, (int)prev_nrow - 1, k, 1);	254	scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
266		255
267	for (p = nrow; p < prev_nrow; p++)	256	for (p = nrow; p < prev_nrow; p++)
268	{	257	{
269	q = p + TermWin.saveLines;	258	lfree (save[p + saveLines]);
270
271	if (screen.text[q])
272	{
273	#ifdef DEBUG_STRICT
274	assert (screen.rend[q]);
275	#endif
276	talloc->free (screen.text[q]);
277	ralloc->free (screen.rend[q]);
278	}
279
280	if (swap.text[p])	259	lfree (swap_save[p]);
281	{
282	#ifdef DEBUG_STRICT
283	assert (swap.rend[p]);
284	#endif
285	talloc->free (swap.text[p]);
286	ralloc->free (swap.rend[p]);
287	}
288
289	#ifdef DEBUG_STRICT
290	assert (drawn_text[p] && drawn_rend[p]);
291	#endif
292	talloc->free (drawn_text[p]);	260	lfree (drawn[p]);
293	ralloc->free (drawn_rend[p]);
294	}	261	}
295		262
296	/* we have fewer rows so fix up cursor position */	263	/* we have fewer rows so fix up cursor position */
297	MIN_IT (screen.cur.row, (int32_t)nrow - 1);	264	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
298		265
…		…
301	else if (nrow > prev_nrow)	268	else if (nrow > prev_nrow)
302	{	269	{
303	/* add rows */	270	/* add rows */
304	scr_reset_realloc (); /* realloc _first_ */	271	scr_reset_realloc (); /* realloc _first_ */
305		272
		273	int ocol = ncol;
306	TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this	274	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
307		275
308	k = min (TermWin.nscrolled, nrow - prev_nrow);	276	k = min (nscrolled, nrow - prev_nrow);
309		277
310	for (p = prev_total_rows; p < total_rows; p++)	278	for (p = prev_total_rows; p < total_rows; p++)
311	{	279	save[p].clear ();
312	screen.tlen[p] = 0;
313	screen.text[p] = NULL;
314	screen.rend[p] = NULL;
315	}
316		280
317	for (p = prev_total_rows; p < total_rows - k; p++)	281	for (p = prev_total_rows; p < total_rows - k; p++)
318	scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle);	282	scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
		283
		284	scr_update_term ();
319		285
320	for (p = prev_nrow; p < nrow; p++)	286	for (p = prev_nrow; p < nrow; p++)
321	{	287	{
322	swap.tlen[p] = 0;	288	swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
323	swap.text[p] = NULL;	289	drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
324	swap.rend[p] = NULL;
325	drawn_text[p] = NULL;
326	drawn_rend[p] = NULL;
327	scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
328	scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
329	}	290	}
330		291
331	if (k > 0)	292	if (k > 0)
332	{	293	{
333	scr_scroll_text (0, (int)nrow - 1, -k, 1);	294	scr_scroll_text (0, (int)nrow - 1, -k, 1);
334	screen.cur.row += k;	295	screen.cur.row += k;
335	screen.s_cur.row += k;	296	screen.s_cur.row += k;
336	TermWin.nscrolled -= k;	297	nscrolled -= k;
337	}	298	}
338		299
339	#ifdef DEBUG_STRICT	300	#ifdef DEBUG_STRICT
340	assert (screen.cur.row < TermWin.nrow);	301	assert (screen.cur.row < nrow);
341	#else /* drive with your eyes closed */	302	#else /* drive with your eyes closed */
342	MIN_IT (screen.cur.row, nrow - 1);	303	MIN_IT (screen.cur.row, nrow - 1);
343	#endif	304	#endif
344	TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this	305	ncol = ocol; // save b/c scr_blank_screen_mem uses this
345	}	306	}
346		307
347	/* resize columns */	308	/* resize columns */
348	if (ncol != prev_ncol)	309	if (ncol != prev_ncol)
349	{	310	{
350	rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));	311	old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
351	rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));	312	old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
352		313
353	for (p = 0; p < total_rows; p++)	314	for (p = total_rows; p--; )
		315	lresize (save[p]);
		316
		317	for (p = nrow; p--; )
354	{	318	{
355	if (screen.text[p])	319	lresize (drawn[p]);
		320	lresize (swap_save[p]);
		321	}
		322
		323	MIN_IT (screen.cur.col, (int16_t)ncol - 1);
		324
		325	delete old_ta;
		326	delete old_ra;
		327	}
		328
		329	#if 0
		330	// re-wrap lines, this is rather ugly, possibly because I am too dumb
		331	// to come up with a lean and mean algorithm.
		332	rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
		333	rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
		334
		335	text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
		336	rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
		337	tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
		338
		339	for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
		340
		341	p = prev_total_rows;
		342	q = total_rows;
		343
		344	while (p > 0 && q > 0)
		345	{
		346	--p;
		347
		348	printf ("pq %d:%d\n", p, q);
		349	if (save[p].t)
		350	{
		351	int llen = save[p].l;
		352
		353	assert (llen >= 0);
		354
		355	while (p && save[p - 1].l < 0)
356	{	356	{
357	screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t));	357	--p;
358	screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
359
360	MIN_IT (screen.tlen[p], (int16_t)ncol);
361
362	if (ncol > prev_ncol)	358	llen += prev_ncol;
363	scr_blank_line (&screen.text[p][prev_ncol],	359	}
364	&screen.rend[p][prev_ncol],	360
365	ncol - prev_ncol, setrstyle);	361	int qlines = llen / ncol + 1;
		362	int lofs = 0;
		363
		364	q -= qlines;
		365
		366	int qrow = q;
		367
		368	printf ("QL %d llen %d\n", qlines, llen);//D
		369	for (; qlines--; qrow++)
		370	{
		371	if (qrow >= 0)
		372	{
		373	tp [qrow] = (text_t *)ta->alloc ();
		374	rp [qrow] = (rend_t *)ra->alloc ();
		375	tl [qrow] = LINE_CONT1;
		376
		377	int qcol = 0;
		378
		379	for (;;)
		380	{
		381	int prow = lofs / prev_ncol + p;
		382	int pcol = lofs % prev_ncol;
		383
		384	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
		385
		386	printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
		387
		388	if (len <= 0)
		389	{
		390	tl [qrow] = qcol;
		391
		392	TODO
		393	scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
		394	ncol - qcol, DEFAULT_RSTYLE);
		395
		396	break;
		397	}
		398
		399	assert (lofs < 1000);
		400
		401	memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t));
		402	memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t));
		403
		404	lofs += len;
		405	qcol += len;
		406
		407	if (qcol == ncol)
		408	break;
		409	}
		410	}
		411	else
		412	lofs += ncol;
366	}	413	}
367	}	414	}
368
369	for (p = 0; p < nrow; p++)
370	{
371	drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
372	drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
373
374	if (ncol > prev_ncol)
375	scr_blank_line (&drawn_text[p][prev_ncol],
376	&drawn_rend[p][prev_ncol],
377	ncol - prev_ncol, setrstyle);
378
379	if (swap.text[p])
380	{
381	swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
382	swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
383
384	MIN_IT (swap.tlen[p], (int16_t)ncol);
385
386	if (ncol > prev_ncol)
387	scr_blank_line (&swap.text[p][prev_ncol],
388	&swap.rend[p][prev_ncol],
389	ncol - prev_ncol, setrstyle);
390	}
391
392	}	415	}
393		416
394	MIN_IT (screen.cur.col, (int16_t)ncol - 1);	417	free (screen.text); screen.text = tp;
		418	free (screen.rend); screen.rend = rp;
		419	free (screen.tlen); screen.tlen = tl;
395		420
396	delete talloc; talloc = ta;	421	for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
397	delete ralloc; ralloc = ra;	422	#endif
398	}
399		423
400	if (tabs)	424	if (tabs)
401	free (tabs);	425	free (tabs);
402	}	426	}
403		427
…		…
413	}	437	}
414		438
415	void	439	void
416	rxvt_term::scr_reset_realloc ()	440	rxvt_term::scr_reset_realloc ()
417	{	441	{
418	unsigned int total_rows, nrow;	442	unsigned int total_rows = nrow + saveLines;
419		443
420	nrow = TermWin.nrow;
421	total_rows = nrow + TermWin.saveLines;
422	/* *INDENT-OFF* */
423	screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));	444	screen.line = (line_t **)rxvt_realloc (screen.line, nrow * sizeof (line_t *));
424	buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
425	drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
426	swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *));	445	swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
427		446	drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
428	screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t));	447	save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
429	swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t));	448	buf = (line_t *) rxvt_realloc (buf , total_rows * sizeof (line_t));
430
431	screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
432	buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
433	drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
434	swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
435	/* *INDENT-ON* */
436	}	449	}
437		450
438	/* ------------------------------------------------------------------------- */	451	/* ------------------------------------------------------------------------- */
439	/*	452	/*
440	* Free everything. That way malloc debugging can find leakage.	453	* Free everything. That way malloc debugging can find leakage.
441	*/	454	*/
442	void	455	void
443	rxvt_term::scr_release ()	456	rxvt_term::scr_release ()
444	{	457	{
445	unsigned int total_rows;	458	unsigned int total_rows;
446	int i;
447		459
448	total_rows = TermWin.nrow + TermWin.saveLines;	460	total_rows = nrow + saveLines;
449		461
450	delete talloc; talloc = 0;	462	delete talloc; talloc = 0;
451	delete ralloc; ralloc = 0;	463	delete ralloc; ralloc = 0;
452		464
453	free (screen.text);
454	free (screen.tlen);	465	free (screen.line);
455	free (screen.rend);	466	free (save);
		467	free (swap_save);
456	free (drawn_text);	468	free (drawn);
457	free (drawn_rend);
458	free (swap.text);
459	free (swap.tlen);
460	free (swap.rend);
461	free (buf_text);	469	free (buf);
462	free (buf_rend);
463	free (tabs);	470	free (tabs);
464
465	/* NULL these so if anything tries to use them, we'll know about it */
466	screen.text = drawn_text = swap.text = NULL;
467	screen.rend = drawn_rend = swap.rend = NULL;
468	screen.tlen = swap.tlen = NULL;
469	buf_text = NULL;
470	buf_rend = NULL;
471	tabs = NULL;
472	}	471	}
473		472
474	/* ------------------------------------------------------------------------- */	473	/* ------------------------------------------------------------------------- */
475	/*	474	/*
476	* Hard reset	475	* Hard reset
…		…
527	set_font_style ();	526	set_font_style ();
528	break;	527	break;
529	}	528	}
530		529
531	/* boundary check in case screen size changed between SAVE and RESTORE */	530	/* boundary check in case screen size changed between SAVE and RESTORE */
532	MIN_IT (s->cur.row, TermWin.nrow - 1);	531	MIN_IT (s->cur.row, nrow - 1);
533	MIN_IT (s->cur.col, TermWin.ncol - 1);	532	MIN_IT (s->cur.col, ncol - 1);
534	#ifdef DEBUG_STRICT	533	#ifdef DEBUG_STRICT
535	assert (s->cur.row >= 0);	534	assert (s->cur.row >= 0);
536	assert (s->cur.col >= 0);	535	assert (s->cur.col >= 0);
537	#else /* drive with your eyes closed */	536	#else /* drive with your eyes closed */
538	MAX_IT (s->cur.row, 0);	537	MAX_IT (s->cur.row, 0);
…		…
554	int offset;	553	int offset;
555	#endif	554	#endif
556		555
557	want_refresh = 1;	556	want_refresh = 1;
558		557
559	TermWin.view_start = 0;	558	view_start = 0;
560		559
561	if (current_screen == scrn)	560	if (current_screen == scrn)
562	return scrn;	561	return scrn;
563		562
564	selection_check (2); /* check for boundary cross */	563	selection_check (2); /* check for boundary cross */
…		…
574		573
575	#if NSCREENS	574	#if NSCREENS
576	if (options & Opt_secondaryScreen)	575	if (options & Opt_secondaryScreen)
577	{	576	{
578	num_scr = 0;	577	num_scr = 0;
579	offset = TermWin.saveLines;	578	offset = saveLines;
580		579
581	for (i = prev_nrow; i--;)	580	for (i = prev_nrow; i--;)
582	{
583	SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
584	SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);	581	SWAP_IT (*(screen.line[i]), swap_save[i], line_t);
585	SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
586	}
587		582
588	SWAP_IT (screen.charset, swap.charset, int16_t);	583	SWAP_IT (screen.charset, swap.charset, int16_t);
589	SWAP_IT (screen.flags, swap.flags, int);	584	SWAP_IT (screen.flags, swap.flags, int);
590	screen.flags |= Screen_VisibleCursor;	585	screen.flags |= Screen_VisibleCursor;
591	swap.flags |= Screen_VisibleCursor;	586	swap.flags |= Screen_VisibleCursor;
…		…
609		604
610	screen.cur.col = 0;	605	screen.cur.col = 0;
611		606
612	if (screen.cur.row == screen.bscroll)	607	if (screen.cur.row == screen.bscroll)
613	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);	608	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
614	else if (screen.cur.row < TermWin.nrow - 1)	609	else if (screen.cur.row < nrow - 1)
615	screen.cur.row++;	610	screen.cur.row++;
616	}	611	}
617		612
618	/* ------------------------------------------------------------------------- */	613	/* ------------------------------------------------------------------------- */
619	/*	614	/*
…		…
644	rstyle = DEFAULT_RSTYLE;	639	rstyle = DEFAULT_RSTYLE;
645	else	640	else
646	rstyle &= ~style;	641	rstyle &= ~style;
647	}	642	}
648		643
		644	// set screen.line pointers to the actual lines in the save buffer
		645	void
		646	rxvt_term::scr_update_term ()
		647	{
		648	for (int i = nrow; i--; )
		649	screen.line[i] = save + saveLines + i;
		650	}
		651
649	/* ------------------------------------------------------------------------- */	652	/* ------------------------------------------------------------------------- */
650	/*	653	/*
651	* Scroll text between <row1> and <row2> inclusive, by <count> lines	654	* Scroll text between <row1> and <row2> inclusive, by <count> lines
652	* count positive ==> scroll up	655	* count positive ==> scroll up
653	* count negative ==> scroll down	656	* count negative ==> scroll down
…		…
655	*/	658	*/
656	int	659	int
657	rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec)	660	rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec)
658	{	661	{
659	int i, j;	662	int i, j;
660	long nscrolled;
661		663
662	if (count == 0 || (row1 > row2))	664	if (count == 0 || (row1 > row2))
663	return 0;	665	return 0;
664		666
665	want_refresh = 1;	667	want_refresh = 1;
666		668
667	if (row1 == 0 && count > 0	669	if (row1 == 0 && count > 0
668	&& (current_screen == PRIMARY || options & Opt_secondaryScroll))	670	&& (current_screen == PRIMARY || options & Opt_secondaryScroll))
669	{	671	{
670	nscrolled = (long)TermWin.nscrolled + (long)count;	672	nscrolled += count;
671		673
672	if (nscrolled > (long)TermWin.saveLines)	674	if (nscrolled > saveLines)
673	TermWin.nscrolled = TermWin.saveLines;	675	nscrolled = saveLines;
674	else
675	TermWin.nscrolled = (unsigned int)nscrolled;
676		676
677	if ((options & Opt_scrollWithBuffer)	677	if ((options & Opt_scrollWithBuffer)
678	&& TermWin.view_start != 0	678	&& view_start != 0
679	&& TermWin.view_start != TermWin.saveLines)	679	&& view_start != saveLines)
680	scr_page (UP, count);	680	scr_page (UP, count);
681	}	681	}
682	else if (!spec)	682	else if (!spec)
683	row1 += TermWin.saveLines;	683	row1 += saveLines;
684		684
685	row2 += TermWin.saveLines;	685	row2 += saveLines;
686		686
687	if (selection.op && current_screen == selection.screen)	687	if (selection.op && current_screen == selection.screen)
688	{	688	{
689	i = selection.beg.row + TermWin.saveLines;	689	i = selection.beg.row + saveLines;
690	j = selection.end.row + TermWin.saveLines;	690	j = selection.end.row + saveLines;
		691
691	if ((i < row1 && j > row1)	692	if ((i < row1 && j > row1)
692	|| (i < row2 && j > row2)	693	|| (i < row2 && j > row2)
693	|| (i - count < row1 && i >= row1)	694	|| (i - count < row1 && i >= row1)
694	|| (i - count > row2 && i <= row2)	695	|| (i - count > row2 && i <= row2)
695	|| (j - count < row1 && j >= row1)	696	|| (j - count < row1 && j >= row1)
…		…
705	selection.end.row -= count;	706	selection.end.row -= count;
706	selection.mark.row -= count;	707	selection.mark.row -= count;
707	}	708	}
708	}	709	}
709		710
710	selection_check (0); /* _after_ TermWin.nscrolled update */	711	selection_check (0); /* _after_ nscrolled update */
711		712
712	num_scr += count;	713	num_scr += count;
713	j = count;	714	j = count;
714		715
715	if (count < 0)	716	if (count < 0)
…		…
721	if (j > 0)	722	if (j > 0)
722	{	723	{
723	/* scroll up */	724	/* scroll up */
724		725
725	/* Copy lines that will get clobbered by the rotation */	726	/* Copy lines that will get clobbered by the rotation */
726	memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));	727	memcpy (buf, save + row1, count * sizeof (line_t));
727	memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
728		728
729	/* Rotate lines */	729	/* Rotate lines */
730	i = row2 - row1 - count + 1;	730	i = row2 - row1 - count + 1;
731	memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));	731	memmove (save + row1, save + row1 + count, i * sizeof (line_t));
732	memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
733	memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
734		732
735	j = row2 - count + 1, i = count;	733	j = row2 - count + 1, i = count;
736	}	734	}
737	else /* if (j < 0) */	735	else /* if (j < 0) */
738	{	736	{
739	/* scroll down */	737	/* scroll down */
740		738
741	/* Copy lines that will get clobbered by the rotation */	739	/* Copy lines that will get clobbered by the rotation */
742	for (i = 0, j = row2; i < count; i++, j--)	740	for (i = 0, j = row2; i < count; i++, j--)
743	{	741	buf[i] = save[j];
744	buf_text[i] = screen.text[j];
745	buf_rend[i] = screen.rend[j];
746	}
747		742
748	/* Rotate lines */	743	/* Rotate lines */
749	for (j = row2, i = j - count; i >= row1; i--, j--)	744	for (j = row2, i = j - count; i >= row1; i--, j--)
750	{	745	save[j] = save[i];
751	screen.tlen[j] = screen.tlen[i];
752	screen.text[j] = screen.text[i];
753	screen.rend[j] = screen.rend[i];
754	}
755		746
756	j = row1, i = count;	747	j = row1, i = count;
757	count = -count;	748	count = -count;
758	}	749	}
759		750
760	/* Resurrect lines */	751	/* Resurrect lines */
761	memset (screen.tlen + j, 0, i * sizeof (int16_t));
762	memcpy (screen.text + j, buf_text, i * sizeof (text_t *));	752	memcpy (save + j, buf, i * sizeof (line_t));
763	memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));	753
		754	scr_update_term ();
		755
764	if (!spec) /* line length may not equal TermWin.ncol */	756	if (!spec) /* line length may not equal ncol */
765	for (; i--; j++)	757	for (; i--; j++)
766	scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);	758	scr_blank_screen_mem (save[j], rstyle);
767		759
768	return count;	760	return count;
769	}	761	}
770		762
771	/* ------------------------------------------------------------------------- */	763	/* ------------------------------------------------------------------------- */
…		…
778	if (len <= 0) /* sanity */	770	if (len <= 0) /* sanity */
779	return;	771	return;
780		772
781	unsigned char checksel;	773	unsigned char checksel;
782	unicode_t c;	774	unicode_t c;
783	int i, row, last_col;	775	int row, last_col;
784	text_t *stp;
785	rend_t *srp;
786	const unicode_t *strend = str + len;	776	const unicode_t *strend = str + len;
787		777
788	want_refresh = 1;	778	want_refresh = 1;
789	ZERO_SCROLLBACK ();	779	ZERO_SCROLLBACK ();
790	last_col = TermWin.ncol;	780	last_col = ncol;
791		781
792	if (nlines > 0)	782	if (nlines > 0)
793	{	783	{
794	nlines += screen.cur.row - screen.bscroll;	784	nlines += screen.cur.row - screen.bscroll;
795	if ((nlines > 0)	785	if ((nlines > 0)
796	&& (screen.tscroll == 0)	786	&& (screen.tscroll == 0)
797	&& (screen.bscroll == (TermWin.nrow - 1)))	787	&& (screen.bscroll == (nrow - 1)))
798	{	788	{
799	/* _at least_ this many lines need to be scrolled */	789	/* _at least_ this many lines need to be scrolled */
800	scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);	790	scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
801	screen.cur.row -= nlines;	791	screen.cur.row -= nlines;
802	}	792	}
803	}	793	}
804		794
805	#ifdef DEBUG_STRICT	795	#ifdef DEBUG_STRICT
806	assert (screen.cur.col < last_col);	796	assert (screen.cur.col < last_col);
807	assert ((screen.cur.row < TermWin.nrow)	797	assert ((screen.cur.row < nrow)
808	&& (screen.cur.row >= - (int32_t)TermWin.nscrolled));	798	&& (screen.cur.row >= - (int32_t)nscrolled));
809	#else /* drive with your eyes closed */	799	#else /* drive with your eyes closed */
810	MIN_IT (screen.cur.col, last_col - 1);	800	MIN_IT (screen.cur.col, last_col - 1);
811	MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);	801	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
812	MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);	802	MAX_IT (screen.cur.row, - (int32_t)nscrolled);
813	#endif	803	#endif
814	row = screen.cur.row + TermWin.saveLines;	804	row = screen.cur.row + saveLines;
815		805
816	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	806	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
817		807
818	stp = screen.text[row];	808	line_t *line = save + row;
819	srp = screen.rend[row];
820		809
821	while (str < strend)	810	while (str < strend)
822	{	811	{
823	c = *str++;	812	c = *str++;
824		813
825	if (c < 0x20)	814	if (c < 0x20)
826	if (c == C0_LF)	815	if (c == C0_LF)
827	{	816	{
828	if (screen.tlen[row] != -1) /* XXX: think about this */	817	if (!line->is_longer ()) /* XXX: think about this */
829	MAX_IT (screen.tlen[row], screen.cur.col);	818	MAX_IT (line->l, screen.cur.col);
830		819
831	screen.flags &= ~Screen_WrapNext;	820	screen.flags &= ~Screen_WrapNext;
832		821
833	if (screen.cur.row == screen.bscroll)	822	if (screen.cur.row == screen.bscroll)
834	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);	823	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
835	else if (screen.cur.row < (TermWin.nrow - 1))	824	else if (screen.cur.row < (nrow - 1))
836	row = (++screen.cur.row) + TermWin.saveLines;	825	row = (++screen.cur.row) + saveLines;
837		826
838	stp = screen.text[row]; /* _must_ refresh */	827	line = save + row; /* _must_ refresh */
839	srp = screen.rend[row]; /* _must_ refresh */
840	continue;	828	continue;
841	}	829	}
842	else if (c == C0_CR)	830	else if (c == C0_CR)
843	{	831	{
844	if (screen.tlen[row] != -1) /* XXX: think about this */	832	if (!line->is_longer ()) /* XXX: think about this */
845	MAX_IT (screen.tlen[row], screen.cur.col);	833	MAX_IT (line->l, screen.cur.col);
846		834
847	screen.flags &= ~Screen_WrapNext;	835	screen.flags &= ~Screen_WrapNext;
848	screen.cur.col = 0;	836	screen.cur.col = 0;
849	continue;	837	continue;
850	}	838	}
…		…
867	CLEAR_SELECTION ();	855	CLEAR_SELECTION ();
868	}	856	}
869		857
870	if (screen.flags & Screen_WrapNext)	858	if (screen.flags & Screen_WrapNext)
871	{	859	{
872	screen.tlen[row] = -1;	860	line->set_is_longer ();
873		861
874	scr_do_wrap ();	862	scr_do_wrap ();
875		863
876	row = screen.cur.row + TermWin.saveLines;	864	row = screen.cur.row + saveLines;
877	stp = screen.text[row]; /* _must_ refresh */	865	line = save + row; /* _must_ refresh */
878	srp = screen.rend[row]; /* _must_ refresh */
879	}	866	}
880		867
881	// some utf-8 decoders "decode" surrogate characters: let's fix this.	868	// some utf-8 decoders "decode" surrogate characters: let's fix this.
882	if (IN_RANGE (c, 0xd800, 0xdfff))	869	if (IN_RANGE (c, 0xd800, 0xdfff))
883	c = 0xfffd;	870	c = 0xfffd;
…		…
925	c = 0xfffd;	912	c = 0xfffd;
926	# endif	913	# endif
927	#endif	914	#endif
928		915
929	// nuke the character at this position, if required	916	// nuke the character at this position, if required
930	if (stp[screen.cur.col] == NOCHAR	917	if (line->t[screen.cur.col] == NOCHAR
931	|| (screen.cur.col < TermWin.ncol - 1	918	|| (screen.cur.col < ncol - 1
932	&& stp[screen.cur.col + 1] == NOCHAR))	919	&& line->t[screen.cur.col + 1] == NOCHAR))
933	{	920	{
934	int col = screen.cur.col;	921	int col = screen.cur.col;
935		922
936	// find begin	923	// find begin
937	while (col > 0 && stp[col] == NOCHAR)	924	while (col > 0 && line->t[col] == NOCHAR)
938	col--;	925	col--;
939		926
940	rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));	927	rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
941		928
942	// found begin, nuke	929	// found begin, nuke
943	do {	930	do {
944	stp[col] = ' ';	931	line->t[col] = ' ';
945	srp[col] = rend;	932	line->r[col] = rend;
946	col++;	933	col++;
947	} while (col < TermWin.ncol && stp[col] == NOCHAR);	934	} while (col < ncol && line->t[col] == NOCHAR);
948	}	935	}
949		936
950	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	937	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
951		938
952	// if the character doesn't fit into the remaining columns...	939	// if the character doesn't fit into the remaining columns...
…		…
958	--str;	945	--str;
959	}	946	}
960		947
961	do	948	do
962	{	949	{
963	stp[screen.cur.col] = c;	950	line->t[screen.cur.col] = c;
964	srp[screen.cur.col] = rend;	951	line->r[screen.cur.col] = rend;
965		952
966	if (screen.cur.col < last_col - 1)	953	if (screen.cur.col < last_col - 1)
967	screen.cur.col++;	954	screen.cur.col++;
968	else	955	else
969	{	956	{
970	screen.tlen[row] = last_col;	957	line->l = last_col;
971	if (screen.flags & Screen_Autowrap)	958	if (screen.flags & Screen_Autowrap)
972	screen.flags |= Screen_WrapNext;	959	screen.flags |= Screen_WrapNext;
973	break;	960	break;
974	}	961	}
975		962
…		…
977	}	964	}
978	while (--width > 0);	965	while (--width > 0);
979		966
980	// pad with spaces when overwriting wide character with smaller one	967	// pad with spaces when overwriting wide character with smaller one
981	if (!width)	968	if (!width)
982	for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)	969	for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)
983	{	970	{
984	stp[c] = ' ';	971	line->t[c] = ' ';
985	srp[c] = rend;	972	line->r[c] = rend;
986	}	973	}
987	}	974	}
988	else // width == 0	975	else // width == 0
989	{	976	{
990	#if ENABLE_COMBINING	977	#if ENABLE_COMBINING
…		…
995	text_t *tp;	982	text_t *tp;
996	rend_t *rp;	983	rend_t *rp;
997		984
998	if (screen.cur.col > 0)	985	if (screen.cur.col > 0)
999	{	986	{
1000	tp = stp + screen.cur.col - 1;	987	tp = line->t + screen.cur.col - 1;
1001	rp = srp + screen.cur.col - 1;	988	rp = line->r + screen.cur.col - 1;
1002		989
1003	while (*tp == NOCHAR && tp > stp)	990	while (*tp == NOCHAR && tp > line->t)
1004	tp--, rp--;	991	tp--, rp--;
1005	}	992	}
1006	else if (screen.cur.row > 0	993	else if (screen.cur.row > 0
1007	&& screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)	994	&& save [screen.cur.row - 1 + saveLines].is_longer ())
1008	{	995	{
1009	int line = screen.cur.row - 1 + TermWin.saveLines;	996	line_t *line = save + (screen.cur.row - 1 + saveLines);
1010		997
1011	tp = screen.text[line] + last_col - 1;	998	tp = line->t + last_col - 1;
1012	rp = screen.rend[line] + last_col - 1;	999	rp = line->r + last_col - 1;
1013		1000
1014	while (*tp == NOCHAR && tp > screen.text[line])	1001	while (*tp == NOCHAR && tp > line->t)
1015	tp--, rp--;	1002	tp--, rp--;
1016	}	1003	}
1017	else	1004	else
1018	continue;	1005	continue;
1019		1006
…		…
1026	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));	1013	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1027	#endif	1014	#endif
1028	}	1015	}
1029	}	1016	}
1030		1017
1031	if (screen.tlen[row] != -1) /* XXX: think about this */	1018	if (!line->is_longer ()) /* XXX: think about this */
1032	MAX_IT (screen.tlen[row], screen.cur.col);	1019	MAX_IT (line->l, screen.cur.col);
1033		1020
1034	#ifdef DEBUG_STRICT	1021	#ifdef DEBUG_STRICT
1035	assert (screen.cur.row >= 0);	1022	assert (screen.cur.row >= 0);
1036	#else /* drive with your eyes closed */	1023	#else /* drive with your eyes closed */
1037	MAX_IT (screen.cur.row, 0);	1024	MAX_IT (screen.cur.row, 0);
…		…
1051	if (screen.cur.col == 0)	1038	if (screen.cur.col == 0)
1052	{	1039	{
1053	if (screen.cur.row > 0)	1040	if (screen.cur.row > 0)
1054	{	1041	{
1055	#ifdef TERMCAP_HAS_BW	1042	#ifdef TERMCAP_HAS_BW
1056	screen.cur.col = TermWin.ncol - 1;	1043	screen.cur.col = ncol - 1;
1057	screen.cur.row--;	1044	screen.cur.row--;
1058	return;	1045	return;
1059	#endif	1046	#endif
1060	}	1047	}
1061	}	1048	}
…		…
1081		1068
1082	if (count == 0)	1069	if (count == 0)
1083	return;	1070	return;
1084	else if (count > 0)	1071	else if (count > 0)
1085	{	1072	{
1086	int row = TermWin.saveLines + screen.cur.row;	1073	int row = saveLines + screen.cur.row;
1087	text_t *tp = screen.text[row];	1074
1088	rend_t *rp = screen.rend[row];	1075	line_t &l = save[row];
1089	rend_t base_rend = rp[i];	1076	rend_t base_rend = l.r[i];
1090	ht &= tp[i] == ' ';	1077	ht &= l.t[i] == ' ';
1091		1078
1092	for (; ++i < TermWin.ncol; )	1079	for (; ++i < ncol; )
1093	if (tabs[i])	1080	if (tabs[i])
1094	{	1081	{
1095	x = i;	1082	x = i;
1096	if (!--count)	1083	if (!--count)
1097	break;	1084	break;
1098	}	1085	}
1099	else	1086	else
1100	ht &= tp[i] == ' '	1087	ht &= l.t[i] == ' '
1101	&& RS_SAME (rp[i], base_rend);	1088	&& RS_SAME (l.r[i], base_rend);
1102		1089
1103	if (count)	1090	if (count)
1104	x = TermWin.ncol - 1;	1091	x = ncol - 1;
1105		1092
1106	// store horizontal tab commands as characters inside the text	1093	// store horizontal tab commands as characters inside the text
1107	// buffer so they can be selected and pasted.	1094	// buffer so they can be selected and pasted.
1108	if (ht && options & Opt_pastableTabs)	1095	if (ht && options & Opt_pastableTabs)
1109	{	1096	{
1110	base_rend = SET_FONT (base_rend, 0);	1097	base_rend = SET_FONT (base_rend, 0);
1111		1098
1112	if (screen.tlen[row] != -1) /* XXX: think about this */	1099	if (!l.is_longer ()) /* XXX: think about this */
1113	MAX_IT (screen.tlen[row], x);	1100	MAX_IT (l.l, x);
1114		1101
1115	i = screen.cur.col;	1102	i = screen.cur.col;
1116		1103
1117	tp[i] = '\t';	1104	l.t[i] = '\t';
1118	rp[i] = base_rend;	1105	l.r[i] = base_rend;
1119		1106
1120	while (++i < x)	1107	while (++i < x)
1121	{	1108	{
1122	tp[i] = NOCHAR;	1109	l.t[i] = NOCHAR;
1123	rp[i] = base_rend;	1110	l.r[i] = base_rend;
1124	}	1111	}
1125	}	1112	}
1126	}	1113	}
1127	else /* if (count < 0) */	1114	else /* if (count < 0) */
1128	{	1115	{
…		…
1155	{	1142	{
1156	if (screen.cur.col > 0)	1143	if (screen.cur.col > 0)
1157	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1144	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1158	else	1145	else
1159	{	1146	{
1160	if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)	1147	if (!save[screen.cur.row + saveLines].l)
1161	return; /* um, yeah? */	1148	return; /* um, yeah? */
1162		1149
1163	scr_insdel_chars (1, INSERT);	1150	scr_insdel_chars (1, INSERT);
1164	}	1151	}
1165	}	1152	}
…		…
1175	void	1162	void
1176	rxvt_term::scr_forwardindex ()	1163	rxvt_term::scr_forwardindex ()
1177	{	1164	{
1178	int row;	1165	int row;
1179		1166
1180	if (screen.cur.col < TermWin.ncol - 1)	1167	if (screen.cur.col < ncol - 1)
1181	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1168	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1182	else	1169	else
1183	{	1170	{
1184	row = screen.cur.row + TermWin.saveLines;	1171	row = screen.cur.row + saveLines;
1185		1172
1186	if (screen.tlen[row] == 0)	1173	if (!save[row].l)
1187	return; /* um, yeah? */	1174	return; /* um, yeah? */
1188	else if (screen.tlen[row] == -1)	1175
1189	screen.tlen[row] = TermWin.ncol;	1176	if (save[row].is_longer ()) //TODO//FIXME//LEN
		1177	save[row].l = ncol;
1190		1178
1191	scr_gotorc (0, 0, R_RELATIVE);	1179	scr_gotorc (0, 0, R_RELATIVE);
1192	scr_insdel_chars (1, DELETE);	1180	scr_insdel_chars (1, DELETE);
1193	scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);	1181	scr_gotorc (0, ncol - 1, R_RELATIVE);
1194	}	1182	}
1195	}	1183	}
1196	#endif	1184	#endif
1197		1185
1198	/* ------------------------------------------------------------------------- */	1186	/* ------------------------------------------------------------------------- */
…		…
1205	want_refresh = 1;	1193	want_refresh = 1;
1206	ZERO_SCROLLBACK ();	1194	ZERO_SCROLLBACK ();
1207		1195
1208	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;	1196	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1209	MAX_IT (screen.cur.col, 0);	1197	MAX_IT (screen.cur.col, 0);
1210	MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);	1198	MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1211		1199
1212	screen.flags &= ~Screen_WrapNext;	1200	screen.flags &= ~Screen_WrapNext;
1213		1201
1214	if (relative & R_RELATIVE)	1202	if (relative & R_RELATIVE)
1215	{	1203	{
…		…
1240	else	1228	else
1241	screen.cur.row = row;	1229	screen.cur.row = row;
1242	}	1230	}
1243		1231
1244	MAX_IT (screen.cur.row, 0);	1232	MAX_IT (screen.cur.row, 0);
1245	MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);	1233	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1246	}	1234	}
1247		1235
1248	/* ------------------------------------------------------------------------- */	1236	/* ------------------------------------------------------------------------- */
1249	/*	1237	/*
1250	* direction should be UP or DN	1238	* direction should be UP or DN
…		…
1266	scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);	1254	scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1267	else	1255	else
1268	screen.cur.row += dirn;	1256	screen.cur.row += dirn;
1269		1257
1270	MAX_IT (screen.cur.row, 0);	1258	MAX_IT (screen.cur.row, 0);
1271	MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);	1259	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1272	selection_check (0);	1260	selection_check (0);
1273	}	1261	}
1274		1262
1275	/* ------------------------------------------------------------------------- */	1263	/* ------------------------------------------------------------------------- */
1276	/*	1264	/*
…		…
1287	want_refresh = 1;	1275	want_refresh = 1;
1288	ZERO_SCROLLBACK ();	1276	ZERO_SCROLLBACK ();
1289		1277
1290	selection_check (1);	1278	selection_check (1);
1291		1279
1292	row = TermWin.saveLines + screen.cur.row;	1280	row = saveLines + screen.cur.row;
		1281
1293	switch (mode)	1282	switch (mode)
1294	{	1283	{
1295	case 0: /* erase to end of line */	1284	case 0: /* erase to end of line */
1296	col = screen.cur.col;	1285	col = screen.cur.col;
1297	num = TermWin.ncol - col;	1286	num = ncol - col;
1298	MIN_IT (screen.tlen[row], (int16_t)col);	1287	MIN_IT (save[row].l, (int16_t)col);
1299	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1288	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1300	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1289	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1301	CLEAR_SELECTION ();	1290	CLEAR_SELECTION ();
1302	break;	1291	break;
1303	case 1: /* erase to beginning of line */	1292	case 1: /* erase to beginning of line */
…		…
1307	|| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))	1296	|| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1308	CLEAR_SELECTION ();	1297	CLEAR_SELECTION ();
1309	break;	1298	break;
1310	case 2: /* erase whole line */	1299	case 2: /* erase whole line */
1311	col = 0;	1300	col = 0;
1312	num = TermWin.ncol;	1301	num = ncol;
1313	screen.tlen[row] = 0;	1302	save[row].l = 0;
1314	if (selection.beg.row <= screen.cur.row	1303	if (selection.beg.row <= screen.cur.row
1315	&& selection.end.row >= screen.cur.row)	1304	&& selection.end.row >= screen.cur.row)
1316	CLEAR_SELECTION ();	1305	CLEAR_SELECTION ();
1317	break;	1306	break;
1318	default:	1307	default:
1319	return;	1308	return;
1320	}	1309	}
1321		1310
1322	if (screen.text[row])	1311	if (save[row].t)
1323	scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);	1312	scr_blank_line (save[row], col, num, rstyle);
1324	else	1313	else
1325	scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);	1314	scr_blank_screen_mem (save[row], rstyle);
1326	}	1315	}
1327		1316
1328	/* ------------------------------------------------------------------------- */	1317	/* ------------------------------------------------------------------------- */
1329	/*	1318	/*
1330	* Erase part of whole of the screen	1319	* Erase part of whole of the screen
…		…
1341	XGCValues gcvalue;	1330	XGCValues gcvalue;
1342		1331
1343	want_refresh = 1;	1332	want_refresh = 1;
1344	ZERO_SCROLLBACK ();	1333	ZERO_SCROLLBACK ();
1345		1334
1346	row_offset = (int32_t)TermWin.saveLines;	1335	row_offset = (int32_t)saveLines;
1347		1336
1348	switch (mode)	1337	switch (mode)
1349	{	1338	{
1350	case 0: /* erase to end of screen */	1339	case 0: /* erase to end of screen */
1351	selection_check (1);	1340	selection_check (1);
1352	scr_erase_line (0);	1341	scr_erase_line (0);
1353	row = screen.cur.row + 1; /* possible OOB */	1342	row = screen.cur.row + 1; /* possible OOB */
1354	num = TermWin.nrow - row;	1343	num = nrow - row;
1355	break;	1344	break;
1356	case 1: /* erase to beginning of screen */	1345	case 1: /* erase to beginning of screen */
1357	selection_check (3);	1346	selection_check (3);
1358	scr_erase_line (1);	1347	scr_erase_line (1);
1359	row = 0;	1348	row = 0;
1360	num = screen.cur.row;	1349	num = screen.cur.row;
1361	break;	1350	break;
1362	case 2: /* erase whole screen */	1351	case 2: /* erase whole screen */
1363	selection_check (3);	1352	selection_check (3);
1364	row = 0;	1353	row = 0;
1365	num = TermWin.nrow;	1354	num = nrow;
1366	break;	1355	break;
1367	default:	1356	default:
1368	return;	1357	return;
1369	}	1358	}
1370		1359
…		…
1372	&& ((selection.beg.row >= row && selection.beg.row <= row + num)	1361	&& ((selection.beg.row >= row && selection.beg.row <= row + num)
1373	|| (selection.end.row >= row	1362	|| (selection.end.row >= row
1374	&& selection.end.row <= row + num)))	1363	&& selection.end.row <= row + num)))
1375	CLEAR_SELECTION ();	1364	CLEAR_SELECTION ();
1376		1365
1377	if (row >= TermWin.nrow) /* Out Of Bounds */	1366	if (row >= nrow) /* Out Of Bounds */
1378	return;	1367	return;
1379		1368
1380	MIN_IT (num, (TermWin.nrow - row));	1369	MIN_IT (num, (nrow - row));
1381		1370
1382	if (rstyle & (RS_RVid | RS_Uline))	1371	if (rstyle & (RS_RVid | RS_Uline))
1383	ren = (rend_t) ~RS_None;	1372	ren = (rend_t) ~RS_None;
1384	else if (GET_BASEBG (rstyle) == Color_bg)	1373	else if (GET_BASEBG (rstyle) == Color_bg)
1385	{	1374	{
…		…
1388	}	1377	}
1389	else	1378	else
1390	{	1379	{
1391	ren = rstyle & (RS_fgMask | RS_bgMask);	1380	ren = rstyle & (RS_fgMask | RS_bgMask);
1392	gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];	1381	gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1393	XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);	1382	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1394	ERASE_ROWS (row, num);	1383	ERASE_ROWS (row, num);
1395	gcvalue.foreground = pix_colors[Color_fg];	1384	gcvalue.foreground = pix_colors[Color_fg];
1396	XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);	1385	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1397	}	1386	}
1398		1387
1399	for (; num--; row++)	1388	for (; num--; row++)
1400	{	1389	{
1401	scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);	1390	scr_blank_screen_mem (save[row + row_offset], rstyle);
1402	screen.tlen[row + row_offset] = 0;	1391	save[row + row_offset].l = 0;
1403	scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);	1392	scr_blank_line (drawn[row], 0, ncol, ren);
1404	}	1393	}
1405	}	1394	}
1406		1395
1407	#if ENABLE_FRILLS	1396	#if ENABLE_FRILLS
1408	void	1397	void
1409	rxvt_term::scr_erase_savelines ()	1398	rxvt_term::scr_erase_savelines ()
1410	{	1399	{
1411	want_refresh = 1;	1400	want_refresh = 1;
1412	ZERO_SCROLLBACK ();	1401	ZERO_SCROLLBACK ();
1413		1402
1414	TermWin.nscrolled = 0;	1403	nscrolled = 0;
1415	}	1404	}
1416	#endif	1405	#endif
1417		1406
1418	/* ------------------------------------------------------------------------- */	1407	/* ------------------------------------------------------------------------- */
1419	/*	1408	/*
…		…
1431		1420
1432	num_scr_allow = 0;	1421	num_scr_allow = 0;
1433	selection_check (3);	1422	selection_check (3);
1434		1423
1435	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1424	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1436	for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)	1425	for (k = saveLines, i = nrow; i--; k++)
1437	{	1426	{
1438	screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */	1427	line_t &line = save[k];
		1428
1439	fill_text (screen.text[k], 'E', TermWin.ncol);	1429	fill_text (line.t, 'E', ncol);
		1430
1440	for (r1 = screen.rend[k], j = TermWin.ncol; j--; )	1431	for (r1 = line.r, j = ncol; j--; )
1441	*r1++ = fs;	1432	*r1++ = fs;
		1433
		1434	line.l = ncol; /* make the `E's selectable */
1442	}	1435	}
1443	}	1436	}
1444		1437
1445	/* ------------------------------------------------------------------------- */	1438	/* ------------------------------------------------------------------------- */
1446	/*	1439	/*
…		…
1479	void	1472	void
1480	rxvt_term::scr_insdel_chars (int count, int insdel)	1473	rxvt_term::scr_insdel_chars (int count, int insdel)
1481	{	1474	{
1482	int col, row;	1475	int col, row;
1483	rend_t tr;	1476	rend_t tr;
1484	text_t *stp;
1485	rend_t *srp;
1486	int16_t *slp;
1487		1477
1488	want_refresh = 1;	1478	want_refresh = 1;
1489	ZERO_SCROLLBACK ();	1479	ZERO_SCROLLBACK ();
1490		1480
1491	if (count <= 0)	1481	if (count <= 0)
1492	return;	1482	return;
1493		1483
1494	scr_do_wrap ();	1484	scr_do_wrap ();
1495		1485
1496	selection_check (1);	1486	selection_check (1);
1497	MIN_IT (count, (TermWin.ncol - screen.cur.col));	1487	MIN_IT (count, (ncol - screen.cur.col));
1498		1488
1499	row = screen.cur.row + TermWin.saveLines;	1489	row = screen.cur.row + saveLines;
1500		1490
1501	stp = screen.text[row];	1491	line_t *line = save + row;
1502	srp = screen.rend[row];
1503	slp = &screen.tlen[row];
1504		1492
1505	switch (insdel)	1493	switch (insdel)
1506	{	1494	{
1507	case INSERT:	1495	case INSERT:
1508	for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)	1496	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1509	{	1497	{
1510	stp[col] = stp[col - count];	1498	line->t[col] = line->t[col - count];
1511	srp[col] = srp[col - count];	1499	line->r[col] = line->r[col - count];
1512	}	1500	}
1513		1501
1514	if (*slp != -1)	1502	if (!line->is_longer ())
1515	{	1503	{
1516	*slp += count;	1504	line->l += count;
1517	MIN_IT (*slp, TermWin.ncol);	1505	MIN_IT (line->l, ncol);
1518	}	1506	}
1519		1507
1520	if (selection.op && current_screen == selection.screen	1508	if (selection.op && current_screen == selection.screen
1521	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1509	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1522	{	1510	{
1523	if (selection.end.row != screen.cur.row	1511	if (selection.end.row != screen.cur.row
1524	|| (selection.end.col + count >= TermWin.ncol))	1512	|| (selection.end.col + count >= ncol))
1525	CLEAR_SELECTION ();	1513	CLEAR_SELECTION ();
1526	else	1514	else
1527	{ /* shift selection */	1515	{ /* shift selection */
1528	selection.beg.col += count;	1516	selection.beg.col += count;
1529	selection.mark.col += count; /* XXX: yes? */	1517	selection.mark.col += count; /* XXX: yes? */
1530	selection.end.col += count;	1518	selection.end.col += count;
1531	}	1519	}
1532	}	1520	}
1533		1521
1534	scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],	1522	scr_blank_line (save[row], screen.cur.col, count, rstyle);
1535	(unsigned int)count, rstyle);
1536	break;	1523	break;
1537		1524
1538	case ERASE:	1525	case ERASE:
1539	screen.cur.col += count; /* don't worry if > TermWin.ncol */	1526	screen.cur.col += count; /* don't worry if > ncol */
1540	selection_check (1);	1527	selection_check (1);
1541	screen.cur.col -= count;	1528	screen.cur.col -= count;
1542	scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],	1529	scr_blank_line (save[row], screen.cur.col, count, rstyle);
1543	(unsigned int)count, rstyle);
1544	break;	1530	break;
1545		1531
1546	case DELETE:	1532	case DELETE:
1547	tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1533	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1548		1534
1549	for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)	1535	for (col = screen.cur.col; (col + count) < ncol; col++)
1550	{	1536	{
1551	stp[col] = stp[col + count];	1537	line->t[col] = line->t[col + count];
1552	srp[col] = srp[col + count];	1538	line->r[col] = line->r[col + count];
1553	}	1539	}
1554		1540
1555	scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],	1541	scr_blank_line (*line, ncol - count, count, tr);
1556	(unsigned int)count, tr);
1557		1542
1558	if (*slp == -1) /* break line continuation */	1543	if (line->is_longer ()) /* break line continuation */
1559	*slp = TermWin.ncol;	1544	line->l = ncol;
1560		1545
1561	*slp -= count;	1546	line->l -= count;
1562	MAX_IT (*slp, 0);	1547	MAX_IT (line->l, 0);
1563		1548
1564	if (selection.op && current_screen == selection.screen	1549	if (selection.op && current_screen == selection.screen
1565	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1550	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1566	{	1551	{
1567	if (selection.end.row != screen.cur.row	1552	if (selection.end.row != screen.cur.row
1568	|| (screen.cur.col >= selection.beg.col - count)	1553	|| (screen.cur.col >= selection.beg.col - count)
1569	|| selection.end.col >= TermWin.ncol)	1554	|| selection.end.col >= ncol)
1570	CLEAR_SELECTION ();	1555	CLEAR_SELECTION ();
1571	else	1556	else
1572	{	1557	{
1573	/* shift selection */	1558	/* shift selection */
1574	selection.beg.col -= count;	1559	selection.beg.col -= count;
…		…
1588	*/	1573	*/
1589	void	1574	void
1590	rxvt_term::scr_scroll_region (int top, int bot)	1575	rxvt_term::scr_scroll_region (int top, int bot)
1591	{	1576	{
1592	MAX_IT (top, 0);	1577	MAX_IT (top, 0);
1593	MIN_IT (bot, (int)TermWin.nrow - 1);	1578	MIN_IT (bot, (int)nrow - 1);
1594		1579
1595	if (top > bot)	1580	if (top > bot)
1596	return;	1581	return;
1597		1582
1598	screen.tscroll = top;	1583	screen.tscroll = top;
…		…
1677	*/	1662	*/
1678	void	1663	void
1679	rxvt_term::scr_set_tab (int mode)	1664	rxvt_term::scr_set_tab (int mode)
1680	{	1665	{
1681	if (mode < 0)	1666	if (mode < 0)
1682	memset (tabs, 0, TermWin.ncol * sizeof (char));	1667	memset (tabs, 0, ncol * sizeof (char));
1683	else if (screen.cur.col < TermWin.ncol)	1668	else if (screen.cur.col < ncol)
1684	tabs[screen.cur.col] = (mode ? 1 : 0);	1669	tabs[screen.cur.col] = (mode ? 1 : 0);
1685	}	1670	}
1686		1671
1687	/* ------------------------------------------------------------------------- */	1672	/* ------------------------------------------------------------------------- */
1688	/*	1673	/*
…		…
1703	if (bgPixmap.pixmap == None)	1688	if (bgPixmap.pixmap == None)
1704	#endif	1689	#endif
1705	#if TRANSPARENT	1690	#if TRANSPARENT
1706	if (! (options & Opt_transparent) || am_transparent == 0)	1691	if (! (options & Opt_transparent) || am_transparent == 0)
1707	#endif	1692	#endif
1708	XSetWindowBackground (display->display, TermWin.vt,	1693	XSetWindowBackground (display->display, vt,
1709	pix_colors[Color_bg]);	1694	pix_colors[Color_bg]);
1710		1695
1711	gcvalue.foreground = pix_colors[Color_fg];	1696	gcvalue.foreground = pix_colors[Color_fg];
1712	gcvalue.background = pix_colors[Color_bg];	1697	gcvalue.background = pix_colors[Color_bg];
1713	XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,	1698	XChangeGC (display->display, gc, GCBackground | GCForeground,
1714	&gcvalue);	1699	&gcvalue);
1715	scr_clear ();	1700	scr_clear ();
1716	scr_touch (true);	1701	scr_touch (true);
1717	}	1702	}
1718	}	1703	}
…		…
1799	bool	1784	bool
1800	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)	1785	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1801	{	1786	{
1802	bool found = false;	1787	bool found = false;
1803		1788
1804	for (int i = 0; i < TermWin.nrow; i++)	1789	for (int i = 0; i < nrow; i++)
1805	{	1790	{
1806	int col = 0;	1791	int col = 0;
1807	rend_t *drp = drawn_rend [i];	1792	rend_t *drp = drawn[i].r;
1808		1793
1809	for (; col < TermWin.ncol; col++, drp++)	1794	for (; col < ncol; col++, drp++)
1810	if ((*drp & mask) == value)	1795	if ((*drp & mask) == value)
1811	{	1796	{
1812	found = true;	1797	found = true;
1813	*drp = ~value;	1798	*drp = ~value;
1814	}	1799	}
…		…
1825	PART_END,	1810	PART_END,
1826	RC_COUNT	1811	RC_COUNT
1827	};	1812	};
1828		1813
1829	void	1814	void
1830	rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh)	1815	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1831	{	1816	{
1832	int i;	1817	int i;
1833	row_col_t rc[RC_COUNT];	1818	row_col_t rc[RC_COUNT];
1834		1819
1835	if (drawn_text == NULL) /* sanity check */	1820	if (!drawn) /* sanity check */
1836	return;	1821	return;
1837		1822
1838	#ifndef NO_SLOW_LINK_SUPPORT	1823	#ifndef NO_SLOW_LINK_SUPPORT
1839	if (refresh_type == FAST_REFRESH && !display->is_local)	1824	if (refresh_type == FAST_REFRESH && !display->is_local)
1840	{	1825	{
1841	y = 0;	1826	y = 0;
1842	height = TermWin.height;	1827	eheight = height;
1843	}	1828	}
1844	#endif	1829	#endif
1845		1830
1846	#ifdef DEBUG_STRICT	1831	#ifdef DEBUG_STRICT
1847	x = max (x, 0);	1832	x = max (x, 0);
1848	x = min (x, (int)TermWin.width);	1833	x = min (x, (int)width);
1849	y = max (y, 0);	1834	y = max (y, 0);
1850	y = min (y, (int)TermWin.height);	1835	y = min (y, (int)height);
1851	#endif	1836	#endif
1852		1837
1853	/* round down */	1838	/* round down */
1854	rc[PART_BEG].col = Pixel2Col (x);	1839	rc[PART_BEG].col = Pixel2Col (x);
1855	rc[PART_BEG].row = Pixel2Row (y);	1840	rc[PART_BEG].row = Pixel2Row (y);
1856	/* round up */	1841	/* round up */
1857	rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1);	1842	rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1858	rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1);	1843	rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1859		1844
1860	/* sanity checks */	1845	/* sanity checks */
1861	for (i = PART_BEG; i < RC_COUNT; i++)	1846	for (i = PART_BEG; i < RC_COUNT; i++)
1862	{	1847	{
1863	MIN_IT (rc[i].col, TermWin.ncol - 1);	1848	MIN_IT (rc[i].col, ncol - 1);
1864	MIN_IT (rc[i].row, TermWin.nrow - 1);	1849	MIN_IT (rc[i].row, nrow - 1);
1865	}	1850	}
1866		1851
1867	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1852	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1868	fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1853	fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1869		1854
1870	if (refresh)	1855	if (refresh)
1871	scr_refresh (SLOW_REFRESH);	1856	scr_refresh (SLOW_REFRESH);
1872	}	1857	}
1873		1858
…		…
1876	* Refresh the entire screen	1861	* Refresh the entire screen
1877	*/	1862	*/
1878	void	1863	void
1879	rxvt_term::scr_touch (bool refresh)	1864	rxvt_term::scr_touch (bool refresh)
1880	{	1865	{
1881	scr_expose (0, 0, TermWin.width, TermWin.height, refresh);	1866	scr_expose (0, 0, width, height, refresh);
1882	}	1867	}
1883		1868
1884	/* ------------------------------------------------------------------------- */	1869	/* ------------------------------------------------------------------------- */
1885	/*	1870	/*
1886	* Move the display so that the line represented by scrollbar value Y is at	1871	* Move the display so that the line represented by scrollbar value Y is at
…		…
1890	rxvt_term::scr_move_to (int y, int len)	1875	rxvt_term::scr_move_to (int y, int len)
1891	{	1876	{
1892	long p = 0;	1877	long p = 0;
1893	unsigned int oldviewstart;	1878	unsigned int oldviewstart;
1894		1879
1895	oldviewstart = TermWin.view_start;	1880	oldviewstart = view_start;
1896		1881
1897	if (y < len)	1882	if (y < len)
1898	{	1883	{
1899	p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;	1884	p = (nrow + nscrolled) * (len - y) / len;
1900	p -= (long) (TermWin.nrow - 1);	1885	p -= (long) (nrow - 1);
1901	p = max (p, 0);	1886	p = max (p, 0);
1902	}	1887	}
1903		1888
1904	TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);	1889	view_start = (unsigned int)min (p, nscrolled);
1905		1890
1906	return scr_changeview (oldviewstart);	1891	return scr_changeview (oldviewstart);
1907	}	1892	}
1908		1893
1909	/* ------------------------------------------------------------------------- */	1894	/* ------------------------------------------------------------------------- */
…		…
1915	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1900	rxvt_term::scr_page (enum page_dirn direction, int nlines)
1916	{	1901	{
1917	int n;	1902	int n;
1918	unsigned int oldviewstart;	1903	unsigned int oldviewstart;
1919		1904
1920	oldviewstart = TermWin.view_start;	1905	oldviewstart = view_start;
1921		1906
1922	if (direction == UP)	1907	if (direction == UP)
1923	{	1908	{
1924	n = TermWin.view_start + nlines;	1909	n = view_start + nlines;
1925	TermWin.view_start = min (n, TermWin.nscrolled);	1910	view_start = min (n, nscrolled);
1926	}	1911	}
1927	else	1912	else
1928	{	1913	{
1929	n = TermWin.view_start - nlines;	1914	n = view_start - nlines;
1930	TermWin.view_start = max (n, 0);	1915	view_start = max (n, 0);
1931	}	1916	}
1932		1917
1933	return scr_changeview (oldviewstart);	1918	return scr_changeview (oldviewstart);
1934	}	1919	}
1935		1920
1936	int	1921	int
1937	rxvt_term::scr_changeview (unsigned int oldviewstart)	1922	rxvt_term::scr_changeview (unsigned int oldviewstart)
1938	{	1923	{
1939	if (TermWin.view_start != oldviewstart)	1924	if (view_start != oldviewstart)
1940	{	1925	{
1941	want_refresh = 1;	1926	want_refresh = 1;
1942	num_scr -= (TermWin.view_start - oldviewstart);	1927	num_scr -= (view_start - oldviewstart);
1943	}	1928	}
1944		1929
1945	return (int) (TermWin.view_start - oldviewstart);	1930	return (int) (view_start - oldviewstart);
1946	}	1931	}
1947		1932
1948	/* ------------------------------------------------------------------------- */	1933	/* ------------------------------------------------------------------------- */
1949	void	1934	void
1950	rxvt_term::scr_bell ()	1935	rxvt_term::scr_bell ()
1951	{	1936	{
1952	#ifndef NO_BELL	1937	#ifndef NO_BELL
		1938
1953	# ifndef NO_MAPALERT	1939	# ifndef NO_MAPALERT
1954	# ifdef MAPALERT_OPTION	1940	# ifdef MAPALERT_OPTION
1955	if (options & Opt_mapAlert)	1941	if (options & Opt_mapAlert)
1956	# endif	1942	# endif
1957	XMapWindow (display->display, TermWin.parent[0]);	1943	XMapWindow (display->display, parent[0]);
1958	# endif	1944	# endif
		1945
1959	if (options & Opt_visualBell)	1946	if (options & Opt_visualBell)
1960	{	1947	{
1961	scr_rvideo_mode (!rvideo); /* refresh also done */	1948	scr_rvideo_mode (!rvideo); /* refresh also done */
		1949	rxvt_usleep (VISUAL_BELL_DURATION);
1962	scr_rvideo_mode (!rvideo); /* refresh also done */	1950	scr_rvideo_mode (!rvideo); /* refresh also done */
1963	}	1951	}
1964	else	1952	else
1965	XBell (display->display, 0);	1953	XBell (display->display, 0);
		1954
1966	#endif	1955	#endif
1967	}	1956	}
1968		1957
1969	/* ------------------------------------------------------------------------- */	1958	/* ------------------------------------------------------------------------- */
1970	/* ARGSUSED */	1959	/* ARGSUSED */
…		…
1976	FILE *fd;	1965	FILE *fd;
1977		1966
1978	if ((fd = popen_printer ()) == NULL)	1967	if ((fd = popen_printer ()) == NULL)
1979	return;	1968	return;
1980		1969
1981	nrows = TermWin.nrow;	1970	nrows = nrow;
1982	row_offset = TermWin.saveLines;	1971	row_offset = saveLines;
1983		1972
1984	if (!fullhist)	1973	if (!fullhist)
1985	row_offset -= TermWin.view_start;	1974	row_offset -= view_start;
1986	else	1975	else
1987	{	1976	{
1988	nrows += TermWin.nscrolled;	1977	nrows += nscrolled;
1989	row_offset -= TermWin.nscrolled;	1978	row_offset -= nscrolled;
1990	}	1979	}
1991		1980
1992	wctomb (0, 0);	1981	wctomb (0, 0);
1993		1982
1994	for (r1 = 0; r1 < nrows; r1++)	1983	for (r1 = 0; r1 < nrows; r1++)
1995	{	1984	{
1996	text_t *tp = screen.text[r1 + row_offset];	1985	text_t *tp = save[r1 + row_offset].t;
1997	int len = screen.tlen[r1 + row_offset];	1986	int len = save[r1 + row_offset].l;
1998		1987
1999	for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )	1988	for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
2000	{	1989	{
2001	char mb[MB_LEN_MAX];	1990	char mb[MB_LEN_MAX];
2002	text_t t = *tp++;	1991	text_t t = *tp++;
2003	if (t == NOCHAR)	1992	if (t == NOCHAR)
2004	continue;	1993	continue;
…		…
2041	#endif	2030	#endif
2042	rend_t *crp; // cursor rendition pointer	2031	rend_t *crp; // cursor rendition pointer
2043		2032
2044	want_refresh = 0; /* screen is current */	2033	want_refresh = 0; /* screen is current */
2045		2034
2046	if (refresh_type == NO_REFRESH || !TermWin.mapped)	2035	if (refresh_type == NO_REFRESH || !mapped)
2047	return;	2036	return;
2048		2037
2049	/*	2038	/*
2050	* A: set up vars	2039	* A: set up vars
2051	*/	2040	*/
2052	must_clear = 0;	2041	must_clear = 0;
2053	refresh_count = 0;	2042	refresh_count = 0;
2054		2043
2055	row_offset = TermWin.saveLines - TermWin.view_start;	2044	row_offset = saveLines - view_start;
2056		2045
2057	#if XPM_BACKGROUND	2046	#if XPM_BACKGROUND
2058	must_clear |= bgPixmap.pixmap != None;	2047	must_clear |= bgPixmap.pixmap != None;
2059	#endif	2048	#endif
2060	#if TRANSPARENT	2049	#if TRANSPARENT
…		…
2083		2072
2084	if (showcursor)	2073	if (showcursor)
2085	{	2074	{
2086	int col = screen.cur.col;	2075	int col = screen.cur.col;
2087		2076
2088	while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)	2077	while (col && screen.line[screen.cur.row]->t[col] == NOCHAR)
2089	col--;	2078	col--;
2090		2079
2091	crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];	2080	crp = &screen.line[screen.cur.row]->r[col];
2092		2081
2093	if (showcursor && TermWin.focus)	2082	if (showcursor && focus)
2094	{	2083	{
2095	if (options & Opt_cursorUnderline)	2084	if (options & Opt_cursorUnderline)
2096	*crp ^= RS_Uline;	2085	*crp ^= RS_Uline;
2097	else	2086	else
2098	{	2087	{
…		…
2125		2114
2126	/* make sure no outline cursor is left around */	2115	/* make sure no outline cursor is left around */
2127	setoldcursor = 0;	2116	setoldcursor = 0;
2128	if (ocrow != -1)	2117	if (ocrow != -1)
2129	{	2118	{
2130	if (screen.cur.row + TermWin.view_start != ocrow	2119	if (screen.cur.row + view_start != ocrow
2131	|| screen.cur.col != oldcursor.col)	2120	|| screen.cur.col != oldcursor.col)
2132	{	2121	{
2133	if (ocrow < TermWin.nrow	2122	if (ocrow < nrow
2134	&& oldcursor.col < TermWin.ncol)	2123	&& oldcursor.col < ncol)
2135	drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);	2124	drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2136		2125
2137	if (TermWin.focus || !showcursor)	2126	if (focus || !showcursor)
2138	oldcursor.row = -1;	2127	oldcursor.row = -1;
2139	else	2128	else
2140	setoldcursor = 1;	2129	setoldcursor = 1;
2141	}	2130	}
2142	}	2131	}
2143	else if (!TermWin.focus)	2132	else if (!focus)
2144	setoldcursor = 1;	2133	setoldcursor = 1;
2145		2134
2146	if (setoldcursor)	2135	if (setoldcursor)
2147	{	2136	{
2148	if (screen.cur.row + TermWin.view_start >= TermWin.nrow)	2137	if (screen.cur.row + view_start >= nrow)
2149	oldcursor.row = -1;	2138	oldcursor.row = -1;
2150	else	2139	else
2151	{	2140	{
2152	oldcursor.row = screen.cur.row + TermWin.view_start;	2141	oldcursor.row = screen.cur.row + view_start;
2153	oldcursor.col = screen.cur.col;	2142	oldcursor.col = screen.cur.col;
2154	}	2143	}
2155	}	2144	}
2156	}	2145	}
2157		2146
2158	#if ENABLE_OVERLAY	2147	#if ENABLE_OVERLAY
2159	scr_swap_overlay ();	2148	scr_swap_overlay ();
2160	#endif	2149	#endif
2161
2162	rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2163	text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2164		2150
2165	#ifndef NO_SLOW_LINK_SUPPORT	2151	#ifndef NO_SLOW_LINK_SUPPORT
2166	/*	2152	/*
2167	* D: CopyArea pass - very useful for slower links	2153	* D: CopyArea pass - very useful for slower links
2168	* This has been deliberately kept simple.	2154	* This has been deliberately kept simple.
2169	*/	2155	*/
2170	i = num_scr;	2156	i = num_scr;
2171	if (!display->is_local	2157	if (!display->is_local
2172	&& refresh_type == FAST_REFRESH && num_scr_allow && i	2158	&& refresh_type == FAST_REFRESH && num_scr_allow && i
2173	&& abs (i) < TermWin.nrow && !must_clear)	2159	&& abs (i) < nrow && !must_clear)
2174	{	2160	{
2175	int16_t nits;	2161	int16_t nits;
2176	int j;	2162	int j;
2177	int len, wlen;	2163	int len, wlen;
2178		2164
2179	j = TermWin.nrow;	2165	j = nrow;
2180	wlen = len = -1;	2166	wlen = len = -1;
2181	row = i > 0 ? 0 : j - 1;	2167	row = i > 0 ? 0 : j - 1;
2182	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2168	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2183	{	2169	{
2184	if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)	2170	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2185	{	2171	{
2186	text_t *stp = screen.text[row + row_offset];	2172	line_t s = save[row + row_offset];
2187	rend_t *srp = screen.rend[row + row_offset];
2188	text_t *dtp = drawn_text[row];	2173	line_t d = drawn[row];
2189	text_t *dtp2 = drawn_text[row + i];	2174	line_t d2 = drawn[row + i];
2190	rend_t *drp = drawn_rend[row];
2191	rend_t *drp2 = drawn_rend[row + i];
2192		2175
2193	for (nits = 0, col = TermWin.ncol; col--; )	2176	for (nits = 0, col = ncol; col--; )
2194	if (stp[col] != dtp2[col] || srp[col] != drp2[col])	2177	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2195	nits--;	2178	nits--;
2196	else if (stp[col] != dtp[col] || srp[col] != drp[col])	2179	else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2197	nits++;	2180	nits++;
2198		2181
2199	if (nits > 8) /* XXX: arbitrary choice */	2182	if (nits > 8) /* XXX: arbitrary choice */
2200	{	2183	{
2201	for (col = TermWin.ncol; col--; )	2184	for (col = ncol; col--; )
2202	{	2185	{
2203	*dtp++ = *dtp2++;	2186	*d.t++ = *d2.t++;
2204	*drp++ = *drp2++;	2187	*d.r++ = *d2.r++;
2205	}	2188	}
2206		2189
2207	if (len == -1)	2190	if (len == -1)
2208	len = row;	2191	len = row;
2209		2192
…		…
2216	{	2199	{
2217	/* also comes here at end if needed because of >= above */	2200	/* also comes here at end if needed because of >= above */
2218	if (wlen < len)	2201	if (wlen < len)
2219	SWAP_IT (wlen, len, int);	2202	SWAP_IT (wlen, len, int);
2220		2203
2221	XCopyArea (display->display, TermWin.vt, TermWin.vt,	2204	XCopyArea (display->display, vt, vt,
2222	TermWin.gc, 0, Row2Pixel (len + i),	2205	gc, 0, Row2Pixel (len + i),
2223	(unsigned int)TermWin_TotalWidth (),	2206	(unsigned int)TermWin_TotalWidth (),
2224	(unsigned int)Height2Pixel (wlen - len + 1),	2207	(unsigned int)Height2Pixel (wlen - len + 1),
2225	0, Row2Pixel (len));	2208	0, Row2Pixel (len));
2226	len = -1;	2209	len = -1;
2227	}	2210	}
…		…
2230	#endif	2213	#endif
2231		2214
2232	/*	2215	/*
2233	* E: main pass across every character	2216	* E: main pass across every character
2234	*/	2217	*/
2235	for (row = 0; row < TermWin.nrow; row++)	2218	for (row = 0; row < nrow; row++)
2236	{	2219	{
2237	text_t *stp = screen.text[row + row_offset];	2220	text_t *stp = save[row + row_offset].t;
2238	rend_t *srp = screen.rend[row + row_offset];	2221	rend_t *srp = save[row + row_offset].r;
2239	text_t *dtp = drawn_text[row];	2222	text_t *dtp = drawn[row].t;
2240	rend_t *drp = drawn_rend[row];	2223	rend_t *drp = drawn[row].r;
2241		2224
2242	/*	2225	/*
2243	* E2: OK, now the real pass	2226	* E2: OK, now the real pass
2244	*/	2227	*/
2245	int ypixel = (int)Row2Pixel (row);	2228	int ypixel = (int)Row2Pixel (row);
2246		2229
2247	for (col = 0; col < TermWin.ncol; col++)	2230	for (col = 0; col < ncol; col++)
2248	{	2231	{
2249	/* compare new text with old - if exactly the same then continue */	2232	/* compare new text with old - if exactly the same then continue */
2250	if (stp[col] == dtp[col] /* Must match characters to skip. */	2233	if (stp[col] == dtp[col] /* Must match characters to skip. */
2251	&& (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */	2234	&& (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2252	|| (stp[col] == ' ' /* space w/ no background change */	2235	|| (stp[col] == ' ' /* space w/ no background change */
…		…
2266	dtp[col] = stp[col];	2249	dtp[col] = stp[col];
2267	drp[col] = rend;	2250	drp[col] = rend;
2268		2251
2269	int xpixel = Col2Pixel (col);	2252	int xpixel = Col2Pixel (col);
2270		2253
2271	for (i = 0; ++col < TermWin.ncol; )	2254	for (i = 0; ++col < ncol; )
2272	{	2255	{
2273	if (stp[col] == NOCHAR)	2256	if (stp[col] == NOCHAR)
2274	{	2257	{
2275	dtp[col] = stp[col];	2258	dtp[col] = stp[col];
2276	drp[col] = rend;	2259	drp[col] = rend;
…		…
2304		2287
2305	// sometimes we optimize away the trailing NOCHAR's, add them back	2288	// sometimes we optimize away the trailing NOCHAR's, add them back
2306	while (i && text[count] == NOCHAR)	2289	while (i && text[count] == NOCHAR)
2307	count++, i--;	2290	count++, i--;
2308		2291
2309	#if ENABLE_STYLES
2310	// force redraw after "careful" characters to avoid pixel droppings
2311	if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2312	drp[col + 1] = ~srp[col + 1];
2313
2314	// include previous careful character(s) if possible, looks nicer (best effort...)
2315	while (text > stp
2316	&& srp[text - stp - 1] & RS_Careful
2317	&& RS_SAME (rend, srp[text - stp - 1]))
2318	text--, count++, xpixel -= TermWin.fwidth;
2319	#endif
2320
2321	/*	2292	/*
2322	* Determine the attributes for the string	2293	* Determine the attributes for the string
2323	*/	2294	*/
2324	int fore = GET_FGCOLOR (rend); // desired foreground	2295	int fore = GET_FGCOLOR (rend); // desired foreground
2325	int back = GET_BGCOLOR (rend); // desired background	2296	int back = GET_BGCOLOR (rend); // desired background
2326		2297
2327	// only do special processing if ana attributes are set, which is rare	2298	// only do special processing if any attributes are set, which is rare
2328	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))	2299	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2329	{	2300	{
		2301	#if ENABLE_STYLES
		2302	// force redraw after "careful" characters to avoid pixel droppings
		2303	if (srp[col] & RS_Careful && col < ncol - 1 && 0)
		2304	drp[col + 1] = ~srp[col + 1];
		2305
		2306	// include previous careful character(s) if possible, looks nicer (best effort...)
		2307	while (text > stp
		2308	&& srp[text - stp - 1] & RS_Careful
		2309	&& RS_SAME (rend, srp[text - stp - 1]))
		2310	text--, count++, xpixel -= fwidth;
		2311	#endif
		2312
2330	bool invert = rend & RS_RVid;	2313	bool invert = rend & RS_RVid;
2331		2314
2332	#ifndef NO_BOLD_UNDERLINE_REVERSE	2315	#ifndef NO_BOLD_UNDERLINE_REVERSE
2333	if (rend & RS_Bold	2316	if (rend & RS_Bold
2334	&& fore == Color_fg)	2317	&& fore == Color_fg)
…		…
2361	SWAP_IT (fore, back, int);	2344	SWAP_IT (fore, back, int);
2362		2345
2363	#ifndef NO_BOLD_UNDERLINE_REVERSE	2346	#ifndef NO_BOLD_UNDERLINE_REVERSE
2364	if (ISSET_PIXCOLOR (Color_RV))	2347	if (ISSET_PIXCOLOR (Color_RV))
2365	back = Color_RV;	2348	back = Color_RV;
		2349
		2350	if (fore == back)
		2351	{
		2352	fore = Color_bg;
		2353	back = Color_fg;
		2354	}
2366	#endif	2355	#endif
2367	}	2356	}
2368		2357
2369	#ifdef TEXT_BLINK	2358	#ifdef TEXT_BLINK
2370	if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))	2359	if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
…		…
2381	}	2370	}
2382		2371
2383	/*	2372	/*
2384	* Actually do the drawing of the string here	2373	* Actually do the drawing of the string here
2385	*/	2374	*/
2386	rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2375	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2387		2376
2388	if (back == fore)	2377	if (back == fore)
2389	font->clear_rect (*TermWin.drawable, xpixel, ypixel,	2378	font->clear_rect (*drawable, xpixel, ypixel,
2390	TermWin.fwidth * count, TermWin.fheight,	2379	fwidth * count, fheight,
2391	back);	2380	back);
2392	else if (back == Color_bg)	2381	else if (back == Color_bg)
2393	{	2382	{
2394	if (must_clear)	2383	if (must_clear)
2395	{	2384	{
2396	CLEAR_CHARS (xpixel, ypixel, count);	2385	CLEAR_CHARS (xpixel, ypixel, count);
2397		2386
2398	for (i = 0; i < count; i++) /* don't draw empty strings */	2387	for (i = 0; i < count; i++) /* don't draw empty strings */
2399	if (text[i] != ' ')	2388	if (text[i] != ' ')
2400	{	2389	{
2401	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1);	2390	font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2402	break;	2391	break;
2403	}	2392	}
2404	}	2393	}
2405	else	2394	else
2406	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);	2395	font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2407	}	2396	}
2408	else	2397	else
2409	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);	2398	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2410		2399
2411	if (rend & RS_Uline && font->descent > 1 && fore != back)	2400	if (rend & RS_Uline && font->descent > 1 && fore != back)
2412	{	2401	{
2413	#if ENABLE_FRILLS	2402	#if ENABLE_FRILLS
2414	if (ISSET_PIXCOLOR (Color_underline))	2403	if (ISSET_PIXCOLOR (Color_underline))
2415	XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);	2404	XSetForeground (display->display, gc, pix_colors[Color_underline]);
2416	else	2405	else
2417	#endif	2406	#endif
2418	XSetForeground (display->display, TermWin.gc, pix_colors[fore]);	2407	XSetForeground (display->display, gc, pix_colors[fore]);
2419		2408
2420	XDrawLine (display->display, drawBuffer, TermWin.gc,	2409	XDrawLine (display->display, drawBuffer, gc,
2421	xpixel, ypixel + font->ascent + 1,	2410	xpixel, ypixel + font->ascent + 1,
2422	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2411	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2423	}	2412	}
2424	} /* for (col....) */	2413	} /* for (col....) */
2425	} /* for (row....) */	2414	} /* for (row....) */
…		…
2431	/*	2420	/*
2432	* G: cleanup cursor and display outline cursor if necessary	2421	* G: cleanup cursor and display outline cursor if necessary
2433	*/	2422	*/
2434	if (showcursor)	2423	if (showcursor)
2435	{	2424	{
2436	if (TermWin.focus)	2425	if (focus)
2437	{	2426	{
2438	if (options & Opt_cursorUnderline)	2427	if (options & Opt_cursorUnderline)
2439	*crp ^= RS_Uline;	2428	*crp ^= RS_Uline;
2440	else	2429	else
2441	{	2430	{
…		…
2448	else if (oldcursor.row >= 0)	2437	else if (oldcursor.row >= 0)
2449	{	2438	{
2450	int cursorwidth = 1;	2439	int cursorwidth = 1;
2451	int col = oldcursor.col;	2440	int col = oldcursor.col;
2452		2441
2453	while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)	2442	while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR)
2454	col--;	2443	col--;
2455		2444
2456	while (col + cursorwidth < TermWin.ncol	2445	while (col + cursorwidth < ncol
2457	&& drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)	2446	&& drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2458	cursorwidth++;	2447	cursorwidth++;
2459		2448
2460	#ifndef NO_CURSORCOLOR	2449	#ifndef NO_CURSORCOLOR
2461	if (ISSET_PIXCOLOR (Color_cursor))	2450	if (ISSET_PIXCOLOR (Color_cursor))
2462	XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);	2451	XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2463	#endif	2452	#endif
2464		2453
2465	XDrawRectangle (display->display, drawBuffer, TermWin.gc,	2454	XDrawRectangle (display->display, drawBuffer, gc,
2466	Col2Pixel (col),	2455	Col2Pixel (col),
2467	Row2Pixel (oldcursor.row),	2456	Row2Pixel (oldcursor.row),
2468	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2457	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2469	(unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));	2458	(unsigned int) (Height2Pixel (1) - lineSpace - 1));
2470	}	2459	}
2471	}	2460	}
2472		2461
2473	/*	2462	/*
2474	* H: cleanup selection	2463	* H: cleanup selection
…		…
2481	num_scr = 0;	2470	num_scr = 0;
2482	num_scr_allow = 1;	2471	num_scr_allow = 1;
2483	}	2472	}
2484		2473
2485	void	2474	void
2486	rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)	2475	rxvt_term::scr_remap_chars (const line_t &l)
2487	{	2476	{
2488	if (!rp || !tp)	2477	if (!l.t)
2489	return;	2478	return;
2490		2479
2491	for (int i = TermWin.ncol; i; i--, rp++, tp++)	2480	for (int i = ncol; i--; )
2492	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));	2481	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2493	}	2482	}
2494		2483
2495	void	2484	void
2496	rxvt_term::scr_remap_chars ()	2485	rxvt_term::scr_remap_chars ()
2497	{	2486	{
2498	for (int i = TermWin.nrow + TermWin.saveLines; i--; )	2487	for (int i = nrow + saveLines; i--; )
2499	scr_remap_chars (screen.text[i], screen.rend[i]);	2488	scr_remap_chars (save[i]);
2500		2489
2501	for (int i = TermWin.nrow; i--; )	2490	for (int i = nrow; i--; )
2502	{	2491	{
2503	scr_remap_chars (drawn_text[i], drawn_rend[i]);	2492	scr_remap_chars (drawn[i]);
2504	scr_remap_chars (swap.text[i], swap.rend[i]);	2493	scr_remap_chars (swap_save[i]);
2505	}	2494	}
2506	}	2495	}
2507		2496
2508	void	2497	void
2509	rxvt_term::scr_recolour ()	2498	rxvt_term::scr_recolour ()
…		…
2515	#if XPM_BACKGROUND	2504	#if XPM_BACKGROUND
2516	&& !bgPixmap.pixmap	2505	&& !bgPixmap.pixmap
2517	#endif	2506	#endif
2518	)	2507	)
2519	{	2508	{
2520	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);	2509	XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2521	XClearWindow (display->display, TermWin.parent[0]);	2510	XClearWindow (display->display, parent[0]);
2522	XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);	2511	XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2523	#if HAVE_SCROLLBARS	2512	#if HAVE_SCROLLBARS
2524	if (scrollBar.win)	2513	if (scrollBar.win)
2525	{	2514	{
2526	XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);	2515	XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2527	scrollBar.setIdle ();	2516	scrollBar.setIdle ();
…		…
2537		2526
2538	/* ------------------------------------------------------------------------- */	2527	/* ------------------------------------------------------------------------- */
2539	void	2528	void
2540	rxvt_term::scr_clear (bool really)	2529	rxvt_term::scr_clear (bool really)
2541	{	2530	{
2542	if (!TermWin.mapped)	2531	if (!mapped)
2543	return;	2532	return;
2544		2533
2545	num_scr_allow = 0;	2534	num_scr_allow = 0;
2546	want_refresh = 1;	2535	want_refresh = 1;
2547		2536
2548	#if TRANSPARENT
2549	if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2550	{
2551	int i;
2552
2553	if (!(options & Opt_transparent_all))
2554	i = 0;
2555	else
2556	i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2557
2558	while (i--)
2559	if (TermWin.parent[i] != None)
2560	XClearWindow (display->display, TermWin.parent[i]);
2561	}
2562	#endif
2563
2564	if (really)	2537	if (really)
2565	XClearWindow (display->display, TermWin.vt);	2538	XClearWindow (display->display, vt);
2566	}	2539	}
2567		2540
2568	/* ------------------------------------------------------------------------- */	2541	/* ------------------------------------------------------------------------- */
2569	void	2542	void
2570	rxvt_term::scr_reverse_selection ()	2543	rxvt_term::scr_reverse_selection ()
2571	{	2544	{
2572	if (selection.op && current_screen == selection.screen)	2545	if (selection.op && current_screen == selection.screen)
2573	{	2546	{
2574	int end_row = TermWin.saveLines - TermWin.view_start;	2547	int end_row = saveLines - view_start;
2575	int i = selection.beg.row + TermWin.saveLines;	2548	int i = selection.beg.row + saveLines;
2576	int col, row = selection.end.row + TermWin.saveLines;	2549	int col, row = selection.end.row + saveLines;
2577	rend_t *srp;	2550	rend_t *srp;
2578		2551
2579	#if ENABLE_FRILLS	2552	#if ENABLE_FRILLS
2580	if (selection.rect)	2553	if (selection.rect)
2581	{	2554	{
2582	end_row += TermWin.nrow;	2555	end_row += nrow;
2583		2556
2584	for (; i <= row && i <= end_row; i++)	2557	for (; i <= row && i <= end_row; i++)
2585	for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)	2558	for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++)
2586	srp[col] ^= RS_RVid;	2559	srp[col] ^= RS_RVid;
2587	}	2560	}
2588	else	2561	else
2589	#endif	2562	#endif
2590	{	2563	{
…		…
2594	{	2567	{
2595	col = 0;	2568	col = 0;
2596	i = end_row;	2569	i = end_row;
2597	}	2570	}
2598		2571
2599	end_row += TermWin.nrow;	2572	end_row += nrow;
2600		2573
2601	for (; i < row && i < end_row; i++, col = 0)	2574	for (; i < row && i < end_row; i++, col = 0)
2602	for (srp = screen.rend[i]; col < TermWin.ncol; col++)	2575	for (srp = save[i].r; col < ncol; col++)
2603	srp[col] ^= RS_RVid;	2576	srp[col] ^= RS_RVid;
2604		2577
2605	if (i == row && i < end_row)	2578	if (i == row && i < end_row)
2606	for (srp = screen.rend[i]; col < selection.end.col; col++)	2579	for (srp = save[i].r; col < selection.end.col; col++)
2607	srp[col] ^= RS_RVid;	2580	srp[col] ^= RS_RVid;
2608	}	2581	}
2609	}	2582	}
2610	}	2583	}
2611		2584
…		…
2620	{	2593	{
2621	int row, wrote;	2594	int row, wrote;
2622	unsigned int width, towrite;	2595	unsigned int width, towrite;
2623	char r1[] = "\n";	2596	char r1[] = "\n";
2624		2597
2625	for (row = TermWin.saveLines - TermWin.nscrolled;	2598	for (row = saveLines - nscrolled;
2626	row < TermWin.saveLines + TermWin.nrow - 1; row++)	2599	row < saveLines + nrow - 1; row++)
2627	{	2600	{
2628	width = screen.tlen[row] >= 0 ? screen.tlen[row]	2601	width = save[row].l >= 0 ? save[row].l
2629	: TermWin.ncol;	2602	: ncol;
2630	for (towrite = width; towrite; towrite -= wrote)	2603	for (towrite = width; towrite; towrite -= wrote)
2631	{	2604	{
2632	wrote = write (fd, & (screen.text[row][width - towrite]),	2605	wrote = write (fd, & (save[row].t[width - towrite]),
2633	towrite);	2606	towrite);
2634	if (wrote < 0)	2607	if (wrote < 0)
2635	return; /* XXX: death, no report */	2608	return; /* XXX: death, no report */
2636	}	2609	}
2637	if (screen.tlen[row] >= 0)	2610	if (save[row].l >= 0)
2638	if (write (fd, r1, 1) <= 0)	2611	if (write (fd, r1, 1) <= 0)
2639	return; /* XXX: death, no report */	2612	return; /* XXX: death, no report */
2640	}	2613	}
2641	}	2614	}
2642	#endif	2615	#endif
…		…
2644	/* ------------------------------------------------------------------------- *	2617	/* ------------------------------------------------------------------------- *
2645	* CHARACTER SELECTION *	2618	* CHARACTER SELECTION *
2646	* ------------------------------------------------------------------------- */	2619	* ------------------------------------------------------------------------- */
2647		2620
2648	/*	2621	/*
2649	* -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1	2622	* -nscrolled <= (selection row) <= nrow - 1
2650	*/	2623	*/
2651	void	2624	void
2652	rxvt_term::selection_check (int check_more)	2625	rxvt_term::selection_check (int check_more)
2653	{	2626	{
2654	row_col_t pos;	2627	row_col_t pos;
2655		2628
2656	if (!selection.op)	2629	if (!selection.op)
2657	return;	2630	return;
2658		2631
2659	pos.row = pos.col = 0;	2632	pos.row = pos.col = 0;
2660	if ((selection.beg.row < - (int32_t)TermWin.nscrolled)	2633	if ((selection.beg.row < - (int32_t)nscrolled)
2661	|| (selection.beg.row >= TermWin.nrow)	2634	|| (selection.beg.row >= nrow)
2662	|| (selection.mark.row < - (int32_t)TermWin.nscrolled)	2635	|| (selection.mark.row < - (int32_t)nscrolled)
2663	|| (selection.mark.row >= TermWin.nrow)	2636	|| (selection.mark.row >= nrow)
2664	|| (selection.end.row < - (int32_t)TermWin.nscrolled)	2637	|| (selection.end.row < - (int32_t)nscrolled)
2665	|| (selection.end.row >= TermWin.nrow)	2638	|| (selection.end.row >= nrow)
2666	|| (check_more == 1	2639	|| (check_more == 1
2667	&& current_screen == selection.screen	2640	&& current_screen == selection.screen
2668	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2641	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2669	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2642	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
2670	|| (check_more == 2	2643	|| (check_more == 2
…		…
2672	&& ROWCOL_IS_AFTER (selection.end, pos))	2645	&& ROWCOL_IS_AFTER (selection.end, pos))
2673	|| (check_more == 3	2646	|| (check_more == 3
2674	&& ROWCOL_IS_AFTER (selection.end, pos))	2647	&& ROWCOL_IS_AFTER (selection.end, pos))
2675	|| (check_more == 4 /* screen width change */	2648	|| (check_more == 4 /* screen width change */
2676	&& (selection.beg.row != selection.end.row	2649	&& (selection.beg.row != selection.end.row
2677	|| selection.end.col > TermWin.ncol)))	2650	|| selection.end.col > ncol)))
2678	CLEAR_SELECTION ();	2651	CLEAR_SELECTION ();
2679	}	2652	}
2680		2653
2681	/* ------------------------------------------------------------------------- */	2654	/* ------------------------------------------------------------------------- */
2682	/*	2655	/*
…		…
2891	* EXT: button 2 release	2864	* EXT: button 2 release
2892	*/	2865	*/
2893	void	2866	void
2894	rxvt_term::selection_request (Time tm, int x, int y)	2867	rxvt_term::selection_request (Time tm, int x, int y)
2895	{	2868	{
2896	if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)	2869	if (x < 0 || x >= width || y < 0 || y >= height)
2897	return; /* outside window */	2870	return; /* outside window */
2898		2871
2899	if (selection.text)	2872	if (selection.text)
2900	{ /* internal selection */	2873	{ /* internal selection */
2901	char *str = rxvt_wcstombs (selection.text, selection.len);	2874	char *str = rxvt_wcstombs (selection.text, selection.len);
…		…
2943	sel = xa[XA_CLIPBOARD];	2916	sel = xa[XA_CLIPBOARD];
2944		2917
2945	if (XGetSelectionOwner (display->display, sel) != None)	2918	if (XGetSelectionOwner (display->display, sel) != None)
2946	{	2919	{
2947	XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],	2920	XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2948	TermWin.vt, selection_request_time);	2921	vt, selection_request_time);
2949	return 1;	2922	return 1;
2950	}	2923	}
2951		2924
2952	return 0;	2925	return 0;
2953	}	2926	}
…		…
2999	selection.op = SELECTION_DONE;	2972	selection.op = SELECTION_DONE;
3000		2973
3001	if (selection.clicks == 4)	2974	if (selection.clicks == 4)
3002	return; /* nothing selected, go away */	2975	return; /* nothing selected, go away */
3003		2976
3004	i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);	2977	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3005	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2978	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
3006		2979
3007	col = selection.beg.col;	2980	col = selection.beg.col;
3008	row = selection.beg.row + TermWin.saveLines;	2981	row = selection.beg.row + saveLines;
3009	end_row = selection.end.row + TermWin.saveLines;	2982	end_row = selection.end.row + saveLines;
3010	int ofs = 0;	2983	int ofs = 0;
3011	int extra = 0;	2984	int extra = 0;
3012		2985
3013	for (; row <= end_row; row++, col = 0)	2986	for (; row <= end_row; row++, col = 0)
3014	{	2987	{
3015	end_col = screen.tlen[row];
3016
3017	#if ENABLE_FRILLS	2988	#if ENABLE_FRILLS
3018	if (selection.rect)	2989	if (selection.rect)
3019	{	2990	{
3020	col = selection.beg.col;	2991	col = selection.beg.col;
3021	end_col = TermWin.ncol + 1;	2992	end_col = ncol + 1;
3022	}	2993	}
		2994	else
3023	#endif	2995	#endif
		2996	end_col = save[row].is_longer () ? ncol : save[row].l; //TODO//FIXME//LEN
3024		2997
3025	MAX_IT (col, 0);	2998	MAX_IT (col, 0);
3026
3027	if (end_col == -1)
3028	end_col = TermWin.ncol;
3029		2999
3030	if (row == end_row || selection.rect)	3000	if (row == end_row || selection.rect)
3031	MIN_IT (end_col, selection.end.col);	3001	MIN_IT (end_col, selection.end.col);
3032		3002
3033	t = &screen.text[row][col];	3003	t = save[row].t + col;
3034	for (; col < end_col; col++)	3004	for (; col < end_col; col++)
3035	{	3005	{
3036	if (*t == NOCHAR)	3006	if (*t == NOCHAR)
3037	t++;	3007	t++;
3038	#if ENABLE_COMBINING	3008	#if ENABLE_COMBINING
…		…
3054	#endif	3024	#endif
3055	else	3025	else
3056	new_selection_text[ofs++] = *t++;	3026	new_selection_text[ofs++] = *t++;
3057	}	3027	}
3058		3028
3059	if (screen.tlen[row] != -1 && row != end_row)	3029	if (!save[row].is_longer () && row != end_row)
3060	new_selection_text[ofs++] = C0_LF;	3030	new_selection_text[ofs++] = C0_LF;
3061	}	3031	}
3062		3032
3063	if (end_col != selection.end.col)	3033	if (end_col != selection.end.col)
3064	new_selection_text[ofs++] = C0_LF;	3034	new_selection_text[ofs++] = C0_LF;
…		…
3075		3045
3076	// we usually allocate much more than necessary, so realloc it smaller again	3046	// we usually allocate much more than necessary, so realloc it smaller again
3077	selection.len = ofs;	3047	selection.len = ofs;
3078	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));	3048	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3079		3049
3080	XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);	3050	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3081	if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)	3051	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3082	display->set_selection_owner (this);	3052	display->set_selection_owner (this);
3083	else	3053	else
3084	rxvt_warn ("can't get primary selection, ignoring.\n");	3054	rxvt_warn ("can't get primary selection, ignoring.\n");
3085		3055
3086	#if 0	3056	#if 0
…		…
3109		3079
3110	selection_start_colrow (Pixel2Col (x), Pixel2Row (y));	3080	selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3111		3081
3112	if (clicks == 2 || clicks == 3)	3082	if (clicks == 2 || clicks == 3)
3113	selection_extend_colrow (selection.mark.col,	3083	selection_extend_colrow (selection.mark.col,
3114	selection.mark.row + TermWin.view_start,	3084	selection.mark.row + view_start,
3115	0, /* button 3 */	3085	0, /* button 3 */
3116	1, /* button press */	3086	1, /* button press */
3117	0); /* click change */	3087	0); /* click change */
3118	}	3088	}
3119		3089
…		…
3124	void	3094	void
3125	rxvt_term::selection_start_colrow (int col, int row)	3095	rxvt_term::selection_start_colrow (int col, int row)
3126	{	3096	{
3127	want_refresh = 1;	3097	want_refresh = 1;
3128	selection.mark.col = col;	3098	selection.mark.col = col;
3129	selection.mark.row = row - TermWin.view_start;	3099	selection.mark.row = row - view_start;
3130		3100
3131	MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);	3101	MAX_IT (selection.mark.row, - (int32_t)nscrolled);
3132	MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);	3102	MIN_IT (selection.mark.row, (int32_t)nrow - 1);
3133	MAX_IT (selection.mark.col, 0);	3103	MAX_IT (selection.mark.col, 0);
3134	MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);	3104	MIN_IT (selection.mark.col, (int32_t)ncol - 1);
3135		3105
3136	while (selection.mark.col > 0	3106	while (selection.mark.col > 0
3137	&& screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)	3107	&& save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR)
3138	--selection.mark.col;	3108	--selection.mark.col;
3139		3109
3140	if (selection.op)	3110	if (selection.op)
3141	{ /* clear the old selection */	3111	{ /* clear the old selection */
3142	selection.beg.row = selection.end.row = selection.mark.row;	3112	selection.beg.row = selection.end.row = selection.mark.row;
…		…
3166	text_t *stp;	3136	text_t *stp;
3167	rend_t *srp;	3137	rend_t *srp;
3168		3138
3169	if (dirn == UP)	3139	if (dirn == UP)
3170	{	3140	{
3171	bound.row = TermWin.saveLines - TermWin.nscrolled - 1;	3141	bound.row = saveLines - nscrolled - 1;
3172	bound.col = 0;	3142	bound.col = 0;
3173	dirnadd = -1;	3143	dirnadd = -1;
3174	}	3144	}
3175	else	3145	else
3176	{	3146	{
3177	bound.row = TermWin.saveLines + TermWin.nrow;	3147	bound.row = saveLines + nrow;
3178	bound.col = TermWin.ncol - 1;	3148	bound.col = ncol - 1;
3179	dirnadd = 1;	3149	dirnadd = 1;
3180	}	3150	}
3181		3151
3182	row = mark->row + TermWin.saveLines;	3152	row = mark->row + saveLines;
3183	col = mark->col;	3153	col = mark->col;
3184	MAX_IT (col, 0);	3154	MAX_IT (col, 0);
3185	/* find the edge of a word */	3155	/* find the edge of a word */
3186	stp = &screen.text[row][col];	3156	stp = save[row].t + col; w1 = DELIMIT_TEXT (*stp);
3187	w1 = DELIMIT_TEXT (*stp);	3157	srp = save[row].r + col; w2 = DELIMIT_REND (*srp);
3188
3189	srp = &screen.rend[row][col];
3190	w2 = DELIMIT_REND (*srp);
3191		3158
3192	for (;;)	3159	for (;;)
3193	{	3160	{
3194	for (; col != bound.col; col += dirnadd)	3161	for (; col != bound.col; col += dirnadd)
3195	{	3162	{
…		…
3205	break;	3172	break;
3206	}	3173	}
3207		3174
3208	if ((col == bound.col) && (row != bound.row))	3175	if ((col == bound.col) && (row != bound.row))
3209	{	3176	{
3210	if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)	3177	if (save[ (row - (dirn == UP ? 1 : 0))].is_longer ())
3211	{	3178	{
3212	trow = row + dirnadd;	3179	trow = row + dirnadd;
3213	tcol = dirn == UP ? TermWin.ncol - 1 : 0;	3180	tcol = dirn == UP ? ncol - 1 : 0;
3214		3181
3215	if (screen.text[trow] == NULL)	3182	if (!save[trow].t)
3216	break;	3183	break;
3217		3184
3218	stp = & (screen.text[trow][tcol]);	3185	stp = save[trow].t + tcol;
3219	srp = & (screen.rend[trow][tcol]);	3186	srp = save[trow].r + tcol;
3220		3187
3221	if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)	3188	if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3222	break;	3189	break;
3223		3190
3224	row = trow;	3191	row = trow;
…		…
3232	Old_Word_Selection_You_Die:	3199	Old_Word_Selection_You_Die:
3233	if (dirn == DN)	3200	if (dirn == DN)
3234	col++; /* put us on one past the end */	3201	col++; /* put us on one past the end */
3235		3202
3236	/* Poke the values back in */	3203	/* Poke the values back in */
3237	ret->row = row - TermWin.saveLines;	3204	ret->row = row - saveLines;
3238	ret->col = col;	3205	ret->col = col;
3239	}	3206	}
3240		3207
3241	/* ------------------------------------------------------------------------- */	3208	/* ------------------------------------------------------------------------- */
3242	/*	3209	/*
…		…
3252	int col, row;	3219	int col, row;
3253		3220
3254	col = Pixel2Col (x);	3221	col = Pixel2Col (x);
3255	row = Pixel2Row (y);	3222	row = Pixel2Row (y);
3256	MAX_IT (row, 0);	3223	MAX_IT (row, 0);
3257	MIN_IT (row, (int)TermWin.nrow - 1);	3224	MIN_IT (row, (int)nrow - 1);
3258	MAX_IT (col, 0);	3225	MAX_IT (col, 0);
3259	MIN_IT (col, (int)TermWin.ncol);	3226	MIN_IT (col, (int)ncol);
3260		3227
3261	/*	3228	/*
3262	* If we're selecting characters (single click) then we must check first	3229	* If we're selecting characters (single click) then we must check first
3263	* if we are at the same place as the original mark. If we are then	3230	* if we are at the same place as the original mark. If we are then
3264	* select nothing. Otherwise, if we're to the right of the mark, you have to	3231	* select nothing. Otherwise, if we're to the right of the mark, you have to
3265	* be _past_ a character for it to be selected.	3232	* be _past_ a character for it to be selected.
3266	*/	3233	*/
3267	if (((selection.clicks % 3) == 1) && !flag	3234	if (((selection.clicks % 3) == 1) && !flag
3268	&& (col == selection.mark.col	3235	&& (col == selection.mark.col
3269	&& (row == selection.mark.row + TermWin.view_start)))	3236	&& (row == selection.mark.row + view_start)))
3270	{	3237	{
3271	/* select nothing */	3238	/* select nothing */
3272	selection.beg.row = selection.end.row = 0;	3239	selection.beg.row = selection.end.row = 0;
3273	selection.beg.col = selection.end.col = 0;	3240	selection.beg.col = selection.end.col = 0;
3274	selection.clicks = 4;	3241	selection.clicks = 4;
…		…
3289	* Extend the selection to the specified col/row	3256	* Extend the selection to the specified col/row
3290	*/	3257	*/
3291	void	3258	void
3292	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)	3259	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3293	{	3260	{
3294	int16_t ncol = TermWin.ncol;
3295	int end_col;
3296	row_col_t pos;	3261	row_col_t pos;
3297	enum {	3262	enum {
3298	LEFT, RIGHT	3263	LEFT, RIGHT
3299	} closeto = RIGHT;	3264	} closeto = RIGHT;
3300		3265
…		…
3333	}	3298	}
3334		3299
3335	pos.col = col;	3300	pos.col = col;
3336	pos.row = row;	3301	pos.row = row;
3337		3302
3338	pos.row -= TermWin.view_start; /* adjust for scroll */	3303	pos.row -= view_start; /* adjust for scroll */
3339		3304
3340	/*	3305	/*
3341	* This is mainly xterm style selection with a couple of differences, mainly	3306	* This is mainly xterm style selection with a couple of differences, mainly
3342	* in the way button3 drag extension works.	3307	* in the way button3 drag extension works.
3343	* We're either doing: button1 drag; button3 press; or button3 drag	3308	* We're either doing: button1 drag; button3 press; or button3 drag
…		…
3402	}	3367	}
3403	}	3368	}
3404		3369
3405	if (selection.clicks == 1)	3370	if (selection.clicks == 1)
3406	{	3371	{
3407	end_col = screen.tlen[selection.beg.row + TermWin.saveLines];	3372	if (selection.beg.col > save[selection.beg.row + saveLines].l //TODO//FIXME//LEN
3408		3373	&& !save[selection.beg.row + saveLines].is_longer ()
3409	if (selection.beg.col > end_col
3410	&& end_col != -1
3411	#if ENABLE_FRILLS	3374	#if ENABLE_FRILLS
3412	&& !selection.rect	3375	&& !selection.rect
3413	#endif	3376	#endif
3414	)	3377	)
3415	selection.beg.col = ncol;	3378	selection.beg.col = ncol;
3416		3379
3417	end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3418
3419	if (	3380	if (
3420	selection.end.col > end_col	3381	selection.end.col > save[selection.end.row + saveLines].l //TODO//FIXME//LEN
3421	&& end_col != -1	3382	&& !save[selection.end.row + saveLines].is_longer ()
3422	#if ENABLE_FRILLS	3383	#if ENABLE_FRILLS
3423	&& !selection.rect	3384	&& !selection.rect
3424	#endif	3385	#endif
3425	)	3386	)
3426	selection.end.col = ncol;	3387	selection.end.col = ncol;
…		…
3436	else if (selection.clicks == 3)	3397	else if (selection.clicks == 3)
3437	{	3398	{
3438	#if ENABLE_FRILLS	3399	#if ENABLE_FRILLS
3439	if (options & Opt_tripleclickwords)	3400	if (options & Opt_tripleclickwords)
3440	{	3401	{
3441	int end_row;
3442
3443	selection_delimit_word (UP, &selection.beg, &selection.beg);	3402	selection_delimit_word (UP, &selection.beg, &selection.beg);
3444	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3445		3403
3446	for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)	3404	for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3447	{	3405	{
3448	end_col = screen.tlen[end_row + TermWin.saveLines];	3406	if (!save[end_row + saveLines].is_longer ())
3449
3450	if (end_col != -1)
3451	{	3407	{
3452	selection.end.row = end_row;	3408	selection.end.row = end_row;
3453	selection.end.col = end_col;	3409	selection.end.col = save[end_row + saveLines].l;
3454	selection_remove_trailing_spaces ();	3410	selection_remove_trailing_spaces ();
3455	break;	3411	break;
3456	}	3412	}
3457	}	3413	}
3458	}	3414	}
…		…
3464		3420
3465	selection.beg.col = 0;	3421	selection.beg.col = 0;
3466	selection.end.col = ncol;	3422	selection.end.col = ncol;
3467		3423
3468	// select a complete logical line	3424	// select a complete logical line
3469	while (selection.beg.row > -TermWin.saveLines	3425	while (selection.beg.row > -saveLines
3470	&& screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)	3426	&& save[selection.beg.row - 1 + saveLines].is_longer ())
3471	selection.beg.row--;	3427	selection.beg.row--;
3472		3428
3473	while (selection.end.row < TermWin.nrow	3429	while (selection.end.row < nrow
3474	&& screen.tlen[selection.end.row + TermWin.saveLines] == -1)	3430	&& save[selection.end.row + saveLines].is_longer ())
3475	selection.end.row++;	3431	selection.end.row++;
3476	}	3432	}
3477	}	3433	}
3478		3434
3479	if (button3 && buttonpress)	3435	if (button3 && buttonpress)
…		…
3506	end_col = selection.end.col;	3462	end_col = selection.end.col;
3507	end_row = selection.end.row;	3463	end_row = selection.end.row;
3508		3464
3509	for ( ; end_row >= selection.beg.row; )	3465	for ( ; end_row >= selection.beg.row; )
3510	{	3466	{
3511	stp = screen.text[end_row + TermWin.saveLines];	3467	stp = save[end_row + saveLines].t;
3512		3468
3513	while (--end_col >= 0)	3469	while (--end_col >= 0)
3514	{	3470	{
3515	if (stp[end_col] != ' '	3471	if (stp[end_col] != ' '
3516	&& stp[end_col] != '\t'	3472	&& stp[end_col] != '\t'
3517	&& stp[end_col] != NOCHAR)	3473	&& stp[end_col] != NOCHAR)
3518	break;	3474	break;
3519	}	3475	}
3520		3476
3521	if (end_col >= 0	3477	if (end_col >= 0
3522	|| screen.tlen[end_row - 1 + TermWin.saveLines] != -1)	3478	|| !save[end_row - 1 + saveLines].is_longer ())
3523	{	3479	{
3524	selection.end.col = end_col + 1;	3480	selection.end.col = end_col + 1;
3525	selection.end.row = end_row;	3481	selection.end.row = end_row;
3526	break;	3482	break;
3527	}	3483	}
3528		3484
3529	end_row--;	3485	end_row--;
3530	end_col = TermWin.ncol;	3486	end_col = ncol;
3531	}	3487	}
3532		3488
3533	if (selection.mark.row > selection.end.row)	3489	if (selection.mark.row > selection.end.row)
3534	{	3490	{
3535	selection.mark.row = selection.end.row;	3491	selection.mark.row = selection.end.row;
…		…
3698	*/	3654	*/
3699	void	3655	void
3700	rxvt_term::pixel_position (int *x, int *y)	3656	rxvt_term::pixel_position (int *x, int *y)
3701	{	3657	{
3702	*x = Pixel2Col (*x);	3658	*x = Pixel2Col (*x);
3703	/* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */	3659	/* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */
3704	*y = Pixel2Row (*y);	3660	*y = Pixel2Row (*y);
3705	/* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */	3661	/* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */
3706	}	3662	}
3707		3663
3708	/* ------------------------------------------------------------------------- */	3664	/* ------------------------------------------------------------------------- */
3709	#ifdef USE_XIM	3665	#ifdef USE_XIM
3710	void	3666	void
3711	rxvt_term::im_set_position (XPoint &pos)	3667	rxvt_term::im_set_position (XPoint &pos)
3712	{	3668	{
3713	XWindowAttributes xwa;	3669	XWindowAttributes xwa;
3714		3670
3715	XGetWindowAttributes (display->display, TermWin.vt, &xwa);	3671	XGetWindowAttributes (display->display, vt, &xwa);
3716		3672
3717	pos.x = xwa.x + Col2Pixel (screen.cur.col);	3673	pos.x = xwa.x + Col2Pixel (screen.cur.col);
3718	pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;	3674	pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3719	}	3675	}
3720	#endif	3676	#endif
3721		3677
3722	#if ENABLE_OVERLAY	3678	#if ENABLE_OVERLAY
3723	void	3679	void
3724	rxvt_term::scr_overlay_new (int x, int y, int w, int h)	3680	rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3725	{	3681	{
3726	if (TermWin.nrow < 3 || TermWin.ncol < 3)	3682	if (nrow < 3 || ncol < 3)
3727	return;	3683	return;
3728		3684
3729	want_refresh = 1;	3685	want_refresh = 1;
3730		3686
3731	scr_overlay_off ();	3687	scr_overlay_off ();
3732		3688
3733	if (x < 0) x = TermWin.ncol - w;	3689	if (x < 0) x = ncol - w;
3734	if (y < 0) y = TermWin.nrow - h;	3690	if (y < 0) y = nrow - h;
3735		3691
3736	// make space for border	3692	// make space for border
3737	w += 2; MIN_IT (w, TermWin.ncol);	3693	w += 2; MIN_IT (w, ncol);
3738	h += 2; MIN_IT (h, TermWin.nrow);	3694	h += 2; MIN_IT (h, nrow);
3739		3695
3740	x -= 1; MAX_IT (x, 0);	3696	x -= 1; MAX_IT (x, 0);
3741	y -= 1; MAX_IT (y, 0);	3697	y -= 1; MAX_IT (y, 0);
3742		3698
3743	MIN_IT (x, TermWin.ncol - w);	3699	MIN_IT (x, ncol - w);
3744	MIN_IT (y, TermWin.nrow - h);	3700	MIN_IT (y, nrow - h);
3745		3701
3746	ov_x = x; ov_y = y;	3702	ov_x = x; ov_y = y;
3747	ov_w = w; ov_h = h;	3703	ov_w = w; ov_h = h;
3748		3704
3749	ov_text = new text_t *[h];	3705	ov_text = new text_t *[h];
…		…
3835	rxvt_term::scr_swap_overlay ()	3791	rxvt_term::scr_swap_overlay ()
3836	{	3792	{
3837	if (!ov_text)	3793	if (!ov_text)
3838	return;	3794	return;
3839		3795
3840	int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;	3796	int row_offset = ov_y + saveLines - view_start;
3841		3797
3842	// swap screen mem with overlay	3798	// swap screen mem with overlay
3843	for (int y = ov_h; y--; )	3799	for (int y = ov_h; y--; )
3844	{	3800	{
3845	text_t *t1 = ov_text[y];	3801	text_t *t1 = ov_text[y];
3846	rend_t *r1 = ov_rend[y];	3802	rend_t *r1 = ov_rend[y];
3847		3803
3848	text_t *t2 = screen.text[y + row_offset] + ov_x;	3804	text_t *t2 = save[y + row_offset].t + ov_x;
3849	rend_t *r2 = screen.rend[y + row_offset] + ov_x;	3805	rend_t *r2 = save[y + row_offset].r + ov_x;
3850		3806
3851	for (int x = ov_w; x--; )	3807	for (int x = ov_w; x--; )
3852	{	3808	{
3853	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3809	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3854	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3810	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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