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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.413 by ayin, Sun Feb 17 12:11:56 2008 UTC vs.
Revision 1.423 by root, Tue Nov 4 22:44:09 2008 UTC

…		…
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
…		…
1127	{	1127	{
1128	// this should really be sched_yield(), but the linux guys thought	1128	// this should really be sched_yield(), but the linux guys thought
1129	// that giving a process calling sched_yield () less cpu time than	1129	// that giving a process calling sched_yield () less cpu time than
1130	// ones with high nice levels is a useful thing to do. It surely is is	1130	// ones with high nice levels is a useful thing to do. It surely is is
1131	// 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.
1132		1135
1133	struct timespec ts = { 0, 0 };	1136	struct timespec ts = { 0, 1000 };
1134	nanosleep (&ts, 0);	1137	nanosleep (&ts, 0);
1135		1138
1136	w.stop ();	1139	w.stop ();
1137	}	1140	}
1138		1141
…		…
1188	{	1191	{
1189	make_current ();	1192	make_current ();
1190		1193
1191	if (revents & ev::READ)	1194	if (revents & ev::READ)
1192	// loop, but don't allow a single term to monopolize us	1195	// loop, but don't allow a single term to monopolize us
1193	while (pty_fill ())	1196	for (int i = CBUFCNT; i-- && pty_fill (); )
1194	if (cmd_parse ())	1197	cmd_parse ();
1195	break;
1196		1198
1197	if (revents & ev::WRITE)	1199	if (revents & ev::WRITE)
1198	pty_write ();	1200	pty_write ();
1199		1201
1200	refresh_check ();	1202	refresh_check ();
…		…
1536	;	1538	;
1537		1539
1538	if (scrollBar.state && ev.xany.window == scrollBar.win)	1540	if (scrollBar.state && ev.xany.window == scrollBar.win)
1539	{	1541	{
1540	scrollBar.state = STATE_IDLE;	1542	scrollBar.state = STATE_IDLE;
1541	scrollbar_show (0);	1543	scrollBar.show (0);
1542	}	1544	}
1543	}	1545	}
1544	break;	1546	break;
1545		1547
1546	case MotionNotify:	1548	case MotionNotify:
…		…
1647	&ev.xbutton.x, &ev.xbutton.y,	1649	&ev.xbutton.x, &ev.xbutton.y,
1648	&unused_mask);	1650	&unused_mask);
1649	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1651	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650	scrollBar.size ());	1652	scrollBar.size ());
1651	want_refresh = 1;	1653	want_refresh = 1;
1652	scrollbar_show (1);	1654	scrollBar.show (1);
1653	}	1655	}
1654	break;	1656	break;
1655	}	1657	}
1656		1658
1657	#if defined(CURSOR_BLINK)	1659	#if defined(CURSOR_BLINK)
…		…
1683		1685
1684	refresh_check ();	1686	refresh_check ();
1685	}	1687	}
1686		1688
1687	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
1688	rxvt_term::focus_in ()	1704	rxvt_term::focus_in ()
1689	{	1705	{
1690	if (!focus)	1706	if (!focus)
1691	{	1707	{
1692	focus = 1;	1708	focus = 1;
1693	want_refresh = 1;	1709	want_refresh = 1;
1694
1695	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696		1710
1697	#if USE_XIM	1711	#if USE_XIM
1698	if (Input_Context != NULL)	1712	if (Input_Context != NULL)
1699	{	1713	{
1700	IMSetPosition ();	1714	IMSetPosition ();
…		…
1712	scr_recolour ();	1726	scr_recolour ();
1713	}	1727	}
1714	#endif	1728	#endif
1715	#if ENABLE_FRILLS	1729	#if ENABLE_FRILLS
1716	if (option (Opt_urgentOnBell))	1730	if (option (Opt_urgentOnBell))
1717	{	1731	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	1732	#endif
		1733
		1734	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725	}	1735	}
1726	}	1736	}
1727		1737
1728	void	1738	void
1729	rxvt_term::focus_out ()	1739	rxvt_term::focus_out ()
…		…
1731	if (focus)	1741	if (focus)
1732	{	1742	{
1733	focus = 0;	1743	focus = 0;
1734	want_refresh = 1;	1744	want_refresh = 1;
1735		1745
1736	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1746	#if ENABLE_FRILLS
1737		1747	if (option (Opt_urgentOnBell))
		1748	set_urgency (0);
		1749	#endif
1738	#if ENABLE_FRILLS \|\| ISO_14755	1750	#if ENABLE_FRILLS \|\| ISO_14755
1739	if (iso14755buf)	1751	if (iso14755buf)
1740	{	1752	{
1741	iso14755buf = 0;	1753	iso14755buf = 0;
1742	# if ISO_14755	1754	# if ISO_14755
…		…
1759	{	1771	{
1760	pix_colors = pix_colors_unfocused;	1772	pix_colors = pix_colors_unfocused;
1761	scr_recolour ();	1773	scr_recolour ();
1762	}	1774	}
1763	#endif	1775	#endif
		1776
		1777	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764	}	1778	}
1765	}	1779	}
1766		1780
1767	void	1781	void
1768	rxvt_term::update_fade_color (unsigned int idx)	1782	rxvt_term::update_fade_color (unsigned int idx)
…		…
2066	reportmode = !! (priv_modes & PrivMode_mouse_report);	2080	reportmode = !! (priv_modes & PrivMode_mouse_report);
2067		2081
2068	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2082	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2069	{	2083	{
2070	scrollBar.state = STATE_IDLE;	2084	scrollBar.state = STATE_IDLE;
2071	scrollbar_show (0);	2085	scrollBar.show (0);
2072	}	2086	}
2073		2087
2074	#ifdef SELECTION_SCROLLING	2088	#ifdef SELECTION_SCROLLING
2075	sel_scroll_ev.stop();	2089	sel_scroll_ev.stop();
2076	#endif	2090	#endif
…		…
2159	}	2173	}
2160	else	2174	else
2161	# endif	2175	# endif
2162	{	2176	{
2163	scr_page (v, i);	2177	scr_page (v, i);
2164	scrollbar_show (1);	2178	scrollBar.show (1);
2165	}	2179	}
2166	}	2180	}
2167	break;	2181	break;
2168	#endif	2182	#endif
2169	}	2183	}
2170	}	2184	}
2171	}	2185	}
2172		2186
2173	/}}} /	2187	/}}} /
2174		2188
2175	bool	2189	void
2176	rxvt_term::cmd_parse ()	2190	rxvt_term::cmd_parse ()
2177	{	2191	{
2178	bool flag = false;
2179	wchar_t ch = NOCHAR;	2192	wchar_t ch = NOCHAR;
2180	char *seq_begin; // remember start of esc-sequence here	2193	char *seq_begin; // remember start of esc-sequence here
2181		2194
2182	for (;;)	2195	for (;;)
2183	{	2196	{
2184	if (ch == NOCHAR)	2197	if (expect_false (ch == NOCHAR))
2185	{	2198	{
2186	seq_begin = cmdbuf_ptr;	2199	seq_begin = cmdbuf_ptr;
2187	ch = next_char ();	2200	ch = next_char ();
2188		2201
2189	if (ch == NOCHAR)	2202	if (ch == NOCHAR)
2190	break;	2203	break;
2191	}	2204	}
2192		2205
2193	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))
2194	{	2207	{
2195	if (!seen_input)	2208	if (expect_false (!seen_input))
2196	{	2209	{
2197	seen_input = 1;	2210	seen_input = 1;
2198	// many badly-written programs (e.g. jed) contain a race condition:	2211	// many badly-written programs (e.g. jed) contain a race condition:
2199	// they first read the screensize and then install a SIGWINCH handler.	2212	// they first read the screensize and then install a SIGWINCH handler.
2200	// some window managers resize the window early, and these programs	2213	// some window managers resize the window early, and these programs
…		…
2213	wchar_t *str = buf;	2226	wchar_t *str = buf;
2214	wchar_t *eol = str + min (ncol, UBUFSIZ);	2227	wchar_t *eol = str + min (ncol, UBUFSIZ);
2215		2228
2216	for (;;)	2229	for (;;)
2217	{	2230	{
2218	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)))
2219	break;	2232	break;
2220		2233
2221	*str++ = ch;	2234	*str++ = ch;
2222		2235
2223	if (ch == C0_LF \|\| str >= eol)	2236	if (expect_false (ch == C0_LF \|\| str >= eol))
2224	{	2237	{
2225	if (ch == C0_LF)	2238	if (ch == C0_LF)
2226	nlines++;	2239	nlines++;
2227		2240
2228	refresh_count++;	2241	refresh_count++;
…		…
2277	* 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.
2278	* if skipScroll is enabled.	2291	* if skipScroll is enabled.
2279	*/	2292	*/
2280	if (refreshnow)	2293	if (refreshnow)
2281	{	2294	{
2282	flag = true;
2283	scr_refresh ();	2295	scr_refresh ();
2284	want_refresh = 1;	2296	want_refresh = 1;
2285	}	2297	}
2286
2287	}	2298	}
2288	else	2299	else
2289	{	2300	{
2290	try	2301	try
2291	{	2302	{
…		…
2299	}	2310	}
2300		2311
2301	ch = NOCHAR;	2312	ch = NOCHAR;
2302	}	2313	}
2303	}	2314	}
2304
2305	return flag;
2306	}	2315	}
2307		2316
2308	// read the next character	2317	// read the next character
2309	wchar_t	2318	wchar_t
2310	rxvt_term::next_char () NOTHROW	2319	rxvt_term::next_char () NOTHROW
2311	{	2320	{
2312	while (cmdbuf_ptr < cmdbuf_endp)	2321	while (cmdbuf_ptr < cmdbuf_endp)
2313	{	2322	{
2314	// assume 7-bit to be ascii ALWAYS	2323	// assume 7-bit to be ascii ALWAYS
2315	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2324	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2316	return *cmdbuf_ptr++;	2325	return *cmdbuf_ptr++;
2317		2326
2318	wchar_t wc;	2327	wchar_t wc;
2319	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);
2320		2329
…		…
2324	cmdbuf_ptr = cmdbuf_endp;	2333	cmdbuf_ptr = cmdbuf_endp;
2325	break;	2334	break;
2326	}	2335	}
2327		2336
2328	if (len == (size_t)-1)	2337	if (len == (size_t)-1)
		2338	{
		2339	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	2340	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2341	}
2330		2342
2331	// assume wchar == unicode	2343	// assume wchar == unicode
2332	cmdbuf_ptr += len;	2344	cmdbuf_ptr += len;
2333	return wc & UNICODE_MASK;	2345	return wc & UNICODE_MASK;
2334	}	2346	}
…		…
2378	/----------------------------------------------------------------------/	2390	/----------------------------------------------------------------------/
2379	#ifdef PRINTPIPE	2391	#ifdef PRINTPIPE
2380	FILE *	2392	FILE *
2381	rxvt_term::popen_printer ()	2393	rxvt_term::popen_printer ()
2382	{	2394	{
2383	FILE *stream = popen (rs[Rs_print_pipe], "w");	2395	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384		2396
2385	if (stream == NULL)	2397	if (stream == NULL)
2386	rxvt_warn ("can't open printer pipe, not printing.\n");	2398	rxvt_warn ("can't open printer pipe, not printing.\n");
2387		2399
2388	return stream;	2400	return stream;
…		…
2399	* simulate attached vt100 printer	2411	* simulate attached vt100 printer
2400	*/	2412	*/
2401	void	2413	void
2402	rxvt_term::process_print_pipe ()	2414	rxvt_term::process_print_pipe ()
2403	{	2415	{
2404	int done;	2416	FILE *fd = popen_printer ();
2405	FILE *fd;
2406		2417
2407	if ((fd = popen_printer ()) == NULL)	2418	if (!fd)
2408	return;	2419	return;
2409		2420
2410	/*	2421	/*
2411	* 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
2412	* is received.	2423	* is received.
2413	*/	2424	*/
2414	for (done = 0; !done;)	2425	for (int done = 0; !done; )
2415	{	2426	{
2416	unsigned char buf[8];	2427	unsigned char buf[8];
2417	unicode_t ch;	2428	unicode_t ch;
2418	unsigned int i, len;	2429	unsigned int i, len;
2419		2430
…		…
2677	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2688	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678	case C1_SCI: /* ESC Z */	2689	case C1_SCI: /* ESC Z */
2679	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2690	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680	break; /* steal obsolete ESC [ c */	2691	break; /* steal obsolete ESC [ c */
2681		2692
2682	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2693	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683	case C1_CSI: /* ESC [ */	2694	case C1_CSI: /* ESC [ */
2684	process_csi_seq ();	2695	process_csi_seq ();
2685	break;	2696	break;
2686		2697
2687	/* 8.3.90: OPERATING SYSTEM COMMAND */	2698	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688	case C1_OSC: /* ESC ] */	2699	case C1_OSC: /* ESC ] */
2689	process_osc_seq ();	2700	process_osc_seq ();
2690	break;	2701	break;
2691		2702
2692	/* 8.3.106: RESET TO INITIAL STATE */	2703	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693	case 'c':	2704	case 'c':
2694	mbstate.reset ();	2705	mbstate.reset ();
2695	scr_poweron ();	2706	scr_poweron ();
2696	scrollbar_show (1);	2707	scrollBar.show (1);
2697	break;	2708	break;
2698		2709
2699	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2710	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700	case 'n':	2711	case 'n':
2701	scr_charset_choose (2);	2712	scr_charset_choose (2);
…		…
2752		2763
2753	nargs = 0;	2764	nargs = 0;
2754		2765
2755	priv = 0;	2766	priv = 0;
2756	ch = cmd_getc ();	2767	ch = cmd_getc ();
2757	if (ch >= '<' && ch <= '?')	2768	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2758	{	2769	{
2759	/* '<' '=' '>' '?' */	2770	/* '<' '=' '>' '?' '!' */
2760	priv = ch;	2771	priv = ch;
2761	ch = cmd_getc ();	2772	ch = cmd_getc ();
2762	}	2773	}
2763		2774
2764	/* read any numerical arguments */	2775	/* read any numerical arguments */
…		…
2818		2829
2819	case '?':	2830	case '?':
2820	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2831	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2821	process_terminal_mode (ch, priv, nargs, arg);	2832	process_terminal_mode (ch, priv, nargs, arg);
2822	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, 7, 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);
2823	}	2846	}
		2847	break;
		2848	}
		2849
2824	return;	2850	return;
2825	}	2851	}
2826		2852
2827	switch (ch)	2853	switch (ch)
2828	{	2854	{
…		…
3507	break;	3533	break;
3508	#endif	3534	#endif
3509		3535
3510	#if ENABLE_PERL	3536	#if ENABLE_PERL
3511	case URxvt_perl:	3537	case URxvt_perl:
3512	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));
3513	; // no responses yet
3514	break;	3539	break;
3515	#endif	3540	#endif
3516	}	3541	}
3517	}	3542	}
3518	/----------------------------------------------------------------------/	3543	/----------------------------------------------------------------------/
…		…
3677	if (state) /* orthogonal */	3702	if (state) /* orthogonal */
3678	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3703	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3679	break;	3704	break;
3680	#ifdef scrollBar_esc	3705	#ifdef scrollBar_esc
3681	case scrollBar_esc:	3706	case scrollBar_esc:
3682	if (scrollbar_mapping (state))	3707	if (scrollBar.map (state))
3683	{	3708	{
3684	resize_all_windows (0, 0, 0);	3709	resize_all_windows (0, 0, 0);
3685	scr_touch (true);	3710	scr_touch (true);
3686	}	3711	}
3687	break;	3712	break;

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.413 by ayin, Sun Feb 17 12:11:56 2008 UTC vs. Revision 1.423 by root, Tue Nov 4 22:44:09 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.413 by ayin, Sun Feb 17 12:11:56 2008 UTC vs.
Revision 1.423 by root, Tue Nov 4 22:44:09 2008 UTC