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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC vs.
Revision 1.319 by ayin, Fri Feb 16 21:46:05 2007 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	{
…		…
1103		1183
1104	void yield_cb (check_watcher &w)	1184	void yield_cb (check_watcher &w)
1105	{	1185	{
1106	// this should really be sched_yield(), but the linux guys thought	1186	// this should really be sched_yield(), but the linux guys thought
1107	// that giving a process calling sched_yield () less cpu time than	1187	// that giving a process calling sched_yield () less cpu time than
1108	// ones with high nice levels.	1188	// ones with high nice levels is a useful thing to do. It surely is is
		1189	// allowed by the sus... as is returning ENOSYS.
1109		1190
1110	struct timespec ts = { 0, 0 };	1191	struct timespec ts = { 0, 0 };
1111	nanosleep (&ts, 0);	1192	nanosleep (&ts, 0);
1112		1193
1113	w.stop ();	1194	w.stop ();
…		…
1176	}	1257	}
1177		1258
1178	void	1259	void
1179	rxvt_term::pointer_unblank ()	1260	rxvt_term::pointer_unblank ()
1180	{	1261	{
1181	XDefineCursor (xdisp, vt, TermWin_cursor);	1262	XDefineCursor (dpy, vt, TermWin_cursor);
1182	recolour_cursor ();	1263	recolour_cursor ();
1183		1264
1184	#ifdef POINTER_BLANK	1265	#ifdef POINTER_BLANK
1185	hidden_pointer = 0;	1266	hidden_pointer = 0;
1186		1267
…		…
1194	rxvt_term::pointer_blank ()	1275	rxvt_term::pointer_blank ()
1195	{	1276	{
1196	if (!OPTION (Opt_pointerBlank))	1277	if (!OPTION (Opt_pointerBlank))
1197	return;	1278	return;
1198		1279
1199	XDefineCursor (xdisp, vt, display->blank_cursor);	1280	XDefineCursor (dpy, vt, display->blank_cursor);
1200	XFlush (xdisp);	1281	XFlush (dpy);
1201		1282
1202	hidden_pointer = 1;	1283	hidden_pointer = 1;
1203	}	1284	}
1204		1285
1205	void	1286	void
…		…
1284	void	1365	void
1285	rxvt_term::x_cb (XEvent &ev)	1366	rxvt_term::x_cb (XEvent &ev)
1286	{	1367	{
1287	make_current ();	1368	make_current ();
1288		1369
1289	dLocal (Display *, xdisp);	1370	dLocal (Display *, dpy);
1290		1371
1291	if (ev.xany.window == vt	1372	if (ev.xany.window == vt
1292	&& SHOULD_INVOKE (HOOK_X_EVENT)	1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
1293	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1294	return;	1375	return;
…		…
1299	unsigned int unused_mask;	1380	unsigned int unused_mask;
1300		1381
1301	switch (ev.type)	1382	switch (ev.type)
1302	{	1383	{
1303	case KeyPress:	1384	case KeyPress:
1304	#if ISO_14755	1385	key_press (ev.xkey);
1305	if (!(iso14755buf & ISO_14755_52))
1306	#endif
1307	lookup_key (ev.xkey);
1308
1309	break;	1386	break;
1310		1387
1311	case KeyRelease:	1388	case KeyRelease:
1312	{	1389	key_release (ev.xkey);
1313	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1314	KeySym keysym;
1315
1316	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1317	#endif
1318
1319	#if ENABLE_FRILLS \|\| ISO_14755
1320	// ISO 14755 support
1321	if (iso14755buf)
1322	if (iso14755buf & ISO_14755_52)
1323	{
1324	# if ENABLE_OVERLAY
1325	scr_overlay_off ();
1326	# endif
1327	# if ISO_14755
1328	// iso14755 part 5.2 handling: release time
1329	// first: controls
1330	if ((ev.xkey.state & ControlMask)
1331	&& ((keysym >= 0x40 && keysym <= 0x5f)
1332	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1333	{
1334	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1335	commit_iso14755 ();
1336	goto skip_switch;
1337	}
1338
1339	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1340	if (i[0] == keysym)
1341	{
1342	iso14755buf = ISO_14755_51 \| i[1];
1343	commit_iso14755 ();
1344	goto skip_switch;
1345	}
1346
1347	scr_bell ();
1348	# endif
1349	iso14755buf = 0;
1350	break;
1351	}
1352	else if ((ev.xkey.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
1353	{
1354	# if ENABLE_OVERLAY
1355	scr_overlay_off ();
1356	# endif
1357	if (iso14755buf & ISO_14755_51)
1358	commit_iso14755 ();
1359	#if ISO_14755
1360	else if (iso14755buf & ISO_14755_STARTED)
1361	{
1362	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1363
1364	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1365	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1366	}
1367	# endif
1368	else
1369	iso14755buf = 0;
1370	}
1371	#endif
1372
1373	if (ev.xany.window == vt
1374	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1375	break;
1376
1377	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378	if (!(ev.xkey.state & ControlMask))
1379	slip_wheel_ev.stop ();
1380	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1381	mouse_slip_wheel_speed = 0;
1382	#endif
1383	break;	1390	break;
1384	}
1385		1391
1386	case ButtonPress:	1392	case ButtonPress:
1387	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1388	break;	1394	break;
1389		1395
…		…
1404	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)))
1405	destroy ();	1411	destroy ();
1406	}	1412	}
1407	#if ENABLE_EWMH	1413	#if ENABLE_EWMH
1408	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])
1409	XSendEvent (xdisp, ev.xclient.window = display->root,	1415	XSendEvent (dpy, ev.xclient.window = display->root,
1410	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1416	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1411	&ev);	1417	&ev);
1412	#endif	1418	#endif
1413	}	1419	}
1414	}	1420	}
…		…
1452	break;	1458	break;
1453	}	1459	}
1454	break;	1460	break;
1455		1461
1456	case FocusIn:	1462	case FocusIn:
		1463	if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1457	focus_in ();	1464	focus_in ();
1458	break;	1465	break;
1459		1466
1460	case FocusOut:	1467	case FocusOut:
		1468	if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1461	focus_out ();	1469	focus_out ();
1462	break;	1470	break;
1463		1471
1464	case ConfigureNotify:	1472	case ConfigureNotify:
1465	if (ev.xconfigure.window == parent[0])	1473	if (ev.xconfigure.window == parent[0])
1466	{	1474	{
1467	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))	1475	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1468	;	1476	;
1469		1477
1470	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1478	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1471	{	1479	{
1472	seen_resize = 1;	1480	seen_resize = 1;
1473	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1481	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1474	}	1482	}
1475		1483
1476	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1484	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1477		1485
1478	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1486	#ifdef TRANSPARENT
1479	if (OPTION (Opt_transparent))	1487	if (OPTION (Opt_transparent))
1480	check_our_parents ();	1488	check_our_parents ();
1481	#endif	1489	#endif
1482	}	1490	}
1483	break;	1491	break;
…		…
1530	if (ev.xany.window == vt)	1538	if (ev.xany.window == vt)
1531	{	1539	{
1532	do	1540	do
1533	scr_expose (ev.xexpose.x, ev.xexpose.y,	1541	scr_expose (ev.xexpose.x, ev.xexpose.y,
1534	ev.xexpose.width, ev.xexpose.height, False);	1542	ev.xexpose.width, ev.xexpose.height, False);
1535	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));	1543	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1536		1544
1537	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1545	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1538		1546
1539	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))	1547	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540	scr_expose (ev.xexpose.x, ev.xexpose.y,	1548	scr_expose (ev.xexpose.x, ev.xexpose.y,
1541	ev.xexpose.width, ev.xexpose.height, False);	1549	ev.xexpose.width, ev.xexpose.height, False);
1542		1550
1543	want_refresh = 1;	1551	want_refresh = 1;
1544	}	1552	}
1545	else	1553	else
1546	{	1554	{
1547	XEvent unused_event;	1555	XEvent unused_event;
1548		1556
1549	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))	1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1550	;	1558	;
1551	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))	1559	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1552	;	1560	;
1553		1561
1554	if (isScrollbarWindow (ev.xany.window))	1562	if (isScrollbarWindow (ev.xany.window))
1555	{	1563	{
1556	scrollBar.setIdle ();	1564	scrollBar.setIdle ();
1557	scrollbar_show (0);	1565	scrollbar_show (0);
1558	}	1566	}
1559		1567
1560	#ifdef TRANSPARENT	1568	#ifdef TRANSPARENT
1561	if (am_transparent && ev.xany.window == parent[0])	1569	if (am_transparent && ev.xany.window == parent[0])
1562	XClearWindow (xdisp, ev.xany.window);	1570	XClearWindow (dpy, ev.xany.window);
1563	#endif	1571	#endif
1564	}	1572	}
1565	break;	1573	break;
1566		1574
1567	case MotionNotify:	1575	case MotionNotify:
…		…
1577	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1585	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1578	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1586	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1579	; // nop	1587	; // nop
1580	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1588	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1581	{	1589	{
1582	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))	1590	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1583	;	1591	;
1584		1592
1585	XQueryPointer (xdisp, vt,	1593	XQueryPointer (dpy, vt,
1586	&unused_root, &unused_child,	1594	&unused_root, &unused_child,
1587	&unused_root_x, &unused_root_y,	1595	&unused_root_x, &unused_root_y,
1588	&ev.xbutton.x, &ev.xbutton.y,	1596	&ev.xbutton.x, &ev.xbutton.y,
1589	&ev.xbutton.state);	1597	&ev.xbutton.state);
1590	#ifdef MOUSE_THRESHOLD	1598	#ifdef MOUSE_THRESHOLD
…		…
1654	#endif	1662	#endif
1655	}	1663	}
1656	}	1664	}
1657	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1665	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1658	{	1666	{
1659	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,	1667	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1660	MotionNotify, &ev))	1668	MotionNotify, &ev))
1661	;	1669	;
1662		1670
1663	XQueryPointer (xdisp, scrollBar.win,	1671	XQueryPointer (dpy, scrollBar.win,
1664	&unused_root, &unused_child,	1672	&unused_root, &unused_child,
1665	&unused_root_x, &unused_root_y,	1673	&unused_root_x, &unused_root_y,
1666	&ev.xbutton.x, &ev.xbutton.y,	1674	&ev.xbutton.x, &ev.xbutton.y,
1667	&unused_mask);	1675	&unused_mask);
1668	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1676	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1672	scrollbar_show (1);	1680	scrollbar_show (1);
1673	}	1681	}
1674	break;	1682	break;
1675	}	1683	}
1676		1684
1677	skip_switch: ;
1678
1679	#if defined(CURSOR_BLINK)	1685	#if defined(CURSOR_BLINK)
1680	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1686	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1681	{	1687	{
1682	if (hidden_cursor)	1688	if (hidden_cursor)
1683	{	1689	{
…		…
1710	if (!focus)	1716	if (!focus)
1711	{	1717	{
1712	focus = 1;	1718	focus = 1;
1713	want_refresh = 1;	1719	want_refresh = 1;
1714		1720
1715	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1721	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1716		1722
1717	#if USE_XIM	1723	#if USE_XIM
1718	if (Input_Context != NULL)	1724	if (Input_Context != NULL)
1719	{	1725	{
1720	IMSetStatusPosition ();	1726	IMSetPosition ();
1721	XSetICFocus (Input_Context);	1727	XSetICFocus (Input_Context);
1722	}	1728	}
1723	#endif	1729	#endif
1724	#if CURSOR_BLINK	1730	#if CURSOR_BLINK
1725	if (OPTION (Opt_cursorBlink))	1731	if (OPTION (Opt_cursorBlink))
…		…
1771	}	1777	}
1772	#endif	1778	#endif
1773	}	1779	}
1774	}	1780	}
1775		1781
1776	#if TRANSPARENT	1782	void
		1783	rxvt_term::update_fade_color (unsigned int idx)
		1784	{
		1785	#if OFF_FOCUS_FADING
		1786	if (rs[Rs_fade])
		1787	{
		1788	rgba c;
		1789	pix_colors [Color_fade].get (c);
		1790	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		1791	}
		1792	#endif
		1793	}
		1794
		1795	#if TRANSPARENT \|\| ENABLE_PERL
1777	void	1796	void
1778	rxvt_term::rootwin_cb (XEvent &ev)	1797	rxvt_term::rootwin_cb (XEvent &ev)
1779	{	1798	{
1780	make_current ();	1799	make_current ();
1781		1800
		1801	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
		1802	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
		1803	return;
		1804
		1805	# if TRANSPARENT
1782	switch (ev.type)	1806	switch (ev.type)
1783	{	1807	{
1784	case PropertyNotify:	1808	case PropertyNotify:
1785	/*	1809	/*
1786	* if user used some Esetroot compatible prog to set the root bg,	1810	* if user used some Esetroot compatible prog to set the root bg,
…		…
1794	case ReparentNotify:	1818	case ReparentNotify:
1795	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)	1819	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1796	want_refresh = want_full_refresh = 1;	1820	want_refresh = want_full_refresh = 1;
1797	break;	1821	break;
1798	}	1822	}
		1823	# endif
1799	}	1824	}
1800	#endif	1825	#endif
1801		1826
1802	void	1827	void
1803	rxvt_term::button_press (XButtonEvent &ev)	1828	rxvt_term::button_press (XButtonEvent &ev)
…		…
2131	selection_make (ev.time);	2156	selection_make (ev.time);
2132	break;	2157	break;
2133		2158
2134	case Button2:	2159	case Button2:
2135	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2160	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2136	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);	2161	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2137	break;	2162	break;
2138		2163
2139	#ifdef MOUSE_WHEEL	2164	#ifdef MOUSE_WHEEL
2140	case Button4:	2165	case Button4:
2141	case Button5:	2166	case Button5:
…		…
2429	pchanged = 0;	2454	pchanged = 0;
2430		2455
2431	if (!OPTION (Opt_transparent))	2456	if (!OPTION (Opt_transparent))
2432	return pchanged; /* Don't try any more */	2457	return pchanged; /* Don't try any more */
2433		2458
2434	XGetWindowAttributes (xdisp, display->root, &wrootattr);	2459	XGetWindowAttributes (dpy, display->root, &wrootattr);
2435	rootdepth = wrootattr.depth;	2460	rootdepth = wrootattr.depth;
2436		2461
2437	XGetWindowAttributes (xdisp, parent[0], &wattr);	2462	XGetWindowAttributes (dpy, parent[0], &wattr);
2438		2463
2439	if (rootdepth != wattr.depth)	2464	if (rootdepth != wattr.depth)
2440	{	2465	{
2441	if (am_transparent)	2466	if (am_transparent)
2442	{	2467	{
2443	pchanged = 1;	2468	pchanged = 1;
2444	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);	2469	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2445	am_transparent = am_pixmap_trans = 0;	2470	am_transparent = am_pixmap_trans = 0;
2446	}	2471	}
2447		2472
2448	return pchanged; /* Don't try any more */	2473	return pchanged; /* Don't try any more */
2449	}	2474	}
2450		2475
2451	/* Get all X ops out of the queue so that our information is up-to-date. */	2476	/* Get all X ops out of the queue so that our information is up-to-date. */
2452	XSync (xdisp, False);	2477	XSync (dpy, False);
2453		2478
2454	/*	2479	/*
2455	* Make the frame window set by the window manager have	2480	* Make the frame window set by the window manager have
2456	* the root background. Some window managers put multiple nested frame	2481	* the root background. Some window managers put multiple nested frame
2457	* windows for each client, so we have to take care about that.	2482	* windows for each client, so we have to take care about that.
2458	*/	2483	*/
2459	i = (xa[XA_XROOTPMAP_ID]	2484	i = (xa[XA_XROOTPMAP_ID]
2460	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],	2485	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2461	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2486	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2462	&nitems, &bytes_after, &prop) == Success);	2487	&nitems, &bytes_after, &prop) == Success);
2463		2488
2464	if (!i \|\| prop == NULL)	2489	if (!i \|\| prop == NULL)
2465	i = (xa[XA_ESETROOT_PMAP_ID]	2490	i = (xa[XA_ESETROOT_PMAP_ID]
2466	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],	2491	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2467	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2492	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2468	&nitems, &bytes_after, &prop) == Success);	2493	&nitems, &bytes_after, &prop) == Success);
2469		2494
2470	if (!i \|\| prop == NULL	2495	if (!i \|\| prop == NULL
2471	#if TINTING	2496	#if TINTING
…		…
2490	Window cr;	2515	Window cr;
2491	XImage *image;	2516	XImage *image;
2492	GC gc;	2517	GC gc;
2493	XGCValues gcvalue;	2518	XGCValues gcvalue;
2494		2519
2495	XTranslateCoordinates (xdisp, parent[0], display->root,	2520	XTranslateCoordinates (dpy, parent[0], display->root,
2496	0, 0, &sx, &sy, &cr);	2521	0, 0, &sx, &sy, &cr);
2497	nw = (unsigned int)szHint.width;	2522	nw = (unsigned int)szHint.width;
2498	nh = (unsigned int)szHint.height;	2523	nh = (unsigned int)szHint.height;
2499	nx = ny = 0;	2524	nx = ny = 0;
2500		2525
…		…
2513	}	2538	}
2514		2539
2515	min_it (nw, (unsigned int) (wrootattr.width - sx));	2540	min_it (nw, (unsigned int) (wrootattr.width - sx));
2516	min_it (nh, (unsigned int) (wrootattr.height - sy));	2541	min_it (nh, (unsigned int) (wrootattr.height - sy));
2517		2542
2518	XSync (xdisp, False);	2543	XSync (dpy, False);
2519	allowedxerror = -1;	2544	allowedxerror = -1;
2520	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2545	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2521		2546
2522	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2547	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2523	/* XXX: may need a delay here? */	2548	/* XXX: may need a delay here? */
2524	allowedxerror = 0;	2549	allowedxerror = 0;
2525		2550
…		…
2528	if (am_transparent && am_pixmap_trans)	2553	if (am_transparent && am_pixmap_trans)
2529	{	2554	{
2530	pchanged = 1;	2555	pchanged = 1;
2531	if (pixmap != None)	2556	if (pixmap != None)
2532	{	2557	{
2533	XFreePixmap (xdisp, pixmap);	2558	XFreePixmap (dpy, pixmap);
2534	pixmap = None;	2559	pixmap = None;
2535	}	2560	}
2536	}	2561	}
2537		2562
2538	am_pixmap_trans = 0;	2563	am_pixmap_trans = 0;
2539	}	2564	}
2540	else	2565	else
2541	{	2566	{
2542	if (pixmap != None)	2567	if (pixmap != None)
2543	XFreePixmap (xdisp, pixmap);	2568	XFreePixmap (dpy, pixmap);
2544		2569
2545	#if TINTING	2570	#if TINTING
2546	if (ISSET_PIXCOLOR (Color_tint))	2571	if (ISSET_PIXCOLOR (Color_tint))
2547	{	2572	{
2548	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2573	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
…		…
2552		2577
2553	ShadeXImage (this, image, shade, c.r, c.g, c.b);	2578	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2554	}	2579	}
2555	#endif	2580	#endif
2556		2581
2557	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);	2582	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2558	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);	2583	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2559	XPutImage (xdisp, pixmap, gc, image, 0, 0,	2584	XPutImage (dpy, pixmap, gc, image, 0, 0,
2560	nx, ny, image->width, image->height);	2585	nx, ny, image->width, image->height);
2561	XFreeGC (xdisp, gc);	2586	XFreeGC (dpy, gc);
2562	XDestroyImage (image);	2587	XDestroyImage (image);
2563	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);	2588	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2564	XClearWindow (xdisp, parent[0]);	2589	XClearWindow (dpy, parent[0]);
2565		2590
2566	if (!am_transparent \|\| !am_pixmap_trans)	2591	if (!am_transparent \|\| !am_pixmap_trans)
2567	pchanged = 1;	2592	pchanged = 1;
2568		2593
2569	am_transparent = am_pixmap_trans = 1;	2594	am_transparent = am_pixmap_trans = 1;
2570	}	2595	}
2571	}	2596	}
2572		2597
2573	if (am_pixmap_trans)	2598	if (am_pixmap_trans)
2574	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);	2599	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2575	else	2600	else
2576	{	2601	{
2577	unsigned int n;	2602	unsigned int n;
2578	/*	2603	/*
2579	* InheritPixmap transparency	2604	* InheritPixmap transparency
2580	*/	2605	*/
2581	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2606	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582	{	2607	{
2583	oldp = parent[i];	2608	oldp = parent[i];
2584	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);	2609	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2585	XFree (list);	2610	XFree (list);
2586		2611
2587	if (parent[i] == display->root)	2612	if (parent[i] == display->root)
2588	{	2613	{
2589	if (oldp != None)	2614	if (oldp != None)
…		…
2599	n = 0;	2624	n = 0;
2600		2625
2601	if (pchanged)	2626	if (pchanged)
2602	for (; n < (unsigned int)i; n++)	2627	for (; n < (unsigned int)i; n++)
2603	{	2628	{
2604	XGetWindowAttributes (xdisp, parent[n], &wattr);	2629	XGetWindowAttributes (dpy, parent[n], &wattr);
2605		2630
2606	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2631	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2607	{	2632	{
2608	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2633	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2609	break;	2634	break;
2610	}	2635	}
2611	}	2636	}
2612		2637
2613	if (n > (sizeof (parent) / sizeof (parent[0])))	2638	if (n > (sizeof (parent) / sizeof (parent[0])))
2614	{	2639	{
2615	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);	2640	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2616	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);	2641	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2617	am_transparent = 0;	2642	am_transparent = 0;
2618	/* XXX: also turn off Opt_transparent? */	2643	/* XXX: also turn off Opt_transparent? */
2619	}	2644	}
2620	else	2645	else
2621	{	2646	{
2622	for (n = 0; n < (unsigned int)i; n++)	2647	for (n = 0; n < (unsigned int)i; n++)
2623	{	2648	{
2624	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);	2649	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2625	XClearWindow (xdisp, parent[n]);	2650	XClearWindow (dpy, parent[n]);
2626	}	2651	}
2627		2652
2628	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);	2653	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2629	am_transparent = 1;	2654	am_transparent = 1;
2630	}	2655	}
2631		2656
2632	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2657	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2633	parent[i] = None;	2658	parent[i] = None;
2634	}	2659	}
2635		2660
2636	if (scrollBar.win)	2661	if (scrollBar.win)
2637	{	2662	{
2638	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);	2663	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2639	scrollBar.setIdle ();	2664	scrollBar.setIdle ();
2640	scrollbar_show (0);	2665	scrollbar_show (0);
2641	}	2666	}
2642		2667
2643	if (am_transparent)	2668	if (am_transparent)
…		…
2761	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2786	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2762	refresh_limit++;	2787	refresh_limit++;
2763	else	2788	else
2764	{	2789	{
2765	flag = true;	2790	flag = true;
		2791	//TODO: due to popular request, implement "skipscroll" option here
2766	scr_refresh ();	2792	scr_refresh ();
2767	want_refresh = 1;	2793	want_refresh = 1;
2768	}	2794	}
2769	}	2795	}
2770		2796
…		…
3534	{	3560	{
3535	int x, y;	3561	int x, y;
3536	XWindowAttributes wattr;	3562	XWindowAttributes wattr;
3537	Window wdummy;	3563	Window wdummy;
3538		3564
3539	dLocal (Display *, xdisp);	3565	dLocal (Display *, dpy);
3540		3566
3541	if (nargs == 0)	3567	if (nargs == 0)
3542	return;	3568	return;
3543		3569
3544	switch (args[0])	3570	switch (args[0])
3545	{	3571	{
3546	/*	3572	/*
3547	* commands	3573	* commands
3548	*/	3574	*/
3549	case 1: /* deiconify window */	3575	case 1: /* deiconify window */
3550	XMapWindow (xdisp, parent[0]);	3576	XMapWindow (dpy, parent[0]);
3551	break;	3577	break;
3552	case 2: /* iconify window */	3578	case 2: /* iconify window */
3553	XIconifyWindow (xdisp, parent[0], display->screen);	3579	XIconifyWindow (dpy, parent[0], display->screen);
3554	break;	3580	break;
3555	case 3: /* set position (pixels) */	3581	case 3: /* set position (pixels) */
3556	XMoveWindow (xdisp, parent[0], args[1], args[2]);	3582	XMoveWindow (dpy, parent[0], args[1], args[2]);
3557	break;	3583	break;
3558	case 4: /* set size (pixels) */	3584	case 4: /* set size (pixels) */
3559	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3585	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3560	break;	3586	break;
3561	case 5: /* raise window */	3587	case 5: /* raise window */
3562	XRaiseWindow (xdisp, parent[0]);	3588	XRaiseWindow (dpy, parent[0]);
3563	break;	3589	break;
3564	case 6: /* lower window */	3590	case 6: /* lower window */
3565	XLowerWindow (xdisp, parent[0]);	3591	XLowerWindow (dpy, parent[0]);
3566	break;	3592	break;
3567	case 7: /* refresh window */	3593	case 7: /* refresh window */
3568	scr_touch (true);	3594	scr_touch (true);
3569	break;	3595	break;
3570	case 8: /* set size (chars) */	3596	case 8: /* set size (chars) */
…		…
3581		3607
3582	/*	3608	/*
3583	* reports - some output format copied from XTerm	3609	* reports - some output format copied from XTerm
3584	*/	3610	*/
3585	case 11: /* report window state */	3611	case 11: /* report window state */
3586	XGetWindowAttributes (xdisp, parent[0], &wattr);	3612	XGetWindowAttributes (dpy, parent[0], &wattr);
3587	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3613	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3588	break;	3614	break;
3589	case 13: /* report window position */	3615	case 13: /* report window position */
3590	XGetWindowAttributes (xdisp, parent[0], &wattr);	3616	XGetWindowAttributes (dpy, parent[0], &wattr);
3591	XTranslateCoordinates (xdisp, parent[0], wattr.root,	3617	XTranslateCoordinates (dpy, parent[0], wattr.root,
3592	-wattr.border_width, -wattr.border_width,	3618	-wattr.border_width, -wattr.border_width,
3593	&x, &y, &wdummy);	3619	&x, &y, &wdummy);
3594	tt_printf ("\033[3;%d;%dt", x, y);	3620	tt_printf ("\033[3;%d;%dt", x, y);
3595	break;	3621	break;
3596	case 14: /* report window size (pixels) */	3622	case 14: /* report window size (pixels) */
3597	XGetWindowAttributes (xdisp, parent[0], &wattr);	3623	XGetWindowAttributes (dpy, parent[0], &wattr);
3598	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3624	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3599	break;	3625	break;
3600	case 18: /* report text area size (chars) */	3626	case 18: /* report text area size (chars) */
3601	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3627	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3602	break;	3628	break;
…		…
3604	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3630	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3605	break;	3631	break;
3606	case 20: /* report icon label */	3632	case 20: /* report icon label */
3607	{	3633	{
3608	char *s;	3634	char *s;
3609	XGetIconName (xdisp, parent[0], &s);	3635	XGetIconName (dpy, parent[0], &s);
3610	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3636	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3611	XFree (s);	3637	XFree (s);
3612	}	3638	}
3613	break;	3639	break;
3614	case 21: /* report window title */	3640	case 21: /* report window title */
3615	{	3641	{
3616	char *s;	3642	char *s;
3617	XFetchName (xdisp, parent[0], &s);	3643	XFetchName (dpy, parent[0], &s);
3618	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3644	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3619	XFree (s);	3645	XFree (s);
3620	}	3646	}
3621	break;	3647	break;
3622	}	3648	}
…		…
3650	seen_esc = true;	3676	seen_esc = true;
3651	continue;	3677	continue;
3652	}	3678	}
3653	else if (ch == C0_BEL \|\| ch == CHAR_ST)	3679	else if (ch == C0_BEL \|\| ch == CHAR_ST)
3654	break;	3680	break;
		3681	else if (ch == C0_SYN)
		3682	ch = cmd_get8 ();
3655	else if (ch < 0x20)	3683	else if (ch < 0x20)
3656	return NULL; /* other control character - exit */	3684	return NULL; /* other control character - exit */
3657		3685
3658	seen_esc = false;	3686	seen_esc = false;
3659		3687
3660	if (n >= STRING_MAX - 1)	3688	if (n >= STRING_MAX - 1)
3661	// stop at some sane length	3689	// stop at some sane length
3662	return NULL;	3690	return NULL;
3663		3691
3664	if (ch == C0_SYN)
3665	string[n++] = cmd_get8 ();
3666	else
3667	string[n++] = ch;	3692	string[n++] = ch;
3668	}	3693	}
3669		3694
3670	string[n++] = '\0';	3695	string[n++] = '\0';
3671		3696
3672	ends_how = (ch == 0x5c ? C0_ESC : ch);	3697	ends_how = (ch == 0x5c ? C0_ESC : ch);
…		…
3748	int color;	3773	int color;
3749	char buf, name;	3774	char buf, name;
3750	bool query = str[0] == '?' && !str[1];	3775	bool query = str[0] == '?' && !str[1];
3751	int saveop = op;	3776	int saveop = op;
3752		3777
3753	dLocal (Display *, xdisp);	3778	dLocal (Display *, dpy);
3754		3779
3755	assert (str != NULL);	3780	assert (str != NULL);
		3781
		3782	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3783	return;
		3784
3756	switch (op)	3785	switch (op)
3757	{	3786	{
3758	case XTerm_name:	3787	case XTerm_name:
3759	set_title (str);	3788	set_title (str);
3760	/* FALLTHROUGH */	3789	/* FALLTHROUGH */
…		…
3774	unsigned long bytes_after;	3803	unsigned long bytes_after;
3775	unsigned char *value = 0;	3804	unsigned char *value = 0;
3776	const char *str = "";	3805	const char *str = "";
3777		3806
3778	if (prop	3807	if (prop
3779	&& XGetWindowProperty (xdisp, parent[0],	3808	&& XGetWindowProperty (dpy, parent[0],
3780	prop, 0, 1<<16, 0, AnyPropertyType,	3809	prop, 0, 1<<16, 0, AnyPropertyType,
3781	&actual_type, &actual_format,	3810	&actual_type, &actual_format,
3782	&nitems, &bytes_after, &value) == Success	3811	&nitems, &bytes_after, &value) == Success
3783	&& actual_type != None	3812	&& actual_type != None
3784	&& actual_format == 8)	3813	&& actual_format == 8)
…		…
3796	{	3825	{
3797	*eq = 0;	3826	*eq = 0;
3798	set_utf8_property (display->atom (str), eq + 1);	3827	set_utf8_property (display->atom (str), eq + 1);
3799	}	3828	}
3800	else	3829	else
3801	XDeleteProperty (xdisp, parent[0],	3830	XDeleteProperty (dpy, parent[0],
3802	display->atom (str));	3831	display->atom (str));
3803	}	3832	}
3804	break;	3833	break;
3805		3834
3806	case XTerm_Color:	3835	case XTerm_Color:
…		…
3977	break;	4006	break;
3978	#endif	4007	#endif
3979		4008
3980	#if ENABLE_PERL	4009	#if ENABLE_PERL
3981	case URxvt_perl:	4010	case URxvt_perl:
3982	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	4011	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3983	; // no responses yet	4012	; // no responses yet
3984	break;	4013	break;
3985	#endif	4014	#endif
3986	}	4015	}
3987	}	4016	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC vs. Revision 1.319 by ayin, Fri Feb 16 21:46:05 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC vs.
Revision 1.319 by ayin, Fri Feb 16 21:46:05 2007 UTC