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.223 by root, Wed Jan 11 18:54:30 2006 UTC vs.
Revision 1.262 by root, Mon Feb 20 22:42:01 2006 UTC

1	/*--------------------------------*-C-*--------------------------------------*	1	/*---------------------------------------------------------------------------*
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-2006 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
…		…
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 (dpy, 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 (dpy, 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 (dpy, 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;
126	width = ncol;	126	width = ncol;
127	}	127	}
128		128
129	l.touch ();	129	l.touch ();
130		130
131	efs &= ~RS_baseattrMask;	131	efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));	132	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133		133
134	text_t *et = l.t + col;	134	text_t *et = l.t + col;
135	rend_t *er = l.r + col;	135	rend_t *er = l.r + col;
136		136
…		…
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		150
151	l.l = 0;	151	l.l = 0;
152	l.f = 0;	152	l.f = 0;
…		…
173	nrow = 24;	173	nrow = 24;
174		174
175	if (ncol == prev_ncol && nrow == prev_nrow)	175	if (ncol == prev_ncol && nrow == prev_nrow)
176	return;	176	return;
177		177
		178	if (current_screen != PRIMARY)
		179	scr_swap_screen ();
		180
178	// we need at least two lines for wrapping to work correctly	181	// we need at least two lines for wrapping to work correctly
179	if (nrow + saveLines < 2)	182	while (nrow + saveLines < 2)
180	{	183	{
181	//TODO//FIXME	184	//TODO//FIXME
182	saveLines++;	185	saveLines++;
183	prev_nrow--;	186	prev_nrow--;
184	nsaved++;	187	top_row--;
185	}	188	}
186		189
187	want_refresh = 1;	190	want_refresh = 1;
188		191
189	int prev_total_rows = prev_nrow + saveLines;	192	int prev_total_rows = prev_nrow + saveLines;
…		…
195	if (!row_buf)	198	if (!row_buf)
196	{	199	{
197	/*	200	/*
198	* 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
199	*/	202	*/
200	nsaved = 0; /* no saved lines */	203	top_row = 0;
201	term_start = 0;	204	term_start = 0;
202		205
203	talloc = new rxvt_salloc (ncol * sizeof (text_t));	206	talloc = new rxvt_salloc (ncol * sizeof (text_t));
204	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));	207	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205		208
…		…
234	selection.text = NULL;	237	selection.text = NULL;
235	selection.len = 0;	238	selection.len = 0;
236	selection.op = SELECTION_CLEAR;	239	selection.op = SELECTION_CLEAR;
237	selection.screen = PRIMARY;	240	selection.screen = PRIMARY;
238	selection.clicks = 0;	241	selection.clicks = 0;
239	CLEAR_ALL_SELECTION ();	242	rvideo_state = rvideo_mode = false;
240	rvideo = 0;
241	}	243	}
242	else	244	else
243	{	245	{
244	/*	246	/*
245	* add or delete rows as appropriate	247	* add or delete rows as appropriate
…		…
276		278
277	line_t *old_buf = row_buf;	279	line_t *old_buf = row_buf;
278	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));	280	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279		281
280	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
281	int pend = MOD (term_start - nsaved , prev_total_rows);	283	int pend = MOD (term_start + top_row , prev_total_rows);
282	int q = total_rows; // rewrapped row	284	int q = total_rows; // rewrapped row
283		285
284	if (nsaved)	286	if (top_row)
285	{	287	{
286	// 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
287	// to come up with a lean and mean algorithm.	289	// to come up with a lean and mean algorithm.
288		290
289	row_col_t ocur = screen.cur;	291	row_col_t ocur = screen.cur;
290	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	292	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291		293
…		…
325	qline->l = ncol;	327	qline->l = ncol;
326	qline->is_longer (1);	328	qline->is_longer (1);
327		329
328	int qcol = 0;	330	int qcol = 0;
329		331
		332	// see below for cursor adjustment rationale
		333	if (p == ocur.row)
		334	screen.cur.row = q - (total_rows - nrow);
		335
330	// fill a single destination line	336	// fill a single destination line
331	while (lofs < llen && qcol < ncol)	337	while (lofs < llen && qcol < ncol)
332	{	338	{
333	int prow = lofs / prev_ncol;	339	int prow = lofs / prev_ncol;
334	int pcol = lofs % prev_ncol;	340	int pcol = lofs % prev_ncol;
…		…
344		350
345	line_t &pline = old_buf [prow];	351	line_t &pline = old_buf [prow];
346		352
347	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	353	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348		354
349	assert (len);
350	assert (pline.t);
351
352	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));	355	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));	356	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354		357
355	lofs += len;	358	lofs += len;
356	qcol += len;	359	qcol += len;
…		…
362	scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);	365	scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
363	}	366	}
364	while (p != pend && q > 0);	367	while (p != pend && q > 0);
365		368
366	term_start = total_rows - nrow;	369	term_start = total_rows - nrow;
367	nsaved = term_start - q;	370	top_row = q - term_start;
368		371
369	// make sure all terminal lines exist	372	// make sure all terminal lines exist
370	while (nsaved < 0)	373	while (top_row > 0)
371	scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);	374	scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372	}	375	}
373	else	376	else
374	{	377	{
375	// if no scrollback exists (yet), wing, instead of wrap	378	// if no scrollback exists (yet), wing, instead of wrap
376		379
…		…
389	}	392	}
390		393
391	term_start = 0;	394	term_start = 0;
392	}	395	}
393		396
394	#ifdef DEBUG_STRICT //TODO: remove
395	for (int i = -nsaved; i < nrow; i++)
396	assert (ROW (i).t);
397	#endif
398
399	free (old_buf);	397	free (old_buf);
400	delete old_ta;	398	delete old_ta;
401	delete old_ra;	399	delete old_ra;
402		400
403	clamp_it (screen.cur.row, 0, nrow - 1);	401	clamp_it (screen.cur.row, 0, nrow - 1);
404	clamp_it (screen.cur.col, 0, ncol - 1);	402	clamp_it (screen.cur.col, 0, ncol - 1);
405		403
406	if (tabs)
407	free (tabs);	404	free (tabs);
408	}	405	}
		406
		407	CLEAR_ALL_SELECTION ();
409		408
410	prev_nrow = nrow;	409	prev_nrow = nrow;
411	prev_ncol = ncol;	410	prev_ncol = ncol;
412		411
413	tabs = (char *)rxvt_malloc (ncol * sizeof (char));	412	tabs = (char *)rxvt_malloc (ncol * sizeof (char));
414		413
415	for (int col = ncol; col--; )	414	for (int col = ncol; col--; )
416	tabs [col] = col % TABSIZE == 0;	415	tabs [col] = col % TABSIZE == 0;
417		416
		417	if (current_screen != PRIMARY)
		418	scr_swap_screen ();
		419
418	tt_winch ();	420	tt_winch ();
419		421
420	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	422	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421	}	423	}
422		424
423	/* ------------------------------------------------------------------------- */	425	/* ------------------------------------------------------------------------- */
424	/*	426	/*
425	* Free everything. That way malloc debugging can find leakage.	427	* Free everything. That way malloc debugging can find leakage.
426	*/	428	*/
427	void	429	void
428	rxvt_term::scr_release ()	430	rxvt_term::scr_release () NOTHROW
429	{	431	{
		432	if (row_buf)
		433	{
430	delete talloc; talloc = 0;	434	delete talloc; talloc = 0;
431	delete ralloc; ralloc = 0;	435	delete ralloc; ralloc = 0;
432		436
433	free (row_buf);	437	free (row_buf);
434	free (swap_buf);	438	free (swap_buf);
435	free (drawn_buf);	439	free (drawn_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 (!IN_RANGE_INC (color, minCOLOR, 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)
…		…
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	{
		646	line_t &l = ROW(nrow - 1 - i);
		647
		648	// optimize if already cleared, can be significant on slow machines
		649	// could be rolled into scr_blank_screen_mem
		650	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
		651	{
		652	scr_blank_line (l, 0, l.l, rstyle);
		653	l.l = 0;
		654	l.f = 0;
		655	}
		656	else
		657	scr_blank_screen_mem (l, rstyle);
		658	}
		659
		660	// now copy lines below the scroll region bottom to the
		661	// bottom of the screen again, so they look as if they
		662	// hadn't moved.
		663	for (int i = nrow; --i > row2; )
		664	{
		665	line_t &l1 = ROW(i - count);
		666	line_t &l2 = ROW(i);
		667
		668	::swap (l1, l2);
		669	l2.touch ();
		670	}
624		671
625	term_start = (term_start + count) % total_rows;	672	// move and/or clear selection, if any
626
627	if (selection.op && current_screen == selection.screen)	673	if (selection.op && current_screen == selection.screen)
628	{	674	{
629	selection.beg.row -= count;	675	selection.beg.row -= count;
630	selection.end.row -= count;	676	selection.end.row -= count;
631	selection.mark.row -= count;	677	selection.mark.row -= count;
632		678
633	if (selection.beg.row < -nsaved	679	if (selection.beg.row < top_row
634	|| selection.end.row < -nsaved	680	|| selection.end.row < top_row
635	|| selection.mark.row < -nsaved)	681	|| selection.mark.row < top_row)
636	{	682	{
637	CLEAR_ALL_SELECTION ();	683	CLEAR_ALL_SELECTION ();
638	selection.op = SELECTION_CLEAR;	684	selection.op = SELECTION_CLEAR;
639	}	685	}
640	}	686	}
641		687
642	for (int i = count; i--; )	688	// finally move the view window, if desired
643	{
644	// basically thi is a slightly optimized scr_blank_screen_mem
645	// it is worth the effort on slower machines
646	line_t &l = ROW(row2 - i);
647
648	scr_blank_line (l, 0, l.l, rstyle);
649
650	l.l = 0;
651	l.f = 0;
652	}
653
654	if (OPTION (Opt_scrollWithBuffer)	689	if (OPTION (Opt_scrollWithBuffer)
655	&& view_start != 0	690	&& view_start != 0
656	&& view_start != saveLines)	691	&& view_start != -saveLines)
657	scr_page (UP, count);	692	scr_page (UP, count);
		693
		694	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
		695	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
658	}	696	}
659	else	697	else
660	{	698	{
661	if (selection.op && current_screen == selection.screen)	699	if (selection.op && current_screen == selection.screen)
662	{	700	{
…		…
708	/* ------------------------------------------------------------------------- */	746	/* ------------------------------------------------------------------------- */
709	/*	747	/*
710	* Add text given in <str> of length <len> to screen struct	748	* Add text given in <str> of length <len> to screen struct
711	*/	749	*/
712	void	750	void
713	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)	751	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
714	{	752	{
715	if (len <= 0) /* sanity */	753	if (len <= 0) /* sanity */
716	return;	754	return;
717		755
718	unsigned char checksel;	756	unsigned char checksel;
…		…
724	ZERO_SCROLLBACK ();	762	ZERO_SCROLLBACK ();
725		763
726	if (minlines > 0)	764	if (minlines > 0)
727	{	765	{
728	minlines += screen.cur.row - screen.bscroll;	766	minlines += screen.cur.row - screen.bscroll;
		767	min_it (minlines, screen.cur.row - top_row);
729		768
730	if (minlines > 0	769	if (minlines > 0
731	&& screen.tscroll == 0	770	&& screen.tscroll == 0
732	&& screen.bscroll == nrow - 1)	771	&& screen.bscroll == nrow - 1)
733	{	772	{
…		…
738	}	777	}
739		778
740	#ifdef DEBUG_STRICT	779	#ifdef DEBUG_STRICT
741	assert (screen.cur.col < ncol);	780	assert (screen.cur.col < ncol);
742	assert (screen.cur.row < nrow	781	assert (screen.cur.row < nrow
743	&& screen.cur.row >= -nsaved);	782	&& screen.cur.row >= top_row);
744	#endif	783	#endif
745	int row = screen.cur.row;	784	int row = screen.cur.row;
746		785
747	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	786	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
748		787
…		…
794	CLEAR_SELECTION ();	833	CLEAR_SELECTION ();
795	}	834	}
796		835
797	if (screen.flags & Screen_WrapNext)	836	if (screen.flags & Screen_WrapNext)
798	{	837	{
799	max_it (line->l, ncol);
800	line->is_longer (1);
801
802	scr_do_wrap ();	838	scr_do_wrap ();
803		839
		840	line->l = ncol;
		841	line->is_longer (1);
		842
804	row = screen.cur.row;	843	row = screen.cur.row;
805	line = &ROW(row); /* _must_ refresh */	844	line = &ROW(row); /* _must_ refresh */
806	}	845	}
807		846
808	// some utf-8 decoders "decode" surrogate characters: let's fix this.	847	// some utf-8 decoders "decode" surrogate characters: let's fix this.
809	if (IN_RANGE_INC (c, 0xd800, 0xdfff))	848	if (IN_RANGE_INC (c, 0xd800, 0xdfff))
810	c = 0xfffd;	849	c = 0xfffd;
811		850
812	// rely on wcwidth to tell us the character width, at least for non-latin1	851	// rely on wcwidth to tell us the character width, do wcwidth before
813	// do wcwidth before further replacements, as wcwidth might return -1	852	// further replacements, as wcwidth might return -1 for the line
814	// for the line drawing characters below as they might be invalid in the current	853	// drawing characters below as they might be invalid in the current
815	// locale.	854	// locale.
816	int width = c < 0x100 ? 1 : wcwidth (c);	855	int width = WCWIDTH (c);
817		856
818	if (charsets [screen.charset] == '0') // DEC SPECIAL	857	if (charsets [screen.charset] == '0') // DEC SPECIAL
819	{	858	{
820	// vt100 special graphics and line drawing	859	// vt100 special graphics and line drawing
821	// 5f-7e standard vt100	860	// 5f-7e standard vt100
…		…
972	/*	1011	/*
973	* Process Backspace. Move back the cursor back a position, wrap if have to	1012	* Process Backspace. Move back the cursor back a position, wrap if have to
974	* XTERM_SEQ: CTRL-H	1013	* XTERM_SEQ: CTRL-H
975	*/	1014	*/
976	void	1015	void
977	rxvt_term::scr_backspace ()	1016	rxvt_term::scr_backspace () NOTHROW
978	{	1017	{
979	want_refresh = 1;	1018	want_refresh = 1;
980		1019
981	if (screen.cur.col == 0)	1020	if (screen.cur.col == 0)
982	{	1021	{
…		…
1000	* Process Horizontal Tab	1039	* Process Horizontal Tab
1001	* count: +ve = forward; -ve = backwards	1040	* count: +ve = forward; -ve = backwards
1002	* XTERM_SEQ: CTRL-I	1041	* XTERM_SEQ: CTRL-I
1003	*/	1042	*/
1004	void	1043	void
1005	rxvt_term::scr_tab (int count, bool ht)	1044	rxvt_term::scr_tab (int count, bool ht) NOTHROW
1006	{	1045	{
1007	int i, x;	1046	int i, x;
1008		1047
1009	want_refresh = 1;	1048	want_refresh = 1;
1010	i = x = screen.cur.col;	1049	i = x = screen.cur.col;
…		…
1075	* Process DEC Back Index	1114	* Process DEC Back Index
1076	* XTERM_SEQ: ESC 6	1115	* XTERM_SEQ: ESC 6
1077	* Move cursor left in row. If we're at the left boundary, shift everything	1116	* Move cursor left in row. If we're at the left boundary, shift everything
1078	* in that row right. Clear left column.	1117	* in that row right. Clear left column.
1079	*/	1118	*/
1080	#if ENABLE_FRILLS	1119	#if !ENABLE_MINIMAL
1081	void	1120	void
1082	rxvt_term::scr_backindex ()	1121	rxvt_term::scr_backindex () NOTHROW
1083	{	1122	{
1084	if (screen.cur.col > 0)	1123	if (screen.cur.col > 0)
1085	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1124	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1086	else	1125	else
1087	scr_insdel_chars (1, INSERT);	1126	scr_insdel_chars (1, INSERT);
…		…
1092	* Process DEC Forward Index	1131	* Process DEC Forward Index
1093	* XTERM_SEQ: ESC 9	1132	* XTERM_SEQ: ESC 9
1094	* Move cursor right in row. If we're at the right boundary, shift everything	1133	* Move cursor right in row. If we're at the right boundary, shift everything
1095	* in that row left. Clear right column.	1134	* in that row left. Clear right column.
1096	*/	1135	*/
1097	#if ENABLE_FRILLS	1136	#if !ENABLE_MINIMAL
1098	void	1137	void
1099	rxvt_term::scr_forwardindex ()	1138	rxvt_term::scr_forwardindex () NOTHROW
1100	{	1139	{
1101	if (screen.cur.col < ncol - 1)	1140	if (screen.cur.col < ncol - 1)
1102	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1141	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1103	else	1142	else
1104	{	1143	{
…		…
1117	/* ------------------------------------------------------------------------- */	1156	/* ------------------------------------------------------------------------- */
1118	/*	1157	/*
1119	* Goto Row/Column	1158	* Goto Row/Column
1120	*/	1159	*/
1121	void	1160	void
1122	rxvt_term::scr_gotorc (int row, int col, int relative)	1161	rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1123	{	1162	{
1124	want_refresh = 1;	1163	want_refresh = 1;
1125	ZERO_SCROLLBACK ();	1164	ZERO_SCROLLBACK ();
1126		1165
1127	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;	1166	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
…		…
1165	/* ------------------------------------------------------------------------- */	1204	/* ------------------------------------------------------------------------- */
1166	/*	1205	/*
1167	* direction should be UP or DN	1206	* direction should be UP or DN
1168	*/	1207	*/
1169	void	1208	void
1170	rxvt_term::scr_index (enum page_dirn direction)	1209	rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1171	{	1210	{
1172	int dirn;	1211	int dirn;
1173		1212
1174	want_refresh = 1;	1213	want_refresh = 1;
1175	ZERO_SCROLLBACK ();	1214	ZERO_SCROLLBACK ();
…		…
1194	* XTERM_SEQ: Clear line to right: ESC [ 0 K	1233	* XTERM_SEQ: Clear line to right: ESC [ 0 K
1195	* XTERM_SEQ: Clear line to left : ESC [ 1 K	1234	* XTERM_SEQ: Clear line to left : ESC [ 1 K
1196	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1235	* XTERM_SEQ: Clear whole line : ESC [ 2 K
1197	*/	1236	*/
1198	void	1237	void
1199	rxvt_term::scr_erase_line (int mode)	1238	rxvt_term::scr_erase_line (int mode) NOTHROW
1200	{	1239	{
1201	unsigned int col, num;	1240	unsigned int col, num;
1202		1241
1203	want_refresh = 1;	1242	want_refresh = 1;
1204	ZERO_SCROLLBACK ();	1243	ZERO_SCROLLBACK ();
…		…
1248	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1287	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1249	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1288	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1250	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1289	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1251	*/	1290	*/
1252	void	1291	void
1253	rxvt_term::scr_erase_screen (int mode)	1292	rxvt_term::scr_erase_screen (int mode) NOTHROW
1254	{	1293	{
1255	int num;	1294	int num;
1256	int32_t row;	1295	int32_t row;
1257	rend_t ren;	1296	rend_t ren;
1258	XGCValues gcvalue;	1297	XGCValues gcvalue;
…		…
1303	}	1342	}
1304	else	1343	else
1305	{	1344	{
1306	ren = rstyle & (RS_fgMask | RS_bgMask);	1345	ren = rstyle & (RS_fgMask | RS_bgMask);
1307	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1346	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1308	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1347	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1309	ERASE_ROWS (row, num);	1348	ERASE_ROWS (row, num);
1310	gcvalue.foreground = pix_colors[Color_fg];	1349	gcvalue.foreground = pix_colors[Color_fg];
1311	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1350	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1312	}	1351	}
1313		1352
1314	for (; num--; row++)	1353	for (; num--; row++)
1315	{	1354	{
1316	scr_blank_screen_mem (ROW(row), rstyle);	1355	scr_blank_screen_mem (ROW(row), rstyle);
1317	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1356	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1318	}	1357	}
1319	}	1358	}
1320		1359
1321	#if ENABLE_FRILLS	1360	#if !ENABLE_MINIMAL
1322	void	1361	void
1323	rxvt_term::scr_erase_savelines ()	1362	rxvt_term::scr_erase_savelines () NOTHROW
1324	{	1363	{
1325	want_refresh = 1;	1364	want_refresh = 1;
1326	ZERO_SCROLLBACK ();	1365	ZERO_SCROLLBACK ();
1327		1366
1328	nsaved = 0;	1367	top_row = 0;
1329	}	1368	}
1330	#endif	1369	#endif
1331		1370
1332	/* ------------------------------------------------------------------------- */	1371	/* ------------------------------------------------------------------------- */
1333	/*	1372	/*
1334	* Fill the screen with `E's	1373	* Fill the screen with `E's
1335	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1374	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1336	*/	1375	*/
1337	void	1376	void
1338	rxvt_term::scr_E ()	1377	rxvt_term::scr_E () NOTHROW
1339	{	1378	{
1340	rend_t fs;	1379	rend_t fs;
1341		1380
1342	want_refresh = 1;	1381	want_refresh = 1;
1343	ZERO_SCROLLBACK ();	1382	ZERO_SCROLLBACK ();
…		…
1364	/* ------------------------------------------------------------------------- */	1403	/* ------------------------------------------------------------------------- */
1365	/*	1404	/*
1366	* Insert/Delete <count> lines	1405	* Insert/Delete <count> lines
1367	*/	1406	*/
1368	void	1407	void
1369	rxvt_term::scr_insdel_lines (int count, int insdel)	1408	rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1370	{	1409	{
1371	int end;	1410	int end;
1372		1411
1373	ZERO_SCROLLBACK ();	1412	ZERO_SCROLLBACK ();
1374		1413
…		…
1394	/* ------------------------------------------------------------------------- */	1433	/* ------------------------------------------------------------------------- */
1395	/*	1434	/*
1396	* Insert/Delete <count> characters from the current position	1435	* Insert/Delete <count> characters from the current position
1397	*/	1436	*/
1398	void	1437	void
1399	rxvt_term::scr_insdel_chars (int count, int insdel)	1438	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1400	{	1439	{
1401	int col, row;	1440	int col, row;
1402	rend_t tr;	1441	rend_t tr;
1403		1442
1404	want_refresh = 1;	1443	want_refresh = 1;
…		…
1492	/*	1531	/*
1493	* Set the scrolling region	1532	* Set the scrolling region
1494	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1533	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1495	*/	1534	*/
1496	void	1535	void
1497	rxvt_term::scr_scroll_region (int top, int bot)	1536	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1498	{	1537	{
1499	max_it (top, 0);	1538	max_it (top, 0);
1500	min_it (bot, nrow - 1);	1539	min_it (bot, nrow - 1);
1501		1540
1502	if (top > bot)	1541	if (top > bot)
…		…
1512	* Make the cursor visible/invisible	1551	* Make the cursor visible/invisible
1513	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h	1552	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1514	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l	1553	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1515	*/	1554	*/
1516	void	1555	void
1517	rxvt_term::scr_cursor_visible (int mode)	1556	rxvt_term::scr_cursor_visible (int mode) NOTHROW
1518	{	1557	{
1519	want_refresh = 1;	1558	want_refresh = 1;
1520		1559
1521	if (mode)	1560	if (mode)
1522	screen.flags |= Screen_VisibleCursor;	1561	screen.flags |= Screen_VisibleCursor;
…		…
1529	* Set/unset automatic wrapping	1568	* Set/unset automatic wrapping
1530	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h	1569	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1531	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l	1570	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1532	*/	1571	*/
1533	void	1572	void
1534	rxvt_term::scr_autowrap (int mode)	1573	rxvt_term::scr_autowrap (int mode) NOTHROW
1535	{	1574	{
1536	if (mode)	1575	if (mode)
1537	screen.flags |= Screen_Autowrap;	1576	screen.flags |= Screen_Autowrap;
1538	else	1577	else
1539	screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);	1578	screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
…		…
1548	* and the cursor cannot be moved outside.	1587	* and the cursor cannot be moved outside.
1549	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h	1588	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1550	* XTERM_SEQ: Set Relative: ESC [ ? 6 l	1589	* XTERM_SEQ: Set Relative: ESC [ ? 6 l
1551	*/	1590	*/
1552	void	1591	void
1553	rxvt_term::scr_relative_origin (int mode)	1592	rxvt_term::scr_relative_origin (int mode) NOTHROW
1554	{	1593	{
1555	if (mode)	1594	if (mode)
1556	screen.flags |= Screen_Relative;	1595	screen.flags |= Screen_Relative;
1557	else	1596	else
1558	screen.flags &= ~Screen_Relative;	1597	screen.flags &= ~Screen_Relative;
…		…
1565	* Set insert/replace mode	1604	* Set insert/replace mode
1566	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h	1605	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1567	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l	1606	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1568	*/	1607	*/
1569	void	1608	void
1570	rxvt_term::scr_insert_mode (int mode)	1609	rxvt_term::scr_insert_mode (int mode) NOTHROW
1571	{	1610	{
1572	if (mode)	1611	if (mode)
1573	screen.flags |= Screen_Insert;	1612	screen.flags |= Screen_Insert;
1574	else	1613	else
1575	screen.flags &= ~Screen_Insert;	1614	screen.flags &= ~Screen_Insert;
…		…
1581	* XTERM_SEQ: Set tab at current column : ESC H	1620	* XTERM_SEQ: Set tab at current column : ESC H
1582	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g	1621	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1583	* XTERM_SEQ: Clear all tabs : ESC [ 3 g	1622	* XTERM_SEQ: Clear all tabs : ESC [ 3 g
1584	*/	1623	*/
1585	void	1624	void
1586	rxvt_term::scr_set_tab (int mode)	1625	rxvt_term::scr_set_tab (int mode) NOTHROW
1587	{	1626	{
1588	if (mode < 0)	1627	if (mode < 0)
1589	memset (tabs, 0, ncol * sizeof (char));	1628	memset (tabs, 0, ncol * sizeof (char));
1590	else if (screen.cur.col < ncol)	1629	else if (screen.cur.col < ncol)
1591	tabs [screen.cur.col] = !!mode;	1630	tabs [screen.cur.col] = !!mode;
…		…
1596	* Set reverse/normal video	1635	* Set reverse/normal video
1597	* XTERM_SEQ: Reverse video: ESC [ ? 5 h	1636	* XTERM_SEQ: Reverse video: ESC [ ? 5 h
1598	* XTERM_SEQ: Normal video : ESC [ ? 5 l	1637	* XTERM_SEQ: Normal video : ESC [ ? 5 l
1599	*/	1638	*/
1600	void	1639	void
1601	rxvt_term::scr_rvideo_mode (int mode)	1640	rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1602	{	1641	{
1603	XGCValues gcvalue;	1642	rvideo_mode = on;
1604		1643
		1644	#ifndef NO_BELL
		1645	on ^= rvideo_bell;
		1646	#endif
		1647
1605	if (rvideo != mode)	1648	if (rvideo_state != on)
1606	{	1649	{
1607	rvideo = mode;	1650	rvideo_state = on;
		1651
1608	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1652	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1609	#if XPM_BACKGROUND	1653	#if XPM_BACKGROUND
1610	if (bgPixmap.pixmap == None)	1654	if (bgPixmap.pixmap == None)
1611	#endif	1655	#endif
1612	#if TRANSPARENT	1656	#if TRANSPARENT
1613	if (! OPTION (Opt_transparent) || am_transparent == 0)	1657	if (!OPTION (Opt_transparent) || am_transparent == 0)
1614	#endif	1658	#endif
1615	XSetWindowBackground (display->display, vt,	1659	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1616	pix_colors[Color_bg]);
1617		1660
		1661	XGCValues gcvalue;
1618	gcvalue.foreground = pix_colors[Color_fg];	1662	gcvalue.foreground = pix_colors[Color_fg];
1619	gcvalue.background = pix_colors[Color_bg];	1663	gcvalue.background = pix_colors[Color_bg];
1620	XChangeGC (display->display, gc, GCBackground | GCForeground,	1664	XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1621	&gcvalue);	1665
1622	scr_clear ();	1666	scr_clear ();
1623	scr_touch (true);	1667	scr_touch (true);
1624	}	1668	}
1625	}	1669	}
1626		1670
…		…
1628	/*	1672	/*
1629	* Report current cursor position	1673	* Report current cursor position
1630	* XTERM_SEQ: Report position: ESC [ 6 n	1674	* XTERM_SEQ: Report position: ESC [ 6 n
1631	*/	1675	*/
1632	void	1676	void
1633	rxvt_term::scr_report_position ()	1677	rxvt_term::scr_report_position () NOTHROW
1634	{	1678	{
1635	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);	1679	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1636	}	1680	}
1637		1681
1638	/* ------------------------------------------------------------------------- *	1682	/* ------------------------------------------------------------------------- *
…		…
1641		1685
1642	/*	1686	/*
1643	* Set font style	1687	* Set font style
1644	*/	1688	*/
1645	void	1689	void
1646	rxvt_term::set_font_style ()	1690	rxvt_term::set_font_style () NOTHROW
1647	{	1691	{
1648	#if 0	1692	#if 0
1649	switch (charsets [screen.charset])	1693	switch (charsets [screen.charset])
1650	{	1694	{
1651	case '0': /* DEC Special Character & Line Drawing Set */	1695	case '0': /* DEC Special Character & Line Drawing Set */
…		…
1673	* XTERM_SEQ: Invoke G1 character set: CTRL-N	1717	* XTERM_SEQ: Invoke G1 character set: CTRL-N
1674	* XTERM_SEQ: Invoke G2 character set: ESC N	1718	* XTERM_SEQ: Invoke G2 character set: ESC N
1675	* XTERM_SEQ: Invoke G3 character set: ESC O	1719	* XTERM_SEQ: Invoke G3 character set: ESC O
1676	*/	1720	*/
1677	void	1721	void
1678	rxvt_term::scr_charset_choose (int set)	1722	rxvt_term::scr_charset_choose (int set) NOTHROW
1679	{	1723	{
1680	screen.charset = set;	1724	screen.charset = set;
1681	set_font_style ();	1725	set_font_style ();
1682	}	1726	}
1683		1727
…		…
1689	* XTERM_SEQ: Set G2 character set: ESC * <C>	1733	* XTERM_SEQ: Set G2 character set: ESC * <C>
1690	* XTERM_SEQ: Set G3 character set: ESC + <C>	1734	* XTERM_SEQ: Set G3 character set: ESC + <C>
1691	* See set_font_style for possible values for <C>	1735	* See set_font_style for possible values for <C>
1692	*/	1736	*/
1693	void	1737	void
1694	rxvt_term::scr_charset_set (int set, unsigned int ch)	1738	rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1695	{	1739	{
1696	charsets[set] = (unsigned char)ch;	1740	charsets[set] = (unsigned char)ch;
1697	set_font_style ();	1741	set_font_style ();
1698	}	1742	}
1699		1743
…		…
1704		1748
1705	/*	1749	/*
1706	* refresh matching text.	1750	* refresh matching text.
1707	*/	1751	*/
1708	bool	1752	bool
1709	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)	1753	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1710	{	1754	{
1711	bool found = false;	1755	bool found = false;
1712		1756
1713	for (int i = 0; i < nrow; i++)	1757	for (int i = 0; i < nrow; i++)
1714	{	1758	{
1715	int col = 0;
1716	rend_t *drp = drawn_buf[i].r;	1759	rend_t *drp = drawn_buf[i].r;
1717		1760
1718	for (; col < ncol; col++, drp++)	1761	for (int col = 0; col < ncol; col++, drp++)
1719	if ((*drp & mask) == value)	1762	if ((*drp & mask) == value)
1720	{	1763	{
1721	found = true;	1764	found = true;
1722	*drp = ~value;	1765	*drp = ~value;
1723	}	1766	}
…		…
1734	PART_END,	1777	PART_END,
1735	RC_COUNT	1778	RC_COUNT
1736	};	1779	};
1737		1780
1738	void	1781	void
1739	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)	1782	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1740	{	1783	{
1741	int i;	1784	int i;
1742	row_col_t rc[RC_COUNT];	1785	row_col_t rc[RC_COUNT];
1743		1786
1744	if (!drawn_buf) /* sanity check */	1787	if (!drawn_buf) /* sanity check */
…		…
1767	}	1810	}
1768		1811
1769	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1812	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1770	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1813	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1771		1814
		1815	num_scr_allow = 0;
		1816
1772	if (refresh)	1817	if (refresh)
1773	scr_refresh (SLOW_REFRESH);	1818	scr_refresh ();
1774	}	1819	}
1775		1820
1776	/* ------------------------------------------------------------------------- */	1821	/* ------------------------------------------------------------------------- */
1777	/*	1822	/*
1778	* Refresh the entire screen	1823	* Refresh the entire screen
1779	*/	1824	*/
1780	void	1825	void
1781	rxvt_term::scr_touch (bool refresh)	1826	rxvt_term::scr_touch (bool refresh) NOTHROW
1782	{	1827	{
1783	scr_expose (0, 0, width, height, refresh);	1828	scr_expose (0, 0, width, height, refresh);
1784	}	1829	}
1785		1830
1786	/* ------------------------------------------------------------------------- */	1831	/* ------------------------------------------------------------------------- */
1787	/*	1832	/*
1788	* Move the display so that the line represented by scrollbar value Y is at	1833	* Move the display so that the line represented by scrollbar value Y is at
1789	* the top of the screen	1834	* the top of the screen
1790	*/	1835	*/
1791	int	1836	void
1792	rxvt_term::scr_move_to (int y, int len)	1837	rxvt_term::scr_move_to (int y, int len) NOTHROW
1793	{	1838	{
1794	long p = 0;	1839	scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1795	unsigned int oldviewstart;
1796
1797	oldviewstart = view_start;
1798
1799	if (y < len)
1800	{
1801	p = (nrow + nsaved) * (len - y) / len;
1802	p -= (long) (nrow - 1);
1803	p = max (p, 0);
1804	}
1805
1806	view_start = (unsigned int)min (p, nsaved);
1807
1808	return scr_changeview (oldviewstart);
1809	}	1840	}
1810		1841
1811	/* ------------------------------------------------------------------------- */	1842	/* ------------------------------------------------------------------------- */
1812	/*	1843	/*
1813	* Page the screen up/down nlines	1844	* Page the screen up/down nlines
1814	* direction should be UP or DN	1845	* direction should be UP or DN
1815	*/	1846	*/
1816	int	1847	bool
1817	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1848	rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1818	{	1849	{
1819	int n;	1850	int new_view_start =
1820	unsigned int oldviewstart;
1821
1822	oldviewstart = view_start;
1823
1824	if (direction == UP)
1825	{
1826	n = view_start + nlines;
1827	view_start = min (n, nsaved);
1828	}
1829	else
1830	{
1831	n = view_start - nlines;	1851	direction == UP ? view_start - nlines
1832	view_start = max (n, 0);	1852	: view_start + nlines;
1833	}
1834		1853
1835	return scr_changeview (oldviewstart);	1854	return scr_changeview (new_view_start);
1836	}	1855	}
1837		1856
1838	int	1857	bool
1839	rxvt_term::scr_changeview (unsigned int oldviewstart)	1858	rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840	{	1859	{
		1860	clamp_it (new_view_start, top_row, 0);
		1861
1841	if (view_start != oldviewstart)	1862	if (new_view_start == view_start)
1842	{	1863	return false;
		1864
		1865	num_scr += new_view_start - view_start;
		1866	view_start = new_view_start;
		1867	want_refresh = 1;
		1868
1843	HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));	1869	HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844		1870
1845	want_refresh = 1;	1871	return true;
1846	num_scr -= (view_start - oldviewstart);
1847	}
1848
1849	return (int)view_start - (int)oldviewstart;
1850	}	1872	}
1851		1873
1852	/* ------------------------------------------------------------------------- */	1874	#ifndef NO_BELL
1853	void	1875	void
		1876	rxvt_term::bell_cb (time_watcher &w)
		1877	{
		1878	rvideo_bell = false;
		1879	scr_rvideo_mode (rvideo_mode);
		1880	}
		1881	#endif
		1882
		1883	/* ------------------------------------------------------------------------- */
		1884	void
1854	rxvt_term::scr_bell ()	1885	rxvt_term::scr_bell () NOTHROW
1855	{	1886	{
1856	#ifndef NO_BELL	1887	#ifndef NO_BELL
1857		1888
1858	# ifndef NO_MAPALERT	1889	# ifndef NO_MAPALERT
1859	# ifdef MAPALERT_OPTION	1890	# ifdef MAPALERT_OPTION
1860	if (OPTION (Opt_mapAlert))	1891	if (OPTION (Opt_mapAlert))
1861	# endif	1892	# endif
1862	XMapWindow (display->display, parent[0]);	1893	XMapWindow (dpy, parent[0]);
1863	# endif	1894	# endif
1864		1895
1865	if (OPTION (Opt_visualBell))	1896	if (OPTION (Opt_visualBell))
1866	{	1897	{
1867	scr_rvideo_mode (!rvideo); /* refresh also done */	1898	rvideo_bell = true;
		1899	scr_rvideo_mode (rvideo_mode);
1868	display->flush ();	1900	display->flush ();
1869	rxvt_usleep (VISUAL_BELL_DURATION);	1901
1870	scr_rvideo_mode (!rvideo); /* refresh also done */	1902	bell_ev.start (NOW + VISUAL_BELL_DURATION);
1871	}	1903	}
1872	else	1904	else
1873	XBell (display->display, 0);	1905	XBell (dpy, 0);
1874		1906
1875	#endif	1907	#endif
1876	}	1908	}
1877		1909
1878	/* ------------------------------------------------------------------------- */	1910	/* ------------------------------------------------------------------------- */
1879	/* ARGSUSED */	1911	/* ARGSUSED */
1880	void	1912	void
1881	rxvt_term::scr_printscreen (int fullhist)	1913	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1882	{	1914	{
1883	#ifdef PRINTPIPE	1915	#ifdef PRINTPIPE
1884	int nrows, row_start;	1916	int nrows, row_start;
1885	FILE *fd;	1917	FILE *fd;
1886		1918
1887	if ((fd = popen_printer ()) == NULL)	1919	if ((fd = popen_printer ()) == NULL)
1888	return;	1920	return;
1889		1921
1890	if (fullhist)	1922	if (fullhist)
1891	{	1923	{
1892	nrows = nrow + nsaved;	1924	nrows = nrow - top_row;
1893	row_start = -nsaved;	1925	row_start = top_row;
1894	}	1926	}
1895	else	1927	else
1896	{	1928	{
1897	nrows = nrow;	1929	nrows = nrow;
1898	row_start = -view_start;	1930	row_start = view_start;
1899	}	1931	}
1900		1932
1901	wctomb (0, 0);	1933	wctomb (0, 0);
1902		1934
1903	for (int r1 = 0; r1 < nrows; r1++)	1935	for (int r1 = 0; r1 < nrows; r1++)
…		…
1935	* Refresh the screen	1967	* Refresh the screen
1936	* drawn_text/drawn_rend contain the screen information before the update.	1968	* drawn_text/drawn_rend contain the screen information before the update.
1937	* screen.text/screen.rend contain what the screen will change to.	1969	* screen.text/screen.rend contain what the screen will change to.
1938	*/	1970	*/
1939	void	1971	void
1940	rxvt_term::scr_refresh (unsigned char refresh_type)	1972	rxvt_term::scr_refresh () NOTHROW
1941	{	1973	{
1942	unsigned char must_clear, /* use draw_string not draw_image_string */	1974	unsigned char have_bg,
1943	showcursor; /* show the cursor */	1975	showcursor; /* show the cursor */
1944	int16_t col, row, /* column/row we're processing */	1976	int16_t col, row, /* column/row we're processing */
1945	ocrow; /* old cursor row */	1977	ocrow; /* old cursor row */
1946	int i; /* tmp */	1978	int i; /* tmp */
1947	#ifndef NO_CURSORCOLOR	1979	#ifndef NO_CURSORCOLOR
…		…
1955	return;	1987	return;
1956		1988
1957	/*	1989	/*
1958	* A: set up vars	1990	* A: set up vars
1959	*/	1991	*/
1960	must_clear = 0;	1992	have_bg = 0;
1961	refresh_count = 0;	1993	refresh_count = 0;
1962		1994
1963	#if XPM_BACKGROUND	1995	#if XPM_BACKGROUND
1964	must_clear |= bgPixmap.pixmap != None;	1996	have_bg |= bgPixmap.pixmap != None;
1965	#endif	1997	#endif
1966	#if TRANSPARENT	1998	#if TRANSPARENT
1967	must_clear |= OPTION (Opt_transparent) && am_transparent;	1999	have_bg |= OPTION (Opt_transparent) && am_transparent;
1968	#endif	2000	#endif
1969	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2001	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1970		2002
1971	/*	2003	/*
1972	* B: reverse any characters which are selected	2004	* B: reverse any characters which are selected
…		…
2031		2063
2032	/* make sure no outline cursor is left around */	2064	/* make sure no outline cursor is left around */
2033	setoldcursor = 0;	2065	setoldcursor = 0;
2034	if (ocrow != -1)	2066	if (ocrow != -1)
2035	{	2067	{
2036	if (screen.cur.row + view_start != ocrow	2068	if (screen.cur.row - view_start != ocrow
2037	|| screen.cur.col != oldcursor.col)	2069	|| screen.cur.col != oldcursor.col)
2038	{	2070	{
2039	if (ocrow < nrow	2071	if (ocrow < nrow
2040	&& oldcursor.col < ncol)	2072	&& oldcursor.col < ncol)
2041	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);	2073	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
…		…
2049	else if (!focus)	2081	else if (!focus)
2050	setoldcursor = 1;	2082	setoldcursor = 1;
2051		2083
2052	if (setoldcursor)	2084	if (setoldcursor)
2053	{	2085	{
2054	if (screen.cur.row + view_start >= nrow)	2086	if (screen.cur.row - view_start >= nrow)
2055	oldcursor.row = -1;	2087	oldcursor.row = -1;
2056	else	2088	else
2057	{	2089	{
2058	oldcursor.row = screen.cur.row + view_start;	2090	oldcursor.row = screen.cur.row - view_start;
2059	oldcursor.col = screen.cur.col;	2091	oldcursor.col = screen.cur.col;
2060	}	2092	}
2061	}	2093	}
2062	}	2094	}
2063		2095
…		…
2069	#ifndef NO_SLOW_LINK_SUPPORT	2101	#ifndef NO_SLOW_LINK_SUPPORT
2070	/*	2102	/*
2071	* D: CopyArea pass - very useful for slower links	2103	* D: CopyArea pass - very useful for slower links
2072	* This has been deliberately kept simple.	2104	* This has been deliberately kept simple.
2073	*/	2105	*/
2074	i = num_scr;
2075	if (!display->is_local	2106	if (!display->is_local
2076	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr	2107	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2077	&& abs (num_scr) < nrow && !must_clear)	2108	&& abs (num_scr) < nrow && !have_bg)
2078	{	2109	{
2079	int16_t nits;	2110	int16_t nits;
		2111	int i = num_scr;
2080	int j;	2112	int j;
2081	int len, wlen;	2113	int len, wlen;
		2114	dLocal (int, num_scr);
2082		2115
2083	j = nrow;	2116	j = nrow;
2084	wlen = len = -1;	2117	wlen = len = -1;
2085	row = i > 0 ? 0 : j - 1;	2118	row = i > 0 ? 0 : j - 1;
		2119
2086	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2120	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2087	{	2121	{
2088	if (row + i >= 0 && row + i < nrow && row + i != ocrow)	2122	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2089	{	2123	{
2090	line_t s = ROW(row - view_start);	2124	line_t s = ROW(view_start + row);
2091	line_t d = drawn_buf[row];	2125	line_t d = drawn_buf[row];
2092	line_t d2 = drawn_buf[row + i];	2126	line_t d2 = drawn_buf[row + i];
2093		2127
2094	for (nits = 0, col = ncol; col--; )	2128	for (nits = 0, col = ncol; col--; )
2095	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])	2129	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
…		…
2111	wlen = row;	2145	wlen = row;
2112	continue;	2146	continue;
2113	}	2147	}
2114	}	2148	}
2115		2149
2116	if (len != -1)	2150	if (len >= 0)
2117	{	2151	{
2118	/* also comes here at end if needed because of >= above */	2152	/* also comes here at end if needed because of >= above */
2119	if (wlen < len)	2153	if (wlen < len)
2120	::swap (wlen, len);	2154	::swap (wlen, len);
2121		2155
		2156	XGCValues gcv;
		2157
		2158	gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2122	XCopyArea (display->display, vt, vt,	2159	XCopyArea (dpy, vt, vt,
2123	gc, 0, Row2Pixel (len + i),	2160	gc, 0, Row2Pixel (len + i),
2124	(unsigned int)this->width,	2161	(unsigned int)this->width,
2125	(unsigned int)Height2Pixel (wlen - len + 1),	2162	(unsigned int)Height2Pixel (wlen - len + 1),
2126	0, Row2Pixel (len));	2163	0, Row2Pixel (len));
		2164	gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
		2165
2127	len = -1;	2166	len = -1;
2128	}	2167	}
2129	}	2168	}
2130	}	2169	}
2131	#endif	2170	#endif
…		…
2133	/*	2172	/*
2134	* E: main pass across every character	2173	* E: main pass across every character
2135	*/	2174	*/
2136	for (row = 0; row < nrow; row++)	2175	for (row = 0; row < nrow; row++)
2137	{	2176	{
2138	text_t *stp = ROW(row - view_start).t;	2177	text_t *stp = ROW(view_start + row).t;
2139	rend_t *srp = ROW(row - view_start).r;	2178	rend_t *srp = ROW(view_start + row).r;
2140	text_t *dtp = drawn_buf[row].t;	2179	text_t *dtp = drawn_buf[row].t;
2141	rend_t *drp = drawn_buf[row].r;	2180	rend_t *drp = drawn_buf[row].r;
2142		2181
2143	/*	2182	/*
2144	* E2: OK, now the real pass	2183	* E2: OK, now the real pass
…		…
2187	count++;	2226	count++;
2188		2227
2189	if (stp[col] != dtp[col]	2228	if (stp[col] != dtp[col]
2190	|| !RS_SAME (srp[col], drp[col]))	2229	|| !RS_SAME (srp[col], drp[col]))
2191	{	2230	{
2192	if (must_clear && (i++ > count / 2))	2231	if (have_bg && (i++ > count / 2))
2193	break;	2232	break;
2194		2233
2195	dtp[col] = stp[col];	2234	dtp[col] = stp[col];
2196	drp[col] = rend;	2235	drp[col] = rend;
2197	i = 0;	2236	i = 0;
2198	}	2237	}
2199	else if (must_clear || (stp[col] != ' ' && ++i >= 16))	2238	else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2200	break;	2239	break;
2201	}	2240	}
2202		2241
2203	col--; /* went one too far. move back */	2242	col--; /* went one too far. move back */
2204	count -= i; /* dump any matching trailing chars */	2243	count -= i; /* dump any matching trailing chars */
…		…
2215		2254
2216	// only do special processing if any attributes are set, which is unlikely	2255	// only do special processing if any attributes are set, which is unlikely
2217	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2256	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2218	{	2257	{
2219	#if ENABLE_STYLES	2258	#if ENABLE_STYLES
2220	// force redraw after "careful" characters to avoid pixel droppings	2259	// "careful" (too wide) character handling
2221	if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2222	drp[col + 1] = ~srp[col + 1];
2223		2260
2224	// include previous careful character(s) if possible, looks nicer (best effort...)	2261	// include previous careful character(s) if possible, looks nicer (best effort...)
2225	while (text > stp	2262	while (text > stp
2226	&& srp[text - stp - 1] & RS_Careful	2263	&& srp[text - stp - 1] & RS_Careful
2227	&& RS_SAME (rend, srp[text - stp - 1]))	2264	&& RS_SAME (rend, srp[text - stp - 1]))
2228	text--, count++, xpixel -= fwidth;	2265	text--, count++, xpixel -= fwidth;
		2266
		2267	// force redraw after "careful" characters to avoid pixel droppings
		2268	for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
		2269	drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
		2270
		2271	// force redraw before "careful" characters to avoid pixel droppings
		2272	for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
		2273	drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2229	#endif	2274	#endif
2230		2275
2231	bool invert = rend & RS_RVid;	2276	bool invert = rend & RS_RVid;
2232		2277
2233	#ifndef NO_BOLD_UNDERLINE_REVERSE	2278	#ifndef NO_BOLD_UNDERLINE_REVERSE
…		…
2291	* Actually do the drawing of the string here	2336	* Actually do the drawing of the string here
2292	*/	2337	*/
2293	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2338	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2294		2339
2295	if (back == fore)	2340	if (back == fore)
2296	font->clear_rect (*drawable, xpixel, ypixel,	2341	font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2297	fwidth * count, fheight,
2298	back);
2299	else if (back == Color_bg)	2342	else if (back == Color_bg && have_bg)
2300	{	2343	{
2301	if (must_clear)	2344	// this is very ugly, maybe push it into ->draw?
2302	{
2303	CLEAR_CHARS (xpixel, ypixel, count);
2304		2345
2305	for (i = 0; i < count; i++) /* don't draw empty strings */	2346	for (i = 0; i < count; i++) /* don't draw empty strings */
2306	if (text[i] != ' ')	2347	if (text[i] != ' ')
2307	{	2348	{
2308	font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);	2349	font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2309	break;	2350	goto did_clear;
2310	}
2311	}	2351	}
2312	else	2352
2313	font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);	2353	CLEAR_CHARS (xpixel, ypixel, count);
		2354	did_clear: ;
2314	}	2355	}
2315	else	2356	else
2316	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2357	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2317		2358
2318	if (rend & RS_Uline && font->descent > 1 && fore != back)	2359	if (rend & RS_Uline && font->descent > 1 && fore != back)
2319	{	2360	{
2320	#if ENABLE_FRILLS	2361	#if ENABLE_FRILLS
2321	if (ISSET_PIXCOLOR (Color_underline))	2362	if (ISSET_PIXCOLOR (Color_underline))
2322	XSetForeground (display->display, gc, pix_colors[Color_underline]);	2363	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2323	else	2364	else
2324	#endif	2365	#endif
2325	XSetForeground (display->display, gc, pix_colors[fore]);	2366	XSetForeground (dpy, gc, pix_colors[fore]);
2326		2367
2327	XDrawLine (display->display, drawBuffer, gc,	2368	XDrawLine (dpy, drawBuffer, gc,
2328	xpixel, ypixel + font->ascent + 1,	2369	xpixel, ypixel + font->ascent + 1,
2329	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2370	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2330	}	2371	}
2331	} /* for (col....) */	2372	} /* for (col....) */
2332	} /* for (row....) */	2373	} /* for (row....) */
…		…
2365	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)	2406	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2366	cursorwidth++;	2407	cursorwidth++;
2367		2408
2368	#ifndef NO_CURSORCOLOR	2409	#ifndef NO_CURSORCOLOR
2369	if (ISSET_PIXCOLOR (Color_cursor))	2410	if (ISSET_PIXCOLOR (Color_cursor))
2370	XSetForeground (display->display, gc, pix_colors[Color_cursor]);	2411	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2371	#endif	2412	#endif
2372		2413
2373	XDrawRectangle (display->display, drawBuffer, gc,	2414	XDrawRectangle (dpy, drawBuffer, gc,
2374	Col2Pixel (col),	2415	Col2Pixel (col),
2375	Row2Pixel (oldcursor.row),	2416	Row2Pixel (oldcursor.row),
2376	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2417	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2377	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2418	(unsigned int) (Height2Pixel (1) - lineSpace - 1));
2378	}	2419	}
…		…
2386	num_scr = 0;	2427	num_scr = 0;
2387	num_scr_allow = 1;	2428	num_scr_allow = 1;
2388	}	2429	}
2389		2430
2390	void	2431	void
2391	rxvt_term::scr_remap_chars (line_t &l)	2432	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2392	{	2433	{
2393	if (!l.t)	2434	if (!l.t)
2394	return;	2435	return;
2395		2436
2396	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant	2437	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
…		…
2398	for (int i = ncol; i--; )	2439	for (int i = ncol; i--; )
2399	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2440	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2400	}	2441	}
2401		2442
2402	void	2443	void
2403	rxvt_term::scr_remap_chars ()	2444	rxvt_term::scr_remap_chars () NOTHROW
2404	{	2445	{
2405	for (int i = total_rows; i--; )	2446	for (int i = total_rows; i--; )
2406	scr_remap_chars (row_buf [i]);	2447	scr_remap_chars (row_buf [i]);
2407		2448
2408	for (int i = nrow; i--; )	2449	for (int i = nrow; i--; )
…		…
2411	scr_remap_chars (swap_buf [i]);	2452	scr_remap_chars (swap_buf [i]);
2412	}	2453	}
2413	}	2454	}
2414		2455
2415	void	2456	void
2416	rxvt_term::scr_recolour ()	2457	rxvt_term::scr_recolour () NOTHROW
2417	{	2458	{
2418	if (1	2459	if (1
2419	#if TRANSPARENT	2460	#if TRANSPARENT
2420	&& !am_transparent	2461	&& !am_transparent
2421	#endif	2462	#endif
2422	#if XPM_BACKGROUND	2463	#if XPM_BACKGROUND
2423	&& !bgPixmap.pixmap	2464	&& !bgPixmap.pixmap
2424	#endif	2465	#endif
2425	)	2466	)
2426	{	2467	{
2427	XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);	2468	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2428	XClearWindow (display->display, parent[0]);	2469	XClearWindow (dpy, parent[0]);
2429	XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);	2470	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2430	#if HAVE_SCROLLBARS	2471	#if HAVE_SCROLLBARS
2431	if (scrollBar.win)	2472	if (scrollBar.win)
2432	{	2473	{
2433	XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);	2474	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2434	scrollBar.setIdle ();	2475	scrollBar.setIdle ();
2435	scrollbar_show (0);	2476	scrollbar_show (0);
2436	}	2477	}
2437	#endif	2478	#endif
2438	}	2479	}
…		…
2442	want_refresh = 1;	2483	want_refresh = 1;
2443	}	2484	}
2444		2485
2445	/* ------------------------------------------------------------------------- */	2486	/* ------------------------------------------------------------------------- */
2446	void	2487	void
2447	rxvt_term::scr_clear (bool really)	2488	rxvt_term::scr_clear (bool really) NOTHROW
2448	{	2489	{
2449	if (!mapped)	2490	if (!mapped)
2450	return;	2491	return;
2451		2492
2452	num_scr_allow = 0;	2493	num_scr_allow = 0;
2453	want_refresh = 1;	2494	want_refresh = 1;
2454		2495
2455	if (really)	2496	if (really)
2456	XClearWindow (display->display, vt);	2497	XClearWindow (dpy, vt);
2457	}	2498	}
2458		2499
2459	void	2500	void
2460	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)	2501	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2461	{	2502	{
2462	int view_end = -view_start + nrow;	2503	int view_end = view_start + nrow;
2463	int row, col;	2504	int row, col;
2464		2505
2465	for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++)	2506	for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2466	{	2507	{
2467	text_t *stp = ROW(row).t;	2508	text_t *stp = ROW(row).t;
2468	rend_t *srp = ROW(row).r;	2509	rend_t *srp = ROW(row).r;
2469		2510
2470	for (col = beg_col; col < end_col; col++)	2511	for (col = beg_col; col < end_col; col++)
…		…
2477	srp[col] ^= rstyle2;	2518	srp[col] ^= rstyle2;
2478	}	2519	}
2479	}	2520	}
2480		2521
2481	void	2522	void
2482	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)	2523	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2483	{	2524	{
2484	int view_end = -view_start + nrow;	2525	int view_end = view_start + nrow;
2485	int row, col;	2526	int row, col;
2486		2527
2487	if (beg_row >= -view_start)	2528	if (beg_row >= view_start)
2488	{	2529	{
2489	col = beg_col;	2530	col = beg_col;
2490	row = beg_row;	2531	row = beg_row;
2491	}	2532	}
2492	else	2533	else
2493	{	2534	{
2494	col = 0;	2535	col = 0;
2495	row = -view_start;	2536	row = view_start;
2496	}	2537	}
2497		2538
2498	for (; row < min (end_row, view_end); row++, col = 0)	2539	for (; row < min (end_row, view_end); row++, col = 0)
2499	for (rend_t *srp = ROW(row).r; col < ncol; col++)	2540	for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500	srp[col] ^= rstyle;	2541	srp[col] ^= rstyle;
…		…
2504	srp[col] ^= rstyle;	2545	srp[col] ^= rstyle;
2505	}	2546	}
2506		2547
2507	/* ------------------------------------------------------------------------- */	2548	/* ------------------------------------------------------------------------- */
2508	void	2549	void
2509	rxvt_term::scr_reverse_selection ()	2550	rxvt_term::scr_reverse_selection () NOTHROW
2510	{	2551	{
2511	if (selection.op	2552	if (selection.op
2512	&& current_screen == selection.screen	2553	&& current_screen == selection.screen
2513	&& selection.end.row >= -view_start)	2554	&& selection.end.row >= view_start)
2514	{	2555	{
2515	#if ENABLE_FRILLS	2556	#if !ENABLE_MINIMAL
2516	if (selection.rect)	2557	if (selection.rect)
2517	scr_xor_rect (selection.beg.row, selection.beg.col,	2558	scr_xor_rect (selection.beg.row, selection.beg.col,
2518	selection.end.row, selection.end.col,	2559	selection.end.row, selection.end.col,
2519	RS_RVid, RS_RVid | RS_Uline);	2560	RS_RVid, RS_RVid | RS_Uline);
2520	else	2561	else
…		…
2530	* Dump the whole scrollback and screen to the passed filedescriptor. The	2571	* Dump the whole scrollback and screen to the passed filedescriptor. The
2531	* invoking routine must close the fd.	2572	* invoking routine must close the fd.
2532	*/	2573	*/
2533	#if 0	2574	#if 0
2534	void	2575	void
2535	rxvt_term::scr_dump (int fd)	2576	rxvt_term::scr_dump (int fd) NOTHROW
2536	{	2577	{
2537	int row, wrote;	2578	int row, wrote;
2538	unsigned int width, towrite;	2579	unsigned int width, towrite;
2539	char r1[] = "\n";	2580	char r1[] = "\n";
2540		2581
…		…
2559		2600
2560	/* ------------------------------------------------------------------------- *	2601	/* ------------------------------------------------------------------------- *
2561	* CHARACTER SELECTION *	2602	* CHARACTER SELECTION *
2562	* ------------------------------------------------------------------------- */	2603	* ------------------------------------------------------------------------- */
2563	void	2604	void
2564	rxvt_term::selection_check (int check_more)	2605	rxvt_term::selection_check (int check_more) NOTHROW
2565	{	2606	{
2566	row_col_t pos;	2607	row_col_t pos;
2567		2608
2568	if (!selection.op)	2609	if (!selection.op)
2569	return;	2610	return;
2570		2611
2571	pos.row = pos.col = 0;	2612	pos.row = pos.col = 0;
2572	if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)	2613	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2573	|| !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)	2614	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2574	|| !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)	2615	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2575	|| (check_more == 1	2616	|| (check_more == 1
2576	&& current_screen == selection.screen	2617	&& current_screen == selection.screen
2577	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2618	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2578	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2619	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
2579	|| (check_more == 2	2620	|| (check_more == 2
…		…
2590	/* ------------------------------------------------------------------------- */	2631	/* ------------------------------------------------------------------------- */
2591	/*	2632	/*
2592	* Paste a selection direct to the command fd	2633	* Paste a selection direct to the command fd
2593	*/	2634	*/
2594	void	2635	void
2595	rxvt_term::paste (char *data, unsigned int len)	2636	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2596	{	2637	{
2597	/* convert normal newline chars into common keyboard Return key sequence */	2638	/* convert normal newline chars into common keyboard Return key sequence */
2598	for (unsigned int i = 0; i < len; i++)	2639	for (unsigned int i = 0; i < len; i++)
2599	if (data[i] == C0_LF)	2640	if (data[i] == C0_LF)
2600	data[i] = C0_CR;	2641	data[i] = C0_CR;
…		…
2606	/*	2647	/*
2607	* Respond to a notification that a primary selection has been sent	2648	* Respond to a notification that a primary selection has been sent
2608	* EXT: SelectionNotify	2649	* EXT: SelectionNotify
2609	*/	2650	*/
2610	void	2651	void
2611	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)	2652	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2612	{	2653	{
2613	if (prop == None) /* check for failed XConvertSelection */	2654	if (prop == None) /* check for failed XConvertSelection */
2614	{	2655	{
2615	if ((selection_type & Sel_CompoundText))	2656	if ((selection_type & Sel_CompoundText))
2616	{	2657	{
…		…
2636	}	2677	}
2637		2678
2638	unsigned long bytes_after;	2679	unsigned long bytes_after;
2639	XTextProperty ct;	2680	XTextProperty ct;
2640		2681
2641	if (XGetWindowProperty (display->display, win, prop,	2682	if (XGetWindowProperty (dpy, win, prop,
2642	0, PROP_SIZE / 4,	2683	0, PROP_SIZE / 4,
2643	delete_prop, AnyPropertyType,	2684	delete_prop, AnyPropertyType,
2644	&ct.encoding, &ct.format,	2685	&ct.encoding, &ct.format,
2645	&ct.nitems, &bytes_after,	2686	&ct.nitems, &bytes_after,
2646	&ct.value) != Success)	2687	&ct.value) != Success)
…		…
2655	if (bytes_after)	2696	if (bytes_after)
2656	{	2697	{
2657	// fetch and append remaining data	2698	// fetch and append remaining data
2658	XTextProperty ct2;	2699	XTextProperty ct2;
2659		2700
2660	if (XGetWindowProperty (display->display, win, prop,	2701	if (XGetWindowProperty (dpy, win, prop,
2661	ct.nitems / 4, (bytes_after + 3) / 4,	2702	ct.nitems / 4, (bytes_after + 3) / 4,
2662	delete_prop, AnyPropertyType,	2703	delete_prop, AnyPropertyType,
2663	&ct2.encoding, &ct2.format,	2704	&ct2.encoding, &ct2.format,
2664	&ct2.nitems, &bytes_after,	2705	&ct2.nitems, &bytes_after,
2665	&ct2.value) != Success)	2706	&ct2.value) != Success)
…		…
2678		2719
2679	if (ct.encoding == xa[XA_INCR])	2720	if (ct.encoding == xa[XA_INCR])
2680	{	2721	{
2681	// INCR selection, start handshake	2722	// INCR selection, start handshake
2682	if (!delete_prop)	2723	if (!delete_prop)
2683	XDeleteProperty (display->display, win, prop);	2724	XDeleteProperty (dpy, win, prop);
2684		2725
2685	selection_wait = Sel_incr;	2726	selection_wait = Sel_incr;
2686	incr_buf_fill = 0;	2727	incr_buf_fill = 0;
2687	incr_ev.start (NOW + 10);	2728	incr_ev.start (NOW + 10);
2688		2729
…		…
2735	}	2776	}
2736		2777
2737	char **cl;	2778	char **cl;
2738	int cr;	2779	int cr;
2739		2780
2740	#if ENABLE_FRILLS	2781	#if !ENABLE_MINIMAL
2741	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it	2782	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2742	// so recode it manually	2783	// so recode it manually
2743	if (ct.encoding == xa[XA_UTF8_STRING])	2784	if (ct.encoding == xa[XA_UTF8_STRING])
2744	{	2785	{
2745	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);	2786	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
…		…
2749	paste (s, strlen (s));	2790	paste (s, strlen (s));
2750	free (s);	2791	free (s);
2751	}	2792	}
2752	else	2793	else
2753	#endif	2794	#endif
2754	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0	2795	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2755	&& cl)	2796	&& cl)
2756	{	2797	{
2757	for (int i = 0; i < cr; i++)	2798	for (int i = 0; i < cr; i++)
2758	paste (cl[i], strlen (cl[i]));	2799	paste (cl[i], strlen (cl[i]));
2759		2800
…		…
2768	if (selection_wait == Sel_normal)	2809	if (selection_wait == Sel_normal)
2769	selection_wait = Sel_none;	2810	selection_wait = Sel_none;
2770	}	2811	}
2771		2812
2772	void	2813	void
2773	rxvt_term::incr_cb (time_watcher &w)	2814	rxvt_term::incr_cb (time_watcher &w) NOTHROW
2774	{	2815	{
2775	selection_wait = Sel_none;	2816	selection_wait = Sel_none;
2776		2817
2777	incr_buf_size = 0;	2818	incr_buf_size = 0;
2778	free (incr_buf);	2819	free (incr_buf);
2779		2820
2780	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");	2821	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2781	}	2822	}
2782		2823
2783	void	2824	void
2784	rxvt_term::selection_property (Window win, Atom prop)	2825	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2785	{	2826	{
2786	if (prop == None || selection_wait != Sel_incr)	2827	if (prop == None || selection_wait != Sel_incr)
2787	return;	2828	return;
2788		2829
2789	selection_paste (win, prop, true);	2830	selection_paste (win, prop, true);
…		…
2798	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()	2839	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2799	* will auto fallback to CUT_BUFFER0	2840	* will auto fallback to CUT_BUFFER0
2800	* EXT: button 2 release	2841	* EXT: button 2 release
2801	*/	2842	*/
2802	void	2843	void
2803	rxvt_term::selection_request (Time tm, int x, int y)	2844	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2804	{	2845	{
2805	if (x < 0 || x >= width || y < 0 || y >= height)	2846	if (selection.text && selnum == Sel_Primary)
2806	return; /* outside window */
2807
2808	if (selection.text)
2809	{ /* internal selection */	2847	{ /* internal selection */
2810	char *str = rxvt_wcstombs (selection.text, selection.len);	2848	char *str = rxvt_wcstombs (selection.text, selection.len);
2811	paste (str, strlen (str));	2849	paste (str, strlen (str));
2812	free (str);	2850	free (str);
2813	return;	2851	return;
2814	}	2852	}
2815	else	2853	else
2816	{	2854	{
2817	int i;
2818
2819	selection_request_time = tm;	2855	selection_request_time = tm;
2820	selection_wait = Sel_normal;	2856	selection_wait = Sel_normal;
2821		2857
2822	for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2823	{
2824	#if X_HAVE_UTF8_STRING	2858	#if X_HAVE_UTF8_STRING
2825	selection_type = Sel_UTF8String;	2859	selection_type = Sel_UTF8String;
2826	if (selection_request_other (xa[XA_UTF8_STRING], i))	2860	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2827	return;	2861	return;
2828	#else	2862	#else
2829	selection_type = Sel_CompoundText;	2863	selection_type = Sel_CompoundText;
2830	if (selection_request_other (xa[XA_COMPOUND_TEXT], i))	2864	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2831	return;	2865	return;
2832	#endif	2866	#endif
2833	}
2834	}	2867	}
2835		2868
2836	selection_wait = Sel_none; /* don't loop in selection_paste () */	2869	selection_wait = Sel_none; /* don't loop in selection_paste () */
2837	selection_paste (display->root, XA_CUT_BUFFER0, false);	2870	selection_paste (display->root, XA_CUT_BUFFER0, false);
2838	}	2871	}
2839		2872
2840	int	2873	int
2841	rxvt_term::selection_request_other (Atom target, int selnum)	2874	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2842	{	2875	{
2843	Atom sel;	2876	Atom sel;
2844		2877
2845	selection_type |= selnum;	2878	selection_type |= selnum;
2846		2879
…		…
2849	else if (selnum == Sel_Secondary)	2882	else if (selnum == Sel_Secondary)
2850	sel = XA_SECONDARY;	2883	sel = XA_SECONDARY;
2851	else	2884	else
2852	sel = xa[XA_CLIPBOARD];	2885	sel = xa[XA_CLIPBOARD];
2853		2886
2854	if (XGetSelectionOwner (display->display, sel) != None)	2887	if (XGetSelectionOwner (dpy, sel) != None)
2855	{	2888	{
2856	XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],	2889	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2857	vt, selection_request_time);	2890	vt, selection_request_time);
2858	return 1;	2891	return 1;
2859	}	2892	}
2860		2893
2861	return 0;	2894	return 0;
…		…
2865	/*	2898	/*
2866	* Clear all selected text	2899	* Clear all selected text
2867	* EXT: SelectionClear	2900	* EXT: SelectionClear
2868	*/	2901	*/
2869	void	2902	void
2870	rxvt_term::selection_clear ()	2903	rxvt_term::selection_clear () NOTHROW
2871	{	2904	{
2872	want_refresh = 1;	2905	want_refresh = 1;
2873	free (selection.text);	2906	free (selection.text);
2874	selection.text = NULL;	2907	selection.text = NULL;
2875	selection.len = 0;	2908	selection.len = 0;
…		…
2924		2957
2925	int end_col;	2958	int end_col;
2926		2959
2927	for (; row <= selection.end.row; row++, col = 0)	2960	for (; row <= selection.end.row; row++, col = 0)
2928	{	2961	{
2929	#if ENABLE_FRILLS	2962	#if !ENABLE_MINIMAL
2930	if (selection.rect)	2963	if (selection.rect)
2931	{	2964	{
2932	col = selection.beg.col;	2965	col = selection.beg.col;
2933	end_col = ncol + 1;	2966	end_col = ncol + 1;
2934	}	2967	}
…		…
2937	end_col = ROW(row).l;	2970	end_col = ROW(row).l;
2938		2971
2939	col = max (col, 0);	2972	col = max (col, 0);
2940		2973
2941	if (row == selection.end.row	2974	if (row == selection.end.row
2942	#if ENABLE_FRILLS	2975	#if !ENABLE_MINIMAL
2943	|| selection.rect	2976	|| selection.rect
2944	#endif	2977	#endif
2945	)	2978	)
2946	min_it (end_col, selection.end.col);	2979	min_it (end_col, selection.end.col);
2947		2980
…		…
2970	#endif	3003	#endif
2971	else	3004	else
2972	new_selection_text[ofs++] = *t++;	3005	new_selection_text[ofs++] = *t++;
2973	}	3006	}
2974		3007
2975	#if ENABLE_FRILLS	3008	#if !ENABLE_MINIMAL
2976	if (selection.rect)	3009	if (selection.rect)
2977	{	3010	{
2978	while (ofs	3011	while (ofs
2979	&& new_selection_text[ofs - 1] != C0_LF	3012	&& new_selection_text[ofs - 1] != C0_LF
2980	&& unicode::is_space (new_selection_text[ofs - 1]))	3013	&& unicode::is_space (new_selection_text[ofs - 1]))
…		…
3010		3043
3011	selection_grab (tm);	3044	selection_grab (tm);
3012	}	3045	}
3013		3046
3014	bool	3047	bool
3015	rxvt_term::selection_grab (Time tm)	3048	rxvt_term::selection_grab (Time tm) NOTHROW
3016	{	3049	{
3017	selection_time = tm;	3050	selection_time = tm;
3018		3051
3019	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);	3052	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3020	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)	3053	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3021	{	3054	{
3022	display->set_selection_owner (this);	3055	display->set_selection_owner (this);
3023	return true;	3056	return true;
3024	}	3057	}
3025	else	3058	else
		3059	{
		3060	selection_clear ();
3026	return false;	3061	return false;
		3062	}
3027		3063
3028	#if 0	3064	#if 0
3029	XTextProperty ct;	3065	XTextProperty ct;
3030		3066
3031	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)	3067	if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3032	{	3068	{
3033	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);	3069	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3034	XFree (ct.value);	3070	XFree (ct.value);
3035	}	3071	}
3036	#endif	3072	#endif
…		…
3040	/*	3076	/*
3041	* Mark or select text based upon number of clicks: 1, 2, or 3	3077	* Mark or select text based upon number of clicks: 1, 2, or 3
3042	* EXT: button 1 press	3078	* EXT: button 1 press
3043	*/	3079	*/
3044	void	3080	void
3045	rxvt_term::selection_click (int clicks, int x, int y)	3081	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3046	{	3082	{
3047	clicks = ((clicks - 1) % 3) + 1;	3083	clicks = ((clicks - 1) % 3) + 1;
3048	selection.clicks = clicks; /* save clicks so extend will work */	3084	selection.clicks = clicks; /* save clicks so extend will work */
3049		3085
		3086	if (clicks == 2 && !selection.rect
		3087	&& HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
		3088	{
		3089	MEvent.clicks = 1; // what a mess
		3090	selection.screen = current_screen;
		3091	selection.op = SELECTION_CONT;
		3092	return;
		3093	}
		3094
3050	selection_start_colrow (Pixel2Col (x), Pixel2Row (y));	3095	selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3051		3096
3052	if (clicks == 2 || clicks == 3)	3097	if (clicks == 2 || clicks == 3)
3053	selection_extend_colrow (selection.mark.col,	3098	selection_extend_colrow (selection.mark.col,
3054	selection.mark.row + view_start,	3099	selection.mark.row - view_start,
3055	0, /* button 3 */	3100	0, /* button 3 */
3056	1, /* button press */	3101	1, /* button press */
3057	0); /* click change */	3102	0); /* click change */
3058	}	3103	}
3059		3104
3060	/* ------------------------------------------------------------------------- */	3105	/* ------------------------------------------------------------------------- */
3061	/*	3106	/*
3062	* Mark a selection at the specified col/row	3107	* Mark a selection at the specified col/row
3063	*/	3108	*/
3064	void	3109	void
3065	rxvt_term::selection_start_colrow (int col, int row)	3110	rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3066	{	3111	{
3067	want_refresh = 1;	3112	want_refresh = 1;
3068		3113
3069	selection.mark.row = row - view_start;	3114	selection.mark.row = row + view_start;
3070	selection.mark.col = col;	3115	selection.mark.col = col;
3071		3116
3072	selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);	3117	selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3073	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);	3118	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3074		3119
3075	while (selection.mark.col > 0	3120	while (selection.mark.col > 0
3076	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)	3121	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3077	--selection.mark.col;	3122	--selection.mark.col;
…		…
3096	#define DELIMIT_TEXT(x) \	3141	#define DELIMIT_TEXT(x) \
3097	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3142	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3098	#define DELIMIT_REND(x) 1	3143	#define DELIMIT_REND(x) 1
3099		3144
3100	void	3145	void
3101	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)	3146	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3102	{	3147	{
3103	int col, row, dirnadd, tcol, trow, w1, w2;	3148	int col, row, dirnadd, tcol, trow, w1, w2;
3104	row_col_t bound;	3149	row_col_t bound;
3105	text_t *stp;	3150	text_t *stp;
3106	rend_t *srp;	3151	rend_t *srp;
3107		3152
3108	if (dirn == UP)	3153	if (dirn == UP)
3109	{	3154	{
3110	bound.row = - nsaved - 1;	3155	bound.row = top_row - 1;
3111	bound.col = 0;	3156	bound.col = 0;
3112	dirnadd = -1;	3157	dirnadd = -1;
3113	}	3158	}
3114	else	3159	else
3115	{	3160	{
…		…
3180	* flag == 0 ==> button 1	3225	* flag == 0 ==> button 1
3181	* flag == 1 ==> button 3 press	3226	* flag == 1 ==> button 3 press
3182	* flag == 2 ==> button 3 motion	3227	* flag == 2 ==> button 3 motion
3183	*/	3228	*/
3184	void	3229	void
3185	rxvt_term::selection_extend (int x, int y, int flag)	3230	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3186	{	3231	{
3187	int col = clamp (Pixel2Col (x), 0, ncol);	3232	int col = clamp (Pixel2Col (x), 0, ncol);
3188	int row = clamp (Pixel2Row (y), 0, nrow - 1);	3233	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3189		3234
3190	/*	3235	/*
…		…
3193	* select nothing. Otherwise, if we're to the right of the mark, you have to	3238	* select nothing. Otherwise, if we're to the right of the mark, you have to
3194	* be _past_ a character for it to be selected.	3239	* be _past_ a character for it to be selected.
3195	*/	3240	*/
3196	if (((selection.clicks % 3) == 1) && !flag	3241	if (((selection.clicks % 3) == 1) && !flag
3197	&& (col == selection.mark.col	3242	&& (col == selection.mark.col
3198	&& (row == selection.mark.row + view_start)))	3243	&& (row == selection.mark.row - view_start)))
3199	{	3244	{
3200	/* select nothing */	3245	/* select nothing */
3201	selection.beg.row = selection.end.row = 0;	3246	selection.beg.row = selection.end.row = 0;
3202	selection.beg.col = selection.end.col = 0;	3247	selection.beg.col = selection.end.col = 0;
3203	selection.clicks = 4;	3248	selection.clicks = 4;
…		…
3216	/* ------------------------------------------------------------------------- */	3261	/* ------------------------------------------------------------------------- */
3217	/*	3262	/*
3218	* Extend the selection to the specified col/row	3263	* Extend the selection to the specified col/row
3219	*/	3264	*/
3220	void	3265	void
3221	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)	3266	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3222	{	3267	{
3223	row_col_t pos;	3268	row_col_t pos;
3224	enum {	3269	enum {
3225	LEFT, RIGHT	3270	LEFT, RIGHT
3226	} closeto = RIGHT;	3271	} closeto = RIGHT;
…		…
3258	selection.beg.col = selection.end.col = selection.mark.col;	3303	selection.beg.col = selection.end.col = selection.mark.col;
3259	selection.beg.row = selection.end.row = selection.mark.row;	3304	selection.beg.row = selection.end.row = selection.mark.row;
3260	}	3305	}
3261		3306
3262	pos.col = col;	3307	pos.col = col;
3263	pos.row = row - view_start;	3308	pos.row = view_start + row;
3264		3309
3265	/*	3310	/*
3266	* This is mainly xterm style selection with a couple of differences, mainly	3311	* This is mainly xterm style selection with a couple of differences, mainly
3267	* in the way button3 drag extension works.	3312	* in the way button3 drag extension works.
3268	* We're either doing: button1 drag; button3 press; or button3 drag	3313	* We're either doing: button1 drag; button3 press; or button3 drag
…		…
3329		3374
3330	if (selection.clicks == 1)	3375	if (selection.clicks == 1)
3331	{	3376	{
3332	if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN	3377	if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3333	&& !ROW(selection.beg.row).is_longer ()	3378	&& !ROW(selection.beg.row).is_longer ()
3334	#if ENABLE_FRILLS	3379	#if !ENABLE_MINIMAL
3335	&& !selection.rect	3380	&& !selection.rect
3336	#endif	3381	#endif
3337	)	3382	)
3338	selection.beg.col = ncol;	3383	selection.beg.col = ncol;
3339		3384
3340	if (	3385	if (
3341	selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN	3386	selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3342	&& !ROW(selection.end.row).is_longer ()	3387	&& !ROW(selection.end.row).is_longer ()
3343	#if ENABLE_FRILLS	3388	#if !ENABLE_MINIMAL
3344	&& !selection.rect	3389	&& !selection.rect
3345	#endif	3390	#endif
3346	)	3391	)
3347	selection.end.col = ncol;	3392	selection.end.col = ncol;
3348	}	3393	}
3349	else if (selection.clicks == 2)	3394	else if (selection.clicks == 2)
3350	{	3395	{
3351	if (ROWCOL_IS_AFTER (selection.end, selection.beg))	3396	if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3352	selection.end.col--;	3397	selection.end.col--;
3353		3398
3354	if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3355	{
3356	selection_delimit_word (UP, &selection.beg, &selection.beg);	3399	selection_delimit_word (UP, &selection.beg, &selection.beg);
3357	selection_delimit_word (DN, &selection.end, &selection.end);	3400	selection_delimit_word (DN, &selection.end, &selection.end);
3358	}
3359	}	3401	}
3360	else if (selection.clicks == 3)	3402	else if (selection.clicks == 3)
3361	{	3403	{
3362	#if ENABLE_FRILLS	3404	#if ENABLE_FRILLS
3363	if (OPTION (Opt_tripleclickwords))	3405	if (OPTION (Opt_tripleclickwords))
…		…
3368	{	3410	{
3369	if (!ROW(end_row).is_longer ())	3411	if (!ROW(end_row).is_longer ())
3370	{	3412	{
3371	selection.end.row = end_row;	3413	selection.end.row = end_row;
3372	selection.end.col = ROW(end_row).l;	3414	selection.end.col = ROW(end_row).l;
		3415	# if !ENABLE_MINIMAL
3373	selection_remove_trailing_spaces ();	3416	selection_remove_trailing_spaces ();
		3417	# endif
3374	break;	3418	break;
3375	}	3419	}
3376	}	3420	}
3377	}	3421	}
3378	else	3422	else
…		…
3407	selection.mark.row = selection.beg.row;	3451	selection.mark.row = selection.beg.row;
3408	selection.mark.col = selection.beg.col;	3452	selection.mark.col = selection.beg.col;
3409	}	3453	}
3410	}	3454	}
3411		3455
3412	#if ENABLE_FRILLS	3456	#if !ENABLE_MINIMAL
3413	if (selection.rect && selection.beg.col > selection.end.col)	3457	if (selection.rect && selection.beg.col > selection.end.col)
3414	::swap (selection.beg.col, selection.end.col);	3458	::swap (selection.beg.col, selection.end.col);
3415	#endif	3459	#endif
3416	}	3460	}
3417		3461
3418	#if ENABLE_FRILLS	3462	#if !ENABLE_MINIMAL
3419	void	3463	void
3420	rxvt_term::selection_remove_trailing_spaces ()	3464	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3421	{	3465	{
3422	int32_t end_col, end_row;	3466	int32_t end_col, end_row;
3423	text_t *stp;	3467	text_t *stp;
3424		3468
3425	end_col = selection.end.col;	3469	end_col = selection.end.col;
…		…
3463	/*	3507	/*
3464	* Double click on button 3 when already selected	3508	* Double click on button 3 when already selected
3465	* EXT: button 3 double click	3509	* EXT: button 3 double click
3466	*/	3510	*/
3467	void	3511	void
3468	rxvt_term::selection_rotate (int x, int y)	3512	rxvt_term::selection_rotate (int x, int y) NOTHROW
3469	{	3513	{
3470	selection.clicks = selection.clicks % 3 + 1;	3514	selection.clicks = selection.clicks % 3 + 1;
3471	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3515	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3472	}	3516	}
3473		3517
…		…
3475	/*	3519	/*
3476	* Respond to a request for our current selection	3520	* Respond to a request for our current selection
3477	* EXT: SelectionRequest	3521	* EXT: SelectionRequest
3478	*/	3522	*/
3479	void	3523	void
3480	rxvt_term::selection_send (const XSelectionRequestEvent &rq)	3524	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3481	{	3525	{
3482	XSelectionEvent ev;	3526	XSelectionEvent ev;
3483	dDisp;
3484		3527
3485	ev.type = SelectionNotify;	3528	ev.type = SelectionNotify;
3486	ev.property = None;	3529	ev.property = None;
3487	ev.display = rq.display;	3530	ev.display = rq.display;
3488	ev.requestor = rq.requestor;	3531	ev.requestor = rq.requestor;
…		…
3502	*target++ = xa[XA_COMPOUND_TEXT];	3545	*target++ = xa[XA_COMPOUND_TEXT];
3503	#if X_HAVE_UTF8_STRING	3546	#if X_HAVE_UTF8_STRING
3504	*target++ = xa[XA_UTF8_STRING];	3547	*target++ = xa[XA_UTF8_STRING];
3505	#endif	3548	#endif
3506		3549
3507	XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,	3550	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3508	32, PropModeReplace,	3551	32, PropModeReplace,
3509	(unsigned char *)target_list, target - target_list);	3552	(unsigned char *)target_list, target - target_list);
3510	ev.property = rq.property;	3553	ev.property = rq.property;
3511	}	3554	}
3512	#if TODO // TODO	3555	#if TODO // TODO
…		…
3515	/* TODO: Handle MULTIPLE */	3558	/* TODO: Handle MULTIPLE */
3516	}	3559	}
3517	#endif	3560	#endif
3518	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3561	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3519	{	3562	{
3520	XChangeProperty (disp, rq.requestor, rq.property, rq.target,	3563	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3521	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3564	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3522	ev.property = rq.property;	3565	ev.property = rq.property;
3523	}	3566	}
3524	else if (rq.target == XA_STRING	3567	else if (rq.target == XA_STRING
3525	|| rq.target == xa[XA_TEXT]	3568	|| rq.target == xa[XA_TEXT]
…		…
3549	style = enc_string;	3592	style = enc_string;
3550	else if (target == xa[XA_TEXT])	3593	else if (target == xa[XA_TEXT])
3551	style = enc_text;	3594	style = enc_text;
3552	else if (target == xa[XA_COMPOUND_TEXT])	3595	else if (target == xa[XA_COMPOUND_TEXT])
3553	style = enc_compound_text;	3596	style = enc_compound_text;
3554	#if ENABLE_FRILLS	3597	#if !ENABLE_MINIMAL
3555	else if (target == xa[XA_UTF8_STRING])	3598	else if (target == xa[XA_UTF8_STRING])
3556	style = enc_utf8;	3599	style = enc_utf8;
3557	#endif	3600	#endif
3558	else	3601	else
3559	{	3602	{
…		…
3570	{	3613	{
3571	cl = L"";	3614	cl = L"";
3572	selectlen = 0;	3615	selectlen = 0;
3573	}	3616	}
3574		3617
3575	#if ENABLE_FRILLS	3618	#if !ENABLE_MINIMAL
3576	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it	3619	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3577	// so recode it manually	3620	// so recode it manually
3578	if (style == enc_utf8)	3621	if (style == enc_utf8)
3579	{	3622	{
3580	freect = 1;	3623	freect = 1;
…		…
3583	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);	3626	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3584	ct.nitems = strlen ((char *)ct.value);	3627	ct.nitems = strlen ((char *)ct.value);
3585	}	3628	}
3586	else	3629	else
3587	#endif	3630	#endif
3588	if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)	3631	if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3589	freect = 1;	3632	freect = 1;
3590	else	3633	else
3591	{	3634	{
3592	/* if we failed to convert then send it raw */	3635	/* if we failed to convert then send it raw */
3593	ct.value = (unsigned char *)cl;	3636	ct.value = (unsigned char *)cl;
3594	ct.nitems = selectlen;	3637	ct.nitems = selectlen;
3595	ct.encoding = target;	3638	ct.encoding = target;
3596	}	3639	}
3597		3640
3598	XChangeProperty (disp, rq.requestor, rq.property,	3641	XChangeProperty (dpy, rq.requestor, rq.property,
3599	ct.encoding, 8, PropModeReplace,	3642	ct.encoding, 8, PropModeReplace,
3600	ct.value, (int)ct.nitems);	3643	ct.value, (int)ct.nitems);
3601	ev.property = rq.property;	3644	ev.property = rq.property;
3602		3645
3603	if (freect)	3646	if (freect)
3604	XFree (ct.value);	3647	XFree (ct.value);
3605	}	3648	}
3606		3649
3607	XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);	3650	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3608	}	3651	}
3609		3652
3610	/* ------------------------------------------------------------------------- *	3653	/* ------------------------------------------------------------------------- *
3611	* MOUSE ROUTINES *	3654	* MOUSE ROUTINES *
3612	* ------------------------------------------------------------------------- */	3655	* ------------------------------------------------------------------------- */
3613		3656
3614	/*	3657	/*
3615	* return col/row values corresponding to x/y pixel values	3658	* return col/row values corresponding to x/y pixel values
3616	*/	3659	*/
3617	void	3660	void
3618	rxvt_term::pixel_position (int *x, int *y)	3661	rxvt_term::pixel_position (int *x, int *y) NOTHROW
3619	{	3662	{
3620	*x = Pixel2Col (*x);	3663	*x = Pixel2Col (*x);
3621	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */	3664	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3622	*y = Pixel2Row (*y);	3665	*y = Pixel2Row (*y);
3623	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */	3666	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3624	}	3667	}
3625		3668
3626	/* ------------------------------------------------------------------------- */	3669	/* ------------------------------------------------------------------------- */
3627	#ifdef USE_XIM	3670	#ifdef USE_XIM
3628	void	3671	void
3629	rxvt_term::im_set_position (XPoint &pos)	3672	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3630	{	3673	{
3631	XWindowAttributes xwa;	3674	XWindowAttributes xwa;
3632		3675
3633	XGetWindowAttributes (display->display, vt, &xwa);	3676	XGetWindowAttributes (dpy, vt, &xwa);
3634		3677
3635	pos.x = xwa.x + Col2Pixel (screen.cur.col);	3678	pos.x = xwa.x + Col2Pixel (screen.cur.col);
3636	pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;	3679	pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3637	}	3680	}
3638	#endif	3681	#endif
3639		3682
3640	#if ENABLE_OVERLAY	3683	#if ENABLE_OVERLAY
3641	void	3684	void
3642	rxvt_term::scr_overlay_new (int x, int y, int w, int h)	3685	rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3643	{	3686	{
3644	if (nrow < 1 || ncol < 1)	3687	if (nrow < 1 || ncol < 1)
3645	return;	3688	return;
3646		3689
3647	want_refresh = 1;	3690	want_refresh = 1;
…		…
3692	*rp = r;	3735	*rp = r;
3693	}	3736	}
3694	}	3737	}
3695		3738
3696	void	3739	void
3697	rxvt_term::scr_overlay_off ()	3740	rxvt_term::scr_overlay_off () NOTHROW
3698	{	3741	{
3699	if (!ov_text)	3742	if (!ov_text)
3700	return;	3743	return;
3701		3744
3702	want_refresh = 1;	3745	want_refresh = 1;
…		…
3710	delete [] ov_text; ov_text = 0;	3753	delete [] ov_text; ov_text = 0;
3711	delete [] ov_rend; ov_rend = 0;	3754	delete [] ov_rend; ov_rend = 0;
3712	}	3755	}
3713		3756
3714	void	3757	void
3715	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)	3758	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3716	{	3759	{
3717	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3760	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3718	return;	3761	return;
3719		3762
3720	x++, y++;	3763	x++, y++;
…		…
3722	ov_text[y][x] = text;	3765	ov_text[y][x] = text;
3723	ov_rend[y][x] = rend;	3766	ov_rend[y][x] = rend;
3724	}	3767	}
3725		3768
3726	void	3769	void
3727	rxvt_term::scr_overlay_set (int x, int y, const char *s)	3770	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3728	{	3771	{
3729	while (*s)	3772	while (*s)
3730	scr_overlay_set (x++, y, *s++);	3773	scr_overlay_set (x++, y, *s++);
3731	}	3774	}
3732		3775
3733	void	3776	void
3734	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)	3777	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3735	{	3778	{
3736	while (*s)	3779	while (*s)
3737	{	3780	{
3738	text_t t = *s++;	3781	text_t t = *s++;
3739	int width = wcwidth (t);	3782	int width = WCWIDTH (t);
3740		3783
3741	while (width--)	3784	while (width--)
3742	{	3785	{
3743	scr_overlay_set (x++, y, t);	3786	scr_overlay_set (x++, y, t);
3744	t = NOCHAR;	3787	t = NOCHAR;
3745	}	3788	}
3746	}	3789	}
3747	}	3790	}
3748		3791
3749	void	3792	void
3750	rxvt_term::scr_swap_overlay ()	3793	rxvt_term::scr_swap_overlay () NOTHROW
3751	{	3794	{
3752	if (!ov_text)	3795	if (!ov_text)
3753	return;	3796	return;
3754		3797
3755	// swap screen mem with overlay	3798	// swap screen mem with overlay
3756	for (int y = ov_h; y--; )	3799	for (int y = ov_h; y--; )
3757	{	3800	{
3758	text_t *t1 = ov_text[y];	3801	text_t *t1 = ov_text[y];
3759	rend_t *r1 = ov_rend[y];	3802	rend_t *r1 = ov_rend[y];
3760		3803
3761	text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;	3804	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3762	rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;	3805	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3763		3806
3764	for (int x = ov_w; x--; )	3807	for (int x = ov_w; x--; )
3765	{	3808	{
3766	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3809	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3767	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3810	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