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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.466 by sf-exg, Sat Dec 18 18:17:38 2010 UTC vs.
Revision 1.499 by root, Wed Nov 16 20:15:45 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	}
…		…
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	}
…		…
1081		1042
1082	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1043	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1083	void	1044	void
1084	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1045	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1085	{	1046	{
1086	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	1047	if ((scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
1087	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1048	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1088	{	1049	{
1089	want_refresh = 1;	1050	want_refresh = 1;
1090	refresh_check ();	1051	refresh_check ();
1091	}	1052	}
1092	else	1053	else
…		…
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;
…		…
1446	&& ev.xfocus.mode != NotifyGrab)	1440	&& ev.xfocus.mode != NotifyGrab)
1447	focus_out ();	1441	focus_out ();
1448	break;	1442	break;
1449		1443
1450	case ConfigureNotify:	1444	case ConfigureNotify:
1451	if (ev.xconfigure.window == parent[0])	1445	if (ev.xconfigure.window == parent)
1452	{	1446	{
1453	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1447	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1454	;	1448	;
1455		1449
1456	#ifdef HAVE_BG_PIXMAP	1450	#ifdef HAVE_BG_PIXMAP
1457	bool moved = false;	1451	bool moved = false;
1458	if (bgPixmap.window_position_sensitive ())	1452	if (bg_window_position_sensitive ())
1459	{	1453	{
1460	int x, y;	1454	int x, y;
1461	if (ev.xconfigure.send_event)	1455	if (ev.xconfigure.send_event)
1462	{	1456	{
1463	x = ev.xconfigure.x;	1457	x = ev.xconfigure.x;
1464	y = ev.xconfigure.y;	1458	y = ev.xconfigure.y;
1465	}	1459	}
1466	else	1460	else
1467	get_window_origin (x, y);	1461	get_window_origin (x, y);
1468		1462
1469	if (bgPixmap.set_position (x, y)	1463	if (bg_set_position (x, y)
1470	\|\| (bgPixmap.flags & bgPixmap_t::isInvalid))	1464	\|\| !(bg_flags & BG_IS_VALID))
1471	moved = true;	1465	moved = true;
1472	}	1466	}
1473	#endif	1467	#endif
1474		1468
1475	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1469	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
…		…
1479	}	1473	}
1480	else	1474	else
1481	{	1475	{
1482	#ifdef HAVE_BG_PIXMAP	1476	#ifdef HAVE_BG_PIXMAP
1483	if (moved)	1477	if (moved)
1484	{
1485	if (mapped)
1486	update_background ();	1478	update_background ();
1487	else
1488	bgPixmap.invalidate ();
1489	}
1490	#endif	1479	#endif
1491	}	1480	}
1492		1481
1493	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1482	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1494	}	1483	}
1495	break;	1484	break;
1496		1485
1497	case PropertyNotify:	1486	case PropertyNotify:
1498	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1487	HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1499	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1500	&& ev.xproperty.state == PropertyNewValue)
1501	selection_property (ev.xproperty.window, ev.xproperty.atom);
1502
1503	break;	1488	break;
1504		1489
1505	case SelectionClear:	1490	case SelectionClear:
1506	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);	1491	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1507	break;
1508
1509	case SelectionNotify:
1510	if (selection_wait == Sel_normal)
1511	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1512	break;	1492	break;
1513		1493
1514	case SelectionRequest:	1494	case SelectionRequest:
1515	selection_send (ev.xselectionrequest);	1495	selection_send (ev.xselectionrequest);
1516	break;	1496	break;
…		…
1527	* 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
1528	* bit of time for ConfigureNotifies to arrive.	1508	* bit of time for ConfigureNotifies to arrive.
1529	* 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
1530	* of ConfigureNotifys for the best results.	1510	* of ConfigureNotifys for the best results.
1531	*/	1511	*/
1532	if (bgPixmap.flags & bgPixmap_t::isInvalid)	1512	if (!(bg_flags & BG_IS_VALID))
1533	update_background_ev.start (0.025);	1513	update_background_ev.start (0.025);
1534	#endif	1514	#endif
1535	mapped = 1;	1515	mapped = 1;
1536	#ifdef TEXT_BLINK	1516	#ifdef TEXT_BLINK
1537	text_blink_ev.start ();	1517	text_blink_ev.start ();
…		…
1552	if (ev.xany.window == vt)	1532	if (ev.xany.window == vt)
1553	{	1533	{
1554	do	1534	do
1555	{	1535	{
1556	scr_expose (ev.xexpose.x, ev.xexpose.y,	1536	scr_expose (ev.xexpose.x, ev.xexpose.y,
1557	ev.xexpose.width, ev.xexpose.height, False);	1537	ev.xexpose.width, ev.xexpose.height, false);
1558	}	1538	}
1559	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1539	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1560		1540
1561	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1541	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1562		1542
1563	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1543	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1564	{	1544	{
1565	scr_expose (ev.xexpose.x, ev.xexpose.y,	1545	scr_expose (ev.xexpose.x, ev.xexpose.y,
1566	ev.xexpose.width, ev.xexpose.height, False);	1546	ev.xexpose.width, ev.xexpose.height, false);
1567	}	1547	}
1568		1548
1569	want_refresh = 1;	1549	want_refresh = 1;
1570	}	1550	}
1571	else	1551	else
…		…
1577	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1578	;	1558	;
1579		1559
1580	if (scrollBar.state && ev.xany.window == scrollBar.win)	1560	if (scrollBar.state && ev.xany.window == scrollBar.win)
1581	{	1561	{
1582	scrollBar.state = STATE_IDLE;	1562	scrollBar.state = SB_STATE_IDLE;
1583	scrollBar.show (0);	1563	scrollBar.show (0);
1584	}	1564	}
1585	}	1565	}
1586	break;	1566	break;
1587		1567
…		…
1675	#ifdef MOUSE_THRESHOLD	1655	#ifdef MOUSE_THRESHOLD
1676	}	1656	}
1677	#endif	1657	#endif
1678	}	1658	}
1679	}	1659	}
1680	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1660	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1681	{	1661	{
1682	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1662	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1683	MotionNotify, &ev))	1663	MotionNotify, &ev))
1684	;	1664	;
1685		1665
1686	XQueryPointer (dpy, scrollBar.win,	1666	XQueryPointer (dpy, scrollBar.win,
1687	&unused_root, &unused_child,	1667	&unused_root, &unused_child,
1688	&unused_root_x, &unused_root_y,	1668	&unused_root_x, &unused_root_y,
1689	&ev.xbutton.x, &ev.xbutton.y,	1669	&ev.xbutton.x, &ev.xbutton.y,
1690	&unused_mask);	1670	&unused_mask);
1691	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1671	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1692	scrollBar.size ());	1672	scrollBar.size ());
1693	want_refresh = 1;	1673	want_refresh = 1;
1694	scrollBar.show (1);	1674	scrollBar.show (1);
1695	}	1675	}
1696	break;	1676	break;
…		…
1731	rxvt_term::set_urgency (bool enable)	1711	rxvt_term::set_urgency (bool enable)
1732	{	1712	{
1733	if (enable == urgency_hint)	1713	if (enable == urgency_hint)
1734	return;	1714	return;
1735		1715
1736	if (XWMHints *h = XGetWMHints (dpy, parent[0]))	1716	if (XWMHints *h = XGetWMHints (dpy, parent))
1737	{	1717	{
1738	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1718	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1739	XSetWMHints (dpy, parent[0], h);	1719	XSetWMHints (dpy, parent, h);
1740	urgency_hint = enable;	1720	urgency_hint = enable;
		1721	XFree (h);
1741	}	1722	}
1742	}	1723	}
1743	#endif	1724	#endif
1744		1725
1745	void	1726	void
…		…
1751	want_refresh = 1;	1732	want_refresh = 1;
1752		1733
1753	#if USE_XIM	1734	#if USE_XIM
1754	if (Input_Context != NULL)	1735	if (Input_Context != NULL)
1755	{	1736	{
1756	IMSetPosition ();	1737	im_set_position ();
1757	XSetICFocus (Input_Context);	1738	XSetICFocus (Input_Context);
1758	}	1739	}
1759	#endif	1740	#endif
1760	#if CURSOR_BLINK	1741	#if CURSOR_BLINK
1761	if (option (Opt_cursorBlink))	1742	if (option (Opt_cursorBlink))
…		…
1852	* use the property to determine the pixmap. We use it later on.	1833	* use the property to determine the pixmap. We use it later on.
1853	*/	1834	*/
1854	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1835	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1855	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1836	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1856	{	1837	{
1857	bgPixmap.set_root_pixmap ();	1838	bg_set_root_pixmap ();
1858	update_background ();	1839	update_background ();
1859	}	1840	}
1860		1841
1861	break;	1842	break;
1862	}	1843	}
…		…
1992	if (scrollBar.upButton (ev.y))	1973	if (scrollBar.upButton (ev.y))
1993	direction = UP; /* up */	1974	direction = UP; /* up */
1994	else if (scrollBar.dnButton (ev.y))	1975	else if (scrollBar.dnButton (ev.y))
1995	direction = DN; /* down */	1976	direction = DN; /* down */
1996		1977
1997	scrollBar.state = STATE_IDLE;	1978	scrollBar.state = SB_STATE_IDLE;
1998	/*	1979	/*
1999	* Rxvt-style scrollbar:	1980	* Rxvt-style scrollbar:
2000	* move up if mouse is above slider	1981	* move up if mouse is above slider
2001	* move dn if mouse is below slider	1982	* move dn if mouse is below slider
2002	*	1983	*
…		…
2041	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2022	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2042	#endif	2023	#endif
2043	if (scr_page (direction, 1))	2024	if (scr_page (direction, 1))
2044	{	2025	{
2045	if (direction == UP)	2026	if (direction == UP)
2046	scrollBar.state = STATE_UP;	2027	scrollBar.state = SB_STATE_UP;
2047	else	2028	else
2048	scrollBar.state = STATE_DOWN;	2029	scrollBar.state = SB_STATE_DOWN;
2049	}	2030	}
2050	}	2031	}
2051	else	2032	else
2052	switch (ev.button)	2033	switch (ev.button)
2053	{	2034	{
2054	case Button2:	2035	case Button2:
2055	switch (scrollBar.align)	2036	switch (scrollBar.align)
2056	{	2037	{
2057	case R_SB_ALIGN_TOP:	2038	case SB_ALIGN_TOP:
2058	csrO = 0;	2039	csrO = 0;
2059	break;	2040	break;
2060	case R_SB_ALIGN_CENTRE:	2041	case SB_ALIGN_CENTRE:
2061	csrO = (scrollBar.bot - scrollBar.top) / 2;	2042	csrO = (scrollBar.bot - scrollBar.top) / 2;
2062	break;	2043	break;
2063	case R_SB_ALIGN_BOTTOM:	2044	case SB_ALIGN_BOTTOM:
2064	csrO = scrollBar.bot - scrollBar.top;	2045	csrO = scrollBar.bot - scrollBar.top;
2065	break;	2046	break;
2066	}	2047	}
2067		2048
2068	if (scrollBar.style == R_SB_XTERM	2049	if (scrollBar.style == SB_STYLE_XTERM
2069	\|\| scrollbar_above_slider (ev.y)	2050	\|\| scrollBar.above_slider (ev.y)
2070	\|\| scrollbar_below_slider (ev.y))	2051	\|\| scrollBar.below_slider (ev.y))
2071	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2052	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2072		2053
2073	scrollBar.state = STATE_MOTION;	2054	scrollBar.state = SB_STATE_MOTION;
2074	break;	2055	break;
2075		2056
2076	case Button1:	2057	case Button1:
2077	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2058	if (scrollBar.align == SB_ALIGN_CENTRE)
2078	csrO = ev.y - scrollBar.top;	2059	csrO = ev.y - scrollBar.top;
2079	/* FALLTHROUGH */	2060	/* FALLTHROUGH */
2080		2061
2081	case Button3:	2062	case Button3:
2082	if (scrollBar.style != R_SB_XTERM)	2063	if (scrollBar.style != SB_STYLE_XTERM)
2083	{	2064	{
2084	if (scrollbar_above_slider (ev.y))	2065	if (scrollBar.above_slider (ev.y))
2085	# ifdef RXVT_SCROLL_FULL	2066	# ifdef RXVT_SCROLL_FULL
2086	scr_page (UP, nrow - 1);	2067	scr_page (UP, nrow - 1);
2087	# else	2068	# else
2088	scr_page (UP, nrow / 4);	2069	scr_page (UP, nrow / 4);
2089	# endif	2070	# endif
2090	else if (scrollbar_below_slider (ev.y))	2071	else if (scrollBar.below_slider (ev.y))
2091	# ifdef RXVT_SCROLL_FULL	2072	# ifdef RXVT_SCROLL_FULL
2092	scr_page (DN, nrow - 1);	2073	scr_page (DN, nrow - 1);
2093	# else	2074	# else
2094	scr_page (DN, nrow / 4);	2075	scr_page (DN, nrow / 4);
2095	# endif	2076	# endif
2096	else	2077	else
2097	scrollBar.state = STATE_MOTION;	2078	scrollBar.state = SB_STATE_MOTION;
2098	}	2079	}
2099	else	2080	else
2100	{	2081	{
2101	scr_page ((ev.button == Button1 ? DN : UP),	2082	scr_page ((ev.button == Button1 ? DN : UP),
2102	(nrow	2083	(nrow
2103	* scrollbar_position (ev.y)	2084	* scrollBar.position (ev.y)
2104	/ scrollBar.size ()));	2085	/ scrollBar.size ()));
2105	}	2086	}
2106		2087
2107	break;	2088	break;
2108	}	2089	}
…		…
2119		2100
2120	csrO = 0; /* reset csr Offset */	2101	csrO = 0; /* reset csr Offset */
2121	if (!bypass_keystate)	2102	if (!bypass_keystate)
2122	reportmode = !! (priv_modes & PrivMode_mouse_report);	2103	reportmode = !! (priv_modes & PrivMode_mouse_report);
2123		2104
2124	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2105	if (scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
2125	{	2106	{
2126	scrollBar.state = STATE_IDLE;	2107	scrollBar.state = SB_STATE_IDLE;
2127	scrollBar.show (0);	2108	scrollBar.show (0);
2128	}	2109	}
2129		2110
2130	#ifdef SELECTION_SCROLLING	2111	#ifdef SELECTION_SCROLLING
2131	sel_scroll_ev.stop();	2112	sel_scroll_ev.stop();
…		…
2234	wchar_t ch = NOCHAR;	2215	wchar_t ch = NOCHAR;
2235	char *seq_begin; // remember start of esc-sequence here	2216	char *seq_begin; // remember start of esc-sequence here
2236		2217
2237	for (;;)	2218	for (;;)
2238	{	2219	{
2239	if (expect_false (ch == NOCHAR))	2220	if (ecb_unlikely (ch == NOCHAR))
2240	{	2221	{
2241	seq_begin = cmdbuf_ptr;	2222	seq_begin = cmdbuf_ptr;
2242	ch = next_char ();	2223	ch = next_char ();
2243		2224
2244	if (ch == NOCHAR)	2225	if (ch == NOCHAR)
2245	break;	2226	break;
2246	}	2227	}
2247		2228
2248	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))	2229	if (ecb_likely (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2249	{	2230	{
2250	if (expect_false (!seen_input))	2231	if (ecb_unlikely (!seen_input))
2251	{	2232	{
2252	seen_input = 1;	2233	seen_input = 1;
2253	// many badly-written programs (e.g. jed) contain a race condition:	2234	// many badly-written programs (e.g. jed) contain a race condition:
2254	// they first read the screensize and then install a SIGWINCH handler.	2235	// they first read the screensize and then install a SIGWINCH handler.
2255	// some window managers resize the window early, and these programs	2236	// some window managers resize the window early, and these programs
…		…
2268	wchar_t *str = buf;	2249	wchar_t *str = buf;
2269	wchar_t *eol = str + min (ncol, UBUFSIZ);	2250	wchar_t *eol = str + min (ncol, UBUFSIZ);
2270		2251
2271	for (;;)	2252	for (;;)
2272	{	2253	{
2273	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))	2254	if (ecb_unlikely (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2274	break;	2255	break;
2275		2256
2276	*str++ = ch;	2257	*str++ = ch;
2277		2258
2278	if (expect_false (ch == C0_LF \|\| str >= eol))	2259	if (ecb_unlikely (ch == C0_LF \|\| str >= eol))
2279	{	2260	{
2280	if (ch == C0_LF)	2261	if (ch == C0_LF)
2281	nlines++;	2262	nlines++;
2282		2263
2283	refresh_count++;	2264	refresh_count++;
…		…
2361	rxvt_term::next_char () NOTHROW	2342	rxvt_term::next_char () NOTHROW
2362	{	2343	{
2363	while (cmdbuf_ptr < cmdbuf_endp)	2344	while (cmdbuf_ptr < cmdbuf_endp)
2364	{	2345	{
2365	// assume 7-bit to be ascii ALWAYS	2346	// assume 7-bit to be ascii ALWAYS
2366	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))	2347	if (ecb_likely ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2367	return *cmdbuf_ptr++;	2348	return *cmdbuf_ptr++;
2368		2349
2369	wchar_t wc;	2350	wchar_t wc;
2370	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2351	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2371		2352
…		…
2399	: NOCHAR;	2380	: NOCHAR;
2400	}	2381	}
2401		2382
2402	static class out_of_input out_of_input;	2383	static class out_of_input out_of_input;
2403		2384
2404	/* rxvt_cmd_getc () - Return next input character */
2405	/*
2406	* Return the next input character after first passing any keyboard input
2407	* to the command.
2408	*/
2409	wchar_t	2385	wchar_t
2410	rxvt_term::cmd_getc () THROW ((class out_of_input))	2386	rxvt_term::cmd_getc () THROW ((class out_of_input))
2411	{	2387	{
2412	wchar_t c = next_char ();	2388	wchar_t c = next_char ();
2413		2389
…		…
2506	pclose_printer (fd);	2482	pclose_printer (fd);
2507	}	2483	}
2508	#endif /* PRINTPIPE */	2484	#endif /* PRINTPIPE */
2509	/}}} /	2485	/}}} /
2510		2486
2511	/* INDENT-OFF */
2512	enum {	2487	enum {
2513	C1_40 = 0x40,	2488	C1_40 = 0x40,
2514	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,	2489	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2515	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,	2490	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2516	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2491	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2517	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2492	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2518	};	2493	};
2519	/* INDENT-ON */
2520		2494
2521	/{{{ process non-printing single characters /	2495	/{{{ process non-printing single characters /
2522	void	2496	void
2523	rxvt_term::process_nonprinting (unicode_t ch)	2497	rxvt_term::process_nonprinting (unicode_t ch)
2524	{	2498	{
…		…
2617	break;	2591	break;
2618	case 'Z': /* identify the terminal type */	2592	case 'Z': /* identify the terminal type */
2619	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2593	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2620	break;	2594	break;
2621	case '<': /* turn off VT52 mode */	2595	case '<': /* turn off VT52 mode */
2622	set_privmode (PrivMode_vt52, 0);	2596	priv_modes &= ~PrivMode_vt52;
2623	break;	2597	break;
2624	case 'F': /* use special graphics character set */	2598	case 'F': /* use special graphics character set */
2625	case 'G': /* use regular character set */	2599	case 'G': /* use regular character set */
2626	/* unimplemented */	2600	/* unimplemented */
2627	break;	2601	break;
…		…
2646	return;	2620	return;
2647	}	2621	}
2648		2622
2649	switch (ch)	2623	switch (ch)
2650	{	2624	{
2651	/* case 1: do_tek_mode (); break; */
2652	case '#':	2625	case '#':
2653	if (cmd_getc () == '8')	2626	if (cmd_getc () == '8')
2654	scr_E ();	2627	scr_E ();
2655	break;	2628	break;
2656	case '(':	2629	case '(':
…		…
2679	#if !ENABLE_MINIMAL	2652	#if !ENABLE_MINIMAL
2680	case '9':	2653	case '9':
2681	scr_forwardindex ();	2654	scr_forwardindex ();
2682	break;	2655	break;
2683	#endif	2656	#endif
		2657	// DECPAM/DECPNM
2684	case '=':	2658	case '=':
		2659	priv_modes \|= PrivMode_aplKP;
		2660	break;
2685	case '>':	2661	case '>':
2686	set_privmode (PrivMode_aplKP, ch == '=');	2662	priv_modes &= ~PrivMode_aplKP;
2687	break;	2663	break;
2688		2664
2689	case C1_40:	2665	case C1_40:
2690	cmd_getc ();	2666	cmd_getc ();
2691	break;	2667	break;
…		…
2695		2671
2696	/* 8.3.87: NEXT LINE */	2672	/* 8.3.87: NEXT LINE */
2697	case C1_NEL: /* ESC E */	2673	case C1_NEL: /* ESC E */
2698	{	2674	{
2699	wchar_t nlcr[] = { C0_LF, C0_CR };	2675	wchar_t nlcr[] = { C0_LF, C0_CR };
2700	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);	2676	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2701	}	2677	}
2702	break;	2678	break;
2703		2679
2704	/* kidnapped escape sequence: Should be 8.3.48 */	2680	/* kidnapped escape sequence: Should be 8.3.48 */
2705	case C1_ESA: /* ESC G */	2681	case C1_ESA: /* ESC G */
2706	process_graphics ();	2682	// used by original rxvt for rob nations own graphics mode
		2683	if (cmd_getc () == 'Q')
		2684	tt_printf ("\033G0\012"); /* query graphics - no graphics */
2707	break;	2685	break;
2708		2686
2709	/* 8.3.63: CHARACTER TABULATION SET */	2687	/* 8.3.63: CHARACTER TABULATION SET */
2710	case C1_HTS: /* ESC H */	2688	case C1_HTS: /* ESC H */
2711	scr_set_tab (1);	2689	scr_set_tab (1);
…		…
2715	case C1_RI: /* ESC M */	2693	case C1_RI: /* ESC M */
2716	scr_index (DN);	2694	scr_index (DN);
2717	break;	2695	break;
2718		2696
2719	/* 8.3.142: SINGLE-SHIFT TWO */	2697	/* 8.3.142: SINGLE-SHIFT TWO */
2720	/case C1_SS2: scr_single_shift (2); break; /	2698	/* case C1_SS2: break; */
2721		2699
2722	/* 8.3.143: SINGLE-SHIFT THREE */	2700	/* 8.3.143: SINGLE-SHIFT THREE */
2723	/case C1_SS3: scr_single_shift (3); break; /	2701	/* case C1_SS3: break; */
2724		2702
2725	/* 8.3.27: DEVICE CONTROL STRING */	2703	/* 8.3.27: DEVICE CONTROL STRING */
2726	case C1_DCS: /* ESC P */	2704	case C1_DCS: /* ESC P */
2727	process_dcs_seq ();	2705	process_dcs_seq ();
2728	break;	2706	break;
…		…
2761	}	2739	}
2762	}	2740	}
2763	/}}} /	2741	/}}} /
2764		2742
2765	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /	2743	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /
2766	/* INDENT-OFF */
2767	enum {	2744	enum {
2768	CSI_ICH = 0x40,	2745	CSI_ICH = 0x40,
2769	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,	2746	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2770	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,	2747	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2771	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,	2748	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
…		…
2791	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */	2768	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2792	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2769	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2793	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2770	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2794	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2771	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2795	};	2772	};
2796	/* INDENT-ON */
2797		2773
2798	void	2774	void
2799	rxvt_term::process_csi_seq ()	2775	rxvt_term::process_csi_seq ()
2800	{	2776	{
2801	unicode_t ch, priv, i;	2777	unicode_t ch, priv, i;
…		…
2881	scr_soft_reset ();	2857	scr_soft_reset ();
2882		2858
2883	static const int pm_h[] = { 7, 25 };	2859	static const int pm_h[] = { 7, 25 };
2884	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };	2860	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2885		2861
2886	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);	2862	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2887	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);	2863	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2888	}	2864	}
2889	break;	2865	break;
2890	}	2866	}
2891		2867
2892	return;	2868	return;
…		…
2910	}	2886	}
2911	break;	2887	break;
2912	#endif	2888	#endif
2913		2889
2914	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2890	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2915	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2891	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2916	arg[0] = -arg[0];	2892	arg[0] = -arg[0];
2917	/* FALLTHROUGH */	2893	/* FALLTHROUGH */
2918	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2894	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2919	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2895	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2920	scr_gotorc (arg[0], 0, RELATIVE);	2896	scr_gotorc (arg[0], 0, RELATIVE);
2921	break;	2897	break;
2922		2898
2923	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2899	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2924	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2900	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3111	}	3087	}
3112	}	3088	}
3113	/}}} /	3089	/}}} /
3114		3090
3115	#if !ENABLE_MINIMAL	3091	#if !ENABLE_MINIMAL
3116	/* ARGSUSED */
3117	void	3092	void
3118	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3093	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3119	{	3094	{
3120	int x, y;	3095	int x, y;
3121	XWindowAttributes wattr;	3096	XWindowAttributes wattr;
…		…
3130	{	3105	{
3131	/*	3106	/*
3132	* commands	3107	* commands
3133	*/	3108	*/
3134	case 1: /* deiconify window */	3109	case 1: /* deiconify window */
3135	XMapWindow (dpy, parent[0]);	3110	XMapWindow (dpy, parent);
3136	break;	3111	break;
3137	case 2: /* iconify window */	3112	case 2: /* iconify window */
3138	XIconifyWindow (dpy, parent[0], display->screen);	3113	XIconifyWindow (dpy, parent, display->screen);
3139	break;	3114	break;
3140	case 3: /* set position (pixels) */	3115	case 3: /* set position (pixels) */
3141	XMoveWindow (dpy, parent[0], args[1], args[2]);	3116	XMoveWindow (dpy, parent, args[1], args[2]);
3142	break;	3117	break;
3143	case 4: /* set size (pixels) */	3118	case 4: /* set size (pixels) */
3144	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3119	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3145	break;	3120	break;
3146	case 5: /* raise window */	3121	case 5: /* raise window */
3147	XRaiseWindow (dpy, parent[0]);	3122	XRaiseWindow (dpy, parent);
3148	break;	3123	break;
3149	case 6: /* lower window */	3124	case 6: /* lower window */
3150	XLowerWindow (dpy, parent[0]);	3125	XLowerWindow (dpy, parent);
3151	break;	3126	break;
3152	case 7: /* refresh window */	3127	case 7: /* refresh window */
3153	scr_touch (true);	3128	scr_touch (true);
3154	break;	3129	break;
3155	case 8: /* set size (chars) */	3130	case 8: /* set size (chars) */
…		…
3166		3141
3167	/*	3142	/*
3168	* reports - some output format copied from XTerm	3143	* reports - some output format copied from XTerm
3169	*/	3144	*/
3170	case 11: /* report window state */	3145	case 11: /* report window state */
3171	XGetWindowAttributes (dpy, parent[0], &wattr);	3146	XGetWindowAttributes (dpy, parent, &wattr);
3172	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3147	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3173	break;	3148	break;
3174	case 13: /* report window position */	3149	case 13: /* report window position */
3175	XGetWindowAttributes (dpy, parent[0], &wattr);	3150	XGetWindowAttributes (dpy, parent, &wattr);
3176	XTranslateCoordinates (dpy, parent[0], wattr.root,	3151	XTranslateCoordinates (dpy, parent, wattr.root,
3177	-wattr.border_width, -wattr.border_width,	3152	-wattr.border_width, -wattr.border_width,
3178	&x, &y, &wdummy);	3153	&x, &y, &wdummy);
3179	tt_printf ("\033[3;%d;%dt", x, y);	3154	tt_printf ("\033[3;%d;%dt", x, y);
3180	break;	3155	break;
3181	case 14: /* report window size (pixels) */	3156	case 14: /* report window size (pixels) */
3182	XGetWindowAttributes (dpy, parent[0], &wattr);	3157	XGetWindowAttributes (dpy, parent, &wattr);
3183	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3158	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3184	break;	3159	break;
3185	case 18: /* report text area size (chars) */	3160	case 18: /* report text area size (chars) */
3186	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3161	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3187	break;	3162	break;
…		…
3189	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3164	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3190	break;	3165	break;
3191	case 20: /* report icon label */	3166	case 20: /* report icon label */
3192	{	3167	{
3193	char *s;	3168	char *s;
3194	XGetIconName (dpy, parent[0], &s);	3169	XGetIconName (dpy, parent, &s);
3195	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3170	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3196	XFree (s);	3171	XFree (s);
3197	}	3172	}
3198	break;	3173	break;
3199	case 21: /* report window title */	3174	case 21: /* report window title */
3200	{	3175	{
3201	char *s;	3176	char *s;
3202	XFetchName (dpy, parent[0], &s);	3177	XFetchName (dpy, parent, &s);
3203	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3178	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3204	XFree (s);	3179	XFree (s);
3205	}	3180	}
3206	break;	3181	break;
3207	}	3182	}
…		…
3361	unsigned long bytes_after;	3336	unsigned long bytes_after;
3362	unsigned char *value = 0;	3337	unsigned char *value = 0;
3363	const char *str = "";	3338	const char *str = "";
3364		3339
3365	if (prop	3340	if (prop
3366	&& XGetWindowProperty (dpy, parent[0],	3341	&& XGetWindowProperty (dpy, parent,
3367	prop, 0, 1<<16, 0, AnyPropertyType,	3342	prop, 0, 1<<16, 0, AnyPropertyType,
3368	&actual_type, &actual_format,	3343	&actual_type, &actual_format,
3369	&nitems, &bytes_after, &value) == Success	3344	&nitems, &bytes_after, &value) == Success
3370	&& actual_type != None	3345	&& actual_type != None
3371	&& actual_format == 8)	3346	&& actual_format == 8)
…		…
3383	{	3358	{
3384	*eq = 0;	3359	*eq = 0;
3385	set_utf8_property (display->atom (str), eq + 1);	3360	set_utf8_property (display->atom (str), eq + 1);
3386	}	3361	}
3387	else	3362	else
3388	XDeleteProperty (dpy, parent[0],	3363	XDeleteProperty (dpy, parent,
3389	display->atom (str));	3364	display->atom (str));
3390	}	3365	}
3391	break;	3366	break;
3392		3367
3393	case XTerm_Color:	3368	case XTerm_Color:
…		…
3454	process_color_seq (op, Color_tint, str, resp);	3429	process_color_seq (op, Color_tint, str, resp);
3455	{	3430	{
3456	bool changed = false;	3431	bool changed = false;
3457		3432
3458	if (ISSET_PIXCOLOR (Color_tint))	3433	if (ISSET_PIXCOLOR (Color_tint))
3459	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3434	changed = bg_set_tint (pix_colors_focused [Color_tint]);
3460	else
3461	changed = bgPixmap.unset_tint ();
3462		3435
3463	if (changed)	3436	if (changed)
3464	update_background ();	3437	update_background ();
3465	}	3438	}
3466		3439
…		…
3472	if (!strcmp (str, "?"))	3445	if (!strcmp (str, "?"))
3473	{	3446	{
3474	char str[256];	3447	char str[256];
3475		3448
3476	sprintf (str, "[%dx%d+%d+%d]",	3449	sprintf (str, "[%dx%d+%d+%d]",
3477	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3450	min (h_scale, 32767), min (v_scale, 32767),
3478	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3451	min (h_align, 32767), min (v_align, 32767));
3479	process_xterm_seq (XTerm_title, str, CHAR_ST);	3452	process_xterm_seq (XTerm_title, str, CHAR_ST);
3480	}	3453	}
3481	else	3454	else
3482	{	3455	{
3483	int changed = 0;	3456	bool changed = false;
3484		3457
3485	if (*str != ';')	3458	if (*str != ';')
3486	{	3459	{
3487	if (bgPixmap.set_file (str)) /* change pixmap */	3460	if (bg_set_file (str)) /* change pixmap */
3488	{
3489	changed++;	3461	changed = true;
3490	str = strchr (str, ';');
3491	if (str == NULL)
3492	bgPixmap.set_defaultGeometry ();
3493	else
3494	bgPixmap.set_geometry (str+1);
3495	}
3496	}	3462	}
3497	else	3463	else
3498	{	3464	{
3499	str++;	3465	str++;
3500	if (bgPixmap.set_geometry (str, true))	3466	if (bg_set_geometry (str, true))
3501	changed++;	3467	changed = true;
3502	}	3468	}
3503		3469
3504	if (changed)	3470	if (changed)
3505	{	3471	{
3506	if (bgPixmap.window_position_sensitive ())	3472	if (bg_window_position_sensitive ())
3507	{	3473	{
3508	int x, y;	3474	int x, y;
3509	get_window_origin (x, y);	3475	get_window_origin (x, y);
3510	bgPixmap.set_position (x, y);	3476	bg_set_position (x, y);
3511	}	3477	}
3512	update_background ();	3478	update_background ();
3513	}	3479	}
3514	}	3480	}
3515	break;	3481	break;
…		…
3622	if (mode == 'r')	3588	if (mode == 'r')
3623	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3589	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3624	else	3590	else
3625	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3591	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3626		3592
3627	set_privmode (bit, state);	3593	if (state)
		3594	priv_modes \|= bit;
		3595	else
		3596	priv_modes &= ~bit;
3628	}	3597	}
3629		3598
3630	return state;	3599	return state;
3631	}	3600	}
3632		3601
3633	/* we're not using priv _yet_ */	3602	/* we're not using priv _yet_ */
3634	void	3603	void
3635	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3604	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3636	{	3605	{
3637	unsigned int i, j;	3606	unsigned int i, j;
3638	int state;	3607	int state;
3639		3608
3640	static const struct	3609	static const struct
3641	{	3610	{
3642	const int argval;	3611	const int argval;
3643	const unsigned long bit;	3612	const unsigned long bit;
3644	} argtopriv[] = {	3613	} argtopriv[] = {
3645	{ 1, PrivMode_aplCUR }, // DECCKM	3614	{ 1, PrivMode_aplCUR }, // DECCKM
3646	{ 2, PrivMode_vt52 },	3615	{ 2, PrivMode_vt52 }, // DECANM
3647	{ 3, PrivMode_132 }, // DECCOLM	3616	{ 3, PrivMode_132 }, // DECCOLM
3648	{ 4, PrivMode_smoothScroll }, // DECSCLM	3617	{ 4, PrivMode_smoothScroll }, // DECSCLM
3649	{ 5, PrivMode_rVideo }, // DECSCNM	3618	{ 5, PrivMode_rVideo }, // DECSCNM
3650	{ 6, PrivMode_relOrigin }, // DECOM	3619	{ 6, PrivMode_relOrigin }, // DECOM
3651	{ 7, PrivMode_Autowrap }, // DECAWM	3620	{ 7, PrivMode_Autowrap }, // DECAWM
3652	// 8, auto-repeat keys // DECARM	3621	// 8, auto-repeat keys // DECARM
3653	{ 9, PrivMode_MouseX10 },	3622	{ 9, PrivMode_MouseX10 },
3654	// 18 end FF to printer after print screen	3623	// 18 end FF to printer after print screen
3655	// 19 Print screen prints full screen/scroll region	3624	// 19 Print screen prints full screen/scroll region
3656	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3625	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3657	#ifdef scrollBar_esc	3626	#ifdef scrollBar_esc
3658	{ scrollBar_esc, PrivMode_scrollBar },	3627	{ scrollBar_esc, PrivMode_scrollBar },
3659	#endif	3628	#endif
3660	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3629	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3661	// 38, tektronix mode // DECTEK	3630	// 38, tektronix mode // DECTEK
3662	{ 40, PrivMode_132OK },	3631	{ 40, PrivMode_132OK },
3663	// 41 xterm more fixes NYI	3632	// 41 xterm more fixes NYI
3664	// 45 margin bell NYI	3633	// 45 margin bell NYI
3665	// 46 start logging	3634	// 46 start logging
3666	{ 47, PrivMode_Screen },	3635	{ 47, PrivMode_Screen },
3667	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3636	{ 66, PrivMode_aplKP }, // DECNKM
3668	#ifndef NO_BACKSPACE_KEY	3637	#ifndef NO_BACKSPACE_KEY
3669	{ 67, PrivMode_BackSpace }, // DECBKM	3638	{ 67, PrivMode_BackSpace }, // DECBKM
3670	#endif	3639	#endif
3671	{ 1000, PrivMode_MouseX11 },	3640	{ 1000, PrivMode_MouseX11 },
3672	{ 1002, PrivMode_MouseBtnEvent },	3641	{ 1002, PrivMode_MouseBtnEvent },
…		…
3701	for (i = 0; i < nargs; i++)	3670	for (i = 0; i < nargs; i++)
3702	{	3671	{
3703	state = -1;	3672	state = -1;
3704		3673
3705	/* basic handling */	3674	/* basic handling */
3706	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)	3675	for (j = 0; j < ecb_array_length (argtopriv); j++)
3707	if (argtopriv[j].argval == arg[i])	3676	if (argtopriv[j].argval == arg[i])
3708	{	3677	{
3709	state = privcases (mode, argtopriv[j].bit);	3678	state = privcases (mode, argtopriv[j].bit);
3710	break;	3679	break;
3711	}	3680	}
…		…
3737	case 2: /* VT52 mode */	3706	case 2: /* VT52 mode */
3738	/* oddball mode. should be set regardless of set/reset	3707	/* oddball mode. should be set regardless of set/reset
3739	* parameter. Return from VT52 mode with an ESC < from	3708	* parameter. Return from VT52 mode with an ESC < from
3740	* within VT52 mode	3709	* within VT52 mode
3741	*/	3710	*/
3742	set_privmode (PrivMode_vt52, 1);	3711	priv_modes \|= PrivMode_vt52;
3743	break;	3712	break;
3744	case 3: /* 80/132 */	3713	case 3: /* 80/132 */
3745	if (priv_modes & PrivMode_132OK)	3714	if (priv_modes & PrivMode_132OK)
3746	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3715	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3747	break;	3716	break;
…		…
3762	if (state) /* orthogonal */	3731	if (state) /* orthogonal */
3763	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3732	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3764	break;	3733	break;
3765	#ifdef scrollBar_esc	3734	#ifdef scrollBar_esc
3766	case scrollBar_esc:	3735	case scrollBar_esc:
3767	if (scrollBar.map (state))	3736	scrollBar.map (state);
3768	{
3769	resize_all_windows (0, 0, 0);	3737	resize_all_windows (0, 0, 0);
3770	scr_touch (true);	3738	scr_touch (true);
3771	}
3772	break;	3739	break;
3773	#endif	3740	#endif
3774	case 25: /* visible/invisible cursor */	3741	case 25: /* visible/invisible cursor */
3775	scr_cursor_visible (state);	3742	scr_cursor_visible (state);
3776	break;	3743	break;
…		…
3984	}	3951	}
3985	}	3952	}
3986	}	3953	}
3987	/}}} /	3954	/}}} /
3988		3955
3989	/{{{ (do not) process Rob Nation's own graphics mode sequences /
3990	void
3991	rxvt_term::process_graphics ()
3992	{
3993	unicode_t ch, cmd = cmd_getc ();
3994
3995	if (cmd == 'Q')
3996	{
3997	/* query graphics */
3998	tt_printf ("\033G0\012"); /* no graphics */
3999	return;
4000	}
4001	/* swallow other graphics sequences until terminating ':' */
4002	do
4003	ch = cmd_getc ();
4004	while (ch != ':');
4005	}
4006	/}}} /
4007
4008	/* ------------------------------------------------------------------------- */	3956	/* ------------------------------------------------------------------------- */
4009		3957
4010	/*	3958	/*
4011	* Send printf () formatted output to the command.	3959	* Send printf () formatted output to the command.
4012	* Only use for small amounts of data.	3960	* Only use for small amounts of data.
…		…
4040		3988
4041	if (v_buflen == 0)	3989	if (v_buflen == 0)
4042	{	3990	{
4043	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));	3991	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4044		3992
		3993	max_it (written, 0);
		3994
4045	if ((unsigned int)written == len)	3995	if (written == len)
4046	return;	3996	return;
4047		3997
4048	data += written;	3998	data += written;
4049	len -= written;	3999	len -= written;
4050	}	4000	}
4051		4001
4052	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	4002	v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4053		4003
4054	memcpy (v_buffer + v_buflen, data, len);	4004	memcpy (v_buffer + v_buflen, data, len);
4055	v_buflen += len;	4005	v_buflen += len;
4056		4006
4057	pty_ev.set (ev::READ \| ev::WRITE);	4007	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.466 by sf-exg, Sat Dec 18 18:17:38 2010 UTC vs. Revision 1.499 by root, Wed Nov 16 20:15:45 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.466 by sf-exg, Sat Dec 18 18:17:38 2010 UTC vs.
Revision 1.499 by root, Wed Nov 16 20:15:45 2011 UTC