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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.304 by root, Tue Jan 31 22:01:25 2006 UTC vs.
Revision 1.314 by root, Thu Jul 6 23:48:11 2006 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: command.C	2	* File: command.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
298		298
299	return -1;	299	return -1;
300	}	300	}
301	#endif	301	#endif
302		302
303	/{{{ Convert the keypress event into a string /
304	void	303	void
305	rxvt_term::lookup_key (XKeyEvent &ev)	304	rxvt_term::key_press (XKeyEvent &ev)
306	{	305	{
307	int ctrl, meta, shft, len;	306	int ctrl, meta, shft, len;
308	unsigned int newlen;	307	unsigned int newlen;
309	KeySym keysym;	308	KeySym keysym;
310	int valid_keysym;	309	int valid_keysym;
311	char kbuf[KBUFSZ];	310	char kbuf[KBUFSZ];
		311
		312	#if ISO_14755
		313	if (iso14755buf & ISO_14755_52)
		314	return;
		315	#endif
312		316
313	/*	317	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	318	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315	* escape sequence to toggle the Keypad.	319	* escape sequence to toggle the Keypad.
316	*	320	*
…		…
907	tt_write (&ch, 1);	911	tt_write (&ch, 1);
908	}	912	}
909		913
910	tt_write (kbuf, (unsigned int)len);	914	tt_write (kbuf, (unsigned int)len);
911	}	915	}
912	/}}} /	916
		917	void
		918	rxvt_term::key_release (XKeyEvent &ev)
		919	{
		920	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
		921	KeySym keysym;
		922
		923	keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
		924	#endif
		925
		926	#if ENABLE_FRILLS \|\| ISO_14755
		927	// ISO 14755 support
		928	if (iso14755buf)
		929	if (iso14755buf & ISO_14755_52)
		930	{
		931	# if ENABLE_OVERLAY
		932	scr_overlay_off ();
		933	# endif
		934	# if ISO_14755
		935	// iso14755 part 5.2 handling: release time
		936	// first: controls
		937	if ((ev.state & ControlMask)
		938	&& ((keysym >= 0x40 && keysym <= 0x5f)
		939	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
		940	{
		941	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
		942	commit_iso14755 ();
		943
		944	return;
		945	}
		946
		947	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
		948	if (i[0] == keysym)
		949	{
		950	iso14755buf = ISO_14755_51 \| i[1];
		951	commit_iso14755 ();
		952
		953	return;
		954	}
		955
		956	scr_bell ();
		957	# endif
		958	iso14755buf = 0;
		959
		960	return;
		961	}
		962	else if ((ev.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
		963	{
		964	# if ENABLE_OVERLAY
		965	scr_overlay_off ();
		966	# endif
		967	if (iso14755buf & ISO_14755_51)
		968	commit_iso14755 ();
		969	#if ISO_14755
		970	else if (iso14755buf & ISO_14755_STARTED)
		971	{
		972	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
		973
		974	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
		975	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
		976	}
		977	# endif
		978	else
		979	iso14755buf = 0;
		980	}
		981	#endif
		982
		983	if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		984	return;
		985
		986	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		987	if (!(ev.state & ControlMask))
		988	slip_wheel_ev.stop ();
		989	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
		990	mouse_slip_wheel_speed = 0;
		991	#endif
		992	}
913		993
914	#if defined (KEYSYM_RESOURCE)	994	#if defined (KEYSYM_RESOURCE)
915	unsigned int	995	unsigned int
916	rxvt_term::cmd_write (const char *str, unsigned int count)	996	rxvt_term::cmd_write (const char *str, unsigned int count)
917	{	997	{
…		…
1177	}	1257	}
1178		1258
1179	void	1259	void
1180	rxvt_term::pointer_unblank ()	1260	rxvt_term::pointer_unblank ()
1181	{	1261	{
1182	XDefineCursor (xdisp, vt, TermWin_cursor);	1262	XDefineCursor (dpy, vt, TermWin_cursor);
1183	recolour_cursor ();	1263	recolour_cursor ();
1184		1264
1185	#ifdef POINTER_BLANK	1265	#ifdef POINTER_BLANK
1186	hidden_pointer = 0;	1266	hidden_pointer = 0;
1187		1267
…		…
1195	rxvt_term::pointer_blank ()	1275	rxvt_term::pointer_blank ()
1196	{	1276	{
1197	if (!OPTION (Opt_pointerBlank))	1277	if (!OPTION (Opt_pointerBlank))
1198	return;	1278	return;
1199		1279
1200	XDefineCursor (xdisp, vt, display->blank_cursor);	1280	XDefineCursor (dpy, vt, display->blank_cursor);
1201	XFlush (xdisp);	1281	XFlush (dpy);
1202		1282
1203	hidden_pointer = 1;	1283	hidden_pointer = 1;
1204	}	1284	}
1205		1285
1206	void	1286	void
…		…
1285	void	1365	void
1286	rxvt_term::x_cb (XEvent &ev)	1366	rxvt_term::x_cb (XEvent &ev)
1287	{	1367	{
1288	make_current ();	1368	make_current ();
1289		1369
1290	dLocal (Display *, xdisp);	1370	dLocal (Display *, dpy);
1291		1371
1292	if (ev.xany.window == vt	1372	if (ev.xany.window == vt
1293	&& SHOULD_INVOKE (HOOK_X_EVENT)	1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
1294	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1295	return;	1375	return;
…		…
1300	unsigned int unused_mask;	1380	unsigned int unused_mask;
1301		1381
1302	switch (ev.type)	1382	switch (ev.type)
1303	{	1383	{
1304	case KeyPress:	1384	case KeyPress:
1305	#if ISO_14755	1385	key_press (ev.xkey);
1306	if (!(iso14755buf & ISO_14755_52))
1307	#endif
1308	lookup_key (ev.xkey);
1309
1310	break;	1386	break;
1311		1387
1312	case KeyRelease:	1388	case KeyRelease:
1313	{	1389	key_release (ev.xkey);
1314	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1315	KeySym keysym;
1316
1317	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1318	#endif
1319
1320	#if ENABLE_FRILLS \|\| ISO_14755
1321	// ISO 14755 support
1322	if (iso14755buf)
1323	if (iso14755buf & ISO_14755_52)
1324	{
1325	# if ENABLE_OVERLAY
1326	scr_overlay_off ();
1327	# endif
1328	# if ISO_14755
1329	// iso14755 part 5.2 handling: release time
1330	// first: controls
1331	if ((ev.xkey.state & ControlMask)
1332	&& ((keysym >= 0x40 && keysym <= 0x5f)
1333	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1334	{
1335	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1336	commit_iso14755 ();
1337	goto skip_switch;
1338	}
1339
1340	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1341	if (i[0] == keysym)
1342	{
1343	iso14755buf = ISO_14755_51 \| i[1];
1344	commit_iso14755 ();
1345	goto skip_switch;
1346	}
1347
1348	scr_bell ();
1349	# endif
1350	iso14755buf = 0;
1351	break;
1352	}
1353	else if ((ev.xkey.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
1354	{
1355	# if ENABLE_OVERLAY
1356	scr_overlay_off ();
1357	# endif
1358	if (iso14755buf & ISO_14755_51)
1359	commit_iso14755 ();
1360	#if ISO_14755
1361	else if (iso14755buf & ISO_14755_STARTED)
1362	{
1363	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1364
1365	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1366	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1367	}
1368	# endif
1369	else
1370	iso14755buf = 0;
1371	}
1372	#endif
1373
1374	if (ev.xany.window == vt
1375	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1376	break;
1377
1378	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379	if (!(ev.xkey.state & ControlMask))
1380	slip_wheel_ev.stop ();
1381	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1382	mouse_slip_wheel_speed = 0;
1383	#endif
1384	break;	1390	break;
1385	}
1386		1391
1387	case ButtonPress:	1392	case ButtonPress:
1388	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1389	break;	1394	break;
1390		1395
…		…
1405	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))	1410	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1406	destroy ();	1411	destroy ();
1407	}	1412	}
1408	#if ENABLE_EWMH	1413	#if ENABLE_EWMH
1409	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1414	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1410	XSendEvent (xdisp, ev.xclient.window = display->root,	1415	XSendEvent (dpy, ev.xclient.window = display->root,
1411	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1416	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1412	&ev);	1417	&ev);
1413	#endif	1418	#endif
1414	}	1419	}
1415	}	1420	}
…		…
1463	break;	1468	break;
1464		1469
1465	case ConfigureNotify:	1470	case ConfigureNotify:
1466	if (ev.xconfigure.window == parent[0])	1471	if (ev.xconfigure.window == parent[0])
1467	{	1472	{
1468	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))	1473	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1469	;	1474	;
1470		1475
1471	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1476	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1472	{	1477	{
1473	seen_resize = 1;	1478	seen_resize = 1;
…		…
1531	if (ev.xany.window == vt)	1536	if (ev.xany.window == vt)
1532	{	1537	{
1533	do	1538	do
1534	scr_expose (ev.xexpose.x, ev.xexpose.y,	1539	scr_expose (ev.xexpose.x, ev.xexpose.y,
1535	ev.xexpose.width, ev.xexpose.height, False);	1540	ev.xexpose.width, ev.xexpose.height, False);
1536	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));	1541	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1537		1542
1538	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1543	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1539		1544
1540	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))	1545	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1541	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1542	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, False);
1543		1548
1544	want_refresh = 1;	1549	want_refresh = 1;
1545	}	1550	}
1546	else	1551	else
1547	{	1552	{
1548	XEvent unused_event;	1553	XEvent unused_event;
1549		1554
1550	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))	1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1551	;	1556	;
1552	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))	1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1553	;	1558	;
1554		1559
1555	if (isScrollbarWindow (ev.xany.window))	1560	if (isScrollbarWindow (ev.xany.window))
1556	{	1561	{
1557	scrollBar.setIdle ();	1562	scrollBar.setIdle ();
1558	scrollbar_show (0);	1563	scrollbar_show (0);
1559	}	1564	}
1560		1565
1561	#ifdef TRANSPARENT	1566	#ifdef TRANSPARENT
1562	if (am_transparent && ev.xany.window == parent[0])	1567	if (am_transparent && ev.xany.window == parent[0])
1563	XClearWindow (xdisp, ev.xany.window);	1568	XClearWindow (dpy, ev.xany.window);
1564	#endif	1569	#endif
1565	}	1570	}
1566	break;	1571	break;
1567		1572
1568	case MotionNotify:	1573	case MotionNotify:
…		…
1578	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1583	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1579	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1584	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1580	; // nop	1585	; // nop
1581	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1586	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1582	{	1587	{
1583	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))	1588	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1584	;	1589	;
1585		1590
1586	XQueryPointer (xdisp, vt,	1591	XQueryPointer (dpy, vt,
1587	&unused_root, &unused_child,	1592	&unused_root, &unused_child,
1588	&unused_root_x, &unused_root_y,	1593	&unused_root_x, &unused_root_y,
1589	&ev.xbutton.x, &ev.xbutton.y,	1594	&ev.xbutton.x, &ev.xbutton.y,
1590	&ev.xbutton.state);	1595	&ev.xbutton.state);
1591	#ifdef MOUSE_THRESHOLD	1596	#ifdef MOUSE_THRESHOLD
…		…
1655	#endif	1660	#endif
1656	}	1661	}
1657	}	1662	}
1658	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1663	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1659	{	1664	{
1660	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,	1665	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1661	MotionNotify, &ev))	1666	MotionNotify, &ev))
1662	;	1667	;
1663		1668
1664	XQueryPointer (xdisp, scrollBar.win,	1669	XQueryPointer (dpy, scrollBar.win,
1665	&unused_root, &unused_child,	1670	&unused_root, &unused_child,
1666	&unused_root_x, &unused_root_y,	1671	&unused_root_x, &unused_root_y,
1667	&ev.xbutton.x, &ev.xbutton.y,	1672	&ev.xbutton.x, &ev.xbutton.y,
1668	&unused_mask);	1673	&unused_mask);
1669	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1674	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1673	scrollbar_show (1);	1678	scrollbar_show (1);
1674	}	1679	}
1675	break;	1680	break;
1676	}	1681	}
1677		1682
1678	skip_switch: ;
1679
1680	#if defined(CURSOR_BLINK)	1683	#if defined(CURSOR_BLINK)
1681	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1684	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1682	{	1685	{
1683	if (hidden_cursor)	1686	if (hidden_cursor)
1684	{	1687	{
…		…
1711	if (!focus)	1714	if (!focus)
1712	{	1715	{
1713	focus = 1;	1716	focus = 1;
1714	want_refresh = 1;	1717	want_refresh = 1;
1715		1718
1716	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1719	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1717		1720
1718	#if USE_XIM	1721	#if USE_XIM
1719	if (Input_Context != NULL)	1722	if (Input_Context != NULL)
1720	{	1723	{
1721	IMSetStatusPosition ();	1724	IMSetPosition ();
1722	XSetICFocus (Input_Context);	1725	XSetICFocus (Input_Context);
1723	}	1726	}
1724	#endif	1727	#endif
1725	#if CURSOR_BLINK	1728	#if CURSOR_BLINK
1726	if (OPTION (Opt_cursorBlink))	1729	if (OPTION (Opt_cursorBlink))
…		…
1772	}	1775	}
1773	#endif	1776	#endif
1774	}	1777	}
1775	}	1778	}
1776		1779
1777	#if TRANSPARENT	1780	void
		1781	rxvt_term::update_fade_color (unsigned int idx)
		1782	{
		1783	#if OFF_FOCUS_FADING
		1784	if (rs[Rs_fade])
		1785	{
		1786	rgba c;
		1787	pix_colors [Color_fade].get (c);
		1788	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		1789	}
		1790	#endif
		1791	}
		1792
		1793	#if TRANSPARENT \|\| ENABLE_PERL
1778	void	1794	void
1779	rxvt_term::rootwin_cb (XEvent &ev)	1795	rxvt_term::rootwin_cb (XEvent &ev)
1780	{	1796	{
1781	make_current ();	1797	make_current ();
1782		1798
		1799	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
		1800	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
		1801	return;
		1802
		1803	# if TRANSPARENT
1783	switch (ev.type)	1804	switch (ev.type)
1784	{	1805	{
1785	case PropertyNotify:	1806	case PropertyNotify:
1786	/*	1807	/*
1787	* if user used some Esetroot compatible prog to set the root bg,	1808	* if user used some Esetroot compatible prog to set the root bg,
…		…
1795	case ReparentNotify:	1816	case ReparentNotify:
1796	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)	1817	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1797	want_refresh = want_full_refresh = 1;	1818	want_refresh = want_full_refresh = 1;
1798	break;	1819	break;
1799	}	1820	}
		1821	# endif
1800	}	1822	}
1801	#endif	1823	#endif
1802		1824
1803	void	1825	void
1804	rxvt_term::button_press (XButtonEvent &ev)	1826	rxvt_term::button_press (XButtonEvent &ev)
…		…
2430	pchanged = 0;	2452	pchanged = 0;
2431		2453
2432	if (!OPTION (Opt_transparent))	2454	if (!OPTION (Opt_transparent))
2433	return pchanged; /* Don't try any more */	2455	return pchanged; /* Don't try any more */
2434		2456
2435	XGetWindowAttributes (xdisp, display->root, &wrootattr);	2457	XGetWindowAttributes (dpy, display->root, &wrootattr);
2436	rootdepth = wrootattr.depth;	2458	rootdepth = wrootattr.depth;
2437		2459
2438	XGetWindowAttributes (xdisp, parent[0], &wattr);	2460	XGetWindowAttributes (dpy, parent[0], &wattr);
2439		2461
2440	if (rootdepth != wattr.depth)	2462	if (rootdepth != wattr.depth)
2441	{	2463	{
2442	if (am_transparent)	2464	if (am_transparent)
2443	{	2465	{
2444	pchanged = 1;	2466	pchanged = 1;
2445	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);	2467	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2446	am_transparent = am_pixmap_trans = 0;	2468	am_transparent = am_pixmap_trans = 0;
2447	}	2469	}
2448		2470
2449	return pchanged; /* Don't try any more */	2471	return pchanged; /* Don't try any more */
2450	}	2472	}
2451		2473
2452	/* Get all X ops out of the queue so that our information is up-to-date. */	2474	/* Get all X ops out of the queue so that our information is up-to-date. */
2453	XSync (xdisp, False);	2475	XSync (dpy, False);
2454		2476
2455	/*	2477	/*
2456	* Make the frame window set by the window manager have	2478	* Make the frame window set by the window manager have
2457	* the root background. Some window managers put multiple nested frame	2479	* the root background. Some window managers put multiple nested frame
2458	* windows for each client, so we have to take care about that.	2480	* windows for each client, so we have to take care about that.
2459	*/	2481	*/
2460	i = (xa[XA_XROOTPMAP_ID]	2482	i = (xa[XA_XROOTPMAP_ID]
2461	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],	2483	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2484	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463	&nitems, &bytes_after, &prop) == Success);	2485	&nitems, &bytes_after, &prop) == Success);
2464		2486
2465	if (!i \|\| prop == NULL)	2487	if (!i \|\| prop == NULL)
2466	i = (xa[XA_ESETROOT_PMAP_ID]	2488	i = (xa[XA_ESETROOT_PMAP_ID]
2467	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],	2489	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2468	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2490	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2469	&nitems, &bytes_after, &prop) == Success);	2491	&nitems, &bytes_after, &prop) == Success);
2470		2492
2471	if (!i \|\| prop == NULL	2493	if (!i \|\| prop == NULL
2472	#if TINTING	2494	#if TINTING
…		…
2491	Window cr;	2513	Window cr;
2492	XImage *image;	2514	XImage *image;
2493	GC gc;	2515	GC gc;
2494	XGCValues gcvalue;	2516	XGCValues gcvalue;
2495		2517
2496	XTranslateCoordinates (xdisp, parent[0], display->root,	2518	XTranslateCoordinates (dpy, parent[0], display->root,
2497	0, 0, &sx, &sy, &cr);	2519	0, 0, &sx, &sy, &cr);
2498	nw = (unsigned int)szHint.width;	2520	nw = (unsigned int)szHint.width;
2499	nh = (unsigned int)szHint.height;	2521	nh = (unsigned int)szHint.height;
2500	nx = ny = 0;	2522	nx = ny = 0;
2501		2523
…		…
2514	}	2536	}
2515		2537
2516	min_it (nw, (unsigned int) (wrootattr.width - sx));	2538	min_it (nw, (unsigned int) (wrootattr.width - sx));
2517	min_it (nh, (unsigned int) (wrootattr.height - sy));	2539	min_it (nh, (unsigned int) (wrootattr.height - sy));
2518		2540
2519	XSync (xdisp, False);	2541	XSync (dpy, False);
2520	allowedxerror = -1;	2542	allowedxerror = -1;
2521	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2543	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2522		2544
2523	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2545	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2524	/* XXX: may need a delay here? */	2546	/* XXX: may need a delay here? */
2525	allowedxerror = 0;	2547	allowedxerror = 0;
2526		2548
…		…
2529	if (am_transparent && am_pixmap_trans)	2551	if (am_transparent && am_pixmap_trans)
2530	{	2552	{
2531	pchanged = 1;	2553	pchanged = 1;
2532	if (pixmap != None)	2554	if (pixmap != None)
2533	{	2555	{
2534	XFreePixmap (xdisp, pixmap);	2556	XFreePixmap (dpy, pixmap);
2535	pixmap = None;	2557	pixmap = None;
2536	}	2558	}
2537	}	2559	}
2538		2560
2539	am_pixmap_trans = 0;	2561	am_pixmap_trans = 0;
2540	}	2562	}
2541	else	2563	else
2542	{	2564	{
2543	if (pixmap != None)	2565	if (pixmap != None)
2544	XFreePixmap (xdisp, pixmap);	2566	XFreePixmap (dpy, pixmap);
2545		2567
2546	#if TINTING	2568	#if TINTING
2547	if (ISSET_PIXCOLOR (Color_tint))	2569	if (ISSET_PIXCOLOR (Color_tint))
2548	{	2570	{
2549	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2571	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
…		…
2553		2575
2554	ShadeXImage (this, image, shade, c.r, c.g, c.b);	2576	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2555	}	2577	}
2556	#endif	2578	#endif
2557		2579
2558	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);	2580	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2559	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);	2581	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2560	XPutImage (xdisp, pixmap, gc, image, 0, 0,	2582	XPutImage (dpy, pixmap, gc, image, 0, 0,
2561	nx, ny, image->width, image->height);	2583	nx, ny, image->width, image->height);
2562	XFreeGC (xdisp, gc);	2584	XFreeGC (dpy, gc);
2563	XDestroyImage (image);	2585	XDestroyImage (image);
2564	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);	2586	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2565	XClearWindow (xdisp, parent[0]);	2587	XClearWindow (dpy, parent[0]);
2566		2588
2567	if (!am_transparent \|\| !am_pixmap_trans)	2589	if (!am_transparent \|\| !am_pixmap_trans)
2568	pchanged = 1;	2590	pchanged = 1;
2569		2591
2570	am_transparent = am_pixmap_trans = 1;	2592	am_transparent = am_pixmap_trans = 1;
2571	}	2593	}
2572	}	2594	}
2573		2595
2574	if (am_pixmap_trans)	2596	if (am_pixmap_trans)
2575	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);	2597	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2576	else	2598	else
2577	{	2599	{
2578	unsigned int n;	2600	unsigned int n;
2579	/*	2601	/*
2580	* InheritPixmap transparency	2602	* InheritPixmap transparency
2581	*/	2603	*/
2582	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2604	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583	{	2605	{
2584	oldp = parent[i];	2606	oldp = parent[i];
2585	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);	2607	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2586	XFree (list);	2608	XFree (list);
2587		2609
2588	if (parent[i] == display->root)	2610	if (parent[i] == display->root)
2589	{	2611	{
2590	if (oldp != None)	2612	if (oldp != None)
…		…
2600	n = 0;	2622	n = 0;
2601		2623
2602	if (pchanged)	2624	if (pchanged)
2603	for (; n < (unsigned int)i; n++)	2625	for (; n < (unsigned int)i; n++)
2604	{	2626	{
2605	XGetWindowAttributes (xdisp, parent[n], &wattr);	2627	XGetWindowAttributes (dpy, parent[n], &wattr);
2606		2628
2607	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2629	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2608	{	2630	{
2609	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2631	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610	break;	2632	break;
2611	}	2633	}
2612	}	2634	}
2613		2635
2614	if (n > (sizeof (parent) / sizeof (parent[0])))	2636	if (n > (sizeof (parent) / sizeof (parent[0])))
2615	{	2637	{
2616	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);	2638	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2617	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);	2639	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2618	am_transparent = 0;	2640	am_transparent = 0;
2619	/* XXX: also turn off Opt_transparent? */	2641	/* XXX: also turn off Opt_transparent? */
2620	}	2642	}
2621	else	2643	else
2622	{	2644	{
2623	for (n = 0; n < (unsigned int)i; n++)	2645	for (n = 0; n < (unsigned int)i; n++)
2624	{	2646	{
2625	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);	2647	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2626	XClearWindow (xdisp, parent[n]);	2648	XClearWindow (dpy, parent[n]);
2627	}	2649	}
2628		2650
2629	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);	2651	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2630	am_transparent = 1;	2652	am_transparent = 1;
2631	}	2653	}
2632		2654
2633	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2655	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2634	parent[i] = None;	2656	parent[i] = None;
2635	}	2657	}
2636		2658
2637	if (scrollBar.win)	2659	if (scrollBar.win)
2638	{	2660	{
2639	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);	2661	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2640	scrollBar.setIdle ();	2662	scrollBar.setIdle ();
2641	scrollbar_show (0);	2663	scrollbar_show (0);
2642	}	2664	}
2643		2665
2644	if (am_transparent)	2666	if (am_transparent)
…		…
2762	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2784	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2763	refresh_limit++;	2785	refresh_limit++;
2764	else	2786	else
2765	{	2787	{
2766	flag = true;	2788	flag = true;
		2789	//TODO: due to popular request, implement "skipscroll" option here
2767	scr_refresh ();	2790	scr_refresh ();
2768	want_refresh = 1;	2791	want_refresh = 1;
2769	}	2792	}
2770	}	2793	}
2771		2794
…		…
3535	{	3558	{
3536	int x, y;	3559	int x, y;
3537	XWindowAttributes wattr;	3560	XWindowAttributes wattr;
3538	Window wdummy;	3561	Window wdummy;
3539		3562
3540	dLocal (Display *, xdisp);	3563	dLocal (Display *, dpy);
3541		3564
3542	if (nargs == 0)	3565	if (nargs == 0)
3543	return;	3566	return;
3544		3567
3545	switch (args[0])	3568	switch (args[0])
3546	{	3569	{
3547	/*	3570	/*
3548	* commands	3571	* commands
3549	*/	3572	*/
3550	case 1: /* deiconify window */	3573	case 1: /* deiconify window */
3551	XMapWindow (xdisp, parent[0]);	3574	XMapWindow (dpy, parent[0]);
3552	break;	3575	break;
3553	case 2: /* iconify window */	3576	case 2: /* iconify window */
3554	XIconifyWindow (xdisp, parent[0], display->screen);	3577	XIconifyWindow (dpy, parent[0], display->screen);
3555	break;	3578	break;
3556	case 3: /* set position (pixels) */	3579	case 3: /* set position (pixels) */
3557	XMoveWindow (xdisp, parent[0], args[1], args[2]);	3580	XMoveWindow (dpy, parent[0], args[1], args[2]);
3558	break;	3581	break;
3559	case 4: /* set size (pixels) */	3582	case 4: /* set size (pixels) */
3560	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3583	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561	break;	3584	break;
3562	case 5: /* raise window */	3585	case 5: /* raise window */
3563	XRaiseWindow (xdisp, parent[0]);	3586	XRaiseWindow (dpy, parent[0]);
3564	break;	3587	break;
3565	case 6: /* lower window */	3588	case 6: /* lower window */
3566	XLowerWindow (xdisp, parent[0]);	3589	XLowerWindow (dpy, parent[0]);
3567	break;	3590	break;
3568	case 7: /* refresh window */	3591	case 7: /* refresh window */
3569	scr_touch (true);	3592	scr_touch (true);
3570	break;	3593	break;
3571	case 8: /* set size (chars) */	3594	case 8: /* set size (chars) */
…		…
3582		3605
3583	/*	3606	/*
3584	* reports - some output format copied from XTerm	3607	* reports - some output format copied from XTerm
3585	*/	3608	*/
3586	case 11: /* report window state */	3609	case 11: /* report window state */
3587	XGetWindowAttributes (xdisp, parent[0], &wattr);	3610	XGetWindowAttributes (dpy, parent[0], &wattr);
3588	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3611	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3589	break;	3612	break;
3590	case 13: /* report window position */	3613	case 13: /* report window position */
3591	XGetWindowAttributes (xdisp, parent[0], &wattr);	3614	XGetWindowAttributes (dpy, parent[0], &wattr);
3592	XTranslateCoordinates (xdisp, parent[0], wattr.root,	3615	XTranslateCoordinates (dpy, parent[0], wattr.root,
3593	-wattr.border_width, -wattr.border_width,	3616	-wattr.border_width, -wattr.border_width,
3594	&x, &y, &wdummy);	3617	&x, &y, &wdummy);
3595	tt_printf ("\033[3;%d;%dt", x, y);	3618	tt_printf ("\033[3;%d;%dt", x, y);
3596	break;	3619	break;
3597	case 14: /* report window size (pixels) */	3620	case 14: /* report window size (pixels) */
3598	XGetWindowAttributes (xdisp, parent[0], &wattr);	3621	XGetWindowAttributes (dpy, parent[0], &wattr);
3599	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3622	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3600	break;	3623	break;
3601	case 18: /* report text area size (chars) */	3624	case 18: /* report text area size (chars) */
3602	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3625	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3603	break;	3626	break;
…		…
3605	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3628	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3606	break;	3629	break;
3607	case 20: /* report icon label */	3630	case 20: /* report icon label */
3608	{	3631	{
3609	char *s;	3632	char *s;
3610	XGetIconName (xdisp, parent[0], &s);	3633	XGetIconName (dpy, parent[0], &s);
3611	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3634	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3612	XFree (s);	3635	XFree (s);
3613	}	3636	}
3614	break;	3637	break;
3615	case 21: /* report window title */	3638	case 21: /* report window title */
3616	{	3639	{
3617	char *s;	3640	char *s;
3618	XFetchName (xdisp, parent[0], &s);	3641	XFetchName (dpy, parent[0], &s);
3619	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3642	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3620	XFree (s);	3643	XFree (s);
3621	}	3644	}
3622	break;	3645	break;
3623	}	3646	}
…		…
3749	int color;	3772	int color;
3750	char buf, name;	3773	char buf, name;
3751	bool query = str[0] == '?' && !str[1];	3774	bool query = str[0] == '?' && !str[1];
3752	int saveop = op;	3775	int saveop = op;
3753		3776
3754	dLocal (Display *, xdisp);	3777	dLocal (Display *, dpy);
3755		3778
3756	assert (str != NULL);	3779	assert (str != NULL);
		3780
		3781	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3782	return;
		3783
3757	switch (op)	3784	switch (op)
3758	{	3785	{
3759	case XTerm_name:	3786	case XTerm_name:
3760	set_title (str);	3787	set_title (str);
3761	/* FALLTHROUGH */	3788	/* FALLTHROUGH */
…		…
3775	unsigned long bytes_after;	3802	unsigned long bytes_after;
3776	unsigned char *value = 0;	3803	unsigned char *value = 0;
3777	const char *str = "";	3804	const char *str = "";
3778		3805
3779	if (prop	3806	if (prop
3780	&& XGetWindowProperty (xdisp, parent[0],	3807	&& XGetWindowProperty (dpy, parent[0],
3781	prop, 0, 1<<16, 0, AnyPropertyType,	3808	prop, 0, 1<<16, 0, AnyPropertyType,
3782	&actual_type, &actual_format,	3809	&actual_type, &actual_format,
3783	&nitems, &bytes_after, &value) == Success	3810	&nitems, &bytes_after, &value) == Success
3784	&& actual_type != None	3811	&& actual_type != None
3785	&& actual_format == 8)	3812	&& actual_format == 8)
…		…
3797	{	3824	{
3798	*eq = 0;	3825	*eq = 0;
3799	set_utf8_property (display->atom (str), eq + 1);	3826	set_utf8_property (display->atom (str), eq + 1);
3800	}	3827	}
3801	else	3828	else
3802	XDeleteProperty (xdisp, parent[0],	3829	XDeleteProperty (dpy, parent[0],
3803	display->atom (str));	3830	display->atom (str));
3804	}	3831	}
3805	break;	3832	break;
3806		3833
3807	case XTerm_Color:	3834	case XTerm_Color:
…		…
3978	break;	4005	break;
3979	#endif	4006	#endif
3980		4007
3981	#if ENABLE_PERL	4008	#if ENABLE_PERL
3982	case URxvt_perl:	4009	case URxvt_perl:
3983	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	4010	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3984	; // no responses yet	4011	; // no responses yet
3985	break;	4012	break;
3986	#endif	4013	#endif
3987	}	4014	}
3988	}	4015	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.304 by root, Tue Jan 31 22:01:25 2006 UTC vs. Revision 1.314 by root, Thu Jul 6 23:48:11 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.304 by root, Tue Jan 31 22:01:25 2006 UTC vs.
Revision 1.314 by root, Thu Jul 6 23:48:11 2006 UTC