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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.252 by root, Mon Jan 9 22:41:41 2006 UTC vs.
Revision 1.285 by root, Wed Jan 25 21:03:04 2006 UTC

…		…
64		64
65	/----------------------------------------------------------------------/	65	/----------------------------------------------------------------------/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68		68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71
72	#if ENABLE_FRILLS \|\| ISO_14755	69	#if ENABLE_FRILLS \|\| ISO_14755
73		70
74	#define ISO_14755_STARTED 0x80000000UL	71	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	72	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)	73	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
…		…
147	\|\| !IN_RANGE_EXC (y, 0, nrow))	144	\|\| !IN_RANGE_EXC (y, 0, nrow))
148	return;	145	return;
149		146
150	for (;;)	147	for (;;)
151	{	148	{
152	const line_t &l = ROW(y - view_start);	149	const line_t &l = ROW(y + view_start);
153		150
154	text_t t = l.t[x];	151	text_t t = l.t[x];
155		152
156	if (t != NOCHAR \|\| !x)	153	if (t != NOCHAR \|\| !x)
157	{	154	{
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	299	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	300	{
304	int ctrl, meta, shft, len;	301	int ctrl, meta, shft, len;
305	unsigned int newlen;	302	unsigned int newlen;
306	KeySym keysym;	303	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	304	int valid_keysym;
311	char kbuf[KBUFSZ];	305	char kbuf[KBUFSZ];
312		306
313	/*	307	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	308	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
443	scr_move_to (0, 1);	437	scr_move_to (0, 1);
444	return;	438	return;
445	}	439	}
446	else if (keysym == XK_End)	440	else if (keysym == XK_End)
447	{	441	{
448	scr_move_to (1, 0);	442	scr_move_to (1, 1);
449	return;	443	return;
450	}	444	}
451	}	445	}
452	#endif	446	#endif
453	}	447	}
…		…
464	{	458	{
465	switch (keysym)	459	switch (keysym)
466	{	460	{
467	/* normal XTerm key bindings */	461	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	462	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	463	selection_request (ev.time);
470	return;	464	return;
471	#if TODO	465	#if TODO
472	/* rxvt extras */	466	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	467	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	468	change_font (FONT_UP);
…		…
905	{	899	{
906	const char ch = C0_ESC;	900	const char ch = C0_ESC;
907	tt_write (&ch, 1);	901	tt_write (&ch, 1);
908	}	902	}
909		903
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);	904	tt_write (kbuf, (unsigned int)len);
921	}	905	}
922	/}}} /	906	/}}} /
923		907
924	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	908	#if defined (KEYSYM_RESOURCE)
925	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
926	/* attempt to `write' count to the input buffer */
927	unsigned int	909	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	910	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	911	{
930	unsigned int n, s;	912	unsigned int n, s;
931		913
…		…
972		954
973	if (want_refresh)	955	if (want_refresh)
974	{	956	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	957	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	958	{
977	int row = -view_start;	959	int row = view_start;
978	int end_row = row + nrow;	960	int end_row = row + nrow;
979		961
980	while (row > -nsaved && ROW (row - 1).is_longer ())	962	while (row > top_row && ROW (row - 1).is_longer ())
981	--row;	963	--row;
982		964
983	do	965	do
984	{	966	{
985	int start_row = row;	967	int start_row = row;
…		…
987		969
988	do	970	do
989	{	971	{
990	l = &ROW (row++);	972	l = &ROW (row++);
991		973
992	if (l->f & LINE_FILTERED)	974	if (!(l->f & LINE_FILTERED))
993	row++;
994	else
995	{	975	{
996	// line not filtered, mark it as filtered	976	// line not filtered, mark it as filtered
997	l->f \|= LINE_FILTERED;	977	l->f \|= LINE_FILTERED;
998	while (l->is_longer ())	978	while (l->is_longer ())
999	{	979	{
1000	l = &ROW (++row);	980	l = &ROW (row++);
1001	l->f \|= LINE_FILTERED;	981	l->f \|= LINE_FILTERED;
1002	}	982	}
1003		983
1004	// and filter it	984	// and filter it
1005	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	985	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
…		…
1007	break;	987	break;
1008	}	988	}
1009	}	989	}
1010	while (l->is_longer () && row < end_row);	990	while (l->is_longer () && row < end_row);
1011	}	991	}
1012	while (++row < end_row);	992	while (row < end_row);
1013	}	993	}
1014		994
1015	scr_refresh (refresh_type);	995	scr_refresh ();
1016	scrollbar_show (1);	996	scrollbar_show (1);
1017	#ifdef USE_XIM	997	#ifdef USE_XIM
1018	IMSendSpot ();	998	IMSendSpot ();
1019	#endif	999	#endif
1020	}	1000	}
…		…
1023	}	1003	}
1024		1004
1025	void	1005	void
1026	rxvt_term::check_cb (check_watcher &w)	1006	rxvt_term::check_cb (check_watcher &w)
1027	{	1007	{
1028	SET_R (this);	1008	make_current ();
1029	SET_LOCALE (locale);
1030		1009
1031	display->flush ();	1010	display->flush ();
1032		1011
1033	if (want_refresh && !flush_ev.active)	1012	if (want_refresh && !flush_ev.active)
1034	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1013	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1035	}	1014	}
1036		1015
1037	void	1016	void
1038	rxvt_term::flush_cb (time_watcher &w)	1017	rxvt_term::flush_cb (time_watcher &w)
1039	{	1018	{
1040	SET_R (this);	1019	make_current ();
1041	SET_LOCALE (locale);
1042		1020
1043	refresh_limit = 1;	1021	refresh_limit = 1;
1044	refresh_count = 0;	1022	refresh_count = 0;
1045	flush ();	1023	flush ();
1046	}	1024	}
…		…
1050	rxvt_term::cursor_blink_cb (time_watcher &w)	1028	rxvt_term::cursor_blink_cb (time_watcher &w)
1051	{	1029	{
1052	hidden_cursor = !hidden_cursor;	1030	hidden_cursor = !hidden_cursor;
1053	want_refresh = 1;	1031	want_refresh = 1;
1054		1032
1055	w.start (w.at + BLINK_INTERVAL);	1033	w.start (w.at + CURSOR_BLINK_INTERVAL);
1056	}	1034	}
1057	#endif	1035	#endif
1058		1036
1059	#ifdef TEXT_BLINK	1037	#ifdef TEXT_BLINK
1060	void	1038	void
…		…
1074	rxvt_term::cont_scroll_cb (time_watcher &w)	1052	rxvt_term::cont_scroll_cb (time_watcher &w)
1075	{	1053	{
1076	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1054	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1077	scr_page (scrollbar_isUp() ? UP : DN, 1))	1055	scr_page (scrollbar_isUp() ? UP : DN, 1))
1078	{	1056	{
1079	refresh_type \|= SMOOTH_REFRESH;
1080	want_refresh = 1;	1057	want_refresh = 1;
1081	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1058	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1082	}	1059	}
1083	}	1060	}
1084	#endif	1061	#endif
…		…
1088	rxvt_term::sel_scroll_cb (time_watcher &w)	1065	rxvt_term::sel_scroll_cb (time_watcher &w)
1089	{	1066	{
1090	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1067	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1091	{	1068	{
1092	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1069	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1093	refresh_type \|= SMOOTH_REFRESH;
1094	want_refresh = 1;	1070	want_refresh = 1;
1095	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1071	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1096	}	1072	}
1097	}	1073	}
1098	#endif	1074	#endif
…		…
1103	{	1079	{
1104	if (mouse_slip_wheel_speed == 0	1080	if (mouse_slip_wheel_speed == 0
1105	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1081	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1106	: scr_page (UP, mouse_slip_wheel_speed))	1082	: scr_page (UP, mouse_slip_wheel_speed))
1107	{	1083	{
1108	if (view_start == nsaved \|\|	1084	if (view_start == top_row \|\| view_start == 0)
1109	view_start == 0)
1110	mouse_slip_wheel_speed = 0;	1085	mouse_slip_wheel_speed = 0;
1111		1086
1112	refresh_type \|= SMOOTH_REFRESH;
1113	want_refresh = 1;	1087	want_refresh = 1;
1114	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1088	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1115	}	1089	}
1116	}	1090	}
1117	#endif	1091	#endif
…		…
1147		1121
1148	memmove (cmdbuf_base, cmdbuf_ptr, n);	1122	memmove (cmdbuf_base, cmdbuf_ptr, n);
1149	cmdbuf_ptr = cmdbuf_base;	1123	cmdbuf_ptr = cmdbuf_base;
1150	cmdbuf_endp = cmdbuf_ptr + n;	1124	cmdbuf_endp = cmdbuf_ptr + n;
1151		1125
1152	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1126	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1153		1127
1154	if (r > 0)	1128	if (r > 0)
1155	{	1129	{
1156	cmdbuf_endp += r;	1130	cmdbuf_endp += r;
1157	return true;	1131	return true;
…		…
1175	}	1149	}
1176		1150
1177	void	1151	void
1178	rxvt_term::pty_cb (io_watcher &w, short revents)	1152	rxvt_term::pty_cb (io_watcher &w, short revents)
1179	{	1153	{
1180	SET_R (this);	1154	make_current ();
1181	SET_LOCALE (locale);
1182		1155
1183	if (revents & EVENT_READ)	1156	if (revents & EVENT_READ)
1184	// loop, but don't allow a single term to monopolize us	1157	// loop, but don't allow a single term to monopolize us
1185	while (pty_fill ())	1158	while (pty_fill ())
1186	if (cmd_parse ())	1159	if (cmd_parse ())
…		…
1218	}	1191	}
1219		1192
1220	void	1193	void
1221	rxvt_term::pointer_cb (time_watcher &w)	1194	rxvt_term::pointer_cb (time_watcher &w)
1222	{	1195	{
1223	SET_R (this);	1196	make_current ();
1224	SET_LOCALE (locale);
1225		1197
1226	pointer_blank ();	1198	pointer_blank ();
1227	}	1199	}
1228	#endif	1200	#endif
1229		1201
…		…
1294	(32 + button_number + key_state),	1266	(32 + button_number + key_state),
1295	(32 + x + 1),	1267	(32 + x + 1),
1296	(32 + y + 1));	1268	(32 + y + 1));
1297	}	1269	}
1298		1270
1299	#ifdef USING_W11LIB
1300	void
1301	rxvt_W11_process_x_event (XEvent *ev)
1302	{
1303	rxvt_t *r = rxvt_get_r ();
1304
1305	x_cb (*ev);
1306	}
1307	#endif
1308
1309	/{{{ process an X event /	1271	/{{{ process an X event /
1310	void	1272	void
1311	rxvt_term::x_cb (XEvent &ev)	1273	rxvt_term::x_cb (XEvent &ev)
1312	{	1274	{
1313	dDisp;	1275	make_current ();
1314		1276
1315	SET_R (this);	1277	dLocal (Display *, xdisp);
1316	SET_LOCALE (locale);
1317		1278
		1279	if (ev.xany.window == vt
		1280	&& SHOULD_INVOKE (HOOK_X_EVENT)
		1281	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
		1282	return;
		1283
		1284	// for XQueryPointer
1318	Window unused_root, unused_child;	1285	Window unused_root, unused_child;
1319	int unused_root_x, unused_root_y;	1286	int unused_root_x, unused_root_y;
1320	unsigned int unused_mask;	1287	unsigned int unused_mask;
1321		1288
1322	switch (ev.type)	1289	switch (ev.type)
…		…
1412	button_release (ev.xbutton);	1379	button_release (ev.xbutton);
1413	break;	1380	break;
1414		1381
1415	case ClientMessage:	1382	case ClientMessage:
1416	if (ev.xclient.format == 32	1383	if (ev.xclient.format == 32
1417	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1384	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1418	{	1385	{
		1386	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1387	{
		1388	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1389	{
1419	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1390	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1391	{
		1392	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1420	destroy ();	1393	destroy ();
		1394	}
1421	#if ENABLE_EWMH	1395	#if ENABLE_EWMH
1422	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1396	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1423	XSendEvent (disp, ev.xclient.window = display->root,	1397	XSendEvent (xdisp, ev.xclient.window = display->root,
1424	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1398	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1425	&ev);	1399	&ev);
		1400	#endif
		1401	}
		1402	}
		1403	#if ENABLE_XEMBED
		1404	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1405	{
		1406	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1407	focus_in ();
		1408	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1409	focus_out ();
		1410	}
1426	#endif	1411	#endif
1427	}	1412	}
1428	#if ENABLE_XEMBED
1429	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430	{
1431	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432	focus_in ();
1433	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434	focus_out ();
1435	}
1436	#endif
1437	#ifdef OFFIX_DND
1438	/* OffiX Dnd (drag 'n' drop) protocol */
1439	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1440	&& (ev.xclient.data.l[0] == DndFile
1441	\|\| ev.xclient.data.l[0] == DndDir
1442	\|\| ev.xclient.data.l[0] == DndLink))
1443	{
1444	/* Get Dnd data */
1445	Atom ActualType;
1446	int ActualFormat;
1447	unsigned char *data;
1448	unsigned long Size, RemainingBytes;
1449
1450	XGetWindowProperty (disp, display->root,
1451	xa[XA_DNDSELECTION],
1452	0L, 1000000L,
1453	False, AnyPropertyType,
1454	&ActualType, &ActualFormat,
1455	&Size, &RemainingBytes,
1456	&data);
1457	set_string_property (XA_CUT_BUFFER0, data);
1458	XFree (data);
1459	selection_paste (display->root, XA_CUT_BUFFER0, true);
1460	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1461	}
1462	#endif /* OFFIX_DND */
1463	break;	1413	break;
1464		1414
1465	case MappingNotify:	1415	case MappingNotify:
1466	XRefreshKeyboardMapping (&ev.xmapping);	1416	XRefreshKeyboardMapping (&ev.xmapping);
1467	break;	1417	break;
…		…
1500	break;	1450	break;
1501		1451
1502	case ConfigureNotify:	1452	case ConfigureNotify:
1503	if (ev.xconfigure.window == parent[0])	1453	if (ev.xconfigure.window == parent[0])
1504	{	1454	{
1505	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1455	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1506	;	1456	;
1507		1457
1508	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1458	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1509	{	1459	{
1510	seen_resize = 1;	1460	seen_resize = 1;
1511	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1461	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1512	}	1462	}
1513		1463
		1464	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1465
1514	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1466	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1515	if (OPTION (Opt_transparent))	1467	if (OPTION (Opt_transparent))
1516	check_our_parents ();	1468	check_our_parents ();
1517	#endif	1469	#endif
1518	}	1470	}
1519	break;	1471	break;
1520		1472
1521	case PropertyNotify:	1473	case PropertyNotify:
		1474	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1522	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1475	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1523	&& ev.xproperty.state == PropertyNewValue)	1476	&& ev.xproperty.state == PropertyNewValue)
1524	selection_property (ev.xproperty.window, ev.xproperty.atom);	1477	selection_property (ev.xproperty.window, ev.xproperty.atom);
1525		1478
1526	break;	1479	break;
1527		1480
1528	case SelectionClear:	1481	case SelectionClear:
1529	selection_clear ();	1482	selection_clear ();
…		…
1565	if (ev.xany.window == vt)	1518	if (ev.xany.window == vt)
1566	{	1519	{
1567	do	1520	do
1568	scr_expose (ev.xexpose.x, ev.xexpose.y,	1521	scr_expose (ev.xexpose.x, ev.xexpose.y,
1569	ev.xexpose.width, ev.xexpose.height, False);	1522	ev.xexpose.width, ev.xexpose.height, False);
1570	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1523	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1571		1524
1572	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1525	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1573		1526
1574	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1527	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1575	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1576	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1577		1530
1578	scr_refresh (refresh_type);	1531	want_refresh = 1;
1579	}	1532	}
1580	else	1533	else
1581	{	1534	{
1582	XEvent unused_event;	1535	XEvent unused_event;
1583		1536
1584	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1537	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1585	;	1538	;
1586	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1539	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1587	;	1540	;
1588		1541
1589	if (isScrollbarWindow (ev.xany.window))	1542	if (isScrollbarWindow (ev.xany.window))
1590	{	1543	{
1591	scrollBar.setIdle ();	1544	scrollBar.setIdle ();
1592	scrollbar_show (0);	1545	scrollbar_show (0);
1593	}	1546	}
1594	#ifdef MENUBAR
1595	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1596	menubar_expose ();
1597	#endif
1598		1547
1599	#ifdef TRANSPARENT	1548	#ifdef TRANSPARENT
1600	if (am_transparent && ev.xany.window == parent[0])	1549	if (am_transparent && ev.xany.window == parent[0])
1601	XClearWindow (disp, ev.xany.window);	1550	XClearWindow (xdisp, ev.xany.window);
1602	#endif	1551	#endif
1603	}	1552	}
1604	break;	1553	break;
1605		1554
1606	case MotionNotify:	1555	case MotionNotify:
1607	#ifdef POINTER_BLANK	1556	#ifdef POINTER_BLANK
1608	if (hidden_pointer)	1557	if (hidden_pointer)
1609	pointer_unblank ();	1558	pointer_unblank ();
1610	#endif	1559	#endif
1611	#if MENUBAR
1612	if (isMenuBarWindow (ev.xany.window))
1613	{
1614	menubar_control (ev.xbutton);
1615	break;
1616	}
1617	#endif
1618	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1560	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1619	break;	1561	break;
1620		1562
1621	if (ev.xany.window == vt)	1563	if (ev.xany.window == vt)
1622	{	1564	{
		1565	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1623	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1566	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624	; // nop	1567	; // nop
1625	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1568	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1626	{	1569	{
1627	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1570	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1628	;	1571	;
1629		1572
1630	XQueryPointer (disp, vt,	1573	XQueryPointer (xdisp, vt,
1631	&unused_root, &unused_child,	1574	&unused_root, &unused_child,
1632	&unused_root_x, &unused_root_y,	1575	&unused_root_x, &unused_root_y,
1633	&ev.xbutton.x, &ev.xbutton.y,	1576	&ev.xbutton.x, &ev.xbutton.y,
1634	&ev.xbutton.state);	1577	&ev.xbutton.state);
1635	#ifdef MOUSE_THRESHOLD	1578	#ifdef MOUSE_THRESHOLD
…		…
1699	#endif	1642	#endif
1700	}	1643	}
1701	}	1644	}
1702	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1645	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1703	{	1646	{
1704	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1647	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1705	MotionNotify, &ev))	1648	MotionNotify, &ev))
1706	;	1649	;
1707		1650
1708	XQueryPointer (disp, scrollBar.win,	1651	XQueryPointer (xdisp, scrollBar.win,
1709	&unused_root, &unused_child,	1652	&unused_root, &unused_child,
1710	&unused_root_x, &unused_root_y,	1653	&unused_root_x, &unused_root_y,
1711	&ev.xbutton.x, &ev.xbutton.y,	1654	&ev.xbutton.x, &ev.xbutton.y,
1712	&unused_mask);	1655	&unused_mask);
1713	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1656	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1714	scrollbar_size ());	1657	scrollbar_size ());
1715	scr_refresh (refresh_type);	1658	want_refresh = 1;
1716	refresh_limit = 0;	1659	refresh_limit = 0;
1717	scrollbar_show (1);	1660	scrollbar_show (1);
1718	}	1661	}
1719	break;	1662	break;
1720	}	1663	}
…		…
1728	{	1671	{
1729	hidden_cursor = 0;	1672	hidden_cursor = 0;
1730	want_refresh = 1;	1673	want_refresh = 1;
1731	}	1674	}
1732		1675
1733	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1676	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1734	}	1677	}
1735	#endif	1678	#endif
1736		1679
1737	#if defined(POINTER_BLANK)	1680	#if defined(POINTER_BLANK)
1738	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1681	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1766	XSetICFocus (Input_Context);	1709	XSetICFocus (Input_Context);
1767	}	1710	}
1768	#endif	1711	#endif
1769	#if CURSOR_BLINK	1712	#if CURSOR_BLINK
1770	if (OPTION (Opt_cursorBlink))	1713	if (OPTION (Opt_cursorBlink))
1771	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1714	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1772	#endif	1715	#endif
1773	#if OFF_FOCUS_FADING	1716	#if OFF_FOCUS_FADING
1774	if (rs[Rs_fade])	1717	if (rs[Rs_fade])
1775	{	1718	{
1776	pix_colors = pix_colors_focused;	1719	pix_colors = pix_colors_focused;
…		…
1820		1763
1821	#if TRANSPARENT	1764	#if TRANSPARENT
1822	void	1765	void
1823	rxvt_term::rootwin_cb (XEvent &ev)	1766	rxvt_term::rootwin_cb (XEvent &ev)
1824	{	1767	{
1825	SET_R (this);	1768	make_current ();
1826	SET_LOCALE (locale);
1827		1769
1828	switch (ev.type)	1770	switch (ev.type)
1829	{	1771	{
1830	case PropertyNotify:	1772	case PropertyNotify:
1831	/*	1773	/*
…		…
1858	/*	1800	/*
1859	* VT window processing of button press	1801	* VT window processing of button press
1860	*/	1802	*/
1861	if (ev.window == vt)	1803	if (ev.window == vt)
1862	{	1804	{
		1805	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1806	return;
		1807
1863	#if ISO_14755	1808	#if ISO_14755
1864	// 5.4	1809	// 5.4
1865	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1810	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1866	{	1811	{
1867	iso14755_54 (ev.x, ev.y);	1812	iso14755_54 (ev.x, ev.y);
…		…
1909	else	1854	else
1910	{	1855	{
1911	if (ev.button != MEvent.button)	1856	if (ev.button != MEvent.button)
1912	MEvent.clicks = 0;	1857	MEvent.clicks = 0;
1913		1858
1914	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1915	switch (ev.button)	1859	switch (ev.button)
1916	{	1860	{
1917	case Button1:	1861	case Button1:
1918	/* allow meta + click to select rectangular areas */	1862	/* allow meta + click to select rectangular areas */
1919	/* should be done in screen.C */	1863	/* should be done in screen.C */
1920	#if ENABLE_FRILLS	1864	#if ENABLE_FRILLS
1921	selection.rect = !!(ev.state & ModMetaMask);	1865	selection.rect = !!(ev.state & ModMetaMask);
1922	#else	1866	#else
1923	selection.rect = false;	1867	selection.rect = false;
1924	#endif	1868	#endif
1925		1869
1926	/* allow shift+left click to extend selection */	1870	/* allow shift+left click to extend selection */
1927	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1871	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1928	{	1872	{
1929	if (MEvent.button == Button1 && clickintime)	1873	if (MEvent.button == Button1 && clickintime)
1930	selection_rotate (ev.x, ev.y);	1874	selection_rotate (ev.x, ev.y);
1931	else	1875	else
1932	selection_extend (ev.x, ev.y, 1);	1876	selection_extend (ev.x, ev.y, 1);
1933	}	1877	}
1934	else	1878	else
1935	{	1879	{
1936	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1937	MEvent.clicks++;	1881	MEvent.clicks++;
1938	else	1882	else
1939	MEvent.clicks = 1;	1883	MEvent.clicks = 1;
1940		1884
1941	selection_click (MEvent.clicks, ev.x, ev.y);	1885	selection_click (MEvent.clicks, ev.x, ev.y);
1942	}	1886	}
1943		1887
1944	MEvent.button = Button1;	1888	MEvent.button = Button1;
1945	break;	1889	break;
1946		1890
1947	case Button3:	1891	case Button3:
1948	if (MEvent.button == Button3 && clickintime)	1892	if (MEvent.button == Button3 && clickintime)
1949	selection_rotate (ev.x, ev.y);	1893	selection_rotate (ev.x, ev.y);
1950	else	1894	else
1951	selection_extend (ev.x, ev.y, 1);	1895	selection_extend (ev.x, ev.y, 1);
1952		1896
1953	MEvent.button = Button3;	1897	MEvent.button = Button3;
1954	break;	1898	break;
1955	}	1899	}
1956	}	1900	}
1957		1901
1958	MEvent.time = ev.time;	1902	MEvent.time = ev.time;
1959	return;	1903	return;
1960	}	1904	}
1961		1905
…		…
2100	}	2044	}
2101	}	2045	}
2102		2046
2103	return;	2047	return;
2104	}	2048	}
2105
2106	#if MENUBAR
2107	/*
2108	* Menubar window processing of button press
2109	*/
2110	if (isMenuBarWindow (ev.window))
2111	menubar_control (ev);
2112	#endif
2113	}	2049	}
2114		2050
2115	void	2051	void
2116	rxvt_term::button_release (XButtonEvent &ev)	2052	rxvt_term::button_release (XButtonEvent &ev)
2117	{	2053	{
…		…
2123		2059
2124	if (scrollbar_isUpDn ())	2060	if (scrollbar_isUpDn ())
2125	{	2061	{
2126	scrollBar.setIdle ();	2062	scrollBar.setIdle ();
2127	scrollbar_show (0);	2063	scrollbar_show (0);
2128	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2129	refresh_type &= ~SMOOTH_REFRESH;
2130	#endif
2131	}	2064	}
2132		2065
2133	#ifdef SELECTION_SCROLLING	2066	#ifdef SELECTION_SCROLLING
2134	if (sel_scroll_ev.active)	2067	if (sel_scroll_ev.active)
2135	sel_scroll_ev.stop();	2068	sel_scroll_ev.stop();
2136	#endif	2069	#endif
2137		2070
2138	if (ev.window == vt)	2071	if (ev.window == vt)
2139	{	2072	{
		2073	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2074	return;
		2075
2140	#if ISO_14755	2076	#if ISO_14755
2141	// 5.4	2077	// 5.4
2142	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2078	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2143	return;	2079	return;
2144	#endif	2080	#endif
		2081
2145	if (reportmode)	2082	if (reportmode)
2146	{	2083	{
2147	/* mouse report from vt window */	2084	/* mouse report from vt window */
2148	/* don't report release of wheel "buttons" */	2085	/* don't report release of wheel "buttons" */
2149	if (ev.button >= 4)	2086	if (ev.button >= 4)
…		…
2173	if (priv_modes & PrivMode_mouse_report	2110	if (priv_modes & PrivMode_mouse_report
2174	&& bypass_keystate	2111	&& bypass_keystate
2175	&& ev.button == Button1 && MEvent.clicks <= 1)	2112	&& ev.button == Button1 && MEvent.clicks <= 1)
2176	selection_extend (ev.x, ev.y, 0);	2113	selection_extend (ev.x, ev.y, 0);
2177		2114
2178	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2179	return;
2180
2181	switch (ev.button)	2115	switch (ev.button)
2182	{	2116	{
2183	case Button1:	2117	case Button1:
2184	case Button3:	2118	case Button3:
2185	selection_make (ev.time);	2119	selection_make (ev.time);
2186	break;	2120	break;
		2121
2187	case Button2:	2122	case Button2:
2188	selection_request (ev.time, ev.x, ev.y);	2123	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2124	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2189	break;	2125	break;
		2126
2190	#ifdef MOUSE_WHEEL	2127	#ifdef MOUSE_WHEEL
2191	case Button4:	2128	case Button4:
2192	case Button5:	2129	case Button5:
2193	{	2130	{
2194	int i;	2131	int i;
…		…
2216	slip_wheel_ev.start ();	2153	slip_wheel_ev.start ();
2217	}	2154	}
2218	else	2155	else
2219	{	2156	{
2220	# endif	2157	# endif
2221	# ifdef JUMP_MOUSE_WHEEL
2222	scr_page (v, i);	2158	scr_page (v, i);
2223	scr_refresh (SMOOTH_REFRESH);
2224	scrollbar_show (1);	2159	scrollbar_show (1);
2225	# else
2226	while (i--)
2227	{
2228	scr_page (v, 1);
2229	scr_refresh (SMOOTH_REFRESH);
2230	scrollbar_show (1);
2231	}
2232	# endif
2233	# ifdef MOUSE_SLIP_WHEELING	2160	# ifdef MOUSE_SLIP_WHEELING
2234	}	2161	}
2235	#endif	2162	# endif
2236	}	2163	}
2237	break;	2164	break;
2238	#endif	2165	#endif
2239	}	2166	}
2240	}	2167	}
2241	#ifdef MENUBAR
2242	else if (isMenuBarWindow (ev.window))
2243	menubar_control (ev);
2244	#endif
2245	}	2168	}
2246		2169
2247	#ifdef TRANSPARENT	2170	#ifdef TRANSPARENT
2248	#if TINTING	2171	#if TINTING
2249	/* taken from aterm-0.4.2 */	2172	/* taken from aterm-0.4.2 */
2250		2173
2251	typedef uint32_t RUINT32T;	2174	typedef uint32_t RUINT32T;
2252		2175
2253	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2176	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2254	{	2177	{
2255	int sh_r, sh_g, sh_b;	2178	int sh_r, sh_g, sh_b;
2256	RUINT32T mask_r, mask_g, mask_b;	2179	RUINT32T mask_r, mask_g, mask_b;
2257	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2180	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2258	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2181	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2259	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2182	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2260	int i;	2183	int i;
2261		2184
2262	Visual *visual = display->visual;	2185	Visual *visual = term->visual;
2263		2186
2264	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2187	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2265		2188
2266	/* for convenience */	2189	/* for convenience */
2267	mask_r = visual->red_mask;	2190	mask_r = visual->red_mask;
…		…
2488	Atom atype;	2411	Atom atype;
2489	unsigned char *prop = NULL;	2412	unsigned char *prop = NULL;
2490	Window root, oldp, *list;	2413	Window root, oldp, *list;
2491	Pixmap rootpixmap = None;	2414	Pixmap rootpixmap = None;
2492	XWindowAttributes wattr, wrootattr;	2415	XWindowAttributes wattr, wrootattr;
2493	dDisp;
2494		2416
2495	pchanged = 0;	2417	pchanged = 0;
2496		2418
2497	if (!OPTION (Opt_transparent))	2419	if (!OPTION (Opt_transparent))
2498	return pchanged; /* Don't try any more */	2420	return pchanged; /* Don't try any more */
2499		2421
2500	XGetWindowAttributes (disp, display->root, &wrootattr);	2422	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2501	rootdepth = wrootattr.depth;	2423	rootdepth = wrootattr.depth;
2502		2424
2503	XGetWindowAttributes (disp, parent[0], &wattr);	2425	XGetWindowAttributes (xdisp, parent[0], &wattr);
2504		2426
2505	if (rootdepth != wattr.depth)	2427	if (rootdepth != wattr.depth)
2506	{	2428	{
2507	if (am_transparent)	2429	if (am_transparent)
2508	{	2430	{
2509	pchanged = 1;	2431	pchanged = 1;
2510	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2432	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2511	am_transparent = am_pixmap_trans = 0;	2433	am_transparent = am_pixmap_trans = 0;
2512	}	2434	}
2513		2435
2514	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2515	}	2437	}
2516		2438
2517	/* Get all X ops out of the queue so that our information is up-to-date. */	2439	/* Get all X ops out of the queue so that our information is up-to-date. */
2518	XSync (disp, False);	2440	XSync (xdisp, False);
2519		2441
2520	/*	2442	/*
2521	* Make the frame window set by the window manager have	2443	* Make the frame window set by the window manager have
2522	* the root background. Some window managers put multiple nested frame	2444	* the root background. Some window managers put multiple nested frame
2523	* windows for each client, so we have to take care about that.	2445	* windows for each client, so we have to take care about that.
2524	*/	2446	*/
2525	i = (xa[XA_XROOTPMAP_ID]	2447	i = (xa[XA_XROOTPMAP_ID]
2526	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2448	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2527	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2449	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2528	&nitems, &bytes_after, &prop) == Success);	2450	&nitems, &bytes_after, &prop) == Success);
2529		2451
2530	if (!i \|\| prop == NULL)	2452	if (!i \|\| prop == NULL)
2531	i = (xa[XA_ESETROOT_PMAP_ID]	2453	i = (xa[XA_ESETROOT_PMAP_ID]
2532	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2454	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2533	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2455	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2534	&nitems, &bytes_after, &prop) == Success);	2456	&nitems, &bytes_after, &prop) == Success);
2535		2457
2536	if (!i \|\| prop == NULL	2458	if (!i \|\| prop == NULL
2537	#if TINTING	2459	#if TINTING
…		…
2556	Window cr;	2478	Window cr;
2557	XImage *image;	2479	XImage *image;
2558	GC gc;	2480	GC gc;
2559	XGCValues gcvalue;	2481	XGCValues gcvalue;
2560		2482
2561	XTranslateCoordinates (disp, parent[0], display->root,	2483	XTranslateCoordinates (xdisp, parent[0], display->root,
2562	0, 0, &sx, &sy, &cr);	2484	0, 0, &sx, &sy, &cr);
2563	nw = (unsigned int)szHint.width;	2485	nw = (unsigned int)szHint.width;
2564	nh = (unsigned int)szHint.height;	2486	nh = (unsigned int)szHint.height;
2565	nx = ny = 0;	2487	nx = ny = 0;
2566		2488
…		…
2579	}	2501	}
2580		2502
2581	min_it (nw, (unsigned int) (wrootattr.width - sx));	2503	min_it (nw, (unsigned int) (wrootattr.width - sx));
2582	min_it (nh, (unsigned int) (wrootattr.height - sy));	2504	min_it (nh, (unsigned int) (wrootattr.height - sy));
2583		2505
2584	XSync (disp, False);	2506	XSync (xdisp, False);
2585	allowedxerror = -1;	2507	allowedxerror = -1;
2586	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2508	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2587		2509
2588	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2510	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2589	/* XXX: may need a delay here? */	2511	/* XXX: may need a delay here? */
2590	allowedxerror = 0;	2512	allowedxerror = 0;
2591		2513
…		…
2594	if (am_transparent && am_pixmap_trans)	2516	if (am_transparent && am_pixmap_trans)
2595	{	2517	{
2596	pchanged = 1;	2518	pchanged = 1;
2597	if (pixmap != None)	2519	if (pixmap != None)
2598	{	2520	{
2599	XFreePixmap (disp, pixmap);	2521	XFreePixmap (xdisp, pixmap);
2600	pixmap = None;	2522	pixmap = None;
2601	}	2523	}
2602	}	2524	}
2603		2525
2604	am_pixmap_trans = 0;	2526	am_pixmap_trans = 0;
2605	}	2527	}
2606	else	2528	else
2607	{	2529	{
2608	if (pixmap != None)	2530	if (pixmap != None)
2609	XFreePixmap (disp, pixmap);	2531	XFreePixmap (xdisp, pixmap);
2610		2532
2611	#if TINTING	2533	#if TINTING
2612	if (ISSET_PIXCOLOR (Color_tint))	2534	if (ISSET_PIXCOLOR (Color_tint))
2613	{	2535	{
2614	unsigned short rm, gm, bm;	2536	unsigned short rm, gm, bm;
2615	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2537	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2616		2538
2617	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2539	pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2618		2540
2619	ShadeXImage (display, image, shade, rm, gm, bm);	2541	ShadeXImage (this, image, shade, rm, gm, bm);
2620	}	2542	}
2621	#endif	2543	#endif
2622		2544
2623	pixmap = XCreatePixmap (disp, vt,	2545	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2624	szHint.width, szHint.height, image->depth);
2625	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2546	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2626	XPutImage (disp, pixmap, gc, image, 0, 0,	2547	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2627	nx, ny, image->width, image->height);	2548	nx, ny, image->width, image->height);
2628	XFreeGC (disp, gc);	2549	XFreeGC (xdisp, gc);
2629	XDestroyImage (image);	2550	XDestroyImage (image);
2630	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2551	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2631	XClearWindow (disp, parent[0]);	2552	XClearWindow (xdisp, parent[0]);
2632		2553
2633	if (!am_transparent \|\| !am_pixmap_trans)	2554	if (!am_transparent \|\| !am_pixmap_trans)
2634	pchanged = 1;	2555	pchanged = 1;
2635		2556
2636	am_transparent = am_pixmap_trans = 1;	2557	am_transparent = am_pixmap_trans = 1;
2637	}	2558	}
2638	}	2559	}
2639		2560
2640	if (am_pixmap_trans)	2561	if (am_pixmap_trans)
2641	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2562	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2642	else	2563	else
2643	{	2564	{
2644	unsigned int n;	2565	unsigned int n;
2645	/*	2566	/*
2646	* InheritPixmap transparency	2567	* InheritPixmap transparency
2647	*/	2568	*/
2648	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2569	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2649	{	2570	{
2650	oldp = parent[i];	2571	oldp = parent[i];
2651	XQueryTree (disp, parent[i - 1], &root,	2572	XQueryTree (xdisp, parent[i - 1], &root,
2652	&parent[i], &list, &n);	2573	&parent[i], &list, &n);
2653	XFree (list);	2574	XFree (list);
2654		2575
2655	if (parent[i] == display->root)	2576	if (parent[i] == display->root)
2656	{	2577	{
…		…
2668		2589
2669	if (pchanged)	2590	if (pchanged)
2670	{	2591	{
2671	for (; n < (unsigned int)i; n++)	2592	for (; n < (unsigned int)i; n++)
2672	{	2593	{
2673	XGetWindowAttributes (disp, parent[n], &wattr);	2594	XGetWindowAttributes (xdisp, parent[n], &wattr);
2674	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2595	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2675	{	2596	{
2676	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2597	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2677	break;	2598	break;
2678	}	2599	}
2679	}	2600	}
2680	}	2601	}
2681		2602
2682	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2603	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2683	{	2604	{
2684	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2605	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2685	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2606	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2686	am_transparent = 0;	2607	am_transparent = 0;
2687	/* XXX: also turn off Opt_transparent? */	2608	/* XXX: also turn off Opt_transparent? */
2688	}	2609	}
2689	else	2610	else
2690	{	2611	{
2691	#if WAIT_FOR_WM
2692	/* wait (an arbitrary period) for the WM to do its thing
2693	* needed for fvwm2.2.2 (and before?) */
2694	sleep (1);
2695	#endif
2696	for (n = 0; n < (unsigned int)i; n++)	2612	for (n = 0; n < (unsigned int)i; n++)
2697	{	2613	{
2698	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2614	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2699	XClearWindow (disp, parent[n]);	2615	XClearWindow (xdisp, parent[n]);
2700	}	2616	}
2701		2617
2702	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2618	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2703	am_transparent = 1;	2619	am_transparent = 1;
2704	}	2620	}
2705		2621
2706	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2622	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2707	parent[i] = None;	2623	parent[i] = None;
2708	}	2624	}
2709		2625
2710	if (scrollBar.win)	2626	if (scrollBar.win)
2711	{	2627	{
2712	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2628	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2713	scrollBar.setIdle ();	2629	scrollBar.setIdle ();
2714	scrollbar_show (0);	2630	scrollbar_show (0);
2715	}	2631	}
2716		2632
2717	if (am_transparent)	2633	if (am_transparent)
…		…
2792	}	2708	}
2793		2709
2794	// scr_add_lines only works for nlines <= nrow - 1.	2710	// scr_add_lines only works for nlines <= nrow - 1.
2795	if (nlines >= nrow - 1)	2711	if (nlines >= nrow - 1)
2796	{	2712	{
		2713	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2797	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2714	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2798	scr_add_lines (buf, str - buf, nlines);	2715	scr_add_lines (buf, str - buf, nlines);
2799		2716
2800	nlines = 0;	2717	nlines = 0;
2801	str = buf;	2718	str = buf;
2802	eol = str + min (ncol, UBUFSIZ);	2719	eol = str + min (ncol, UBUFSIZ);
…		…
2817		2734
2818	seq_begin = cmdbuf_ptr;	2735	seq_begin = cmdbuf_ptr;
2819	ch = next_char ();	2736	ch = next_char ();
2820	}	2737	}
2821		2738
		2739	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2822	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2740	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2823	scr_add_lines (buf, str - buf, nlines);	2741	scr_add_lines (buf, str - buf, nlines);
2824		2742
2825	/*	2743	/*
2826	* If there have been a lot of new lines, then update the screen	2744	* If there have been a lot of new lines, then update the screen
2827	* What the heck I'll cheat and only refresh less than every page-full.	2745	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2833	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2751	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2834	refresh_limit++;	2752	refresh_limit++;
2835	else	2753	else
2836	{	2754	{
2837	flag = true;	2755	flag = true;
2838	scr_refresh (refresh_type);	2756	scr_refresh ();
2839	flush_ev.stop ();	2757	want_refresh = 1;
2840	}	2758	}
2841	}	2759	}
2842		2760
2843	}	2761	}
2844	else	2762	else
…		…
2861	return flag;	2779	return flag;
2862	}	2780	}
2863		2781
2864	// read the next character	2782	// read the next character
2865	wchar_t	2783	wchar_t
2866	rxvt_term::next_char ()	2784	rxvt_term::next_char () NOTHROW
2867	{	2785	{
2868	while (cmdbuf_ptr < cmdbuf_endp)	2786	while (cmdbuf_ptr < cmdbuf_endp)
2869	{	2787	{
2870	// assume 7-bit to be ascii ALWAYS	2788	// assume 7-bit to be ascii ALWAYS
2871	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2789	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2892	return NOCHAR;	2810	return NOCHAR;
2893	}	2811	}
2894		2812
2895	// read the next octet	2813	// read the next octet
2896	uint32_t	2814	uint32_t
2897	rxvt_term::next_octet ()	2815	rxvt_term::next_octet () NOTHROW
2898	{	2816	{
2899	return cmdbuf_ptr < cmdbuf_endp	2817	return cmdbuf_ptr < cmdbuf_endp
2900	? (unsigned char)*cmdbuf_ptr++	2818	? (unsigned char)*cmdbuf_ptr++
2901	: NOCHAR;	2819	: NOCHAR;
2902	}	2820	}
		2821
		2822	static class out_of_input out_of_input;
2903		2823
2904	/* rxvt_cmd_getc () - Return next input character */	2824	/* rxvt_cmd_getc () - Return next input character */
2905	/*	2825	/*
2906	* Return the next input character after first passing any keyboard input	2826	* Return the next input character after first passing any keyboard input
2907	* to the command.	2827	* to the command.
2908	*/	2828	*/
2909	wchar_t	2829	wchar_t
2910	rxvt_term::cmd_getc ()	2830	rxvt_term::cmd_getc () THROW ((class out_of_input))
2911	{	2831	{
2912	wchar_t c = next_char ();	2832	wchar_t c = next_char ();
2913		2833
2914	if (c == NOCHAR)	2834	if (c == NOCHAR)
2915	throw out_of_input;	2835	throw out_of_input;
2916		2836
2917	return c;	2837	return c;
2918	}	2838	}
2919		2839
2920	uint32_t	2840	uint32_t
2921	rxvt_term::cmd_get8 ()	2841	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2922	{	2842	{
2923	uint32_t c = next_octet ();	2843	uint32_t c = next_octet ();
2924		2844
2925	if (c == NOCHAR)	2845	if (c == NOCHAR)
2926	throw out_of_input;	2846	throw out_of_input;
…		…
3347	ndef = get_byte_array_bit (csi_defaults, i);	3267	ndef = get_byte_array_bit (csi_defaults, i);
3348	for (p = 0; p < nargs; p++)	3268	for (p = 0; p < nargs; p++)
3349	if (arg[p] == -1)	3269	if (arg[p] == -1)
3350	arg[p] = ndef;	3270	arg[p] = ndef;
3351		3271
3352	#ifdef DEBUG_CMD
3353	fprintf (stderr, "CSI ");
3354	for (p = 0; p < nargs; p++)
3355	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3356	fprintf (stderr, "%c\n", ch);
3357	#endif
3358
3359	/*	3272	/*
3360	* private mode handling	3273	* private mode handling
3361	*/	3274	*/
3362	if (priv)	3275	if (priv)
3363	{	3276	{
3364	switch (priv)	3277	switch (priv)
3365	{	3278	{
3366	case '>':	3279	case '>':
3367	if (ch == CSI_DA) /* secondary device attributes */	3280	if (ch == CSI_DA) /* secondary device attributes */
		3281	{
		3282	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3283	// 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.
		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	//
3368	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3289	tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);
		3290	}
3369	break;	3291	break;
3370	case '?':	3292	case '?':
3371	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3293	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3372	process_terminal_mode (ch, priv, nargs, arg);	3294	process_terminal_mode (ch, priv, nargs, arg);
3373	break;	3295	break;
…		…
3601	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3523	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3602	{	3524	{
3603	int x, y;	3525	int x, y;
3604	XWindowAttributes wattr;	3526	XWindowAttributes wattr;
3605	Window wdummy;	3527	Window wdummy;
3606	dDisp;	3528
		3529	dLocal (Display *, xdisp);
3607		3530
3608	if (nargs == 0)	3531	if (nargs == 0)
3609	return;	3532	return;
3610		3533
3611	switch (args[0])	3534	switch (args[0])
3612	{	3535	{
3613	/*	3536	/*
3614	* commands	3537	* commands
3615	*/	3538	*/
3616	case 1: /* deiconify window */	3539	case 1: /* deiconify window */
3617	XMapWindow (disp, parent[0]);	3540	XMapWindow (xdisp, parent[0]);
3618	break;	3541	break;
3619	case 2: /* iconify window */	3542	case 2: /* iconify window */
3620	XIconifyWindow (disp, parent[0], display->screen);	3543	XIconifyWindow (xdisp, parent[0], display->screen);
3621	break;	3544	break;
3622	case 3: /* set position (pixels) */	3545	case 3: /* set position (pixels) */
3623	XMoveWindow (disp, parent[0], args[1], args[2]);	3546	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3624	break;	3547	break;
3625	case 4: /* set size (pixels) */	3548	case 4: /* set size (pixels) */
3626	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3549	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3627	break;	3550	break;
3628	case 5: /* raise window */	3551	case 5: /* raise window */
3629	XRaiseWindow (disp, parent[0]);	3552	XRaiseWindow (xdisp, parent[0]);
3630	break;	3553	break;
3631	case 6: /* lower window */	3554	case 6: /* lower window */
3632	XLowerWindow (disp, parent[0]);	3555	XLowerWindow (xdisp, parent[0]);
3633	break;	3556	break;
3634	case 7: /* refresh window */	3557	case 7: /* refresh window */
3635	scr_touch (true);	3558	scr_touch (true);
3636	break;	3559	break;
3637	case 8: /* set size (chars) */	3560	case 8: /* set size (chars) */
…		…
3649		3572
3650	/*	3573	/*
3651	* reports - some output format copied from XTerm	3574	* reports - some output format copied from XTerm
3652	*/	3575	*/
3653	case 11: /* report window state */	3576	case 11: /* report window state */
3654	XGetWindowAttributes (disp, parent[0], &wattr);	3577	XGetWindowAttributes (xdisp, parent[0], &wattr);
3655	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3578	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3656	break;	3579	break;
3657	case 13: /* report window position */	3580	case 13: /* report window position */
3658	XGetWindowAttributes (disp, parent[0], &wattr);	3581	XGetWindowAttributes (xdisp, parent[0], &wattr);
3659	XTranslateCoordinates (disp, parent[0], wattr.root,	3582	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3660	-wattr.border_width, -wattr.border_width,	3583	-wattr.border_width, -wattr.border_width,
3661	&x, &y, &wdummy);	3584	&x, &y, &wdummy);
3662	tt_printf ("\033[3;%d;%dt", x, y);	3585	tt_printf ("\033[3;%d;%dt", x, y);
3663	break;	3586	break;
3664	case 14: /* report window size (pixels) */	3587	case 14: /* report window size (pixels) */
3665	XGetWindowAttributes (disp, parent[0], &wattr);	3588	XGetWindowAttributes (xdisp, parent[0], &wattr);
3666	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3589	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3667	break;	3590	break;
3668	case 18: /* report text area size (chars) */	3591	case 18: /* report text area size (chars) */
3669	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3592	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3670	break;	3593	break;
…		…
3672	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3595	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3673	break;	3596	break;
3674	case 20: /* report icon label */	3597	case 20: /* report icon label */
3675	{	3598	{
3676	char *s;	3599	char *s;
3677	XGetIconName (disp, parent[0], &s);	3600	XGetIconName (xdisp, parent[0], &s);
3678	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3601	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3679	XFree (s);	3602	XFree (s);
3680	}	3603	}
3681	break;	3604	break;
3682	case 21: /* report window title */	3605	case 21: /* report window title */
3683	{	3606	{
3684	char *s;	3607	char *s;
3685	XFetchName (disp, parent[0], &s);	3608	XFetchName (xdisp, parent[0], &s);
3686	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3609	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3687	XFree (s);	3610	XFree (s);
3688	}	3611	}
3689	break;	3612	break;
3690	}	3613	}
…		…
3792	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3715	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3793	{	3716	{
3794	if (str[0] == '?' && !str[1])	3717	if (str[0] == '?' && !str[1])
3795	{	3718	{
3796	unsigned short r, g, b;	3719	unsigned short r, g, b;
3797	pix_colors_focused[color].get (display, r, g, b);	3720	pix_colors_focused[color].get (this, r, g, b);
3798	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3721	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3799	}	3722	}
3800	else	3723	else
3801	set_window_color (color, str);	3724	set_window_color (color, str);
3802	}	3725	}
…		…
3805	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3728	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3806	*/	3729	*/
3807	void	3730	void
3808	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3731	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3809	{	3732	{
3810	int changed = 0;
3811	int color;	3733	int color;
3812	char buf, name;	3734	char buf, name;
3813	bool query = str[0] == '?' && !str[1];	3735	bool query = str[0] == '?' && !str[1];
3814	int saveop = op;	3736	int saveop = op;
3815	dDisp;	3737
		3738	dLocal (Display *, xdisp);
3816		3739
3817	assert (str != NULL);	3740	assert (str != NULL);
3818	switch (op)	3741	switch (op)
3819	{	3742	{
3820	case XTerm_name:	3743	case XTerm_name:
…		…
3836	unsigned long bytes_after;	3759	unsigned long bytes_after;
3837	unsigned char *value = 0;	3760	unsigned char *value = 0;
3838	const char *str = "";	3761	const char *str = "";
3839		3762
3840	if (prop	3763	if (prop
3841	&& XGetWindowProperty (disp, parent[0],	3764	&& XGetWindowProperty (xdisp, parent[0],
3842	prop, 0, 1<<16, 0, AnyPropertyType,	3765	prop, 0, 1<<16, 0, AnyPropertyType,
3843	&actual_type, &actual_format,	3766	&actual_type, &actual_format,
3844	&nitems, &bytes_after, &value) == Success	3767	&nitems, &bytes_after, &value) == Success
3845	&& actual_type != None	3768	&& actual_type != None
3846	&& actual_format == 8)	3769	&& actual_format == 8)
…		…
3858	{	3781	{
3859	*eq = 0;	3782	*eq = 0;
3860	set_utf8_property (display->atom (str), eq + 1);	3783	set_utf8_property (display->atom (str), eq + 1);
3861	}	3784	}
3862	else	3785	else
3863	XDeleteProperty (disp, parent[0],	3786	XDeleteProperty (xdisp, parent[0],
3864	display->atom (str));	3787	display->atom (str));
3865	}	3788	}
3866	break;	3789	break;
3867		3790
3868	case XTerm_Color:	3791	case XTerm_Color:
…		…
3870	{	3793	{
3871	if ((name = strchr (buf, ';')) == NULL)	3794	if ((name = strchr (buf, ';')) == NULL)
3872	break;	3795	break;
3873		3796
3874	*name++ = '\0';	3797	*name++ = '\0';
3875	color = atoi (buf);	3798	color = atoi (buf) + minCOLOR;
3876		3799
3877	if (color < 0 \|\| color >= TOTAL_COLORS)	3800	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3878	break;	3801	break;
3879		3802
3880	if ((buf = strchr (name, ';')) != NULL)	3803	if ((buf = strchr (name, ';')) != NULL)
3881	*buf++ = '\0';	3804	*buf++ = '\0';
3882		3805
3883	if (name[0] == '?' && !name[1])	3806	if (name[0] == '?' && !name[1])
3884	{	3807	{
3885	unsigned short r, g, b;	3808	unsigned short r, g, b;
3886	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3809	pix_colors_focused[color].get (this, r, g, b);
3887	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3810	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3888	}	3811	}
3889	else	3812	else
3890	set_window_color (color + minCOLOR, name);	3813	set_window_color (color, name);
3891	}	3814	}
3892	break;	3815	break;
3893	case XTerm_Color00:	3816	case XTerm_Color00:
3894	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3817	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3895	break;	3818	break;
3896	case XTerm_Color01:	3819	case XTerm_Color01:
3897	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3820	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3898	break;	3821	break;
3899	#ifndef NO_CURSORCOLOR	3822	#ifndef NO_CURSORCOLOR
3900	case XTerm_Color_cursor:	3823	case XTerm_Color_cursor:
3901	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3824	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3902	break;	3825	break;
…		…
3906	break;	3829	break;
3907	case XTerm_Color_pointer_bg:	3830	case XTerm_Color_pointer_bg:
3908	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3831	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3909	break;	3832	break;
3910	#ifndef NO_BOLD_UNDERLINE_REVERSE	3833	#ifndef NO_BOLD_UNDERLINE_REVERSE
3911	case XTerm_Color_BD:
3912	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3913	break;
3914	case XTerm_Color_UL:
3915	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3916	break;
3917	case XTerm_Color_RV:	3834	case XTerm_Color_RV:
3918	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3835	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3836	break;
		3837	case Rxvt_Color_BD:
		3838	case URxvt_Color_BD:
		3839	process_color_seq (op, Color_BD, str, resp);
		3840	break;
		3841	case Rxvt_Color_UL:
		3842	case URxvt_Color_UL:
		3843	process_color_seq (op, Color_UL, str, resp);
3919	break;	3844	break;
3920	case URxvt_Color_IT:	3845	case URxvt_Color_IT:
3921	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3846	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3922	break;	3847	break;
3923	#endif	3848	#endif
…		…
3928	if (am_transparent)	3853	if (am_transparent)
3929	want_full_refresh = want_refresh = 1;	3854	want_full_refresh = want_refresh = 1;
3930	break;	3855	break;
3931	#endif	3856	#endif
3932		3857
3933	case XTerm_Pixmap:	3858	case Rxvt_Pixmap:
		3859	{
3934	if (*str != ';')	3860	if (*str != ';')
3935	{	3861	{
3936	#if XPM_BACKGROUND	3862	#if XPM_BACKGROUND
3937	scale_pixmap (""); /* reset to default scaling */	3863	scale_pixmap (""); /* reset to default scaling */
3938	set_bgPixmap (str); /* change pixmap */	3864	set_bgPixmap (str); /* change pixmap */
3939	#endif
3940	scr_touch (true);	3865	scr_touch (true);
		3866	#endif
3941	}	3867	}
		3868
		3869	int changed = 0;
		3870
3942	while ((str = strchr (str, ';')) != NULL)	3871	while ((str = strchr (str, ';')) != NULL)
3943	{	3872	{
3944	str++;	3873	str++;
3945	#if XPM_BACKGROUND	3874	#if XPM_BACKGROUND
3946	changed += scale_pixmap (str);	3875	changed += scale_pixmap (str);
3947	#endif	3876	#endif
3948	}	3877	}
3949		3878
3950	if (changed)	3879	if (changed)
3951	{	3880	{
3952	#ifdef XPM_BACKGROUND	3881	#ifdef XPM_BACKGROUND
3953	resize_pixmap ();	3882	resize_pixmap ();
3954	#endif
3955	scr_touch (true);	3883	scr_touch (true);
		3884	#endif
3956	}	3885	}
		3886	}
3957	break;	3887	break;
3958		3888
3959	case XTerm_restoreFG:	3889	case Rxvt_restoreFG:
3960	set_window_color (Color_fg, str);	3890	set_window_color (Color_fg, str);
3961	break;	3891	break;
3962	case XTerm_restoreBG:	3892	case Rxvt_restoreBG:
3963	set_window_color (Color_bg, str);	3893	set_window_color (Color_bg, str);
3964	break;	3894	break;
3965		3895
3966	case XTerm_logfile:	3896	case XTerm_logfile:
3967	// TODO, when secure mode?	3897	// TODO, when secure mode?
3968	break;	3898	break;
3969		3899
3970	#ifdef MENUBAR
3971	case URxvt_Menu:
3972	if (OPTION (Opt_insecure))
3973	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3974	break;
3975	#endif
3976	#if 0	3900	#if 0
3977	case XTerm_dumpscreen: /* no error notices */	3901	case Rxvt_dumpscreen: /* no error notices */
3978	{	3902	{
3979	int fd;	3903	int fd;
3980	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3904	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3981	{	3905	{
3982	scr_dump (fd);	3906	scr_dump (fd);
…		…
4013	if (query)	3937	if (query)
4014	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3938	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4015	else	3939	else
4016	{	3940	{
4017	set_locale (str);	3941	set_locale (str);
4018	pty.set_utf8_mode (enc_utf8);	3942	pty->set_utf8_mode (enc_utf8);
4019	init_xlocale ();	3943	init_xlocale ();
4020	}	3944	}
4021	break;	3945	break;
4022		3946
4023	case URxvt_view_up:	3947	case URxvt_view_up:
…		…
4076	return state;	4000	return state;
4077	}	4001	}
4078		4002
4079	/* we're not using priv _yet_ */	4003	/* we're not using priv _yet_ */
4080	void	4004	void
4081	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4005	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4082	{	4006	{
4083	unsigned int i, j;	4007	unsigned int i, j;
4084	int state;	4008	int state;
4085		4009
4086	static const struct	4010	static const struct
…		…
4097	{ 5, PrivMode_rVideo },	4021	{ 5, PrivMode_rVideo },
4098	{ 6, PrivMode_relOrigin },	4022	{ 6, PrivMode_relOrigin },
4099	{ 7, PrivMode_Autowrap },	4023	{ 7, PrivMode_Autowrap },
4100	// 8, bi-directional support mode	4024	// 8, bi-directional support mode
4101	{ 9, PrivMode_MouseX10 },	4025	{ 9, PrivMode_MouseX10 },
4102	#ifdef menuBar_esc
4103	{ menuBar_esc, PrivMode_menuBar },
4104	#endif
4105	// 18, 19 printing-related	4026	// 18, 19 printing-related
4106	{ 25, PrivMode_VisibleCursor },	4027	{ 25, PrivMode_VisibleCursor },
4107	#ifdef scrollBar_esc	4028	#ifdef scrollBar_esc
4108	{ scrollBar_esc, PrivMode_scrollBar },	4029	{ scrollBar_esc, PrivMode_scrollBar },
4109	#endif	4030	#endif
…		…
4204	/* case 8: - auto repeat, can't do on a per window basis */	4125	/* case 8: - auto repeat, can't do on a per window basis */
4205	case 9: /* X10 mouse reporting */	4126	case 9: /* X10 mouse reporting */
4206	if (state) /* orthogonal */	4127	if (state) /* orthogonal */
4207	priv_modes &= ~PrivMode_MouseX11;	4128	priv_modes &= ~PrivMode_MouseX11;
4208	break;	4129	break;
4209	#ifdef menuBar_esc
4210	case menuBar_esc:
4211	#ifdef MENUBAR
4212	map_menuBar (state);
4213	#endif
4214	break;
4215	#endif
4216	#ifdef scrollBar_esc	4130	#ifdef scrollBar_esc
4217	case scrollBar_esc:	4131	case scrollBar_esc:
4218	if (scrollbar_mapping (state))	4132	if (scrollbar_mapping (state))
4219	{	4133	{
4220	resize_all_windows (0, 0, 0);	4134	resize_all_windows (0, 0, 0);
…		…
4462	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4376	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4463		4377
4464	void	4378	void
4465	rxvt_term::tt_write (const char *data, unsigned int len)	4379	rxvt_term::tt_write (const char *data, unsigned int len)
4466	{	4380	{
4467	if (pty.pty < 0)	4381	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4468	return;	4382	return;
4469		4383
		4384	if (pty->pty < 0)
		4385	return;
		4386
4470	if (v_buflen == 0)	4387	if (v_buflen == 0)
4471	{	4388	{
4472	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4389	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4473		4390
4474	if ((unsigned int)written == len)	4391	if ((unsigned int)written == len)
4475	return;	4392	return;
4476		4393
4477	data += written;	4394	data += written;
…		…
4486	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4403	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4487	}	4404	}
4488		4405
4489	void rxvt_term::pty_write ()	4406	void rxvt_term::pty_write ()
4490	{	4407	{
4491	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4408	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4492		4409
4493	if (written > 0)	4410	if (written > 0)
4494	{	4411	{
4495	v_buflen -= written;	4412	v_buflen -= written;
4496		4413

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.252 by root, Mon Jan 9 22:41:41 2006 UTC vs. Revision 1.285 by root, Wed Jan 25 21:03:04 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.252 by root, Mon Jan 9 22:41:41 2006 UTC vs.
Revision 1.285 by root, Wed Jan 25 21:03:04 2006 UTC