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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.418 by root, Fri Oct 10 00:11:44 2008 UTC vs.
Revision 1.438 by root, Thu Feb 4 21:55:12 2010 UTC

…		…
505	#ifdef PAGING_CONTEXT_LINES	505	#ifdef PAGING_CONTEXT_LINES
506	lnsppg = nrow - PAGING_CONTEXT_LINES;	506	lnsppg = nrow - PAGING_CONTEXT_LINES;
507	#else	507	#else
508	lnsppg = nrow * 4 / 5;	508	lnsppg = nrow * 4 / 5;
509	#endif	509	#endif
		510	max_it (lnsppg, 1);
		511
510	if (keysym == XK_Prior)	512	if (keysym == XK_Prior)
511	{	513	{
512	scr_page (UP, lnsppg);	514	scr_page (UP, lnsppg);
513	return;	515	return;
514	}	516	}
…		…
579	}	581	}
580	}	582	}
581		583
582	#if ENABLE_FRILLS \|\| ISO_14755	584	#if ENABLE_FRILLS \|\| ISO_14755
583	// ISO 14755 support	585	// ISO 14755 support
584	if (shft && ctrl)	586	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))
585	{	587	{
586	int hv;	588	int hv;
587		589
588	if (iso14755buf & ISO_14755_51	590	if (iso14755buf & ISO_14755_51
589	&& (keysym == XK_space \|\| keysym == XK_KP_Space	591	&& (keysym == XK_space \|\| keysym == XK_KP_Space
…		…
619	scr_overlay_off ();	621	scr_overlay_off ();
620	# endif	622	# endif
621	iso14755buf = 0;	623	iso14755buf = 0;
622	}	624	}
623	}	625	}
		626	else if (option (Opt_iso14755) &&
624	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))	627	((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))
625	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))	628	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R))))
626	if (!(iso14755buf & ISO_14755_STARTED))	629	if (!(iso14755buf & ISO_14755_STARTED))
627	{	630	{
628	iso14755buf \|= ISO_14755_STARTED;	631	iso14755buf \|= ISO_14755_STARTED;
629	# if ISO_14755	632	# if ISO_14755
630	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	633	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
…		…
1127	{	1130	{
1128	// this should really be sched_yield(), but the linux guys thought	1131	// this should really be sched_yield(), but the linux guys thought
1129	// that giving a process calling sched_yield () less cpu time than	1132	// that giving a process calling sched_yield () less cpu time than
1130	// ones with high nice levels is a useful thing to do. It surely is is	1133	// ones with high nice levels is a useful thing to do. It surely is is
1131	// allowed by the sus... as is returning ENOSYS.	1134	// allowed by the sus... as is returning ENOSYS.
		1135	// since the linux guys additionally thought that breaking the only
		1136	// known workaroudn against their unusable sched_yield hack is cool,
		1137	// we just nanosleep a bit and hope for the best.
1132		1138
1133	struct timespec ts = { 0, 0 };	1139	struct timespec ts = { 0, 1000 };
1134	nanosleep (&ts, 0);	1140	nanosleep (&ts, 0);
1135		1141
1136	w.stop ();	1142	w.stop ();
1137	}	1143	}
1138		1144
…		…
1188	{	1194	{
1189	make_current ();	1195	make_current ();
1190		1196
1191	if (revents & ev::READ)	1197	if (revents & ev::READ)
1192	// loop, but don't allow a single term to monopolize us	1198	// loop, but don't allow a single term to monopolize us
1193	while (pty_fill ())	1199	for (int i = CBUFCNT; i-- && pty_fill (); )
1194	if (cmd_parse ())	1200	cmd_parse ();
1195	break;
1196		1201
1197	if (revents & ev::WRITE)	1202	if (revents & ev::WRITE)
1198	pty_write ();	1203	pty_write ();
1199		1204
1200	refresh_check ();	1205	refresh_check ();
…		…
1459	selection_property (ev.xproperty.window, ev.xproperty.atom);	1464	selection_property (ev.xproperty.window, ev.xproperty.atom);
1460		1465
1461	break;	1466	break;
1462		1467
1463	case SelectionClear:	1468	case SelectionClear:
1464	selection_clear ();	1469	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465	break;	1470	break;
1466		1471
1467	case SelectionNotify:	1472	case SelectionNotify:
1468	if (selection_wait == Sel_normal)	1473	if (selection_wait == Sel_normal)
1469	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1474	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
…		…
1682	#endif	1687	#endif
1683		1688
1684	refresh_check ();	1689	refresh_check ();
1685	}	1690	}
1686		1691
		1692	#if ENABLE_FRILLS
		1693	void
		1694	rxvt_term::set_urgency (bool enable)
		1695	{
		1696	if (enable == urgency_hint)
		1697	return;
		1698
		1699	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1700	{
		1701	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
		1702	XSetWMHints (dpy, parent[0], h);
		1703	urgency_hint = enable;
		1704	}
		1705	}
		1706	#endif
		1707
1687	void	1708	void
1688	rxvt_term::focus_in ()	1709	rxvt_term::focus_in ()
1689	{	1710	{
1690	if (!focus)	1711	if (!focus)
1691	{	1712	{
1692	focus = 1;	1713	focus = 1;
1693	want_refresh = 1;	1714	want_refresh = 1;
1694
1695	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696		1715
1697	#if USE_XIM	1716	#if USE_XIM
1698	if (Input_Context != NULL)	1717	if (Input_Context != NULL)
1699	{	1718	{
1700	IMSetPosition ();	1719	IMSetPosition ();
…		…
1712	scr_recolour ();	1731	scr_recolour ();
1713	}	1732	}
1714	#endif	1733	#endif
1715	#if ENABLE_FRILLS	1734	#if ENABLE_FRILLS
1716	if (option (Opt_urgentOnBell))	1735	if (option (Opt_urgentOnBell))
1717	{	1736	set_urgency (0);
1718	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719	{
1720	h->flags &= ~XUrgencyHint;
1721	XSetWMHints (dpy, parent[0], h);
1722	}
1723	}
1724	#endif	1737	#endif
		1738
		1739	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725	}	1740	}
1726	}	1741	}
1727		1742
1728	void	1743	void
1729	rxvt_term::focus_out ()	1744	rxvt_term::focus_out ()
…		…
1731	if (focus)	1746	if (focus)
1732	{	1747	{
1733	focus = 0;	1748	focus = 0;
1734	want_refresh = 1;	1749	want_refresh = 1;
1735		1750
1736	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1751	#if ENABLE_FRILLS
1737		1752	if (option (Opt_urgentOnBell))
		1753	set_urgency (0);
		1754	#endif
1738	#if ENABLE_FRILLS \|\| ISO_14755	1755	#if ENABLE_FRILLS \|\| ISO_14755
1739	if (iso14755buf)	1756	if (iso14755buf)
1740	{	1757	{
1741	iso14755buf = 0;	1758	iso14755buf = 0;
1742	# if ISO_14755	1759	# if ISO_14755
…		…
1759	{	1776	{
1760	pix_colors = pix_colors_unfocused;	1777	pix_colors = pix_colors_unfocused;
1761	scr_recolour ();	1778	scr_recolour ();
1762	}	1779	}
1763	#endif	1780	#endif
		1781
		1782	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764	}	1783	}
1765	}	1784	}
1766		1785
1767	void	1786	void
1768	rxvt_term::update_fade_color (unsigned int idx)	1787	rxvt_term::update_fade_color (unsigned int idx)
…		…
2170	}	2189	}
2171	}	2190	}
2172		2191
2173	/}}} /	2192	/}}} /
2174		2193
2175	bool	2194	void
2176	rxvt_term::cmd_parse ()	2195	rxvt_term::cmd_parse ()
2177	{	2196	{
2178	bool flag = false;
2179	wchar_t ch = NOCHAR;	2197	wchar_t ch = NOCHAR;
2180	char *seq_begin; // remember start of esc-sequence here	2198	char *seq_begin; // remember start of esc-sequence here
2181		2199
2182	for (;;)	2200	for (;;)
2183	{	2201	{
…		…
2277	* What the heck we'll cheat and only refresh less than every page-full.	2295	* What the heck we'll cheat and only refresh less than every page-full.
2278	* if skipScroll is enabled.	2296	* if skipScroll is enabled.
2279	*/	2297	*/
2280	if (refreshnow)	2298	if (refreshnow)
2281	{	2299	{
2282	flag = true;
2283	scr_refresh ();	2300	scr_refresh ();
2284	want_refresh = 1;	2301	want_refresh = 1;
2285	}	2302	}
2286
2287	}	2303	}
2288	else	2304	else
2289	{	2305	{
2290	try	2306	try
2291	{	2307	{
…		…
2299	}	2315	}
2300		2316
2301	ch = NOCHAR;	2317	ch = NOCHAR;
2302	}	2318	}
2303	}	2319	}
2304
2305	return flag;
2306	}	2320	}
2307		2321
2308	// read the next character	2322	// read the next character
2309	wchar_t	2323	wchar_t
2310	rxvt_term::next_char () NOTHROW	2324	rxvt_term::next_char () NOTHROW
…		…
2325	break;	2339	break;
2326	}	2340	}
2327		2341
2328	if (len == (size_t)-1)	2342	if (len == (size_t)-1)
2329	{	2343	{
2330	mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state	2344	mbstate.reset (); // reset now undefined conversion state
2331	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2345	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332	}	2346	}
2333		2347
2334	// assume wchar == unicode	2348	// assume wchar == unicode
2335	cmdbuf_ptr += len;	2349	cmdbuf_ptr += len;
…		…
2679	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2693	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2680	case C1_SCI: /* ESC Z */	2694	case C1_SCI: /* ESC Z */
2681	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2695	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2682	break; /* steal obsolete ESC [ c */	2696	break; /* steal obsolete ESC [ c */
2683		2697
2684	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2698	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2685	case C1_CSI: /* ESC [ */	2699	case C1_CSI: /* ESC [ */
2686	process_csi_seq ();	2700	process_csi_seq ();
2687	break;	2701	break;
2688		2702
2689	/* 8.3.90: OPERATING SYSTEM COMMAND */	2703	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2690	case C1_OSC: /* ESC ] */	2704	case C1_OSC: /* ESC ] */
2691	process_osc_seq ();	2705	process_osc_seq ();
2692	break;	2706	break;
2693		2707
2694	/* 8.3.106: RESET TO INITIAL STATE */	2708	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2695	case 'c':	2709	case 'c':
2696	mbstate.reset ();	2710	mbstate.reset ();
2697	scr_poweron ();	2711	scr_poweron ();
2698	scrollBar.show (1);	2712	scrollBar.show (1);
2699	break;	2713	break;
…		…
2754		2768
2755	nargs = 0;	2769	nargs = 0;
2756		2770
2757	priv = 0;	2771	priv = 0;
2758	ch = cmd_getc ();	2772	ch = cmd_getc ();
2759	if (ch >= '<' && ch <= '?')	2773	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2760	{	2774	{
2761	/* '<' '=' '>' '?' */	2775	/* '<' '=' '>' '?' '!' */
2762	priv = ch;	2776	priv = ch;
2763	ch = cmd_getc ();	2777	ch = cmd_getc ();
2764	}	2778	}
2765		2779
2766	/* read any numerical arguments */	2780	/* read any numerical arguments */
…		…
2820		2834
2821	case '?':	2835	case '?':
2822	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2836	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2823	process_terminal_mode (ch, priv, nargs, arg);	2837	process_terminal_mode (ch, priv, nargs, arg);
2824	break;	2838	break;
		2839
		2840	case '!':
		2841	if (ch == CSI_70)
		2842	{
		2843	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2844	scr_soft_reset ();
		2845
		2846	static const int pm_h[] = { 7, 25 };
		2847	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
		2848
		2849	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2850	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2825	}	2851	}
		2852	break;
		2853	}
		2854
2826	return;	2855	return;
2827	}	2856	}
2828		2857
2829	switch (ch)	2858	switch (ch)
2830	{	2859	{
…		…
3259		3288
3260	/*	3289	/*
3261	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3290	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3262	*/	3291	*/
3263	void	3292	void
3264	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3293	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3265	{	3294	{
3266	int color;	3295	int color;
3267	char buf, name;	3296	char buf, name;
3268	bool query = str[0] == '?' && !str[1];	3297	bool query = str[0] == '?' && !str[1];
3269	int saveop = op;	3298	int saveop = op;
…		…
3272		3301
3273	assert (str != NULL);	3302	assert (str != NULL);
3274		3303
3275	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))	3304	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3276	return;	3305	return;
3277	fprintf (stderr, "op %d<%s>\n", op, str);//D
3278		3306
3279	switch (op)	3307	switch (op)
3280	{	3308	{
3281	case XTerm_name:	3309	case XTerm_name:
3282	set_title (str);	3310	set_title (str);
…		…
3311		3339
3312	XFree (value);	3340	XFree (value);
3313	}	3341	}
3314	else	3342	else
3315	{	3343	{
3316	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3344	char *eq = strchr (str, '=');
3317		3345
3318	if (eq)	3346	if (eq)
3319	{	3347	{
3320	*eq = 0;	3348	*eq = 0;
3321	set_utf8_property (display->atom (str), eq + 1);	3349	set_utf8_property (display->atom (str), eq + 1);
…		…
3377	break;	3405	break;
3378	case URxvt_Color_IT:	3406	case URxvt_Color_IT:
3379	process_color_seq (op, Color_IT, str, resp);	3407	process_color_seq (op, Color_IT, str, resp);
3380	break;	3408	break;
3381	#endif	3409	#endif
		3410	case URxvt_Color_border:
		3411	process_color_seq (op, Color_border, str, resp);
		3412	break;
3382	#if ENABLE_TRANSPARENCY	3413	#if ENABLE_TRANSPARENCY
3383	case URxvt_Color_tint:	3414	case URxvt_Color_tint:
3384	process_color_seq (op, Color_tint, str, resp);	3415	process_color_seq (op, Color_tint, str, resp);
3385	{	3416	{
3386	bool changed = false;	3417	bool changed = false;
…		…
3401	case Rxvt_Pixmap:	3432	case Rxvt_Pixmap:
3402	if (!strcmp (str, "?"))	3433	if (!strcmp (str, "?"))
3403	{	3434	{
3404	char str[256];	3435	char str[256];
3405		3436
3406	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3437	sprintf (str, "[%dx%d+%d+%d]",
3407	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3438	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3408	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3439	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3409	process_xterm_seq (XTerm_title, str, CHAR_ST);	3440	process_xterm_seq (XTerm_title, str, CHAR_ST);
3410	}	3441	}
3411	else	3442	else
…		…
3561	static const struct	3592	static const struct
3562	{	3593	{
3563	const int argval;	3594	const int argval;
3564	const unsigned long bit;	3595	const unsigned long bit;
3565	} argtopriv[] = {	3596	} argtopriv[] = {
3566	{ 1, PrivMode_aplCUR },	3597	{ 1, PrivMode_aplCUR }, // DECCKM
3567	{ 2, PrivMode_vt52 },	3598	{ 2, PrivMode_vt52 },
3568	{ 3, PrivMode_132 },	3599	{ 3, PrivMode_132 }, // DECCOLM
3569	{ 4, PrivMode_smoothScroll },	3600	{ 4, PrivMode_smoothScroll }, // DECSCLM
3570	{ 5, PrivMode_rVideo },	3601	{ 5, PrivMode_rVideo }, // DECSCNM
3571	{ 6, PrivMode_relOrigin },	3602	{ 6, PrivMode_relOrigin }, // DECOM
3572	{ 7, PrivMode_Autowrap },	3603	{ 7, PrivMode_Autowrap }, // DECAWM
3573	// 8, bi-directional support mode	3604	// 8, auto-repeat keys // DECARM
3574	{ 9, PrivMode_MouseX10 },	3605	{ 9, PrivMode_MouseX10 },
3575	// 18, 19 printing-related	3606	// 18 end FF to printer after print screen
		3607	// 19 Print screen prints full screen/scorll region
3576	{ 25, PrivMode_VisibleCursor },	3608	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3577	#ifdef scrollBar_esc	3609	#ifdef scrollBar_esc
3578	{ scrollBar_esc, PrivMode_scrollBar },	3610	{ scrollBar_esc, PrivMode_scrollBar },
3579	#endif	3611	#endif
3580	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3612	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3613	// 38, tektronix mode // DECTEK
3581	{ 40, PrivMode_132OK },	3614	{ 40, PrivMode_132OK },
3582	// 41 xterm more fixes NYI	3615	// 41 xterm more fixes NYI
3583	// 45 margin bell NYI	3616	// 45 margin bell NYI
3584	// 46 start logging	3617	// 46 start logging
3585	{ 47, PrivMode_Screen },	3618	{ 47, PrivMode_Screen },
3586	{ 66, PrivMode_aplKP },	3619	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3587	#ifndef NO_BACKSPACE_KEY	3620	#ifndef NO_BACKSPACE_KEY
3588	{ 67, PrivMode_BackSpace },	3621	{ 67, PrivMode_BackSpace }, // DECBKM
3589	#endif	3622	#endif
3590	{ 1000, PrivMode_MouseX11 },	3623	{ 1000, PrivMode_MouseX11 },
3591	{ 1002, PrivMode_MouseBtnEvent },	3624	{ 1002, PrivMode_MouseBtnEvent },
3592	{ 1003, PrivMode_MouseAnyEvent },	3625	{ 1003, PrivMode_MouseAnyEvent },
3593	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3626	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
…		…
3632		3665
3633	scr_touch (true);	3666	scr_touch (true);
3634	break;	3667	break;
3635	#endif	3668	#endif
3636	case 1048: /* alternative cursor save */	3669	case 1048: /* alternative cursor save */
3637	case 1049:
3638	if (option (Opt_secondaryScreen))	3670	if (option (Opt_secondaryScreen))
3639	if (mode == 0)	3671	if (mode == 0)
3640	scr_cursor (RESTORE);	3672	scr_cursor (RESTORE);
3641	else if (mode == 1)	3673	else if (mode == 1)
3642	scr_cursor (SAVE);	3674	scr_cursor (SAVE);
…		…
3655	*/	3687	*/
3656	set_privmode (PrivMode_vt52, 1);	3688	set_privmode (PrivMode_vt52, 1);
3657	break;	3689	break;
3658	case 3: /* 80/132 */	3690	case 3: /* 80/132 */
3659	if (priv_modes & PrivMode_132OK)	3691	if (priv_modes & PrivMode_132OK)
3660	{
3661	scr_poweron ();
3662	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3692	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3663	}
3664	break;	3693	break;
3665	case 4: /* smooth scrolling */	3694	case 4: /* smooth scrolling */
3666	set_option (Opt_jumpScroll, !state);	3695	set_option (Opt_jumpScroll, !state);
3667	break;	3696	break;
3668	case 5: /* reverse video */	3697	case 5: /* reverse video */
…		…
3710	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3739	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3711	vt_emask_mouse = PointerMotionMask;	3740	vt_emask_mouse = PointerMotionMask;
3712	}	3741	}
3713	else	3742	else
3714	vt_emask_mouse = NoEventMask;	3743	vt_emask_mouse = NoEventMask;
		3744
3715	vt_select_input ();	3745	vt_select_input ();
3716	break;	3746	break;
3717	case 1010: /* scroll to bottom on TTY output inhibit */	3747	case 1010: /* scroll to bottom on TTY output inhibit */
3718	set_option (Opt_scrollTtyOutput, !state);	3748	set_option (Opt_scrollTtyOutput, !state);
3719	break;	3749	break;
3720	case 1011: /* scroll to bottom on key press */	3750	case 1011: /* scroll to bottom on key press */
3721	set_option (Opt_scrollTtyKeypress, state);	3751	set_option (Opt_scrollTtyKeypress, state);
3722	break;	3752	break;
3723	case 1047: /* secondary screen w/ clearing last */	3753	case 1047: /* secondary screen w/ clearing last */
3724	if (option (Opt_secondaryScreen))	3754	if (option (Opt_secondaryScreen))
3725	if (current_screen != PRIMARY)	3755	if (!state)
3726	scr_erase_screen (2);	3756	scr_erase_screen (2);
		3757
3727	scr_change_screen (state);	3758	scr_change_screen (state);
3728	break;	3759	break;
3729	case 1049: /* secondary screen w/ clearing first */	3760	case 1049: /* secondary screen w/ clearing first */
		3761	if (option (Opt_secondaryScreen))
		3762	if (state)
		3763	scr_cursor (SAVE);
		3764
3730	scr_change_screen (state);	3765	scr_change_screen (state);
		3766
3731	if (option (Opt_secondaryScreen))	3767	if (option (Opt_secondaryScreen))
3732	if (current_screen != PRIMARY)	3768	if (state)
3733	scr_erase_screen (2);	3769	scr_erase_screen (2);
		3770	else
		3771	scr_cursor (RESTORE);
3734	break;	3772	break;
3735	default:	3773	default:
3736	break;	3774	break;
3737	}	3775	}
3738	}	3776	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.418 by root, Fri Oct 10 00:11:44 2008 UTC vs. Revision 1.438 by root, Thu Feb 4 21:55:12 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.418 by root, Fri Oct 10 00:11:44 2008 UTC vs.
Revision 1.438 by root, Thu Feb 4 21:55:12 2010 UTC