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.176 by root, Tue Dec 20 20:58:31 2005 UTC vs.
Revision 1.207 by root, Wed Jan 4 04:42:45 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
…		…
639	return 0;	616	return 0;
640		617
641	want_refresh = 1;	618	want_refresh = 1;
642	num_scr += count;	619	num_scr += count;
643		620
644	if (row1 == 0 && count > 0	621	if (count > 0
		622	&& row1 == 0
		623	&& row2 == nrow - 1
645	&& (current_screen == PRIMARY || options & Opt_secondaryScroll))	624	&& (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
646	{	625	{
647	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
648	term_start = (term_start + count) % total_rows;	630	term_start = (term_start + count) % total_rows;
649		631
650	if (selection.op && current_screen == selection.screen)	632	if (selection.op && current_screen == selection.screen)
651	{	633	{
652	selection.beg.row -= count;	634	selection.beg.row -= count;
653	selection.end.row -= count;	635	selection.end.row -= count;
654	selection.mark.row -= count;	636	selection.mark.row -= count;
655		637
656	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	}
657	}	645	}
658		646
659	for (int i = count; i--; )	647	for (int i = count; i--; )
		648	{
		649	ROW(row2 - i).l = 0;
660	scr_blank_screen_mem (ROW(row2 - i), rstyle);	650	scr_blank_screen_mem (ROW(row2 - i), rstyle);
		651	}
661		652
662	if ((options & Opt_scrollWithBuffer)	653	if (OPTION (Opt_scrollWithBuffer)
663	&& view_start != 0	654	&& view_start != 0
664	&& view_start != saveLines)	655	&& view_start != saveLines)
665	scr_page (UP, count);	656	scr_page (UP, count);
666	}	657	}
667	else	658	else
668	{	659	{
669	if (selection.op && current_screen == selection.screen)	660	if (selection.op && current_screen == selection.screen)
670	{	661	{
671	int i = selection.beg.row;	662	if ((selection.beg.row < row1 && selection.end.row > row1)
672	int j = selection.end.row;	663	|| (selection.beg.row < row2 && selection.end.row > row2)
673
674	if ((i < row1 && j > row1)
675	|| (i < row2 && j > row2)
676	|| (i - count < row1 && i >= row1)	664	|| (selection.beg.row - count < row1 && selection.beg.row >= row1)
677	|| (i - count > row2 && i <= row2)	665	|| (selection.beg.row - count > row2 && selection.beg.row <= row2)
678	|| (j - count < row1 && j >= row1)	666	|| (selection.end.row - count < row1 && selection.end.row >= row1)
679	|| (j - count > row2 && j <= row2))	667	|| (selection.end.row - count > row2 && selection.end.row <= row2))
680	{	668	{
681	CLEAR_ALL_SELECTION ();	669	CLEAR_ALL_SELECTION ();
682	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */	670	selection.op = SELECTION_CLEAR;
683	}	671	}
684	else if (j >= row1 && j <= row2)	672	else if (selection.end.row >= row1 && selection.end.row <= row2)
685	{	673	{
686	/* move selected region too */	674	/* move selected region too */
687	selection.beg.row -= count;	675	selection.beg.row -= count;
688	selection.end.row -= count;	676	selection.end.row -= count;
689	selection.mark.row -= count;	677	selection.mark.row -= count;
…		…
695	// use a simple and robust scrolling algorithm, this	683	// use a simple and robust scrolling algorithm, this
696	// part of scr_scroll_text is not time-critical.	684	// part of scr_scroll_text is not time-critical.
697		685
698	int rows = row2 - row1 + 1;	686	int rows = row2 - row1 + 1;
699		687
		688	min_it (count, rows);
		689
700	for (int row = 0; row < rows; row++)	690	for (int row = 0; row < rows; row++)
701	{	691	{
702	buf [row] = ROW(row1 + (row + count + rows) % rows);	692	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
703		693
704	if (!IN_RANGE_EXC (row + count, 0, rows))	694	if (!IN_RANGE_EXC (row + count, 0, rows))
705	scr_blank_screen_mem (buf [row], rstyle);	695	scr_blank_screen_mem (temp_buf [row], rstyle);
706	}	696	}
707		697
708	for (int row = 0; row < rows; row++)	698	for (int row = 0; row < rows; row++)
709	ROW(row1 + row) = buf [row];	699	ROW(row1 + row) = temp_buf [row];
710	}	700	}
711		701
712	return count;	702	return count;
713	}	703	}
714		704
…		…
722	if (len <= 0) /* sanity */	712	if (len <= 0) /* sanity */
723	return;	713	return;
724		714
725	unsigned char checksel;	715	unsigned char checksel;
726	unicode_t c;	716	unicode_t c;
727	int row, last_col;	717	int last_col;
728	const unicode_t *strend = str + len;	718	const unicode_t *strend = str + len;
729		719
730	want_refresh = 1;	720	want_refresh = 1;
731	ZERO_SCROLLBACK ();	721	ZERO_SCROLLBACK ();
732	last_col = ncol;	722	last_col = ncol;
733		723
734	if (nlines > 0)	724	if (nlines > 0)
735	{	725	{
736	nlines += screen.cur.row - screen.bscroll;	726	nlines += screen.cur.row - screen.bscroll;
737	if ((nlines > 0)	727	if (nlines > 0
738	&& (screen.tscroll == 0)	728	&& screen.tscroll == 0
739	&& (screen.bscroll == (nrow - 1)))	729	&& screen.bscroll == (nrow - 1))
740	{	730	{
741	/* _at least_ this many lines need to be scrolled */	731	/* _at least_ this many lines need to be scrolled */
742	scr_scroll_text (screen.tscroll, screen.bscroll, nlines);	732	scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
743	screen.cur.row -= nlines;	733	screen.cur.row -= nlines;
744	}	734	}
745	}	735	}
746		736
747	#ifdef DEBUG_STRICT	737	#ifdef DEBUG_STRICT
748	assert (screen.cur.col < last_col);	738	assert (screen.cur.col < last_col);
749	assert ((screen.cur.row < nrow)	739	assert (screen.cur.row < nrow
750	&& (screen.cur.row >= - (int32_t)nsaved));	740	&& screen.cur.row >= -nsaved);
751	#else /* drive with your eyes closed */
752	MIN_IT (screen.cur.col, last_col - 1);
753	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
754	MAX_IT (screen.cur.row, - (int32_t)nsaved);
755	#endif	741	#endif
756	row = screen.cur.row;	742	int row = screen.cur.row;
757		743
758	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	744	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
759		745
760	line_t *line = &ROW(row);	746	line_t *line = &ROW(row);
761		747
…		…
763	{	749	{
764	c = *str++;	750	c = *str++;
765		751
766	if (c < 0x20)	752	if (c < 0x20)
767	if (c == C0_LF)	753	if (c == C0_LF)
768	{	754	{
769	if (!line->is_longer ()) /* XXX: think about this */	755	if (!line->is_longer ()) /* XXX: think about this */
770	MAX_IT (line->l, screen.cur.col);	756	max_it (line->l, screen.cur.col);
771		757
772	screen.flags &= ~Screen_WrapNext;	758	screen.flags &= ~Screen_WrapNext;
773		759
774	if (screen.cur.row == screen.bscroll)	760	if (screen.cur.row == screen.bscroll)
775	scr_scroll_text (screen.tscroll, screen.bscroll, 1);	761	scr_scroll_text (screen.tscroll, screen.bscroll, 1);
…		…
780	continue;	766	continue;
781	}	767	}
782	else if (c == C0_CR)	768	else if (c == C0_CR)
783	{	769	{
784	if (!line->is_longer ()) /* XXX: think about this */	770	if (!line->is_longer ()) /* XXX: think about this */
785	MAX_IT (line->l, screen.cur.col);	771	max_it (line->l, screen.cur.col);
786		772
787	screen.flags &= ~Screen_WrapNext;	773	screen.flags &= ~Screen_WrapNext;
788	screen.cur.col = 0;	774	screen.cur.col = 0;
789	continue;	775	continue;
790	}	776	}
…		…
966	#endif	952	#endif
967	}	953	}
968	}	954	}
969		955
970	if (!line->is_longer ()) /* XXX: think about this */	956	if (!line->is_longer ()) /* XXX: think about this */
971	MAX_IT (line->l, screen.cur.col);	957	max_it (line->l, screen.cur.col);
972		958
973	#ifdef DEBUG_STRICT	959	#ifdef DEBUG_STRICT
974	assert (screen.cur.row >= 0);	960	assert (screen.cur.row >= 0);
975	#else /* drive with your eyes closed */
976	MAX_IT (screen.cur.row, 0);
977	#endif	961	#endif
978	}	962	}
979		963
980	/* ------------------------------------------------------------------------- */	964	/* ------------------------------------------------------------------------- */
981	/*	965	/*
…		…
1020		1004
1021	if (count == 0)	1005	if (count == 0)
1022	return;	1006	return;
1023	else if (count > 0)	1007	else if (count > 0)
1024	{	1008	{
1025	int row = screen.cur.row;
1026
1027	line_t &l = ROW(row);	1009	line_t &l = ROW(screen.cur.row);
1028	rend_t base_rend = l.r[i];	1010	rend_t base_rend = l.r[i];
1029	ht &= l.t[i] == ' ';	1011	ht &= l.t[i] == ' ';
1030		1012
1031	for (; ++i < ncol; )	1013	for (; ++i < ncol; )
1032	if (tabs[i])	1014	if (tabs[i])
…		…
1042	if (count)	1024	if (count)
1043	x = ncol - 1;	1025	x = ncol - 1;
1044		1026
1045	// store horizontal tab commands as characters inside the text	1027	// store horizontal tab commands as characters inside the text
1046	// buffer so they can be selected and pasted.	1028	// buffer so they can be selected and pasted.
1047	if (ht && options & Opt_pastableTabs)	1029	if (ht && OPTION (Opt_pastableTabs))
1048	{	1030	{
1049	base_rend = SET_FONT (base_rend, 0);	1031	base_rend = SET_FONT (base_rend, 0);
1050		1032
1051	if (!l.is_longer ()) /* XXX: think about this */	1033	if (!l.is_longer ()) /* XXX: think about this */
1052	MAX_IT (l.l, x);	1034	max_it (l.l, x);
1053		1035
1054	i = screen.cur.col;	1036	i = screen.cur.col;
1055		1037
1056	l.t[i] = '\t';	1038	l.t[i] = '\t';
1057	l.r[i] = base_rend;	1039	l.r[i] = base_rend;
…		…
1107	*/	1089	*/
1108	#if ENABLE_FRILLS	1090	#if ENABLE_FRILLS
1109	void	1091	void
1110	rxvt_term::scr_forwardindex ()	1092	rxvt_term::scr_forwardindex ()
1111	{	1093	{
1112	int row;
1113
1114	if (screen.cur.col < ncol - 1)	1094	if (screen.cur.col < ncol - 1)
1115	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1095	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1116	else	1096	else
1117	{	1097	{
1118	row = screen.cur.row;
1119
1120	if (ROW(row).is_longer ()) //TODO//FIXME//LEN	1098	if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1121	ROW(row).l = ncol;	1099	ROW(screen.cur.row).l = ncol;
1122		1100
1123	scr_gotorc (0, 0, R_RELATIVE);	1101	scr_gotorc (0, 0, R_RELATIVE);
1124	scr_insdel_chars (1, DELETE);	1102	scr_insdel_chars (1, DELETE);
1125	scr_gotorc (0, ncol - 1, R_RELATIVE);	1103	scr_gotorc (0, ncol - 1, R_RELATIVE);
1126	}	1104	}
…		…
1136	{	1114	{
1137	want_refresh = 1;	1115	want_refresh = 1;
1138	ZERO_SCROLLBACK ();	1116	ZERO_SCROLLBACK ();
1139		1117
1140	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;	1118	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1141	MAX_IT (screen.cur.col, 0);	1119	clamp_it (screen.cur.col, 0, ncol - 1);
1142	MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1143		1120
1144	screen.flags &= ~Screen_WrapNext;	1121	screen.flags &= ~Screen_WrapNext;
1145		1122
1146	if (relative & R_RELATIVE)	1123	if (relative & R_RELATIVE)
1147	{	1124	{
…		…
1165	else	1142	else
1166	{	1143	{
1167	if (screen.flags & Screen_Relative)	1144	if (screen.flags & Screen_Relative)
1168	{ /* relative origin mode */	1145	{ /* relative origin mode */
1169	screen.cur.row = row + screen.tscroll;	1146	screen.cur.row = row + screen.tscroll;
1170	MIN_IT (screen.cur.row, screen.bscroll);	1147	min_it (screen.cur.row, screen.bscroll);
1171	}	1148	}
1172	else	1149	else
1173	screen.cur.row = row;	1150	screen.cur.row = row;
1174	}	1151	}
1175		1152
1176	MAX_IT (screen.cur.row, 0);	1153	clamp_it (screen.cur.row, 0, nrow - 1);
1177	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1178	}	1154	}
1179		1155
1180	/* ------------------------------------------------------------------------- */	1156	/* ------------------------------------------------------------------------- */
1181	/*	1157	/*
1182	* direction should be UP or DN	1158	* direction should be UP or DN
…		…
1197	|| (screen.cur.row == screen.tscroll && direction == DN))	1173	|| (screen.cur.row == screen.tscroll && direction == DN))
1198	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);	1174	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1199	else	1175	else
1200	screen.cur.row += dirn;	1176	screen.cur.row += dirn;
1201		1177
1202	MAX_IT (screen.cur.row, 0);	1178	clamp_it (screen.cur.row, 0, nrow - 1);
1203	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1204	selection_check (0);	1179	selection_check (0);
1205	}	1180	}
1206		1181
1207	/* ------------------------------------------------------------------------- */	1182	/* ------------------------------------------------------------------------- */
1208	/*	1183	/*
…		…
1212	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1187	* XTERM_SEQ: Clear whole line : ESC [ 2 K
1213	*/	1188	*/
1214	void	1189	void
1215	rxvt_term::scr_erase_line (int mode)	1190	rxvt_term::scr_erase_line (int mode)
1216	{	1191	{
1217	unsigned int row, col, num;	1192	unsigned int col, num;
1218		1193
1219	want_refresh = 1;	1194	want_refresh = 1;
1220	ZERO_SCROLLBACK ();	1195	ZERO_SCROLLBACK ();
1221		1196
1222	selection_check (1);	1197	selection_check (1);
1223		1198
1224	row = screen.cur.row;	1199	line_t &line = ROW(screen.cur.row);
1225		1200
1226	switch (mode)	1201	switch (mode)
1227	{	1202	{
1228	case 0: /* erase to end of line */	1203	case 0: /* erase to end of line */
1229	col = screen.cur.col;	1204	col = screen.cur.col;
1230	num = ncol - col;	1205	num = ncol - col;
1231	MIN_IT (ROW(row).l, (int16_t)col);	1206	min_it (line.l, col);
1232	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1207	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1233	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1208	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1234	CLEAR_SELECTION ();	1209	CLEAR_SELECTION ();
1235	break;	1210	break;
1236	case 1: /* erase to beginning of line */	1211	case 1: /* erase to beginning of line */
…		…
1241	CLEAR_SELECTION ();	1216	CLEAR_SELECTION ();
1242	break;	1217	break;
1243	case 2: /* erase whole line */	1218	case 2: /* erase whole line */
1244	col = 0;	1219	col = 0;
1245	num = ncol;	1220	num = ncol;
1246	ROW(row).l = 0;	1221	line.l = 0;
1247	if (selection.beg.row <= screen.cur.row	1222	if (selection.beg.row <= screen.cur.row
1248	&& selection.end.row >= screen.cur.row)	1223	&& selection.end.row >= screen.cur.row)
1249	CLEAR_SELECTION ();	1224	CLEAR_SELECTION ();
1250	break;	1225	break;
1251	default:	1226	default:
1252	return;	1227	return;
1253	}	1228	}
1254		1229
1255	scr_blank_line (ROW(row), col, num, rstyle);	1230	scr_blank_line (line, col, num, rstyle);
1256	}	1231	}
1257		1232
1258	/* ------------------------------------------------------------------------- */	1233	/* ------------------------------------------------------------------------- */
1259	/*	1234	/*
1260	* Erase part of whole of the screen	1235	* Erase part of whole of the screen
…		…
1303	CLEAR_SELECTION ();	1278	CLEAR_SELECTION ();
1304		1279
1305	if (row >= nrow) /* Out Of Bounds */	1280	if (row >= nrow) /* Out Of Bounds */
1306	return;	1281	return;
1307		1282
1308	MIN_IT (num, (nrow - row));	1283	min_it (num, nrow - row);
1309		1284
1310	if (rstyle & (RS_RVid | RS_Uline))	1285	if (rstyle & (RS_RVid | RS_Uline))
1311	ren = (rend_t) ~RS_None;	1286	ren = (rend_t) ~RS_None;
1312	else if (GET_BASEBG (rstyle) == Color_bg)	1287	else if (GET_BASEBG (rstyle) == Color_bg)
1313	{	1288	{
…		…
1315	CLEAR_ROWS (row, num);	1290	CLEAR_ROWS (row, num);
1316	}	1291	}
1317	else	1292	else
1318	{	1293	{
1319	ren = rstyle & (RS_fgMask | RS_bgMask);	1294	ren = rstyle & (RS_fgMask | RS_bgMask);
1320	gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];	1295	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1321	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1296	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1322	ERASE_ROWS (row, num);	1297	ERASE_ROWS (row, num);
1323	gcvalue.foreground = pix_colors[Color_fg];	1298	gcvalue.foreground = pix_colors[Color_fg];
1324	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1299	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1325	}	1300	}
1326		1301
1327	for (; num--; row++)	1302	for (; num--; row++)
1328	{	1303	{
		1304	ROW (row).l = 0;
1329	scr_blank_screen_mem (ROW (row), rstyle);	1305	scr_blank_screen_mem (ROW (row), rstyle);
1330	ROW (row).l = 0;
1331	scr_blank_line (drawn[row], 0, ncol, ren);	1306	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1332	}	1307	}
1333	}	1308	}
1334		1309
1335	#if ENABLE_FRILLS	1310	#if ENABLE_FRILLS
1336	void	1311	void
…		…
1421	return;	1396	return;
1422		1397
1423	scr_do_wrap ();	1398	scr_do_wrap ();
1424		1399
1425	selection_check (1);	1400	selection_check (1);
1426	MIN_IT (count, (ncol - screen.cur.col));	1401	min_it (count, ncol - screen.cur.col);
1427		1402
1428	row = screen.cur.row;	1403	row = screen.cur.row;
1429		1404
1430	line_t *line = &ROW(row);	1405	line_t *line = &ROW(row);
1431		1406
…		…
1439	}	1414	}
1440		1415
1441	if (!line->is_longer ())	1416	if (!line->is_longer ())
1442	{	1417	{
1443	line->l += count;	1418	line->l += count;
1444	MIN_IT (line->l, ncol);	1419	min_it (line->l, ncol);
1445	}	1420	}
1446		1421
1447	if (selection.op && current_screen == selection.screen	1422	if (selection.op && current_screen == selection.screen
1448	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1423	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1449	{	1424	{
…		…
1510	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1485	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1511	*/	1486	*/
1512	void	1487	void
1513	rxvt_term::scr_scroll_region (int top, int bot)	1488	rxvt_term::scr_scroll_region (int top, int bot)
1514	{	1489	{
1515	MAX_IT (top, 0);	1490	max_it (top, 0);
1516	MIN_IT (bot, (int)nrow - 1);	1491	min_it (bot, nrow - 1);
1517		1492
1518	if (top > bot)	1493	if (top > bot)
1519	return;	1494	return;
1520		1495
1521	screen.tscroll = top;	1496	screen.tscroll = top;
…		…
1619	XGCValues gcvalue;	1594	XGCValues gcvalue;
1620		1595
1621	if (rvideo != mode)	1596	if (rvideo != mode)
1622	{	1597	{
1623	rvideo = mode;	1598	rvideo = mode;
1624	SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);	1599	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1625	#if XPM_BACKGROUND	1600	#if XPM_BACKGROUND
1626	if (bgPixmap.pixmap == None)	1601	if (bgPixmap.pixmap == None)
1627	#endif	1602	#endif
1628	#if TRANSPARENT	1603	#if TRANSPARENT
1629	if (! (options & Opt_transparent) || am_transparent == 0)	1604	if (! OPTION (Opt_transparent) || am_transparent == 0)
1630	#endif	1605	#endif
1631	XSetWindowBackground (display->display, vt,	1606	XSetWindowBackground (display->display, vt,
1632	pix_colors[Color_bg]);	1607	pix_colors[Color_bg]);
1633		1608
1634	gcvalue.foreground = pix_colors[Color_fg];	1609	gcvalue.foreground = pix_colors[Color_fg];
…		…
1725	bool found = false;	1700	bool found = false;
1726		1701
1727	for (int i = 0; i < nrow; i++)	1702	for (int i = 0; i < nrow; i++)
1728	{	1703	{
1729	int col = 0;	1704	int col = 0;
1730	rend_t *drp = drawn[i].r;	1705	rend_t *drp = drawn_buf[i].r;
1731		1706
1732	for (; col < ncol; col++, drp++)	1707	for (; col < ncol; col++, drp++)
1733	if ((*drp & mask) == value)	1708	if ((*drp & mask) == value)
1734	{	1709	{
1735	found = true;	1710	found = true;
…		…
1753	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)	1728	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1754	{	1729	{
1755	int i;	1730	int i;
1756	row_col_t rc[RC_COUNT];	1731	row_col_t rc[RC_COUNT];
1757		1732
1758	if (!drawn) /* sanity check */	1733	if (!drawn_buf) /* sanity check */
1759	return;	1734	return;
1760		1735
1761	#ifndef NO_SLOW_LINK_SUPPORT	1736	#ifndef NO_SLOW_LINK_SUPPORT
1762	if (refresh_type == FAST_REFRESH && !display->is_local)	1737	if (refresh_type == FAST_REFRESH && !display->is_local)
1763	{	1738	{
1764	y = 0;	1739	y = 0;
1765	eheight = height;	1740	eheight = height;
1766	}	1741	}
1767	#endif
1768
1769	#ifdef DEBUG_STRICT
1770	x = max (x, 0);
1771	x = min (x, (int)width);
1772	y = max (y, 0);
1773	y = min (y, (int)height);
1774	#endif	1742	#endif
1775		1743
1776	/* round down */	1744	/* round down */
1777	rc[PART_BEG].col = Pixel2Col (x);	1745	rc[PART_BEG].col = Pixel2Col (x);
1778	rc[PART_BEG].row = Pixel2Row (y);	1746	rc[PART_BEG].row = Pixel2Row (y);
…		…
1781	rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);	1749	rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1782		1750
1783	/* sanity checks */	1751	/* sanity checks */
1784	for (i = PART_BEG; i < RC_COUNT; i++)	1752	for (i = PART_BEG; i < RC_COUNT; i++)
1785	{	1753	{
1786	MIN_IT (rc[i].col, ncol - 1);	1754	min_it (rc[i].col, ncol - 1);
1787	MIN_IT (rc[i].row, nrow - 1);	1755	min_it (rc[i].row, nrow - 1);
1788	}	1756	}
1789		1757
1790	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1758	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1791	fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1759	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1792		1760
1793	if (refresh)	1761	if (refresh)
1794	scr_refresh (SLOW_REFRESH);	1762	scr_refresh (SLOW_REFRESH);
1795	}	1763	}
1796		1764
…		…
1857	}	1825	}
1858		1826
1859	int	1827	int
1860	rxvt_term::scr_changeview (unsigned int oldviewstart)	1828	rxvt_term::scr_changeview (unsigned int oldviewstart)
1861	{	1829	{
		1830	PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
		1831
1862	if (view_start != oldviewstart)	1832	if (view_start != oldviewstart)
1863	{	1833	{
1864	want_refresh = 1;	1834	want_refresh = 1;
1865	num_scr -= (view_start - oldviewstart);	1835	num_scr -= (view_start - oldviewstart);
1866	}	1836	}
…		…
1874	{	1844	{
1875	#ifndef NO_BELL	1845	#ifndef NO_BELL
1876		1846
1877	# ifndef NO_MAPALERT	1847	# ifndef NO_MAPALERT
1878	# ifdef MAPALERT_OPTION	1848	# ifdef MAPALERT_OPTION
1879	if (options & Opt_mapAlert)	1849	if (OPTION (Opt_mapAlert))
1880	# endif	1850	# endif
1881	XMapWindow (display->display, parent[0]);	1851	XMapWindow (display->display, parent[0]);
1882	# endif	1852	# endif
1883		1853
1884	if (options & Opt_visualBell)	1854	if (OPTION (Opt_visualBell))
1885	{	1855	{
1886	scr_rvideo_mode (!rvideo); /* refresh also done */	1856	scr_rvideo_mode (!rvideo); /* refresh also done */
1887	rxvt_usleep (VISUAL_BELL_DURATION);	1857	rxvt_usleep (VISUAL_BELL_DURATION);
1888	scr_rvideo_mode (!rvideo); /* refresh also done */	1858	scr_rvideo_mode (!rvideo); /* refresh also done */
1889	}	1859	}
…		…
1959	{	1929	{
1960	unsigned char must_clear, /* use draw_string not draw_image_string */	1930	unsigned char must_clear, /* use draw_string not draw_image_string */
1961	showcursor; /* show the cursor */	1931	showcursor; /* show the cursor */
1962	int16_t col, row, /* column/row we're processing */	1932	int16_t col, row, /* column/row we're processing */
1963	ocrow; /* old cursor row */	1933	ocrow; /* old cursor row */
1964	int i, /* tmp */	1934	int i; /* tmp */
1965	row_offset; /* basic offset in screen structure */
1966	#ifndef NO_CURSORCOLOR	1935	#ifndef NO_CURSORCOLOR
1967	rend_t cc1; /* store colours at cursor position (s) */	1936	rend_t cc1; /* store colours at cursor position (s) */
1968	#endif	1937	#endif
1969	rend_t *crp; // cursor rendition pointer	1938	rend_t *crp; // cursor rendition pointer
1970		1939
…		…
1977	* A: set up vars	1946	* A: set up vars
1978	*/	1947	*/
1979	must_clear = 0;	1948	must_clear = 0;
1980	refresh_count = 0;	1949	refresh_count = 0;
1981		1950
1982	row_offset = term_start - view_start;
1983
1984	#if XPM_BACKGROUND	1951	#if XPM_BACKGROUND
1985	must_clear |= bgPixmap.pixmap != None;	1952	must_clear |= bgPixmap.pixmap != None;
1986	#endif	1953	#endif
1987	#if TRANSPARENT	1954	#if TRANSPARENT
1988	must_clear |= (options & Opt_transparent) && am_transparent;	1955	must_clear |= OPTION (Opt_transparent) && am_transparent;
1989	#endif	1956	#endif
1990	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	1957	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1991		1958
1992	/*	1959	/*
1993	* B: reverse any characters which are selected	1960	* B: reverse any characters which are selected
…		…
2017		1984
2018	crp = &ROW(screen.cur.row).r[col];	1985	crp = &ROW(screen.cur.row).r[col];
2019		1986
2020	if (showcursor && focus)	1987	if (showcursor && focus)
2021	{	1988	{
2022	if (options & Opt_cursorUnderline)	1989	if (OPTION (Opt_cursorUnderline))
2023	*crp ^= RS_Uline;	1990	*crp ^= RS_Uline;
2024	else	1991	else
2025	{	1992	{
2026	*crp ^= RS_RVid;	1993	*crp ^= RS_RVid;
2027		1994
…		…
2029	cc1 = *crp & (RS_fgMask | RS_bgMask);	1996	cc1 = *crp & (RS_fgMask | RS_bgMask);
2030	if (ISSET_PIXCOLOR (Color_cursor))	1997	if (ISSET_PIXCOLOR (Color_cursor))
2031	ccol1 = Color_cursor;	1998	ccol1 = Color_cursor;
2032	else	1999	else
2033	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2000	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2034	ccol1 = GET_FGCOLOR (rstyle);	2001	ccol1 = fgcolor_of (rstyle);
2035	#else	2002	#else
2036	ccol1 = Color_fg;	2003	ccol1 = Color_fg;
2037	#endif	2004	#endif
2038	if (ISSET_PIXCOLOR (Color_cursor2))	2005	if (ISSET_PIXCOLOR (Color_cursor2))
2039	ccol2 = Color_cursor2;	2006	ccol2 = Color_cursor2;
2040	else	2007	else
2041	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2008	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2042	ccol2 = GET_BGCOLOR (rstyle);	2009	ccol2 = bgcolor_of (rstyle);
2043	#else	2010	#else
2044	ccol2 = Color_bg;	2011	ccol2 = Color_bg;
2045	#endif	2012	#endif
2046	*crp = SET_FGCOLOR (*crp, ccol1);	2013	*crp = SET_FGCOLOR (*crp, ccol1);
2047	*crp = SET_BGCOLOR (*crp, ccol2);	2014	*crp = SET_BGCOLOR (*crp, ccol2);
…		…
2057	if (screen.cur.row + view_start != ocrow	2024	if (screen.cur.row + view_start != ocrow
2058	|| screen.cur.col != oldcursor.col)	2025	|| screen.cur.col != oldcursor.col)
2059	{	2026	{
2060	if (ocrow < nrow	2027	if (ocrow < nrow
2061	&& oldcursor.col < ncol)	2028	&& oldcursor.col < ncol)
2062	drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);	2029	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2063		2030
2064	if (focus || !showcursor)	2031	if (focus || !showcursor)
2065	oldcursor.row = -1;	2032	oldcursor.row = -1;
2066	else	2033	else
2067	setoldcursor = 1;	2034	setoldcursor = 1;
…		…
2080	oldcursor.col = screen.cur.col;	2047	oldcursor.col = screen.cur.col;
2081	}	2048	}
2082	}	2049	}
2083	}	2050	}
2084		2051
		2052	PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2085	#if ENABLE_OVERLAY	2053	#if ENABLE_OVERLAY
2086	scr_swap_overlay ();	2054	scr_swap_overlay ();
2087	#endif	2055	#endif
2088		2056
2089	#ifndef NO_SLOW_LINK_SUPPORT	2057	#ifndef NO_SLOW_LINK_SUPPORT
…		…
2105	row = i > 0 ? 0 : j - 1;	2073	row = i > 0 ? 0 : j - 1;
2106	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2074	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2107	{	2075	{
2108	if (row + i >= 0 && row + i < nrow && row + i != ocrow)	2076	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2109	{	2077	{
2110	line_t s = save[(row + row_offset) % total_rows];	2078	line_t s = ROW(row - view_start);
2111	line_t d = drawn[row];	2079	line_t d = drawn_buf[row];
2112	line_t d2 = drawn[row + i];	2080	line_t d2 = drawn_buf[row + i];
2113		2081
2114	for (nits = 0, col = ncol; col--; )	2082	for (nits = 0, col = ncol; col--; )
2115	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])	2083	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2116	nits--;	2084	nits--;
2117	else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])	2085	else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
…		…
2135		2103
2136	if (len != -1)	2104	if (len != -1)
2137	{	2105	{
2138	/* also comes here at end if needed because of >= above */	2106	/* also comes here at end if needed because of >= above */
2139	if (wlen < len)	2107	if (wlen < len)
2140	SWAP_IT (wlen, len, int);	2108	::swap (wlen, len);
2141		2109
2142	XCopyArea (display->display, vt, vt,	2110	XCopyArea (display->display, vt, vt,
2143	gc, 0, Row2Pixel (len + i),	2111	gc, 0, Row2Pixel (len + i),
2144	(unsigned int)TermWin_TotalWidth (),	2112	(unsigned int)this->width,
2145	(unsigned int)Height2Pixel (wlen - len + 1),	2113	(unsigned int)Height2Pixel (wlen - len + 1),
2146	0, Row2Pixel (len));	2114	0, Row2Pixel (len));
2147	len = -1;	2115	len = -1;
2148	}	2116	}
2149	}	2117	}
…		…
2153	/*	2121	/*
2154	* E: main pass across every character	2122	* E: main pass across every character
2155	*/	2123	*/
2156	for (row = 0; row < nrow; row++)	2124	for (row = 0; row < nrow; row++)
2157	{	2125	{
2158	text_t *stp = save[(row + row_offset) % total_rows].t;	2126	text_t *stp = ROW(row - view_start).t;
2159	rend_t *srp = save[(row + row_offset) % total_rows].r;	2127	rend_t *srp = ROW(row - view_start).r;
2160	text_t *dtp = drawn[row].t;	2128	text_t *dtp = drawn_buf[row].t;
2161	rend_t *drp = drawn[row].r;	2129	rend_t *drp = drawn_buf[row].r;
2162		2130
2163	/*	2131	/*
2164	* E2: OK, now the real pass	2132	* E2: OK, now the real pass
2165	*/	2133	*/
2166	int ypixel = (int)Row2Pixel (row);	2134	int ypixel = (int)Row2Pixel (row);
…		…
2228	count++, i--;	2196	count++, i--;
2229		2197
2230	/*	2198	/*
2231	* Determine the attributes for the string	2199	* Determine the attributes for the string
2232	*/	2200	*/
2233	int fore = GET_FGCOLOR (rend); // desired foreground	2201	int fore = fgcolor_of (rend); // desired foreground
2234	int back = GET_BGCOLOR (rend); // desired background	2202	int back = bgcolor_of (rend); // desired background
2235		2203
2236	// only do special processing if any attributes are set, which is rare	2204	// only do special processing if any attributes are set, which is unlikely
2237	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2205	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2238	{	2206	{
2239	#if ENABLE_STYLES	2207	#if ENABLE_STYLES
2240	// force redraw after "careful" characters to avoid pixel droppings	2208	// force redraw after "careful" characters to avoid pixel droppings
2241	if (srp[col] & RS_Careful && col < ncol - 1 && 0)	2209	if (srp[col] & RS_Careful && col < ncol - 1 && 0)
…		…
2277	fore = Color_UL;	2245	fore = Color_UL;
2278	#endif	2246	#endif
2279		2247
2280	if (invert)	2248	if (invert)
2281	{	2249	{
2282	SWAP_IT (fore, back, int);	2250	::swap (fore, back);
2283		2251
2284	#ifndef NO_BOLD_UNDERLINE_REVERSE	2252	#ifndef NO_BOLD_UNDERLINE_REVERSE
2285	if (ISSET_PIXCOLOR (Color_RV))	2253	if (ISSET_PIXCOLOR (Color_RV))
2286	back = Color_RV;	2254	back = Color_RV;
2287		2255
…		…
2352	} /* for (row....) */	2320	} /* for (row....) */
2353		2321
2354	#if ENABLE_OVERLAY	2322	#if ENABLE_OVERLAY
2355	scr_swap_overlay ();	2323	scr_swap_overlay ();
2356	#endif	2324	#endif
		2325	PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2357		2326
2358	/*	2327	/*
2359	* G: cleanup cursor and display outline cursor if necessary	2328	* G: cleanup cursor and display outline cursor if necessary
2360	*/	2329	*/
2361	if (showcursor)	2330	if (showcursor)
2362	{	2331	{
2363	if (focus)	2332	if (focus)
2364	{	2333	{
2365	if (options & Opt_cursorUnderline)	2334	if (OPTION (Opt_cursorUnderline))
2366	*crp ^= RS_Uline;	2335	*crp ^= RS_Uline;
2367	else	2336	else
2368	{	2337	{
2369	*crp ^= RS_RVid;	2338	*crp ^= RS_RVid;
2370	#ifndef NO_CURSORCOLOR	2339	#ifndef NO_CURSORCOLOR
…		…
2379		2348
2380	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2349	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2381	col--;	2350	col--;
2382		2351
2383	while (col + cursorwidth < ncol	2352	while (col + cursorwidth < ncol
2384	&& drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)	2353	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2385	cursorwidth++;	2354	cursorwidth++;
2386		2355
2387	#ifndef NO_CURSORCOLOR	2356	#ifndef NO_CURSORCOLOR
2388	if (ISSET_PIXCOLOR (Color_cursor))	2357	if (ISSET_PIXCOLOR (Color_cursor))
2389	XSetForeground (display->display, gc, pix_colors[Color_cursor]);	2358	XSetForeground (display->display, gc, pix_colors[Color_cursor]);
…		…
2421		2390
2422	void	2391	void
2423	rxvt_term::scr_remap_chars ()	2392	rxvt_term::scr_remap_chars ()
2424	{	2393	{
2425	for (int i = total_rows; i--; )	2394	for (int i = total_rows; i--; )
2426	scr_remap_chars (save[i]);	2395	scr_remap_chars (row_buf [i]);
2427		2396
2428	for (int i = nrow; i--; )	2397	for (int i = nrow; i--; )
2429	{	2398	{
2430	scr_remap_chars (drawn[i]);	2399	scr_remap_chars (drawn_buf [i]);
2431	scr_remap_chars (swap_save[i]);	2400	scr_remap_chars (swap_buf [i]);
2432	}	2401	}
2433	}	2402	}
2434		2403
2435	void	2404	void
2436	rxvt_term::scr_recolour ()	2405	rxvt_term::scr_recolour ()
…		…
2489		2458
2490	#if ENABLE_FRILLS	2459	#if ENABLE_FRILLS
2491	if (selection.rect)	2460	if (selection.rect)
2492	{	2461	{
2493	for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)	2462	for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
		2463	{
		2464	text_t *stp = ROW(row).t;
		2465	rend_t *srp = ROW(row).r;
		2466
2494	for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)	2467	for (col = selection.beg.col; col < selection.end.col; col++)
2495	srp[col] ^= RS_RVid;	2468	srp[col] ^= RS_RVid;
		2469
		2470	while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
		2471	srp[col] ^= RS_RVid | RS_Uline;
		2472
		2473	if (++col < selection.end.col)
		2474	srp[col] ^= RS_RVid | RS_Uline;
		2475	}
2496	}	2476	}
2497	else	2477	else
2498	#endif	2478	#endif
2499	{	2479	{
2500	if (selection.beg.row >= -view_start)	2480	if (selection.beg.row >= -view_start)
…		…
2503	row = selection.beg.row;	2483	row = selection.beg.row;
2504	}	2484	}
2505	else	2485	else
2506	{	2486	{
2507	col = 0;	2487	col = 0;
2508	row = view_start;	2488	row = -view_start;
2509	}	2489	}
2510		2490
2511	for (; row < min (selection.end.row, view_end); row++, col = 0)	2491	for (; row < min (selection.end.row, view_end); row++, col = 0)
2512	for (rend_t *srp = ROW(row).r; col < ncol; col++)	2492	for (rend_t *srp = ROW(row).r; col < ncol; col++)
2513	srp[col] ^= RS_RVid;	2493	srp[col] ^= RS_RVid;
…		…
2533	char r1[] = "\n";	2513	char r1[] = "\n";
2534		2514
2535	for (row = saveLines - nsaved;	2515	for (row = saveLines - nsaved;
2536	row < saveLines + nrow - 1; row++)	2516	row < saveLines + nrow - 1; row++)
2537	{	2517	{
2538	width = save[row].l >= 0 ? save[row].l	2518	width = row_buf[row].l >= 0 ? row_buf[row].l
2539	: ncol;	2519	: ncol;
2540	for (towrite = width; towrite; towrite -= wrote)	2520	for (towrite = width; towrite; towrite -= wrote)
2541	{	2521	{
2542	wrote = write (fd, & (save[row].t[width - towrite]),	2522	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2543	towrite);	2523	towrite);
2544	if (wrote < 0)	2524	if (wrote < 0)
2545	return; /* XXX: death, no report */	2525	return; /* XXX: death, no report */
2546	}	2526	}
2547	if (save[row].l >= 0)	2527	if (row_buf[row].l >= 0)
2548	if (write (fd, r1, 1) <= 0)	2528	if (write (fd, r1, 1) <= 0)
2549	return; /* XXX: death, no report */	2529	return; /* XXX: death, no report */
2550	}	2530	}
2551	}	2531	}
2552	#endif	2532	#endif
…		…
2584	/* ------------------------------------------------------------------------- */	2564	/* ------------------------------------------------------------------------- */
2585	/*	2565	/*
2586	* Paste a selection direct to the command fd	2566	* Paste a selection direct to the command fd
2587	*/	2567	*/
2588	void	2568	void
2589	rxvt_term::paste (unsigned char *data, unsigned int len)	2569	rxvt_term::paste (char *data, unsigned int len)
2590	{	2570	{
2591	/* convert normal newline chars into common keyboard Return key sequence */	2571	/* convert normal newline chars into common keyboard Return key sequence */
2592	for (unsigned int i = 0; i < len; i++)	2572	for (unsigned int i = 0; i < len; i++)
2593	if (data[i] == C0_LF)	2573	if (data[i] == C0_LF)
2594	data[i] = C0_CR;	2574	data[i] = C0_CR;
…		…
2738	{	2718	{
2739	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);	2719	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2740	char *s = rxvt_wcstombs (w);	2720	char *s = rxvt_wcstombs (w);
2741	free (w);	2721	free (w);
2742	// TODO: strlen == only the first element will be converted. well...	2722	// TODO: strlen == only the first element will be converted. well...
2743	paste ((unsigned char *)s, strlen (s));	2723	paste (s, strlen (s));
2744	free (s);	2724	free (s);
2745	}	2725	}
2746	else	2726	else
2747	#endif	2727	#endif
2748	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0	2728	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2749	&& cl)	2729	&& cl)
2750	{	2730	{
2751	for (int i = 0; i < cr; i++)	2731	for (int i = 0; i < cr; i++)
2752	paste ((unsigned char *)cl[i], strlen (cl[i]));	2732	paste (cl[i], strlen (cl[i]));
2753		2733
2754	XFreeStringList (cl);	2734	XFreeStringList (cl);
2755	}	2735	}
2756	else	2736	else
2757	paste (ct.value, ct.nitems); // paste raw	2737	paste ((char *)ct.value, ct.nitems); // paste raw
2758		2738
2759	bailout:	2739	bailout:
2760	XFree (ct.value);	2740	XFree (ct.value);
2761		2741
2762	if (selection_wait == Sel_normal)	2742	if (selection_wait == Sel_normal)
…		…
2800	return; /* outside window */	2780	return; /* outside window */
2801		2781
2802	if (selection.text)	2782	if (selection.text)
2803	{ /* internal selection */	2783	{ /* internal selection */
2804	char *str = rxvt_wcstombs (selection.text, selection.len);	2784	char *str = rxvt_wcstombs (selection.text, selection.len);
2805	paste ((unsigned char *)str, strlen (str));	2785	paste (str, strlen (str));
2806	free (str);	2786	free (str);
2807	return;	2787	return;
2808	}	2788	}
2809	else	2789	else
2810	{	2790	{
…		…
2902	selection.op = SELECTION_DONE;	2882	selection.op = SELECTION_DONE;
2903		2883
2904	if (selection.clicks == 4)	2884	if (selection.clicks == 4)
2905	return; /* nothing selected, go away */	2885	return; /* nothing selected, go away */
2906		2886
		2887	if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
		2888	return;
		2889
2907	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2890	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2908	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2891	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2909		2892
2910	int ofs = 0;	2893	int ofs = 0;
2911	int extra = 0;	2894	int extra = 0;
…		…
2927	#endif	2910	#endif
2928	end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN	2911	end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2929		2912
2930	col = max (col, 0);	2913	col = max (col, 0);
2931		2914
2932	if (row == selection.end.row || selection.rect)	2915	if (row == selection.end.row
		2916	#if ENABLE_FRILLS
		2917	|| selection.rect
		2918	#endif
		2919	)
2933	end_col = min (end_col, selection.end.col);	2920	min_it (end_col, selection.end.col);
2934		2921
2935	t = ROW(row).t + col;	2922	t = ROW(row).t + col;
2936	for (; col < end_col; col++)	2923	for (; col < end_col; col++)
2937	{	2924	{
2938	if (*t == NOCHAR)	2925	if (*t == NOCHAR)
…		…
2956	#endif	2943	#endif
2957	else	2944	else
2958	new_selection_text[ofs++] = *t++;	2945	new_selection_text[ofs++] = *t++;
2959	}	2946	}
2960		2947
		2948	#if ENABLE_FRILLS
		2949	if (selection.rect)
		2950	{
		2951	while (ofs
		2952	&& new_selection_text[ofs - 1] != C0_LF
		2953	&& unicode::is_space (new_selection_text[ofs - 1]))
		2954	--ofs;
		2955
		2956	new_selection_text[ofs++] = C0_LF;
		2957	}
		2958	else
		2959	#endif
2961	if (!ROW(row).is_longer () && row != selection.end.row)	2960	if (!ROW(row).is_longer () && row != selection.end.row)
2962	new_selection_text[ofs++] = C0_LF;	2961	new_selection_text[ofs++] = C0_LF;
2963	}	2962	}
2964		2963
2965	if (end_col != selection.end.col)	2964	if (end_col != selection.end.col)
2966	new_selection_text[ofs++] = C0_LF;	2965	new_selection_text[ofs++] = C0_LF;
2967		2966
…		…
2977		2976
2978	// we usually allocate much more than necessary, so realloc it smaller again	2977	// we usually allocate much more than necessary, so realloc it smaller again
2979	selection.len = ofs;	2978	selection.len = ofs;
2980	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));	2979	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2981		2980
		2981	if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
		2982	return;
		2983
		2984	selection_grab (tm);
		2985	}
		2986
		2987	bool
		2988	rxvt_term::selection_grab (Time tm)
		2989	{
		2990	selection_time = tm;
		2991
2982	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);	2992	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2983	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)	2993	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
		2994	{
2984	display->set_selection_owner (this);	2995	display->set_selection_owner (this);
		2996	return true;
		2997	}
2985	else	2998	else
2986	rxvt_warn ("can't get primary selection, ignoring.\n");	2999	return false;
2987		3000
2988	#if 0	3001	#if 0
2989	XTextProperty ct;	3002	XTextProperty ct;
2990		3003
2991	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)	3004	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2992	{	3005	{
2993	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);	3006	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2994	XFree (ct.value);	3007	XFree (ct.value);
2995	}	3008	}
2996	#endif	3009	#endif
2997
2998	selection_time = tm;
2999	}	3010	}
3000		3011
3001	/* ------------------------------------------------------------------------- */	3012	/* ------------------------------------------------------------------------- */
3002	/*	3013	/*
3003	* Mark or select text based upon number of clicks: 1, 2, or 3	3014	* Mark or select text based upon number of clicks: 1, 2, or 3
…		…
3029	want_refresh = 1;	3040	want_refresh = 1;
3030		3041
3031	selection.mark.row = row - view_start;	3042	selection.mark.row = row - view_start;
3032	selection.mark.col = col;	3043	selection.mark.col = col;
3033		3044
3034	selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1);	3045	selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3035	selection.mark.col = min (max (selection.mark.col, 0), ncol - 1);	3046	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3036		3047
3037	while (selection.mark.col > 0	3048	while (selection.mark.col > 0
3038	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)	3049	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3039	--selection.mark.col;	3050	--selection.mark.col;
3040		3051
…		…
3145	* flag == 2 ==> button 3 motion	3156	* flag == 2 ==> button 3 motion
3146	*/	3157	*/
3147	void	3158	void
3148	rxvt_term::selection_extend (int x, int y, int flag)	3159	rxvt_term::selection_extend (int x, int y, int flag)
3149	{	3160	{
3150	int col = min (max (Pixel2Col (x), 0), nrow - 1);	3161	int col = clamp (Pixel2Col (x), 0, ncol);
3151	int row = min (max (Pixel2Row (y), 0), ncol);	3162	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3152		3163
3153	/*	3164	/*
3154	* 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
3155	* 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
3156	* 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
…		…
3312	else if (selection.clicks == 2)	3323	else if (selection.clicks == 2)
3313	{	3324	{
3314	if (ROWCOL_IS_AFTER (selection.end, selection.beg))	3325	if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3315	selection.end.col--;	3326	selection.end.col--;
3316		3327
		3328	if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
		3329	{
3317	selection_delimit_word (UP, &selection.beg, &selection.beg);	3330	selection_delimit_word (UP, &selection.beg, &selection.beg);
3318	selection_delimit_word (DN, &selection.end, &selection.end);	3331	selection_delimit_word (DN, &selection.end, &selection.end);
		3332	}
3319	}	3333	}
3320	else if (selection.clicks == 3)	3334	else if (selection.clicks == 3)
3321	{	3335	{
3322	#if ENABLE_FRILLS	3336	#if ENABLE_FRILLS
3323	if (options & Opt_tripleclickwords)	3337	if (OPTION (Opt_tripleclickwords))
3324	{	3338	{
3325	selection_delimit_word (UP, &selection.beg, &selection.beg);	3339	selection_delimit_word (UP, &selection.beg, &selection.beg);
3326		3340
3327	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++)
3328	{	3342	{
…		…
3369	}	3383	}
3370	}	3384	}
3371		3385
3372	#if ENABLE_FRILLS	3386	#if ENABLE_FRILLS
3373	if (selection.rect && selection.beg.col > selection.end.col)	3387	if (selection.rect && selection.beg.col > selection.end.col)
3374	SWAP_IT (selection.beg.col, selection.end.col, int);	3388	::swap (selection.beg.col, selection.end.col);
3375	#endif	3389	#endif
3376	}	3390	}
3377		3391
3378	#if ENABLE_FRILLS	3392	#if ENABLE_FRILLS
3379	void	3393	void
…		…
3389	{	3403	{
3390	stp = ROW(end_row).t;	3404	stp = ROW(end_row).t;
3391		3405
3392	while (--end_col >= 0)	3406	while (--end_col >= 0)
3393	{	3407	{
3394	if (stp[end_col] != ' '	3408	if (stp[end_col] != NOCHAR
3395	&& stp[end_col] != '\t'	3409	&& !unicode::is_space (stp[end_col]))
3396	&& stp[end_col] != NOCHAR)
3397	break;	3410	break;
3398	}	3411	}
3399		3412
3400	if (end_col >= 0	3413	if (end_col >= 0
3401	|| !ROW(end_row - 1).is_longer ())	3414	|| !ROW(end_row - 1).is_longer ())
…		…
3577	*/	3590	*/
3578	void	3591	void
3579	rxvt_term::pixel_position (int *x, int *y)	3592	rxvt_term::pixel_position (int *x, int *y)
3580	{	3593	{
3581	*x = Pixel2Col (*x);	3594	*x = Pixel2Col (*x);
3582	/* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */	3595	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3583	*y = Pixel2Row (*y);	3596	*y = Pixel2Row (*y);
3584	/* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */	3597	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3585	}	3598	}
3586		3599
3587	/* ------------------------------------------------------------------------- */	3600	/* ------------------------------------------------------------------------- */
3588	#ifdef USE_XIM	3601	#ifdef USE_XIM
3589	void	3602	void
…		…
3600		3613
3601	#if ENABLE_OVERLAY	3614	#if ENABLE_OVERLAY
3602	void	3615	void
3603	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)
3604	{	3617	{
3605	if (nrow < 3 || ncol < 3)	3618	if (nrow < 1 || ncol < 1)
3606	return;	3619	return;
3607		3620
3608	want_refresh = 1;	3621	want_refresh = 1;
3609		3622
3610	scr_overlay_off ();	3623	scr_overlay_off ();
3611		3624
3612	if (x < 0) x = ncol - w;	3625	if (x < 0) x = ncol - w;
3613	if (y < 0) y = nrow - h;	3626	if (y < 0) y = nrow - h;
3614		3627
3615	// make space for border	3628	// make space for border
3616	w += 2; MIN_IT (w, ncol);	3629	w += 2; min_it (w, ncol);
3617	h += 2; MIN_IT (h, nrow);	3630	h += 2; min_it (h, nrow);
3618		3631
3619	x -= 1; MAX_IT (x, 0);	3632	x -= 1; clamp_it (x, 0, ncol - w);
3620	y -= 1; MAX_IT (y, 0);	3633	y -= 1; clamp_it (y, 0, nrow - h);
3621
3622	MIN_IT (x, ncol - w);
3623	MIN_IT (y, nrow - h);
3624		3634
3625	ov_x = x; ov_y = y;	3635	ov_x = x; ov_y = y;
3626	ov_w = w; ov_h = h;	3636	ov_w = w; ov_h = h;
3627		3637
3628	ov_text = new text_t *[h];	3638	ov_text = new text_t *[h];
…		…
3720	for (int y = ov_h; y--; )	3730	for (int y = ov_h; y--; )
3721	{	3731	{
3722	text_t *t1 = ov_text[y];	3732	text_t *t1 = ov_text[y];
3723	rend_t *r1 = ov_rend[y];	3733	rend_t *r1 = ov_rend[y];
3724		3734
3725	text_t *t2 = ROW(y - view_start).t + ov_x;	3735	text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3726	rend_t *r2 = ROW(y - view_start).r + ov_x;	3736	rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3727		3737
3728	for (int x = ov_w; x--; )	3738	for (int x = ov_w; x--; )
3729	{	3739	{
3730	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3740	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3731	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