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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.409 by ayin, Sat Feb 16 15:39:20 2008 UTC vs.
Revision 1.438 by root, Thu Feb 4 21:55:12 2010 UTC

…		…
376	param = 5;	376	param = 5;
377	break;	377	break;
378	case XK_Next:	378	case XK_Next:
379	param = 6;	379	param = 6;
380	break;	380	break;
		381	case XK_Home:
		382	param = 7;
		383	break;
		384	case XK_End:
		385	param = 8;
		386	break;
381	#endif	387	#endif
382	case XK_Help:	388	case XK_Help:
383	param = 28;	389	param = 28;
384	break;	390	break;
385	case XK_Menu:	391	case XK_Menu:
…		…
413	meta = ev.state & ModMetaMask;	419	meta = ev.state & ModMetaMask;
414		420
415	if (numlock_state \|\| (ev.state & ModNumLockMask))	421	if (numlock_state \|\| (ev.state & ModNumLockMask))
416	{	422	{
417	numlock_state = (ev.state & ModNumLockMask);	423	numlock_state = (ev.state & ModNumLockMask);
418	PrivMode ((!numlock_state), PrivMode_aplKP);	424	set_privmode (PrivMode_aplKP, !numlock_state);
419	}	425	}
420		426
421	kbuf[0] = 0;	427	kbuf[0] = 0;
422		428
423	#ifdef USE_XIM	429	#ifdef USE_XIM
…		…
499	#ifdef PAGING_CONTEXT_LINES	505	#ifdef PAGING_CONTEXT_LINES
500	lnsppg = nrow - PAGING_CONTEXT_LINES;	506	lnsppg = nrow - PAGING_CONTEXT_LINES;
501	#else	507	#else
502	lnsppg = nrow * 4 / 5;	508	lnsppg = nrow * 4 / 5;
503	#endif	509	#endif
		510	max_it (lnsppg, 1);
		511
504	if (keysym == XK_Prior)	512	if (keysym == XK_Prior)
505	{	513	{
506	scr_page (UP, lnsppg);	514	scr_page (UP, lnsppg);
507	return;	515	return;
508	}	516	}
…		…
573	}	581	}
574	}	582	}
575		583
576	#if ENABLE_FRILLS \|\| ISO_14755	584	#if ENABLE_FRILLS \|\| ISO_14755
577	// ISO 14755 support	585	// ISO 14755 support
578	if (shft && ctrl)	586	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))
579	{	587	{
580	int hv;	588	int hv;
581		589
582	if (iso14755buf & ISO_14755_51	590	if (iso14755buf & ISO_14755_51
583	&& (keysym == XK_space \|\| keysym == XK_KP_Space	591	&& (keysym == XK_space \|\| keysym == XK_KP_Space
…		…
613	scr_overlay_off ();	621	scr_overlay_off ();
614	# endif	622	# endif
615	iso14755buf = 0;	623	iso14755buf = 0;
616	}	624	}
617	}	625	}
		626	else if (option (Opt_iso14755) &&
618	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))	627	((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))
619	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))	628	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R))))
620	if (!(iso14755buf & ISO_14755_STARTED))	629	if (!(iso14755buf & ISO_14755_STARTED))
621	{	630	{
622	iso14755buf \|= ISO_14755_STARTED;	631	iso14755buf \|= ISO_14755_STARTED;
623	# if ISO_14755	632	# if ISO_14755
624	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	633	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
…		…
635	}	644	}
636	#endif	645	#endif
637		646
638	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	647	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
639	{	648	{
640	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	649	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
641	unsigned int newlen = 1;	650	unsigned int newlen = 1;
642		651
643	switch (translate_keypad (keysym, kp))	652	switch (translate_keypad (keysym, kp))
		653	{
		654	#ifndef NO_BACKSPACE_KEY
		655	case XK_BackSpace:
		656	if (priv_modes & PrivMode_HaveBackSpace)
		657	{
		658	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
		659	^ !!ctrl) ? '\b' : '\177';
		660	kbuf[1] = '\0';
		661	}
		662	else
		663	strcpy (kbuf, rs[Rs_backspace_key]);
		664	break;
		665	#endif
		666	#ifndef NO_DELETE_KEY
		667	case XK_Delete:
		668	strcpy (kbuf, rs[Rs_delete_key]);
		669	break;
		670	#endif
		671	case XK_Tab:
		672	if (shft)
		673	strcpy (kbuf, "\033[Z");
		674	else
		675	{
		676	#ifdef CTRL_TAB_MAKES_META
		677	if (ctrl)
		678	meta = 1;
		679	#endif
		680	#ifdef MOD4_TAB_MAKES_META
		681	if (ev.state & Mod4Mask)
		682	meta = 1;
		683	#endif
		684	newlen = 0;
		685	}
		686	break;
		687
		688	case XK_Up: /* "\033[A" */
		689	case XK_Down: /* "\033[B" */
		690	case XK_Right: /* "\033[C" */
		691	case XK_Left: /* "\033[D" */
		692	strcpy (kbuf, "\033[Z");
		693	kbuf[2] = "DACB"[keysym - XK_Left];
		694	/* do Shift first */
		695	if (shft)
		696	kbuf[2] = "dacb"[keysym - XK_Left];
		697	else if (ctrl)
		698	{
		699	kbuf[1] = 'O';
		700	kbuf[2] = "dacb"[keysym - XK_Left];
		701	}
		702	else if (priv_modes & PrivMode_aplCUR)
		703	kbuf[1] = 'O';
		704	break;
		705
		706	case XK_KP_Enter:
		707	/* allow shift to override */
		708	if (kp)
		709	{
		710	strcpy (kbuf, "\033OM");
		711	break;
		712	}
		713
		714	/* FALLTHROUGH */
		715
		716	case XK_Return:
		717	if (priv_modes & PrivMode_LFNL)
		718	{
		719	kbuf[0] = '\015';
		720	kbuf[1] = '\012';
		721	kbuf[2] = '\0';
		722	}
		723	else
		724	{
		725	kbuf[0] = '\015';
		726	kbuf[1] = '\0';
		727	}
		728	break;
		729
		730	case XK_KP_F1: /* "\033OP" */
		731	case XK_KP_F2: /* "\033OQ" */
		732	case XK_KP_F3: /* "\033OR" */
		733	case XK_KP_F4: /* "\033OS" */
		734	strcpy (kbuf, "\033OP");
		735	kbuf[2] += (keysym - XK_KP_F1);
		736	break;
		737
		738	case XK_KP_Multiply: /* "\033Oj" : "" /
		739	case XK_KP_Add: /* "\033Ok" : "+" */
		740	case XK_KP_Separator: /* "\033Ol" : "," */
		741	case XK_KP_Subtract: /* "\033Om" : "-" */
		742	case XK_KP_Decimal: /* "\033On" : "." */
		743	case XK_KP_Divide: /* "\033Oo" : "/" */
		744	case XK_KP_0: /* "\033Op" : "0" */
		745	case XK_KP_1: /* "\033Oq" : "1" */
		746	case XK_KP_2: /* "\033Or" : "2" */
		747	case XK_KP_3: /* "\033Os" : "3" */
		748	case XK_KP_4: /* "\033Ot" : "4" */
		749	case XK_KP_5: /* "\033Ou" : "5" */
		750	case XK_KP_6: /* "\033Ov" : "6" */
		751	case XK_KP_7: /* "\033Ow" : "7" */
		752	case XK_KP_8: /* "\033Ox" : "8" */
		753	case XK_KP_9: /* "\033Oy" : "9" */
		754	/* allow shift to override */
		755	if (kp)
		756	{
		757	strcpy (kbuf, "\033Oj");
		758	kbuf[2] += (keysym - XK_KP_Multiply);
		759	}
		760	else
		761	{
		762	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		763	kbuf[1] = '\0';
		764	}
		765	break;
		766
		767	default:
644	{	768	{
645	#ifndef NO_BACKSPACE_KEY
646	case XK_BackSpace:
647	if (priv_modes & PrivMode_HaveBackSpace)
648	{
649	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
650	^ !!ctrl) ? '\b' : '\177';
651	kbuf[1] = '\0';
652	}
653	else
654	strcpy (kbuf, rs[Rs_backspace_key]);
655	break;
656	#endif
657	#ifndef NO_DELETE_KEY
658	case XK_Delete:
659	strcpy (kbuf, rs[Rs_delete_key]);
660	break;
661	#endif
662	case XK_Tab:
663	if (shft)
664	strcpy (kbuf, "\033[Z");
665	else
666	{
667	#ifdef CTRL_TAB_MAKES_META
668	if (ctrl)
669	meta = 1;
670	#endif
671	#ifdef MOD4_TAB_MAKES_META
672	if (ev.state & Mod4Mask)
673	meta = 1;
674	#endif
675	newlen = 0;
676	}
677	break;
678
679	case XK_Up: /* "\033[A" */
680	case XK_Down: /* "\033[B" */
681	case XK_Right: /* "\033[C" */
682	case XK_Left: /* "\033[D" */
683	strcpy (kbuf, "\033[Z");
684	kbuf[2] = "DACB"[keysym - XK_Left];
685	/* do Shift first */
686	if (shft)
687	kbuf[2] = "dacb"[keysym - XK_Left];
688	else if (ctrl)
689	{
690	kbuf[1] = 'O';
691	kbuf[2] = "dacb"[keysym - XK_Left];
692	}
693	else if (priv_modes & PrivMode_aplCUR)
694	kbuf[1] = 'O';
695	break;
696
697	case XK_KP_Enter:
698	/* allow shift to override */
699	if (kp)
700	{
701	strcpy (kbuf, "\033OM");
702	break;
703	}
704
705	/* FALLTHROUGH */
706
707	case XK_Return:
708	if (priv_modes & PrivMode_LFNL)
709	{
710	kbuf[0] = '\015';
711	kbuf[1] = '\012';
712	kbuf[2] = '\0';
713	}
714	else
715	{
716	kbuf[0] = '\015';
717	kbuf[1] = '\0';
718	}
719	break;
720
721	case XK_KP_F1: /* "\033OP" */
722	case XK_KP_F2: /* "\033OQ" */
723	case XK_KP_F3: /* "\033OR" */
724	case XK_KP_F4: /* "\033OS" */
725	strcpy (kbuf, "\033OP");
726	kbuf[2] += (keysym - XK_KP_F1);
727	break;
728
729	case XK_KP_Multiply: /* "\033Oj" : "" /
730	case XK_KP_Add: /* "\033Ok" : "+" */
731	case XK_KP_Separator: /* "\033Ol" : "," */
732	case XK_KP_Subtract: /* "\033Om" : "-" */
733	case XK_KP_Decimal: /* "\033On" : "." */
734	case XK_KP_Divide: /* "\033Oo" : "/" */
735	case XK_KP_0: /* "\033Op" : "0" */
736	case XK_KP_1: /* "\033Oq" : "1" */
737	case XK_KP_2: /* "\033Or" : "2" */
738	case XK_KP_3: /* "\033Os" : "3" */
739	case XK_KP_4: /* "\033Ot" : "4" */
740	case XK_KP_5: /* "\033Ou" : "5" */
741	case XK_KP_6: /* "\033Ov" : "6" */
742	case XK_KP_7: /* "\033Ow" : "7" */
743	case XK_KP_8: /* "\033Ox" : "8" */
744	case XK_KP_9: /* "\033Oy" : "9" */
745	/* allow shift to override */
746	if (kp)
747	{
748	strcpy (kbuf, "\033Oj");
749	kbuf[2] += (keysym - XK_KP_Multiply);
750	}
751	else
752	{
753	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
754	kbuf[1] = '\0';
755	}
756	break;
757
758	case XK_End:
759	strcpy (kbuf, KS_END);
760	break;
761	case XK_Home:
762	strcpy (kbuf, KS_HOME);
763	break;
764
765	default:
766	{
767	int param = map_function_key (keysym);	769	int param = map_function_key (keysym);
768	if (param > 0)	770	if (param > 0)
769	sprintf (kbuf,"\033[%d~", param);	771	sprintf (kbuf,"\033[%d~", param);
770	else	772	else
771	newlen = 0;	773	newlen = 0;
772	}
773	break;
774	}	774	}
		775	break;
		776	}
775		777
776	if (newlen)	778	if (newlen)
777	len = strlen (kbuf);	779	len = strlen (kbuf);
778		780
779	/*	781	/*
780	* Pass meta for all function keys, if 'meta' option set	782	* Pass meta for all function keys, if 'meta' option set
781	*/	783	*/
782	#ifdef META8_OPTION	784	#ifdef META8_OPTION
…		…
1016	}	1018	}
1017	while (row < end_row);	1019	while (row < end_row);
1018	}	1020	}
1019		1021
1020	scr_refresh ();	1022	scr_refresh ();
1021	scrollbar_show (1);	1023	scrollBar.show (1);
1022	#ifdef USE_XIM	1024	#ifdef USE_XIM
1023	IMSendSpot ();	1025	IMSendSpot ();
1024	#endif	1026	#endif
1025	}	1027	}
1026		1028
…		…
1128	{	1130	{
1129	// this should really be sched_yield(), but the linux guys thought	1131	// this should really be sched_yield(), but the linux guys thought
1130	// that giving a process calling sched_yield () less cpu time than	1132	// that giving a process calling sched_yield () less cpu time than
1131	// 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
1132	// 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.
1133		1138
1134	struct timespec ts = { 0, 0 };	1139	struct timespec ts = { 0, 1000 };
1135	nanosleep (&ts, 0);	1140	nanosleep (&ts, 0);
1136		1141
1137	w.stop ();	1142	w.stop ();
1138	}	1143	}
1139		1144
…		…
1189	{	1194	{
1190	make_current ();	1195	make_current ();
1191		1196
1192	if (revents & ev::READ)	1197	if (revents & ev::READ)
1193	// loop, but don't allow a single term to monopolize us	1198	// loop, but don't allow a single term to monopolize us
1194	while (pty_fill ())	1199	for (int i = CBUFCNT; i-- && pty_fill (); )
1195	if (cmd_parse ())	1200	cmd_parse ();
1196	break;
1197		1201
1198	if (revents & ev::WRITE)	1202	if (revents & ev::WRITE)
1199	pty_write ();	1203	pty_write ();
1200		1204
1201	refresh_check ();	1205	refresh_check ();
…		…
1460	selection_property (ev.xproperty.window, ev.xproperty.atom);	1464	selection_property (ev.xproperty.window, ev.xproperty.atom);
1461		1465
1462	break;	1466	break;
1463		1467
1464	case SelectionClear:	1468	case SelectionClear:
1465	selection_clear ();	1469	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1466	break;	1470	break;
1467		1471
1468	case SelectionNotify:	1472	case SelectionNotify:
1469	if (selection_wait == Sel_normal)	1473	if (selection_wait == Sel_normal)
1470	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1474	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
…		…
1537	;	1541	;
1538		1542
1539	if (scrollBar.state && ev.xany.window == scrollBar.win)	1543	if (scrollBar.state && ev.xany.window == scrollBar.win)
1540	{	1544	{
1541	scrollBar.state = STATE_IDLE;	1545	scrollBar.state = STATE_IDLE;
1542	scrollbar_show (0);	1546	scrollBar.show (0);
1543	}	1547	}
1544	}	1548	}
1545	break;	1549	break;
1546		1550
1547	case MotionNotify:	1551	case MotionNotify:
…		…
1646	&unused_root, &unused_child,	1650	&unused_root, &unused_child,
1647	&unused_root_x, &unused_root_y,	1651	&unused_root_x, &unused_root_y,
1648	&ev.xbutton.x, &ev.xbutton.y,	1652	&ev.xbutton.x, &ev.xbutton.y,
1649	&unused_mask);	1653	&unused_mask);
1650	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1654	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1651	scrollbar_size ());	1655	scrollBar.size ());
1652	want_refresh = 1;	1656	want_refresh = 1;
1653	scrollbar_show (1);	1657	scrollBar.show (1);
1654	}	1658	}
1655	break;	1659	break;
1656	}	1660	}
1657		1661
1658	#if defined(CURSOR_BLINK)	1662	#if defined(CURSOR_BLINK)
…		…
1683	#endif	1687	#endif
1684		1688
1685	refresh_check ();	1689	refresh_check ();
1686	}	1690	}
1687		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
1688	void	1708	void
1689	rxvt_term::focus_in ()	1709	rxvt_term::focus_in ()
1690	{	1710	{
1691	if (!focus)	1711	if (!focus)
1692	{	1712	{
1693	focus = 1;	1713	focus = 1;
1694	want_refresh = 1;	1714	want_refresh = 1;
1695
1696	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1697		1715
1698	#if USE_XIM	1716	#if USE_XIM
1699	if (Input_Context != NULL)	1717	if (Input_Context != NULL)
1700	{	1718	{
1701	IMSetPosition ();	1719	IMSetPosition ();
…		…
1713	scr_recolour ();	1731	scr_recolour ();
1714	}	1732	}
1715	#endif	1733	#endif
1716	#if ENABLE_FRILLS	1734	#if ENABLE_FRILLS
1717	if (option (Opt_urgentOnBell))	1735	if (option (Opt_urgentOnBell))
1718	{	1736	set_urgency (0);
1719	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1720	{
1721	h->flags &= ~XUrgencyHint;
1722	XSetWMHints (dpy, parent[0], h);
1723	}
1724	}
1725	#endif	1737	#endif
		1738
		1739	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726	}	1740	}
1727	}	1741	}
1728		1742
1729	void	1743	void
1730	rxvt_term::focus_out ()	1744	rxvt_term::focus_out ()
…		…
1732	if (focus)	1746	if (focus)
1733	{	1747	{
1734	focus = 0;	1748	focus = 0;
1735	want_refresh = 1;	1749	want_refresh = 1;
1736		1750
1737	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1751	#if ENABLE_FRILLS
1738		1752	if (option (Opt_urgentOnBell))
		1753	set_urgency (0);
		1754	#endif
1739	#if ENABLE_FRILLS \|\| ISO_14755	1755	#if ENABLE_FRILLS \|\| ISO_14755
1740	if (iso14755buf)	1756	if (iso14755buf)
1741	{	1757	{
1742	iso14755buf = 0;	1758	iso14755buf = 0;
1743	# if ISO_14755	1759	# if ISO_14755
…		…
1760	{	1776	{
1761	pix_colors = pix_colors_unfocused;	1777	pix_colors = pix_colors_unfocused;
1762	scr_recolour ();	1778	scr_recolour ();
1763	}	1779	}
1764	#endif	1780	#endif
		1781
		1782	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1765	}	1783	}
1766	}	1784	}
1767		1785
1768	void	1786	void
1769	rxvt_term::update_fade_color (unsigned int idx)	1787	rxvt_term::update_fade_color (unsigned int idx)
…		…
2011	}	2029	}
2012		2030
2013	if (scrollBar.style == R_SB_XTERM	2031	if (scrollBar.style == R_SB_XTERM
2014	\|\| scrollbar_above_slider (ev.y)	2032	\|\| scrollbar_above_slider (ev.y)
2015	\|\| scrollbar_below_slider (ev.y))	2033	\|\| scrollbar_below_slider (ev.y))
2016	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2034	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2017		2035
2018	scrollBar.state = STATE_MOTION;	2036	scrollBar.state = STATE_MOTION;
2019	break;	2037	break;
2020		2038
2021	case Button1:	2039	case Button1:
…		…
2044	else	2062	else
2045	{	2063	{
2046	scr_page ((ev.button == Button1 ? DN : UP),	2064	scr_page ((ev.button == Button1 ? DN : UP),
2047	(nrow	2065	(nrow
2048	* scrollbar_position (ev.y)	2066	* scrollbar_position (ev.y)
2049	/ scrollbar_size ()));	2067	/ scrollBar.size ()));
2050	}	2068	}
2051		2069
2052	break;	2070	break;
2053	}	2071	}
2054	}	2072	}
…		…
2067	reportmode = !! (priv_modes & PrivMode_mouse_report);	2085	reportmode = !! (priv_modes & PrivMode_mouse_report);
2068		2086
2069	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2087	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2070	{	2088	{
2071	scrollBar.state = STATE_IDLE;	2089	scrollBar.state = STATE_IDLE;
2072	scrollbar_show (0);	2090	scrollBar.show (0);
2073	}	2091	}
2074		2092
2075	#ifdef SELECTION_SCROLLING	2093	#ifdef SELECTION_SCROLLING
2076	sel_scroll_ev.stop();	2094	sel_scroll_ev.stop();
2077	#endif	2095	#endif
…		…
2160	}	2178	}
2161	else	2179	else
2162	# endif	2180	# endif
2163	{	2181	{
2164	scr_page (v, i);	2182	scr_page (v, i);
2165	scrollbar_show (1);	2183	scrollBar.show (1);
2166	}	2184	}
2167	}	2185	}
2168	break;	2186	break;
2169	#endif	2187	#endif
2170	}	2188	}
2171	}	2189	}
2172	}	2190	}
2173		2191
2174	/}}} /	2192	/}}} /
2175		2193
2176	bool	2194	void
2177	rxvt_term::cmd_parse ()	2195	rxvt_term::cmd_parse ()
2178	{	2196	{
2179	bool flag = false;
2180	wchar_t ch = NOCHAR;	2197	wchar_t ch = NOCHAR;
2181	char *seq_begin; // remember start of esc-sequence here	2198	char *seq_begin; // remember start of esc-sequence here
2182		2199
2183	for (;;)	2200	for (;;)
2184	{	2201	{
2185	if (ch == NOCHAR)	2202	if (expect_false (ch == NOCHAR))
2186	{	2203	{
2187	seq_begin = cmdbuf_ptr;	2204	seq_begin = cmdbuf_ptr;
2188	ch = next_char ();	2205	ch = next_char ();
2189		2206
2190	if (ch == NOCHAR)	2207	if (ch == NOCHAR)
2191	break;	2208	break;
2192	}	2209	}
2193		2210
2194	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2211	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2195	{	2212	{
2196	if (!seen_input)	2213	if (expect_false (!seen_input))
2197	{	2214	{
2198	seen_input = 1;	2215	seen_input = 1;
2199	// many badly-written programs (e.g. jed) contain a race condition:	2216	// many badly-written programs (e.g. jed) contain a race condition:
2200	// they first read the screensize and then install a SIGWINCH handler.	2217	// they first read the screensize and then install a SIGWINCH handler.
2201	// some window managers resize the window early, and these programs	2218	// some window managers resize the window early, and these programs
…		…
2214	wchar_t *str = buf;	2231	wchar_t *str = buf;
2215	wchar_t *eol = str + min (ncol, UBUFSIZ);	2232	wchar_t *eol = str + min (ncol, UBUFSIZ);
2216		2233
2217	for (;;)	2234	for (;;)
2218	{	2235	{
2219	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2236	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2220	break;	2237	break;
2221		2238
2222	*str++ = ch;	2239	*str++ = ch;
2223		2240
2224	if (ch == C0_LF \|\| str >= eol)	2241	if (expect_false (ch == C0_LF \|\| str >= eol))
2225	{	2242	{
2226	if (ch == C0_LF)	2243	if (ch == C0_LF)
2227	nlines++;	2244	nlines++;
2228		2245
2229	refresh_count++;	2246	refresh_count++;
…		…
2278	* 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.
2279	* if skipScroll is enabled.	2296	* if skipScroll is enabled.
2280	*/	2297	*/
2281	if (refreshnow)	2298	if (refreshnow)
2282	{	2299	{
2283	flag = true;
2284	scr_refresh ();	2300	scr_refresh ();
2285	want_refresh = 1;	2301	want_refresh = 1;
2286	}	2302	}
2287
2288	}	2303	}
2289	else	2304	else
2290	{	2305	{
2291	try	2306	try
2292	{	2307	{
…		…
2300	}	2315	}
2301		2316
2302	ch = NOCHAR;	2317	ch = NOCHAR;
2303	}	2318	}
2304	}	2319	}
2305
2306	return flag;
2307	}	2320	}
2308		2321
2309	// read the next character	2322	// read the next character
2310	wchar_t	2323	wchar_t
2311	rxvt_term::next_char () NOTHROW	2324	rxvt_term::next_char () NOTHROW
2312	{	2325	{
2313	while (cmdbuf_ptr < cmdbuf_endp)	2326	while (cmdbuf_ptr < cmdbuf_endp)
2314	{	2327	{
2315	// assume 7-bit to be ascii ALWAYS	2328	// assume 7-bit to be ascii ALWAYS
2316	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2329	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2317	return *cmdbuf_ptr++;	2330	return *cmdbuf_ptr++;
2318		2331
2319	wchar_t wc;	2332	wchar_t wc;
2320	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2333	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2321		2334
…		…
2325	cmdbuf_ptr = cmdbuf_endp;	2338	cmdbuf_ptr = cmdbuf_endp;
2326	break;	2339	break;
2327	}	2340	}
2328		2341
2329	if (len == (size_t)-1)	2342	if (len == (size_t)-1)
		2343	{
		2344	mbstate.reset (); // reset now undefined conversion state
2330	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
		2346	}
2331		2347
2332	// assume wchar == unicode	2348	// assume wchar == unicode
2333	cmdbuf_ptr += len;	2349	cmdbuf_ptr += len;
2334	return wc & UNICODE_MASK;	2350	return wc & UNICODE_MASK;
2335	}	2351	}
…		…
2379	/----------------------------------------------------------------------/	2395	/----------------------------------------------------------------------/
2380	#ifdef PRINTPIPE	2396	#ifdef PRINTPIPE
2381	FILE *	2397	FILE *
2382	rxvt_term::popen_printer ()	2398	rxvt_term::popen_printer ()
2383	{	2399	{
2384	FILE *stream = popen (rs[Rs_print_pipe], "w");	2400	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385		2401
2386	if (stream == NULL)	2402	if (stream == NULL)
2387	rxvt_warn ("can't open printer pipe, not printing.\n");	2403	rxvt_warn ("can't open printer pipe, not printing.\n");
2388		2404
2389	return stream;	2405	return stream;
…		…
2400	* simulate attached vt100 printer	2416	* simulate attached vt100 printer
2401	*/	2417	*/
2402	void	2418	void
2403	rxvt_term::process_print_pipe ()	2419	rxvt_term::process_print_pipe ()
2404	{	2420	{
2405	int done;	2421	FILE *fd = popen_printer ();
2406	FILE *fd;
2407		2422
2408	if ((fd = popen_printer ()) == NULL)	2423	if (!fd)
2409	return;	2424	return;
2410		2425
2411	/*	2426	/*
2412	* Send all input to the printer until either ESC[4i or ESC[?4i	2427	* Send all input to the printer until either ESC[4i or ESC[?4i
2413	* is received.	2428	* is received.
2414	*/	2429	*/
2415	for (done = 0; !done;)	2430	for (int done = 0; !done; )
2416	{	2431	{
2417	unsigned char buf[8];	2432	unsigned char buf[8];
2418	unicode_t ch;	2433	unicode_t ch;
2419	unsigned int i, len;	2434	unsigned int i, len;
2420		2435
…		…
2565	break;	2580	break;
2566	case 'Z': /* identify the terminal type */	2581	case 'Z': /* identify the terminal type */
2567	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2582	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568	break;	2583	break;
2569	case '<': /* turn off VT52 mode */	2584	case '<': /* turn off VT52 mode */
2570	PrivMode (0, PrivMode_vt52);	2585	set_privmode (PrivMode_vt52, 0);
2571	break;	2586	break;
2572	case 'F': /* use special graphics character set */	2587	case 'F': /* use special graphics character set */
2573	case 'G': /* use regular character set */	2588	case 'G': /* use regular character set */
2574	/* unimplemented */	2589	/* unimplemented */
2575	break;	2590	break;
…		…
2629	scr_forwardindex ();	2644	scr_forwardindex ();
2630	break;	2645	break;
2631	#endif	2646	#endif
2632	case '=':	2647	case '=':
2633	case '>':	2648	case '>':
2634	PrivMode ((ch == '='), PrivMode_aplKP);	2649	set_privmode (PrivMode_aplKP, ch == '=');
2635	break;	2650	break;
2636		2651
2637	case C1_40:	2652	case C1_40:
2638	cmd_getc ();	2653	cmd_getc ();
2639	break;	2654	break;
…		…
2678	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2693	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2679	case C1_SCI: /* ESC Z */	2694	case C1_SCI: /* ESC Z */
2680	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2695	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2681	break; /* steal obsolete ESC [ c */	2696	break; /* steal obsolete ESC [ c */
2682		2697
2683	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2698	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2684	case C1_CSI: /* ESC [ */	2699	case C1_CSI: /* ESC [ */
2685	process_csi_seq ();	2700	process_csi_seq ();
2686	break;	2701	break;
2687		2702
2688	/* 8.3.90: OPERATING SYSTEM COMMAND */	2703	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2689	case C1_OSC: /* ESC ] */	2704	case C1_OSC: /* ESC ] */
2690	process_osc_seq ();	2705	process_osc_seq ();
2691	break;	2706	break;
2692		2707
2693	/* 8.3.106: RESET TO INITIAL STATE */	2708	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2694	case 'c':	2709	case 'c':
2695	mbstate.reset ();	2710	mbstate.reset ();
2696	scr_poweron ();	2711	scr_poweron ();
2697	scrollbar_show (1);	2712	scrollBar.show (1);
2698	break;	2713	break;
2699		2714
2700	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2715	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701	case 'n':	2716	case 'n':
2702	scr_charset_choose (2);	2717	scr_charset_choose (2);
…		…
2753		2768
2754	nargs = 0;	2769	nargs = 0;
2755		2770
2756	priv = 0;	2771	priv = 0;
2757	ch = cmd_getc ();	2772	ch = cmd_getc ();
2758	if (ch >= '<' && ch <= '?')	2773	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2759	{	2774	{
2760	/* '<' '=' '>' '?' */	2775	/* '<' '=' '>' '?' '!' */
2761	priv = ch;	2776	priv = ch;
2762	ch = cmd_getc ();	2777	ch = cmd_getc ();
2763	}	2778	}
2764		2779
2765	/* read any numerical arguments */	2780	/* read any numerical arguments */
…		…
2819		2834
2820	case '?':	2835	case '?':
2821	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2836	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2822	process_terminal_mode (ch, priv, nargs, arg);	2837	process_terminal_mode (ch, priv, nargs, arg);
2823	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);
2824	}	2851	}
		2852	break;
		2853	}
		2854
2825	return;	2855	return;
2826	}	2856	}
2827		2857
2828	switch (ch)	2858	switch (ch)
2829	{	2859	{
…		…
3258		3288
3259	/*	3289	/*
3260	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3290	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3261	*/	3291	*/
3262	void	3292	void
3263	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3293	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3264	{	3294	{
3265	int color;	3295	int color;
3266	char buf, name;	3296	char buf, name;
3267	bool query = str[0] == '?' && !str[1];	3297	bool query = str[0] == '?' && !str[1];
3268	int saveop = op;	3298	int saveop = op;
…		…
3309		3339
3310	XFree (value);	3340	XFree (value);
3311	}	3341	}
3312	else	3342	else
3313	{	3343	{
3314	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3344	char *eq = strchr (str, '=');
3315		3345
3316	if (eq)	3346	if (eq)
3317	{	3347	{
3318	*eq = 0;	3348	*eq = 0;
3319	set_utf8_property (display->atom (str), eq + 1);	3349	set_utf8_property (display->atom (str), eq + 1);
…		…
3375	break;	3405	break;
3376	case URxvt_Color_IT:	3406	case URxvt_Color_IT:
3377	process_color_seq (op, Color_IT, str, resp);	3407	process_color_seq (op, Color_IT, str, resp);
3378	break;	3408	break;
3379	#endif	3409	#endif
		3410	case URxvt_Color_border:
		3411	process_color_seq (op, Color_border, str, resp);
		3412	break;
3380	#if ENABLE_TRANSPARENCY	3413	#if ENABLE_TRANSPARENCY
3381	case URxvt_Color_tint:	3414	case URxvt_Color_tint:
3382	process_color_seq (op, Color_tint, str, resp);	3415	process_color_seq (op, Color_tint, str, resp);
3383	{	3416	{
3384	bool changed = false;	3417	bool changed = false;
…		…
3399	case Rxvt_Pixmap:	3432	case Rxvt_Pixmap:
3400	if (!strcmp (str, "?"))	3433	if (!strcmp (str, "?"))
3401	{	3434	{
3402	char str[256];	3435	char str[256];
3403		3436
3404	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3437	sprintf (str, "[%dx%d+%d+%d]",
3405	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3438	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3406	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3439	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3407	process_xterm_seq (XTerm_title, str, CHAR_ST);	3440	process_xterm_seq (XTerm_title, str, CHAR_ST);
3408	}	3441	}
3409	else	3442	else
…		…
3508	break;	3541	break;
3509	#endif	3542	#endif
3510		3543
3511	#if ENABLE_PERL	3544	#if ENABLE_PERL
3512	case URxvt_perl:	3545	case URxvt_perl:
3513	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3546	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3514	; // no responses yet
3515	break;	3547	break;
3516	#endif	3548	#endif
3517	}	3549	}
3518	}	3550	}
3519	/----------------------------------------------------------------------/	3551	/----------------------------------------------------------------------/
…		…
3542	{	3574	{
3543	if (mode == 'r')	3575	if (mode == 'r')
3544	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3576	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545	else	3577	else
3546	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3578	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547	PrivMode (state, bit);	3579	set_privmode (bit, state);
3548	}	3580	}
3549		3581
3550	return state;	3582	return state;
3551	}	3583	}
3552		3584
…		…
3560	static const struct	3592	static const struct
3561	{	3593	{
3562	const int argval;	3594	const int argval;
3563	const unsigned long bit;	3595	const unsigned long bit;
3564	} argtopriv[] = {	3596	} argtopriv[] = {
3565	{ 1, PrivMode_aplCUR },	3597	{ 1, PrivMode_aplCUR }, // DECCKM
3566	{ 2, PrivMode_vt52 },	3598	{ 2, PrivMode_vt52 },
3567	{ 3, PrivMode_132 },	3599	{ 3, PrivMode_132 }, // DECCOLM
3568	{ 4, PrivMode_smoothScroll },	3600	{ 4, PrivMode_smoothScroll }, // DECSCLM
3569	{ 5, PrivMode_rVideo },	3601	{ 5, PrivMode_rVideo }, // DECSCNM
3570	{ 6, PrivMode_relOrigin },	3602	{ 6, PrivMode_relOrigin }, // DECOM
3571	{ 7, PrivMode_Autowrap },	3603	{ 7, PrivMode_Autowrap }, // DECAWM
3572	// 8, bi-directional support mode	3604	// 8, auto-repeat keys // DECARM
3573	{ 9, PrivMode_MouseX10 },	3605	{ 9, PrivMode_MouseX10 },
3574	// 18, 19 printing-related	3606	// 18 end FF to printer after print screen
		3607	// 19 Print screen prints full screen/scorll region
3575	{ 25, PrivMode_VisibleCursor },	3608	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3576	#ifdef scrollBar_esc	3609	#ifdef scrollBar_esc
3577	{ scrollBar_esc, PrivMode_scrollBar },	3610	{ scrollBar_esc, PrivMode_scrollBar },
3578	#endif	3611	#endif
3579	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3612	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3613	// 38, tektronix mode // DECTEK
3580	{ 40, PrivMode_132OK },	3614	{ 40, PrivMode_132OK },
3581	// 41 xterm more fixes NYI	3615	// 41 xterm more fixes NYI
3582	// 45 margin bell NYI	3616	// 45 margin bell NYI
3583	// 46 start logging	3617	// 46 start logging
3584	{ 47, PrivMode_Screen },	3618	{ 47, PrivMode_Screen },
3585	{ 66, PrivMode_aplKP },	3619	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3586	#ifndef NO_BACKSPACE_KEY	3620	#ifndef NO_BACKSPACE_KEY
3587	{ 67, PrivMode_BackSpace },	3621	{ 67, PrivMode_BackSpace }, // DECBKM
3588	#endif	3622	#endif
3589	{ 1000, PrivMode_MouseX11 },	3623	{ 1000, PrivMode_MouseX11 },
3590	{ 1002, PrivMode_MouseBtnEvent },	3624	{ 1002, PrivMode_MouseBtnEvent },
3591	{ 1003, PrivMode_MouseAnyEvent },	3625	{ 1003, PrivMode_MouseAnyEvent },
3592	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3626	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
…		…
3631		3665
3632	scr_touch (true);	3666	scr_touch (true);
3633	break;	3667	break;
3634	#endif	3668	#endif
3635	case 1048: /* alternative cursor save */	3669	case 1048: /* alternative cursor save */
3636	case 1049:
3637	if (option (Opt_secondaryScreen))	3670	if (option (Opt_secondaryScreen))
3638	if (mode == 0)	3671	if (mode == 0)
3639	scr_cursor (RESTORE);	3672	scr_cursor (RESTORE);
3640	else if (mode == 1)	3673	else if (mode == 1)
3641	scr_cursor (SAVE);	3674	scr_cursor (SAVE);
…		…
3650	case 2: /* VT52 mode */	3683	case 2: /* VT52 mode */
3651	/* oddball mode. should be set regardless of set/reset	3684	/* oddball mode. should be set regardless of set/reset
3652	* parameter. Return from VT52 mode with an ESC < from	3685	* parameter. Return from VT52 mode with an ESC < from
3653	* within VT52 mode	3686	* within VT52 mode
3654	*/	3687	*/
3655	PrivMode (1, PrivMode_vt52);	3688	set_privmode (PrivMode_vt52, 1);
3656	break;	3689	break;
3657	case 3: /* 80/132 */	3690	case 3: /* 80/132 */
3658	if (priv_modes & PrivMode_132OK)	3691	if (priv_modes & PrivMode_132OK)
3659	{
3660	scr_poweron ();
3661	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3692	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3662	}
3663	break;	3693	break;
3664	case 4: /* smooth scrolling */	3694	case 4: /* smooth scrolling */
3665	set_option (Opt_jumpScroll, !state);	3695	set_option (Opt_jumpScroll, !state);
3666	break;	3696	break;
3667	case 5: /* reverse video */	3697	case 5: /* reverse video */
…		…
3678	if (state) /* orthogonal */	3708	if (state) /* orthogonal */
3679	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3709	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3680	break;	3710	break;
3681	#ifdef scrollBar_esc	3711	#ifdef scrollBar_esc
3682	case scrollBar_esc:	3712	case scrollBar_esc:
3683	if (scrollbar_mapping (state))	3713	if (scrollBar.map (state))
3684	{	3714	{
3685	resize_all_windows (0, 0, 0);	3715	resize_all_windows (0, 0, 0);
3686	scr_touch (true);	3716	scr_touch (true);
3687	}	3717	}
3688	break;	3718	break;
…		…
3709	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3739	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3710	vt_emask_mouse = PointerMotionMask;	3740	vt_emask_mouse = PointerMotionMask;
3711	}	3741	}
3712	else	3742	else
3713	vt_emask_mouse = NoEventMask;	3743	vt_emask_mouse = NoEventMask;
		3744
3714	vt_select_input ();	3745	vt_select_input ();
3715	break;	3746	break;
3716	case 1010: /* scroll to bottom on TTY output inhibit */	3747	case 1010: /* scroll to bottom on TTY output inhibit */
3717	set_option (Opt_scrollTtyOutput, !state);	3748	set_option (Opt_scrollTtyOutput, !state);
3718	break;	3749	break;
3719	case 1011: /* scroll to bottom on key press */	3750	case 1011: /* scroll to bottom on key press */
3720	set_option (Opt_scrollTtyKeypress, state);	3751	set_option (Opt_scrollTtyKeypress, state);
3721	break;	3752	break;
3722	case 1047: /* secondary screen w/ clearing last */	3753	case 1047: /* secondary screen w/ clearing last */
3723	if (option (Opt_secondaryScreen))	3754	if (option (Opt_secondaryScreen))
3724	if (current_screen != PRIMARY)	3755	if (!state)
3725	scr_erase_screen (2);	3756	scr_erase_screen (2);
		3757
3726	scr_change_screen (state);	3758	scr_change_screen (state);
3727	break;	3759	break;
3728	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
3729	scr_change_screen (state);	3765	scr_change_screen (state);
		3766
3730	if (option (Opt_secondaryScreen))	3767	if (option (Opt_secondaryScreen))
3731	if (current_screen != PRIMARY)	3768	if (state)
3732	scr_erase_screen (2);	3769	scr_erase_screen (2);
		3770	else
		3771	scr_cursor (RESTORE);
3733	break;	3772	break;
3734	default:	3773	default:
3735	break;	3774	break;
3736	}	3775	}
3737	}	3776	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.409 by ayin, Sat Feb 16 15:39:20 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.409 by ayin, Sat Feb 16 15:39:20 2008 UTC vs.
Revision 1.438 by root, Thu Feb 4 21:55:12 2010 UTC