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.211 by root, Fri Jan 6 01:16:58 2006 UTC vs.
Revision 1.253 by root, Fri Jan 27 18:36:43 2006 UTC

1	/*--------------------------------*-C-*--------------------------------------*	1	/*--------------------------------*-C-*--------------------------------------*
2	* File: screen.C	2	* File: screen.C
3	*---------------------------------------------------------------------------*	3	*---------------------------------------------------------------------------*
4	*	4	*
5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>	5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
…		…
93	*/	93	*/
94	#define drawBuffer vt	94	#define drawBuffer vt
95		95
96	#define CLEAR_ROWS(row, num) \	96	#define CLEAR_ROWS(row, num) \
97	if (mapped) \	97	if (mapped) \
98	XClearArea (display->display, drawBuffer, 0, \	98	XClearArea (xdisp, drawBuffer, 0, \
99	Row2Pixel (row), (unsigned int)width, \	99	Row2Pixel (row), (unsigned int)width, \
100	(unsigned int)Height2Pixel (num), False)	100	(unsigned int)Height2Pixel (num), False)
101		101
102	#define CLEAR_CHARS(x, y, num) \	102	#define CLEAR_CHARS(x, y, num) \
103	if (mapped) \	103	if (mapped) \
104	XClearArea (display->display, drawBuffer, x, y, \	104	XClearArea (xdisp, drawBuffer, x, y, \
105	(unsigned int)Width2Pixel (num), \	105	(unsigned int)Width2Pixel (num), \
106	(unsigned int)Height2Pixel (1), False)	106	(unsigned int)Height2Pixel (1), False)
107		107
108	#define ERASE_ROWS(row, num) \	108	#define ERASE_ROWS(row, num) \
109	XFillRectangle (display->display, drawBuffer, gc, \	109	XFillRectangle (xdisp, drawBuffer, gc, \
110	0, Row2Pixel (row), \	110	0, Row2Pixel (row), \
111	(unsigned int)width, \	111	(unsigned int)width, \
112	(unsigned int)Height2Pixel (num))	112	(unsigned int)Height2Pixel (num))
113		113
114	/* ------------------------------------------------------------------------- *	114	/* ------------------------------------------------------------------------- *
115	* SCREEN `COMMON' ROUTINES *	115	* SCREEN `COMMON' ROUTINES *
116	* ------------------------------------------------------------------------- */	116	* ------------------------------------------------------------------------- */
117		117
118	/* Fill part/all of a line with blanks. */	118	/* Fill part/all of a line with blanks. */
119	void	119	void
120	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)	120	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121	{	121	{
122	if (!l.t)	122	if (!l.t)
123	{	123	{
124	lalloc (l);	124	lalloc (l);
125	col = 0;	125	col = 0;
…		…
142	}	142	}
143		143
144	/* ------------------------------------------------------------------------- */	144	/* ------------------------------------------------------------------------- */
145	/* Fill a full line with blanks - make sure it is allocated first */	145	/* Fill a full line with blanks - make sure it is allocated first */
146	void	146	void
147	rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)	147	rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148	{	148	{
149	scr_blank_line (l, 0, ncol, efs);	149	scr_blank_line (l, 0, ncol, efs);
		150
		151	l.l = 0;
		152	l.f = 0;
150	}	153	}
151		154
152	/* ------------------------------------------------------------------------- *	155	/* ------------------------------------------------------------------------- *
153	* SCREEN INITIALISATION *	156	* SCREEN INITIALISATION *
154	* ------------------------------------------------------------------------- */	157	* ------------------------------------------------------------------------- */
…		…
170	nrow = 24;	173	nrow = 24;
171		174
172	if (ncol == prev_ncol && nrow == prev_nrow)	175	if (ncol == prev_ncol && nrow == prev_nrow)
173	return;	176	return;
174		177
		178	if (current_screen != PRIMARY)
		179	scr_swap_screen ();
		180
175	// we need at least two lines for wrapping to work correctly	181	// we need at least two lines for wrapping to work correctly
176	if (nrow + saveLines < 2)	182	while (nrow + saveLines < 2)
177	{	183	{
178	//TODO//FIXME	184	//TODO//FIXME
179	saveLines++;	185	saveLines++;
180	prev_nrow--;	186	prev_nrow--;
181	nsaved++;	187	top_row--;
182	}	188	}
183		189
184	want_refresh = 1;	190	want_refresh = 1;
185		191
186	int prev_total_rows = prev_nrow + saveLines;	192	int prev_total_rows = prev_nrow + saveLines;
…		…
191		197
192	if (!row_buf)	198	if (!row_buf)
193	{	199	{
194	/*	200	/*
195	* first time called so just malloc everything: don't rely on realloc	201	* first time called so just malloc everything: don't rely on realloc
196	* Note: this is still needed so that all the scrollback lines are NULL
197	*/	202	*/
198	nsaved = 0; /* no saved lines */	203	top_row = 0;
199	term_start = 0;	204	term_start = 0;
200		205
201	talloc = new rxvt_salloc (ncol * sizeof (text_t));	206	talloc = new rxvt_salloc (ncol * sizeof (text_t));
202	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));	207	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203		208
204	row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));	209	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
205	temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));	210	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));	211	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208		212
209	for (int row = nrow; row--; )	213	for (int row = nrow; row--; )
210	{	214	{
211	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);	215	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
212	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);	216	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
…		…
233	selection.text = NULL;	237	selection.text = NULL;
234	selection.len = 0;	238	selection.len = 0;
235	selection.op = SELECTION_CLEAR;	239	selection.op = SELECTION_CLEAR;
236	selection.screen = PRIMARY;	240	selection.screen = PRIMARY;
237	selection.clicks = 0;	241	selection.clicks = 0;
238	CLEAR_ALL_SELECTION ();	242	rvideo_state = rvideo_mode = false;
239	rvideo = 0;
240	}	243	}
241	else	244	else
242	{	245	{
243	/*	246	/*
244	* add or delete rows as appropriate	247	* add or delete rows as appropriate
…		…
257	}	260	}
258	}	261	}
259	#endif	262	#endif
260		263
261	drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));	264	drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
262	temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
263	swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));	265	swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264		266
265	for (int row = min (nrow, prev_nrow); row--; )	267	for (int row = min (nrow, prev_nrow); row--; )
266	{	268	{
267	lresize (drawn_buf[row]);	269	lresize (drawn_buf[row]);
…		…
272	{	274	{
273	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);	275	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);	276	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275	}	277	}
276		278
		279	line_t *old_buf = row_buf;
277	line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));	280	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
278		281
279	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	282	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280	int pend = MOD (term_start - nsaved , prev_total_rows);	283	int pend = MOD (term_start + top_row , prev_total_rows);
281	int q = total_rows; // rewrapped row	284	int q = total_rows; // rewrapped row
282		285
283	if (nsaved)	286	if (top_row)
284	{	287	{
285	// re-wrap lines, this is rather ugly, possibly because I am too dumb	288	// Re-wrap lines. This is rather ugly, possibly because I am too dumb
286	// to come up with a lean and mean algorithm.	289	// to come up with a lean and mean algorithm.
287		290
288	row_col_t ocur = screen.cur;	291	row_col_t ocur = screen.cur;
289	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	292	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290		293
…		…
324	qline->l = ncol;	327	qline->l = ncol;
325	qline->is_longer (1);	328	qline->is_longer (1);
326		329
327	int qcol = 0;	330	int qcol = 0;
328		331
		332	// see below for cursor adjustment rationale
		333	if (p == ocur.row)
		334	screen.cur.row = q - (total_rows - nrow);
		335
329	// fill a single destination line	336	// fill a single destination line
330	while (lofs < llen && qcol < ncol)	337	while (lofs < llen && qcol < ncol)
331	{	338	{
332	int prow = lofs / prev_ncol;	339	int prow = lofs / prev_ncol;
333	int pcol = lofs % prev_ncol;	340	int pcol = lofs % prev_ncol;
…		…
343		350
344	line_t &pline = old_buf [prow];	351	line_t &pline = old_buf [prow];
345		352
346	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	353	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
347		354
348	assert (len);
349	assert (pline.t);
350
351	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));	355	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
352	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));	356	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
353		357
354	lofs += len;	358	lofs += len;
355	qcol += len;	359	qcol += len;
…		…
361	scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);	365	scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
362	}	366	}
363	while (p != pend && q > 0);	367	while (p != pend && q > 0);
364		368
365	term_start = total_rows - nrow;	369	term_start = total_rows - nrow;
366	nsaved = term_start - q;	370	top_row = q - term_start;
367		371
368	// make sure all terminal lines exist	372	// make sure all terminal lines exist
369	while (nsaved < 0)	373	while (top_row > 0)
370	scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);	374	scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
371	}	375	}
372	else	376	else
373	{	377	{
374	// if no scrollback exists (yet), wing, instead of wrap	378	// if no scrollback exists (yet), wing, instead of wrap
375		379
…		…
388	}	392	}
389		393
390	term_start = 0;	394	term_start = 0;
391	}	395	}
392		396
393	#ifdef DEBUG_STRICT //TODO: remove
394	for (int i = -nsaved; i < nrow; i++)
395	assert (ROW (i).t);
396	#endif
397
398	free (old_buf);	397	free (old_buf);
399	delete old_ta;	398	delete old_ta;
400	delete old_ra;	399	delete old_ra;
401		400
402	clamp_it (screen.cur.row, 0, nrow - 1);	401	clamp_it (screen.cur.row, 0, nrow - 1);
403	clamp_it (screen.cur.col, 0, ncol - 1);	402	clamp_it (screen.cur.col, 0, ncol - 1);
404		403
405	if (tabs)
406	free (tabs);	404	free (tabs);
407	}	405	}
		406
		407	CLEAR_ALL_SELECTION ();
408		408
409	prev_nrow = nrow;	409	prev_nrow = nrow;
410	prev_ncol = ncol;	410	prev_ncol = ncol;
411		411
412	tabs = (char *)rxvt_malloc (ncol * sizeof (char));	412	tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413		413
414	for (int col = ncol; col--; )	414	for (int col = ncol; col--; )
415	tabs [col] = col % TABSIZE == 0;	415	tabs [col] = col % TABSIZE == 0;
416		416
		417	if (current_screen != PRIMARY)
		418	scr_swap_screen ();
		419
417	tt_winch ();	420	tt_winch ();
418		421
419	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	422	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
420	}	423	}
421		424
422	/* ------------------------------------------------------------------------- */	425	/* ------------------------------------------------------------------------- */
423	/*	426	/*
424	* Free everything. That way malloc debugging can find leakage.	427	* Free everything. That way malloc debugging can find leakage.
425	*/	428	*/
426	void	429	void
427	rxvt_term::scr_release ()	430	rxvt_term::scr_release () NOTHROW
428	{	431	{
		432	if (row_buf)
		433	{
429	delete talloc; talloc = 0;	434	delete talloc; talloc = 0;
430	delete ralloc; ralloc = 0;	435	delete ralloc; ralloc = 0;
431		436
432	free (row_buf);	437	free (row_buf);
433	free (swap_buf);	438	free (swap_buf);
434	free (drawn_buf);	439	free (drawn_buf);
435	free (temp_buf);
436	free (tabs);	440	free (tabs);
437		441
438	row_buf = 0; // signal that we freed all the arrays	442	row_buf = 0; // signal that we freed all the arrays
		443	}
439	}	444	}
440		445
441	/* ------------------------------------------------------------------------- */	446	/* ------------------------------------------------------------------------- */
442	/*	447	/*
443	* Hard reset	448	* Hard reset
…		…
448	scr_release ();	453	scr_release ();
449	prev_nrow = prev_ncol = 0;	454	prev_nrow = prev_ncol = 0;
450	scr_reset ();	455	scr_reset ();
451		456
452	scr_clear (true);	457	scr_clear (true);
453	scr_refresh (SLOW_REFRESH);	458	scr_refresh ();
454	}	459	}
455		460
456	/* ------------------------------------------------------------------------- *	461	/* ------------------------------------------------------------------------- *
457	* PROCESS SCREEN COMMANDS *	462	* PROCESS SCREEN COMMANDS *
458	* ------------------------------------------------------------------------- */	463	* ------------------------------------------------------------------------- */
…		…
460	* Save and Restore cursor	465	* Save and Restore cursor
461	* XTERM_SEQ: Save cursor : ESC 7	466	* XTERM_SEQ: Save cursor : ESC 7
462	* XTERM_SEQ: Restore cursor: ESC 8	467	* XTERM_SEQ: Restore cursor: ESC 8
463	*/	468	*/
464	void	469	void
465	rxvt_term::scr_cursor (int mode)	470	rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
466	{	471	{
467	screen_t *s;	472	screen_t *s;
468		473
469	#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)	474	#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
470	if (current_screen == SECONDARY)	475	if (current_screen == SECONDARY)
…		…
502	assert (s->cur.row >= 0);	507	assert (s->cur.row >= 0);
503	assert (s->cur.col >= 0);	508	assert (s->cur.col >= 0);
504	#endif	509	#endif
505	}	510	}
506		511
		512	void
		513	rxvt_term::scr_swap_screen ()
		514	{
		515	if (!OPTION (Opt_secondaryScreen))
		516	return;
		517
		518	for (int i = prev_nrow; i--; )
		519	::swap (ROW(i), swap_buf [i]);
		520
		521	::swap (screen.cur, swap.cur);
		522
		523	screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
		524	screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
		525	}
		526
507	/* ------------------------------------------------------------------------- */	527	/* ------------------------------------------------------------------------- */
508	/*	528	/*
509	* Swap between primary and secondary screens	529	* Swap between primary and secondary screens
510	* XTERM_SEQ: Primary screen : ESC [ ? 4 7 h	530	* XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
511	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l	531	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
512	*/	532	*/
513	int	533	void
514	rxvt_term::scr_change_screen (int scrn)	534	rxvt_term::scr_change_screen (int scrn)
515	{	535	{
		536	if (scrn == current_screen)
		537	return;
		538
516	want_refresh = 1;	539	want_refresh = 1;
517	view_start = 0;	540	view_start = 0;
518		541
519	if (current_screen == scrn)
520	return scrn;
521
522	selection_check (2); /* check for boundary cross */	542	selection_check (2); /* check for boundary cross */
523		543
524	int i = current_screen; current_screen = scrn; scrn = i;	544	int i = current_screen; current_screen = scrn; scrn = i;
525
526	::swap (screen.cur.row, swap.cur.row);
527	::swap (screen.cur.col, swap.cur.col);
528
529	screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
530	screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
531		545
532	#if NSCREENS	546	#if NSCREENS
533	if (OPTION (Opt_secondaryScreen))	547	if (OPTION (Opt_secondaryScreen))
534	{	548	{
535	num_scr = 0;	549	num_scr = 0;
536		550
537	for (int i = prev_nrow; i--; )	551	scr_swap_screen ();
538	::swap (ROW(i), swap_buf [i]);
539		552
540	::swap (screen.charset, swap.charset);	553	::swap (screen.charset, swap.charset);
541	::swap (screen.flags, swap.flags);	554	::swap (screen.flags, swap.flags);
542	screen.flags |= Screen_VisibleCursor;	555	screen.flags |= Screen_VisibleCursor;
543	swap.flags |= Screen_VisibleCursor;	556	swap.flags |= Screen_VisibleCursor;
544	}	557	}
545	else	558	else
546	#endif	559	#endif
547	if (OPTION (Opt_secondaryScroll))	560	if (OPTION (Opt_secondaryScroll))
548	scr_scroll_text (0, prev_nrow - 1, prev_nrow);	561	scr_scroll_text (0, prev_nrow - 1, prev_nrow);
549
550	return scrn;
551	}	562	}
552		563
553	// clear WrapNext indicator, solidifying position on next line	564	// clear WrapNext indicator, solidifying position on next line
554	void	565	void
555	rxvt_term::scr_do_wrap ()	566	rxvt_term::scr_do_wrap () NOTHROW
556	{	567	{
557	if (!(screen.flags & Screen_WrapNext))	568	if (!(screen.flags & Screen_WrapNext))
558	return;	569	return;
559		570
560	screen.flags &= ~Screen_WrapNext;	571	screen.flags &= ~Screen_WrapNext;
…		…
570	/* ------------------------------------------------------------------------- */	581	/* ------------------------------------------------------------------------- */
571	/*	582	/*
572	* Change the colour for following text	583	* Change the colour for following text
573	*/	584	*/
574	void	585	void
575	rxvt_term::scr_color (unsigned int color, int fgbg)	586	rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
576	{	587	{
577	if (color > maxTermCOLOR)	588	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578	color = fgbg;	589	color = fgbg;
579		590
580	if (fgbg == Color_fg)	591	if (fgbg == Color_fg)
581	rstyle = SET_FGCOLOR (rstyle, color);	592	rstyle = SET_FGCOLOR (rstyle, color);
582	else	593	else
…		…
586	/* ------------------------------------------------------------------------- */	597	/* ------------------------------------------------------------------------- */
587	/*	598	/*
588	* Change the rendition style for following text	599	* Change the rendition style for following text
589	*/	600	*/
590	void	601	void
591	rxvt_term::scr_rendition (int set, int style)	602	rxvt_term::scr_rendition (int set, int style) NOTHROW
592	{	603	{
593	if (set)	604	if (set)
594	rstyle |= style;	605	rstyle |= style;
595	else if (style == ~RS_None)	606	else if (style == ~RS_None)
596	rstyle = DEFAULT_RSTYLE;	607	rstyle = DEFAULT_RSTYLE;
…		…
603	* Scroll text between <row1> and <row2> inclusive, by <count> lines	614	* Scroll text between <row1> and <row2> inclusive, by <count> lines
604	* count positive ==> scroll up	615	* count positive ==> scroll up
605	* count negative ==> scroll down	616	* count negative ==> scroll down
606	*/	617	*/
607	int	618	int
608	rxvt_term::scr_scroll_text (int row1, int row2, int count)	619	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
609	{	620	{
610	if (count == 0 || (row1 > row2))	621	if (count == 0 || (row1 > row2))
611	return 0;	622	return 0;
612		623
613	want_refresh = 1;	624	want_refresh = 1;
614	num_scr += count;	625	num_scr += count;
615		626
616	if (count > 0	627	if (count > 0
617	&& row1 == 0	628	&& row1 == 0
618	&& row2 == nrow - 1
619	&& (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))	629	&& (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
620	{	630	{
621	nsaved = min (nsaved + count, saveLines);	631	top_row = max (top_row - count, -saveLines);
622		632
623	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));	633	// scroll everything up 'count' lines
		634	term_start = (term_start + count) % total_rows;
		635
		636	// sever bottommost line
		637	{
		638	line_t &l = ROW(row2 - count);
		639	l.is_longer (0);
		640	l.touch ();
		641	}
		642
		643	// erase newly scrolled-in lines
		644	for (int i = count; i--; )
		645	scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle);
		646
		647	// now copy lines below the scroll region bottom to the
		648	// bottom of the screen again, so they look as if they
		649	// hadn't moved.
		650	for (int i = nrow; --i > row2; )
		651	{
		652	line_t &l1 = ROW(i - count);
		653	line_t &l2 = ROW(i);
		654
		655	::swap (l1, l2);
		656	l2.touch ();
		657	}
624		658
625	term_start = (term_start + count) % total_rows;	659	// move and/or clear selection, if any
626
627	if (selection.op && current_screen == selection.screen)	660	if (selection.op && current_screen == selection.screen)
628	{	661	{
629	selection.beg.row -= count;	662	selection.beg.row -= count;
630	selection.end.row -= count;	663	selection.end.row -= count;
631	selection.mark.row -= count;	664	selection.mark.row -= count;
632		665
633	if (selection.beg.row < -nsaved	666	if (selection.beg.row < top_row
634	|| selection.end.row < -nsaved	667	|| selection.end.row < top_row
635	|| selection.mark.row < -nsaved)	668	|| selection.mark.row < top_row)
636	{	669	{
637	CLEAR_ALL_SELECTION ();	670	CLEAR_ALL_SELECTION ();
638	selection.op = SELECTION_CLEAR;	671	selection.op = SELECTION_CLEAR;
639	}	672	}
640	}	673	}
641		674
642	for (int i = count; i--; )	675	// finally move the view window, if desired
643	{
644	ROW(row2 - i).l = 0;
645	scr_blank_screen_mem (ROW(row2 - i), rstyle);
646	}
647
648	if (OPTION (Opt_scrollWithBuffer)	676	if (OPTION (Opt_scrollWithBuffer)
649	&& view_start != 0	677	&& view_start != 0
650	&& view_start != saveLines)	678	&& view_start != -saveLines)
651	scr_page (UP, count);	679	scr_page (UP, count);
		680
		681	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
		682	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
652	}	683	}
653	else	684	else
654	{	685	{
655	if (selection.op && current_screen == selection.screen)	686	if (selection.op && current_screen == selection.screen)
656	{	687	{
…		…
680		711
681	int rows = row2 - row1 + 1;	712	int rows = row2 - row1 + 1;
682		713
683	min_it (count, rows);	714	min_it (count, rows);
684		715
		716	line_t *temp_buf = row_buf + total_rows;
		717
685	for (int row = 0; row < rows; row++)	718	for (int row = 0; row < rows; row++)
686	{	719	{
687	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	720	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
688		721
689	if (!IN_RANGE_EXC (row + count, 0, rows))	722	if (!IN_RANGE_EXC (row + count, 0, rows))
…		…
700	/* ------------------------------------------------------------------------- */	733	/* ------------------------------------------------------------------------- */
701	/*	734	/*
702	* Add text given in <str> of length <len> to screen struct	735	* Add text given in <str> of length <len> to screen struct
703	*/	736	*/
704	void	737	void
705	rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)	738	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
706	{	739	{
707	if (len <= 0) /* sanity */	740	if (len <= 0) /* sanity */
708	return;	741	return;
709		742
710	unsigned char checksel;	743	unsigned char checksel;
711	unicode_t c;	744	unicode_t c;
712	int ncol = this->ncol;	745	int ncol = this->ncol;
713	const unicode_t *strend = str + len;	746	const wchar_t *strend = str + len;
714		747
715	want_refresh = 1;	748	want_refresh = 1;
716	ZERO_SCROLLBACK ();	749	ZERO_SCROLLBACK ();
717		750
718	if (nlines > 0)	751	if (minlines > 0)
719	{	752	{
720	nlines += screen.cur.row - screen.bscroll;	753	minlines += screen.cur.row - screen.bscroll;
		754	min_it (minlines, screen.cur.row - top_row);
721		755
722	if (nlines > 0	756	if (minlines > 0
723	&& screen.tscroll == 0	757	&& screen.tscroll == 0
724	&& screen.bscroll == nrow - 1)	758	&& screen.bscroll == nrow - 1)
725	{	759	{
726	/* _at least_ this many lines need to be scrolled */	760	/* _at least_ this many lines need to be scrolled */
727	scr_scroll_text (screen.tscroll, screen.bscroll, nlines);	761	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
728	screen.cur.row -= nlines;	762	screen.cur.row -= minlines;
729	}	763	}
730	}	764	}
731		765
732	#ifdef DEBUG_STRICT	766	#ifdef DEBUG_STRICT
733	assert (screen.cur.col < ncol);	767	assert (screen.cur.col < ncol);
734	assert (screen.cur.row < nrow	768	assert (screen.cur.row < nrow
735	&& screen.cur.row >= -nsaved);	769	&& screen.cur.row >= top_row);
736	#endif	770	#endif
737	int row = screen.cur.row;	771	int row = screen.cur.row;
738		772
739	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	773	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
740		774
741	line_t *line = &ROW(row);	775	line_t *line = &ROW(row);
742		776
743	while (str < strend)	777	while (str < strend)
744	{	778	{
745	c = *str++;	779	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
746		780
747	if (c < 0x20)	781	if (c < 0x20)
748	if (c == C0_LF)	782	if (c == C0_LF)
749	{	783	{
750	max_it (line->l, screen.cur.col);	784	max_it (line->l, screen.cur.col);
…		…
786	CLEAR_SELECTION ();	820	CLEAR_SELECTION ();
787	}	821	}
788		822
789	if (screen.flags & Screen_WrapNext)	823	if (screen.flags & Screen_WrapNext)
790	{	824	{
791	max_it (line->l, ncol);
792	line->is_longer (1);
793
794	scr_do_wrap ();	825	scr_do_wrap ();
795		826
		827	line->l = ncol;
		828	line->is_longer (1);
		829
796	row = screen.cur.row;	830	row = screen.cur.row;
797	line = &ROW(row); /* _must_ refresh */	831	line = &ROW(row); /* _must_ refresh */
798	}	832	}
799		833
800	// some utf-8 decoders "decode" surrogate characters: let's fix this.	834	// some utf-8 decoders "decode" surrogate characters: let's fix this.
801	if (IN_RANGE_INC (c, 0xd800, 0xdfff))	835	if (IN_RANGE_INC (c, 0xd800, 0xdfff))
802	c = 0xfffd;	836	c = 0xfffd;
803		837
804	// rely on wcwidth to tell us the character width, at least for non-latin1	838	// rely on wcwidth to tell us the character width, do wcwidth before
805	// do wcwidth before further replacements, as wcwidth might return -1	839	// further replacements, as wcwidth might return -1 for the line
806	// for the line drawing characters below as they might be invalid in the current	840	// drawing characters below as they might be invalid in the current
807	// locale.	841	// locale.
808	int width = c < 0x100 ? 1 : wcwidth (c);	842	int width = WCWIDTH (c);
809		843
810	if (charsets [screen.charset] == '0') // DEC SPECIAL	844	if (charsets [screen.charset] == '0') // DEC SPECIAL
811	{	845	{
812	// vt100 special graphics and line drawing	846	// vt100 special graphics and line drawing
813	// 5f-7e standard vt100	847	// 5f-7e standard vt100
…		…
964	/*	998	/*
965	* Process Backspace. Move back the cursor back a position, wrap if have to	999	* Process Backspace. Move back the cursor back a position, wrap if have to
966	* XTERM_SEQ: CTRL-H	1000	* XTERM_SEQ: CTRL-H
967	*/	1001	*/
968	void	1002	void
969	rxvt_term::scr_backspace ()	1003	rxvt_term::scr_backspace () NOTHROW
970	{	1004	{
971	want_refresh = 1;	1005	want_refresh = 1;
972		1006
973	if (screen.cur.col == 0)	1007	if (screen.cur.col == 0)
974	{	1008	{
…		…
992	* Process Horizontal Tab	1026	* Process Horizontal Tab
993	* count: +ve = forward; -ve = backwards	1027	* count: +ve = forward; -ve = backwards
994	* XTERM_SEQ: CTRL-I	1028	* XTERM_SEQ: CTRL-I
995	*/	1029	*/
996	void	1030	void
997	rxvt_term::scr_tab (int count, bool ht)	1031	rxvt_term::scr_tab (int count, bool ht) NOTHROW
998	{	1032	{
999	int i, x;	1033	int i, x;
1000		1034
1001	want_refresh = 1;	1035	want_refresh = 1;
1002	i = x = screen.cur.col;	1036	i = x = screen.cur.col;
…		…
1069	* Move cursor left in row. If we're at the left boundary, shift everything	1103	* Move cursor left in row. If we're at the left boundary, shift everything
1070	* in that row right. Clear left column.	1104	* in that row right. Clear left column.
1071	*/	1105	*/
1072	#if ENABLE_FRILLS	1106	#if ENABLE_FRILLS
1073	void	1107	void
1074	rxvt_term::scr_backindex ()	1108	rxvt_term::scr_backindex () NOTHROW
1075	{	1109	{
1076	if (screen.cur.col > 0)	1110	if (screen.cur.col > 0)
1077	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1111	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1078	else	1112	else
1079	scr_insdel_chars (1, INSERT);	1113	scr_insdel_chars (1, INSERT);
…		…
1086	* Move cursor right in row. If we're at the right boundary, shift everything	1120	* Move cursor right in row. If we're at the right boundary, shift everything
1087	* in that row left. Clear right column.	1121	* in that row left. Clear right column.
1088	*/	1122	*/
1089	#if ENABLE_FRILLS	1123	#if ENABLE_FRILLS
1090	void	1124	void
1091	rxvt_term::scr_forwardindex ()	1125	rxvt_term::scr_forwardindex () NOTHROW
1092	{	1126	{
1093	if (screen.cur.col < ncol - 1)	1127	if (screen.cur.col < ncol - 1)
1094	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1128	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1095	else	1129	else
1096	{	1130	{
…		…
1109	/* ------------------------------------------------------------------------- */	1143	/* ------------------------------------------------------------------------- */
1110	/*	1144	/*
1111	* Goto Row/Column	1145	* Goto Row/Column
1112	*/	1146	*/
1113	void	1147	void
1114	rxvt_term::scr_gotorc (int row, int col, int relative)	1148	rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1115	{	1149	{
1116	want_refresh = 1;	1150	want_refresh = 1;
1117	ZERO_SCROLLBACK ();	1151	ZERO_SCROLLBACK ();
1118		1152
1119	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;	1153	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
…		…
1157	/* ------------------------------------------------------------------------- */	1191	/* ------------------------------------------------------------------------- */
1158	/*	1192	/*
1159	* direction should be UP or DN	1193	* direction should be UP or DN
1160	*/	1194	*/
1161	void	1195	void
1162	rxvt_term::scr_index (enum page_dirn direction)	1196	rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1163	{	1197	{
1164	int dirn;	1198	int dirn;
1165		1199
1166	want_refresh = 1;	1200	want_refresh = 1;
1167	ZERO_SCROLLBACK ();	1201	ZERO_SCROLLBACK ();
…		…
1186	* XTERM_SEQ: Clear line to right: ESC [ 0 K	1220	* XTERM_SEQ: Clear line to right: ESC [ 0 K
1187	* XTERM_SEQ: Clear line to left : ESC [ 1 K	1221	* XTERM_SEQ: Clear line to left : ESC [ 1 K
1188	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1222	* XTERM_SEQ: Clear whole line : ESC [ 2 K
1189	*/	1223	*/
1190	void	1224	void
1191	rxvt_term::scr_erase_line (int mode)	1225	rxvt_term::scr_erase_line (int mode) NOTHROW
1192	{	1226	{
1193	unsigned int col, num;	1227	unsigned int col, num;
1194		1228
1195	want_refresh = 1;	1229	want_refresh = 1;
1196	ZERO_SCROLLBACK ();	1230	ZERO_SCROLLBACK ();
…		…
1240	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1274	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1241	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1275	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1242	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1276	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1243	*/	1277	*/
1244	void	1278	void
1245	rxvt_term::scr_erase_screen (int mode)	1279	rxvt_term::scr_erase_screen (int mode) NOTHROW
1246	{	1280	{
1247	int num;	1281	int num;
1248	int32_t row;	1282	int32_t row;
1249	rend_t ren;	1283	rend_t ren;
1250	XGCValues gcvalue;	1284	XGCValues gcvalue;
…		…
1295	}	1329	}
1296	else	1330	else
1297	{	1331	{
1298	ren = rstyle & (RS_fgMask | RS_bgMask);	1332	ren = rstyle & (RS_fgMask | RS_bgMask);
1299	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1333	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1300	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1334	XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1301	ERASE_ROWS (row, num);	1335	ERASE_ROWS (row, num);
1302	gcvalue.foreground = pix_colors[Color_fg];	1336	gcvalue.foreground = pix_colors[Color_fg];
1303	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1337	XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1304	}	1338	}
1305		1339
1306	for (; num--; row++)	1340	for (; num--; row++)
1307	{	1341	{
1308	line_t &l = ROW(row);
1309	l.l = 0;
1310	l.is_longer (0);
1311	scr_blank_screen_mem (l, rstyle);	1342	scr_blank_screen_mem (ROW(row), rstyle);
1312	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1343	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1313	}	1344	}
1314	}	1345	}
1315		1346
1316	#if ENABLE_FRILLS	1347	#if ENABLE_FRILLS
1317	void	1348	void
1318	rxvt_term::scr_erase_savelines ()	1349	rxvt_term::scr_erase_savelines () NOTHROW
1319	{	1350	{
1320	want_refresh = 1;	1351	want_refresh = 1;
1321	ZERO_SCROLLBACK ();	1352	ZERO_SCROLLBACK ();
1322		1353
1323	nsaved = 0;	1354	top_row = 0;
1324	}	1355	}
1325	#endif	1356	#endif
1326		1357
1327	/* ------------------------------------------------------------------------- */	1358	/* ------------------------------------------------------------------------- */
1328	/*	1359	/*
1329	* Fill the screen with `E's	1360	* Fill the screen with `E's
1330	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1361	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1331	*/	1362	*/
1332	void	1363	void
1333	rxvt_term::scr_E ()	1364	rxvt_term::scr_E () NOTHROW
1334	{	1365	{
1335	rend_t fs;	1366	rend_t fs;
1336		1367
1337	want_refresh = 1;	1368	want_refresh = 1;
1338	ZERO_SCROLLBACK ();	1369	ZERO_SCROLLBACK ();
…		…
1359	/* ------------------------------------------------------------------------- */	1390	/* ------------------------------------------------------------------------- */
1360	/*	1391	/*
1361	* Insert/Delete <count> lines	1392	* Insert/Delete <count> lines
1362	*/	1393	*/
1363	void	1394	void
1364	rxvt_term::scr_insdel_lines (int count, int insdel)	1395	rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1365	{	1396	{
1366	int end;	1397	int end;
1367		1398
1368	ZERO_SCROLLBACK ();	1399	ZERO_SCROLLBACK ();
1369		1400
…		…
1389	/* ------------------------------------------------------------------------- */	1420	/* ------------------------------------------------------------------------- */
1390	/*	1421	/*
1391	* Insert/Delete <count> characters from the current position	1422	* Insert/Delete <count> characters from the current position
1392	*/	1423	*/
1393	void	1424	void
1394	rxvt_term::scr_insdel_chars (int count, int insdel)	1425	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1395	{	1426	{
1396	int col, row;	1427	int col, row;
1397	rend_t tr;	1428	rend_t tr;
1398		1429
1399	want_refresh = 1;	1430	want_refresh = 1;
…		…
1487	/*	1518	/*
1488	* Set the scrolling region	1519	* Set the scrolling region
1489	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1520	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1490	*/	1521	*/
1491	void	1522	void
1492	rxvt_term::scr_scroll_region (int top, int bot)	1523	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1493	{	1524	{
1494	max_it (top, 0);	1525	max_it (top, 0);
1495	min_it (bot, nrow - 1);	1526	min_it (bot, nrow - 1);
1496		1527
1497	if (top > bot)	1528	if (top > bot)
…		…
1507	* Make the cursor visible/invisible	1538	* Make the cursor visible/invisible
1508	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h	1539	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1509	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l	1540	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1510	*/	1541	*/
1511	void	1542	void
1512	rxvt_term::scr_cursor_visible (int mode)	1543	rxvt_term::scr_cursor_visible (int mode) NOTHROW
1513	{	1544	{
1514	want_refresh = 1;	1545	want_refresh = 1;
1515		1546
1516	if (mode)	1547	if (mode)
1517	screen.flags |= Screen_VisibleCursor;	1548	screen.flags |= Screen_VisibleCursor;
…		…
1524	* Set/unset automatic wrapping	1555	* Set/unset automatic wrapping
1525	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h	1556	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1526	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l	1557	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1527	*/	1558	*/
1528	void	1559	void
1529	rxvt_term::scr_autowrap (int mode)	1560	rxvt_term::scr_autowrap (int mode) NOTHROW
1530	{	1561	{
1531	if (mode)	1562	if (mode)
1532	screen.flags |= Screen_Autowrap;	1563	screen.flags |= Screen_Autowrap;
1533	else	1564	else
1534	screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);	1565	screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
…		…
1543	* and the cursor cannot be moved outside.	1574	* and the cursor cannot be moved outside.
1544	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h	1575	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1545	* XTERM_SEQ: Set Relative: ESC [ ? 6 l	1576	* XTERM_SEQ: Set Relative: ESC [ ? 6 l
1546	*/	1577	*/
1547	void	1578	void
1548	rxvt_term::scr_relative_origin (int mode)	1579	rxvt_term::scr_relative_origin (int mode) NOTHROW
1549	{	1580	{
1550	if (mode)	1581	if (mode)
1551	screen.flags |= Screen_Relative;	1582	screen.flags |= Screen_Relative;
1552	else	1583	else
1553	screen.flags &= ~Screen_Relative;	1584	screen.flags &= ~Screen_Relative;
…		…
1560	* Set insert/replace mode	1591	* Set insert/replace mode
1561	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h	1592	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1562	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l	1593	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1563	*/	1594	*/
1564	void	1595	void
1565	rxvt_term::scr_insert_mode (int mode)	1596	rxvt_term::scr_insert_mode (int mode) NOTHROW
1566	{	1597	{
1567	if (mode)	1598	if (mode)
1568	screen.flags |= Screen_Insert;	1599	screen.flags |= Screen_Insert;
1569	else	1600	else
1570	screen.flags &= ~Screen_Insert;	1601	screen.flags &= ~Screen_Insert;
…		…
1576	* XTERM_SEQ: Set tab at current column : ESC H	1607	* XTERM_SEQ: Set tab at current column : ESC H
1577	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g	1608	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1578	* XTERM_SEQ: Clear all tabs : ESC [ 3 g	1609	* XTERM_SEQ: Clear all tabs : ESC [ 3 g
1579	*/	1610	*/
1580	void	1611	void
1581	rxvt_term::scr_set_tab (int mode)	1612	rxvt_term::scr_set_tab (int mode) NOTHROW
1582	{	1613	{
1583	if (mode < 0)	1614	if (mode < 0)
1584	memset (tabs, 0, ncol * sizeof (char));	1615	memset (tabs, 0, ncol * sizeof (char));
1585	else if (screen.cur.col < ncol)	1616	else if (screen.cur.col < ncol)
1586	tabs [screen.cur.col] = !!mode;	1617	tabs [screen.cur.col] = !!mode;
…		…
1591	* Set reverse/normal video	1622	* Set reverse/normal video
1592	* XTERM_SEQ: Reverse video: ESC [ ? 5 h	1623	* XTERM_SEQ: Reverse video: ESC [ ? 5 h
1593	* XTERM_SEQ: Normal video : ESC [ ? 5 l	1624	* XTERM_SEQ: Normal video : ESC [ ? 5 l
1594	*/	1625	*/
1595	void	1626	void
1596	rxvt_term::scr_rvideo_mode (int mode)	1627	rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1597	{	1628	{
1598	XGCValues gcvalue;	1629	rvideo_mode = on;
1599		1630
		1631	#ifndef NO_BELL
		1632	on ^= rvideo_bell;
		1633	#endif
		1634
1600	if (rvideo != mode)	1635	if (rvideo_state != on)
1601	{	1636	{
1602	rvideo = mode;	1637	rvideo_state = on;
		1638
1603	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1639	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1604	#if XPM_BACKGROUND	1640	#if XPM_BACKGROUND
1605	if (bgPixmap.pixmap == None)	1641	if (bgPixmap.pixmap == None)
1606	#endif	1642	#endif
1607	#if TRANSPARENT	1643	#if TRANSPARENT
1608	if (! OPTION (Opt_transparent) || am_transparent == 0)	1644	if (!OPTION (Opt_transparent) || am_transparent == 0)
1609	#endif	1645	#endif
1610	XSetWindowBackground (display->display, vt,	1646	XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
1611	pix_colors[Color_bg]);
1612		1647
		1648	XGCValues gcvalue;
1613	gcvalue.foreground = pix_colors[Color_fg];	1649	gcvalue.foreground = pix_colors[Color_fg];
1614	gcvalue.background = pix_colors[Color_bg];	1650	gcvalue.background = pix_colors[Color_bg];
1615	XChangeGC (display->display, gc, GCBackground | GCForeground,	1651	XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);
1616	&gcvalue);	1652
1617	scr_clear ();	1653	scr_clear ();
1618	scr_touch (true);	1654	scr_touch (true);
1619	}	1655	}
1620	}	1656	}
1621		1657
…		…
1623	/*	1659	/*
1624	* Report current cursor position	1660	* Report current cursor position
1625	* XTERM_SEQ: Report position: ESC [ 6 n	1661	* XTERM_SEQ: Report position: ESC [ 6 n
1626	*/	1662	*/
1627	void	1663	void
1628	rxvt_term::scr_report_position ()	1664	rxvt_term::scr_report_position () NOTHROW
1629	{	1665	{
1630	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);	1666	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1631	}	1667	}
1632		1668
1633	/* ------------------------------------------------------------------------- *	1669	/* ------------------------------------------------------------------------- *
…		…
1636		1672
1637	/*	1673	/*
1638	* Set font style	1674	* Set font style
1639	*/	1675	*/
1640	void	1676	void
1641	rxvt_term::set_font_style ()	1677	rxvt_term::set_font_style () NOTHROW
1642	{	1678	{
1643	#if 0	1679	#if 0
1644	switch (charsets [screen.charset])	1680	switch (charsets [screen.charset])
1645	{	1681	{
1646	case '0': /* DEC Special Character & Line Drawing Set */	1682	case '0': /* DEC Special Character & Line Drawing Set */
…		…
1668	* XTERM_SEQ: Invoke G1 character set: CTRL-N	1704	* XTERM_SEQ: Invoke G1 character set: CTRL-N
1669	* XTERM_SEQ: Invoke G2 character set: ESC N	1705	* XTERM_SEQ: Invoke G2 character set: ESC N
1670	* XTERM_SEQ: Invoke G3 character set: ESC O	1706	* XTERM_SEQ: Invoke G3 character set: ESC O
1671	*/	1707	*/
1672	void	1708	void
1673	rxvt_term::scr_charset_choose (int set)	1709	rxvt_term::scr_charset_choose (int set) NOTHROW
1674	{	1710	{
1675	screen.charset = set;	1711	screen.charset = set;
1676	set_font_style ();	1712	set_font_style ();
1677	}	1713	}
1678		1714
…		…
1684	* XTERM_SEQ: Set G2 character set: ESC * <C>	1720	* XTERM_SEQ: Set G2 character set: ESC * <C>
1685	* XTERM_SEQ: Set G3 character set: ESC + <C>	1721	* XTERM_SEQ: Set G3 character set: ESC + <C>
1686	* See set_font_style for possible values for <C>	1722	* See set_font_style for possible values for <C>
1687	*/	1723	*/
1688	void	1724	void
1689	rxvt_term::scr_charset_set (int set, unsigned int ch)	1725	rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1690	{	1726	{
1691	charsets[set] = (unsigned char)ch;	1727	charsets[set] = (unsigned char)ch;
1692	set_font_style ();	1728	set_font_style ();
1693	}	1729	}
1694		1730
…		…
1699		1735
1700	/*	1736	/*
1701	* refresh matching text.	1737	* refresh matching text.
1702	*/	1738	*/
1703	bool	1739	bool
1704	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)	1740	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1705	{	1741	{
1706	bool found = false;	1742	bool found = false;
1707		1743
1708	for (int i = 0; i < nrow; i++)	1744	for (int i = 0; i < nrow; i++)
1709	{	1745	{
…		…
1729	PART_END,	1765	PART_END,
1730	RC_COUNT	1766	RC_COUNT
1731	};	1767	};
1732		1768
1733	void	1769	void
1734	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)	1770	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1735	{	1771	{
1736	int i;	1772	int i;
1737	row_col_t rc[RC_COUNT];	1773	row_col_t rc[RC_COUNT];
1738		1774
1739	if (!drawn_buf) /* sanity check */	1775	if (!drawn_buf) /* sanity check */
…		…
1762	}	1798	}
1763		1799
1764	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1800	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1765	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1801	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1766		1802
		1803	num_scr_allow = 0;
		1804
1767	if (refresh)	1805	if (refresh)
1768	scr_refresh (SLOW_REFRESH);	1806	scr_refresh ();
1769	}	1807	}
1770		1808
1771	/* ------------------------------------------------------------------------- */	1809	/* ------------------------------------------------------------------------- */
1772	/*	1810	/*
1773	* Refresh the entire screen	1811	* Refresh the entire screen
1774	*/	1812	*/
1775	void	1813	void
1776	rxvt_term::scr_touch (bool refresh)	1814	rxvt_term::scr_touch (bool refresh) NOTHROW
1777	{	1815	{
1778	scr_expose (0, 0, width, height, refresh);	1816	scr_expose (0, 0, width, height, refresh);
1779	}	1817	}
1780		1818
1781	/* ------------------------------------------------------------------------- */	1819	/* ------------------------------------------------------------------------- */
1782	/*	1820	/*
1783	* Move the display so that the line represented by scrollbar value Y is at	1821	* Move the display so that the line represented by scrollbar value Y is at
1784	* the top of the screen	1822	* the top of the screen
1785	*/	1823	*/
1786	int	1824	void
1787	rxvt_term::scr_move_to (int y, int len)	1825	rxvt_term::scr_move_to (int y, int len) NOTHROW
1788	{	1826	{
1789	long p = 0;	1827	scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1790	unsigned int oldviewstart;
1791
1792	oldviewstart = view_start;
1793
1794	if (y < len)
1795	{
1796	p = (nrow + nsaved) * (len - y) / len;
1797	p -= (long) (nrow - 1);
1798	p = max (p, 0);
1799	}
1800
1801	view_start = (unsigned int)min (p, nsaved);
1802
1803	return scr_changeview (oldviewstart);
1804	}	1828	}
1805		1829
1806	/* ------------------------------------------------------------------------- */	1830	/* ------------------------------------------------------------------------- */
1807	/*	1831	/*
1808	* Page the screen up/down nlines	1832	* Page the screen up/down nlines
1809	* direction should be UP or DN	1833	* direction should be UP or DN
1810	*/	1834	*/
1811	int	1835	bool
1812	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1836	rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1813	{	1837	{
1814	int n;	1838	int new_view_start =
1815	unsigned int oldviewstart;
1816
1817	oldviewstart = view_start;
1818
1819	if (direction == UP)
1820	{
1821	n = view_start + nlines;
1822	view_start = min (n, nsaved);
1823	}
1824	else
1825	{
1826	n = view_start - nlines;	1839	direction == UP ? view_start - nlines
1827	view_start = max (n, 0);	1840	: view_start + nlines;
1828	}
1829		1841
1830	return scr_changeview (oldviewstart);	1842	return scr_changeview (new_view_start);
1831	}	1843	}
1832		1844
1833	int	1845	bool
1834	rxvt_term::scr_changeview (unsigned int oldviewstart)	1846	rxvt_term::scr_changeview (int new_view_start) NOTHROW
1835	{	1847	{
		1848	clamp_it (new_view_start, top_row, 0);
		1849
1836	if (view_start != oldviewstart)	1850	if (new_view_start == view_start)
1837	{	1851	return false;
		1852
		1853	num_scr += new_view_start - view_start;
		1854	view_start = new_view_start;
		1855	want_refresh = 1;
		1856
1838	HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));	1857	HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1839		1858
1840	want_refresh = 1;	1859	return true;
1841	num_scr -= (view_start - oldviewstart);
1842	}
1843
1844	return (int)view_start - (int)oldviewstart;
1845	}	1860	}
1846		1861
1847	/* ------------------------------------------------------------------------- */	1862	#ifndef NO_BELL
1848	void	1863	void
		1864	rxvt_term::bell_cb (time_watcher &w)
		1865	{
		1866	rvideo_bell = false;
		1867	scr_rvideo_mode (rvideo_mode);
		1868	}
		1869	#endif
		1870
		1871	/* ------------------------------------------------------------------------- */
		1872	void
1849	rxvt_term::scr_bell ()	1873	rxvt_term::scr_bell () NOTHROW
1850	{	1874	{
1851	#ifndef NO_BELL	1875	#ifndef NO_BELL
1852		1876
1853	# ifndef NO_MAPALERT	1877	# ifndef NO_MAPALERT
1854	# ifdef MAPALERT_OPTION	1878	# ifdef MAPALERT_OPTION
1855	if (OPTION (Opt_mapAlert))	1879	if (OPTION (Opt_mapAlert))
1856	# endif	1880	# endif
1857	XMapWindow (display->display, parent[0]);	1881	XMapWindow (xdisp, parent[0]);
1858	# endif	1882	# endif
1859		1883
1860	if (OPTION (Opt_visualBell))	1884	if (OPTION (Opt_visualBell))
1861	{	1885	{
1862	scr_rvideo_mode (!rvideo); /* refresh also done */	1886	rvideo_bell = true;
1863	rxvt_usleep (VISUAL_BELL_DURATION);	1887	scr_rvideo_mode (rvideo_mode);
1864	scr_rvideo_mode (!rvideo); /* refresh also done */	1888	display->flush ();
		1889
		1890	bell_ev.start (NOW + VISUAL_BELL_DURATION);
1865	}	1891	}
1866	else	1892	else
1867	XBell (display->display, 0);	1893	XBell (xdisp, 0);
1868		1894
1869	#endif	1895	#endif
1870	}	1896	}
1871		1897
1872	/* ------------------------------------------------------------------------- */	1898	/* ------------------------------------------------------------------------- */
1873	/* ARGSUSED */	1899	/* ARGSUSED */
1874	void	1900	void
1875	rxvt_term::scr_printscreen (int fullhist)	1901	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1876	{	1902	{
1877	#ifdef PRINTPIPE	1903	#ifdef PRINTPIPE
1878	int nrows, row_start;	1904	int nrows, row_start;
1879	FILE *fd;	1905	FILE *fd;
1880		1906
1881	if ((fd = popen_printer ()) == NULL)	1907	if ((fd = popen_printer ()) == NULL)
1882	return;	1908	return;
1883		1909
1884	if (fullhist)	1910	if (fullhist)
1885	{	1911	{
1886	nrows = nrow + nsaved;	1912	nrows = nrow - top_row;
1887	row_start = -nsaved;	1913	row_start = top_row;
1888	}	1914	}
1889	else	1915	else
1890	{	1916	{
1891	nrows = nrow;	1917	nrows = nrow;
1892	row_start = -view_start;	1918	row_start = view_start;
1893	}	1919	}
1894		1920
1895	wctomb (0, 0);	1921	wctomb (0, 0);
1896		1922
1897	for (int r1 = 0; r1 < nrows; r1++)	1923	for (int r1 = 0; r1 < nrows; r1++)
…		…
1929	* Refresh the screen	1955	* Refresh the screen
1930	* drawn_text/drawn_rend contain the screen information before the update.	1956	* drawn_text/drawn_rend contain the screen information before the update.
1931	* screen.text/screen.rend contain what the screen will change to.	1957	* screen.text/screen.rend contain what the screen will change to.
1932	*/	1958	*/
1933	void	1959	void
1934	rxvt_term::scr_refresh (unsigned char refresh_type)	1960	rxvt_term::scr_refresh () NOTHROW
1935	{	1961	{
1936	unsigned char must_clear, /* use draw_string not draw_image_string */	1962	unsigned char must_clear, /* use draw_string not draw_image_string */
1937	showcursor; /* show the cursor */	1963	showcursor; /* show the cursor */
1938	int16_t col, row, /* column/row we're processing */	1964	int16_t col, row, /* column/row we're processing */
1939	ocrow; /* old cursor row */	1965	ocrow; /* old cursor row */
…		…
2025		2051
2026	/* make sure no outline cursor is left around */	2052	/* make sure no outline cursor is left around */
2027	setoldcursor = 0;	2053	setoldcursor = 0;
2028	if (ocrow != -1)	2054	if (ocrow != -1)
2029	{	2055	{
2030	if (screen.cur.row + view_start != ocrow	2056	if (screen.cur.row - view_start != ocrow
2031	|| screen.cur.col != oldcursor.col)	2057	|| screen.cur.col != oldcursor.col)
2032	{	2058	{
2033	if (ocrow < nrow	2059	if (ocrow < nrow
2034	&& oldcursor.col < ncol)	2060	&& oldcursor.col < ncol)
2035	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);	2061	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
…		…
2043	else if (!focus)	2069	else if (!focus)
2044	setoldcursor = 1;	2070	setoldcursor = 1;
2045		2071
2046	if (setoldcursor)	2072	if (setoldcursor)
2047	{	2073	{
2048	if (screen.cur.row + view_start >= nrow)	2074	if (screen.cur.row - view_start >= nrow)
2049	oldcursor.row = -1;	2075	oldcursor.row = -1;
2050	else	2076	else
2051	{	2077	{
2052	oldcursor.row = screen.cur.row + view_start;	2078	oldcursor.row = screen.cur.row - view_start;
2053	oldcursor.col = screen.cur.col;	2079	oldcursor.col = screen.cur.col;
2054	}	2080	}
2055	}	2081	}
2056	}	2082	}
2057		2083
…		…
2063	#ifndef NO_SLOW_LINK_SUPPORT	2089	#ifndef NO_SLOW_LINK_SUPPORT
2064	/*	2090	/*
2065	* D: CopyArea pass - very useful for slower links	2091	* D: CopyArea pass - very useful for slower links
2066	* This has been deliberately kept simple.	2092	* This has been deliberately kept simple.
2067	*/	2093	*/
2068	i = num_scr;
2069	if (!display->is_local	2094	if (!display->is_local
2070	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr	2095	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2071	&& abs (num_scr) < nrow && !must_clear)	2096	&& abs (num_scr) < nrow && !must_clear)
2072	{	2097	{
2073	int16_t nits;	2098	int16_t nits;
2074	int j;	2099	int j;
2075	int len, wlen;	2100	int len, wlen;
		2101	dLocal (int, num_scr);
2076		2102
2077	j = nrow;	2103	j = nrow;
2078	wlen = len = -1;	2104	wlen = len = -1;
2079	row = i > 0 ? 0 : j - 1;	2105	row = i > 0 ? 0 : j - 1;
2080	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2106	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2081	{	2107	{
2082	if (row + i >= 0 && row + i < nrow && row + i != ocrow)	2108	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2083	{	2109	{
2084	line_t s = ROW(row - view_start);	2110	line_t s = ROW(view_start + row);
2085	line_t d = drawn_buf[row];	2111	line_t d = drawn_buf[row];
2086	line_t d2 = drawn_buf[row + i];	2112	line_t d2 = drawn_buf[row + i];
2087		2113
2088	for (nits = 0, col = ncol; col--; )	2114	for (nits = 0, col = ncol; col--; )
2089	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])	2115	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
…		…
2111	{	2137	{
2112	/* also comes here at end if needed because of >= above */	2138	/* also comes here at end if needed because of >= above */
2113	if (wlen < len)	2139	if (wlen < len)
2114	::swap (wlen, len);	2140	::swap (wlen, len);
2115		2141
2116	XCopyArea (display->display, vt, vt,	2142	XCopyArea (xdisp, vt, vt,
2117	gc, 0, Row2Pixel (len + i),	2143	gc, 0, Row2Pixel (len + i),
2118	(unsigned int)this->width,	2144	(unsigned int)this->width,
2119	(unsigned int)Height2Pixel (wlen - len + 1),	2145	(unsigned int)Height2Pixel (wlen - len + 1),
2120	0, Row2Pixel (len));	2146	0, Row2Pixel (len));
2121	len = -1;	2147	len = -1;
…		…
2127	/*	2153	/*
2128	* E: main pass across every character	2154	* E: main pass across every character
2129	*/	2155	*/
2130	for (row = 0; row < nrow; row++)	2156	for (row = 0; row < nrow; row++)
2131	{	2157	{
2132	text_t *stp = ROW(row - view_start).t;	2158	text_t *stp = ROW(view_start + row).t;
2133	rend_t *srp = ROW(row - view_start).r;	2159	rend_t *srp = ROW(view_start + row).r;
2134	text_t *dtp = drawn_buf[row].t;	2160	text_t *dtp = drawn_buf[row].t;
2135	rend_t *drp = drawn_buf[row].r;	2161	rend_t *drp = drawn_buf[row].r;
2136		2162
2137	/*	2163	/*
2138	* E2: OK, now the real pass	2164	* E2: OK, now the real pass
…		…
2209		2235
2210	// only do special processing if any attributes are set, which is unlikely	2236	// only do special processing if any attributes are set, which is unlikely
2211	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2237	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2212	{	2238	{
2213	#if ENABLE_STYLES	2239	#if ENABLE_STYLES
2214	// force redraw after "careful" characters to avoid pixel droppings	2240	// "careful" (too wide) character handling
2215	if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2216	drp[col + 1] = ~srp[col + 1];
2217		2241
2218	// include previous careful character(s) if possible, looks nicer (best effort...)	2242	// include previous careful character(s) if possible, looks nicer (best effort...)
2219	while (text > stp	2243	while (text > stp
2220	&& srp[text - stp - 1] & RS_Careful	2244	&& srp[text - stp - 1] & RS_Careful
2221	&& RS_SAME (rend, srp[text - stp - 1]))	2245	&& RS_SAME (rend, srp[text - stp - 1]))
2222	text--, count++, xpixel -= fwidth;	2246	text--, count++, xpixel -= fwidth;
		2247
		2248	// force redraw after "careful" characters to avoid pixel droppings
		2249	for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
		2250	drp[col + i + 1] = ~srp[col + i + 1];
		2251
		2252	// force redraw before "careful" characters to avoid pixel droppings
		2253	for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
		2254	drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2223	#endif	2255	#endif
2224		2256
2225	bool invert = rend & RS_RVid;	2257	bool invert = rend & RS_RVid;
2226		2258
2227	#ifndef NO_BOLD_UNDERLINE_REVERSE	2259	#ifndef NO_BOLD_UNDERLINE_REVERSE
…		…
2311		2343
2312	if (rend & RS_Uline && font->descent > 1 && fore != back)	2344	if (rend & RS_Uline && font->descent > 1 && fore != back)
2313	{	2345	{
2314	#if ENABLE_FRILLS	2346	#if ENABLE_FRILLS
2315	if (ISSET_PIXCOLOR (Color_underline))	2347	if (ISSET_PIXCOLOR (Color_underline))
2316	XSetForeground (display->display, gc, pix_colors[Color_underline]);	2348	XSetForeground (xdisp, gc, pix_colors[Color_underline]);
2317	else	2349	else
2318	#endif	2350	#endif
2319	XSetForeground (display->display, gc, pix_colors[fore]);	2351	XSetForeground (xdisp, gc, pix_colors[fore]);
2320		2352
2321	XDrawLine (display->display, drawBuffer, gc,	2353	XDrawLine (xdisp, drawBuffer, gc,
2322	xpixel, ypixel + font->ascent + 1,	2354	xpixel, ypixel + font->ascent + 1,
2323	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2355	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2324	}	2356	}
2325	} /* for (col....) */	2357	} /* for (col....) */
2326	} /* for (row....) */	2358	} /* for (row....) */
…		…
2359	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)	2391	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2360	cursorwidth++;	2392	cursorwidth++;
2361		2393
2362	#ifndef NO_CURSORCOLOR	2394	#ifndef NO_CURSORCOLOR
2363	if (ISSET_PIXCOLOR (Color_cursor))	2395	if (ISSET_PIXCOLOR (Color_cursor))
2364	XSetForeground (display->display, gc, pix_colors[Color_cursor]);	2396	XSetForeground (xdisp, gc, pix_colors[Color_cursor]);
2365	#endif	2397	#endif
2366		2398
2367	XDrawRectangle (display->display, drawBuffer, gc,	2399	XDrawRectangle (xdisp, drawBuffer, gc,
2368	Col2Pixel (col),	2400	Col2Pixel (col),
2369	Row2Pixel (oldcursor.row),	2401	Row2Pixel (oldcursor.row),
2370	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2402	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2371	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2403	(unsigned int) (Height2Pixel (1) - lineSpace - 1));
2372	}	2404	}
…		…
2375	/*	2407	/*
2376	* H: cleanup selection	2408	* H: cleanup selection
2377	*/	2409	*/
2378	scr_reverse_selection ();	2410	scr_reverse_selection ();
2379		2411
2380	if (refresh_type & SMOOTH_REFRESH)
2381	XFlush (display->display);
2382
2383	num_scr = 0;	2412	num_scr = 0;
2384	num_scr_allow = 1;	2413	num_scr_allow = 1;
2385	}	2414	}
2386		2415
2387	void	2416	void
2388	rxvt_term::scr_remap_chars (line_t &l)	2417	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2389	{	2418	{
2390	if (!l.t)	2419	if (!l.t)
2391	return;	2420	return;
2392		2421
2393	l.touch (); // maybe a bit of an overkill, but its not performance-relevant	2422	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2394		2423
2395	for (int i = ncol; i--; )	2424	for (int i = ncol; i--; )
2396	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2425	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2397	}	2426	}
2398		2427
2399	void	2428	void
2400	rxvt_term::scr_remap_chars ()	2429	rxvt_term::scr_remap_chars () NOTHROW
2401	{	2430	{
2402	for (int i = total_rows; i--; )	2431	for (int i = total_rows; i--; )
2403	scr_remap_chars (row_buf [i]);	2432	scr_remap_chars (row_buf [i]);
2404		2433
2405	for (int i = nrow; i--; )	2434	for (int i = nrow; i--; )
…		…
2408	scr_remap_chars (swap_buf [i]);	2437	scr_remap_chars (swap_buf [i]);
2409	}	2438	}
2410	}	2439	}
2411		2440
2412	void	2441	void
2413	rxvt_term::scr_recolour ()	2442	rxvt_term::scr_recolour () NOTHROW
2414	{	2443	{
2415	if (1	2444	if (1
2416	#if TRANSPARENT	2445	#if TRANSPARENT
2417	&& !am_transparent	2446	&& !am_transparent
2418	#endif	2447	#endif
2419	#if XPM_BACKGROUND	2448	#if XPM_BACKGROUND
2420	&& !bgPixmap.pixmap	2449	&& !bgPixmap.pixmap
2421	#endif	2450	#endif
2422	)	2451	)
2423	{	2452	{
2424	XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);	2453	XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]);
2425	XClearWindow (display->display, parent[0]);	2454	XClearWindow (xdisp, parent[0]);
2426	XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);	2455	XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
2427	#if HAVE_SCROLLBARS	2456	#if HAVE_SCROLLBARS
2428	if (scrollBar.win)	2457	if (scrollBar.win)
2429	{	2458	{
2430	XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);	2459	XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);
2431	scrollBar.setIdle ();	2460	scrollBar.setIdle ();
2432	scrollbar_show (0);	2461	scrollbar_show (0);
2433	}	2462	}
2434	#endif	2463	#endif
2435	}	2464	}
…		…
2439	want_refresh = 1;	2468	want_refresh = 1;
2440	}	2469	}
2441		2470
2442	/* ------------------------------------------------------------------------- */	2471	/* ------------------------------------------------------------------------- */
2443	void	2472	void
2444	rxvt_term::scr_clear (bool really)	2473	rxvt_term::scr_clear (bool really) NOTHROW
2445	{	2474	{
2446	if (!mapped)	2475	if (!mapped)
2447	return;	2476	return;
2448		2477
2449	num_scr_allow = 0;	2478	num_scr_allow = 0;
2450	want_refresh = 1;	2479	want_refresh = 1;
2451		2480
2452	if (really)	2481	if (really)
2453	XClearWindow (display->display, vt);	2482	XClearWindow (xdisp, vt);
2454	}	2483	}
2455		2484
2456	/* ------------------------------------------------------------------------- */
2457	void	2485	void
		2486	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
		2487	{
		2488	int view_end = view_start + nrow;
		2489	int row, col;
		2490
		2491	for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
		2492	{
		2493	text_t *stp = ROW(row).t;
		2494	rend_t *srp = ROW(row).r;
		2495
		2496	for (col = beg_col; col < end_col; col++)
		2497	srp[col] ^= rstyle1;
		2498
		2499	while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
		2500	srp[col] ^= rstyle2;
		2501
		2502	if (++col < end_col)
		2503	srp[col] ^= rstyle2;
		2504	}
		2505	}
		2506
		2507	void
		2508	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
		2509	{
		2510	int view_end = view_start + nrow;
		2511	int row, col;
		2512
		2513	if (beg_row >= view_start)
		2514	{
		2515	col = beg_col;
		2516	row = beg_row;
		2517	}
		2518	else
		2519	{
		2520	col = 0;
		2521	row = view_start;
		2522	}
		2523
		2524	for (; row < min (end_row, view_end); row++, col = 0)
		2525	for (rend_t *srp = ROW(row).r; col < ncol; col++)
		2526	srp[col] ^= rstyle;
		2527
		2528	if (row == end_row)
		2529	for (rend_t *srp = ROW(row).r; col < end_col; col++)
		2530	srp[col] ^= rstyle;
		2531	}
		2532
		2533	/* ------------------------------------------------------------------------- */
		2534	void
2458	rxvt_term::scr_reverse_selection ()	2535	rxvt_term::scr_reverse_selection () NOTHROW
2459	{	2536	{
2460	if (selection.op	2537	if (selection.op
2461	&& current_screen == selection.screen	2538	&& current_screen == selection.screen
2462	&& selection.end.row >= -view_start)	2539	&& selection.end.row >= view_start)
2463	{	2540	{
2464	int view_end = -view_start + nrow;
2465	int row, col;
2466
2467	#if ENABLE_FRILLS	2541	#if ENABLE_FRILLS
2468	if (selection.rect)	2542	if (selection.rect)
2469	{	2543	scr_xor_rect (selection.beg.row, selection.beg.col,
2470	for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)	2544	selection.end.row, selection.end.col,
2471	{	2545	RS_RVid, RS_RVid | RS_Uline);
2472	text_t *stp = ROW(row).t;
2473	rend_t *srp = ROW(row).r;
2474
2475	for (col = selection.beg.col; col < selection.end.col; col++)
2476	srp[col] ^= RS_RVid;
2477
2478	while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2479	srp[col] ^= RS_RVid | RS_Uline;
2480
2481	if (++col < selection.end.col)
2482	srp[col] ^= RS_RVid | RS_Uline;
2483	}
2484	}
2485	else	2546	else
2486	#endif	2547	#endif
2487	{	2548	scr_xor_span (selection.beg.row, selection.beg.col,
2488	if (selection.beg.row >= -view_start)	2549	selection.end.row, selection.end.col,
2489	{	2550	RS_RVid);
2490	col = selection.beg.col;
2491	row = selection.beg.row;
2492	}
2493	else
2494	{
2495	col = 0;
2496	row = -view_start;
2497	}
2498
2499	for (; row < min (selection.end.row, view_end); row++, col = 0)
2500	for (rend_t *srp = ROW(row).r; col < ncol; col++)
2501	srp[col] ^= RS_RVid;
2502
2503	if (row == selection.end.row)
2504	for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2505	srp[col] ^= RS_RVid;
2506	}
2507	}	2551	}
2508	}	2552	}
2509		2553
2510	/* ------------------------------------------------------------------------- */	2554	/* ------------------------------------------------------------------------- */
2511	/*	2555	/*
2512	* Dump the whole scrollback and screen to the passed filedescriptor. The	2556	* Dump the whole scrollback and screen to the passed filedescriptor. The
2513	* invoking routine must close the fd.	2557	* invoking routine must close the fd.
2514	*/	2558	*/
2515	#if 0	2559	#if 0
2516	void	2560	void
2517	rxvt_term::scr_dump (int fd)	2561	rxvt_term::scr_dump (int fd) NOTHROW
2518	{	2562	{
2519	int row, wrote;	2563	int row, wrote;
2520	unsigned int width, towrite;	2564	unsigned int width, towrite;
2521	char r1[] = "\n";	2565	char r1[] = "\n";
2522		2566
…		…
2541		2585
2542	/* ------------------------------------------------------------------------- *	2586	/* ------------------------------------------------------------------------- *
2543	* CHARACTER SELECTION *	2587	* CHARACTER SELECTION *
2544	* ------------------------------------------------------------------------- */	2588	* ------------------------------------------------------------------------- */
2545	void	2589	void
2546	rxvt_term::selection_check (int check_more)	2590	rxvt_term::selection_check (int check_more) NOTHROW
2547	{	2591	{
2548	row_col_t pos;	2592	row_col_t pos;
2549		2593
2550	if (!selection.op)	2594	if (!selection.op)
2551	return;	2595	return;
2552		2596
2553	pos.row = pos.col = 0;	2597	pos.row = pos.col = 0;
2554	if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)	2598	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2555	|| !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)	2599	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2556	|| !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)	2600	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2557	|| (check_more == 1	2601	|| (check_more == 1
2558	&& current_screen == selection.screen	2602	&& current_screen == selection.screen
2559	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2603	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2560	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2604	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
2561	|| (check_more == 2	2605	|| (check_more == 2
…		…
2572	/* ------------------------------------------------------------------------- */	2616	/* ------------------------------------------------------------------------- */
2573	/*	2617	/*
2574	* Paste a selection direct to the command fd	2618	* Paste a selection direct to the command fd
2575	*/	2619	*/
2576	void	2620	void
2577	rxvt_term::paste (char *data, unsigned int len)	2621	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2578	{	2622	{
2579	/* convert normal newline chars into common keyboard Return key sequence */	2623	/* convert normal newline chars into common keyboard Return key sequence */
2580	for (unsigned int i = 0; i < len; i++)	2624	for (unsigned int i = 0; i < len; i++)
2581	if (data[i] == C0_LF)	2625	if (data[i] == C0_LF)
2582	data[i] = C0_CR;	2626	data[i] = C0_CR;
…		…
2588	/*	2632	/*
2589	* Respond to a notification that a primary selection has been sent	2633	* Respond to a notification that a primary selection has been sent
2590	* EXT: SelectionNotify	2634	* EXT: SelectionNotify
2591	*/	2635	*/
2592	void	2636	void
2593	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)	2637	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2594	{	2638	{
2595	if (prop == None) /* check for failed XConvertSelection */	2639	if (prop == None) /* check for failed XConvertSelection */
2596	{	2640	{
2597	if ((selection_type & Sel_CompoundText))	2641	if ((selection_type & Sel_CompoundText))
2598	{	2642	{
…		…
2618	}	2662	}
2619		2663
2620	unsigned long bytes_after;	2664	unsigned long bytes_after;
2621	XTextProperty ct;	2665	XTextProperty ct;
2622		2666
2623	if (XGetWindowProperty (display->display, win, prop,	2667	if (XGetWindowProperty (xdisp, win, prop,
2624	0, PROP_SIZE / 4,	2668	0, PROP_SIZE / 4,
2625	delete_prop, AnyPropertyType,	2669	delete_prop, AnyPropertyType,
2626	&ct.encoding, &ct.format,	2670	&ct.encoding, &ct.format,
2627	&ct.nitems, &bytes_after,	2671	&ct.nitems, &bytes_after,
2628	&ct.value) != Success)	2672	&ct.value) != Success)
…		…
2637	if (bytes_after)	2681	if (bytes_after)
2638	{	2682	{
2639	// fetch and append remaining data	2683	// fetch and append remaining data
2640	XTextProperty ct2;	2684	XTextProperty ct2;
2641		2685
2642	if (XGetWindowProperty (display->display, win, prop,	2686	if (XGetWindowProperty (xdisp, win, prop,
2643	ct.nitems / 4, (bytes_after + 3) / 4,	2687	ct.nitems / 4, (bytes_after + 3) / 4,
2644	delete_prop, AnyPropertyType,	2688	delete_prop, AnyPropertyType,
2645	&ct2.encoding, &ct2.format,	2689	&ct2.encoding, &ct2.format,
2646	&ct2.nitems, &bytes_after,	2690	&ct2.nitems, &bytes_after,
2647	&ct2.value) != Success)	2691	&ct2.value) != Success)
…		…
2660		2704
2661	if (ct.encoding == xa[XA_INCR])	2705	if (ct.encoding == xa[XA_INCR])
2662	{	2706	{
2663	// INCR selection, start handshake	2707	// INCR selection, start handshake
2664	if (!delete_prop)	2708	if (!delete_prop)
2665	XDeleteProperty (display->display, win, prop);	2709	XDeleteProperty (xdisp, win, prop);
2666		2710
2667	selection_wait = Sel_incr;	2711	selection_wait = Sel_incr;
2668	incr_buf_fill = 0;	2712	incr_buf_fill = 0;
2669	incr_ev.start (NOW + 10);	2713	incr_ev.start (NOW + 10);
2670		2714
…		…
2731	paste (s, strlen (s));	2775	paste (s, strlen (s));
2732	free (s);	2776	free (s);
2733	}	2777	}
2734	else	2778	else
2735	#endif	2779	#endif
2736	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0	2780	if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
2737	&& cl)	2781	&& cl)
2738	{	2782	{
2739	for (int i = 0; i < cr; i++)	2783	for (int i = 0; i < cr; i++)
2740	paste (cl[i], strlen (cl[i]));	2784	paste (cl[i], strlen (cl[i]));
2741		2785
…		…
2750	if (selection_wait == Sel_normal)	2794	if (selection_wait == Sel_normal)
2751	selection_wait = Sel_none;	2795	selection_wait = Sel_none;
2752	}	2796	}
2753		2797
2754	void	2798	void
2755	rxvt_term::incr_cb (time_watcher &w)	2799	rxvt_term::incr_cb (time_watcher &w) NOTHROW
2756	{	2800	{
2757	selection_wait = Sel_none;	2801	selection_wait = Sel_none;
2758		2802
2759	incr_buf_size = 0;	2803	incr_buf_size = 0;
2760	free (incr_buf);	2804	free (incr_buf);
2761		2805
2762	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");	2806	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2763	}	2807	}
2764		2808
2765	void	2809	void
2766	rxvt_term::selection_property (Window win, Atom prop)	2810	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2767	{	2811	{
2768	if (prop == None || selection_wait != Sel_incr)	2812	if (prop == None || selection_wait != Sel_incr)
2769	return;	2813	return;
2770		2814
2771	selection_paste (win, prop, true);	2815	selection_paste (win, prop, true);
…		…
2780	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()	2824	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2781	* will auto fallback to CUT_BUFFER0	2825	* will auto fallback to CUT_BUFFER0
2782	* EXT: button 2 release	2826	* EXT: button 2 release
2783	*/	2827	*/
2784	void	2828	void
2785	rxvt_term::selection_request (Time tm, int x, int y)	2829	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2786	{	2830	{
2787	if (x < 0 || x >= width || y < 0 || y >= height)	2831	if (selection.text && selnum == Sel_Primary)
2788	return; /* outside window */
2789
2790	if (selection.text)
2791	{ /* internal selection */	2832	{ /* internal selection */
2792	char *str = rxvt_wcstombs (selection.text, selection.len);	2833	char *str = rxvt_wcstombs (selection.text, selection.len);
2793	paste (str, strlen (str));	2834	paste (str, strlen (str));
2794	free (str);	2835	free (str);
2795	return;	2836	return;
2796	}	2837	}
2797	else	2838	else
2798	{	2839	{
2799	int i;
2800
2801	selection_request_time = tm;	2840	selection_request_time = tm;
2802	selection_wait = Sel_normal;	2841	selection_wait = Sel_normal;
2803		2842
2804	for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2805	{
2806	#if X_HAVE_UTF8_STRING	2843	#if X_HAVE_UTF8_STRING
2807	selection_type = Sel_UTF8String;	2844	selection_type = Sel_UTF8String;
2808	if (selection_request_other (xa[XA_UTF8_STRING], i))	2845	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2809	return;	2846	return;
2810	#else	2847	#else
2811	selection_type = Sel_CompoundText;	2848	selection_type = Sel_CompoundText;
2812	if (selection_request_other (xa[XA_COMPOUND_TEXT], i))	2849	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2813	return;	2850	return;
2814	#endif	2851	#endif
2815	}
2816	}	2852	}
2817		2853
2818	selection_wait = Sel_none; /* don't loop in selection_paste () */	2854	selection_wait = Sel_none; /* don't loop in selection_paste () */
2819	selection_paste (display->root, XA_CUT_BUFFER0, false);	2855	selection_paste (display->root, XA_CUT_BUFFER0, false);
2820	}	2856	}
2821		2857
2822	int	2858	int
2823	rxvt_term::selection_request_other (Atom target, int selnum)	2859	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2824	{	2860	{
2825	Atom sel;	2861	Atom sel;
2826		2862
2827	selection_type |= selnum;	2863	selection_type |= selnum;
2828		2864
…		…
2831	else if (selnum == Sel_Secondary)	2867	else if (selnum == Sel_Secondary)
2832	sel = XA_SECONDARY;	2868	sel = XA_SECONDARY;
2833	else	2869	else
2834	sel = xa[XA_CLIPBOARD];	2870	sel = xa[XA_CLIPBOARD];
2835		2871
2836	if (XGetSelectionOwner (display->display, sel) != None)	2872	if (XGetSelectionOwner (xdisp, sel) != None)
2837	{	2873	{
2838	XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],	2874	XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
2839	vt, selection_request_time);	2875	vt, selection_request_time);
2840	return 1;	2876	return 1;
2841	}	2877	}
2842		2878
2843	return 0;	2879	return 0;
…		…
2847	/*	2883	/*
2848	* Clear all selected text	2884	* Clear all selected text
2849	* EXT: SelectionClear	2885	* EXT: SelectionClear
2850	*/	2886	*/
2851	void	2887	void
2852	rxvt_term::selection_clear ()	2888	rxvt_term::selection_clear () NOTHROW
2853	{	2889	{
2854	want_refresh = 1;	2890	want_refresh = 1;
2855	free (selection.text);	2891	free (selection.text);
2856	selection.text = NULL;	2892	selection.text = NULL;
2857	selection.len = 0;	2893	selection.len = 0;
…		…
2992		3028
2993	selection_grab (tm);	3029	selection_grab (tm);
2994	}	3030	}
2995		3031
2996	bool	3032	bool
2997	rxvt_term::selection_grab (Time tm)	3033	rxvt_term::selection_grab (Time tm) NOTHROW
2998	{	3034	{
2999	selection_time = tm;	3035	selection_time = tm;
3000		3036
3001	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);	3037	XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
3002	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)	3038	if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3003	{	3039	{
3004	display->set_selection_owner (this);	3040	display->set_selection_owner (this);
3005	return true;	3041	return true;
3006	}	3042	}
3007	else	3043	else
		3044	{
		3045	selection_clear ();
3008	return false;	3046	return false;
		3047	}
3009		3048
3010	#if 0	3049	#if 0
3011	XTextProperty ct;	3050	XTextProperty ct;
3012		3051
3013	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)	3052	if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)
3014	{	3053	{
3015	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);	3054	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3016	XFree (ct.value);	3055	XFree (ct.value);
3017	}	3056	}
3018	#endif	3057	#endif
…		…
3022	/*	3061	/*
3023	* Mark or select text based upon number of clicks: 1, 2, or 3	3062	* Mark or select text based upon number of clicks: 1, 2, or 3
3024	* EXT: button 1 press	3063	* EXT: button 1 press
3025	*/	3064	*/
3026	void	3065	void
3027	rxvt_term::selection_click (int clicks, int x, int y)	3066	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3028	{	3067	{
3029	clicks = ((clicks - 1) % 3) + 1;	3068	clicks = ((clicks - 1) % 3) + 1;
3030	selection.clicks = clicks; /* save clicks so extend will work */	3069	selection.clicks = clicks; /* save clicks so extend will work */
3031		3070
		3071	if (clicks == 2 && !selection.rect
		3072	&& HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
		3073	{
		3074	MEvent.clicks = 1; // what a mess
		3075	selection.screen = current_screen;
		3076	selection.op = SELECTION_CONT;
		3077	return;
		3078	}
		3079
3032	selection_start_colrow (Pixel2Col (x), Pixel2Row (y));	3080	selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3033		3081
3034	if (clicks == 2 || clicks == 3)	3082	if (clicks == 2 || clicks == 3)
3035	selection_extend_colrow (selection.mark.col,	3083	selection_extend_colrow (selection.mark.col,
3036	selection.mark.row + view_start,	3084	selection.mark.row - view_start,
3037	0, /* button 3 */	3085	0, /* button 3 */
3038	1, /* button press */	3086	1, /* button press */
3039	0); /* click change */	3087	0); /* click change */
3040	}	3088	}
3041		3089
3042	/* ------------------------------------------------------------------------- */	3090	/* ------------------------------------------------------------------------- */
3043	/*	3091	/*
3044	* Mark a selection at the specified col/row	3092	* Mark a selection at the specified col/row
3045	*/	3093	*/
3046	void	3094	void
3047	rxvt_term::selection_start_colrow (int col, int row)	3095	rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3048	{	3096	{
3049	want_refresh = 1;	3097	want_refresh = 1;
3050		3098
3051	selection.mark.row = row - view_start;	3099	selection.mark.row = row + view_start;
3052	selection.mark.col = col;	3100	selection.mark.col = col;
3053		3101
3054	selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);	3102	selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3055	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);	3103	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3056		3104
3057	while (selection.mark.col > 0	3105	while (selection.mark.col > 0
3058	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)	3106	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3059	--selection.mark.col;	3107	--selection.mark.col;
…		…
3078	#define DELIMIT_TEXT(x) \	3126	#define DELIMIT_TEXT(x) \
3079	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3127	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3080	#define DELIMIT_REND(x) 1	3128	#define DELIMIT_REND(x) 1
3081		3129
3082	void	3130	void
3083	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)	3131	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3084	{	3132	{
3085	int col, row, dirnadd, tcol, trow, w1, w2;	3133	int col, row, dirnadd, tcol, trow, w1, w2;
3086	row_col_t bound;	3134	row_col_t bound;
3087	text_t *stp;	3135	text_t *stp;
3088	rend_t *srp;	3136	rend_t *srp;
3089		3137
3090	if (dirn == UP)	3138	if (dirn == UP)
3091	{	3139	{
3092	bound.row = - nsaved - 1;	3140	bound.row = top_row - 1;
3093	bound.col = 0;	3141	bound.col = 0;
3094	dirnadd = -1;	3142	dirnadd = -1;
3095	}	3143	}
3096	else	3144	else
3097	{	3145	{
…		…
3162	* flag == 0 ==> button 1	3210	* flag == 0 ==> button 1
3163	* flag == 1 ==> button 3 press	3211	* flag == 1 ==> button 3 press
3164	* flag == 2 ==> button 3 motion	3212	* flag == 2 ==> button 3 motion
3165	*/	3213	*/
3166	void	3214	void
3167	rxvt_term::selection_extend (int x, int y, int flag)	3215	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3168	{	3216	{
3169	int col = clamp (Pixel2Col (x), 0, ncol);	3217	int col = clamp (Pixel2Col (x), 0, ncol);
3170	int row = clamp (Pixel2Row (y), 0, nrow - 1);	3218	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3171		3219
3172	/*	3220	/*
…		…
3175	* select nothing. Otherwise, if we're to the right of the mark, you have to	3223	* select nothing. Otherwise, if we're to the right of the mark, you have to
3176	* be _past_ a character for it to be selected.	3224	* be _past_ a character for it to be selected.
3177	*/	3225	*/
3178	if (((selection.clicks % 3) == 1) && !flag	3226	if (((selection.clicks % 3) == 1) && !flag
3179	&& (col == selection.mark.col	3227	&& (col == selection.mark.col
3180	&& (row == selection.mark.row + view_start)))	3228	&& (row == selection.mark.row - view_start)))
3181	{	3229	{
3182	/* select nothing */	3230	/* select nothing */
3183	selection.beg.row = selection.end.row = 0;	3231	selection.beg.row = selection.end.row = 0;
3184	selection.beg.col = selection.end.col = 0;	3232	selection.beg.col = selection.end.col = 0;
3185	selection.clicks = 4;	3233	selection.clicks = 4;
…		…
3198	/* ------------------------------------------------------------------------- */	3246	/* ------------------------------------------------------------------------- */
3199	/*	3247	/*
3200	* Extend the selection to the specified col/row	3248	* Extend the selection to the specified col/row
3201	*/	3249	*/
3202	void	3250	void
3203	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)	3251	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3204	{	3252	{
3205	row_col_t pos;	3253	row_col_t pos;
3206	enum {	3254	enum {
3207	LEFT, RIGHT	3255	LEFT, RIGHT
3208	} closeto = RIGHT;	3256	} closeto = RIGHT;
…		…
3240	selection.beg.col = selection.end.col = selection.mark.col;	3288	selection.beg.col = selection.end.col = selection.mark.col;
3241	selection.beg.row = selection.end.row = selection.mark.row;	3289	selection.beg.row = selection.end.row = selection.mark.row;
3242	}	3290	}
3243		3291
3244	pos.col = col;	3292	pos.col = col;
3245	pos.row = row - view_start;	3293	pos.row = view_start + row;
3246		3294
3247	/*	3295	/*
3248	* This is mainly xterm style selection with a couple of differences, mainly	3296	* This is mainly xterm style selection with a couple of differences, mainly
3249	* in the way button3 drag extension works.	3297	* in the way button3 drag extension works.
3250	* We're either doing: button1 drag; button3 press; or button3 drag	3298	* We're either doing: button1 drag; button3 press; or button3 drag
…		…
3331	else if (selection.clicks == 2)	3379	else if (selection.clicks == 2)
3332	{	3380	{
3333	if (ROWCOL_IS_AFTER (selection.end, selection.beg))	3381	if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3334	selection.end.col--;	3382	selection.end.col--;
3335		3383
3336	if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3337	{
3338	selection_delimit_word (UP, &selection.beg, &selection.beg);	3384	selection_delimit_word (UP, &selection.beg, &selection.beg);
3339	selection_delimit_word (DN, &selection.end, &selection.end);	3385	selection_delimit_word (DN, &selection.end, &selection.end);
3340	}
3341	}	3386	}
3342	else if (selection.clicks == 3)	3387	else if (selection.clicks == 3)
3343	{	3388	{
3344	#if ENABLE_FRILLS	3389	#if ENABLE_FRILLS
3345	if (OPTION (Opt_tripleclickwords))	3390	if (OPTION (Opt_tripleclickwords))
…		…
3397	#endif	3442	#endif
3398	}	3443	}
3399		3444
3400	#if ENABLE_FRILLS	3445	#if ENABLE_FRILLS
3401	void	3446	void
3402	rxvt_term::selection_remove_trailing_spaces ()	3447	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3403	{	3448	{
3404	int32_t end_col, end_row;	3449	int32_t end_col, end_row;
3405	text_t *stp;	3450	text_t *stp;
3406		3451
3407	end_col = selection.end.col;	3452	end_col = selection.end.col;
…		…
3445	/*	3490	/*
3446	* Double click on button 3 when already selected	3491	* Double click on button 3 when already selected
3447	* EXT: button 3 double click	3492	* EXT: button 3 double click
3448	*/	3493	*/
3449	void	3494	void
3450	rxvt_term::selection_rotate (int x, int y)	3495	rxvt_term::selection_rotate (int x, int y) NOTHROW
3451	{	3496	{
3452	selection.clicks = selection.clicks % 3 + 1;	3497	selection.clicks = selection.clicks % 3 + 1;
3453	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3498	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3454	}	3499	}
3455		3500
…		…
3457	/*	3502	/*
3458	* Respond to a request for our current selection	3503	* Respond to a request for our current selection
3459	* EXT: SelectionRequest	3504	* EXT: SelectionRequest
3460	*/	3505	*/
3461	void	3506	void
3462	rxvt_term::selection_send (const XSelectionRequestEvent &rq)	3507	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3463	{	3508	{
3464	XSelectionEvent ev;	3509	XSelectionEvent ev;
3465	dDisp;
3466		3510
3467	ev.type = SelectionNotify;	3511	ev.type = SelectionNotify;
3468	ev.property = None;	3512	ev.property = None;
3469	ev.display = rq.display;	3513	ev.display = rq.display;
3470	ev.requestor = rq.requestor;	3514	ev.requestor = rq.requestor;
…		…
3484	*target++ = xa[XA_COMPOUND_TEXT];	3528	*target++ = xa[XA_COMPOUND_TEXT];
3485	#if X_HAVE_UTF8_STRING	3529	#if X_HAVE_UTF8_STRING
3486	*target++ = xa[XA_UTF8_STRING];	3530	*target++ = xa[XA_UTF8_STRING];
3487	#endif	3531	#endif
3488		3532
3489	XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,	3533	XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,
3490	32, PropModeReplace,	3534	32, PropModeReplace,
3491	(unsigned char *)target_list, target - target_list);	3535	(unsigned char *)target_list, target - target_list);
3492	ev.property = rq.property;	3536	ev.property = rq.property;
3493	}	3537	}
3494	#if TODO // TODO	3538	#if TODO // TODO
…		…
3497	/* TODO: Handle MULTIPLE */	3541	/* TODO: Handle MULTIPLE */
3498	}	3542	}
3499	#endif	3543	#endif
3500	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3544	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3501	{	3545	{
3502	XChangeProperty (disp, rq.requestor, rq.property, rq.target,	3546	XChangeProperty (xdisp, rq.requestor, rq.property, rq.target,
3503	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3547	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3504	ev.property = rq.property;	3548	ev.property = rq.property;
3505	}	3549	}
3506	else if (rq.target == XA_STRING	3550	else if (rq.target == XA_STRING
3507	|| rq.target == xa[XA_TEXT]	3551	|| rq.target == xa[XA_TEXT]
…		…
3565	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);	3609	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3566	ct.nitems = strlen ((char *)ct.value);	3610	ct.nitems = strlen ((char *)ct.value);
3567	}	3611	}
3568	else	3612	else
3569	#endif	3613	#endif
3570	if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)	3614	if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3571	freect = 1;	3615	freect = 1;
3572	else	3616	else
3573	{	3617	{
3574	/* if we failed to convert then send it raw */	3618	/* if we failed to convert then send it raw */
3575	ct.value = (unsigned char *)cl;	3619	ct.value = (unsigned char *)cl;
3576	ct.nitems = selectlen;	3620	ct.nitems = selectlen;
3577	ct.encoding = target;	3621	ct.encoding = target;
3578	}	3622	}
3579		3623
3580	XChangeProperty (disp, rq.requestor, rq.property,	3624	XChangeProperty (xdisp, rq.requestor, rq.property,
3581	ct.encoding, 8, PropModeReplace,	3625	ct.encoding, 8, PropModeReplace,
3582	ct.value, (int)ct.nitems);	3626	ct.value, (int)ct.nitems);
3583	ev.property = rq.property;	3627	ev.property = rq.property;
3584		3628
3585	if (freect)	3629	if (freect)
3586	XFree (ct.value);	3630	XFree (ct.value);
3587	}	3631	}
3588		3632
3589	XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);	3633	XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);
3590	}	3634	}
3591		3635
3592	/* ------------------------------------------------------------------------- *	3636	/* ------------------------------------------------------------------------- *
3593	* MOUSE ROUTINES *	3637	* MOUSE ROUTINES *
3594	* ------------------------------------------------------------------------- */	3638	* ------------------------------------------------------------------------- */
3595		3639
3596	/*	3640	/*
3597	* return col/row values corresponding to x/y pixel values	3641	* return col/row values corresponding to x/y pixel values
3598	*/	3642	*/
3599	void	3643	void
3600	rxvt_term::pixel_position (int *x, int *y)	3644	rxvt_term::pixel_position (int *x, int *y) NOTHROW
3601	{	3645	{
3602	*x = Pixel2Col (*x);	3646	*x = Pixel2Col (*x);
3603	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */	3647	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3604	*y = Pixel2Row (*y);	3648	*y = Pixel2Row (*y);
3605	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */	3649	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3606	}	3650	}
3607		3651
3608	/* ------------------------------------------------------------------------- */	3652	/* ------------------------------------------------------------------------- */
3609	#ifdef USE_XIM	3653	#ifdef USE_XIM
3610	void	3654	void
3611	rxvt_term::im_set_position (XPoint &pos)	3655	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3612	{	3656	{
3613	XWindowAttributes xwa;	3657	XWindowAttributes xwa;
3614		3658
3615	XGetWindowAttributes (display->display, vt, &xwa);	3659	XGetWindowAttributes (xdisp, vt, &xwa);
3616		3660
3617	pos.x = xwa.x + Col2Pixel (screen.cur.col);	3661	pos.x = xwa.x + Col2Pixel (screen.cur.col);
3618	pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;	3662	pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3619	}	3663	}
3620	#endif	3664	#endif
3621		3665
3622	#if ENABLE_OVERLAY	3666	#if ENABLE_OVERLAY
3623	void	3667	void
3624	rxvt_term::scr_overlay_new (int x, int y, int w, int h)	3668	rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3625	{	3669	{
3626	if (nrow < 1 || ncol < 1)	3670	if (nrow < 1 || ncol < 1)
3627	return;	3671	return;
3628		3672
3629	want_refresh = 1;	3673	want_refresh = 1;
…		…
3674	*rp = r;	3718	*rp = r;
3675	}	3719	}
3676	}	3720	}
3677		3721
3678	void	3722	void
3679	rxvt_term::scr_overlay_off ()	3723	rxvt_term::scr_overlay_off () NOTHROW
3680	{	3724	{
3681	if (!ov_text)	3725	if (!ov_text)
3682	return;	3726	return;
3683		3727
3684	want_refresh = 1;	3728	want_refresh = 1;
…		…
3692	delete [] ov_text; ov_text = 0;	3736	delete [] ov_text; ov_text = 0;
3693	delete [] ov_rend; ov_rend = 0;	3737	delete [] ov_rend; ov_rend = 0;
3694	}	3738	}
3695		3739
3696	void	3740	void
3697	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)	3741	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3698	{	3742	{
3699	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3743	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3700	return;	3744	return;
3701		3745
3702	x++, y++;	3746	x++, y++;
…		…
3704	ov_text[y][x] = text;	3748	ov_text[y][x] = text;
3705	ov_rend[y][x] = rend;	3749	ov_rend[y][x] = rend;
3706	}	3750	}
3707		3751
3708	void	3752	void
3709	rxvt_term::scr_overlay_set (int x, int y, const char *s)	3753	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3710	{	3754	{
3711	while (*s)	3755	while (*s)
3712	scr_overlay_set (x++, y, *s++);	3756	scr_overlay_set (x++, y, *s++);
3713	}	3757	}
3714		3758
3715	void	3759	void
3716	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)	3760	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3717	{	3761	{
3718	while (*s)	3762	while (*s)
3719	{	3763	{
3720	text_t t = *s++;	3764	text_t t = *s++;
3721	int width = wcwidth (t);	3765	int width = WCWIDTH (t);
3722		3766
3723	while (width--)	3767	while (width--)
3724	{	3768	{
3725	scr_overlay_set (x++, y, t);	3769	scr_overlay_set (x++, y, t);
3726	t = NOCHAR;	3770	t = NOCHAR;
3727	}	3771	}
3728	}	3772	}
3729	}	3773	}
3730		3774
3731	void	3775	void
3732	rxvt_term::scr_swap_overlay ()	3776	rxvt_term::scr_swap_overlay () NOTHROW
3733	{	3777	{
3734	if (!ov_text)	3778	if (!ov_text)
3735	return;	3779	return;
3736		3780
3737	// swap screen mem with overlay	3781	// swap screen mem with overlay
3738	for (int y = ov_h; y--; )	3782	for (int y = ov_h; y--; )
3739	{	3783	{
3740	text_t *t1 = ov_text[y];	3784	text_t *t1 = ov_text[y];
3741	rend_t *r1 = ov_rend[y];	3785	rend_t *r1 = ov_rend[y];
3742		3786
3743	text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;	3787	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3744	rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;	3788	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3745		3789
3746	for (int x = ov_w; x--; )	3790	for (int x = ov_w; x--; )
3747	{	3791	{
3748	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3792	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3749	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3793	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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