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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.274 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.290 by root, Sat Jan 28 20:41:38 2006 UTC

…		…
299	rxvt_term::lookup_key (XKeyEvent &ev)	299	rxvt_term::lookup_key (XKeyEvent &ev)
300	{	300	{
301	int ctrl, meta, shft, len;	301	int ctrl, meta, shft, len;
302	unsigned int newlen;	302	unsigned int newlen;
303	KeySym keysym;	303	KeySym keysym;
304	#ifdef DEBUG_CMD
305	static int debug_key = 1; /* accessible by a debugger only */
306	#endif
307	int valid_keysym;	304	int valid_keysym;
308	char kbuf[KBUFSZ];	305	char kbuf[KBUFSZ];
309		306
310	/*	307	/*
311	* 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
…		…
461	{	458	{
462	switch (keysym)	459	switch (keysym)
463	{	460	{
464	/* normal XTerm key bindings */	461	/* normal XTerm key bindings */
465	case XK_Insert: /* Shift+Insert = paste mouse selection */	462	case XK_Insert: /* Shift+Insert = paste mouse selection */
466	selection_request (ev.time, Sel_Primary);	463	selection_request (ev.time);
467	return;	464	return;
468	#if TODO	465	#if TODO
469	/* rxvt extras */	466	/* rxvt extras */
470	case XK_KP_Add: /* Shift+KP_Add = bigger font */	467	case XK_KP_Add: /* Shift+KP_Add = bigger font */
471	change_font (FONT_UP);	468	change_font (FONT_UP);
…		…
902	{	899	{
903	const char ch = C0_ESC;	900	const char ch = C0_ESC;
904	tt_write (&ch, 1);	901	tt_write (&ch, 1);
905	}	902	}
906		903
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);	904	tt_write (kbuf, (unsigned int)len);
918	}	905	}
919	/}}} /	906	/}}} /
920		907
921	#if defined (KEYSYM_RESOURCE)	908	#if defined (KEYSYM_RESOURCE)
…		…
1177	}	1164	}
1178		1165
1179	void	1166	void
1180	rxvt_term::pointer_unblank ()	1167	rxvt_term::pointer_unblank ()
1181	{	1168	{
1182	XDefineCursor (display->display, vt, TermWin_cursor);	1169	XDefineCursor (xdisp, vt, TermWin_cursor);
1183	recolour_cursor ();	1170	recolour_cursor ();
1184		1171
1185	#ifdef POINTER_BLANK	1172	#ifdef POINTER_BLANK
1186	hidden_pointer = 0;	1173	hidden_pointer = 0;
1187		1174
…		…
1195	rxvt_term::pointer_blank ()	1182	rxvt_term::pointer_blank ()
1196	{	1183	{
1197	if (!OPTION (Opt_pointerBlank))	1184	if (!OPTION (Opt_pointerBlank))
1198	return;	1185	return;
1199		1186
1200	XDefineCursor (display->display, vt, display->blank_cursor);	1187	XDefineCursor (xdisp, vt, display->blank_cursor);
1201	XFlush (display->display);	1188	XFlush (xdisp);
1202		1189
1203	hidden_pointer = 1;	1190	hidden_pointer = 1;
1204	}	1191	}
1205		1192
1206	void	1193	void
…		…
1279	(32 + button_number + key_state),	1266	(32 + button_number + key_state),
1280	(32 + x + 1),	1267	(32 + x + 1),
1281	(32 + y + 1));	1268	(32 + y + 1));
1282	}	1269	}
1283		1270
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 /	1271	/{{{ process an X event /
1295	void	1272	void
1296	rxvt_term::x_cb (XEvent &ev)	1273	rxvt_term::x_cb (XEvent &ev)
1297	{	1274	{
1298	make_current ();	1275	make_current ();
1299		1276
1300	dDisp;	1277	dLocal (Display *, xdisp);
1301		1278
1302	if (ev.xany.window == vt	1279	if (ev.xany.window == vt
1303	&& SHOULD_INVOKE (HOOK_X_EVENT)	1280	&& SHOULD_INVOKE (HOOK_X_EVENT)
1304	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1281	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305	return;	1282	return;
…		…
1402	button_release (ev.xbutton);	1379	button_release (ev.xbutton);
1403	break;	1380	break;
1404		1381
1405	case ClientMessage:	1382	case ClientMessage:
1406	if (ev.xclient.format == 32	1383	if (ev.xclient.format == 32
1407	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1384	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1408	{	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	{
1409	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)))
1410	destroy ();	1393	destroy ();
		1394	}
1411	#if ENABLE_EWMH	1395	#if ENABLE_EWMH
1412	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])
1413	XSendEvent (disp, ev.xclient.window = display->root,	1397	XSendEvent (xdisp, ev.xclient.window = display->root,
1414	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1398	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1415	&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	}
1416	#endif	1411	#endif
1417	}	1412	}
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;	1413	break;
1454		1414
1455	case MappingNotify:	1415	case MappingNotify:
1456	XRefreshKeyboardMapping (&ev.xmapping);	1416	XRefreshKeyboardMapping (&ev.xmapping);
1457	break;	1417	break;
…		…
1490	break;	1450	break;
1491		1451
1492	case ConfigureNotify:	1452	case ConfigureNotify:
1493	if (ev.xconfigure.window == parent[0])	1453	if (ev.xconfigure.window == parent[0])
1494	{	1454	{
1495	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1455	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1496	;	1456	;
1497		1457
1498	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1458	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1499	{	1459	{
1500	seen_resize = 1;	1460	seen_resize = 1;
…		…
1509	#endif	1469	#endif
1510	}	1470	}
1511	break;	1471	break;
1512		1472
1513	case PropertyNotify:	1473	case PropertyNotify:
		1474	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1514	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1475	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1515	&& ev.xproperty.state == PropertyNewValue)	1476	&& ev.xproperty.state == PropertyNewValue)
1516	selection_property (ev.xproperty.window, ev.xproperty.atom);	1477	selection_property (ev.xproperty.window, ev.xproperty.atom);
1517		1478
1518	break;	1479	break;
1519		1480
1520	case SelectionClear:	1481	case SelectionClear:
1521	selection_clear ();	1482	selection_clear ();
…		…
1557	if (ev.xany.window == vt)	1518	if (ev.xany.window == vt)
1558	{	1519	{
1559	do	1520	do
1560	scr_expose (ev.xexpose.x, ev.xexpose.y,	1521	scr_expose (ev.xexpose.x, ev.xexpose.y,
1561	ev.xexpose.width, ev.xexpose.height, False);	1522	ev.xexpose.width, ev.xexpose.height, False);
1562	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1523	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1563		1524
1564	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1525	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565		1526
1566	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1527	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1567	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1568	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1569		1530
1570	want_refresh = 1;	1531	want_refresh = 1;
1571	}	1532	}
1572	else	1533	else
1573	{	1534	{
1574	XEvent unused_event;	1535	XEvent unused_event;
1575		1536
1576	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1537	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1577	;	1538	;
1578	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1539	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1579	;	1540	;
1580		1541
1581	if (isScrollbarWindow (ev.xany.window))	1542	if (isScrollbarWindow (ev.xany.window))
1582	{	1543	{
1583	scrollBar.setIdle ();	1544	scrollBar.setIdle ();
1584	scrollbar_show (0);	1545	scrollbar_show (0);
1585	}	1546	}
1586		1547
1587	#ifdef TRANSPARENT	1548	#ifdef TRANSPARENT
1588	if (am_transparent && ev.xany.window == parent[0])	1549	if (am_transparent && ev.xany.window == parent[0])
1589	XClearWindow (disp, ev.xany.window);	1550	XClearWindow (xdisp, ev.xany.window);
1590	#endif	1551	#endif
1591	}	1552	}
1592	break;	1553	break;
1593		1554
1594	case MotionNotify:	1555	case MotionNotify:
…		…
1604	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1565	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1566	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606	; // nop	1567	; // nop
1607	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1568	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1608	{	1569	{
1609	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1570	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1610	;	1571	;
1611		1572
1612	XQueryPointer (disp, vt,	1573	XQueryPointer (xdisp, vt,
1613	&unused_root, &unused_child,	1574	&unused_root, &unused_child,
1614	&unused_root_x, &unused_root_y,	1575	&unused_root_x, &unused_root_y,
1615	&ev.xbutton.x, &ev.xbutton.y,	1576	&ev.xbutton.x, &ev.xbutton.y,
1616	&ev.xbutton.state);	1577	&ev.xbutton.state);
1617	#ifdef MOUSE_THRESHOLD	1578	#ifdef MOUSE_THRESHOLD
…		…
1681	#endif	1642	#endif
1682	}	1643	}
1683	}	1644	}
1684	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1645	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1685	{	1646	{
1686	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1647	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1687	MotionNotify, &ev))	1648	MotionNotify, &ev))
1688	;	1649	;
1689		1650
1690	XQueryPointer (disp, scrollBar.win,	1651	XQueryPointer (xdisp, scrollBar.win,
1691	&unused_root, &unused_child,	1652	&unused_root, &unused_child,
1692	&unused_root_x, &unused_root_y,	1653	&unused_root_x, &unused_root_y,
1693	&ev.xbutton.x, &ev.xbutton.y,	1654	&ev.xbutton.x, &ev.xbutton.y,
1694	&unused_mask);	1655	&unused_mask);
1695	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1656	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1839	/*	1800	/*
1840	* VT window processing of button press	1801	* VT window processing of button press
1841	*/	1802	*/
1842	if (ev.window == vt)	1803	if (ev.window == vt)
1843	{	1804	{
		1805	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1806	return;
		1807
1844	#if ISO_14755	1808	#if ISO_14755
1845	// 5.4	1809	// 5.4
1846	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1810	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1847	{	1811	{
1848	iso14755_54 (ev.x, ev.y);	1812	iso14755_54 (ev.x, ev.y);
…		…
1890	else	1854	else
1891	{	1855	{
1892	if (ev.button != MEvent.button)	1856	if (ev.button != MEvent.button)
1893	MEvent.clicks = 0;	1857	MEvent.clicks = 0;
1894		1858
1895	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1896	switch (ev.button)	1859	switch (ev.button)
1897	{	1860	{
1898	case Button1:	1861	case Button1:
1899	/* allow meta + click to select rectangular areas */	1862	/* allow meta + click to select rectangular areas */
1900	/* should be done in screen.C */	1863	/* should be done in screen.C */
1901	#if ENABLE_FRILLS	1864	#if ENABLE_FRILLS
1902	selection.rect = !!(ev.state & ModMetaMask);	1865	selection.rect = !!(ev.state & ModMetaMask);
1903	#else	1866	#else
1904	selection.rect = false;	1867	selection.rect = false;
1905	#endif	1868	#endif
1906		1869
1907	/* allow shift+left click to extend selection */	1870	/* allow shift+left click to extend selection */
1908	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1871	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1909	{	1872	{
1910	if (MEvent.button == Button1 && clickintime)	1873	if (MEvent.button == Button1 && clickintime)
1911	selection_rotate (ev.x, ev.y);	1874	selection_rotate (ev.x, ev.y);
1912	else	1875	else
1913	selection_extend (ev.x, ev.y, 1);	1876	selection_extend (ev.x, ev.y, 1);
1914	}	1877	}
1915	else	1878	else
1916	{	1879	{
1917	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1918	MEvent.clicks++;	1881	MEvent.clicks++;
1919	else	1882	else
1920	MEvent.clicks = 1;	1883	MEvent.clicks = 1;
1921		1884
1922	selection_click (MEvent.clicks, ev.x, ev.y);	1885	selection_click (MEvent.clicks, ev.x, ev.y);
1923	}	1886	}
1924		1887
1925	MEvent.button = Button1;	1888	MEvent.button = Button1;
1926	break;	1889	break;
1927		1890
1928	case Button3:	1891	case Button3:
1929	if (MEvent.button == Button3 && clickintime)	1892	if (MEvent.button == Button3 && clickintime)
1930	selection_rotate (ev.x, ev.y);	1893	selection_rotate (ev.x, ev.y);
1931	else	1894	else
1932	selection_extend (ev.x, ev.y, 1);	1895	selection_extend (ev.x, ev.y, 1);
1933		1896
1934	MEvent.button = Button3;	1897	MEvent.button = Button3;
1935	break;	1898	break;
1936	}	1899	}
1937	}	1900	}
1938		1901
1939	MEvent.time = ev.time;	1902	MEvent.time = ev.time;
1940	return;	1903	return;
1941	}	1904	}
1942		1905
…		…
2105	sel_scroll_ev.stop();	2068	sel_scroll_ev.stop();
2106	#endif	2069	#endif
2107		2070
2108	if (ev.window == vt)	2071	if (ev.window == vt)
2109	{	2072	{
		2073	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2074	return;
		2075
2110	#if ISO_14755	2076	#if ISO_14755
2111	// 5.4	2077	// 5.4
2112	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2078	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2113	return;	2079	return;
2114	#endif	2080	#endif
		2081
2115	if (reportmode)	2082	if (reportmode)
2116	{	2083	{
2117	/* mouse report from vt window */	2084	/* mouse report from vt window */
2118	/* don't report release of wheel "buttons" */	2085	/* don't report release of wheel "buttons" */
2119	if (ev.button >= 4)	2086	if (ev.button >= 4)
…		…
2143	if (priv_modes & PrivMode_mouse_report	2110	if (priv_modes & PrivMode_mouse_report
2144	&& bypass_keystate	2111	&& bypass_keystate
2145	&& ev.button == Button1 && MEvent.clicks <= 1)	2112	&& ev.button == Button1 && MEvent.clicks <= 1)
2146	selection_extend (ev.x, ev.y, 0);	2113	selection_extend (ev.x, ev.y, 0);
2147		2114
2148	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149	return;
2150
2151	switch (ev.button)	2115	switch (ev.button)
2152	{	2116	{
2153	case Button1:	2117	case Button1:
2154	case Button3:	2118	case Button3:
2155	selection_make (ev.time);	2119	selection_make (ev.time);
2156	break;	2120	break;
2157		2121
2158	case Button2:	2122	case Button2:
2159	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?
2160	&& IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2124	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2161	{
2162	if (ev.state & ShiftMask)
2163	selection_request (ev.time, Sel_Clipboard);
2164	else
2165	selection_request (ev.time, Sel_Primary);
2166	}
2167	break;	2125	break;
2168		2126
2169	#ifdef MOUSE_WHEEL	2127	#ifdef MOUSE_WHEEL
2170	case Button4:	2128	case Button4:
2171	case Button5:	2129	case Button5:
…		…
2213	#if TINTING	2171	#if TINTING
2214	/* taken from aterm-0.4.2 */	2172	/* taken from aterm-0.4.2 */
2215		2173
2216	typedef uint32_t RUINT32T;	2174	typedef uint32_t RUINT32T;
2217		2175
2218	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)
2219	{	2177	{
2220	int sh_r, sh_g, sh_b;	2178	int sh_r, sh_g, sh_b;
2221	RUINT32T mask_r, mask_g, mask_b;	2179	RUINT32T mask_r, mask_g, mask_b;
2222	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2180	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2223	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2181	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2224	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2182	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2225	int i;	2183	int i;
2226		2184
2227	Visual *visual = display->visual;	2185	Visual *visual = term->visual;
2228		2186
2229	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2187	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2230		2188
2231	/* for convenience */	2189	/* for convenience */
2232	mask_r = visual->red_mask;	2190	mask_r = visual->red_mask;
…		…
2453	Atom atype;	2411	Atom atype;
2454	unsigned char *prop = NULL;	2412	unsigned char *prop = NULL;
2455	Window root, oldp, *list;	2413	Window root, oldp, *list;
2456	Pixmap rootpixmap = None;	2414	Pixmap rootpixmap = None;
2457	XWindowAttributes wattr, wrootattr;	2415	XWindowAttributes wattr, wrootattr;
2458	dDisp;
2459		2416
2460	pchanged = 0;	2417	pchanged = 0;
2461		2418
2462	if (!OPTION (Opt_transparent))	2419	if (!OPTION (Opt_transparent))
2463	return pchanged; /* Don't try any more */	2420	return pchanged; /* Don't try any more */
2464		2421
2465	XGetWindowAttributes (disp, display->root, &wrootattr);	2422	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2466	rootdepth = wrootattr.depth;	2423	rootdepth = wrootattr.depth;
2467		2424
2468	XGetWindowAttributes (disp, parent[0], &wattr);	2425	XGetWindowAttributes (xdisp, parent[0], &wattr);
2469		2426
2470	if (rootdepth != wattr.depth)	2427	if (rootdepth != wattr.depth)
2471	{	2428	{
2472	if (am_transparent)	2429	if (am_transparent)
2473	{	2430	{
2474	pchanged = 1;	2431	pchanged = 1;
2475	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2432	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2476	am_transparent = am_pixmap_trans = 0;	2433	am_transparent = am_pixmap_trans = 0;
2477	}	2434	}
2478		2435
2479	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2480	}	2437	}
2481		2438
2482	/* 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. */
2483	XSync (disp, False);	2440	XSync (xdisp, False);
2484		2441
2485	/*	2442	/*
2486	* Make the frame window set by the window manager have	2443	* Make the frame window set by the window manager have
2487	* the root background. Some window managers put multiple nested frame	2444	* the root background. Some window managers put multiple nested frame
2488	* 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.
2489	*/	2446	*/
2490	i = (xa[XA_XROOTPMAP_ID]	2447	i = (xa[XA_XROOTPMAP_ID]
2491	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2448	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2492	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2449	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493	&nitems, &bytes_after, &prop) == Success);	2450	&nitems, &bytes_after, &prop) == Success);
2494		2451
2495	if (!i \|\| prop == NULL)	2452	if (!i \|\| prop == NULL)
2496	i = (xa[XA_ESETROOT_PMAP_ID]	2453	i = (xa[XA_ESETROOT_PMAP_ID]
2497	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2454	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2498	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2455	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2499	&nitems, &bytes_after, &prop) == Success);	2456	&nitems, &bytes_after, &prop) == Success);
2500		2457
2501	if (!i \|\| prop == NULL	2458	if (!i \|\| prop == NULL
2502	#if TINTING	2459	#if TINTING
…		…
2521	Window cr;	2478	Window cr;
2522	XImage *image;	2479	XImage *image;
2523	GC gc;	2480	GC gc;
2524	XGCValues gcvalue;	2481	XGCValues gcvalue;
2525		2482
2526	XTranslateCoordinates (disp, parent[0], display->root,	2483	XTranslateCoordinates (xdisp, parent[0], display->root,
2527	0, 0, &sx, &sy, &cr);	2484	0, 0, &sx, &sy, &cr);
2528	nw = (unsigned int)szHint.width;	2485	nw = (unsigned int)szHint.width;
2529	nh = (unsigned int)szHint.height;	2486	nh = (unsigned int)szHint.height;
2530	nx = ny = 0;	2487	nx = ny = 0;
2531		2488
…		…
2544	}	2501	}
2545		2502
2546	min_it (nw, (unsigned int) (wrootattr.width - sx));	2503	min_it (nw, (unsigned int) (wrootattr.width - sx));
2547	min_it (nh, (unsigned int) (wrootattr.height - sy));	2504	min_it (nh, (unsigned int) (wrootattr.height - sy));
2548		2505
2549	XSync (disp, False);	2506	XSync (xdisp, False);
2550	allowedxerror = -1;	2507	allowedxerror = -1;
2551	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2508	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2552		2509
2553	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2510	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2554	/* XXX: may need a delay here? */	2511	/* XXX: may need a delay here? */
2555	allowedxerror = 0;	2512	allowedxerror = 0;
2556		2513
…		…
2559	if (am_transparent && am_pixmap_trans)	2516	if (am_transparent && am_pixmap_trans)
2560	{	2517	{
2561	pchanged = 1;	2518	pchanged = 1;
2562	if (pixmap != None)	2519	if (pixmap != None)
2563	{	2520	{
2564	XFreePixmap (disp, pixmap);	2521	XFreePixmap (xdisp, pixmap);
2565	pixmap = None;	2522	pixmap = None;
2566	}	2523	}
2567	}	2524	}
2568		2525
2569	am_pixmap_trans = 0;	2526	am_pixmap_trans = 0;
2570	}	2527	}
2571	else	2528	else
2572	{	2529	{
2573	if (pixmap != None)	2530	if (pixmap != None)
2574	XFreePixmap (disp, pixmap);	2531	XFreePixmap (xdisp, pixmap);
2575		2532
2576	#if TINTING	2533	#if TINTING
2577	if (ISSET_PIXCOLOR (Color_tint))	2534	if (ISSET_PIXCOLOR (Color_tint))
2578	{	2535	{
2579	unsigned short rm, gm, bm;	2536	unsigned short rm, gm, bm;
2580	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2537	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2581		2538
2582	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2539	pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2583		2540
2584	ShadeXImage (display, image, shade, rm, gm, bm);	2541	ShadeXImage (this, image, shade, rm, gm, bm);
2585	}	2542	}
2586	#endif	2543	#endif
2587		2544
2588	pixmap = XCreatePixmap (disp, vt,	2545	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2589	szHint.width, szHint.height, image->depth);
2590	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2546	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2591	XPutImage (disp, pixmap, gc, image, 0, 0,	2547	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2592	nx, ny, image->width, image->height);	2548	nx, ny, image->width, image->height);
2593	XFreeGC (disp, gc);	2549	XFreeGC (xdisp, gc);
2594	XDestroyImage (image);	2550	XDestroyImage (image);
2595	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2551	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2596	XClearWindow (disp, parent[0]);	2552	XClearWindow (xdisp, parent[0]);
2597		2553
2598	if (!am_transparent \|\| !am_pixmap_trans)	2554	if (!am_transparent \|\| !am_pixmap_trans)
2599	pchanged = 1;	2555	pchanged = 1;
2600		2556
2601	am_transparent = am_pixmap_trans = 1;	2557	am_transparent = am_pixmap_trans = 1;
2602	}	2558	}
2603	}	2559	}
2604		2560
2605	if (am_pixmap_trans)	2561	if (am_pixmap_trans)
2606	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2562	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2607	else	2563	else
2608	{	2564	{
2609	unsigned int n;	2565	unsigned int n;
2610	/*	2566	/*
2611	* InheritPixmap transparency	2567	* InheritPixmap transparency
2612	*/	2568	*/
2613	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2569	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2614	{	2570	{
2615	oldp = parent[i];	2571	oldp = parent[i];
2616	XQueryTree (disp, parent[i - 1], &root,	2572	XQueryTree (xdisp, parent[i - 1], &root,
2617	&parent[i], &list, &n);	2573	&parent[i], &list, &n);
2618	XFree (list);	2574	XFree (list);
2619		2575
2620	if (parent[i] == display->root)	2576	if (parent[i] == display->root)
2621	{	2577	{
…		…
2633		2589
2634	if (pchanged)	2590	if (pchanged)
2635	{	2591	{
2636	for (; n < (unsigned int)i; n++)	2592	for (; n < (unsigned int)i; n++)
2637	{	2593	{
2638	XGetWindowAttributes (disp, parent[n], &wattr);	2594	XGetWindowAttributes (xdisp, parent[n], &wattr);
2639	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2595	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2640	{	2596	{
2641	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2597	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2642	break;	2598	break;
2643	}	2599	}
2644	}	2600	}
2645	}	2601	}
2646		2602
2647	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2603	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2648	{	2604	{
2649	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2605	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2650	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2606	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2651	am_transparent = 0;	2607	am_transparent = 0;
2652	/* XXX: also turn off Opt_transparent? */	2608	/* XXX: also turn off Opt_transparent? */
2653	}	2609	}
2654	else	2610	else
2655	{	2611	{
2656	#if WAIT_FOR_WM
2657	/* wait (an arbitrary period) for the WM to do its thing
2658	* needed for fvwm2.2.2 (and before?) */
2659	sleep (1);
2660	#endif
2661	for (n = 0; n < (unsigned int)i; n++)	2612	for (n = 0; n < (unsigned int)i; n++)
2662	{	2613	{
2663	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2614	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2664	XClearWindow (disp, parent[n]);	2615	XClearWindow (xdisp, parent[n]);
2665	}	2616	}
2666		2617
2667	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2618	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2668	am_transparent = 1;	2619	am_transparent = 1;
2669	}	2620	}
2670		2621
2671	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2622	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2672	parent[i] = None;	2623	parent[i] = None;
2673	}	2624	}
2674		2625
2675	if (scrollBar.win)	2626	if (scrollBar.win)
2676	{	2627	{
2677	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2628	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2678	scrollBar.setIdle ();	2629	scrollBar.setIdle ();
2679	scrollbar_show (0);	2630	scrollbar_show (0);
2680	}	2631	}
2681		2632
2682	if (am_transparent)	2633	if (am_transparent)
…		…
3316	ndef = get_byte_array_bit (csi_defaults, i);	3267	ndef = get_byte_array_bit (csi_defaults, i);
3317	for (p = 0; p < nargs; p++)	3268	for (p = 0; p < nargs; p++)
3318	if (arg[p] == -1)	3269	if (arg[p] == -1)
3319	arg[p] = ndef;	3270	arg[p] = ndef;
3320		3271
3321	#ifdef DEBUG_CMD
3322	fprintf (stderr, "CSI ");
3323	for (p = 0; p < nargs; p++)
3324	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3325	fprintf (stderr, "%c\n", ch);
3326	#endif
3327
3328	/*	3272	/*
3329	* private mode handling	3273	* private mode handling
3330	*/	3274	*/
3331	if (priv)	3275	if (priv)
3332	{	3276	{
3333	switch (priv)	3277	switch (priv)
3334	{	3278	{
3335	case '>':	3279	case '>':
3336	if (ch == CSI_DA) /* secondary device attributes */	3280	if (ch == CSI_DA) /* secondary device attributes */
3337	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	}
3338	break;	3291	break;
3339	case '?':	3292	case '?':
3340	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3293	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3341	process_terminal_mode (ch, priv, nargs, arg);	3294	process_terminal_mode (ch, priv, nargs, arg);
3342	break;	3295	break;
…		…
3570	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3523	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3571	{	3524	{
3572	int x, y;	3525	int x, y;
3573	XWindowAttributes wattr;	3526	XWindowAttributes wattr;
3574	Window wdummy;	3527	Window wdummy;
3575	dDisp;	3528
		3529	dLocal (Display *, xdisp);
3576		3530
3577	if (nargs == 0)	3531	if (nargs == 0)
3578	return;	3532	return;
3579		3533
3580	switch (args[0])	3534	switch (args[0])
3581	{	3535	{
3582	/*	3536	/*
3583	* commands	3537	* commands
3584	*/	3538	*/
3585	case 1: /* deiconify window */	3539	case 1: /* deiconify window */
3586	XMapWindow (disp, parent[0]);	3540	XMapWindow (xdisp, parent[0]);
3587	break;	3541	break;
3588	case 2: /* iconify window */	3542	case 2: /* iconify window */
3589	XIconifyWindow (disp, parent[0], display->screen);	3543	XIconifyWindow (xdisp, parent[0], display->screen);
3590	break;	3544	break;
3591	case 3: /* set position (pixels) */	3545	case 3: /* set position (pixels) */
3592	XMoveWindow (disp, parent[0], args[1], args[2]);	3546	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3593	break;	3547	break;
3594	case 4: /* set size (pixels) */	3548	case 4: /* set size (pixels) */
3595	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3549	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3596	break;	3550	break;
3597	case 5: /* raise window */	3551	case 5: /* raise window */
3598	XRaiseWindow (disp, parent[0]);	3552	XRaiseWindow (xdisp, parent[0]);
3599	break;	3553	break;
3600	case 6: /* lower window */	3554	case 6: /* lower window */
3601	XLowerWindow (disp, parent[0]);	3555	XLowerWindow (xdisp, parent[0]);
3602	break;	3556	break;
3603	case 7: /* refresh window */	3557	case 7: /* refresh window */
3604	scr_touch (true);	3558	scr_touch (true);
3605	break;	3559	break;
3606	case 8: /* set size (chars) */	3560	case 8: /* set size (chars) */
…		…
3618		3572
3619	/*	3573	/*
3620	* reports - some output format copied from XTerm	3574	* reports - some output format copied from XTerm
3621	*/	3575	*/
3622	case 11: /* report window state */	3576	case 11: /* report window state */
3623	XGetWindowAttributes (disp, parent[0], &wattr);	3577	XGetWindowAttributes (xdisp, parent[0], &wattr);
3624	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3578	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3625	break;	3579	break;
3626	case 13: /* report window position */	3580	case 13: /* report window position */
3627	XGetWindowAttributes (disp, parent[0], &wattr);	3581	XGetWindowAttributes (xdisp, parent[0], &wattr);
3628	XTranslateCoordinates (disp, parent[0], wattr.root,	3582	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3629	-wattr.border_width, -wattr.border_width,	3583	-wattr.border_width, -wattr.border_width,
3630	&x, &y, &wdummy);	3584	&x, &y, &wdummy);
3631	tt_printf ("\033[3;%d;%dt", x, y);	3585	tt_printf ("\033[3;%d;%dt", x, y);
3632	break;	3586	break;
3633	case 14: /* report window size (pixels) */	3587	case 14: /* report window size (pixels) */
3634	XGetWindowAttributes (disp, parent[0], &wattr);	3588	XGetWindowAttributes (xdisp, parent[0], &wattr);
3635	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3589	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3636	break;	3590	break;
3637	case 18: /* report text area size (chars) */	3591	case 18: /* report text area size (chars) */
3638	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3592	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3639	break;	3593	break;
…		…
3641	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3595	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3642	break;	3596	break;
3643	case 20: /* report icon label */	3597	case 20: /* report icon label */
3644	{	3598	{
3645	char *s;	3599	char *s;
3646	XGetIconName (disp, parent[0], &s);	3600	XGetIconName (xdisp, parent[0], &s);
3647	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 */
3648	XFree (s);	3602	XFree (s);
3649	}	3603	}
3650	break;	3604	break;
3651	case 21: /* report window title */	3605	case 21: /* report window title */
3652	{	3606	{
3653	char *s;	3607	char *s;
3654	XFetchName (disp, parent[0], &s);	3608	XFetchName (xdisp, parent[0], &s);
3655	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 */
3656	XFree (s);	3610	XFree (s);
3657	}	3611	}
3658	break;	3612	break;
3659	}	3613	}
…		…
3761	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)
3762	{	3716	{
3763	if (str[0] == '?' && !str[1])	3717	if (str[0] == '?' && !str[1])
3764	{	3718	{
3765	unsigned short r, g, b;	3719	unsigned short r, g, b;
3766	pix_colors_focused[color].get (display, r, g, b);	3720	pix_colors_focused[color].get (this, r, g, b);
3767	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3721	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3768	}	3722	}
3769	else	3723	else
3770	set_window_color (color, str);	3724	set_window_color (color, str);
3771	}	3725	}
…		…
3778	{	3732	{
3779	int color;	3733	int color;
3780	char buf, name;	3734	char buf, name;
3781	bool query = str[0] == '?' && !str[1];	3735	bool query = str[0] == '?' && !str[1];
3782	int saveop = op;	3736	int saveop = op;
3783	dDisp;	3737
		3738	dLocal (Display *, xdisp);
3784		3739
3785	assert (str != NULL);	3740	assert (str != NULL);
3786	switch (op)	3741	switch (op)
3787	{	3742	{
3788	case XTerm_name:	3743	case XTerm_name:
…		…
3804	unsigned long bytes_after;	3759	unsigned long bytes_after;
3805	unsigned char *value = 0;	3760	unsigned char *value = 0;
3806	const char *str = "";	3761	const char *str = "";
3807		3762
3808	if (prop	3763	if (prop
3809	&& XGetWindowProperty (disp, parent[0],	3764	&& XGetWindowProperty (xdisp, parent[0],
3810	prop, 0, 1<<16, 0, AnyPropertyType,	3765	prop, 0, 1<<16, 0, AnyPropertyType,
3811	&actual_type, &actual_format,	3766	&actual_type, &actual_format,
3812	&nitems, &bytes_after, &value) == Success	3767	&nitems, &bytes_after, &value) == Success
3813	&& actual_type != None	3768	&& actual_type != None
3814	&& actual_format == 8)	3769	&& actual_format == 8)
3815	str = (const char *)(value);	3770	str = (const char *)(value);
3816		3771
3817	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3772	tt_printf ("\033]%d;%s%c", op, str, resp);
3818		3773
3819	XFree (value);	3774	XFree (value);
3820	}	3775	}
3821	else	3776	else
3822	{	3777	{
…		…
3826	{	3781	{
3827	*eq = 0;	3782	*eq = 0;
3828	set_utf8_property (display->atom (str), eq + 1);	3783	set_utf8_property (display->atom (str), eq + 1);
3829	}	3784	}
3830	else	3785	else
3831	XDeleteProperty (disp, parent[0],	3786	XDeleteProperty (xdisp, parent[0],
3832	display->atom (str));	3787	display->atom (str));
3833	}	3788	}
3834	break;	3789	break;
3835		3790
3836	case XTerm_Color:	3791	case XTerm_Color:
…		…
3849	*buf++ = '\0';	3804	*buf++ = '\0';
3850		3805
3851	if (name[0] == '?' && !name[1])	3806	if (name[0] == '?' && !name[1])
3852	{	3807	{
3853	unsigned short r, g, b;	3808	unsigned short r, g, b;
3854	pix_colors_focused[color].get (display, r, g, b);	3809	pix_colors_focused[color].get (this, r, g, b);
3855	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3810	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", op, color, r, g, b, resp);
3856	}	3811	}
3857	else	3812	else
3858	set_window_color (color, name);	3813	set_window_color (color, name);
3859	}	3814	}
3860	break;	3815	break;
3861	case XTerm_Color00:	3816	case XTerm_Color00:
3862	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3817	process_color_seq (op, Color_fg, str, resp);
3863	break;	3818	break;
3864	case XTerm_Color01:	3819	case XTerm_Color01:
3865	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3820	process_color_seq (op, Color_bg, str, resp);
3866	break;	3821	break;
3867	#ifndef NO_CURSORCOLOR	3822	#ifndef NO_CURSORCOLOR
3868	case XTerm_Color_cursor:	3823	case XTerm_Color_cursor:
3869	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3824	process_color_seq (op, Color_cursor, str, resp);
3870	break;	3825	break;
3871	#endif	3826	#endif
3872	case XTerm_Color_pointer_fg:	3827	case XTerm_Color_pointer_fg:
3873	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3828	process_color_seq (op, Color_pointer_fg, str, resp);
3874	break;	3829	break;
3875	case XTerm_Color_pointer_bg:	3830	case XTerm_Color_pointer_bg:
3876	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3831	process_color_seq (op, Color_pointer_bg, str, resp);
3877	break;	3832	break;
3878	#ifndef NO_BOLD_UNDERLINE_REVERSE	3833	#ifndef NO_BOLD_UNDERLINE_REVERSE
3879	case XTerm_Color_RV:	3834	case XTerm_Color_RV:
3880	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3835	process_color_seq (op, Color_RV, str, resp);
3881	break;	3836	break;
3882	case Rxvt_Color_BD:	3837	case Rxvt_Color_BD:
3883	case URxvt_Color_BD:	3838	case URxvt_Color_BD:
3884	process_color_seq (op, Color_BD, str, resp);	3839	process_color_seq (op, Color_BD, str, resp);
3885	break;	3840	break;
3886	case Rxvt_Color_UL:	3841	case Rxvt_Color_UL:
3887	case URxvt_Color_UL:	3842	case URxvt_Color_UL:
3888	process_color_seq (op, Color_UL, str, resp);	3843	process_color_seq (op, Color_UL, str, resp);
3889	break;	3844	break;
3890	case URxvt_Color_IT:	3845	case URxvt_Color_IT:
3891	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3846	process_color_seq (op, Color_IT, str, resp);
3892	break;	3847	break;
3893	#endif	3848	#endif
3894	#if TRANSPARENT && TINTING	3849	#if TRANSPARENT && TINTING
3895	case URxvt_Color_tint:	3850	case URxvt_Color_tint:
3896	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3851	process_color_seq (op, Color_tint, str, resp);
3897	check_our_parents ();	3852	check_our_parents ();
3898	if (am_transparent)	3853	if (am_transparent)
3899	want_full_refresh = want_refresh = 1;	3854	want_full_refresh = want_refresh = 1;
3900	break;	3855	break;
3901	#endif	3856	#endif
…		…
3975	allocated.push_back ((void *)res);	3930	allocated.push_back ((void *)res);
3976	set_fonts ();	3931	set_fonts ();
3977	}	3932	}
3978	break;	3933	break;
3979		3934
		3935	case URxvt_version:
		3936	if (query)
		3937	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3938	op,
		3939	rs[Rs_name], VERSION[0], VERSION[2],
		3940	resp);
		3941	break;
		3942
3980	#if ENABLE_FRILLS	3943	#if ENABLE_FRILLS
3981	case URxvt_locale:	3944	case URxvt_locale:
3982	if (query)	3945	if (query)
3983	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3946	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3984	else	3947	else
3985	{	3948	{
3986	set_locale (str);	3949	set_locale (str);
3987	pty->set_utf8_mode (enc_utf8);	3950	pty->set_utf8_mode (enc_utf8);
3988	init_xlocale ();	3951	init_xlocale ();

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.274 by root, Fri Jan 20 10:27:08 2006 UTC vs. Revision 1.290 by root, Sat Jan 28 20:41:38 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.274 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.290 by root, Sat Jan 28 20:41:38 2006 UTC