[ViewVC] Diff of: cvs/rxvt-unicode/src/screen.C

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.245 by root, Fri Jan 20 10:35:25 2006 UTC vs.
Revision 1.250 by root, Wed Jan 25 13:24:45 2006 UTC

…		…
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	rvideo = 0;	242	rvideo_state = rvideo_mode = false;
240	}	243	}
241	else	244	else
242	{	245	{
243	/*	246	/*
244	* add or delete rows as appropriate	247	* add or delete rows as appropriate
…		…
280	int pend = MOD (term_start + top_row , prev_total_rows);	283	int pend = MOD (term_start + top_row , prev_total_rows);
281	int q = total_rows; // rewrapped row	284	int q = total_rows; // rewrapped row
282		285
283	if (top_row)	286	if (top_row)
284	{	287	{
285	// re-wrap lines, this is rather ugly, possibly because I am too dumb	288	// Re-wrap lines. This is rather ugly, possibly because I am too dumb
286	// to come up with a lean and mean algorithm.	289	// to come up with a lean and mean algorithm.
287		290
288	row_col_t ocur = screen.cur;	291	row_col_t ocur = screen.cur;
289	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	292	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290		293
…		…
347		350
348	line_t &pline = old_buf [prow];	351	line_t &pline = old_buf [prow];
349		352
350	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	353	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351		354
352	#if DEBUG_STRICT
353	assert (len);
354	assert (pline.t);
355	#endif
356
357	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));	355	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
358	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));	356	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
359		357
360	lofs += len;	358	lofs += len;
361	qcol += len;	359	qcol += len;
…		…
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	}
409		406
410	CLEAR_ALL_SELECTION ();	407	CLEAR_ALL_SELECTION ();
411		408
412	prev_nrow = nrow;	409	prev_nrow = nrow;
…		…
415	tabs = (char )rxvt_malloc (ncol sizeof (char));	412	tabs = (char )rxvt_malloc (ncol sizeof (char));
416		413
417	for (int col = ncol; col--; )	414	for (int col = ncol; col--; )
418	tabs [col] = col % TABSIZE == 0;	415	tabs [col] = col % TABSIZE == 0;
419		416
		417	if (current_screen != PRIMARY)
		418	scr_swap_screen ();
		419
420	tt_winch ();	420	tt_winch ();
421		421
422	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	422	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423	}	423	}
424		424
…		…
427	* Free everything. That way malloc debugging can find leakage.	427	* Free everything. That way malloc debugging can find leakage.
428	*/	428	*/
429	void	429	void
430	rxvt_term::scr_release () NOTHROW	430	rxvt_term::scr_release () NOTHROW
431	{	431	{
		432	if (row_buf)
		433	{
432	delete talloc; talloc = 0;	434	delete talloc; talloc = 0;
433	delete ralloc; ralloc = 0;	435	delete ralloc; ralloc = 0;
434		436
435	free (row_buf);	437	free (row_buf);
436	free (swap_buf);	438	free (swap_buf);
437	free (drawn_buf);	439	free (drawn_buf);
438	free (tabs);	440	free (tabs);
439		441
440	row_buf = 0; // signal that we freed all the arrays	442	row_buf = 0; // signal that we freed all the arrays
		443	}
441	}	444	}
442		445
443	/* ------------------------------------------------------------------------- */	446	/* ------------------------------------------------------------------------- */
444	/*	447	/*
445	* Hard reset	448	* Hard reset
446	*/	449	*/
447	void	450	void
448	rxvt_term::scr_poweron () NOTHROW	451	rxvt_term::scr_poweron ()
449	{	452	{
450	scr_release ();	453	scr_release ();
451	prev_nrow = prev_ncol = 0;	454	prev_nrow = prev_ncol = 0;
452	scr_reset ();	455	scr_reset ();
453		456
…		…
504	assert (s->cur.row >= 0);	507	assert (s->cur.row >= 0);
505	assert (s->cur.col >= 0);	508	assert (s->cur.col >= 0);
506	#endif	509	#endif
507	}	510	}
508		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
509	/* ------------------------------------------------------------------------- */	527	/* ------------------------------------------------------------------------- */
510	/*	528	/*
511	* Swap between primary and secondary screens	529	* Swap between primary and secondary screens
512	* XTERM_SEQ: Primary screen : ESC [ ? 4 7 h	530	* XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l	531	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514	*/	532	*/
515	int	533	void
516	rxvt_term::scr_change_screen (int scrn) NOTHROW	534	rxvt_term::scr_change_screen (int scrn)
517	{	535	{
		536	if (scrn == current_screen)
		537	return;
		538
518	want_refresh = 1;	539	want_refresh = 1;
519	view_start = 0;	540	view_start = 0;
520		541
521	if (current_screen == scrn)
522	return scrn;
523
524	selection_check (2); /* check for boundary cross */	542	selection_check (2); /* check for boundary cross */
525		543
526	int i = current_screen; current_screen = scrn; scrn = i;	544	int i = current_screen; current_screen = scrn; scrn = i;
527
528	::swap (screen.cur.row, swap.cur.row);
529	::swap (screen.cur.col, swap.cur.col);
530
531	screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
532	screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
533		545
534	#if NSCREENS	546	#if NSCREENS
535	if (OPTION (Opt_secondaryScreen))	547	if (OPTION (Opt_secondaryScreen))
536	{	548	{
537	num_scr = 0;	549	num_scr = 0;
538		550
539	for (int i = prev_nrow; i--; )	551	scr_swap_screen ();
540	::swap (ROW(i), swap_buf [i]);
541		552
542	::swap (screen.charset, swap.charset);	553	::swap (screen.charset, swap.charset);
543	::swap (screen.flags, swap.flags);	554	::swap (screen.flags, swap.flags);
544	screen.flags \|= Screen_VisibleCursor;	555	screen.flags \|= Screen_VisibleCursor;
545	swap.flags \|= Screen_VisibleCursor;	556	swap.flags \|= Screen_VisibleCursor;
546	}	557	}
547	else	558	else
548	#endif	559	#endif
549	if (OPTION (Opt_secondaryScroll))	560	if (OPTION (Opt_secondaryScroll))
550	scr_scroll_text (0, prev_nrow - 1, prev_nrow);	561	scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552	return scrn;
553	}	562	}
554		563
555	// clear WrapNext indicator, solidifying position on next line	564	// clear WrapNext indicator, solidifying position on next line
556	void	565	void
557	rxvt_term::scr_do_wrap () NOTHROW	566	rxvt_term::scr_do_wrap () NOTHROW
…		…
749	ZERO_SCROLLBACK ();	758	ZERO_SCROLLBACK ();
750		759
751	if (minlines > 0)	760	if (minlines > 0)
752	{	761	{
753	minlines += screen.cur.row - screen.bscroll;	762	minlines += screen.cur.row - screen.bscroll;
		763	min_it (minlines, screen.cur.row - top_row);
754		764
755	if (minlines > 0	765	if (minlines > 0
756	&& screen.tscroll == 0	766	&& screen.tscroll == 0
757	&& screen.bscroll == nrow - 1)	767	&& screen.bscroll == nrow - 1)
758	{	768	{
…		…
832		842
833	// some utf-8 decoders "decode" surrogate characters: let's fix this.	843	// some utf-8 decoders "decode" surrogate characters: let's fix this.
834	if (IN_RANGE_INC (c, 0xd800, 0xdfff))	844	if (IN_RANGE_INC (c, 0xd800, 0xdfff))
835	c = 0xfffd;	845	c = 0xfffd;
836		846
837	// rely on wcwidth to tell us the character width, at least for non-latin1	847	// rely on wcwidth to tell us the character width, do wcwidth before
838	// do wcwidth before further replacements, as wcwidth might return -1	848	// further replacements, as wcwidth might return -1 for the line
839	// for the line drawing characters below as they might be invalid in the current	849	// drawing characters below as they might be invalid in the current
840	// locale.	850	// locale.
841	int width = c < 0x100 ? 1 : wcwidth (c);	851	int width = WCWIDTH (c);
842		852
843	if (charsets [screen.charset] == '0') // DEC SPECIAL	853	if (charsets [screen.charset] == '0') // DEC SPECIAL
844	{	854	{
845	// vt100 special graphics and line drawing	855	// vt100 special graphics and line drawing
846	// 5f-7e standard vt100	856	// 5f-7e standard vt100
…		…
1621	* Set reverse/normal video	1631	* Set reverse/normal video
1622	* XTERM_SEQ: Reverse video: ESC [ ? 5 h	1632	* XTERM_SEQ: Reverse video: ESC [ ? 5 h
1623	* XTERM_SEQ: Normal video : ESC [ ? 5 l	1633	* XTERM_SEQ: Normal video : ESC [ ? 5 l
1624	*/	1634	*/
1625	void	1635	void
1626	rxvt_term::scr_rvideo_mode (int mode) NOTHROW	1636	rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1627	{	1637	{
1628	XGCValues gcvalue;	1638	rvideo_mode = on;
1629		1639
		1640	#ifndef NO_BELL
		1641	on ^= rvideo_bell;
		1642	#endif
		1643
1630	if (rvideo != mode)	1644	if (rvideo_state != on)
1631	{	1645	{
1632	rvideo = mode;	1646	rvideo_state = on;
		1647
1633	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1648	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1634	#if XPM_BACKGROUND	1649	#if XPM_BACKGROUND
1635	if (bgPixmap.pixmap == None)	1650	if (bgPixmap.pixmap == None)
1636	#endif	1651	#endif
1637	#if TRANSPARENT	1652	#if TRANSPARENT
1638	if (! OPTION (Opt_transparent) \|\| am_transparent == 0)	1653	if (!OPTION (Opt_transparent) \|\| am_transparent == 0)
1639	#endif	1654	#endif
1640	XSetWindowBackground (display->display, vt,	1655	XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1641	pix_colors[Color_bg]);
1642		1656
		1657	XGCValues gcvalue;
1643	gcvalue.foreground = pix_colors[Color_fg];	1658	gcvalue.foreground = pix_colors[Color_fg];
1644	gcvalue.background = pix_colors[Color_bg];	1659	gcvalue.background = pix_colors[Color_bg];
1645	XChangeGC (display->display, gc, GCBackground \| GCForeground,	1660	XChangeGC (display->display, gc, GCBackground \| GCForeground, &gcvalue);
1646	&gcvalue);	1661
1647	scr_clear ();	1662	scr_clear ();
1648	scr_touch (true);	1663	scr_touch (true);
1649	}	1664	}
1650	}	1665	}
1651		1666
…		…
1851	HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));	1866	HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1852		1867
1853	return true;	1868	return true;
1854	}	1869	}
1855		1870
		1871	#ifndef NO_BELL
		1872	void
		1873	rxvt_term::bell_cb (time_watcher &w)
		1874	{
		1875	rvideo_bell = false;
		1876	scr_rvideo_mode (rvideo_mode);
		1877	}
		1878	#endif
		1879
1856	/* ------------------------------------------------------------------------- */	1880	/* ------------------------------------------------------------------------- */
1857	void	1881	void
1858	rxvt_term::scr_bell () NOTHROW	1882	rxvt_term::scr_bell () NOTHROW
1859	{	1883	{
1860	#ifndef NO_BELL	1884	#ifndef NO_BELL
…		…
1866	XMapWindow (display->display, parent[0]);	1890	XMapWindow (display->display, parent[0]);
1867	# endif	1891	# endif
1868		1892
1869	if (OPTION (Opt_visualBell))	1893	if (OPTION (Opt_visualBell))
1870	{	1894	{
1871	scr_rvideo_mode (!rvideo); /* refresh also done */	1895	rvideo_bell = true;
		1896	scr_rvideo_mode (rvideo_mode);
1872	display->flush ();	1897	display->flush ();
1873	rxvt_usleep (VISUAL_BELL_DURATION);	1898
1874	scr_rvideo_mode (!rvideo); /* refresh also done */	1899	bell_ev.start (NOW + VISUAL_BELL_DURATION);
1875	}	1900	}
1876	else	1901	else
1877	XBell (display->display, 0);	1902	XBell (display->display, 0);
1878		1903
1879	#endif	1904	#endif
…		…
2219		2244
2220	// only do special processing if any attributes are set, which is unlikely	2245	// only do special processing if any attributes are set, which is unlikely
2221	if (rend & (RS_Bold \| RS_Italic \| RS_Uline \| RS_RVid \| RS_Blink \| RS_Careful))	2246	if (rend & (RS_Bold \| RS_Italic \| RS_Uline \| RS_RVid \| RS_Blink \| RS_Careful))
2222	{	2247	{
2223	#if ENABLE_STYLES	2248	#if ENABLE_STYLES
2224	// force redraw after "careful" characters to avoid pixel droppings	2249	// "careful" (too wide) character handling
2225	if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2226	drp[col + 1] = ~srp[col + 1];
2227		2250
2228	// include previous careful character(s) if possible, looks nicer (best effort...)	2251	// include previous careful character(s) if possible, looks nicer (best effort...)
2229	while (text > stp	2252	while (text > stp
2230	&& srp[text - stp - 1] & RS_Careful	2253	&& srp[text - stp - 1] & RS_Careful
2231	&& RS_SAME (rend, srp[text - stp - 1]))	2254	&& RS_SAME (rend, srp[text - stp - 1]))
2232	text--, count++, xpixel -= fwidth;	2255	text--, count++, xpixel -= fwidth;
		2256
		2257	// force redraw after "careful" characters to avoid pixel droppings
		2258	for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
		2259	drp[col + i + 1] = ~srp[col + i + 1];
		2260
		2261	// force redraw before "careful" characters to avoid pixel droppings
		2262	for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
		2263	drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2233	#endif	2264	#endif
2234		2265
2235	bool invert = rend & RS_RVid;	2266	bool invert = rend & RS_RVid;
2236		2267
2237	#ifndef NO_BOLD_UNDERLINE_REVERSE	2268	#ifndef NO_BOLD_UNDERLINE_REVERSE
…		…
3739	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW	3770	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3740	{	3771	{
3741	while (*s)	3772	while (*s)
3742	{	3773	{
3743	text_t t = *s++;	3774	text_t t = *s++;
3744	int width = wcwidth (t);	3775	int width = WCWIDTH (t);
3745		3776
3746	while (width--)	3777	while (width--)
3747	{	3778	{
3748	scr_overlay_set (x++, y, t);	3779	scr_overlay_set (x++, y, t);
3749	t = NOCHAR;	3780	t = NOCHAR;

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.245 by root, Fri Jan 20 10:35:25 2006 UTC vs. Revision 1.250 by root, Wed Jan 25 13:24:45 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.245 by root, Fri Jan 20 10:35:25 2006 UTC vs.
Revision 1.250 by root, Wed Jan 25 13:24:45 2006 UTC