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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.259 by root, Fri Jan 13 04:59:04 2006 UTC vs.
Revision 1.293 by root, Mon Jan 30 04:27:17 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	{
…		…
230	# if !UNICODE3	227	# if !UNICODE3
231	if (ch >= 0x10000)	228	if (ch >= 0x10000)
232	ch = 0xfffd;	229	ch = 0xfffd;
233	# endif	230	# endif
234	scr_overlay_set (11, y, ch, r);	231	scr_overlay_set (11, y, ch, r);
		232
		233	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	234	scr_overlay_set (12, y, NOCHAR, r);
236	}	235	}
237		236
		237	// {
		238	// char buf[4+4+3+1];
		239	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
		240	// scr_overlay_set (0, 0, buf);
		241	// }
238	scr_overlay_set (0, len , attr);	242	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	243	scr_overlay_set (0, len + 1, fname);
240		244
241	free (fname);	245	free (fname);
242		246
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	306	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	307	{
304	int ctrl, meta, shft, len;	308	int ctrl, meta, shft, len;
305	unsigned int newlen;	309	unsigned int newlen;
306	KeySym keysym;	310	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	311	int valid_keysym;
311	char kbuf[KBUFSZ];	312	char kbuf[KBUFSZ];
312		313
313	/*	314	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	315	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
443	scr_move_to (0, 1);	444	scr_move_to (0, 1);
444	return;	445	return;
445	}	446	}
446	else if (keysym == XK_End)	447	else if (keysym == XK_End)
447	{	448	{
448	scr_move_to (1, 0);	449	scr_move_to (1, 1);
449	return;	450	return;
450	}	451	}
451	}	452	}
452	#endif	453	#endif
453	}	454	}
…		…
464	{	465	{
465	switch (keysym)	466	switch (keysym)
466	{	467	{
467	/* normal XTerm key bindings */	468	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	469	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	470	selection_request (ev.time);
470	return;	471	return;
471	#if TODO	472	#if TODO
472	/* rxvt extras */	473	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	474	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	475	change_font (FONT_UP);
…		…
905	{	906	{
906	const char ch = C0_ESC;	907	const char ch = C0_ESC;
907	tt_write (&ch, 1);	908	tt_write (&ch, 1);
908	}	909	}
909		910
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);	911	tt_write (kbuf, (unsigned int)len);
921	}	912	}
922	/}}} /	913	/}}} /
923		914
924	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	915	#if defined (KEYSYM_RESOURCE)
925	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
926	/* attempt to `write' count to the input buffer */
927	unsigned int	916	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	917	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	918	{
930	unsigned int n, s;	919	unsigned int n, s;
931		920
…		…
972		961
973	if (want_refresh)	962	if (want_refresh)
974	{	963	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	964	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	965	{
977	int row = -view_start;	966	int row = view_start;
978	int end_row = row + nrow;	967	int end_row = row + nrow;
979		968
980	while (row > -nsaved && ROW (row - 1).is_longer ())	969	while (row > top_row && ROW (row - 1).is_longer ())
981	--row;	970	--row;
982		971
983	do	972	do
984	{	973	{
985	int start_row = row;	974	int start_row = row;
…		…
1008	while (l->is_longer () && row < end_row);	997	while (l->is_longer () && row < end_row);
1009	}	998	}
1010	while (row < end_row);	999	while (row < end_row);
1011	}	1000	}
1012		1001
1013	scr_refresh (refresh_type);	1002	scr_refresh ();
1014	scrollbar_show (1);	1003	scrollbar_show (1);
1015	#ifdef USE_XIM	1004	#ifdef USE_XIM
1016	IMSendSpot ();	1005	IMSendSpot ();
1017	#endif	1006	#endif
1018	}	1007	}
…		…
1021	}	1010	}
1022		1011
1023	void	1012	void
1024	rxvt_term::check_cb (check_watcher &w)	1013	rxvt_term::check_cb (check_watcher &w)
1025	{	1014	{
1026	SET_R (this);	1015	make_current ();
1027	SET_LOCALE (locale);
1028		1016
1029	display->flush ();	1017	display->flush ();
1030		1018
1031	if (want_refresh && !flush_ev.active)	1019	if (want_refresh && !flush_ev.active)
1032	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1020	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033	}	1021	}
1034		1022
1035	void	1023	void
1036	rxvt_term::flush_cb (time_watcher &w)	1024	rxvt_term::flush_cb (time_watcher &w)
1037	{	1025	{
1038	SET_R (this);	1026	make_current ();
1039	SET_LOCALE (locale);
1040		1027
1041	refresh_limit = 1;	1028	refresh_limit = 1;
1042	refresh_count = 0;	1029	refresh_count = 0;
1043	flush ();	1030	flush ();
1044	}	1031	}
…		…
1048	rxvt_term::cursor_blink_cb (time_watcher &w)	1035	rxvt_term::cursor_blink_cb (time_watcher &w)
1049	{	1036	{
1050	hidden_cursor = !hidden_cursor;	1037	hidden_cursor = !hidden_cursor;
1051	want_refresh = 1;	1038	want_refresh = 1;
1052		1039
1053	w.start (w.at + BLINK_INTERVAL);	1040	w.start (w.at + CURSOR_BLINK_INTERVAL);
1054	}	1041	}
1055	#endif	1042	#endif
1056		1043
1057	#ifdef TEXT_BLINK	1044	#ifdef TEXT_BLINK
1058	void	1045	void
…		…
1072	rxvt_term::cont_scroll_cb (time_watcher &w)	1059	rxvt_term::cont_scroll_cb (time_watcher &w)
1073	{	1060	{
1074	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1061	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1075	scr_page (scrollbar_isUp() ? UP : DN, 1))	1062	scr_page (scrollbar_isUp() ? UP : DN, 1))
1076	{	1063	{
1077	refresh_type \|= SMOOTH_REFRESH;
1078	want_refresh = 1;	1064	want_refresh = 1;
1079	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1065	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080	}	1066	}
1081	}	1067	}
1082	#endif	1068	#endif
…		…
1086	rxvt_term::sel_scroll_cb (time_watcher &w)	1072	rxvt_term::sel_scroll_cb (time_watcher &w)
1087	{	1073	{
1088	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1074	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089	{	1075	{
1090	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1076	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091	refresh_type \|= SMOOTH_REFRESH;
1092	want_refresh = 1;	1077	want_refresh = 1;
1093	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1078	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094	}	1079	}
1095	}	1080	}
1096	#endif	1081	#endif
…		…
1101	{	1086	{
1102	if (mouse_slip_wheel_speed == 0	1087	if (mouse_slip_wheel_speed == 0
1103	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1088	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104	: scr_page (UP, mouse_slip_wheel_speed))	1089	: scr_page (UP, mouse_slip_wheel_speed))
1105	{	1090	{
1106	if (view_start == nsaved \|\|	1091	if (view_start == top_row \|\| view_start == 0)
1107	view_start == 0)
1108	mouse_slip_wheel_speed = 0;	1092	mouse_slip_wheel_speed = 0;
1109		1093
1110	refresh_type \|= SMOOTH_REFRESH;
1111	want_refresh = 1;	1094	want_refresh = 1;
1112	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1095	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1113	}	1096	}
1114	}	1097	}
1115	#endif	1098	#endif
…		…
1145		1128
1146	memmove (cmdbuf_base, cmdbuf_ptr, n);	1129	memmove (cmdbuf_base, cmdbuf_ptr, n);
1147	cmdbuf_ptr = cmdbuf_base;	1130	cmdbuf_ptr = cmdbuf_base;
1148	cmdbuf_endp = cmdbuf_ptr + n;	1131	cmdbuf_endp = cmdbuf_ptr + n;
1149		1132
1150	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1133	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1151		1134
1152	if (r > 0)	1135	if (r > 0)
1153	{	1136	{
1154	cmdbuf_endp += r;	1137	cmdbuf_endp += r;
1155	return true;	1138	return true;
…		…
1173	}	1156	}
1174		1157
1175	void	1158	void
1176	rxvt_term::pty_cb (io_watcher &w, short revents)	1159	rxvt_term::pty_cb (io_watcher &w, short revents)
1177	{	1160	{
1178	SET_R (this);	1161	make_current ();
1179	SET_LOCALE (locale);
1180		1162
1181	if (revents & EVENT_READ)	1163	if (revents & EVENT_READ)
1182	// loop, but don't allow a single term to monopolize us	1164	// loop, but don't allow a single term to monopolize us
1183	while (pty_fill ())	1165	while (pty_fill ())
1184	if (cmd_parse ())	1166	if (cmd_parse ())
…		…
1189	}	1171	}
1190		1172
1191	void	1173	void
1192	rxvt_term::pointer_unblank ()	1174	rxvt_term::pointer_unblank ()
1193	{	1175	{
1194	XDefineCursor (display->display, vt, TermWin_cursor);	1176	XDefineCursor (xdisp, vt, TermWin_cursor);
1195	recolour_cursor ();	1177	recolour_cursor ();
1196		1178
1197	#ifdef POINTER_BLANK	1179	#ifdef POINTER_BLANK
1198	hidden_pointer = 0;	1180	hidden_pointer = 0;
1199		1181
…		…
1207	rxvt_term::pointer_blank ()	1189	rxvt_term::pointer_blank ()
1208	{	1190	{
1209	if (!OPTION (Opt_pointerBlank))	1191	if (!OPTION (Opt_pointerBlank))
1210	return;	1192	return;
1211		1193
1212	XDefineCursor (display->display, vt, display->blank_cursor);	1194	XDefineCursor (xdisp, vt, display->blank_cursor);
1213	XFlush (display->display);	1195	XFlush (xdisp);
1214		1196
1215	hidden_pointer = 1;	1197	hidden_pointer = 1;
1216	}	1198	}
1217		1199
1218	void	1200	void
1219	rxvt_term::pointer_cb (time_watcher &w)	1201	rxvt_term::pointer_cb (time_watcher &w)
1220	{	1202	{
1221	SET_R (this);	1203	make_current ();
1222	SET_LOCALE (locale);
1223		1204
1224	pointer_blank ();	1205	pointer_blank ();
1225	}	1206	}
1226	#endif	1207	#endif
1227		1208
…		…
1292	(32 + button_number + key_state),	1273	(32 + button_number + key_state),
1293	(32 + x + 1),	1274	(32 + x + 1),
1294	(32 + y + 1));	1275	(32 + y + 1));
1295	}	1276	}
1296		1277
1297	#ifdef USING_W11LIB
1298	void
1299	rxvt_W11_process_x_event (XEvent *ev)
1300	{
1301	rxvt_t *r = rxvt_get_r ();
1302
1303	x_cb (*ev);
1304	}
1305	#endif
1306
1307	/{{{ process an X event /	1278	/{{{ process an X event /
1308	void	1279	void
1309	rxvt_term::x_cb (XEvent &ev)	1280	rxvt_term::x_cb (XEvent &ev)
1310	{	1281	{
1311	dDisp;	1282	make_current ();
1312		1283
1313	SET_R (this);	1284	dLocal (Display *, xdisp);
1314	SET_LOCALE (locale);
1315		1285
1316	if (ev.xany.window == vt	1286	if (ev.xany.window == vt
		1287	&& SHOULD_INVOKE (HOOK_X_EVENT)
1317	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1288	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1318	return;	1289	return;
1319		1290
		1291	// for XQueryPointer
1320	Window unused_root, unused_child;	1292	Window unused_root, unused_child;
1321	int unused_root_x, unused_root_y;	1293	int unused_root_x, unused_root_y;
1322	unsigned int unused_mask;	1294	unsigned int unused_mask;
1323		1295
1324	switch (ev.type)	1296	switch (ev.type)
…		…
1414	button_release (ev.xbutton);	1386	button_release (ev.xbutton);
1415	break;	1387	break;
1416		1388
1417	case ClientMessage:	1389	case ClientMessage:
1418	if (ev.xclient.format == 32	1390	if (ev.xclient.format == 32
1419	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1391	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1420	{	1392	{
		1393	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1394	{
		1395	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1396	{
1421	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1397	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1398	{
		1399	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1422	destroy ();	1400	destroy ();
		1401	}
1423	#if ENABLE_EWMH	1402	#if ENABLE_EWMH
1424	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1403	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1425	XSendEvent (disp, ev.xclient.window = display->root,	1404	XSendEvent (xdisp, ev.xclient.window = display->root,
1426	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1405	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1427	&ev);	1406	&ev);
		1407	#endif
		1408	}
		1409	}
		1410	#if ENABLE_XEMBED
		1411	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1412	{
		1413	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1414	focus_in ();
		1415	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1416	focus_out ();
		1417	}
1428	#endif	1418	#endif
1429	}	1419	}
1430	#if ENABLE_XEMBED
1431	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1432	{
1433	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1434	focus_in ();
1435	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1436	focus_out ();
1437	}
1438	#endif
1439	#ifdef OFFIX_DND
1440	/* OffiX Dnd (drag 'n' drop) protocol */
1441	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1442	&& (ev.xclient.data.l[0] == DndFile
1443	\|\| ev.xclient.data.l[0] == DndDir
1444	\|\| ev.xclient.data.l[0] == DndLink))
1445	{
1446	/* Get Dnd data */
1447	Atom ActualType;
1448	int ActualFormat;
1449	unsigned char *data;
1450	unsigned long Size, RemainingBytes;
1451
1452	XGetWindowProperty (disp, display->root,
1453	xa[XA_DNDSELECTION],
1454	0L, 1000000L,
1455	False, AnyPropertyType,
1456	&ActualType, &ActualFormat,
1457	&Size, &RemainingBytes,
1458	&data);
1459	set_string_property (XA_CUT_BUFFER0, data);
1460	XFree (data);
1461	selection_paste (display->root, XA_CUT_BUFFER0, true);
1462	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1463	}
1464	#endif /* OFFIX_DND */
1465	break;	1420	break;
1466		1421
1467	case MappingNotify:	1422	case MappingNotify:
1468	XRefreshKeyboardMapping (&ev.xmapping);	1423	XRefreshKeyboardMapping (&ev.xmapping);
1469	break;	1424	break;
…		…
1502	break;	1457	break;
1503		1458
1504	case ConfigureNotify:	1459	case ConfigureNotify:
1505	if (ev.xconfigure.window == parent[0])	1460	if (ev.xconfigure.window == parent[0])
1506	{	1461	{
1507	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1462	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1508	;	1463	;
1509		1464
1510	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1465	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1511	{	1466	{
1512	seen_resize = 1;	1467	seen_resize = 1;
1513	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1468	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1514	}	1469	}
1515		1470
		1471	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1472
1516	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1473	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1517	if (OPTION (Opt_transparent))	1474	if (OPTION (Opt_transparent))
1518	check_our_parents ();	1475	check_our_parents ();
1519	#endif	1476	#endif
1520	}	1477	}
1521	break;	1478	break;
1522		1479
1523	case PropertyNotify:	1480	case PropertyNotify:
		1481	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1524	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1482	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1525	&& ev.xproperty.state == PropertyNewValue)	1483	&& ev.xproperty.state == PropertyNewValue)
1526	selection_property (ev.xproperty.window, ev.xproperty.atom);	1484	selection_property (ev.xproperty.window, ev.xproperty.atom);
1527		1485
1528	break;	1486	break;
1529		1487
1530	case SelectionClear:	1488	case SelectionClear:
1531	selection_clear ();	1489	selection_clear ();
…		…
1567	if (ev.xany.window == vt)	1525	if (ev.xany.window == vt)
1568	{	1526	{
1569	do	1527	do
1570	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1571	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1572	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1530	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1573		1531
1574	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1532	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1575		1533
1576	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1534	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1577	scr_expose (ev.xexpose.x, ev.xexpose.y,	1535	scr_expose (ev.xexpose.x, ev.xexpose.y,
1578	ev.xexpose.width, ev.xexpose.height, False);	1536	ev.xexpose.width, ev.xexpose.height, False);
1579		1537
1580	want_refresh = 1;	1538	want_refresh = 1;
1581	}	1539	}
1582	else	1540	else
1583	{	1541	{
1584	XEvent unused_event;	1542	XEvent unused_event;
1585		1543
1586	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1544	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1587	;	1545	;
1588	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1546	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1589	;	1547	;
1590		1548
1591	if (isScrollbarWindow (ev.xany.window))	1549	if (isScrollbarWindow (ev.xany.window))
1592	{	1550	{
1593	scrollBar.setIdle ();	1551	scrollBar.setIdle ();
1594	scrollbar_show (0);	1552	scrollbar_show (0);
1595	}	1553	}
1596	#ifdef MENUBAR
1597	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1598	menubar_expose ();
1599	#endif
1600		1554
1601	#ifdef TRANSPARENT	1555	#ifdef TRANSPARENT
1602	if (am_transparent && ev.xany.window == parent[0])	1556	if (am_transparent && ev.xany.window == parent[0])
1603	XClearWindow (disp, ev.xany.window);	1557	XClearWindow (xdisp, ev.xany.window);
1604	#endif	1558	#endif
1605	}	1559	}
1606	break;	1560	break;
1607		1561
1608	case MotionNotify:	1562	case MotionNotify:
1609	printf ("motion notify\n");//D
1610	#ifdef POINTER_BLANK	1563	#ifdef POINTER_BLANK
1611	if (hidden_pointer)	1564	if (hidden_pointer)
1612	pointer_unblank ();	1565	pointer_unblank ();
1613	#endif	1566	#endif
1614	#if MENUBAR
1615	if (isMenuBarWindow (ev.xany.window))
1616	{
1617	menubar_control (ev.xbutton);
1618	break;
1619	}
1620	#endif
1621	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1567	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1622	break;	1568	break;
1623		1569
1624	if (ev.xany.window == vt)	1570	if (ev.xany.window == vt)
1625	{	1571	{
		1572	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1626	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1573	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1627	; // nop	1574	; // nop
1628	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1575	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1629	{	1576	{
1630	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1577	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1631	;	1578	;
1632		1579
1633	XQueryPointer (disp, vt,	1580	XQueryPointer (xdisp, vt,
1634	&unused_root, &unused_child,	1581	&unused_root, &unused_child,
1635	&unused_root_x, &unused_root_y,	1582	&unused_root_x, &unused_root_y,
1636	&ev.xbutton.x, &ev.xbutton.y,	1583	&ev.xbutton.x, &ev.xbutton.y,
1637	&ev.xbutton.state);	1584	&ev.xbutton.state);
1638	#ifdef MOUSE_THRESHOLD	1585	#ifdef MOUSE_THRESHOLD
…		…
1702	#endif	1649	#endif
1703	}	1650	}
1704	}	1651	}
1705	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1652	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1706	{	1653	{
1707	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1654	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1708	MotionNotify, &ev))	1655	MotionNotify, &ev))
1709	;	1656	;
1710		1657
1711	XQueryPointer (disp, scrollBar.win,	1658	XQueryPointer (xdisp, scrollBar.win,
1712	&unused_root, &unused_child,	1659	&unused_root, &unused_child,
1713	&unused_root_x, &unused_root_y,	1660	&unused_root_x, &unused_root_y,
1714	&ev.xbutton.x, &ev.xbutton.y,	1661	&ev.xbutton.x, &ev.xbutton.y,
1715	&unused_mask);	1662	&unused_mask);
1716	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1663	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1731	{	1678	{
1732	hidden_cursor = 0;	1679	hidden_cursor = 0;
1733	want_refresh = 1;	1680	want_refresh = 1;
1734	}	1681	}
1735		1682
1736	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1683	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1737	}	1684	}
1738	#endif	1685	#endif
1739		1686
1740	#if defined(POINTER_BLANK)	1687	#if defined(POINTER_BLANK)
1741	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1688	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1769	XSetICFocus (Input_Context);	1716	XSetICFocus (Input_Context);
1770	}	1717	}
1771	#endif	1718	#endif
1772	#if CURSOR_BLINK	1719	#if CURSOR_BLINK
1773	if (OPTION (Opt_cursorBlink))	1720	if (OPTION (Opt_cursorBlink))
1774	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1721	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1775	#endif	1722	#endif
1776	#if OFF_FOCUS_FADING	1723	#if OFF_FOCUS_FADING
1777	if (rs[Rs_fade])	1724	if (rs[Rs_fade])
1778	{	1725	{
1779	pix_colors = pix_colors_focused;	1726	pix_colors = pix_colors_focused;
…		…
1823		1770
1824	#if TRANSPARENT	1771	#if TRANSPARENT
1825	void	1772	void
1826	rxvt_term::rootwin_cb (XEvent &ev)	1773	rxvt_term::rootwin_cb (XEvent &ev)
1827	{	1774	{
1828	SET_R (this);	1775	make_current ();
1829	SET_LOCALE (locale);
1830		1776
1831	switch (ev.type)	1777	switch (ev.type)
1832	{	1778	{
1833	case PropertyNotify:	1779	case PropertyNotify:
1834	/*	1780	/*
…		…
1861	/*	1807	/*
1862	* VT window processing of button press	1808	* VT window processing of button press
1863	*/	1809	*/
1864	if (ev.window == vt)	1810	if (ev.window == vt)
1865	{	1811	{
		1812	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1813	return;
		1814
1866	#if ISO_14755	1815	#if ISO_14755
1867	// 5.4	1816	// 5.4
1868	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1817	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1869	{	1818	{
1870	iso14755_54 (ev.x, ev.y);	1819	iso14755_54 (ev.x, ev.y);
…		…
1912	else	1861	else
1913	{	1862	{
1914	if (ev.button != MEvent.button)	1863	if (ev.button != MEvent.button)
1915	MEvent.clicks = 0;	1864	MEvent.clicks = 0;
1916		1865
1917	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1918	switch (ev.button)	1866	switch (ev.button)
1919	{	1867	{
1920	case Button1:	1868	case Button1:
1921	/* allow meta + click to select rectangular areas */	1869	/* allow meta + click to select rectangular areas */
1922	/* should be done in screen.C */	1870	/* should be done in screen.C */
1923	#if ENABLE_FRILLS	1871	#if ENABLE_FRILLS
1924	selection.rect = !!(ev.state & ModMetaMask);	1872	selection.rect = !!(ev.state & ModMetaMask);
1925	#else	1873	#else
1926	selection.rect = false;	1874	selection.rect = false;
1927	#endif	1875	#endif
1928		1876
1929	/* allow shift+left click to extend selection */	1877	/* allow shift+left click to extend selection */
1930	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1878	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1931	{	1879	{
1932	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1933	selection_rotate (ev.x, ev.y);	1881	selection_rotate (ev.x, ev.y);
1934	else	1882	else
1935	selection_extend (ev.x, ev.y, 1);	1883	selection_extend (ev.x, ev.y, 1);
1936	}	1884	}
1937	else	1885	else
1938	{	1886	{
1939	if (MEvent.button == Button1 && clickintime)	1887	if (MEvent.button == Button1 && clickintime)
1940	MEvent.clicks++;	1888	MEvent.clicks++;
1941	else	1889	else
1942	MEvent.clicks = 1;	1890	MEvent.clicks = 1;
1943		1891
1944	selection_click (MEvent.clicks, ev.x, ev.y);	1892	selection_click (MEvent.clicks, ev.x, ev.y);
1945	}	1893	}
1946		1894
1947	MEvent.button = Button1;	1895	MEvent.button = Button1;
1948	break;	1896	break;
1949		1897
1950	case Button3:	1898	case Button3:
1951	if (MEvent.button == Button3 && clickintime)	1899	if (MEvent.button == Button3 && clickintime)
1952	selection_rotate (ev.x, ev.y);	1900	selection_rotate (ev.x, ev.y);
1953	else	1901	else
1954	selection_extend (ev.x, ev.y, 1);	1902	selection_extend (ev.x, ev.y, 1);
1955		1903
1956	MEvent.button = Button3;	1904	MEvent.button = Button3;
1957	break;	1905	break;
1958	}	1906	}
1959	}	1907	}
1960		1908
1961	MEvent.time = ev.time;	1909	MEvent.time = ev.time;
1962	return;	1910	return;
1963	}	1911	}
1964		1912
…		…
2103	}	2051	}
2104	}	2052	}
2105		2053
2106	return;	2054	return;
2107	}	2055	}
2108
2109	#if MENUBAR
2110	/*
2111	* Menubar window processing of button press
2112	*/
2113	if (isMenuBarWindow (ev.window))
2114	menubar_control (ev);
2115	#endif
2116	}	2056	}
2117		2057
2118	void	2058	void
2119	rxvt_term::button_release (XButtonEvent &ev)	2059	rxvt_term::button_release (XButtonEvent &ev)
2120	{	2060	{
…		…
2126		2066
2127	if (scrollbar_isUpDn ())	2067	if (scrollbar_isUpDn ())
2128	{	2068	{
2129	scrollBar.setIdle ();	2069	scrollBar.setIdle ();
2130	scrollbar_show (0);	2070	scrollbar_show (0);
2131	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2132	refresh_type &= ~SMOOTH_REFRESH;
2133	#endif
2134	}	2071	}
2135		2072
2136	#ifdef SELECTION_SCROLLING	2073	#ifdef SELECTION_SCROLLING
2137	if (sel_scroll_ev.active)	2074	if (sel_scroll_ev.active)
2138	sel_scroll_ev.stop();	2075	sel_scroll_ev.stop();
2139	#endif	2076	#endif
2140		2077
2141	if (ev.window == vt)	2078	if (ev.window == vt)
2142	{	2079	{
		2080	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2081	return;
		2082
2143	#if ISO_14755	2083	#if ISO_14755
2144	// 5.4	2084	// 5.4
2145	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2085	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2146	return;	2086	return;
2147	#endif	2087	#endif
		2088
2148	if (reportmode)	2089	if (reportmode)
2149	{	2090	{
2150	/* mouse report from vt window */	2091	/* mouse report from vt window */
2151	/* don't report release of wheel "buttons" */	2092	/* don't report release of wheel "buttons" */
2152	if (ev.button >= 4)	2093	if (ev.button >= 4)
…		…
2176	if (priv_modes & PrivMode_mouse_report	2117	if (priv_modes & PrivMode_mouse_report
2177	&& bypass_keystate	2118	&& bypass_keystate
2178	&& ev.button == Button1 && MEvent.clicks <= 1)	2119	&& ev.button == Button1 && MEvent.clicks <= 1)
2179	selection_extend (ev.x, ev.y, 0);	2120	selection_extend (ev.x, ev.y, 0);
2180		2121
2181	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2182	return;
2183
2184	switch (ev.button)	2122	switch (ev.button)
2185	{	2123	{
2186	case Button1:	2124	case Button1:
2187	case Button3:	2125	case Button3:
2188	selection_make (ev.time);	2126	selection_make (ev.time);
2189	break;	2127	break;
		2128
2190	case Button2:	2129	case Button2:
2191	selection_request (ev.time, ev.x, ev.y);	2130	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2131	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2192	break;	2132	break;
		2133
2193	#ifdef MOUSE_WHEEL	2134	#ifdef MOUSE_WHEEL
2194	case Button4:	2135	case Button4:
2195	case Button5:	2136	case Button5:
2196	{	2137	{
2197	int i;	2138	int i;
…		…
2229	}	2170	}
2230	break;	2171	break;
2231	#endif	2172	#endif
2232	}	2173	}
2233	}	2174	}
2234	#ifdef MENUBAR
2235	else if (isMenuBarWindow (ev.window))
2236	menubar_control (ev);
2237	#endif
2238	}	2175	}
2239		2176
2240	#ifdef TRANSPARENT	2177	#ifdef TRANSPARENT
2241	#if TINTING	2178	#if TINTING
2242	/* taken from aterm-0.4.2 */	2179	/* taken from aterm-0.4.2 */
2243		2180
2244	typedef uint32_t RUINT32T;	2181	typedef uint32_t RUINT32T;
2245		2182
2246	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2183	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2247	{	2184	{
2248	int sh_r, sh_g, sh_b;	2185	int sh_r, sh_g, sh_b;
2249	RUINT32T mask_r, mask_g, mask_b;	2186	RUINT32T mask_r, mask_g, mask_b;
2250	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2187	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2251	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2188	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2252	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2189	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2253	int i;	2190	int i;
2254		2191
2255	Visual *visual = display->visual;	2192	Visual *visual = term->visual;
2256		2193
2257	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2194	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2258		2195
2259	/* for convenience */	2196	/* for convenience */
2260	mask_r = visual->red_mask;	2197	mask_r = visual->red_mask;
…		…
2481	Atom atype;	2418	Atom atype;
2482	unsigned char *prop = NULL;	2419	unsigned char *prop = NULL;
2483	Window root, oldp, *list;	2420	Window root, oldp, *list;
2484	Pixmap rootpixmap = None;	2421	Pixmap rootpixmap = None;
2485	XWindowAttributes wattr, wrootattr;	2422	XWindowAttributes wattr, wrootattr;
2486	dDisp;
2487		2423
2488	pchanged = 0;	2424	pchanged = 0;
2489		2425
2490	if (!OPTION (Opt_transparent))	2426	if (!OPTION (Opt_transparent))
2491	return pchanged; /* Don't try any more */	2427	return pchanged; /* Don't try any more */
2492		2428
2493	XGetWindowAttributes (disp, display->root, &wrootattr);	2429	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2494	rootdepth = wrootattr.depth;	2430	rootdepth = wrootattr.depth;
2495		2431
2496	XGetWindowAttributes (disp, parent[0], &wattr);	2432	XGetWindowAttributes (xdisp, parent[0], &wattr);
2497		2433
2498	if (rootdepth != wattr.depth)	2434	if (rootdepth != wattr.depth)
2499	{	2435	{
2500	if (am_transparent)	2436	if (am_transparent)
2501	{	2437	{
2502	pchanged = 1;	2438	pchanged = 1;
2503	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2439	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2504	am_transparent = am_pixmap_trans = 0;	2440	am_transparent = am_pixmap_trans = 0;
2505	}	2441	}
2506		2442
2507	return pchanged; /* Don't try any more */	2443	return pchanged; /* Don't try any more */
2508	}	2444	}
2509		2445
2510	/* Get all X ops out of the queue so that our information is up-to-date. */	2446	/* Get all X ops out of the queue so that our information is up-to-date. */
2511	XSync (disp, False);	2447	XSync (xdisp, False);
2512		2448
2513	/*	2449	/*
2514	* Make the frame window set by the window manager have	2450	* Make the frame window set by the window manager have
2515	* the root background. Some window managers put multiple nested frame	2451	* the root background. Some window managers put multiple nested frame
2516	* windows for each client, so we have to take care about that.	2452	* windows for each client, so we have to take care about that.
2517	*/	2453	*/
2518	i = (xa[XA_XROOTPMAP_ID]	2454	i = (xa[XA_XROOTPMAP_ID]
2519	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2455	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2520	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2456	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2521	&nitems, &bytes_after, &prop) == Success);	2457	&nitems, &bytes_after, &prop) == Success);
2522		2458
2523	if (!i \|\| prop == NULL)	2459	if (!i \|\| prop == NULL)
2524	i = (xa[XA_ESETROOT_PMAP_ID]	2460	i = (xa[XA_ESETROOT_PMAP_ID]
2525	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2461	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2526	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2527	&nitems, &bytes_after, &prop) == Success);	2463	&nitems, &bytes_after, &prop) == Success);
2528		2464
2529	if (!i \|\| prop == NULL	2465	if (!i \|\| prop == NULL
2530	#if TINTING	2466	#if TINTING
…		…
2549	Window cr;	2485	Window cr;
2550	XImage *image;	2486	XImage *image;
2551	GC gc;	2487	GC gc;
2552	XGCValues gcvalue;	2488	XGCValues gcvalue;
2553		2489
2554	XTranslateCoordinates (disp, parent[0], display->root,	2490	XTranslateCoordinates (xdisp, parent[0], display->root,
2555	0, 0, &sx, &sy, &cr);	2491	0, 0, &sx, &sy, &cr);
2556	nw = (unsigned int)szHint.width;	2492	nw = (unsigned int)szHint.width;
2557	nh = (unsigned int)szHint.height;	2493	nh = (unsigned int)szHint.height;
2558	nx = ny = 0;	2494	nx = ny = 0;
2559		2495
…		…
2572	}	2508	}
2573		2509
2574	min_it (nw, (unsigned int) (wrootattr.width - sx));	2510	min_it (nw, (unsigned int) (wrootattr.width - sx));
2575	min_it (nh, (unsigned int) (wrootattr.height - sy));	2511	min_it (nh, (unsigned int) (wrootattr.height - sy));
2576		2512
2577	XSync (disp, False);	2513	XSync (xdisp, False);
2578	allowedxerror = -1;	2514	allowedxerror = -1;
2579	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2515	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2580		2516
2581	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2517	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2582	/* XXX: may need a delay here? */	2518	/* XXX: may need a delay here? */
2583	allowedxerror = 0;	2519	allowedxerror = 0;
2584		2520
…		…
2587	if (am_transparent && am_pixmap_trans)	2523	if (am_transparent && am_pixmap_trans)
2588	{	2524	{
2589	pchanged = 1;	2525	pchanged = 1;
2590	if (pixmap != None)	2526	if (pixmap != None)
2591	{	2527	{
2592	XFreePixmap (disp, pixmap);	2528	XFreePixmap (xdisp, pixmap);
2593	pixmap = None;	2529	pixmap = None;
2594	}	2530	}
2595	}	2531	}
2596		2532
2597	am_pixmap_trans = 0;	2533	am_pixmap_trans = 0;
2598	}	2534	}
2599	else	2535	else
2600	{	2536	{
2601	if (pixmap != None)	2537	if (pixmap != None)
2602	XFreePixmap (disp, pixmap);	2538	XFreePixmap (xdisp, pixmap);
2603		2539
2604	#if TINTING	2540	#if TINTING
2605	if (ISSET_PIXCOLOR (Color_tint))	2541	if (ISSET_PIXCOLOR (Color_tint))
2606	{	2542	{
2607	unsigned short rm, gm, bm;	2543	rxvt_rgba c;
2608	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2544	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2609		2545
2610	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2546	pix_colors_focused[Color_tint].get (this, c);
2611		2547
2612	ShadeXImage (display, image, shade, rm, gm, bm);	2548	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2613	}	2549	}
2614	#endif	2550	#endif
2615		2551
2616	pixmap = XCreatePixmap (disp, vt,	2552	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2617	szHint.width, szHint.height, image->depth);
2618	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2553	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2619	XPutImage (disp, pixmap, gc, image, 0, 0,	2554	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2620	nx, ny, image->width, image->height);	2555	nx, ny, image->width, image->height);
2621	XFreeGC (disp, gc);	2556	XFreeGC (xdisp, gc);
2622	XDestroyImage (image);	2557	XDestroyImage (image);
2623	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2558	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2624	XClearWindow (disp, parent[0]);	2559	XClearWindow (xdisp, parent[0]);
2625		2560
2626	if (!am_transparent \|\| !am_pixmap_trans)	2561	if (!am_transparent \|\| !am_pixmap_trans)
2627	pchanged = 1;	2562	pchanged = 1;
2628		2563
2629	am_transparent = am_pixmap_trans = 1;	2564	am_transparent = am_pixmap_trans = 1;
2630	}	2565	}
2631	}	2566	}
2632		2567
2633	if (am_pixmap_trans)	2568	if (am_pixmap_trans)
2634	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2569	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2635	else	2570	else
2636	{	2571	{
2637	unsigned int n;	2572	unsigned int n;
2638	/*	2573	/*
2639	* InheritPixmap transparency	2574	* InheritPixmap transparency
2640	*/	2575	*/
2641	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2576	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2642	{	2577	{
2643	oldp = parent[i];	2578	oldp = parent[i];
2644	XQueryTree (disp, parent[i - 1], &root,	2579	XQueryTree (xdisp, parent[i - 1], &root,
2645	&parent[i], &list, &n);	2580	&parent[i], &list, &n);
2646	XFree (list);	2581	XFree (list);
2647		2582
2648	if (parent[i] == display->root)	2583	if (parent[i] == display->root)
2649	{	2584	{
…		…
2661		2596
2662	if (pchanged)	2597	if (pchanged)
2663	{	2598	{
2664	for (; n < (unsigned int)i; n++)	2599	for (; n < (unsigned int)i; n++)
2665	{	2600	{
2666	XGetWindowAttributes (disp, parent[n], &wattr);	2601	XGetWindowAttributes (xdisp, parent[n], &wattr);
2667	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2602	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2668	{	2603	{
2669	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2604	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2670	break;	2605	break;
2671	}	2606	}
2672	}	2607	}
2673	}	2608	}
2674		2609
2675	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2610	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2676	{	2611	{
2677	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2612	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2678	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2613	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2679	am_transparent = 0;	2614	am_transparent = 0;
2680	/* XXX: also turn off Opt_transparent? */	2615	/* XXX: also turn off Opt_transparent? */
2681	}	2616	}
2682	else	2617	else
2683	{	2618	{
2684	#if WAIT_FOR_WM
2685	/* wait (an arbitrary period) for the WM to do its thing
2686	* needed for fvwm2.2.2 (and before?) */
2687	sleep (1);
2688	#endif
2689	for (n = 0; n < (unsigned int)i; n++)	2619	for (n = 0; n < (unsigned int)i; n++)
2690	{	2620	{
2691	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2621	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2692	XClearWindow (disp, parent[n]);	2622	XClearWindow (xdisp, parent[n]);
2693	}	2623	}
2694		2624
2695	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2625	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2696	am_transparent = 1;	2626	am_transparent = 1;
2697	}	2627	}
2698		2628
2699	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2629	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2700	parent[i] = None;	2630	parent[i] = None;
2701	}	2631	}
2702		2632
2703	if (scrollBar.win)	2633	if (scrollBar.win)
2704	{	2634	{
2705	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2635	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2706	scrollBar.setIdle ();	2636	scrollBar.setIdle ();
2707	scrollbar_show (0);	2637	scrollbar_show (0);
2708	}	2638	}
2709		2639
2710	if (am_transparent)	2640	if (am_transparent)
…		…
2785	}	2715	}
2786		2716
2787	// scr_add_lines only works for nlines <= nrow - 1.	2717	// scr_add_lines only works for nlines <= nrow - 1.
2788	if (nlines >= nrow - 1)	2718	if (nlines >= nrow - 1)
2789	{	2719	{
		2720	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2790	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2721	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2791	scr_add_lines (buf, str - buf, nlines);	2722	scr_add_lines (buf, str - buf, nlines);
2792		2723
2793	nlines = 0;	2724	nlines = 0;
2794	str = buf;	2725	str = buf;
2795	eol = str + min (ncol, UBUFSIZ);	2726	eol = str + min (ncol, UBUFSIZ);
…		…
2810		2741
2811	seq_begin = cmdbuf_ptr;	2742	seq_begin = cmdbuf_ptr;
2812	ch = next_char ();	2743	ch = next_char ();
2813	}	2744	}
2814		2745
		2746	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2815	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2747	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2816	scr_add_lines (buf, str - buf, nlines);	2748	scr_add_lines (buf, str - buf, nlines);
2817		2749
2818	/*	2750	/*
2819	* If there have been a lot of new lines, then update the screen	2751	* If there have been a lot of new lines, then update the screen
2820	* What the heck I'll cheat and only refresh less than every page-full.	2752	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2826	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2758	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2827	refresh_limit++;	2759	refresh_limit++;
2828	else	2760	else
2829	{	2761	{
2830	flag = true;	2762	flag = true;
2831	scr_refresh (refresh_type);	2763	scr_refresh ();
2832	want_refresh = 1;	2764	want_refresh = 1;
2833	}	2765	}
2834	}	2766	}
2835		2767
2836	}	2768	}
…		…
2854	return flag;	2786	return flag;
2855	}	2787	}
2856		2788
2857	// read the next character	2789	// read the next character
2858	wchar_t	2790	wchar_t
2859	rxvt_term::next_char ()	2791	rxvt_term::next_char () NOTHROW
2860	{	2792	{
2861	while (cmdbuf_ptr < cmdbuf_endp)	2793	while (cmdbuf_ptr < cmdbuf_endp)
2862	{	2794	{
2863	// assume 7-bit to be ascii ALWAYS	2795	// assume 7-bit to be ascii ALWAYS
2864	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2796	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2885	return NOCHAR;	2817	return NOCHAR;
2886	}	2818	}
2887		2819
2888	// read the next octet	2820	// read the next octet
2889	uint32_t	2821	uint32_t
2890	rxvt_term::next_octet ()	2822	rxvt_term::next_octet () NOTHROW
2891	{	2823	{
2892	return cmdbuf_ptr < cmdbuf_endp	2824	return cmdbuf_ptr < cmdbuf_endp
2893	? (unsigned char)*cmdbuf_ptr++	2825	? (unsigned char)*cmdbuf_ptr++
2894	: NOCHAR;	2826	: NOCHAR;
2895	}	2827	}
		2828
		2829	static class out_of_input out_of_input;
2896		2830
2897	/* rxvt_cmd_getc () - Return next input character */	2831	/* rxvt_cmd_getc () - Return next input character */
2898	/*	2832	/*
2899	* Return the next input character after first passing any keyboard input	2833	* Return the next input character after first passing any keyboard input
2900	* to the command.	2834	* to the command.
2901	*/	2835	*/
2902	wchar_t	2836	wchar_t
2903	rxvt_term::cmd_getc ()	2837	rxvt_term::cmd_getc () THROW ((class out_of_input))
2904	{	2838	{
2905	wchar_t c = next_char ();	2839	wchar_t c = next_char ();
2906		2840
2907	if (c == NOCHAR)	2841	if (c == NOCHAR)
2908	throw out_of_input;	2842	throw out_of_input;
2909		2843
2910	return c;	2844	return c;
2911	}	2845	}
2912		2846
2913	uint32_t	2847	uint32_t
2914	rxvt_term::cmd_get8 ()	2848	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2915	{	2849	{
2916	uint32_t c = next_octet ();	2850	uint32_t c = next_octet ();
2917		2851
2918	if (c == NOCHAR)	2852	if (c == NOCHAR)
2919	throw out_of_input;	2853	throw out_of_input;
…		…
3340	ndef = get_byte_array_bit (csi_defaults, i);	3274	ndef = get_byte_array_bit (csi_defaults, i);
3341	for (p = 0; p < nargs; p++)	3275	for (p = 0; p < nargs; p++)
3342	if (arg[p] == -1)	3276	if (arg[p] == -1)
3343	arg[p] = ndef;	3277	arg[p] = ndef;
3344		3278
3345	#ifdef DEBUG_CMD
3346	fprintf (stderr, "CSI ");
3347	for (p = 0; p < nargs; p++)
3348	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3349	fprintf (stderr, "%c\n", ch);
3350	#endif
3351
3352	/*	3279	/*
3353	* private mode handling	3280	* private mode handling
3354	*/	3281	*/
3355	if (priv)	3282	if (priv)
3356	{	3283	{
3357	switch (priv)	3284	switch (priv)
3358	{	3285	{
3359	case '>':	3286	case '>':
3360	if (ch == CSI_DA) /* secondary device attributes */	3287	if (ch == CSI_DA) /* secondary device attributes */
3361	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3288	{
		3289	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3290	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3291	//
		3292	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3293	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3294	// that we do not support xterm mouse reporting (should be 95 when we do).
		3295	//
		3296	tt_printf ("\033[>%d;94;0c", 'U');
		3297	}
3362	break;	3298	break;
3363	case '?':	3299	case '?':
3364	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3300	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3365	process_terminal_mode (ch, priv, nargs, arg);	3301	process_terminal_mode (ch, priv, nargs, arg);
3366	break;	3302	break;
…		…
3594	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3530	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3595	{	3531	{
3596	int x, y;	3532	int x, y;
3597	XWindowAttributes wattr;	3533	XWindowAttributes wattr;
3598	Window wdummy;	3534	Window wdummy;
3599	dDisp;	3535
		3536	dLocal (Display *, xdisp);
3600		3537
3601	if (nargs == 0)	3538	if (nargs == 0)
3602	return;	3539	return;
3603		3540
3604	switch (args[0])	3541	switch (args[0])
3605	{	3542	{
3606	/*	3543	/*
3607	* commands	3544	* commands
3608	*/	3545	*/
3609	case 1: /* deiconify window */	3546	case 1: /* deiconify window */
3610	XMapWindow (disp, parent[0]);	3547	XMapWindow (xdisp, parent[0]);
3611	break;	3548	break;
3612	case 2: /* iconify window */	3549	case 2: /* iconify window */
3613	XIconifyWindow (disp, parent[0], display->screen);	3550	XIconifyWindow (xdisp, parent[0], display->screen);
3614	break;	3551	break;
3615	case 3: /* set position (pixels) */	3552	case 3: /* set position (pixels) */
3616	XMoveWindow (disp, parent[0], args[1], args[2]);	3553	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3617	break;	3554	break;
3618	case 4: /* set size (pixels) */	3555	case 4: /* set size (pixels) */
3619	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3556	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3620	break;	3557	break;
3621	case 5: /* raise window */	3558	case 5: /* raise window */
3622	XRaiseWindow (disp, parent[0]);	3559	XRaiseWindow (xdisp, parent[0]);
3623	break;	3560	break;
3624	case 6: /* lower window */	3561	case 6: /* lower window */
3625	XLowerWindow (disp, parent[0]);	3562	XLowerWindow (xdisp, parent[0]);
3626	break;	3563	break;
3627	case 7: /* refresh window */	3564	case 7: /* refresh window */
3628	scr_touch (true);	3565	scr_touch (true);
3629	break;	3566	break;
3630	case 8: /* set size (chars) */	3567	case 8: /* set size (chars) */
…		…
3642		3579
3643	/*	3580	/*
3644	* reports - some output format copied from XTerm	3581	* reports - some output format copied from XTerm
3645	*/	3582	*/
3646	case 11: /* report window state */	3583	case 11: /* report window state */
3647	XGetWindowAttributes (disp, parent[0], &wattr);	3584	XGetWindowAttributes (xdisp, parent[0], &wattr);
3648	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3585	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3649	break;	3586	break;
3650	case 13: /* report window position */	3587	case 13: /* report window position */
3651	XGetWindowAttributes (disp, parent[0], &wattr);	3588	XGetWindowAttributes (xdisp, parent[0], &wattr);
3652	XTranslateCoordinates (disp, parent[0], wattr.root,	3589	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3653	-wattr.border_width, -wattr.border_width,	3590	-wattr.border_width, -wattr.border_width,
3654	&x, &y, &wdummy);	3591	&x, &y, &wdummy);
3655	tt_printf ("\033[3;%d;%dt", x, y);	3592	tt_printf ("\033[3;%d;%dt", x, y);
3656	break;	3593	break;
3657	case 14: /* report window size (pixels) */	3594	case 14: /* report window size (pixels) */
3658	XGetWindowAttributes (disp, parent[0], &wattr);	3595	XGetWindowAttributes (xdisp, parent[0], &wattr);
3659	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3596	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3660	break;	3597	break;
3661	case 18: /* report text area size (chars) */	3598	case 18: /* report text area size (chars) */
3662	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3599	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3663	break;	3600	break;
…		…
3665	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3602	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3666	break;	3603	break;
3667	case 20: /* report icon label */	3604	case 20: /* report icon label */
3668	{	3605	{
3669	char *s;	3606	char *s;
3670	XGetIconName (disp, parent[0], &s);	3607	XGetIconName (xdisp, parent[0], &s);
3671	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3608	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3672	XFree (s);	3609	XFree (s);
3673	}	3610	}
3674	break;	3611	break;
3675	case 21: /* report window title */	3612	case 21: /* report window title */
3676	{	3613	{
3677	char *s;	3614	char *s;
3678	XFetchName (disp, parent[0], &s);	3615	XFetchName (xdisp, parent[0], &s);
3679	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3616	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3680	XFree (s);	3617	XFree (s);
3681	}	3618	}
3682	break;	3619	break;
3683	}	3620	}
…		…
3784	void	3721	void
3785	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3722	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3786	{	3723	{
3787	if (str[0] == '?' && !str[1])	3724	if (str[0] == '?' && !str[1])
3788	{	3725	{
3789	unsigned short r, g, b;	3726	rxvt_rgba c;
3790	pix_colors_focused[color].get (display, r, g, b);	3727	pix_colors_focused[color].get (this, c);
		3728
		3729	#if XFT
		3730	if (c.a != rxvt_rgba::MAX_CC)
		3731	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3732	else
		3733	#endif
3791	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3734	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3792	}	3735	}
3793	else	3736	else
3794	set_window_color (color, str);	3737	set_window_color (color, str);
3795	}	3738	}
3796		3739
…		…
3798	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3741	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3799	*/	3742	*/
3800	void	3743	void
3801	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3744	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3802	{	3745	{
3803	int changed = 0;
3804	int color;	3746	int color;
3805	char buf, name;	3747	char buf, name;
3806	bool query = str[0] == '?' && !str[1];	3748	bool query = str[0] == '?' && !str[1];
3807	int saveop = op;	3749	int saveop = op;
3808	dDisp;	3750
		3751	dLocal (Display *, xdisp);
3809		3752
3810	assert (str != NULL);	3753	assert (str != NULL);
3811	switch (op)	3754	switch (op)
3812	{	3755	{
3813	case XTerm_name:	3756	case XTerm_name:
…		…
3829	unsigned long bytes_after;	3772	unsigned long bytes_after;
3830	unsigned char *value = 0;	3773	unsigned char *value = 0;
3831	const char *str = "";	3774	const char *str = "";
3832		3775
3833	if (prop	3776	if (prop
3834	&& XGetWindowProperty (disp, parent[0],	3777	&& XGetWindowProperty (xdisp, parent[0],
3835	prop, 0, 1<<16, 0, AnyPropertyType,	3778	prop, 0, 1<<16, 0, AnyPropertyType,
3836	&actual_type, &actual_format,	3779	&actual_type, &actual_format,
3837	&nitems, &bytes_after, &value) == Success	3780	&nitems, &bytes_after, &value) == Success
3838	&& actual_type != None	3781	&& actual_type != None
3839	&& actual_format == 8)	3782	&& actual_format == 8)
3840	str = (const char *)(value);	3783	str = (const char *)(value);
3841		3784
3842	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3785	tt_printf ("\033]%d;%s%c", op, str, resp);
3843		3786
3844	XFree (value);	3787	XFree (value);
3845	}	3788	}
3846	else	3789	else
3847	{	3790	{
…		…
3851	{	3794	{
3852	*eq = 0;	3795	*eq = 0;
3853	set_utf8_property (display->atom (str), eq + 1);	3796	set_utf8_property (display->atom (str), eq + 1);
3854	}	3797	}
3855	else	3798	else
3856	XDeleteProperty (disp, parent[0],	3799	XDeleteProperty (xdisp, parent[0],
3857	display->atom (str));	3800	display->atom (str));
3858	}	3801	}
3859	break;	3802	break;
3860		3803
3861	case XTerm_Color:	3804	case XTerm_Color:
…		…
3871	break;	3814	break;
3872		3815
3873	if ((buf = strchr (name, ';')) != NULL)	3816	if ((buf = strchr (name, ';')) != NULL)
3874	*buf++ = '\0';	3817	*buf++ = '\0';
3875		3818
3876	if (name[0] == '?' && !name[1])	3819	process_color_seq (op, color, name, resp);
3877	{
3878	unsigned short r, g, b;
3879	pix_colors_focused[color].get (display, r, g, b);
3880	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3881	}
3882	else
3883	set_window_color (color, name);
3884	}	3820	}
3885	break;	3821	break;
3886	case XTerm_Color00:	3822	case XTerm_Color00:
3887	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3823	process_color_seq (op, Color_fg, str, resp);
3888	break;	3824	break;
3889	case XTerm_Color01:	3825	case XTerm_Color01:
3890	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3826	process_color_seq (op, Color_bg, str, resp);
3891	break;	3827	break;
3892	#ifndef NO_CURSORCOLOR	3828	#ifndef NO_CURSORCOLOR
3893	case XTerm_Color_cursor:	3829	case XTerm_Color_cursor:
3894	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3830	process_color_seq (op, Color_cursor, str, resp);
3895	break;	3831	break;
3896	#endif	3832	#endif
3897	case XTerm_Color_pointer_fg:	3833	case XTerm_Color_pointer_fg:
3898	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3834	process_color_seq (op, Color_pointer_fg, str, resp);
3899	break;	3835	break;
3900	case XTerm_Color_pointer_bg:	3836	case XTerm_Color_pointer_bg:
3901	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3837	process_color_seq (op, Color_pointer_bg, str, resp);
3902	break;	3838	break;
3903	#ifndef NO_BOLD_UNDERLINE_REVERSE	3839	#ifndef NO_BOLD_UNDERLINE_REVERSE
3904	case XTerm_Color_RV:	3840	case XTerm_Color_RV:
3905	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3841	process_color_seq (op, Color_RV, str, resp);
3906	break;	3842	break;
3907	case Rxvt_Color_BD:	3843	case Rxvt_Color_BD:
3908	case URxvt_Color_BD:	3844	case URxvt_Color_BD:
3909	process_color_seq (op, Color_BD, str, resp);	3845	process_color_seq (op, Color_BD, str, resp);
3910	break;	3846	break;
3911	case Rxvt_Color_UL:	3847	case Rxvt_Color_UL:
3912	case URxvt_Color_UL:	3848	case URxvt_Color_UL:
3913	process_color_seq (op, Color_UL, str, resp);	3849	process_color_seq (op, Color_UL, str, resp);
3914	break;	3850	break;
3915	case URxvt_Color_IT:	3851	case URxvt_Color_IT:
3916	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3852	process_color_seq (op, Color_IT, str, resp);
3917	break;	3853	break;
3918	#endif	3854	#endif
3919	#if TRANSPARENT && TINTING	3855	#if TRANSPARENT && TINTING
3920	case URxvt_Color_tint:	3856	case URxvt_Color_tint:
3921	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3857	process_color_seq (op, Color_tint, str, resp);
3922	check_our_parents ();	3858	check_our_parents ();
3923	if (am_transparent)	3859	if (am_transparent)
3924	want_full_refresh = want_refresh = 1;	3860	want_full_refresh = want_refresh = 1;
3925	break;	3861	break;
3926	#endif	3862	#endif
3927		3863
3928	case Rxvt_Pixmap:	3864	case Rxvt_Pixmap:
		3865	{
3929	if (*str != ';')	3866	if (*str != ';')
3930	{	3867	{
3931	#if XPM_BACKGROUND	3868	#if XPM_BACKGROUND
3932	scale_pixmap (""); /* reset to default scaling */	3869	scale_pixmap (""); /* reset to default scaling */
3933	set_bgPixmap (str); /* change pixmap */	3870	set_bgPixmap (str); /* change pixmap */
3934	scr_touch (true);	3871	scr_touch (true);
3935	#endif	3872	#endif
3936	}	3873	}
3937		3874
		3875	int changed = 0;
		3876
3938	while ((str = strchr (str, ';')) != NULL)	3877	while ((str = strchr (str, ';')) != NULL)
3939	{	3878	{
3940	str++;	3879	str++;
3941	#if XPM_BACKGROUND	3880	#if XPM_BACKGROUND
3942	changed += scale_pixmap (str);	3881	changed += scale_pixmap (str);
3943	#endif	3882	#endif
3944	}	3883	}
3945		3884
3946	if (changed)	3885	if (changed)
3947	{	3886	{
3948	#ifdef XPM_BACKGROUND	3887	#ifdef XPM_BACKGROUND
3949	resize_pixmap ();	3888	resize_pixmap ();
3950	scr_touch (true);	3889	scr_touch (true);
3951	#endif	3890	#endif
3952	}	3891	}
		3892	}
3953	break;	3893	break;
3954		3894
3955	case Rxvt_restoreFG:	3895	case Rxvt_restoreFG:
3956	set_window_color (Color_fg, str);	3896	set_window_color (Color_fg, str);
3957	break;	3897	break;
…		…
3961		3901
3962	case XTerm_logfile:	3902	case XTerm_logfile:
3963	// TODO, when secure mode?	3903	// TODO, when secure mode?
3964	break;	3904	break;
3965		3905
3966	#ifdef MENUBAR
3967	case URxvt_Menu:
3968	if (OPTION (Opt_insecure))
3969	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3970	break;
3971	#endif
3972	#if 0	3906	#if 0
3973	case Rxvt_dumpscreen: /* no error notices */	3907	case Rxvt_dumpscreen: /* no error notices */
3974	{	3908	{
3975	int fd;	3909	int fd;
3976	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3910	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
…		…
4002	allocated.push_back ((void *)res);	3936	allocated.push_back ((void *)res);
4003	set_fonts ();	3937	set_fonts ();
4004	}	3938	}
4005	break;	3939	break;
4006		3940
		3941	case URxvt_version:
		3942	if (query)
		3943	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3944	op,
		3945	rs[Rs_name], VERSION[0], VERSION[2],
		3946	resp);
		3947	break;
		3948
4007	#if ENABLE_FRILLS	3949	#if ENABLE_FRILLS
4008	case URxvt_locale:	3950	case URxvt_locale:
4009	if (query)	3951	if (query)
4010	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3952	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4011	else	3953	else
4012	{	3954	{
4013	set_locale (str);	3955	set_locale (str);
4014	pty.set_utf8_mode (enc_utf8);	3956	pty->set_utf8_mode (enc_utf8);
4015	init_xlocale ();	3957	init_xlocale ();
4016	}	3958	}
4017	break;	3959	break;
4018		3960
4019	case URxvt_view_up:	3961	case URxvt_view_up:
…		…
4072	return state;	4014	return state;
4073	}	4015	}
4074		4016
4075	/* we're not using priv _yet_ */	4017	/* we're not using priv _yet_ */
4076	void	4018	void
4077	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4019	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4078	{	4020	{
4079	unsigned int i, j;	4021	unsigned int i, j;
4080	int state;	4022	int state;
4081		4023
4082	static const struct	4024	static const struct
…		…
4093	{ 5, PrivMode_rVideo },	4035	{ 5, PrivMode_rVideo },
4094	{ 6, PrivMode_relOrigin },	4036	{ 6, PrivMode_relOrigin },
4095	{ 7, PrivMode_Autowrap },	4037	{ 7, PrivMode_Autowrap },
4096	// 8, bi-directional support mode	4038	// 8, bi-directional support mode
4097	{ 9, PrivMode_MouseX10 },	4039	{ 9, PrivMode_MouseX10 },
4098	#ifdef menuBar_esc
4099	{ menuBar_esc, PrivMode_menuBar },
4100	#endif
4101	// 18, 19 printing-related	4040	// 18, 19 printing-related
4102	{ 25, PrivMode_VisibleCursor },	4041	{ 25, PrivMode_VisibleCursor },
4103	#ifdef scrollBar_esc	4042	#ifdef scrollBar_esc
4104	{ scrollBar_esc, PrivMode_scrollBar },	4043	{ scrollBar_esc, PrivMode_scrollBar },
4105	#endif	4044	#endif
…		…
4200	/* case 8: - auto repeat, can't do on a per window basis */	4139	/* case 8: - auto repeat, can't do on a per window basis */
4201	case 9: /* X10 mouse reporting */	4140	case 9: /* X10 mouse reporting */
4202	if (state) /* orthogonal */	4141	if (state) /* orthogonal */
4203	priv_modes &= ~PrivMode_MouseX11;	4142	priv_modes &= ~PrivMode_MouseX11;
4204	break;	4143	break;
4205	#ifdef menuBar_esc
4206	case menuBar_esc:
4207	#ifdef MENUBAR
4208	map_menuBar (state);
4209	#endif
4210	break;
4211	#endif
4212	#ifdef scrollBar_esc	4144	#ifdef scrollBar_esc
4213	case scrollBar_esc:	4145	case scrollBar_esc:
4214	if (scrollbar_mapping (state))	4146	if (scrollbar_mapping (state))
4215	{	4147	{
4216	resize_all_windows (0, 0, 0);	4148	resize_all_windows (0, 0, 0);
…		…
4461	rxvt_term::tt_write (const char *data, unsigned int len)	4393	rxvt_term::tt_write (const char *data, unsigned int len)
4462	{	4394	{
4463	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4395	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4464	return;	4396	return;
4465		4397
4466	if (pty.pty < 0)	4398	if (pty->pty < 0)
4467	return;	4399	return;
4468		4400
4469	if (v_buflen == 0)	4401	if (v_buflen == 0)
4470	{	4402	{
4471	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4403	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4472		4404
4473	if ((unsigned int)written == len)	4405	if ((unsigned int)written == len)
4474	return;	4406	return;
4475		4407
4476	data += written;	4408	data += written;
…		…
4485	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4417	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4486	}	4418	}
4487		4419
4488	void rxvt_term::pty_write ()	4420	void rxvt_term::pty_write ()
4489	{	4421	{
4490	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4422	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4491		4423
4492	if (written > 0)	4424	if (written > 0)
4493	{	4425	{
4494	v_buflen -= written;	4426	v_buflen -= written;
4495		4427

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.259 by root, Fri Jan 13 04:59:04 2006 UTC vs. Revision 1.293 by root, Mon Jan 30 04:27:17 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.259 by root, Fri Jan 13 04:59:04 2006 UTC vs.
Revision 1.293 by root, Mon Jan 30 04:27:17 2006 UTC