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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.277 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.287 by root, Sat Jan 28 20:08:05 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
…		…
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;
…		…
1415	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))	1392	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416	destroy ();	1393	destroy ();
1417	}	1394	}
1418	#if ENABLE_EWMH	1395	#if ENABLE_EWMH
1419	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])
1420	XSendEvent (disp, ev.xclient.window = display->root,	1397	XSendEvent (xdisp, ev.xclient.window = display->root,
1421	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1398	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1422	&ev);	1399	&ev);
1423	#endif	1400	#endif
1424	}	1401	}
1425	}	1402	}
…		…
1473	break;	1450	break;
1474		1451
1475	case ConfigureNotify:	1452	case ConfigureNotify:
1476	if (ev.xconfigure.window == parent[0])	1453	if (ev.xconfigure.window == parent[0])
1477	{	1454	{
1478	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1455	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1479	;	1456	;
1480		1457
1481	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1458	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1482	{	1459	{
1483	seen_resize = 1;	1460	seen_resize = 1;
…		…
1492	#endif	1469	#endif
1493	}	1470	}
1494	break;	1471	break;
1495		1472
1496	case PropertyNotify:	1473	case PropertyNotify:
		1474	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1497	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1475	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1498	&& ev.xproperty.state == PropertyNewValue)	1476	&& ev.xproperty.state == PropertyNewValue)
1499	selection_property (ev.xproperty.window, ev.xproperty.atom);	1477	selection_property (ev.xproperty.window, ev.xproperty.atom);
1500		1478
1501	break;	1479	break;
1502		1480
1503	case SelectionClear:	1481	case SelectionClear:
1504	selection_clear ();	1482	selection_clear ();
…		…
1540	if (ev.xany.window == vt)	1518	if (ev.xany.window == vt)
1541	{	1519	{
1542	do	1520	do
1543	scr_expose (ev.xexpose.x, ev.xexpose.y,	1521	scr_expose (ev.xexpose.x, ev.xexpose.y,
1544	ev.xexpose.width, ev.xexpose.height, False);	1522	ev.xexpose.width, ev.xexpose.height, False);
1545	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1523	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1546		1524
1547	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1525	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1548		1526
1549	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1527	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1550	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1551	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1552		1530
1553	want_refresh = 1;	1531	want_refresh = 1;
1554	}	1532	}
1555	else	1533	else
1556	{	1534	{
1557	XEvent unused_event;	1535	XEvent unused_event;
1558		1536
1559	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1537	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1560	;	1538	;
1561	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1539	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1562	;	1540	;
1563		1541
1564	if (isScrollbarWindow (ev.xany.window))	1542	if (isScrollbarWindow (ev.xany.window))
1565	{	1543	{
1566	scrollBar.setIdle ();	1544	scrollBar.setIdle ();
1567	scrollbar_show (0);	1545	scrollbar_show (0);
1568	}	1546	}
1569		1547
1570	#ifdef TRANSPARENT	1548	#ifdef TRANSPARENT
1571	if (am_transparent && ev.xany.window == parent[0])	1549	if (am_transparent && ev.xany.window == parent[0])
1572	XClearWindow (disp, ev.xany.window);	1550	XClearWindow (xdisp, ev.xany.window);
1573	#endif	1551	#endif
1574	}	1552	}
1575	break;	1553	break;
1576		1554
1577	case MotionNotify:	1555	case MotionNotify:
…		…
1587	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1565	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1588	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1566	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1589	; // nop	1567	; // nop
1590	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1568	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1591	{	1569	{
1592	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1570	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1593	;	1571	;
1594		1572
1595	XQueryPointer (disp, vt,	1573	XQueryPointer (xdisp, vt,
1596	&unused_root, &unused_child,	1574	&unused_root, &unused_child,
1597	&unused_root_x, &unused_root_y,	1575	&unused_root_x, &unused_root_y,
1598	&ev.xbutton.x, &ev.xbutton.y,	1576	&ev.xbutton.x, &ev.xbutton.y,
1599	&ev.xbutton.state);	1577	&ev.xbutton.state);
1600	#ifdef MOUSE_THRESHOLD	1578	#ifdef MOUSE_THRESHOLD
…		…
1664	#endif	1642	#endif
1665	}	1643	}
1666	}	1644	}
1667	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1645	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1668	{	1646	{
1669	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1647	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1670	MotionNotify, &ev))	1648	MotionNotify, &ev))
1671	;	1649	;
1672		1650
1673	XQueryPointer (disp, scrollBar.win,	1651	XQueryPointer (xdisp, scrollBar.win,
1674	&unused_root, &unused_child,	1652	&unused_root, &unused_child,
1675	&unused_root_x, &unused_root_y,	1653	&unused_root_x, &unused_root_y,
1676	&ev.xbutton.x, &ev.xbutton.y,	1654	&ev.xbutton.x, &ev.xbutton.y,
1677	&unused_mask);	1655	&unused_mask);
1678	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1656	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1822	/*	1800	/*
1823	* VT window processing of button press	1801	* VT window processing of button press
1824	*/	1802	*/
1825	if (ev.window == vt)	1803	if (ev.window == vt)
1826	{	1804	{
		1805	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1806	return;
		1807
1827	#if ISO_14755	1808	#if ISO_14755
1828	// 5.4	1809	// 5.4
1829	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1810	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1830	{	1811	{
1831	iso14755_54 (ev.x, ev.y);	1812	iso14755_54 (ev.x, ev.y);
…		…
1873	else	1854	else
1874	{	1855	{
1875	if (ev.button != MEvent.button)	1856	if (ev.button != MEvent.button)
1876	MEvent.clicks = 0;	1857	MEvent.clicks = 0;
1877		1858
1878	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1879	switch (ev.button)	1859	switch (ev.button)
1880	{	1860	{
1881	case Button1:	1861	case Button1:
1882	/* allow meta + click to select rectangular areas */	1862	/* allow meta + click to select rectangular areas */
1883	/* should be done in screen.C */	1863	/* should be done in screen.C */
1884	#if ENABLE_FRILLS	1864	#if ENABLE_FRILLS
1885	selection.rect = !!(ev.state & ModMetaMask);	1865	selection.rect = !!(ev.state & ModMetaMask);
1886	#else	1866	#else
1887	selection.rect = false;	1867	selection.rect = false;
1888	#endif	1868	#endif
1889		1869
1890	/* allow shift+left click to extend selection */	1870	/* allow shift+left click to extend selection */
1891	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1871	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1892	{	1872	{
1893	if (MEvent.button == Button1 && clickintime)	1873	if (MEvent.button == Button1 && clickintime)
1894	selection_rotate (ev.x, ev.y);	1874	selection_rotate (ev.x, ev.y);
1895	else	1875	else
1896	selection_extend (ev.x, ev.y, 1);	1876	selection_extend (ev.x, ev.y, 1);
1897	}	1877	}
1898	else	1878	else
1899	{	1879	{
1900	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1901	MEvent.clicks++;	1881	MEvent.clicks++;
1902	else	1882	else
1903	MEvent.clicks = 1;	1883	MEvent.clicks = 1;
1904		1884
1905	selection_click (MEvent.clicks, ev.x, ev.y);	1885	selection_click (MEvent.clicks, ev.x, ev.y);
1906	}	1886	}
1907		1887
1908	MEvent.button = Button1;	1888	MEvent.button = Button1;
1909	break;	1889	break;
1910		1890
1911	case Button3:	1891	case Button3:
1912	if (MEvent.button == Button3 && clickintime)	1892	if (MEvent.button == Button3 && clickintime)
1913	selection_rotate (ev.x, ev.y);	1893	selection_rotate (ev.x, ev.y);
1914	else	1894	else
1915	selection_extend (ev.x, ev.y, 1);	1895	selection_extend (ev.x, ev.y, 1);
1916		1896
1917	MEvent.button = Button3;	1897	MEvent.button = Button3;
1918	break;	1898	break;
1919	}	1899	}
1920	}	1900	}
1921		1901
1922	MEvent.time = ev.time;	1902	MEvent.time = ev.time;
1923	return;	1903	return;
1924	}	1904	}
1925		1905
…		…
2088	sel_scroll_ev.stop();	2068	sel_scroll_ev.stop();
2089	#endif	2069	#endif
2090		2070
2091	if (ev.window == vt)	2071	if (ev.window == vt)
2092	{	2072	{
		2073	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2074	return;
		2075
2093	#if ISO_14755	2076	#if ISO_14755
2094	// 5.4	2077	// 5.4
2095	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2078	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2096	return;	2079	return;
2097	#endif	2080	#endif
		2081
2098	if (reportmode)	2082	if (reportmode)
2099	{	2083	{
2100	/* mouse report from vt window */	2084	/* mouse report from vt window */
2101	/* don't report release of wheel "buttons" */	2085	/* don't report release of wheel "buttons" */
2102	if (ev.button >= 4)	2086	if (ev.button >= 4)
…		…
2126	if (priv_modes & PrivMode_mouse_report	2110	if (priv_modes & PrivMode_mouse_report
2127	&& bypass_keystate	2111	&& bypass_keystate
2128	&& ev.button == Button1 && MEvent.clicks <= 1)	2112	&& ev.button == Button1 && MEvent.clicks <= 1)
2129	selection_extend (ev.x, ev.y, 0);	2113	selection_extend (ev.x, ev.y, 0);
2130		2114
2131	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2132	return;
2133
2134	switch (ev.button)	2115	switch (ev.button)
2135	{	2116	{
2136	case Button1:	2117	case Button1:
2137	case Button3:	2118	case Button3:
2138	selection_make (ev.time);	2119	selection_make (ev.time);
2139	break;	2120	break;
2140		2121
2141	case Button2:	2122	case Button2:
2142	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2123	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2143	selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);	2124	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2144	break;	2125	break;
2145		2126
2146	#ifdef MOUSE_WHEEL	2127	#ifdef MOUSE_WHEEL
2147	case Button4:	2128	case Button4:
2148	case Button5:	2129	case Button5:
…		…
2190	#if TINTING	2171	#if TINTING
2191	/* taken from aterm-0.4.2 */	2172	/* taken from aterm-0.4.2 */
2192		2173
2193	typedef uint32_t RUINT32T;	2174	typedef uint32_t RUINT32T;
2194		2175
2195	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)
2196	{	2177	{
2197	int sh_r, sh_g, sh_b;	2178	int sh_r, sh_g, sh_b;
2198	RUINT32T mask_r, mask_g, mask_b;	2179	RUINT32T mask_r, mask_g, mask_b;
2199	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2180	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2200	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2181	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2201	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2182	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2202	int i;	2183	int i;
2203		2184
2204	Visual *visual = display->visual;	2185	Visual *visual = term->visual;
2205		2186
2206	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2187	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2207		2188
2208	/* for convenience */	2189	/* for convenience */
2209	mask_r = visual->red_mask;	2190	mask_r = visual->red_mask;
…		…
2430	Atom atype;	2411	Atom atype;
2431	unsigned char *prop = NULL;	2412	unsigned char *prop = NULL;
2432	Window root, oldp, *list;	2413	Window root, oldp, *list;
2433	Pixmap rootpixmap = None;	2414	Pixmap rootpixmap = None;
2434	XWindowAttributes wattr, wrootattr;	2415	XWindowAttributes wattr, wrootattr;
2435	dDisp;
2436		2416
2437	pchanged = 0;	2417	pchanged = 0;
2438		2418
2439	if (!OPTION (Opt_transparent))	2419	if (!OPTION (Opt_transparent))
2440	return pchanged; /* Don't try any more */	2420	return pchanged; /* Don't try any more */
2441		2421
2442	XGetWindowAttributes (disp, display->root, &wrootattr);	2422	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2443	rootdepth = wrootattr.depth;	2423	rootdepth = wrootattr.depth;
2444		2424
2445	XGetWindowAttributes (disp, parent[0], &wattr);	2425	XGetWindowAttributes (xdisp, parent[0], &wattr);
2446		2426
2447	if (rootdepth != wattr.depth)	2427	if (rootdepth != wattr.depth)
2448	{	2428	{
2449	if (am_transparent)	2429	if (am_transparent)
2450	{	2430	{
2451	pchanged = 1;	2431	pchanged = 1;
2452	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2432	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2453	am_transparent = am_pixmap_trans = 0;	2433	am_transparent = am_pixmap_trans = 0;
2454	}	2434	}
2455		2435
2456	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2457	}	2437	}
2458		2438
2459	/* 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. */
2460	XSync (disp, False);	2440	XSync (xdisp, False);
2461		2441
2462	/*	2442	/*
2463	* Make the frame window set by the window manager have	2443	* Make the frame window set by the window manager have
2464	* the root background. Some window managers put multiple nested frame	2444	* the root background. Some window managers put multiple nested frame
2465	* 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.
2466	*/	2446	*/
2467	i = (xa[XA_XROOTPMAP_ID]	2447	i = (xa[XA_XROOTPMAP_ID]
2468	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2448	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2469	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2449	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2470	&nitems, &bytes_after, &prop) == Success);	2450	&nitems, &bytes_after, &prop) == Success);
2471		2451
2472	if (!i \|\| prop == NULL)	2452	if (!i \|\| prop == NULL)
2473	i = (xa[XA_ESETROOT_PMAP_ID]	2453	i = (xa[XA_ESETROOT_PMAP_ID]
2474	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2454	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2475	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2455	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2476	&nitems, &bytes_after, &prop) == Success);	2456	&nitems, &bytes_after, &prop) == Success);
2477		2457
2478	if (!i \|\| prop == NULL	2458	if (!i \|\| prop == NULL
2479	#if TINTING	2459	#if TINTING
…		…
2498	Window cr;	2478	Window cr;
2499	XImage *image;	2479	XImage *image;
2500	GC gc;	2480	GC gc;
2501	XGCValues gcvalue;	2481	XGCValues gcvalue;
2502		2482
2503	XTranslateCoordinates (disp, parent[0], display->root,	2483	XTranslateCoordinates (xdisp, parent[0], display->root,
2504	0, 0, &sx, &sy, &cr);	2484	0, 0, &sx, &sy, &cr);
2505	nw = (unsigned int)szHint.width;	2485	nw = (unsigned int)szHint.width;
2506	nh = (unsigned int)szHint.height;	2486	nh = (unsigned int)szHint.height;
2507	nx = ny = 0;	2487	nx = ny = 0;
2508		2488
…		…
2521	}	2501	}
2522		2502
2523	min_it (nw, (unsigned int) (wrootattr.width - sx));	2503	min_it (nw, (unsigned int) (wrootattr.width - sx));
2524	min_it (nh, (unsigned int) (wrootattr.height - sy));	2504	min_it (nh, (unsigned int) (wrootattr.height - sy));
2525		2505
2526	XSync (disp, False);	2506	XSync (xdisp, False);
2527	allowedxerror = -1;	2507	allowedxerror = -1;
2528	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2508	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2529		2509
2530	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2510	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2531	/* XXX: may need a delay here? */	2511	/* XXX: may need a delay here? */
2532	allowedxerror = 0;	2512	allowedxerror = 0;
2533		2513
…		…
2536	if (am_transparent && am_pixmap_trans)	2516	if (am_transparent && am_pixmap_trans)
2537	{	2517	{
2538	pchanged = 1;	2518	pchanged = 1;
2539	if (pixmap != None)	2519	if (pixmap != None)
2540	{	2520	{
2541	XFreePixmap (disp, pixmap);	2521	XFreePixmap (xdisp, pixmap);
2542	pixmap = None;	2522	pixmap = None;
2543	}	2523	}
2544	}	2524	}
2545		2525
2546	am_pixmap_trans = 0;	2526	am_pixmap_trans = 0;
2547	}	2527	}
2548	else	2528	else
2549	{	2529	{
2550	if (pixmap != None)	2530	if (pixmap != None)
2551	XFreePixmap (disp, pixmap);	2531	XFreePixmap (xdisp, pixmap);
2552		2532
2553	#if TINTING	2533	#if TINTING
2554	if (ISSET_PIXCOLOR (Color_tint))	2534	if (ISSET_PIXCOLOR (Color_tint))
2555	{	2535	{
2556	unsigned short rm, gm, bm;	2536	unsigned short rm, gm, bm;
2557	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2537	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2558		2538
2559	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2539	pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2560		2540
2561	ShadeXImage (display, image, shade, rm, gm, bm);	2541	ShadeXImage (this, image, shade, rm, gm, bm);
2562	}	2542	}
2563	#endif	2543	#endif
2564		2544
2565	pixmap = XCreatePixmap (disp, vt,	2545	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2566	szHint.width, szHint.height, image->depth);
2567	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2546	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2568	XPutImage (disp, pixmap, gc, image, 0, 0,	2547	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2569	nx, ny, image->width, image->height);	2548	nx, ny, image->width, image->height);
2570	XFreeGC (disp, gc);	2549	XFreeGC (xdisp, gc);
2571	XDestroyImage (image);	2550	XDestroyImage (image);
2572	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2551	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2573	XClearWindow (disp, parent[0]);	2552	XClearWindow (xdisp, parent[0]);
2574		2553
2575	if (!am_transparent \|\| !am_pixmap_trans)	2554	if (!am_transparent \|\| !am_pixmap_trans)
2576	pchanged = 1;	2555	pchanged = 1;
2577		2556
2578	am_transparent = am_pixmap_trans = 1;	2557	am_transparent = am_pixmap_trans = 1;
2579	}	2558	}
2580	}	2559	}
2581		2560
2582	if (am_pixmap_trans)	2561	if (am_pixmap_trans)
2583	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2562	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2584	else	2563	else
2585	{	2564	{
2586	unsigned int n;	2565	unsigned int n;
2587	/*	2566	/*
2588	* InheritPixmap transparency	2567	* InheritPixmap transparency
2589	*/	2568	*/
2590	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2569	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2591	{	2570	{
2592	oldp = parent[i];	2571	oldp = parent[i];
2593	XQueryTree (disp, parent[i - 1], &root,	2572	XQueryTree (xdisp, parent[i - 1], &root,
2594	&parent[i], &list, &n);	2573	&parent[i], &list, &n);
2595	XFree (list);	2574	XFree (list);
2596		2575
2597	if (parent[i] == display->root)	2576	if (parent[i] == display->root)
2598	{	2577	{
…		…
2610		2589
2611	if (pchanged)	2590	if (pchanged)
2612	{	2591	{
2613	for (; n < (unsigned int)i; n++)	2592	for (; n < (unsigned int)i; n++)
2614	{	2593	{
2615	XGetWindowAttributes (disp, parent[n], &wattr);	2594	XGetWindowAttributes (xdisp, parent[n], &wattr);
2616	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2595	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2617	{	2596	{
2618	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2597	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2619	break;	2598	break;
2620	}	2599	}
2621	}	2600	}
2622	}	2601	}
2623		2602
2624	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2603	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2625	{	2604	{
2626	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2605	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2627	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2606	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2628	am_transparent = 0;	2607	am_transparent = 0;
2629	/* XXX: also turn off Opt_transparent? */	2608	/* XXX: also turn off Opt_transparent? */
2630	}	2609	}
2631	else	2610	else
2632	{	2611	{
2633	#if WAIT_FOR_WM
2634	/* wait (an arbitrary period) for the WM to do its thing
2635	* needed for fvwm2.2.2 (and before?) */
2636	sleep (1);
2637	#endif
2638	for (n = 0; n < (unsigned int)i; n++)	2612	for (n = 0; n < (unsigned int)i; n++)
2639	{	2613	{
2640	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2614	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2641	XClearWindow (disp, parent[n]);	2615	XClearWindow (xdisp, parent[n]);
2642	}	2616	}
2643		2617
2644	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2618	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2645	am_transparent = 1;	2619	am_transparent = 1;
2646	}	2620	}
2647		2621
2648	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2622	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2649	parent[i] = None;	2623	parent[i] = None;
2650	}	2624	}
2651		2625
2652	if (scrollBar.win)	2626	if (scrollBar.win)
2653	{	2627	{
2654	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2628	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2655	scrollBar.setIdle ();	2629	scrollBar.setIdle ();
2656	scrollbar_show (0);	2630	scrollbar_show (0);
2657	}	2631	}
2658		2632
2659	if (am_transparent)	2633	if (am_transparent)
…		…
3293	ndef = get_byte_array_bit (csi_defaults, i);	3267	ndef = get_byte_array_bit (csi_defaults, i);
3294	for (p = 0; p < nargs; p++)	3268	for (p = 0; p < nargs; p++)
3295	if (arg[p] == -1)	3269	if (arg[p] == -1)
3296	arg[p] = ndef;	3270	arg[p] = ndef;
3297		3271
3298	#ifdef DEBUG_CMD
3299	fprintf (stderr, "CSI ");
3300	for (p = 0; p < nargs; p++)
3301	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3302	fprintf (stderr, "%c\n", ch);
3303	#endif
3304
3305	/*	3272	/*
3306	* private mode handling	3273	* private mode handling
3307	*/	3274	*/
3308	if (priv)	3275	if (priv)
3309	{	3276	{
3310	switch (priv)	3277	switch (priv)
3311	{	3278	{
3312	case '>':	3279	case '>':
3313	if (ch == CSI_DA) /* secondary device attributes */	3280	if (ch == CSI_DA) /* secondary device attributes */
		3281	{
		3282	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3283	// 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.
		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	//
3314	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3289	tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[2]);
		3290	}
3315	break;	3291	break;
3316	case '?':	3292	case '?':
3317	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3293	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3318	process_terminal_mode (ch, priv, nargs, arg);	3294	process_terminal_mode (ch, priv, nargs, arg);
3319	break;	3295	break;
…		…
3547	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3523	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3548	{	3524	{
3549	int x, y;	3525	int x, y;
3550	XWindowAttributes wattr;	3526	XWindowAttributes wattr;
3551	Window wdummy;	3527	Window wdummy;
3552	dDisp;	3528
		3529	dLocal (Display *, xdisp);
3553		3530
3554	if (nargs == 0)	3531	if (nargs == 0)
3555	return;	3532	return;
3556		3533
3557	switch (args[0])	3534	switch (args[0])
3558	{	3535	{
3559	/*	3536	/*
3560	* commands	3537	* commands
3561	*/	3538	*/
3562	case 1: /* deiconify window */	3539	case 1: /* deiconify window */
3563	XMapWindow (disp, parent[0]);	3540	XMapWindow (xdisp, parent[0]);
3564	break;	3541	break;
3565	case 2: /* iconify window */	3542	case 2: /* iconify window */
3566	XIconifyWindow (disp, parent[0], display->screen);	3543	XIconifyWindow (xdisp, parent[0], display->screen);
3567	break;	3544	break;
3568	case 3: /* set position (pixels) */	3545	case 3: /* set position (pixels) */
3569	XMoveWindow (disp, parent[0], args[1], args[2]);	3546	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3570	break;	3547	break;
3571	case 4: /* set size (pixels) */	3548	case 4: /* set size (pixels) */
3572	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3549	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3573	break;	3550	break;
3574	case 5: /* raise window */	3551	case 5: /* raise window */
3575	XRaiseWindow (disp, parent[0]);	3552	XRaiseWindow (xdisp, parent[0]);
3576	break;	3553	break;
3577	case 6: /* lower window */	3554	case 6: /* lower window */
3578	XLowerWindow (disp, parent[0]);	3555	XLowerWindow (xdisp, parent[0]);
3579	break;	3556	break;
3580	case 7: /* refresh window */	3557	case 7: /* refresh window */
3581	scr_touch (true);	3558	scr_touch (true);
3582	break;	3559	break;
3583	case 8: /* set size (chars) */	3560	case 8: /* set size (chars) */
…		…
3595		3572
3596	/*	3573	/*
3597	* reports - some output format copied from XTerm	3574	* reports - some output format copied from XTerm
3598	*/	3575	*/
3599	case 11: /* report window state */	3576	case 11: /* report window state */
3600	XGetWindowAttributes (disp, parent[0], &wattr);	3577	XGetWindowAttributes (xdisp, parent[0], &wattr);
3601	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3578	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3602	break;	3579	break;
3603	case 13: /* report window position */	3580	case 13: /* report window position */
3604	XGetWindowAttributes (disp, parent[0], &wattr);	3581	XGetWindowAttributes (xdisp, parent[0], &wattr);
3605	XTranslateCoordinates (disp, parent[0], wattr.root,	3582	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3606	-wattr.border_width, -wattr.border_width,	3583	-wattr.border_width, -wattr.border_width,
3607	&x, &y, &wdummy);	3584	&x, &y, &wdummy);
3608	tt_printf ("\033[3;%d;%dt", x, y);	3585	tt_printf ("\033[3;%d;%dt", x, y);
3609	break;	3586	break;
3610	case 14: /* report window size (pixels) */	3587	case 14: /* report window size (pixels) */
3611	XGetWindowAttributes (disp, parent[0], &wattr);	3588	XGetWindowAttributes (xdisp, parent[0], &wattr);
3612	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3589	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3613	break;	3590	break;
3614	case 18: /* report text area size (chars) */	3591	case 18: /* report text area size (chars) */
3615	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3592	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3616	break;	3593	break;
…		…
3618	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3595	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3619	break;	3596	break;
3620	case 20: /* report icon label */	3597	case 20: /* report icon label */
3621	{	3598	{
3622	char *s;	3599	char *s;
3623	XGetIconName (disp, parent[0], &s);	3600	XGetIconName (xdisp, parent[0], &s);
3624	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 */
3625	XFree (s);	3602	XFree (s);
3626	}	3603	}
3627	break;	3604	break;
3628	case 21: /* report window title */	3605	case 21: /* report window title */
3629	{	3606	{
3630	char *s;	3607	char *s;
3631	XFetchName (disp, parent[0], &s);	3608	XFetchName (xdisp, parent[0], &s);
3632	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 */
3633	XFree (s);	3610	XFree (s);
3634	}	3611	}
3635	break;	3612	break;
3636	}	3613	}
…		…
3738	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)
3739	{	3716	{
3740	if (str[0] == '?' && !str[1])	3717	if (str[0] == '?' && !str[1])
3741	{	3718	{
3742	unsigned short r, g, b;	3719	unsigned short r, g, b;
3743	pix_colors_focused[color].get (display, r, g, b);	3720	pix_colors_focused[color].get (this, r, g, b);
3744	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);
3745	}	3722	}
3746	else	3723	else
3747	set_window_color (color, str);	3724	set_window_color (color, str);
3748	}	3725	}
…		…
3755	{	3732	{
3756	int color;	3733	int color;
3757	char buf, name;	3734	char buf, name;
3758	bool query = str[0] == '?' && !str[1];	3735	bool query = str[0] == '?' && !str[1];
3759	int saveop = op;	3736	int saveop = op;
3760	dDisp;	3737
		3738	dLocal (Display *, xdisp);
3761		3739
3762	assert (str != NULL);	3740	assert (str != NULL);
3763	switch (op)	3741	switch (op)
3764	{	3742	{
3765	case XTerm_name:	3743	case XTerm_name:
…		…
3781	unsigned long bytes_after;	3759	unsigned long bytes_after;
3782	unsigned char *value = 0;	3760	unsigned char *value = 0;
3783	const char *str = "";	3761	const char *str = "";
3784		3762
3785	if (prop	3763	if (prop
3786	&& XGetWindowProperty (disp, parent[0],	3764	&& XGetWindowProperty (xdisp, parent[0],
3787	prop, 0, 1<<16, 0, AnyPropertyType,	3765	prop, 0, 1<<16, 0, AnyPropertyType,
3788	&actual_type, &actual_format,	3766	&actual_type, &actual_format,
3789	&nitems, &bytes_after, &value) == Success	3767	&nitems, &bytes_after, &value) == Success
3790	&& actual_type != None	3768	&& actual_type != None
3791	&& actual_format == 8)	3769	&& actual_format == 8)
…		…
3803	{	3781	{
3804	*eq = 0;	3782	*eq = 0;
3805	set_utf8_property (display->atom (str), eq + 1);	3783	set_utf8_property (display->atom (str), eq + 1);
3806	}	3784	}
3807	else	3785	else
3808	XDeleteProperty (disp, parent[0],	3786	XDeleteProperty (xdisp, parent[0],
3809	display->atom (str));	3787	display->atom (str));
3810	}	3788	}
3811	break;	3789	break;
3812		3790
3813	case XTerm_Color:	3791	case XTerm_Color:
…		…
3826	*buf++ = '\0';	3804	*buf++ = '\0';
3827		3805
3828	if (name[0] == '?' && !name[1])	3806	if (name[0] == '?' && !name[1])
3829	{	3807	{
3830	unsigned short r, g, b;	3808	unsigned short r, g, b;
3831	pix_colors_focused[color].get (display, r, g, b);	3809	pix_colors_focused[color].get (this, r, g, b);
3832	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", XTerm_Color, color, r, g, b, resp);
3833	}	3811	}
3834	else	3812	else
3835	set_window_color (color, name);	3813	set_window_color (color, name);
3836	}	3814	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.277 by root, Fri Jan 20 12:16:28 2006 UTC vs. Revision 1.287 by root, Sat Jan 28 20:08:05 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.277 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.287 by root, Sat Jan 28 20:08:05 2006 UTC