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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.415 by root, Sat Apr 26 03:37:18 2008 UTC vs.
Revision 1.454 by sf-exg, Sat Aug 21 16:07:15 2010 UTC

…		…
162		162
163	void	163	void
164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165	{	165	{
166	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
167	rxvt_font f = (fs)[fs->find_font (ch)];
168	wchar_t chr, alloc, ch2, *fname;	167	wchar_t chr, alloc, ch2, **fname;
169	int len;	168	int len;
170
171	fname = rxvt_utf8towcs (f->name);
172		169
173	# if ENABLE_COMBINING	170	# if ENABLE_COMBINING
174	if (IS_COMPOSE (ch))	171	if (IS_COMPOSE (ch))
175	{	172	{
176	len = rxvt_composite.expand (ch, 0);	173	len = rxvt_composite.expand (ch, 0);
…		…
197	r & RS_Blink ? " blink" : "",	194	r & RS_Blink ? " blink" : "",
198	r & RS_RVid ? " rvid" : "",	195	r & RS_RVid ? " rvid" : "",
199	r & RS_Uline ? " uline" : "",	196	r & RS_Uline ? " uline" : "",
200	r & RS_Careful ? " careful" : "");	197	r & RS_Careful ? " careful" : "");
201		198
		199	int width = 0;
		200	fname = rxvt_temp_buf<wchar_t *> (len);
		201	for (int i = 0; i < len; i++)
		202	{
		203	rxvt_font f = (fs)[fs->find_font_idx (chr[i])];
		204	fname[i] = rxvt_utf8towcs (f->name);
202	int width = wcswidth (fname, wcslen (fname));	205	max_it (width, wcswidth (fname[i], wcslen (fname[i])));
		206	}
203		207
204	max_it (width, 8+5); // for char + hex	208	max_it (width, 8+5); // for char + hex
205	max_it (width, strlen (attr));	209	max_it (width, strlen (attr));
206		210
207	if (y >= 0)	211	if (y >= 0)
208	{	212	{
209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210	x = 0;	214	x = 0;
211	}	215	}
212		216
213	scr_overlay_new (x, y, width, len + 2);	217	scr_overlay_new (x, y, width, len * 2 + 1);
214		218
215	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216		220
217	for (int y = 0; y < len; y++)	221	for (int y = 0; y < len; y++)
218	{	222	{
…		…
237	// char buf[4+4+3+1];	241	// char buf[4+4+3+1];
238	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);	242	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
239	// scr_overlay_set (0, 0, buf);	243	// scr_overlay_set (0, 0, buf);
240	// }	244	// }
241	scr_overlay_set (0, len , attr);	245	scr_overlay_set (0, len , attr);
		246	for (int i = 0; i < len; i++)
		247	{
242	scr_overlay_set (0, len + 1, fname);	248	scr_overlay_set (0, len + 1 + i, fname[i]);
243
244	free (fname);	249	free (fname[i]);
		250	}
245		251
246	# if ENABLE_COMBINING	252	# if ENABLE_COMBINING
247	if (alloc)	253	if (alloc)
248	delete [] alloc;	254	delete [] alloc;
249	# endif	255	# endif
…		…
282	}	288	}
283		289
284	static int	290	static int
285	hex_keyval (XKeyEvent &ev)	291	hex_keyval (XKeyEvent &ev)
286	{	292	{
287	// check wether this event corresponds to a hex digit	293	// check whether this event corresponds to a hex digit
288	// if the modifiers had not been pressed.	294	// if the modifiers had not been pressed.
289	for (int index = 0; index < 8; index++)	295	for (int index = 0; index < 8; index++)
290	{	296	{
291	KeySym k = XLookupKeysym (&ev, index);	297	KeySym k = XLookupKeysym (&ev, index);
292		298
…		…
416	*/	422	*/
417	shft = ev.state & ShiftMask;	423	shft = ev.state & ShiftMask;
418	ctrl = ev.state & ControlMask;	424	ctrl = ev.state & ControlMask;
419	meta = ev.state & ModMetaMask;	425	meta = ev.state & ModMetaMask;
420		426
421	if (numlock_state \|\| (ev.state & ModNumLockMask))
422	{
423	numlock_state = (ev.state & ModNumLockMask);
424	set_privmode (PrivMode_aplKP, !numlock_state);
425	}
426
427	kbuf[0] = 0;	427	kbuf[0] = 0;
428		428
429	#ifdef USE_XIM	429	#ifdef USE_XIM
430	if (Input_Context)	430	if (Input_Context)
431	{	431	{
…		…
505	#ifdef PAGING_CONTEXT_LINES	505	#ifdef PAGING_CONTEXT_LINES
506	lnsppg = nrow - PAGING_CONTEXT_LINES;	506	lnsppg = nrow - PAGING_CONTEXT_LINES;
507	#else	507	#else
508	lnsppg = nrow * 4 / 5;	508	lnsppg = nrow * 4 / 5;
509	#endif	509	#endif
		510	max_it (lnsppg, 1);
		511
510	if (keysym == XK_Prior)	512	if (keysym == XK_Prior)
511	{	513	{
512	scr_page (UP, lnsppg);	514	scr_page (UP, lnsppg);
513	return;	515	return;
514	}	516	}
…		…
579	}	581	}
580	}	582	}
581		583
582	#if ENABLE_FRILLS \|\| ISO_14755	584	#if ENABLE_FRILLS \|\| ISO_14755
583	// ISO 14755 support	585	// ISO 14755 support
584	if (shft && ctrl)	586	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))
585	{	587	{
586	int hv;	588	int hv;
587		589
588	if (iso14755buf & ISO_14755_51	590	if (iso14755buf & ISO_14755_51
589	&& (keysym == XK_space \|\| keysym == XK_KP_Space	591	&& (keysym == XK_space \|\| keysym == XK_KP_Space
…		…
619	scr_overlay_off ();	621	scr_overlay_off ();
620	# endif	622	# endif
621	iso14755buf = 0;	623	iso14755buf = 0;
622	}	624	}
623	}	625	}
		626	else if (option (Opt_iso14755) &&
624	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))	627	((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))
625	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))	628	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R))))
626	if (!(iso14755buf & ISO_14755_STARTED))	629	if (!(iso14755buf & ISO_14755_STARTED))
627	{	630	{
628	iso14755buf \|= ISO_14755_STARTED;	631	iso14755buf \|= ISO_14755_STARTED;
629	# if ISO_14755	632	# if ISO_14755
630	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	633	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
…		…
644	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	647	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645	{	648	{
646	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	649	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647	unsigned int newlen = 1;	650	unsigned int newlen = 1;
648		651
		652	if (ev.state & ModNumLockMask)
		653	kp = false;
		654
649	switch (translate_keypad (keysym, kp))	655	keysym = translate_keypad (keysym, kp);
		656
		657	switch (keysym)
650	{	658	{
651	#ifndef NO_BACKSPACE_KEY	659	#ifndef NO_BACKSPACE_KEY
652	case XK_BackSpace:	660	case XK_BackSpace:
653	if (priv_modes & PrivMode_HaveBackSpace)	661	if (priv_modes & PrivMode_HaveBackSpace)
654	{	662	{
…		…
763		771
764	default:	772	default:
765	{	773	{
766	int param = map_function_key (keysym);	774	int param = map_function_key (keysym);
767	if (param > 0)	775	if (param > 0)
		776	{
768	sprintf (kbuf,"\033[%d~", param);	777	int n = sprintf (kbuf,"\033[%d~", param);
		778	/*
		779	* pass Shift/Control indicators for function keys ending with `~'
		780	*
		781	* eg,
		782	* Prior = "ESC[5~"
		783	* Shift+Prior = "ESC[5$"
		784	* Ctrl+Prior = "ESC[5^"
		785	* Ctrl+Shift+Prior = "ESC[5@"
		786	*/
		787	kbuf[n-1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
		788	}
769	else	789	else
770	newlen = 0;	790	newlen = 0;
771	}	791	}
772	break;	792	break;
773	}	793	}
…		…
824	view_start = 0;	844	view_start = 0;
825	want_refresh = 1;	845	want_refresh = 1;
826	}	846	}
827		847
828	/*	848	/*
829	* these modifications only affect the static keybuffer
830	* pass Shift/Control indicators for function keys ending with `~'
831	*
832	* eg,
833	* Prior = "ESC[5~"
834	* Shift+Prior = "ESC[5$"
835	* Ctrl+Prior = "ESC[5^"
836	* Ctrl+Shift+Prior = "ESC[5@"
837	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).	849	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
838	*/	850	*/
839	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
840	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
841		851
842	/* escape prefix */	852	/* escape prefix */
843	if (meta	853	if (meta
844	#ifdef META8_OPTION	854	#ifdef META8_OPTION
845	&& meta_char == C0_ESC	855	&& meta_char == C0_ESC
…		…
1024	}	1034	}
1025		1035
1026	display->flush ();	1036	display->flush ();
1027	}	1037	}
1028		1038
1029	/* checks wether a refresh is requested and starts the refresh timer */	1039	/* checks whether a refresh is requested and starts the refresh timer */
1030	void	1040	void
1031	rxvt_term::refresh_check ()	1041	rxvt_term::refresh_check ()
1032	{	1042	{
1033	if (want_refresh && !flush_ev.is_active ())	1043	if (want_refresh && !flush_ev.is_active ())
1034	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally	1044	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
…		…
1127	{	1137	{
1128	// this should really be sched_yield(), but the linux guys thought	1138	// this should really be sched_yield(), but the linux guys thought
1129	// that giving a process calling sched_yield () less cpu time than	1139	// 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	1140	// ones with high nice levels is a useful thing to do. It surely is is
1131	// allowed by the sus... as is returning ENOSYS.	1141	// allowed by the sus... as is returning ENOSYS.
		1142	// since the linux guys additionally thought that breaking the only
		1143	// known workaround against their unusable sched_yield hack is cool,
		1144	// we just nanosleep a bit and hope for the best.
1132		1145
1133	struct timespec ts = { 0, 0 };	1146	struct timespec ts = { 0, 1000 };
1134	nanosleep (&ts, 0);	1147	nanosleep (&ts, 0);
1135		1148
1136	w.stop ();	1149	w.stop ();
1137	}	1150	}
1138		1151
…		…
1188	{	1201	{
1189	make_current ();	1202	make_current ();
1190		1203
1191	if (revents & ev::READ)	1204	if (revents & ev::READ)
1192	// loop, but don't allow a single term to monopolize us	1205	// loop, but don't allow a single term to monopolize us
1193	while (pty_fill ())	1206	for (int i = CBUFCNT; i-- && pty_fill (); )
1194	if (cmd_parse ())	1207	cmd_parse ();
1195	break;
1196		1208
1197	if (revents & ev::WRITE)	1209	if (revents & ev::WRITE)
1198	pty_write ();	1210	pty_write ();
1199		1211
1200	refresh_check ();	1212	refresh_check ();
…		…
1459	selection_property (ev.xproperty.window, ev.xproperty.atom);	1471	selection_property (ev.xproperty.window, ev.xproperty.atom);
1460		1472
1461	break;	1473	break;
1462		1474
1463	case SelectionClear:	1475	case SelectionClear:
1464	selection_clear ();	1476	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465	break;	1477	break;
1466		1478
1467	case SelectionNotify:	1479	case SelectionNotify:
1468	if (selection_wait == Sel_normal)	1480	if (selection_wait == Sel_normal)
1469	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1481	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
…		…
1473	selection_send (ev.xselectionrequest);	1485	selection_send (ev.xselectionrequest);
1474	break;	1486	break;
1475		1487
1476	case MapNotify:	1488	case MapNotify:
1477	#ifdef HAVE_BG_PIXMAP	1489	#ifdef HAVE_BG_PIXMAP
1478	/* This is needed spcifically to fix the case of no window manager or a	1490	/* This is needed specifically to fix the case of no window manager or a
1479	* non-reparenting window manager. In those cases we never get first	1491	* non-reparenting window manager. In those cases we never get first
1480	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1492	* ConfigureNotify. Also that speeds startup under normal WM, by taking
1481	* care of multiplicity of ConfigureNotify events arriwing while WM does	1493	* care of multiplicity of ConfigureNotify events arriving while WM does
1482	* reparenting.	1494	* reparenting.
1483	* We should not render background immidiately, as there could be several	1495	* We should not render background immediately, as there could be several
1484	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1496	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485	* by scheduling background redraw as soon as we can, but giving a short	1497	* by scheduling background redraw as soon as we can, but giving a short
1486	* bit of time for ConfigureNotifies to arrive.	1498	* bit of time for ConfigureNotifies to arrive.
1487	* We should render background PRIOR to drawing any text, but AFTER all	1499	* We should render background PRIOR to drawing any text, but AFTER all
1488	* of ConfigureNotifys for the best results.	1500	* of ConfigureNotifys for the best results.
…		…
1682	#endif	1694	#endif
1683		1695
1684	refresh_check ();	1696	refresh_check ();
1685	}	1697	}
1686		1698
		1699	#if ENABLE_FRILLS
		1700	void
		1701	rxvt_term::set_urgency (bool enable)
		1702	{
		1703	if (enable == urgency_hint)
		1704	return;
		1705
		1706	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1707	{
		1708	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
		1709	XSetWMHints (dpy, parent[0], h);
		1710	urgency_hint = enable;
		1711	}
		1712	}
		1713	#endif
		1714
1687	void	1715	void
1688	rxvt_term::focus_in ()	1716	rxvt_term::focus_in ()
1689	{	1717	{
1690	if (!focus)	1718	if (!focus)
1691	{	1719	{
1692	focus = 1;	1720	focus = 1;
1693	want_refresh = 1;	1721	want_refresh = 1;
1694
1695	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696		1722
1697	#if USE_XIM	1723	#if USE_XIM
1698	if (Input_Context != NULL)	1724	if (Input_Context != NULL)
1699	{	1725	{
1700	IMSetPosition ();	1726	IMSetPosition ();
…		…
1712	scr_recolour ();	1738	scr_recolour ();
1713	}	1739	}
1714	#endif	1740	#endif
1715	#if ENABLE_FRILLS	1741	#if ENABLE_FRILLS
1716	if (option (Opt_urgentOnBell))	1742	if (option (Opt_urgentOnBell))
1717	{	1743	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	1744	#endif
		1745
		1746	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725	}	1747	}
1726	}	1748	}
1727		1749
1728	void	1750	void
1729	rxvt_term::focus_out ()	1751	rxvt_term::focus_out ()
…		…
1731	if (focus)	1753	if (focus)
1732	{	1754	{
1733	focus = 0;	1755	focus = 0;
1734	want_refresh = 1;	1756	want_refresh = 1;
1735		1757
1736	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1758	#if ENABLE_FRILLS
1737		1759	if (option (Opt_urgentOnBell))
		1760	set_urgency (0);
		1761	#endif
1738	#if ENABLE_FRILLS \|\| ISO_14755	1762	#if ENABLE_FRILLS \|\| ISO_14755
1739	if (iso14755buf)	1763	if (iso14755buf)
1740	{	1764	{
1741	iso14755buf = 0;	1765	iso14755buf = 0;
1742	# if ISO_14755	1766	# if ISO_14755
…		…
1759	{	1783	{
1760	pix_colors = pix_colors_unfocused;	1784	pix_colors = pix_colors_unfocused;
1761	scr_recolour ();	1785	scr_recolour ();
1762	}	1786	}
1763	#endif	1787	#endif
		1788
		1789	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764	}	1790	}
1765	}	1791	}
1766		1792
1767	void	1793	void
1768	rxvt_term::update_fade_color (unsigned int idx)	1794	rxvt_term::update_fade_color (unsigned int idx)
…		…
1845	/* save the xbutton state (for ButtonRelease) */	1871	/* save the xbutton state (for ButtonRelease) */
1846	MEvent.state = ev.state;	1872	MEvent.state = ev.state;
1847	#ifdef MOUSE_REPORT_DOUBLECLICK	1873	#ifdef MOUSE_REPORT_DOUBLECLICK
1848	if (ev.button == MEvent.button && clickintime)	1874	if (ev.button == MEvent.button && clickintime)
1849	{	1875	{
1850	/* same button, within alloted time */	1876	/* same button, within allowed time */
1851	MEvent.clicks++;	1877	MEvent.clicks++;
1852		1878
1853	if (MEvent.clicks > 1)	1879	if (MEvent.clicks > 1)
1854	{	1880	{
1855	/* only report double clicks */	1881	/* only report double clicks */
…		…
2126	selection_make (ev.time);	2152	selection_make (ev.time);
2127	break;	2153	break;
2128		2154
2129	case Button2:	2155	case Button2:
2130	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2156	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2157	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132	break;	2158	break;
2133		2159
2134	#ifdef MOUSE_WHEEL	2160	#ifdef MOUSE_WHEEL
2135	case Button4:	2161	case Button4:
2136	case Button5:	2162	case Button5:
…		…
2170	}	2196	}
2171	}	2197	}
2172		2198
2173	/}}} /	2199	/}}} /
2174		2200
2175	bool	2201	void
2176	rxvt_term::cmd_parse ()	2202	rxvt_term::cmd_parse ()
2177	{	2203	{
2178	bool flag = false;
2179	wchar_t ch = NOCHAR;	2204	wchar_t ch = NOCHAR;
2180	char *seq_begin; // remember start of esc-sequence here	2205	char *seq_begin; // remember start of esc-sequence here
2181		2206
2182	for (;;)	2207	for (;;)
2183	{	2208	{
2184	if (ch == NOCHAR)	2209	if (expect_false (ch == NOCHAR))
2185	{	2210	{
2186	seq_begin = cmdbuf_ptr;	2211	seq_begin = cmdbuf_ptr;
2187	ch = next_char ();	2212	ch = next_char ();
2188		2213
2189	if (ch == NOCHAR)	2214	if (ch == NOCHAR)
2190	break;	2215	break;
2191	}	2216	}
2192		2217
2193	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2218	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2194	{	2219	{
2195	if (!seen_input)	2220	if (expect_false (!seen_input))
2196	{	2221	{
2197	seen_input = 1;	2222	seen_input = 1;
2198	// many badly-written programs (e.g. jed) contain a race condition:	2223	// many badly-written programs (e.g. jed) contain a race condition:
2199	// they first read the screensize and then install a SIGWINCH handler.	2224	// they first read the screensize and then install a SIGWINCH handler.
2200	// some window managers resize the window early, and these programs	2225	// some window managers resize the window early, and these programs
…		…
2213	wchar_t *str = buf;	2238	wchar_t *str = buf;
2214	wchar_t *eol = str + min (ncol, UBUFSIZ);	2239	wchar_t *eol = str + min (ncol, UBUFSIZ);
2215		2240
2216	for (;;)	2241	for (;;)
2217	{	2242	{
2218	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2243	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219	break;	2244	break;
2220		2245
2221	*str++ = ch;	2246	*str++ = ch;
2222		2247
2223	if (ch == C0_LF \|\| str >= eol)	2248	if (expect_false (ch == C0_LF \|\| str >= eol))
2224	{	2249	{
2225	if (ch == C0_LF)	2250	if (ch == C0_LF)
2226	nlines++;	2251	nlines++;
2227		2252
2228	refresh_count++;	2253	refresh_count++;
…		…
2277	* What the heck we'll cheat and only refresh less than every page-full.	2302	* What the heck we'll cheat and only refresh less than every page-full.
2278	* if skipScroll is enabled.	2303	* if skipScroll is enabled.
2279	*/	2304	*/
2280	if (refreshnow)	2305	if (refreshnow)
2281	{	2306	{
2282	flag = true;
2283	scr_refresh ();	2307	scr_refresh ();
2284	want_refresh = 1;	2308	want_refresh = 1;
2285	}	2309	}
2286
2287	}	2310	}
2288	else	2311	else
2289	{	2312	{
2290	try	2313	try
2291	{	2314	{
…		…
2299	}	2322	}
2300		2323
2301	ch = NOCHAR;	2324	ch = NOCHAR;
2302	}	2325	}
2303	}	2326	}
2304
2305	return flag;
2306	}	2327	}
2307		2328
2308	// read the next character	2329	// read the next character
2309	wchar_t	2330	wchar_t
2310	rxvt_term::next_char () NOTHROW	2331	rxvt_term::next_char () NOTHROW
2311	{	2332	{
2312	while (cmdbuf_ptr < cmdbuf_endp)	2333	while (cmdbuf_ptr < cmdbuf_endp)
2313	{	2334	{
2314	// assume 7-bit to be ascii ALWAYS	2335	// assume 7-bit to be ascii ALWAYS
2315	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2336	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2316	return *cmdbuf_ptr++;	2337	return *cmdbuf_ptr++;
2317		2338
2318	wchar_t wc;	2339	wchar_t wc;
2319	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2340	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320		2341
…		…
2325	break;	2346	break;
2326	}	2347	}
2327		2348
2328	if (len == (size_t)-1)	2349	if (len == (size_t)-1)
2329	{	2350	{
2330	mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state	2351	mbstate.reset (); // reset now undefined conversion state
2331	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2352	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332	}	2353	}
2333		2354
2334	// assume wchar == unicode	2355	// assume wchar == unicode
2335	cmdbuf_ptr += len;	2356	cmdbuf_ptr += len;
…		…
2381	/----------------------------------------------------------------------/	2402	/----------------------------------------------------------------------/
2382	#ifdef PRINTPIPE	2403	#ifdef PRINTPIPE
2383	FILE *	2404	FILE *
2384	rxvt_term::popen_printer ()	2405	rxvt_term::popen_printer ()
2385	{	2406	{
2386	FILE *stream = popen (rs[Rs_print_pipe], "w");	2407	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2387		2408
2388	if (stream == NULL)	2409	if (stream == NULL)
2389	rxvt_warn ("can't open printer pipe, not printing.\n");	2410	rxvt_warn ("can't open printer pipe, not printing.\n");
2390		2411
2391	return stream;	2412	return stream;
…		…
2402	* simulate attached vt100 printer	2423	* simulate attached vt100 printer
2403	*/	2424	*/
2404	void	2425	void
2405	rxvt_term::process_print_pipe ()	2426	rxvt_term::process_print_pipe ()
2406	{	2427	{
2407	int done;	2428	FILE *fd = popen_printer ();
2408	FILE *fd;
2409		2429
2410	if ((fd = popen_printer ()) == NULL)	2430	if (!fd)
2411	return;	2431	return;
2412		2432
2413	/*	2433	/*
2414	* Send all input to the printer until either ESC[4i or ESC[?4i	2434	* Send all input to the printer until either ESC[4i or ESC[?4i
2415	* is received.	2435	* is received.
2416	*/	2436	*/
2417	for (done = 0; !done;)	2437	for (int done = 0; !done; )
2418	{	2438	{
2419	unsigned char buf[8];	2439	unsigned char buf[8];
2420	unicode_t ch;	2440	unicode_t ch;
2421	unsigned int i, len;	2441	unsigned int i, len;
2422		2442
…		…
2680	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2700	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2681	case C1_SCI: /* ESC Z */	2701	case C1_SCI: /* ESC Z */
2682	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2702	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2683	break; /* steal obsolete ESC [ c */	2703	break; /* steal obsolete ESC [ c */
2684		2704
2685	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2705	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2686	case C1_CSI: /* ESC [ */	2706	case C1_CSI: /* ESC [ */
2687	process_csi_seq ();	2707	process_csi_seq ();
2688	break;	2708	break;
2689		2709
2690	/* 8.3.90: OPERATING SYSTEM COMMAND */	2710	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2691	case C1_OSC: /* ESC ] */	2711	case C1_OSC: /* ESC ] */
2692	process_osc_seq ();	2712	process_osc_seq ();
2693	break;	2713	break;
2694		2714
2695	/* 8.3.106: RESET TO INITIAL STATE */	2715	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2696	case 'c':	2716	case 'c':
2697	mbstate.reset ();	2717	mbstate.reset ();
2698	scr_poweron ();	2718	scr_poweron ();
2699	scrollBar.show (1);	2719	scrollBar.show (1);
2700	break;	2720	break;
…		…
2755		2775
2756	nargs = 0;	2776	nargs = 0;
2757		2777
2758	priv = 0;	2778	priv = 0;
2759	ch = cmd_getc ();	2779	ch = cmd_getc ();
2760	if (ch >= '<' && ch <= '?')	2780	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2761	{	2781	{
2762	/* '<' '=' '>' '?' */	2782	/* '<' '=' '>' '?' '!' */
2763	priv = ch;	2783	priv = ch;
2764	ch = cmd_getc ();	2784	ch = cmd_getc ();
2765	}	2785	}
2766		2786
2767	/* read any numerical arguments */	2787	/* read any numerical arguments */
…		…
2821		2841
2822	case '?':	2842	case '?':
2823	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2843	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2824	process_terminal_mode (ch, priv, nargs, arg);	2844	process_terminal_mode (ch, priv, nargs, arg);
2825	break;	2845	break;
		2846
		2847	case '!':
		2848	if (ch == CSI_70)
		2849	{
		2850	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2851	scr_soft_reset ();
		2852
		2853	static const int pm_h[] = { 7, 25 };
		2854	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
		2855
		2856	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2857	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2826	}	2858	}
		2859	break;
		2860	}
		2861
2827	return;	2862	return;
2828	}	2863	}
2829		2864
2830	switch (ch)	2865	switch (ch)
2831	{	2866	{
…		…
3198	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3233	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
3199	*/	3234	*/
3200	void	3235	void
3201	rxvt_term::process_dcs_seq ()	3236	rxvt_term::process_dcs_seq ()
3202	{	3237	{
3203	char *s;
3204	unicode_t eh;
3205
3206	/*	3238	/*
3207	* Not handled yet	3239	* Not handled yet
3208	*/	3240	*/
		3241
		3242	unicode_t eh;
3209	s = get_to_st (eh);	3243	char *s = get_to_st (eh);
3210	if (s)	3244	if (s)
3211	free (s);	3245	free (s);
3212		3246
3213	return;	3247	return;
3214	}	3248	}
…		…
3218	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'	3252	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'
3219	*/	3253	*/
3220	void	3254	void
3221	rxvt_term::process_osc_seq ()	3255	rxvt_term::process_osc_seq ()
3222	{	3256	{
3223	unicode_t ch, eh;
3224	int arg;	3257	int arg;
3225		3258
3226	ch = cmd_getc ();	3259	unicode_t ch = cmd_getc ();
3227	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3260	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3228	arg = arg * 10 + (ch - '0');	3261	arg = arg * 10 + (ch - '0');
3229		3262
3230	if (ch == ';')	3263	if (ch == ';')
3231	{	3264	{
		3265	unicode_t eh;
3232	char *s = get_to_st (eh);	3266	char *s = get_to_st (eh);
3233		3267
3234	if (s)	3268	if (s)
3235	{	3269	{
3236	process_xterm_seq (arg, s, eh);	3270	process_xterm_seq (arg, s, eh);
…		…
3260		3294
3261	/*	3295	/*
3262	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3296	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3263	*/	3297	*/
3264	void	3298	void
3265	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3299	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3266	{	3300	{
3267	int color;	3301	int color;
3268	char buf, name;	3302	char buf, name;
3269	bool query = str[0] == '?' && !str[1];	3303	bool query = str[0] == '?' && !str[1];
3270	int saveop = op;	3304	int saveop = op;
…		…
3311		3345
3312	XFree (value);	3346	XFree (value);
3313	}	3347	}
3314	else	3348	else
3315	{	3349	{
3316	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3350	char *eq = strchr (str, '=');
3317		3351
3318	if (eq)	3352	if (eq)
3319	{	3353	{
3320	*eq = 0;	3354	*eq = 0;
3321	set_utf8_property (display->atom (str), eq + 1);	3355	set_utf8_property (display->atom (str), eq + 1);
…		…
3361	process_color_seq (op, Color_pointer_fg, str, resp);	3395	process_color_seq (op, Color_pointer_fg, str, resp);
3362	break;	3396	break;
3363	case XTerm_Color_pointer_bg:	3397	case XTerm_Color_pointer_bg:
3364	process_color_seq (op, Color_pointer_bg, str, resp);	3398	process_color_seq (op, Color_pointer_bg, str, resp);
3365	break;	3399	break;
		3400	#ifdef OPTION_HC
		3401	case XTerm_Color_HC:
		3402	process_color_seq (op, Color_HC, str, resp);
		3403	break;
		3404	case XTerm_Color_HTC:
		3405	process_color_seq (op, Color_HTC, str, resp);
		3406	break;
		3407	#endif
3366	#ifndef NO_BOLD_UNDERLINE_REVERSE	3408	#ifndef NO_BOLD_UNDERLINE_REVERSE
3367	case XTerm_Color_RV:
3368	process_color_seq (op, Color_RV, str, resp);
3369	break;
3370	case Rxvt_Color_BD:
3371	case URxvt_Color_BD:	3409	case URxvt_Color_BD:
3372	process_color_seq (op, Color_BD, str, resp);	3410	process_color_seq (op, Color_BD, str, resp);
3373	break;	3411	break;
3374	case Rxvt_Color_UL:
3375	case URxvt_Color_UL:	3412	case URxvt_Color_UL:
3376	process_color_seq (op, Color_UL, str, resp);	3413	process_color_seq (op, Color_UL, str, resp);
3377	break;	3414	break;
3378	case URxvt_Color_IT:	3415	case URxvt_Color_IT:
3379	process_color_seq (op, Color_IT, str, resp);	3416	process_color_seq (op, Color_IT, str, resp);
3380	break;	3417	break;
3381	#endif	3418	#endif
		3419	case URxvt_Color_border:
		3420	process_color_seq (op, Color_border, str, resp);
		3421	break;
3382	#if ENABLE_TRANSPARENCY	3422	#if ENABLE_TRANSPARENCY
3383	case URxvt_Color_tint:	3423	case URxvt_Color_tint:
3384	process_color_seq (op, Color_tint, str, resp);	3424	process_color_seq (op, Color_tint, str, resp);
3385	{	3425	{
3386	bool changed = false;	3426	bool changed = false;
…		…
3401	case Rxvt_Pixmap:	3441	case Rxvt_Pixmap:
3402	if (!strcmp (str, "?"))	3442	if (!strcmp (str, "?"))
3403	{	3443	{
3404	char str[256];	3444	char str[256];
3405		3445
3406	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3446	sprintf (str, "[%dx%d+%d+%d]",
3407	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3447	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3408	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3448	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3409	process_xterm_seq (XTerm_title, str, CHAR_ST);	3449	process_xterm_seq (XTerm_title, str, CHAR_ST);
3410	}	3450	}
3411	else	3451	else
…		…
3510	break;	3550	break;
3511	#endif	3551	#endif
3512		3552
3513	#if ENABLE_PERL	3553	#if ENABLE_PERL
3514	case URxvt_perl:	3554	case URxvt_perl:
3515	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3555	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3516	; // no responses yet
3517	break;	3556	break;
3518	#endif	3557	#endif
3519	}	3558	}
3520	}	3559	}
3521	/----------------------------------------------------------------------/	3560	/----------------------------------------------------------------------/
…		…
3544	{	3583	{
3545	if (mode == 'r')	3584	if (mode == 'r')
3546	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3585	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3547	else	3586	else
3548	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3587	state = (mode == 't') ? ! (priv_modes & bit) : mode;
		3588
3549	set_privmode (bit, state);	3589	set_privmode (bit, state);
3550	}	3590	}
3551		3591
3552	return state;	3592	return state;
3553	}	3593	}
…		…
3562	static const struct	3602	static const struct
3563	{	3603	{
3564	const int argval;	3604	const int argval;
3565	const unsigned long bit;	3605	const unsigned long bit;
3566	} argtopriv[] = {	3606	} argtopriv[] = {
3567	{ 1, PrivMode_aplCUR },	3607	{ 1, PrivMode_aplCUR }, // DECCKM
3568	{ 2, PrivMode_vt52 },	3608	{ 2, PrivMode_vt52 },
3569	{ 3, PrivMode_132 },	3609	{ 3, PrivMode_132 }, // DECCOLM
3570	{ 4, PrivMode_smoothScroll },	3610	{ 4, PrivMode_smoothScroll }, // DECSCLM
3571	{ 5, PrivMode_rVideo },	3611	{ 5, PrivMode_rVideo }, // DECSCNM
3572	{ 6, PrivMode_relOrigin },	3612	{ 6, PrivMode_relOrigin }, // DECOM
3573	{ 7, PrivMode_Autowrap },	3613	{ 7, PrivMode_Autowrap }, // DECAWM
3574	// 8, bi-directional support mode	3614	// 8, auto-repeat keys // DECARM
3575	{ 9, PrivMode_MouseX10 },	3615	{ 9, PrivMode_MouseX10 },
3576	// 18, 19 printing-related	3616	// 18 end FF to printer after print screen
		3617	// 19 Print screen prints full screen/scroll region
3577	{ 25, PrivMode_VisibleCursor },	3618	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3578	#ifdef scrollBar_esc	3619	#ifdef scrollBar_esc
3579	{ scrollBar_esc, PrivMode_scrollBar },	3620	{ scrollBar_esc, PrivMode_scrollBar },
3580	#endif	3621	#endif
3581	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3622	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3623	// 38, tektronix mode // DECTEK
3582	{ 40, PrivMode_132OK },	3624	{ 40, PrivMode_132OK },
3583	// 41 xterm more fixes NYI	3625	// 41 xterm more fixes NYI
3584	// 45 margin bell NYI	3626	// 45 margin bell NYI
3585	// 46 start logging	3627	// 46 start logging
3586	{ 47, PrivMode_Screen },	3628	{ 47, PrivMode_Screen },
3587	{ 66, PrivMode_aplKP },	3629	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3588	#ifndef NO_BACKSPACE_KEY	3630	#ifndef NO_BACKSPACE_KEY
3589	{ 67, PrivMode_BackSpace },	3631	{ 67, PrivMode_BackSpace }, // DECBKM
3590	#endif	3632	#endif
3591	{ 1000, PrivMode_MouseX11 },	3633	{ 1000, PrivMode_MouseX11 },
3592	{ 1002, PrivMode_MouseBtnEvent },	3634	{ 1002, PrivMode_MouseBtnEvent },
3593	{ 1003, PrivMode_MouseAnyEvent },	3635	{ 1003, PrivMode_MouseAnyEvent },
3594	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3636	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
…		…
3633		3675
3634	scr_touch (true);	3676	scr_touch (true);
3635	break;	3677	break;
3636	#endif	3678	#endif
3637	case 1048: /* alternative cursor save */	3679	case 1048: /* alternative cursor save */
3638	case 1049:
3639	if (option (Opt_secondaryScreen))	3680	if (option (Opt_secondaryScreen))
3640	if (mode == 0)	3681	if (mode == 0)
3641	scr_cursor (RESTORE);	3682	scr_cursor (RESTORE);
3642	else if (mode == 1)	3683	else if (mode == 1)
3643	scr_cursor (SAVE);	3684	scr_cursor (SAVE);
…		…
3656	*/	3697	*/
3657	set_privmode (PrivMode_vt52, 1);	3698	set_privmode (PrivMode_vt52, 1);
3658	break;	3699	break;
3659	case 3: /* 80/132 */	3700	case 3: /* 80/132 */
3660	if (priv_modes & PrivMode_132OK)	3701	if (priv_modes & PrivMode_132OK)
3661	{
3662	scr_poweron ();
3663	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3702	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3664	}
3665	break;	3703	break;
3666	case 4: /* smooth scrolling */	3704	case 4: /* smooth scrolling */
3667	set_option (Opt_jumpScroll, !state);	3705	set_option (Opt_jumpScroll, !state);
3668	break;	3706	break;
3669	case 5: /* reverse video */	3707	case 5: /* reverse video */
…		…
3711	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3749	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3712	vt_emask_mouse = PointerMotionMask;	3750	vt_emask_mouse = PointerMotionMask;
3713	}	3751	}
3714	else	3752	else
3715	vt_emask_mouse = NoEventMask;	3753	vt_emask_mouse = NoEventMask;
		3754
3716	vt_select_input ();	3755	vt_select_input ();
3717	break;	3756	break;
3718	case 1010: /* scroll to bottom on TTY output inhibit */	3757	case 1010: /* scroll to bottom on TTY output inhibit */
3719	set_option (Opt_scrollTtyOutput, !state);	3758	set_option (Opt_scrollTtyOutput, !state);
3720	break;	3759	break;
3721	case 1011: /* scroll to bottom on key press */	3760	case 1011: /* scroll to bottom on key press */
3722	set_option (Opt_scrollTtyKeypress, state);	3761	set_option (Opt_scrollTtyKeypress, state);
3723	break;	3762	break;
3724	case 1047: /* secondary screen w/ clearing last */	3763	case 1047: /* secondary screen w/ clearing last */
3725	if (option (Opt_secondaryScreen))	3764	if (option (Opt_secondaryScreen))
3726	if (current_screen != PRIMARY)	3765	if (!state)
3727	scr_erase_screen (2);	3766	scr_erase_screen (2);
		3767
3728	scr_change_screen (state);	3768	scr_change_screen (state);
3729	break;	3769	break;
3730	case 1049: /* secondary screen w/ clearing first */	3770	case 1049: /* secondary screen w/ clearing first */
		3771	if (option (Opt_secondaryScreen))
		3772	if (state)
		3773	scr_cursor (SAVE);
		3774
3731	scr_change_screen (state);	3775	scr_change_screen (state);
		3776
3732	if (option (Opt_secondaryScreen))	3777	if (option (Opt_secondaryScreen))
3733	if (current_screen != PRIMARY)	3778	if (state)
3734	scr_erase_screen (2);	3779	scr_erase_screen (2);
		3780	else
		3781	scr_cursor (RESTORE);
3735	break;	3782	break;
3736	default:	3783	default:
3737	break;	3784	break;
3738	}	3785	}
3739	}	3786	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.415 by root, Sat Apr 26 03:37:18 2008 UTC vs. Revision 1.454 by sf-exg, Sat Aug 21 16:07:15 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.415 by root, Sat Apr 26 03:37:18 2008 UTC vs.
Revision 1.454 by sf-exg, Sat Aug 21 16:07:15 2010 UTC