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.177 by root, Tue Dec 20 21:49:55 2005 UTC vs.
Revision 1.209 by root, Thu Jan 5 01:04:10 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() \
…		…
83	#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \	84	#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
84	ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)	85	ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
85	#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \	86	#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
86	ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)	87	ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87		88
88	#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
89	#define ROW(n) (save [LINENO (n)])
90
91	/*	89	/*
92	* CLEAR_ROWS : clear <num> rows starting from row <row>	90	* CLEAR_ROWS : clear <num> rows starting from row <row>
93	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>	91	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
94	* ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour	92	* ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
95	*/	93	*/
…		…
150	}	148	}
151		149
152	/* ------------------------------------------------------------------------- *	150	/* ------------------------------------------------------------------------- *
153	* SCREEN INITIALISATION *	151	* SCREEN INITIALISATION *
154	* ------------------------------------------------------------------------- */	152	* ------------------------------------------------------------------------- */
		153
155	void	154	void
156	rxvt_term::scr_reset ()	155	rxvt_term::scr_reset ()
157	{	156	{
158	unsigned int p, q;
159	int k;
160
161	#if ENABLE_OVERLAY	157	#if ENABLE_OVERLAY
162	scr_overlay_off ();	158	scr_overlay_off ();
163	#endif	159	#endif
164		160
165	view_start = 0;	161	view_start = 0;
…		…
175	return;	171	return;
176		172
177	// we need at least two lines for wrapping to work correctly	173	// we need at least two lines for wrapping to work correctly
178	if (nrow + saveLines < 2)	174	if (nrow + saveLines < 2)
179	{	175	{
		176	//TODO//FIXME
180	saveLines++;	177	saveLines++;
181	prev_nrow--;	178	prev_nrow--;
182	nsaved++;	179	nsaved++;
183	}	180	}
184		181
…		…
188	total_rows = nrow + saveLines;	185	total_rows = nrow + saveLines;
189		186
190	screen.tscroll = 0;	187	screen.tscroll = 0;
191	screen.bscroll = nrow - 1;	188	screen.bscroll = nrow - 1;
192		189
193	if (!save)	190	if (!row_buf)
194	{	191	{
195	/*	192	/*
196	* first time called so just malloc everything: don't rely on realloc	193	* first time called so just malloc everything: don't rely on realloc
197	* Note: this is still needed so that all the scrollback lines are NULL	194	* Note: this is still needed so that all the scrollback lines are NULL
198	*/	195	*/
…		…
200	term_start = 0;	197	term_start = 0;
201		198
202	talloc = new rxvt_salloc (ncol * sizeof (text_t));	199	talloc = new rxvt_salloc (ncol * sizeof (text_t));
203	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));	200	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
204		201
205	save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206	buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));	202	row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
		203	temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
207	drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t));	204	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208	swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t));	205	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209		206
210	for (p = nrow; p--; )	207	for (int row = nrow; row--; )
211	{	208	{
212	scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE);	209	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213	scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);	210	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214	scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);	211	scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215	}	212	}
216		213
217	memset (charsets, 'B', sizeof (charsets));	214	memset (charsets, 'B', sizeof (charsets));
218	rstyle = DEFAULT_RSTYLE;	215	rstyle = DEFAULT_RSTYLE;
219	screen.flags = Screen_DefaultFlags;	216	screen.flags = Screen_DefaultFlags;
…		…
243	{	240	{
244	/*	241	/*
245	* add or delete rows as appropriate	242	* add or delete rows as appropriate
246	*/	243	*/
247		244
248	rxvt_salloc *old_ta;	245	rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
249	rxvt_salloc *old_ra;	246	rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250		247
		248	#if 0
251	if (nrow < prev_nrow)	249	if (nrow < prev_nrow)
252	{	250	{
253	/* delete rows */
254	k = min (nsaved, prev_nrow - nrow);
255	// k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
256	scr_scroll_text (0, (int)prev_nrow - 1, k);
257
258	for (p = nrow; p < prev_nrow; p++)	251	for (int row = nrow; row < prev_nrow; row++)
259	{	252	{
260	lfree (ROW(p));
261	lfree (swap_save[p]);	253	lfree (swap_buf [row]);
262	lfree (drawn[p]);	254	lfree (drawn_buf[row]);
263	}	255	}
		256	}
		257	#endif
264		258
265	/* we have fewer rows so fix up cursor position */	259	drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
266	MIN_IT (screen.cur.row, (int32_t)nrow - 1);	260	temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
		261	swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267		262
268	scr_reset_realloc (); /* realloc _last_ */	263	for (int row = min (nrow, prev_nrow); row--; )
		264	{
		265	lresize (drawn_buf[row]);
		266	lresize (swap_buf [row]);
		267	}
		268
		269	for (int row = prev_nrow; row < nrow; row++)
		270	{
		271	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
		272	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
		273	}
		274
		275	line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
269	}	276
270	else if (nrow > prev_nrow)	277	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
		278	int pend = MOD (term_start - nsaved , prev_total_rows);
		279	int q = total_rows; // rewrapped row
		280
		281	if (nsaved)
		282	{
		283	// re-wrap lines, this is rather ugly, possibly because I am too dumb
		284	// to come up with a lean and mean algorithm.
		285
		286	row_col_t ocur = screen.cur;
		287	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
		288
271	{	289	do
272	/* add rows */
273	scr_reset_realloc (); /* realloc _first_ */
274
275	int ocol = ncol;
276	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
277
278	k = min (nsaved, nrow - prev_nrow);
279
280	for (p = prev_total_rows; p < total_rows; p++)
281	save[p].clear ();
282
283	for (p = prev_total_rows; p < total_rows - k; p++)
284	scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
285
286	for (p = prev_nrow; p < nrow; p++)
287	{	290	{
288	swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);	291	p = MOD (p - 1, prev_total_rows);
289	drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
290	}
291
292	if (k > 0)
293	{
294	scr_scroll_text (0, (int)nrow - 1, -k);
295	screen.cur.row += k;
296	screen.s_cur.row += k;
297	nsaved -= k;
298	}
299
300	#ifdef DEBUG_STRICT	292	#ifdef DEBUG_STRICT
301	assert (screen.cur.row < nrow);	293	assert (old_buf [MOD (p, prev_total_rows)].t);
302	#else /* drive with your eyes closed */
303	MIN_IT (screen.cur.row, nrow - 1);
304	#endif	294	#endif
305	ncol = ocol; // save b/c scr_blank_screen_mem uses this
306	}
307		295
308	/* resize columns */
309	if (ncol != prev_ncol)
310	{
311	old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
312	old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
313
314	for (p = total_rows; p--; )
315	lresize (save[p]);
316
317	for (p = nrow; p--; )
318	{
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;	296	int plines = 1;
		297	int llen = old_buf [MOD (p, prev_total_rows)].l;
352		298
353	assert (llen >= 0);	299	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
354
355	while (p && save[p - 1].l < 0)
356	{	300	{
		301	p = MOD (p - 1, prev_total_rows);
		302
357	--p;	303	plines++;
358	llen += prev_ncol;	304	llen += prev_ncol;
359	}	305	}
360		306
361	int qlines = llen / ncol + 1;	307	int qlines = max (0, (llen - 1) / ncol) + 1;
		308
		309	// drop partial lines completely
		310	if (q < qlines)
		311	break;
		312
		313	q -= qlines;
		314
362	int lofs = 0;	315	int lofs = 0;
		316	line_t *qline;
363		317
364	q -= qlines;	318	// re-assemble the full line by destination lines
365
366	int qrow = q;
367
368	printf ("QL %d llen %d\n", qlines, llen);//D
369	for (; qlines--; qrow++)	319	for (int qrow = q; qlines--; qrow++)
370	{	320	{
		321	qline = row_buf + qrow;
		322	lalloc (*qline);
		323	qline->set_is_longer ();
		324
371	if (qrow >= 0)	325	int qcol = 0;
		326
		327	// fill a single destination line
		328	while (lofs < llen && qcol < ncol)
372	{	329	{
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;	330	int prow = lofs / prev_ncol;
382	int pcol = lofs % prev_ncol;	331	int pcol = lofs % prev_ncol;
383		332
		333	prow = MOD (p + prow, prev_total_rows);
		334
		335	// we only adjust the cursor _row_ and put it into
		336	// the topmost line of "long line" it was in, as
		337	// this seems to upset applications/shells/readline
		338	// least.
		339	if (prow == ocur.row)
		340	screen.cur.row = q - (total_rows - nrow);
		341
		342	line_t &pline = old_buf [prow];
		343
384	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	344	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385		345
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);	346	assert (len);
		347	assert (pline.t);
400		348
401	memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t));	349	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402	memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t));	350	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403		351
404	lofs += len;	352	lofs += len;
405	qcol += len;	353	qcol += len;
406
407	if (qcol == ncol)
408	break;
409	}
410	}	354	}
411	else
412	lofs += ncol;
413	}	355	}
		356
		357	qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
		358	#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY
		359	if (qline->l < 0)
		360	{
		361	fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
		362	qline->l = 0;
		363	}
		364	#endif
		365	scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414	}	366	}
		367	while (p != pend && q > 0);
		368
		369	term_start = total_rows - nrow;
		370	nsaved = term_start - q;
		371
		372	// make sure all terminal lines exist
		373	while (nsaved < 0)
		374	scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
		375
		376	}
		377	else
415	}	378	{
		379	// if no scrollback exists (yet), wing, instead of wrap
		380
		381	for (int row = min (nrow, prev_nrow); row--; )
		382	{
		383	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
		384	line_t &qline = row_buf [row];
416		385
417	free (screen.text); screen.text = tp;	386	qline = pline;
418	free (screen.rend); screen.rend = rp;	387	lresize (qline);
419	free (screen.tlen); screen.tlen = tl;	388	}
420		389
421	for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D	390	for (int row = prev_nrow; row < nrow; row++)
		391	{
		392	row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
		393	}
		394
		395	term_start = 0;
		396	}
		397
		398	#ifdef DEBUG_STRICT //TODO: remove
		399	for (int i = -nsaved; i < nrow; i++)
		400	assert (ROW (i).t);
422	#endif	401	#endif
		402
		403	free (old_buf);
		404	delete old_ta;
		405	delete old_ra;
		406
		407	clamp_it (screen.cur.row, 0, nrow - 1);
		408	clamp_it (screen.cur.col, 0, ncol - 1);
423		409
424	if (tabs)	410	if (tabs)
425	free (tabs);	411	free (tabs);
426	}	412	}
427		413
428	prev_nrow = nrow;	414	prev_nrow = nrow;
429	prev_ncol = ncol;	415	prev_ncol = ncol;
430		416
431	tabs = (char *)rxvt_malloc (ncol * sizeof (char));	417	tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432		418
433	for (p = 0; p < ncol; p++)	419	for (int col = ncol; col--; )
434	tabs[p] = (p % TABSIZE == 0) ? 1 : 0;	420	tabs [col] = col % TABSIZE == 0;
435		421
436	tt_winch ();	422	tt_winch ();
437	}
438		423
439	void	424	PERL_INVOKE ((this, HOOK_RESET, DT_END));
440	rxvt_term::scr_reset_realloc ()
441	{
442	swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
443	drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
444	buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
445	save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
446	}	425	}
447		426
448	/* ------------------------------------------------------------------------- */	427	/* ------------------------------------------------------------------------- */
449	/*	428	/*
450	* Free everything. That way malloc debugging can find leakage.	429	* Free everything. That way malloc debugging can find leakage.
…		…
453	rxvt_term::scr_release ()	432	rxvt_term::scr_release ()
454	{	433	{
455	delete talloc; talloc = 0;	434	delete talloc; talloc = 0;
456	delete ralloc; ralloc = 0;	435	delete ralloc; ralloc = 0;
457		436
458	free (save);	437	free (row_buf);
459	free (swap_save);	438	free (swap_buf);
460	free (drawn);	439	free (drawn_buf);
461	free (buf);	440	free (temp_buf);
462	free (tabs);	441	free (tabs);
		442
		443	row_buf = 0; // signal that we freed all the arrays
463	}	444	}
464		445
465	/* ------------------------------------------------------------------------- */	446	/* ------------------------------------------------------------------------- */
466	/*	447	/*
467	* Hard reset	448	* Hard reset
…		…
518	set_font_style ();	499	set_font_style ();
519	break;	500	break;
520	}	501	}
521		502
522	/* boundary check in case screen size changed between SAVE and RESTORE */	503	/* boundary check in case screen size changed between SAVE and RESTORE */
523	MIN_IT (s->cur.row, nrow - 1);	504	min_it (s->cur.row, nrow - 1);
524	MIN_IT (s->cur.col, ncol - 1);	505	min_it (s->cur.col, ncol - 1);
525	#ifdef DEBUG_STRICT	506	#ifdef DEBUG_STRICT
526	assert (s->cur.row >= 0);	507	assert (s->cur.row >= 0);
527	assert (s->cur.col >= 0);	508	assert (s->cur.col >= 0);
528	#else /* drive with your eyes closed */
529	MAX_IT (s->cur.row, 0);
530	MAX_IT (s->cur.col, 0);
531	#endif	509	#endif
532	}	510	}
533		511
534	/* ------------------------------------------------------------------------- */	512	/* ------------------------------------------------------------------------- */
535	/*	513	/*
…		…
546	if (current_screen == scrn)	524	if (current_screen == scrn)
547	return scrn;	525	return scrn;
548		526
549	selection_check (2); /* check for boundary cross */	527	selection_check (2); /* check for boundary cross */
550		528
551	SWAP_IT (scrn, current_screen, int);	529	int i = current_screen; current_screen = scrn; scrn = i;
552		530
553	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);	531	::swap (screen.cur.row, swap.cur.row);
554	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);	532	::swap (screen.cur.col, swap.cur.col);
555	MAX_IT (screen.cur.row, 0);	533
556	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);	534	screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
557	MAX_IT (screen.cur.col, 0);	535	screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
558	MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
559		536
560	#if NSCREENS	537	#if NSCREENS
561	if (options & Opt_secondaryScreen)	538	if (OPTION (Opt_secondaryScreen))
562	{	539	{
563	num_scr = 0;	540	num_scr = 0;
564		541
565	for (int i = nrow; i--; )	542	for (int i = prev_nrow; i--; )
566	SWAP_IT (ROW(i), swap_save[i], line_t);	543	::swap (ROW(i), swap_buf [i]);
567		544
568	SWAP_IT (screen.charset, swap.charset, int16_t);	545	::swap (screen.charset, swap.charset);
569	SWAP_IT (screen.flags, swap.flags, int);	546	::swap (screen.flags, swap.flags);
570	screen.flags |= Screen_VisibleCursor;	547	screen.flags |= Screen_VisibleCursor;
571	swap.flags |= Screen_VisibleCursor;	548	swap.flags |= Screen_VisibleCursor;
572	}	549	}
573	else	550	else
574	#endif	551	#endif
575	if (options & Opt_secondaryScroll)	552	if (OPTION (Opt_secondaryScroll))
576	scr_scroll_text (0, prev_nrow - 1, prev_nrow);	553	scr_scroll_text (0, prev_nrow - 1, prev_nrow);
577		554
578	return scrn;	555	return scrn;
579	}	556	}
580		557
…		…
642	num_scr += count;	619	num_scr += count;
643		620
644	if (count > 0	621	if (count > 0
645	&& row1 == 0	622	&& row1 == 0
646	&& row2 == nrow - 1	623	&& row2 == nrow - 1
647	&& (current_screen == PRIMARY || options & Opt_secondaryScroll))	624	&& (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
648	{	625	{
649	nsaved = min (nsaved + count, saveLines);	626	nsaved = min (nsaved + count, saveLines);
		627
		628	PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
		629
650	term_start = (term_start + count) % total_rows;	630	term_start = (term_start + count) % total_rows;
651		631
652	if (selection.op && current_screen == selection.screen)	632	if (selection.op && current_screen == selection.screen)
653	{	633	{
654	selection.beg.row -= count;	634	selection.beg.row -= count;
655	selection.end.row -= count;	635	selection.end.row -= count;
656	selection.mark.row -= count;	636	selection.mark.row -= count;
657		637
658	selection_check (0);	638	if (selection.beg.row < -nsaved
		639	|| selection.end.row < -nsaved
		640	|| selection.mark.row < -nsaved)
		641	{
		642	CLEAR_ALL_SELECTION ();
		643	selection.op = SELECTION_CLEAR;
		644	}
659	}	645	}
660		646
661	for (int i = count; i--; )	647	for (int i = count; i--; )
		648	{
		649	ROW(row2 - i).l = 0;
662	scr_blank_screen_mem (ROW(row2 - i), rstyle);	650	scr_blank_screen_mem (ROW(row2 - i), rstyle);
		651	}
663		652
664	if ((options & Opt_scrollWithBuffer)	653	if (OPTION (Opt_scrollWithBuffer)
665	&& view_start != 0	654	&& view_start != 0
666	&& view_start != saveLines)	655	&& view_start != saveLines)
667	scr_page (UP, count);	656	scr_page (UP, count);
668	}	657	}
669	else	658	else
670	{	659	{
671	if (selection.op && current_screen == selection.screen)	660	if (selection.op && current_screen == selection.screen)
672	{	661	{
673	int i = selection.beg.row;	662	if ((selection.beg.row < row1 && selection.end.row > row1)
674	int j = selection.end.row;	663	|| (selection.beg.row < row2 && selection.end.row > row2)
675
676	if ((i < row1 && j > row1)
677	|| (i < row2 && j > row2)
678	|| (i - count < row1 && i >= row1)	664	|| (selection.beg.row - count < row1 && selection.beg.row >= row1)
679	|| (i - count > row2 && i <= row2)	665	|| (selection.beg.row - count > row2 && selection.beg.row <= row2)
680	|| (j - count < row1 && j >= row1)	666	|| (selection.end.row - count < row1 && selection.end.row >= row1)
681	|| (j - count > row2 && j <= row2))	667	|| (selection.end.row - count > row2 && selection.end.row <= row2))
682	{	668	{
683	CLEAR_ALL_SELECTION ();	669	CLEAR_ALL_SELECTION ();
684	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */	670	selection.op = SELECTION_CLEAR;
685	}	671	}
686	else if (j >= row1 && j <= row2)	672	else if (selection.end.row >= row1 && selection.end.row <= row2)
687	{	673	{
688	/* move selected region too */	674	/* move selected region too */
689	selection.beg.row -= count;	675	selection.beg.row -= count;
690	selection.end.row -= count;	676	selection.end.row -= count;
691	selection.mark.row -= count;	677	selection.mark.row -= count;
…		…
697	// use a simple and robust scrolling algorithm, this	683	// use a simple and robust scrolling algorithm, this
698	// part of scr_scroll_text is not time-critical.	684	// part of scr_scroll_text is not time-critical.
699		685
700	int rows = row2 - row1 + 1;	686	int rows = row2 - row1 + 1;
701		687
		688	min_it (count, rows);
		689
702	for (int row = 0; row < rows; row++)	690	for (int row = 0; row < rows; row++)
703	{	691	{
704	buf [row] = ROW(row1 + (row + count + rows) % rows);	692	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
705		693
706	if (!IN_RANGE_EXC (row + count, 0, rows))	694	if (!IN_RANGE_EXC (row + count, 0, rows))
707	scr_blank_screen_mem (buf [row], rstyle);	695	scr_blank_screen_mem (temp_buf [row], rstyle);
708	}	696	}
709		697
710	for (int row = 0; row < rows; row++)	698	for (int row = 0; row < rows; row++)
711	ROW(row1 + row) = buf [row];	699	ROW(row1 + row) = temp_buf [row];
712	}	700	}
713		701
714	return count;	702	return count;
715	}	703	}
716		704
…		…
724	if (len <= 0) /* sanity */	712	if (len <= 0) /* sanity */
725	return;	713	return;
726		714
727	unsigned char checksel;	715	unsigned char checksel;
728	unicode_t c;	716	unicode_t c;
729	int row, last_col;	717	int last_col;
730	const unicode_t *strend = str + len;	718	const unicode_t *strend = str + len;
731		719
732	want_refresh = 1;	720	want_refresh = 1;
733	ZERO_SCROLLBACK ();	721	ZERO_SCROLLBACK ();
734	last_col = ncol;	722	last_col = ncol;
735		723
736	if (nlines > 0)	724	if (nlines > 0)
737	{	725	{
738	nlines += screen.cur.row - screen.bscroll;	726	nlines += screen.cur.row - screen.bscroll;
		727
739	if ((nlines > 0)	728	if (nlines > 0
740	&& (screen.tscroll == 0)	729	&& screen.tscroll == 0
741	&& (screen.bscroll == (nrow - 1)))	730	&& screen.bscroll == (nrow - 1))
742	{	731	{
743	/* _at least_ this many lines need to be scrolled */	732	/* _at least_ this many lines need to be scrolled */
744	scr_scroll_text (screen.tscroll, screen.bscroll, nlines);	733	scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
745	screen.cur.row -= nlines;	734	screen.cur.row -= nlines;
746	}	735	}
747	}	736	}
748		737
749	#ifdef DEBUG_STRICT	738	#ifdef DEBUG_STRICT
750	assert (screen.cur.col < last_col);	739	assert (screen.cur.col < last_col);
751	assert ((screen.cur.row < nrow)	740	assert (screen.cur.row < nrow
752	&& (screen.cur.row >= - (int32_t)nsaved));	741	&& screen.cur.row >= -nsaved);
753	#else /* drive with your eyes closed */
754	MIN_IT (screen.cur.col, last_col - 1);
755	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
756	MAX_IT (screen.cur.row, - (int32_t)nsaved);
757	#endif	742	#endif
758	row = screen.cur.row;	743	int row = screen.cur.row;
759		744
760	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	745	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
761		746
762	line_t *line = &ROW(row);	747	line_t *line = &ROW(row);
763		748
…		…
765	{	750	{
766	c = *str++;	751	c = *str++;
767		752
768	if (c < 0x20)	753	if (c < 0x20)
769	if (c == C0_LF)	754	if (c == C0_LF)
770	{	755	{
771	if (!line->is_longer ()) /* XXX: think about this */	756	if (!line->is_longer ()) /* XXX: think about this */
772	MAX_IT (line->l, screen.cur.col);	757	max_it (line->l, screen.cur.col);
773		758
774	screen.flags &= ~Screen_WrapNext;	759	screen.flags &= ~Screen_WrapNext;
775		760
776	if (screen.cur.row == screen.bscroll)	761	if (screen.cur.row == screen.bscroll)
777	scr_scroll_text (screen.tscroll, screen.bscroll, 1);	762	scr_scroll_text (screen.tscroll, screen.bscroll, 1);
…		…
782	continue;	767	continue;
783	}	768	}
784	else if (c == C0_CR)	769	else if (c == C0_CR)
785	{	770	{
786	if (!line->is_longer ()) /* XXX: think about this */	771	if (!line->is_longer ()) /* XXX: think about this */
787	MAX_IT (line->l, screen.cur.col);	772	max_it (line->l, screen.cur.col);
788		773
789	screen.flags &= ~Screen_WrapNext;	774	screen.flags &= ~Screen_WrapNext;
790	screen.cur.col = 0;	775	screen.cur.col = 0;
791	continue;	776	continue;
792	}	777	}
…		…
968	#endif	953	#endif
969	}	954	}
970	}	955	}
971		956
972	if (!line->is_longer ()) /* XXX: think about this */	957	if (!line->is_longer ()) /* XXX: think about this */
973	MAX_IT (line->l, screen.cur.col);	958	max_it (line->l, screen.cur.col);
974		959
975	#ifdef DEBUG_STRICT	960	#ifdef DEBUG_STRICT
976	assert (screen.cur.row >= 0);	961	assert (screen.cur.row >= 0);
977	#else /* drive with your eyes closed */
978	MAX_IT (screen.cur.row, 0);
979	#endif	962	#endif
980	}	963	}
981		964
982	/* ------------------------------------------------------------------------- */	965	/* ------------------------------------------------------------------------- */
983	/*	966	/*
…		…
1022		1005
1023	if (count == 0)	1006	if (count == 0)
1024	return;	1007	return;
1025	else if (count > 0)	1008	else if (count > 0)
1026	{	1009	{
1027	int row = screen.cur.row;
1028
1029	line_t &l = ROW(row);	1010	line_t &l = ROW(screen.cur.row);
1030	rend_t base_rend = l.r[i];	1011	rend_t base_rend = l.r[i];
1031	ht &= l.t[i] == ' ';	1012	ht &= l.t[i] == ' ';
1032		1013
1033	for (; ++i < ncol; )	1014	for (; ++i < ncol; )
1034	if (tabs[i])	1015	if (tabs[i])
…		…
1044	if (count)	1025	if (count)
1045	x = ncol - 1;	1026	x = ncol - 1;
1046		1027
1047	// store horizontal tab commands as characters inside the text	1028	// store horizontal tab commands as characters inside the text
1048	// buffer so they can be selected and pasted.	1029	// buffer so they can be selected and pasted.
1049	if (ht && options & Opt_pastableTabs)	1030	if (ht && OPTION (Opt_pastableTabs))
1050	{	1031	{
1051	base_rend = SET_FONT (base_rend, 0);	1032	base_rend = SET_FONT (base_rend, 0);
1052		1033
1053	if (!l.is_longer ()) /* XXX: think about this */	1034	if (!l.is_longer ()) /* XXX: think about this */
1054	MAX_IT (l.l, x);	1035	max_it (l.l, x);
1055		1036
1056	i = screen.cur.col;	1037	i = screen.cur.col;
1057		1038
1058	l.t[i] = '\t';	1039	l.t[i] = '\t';
1059	l.r[i] = base_rend;	1040	l.r[i] = base_rend;
…		…
1109	*/	1090	*/
1110	#if ENABLE_FRILLS	1091	#if ENABLE_FRILLS
1111	void	1092	void
1112	rxvt_term::scr_forwardindex ()	1093	rxvt_term::scr_forwardindex ()
1113	{	1094	{
1114	int row;
1115
1116	if (screen.cur.col < ncol - 1)	1095	if (screen.cur.col < ncol - 1)
1117	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1096	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1118	else	1097	else
1119	{	1098	{
1120	row = screen.cur.row;
1121
1122	if (ROW(row).is_longer ()) //TODO//FIXME//LEN	1099	if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1123	ROW(row).l = ncol;	1100	ROW(screen.cur.row).l = ncol;
1124		1101
1125	scr_gotorc (0, 0, R_RELATIVE);	1102	scr_gotorc (0, 0, R_RELATIVE);
1126	scr_insdel_chars (1, DELETE);	1103	scr_insdel_chars (1, DELETE);
1127	scr_gotorc (0, ncol - 1, R_RELATIVE);	1104	scr_gotorc (0, ncol - 1, R_RELATIVE);
1128	}	1105	}
…		…
1138	{	1115	{
1139	want_refresh = 1;	1116	want_refresh = 1;
1140	ZERO_SCROLLBACK ();	1117	ZERO_SCROLLBACK ();
1141		1118
1142	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;	1119	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1143	MAX_IT (screen.cur.col, 0);	1120	clamp_it (screen.cur.col, 0, ncol - 1);
1144	MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1145		1121
1146	screen.flags &= ~Screen_WrapNext;	1122	screen.flags &= ~Screen_WrapNext;
1147		1123
1148	if (relative & R_RELATIVE)	1124	if (relative & R_RELATIVE)
1149	{	1125	{
…		…
1167	else	1143	else
1168	{	1144	{
1169	if (screen.flags & Screen_Relative)	1145	if (screen.flags & Screen_Relative)
1170	{ /* relative origin mode */	1146	{ /* relative origin mode */
1171	screen.cur.row = row + screen.tscroll;	1147	screen.cur.row = row + screen.tscroll;
1172	MIN_IT (screen.cur.row, screen.bscroll);	1148	min_it (screen.cur.row, screen.bscroll);
1173	}	1149	}
1174	else	1150	else
1175	screen.cur.row = row;	1151	screen.cur.row = row;
1176	}	1152	}
1177		1153
1178	MAX_IT (screen.cur.row, 0);	1154	clamp_it (screen.cur.row, 0, nrow - 1);
1179	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1180	}	1155	}
1181		1156
1182	/* ------------------------------------------------------------------------- */	1157	/* ------------------------------------------------------------------------- */
1183	/*	1158	/*
1184	* direction should be UP or DN	1159	* direction should be UP or DN
…		…
1199	|| (screen.cur.row == screen.tscroll && direction == DN))	1174	|| (screen.cur.row == screen.tscroll && direction == DN))
1200	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);	1175	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1201	else	1176	else
1202	screen.cur.row += dirn;	1177	screen.cur.row += dirn;
1203		1178
1204	MAX_IT (screen.cur.row, 0);	1179	clamp_it (screen.cur.row, 0, nrow - 1);
1205	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1206	selection_check (0);	1180	selection_check (0);
1207	}	1181	}
1208		1182
1209	/* ------------------------------------------------------------------------- */	1183	/* ------------------------------------------------------------------------- */
1210	/*	1184	/*
…		…
1214	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1188	* XTERM_SEQ: Clear whole line : ESC [ 2 K
1215	*/	1189	*/
1216	void	1190	void
1217	rxvt_term::scr_erase_line (int mode)	1191	rxvt_term::scr_erase_line (int mode)
1218	{	1192	{
1219	unsigned int row, col, num;	1193	unsigned int col, num;
1220		1194
1221	want_refresh = 1;	1195	want_refresh = 1;
1222	ZERO_SCROLLBACK ();	1196	ZERO_SCROLLBACK ();
1223		1197
1224	selection_check (1);	1198	selection_check (1);
1225		1199
1226	row = screen.cur.row;	1200	line_t &line = ROW(screen.cur.row);
1227		1201
1228	switch (mode)	1202	switch (mode)
1229	{	1203	{
1230	case 0: /* erase to end of line */	1204	case 0: /* erase to end of line */
1231	col = screen.cur.col;	1205	col = screen.cur.col;
1232	num = ncol - col;	1206	num = ncol - col;
1233	MIN_IT (ROW(row).l, (int16_t)col);	1207	min_it (line.l, col);
1234	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1208	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1235	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1209	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1236	CLEAR_SELECTION ();	1210	CLEAR_SELECTION ();
1237	break;	1211	break;
1238	case 1: /* erase to beginning of line */	1212	case 1: /* erase to beginning of line */
…		…
1243	CLEAR_SELECTION ();	1217	CLEAR_SELECTION ();
1244	break;	1218	break;
1245	case 2: /* erase whole line */	1219	case 2: /* erase whole line */
1246	col = 0;	1220	col = 0;
1247	num = ncol;	1221	num = ncol;
1248	ROW(row).l = 0;	1222	line.l = 0;
1249	if (selection.beg.row <= screen.cur.row	1223	if (selection.beg.row <= screen.cur.row
1250	&& selection.end.row >= screen.cur.row)	1224	&& selection.end.row >= screen.cur.row)
1251	CLEAR_SELECTION ();	1225	CLEAR_SELECTION ();
1252	break;	1226	break;
1253	default:	1227	default:
1254	return;	1228	return;
1255	}	1229	}
1256		1230
1257	scr_blank_line (ROW(row), col, num, rstyle);	1231	scr_blank_line (line, col, num, rstyle);
1258	}	1232	}
1259		1233
1260	/* ------------------------------------------------------------------------- */	1234	/* ------------------------------------------------------------------------- */
1261	/*	1235	/*
1262	* Erase part of whole of the screen	1236	* Erase part of whole of the screen
…		…
1305	CLEAR_SELECTION ();	1279	CLEAR_SELECTION ();
1306		1280
1307	if (row >= nrow) /* Out Of Bounds */	1281	if (row >= nrow) /* Out Of Bounds */
1308	return;	1282	return;
1309		1283
1310	MIN_IT (num, (nrow - row));	1284	min_it (num, nrow - row);
1311		1285
1312	if (rstyle & (RS_RVid | RS_Uline))	1286	if (rstyle & (RS_RVid | RS_Uline))
1313	ren = (rend_t) ~RS_None;	1287	ren = (rend_t) ~RS_None;
1314	else if (GET_BASEBG (rstyle) == Color_bg)	1288	else if (GET_BASEBG (rstyle) == Color_bg)
1315	{	1289	{
…		…
1317	CLEAR_ROWS (row, num);	1291	CLEAR_ROWS (row, num);
1318	}	1292	}
1319	else	1293	else
1320	{	1294	{
1321	ren = rstyle & (RS_fgMask | RS_bgMask);	1295	ren = rstyle & (RS_fgMask | RS_bgMask);
1322	gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];	1296	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1323	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1297	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1324	ERASE_ROWS (row, num);	1298	ERASE_ROWS (row, num);
1325	gcvalue.foreground = pix_colors[Color_fg];	1299	gcvalue.foreground = pix_colors[Color_fg];
1326	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1300	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1327	}	1301	}
1328		1302
1329	for (; num--; row++)	1303	for (; num--; row++)
1330	{	1304	{
		1305	ROW (row).l = 0;
1331	scr_blank_screen_mem (ROW (row), rstyle);	1306	scr_blank_screen_mem (ROW (row), rstyle);
1332	ROW (row).l = 0;
1333	scr_blank_line (drawn[row], 0, ncol, ren);	1307	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1334	}	1308	}
1335	}	1309	}
1336		1310
1337	#if ENABLE_FRILLS	1311	#if ENABLE_FRILLS
1338	void	1312	void
…		…
1423	return;	1397	return;
1424		1398
1425	scr_do_wrap ();	1399	scr_do_wrap ();
1426		1400
1427	selection_check (1);	1401	selection_check (1);
1428	MIN_IT (count, (ncol - screen.cur.col));	1402	min_it (count, ncol - screen.cur.col);
1429		1403
1430	row = screen.cur.row;	1404	row = screen.cur.row;
1431		1405
1432	line_t *line = &ROW(row);	1406	line_t *line = &ROW(row);
1433		1407
…		…
1441	}	1415	}
1442		1416
1443	if (!line->is_longer ())	1417	if (!line->is_longer ())
1444	{	1418	{
1445	line->l += count;	1419	line->l += count;
1446	MIN_IT (line->l, ncol);	1420	min_it (line->l, ncol);
1447	}	1421	}
1448		1422
1449	if (selection.op && current_screen == selection.screen	1423	if (selection.op && current_screen == selection.screen
1450	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1424	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1451	{	1425	{
…		…
1512	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1486	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1513	*/	1487	*/
1514	void	1488	void
1515	rxvt_term::scr_scroll_region (int top, int bot)	1489	rxvt_term::scr_scroll_region (int top, int bot)
1516	{	1490	{
1517	MAX_IT (top, 0);	1491	max_it (top, 0);
1518	MIN_IT (bot, (int)nrow - 1);	1492	min_it (bot, nrow - 1);
1519		1493
1520	if (top > bot)	1494	if (top > bot)
1521	return;	1495	return;
1522		1496
1523	screen.tscroll = top;	1497	screen.tscroll = top;
…		…
1621	XGCValues gcvalue;	1595	XGCValues gcvalue;
1622		1596
1623	if (rvideo != mode)	1597	if (rvideo != mode)
1624	{	1598	{
1625	rvideo = mode;	1599	rvideo = mode;
1626	SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);	1600	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1627	#if XPM_BACKGROUND	1601	#if XPM_BACKGROUND
1628	if (bgPixmap.pixmap == None)	1602	if (bgPixmap.pixmap == None)
1629	#endif	1603	#endif
1630	#if TRANSPARENT	1604	#if TRANSPARENT
1631	if (! (options & Opt_transparent) || am_transparent == 0)	1605	if (! OPTION (Opt_transparent) || am_transparent == 0)
1632	#endif	1606	#endif
1633	XSetWindowBackground (display->display, vt,	1607	XSetWindowBackground (display->display, vt,
1634	pix_colors[Color_bg]);	1608	pix_colors[Color_bg]);
1635		1609
1636	gcvalue.foreground = pix_colors[Color_fg];	1610	gcvalue.foreground = pix_colors[Color_fg];
…		…
1727	bool found = false;	1701	bool found = false;
1728		1702
1729	for (int i = 0; i < nrow; i++)	1703	for (int i = 0; i < nrow; i++)
1730	{	1704	{
1731	int col = 0;	1705	int col = 0;
1732	rend_t *drp = drawn[i].r;	1706	rend_t *drp = drawn_buf[i].r;
1733		1707
1734	for (; col < ncol; col++, drp++)	1708	for (; col < ncol; col++, drp++)
1735	if ((*drp & mask) == value)	1709	if ((*drp & mask) == value)
1736	{	1710	{
1737	found = true;	1711	found = true;
…		…
1755	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)	1729	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1756	{	1730	{
1757	int i;	1731	int i;
1758	row_col_t rc[RC_COUNT];	1732	row_col_t rc[RC_COUNT];
1759		1733
1760	if (!drawn) /* sanity check */	1734	if (!drawn_buf) /* sanity check */
1761	return;	1735	return;
1762		1736
1763	#ifndef NO_SLOW_LINK_SUPPORT	1737	#ifndef NO_SLOW_LINK_SUPPORT
1764	if (refresh_type == FAST_REFRESH && !display->is_local)	1738	if (refresh_type == FAST_REFRESH && !display->is_local)
1765	{	1739	{
1766	y = 0;	1740	y = 0;
1767	eheight = height;	1741	eheight = height;
1768	}	1742	}
1769	#endif
1770
1771	#ifdef DEBUG_STRICT
1772	x = max (x, 0);
1773	x = min (x, (int)width);
1774	y = max (y, 0);
1775	y = min (y, (int)height);
1776	#endif	1743	#endif
1777		1744
1778	/* round down */	1745	/* round down */
1779	rc[PART_BEG].col = Pixel2Col (x);	1746	rc[PART_BEG].col = Pixel2Col (x);
1780	rc[PART_BEG].row = Pixel2Row (y);	1747	rc[PART_BEG].row = Pixel2Row (y);
…		…
1783	rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);	1750	rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1784		1751
1785	/* sanity checks */	1752	/* sanity checks */
1786	for (i = PART_BEG; i < RC_COUNT; i++)	1753	for (i = PART_BEG; i < RC_COUNT; i++)
1787	{	1754	{
1788	MIN_IT (rc[i].col, ncol - 1);	1755	min_it (rc[i].col, ncol - 1);
1789	MIN_IT (rc[i].row, nrow - 1);	1756	min_it (rc[i].row, nrow - 1);
1790	}	1757	}
1791		1758
1792	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1759	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1793	fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1760	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1794		1761
1795	if (refresh)	1762	if (refresh)
1796	scr_refresh (SLOW_REFRESH);	1763	scr_refresh (SLOW_REFRESH);
1797	}	1764	}
1798		1765
…		…
1859	}	1826	}
1860		1827
1861	int	1828	int
1862	rxvt_term::scr_changeview (unsigned int oldviewstart)	1829	rxvt_term::scr_changeview (unsigned int oldviewstart)
1863	{	1830	{
		1831	PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
		1832
1864	if (view_start != oldviewstart)	1833	if (view_start != oldviewstart)
1865	{	1834	{
1866	want_refresh = 1;	1835	want_refresh = 1;
1867	num_scr -= (view_start - oldviewstart);	1836	num_scr -= (view_start - oldviewstart);
1868	}	1837	}
…		…
1876	{	1845	{
1877	#ifndef NO_BELL	1846	#ifndef NO_BELL
1878		1847
1879	# ifndef NO_MAPALERT	1848	# ifndef NO_MAPALERT
1880	# ifdef MAPALERT_OPTION	1849	# ifdef MAPALERT_OPTION
1881	if (options & Opt_mapAlert)	1850	if (OPTION (Opt_mapAlert))
1882	# endif	1851	# endif
1883	XMapWindow (display->display, parent[0]);	1852	XMapWindow (display->display, parent[0]);
1884	# endif	1853	# endif
1885		1854
1886	if (options & Opt_visualBell)	1855	if (OPTION (Opt_visualBell))
1887	{	1856	{
1888	scr_rvideo_mode (!rvideo); /* refresh also done */	1857	scr_rvideo_mode (!rvideo); /* refresh also done */
1889	rxvt_usleep (VISUAL_BELL_DURATION);	1858	rxvt_usleep (VISUAL_BELL_DURATION);
1890	scr_rvideo_mode (!rvideo); /* refresh also done */	1859	scr_rvideo_mode (!rvideo); /* refresh also done */
1891	}	1860	}
…		…
1961	{	1930	{
1962	unsigned char must_clear, /* use draw_string not draw_image_string */	1931	unsigned char must_clear, /* use draw_string not draw_image_string */
1963	showcursor; /* show the cursor */	1932	showcursor; /* show the cursor */
1964	int16_t col, row, /* column/row we're processing */	1933	int16_t col, row, /* column/row we're processing */
1965	ocrow; /* old cursor row */	1934	ocrow; /* old cursor row */
1966	int i, /* tmp */	1935	int i; /* tmp */
1967	row_offset; /* basic offset in screen structure */
1968	#ifndef NO_CURSORCOLOR	1936	#ifndef NO_CURSORCOLOR
1969	rend_t cc1; /* store colours at cursor position (s) */	1937	rend_t cc1; /* store colours at cursor position (s) */
1970	#endif	1938	#endif
1971	rend_t *crp; // cursor rendition pointer	1939	rend_t *crp; // cursor rendition pointer
1972		1940
…		…
1979	* A: set up vars	1947	* A: set up vars
1980	*/	1948	*/
1981	must_clear = 0;	1949	must_clear = 0;
1982	refresh_count = 0;	1950	refresh_count = 0;
1983		1951
1984	row_offset = term_start - view_start;
1985
1986	#if XPM_BACKGROUND	1952	#if XPM_BACKGROUND
1987	must_clear |= bgPixmap.pixmap != None;	1953	must_clear |= bgPixmap.pixmap != None;
1988	#endif	1954	#endif
1989	#if TRANSPARENT	1955	#if TRANSPARENT
1990	must_clear |= (options & Opt_transparent) && am_transparent;	1956	must_clear |= OPTION (Opt_transparent) && am_transparent;
1991	#endif	1957	#endif
1992	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	1958	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1993		1959
1994	/*	1960	/*
1995	* B: reverse any characters which are selected	1961	* B: reverse any characters which are selected
…		…
2019		1985
2020	crp = &ROW(screen.cur.row).r[col];	1986	crp = &ROW(screen.cur.row).r[col];
2021		1987
2022	if (showcursor && focus)	1988	if (showcursor && focus)
2023	{	1989	{
2024	if (options & Opt_cursorUnderline)	1990	if (OPTION (Opt_cursorUnderline))
2025	*crp ^= RS_Uline;	1991	*crp ^= RS_Uline;
2026	else	1992	else
2027	{	1993	{
2028	*crp ^= RS_RVid;	1994	*crp ^= RS_RVid;
2029		1995
…		…
2031	cc1 = *crp & (RS_fgMask | RS_bgMask);	1997	cc1 = *crp & (RS_fgMask | RS_bgMask);
2032	if (ISSET_PIXCOLOR (Color_cursor))	1998	if (ISSET_PIXCOLOR (Color_cursor))
2033	ccol1 = Color_cursor;	1999	ccol1 = Color_cursor;
2034	else	2000	else
2035	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2001	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2036	ccol1 = GET_FGCOLOR (rstyle);	2002	ccol1 = fgcolor_of (rstyle);
2037	#else	2003	#else
2038	ccol1 = Color_fg;	2004	ccol1 = Color_fg;
2039	#endif	2005	#endif
2040	if (ISSET_PIXCOLOR (Color_cursor2))	2006	if (ISSET_PIXCOLOR (Color_cursor2))
2041	ccol2 = Color_cursor2;	2007	ccol2 = Color_cursor2;
2042	else	2008	else
2043	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2009	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2044	ccol2 = GET_BGCOLOR (rstyle);	2010	ccol2 = bgcolor_of (rstyle);
2045	#else	2011	#else
2046	ccol2 = Color_bg;	2012	ccol2 = Color_bg;
2047	#endif	2013	#endif
2048	*crp = SET_FGCOLOR (*crp, ccol1);	2014	*crp = SET_FGCOLOR (*crp, ccol1);
2049	*crp = SET_BGCOLOR (*crp, ccol2);	2015	*crp = SET_BGCOLOR (*crp, ccol2);
…		…
2059	if (screen.cur.row + view_start != ocrow	2025	if (screen.cur.row + view_start != ocrow
2060	|| screen.cur.col != oldcursor.col)	2026	|| screen.cur.col != oldcursor.col)
2061	{	2027	{
2062	if (ocrow < nrow	2028	if (ocrow < nrow
2063	&& oldcursor.col < ncol)	2029	&& oldcursor.col < ncol)
2064	drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);	2030	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2065		2031
2066	if (focus || !showcursor)	2032	if (focus || !showcursor)
2067	oldcursor.row = -1;	2033	oldcursor.row = -1;
2068	else	2034	else
2069	setoldcursor = 1;	2035	setoldcursor = 1;
…		…
2082	oldcursor.col = screen.cur.col;	2048	oldcursor.col = screen.cur.col;
2083	}	2049	}
2084	}	2050	}
2085	}	2051	}
2086		2052
		2053	PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2087	#if ENABLE_OVERLAY	2054	#if ENABLE_OVERLAY
2088	scr_swap_overlay ();	2055	scr_swap_overlay ();
2089	#endif	2056	#endif
2090		2057
2091	#ifndef NO_SLOW_LINK_SUPPORT	2058	#ifndef NO_SLOW_LINK_SUPPORT
…		…
2107	row = i > 0 ? 0 : j - 1;	2074	row = i > 0 ? 0 : j - 1;
2108	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2075	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2109	{	2076	{
2110	if (row + i >= 0 && row + i < nrow && row + i != ocrow)	2077	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2111	{	2078	{
2112	line_t s = save[(row + row_offset) % total_rows];	2079	line_t s = ROW(row - view_start);
2113	line_t d = drawn[row];	2080	line_t d = drawn_buf[row];
2114	line_t d2 = drawn[row + i];	2081	line_t d2 = drawn_buf[row + i];
2115		2082
2116	for (nits = 0, col = ncol; col--; )	2083	for (nits = 0, col = ncol; col--; )
2117	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])	2084	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2118	nits--;	2085	nits--;
2119	else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])	2086	else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
…		…
2137		2104
2138	if (len != -1)	2105	if (len != -1)
2139	{	2106	{
2140	/* also comes here at end if needed because of >= above */	2107	/* also comes here at end if needed because of >= above */
2141	if (wlen < len)	2108	if (wlen < len)
2142	SWAP_IT (wlen, len, int);	2109	::swap (wlen, len);
2143		2110
2144	XCopyArea (display->display, vt, vt,	2111	XCopyArea (display->display, vt, vt,
2145	gc, 0, Row2Pixel (len + i),	2112	gc, 0, Row2Pixel (len + i),
2146	(unsigned int)TermWin_TotalWidth (),	2113	(unsigned int)this->width,
2147	(unsigned int)Height2Pixel (wlen - len + 1),	2114	(unsigned int)Height2Pixel (wlen - len + 1),
2148	0, Row2Pixel (len));	2115	0, Row2Pixel (len));
2149	len = -1;	2116	len = -1;
2150	}	2117	}
2151	}	2118	}
…		…
2155	/*	2122	/*
2156	* E: main pass across every character	2123	* E: main pass across every character
2157	*/	2124	*/
2158	for (row = 0; row < nrow; row++)	2125	for (row = 0; row < nrow; row++)
2159	{	2126	{
2160	text_t *stp = save[(row + row_offset) % total_rows].t;	2127	text_t *stp = ROW(row - view_start).t;
2161	rend_t *srp = save[(row + row_offset) % total_rows].r;	2128	rend_t *srp = ROW(row - view_start).r;
2162	text_t *dtp = drawn[row].t;	2129	text_t *dtp = drawn_buf[row].t;
2163	rend_t *drp = drawn[row].r;	2130	rend_t *drp = drawn_buf[row].r;
2164		2131
2165	/*	2132	/*
2166	* E2: OK, now the real pass	2133	* E2: OK, now the real pass
2167	*/	2134	*/
2168	int ypixel = (int)Row2Pixel (row);	2135	int ypixel = (int)Row2Pixel (row);
…		…
2230	count++, i--;	2197	count++, i--;
2231		2198
2232	/*	2199	/*
2233	* Determine the attributes for the string	2200	* Determine the attributes for the string
2234	*/	2201	*/
2235	int fore = GET_FGCOLOR (rend); // desired foreground	2202	int fore = fgcolor_of (rend); // desired foreground
2236	int back = GET_BGCOLOR (rend); // desired background	2203	int back = bgcolor_of (rend); // desired background
2237		2204
2238	// only do special processing if any attributes are set, which is rare	2205	// only do special processing if any attributes are set, which is unlikely
2239	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2206	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2240	{	2207	{
2241	#if ENABLE_STYLES	2208	#if ENABLE_STYLES
2242	// force redraw after "careful" characters to avoid pixel droppings	2209	// force redraw after "careful" characters to avoid pixel droppings
2243	if (srp[col] & RS_Careful && col < ncol - 1 && 0)	2210	if (srp[col] & RS_Careful && col < ncol - 1 && 0)
…		…
2279	fore = Color_UL;	2246	fore = Color_UL;
2280	#endif	2247	#endif
2281		2248
2282	if (invert)	2249	if (invert)
2283	{	2250	{
2284	SWAP_IT (fore, back, int);	2251	::swap (fore, back);
2285		2252
2286	#ifndef NO_BOLD_UNDERLINE_REVERSE	2253	#ifndef NO_BOLD_UNDERLINE_REVERSE
2287	if (ISSET_PIXCOLOR (Color_RV))	2254	if (ISSET_PIXCOLOR (Color_RV))
2288	back = Color_RV;	2255	back = Color_RV;
2289		2256
…		…
2354	} /* for (row....) */	2321	} /* for (row....) */
2355		2322
2356	#if ENABLE_OVERLAY	2323	#if ENABLE_OVERLAY
2357	scr_swap_overlay ();	2324	scr_swap_overlay ();
2358	#endif	2325	#endif
		2326	PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2359		2327
2360	/*	2328	/*
2361	* G: cleanup cursor and display outline cursor if necessary	2329	* G: cleanup cursor and display outline cursor if necessary
2362	*/	2330	*/
2363	if (showcursor)	2331	if (showcursor)
2364	{	2332	{
2365	if (focus)	2333	if (focus)
2366	{	2334	{
2367	if (options & Opt_cursorUnderline)	2335	if (OPTION (Opt_cursorUnderline))
2368	*crp ^= RS_Uline;	2336	*crp ^= RS_Uline;
2369	else	2337	else
2370	{	2338	{
2371	*crp ^= RS_RVid;	2339	*crp ^= RS_RVid;
2372	#ifndef NO_CURSORCOLOR	2340	#ifndef NO_CURSORCOLOR
…		…
2381		2349
2382	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2350	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2383	col--;	2351	col--;
2384		2352
2385	while (col + cursorwidth < ncol	2353	while (col + cursorwidth < ncol
2386	&& drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)	2354	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2387	cursorwidth++;	2355	cursorwidth++;
2388		2356
2389	#ifndef NO_CURSORCOLOR	2357	#ifndef NO_CURSORCOLOR
2390	if (ISSET_PIXCOLOR (Color_cursor))	2358	if (ISSET_PIXCOLOR (Color_cursor))
2391	XSetForeground (display->display, gc, pix_colors[Color_cursor]);	2359	XSetForeground (display->display, gc, pix_colors[Color_cursor]);
…		…
2423		2391
2424	void	2392	void
2425	rxvt_term::scr_remap_chars ()	2393	rxvt_term::scr_remap_chars ()
2426	{	2394	{
2427	for (int i = total_rows; i--; )	2395	for (int i = total_rows; i--; )
2428	scr_remap_chars (save[i]);	2396	scr_remap_chars (row_buf [i]);
2429		2397
2430	for (int i = nrow; i--; )	2398	for (int i = nrow; i--; )
2431	{	2399	{
2432	scr_remap_chars (drawn[i]);	2400	scr_remap_chars (drawn_buf [i]);
2433	scr_remap_chars (swap_save[i]);	2401	scr_remap_chars (swap_buf [i]);
2434	}	2402	}
2435	}	2403	}
2436		2404
2437	void	2405	void
2438	rxvt_term::scr_recolour ()	2406	rxvt_term::scr_recolour ()
…		…
2491		2459
2492	#if ENABLE_FRILLS	2460	#if ENABLE_FRILLS
2493	if (selection.rect)	2461	if (selection.rect)
2494	{	2462	{
2495	for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)	2463	for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
		2464	{
		2465	text_t *stp = ROW(row).t;
		2466	rend_t *srp = ROW(row).r;
		2467
2496	for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)	2468	for (col = selection.beg.col; col < selection.end.col; col++)
2497	srp[col] ^= RS_RVid;	2469	srp[col] ^= RS_RVid;
		2470
		2471	while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
		2472	srp[col] ^= RS_RVid | RS_Uline;
		2473
		2474	if (++col < selection.end.col)
		2475	srp[col] ^= RS_RVid | RS_Uline;
		2476	}
2498	}	2477	}
2499	else	2478	else
2500	#endif	2479	#endif
2501	{	2480	{
2502	if (selection.beg.row >= -view_start)	2481	if (selection.beg.row >= -view_start)
…		…
2505	row = selection.beg.row;	2484	row = selection.beg.row;
2506	}	2485	}
2507	else	2486	else
2508	{	2487	{
2509	col = 0;	2488	col = 0;
2510	row = view_start;	2489	row = -view_start;
2511	}	2490	}
2512		2491
2513	for (; row < min (selection.end.row, view_end); row++, col = 0)	2492	for (; row < min (selection.end.row, view_end); row++, col = 0)
2514	for (rend_t *srp = ROW(row).r; col < ncol; col++)	2493	for (rend_t *srp = ROW(row).r; col < ncol; col++)
2515	srp[col] ^= RS_RVid;	2494	srp[col] ^= RS_RVid;
…		…
2535	char r1[] = "\n";	2514	char r1[] = "\n";
2536		2515
2537	for (row = saveLines - nsaved;	2516	for (row = saveLines - nsaved;
2538	row < saveLines + nrow - 1; row++)	2517	row < saveLines + nrow - 1; row++)
2539	{	2518	{
2540	width = save[row].l >= 0 ? save[row].l	2519	width = row_buf[row].l >= 0 ? row_buf[row].l
2541	: ncol;	2520	: ncol;
2542	for (towrite = width; towrite; towrite -= wrote)	2521	for (towrite = width; towrite; towrite -= wrote)
2543	{	2522	{
2544	wrote = write (fd, & (save[row].t[width - towrite]),	2523	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2545	towrite);	2524	towrite);
2546	if (wrote < 0)	2525	if (wrote < 0)
2547	return; /* XXX: death, no report */	2526	return; /* XXX: death, no report */
2548	}	2527	}
2549	if (save[row].l >= 0)	2528	if (row_buf[row].l >= 0)
2550	if (write (fd, r1, 1) <= 0)	2529	if (write (fd, r1, 1) <= 0)
2551	return; /* XXX: death, no report */	2530	return; /* XXX: death, no report */
2552	}	2531	}
2553	}	2532	}
2554	#endif	2533	#endif
…		…
2586	/* ------------------------------------------------------------------------- */	2565	/* ------------------------------------------------------------------------- */
2587	/*	2566	/*
2588	* Paste a selection direct to the command fd	2567	* Paste a selection direct to the command fd
2589	*/	2568	*/
2590	void	2569	void
2591	rxvt_term::paste (unsigned char *data, unsigned int len)	2570	rxvt_term::paste (char *data, unsigned int len)
2592	{	2571	{
2593	/* convert normal newline chars into common keyboard Return key sequence */	2572	/* convert normal newline chars into common keyboard Return key sequence */
2594	for (unsigned int i = 0; i < len; i++)	2573	for (unsigned int i = 0; i < len; i++)
2595	if (data[i] == C0_LF)	2574	if (data[i] == C0_LF)
2596	data[i] = C0_CR;	2575	data[i] = C0_CR;
…		…
2740	{	2719	{
2741	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);	2720	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2742	char *s = rxvt_wcstombs (w);	2721	char *s = rxvt_wcstombs (w);
2743	free (w);	2722	free (w);
2744	// TODO: strlen == only the first element will be converted. well...	2723	// TODO: strlen == only the first element will be converted. well...
2745	paste ((unsigned char *)s, strlen (s));	2724	paste (s, strlen (s));
2746	free (s);	2725	free (s);
2747	}	2726	}
2748	else	2727	else
2749	#endif	2728	#endif
2750	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0	2729	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2751	&& cl)	2730	&& cl)
2752	{	2731	{
2753	for (int i = 0; i < cr; i++)	2732	for (int i = 0; i < cr; i++)
2754	paste ((unsigned char *)cl[i], strlen (cl[i]));	2733	paste (cl[i], strlen (cl[i]));
2755		2734
2756	XFreeStringList (cl);	2735	XFreeStringList (cl);
2757	}	2736	}
2758	else	2737	else
2759	paste (ct.value, ct.nitems); // paste raw	2738	paste ((char *)ct.value, ct.nitems); // paste raw
2760		2739
2761	bailout:	2740	bailout:
2762	XFree (ct.value);	2741	XFree (ct.value);
2763		2742
2764	if (selection_wait == Sel_normal)	2743	if (selection_wait == Sel_normal)
…		…
2802	return; /* outside window */	2781	return; /* outside window */
2803		2782
2804	if (selection.text)	2783	if (selection.text)
2805	{ /* internal selection */	2784	{ /* internal selection */
2806	char *str = rxvt_wcstombs (selection.text, selection.len);	2785	char *str = rxvt_wcstombs (selection.text, selection.len);
2807	paste ((unsigned char *)str, strlen (str));	2786	paste (str, strlen (str));
2808	free (str);	2787	free (str);
2809	return;	2788	return;
2810	}	2789	}
2811	else	2790	else
2812	{	2791	{
…		…
2904	selection.op = SELECTION_DONE;	2883	selection.op = SELECTION_DONE;
2905		2884
2906	if (selection.clicks == 4)	2885	if (selection.clicks == 4)
2907	return; /* nothing selected, go away */	2886	return; /* nothing selected, go away */
2908		2887
		2888	if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
		2889	return;
		2890
2909	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2891	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2910	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2892	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2911		2893
2912	int ofs = 0;	2894	int ofs = 0;
2913	int extra = 0;	2895	int extra = 0;
…		…
2929	#endif	2911	#endif
2930	end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN	2912	end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2931		2913
2932	col = max (col, 0);	2914	col = max (col, 0);
2933		2915
2934	if (row == selection.end.row || selection.rect)	2916	if (row == selection.end.row
		2917	#if ENABLE_FRILLS
		2918	|| selection.rect
		2919	#endif
		2920	)
2935	end_col = min (end_col, selection.end.col);	2921	min_it (end_col, selection.end.col);
2936		2922
2937	t = ROW(row).t + col;	2923	t = ROW(row).t + col;
2938	for (; col < end_col; col++)	2924	for (; col < end_col; col++)
2939	{	2925	{
2940	if (*t == NOCHAR)	2926	if (*t == NOCHAR)
…		…
2958	#endif	2944	#endif
2959	else	2945	else
2960	new_selection_text[ofs++] = *t++;	2946	new_selection_text[ofs++] = *t++;
2961	}	2947	}
2962		2948
		2949	#if ENABLE_FRILLS
		2950	if (selection.rect)
		2951	{
		2952	while (ofs
		2953	&& new_selection_text[ofs - 1] != C0_LF
		2954	&& unicode::is_space (new_selection_text[ofs - 1]))
		2955	--ofs;
		2956
		2957	new_selection_text[ofs++] = C0_LF;
		2958	}
		2959	else
		2960	#endif
2963	if (!ROW(row).is_longer () && row != selection.end.row)	2961	if (!ROW(row).is_longer () && row != selection.end.row)
2964	new_selection_text[ofs++] = C0_LF;	2962	new_selection_text[ofs++] = C0_LF;
2965	}	2963	}
2966		2964
2967	if (end_col != selection.end.col)	2965	if (end_col != selection.end.col)
2968	new_selection_text[ofs++] = C0_LF;	2966	new_selection_text[ofs++] = C0_LF;
2969		2967
…		…
2979		2977
2980	// we usually allocate much more than necessary, so realloc it smaller again	2978	// we usually allocate much more than necessary, so realloc it smaller again
2981	selection.len = ofs;	2979	selection.len = ofs;
2982	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));	2980	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2983		2981
		2982	if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
		2983	return;
		2984
		2985	selection_grab (tm);
		2986	}
		2987
		2988	bool
		2989	rxvt_term::selection_grab (Time tm)
		2990	{
		2991	selection_time = tm;
		2992
2984	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);	2993	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2985	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)	2994	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
		2995	{
2986	display->set_selection_owner (this);	2996	display->set_selection_owner (this);
		2997	return true;
		2998	}
2987	else	2999	else
2988	rxvt_warn ("can't get primary selection, ignoring.\n");	3000	return false;
2989		3001
2990	#if 0	3002	#if 0
2991	XTextProperty ct;	3003	XTextProperty ct;
2992		3004
2993	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)	3005	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2994	{	3006	{
2995	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);	3007	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2996	XFree (ct.value);	3008	XFree (ct.value);
2997	}	3009	}
2998	#endif	3010	#endif
2999
3000	selection_time = tm;
3001	}	3011	}
3002		3012
3003	/* ------------------------------------------------------------------------- */	3013	/* ------------------------------------------------------------------------- */
3004	/*	3014	/*
3005	* Mark or select text based upon number of clicks: 1, 2, or 3	3015	* Mark or select text based upon number of clicks: 1, 2, or 3
…		…
3031	want_refresh = 1;	3041	want_refresh = 1;
3032		3042
3033	selection.mark.row = row - view_start;	3043	selection.mark.row = row - view_start;
3034	selection.mark.col = col;	3044	selection.mark.col = col;
3035		3045
3036	selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1);	3046	selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3037	selection.mark.col = min (max (selection.mark.col, 0), ncol - 1);	3047	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3038		3048
3039	while (selection.mark.col > 0	3049	while (selection.mark.col > 0
3040	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)	3050	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3041	--selection.mark.col;	3051	--selection.mark.col;
3042		3052
…		…
3127	}	3137	}
3128	}	3138	}
3129	break;	3139	break;
3130	}	3140	}
3131		3141
3132	Old_Word_Selection_You_Die:
3133	if (dirn == DN)	3142	if (dirn == DN)
3134	col++; /* put us on one past the end */	3143	col++; /* put us on one past the end */
3135		3144
3136	/* Poke the values back in */	3145	/* Poke the values back in */
3137	ret->row = row;	3146	ret->row = row;
…		…
3147	* flag == 2 ==> button 3 motion	3156	* flag == 2 ==> button 3 motion
3148	*/	3157	*/
3149	void	3158	void
3150	rxvt_term::selection_extend (int x, int y, int flag)	3159	rxvt_term::selection_extend (int x, int y, int flag)
3151	{	3160	{
3152	int col = min (max (Pixel2Col (x), 0), nrow - 1);	3161	int col = clamp (Pixel2Col (x), 0, ncol);
3153	int row = min (max (Pixel2Row (y), 0), ncol);	3162	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3154		3163
3155	/*	3164	/*
3156	* If we're selecting characters (single click) then we must check first	3165	* If we're selecting characters (single click) then we must check first
3157	* if we are at the same place as the original mark. If we are then	3166	* if we are at the same place as the original mark. If we are then
3158	* select nothing. Otherwise, if we're to the right of the mark, you have to	3167	* select nothing. Otherwise, if we're to the right of the mark, you have to
…		…
3314	else if (selection.clicks == 2)	3323	else if (selection.clicks == 2)
3315	{	3324	{
3316	if (ROWCOL_IS_AFTER (selection.end, selection.beg))	3325	if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3317	selection.end.col--;	3326	selection.end.col--;
3318		3327
		3328	if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
		3329	{
3319	selection_delimit_word (UP, &selection.beg, &selection.beg);	3330	selection_delimit_word (UP, &selection.beg, &selection.beg);
3320	selection_delimit_word (DN, &selection.end, &selection.end);	3331	selection_delimit_word (DN, &selection.end, &selection.end);
		3332	}
3321	}	3333	}
3322	else if (selection.clicks == 3)	3334	else if (selection.clicks == 3)
3323	{	3335	{
3324	#if ENABLE_FRILLS	3336	#if ENABLE_FRILLS
3325	if (options & Opt_tripleclickwords)	3337	if (OPTION (Opt_tripleclickwords))
3326	{	3338	{
3327	selection_delimit_word (UP, &selection.beg, &selection.beg);	3339	selection_delimit_word (UP, &selection.beg, &selection.beg);
3328		3340
3329	for (int end_row = selection.mark.row; end_row < nrow; end_row++)	3341	for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3330	{	3342	{
…		…
3371	}	3383	}
3372	}	3384	}
3373		3385
3374	#if ENABLE_FRILLS	3386	#if ENABLE_FRILLS
3375	if (selection.rect && selection.beg.col > selection.end.col)	3387	if (selection.rect && selection.beg.col > selection.end.col)
3376	SWAP_IT (selection.beg.col, selection.end.col, int);	3388	::swap (selection.beg.col, selection.end.col);
3377	#endif	3389	#endif
3378	}	3390	}
3379		3391
3380	#if ENABLE_FRILLS	3392	#if ENABLE_FRILLS
3381	void	3393	void
…		…
3391	{	3403	{
3392	stp = ROW(end_row).t;	3404	stp = ROW(end_row).t;
3393		3405
3394	while (--end_col >= 0)	3406	while (--end_col >= 0)
3395	{	3407	{
3396	if (stp[end_col] != ' '	3408	if (stp[end_col] != NOCHAR
3397	&& stp[end_col] != '\t'	3409	&& !unicode::is_space (stp[end_col]))
3398	&& stp[end_col] != NOCHAR)
3399	break;	3410	break;
3400	}	3411	}
3401		3412
3402	if (end_col >= 0	3413	if (end_col >= 0
3403	|| !ROW(end_row - 1).is_longer ())	3414	|| !ROW(end_row - 1).is_longer ())
…		…
3579	*/	3590	*/
3580	void	3591	void
3581	rxvt_term::pixel_position (int *x, int *y)	3592	rxvt_term::pixel_position (int *x, int *y)
3582	{	3593	{
3583	*x = Pixel2Col (*x);	3594	*x = Pixel2Col (*x);
3584	/* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */	3595	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3585	*y = Pixel2Row (*y);	3596	*y = Pixel2Row (*y);
3586	/* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */	3597	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3587	}	3598	}
3588		3599
3589	/* ------------------------------------------------------------------------- */	3600	/* ------------------------------------------------------------------------- */
3590	#ifdef USE_XIM	3601	#ifdef USE_XIM
3591	void	3602	void
…		…
3602		3613
3603	#if ENABLE_OVERLAY	3614	#if ENABLE_OVERLAY
3604	void	3615	void
3605	rxvt_term::scr_overlay_new (int x, int y, int w, int h)	3616	rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3606	{	3617	{
3607	if (nrow < 3 || ncol < 3)	3618	if (nrow < 1 || ncol < 1)
3608	return;	3619	return;
3609		3620
3610	want_refresh = 1;	3621	want_refresh = 1;
3611		3622
3612	scr_overlay_off ();	3623	scr_overlay_off ();
3613		3624
3614	if (x < 0) x = ncol - w;	3625	if (x < 0) x = ncol - w;
3615	if (y < 0) y = nrow - h;	3626	if (y < 0) y = nrow - h;
3616		3627
3617	// make space for border	3628	// make space for border
3618	w += 2; MIN_IT (w, ncol);	3629	w += 2; min_it (w, ncol);
3619	h += 2; MIN_IT (h, nrow);	3630	h += 2; min_it (h, nrow);
3620		3631
3621	x -= 1; MAX_IT (x, 0);	3632	x -= 1; clamp_it (x, 0, ncol - w);
3622	y -= 1; MAX_IT (y, 0);	3633	y -= 1; clamp_it (y, 0, nrow - h);
3623
3624	MIN_IT (x, ncol - w);
3625	MIN_IT (y, nrow - h);
3626		3634
3627	ov_x = x; ov_y = y;	3635	ov_x = x; ov_y = y;
3628	ov_w = w; ov_h = h;	3636	ov_w = w; ov_h = h;
3629		3637
3630	ov_text = new text_t *[h];	3638	ov_text = new text_t *[h];
…		…
3722	for (int y = ov_h; y--; )	3730	for (int y = ov_h; y--; )
3723	{	3731	{
3724	text_t *t1 = ov_text[y];	3732	text_t *t1 = ov_text[y];
3725	rend_t *r1 = ov_rend[y];	3733	rend_t *r1 = ov_rend[y];
3726		3734
3727	text_t *t2 = ROW(y - view_start).t + ov_x;	3735	text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3728	rend_t *r2 = ROW(y - view_start).r + ov_x;	3736	rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3729		3737
3730	for (int x = ov_w; x--; )	3738	for (int x = ov_w; x--; )
3731	{	3739	{
3732	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3740	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3733	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3741	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