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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.283 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.317 by root, Sat Jan 13 15:06:54 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>
49	#include "rxvt.h"	49	#include "rxvt.h"
50	#include "rxvtperl.h"	50	#include "rxvtperl.h"
51	#include "version.h"	51	#include "version.h"
52	#include "command.h"	52	#include "command.h"
53		53
54	#if HAVE_SCHED_YIELD
55	#undef HAVE_SCHED_YIELD // disabled for the time being
56	//# include <sched.h>
57	#endif
58
59	#ifdef KEYSYM_RESOURCE	54	#ifdef KEYSYM_RESOURCE
60	# include "keyboard.h"	55	# include "keyboard.h"
61	#endif	56	#endif
62		57
63	#include <csignal>	58	#include <csignal>
		59
		60	#if LINUX_YIELD_HACK
		61	# include <ctime>
		62	#endif
64		63
65	/----------------------------------------------------------------------/	64	/----------------------------------------------------------------------/
66		65
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	66	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68		67
…		…
227	# if !UNICODE3	226	# if !UNICODE3
228	if (ch >= 0x10000)	227	if (ch >= 0x10000)
229	ch = 0xfffd;	228	ch = 0xfffd;
230	# endif	229	# endif
231	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
		231
		232	if (WCWIDTH (ch) >= 2)
232	scr_overlay_set (12, y, NOCHAR, r);	233	scr_overlay_set (12, y, NOCHAR, r);
233	}	234	}
234		235
		236	// {
		237	// char buf[4+4+3+1];
		238	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
		239	// scr_overlay_set (0, 0, buf);
		240	// }
235	scr_overlay_set (0, len , attr);	241	scr_overlay_set (0, len , attr);
236	scr_overlay_set (0, len + 1, fname);	242	scr_overlay_set (0, len + 1, fname);
237		243
238	free (fname);	244	free (fname);
239		245
…		…
292		298
293	return -1;	299	return -1;
294	}	300	}
295	#endif	301	#endif
296		302
297	/{{{ Convert the keypress event into a string /
298	void	303	void
299	rxvt_term::lookup_key (XKeyEvent &ev)	304	rxvt_term::key_press (XKeyEvent &ev)
300	{	305	{
301	int ctrl, meta, shft, len;	306	int ctrl, meta, shft, len;
302	unsigned int newlen;	307	unsigned int newlen;
303	KeySym keysym;	308	KeySym keysym;
304	int valid_keysym;	309	int valid_keysym;
305	char kbuf[KBUFSZ];	310	char kbuf[KBUFSZ];
		311
		312	#if ISO_14755
		313	if (iso14755buf & ISO_14755_52)
		314	return;
		315	#endif
306		316
307	/*	317	/*
308	* 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
309	* escape sequence to toggle the Keypad.	319	* escape sequence to toggle the Keypad.
310	*	320	*
…		…
901	tt_write (&ch, 1);	911	tt_write (&ch, 1);
902	}	912	}
903		913
904	tt_write (kbuf, (unsigned int)len);	914	tt_write (kbuf, (unsigned int)len);
905	}	915	}
906	/}}} /	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	}
907		993
908	#if defined (KEYSYM_RESOURCE)	994	#if defined (KEYSYM_RESOURCE)
909	unsigned int	995	unsigned int
910	rxvt_term::cmd_write (const char *str, unsigned int count)	996	rxvt_term::cmd_write (const char *str, unsigned int count)
911	{	997	{
…		…
1088	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1174	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089	}	1175	}
1090	}	1176	}
1091	#endif	1177	#endif
1092		1178
1093	#if HAVE_SCHED_YIELD	1179	#if LINUX_YIELD_HACK
1094	static struct event_handler	1180	static struct event_handler
1095	{	1181	{
1096	check_watcher cw_yield;	1182	check_watcher yield_ev;
1097		1183
1098	void yield (check_watcher &w)	1184	void yield_cb (check_watcher &w)
1099	{	1185	{
1100	sched_yield ();	1186	// this should really be sched_yield(), but the linux guys thought
		1187	// that giving a process calling sched_yield () less cpu time than
		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.
		1190
		1191	struct timespec ts = { 0, 0 };
		1192	nanosleep (&ts, 0);
		1193
1101	w.stop ();	1194	w.stop ();
1102	}	1195	}
1103		1196
1104	event_handler ()	1197	event_handler ()
1105	: cw_yield (this, &event_handler::yield)	1198	: yield_ev (this, &event_handler::yield_cb)
1106	{	1199	{
1107	}	1200	}
1108	} event_handler;	1201	} event_handler;
1109	#endif	1202	#endif
1110		1203
…		…
1130	cmdbuf_endp += r;	1223	cmdbuf_endp += r;
1131	return true;	1224	return true;
1132	}	1225	}
1133	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))	1226	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
1134	{	1227	{
1135	#if HAVE_SCHED_YIELD	1228	#if LINUX_YIELD_HACK
1136	if (display->is_local)	1229	if (display->is_local)
1137	event_handler.cw_yield.start ();	1230	event_handler.yield_ev.start ();
1138	#endif	1231	#endif
1139	}	1232	}
1140	else	1233	else
1141	{	1234	{
1142	pty_ev.stop ();	1235	pty_ev.stop ();
…		…
1164	}	1257	}
1165		1258
1166	void	1259	void
1167	rxvt_term::pointer_unblank ()	1260	rxvt_term::pointer_unblank ()
1168	{	1261	{
1169	XDefineCursor (display->display, vt, TermWin_cursor);	1262	XDefineCursor (dpy, vt, TermWin_cursor);
1170	recolour_cursor ();	1263	recolour_cursor ();
1171		1264
1172	#ifdef POINTER_BLANK	1265	#ifdef POINTER_BLANK
1173	hidden_pointer = 0;	1266	hidden_pointer = 0;
1174		1267
…		…
1182	rxvt_term::pointer_blank ()	1275	rxvt_term::pointer_blank ()
1183	{	1276	{
1184	if (!OPTION (Opt_pointerBlank))	1277	if (!OPTION (Opt_pointerBlank))
1185	return;	1278	return;
1186		1279
1187	XDefineCursor (display->display, vt, display->blank_cursor);	1280	XDefineCursor (dpy, vt, display->blank_cursor);
1188	XFlush (display->display);	1281	XFlush (dpy);
1189		1282
1190	hidden_pointer = 1;	1283	hidden_pointer = 1;
1191	}	1284	}
1192		1285
1193	void	1286	void
…		…
1266	(32 + button_number + key_state),	1359	(32 + button_number + key_state),
1267	(32 + x + 1),	1360	(32 + x + 1),
1268	(32 + y + 1));	1361	(32 + y + 1));
1269	}	1362	}
1270		1363
1271	#ifdef USING_W11LIB
1272	void
1273	rxvt_W11_process_x_event (XEvent *ev)
1274	{
1275	rxvt_t *r = rxvt_get_r ();
1276
1277	x_cb (*ev);
1278	}
1279	#endif
1280
1281	/{{{ process an X event /	1364	/{{{ process an X event /
1282	void	1365	void
1283	rxvt_term::x_cb (XEvent &ev)	1366	rxvt_term::x_cb (XEvent &ev)
1284	{	1367	{
1285	make_current ();	1368	make_current ();
1286		1369
1287	dDisp;	1370	dLocal (Display *, dpy);
1288		1371
1289	if (ev.xany.window == vt	1372	if (ev.xany.window == vt
1290	&& SHOULD_INVOKE (HOOK_X_EVENT)	1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
1291	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1292	return;	1375	return;
…		…
1297	unsigned int unused_mask;	1380	unsigned int unused_mask;
1298		1381
1299	switch (ev.type)	1382	switch (ev.type)
1300	{	1383	{
1301	case KeyPress:	1384	case KeyPress:
1302	#if ISO_14755	1385	key_press (ev.xkey);
1303	if (!(iso14755buf & ISO_14755_52))
1304	#endif
1305	lookup_key (ev.xkey);
1306
1307	break;	1386	break;
1308		1387
1309	case KeyRelease:	1388	case KeyRelease:
1310	{	1389	key_release (ev.xkey);
1311	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1312	KeySym keysym;
1313
1314	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1315	#endif
1316
1317	#if ENABLE_FRILLS \|\| ISO_14755
1318	// ISO 14755 support
1319	if (iso14755buf)
1320	if (iso14755buf & ISO_14755_52)
1321	{
1322	# if ENABLE_OVERLAY
1323	scr_overlay_off ();
1324	# endif
1325	# if ISO_14755
1326	// iso14755 part 5.2 handling: release time
1327	// first: controls
1328	if ((ev.xkey.state & ControlMask)
1329	&& ((keysym >= 0x40 && keysym <= 0x5f)
1330	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1331	{
1332	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1333	commit_iso14755 ();
1334	goto skip_switch;
1335	}
1336
1337	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1338	if (i[0] == keysym)
1339	{
1340	iso14755buf = ISO_14755_51 \| i[1];
1341	commit_iso14755 ();
1342	goto skip_switch;
1343	}
1344
1345	scr_bell ();
1346	# endif
1347	iso14755buf = 0;
1348	break;
1349	}
1350	else if ((ev.xkey.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
1351	{
1352	# if ENABLE_OVERLAY
1353	scr_overlay_off ();
1354	# endif
1355	if (iso14755buf & ISO_14755_51)
1356	commit_iso14755 ();
1357	#if ISO_14755
1358	else if (iso14755buf & ISO_14755_STARTED)
1359	{
1360	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1361
1362	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1363	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1364	}
1365	# endif
1366	else
1367	iso14755buf = 0;
1368	}
1369	#endif
1370
1371	if (ev.xany.window == vt
1372	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1373	break;
1374
1375	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1376	if (!(ev.xkey.state & ControlMask))
1377	slip_wheel_ev.stop ();
1378	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1379	mouse_slip_wheel_speed = 0;
1380	#endif
1381	break;	1390	break;
1382	}
1383		1391
1384	case ButtonPress:	1392	case ButtonPress:
1385	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1386	break;	1394	break;
1387		1395
…		…
1402	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)))
1403	destroy ();	1411	destroy ();
1404	}	1412	}
1405	#if ENABLE_EWMH	1413	#if ENABLE_EWMH
1406	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])
1407	XSendEvent (disp, ev.xclient.window = display->root,	1415	XSendEvent (dpy, ev.xclient.window = display->root,
1408	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1416	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1409	&ev);	1417	&ev);
1410	#endif	1418	#endif
1411	}	1419	}
1412	}	1420	}
…		…
1450	break;	1458	break;
1451	}	1459	}
1452	break;	1460	break;
1453		1461
1454	case FocusIn:	1462	case FocusIn:
		1463	if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1455	focus_in ();	1464	focus_in ();
1456	break;	1465	break;
1457		1466
1458	case FocusOut:	1467	case FocusOut:
		1468	if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1459	focus_out ();	1469	focus_out ();
1460	break;	1470	break;
1461		1471
1462	case ConfigureNotify:	1472	case ConfigureNotify:
1463	if (ev.xconfigure.window == parent[0])	1473	if (ev.xconfigure.window == parent[0])
1464	{	1474	{
1465	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1475	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1466	;	1476	;
1467		1477
1468	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1478	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1469	{	1479	{
1470	seen_resize = 1;	1480	seen_resize = 1;
…		…
1472	}	1482	}
1473		1483
1474	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1484	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1475		1485
1476	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1486	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
		1487	#if 0
1477	if (OPTION (Opt_transparent))	1488	if (OPTION (Opt_transparent))
1478	check_our_parents ();	1489	check_our_parents ();
		1490	#endif
1479	#endif	1491	#endif
1480	}	1492	}
1481	break;	1493	break;
1482		1494
1483	case PropertyNotify:	1495	case PropertyNotify:
…		…
1528	if (ev.xany.window == vt)	1540	if (ev.xany.window == vt)
1529	{	1541	{
1530	do	1542	do
1531	scr_expose (ev.xexpose.x, ev.xexpose.y,	1543	scr_expose (ev.xexpose.x, ev.xexpose.y,
1532	ev.xexpose.width, ev.xexpose.height, False);	1544	ev.xexpose.width, ev.xexpose.height, False);
1533	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1545	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1534		1546
1535	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1547	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1536		1548
1537	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1549	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1538	scr_expose (ev.xexpose.x, ev.xexpose.y,	1550	scr_expose (ev.xexpose.x, ev.xexpose.y,
1539	ev.xexpose.width, ev.xexpose.height, False);	1551	ev.xexpose.width, ev.xexpose.height, False);
1540		1552
1541	want_refresh = 1;	1553	want_refresh = 1;
1542	}	1554	}
1543	else	1555	else
1544	{	1556	{
1545	XEvent unused_event;	1557	XEvent unused_event;
1546		1558
1547	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1559	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1548	;	1560	;
1549	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1561	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1550	;	1562	;
1551		1563
1552	if (isScrollbarWindow (ev.xany.window))	1564	if (isScrollbarWindow (ev.xany.window))
1553	{	1565	{
1554	scrollBar.setIdle ();	1566	scrollBar.setIdle ();
1555	scrollbar_show (0);	1567	scrollbar_show (0);
1556	}	1568	}
1557		1569
1558	#ifdef TRANSPARENT	1570	#ifdef TRANSPARENT
1559	if (am_transparent && ev.xany.window == parent[0])	1571	if (am_transparent && ev.xany.window == parent[0])
1560	XClearWindow (disp, ev.xany.window);	1572	XClearWindow (dpy, ev.xany.window);
1561	#endif	1573	#endif
1562	}	1574	}
1563	break;	1575	break;
1564		1576
1565	case MotionNotify:	1577	case MotionNotify:
…		…
1575	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1587	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1576	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1588	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1577	; // nop	1589	; // nop
1578	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1590	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1579	{	1591	{
1580	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1592	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1581	;	1593	;
1582		1594
1583	XQueryPointer (disp, vt,	1595	XQueryPointer (dpy, vt,
1584	&unused_root, &unused_child,	1596	&unused_root, &unused_child,
1585	&unused_root_x, &unused_root_y,	1597	&unused_root_x, &unused_root_y,
1586	&ev.xbutton.x, &ev.xbutton.y,	1598	&ev.xbutton.x, &ev.xbutton.y,
1587	&ev.xbutton.state);	1599	&ev.xbutton.state);
1588	#ifdef MOUSE_THRESHOLD	1600	#ifdef MOUSE_THRESHOLD
…		…
1652	#endif	1664	#endif
1653	}	1665	}
1654	}	1666	}
1655	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1667	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1656	{	1668	{
1657	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1669	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1658	MotionNotify, &ev))	1670	MotionNotify, &ev))
1659	;	1671	;
1660		1672
1661	XQueryPointer (disp, scrollBar.win,	1673	XQueryPointer (dpy, scrollBar.win,
1662	&unused_root, &unused_child,	1674	&unused_root, &unused_child,
1663	&unused_root_x, &unused_root_y,	1675	&unused_root_x, &unused_root_y,
1664	&ev.xbutton.x, &ev.xbutton.y,	1676	&ev.xbutton.x, &ev.xbutton.y,
1665	&unused_mask);	1677	&unused_mask);
1666	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1678	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1670	scrollbar_show (1);	1682	scrollbar_show (1);
1671	}	1683	}
1672	break;	1684	break;
1673	}	1685	}
1674		1686
1675	skip_switch: ;
1676
1677	#if defined(CURSOR_BLINK)	1687	#if defined(CURSOR_BLINK)
1678	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1688	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1679	{	1689	{
1680	if (hidden_cursor)	1690	if (hidden_cursor)
1681	{	1691	{
…		…
1708	if (!focus)	1718	if (!focus)
1709	{	1719	{
1710	focus = 1;	1720	focus = 1;
1711	want_refresh = 1;	1721	want_refresh = 1;
1712		1722
1713	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1723	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714		1724
1715	#if USE_XIM	1725	#if USE_XIM
1716	if (Input_Context != NULL)	1726	if (Input_Context != NULL)
1717	{	1727	{
1718	IMSetStatusPosition ();	1728	IMSetPosition ();
1719	XSetICFocus (Input_Context);	1729	XSetICFocus (Input_Context);
1720	}	1730	}
1721	#endif	1731	#endif
1722	#if CURSOR_BLINK	1732	#if CURSOR_BLINK
1723	if (OPTION (Opt_cursorBlink))	1733	if (OPTION (Opt_cursorBlink))
…		…
1769	}	1779	}
1770	#endif	1780	#endif
1771	}	1781	}
1772	}	1782	}
1773		1783
1774	#if TRANSPARENT	1784	void
		1785	rxvt_term::update_fade_color (unsigned int idx)
		1786	{
		1787	#if OFF_FOCUS_FADING
		1788	if (rs[Rs_fade])
		1789	{
		1790	rgba c;
		1791	pix_colors [Color_fade].get (c);
		1792	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		1793	}
		1794	#endif
		1795	}
		1796
		1797	#if TRANSPARENT \|\| ENABLE_PERL
1775	void	1798	void
1776	rxvt_term::rootwin_cb (XEvent &ev)	1799	rxvt_term::rootwin_cb (XEvent &ev)
1777	{	1800	{
1778	make_current ();	1801	make_current ();
1779		1802
		1803	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
		1804	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
		1805	return;
		1806
		1807	# if TRANSPARENT
1780	switch (ev.type)	1808	switch (ev.type)
1781	{	1809	{
1782	case PropertyNotify:	1810	case PropertyNotify:
1783	/*	1811	/*
1784	* if user used some Esetroot compatible prog to set the root bg,	1812	* if user used some Esetroot compatible prog to set the root bg,
…		…
1792	case ReparentNotify:	1820	case ReparentNotify:
1793	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)	1821	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1794	want_refresh = want_full_refresh = 1;	1822	want_refresh = want_full_refresh = 1;
1795	break;	1823	break;
1796	}	1824	}
		1825	# endif
1797	}	1826	}
1798	#endif	1827	#endif
1799		1828
1800	void	1829	void
1801	rxvt_term::button_press (XButtonEvent &ev)	1830	rxvt_term::button_press (XButtonEvent &ev)
…		…
2181	#if TINTING	2210	#if TINTING
2182	/* taken from aterm-0.4.2 */	2211	/* taken from aterm-0.4.2 */
2183		2212
2184	typedef uint32_t RUINT32T;	2213	typedef uint32_t RUINT32T;
2185		2214
2186	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2215	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2187	{	2216	{
2188	int sh_r, sh_g, sh_b;	2217	int sh_r, sh_g, sh_b;
2189	RUINT32T mask_r, mask_g, mask_b;	2218	RUINT32T mask_r, mask_g, mask_b;
2190	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2219	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2191	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2220	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2192	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2221	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2193	int i;	2222	int i;
2194		2223
2195	Visual *visual = display->visual;	2224	Visual *visual = term->visual;
2196		2225
2197	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2226	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2198		2227
2199	/* for convenience */	2228	/* for convenience */
2200	mask_r = visual->red_mask;	2229	mask_r = visual->red_mask;
…		…
2421	Atom atype;	2450	Atom atype;
2422	unsigned char *prop = NULL;	2451	unsigned char *prop = NULL;
2423	Window root, oldp, *list;	2452	Window root, oldp, *list;
2424	Pixmap rootpixmap = None;	2453	Pixmap rootpixmap = None;
2425	XWindowAttributes wattr, wrootattr;	2454	XWindowAttributes wattr, wrootattr;
2426	dDisp;
2427		2455
2428	pchanged = 0;	2456	pchanged = 0;
2429		2457
2430	if (!OPTION (Opt_transparent))	2458	if (!OPTION (Opt_transparent))
2431	return pchanged; /* Don't try any more */	2459	return pchanged; /* Don't try any more */
2432		2460
2433	XGetWindowAttributes (disp, display->root, &wrootattr);	2461	XGetWindowAttributes (dpy, display->root, &wrootattr);
2434	rootdepth = wrootattr.depth;	2462	rootdepth = wrootattr.depth;
2435		2463
2436	XGetWindowAttributes (disp, parent[0], &wattr);	2464	XGetWindowAttributes (dpy, parent[0], &wattr);
2437		2465
2438	if (rootdepth != wattr.depth)	2466	if (rootdepth != wattr.depth)
2439	{	2467	{
2440	if (am_transparent)	2468	if (am_transparent)
2441	{	2469	{
2442	pchanged = 1;	2470	pchanged = 1;
2443	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2471	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2444	am_transparent = am_pixmap_trans = 0;	2472	am_transparent = am_pixmap_trans = 0;
2445	}	2473	}
2446		2474
2447	return pchanged; /* Don't try any more */	2475	return pchanged; /* Don't try any more */
2448	}	2476	}
2449		2477
2450	/* Get all X ops out of the queue so that our information is up-to-date. */	2478	/* Get all X ops out of the queue so that our information is up-to-date. */
2451	XSync (disp, False);	2479	XSync (dpy, False);
2452		2480
2453	/*	2481	/*
2454	* Make the frame window set by the window manager have	2482	* Make the frame window set by the window manager have
2455	* the root background. Some window managers put multiple nested frame	2483	* the root background. Some window managers put multiple nested frame
2456	* windows for each client, so we have to take care about that.	2484	* windows for each client, so we have to take care about that.
2457	*/	2485	*/
2458	i = (xa[XA_XROOTPMAP_ID]	2486	i = (xa[XA_XROOTPMAP_ID]
2459	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2487	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2460	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2488	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2461	&nitems, &bytes_after, &prop) == Success);	2489	&nitems, &bytes_after, &prop) == Success);
2462		2490
2463	if (!i \|\| prop == NULL)	2491	if (!i \|\| prop == NULL)
2464	i = (xa[XA_ESETROOT_PMAP_ID]	2492	i = (xa[XA_ESETROOT_PMAP_ID]
2465	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2493	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2466	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2494	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2467	&nitems, &bytes_after, &prop) == Success);	2495	&nitems, &bytes_after, &prop) == Success);
2468		2496
2469	if (!i \|\| prop == NULL	2497	if (!i \|\| prop == NULL
2470	#if TINTING	2498	#if TINTING
2471	\|\| !rs[Rs_color + Color_tint]	2499	\|\| !ISSET_PIXCOLOR (Color_tint)
2472	#endif	2500	#endif
2473	)	2501	)
2474	have_pixmap = 0;	2502	have_pixmap = 0;
2475	else	2503	else
2476	{	2504	{
…		…
2489	Window cr;	2517	Window cr;
2490	XImage *image;	2518	XImage *image;
2491	GC gc;	2519	GC gc;
2492	XGCValues gcvalue;	2520	XGCValues gcvalue;
2493		2521
2494	XTranslateCoordinates (disp, parent[0], display->root,	2522	XTranslateCoordinates (dpy, parent[0], display->root,
2495	0, 0, &sx, &sy, &cr);	2523	0, 0, &sx, &sy, &cr);
2496	nw = (unsigned int)szHint.width;	2524	nw = (unsigned int)szHint.width;
2497	nh = (unsigned int)szHint.height;	2525	nh = (unsigned int)szHint.height;
2498	nx = ny = 0;	2526	nx = ny = 0;
2499		2527
…		…
2512	}	2540	}
2513		2541
2514	min_it (nw, (unsigned int) (wrootattr.width - sx));	2542	min_it (nw, (unsigned int) (wrootattr.width - sx));
2515	min_it (nh, (unsigned int) (wrootattr.height - sy));	2543	min_it (nh, (unsigned int) (wrootattr.height - sy));
2516		2544
2517	XSync (disp, False);	2545	XSync (dpy, False);
2518	allowedxerror = -1;	2546	allowedxerror = -1;
2519	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2547	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2520		2548
2521	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2549	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2522	/* XXX: may need a delay here? */	2550	/* XXX: may need a delay here? */
2523	allowedxerror = 0;	2551	allowedxerror = 0;
2524		2552
…		…
2527	if (am_transparent && am_pixmap_trans)	2555	if (am_transparent && am_pixmap_trans)
2528	{	2556	{
2529	pchanged = 1;	2557	pchanged = 1;
2530	if (pixmap != None)	2558	if (pixmap != None)
2531	{	2559	{
2532	XFreePixmap (disp, pixmap);	2560	XFreePixmap (dpy, pixmap);
2533	pixmap = None;	2561	pixmap = None;
2534	}	2562	}
2535	}	2563	}
2536		2564
2537	am_pixmap_trans = 0;	2565	am_pixmap_trans = 0;
2538	}	2566	}
2539	else	2567	else
2540	{	2568	{
2541	if (pixmap != None)	2569	if (pixmap != None)
2542	XFreePixmap (disp, pixmap);	2570	XFreePixmap (dpy, pixmap);
2543		2571
2544	#if TINTING	2572	#if TINTING
2545	if (ISSET_PIXCOLOR (Color_tint))	2573	if (ISSET_PIXCOLOR (Color_tint))
2546	{	2574	{
2547	unsigned short rm, gm, bm;
2548	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2575	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549		2576
		2577	rgba c;
2550	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2578	pix_colors_focused [Color_tint].get (c);
2551		2579
2552	ShadeXImage (display, image, shade, rm, gm, bm);	2580	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2553	}	2581	}
2554	#endif	2582	#endif
2555		2583
2556	pixmap = XCreatePixmap (disp, vt,	2584	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2557	szHint.width, szHint.height, image->depth);
2558	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2585	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2559	XPutImage (disp, pixmap, gc, image, 0, 0,	2586	XPutImage (dpy, pixmap, gc, image, 0, 0,
2560	nx, ny, image->width, image->height);	2587	nx, ny, image->width, image->height);
2561	XFreeGC (disp, gc);	2588	XFreeGC (dpy, gc);
2562	XDestroyImage (image);	2589	XDestroyImage (image);
2563	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2590	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2564	XClearWindow (disp, parent[0]);	2591	XClearWindow (dpy, parent[0]);
2565		2592
2566	if (!am_transparent \|\| !am_pixmap_trans)	2593	if (!am_transparent \|\| !am_pixmap_trans)
2567	pchanged = 1;	2594	pchanged = 1;
2568		2595
2569	am_transparent = am_pixmap_trans = 1;	2596	am_transparent = am_pixmap_trans = 1;
2570	}	2597	}
2571	}	2598	}
2572		2599
2573	if (am_pixmap_trans)	2600	if (am_pixmap_trans)
2574	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2601	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2575	else	2602	else
2576	{	2603	{
2577	unsigned int n;	2604	unsigned int n;
2578	/*	2605	/*
2579	* InheritPixmap transparency	2606	* InheritPixmap transparency
2580	*/	2607	*/
2581	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2608	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582	{	2609	{
2583	oldp = parent[i];	2610	oldp = parent[i];
2584	XQueryTree (disp, parent[i - 1], &root,	2611	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2585	&parent[i], &list, &n);
2586	XFree (list);	2612	XFree (list);
2587		2613
2588	if (parent[i] == display->root)	2614	if (parent[i] == display->root)
2589	{	2615	{
2590	if (oldp != None)	2616	if (oldp != None)
…		…
2598	}	2624	}
2599		2625
2600	n = 0;	2626	n = 0;
2601		2627
2602	if (pchanged)	2628	if (pchanged)
2603	{
2604	for (; n < (unsigned int)i; n++)	2629	for (; n < (unsigned int)i; n++)
2605	{	2630	{
2606	XGetWindowAttributes (disp, parent[n], &wattr);	2631	XGetWindowAttributes (dpy, parent[n], &wattr);
		2632
2607	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2633	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2608	{	2634	{
2609	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2635	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610	break;	2636	break;
2611	}	2637	}
2612	}	2638	}
2613	}
2614		2639
2615	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2640	if (n > (sizeof (parent) / sizeof (parent[0])))
2616	{	2641	{
2617	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2642	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2618	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2643	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2619	am_transparent = 0;	2644	am_transparent = 0;
2620	/* XXX: also turn off Opt_transparent? */	2645	/* XXX: also turn off Opt_transparent? */
2621	}	2646	}
2622	else	2647	else
2623	{	2648	{
2624	for (n = 0; n < (unsigned int)i; n++)	2649	for (n = 0; n < (unsigned int)i; n++)
2625	{	2650	{
2626	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2651	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2627	XClearWindow (disp, parent[n]);	2652	XClearWindow (dpy, parent[n]);
2628	}	2653	}
2629		2654
2630	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2655	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2631	am_transparent = 1;	2656	am_transparent = 1;
2632	}	2657	}
2633		2658
2634	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2659	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635	parent[i] = None;	2660	parent[i] = None;
2636	}	2661	}
2637		2662
2638	if (scrollBar.win)	2663	if (scrollBar.win)
2639	{	2664	{
2640	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2665	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2641	scrollBar.setIdle ();	2666	scrollBar.setIdle ();
2642	scrollbar_show (0);	2667	scrollbar_show (0);
2643	}	2668	}
2644		2669
2645	if (am_transparent)	2670	if (am_transparent)
…		…
2763	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2788	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2764	refresh_limit++;	2789	refresh_limit++;
2765	else	2790	else
2766	{	2791	{
2767	flag = true;	2792	flag = true;
		2793	//TODO: due to popular request, implement "skipscroll" option here
2768	scr_refresh ();	2794	scr_refresh ();
2769	want_refresh = 1;	2795	want_refresh = 1;
2770	}	2796	}
2771	}	2797	}
2772		2798
…		…
3096	scr_charset_set (2, (unsigned int)cmd_getc ());	3122	scr_charset_set (2, (unsigned int)cmd_getc ());
3097	break;	3123	break;
3098	case '+':	3124	case '+':
3099	scr_charset_set (3, (unsigned int)cmd_getc ());	3125	scr_charset_set (3, (unsigned int)cmd_getc ());
3100	break;	3126	break;
3101	#if ENABLE_FRILLS	3127	#if !ENABLE_MINIMAL
3102	case '6':	3128	case '6':
3103	scr_backindex ();	3129	scr_backindex ();
3104	break;	3130	break;
3105	#endif	3131	#endif
3106	case '7':	3132	case '7':
3107	scr_cursor (SAVE);	3133	scr_cursor (SAVE);
3108	break;	3134	break;
3109	case '8':	3135	case '8':
3110	scr_cursor (RESTORE);	3136	scr_cursor (RESTORE);
3111	break;	3137	break;
3112	#if ENABLE_FRILLS	3138	#if !ENABLE_MINIMAL
3113	case '9':	3139	case '9':
3114	scr_forwardindex ();	3140	scr_forwardindex ();
3115	break;	3141	break;
3116	#endif	3142	#endif
3117	case '=':	3143	case '=':
…		…
3290	{	3316	{
3291	case '>':	3317	case '>':
3292	if (ch == CSI_DA) /* secondary device attributes */	3318	if (ch == CSI_DA) /* secondary device attributes */
3293	{	3319	{
3294	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,	3320	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3295	// 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.	3321	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
3296	//	3322	//
3297	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	3323	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3298	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	3324	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3299	// that we do not support xterm mouse reporting (should be 95 when we do).	3325	// that we do not support xterm mouse reporting (should be 95 when we do).
3300	//	3326	//
3301	tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);	3327	tt_printf ("\033[>%d;94;0c", 'U');
3302	}	3328	}
3303	break;	3329	break;
3304	case '?':	3330	case '?':
3305	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3331	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3306	process_terminal_mode (ch, priv, nargs, arg);	3332	process_terminal_mode (ch, priv, nargs, arg);
…		…
3510	break;	3536	break;
3511	case CSI_75:	3537	case CSI_75:
3512	scr_cursor (RESTORE);	3538	scr_cursor (RESTORE);
3513	break;	3539	break;
3514		3540
3515	#if ENABLE_FRILLS	3541	#if !ENABLE_MINIMAL
3516	case CSI_74:	3542	case CSI_74:
3517	process_window_ops (arg, nargs);	3543	process_window_ops (arg, nargs);
3518	break;	3544	break;
3519	#endif	3545	#endif
3520		3546
…		…
3527	break;	3553	break;
3528	}	3554	}
3529	}	3555	}
3530	/}}} /	3556	/}}} /
3531		3557
3532	#if ENABLE_FRILLS	3558	#if !ENABLE_MINIMAL
3533	/* ARGSUSED */	3559	/* ARGSUSED */
3534	void	3560	void
3535	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3561	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3536	{	3562	{
3537	int x, y;	3563	int x, y;
3538	XWindowAttributes wattr;	3564	XWindowAttributes wattr;
3539	Window wdummy;	3565	Window wdummy;
3540	dDisp;	3566
		3567	dLocal (Display *, dpy);
3541		3568
3542	if (nargs == 0)	3569	if (nargs == 0)
3543	return;	3570	return;
3544		3571
3545	switch (args[0])	3572	switch (args[0])
3546	{	3573	{
3547	/*	3574	/*
3548	* commands	3575	* commands
3549	*/	3576	*/
3550	case 1: /* deiconify window */	3577	case 1: /* deiconify window */
3551	XMapWindow (disp, parent[0]);	3578	XMapWindow (dpy, parent[0]);
3552	break;	3579	break;
3553	case 2: /* iconify window */	3580	case 2: /* iconify window */
3554	XIconifyWindow (disp, parent[0], display->screen);	3581	XIconifyWindow (dpy, parent[0], display->screen);
3555	break;	3582	break;
3556	case 3: /* set position (pixels) */	3583	case 3: /* set position (pixels) */
3557	XMoveWindow (disp, parent[0], args[1], args[2]);	3584	XMoveWindow (dpy, parent[0], args[1], args[2]);
3558	break;	3585	break;
3559	case 4: /* set size (pixels) */	3586	case 4: /* set size (pixels) */
3560	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3587	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561	break;	3588	break;
3562	case 5: /* raise window */	3589	case 5: /* raise window */
3563	XRaiseWindow (disp, parent[0]);	3590	XRaiseWindow (dpy, parent[0]);
3564	break;	3591	break;
3565	case 6: /* lower window */	3592	case 6: /* lower window */
3566	XLowerWindow (disp, parent[0]);	3593	XLowerWindow (dpy, parent[0]);
3567	break;	3594	break;
3568	case 7: /* refresh window */	3595	case 7: /* refresh window */
3569	scr_touch (true);	3596	scr_touch (true);
3570	break;	3597	break;
3571	case 8: /* set size (chars) */	3598	case 8: /* set size (chars) */
…		…
3578	if (args[0] >= 24) /* set height (chars) */	3605	if (args[0] >= 24) /* set height (chars) */
3579	set_widthheight ((unsigned int)width,	3606	set_widthheight ((unsigned int)width,
3580	(unsigned int) (args[1] * fheight));	3607	(unsigned int) (args[1] * fheight));
3581	break;	3608	break;
3582		3609
3583
3584	/*	3610	/*
3585	* reports - some output format copied from XTerm	3611	* reports - some output format copied from XTerm
3586	*/	3612	*/
3587	case 11: /* report window state */	3613	case 11: /* report window state */
3588	XGetWindowAttributes (disp, parent[0], &wattr);	3614	XGetWindowAttributes (dpy, parent[0], &wattr);
3589	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3615	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3590	break;	3616	break;
3591	case 13: /* report window position */	3617	case 13: /* report window position */
3592	XGetWindowAttributes (disp, parent[0], &wattr);	3618	XGetWindowAttributes (dpy, parent[0], &wattr);
3593	XTranslateCoordinates (disp, parent[0], wattr.root,	3619	XTranslateCoordinates (dpy, parent[0], wattr.root,
3594	-wattr.border_width, -wattr.border_width,	3620	-wattr.border_width, -wattr.border_width,
3595	&x, &y, &wdummy);	3621	&x, &y, &wdummy);
3596	tt_printf ("\033[3;%d;%dt", x, y);	3622	tt_printf ("\033[3;%d;%dt", x, y);
3597	break;	3623	break;
3598	case 14: /* report window size (pixels) */	3624	case 14: /* report window size (pixels) */
3599	XGetWindowAttributes (disp, parent[0], &wattr);	3625	XGetWindowAttributes (dpy, parent[0], &wattr);
3600	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3626	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3601	break;	3627	break;
3602	case 18: /* report text area size (chars) */	3628	case 18: /* report text area size (chars) */
3603	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3629	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3604	break;	3630	break;
…		…
3606	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3632	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3607	break;	3633	break;
3608	case 20: /* report icon label */	3634	case 20: /* report icon label */
3609	{	3635	{
3610	char *s;	3636	char *s;
3611	XGetIconName (disp, parent[0], &s);	3637	XGetIconName (dpy, parent[0], &s);
3612	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3638	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3613	XFree (s);	3639	XFree (s);
3614	}	3640	}
3615	break;	3641	break;
3616	case 21: /* report window title */	3642	case 21: /* report window title */
3617	{	3643	{
3618	char *s;	3644	char *s;
3619	XFetchName (disp, parent[0], &s);	3645	XFetchName (dpy, parent[0], &s);
3620	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3646	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621	XFree (s);	3647	XFree (s);
3622	}	3648	}
3623	break;	3649	break;
3624	}	3650	}
…		…
3652	seen_esc = true;	3678	seen_esc = true;
3653	continue;	3679	continue;
3654	}	3680	}
3655	else if (ch == C0_BEL \|\| ch == CHAR_ST)	3681	else if (ch == C0_BEL \|\| ch == CHAR_ST)
3656	break;	3682	break;
		3683	else if (ch == C0_SYN)
		3684	ch = cmd_get8 ();
3657	else if (ch < 0x20)	3685	else if (ch < 0x20)
3658	return NULL; /* other control character - exit */	3686	return NULL; /* other control character - exit */
3659		3687
3660	seen_esc = false;	3688	seen_esc = false;
3661		3689
3662	if (n >= STRING_MAX - 1)	3690	if (n >= STRING_MAX - 1)
3663	// stop at some sane length	3691	// stop at some sane length
3664	return NULL;	3692	return NULL;
3665		3693
3666	if (ch == C0_SYN)
3667	string[n++] = cmd_get8 ();
3668	else
3669	string[n++] = ch;	3694	string[n++] = ch;
3670	}	3695	}
3671		3696
3672	string[n++] = '\0';	3697	string[n++] = '\0';
3673		3698
3674	ends_how = (ch == 0x5c ? C0_ESC : ch);	3699	ends_how = (ch == 0x5c ? C0_ESC : ch);
…		…
3725	void	3750	void
3726	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3751	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3727	{	3752	{
3728	if (str[0] == '?' && !str[1])	3753	if (str[0] == '?' && !str[1])
3729	{	3754	{
3730	unsigned short r, g, b;	3755	rgba c;
3731	pix_colors_focused[color].get (display, r, g, b);	3756	pix_colors_focused[color].get (c);
		3757
		3758	#if XFT
		3759	if (c.a != rgba::MAX_CC)
		3760	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3761	else
		3762	#endif
3732	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3763	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3733	}	3764	}
3734	else	3765	else
3735	set_window_color (color, str);	3766	set_window_color (color, str);
3736	}	3767	}
3737		3768
…		…
3743	{	3774	{
3744	int color;	3775	int color;
3745	char buf, name;	3776	char buf, name;
3746	bool query = str[0] == '?' && !str[1];	3777	bool query = str[0] == '?' && !str[1];
3747	int saveop = op;	3778	int saveop = op;
3748	dDisp;	3779
		3780	dLocal (Display *, dpy);
3749		3781
3750	assert (str != NULL);	3782	assert (str != NULL);
		3783
		3784	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3785	return;
		3786
3751	switch (op)	3787	switch (op)
3752	{	3788	{
3753	case XTerm_name:	3789	case XTerm_name:
3754	set_title (str);	3790	set_title (str);
3755	/* FALLTHROUGH */	3791	/* FALLTHROUGH */
…		…
3769	unsigned long bytes_after;	3805	unsigned long bytes_after;
3770	unsigned char *value = 0;	3806	unsigned char *value = 0;
3771	const char *str = "";	3807	const char *str = "";
3772		3808
3773	if (prop	3809	if (prop
3774	&& XGetWindowProperty (disp, parent[0],	3810	&& XGetWindowProperty (dpy, parent[0],
3775	prop, 0, 1<<16, 0, AnyPropertyType,	3811	prop, 0, 1<<16, 0, AnyPropertyType,
3776	&actual_type, &actual_format,	3812	&actual_type, &actual_format,
3777	&nitems, &bytes_after, &value) == Success	3813	&nitems, &bytes_after, &value) == Success
3778	&& actual_type != None	3814	&& actual_type != None
3779	&& actual_format == 8)	3815	&& actual_format == 8)
3780	str = (const char *)(value);	3816	str = (const char *)(value);
3781		3817
3782	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3818	tt_printf ("\033]%d;%s%c", op, str, resp);
3783		3819
3784	XFree (value);	3820	XFree (value);
3785	}	3821	}
3786	else	3822	else
3787	{	3823	{
…		…
3791	{	3827	{
3792	*eq = 0;	3828	*eq = 0;
3793	set_utf8_property (display->atom (str), eq + 1);	3829	set_utf8_property (display->atom (str), eq + 1);
3794	}	3830	}
3795	else	3831	else
3796	XDeleteProperty (disp, parent[0],	3832	XDeleteProperty (dpy, parent[0],
3797	display->atom (str));	3833	display->atom (str));
3798	}	3834	}
3799	break;	3835	break;
3800		3836
3801	case XTerm_Color:	3837	case XTerm_Color:
…		…
3811	break;	3847	break;
3812		3848
3813	if ((buf = strchr (name, ';')) != NULL)	3849	if ((buf = strchr (name, ';')) != NULL)
3814	*buf++ = '\0';	3850	*buf++ = '\0';
3815		3851
3816	if (name[0] == '?' && !name[1])	3852	process_color_seq (op, color, name, resp);
3817	{
3818	unsigned short r, g, b;
3819	pix_colors_focused[color].get (display, r, g, b);
3820	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3821	}
3822	else
3823	set_window_color (color, name);
3824	}	3853	}
3825	break;	3854	break;
3826	case XTerm_Color00:	3855	case XTerm_Color00:
3827	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3856	process_color_seq (op, Color_fg, str, resp);
3828	break;	3857	break;
3829	case XTerm_Color01:	3858	case XTerm_Color01:
3830	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3859	process_color_seq (op, Color_bg, str, resp);
3831	break;	3860	break;
3832	#ifndef NO_CURSORCOLOR	3861	#ifndef NO_CURSORCOLOR
3833	case XTerm_Color_cursor:	3862	case XTerm_Color_cursor:
3834	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3863	process_color_seq (op, Color_cursor, str, resp);
3835	break;	3864	break;
3836	#endif	3865	#endif
3837	case XTerm_Color_pointer_fg:	3866	case XTerm_Color_pointer_fg:
3838	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3867	process_color_seq (op, Color_pointer_fg, str, resp);
3839	break;	3868	break;
3840	case XTerm_Color_pointer_bg:	3869	case XTerm_Color_pointer_bg:
3841	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3870	process_color_seq (op, Color_pointer_bg, str, resp);
3842	break;	3871	break;
3843	#ifndef NO_BOLD_UNDERLINE_REVERSE	3872	#ifndef NO_BOLD_UNDERLINE_REVERSE
3844	case XTerm_Color_RV:	3873	case XTerm_Color_RV:
3845	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3874	process_color_seq (op, Color_RV, str, resp);
3846	break;	3875	break;
3847	case Rxvt_Color_BD:	3876	case Rxvt_Color_BD:
3848	case URxvt_Color_BD:	3877	case URxvt_Color_BD:
3849	process_color_seq (op, Color_BD, str, resp);	3878	process_color_seq (op, Color_BD, str, resp);
3850	break;	3879	break;
3851	case Rxvt_Color_UL:	3880	case Rxvt_Color_UL:
3852	case URxvt_Color_UL:	3881	case URxvt_Color_UL:
3853	process_color_seq (op, Color_UL, str, resp);	3882	process_color_seq (op, Color_UL, str, resp);
3854	break;	3883	break;
3855	case URxvt_Color_IT:	3884	case URxvt_Color_IT:
3856	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3885	process_color_seq (op, Color_IT, str, resp);
3857	break;	3886	break;
3858	#endif	3887	#endif
3859	#if TRANSPARENT && TINTING	3888	#if TRANSPARENT && TINTING
3860	case URxvt_Color_tint:	3889	case URxvt_Color_tint:
3861	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3890	process_color_seq (op, Color_tint, str, resp);
		3891
3862	check_our_parents ();	3892	check_our_parents ();
		3893
3863	if (am_transparent)	3894	if (am_transparent)
3864	want_full_refresh = want_refresh = 1;	3895	want_full_refresh = want_refresh = 1;
		3896
3865	break;	3897	break;
3866	#endif	3898	#endif
3867		3899
3868	case Rxvt_Pixmap:	3900	case Rxvt_Pixmap:
3869	{	3901	{
…		…
3940	allocated.push_back ((void *)res);	3972	allocated.push_back ((void *)res);
3941	set_fonts ();	3973	set_fonts ();
3942	}	3974	}
3943	break;	3975	break;
3944		3976
3945	#if ENABLE_FRILLS	3977	case URxvt_version:
		3978	if (query)
		3979	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3980	op,
		3981	rs[Rs_name], VERSION[0], VERSION[2],
		3982	resp);
		3983	break;
		3984
		3985	#if !ENABLE_MINIMAL
3946	case URxvt_locale:	3986	case URxvt_locale:
3947	if (query)	3987	if (query)
3948	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3988	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3949	else	3989	else
3950	{	3990	{
3951	set_locale (str);	3991	set_locale (str);
3952	pty->set_utf8_mode (enc_utf8);	3992	pty->set_utf8_mode (enc_utf8);
3953	init_xlocale ();	3993	init_xlocale ();
…		…
3968	break;	4008	break;
3969	#endif	4009	#endif
3970		4010
3971	#if ENABLE_PERL	4011	#if ENABLE_PERL
3972	case URxvt_perl:	4012	case URxvt_perl:
3973	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	4013	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3974	; // no responses yet	4014	; // no responses yet
3975	break;	4015	break;
3976	#endif	4016	#endif
3977	}	4017	}
3978	}	4018	}
…		…
4314	scr_color (Color_bg, Color_bg);	4354	scr_color (Color_bg, Color_bg);
4315	break;	4355	break;
4316		4356
4317	//case 50: // not variable spacing	4357	//case 50: // not variable spacing
4318		4358
4319	#if ENABLE_FRILLS	4359	#if !ENABLE_MINIMAL
4320	case 90:	4360	case 90:
4321	case 91: /* set bright fg color */	4361	case 91: /* set bright fg color */
4322	case 92:	4362	case 92:
4323	case 93:	4363	case 93:
4324	case 94:	4364	case 94:

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.283 by root, Tue Jan 24 19:40:12 2006 UTC vs. Revision 1.317 by root, Sat Jan 13 15:06:54 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.283 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.317 by root, Sat Jan 13 15:06:54 2007 UTC