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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.266 by root, Mon Jan 16 08:57:02 2006 UTC vs.
Revision 1.302 by root, Tue Jan 31 21:35:39 2006 UTC

…		…
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>
64		59
65	/----------------------------------------------------------------------/	60	/----------------------------------------------------------------------/
66		61
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	62	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71		63
72	#if ENABLE_FRILLS \|\| ISO_14755	64	#if ENABLE_FRILLS \|\| ISO_14755
73		65
74	#define ISO_14755_STARTED 0x80000000UL	66	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	67	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
…		…
230	# if !UNICODE3	222	# if !UNICODE3
231	if (ch >= 0x10000)	223	if (ch >= 0x10000)
232	ch = 0xfffd;	224	ch = 0xfffd;
233	# endif	225	# endif
234	scr_overlay_set (11, y, ch, r);	226	scr_overlay_set (11, y, ch, r);
		227
		228	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	229	scr_overlay_set (12, y, NOCHAR, r);
236	}	230	}
237		231
		232	// {
		233	// char buf[4+4+3+1];
		234	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
		235	// scr_overlay_set (0, 0, buf);
		236	// }
238	scr_overlay_set (0, len , attr);	237	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	238	scr_overlay_set (0, len + 1, fname);
240		239
241	free (fname);	240	free (fname);
242		241
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	301	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	302	{
304	int ctrl, meta, shft, len;	303	int ctrl, meta, shft, len;
305	unsigned int newlen;	304	unsigned int newlen;
306	KeySym keysym;	305	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	306	int valid_keysym;
311	char kbuf[KBUFSZ];	307	char kbuf[KBUFSZ];
312		308
313	/*	309	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	310	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
464	{	460	{
465	switch (keysym)	461	switch (keysym)
466	{	462	{
467	/* normal XTerm key bindings */	463	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	464	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	465	selection_request (ev.time);
470	return;	466	return;
471	#if TODO	467	#if TODO
472	/* rxvt extras */	468	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	469	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	470	change_font (FONT_UP);
…		…
905	{	901	{
906	const char ch = C0_ESC;	902	const char ch = C0_ESC;
907	tt_write (&ch, 1);	903	tt_write (&ch, 1);
908	}	904	}
909		905
910	#if defined(DEBUG_CMD)
911	/* Display keyboard buffer contents */
912	unsigned char *p;
913	int i;
914
915	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916	for (i = 0, p = kbuf; i < len; i++, p++)
917	fprintf (stderr, (p >= ' ' && p < '\177' ? "%c" : "\\%03o"), *p);
918	fprintf (stderr, "'\n");
919	#endif /* DEBUG_CMD */
920	tt_write (kbuf, (unsigned int)len);	906	tt_write (kbuf, (unsigned int)len);
921	}	907	}
922	/}}} /	908	/}}} /
923		909
924	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	910	#if defined (KEYSYM_RESOURCE)
925	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
926	/* attempt to `write' count to the input buffer */
927	unsigned int	911	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	912	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	913	{
930	unsigned int n, s;	914	unsigned int n, s;
931		915
…		…
1008	while (l->is_longer () && row < end_row);	992	while (l->is_longer () && row < end_row);
1009	}	993	}
1010	while (row < end_row);	994	while (row < end_row);
1011	}	995	}
1012		996
1013	scr_refresh (refresh_type);	997	scr_refresh ();
1014	scrollbar_show (1);	998	scrollbar_show (1);
1015	#ifdef USE_XIM	999	#ifdef USE_XIM
1016	IMSendSpot ();	1000	IMSendSpot ();
1017	#endif	1001	#endif
1018	}	1002	}
…		…
1046	rxvt_term::cursor_blink_cb (time_watcher &w)	1030	rxvt_term::cursor_blink_cb (time_watcher &w)
1047	{	1031	{
1048	hidden_cursor = !hidden_cursor;	1032	hidden_cursor = !hidden_cursor;
1049	want_refresh = 1;	1033	want_refresh = 1;
1050		1034
1051	w.start (w.at + BLINK_INTERVAL);	1035	w.start (w.at + CURSOR_BLINK_INTERVAL);
1052	}	1036	}
1053	#endif	1037	#endif
1054		1038
1055	#ifdef TEXT_BLINK	1039	#ifdef TEXT_BLINK
1056	void	1040	void
…		…
1070	rxvt_term::cont_scroll_cb (time_watcher &w)	1054	rxvt_term::cont_scroll_cb (time_watcher &w)
1071	{	1055	{
1072	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1056	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1073	scr_page (scrollbar_isUp() ? UP : DN, 1))	1057	scr_page (scrollbar_isUp() ? UP : DN, 1))
1074	{	1058	{
1075	refresh_type \|= SMOOTH_REFRESH;
1076	want_refresh = 1;	1059	want_refresh = 1;
1077	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1060	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078	}	1061	}
1079	}	1062	}
1080	#endif	1063	#endif
…		…
1084	rxvt_term::sel_scroll_cb (time_watcher &w)	1067	rxvt_term::sel_scroll_cb (time_watcher &w)
1085	{	1068	{
1086	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1069	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087	{	1070	{
1088	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1071	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089	refresh_type \|= SMOOTH_REFRESH;
1090	want_refresh = 1;	1072	want_refresh = 1;
1091	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1073	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092	}	1074	}
1093	}	1075	}
1094	#endif	1076	#endif
…		…
1102	: scr_page (UP, mouse_slip_wheel_speed))	1084	: scr_page (UP, mouse_slip_wheel_speed))
1103	{	1085	{
1104	if (view_start == top_row \|\| view_start == 0)	1086	if (view_start == top_row \|\| view_start == 0)
1105	mouse_slip_wheel_speed = 0;	1087	mouse_slip_wheel_speed = 0;
1106		1088
1107	refresh_type \|= SMOOTH_REFRESH;
1108	want_refresh = 1;	1089	want_refresh = 1;
1109	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1090	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110	}	1091	}
1111	}	1092	}
1112	#endif	1093	#endif
1113		1094
1114	#if HAVE_SCHED_YIELD	1095	#if LINUX_YIELD_HACK
1115	static struct event_handler	1096	static struct event_handler
1116	{	1097	{
1117	check_watcher cw_yield;	1098	check_watcher yield_ev;
1118		1099
1119	void yield (check_watcher &w)	1100	void yield_cb (check_watcher &w)
1120	{	1101	{
1121	sched_yield ();	1102	usleep (0);
1122	w.stop ();	1103	w.stop ();
1123	}	1104	}
1124		1105
1125	event_handler ()	1106	event_handler ()
1126	: cw_yield (this, &event_handler::yield)	1107	: yield_ev (this, &event_handler::yield_cb)
1127	{	1108	{
1128	}	1109	}
1129	} event_handler;	1110	} event_handler;
1130	#endif	1111	#endif
1131		1112
…		…
1142		1123
1143	memmove (cmdbuf_base, cmdbuf_ptr, n);	1124	memmove (cmdbuf_base, cmdbuf_ptr, n);
1144	cmdbuf_ptr = cmdbuf_base;	1125	cmdbuf_ptr = cmdbuf_base;
1145	cmdbuf_endp = cmdbuf_ptr + n;	1126	cmdbuf_endp = cmdbuf_ptr + n;
1146		1127
1147	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1128	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1148		1129
1149	if (r > 0)	1130	if (r > 0)
1150	{	1131	{
1151	cmdbuf_endp += r;	1132	cmdbuf_endp += r;
1152	return true;	1133	return true;
1153	}	1134	}
1154	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))	1135	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
1155	{	1136	{
1156	#if HAVE_SCHED_YIELD	1137	#if LINUX_YIELD_HACK
1157	if (display->is_local)	1138	if (display->is_local)
1158	event_handler.cw_yield.start ();	1139	event_handler.yield_ev.start ();
1159	#endif	1140	#endif
1160	}	1141	}
1161	else	1142	else
1162	{	1143	{
1163	pty_ev.stop ();	1144	pty_ev.stop ();
…		…
1185	}	1166	}
1186		1167
1187	void	1168	void
1188	rxvt_term::pointer_unblank ()	1169	rxvt_term::pointer_unblank ()
1189	{	1170	{
1190	XDefineCursor (display->display, vt, TermWin_cursor);	1171	XDefineCursor (xdisp, vt, TermWin_cursor);
1191	recolour_cursor ();	1172	recolour_cursor ();
1192		1173
1193	#ifdef POINTER_BLANK	1174	#ifdef POINTER_BLANK
1194	hidden_pointer = 0;	1175	hidden_pointer = 0;
1195		1176
…		…
1203	rxvt_term::pointer_blank ()	1184	rxvt_term::pointer_blank ()
1204	{	1185	{
1205	if (!OPTION (Opt_pointerBlank))	1186	if (!OPTION (Opt_pointerBlank))
1206	return;	1187	return;
1207		1188
1208	XDefineCursor (display->display, vt, display->blank_cursor);	1189	XDefineCursor (xdisp, vt, display->blank_cursor);
1209	XFlush (display->display);	1190	XFlush (xdisp);
1210		1191
1211	hidden_pointer = 1;	1192	hidden_pointer = 1;
1212	}	1193	}
1213		1194
1214	void	1195	void
…		…
1287	(32 + button_number + key_state),	1268	(32 + button_number + key_state),
1288	(32 + x + 1),	1269	(32 + x + 1),
1289	(32 + y + 1));	1270	(32 + y + 1));
1290	}	1271	}
1291		1272
1292	#ifdef USING_W11LIB
1293	void
1294	rxvt_W11_process_x_event (XEvent *ev)
1295	{
1296	rxvt_t *r = rxvt_get_r ();
1297
1298	x_cb (*ev);
1299	}
1300	#endif
1301
1302	/{{{ process an X event /	1273	/{{{ process an X event /
1303	void	1274	void
1304	rxvt_term::x_cb (XEvent &ev)	1275	rxvt_term::x_cb (XEvent &ev)
1305	{	1276	{
1306	make_current ();	1277	make_current ();
1307		1278
1308	dDisp;	1279	dLocal (Display *, xdisp);
1309		1280
1310	if (ev.xany.window == vt	1281	if (ev.xany.window == vt
1311	&& SHOULD_INVOKE (HOOK_X_EVENT)	1282	&& SHOULD_INVOKE (HOOK_X_EVENT)
1312	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1283	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1313	return;	1284	return;
…		…
1410	button_release (ev.xbutton);	1381	button_release (ev.xbutton);
1411	break;	1382	break;
1412		1383
1413	case ClientMessage:	1384	case ClientMessage:
1414	if (ev.xclient.format == 32	1385	if (ev.xclient.format == 32
1415	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1386	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416	{	1387	{
		1388	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1389	{
		1390	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1391	{
1417	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1392	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1393	{
		1394	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1418	destroy ();	1395	destroy ();
		1396	}
1419	#if ENABLE_EWMH	1397	#if ENABLE_EWMH
1420	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1398	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421	XSendEvent (disp, ev.xclient.window = display->root,	1399	XSendEvent (xdisp, ev.xclient.window = display->root,
1422	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1400	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1423	&ev);	1401	&ev);
		1402	#endif
		1403	}
		1404	}
		1405	#if ENABLE_XEMBED
		1406	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1407	{
		1408	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1409	focus_in ();
		1410	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1411	focus_out ();
		1412	}
1424	#endif	1413	#endif
1425	}	1414	}
1426	#if ENABLE_XEMBED
1427	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428	{
1429	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430	focus_in ();
1431	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432	focus_out ();
1433	}
1434	#endif
1435	#ifdef OFFIX_DND
1436	/* OffiX Dnd (drag 'n' drop) protocol */
1437	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438	&& (ev.xclient.data.l[0] == DndFile
1439	\|\| ev.xclient.data.l[0] == DndDir
1440	\|\| ev.xclient.data.l[0] == DndLink))
1441	{
1442	/* Get Dnd data */
1443	Atom ActualType;
1444	int ActualFormat;
1445	unsigned char *data;
1446	unsigned long Size, RemainingBytes;
1447
1448	XGetWindowProperty (disp, display->root,
1449	xa[XA_DNDSELECTION],
1450	0L, 1000000L,
1451	False, AnyPropertyType,
1452	&ActualType, &ActualFormat,
1453	&Size, &RemainingBytes,
1454	&data);
1455	set_string_property (XA_CUT_BUFFER0, data);
1456	XFree (data);
1457	selection_paste (display->root, XA_CUT_BUFFER0, true);
1458	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459	}
1460	#endif /* OFFIX_DND */
1461	break;	1415	break;
1462		1416
1463	case MappingNotify:	1417	case MappingNotify:
1464	XRefreshKeyboardMapping (&ev.xmapping);	1418	XRefreshKeyboardMapping (&ev.xmapping);
1465	break;	1419	break;
…		…
1498	break;	1452	break;
1499		1453
1500	case ConfigureNotify:	1454	case ConfigureNotify:
1501	if (ev.xconfigure.window == parent[0])	1455	if (ev.xconfigure.window == parent[0])
1502	{	1456	{
1503	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1457	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1504	;	1458	;
1505		1459
1506	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1460	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1507	{	1461	{
1508	seen_resize = 1;	1462	seen_resize = 1;
1509	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1463	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510	}	1464	}
1511		1465
		1466	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1467
1512	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1468	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513	if (OPTION (Opt_transparent))	1469	if (OPTION (Opt_transparent))
1514	check_our_parents ();	1470	check_our_parents ();
1515	#endif	1471	#endif
1516	}	1472	}
1517	break;	1473	break;
1518		1474
1519	case PropertyNotify:	1475	case PropertyNotify:
		1476	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1477	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521	&& ev.xproperty.state == PropertyNewValue)	1478	&& ev.xproperty.state == PropertyNewValue)
1522	selection_property (ev.xproperty.window, ev.xproperty.atom);	1479	selection_property (ev.xproperty.window, ev.xproperty.atom);
1523		1480
1524	break;	1481	break;
1525		1482
1526	case SelectionClear:	1483	case SelectionClear:
1527	selection_clear ();	1484	selection_clear ();
…		…
1563	if (ev.xany.window == vt)	1520	if (ev.xany.window == vt)
1564	{	1521	{
1565	do	1522	do
1566	scr_expose (ev.xexpose.x, ev.xexpose.y,	1523	scr_expose (ev.xexpose.x, ev.xexpose.y,
1567	ev.xexpose.width, ev.xexpose.height, False);	1524	ev.xexpose.width, ev.xexpose.height, False);
1568	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1525	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1569		1526
1570	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1527	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571		1528
1572	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1529	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1573	scr_expose (ev.xexpose.x, ev.xexpose.y,	1530	scr_expose (ev.xexpose.x, ev.xexpose.y,
1574	ev.xexpose.width, ev.xexpose.height, False);	1531	ev.xexpose.width, ev.xexpose.height, False);
1575		1532
1576	want_refresh = 1;	1533	want_refresh = 1;
1577	}	1534	}
1578	else	1535	else
1579	{	1536	{
1580	XEvent unused_event;	1537	XEvent unused_event;
1581		1538
1582	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1539	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1583	;	1540	;
1584	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1541	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1585	;	1542	;
1586		1543
1587	if (isScrollbarWindow (ev.xany.window))	1544	if (isScrollbarWindow (ev.xany.window))
1588	{	1545	{
1589	scrollBar.setIdle ();	1546	scrollBar.setIdle ();
1590	scrollbar_show (0);	1547	scrollbar_show (0);
1591	}	1548	}
1592	#ifdef MENUBAR
1593	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594	menubar_expose ();
1595	#endif
1596		1549
1597	#ifdef TRANSPARENT	1550	#ifdef TRANSPARENT
1598	if (am_transparent && ev.xany.window == parent[0])	1551	if (am_transparent && ev.xany.window == parent[0])
1599	XClearWindow (disp, ev.xany.window);	1552	XClearWindow (xdisp, ev.xany.window);
1600	#endif	1553	#endif
1601	}	1554	}
1602	break;	1555	break;
1603		1556
1604	case MotionNotify:	1557	case MotionNotify:
1605	#ifdef POINTER_BLANK	1558	#ifdef POINTER_BLANK
1606	if (hidden_pointer)	1559	if (hidden_pointer)
1607	pointer_unblank ();	1560	pointer_unblank ();
1608	#endif
1609	#if MENUBAR
1610	if (isMenuBarWindow (ev.xany.window))
1611	{
1612	menubar_control (ev.xbutton);
1613	break;
1614	}
1615	#endif	1561	#endif
1616	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1562	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617	break;	1563	break;
1618		1564
1619	if (ev.xany.window == vt)	1565	if (ev.xany.window == vt)
…		…
1621	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1567	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1568	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623	; // nop	1569	; // nop
1624	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1570	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1625	{	1571	{
1626	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1572	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1627	;	1573	;
1628		1574
1629	XQueryPointer (disp, vt,	1575	XQueryPointer (xdisp, vt,
1630	&unused_root, &unused_child,	1576	&unused_root, &unused_child,
1631	&unused_root_x, &unused_root_y,	1577	&unused_root_x, &unused_root_y,
1632	&ev.xbutton.x, &ev.xbutton.y,	1578	&ev.xbutton.x, &ev.xbutton.y,
1633	&ev.xbutton.state);	1579	&ev.xbutton.state);
1634	#ifdef MOUSE_THRESHOLD	1580	#ifdef MOUSE_THRESHOLD
…		…
1698	#endif	1644	#endif
1699	}	1645	}
1700	}	1646	}
1701	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1647	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1702	{	1648	{
1703	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1649	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1704	MotionNotify, &ev))	1650	MotionNotify, &ev))
1705	;	1651	;
1706		1652
1707	XQueryPointer (disp, scrollBar.win,	1653	XQueryPointer (xdisp, scrollBar.win,
1708	&unused_root, &unused_child,	1654	&unused_root, &unused_child,
1709	&unused_root_x, &unused_root_y,	1655	&unused_root_x, &unused_root_y,
1710	&ev.xbutton.x, &ev.xbutton.y,	1656	&ev.xbutton.x, &ev.xbutton.y,
1711	&unused_mask);	1657	&unused_mask);
1712	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1658	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1727	{	1673	{
1728	hidden_cursor = 0;	1674	hidden_cursor = 0;
1729	want_refresh = 1;	1675	want_refresh = 1;
1730	}	1676	}
1731		1677
1732	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1678	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733	}	1679	}
1734	#endif	1680	#endif
1735		1681
1736	#if defined(POINTER_BLANK)	1682	#if defined(POINTER_BLANK)
1737	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1683	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1765	XSetICFocus (Input_Context);	1711	XSetICFocus (Input_Context);
1766	}	1712	}
1767	#endif	1713	#endif
1768	#if CURSOR_BLINK	1714	#if CURSOR_BLINK
1769	if (OPTION (Opt_cursorBlink))	1715	if (OPTION (Opt_cursorBlink))
1770	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1716	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1771	#endif	1717	#endif
1772	#if OFF_FOCUS_FADING	1718	#if OFF_FOCUS_FADING
1773	if (rs[Rs_fade])	1719	if (rs[Rs_fade])
1774	{	1720	{
1775	pix_colors = pix_colors_focused;	1721	pix_colors = pix_colors_focused;
…		…
1856	/*	1802	/*
1857	* VT window processing of button press	1803	* VT window processing of button press
1858	*/	1804	*/
1859	if (ev.window == vt)	1805	if (ev.window == vt)
1860	{	1806	{
		1807	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1808	return;
		1809
1861	#if ISO_14755	1810	#if ISO_14755
1862	// 5.4	1811	// 5.4
1863	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1812	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1864	{	1813	{
1865	iso14755_54 (ev.x, ev.y);	1814	iso14755_54 (ev.x, ev.y);
…		…
1907	else	1856	else
1908	{	1857	{
1909	if (ev.button != MEvent.button)	1858	if (ev.button != MEvent.button)
1910	MEvent.clicks = 0;	1859	MEvent.clicks = 0;
1911		1860
1912	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913	switch (ev.button)	1861	switch (ev.button)
1914	{	1862	{
1915	case Button1:	1863	case Button1:
1916	/* allow meta + click to select rectangular areas */	1864	/* allow meta + click to select rectangular areas */
1917	/* should be done in screen.C */	1865	/* should be done in screen.C */
1918	#if ENABLE_FRILLS	1866	#if ENABLE_FRILLS
1919	selection.rect = !!(ev.state & ModMetaMask);	1867	selection.rect = !!(ev.state & ModMetaMask);
1920	#else	1868	#else
1921	selection.rect = false;	1869	selection.rect = false;
1922	#endif	1870	#endif
1923		1871
1924	/* allow shift+left click to extend selection */	1872	/* allow shift+left click to extend selection */
1925	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1873	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926	{	1874	{
1927	if (MEvent.button == Button1 && clickintime)	1875	if (MEvent.button == Button1 && clickintime)
1928	selection_rotate (ev.x, ev.y);	1876	selection_rotate (ev.x, ev.y);
1929	else	1877	else
1930	selection_extend (ev.x, ev.y, 1);	1878	selection_extend (ev.x, ev.y, 1);
1931	}	1879	}
1932	else	1880	else
1933	{	1881	{
1934	if (MEvent.button == Button1 && clickintime)	1882	if (MEvent.button == Button1 && clickintime)
1935	MEvent.clicks++;	1883	MEvent.clicks++;
1936	else	1884	else
1937	MEvent.clicks = 1;	1885	MEvent.clicks = 1;
1938		1886
1939	selection_click (MEvent.clicks, ev.x, ev.y);	1887	selection_click (MEvent.clicks, ev.x, ev.y);
1940	}	1888	}
1941		1889
1942	MEvent.button = Button1;	1890	MEvent.button = Button1;
1943	break;	1891	break;
1944		1892
1945	case Button3:	1893	case Button3:
1946	if (MEvent.button == Button3 && clickintime)	1894	if (MEvent.button == Button3 && clickintime)
1947	selection_rotate (ev.x, ev.y);	1895	selection_rotate (ev.x, ev.y);
1948	else	1896	else
1949	selection_extend (ev.x, ev.y, 1);	1897	selection_extend (ev.x, ev.y, 1);
1950		1898
1951	MEvent.button = Button3;	1899	MEvent.button = Button3;
1952	break;	1900	break;
1953	}	1901	}
1954	}	1902	}
1955		1903
1956	MEvent.time = ev.time;	1904	MEvent.time = ev.time;
1957	return;	1905	return;
1958	}	1906	}
1959		1907
…		…
2098	}	2046	}
2099	}	2047	}
2100		2048
2101	return;	2049	return;
2102	}	2050	}
2103
2104	#if MENUBAR
2105	/*
2106	* Menubar window processing of button press
2107	*/
2108	if (isMenuBarWindow (ev.window))
2109	menubar_control (ev);
2110	#endif
2111	}	2051	}
2112		2052
2113	void	2053	void
2114	rxvt_term::button_release (XButtonEvent &ev)	2054	rxvt_term::button_release (XButtonEvent &ev)
2115	{	2055	{
…		…
2121		2061
2122	if (scrollbar_isUpDn ())	2062	if (scrollbar_isUpDn ())
2123	{	2063	{
2124	scrollBar.setIdle ();	2064	scrollBar.setIdle ();
2125	scrollbar_show (0);	2065	scrollbar_show (0);
2126	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127	refresh_type &= ~SMOOTH_REFRESH;
2128	#endif
2129	}	2066	}
2130		2067
2131	#ifdef SELECTION_SCROLLING	2068	#ifdef SELECTION_SCROLLING
2132	if (sel_scroll_ev.active)	2069	if (sel_scroll_ev.active)
2133	sel_scroll_ev.stop();	2070	sel_scroll_ev.stop();
2134	#endif	2071	#endif
2135		2072
2136	if (ev.window == vt)	2073	if (ev.window == vt)
2137	{	2074	{
		2075	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2076	return;
		2077
2138	#if ISO_14755	2078	#if ISO_14755
2139	// 5.4	2079	// 5.4
2140	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2080	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2141	return;	2081	return;
2142	#endif	2082	#endif
		2083
2143	if (reportmode)	2084	if (reportmode)
2144	{	2085	{
2145	/* mouse report from vt window */	2086	/* mouse report from vt window */
2146	/* don't report release of wheel "buttons" */	2087	/* don't report release of wheel "buttons" */
2147	if (ev.button >= 4)	2088	if (ev.button >= 4)
…		…
2171	if (priv_modes & PrivMode_mouse_report	2112	if (priv_modes & PrivMode_mouse_report
2172	&& bypass_keystate	2113	&& bypass_keystate
2173	&& ev.button == Button1 && MEvent.clicks <= 1)	2114	&& ev.button == Button1 && MEvent.clicks <= 1)
2174	selection_extend (ev.x, ev.y, 0);	2115	selection_extend (ev.x, ev.y, 0);
2175		2116
2176	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177	return;
2178
2179	switch (ev.button)	2117	switch (ev.button)
2180	{	2118	{
2181	case Button1:	2119	case Button1:
2182	case Button3:	2120	case Button3:
2183	selection_make (ev.time);	2121	selection_make (ev.time);
2184	break;	2122	break;
		2123
2185	case Button2:	2124	case Button2:
2186	selection_request (ev.time, ev.x, ev.y);	2125	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2126	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2187	break;	2127	break;
		2128
2188	#ifdef MOUSE_WHEEL	2129	#ifdef MOUSE_WHEEL
2189	case Button4:	2130	case Button4:
2190	case Button5:	2131	case Button5:
2191	{	2132	{
2192	int i;	2133	int i;
…		…
2224	}	2165	}
2225	break;	2166	break;
2226	#endif	2167	#endif
2227	}	2168	}
2228	}	2169	}
2229	#ifdef MENUBAR
2230	else if (isMenuBarWindow (ev.window))
2231	menubar_control (ev);
2232	#endif
2233	}	2170	}
2234		2171
2235	#ifdef TRANSPARENT	2172	#ifdef TRANSPARENT
2236	#if TINTING	2173	#if TINTING
2237	/* taken from aterm-0.4.2 */	2174	/* taken from aterm-0.4.2 */
2238		2175
2239	typedef uint32_t RUINT32T;	2176	typedef uint32_t RUINT32T;
2240		2177
2241	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2178	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2242	{	2179	{
2243	int sh_r, sh_g, sh_b;	2180	int sh_r, sh_g, sh_b;
2244	RUINT32T mask_r, mask_g, mask_b;	2181	RUINT32T mask_r, mask_g, mask_b;
2245	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2182	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2246	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2183	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2184	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248	int i;	2185	int i;
2249		2186
2250	Visual *visual = display->visual;	2187	Visual *visual = term->visual;
2251		2188
2252	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2189	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2253		2190
2254	/* for convenience */	2191	/* for convenience */
2255	mask_r = visual->red_mask;	2192	mask_r = visual->red_mask;
…		…
2476	Atom atype;	2413	Atom atype;
2477	unsigned char *prop = NULL;	2414	unsigned char *prop = NULL;
2478	Window root, oldp, *list;	2415	Window root, oldp, *list;
2479	Pixmap rootpixmap = None;	2416	Pixmap rootpixmap = None;
2480	XWindowAttributes wattr, wrootattr;	2417	XWindowAttributes wattr, wrootattr;
2481	dDisp;
2482		2418
2483	pchanged = 0;	2419	pchanged = 0;
2484		2420
2485	if (!OPTION (Opt_transparent))	2421	if (!OPTION (Opt_transparent))
2486	return pchanged; /* Don't try any more */	2422	return pchanged; /* Don't try any more */
2487		2423
2488	XGetWindowAttributes (disp, display->root, &wrootattr);	2424	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2489	rootdepth = wrootattr.depth;	2425	rootdepth = wrootattr.depth;
2490		2426
2491	XGetWindowAttributes (disp, parent[0], &wattr);	2427	XGetWindowAttributes (xdisp, parent[0], &wattr);
2492		2428
2493	if (rootdepth != wattr.depth)	2429	if (rootdepth != wattr.depth)
2494	{	2430	{
2495	if (am_transparent)	2431	if (am_transparent)
2496	{	2432	{
2497	pchanged = 1;	2433	pchanged = 1;
2498	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2434	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2499	am_transparent = am_pixmap_trans = 0;	2435	am_transparent = am_pixmap_trans = 0;
2500	}	2436	}
2501		2437
2502	return pchanged; /* Don't try any more */	2438	return pchanged; /* Don't try any more */
2503	}	2439	}
2504		2440
2505	/* Get all X ops out of the queue so that our information is up-to-date. */	2441	/* Get all X ops out of the queue so that our information is up-to-date. */
2506	XSync (disp, False);	2442	XSync (xdisp, False);
2507		2443
2508	/*	2444	/*
2509	* Make the frame window set by the window manager have	2445	* Make the frame window set by the window manager have
2510	* the root background. Some window managers put multiple nested frame	2446	* the root background. Some window managers put multiple nested frame
2511	* windows for each client, so we have to take care about that.	2447	* windows for each client, so we have to take care about that.
2512	*/	2448	*/
2513	i = (xa[XA_XROOTPMAP_ID]	2449	i = (xa[XA_XROOTPMAP_ID]
2514	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2450	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2515	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2451	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516	&nitems, &bytes_after, &prop) == Success);	2452	&nitems, &bytes_after, &prop) == Success);
2517		2453
2518	if (!i \|\| prop == NULL)	2454	if (!i \|\| prop == NULL)
2519	i = (xa[XA_ESETROOT_PMAP_ID]	2455	i = (xa[XA_ESETROOT_PMAP_ID]
2520	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2456	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2521	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2457	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522	&nitems, &bytes_after, &prop) == Success);	2458	&nitems, &bytes_after, &prop) == Success);
2523		2459
2524	if (!i \|\| prop == NULL	2460	if (!i \|\| prop == NULL
2525	#if TINTING	2461	#if TINTING
2526	\|\| !rs[Rs_color + Color_tint]	2462	\|\| !ISSET_PIXCOLOR (Color_tint)
2527	#endif	2463	#endif
2528	)	2464	)
2529	have_pixmap = 0;	2465	have_pixmap = 0;
2530	else	2466	else
2531	{	2467	{
…		…
2544	Window cr;	2480	Window cr;
2545	XImage *image;	2481	XImage *image;
2546	GC gc;	2482	GC gc;
2547	XGCValues gcvalue;	2483	XGCValues gcvalue;
2548		2484
2549	XTranslateCoordinates (disp, parent[0], display->root,	2485	XTranslateCoordinates (xdisp, parent[0], display->root,
2550	0, 0, &sx, &sy, &cr);	2486	0, 0, &sx, &sy, &cr);
2551	nw = (unsigned int)szHint.width;	2487	nw = (unsigned int)szHint.width;
2552	nh = (unsigned int)szHint.height;	2488	nh = (unsigned int)szHint.height;
2553	nx = ny = 0;	2489	nx = ny = 0;
2554		2490
…		…
2567	}	2503	}
2568		2504
2569	min_it (nw, (unsigned int) (wrootattr.width - sx));	2505	min_it (nw, (unsigned int) (wrootattr.width - sx));
2570	min_it (nh, (unsigned int) (wrootattr.height - sy));	2506	min_it (nh, (unsigned int) (wrootattr.height - sy));
2571		2507
2572	XSync (disp, False);	2508	XSync (xdisp, False);
2573	allowedxerror = -1;	2509	allowedxerror = -1;
2574	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2510	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575		2511
2576	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2512	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2577	/* XXX: may need a delay here? */	2513	/* XXX: may need a delay here? */
2578	allowedxerror = 0;	2514	allowedxerror = 0;
2579		2515
…		…
2582	if (am_transparent && am_pixmap_trans)	2518	if (am_transparent && am_pixmap_trans)
2583	{	2519	{
2584	pchanged = 1;	2520	pchanged = 1;
2585	if (pixmap != None)	2521	if (pixmap != None)
2586	{	2522	{
2587	XFreePixmap (disp, pixmap);	2523	XFreePixmap (xdisp, pixmap);
2588	pixmap = None;	2524	pixmap = None;
2589	}	2525	}
2590	}	2526	}
2591		2527
2592	am_pixmap_trans = 0;	2528	am_pixmap_trans = 0;
2593	}	2529	}
2594	else	2530	else
2595	{	2531	{
2596	if (pixmap != None)	2532	if (pixmap != None)
2597	XFreePixmap (disp, pixmap);	2533	XFreePixmap (xdisp, pixmap);
2598		2534
2599	#if TINTING	2535	#if TINTING
2600	if (ISSET_PIXCOLOR (Color_tint))	2536	if (ISSET_PIXCOLOR (Color_tint))
2601	{	2537	{
2602	unsigned short rm, gm, bm;
2603	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2538	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604		2539
		2540	rgba c;
2605	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2541	pix_colors_focused [Color_tint].get (c);
2606		2542
2607	ShadeXImage (display, image, shade, rm, gm, bm);	2543	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2608	}	2544	}
2609	#endif	2545	#endif
2610		2546
2611	pixmap = XCreatePixmap (disp, vt,	2547	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2612	szHint.width, szHint.height, image->depth);
2613	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2548	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2614	XPutImage (disp, pixmap, gc, image, 0, 0,	2549	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2615	nx, ny, image->width, image->height);	2550	nx, ny, image->width, image->height);
2616	XFreeGC (disp, gc);	2551	XFreeGC (xdisp, gc);
2617	XDestroyImage (image);	2552	XDestroyImage (image);
2618	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2553	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2619	XClearWindow (disp, parent[0]);	2554	XClearWindow (xdisp, parent[0]);
2620		2555
2621	if (!am_transparent \|\| !am_pixmap_trans)	2556	if (!am_transparent \|\| !am_pixmap_trans)
2622	pchanged = 1;	2557	pchanged = 1;
2623		2558
2624	am_transparent = am_pixmap_trans = 1;	2559	am_transparent = am_pixmap_trans = 1;
2625	}	2560	}
2626	}	2561	}
2627		2562
2628	if (am_pixmap_trans)	2563	if (am_pixmap_trans)
2629	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2564	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2630	else	2565	else
2631	{	2566	{
2632	unsigned int n;	2567	unsigned int n;
2633	/*	2568	/*
2634	* InheritPixmap transparency	2569	* InheritPixmap transparency
2635	*/	2570	*/
2636	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2571	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637	{	2572	{
2638	oldp = parent[i];	2573	oldp = parent[i];
2639	XQueryTree (disp, parent[i - 1], &root,	2574	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2640	&parent[i], &list, &n);
2641	XFree (list);	2575	XFree (list);
2642		2576
2643	if (parent[i] == display->root)	2577	if (parent[i] == display->root)
2644	{	2578	{
2645	if (oldp != None)	2579	if (oldp != None)
…		…
2653	}	2587	}
2654		2588
2655	n = 0;	2589	n = 0;
2656		2590
2657	if (pchanged)	2591	if (pchanged)
2658	{
2659	for (; n < (unsigned int)i; n++)	2592	for (; n < (unsigned int)i; n++)
2660	{	2593	{
2661	XGetWindowAttributes (disp, parent[n], &wattr);	2594	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2595
2662	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2596	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2663	{	2597	{
2664	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2598	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665	break;	2599	break;
2666	}	2600	}
2667	}	2601	}
2668	}
2669		2602
2670	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2603	if (n > (sizeof (parent) / sizeof (parent[0])))
2671	{	2604	{
2672	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2605	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2673	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2606	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2674	am_transparent = 0;	2607	am_transparent = 0;
2675	/* XXX: also turn off Opt_transparent? */	2608	/* XXX: also turn off Opt_transparent? */
2676	}	2609	}
2677	else	2610	else
2678	{	2611	{
2679	#if WAIT_FOR_WM
2680	/* wait (an arbitrary period) for the WM to do its thing
2681	* needed for fvwm2.2.2 (and before?) */
2682	sleep (1);
2683	#endif
2684	for (n = 0; n < (unsigned int)i; n++)	2612	for (n = 0; n < (unsigned int)i; n++)
2685	{	2613	{
2686	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2614	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2687	XClearWindow (disp, parent[n]);	2615	XClearWindow (xdisp, parent[n]);
2688	}	2616	}
2689		2617
2690	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2618	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2691	am_transparent = 1;	2619	am_transparent = 1;
2692	}	2620	}
2693		2621
2694	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2622	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695	parent[i] = None;	2623	parent[i] = None;
2696	}	2624	}
2697		2625
2698	if (scrollBar.win)	2626	if (scrollBar.win)
2699	{	2627	{
2700	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2628	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2701	scrollBar.setIdle ();	2629	scrollBar.setIdle ();
2702	scrollbar_show (0);	2630	scrollbar_show (0);
2703	}	2631	}
2704		2632
2705	if (am_transparent)	2633	if (am_transparent)
…		…
2823	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2751	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2824	refresh_limit++;	2752	refresh_limit++;
2825	else	2753	else
2826	{	2754	{
2827	flag = true;	2755	flag = true;
2828	scr_refresh (refresh_type);	2756	scr_refresh ();
2829	want_refresh = 1;	2757	want_refresh = 1;
2830	}	2758	}
2831	}	2759	}
2832		2760
2833	}	2761	}
…		…
2851	return flag;	2779	return flag;
2852	}	2780	}
2853		2781
2854	// read the next character	2782	// read the next character
2855	wchar_t	2783	wchar_t
2856	rxvt_term::next_char ()	2784	rxvt_term::next_char () NOTHROW
2857	{	2785	{
2858	while (cmdbuf_ptr < cmdbuf_endp)	2786	while (cmdbuf_ptr < cmdbuf_endp)
2859	{	2787	{
2860	// assume 7-bit to be ascii ALWAYS	2788	// assume 7-bit to be ascii ALWAYS
2861	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2789	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2882	return NOCHAR;	2810	return NOCHAR;
2883	}	2811	}
2884		2812
2885	// read the next octet	2813	// read the next octet
2886	uint32_t	2814	uint32_t
2887	rxvt_term::next_octet ()	2815	rxvt_term::next_octet () NOTHROW
2888	{	2816	{
2889	return cmdbuf_ptr < cmdbuf_endp	2817	return cmdbuf_ptr < cmdbuf_endp
2890	? (unsigned char)*cmdbuf_ptr++	2818	? (unsigned char)*cmdbuf_ptr++
2891	: NOCHAR;	2819	: NOCHAR;
2892	}	2820	}
		2821
		2822	static class out_of_input out_of_input;
2893		2823
2894	/* rxvt_cmd_getc () - Return next input character */	2824	/* rxvt_cmd_getc () - Return next input character */
2895	/*	2825	/*
2896	* Return the next input character after first passing any keyboard input	2826	* Return the next input character after first passing any keyboard input
2897	* to the command.	2827	* to the command.
2898	*/	2828	*/
2899	wchar_t	2829	wchar_t
2900	rxvt_term::cmd_getc ()	2830	rxvt_term::cmd_getc () THROW ((class out_of_input))
2901	{	2831	{
2902	wchar_t c = next_char ();	2832	wchar_t c = next_char ();
2903		2833
2904	if (c == NOCHAR)	2834	if (c == NOCHAR)
2905	throw out_of_input;	2835	throw out_of_input;
2906		2836
2907	return c;	2837	return c;
2908	}	2838	}
2909		2839
2910	uint32_t	2840	uint32_t
2911	rxvt_term::cmd_get8 ()	2841	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2912	{	2842	{
2913	uint32_t c = next_octet ();	2843	uint32_t c = next_octet ();
2914		2844
2915	if (c == NOCHAR)	2845	if (c == NOCHAR)
2916	throw out_of_input;	2846	throw out_of_input;
…		…
3154	scr_charset_set (2, (unsigned int)cmd_getc ());	3084	scr_charset_set (2, (unsigned int)cmd_getc ());
3155	break;	3085	break;
3156	case '+':	3086	case '+':
3157	scr_charset_set (3, (unsigned int)cmd_getc ());	3087	scr_charset_set (3, (unsigned int)cmd_getc ());
3158	break;	3088	break;
3159	#if ENABLE_FRILLS	3089	#if !ENABLE_MINIMAL
3160	case '6':	3090	case '6':
3161	scr_backindex ();	3091	scr_backindex ();
3162	break;	3092	break;
3163	#endif	3093	#endif
3164	case '7':	3094	case '7':
3165	scr_cursor (SAVE);	3095	scr_cursor (SAVE);
3166	break;	3096	break;
3167	case '8':	3097	case '8':
3168	scr_cursor (RESTORE);	3098	scr_cursor (RESTORE);
3169	break;	3099	break;
3170	#if ENABLE_FRILLS	3100	#if !ENABLE_MINIMAL
3171	case '9':	3101	case '9':
3172	scr_forwardindex ();	3102	scr_forwardindex ();
3173	break;	3103	break;
3174	#endif	3104	#endif
3175	case '=':	3105	case '=':
…		…
3337	ndef = get_byte_array_bit (csi_defaults, i);	3267	ndef = get_byte_array_bit (csi_defaults, i);
3338	for (p = 0; p < nargs; p++)	3268	for (p = 0; p < nargs; p++)
3339	if (arg[p] == -1)	3269	if (arg[p] == -1)
3340	arg[p] = ndef;	3270	arg[p] = ndef;
3341		3271
3342	#ifdef DEBUG_CMD
3343	fprintf (stderr, "CSI ");
3344	for (p = 0; p < nargs; p++)
3345	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3346	fprintf (stderr, "%c\n", ch);
3347	#endif
3348
3349	/*	3272	/*
3350	* private mode handling	3273	* private mode handling
3351	*/	3274	*/
3352	if (priv)	3275	if (priv)
3353	{	3276	{
3354	switch (priv)	3277	switch (priv)
3355	{	3278	{
3356	case '>':	3279	case '>':
3357	if (ch == CSI_DA) /* secondary device attributes */	3280	if (ch == CSI_DA) /* secondary device attributes */
3358	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3281	{
		3282	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3283	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3284	//
		3285	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3286	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3287	// that we do not support xterm mouse reporting (should be 95 when we do).
		3288	//
		3289	tt_printf ("\033[>%d;94;0c", 'U');
		3290	}
3359	break;	3291	break;
3360	case '?':	3292	case '?':
3361	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3293	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3362	process_terminal_mode (ch, priv, nargs, arg);	3294	process_terminal_mode (ch, priv, nargs, arg);
3363	break;	3295	break;
…		…
3566	break;	3498	break;
3567	case CSI_75:	3499	case CSI_75:
3568	scr_cursor (RESTORE);	3500	scr_cursor (RESTORE);
3569	break;	3501	break;
3570		3502
3571	#if ENABLE_FRILLS	3503	#if !ENABLE_MINIMAL
3572	case CSI_74:	3504	case CSI_74:
3573	process_window_ops (arg, nargs);	3505	process_window_ops (arg, nargs);
3574	break;	3506	break;
3575	#endif	3507	#endif
3576		3508
…		…
3583	break;	3515	break;
3584	}	3516	}
3585	}	3517	}
3586	/}}} /	3518	/}}} /
3587		3519
3588	#if ENABLE_FRILLS	3520	#if !ENABLE_MINIMAL
3589	/* ARGSUSED */	3521	/* ARGSUSED */
3590	void	3522	void
3591	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3523	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3592	{	3524	{
3593	int x, y;	3525	int x, y;
3594	XWindowAttributes wattr;	3526	XWindowAttributes wattr;
3595	Window wdummy;	3527	Window wdummy;
3596	dDisp;	3528
		3529	dLocal (Display *, xdisp);
3597		3530
3598	if (nargs == 0)	3531	if (nargs == 0)
3599	return;	3532	return;
3600		3533
3601	switch (args[0])	3534	switch (args[0])
3602	{	3535	{
3603	/*	3536	/*
3604	* commands	3537	* commands
3605	*/	3538	*/
3606	case 1: /* deiconify window */	3539	case 1: /* deiconify window */
3607	XMapWindow (disp, parent[0]);	3540	XMapWindow (xdisp, parent[0]);
3608	break;	3541	break;
3609	case 2: /* iconify window */	3542	case 2: /* iconify window */
3610	XIconifyWindow (disp, parent[0], display->screen);	3543	XIconifyWindow (xdisp, parent[0], display->screen);
3611	break;	3544	break;
3612	case 3: /* set position (pixels) */	3545	case 3: /* set position (pixels) */
3613	XMoveWindow (disp, parent[0], args[1], args[2]);	3546	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3614	break;	3547	break;
3615	case 4: /* set size (pixels) */	3548	case 4: /* set size (pixels) */
3616	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3549	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3617	break;	3550	break;
3618	case 5: /* raise window */	3551	case 5: /* raise window */
3619	XRaiseWindow (disp, parent[0]);	3552	XRaiseWindow (xdisp, parent[0]);
3620	break;	3553	break;
3621	case 6: /* lower window */	3554	case 6: /* lower window */
3622	XLowerWindow (disp, parent[0]);	3555	XLowerWindow (xdisp, parent[0]);
3623	break;	3556	break;
3624	case 7: /* refresh window */	3557	case 7: /* refresh window */
3625	scr_touch (true);	3558	scr_touch (true);
3626	break;	3559	break;
3627	case 8: /* set size (chars) */	3560	case 8: /* set size (chars) */
…		…
3634	if (args[0] >= 24) /* set height (chars) */	3567	if (args[0] >= 24) /* set height (chars) */
3635	set_widthheight ((unsigned int)width,	3568	set_widthheight ((unsigned int)width,
3636	(unsigned int) (args[1] * fheight));	3569	(unsigned int) (args[1] * fheight));
3637	break;	3570	break;
3638		3571
3639
3640	/*	3572	/*
3641	* reports - some output format copied from XTerm	3573	* reports - some output format copied from XTerm
3642	*/	3574	*/
3643	case 11: /* report window state */	3575	case 11: /* report window state */
3644	XGetWindowAttributes (disp, parent[0], &wattr);	3576	XGetWindowAttributes (xdisp, parent[0], &wattr);
3645	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3577	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3646	break;	3578	break;
3647	case 13: /* report window position */	3579	case 13: /* report window position */
3648	XGetWindowAttributes (disp, parent[0], &wattr);	3580	XGetWindowAttributes (xdisp, parent[0], &wattr);
3649	XTranslateCoordinates (disp, parent[0], wattr.root,	3581	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3650	-wattr.border_width, -wattr.border_width,	3582	-wattr.border_width, -wattr.border_width,
3651	&x, &y, &wdummy);	3583	&x, &y, &wdummy);
3652	tt_printf ("\033[3;%d;%dt", x, y);	3584	tt_printf ("\033[3;%d;%dt", x, y);
3653	break;	3585	break;
3654	case 14: /* report window size (pixels) */	3586	case 14: /* report window size (pixels) */
3655	XGetWindowAttributes (disp, parent[0], &wattr);	3587	XGetWindowAttributes (xdisp, parent[0], &wattr);
3656	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3588	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3657	break;	3589	break;
3658	case 18: /* report text area size (chars) */	3590	case 18: /* report text area size (chars) */
3659	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3591	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3660	break;	3592	break;
…		…
3662	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3594	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3663	break;	3595	break;
3664	case 20: /* report icon label */	3596	case 20: /* report icon label */
3665	{	3597	{
3666	char *s;	3598	char *s;
3667	XGetIconName (disp, parent[0], &s);	3599	XGetIconName (xdisp, parent[0], &s);
3668	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3600	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3669	XFree (s);	3601	XFree (s);
3670	}	3602	}
3671	break;	3603	break;
3672	case 21: /* report window title */	3604	case 21: /* report window title */
3673	{	3605	{
3674	char *s;	3606	char *s;
3675	XFetchName (disp, parent[0], &s);	3607	XFetchName (xdisp, parent[0], &s);
3676	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3608	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3677	XFree (s);	3609	XFree (s);
3678	}	3610	}
3679	break;	3611	break;
3680	}	3612	}
…		…
3781	void	3713	void
3782	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3714	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3783	{	3715	{
3784	if (str[0] == '?' && !str[1])	3716	if (str[0] == '?' && !str[1])
3785	{	3717	{
3786	unsigned short r, g, b;	3718	rgba c;
3787	pix_colors_focused[color].get (display, r, g, b);	3719	pix_colors_focused[color].get (c);
		3720
		3721	#if XFT
		3722	if (c.a != rgba::MAX_CC)
		3723	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3724	else
		3725	#endif
3788	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3726	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3789	}	3727	}
3790	else	3728	else
3791	set_window_color (color, str);	3729	set_window_color (color, str);
3792	}	3730	}
3793		3731
…		…
3795	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3733	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3796	*/	3734	*/
3797	void	3735	void
3798	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3736	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3799	{	3737	{
3800	int changed = 0;
3801	int color;	3738	int color;
3802	char buf, name;	3739	char buf, name;
3803	bool query = str[0] == '?' && !str[1];	3740	bool query = str[0] == '?' && !str[1];
3804	int saveop = op;	3741	int saveop = op;
3805	dDisp;	3742
		3743	dLocal (Display *, xdisp);
3806		3744
3807	assert (str != NULL);	3745	assert (str != NULL);
3808	switch (op)	3746	switch (op)
3809	{	3747	{
3810	case XTerm_name:	3748	case XTerm_name:
…		…
3826	unsigned long bytes_after;	3764	unsigned long bytes_after;
3827	unsigned char *value = 0;	3765	unsigned char *value = 0;
3828	const char *str = "";	3766	const char *str = "";
3829		3767
3830	if (prop	3768	if (prop
3831	&& XGetWindowProperty (disp, parent[0],	3769	&& XGetWindowProperty (xdisp, parent[0],
3832	prop, 0, 1<<16, 0, AnyPropertyType,	3770	prop, 0, 1<<16, 0, AnyPropertyType,
3833	&actual_type, &actual_format,	3771	&actual_type, &actual_format,
3834	&nitems, &bytes_after, &value) == Success	3772	&nitems, &bytes_after, &value) == Success
3835	&& actual_type != None	3773	&& actual_type != None
3836	&& actual_format == 8)	3774	&& actual_format == 8)
3837	str = (const char *)(value);	3775	str = (const char *)(value);
3838		3776
3839	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3777	tt_printf ("\033]%d;%s%c", op, str, resp);
3840		3778
3841	XFree (value);	3779	XFree (value);
3842	}	3780	}
3843	else	3781	else
3844	{	3782	{
…		…
3848	{	3786	{
3849	*eq = 0;	3787	*eq = 0;
3850	set_utf8_property (display->atom (str), eq + 1);	3788	set_utf8_property (display->atom (str), eq + 1);
3851	}	3789	}
3852	else	3790	else
3853	XDeleteProperty (disp, parent[0],	3791	XDeleteProperty (xdisp, parent[0],
3854	display->atom (str));	3792	display->atom (str));
3855	}	3793	}
3856	break;	3794	break;
3857		3795
3858	case XTerm_Color:	3796	case XTerm_Color:
…		…
3868	break;	3806	break;
3869		3807
3870	if ((buf = strchr (name, ';')) != NULL)	3808	if ((buf = strchr (name, ';')) != NULL)
3871	*buf++ = '\0';	3809	*buf++ = '\0';
3872		3810
3873	if (name[0] == '?' && !name[1])	3811	process_color_seq (op, color, name, resp);
3874	{
3875	unsigned short r, g, b;
3876	pix_colors_focused[color].get (display, r, g, b);
3877	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3878	}
3879	else
3880	set_window_color (color, name);
3881	}	3812	}
3882	break;	3813	break;
3883	case XTerm_Color00:	3814	case XTerm_Color00:
3884	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3815	process_color_seq (op, Color_fg, str, resp);
3885	break;	3816	break;
3886	case XTerm_Color01:	3817	case XTerm_Color01:
3887	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3818	process_color_seq (op, Color_bg, str, resp);
3888	break;	3819	break;
3889	#ifndef NO_CURSORCOLOR	3820	#ifndef NO_CURSORCOLOR
3890	case XTerm_Color_cursor:	3821	case XTerm_Color_cursor:
3891	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3822	process_color_seq (op, Color_cursor, str, resp);
3892	break;	3823	break;
3893	#endif	3824	#endif
3894	case XTerm_Color_pointer_fg:	3825	case XTerm_Color_pointer_fg:
3895	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3826	process_color_seq (op, Color_pointer_fg, str, resp);
3896	break;	3827	break;
3897	case XTerm_Color_pointer_bg:	3828	case XTerm_Color_pointer_bg:
3898	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3829	process_color_seq (op, Color_pointer_bg, str, resp);
3899	break;	3830	break;
3900	#ifndef NO_BOLD_UNDERLINE_REVERSE	3831	#ifndef NO_BOLD_UNDERLINE_REVERSE
3901	case XTerm_Color_RV:	3832	case XTerm_Color_RV:
3902	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3833	process_color_seq (op, Color_RV, str, resp);
3903	break;	3834	break;
3904	case Rxvt_Color_BD:	3835	case Rxvt_Color_BD:
3905	case URxvt_Color_BD:	3836	case URxvt_Color_BD:
3906	process_color_seq (op, Color_BD, str, resp);	3837	process_color_seq (op, Color_BD, str, resp);
3907	break;	3838	break;
3908	case Rxvt_Color_UL:	3839	case Rxvt_Color_UL:
3909	case URxvt_Color_UL:	3840	case URxvt_Color_UL:
3910	process_color_seq (op, Color_UL, str, resp);	3841	process_color_seq (op, Color_UL, str, resp);
3911	break;	3842	break;
3912	case URxvt_Color_IT:	3843	case URxvt_Color_IT:
3913	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3844	process_color_seq (op, Color_IT, str, resp);
3914	break;	3845	break;
3915	#endif	3846	#endif
3916	#if TRANSPARENT && TINTING	3847	#if TRANSPARENT && TINTING
3917	case URxvt_Color_tint:	3848	case URxvt_Color_tint:
3918	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3849	process_color_seq (op, Color_tint, str, resp);
		3850
3919	check_our_parents ();	3851	check_our_parents ();
		3852
3920	if (am_transparent)	3853	if (am_transparent)
3921	want_full_refresh = want_refresh = 1;	3854	want_full_refresh = want_refresh = 1;
		3855
3922	break;	3856	break;
3923	#endif	3857	#endif
3924		3858
3925	case Rxvt_Pixmap:	3859	case Rxvt_Pixmap:
		3860	{
3926	if (*str != ';')	3861	if (*str != ';')
3927	{	3862	{
3928	#if XPM_BACKGROUND	3863	#if XPM_BACKGROUND
3929	scale_pixmap (""); /* reset to default scaling */	3864	scale_pixmap (""); /* reset to default scaling */
3930	set_bgPixmap (str); /* change pixmap */	3865	set_bgPixmap (str); /* change pixmap */
3931	scr_touch (true);	3866	scr_touch (true);
3932	#endif	3867	#endif
3933	}	3868	}
3934		3869
		3870	int changed = 0;
		3871
3935	while ((str = strchr (str, ';')) != NULL)	3872	while ((str = strchr (str, ';')) != NULL)
3936	{	3873	{
3937	str++;	3874	str++;
3938	#if XPM_BACKGROUND	3875	#if XPM_BACKGROUND
3939	changed += scale_pixmap (str);	3876	changed += scale_pixmap (str);
3940	#endif	3877	#endif
3941	}	3878	}
3942		3879
3943	if (changed)	3880	if (changed)
3944	{	3881	{
3945	#ifdef XPM_BACKGROUND	3882	#ifdef XPM_BACKGROUND
3946	resize_pixmap ();	3883	resize_pixmap ();
3947	scr_touch (true);	3884	scr_touch (true);
3948	#endif	3885	#endif
3949	}	3886	}
		3887	}
3950	break;	3888	break;
3951		3889
3952	case Rxvt_restoreFG:	3890	case Rxvt_restoreFG:
3953	set_window_color (Color_fg, str);	3891	set_window_color (Color_fg, str);
3954	break;	3892	break;
…		…
3958		3896
3959	case XTerm_logfile:	3897	case XTerm_logfile:
3960	// TODO, when secure mode?	3898	// TODO, when secure mode?
3961	break;	3899	break;
3962		3900
3963	#ifdef MENUBAR
3964	case URxvt_Menu:
3965	if (OPTION (Opt_insecure))
3966	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3967	break;
3968	#endif
3969	#if 0	3901	#if 0
3970	case Rxvt_dumpscreen: /* no error notices */	3902	case Rxvt_dumpscreen: /* no error notices */
3971	{	3903	{
3972	int fd;	3904	int fd;
3973	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3905	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
…		…
3999	allocated.push_back ((void *)res);	3931	allocated.push_back ((void *)res);
4000	set_fonts ();	3932	set_fonts ();
4001	}	3933	}
4002	break;	3934	break;
4003		3935
4004	#if ENABLE_FRILLS	3936	case URxvt_version:
		3937	if (query)
		3938	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3939	op,
		3940	rs[Rs_name], VERSION[0], VERSION[2],
		3941	resp);
		3942	break;
		3943
		3944	#if !ENABLE_MINIMAL
4005	case URxvt_locale:	3945	case URxvt_locale:
4006	if (query)	3946	if (query)
4007	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3947	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4008	else	3948	else
4009	{	3949	{
4010	set_locale (str);	3950	set_locale (str);
4011	pty.set_utf8_mode (enc_utf8);	3951	pty->set_utf8_mode (enc_utf8);
4012	init_xlocale ();	3952	init_xlocale ();
4013	}	3953	}
4014	break;	3954	break;
4015		3955
4016	case URxvt_view_up:	3956	case URxvt_view_up:
…		…
4069	return state;	4009	return state;
4070	}	4010	}
4071		4011
4072	/* we're not using priv _yet_ */	4012	/* we're not using priv _yet_ */
4073	void	4013	void
4074	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4014	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4075	{	4015	{
4076	unsigned int i, j;	4016	unsigned int i, j;
4077	int state;	4017	int state;
4078		4018
4079	static const struct	4019	static const struct
…		…
4090	{ 5, PrivMode_rVideo },	4030	{ 5, PrivMode_rVideo },
4091	{ 6, PrivMode_relOrigin },	4031	{ 6, PrivMode_relOrigin },
4092	{ 7, PrivMode_Autowrap },	4032	{ 7, PrivMode_Autowrap },
4093	// 8, bi-directional support mode	4033	// 8, bi-directional support mode
4094	{ 9, PrivMode_MouseX10 },	4034	{ 9, PrivMode_MouseX10 },
4095	#ifdef menuBar_esc
4096	{ menuBar_esc, PrivMode_menuBar },
4097	#endif
4098	// 18, 19 printing-related	4035	// 18, 19 printing-related
4099	{ 25, PrivMode_VisibleCursor },	4036	{ 25, PrivMode_VisibleCursor },
4100	#ifdef scrollBar_esc	4037	#ifdef scrollBar_esc
4101	{ scrollBar_esc, PrivMode_scrollBar },	4038	{ scrollBar_esc, PrivMode_scrollBar },
4102	#endif	4039	#endif
…		…
4197	/* case 8: - auto repeat, can't do on a per window basis */	4134	/* case 8: - auto repeat, can't do on a per window basis */
4198	case 9: /* X10 mouse reporting */	4135	case 9: /* X10 mouse reporting */
4199	if (state) /* orthogonal */	4136	if (state) /* orthogonal */
4200	priv_modes &= ~PrivMode_MouseX11;	4137	priv_modes &= ~PrivMode_MouseX11;
4201	break;	4138	break;
4202	#ifdef menuBar_esc
4203	case menuBar_esc:
4204	#ifdef MENUBAR
4205	map_menuBar (state);
4206	#endif
4207	break;
4208	#endif
4209	#ifdef scrollBar_esc	4139	#ifdef scrollBar_esc
4210	case scrollBar_esc:	4140	case scrollBar_esc:
4211	if (scrollbar_mapping (state))	4141	if (scrollbar_mapping (state))
4212	{	4142	{
4213	resize_all_windows (0, 0, 0);	4143	resize_all_windows (0, 0, 0);
…		…
4383	scr_color (Color_bg, Color_bg);	4313	scr_color (Color_bg, Color_bg);
4384	break;	4314	break;
4385		4315
4386	//case 50: // not variable spacing	4316	//case 50: // not variable spacing
4387		4317
4388	#if ENABLE_FRILLS	4318	#if !ENABLE_MINIMAL
4389	case 90:	4319	case 90:
4390	case 91: /* set bright fg color */	4320	case 91: /* set bright fg color */
4391	case 92:	4321	case 92:
4392	case 93:	4322	case 93:
4393	case 94:	4323	case 94:
…		…
4458	rxvt_term::tt_write (const char *data, unsigned int len)	4388	rxvt_term::tt_write (const char *data, unsigned int len)
4459	{	4389	{
4460	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4390	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4461	return;	4391	return;
4462		4392
4463	if (pty.pty < 0)	4393	if (pty->pty < 0)
4464	return;	4394	return;
4465		4395
4466	if (v_buflen == 0)	4396	if (v_buflen == 0)
4467	{	4397	{
4468	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4398	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4469		4399
4470	if ((unsigned int)written == len)	4400	if ((unsigned int)written == len)
4471	return;	4401	return;
4472		4402
4473	data += written;	4403	data += written;
…		…
4482	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4412	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4483	}	4413	}
4484		4414
4485	void rxvt_term::pty_write ()	4415	void rxvt_term::pty_write ()
4486	{	4416	{
4487	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4417	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4488		4418
4489	if (written > 0)	4419	if (written > 0)
4490	{	4420	{
4491	v_buflen -= written;	4421	v_buflen -= written;
4492		4422

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.266 by root, Mon Jan 16 08:57:02 2006 UTC vs. Revision 1.302 by root, Tue Jan 31 21:35:39 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.266 by root, Mon Jan 16 08:57:02 2006 UTC vs.
Revision 1.302 by root, Tue Jan 31 21:35:39 2006 UTC