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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.416 by root, Tue Jul 15 16:41:22 2008 UTC vs.
Revision 1.459 by sf-exg, Thu Nov 18 17:28:31 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	{
…		…
967	rxvt_term::flush ()	975	rxvt_term::flush ()
968	{	976	{
969	flush_ev.stop ();	977	flush_ev.stop ();
970		978
971	#ifdef HAVE_BG_PIXMAP	979	#ifdef HAVE_BG_PIXMAP
972	if (bgPixmap.check_clearChanged ())	980	if (bgPixmap.flags & bgPixmap_t::hasChanged)
973	{	981	{
		982	bgPixmap.flags &= ~bgPixmap_t::hasChanged;
974	// scr_clear (true); This needs to be researched further!	983	// scr_clear (true); This needs to be researched further!
975	scr_touch (false);	984	scr_touch (false);
976	}	985	}
977	#endif	986	#endif
978		987
…		…
1024	}	1033	}
1025		1034
1026	display->flush ();	1035	display->flush ();
1027	}	1036	}
1028		1037
1029	/* checks wether a refresh is requested and starts the refresh timer */	1038	/* checks whether a refresh is requested and starts the refresh timer */
1030	void	1039	void
1031	rxvt_term::refresh_check ()	1040	rxvt_term::refresh_check ()
1032	{	1041	{
1033	if (want_refresh && !flush_ev.is_active ())	1042	if (want_refresh && !flush_ev.is_active ())
1034	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally	1043	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
…		…
1127	{	1136	{
1128	// this should really be sched_yield(), but the linux guys thought	1137	// this should really be sched_yield(), but the linux guys thought
1129	// that giving a process calling sched_yield () less cpu time than	1138	// 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	1139	// ones with high nice levels is a useful thing to do. It surely is is
1131	// allowed by the sus... as is returning ENOSYS.	1140	// allowed by the sus... as is returning ENOSYS.
		1141	// since the linux guys additionally thought that breaking the only
		1142	// known workaround against their unusable sched_yield hack is cool,
		1143	// we just nanosleep a bit and hope for the best.
1132		1144
1133	struct timespec ts = { 0, 0 };	1145	struct timespec ts = { 0, 1000 };
1134	nanosleep (&ts, 0);	1146	nanosleep (&ts, 0);
1135		1147
1136	w.stop ();	1148	w.stop ();
1137	}	1149	}
1138		1150
…		…
1188	{	1200	{
1189	make_current ();	1201	make_current ();
1190		1202
1191	if (revents & ev::READ)	1203	if (revents & ev::READ)
1192	// loop, but don't allow a single term to monopolize us	1204	// loop, but don't allow a single term to monopolize us
1193	while (pty_fill ())	1205	for (int i = CBUFCNT; i-- && pty_fill (); )
1194	if (cmd_parse ())	1206	cmd_parse ();
1195	break;
1196		1207
1197	if (revents & ev::WRITE)	1208	if (revents & ev::WRITE)
1198	pty_write ();	1209	pty_write ();
1199		1210
1200	refresh_check ();	1211	refresh_check ();
…		…
1420	&& ev.xfocus.mode != NotifyGrab)	1431	&& ev.xfocus.mode != NotifyGrab)
1421	focus_out ();	1432	focus_out ();
1422	break;	1433	break;
1423		1434
1424	case ConfigureNotify:	1435	case ConfigureNotify:
1425	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427	szHint.width, szHint.height);*/
1428	if (ev.xconfigure.window == parent[0])	1436	if (ev.xconfigure.window == parent[0])
1429	{	1437	{
1430	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1438	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431	;	1439	;
1432		1440
…		…
1459	selection_property (ev.xproperty.window, ev.xproperty.atom);	1467	selection_property (ev.xproperty.window, ev.xproperty.atom);
1460		1468
1461	break;	1469	break;
1462		1470
1463	case SelectionClear:	1471	case SelectionClear:
1464	selection_clear ();	1472	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465	break;	1473	break;
1466		1474
1467	case SelectionNotify:	1475	case SelectionNotify:
1468	if (selection_wait == Sel_normal)	1476	if (selection_wait == Sel_normal)
1469	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1477	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
…		…
1473	selection_send (ev.xselectionrequest);	1481	selection_send (ev.xselectionrequest);
1474	break;	1482	break;
1475		1483
1476	case MapNotify:	1484	case MapNotify:
1477	#ifdef HAVE_BG_PIXMAP	1485	#ifdef HAVE_BG_PIXMAP
1478	/* This is needed spcifically to fix the case of no window manager or a	1486	/* 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	1487	* non-reparenting window manager. In those cases we never get first
1480	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1488	* ConfigureNotify. Also that speeds startup under normal WM, by taking
1481	* care of multiplicity of ConfigureNotify events arriwing while WM does	1489	* care of multiplicity of ConfigureNotify events arriving while WM does
1482	* reparenting.	1490	* reparenting.
1483	* We should not render background immidiately, as there could be several	1491	* 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	1492	* 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	1493	* by scheduling background redraw as soon as we can, but giving a short
1486	* bit of time for ConfigureNotifies to arrive.	1494	* bit of time for ConfigureNotifies to arrive.
1487	* We should render background PRIOR to drawing any text, but AFTER all	1495	* We should render background PRIOR to drawing any text, but AFTER all
1488	* of ConfigureNotifys for the best results.	1496	* of ConfigureNotifys for the best results.
…		…
1682	#endif	1690	#endif
1683		1691
1684	refresh_check ();	1692	refresh_check ();
1685	}	1693	}
1686		1694
		1695	#if ENABLE_FRILLS
		1696	void
		1697	rxvt_term::set_urgency (bool enable)
		1698	{
		1699	if (enable == urgency_hint)
		1700	return;
		1701
		1702	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1703	{
		1704	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
		1705	XSetWMHints (dpy, parent[0], h);
		1706	urgency_hint = enable;
		1707	}
		1708	}
		1709	#endif
		1710
1687	void	1711	void
1688	rxvt_term::focus_in ()	1712	rxvt_term::focus_in ()
1689	{	1713	{
1690	if (!focus)	1714	if (!focus)
1691	{	1715	{
1692	focus = 1;	1716	focus = 1;
1693	want_refresh = 1;	1717	want_refresh = 1;
1694
1695	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696		1718
1697	#if USE_XIM	1719	#if USE_XIM
1698	if (Input_Context != NULL)	1720	if (Input_Context != NULL)
1699	{	1721	{
1700	IMSetPosition ();	1722	IMSetPosition ();
…		…
1712	scr_recolour ();	1734	scr_recolour ();
1713	}	1735	}
1714	#endif	1736	#endif
1715	#if ENABLE_FRILLS	1737	#if ENABLE_FRILLS
1716	if (option (Opt_urgentOnBell))	1738	if (option (Opt_urgentOnBell))
1717	{	1739	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	1740	#endif
		1741
		1742	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725	}	1743	}
1726	}	1744	}
1727		1745
1728	void	1746	void
1729	rxvt_term::focus_out ()	1747	rxvt_term::focus_out ()
…		…
1731	if (focus)	1749	if (focus)
1732	{	1750	{
1733	focus = 0;	1751	focus = 0;
1734	want_refresh = 1;	1752	want_refresh = 1;
1735		1753
1736	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1754	#if ENABLE_FRILLS
1737		1755	if (option (Opt_urgentOnBell))
		1756	set_urgency (0);
		1757	#endif
1738	#if ENABLE_FRILLS \|\| ISO_14755	1758	#if ENABLE_FRILLS \|\| ISO_14755
1739	if (iso14755buf)	1759	if (iso14755buf)
1740	{	1760	{
1741	iso14755buf = 0;	1761	iso14755buf = 0;
1742	# if ISO_14755	1762	# if ISO_14755
…		…
1759	{	1779	{
1760	pix_colors = pix_colors_unfocused;	1780	pix_colors = pix_colors_unfocused;
1761	scr_recolour ();	1781	scr_recolour ();
1762	}	1782	}
1763	#endif	1783	#endif
		1784
		1785	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764	}	1786	}
1765	}	1787	}
1766		1788
1767	void	1789	void
1768	rxvt_term::update_fade_color (unsigned int idx)	1790	rxvt_term::update_fade_color (unsigned int idx)
…		…
1845	/* save the xbutton state (for ButtonRelease) */	1867	/* save the xbutton state (for ButtonRelease) */
1846	MEvent.state = ev.state;	1868	MEvent.state = ev.state;
1847	#ifdef MOUSE_REPORT_DOUBLECLICK	1869	#ifdef MOUSE_REPORT_DOUBLECLICK
1848	if (ev.button == MEvent.button && clickintime)	1870	if (ev.button == MEvent.button && clickintime)
1849	{	1871	{
1850	/* same button, within alloted time */	1872	/* same button, within allowed time */
1851	MEvent.clicks++;	1873	MEvent.clicks++;
1852		1874
1853	if (MEvent.clicks > 1)	1875	if (MEvent.clicks > 1)
1854	{	1876	{
1855	/* only report double clicks */	1877	/* only report double clicks */
…		…
2126	selection_make (ev.time);	2148	selection_make (ev.time);
2127	break;	2149	break;
2128		2150
2129	case Button2:	2151	case Button2:
2130	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2152	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);	2153	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132	break;	2154	break;
2133		2155
2134	#ifdef MOUSE_WHEEL	2156	#ifdef MOUSE_WHEEL
2135	case Button4:	2157	case Button4:
2136	case Button5:	2158	case Button5:
…		…
2170	}	2192	}
2171	}	2193	}
2172		2194
2173	/}}} /	2195	/}}} /
2174		2196
2175	bool	2197	void
2176	rxvt_term::cmd_parse ()	2198	rxvt_term::cmd_parse ()
2177	{	2199	{
2178	bool flag = false;
2179	wchar_t ch = NOCHAR;	2200	wchar_t ch = NOCHAR;
2180	char *seq_begin; // remember start of esc-sequence here	2201	char *seq_begin; // remember start of esc-sequence here
2181		2202
2182	for (;;)	2203	for (;;)
2183	{	2204	{
2184	if (ch == NOCHAR)	2205	if (expect_false (ch == NOCHAR))
2185	{	2206	{
2186	seq_begin = cmdbuf_ptr;	2207	seq_begin = cmdbuf_ptr;
2187	ch = next_char ();	2208	ch = next_char ();
2188		2209
2189	if (ch == NOCHAR)	2210	if (ch == NOCHAR)
2190	break;	2211	break;
2191	}	2212	}
2192		2213
2193	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2214	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2194	{	2215	{
2195	if (!seen_input)	2216	if (expect_false (!seen_input))
2196	{	2217	{
2197	seen_input = 1;	2218	seen_input = 1;
2198	// many badly-written programs (e.g. jed) contain a race condition:	2219	// many badly-written programs (e.g. jed) contain a race condition:
2199	// they first read the screensize and then install a SIGWINCH handler.	2220	// they first read the screensize and then install a SIGWINCH handler.
2200	// some window managers resize the window early, and these programs	2221	// some window managers resize the window early, and these programs
…		…
2213	wchar_t *str = buf;	2234	wchar_t *str = buf;
2214	wchar_t *eol = str + min (ncol, UBUFSIZ);	2235	wchar_t *eol = str + min (ncol, UBUFSIZ);
2215		2236
2216	for (;;)	2237	for (;;)
2217	{	2238	{
2218	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2239	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219	break;	2240	break;
2220		2241
2221	*str++ = ch;	2242	*str++ = ch;
2222		2243
2223	if (ch == C0_LF \|\| str >= eol)	2244	if (expect_false (ch == C0_LF \|\| str >= eol))
2224	{	2245	{
2225	if (ch == C0_LF)	2246	if (ch == C0_LF)
2226	nlines++;	2247	nlines++;
2227		2248
2228	refresh_count++;	2249	refresh_count++;
…		…
2277	* What the heck we'll cheat and only refresh less than every page-full.	2298	* What the heck we'll cheat and only refresh less than every page-full.
2278	* if skipScroll is enabled.	2299	* if skipScroll is enabled.
2279	*/	2300	*/
2280	if (refreshnow)	2301	if (refreshnow)
2281	{	2302	{
2282	flag = true;
2283	scr_refresh ();	2303	scr_refresh ();
2284	want_refresh = 1;	2304	want_refresh = 1;
2285	}	2305	}
2286
2287	}	2306	}
2288	else	2307	else
2289	{	2308	{
2290	try	2309	try
2291	{	2310	{
…		…
2299	}	2318	}
2300		2319
2301	ch = NOCHAR;	2320	ch = NOCHAR;
2302	}	2321	}
2303	}	2322	}
2304
2305	return flag;
2306	}	2323	}
2307		2324
2308	// read the next character	2325	// read the next character
2309	wchar_t	2326	wchar_t
2310	rxvt_term::next_char () NOTHROW	2327	rxvt_term::next_char () NOTHROW
2311	{	2328	{
2312	while (cmdbuf_ptr < cmdbuf_endp)	2329	while (cmdbuf_ptr < cmdbuf_endp)
2313	{	2330	{
2314	// assume 7-bit to be ascii ALWAYS	2331	// assume 7-bit to be ascii ALWAYS
2315	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2332	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2316	return *cmdbuf_ptr++;	2333	return *cmdbuf_ptr++;
2317		2334
2318	wchar_t wc;	2335	wchar_t wc;
2319	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2336	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320		2337
…		…
2325	break;	2342	break;
2326	}	2343	}
2327		2344
2328	if (len == (size_t)-1)	2345	if (len == (size_t)-1)
2329	{	2346	{
2330	mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state	2347	mbstate.reset (); // reset now undefined conversion state
2331	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2348	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332	}	2349	}
2333		2350
2334	// assume wchar == unicode	2351	// assume wchar == unicode
2335	cmdbuf_ptr += len;	2352	cmdbuf_ptr += len;
…		…
2679	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2696	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2680	case C1_SCI: /* ESC Z */	2697	case C1_SCI: /* ESC Z */
2681	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2698	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2682	break; /* steal obsolete ESC [ c */	2699	break; /* steal obsolete ESC [ c */
2683		2700
2684	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2701	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2685	case C1_CSI: /* ESC [ */	2702	case C1_CSI: /* ESC [ */
2686	process_csi_seq ();	2703	process_csi_seq ();
2687	break;	2704	break;
2688		2705
2689	/* 8.3.90: OPERATING SYSTEM COMMAND */	2706	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2690	case C1_OSC: /* ESC ] */	2707	case C1_OSC: /* ESC ] */
2691	process_osc_seq ();	2708	process_osc_seq ();
2692	break;	2709	break;
2693		2710
2694	/* 8.3.106: RESET TO INITIAL STATE */	2711	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2695	case 'c':	2712	case 'c':
2696	mbstate.reset ();	2713	mbstate.reset ();
2697	scr_poweron ();	2714	scr_poweron ();
2698	scrollBar.show (1);	2715	scrollBar.show (1);
2699	break;	2716	break;
…		…
2754		2771
2755	nargs = 0;	2772	nargs = 0;
2756		2773
2757	priv = 0;	2774	priv = 0;
2758	ch = cmd_getc ();	2775	ch = cmd_getc ();
2759	if (ch >= '<' && ch <= '?')	2776	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2760	{	2777	{
2761	/* '<' '=' '>' '?' */	2778	/* '<' '=' '>' '?' '!' */
2762	priv = ch;	2779	priv = ch;
2763	ch = cmd_getc ();	2780	ch = cmd_getc ();
2764	}	2781	}
2765		2782
2766	/* read any numerical arguments */	2783	/* read any numerical arguments */
…		…
2820		2837
2821	case '?':	2838	case '?':
2822	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2839	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2823	process_terminal_mode (ch, priv, nargs, arg);	2840	process_terminal_mode (ch, priv, nargs, arg);
2824	break;	2841	break;
		2842
		2843	case '!':
		2844	if (ch == CSI_70)
		2845	{
		2846	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2847	scr_soft_reset ();
		2848
		2849	static const int pm_h[] = { 7, 25 };
		2850	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
		2851
		2852	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2853	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2825	}	2854	}
		2855	break;
		2856	}
		2857
2826	return;	2858	return;
2827	}	2859	}
2828		2860
2829	switch (ch)	2861	switch (ch)
2830	{	2862	{
…		…
3197	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3229	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
3198	*/	3230	*/
3199	void	3231	void
3200	rxvt_term::process_dcs_seq ()	3232	rxvt_term::process_dcs_seq ()
3201	{	3233	{
3202	char *s;
3203	unicode_t eh;
3204
3205	/*	3234	/*
3206	* Not handled yet	3235	* Not handled yet
3207	*/	3236	*/
		3237
		3238	unicode_t eh;
3208	s = get_to_st (eh);	3239	char *s = get_to_st (eh);
3209	if (s)	3240	if (s)
3210	free (s);	3241	free (s);
3211		3242
3212	return;	3243	return;
3213	}	3244	}
…		…
3217	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'	3248	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'
3218	*/	3249	*/
3219	void	3250	void
3220	rxvt_term::process_osc_seq ()	3251	rxvt_term::process_osc_seq ()
3221	{	3252	{
3222	unicode_t ch, eh;
3223	int arg;	3253	int arg;
3224		3254
3225	ch = cmd_getc ();	3255	unicode_t ch = cmd_getc ();
3226	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3256	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3227	arg = arg * 10 + (ch - '0');	3257	arg = arg * 10 + (ch - '0');
3228		3258
3229	if (ch == ';')	3259	if (ch == ';')
3230	{	3260	{
		3261	unicode_t eh;
3231	char *s = get_to_st (eh);	3262	char *s = get_to_st (eh);
3232		3263
3233	if (s)	3264	if (s)
3234	{	3265	{
3235	process_xterm_seq (arg, s, eh);	3266	process_xterm_seq (arg, s, eh);
…		…
3259		3290
3260	/*	3291	/*
3261	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3292	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3262	*/	3293	*/
3263	void	3294	void
3264	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3295	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3265	{	3296	{
3266	int color;	3297	int color;
3267	char buf, name;	3298	char buf, name;
3268	bool query = str[0] == '?' && !str[1];	3299	bool query = str[0] == '?' && !str[1];
3269	int saveop = op;	3300	int saveop = op;
…		…
3310		3341
3311	XFree (value);	3342	XFree (value);
3312	}	3343	}
3313	else	3344	else
3314	{	3345	{
3315	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3346	char *eq = strchr (str, '=');
3316		3347
3317	if (eq)	3348	if (eq)
3318	{	3349	{
3319	*eq = 0;	3350	*eq = 0;
3320	set_utf8_property (display->atom (str), eq + 1);	3351	set_utf8_property (display->atom (str), eq + 1);
…		…
3360	process_color_seq (op, Color_pointer_fg, str, resp);	3391	process_color_seq (op, Color_pointer_fg, str, resp);
3361	break;	3392	break;
3362	case XTerm_Color_pointer_bg:	3393	case XTerm_Color_pointer_bg:
3363	process_color_seq (op, Color_pointer_bg, str, resp);	3394	process_color_seq (op, Color_pointer_bg, str, resp);
3364	break;	3395	break;
		3396	#ifdef OPTION_HC
		3397	case XTerm_Color_HC:
		3398	process_color_seq (op, Color_HC, str, resp);
		3399	break;
		3400	case XTerm_Color_HTC:
		3401	process_color_seq (op, Color_HTC, str, resp);
		3402	break;
		3403	#endif
3365	#ifndef NO_BOLD_UNDERLINE_REVERSE	3404	#ifndef NO_BOLD_UNDERLINE_REVERSE
3366	case XTerm_Color_RV:
3367	process_color_seq (op, Color_RV, str, resp);
3368	break;
3369	case Rxvt_Color_BD:
3370	case URxvt_Color_BD:	3405	case URxvt_Color_BD:
3371	process_color_seq (op, Color_BD, str, resp);	3406	process_color_seq (op, Color_BD, str, resp);
3372	break;	3407	break;
3373	case Rxvt_Color_UL:
3374	case URxvt_Color_UL:	3408	case URxvt_Color_UL:
3375	process_color_seq (op, Color_UL, str, resp);	3409	process_color_seq (op, Color_UL, str, resp);
3376	break;	3410	break;
3377	case URxvt_Color_IT:	3411	case URxvt_Color_IT:
3378	process_color_seq (op, Color_IT, str, resp);	3412	process_color_seq (op, Color_IT, str, resp);
3379	break;	3413	break;
3380	#endif	3414	#endif
		3415	case URxvt_Color_border:
		3416	process_color_seq (op, Color_border, str, resp);
		3417	break;
3381	#if ENABLE_TRANSPARENCY	3418	#if ENABLE_TRANSPARENCY
3382	case URxvt_Color_tint:	3419	case URxvt_Color_tint:
3383	process_color_seq (op, Color_tint, str, resp);	3420	process_color_seq (op, Color_tint, str, resp);
3384	{	3421	{
3385	bool changed = false;	3422	bool changed = false;
…		…
3400	case Rxvt_Pixmap:	3437	case Rxvt_Pixmap:
3401	if (!strcmp (str, "?"))	3438	if (!strcmp (str, "?"))
3402	{	3439	{
3403	char str[256];	3440	char str[256];
3404		3441
3405	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3442	sprintf (str, "[%dx%d+%d+%d]",
3406	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3443	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3407	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3444	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3408	process_xterm_seq (XTerm_title, str, CHAR_ST);	3445	process_xterm_seq (XTerm_title, str, CHAR_ST);
3409	}	3446	}
3410	else	3447	else
3411	{	3448	{
3412	int changed = 0;	3449	int changed = 0;
3413		3450
3414	if (*str != ';')	3451	if (*str != ';')
3415	{	3452	{
3416	/* reset to default scaling :*/
3417	bgPixmap.unset_geometry ();
3418	if (bgPixmap.set_file (str)) /* change pixmap */	3453	if (bgPixmap.set_file (str)) /* change pixmap */
		3454	{
3419	changed++;	3455	changed++;
3420	str = strchr (str, ';');	3456	str = strchr (str, ';');
3421	if (str == NULL)	3457	if (str == NULL)
3422	bgPixmap.set_defaultGeometry ();	3458	bgPixmap.set_defaultGeometry ();
		3459	else
		3460	bgPixmap.set_geometry (str+1);
		3461	}
3423	}	3462	}
3424		3463	else
3425	while (str)
3426	{	3464	{
3427	str++;	3465	str++;
3428	if (bgPixmap.set_geometry (str))	3466	if (bgPixmap.set_geometry (str, true))
3429	changed++;	3467	changed++;
3430	str = strchr (str, ';');
3431	}	3468	}
3432		3469
3433	if (changed)	3470	if (changed)
3434	update_background ();	3471	update_background ();
3435	}	3472	}
…		…
3509	break;	3546	break;
3510	#endif	3547	#endif
3511		3548
3512	#if ENABLE_PERL	3549	#if ENABLE_PERL
3513	case URxvt_perl:	3550	case URxvt_perl:
3514	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3551	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3515	; // no responses yet
3516	break;	3552	break;
3517	#endif	3553	#endif
3518	}	3554	}
3519	}	3555	}
3520	/----------------------------------------------------------------------/	3556	/----------------------------------------------------------------------/
…		…
3543	{	3579	{
3544	if (mode == 'r')	3580	if (mode == 'r')
3545	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3581	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3546	else	3582	else
3547	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3583	state = (mode == 't') ? ! (priv_modes & bit) : mode;
		3584
3548	set_privmode (bit, state);	3585	set_privmode (bit, state);
3549	}	3586	}
3550		3587
3551	return state;	3588	return state;
3552	}	3589	}
…		…
3561	static const struct	3598	static const struct
3562	{	3599	{
3563	const int argval;	3600	const int argval;
3564	const unsigned long bit;	3601	const unsigned long bit;
3565	} argtopriv[] = {	3602	} argtopriv[] = {
3566	{ 1, PrivMode_aplCUR },	3603	{ 1, PrivMode_aplCUR }, // DECCKM
3567	{ 2, PrivMode_vt52 },	3604	{ 2, PrivMode_vt52 },
3568	{ 3, PrivMode_132 },	3605	{ 3, PrivMode_132 }, // DECCOLM
3569	{ 4, PrivMode_smoothScroll },	3606	{ 4, PrivMode_smoothScroll }, // DECSCLM
3570	{ 5, PrivMode_rVideo },	3607	{ 5, PrivMode_rVideo }, // DECSCNM
3571	{ 6, PrivMode_relOrigin },	3608	{ 6, PrivMode_relOrigin }, // DECOM
3572	{ 7, PrivMode_Autowrap },	3609	{ 7, PrivMode_Autowrap }, // DECAWM
3573	// 8, bi-directional support mode	3610	// 8, auto-repeat keys // DECARM
3574	{ 9, PrivMode_MouseX10 },	3611	{ 9, PrivMode_MouseX10 },
3575	// 18, 19 printing-related	3612	// 18 end FF to printer after print screen
		3613	// 19 Print screen prints full screen/scroll region
3576	{ 25, PrivMode_VisibleCursor },	3614	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3577	#ifdef scrollBar_esc	3615	#ifdef scrollBar_esc
3578	{ scrollBar_esc, PrivMode_scrollBar },	3616	{ scrollBar_esc, PrivMode_scrollBar },
3579	#endif	3617	#endif
3580	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3618	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3619	// 38, tektronix mode // DECTEK
3581	{ 40, PrivMode_132OK },	3620	{ 40, PrivMode_132OK },
3582	// 41 xterm more fixes NYI	3621	// 41 xterm more fixes NYI
3583	// 45 margin bell NYI	3622	// 45 margin bell NYI
3584	// 46 start logging	3623	// 46 start logging
3585	{ 47, PrivMode_Screen },	3624	{ 47, PrivMode_Screen },
3586	{ 66, PrivMode_aplKP },	3625	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3587	#ifndef NO_BACKSPACE_KEY	3626	#ifndef NO_BACKSPACE_KEY
3588	{ 67, PrivMode_BackSpace },	3627	{ 67, PrivMode_BackSpace }, // DECBKM
3589	#endif	3628	#endif
3590	{ 1000, PrivMode_MouseX11 },	3629	{ 1000, PrivMode_MouseX11 },
3591	{ 1002, PrivMode_MouseBtnEvent },	3630	{ 1002, PrivMode_MouseBtnEvent },
3592	{ 1003, PrivMode_MouseAnyEvent },	3631	{ 1003, PrivMode_MouseAnyEvent },
3593	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3632	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
…		…
3632		3671
3633	scr_touch (true);	3672	scr_touch (true);
3634	break;	3673	break;
3635	#endif	3674	#endif
3636	case 1048: /* alternative cursor save */	3675	case 1048: /* alternative cursor save */
3637	case 1049:
3638	if (option (Opt_secondaryScreen))	3676	if (option (Opt_secondaryScreen))
3639	if (mode == 0)	3677	if (mode == 0)
3640	scr_cursor (RESTORE);	3678	scr_cursor (RESTORE);
3641	else if (mode == 1)	3679	else if (mode == 1)
3642	scr_cursor (SAVE);	3680	scr_cursor (SAVE);
…		…
3655	*/	3693	*/
3656	set_privmode (PrivMode_vt52, 1);	3694	set_privmode (PrivMode_vt52, 1);
3657	break;	3695	break;
3658	case 3: /* 80/132 */	3696	case 3: /* 80/132 */
3659	if (priv_modes & PrivMode_132OK)	3697	if (priv_modes & PrivMode_132OK)
3660	{
3661	scr_poweron ();
3662	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3698	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3663	}
3664	break;	3699	break;
3665	case 4: /* smooth scrolling */	3700	case 4: /* smooth scrolling */
3666	set_option (Opt_jumpScroll, !state);	3701	set_option (Opt_jumpScroll, !state);
3667	break;	3702	break;
3668	case 5: /* reverse video */	3703	case 5: /* reverse video */
…		…
3710	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3745	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3711	vt_emask_mouse = PointerMotionMask;	3746	vt_emask_mouse = PointerMotionMask;
3712	}	3747	}
3713	else	3748	else
3714	vt_emask_mouse = NoEventMask;	3749	vt_emask_mouse = NoEventMask;
		3750
3715	vt_select_input ();	3751	vt_select_input ();
3716	break;	3752	break;
3717	case 1010: /* scroll to bottom on TTY output inhibit */	3753	case 1010: /* scroll to bottom on TTY output inhibit */
3718	set_option (Opt_scrollTtyOutput, !state);	3754	set_option (Opt_scrollTtyOutput, !state);
3719	break;	3755	break;
3720	case 1011: /* scroll to bottom on key press */	3756	case 1011: /* scroll to bottom on key press */
3721	set_option (Opt_scrollTtyKeypress, state);	3757	set_option (Opt_scrollTtyKeypress, state);
3722	break;	3758	break;
3723	case 1047: /* secondary screen w/ clearing last */	3759	case 1047: /* secondary screen w/ clearing last */
3724	if (option (Opt_secondaryScreen))	3760	if (option (Opt_secondaryScreen))
3725	if (current_screen != PRIMARY)	3761	if (!state)
3726	scr_erase_screen (2);	3762	scr_erase_screen (2);
		3763
3727	scr_change_screen (state);	3764	scr_change_screen (state);
3728	break;	3765	break;
3729	case 1049: /* secondary screen w/ clearing first */	3766	case 1049: /* secondary screen w/ clearing first */
		3767	if (option (Opt_secondaryScreen))
		3768	if (state)
		3769	scr_cursor (SAVE);
		3770
3730	scr_change_screen (state);	3771	scr_change_screen (state);
		3772
3731	if (option (Opt_secondaryScreen))	3773	if (option (Opt_secondaryScreen))
3732	if (current_screen != PRIMARY)	3774	if (state)
3733	scr_erase_screen (2);	3775	scr_erase_screen (2);
		3776	else
		3777	scr_cursor (RESTORE);
3734	break;	3778	break;
3735	default:	3779	default:
3736	break;	3780	break;
3737	}	3781	}
3738	}	3782	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.416 by root, Tue Jul 15 16:41:22 2008 UTC vs. Revision 1.459 by sf-exg, Thu Nov 18 17:28:31 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.416 by root, Tue Jul 15 16:41:22 2008 UTC vs.
Revision 1.459 by sf-exg, Thu Nov 18 17:28:31 2010 UTC