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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.272 by root, Thu Jan 19 16:22:12 2006 UTC vs.
Revision 1.292 by root, Sun Jan 29 21:45:47 2006 UTC

…		…
64		64
65	/----------------------------------------------------------------------/	65	/----------------------------------------------------------------------/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68		68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71
72	#if ENABLE_FRILLS \|\| ISO_14755	69	#if ENABLE_FRILLS \|\| ISO_14755
73		70
74	#define ISO_14755_STARTED 0x80000000UL	71	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	72	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)	73	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	299	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	300	{
304	int ctrl, meta, shft, len;	301	int ctrl, meta, shft, len;
305	unsigned int newlen;	302	unsigned int newlen;
306	KeySym keysym;	303	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	304	int valid_keysym;
311	char kbuf[KBUFSZ];	305	char kbuf[KBUFSZ];
312		306
313	/*	307	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	308	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
905	{	899	{
906	const char ch = C0_ESC;	900	const char ch = C0_ESC;
907	tt_write (&ch, 1);	901	tt_write (&ch, 1);
908	}	902	}
909		903
910	#if defined(DEBUG_CMD)
911	/* Display keyboard buffer contents */
912	unsigned char *p;
913	int i;
914
915	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916	for (i = 0, p = kbuf; i < len; i++, p++)
917	fprintf (stderr, (p >= ' ' && p < '\177' ? "%c" : "\\%03o"), *p);
918	fprintf (stderr, "'\n");
919	#endif /* DEBUG_CMD */
920	tt_write (kbuf, (unsigned int)len);	904	tt_write (kbuf, (unsigned int)len);
921	}	905	}
922	/}}} /	906	/}}} /
923		907
924	#if defined (KEYSYM_RESOURCE)	908	#if defined (KEYSYM_RESOURCE)
…		…
1044	rxvt_term::cursor_blink_cb (time_watcher &w)	1028	rxvt_term::cursor_blink_cb (time_watcher &w)
1045	{	1029	{
1046	hidden_cursor = !hidden_cursor;	1030	hidden_cursor = !hidden_cursor;
1047	want_refresh = 1;	1031	want_refresh = 1;
1048		1032
1049	w.start (w.at + BLINK_INTERVAL);	1033	w.start (w.at + CURSOR_BLINK_INTERVAL);
1050	}	1034	}
1051	#endif	1035	#endif
1052		1036
1053	#ifdef TEXT_BLINK	1037	#ifdef TEXT_BLINK
1054	void	1038	void
…		…
1180	}	1164	}
1181		1165
1182	void	1166	void
1183	rxvt_term::pointer_unblank ()	1167	rxvt_term::pointer_unblank ()
1184	{	1168	{
1185	XDefineCursor (display->display, vt, TermWin_cursor);	1169	XDefineCursor (xdisp, vt, TermWin_cursor);
1186	recolour_cursor ();	1170	recolour_cursor ();
1187		1171
1188	#ifdef POINTER_BLANK	1172	#ifdef POINTER_BLANK
1189	hidden_pointer = 0;	1173	hidden_pointer = 0;
1190		1174
…		…
1198	rxvt_term::pointer_blank ()	1182	rxvt_term::pointer_blank ()
1199	{	1183	{
1200	if (!OPTION (Opt_pointerBlank))	1184	if (!OPTION (Opt_pointerBlank))
1201	return;	1185	return;
1202		1186
1203	XDefineCursor (display->display, vt, display->blank_cursor);	1187	XDefineCursor (xdisp, vt, display->blank_cursor);
1204	XFlush (display->display);	1188	XFlush (xdisp);
1205		1189
1206	hidden_pointer = 1;	1190	hidden_pointer = 1;
1207	}	1191	}
1208		1192
1209	void	1193	void
…		…
1282	(32 + button_number + key_state),	1266	(32 + button_number + key_state),
1283	(32 + x + 1),	1267	(32 + x + 1),
1284	(32 + y + 1));	1268	(32 + y + 1));
1285	}	1269	}
1286		1270
1287	#ifdef USING_W11LIB
1288	void
1289	rxvt_W11_process_x_event (XEvent *ev)
1290	{
1291	rxvt_t *r = rxvt_get_r ();
1292
1293	x_cb (*ev);
1294	}
1295	#endif
1296
1297	/{{{ process an X event /	1271	/{{{ process an X event /
1298	void	1272	void
1299	rxvt_term::x_cb (XEvent &ev)	1273	rxvt_term::x_cb (XEvent &ev)
1300	{	1274	{
1301	make_current ();	1275	make_current ();
1302		1276
1303	dDisp;	1277	dLocal (Display *, xdisp);
1304		1278
1305	if (ev.xany.window == vt	1279	if (ev.xany.window == vt
1306	&& SHOULD_INVOKE (HOOK_X_EVENT)	1280	&& SHOULD_INVOKE (HOOK_X_EVENT)
1307	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1281	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308	return;	1282	return;
…		…
1405	button_release (ev.xbutton);	1379	button_release (ev.xbutton);
1406	break;	1380	break;
1407		1381
1408	case ClientMessage:	1382	case ClientMessage:
1409	if (ev.xclient.format == 32	1383	if (ev.xclient.format == 32
1410	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1384	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411	{	1385	{
		1386	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1387	{
		1388	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1389	{
1412	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1390	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1391	{
		1392	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413	destroy ();	1393	destroy ();
		1394	}
1414	#if ENABLE_EWMH	1395	#if ENABLE_EWMH
1415	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1396	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416	XSendEvent (disp, ev.xclient.window = display->root,	1397	XSendEvent (xdisp, ev.xclient.window = display->root,
1417	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1398	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1418	&ev);	1399	&ev);
		1400	#endif
		1401	}
		1402	}
		1403	#if ENABLE_XEMBED
		1404	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1405	{
		1406	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1407	focus_in ();
		1408	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1409	focus_out ();
		1410	}
1419	#endif	1411	#endif
1420	}	1412	}
1421	#if ENABLE_XEMBED
1422	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423	{
1424	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425	focus_in ();
1426	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427	focus_out ();
1428	}
1429	#endif
1430	#ifdef OFFIX_DND
1431	/* OffiX Dnd (drag 'n' drop) protocol */
1432	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433	&& (ev.xclient.data.l[0] == DndFile
1434	\|\| ev.xclient.data.l[0] == DndDir
1435	\|\| ev.xclient.data.l[0] == DndLink))
1436	{
1437	/* Get Dnd data */
1438	Atom ActualType;
1439	int ActualFormat;
1440	unsigned char *data;
1441	unsigned long Size, RemainingBytes;
1442
1443	XGetWindowProperty (disp, display->root,
1444	xa[XA_DNDSELECTION],
1445	0L, 1000000L,
1446	False, AnyPropertyType,
1447	&ActualType, &ActualFormat,
1448	&Size, &RemainingBytes,
1449	&data);
1450	set_string_property (XA_CUT_BUFFER0, data);
1451	XFree (data);
1452	selection_paste (display->root, XA_CUT_BUFFER0, true);
1453	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454	}
1455	#endif /* OFFIX_DND */
1456	break;	1413	break;
1457		1414
1458	case MappingNotify:	1415	case MappingNotify:
1459	XRefreshKeyboardMapping (&ev.xmapping);	1416	XRefreshKeyboardMapping (&ev.xmapping);
1460	break;	1417	break;
…		…
1493	break;	1450	break;
1494		1451
1495	case ConfigureNotify:	1452	case ConfigureNotify:
1496	if (ev.xconfigure.window == parent[0])	1453	if (ev.xconfigure.window == parent[0])
1497	{	1454	{
1498	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1455	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1499	;	1456	;
1500		1457
1501	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1458	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1502	{	1459	{
1503	seen_resize = 1;	1460	seen_resize = 1;
…		…
1512	#endif	1469	#endif
1513	}	1470	}
1514	break;	1471	break;
1515		1472
1516	case PropertyNotify:	1473	case PropertyNotify:
		1474	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1475	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518	&& ev.xproperty.state == PropertyNewValue)	1476	&& ev.xproperty.state == PropertyNewValue)
1519	selection_property (ev.xproperty.window, ev.xproperty.atom);	1477	selection_property (ev.xproperty.window, ev.xproperty.atom);
1520		1478
1521	break;	1479	break;
1522		1480
1523	case SelectionClear:	1481	case SelectionClear:
1524	selection_clear ();	1482	selection_clear ();
…		…
1560	if (ev.xany.window == vt)	1518	if (ev.xany.window == vt)
1561	{	1519	{
1562	do	1520	do
1563	scr_expose (ev.xexpose.x, ev.xexpose.y,	1521	scr_expose (ev.xexpose.x, ev.xexpose.y,
1564	ev.xexpose.width, ev.xexpose.height, False);	1522	ev.xexpose.width, ev.xexpose.height, False);
1565	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1523	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1566		1524
1567	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1525	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568		1526
1569	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1527	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1570	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1571	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1572		1530
1573	want_refresh = 1;	1531	want_refresh = 1;
1574	}	1532	}
1575	else	1533	else
1576	{	1534	{
1577	XEvent unused_event;	1535	XEvent unused_event;
1578		1536
1579	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1537	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1580	;	1538	;
1581	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1539	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1582	;	1540	;
1583		1541
1584	if (isScrollbarWindow (ev.xany.window))	1542	if (isScrollbarWindow (ev.xany.window))
1585	{	1543	{
1586	scrollBar.setIdle ();	1544	scrollBar.setIdle ();
1587	scrollbar_show (0);	1545	scrollbar_show (0);
1588	}	1546	}
1589		1547
1590	#ifdef TRANSPARENT	1548	#ifdef TRANSPARENT
1591	if (am_transparent && ev.xany.window == parent[0])	1549	if (am_transparent && ev.xany.window == parent[0])
1592	XClearWindow (disp, ev.xany.window);	1550	XClearWindow (xdisp, ev.xany.window);
1593	#endif	1551	#endif
1594	}	1552	}
1595	break;	1553	break;
1596		1554
1597	case MotionNotify:	1555	case MotionNotify:
…		…
1607	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1565	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1566	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609	; // nop	1567	; // nop
1610	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1568	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1611	{	1569	{
1612	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1570	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1613	;	1571	;
1614		1572
1615	XQueryPointer (disp, vt,	1573	XQueryPointer (xdisp, vt,
1616	&unused_root, &unused_child,	1574	&unused_root, &unused_child,
1617	&unused_root_x, &unused_root_y,	1575	&unused_root_x, &unused_root_y,
1618	&ev.xbutton.x, &ev.xbutton.y,	1576	&ev.xbutton.x, &ev.xbutton.y,
1619	&ev.xbutton.state);	1577	&ev.xbutton.state);
1620	#ifdef MOUSE_THRESHOLD	1578	#ifdef MOUSE_THRESHOLD
…		…
1684	#endif	1642	#endif
1685	}	1643	}
1686	}	1644	}
1687	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1645	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688	{	1646	{
1689	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1647	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1690	MotionNotify, &ev))	1648	MotionNotify, &ev))
1691	;	1649	;
1692		1650
1693	XQueryPointer (disp, scrollBar.win,	1651	XQueryPointer (xdisp, scrollBar.win,
1694	&unused_root, &unused_child,	1652	&unused_root, &unused_child,
1695	&unused_root_x, &unused_root_y,	1653	&unused_root_x, &unused_root_y,
1696	&ev.xbutton.x, &ev.xbutton.y,	1654	&ev.xbutton.x, &ev.xbutton.y,
1697	&unused_mask);	1655	&unused_mask);
1698	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1656	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1713	{	1671	{
1714	hidden_cursor = 0;	1672	hidden_cursor = 0;
1715	want_refresh = 1;	1673	want_refresh = 1;
1716	}	1674	}
1717		1675
1718	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1676	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719	}	1677	}
1720	#endif	1678	#endif
1721		1679
1722	#if defined(POINTER_BLANK)	1680	#if defined(POINTER_BLANK)
1723	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1681	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1751	XSetICFocus (Input_Context);	1709	XSetICFocus (Input_Context);
1752	}	1710	}
1753	#endif	1711	#endif
1754	#if CURSOR_BLINK	1712	#if CURSOR_BLINK
1755	if (OPTION (Opt_cursorBlink))	1713	if (OPTION (Opt_cursorBlink))
1756	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1714	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1757	#endif	1715	#endif
1758	#if OFF_FOCUS_FADING	1716	#if OFF_FOCUS_FADING
1759	if (rs[Rs_fade])	1717	if (rs[Rs_fade])
1760	{	1718	{
1761	pix_colors = pix_colors_focused;	1719	pix_colors = pix_colors_focused;
…		…
1842	/*	1800	/*
1843	* VT window processing of button press	1801	* VT window processing of button press
1844	*/	1802	*/
1845	if (ev.window == vt)	1803	if (ev.window == vt)
1846	{	1804	{
		1805	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1806	return;
		1807
1847	#if ISO_14755	1808	#if ISO_14755
1848	// 5.4	1809	// 5.4
1849	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1810	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1850	{	1811	{
1851	iso14755_54 (ev.x, ev.y);	1812	iso14755_54 (ev.x, ev.y);
…		…
1893	else	1854	else
1894	{	1855	{
1895	if (ev.button != MEvent.button)	1856	if (ev.button != MEvent.button)
1896	MEvent.clicks = 0;	1857	MEvent.clicks = 0;
1897		1858
1898	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899	switch (ev.button)	1859	switch (ev.button)
1900	{	1860	{
1901	case Button1:	1861	case Button1:
1902	/* allow meta + click to select rectangular areas */	1862	/* allow meta + click to select rectangular areas */
1903	/* should be done in screen.C */	1863	/* should be done in screen.C */
1904	#if ENABLE_FRILLS	1864	#if ENABLE_FRILLS
1905	selection.rect = !!(ev.state & ModMetaMask);	1865	selection.rect = !!(ev.state & ModMetaMask);
1906	#else	1866	#else
1907	selection.rect = false;	1867	selection.rect = false;
1908	#endif	1868	#endif
1909		1869
1910	/* allow shift+left click to extend selection */	1870	/* allow shift+left click to extend selection */
1911	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1871	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912	{	1872	{
1913	if (MEvent.button == Button1 && clickintime)	1873	if (MEvent.button == Button1 && clickintime)
1914	selection_rotate (ev.x, ev.y);	1874	selection_rotate (ev.x, ev.y);
1915	else	1875	else
1916	selection_extend (ev.x, ev.y, 1);	1876	selection_extend (ev.x, ev.y, 1);
1917	}	1877	}
1918	else	1878	else
1919	{	1879	{
1920	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1921	MEvent.clicks++;	1881	MEvent.clicks++;
1922	else	1882	else
1923	MEvent.clicks = 1;	1883	MEvent.clicks = 1;
1924		1884
1925	selection_click (MEvent.clicks, ev.x, ev.y);	1885	selection_click (MEvent.clicks, ev.x, ev.y);
1926	}	1886	}
1927		1887
1928	MEvent.button = Button1;	1888	MEvent.button = Button1;
1929	break;	1889	break;
1930		1890
1931	case Button3:	1891	case Button3:
1932	if (MEvent.button == Button3 && clickintime)	1892	if (MEvent.button == Button3 && clickintime)
1933	selection_rotate (ev.x, ev.y);	1893	selection_rotate (ev.x, ev.y);
1934	else	1894	else
1935	selection_extend (ev.x, ev.y, 1);	1895	selection_extend (ev.x, ev.y, 1);
1936		1896
1937	MEvent.button = Button3;	1897	MEvent.button = Button3;
1938	break;	1898	break;
1939	}	1899	}
1940	}	1900	}
1941		1901
1942	MEvent.time = ev.time;	1902	MEvent.time = ev.time;
1943	return;	1903	return;
1944	}	1904	}
1945		1905
…		…
2108	sel_scroll_ev.stop();	2068	sel_scroll_ev.stop();
2109	#endif	2069	#endif
2110		2070
2111	if (ev.window == vt)	2071	if (ev.window == vt)
2112	{	2072	{
		2073	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2074	return;
		2075
2113	#if ISO_14755	2076	#if ISO_14755
2114	// 5.4	2077	// 5.4
2115	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2078	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2116	return;	2079	return;
2117	#endif	2080	#endif
		2081
2118	if (reportmode)	2082	if (reportmode)
2119	{	2083	{
2120	/* mouse report from vt window */	2084	/* mouse report from vt window */
2121	/* don't report release of wheel "buttons" */	2085	/* don't report release of wheel "buttons" */
2122	if (ev.button >= 4)	2086	if (ev.button >= 4)
…		…
2146	if (priv_modes & PrivMode_mouse_report	2110	if (priv_modes & PrivMode_mouse_report
2147	&& bypass_keystate	2111	&& bypass_keystate
2148	&& ev.button == Button1 && MEvent.clicks <= 1)	2112	&& ev.button == Button1 && MEvent.clicks <= 1)
2149	selection_extend (ev.x, ev.y, 0);	2113	selection_extend (ev.x, ev.y, 0);
2150		2114
2151	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152	return;
2153
2154	switch (ev.button)	2115	switch (ev.button)
2155	{	2116	{
2156	case Button1:	2117	case Button1:
2157	case Button3:	2118	case Button3:
2158	selection_make (ev.time);	2119	selection_make (ev.time);
2159	break;	2120	break;
2160		2121
2161	case Button2:	2122	case Button2:
2162	if (IN_RANGE_EXC (ev.x, 0, width)	2123	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163	&& IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2124	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2164	selection_request (ev.time);
2165
2166	break;	2125	break;
2167		2126
2168	#ifdef MOUSE_WHEEL	2127	#ifdef MOUSE_WHEEL
2169	case Button4:	2128	case Button4:
2170	case Button5:	2129	case Button5:
…		…
2212	#if TINTING	2171	#if TINTING
2213	/* taken from aterm-0.4.2 */	2172	/* taken from aterm-0.4.2 */
2214		2173
2215	typedef uint32_t RUINT32T;	2174	typedef uint32_t RUINT32T;
2216		2175
2217	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2176	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2218	{	2177	{
2219	int sh_r, sh_g, sh_b;	2178	int sh_r, sh_g, sh_b;
2220	RUINT32T mask_r, mask_g, mask_b;	2179	RUINT32T mask_r, mask_g, mask_b;
2221	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2180	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2222	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2181	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2223	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2182	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2224	int i;	2183	int i;
2225		2184
2226	Visual *visual = display->visual;	2185	Visual *visual = term->visual;
2227		2186
2228	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2187	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2229		2188
2230	/* for convenience */	2189	/* for convenience */
2231	mask_r = visual->red_mask;	2190	mask_r = visual->red_mask;
…		…
2452	Atom atype;	2411	Atom atype;
2453	unsigned char *prop = NULL;	2412	unsigned char *prop = NULL;
2454	Window root, oldp, *list;	2413	Window root, oldp, *list;
2455	Pixmap rootpixmap = None;	2414	Pixmap rootpixmap = None;
2456	XWindowAttributes wattr, wrootattr;	2415	XWindowAttributes wattr, wrootattr;
2457	dDisp;
2458		2416
2459	pchanged = 0;	2417	pchanged = 0;
2460		2418
2461	if (!OPTION (Opt_transparent))	2419	if (!OPTION (Opt_transparent))
2462	return pchanged; /* Don't try any more */	2420	return pchanged; /* Don't try any more */
2463		2421
2464	XGetWindowAttributes (disp, display->root, &wrootattr);	2422	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2465	rootdepth = wrootattr.depth;	2423	rootdepth = wrootattr.depth;
2466		2424
2467	XGetWindowAttributes (disp, parent[0], &wattr);	2425	XGetWindowAttributes (xdisp, parent[0], &wattr);
2468		2426
2469	if (rootdepth != wattr.depth)	2427	if (rootdepth != wattr.depth)
2470	{	2428	{
2471	if (am_transparent)	2429	if (am_transparent)
2472	{	2430	{
2473	pchanged = 1;	2431	pchanged = 1;
2474	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2432	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2475	am_transparent = am_pixmap_trans = 0;	2433	am_transparent = am_pixmap_trans = 0;
2476	}	2434	}
2477		2435
2478	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2479	}	2437	}
2480		2438
2481	/* Get all X ops out of the queue so that our information is up-to-date. */	2439	/* Get all X ops out of the queue so that our information is up-to-date. */
2482	XSync (disp, False);	2440	XSync (xdisp, False);
2483		2441
2484	/*	2442	/*
2485	* Make the frame window set by the window manager have	2443	* Make the frame window set by the window manager have
2486	* the root background. Some window managers put multiple nested frame	2444	* the root background. Some window managers put multiple nested frame
2487	* windows for each client, so we have to take care about that.	2445	* windows for each client, so we have to take care about that.
2488	*/	2446	*/
2489	i = (xa[XA_XROOTPMAP_ID]	2447	i = (xa[XA_XROOTPMAP_ID]
2490	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2448	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2491	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2449	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2492	&nitems, &bytes_after, &prop) == Success);	2450	&nitems, &bytes_after, &prop) == Success);
2493		2451
2494	if (!i \|\| prop == NULL)	2452	if (!i \|\| prop == NULL)
2495	i = (xa[XA_ESETROOT_PMAP_ID]	2453	i = (xa[XA_ESETROOT_PMAP_ID]
2496	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2454	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2497	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2455	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2498	&nitems, &bytes_after, &prop) == Success);	2456	&nitems, &bytes_after, &prop) == Success);
2499		2457
2500	if (!i \|\| prop == NULL	2458	if (!i \|\| prop == NULL
2501	#if TINTING	2459	#if TINTING
…		…
2520	Window cr;	2478	Window cr;
2521	XImage *image;	2479	XImage *image;
2522	GC gc;	2480	GC gc;
2523	XGCValues gcvalue;	2481	XGCValues gcvalue;
2524		2482
2525	XTranslateCoordinates (disp, parent[0], display->root,	2483	XTranslateCoordinates (xdisp, parent[0], display->root,
2526	0, 0, &sx, &sy, &cr);	2484	0, 0, &sx, &sy, &cr);
2527	nw = (unsigned int)szHint.width;	2485	nw = (unsigned int)szHint.width;
2528	nh = (unsigned int)szHint.height;	2486	nh = (unsigned int)szHint.height;
2529	nx = ny = 0;	2487	nx = ny = 0;
2530		2488
…		…
2543	}	2501	}
2544		2502
2545	min_it (nw, (unsigned int) (wrootattr.width - sx));	2503	min_it (nw, (unsigned int) (wrootattr.width - sx));
2546	min_it (nh, (unsigned int) (wrootattr.height - sy));	2504	min_it (nh, (unsigned int) (wrootattr.height - sy));
2547		2505
2548	XSync (disp, False);	2506	XSync (xdisp, False);
2549	allowedxerror = -1;	2507	allowedxerror = -1;
2550	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2508	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2551		2509
2552	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2510	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2553	/* XXX: may need a delay here? */	2511	/* XXX: may need a delay here? */
2554	allowedxerror = 0;	2512	allowedxerror = 0;
2555		2513
…		…
2558	if (am_transparent && am_pixmap_trans)	2516	if (am_transparent && am_pixmap_trans)
2559	{	2517	{
2560	pchanged = 1;	2518	pchanged = 1;
2561	if (pixmap != None)	2519	if (pixmap != None)
2562	{	2520	{
2563	XFreePixmap (disp, pixmap);	2521	XFreePixmap (xdisp, pixmap);
2564	pixmap = None;	2522	pixmap = None;
2565	}	2523	}
2566	}	2524	}
2567		2525
2568	am_pixmap_trans = 0;	2526	am_pixmap_trans = 0;
2569	}	2527	}
2570	else	2528	else
2571	{	2529	{
2572	if (pixmap != None)	2530	if (pixmap != None)
2573	XFreePixmap (disp, pixmap);	2531	XFreePixmap (xdisp, pixmap);
2574		2532
2575	#if TINTING	2533	#if TINTING
2576	if (ISSET_PIXCOLOR (Color_tint))	2534	if (ISSET_PIXCOLOR (Color_tint))
2577	{	2535	{
2578	unsigned short rm, gm, bm;	2536	rxvt_rgba c;
2579	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2537	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580		2538
2581	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2539	pix_colors_focused[Color_tint].get (this, c);
2582		2540
2583	ShadeXImage (display, image, shade, rm, gm, bm);	2541	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2584	}	2542	}
2585	#endif	2543	#endif
2586		2544
2587	pixmap = XCreatePixmap (disp, vt,	2545	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2588	szHint.width, szHint.height, image->depth);
2589	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2546	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2590	XPutImage (disp, pixmap, gc, image, 0, 0,	2547	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2591	nx, ny, image->width, image->height);	2548	nx, ny, image->width, image->height);
2592	XFreeGC (disp, gc);	2549	XFreeGC (xdisp, gc);
2593	XDestroyImage (image);	2550	XDestroyImage (image);
2594	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2551	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2595	XClearWindow (disp, parent[0]);	2552	XClearWindow (xdisp, parent[0]);
2596		2553
2597	if (!am_transparent \|\| !am_pixmap_trans)	2554	if (!am_transparent \|\| !am_pixmap_trans)
2598	pchanged = 1;	2555	pchanged = 1;
2599		2556
2600	am_transparent = am_pixmap_trans = 1;	2557	am_transparent = am_pixmap_trans = 1;
2601	}	2558	}
2602	}	2559	}
2603		2560
2604	if (am_pixmap_trans)	2561	if (am_pixmap_trans)
2605	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2562	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2606	else	2563	else
2607	{	2564	{
2608	unsigned int n;	2565	unsigned int n;
2609	/*	2566	/*
2610	* InheritPixmap transparency	2567	* InheritPixmap transparency
2611	*/	2568	*/
2612	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2569	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2613	{	2570	{
2614	oldp = parent[i];	2571	oldp = parent[i];
2615	XQueryTree (disp, parent[i - 1], &root,	2572	XQueryTree (xdisp, parent[i - 1], &root,
2616	&parent[i], &list, &n);	2573	&parent[i], &list, &n);
2617	XFree (list);	2574	XFree (list);
2618		2575
2619	if (parent[i] == display->root)	2576	if (parent[i] == display->root)
2620	{	2577	{
…		…
2632		2589
2633	if (pchanged)	2590	if (pchanged)
2634	{	2591	{
2635	for (; n < (unsigned int)i; n++)	2592	for (; n < (unsigned int)i; n++)
2636	{	2593	{
2637	XGetWindowAttributes (disp, parent[n], &wattr);	2594	XGetWindowAttributes (xdisp, parent[n], &wattr);
2638	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2595	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2639	{	2596	{
2640	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2597	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2641	break;	2598	break;
2642	}	2599	}
2643	}	2600	}
2644	}	2601	}
2645		2602
2646	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2603	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2647	{	2604	{
2648	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2605	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2649	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2606	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2650	am_transparent = 0;	2607	am_transparent = 0;
2651	/* XXX: also turn off Opt_transparent? */	2608	/* XXX: also turn off Opt_transparent? */
2652	}	2609	}
2653	else	2610	else
2654	{	2611	{
2655	#if WAIT_FOR_WM
2656	/* wait (an arbitrary period) for the WM to do its thing
2657	* needed for fvwm2.2.2 (and before?) */
2658	sleep (1);
2659	#endif
2660	for (n = 0; n < (unsigned int)i; n++)	2612	for (n = 0; n < (unsigned int)i; n++)
2661	{	2613	{
2662	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2614	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2663	XClearWindow (disp, parent[n]);	2615	XClearWindow (xdisp, parent[n]);
2664	}	2616	}
2665		2617
2666	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2618	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2667	am_transparent = 1;	2619	am_transparent = 1;
2668	}	2620	}
2669		2621
2670	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2622	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2671	parent[i] = None;	2623	parent[i] = None;
2672	}	2624	}
2673		2625
2674	if (scrollBar.win)	2626	if (scrollBar.win)
2675	{	2627	{
2676	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2628	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2677	scrollBar.setIdle ();	2629	scrollBar.setIdle ();
2678	scrollbar_show (0);	2630	scrollbar_show (0);
2679	}	2631	}
2680		2632
2681	if (am_transparent)	2633	if (am_transparent)
…		…
2827	return flag;	2779	return flag;
2828	}	2780	}
2829		2781
2830	// read the next character	2782	// read the next character
2831	wchar_t	2783	wchar_t
2832	rxvt_term::next_char ()	2784	rxvt_term::next_char () NOTHROW
2833	{	2785	{
2834	while (cmdbuf_ptr < cmdbuf_endp)	2786	while (cmdbuf_ptr < cmdbuf_endp)
2835	{	2787	{
2836	// assume 7-bit to be ascii ALWAYS	2788	// assume 7-bit to be ascii ALWAYS
2837	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2789	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2858	return NOCHAR;	2810	return NOCHAR;
2859	}	2811	}
2860		2812
2861	// read the next octet	2813	// read the next octet
2862	uint32_t	2814	uint32_t
2863	rxvt_term::next_octet ()	2815	rxvt_term::next_octet () NOTHROW
2864	{	2816	{
2865	return cmdbuf_ptr < cmdbuf_endp	2817	return cmdbuf_ptr < cmdbuf_endp
2866	? (unsigned char)*cmdbuf_ptr++	2818	? (unsigned char)*cmdbuf_ptr++
2867	: NOCHAR;	2819	: NOCHAR;
2868	}	2820	}
		2821
		2822	static class out_of_input out_of_input;
2869		2823
2870	/* rxvt_cmd_getc () - Return next input character */	2824	/* rxvt_cmd_getc () - Return next input character */
2871	/*	2825	/*
2872	* Return the next input character after first passing any keyboard input	2826	* Return the next input character after first passing any keyboard input
2873	* to the command.	2827	* to the command.
2874	*/	2828	*/
2875	wchar_t	2829	wchar_t
2876	rxvt_term::cmd_getc ()	2830	rxvt_term::cmd_getc () THROW ((class out_of_input))
2877	{	2831	{
2878	wchar_t c = next_char ();	2832	wchar_t c = next_char ();
2879		2833
2880	if (c == NOCHAR)	2834	if (c == NOCHAR)
2881	throw out_of_input;	2835	throw out_of_input;
2882		2836
2883	return c;	2837	return c;
2884	}	2838	}
2885		2839
2886	uint32_t	2840	uint32_t
2887	rxvt_term::cmd_get8 ()	2841	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2888	{	2842	{
2889	uint32_t c = next_octet ();	2843	uint32_t c = next_octet ();
2890		2844
2891	if (c == NOCHAR)	2845	if (c == NOCHAR)
2892	throw out_of_input;	2846	throw out_of_input;
…		…
3313	ndef = get_byte_array_bit (csi_defaults, i);	3267	ndef = get_byte_array_bit (csi_defaults, i);
3314	for (p = 0; p < nargs; p++)	3268	for (p = 0; p < nargs; p++)
3315	if (arg[p] == -1)	3269	if (arg[p] == -1)
3316	arg[p] = ndef;	3270	arg[p] = ndef;
3317		3271
3318	#ifdef DEBUG_CMD
3319	fprintf (stderr, "CSI ");
3320	for (p = 0; p < nargs; p++)
3321	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3322	fprintf (stderr, "%c\n", ch);
3323	#endif
3324
3325	/*	3272	/*
3326	* private mode handling	3273	* private mode handling
3327	*/	3274	*/
3328	if (priv)	3275	if (priv)
3329	{	3276	{
3330	switch (priv)	3277	switch (priv)
3331	{	3278	{
3332	case '>':	3279	case '>':
3333	if (ch == CSI_DA) /* secondary device attributes */	3280	if (ch == CSI_DA) /* secondary device attributes */
3334	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3281	{
		3282	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3283	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3284	//
		3285	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3286	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3287	// that we do not support xterm mouse reporting (should be 95 when we do).
		3288	//
		3289	tt_printf ("\033[>%d;94;0c", 'U');
		3290	}
3335	break;	3291	break;
3336	case '?':	3292	case '?':
3337	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3293	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3338	process_terminal_mode (ch, priv, nargs, arg);	3294	process_terminal_mode (ch, priv, nargs, arg);
3339	break;	3295	break;
…		…
3567	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3523	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3568	{	3524	{
3569	int x, y;	3525	int x, y;
3570	XWindowAttributes wattr;	3526	XWindowAttributes wattr;
3571	Window wdummy;	3527	Window wdummy;
3572	dDisp;	3528
		3529	dLocal (Display *, xdisp);
3573		3530
3574	if (nargs == 0)	3531	if (nargs == 0)
3575	return;	3532	return;
3576		3533
3577	switch (args[0])	3534	switch (args[0])
3578	{	3535	{
3579	/*	3536	/*
3580	* commands	3537	* commands
3581	*/	3538	*/
3582	case 1: /* deiconify window */	3539	case 1: /* deiconify window */
3583	XMapWindow (disp, parent[0]);	3540	XMapWindow (xdisp, parent[0]);
3584	break;	3541	break;
3585	case 2: /* iconify window */	3542	case 2: /* iconify window */
3586	XIconifyWindow (disp, parent[0], display->screen);	3543	XIconifyWindow (xdisp, parent[0], display->screen);
3587	break;	3544	break;
3588	case 3: /* set position (pixels) */	3545	case 3: /* set position (pixels) */
3589	XMoveWindow (disp, parent[0], args[1], args[2]);	3546	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3590	break;	3547	break;
3591	case 4: /* set size (pixels) */	3548	case 4: /* set size (pixels) */
3592	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3549	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3593	break;	3550	break;
3594	case 5: /* raise window */	3551	case 5: /* raise window */
3595	XRaiseWindow (disp, parent[0]);	3552	XRaiseWindow (xdisp, parent[0]);
3596	break;	3553	break;
3597	case 6: /* lower window */	3554	case 6: /* lower window */
3598	XLowerWindow (disp, parent[0]);	3555	XLowerWindow (xdisp, parent[0]);
3599	break;	3556	break;
3600	case 7: /* refresh window */	3557	case 7: /* refresh window */
3601	scr_touch (true);	3558	scr_touch (true);
3602	break;	3559	break;
3603	case 8: /* set size (chars) */	3560	case 8: /* set size (chars) */
…		…
3615		3572
3616	/*	3573	/*
3617	* reports - some output format copied from XTerm	3574	* reports - some output format copied from XTerm
3618	*/	3575	*/
3619	case 11: /* report window state */	3576	case 11: /* report window state */
3620	XGetWindowAttributes (disp, parent[0], &wattr);	3577	XGetWindowAttributes (xdisp, parent[0], &wattr);
3621	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3578	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3622	break;	3579	break;
3623	case 13: /* report window position */	3580	case 13: /* report window position */
3624	XGetWindowAttributes (disp, parent[0], &wattr);	3581	XGetWindowAttributes (xdisp, parent[0], &wattr);
3625	XTranslateCoordinates (disp, parent[0], wattr.root,	3582	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3626	-wattr.border_width, -wattr.border_width,	3583	-wattr.border_width, -wattr.border_width,
3627	&x, &y, &wdummy);	3584	&x, &y, &wdummy);
3628	tt_printf ("\033[3;%d;%dt", x, y);	3585	tt_printf ("\033[3;%d;%dt", x, y);
3629	break;	3586	break;
3630	case 14: /* report window size (pixels) */	3587	case 14: /* report window size (pixels) */
3631	XGetWindowAttributes (disp, parent[0], &wattr);	3588	XGetWindowAttributes (xdisp, parent[0], &wattr);
3632	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3589	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3633	break;	3590	break;
3634	case 18: /* report text area size (chars) */	3591	case 18: /* report text area size (chars) */
3635	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3592	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3636	break;	3593	break;
…		…
3638	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3595	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3639	break;	3596	break;
3640	case 20: /* report icon label */	3597	case 20: /* report icon label */
3641	{	3598	{
3642	char *s;	3599	char *s;
3643	XGetIconName (disp, parent[0], &s);	3600	XGetIconName (xdisp, parent[0], &s);
3644	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3601	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645	XFree (s);	3602	XFree (s);
3646	}	3603	}
3647	break;	3604	break;
3648	case 21: /* report window title */	3605	case 21: /* report window title */
3649	{	3606	{
3650	char *s;	3607	char *s;
3651	XFetchName (disp, parent[0], &s);	3608	XFetchName (xdisp, parent[0], &s);
3652	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3609	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3653	XFree (s);	3610	XFree (s);
3654	}	3611	}
3655	break;	3612	break;
3656	}	3613	}
…		…
3757	void	3714	void
3758	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3715	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3759	{	3716	{
3760	if (str[0] == '?' && !str[1])	3717	if (str[0] == '?' && !str[1])
3761	{	3718	{
3762	unsigned short r, g, b;	3719	rxvt_rgba c;
3763	pix_colors_focused[color].get (display, r, g, b);	3720	pix_colors_focused[color].get (this, c);
		3721
		3722	#if XFT
		3723	if (c.a != rxvt_rgba::MAX_CC)
		3724	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3725	else
		3726	#endif
3764	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3727	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3765	}	3728	}
3766	else	3729	else
3767	set_window_color (color, str);	3730	set_window_color (color, str);
3768	}	3731	}
3769		3732
…		…
3775	{	3738	{
3776	int color;	3739	int color;
3777	char buf, name;	3740	char buf, name;
3778	bool query = str[0] == '?' && !str[1];	3741	bool query = str[0] == '?' && !str[1];
3779	int saveop = op;	3742	int saveop = op;
3780	dDisp;	3743
		3744	dLocal (Display *, xdisp);
3781		3745
3782	assert (str != NULL);	3746	assert (str != NULL);
3783	switch (op)	3747	switch (op)
3784	{	3748	{
3785	case XTerm_name:	3749	case XTerm_name:
…		…
3801	unsigned long bytes_after;	3765	unsigned long bytes_after;
3802	unsigned char *value = 0;	3766	unsigned char *value = 0;
3803	const char *str = "";	3767	const char *str = "";
3804		3768
3805	if (prop	3769	if (prop
3806	&& XGetWindowProperty (disp, parent[0],	3770	&& XGetWindowProperty (xdisp, parent[0],
3807	prop, 0, 1<<16, 0, AnyPropertyType,	3771	prop, 0, 1<<16, 0, AnyPropertyType,
3808	&actual_type, &actual_format,	3772	&actual_type, &actual_format,
3809	&nitems, &bytes_after, &value) == Success	3773	&nitems, &bytes_after, &value) == Success
3810	&& actual_type != None	3774	&& actual_type != None
3811	&& actual_format == 8)	3775	&& actual_format == 8)
3812	str = (const char *)(value);	3776	str = (const char *)(value);
3813		3777
3814	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3778	tt_printf ("\033]%d;%s%c", op, str, resp);
3815		3779
3816	XFree (value);	3780	XFree (value);
3817	}	3781	}
3818	else	3782	else
3819	{	3783	{
…		…
3823	{	3787	{
3824	*eq = 0;	3788	*eq = 0;
3825	set_utf8_property (display->atom (str), eq + 1);	3789	set_utf8_property (display->atom (str), eq + 1);
3826	}	3790	}
3827	else	3791	else
3828	XDeleteProperty (disp, parent[0],	3792	XDeleteProperty (xdisp, parent[0],
3829	display->atom (str));	3793	display->atom (str));
3830	}	3794	}
3831	break;	3795	break;
3832		3796
3833	case XTerm_Color:	3797	case XTerm_Color:
…		…
3843	break;	3807	break;
3844		3808
3845	if ((buf = strchr (name, ';')) != NULL)	3809	if ((buf = strchr (name, ';')) != NULL)
3846	*buf++ = '\0';	3810	*buf++ = '\0';
3847		3811
3848	if (name[0] == '?' && !name[1])	3812	process_color_seq (op, color, name, resp);
3849	{
3850	unsigned short r, g, b;
3851	pix_colors_focused[color].get (display, r, g, b);
3852	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3853	}
3854	else
3855	set_window_color (color, name);
3856	}	3813	}
3857	break;	3814	break;
3858	case XTerm_Color00:	3815	case XTerm_Color00:
3859	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3816	process_color_seq (op, Color_fg, str, resp);
3860	break;	3817	break;
3861	case XTerm_Color01:	3818	case XTerm_Color01:
3862	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3819	process_color_seq (op, Color_bg, str, resp);
3863	break;	3820	break;
3864	#ifndef NO_CURSORCOLOR	3821	#ifndef NO_CURSORCOLOR
3865	case XTerm_Color_cursor:	3822	case XTerm_Color_cursor:
3866	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3823	process_color_seq (op, Color_cursor, str, resp);
3867	break;	3824	break;
3868	#endif	3825	#endif
3869	case XTerm_Color_pointer_fg:	3826	case XTerm_Color_pointer_fg:
3870	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3827	process_color_seq (op, Color_pointer_fg, str, resp);
3871	break;	3828	break;
3872	case XTerm_Color_pointer_bg:	3829	case XTerm_Color_pointer_bg:
3873	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3830	process_color_seq (op, Color_pointer_bg, str, resp);
3874	break;	3831	break;
3875	#ifndef NO_BOLD_UNDERLINE_REVERSE	3832	#ifndef NO_BOLD_UNDERLINE_REVERSE
3876	case XTerm_Color_RV:	3833	case XTerm_Color_RV:
3877	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3834	process_color_seq (op, Color_RV, str, resp);
3878	break;	3835	break;
3879	case Rxvt_Color_BD:	3836	case Rxvt_Color_BD:
3880	case URxvt_Color_BD:	3837	case URxvt_Color_BD:
3881	process_color_seq (op, Color_BD, str, resp);	3838	process_color_seq (op, Color_BD, str, resp);
3882	break;	3839	break;
3883	case Rxvt_Color_UL:	3840	case Rxvt_Color_UL:
3884	case URxvt_Color_UL:	3841	case URxvt_Color_UL:
3885	process_color_seq (op, Color_UL, str, resp);	3842	process_color_seq (op, Color_UL, str, resp);
3886	break;	3843	break;
3887	case URxvt_Color_IT:	3844	case URxvt_Color_IT:
3888	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3845	process_color_seq (op, Color_IT, str, resp);
3889	break;	3846	break;
3890	#endif	3847	#endif
3891	#if TRANSPARENT && TINTING	3848	#if TRANSPARENT && TINTING
3892	case URxvt_Color_tint:	3849	case URxvt_Color_tint:
3893	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3850	process_color_seq (op, Color_tint, str, resp);
3894	check_our_parents ();	3851	check_our_parents ();
3895	if (am_transparent)	3852	if (am_transparent)
3896	want_full_refresh = want_refresh = 1;	3853	want_full_refresh = want_refresh = 1;
3897	break;	3854	break;
3898	#endif	3855	#endif
…		…
3972	allocated.push_back ((void *)res);	3929	allocated.push_back ((void *)res);
3973	set_fonts ();	3930	set_fonts ();
3974	}	3931	}
3975	break;	3932	break;
3976		3933
		3934	case URxvt_version:
		3935	if (query)
		3936	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3937	op,
		3938	rs[Rs_name], VERSION[0], VERSION[2],
		3939	resp);
		3940	break;
		3941
3977	#if ENABLE_FRILLS	3942	#if ENABLE_FRILLS
3978	case URxvt_locale:	3943	case URxvt_locale:
3979	if (query)	3944	if (query)
3980	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3945	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3981	else	3946	else
3982	{	3947	{
3983	set_locale (str);	3948	set_locale (str);
3984	pty->set_utf8_mode (enc_utf8);	3949	pty->set_utf8_mode (enc_utf8);
3985	init_xlocale ();	3950	init_xlocale ();
…		…
4042	return state;	4007	return state;
4043	}	4008	}
4044		4009
4045	/* we're not using priv _yet_ */	4010	/* we're not using priv _yet_ */
4046	void	4011	void
4047	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4012	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4048	{	4013	{
4049	unsigned int i, j;	4014	unsigned int i, j;
4050	int state;	4015	int state;
4051		4016
4052	static const struct	4017	static const struct

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.272 by root, Thu Jan 19 16:22:12 2006 UTC vs. Revision 1.292 by root, Sun Jan 29 21:45:47 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.272 by root, Thu Jan 19 16:22:12 2006 UTC vs.
Revision 1.292 by root, Sun Jan 29 21:45:47 2006 UTC