[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.422 by root, Tue Oct 28 04:45:59 2008 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
…		…
635	}	641	}
636	#endif	642	#endif
637		643
638	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	644	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
639	{	645	{
640	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	646	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
641	unsigned int newlen = 1;	647	unsigned int newlen = 1;
642		648
643	switch (translate_keypad (keysym, kp))	649	switch (translate_keypad (keysym, kp))
		650	{
		651	#ifndef NO_BACKSPACE_KEY
		652	case XK_BackSpace:
		653	if (priv_modes & PrivMode_HaveBackSpace)
		654	{
		655	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
		656	^ !!ctrl) ? '\b' : '\177';
		657	kbuf[1] = '\0';
		658	}
		659	else
		660	strcpy (kbuf, rs[Rs_backspace_key]);
		661	break;
		662	#endif
		663	#ifndef NO_DELETE_KEY
		664	case XK_Delete:
		665	strcpy (kbuf, rs[Rs_delete_key]);
		666	break;
		667	#endif
		668	case XK_Tab:
		669	if (shft)
		670	strcpy (kbuf, "\033[Z");
		671	else
		672	{
		673	#ifdef CTRL_TAB_MAKES_META
		674	if (ctrl)
		675	meta = 1;
		676	#endif
		677	#ifdef MOD4_TAB_MAKES_META
		678	if (ev.state & Mod4Mask)
		679	meta = 1;
		680	#endif
		681	newlen = 0;
		682	}
		683	break;
		684
		685	case XK_Up: /* "\033[A" */
		686	case XK_Down: /* "\033[B" */
		687	case XK_Right: /* "\033[C" */
		688	case XK_Left: /* "\033[D" */
		689	strcpy (kbuf, "\033[Z");
		690	kbuf[2] = "DACB"[keysym - XK_Left];
		691	/* do Shift first */
		692	if (shft)
		693	kbuf[2] = "dacb"[keysym - XK_Left];
		694	else if (ctrl)
		695	{
		696	kbuf[1] = 'O';
		697	kbuf[2] = "dacb"[keysym - XK_Left];
		698	}
		699	else if (priv_modes & PrivMode_aplCUR)
		700	kbuf[1] = 'O';
		701	break;
		702
		703	case XK_KP_Enter:
		704	/* allow shift to override */
		705	if (kp)
		706	{
		707	strcpy (kbuf, "\033OM");
		708	break;
		709	}
		710
		711	/* FALLTHROUGH */
		712
		713	case XK_Return:
		714	if (priv_modes & PrivMode_LFNL)
		715	{
		716	kbuf[0] = '\015';
		717	kbuf[1] = '\012';
		718	kbuf[2] = '\0';
		719	}
		720	else
		721	{
		722	kbuf[0] = '\015';
		723	kbuf[1] = '\0';
		724	}
		725	break;
		726
		727	case XK_KP_F1: /* "\033OP" */
		728	case XK_KP_F2: /* "\033OQ" */
		729	case XK_KP_F3: /* "\033OR" */
		730	case XK_KP_F4: /* "\033OS" */
		731	strcpy (kbuf, "\033OP");
		732	kbuf[2] += (keysym - XK_KP_F1);
		733	break;
		734
		735	case XK_KP_Multiply: /* "\033Oj" : "" /
		736	case XK_KP_Add: /* "\033Ok" : "+" */
		737	case XK_KP_Separator: /* "\033Ol" : "," */
		738	case XK_KP_Subtract: /* "\033Om" : "-" */
		739	case XK_KP_Decimal: /* "\033On" : "." */
		740	case XK_KP_Divide: /* "\033Oo" : "/" */
		741	case XK_KP_0: /* "\033Op" : "0" */
		742	case XK_KP_1: /* "\033Oq" : "1" */
		743	case XK_KP_2: /* "\033Or" : "2" */
		744	case XK_KP_3: /* "\033Os" : "3" */
		745	case XK_KP_4: /* "\033Ot" : "4" */
		746	case XK_KP_5: /* "\033Ou" : "5" */
		747	case XK_KP_6: /* "\033Ov" : "6" */
		748	case XK_KP_7: /* "\033Ow" : "7" */
		749	case XK_KP_8: /* "\033Ox" : "8" */
		750	case XK_KP_9: /* "\033Oy" : "9" */
		751	/* allow shift to override */
		752	if (kp)
		753	{
		754	strcpy (kbuf, "\033Oj");
		755	kbuf[2] += (keysym - XK_KP_Multiply);
		756	}
		757	else
		758	{
		759	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		760	kbuf[1] = '\0';
		761	}
		762	break;
		763
		764	default:
644	{	765	{
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);	766	int param = map_function_key (keysym);
768	if (param > 0)	767	if (param > 0)
769	sprintf (kbuf,"\033[%d~", param);	768	sprintf (kbuf,"\033[%d~", param);
770	else	769	else
771	newlen = 0;	770	newlen = 0;
772	}
773	break;
774	}	771	}
		772	break;
		773	}
775		774
776	if (newlen)	775	if (newlen)
777	len = strlen (kbuf);	776	len = strlen (kbuf);
778		777
779	/*	778	/*
780	* Pass meta for all function keys, if 'meta' option set	779	* Pass meta for all function keys, if 'meta' option set
781	*/	780	*/
782	#ifdef META8_OPTION	781	#ifdef META8_OPTION
…		…
1016	}	1015	}
1017	while (row < end_row);	1016	while (row < end_row);
1018	}	1017	}
1019		1018
1020	scr_refresh ();	1019	scr_refresh ();
1021	scrollbar_show (1);	1020	scrollBar.show (1);
1022	#ifdef USE_XIM	1021	#ifdef USE_XIM
1023	IMSendSpot ();	1022	IMSendSpot ();
1024	#endif	1023	#endif
1025	}	1024	}
1026		1025
…		…
1128	{	1127	{
1129	// this should really be sched_yield(), but the linux guys thought	1128	// this should really be sched_yield(), but the linux guys thought
1130	// that giving a process calling sched_yield () less cpu time than	1129	// 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	1130	// ones with high nice levels is a useful thing to do. It surely is is
1132	// allowed by the sus... as is returning ENOSYS.	1131	// allowed by the sus... as is returning ENOSYS.
		1132	// since the linux guys additionally thought that breaking the only
		1133	// known workaroudn against their unusable sched_yield hack is cool,
		1134	// we just nanosleep a bit and hope for the best.
1133		1135
1134	struct timespec ts = { 0, 0 };	1136	struct timespec ts = { 0, 1000 };
1135	nanosleep (&ts, 0);	1137	nanosleep (&ts, 0);
1136		1138
1137	w.stop ();	1139	w.stop ();
1138	}	1140	}
1139		1141
…		…
1189	{	1191	{
1190	make_current ();	1192	make_current ();
1191		1193
1192	if (revents & ev::READ)	1194	if (revents & ev::READ)
1193	// loop, but don't allow a single term to monopolize us	1195	// loop, but don't allow a single term to monopolize us
1194	while (pty_fill ())	1196	for (int i = CBUFCNT; i-- && pty_fill (); )
1195	if (cmd_parse ())	1197	cmd_parse ();
1196	break;
1197		1198
1198	if (revents & ev::WRITE)	1199	if (revents & ev::WRITE)
1199	pty_write ();	1200	pty_write ();
1200		1201
1201	refresh_check ();	1202	refresh_check ();
…		…
1537	;	1538	;
1538		1539
1539	if (scrollBar.state && ev.xany.window == scrollBar.win)	1540	if (scrollBar.state && ev.xany.window == scrollBar.win)
1540	{	1541	{
1541	scrollBar.state = STATE_IDLE;	1542	scrollBar.state = STATE_IDLE;
1542	scrollbar_show (0);	1543	scrollBar.show (0);
1543	}	1544	}
1544	}	1545	}
1545	break;	1546	break;
1546		1547
1547	case MotionNotify:	1548	case MotionNotify:
…		…
1646	&unused_root, &unused_child,	1647	&unused_root, &unused_child,
1647	&unused_root_x, &unused_root_y,	1648	&unused_root_x, &unused_root_y,
1648	&ev.xbutton.x, &ev.xbutton.y,	1649	&ev.xbutton.x, &ev.xbutton.y,
1649	&unused_mask);	1650	&unused_mask);
1650	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1651	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1651	scrollbar_size ());	1652	scrollBar.size ());
1652	want_refresh = 1;	1653	want_refresh = 1;
1653	scrollbar_show (1);	1654	scrollBar.show (1);
1654	}	1655	}
1655	break;	1656	break;
1656	}	1657	}
1657		1658
1658	#if defined(CURSOR_BLINK)	1659	#if defined(CURSOR_BLINK)
…		…
1684		1685
1685	refresh_check ();	1686	refresh_check ();
1686	}	1687	}
1687		1688
1688	void	1689	void
		1690	rxvt_term::set_urgency (bool enable)
		1691	{
		1692	if (enable == urgency_hint)
		1693	return;
		1694
		1695	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1696	{
		1697	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
		1698	XSetWMHints (dpy, parent[0], h);
		1699	urgency_hint = enable;
		1700	}
		1701	}
		1702
		1703	void
1689	rxvt_term::focus_in ()	1704	rxvt_term::focus_in ()
1690	{	1705	{
1691	if (!focus)	1706	if (!focus)
1692	{	1707	{
1693	focus = 1;	1708	focus = 1;
1694	want_refresh = 1;	1709	want_refresh = 1;
1695
1696	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1697		1710
1698	#if USE_XIM	1711	#if USE_XIM
1699	if (Input_Context != NULL)	1712	if (Input_Context != NULL)
1700	{	1713	{
1701	IMSetPosition ();	1714	IMSetPosition ();
…		…
1713	scr_recolour ();	1726	scr_recolour ();
1714	}	1727	}
1715	#endif	1728	#endif
1716	#if ENABLE_FRILLS	1729	#if ENABLE_FRILLS
1717	if (option (Opt_urgentOnBell))	1730	if (option (Opt_urgentOnBell))
1718	{	1731	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	1732	#endif
		1733
		1734	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726	}	1735	}
1727	}	1736	}
1728		1737
1729	void	1738	void
1730	rxvt_term::focus_out ()	1739	rxvt_term::focus_out ()
…		…
1732	if (focus)	1741	if (focus)
1733	{	1742	{
1734	focus = 0;	1743	focus = 0;
1735	want_refresh = 1;	1744	want_refresh = 1;
1736		1745
1737	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1746	#if ENABLE_FRILLS
1738		1747	if (option (Opt_urgentOnBell))
		1748	set_urgency (0);
		1749	#endif
1739	#if ENABLE_FRILLS \|\| ISO_14755	1750	#if ENABLE_FRILLS \|\| ISO_14755
1740	if (iso14755buf)	1751	if (iso14755buf)
1741	{	1752	{
1742	iso14755buf = 0;	1753	iso14755buf = 0;
1743	# if ISO_14755	1754	# if ISO_14755
…		…
1760	{	1771	{
1761	pix_colors = pix_colors_unfocused;	1772	pix_colors = pix_colors_unfocused;
1762	scr_recolour ();	1773	scr_recolour ();
1763	}	1774	}
1764	#endif	1775	#endif
		1776
		1777	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1765	}	1778	}
1766	}	1779	}
1767		1780
1768	void	1781	void
1769	rxvt_term::update_fade_color (unsigned int idx)	1782	rxvt_term::update_fade_color (unsigned int idx)
…		…
2011	}	2024	}
2012		2025
2013	if (scrollBar.style == R_SB_XTERM	2026	if (scrollBar.style == R_SB_XTERM
2014	\|\| scrollbar_above_slider (ev.y)	2027	\|\| scrollbar_above_slider (ev.y)
2015	\|\| scrollbar_below_slider (ev.y))	2028	\|\| scrollbar_below_slider (ev.y))
2016	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2029	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2017		2030
2018	scrollBar.state = STATE_MOTION;	2031	scrollBar.state = STATE_MOTION;
2019	break;	2032	break;
2020		2033
2021	case Button1:	2034	case Button1:
…		…
2044	else	2057	else
2045	{	2058	{
2046	scr_page ((ev.button == Button1 ? DN : UP),	2059	scr_page ((ev.button == Button1 ? DN : UP),
2047	(nrow	2060	(nrow
2048	* scrollbar_position (ev.y)	2061	* scrollbar_position (ev.y)
2049	/ scrollbar_size ()));	2062	/ scrollBar.size ()));
2050	}	2063	}
2051		2064
2052	break;	2065	break;
2053	}	2066	}
2054	}	2067	}
…		…
2067	reportmode = !! (priv_modes & PrivMode_mouse_report);	2080	reportmode = !! (priv_modes & PrivMode_mouse_report);
2068		2081
2069	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2082	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2070	{	2083	{
2071	scrollBar.state = STATE_IDLE;	2084	scrollBar.state = STATE_IDLE;
2072	scrollbar_show (0);	2085	scrollBar.show (0);
2073	}	2086	}
2074		2087
2075	#ifdef SELECTION_SCROLLING	2088	#ifdef SELECTION_SCROLLING
2076	sel_scroll_ev.stop();	2089	sel_scroll_ev.stop();
2077	#endif	2090	#endif
…		…
2160	}	2173	}
2161	else	2174	else
2162	# endif	2175	# endif
2163	{	2176	{
2164	scr_page (v, i);	2177	scr_page (v, i);
2165	scrollbar_show (1);	2178	scrollBar.show (1);
2166	}	2179	}
2167	}	2180	}
2168	break;	2181	break;
2169	#endif	2182	#endif
2170	}	2183	}
2171	}	2184	}
2172	}	2185	}
2173		2186
2174	/}}} /	2187	/}}} /
2175		2188
2176	bool	2189	void
2177	rxvt_term::cmd_parse ()	2190	rxvt_term::cmd_parse ()
2178	{	2191	{
2179	bool flag = false;
2180	wchar_t ch = NOCHAR;	2192	wchar_t ch = NOCHAR;
2181	char *seq_begin; // remember start of esc-sequence here	2193	char *seq_begin; // remember start of esc-sequence here
2182		2194
2183	for (;;)	2195	for (;;)
2184	{	2196	{
2185	if (ch == NOCHAR)	2197	if (expect_false (ch == NOCHAR))
2186	{	2198	{
2187	seq_begin = cmdbuf_ptr;	2199	seq_begin = cmdbuf_ptr;
2188	ch = next_char ();	2200	ch = next_char ();
2189		2201
2190	if (ch == NOCHAR)	2202	if (ch == NOCHAR)
2191	break;	2203	break;
2192	}	2204	}
2193		2205
2194	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2206	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2195	{	2207	{
2196	if (!seen_input)	2208	if (expect_false (!seen_input))
2197	{	2209	{
2198	seen_input = 1;	2210	seen_input = 1;
2199	// many badly-written programs (e.g. jed) contain a race condition:	2211	// many badly-written programs (e.g. jed) contain a race condition:
2200	// they first read the screensize and then install a SIGWINCH handler.	2212	// they first read the screensize and then install a SIGWINCH handler.
2201	// some window managers resize the window early, and these programs	2213	// some window managers resize the window early, and these programs
…		…
2214	wchar_t *str = buf;	2226	wchar_t *str = buf;
2215	wchar_t *eol = str + min (ncol, UBUFSIZ);	2227	wchar_t *eol = str + min (ncol, UBUFSIZ);
2216		2228
2217	for (;;)	2229	for (;;)
2218	{	2230	{
2219	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2231	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2220	break;	2232	break;
2221		2233
2222	*str++ = ch;	2234	*str++ = ch;
2223		2235
2224	if (ch == C0_LF \|\| str >= eol)	2236	if (expect_false (ch == C0_LF \|\| str >= eol))
2225	{	2237	{
2226	if (ch == C0_LF)	2238	if (ch == C0_LF)
2227	nlines++;	2239	nlines++;
2228		2240
2229	refresh_count++;	2241	refresh_count++;
…		…
2278	* What the heck we'll cheat and only refresh less than every page-full.	2290	* What the heck we'll cheat and only refresh less than every page-full.
2279	* if skipScroll is enabled.	2291	* if skipScroll is enabled.
2280	*/	2292	*/
2281	if (refreshnow)	2293	if (refreshnow)
2282	{	2294	{
2283	flag = true;
2284	scr_refresh ();	2295	scr_refresh ();
2285	want_refresh = 1;	2296	want_refresh = 1;
2286	}	2297	}
2287
2288	}	2298	}
2289	else	2299	else
2290	{	2300	{
2291	try	2301	try
2292	{	2302	{
…		…
2300	}	2310	}
2301		2311
2302	ch = NOCHAR;	2312	ch = NOCHAR;
2303	}	2313	}
2304	}	2314	}
2305
2306	return flag;
2307	}	2315	}
2308		2316
2309	// read the next character	2317	// read the next character
2310	wchar_t	2318	wchar_t
2311	rxvt_term::next_char () NOTHROW	2319	rxvt_term::next_char () NOTHROW
2312	{	2320	{
2313	while (cmdbuf_ptr < cmdbuf_endp)	2321	while (cmdbuf_ptr < cmdbuf_endp)
2314	{	2322	{
2315	// assume 7-bit to be ascii ALWAYS	2323	// assume 7-bit to be ascii ALWAYS
2316	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2324	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2317	return *cmdbuf_ptr++;	2325	return *cmdbuf_ptr++;
2318		2326
2319	wchar_t wc;	2327	wchar_t wc;
2320	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2328	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2321		2329
…		…
2325	cmdbuf_ptr = cmdbuf_endp;	2333	cmdbuf_ptr = cmdbuf_endp;
2326	break;	2334	break;
2327	}	2335	}
2328		2336
2329	if (len == (size_t)-1)	2337	if (len == (size_t)-1)
		2338	{
		2339	mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2330	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2340	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2341	}
2331		2342
2332	// assume wchar == unicode	2343	// assume wchar == unicode
2333	cmdbuf_ptr += len;	2344	cmdbuf_ptr += len;
2334	return wc & UNICODE_MASK;	2345	return wc & UNICODE_MASK;
2335	}	2346	}
…		…
2379	/----------------------------------------------------------------------/	2390	/----------------------------------------------------------------------/
2380	#ifdef PRINTPIPE	2391	#ifdef PRINTPIPE
2381	FILE *	2392	FILE *
2382	rxvt_term::popen_printer ()	2393	rxvt_term::popen_printer ()
2383	{	2394	{
2384	FILE *stream = popen (rs[Rs_print_pipe], "w");	2395	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385		2396
2386	if (stream == NULL)	2397	if (stream == NULL)
2387	rxvt_warn ("can't open printer pipe, not printing.\n");	2398	rxvt_warn ("can't open printer pipe, not printing.\n");
2388		2399
2389	return stream;	2400	return stream;
…		…
2400	* simulate attached vt100 printer	2411	* simulate attached vt100 printer
2401	*/	2412	*/
2402	void	2413	void
2403	rxvt_term::process_print_pipe ()	2414	rxvt_term::process_print_pipe ()
2404	{	2415	{
2405	int done;	2416	FILE *fd = popen_printer ();
2406	FILE *fd;
2407		2417
2408	if ((fd = popen_printer ()) == NULL)	2418	if (!fd)
2409	return;	2419	return;
2410		2420
2411	/*	2421	/*
2412	* Send all input to the printer until either ESC[4i or ESC[?4i	2422	* Send all input to the printer until either ESC[4i or ESC[?4i
2413	* is received.	2423	* is received.
2414	*/	2424	*/
2415	for (done = 0; !done;)	2425	for (int done = 0; !done; )
2416	{	2426	{
2417	unsigned char buf[8];	2427	unsigned char buf[8];
2418	unicode_t ch;	2428	unicode_t ch;
2419	unsigned int i, len;	2429	unsigned int i, len;
2420		2430
…		…
2565	break;	2575	break;
2566	case 'Z': /* identify the terminal type */	2576	case 'Z': /* identify the terminal type */
2567	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2577	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568	break;	2578	break;
2569	case '<': /* turn off VT52 mode */	2579	case '<': /* turn off VT52 mode */
2570	PrivMode (0, PrivMode_vt52);	2580	set_privmode (PrivMode_vt52, 0);
2571	break;	2581	break;
2572	case 'F': /* use special graphics character set */	2582	case 'F': /* use special graphics character set */
2573	case 'G': /* use regular character set */	2583	case 'G': /* use regular character set */
2574	/* unimplemented */	2584	/* unimplemented */
2575	break;	2585	break;
…		…
2629	scr_forwardindex ();	2639	scr_forwardindex ();
2630	break;	2640	break;
2631	#endif	2641	#endif
2632	case '=':	2642	case '=':
2633	case '>':	2643	case '>':
2634	PrivMode ((ch == '='), PrivMode_aplKP);	2644	set_privmode (PrivMode_aplKP, ch == '=');
2635	break;	2645	break;
2636		2646
2637	case C1_40:	2647	case C1_40:
2638	cmd_getc ();	2648	cmd_getc ();
2639	break;	2649	break;
…		…
2692		2702
2693	/* 8.3.106: RESET TO INITIAL STATE */	2703	/* 8.3.106: RESET TO INITIAL STATE */
2694	case 'c':	2704	case 'c':
2695	mbstate.reset ();	2705	mbstate.reset ();
2696	scr_poweron ();	2706	scr_poweron ();
2697	scrollbar_show (1);	2707	scrollBar.show (1);
2698	break;	2708	break;
2699		2709
2700	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2710	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701	case 'n':	2711	case 'n':
2702	scr_charset_choose (2);	2712	scr_charset_choose (2);
…		…
3508	break;	3518	break;
3509	#endif	3519	#endif
3510		3520
3511	#if ENABLE_PERL	3521	#if ENABLE_PERL
3512	case URxvt_perl:	3522	case URxvt_perl:
3513	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3523	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3514	; // no responses yet
3515	break;	3524	break;
3516	#endif	3525	#endif
3517	}	3526	}
3518	}	3527	}
3519	/----------------------------------------------------------------------/	3528	/----------------------------------------------------------------------/
…		…
3542	{	3551	{
3543	if (mode == 'r')	3552	if (mode == 'r')
3544	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3553	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545	else	3554	else
3546	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3555	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547	PrivMode (state, bit);	3556	set_privmode (bit, state);
3548	}	3557	}
3549		3558
3550	return state;	3559	return state;
3551	}	3560	}
3552		3561
…		…
3650	case 2: /* VT52 mode */	3659	case 2: /* VT52 mode */
3651	/* oddball mode. should be set regardless of set/reset	3660	/* oddball mode. should be set regardless of set/reset
3652	* parameter. Return from VT52 mode with an ESC < from	3661	* parameter. Return from VT52 mode with an ESC < from
3653	* within VT52 mode	3662	* within VT52 mode
3654	*/	3663	*/
3655	PrivMode (1, PrivMode_vt52);	3664	set_privmode (PrivMode_vt52, 1);
3656	break;	3665	break;
3657	case 3: /* 80/132 */	3666	case 3: /* 80/132 */
3658	if (priv_modes & PrivMode_132OK)	3667	if (priv_modes & PrivMode_132OK)
3659	{	3668	{
3660	scr_poweron ();	3669	scr_poweron ();
…		…
3678	if (state) /* orthogonal */	3687	if (state) /* orthogonal */
3679	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3688	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3680	break;	3689	break;
3681	#ifdef scrollBar_esc	3690	#ifdef scrollBar_esc
3682	case scrollBar_esc:	3691	case scrollBar_esc:
3683	if (scrollbar_mapping (state))	3692	if (scrollBar.map (state))
3684	{	3693	{
3685	resize_all_windows (0, 0, 0);	3694	resize_all_windows (0, 0, 0);
3686	scr_touch (true);	3695	scr_touch (true);
3687	}	3696	}
3688	break;	3697	break;

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.422 by root, Tue Oct 28 04:45:59 2008 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.422 by root, Tue Oct 28 04:45:59 2008 UTC