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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.275 by root, Fri Jan 20 10:35:25 2006 UTC vs.
Revision 1.299 by root, Tue Jan 31 19:11:43 2006 UTC

…		…
227	# if !UNICODE3	227	# if !UNICODE3
228	if (ch >= 0x10000)	228	if (ch >= 0x10000)
229	ch = 0xfffd;	229	ch = 0xfffd;
230	# endif	230	# endif
231	scr_overlay_set (11, y, ch, r);	231	scr_overlay_set (11, y, ch, r);
		232
		233	if (WCWIDTH (ch) >= 2)
232	scr_overlay_set (12, y, NOCHAR, r);	234	scr_overlay_set (12, y, NOCHAR, r);
233	}	235	}
234		236
		237	// {
		238	// char buf[4+4+3+1];
		239	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
		240	// scr_overlay_set (0, 0, buf);
		241	// }
235	scr_overlay_set (0, len , attr);	242	scr_overlay_set (0, len , attr);
236	scr_overlay_set (0, len + 1, fname);	243	scr_overlay_set (0, len + 1, fname);
237		244
238	free (fname);	245	free (fname);
239		246
…		…
299	rxvt_term::lookup_key (XKeyEvent &ev)	306	rxvt_term::lookup_key (XKeyEvent &ev)
300	{	307	{
301	int ctrl, meta, shft, len;	308	int ctrl, meta, shft, len;
302	unsigned int newlen;	309	unsigned int newlen;
303	KeySym keysym;	310	KeySym keysym;
304	#ifdef DEBUG_CMD
305	static int debug_key = 1; /* accessible by a debugger only */
306	#endif
307	int valid_keysym;	311	int valid_keysym;
308	char kbuf[KBUFSZ];	312	char kbuf[KBUFSZ];
309		313
310	/*	314	/*
311	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	315	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
902	{	906	{
903	const char ch = C0_ESC;	907	const char ch = C0_ESC;
904	tt_write (&ch, 1);	908	tt_write (&ch, 1);
905	}	909	}
906		910
907	#if defined(DEBUG_CMD)
908	/* Display keyboard buffer contents */
909	unsigned char *p;
910	int i;
911
912	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913	for (i = 0, p = kbuf; i < len; i++, p++)
914	fprintf (stderr, (p >= ' ' && p < '\177' ? "%c" : "\\%03o"), *p);
915	fprintf (stderr, "'\n");
916	#endif /* DEBUG_CMD */
917	tt_write (kbuf, (unsigned int)len);	911	tt_write (kbuf, (unsigned int)len);
918	}	912	}
919	/}}} /	913	/}}} /
920		914
921	#if defined (KEYSYM_RESOURCE)	915	#if defined (KEYSYM_RESOURCE)
…		…
1177	}	1171	}
1178		1172
1179	void	1173	void
1180	rxvt_term::pointer_unblank ()	1174	rxvt_term::pointer_unblank ()
1181	{	1175	{
1182	XDefineCursor (display->display, vt, TermWin_cursor);	1176	XDefineCursor (xdisp, vt, TermWin_cursor);
1183	recolour_cursor ();	1177	recolour_cursor ();
1184		1178
1185	#ifdef POINTER_BLANK	1179	#ifdef POINTER_BLANK
1186	hidden_pointer = 0;	1180	hidden_pointer = 0;
1187		1181
…		…
1195	rxvt_term::pointer_blank ()	1189	rxvt_term::pointer_blank ()
1196	{	1190	{
1197	if (!OPTION (Opt_pointerBlank))	1191	if (!OPTION (Opt_pointerBlank))
1198	return;	1192	return;
1199		1193
1200	XDefineCursor (display->display, vt, display->blank_cursor);	1194	XDefineCursor (xdisp, vt, display->blank_cursor);
1201	XFlush (display->display);	1195	XFlush (xdisp);
1202		1196
1203	hidden_pointer = 1;	1197	hidden_pointer = 1;
1204	}	1198	}
1205		1199
1206	void	1200	void
…		…
1279	(32 + button_number + key_state),	1273	(32 + button_number + key_state),
1280	(32 + x + 1),	1274	(32 + x + 1),
1281	(32 + y + 1));	1275	(32 + y + 1));
1282	}	1276	}
1283		1277
1284	#ifdef USING_W11LIB
1285	void
1286	rxvt_W11_process_x_event (XEvent *ev)
1287	{
1288	rxvt_t *r = rxvt_get_r ();
1289
1290	x_cb (*ev);
1291	}
1292	#endif
1293
1294	/{{{ process an X event /	1278	/{{{ process an X event /
1295	void	1279	void
1296	rxvt_term::x_cb (XEvent &ev)	1280	rxvt_term::x_cb (XEvent &ev)
1297	{	1281	{
1298	make_current ();	1282	make_current ();
1299		1283
1300	dDisp;	1284	dLocal (Display *, xdisp);
1301		1285
1302	if (ev.xany.window == vt	1286	if (ev.xany.window == vt
1303	&& SHOULD_INVOKE (HOOK_X_EVENT)	1287	&& SHOULD_INVOKE (HOOK_X_EVENT)
1304	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1288	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305	return;	1289	return;
…		…
1402	button_release (ev.xbutton);	1386	button_release (ev.xbutton);
1403	break;	1387	break;
1404		1388
1405	case ClientMessage:	1389	case ClientMessage:
1406	if (ev.xclient.format == 32	1390	if (ev.xclient.format == 32
1407	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1391	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1408	{	1392	{
		1393	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1394	{
		1395	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1396	{
1409	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1397	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1398	{
		1399	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1410	destroy ();	1400	destroy ();
		1401	}
1411	#if ENABLE_EWMH	1402	#if ENABLE_EWMH
1412	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1403	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1413	XSendEvent (disp, ev.xclient.window = display->root,	1404	XSendEvent (xdisp, ev.xclient.window = display->root,
1414	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1405	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1415	&ev);	1406	&ev);
		1407	#endif
		1408	}
		1409	}
		1410	#if ENABLE_XEMBED
		1411	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1412	{
		1413	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1414	focus_in ();
		1415	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1416	focus_out ();
		1417	}
1416	#endif	1418	#endif
1417	}	1419	}
1418	#if ENABLE_XEMBED
1419	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1420	{
1421	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1422	focus_in ();
1423	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1424	focus_out ();
1425	}
1426	#endif
1427	#ifdef OFFIX_DND
1428	/* OffiX Dnd (drag 'n' drop) protocol */
1429	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1430	&& (ev.xclient.data.l[0] == DndFile
1431	\|\| ev.xclient.data.l[0] == DndDir
1432	\|\| ev.xclient.data.l[0] == DndLink))
1433	{
1434	/* Get Dnd data */
1435	Atom ActualType;
1436	int ActualFormat;
1437	unsigned char *data;
1438	unsigned long Size, RemainingBytes;
1439
1440	XGetWindowProperty (disp, display->root,
1441	xa[XA_DNDSELECTION],
1442	0L, 1000000L,
1443	False, AnyPropertyType,
1444	&ActualType, &ActualFormat,
1445	&Size, &RemainingBytes,
1446	&data);
1447	set_string_property (XA_CUT_BUFFER0, data);
1448	XFree (data);
1449	selection_paste (display->root, XA_CUT_BUFFER0, true);
1450	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1451	}
1452	#endif /* OFFIX_DND */
1453	break;	1420	break;
1454		1421
1455	case MappingNotify:	1422	case MappingNotify:
1456	XRefreshKeyboardMapping (&ev.xmapping);	1423	XRefreshKeyboardMapping (&ev.xmapping);
1457	break;	1424	break;
…		…
1490	break;	1457	break;
1491		1458
1492	case ConfigureNotify:	1459	case ConfigureNotify:
1493	if (ev.xconfigure.window == parent[0])	1460	if (ev.xconfigure.window == parent[0])
1494	{	1461	{
1495	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1462	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1496	;	1463	;
1497		1464
1498	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1465	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1499	{	1466	{
1500	seen_resize = 1;	1467	seen_resize = 1;
…		…
1509	#endif	1476	#endif
1510	}	1477	}
1511	break;	1478	break;
1512		1479
1513	case PropertyNotify:	1480	case PropertyNotify:
		1481	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1514	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1482	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1515	&& ev.xproperty.state == PropertyNewValue)	1483	&& ev.xproperty.state == PropertyNewValue)
1516	selection_property (ev.xproperty.window, ev.xproperty.atom);	1484	selection_property (ev.xproperty.window, ev.xproperty.atom);
1517		1485
1518	break;	1486	break;
1519		1487
1520	case SelectionClear:	1488	case SelectionClear:
1521	selection_clear ();	1489	selection_clear ();
…		…
1557	if (ev.xany.window == vt)	1525	if (ev.xany.window == vt)
1558	{	1526	{
1559	do	1527	do
1560	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1561	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1562	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1530	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1563		1531
1564	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1532	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565		1533
1566	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1534	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1567	scr_expose (ev.xexpose.x, ev.xexpose.y,	1535	scr_expose (ev.xexpose.x, ev.xexpose.y,
1568	ev.xexpose.width, ev.xexpose.height, False);	1536	ev.xexpose.width, ev.xexpose.height, False);
1569		1537
1570	want_refresh = 1;	1538	want_refresh = 1;
1571	}	1539	}
1572	else	1540	else
1573	{	1541	{
1574	XEvent unused_event;	1542	XEvent unused_event;
1575		1543
1576	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1544	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1577	;	1545	;
1578	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1546	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1579	;	1547	;
1580		1548
1581	if (isScrollbarWindow (ev.xany.window))	1549	if (isScrollbarWindow (ev.xany.window))
1582	{	1550	{
1583	scrollBar.setIdle ();	1551	scrollBar.setIdle ();
1584	scrollbar_show (0);	1552	scrollbar_show (0);
1585	}	1553	}
1586		1554
1587	#ifdef TRANSPARENT	1555	#ifdef TRANSPARENT
1588	if (am_transparent && ev.xany.window == parent[0])	1556	if (am_transparent && ev.xany.window == parent[0])
1589	XClearWindow (disp, ev.xany.window);	1557	XClearWindow (xdisp, ev.xany.window);
1590	#endif	1558	#endif
1591	}	1559	}
1592	break;	1560	break;
1593		1561
1594	case MotionNotify:	1562	case MotionNotify:
…		…
1604	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1572	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1573	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606	; // nop	1574	; // nop
1607	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1575	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1608	{	1576	{
1609	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1577	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1610	;	1578	;
1611		1579
1612	XQueryPointer (disp, vt,	1580	XQueryPointer (xdisp, vt,
1613	&unused_root, &unused_child,	1581	&unused_root, &unused_child,
1614	&unused_root_x, &unused_root_y,	1582	&unused_root_x, &unused_root_y,
1615	&ev.xbutton.x, &ev.xbutton.y,	1583	&ev.xbutton.x, &ev.xbutton.y,
1616	&ev.xbutton.state);	1584	&ev.xbutton.state);
1617	#ifdef MOUSE_THRESHOLD	1585	#ifdef MOUSE_THRESHOLD
…		…
1681	#endif	1649	#endif
1682	}	1650	}
1683	}	1651	}
1684	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1652	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1685	{	1653	{
1686	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1654	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1687	MotionNotify, &ev))	1655	MotionNotify, &ev))
1688	;	1656	;
1689		1657
1690	XQueryPointer (disp, scrollBar.win,	1658	XQueryPointer (xdisp, scrollBar.win,
1691	&unused_root, &unused_child,	1659	&unused_root, &unused_child,
1692	&unused_root_x, &unused_root_y,	1660	&unused_root_x, &unused_root_y,
1693	&ev.xbutton.x, &ev.xbutton.y,	1661	&ev.xbutton.x, &ev.xbutton.y,
1694	&unused_mask);	1662	&unused_mask);
1695	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1663	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1839	/*	1807	/*
1840	* VT window processing of button press	1808	* VT window processing of button press
1841	*/	1809	*/
1842	if (ev.window == vt)	1810	if (ev.window == vt)
1843	{	1811	{
		1812	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1813	return;
		1814
1844	#if ISO_14755	1815	#if ISO_14755
1845	// 5.4	1816	// 5.4
1846	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1817	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1847	{	1818	{
1848	iso14755_54 (ev.x, ev.y);	1819	iso14755_54 (ev.x, ev.y);
…		…
1890	else	1861	else
1891	{	1862	{
1892	if (ev.button != MEvent.button)	1863	if (ev.button != MEvent.button)
1893	MEvent.clicks = 0;	1864	MEvent.clicks = 0;
1894		1865
1895	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1896	switch (ev.button)	1866	switch (ev.button)
1897	{	1867	{
1898	case Button1:	1868	case Button1:
1899	/* allow meta + click to select rectangular areas */	1869	/* allow meta + click to select rectangular areas */
1900	/* should be done in screen.C */	1870	/* should be done in screen.C */
1901	#if ENABLE_FRILLS	1871	#if ENABLE_FRILLS
1902	selection.rect = !!(ev.state & ModMetaMask);	1872	selection.rect = !!(ev.state & ModMetaMask);
1903	#else	1873	#else
1904	selection.rect = false;	1874	selection.rect = false;
1905	#endif	1875	#endif
1906		1876
1907	/* allow shift+left click to extend selection */	1877	/* allow shift+left click to extend selection */
1908	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1878	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1909	{	1879	{
1910	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1911	selection_rotate (ev.x, ev.y);	1881	selection_rotate (ev.x, ev.y);
1912	else	1882	else
1913	selection_extend (ev.x, ev.y, 1);	1883	selection_extend (ev.x, ev.y, 1);
1914	}	1884	}
1915	else	1885	else
1916	{	1886	{
1917	if (MEvent.button == Button1 && clickintime)	1887	if (MEvent.button == Button1 && clickintime)
1918	MEvent.clicks++;	1888	MEvent.clicks++;
1919	else	1889	else
1920	MEvent.clicks = 1;	1890	MEvent.clicks = 1;
1921		1891
1922	selection_click (MEvent.clicks, ev.x, ev.y);	1892	selection_click (MEvent.clicks, ev.x, ev.y);
1923	}	1893	}
1924		1894
1925	MEvent.button = Button1;	1895	MEvent.button = Button1;
1926	break;	1896	break;
1927		1897
1928	case Button3:	1898	case Button3:
1929	if (MEvent.button == Button3 && clickintime)	1899	if (MEvent.button == Button3 && clickintime)
1930	selection_rotate (ev.x, ev.y);	1900	selection_rotate (ev.x, ev.y);
1931	else	1901	else
1932	selection_extend (ev.x, ev.y, 1);	1902	selection_extend (ev.x, ev.y, 1);
1933		1903
1934	MEvent.button = Button3;	1904	MEvent.button = Button3;
1935	break;	1905	break;
1936	}	1906	}
1937	}	1907	}
1938		1908
1939	MEvent.time = ev.time;	1909	MEvent.time = ev.time;
1940	return;	1910	return;
1941	}	1911	}
1942		1912
…		…
2105	sel_scroll_ev.stop();	2075	sel_scroll_ev.stop();
2106	#endif	2076	#endif
2107		2077
2108	if (ev.window == vt)	2078	if (ev.window == vt)
2109	{	2079	{
		2080	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2081	return;
		2082
2110	#if ISO_14755	2083	#if ISO_14755
2111	// 5.4	2084	// 5.4
2112	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2085	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2113	return;	2086	return;
2114	#endif	2087	#endif
		2088
2115	if (reportmode)	2089	if (reportmode)
2116	{	2090	{
2117	/* mouse report from vt window */	2091	/* mouse report from vt window */
2118	/* don't report release of wheel "buttons" */	2092	/* don't report release of wheel "buttons" */
2119	if (ev.button >= 4)	2093	if (ev.button >= 4)
…		…
2143	if (priv_modes & PrivMode_mouse_report	2117	if (priv_modes & PrivMode_mouse_report
2144	&& bypass_keystate	2118	&& bypass_keystate
2145	&& ev.button == Button1 && MEvent.clicks <= 1)	2119	&& ev.button == Button1 && MEvent.clicks <= 1)
2146	selection_extend (ev.x, ev.y, 0);	2120	selection_extend (ev.x, ev.y, 0);
2147		2121
2148	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149	return;
2150
2151	switch (ev.button)	2122	switch (ev.button)
2152	{	2123	{
2153	case Button1:	2124	case Button1:
2154	case Button3:	2125	case Button3:
2155	selection_make (ev.time);	2126	selection_make (ev.time);
2156	break;	2127	break;
2157		2128
2158	case Button2:	2129	case Button2:
2159	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2130	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2160	selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);	2131	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2161	break;	2132	break;
2162		2133
2163	#ifdef MOUSE_WHEEL	2134	#ifdef MOUSE_WHEEL
2164	case Button4:	2135	case Button4:
2165	case Button5:	2136	case Button5:
…		…
2207	#if TINTING	2178	#if TINTING
2208	/* taken from aterm-0.4.2 */	2179	/* taken from aterm-0.4.2 */
2209		2180
2210	typedef uint32_t RUINT32T;	2181	typedef uint32_t RUINT32T;
2211		2182
2212	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2183	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2213	{	2184	{
2214	int sh_r, sh_g, sh_b;	2185	int sh_r, sh_g, sh_b;
2215	RUINT32T mask_r, mask_g, mask_b;	2186	RUINT32T mask_r, mask_g, mask_b;
2216	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2187	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2217	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2188	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2218	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2189	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2219	int i;	2190	int i;
2220		2191
2221	Visual *visual = display->visual;	2192	Visual *visual = term->visual;
2222		2193
2223	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2194	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2224		2195
2225	/* for convenience */	2196	/* for convenience */
2226	mask_r = visual->red_mask;	2197	mask_r = visual->red_mask;
…		…
2447	Atom atype;	2418	Atom atype;
2448	unsigned char *prop = NULL;	2419	unsigned char *prop = NULL;
2449	Window root, oldp, *list;	2420	Window root, oldp, *list;
2450	Pixmap rootpixmap = None;	2421	Pixmap rootpixmap = None;
2451	XWindowAttributes wattr, wrootattr;	2422	XWindowAttributes wattr, wrootattr;
2452	dDisp;
2453		2423
2454	pchanged = 0;	2424	pchanged = 0;
2455		2425
2456	if (!OPTION (Opt_transparent))	2426	if (!OPTION (Opt_transparent))
2457	return pchanged; /* Don't try any more */	2427	return pchanged; /* Don't try any more */
2458		2428
2459	XGetWindowAttributes (disp, display->root, &wrootattr);	2429	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2460	rootdepth = wrootattr.depth;	2430	rootdepth = wrootattr.depth;
2461		2431
2462	XGetWindowAttributes (disp, parent[0], &wattr);	2432	XGetWindowAttributes (xdisp, parent[0], &wattr);
2463		2433
2464	if (rootdepth != wattr.depth)	2434	if (rootdepth != wattr.depth)
2465	{	2435	{
2466	if (am_transparent)	2436	if (am_transparent)
2467	{	2437	{
2468	pchanged = 1;	2438	pchanged = 1;
2469	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2439	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2470	am_transparent = am_pixmap_trans = 0;	2440	am_transparent = am_pixmap_trans = 0;
2471	}	2441	}
2472		2442
2473	return pchanged; /* Don't try any more */	2443	return pchanged; /* Don't try any more */
2474	}	2444	}
2475		2445
2476	/* Get all X ops out of the queue so that our information is up-to-date. */	2446	/* Get all X ops out of the queue so that our information is up-to-date. */
2477	XSync (disp, False);	2447	XSync (xdisp, False);
2478		2448
2479	/*	2449	/*
2480	* Make the frame window set by the window manager have	2450	* Make the frame window set by the window manager have
2481	* the root background. Some window managers put multiple nested frame	2451	* the root background. Some window managers put multiple nested frame
2482	* windows for each client, so we have to take care about that.	2452	* windows for each client, so we have to take care about that.
2483	*/	2453	*/
2484	i = (xa[XA_XROOTPMAP_ID]	2454	i = (xa[XA_XROOTPMAP_ID]
2485	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2455	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2486	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2456	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487	&nitems, &bytes_after, &prop) == Success);	2457	&nitems, &bytes_after, &prop) == Success);
2488		2458
2489	if (!i \|\| prop == NULL)	2459	if (!i \|\| prop == NULL)
2490	i = (xa[XA_ESETROOT_PMAP_ID]	2460	i = (xa[XA_ESETROOT_PMAP_ID]
2491	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2461	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2492	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493	&nitems, &bytes_after, &prop) == Success);	2463	&nitems, &bytes_after, &prop) == Success);
2494		2464
2495	if (!i \|\| prop == NULL	2465	if (!i \|\| prop == NULL
2496	#if TINTING	2466	#if TINTING
2497	\|\| !rs[Rs_color + Color_tint]	2467	\|\| !ISSET_PIXCOLOR (Color_tint)
2498	#endif	2468	#endif
2499	)	2469	)
2500	have_pixmap = 0;	2470	have_pixmap = 0;
2501	else	2471	else
2502	{	2472	{
…		…
2515	Window cr;	2485	Window cr;
2516	XImage *image;	2486	XImage *image;
2517	GC gc;	2487	GC gc;
2518	XGCValues gcvalue;	2488	XGCValues gcvalue;
2519		2489
2520	XTranslateCoordinates (disp, parent[0], display->root,	2490	XTranslateCoordinates (xdisp, parent[0], display->root,
2521	0, 0, &sx, &sy, &cr);	2491	0, 0, &sx, &sy, &cr);
2522	nw = (unsigned int)szHint.width;	2492	nw = (unsigned int)szHint.width;
2523	nh = (unsigned int)szHint.height;	2493	nh = (unsigned int)szHint.height;
2524	nx = ny = 0;	2494	nx = ny = 0;
2525		2495
…		…
2538	}	2508	}
2539		2509
2540	min_it (nw, (unsigned int) (wrootattr.width - sx));	2510	min_it (nw, (unsigned int) (wrootattr.width - sx));
2541	min_it (nh, (unsigned int) (wrootattr.height - sy));	2511	min_it (nh, (unsigned int) (wrootattr.height - sy));
2542		2512
2543	XSync (disp, False);	2513	XSync (xdisp, False);
2544	allowedxerror = -1;	2514	allowedxerror = -1;
2545	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2515	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546		2516
2547	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2517	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2548	/* XXX: may need a delay here? */	2518	/* XXX: may need a delay here? */
2549	allowedxerror = 0;	2519	allowedxerror = 0;
2550		2520
…		…
2553	if (am_transparent && am_pixmap_trans)	2523	if (am_transparent && am_pixmap_trans)
2554	{	2524	{
2555	pchanged = 1;	2525	pchanged = 1;
2556	if (pixmap != None)	2526	if (pixmap != None)
2557	{	2527	{
2558	XFreePixmap (disp, pixmap);	2528	XFreePixmap (xdisp, pixmap);
2559	pixmap = None;	2529	pixmap = None;
2560	}	2530	}
2561	}	2531	}
2562		2532
2563	am_pixmap_trans = 0;	2533	am_pixmap_trans = 0;
2564	}	2534	}
2565	else	2535	else
2566	{	2536	{
2567	if (pixmap != None)	2537	if (pixmap != None)
2568	XFreePixmap (disp, pixmap);	2538	XFreePixmap (xdisp, pixmap);
2569		2539
2570	#if TINTING	2540	#if TINTING
2571	if (ISSET_PIXCOLOR (Color_tint))	2541	if (ISSET_PIXCOLOR (Color_tint))
2572	{	2542	{
2573	unsigned short rm, gm, bm;
2574	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2543	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2575		2544
		2545	rgba c;
2576	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2546	pix_colors_focused [Color_tint].get (this, c);
2577		2547
2578	ShadeXImage (display, image, shade, rm, gm, bm);	2548	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2579	}	2549	}
2580	#endif	2550	#endif
2581		2551
2582	pixmap = XCreatePixmap (disp, vt,	2552	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2583	szHint.width, szHint.height, image->depth);
2584	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2553	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2585	XPutImage (disp, pixmap, gc, image, 0, 0,	2554	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2586	nx, ny, image->width, image->height);	2555	nx, ny, image->width, image->height);
2587	XFreeGC (disp, gc);	2556	XFreeGC (xdisp, gc);
2588	XDestroyImage (image);	2557	XDestroyImage (image);
2589	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2558	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2590	XClearWindow (disp, parent[0]);	2559	XClearWindow (xdisp, parent[0]);
2591		2560
2592	if (!am_transparent \|\| !am_pixmap_trans)	2561	if (!am_transparent \|\| !am_pixmap_trans)
2593	pchanged = 1;	2562	pchanged = 1;
2594		2563
2595	am_transparent = am_pixmap_trans = 1;	2564	am_transparent = am_pixmap_trans = 1;
2596	}	2565	}
2597	}	2566	}
2598		2567
2599	if (am_pixmap_trans)	2568	if (am_pixmap_trans)
2600	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2569	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2601	else	2570	else
2602	{	2571	{
2603	unsigned int n;	2572	unsigned int n;
2604	/*	2573	/*
2605	* InheritPixmap transparency	2574	* InheritPixmap transparency
2606	*/	2575	*/
2607	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2576	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2608	{	2577	{
2609	oldp = parent[i];	2578	oldp = parent[i];
2610	XQueryTree (disp, parent[i - 1], &root,	2579	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2611	&parent[i], &list, &n);
2612	XFree (list);	2580	XFree (list);
2613		2581
2614	if (parent[i] == display->root)	2582	if (parent[i] == display->root)
2615	{	2583	{
2616	if (oldp != None)	2584	if (oldp != None)
…		…
2624	}	2592	}
2625		2593
2626	n = 0;	2594	n = 0;
2627		2595
2628	if (pchanged)	2596	if (pchanged)
2629	{
2630	for (; n < (unsigned int)i; n++)	2597	for (; n < (unsigned int)i; n++)
2631	{	2598	{
2632	XGetWindowAttributes (disp, parent[n], &wattr);	2599	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2600
2633	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2601	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2634	{	2602	{
2635	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2603	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636	break;	2604	break;
2637	}	2605	}
2638	}	2606	}
2639	}
2640		2607
2641	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2608	if (n > (sizeof (parent) / sizeof (parent[0])))
2642	{	2609	{
2643	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2610	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2644	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2611	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2645	am_transparent = 0;	2612	am_transparent = 0;
2646	/* XXX: also turn off Opt_transparent? */	2613	/* XXX: also turn off Opt_transparent? */
2647	}	2614	}
2648	else	2615	else
2649	{	2616	{
2650	#if WAIT_FOR_WM
2651	/* wait (an arbitrary period) for the WM to do its thing
2652	* needed for fvwm2.2.2 (and before?) */
2653	sleep (1);
2654	#endif
2655	for (n = 0; n < (unsigned int)i; n++)	2617	for (n = 0; n < (unsigned int)i; n++)
2656	{	2618	{
2657	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2619	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2658	XClearWindow (disp, parent[n]);	2620	XClearWindow (xdisp, parent[n]);
2659	}	2621	}
2660		2622
2661	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2623	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2662	am_transparent = 1;	2624	am_transparent = 1;
2663	}	2625	}
2664		2626
2665	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2627	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2666	parent[i] = None;	2628	parent[i] = None;
2667	}	2629	}
2668		2630
2669	if (scrollBar.win)	2631	if (scrollBar.win)
2670	{	2632	{
2671	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2633	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2672	scrollBar.setIdle ();	2634	scrollBar.setIdle ();
2673	scrollbar_show (0);	2635	scrollbar_show (0);
2674	}	2636	}
2675		2637
2676	if (am_transparent)	2638	if (am_transparent)
…		…
3127	scr_charset_set (2, (unsigned int)cmd_getc ());	3089	scr_charset_set (2, (unsigned int)cmd_getc ());
3128	break;	3090	break;
3129	case '+':	3091	case '+':
3130	scr_charset_set (3, (unsigned int)cmd_getc ());	3092	scr_charset_set (3, (unsigned int)cmd_getc ());
3131	break;	3093	break;
3132	#if ENABLE_FRILLS	3094	#if !ENABLE_MINIMAL
3133	case '6':	3095	case '6':
3134	scr_backindex ();	3096	scr_backindex ();
3135	break;	3097	break;
3136	#endif	3098	#endif
3137	case '7':	3099	case '7':
3138	scr_cursor (SAVE);	3100	scr_cursor (SAVE);
3139	break;	3101	break;
3140	case '8':	3102	case '8':
3141	scr_cursor (RESTORE);	3103	scr_cursor (RESTORE);
3142	break;	3104	break;
3143	#if ENABLE_FRILLS	3105	#if !ENABLE_MINIMAL
3144	case '9':	3106	case '9':
3145	scr_forwardindex ();	3107	scr_forwardindex ();
3146	break;	3108	break;
3147	#endif	3109	#endif
3148	case '=':	3110	case '=':
…		…
3310	ndef = get_byte_array_bit (csi_defaults, i);	3272	ndef = get_byte_array_bit (csi_defaults, i);
3311	for (p = 0; p < nargs; p++)	3273	for (p = 0; p < nargs; p++)
3312	if (arg[p] == -1)	3274	if (arg[p] == -1)
3313	arg[p] = ndef;	3275	arg[p] = ndef;
3314		3276
3315	#ifdef DEBUG_CMD
3316	fprintf (stderr, "CSI ");
3317	for (p = 0; p < nargs; p++)
3318	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3319	fprintf (stderr, "%c\n", ch);
3320	#endif
3321
3322	/*	3277	/*
3323	* private mode handling	3278	* private mode handling
3324	*/	3279	*/
3325	if (priv)	3280	if (priv)
3326	{	3281	{
3327	switch (priv)	3282	switch (priv)
3328	{	3283	{
3329	case '>':	3284	case '>':
3330	if (ch == CSI_DA) /* secondary device attributes */	3285	if (ch == CSI_DA) /* secondary device attributes */
3331	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3286	{
		3287	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3288	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3289	//
		3290	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3291	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3292	// that we do not support xterm mouse reporting (should be 95 when we do).
		3293	//
		3294	tt_printf ("\033[>%d;94;0c", 'U');
		3295	}
3332	break;	3296	break;
3333	case '?':	3297	case '?':
3334	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3298	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3335	process_terminal_mode (ch, priv, nargs, arg);	3299	process_terminal_mode (ch, priv, nargs, arg);
3336	break;	3300	break;
…		…
3539	break;	3503	break;
3540	case CSI_75:	3504	case CSI_75:
3541	scr_cursor (RESTORE);	3505	scr_cursor (RESTORE);
3542	break;	3506	break;
3543		3507
3544	#if ENABLE_FRILLS	3508	#if !ENABLE_MINIMAL
3545	case CSI_74:	3509	case CSI_74:
3546	process_window_ops (arg, nargs);	3510	process_window_ops (arg, nargs);
3547	break;	3511	break;
3548	#endif	3512	#endif
3549		3513
…		…
3556	break;	3520	break;
3557	}	3521	}
3558	}	3522	}
3559	/}}} /	3523	/}}} /
3560		3524
3561	#if ENABLE_FRILLS	3525	#if !ENABLE_MINIMAL
3562	/* ARGSUSED */	3526	/* ARGSUSED */
3563	void	3527	void
3564	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3528	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3565	{	3529	{
3566	int x, y;	3530	int x, y;
3567	XWindowAttributes wattr;	3531	XWindowAttributes wattr;
3568	Window wdummy;	3532	Window wdummy;
3569	dDisp;	3533
		3534	dLocal (Display *, xdisp);
3570		3535
3571	if (nargs == 0)	3536	if (nargs == 0)
3572	return;	3537	return;
3573		3538
3574	switch (args[0])	3539	switch (args[0])
3575	{	3540	{
3576	/*	3541	/*
3577	* commands	3542	* commands
3578	*/	3543	*/
3579	case 1: /* deiconify window */	3544	case 1: /* deiconify window */
3580	XMapWindow (disp, parent[0]);	3545	XMapWindow (xdisp, parent[0]);
3581	break;	3546	break;
3582	case 2: /* iconify window */	3547	case 2: /* iconify window */
3583	XIconifyWindow (disp, parent[0], display->screen);	3548	XIconifyWindow (xdisp, parent[0], display->screen);
3584	break;	3549	break;
3585	case 3: /* set position (pixels) */	3550	case 3: /* set position (pixels) */
3586	XMoveWindow (disp, parent[0], args[1], args[2]);	3551	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3587	break;	3552	break;
3588	case 4: /* set size (pixels) */	3553	case 4: /* set size (pixels) */
3589	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3554	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3590	break;	3555	break;
3591	case 5: /* raise window */	3556	case 5: /* raise window */
3592	XRaiseWindow (disp, parent[0]);	3557	XRaiseWindow (xdisp, parent[0]);
3593	break;	3558	break;
3594	case 6: /* lower window */	3559	case 6: /* lower window */
3595	XLowerWindow (disp, parent[0]);	3560	XLowerWindow (xdisp, parent[0]);
3596	break;	3561	break;
3597	case 7: /* refresh window */	3562	case 7: /* refresh window */
3598	scr_touch (true);	3563	scr_touch (true);
3599	break;	3564	break;
3600	case 8: /* set size (chars) */	3565	case 8: /* set size (chars) */
…		…
3607	if (args[0] >= 24) /* set height (chars) */	3572	if (args[0] >= 24) /* set height (chars) */
3608	set_widthheight ((unsigned int)width,	3573	set_widthheight ((unsigned int)width,
3609	(unsigned int) (args[1] * fheight));	3574	(unsigned int) (args[1] * fheight));
3610	break;	3575	break;
3611		3576
3612
3613	/*	3577	/*
3614	* reports - some output format copied from XTerm	3578	* reports - some output format copied from XTerm
3615	*/	3579	*/
3616	case 11: /* report window state */	3580	case 11: /* report window state */
3617	XGetWindowAttributes (disp, parent[0], &wattr);	3581	XGetWindowAttributes (xdisp, parent[0], &wattr);
3618	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3582	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3619	break;	3583	break;
3620	case 13: /* report window position */	3584	case 13: /* report window position */
3621	XGetWindowAttributes (disp, parent[0], &wattr);	3585	XGetWindowAttributes (xdisp, parent[0], &wattr);
3622	XTranslateCoordinates (disp, parent[0], wattr.root,	3586	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3623	-wattr.border_width, -wattr.border_width,	3587	-wattr.border_width, -wattr.border_width,
3624	&x, &y, &wdummy);	3588	&x, &y, &wdummy);
3625	tt_printf ("\033[3;%d;%dt", x, y);	3589	tt_printf ("\033[3;%d;%dt", x, y);
3626	break;	3590	break;
3627	case 14: /* report window size (pixels) */	3591	case 14: /* report window size (pixels) */
3628	XGetWindowAttributes (disp, parent[0], &wattr);	3592	XGetWindowAttributes (xdisp, parent[0], &wattr);
3629	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3593	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3630	break;	3594	break;
3631	case 18: /* report text area size (chars) */	3595	case 18: /* report text area size (chars) */
3632	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3596	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3633	break;	3597	break;
…		…
3635	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3599	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3636	break;	3600	break;
3637	case 20: /* report icon label */	3601	case 20: /* report icon label */
3638	{	3602	{
3639	char *s;	3603	char *s;
3640	XGetIconName (disp, parent[0], &s);	3604	XGetIconName (xdisp, parent[0], &s);
3641	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3605	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3642	XFree (s);	3606	XFree (s);
3643	}	3607	}
3644	break;	3608	break;
3645	case 21: /* report window title */	3609	case 21: /* report window title */
3646	{	3610	{
3647	char *s;	3611	char *s;
3648	XFetchName (disp, parent[0], &s);	3612	XFetchName (xdisp, parent[0], &s);
3649	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3613	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3650	XFree (s);	3614	XFree (s);
3651	}	3615	}
3652	break;	3616	break;
3653	}	3617	}
…		…
3754	void	3718	void
3755	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3719	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3756	{	3720	{
3757	if (str[0] == '?' && !str[1])	3721	if (str[0] == '?' && !str[1])
3758	{	3722	{
3759	unsigned short r, g, b;	3723	rgba c;
3760	pix_colors_focused[color].get (display, r, g, b);	3724	pix_colors_focused[color].get (this, c);
		3725
		3726	#if XFT
		3727	if (c.a != rgba::MAX_CC)
		3728	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3729	else
		3730	#endif
3761	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3731	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3762	}	3732	}
3763	else	3733	else
3764	set_window_color (color, str);	3734	set_window_color (color, str);
3765	}	3735	}
3766		3736
…		…
3772	{	3742	{
3773	int color;	3743	int color;
3774	char buf, name;	3744	char buf, name;
3775	bool query = str[0] == '?' && !str[1];	3745	bool query = str[0] == '?' && !str[1];
3776	int saveop = op;	3746	int saveop = op;
3777	dDisp;	3747
		3748	dLocal (Display *, xdisp);
3778		3749
3779	assert (str != NULL);	3750	assert (str != NULL);
3780	switch (op)	3751	switch (op)
3781	{	3752	{
3782	case XTerm_name:	3753	case XTerm_name:
…		…
3798	unsigned long bytes_after;	3769	unsigned long bytes_after;
3799	unsigned char *value = 0;	3770	unsigned char *value = 0;
3800	const char *str = "";	3771	const char *str = "";
3801		3772
3802	if (prop	3773	if (prop
3803	&& XGetWindowProperty (disp, parent[0],	3774	&& XGetWindowProperty (xdisp, parent[0],
3804	prop, 0, 1<<16, 0, AnyPropertyType,	3775	prop, 0, 1<<16, 0, AnyPropertyType,
3805	&actual_type, &actual_format,	3776	&actual_type, &actual_format,
3806	&nitems, &bytes_after, &value) == Success	3777	&nitems, &bytes_after, &value) == Success
3807	&& actual_type != None	3778	&& actual_type != None
3808	&& actual_format == 8)	3779	&& actual_format == 8)
3809	str = (const char *)(value);	3780	str = (const char *)(value);
3810		3781
3811	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3782	tt_printf ("\033]%d;%s%c", op, str, resp);
3812		3783
3813	XFree (value);	3784	XFree (value);
3814	}	3785	}
3815	else	3786	else
3816	{	3787	{
…		…
3820	{	3791	{
3821	*eq = 0;	3792	*eq = 0;
3822	set_utf8_property (display->atom (str), eq + 1);	3793	set_utf8_property (display->atom (str), eq + 1);
3823	}	3794	}
3824	else	3795	else
3825	XDeleteProperty (disp, parent[0],	3796	XDeleteProperty (xdisp, parent[0],
3826	display->atom (str));	3797	display->atom (str));
3827	}	3798	}
3828	break;	3799	break;
3829		3800
3830	case XTerm_Color:	3801	case XTerm_Color:
…		…
3840	break;	3811	break;
3841		3812
3842	if ((buf = strchr (name, ';')) != NULL)	3813	if ((buf = strchr (name, ';')) != NULL)
3843	*buf++ = '\0';	3814	*buf++ = '\0';
3844		3815
3845	if (name[0] == '?' && !name[1])	3816	process_color_seq (op, color, name, resp);
3846	{
3847	unsigned short r, g, b;
3848	pix_colors_focused[color].get (display, r, g, b);
3849	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3850	}
3851	else
3852	set_window_color (color, name);
3853	}	3817	}
3854	break;	3818	break;
3855	case XTerm_Color00:	3819	case XTerm_Color00:
3856	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3820	process_color_seq (op, Color_fg, str, resp);
3857	break;	3821	break;
3858	case XTerm_Color01:	3822	case XTerm_Color01:
3859	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3823	process_color_seq (op, Color_bg, str, resp);
3860	break;	3824	break;
3861	#ifndef NO_CURSORCOLOR	3825	#ifndef NO_CURSORCOLOR
3862	case XTerm_Color_cursor:	3826	case XTerm_Color_cursor:
3863	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3827	process_color_seq (op, Color_cursor, str, resp);
3864	break;	3828	break;
3865	#endif	3829	#endif
3866	case XTerm_Color_pointer_fg:	3830	case XTerm_Color_pointer_fg:
3867	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3831	process_color_seq (op, Color_pointer_fg, str, resp);
3868	break;	3832	break;
3869	case XTerm_Color_pointer_bg:	3833	case XTerm_Color_pointer_bg:
3870	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3834	process_color_seq (op, Color_pointer_bg, str, resp);
3871	break;	3835	break;
3872	#ifndef NO_BOLD_UNDERLINE_REVERSE	3836	#ifndef NO_BOLD_UNDERLINE_REVERSE
3873	case XTerm_Color_RV:	3837	case XTerm_Color_RV:
3874	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3838	process_color_seq (op, Color_RV, str, resp);
3875	break;	3839	break;
3876	case Rxvt_Color_BD:	3840	case Rxvt_Color_BD:
3877	case URxvt_Color_BD:	3841	case URxvt_Color_BD:
3878	process_color_seq (op, Color_BD, str, resp);	3842	process_color_seq (op, Color_BD, str, resp);
3879	break;	3843	break;
3880	case Rxvt_Color_UL:	3844	case Rxvt_Color_UL:
3881	case URxvt_Color_UL:	3845	case URxvt_Color_UL:
3882	process_color_seq (op, Color_UL, str, resp);	3846	process_color_seq (op, Color_UL, str, resp);
3883	break;	3847	break;
3884	case URxvt_Color_IT:	3848	case URxvt_Color_IT:
3885	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3849	process_color_seq (op, Color_IT, str, resp);
3886	break;	3850	break;
3887	#endif	3851	#endif
3888	#if TRANSPARENT && TINTING	3852	#if TRANSPARENT && TINTING
3889	case URxvt_Color_tint:	3853	case URxvt_Color_tint:
3890	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3854	process_color_seq (op, Color_tint, str, resp);
		3855
3891	check_our_parents ();	3856	check_our_parents ();
		3857
3892	if (am_transparent)	3858	if (am_transparent)
3893	want_full_refresh = want_refresh = 1;	3859	want_full_refresh = want_refresh = 1;
		3860
3894	break;	3861	break;
3895	#endif	3862	#endif
3896		3863
3897	case Rxvt_Pixmap:	3864	case Rxvt_Pixmap:
3898	{	3865	{
…		…
3969	allocated.push_back ((void *)res);	3936	allocated.push_back ((void *)res);
3970	set_fonts ();	3937	set_fonts ();
3971	}	3938	}
3972	break;	3939	break;
3973		3940
3974	#if ENABLE_FRILLS	3941	case URxvt_version:
		3942	if (query)
		3943	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3944	op,
		3945	rs[Rs_name], VERSION[0], VERSION[2],
		3946	resp);
		3947	break;
		3948
		3949	#if !ENABLE_MINIMAL
3975	case URxvt_locale:	3950	case URxvt_locale:
3976	if (query)	3951	if (query)
3977	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3952	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3978	else	3953	else
3979	{	3954	{
3980	set_locale (str);	3955	set_locale (str);
3981	pty->set_utf8_mode (enc_utf8);	3956	pty->set_utf8_mode (enc_utf8);
3982	init_xlocale ();	3957	init_xlocale ();
…		…
4343	scr_color (Color_bg, Color_bg);	4318	scr_color (Color_bg, Color_bg);
4344	break;	4319	break;
4345		4320
4346	//case 50: // not variable spacing	4321	//case 50: // not variable spacing
4347		4322
4348	#if ENABLE_FRILLS	4323	#if !ENABLE_MINIMAL
4349	case 90:	4324	case 90:
4350	case 91: /* set bright fg color */	4325	case 91: /* set bright fg color */
4351	case 92:	4326	case 92:
4352	case 93:	4327	case 93:
4353	case 94:	4328	case 94:

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.275 by root, Fri Jan 20 10:35:25 2006 UTC vs. Revision 1.299 by root, Tue Jan 31 19:11:43 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.275 by root, Fri Jan 20 10:35:25 2006 UTC vs.
Revision 1.299 by root, Tue Jan 31 19:11:43 2006 UTC