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.179 by root, Tue Dec 20 22:47:14 2005 UTC vs.
Revision 1.210 by root, Thu Jan 5 21:21:49 2006 UTC

…		…
24	* This file handles _all_ screen updates and selections	24	* This file handles _all_ screen updates and selections
25	*/	25	*/
26		26
27	#include "../config.h" /* NECESSARY */	27	#include "../config.h" /* NECESSARY */
28	#include "rxvt.h" /* NECESSARY */	28	#include "rxvt.h" /* NECESSARY */
		29	#include "rxvtperl.h" /* NECESSARY */
29		30
30	#include <X11/Xmd.h> /* get the typedef for CARD32 */	31	#include <X11/Xmd.h> /* get the typedef for CARD32 */
31		32
32	#include <inttypes.h>	33	#include <inttypes.h>
33		34
…		…
46		47
47	/* ------------------------------------------------------------------------- *	48	/* ------------------------------------------------------------------------- *
48	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *	49	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49	* ------------------------------------------------------------------------- */	50	* ------------------------------------------------------------------------- */
50	#define ZERO_SCROLLBACK() \	51	#define ZERO_SCROLLBACK() \
51	if (options & Opt_scrollTtyOutput) \	52	if (OPTION (Opt_scrollTtyOutput)) \
52	view_start = 0	53	view_start = 0
53	#define CLEAR_SELECTION() \	54	#define CLEAR_SELECTION() \
54	selection.beg.row = selection.beg.col \	55	selection.beg.row = selection.beg.col \
55	= selection.end.row = selection.end.col = 0	56	= selection.end.row = selection.end.col = 0
56	#define CLEAR_ALL_SELECTION() \	57	#define CLEAR_ALL_SELECTION() \
…		…
123	lalloc (l);	124	lalloc (l);
124	col = 0;	125	col = 0;
125	width = ncol;	126	width = ncol;
126	}	127	}
127		128
		129	l.touch ();
		130
128	efs &= ~RS_baseattrMask;	131	efs &= ~RS_baseattrMask;
129	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));	132	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130		133
131	text_t *et = l.t + col;	134	text_t *et = l.t + col;
132	rend_t *er = l.r + col;	135	rend_t *er = l.r + col;
…		…
147	}	150	}
148		151
149	/* ------------------------------------------------------------------------- *	152	/* ------------------------------------------------------------------------- *
150	* SCREEN INITIALISATION *	153	* SCREEN INITIALISATION *
151	* ------------------------------------------------------------------------- */	154	* ------------------------------------------------------------------------- */
		155
152	void	156	void
153	rxvt_term::scr_reset ()	157	rxvt_term::scr_reset ()
154	{	158	{
155	unsigned int p, q;
156	int k;
157
158	#if ENABLE_OVERLAY	159	#if ENABLE_OVERLAY
159	scr_overlay_off ();	160	scr_overlay_off ();
160	#endif	161	#endif
161		162
162	view_start = 0;	163	view_start = 0;
…		…
172	return;	173	return;
173		174
174	// we need at least two lines for wrapping to work correctly	175	// we need at least two lines for wrapping to work correctly
175	if (nrow + saveLines < 2)	176	if (nrow + saveLines < 2)
176	{	177	{
		178	//TODO//FIXME
177	saveLines++;	179	saveLines++;
178	prev_nrow--;	180	prev_nrow--;
179	nsaved++;	181	nsaved++;
180	}	182	}
181		183
…		…
185	total_rows = nrow + saveLines;	187	total_rows = nrow + saveLines;
186		188
187	screen.tscroll = 0;	189	screen.tscroll = 0;
188	screen.bscroll = nrow - 1;	190	screen.bscroll = nrow - 1;
189		191
190	if (!save)	192	if (!row_buf)
191	{	193	{
192	/*	194	/*
193	* first time called so just malloc everything: don't rely on realloc	195	* first time called so just malloc everything: don't rely on realloc
194	* Note: this is still needed so that all the scrollback lines are NULL	196	* Note: this is still needed so that all the scrollback lines are NULL
195	*/	197	*/
…		…
197	term_start = 0;	199	term_start = 0;
198		200
199	talloc = new rxvt_salloc (ncol * sizeof (text_t));	201	talloc = new rxvt_salloc (ncol * sizeof (text_t));
200	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));	202	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201		203
202	save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203	buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));	204	row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
		205	temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
204	drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t));	206	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205	swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t));	207	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206		208
207	for (p = nrow; p--; )	209	for (int row = nrow; row--; )
208	{	210	{
209	scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE);	211	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210	scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);	212	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211	scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);	213	scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212	}	214	}
213		215
214	memset (charsets, 'B', sizeof (charsets));	216	memset (charsets, 'B', sizeof (charsets));
215	rstyle = DEFAULT_RSTYLE;	217	rstyle = DEFAULT_RSTYLE;
216	screen.flags = Screen_DefaultFlags;	218	screen.flags = Screen_DefaultFlags;
…		…
240	{	242	{
241	/*	243	/*
242	* add or delete rows as appropriate	244	* add or delete rows as appropriate
243	*/	245	*/
244		246
245	rxvt_salloc *old_ta;	247	rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
246	rxvt_salloc *old_ra;	248	rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
247		249
		250	#if 0
248	if (nrow < prev_nrow)	251	if (nrow < prev_nrow)
249	{	252	{
250	/* delete rows */
251	k = min (nsaved, prev_nrow - nrow);
252	// k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
253	scr_scroll_text (0, (int)prev_nrow - 1, k);
254
255	for (p = nrow; p < prev_nrow; p++)	253	for (int row = nrow; row < prev_nrow; row++)
256	{	254	{
257	lfree (ROW(p));
258	lfree (swap_save[p]);	255	lfree (swap_buf [row]);
259	lfree (drawn[p]);	256	lfree (drawn_buf[row]);
260	}	257	}
		258	}
		259	#endif
261		260
262	/* we have fewer rows so fix up cursor position */	261	drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263	MIN_IT (screen.cur.row, (int32_t)nrow - 1);	262	temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
		263	swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264		264
265	scr_reset_realloc (); /* realloc _last_ */	265	for (int row = min (nrow, prev_nrow); row--; )
		266	{
		267	lresize (drawn_buf[row]);
		268	lresize (swap_buf [row]);
		269	}
		270
		271	for (int row = prev_nrow; row < nrow; row++)
		272	{
		273	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
		274	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
		275	}
		276
		277	line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
266	}	278
267	else if (nrow > prev_nrow)	279	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
		280	int pend = MOD (term_start - nsaved , prev_total_rows);
		281	int q = total_rows; // rewrapped row
		282
		283	if (nsaved)
		284	{
		285	// re-wrap lines, this is rather ugly, possibly because I am too dumb
		286	// to come up with a lean and mean algorithm.
		287
		288	row_col_t ocur = screen.cur;
		289	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
		290
268	{	291	do
269	/* add rows */
270	scr_reset_realloc (); /* realloc _first_ */
271
272	int ocol = ncol;
273	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
274
275	k = min (nsaved, nrow - prev_nrow);
276
277	for (p = prev_total_rows; p < total_rows; p++)
278	save[p].clear ();
279
280	for (p = prev_total_rows; p < total_rows - k; p++)
281	scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
282
283	for (p = prev_nrow; p < nrow; p++)
284	{	292	{
285	swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);	293	p = MOD (p - 1, prev_total_rows);
286	drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
287	}
288
289	if (k > 0)
290	{
291	scr_scroll_text (0, (int)nrow - 1, -k);
292	screen.cur.row += k;
293	screen.s_cur.row += k;
294	nsaved -= k;
295	}
296
297	#ifdef DEBUG_STRICT	294	#ifdef DEBUG_STRICT
298	assert (screen.cur.row < nrow);	295	assert (old_buf [MOD (p, prev_total_rows)].t);
299	#else /* drive with your eyes closed */
300	MIN_IT (screen.cur.row, nrow - 1);
301	#endif	296	#endif
302	ncol = ocol; // save b/c scr_blank_screen_mem uses this
303	}
304
305	/* resize columns */
306	if (ncol != prev_ncol)
307	{
308	old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
309	old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
310
311	for (p = total_rows; p--; )
312	lresize (save[p]);
313
314	for (p = nrow; p--; )
315	{
316	lresize (drawn[p]);
317	lresize (swap_save[p]);
318	}
319
320	MIN_IT (screen.cur.col, (int16_t)ncol - 1);
321
322	delete old_ta;
323	delete old_ra;
324	}
325
326	#if 0
327	// re-wrap lines, this is rather ugly, possibly because I am too dumb
328	// to come up with a lean and mean algorithm.
329	rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
330	rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
331
332	text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
333	rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
334	tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
335
336	for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
337
338	p = prev_total_rows;
339	q = total_rows;
340
341	while (p > 0 && q > 0)
342	{
343	--p;
344
345	printf ("pq %d:%d\n", p, q);
346	if (save[p].t)
347	{
348	int llen = save[p].l;	297	int plines = 1;
		298	int llen = old_buf [MOD (p, prev_total_rows)].l;
349		299
350	assert (llen >= 0);	300	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
351
352	while (p && save[p - 1].l < 0)
353	{	301	{
		302	p = MOD (p - 1, prev_total_rows);
		303
354	--p;	304	plines++;
355	llen += prev_ncol;	305	llen += prev_ncol;
356	}	306	}
357		307
358	int qlines = llen / ncol + 1;	308	int qlines = max (0, (llen - 1) / ncol) + 1;
		309
		310	// drop partial lines completely
		311	if (q < qlines)
		312	break;
		313
		314	q -= qlines;
		315
359	int lofs = 0;	316	int lofs = 0;
		317	line_t *qline;
360		318
361	q -= qlines;	319	// re-assemble the full line by destination lines
362
363	int qrow = q;
364
365	printf ("QL %d llen %d\n", qlines, llen);//D
366	for (; qlines--; qrow++)	320	for (int qrow = q; qlines--; qrow++)
367	{	321	{
		322	qline = row_buf + qrow;
		323	lalloc (*qline);
		324	qline->l = ncol;
		325	qline->is_longer (1);
		326
368	if (qrow >= 0)	327	int qcol = 0;
		328
		329	// fill a single destination line
		330	while (lofs < llen && qcol < ncol)
369	{	331	{
370	tp [qrow] = (text_t *)ta->alloc ();
371	rp [qrow] = (rend_t *)ra->alloc ();
372	tl [qrow] = LINE_CONT1;
373
374	int qcol = 0;
375
376	for (;;)
377	{
378	int prow = lofs / prev_ncol + p;	332	int prow = lofs / prev_ncol;
379	int pcol = lofs % prev_ncol;	333	int pcol = lofs % prev_ncol;
380		334
		335	prow = MOD (p + prow, prev_total_rows);
		336
		337	// we only adjust the cursor _row_ and put it into
		338	// the topmost line of "long line" it was in, as
		339	// this seems to upset applications/shells/readline
		340	// least.
		341	if (prow == ocur.row)
		342	screen.cur.row = q - (total_rows - nrow);
		343
		344	line_t &pline = old_buf [prow];
		345
381	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	346	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
382		347
383	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);
384
385	if (len <= 0)
386	{
387	tl [qrow] = qcol;
388
389	TODO
390	scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
391	ncol - qcol, DEFAULT_RSTYLE);
392
393	break;
394	}
395
396	assert (lofs < 1000);	348	assert (len);
		349	assert (pline.t);
397		350
398	memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t));	351	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
399	memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t));	352	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
400		353
401	lofs += len;	354	lofs += len;
402	qcol += len;	355	qcol += len;
403
404	if (qcol == ncol)
405	break;
406	}
407	}	356	}
408	else
409	lofs += ncol;
410	}	357	}
		358
		359	qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
		360	qline->is_longer (0);
		361	scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
411	}	362	}
		363	while (p != pend && q > 0);
		364
		365	term_start = total_rows - nrow;
		366	nsaved = term_start - q;
		367
		368	// make sure all terminal lines exist
		369	while (nsaved < 0)
		370	scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
		371	}
		372	else
412	}	373	{
		374	// if no scrollback exists (yet), wing, instead of wrap
		375
		376	for (int row = min (nrow, prev_nrow); row--; )
		377	{
		378	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
		379	line_t &qline = row_buf [row];
413		380
414	free (screen.text); screen.text = tp;	381	qline = pline;
415	free (screen.rend); screen.rend = rp;	382	lresize (qline);
416	free (screen.tlen); screen.tlen = tl;	383	}
417		384
418	for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D	385	for (int row = prev_nrow; row < nrow; row++)
		386	{
		387	row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
		388	}
		389
		390	term_start = 0;
		391	}
		392
		393	#ifdef DEBUG_STRICT //TODO: remove
		394	for (int i = -nsaved; i < nrow; i++)
		395	assert (ROW (i).t);
419	#endif	396	#endif
		397
		398	free (old_buf);
		399	delete old_ta;
		400	delete old_ra;
		401
		402	clamp_it (screen.cur.row, 0, nrow - 1);
		403	clamp_it (screen.cur.col, 0, ncol - 1);
420		404
421	if (tabs)	405	if (tabs)
422	free (tabs);	406	free (tabs);
423	}	407	}
424		408
425	prev_nrow = nrow;	409	prev_nrow = nrow;
426	prev_ncol = ncol;	410	prev_ncol = ncol;
427		411
428	tabs = (char *)rxvt_malloc (ncol * sizeof (char));	412	tabs = (char *)rxvt_malloc (ncol * sizeof (char));
429		413
430	for (p = 0; p < ncol; p++)	414	for (int col = ncol; col--; )
431	tabs[p] = (p % TABSIZE == 0) ? 1 : 0;	415	tabs [col] = col % TABSIZE == 0;
432		416
433	tt_winch ();	417	tt_winch ();
434	}
435		418
436	void	419	PERL_INVOKE ((this, HOOK_RESET, DT_END));
437	rxvt_term::scr_reset_realloc ()
438	{
439	swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
440	drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
441	buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
442	save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
443	}	420	}
444		421
445	/* ------------------------------------------------------------------------- */	422	/* ------------------------------------------------------------------------- */
446	/*	423	/*
447	* Free everything. That way malloc debugging can find leakage.	424	* Free everything. That way malloc debugging can find leakage.
…		…
450	rxvt_term::scr_release ()	427	rxvt_term::scr_release ()
451	{	428	{
452	delete talloc; talloc = 0;	429	delete talloc; talloc = 0;
453	delete ralloc; ralloc = 0;	430	delete ralloc; ralloc = 0;
454		431
455	free (save);	432	free (row_buf);
456	free (swap_save);	433	free (swap_buf);
457	free (drawn);	434	free (drawn_buf);
458	free (buf);	435	free (temp_buf);
459	free (tabs);	436	free (tabs);
		437
		438	row_buf = 0; // signal that we freed all the arrays
460	}	439	}
461		440
462	/* ------------------------------------------------------------------------- */	441	/* ------------------------------------------------------------------------- */
463	/*	442	/*
464	* Hard reset	443	* Hard reset
…		…
515	set_font_style ();	494	set_font_style ();
516	break;	495	break;
517	}	496	}
518		497
519	/* boundary check in case screen size changed between SAVE and RESTORE */	498	/* boundary check in case screen size changed between SAVE and RESTORE */
520	MIN_IT (s->cur.row, nrow - 1);	499	min_it (s->cur.row, nrow - 1);
521	MIN_IT (s->cur.col, ncol - 1);	500	min_it (s->cur.col, ncol - 1);
522	#ifdef DEBUG_STRICT	501	#ifdef DEBUG_STRICT
523	assert (s->cur.row >= 0);	502	assert (s->cur.row >= 0);
524	assert (s->cur.col >= 0);	503	assert (s->cur.col >= 0);
525	#else /* drive with your eyes closed */
526	MAX_IT (s->cur.row, 0);
527	MAX_IT (s->cur.col, 0);
528	#endif	504	#endif
529	}	505	}
530		506
531	/* ------------------------------------------------------------------------- */	507	/* ------------------------------------------------------------------------- */
532	/*	508	/*
…		…
543	if (current_screen == scrn)	519	if (current_screen == scrn)
544	return scrn;	520	return scrn;
545		521
546	selection_check (2); /* check for boundary cross */	522	selection_check (2); /* check for boundary cross */
547		523
548	SWAP_IT (scrn, current_screen, int);	524	int i = current_screen; current_screen = scrn; scrn = i;
549		525
550	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);	526	::swap (screen.cur.row, swap.cur.row);
551	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);	527	::swap (screen.cur.col, swap.cur.col);
552	MAX_IT (screen.cur.row, 0);	528
553	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);	529	screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
554	MAX_IT (screen.cur.col, 0);	530	screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
555	MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
556		531
557	#if NSCREENS	532	#if NSCREENS
558	if (options & Opt_secondaryScreen)	533	if (OPTION (Opt_secondaryScreen))
559	{	534	{
560	num_scr = 0;	535	num_scr = 0;
561		536
562	for (int i = nrow; i--; )	537	for (int i = prev_nrow; i--; )
563	SWAP_IT (ROW(i), swap_save[i], line_t);	538	::swap (ROW(i), swap_buf [i]);
564		539
565	SWAP_IT (screen.charset, swap.charset, int16_t);	540	::swap (screen.charset, swap.charset);
566	SWAP_IT (screen.flags, swap.flags, int);	541	::swap (screen.flags, swap.flags);
567	screen.flags |= Screen_VisibleCursor;	542	screen.flags |= Screen_VisibleCursor;
568	swap.flags |= Screen_VisibleCursor;	543	swap.flags |= Screen_VisibleCursor;
569	}	544	}
570	else	545	else
571	#endif	546	#endif
572	if (options & Opt_secondaryScroll)	547	if (OPTION (Opt_secondaryScroll))
573	scr_scroll_text (0, prev_nrow - 1, prev_nrow);	548	scr_scroll_text (0, prev_nrow - 1, prev_nrow);
574		549
575	return scrn;	550	return scrn;
576	}	551	}
577		552
…		…
639	num_scr += count;	614	num_scr += count;
640		615
641	if (count > 0	616	if (count > 0
642	&& row1 == 0	617	&& row1 == 0
643	&& row2 == nrow - 1	618	&& row2 == nrow - 1
644	&& (current_screen == PRIMARY || options & Opt_secondaryScroll))	619	&& (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
645	{	620	{
646	nsaved = min (nsaved + count, saveLines);	621	nsaved = min (nsaved + count, saveLines);
		622
		623	PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
		624
647	term_start = (term_start + count) % total_rows;	625	term_start = (term_start + count) % total_rows;
648		626
649	if (selection.op && current_screen == selection.screen)	627	if (selection.op && current_screen == selection.screen)
650	{	628	{
651	selection.beg.row -= count;	629	selection.beg.row -= count;
652	selection.end.row -= count;	630	selection.end.row -= count;
653	selection.mark.row -= count;	631	selection.mark.row -= count;
654		632
655	selection_check (0);	633	if (selection.beg.row < -nsaved
		634	|| selection.end.row < -nsaved
		635	|| selection.mark.row < -nsaved)
		636	{
		637	CLEAR_ALL_SELECTION ();
		638	selection.op = SELECTION_CLEAR;
		639	}
656	}	640	}
657		641
658	for (int i = count; i--; )	642	for (int i = count; i--; )
		643	{
		644	ROW(row2 - i).l = 0;
659	scr_blank_screen_mem (ROW(row2 - i), rstyle);	645	scr_blank_screen_mem (ROW(row2 - i), rstyle);
		646	}
660		647
661	if ((options & Opt_scrollWithBuffer)	648	if (OPTION (Opt_scrollWithBuffer)
662	&& view_start != 0	649	&& view_start != 0
663	&& view_start != saveLines)	650	&& view_start != saveLines)
664	scr_page (UP, count);	651	scr_page (UP, count);
665	}	652	}
666	else	653	else
667	{	654	{
668	if (selection.op && current_screen == selection.screen)	655	if (selection.op && current_screen == selection.screen)
669	{	656	{
670	int i = selection.beg.row;	657	if ((selection.beg.row < row1 && selection.end.row > row1)
671	int j = selection.end.row;	658	|| (selection.beg.row < row2 && selection.end.row > row2)
672
673	if ((i < row1 && j > row1)
674	|| (i < row2 && j > row2)
675	|| (i - count < row1 && i >= row1)	659	|| (selection.beg.row - count < row1 && selection.beg.row >= row1)
676	|| (i - count > row2 && i <= row2)	660	|| (selection.beg.row - count > row2 && selection.beg.row <= row2)
677	|| (j - count < row1 && j >= row1)	661	|| (selection.end.row - count < row1 && selection.end.row >= row1)
678	|| (j - count > row2 && j <= row2))	662	|| (selection.end.row - count > row2 && selection.end.row <= row2))
679	{	663	{
680	CLEAR_ALL_SELECTION ();	664	CLEAR_ALL_SELECTION ();
681	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */	665	selection.op = SELECTION_CLEAR;
682	}	666	}
683	else if (j >= row1 && j <= row2)	667	else if (selection.end.row >= row1 && selection.end.row <= row2)
684	{	668	{
685	/* move selected region too */	669	/* move selected region too */
686	selection.beg.row -= count;	670	selection.beg.row -= count;
687	selection.end.row -= count;	671	selection.end.row -= count;
688	selection.mark.row -= count;	672	selection.mark.row -= count;
…		…
694	// use a simple and robust scrolling algorithm, this	678	// use a simple and robust scrolling algorithm, this
695	// part of scr_scroll_text is not time-critical.	679	// part of scr_scroll_text is not time-critical.
696		680
697	int rows = row2 - row1 + 1;	681	int rows = row2 - row1 + 1;
698		682
		683	min_it (count, rows);
		684
699	for (int row = 0; row < rows; row++)	685	for (int row = 0; row < rows; row++)
700	{	686	{
701	buf [row] = ROW(row1 + (row + count + rows) % rows);	687	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
702		688
703	if (!IN_RANGE_EXC (row + count, 0, rows))	689	if (!IN_RANGE_EXC (row + count, 0, rows))
704	scr_blank_screen_mem (buf [row], rstyle);	690	scr_blank_screen_mem (temp_buf [row], rstyle);
705	}	691	}
706		692
707	for (int row = 0; row < rows; row++)	693	for (int row = 0; row < rows; row++)
708	ROW(row1 + row) = buf [row];	694	ROW(row1 + row) = temp_buf [row];
709	}	695	}
710		696
711	return count;	697	return count;
712	}	698	}
713		699
…		…
721	if (len <= 0) /* sanity */	707	if (len <= 0) /* sanity */
722	return;	708	return;
723		709
724	unsigned char checksel;	710	unsigned char checksel;
725	unicode_t c;	711	unicode_t c;
726	int row, last_col;	712	int ncol = this->ncol;
727	const unicode_t *strend = str + len;	713	const unicode_t *strend = str + len;
728		714
729	want_refresh = 1;	715	want_refresh = 1;
730	ZERO_SCROLLBACK ();	716	ZERO_SCROLLBACK ();
731	last_col = ncol;
732		717
733	if (nlines > 0)	718	if (nlines > 0)
734	{	719	{
735	nlines += screen.cur.row - screen.bscroll;	720	nlines += screen.cur.row - screen.bscroll;
		721
736	if ((nlines > 0)	722	if (nlines > 0
737	&& (screen.tscroll == 0)	723	&& screen.tscroll == 0
738	&& (screen.bscroll == (nrow - 1)))	724	&& screen.bscroll == nrow - 1)
739	{	725	{
740	/* _at least_ this many lines need to be scrolled */	726	/* _at least_ this many lines need to be scrolled */
741	scr_scroll_text (screen.tscroll, screen.bscroll, nlines);	727	scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
742	screen.cur.row -= nlines;	728	screen.cur.row -= nlines;
743	}	729	}
744	}	730	}
745		731
746	#ifdef DEBUG_STRICT	732	#ifdef DEBUG_STRICT
747	assert (screen.cur.col < last_col);	733	assert (screen.cur.col < ncol);
748	assert ((screen.cur.row < nrow)	734	assert (screen.cur.row < nrow
749	&& (screen.cur.row >= - (int32_t)nsaved));	735	&& screen.cur.row >= -nsaved);
750	#else /* drive with your eyes closed */
751	MIN_IT (screen.cur.col, last_col - 1);
752	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
753	MAX_IT (screen.cur.row, - (int32_t)nsaved);
754	#endif	736	#endif
755	row = screen.cur.row;	737	int row = screen.cur.row;
756		738
757	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	739	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
758		740
759	line_t *line = &ROW(row);	741	line_t *line = &ROW(row);
760		742
…		…
762	{	744	{
763	c = *str++;	745	c = *str++;
764		746
765	if (c < 0x20)	747	if (c < 0x20)
766	if (c == C0_LF)	748	if (c == C0_LF)
767	{	749	{
768	if (!line->is_longer ()) /* XXX: think about this */
769	MAX_IT (line->l, screen.cur.col);	750	max_it (line->l, screen.cur.col);
770		751
771	screen.flags &= ~Screen_WrapNext;	752	screen.flags &= ~Screen_WrapNext;
772		753
773	if (screen.cur.row == screen.bscroll)	754	if (screen.cur.row == screen.bscroll)
774	scr_scroll_text (screen.tscroll, screen.bscroll, 1);	755	scr_scroll_text (screen.tscroll, screen.bscroll, 1);
…		…
778	line = &ROW(row); /* _must_ refresh */	759	line = &ROW(row); /* _must_ refresh */
779	continue;	760	continue;
780	}	761	}
781	else if (c == C0_CR)	762	else if (c == C0_CR)
782	{	763	{
783	if (!line->is_longer ()) /* XXX: think about this */
784	MAX_IT (line->l, screen.cur.col);	764	max_it (line->l, screen.cur.col);
785		765
786	screen.flags &= ~Screen_WrapNext;	766	screen.flags &= ~Screen_WrapNext;
787	screen.cur.col = 0;	767	screen.cur.col = 0;
788	continue;	768	continue;
789	}	769	}
…		…
806	CLEAR_SELECTION ();	786	CLEAR_SELECTION ();
807	}	787	}
808		788
809	if (screen.flags & Screen_WrapNext)	789	if (screen.flags & Screen_WrapNext)
810	{	790	{
		791	max_it (line->l, ncol);
811	line->set_is_longer ();	792	line->is_longer (1);
812		793
813	scr_do_wrap ();	794	scr_do_wrap ();
814		795
815	row = screen.cur.row;	796	row = screen.cur.row;
816	line = &ROW(row); /* _must_ refresh */	797	line = &ROW(row); /* _must_ refresh */
…		…
824	// do wcwidth before further replacements, as wcwidth might return -1	805	// do wcwidth before further replacements, as wcwidth might return -1
825	// for the line drawing characters below as they might be invalid in the current	806	// for the line drawing characters below as they might be invalid in the current
826	// locale.	807	// locale.
827	int width = c < 0x100 ? 1 : wcwidth (c);	808	int width = c < 0x100 ? 1 : wcwidth (c);
828		809
829	if (charsets[screen.charset] == '0') // DEC SPECIAL	810	if (charsets [screen.charset] == '0') // DEC SPECIAL
830	{	811	{
831	// vt100 special graphics and line drawing	812	// vt100 special graphics and line drawing
832	// 5f-7e standard vt100	813	// 5f-7e standard vt100
833	// 40-5e rxvt extension for extra curses acs chars	814	// 40-5e rxvt extension for extra curses acs chars
834	static uint16_t vt100_0[62] = { // 41 .. 7e	815	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
886	}	867	}
887		868
888	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	869	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
889		870
890	// if the character doesn't fit into the remaining columns...	871	// if the character doesn't fit into the remaining columns...
891	if (screen.cur.col > last_col - width && last_col >= width)	872	if (screen.cur.col > ncol - width && ncol >= width)
892	{	873	{
893	// ...output spaces	874	// ...output spaces
894	c = ' ';	875	c = ' ';
895	// and try the same character next loop iteration	876	// and try the same character next loop iteration
896	--str;	877	--str;
897	}	878	}
898		879
		880	line->touch ();
		881
899	do	882	do
900	{	883	{
901	line->t[screen.cur.col] = c;	884	line->t[screen.cur.col] = c;
902	line->r[screen.cur.col] = rend;	885	line->r[screen.cur.col] = rend;
903		886
904	if (screen.cur.col < last_col - 1)	887	if (screen.cur.col < ncol - 1)
905	screen.cur.col++;	888	screen.cur.col++;
906	else	889	else
907	{	890	{
908	line->l = last_col;	891	line->l = ncol;
909	if (screen.flags & Screen_Autowrap)	892	if (screen.flags & Screen_Autowrap)
910	screen.flags |= Screen_WrapNext;	893	screen.flags |= Screen_WrapNext;
911	break;	894	break;
912	}	895	}
913		896
…		…
915	}	898	}
916	while (--width > 0);	899	while (--width > 0);
917		900
918	// pad with spaces when overwriting wide character with smaller one	901	// pad with spaces when overwriting wide character with smaller one
919	if (!width)	902	if (!width)
		903	{
		904	line->touch ();
		905
920	for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)	906	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
921	{	907	{
922	line->t[c] = ' ';	908	line->t[c] = ' ';
923	line->r[c] = rend;	909	line->r[c] = rend;
924	}	910	}
		911	}
925	}	912	}
926	else // width == 0	913	else // width == 0
927	{	914	{
928	#if ENABLE_COMBINING	915	#if ENABLE_COMBINING
929	// handle combining characters	916	// handle combining characters
930	// we just tag the accent on the previous on-screen character.	917	// we just tag the accent on the previous on-screen character.
931	// this is arguably not correct, but also arguably not wrong.	918	// this is arguably not correct, but also arguably not wrong.
932	// we don't handle double-width characters nicely yet.	919	// we don't handle double-width characters nicely yet.
		920	line_t *linep;
933	text_t *tp;	921	text_t *tp;
934	rend_t *rp;	922	rend_t *rp;
935		923
936	if (screen.cur.col > 0)	924	if (screen.cur.col > 0)
937	{	925	{
		926	linep = line;
938	tp = line->t + screen.cur.col - 1;	927	tp = line->t + screen.cur.col - 1;
939	rp = line->r + screen.cur.col - 1;	928	rp = line->r + screen.cur.col - 1;
940
941	while (*tp == NOCHAR && tp > line->t)
942	tp--, rp--;
943	}	929	}
944	else if (screen.cur.row > 0	930	else if (screen.cur.row > 0
945	&& ROW(screen.cur.row - 1).is_longer ())	931	&& ROW(screen.cur.row - 1).is_longer ())
946	{	932	{
947	line_t *line = &ROW(screen.cur.row - 1);	933	linep = &ROW(screen.cur.row - 1);
948
949	tp = line->t + last_col - 1;	934	tp = line->t + ncol - 1;
950	rp = line->r + last_col - 1;	935	rp = line->r + ncol - 1;
951
952	while (*tp == NOCHAR && tp > line->t)
953	tp--, rp--;
954	}	936	}
955	else	937	else
956	continue;	938	continue;
		939
		940	linep->touch ();
		941
		942	while (*tp == NOCHAR && tp > linep->t)
		943	tp--, rp--;
957		944
958	// first try to find a precomposed character	945	// first try to find a precomposed character
959	unicode_t n = rxvt_compose (*tp, c);	946	unicode_t n = rxvt_compose (*tp, c);
960	if (n == NOCHAR)	947	if (n == NOCHAR)
961	n = rxvt_composite.compose (*tp, c);	948	n = rxvt_composite.compose (*tp, c);
…		…
964	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));	951	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
965	#endif	952	#endif
966	}	953	}
967	}	954	}
968		955
969	if (!line->is_longer ()) /* XXX: think about this */
970	MAX_IT (line->l, screen.cur.col);	956	max_it (line->l, screen.cur.col);
971		957
972	#ifdef DEBUG_STRICT	958	#ifdef DEBUG_STRICT
973	assert (screen.cur.row >= 0);	959	assert (screen.cur.row >= 0);
974	#else /* drive with your eyes closed */
975	MAX_IT (screen.cur.row, 0);
976	#endif	960	#endif
977	}	961	}
978		962
979	/* ------------------------------------------------------------------------- */	963	/* ------------------------------------------------------------------------- */
980	/*	964	/*
…		…
1019		1003
1020	if (count == 0)	1004	if (count == 0)
1021	return;	1005	return;
1022	else if (count > 0)	1006	else if (count > 0)
1023	{	1007	{
1024	int row = screen.cur.row;
1025
1026	line_t &l = ROW(row);	1008	line_t &l = ROW(screen.cur.row);
1027	rend_t base_rend = l.r[i];	1009	rend_t base_rend = l.r[i];
1028	ht &= l.t[i] == ' ';	1010	ht &= l.t[i] == ' ';
1029		1011
1030	for (; ++i < ncol; )	1012	for (; ++i < ncol; )
1031	if (tabs[i])	1013	if (tabs[i])
1032	{	1014	{
1033	x = i;	1015	x = i;
		1016
1034	if (!--count)	1017	if (!--count)
1035	break;	1018	break;
1036	}	1019	}
1037	else	1020	else
1038	ht &= l.t[i] == ' '	1021	ht &= l.t[i] == ' '
…		…
1041	if (count)	1024	if (count)
1042	x = ncol - 1;	1025	x = ncol - 1;
1043		1026
1044	// store horizontal tab commands as characters inside the text	1027	// store horizontal tab commands as characters inside the text
1045	// buffer so they can be selected and pasted.	1028	// buffer so they can be selected and pasted.
1046	if (ht && options & Opt_pastableTabs)	1029	if (ht && OPTION (Opt_pastableTabs))
1047	{	1030	{
1048	base_rend = SET_FONT (base_rend, 0);	1031	base_rend = SET_FONT (base_rend, 0);
1049		1032
1050	if (!l.is_longer ()) /* XXX: think about this */	1033	l.touch (x);
1051	MAX_IT (l.l, x);
1052		1034
1053	i = screen.cur.col;	1035	i = screen.cur.col;
1054		1036
1055	l.t[i] = '\t';	1037	l.t[i] = '\t';
1056	l.r[i] = base_rend;	1038	l.r[i] = base_rend;
…		…
1106	*/	1088	*/
1107	#if ENABLE_FRILLS	1089	#if ENABLE_FRILLS
1108	void	1090	void
1109	rxvt_term::scr_forwardindex ()	1091	rxvt_term::scr_forwardindex ()
1110	{	1092	{
1111	int row;
1112
1113	if (screen.cur.col < ncol - 1)	1093	if (screen.cur.col < ncol - 1)
1114	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1094	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1115	else	1095	else
1116	{	1096	{
1117	row = screen.cur.row;	1097	line_t &l = ROW(screen.cur.row);
1118		1098
1119	if (ROW(row).is_longer ()) //TODO//FIXME//LEN	1099	l.touch ();
1120	ROW(row).l = ncol;	1100	l.is_longer (0);
1121		1101
1122	scr_gotorc (0, 0, R_RELATIVE);	1102	scr_gotorc (0, 0, R_RELATIVE);
1123	scr_insdel_chars (1, DELETE);	1103	scr_insdel_chars (1, DELETE);
1124	scr_gotorc (0, ncol - 1, R_RELATIVE);	1104	scr_gotorc (0, ncol - 1, R_RELATIVE);
1125	}	1105	}
…		…
1135	{	1115	{
1136	want_refresh = 1;	1116	want_refresh = 1;
1137	ZERO_SCROLLBACK ();	1117	ZERO_SCROLLBACK ();
1138		1118
1139	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;	1119	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1140	MAX_IT (screen.cur.col, 0);	1120	clamp_it (screen.cur.col, 0, ncol - 1);
1141	MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1142		1121
1143	screen.flags &= ~Screen_WrapNext;	1122	screen.flags &= ~Screen_WrapNext;
1144		1123
1145	if (relative & R_RELATIVE)	1124	if (relative & R_RELATIVE)
1146	{	1125	{
…		…
1164	else	1143	else
1165	{	1144	{
1166	if (screen.flags & Screen_Relative)	1145	if (screen.flags & Screen_Relative)
1167	{ /* relative origin mode */	1146	{ /* relative origin mode */
1168	screen.cur.row = row + screen.tscroll;	1147	screen.cur.row = row + screen.tscroll;
1169	MIN_IT (screen.cur.row, screen.bscroll);	1148	min_it (screen.cur.row, screen.bscroll);
1170	}	1149	}
1171	else	1150	else
1172	screen.cur.row = row;	1151	screen.cur.row = row;
1173	}	1152	}
1174		1153
1175	MAX_IT (screen.cur.row, 0);	1154	clamp_it (screen.cur.row, 0, nrow - 1);
1176	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1177	}	1155	}
1178		1156
1179	/* ------------------------------------------------------------------------- */	1157	/* ------------------------------------------------------------------------- */
1180	/*	1158	/*
1181	* direction should be UP or DN	1159	* direction should be UP or DN
…		…
1196	|| (screen.cur.row == screen.tscroll && direction == DN))	1174	|| (screen.cur.row == screen.tscroll && direction == DN))
1197	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);	1175	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1198	else	1176	else
1199	screen.cur.row += dirn;	1177	screen.cur.row += dirn;
1200		1178
1201	MAX_IT (screen.cur.row, 0);	1179	clamp_it (screen.cur.row, 0, nrow - 1);
1202	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1203	selection_check (0);	1180	selection_check (0);
1204	}	1181	}
1205		1182
1206	/* ------------------------------------------------------------------------- */	1183	/* ------------------------------------------------------------------------- */
1207	/*	1184	/*
…		…
1211	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1188	* XTERM_SEQ: Clear whole line : ESC [ 2 K
1212	*/	1189	*/
1213	void	1190	void
1214	rxvt_term::scr_erase_line (int mode)	1191	rxvt_term::scr_erase_line (int mode)
1215	{	1192	{
1216	unsigned int row, col, num;	1193	unsigned int col, num;
1217		1194
1218	want_refresh = 1;	1195	want_refresh = 1;
1219	ZERO_SCROLLBACK ();	1196	ZERO_SCROLLBACK ();
1220		1197
1221	selection_check (1);	1198	selection_check (1);
1222		1199
1223	row = screen.cur.row;	1200	line_t &line = ROW(screen.cur.row);
		1201
		1202	line.touch ();
		1203	line.is_longer (0);
1224		1204
1225	switch (mode)	1205	switch (mode)
1226	{	1206	{
1227	case 0: /* erase to end of line */	1207	case 0: /* erase to end of line */
1228	col = screen.cur.col;	1208	col = screen.cur.col;
1229	num = ncol - col;	1209	num = ncol - col;
1230	MIN_IT (ROW(row).l, (int16_t)col);	1210	min_it (line.l, col);
1231	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1211	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1232	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1212	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1233	CLEAR_SELECTION ();	1213	CLEAR_SELECTION ();
1234	break;	1214	break;
1235	case 1: /* erase to beginning of line */	1215	case 1: /* erase to beginning of line */
…		…
1240	CLEAR_SELECTION ();	1220	CLEAR_SELECTION ();
1241	break;	1221	break;
1242	case 2: /* erase whole line */	1222	case 2: /* erase whole line */
1243	col = 0;	1223	col = 0;
1244	num = ncol;	1224	num = ncol;
1245	ROW(row).l = 0;	1225	line.l = 0;
1246	if (selection.beg.row <= screen.cur.row	1226	if (selection.beg.row <= screen.cur.row
1247	&& selection.end.row >= screen.cur.row)	1227	&& selection.end.row >= screen.cur.row)
1248	CLEAR_SELECTION ();	1228	CLEAR_SELECTION ();
1249	break;	1229	break;
1250	default:	1230	default:
1251	return;	1231	return;
1252	}	1232	}
1253		1233
1254	scr_blank_line (ROW(row), col, num, rstyle);	1234	scr_blank_line (line, col, num, rstyle);
1255	}	1235	}
1256		1236
1257	/* ------------------------------------------------------------------------- */	1237	/* ------------------------------------------------------------------------- */
1258	/*	1238	/*
1259	* Erase part of whole of the screen	1239	* Erase part of whole of the screen
…		…
1302	CLEAR_SELECTION ();	1282	CLEAR_SELECTION ();
1303		1283
1304	if (row >= nrow) /* Out Of Bounds */	1284	if (row >= nrow) /* Out Of Bounds */
1305	return;	1285	return;
1306		1286
1307	MIN_IT (num, (nrow - row));	1287	min_it (num, nrow - row);
1308		1288
1309	if (rstyle & (RS_RVid | RS_Uline))	1289	if (rstyle & (RS_RVid | RS_Uline))
1310	ren = (rend_t) ~RS_None;	1290	ren = (rend_t) ~RS_None;
1311	else if (GET_BASEBG (rstyle) == Color_bg)	1291	else if (GET_BASEBG (rstyle) == Color_bg)
1312	{	1292	{
…		…
1314	CLEAR_ROWS (row, num);	1294	CLEAR_ROWS (row, num);
1315	}	1295	}
1316	else	1296	else
1317	{	1297	{
1318	ren = rstyle & (RS_fgMask | RS_bgMask);	1298	ren = rstyle & (RS_fgMask | RS_bgMask);
1319	gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];	1299	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1320	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1300	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1321	ERASE_ROWS (row, num);	1301	ERASE_ROWS (row, num);
1322	gcvalue.foreground = pix_colors[Color_fg];	1302	gcvalue.foreground = pix_colors[Color_fg];
1323	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1303	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1324	}	1304	}
1325		1305
1326	for (; num--; row++)	1306	for (; num--; row++)
1327	{	1307	{
		1308	line_t &l = ROW(row);
		1309	l.l = 0;
		1310	l.is_longer (0);
1328	scr_blank_screen_mem (ROW (row), rstyle);	1311	scr_blank_screen_mem (l, rstyle);
1329	ROW (row).l = 0;
1330	scr_blank_line (drawn[row], 0, ncol, ren);	1312	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1331	}	1313	}
1332	}	1314	}
1333		1315
1334	#if ENABLE_FRILLS	1316	#if ENABLE_FRILLS
1335	void	1317	void
…		…
1367	rend_t *r1 = line.r;	1349	rend_t *r1 = line.r;
1368		1350
1369	for (int j = ncol; j--; )	1351	for (int j = ncol; j--; )
1370	*r1++ = fs;	1352	*r1++ = fs;
1371		1353
1372	line.l = ncol; /* make the `E's selectable */	1354	line.is_longer (0);
		1355	line.touch (ncol);
1373	}	1356	}
1374	}	1357	}
1375		1358
1376	/* ------------------------------------------------------------------------- */	1359	/* ------------------------------------------------------------------------- */
1377	/*	1360	/*
…		…
1420	return;	1403	return;
1421		1404
1422	scr_do_wrap ();	1405	scr_do_wrap ();
1423		1406
1424	selection_check (1);	1407	selection_check (1);
1425	MIN_IT (count, (ncol - screen.cur.col));	1408	min_it (count, ncol - screen.cur.col);
1426		1409
1427	row = screen.cur.row;	1410	row = screen.cur.row;
1428		1411
1429	line_t *line = &ROW(row);	1412	line_t *line = &ROW(row);
		1413
		1414	line->touch ();
		1415	line->is_longer (0);
1430		1416
1431	switch (insdel)	1417	switch (insdel)
1432	{	1418	{
1433	case INSERT:	1419	case INSERT:
1434	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1420	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1435	{	1421	{
1436	line->t[col] = line->t[col - count];	1422	line->t[col] = line->t[col - count];
1437	line->r[col] = line->r[col - count];	1423	line->r[col] = line->r[col - count];
1438	}	1424	}
1439		1425
1440	if (!line->is_longer ())	1426	line->l = min (line->l + count, ncol);
1441	{
1442	line->l += count;
1443	MIN_IT (line->l, ncol);
1444	}
1445		1427
1446	if (selection.op && current_screen == selection.screen	1428	if (selection.op && current_screen == selection.screen
1447	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1429	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1448	{	1430	{
1449	if (selection.end.row != screen.cur.row	1431	if (selection.end.row != screen.cur.row
…		…
1462		1444
1463	case ERASE:	1445	case ERASE:
1464	screen.cur.col += count; /* don't worry if > ncol */	1446	screen.cur.col += count; /* don't worry if > ncol */
1465	selection_check (1);	1447	selection_check (1);
1466	screen.cur.col -= count;	1448	screen.cur.col -= count;
		1449
		1450	line->l = max (line->l - count, 0);
1467	scr_blank_line (*line, screen.cur.col, count, rstyle);	1451	scr_blank_line (*line, screen.cur.col, count, rstyle);
1468	break;	1452	break;
1469		1453
1470	case DELETE:	1454	case DELETE:
1471	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1455	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
…		…
1474	{	1458	{
1475	line->t[col] = line->t[col + count];	1459	line->t[col] = line->t[col + count];
1476	line->r[col] = line->r[col + count];	1460	line->r[col] = line->r[col + count];
1477	}	1461	}
1478		1462
		1463	line->l = max (line->l - count, 0);
1479	scr_blank_line (*line, ncol - count, count, tr);	1464	scr_blank_line (*line, ncol - count, count, tr);
1480
1481	if (line->is_longer ()) /* break line continuation */
1482	line->l = ncol;
1483
1484	line->l = max (line->l - count, 0);
1485		1465
1486	if (selection.op && current_screen == selection.screen	1466	if (selection.op && current_screen == selection.screen
1487	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1467	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1488	{	1468	{
1489	if (selection.end.row != screen.cur.row	1469	if (selection.end.row != screen.cur.row
…		…
1509	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1489	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1510	*/	1490	*/
1511	void	1491	void
1512	rxvt_term::scr_scroll_region (int top, int bot)	1492	rxvt_term::scr_scroll_region (int top, int bot)
1513	{	1493	{
1514	MAX_IT (top, 0);	1494	max_it (top, 0);
1515	MIN_IT (bot, (int)nrow - 1);	1495	min_it (bot, nrow - 1);
1516		1496
1517	if (top > bot)	1497	if (top > bot)
1518	return;	1498	return;
1519		1499
1520	screen.tscroll = top;	1500	screen.tscroll = top;
…		…
1601	rxvt_term::scr_set_tab (int mode)	1581	rxvt_term::scr_set_tab (int mode)
1602	{	1582	{
1603	if (mode < 0)	1583	if (mode < 0)
1604	memset (tabs, 0, ncol * sizeof (char));	1584	memset (tabs, 0, ncol * sizeof (char));
1605	else if (screen.cur.col < ncol)	1585	else if (screen.cur.col < ncol)
1606	tabs[screen.cur.col] = (mode ? 1 : 0);	1586	tabs [screen.cur.col] = !!mode;
1607	}	1587	}
1608		1588
1609	/* ------------------------------------------------------------------------- */	1589	/* ------------------------------------------------------------------------- */
1610	/*	1590	/*
1611	* Set reverse/normal video	1591	* Set reverse/normal video
…		…
1618	XGCValues gcvalue;	1598	XGCValues gcvalue;
1619		1599
1620	if (rvideo != mode)	1600	if (rvideo != mode)
1621	{	1601	{
1622	rvideo = mode;	1602	rvideo = mode;
1623	SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);	1603	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1624	#if XPM_BACKGROUND	1604	#if XPM_BACKGROUND
1625	if (bgPixmap.pixmap == None)	1605	if (bgPixmap.pixmap == None)
1626	#endif	1606	#endif
1627	#if TRANSPARENT	1607	#if TRANSPARENT
1628	if (! (options & Opt_transparent) || am_transparent == 0)	1608	if (! OPTION (Opt_transparent) || am_transparent == 0)
1629	#endif	1609	#endif
1630	XSetWindowBackground (display->display, vt,	1610	XSetWindowBackground (display->display, vt,
1631	pix_colors[Color_bg]);	1611	pix_colors[Color_bg]);
1632		1612
1633	gcvalue.foreground = pix_colors[Color_fg];	1613	gcvalue.foreground = pix_colors[Color_fg];
…		…
1658	* Set font style	1638	* Set font style
1659	*/	1639	*/
1660	void	1640	void
1661	rxvt_term::set_font_style ()	1641	rxvt_term::set_font_style ()
1662	{	1642	{
		1643	#if 0
1663	switch (charsets[screen.charset])	1644	switch (charsets [screen.charset])
1664	{	1645	{
1665	case '0': /* DEC Special Character & Line Drawing Set */	1646	case '0': /* DEC Special Character & Line Drawing Set */
1666	break;	1647	break;
1667	case 'A': /* United Kingdom (UK) */	1648	case 'A': /* United Kingdom (UK) */
1668	break;	1649	break;
…		…
1675	case 'C': /* Finnish character set */	1656	case 'C': /* Finnish character set */
1676	break;	1657	break;
1677	case 'K': /* German character set */	1658	case 'K': /* German character set */
1678	break;	1659	break;
1679	}	1660	}
		1661	#endif
1680	}	1662	}
1681		1663
1682	/* ------------------------------------------------------------------------- */	1664	/* ------------------------------------------------------------------------- */
1683	/*	1665	/*
1684	* Choose a font	1666	* Choose a font
…		…
1724	bool found = false;	1706	bool found = false;
1725		1707
1726	for (int i = 0; i < nrow; i++)	1708	for (int i = 0; i < nrow; i++)
1727	{	1709	{
1728	int col = 0;	1710	int col = 0;
1729	rend_t *drp = drawn[i].r;	1711	rend_t *drp = drawn_buf[i].r;
1730		1712
1731	for (; col < ncol; col++, drp++)	1713	for (; col < ncol; col++, drp++)
1732	if ((*drp & mask) == value)	1714	if ((*drp & mask) == value)
1733	{	1715	{
1734	found = true;	1716	found = true;
…		…
1752	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)	1734	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1753	{	1735	{
1754	int i;	1736	int i;
1755	row_col_t rc[RC_COUNT];	1737	row_col_t rc[RC_COUNT];
1756		1738
1757	if (!drawn) /* sanity check */	1739	if (!drawn_buf) /* sanity check */
1758	return;	1740	return;
1759		1741
1760	#ifndef NO_SLOW_LINK_SUPPORT	1742	#ifndef NO_SLOW_LINK_SUPPORT
1761	if (refresh_type == FAST_REFRESH && !display->is_local)	1743	if (refresh_type == FAST_REFRESH && !display->is_local)
1762	{	1744	{
1763	y = 0;	1745	y = 0;
1764	eheight = height;	1746	eheight = height;
1765	}	1747	}
1766	#endif
1767
1768	#ifdef DEBUG_STRICT
1769	x = max (x, 0);
1770	x = min (x, (int)width);
1771	y = max (y, 0);
1772	y = min (y, (int)height);
1773	#endif	1748	#endif
1774		1749
1775	/* round down */	1750	/* round down */
1776	rc[PART_BEG].col = Pixel2Col (x);	1751	rc[PART_BEG].col = Pixel2Col (x);
1777	rc[PART_BEG].row = Pixel2Row (y);	1752	rc[PART_BEG].row = Pixel2Row (y);
…		…
1780	rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);	1755	rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1781		1756
1782	/* sanity checks */	1757	/* sanity checks */
1783	for (i = PART_BEG; i < RC_COUNT; i++)	1758	for (i = PART_BEG; i < RC_COUNT; i++)
1784	{	1759	{
1785	MIN_IT (rc[i].col, ncol - 1);	1760	min_it (rc[i].col, ncol - 1);
1786	MIN_IT (rc[i].row, nrow - 1);	1761	min_it (rc[i].row, nrow - 1);
1787	}	1762	}
1788		1763
1789	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1764	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1790	fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1765	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1791		1766
1792	if (refresh)	1767	if (refresh)
1793	scr_refresh (SLOW_REFRESH);	1768	scr_refresh (SLOW_REFRESH);
1794	}	1769	}
1795		1770
…		…
1858	int	1833	int
1859	rxvt_term::scr_changeview (unsigned int oldviewstart)	1834	rxvt_term::scr_changeview (unsigned int oldviewstart)
1860	{	1835	{
1861	if (view_start != oldviewstart)	1836	if (view_start != oldviewstart)
1862	{	1837	{
		1838	PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
		1839
1863	want_refresh = 1;	1840	want_refresh = 1;
1864	num_scr -= (view_start - oldviewstart);	1841	num_scr -= (view_start - oldviewstart);
1865	}	1842	}
1866		1843
1867	return (int) (view_start - oldviewstart);	1844	return (int)view_start - (int)oldviewstart;
1868	}	1845	}
1869		1846
1870	/* ------------------------------------------------------------------------- */	1847	/* ------------------------------------------------------------------------- */
1871	void	1848	void
1872	rxvt_term::scr_bell ()	1849	rxvt_term::scr_bell ()
1873	{	1850	{
1874	#ifndef NO_BELL	1851	#ifndef NO_BELL
1875		1852
1876	# ifndef NO_MAPALERT	1853	# ifndef NO_MAPALERT
1877	# ifdef MAPALERT_OPTION	1854	# ifdef MAPALERT_OPTION
1878	if (options & Opt_mapAlert)	1855	if (OPTION (Opt_mapAlert))
1879	# endif	1856	# endif
1880	XMapWindow (display->display, parent[0]);	1857	XMapWindow (display->display, parent[0]);
1881	# endif	1858	# endif
1882		1859
1883	if (options & Opt_visualBell)	1860	if (OPTION (Opt_visualBell))
1884	{	1861	{
1885	scr_rvideo_mode (!rvideo); /* refresh also done */	1862	scr_rvideo_mode (!rvideo); /* refresh also done */
1886	rxvt_usleep (VISUAL_BELL_DURATION);	1863	rxvt_usleep (VISUAL_BELL_DURATION);
1887	scr_rvideo_mode (!rvideo); /* refresh also done */	1864	scr_rvideo_mode (!rvideo); /* refresh also done */
1888	}	1865	}
…		…
1979		1956
1980	#if XPM_BACKGROUND	1957	#if XPM_BACKGROUND
1981	must_clear |= bgPixmap.pixmap != None;	1958	must_clear |= bgPixmap.pixmap != None;
1982	#endif	1959	#endif
1983	#if TRANSPARENT	1960	#if TRANSPARENT
1984	must_clear |= (options & Opt_transparent) && am_transparent;	1961	must_clear |= OPTION (Opt_transparent) && am_transparent;
1985	#endif	1962	#endif
1986	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	1963	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1987		1964
1988	/*	1965	/*
1989	* B: reverse any characters which are selected	1966	* B: reverse any characters which are selected
…		…
2013		1990
2014	crp = &ROW(screen.cur.row).r[col];	1991	crp = &ROW(screen.cur.row).r[col];
2015		1992
2016	if (showcursor && focus)	1993	if (showcursor && focus)
2017	{	1994	{
2018	if (options & Opt_cursorUnderline)	1995	if (OPTION (Opt_cursorUnderline))
2019	*crp ^= RS_Uline;	1996	*crp ^= RS_Uline;
2020	else	1997	else
2021	{	1998	{
2022	*crp ^= RS_RVid;	1999	*crp ^= RS_RVid;
2023		2000
…		…
2025	cc1 = *crp & (RS_fgMask | RS_bgMask);	2002	cc1 = *crp & (RS_fgMask | RS_bgMask);
2026	if (ISSET_PIXCOLOR (Color_cursor))	2003	if (ISSET_PIXCOLOR (Color_cursor))
2027	ccol1 = Color_cursor;	2004	ccol1 = Color_cursor;
2028	else	2005	else
2029	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2006	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2030	ccol1 = GET_FGCOLOR (rstyle);	2007	ccol1 = fgcolor_of (rstyle);
2031	#else	2008	#else
2032	ccol1 = Color_fg;	2009	ccol1 = Color_fg;
2033	#endif	2010	#endif
2034	if (ISSET_PIXCOLOR (Color_cursor2))	2011	if (ISSET_PIXCOLOR (Color_cursor2))
2035	ccol2 = Color_cursor2;	2012	ccol2 = Color_cursor2;
2036	else	2013	else
2037	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2014	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2038	ccol2 = GET_BGCOLOR (rstyle);	2015	ccol2 = bgcolor_of (rstyle);
2039	#else	2016	#else
2040	ccol2 = Color_bg;	2017	ccol2 = Color_bg;
2041	#endif	2018	#endif
2042	*crp = SET_FGCOLOR (*crp, ccol1);	2019	*crp = SET_FGCOLOR (*crp, ccol1);
2043	*crp = SET_BGCOLOR (*crp, ccol2);	2020	*crp = SET_BGCOLOR (*crp, ccol2);
…		…
2053	if (screen.cur.row + view_start != ocrow	2030	if (screen.cur.row + view_start != ocrow
2054	|| screen.cur.col != oldcursor.col)	2031	|| screen.cur.col != oldcursor.col)
2055	{	2032	{
2056	if (ocrow < nrow	2033	if (ocrow < nrow
2057	&& oldcursor.col < ncol)	2034	&& oldcursor.col < ncol)
2058	drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);	2035	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2059		2036
2060	if (focus || !showcursor)	2037	if (focus || !showcursor)
2061	oldcursor.row = -1;	2038	oldcursor.row = -1;
2062	else	2039	else
2063	setoldcursor = 1;	2040	setoldcursor = 1;
…		…
2076	oldcursor.col = screen.cur.col;	2053	oldcursor.col = screen.cur.col;
2077	}	2054	}
2078	}	2055	}
2079	}	2056	}
2080		2057
		2058	PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2081	#if ENABLE_OVERLAY	2059	#if ENABLE_OVERLAY
2082	scr_swap_overlay ();	2060	scr_swap_overlay ();
2083	#endif	2061	#endif
2084		2062
2085	#ifndef NO_SLOW_LINK_SUPPORT	2063	#ifndef NO_SLOW_LINK_SUPPORT
…		…
2102	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2080	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2103	{	2081	{
2104	if (row + i >= 0 && row + i < nrow && row + i != ocrow)	2082	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2105	{	2083	{
2106	line_t s = ROW(row - view_start);	2084	line_t s = ROW(row - view_start);
2107	line_t d = drawn[row];	2085	line_t d = drawn_buf[row];
2108	line_t d2 = drawn[row + i];	2086	line_t d2 = drawn_buf[row + i];
2109		2087
2110	for (nits = 0, col = ncol; col--; )	2088	for (nits = 0, col = ncol; col--; )
2111	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])	2089	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2112	nits--;	2090	nits--;
2113	else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])	2091	else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
…		…
2131		2109
2132	if (len != -1)	2110	if (len != -1)
2133	{	2111	{
2134	/* also comes here at end if needed because of >= above */	2112	/* also comes here at end if needed because of >= above */
2135	if (wlen < len)	2113	if (wlen < len)
2136	SWAP_IT (wlen, len, int);	2114	::swap (wlen, len);
2137		2115
2138	XCopyArea (display->display, vt, vt,	2116	XCopyArea (display->display, vt, vt,
2139	gc, 0, Row2Pixel (len + i),	2117	gc, 0, Row2Pixel (len + i),
2140	(unsigned int)TermWin_TotalWidth (),	2118	(unsigned int)this->width,
2141	(unsigned int)Height2Pixel (wlen - len + 1),	2119	(unsigned int)Height2Pixel (wlen - len + 1),
2142	0, Row2Pixel (len));	2120	0, Row2Pixel (len));
2143	len = -1;	2121	len = -1;
2144	}	2122	}
2145	}	2123	}
…		…
2151	*/	2129	*/
2152	for (row = 0; row < nrow; row++)	2130	for (row = 0; row < nrow; row++)
2153	{	2131	{
2154	text_t *stp = ROW(row - view_start).t;	2132	text_t *stp = ROW(row - view_start).t;
2155	rend_t *srp = ROW(row - view_start).r;	2133	rend_t *srp = ROW(row - view_start).r;
2156	text_t *dtp = drawn[row].t;	2134	text_t *dtp = drawn_buf[row].t;
2157	rend_t *drp = drawn[row].r;	2135	rend_t *drp = drawn_buf[row].r;
2158		2136
2159	/*	2137	/*
2160	* E2: OK, now the real pass	2138	* E2: OK, now the real pass
2161	*/	2139	*/
2162	int ypixel = (int)Row2Pixel (row);	2140	int ypixel = (int)Row2Pixel (row);
…		…
2224	count++, i--;	2202	count++, i--;
2225		2203
2226	/*	2204	/*
2227	* Determine the attributes for the string	2205	* Determine the attributes for the string
2228	*/	2206	*/
2229	int fore = GET_FGCOLOR (rend); // desired foreground	2207	int fore = fgcolor_of (rend); // desired foreground
2230	int back = GET_BGCOLOR (rend); // desired background	2208	int back = bgcolor_of (rend); // desired background
2231		2209
2232	// only do special processing if any attributes are set, which is rare	2210	// only do special processing if any attributes are set, which is unlikely
2233	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2211	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2234	{	2212	{
2235	#if ENABLE_STYLES	2213	#if ENABLE_STYLES
2236	// force redraw after "careful" characters to avoid pixel droppings	2214	// force redraw after "careful" characters to avoid pixel droppings
2237	if (srp[col] & RS_Careful && col < ncol - 1 && 0)	2215	if (srp[col] & RS_Careful && col < ncol - 1 && 0)
…		…
2273	fore = Color_UL;	2251	fore = Color_UL;
2274	#endif	2252	#endif
2275		2253
2276	if (invert)	2254	if (invert)
2277	{	2255	{
2278	SWAP_IT (fore, back, int);	2256	::swap (fore, back);
2279		2257
2280	#ifndef NO_BOLD_UNDERLINE_REVERSE	2258	#ifndef NO_BOLD_UNDERLINE_REVERSE
2281	if (ISSET_PIXCOLOR (Color_RV))	2259	if (ISSET_PIXCOLOR (Color_RV))
2282	back = Color_RV;	2260	back = Color_RV;
2283		2261
…		…
2348	} /* for (row....) */	2326	} /* for (row....) */
2349		2327
2350	#if ENABLE_OVERLAY	2328	#if ENABLE_OVERLAY
2351	scr_swap_overlay ();	2329	scr_swap_overlay ();
2352	#endif	2330	#endif
		2331	PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2353		2332
2354	/*	2333	/*
2355	* G: cleanup cursor and display outline cursor if necessary	2334	* G: cleanup cursor and display outline cursor if necessary
2356	*/	2335	*/
2357	if (showcursor)	2336	if (showcursor)
2358	{	2337	{
2359	if (focus)	2338	if (focus)
2360	{	2339	{
2361	if (options & Opt_cursorUnderline)	2340	if (OPTION (Opt_cursorUnderline))
2362	*crp ^= RS_Uline;	2341	*crp ^= RS_Uline;
2363	else	2342	else
2364	{	2343	{
2365	*crp ^= RS_RVid;	2344	*crp ^= RS_RVid;
2366	#ifndef NO_CURSORCOLOR	2345	#ifndef NO_CURSORCOLOR
…		…
2375		2354
2376	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2355	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2377	col--;	2356	col--;
2378		2357
2379	while (col + cursorwidth < ncol	2358	while (col + cursorwidth < ncol
2380	&& drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)	2359	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2381	cursorwidth++;	2360	cursorwidth++;
2382		2361
2383	#ifndef NO_CURSORCOLOR	2362	#ifndef NO_CURSORCOLOR
2384	if (ISSET_PIXCOLOR (Color_cursor))	2363	if (ISSET_PIXCOLOR (Color_cursor))
2385	XSetForeground (display->display, gc, pix_colors[Color_cursor]);	2364	XSetForeground (display->display, gc, pix_colors[Color_cursor]);
…		…
2404	num_scr = 0;	2383	num_scr = 0;
2405	num_scr_allow = 1;	2384	num_scr_allow = 1;
2406	}	2385	}
2407		2386
2408	void	2387	void
2409	rxvt_term::scr_remap_chars (const line_t &l)	2388	rxvt_term::scr_remap_chars (line_t &l)
2410	{	2389	{
2411	if (!l.t)	2390	if (!l.t)
2412	return;	2391	return;
2413		2392
		2393	l.touch (); // maybe a bit of an overkill, but its not performance-relevant
		2394
2414	for (int i = ncol; i--; )	2395	for (int i = ncol; i--; )
2415	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2396	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2416	}	2397	}
2417		2398
2418	void	2399	void
2419	rxvt_term::scr_remap_chars ()	2400	rxvt_term::scr_remap_chars ()
2420	{	2401	{
2421	for (int i = total_rows; i--; )	2402	for (int i = total_rows; i--; )
2422	scr_remap_chars (save[i]);	2403	scr_remap_chars (row_buf [i]);
2423		2404
2424	for (int i = nrow; i--; )	2405	for (int i = nrow; i--; )
2425	{	2406	{
2426	scr_remap_chars (drawn[i]);	2407	scr_remap_chars (drawn_buf [i]);
2427	scr_remap_chars (swap_save[i]);	2408	scr_remap_chars (swap_buf [i]);
2428	}	2409	}
2429	}	2410	}
2430		2411
2431	void	2412	void
2432	rxvt_term::scr_recolour ()	2413	rxvt_term::scr_recolour ()
…		…
2485		2466
2486	#if ENABLE_FRILLS	2467	#if ENABLE_FRILLS
2487	if (selection.rect)	2468	if (selection.rect)
2488	{	2469	{
2489	for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)	2470	for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
		2471	{
		2472	text_t *stp = ROW(row).t;
		2473	rend_t *srp = ROW(row).r;
		2474
2490	for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)	2475	for (col = selection.beg.col; col < selection.end.col; col++)
2491	srp[col] ^= RS_RVid;	2476	srp[col] ^= RS_RVid;
		2477
		2478	while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
		2479	srp[col] ^= RS_RVid | RS_Uline;
		2480
		2481	if (++col < selection.end.col)
		2482	srp[col] ^= RS_RVid | RS_Uline;
		2483	}
2492	}	2484	}
2493	else	2485	else
2494	#endif	2486	#endif
2495	{	2487	{
2496	if (selection.beg.row >= -view_start)	2488	if (selection.beg.row >= -view_start)
…		…
2499	row = selection.beg.row;	2491	row = selection.beg.row;
2500	}	2492	}
2501	else	2493	else
2502	{	2494	{
2503	col = 0;	2495	col = 0;
2504	row = view_start;	2496	row = -view_start;
2505	}	2497	}
2506		2498
2507	for (; row < min (selection.end.row, view_end); row++, col = 0)	2499	for (; row < min (selection.end.row, view_end); row++, col = 0)
2508	for (rend_t *srp = ROW(row).r; col < ncol; col++)	2500	for (rend_t *srp = ROW(row).r; col < ncol; col++)
2509	srp[col] ^= RS_RVid;	2501	srp[col] ^= RS_RVid;
…		…
2529	char r1[] = "\n";	2521	char r1[] = "\n";
2530		2522
2531	for (row = saveLines - nsaved;	2523	for (row = saveLines - nsaved;
2532	row < saveLines + nrow - 1; row++)	2524	row < saveLines + nrow - 1; row++)
2533	{	2525	{
2534	width = save[row].l >= 0 ? save[row].l	2526	width = row_buf[row].l >= 0 ? row_buf[row].l
2535	: ncol;	2527	: ncol;
2536	for (towrite = width; towrite; towrite -= wrote)	2528	for (towrite = width; towrite; towrite -= wrote)
2537	{	2529	{
2538	wrote = write (fd, & (save[row].t[width - towrite]),	2530	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2539	towrite);	2531	towrite);
2540	if (wrote < 0)	2532	if (wrote < 0)
2541	return; /* XXX: death, no report */	2533	return; /* XXX: death, no report */
2542	}	2534	}
2543	if (save[row].l >= 0)	2535	if (row_buf[row].l >= 0)
2544	if (write (fd, r1, 1) <= 0)	2536	if (write (fd, r1, 1) <= 0)
2545	return; /* XXX: death, no report */	2537	return; /* XXX: death, no report */
2546	}	2538	}
2547	}	2539	}
2548	#endif	2540	#endif
…		…
2580	/* ------------------------------------------------------------------------- */	2572	/* ------------------------------------------------------------------------- */
2581	/*	2573	/*
2582	* Paste a selection direct to the command fd	2574	* Paste a selection direct to the command fd
2583	*/	2575	*/
2584	void	2576	void
2585	rxvt_term::paste (unsigned char *data, unsigned int len)	2577	rxvt_term::paste (char *data, unsigned int len)
2586	{	2578	{
2587	/* convert normal newline chars into common keyboard Return key sequence */	2579	/* convert normal newline chars into common keyboard Return key sequence */
2588	for (unsigned int i = 0; i < len; i++)	2580	for (unsigned int i = 0; i < len; i++)
2589	if (data[i] == C0_LF)	2581	if (data[i] == C0_LF)
2590	data[i] = C0_CR;	2582	data[i] = C0_CR;
…		…
2734	{	2726	{
2735	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);	2727	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2736	char *s = rxvt_wcstombs (w);	2728	char *s = rxvt_wcstombs (w);
2737	free (w);	2729	free (w);
2738	// TODO: strlen == only the first element will be converted. well...	2730	// TODO: strlen == only the first element will be converted. well...
2739	paste ((unsigned char *)s, strlen (s));	2731	paste (s, strlen (s));
2740	free (s);	2732	free (s);
2741	}	2733	}
2742	else	2734	else
2743	#endif	2735	#endif
2744	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0	2736	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2745	&& cl)	2737	&& cl)
2746	{	2738	{
2747	for (int i = 0; i < cr; i++)	2739	for (int i = 0; i < cr; i++)
2748	paste ((unsigned char *)cl[i], strlen (cl[i]));	2740	paste (cl[i], strlen (cl[i]));
2749		2741
2750	XFreeStringList (cl);	2742	XFreeStringList (cl);
2751	}	2743	}
2752	else	2744	else
2753	paste (ct.value, ct.nitems); // paste raw	2745	paste ((char *)ct.value, ct.nitems); // paste raw
2754		2746
2755	bailout:	2747	bailout:
2756	XFree (ct.value);	2748	XFree (ct.value);
2757		2749
2758	if (selection_wait == Sel_normal)	2750	if (selection_wait == Sel_normal)
…		…
2796	return; /* outside window */	2788	return; /* outside window */
2797		2789
2798	if (selection.text)	2790	if (selection.text)
2799	{ /* internal selection */	2791	{ /* internal selection */
2800	char *str = rxvt_wcstombs (selection.text, selection.len);	2792	char *str = rxvt_wcstombs (selection.text, selection.len);
2801	paste ((unsigned char *)str, strlen (str));	2793	paste (str, strlen (str));
2802	free (str);	2794	free (str);
2803	return;	2795	return;
2804	}	2796	}
2805	else	2797	else
2806	{	2798	{
…		…
2898	selection.op = SELECTION_DONE;	2890	selection.op = SELECTION_DONE;
2899		2891
2900	if (selection.clicks == 4)	2892	if (selection.clicks == 4)
2901	return; /* nothing selected, go away */	2893	return; /* nothing selected, go away */
2902		2894
		2895	if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
		2896	return;
		2897
2903	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2898	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2904	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2899	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2905		2900
2906	int ofs = 0;	2901	int ofs = 0;
2907	int extra = 0;	2902	int extra = 0;
…		…
2919	col = selection.beg.col;	2914	col = selection.beg.col;
2920	end_col = ncol + 1;	2915	end_col = ncol + 1;
2921	}	2916	}
2922	else	2917	else
2923	#endif	2918	#endif
2924	end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN	2919	end_col = ROW(row).l;
2925		2920
2926	col = max (col, 0);	2921	col = max (col, 0);
2927		2922
2928	if (row == selection.end.row || selection.rect)	2923	if (row == selection.end.row
		2924	#if ENABLE_FRILLS
		2925	|| selection.rect
		2926	#endif
		2927	)
2929	end_col = min (end_col, selection.end.col);	2928	min_it (end_col, selection.end.col);
2930		2929
2931	t = ROW(row).t + col;	2930	t = ROW(row).t + col;
		2931
2932	for (; col < end_col; col++)	2932	for (; col < end_col; col++)
2933	{	2933	{
2934	if (*t == NOCHAR)	2934	if (*t == NOCHAR)
2935	t++;	2935	t++;
2936	#if ENABLE_COMBINING	2936	#if ENABLE_COMBINING
…		…
2952	#endif	2952	#endif
2953	else	2953	else
2954	new_selection_text[ofs++] = *t++;	2954	new_selection_text[ofs++] = *t++;
2955	}	2955	}
2956		2956
		2957	#if ENABLE_FRILLS
		2958	if (selection.rect)
		2959	{
		2960	while (ofs
		2961	&& new_selection_text[ofs - 1] != C0_LF
		2962	&& unicode::is_space (new_selection_text[ofs - 1]))
		2963	--ofs;
		2964
		2965	new_selection_text[ofs++] = C0_LF;
		2966	}
		2967	else
		2968	#endif
2957	if (!ROW(row).is_longer () && row != selection.end.row)	2969	if (!ROW(row).is_longer () && row != selection.end.row)
2958	new_selection_text[ofs++] = C0_LF;	2970	new_selection_text[ofs++] = C0_LF;
2959	}	2971	}
2960		2972
2961	if (end_col != selection.end.col)	2973	if (end_col != selection.end.col)
2962	new_selection_text[ofs++] = C0_LF;	2974	new_selection_text[ofs++] = C0_LF;
2963		2975
…		…
2973		2985
2974	// we usually allocate much more than necessary, so realloc it smaller again	2986	// we usually allocate much more than necessary, so realloc it smaller again
2975	selection.len = ofs;	2987	selection.len = ofs;
2976	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));	2988	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2977		2989
		2990	if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
		2991	return;
		2992
		2993	selection_grab (tm);
		2994	}
		2995
		2996	bool
		2997	rxvt_term::selection_grab (Time tm)
		2998	{
		2999	selection_time = tm;
		3000
2978	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);	3001	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2979	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)	3002	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
		3003	{
2980	display->set_selection_owner (this);	3004	display->set_selection_owner (this);
		3005	return true;
		3006	}
2981	else	3007	else
2982	rxvt_warn ("can't get primary selection, ignoring.\n");	3008	return false;
2983		3009
2984	#if 0	3010	#if 0
2985	XTextProperty ct;	3011	XTextProperty ct;
2986		3012
2987	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)	3013	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2988	{	3014	{
2989	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);	3015	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2990	XFree (ct.value);	3016	XFree (ct.value);
2991	}	3017	}
2992	#endif	3018	#endif
2993
2994	selection_time = tm;
2995	}	3019	}
2996		3020
2997	/* ------------------------------------------------------------------------- */	3021	/* ------------------------------------------------------------------------- */
2998	/*	3022	/*
2999	* Mark or select text based upon number of clicks: 1, 2, or 3	3023	* Mark or select text based upon number of clicks: 1, 2, or 3
…		…
3025	want_refresh = 1;	3049	want_refresh = 1;
3026		3050
3027	selection.mark.row = row - view_start;	3051	selection.mark.row = row - view_start;
3028	selection.mark.col = col;	3052	selection.mark.col = col;
3029		3053
3030	selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1);	3054	selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3031	selection.mark.col = min (max (selection.mark.col, 0), ncol - 1);	3055	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3032		3056
3033	while (selection.mark.col > 0	3057	while (selection.mark.col > 0
3034	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)	3058	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3035	--selection.mark.col;	3059	--selection.mark.col;
3036		3060
…		…
3121	}	3145	}
3122	}	3146	}
3123	break;	3147	break;
3124	}	3148	}
3125		3149
3126	Old_Word_Selection_You_Die:
3127	if (dirn == DN)	3150	if (dirn == DN)
3128	col++; /* put us on one past the end */	3151	col++; /* put us on one past the end */
3129		3152
3130	/* Poke the values back in */	3153	/* Poke the values back in */
3131	ret->row = row;	3154	ret->row = row;
…		…
3141	* flag == 2 ==> button 3 motion	3164	* flag == 2 ==> button 3 motion
3142	*/	3165	*/
3143	void	3166	void
3144	rxvt_term::selection_extend (int x, int y, int flag)	3167	rxvt_term::selection_extend (int x, int y, int flag)
3145	{	3168	{
3146	int col = min (max (Pixel2Col (x), 0), ncol);	3169	int col = clamp (Pixel2Col (x), 0, ncol);
3147	int row = min (max (Pixel2Row (y), 0), nrow - 1);	3170	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3148		3171
3149	/*	3172	/*
3150	* If we're selecting characters (single click) then we must check first	3173	* If we're selecting characters (single click) then we must check first
3151	* if we are at the same place as the original mark. If we are then	3174	* if we are at the same place as the original mark. If we are then
3152	* select nothing. Otherwise, if we're to the right of the mark, you have to	3175	* select nothing. Otherwise, if we're to the right of the mark, you have to
…		…
3308	else if (selection.clicks == 2)	3331	else if (selection.clicks == 2)
3309	{	3332	{
3310	if (ROWCOL_IS_AFTER (selection.end, selection.beg))	3333	if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3311	selection.end.col--;	3334	selection.end.col--;
3312		3335
		3336	if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
		3337	{
3313	selection_delimit_word (UP, &selection.beg, &selection.beg);	3338	selection_delimit_word (UP, &selection.beg, &selection.beg);
3314	selection_delimit_word (DN, &selection.end, &selection.end);	3339	selection_delimit_word (DN, &selection.end, &selection.end);
		3340	}
3315	}	3341	}
3316	else if (selection.clicks == 3)	3342	else if (selection.clicks == 3)
3317	{	3343	{
3318	#if ENABLE_FRILLS	3344	#if ENABLE_FRILLS
3319	if (options & Opt_tripleclickwords)	3345	if (OPTION (Opt_tripleclickwords))
3320	{	3346	{
3321	selection_delimit_word (UP, &selection.beg, &selection.beg);	3347	selection_delimit_word (UP, &selection.beg, &selection.beg);
3322		3348
3323	for (int end_row = selection.mark.row; end_row < nrow; end_row++)	3349	for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3324	{	3350	{
…		…
3365	}	3391	}
3366	}	3392	}
3367		3393
3368	#if ENABLE_FRILLS	3394	#if ENABLE_FRILLS
3369	if (selection.rect && selection.beg.col > selection.end.col)	3395	if (selection.rect && selection.beg.col > selection.end.col)
3370	SWAP_IT (selection.beg.col, selection.end.col, int);	3396	::swap (selection.beg.col, selection.end.col);
3371	#endif	3397	#endif
3372	}	3398	}
3373		3399
3374	#if ENABLE_FRILLS	3400	#if ENABLE_FRILLS
3375	void	3401	void
…		…
3385	{	3411	{
3386	stp = ROW(end_row).t;	3412	stp = ROW(end_row).t;
3387		3413
3388	while (--end_col >= 0)	3414	while (--end_col >= 0)
3389	{	3415	{
3390	if (stp[end_col] != ' '	3416	if (stp[end_col] != NOCHAR
3391	&& stp[end_col] != '\t'	3417	&& !unicode::is_space (stp[end_col]))
3392	&& stp[end_col] != NOCHAR)
3393	break;	3418	break;
3394	}	3419	}
3395		3420
3396	if (end_col >= 0	3421	if (end_col >= 0
3397	|| !ROW(end_row - 1).is_longer ())	3422	|| !ROW(end_row - 1).is_longer ())
…		…
3573	*/	3598	*/
3574	void	3599	void
3575	rxvt_term::pixel_position (int *x, int *y)	3600	rxvt_term::pixel_position (int *x, int *y)
3576	{	3601	{
3577	*x = Pixel2Col (*x);	3602	*x = Pixel2Col (*x);
3578	/* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */	3603	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3579	*y = Pixel2Row (*y);	3604	*y = Pixel2Row (*y);
3580	/* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */	3605	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3581	}	3606	}
3582		3607
3583	/* ------------------------------------------------------------------------- */	3608	/* ------------------------------------------------------------------------- */
3584	#ifdef USE_XIM	3609	#ifdef USE_XIM
3585	void	3610	void
…		…
3596		3621
3597	#if ENABLE_OVERLAY	3622	#if ENABLE_OVERLAY
3598	void	3623	void
3599	rxvt_term::scr_overlay_new (int x, int y, int w, int h)	3624	rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3600	{	3625	{
3601	if (nrow < 3 || ncol < 3)	3626	if (nrow < 1 || ncol < 1)
3602	return;	3627	return;
3603		3628
3604	want_refresh = 1;	3629	want_refresh = 1;
3605		3630
3606	scr_overlay_off ();	3631	scr_overlay_off ();
3607		3632
3608	if (x < 0) x = ncol - w;	3633	if (x < 0) x = ncol - w;
3609	if (y < 0) y = nrow - h;	3634	if (y < 0) y = nrow - h;
3610		3635
3611	// make space for border	3636	// make space for border
3612	w += 2; MIN_IT (w, ncol);	3637	w += 2; min_it (w, ncol);
3613	h += 2; MIN_IT (h, nrow);	3638	h += 2; min_it (h, nrow);
3614		3639
3615	x -= 1; MAX_IT (x, 0);	3640	x -= 1; clamp_it (x, 0, ncol - w);
3616	y -= 1; MAX_IT (y, 0);	3641	y -= 1; clamp_it (y, 0, nrow - h);
3617
3618	MIN_IT (x, ncol - w);
3619	MIN_IT (y, nrow - h);
3620		3642
3621	ov_x = x; ov_y = y;	3643	ov_x = x; ov_y = y;
3622	ov_w = w; ov_h = h;	3644	ov_w = w; ov_h = h;
3623		3645
3624	ov_text = new text_t *[h];	3646	ov_text = new text_t *[h];
…		…
3716	for (int y = ov_h; y--; )	3738	for (int y = ov_h; y--; )
3717	{	3739	{
3718	text_t *t1 = ov_text[y];	3740	text_t *t1 = ov_text[y];
3719	rend_t *r1 = ov_rend[y];	3741	rend_t *r1 = ov_rend[y];
3720		3742
3721	text_t *t2 = ROW(y - view_start).t + ov_x;	3743	text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3722	rend_t *r2 = ROW(y - view_start).r + ov_x;	3744	rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3723		3745
3724	for (int x = ov_w; x--; )	3746	for (int x = ov_w; x--; )
3725	{	3747	{
3726	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3748	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3727	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3749	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