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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.410 by ayin, Sat Feb 16 15:48:36 2008 UTC vs.
Revision 1.420 by root, Wed Oct 15 14:48:22 2008 UTC

…		…
419	meta = ev.state & ModMetaMask;	419	meta = ev.state & ModMetaMask;
420		420
421	if (numlock_state \|\| (ev.state & ModNumLockMask))	421	if (numlock_state \|\| (ev.state & ModNumLockMask))
422	{	422	{
423	numlock_state = (ev.state & ModNumLockMask);	423	numlock_state = (ev.state & ModNumLockMask);
424	PrivMode ((!numlock_state), PrivMode_aplKP);	424	set_privmode (PrivMode_aplKP, !numlock_state);
425	}	425	}
426		426
427	kbuf[0] = 0;	427	kbuf[0] = 0;
428		428
429	#ifdef USE_XIM	429	#ifdef USE_XIM
…		…
641	}	641	}
642	#endif	642	#endif
643		643
644	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	644	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645	{	645	{
646	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	646	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647	unsigned int newlen = 1;	647	unsigned int newlen = 1;
648		648
649	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:
650	{	765	{
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:
765	{
766	int param = map_function_key (keysym);	766	int param = map_function_key (keysym);
767	if (param > 0)	767	if (param > 0)
768	sprintf (kbuf,"\033[%d~", param);	768	sprintf (kbuf,"\033[%d~", param);
769	else	769	else
770	newlen = 0;	770	newlen = 0;
771	}
772	break;
773	}	771	}
		772	break;
		773	}
774		774
775	if (newlen)	775	if (newlen)
776	len = strlen (kbuf);	776	len = strlen (kbuf);
777		777
778	/*	778	/*
779	* Pass meta for all function keys, if 'meta' option set	779	* Pass meta for all function keys, if 'meta' option set
780	*/	780	*/
781	#ifdef META8_OPTION	781	#ifdef META8_OPTION
…		…
1015	}	1015	}
1016	while (row < end_row);	1016	while (row < end_row);
1017	}	1017	}
1018		1018
1019	scr_refresh ();	1019	scr_refresh ();
1020	scrollbar_show (1);	1020	scrollBar.show (1);
1021	#ifdef USE_XIM	1021	#ifdef USE_XIM
1022	IMSendSpot ();	1022	IMSendSpot ();
1023	#endif	1023	#endif
1024	}	1024	}
1025		1025
…		…
1536	;	1536	;
1537		1537
1538	if (scrollBar.state && ev.xany.window == scrollBar.win)	1538	if (scrollBar.state && ev.xany.window == scrollBar.win)
1539	{	1539	{
1540	scrollBar.state = STATE_IDLE;	1540	scrollBar.state = STATE_IDLE;
1541	scrollbar_show (0);	1541	scrollBar.show (0);
1542	}	1542	}
1543	}	1543	}
1544	break;	1544	break;
1545		1545
1546	case MotionNotify:	1546	case MotionNotify:
…		…
1645	&unused_root, &unused_child,	1645	&unused_root, &unused_child,
1646	&unused_root_x, &unused_root_y,	1646	&unused_root_x, &unused_root_y,
1647	&ev.xbutton.x, &ev.xbutton.y,	1647	&ev.xbutton.x, &ev.xbutton.y,
1648	&unused_mask);	1648	&unused_mask);
1649	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1649	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650	scrollbar_size ());	1650	scrollBar.size ());
1651	want_refresh = 1;	1651	want_refresh = 1;
1652	scrollbar_show (1);	1652	scrollBar.show (1);
1653	}	1653	}
1654	break;	1654	break;
1655	}	1655	}
1656		1656
1657	#if defined(CURSOR_BLINK)	1657	#if defined(CURSOR_BLINK)
…		…
1683		1683
1684	refresh_check ();	1684	refresh_check ();
1685	}	1685	}
1686		1686
1687	void	1687	void
		1688	rxvt_term::set_urgency (bool enable)
		1689	{
		1690	if (enable == urgency_hint)
		1691	return;
		1692
		1693	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1694	{
		1695	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
		1696	XSetWMHints (dpy, parent[0], h);
		1697	urgency_hint = enable;
		1698	}
		1699	}
		1700
		1701	void
1688	rxvt_term::focus_in ()	1702	rxvt_term::focus_in ()
1689	{	1703	{
1690	if (!focus)	1704	if (!focus)
1691	{	1705	{
1692	focus = 1;	1706	focus = 1;
1693	want_refresh = 1;	1707	want_refresh = 1;
1694
1695	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696		1708
1697	#if USE_XIM	1709	#if USE_XIM
1698	if (Input_Context != NULL)	1710	if (Input_Context != NULL)
1699	{	1711	{
1700	IMSetPosition ();	1712	IMSetPosition ();
…		…
1712	scr_recolour ();	1724	scr_recolour ();
1713	}	1725	}
1714	#endif	1726	#endif
1715	#if ENABLE_FRILLS	1727	#if ENABLE_FRILLS
1716	if (option (Opt_urgentOnBell))	1728	if (option (Opt_urgentOnBell))
1717	{	1729	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	1730	#endif
		1731
		1732	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725	}	1733	}
1726	}	1734	}
1727		1735
1728	void	1736	void
1729	rxvt_term::focus_out ()	1737	rxvt_term::focus_out ()
…		…
1731	if (focus)	1739	if (focus)
1732	{	1740	{
1733	focus = 0;	1741	focus = 0;
1734	want_refresh = 1;	1742	want_refresh = 1;
1735		1743
1736	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1744	#if ENABLE_FRILLS
1737		1745	if (option (Opt_urgentOnBell))
		1746	set_urgency (0);
		1747	#endif
1738	#if ENABLE_FRILLS \|\| ISO_14755	1748	#if ENABLE_FRILLS \|\| ISO_14755
1739	if (iso14755buf)	1749	if (iso14755buf)
1740	{	1750	{
1741	iso14755buf = 0;	1751	iso14755buf = 0;
1742	# if ISO_14755	1752	# if ISO_14755
…		…
1759	{	1769	{
1760	pix_colors = pix_colors_unfocused;	1770	pix_colors = pix_colors_unfocused;
1761	scr_recolour ();	1771	scr_recolour ();
1762	}	1772	}
1763	#endif	1773	#endif
		1774
		1775	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764	}	1776	}
1765	}	1777	}
1766		1778
1767	void	1779	void
1768	rxvt_term::update_fade_color (unsigned int idx)	1780	rxvt_term::update_fade_color (unsigned int idx)
…		…
2010	}	2022	}
2011		2023
2012	if (scrollBar.style == R_SB_XTERM	2024	if (scrollBar.style == R_SB_XTERM
2013	\|\| scrollbar_above_slider (ev.y)	2025	\|\| scrollbar_above_slider (ev.y)
2014	\|\| scrollbar_below_slider (ev.y))	2026	\|\| scrollbar_below_slider (ev.y))
2015	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2027	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2016		2028
2017	scrollBar.state = STATE_MOTION;	2029	scrollBar.state = STATE_MOTION;
2018	break;	2030	break;
2019		2031
2020	case Button1:	2032	case Button1:
…		…
2043	else	2055	else
2044	{	2056	{
2045	scr_page ((ev.button == Button1 ? DN : UP),	2057	scr_page ((ev.button == Button1 ? DN : UP),
2046	(nrow	2058	(nrow
2047	* scrollbar_position (ev.y)	2059	* scrollbar_position (ev.y)
2048	/ scrollbar_size ()));	2060	/ scrollBar.size ()));
2049	}	2061	}
2050		2062
2051	break;	2063	break;
2052	}	2064	}
2053	}	2065	}
…		…
2066	reportmode = !! (priv_modes & PrivMode_mouse_report);	2078	reportmode = !! (priv_modes & PrivMode_mouse_report);
2067		2079
2068	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2080	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2069	{	2081	{
2070	scrollBar.state = STATE_IDLE;	2082	scrollBar.state = STATE_IDLE;
2071	scrollbar_show (0);	2083	scrollBar.show (0);
2072	}	2084	}
2073		2085
2074	#ifdef SELECTION_SCROLLING	2086	#ifdef SELECTION_SCROLLING
2075	sel_scroll_ev.stop();	2087	sel_scroll_ev.stop();
2076	#endif	2088	#endif
…		…
2159	}	2171	}
2160	else	2172	else
2161	# endif	2173	# endif
2162	{	2174	{
2163	scr_page (v, i);	2175	scr_page (v, i);
2164	scrollbar_show (1);	2176	scrollBar.show (1);
2165	}	2177	}
2166	}	2178	}
2167	break;	2179	break;
2168	#endif	2180	#endif
2169	}	2181	}
…		…
2179	wchar_t ch = NOCHAR;	2191	wchar_t ch = NOCHAR;
2180	char *seq_begin; // remember start of esc-sequence here	2192	char *seq_begin; // remember start of esc-sequence here
2181		2193
2182	for (;;)	2194	for (;;)
2183	{	2195	{
2184	if (ch == NOCHAR)	2196	if (expect_false (ch == NOCHAR))
2185	{	2197	{
2186	seq_begin = cmdbuf_ptr;	2198	seq_begin = cmdbuf_ptr;
2187	ch = next_char ();	2199	ch = next_char ();
2188		2200
2189	if (ch == NOCHAR)	2201	if (ch == NOCHAR)
2190	break;	2202	break;
2191	}	2203	}
2192		2204
2193	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2205	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2194	{	2206	{
2195	if (!seen_input)	2207	if (expect_false (!seen_input))
2196	{	2208	{
2197	seen_input = 1;	2209	seen_input = 1;
2198	// many badly-written programs (e.g. jed) contain a race condition:	2210	// many badly-written programs (e.g. jed) contain a race condition:
2199	// they first read the screensize and then install a SIGWINCH handler.	2211	// they first read the screensize and then install a SIGWINCH handler.
2200	// some window managers resize the window early, and these programs	2212	// some window managers resize the window early, and these programs
…		…
2213	wchar_t *str = buf;	2225	wchar_t *str = buf;
2214	wchar_t *eol = str + min (ncol, UBUFSIZ);	2226	wchar_t *eol = str + min (ncol, UBUFSIZ);
2215		2227
2216	for (;;)	2228	for (;;)
2217	{	2229	{
2218	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2230	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219	break;	2231	break;
2220		2232
2221	*str++ = ch;	2233	*str++ = ch;
2222		2234
2223	if (ch == C0_LF \|\| str >= eol)	2235	if (expect_false (ch == C0_LF \|\| str >= eol))
2224	{	2236	{
2225	if (ch == C0_LF)	2237	if (ch == C0_LF)
2226	nlines++;	2238	nlines++;
2227		2239
2228	refresh_count++;	2240	refresh_count++;
…		…
2310	rxvt_term::next_char () NOTHROW	2322	rxvt_term::next_char () NOTHROW
2311	{	2323	{
2312	while (cmdbuf_ptr < cmdbuf_endp)	2324	while (cmdbuf_ptr < cmdbuf_endp)
2313	{	2325	{
2314	// assume 7-bit to be ascii ALWAYS	2326	// assume 7-bit to be ascii ALWAYS
2315	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2327	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2316	return *cmdbuf_ptr++;	2328	return *cmdbuf_ptr++;
2317		2329
2318	wchar_t wc;	2330	wchar_t wc;
2319	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2331	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320		2332
…		…
2324	cmdbuf_ptr = cmdbuf_endp;	2336	cmdbuf_ptr = cmdbuf_endp;
2325	break;	2337	break;
2326	}	2338	}
2327		2339
2328	if (len == (size_t)-1)	2340	if (len == (size_t)-1)
		2341	{
		2342	mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2329	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2343	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2344	}
2330		2345
2331	// assume wchar == unicode	2346	// assume wchar == unicode
2332	cmdbuf_ptr += len;	2347	cmdbuf_ptr += len;
2333	return wc & UNICODE_MASK;	2348	return wc & UNICODE_MASK;
2334	}	2349	}
…		…
2378	/----------------------------------------------------------------------/	2393	/----------------------------------------------------------------------/
2379	#ifdef PRINTPIPE	2394	#ifdef PRINTPIPE
2380	FILE *	2395	FILE *
2381	rxvt_term::popen_printer ()	2396	rxvt_term::popen_printer ()
2382	{	2397	{
2383	FILE *stream = popen (rs[Rs_print_pipe], "w");	2398	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384		2399
2385	if (stream == NULL)	2400	if (stream == NULL)
2386	rxvt_warn ("can't open printer pipe, not printing.\n");	2401	rxvt_warn ("can't open printer pipe, not printing.\n");
2387		2402
2388	return stream;	2403	return stream;
…		…
2399	* simulate attached vt100 printer	2414	* simulate attached vt100 printer
2400	*/	2415	*/
2401	void	2416	void
2402	rxvt_term::process_print_pipe ()	2417	rxvt_term::process_print_pipe ()
2403	{	2418	{
2404	int done;	2419	FILE *fd = popen_printer ();
2405	FILE *fd;
2406		2420
2407	if ((fd = popen_printer ()) == NULL)	2421	if (!fd)
2408	return;	2422	return;
2409		2423
2410	/*	2424	/*
2411	* Send all input to the printer until either ESC[4i or ESC[?4i	2425	* Send all input to the printer until either ESC[4i or ESC[?4i
2412	* is received.	2426	* is received.
2413	*/	2427	*/
2414	for (done = 0; !done;)	2428	for (int done = 0; !done; )
2415	{	2429	{
2416	unsigned char buf[8];	2430	unsigned char buf[8];
2417	unicode_t ch;	2431	unicode_t ch;
2418	unsigned int i, len;	2432	unsigned int i, len;
2419		2433
…		…
2564	break;	2578	break;
2565	case 'Z': /* identify the terminal type */	2579	case 'Z': /* identify the terminal type */
2566	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2580	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567	break;	2581	break;
2568	case '<': /* turn off VT52 mode */	2582	case '<': /* turn off VT52 mode */
2569	PrivMode (0, PrivMode_vt52);	2583	set_privmode (PrivMode_vt52, 0);
2570	break;	2584	break;
2571	case 'F': /* use special graphics character set */	2585	case 'F': /* use special graphics character set */
2572	case 'G': /* use regular character set */	2586	case 'G': /* use regular character set */
2573	/* unimplemented */	2587	/* unimplemented */
2574	break;	2588	break;
…		…
2628	scr_forwardindex ();	2642	scr_forwardindex ();
2629	break;	2643	break;
2630	#endif	2644	#endif
2631	case '=':	2645	case '=':
2632	case '>':	2646	case '>':
2633	PrivMode ((ch == '='), PrivMode_aplKP);	2647	set_privmode (PrivMode_aplKP, ch == '=');
2634	break;	2648	break;
2635		2649
2636	case C1_40:	2650	case C1_40:
2637	cmd_getc ();	2651	cmd_getc ();
2638	break;	2652	break;
…		…
2691		2705
2692	/* 8.3.106: RESET TO INITIAL STATE */	2706	/* 8.3.106: RESET TO INITIAL STATE */
2693	case 'c':	2707	case 'c':
2694	mbstate.reset ();	2708	mbstate.reset ();
2695	scr_poweron ();	2709	scr_poweron ();
2696	scrollbar_show (1);	2710	scrollBar.show (1);
2697	break;	2711	break;
2698		2712
2699	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2713	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700	case 'n':	2714	case 'n':
2701	scr_charset_choose (2);	2715	scr_charset_choose (2);
…		…
3507	break;	3521	break;
3508	#endif	3522	#endif
3509		3523
3510	#if ENABLE_PERL	3524	#if ENABLE_PERL
3511	case URxvt_perl:	3525	case URxvt_perl:
3512	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3526	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513	; // no responses yet
3514	break;	3527	break;
3515	#endif	3528	#endif
3516	}	3529	}
3517	}	3530	}
3518	/----------------------------------------------------------------------/	3531	/----------------------------------------------------------------------/
…		…
3541	{	3554	{
3542	if (mode == 'r')	3555	if (mode == 'r')
3543	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3556	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544	else	3557	else
3545	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3558	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546	PrivMode (state, bit);	3559	set_privmode (bit, state);
3547	}	3560	}
3548		3561
3549	return state;	3562	return state;
3550	}	3563	}
3551		3564
…		…
3649	case 2: /* VT52 mode */	3662	case 2: /* VT52 mode */
3650	/* oddball mode. should be set regardless of set/reset	3663	/* oddball mode. should be set regardless of set/reset
3651	* parameter. Return from VT52 mode with an ESC < from	3664	* parameter. Return from VT52 mode with an ESC < from
3652	* within VT52 mode	3665	* within VT52 mode
3653	*/	3666	*/
3654	PrivMode (1, PrivMode_vt52);	3667	set_privmode (PrivMode_vt52, 1);
3655	break;	3668	break;
3656	case 3: /* 80/132 */	3669	case 3: /* 80/132 */
3657	if (priv_modes & PrivMode_132OK)	3670	if (priv_modes & PrivMode_132OK)
3658	{	3671	{
3659	scr_poweron ();	3672	scr_poweron ();
…		…
3677	if (state) /* orthogonal */	3690	if (state) /* orthogonal */
3678	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3691	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3679	break;	3692	break;
3680	#ifdef scrollBar_esc	3693	#ifdef scrollBar_esc
3681	case scrollBar_esc:	3694	case scrollBar_esc:
3682	if (scrollbar_mapping (state))	3695	if (scrollBar.map (state))
3683	{	3696	{
3684	resize_all_windows (0, 0, 0);	3697	resize_all_windows (0, 0, 0);
3685	scr_touch (true);	3698	scr_touch (true);
3686	}	3699	}
3687	break;	3700	break;

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.410 by ayin, Sat Feb 16 15:48:36 2008 UTC vs. Revision 1.420 by root, Wed Oct 15 14:48:22 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.410 by ayin, Sat Feb 16 15:48:36 2008 UTC vs.
Revision 1.420 by root, Wed Oct 15 14:48:22 2008 UTC