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.230 by root, Sun Jan 15 16:47:29 2006 UTC vs.
Revision 1.255 by root, Mon Jan 30 04:27:17 2006 UTC

…		…
93	*/	93	*/
94	#define drawBuffer vt	94	#define drawBuffer vt
95		95
96	#define CLEAR_ROWS(row, num) \	96	#define CLEAR_ROWS(row, num) \
97	if (mapped) \	97	if (mapped) \
98	XClearArea (display->display, drawBuffer, 0, \	98	XClearArea (xdisp, drawBuffer, 0, \
99	Row2Pixel (row), (unsigned int)width, \	99	Row2Pixel (row), (unsigned int)width, \
100	(unsigned int)Height2Pixel (num), False)	100	(unsigned int)Height2Pixel (num), False)
101		101
102	#define CLEAR_CHARS(x, y, num) \	102	#define CLEAR_CHARS(x, y, num) \
103	if (mapped) \	103	if (mapped) \
104	XClearArea (display->display, drawBuffer, x, y, \	104	XClearArea (xdisp, drawBuffer, x, y, \
105	(unsigned int)Width2Pixel (num), \	105	(unsigned int)Width2Pixel (num), \
106	(unsigned int)Height2Pixel (1), False)	106	(unsigned int)Height2Pixel (1), False)
107		107
108	#define ERASE_ROWS(row, num) \	108	#define ERASE_ROWS(row, num) \
109	XFillRectangle (display->display, drawBuffer, gc, \	109	XFillRectangle (xdisp, drawBuffer, gc, \
110	0, Row2Pixel (row), \	110	0, Row2Pixel (row), \
111	(unsigned int)width, \	111	(unsigned int)width, \
112	(unsigned int)Height2Pixel (num))	112	(unsigned int)Height2Pixel (num))
113		113
114	/* ------------------------------------------------------------------------- *	114	/* ------------------------------------------------------------------------- *
115	* SCREEN `COMMON' ROUTINES *	115	* SCREEN `COMMON' ROUTINES *
116	* ------------------------------------------------------------------------- */	116	* ------------------------------------------------------------------------- */
117		117
118	/* Fill part/all of a line with blanks. */	118	/* Fill part/all of a line with blanks. */
119	void	119	void
120	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)	120	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121	{	121	{
122	if (!l.t)	122	if (!l.t)
123	{	123	{
124	lalloc (l);	124	lalloc (l);
125	col = 0;	125	col = 0;
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	top_row--;	187	top_row--;
…		…
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	top_row = 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
…		…
281	int pend = MOD (term_start + top_row , 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 (top_row)	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;
…		…
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 = top_row; 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;
…		…
617	&& row1 == 0	628	&& row1 == 0
618	&& (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))	629	&& (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
619	{	630	{
620	top_row = max (top_row - count, -saveLines);	631	top_row = max (top_row - count, -saveLines);
621		632
622	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
623
624	// scroll everything up 'count' lines	633	// scroll everything up 'count' lines
625	term_start = (term_start + count) % total_rows;	634	term_start = (term_start + count) % total_rows;
626		635
		636	// sever bottommost line
627	{	637	{
628	// severe bottommost scrolled line
629	line_t &l = ROW(row2 - count);	638	line_t &l = ROW(row2 - count);
		639	l.is_longer (0);
630	l.touch ();	640	l.touch ();
631	l.is_longer (0);
632	}	641	}
633		642
634	// erase newly scorlled-in lines	643	// erase newly scrolled-in lines
635	for (int i = count; i; --i )	644	for (int i = count; i--; )
636	{	645	{
637	// basically this is a slightly optimized scr_blank_screen_mem
638	// it is worth the effort on slower machines
639	line_t &l = ROW(nrow - i);	646	line_t &l = ROW(nrow - 1 - i);
640		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_bgMask))
		651	{
641	scr_blank_line (l, 0, l.l, rstyle);	652	scr_blank_line (l, 0, l.l, rstyle);
642
643	l.l = 0;	653	l.l = 0;
644	l.f = 0;	654	l.f = 0;
		655	}
		656	else
		657	scr_blank_screen_mem (l, rstyle);
645	}	658	}
646		659
647	// now copy lines below the scroll region bottom to the	660	// now copy lines below the scroll region bottom to the
648	// bottom of the screen again, so they look as if they	661	// bottom of the screen again, so they look as if they
649	// hadn't moved.	662	// hadn't moved.
…		…
675	// finally move the view window, if desired	688	// finally move the view window, if desired
676	if (OPTION (Opt_scrollWithBuffer)	689	if (OPTION (Opt_scrollWithBuffer)
677	&& view_start != 0	690	&& view_start != 0
678	&& view_start != -saveLines)	691	&& view_start != -saveLines)
679	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));
680	}	696	}
681	else	697	else
682	{	698	{
683	if (selection.op && current_screen == selection.screen)	699	if (selection.op && current_screen == selection.screen)
684	{	700	{
…		…
730	/* ------------------------------------------------------------------------- */	746	/* ------------------------------------------------------------------------- */
731	/*	747	/*
732	* Add text given in <str> of length <len> to screen struct	748	* Add text given in <str> of length <len> to screen struct
733	*/	749	*/
734	void	750	void
735	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
736	{	752	{
737	if (len <= 0) /* sanity */	753	if (len <= 0) /* sanity */
738	return;	754	return;
739		755
740	unsigned char checksel;	756	unsigned char checksel;
…		…
746	ZERO_SCROLLBACK ();	762	ZERO_SCROLLBACK ();
747		763
748	if (minlines > 0)	764	if (minlines > 0)
749	{	765	{
750	minlines += screen.cur.row - screen.bscroll;	766	minlines += screen.cur.row - screen.bscroll;
		767	min_it (minlines, screen.cur.row - top_row);
751		768
752	if (minlines > 0	769	if (minlines > 0
753	&& screen.tscroll == 0	770	&& screen.tscroll == 0
754	&& screen.bscroll == nrow - 1)	771	&& screen.bscroll == nrow - 1)
755	{	772	{
…		…
816	CLEAR_SELECTION ();	833	CLEAR_SELECTION ();
817	}	834	}
818		835
819	if (screen.flags & Screen_WrapNext)	836	if (screen.flags & Screen_WrapNext)
820	{	837	{
821	max_it (line->l, ncol);
822	line->is_longer (1);
823
824	scr_do_wrap ();	838	scr_do_wrap ();
825		839
		840	line->l = ncol;
		841	line->is_longer (1);
		842
826	row = screen.cur.row;	843	row = screen.cur.row;
827	line = &ROW(row); /* _must_ refresh */	844	line = &ROW(row); /* _must_ refresh */
828	}	845	}
829		846
830	// some utf-8 decoders "decode" surrogate characters: let's fix this.	847	// some utf-8 decoders "decode" surrogate characters: let's fix this.
831	if (IN_RANGE_INC (c, 0xd800, 0xdfff))	848	if (IN_RANGE_INC (c, 0xd800, 0xdfff))
832	c = 0xfffd;	849	c = 0xfffd;
833		850
834	// 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
835	// do wcwidth before further replacements, as wcwidth might return -1	852	// further replacements, as wcwidth might return -1 for the line
836	// 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
837	// locale.	854	// locale.
838	int width = c < 0x100 ? 1 : wcwidth (c);	855	int width = WCWIDTH (c);
839		856
840	if (charsets [screen.charset] == '0') // DEC SPECIAL	857	if (charsets [screen.charset] == '0') // DEC SPECIAL
841	{	858	{
842	// vt100 special graphics and line drawing	859	// vt100 special graphics and line drawing
843	// 5f-7e standard vt100	860	// 5f-7e standard vt100
…		…
994	/*	1011	/*
995	* 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
996	* XTERM_SEQ: CTRL-H	1013	* XTERM_SEQ: CTRL-H
997	*/	1014	*/
998	void	1015	void
999	rxvt_term::scr_backspace ()	1016	rxvt_term::scr_backspace () NOTHROW
1000	{	1017	{
1001	want_refresh = 1;	1018	want_refresh = 1;
1002		1019
1003	if (screen.cur.col == 0)	1020	if (screen.cur.col == 0)
1004	{	1021	{
…		…
1022	* Process Horizontal Tab	1039	* Process Horizontal Tab
1023	* count: +ve = forward; -ve = backwards	1040	* count: +ve = forward; -ve = backwards
1024	* XTERM_SEQ: CTRL-I	1041	* XTERM_SEQ: CTRL-I
1025	*/	1042	*/
1026	void	1043	void
1027	rxvt_term::scr_tab (int count, bool ht)	1044	rxvt_term::scr_tab (int count, bool ht) NOTHROW
1028	{	1045	{
1029	int i, x;	1046	int i, x;
1030		1047
1031	want_refresh = 1;	1048	want_refresh = 1;
1032	i = x = screen.cur.col;	1049	i = x = screen.cur.col;
…		…
1099	* 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
1100	* in that row right. Clear left column.	1117	* in that row right. Clear left column.
1101	*/	1118	*/
1102	#if ENABLE_FRILLS	1119	#if ENABLE_FRILLS
1103	void	1120	void
1104	rxvt_term::scr_backindex ()	1121	rxvt_term::scr_backindex () NOTHROW
1105	{	1122	{
1106	if (screen.cur.col > 0)	1123	if (screen.cur.col > 0)
1107	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1124	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1108	else	1125	else
1109	scr_insdel_chars (1, INSERT);	1126	scr_insdel_chars (1, INSERT);
…		…
1116	* 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
1117	* in that row left. Clear right column.	1134	* in that row left. Clear right column.
1118	*/	1135	*/
1119	#if ENABLE_FRILLS	1136	#if ENABLE_FRILLS
1120	void	1137	void
1121	rxvt_term::scr_forwardindex ()	1138	rxvt_term::scr_forwardindex () NOTHROW
1122	{	1139	{
1123	if (screen.cur.col < ncol - 1)	1140	if (screen.cur.col < ncol - 1)
1124	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1141	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1125	else	1142	else
1126	{	1143	{
…		…
1139	/* ------------------------------------------------------------------------- */	1156	/* ------------------------------------------------------------------------- */
1140	/*	1157	/*
1141	* Goto Row/Column	1158	* Goto Row/Column
1142	*/	1159	*/
1143	void	1160	void
1144	rxvt_term::scr_gotorc (int row, int col, int relative)	1161	rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1145	{	1162	{
1146	want_refresh = 1;	1163	want_refresh = 1;
1147	ZERO_SCROLLBACK ();	1164	ZERO_SCROLLBACK ();
1148		1165
1149	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;	1166	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
…		…
1187	/* ------------------------------------------------------------------------- */	1204	/* ------------------------------------------------------------------------- */
1188	/*	1205	/*
1189	* direction should be UP or DN	1206	* direction should be UP or DN
1190	*/	1207	*/
1191	void	1208	void
1192	rxvt_term::scr_index (enum page_dirn direction)	1209	rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1193	{	1210	{
1194	int dirn;	1211	int dirn;
1195		1212
1196	want_refresh = 1;	1213	want_refresh = 1;
1197	ZERO_SCROLLBACK ();	1214	ZERO_SCROLLBACK ();
…		…
1216	* XTERM_SEQ: Clear line to right: ESC [ 0 K	1233	* XTERM_SEQ: Clear line to right: ESC [ 0 K
1217	* XTERM_SEQ: Clear line to left : ESC [ 1 K	1234	* XTERM_SEQ: Clear line to left : ESC [ 1 K
1218	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1235	* XTERM_SEQ: Clear whole line : ESC [ 2 K
1219	*/	1236	*/
1220	void	1237	void
1221	rxvt_term::scr_erase_line (int mode)	1238	rxvt_term::scr_erase_line (int mode) NOTHROW
1222	{	1239	{
1223	unsigned int col, num;	1240	unsigned int col, num;
1224		1241
1225	want_refresh = 1;	1242	want_refresh = 1;
1226	ZERO_SCROLLBACK ();	1243	ZERO_SCROLLBACK ();
…		…
1270	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1287	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1271	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1288	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1272	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1289	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1273	*/	1290	*/
1274	void	1291	void
1275	rxvt_term::scr_erase_screen (int mode)	1292	rxvt_term::scr_erase_screen (int mode) NOTHROW
1276	{	1293	{
1277	int num;	1294	int num;
1278	int32_t row;	1295	int32_t row;
1279	rend_t ren;	1296	rend_t ren;
1280	XGCValues gcvalue;	1297	XGCValues gcvalue;
…		…
1325	}	1342	}
1326	else	1343	else
1327	{	1344	{
1328	ren = rstyle & (RS_fgMask | RS_bgMask);	1345	ren = rstyle & (RS_fgMask | RS_bgMask);
1329	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1346	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1330	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1347	XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1331	ERASE_ROWS (row, num);	1348	ERASE_ROWS (row, num);
1332	gcvalue.foreground = pix_colors[Color_fg];	1349	gcvalue.foreground = pix_colors[Color_fg];
1333	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1350	XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1334	}	1351	}
1335		1352
1336	for (; num--; row++)	1353	for (; num--; row++)
1337	{	1354	{
1338	scr_blank_screen_mem (ROW(row), rstyle);	1355	scr_blank_screen_mem (ROW(row), rstyle);
…		…
1340	}	1357	}
1341	}	1358	}
1342		1359
1343	#if ENABLE_FRILLS	1360	#if ENABLE_FRILLS
1344	void	1361	void
1345	rxvt_term::scr_erase_savelines ()	1362	rxvt_term::scr_erase_savelines () NOTHROW
1346	{	1363	{
1347	want_refresh = 1;	1364	want_refresh = 1;
1348	ZERO_SCROLLBACK ();	1365	ZERO_SCROLLBACK ();
1349		1366
1350	top_row = 0;	1367	top_row = 0;
…		…
1355	/*	1372	/*
1356	* Fill the screen with `E's	1373	* Fill the screen with `E's
1357	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1374	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1358	*/	1375	*/
1359	void	1376	void
1360	rxvt_term::scr_E ()	1377	rxvt_term::scr_E () NOTHROW
1361	{	1378	{
1362	rend_t fs;	1379	rend_t fs;
1363		1380
1364	want_refresh = 1;	1381	want_refresh = 1;
1365	ZERO_SCROLLBACK ();	1382	ZERO_SCROLLBACK ();
…		…
1386	/* ------------------------------------------------------------------------- */	1403	/* ------------------------------------------------------------------------- */
1387	/*	1404	/*
1388	* Insert/Delete <count> lines	1405	* Insert/Delete <count> lines
1389	*/	1406	*/
1390	void	1407	void
1391	rxvt_term::scr_insdel_lines (int count, int insdel)	1408	rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1392	{	1409	{
1393	int end;	1410	int end;
1394		1411
1395	ZERO_SCROLLBACK ();	1412	ZERO_SCROLLBACK ();
1396		1413
…		…
1416	/* ------------------------------------------------------------------------- */	1433	/* ------------------------------------------------------------------------- */
1417	/*	1434	/*
1418	* Insert/Delete <count> characters from the current position	1435	* Insert/Delete <count> characters from the current position
1419	*/	1436	*/
1420	void	1437	void
1421	rxvt_term::scr_insdel_chars (int count, int insdel)	1438	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1422	{	1439	{
1423	int col, row;	1440	int col, row;
1424	rend_t tr;	1441	rend_t tr;
1425		1442
1426	want_refresh = 1;	1443	want_refresh = 1;
…		…
1514	/*	1531	/*
1515	* Set the scrolling region	1532	* Set the scrolling region
1516	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1533	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1517	*/	1534	*/
1518	void	1535	void
1519	rxvt_term::scr_scroll_region (int top, int bot)	1536	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1520	{	1537	{
1521	max_it (top, 0);	1538	max_it (top, 0);
1522	min_it (bot, nrow - 1);	1539	min_it (bot, nrow - 1);
1523		1540
1524	if (top > bot)	1541	if (top > bot)
…		…
1534	* Make the cursor visible/invisible	1551	* Make the cursor visible/invisible
1535	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h	1552	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1536	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l	1553	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1537	*/	1554	*/
1538	void	1555	void
1539	rxvt_term::scr_cursor_visible (int mode)	1556	rxvt_term::scr_cursor_visible (int mode) NOTHROW
1540	{	1557	{
1541	want_refresh = 1;	1558	want_refresh = 1;
1542		1559
1543	if (mode)	1560	if (mode)
1544	screen.flags |= Screen_VisibleCursor;	1561	screen.flags |= Screen_VisibleCursor;
…		…
1551	* Set/unset automatic wrapping	1568	* Set/unset automatic wrapping
1552	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h	1569	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1553	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l	1570	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1554	*/	1571	*/
1555	void	1572	void
1556	rxvt_term::scr_autowrap (int mode)	1573	rxvt_term::scr_autowrap (int mode) NOTHROW
1557	{	1574	{
1558	if (mode)	1575	if (mode)
1559	screen.flags |= Screen_Autowrap;	1576	screen.flags |= Screen_Autowrap;
1560	else	1577	else
1561	screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);	1578	screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
…		…
1570	* and the cursor cannot be moved outside.	1587	* and the cursor cannot be moved outside.
1571	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h	1588	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1572	* XTERM_SEQ: Set Relative: ESC [ ? 6 l	1589	* XTERM_SEQ: Set Relative: ESC [ ? 6 l
1573	*/	1590	*/
1574	void	1591	void
1575	rxvt_term::scr_relative_origin (int mode)	1592	rxvt_term::scr_relative_origin (int mode) NOTHROW
1576	{	1593	{
1577	if (mode)	1594	if (mode)
1578	screen.flags |= Screen_Relative;	1595	screen.flags |= Screen_Relative;
1579	else	1596	else
1580	screen.flags &= ~Screen_Relative;	1597	screen.flags &= ~Screen_Relative;
…		…
1587	* Set insert/replace mode	1604	* Set insert/replace mode
1588	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h	1605	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1589	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l	1606	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1590	*/	1607	*/
1591	void	1608	void
1592	rxvt_term::scr_insert_mode (int mode)	1609	rxvt_term::scr_insert_mode (int mode) NOTHROW
1593	{	1610	{
1594	if (mode)	1611	if (mode)
1595	screen.flags |= Screen_Insert;	1612	screen.flags |= Screen_Insert;
1596	else	1613	else
1597	screen.flags &= ~Screen_Insert;	1614	screen.flags &= ~Screen_Insert;
…		…
1603	* XTERM_SEQ: Set tab at current column : ESC H	1620	* XTERM_SEQ: Set tab at current column : ESC H
1604	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g	1621	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1605	* XTERM_SEQ: Clear all tabs : ESC [ 3 g	1622	* XTERM_SEQ: Clear all tabs : ESC [ 3 g
1606	*/	1623	*/
1607	void	1624	void
1608	rxvt_term::scr_set_tab (int mode)	1625	rxvt_term::scr_set_tab (int mode) NOTHROW
1609	{	1626	{
1610	if (mode < 0)	1627	if (mode < 0)
1611	memset (tabs, 0, ncol * sizeof (char));	1628	memset (tabs, 0, ncol * sizeof (char));
1612	else if (screen.cur.col < ncol)	1629	else if (screen.cur.col < ncol)
1613	tabs [screen.cur.col] = !!mode;	1630	tabs [screen.cur.col] = !!mode;
…		…
1618	* Set reverse/normal video	1635	* Set reverse/normal video
1619	* XTERM_SEQ: Reverse video: ESC [ ? 5 h	1636	* XTERM_SEQ: Reverse video: ESC [ ? 5 h
1620	* XTERM_SEQ: Normal video : ESC [ ? 5 l	1637	* XTERM_SEQ: Normal video : ESC [ ? 5 l
1621	*/	1638	*/
1622	void	1639	void
1623	rxvt_term::scr_rvideo_mode (int mode)	1640	rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1624	{	1641	{
1625	XGCValues gcvalue;	1642	rvideo_mode = on;
1626		1643
		1644	#ifndef NO_BELL
		1645	on ^= rvideo_bell;
		1646	#endif
		1647
1627	if (rvideo != mode)	1648	if (rvideo_state != on)
1628	{	1649	{
1629	rvideo = mode;	1650	rvideo_state = on;
		1651
1630	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1652	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1631	#if XPM_BACKGROUND	1653	#if XPM_BACKGROUND
1632	if (bgPixmap.pixmap == None)	1654	if (bgPixmap.pixmap == None)
1633	#endif	1655	#endif
1634	#if TRANSPARENT	1656	#if TRANSPARENT
1635	if (! OPTION (Opt_transparent) || am_transparent == 0)	1657	if (!OPTION (Opt_transparent) || am_transparent == 0)
1636	#endif	1658	#endif
1637	XSetWindowBackground (display->display, vt,	1659	XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
1638	pix_colors[Color_bg]);
1639		1660
		1661	XGCValues gcvalue;
1640	gcvalue.foreground = pix_colors[Color_fg];	1662	gcvalue.foreground = pix_colors[Color_fg];
1641	gcvalue.background = pix_colors[Color_bg];	1663	gcvalue.background = pix_colors[Color_bg];
1642	XChangeGC (display->display, gc, GCBackground | GCForeground,	1664	XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);
1643	&gcvalue);	1665
1644	scr_clear ();	1666	scr_clear ();
1645	scr_touch (true);	1667	scr_touch (true);
1646	}	1668	}
1647	}	1669	}
1648		1670
…		…
1650	/*	1672	/*
1651	* Report current cursor position	1673	* Report current cursor position
1652	* XTERM_SEQ: Report position: ESC [ 6 n	1674	* XTERM_SEQ: Report position: ESC [ 6 n
1653	*/	1675	*/
1654	void	1676	void
1655	rxvt_term::scr_report_position ()	1677	rxvt_term::scr_report_position () NOTHROW
1656	{	1678	{
1657	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);
1658	}	1680	}
1659		1681
1660	/* ------------------------------------------------------------------------- *	1682	/* ------------------------------------------------------------------------- *
…		…
1663		1685
1664	/*	1686	/*
1665	* Set font style	1687	* Set font style
1666	*/	1688	*/
1667	void	1689	void
1668	rxvt_term::set_font_style ()	1690	rxvt_term::set_font_style () NOTHROW
1669	{	1691	{
1670	#if 0	1692	#if 0
1671	switch (charsets [screen.charset])	1693	switch (charsets [screen.charset])
1672	{	1694	{
1673	case '0': /* DEC Special Character & Line Drawing Set */	1695	case '0': /* DEC Special Character & Line Drawing Set */
…		…
1695	* XTERM_SEQ: Invoke G1 character set: CTRL-N	1717	* XTERM_SEQ: Invoke G1 character set: CTRL-N
1696	* XTERM_SEQ: Invoke G2 character set: ESC N	1718	* XTERM_SEQ: Invoke G2 character set: ESC N
1697	* XTERM_SEQ: Invoke G3 character set: ESC O	1719	* XTERM_SEQ: Invoke G3 character set: ESC O
1698	*/	1720	*/
1699	void	1721	void
1700	rxvt_term::scr_charset_choose (int set)	1722	rxvt_term::scr_charset_choose (int set) NOTHROW
1701	{	1723	{
1702	screen.charset = set;	1724	screen.charset = set;
1703	set_font_style ();	1725	set_font_style ();
1704	}	1726	}
1705		1727
…		…
1711	* XTERM_SEQ: Set G2 character set: ESC * <C>	1733	* XTERM_SEQ: Set G2 character set: ESC * <C>
1712	* XTERM_SEQ: Set G3 character set: ESC + <C>	1734	* XTERM_SEQ: Set G3 character set: ESC + <C>
1713	* See set_font_style for possible values for <C>	1735	* See set_font_style for possible values for <C>
1714	*/	1736	*/
1715	void	1737	void
1716	rxvt_term::scr_charset_set (int set, unsigned int ch)	1738	rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1717	{	1739	{
1718	charsets[set] = (unsigned char)ch;	1740	charsets[set] = (unsigned char)ch;
1719	set_font_style ();	1741	set_font_style ();
1720	}	1742	}
1721		1743
…		…
1726		1748
1727	/*	1749	/*
1728	* refresh matching text.	1750	* refresh matching text.
1729	*/	1751	*/
1730	bool	1752	bool
1731	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)	1753	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1732	{	1754	{
1733	bool found = false;	1755	bool found = false;
1734		1756
1735	for (int i = 0; i < nrow; i++)	1757	for (int i = 0; i < nrow; i++)
1736	{	1758	{
1737	int col = 0;
1738	rend_t *drp = drawn_buf[i].r;	1759	rend_t *drp = drawn_buf[i].r;
1739		1760
1740	for (; col < ncol; col++, drp++)	1761	for (int col = 0; col < ncol; col++, drp++)
1741	if ((*drp & mask) == value)	1762	if ((*drp & mask) == value)
1742	{	1763	{
1743	found = true;	1764	found = true;
1744	*drp = ~value;	1765	*drp = ~value;
1745	}	1766	}
…		…
1756	PART_END,	1777	PART_END,
1757	RC_COUNT	1778	RC_COUNT
1758	};	1779	};
1759		1780
1760	void	1781	void
1761	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
1762	{	1783	{
1763	int i;	1784	int i;
1764	row_col_t rc[RC_COUNT];	1785	row_col_t rc[RC_COUNT];
1765		1786
1766	if (!drawn_buf) /* sanity check */	1787	if (!drawn_buf) /* sanity check */
…		…
1789	}	1810	}
1790		1811
1791	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++)
1792	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);
1793		1814
		1815	num_scr_allow = 0;
		1816
1794	if (refresh)	1817	if (refresh)
1795	scr_refresh (SLOW_REFRESH);	1818	scr_refresh ();
1796	}	1819	}
1797		1820
1798	/* ------------------------------------------------------------------------- */	1821	/* ------------------------------------------------------------------------- */
1799	/*	1822	/*
1800	* Refresh the entire screen	1823	* Refresh the entire screen
1801	*/	1824	*/
1802	void	1825	void
1803	rxvt_term::scr_touch (bool refresh)	1826	rxvt_term::scr_touch (bool refresh) NOTHROW
1804	{	1827	{
1805	scr_expose (0, 0, width, height, refresh);	1828	scr_expose (0, 0, width, height, refresh);
1806	}	1829	}
1807		1830
1808	/* ------------------------------------------------------------------------- */	1831	/* ------------------------------------------------------------------------- */
1809	/*	1832	/*
1810	* 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
1811	* the top of the screen	1834	* the top of the screen
1812	*/	1835	*/
1813	void	1836	void
1814	rxvt_term::scr_move_to (int y, int len)	1837	rxvt_term::scr_move_to (int y, int len) NOTHROW
1815	{	1838	{
1816	int p = len
1817	? (top_row - nrow) * (len - y) / len + (nrow - 1)	1839	scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1818	: 0;
1819
1820	scr_changeview (p);
1821	}	1840	}
1822		1841
1823	/* ------------------------------------------------------------------------- */	1842	/* ------------------------------------------------------------------------- */
1824	/*	1843	/*
1825	* Page the screen up/down nlines	1844	* Page the screen up/down nlines
1826	* direction should be UP or DN	1845	* direction should be UP or DN
1827	*/	1846	*/
1828	bool	1847	bool
1829	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1848	rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1830	{	1849	{
1831	int new_view_start =	1850	int new_view_start =
1832	direction == UP ? view_start - nlines	1851	direction == UP ? view_start - nlines
1833	: view_start + nlines;	1852	: view_start + nlines;
1834		1853
1835	return scr_changeview (new_view_start);	1854	return scr_changeview (new_view_start);
1836	}	1855	}
1837		1856
1838	bool	1857	bool
1839	rxvt_term::scr_changeview (int new_view_start)	1858	rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840	{	1859	{
1841	clamp_it (new_view_start, top_row, 0);	1860	clamp_it (new_view_start, top_row, 0);
1842		1861
1843	if (new_view_start == view_start)	1862	if (new_view_start == view_start)
1844	return false;	1863	return false;
1845		1864
1846	num_scr += new_view_start - view_start;	1865	num_scr += new_view_start - view_start;
1847	view_start = new_view_start;	1866	view_start = new_view_start;
		1867	want_refresh = 1;
		1868
1848	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));
1849	want_refresh = 1;
1850		1870
1851	return true;	1871	return true;
1852	}	1872	}
1853		1873
1854	/* ------------------------------------------------------------------------- */	1874	#ifndef NO_BELL
1855	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
1856	rxvt_term::scr_bell ()	1885	rxvt_term::scr_bell () NOTHROW
1857	{	1886	{
1858	#ifndef NO_BELL	1887	#ifndef NO_BELL
1859		1888
1860	# ifndef NO_MAPALERT	1889	# ifndef NO_MAPALERT
1861	# ifdef MAPALERT_OPTION	1890	# ifdef MAPALERT_OPTION
1862	if (OPTION (Opt_mapAlert))	1891	if (OPTION (Opt_mapAlert))
1863	# endif	1892	# endif
1864	XMapWindow (display->display, parent[0]);	1893	XMapWindow (xdisp, parent[0]);
1865	# endif	1894	# endif
1866		1895
1867	if (OPTION (Opt_visualBell))	1896	if (OPTION (Opt_visualBell))
1868	{	1897	{
1869	scr_rvideo_mode (!rvideo); /* refresh also done */	1898	rvideo_bell = true;
		1899	scr_rvideo_mode (rvideo_mode);
1870	display->flush ();	1900	display->flush ();
1871	rxvt_usleep (VISUAL_BELL_DURATION);	1901
1872	scr_rvideo_mode (!rvideo); /* refresh also done */	1902	bell_ev.start (NOW + VISUAL_BELL_DURATION);
1873	}	1903	}
1874	else	1904	else
1875	XBell (display->display, 0);	1905	XBell (xdisp, 0);
1876		1906
1877	#endif	1907	#endif
1878	}	1908	}
1879		1909
1880	/* ------------------------------------------------------------------------- */	1910	/* ------------------------------------------------------------------------- */
1881	/* ARGSUSED */	1911	/* ARGSUSED */
1882	void	1912	void
1883	rxvt_term::scr_printscreen (int fullhist)	1913	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1884	{	1914	{
1885	#ifdef PRINTPIPE	1915	#ifdef PRINTPIPE
1886	int nrows, row_start;	1916	int nrows, row_start;
1887	FILE *fd;	1917	FILE *fd;
1888		1918
…		…
1937	* Refresh the screen	1967	* Refresh the screen
1938	* drawn_text/drawn_rend contain the screen information before the update.	1968	* drawn_text/drawn_rend contain the screen information before the update.
1939	* screen.text/screen.rend contain what the screen will change to.	1969	* screen.text/screen.rend contain what the screen will change to.
1940	*/	1970	*/
1941	void	1971	void
1942	rxvt_term::scr_refresh (unsigned char refresh_type)	1972	rxvt_term::scr_refresh () NOTHROW
1943	{	1973	{
1944	unsigned char must_clear, /* use draw_string not draw_image_string */	1974	unsigned char must_clear, /* use draw_string not draw_image_string */
1945	showcursor; /* show the cursor */	1975	showcursor; /* show the cursor */
1946	int16_t col, row, /* column/row we're processing */	1976	int16_t col, row, /* column/row we're processing */
1947	ocrow; /* old cursor row */	1977	ocrow; /* old cursor row */
…		…
2071	#ifndef NO_SLOW_LINK_SUPPORT	2101	#ifndef NO_SLOW_LINK_SUPPORT
2072	/*	2102	/*
2073	* D: CopyArea pass - very useful for slower links	2103	* D: CopyArea pass - very useful for slower links
2074	* This has been deliberately kept simple.	2104	* This has been deliberately kept simple.
2075	*/	2105	*/
2076	i = num_scr;
2077	if (!display->is_local	2106	if (!display->is_local
2078	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr	2107	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2079	&& abs (num_scr) < nrow && !must_clear)	2108	&& abs (num_scr) < nrow && !must_clear)
2080	{	2109	{
2081	int16_t nits;	2110	int16_t nits;
2082	int j;	2111	int j;
2083	int len, wlen;	2112	int len, wlen;
		2113	dLocal (int, num_scr);
2084		2114
2085	j = nrow;	2115	j = nrow;
2086	wlen = len = -1;	2116	wlen = len = -1;
2087	row = i > 0 ? 0 : j - 1;	2117	row = i > 0 ? 0 : j - 1;
2088	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2118	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
…		…
2119	{	2149	{
2120	/* also comes here at end if needed because of >= above */	2150	/* also comes here at end if needed because of >= above */
2121	if (wlen < len)	2151	if (wlen < len)
2122	::swap (wlen, len);	2152	::swap (wlen, len);
2123		2153
2124	XCopyArea (display->display, vt, vt,	2154	XCopyArea (xdisp, vt, vt,
2125	gc, 0, Row2Pixel (len + i),	2155	gc, 0, Row2Pixel (len + i),
2126	(unsigned int)this->width,	2156	(unsigned int)this->width,
2127	(unsigned int)Height2Pixel (wlen - len + 1),	2157	(unsigned int)Height2Pixel (wlen - len + 1),
2128	0, Row2Pixel (len));	2158	0, Row2Pixel (len));
2129	len = -1;	2159	len = -1;
…		…
2217		2247
2218	// only do special processing if any attributes are set, which is unlikely	2248	// only do special processing if any attributes are set, which is unlikely
2219	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2249	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2220	{	2250	{
2221	#if ENABLE_STYLES	2251	#if ENABLE_STYLES
2222	// force redraw after "careful" characters to avoid pixel droppings	2252	// "careful" (too wide) character handling
2223	if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2224	drp[col + 1] = ~srp[col + 1];
2225		2253
2226	// include previous careful character(s) if possible, looks nicer (best effort...)	2254	// include previous careful character(s) if possible, looks nicer (best effort...)
2227	while (text > stp	2255	while (text > stp
2228	&& srp[text - stp - 1] & RS_Careful	2256	&& srp[text - stp - 1] & RS_Careful
2229	&& RS_SAME (rend, srp[text - stp - 1]))	2257	&& RS_SAME (rend, srp[text - stp - 1]))
2230	text--, count++, xpixel -= fwidth;	2258	text--, count++, xpixel -= fwidth;
		2259
		2260	// force redraw after "careful" characters to avoid pixel droppings
		2261	for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
		2262	drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
		2263
		2264	// force redraw before "careful" characters to avoid pixel droppings
		2265	for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
		2266	drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2231	#endif	2267	#endif
2232		2268
2233	bool invert = rend & RS_RVid;	2269	bool invert = rend & RS_RVid;
2234		2270
2235	#ifndef NO_BOLD_UNDERLINE_REVERSE	2271	#ifndef NO_BOLD_UNDERLINE_REVERSE
…		…
2319		2355
2320	if (rend & RS_Uline && font->descent > 1 && fore != back)	2356	if (rend & RS_Uline && font->descent > 1 && fore != back)
2321	{	2357	{
2322	#if ENABLE_FRILLS	2358	#if ENABLE_FRILLS
2323	if (ISSET_PIXCOLOR (Color_underline))	2359	if (ISSET_PIXCOLOR (Color_underline))
2324	XSetForeground (display->display, gc, pix_colors[Color_underline]);	2360	XSetForeground (xdisp, gc, pix_colors[Color_underline]);
2325	else	2361	else
2326	#endif	2362	#endif
2327	XSetForeground (display->display, gc, pix_colors[fore]);	2363	XSetForeground (xdisp, gc, pix_colors[fore]);
2328		2364
2329	XDrawLine (display->display, drawBuffer, gc,	2365	XDrawLine (xdisp, drawBuffer, gc,
2330	xpixel, ypixel + font->ascent + 1,	2366	xpixel, ypixel + font->ascent + 1,
2331	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2367	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2332	}	2368	}
2333	} /* for (col....) */	2369	} /* for (col....) */
2334	} /* for (row....) */	2370	} /* for (row....) */
…		…
2367	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)	2403	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2368	cursorwidth++;	2404	cursorwidth++;
2369		2405
2370	#ifndef NO_CURSORCOLOR	2406	#ifndef NO_CURSORCOLOR
2371	if (ISSET_PIXCOLOR (Color_cursor))	2407	if (ISSET_PIXCOLOR (Color_cursor))
2372	XSetForeground (display->display, gc, pix_colors[Color_cursor]);	2408	XSetForeground (xdisp, gc, pix_colors[Color_cursor]);
2373	#endif	2409	#endif
2374		2410
2375	XDrawRectangle (display->display, drawBuffer, gc,	2411	XDrawRectangle (xdisp, drawBuffer, gc,
2376	Col2Pixel (col),	2412	Col2Pixel (col),
2377	Row2Pixel (oldcursor.row),	2413	Row2Pixel (oldcursor.row),
2378	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2414	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2379	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2415	(unsigned int) (Height2Pixel (1) - lineSpace - 1));
2380	}	2416	}
…		…
2388	num_scr = 0;	2424	num_scr = 0;
2389	num_scr_allow = 1;	2425	num_scr_allow = 1;
2390	}	2426	}
2391		2427
2392	void	2428	void
2393	rxvt_term::scr_remap_chars (line_t &l)	2429	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2394	{	2430	{
2395	if (!l.t)	2431	if (!l.t)
2396	return;	2432	return;
2397		2433
2398	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant	2434	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
…		…
2400	for (int i = ncol; i--; )	2436	for (int i = ncol; i--; )
2401	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2437	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2402	}	2438	}
2403		2439
2404	void	2440	void
2405	rxvt_term::scr_remap_chars ()	2441	rxvt_term::scr_remap_chars () NOTHROW
2406	{	2442	{
2407	for (int i = total_rows; i--; )	2443	for (int i = total_rows; i--; )
2408	scr_remap_chars (row_buf [i]);	2444	scr_remap_chars (row_buf [i]);
2409		2445
2410	for (int i = nrow; i--; )	2446	for (int i = nrow; i--; )
…		…
2413	scr_remap_chars (swap_buf [i]);	2449	scr_remap_chars (swap_buf [i]);
2414	}	2450	}
2415	}	2451	}
2416		2452
2417	void	2453	void
2418	rxvt_term::scr_recolour ()	2454	rxvt_term::scr_recolour () NOTHROW
2419	{	2455	{
2420	if (1	2456	if (1
2421	#if TRANSPARENT	2457	#if TRANSPARENT
2422	&& !am_transparent	2458	&& !am_transparent
2423	#endif	2459	#endif
2424	#if XPM_BACKGROUND	2460	#if XPM_BACKGROUND
2425	&& !bgPixmap.pixmap	2461	&& !bgPixmap.pixmap
2426	#endif	2462	#endif
2427	)	2463	)
2428	{	2464	{
2429	XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);	2465	XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]);
2430	XClearWindow (display->display, parent[0]);	2466	XClearWindow (xdisp, parent[0]);
2431	XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);	2467	XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
2432	#if HAVE_SCROLLBARS	2468	#if HAVE_SCROLLBARS
2433	if (scrollBar.win)	2469	if (scrollBar.win)
2434	{	2470	{
2435	XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);	2471	XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);
2436	scrollBar.setIdle ();	2472	scrollBar.setIdle ();
2437	scrollbar_show (0);	2473	scrollbar_show (0);
2438	}	2474	}
2439	#endif	2475	#endif
2440	}	2476	}
…		…
2444	want_refresh = 1;	2480	want_refresh = 1;
2445	}	2481	}
2446		2482
2447	/* ------------------------------------------------------------------------- */	2483	/* ------------------------------------------------------------------------- */
2448	void	2484	void
2449	rxvt_term::scr_clear (bool really)	2485	rxvt_term::scr_clear (bool really) NOTHROW
2450	{	2486	{
2451	if (!mapped)	2487	if (!mapped)
2452	return;	2488	return;
2453		2489
2454	num_scr_allow = 0;	2490	num_scr_allow = 0;
2455	want_refresh = 1;	2491	want_refresh = 1;
2456		2492
2457	if (really)	2493	if (really)
2458	XClearWindow (display->display, vt);	2494	XClearWindow (xdisp, vt);
2459	}	2495	}
2460		2496
2461	void	2497	void
2462	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)	2498	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2463	{	2499	{
2464	int view_end = view_start + nrow;	2500	int view_end = view_start + nrow;
2465	int row, col;	2501	int row, col;
2466		2502
2467	for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)	2503	for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
…		…
2479	srp[col] ^= rstyle2;	2515	srp[col] ^= rstyle2;
2480	}	2516	}
2481	}	2517	}
2482		2518
2483	void	2519	void
2484	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)	2520	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2485	{	2521	{
2486	int view_end = view_start + nrow;	2522	int view_end = view_start + nrow;
2487	int row, col;	2523	int row, col;
2488		2524
2489	if (beg_row >= view_start)	2525	if (beg_row >= view_start)
…		…
2506	srp[col] ^= rstyle;	2542	srp[col] ^= rstyle;
2507	}	2543	}
2508		2544
2509	/* ------------------------------------------------------------------------- */	2545	/* ------------------------------------------------------------------------- */
2510	void	2546	void
2511	rxvt_term::scr_reverse_selection ()	2547	rxvt_term::scr_reverse_selection () NOTHROW
2512	{	2548	{
2513	if (selection.op	2549	if (selection.op
2514	&& current_screen == selection.screen	2550	&& current_screen == selection.screen
2515	&& selection.end.row >= view_start)	2551	&& selection.end.row >= view_start)
2516	{	2552	{
…		…
2532	* Dump the whole scrollback and screen to the passed filedescriptor. The	2568	* Dump the whole scrollback and screen to the passed filedescriptor. The
2533	* invoking routine must close the fd.	2569	* invoking routine must close the fd.
2534	*/	2570	*/
2535	#if 0	2571	#if 0
2536	void	2572	void
2537	rxvt_term::scr_dump (int fd)	2573	rxvt_term::scr_dump (int fd) NOTHROW
2538	{	2574	{
2539	int row, wrote;	2575	int row, wrote;
2540	unsigned int width, towrite;	2576	unsigned int width, towrite;
2541	char r1[] = "\n";	2577	char r1[] = "\n";
2542		2578
…		…
2561		2597
2562	/* ------------------------------------------------------------------------- *	2598	/* ------------------------------------------------------------------------- *
2563	* CHARACTER SELECTION *	2599	* CHARACTER SELECTION *
2564	* ------------------------------------------------------------------------- */	2600	* ------------------------------------------------------------------------- */
2565	void	2601	void
2566	rxvt_term::selection_check (int check_more)	2602	rxvt_term::selection_check (int check_more) NOTHROW
2567	{	2603	{
2568	row_col_t pos;	2604	row_col_t pos;
2569		2605
2570	if (!selection.op)	2606	if (!selection.op)
2571	return;	2607	return;
…		…
2592	/* ------------------------------------------------------------------------- */	2628	/* ------------------------------------------------------------------------- */
2593	/*	2629	/*
2594	* Paste a selection direct to the command fd	2630	* Paste a selection direct to the command fd
2595	*/	2631	*/
2596	void	2632	void
2597	rxvt_term::paste (char *data, unsigned int len)	2633	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2598	{	2634	{
2599	/* convert normal newline chars into common keyboard Return key sequence */	2635	/* convert normal newline chars into common keyboard Return key sequence */
2600	for (unsigned int i = 0; i < len; i++)	2636	for (unsigned int i = 0; i < len; i++)
2601	if (data[i] == C0_LF)	2637	if (data[i] == C0_LF)
2602	data[i] = C0_CR;	2638	data[i] = C0_CR;
…		…
2608	/*	2644	/*
2609	* Respond to a notification that a primary selection has been sent	2645	* Respond to a notification that a primary selection has been sent
2610	* EXT: SelectionNotify	2646	* EXT: SelectionNotify
2611	*/	2647	*/
2612	void	2648	void
2613	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)	2649	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2614	{	2650	{
2615	if (prop == None) /* check for failed XConvertSelection */	2651	if (prop == None) /* check for failed XConvertSelection */
2616	{	2652	{
2617	if ((selection_type & Sel_CompoundText))	2653	if ((selection_type & Sel_CompoundText))
2618	{	2654	{
…		…
2638	}	2674	}
2639		2675
2640	unsigned long bytes_after;	2676	unsigned long bytes_after;
2641	XTextProperty ct;	2677	XTextProperty ct;
2642		2678
2643	if (XGetWindowProperty (display->display, win, prop,	2679	if (XGetWindowProperty (xdisp, win, prop,
2644	0, PROP_SIZE / 4,	2680	0, PROP_SIZE / 4,
2645	delete_prop, AnyPropertyType,	2681	delete_prop, AnyPropertyType,
2646	&ct.encoding, &ct.format,	2682	&ct.encoding, &ct.format,
2647	&ct.nitems, &bytes_after,	2683	&ct.nitems, &bytes_after,
2648	&ct.value) != Success)	2684	&ct.value) != Success)
…		…
2657	if (bytes_after)	2693	if (bytes_after)
2658	{	2694	{
2659	// fetch and append remaining data	2695	// fetch and append remaining data
2660	XTextProperty ct2;	2696	XTextProperty ct2;
2661		2697
2662	if (XGetWindowProperty (display->display, win, prop,	2698	if (XGetWindowProperty (xdisp, win, prop,
2663	ct.nitems / 4, (bytes_after + 3) / 4,	2699	ct.nitems / 4, (bytes_after + 3) / 4,
2664	delete_prop, AnyPropertyType,	2700	delete_prop, AnyPropertyType,
2665	&ct2.encoding, &ct2.format,	2701	&ct2.encoding, &ct2.format,
2666	&ct2.nitems, &bytes_after,	2702	&ct2.nitems, &bytes_after,
2667	&ct2.value) != Success)	2703	&ct2.value) != Success)
…		…
2680		2716
2681	if (ct.encoding == xa[XA_INCR])	2717	if (ct.encoding == xa[XA_INCR])
2682	{	2718	{
2683	// INCR selection, start handshake	2719	// INCR selection, start handshake
2684	if (!delete_prop)	2720	if (!delete_prop)
2685	XDeleteProperty (display->display, win, prop);	2721	XDeleteProperty (xdisp, win, prop);
2686		2722
2687	selection_wait = Sel_incr;	2723	selection_wait = Sel_incr;
2688	incr_buf_fill = 0;	2724	incr_buf_fill = 0;
2689	incr_ev.start (NOW + 10);	2725	incr_ev.start (NOW + 10);
2690		2726
…		…
2751	paste (s, strlen (s));	2787	paste (s, strlen (s));
2752	free (s);	2788	free (s);
2753	}	2789	}
2754	else	2790	else
2755	#endif	2791	#endif
2756	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0	2792	if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
2757	&& cl)	2793	&& cl)
2758	{	2794	{
2759	for (int i = 0; i < cr; i++)	2795	for (int i = 0; i < cr; i++)
2760	paste (cl[i], strlen (cl[i]));	2796	paste (cl[i], strlen (cl[i]));
2761		2797
…		…
2770	if (selection_wait == Sel_normal)	2806	if (selection_wait == Sel_normal)
2771	selection_wait = Sel_none;	2807	selection_wait = Sel_none;
2772	}	2808	}
2773		2809
2774	void	2810	void
2775	rxvt_term::incr_cb (time_watcher &w)	2811	rxvt_term::incr_cb (time_watcher &w) NOTHROW
2776	{	2812	{
2777	selection_wait = Sel_none;	2813	selection_wait = Sel_none;
2778		2814
2779	incr_buf_size = 0;	2815	incr_buf_size = 0;
2780	free (incr_buf);	2816	free (incr_buf);
2781		2817
2782	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");	2818	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2783	}	2819	}
2784		2820
2785	void	2821	void
2786	rxvt_term::selection_property (Window win, Atom prop)	2822	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2787	{	2823	{
2788	if (prop == None || selection_wait != Sel_incr)	2824	if (prop == None || selection_wait != Sel_incr)
2789	return;	2825	return;
2790		2826
2791	selection_paste (win, prop, true);	2827	selection_paste (win, prop, true);
…		…
2800	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()	2836	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2801	* will auto fallback to CUT_BUFFER0	2837	* will auto fallback to CUT_BUFFER0
2802	* EXT: button 2 release	2838	* EXT: button 2 release
2803	*/	2839	*/
2804	void	2840	void
2805	rxvt_term::selection_request (Time tm, int x, int y)	2841	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2806	{	2842	{
2807	if (x < 0 || x >= width || y < 0 || y >= height)	2843	if (selection.text && selnum == Sel_Primary)
2808	return; /* outside window */
2809
2810	if (selection.text)
2811	{ /* internal selection */	2844	{ /* internal selection */
2812	char *str = rxvt_wcstombs (selection.text, selection.len);	2845	char *str = rxvt_wcstombs (selection.text, selection.len);
2813	paste (str, strlen (str));	2846	paste (str, strlen (str));
2814	free (str);	2847	free (str);
2815	return;	2848	return;
2816	}	2849	}
2817	else	2850	else
2818	{	2851	{
2819	int i;
2820
2821	selection_request_time = tm;	2852	selection_request_time = tm;
2822	selection_wait = Sel_normal;	2853	selection_wait = Sel_normal;
2823		2854
2824	for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2825	{
2826	#if X_HAVE_UTF8_STRING	2855	#if X_HAVE_UTF8_STRING
2827	selection_type = Sel_UTF8String;	2856	selection_type = Sel_UTF8String;
2828	if (selection_request_other (xa[XA_UTF8_STRING], i))	2857	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2829	return;	2858	return;
2830	#else	2859	#else
2831	selection_type = Sel_CompoundText;	2860	selection_type = Sel_CompoundText;
2832	if (selection_request_other (xa[XA_COMPOUND_TEXT], i))	2861	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2833	return;	2862	return;
2834	#endif	2863	#endif
2835	}
2836	}	2864	}
2837		2865
2838	selection_wait = Sel_none; /* don't loop in selection_paste () */	2866	selection_wait = Sel_none; /* don't loop in selection_paste () */
2839	selection_paste (display->root, XA_CUT_BUFFER0, false);	2867	selection_paste (display->root, XA_CUT_BUFFER0, false);
2840	}	2868	}
2841		2869
2842	int	2870	int
2843	rxvt_term::selection_request_other (Atom target, int selnum)	2871	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2844	{	2872	{
2845	Atom sel;	2873	Atom sel;
2846		2874
2847	selection_type |= selnum;	2875	selection_type |= selnum;
2848		2876
…		…
2851	else if (selnum == Sel_Secondary)	2879	else if (selnum == Sel_Secondary)
2852	sel = XA_SECONDARY;	2880	sel = XA_SECONDARY;
2853	else	2881	else
2854	sel = xa[XA_CLIPBOARD];	2882	sel = xa[XA_CLIPBOARD];
2855		2883
2856	if (XGetSelectionOwner (display->display, sel) != None)	2884	if (XGetSelectionOwner (xdisp, sel) != None)
2857	{	2885	{
2858	XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],	2886	XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
2859	vt, selection_request_time);	2887	vt, selection_request_time);
2860	return 1;	2888	return 1;
2861	}	2889	}
2862		2890
2863	return 0;	2891	return 0;
…		…
2867	/*	2895	/*
2868	* Clear all selected text	2896	* Clear all selected text
2869	* EXT: SelectionClear	2897	* EXT: SelectionClear
2870	*/	2898	*/
2871	void	2899	void
2872	rxvt_term::selection_clear ()	2900	rxvt_term::selection_clear () NOTHROW
2873	{	2901	{
2874	want_refresh = 1;	2902	want_refresh = 1;
2875	free (selection.text);	2903	free (selection.text);
2876	selection.text = NULL;	2904	selection.text = NULL;
2877	selection.len = 0;	2905	selection.len = 0;
…		…
3012		3040
3013	selection_grab (tm);	3041	selection_grab (tm);
3014	}	3042	}
3015		3043
3016	bool	3044	bool
3017	rxvt_term::selection_grab (Time tm)	3045	rxvt_term::selection_grab (Time tm) NOTHROW
3018	{	3046	{
3019	selection_time = tm;	3047	selection_time = tm;
3020		3048
3021	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);	3049	XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
3022	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)	3050	if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3023	{	3051	{
3024	display->set_selection_owner (this);	3052	display->set_selection_owner (this);
3025	return true;	3053	return true;
3026	}	3054	}
3027	else	3055	else
…		…
3031	}	3059	}
3032		3060
3033	#if 0	3061	#if 0
3034	XTextProperty ct;	3062	XTextProperty ct;
3035		3063
3036	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)	3064	if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)
3037	{	3065	{
3038	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);	3066	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3039	XFree (ct.value);	3067	XFree (ct.value);
3040	}	3068	}
3041	#endif	3069	#endif
…		…
3045	/*	3073	/*
3046	* Mark or select text based upon number of clicks: 1, 2, or 3	3074	* Mark or select text based upon number of clicks: 1, 2, or 3
3047	* EXT: button 1 press	3075	* EXT: button 1 press
3048	*/	3076	*/
3049	void	3077	void
3050	rxvt_term::selection_click (int clicks, int x, int y)	3078	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3051	{	3079	{
3052	clicks = ((clicks - 1) % 3) + 1;	3080	clicks = ((clicks - 1) % 3) + 1;
3053	selection.clicks = clicks; /* save clicks so extend will work */	3081	selection.clicks = clicks; /* save clicks so extend will work */
3054		3082
3055	if (clicks == 2 && !selection.rect	3083	if (clicks == 2 && !selection.rect
…		…
3074	/* ------------------------------------------------------------------------- */	3102	/* ------------------------------------------------------------------------- */
3075	/*	3103	/*
3076	* Mark a selection at the specified col/row	3104	* Mark a selection at the specified col/row
3077	*/	3105	*/
3078	void	3106	void
3079	rxvt_term::selection_start_colrow (int col, int row)	3107	rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3080	{	3108	{
3081	want_refresh = 1;	3109	want_refresh = 1;
3082		3110
3083	selection.mark.row = row + view_start;	3111	selection.mark.row = row + view_start;
3084	selection.mark.col = col;	3112	selection.mark.col = col;
…		…
3110	#define DELIMIT_TEXT(x) \	3138	#define DELIMIT_TEXT(x) \
3111	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3139	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3112	#define DELIMIT_REND(x) 1	3140	#define DELIMIT_REND(x) 1
3113		3141
3114	void	3142	void
3115	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)	3143	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3116	{	3144	{
3117	int col, row, dirnadd, tcol, trow, w1, w2;	3145	int col, row, dirnadd, tcol, trow, w1, w2;
3118	row_col_t bound;	3146	row_col_t bound;
3119	text_t *stp;	3147	text_t *stp;
3120	rend_t *srp;	3148	rend_t *srp;
…		…
3194	* flag == 0 ==> button 1	3222	* flag == 0 ==> button 1
3195	* flag == 1 ==> button 3 press	3223	* flag == 1 ==> button 3 press
3196	* flag == 2 ==> button 3 motion	3224	* flag == 2 ==> button 3 motion
3197	*/	3225	*/
3198	void	3226	void
3199	rxvt_term::selection_extend (int x, int y, int flag)	3227	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3200	{	3228	{
3201	int col = clamp (Pixel2Col (x), 0, ncol);	3229	int col = clamp (Pixel2Col (x), 0, ncol);
3202	int row = clamp (Pixel2Row (y), 0, nrow - 1);	3230	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3203		3231
3204	/*	3232	/*
…		…
3230	/* ------------------------------------------------------------------------- */	3258	/* ------------------------------------------------------------------------- */
3231	/*	3259	/*
3232	* Extend the selection to the specified col/row	3260	* Extend the selection to the specified col/row
3233	*/	3261	*/
3234	void	3262	void
3235	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)	3263	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3236	{	3264	{
3237	row_col_t pos;	3265	row_col_t pos;
3238	enum {	3266	enum {
3239	LEFT, RIGHT	3267	LEFT, RIGHT
3240	} closeto = RIGHT;	3268	} closeto = RIGHT;
…		…
3426	#endif	3454	#endif
3427	}	3455	}
3428		3456
3429	#if ENABLE_FRILLS	3457	#if ENABLE_FRILLS
3430	void	3458	void
3431	rxvt_term::selection_remove_trailing_spaces ()	3459	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3432	{	3460	{
3433	int32_t end_col, end_row;	3461	int32_t end_col, end_row;
3434	text_t *stp;	3462	text_t *stp;
3435		3463
3436	end_col = selection.end.col;	3464	end_col = selection.end.col;
…		…
3474	/*	3502	/*
3475	* Double click on button 3 when already selected	3503	* Double click on button 3 when already selected
3476	* EXT: button 3 double click	3504	* EXT: button 3 double click
3477	*/	3505	*/
3478	void	3506	void
3479	rxvt_term::selection_rotate (int x, int y)	3507	rxvt_term::selection_rotate (int x, int y) NOTHROW
3480	{	3508	{
3481	selection.clicks = selection.clicks % 3 + 1;	3509	selection.clicks = selection.clicks % 3 + 1;
3482	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3510	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3483	}	3511	}
3484		3512
…		…
3486	/*	3514	/*
3487	* Respond to a request for our current selection	3515	* Respond to a request for our current selection
3488	* EXT: SelectionRequest	3516	* EXT: SelectionRequest
3489	*/	3517	*/
3490	void	3518	void
3491	rxvt_term::selection_send (const XSelectionRequestEvent &rq)	3519	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3492	{	3520	{
3493	XSelectionEvent ev;	3521	XSelectionEvent ev;
3494	dDisp;
3495		3522
3496	ev.type = SelectionNotify;	3523	ev.type = SelectionNotify;
3497	ev.property = None;	3524	ev.property = None;
3498	ev.display = rq.display;	3525	ev.display = rq.display;
3499	ev.requestor = rq.requestor;	3526	ev.requestor = rq.requestor;
…		…
3513	*target++ = xa[XA_COMPOUND_TEXT];	3540	*target++ = xa[XA_COMPOUND_TEXT];
3514	#if X_HAVE_UTF8_STRING	3541	#if X_HAVE_UTF8_STRING
3515	*target++ = xa[XA_UTF8_STRING];	3542	*target++ = xa[XA_UTF8_STRING];
3516	#endif	3543	#endif
3517		3544
3518	XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,	3545	XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,
3519	32, PropModeReplace,	3546	32, PropModeReplace,
3520	(unsigned char *)target_list, target - target_list);	3547	(unsigned char *)target_list, target - target_list);
3521	ev.property = rq.property;	3548	ev.property = rq.property;
3522	}	3549	}
3523	#if TODO // TODO	3550	#if TODO // TODO
…		…
3526	/* TODO: Handle MULTIPLE */	3553	/* TODO: Handle MULTIPLE */
3527	}	3554	}
3528	#endif	3555	#endif
3529	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3556	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3530	{	3557	{
3531	XChangeProperty (disp, rq.requestor, rq.property, rq.target,	3558	XChangeProperty (xdisp, rq.requestor, rq.property, rq.target,
3532	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3559	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3533	ev.property = rq.property;	3560	ev.property = rq.property;
3534	}	3561	}
3535	else if (rq.target == XA_STRING	3562	else if (rq.target == XA_STRING
3536	|| rq.target == xa[XA_TEXT]	3563	|| rq.target == xa[XA_TEXT]
…		…
3594	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);	3621	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3595	ct.nitems = strlen ((char *)ct.value);	3622	ct.nitems = strlen ((char *)ct.value);
3596	}	3623	}
3597	else	3624	else
3598	#endif	3625	#endif
3599	if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)	3626	if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3600	freect = 1;	3627	freect = 1;
3601	else	3628	else
3602	{	3629	{
3603	/* if we failed to convert then send it raw */	3630	/* if we failed to convert then send it raw */
3604	ct.value = (unsigned char *)cl;	3631	ct.value = (unsigned char *)cl;
3605	ct.nitems = selectlen;	3632	ct.nitems = selectlen;
3606	ct.encoding = target;	3633	ct.encoding = target;
3607	}	3634	}
3608		3635
3609	XChangeProperty (disp, rq.requestor, rq.property,	3636	XChangeProperty (xdisp, rq.requestor, rq.property,
3610	ct.encoding, 8, PropModeReplace,	3637	ct.encoding, 8, PropModeReplace,
3611	ct.value, (int)ct.nitems);	3638	ct.value, (int)ct.nitems);
3612	ev.property = rq.property;	3639	ev.property = rq.property;
3613		3640
3614	if (freect)	3641	if (freect)
3615	XFree (ct.value);	3642	XFree (ct.value);
3616	}	3643	}
3617		3644
3618	XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);	3645	XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);
3619	}	3646	}
3620		3647
3621	/* ------------------------------------------------------------------------- *	3648	/* ------------------------------------------------------------------------- *
3622	* MOUSE ROUTINES *	3649	* MOUSE ROUTINES *
3623	* ------------------------------------------------------------------------- */	3650	* ------------------------------------------------------------------------- */
3624		3651
3625	/*	3652	/*
3626	* return col/row values corresponding to x/y pixel values	3653	* return col/row values corresponding to x/y pixel values
3627	*/	3654	*/
3628	void	3655	void
3629	rxvt_term::pixel_position (int *x, int *y)	3656	rxvt_term::pixel_position (int *x, int *y) NOTHROW
3630	{	3657	{
3631	*x = Pixel2Col (*x);	3658	*x = Pixel2Col (*x);
3632	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */	3659	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3633	*y = Pixel2Row (*y);	3660	*y = Pixel2Row (*y);
3634	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */	3661	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3635	}	3662	}
3636		3663
3637	/* ------------------------------------------------------------------------- */	3664	/* ------------------------------------------------------------------------- */
3638	#ifdef USE_XIM	3665	#ifdef USE_XIM
3639	void	3666	void
3640	rxvt_term::im_set_position (XPoint &pos)	3667	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3641	{	3668	{
3642	XWindowAttributes xwa;	3669	XWindowAttributes xwa;
3643		3670
3644	XGetWindowAttributes (display->display, vt, &xwa);	3671	XGetWindowAttributes (xdisp, vt, &xwa);
3645		3672
3646	pos.x = xwa.x + Col2Pixel (screen.cur.col);	3673	pos.x = xwa.x + Col2Pixel (screen.cur.col);
3647	pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;	3674	pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3648	}	3675	}
3649	#endif	3676	#endif
3650		3677
3651	#if ENABLE_OVERLAY	3678	#if ENABLE_OVERLAY
3652	void	3679	void
3653	rxvt_term::scr_overlay_new (int x, int y, int w, int h)	3680	rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3654	{	3681	{
3655	if (nrow < 1 || ncol < 1)	3682	if (nrow < 1 || ncol < 1)
3656	return;	3683	return;
3657		3684
3658	want_refresh = 1;	3685	want_refresh = 1;
…		…
3703	*rp = r;	3730	*rp = r;
3704	}	3731	}
3705	}	3732	}
3706		3733
3707	void	3734	void
3708	rxvt_term::scr_overlay_off ()	3735	rxvt_term::scr_overlay_off () NOTHROW
3709	{	3736	{
3710	if (!ov_text)	3737	if (!ov_text)
3711	return;	3738	return;
3712		3739
3713	want_refresh = 1;	3740	want_refresh = 1;
…		…
3721	delete [] ov_text; ov_text = 0;	3748	delete [] ov_text; ov_text = 0;
3722	delete [] ov_rend; ov_rend = 0;	3749	delete [] ov_rend; ov_rend = 0;
3723	}	3750	}
3724		3751
3725	void	3752	void
3726	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)	3753	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3727	{	3754	{
3728	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3755	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3729	return;	3756	return;
3730		3757
3731	x++, y++;	3758	x++, y++;
…		…
3733	ov_text[y][x] = text;	3760	ov_text[y][x] = text;
3734	ov_rend[y][x] = rend;	3761	ov_rend[y][x] = rend;
3735	}	3762	}
3736		3763
3737	void	3764	void
3738	rxvt_term::scr_overlay_set (int x, int y, const char *s)	3765	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3739	{	3766	{
3740	while (*s)	3767	while (*s)
3741	scr_overlay_set (x++, y, *s++);	3768	scr_overlay_set (x++, y, *s++);
3742	}	3769	}
3743		3770
3744	void	3771	void
3745	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)	3772	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3746	{	3773	{
3747	while (*s)	3774	while (*s)
3748	{	3775	{
3749	text_t t = *s++;	3776	text_t t = *s++;
3750	int width = wcwidth (t);	3777	int width = WCWIDTH (t);
3751		3778
3752	while (width--)	3779	while (width--)
3753	{	3780	{
3754	scr_overlay_set (x++, y, t);	3781	scr_overlay_set (x++, y, t);
3755	t = NOCHAR;	3782	t = NOCHAR;
3756	}	3783	}
3757	}	3784	}
3758	}	3785	}
3759		3786
3760	void	3787	void
3761	rxvt_term::scr_swap_overlay ()	3788	rxvt_term::scr_swap_overlay () NOTHROW
3762	{	3789	{
3763	if (!ov_text)	3790	if (!ov_text)
3764	return;	3791	return;
3765		3792
3766	// swap screen mem with overlay	3793	// swap screen mem with overlay

Diff Legend

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