[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.304 by root, Tue Jan 31 22:01:25 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
		60	#if LINUX_YIELD_HACK
		61	# include <ctime>
		62	#endif
		63
65	/----------------------------------------------------------------------/	64	/----------------------------------------------------------------------/
66		65
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	66	#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		67
72	#if ENABLE_FRILLS \|\| ISO_14755	68	#if ENABLE_FRILLS \|\| ISO_14755
73		69
74	#define ISO_14755_STARTED 0x80000000UL	70	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	71	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
…		…
230	# if !UNICODE3	226	# if !UNICODE3
231	if (ch >= 0x10000)	227	if (ch >= 0x10000)
232	ch = 0xfffd;	228	ch = 0xfffd;
233	# endif	229	# endif
234	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
		231
		232	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	233	scr_overlay_set (12, y, NOCHAR, r);
236	}	234	}
237		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	// }
238	scr_overlay_set (0, len , attr);	241	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	242	scr_overlay_set (0, len + 1, fname);
240		243
241	free (fname);	244	free (fname);
242		245
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	305	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	306	{
304	int ctrl, meta, shft, len;	307	int ctrl, meta, shft, len;
305	unsigned int newlen;	308	unsigned int newlen;
306	KeySym keysym;	309	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	310	int valid_keysym;
311	char kbuf[KBUFSZ];	311	char kbuf[KBUFSZ];
312		312
313	/*	313	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
464	{	464	{
465	switch (keysym)	465	switch (keysym)
466	{	466	{
467	/* normal XTerm key bindings */	467	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	468	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	469	selection_request (ev.time);
470	return;	470	return;
471	#if TODO	471	#if TODO
472	/* rxvt extras */	472	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	473	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	474	change_font (FONT_UP);
…		…
905	{	905	{
906	const char ch = C0_ESC;	906	const char ch = C0_ESC;
907	tt_write (&ch, 1);	907	tt_write (&ch, 1);
908	}	908	}
909		909
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);	910	tt_write (kbuf, (unsigned int)len);
921	}	911	}
922	/}}} /	912	/}}} /
923		913
924	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	914	#if defined (KEYSYM_RESOURCE)
925	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
926	/* attempt to `write' count to the input buffer */
927	unsigned int	915	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	916	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	917	{
930	unsigned int n, s;	918	unsigned int n, s;
931		919
…		…
1008	while (l->is_longer () && row < end_row);	996	while (l->is_longer () && row < end_row);
1009	}	997	}
1010	while (row < end_row);	998	while (row < end_row);
1011	}	999	}
1012		1000
1013	scr_refresh (refresh_type);	1001	scr_refresh ();
1014	scrollbar_show (1);	1002	scrollbar_show (1);
1015	#ifdef USE_XIM	1003	#ifdef USE_XIM
1016	IMSendSpot ();	1004	IMSendSpot ();
1017	#endif	1005	#endif
1018	}	1006	}
…		…
1046	rxvt_term::cursor_blink_cb (time_watcher &w)	1034	rxvt_term::cursor_blink_cb (time_watcher &w)
1047	{	1035	{
1048	hidden_cursor = !hidden_cursor;	1036	hidden_cursor = !hidden_cursor;
1049	want_refresh = 1;	1037	want_refresh = 1;
1050		1038
1051	w.start (w.at + BLINK_INTERVAL);	1039	w.start (w.at + CURSOR_BLINK_INTERVAL);
1052	}	1040	}
1053	#endif	1041	#endif
1054		1042
1055	#ifdef TEXT_BLINK	1043	#ifdef TEXT_BLINK
1056	void	1044	void
…		…
1070	rxvt_term::cont_scroll_cb (time_watcher &w)	1058	rxvt_term::cont_scroll_cb (time_watcher &w)
1071	{	1059	{
1072	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1060	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1073	scr_page (scrollbar_isUp() ? UP : DN, 1))	1061	scr_page (scrollbar_isUp() ? UP : DN, 1))
1074	{	1062	{
1075	refresh_type \|= SMOOTH_REFRESH;
1076	want_refresh = 1;	1063	want_refresh = 1;
1077	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1064	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078	}	1065	}
1079	}	1066	}
1080	#endif	1067	#endif
…		…
1084	rxvt_term::sel_scroll_cb (time_watcher &w)	1071	rxvt_term::sel_scroll_cb (time_watcher &w)
1085	{	1072	{
1086	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1073	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087	{	1074	{
1088	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1075	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089	refresh_type \|= SMOOTH_REFRESH;
1090	want_refresh = 1;	1076	want_refresh = 1;
1091	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1077	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092	}	1078	}
1093	}	1079	}
1094	#endif	1080	#endif
…		…
1102	: scr_page (UP, mouse_slip_wheel_speed))	1088	: scr_page (UP, mouse_slip_wheel_speed))
1103	{	1089	{
1104	if (view_start == top_row \|\| view_start == 0)	1090	if (view_start == top_row \|\| view_start == 0)
1105	mouse_slip_wheel_speed = 0;	1091	mouse_slip_wheel_speed = 0;
1106		1092
1107	refresh_type \|= SMOOTH_REFRESH;
1108	want_refresh = 1;	1093	want_refresh = 1;
1109	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1094	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110	}	1095	}
1111	}	1096	}
1112	#endif	1097	#endif
1113		1098
1114	#if HAVE_SCHED_YIELD	1099	#if LINUX_YIELD_HACK
1115	static struct event_handler	1100	static struct event_handler
1116	{	1101	{
1117	check_watcher cw_yield;	1102	check_watcher yield_ev;
1118		1103
1119	void yield (check_watcher &w)	1104	void yield_cb (check_watcher &w)
1120	{	1105	{
1121	sched_yield ();	1106	// this should really be sched_yield(), but the linux guys thought
		1107	// that giving a process calling sched_yield () less cpu time than
		1108	// ones with high nice levels is a useful thing to do. It surely is is
		1109	// allowed by the sus... as is returning ENOSYS.
		1110
		1111	struct timespec ts = { 0, 0 };
		1112	nanosleep (&ts, 0);
		1113
1122	w.stop ();	1114	w.stop ();
1123	}	1115	}
1124		1116
1125	event_handler ()	1117	event_handler ()
1126	: cw_yield (this, &event_handler::yield)	1118	: yield_ev (this, &event_handler::yield_cb)
1127	{	1119	{
1128	}	1120	}
1129	} event_handler;	1121	} event_handler;
1130	#endif	1122	#endif
1131		1123
…		…
1142		1134
1143	memmove (cmdbuf_base, cmdbuf_ptr, n);	1135	memmove (cmdbuf_base, cmdbuf_ptr, n);
1144	cmdbuf_ptr = cmdbuf_base;	1136	cmdbuf_ptr = cmdbuf_base;
1145	cmdbuf_endp = cmdbuf_ptr + n;	1137	cmdbuf_endp = cmdbuf_ptr + n;
1146		1138
1147	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1139	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1148		1140
1149	if (r > 0)	1141	if (r > 0)
1150	{	1142	{
1151	cmdbuf_endp += r;	1143	cmdbuf_endp += r;
1152	return true;	1144	return true;
1153	}	1145	}
1154	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))	1146	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
1155	{	1147	{
1156	#if HAVE_SCHED_YIELD	1148	#if LINUX_YIELD_HACK
1157	if (display->is_local)	1149	if (display->is_local)
1158	event_handler.cw_yield.start ();	1150	event_handler.yield_ev.start ();
1159	#endif	1151	#endif
1160	}	1152	}
1161	else	1153	else
1162	{	1154	{
1163	pty_ev.stop ();	1155	pty_ev.stop ();
…		…
1185	}	1177	}
1186		1178
1187	void	1179	void
1188	rxvt_term::pointer_unblank ()	1180	rxvt_term::pointer_unblank ()
1189	{	1181	{
1190	XDefineCursor (display->display, vt, TermWin_cursor);	1182	XDefineCursor (xdisp, vt, TermWin_cursor);
1191	recolour_cursor ();	1183	recolour_cursor ();
1192		1184
1193	#ifdef POINTER_BLANK	1185	#ifdef POINTER_BLANK
1194	hidden_pointer = 0;	1186	hidden_pointer = 0;
1195		1187
…		…
1203	rxvt_term::pointer_blank ()	1195	rxvt_term::pointer_blank ()
1204	{	1196	{
1205	if (!OPTION (Opt_pointerBlank))	1197	if (!OPTION (Opt_pointerBlank))
1206	return;	1198	return;
1207		1199
1208	XDefineCursor (display->display, vt, display->blank_cursor);	1200	XDefineCursor (xdisp, vt, display->blank_cursor);
1209	XFlush (display->display);	1201	XFlush (xdisp);
1210		1202
1211	hidden_pointer = 1;	1203	hidden_pointer = 1;
1212	}	1204	}
1213		1205
1214	void	1206	void
…		…
1287	(32 + button_number + key_state),	1279	(32 + button_number + key_state),
1288	(32 + x + 1),	1280	(32 + x + 1),
1289	(32 + y + 1));	1281	(32 + y + 1));
1290	}	1282	}
1291		1283
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 /	1284	/{{{ process an X event /
1303	void	1285	void
1304	rxvt_term::x_cb (XEvent &ev)	1286	rxvt_term::x_cb (XEvent &ev)
1305	{	1287	{
1306	make_current ();	1288	make_current ();
1307		1289
1308	dDisp;	1290	dLocal (Display *, xdisp);
1309		1291
1310	if (ev.xany.window == vt	1292	if (ev.xany.window == vt
1311	&& SHOULD_INVOKE (HOOK_X_EVENT)	1293	&& SHOULD_INVOKE (HOOK_X_EVENT)
1312	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1294	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1313	return;	1295	return;
…		…
1410	button_release (ev.xbutton);	1392	button_release (ev.xbutton);
1411	break;	1393	break;
1412		1394
1413	case ClientMessage:	1395	case ClientMessage:
1414	if (ev.xclient.format == 32	1396	if (ev.xclient.format == 32
1415	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1397	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416	{	1398	{
		1399	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1400	{
		1401	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1402	{
1417	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1403	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1404	{
		1405	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1418	destroy ();	1406	destroy ();
		1407	}
1419	#if ENABLE_EWMH	1408	#if ENABLE_EWMH
1420	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1409	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421	XSendEvent (disp, ev.xclient.window = display->root,	1410	XSendEvent (xdisp, ev.xclient.window = display->root,
1422	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1411	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1423	&ev);	1412	&ev);
		1413	#endif
		1414	}
		1415	}
		1416	#if ENABLE_XEMBED
		1417	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1418	{
		1419	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1420	focus_in ();
		1421	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1422	focus_out ();
		1423	}
1424	#endif	1424	#endif
1425	}	1425	}
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;	1426	break;
1462		1427
1463	case MappingNotify:	1428	case MappingNotify:
1464	XRefreshKeyboardMapping (&ev.xmapping);	1429	XRefreshKeyboardMapping (&ev.xmapping);
1465	break;	1430	break;
…		…
1498	break;	1463	break;
1499		1464
1500	case ConfigureNotify:	1465	case ConfigureNotify:
1501	if (ev.xconfigure.window == parent[0])	1466	if (ev.xconfigure.window == parent[0])
1502	{	1467	{
1503	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1468	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1504	;	1469	;
1505		1470
1506	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1471	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1507	{	1472	{
1508	seen_resize = 1;	1473	seen_resize = 1;
1509	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1474	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510	}	1475	}
1511		1476
		1477	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1478
1512	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1479	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513	if (OPTION (Opt_transparent))	1480	if (OPTION (Opt_transparent))
1514	check_our_parents ();	1481	check_our_parents ();
1515	#endif	1482	#endif
1516	}	1483	}
1517	break;	1484	break;
1518		1485
1519	case PropertyNotify:	1486	case PropertyNotify:
		1487	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1488	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521	&& ev.xproperty.state == PropertyNewValue)	1489	&& ev.xproperty.state == PropertyNewValue)
1522	selection_property (ev.xproperty.window, ev.xproperty.atom);	1490	selection_property (ev.xproperty.window, ev.xproperty.atom);
1523		1491
1524	break;	1492	break;
1525		1493
1526	case SelectionClear:	1494	case SelectionClear:
1527	selection_clear ();	1495	selection_clear ();
…		…
1563	if (ev.xany.window == vt)	1531	if (ev.xany.window == vt)
1564	{	1532	{
1565	do	1533	do
1566	scr_expose (ev.xexpose.x, ev.xexpose.y,	1534	scr_expose (ev.xexpose.x, ev.xexpose.y,
1567	ev.xexpose.width, ev.xexpose.height, False);	1535	ev.xexpose.width, ev.xexpose.height, False);
1568	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1536	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1569		1537
1570	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1538	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571		1539
1572	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1540	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1573	scr_expose (ev.xexpose.x, ev.xexpose.y,	1541	scr_expose (ev.xexpose.x, ev.xexpose.y,
1574	ev.xexpose.width, ev.xexpose.height, False);	1542	ev.xexpose.width, ev.xexpose.height, False);
1575		1543
1576	want_refresh = 1;	1544	want_refresh = 1;
1577	}	1545	}
1578	else	1546	else
1579	{	1547	{
1580	XEvent unused_event;	1548	XEvent unused_event;
1581		1549
1582	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1550	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1583	;	1551	;
1584	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1552	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1585	;	1553	;
1586		1554
1587	if (isScrollbarWindow (ev.xany.window))	1555	if (isScrollbarWindow (ev.xany.window))
1588	{	1556	{
1589	scrollBar.setIdle ();	1557	scrollBar.setIdle ();
1590	scrollbar_show (0);	1558	scrollbar_show (0);
1591	}	1559	}
1592	#ifdef MENUBAR
1593	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594	menubar_expose ();
1595	#endif
1596		1560
1597	#ifdef TRANSPARENT	1561	#ifdef TRANSPARENT
1598	if (am_transparent && ev.xany.window == parent[0])	1562	if (am_transparent && ev.xany.window == parent[0])
1599	XClearWindow (disp, ev.xany.window);	1563	XClearWindow (xdisp, ev.xany.window);
1600	#endif	1564	#endif
1601	}	1565	}
1602	break;	1566	break;
1603		1567
1604	case MotionNotify:	1568	case MotionNotify:
1605	#ifdef POINTER_BLANK	1569	#ifdef POINTER_BLANK
1606	if (hidden_pointer)	1570	if (hidden_pointer)
1607	pointer_unblank ();	1571	pointer_unblank ();
1608	#endif
1609	#if MENUBAR
1610	if (isMenuBarWindow (ev.xany.window))
1611	{
1612	menubar_control (ev.xbutton);
1613	break;
1614	}
1615	#endif	1572	#endif
1616	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1573	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617	break;	1574	break;
1618		1575
1619	if (ev.xany.window == vt)	1576	if (ev.xany.window == vt)
…		…
1621	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1578	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1579	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623	; // nop	1580	; // nop
1624	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1581	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1625	{	1582	{
1626	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1583	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1627	;	1584	;
1628		1585
1629	XQueryPointer (disp, vt,	1586	XQueryPointer (xdisp, vt,
1630	&unused_root, &unused_child,	1587	&unused_root, &unused_child,
1631	&unused_root_x, &unused_root_y,	1588	&unused_root_x, &unused_root_y,
1632	&ev.xbutton.x, &ev.xbutton.y,	1589	&ev.xbutton.x, &ev.xbutton.y,
1633	&ev.xbutton.state);	1590	&ev.xbutton.state);
1634	#ifdef MOUSE_THRESHOLD	1591	#ifdef MOUSE_THRESHOLD
…		…
1698	#endif	1655	#endif
1699	}	1656	}
1700	}	1657	}
1701	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1658	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1702	{	1659	{
1703	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1660	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1704	MotionNotify, &ev))	1661	MotionNotify, &ev))
1705	;	1662	;
1706		1663
1707	XQueryPointer (disp, scrollBar.win,	1664	XQueryPointer (xdisp, scrollBar.win,
1708	&unused_root, &unused_child,	1665	&unused_root, &unused_child,
1709	&unused_root_x, &unused_root_y,	1666	&unused_root_x, &unused_root_y,
1710	&ev.xbutton.x, &ev.xbutton.y,	1667	&ev.xbutton.x, &ev.xbutton.y,
1711	&unused_mask);	1668	&unused_mask);
1712	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1669	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1727	{	1684	{
1728	hidden_cursor = 0;	1685	hidden_cursor = 0;
1729	want_refresh = 1;	1686	want_refresh = 1;
1730	}	1687	}
1731		1688
1732	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1689	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733	}	1690	}
1734	#endif	1691	#endif
1735		1692
1736	#if defined(POINTER_BLANK)	1693	#if defined(POINTER_BLANK)
1737	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1694	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1765	XSetICFocus (Input_Context);	1722	XSetICFocus (Input_Context);
1766	}	1723	}
1767	#endif	1724	#endif
1768	#if CURSOR_BLINK	1725	#if CURSOR_BLINK
1769	if (OPTION (Opt_cursorBlink))	1726	if (OPTION (Opt_cursorBlink))
1770	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1727	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1771	#endif	1728	#endif
1772	#if OFF_FOCUS_FADING	1729	#if OFF_FOCUS_FADING
1773	if (rs[Rs_fade])	1730	if (rs[Rs_fade])
1774	{	1731	{
1775	pix_colors = pix_colors_focused;	1732	pix_colors = pix_colors_focused;
…		…
1856	/*	1813	/*
1857	* VT window processing of button press	1814	* VT window processing of button press
1858	*/	1815	*/
1859	if (ev.window == vt)	1816	if (ev.window == vt)
1860	{	1817	{
		1818	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1819	return;
		1820
1861	#if ISO_14755	1821	#if ISO_14755
1862	// 5.4	1822	// 5.4
1863	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1823	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1864	{	1824	{
1865	iso14755_54 (ev.x, ev.y);	1825	iso14755_54 (ev.x, ev.y);
…		…
1907	else	1867	else
1908	{	1868	{
1909	if (ev.button != MEvent.button)	1869	if (ev.button != MEvent.button)
1910	MEvent.clicks = 0;	1870	MEvent.clicks = 0;
1911		1871
1912	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913	switch (ev.button)	1872	switch (ev.button)
1914	{	1873	{
1915	case Button1:	1874	case Button1:
1916	/* allow meta + click to select rectangular areas */	1875	/* allow meta + click to select rectangular areas */
1917	/* should be done in screen.C */	1876	/* should be done in screen.C */
1918	#if ENABLE_FRILLS	1877	#if ENABLE_FRILLS
1919	selection.rect = !!(ev.state & ModMetaMask);	1878	selection.rect = !!(ev.state & ModMetaMask);
1920	#else	1879	#else
1921	selection.rect = false;	1880	selection.rect = false;
1922	#endif	1881	#endif
1923		1882
1924	/* allow shift+left click to extend selection */	1883	/* allow shift+left click to extend selection */
1925	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1884	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926	{	1885	{
1927	if (MEvent.button == Button1 && clickintime)	1886	if (MEvent.button == Button1 && clickintime)
1928	selection_rotate (ev.x, ev.y);	1887	selection_rotate (ev.x, ev.y);
1929	else	1888	else
1930	selection_extend (ev.x, ev.y, 1);	1889	selection_extend (ev.x, ev.y, 1);
1931	}	1890	}
1932	else	1891	else
1933	{	1892	{
1934	if (MEvent.button == Button1 && clickintime)	1893	if (MEvent.button == Button1 && clickintime)
1935	MEvent.clicks++;	1894	MEvent.clicks++;
1936	else	1895	else
1937	MEvent.clicks = 1;	1896	MEvent.clicks = 1;
1938		1897
1939	selection_click (MEvent.clicks, ev.x, ev.y);	1898	selection_click (MEvent.clicks, ev.x, ev.y);
1940	}	1899	}
1941		1900
1942	MEvent.button = Button1;	1901	MEvent.button = Button1;
1943	break;	1902	break;
1944		1903
1945	case Button3:	1904	case Button3:
1946	if (MEvent.button == Button3 && clickintime)	1905	if (MEvent.button == Button3 && clickintime)
1947	selection_rotate (ev.x, ev.y);	1906	selection_rotate (ev.x, ev.y);
1948	else	1907	else
1949	selection_extend (ev.x, ev.y, 1);	1908	selection_extend (ev.x, ev.y, 1);
1950		1909
1951	MEvent.button = Button3;	1910	MEvent.button = Button3;
1952	break;	1911	break;
1953	}	1912	}
1954	}	1913	}
1955		1914
1956	MEvent.time = ev.time;	1915	MEvent.time = ev.time;
1957	return;	1916	return;
1958	}	1917	}
1959		1918
…		…
2098	}	2057	}
2099	}	2058	}
2100		2059
2101	return;	2060	return;
2102	}	2061	}
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	}	2062	}
2112		2063
2113	void	2064	void
2114	rxvt_term::button_release (XButtonEvent &ev)	2065	rxvt_term::button_release (XButtonEvent &ev)
2115	{	2066	{
…		…
2121		2072
2122	if (scrollbar_isUpDn ())	2073	if (scrollbar_isUpDn ())
2123	{	2074	{
2124	scrollBar.setIdle ();	2075	scrollBar.setIdle ();
2125	scrollbar_show (0);	2076	scrollbar_show (0);
2126	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127	refresh_type &= ~SMOOTH_REFRESH;
2128	#endif
2129	}	2077	}
2130		2078
2131	#ifdef SELECTION_SCROLLING	2079	#ifdef SELECTION_SCROLLING
2132	if (sel_scroll_ev.active)	2080	if (sel_scroll_ev.active)
2133	sel_scroll_ev.stop();	2081	sel_scroll_ev.stop();
2134	#endif	2082	#endif
2135		2083
2136	if (ev.window == vt)	2084	if (ev.window == vt)
2137	{	2085	{
		2086	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2087	return;
		2088
2138	#if ISO_14755	2089	#if ISO_14755
2139	// 5.4	2090	// 5.4
2140	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2091	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2141	return;	2092	return;
2142	#endif	2093	#endif
		2094
2143	if (reportmode)	2095	if (reportmode)
2144	{	2096	{
2145	/* mouse report from vt window */	2097	/* mouse report from vt window */
2146	/* don't report release of wheel "buttons" */	2098	/* don't report release of wheel "buttons" */
2147	if (ev.button >= 4)	2099	if (ev.button >= 4)
…		…
2171	if (priv_modes & PrivMode_mouse_report	2123	if (priv_modes & PrivMode_mouse_report
2172	&& bypass_keystate	2124	&& bypass_keystate
2173	&& ev.button == Button1 && MEvent.clicks <= 1)	2125	&& ev.button == Button1 && MEvent.clicks <= 1)
2174	selection_extend (ev.x, ev.y, 0);	2126	selection_extend (ev.x, ev.y, 0);
2175		2127
2176	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177	return;
2178
2179	switch (ev.button)	2128	switch (ev.button)
2180	{	2129	{
2181	case Button1:	2130	case Button1:
2182	case Button3:	2131	case Button3:
2183	selection_make (ev.time);	2132	selection_make (ev.time);
2184	break;	2133	break;
		2134
2185	case Button2:	2135	case Button2:
2186	selection_request (ev.time, ev.x, ev.y);	2136	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2137	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2187	break;	2138	break;
		2139
2188	#ifdef MOUSE_WHEEL	2140	#ifdef MOUSE_WHEEL
2189	case Button4:	2141	case Button4:
2190	case Button5:	2142	case Button5:
2191	{	2143	{
2192	int i;	2144	int i;
…		…
2224	}	2176	}
2225	break;	2177	break;
2226	#endif	2178	#endif
2227	}	2179	}
2228	}	2180	}
2229	#ifdef MENUBAR
2230	else if (isMenuBarWindow (ev.window))
2231	menubar_control (ev);
2232	#endif
2233	}	2181	}
2234		2182
2235	#ifdef TRANSPARENT	2183	#ifdef TRANSPARENT
2236	#if TINTING	2184	#if TINTING
2237	/* taken from aterm-0.4.2 */	2185	/* taken from aterm-0.4.2 */
2238		2186
2239	typedef uint32_t RUINT32T;	2187	typedef uint32_t RUINT32T;
2240		2188
2241	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2189	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2242	{	2190	{
2243	int sh_r, sh_g, sh_b;	2191	int sh_r, sh_g, sh_b;
2244	RUINT32T mask_r, mask_g, mask_b;	2192	RUINT32T mask_r, mask_g, mask_b;
2245	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2193	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2246	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2194	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2195	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248	int i;	2196	int i;
2249		2197
2250	Visual *visual = display->visual;	2198	Visual *visual = term->visual;
2251		2199
2252	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2200	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2253		2201
2254	/* for convenience */	2202	/* for convenience */
2255	mask_r = visual->red_mask;	2203	mask_r = visual->red_mask;
…		…
2476	Atom atype;	2424	Atom atype;
2477	unsigned char *prop = NULL;	2425	unsigned char *prop = NULL;
2478	Window root, oldp, *list;	2426	Window root, oldp, *list;
2479	Pixmap rootpixmap = None;	2427	Pixmap rootpixmap = None;
2480	XWindowAttributes wattr, wrootattr;	2428	XWindowAttributes wattr, wrootattr;
2481	dDisp;
2482		2429
2483	pchanged = 0;	2430	pchanged = 0;
2484		2431
2485	if (!OPTION (Opt_transparent))	2432	if (!OPTION (Opt_transparent))
2486	return pchanged; /* Don't try any more */	2433	return pchanged; /* Don't try any more */
2487		2434
2488	XGetWindowAttributes (disp, display->root, &wrootattr);	2435	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2489	rootdepth = wrootattr.depth;	2436	rootdepth = wrootattr.depth;
2490		2437
2491	XGetWindowAttributes (disp, parent[0], &wattr);	2438	XGetWindowAttributes (xdisp, parent[0], &wattr);
2492		2439
2493	if (rootdepth != wattr.depth)	2440	if (rootdepth != wattr.depth)
2494	{	2441	{
2495	if (am_transparent)	2442	if (am_transparent)
2496	{	2443	{
2497	pchanged = 1;	2444	pchanged = 1;
2498	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2445	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2499	am_transparent = am_pixmap_trans = 0;	2446	am_transparent = am_pixmap_trans = 0;
2500	}	2447	}
2501		2448
2502	return pchanged; /* Don't try any more */	2449	return pchanged; /* Don't try any more */
2503	}	2450	}
2504		2451
2505	/* Get all X ops out of the queue so that our information is up-to-date. */	2452	/* Get all X ops out of the queue so that our information is up-to-date. */
2506	XSync (disp, False);	2453	XSync (xdisp, False);
2507		2454
2508	/*	2455	/*
2509	* Make the frame window set by the window manager have	2456	* Make the frame window set by the window manager have
2510	* the root background. Some window managers put multiple nested frame	2457	* the root background. Some window managers put multiple nested frame
2511	* windows for each client, so we have to take care about that.	2458	* windows for each client, so we have to take care about that.
2512	*/	2459	*/
2513	i = (xa[XA_XROOTPMAP_ID]	2460	i = (xa[XA_XROOTPMAP_ID]
2514	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2461	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2515	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516	&nitems, &bytes_after, &prop) == Success);	2463	&nitems, &bytes_after, &prop) == Success);
2517		2464
2518	if (!i \|\| prop == NULL)	2465	if (!i \|\| prop == NULL)
2519	i = (xa[XA_ESETROOT_PMAP_ID]	2466	i = (xa[XA_ESETROOT_PMAP_ID]
2520	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2467	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2521	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2468	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522	&nitems, &bytes_after, &prop) == Success);	2469	&nitems, &bytes_after, &prop) == Success);
2523		2470
2524	if (!i \|\| prop == NULL	2471	if (!i \|\| prop == NULL
2525	#if TINTING	2472	#if TINTING
2526	\|\| !rs[Rs_color + Color_tint]	2473	\|\| !ISSET_PIXCOLOR (Color_tint)
2527	#endif	2474	#endif
2528	)	2475	)
2529	have_pixmap = 0;	2476	have_pixmap = 0;
2530	else	2477	else
2531	{	2478	{
…		…
2544	Window cr;	2491	Window cr;
2545	XImage *image;	2492	XImage *image;
2546	GC gc;	2493	GC gc;
2547	XGCValues gcvalue;	2494	XGCValues gcvalue;
2548		2495
2549	XTranslateCoordinates (disp, parent[0], display->root,	2496	XTranslateCoordinates (xdisp, parent[0], display->root,
2550	0, 0, &sx, &sy, &cr);	2497	0, 0, &sx, &sy, &cr);
2551	nw = (unsigned int)szHint.width;	2498	nw = (unsigned int)szHint.width;
2552	nh = (unsigned int)szHint.height;	2499	nh = (unsigned int)szHint.height;
2553	nx = ny = 0;	2500	nx = ny = 0;
2554		2501
…		…
2567	}	2514	}
2568		2515
2569	min_it (nw, (unsigned int) (wrootattr.width - sx));	2516	min_it (nw, (unsigned int) (wrootattr.width - sx));
2570	min_it (nh, (unsigned int) (wrootattr.height - sy));	2517	min_it (nh, (unsigned int) (wrootattr.height - sy));
2571		2518
2572	XSync (disp, False);	2519	XSync (xdisp, False);
2573	allowedxerror = -1;	2520	allowedxerror = -1;
2574	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2521	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575		2522
2576	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2523	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2577	/* XXX: may need a delay here? */	2524	/* XXX: may need a delay here? */
2578	allowedxerror = 0;	2525	allowedxerror = 0;
2579		2526
…		…
2582	if (am_transparent && am_pixmap_trans)	2529	if (am_transparent && am_pixmap_trans)
2583	{	2530	{
2584	pchanged = 1;	2531	pchanged = 1;
2585	if (pixmap != None)	2532	if (pixmap != None)
2586	{	2533	{
2587	XFreePixmap (disp, pixmap);	2534	XFreePixmap (xdisp, pixmap);
2588	pixmap = None;	2535	pixmap = None;
2589	}	2536	}
2590	}	2537	}
2591		2538
2592	am_pixmap_trans = 0;	2539	am_pixmap_trans = 0;
2593	}	2540	}
2594	else	2541	else
2595	{	2542	{
2596	if (pixmap != None)	2543	if (pixmap != None)
2597	XFreePixmap (disp, pixmap);	2544	XFreePixmap (xdisp, pixmap);
2598		2545
2599	#if TINTING	2546	#if TINTING
2600	if (ISSET_PIXCOLOR (Color_tint))	2547	if (ISSET_PIXCOLOR (Color_tint))
2601	{	2548	{
2602	unsigned short rm, gm, bm;
2603	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2549	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604		2550
		2551	rgba c;
2605	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2552	pix_colors_focused [Color_tint].get (c);
2606		2553
2607	ShadeXImage (display, image, shade, rm, gm, bm);	2554	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2608	}	2555	}
2609	#endif	2556	#endif
2610		2557
2611	pixmap = XCreatePixmap (disp, vt,	2558	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2612	szHint.width, szHint.height, image->depth);
2613	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2559	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2614	XPutImage (disp, pixmap, gc, image, 0, 0,	2560	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2615	nx, ny, image->width, image->height);	2561	nx, ny, image->width, image->height);
2616	XFreeGC (disp, gc);	2562	XFreeGC (xdisp, gc);
2617	XDestroyImage (image);	2563	XDestroyImage (image);
2618	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2564	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2619	XClearWindow (disp, parent[0]);	2565	XClearWindow (xdisp, parent[0]);
2620		2566
2621	if (!am_transparent \|\| !am_pixmap_trans)	2567	if (!am_transparent \|\| !am_pixmap_trans)
2622	pchanged = 1;	2568	pchanged = 1;
2623		2569
2624	am_transparent = am_pixmap_trans = 1;	2570	am_transparent = am_pixmap_trans = 1;
2625	}	2571	}
2626	}	2572	}
2627		2573
2628	if (am_pixmap_trans)	2574	if (am_pixmap_trans)
2629	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2575	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2630	else	2576	else
2631	{	2577	{
2632	unsigned int n;	2578	unsigned int n;
2633	/*	2579	/*
2634	* InheritPixmap transparency	2580	* InheritPixmap transparency
2635	*/	2581	*/
2636	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2582	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637	{	2583	{
2638	oldp = parent[i];	2584	oldp = parent[i];
2639	XQueryTree (disp, parent[i - 1], &root,	2585	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2640	&parent[i], &list, &n);
2641	XFree (list);	2586	XFree (list);
2642		2587
2643	if (parent[i] == display->root)	2588	if (parent[i] == display->root)
2644	{	2589	{
2645	if (oldp != None)	2590	if (oldp != None)
…		…
2653	}	2598	}
2654		2599
2655	n = 0;	2600	n = 0;
2656		2601
2657	if (pchanged)	2602	if (pchanged)
2658	{
2659	for (; n < (unsigned int)i; n++)	2603	for (; n < (unsigned int)i; n++)
2660	{	2604	{
2661	XGetWindowAttributes (disp, parent[n], &wattr);	2605	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2606
2662	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2607	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2663	{	2608	{
2664	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2609	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665	break;	2610	break;
2666	}	2611	}
2667	}	2612	}
2668	}
2669		2613
2670	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2614	if (n > (sizeof (parent) / sizeof (parent[0])))
2671	{	2615	{
2672	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2616	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2673	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2617	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2674	am_transparent = 0;	2618	am_transparent = 0;
2675	/* XXX: also turn off Opt_transparent? */	2619	/* XXX: also turn off Opt_transparent? */
2676	}	2620	}
2677	else	2621	else
2678	{	2622	{
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++)	2623	for (n = 0; n < (unsigned int)i; n++)
2685	{	2624	{
2686	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2625	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2687	XClearWindow (disp, parent[n]);	2626	XClearWindow (xdisp, parent[n]);
2688	}	2627	}
2689		2628
2690	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2629	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2691	am_transparent = 1;	2630	am_transparent = 1;
2692	}	2631	}
2693		2632
2694	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2633	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695	parent[i] = None;	2634	parent[i] = None;
2696	}	2635	}
2697		2636
2698	if (scrollBar.win)	2637	if (scrollBar.win)
2699	{	2638	{
2700	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2639	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2701	scrollBar.setIdle ();	2640	scrollBar.setIdle ();
2702	scrollbar_show (0);	2641	scrollbar_show (0);
2703	}	2642	}
2704		2643
2705	if (am_transparent)	2644	if (am_transparent)
…		…
2823	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2762	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2824	refresh_limit++;	2763	refresh_limit++;
2825	else	2764	else
2826	{	2765	{
2827	flag = true;	2766	flag = true;
2828	scr_refresh (refresh_type);	2767	scr_refresh ();
2829	want_refresh = 1;	2768	want_refresh = 1;
2830	}	2769	}
2831	}	2770	}
2832		2771
2833	}	2772	}
…		…
2851	return flag;	2790	return flag;
2852	}	2791	}
2853		2792
2854	// read the next character	2793	// read the next character
2855	wchar_t	2794	wchar_t
2856	rxvt_term::next_char ()	2795	rxvt_term::next_char () NOTHROW
2857	{	2796	{
2858	while (cmdbuf_ptr < cmdbuf_endp)	2797	while (cmdbuf_ptr < cmdbuf_endp)
2859	{	2798	{
2860	// assume 7-bit to be ascii ALWAYS	2799	// assume 7-bit to be ascii ALWAYS
2861	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2800	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2882	return NOCHAR;	2821	return NOCHAR;
2883	}	2822	}
2884		2823
2885	// read the next octet	2824	// read the next octet
2886	uint32_t	2825	uint32_t
2887	rxvt_term::next_octet ()	2826	rxvt_term::next_octet () NOTHROW
2888	{	2827	{
2889	return cmdbuf_ptr < cmdbuf_endp	2828	return cmdbuf_ptr < cmdbuf_endp
2890	? (unsigned char)*cmdbuf_ptr++	2829	? (unsigned char)*cmdbuf_ptr++
2891	: NOCHAR;	2830	: NOCHAR;
2892	}	2831	}
		2832
		2833	static class out_of_input out_of_input;
2893		2834
2894	/* rxvt_cmd_getc () - Return next input character */	2835	/* rxvt_cmd_getc () - Return next input character */
2895	/*	2836	/*
2896	* Return the next input character after first passing any keyboard input	2837	* Return the next input character after first passing any keyboard input
2897	* to the command.	2838	* to the command.
2898	*/	2839	*/
2899	wchar_t	2840	wchar_t
2900	rxvt_term::cmd_getc ()	2841	rxvt_term::cmd_getc () THROW ((class out_of_input))
2901	{	2842	{
2902	wchar_t c = next_char ();	2843	wchar_t c = next_char ();
2903		2844
2904	if (c == NOCHAR)	2845	if (c == NOCHAR)
2905	throw out_of_input;	2846	throw out_of_input;
2906		2847
2907	return c;	2848	return c;
2908	}	2849	}
2909		2850
2910	uint32_t	2851	uint32_t
2911	rxvt_term::cmd_get8 ()	2852	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2912	{	2853	{
2913	uint32_t c = next_octet ();	2854	uint32_t c = next_octet ();
2914		2855
2915	if (c == NOCHAR)	2856	if (c == NOCHAR)
2916	throw out_of_input;	2857	throw out_of_input;
…		…
3154	scr_charset_set (2, (unsigned int)cmd_getc ());	3095	scr_charset_set (2, (unsigned int)cmd_getc ());
3155	break;	3096	break;
3156	case '+':	3097	case '+':
3157	scr_charset_set (3, (unsigned int)cmd_getc ());	3098	scr_charset_set (3, (unsigned int)cmd_getc ());
3158	break;	3099	break;
3159	#if ENABLE_FRILLS	3100	#if !ENABLE_MINIMAL
3160	case '6':	3101	case '6':
3161	scr_backindex ();	3102	scr_backindex ();
3162	break;	3103	break;
3163	#endif	3104	#endif
3164	case '7':	3105	case '7':
3165	scr_cursor (SAVE);	3106	scr_cursor (SAVE);
3166	break;	3107	break;
3167	case '8':	3108	case '8':
3168	scr_cursor (RESTORE);	3109	scr_cursor (RESTORE);
3169	break;	3110	break;
3170	#if ENABLE_FRILLS	3111	#if !ENABLE_MINIMAL
3171	case '9':	3112	case '9':
3172	scr_forwardindex ();	3113	scr_forwardindex ();
3173	break;	3114	break;
3174	#endif	3115	#endif
3175	case '=':	3116	case '=':
…		…
3337	ndef = get_byte_array_bit (csi_defaults, i);	3278	ndef = get_byte_array_bit (csi_defaults, i);
3338	for (p = 0; p < nargs; p++)	3279	for (p = 0; p < nargs; p++)
3339	if (arg[p] == -1)	3280	if (arg[p] == -1)
3340	arg[p] = ndef;	3281	arg[p] = ndef;
3341		3282
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	/*	3283	/*
3350	* private mode handling	3284	* private mode handling
3351	*/	3285	*/
3352	if (priv)	3286	if (priv)
3353	{	3287	{
3354	switch (priv)	3288	switch (priv)
3355	{	3289	{
3356	case '>':	3290	case '>':
3357	if (ch == CSI_DA) /* secondary device attributes */	3291	if (ch == CSI_DA) /* secondary device attributes */
3358	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3292	{
		3293	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3294	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3295	//
		3296	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3297	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3298	// that we do not support xterm mouse reporting (should be 95 when we do).
		3299	//
		3300	tt_printf ("\033[>%d;94;0c", 'U');
		3301	}
3359	break;	3302	break;
3360	case '?':	3303	case '?':
3361	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3304	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3362	process_terminal_mode (ch, priv, nargs, arg);	3305	process_terminal_mode (ch, priv, nargs, arg);
3363	break;	3306	break;
…		…
3566	break;	3509	break;
3567	case CSI_75:	3510	case CSI_75:
3568	scr_cursor (RESTORE);	3511	scr_cursor (RESTORE);
3569	break;	3512	break;
3570		3513
3571	#if ENABLE_FRILLS	3514	#if !ENABLE_MINIMAL
3572	case CSI_74:	3515	case CSI_74:
3573	process_window_ops (arg, nargs);	3516	process_window_ops (arg, nargs);
3574	break;	3517	break;
3575	#endif	3518	#endif
3576		3519
…		…
3583	break;	3526	break;
3584	}	3527	}
3585	}	3528	}
3586	/}}} /	3529	/}}} /
3587		3530
3588	#if ENABLE_FRILLS	3531	#if !ENABLE_MINIMAL
3589	/* ARGSUSED */	3532	/* ARGSUSED */
3590	void	3533	void
3591	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3534	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3592	{	3535	{
3593	int x, y;	3536	int x, y;
3594	XWindowAttributes wattr;	3537	XWindowAttributes wattr;
3595	Window wdummy;	3538	Window wdummy;
3596	dDisp;	3539
		3540	dLocal (Display *, xdisp);
3597		3541
3598	if (nargs == 0)	3542	if (nargs == 0)
3599	return;	3543	return;
3600		3544
3601	switch (args[0])	3545	switch (args[0])
3602	{	3546	{
3603	/*	3547	/*
3604	* commands	3548	* commands
3605	*/	3549	*/
3606	case 1: /* deiconify window */	3550	case 1: /* deiconify window */
3607	XMapWindow (disp, parent[0]);	3551	XMapWindow (xdisp, parent[0]);
3608	break;	3552	break;
3609	case 2: /* iconify window */	3553	case 2: /* iconify window */
3610	XIconifyWindow (disp, parent[0], display->screen);	3554	XIconifyWindow (xdisp, parent[0], display->screen);
3611	break;	3555	break;
3612	case 3: /* set position (pixels) */	3556	case 3: /* set position (pixels) */
3613	XMoveWindow (disp, parent[0], args[1], args[2]);	3557	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3614	break;	3558	break;
3615	case 4: /* set size (pixels) */	3559	case 4: /* set size (pixels) */
3616	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3560	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3617	break;	3561	break;
3618	case 5: /* raise window */	3562	case 5: /* raise window */
3619	XRaiseWindow (disp, parent[0]);	3563	XRaiseWindow (xdisp, parent[0]);
3620	break;	3564	break;
3621	case 6: /* lower window */	3565	case 6: /* lower window */
3622	XLowerWindow (disp, parent[0]);	3566	XLowerWindow (xdisp, parent[0]);
3623	break;	3567	break;
3624	case 7: /* refresh window */	3568	case 7: /* refresh window */
3625	scr_touch (true);	3569	scr_touch (true);
3626	break;	3570	break;
3627	case 8: /* set size (chars) */	3571	case 8: /* set size (chars) */
…		…
3634	if (args[0] >= 24) /* set height (chars) */	3578	if (args[0] >= 24) /* set height (chars) */
3635	set_widthheight ((unsigned int)width,	3579	set_widthheight ((unsigned int)width,
3636	(unsigned int) (args[1] * fheight));	3580	(unsigned int) (args[1] * fheight));
3637	break;	3581	break;
3638		3582
3639
3640	/*	3583	/*
3641	* reports - some output format copied from XTerm	3584	* reports - some output format copied from XTerm
3642	*/	3585	*/
3643	case 11: /* report window state */	3586	case 11: /* report window state */
3644	XGetWindowAttributes (disp, parent[0], &wattr);	3587	XGetWindowAttributes (xdisp, parent[0], &wattr);
3645	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3588	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3646	break;	3589	break;
3647	case 13: /* report window position */	3590	case 13: /* report window position */
3648	XGetWindowAttributes (disp, parent[0], &wattr);	3591	XGetWindowAttributes (xdisp, parent[0], &wattr);
3649	XTranslateCoordinates (disp, parent[0], wattr.root,	3592	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3650	-wattr.border_width, -wattr.border_width,	3593	-wattr.border_width, -wattr.border_width,
3651	&x, &y, &wdummy);	3594	&x, &y, &wdummy);
3652	tt_printf ("\033[3;%d;%dt", x, y);	3595	tt_printf ("\033[3;%d;%dt", x, y);
3653	break;	3596	break;
3654	case 14: /* report window size (pixels) */	3597	case 14: /* report window size (pixels) */
3655	XGetWindowAttributes (disp, parent[0], &wattr);	3598	XGetWindowAttributes (xdisp, parent[0], &wattr);
3656	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3599	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3657	break;	3600	break;
3658	case 18: /* report text area size (chars) */	3601	case 18: /* report text area size (chars) */
3659	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3602	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3660	break;	3603	break;
…		…
3662	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3605	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3663	break;	3606	break;
3664	case 20: /* report icon label */	3607	case 20: /* report icon label */
3665	{	3608	{
3666	char *s;	3609	char *s;
3667	XGetIconName (disp, parent[0], &s);	3610	XGetIconName (xdisp, parent[0], &s);
3668	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3611	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3669	XFree (s);	3612	XFree (s);
3670	}	3613	}
3671	break;	3614	break;
3672	case 21: /* report window title */	3615	case 21: /* report window title */
3673	{	3616	{
3674	char *s;	3617	char *s;
3675	XFetchName (disp, parent[0], &s);	3618	XFetchName (xdisp, parent[0], &s);
3676	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3619	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3677	XFree (s);	3620	XFree (s);
3678	}	3621	}
3679	break;	3622	break;
3680	}	3623	}
…		…
3781	void	3724	void
3782	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3725	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3783	{	3726	{
3784	if (str[0] == '?' && !str[1])	3727	if (str[0] == '?' && !str[1])
3785	{	3728	{
3786	unsigned short r, g, b;	3729	rgba c;
3787	pix_colors_focused[color].get (display, r, g, b);	3730	pix_colors_focused[color].get (c);
		3731
		3732	#if XFT
		3733	if (c.a != rgba::MAX_CC)
		3734	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3735	else
		3736	#endif
3788	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3737	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3789	}	3738	}
3790	else	3739	else
3791	set_window_color (color, str);	3740	set_window_color (color, str);
3792	}	3741	}
3793		3742
…		…
3795	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3744	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3796	*/	3745	*/
3797	void	3746	void
3798	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3747	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3799	{	3748	{
3800	int changed = 0;
3801	int color;	3749	int color;
3802	char buf, name;	3750	char buf, name;
3803	bool query = str[0] == '?' && !str[1];	3751	bool query = str[0] == '?' && !str[1];
3804	int saveop = op;	3752	int saveop = op;
3805	dDisp;	3753
		3754	dLocal (Display *, xdisp);
3806		3755
3807	assert (str != NULL);	3756	assert (str != NULL);
3808	switch (op)	3757	switch (op)
3809	{	3758	{
3810	case XTerm_name:	3759	case XTerm_name:
…		…
3826	unsigned long bytes_after;	3775	unsigned long bytes_after;
3827	unsigned char *value = 0;	3776	unsigned char *value = 0;
3828	const char *str = "";	3777	const char *str = "";
3829		3778
3830	if (prop	3779	if (prop
3831	&& XGetWindowProperty (disp, parent[0],	3780	&& XGetWindowProperty (xdisp, parent[0],
3832	prop, 0, 1<<16, 0, AnyPropertyType,	3781	prop, 0, 1<<16, 0, AnyPropertyType,
3833	&actual_type, &actual_format,	3782	&actual_type, &actual_format,
3834	&nitems, &bytes_after, &value) == Success	3783	&nitems, &bytes_after, &value) == Success
3835	&& actual_type != None	3784	&& actual_type != None
3836	&& actual_format == 8)	3785	&& actual_format == 8)
3837	str = (const char *)(value);	3786	str = (const char *)(value);
3838		3787
3839	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3788	tt_printf ("\033]%d;%s%c", op, str, resp);
3840		3789
3841	XFree (value);	3790	XFree (value);
3842	}	3791	}
3843	else	3792	else
3844	{	3793	{
…		…
3848	{	3797	{
3849	*eq = 0;	3798	*eq = 0;
3850	set_utf8_property (display->atom (str), eq + 1);	3799	set_utf8_property (display->atom (str), eq + 1);
3851	}	3800	}
3852	else	3801	else
3853	XDeleteProperty (disp, parent[0],	3802	XDeleteProperty (xdisp, parent[0],
3854	display->atom (str));	3803	display->atom (str));
3855	}	3804	}
3856	break;	3805	break;
3857		3806
3858	case XTerm_Color:	3807	case XTerm_Color:
…		…
3868	break;	3817	break;
3869		3818
3870	if ((buf = strchr (name, ';')) != NULL)	3819	if ((buf = strchr (name, ';')) != NULL)
3871	*buf++ = '\0';	3820	*buf++ = '\0';
3872		3821
3873	if (name[0] == '?' && !name[1])	3822	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	}	3823	}
3882	break;	3824	break;
3883	case XTerm_Color00:	3825	case XTerm_Color00:
3884	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3826	process_color_seq (op, Color_fg, str, resp);
3885	break;	3827	break;
3886	case XTerm_Color01:	3828	case XTerm_Color01:
3887	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3829	process_color_seq (op, Color_bg, str, resp);
3888	break;	3830	break;
3889	#ifndef NO_CURSORCOLOR	3831	#ifndef NO_CURSORCOLOR
3890	case XTerm_Color_cursor:	3832	case XTerm_Color_cursor:
3891	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3833	process_color_seq (op, Color_cursor, str, resp);
3892	break;	3834	break;
3893	#endif	3835	#endif
3894	case XTerm_Color_pointer_fg:	3836	case XTerm_Color_pointer_fg:
3895	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3837	process_color_seq (op, Color_pointer_fg, str, resp);
3896	break;	3838	break;
3897	case XTerm_Color_pointer_bg:	3839	case XTerm_Color_pointer_bg:
3898	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3840	process_color_seq (op, Color_pointer_bg, str, resp);
3899	break;	3841	break;
3900	#ifndef NO_BOLD_UNDERLINE_REVERSE	3842	#ifndef NO_BOLD_UNDERLINE_REVERSE
3901	case XTerm_Color_RV:	3843	case XTerm_Color_RV:
3902	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3844	process_color_seq (op, Color_RV, str, resp);
3903	break;	3845	break;
3904	case Rxvt_Color_BD:	3846	case Rxvt_Color_BD:
3905	case URxvt_Color_BD:	3847	case URxvt_Color_BD:
3906	process_color_seq (op, Color_BD, str, resp);	3848	process_color_seq (op, Color_BD, str, resp);
3907	break;	3849	break;
3908	case Rxvt_Color_UL:	3850	case Rxvt_Color_UL:
3909	case URxvt_Color_UL:	3851	case URxvt_Color_UL:
3910	process_color_seq (op, Color_UL, str, resp);	3852	process_color_seq (op, Color_UL, str, resp);
3911	break;	3853	break;
3912	case URxvt_Color_IT:	3854	case URxvt_Color_IT:
3913	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3855	process_color_seq (op, Color_IT, str, resp);
3914	break;	3856	break;
3915	#endif	3857	#endif
3916	#if TRANSPARENT && TINTING	3858	#if TRANSPARENT && TINTING
3917	case URxvt_Color_tint:	3859	case URxvt_Color_tint:
3918	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3860	process_color_seq (op, Color_tint, str, resp);
		3861
3919	check_our_parents ();	3862	check_our_parents ();
		3863
3920	if (am_transparent)	3864	if (am_transparent)
3921	want_full_refresh = want_refresh = 1;	3865	want_full_refresh = want_refresh = 1;
		3866
3922	break;	3867	break;
3923	#endif	3868	#endif
3924		3869
3925	case Rxvt_Pixmap:	3870	case Rxvt_Pixmap:
		3871	{
3926	if (*str != ';')	3872	if (*str != ';')
3927	{	3873	{
3928	#if XPM_BACKGROUND	3874	#if XPM_BACKGROUND
3929	scale_pixmap (""); /* reset to default scaling */	3875	scale_pixmap (""); /* reset to default scaling */
3930	set_bgPixmap (str); /* change pixmap */	3876	set_bgPixmap (str); /* change pixmap */
3931	scr_touch (true);	3877	scr_touch (true);
3932	#endif	3878	#endif
3933	}	3879	}
3934		3880
		3881	int changed = 0;
		3882
3935	while ((str = strchr (str, ';')) != NULL)	3883	while ((str = strchr (str, ';')) != NULL)
3936	{	3884	{
3937	str++;	3885	str++;
3938	#if XPM_BACKGROUND	3886	#if XPM_BACKGROUND
3939	changed += scale_pixmap (str);	3887	changed += scale_pixmap (str);
3940	#endif	3888	#endif
3941	}	3889	}
3942		3890
3943	if (changed)	3891	if (changed)
3944	{	3892	{
3945	#ifdef XPM_BACKGROUND	3893	#ifdef XPM_BACKGROUND
3946	resize_pixmap ();	3894	resize_pixmap ();
3947	scr_touch (true);	3895	scr_touch (true);
3948	#endif	3896	#endif
3949	}	3897	}
		3898	}
3950	break;	3899	break;
3951		3900
3952	case Rxvt_restoreFG:	3901	case Rxvt_restoreFG:
3953	set_window_color (Color_fg, str);	3902	set_window_color (Color_fg, str);
3954	break;	3903	break;
…		…
3958		3907
3959	case XTerm_logfile:	3908	case XTerm_logfile:
3960	// TODO, when secure mode?	3909	// TODO, when secure mode?
3961	break;	3910	break;
3962		3911
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	3912	#if 0
3970	case Rxvt_dumpscreen: /* no error notices */	3913	case Rxvt_dumpscreen: /* no error notices */
3971	{	3914	{
3972	int fd;	3915	int fd;
3973	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3916	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
…		…
3999	allocated.push_back ((void *)res);	3942	allocated.push_back ((void *)res);
4000	set_fonts ();	3943	set_fonts ();
4001	}	3944	}
4002	break;	3945	break;
4003		3946
4004	#if ENABLE_FRILLS	3947	case URxvt_version:
		3948	if (query)
		3949	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3950	op,
		3951	rs[Rs_name], VERSION[0], VERSION[2],
		3952	resp);
		3953	break;
		3954
		3955	#if !ENABLE_MINIMAL
4005	case URxvt_locale:	3956	case URxvt_locale:
4006	if (query)	3957	if (query)
4007	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3958	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4008	else	3959	else
4009	{	3960	{
4010	set_locale (str);	3961	set_locale (str);
4011	pty.set_utf8_mode (enc_utf8);	3962	pty->set_utf8_mode (enc_utf8);
4012	init_xlocale ();	3963	init_xlocale ();
4013	}	3964	}
4014	break;	3965	break;
4015		3966
4016	case URxvt_view_up:	3967	case URxvt_view_up:
…		…
4069	return state;	4020	return state;
4070	}	4021	}
4071		4022
4072	/* we're not using priv _yet_ */	4023	/* we're not using priv _yet_ */
4073	void	4024	void
4074	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4025	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4075	{	4026	{
4076	unsigned int i, j;	4027	unsigned int i, j;
4077	int state;	4028	int state;
4078		4029
4079	static const struct	4030	static const struct
…		…
4090	{ 5, PrivMode_rVideo },	4041	{ 5, PrivMode_rVideo },
4091	{ 6, PrivMode_relOrigin },	4042	{ 6, PrivMode_relOrigin },
4092	{ 7, PrivMode_Autowrap },	4043	{ 7, PrivMode_Autowrap },
4093	// 8, bi-directional support mode	4044	// 8, bi-directional support mode
4094	{ 9, PrivMode_MouseX10 },	4045	{ 9, PrivMode_MouseX10 },
4095	#ifdef menuBar_esc
4096	{ menuBar_esc, PrivMode_menuBar },
4097	#endif
4098	// 18, 19 printing-related	4046	// 18, 19 printing-related
4099	{ 25, PrivMode_VisibleCursor },	4047	{ 25, PrivMode_VisibleCursor },
4100	#ifdef scrollBar_esc	4048	#ifdef scrollBar_esc
4101	{ scrollBar_esc, PrivMode_scrollBar },	4049	{ scrollBar_esc, PrivMode_scrollBar },
4102	#endif	4050	#endif
…		…
4197	/* case 8: - auto repeat, can't do on a per window basis */	4145	/* case 8: - auto repeat, can't do on a per window basis */
4198	case 9: /* X10 mouse reporting */	4146	case 9: /* X10 mouse reporting */
4199	if (state) /* orthogonal */	4147	if (state) /* orthogonal */
4200	priv_modes &= ~PrivMode_MouseX11;	4148	priv_modes &= ~PrivMode_MouseX11;
4201	break;	4149	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	4150	#ifdef scrollBar_esc
4210	case scrollBar_esc:	4151	case scrollBar_esc:
4211	if (scrollbar_mapping (state))	4152	if (scrollbar_mapping (state))
4212	{	4153	{
4213	resize_all_windows (0, 0, 0);	4154	resize_all_windows (0, 0, 0);
…		…
4383	scr_color (Color_bg, Color_bg);	4324	scr_color (Color_bg, Color_bg);
4384	break;	4325	break;
4385		4326
4386	//case 50: // not variable spacing	4327	//case 50: // not variable spacing
4387		4328
4388	#if ENABLE_FRILLS	4329	#if !ENABLE_MINIMAL
4389	case 90:	4330	case 90:
4390	case 91: /* set bright fg color */	4331	case 91: /* set bright fg color */
4391	case 92:	4332	case 92:
4392	case 93:	4333	case 93:
4393	case 94:	4334	case 94:
…		…
4458	rxvt_term::tt_write (const char *data, unsigned int len)	4399	rxvt_term::tt_write (const char *data, unsigned int len)
4459	{	4400	{
4460	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4401	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4461	return;	4402	return;
4462		4403
4463	if (pty.pty < 0)	4404	if (pty->pty < 0)
4464	return;	4405	return;
4465		4406
4466	if (v_buflen == 0)	4407	if (v_buflen == 0)
4467	{	4408	{
4468	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4409	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4469		4410
4470	if ((unsigned int)written == len)	4411	if ((unsigned int)written == len)
4471	return;	4412	return;
4472		4413
4473	data += written;	4414	data += written;
…		…
4482	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4423	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4483	}	4424	}
4484		4425
4485	void rxvt_term::pty_write ()	4426	void rxvt_term::pty_write ()
4486	{	4427	{
4487	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4428	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4488		4429
4489	if (written > 0)	4430	if (written > 0)
4490	{	4431	{
4491	v_buflen -= written;	4432	v_buflen -= written;
4492		4433

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.304 by root, Tue Jan 31 22:01:25 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.304 by root, Tue Jan 31 22:01:25 2006 UTC