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.170 by root, Mon Nov 28 19:35:04 2005 UTC vs.
Revision 1.179 by root, Tue Dec 20 22:47:14 2005 UTC

…		…
47	/* ------------------------------------------------------------------------- *	47	/* ------------------------------------------------------------------------- *
48	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *	48	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49	* ------------------------------------------------------------------------- */	49	* ------------------------------------------------------------------------- */
50	#define ZERO_SCROLLBACK() \	50	#define ZERO_SCROLLBACK() \
51	if (options & Opt_scrollTtyOutput) \	51	if (options & Opt_scrollTtyOutput) \
52	TermWin.view_start = 0	52	view_start = 0
53	#define CLEAR_SELECTION() \	53	#define CLEAR_SELECTION() \
54	selection.beg.row = selection.beg.col \	54	selection.beg.row = selection.beg.col \
55	= selection.end.row = selection.end.col = 0	55	= selection.end.row = selection.end.col = 0
56	#define CLEAR_ALL_SELECTION() \	56	#define CLEAR_ALL_SELECTION() \
57	selection.beg.row = selection.beg.col \	57	selection.beg.row = selection.beg.col \
…		…
88	/*	88	/*
89	* CLEAR_ROWS : clear <num> rows starting from row <row>	89	* CLEAR_ROWS : clear <num> rows starting from row <row>
90	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>	90	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91	* ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour	91	* ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92	*/	92	*/
93	#define drawBuffer TermWin.vt	93	#define drawBuffer vt
94		94
95	#define CLEAR_ROWS(row, num) \	95	#define CLEAR_ROWS(row, num) \
96	if (TermWin.mapped) \	96	if (mapped) \
97	XClearArea (display->display, drawBuffer, 0, \	97	XClearArea (display->display, drawBuffer, 0, \
98	Row2Pixel (row), (unsigned int)TermWin.width, \	98	Row2Pixel (row), (unsigned int)width, \
99	(unsigned int)Height2Pixel (num), False)	99	(unsigned int)Height2Pixel (num), False)
100		100
101	#define CLEAR_CHARS(x, y, num) \	101	#define CLEAR_CHARS(x, y, num) \
102	if (TermWin.mapped) \	102	if (mapped) \
103	XClearArea (display->display, drawBuffer, x, y, \	103	XClearArea (display->display, drawBuffer, x, y, \
104	(unsigned int)Width2Pixel (num), \	104	(unsigned int)Width2Pixel (num), \
105	(unsigned int)Height2Pixel (1), False)	105	(unsigned int)Height2Pixel (1), False)
106		106
107	#define ERASE_ROWS(row, num) \	107	#define ERASE_ROWS(row, num) \
108	XFillRectangle (display->display, drawBuffer, TermWin.gc, \	108	XFillRectangle (display->display, drawBuffer, gc, \
109	0, Row2Pixel (row), \	109	0, Row2Pixel (row), \
110	(unsigned int)TermWin.width, \	110	(unsigned int)width, \
111	(unsigned int)Height2Pixel (num))	111	(unsigned int)Height2Pixel (num))
112		112
113	/* ------------------------------------------------------------------------- *	113	/* ------------------------------------------------------------------------- *
114	* SCREEN `COMMON' ROUTINES *	114	* SCREEN `COMMON' ROUTINES *
115	* ------------------------------------------------------------------------- */	115	* ------------------------------------------------------------------------- */
116		116
117	/* Fill part/all of a line with blanks. */	117	/* Fill part/all of a line with blanks. */
118	void	118	void
119	rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)	119	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
120	{	120	{
		121	if (!l.t)
		122	{
		123	lalloc (l);
		124	col = 0;
		125	width = ncol;
		126	}
		127
121	efs &= ~RS_baseattrMask;	128	efs &= ~RS_baseattrMask;
122	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));	129	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123		130
		131	text_t *et = l.t + col;
		132	rend_t *er = l.r + col;
		133
124	while (width--)	134	while (width--)
125	{	135	{
126	*et++ = ' ';	136	*et++ = ' ';
127	*er++ = efs;	137	*er++ = efs;
128	}	138	}
129	}	139	}
130		140
131	/* ------------------------------------------------------------------------- */	141	/* ------------------------------------------------------------------------- */
132	/* Fill a full line with blanks - make sure it is allocated first */	142	/* Fill a full line with blanks - make sure it is allocated first */
133	void	143	void
134	rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs)	144	rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
135	{	145	{
136	#ifdef DEBUG_STRICT	146	scr_blank_line (l, 0, ncol, efs);
137	assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
138	#endif
139	if (tp[row] == NULL)
140	{
141	tp[row] = (text_t *)talloc->alloc ();
142	rp[row] = (rend_t *)ralloc->alloc ();
143	}
144
145	scr_blank_line (tp[row], rp[row], TermWin.ncol, efs);
146	}	147	}
147		148
148	/* ------------------------------------------------------------------------- *	149	/* ------------------------------------------------------------------------- *
149	* SCREEN INITIALISATION *	150	* SCREEN INITIALISATION *
150	* ------------------------------------------------------------------------- */	151	* ------------------------------------------------------------------------- */
151	void	152	void
152	rxvt_term::scr_reset ()	153	rxvt_term::scr_reset ()
153	{	154	{
154	unsigned int ncol, nrow, total_rows, prev_total_rows;
155	unsigned int p, q;	155	unsigned int p, q;
156	int k;	156	int k;
157	rend_t setrstyle;
158		157
159	#if ENABLE_OVERLAY	158	#if ENABLE_OVERLAY
160	scr_overlay_off ();	159	scr_overlay_off ();
161	#endif	160	#endif
162		161
163	TermWin.view_start = 0;	162	view_start = 0;
164	num_scr = 0;	163	num_scr = 0;
165		164
166	if (TermWin.ncol == 0)	165	if (ncol == 0)
167	TermWin.ncol = 80;	166	ncol = 80;
168		167
169	if (TermWin.nrow == 0)	168	if (nrow == 0)
170	TermWin.nrow = 24;	169	nrow = 24;
171
172	ncol = TermWin.ncol;
173	nrow = TermWin.nrow;
174		170
175	if (ncol == prev_ncol && nrow == prev_nrow)	171	if (ncol == prev_ncol && nrow == prev_nrow)
176	return;	172	return;
177		173
178	// we need at least two lines for wrapping to work correctly	174	// we need at least two lines for wrapping to work correctly
179	if (nrow + TermWin.saveLines < 2)	175	if (nrow + saveLines < 2)
180	{	176	{
181	TermWin.saveLines++;	177	saveLines++;
182	prev_nrow--;	178	prev_nrow--;
183	TermWin.nscrolled++;	179	nsaved++;
184	}	180	}
185		181
186	want_refresh = 1;	182	want_refresh = 1;
187		183
188	prev_total_rows = prev_nrow + TermWin.saveLines;	184	int prev_total_rows = prev_nrow + saveLines;
189	total_rows = nrow + TermWin.saveLines;	185	total_rows = nrow + saveLines;
190		186
191	screen.tscroll = 0;	187	screen.tscroll = 0;
192	screen.bscroll = nrow - 1;	188	screen.bscroll = nrow - 1;
193		189
194	if (!talloc)	190	if (!save)
195	{
196	talloc = new rxvt_salloc (ncol * sizeof (text_t));
197	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198	}
199
200	if (!screen.text)
201	{	191	{
202	/*	192	/*
203	* 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
204	* 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
205	*/	195	*/
206	screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));	196	nsaved = 0; /* no saved lines */
207	buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));	197	term_start = 0;
208	drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));	198
		199	talloc = new rxvt_salloc (ncol * sizeof (text_t));
		200	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
		201
		202	save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
		203	buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
		204	drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
209	swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));	205	swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
210		206
211	screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
212	swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
213
214	screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
215	buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216	drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
217	swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218
219	for (p = 0; p < nrow; p++)	207	for (p = nrow; p--; )
220	{	208	{
221	q = p + TermWin.saveLines;
222	scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);	209	scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE);
223	scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);	210	scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
224	screen.tlen[q] = swap.tlen[p] = 0;
225	scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);	211	scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
226	}	212	}
227		213
228	memset (charsets, 'B', sizeof (charsets));	214	memset (charsets, 'B', sizeof (charsets));
229	TermWin.nscrolled = 0; /* no saved lines */
230	rstyle = DEFAULT_RSTYLE;	215	rstyle = DEFAULT_RSTYLE;
231	screen.flags = Screen_DefaultFlags;	216	screen.flags = Screen_DefaultFlags;
232	screen.cur.row = screen.cur.col = 0;	217	screen.cur.row = screen.cur.col = 0;
233	screen.charset = 0;	218	screen.charset = 0;
234	current_screen = PRIMARY;	219	current_screen = PRIMARY;
…		…
254	else	239	else
255	{	240	{
256	/*	241	/*
257	* add or delete rows as appropriate	242	* add or delete rows as appropriate
258	*/	243	*/
259	setrstyle = DEFAULT_RSTYLE;	244
		245	rxvt_salloc *old_ta;
		246	rxvt_salloc *old_ra;
260		247
261	if (nrow < prev_nrow)	248	if (nrow < prev_nrow)
262	{	249	{
263	/* delete rows */	250	/* delete rows */
264	k = min (TermWin.nscrolled, prev_nrow - nrow);	251	k = min (nsaved, prev_nrow - nrow);
		252	// k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
265	scr_scroll_text (0, (int)prev_nrow - 1, k, 1);	253	scr_scroll_text (0, (int)prev_nrow - 1, k);
266		254
267	for (p = nrow; p < prev_nrow; p++)	255	for (p = nrow; p < prev_nrow; p++)
268	{	256	{
269	q = p + TermWin.saveLines;	257	lfree (ROW(p));
270
271	if (screen.text[q])
272	{
273	#ifdef DEBUG_STRICT
274	assert (screen.rend[q]);
275	#endif
276	talloc->free (screen.text[q]);
277	ralloc->free (screen.rend[q]);
278	}
279
280	if (swap.text[p])	258	lfree (swap_save[p]);
281	{
282	#ifdef DEBUG_STRICT
283	assert (swap.rend[p]);
284	#endif
285	talloc->free (swap.text[p]);
286	ralloc->free (swap.rend[p]);
287	}
288
289	#ifdef DEBUG_STRICT
290	assert (drawn_text[p] && drawn_rend[p]);
291	#endif
292	talloc->free (drawn_text[p]);	259	lfree (drawn[p]);
293	ralloc->free (drawn_rend[p]);
294	}	260	}
295		261
296	/* we have fewer rows so fix up cursor position */	262	/* we have fewer rows so fix up cursor position */
297	MIN_IT (screen.cur.row, (int32_t)nrow - 1);	263	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
298		264
…		…
301	else if (nrow > prev_nrow)	267	else if (nrow > prev_nrow)
302	{	268	{
303	/* add rows */	269	/* add rows */
304	scr_reset_realloc (); /* realloc _first_ */	270	scr_reset_realloc (); /* realloc _first_ */
305		271
		272	int ocol = ncol;
306	TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this	273	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
307		274
308	k = min (TermWin.nscrolled, nrow - prev_nrow);	275	k = min (nsaved, nrow - prev_nrow);
309		276
310	for (p = prev_total_rows; p < total_rows; p++)	277	for (p = prev_total_rows; p < total_rows; p++)
311	{	278	save[p].clear ();
312	screen.tlen[p] = 0;
313	screen.text[p] = NULL;
314	screen.rend[p] = NULL;
315	}
316		279
317	for (p = prev_total_rows; p < total_rows - k; p++)	280	for (p = prev_total_rows; p < total_rows - k; p++)
318	scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle);	281	scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
319		282
320	for (p = prev_nrow; p < nrow; p++)	283	for (p = prev_nrow; p < nrow; p++)
321	{	284	{
322	swap.tlen[p] = 0;	285	swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
323	swap.text[p] = NULL;	286	drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
324	swap.rend[p] = NULL;
325	drawn_text[p] = NULL;
326	drawn_rend[p] = NULL;
327	scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
328	scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
329	}	287	}
330		288
331	if (k > 0)	289	if (k > 0)
332	{	290	{
333	scr_scroll_text (0, (int)nrow - 1, -k, 1);	291	scr_scroll_text (0, (int)nrow - 1, -k);
334	screen.cur.row += k;	292	screen.cur.row += k;
335	screen.s_cur.row += k;	293	screen.s_cur.row += k;
336	TermWin.nscrolled -= k;	294	nsaved -= k;
337	}	295	}
338		296
339	#ifdef DEBUG_STRICT	297	#ifdef DEBUG_STRICT
340	assert (screen.cur.row < TermWin.nrow);	298	assert (screen.cur.row < nrow);
341	#else /* drive with your eyes closed */	299	#else /* drive with your eyes closed */
342	MIN_IT (screen.cur.row, nrow - 1);	300	MIN_IT (screen.cur.row, nrow - 1);
343	#endif	301	#endif
344	TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this	302	ncol = ocol; // save b/c scr_blank_screen_mem uses this
345	}	303	}
346		304
347	/* resize columns */	305	/* resize columns */
348	if (ncol != prev_ncol)	306	if (ncol != prev_ncol)
349	{	307	{
350	rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));	308	old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
351	rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));	309	old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
352		310
353	for (p = 0; p < total_rows; p++)	311	for (p = total_rows; p--; )
		312	lresize (save[p]);
		313
		314	for (p = nrow; p--; )
354	{	315	{
355	if (screen.text[p])	316	lresize (drawn[p]);
		317	lresize (swap_save[p]);
		318	}
		319
		320	MIN_IT (screen.cur.col, (int16_t)ncol - 1);
		321
		322	delete old_ta;
		323	delete old_ra;
		324	}
		325
		326	#if 0
		327	// re-wrap lines, this is rather ugly, possibly because I am too dumb
		328	// to come up with a lean and mean algorithm.
		329	rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
		330	rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
		331
		332	text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
		333	rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
		334	tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
		335
		336	for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
		337
		338	p = prev_total_rows;
		339	q = total_rows;
		340
		341	while (p > 0 && q > 0)
		342	{
		343	--p;
		344
		345	printf ("pq %d:%d\n", p, q);
		346	if (save[p].t)
		347	{
		348	int llen = save[p].l;
		349
		350	assert (llen >= 0);
		351
		352	while (p && save[p - 1].l < 0)
356	{	353	{
357	screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t));	354	--p;
358	screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
359
360	MIN_IT (screen.tlen[p], (int16_t)ncol);
361
362	if (ncol > prev_ncol)	355	llen += prev_ncol;
363	scr_blank_line (&screen.text[p][prev_ncol],	356	}
364	&screen.rend[p][prev_ncol],	357
365	ncol - prev_ncol, setrstyle);	358	int qlines = llen / ncol + 1;
		359	int lofs = 0;
		360
		361	q -= qlines;
		362
		363	int qrow = q;
		364
		365	printf ("QL %d llen %d\n", qlines, llen);//D
		366	for (; qlines--; qrow++)
		367	{
		368	if (qrow >= 0)
		369	{
		370	tp [qrow] = (text_t *)ta->alloc ();
		371	rp [qrow] = (rend_t *)ra->alloc ();
		372	tl [qrow] = LINE_CONT1;
		373
		374	int qcol = 0;
		375
		376	for (;;)
		377	{
		378	int prow = lofs / prev_ncol + p;
		379	int pcol = lofs % prev_ncol;
		380
		381	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
		382
		383	printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
		384
		385	if (len <= 0)
		386	{
		387	tl [qrow] = qcol;
		388
		389	TODO
		390	scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
		391	ncol - qcol, DEFAULT_RSTYLE);
		392
		393	break;
		394	}
		395
		396	assert (lofs < 1000);
		397
		398	memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t));
		399	memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t));
		400
		401	lofs += len;
		402	qcol += len;
		403
		404	if (qcol == ncol)
		405	break;
		406	}
		407	}
		408	else
		409	lofs += ncol;
366	}	410	}
367	}	411	}
368
369	for (p = 0; p < nrow; p++)
370	{
371	drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
372	drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
373
374	if (ncol > prev_ncol)
375	scr_blank_line (&drawn_text[p][prev_ncol],
376	&drawn_rend[p][prev_ncol],
377	ncol - prev_ncol, setrstyle);
378
379	if (swap.text[p])
380	{
381	swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
382	swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
383
384	MIN_IT (swap.tlen[p], (int16_t)ncol);
385
386	if (ncol > prev_ncol)
387	scr_blank_line (&swap.text[p][prev_ncol],
388	&swap.rend[p][prev_ncol],
389	ncol - prev_ncol, setrstyle);
390	}
391
392	}	412	}
393		413
394	MIN_IT (screen.cur.col, (int16_t)ncol - 1);	414	free (screen.text); screen.text = tp;
		415	free (screen.rend); screen.rend = rp;
		416	free (screen.tlen); screen.tlen = tl;
395		417
396	delete talloc; talloc = ta;	418	for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
397	delete ralloc; ralloc = ra;	419	#endif
398	}
399		420
400	if (tabs)	421	if (tabs)
401	free (tabs);	422	free (tabs);
402	}	423	}
403		424
…		…
413	}	434	}
414		435
415	void	436	void
416	rxvt_term::scr_reset_realloc ()	437	rxvt_term::scr_reset_realloc ()
417	{	438	{
418	unsigned int total_rows, nrow;
419
420	nrow = TermWin.nrow;
421	total_rows = nrow + TermWin.saveLines;
422	/* *INDENT-OFF* */
423	screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
424	buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
425	drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
426	swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *));	439	swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
427		440	drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
428	screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t));	441	buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
429	swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t));	442	save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
430
431	screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
432	buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
433	drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
434	swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
435	/* *INDENT-ON* */
436	}	443	}
437		444
438	/* ------------------------------------------------------------------------- */	445	/* ------------------------------------------------------------------------- */
439	/*	446	/*
440	* Free everything. That way malloc debugging can find leakage.	447	* Free everything. That way malloc debugging can find leakage.
441	*/	448	*/
442	void	449	void
443	rxvt_term::scr_release ()	450	rxvt_term::scr_release ()
444	{	451	{
445	unsigned int total_rows;
446
447	total_rows = TermWin.nrow + TermWin.saveLines;
448
449	delete talloc; talloc = 0;	452	delete talloc; talloc = 0;
450	delete ralloc; ralloc = 0;	453	delete ralloc; ralloc = 0;
451		454
452	free (screen.text);	455	free (save);
453	free (screen.tlen);	456	free (swap_save);
454	free (screen.rend);
455	free (drawn_text);	457	free (drawn);
456	free (drawn_rend);
457	free (swap.text);
458	free (swap.tlen);
459	free (swap.rend);
460	free (buf_text);	458	free (buf);
461	free (buf_rend);
462	free (tabs);	459	free (tabs);
463
464	/* NULL these so if anything tries to use them, we'll know about it */
465	screen.text = drawn_text = swap.text = NULL;
466	screen.rend = drawn_rend = swap.rend = NULL;
467	screen.tlen = swap.tlen = NULL;
468	buf_text = NULL;
469	buf_rend = NULL;
470	tabs = NULL;
471	}	460	}
472		461
473	/* ------------------------------------------------------------------------- */	462	/* ------------------------------------------------------------------------- */
474	/*	463	/*
475	* Hard reset	464	* Hard reset
…		…
526	set_font_style ();	515	set_font_style ();
527	break;	516	break;
528	}	517	}
529		518
530	/* boundary check in case screen size changed between SAVE and RESTORE */	519	/* boundary check in case screen size changed between SAVE and RESTORE */
531	MIN_IT (s->cur.row, TermWin.nrow - 1);	520	MIN_IT (s->cur.row, nrow - 1);
532	MIN_IT (s->cur.col, TermWin.ncol - 1);	521	MIN_IT (s->cur.col, ncol - 1);
533	#ifdef DEBUG_STRICT	522	#ifdef DEBUG_STRICT
534	assert (s->cur.row >= 0);	523	assert (s->cur.row >= 0);
535	assert (s->cur.col >= 0);	524	assert (s->cur.col >= 0);
536	#else /* drive with your eyes closed */	525	#else /* drive with your eyes closed */
537	MAX_IT (s->cur.row, 0);	526	MAX_IT (s->cur.row, 0);
…		…
546	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l	535	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
547	*/	536	*/
548	int	537	int
549	rxvt_term::scr_change_screen (int scrn)	538	rxvt_term::scr_change_screen (int scrn)
550	{	539	{
551	int i;
552	#if NSCREENS
553	int offset;
554	#endif
555
556	want_refresh = 1;	540	want_refresh = 1;
557
558	TermWin.view_start = 0;	541	view_start = 0;
559		542
560	if (current_screen == scrn)	543	if (current_screen == scrn)
561	return scrn;	544	return scrn;
562		545
563	selection_check (2); /* check for boundary cross */	546	selection_check (2); /* check for boundary cross */
564		547
565	i = current_screen; current_screen = scrn; scrn = i;	548	SWAP_IT (scrn, current_screen, int);
566		549
567	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);	550	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
568	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);	551	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
569	MAX_IT (screen.cur.row, 0);	552	MAX_IT (screen.cur.row, 0);
570	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);	553	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
…		…
573		556
574	#if NSCREENS	557	#if NSCREENS
575	if (options & Opt_secondaryScreen)	558	if (options & Opt_secondaryScreen)
576	{	559	{
577	num_scr = 0;	560	num_scr = 0;
578	offset = TermWin.saveLines;
579		561
580	for (i = prev_nrow; i--;)	562	for (int i = nrow; i--; )
581	{	563	SWAP_IT (ROW(i), swap_save[i], line_t);
582	SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
583	SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
584	SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
585	}
586		564
587	SWAP_IT (screen.charset, swap.charset, int16_t);	565	SWAP_IT (screen.charset, swap.charset, int16_t);
588	SWAP_IT (screen.flags, swap.flags, int);	566	SWAP_IT (screen.flags, swap.flags, int);
589	screen.flags |= Screen_VisibleCursor;	567	screen.flags |= Screen_VisibleCursor;
590	swap.flags |= Screen_VisibleCursor;	568	swap.flags |= Screen_VisibleCursor;
591	}	569	}
592	else	570	else
593	#endif	571	#endif
594	if (options & Opt_secondaryScroll)	572	if (options & Opt_secondaryScroll)
595	scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);	573	scr_scroll_text (0, prev_nrow - 1, prev_nrow);
596		574
597	return scrn;	575	return scrn;
598	}	576	}
599		577
600	// clear WrapNext indicator, solidifying position on next line	578	// clear WrapNext indicator, solidifying position on next line
…		…
607	screen.flags &= ~Screen_WrapNext;	585	screen.flags &= ~Screen_WrapNext;
608		586
609	screen.cur.col = 0;	587	screen.cur.col = 0;
610		588
611	if (screen.cur.row == screen.bscroll)	589	if (screen.cur.row == screen.bscroll)
612	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);	590	scr_scroll_text (screen.tscroll, screen.bscroll, 1);
613	else if (screen.cur.row < TermWin.nrow - 1)	591	else if (screen.cur.row < nrow - 1)
614	screen.cur.row++;	592	screen.cur.row++;
615	}	593	}
616		594
617	/* ------------------------------------------------------------------------- */	595	/* ------------------------------------------------------------------------- */
618	/*	596	/*
…		…
648	/* ------------------------------------------------------------------------- */	626	/* ------------------------------------------------------------------------- */
649	/*	627	/*
650	* Scroll text between <row1> and <row2> inclusive, by <count> lines	628	* Scroll text between <row1> and <row2> inclusive, by <count> lines
651	* count positive ==> scroll up	629	* count positive ==> scroll up
652	* count negative ==> scroll down	630	* count negative ==> scroll down
653	* spec == 0 for normal routines
654	*/	631	*/
655	int	632	int
656	rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec)	633	rxvt_term::scr_scroll_text (int row1, int row2, int count)
657	{	634	{
658	int i, j;
659	long nscrolled;
660
661	if (count == 0 || (row1 > row2))	635	if (count == 0 || (row1 > row2))
662	return 0;	636	return 0;
663		637
664	want_refresh = 1;	638	want_refresh = 1;
		639	num_scr += count;
665		640
666	if (row1 == 0 && count > 0	641	if (count > 0
		642	&& row1 == 0
		643	&& row2 == nrow - 1
667	&& (current_screen == PRIMARY || options & Opt_secondaryScroll))	644	&& (current_screen == PRIMARY || options & Opt_secondaryScroll))
668	{	645	{
669	nscrolled = (long)TermWin.nscrolled + (long)count;	646	nsaved = min (nsaved + count, saveLines);
		647	term_start = (term_start + count) % total_rows;
670		648
671	if (nscrolled > (long)TermWin.saveLines)
672	TermWin.nscrolled = TermWin.saveLines;
673	else
674	TermWin.nscrolled = (unsigned int)nscrolled;
675
676	if ((options & Opt_scrollWithBuffer)
677	&& TermWin.view_start != 0
678	&& TermWin.view_start != TermWin.saveLines)
679	scr_page (UP, count);
680	}
681	else if (!spec)
682	row1 += TermWin.saveLines;
683
684	row2 += TermWin.saveLines;
685
686	if (selection.op && current_screen == selection.screen)	649	if (selection.op && current_screen == selection.screen)
687	{
688	i = selection.beg.row + TermWin.saveLines;
689	j = selection.end.row + TermWin.saveLines;
690	if ((i < row1 && j > row1)
691	|| (i < row2 && j > row2)
692	|| (i - count < row1 && i >= row1)
693	|| (i - count > row2 && i <= row2)
694	|| (j - count < row1 && j >= row1)
695	|| (j - count > row2 && j <= row2))
696	{
697	CLEAR_ALL_SELECTION ();
698	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
699	}	650	{
700	else if (j >= row1 && j <= row2)
701	{
702	/* move selected region too */
703	selection.beg.row -= count;	651	selection.beg.row -= count;
704	selection.end.row -= count;	652	selection.end.row -= count;
705	selection.mark.row -= count;	653	selection.mark.row -= count;
706	}
707	}
708		654
709	selection_check (0); /* _after_ TermWin.nscrolled update */	655	selection_check (0);
710
711	num_scr += count;
712	j = count;
713
714	if (count < 0)
715	count = -count;
716
717	i = row2 - row1 + 1;
718	MIN_IT (count, i);
719
720	if (j > 0)
721	{
722	/* scroll up */
723
724	/* Copy lines that will get clobbered by the rotation */
725	memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
726	memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
727
728	/* Rotate lines */
729	i = row2 - row1 - count + 1;
730	memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
731	memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
732	memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
733
734	j = row2 - count + 1, i = count;
735	}
736	else /* if (j < 0) */
737	{
738	/* scroll down */
739
740	/* Copy lines that will get clobbered by the rotation */
741	for (i = 0, j = row2; i < count; i++, j--)
742	{	656	}
743	buf_text[i] = screen.text[j];	657
744	buf_rend[i] = screen.rend[j];	658	for (int i = count; i--; )
		659	scr_blank_screen_mem (ROW(row2 - i), rstyle);
		660
		661	if ((options & Opt_scrollWithBuffer)
		662	&& view_start != 0
		663	&& view_start != saveLines)
		664	scr_page (UP, count);
		665	}
		666	else
		667	{
		668	if (selection.op && current_screen == selection.screen)
745	}	669	{
		670	int i = selection.beg.row;
		671	int j = selection.end.row;
746		672
747	/* Rotate lines */	673	if ((i < row1 && j > row1)
748	for (j = row2, i = j - count; i >= row1; i--, j--)	674	|| (i < row2 && j > row2)
		675	|| (i - count < row1 && i >= row1)
		676	|| (i - count > row2 && i <= row2)
		677	|| (j - count < row1 && j >= row1)
		678	|| (j - count > row2 && j <= row2))
		679	{
		680	CLEAR_ALL_SELECTION ();
		681	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
		682	}
		683	else if (j >= row1 && j <= row2)
		684	{
		685	/* move selected region too */
		686	selection.beg.row -= count;
		687	selection.end.row -= count;
		688	selection.mark.row -= count;
		689
		690	selection_check (0);
		691	}
749	{	692	}
750	screen.tlen[j] = screen.tlen[i];	693
751	screen.text[j] = screen.text[i];	694	// use a simple and robust scrolling algorithm, this
752	screen.rend[j] = screen.rend[i];	695	// part of scr_scroll_text is not time-critical.
		696
		697	int rows = row2 - row1 + 1;
		698
		699	for (int row = 0; row < rows; row++)
753	}	700	{
		701	buf [row] = ROW(row1 + (row + count + rows) % rows);
754		702
755	j = row1, i = count;	703	if (!IN_RANGE_EXC (row + count, 0, rows))
756	count = -count;	704	scr_blank_screen_mem (buf [row], rstyle);
757	}	705	}
758		706
759	/* Resurrect lines */	707	for (int row = 0; row < rows; row++)
760	memset (screen.tlen + j, 0, i * sizeof (int16_t));	708	ROW(row1 + row) = buf [row];
761	memcpy (screen.text + j, buf_text, i * sizeof (text_t *));	709	}
762	memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
763	if (!spec) /* line length may not equal TermWin.ncol */
764	for (; i--; j++)
765	scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
766		710
767	return count;	711	return count;
768	}	712	}
769		713
770	/* ------------------------------------------------------------------------- */	714	/* ------------------------------------------------------------------------- */
…		…
778	return;	722	return;
779		723
780	unsigned char checksel;	724	unsigned char checksel;
781	unicode_t c;	725	unicode_t c;
782	int row, last_col;	726	int row, last_col;
783	text_t *stp;
784	rend_t *srp;
785	const unicode_t *strend = str + len;	727	const unicode_t *strend = str + len;
786		728
787	want_refresh = 1;	729	want_refresh = 1;
788	ZERO_SCROLLBACK ();	730	ZERO_SCROLLBACK ();
789	last_col = TermWin.ncol;	731	last_col = ncol;
790		732
791	if (nlines > 0)	733	if (nlines > 0)
792	{	734	{
793	nlines += screen.cur.row - screen.bscroll;	735	nlines += screen.cur.row - screen.bscroll;
794	if ((nlines > 0)	736	if ((nlines > 0)
795	&& (screen.tscroll == 0)	737	&& (screen.tscroll == 0)
796	&& (screen.bscroll == (TermWin.nrow - 1)))	738	&& (screen.bscroll == (nrow - 1)))
797	{	739	{
798	/* _at least_ this many lines need to be scrolled */	740	/* _at least_ this many lines need to be scrolled */
799	scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);	741	scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
800	screen.cur.row -= nlines;	742	screen.cur.row -= nlines;
801	}	743	}
802	}	744	}
803		745
804	#ifdef DEBUG_STRICT	746	#ifdef DEBUG_STRICT
805	assert (screen.cur.col < last_col);	747	assert (screen.cur.col < last_col);
806	assert ((screen.cur.row < TermWin.nrow)	748	assert ((screen.cur.row < nrow)
807	&& (screen.cur.row >= - (int32_t)TermWin.nscrolled));	749	&& (screen.cur.row >= - (int32_t)nsaved));
808	#else /* drive with your eyes closed */	750	#else /* drive with your eyes closed */
809	MIN_IT (screen.cur.col, last_col - 1);	751	MIN_IT (screen.cur.col, last_col - 1);
810	MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);	752	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
811	MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);	753	MAX_IT (screen.cur.row, - (int32_t)nsaved);
812	#endif	754	#endif
813	row = screen.cur.row + TermWin.saveLines;	755	row = screen.cur.row;
814		756
815	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	757	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
816		758
817	stp = screen.text[row];	759	line_t *line = &ROW(row);
818	srp = screen.rend[row];
819		760
820	while (str < strend)	761	while (str < strend)
821	{	762	{
822	c = *str++;	763	c = *str++;
823		764
824	if (c < 0x20)	765	if (c < 0x20)
825	if (c == C0_LF)	766	if (c == C0_LF)
826	{	767	{
827	if (screen.tlen[row] != -1) /* XXX: think about this */	768	if (!line->is_longer ()) /* XXX: think about this */
828	MAX_IT (screen.tlen[row], screen.cur.col);	769	MAX_IT (line->l, screen.cur.col);
829		770
830	screen.flags &= ~Screen_WrapNext;	771	screen.flags &= ~Screen_WrapNext;
831		772
832	if (screen.cur.row == screen.bscroll)	773	if (screen.cur.row == screen.bscroll)
833	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);	774	scr_scroll_text (screen.tscroll, screen.bscroll, 1);
834	else if (screen.cur.row < (TermWin.nrow - 1))	775	else if (screen.cur.row < (nrow - 1))
835	row = (++screen.cur.row) + TermWin.saveLines;	776	row = ++screen.cur.row;
836		777
837	stp = screen.text[row]; /* _must_ refresh */	778	line = &ROW(row); /* _must_ refresh */
838	srp = screen.rend[row]; /* _must_ refresh */
839	continue;	779	continue;
840	}	780	}
841	else if (c == C0_CR)	781	else if (c == C0_CR)
842	{	782	{
843	if (screen.tlen[row] != -1) /* XXX: think about this */	783	if (!line->is_longer ()) /* XXX: think about this */
844	MAX_IT (screen.tlen[row], screen.cur.col);	784	MAX_IT (line->l, screen.cur.col);
845		785
846	screen.flags &= ~Screen_WrapNext;	786	screen.flags &= ~Screen_WrapNext;
847	screen.cur.col = 0;	787	screen.cur.col = 0;
848	continue;	788	continue;
849	}	789	}
…		…
866	CLEAR_SELECTION ();	806	CLEAR_SELECTION ();
867	}	807	}
868		808
869	if (screen.flags & Screen_WrapNext)	809	if (screen.flags & Screen_WrapNext)
870	{	810	{
871	screen.tlen[row] = -1;	811	line->set_is_longer ();
872		812
873	scr_do_wrap ();	813	scr_do_wrap ();
874		814
875	row = screen.cur.row + TermWin.saveLines;	815	row = screen.cur.row;
876	stp = screen.text[row]; /* _must_ refresh */	816	line = &ROW(row); /* _must_ refresh */
877	srp = screen.rend[row]; /* _must_ refresh */
878	}	817	}
879		818
880	// some utf-8 decoders "decode" surrogate characters: let's fix this.	819	// some utf-8 decoders "decode" surrogate characters: let's fix this.
881	if (IN_RANGE (c, 0xd800, 0xdfff))	820	if (IN_RANGE_INC (c, 0xd800, 0xdfff))
882	c = 0xfffd;	821	c = 0xfffd;
883		822
884	// rely on wcwidth to tell us the character width, at least for non-latin1	823	// rely on wcwidth to tell us the character width, at least for non-latin1
885	// do wcwidth before further replacements, as wcwidth might return -1	824	// do wcwidth before further replacements, as wcwidth might return -1
886	// for the line drawing characters below as they might be invalid in the current	825	// for the line drawing characters below as they might be invalid in the current
…		…
924	c = 0xfffd;	863	c = 0xfffd;
925	# endif	864	# endif
926	#endif	865	#endif
927		866
928	// nuke the character at this position, if required	867	// nuke the character at this position, if required
929	if (stp[screen.cur.col] == NOCHAR	868	if (line->t[screen.cur.col] == NOCHAR
930	|| (screen.cur.col < TermWin.ncol - 1	869	|| (screen.cur.col < ncol - 1
931	&& stp[screen.cur.col + 1] == NOCHAR))	870	&& line->t[screen.cur.col + 1] == NOCHAR))
932	{	871	{
933	int col = screen.cur.col;	872	int col = screen.cur.col;
934		873
935	// find begin	874	// find begin
936	while (col > 0 && stp[col] == NOCHAR)	875	while (col > 0 && line->t[col] == NOCHAR)
937	col--;	876	col--;
938		877
939	rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));	878	rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
940		879
941	// found begin, nuke	880	// found begin, nuke
942	do {	881	do {
943	stp[col] = ' ';	882	line->t[col] = ' ';
944	srp[col] = rend;	883	line->r[col] = rend;
945	col++;	884	col++;
946	} while (col < TermWin.ncol && stp[col] == NOCHAR);	885	} while (col < ncol && line->t[col] == NOCHAR);
947	}	886	}
948		887
949	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	888	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
950		889
951	// if the character doesn't fit into the remaining columns...	890	// if the character doesn't fit into the remaining columns...
…		…
957	--str;	896	--str;
958	}	897	}
959		898
960	do	899	do
961	{	900	{
962	stp[screen.cur.col] = c;	901	line->t[screen.cur.col] = c;
963	srp[screen.cur.col] = rend;	902	line->r[screen.cur.col] = rend;
964		903
965	if (screen.cur.col < last_col - 1)	904	if (screen.cur.col < last_col - 1)
966	screen.cur.col++;	905	screen.cur.col++;
967	else	906	else
968	{	907	{
969	screen.tlen[row] = last_col;	908	line->l = last_col;
970	if (screen.flags & Screen_Autowrap)	909	if (screen.flags & Screen_Autowrap)
971	screen.flags |= Screen_WrapNext;	910	screen.flags |= Screen_WrapNext;
972	break;	911	break;
973	}	912	}
974		913
…		…
976	}	915	}
977	while (--width > 0);	916	while (--width > 0);
978		917
979	// pad with spaces when overwriting wide character with smaller one	918	// pad with spaces when overwriting wide character with smaller one
980	if (!width)	919	if (!width)
981	for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)	920	for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)
982	{	921	{
983	stp[c] = ' ';	922	line->t[c] = ' ';
984	srp[c] = rend;	923	line->r[c] = rend;
985	}	924	}
986	}	925	}
987	else // width == 0	926	else // width == 0
988	{	927	{
989	#if ENABLE_COMBINING	928	#if ENABLE_COMBINING
…		…
994	text_t *tp;	933	text_t *tp;
995	rend_t *rp;	934	rend_t *rp;
996		935
997	if (screen.cur.col > 0)	936	if (screen.cur.col > 0)
998	{	937	{
999	tp = stp + screen.cur.col - 1;	938	tp = line->t + screen.cur.col - 1;
1000	rp = srp + screen.cur.col - 1;	939	rp = line->r + screen.cur.col - 1;
1001		940
1002	while (*tp == NOCHAR && tp > stp)	941	while (*tp == NOCHAR && tp > line->t)
1003	tp--, rp--;	942	tp--, rp--;
1004	}	943	}
1005	else if (screen.cur.row > 0	944	else if (screen.cur.row > 0
1006	&& screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)	945	&& ROW(screen.cur.row - 1).is_longer ())
1007	{	946	{
1008	int line = screen.cur.row - 1 + TermWin.saveLines;	947	line_t *line = &ROW(screen.cur.row - 1);
1009		948
1010	tp = screen.text[line] + last_col - 1;	949	tp = line->t + last_col - 1;
1011	rp = screen.rend[line] + last_col - 1;	950	rp = line->r + last_col - 1;
1012		951
1013	while (*tp == NOCHAR && tp > screen.text[line])	952	while (*tp == NOCHAR && tp > line->t)
1014	tp--, rp--;	953	tp--, rp--;
1015	}	954	}
1016	else	955	else
1017	continue;	956	continue;
1018		957
…		…
1025	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));	964	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1026	#endif	965	#endif
1027	}	966	}
1028	}	967	}
1029		968
1030	if (screen.tlen[row] != -1) /* XXX: think about this */	969	if (!line->is_longer ()) /* XXX: think about this */
1031	MAX_IT (screen.tlen[row], screen.cur.col);	970	MAX_IT (line->l, screen.cur.col);
1032		971
1033	#ifdef DEBUG_STRICT	972	#ifdef DEBUG_STRICT
1034	assert (screen.cur.row >= 0);	973	assert (screen.cur.row >= 0);
1035	#else /* drive with your eyes closed */	974	#else /* drive with your eyes closed */
1036	MAX_IT (screen.cur.row, 0);	975	MAX_IT (screen.cur.row, 0);
…		…
1050	if (screen.cur.col == 0)	989	if (screen.cur.col == 0)
1051	{	990	{
1052	if (screen.cur.row > 0)	991	if (screen.cur.row > 0)
1053	{	992	{
1054	#ifdef TERMCAP_HAS_BW	993	#ifdef TERMCAP_HAS_BW
1055	screen.cur.col = TermWin.ncol - 1;	994	screen.cur.col = ncol - 1;
1056	screen.cur.row--;	995	screen.cur.row--;
1057	return;	996	return;
1058	#endif	997	#endif
1059	}	998	}
1060	}	999	}
…		…
1080		1019
1081	if (count == 0)	1020	if (count == 0)
1082	return;	1021	return;
1083	else if (count > 0)	1022	else if (count > 0)
1084	{	1023	{
1085	int row = TermWin.saveLines + screen.cur.row;	1024	int row = screen.cur.row;
1086	text_t *tp = screen.text[row];	1025
1087	rend_t *rp = screen.rend[row];	1026	line_t &l = ROW(row);
1088	rend_t base_rend = rp[i];	1027	rend_t base_rend = l.r[i];
1089	ht &= tp[i] == ' ';	1028	ht &= l.t[i] == ' ';
1090		1029
1091	for (; ++i < TermWin.ncol; )	1030	for (; ++i < ncol; )
1092	if (tabs[i])	1031	if (tabs[i])
1093	{	1032	{
1094	x = i;	1033	x = i;
1095	if (!--count)	1034	if (!--count)
1096	break;	1035	break;
1097	}	1036	}
1098	else	1037	else
1099	ht &= tp[i] == ' '	1038	ht &= l.t[i] == ' '
1100	&& RS_SAME (rp[i], base_rend);	1039	&& RS_SAME (l.r[i], base_rend);
1101		1040
1102	if (count)	1041	if (count)
1103	x = TermWin.ncol - 1;	1042	x = ncol - 1;
1104		1043
1105	// store horizontal tab commands as characters inside the text	1044	// store horizontal tab commands as characters inside the text
1106	// buffer so they can be selected and pasted.	1045	// buffer so they can be selected and pasted.
1107	if (ht && options & Opt_pastableTabs)	1046	if (ht && options & Opt_pastableTabs)
1108	{	1047	{
1109	base_rend = SET_FONT (base_rend, 0);	1048	base_rend = SET_FONT (base_rend, 0);
1110		1049
1111	if (screen.tlen[row] != -1) /* XXX: think about this */	1050	if (!l.is_longer ()) /* XXX: think about this */
1112	MAX_IT (screen.tlen[row], x);	1051	MAX_IT (l.l, x);
1113		1052
1114	i = screen.cur.col;	1053	i = screen.cur.col;
1115		1054
1116	tp[i] = '\t';	1055	l.t[i] = '\t';
1117	rp[i] = base_rend;	1056	l.r[i] = base_rend;
1118		1057
1119	while (++i < x)	1058	while (++i < x)
1120	{	1059	{
1121	tp[i] = NOCHAR;	1060	l.t[i] = NOCHAR;
1122	rp[i] = base_rend;	1061	l.r[i] = base_rend;
1123	}	1062	}
1124	}	1063	}
1125	}	1064	}
1126	else /* if (count < 0) */	1065	else /* if (count < 0) */
1127	{	1066	{
…		…
1153	rxvt_term::scr_backindex ()	1092	rxvt_term::scr_backindex ()
1154	{	1093	{
1155	if (screen.cur.col > 0)	1094	if (screen.cur.col > 0)
1156	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1095	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1157	else	1096	else
1158	{
1159	if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1160	return; /* um, yeah? */
1161
1162	scr_insdel_chars (1, INSERT);	1097	scr_insdel_chars (1, INSERT);
1163	}
1164	}	1098	}
1165	#endif	1099	#endif
1166	/* ------------------------------------------------------------------------- */	1100	/* ------------------------------------------------------------------------- */
1167	/*	1101	/*
1168	* Process DEC Forward Index	1102	* Process DEC Forward Index
…		…
1174	void	1108	void
1175	rxvt_term::scr_forwardindex ()	1109	rxvt_term::scr_forwardindex ()
1176	{	1110	{
1177	int row;	1111	int row;
1178		1112
1179	if (screen.cur.col < TermWin.ncol - 1)	1113	if (screen.cur.col < ncol - 1)
1180	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1114	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1181	else	1115	else
1182	{	1116	{
1183	row = screen.cur.row + TermWin.saveLines;	1117	row = screen.cur.row;
1184		1118
1185	if (screen.tlen[row] == 0)	1119	if (ROW(row).is_longer ()) //TODO//FIXME//LEN
1186	return; /* um, yeah? */	1120	ROW(row).l = ncol;
1187	else if (screen.tlen[row] == -1)
1188	screen.tlen[row] = TermWin.ncol;
1189		1121
1190	scr_gotorc (0, 0, R_RELATIVE);	1122	scr_gotorc (0, 0, R_RELATIVE);
1191	scr_insdel_chars (1, DELETE);	1123	scr_insdel_chars (1, DELETE);
1192	scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);	1124	scr_gotorc (0, ncol - 1, R_RELATIVE);
1193	}	1125	}
1194	}	1126	}
1195	#endif	1127	#endif
1196		1128
1197	/* ------------------------------------------------------------------------- */	1129	/* ------------------------------------------------------------------------- */
…		…
1204	want_refresh = 1;	1136	want_refresh = 1;
1205	ZERO_SCROLLBACK ();	1137	ZERO_SCROLLBACK ();
1206		1138
1207	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;	1139	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1208	MAX_IT (screen.cur.col, 0);	1140	MAX_IT (screen.cur.col, 0);
1209	MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);	1141	MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1210		1142
1211	screen.flags &= ~Screen_WrapNext;	1143	screen.flags &= ~Screen_WrapNext;
1212		1144
1213	if (relative & R_RELATIVE)	1145	if (relative & R_RELATIVE)
1214	{	1146	{
…		…
1239	else	1171	else
1240	screen.cur.row = row;	1172	screen.cur.row = row;
1241	}	1173	}
1242		1174
1243	MAX_IT (screen.cur.row, 0);	1175	MAX_IT (screen.cur.row, 0);
1244	MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);	1176	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1245	}	1177	}
1246		1178
1247	/* ------------------------------------------------------------------------- */	1179	/* ------------------------------------------------------------------------- */
1248	/*	1180	/*
1249	* direction should be UP or DN	1181	* direction should be UP or DN
…		…
1260		1192
1261	screen.flags &= ~Screen_WrapNext;	1193	screen.flags &= ~Screen_WrapNext;
1262		1194
1263	if ((screen.cur.row == screen.bscroll && direction == UP)	1195	if ((screen.cur.row == screen.bscroll && direction == UP)
1264	|| (screen.cur.row == screen.tscroll && direction == DN))	1196	|| (screen.cur.row == screen.tscroll && direction == DN))
1265	scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);	1197	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1266	else	1198	else
1267	screen.cur.row += dirn;	1199	screen.cur.row += dirn;
1268		1200
1269	MAX_IT (screen.cur.row, 0);	1201	MAX_IT (screen.cur.row, 0);
1270	MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);	1202	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1271	selection_check (0);	1203	selection_check (0);
1272	}	1204	}
1273		1205
1274	/* ------------------------------------------------------------------------- */	1206	/* ------------------------------------------------------------------------- */
1275	/*	1207	/*
…		…
1286	want_refresh = 1;	1218	want_refresh = 1;
1287	ZERO_SCROLLBACK ();	1219	ZERO_SCROLLBACK ();
1288		1220
1289	selection_check (1);	1221	selection_check (1);
1290		1222
1291	row = TermWin.saveLines + screen.cur.row;	1223	row = screen.cur.row;
		1224
1292	switch (mode)	1225	switch (mode)
1293	{	1226	{
1294	case 0: /* erase to end of line */	1227	case 0: /* erase to end of line */
1295	col = screen.cur.col;	1228	col = screen.cur.col;
1296	num = TermWin.ncol - col;	1229	num = ncol - col;
1297	MIN_IT (screen.tlen[row], (int16_t)col);	1230	MIN_IT (ROW(row).l, (int16_t)col);
1298	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1231	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1299	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1232	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1300	CLEAR_SELECTION ();	1233	CLEAR_SELECTION ();
1301	break;	1234	break;
1302	case 1: /* erase to beginning of line */	1235	case 1: /* erase to beginning of line */
…		…
1306	|| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))	1239	|| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1307	CLEAR_SELECTION ();	1240	CLEAR_SELECTION ();
1308	break;	1241	break;
1309	case 2: /* erase whole line */	1242	case 2: /* erase whole line */
1310	col = 0;	1243	col = 0;
1311	num = TermWin.ncol;	1244	num = ncol;
1312	screen.tlen[row] = 0;	1245	ROW(row).l = 0;
1313	if (selection.beg.row <= screen.cur.row	1246	if (selection.beg.row <= screen.cur.row
1314	&& selection.end.row >= screen.cur.row)	1247	&& selection.end.row >= screen.cur.row)
1315	CLEAR_SELECTION ();	1248	CLEAR_SELECTION ();
1316	break;	1249	break;
1317	default:	1250	default:
1318	return;	1251	return;
1319	}	1252	}
1320		1253
1321	if (screen.text[row])	1254	scr_blank_line (ROW(row), col, num, rstyle);
1322	scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1323	else
1324	scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1325	}	1255	}
1326		1256
1327	/* ------------------------------------------------------------------------- */	1257	/* ------------------------------------------------------------------------- */
1328	/*	1258	/*
1329	* Erase part of whole of the screen	1259	* Erase part of whole of the screen
…		…
1333	*/	1263	*/
1334	void	1264	void
1335	rxvt_term::scr_erase_screen (int mode)	1265	rxvt_term::scr_erase_screen (int mode)
1336	{	1266	{
1337	int num;	1267	int num;
1338	int32_t row, row_offset;	1268	int32_t row;
1339	rend_t ren;	1269	rend_t ren;
1340	XGCValues gcvalue;	1270	XGCValues gcvalue;
1341		1271
1342	want_refresh = 1;	1272	want_refresh = 1;
1343	ZERO_SCROLLBACK ();	1273	ZERO_SCROLLBACK ();
1344
1345	row_offset = (int32_t)TermWin.saveLines;
1346		1274
1347	switch (mode)	1275	switch (mode)
1348	{	1276	{
1349	case 0: /* erase to end of screen */	1277	case 0: /* erase to end of screen */
1350	selection_check (1);	1278	selection_check (1);
1351	scr_erase_line (0);	1279	scr_erase_line (0);
1352	row = screen.cur.row + 1; /* possible OOB */	1280	row = screen.cur.row + 1; /* possible OOB */
1353	num = TermWin.nrow - row;	1281	num = nrow - row;
1354	break;	1282	break;
1355	case 1: /* erase to beginning of screen */	1283	case 1: /* erase to beginning of screen */
1356	selection_check (3);	1284	selection_check (3);
1357	scr_erase_line (1);	1285	scr_erase_line (1);
1358	row = 0;	1286	row = 0;
1359	num = screen.cur.row;	1287	num = screen.cur.row;
1360	break;	1288	break;
1361	case 2: /* erase whole screen */	1289	case 2: /* erase whole screen */
1362	selection_check (3);	1290	selection_check (3);
1363	row = 0;	1291	row = 0;
1364	num = TermWin.nrow;	1292	num = nrow;
1365	break;	1293	break;
1366	default:	1294	default:
1367	return;	1295	return;
1368	}	1296	}
1369		1297
…		…
1371	&& ((selection.beg.row >= row && selection.beg.row <= row + num)	1299	&& ((selection.beg.row >= row && selection.beg.row <= row + num)
1372	|| (selection.end.row >= row	1300	|| (selection.end.row >= row
1373	&& selection.end.row <= row + num)))	1301	&& selection.end.row <= row + num)))
1374	CLEAR_SELECTION ();	1302	CLEAR_SELECTION ();
1375		1303
1376	if (row >= TermWin.nrow) /* Out Of Bounds */	1304	if (row >= nrow) /* Out Of Bounds */
1377	return;	1305	return;
1378		1306
1379	MIN_IT (num, (TermWin.nrow - row));	1307	MIN_IT (num, (nrow - row));
1380		1308
1381	if (rstyle & (RS_RVid | RS_Uline))	1309	if (rstyle & (RS_RVid | RS_Uline))
1382	ren = (rend_t) ~RS_None;	1310	ren = (rend_t) ~RS_None;
1383	else if (GET_BASEBG (rstyle) == Color_bg)	1311	else if (GET_BASEBG (rstyle) == Color_bg)
1384	{	1312	{
…		…
1387	}	1315	}
1388	else	1316	else
1389	{	1317	{
1390	ren = rstyle & (RS_fgMask | RS_bgMask);	1318	ren = rstyle & (RS_fgMask | RS_bgMask);
1391	gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];	1319	gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1392	XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);	1320	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1393	ERASE_ROWS (row, num);	1321	ERASE_ROWS (row, num);
1394	gcvalue.foreground = pix_colors[Color_fg];	1322	gcvalue.foreground = pix_colors[Color_fg];
1395	XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);	1323	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1396	}	1324	}
1397		1325
1398	for (; num--; row++)	1326	for (; num--; row++)
1399	{	1327	{
1400	scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);	1328	scr_blank_screen_mem (ROW (row), rstyle);
1401	screen.tlen[row + row_offset] = 0;	1329	ROW (row).l = 0;
1402	scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);	1330	scr_blank_line (drawn[row], 0, ncol, ren);
1403	}	1331	}
1404	}	1332	}
1405		1333
1406	#if ENABLE_FRILLS	1334	#if ENABLE_FRILLS
1407	void	1335	void
1408	rxvt_term::scr_erase_savelines ()	1336	rxvt_term::scr_erase_savelines ()
1409	{	1337	{
1410	want_refresh = 1;	1338	want_refresh = 1;
1411	ZERO_SCROLLBACK ();	1339	ZERO_SCROLLBACK ();
1412		1340
1413	TermWin.nscrolled = 0;	1341	nsaved = 0;
1414	}	1342	}
1415	#endif	1343	#endif
1416		1344
1417	/* ------------------------------------------------------------------------- */	1345	/* ------------------------------------------------------------------------- */
1418	/*	1346	/*
…		…
1420	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1348	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1421	*/	1349	*/
1422	void	1350	void
1423	rxvt_term::scr_E ()	1351	rxvt_term::scr_E ()
1424	{	1352	{
1425	int i, j, k;
1426	rend_t *r1, fs;	1353	rend_t fs;
1427		1354
1428	want_refresh = 1;	1355	want_refresh = 1;
1429	ZERO_SCROLLBACK ();	1356	ZERO_SCROLLBACK ();
1430		1357
1431	num_scr_allow = 0;	1358	num_scr_allow = 0;
1432	selection_check (3);	1359	selection_check (3);
1433		1360
1434	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1361	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1435	for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)	1362	for (int row = nrow; row--; )
1436	{	1363	{
1437	screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */	1364	line_t &line = ROW(row);
		1365
1438	fill_text (screen.text[k], 'E', TermWin.ncol);	1366	fill_text (line.t, 'E', ncol);
1439	for (r1 = screen.rend[k], j = TermWin.ncol; j--; )	1367	rend_t *r1 = line.r;
		1368
		1369	for (int j = ncol; j--; )
1440	*r1++ = fs;	1370	*r1++ = fs;
		1371
		1372	line.l = ncol; /* make the `E's selectable */
1441	}	1373	}
1442	}	1374	}
1443		1375
1444	/* ------------------------------------------------------------------------- */	1376	/* ------------------------------------------------------------------------- */
1445	/*	1377	/*
…		…
1466	count = end;	1398	count = end;
1467	}	1399	}
1468		1400
1469	scr_do_wrap ();	1401	scr_do_wrap ();
1470		1402
1471	scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);	1403	scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1472	}	1404	}
1473		1405
1474	/* ------------------------------------------------------------------------- */	1406	/* ------------------------------------------------------------------------- */
1475	/*	1407	/*
1476	* Insert/Delete <count> characters from the current position	1408	* Insert/Delete <count> characters from the current position
…		…
1478	void	1410	void
1479	rxvt_term::scr_insdel_chars (int count, int insdel)	1411	rxvt_term::scr_insdel_chars (int count, int insdel)
1480	{	1412	{
1481	int col, row;	1413	int col, row;
1482	rend_t tr;	1414	rend_t tr;
1483	text_t *stp;
1484	rend_t *srp;
1485	int16_t *slp;
1486		1415
1487	want_refresh = 1;	1416	want_refresh = 1;
1488	ZERO_SCROLLBACK ();	1417	ZERO_SCROLLBACK ();
1489		1418
1490	if (count <= 0)	1419	if (count <= 0)
1491	return;	1420	return;
1492		1421
1493	scr_do_wrap ();	1422	scr_do_wrap ();
1494		1423
1495	selection_check (1);	1424	selection_check (1);
1496	MIN_IT (count, (TermWin.ncol - screen.cur.col));	1425	MIN_IT (count, (ncol - screen.cur.col));
1497		1426
1498	row = screen.cur.row + TermWin.saveLines;
1499
1500	stp = screen.text[row];
1501	srp = screen.rend[row];	1427	row = screen.cur.row;
1502	slp = &screen.tlen[row];	1428
		1429	line_t *line = &ROW(row);
1503		1430
1504	switch (insdel)	1431	switch (insdel)
1505	{	1432	{
1506	case INSERT:	1433	case INSERT:
1507	for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)	1434	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1508	{	1435	{
1509	stp[col] = stp[col - count];	1436	line->t[col] = line->t[col - count];
1510	srp[col] = srp[col - count];	1437	line->r[col] = line->r[col - count];
1511	}	1438	}
1512		1439
1513	if (*slp != -1)	1440	if (!line->is_longer ())
1514	{	1441	{
1515	*slp += count;	1442	line->l += count;
1516	MIN_IT (*slp, TermWin.ncol);	1443	MIN_IT (line->l, ncol);
1517	}	1444	}
1518		1445
1519	if (selection.op && current_screen == selection.screen	1446	if (selection.op && current_screen == selection.screen
1520	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1447	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1521	{	1448	{
1522	if (selection.end.row != screen.cur.row	1449	if (selection.end.row != screen.cur.row
1523	|| (selection.end.col + count >= TermWin.ncol))	1450	|| (selection.end.col + count >= ncol))
1524	CLEAR_SELECTION ();	1451	CLEAR_SELECTION ();
1525	else	1452	else
1526	{ /* shift selection */	1453	{ /* shift selection */
1527	selection.beg.col += count;	1454	selection.beg.col += count;
1528	selection.mark.col += count; /* XXX: yes? */	1455	selection.mark.col += count; /* XXX: yes? */
1529	selection.end.col += count;	1456	selection.end.col += count;
1530	}	1457	}
1531	}	1458	}
1532		1459
1533	scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],	1460	scr_blank_line (*line, screen.cur.col, count, rstyle);
1534	(unsigned int)count, rstyle);
1535	break;	1461	break;
1536		1462
1537	case ERASE:	1463	case ERASE:
1538	screen.cur.col += count; /* don't worry if > TermWin.ncol */	1464	screen.cur.col += count; /* don't worry if > ncol */
1539	selection_check (1);	1465	selection_check (1);
1540	screen.cur.col -= count;	1466	screen.cur.col -= count;
1541	scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],	1467	scr_blank_line (*line, screen.cur.col, count, rstyle);
1542	(unsigned int)count, rstyle);
1543	break;	1468	break;
1544		1469
1545	case DELETE:	1470	case DELETE:
1546	tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1471	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1547		1472
1548	for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)	1473	for (col = screen.cur.col; (col + count) < ncol; col++)
1549	{	1474	{
1550	stp[col] = stp[col + count];	1475	line->t[col] = line->t[col + count];
1551	srp[col] = srp[col + count];	1476	line->r[col] = line->r[col + count];
1552	}	1477	}
1553		1478
1554	scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],	1479	scr_blank_line (*line, ncol - count, count, tr);
1555	(unsigned int)count, tr);
1556		1480
1557	if (*slp == -1) /* break line continuation */	1481	if (line->is_longer ()) /* break line continuation */
1558	*slp = TermWin.ncol;	1482	line->l = ncol;
1559		1483
1560	*slp -= count;	1484	line->l = max (line->l - count, 0);
1561	MAX_IT (*slp, 0);
1562		1485
1563	if (selection.op && current_screen == selection.screen	1486	if (selection.op && current_screen == selection.screen
1564	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1487	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1565	{	1488	{
1566	if (selection.end.row != screen.cur.row	1489	if (selection.end.row != screen.cur.row
1567	|| (screen.cur.col >= selection.beg.col - count)	1490	|| (screen.cur.col >= selection.beg.col - count)
1568	|| selection.end.col >= TermWin.ncol)	1491	|| selection.end.col >= ncol)
1569	CLEAR_SELECTION ();	1492	CLEAR_SELECTION ();
1570	else	1493	else
1571	{	1494	{
1572	/* shift selection */	1495	/* shift selection */
1573	selection.beg.col -= count;	1496	selection.beg.col -= count;
…		…
1587	*/	1510	*/
1588	void	1511	void
1589	rxvt_term::scr_scroll_region (int top, int bot)	1512	rxvt_term::scr_scroll_region (int top, int bot)
1590	{	1513	{
1591	MAX_IT (top, 0);	1514	MAX_IT (top, 0);
1592	MIN_IT (bot, (int)TermWin.nrow - 1);	1515	MIN_IT (bot, (int)nrow - 1);
1593		1516
1594	if (top > bot)	1517	if (top > bot)
1595	return;	1518	return;
1596		1519
1597	screen.tscroll = top;	1520	screen.tscroll = top;
…		…
1676	*/	1599	*/
1677	void	1600	void
1678	rxvt_term::scr_set_tab (int mode)	1601	rxvt_term::scr_set_tab (int mode)
1679	{	1602	{
1680	if (mode < 0)	1603	if (mode < 0)
1681	memset (tabs, 0, TermWin.ncol * sizeof (char));	1604	memset (tabs, 0, ncol * sizeof (char));
1682	else if (screen.cur.col < TermWin.ncol)	1605	else if (screen.cur.col < ncol)
1683	tabs[screen.cur.col] = (mode ? 1 : 0);	1606	tabs[screen.cur.col] = (mode ? 1 : 0);
1684	}	1607	}
1685		1608
1686	/* ------------------------------------------------------------------------- */	1609	/* ------------------------------------------------------------------------- */
1687	/*	1610	/*
…		…
1702	if (bgPixmap.pixmap == None)	1625	if (bgPixmap.pixmap == None)
1703	#endif	1626	#endif
1704	#if TRANSPARENT	1627	#if TRANSPARENT
1705	if (! (options & Opt_transparent) || am_transparent == 0)	1628	if (! (options & Opt_transparent) || am_transparent == 0)
1706	#endif	1629	#endif
1707	XSetWindowBackground (display->display, TermWin.vt,	1630	XSetWindowBackground (display->display, vt,
1708	pix_colors[Color_bg]);	1631	pix_colors[Color_bg]);
1709		1632
1710	gcvalue.foreground = pix_colors[Color_fg];	1633	gcvalue.foreground = pix_colors[Color_fg];
1711	gcvalue.background = pix_colors[Color_bg];	1634	gcvalue.background = pix_colors[Color_bg];
1712	XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,	1635	XChangeGC (display->display, gc, GCBackground | GCForeground,
1713	&gcvalue);	1636	&gcvalue);
1714	scr_clear ();	1637	scr_clear ();
1715	scr_touch (true);	1638	scr_touch (true);
1716	}	1639	}
1717	}	1640	}
…		…
1798	bool	1721	bool
1799	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)	1722	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1800	{	1723	{
1801	bool found = false;	1724	bool found = false;
1802		1725
1803	for (int i = 0; i < TermWin.nrow; i++)	1726	for (int i = 0; i < nrow; i++)
1804	{	1727	{
1805	int col = 0;	1728	int col = 0;
1806	rend_t *drp = drawn_rend [i];	1729	rend_t *drp = drawn[i].r;
1807		1730
1808	for (; col < TermWin.ncol; col++, drp++)	1731	for (; col < ncol; col++, drp++)
1809	if ((*drp & mask) == value)	1732	if ((*drp & mask) == value)
1810	{	1733	{
1811	found = true;	1734	found = true;
1812	*drp = ~value;	1735	*drp = ~value;
1813	}	1736	}
…		…
1824	PART_END,	1747	PART_END,
1825	RC_COUNT	1748	RC_COUNT
1826	};	1749	};
1827		1750
1828	void	1751	void
1829	rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh)	1752	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1830	{	1753	{
1831	int i;	1754	int i;
1832	row_col_t rc[RC_COUNT];	1755	row_col_t rc[RC_COUNT];
1833		1756
1834	if (drawn_text == NULL) /* sanity check */	1757	if (!drawn) /* sanity check */
1835	return;	1758	return;
1836		1759
1837	#ifndef NO_SLOW_LINK_SUPPORT	1760	#ifndef NO_SLOW_LINK_SUPPORT
1838	if (refresh_type == FAST_REFRESH && !display->is_local)	1761	if (refresh_type == FAST_REFRESH && !display->is_local)
1839	{	1762	{
1840	y = 0;	1763	y = 0;
1841	height = TermWin.height;	1764	eheight = height;
1842	}	1765	}
1843	#endif	1766	#endif
1844		1767
1845	#ifdef DEBUG_STRICT	1768	#ifdef DEBUG_STRICT
1846	x = max (x, 0);	1769	x = max (x, 0);
1847	x = min (x, (int)TermWin.width);	1770	x = min (x, (int)width);
1848	y = max (y, 0);	1771	y = max (y, 0);
1849	y = min (y, (int)TermWin.height);	1772	y = min (y, (int)height);
1850	#endif	1773	#endif
1851		1774
1852	/* round down */	1775	/* round down */
1853	rc[PART_BEG].col = Pixel2Col (x);	1776	rc[PART_BEG].col = Pixel2Col (x);
1854	rc[PART_BEG].row = Pixel2Row (y);	1777	rc[PART_BEG].row = Pixel2Row (y);
1855	/* round up */	1778	/* round up */
1856	rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1);	1779	rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1857	rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1);	1780	rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1858		1781
1859	/* sanity checks */	1782	/* sanity checks */
1860	for (i = PART_BEG; i < RC_COUNT; i++)	1783	for (i = PART_BEG; i < RC_COUNT; i++)
1861	{	1784	{
1862	MIN_IT (rc[i].col, TermWin.ncol - 1);	1785	MIN_IT (rc[i].col, ncol - 1);
1863	MIN_IT (rc[i].row, TermWin.nrow - 1);	1786	MIN_IT (rc[i].row, nrow - 1);
1864	}	1787	}
1865		1788
1866	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1789	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1867	fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1790	fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1868		1791
1869	if (refresh)	1792	if (refresh)
1870	scr_refresh (SLOW_REFRESH);	1793	scr_refresh (SLOW_REFRESH);
1871	}	1794	}
1872		1795
…		…
1875	* Refresh the entire screen	1798	* Refresh the entire screen
1876	*/	1799	*/
1877	void	1800	void
1878	rxvt_term::scr_touch (bool refresh)	1801	rxvt_term::scr_touch (bool refresh)
1879	{	1802	{
1880	scr_expose (0, 0, TermWin.width, TermWin.height, refresh);	1803	scr_expose (0, 0, width, height, refresh);
1881	}	1804	}
1882		1805
1883	/* ------------------------------------------------------------------------- */	1806	/* ------------------------------------------------------------------------- */
1884	/*	1807	/*
1885	* Move the display so that the line represented by scrollbar value Y is at	1808	* Move the display so that the line represented by scrollbar value Y is at
…		…
1889	rxvt_term::scr_move_to (int y, int len)	1812	rxvt_term::scr_move_to (int y, int len)
1890	{	1813	{
1891	long p = 0;	1814	long p = 0;
1892	unsigned int oldviewstart;	1815	unsigned int oldviewstart;
1893		1816
1894	oldviewstart = TermWin.view_start;	1817	oldviewstart = view_start;
1895		1818
1896	if (y < len)	1819	if (y < len)
1897	{	1820	{
1898	p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;	1821	p = (nrow + nsaved) * (len - y) / len;
1899	p -= (long) (TermWin.nrow - 1);	1822	p -= (long) (nrow - 1);
1900	p = max (p, 0);	1823	p = max (p, 0);
1901	}	1824	}
1902		1825
1903	TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);	1826	view_start = (unsigned int)min (p, nsaved);
1904		1827
1905	return scr_changeview (oldviewstart);	1828	return scr_changeview (oldviewstart);
1906	}	1829	}
1907		1830
1908	/* ------------------------------------------------------------------------- */	1831	/* ------------------------------------------------------------------------- */
…		…
1914	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1837	rxvt_term::scr_page (enum page_dirn direction, int nlines)
1915	{	1838	{
1916	int n;	1839	int n;
1917	unsigned int oldviewstart;	1840	unsigned int oldviewstart;
1918		1841
1919	oldviewstart = TermWin.view_start;	1842	oldviewstart = view_start;
1920		1843
1921	if (direction == UP)	1844	if (direction == UP)
1922	{	1845	{
1923	n = TermWin.view_start + nlines;	1846	n = view_start + nlines;
1924	TermWin.view_start = min (n, TermWin.nscrolled);	1847	view_start = min (n, nsaved);
1925	}	1848	}
1926	else	1849	else
1927	{	1850	{
1928	n = TermWin.view_start - nlines;	1851	n = view_start - nlines;
1929	TermWin.view_start = max (n, 0);	1852	view_start = max (n, 0);
1930	}	1853	}
1931		1854
1932	return scr_changeview (oldviewstart);	1855	return scr_changeview (oldviewstart);
1933	}	1856	}
1934		1857
1935	int	1858	int
1936	rxvt_term::scr_changeview (unsigned int oldviewstart)	1859	rxvt_term::scr_changeview (unsigned int oldviewstart)
1937	{	1860	{
1938	if (TermWin.view_start != oldviewstart)	1861	if (view_start != oldviewstart)
1939	{	1862	{
1940	want_refresh = 1;	1863	want_refresh = 1;
1941	num_scr -= (TermWin.view_start - oldviewstart);	1864	num_scr -= (view_start - oldviewstart);
1942	}	1865	}
1943		1866
1944	return (int) (TermWin.view_start - oldviewstart);	1867	return (int) (view_start - oldviewstart);
1945	}	1868	}
1946		1869
1947	/* ------------------------------------------------------------------------- */	1870	/* ------------------------------------------------------------------------- */
1948	void	1871	void
1949	rxvt_term::scr_bell ()	1872	rxvt_term::scr_bell ()
…		…
1952		1875
1953	# ifndef NO_MAPALERT	1876	# ifndef NO_MAPALERT
1954	# ifdef MAPALERT_OPTION	1877	# ifdef MAPALERT_OPTION
1955	if (options & Opt_mapAlert)	1878	if (options & Opt_mapAlert)
1956	# endif	1879	# endif
1957	XMapWindow (display->display, TermWin.parent[0]);	1880	XMapWindow (display->display, parent[0]);
1958	# endif	1881	# endif
1959		1882
1960	if (options & Opt_visualBell)	1883	if (options & Opt_visualBell)
1961	{	1884	{
1962	scr_rvideo_mode (!rvideo); /* refresh also done */	1885	scr_rvideo_mode (!rvideo); /* refresh also done */
…		…
1973	/* ARGSUSED */	1896	/* ARGSUSED */
1974	void	1897	void
1975	rxvt_term::scr_printscreen (int fullhist)	1898	rxvt_term::scr_printscreen (int fullhist)
1976	{	1899	{
1977	#ifdef PRINTPIPE	1900	#ifdef PRINTPIPE
1978	int i, r1, nrows, row_offset;	1901	int nrows, row_start;
1979	FILE *fd;	1902	FILE *fd;
1980		1903
1981	if ((fd = popen_printer ()) == NULL)	1904	if ((fd = popen_printer ()) == NULL)
1982	return;	1905	return;
1983		1906
1984	nrows = TermWin.nrow;
1985	row_offset = TermWin.saveLines;
1986
1987	if (!fullhist)	1907	if (fullhist)
1988	row_offset -= TermWin.view_start;	1908	{
		1909	nrows = nrow + nsaved;
		1910	row_start = -nsaved;
		1911	}
1989	else	1912	else
1990	{	1913	{
1991	nrows += TermWin.nscrolled;	1914	nrows = nrow;
1992	row_offset -= TermWin.nscrolled;	1915	row_start = -view_start;
1993	}	1916	}
1994		1917
1995	wctomb (0, 0);	1918	wctomb (0, 0);
1996		1919
1997	for (r1 = 0; r1 < nrows; r1++)	1920	for (int r1 = 0; r1 < nrows; r1++)
1998	{	1921	{
1999	text_t *tp = screen.text[r1 + row_offset];	1922	text_t *tp = ROW(r1).t;
2000	int len = screen.tlen[r1 + row_offset];	1923	int len = ROW(r1).l;
2001		1924
2002	for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )	1925	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
2003	{	1926	{
2004	char mb[MB_LEN_MAX];	1927	char mb[MB_LEN_MAX];
2005	text_t t = *tp++;	1928	text_t t = *tp++;
2006	if (t == NOCHAR)	1929	if (t == NOCHAR)
2007	continue;	1930	continue;
…		…
2035	{	1958	{
2036	unsigned char must_clear, /* use draw_string not draw_image_string */	1959	unsigned char must_clear, /* use draw_string not draw_image_string */
2037	showcursor; /* show the cursor */	1960	showcursor; /* show the cursor */
2038	int16_t col, row, /* column/row we're processing */	1961	int16_t col, row, /* column/row we're processing */
2039	ocrow; /* old cursor row */	1962	ocrow; /* old cursor row */
2040	int i, /* tmp */	1963	int i; /* tmp */
2041	row_offset; /* basic offset in screen structure */
2042	#ifndef NO_CURSORCOLOR	1964	#ifndef NO_CURSORCOLOR
2043	rend_t cc1; /* store colours at cursor position (s) */	1965	rend_t cc1; /* store colours at cursor position (s) */
2044	#endif	1966	#endif
2045	rend_t *crp; // cursor rendition pointer	1967	rend_t *crp; // cursor rendition pointer
2046		1968
2047	want_refresh = 0; /* screen is current */	1969	want_refresh = 0; /* screen is current */
2048		1970
2049	if (refresh_type == NO_REFRESH || !TermWin.mapped)	1971	if (refresh_type == NO_REFRESH || !mapped)
2050	return;	1972	return;
2051		1973
2052	/*	1974	/*
2053	* A: set up vars	1975	* A: set up vars
2054	*/	1976	*/
2055	must_clear = 0;	1977	must_clear = 0;
2056	refresh_count = 0;	1978	refresh_count = 0;
2057
2058	row_offset = TermWin.saveLines - TermWin.view_start;
2059		1979
2060	#if XPM_BACKGROUND	1980	#if XPM_BACKGROUND
2061	must_clear |= bgPixmap.pixmap != None;	1981	must_clear |= bgPixmap.pixmap != None;
2062	#endif	1982	#endif
2063	#if TRANSPARENT	1983	#if TRANSPARENT
…		…
2086		2006
2087	if (showcursor)	2007	if (showcursor)
2088	{	2008	{
2089	int col = screen.cur.col;	2009	int col = screen.cur.col;
2090		2010
2091	while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)	2011	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2092	col--;	2012	col--;
2093		2013
2094	crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];	2014	crp = &ROW(screen.cur.row).r[col];
2095		2015
2096	if (showcursor && TermWin.focus)	2016	if (showcursor && focus)
2097	{	2017	{
2098	if (options & Opt_cursorUnderline)	2018	if (options & Opt_cursorUnderline)
2099	*crp ^= RS_Uline;	2019	*crp ^= RS_Uline;
2100	else	2020	else
2101	{	2021	{
…		…
2128		2048
2129	/* make sure no outline cursor is left around */	2049	/* make sure no outline cursor is left around */
2130	setoldcursor = 0;	2050	setoldcursor = 0;
2131	if (ocrow != -1)	2051	if (ocrow != -1)
2132	{	2052	{
2133	if (screen.cur.row + TermWin.view_start != ocrow	2053	if (screen.cur.row + view_start != ocrow
2134	|| screen.cur.col != oldcursor.col)	2054	|| screen.cur.col != oldcursor.col)
2135	{	2055	{
2136	if (ocrow < TermWin.nrow	2056	if (ocrow < nrow
2137	&& oldcursor.col < TermWin.ncol)	2057	&& oldcursor.col < ncol)
2138	drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);	2058	drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2139		2059
2140	if (TermWin.focus || !showcursor)	2060	if (focus || !showcursor)
2141	oldcursor.row = -1;	2061	oldcursor.row = -1;
2142	else	2062	else
2143	setoldcursor = 1;	2063	setoldcursor = 1;
2144	}	2064	}
2145	}	2065	}
2146	else if (!TermWin.focus)	2066	else if (!focus)
2147	setoldcursor = 1;	2067	setoldcursor = 1;
2148		2068
2149	if (setoldcursor)	2069	if (setoldcursor)
2150	{	2070	{
2151	if (screen.cur.row + TermWin.view_start >= TermWin.nrow)	2071	if (screen.cur.row + view_start >= nrow)
2152	oldcursor.row = -1;	2072	oldcursor.row = -1;
2153	else	2073	else
2154	{	2074	{
2155	oldcursor.row = screen.cur.row + TermWin.view_start;	2075	oldcursor.row = screen.cur.row + view_start;
2156	oldcursor.col = screen.cur.col;	2076	oldcursor.col = screen.cur.col;
2157	}	2077	}
2158	}	2078	}
2159	}	2079	}
2160		2080
…		…
2167	* D: CopyArea pass - very useful for slower links	2087	* D: CopyArea pass - very useful for slower links
2168	* This has been deliberately kept simple.	2088	* This has been deliberately kept simple.
2169	*/	2089	*/
2170	i = num_scr;	2090	i = num_scr;
2171	if (!display->is_local	2091	if (!display->is_local
2172	&& refresh_type == FAST_REFRESH && num_scr_allow && i	2092	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2173	&& abs (i) < TermWin.nrow && !must_clear)	2093	&& abs (num_scr) < nrow && !must_clear)
2174	{	2094	{
2175	int16_t nits;	2095	int16_t nits;
2176	int j;	2096	int j;
2177	int len, wlen;	2097	int len, wlen;
2178		2098
2179	j = TermWin.nrow;	2099	j = nrow;
2180	wlen = len = -1;	2100	wlen = len = -1;
2181	row = i > 0 ? 0 : j - 1;	2101	row = i > 0 ? 0 : j - 1;
2182	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2102	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2183	{	2103	{
2184	if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)	2104	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2185	{	2105	{
2186	text_t *stp = screen.text[row + row_offset];	2106	line_t s = ROW(row - view_start);
2187	rend_t *srp = screen.rend[row + row_offset];
2188	text_t *dtp = drawn_text[row];	2107	line_t d = drawn[row];
2189	text_t *dtp2 = drawn_text[row + i];	2108	line_t d2 = drawn[row + i];
2190	rend_t *drp = drawn_rend[row];
2191	rend_t *drp2 = drawn_rend[row + i];
2192		2109
2193	for (nits = 0, col = TermWin.ncol; col--; )	2110	for (nits = 0, col = ncol; col--; )
2194	if (stp[col] != dtp2[col] || srp[col] != drp2[col])	2111	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2195	nits--;	2112	nits--;
2196	else if (stp[col] != dtp[col] || srp[col] != drp[col])	2113	else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2197	nits++;	2114	nits++;
2198		2115
2199	if (nits > 8) /* XXX: arbitrary choice */	2116	if (nits > 8) /* XXX: arbitrary choice */
2200	{	2117	{
2201	for (col = TermWin.ncol; col--; )	2118	for (col = ncol; col--; )
2202	{	2119	{
2203	*dtp++ = *dtp2++;	2120	*d.t++ = *d2.t++;
2204	*drp++ = *drp2++;	2121	*d.r++ = *d2.r++;
2205	}	2122	}
2206		2123
2207	if (len == -1)	2124	if (len == -1)
2208	len = row;	2125	len = row;
2209		2126
…		…
2216	{	2133	{
2217	/* also comes here at end if needed because of >= above */	2134	/* also comes here at end if needed because of >= above */
2218	if (wlen < len)	2135	if (wlen < len)
2219	SWAP_IT (wlen, len, int);	2136	SWAP_IT (wlen, len, int);
2220		2137
2221	XCopyArea (display->display, TermWin.vt, TermWin.vt,	2138	XCopyArea (display->display, vt, vt,
2222	TermWin.gc, 0, Row2Pixel (len + i),	2139	gc, 0, Row2Pixel (len + i),
2223	(unsigned int)TermWin_TotalWidth (),	2140	(unsigned int)TermWin_TotalWidth (),
2224	(unsigned int)Height2Pixel (wlen - len + 1),	2141	(unsigned int)Height2Pixel (wlen - len + 1),
2225	0, Row2Pixel (len));	2142	0, Row2Pixel (len));
2226	len = -1;	2143	len = -1;
2227	}	2144	}
…		…
2230	#endif	2147	#endif
2231		2148
2232	/*	2149	/*
2233	* E: main pass across every character	2150	* E: main pass across every character
2234	*/	2151	*/
2235	for (row = 0; row < TermWin.nrow; row++)	2152	for (row = 0; row < nrow; row++)
2236	{	2153	{
2237	text_t *stp = screen.text[row + row_offset];	2154	text_t *stp = ROW(row - view_start).t;
2238	rend_t *srp = screen.rend[row + row_offset];	2155	rend_t *srp = ROW(row - view_start).r;
2239	text_t *dtp = drawn_text[row];	2156	text_t *dtp = drawn[row].t;
2240	rend_t *drp = drawn_rend[row];	2157	rend_t *drp = drawn[row].r;
2241		2158
2242	/*	2159	/*
2243	* E2: OK, now the real pass	2160	* E2: OK, now the real pass
2244	*/	2161	*/
2245	int ypixel = (int)Row2Pixel (row);	2162	int ypixel = (int)Row2Pixel (row);
2246		2163
2247	for (col = 0; col < TermWin.ncol; col++)	2164	for (col = 0; col < ncol; col++)
2248	{	2165	{
2249	/* compare new text with old - if exactly the same then continue */	2166	/* compare new text with old - if exactly the same then continue */
2250	if (stp[col] == dtp[col] /* Must match characters to skip. */	2167	if (stp[col] == dtp[col] /* Must match characters to skip. */
2251	&& (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */	2168	&& (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2252	|| (stp[col] == ' ' /* space w/ no background change */	2169	|| (stp[col] == ' ' /* space w/ no background change */
…		…
2266	dtp[col] = stp[col];	2183	dtp[col] = stp[col];
2267	drp[col] = rend;	2184	drp[col] = rend;
2268		2185
2269	int xpixel = Col2Pixel (col);	2186	int xpixel = Col2Pixel (col);
2270		2187
2271	for (i = 0; ++col < TermWin.ncol; )	2188	for (i = 0; ++col < ncol; )
2272	{	2189	{
2273	if (stp[col] == NOCHAR)	2190	if (stp[col] == NOCHAR)
2274	{	2191	{
2275	dtp[col] = stp[col];	2192	dtp[col] = stp[col];
2276	drp[col] = rend;	2193	drp[col] = rend;
…		…
2315	// only do special processing if any attributes are set, which is rare	2232	// only do special processing if any attributes are set, which is rare
2316	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2233	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2317	{	2234	{
2318	#if ENABLE_STYLES	2235	#if ENABLE_STYLES
2319	// force redraw after "careful" characters to avoid pixel droppings	2236	// force redraw after "careful" characters to avoid pixel droppings
2320	if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)	2237	if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2321	drp[col + 1] = ~srp[col + 1];	2238	drp[col + 1] = ~srp[col + 1];
2322		2239
2323	// include previous careful character(s) if possible, looks nicer (best effort...)	2240	// include previous careful character(s) if possible, looks nicer (best effort...)
2324	while (text > stp	2241	while (text > stp
2325	&& srp[text - stp - 1] & RS_Careful	2242	&& srp[text - stp - 1] & RS_Careful
2326	&& RS_SAME (rend, srp[text - stp - 1]))	2243	&& RS_SAME (rend, srp[text - stp - 1]))
2327	text--, count++, xpixel -= TermWin.fwidth;	2244	text--, count++, xpixel -= fwidth;
2328	#endif	2245	#endif
2329		2246
2330	bool invert = rend & RS_RVid;	2247	bool invert = rend & RS_RVid;
2331		2248
2332	#ifndef NO_BOLD_UNDERLINE_REVERSE	2249	#ifndef NO_BOLD_UNDERLINE_REVERSE
…		…
2387	}	2304	}
2388		2305
2389	/*	2306	/*
2390	* Actually do the drawing of the string here	2307	* Actually do the drawing of the string here
2391	*/	2308	*/
2392	rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2309	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2393		2310
2394	if (back == fore)	2311	if (back == fore)
2395	font->clear_rect (*TermWin.drawable, xpixel, ypixel,	2312	font->clear_rect (*drawable, xpixel, ypixel,
2396	TermWin.fwidth * count, TermWin.fheight,	2313	fwidth * count, fheight,
2397	back);	2314	back);
2398	else if (back == Color_bg)	2315	else if (back == Color_bg)
2399	{	2316	{
2400	if (must_clear)	2317	if (must_clear)
2401	{	2318	{
2402	CLEAR_CHARS (xpixel, ypixel, count);	2319	CLEAR_CHARS (xpixel, ypixel, count);
2403		2320
2404	for (i = 0; i < count; i++) /* don't draw empty strings */	2321	for (i = 0; i < count; i++) /* don't draw empty strings */
2405	if (text[i] != ' ')	2322	if (text[i] != ' ')
2406	{	2323	{
2407	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1);	2324	font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2408	break;	2325	break;
2409	}	2326	}
2410	}	2327	}
2411	else	2328	else
2412	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);	2329	font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2413	}	2330	}
2414	else	2331	else
2415	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);	2332	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2416		2333
2417	if (rend & RS_Uline && font->descent > 1 && fore != back)	2334	if (rend & RS_Uline && font->descent > 1 && fore != back)
2418	{	2335	{
2419	#if ENABLE_FRILLS	2336	#if ENABLE_FRILLS
2420	if (ISSET_PIXCOLOR (Color_underline))	2337	if (ISSET_PIXCOLOR (Color_underline))
2421	XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);	2338	XSetForeground (display->display, gc, pix_colors[Color_underline]);
2422	else	2339	else
2423	#endif	2340	#endif
2424	XSetForeground (display->display, TermWin.gc, pix_colors[fore]);	2341	XSetForeground (display->display, gc, pix_colors[fore]);
2425		2342
2426	XDrawLine (display->display, drawBuffer, TermWin.gc,	2343	XDrawLine (display->display, drawBuffer, gc,
2427	xpixel, ypixel + font->ascent + 1,	2344	xpixel, ypixel + font->ascent + 1,
2428	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2345	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2429	}	2346	}
2430	} /* for (col....) */	2347	} /* for (col....) */
2431	} /* for (row....) */	2348	} /* for (row....) */
…		…
2437	/*	2354	/*
2438	* G: cleanup cursor and display outline cursor if necessary	2355	* G: cleanup cursor and display outline cursor if necessary
2439	*/	2356	*/
2440	if (showcursor)	2357	if (showcursor)
2441	{	2358	{
2442	if (TermWin.focus)	2359	if (focus)
2443	{	2360	{
2444	if (options & Opt_cursorUnderline)	2361	if (options & Opt_cursorUnderline)
2445	*crp ^= RS_Uline;	2362	*crp ^= RS_Uline;
2446	else	2363	else
2447	{	2364	{
…		…
2454	else if (oldcursor.row >= 0)	2371	else if (oldcursor.row >= 0)
2455	{	2372	{
2456	int cursorwidth = 1;	2373	int cursorwidth = 1;
2457	int col = oldcursor.col;	2374	int col = oldcursor.col;
2458		2375
2459	while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)	2376	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2460	col--;	2377	col--;
2461		2378
2462	while (col + cursorwidth < TermWin.ncol	2379	while (col + cursorwidth < ncol
2463	&& drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)	2380	&& drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2464	cursorwidth++;	2381	cursorwidth++;
2465		2382
2466	#ifndef NO_CURSORCOLOR	2383	#ifndef NO_CURSORCOLOR
2467	if (ISSET_PIXCOLOR (Color_cursor))	2384	if (ISSET_PIXCOLOR (Color_cursor))
2468	XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);	2385	XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2469	#endif	2386	#endif
2470		2387
2471	XDrawRectangle (display->display, drawBuffer, TermWin.gc,	2388	XDrawRectangle (display->display, drawBuffer, gc,
2472	Col2Pixel (col),	2389	Col2Pixel (col),
2473	Row2Pixel (oldcursor.row),	2390	Row2Pixel (oldcursor.row),
2474	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2391	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2475	(unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));	2392	(unsigned int) (Height2Pixel (1) - lineSpace - 1));
2476	}	2393	}
2477	}	2394	}
2478		2395
2479	/*	2396	/*
2480	* H: cleanup selection	2397	* H: cleanup selection
…		…
2487	num_scr = 0;	2404	num_scr = 0;
2488	num_scr_allow = 1;	2405	num_scr_allow = 1;
2489	}	2406	}
2490		2407
2491	void	2408	void
2492	rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)	2409	rxvt_term::scr_remap_chars (const line_t &l)
2493	{	2410	{
2494	if (!rp || !tp)	2411	if (!l.t)
2495	return;	2412	return;
2496		2413
2497	for (int i = TermWin.ncol; i; i--, rp++, tp++)	2414	for (int i = ncol; i--; )
2498	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));	2415	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2499	}	2416	}
2500		2417
2501	void	2418	void
2502	rxvt_term::scr_remap_chars ()	2419	rxvt_term::scr_remap_chars ()
2503	{	2420	{
2504	for (int i = TermWin.nrow + TermWin.saveLines; i--; )	2421	for (int i = total_rows; i--; )
2505	scr_remap_chars (screen.text[i], screen.rend[i]);	2422	scr_remap_chars (save[i]);
2506		2423
2507	for (int i = TermWin.nrow; i--; )	2424	for (int i = nrow; i--; )
2508	{	2425	{
2509	scr_remap_chars (drawn_text[i], drawn_rend[i]);	2426	scr_remap_chars (drawn[i]);
2510	scr_remap_chars (swap.text[i], swap.rend[i]);	2427	scr_remap_chars (swap_save[i]);
2511	}	2428	}
2512	}	2429	}
2513		2430
2514	void	2431	void
2515	rxvt_term::scr_recolour ()	2432	rxvt_term::scr_recolour ()
…		…
2521	#if XPM_BACKGROUND	2438	#if XPM_BACKGROUND
2522	&& !bgPixmap.pixmap	2439	&& !bgPixmap.pixmap
2523	#endif	2440	#endif
2524	)	2441	)
2525	{	2442	{
2526	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);	2443	XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2527	XClearWindow (display->display, TermWin.parent[0]);	2444	XClearWindow (display->display, parent[0]);
2528	XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);	2445	XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2529	#if HAVE_SCROLLBARS	2446	#if HAVE_SCROLLBARS
2530	if (scrollBar.win)	2447	if (scrollBar.win)
2531	{	2448	{
2532	XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);	2449	XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2533	scrollBar.setIdle ();	2450	scrollBar.setIdle ();
…		…
2543		2460
2544	/* ------------------------------------------------------------------------- */	2461	/* ------------------------------------------------------------------------- */
2545	void	2462	void
2546	rxvt_term::scr_clear (bool really)	2463	rxvt_term::scr_clear (bool really)
2547	{	2464	{
2548	if (!TermWin.mapped)	2465	if (!mapped)
2549	return;	2466	return;
2550		2467
2551	num_scr_allow = 0;	2468	num_scr_allow = 0;
2552	want_refresh = 1;	2469	want_refresh = 1;
2553		2470
2554	if (really)	2471	if (really)
2555	XClearWindow (display->display, TermWin.vt);	2472	XClearWindow (display->display, vt);
2556	}	2473	}
2557		2474
2558	/* ------------------------------------------------------------------------- */	2475	/* ------------------------------------------------------------------------- */
2559	void	2476	void
2560	rxvt_term::scr_reverse_selection ()	2477	rxvt_term::scr_reverse_selection ()
2561	{	2478	{
		2479	if (selection.op
2562	if (selection.op && current_screen == selection.screen)	2480	&& current_screen == selection.screen
		2481	&& selection.end.row >= -view_start)
2563	{	2482	{
2564	int end_row = TermWin.saveLines - TermWin.view_start;	2483	int view_end = -view_start + nrow;
2565	int i = selection.beg.row + TermWin.saveLines;	2484	int row, col;
2566	int col, row = selection.end.row + TermWin.saveLines;
2567	rend_t *srp;
2568		2485
2569	#if ENABLE_FRILLS	2486	#if ENABLE_FRILLS
2570	if (selection.rect)	2487	if (selection.rect)
2571	{	2488	{
2572	end_row += TermWin.nrow;	2489	for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2573
2574	for (; i <= row && i <= end_row; i++)
2575	for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)	2490	for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)
2576	srp[col] ^= RS_RVid;	2491	srp[col] ^= RS_RVid;
2577	}	2492	}
2578	else	2493	else
2579	#endif	2494	#endif
2580	{	2495	{
2581	if (i >= end_row)	2496	if (selection.beg.row >= -view_start)
		2497	{
2582	col = selection.beg.col;	2498	col = selection.beg.col;
		2499	row = selection.beg.row;
		2500	}
2583	else	2501	else
2584	{	2502	{
2585	col = 0;	2503	col = 0;
2586	i = end_row;	2504	row = view_start;
2587	}	2505	}
2588		2506
2589	end_row += TermWin.nrow;	2507	for (; row < min (selection.end.row, view_end); row++, col = 0)
2590		2508	for (rend_t *srp = ROW(row).r; col < ncol; col++)
2591	for (; i < row && i < end_row; i++, col = 0)
2592	for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2593	srp[col] ^= RS_RVid;	2509	srp[col] ^= RS_RVid;
2594		2510
2595	if (i == row && i < end_row)	2511	if (row == selection.end.row)
2596	for (srp = screen.rend[i]; col < selection.end.col; col++)	2512	for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2597	srp[col] ^= RS_RVid;	2513	srp[col] ^= RS_RVid;
2598	}	2514	}
2599	}	2515	}
2600	}	2516	}
2601		2517
…		…
2610	{	2526	{
2611	int row, wrote;	2527	int row, wrote;
2612	unsigned int width, towrite;	2528	unsigned int width, towrite;
2613	char r1[] = "\n";	2529	char r1[] = "\n";
2614		2530
2615	for (row = TermWin.saveLines - TermWin.nscrolled;	2531	for (row = saveLines - nsaved;
2616	row < TermWin.saveLines + TermWin.nrow - 1; row++)	2532	row < saveLines + nrow - 1; row++)
2617	{	2533	{
2618	width = screen.tlen[row] >= 0 ? screen.tlen[row]	2534	width = save[row].l >= 0 ? save[row].l
2619	: TermWin.ncol;	2535	: ncol;
2620	for (towrite = width; towrite; towrite -= wrote)	2536	for (towrite = width; towrite; towrite -= wrote)
2621	{	2537	{
2622	wrote = write (fd, & (screen.text[row][width - towrite]),	2538	wrote = write (fd, & (save[row].t[width - towrite]),
2623	towrite);	2539	towrite);
2624	if (wrote < 0)	2540	if (wrote < 0)
2625	return; /* XXX: death, no report */	2541	return; /* XXX: death, no report */
2626	}	2542	}
2627	if (screen.tlen[row] >= 0)	2543	if (save[row].l >= 0)
2628	if (write (fd, r1, 1) <= 0)	2544	if (write (fd, r1, 1) <= 0)
2629	return; /* XXX: death, no report */	2545	return; /* XXX: death, no report */
2630	}	2546	}
2631	}	2547	}
2632	#endif	2548	#endif
2633		2549
2634	/* ------------------------------------------------------------------------- *	2550	/* ------------------------------------------------------------------------- *
2635	* CHARACTER SELECTION *	2551	* CHARACTER SELECTION *
2636	* ------------------------------------------------------------------------- */	2552	* ------------------------------------------------------------------------- */
2637
2638	/*
2639	* -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2640	*/
2641	void	2553	void
2642	rxvt_term::selection_check (int check_more)	2554	rxvt_term::selection_check (int check_more)
2643	{	2555	{
2644	row_col_t pos;	2556	row_col_t pos;
2645		2557
2646	if (!selection.op)	2558	if (!selection.op)
2647	return;	2559	return;
2648		2560
2649	pos.row = pos.col = 0;	2561	pos.row = pos.col = 0;
2650	if ((selection.beg.row < - (int32_t)TermWin.nscrolled)	2562	if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2651	|| (selection.beg.row >= TermWin.nrow)	2563	|| !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2652	|| (selection.mark.row < - (int32_t)TermWin.nscrolled)	2564	|| !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2653	|| (selection.mark.row >= TermWin.nrow)
2654	|| (selection.end.row < - (int32_t)TermWin.nscrolled)
2655	|| (selection.end.row >= TermWin.nrow)
2656	|| (check_more == 1	2565	|| (check_more == 1
2657	&& current_screen == selection.screen	2566	&& current_screen == selection.screen
2658	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2567	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2659	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2568	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
2660	|| (check_more == 2	2569	|| (check_more == 2
…		…
2662	&& ROWCOL_IS_AFTER (selection.end, pos))	2571	&& ROWCOL_IS_AFTER (selection.end, pos))
2663	|| (check_more == 3	2572	|| (check_more == 3
2664	&& ROWCOL_IS_AFTER (selection.end, pos))	2573	&& ROWCOL_IS_AFTER (selection.end, pos))
2665	|| (check_more == 4 /* screen width change */	2574	|| (check_more == 4 /* screen width change */
2666	&& (selection.beg.row != selection.end.row	2575	&& (selection.beg.row != selection.end.row
2667	|| selection.end.col > TermWin.ncol)))	2576	|| selection.end.col > ncol)))
2668	CLEAR_SELECTION ();	2577	CLEAR_SELECTION ();
2669	}	2578	}
2670		2579
2671	/* ------------------------------------------------------------------------- */	2580	/* ------------------------------------------------------------------------- */
2672	/*	2581	/*
…		…
2881	* EXT: button 2 release	2790	* EXT: button 2 release
2882	*/	2791	*/
2883	void	2792	void
2884	rxvt_term::selection_request (Time tm, int x, int y)	2793	rxvt_term::selection_request (Time tm, int x, int y)
2885	{	2794	{
2886	if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)	2795	if (x < 0 || x >= width || y < 0 || y >= height)
2887	return; /* outside window */	2796	return; /* outside window */
2888		2797
2889	if (selection.text)	2798	if (selection.text)
2890	{ /* internal selection */	2799	{ /* internal selection */
2891	char *str = rxvt_wcstombs (selection.text, selection.len);	2800	char *str = rxvt_wcstombs (selection.text, selection.len);
…		…
2933	sel = xa[XA_CLIPBOARD];	2842	sel = xa[XA_CLIPBOARD];
2934		2843
2935	if (XGetSelectionOwner (display->display, sel) != None)	2844	if (XGetSelectionOwner (display->display, sel) != None)
2936	{	2845	{
2937	XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],	2846	XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2938	TermWin.vt, selection_request_time);	2847	vt, selection_request_time);
2939	return 1;	2848	return 1;
2940	}	2849	}
2941		2850
2942	return 0;	2851	return 0;
2943	}	2852	}
…		…
2966	* EXT: button 1 or 3 release	2875	* EXT: button 1 or 3 release
2967	*/	2876	*/
2968	void	2877	void
2969	rxvt_term::selection_make (Time tm)	2878	rxvt_term::selection_make (Time tm)
2970	{	2879	{
2971	int i, col, end_col, row, end_row;	2880	int i;
2972	wchar_t *new_selection_text;	2881	wchar_t *new_selection_text;
2973	text_t *t;	2882	text_t *t;
2974		2883
2975	switch (selection.op)	2884	switch (selection.op)
2976	{	2885	{
…		…
2989	selection.op = SELECTION_DONE;	2898	selection.op = SELECTION_DONE;
2990		2899
2991	if (selection.clicks == 4)	2900	if (selection.clicks == 4)
2992	return; /* nothing selected, go away */	2901	return; /* nothing selected, go away */
2993		2902
2994	i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);	2903	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2995	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2904	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2996		2905
2997	col = selection.beg.col;
2998	row = selection.beg.row + TermWin.saveLines;
2999	end_row = selection.end.row + TermWin.saveLines;
3000	int ofs = 0;	2906	int ofs = 0;
3001	int extra = 0;	2907	int extra = 0;
3002		2908
		2909	int col = selection.beg.col;
		2910	int row = selection.beg.row;
		2911
		2912	int end_col;
		2913
3003	for (; row <= end_row; row++, col = 0)	2914	for (; row <= selection.end.row; row++, col = 0)
3004	{	2915	{
3005	end_col = screen.tlen[row];
3006
3007	#if ENABLE_FRILLS	2916	#if ENABLE_FRILLS
3008	if (selection.rect)	2917	if (selection.rect)
3009	{	2918	{
3010	col = selection.beg.col;	2919	col = selection.beg.col;
3011	end_col = TermWin.ncol + 1;	2920	end_col = ncol + 1;
3012	}	2921	}
		2922	else
3013	#endif	2923	#endif
		2924	end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
3014		2925
3015	MAX_IT (col, 0);	2926	col = max (col, 0);
3016		2927
3017	if (end_col == -1)
3018	end_col = TermWin.ncol;
3019
3020	if (row == end_row || selection.rect)	2928	if (row == selection.end.row || selection.rect)
3021	MIN_IT (end_col, selection.end.col);	2929	end_col = min (end_col, selection.end.col);
3022		2930
3023	t = &screen.text[row][col];	2931	t = ROW(row).t + col;
3024	for (; col < end_col; col++)	2932	for (; col < end_col; col++)
3025	{	2933	{
3026	if (*t == NOCHAR)	2934	if (*t == NOCHAR)
3027	t++;	2935	t++;
3028	#if ENABLE_COMBINING	2936	#if ENABLE_COMBINING
…		…
3044	#endif	2952	#endif
3045	else	2953	else
3046	new_selection_text[ofs++] = *t++;	2954	new_selection_text[ofs++] = *t++;
3047	}	2955	}
3048		2956
3049	if (screen.tlen[row] != -1 && row != end_row)	2957	if (!ROW(row).is_longer () && row != selection.end.row)
3050	new_selection_text[ofs++] = C0_LF;	2958	new_selection_text[ofs++] = C0_LF;
3051	}	2959	}
3052		2960
3053	if (end_col != selection.end.col)	2961	if (end_col != selection.end.col)
3054	new_selection_text[ofs++] = C0_LF;	2962	new_selection_text[ofs++] = C0_LF;
…		…
3065		2973
3066	// we usually allocate much more than necessary, so realloc it smaller again	2974	// we usually allocate much more than necessary, so realloc it smaller again
3067	selection.len = ofs;	2975	selection.len = ofs;
3068	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));	2976	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3069		2977
3070	XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);	2978	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3071	if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)	2979	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3072	display->set_selection_owner (this);	2980	display->set_selection_owner (this);
3073	else	2981	else
3074	rxvt_warn ("can't get primary selection, ignoring.\n");	2982	rxvt_warn ("can't get primary selection, ignoring.\n");
3075		2983
3076	#if 0	2984	#if 0
…		…
3099		3007
3100	selection_start_colrow (Pixel2Col (x), Pixel2Row (y));	3008	selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3101		3009
3102	if (clicks == 2 || clicks == 3)	3010	if (clicks == 2 || clicks == 3)
3103	selection_extend_colrow (selection.mark.col,	3011	selection_extend_colrow (selection.mark.col,
3104	selection.mark.row + TermWin.view_start,	3012	selection.mark.row + view_start,
3105	0, /* button 3 */	3013	0, /* button 3 */
3106	1, /* button press */	3014	1, /* button press */
3107	0); /* click change */	3015	0); /* click change */
3108	}	3016	}
3109		3017
…		…
3113	*/	3021	*/
3114	void	3022	void
3115	rxvt_term::selection_start_colrow (int col, int row)	3023	rxvt_term::selection_start_colrow (int col, int row)
3116	{	3024	{
3117	want_refresh = 1;	3025	want_refresh = 1;
		3026
		3027	selection.mark.row = row - view_start;
3118	selection.mark.col = col;	3028	selection.mark.col = col;
3119	selection.mark.row = row - TermWin.view_start;
3120		3029
3121	MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);	3030	selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1);
3122	MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);	3031	selection.mark.col = min (max (selection.mark.col, 0), ncol - 1);
3123	MAX_IT (selection.mark.col, 0);
3124	MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3125		3032
3126	while (selection.mark.col > 0	3033	while (selection.mark.col > 0
3127	&& screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)	3034	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3128	--selection.mark.col;	3035	--selection.mark.col;
3129		3036
3130	if (selection.op)	3037	if (selection.op)
3131	{ /* clear the old selection */	3038	{ /* clear the old selection */
3132	selection.beg.row = selection.end.row = selection.mark.row;	3039	selection.beg.row = selection.end.row = selection.mark.row;
…		…
3156	text_t *stp;	3063	text_t *stp;
3157	rend_t *srp;	3064	rend_t *srp;
3158		3065
3159	if (dirn == UP)	3066	if (dirn == UP)
3160	{	3067	{
3161	bound.row = TermWin.saveLines - TermWin.nscrolled - 1;	3068	bound.row = - nsaved - 1;
3162	bound.col = 0;	3069	bound.col = 0;
3163	dirnadd = -1;	3070	dirnadd = -1;
3164	}	3071	}
3165	else	3072	else
3166	{	3073	{
3167	bound.row = TermWin.saveLines + TermWin.nrow;	3074	bound.row = nrow;
3168	bound.col = TermWin.ncol - 1;	3075	bound.col = ncol - 1;
3169	dirnadd = 1;	3076	dirnadd = 1;
3170	}	3077	}
3171		3078
3172	row = mark->row + TermWin.saveLines;	3079	row = mark->row;
3173	col = mark->col;	3080	col = max (mark->col, 0);
3174	MAX_IT (col, 0);	3081
3175	/* find the edge of a word */	3082	/* find the edge of a word */
3176	stp = &screen.text[row][col];	3083	stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3177	w1 = DELIMIT_TEXT (*stp);	3084	srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3178
3179	srp = &screen.rend[row][col];
3180	w2 = DELIMIT_REND (*srp);
3181		3085
3182	for (;;)	3086	for (;;)
3183	{	3087	{
3184	for (; col != bound.col; col += dirnadd)	3088	for (; col != bound.col; col += dirnadd)
3185	{	3089	{
…		…
3195	break;	3099	break;
3196	}	3100	}
3197		3101
3198	if ((col == bound.col) && (row != bound.row))	3102	if ((col == bound.col) && (row != bound.row))
3199	{	3103	{
3200	if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)	3104	if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3201	{	3105	{
3202	trow = row + dirnadd;	3106	trow = row + dirnadd;
3203	tcol = dirn == UP ? TermWin.ncol - 1 : 0;	3107	tcol = dirn == UP ? ncol - 1 : 0;
3204		3108
3205	if (screen.text[trow] == NULL)	3109	if (!ROW(trow).t)
3206	break;	3110	break;
3207		3111
3208	stp = & (screen.text[trow][tcol]);	3112	stp = ROW(trow).t + tcol;
3209	srp = & (screen.rend[trow][tcol]);	3113	srp = ROW(trow).r + tcol;
3210		3114
3211	if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)	3115	if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3212	break;	3116	break;
3213		3117
3214	row = trow;	3118	row = trow;
…		…
3222	Old_Word_Selection_You_Die:	3126	Old_Word_Selection_You_Die:
3223	if (dirn == DN)	3127	if (dirn == DN)
3224	col++; /* put us on one past the end */	3128	col++; /* put us on one past the end */
3225		3129
3226	/* Poke the values back in */	3130	/* Poke the values back in */
3227	ret->row = row - TermWin.saveLines;	3131	ret->row = row;
3228	ret->col = col;	3132	ret->col = col;
3229	}	3133	}
3230		3134
3231	/* ------------------------------------------------------------------------- */	3135	/* ------------------------------------------------------------------------- */
3232	/*	3136	/*
…		…
3237	* flag == 2 ==> button 3 motion	3141	* flag == 2 ==> button 3 motion
3238	*/	3142	*/
3239	void	3143	void
3240	rxvt_term::selection_extend (int x, int y, int flag)	3144	rxvt_term::selection_extend (int x, int y, int flag)
3241	{	3145	{
3242	int col, row;	3146	int col = min (max (Pixel2Col (x), 0), ncol);
3243		3147	int row = min (max (Pixel2Row (y), 0), nrow - 1);
3244	col = Pixel2Col (x);
3245	row = Pixel2Row (y);
3246	MAX_IT (row, 0);
3247	MIN_IT (row, (int)TermWin.nrow - 1);
3248	MAX_IT (col, 0);
3249	MIN_IT (col, (int)TermWin.ncol);
3250		3148
3251	/*	3149	/*
3252	* If we're selecting characters (single click) then we must check first	3150	* If we're selecting characters (single click) then we must check first
3253	* if we are at the same place as the original mark. If we are then	3151	* if we are at the same place as the original mark. If we are then
3254	* select nothing. Otherwise, if we're to the right of the mark, you have to	3152	* select nothing. Otherwise, if we're to the right of the mark, you have to
3255	* be _past_ a character for it to be selected.	3153	* be _past_ a character for it to be selected.
3256	*/	3154	*/
3257	if (((selection.clicks % 3) == 1) && !flag	3155	if (((selection.clicks % 3) == 1) && !flag
3258	&& (col == selection.mark.col	3156	&& (col == selection.mark.col
3259	&& (row == selection.mark.row + TermWin.view_start)))	3157	&& (row == selection.mark.row + view_start)))
3260	{	3158	{
3261	/* select nothing */	3159	/* select nothing */
3262	selection.beg.row = selection.end.row = 0;	3160	selection.beg.row = selection.end.row = 0;
3263	selection.beg.col = selection.end.col = 0;	3161	selection.beg.col = selection.end.col = 0;
3264	selection.clicks = 4;	3162	selection.clicks = 4;
…		…
3279	* Extend the selection to the specified col/row	3177	* Extend the selection to the specified col/row
3280	*/	3178	*/
3281	void	3179	void
3282	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)	3180	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3283	{	3181	{
3284	int16_t ncol = TermWin.ncol;
3285	int end_col;
3286	row_col_t pos;	3182	row_col_t pos;
3287	enum {	3183	enum {
3288	LEFT, RIGHT	3184	LEFT, RIGHT
3289	} closeto = RIGHT;	3185	} closeto = RIGHT;
3290		3186
…		…
3321	selection.beg.col = selection.end.col = selection.mark.col;	3217	selection.beg.col = selection.end.col = selection.mark.col;
3322	selection.beg.row = selection.end.row = selection.mark.row;	3218	selection.beg.row = selection.end.row = selection.mark.row;
3323	}	3219	}
3324		3220
3325	pos.col = col;	3221	pos.col = col;
3326	pos.row = row;	3222	pos.row = row - view_start;
3327
3328	pos.row -= TermWin.view_start; /* adjust for scroll */
3329		3223
3330	/*	3224	/*
3331	* This is mainly xterm style selection with a couple of differences, mainly	3225	* This is mainly xterm style selection with a couple of differences, mainly
3332	* in the way button3 drag extension works.	3226	* in the way button3 drag extension works.
3333	* We're either doing: button1 drag; button3 press; or button3 drag	3227	* We're either doing: button1 drag; button3 press; or button3 drag
…		…
3392	}	3286	}
3393	}	3287	}
3394		3288
3395	if (selection.clicks == 1)	3289	if (selection.clicks == 1)
3396	{	3290	{
3397	end_col = screen.tlen[selection.beg.row + TermWin.saveLines];	3291	if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3398		3292	&& !ROW(selection.beg.row).is_longer ()
3399	if (selection.beg.col > end_col
3400	&& end_col != -1
3401	#if ENABLE_FRILLS	3293	#if ENABLE_FRILLS
3402	&& !selection.rect	3294	&& !selection.rect
3403	#endif	3295	#endif
3404	)	3296	)
3405	selection.beg.col = ncol;	3297	selection.beg.col = ncol;
3406		3298
3407	end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3408
3409	if (	3299	if (
3410	selection.end.col > end_col	3300	selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3411	&& end_col != -1	3301	&& !ROW(selection.end.row).is_longer ()
3412	#if ENABLE_FRILLS	3302	#if ENABLE_FRILLS
3413	&& !selection.rect	3303	&& !selection.rect
3414	#endif	3304	#endif
3415	)	3305	)
3416	selection.end.col = ncol;	3306	selection.end.col = ncol;
…		…
3426	else if (selection.clicks == 3)	3316	else if (selection.clicks == 3)
3427	{	3317	{
3428	#if ENABLE_FRILLS	3318	#if ENABLE_FRILLS
3429	if (options & Opt_tripleclickwords)	3319	if (options & Opt_tripleclickwords)
3430	{	3320	{
3431	int end_row;
3432
3433	selection_delimit_word (UP, &selection.beg, &selection.beg);	3321	selection_delimit_word (UP, &selection.beg, &selection.beg);
3434	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3435		3322
3436	for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)	3323	for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3437	{	3324	{
3438	end_col = screen.tlen[end_row + TermWin.saveLines];	3325	if (!ROW(end_row).is_longer ())
3439
3440	if (end_col != -1)
3441	{	3326	{
3442	selection.end.row = end_row;	3327	selection.end.row = end_row;
3443	selection.end.col = end_col;	3328	selection.end.col = ROW(end_row).l;
3444	selection_remove_trailing_spaces ();	3329	selection_remove_trailing_spaces ();
3445	break;	3330	break;
3446	}	3331	}
3447	}	3332	}
3448	}	3333	}
…		…
3454		3339
3455	selection.beg.col = 0;	3340	selection.beg.col = 0;
3456	selection.end.col = ncol;	3341	selection.end.col = ncol;
3457		3342
3458	// select a complete logical line	3343	// select a complete logical line
3459	while (selection.beg.row > -TermWin.saveLines	3344	while (selection.beg.row > -saveLines
3460	&& screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)	3345	&& ROW(selection.beg.row - 1).is_longer ())
3461	selection.beg.row--;	3346	selection.beg.row--;
3462		3347
3463	while (selection.end.row < TermWin.nrow	3348	while (selection.end.row < nrow
3464	&& screen.tlen[selection.end.row + TermWin.saveLines] == -1)	3349	&& ROW(selection.end.row).is_longer ())
3465	selection.end.row++;	3350	selection.end.row++;
3466	}	3351	}
3467	}	3352	}
3468		3353
3469	if (button3 && buttonpress)	3354	if (button3 && buttonpress)
…		…
3494	text_t *stp;	3379	text_t *stp;
3495		3380
3496	end_col = selection.end.col;	3381	end_col = selection.end.col;
3497	end_row = selection.end.row;	3382	end_row = selection.end.row;
3498		3383
3499	for ( ; end_row >= selection.beg.row; )	3384	for (; end_row >= selection.beg.row; )
3500	{	3385	{
3501	stp = screen.text[end_row + TermWin.saveLines];	3386	stp = ROW(end_row).t;
3502		3387
3503	while (--end_col >= 0)	3388	while (--end_col >= 0)
3504	{	3389	{
3505	if (stp[end_col] != ' '	3390	if (stp[end_col] != ' '
3506	&& stp[end_col] != '\t'	3391	&& stp[end_col] != '\t'
3507	&& stp[end_col] != NOCHAR)	3392	&& stp[end_col] != NOCHAR)
3508	break;	3393	break;
3509	}	3394	}
3510		3395
3511	if (end_col >= 0	3396	if (end_col >= 0
3512	|| screen.tlen[end_row - 1 + TermWin.saveLines] != -1)	3397	|| !ROW(end_row - 1).is_longer ())
3513	{	3398	{
3514	selection.end.col = end_col + 1;	3399	selection.end.col = end_col + 1;
3515	selection.end.row = end_row;	3400	selection.end.row = end_row;
3516	break;	3401	break;
3517	}	3402	}
3518		3403
3519	end_row--;	3404	end_row--;
3520	end_col = TermWin.ncol;	3405	end_col = ncol;
3521	}	3406	}
3522		3407
3523	if (selection.mark.row > selection.end.row)	3408	if (selection.mark.row > selection.end.row)
3524	{	3409	{
3525	selection.mark.row = selection.end.row;	3410	selection.mark.row = selection.end.row;
…		…
3688	*/	3573	*/
3689	void	3574	void
3690	rxvt_term::pixel_position (int *x, int *y)	3575	rxvt_term::pixel_position (int *x, int *y)
3691	{	3576	{
3692	*x = Pixel2Col (*x);	3577	*x = Pixel2Col (*x);
3693	/* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */	3578	/* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */
3694	*y = Pixel2Row (*y);	3579	*y = Pixel2Row (*y);
3695	/* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */	3580	/* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */
3696	}	3581	}
3697		3582
3698	/* ------------------------------------------------------------------------- */	3583	/* ------------------------------------------------------------------------- */
3699	#ifdef USE_XIM	3584	#ifdef USE_XIM
3700	void	3585	void
3701	rxvt_term::im_set_position (XPoint &pos)	3586	rxvt_term::im_set_position (XPoint &pos)
3702	{	3587	{
3703	XWindowAttributes xwa;	3588	XWindowAttributes xwa;
3704		3589
3705	XGetWindowAttributes (display->display, TermWin.vt, &xwa);	3590	XGetWindowAttributes (display->display, vt, &xwa);
3706		3591
3707	pos.x = xwa.x + Col2Pixel (screen.cur.col);	3592	pos.x = xwa.x + Col2Pixel (screen.cur.col);
3708	pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;	3593	pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3709	}	3594	}
3710	#endif	3595	#endif
3711		3596
3712	#if ENABLE_OVERLAY	3597	#if ENABLE_OVERLAY
3713	void	3598	void
3714	rxvt_term::scr_overlay_new (int x, int y, int w, int h)	3599	rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3715	{	3600	{
3716	if (TermWin.nrow < 3 || TermWin.ncol < 3)	3601	if (nrow < 3 || ncol < 3)
3717	return;	3602	return;
3718		3603
3719	want_refresh = 1;	3604	want_refresh = 1;
3720		3605
3721	scr_overlay_off ();	3606	scr_overlay_off ();
3722		3607
3723	if (x < 0) x = TermWin.ncol - w;	3608	if (x < 0) x = ncol - w;
3724	if (y < 0) y = TermWin.nrow - h;	3609	if (y < 0) y = nrow - h;
3725		3610
3726	// make space for border	3611	// make space for border
3727	w += 2; MIN_IT (w, TermWin.ncol);	3612	w += 2; MIN_IT (w, ncol);
3728	h += 2; MIN_IT (h, TermWin.nrow);	3613	h += 2; MIN_IT (h, nrow);
3729		3614
3730	x -= 1; MAX_IT (x, 0);	3615	x -= 1; MAX_IT (x, 0);
3731	y -= 1; MAX_IT (y, 0);	3616	y -= 1; MAX_IT (y, 0);
3732		3617
3733	MIN_IT (x, TermWin.ncol - w);	3618	MIN_IT (x, ncol - w);
3734	MIN_IT (y, TermWin.nrow - h);	3619	MIN_IT (y, nrow - h);
3735		3620
3736	ov_x = x; ov_y = y;	3621	ov_x = x; ov_y = y;
3737	ov_w = w; ov_h = h;	3622	ov_w = w; ov_h = h;
3738		3623
3739	ov_text = new text_t *[h];	3624	ov_text = new text_t *[h];
…		…
3825	rxvt_term::scr_swap_overlay ()	3710	rxvt_term::scr_swap_overlay ()
3826	{	3711	{
3827	if (!ov_text)	3712	if (!ov_text)
3828	return;	3713	return;
3829		3714
3830	int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3831
3832	// swap screen mem with overlay	3715	// swap screen mem with overlay
3833	for (int y = ov_h; y--; )	3716	for (int y = ov_h; y--; )
3834	{	3717	{
3835	text_t *t1 = ov_text[y];	3718	text_t *t1 = ov_text[y];
3836	rend_t *r1 = ov_rend[y];	3719	rend_t *r1 = ov_rend[y];
3837		3720
3838	text_t *t2 = screen.text[y + row_offset] + ov_x;	3721	text_t *t2 = ROW(y - view_start).t + ov_x;
3839	rend_t *r2 = screen.rend[y + row_offset] + ov_x;	3722	rend_t *r2 = ROW(y - view_start).r + ov_x;
3840		3723
3841	for (int x = ov_w; x--; )	3724	for (int x = ov_w; x--; )
3842	{	3725	{
3843	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3726	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3844	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3727	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
…		…
3846	}	3729	}
3847	}	3730	}
3848		3731
3849	#endif	3732	#endif
3850	/* ------------------------------------------------------------------------- */	3733	/* ------------------------------------------------------------------------- */
		3734

Diff Legend

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