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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.458 by sf-exg, Thu Nov 18 17:28:12 2010 UTC vs.
Revision 1.496 by sf-exg, Wed Aug 31 22:39:49 2011 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>	31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32	*	32	*
33	* This program is free software; you can redistribute it and/or modify	33	* This program is free software; you can redistribute it and/or modify
34	* it under the terms of the GNU General Public License as published by	34	* it under the terms of the GNU General Public License as published by
35	* the Free Software Foundation; either version 2 of the License, or	35	* the Free Software Foundation; either version 2 of the License, or
…		…
257	#endif	257	#endif
258		258
259	void	259	void
260	rxvt_term::commit_iso14755 ()	260	rxvt_term::commit_iso14755 ()
261	{	261	{
262	wchar_t ch[2];
263
264	ch[0] = iso14755buf & ISO_14755_MASK;	262	wchar_t ch = iso14755buf & ISO_14755_MASK;
265	ch[1] = 0;
266		263
267	if (iso14755buf & ISO_14755_51)	264	if (iso14755buf & ISO_14755_51)
268	{	265	{
269	char mb[16];	266	char mb[MB_LEN_MAX];
270	int len;	267	int len;
271		268
272	// allow verbatim 0-bytes and control-bytes to be entered	269	// allow verbatim 0-bytes and control-bytes to be entered
273	if (ch[0] >= 0x20)	270	if (ch >= 0x20)
274	len = wcstombs (mb, ch, 16);	271	len = wctomb (mb, ch);
275	else	272	else
276	{	273	{
277	mb[0] = ch[0];	274	mb[0] = ch;
278	len = 1;	275	len = 1;
279	}	276	}
280		277
281	if (len > 0)	278	if (len > 0)
282	tt_write (mb, len);	279	tt_write (mb, len);
…		…
569	selection_request (ev.time);	566	selection_request (ev.time);
570	return;	567	return;
571	#if TODO	568	#if TODO
572	/* rxvt extras */	569	/* rxvt extras */
573	case XK_KP_Add: /* Shift+KP_Add = bigger font */	570	case XK_KP_Add: /* Shift+KP_Add = bigger font */
574	change_font (FONT_UP);
575	return;	571	return;
576	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	572	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577	change_font (FONT_DN);
578	return;	573	return;
579	#endif	574	#endif
580	}	575	}
581	}	576	}
582	}	577	}
…		…
889	commit_iso14755 ();	884	commit_iso14755 ();
890		885
891	return;	886	return;
892	}	887	}
893		888
894	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	889	for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895	if (i[0] == keysym)	890	if (i[0] == keysym)
896	{	891	{
897	iso14755buf = ISO_14755_51 \| i[1];	892	iso14755buf = ISO_14755_51 \| i[1];
898	commit_iso14755 ();	893	commit_iso14755 ();
899		894
…		…
936	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)	931	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
937	mouse_slip_wheel_speed = 0;	932	mouse_slip_wheel_speed = 0;
938	#endif	933	#endif
939	}	934	}
940		935
941	#if defined (KEYSYM_RESOURCE)
942	unsigned int
943	rxvt_term::cmd_write (const char *str, unsigned int count)
944	{
945	unsigned int n, s;
946
947	n = cmdbuf_ptr - cmdbuf_base;
948	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950	if (n > 0 && s < count)
951	{
952	memmove (cmdbuf_base, cmdbuf_ptr,
953	(unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954	cmdbuf_ptr = cmdbuf_base;
955	cmdbuf_endp -= n;
956	s += n;
957	}
958
959	if (count > s)
960	{
961	rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962	count = s;
963	}
964
965	for (; count--;)
966	cmdbuf_endp++ = str++;
967
968	cmd_parse ();
969
970	return 0;
971	}
972	#endif
973
974	void	936	void
975	rxvt_term::flush ()	937	rxvt_term::flush ()
976	{	938	{
977	flush_ev.stop ();	939	flush_ev.stop ();
978		940
979	#ifdef HAVE_BG_PIXMAP	941	#ifdef HAVE_BG_PIXMAP
980	if (bgPixmap.flags & bgPixmap_t::hasChanged)	942	if (bg_flags & BG_NEEDS_REFRESH)
981	{	943	{
982	bgPixmap.flags &= ~bgPixmap_t::hasChanged;	944	bg_flags &= ~BG_NEEDS_REFRESH;
983	// scr_clear (true); This needs to be researched further!
984	scr_touch (false);	945	scr_touch (false);
985	}	946	}
986	#endif	947	#endif
987		948
988	if (want_refresh)	949	if (want_refresh)
…		…
1026	}	987	}
1027		988
1028	scr_refresh ();	989	scr_refresh ();
1029	scrollBar.show (1);	990	scrollBar.show (1);
1030	#ifdef USE_XIM	991	#ifdef USE_XIM
1031	IMSendSpot ();	992	im_send_spot ();
1032	#endif	993	#endif
1033	}	994	}
1034		995
1035	display->flush ();	996	display->flush ();
1036	}	997	}
…		…
1153	{	1114	{
1154	}	1115	}
1155	} event_handler;	1116	} event_handler;
1156	#endif	1117	#endif
1157		1118
		1119	/* make sure all the cmd data is at beginning of cmdbuf */
		1120	void
		1121	rxvt_term::cmdbuf_reify ()
		1122	{
		1123	if (cmdbuf_ptr == cmdbuf_base)
		1124	return;
		1125
		1126	ssize_t used = cmdbuf_endp - cmdbuf_ptr;
		1127
		1128	memmove (cmdbuf_base, cmdbuf_ptr, used);
		1129	cmdbuf_ptr = cmdbuf_base;
		1130	cmdbuf_endp = cmdbuf_ptr + used;
		1131
		1132	}
		1133
		1134	#if defined (KEYSYM_RESOURCE)
		1135	void
		1136	rxvt_term::cmdbuf_append (const char *str, size_t count)
		1137	{
		1138	cmdbuf_reify ();
		1139
		1140	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
		1141
		1142	if (count > avail)
		1143	return;
		1144
		1145	memcpy (cmdbuf_endp, str, count);
		1146	cmdbuf_endp += count;
		1147
		1148	cmd_parse ();
		1149	}
		1150	#endif
		1151
1158	bool	1152	bool
1159	rxvt_term::pty_fill ()	1153	rxvt_term::pty_fill ()
1160	{	1154	{
1161	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1155	cmdbuf_reify ();
1162		1156
1163	if (CBUFSIZ == n)	1157	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164	{	1158
1165	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");	1159	if (!avail)
1166	n = 0;
1167	}	1160	{
1168		1161	// normally this indicates a "too long" command sequence - just drop the data we have
1169	memmove (cmdbuf_base, cmdbuf_ptr, n);
1170	cmdbuf_ptr = cmdbuf_base;	1162	cmdbuf_ptr = cmdbuf_base;
1171	cmdbuf_endp = cmdbuf_ptr + n;	1163	cmdbuf_endp = cmdbuf_ptr;
		1164	avail = CBUFSIZ;
		1165	}
1172		1166
1173	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);	1167	ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174		1168
1175	if (r > 0)	1169	if (r > 0)
1176	{	1170	{
1177	cmdbuf_endp += r;	1171	cmdbuf_endp += r;
1178	return true;	1172	return true;
…		…
1252	{	1246	{
1253	int button_number, key_state = 0;	1247	int button_number, key_state = 0;
1254	int x, y;	1248	int x, y;
1255	int code = 32;	1249	int code = 32;
1256		1250
1257	x = Pixel2Col (ev.x);	1251	x = Pixel2Col (ev.x) + 1;
1258	y = Pixel2Row (ev.y);	1252	y = Pixel2Row (ev.y) + 1;
		1253
1259	if (ev.type == MotionNotify)	1254	if (ev.type == MotionNotify)
1260	{	1255	{
1261	if (x == mouse_row && y == mouse_col)	1256	if (x == mouse_row && y == mouse_col)
1262	return;	1257	return;
		1258
1263	mouse_row = x;	1259	mouse_row = x;
1264	mouse_col = y;	1260	mouse_col = y;
1265	code += 32;	1261	code += 32;
1266	}	1262	}
1267		1263
…		…
1270	else	1266	else
1271	{	1267	{
1272	button_number = MEvent.button - Button1;	1268	button_number = MEvent.button - Button1;
1273	/* add 0x3D for wheel events, like xterm does */	1269	/* add 0x3D for wheel events, like xterm does */
1274	if (button_number >= 3)	1270	if (button_number >= 3)
1275	button_number += (64 - 3);	1271	button_number += 64 - 3;
1276	}	1272	}
1277		1273
1278	if (priv_modes & PrivMode_MouseX10)	1274	if (priv_modes & PrivMode_MouseX10)
1279	{	1275	{
1280	/*	1276	/*
…		…
1312	fputc ('A', stderr);	1308	fputc ('A', stderr);
1313	if (key_state & 32)	1309	if (key_state & 32)
1314	fputc ('2', stderr);	1310	fputc ('2', stderr);
1315	fprintf (stderr, "]: <%d>, %d/%d\n",	1311	fprintf (stderr, "]: <%d>, %d/%d\n",
1316	button_number,	1312	button_number,
1317	x + 1,	1313	x,
1318	y + 1);	1314	y);
1319	#endif	1315	#endif
1320		1316
		1317	#if ENABLE_FRILLS
		1318	if (priv_modes & PrivMode_ExtMouseRight)
		1319	tt_printf ("\033[%d;%d;%dM",
		1320	code + button_number + key_state,
		1321	x,
		1322	y);
		1323	else if (priv_modes & PrivMode_ExtModeMouse)
		1324	tt_printf ("\033[M%c%lc%lc",
		1325	code + button_number + key_state,
		1326	wint_t (32 + x),
		1327	wint_t (32 + y));
		1328	else
		1329	#endif
1321	tt_printf ("\033[M%c%c%c",	1330	tt_printf ("\033[M%c%c%c",
1322	(code + button_number + key_state),	1331	code + button_number + key_state,
1323	(32 + x + 1),	1332	32 + x,
1324	(32 + y + 1));	1333	32 + y);
1325	}	1334	}
1326		1335
1327	/{{{ process an X event /	1336	/{{{ process an X event /
1328	void	1337	void
1329	rxvt_term::x_cb (XEvent &ev)	1338	rxvt_term::x_cb (XEvent &ev)
…		…
1431	&& ev.xfocus.mode != NotifyGrab)	1440	&& ev.xfocus.mode != NotifyGrab)
1432	focus_out ();	1441	focus_out ();
1433	break;	1442	break;
1434		1443
1435	case ConfigureNotify:	1444	case ConfigureNotify:
1436	if (ev.xconfigure.window == parent[0])	1445	if (ev.xconfigure.window == parent)
1437	{	1446	{
1438	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1447	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439	;	1448	;
		1449
		1450	#ifdef HAVE_BG_PIXMAP
		1451	bool moved = false;
		1452	if (bg_window_position_sensitive ())
		1453	{
		1454	int x, y;
		1455	if (ev.xconfigure.send_event)
		1456	{
		1457	x = ev.xconfigure.x;
		1458	y = ev.xconfigure.y;
		1459	}
		1460	else
		1461	get_window_origin (x, y);
		1462
		1463	if (bg_set_position (x, y)
		1464	\|\| !(bg_flags & BG_IS_VALID))
		1465	moved = true;
		1466	}
		1467	#endif
1440		1468
1441	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1469	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1442	{	1470	{
1443	seen_resize = 1;	1471	seen_resize = 1;
1444	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1472	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1445	}	1473	}
1446	else	1474	else
1447	{	1475	{
1448	#ifdef HAVE_BG_PIXMAP	1476	#ifdef HAVE_BG_PIXMAP
1449	if (bgPixmap.window_position_sensitive ())
1450	{
1451	if (mapped)	1477	if (moved)
1452	update_background ();	1478	update_background ();
1453	else
1454	bgPixmap.invalidate ();
1455	}
1456	#endif	1479	#endif
1457	}	1480	}
1458		1481
1459	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1482	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1460	}	1483	}
1461	break;	1484	break;
1462		1485
1463	case PropertyNotify:	1486	case PropertyNotify:
1464	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1487	HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1465	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1466	&& ev.xproperty.state == PropertyNewValue)
1467	selection_property (ev.xproperty.window, ev.xproperty.atom);
1468
1469	break;	1488	break;
1470		1489
1471	case SelectionClear:	1490	case SelectionClear:
1472	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);	1491	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1473	break;
1474
1475	case SelectionNotify:
1476	if (selection_wait == Sel_normal)
1477	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1478	break;	1492	break;
1479		1493
1480	case SelectionRequest:	1494	case SelectionRequest:
1481	selection_send (ev.xselectionrequest);	1495	selection_send (ev.xselectionrequest);
1482	break;	1496	break;
…		…
1493	* by scheduling background redraw as soon as we can, but giving a short	1507	* by scheduling background redraw as soon as we can, but giving a short
1494	* bit of time for ConfigureNotifies to arrive.	1508	* bit of time for ConfigureNotifies to arrive.
1495	* We should render background PRIOR to drawing any text, but AFTER all	1509	* We should render background PRIOR to drawing any text, but AFTER all
1496	* of ConfigureNotifys for the best results.	1510	* of ConfigureNotifys for the best results.
1497	*/	1511	*/
1498	if (bgPixmap.flags & bgPixmap_t::isInvalid)	1512	if (!(bg_flags & BG_IS_VALID))
1499	update_background_ev.start (0.025);	1513	update_background_ev.start (0.025);
1500	#endif	1514	#endif
1501	mapped = 1;	1515	mapped = 1;
1502	#ifdef TEXT_BLINK	1516	#ifdef TEXT_BLINK
1503	text_blink_ev.start ();	1517	text_blink_ev.start ();
…		…
1518	if (ev.xany.window == vt)	1532	if (ev.xany.window == vt)
1519	{	1533	{
1520	do	1534	do
1521	{	1535	{
1522	scr_expose (ev.xexpose.x, ev.xexpose.y,	1536	scr_expose (ev.xexpose.x, ev.xexpose.y,
1523	ev.xexpose.width, ev.xexpose.height, False);	1537	ev.xexpose.width, ev.xexpose.height, false);
1524	}	1538	}
1525	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1539	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1526		1540
1527	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1541	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528		1542
1529	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1543	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1530	{	1544	{
1531	scr_expose (ev.xexpose.x, ev.xexpose.y,	1545	scr_expose (ev.xexpose.x, ev.xexpose.y,
1532	ev.xexpose.width, ev.xexpose.height, False);	1546	ev.xexpose.width, ev.xexpose.height, false);
1533	}	1547	}
1534		1548
1535	want_refresh = 1;	1549	want_refresh = 1;
1536	}	1550	}
1537	else	1551	else
…		…
1652	XQueryPointer (dpy, scrollBar.win,	1666	XQueryPointer (dpy, scrollBar.win,
1653	&unused_root, &unused_child,	1667	&unused_root, &unused_child,
1654	&unused_root_x, &unused_root_y,	1668	&unused_root_x, &unused_root_y,
1655	&ev.xbutton.x, &ev.xbutton.y,	1669	&ev.xbutton.x, &ev.xbutton.y,
1656	&unused_mask);	1670	&unused_mask);
1657	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1671	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1658	scrollBar.size ());	1672	scrollBar.size ());
1659	want_refresh = 1;	1673	want_refresh = 1;
1660	scrollBar.show (1);	1674	scrollBar.show (1);
1661	}	1675	}
1662	break;	1676	break;
…		…
1697	rxvt_term::set_urgency (bool enable)	1711	rxvt_term::set_urgency (bool enable)
1698	{	1712	{
1699	if (enable == urgency_hint)	1713	if (enable == urgency_hint)
1700	return;	1714	return;
1701		1715
1702	if (XWMHints *h = XGetWMHints (dpy, parent[0]))	1716	if (XWMHints *h = XGetWMHints (dpy, parent))
1703	{	1717	{
1704	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1718	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1705	XSetWMHints (dpy, parent[0], h);	1719	XSetWMHints (dpy, parent, h);
1706	urgency_hint = enable;	1720	urgency_hint = enable;
1707	}	1721	}
1708	}	1722	}
1709	#endif	1723	#endif
1710		1724
…		…
1717	want_refresh = 1;	1731	want_refresh = 1;
1718		1732
1719	#if USE_XIM	1733	#if USE_XIM
1720	if (Input_Context != NULL)	1734	if (Input_Context != NULL)
1721	{	1735	{
1722	IMSetPosition ();	1736	im_set_position ();
1723	XSetICFocus (Input_Context);	1737	XSetICFocus (Input_Context);
1724	}	1738	}
1725	#endif	1739	#endif
1726	#if CURSOR_BLINK	1740	#if CURSOR_BLINK
1727	if (option (Opt_cursorBlink))	1741	if (option (Opt_cursorBlink))
…		…
1818	* use the property to determine the pixmap. We use it later on.	1832	* use the property to determine the pixmap. We use it later on.
1819	*/	1833	*/
1820	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1834	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1821	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1835	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1822	{	1836	{
1823	bgPixmap.set_root_pixmap ();	1837	bg_set_root_pixmap ();
1824	update_background ();	1838	update_background ();
1825	}	1839	}
1826		1840
1827	break;	1841	break;
1828	}	1842	}
…		…
2030	csrO = scrollBar.bot - scrollBar.top;	2044	csrO = scrollBar.bot - scrollBar.top;
2031	break;	2045	break;
2032	}	2046	}
2033		2047
2034	if (scrollBar.style == R_SB_XTERM	2048	if (scrollBar.style == R_SB_XTERM
2035	\|\| scrollbar_above_slider (ev.y)	2049	\|\| scrollBar.above_slider (ev.y)
2036	\|\| scrollbar_below_slider (ev.y))	2050	\|\| scrollBar.below_slider (ev.y))
2037	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2051	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2038		2052
2039	scrollBar.state = STATE_MOTION;	2053	scrollBar.state = STATE_MOTION;
2040	break;	2054	break;
2041		2055
2042	case Button1:	2056	case Button1:
…		…
2045	/* FALLTHROUGH */	2059	/* FALLTHROUGH */
2046		2060
2047	case Button3:	2061	case Button3:
2048	if (scrollBar.style != R_SB_XTERM)	2062	if (scrollBar.style != R_SB_XTERM)
2049	{	2063	{
2050	if (scrollbar_above_slider (ev.y))	2064	if (scrollBar.above_slider (ev.y))
2051	# ifdef RXVT_SCROLL_FULL	2065	# ifdef RXVT_SCROLL_FULL
2052	scr_page (UP, nrow - 1);	2066	scr_page (UP, nrow - 1);
2053	# else	2067	# else
2054	scr_page (UP, nrow / 4);	2068	scr_page (UP, nrow / 4);
2055	# endif	2069	# endif
2056	else if (scrollbar_below_slider (ev.y))	2070	else if (scrollBar.below_slider (ev.y))
2057	# ifdef RXVT_SCROLL_FULL	2071	# ifdef RXVT_SCROLL_FULL
2058	scr_page (DN, nrow - 1);	2072	scr_page (DN, nrow - 1);
2059	# else	2073	# else
2060	scr_page (DN, nrow / 4);	2074	scr_page (DN, nrow / 4);
2061	# endif	2075	# endif
…		…
2064	}	2078	}
2065	else	2079	else
2066	{	2080	{
2067	scr_page ((ev.button == Button1 ? DN : UP),	2081	scr_page ((ev.button == Button1 ? DN : UP),
2068	(nrow	2082	(nrow
2069	* scrollbar_position (ev.y)	2083	* scrollBar.position (ev.y)
2070	/ scrollBar.size ()));	2084	/ scrollBar.size ()));
2071	}	2085	}
2072		2086
2073	break;	2087	break;
2074	}	2088	}
…		…
2200	wchar_t ch = NOCHAR;	2214	wchar_t ch = NOCHAR;
2201	char *seq_begin; // remember start of esc-sequence here	2215	char *seq_begin; // remember start of esc-sequence here
2202		2216
2203	for (;;)	2217	for (;;)
2204	{	2218	{
2205	if (expect_false (ch == NOCHAR))	2219	if (ecb_unlikely (ch == NOCHAR))
2206	{	2220	{
2207	seq_begin = cmdbuf_ptr;	2221	seq_begin = cmdbuf_ptr;
2208	ch = next_char ();	2222	ch = next_char ();
2209		2223
2210	if (ch == NOCHAR)	2224	if (ch == NOCHAR)
2211	break;	2225	break;
2212	}	2226	}
2213		2227
2214	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))	2228	if (ecb_likely (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2215	{	2229	{
2216	if (expect_false (!seen_input))	2230	if (ecb_unlikely (!seen_input))
2217	{	2231	{
2218	seen_input = 1;	2232	seen_input = 1;
2219	// many badly-written programs (e.g. jed) contain a race condition:	2233	// many badly-written programs (e.g. jed) contain a race condition:
2220	// they first read the screensize and then install a SIGWINCH handler.	2234	// they first read the screensize and then install a SIGWINCH handler.
2221	// some window managers resize the window early, and these programs	2235	// some window managers resize the window early, and these programs
…		…
2234	wchar_t *str = buf;	2248	wchar_t *str = buf;
2235	wchar_t *eol = str + min (ncol, UBUFSIZ);	2249	wchar_t *eol = str + min (ncol, UBUFSIZ);
2236		2250
2237	for (;;)	2251	for (;;)
2238	{	2252	{
2239	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))	2253	if (ecb_unlikely (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2240	break;	2254	break;
2241		2255
2242	*str++ = ch;	2256	*str++ = ch;
2243		2257
2244	if (expect_false (ch == C0_LF \|\| str >= eol))	2258	if (ecb_unlikely (ch == C0_LF \|\| str >= eol))
2245	{	2259	{
2246	if (ch == C0_LF)	2260	if (ch == C0_LF)
2247	nlines++;	2261	nlines++;
2248		2262
2249	refresh_count++;	2263	refresh_count++;
…		…
2327	rxvt_term::next_char () NOTHROW	2341	rxvt_term::next_char () NOTHROW
2328	{	2342	{
2329	while (cmdbuf_ptr < cmdbuf_endp)	2343	while (cmdbuf_ptr < cmdbuf_endp)
2330	{	2344	{
2331	// assume 7-bit to be ascii ALWAYS	2345	// assume 7-bit to be ascii ALWAYS
2332	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))	2346	if (ecb_likely ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2333	return *cmdbuf_ptr++;	2347	return *cmdbuf_ptr++;
2334		2348
2335	wchar_t wc;	2349	wchar_t wc;
2336	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2350	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2337		2351
…		…
2365	: NOCHAR;	2379	: NOCHAR;
2366	}	2380	}
2367		2381
2368	static class out_of_input out_of_input;	2382	static class out_of_input out_of_input;
2369		2383
2370	/* rxvt_cmd_getc () - Return next input character */
2371	/*
2372	* Return the next input character after first passing any keyboard input
2373	* to the command.
2374	*/
2375	wchar_t	2384	wchar_t
2376	rxvt_term::cmd_getc () THROW ((class out_of_input))	2385	rxvt_term::cmd_getc () THROW ((class out_of_input))
2377	{	2386	{
2378	wchar_t c = next_char ();	2387	wchar_t c = next_char ();
2379		2388
…		…
2472	pclose_printer (fd);	2481	pclose_printer (fd);
2473	}	2482	}
2474	#endif /* PRINTPIPE */	2483	#endif /* PRINTPIPE */
2475	/}}} /	2484	/}}} /
2476		2485
2477	/* INDENT-OFF */
2478	enum {	2486	enum {
2479	C1_40 = 0x40,	2487	C1_40 = 0x40,
2480	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,	2488	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2481	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,	2489	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2482	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2490	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2483	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2491	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2484	};	2492	};
2485	/* INDENT-ON */
2486		2493
2487	/{{{ process non-printing single characters /	2494	/{{{ process non-printing single characters /
2488	void	2495	void
2489	rxvt_term::process_nonprinting (unicode_t ch)	2496	rxvt_term::process_nonprinting (unicode_t ch)
2490	{	2497	{
…		…
2583	break;	2590	break;
2584	case 'Z': /* identify the terminal type */	2591	case 'Z': /* identify the terminal type */
2585	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2592	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2586	break;	2593	break;
2587	case '<': /* turn off VT52 mode */	2594	case '<': /* turn off VT52 mode */
2588	set_privmode (PrivMode_vt52, 0);	2595	priv_modes &= ~PrivMode_vt52;
2589	break;	2596	break;
2590	case 'F': /* use special graphics character set */	2597	case 'F': /* use special graphics character set */
2591	case 'G': /* use regular character set */	2598	case 'G': /* use regular character set */
2592	/* unimplemented */	2599	/* unimplemented */
2593	break;	2600	break;
…		…
2612	return;	2619	return;
2613	}	2620	}
2614		2621
2615	switch (ch)	2622	switch (ch)
2616	{	2623	{
2617	/* case 1: do_tek_mode (); break; */
2618	case '#':	2624	case '#':
2619	if (cmd_getc () == '8')	2625	if (cmd_getc () == '8')
2620	scr_E ();	2626	scr_E ();
2621	break;	2627	break;
2622	case '(':	2628	case '(':
…		…
2645	#if !ENABLE_MINIMAL	2651	#if !ENABLE_MINIMAL
2646	case '9':	2652	case '9':
2647	scr_forwardindex ();	2653	scr_forwardindex ();
2648	break;	2654	break;
2649	#endif	2655	#endif
		2656	// DECPAM/DECPNM
2650	case '=':	2657	case '=':
		2658	priv_modes \|= PrivMode_aplKP;
		2659	break;
2651	case '>':	2660	case '>':
2652	set_privmode (PrivMode_aplKP, ch == '=');	2661	priv_modes &= ~PrivMode_aplKP;
2653	break;	2662	break;
2654		2663
2655	case C1_40:	2664	case C1_40:
2656	cmd_getc ();	2665	cmd_getc ();
2657	break;	2666	break;
…		…
2661		2670
2662	/* 8.3.87: NEXT LINE */	2671	/* 8.3.87: NEXT LINE */
2663	case C1_NEL: /* ESC E */	2672	case C1_NEL: /* ESC E */
2664	{	2673	{
2665	wchar_t nlcr[] = { C0_LF, C0_CR };	2674	wchar_t nlcr[] = { C0_LF, C0_CR };
2666	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);	2675	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2667	}	2676	}
2668	break;	2677	break;
2669		2678
2670	/* kidnapped escape sequence: Should be 8.3.48 */	2679	/* kidnapped escape sequence: Should be 8.3.48 */
2671	case C1_ESA: /* ESC G */	2680	case C1_ESA: /* ESC G */
2672	process_graphics ();	2681	// used by original rxvt for rob nations own graphics mode
		2682	if (cmd_getc () == 'Q')
		2683	tt_printf ("\033G0\012"); /* query graphics - no graphics */
2673	break;	2684	break;
2674		2685
2675	/* 8.3.63: CHARACTER TABULATION SET */	2686	/* 8.3.63: CHARACTER TABULATION SET */
2676	case C1_HTS: /* ESC H */	2687	case C1_HTS: /* ESC H */
2677	scr_set_tab (1);	2688	scr_set_tab (1);
…		…
2681	case C1_RI: /* ESC M */	2692	case C1_RI: /* ESC M */
2682	scr_index (DN);	2693	scr_index (DN);
2683	break;	2694	break;
2684		2695
2685	/* 8.3.142: SINGLE-SHIFT TWO */	2696	/* 8.3.142: SINGLE-SHIFT TWO */
2686	/case C1_SS2: scr_single_shift (2); break; /	2697	/* case C1_SS2: break; */
2687		2698
2688	/* 8.3.143: SINGLE-SHIFT THREE */	2699	/* 8.3.143: SINGLE-SHIFT THREE */
2689	/case C1_SS3: scr_single_shift (3); break; /	2700	/* case C1_SS3: break; */
2690		2701
2691	/* 8.3.27: DEVICE CONTROL STRING */	2702	/* 8.3.27: DEVICE CONTROL STRING */
2692	case C1_DCS: /* ESC P */	2703	case C1_DCS: /* ESC P */
2693	process_dcs_seq ();	2704	process_dcs_seq ();
2694	break;	2705	break;
…		…
2727	}	2738	}
2728	}	2739	}
2729	/}}} /	2740	/}}} /
2730		2741
2731	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /	2742	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /
2732	/* INDENT-OFF */
2733	enum {	2743	enum {
2734	CSI_ICH = 0x40,	2744	CSI_ICH = 0x40,
2735	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,	2745	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2736	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,	2746	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2737	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,	2747	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
…		…
2740	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,	2750	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2741	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,	2751	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2742	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F	2752	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2743	};	2753	};
2744		2754
2745	#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \	2755	#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2746	(((b7) << 7) \| ((b6) << 6) \| ((b5) << 5) \| ((b4) << 4) \	2756	(((b7) << 7) \| ((b6) << 6) \| ((b5) << 5) \| ((b4) << 4) \
2747	\| ((b3) << 3) \| ((b2) << 2) \| ((b1) << 1) \| (b0))	2757	\| ((b3) << 3) \| ((b2) << 2) \| ((b1) << 1) \| (b0))
2748	#define get_byte_array_bit(array, bit) \	2758	#define get_byte_array_bit(array, bit) \
2749	(!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))	2759	(!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2750		2760
2751	const unsigned char csi_defaults[] =	2761	static const unsigned char csi_defaults[] =
2752	{	2762	{
2753	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */	2763	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2754	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */	2764	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2755	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */	2765	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2756	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */	2766	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2757	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */	2767	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2758	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2768	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2759	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2769	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2760	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2770	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2761	};	2771	};
2762	/* INDENT-ON */
2763		2772
2764	void	2773	void
2765	rxvt_term::process_csi_seq ()	2774	rxvt_term::process_csi_seq ()
2766	{	2775	{
2767	unicode_t ch, priv, i;	2776	unicode_t ch, priv, i;
…		…
2845	{	2854	{
2846	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */	2855	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2847	scr_soft_reset ();	2856	scr_soft_reset ();
2848		2857
2849	static const int pm_h[] = { 7, 25 };	2858	static const int pm_h[] = { 7, 25 };
2850	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };	2859	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2851		2860
2852	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);	2861	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2853	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);	2862	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2854	}	2863	}
2855	break;	2864	break;
2856	}	2865	}
2857		2866
2858	return;	2867	return;
…		…
3077	}	3086	}
3078	}	3087	}
3079	/}}} /	3088	/}}} /
3080		3089
3081	#if !ENABLE_MINIMAL	3090	#if !ENABLE_MINIMAL
3082	/* ARGSUSED */
3083	void	3091	void
3084	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3092	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3085	{	3093	{
3086	int x, y;	3094	int x, y;
3087	XWindowAttributes wattr;	3095	XWindowAttributes wattr;
…		…
3096	{	3104	{
3097	/*	3105	/*
3098	* commands	3106	* commands
3099	*/	3107	*/
3100	case 1: /* deiconify window */	3108	case 1: /* deiconify window */
3101	XMapWindow (dpy, parent[0]);	3109	XMapWindow (dpy, parent);
3102	break;	3110	break;
3103	case 2: /* iconify window */	3111	case 2: /* iconify window */
3104	XIconifyWindow (dpy, parent[0], display->screen);	3112	XIconifyWindow (dpy, parent, display->screen);
3105	break;	3113	break;
3106	case 3: /* set position (pixels) */	3114	case 3: /* set position (pixels) */
3107	XMoveWindow (dpy, parent[0], args[1], args[2]);	3115	XMoveWindow (dpy, parent, args[1], args[2]);
3108	break;	3116	break;
3109	case 4: /* set size (pixels) */	3117	case 4: /* set size (pixels) */
3110	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3118	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3111	break;	3119	break;
3112	case 5: /* raise window */	3120	case 5: /* raise window */
3113	XRaiseWindow (dpy, parent[0]);	3121	XRaiseWindow (dpy, parent);
3114	break;	3122	break;
3115	case 6: /* lower window */	3123	case 6: /* lower window */
3116	XLowerWindow (dpy, parent[0]);	3124	XLowerWindow (dpy, parent);
3117	break;	3125	break;
3118	case 7: /* refresh window */	3126	case 7: /* refresh window */
3119	scr_touch (true);	3127	scr_touch (true);
3120	break;	3128	break;
3121	case 8: /* set size (chars) */	3129	case 8: /* set size (chars) */
…		…
3132		3140
3133	/*	3141	/*
3134	* reports - some output format copied from XTerm	3142	* reports - some output format copied from XTerm
3135	*/	3143	*/
3136	case 11: /* report window state */	3144	case 11: /* report window state */
3137	XGetWindowAttributes (dpy, parent[0], &wattr);	3145	XGetWindowAttributes (dpy, parent, &wattr);
3138	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3146	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3139	break;	3147	break;
3140	case 13: /* report window position */	3148	case 13: /* report window position */
3141	XGetWindowAttributes (dpy, parent[0], &wattr);	3149	XGetWindowAttributes (dpy, parent, &wattr);
3142	XTranslateCoordinates (dpy, parent[0], wattr.root,	3150	XTranslateCoordinates (dpy, parent, wattr.root,
3143	-wattr.border_width, -wattr.border_width,	3151	-wattr.border_width, -wattr.border_width,
3144	&x, &y, &wdummy);	3152	&x, &y, &wdummy);
3145	tt_printf ("\033[3;%d;%dt", x, y);	3153	tt_printf ("\033[3;%d;%dt", x, y);
3146	break;	3154	break;
3147	case 14: /* report window size (pixels) */	3155	case 14: /* report window size (pixels) */
3148	XGetWindowAttributes (dpy, parent[0], &wattr);	3156	XGetWindowAttributes (dpy, parent, &wattr);
3149	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3157	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3150	break;	3158	break;
3151	case 18: /* report text area size (chars) */	3159	case 18: /* report text area size (chars) */
3152	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3160	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3153	break;	3161	break;
…		…
3155	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3163	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3156	break;	3164	break;
3157	case 20: /* report icon label */	3165	case 20: /* report icon label */
3158	{	3166	{
3159	char *s;	3167	char *s;
3160	XGetIconName (dpy, parent[0], &s);	3168	XGetIconName (dpy, parent, &s);
3161	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3169	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3162	XFree (s);	3170	XFree (s);
3163	}	3171	}
3164	break;	3172	break;
3165	case 21: /* report window title */	3173	case 21: /* report window title */
3166	{	3174	{
3167	char *s;	3175	char *s;
3168	XFetchName (dpy, parent[0], &s);	3176	XFetchName (dpy, parent, &s);
3169	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3177	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3170	XFree (s);	3178	XFree (s);
3171	}	3179	}
3172	break;	3180	break;
3173	}	3181	}
…		…
3327	unsigned long bytes_after;	3335	unsigned long bytes_after;
3328	unsigned char *value = 0;	3336	unsigned char *value = 0;
3329	const char *str = "";	3337	const char *str = "";
3330		3338
3331	if (prop	3339	if (prop
3332	&& XGetWindowProperty (dpy, parent[0],	3340	&& XGetWindowProperty (dpy, parent,
3333	prop, 0, 1<<16, 0, AnyPropertyType,	3341	prop, 0, 1<<16, 0, AnyPropertyType,
3334	&actual_type, &actual_format,	3342	&actual_type, &actual_format,
3335	&nitems, &bytes_after, &value) == Success	3343	&nitems, &bytes_after, &value) == Success
3336	&& actual_type != None	3344	&& actual_type != None
3337	&& actual_format == 8)	3345	&& actual_format == 8)
…		…
3349	{	3357	{
3350	*eq = 0;	3358	*eq = 0;
3351	set_utf8_property (display->atom (str), eq + 1);	3359	set_utf8_property (display->atom (str), eq + 1);
3352	}	3360	}
3353	else	3361	else
3354	XDeleteProperty (dpy, parent[0],	3362	XDeleteProperty (dpy, parent,
3355	display->atom (str));	3363	display->atom (str));
3356	}	3364	}
3357	break;	3365	break;
3358		3366
3359	case XTerm_Color:	3367	case XTerm_Color:
…		…
3420	process_color_seq (op, Color_tint, str, resp);	3428	process_color_seq (op, Color_tint, str, resp);
3421	{	3429	{
3422	bool changed = false;	3430	bool changed = false;
3423		3431
3424	if (ISSET_PIXCOLOR (Color_tint))	3432	if (ISSET_PIXCOLOR (Color_tint))
3425	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3433	changed = bg_set_tint (pix_colors_focused [Color_tint]);
3426	else
3427	changed = bgPixmap.unset_tint ();
3428		3434
3429	if (changed)	3435	if (changed)
3430	update_background ();	3436	update_background ();
3431	}	3437	}
3432		3438
…		…
3438	if (!strcmp (str, "?"))	3444	if (!strcmp (str, "?"))
3439	{	3445	{
3440	char str[256];	3446	char str[256];
3441		3447
3442	sprintf (str, "[%dx%d+%d+%d]",	3448	sprintf (str, "[%dx%d+%d+%d]",
3443	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3449	min (h_scale, 32767), min (v_scale, 32767),
3444	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3450	min (h_align, 32767), min (v_align, 32767));
3445	process_xterm_seq (XTerm_title, str, CHAR_ST);	3451	process_xterm_seq (XTerm_title, str, CHAR_ST);
3446	}	3452	}
3447	else	3453	else
3448	{	3454	{
3449	int changed = 0;	3455	bool changed = false;
3450		3456
3451	if (*str != ';')	3457	if (*str != ';')
3452	{	3458	{
3453	if (bgPixmap.set_file (str)) /* change pixmap */	3459	if (bg_set_file (str)) /* change pixmap */
3454	changed++;	3460	changed = true;
3455	str = strchr (str, ';');
3456	if (str == NULL)
3457	bgPixmap.set_defaultGeometry ();
3458	else
3459	bgPixmap.set_geometry (str+1);
3460	}	3461	}
3461	else	3462	else
3462	{	3463	{
3463	str++;	3464	str++;
3464	if (bgPixmap.set_geometry (str, true))	3465	if (bg_set_geometry (str, true))
3465	changed++;	3466	changed = true;
3466	}	3467	}
3467		3468
3468	if (changed)	3469	if (changed)
		3470	{
		3471	if (bg_window_position_sensitive ())
		3472	{
		3473	int x, y;
		3474	get_window_origin (x, y);
		3475	bg_set_position (x, y);
		3476	}
3469	update_background ();	3477	update_background ();
		3478	}
3470	}	3479	}
3471	break;	3480	break;
3472	#endif	3481	#endif
3473		3482
3474	case XTerm_logfile:	3483	case XTerm_logfile:
…		…
3578	if (mode == 'r')	3587	if (mode == 'r')
3579	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3588	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3580	else	3589	else
3581	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3590	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3582		3591
3583	set_privmode (bit, state);	3592	if (state)
		3593	priv_modes \|= bit;
		3594	else
		3595	priv_modes &= ~bit;
3584	}	3596	}
3585		3597
3586	return state;	3598	return state;
3587	}	3599	}
3588		3600
3589	/* we're not using priv _yet_ */	3601	/* we're not using priv _yet_ */
3590	void	3602	void
3591	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3603	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3592	{	3604	{
3593	unsigned int i, j;	3605	unsigned int i, j;
3594	int state;	3606	int state;
3595		3607
3596	static const struct	3608	static const struct
3597	{	3609	{
3598	const int argval;	3610	const int argval;
3599	const unsigned long bit;	3611	const unsigned long bit;
3600	} argtopriv[] = {	3612	} argtopriv[] = {
3601	{ 1, PrivMode_aplCUR }, // DECCKM	3613	{ 1, PrivMode_aplCUR }, // DECCKM
3602	{ 2, PrivMode_vt52 },	3614	{ 2, PrivMode_vt52 }, // DECANM
3603	{ 3, PrivMode_132 }, // DECCOLM	3615	{ 3, PrivMode_132 }, // DECCOLM
3604	{ 4, PrivMode_smoothScroll }, // DECSCLM	3616	{ 4, PrivMode_smoothScroll }, // DECSCLM
3605	{ 5, PrivMode_rVideo }, // DECSCNM	3617	{ 5, PrivMode_rVideo }, // DECSCNM
3606	{ 6, PrivMode_relOrigin }, // DECOM	3618	{ 6, PrivMode_relOrigin }, // DECOM
3607	{ 7, PrivMode_Autowrap }, // DECAWM	3619	{ 7, PrivMode_Autowrap }, // DECAWM
3608	// 8, auto-repeat keys // DECARM	3620	// 8, auto-repeat keys // DECARM
3609	{ 9, PrivMode_MouseX10 },	3621	{ 9, PrivMode_MouseX10 },
3610	// 18 end FF to printer after print screen	3622	// 18 end FF to printer after print screen
3611	// 19 Print screen prints full screen/scroll region	3623	// 19 Print screen prints full screen/scroll region
3612	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3624	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3613	#ifdef scrollBar_esc	3625	#ifdef scrollBar_esc
3614	{ scrollBar_esc, PrivMode_scrollBar },	3626	{ scrollBar_esc, PrivMode_scrollBar },
3615	#endif	3627	#endif
3616	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3628	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3617	// 38, tektronix mode // DECTEK	3629	// 38, tektronix mode // DECTEK
3618	{ 40, PrivMode_132OK },	3630	{ 40, PrivMode_132OK },
3619	// 41 xterm more fixes NYI	3631	// 41 xterm more fixes NYI
3620	// 45 margin bell NYI	3632	// 45 margin bell NYI
3621	// 46 start logging	3633	// 46 start logging
3622	{ 47, PrivMode_Screen },	3634	{ 47, PrivMode_Screen },
3623	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3635	{ 66, PrivMode_aplKP }, // DECNKM
3624	#ifndef NO_BACKSPACE_KEY	3636	#ifndef NO_BACKSPACE_KEY
3625	{ 67, PrivMode_BackSpace }, // DECBKM	3637	{ 67, PrivMode_BackSpace }, // DECBKM
3626	#endif	3638	#endif
3627	{ 1000, PrivMode_MouseX11 },	3639	{ 1000, PrivMode_MouseX11 },
3628	{ 1002, PrivMode_MouseBtnEvent },	3640	{ 1002, PrivMode_MouseBtnEvent },
3629	{ 1003, PrivMode_MouseAnyEvent },	3641	{ 1003, PrivMode_MouseAnyEvent },
		3642	#if ENABLE_FRILLS
		3643	{ 1005, PrivMode_ExtModeMouse },
		3644	#endif
3630	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3645	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3631	{ 1011, PrivMode_Keypress }, // rxvt extension	3646	{ 1011, PrivMode_Keypress }, // rxvt extension
		3647	#if ENABLE_FRILLS
		3648	{ 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
		3649	#endif
3632	// 1035 enable modifiers for alt, numlock NYI	3650	// 1035 enable modifiers for alt, numlock NYI
3633	// 1036 send ESC for meta keys NYI	3651	// 1036 send ESC for meta keys NYI
3634	// 1037 send DEL for keypad delete NYI	3652	// 1037 send DEL for keypad delete NYI
3635	{ 1047, PrivMode_Screen },	3653	{ 1047, PrivMode_Screen },
3636	// 1048 save and restore cursor	3654	// 1048 save and restore cursor, implemented in code
3637	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3655	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3638	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3656	// 1051, 1052, 1060, 1061 keyboard emulation NYI
3639	{ 2004, PrivMode_BracketPaste },	3657	{ 2004, PrivMode_BracketPaste },
3640	};	3658	};
3641		3659
…		…
3651	for (i = 0; i < nargs; i++)	3669	for (i = 0; i < nargs; i++)
3652	{	3670	{
3653	state = -1;	3671	state = -1;
3654		3672
3655	/* basic handling */	3673	/* basic handling */
3656	for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)	3674	for (j = 0; j < ecb_array_length (argtopriv); j++)
3657	if (argtopriv[j].argval == arg[i])	3675	if (argtopriv[j].argval == arg[i])
3658	{	3676	{
3659	state = privcases (mode, argtopriv[j].bit);	3677	state = privcases (mode, argtopriv[j].bit);
3660	break;	3678	break;
3661	}	3679	}
…		…
3687	case 2: /* VT52 mode */	3705	case 2: /* VT52 mode */
3688	/* oddball mode. should be set regardless of set/reset	3706	/* oddball mode. should be set regardless of set/reset
3689	* parameter. Return from VT52 mode with an ESC < from	3707	* parameter. Return from VT52 mode with an ESC < from
3690	* within VT52 mode	3708	* within VT52 mode
3691	*/	3709	*/
3692	set_privmode (PrivMode_vt52, 1);	3710	priv_modes \|= PrivMode_vt52;
3693	break;	3711	break;
3694	case 3: /* 80/132 */	3712	case 3: /* 80/132 */
3695	if (priv_modes & PrivMode_132OK)	3713	if (priv_modes & PrivMode_132OK)
3696	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3714	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3697	break;	3715	break;
…		…
3712	if (state) /* orthogonal */	3730	if (state) /* orthogonal */
3713	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3731	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3714	break;	3732	break;
3715	#ifdef scrollBar_esc	3733	#ifdef scrollBar_esc
3716	case scrollBar_esc:	3734	case scrollBar_esc:
3717	if (scrollBar.map (state))	3735	scrollBar.map (state);
3718	{
3719	resize_all_windows (0, 0, 0);	3736	resize_all_windows (0, 0, 0);
3720	scr_touch (true);	3737	scr_touch (true);
3721	}
3722	break;	3738	break;
3723	#endif	3739	#endif
3724	case 25: /* visible/invisible cursor */	3740	case 25: /* visible/invisible cursor */
3725	scr_cursor_visible (state);	3741	scr_cursor_visible (state);
3726	break;	3742	break;
…		…
3739	case 1003:	3755	case 1003:
3740	if (state)	3756	if (state)
3741	{	3757	{
3742	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);	3758	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
3743	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3759	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3760	mouse_row = mouse_col = 0;
3744	vt_emask_mouse = PointerMotionMask;	3761	vt_emask_mouse = PointerMotionMask;
3745	}	3762	}
3746	else	3763	else
3747	vt_emask_mouse = NoEventMask;	3764	vt_emask_mouse = NoEventMask;
3748		3765
…		…
3933	}	3950	}
3934	}	3951	}
3935	}	3952	}
3936	/}}} /	3953	/}}} /
3937		3954
3938	/{{{ (do not) process Rob Nation's own graphics mode sequences /
3939	void
3940	rxvt_term::process_graphics ()
3941	{
3942	unicode_t ch, cmd = cmd_getc ();
3943
3944	if (cmd == 'Q')
3945	{
3946	/* query graphics */
3947	tt_printf ("\033G0\012"); /* no graphics */
3948	return;
3949	}
3950	/* swallow other graphics sequences until terminating ':' */
3951	do
3952	ch = cmd_getc ();
3953	while (ch != ':');
3954	}
3955	/}}} /
3956
3957	/* ------------------------------------------------------------------------- */	3955	/* ------------------------------------------------------------------------- */
3958		3956
3959	/*	3957	/*
3960	* Send printf () formatted output to the command.	3958	* Send printf () formatted output to the command.
3961	* Only use for small amounts of data.	3959	* Only use for small amounts of data.
…		…
3974		3972
3975	/* ---------------------------------------------------------------------- */	3973	/* ---------------------------------------------------------------------- */
3976	/* Write data to the pty as typed by the user, pasted with the mouse,	3974	/* Write data to the pty as typed by the user, pasted with the mouse,
3977	* or generated by us in response to a query ESC sequence.	3975	* or generated by us in response to a query ESC sequence.
3978	*/	3976	*/
3979	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	3977	static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3980		3978
3981	void	3979	void
3982	rxvt_term::tt_write (const char *data, unsigned int len)	3980	rxvt_term::tt_write (const char *data, unsigned int len)
3983	{	3981	{
3984	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	3982	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
…		…
3989		3987
3990	if (v_buflen == 0)	3988	if (v_buflen == 0)
3991	{	3989	{
3992	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));	3990	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3993		3991
		3992	max_it (written, 0);
		3993
3994	if ((unsigned int)written == len)	3994	if (written == len)
3995	return;	3995	return;
3996		3996
3997	data += written;	3997	data += written;
3998	len -= written;	3998	len -= written;
3999	}	3999	}
4000		4000
4001	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	4001	v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4002		4002
4003	memcpy (v_buffer + v_buflen, data, len);	4003	memcpy (v_buffer + v_buflen, data, len);
4004	v_buflen += len;	4004	v_buflen += len;
4005		4005
4006	pty_ev.set (ev::READ \| ev::WRITE);	4006	pty_ev.set (ev::READ \| ev::WRITE);

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.458 by sf-exg, Thu Nov 18 17:28:12 2010 UTC vs. Revision 1.496 by sf-exg, Wed Aug 31 22:39:49 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.458 by sf-exg, Thu Nov 18 17:28:12 2010 UTC vs.
Revision 1.496 by sf-exg, Wed Aug 31 22:39:49 2011 UTC