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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.305 by root, Thu Feb 2 18:04:45 2006 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: command.C	2	* File: command.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
298		298
299	return -1;	299	return -1;
300	}	300	}
301	#endif	301	#endif
302		302
303	/{{{ Convert the keypress event into a string /
304	void	303	void
305	rxvt_term::lookup_key (XKeyEvent &ev)	304	rxvt_term::key_press (XKeyEvent &ev)
306	{	305	{
307	int ctrl, meta, shft, len;	306	int ctrl, meta, shft, len;
308	unsigned int newlen;	307	unsigned int newlen;
309	KeySym keysym;	308	KeySym keysym;
310	int valid_keysym;	309	int valid_keysym;
311	char kbuf[KBUFSZ];	310	char kbuf[KBUFSZ];
		311
		312	#if ISO_14755
		313	if (iso14755buf & ISO_14755_52)
		314	return;
		315	#endif
312		316
313	/*	317	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	318	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315	* escape sequence to toggle the Keypad.	319	* escape sequence to toggle the Keypad.
316	*	320	*
…		…
493	{	497	{
494	commit_iso14755 ();	498	commit_iso14755 ();
495	iso14755buf = ISO_14755_51;	499	iso14755buf = ISO_14755_51;
496	# if ISO_14755	500	# if ISO_14755
497	iso14755_51 (0);	501	iso14755_51 (0);
		502	# endif
		503	return;
		504	}
		505	else if (keysym == XK_BackSpace)
		506	{
		507	iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) \| ISO_14755_51;
		508	# if ISO_14755
		509	iso14755_51 (iso14755buf & ISO_14755_MASK);
498	# endif	510	# endif
499	return;	511	return;
500	}	512	}
501	else if ((hv = hex_keyval (ev)) >= 0)	513	else if ((hv = hex_keyval (ev)) >= 0)
502	{	514	{
…		…
873	return;	885	return;
874		886
875	if (len <= 0)	887	if (len <= 0)
876	return; /* not mapped */	888	return; /* not mapped */
877		889
878	if (OPTION (Opt_scrollTtyKeypress))	890	if (option (Opt_scrollTtyKeypress))
879	if (view_start)	891	if (view_start)
880	{	892	{
881	view_start = 0;	893	view_start = 0;
882	want_refresh = 1;	894	want_refresh = 1;
883	}	895	}
…		…
907	tt_write (&ch, 1);	919	tt_write (&ch, 1);
908	}	920	}
909		921
910	tt_write (kbuf, (unsigned int)len);	922	tt_write (kbuf, (unsigned int)len);
911	}	923	}
912	/}}} /	924
		925	void
		926	rxvt_term::key_release (XKeyEvent &ev)
		927	{
		928	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
		929	KeySym keysym;
		930
		931	keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
		932	#endif
		933
		934	#if ENABLE_FRILLS \|\| ISO_14755
		935	// ISO 14755 support
		936	if (iso14755buf)
		937	if (iso14755buf & ISO_14755_52)
		938	{
		939	# if ENABLE_OVERLAY
		940	scr_overlay_off ();
		941	# endif
		942	# if ISO_14755
		943	// iso14755 part 5.2 handling: release time
		944	// first: controls
		945	if ((ev.state & ControlMask)
		946	&& ((keysym >= 0x40 && keysym <= 0x5f)
		947	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
		948	{
		949	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
		950	commit_iso14755 ();
		951
		952	return;
		953	}
		954
		955	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
		956	if (i[0] == keysym)
		957	{
		958	iso14755buf = ISO_14755_51 \| i[1];
		959	commit_iso14755 ();
		960
		961	return;
		962	}
		963
		964	scr_bell ();
		965	# endif
		966	iso14755buf = 0;
		967
		968	return;
		969	}
		970	else if ((ev.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
		971	{
		972	# if ENABLE_OVERLAY
		973	scr_overlay_off ();
		974	# endif
		975	if (iso14755buf & ISO_14755_51)
		976	commit_iso14755 ();
		977	#if ISO_14755
		978	else if (iso14755buf & ISO_14755_STARTED)
		979	{
		980	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
		981
		982	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
		983	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
		984	}
		985	# endif
		986	else
		987	iso14755buf = 0;
		988	}
		989	#endif
		990
		991	if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		992	return;
		993
		994	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		995	if (!(ev.state & ControlMask))
		996	slip_wheel_ev.stop ();
		997	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
		998	mouse_slip_wheel_speed = 0;
		999	#endif
		1000	}
913		1001
914	#if defined (KEYSYM_RESOURCE)	1002	#if defined (KEYSYM_RESOURCE)
915	unsigned int	1003	unsigned int
916	rxvt_term::cmd_write (const char *str, unsigned int count)	1004	rxvt_term::cmd_write (const char *str, unsigned int count)
917	{	1005	{
…		…
1152	}	1240	}
1153	else	1241	else
1154	{	1242	{
1155	pty_ev.stop ();	1243	pty_ev.stop ();
1156		1244
1157	if (!OPTION (Opt_hold))	1245	if (!option (Opt_hold))
1158	destroy ();	1246	destroy ();
1159	}	1247	}
1160		1248
1161	return false;	1249	return false;
1162	}	1250	}
…		…
1183	recolour_cursor ();	1271	recolour_cursor ();
1184		1272
1185	#ifdef POINTER_BLANK	1273	#ifdef POINTER_BLANK
1186	hidden_pointer = 0;	1274	hidden_pointer = 0;
1187		1275
1188	if (OPTION (Opt_pointerBlank))	1276	if (option (Opt_pointerBlank))
1189	pointer_ev.start (NOW + pointerBlankDelay);	1277	pointer_ev.start (NOW + pointerBlankDelay);
1190	#endif	1278	#endif
1191	}	1279	}
1192		1280
1193	#ifdef POINTER_BLANK	1281	#ifdef POINTER_BLANK
1194	void	1282	void
1195	rxvt_term::pointer_blank ()	1283	rxvt_term::pointer_blank ()
1196	{	1284	{
1197	if (!OPTION (Opt_pointerBlank))	1285	if (!option (Opt_pointerBlank))
1198	return;	1286	return;
1199		1287
1200	XDefineCursor (dpy, vt, display->blank_cursor);	1288	XDefineCursor (dpy, vt, display->blank_cursor);
1201	XFlush (dpy);	1289	XFlush (dpy);
1202		1290
…		…
1300	unsigned int unused_mask;	1388	unsigned int unused_mask;
1301		1389
1302	switch (ev.type)	1390	switch (ev.type)
1303	{	1391	{
1304	case KeyPress:	1392	case KeyPress:
1305	#if ISO_14755	1393	key_press (ev.xkey);
1306	if (!(iso14755buf & ISO_14755_52))
1307	#endif
1308	lookup_key (ev.xkey);
1309
1310	break;	1394	break;
1311		1395
1312	case KeyRelease:	1396	case KeyRelease:
1313	{	1397	key_release (ev.xkey);
1314	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1315	KeySym keysym;
1316
1317	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1318	#endif
1319
1320	#if ENABLE_FRILLS \|\| ISO_14755
1321	// ISO 14755 support
1322	if (iso14755buf)
1323	if (iso14755buf & ISO_14755_52)
1324	{
1325	# if ENABLE_OVERLAY
1326	scr_overlay_off ();
1327	# endif
1328	# if ISO_14755
1329	// iso14755 part 5.2 handling: release time
1330	// first: controls
1331	if ((ev.xkey.state & ControlMask)
1332	&& ((keysym >= 0x40 && keysym <= 0x5f)
1333	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1334	{
1335	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1336	commit_iso14755 ();
1337	goto skip_switch;
1338	}
1339
1340	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1341	if (i[0] == keysym)
1342	{
1343	iso14755buf = ISO_14755_51 \| i[1];
1344	commit_iso14755 ();
1345	goto skip_switch;
1346	}
1347
1348	scr_bell ();
1349	# endif
1350	iso14755buf = 0;
1351	break;
1352	}
1353	else if ((ev.xkey.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
1354	{
1355	# if ENABLE_OVERLAY
1356	scr_overlay_off ();
1357	# endif
1358	if (iso14755buf & ISO_14755_51)
1359	commit_iso14755 ();
1360	#if ISO_14755
1361	else if (iso14755buf & ISO_14755_STARTED)
1362	{
1363	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1364
1365	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1366	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1367	}
1368	# endif
1369	else
1370	iso14755buf = 0;
1371	}
1372	#endif
1373
1374	if (ev.xany.window == vt
1375	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1376	break;
1377
1378	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379	if (!(ev.xkey.state & ControlMask))
1380	slip_wheel_ev.stop ();
1381	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1382	mouse_slip_wheel_speed = 0;
1383	#endif
1384	break;	1398	break;
1385	}
1386		1399
1387	case ButtonPress:	1400	case ButtonPress:
1388	button_press (ev.xbutton);	1401	button_press (ev.xbutton);
1389	break;	1402	break;
1390		1403
…		…
1453	break;	1466	break;
1454	}	1467	}
1455	break;	1468	break;
1456		1469
1457	case FocusIn:	1470	case FocusIn:
		1471	if (ev.xfocus.detail != NotifyInferior
		1472	&& ev.xfocus.detail != NotifyPointer
		1473	&& ev.xfocus.mode != NotifyGrab)
1458	focus_in ();	1474	focus_in ();
1459	break;	1475	break;
1460		1476
1461	case FocusOut:	1477	case FocusOut:
		1478	if (ev.xfocus.detail != NotifyInferior
		1479	&& ev.xfocus.detail != NotifyPointer
		1480	&& ev.xfocus.mode != NotifyGrab)
1462	focus_out ();	1481	focus_out ();
1463	break;	1482	break;
1464		1483
1465	case ConfigureNotify:	1484	case ConfigureNotify:
1466	if (ev.xconfigure.window == parent[0])	1485	if (ev.xconfigure.window == parent[0])
1467	{	1486	{
…		…
1474	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1493	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1475	}	1494	}
1476		1495
1477	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1496	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1478		1497
1479	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1498	#ifdef TRANSPARENT
1480	if (OPTION (Opt_transparent))	1499	if (option (Opt_transparent))
1481	check_our_parents ();	1500	check_our_parents ();
1482	#endif	1501	#endif
1483	}	1502	}
1484	break;	1503	break;
1485		1504
…		…
1673	scrollbar_show (1);	1692	scrollbar_show (1);
1674	}	1693	}
1675	break;	1694	break;
1676	}	1695	}
1677		1696
1678	skip_switch: ;
1679
1680	#if defined(CURSOR_BLINK)	1697	#if defined(CURSOR_BLINK)
1681	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1698	if (option (Opt_cursorBlink) && ev.type == KeyPress)
1682	{	1699	{
1683	if (hidden_cursor)	1700	if (hidden_cursor)
1684	{	1701	{
1685	hidden_cursor = 0;	1702	hidden_cursor = 0;
1686	want_refresh = 1;	1703	want_refresh = 1;
…		…
1689	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1706	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1690	}	1707	}
1691	#endif	1708	#endif
1692		1709
1693	#if defined(POINTER_BLANK)	1710	#if defined(POINTER_BLANK)
1694	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1711	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1695	{	1712	{
1696	if (ev.type == MotionNotify	1713	if (ev.type == MotionNotify
1697	\|\| ev.type == ButtonPress	1714	\|\| ev.type == ButtonPress
1698	\|\| ev.type == ButtonRelease)	1715	\|\| ev.type == ButtonRelease)
1699	if (hidden_pointer)	1716	if (hidden_pointer)
…		…
1711	if (!focus)	1728	if (!focus)
1712	{	1729	{
1713	focus = 1;	1730	focus = 1;
1714	want_refresh = 1;	1731	want_refresh = 1;
1715		1732
1716	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1733	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1717		1734
1718	#if USE_XIM	1735	#if USE_XIM
1719	if (Input_Context != NULL)	1736	if (Input_Context != NULL)
1720	{	1737	{
1721	IMSetStatusPosition ();	1738	IMSetPosition ();
1722	XSetICFocus (Input_Context);	1739	XSetICFocus (Input_Context);
1723	}	1740	}
1724	#endif	1741	#endif
1725	#if CURSOR_BLINK	1742	#if CURSOR_BLINK
1726	if (OPTION (Opt_cursorBlink))	1743	if (option (Opt_cursorBlink))
1727	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1744	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1728	#endif	1745	#endif
1729	#if OFF_FOCUS_FADING	1746	#if OFF_FOCUS_FADING
1730	if (rs[Rs_fade])	1747	if (rs[Rs_fade])
1731	{	1748	{
1732	pix_colors = pix_colors_focused;	1749	pix_colors = pix_colors_focused;
1733	scr_recolour ();	1750	scr_recolour ();
		1751	}
		1752	#endif
		1753	#if ENABLE_FRILLS
		1754	if (option (Opt_urgentOnBell))
		1755	{
		1756	XWMHints *h;
		1757
		1758	h = XGetWMHints(dpy, parent[0]);
		1759	if (h != NULL)
		1760	{
		1761	h->flags &= ~XUrgencyHint;
		1762	XSetWMHints(dpy, parent[0], h);
		1763	}
1734	}	1764	}
1735	#endif	1765	#endif
1736	}	1766	}
1737	}	1767	}
1738		1768
…		…
1758	#if USE_XIM	1788	#if USE_XIM
1759	if (Input_Context != NULL)	1789	if (Input_Context != NULL)
1760	XUnsetICFocus (Input_Context);	1790	XUnsetICFocus (Input_Context);
1761	#endif	1791	#endif
1762	#if CURSOR_BLINK	1792	#if CURSOR_BLINK
1763	if (OPTION (Opt_cursorBlink))	1793	if (option (Opt_cursorBlink))
1764	cursor_blink_ev.stop ();	1794	cursor_blink_ev.stop ();
1765	hidden_cursor = 0;	1795	hidden_cursor = 0;
1766	#endif	1796	#endif
1767	#if OFF_FOCUS_FADING	1797	#if OFF_FOCUS_FADING
1768	if (rs[Rs_fade])	1798	if (rs[Rs_fade])
…		…
1772	}	1802	}
1773	#endif	1803	#endif
1774	}	1804	}
1775	}	1805	}
1776		1806
1777	#if TRANSPARENT	1807	void
		1808	rxvt_term::update_fade_color (unsigned int idx)
		1809	{
		1810	#if OFF_FOCUS_FADING
		1811	if (rs[Rs_fade])
		1812	{
		1813	rgba c;
		1814	pix_colors [Color_fade].get (c);
		1815	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		1816	}
		1817	#endif
		1818	}
		1819
		1820	#if TRANSPARENT \|\| ENABLE_PERL
1778	void	1821	void
1779	rxvt_term::rootwin_cb (XEvent &ev)	1822	rxvt_term::rootwin_cb (XEvent &ev)
1780	{	1823	{
1781	make_current ();	1824	make_current ();
1782		1825
		1826	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
		1827	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
		1828	return;
		1829
		1830	# if TRANSPARENT
1783	switch (ev.type)	1831	switch (ev.type)
1784	{	1832	{
1785	case PropertyNotify:	1833	case PropertyNotify:
1786	/*	1834	/*
1787	* if user used some Esetroot compatible prog to set the root bg,	1835	* if user used some Esetroot compatible prog to set the root bg,
…		…
1791	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1839	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1792	return;	1840	return;
1793		1841
1794	/* FALLTHROUGH */	1842	/* FALLTHROUGH */
1795	case ReparentNotify:	1843	case ReparentNotify:
1796	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)	1844	if (option (Opt_transparent) && check_our_parents () && am_transparent)
1797	want_refresh = want_full_refresh = 1;	1845	want_refresh = want_full_refresh = 1;
1798	break;	1846	break;
1799	}	1847	}
		1848	# endif
1800	}	1849	}
1801	#endif	1850	#endif
1802		1851
1803	void	1852	void
1804	rxvt_term::button_press (XButtonEvent &ev)	1853	rxvt_term::button_press (XButtonEvent &ev)
…		…
2132	selection_make (ev.time);	2181	selection_make (ev.time);
2133	break;	2182	break;
2134		2183
2135	case Button2:	2184	case Button2:
2136	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2185	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2137	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);	2186	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2138	break;	2187	break;
2139		2188
2140	#ifdef MOUSE_WHEEL	2189	#ifdef MOUSE_WHEEL
2141	case Button4:	2190	case Button4:
2142	case Button5:	2191	case Button5:
…		…
2146		2195
2147	v = ev.button == Button4 ? UP : DN;	2196	v = ev.button == Button4 ? UP : DN;
2148		2197
2149	if (ev.state & ShiftMask)	2198	if (ev.state & ShiftMask)
2150	i = 1;	2199	i = 1;
2151	else if (OPTION (Opt_mouseWheelScrollPage))	2200	else if (option (Opt_mouseWheelScrollPage))
2152	i = nrow - 1;	2201	i = nrow - 1;
2153	else	2202	else
2154	i = 5;	2203	i = 5;
2155		2204
2156	# ifdef MOUSE_SLIP_WHEELING	2205	# ifdef MOUSE_SLIP_WHEELING
…		…
2427	Pixmap rootpixmap = None;	2476	Pixmap rootpixmap = None;
2428	XWindowAttributes wattr, wrootattr;	2477	XWindowAttributes wattr, wrootattr;
2429		2478
2430	pchanged = 0;	2479	pchanged = 0;
2431		2480
2432	if (!OPTION (Opt_transparent))	2481	if (!option (Opt_transparent))
2433	return pchanged; /* Don't try any more */	2482	return pchanged; /* Don't try any more */
2434		2483
2435	XGetWindowAttributes (dpy, display->root, &wrootattr);	2484	XGetWindowAttributes (dpy, display->root, &wrootattr);
2436	rootdepth = wrootattr.depth;	2485	rootdepth = wrootattr.depth;
2437		2486
…		…
2707	if (ch == C0_LF)	2756	if (ch == C0_LF)
2708	nlines++;	2757	nlines++;
2709		2758
2710	refresh_count++;	2759	refresh_count++;
2711		2760
2712	if (!OPTION (Opt_jumpScroll)	2761	if (!option (Opt_jumpScroll)
2713	\|\| (refresh_count >= refresh_limit * (nrow - 1)))	2762	\|\| (refresh_count >= refresh_limit * (nrow - 1)))
2714	{	2763	{
2715	refreshnow = true;	2764	refreshnow = true;
2716	refresh_count = 0;	2765	refresh_count = 0;
2717	ch = NOCHAR;	2766	ch = NOCHAR;
…		…
2757	* the number of pages between refreshes is refresh_limit, which	2806	* the number of pages between refreshes is refresh_limit, which
2758	* is incremented here because we must be doing flat-out scrolling.	2807	* is incremented here because we must be doing flat-out scrolling.
2759	*/	2808	*/
2760	if (refreshnow)	2809	if (refreshnow)
2761	{	2810	{
2762	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2811	if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2763	refresh_limit++;	2812	refresh_limit++;
2764	else	2813	else
2765	{	2814	{
2766	flag = true;	2815	flag = true;
		2816	//TODO: due to popular request, implement "skipscroll" option here
2767	scr_refresh ();	2817	scr_refresh ();
2768	want_refresh = 1;	2818	want_refresh = 1;
2769	}	2819	}
2770	}	2820	}
2771		2821
…		…
3432	break;	3482	break;
3433	case 6: /* CPR requested */	3483	case 6: /* CPR requested */
3434	scr_report_position ();	3484	scr_report_position ();
3435	break;	3485	break;
3436	case 7: /* unofficial extension */	3486	case 7: /* unofficial extension */
3437	if (OPTION (Opt_insecure))	3487	if (option (Opt_insecure))
3438	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3488	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3439	break;	3489	break;
3440	case 8: /* unofficial extension */	3490	case 8: /* unofficial extension */
3441	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3491	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3442	break;	3492	break;
…		…
3606	break;	3656	break;
3607	case 20: /* report icon label */	3657	case 20: /* report icon label */
3608	{	3658	{
3609	char *s;	3659	char *s;
3610	XGetIconName (dpy, parent[0], &s);	3660	XGetIconName (dpy, parent[0], &s);
3611	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3661	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3612	XFree (s);	3662	XFree (s);
3613	}	3663	}
3614	break;	3664	break;
3615	case 21: /* report window title */	3665	case 21: /* report window title */
3616	{	3666	{
3617	char *s;	3667	char *s;
3618	XFetchName (dpy, parent[0], &s);	3668	XFetchName (dpy, parent[0], &s);
3619	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3669	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3620	XFree (s);	3670	XFree (s);
3621	}	3671	}
3622	break;	3672	break;
3623	}	3673	}
3624	}	3674	}
…		…
3651	seen_esc = true;	3701	seen_esc = true;
3652	continue;	3702	continue;
3653	}	3703	}
3654	else if (ch == C0_BEL \|\| ch == CHAR_ST)	3704	else if (ch == C0_BEL \|\| ch == CHAR_ST)
3655	break;	3705	break;
		3706	else if (ch == C0_SYN)
		3707	ch = cmd_get8 ();
3656	else if (ch < 0x20)	3708	else if (ch < 0x20)
3657	return NULL; /* other control character - exit */	3709	return NULL; /* other control character - exit */
3658		3710
3659	seen_esc = false;	3711	seen_esc = false;
3660		3712
3661	if (n >= STRING_MAX - 1)	3713	if (n >= STRING_MAX - 1)
3662	// stop at some sane length	3714	// stop at some sane length
3663	return NULL;	3715	return NULL;
3664		3716
3665	if (ch == C0_SYN)
3666	string[n++] = cmd_get8 ();
3667	else
3668	string[n++] = ch;	3717	string[n++] = ch;
3669	}	3718	}
3670		3719
3671	string[n++] = '\0';	3720	string[n++] = '\0';
3672		3721
3673	ends_how = (ch == 0x5c ? C0_ESC : ch);	3722	ends_how = (ch == 0x5c ? C0_ESC : ch);
…		…
3752	int saveop = op;	3801	int saveop = op;
3753		3802
3754	dLocal (Display *, dpy);	3803	dLocal (Display *, dpy);
3755		3804
3756	assert (str != NULL);	3805	assert (str != NULL);
		3806
		3807	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3808	return;
		3809
3757	switch (op)	3810	switch (op)
3758	{	3811	{
3759	case XTerm_name:	3812	case XTerm_name:
3760	set_title (str);	3813	set_title (str);
3761	/* FALLTHROUGH */	3814	/* FALLTHROUGH */
…		…
3929	case URxvt_italicFont:	3982	case URxvt_italicFont:
3930	case URxvt_boldItalicFont:	3983	case URxvt_boldItalicFont:
3931	#endif	3984	#endif
3932	if (query)	3985	if (query)
3933	tt_printf ("\33]%d;%-.250s%c", saveop,	3986	tt_printf ("\33]%d;%-.250s%c", saveop,
3934	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc	3987	option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3935	? fontset[op - URxvt_font]->fontdesc : "",	3988	? fontset[op - URxvt_font]->fontdesc : "",
3936	resp);	3989	resp);
3937	else	3990	else
3938	{	3991	{
3939	const char *&res = rs[Rs_font + (op - URxvt_font)];	3992	const char *&res = rs[Rs_font + (op - URxvt_font)];
…		…
3953	break;	4006	break;
3954		4007
3955	#if !ENABLE_MINIMAL	4008	#if !ENABLE_MINIMAL
3956	case URxvt_locale:	4009	case URxvt_locale:
3957	if (query)	4010	if (query)
3958	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);	4011	tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3959	else	4012	else
3960	{	4013	{
3961	set_locale (str);	4014	set_locale (str);
3962	pty->set_utf8_mode (enc_utf8);	4015	pty->set_utf8_mode (enc_utf8);
3963	init_xlocale ();	4016	init_xlocale ();
…		…
3978	break;	4031	break;
3979	#endif	4032	#endif
3980		4033
3981	#if ENABLE_PERL	4034	#if ENABLE_PERL
3982	case URxvt_perl:	4035	case URxvt_perl:
3983	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	4036	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3984	; // no responses yet	4037	; // no responses yet
3985	break;	4038	break;
3986	#endif	4039	#endif
3987	}	4040	}
3988	}	4041	}
…		…
4104	scr_touch (true);	4157	scr_touch (true);
4105	break;	4158	break;
4106	#endif	4159	#endif
4107	case 1048: /* alternative cursor save */	4160	case 1048: /* alternative cursor save */
4108	case 1049:	4161	case 1049:
4109	if (OPTION (Opt_secondaryScreen))	4162	if (option (Opt_secondaryScreen))
4110	if (mode == 0)	4163	if (mode == 0)
4111	scr_cursor (RESTORE);	4164	scr_cursor (RESTORE);
4112	else if (mode == 1)	4165	else if (mode == 1)
4113	scr_cursor (SAVE);	4166	scr_cursor (SAVE);
4114	break;	4167	break;
…		…
4179	break;	4232	break;
4180	case 1011: /* scroll to bottom on key press */	4233	case 1011: /* scroll to bottom on key press */
4181	set_option (Opt_scrollTtyKeypress, state);	4234	set_option (Opt_scrollTtyKeypress, state);
4182	break;	4235	break;
4183	case 1047: /* secondary screen w/ clearing last */	4236	case 1047: /* secondary screen w/ clearing last */
4184	if (OPTION (Opt_secondaryScreen))	4237	if (option (Opt_secondaryScreen))
4185	if (current_screen != PRIMARY)	4238	if (current_screen != PRIMARY)
4186	scr_erase_screen (2);	4239	scr_erase_screen (2);
4187	scr_change_screen (state);	4240	scr_change_screen (state);
4188	break;	4241	break;
4189	case 1049: /* secondary screen w/ clearing first */	4242	case 1049: /* secondary screen w/ clearing first */
4190	scr_change_screen (state);	4243	scr_change_screen (state);
4191	if (OPTION (Opt_secondaryScreen))	4244	if (option (Opt_secondaryScreen))
4192	if (current_screen != PRIMARY)	4245	if (current_screen != PRIMARY)
4193	scr_erase_screen (2);	4246	scr_erase_screen (2);
4194	break;	4247	break;
4195	default:	4248	default:
4196	break;	4249	break;

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.305 by root, Thu Feb 2 18:04:45 2006 UTC vs. Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.305 by root, Thu Feb 2 18:04:45 2006 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC