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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC vs.
Revision 1.424 by root, Tue Nov 4 23:46:22 2008 UTC

…		…
334	# endif	334	# endif
335	#endif	335	#endif
336	return keysym;	336	return keysym;
337	}	337	}
338		338
		339	static inline int
		340	map_function_key (KeySym keysym)
		341	{
		342	int param = 0;
		343
		344	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
		345	{
		346	param = 11 + keysym - XK_F1;
		347	if (keysym >= XK_F17)
		348	param += 4;
		349	else if (keysym >= XK_F15)
		350	param += 3;
		351	else if (keysym >= XK_F11)
		352	param += 2;
		353	else if (keysym >= XK_F6)
		354	param += 1;
		355	}
		356	else
		357	switch (keysym)
		358	{
		359	case XK_Find:
		360	param = 1;
		361	break;
		362	case XK_Insert:
		363	param = 2;
		364	break;
		365	#ifdef DXK_Remove
		366	case DXK_Remove:
		367	#endif
		368	case XK_Execute:
		369	param = 3;
		370	break;
		371	case XK_Select:
		372	param = 4;
		373	break;
		374	#ifndef UNSHIFTED_SCROLLKEYS
		375	case XK_Prior:
		376	param = 5;
		377	break;
		378	case XK_Next:
		379	param = 6;
		380	break;
		381	case XK_Home:
		382	param = 7;
		383	break;
		384	case XK_End:
		385	param = 8;
		386	break;
		387	#endif
		388	case XK_Help:
		389	param = 28;
		390	break;
		391	case XK_Menu:
		392	param = 29;
		393	break;
		394	}
		395	return param;
		396	}
		397
339	void	398	void
340	rxvt_term::key_press (XKeyEvent &ev)	399	rxvt_term::key_press (XKeyEvent &ev)
341	{	400	{
342	int ctrl, meta, shft, len;	401	int ctrl, meta, shft, len;
343	KeySym keysym;	402	KeySym keysym;
…		…
360	meta = ev.state & ModMetaMask;	419	meta = ev.state & ModMetaMask;
361		420
362	if (numlock_state \|\| (ev.state & ModNumLockMask))	421	if (numlock_state \|\| (ev.state & ModNumLockMask))
363	{	422	{
364	numlock_state = (ev.state & ModNumLockMask);	423	numlock_state = (ev.state & ModNumLockMask);
365	PrivMode ((!numlock_state), PrivMode_aplKP);	424	set_privmode (PrivMode_aplKP, !numlock_state);
366	}	425	}
367		426
368	kbuf[0] = 0;	427	kbuf[0] = 0;
369		428
370	#ifdef USE_XIM	429	#ifdef USE_XIM
…		…
582	}	641	}
583	#endif	642	#endif
584		643
585	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	644	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
586	{	645	{
587	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	646	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
588	unsigned int newlen = 1;	647	unsigned int newlen = 1;
589		648
590	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:
591	{	765	{
592	#ifndef NO_BACKSPACE_KEY	766	int param = map_function_key (keysym);
593	case XK_BackSpace:	767	if (param > 0)
594	if (priv_modes & PrivMode_HaveBackSpace)	768	sprintf (kbuf,"\033[%d~", param);
595	{
596	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
597	^ !!ctrl) ? '\b' : '\177';
598	kbuf[1] = '\0';
599	}
600	else	769	else
601	strcpy (kbuf, rs[Rs_backspace_key]);
602	break;
603	#endif
604	#ifndef NO_DELETE_KEY
605	case XK_Delete:
606	strcpy (kbuf, rs[Rs_delete_key]);
607	break;
608	#endif
609	case XK_Tab:
610	if (shft)
611	strcpy (kbuf, "\033[Z");
612	else
613	{
614	#ifdef CTRL_TAB_MAKES_META
615	if (ctrl)
616	meta = 1;
617	#endif
618	#ifdef MOD4_TAB_MAKES_META
619	if (ev.state & Mod4Mask)
620	meta = 1;
621	#endif
622	newlen = 0;
623	}
624	break;
625
626	case XK_Up: /* "\033[A" */
627	case XK_Down: /* "\033[B" */
628	case XK_Right: /* "\033[C" */
629	case XK_Left: /* "\033[D" */
630	strcpy (kbuf, "\033[Z");
631	kbuf[2] = "DACB"[keysym - XK_Left];
632	/* do Shift first */
633	if (shft)
634	kbuf[2] = "dacb"[keysym - XK_Left];
635	else if (ctrl)
636	{
637	kbuf[1] = 'O';
638	kbuf[2] = "dacb"[keysym - XK_Left];
639	}
640	else if (priv_modes & PrivMode_aplCUR)
641	kbuf[1] = 'O';
642	break;
643
644	#ifndef UNSHIFTED_SCROLLKEYS
645	case XK_Prior:
646	strcpy (kbuf, "\033[5~");
647	break;
648	case XK_Next:
649	strcpy (kbuf, "\033[6~");
650	break;
651	#endif
652	case XK_KP_Enter:
653	/* allow shift to override */
654	if (kp)
655	{
656	strcpy (kbuf, "\033OM");
657	break;
658	}
659
660	/* FALLTHROUGH */
661
662	case XK_Return:
663	if (priv_modes & PrivMode_LFNL)
664	{
665	kbuf[0] = '\015';
666	kbuf[1] = '\012';
667	kbuf[2] = '\0';
668	}
669	else
670	{
671	kbuf[0] = '\015';
672	kbuf[1] = '\0';
673	}
674	break;
675
676	case XK_KP_F1: /* "\033OP" */
677	case XK_KP_F2: /* "\033OQ" */
678	case XK_KP_F3: /* "\033OR" */
679	case XK_KP_F4: /* "\033OS" */
680	strcpy (kbuf, "\033OP");
681	kbuf[2] += (keysym - XK_KP_F1);
682	break;
683
684	case XK_KP_Multiply: /* "\033Oj" : "" /
685	case XK_KP_Add: /* "\033Ok" : "+" */
686	case XK_KP_Separator: /* "\033Ol" : "," */
687	case XK_KP_Subtract: /* "\033Om" : "-" */
688	case XK_KP_Decimal: /* "\033On" : "." */
689	case XK_KP_Divide: /* "\033Oo" : "/" */
690	case XK_KP_0: /* "\033Op" : "0" */
691	case XK_KP_1: /* "\033Oq" : "1" */
692	case XK_KP_2: /* "\033Or" : "2" */
693	case XK_KP_3: /* "\033Os" : "3" */
694	case XK_KP_4: /* "\033Ot" : "4" */
695	case XK_KP_5: /* "\033Ou" : "5" */
696	case XK_KP_6: /* "\033Ov" : "6" */
697	case XK_KP_7: /* "\033Ow" : "7" */
698	case XK_KP_8: /* "\033Ox" : "8" */
699	case XK_KP_9: /* "\033Oy" : "9" */
700	/* allow shift to override */
701	if (kp)
702	{
703	strcpy (kbuf, "\033Oj");
704	kbuf[2] += (keysym - XK_KP_Multiply);
705	}
706	else
707	{
708	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
709	kbuf[1] = '\0';
710	}
711	break;
712
713	case XK_Find:
714	strcpy (kbuf, "\033[1~");
715	break;
716
717	case XK_Insert:
718	strcpy (kbuf, "\033[2~");
719	break;
720	#ifdef DXK_Remove /* support for DEC remove like key */
721	case DXK_Remove:
722	/* FALLTHROUGH */
723	#endif
724	case XK_Execute:
725	strcpy (kbuf, "\033[3~");
726	break;
727	case XK_Select:
728	strcpy (kbuf, "\033[4~");
729	break;
730	case XK_End:
731	strcpy (kbuf, KS_END);
732	break;
733	case XK_Home:
734	strcpy (kbuf, KS_HOME);
735	break;
736
737	#define FKEY(n, fkey) \
738	sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
739
740	case XK_F1: /* "\033[11~" */
741	case XK_F2: /* "\033[12~" */
742	case XK_F3: /* "\033[13~" */
743	case XK_F4: /* "\033[14~" */
744	case XK_F5: /* "\033[15~" */
745	FKEY (11, XK_F1);
746	break;
747	case XK_F6: /* "\033[17~" */
748	case XK_F7: /* "\033[18~" */
749	case XK_F8: /* "\033[19~" */
750	case XK_F9: /* "\033[20~" */
751	case XK_F10: /* "\033[21~" */
752	FKEY (17, XK_F6);
753	break;
754	case XK_F11: /* "\033[23~" */
755	case XK_F12: /* "\033[24~" */
756	case XK_F13: /* "\033[25~" */
757	case XK_F14: /* "\033[26~" */
758	FKEY (23, XK_F11);
759	break;
760	case XK_F15: /* "\033[28~" */
761	case XK_F16: /* "\033[29~" */
762	FKEY (28, XK_F15);
763	break;
764	case XK_Help: /* "\033[28~" */
765	FKEY (28, XK_Help);
766	break;
767	case XK_Menu: /* "\033[29~" */
768	FKEY (29, XK_Menu);
769	break;
770	case XK_F17: /* "\033[31~" */
771	case XK_F18: /* "\033[32~" */
772	case XK_F19: /* "\033[33~" */
773	case XK_F20: /* "\033[34~" */
774	case XK_F21: /* "\033[35~" */
775	case XK_F22: /* "\033[36~" */
776	case XK_F23: /* "\033[37~" */
777	case XK_F24: /* "\033[38~" */
778	case XK_F25: /* "\033[39~" */
779	case XK_F26: /* "\033[40~" */
780	case XK_F27: /* "\033[41~" */
781	case XK_F28: /* "\033[42~" */
782	case XK_F29: /* "\033[43~" */
783	case XK_F30: /* "\033[44~" */
784	case XK_F31: /* "\033[45~" */
785	case XK_F32: /* "\033[46~" */
786	case XK_F33: /* "\033[47~" */
787	case XK_F34: /* "\033[48~" */
788	case XK_F35: /* "\033[49~" */
789	FKEY (31, XK_F17);
790	break;
791	#undef FKEY
792	default:
793	newlen = 0;	770	newlen = 0;
794	break;
795	}	771	}
		772	break;
		773	}
796		774
797	if (newlen)	775	if (newlen)
798	len = strlen (kbuf);	776	len = strlen (kbuf);
799		777
800	/*	778	/*
801	* Pass meta for all function keys, if 'meta' option set	779	* Pass meta for all function keys, if 'meta' option set
802	*/	780	*/
803	#ifdef META8_OPTION	781	#ifdef META8_OPTION
…		…
1037	}	1015	}
1038	while (row < end_row);	1016	while (row < end_row);
1039	}	1017	}
1040		1018
1041	scr_refresh ();	1019	scr_refresh ();
1042	scrollbar_show (1);	1020	scrollBar.show (1);
1043	#ifdef USE_XIM	1021	#ifdef USE_XIM
1044	IMSendSpot ();	1022	IMSendSpot ();
1045	#endif	1023	#endif
1046	}	1024	}
1047		1025
…		…
1149	{	1127	{
1150	// this should really be sched_yield(), but the linux guys thought	1128	// this should really be sched_yield(), but the linux guys thought
1151	// that giving a process calling sched_yield () less cpu time than	1129	// that giving a process calling sched_yield () less cpu time than
1152	// 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
1153	// 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.
1154		1135
1155	struct timespec ts = { 0, 0 };	1136	struct timespec ts = { 0, 1000 };
1156	nanosleep (&ts, 0);	1137	nanosleep (&ts, 0);
1157		1138
1158	w.stop ();	1139	w.stop ();
1159	}	1140	}
1160		1141
…		…
1210	{	1191	{
1211	make_current ();	1192	make_current ();
1212		1193
1213	if (revents & ev::READ)	1194	if (revents & ev::READ)
1214	// loop, but don't allow a single term to monopolize us	1195	// loop, but don't allow a single term to monopolize us
1215	while (pty_fill ())	1196	for (int i = CBUFCNT; i-- && pty_fill (); )
1216	if (cmd_parse ())	1197	cmd_parse ();
1217	break;
1218		1198
1219	if (revents & ev::WRITE)	1199	if (revents & ev::WRITE)
1220	pty_write ();	1200	pty_write ();
1221		1201
1222	refresh_check ();	1202	refresh_check ();
…		…
1558	;	1538	;
1559		1539
1560	if (scrollBar.state && ev.xany.window == scrollBar.win)	1540	if (scrollBar.state && ev.xany.window == scrollBar.win)
1561	{	1541	{
1562	scrollBar.state = STATE_IDLE;	1542	scrollBar.state = STATE_IDLE;
1563	scrollbar_show (0);	1543	scrollBar.show (0);
1564	}	1544	}
1565	}	1545	}
1566	break;	1546	break;
1567		1547
1568	case MotionNotify:	1548	case MotionNotify:
…		…
1667	&unused_root, &unused_child,	1647	&unused_root, &unused_child,
1668	&unused_root_x, &unused_root_y,	1648	&unused_root_x, &unused_root_y,
1669	&ev.xbutton.x, &ev.xbutton.y,	1649	&ev.xbutton.x, &ev.xbutton.y,
1670	&unused_mask);	1650	&unused_mask);
1671	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1651	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1672	scrollbar_size ());	1652	scrollBar.size ());
1673	want_refresh = 1;	1653	want_refresh = 1;
1674	scrollbar_show (1);	1654	scrollBar.show (1);
1675	}	1655	}
1676	break;	1656	break;
1677	}	1657	}
1678		1658
1679	#if defined(CURSOR_BLINK)	1659	#if defined(CURSOR_BLINK)
…		…
1705		1685
1706	refresh_check ();	1686	refresh_check ();
1707	}	1687	}
1708		1688
1709	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
1710	rxvt_term::focus_in ()	1704	rxvt_term::focus_in ()
1711	{	1705	{
1712	if (!focus)	1706	if (!focus)
1713	{	1707	{
1714	focus = 1;	1708	focus = 1;
1715	want_refresh = 1;	1709	want_refresh = 1;
1716
1717	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1718		1710
1719	#if USE_XIM	1711	#if USE_XIM
1720	if (Input_Context != NULL)	1712	if (Input_Context != NULL)
1721	{	1713	{
1722	IMSetPosition ();	1714	IMSetPosition ();
…		…
1734	scr_recolour ();	1726	scr_recolour ();
1735	}	1727	}
1736	#endif	1728	#endif
1737	#if ENABLE_FRILLS	1729	#if ENABLE_FRILLS
1738	if (option (Opt_urgentOnBell))	1730	if (option (Opt_urgentOnBell))
1739	{	1731	set_urgency (0);
1740	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1741	{
1742	h->flags &= ~XUrgencyHint;
1743	XSetWMHints (dpy, parent[0], h);
1744	}
1745	}
1746	#endif	1732	#endif
		1733
		1734	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747	}	1735	}
1748	}	1736	}
1749		1737
1750	void	1738	void
1751	rxvt_term::focus_out ()	1739	rxvt_term::focus_out ()
…		…
1753	if (focus)	1741	if (focus)
1754	{	1742	{
1755	focus = 0;	1743	focus = 0;
1756	want_refresh = 1;	1744	want_refresh = 1;
1757		1745
1758	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1746	#if ENABLE_FRILLS
1759		1747	if (option (Opt_urgentOnBell))
		1748	set_urgency (0);
		1749	#endif
1760	#if ENABLE_FRILLS \|\| ISO_14755	1750	#if ENABLE_FRILLS \|\| ISO_14755
1761	if (iso14755buf)	1751	if (iso14755buf)
1762	{	1752	{
1763	iso14755buf = 0;	1753	iso14755buf = 0;
1764	# if ISO_14755	1754	# if ISO_14755
…		…
1781	{	1771	{
1782	pix_colors = pix_colors_unfocused;	1772	pix_colors = pix_colors_unfocused;
1783	scr_recolour ();	1773	scr_recolour ();
1784	}	1774	}
1785	#endif	1775	#endif
		1776
		1777	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1786	}	1778	}
1787	}	1779	}
1788		1780
1789	void	1781	void
1790	rxvt_term::update_fade_color (unsigned int idx)	1782	rxvt_term::update_fade_color (unsigned int idx)
…		…
2032	}	2024	}
2033		2025
2034	if (scrollBar.style == R_SB_XTERM	2026	if (scrollBar.style == R_SB_XTERM
2035	\|\| scrollbar_above_slider (ev.y)	2027	\|\| scrollbar_above_slider (ev.y)
2036	\|\| scrollbar_below_slider (ev.y))	2028	\|\| scrollbar_below_slider (ev.y))
2037	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2029	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2038		2030
2039	scrollBar.state = STATE_MOTION;	2031	scrollBar.state = STATE_MOTION;
2040	break;	2032	break;
2041		2033
2042	case Button1:	2034	case Button1:
…		…
2065	else	2057	else
2066	{	2058	{
2067	scr_page ((ev.button == Button1 ? DN : UP),	2059	scr_page ((ev.button == Button1 ? DN : UP),
2068	(nrow	2060	(nrow
2069	* scrollbar_position (ev.y)	2061	* scrollbar_position (ev.y)
2070	/ scrollbar_size ()));	2062	/ scrollBar.size ()));
2071	}	2063	}
2072		2064
2073	break;	2065	break;
2074	}	2066	}
2075	}	2067	}
…		…
2088	reportmode = !! (priv_modes & PrivMode_mouse_report);	2080	reportmode = !! (priv_modes & PrivMode_mouse_report);
2089		2081
2090	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2082	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2091	{	2083	{
2092	scrollBar.state = STATE_IDLE;	2084	scrollBar.state = STATE_IDLE;
2093	scrollbar_show (0);	2085	scrollBar.show (0);
2094	}	2086	}
2095		2087
2096	#ifdef SELECTION_SCROLLING	2088	#ifdef SELECTION_SCROLLING
2097	sel_scroll_ev.stop();	2089	sel_scroll_ev.stop();
2098	#endif	2090	#endif
…		…
2181	}	2173	}
2182	else	2174	else
2183	# endif	2175	# endif
2184	{	2176	{
2185	scr_page (v, i);	2177	scr_page (v, i);
2186	scrollbar_show (1);	2178	scrollBar.show (1);
2187	}	2179	}
2188	}	2180	}
2189	break;	2181	break;
2190	#endif	2182	#endif
2191	}	2183	}
2192	}	2184	}
2193	}	2185	}
2194		2186
2195	/}}} /	2187	/}}} /
2196		2188
2197	bool	2189	void
2198	rxvt_term::cmd_parse ()	2190	rxvt_term::cmd_parse ()
2199	{	2191	{
2200	bool flag = false;
2201	wchar_t ch = NOCHAR;	2192	wchar_t ch = NOCHAR;
2202	char *seq_begin; // remember start of esc-sequence here	2193	char *seq_begin; // remember start of esc-sequence here
2203		2194
2204	for (;;)	2195	for (;;)
2205	{	2196	{
2206	if (ch == NOCHAR)	2197	if (expect_false (ch == NOCHAR))
2207	{	2198	{
2208	seq_begin = cmdbuf_ptr;	2199	seq_begin = cmdbuf_ptr;
2209	ch = next_char ();	2200	ch = next_char ();
2210		2201
2211	if (ch == NOCHAR)	2202	if (ch == NOCHAR)
2212	break;	2203	break;
2213	}	2204	}
2214		2205
2215	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))
2216	{	2207	{
2217	if (!seen_input)	2208	if (expect_false (!seen_input))
2218	{	2209	{
2219	seen_input = 1;	2210	seen_input = 1;
2220	// many badly-written programs (e.g. jed) contain a race condition:	2211	// many badly-written programs (e.g. jed) contain a race condition:
2221	// they first read the screensize and then install a SIGWINCH handler.	2212	// they first read the screensize and then install a SIGWINCH handler.
2222	// some window managers resize the window early, and these programs	2213	// some window managers resize the window early, and these programs
…		…
2235	wchar_t *str = buf;	2226	wchar_t *str = buf;
2236	wchar_t *eol = str + min (ncol, UBUFSIZ);	2227	wchar_t *eol = str + min (ncol, UBUFSIZ);
2237		2228
2238	for (;;)	2229	for (;;)
2239	{	2230	{
2240	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)))
2241	break;	2232	break;
2242		2233
2243	*str++ = ch;	2234	*str++ = ch;
2244		2235
2245	if (ch == C0_LF \|\| str >= eol)	2236	if (expect_false (ch == C0_LF \|\| str >= eol))
2246	{	2237	{
2247	if (ch == C0_LF)	2238	if (ch == C0_LF)
2248	nlines++;	2239	nlines++;
2249		2240
2250	refresh_count++;	2241	refresh_count++;
…		…
2299	* 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.
2300	* if skipScroll is enabled.	2291	* if skipScroll is enabled.
2301	*/	2292	*/
2302	if (refreshnow)	2293	if (refreshnow)
2303	{	2294	{
2304	flag = true;
2305	scr_refresh ();	2295	scr_refresh ();
2306	want_refresh = 1;	2296	want_refresh = 1;
2307	}	2297	}
2308
2309	}	2298	}
2310	else	2299	else
2311	{	2300	{
2312	try	2301	try
2313	{	2302	{
…		…
2321	}	2310	}
2322		2311
2323	ch = NOCHAR;	2312	ch = NOCHAR;
2324	}	2313	}
2325	}	2314	}
2326
2327	return flag;
2328	}	2315	}
2329		2316
2330	// read the next character	2317	// read the next character
2331	wchar_t	2318	wchar_t
2332	rxvt_term::next_char () NOTHROW	2319	rxvt_term::next_char () NOTHROW
2333	{	2320	{
2334	while (cmdbuf_ptr < cmdbuf_endp)	2321	while (cmdbuf_ptr < cmdbuf_endp)
2335	{	2322	{
2336	// assume 7-bit to be ascii ALWAYS	2323	// assume 7-bit to be ascii ALWAYS
2337	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2324	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2338	return *cmdbuf_ptr++;	2325	return *cmdbuf_ptr++;
2339		2326
2340	wchar_t wc;	2327	wchar_t wc;
2341	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);
2342		2329
…		…
2346	cmdbuf_ptr = cmdbuf_endp;	2333	cmdbuf_ptr = cmdbuf_endp;
2347	break;	2334	break;
2348	}	2335	}
2349		2336
2350	if (len == (size_t)-1)	2337	if (len == (size_t)-1)
		2338	{
		2339	mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2351	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	}
2352		2342
2353	// assume wchar == unicode	2343	// assume wchar == unicode
2354	cmdbuf_ptr += len;	2344	cmdbuf_ptr += len;
2355	return wc & UNICODE_MASK;	2345	return wc & UNICODE_MASK;
2356	}	2346	}
…		…
2400	/----------------------------------------------------------------------/	2390	/----------------------------------------------------------------------/
2401	#ifdef PRINTPIPE	2391	#ifdef PRINTPIPE
2402	FILE *	2392	FILE *
2403	rxvt_term::popen_printer ()	2393	rxvt_term::popen_printer ()
2404	{	2394	{
2405	FILE *stream = popen (rs[Rs_print_pipe], "w");	2395	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2406		2396
2407	if (stream == NULL)	2397	if (stream == NULL)
2408	rxvt_warn ("can't open printer pipe, not printing.\n");	2398	rxvt_warn ("can't open printer pipe, not printing.\n");
2409		2399
2410	return stream;	2400	return stream;
…		…
2421	* simulate attached vt100 printer	2411	* simulate attached vt100 printer
2422	*/	2412	*/
2423	void	2413	void
2424	rxvt_term::process_print_pipe ()	2414	rxvt_term::process_print_pipe ()
2425	{	2415	{
2426	int done;	2416	FILE *fd = popen_printer ();
2427	FILE *fd;
2428		2417
2429	if ((fd = popen_printer ()) == NULL)	2418	if (!fd)
2430	return;	2419	return;
2431		2420
2432	/*	2421	/*
2433	* 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
2434	* is received.	2423	* is received.
2435	*/	2424	*/
2436	for (done = 0; !done;)	2425	for (int done = 0; !done; )
2437	{	2426	{
2438	unsigned char buf[8];	2427	unsigned char buf[8];
2439	unicode_t ch;	2428	unicode_t ch;
2440	unsigned int i, len;	2429	unsigned int i, len;
2441		2430
…		…
2586	break;	2575	break;
2587	case 'Z': /* identify the terminal type */	2576	case 'Z': /* identify the terminal type */
2588	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2577	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2589	break;	2578	break;
2590	case '<': /* turn off VT52 mode */	2579	case '<': /* turn off VT52 mode */
2591	PrivMode (0, PrivMode_vt52);	2580	set_privmode (PrivMode_vt52, 0);
2592	break;	2581	break;
2593	case 'F': /* use special graphics character set */	2582	case 'F': /* use special graphics character set */
2594	case 'G': /* use regular character set */	2583	case 'G': /* use regular character set */
2595	/* unimplemented */	2584	/* unimplemented */
2596	break;	2585	break;
…		…
2650	scr_forwardindex ();	2639	scr_forwardindex ();
2651	break;	2640	break;
2652	#endif	2641	#endif
2653	case '=':	2642	case '=':
2654	case '>':	2643	case '>':
2655	PrivMode ((ch == '='), PrivMode_aplKP);	2644	set_privmode (PrivMode_aplKP, ch == '=');
2656	break;	2645	break;
2657		2646
2658	case C1_40:	2647	case C1_40:
2659	cmd_getc ();	2648	cmd_getc ();
2660	break;	2649	break;
…		…
2699	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2688	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2700	case C1_SCI: /* ESC Z */	2689	case C1_SCI: /* ESC Z */
2701	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2690	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2702	break; /* steal obsolete ESC [ c */	2691	break; /* steal obsolete ESC [ c */
2703		2692
2704	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2693	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2705	case C1_CSI: /* ESC [ */	2694	case C1_CSI: /* ESC [ */
2706	process_csi_seq ();	2695	process_csi_seq ();
2707	break;	2696	break;
2708		2697
2709	/* 8.3.90: OPERATING SYSTEM COMMAND */	2698	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2710	case C1_OSC: /* ESC ] */	2699	case C1_OSC: /* ESC ] */
2711	process_osc_seq ();	2700	process_osc_seq ();
2712	break;	2701	break;
2713		2702
2714	/* 8.3.106: RESET TO INITIAL STATE */	2703	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2715	case 'c':	2704	case 'c':
2716	mbstate.reset ();	2705	mbstate.reset ();
2717	scr_poweron ();	2706	scr_poweron ();
2718	scrollbar_show (1);	2707	scrollBar.show (1);
2719	break;	2708	break;
2720		2709
2721	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2710	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2722	case 'n':	2711	case 'n':
2723	scr_charset_choose (2);	2712	scr_charset_choose (2);
…		…
2774		2763
2775	nargs = 0;	2764	nargs = 0;
2776		2765
2777	priv = 0;	2766	priv = 0;
2778	ch = cmd_getc ();	2767	ch = cmd_getc ();
2779	if (ch >= '<' && ch <= '?')	2768	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2780	{	2769	{
2781	/* '<' '=' '>' '?' */	2770	/* '<' '=' '>' '?' '!' */
2782	priv = ch;	2771	priv = ch;
2783	ch = cmd_getc ();	2772	ch = cmd_getc ();
2784	}	2773	}
2785		2774
2786	/* read any numerical arguments */	2775	/* read any numerical arguments */
…		…
2840		2829
2841	case '?':	2830	case '?':
2842	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2831	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2843	process_terminal_mode (ch, priv, nargs, arg);	2832	process_terminal_mode (ch, priv, nargs, arg);
2844	break;	2833	break;
		2834
		2835	case '!':
		2836	if (ch == CSI_70)
		2837	{
		2838	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2839	scr_soft_reset ();
		2840
		2841	static const int pm_h[] = { 7, 25 };
		2842	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
		2843
		2844	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2845	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2845	}	2846	}
		2847	break;
		2848	}
		2849
2846	return;	2850	return;
2847	}	2851	}
2848		2852
2849	switch (ch)	2853	switch (ch)
2850	{	2854	{
…		…
3529	break;	3533	break;
3530	#endif	3534	#endif
3531		3535
3532	#if ENABLE_PERL	3536	#if ENABLE_PERL
3533	case URxvt_perl:	3537	case URxvt_perl:
3534	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3538	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3535	; // no responses yet
3536	break;	3539	break;
3537	#endif	3540	#endif
3538	}	3541	}
3539	}	3542	}
3540	/----------------------------------------------------------------------/	3543	/----------------------------------------------------------------------/
…		…
3563	{	3566	{
3564	if (mode == 'r')	3567	if (mode == 'r')
3565	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3568	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3566	else	3569	else
3567	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3570	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3568	PrivMode (state, bit);	3571	set_privmode (bit, state);
3569	}	3572	}
3570		3573
3571	return state;	3574	return state;
3572	}	3575	}
3573		3576
…		…
3671	case 2: /* VT52 mode */	3674	case 2: /* VT52 mode */
3672	/* oddball mode. should be set regardless of set/reset	3675	/* oddball mode. should be set regardless of set/reset
3673	* parameter. Return from VT52 mode with an ESC < from	3676	* parameter. Return from VT52 mode with an ESC < from
3674	* within VT52 mode	3677	* within VT52 mode
3675	*/	3678	*/
3676	PrivMode (1, PrivMode_vt52);	3679	set_privmode (PrivMode_vt52, 1);
3677	break;	3680	break;
3678	case 3: /* 80/132 */	3681	case 3: /* 80/132 */
3679	if (priv_modes & PrivMode_132OK)	3682	if (priv_modes & PrivMode_132OK)
3680	{	3683	{
3681	scr_poweron ();	3684	scr_poweron ();
…		…
3699	if (state) /* orthogonal */	3702	if (state) /* orthogonal */
3700	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3703	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3701	break;	3704	break;
3702	#ifdef scrollBar_esc	3705	#ifdef scrollBar_esc
3703	case scrollBar_esc:	3706	case scrollBar_esc:
3704	if (scrollbar_mapping (state))	3707	if (scrollBar.map (state))
3705	{	3708	{
3706	resize_all_windows (0, 0, 0);	3709	resize_all_windows (0, 0, 0);
3707	scr_touch (true);	3710	scr_touch (true);
3708	}	3711	}
3709	break;	3712	break;

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC vs. Revision 1.424 by root, Tue Nov 4 23:46:22 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC vs.
Revision 1.424 by root, Tue Nov 4 23:46:22 2008 UTC