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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.262 by root, Sun Jan 15 06:02:40 2006 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC

…		…
49	#include "rxvt.h"	49	#include "rxvt.h"
50	#include "rxvtperl.h"	50	#include "rxvtperl.h"
51	#include "version.h"	51	#include "version.h"
52	#include "command.h"	52	#include "command.h"
53		53
54	#if HAVE_SCHED_YIELD
55	#undef HAVE_SCHED_YIELD // disabled for the time being
56	//# include <sched.h>
57	#endif
58
59	#ifdef KEYSYM_RESOURCE	54	#ifdef KEYSYM_RESOURCE
60	# include "keyboard.h"	55	# include "keyboard.h"
61	#endif	56	#endif
62		57
63	#include <csignal>	58	#include <csignal>
64		59
65	/----------------------------------------------------------------------/	60	/----------------------------------------------------------------------/
66		61
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	62	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71		63
72	#if ENABLE_FRILLS \|\| ISO_14755	64	#if ENABLE_FRILLS \|\| ISO_14755
73		65
74	#define ISO_14755_STARTED 0x80000000UL	66	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	67	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
…		…
230	# if !UNICODE3	222	# if !UNICODE3
231	if (ch >= 0x10000)	223	if (ch >= 0x10000)
232	ch = 0xfffd;	224	ch = 0xfffd;
233	# endif	225	# endif
234	scr_overlay_set (11, y, ch, r);	226	scr_overlay_set (11, y, ch, r);
		227
		228	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	229	scr_overlay_set (12, y, NOCHAR, r);
236	}	230	}
237		231
		232	// {
		233	// char buf[4+4+3+1];
		234	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
		235	// scr_overlay_set (0, 0, buf);
		236	// }
238	scr_overlay_set (0, len , attr);	237	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	238	scr_overlay_set (0, len + 1, fname);
240		239
241	free (fname);	240	free (fname);
242		241
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	301	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	302	{
304	int ctrl, meta, shft, len;	303	int ctrl, meta, shft, len;
305	unsigned int newlen;	304	unsigned int newlen;
306	KeySym keysym;	305	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	306	int valid_keysym;
311	char kbuf[KBUFSZ];	307	char kbuf[KBUFSZ];
312		308
313	/*	309	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	310	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
443	scr_move_to (0, 1);	439	scr_move_to (0, 1);
444	return;	440	return;
445	}	441	}
446	else if (keysym == XK_End)	442	else if (keysym == XK_End)
447	{	443	{
448	scr_move_to (1, 0);	444	scr_move_to (1, 1);
449	return;	445	return;
450	}	446	}
451	}	447	}
452	#endif	448	#endif
453	}	449	}
…		…
464	{	460	{
465	switch (keysym)	461	switch (keysym)
466	{	462	{
467	/* normal XTerm key bindings */	463	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	464	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	465	selection_request (ev.time);
470	return;	466	return;
471	#if TODO	467	#if TODO
472	/* rxvt extras */	468	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	469	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	470	change_font (FONT_UP);
…		…
905	{	901	{
906	const char ch = C0_ESC;	902	const char ch = C0_ESC;
907	tt_write (&ch, 1);	903	tt_write (&ch, 1);
908	}	904	}
909		905
910	#if defined(DEBUG_CMD)
911	/* Display keyboard buffer contents */
912	unsigned char *p;
913	int i;
914
915	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916	for (i = 0, p = kbuf; i < len; i++, p++)
917	fprintf (stderr, (p >= ' ' && p < '\177' ? "%c" : "\\%03o"), *p);
918	fprintf (stderr, "'\n");
919	#endif /* DEBUG_CMD */
920	tt_write (kbuf, (unsigned int)len);	906	tt_write (kbuf, (unsigned int)len);
921	}	907	}
922	/}}} /	908	/}}} /
923		909
924	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	910	#if defined (KEYSYM_RESOURCE)
925	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
926	/* attempt to `write' count to the input buffer */
927	unsigned int	911	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	912	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	913	{
930	unsigned int n, s;	914	unsigned int n, s;
931		915
…		…
1008	while (l->is_longer () && row < end_row);	992	while (l->is_longer () && row < end_row);
1009	}	993	}
1010	while (row < end_row);	994	while (row < end_row);
1011	}	995	}
1012		996
1013	scr_refresh (refresh_type);	997	scr_refresh ();
1014	scrollbar_show (1);	998	scrollbar_show (1);
1015	#ifdef USE_XIM	999	#ifdef USE_XIM
1016	IMSendSpot ();	1000	IMSendSpot ();
1017	#endif	1001	#endif
1018	}	1002	}
…		…
1021	}	1005	}
1022		1006
1023	void	1007	void
1024	rxvt_term::check_cb (check_watcher &w)	1008	rxvt_term::check_cb (check_watcher &w)
1025	{	1009	{
1026	SET_R (this);	1010	make_current ();
1027	SET_LOCALE (locale);
1028		1011
1029	display->flush ();	1012	display->flush ();
1030		1013
1031	if (want_refresh && !flush_ev.active)	1014	if (want_refresh && !flush_ev.active)
1032	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1015	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033	}	1016	}
1034		1017
1035	void	1018	void
1036	rxvt_term::flush_cb (time_watcher &w)	1019	rxvt_term::flush_cb (time_watcher &w)
1037	{	1020	{
1038	SET_R (this);	1021	make_current ();
1039	SET_LOCALE (locale);
1040		1022
1041	refresh_limit = 1;	1023	refresh_limit = 1;
1042	refresh_count = 0;	1024	refresh_count = 0;
1043	flush ();	1025	flush ();
1044	}	1026	}
…		…
1048	rxvt_term::cursor_blink_cb (time_watcher &w)	1030	rxvt_term::cursor_blink_cb (time_watcher &w)
1049	{	1031	{
1050	hidden_cursor = !hidden_cursor;	1032	hidden_cursor = !hidden_cursor;
1051	want_refresh = 1;	1033	want_refresh = 1;
1052		1034
1053	w.start (w.at + BLINK_INTERVAL);	1035	w.start (w.at + CURSOR_BLINK_INTERVAL);
1054	}	1036	}
1055	#endif	1037	#endif
1056		1038
1057	#ifdef TEXT_BLINK	1039	#ifdef TEXT_BLINK
1058	void	1040	void
…		…
1072	rxvt_term::cont_scroll_cb (time_watcher &w)	1054	rxvt_term::cont_scroll_cb (time_watcher &w)
1073	{	1055	{
1074	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1056	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1075	scr_page (scrollbar_isUp() ? UP : DN, 1))	1057	scr_page (scrollbar_isUp() ? UP : DN, 1))
1076	{	1058	{
1077	refresh_type \|= SMOOTH_REFRESH;
1078	want_refresh = 1;	1059	want_refresh = 1;
1079	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1060	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080	}	1061	}
1081	}	1062	}
1082	#endif	1063	#endif
…		…
1086	rxvt_term::sel_scroll_cb (time_watcher &w)	1067	rxvt_term::sel_scroll_cb (time_watcher &w)
1087	{	1068	{
1088	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1069	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089	{	1070	{
1090	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1071	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091	refresh_type \|= SMOOTH_REFRESH;
1092	want_refresh = 1;	1072	want_refresh = 1;
1093	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1073	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094	}	1074	}
1095	}	1075	}
1096	#endif	1076	#endif
…		…
1104	: scr_page (UP, mouse_slip_wheel_speed))	1084	: scr_page (UP, mouse_slip_wheel_speed))
1105	{	1085	{
1106	if (view_start == top_row \|\| view_start == 0)	1086	if (view_start == top_row \|\| view_start == 0)
1107	mouse_slip_wheel_speed = 0;	1087	mouse_slip_wheel_speed = 0;
1108		1088
1109	refresh_type \|= SMOOTH_REFRESH;
1110	want_refresh = 1;	1089	want_refresh = 1;
1111	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1090	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1112	}	1091	}
1113	}	1092	}
1114	#endif
1115
1116	#if HAVE_SCHED_YIELD
1117	static struct event_handler
1118	{
1119	check_watcher cw_yield;
1120
1121	void yield (check_watcher &w)
1122	{
1123	sched_yield ();
1124	w.stop ();
1125	}
1126
1127	event_handler ()
1128	: cw_yield (this, &event_handler::yield)
1129	{
1130	}
1131	} event_handler;
1132	#endif	1093	#endif
1133		1094
1134	bool	1095	bool
1135	rxvt_term::pty_fill ()	1096	rxvt_term::pty_fill ()
1136	{	1097	{
…		…
1144		1105
1145	memmove (cmdbuf_base, cmdbuf_ptr, n);	1106	memmove (cmdbuf_base, cmdbuf_ptr, n);
1146	cmdbuf_ptr = cmdbuf_base;	1107	cmdbuf_ptr = cmdbuf_base;
1147	cmdbuf_endp = cmdbuf_ptr + n;	1108	cmdbuf_endp = cmdbuf_ptr + n;
1148		1109
1149	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1110	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1150		1111
1151	if (r > 0)	1112	if (r > 0)
1152	{	1113	{
1153	cmdbuf_endp += r;	1114	cmdbuf_endp += r;
1154	return true;	1115	return true;
…		…
1172	}	1133	}
1173		1134
1174	void	1135	void
1175	rxvt_term::pty_cb (io_watcher &w, short revents)	1136	rxvt_term::pty_cb (io_watcher &w, short revents)
1176	{	1137	{
1177	SET_R (this);	1138	make_current ();
1178	SET_LOCALE (locale);
1179		1139
1180	if (revents & EVENT_READ)	1140	if (revents & EVENT_READ)
1181	// loop, but don't allow a single term to monopolize us	1141	// loop, but don't allow a single term to monopolize us
1182	while (pty_fill ())	1142	while (pty_fill ())
1183	if (cmd_parse ())	1143	if (cmd_parse ())
…		…
1188	}	1148	}
1189		1149
1190	void	1150	void
1191	rxvt_term::pointer_unblank ()	1151	rxvt_term::pointer_unblank ()
1192	{	1152	{
1193	XDefineCursor (display->display, vt, TermWin_cursor);	1153	XDefineCursor (xdisp, vt, TermWin_cursor);
1194	recolour_cursor ();	1154	recolour_cursor ();
1195		1155
1196	#ifdef POINTER_BLANK	1156	#ifdef POINTER_BLANK
1197	hidden_pointer = 0;	1157	hidden_pointer = 0;
1198		1158
…		…
1206	rxvt_term::pointer_blank ()	1166	rxvt_term::pointer_blank ()
1207	{	1167	{
1208	if (!OPTION (Opt_pointerBlank))	1168	if (!OPTION (Opt_pointerBlank))
1209	return;	1169	return;
1210		1170
1211	XDefineCursor (display->display, vt, display->blank_cursor);	1171	XDefineCursor (xdisp, vt, display->blank_cursor);
1212	XFlush (display->display);	1172	XFlush (xdisp);
1213		1173
1214	hidden_pointer = 1;	1174	hidden_pointer = 1;
1215	}	1175	}
1216		1176
1217	void	1177	void
1218	rxvt_term::pointer_cb (time_watcher &w)	1178	rxvt_term::pointer_cb (time_watcher &w)
1219	{	1179	{
1220	SET_R (this);	1180	make_current ();
1221	SET_LOCALE (locale);
1222		1181
1223	pointer_blank ();	1182	pointer_blank ();
1224	}	1183	}
1225	#endif	1184	#endif
1226		1185
…		…
1291	(32 + button_number + key_state),	1250	(32 + button_number + key_state),
1292	(32 + x + 1),	1251	(32 + x + 1),
1293	(32 + y + 1));	1252	(32 + y + 1));
1294	}	1253	}
1295		1254
1296	#ifdef USING_W11LIB
1297	void
1298	rxvt_W11_process_x_event (XEvent *ev)
1299	{
1300	rxvt_t *r = rxvt_get_r ();
1301
1302	x_cb (*ev);
1303	}
1304	#endif
1305
1306	/{{{ process an X event /	1255	/{{{ process an X event /
1307	void	1256	void
1308	rxvt_term::x_cb (XEvent &ev)	1257	rxvt_term::x_cb (XEvent &ev)
1309	{	1258	{
1310	dDisp;	1259	make_current ();
1311		1260
1312	SET_R (this);	1261	dLocal (Display *, xdisp);
1313	SET_LOCALE (locale);
1314		1262
1315	if (ev.xany.window == vt	1263	if (ev.xany.window == vt
		1264	&& SHOULD_INVOKE (HOOK_X_EVENT)
1316	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1265	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317	return;	1266	return;
1318		1267
1319	// for XQueryPointer	1268	// for XQueryPointer
1320	Window unused_root, unused_child;	1269	Window unused_root, unused_child;
…		…
1414	button_release (ev.xbutton);	1363	button_release (ev.xbutton);
1415	break;	1364	break;
1416		1365
1417	case ClientMessage:	1366	case ClientMessage:
1418	if (ev.xclient.format == 32	1367	if (ev.xclient.format == 32
1419	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1368	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1420	{	1369	{
		1370	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1371	{
		1372	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1373	{
1421	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1374	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1375	{
		1376	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1422	destroy ();	1377	destroy ();
		1378	}
1423	#if ENABLE_EWMH	1379	#if ENABLE_EWMH
1424	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1380	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1425	XSendEvent (disp, ev.xclient.window = display->root,	1381	XSendEvent (xdisp, ev.xclient.window = display->root,
1426	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1382	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1427	&ev);	1383	&ev);
		1384	#endif
		1385	}
		1386	}
		1387	#if ENABLE_XEMBED
		1388	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1389	{
		1390	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1391	focus_in ();
		1392	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1393	focus_out ();
		1394	}
1428	#endif	1395	#endif
1429	}	1396	}
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;	1397	break;
1466		1398
1467	case MappingNotify:	1399	case MappingNotify:
1468	XRefreshKeyboardMapping (&ev.xmapping);	1400	XRefreshKeyboardMapping (&ev.xmapping);
1469	break;	1401	break;
…		…
1502	break;	1434	break;
1503		1435
1504	case ConfigureNotify:	1436	case ConfigureNotify:
1505	if (ev.xconfigure.window == parent[0])	1437	if (ev.xconfigure.window == parent[0])
1506	{	1438	{
1507	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1439	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1508	;	1440	;
1509		1441
1510	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1442	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1511	{	1443	{
1512	seen_resize = 1;	1444	seen_resize = 1;
1513	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1445	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1514	}	1446	}
1515		1447
		1448	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1449
1516	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1450	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1517	if (OPTION (Opt_transparent))	1451	if (OPTION (Opt_transparent))
1518	check_our_parents ();	1452	check_our_parents ();
1519	#endif	1453	#endif
1520	}	1454	}
1521	break;	1455	break;
1522		1456
1523	case PropertyNotify:	1457	case PropertyNotify:
		1458	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1524	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1459	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1525	&& ev.xproperty.state == PropertyNewValue)	1460	&& ev.xproperty.state == PropertyNewValue)
1526	selection_property (ev.xproperty.window, ev.xproperty.atom);	1461	selection_property (ev.xproperty.window, ev.xproperty.atom);
1527		1462
1528	break;	1463	break;
1529		1464
1530	case SelectionClear:	1465	case SelectionClear:
1531	selection_clear ();	1466	selection_clear ();
…		…
1567	if (ev.xany.window == vt)	1502	if (ev.xany.window == vt)
1568	{	1503	{
1569	do	1504	do
1570	scr_expose (ev.xexpose.x, ev.xexpose.y,	1505	scr_expose (ev.xexpose.x, ev.xexpose.y,
1571	ev.xexpose.width, ev.xexpose.height, False);	1506	ev.xexpose.width, ev.xexpose.height, False);
1572	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1507	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1573		1508
1574	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1509	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1575		1510
1576	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1511	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1577	scr_expose (ev.xexpose.x, ev.xexpose.y,	1512	scr_expose (ev.xexpose.x, ev.xexpose.y,
1578	ev.xexpose.width, ev.xexpose.height, False);	1513	ev.xexpose.width, ev.xexpose.height, False);
1579		1514
1580	want_refresh = 1;	1515	want_refresh = 1;
1581	}	1516	}
1582	else	1517	else
1583	{	1518	{
1584	XEvent unused_event;	1519	XEvent unused_event;
1585		1520
1586	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1521	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1587	;	1522	;
1588	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1523	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1589	;	1524	;
1590		1525
1591	if (isScrollbarWindow (ev.xany.window))	1526	if (isScrollbarWindow (ev.xany.window))
1592	{	1527	{
1593	scrollBar.setIdle ();	1528	scrollBar.setIdle ();
1594	scrollbar_show (0);	1529	scrollbar_show (0);
1595	}	1530	}
1596	#ifdef MENUBAR
1597	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1598	menubar_expose ();
1599	#endif
1600		1531
1601	#ifdef TRANSPARENT	1532	#ifdef TRANSPARENT
1602	if (am_transparent && ev.xany.window == parent[0])	1533	if (am_transparent && ev.xany.window == parent[0])
1603	XClearWindow (disp, ev.xany.window);	1534	XClearWindow (xdisp, ev.xany.window);
1604	#endif	1535	#endif
1605	}	1536	}
1606	break;	1537	break;
1607		1538
1608	case MotionNotify:	1539	case MotionNotify:
1609	#ifdef POINTER_BLANK	1540	#ifdef POINTER_BLANK
1610	if (hidden_pointer)	1541	if (hidden_pointer)
1611	pointer_unblank ();	1542	pointer_unblank ();
1612	#endif	1543	#endif
1613	#if MENUBAR
1614	if (isMenuBarWindow (ev.xany.window))
1615	{
1616	menubar_control (ev.xbutton);
1617	break;
1618	}
1619	#endif
1620	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1544	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1621	break;	1545	break;
1622		1546
1623	if (ev.xany.window == vt)	1547	if (ev.xany.window == vt)
1624	{	1548	{
		1549	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1625	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1550	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1626	; // nop	1551	; // nop
1627	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1552	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1628	{	1553	{
1629	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1554	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1630	;	1555	;
1631		1556
1632	XQueryPointer (disp, vt,	1557	XQueryPointer (xdisp, vt,
1633	&unused_root, &unused_child,	1558	&unused_root, &unused_child,
1634	&unused_root_x, &unused_root_y,	1559	&unused_root_x, &unused_root_y,
1635	&ev.xbutton.x, &ev.xbutton.y,	1560	&ev.xbutton.x, &ev.xbutton.y,
1636	&ev.xbutton.state);	1561	&ev.xbutton.state);
1637	#ifdef MOUSE_THRESHOLD	1562	#ifdef MOUSE_THRESHOLD
…		…
1701	#endif	1626	#endif
1702	}	1627	}
1703	}	1628	}
1704	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1629	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1705	{	1630	{
1706	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1631	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1707	MotionNotify, &ev))	1632	MotionNotify, &ev))
1708	;	1633	;
1709		1634
1710	XQueryPointer (disp, scrollBar.win,	1635	XQueryPointer (xdisp, scrollBar.win,
1711	&unused_root, &unused_child,	1636	&unused_root, &unused_child,
1712	&unused_root_x, &unused_root_y,	1637	&unused_root_x, &unused_root_y,
1713	&ev.xbutton.x, &ev.xbutton.y,	1638	&ev.xbutton.x, &ev.xbutton.y,
1714	&unused_mask);	1639	&unused_mask);
1715	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1640	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1730	{	1655	{
1731	hidden_cursor = 0;	1656	hidden_cursor = 0;
1732	want_refresh = 1;	1657	want_refresh = 1;
1733	}	1658	}
1734		1659
1735	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1660	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1736	}	1661	}
1737	#endif	1662	#endif
1738		1663
1739	#if defined(POINTER_BLANK)	1664	#if defined(POINTER_BLANK)
1740	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1665	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1768	XSetICFocus (Input_Context);	1693	XSetICFocus (Input_Context);
1769	}	1694	}
1770	#endif	1695	#endif
1771	#if CURSOR_BLINK	1696	#if CURSOR_BLINK
1772	if (OPTION (Opt_cursorBlink))	1697	if (OPTION (Opt_cursorBlink))
1773	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1698	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1774	#endif	1699	#endif
1775	#if OFF_FOCUS_FADING	1700	#if OFF_FOCUS_FADING
1776	if (rs[Rs_fade])	1701	if (rs[Rs_fade])
1777	{	1702	{
1778	pix_colors = pix_colors_focused;	1703	pix_colors = pix_colors_focused;
…		…
1822		1747
1823	#if TRANSPARENT	1748	#if TRANSPARENT
1824	void	1749	void
1825	rxvt_term::rootwin_cb (XEvent &ev)	1750	rxvt_term::rootwin_cb (XEvent &ev)
1826	{	1751	{
1827	SET_R (this);	1752	make_current ();
1828	SET_LOCALE (locale);
1829		1753
1830	switch (ev.type)	1754	switch (ev.type)
1831	{	1755	{
1832	case PropertyNotify:	1756	case PropertyNotify:
1833	/*	1757	/*
…		…
1860	/*	1784	/*
1861	* VT window processing of button press	1785	* VT window processing of button press
1862	*/	1786	*/
1863	if (ev.window == vt)	1787	if (ev.window == vt)
1864	{	1788	{
		1789	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1790	return;
		1791
1865	#if ISO_14755	1792	#if ISO_14755
1866	// 5.4	1793	// 5.4
1867	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1794	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1868	{	1795	{
1869	iso14755_54 (ev.x, ev.y);	1796	iso14755_54 (ev.x, ev.y);
…		…
1911	else	1838	else
1912	{	1839	{
1913	if (ev.button != MEvent.button)	1840	if (ev.button != MEvent.button)
1914	MEvent.clicks = 0;	1841	MEvent.clicks = 0;
1915		1842
1916	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1917	switch (ev.button)	1843	switch (ev.button)
1918	{	1844	{
1919	case Button1:	1845	case Button1:
1920	/* allow meta + click to select rectangular areas */	1846	/* allow meta + click to select rectangular areas */
1921	/* should be done in screen.C */	1847	/* should be done in screen.C */
1922	#if ENABLE_FRILLS	1848	#if ENABLE_FRILLS
1923	selection.rect = !!(ev.state & ModMetaMask);	1849	selection.rect = !!(ev.state & ModMetaMask);
1924	#else	1850	#else
1925	selection.rect = false;	1851	selection.rect = false;
1926	#endif	1852	#endif
1927		1853
1928	/* allow shift+left click to extend selection */	1854	/* allow shift+left click to extend selection */
1929	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1855	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1930	{	1856	{
1931	if (MEvent.button == Button1 && clickintime)	1857	if (MEvent.button == Button1 && clickintime)
1932	selection_rotate (ev.x, ev.y);	1858	selection_rotate (ev.x, ev.y);
1933	else	1859	else
1934	selection_extend (ev.x, ev.y, 1);	1860	selection_extend (ev.x, ev.y, 1);
1935	}	1861	}
1936	else	1862	else
1937	{	1863	{
1938	if (MEvent.button == Button1 && clickintime)	1864	if (MEvent.button == Button1 && clickintime)
1939	MEvent.clicks++;	1865	MEvent.clicks++;
1940	else	1866	else
1941	MEvent.clicks = 1;	1867	MEvent.clicks = 1;
1942		1868
1943	selection_click (MEvent.clicks, ev.x, ev.y);	1869	selection_click (MEvent.clicks, ev.x, ev.y);
1944	}	1870	}
1945		1871
1946	MEvent.button = Button1;	1872	MEvent.button = Button1;
1947	break;	1873	break;
1948		1874
1949	case Button3:	1875	case Button3:
1950	if (MEvent.button == Button3 && clickintime)	1876	if (MEvent.button == Button3 && clickintime)
1951	selection_rotate (ev.x, ev.y);	1877	selection_rotate (ev.x, ev.y);
1952	else	1878	else
1953	selection_extend (ev.x, ev.y, 1);	1879	selection_extend (ev.x, ev.y, 1);
1954		1880
1955	MEvent.button = Button3;	1881	MEvent.button = Button3;
1956	break;	1882	break;
1957	}	1883	}
1958	}	1884	}
1959		1885
1960	MEvent.time = ev.time;	1886	MEvent.time = ev.time;
1961	return;	1887	return;
1962	}	1888	}
1963		1889
…		…
2102	}	2028	}
2103	}	2029	}
2104		2030
2105	return;	2031	return;
2106	}	2032	}
2107
2108	#if MENUBAR
2109	/*
2110	* Menubar window processing of button press
2111	*/
2112	if (isMenuBarWindow (ev.window))
2113	menubar_control (ev);
2114	#endif
2115	}	2033	}
2116		2034
2117	void	2035	void
2118	rxvt_term::button_release (XButtonEvent &ev)	2036	rxvt_term::button_release (XButtonEvent &ev)
2119	{	2037	{
…		…
2125		2043
2126	if (scrollbar_isUpDn ())	2044	if (scrollbar_isUpDn ())
2127	{	2045	{
2128	scrollBar.setIdle ();	2046	scrollBar.setIdle ();
2129	scrollbar_show (0);	2047	scrollbar_show (0);
2130	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2131	refresh_type &= ~SMOOTH_REFRESH;
2132	#endif
2133	}	2048	}
2134		2049
2135	#ifdef SELECTION_SCROLLING	2050	#ifdef SELECTION_SCROLLING
2136	if (sel_scroll_ev.active)	2051	if (sel_scroll_ev.active)
2137	sel_scroll_ev.stop();	2052	sel_scroll_ev.stop();
2138	#endif	2053	#endif
2139		2054
2140	if (ev.window == vt)	2055	if (ev.window == vt)
2141	{	2056	{
		2057	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2058	return;
		2059
2142	#if ISO_14755	2060	#if ISO_14755
2143	// 5.4	2061	// 5.4
2144	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2062	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2145	return;	2063	return;
2146	#endif	2064	#endif
		2065
2147	if (reportmode)	2066	if (reportmode)
2148	{	2067	{
2149	/* mouse report from vt window */	2068	/* mouse report from vt window */
2150	/* don't report release of wheel "buttons" */	2069	/* don't report release of wheel "buttons" */
2151	if (ev.button >= 4)	2070	if (ev.button >= 4)
…		…
2175	if (priv_modes & PrivMode_mouse_report	2094	if (priv_modes & PrivMode_mouse_report
2176	&& bypass_keystate	2095	&& bypass_keystate
2177	&& ev.button == Button1 && MEvent.clicks <= 1)	2096	&& ev.button == Button1 && MEvent.clicks <= 1)
2178	selection_extend (ev.x, ev.y, 0);	2097	selection_extend (ev.x, ev.y, 0);
2179		2098
2180	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2181	return;
2182
2183	switch (ev.button)	2099	switch (ev.button)
2184	{	2100	{
2185	case Button1:	2101	case Button1:
2186	case Button3:	2102	case Button3:
2187	selection_make (ev.time);	2103	selection_make (ev.time);
2188	break;	2104	break;
		2105
2189	case Button2:	2106	case Button2:
2190	selection_request (ev.time, ev.x, ev.y);	2107	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2108	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2191	break;	2109	break;
		2110
2192	#ifdef MOUSE_WHEEL	2111	#ifdef MOUSE_WHEEL
2193	case Button4:	2112	case Button4:
2194	case Button5:	2113	case Button5:
2195	{	2114	{
2196	int i;	2115	int i;
…		…
2228	}	2147	}
2229	break;	2148	break;
2230	#endif	2149	#endif
2231	}	2150	}
2232	}	2151	}
2233	#ifdef MENUBAR
2234	else if (isMenuBarWindow (ev.window))
2235	menubar_control (ev);
2236	#endif
2237	}	2152	}
2238		2153
2239	#ifdef TRANSPARENT	2154	#ifdef TRANSPARENT
2240	#if TINTING	2155	#if TINTING
2241	/* taken from aterm-0.4.2 */	2156	/* taken from aterm-0.4.2 */
2242		2157
2243	typedef uint32_t RUINT32T;	2158	typedef uint32_t RUINT32T;
2244		2159
2245	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2160	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2246	{	2161	{
2247	int sh_r, sh_g, sh_b;	2162	int sh_r, sh_g, sh_b;
2248	RUINT32T mask_r, mask_g, mask_b;	2163	RUINT32T mask_r, mask_g, mask_b;
2249	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2164	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2250	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2165	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2251	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2166	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2252	int i;	2167	int i;
2253		2168
2254	Visual *visual = display->visual;	2169	Visual *visual = term->visual;
2255		2170
2256	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2171	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2257		2172
2258	/* for convenience */	2173	/* for convenience */
2259	mask_r = visual->red_mask;	2174	mask_r = visual->red_mask;
…		…
2480	Atom atype;	2395	Atom atype;
2481	unsigned char *prop = NULL;	2396	unsigned char *prop = NULL;
2482	Window root, oldp, *list;	2397	Window root, oldp, *list;
2483	Pixmap rootpixmap = None;	2398	Pixmap rootpixmap = None;
2484	XWindowAttributes wattr, wrootattr;	2399	XWindowAttributes wattr, wrootattr;
2485	dDisp;
2486		2400
2487	pchanged = 0;	2401	pchanged = 0;
2488		2402
2489	if (!OPTION (Opt_transparent))	2403	if (!OPTION (Opt_transparent))
2490	return pchanged; /* Don't try any more */	2404	return pchanged; /* Don't try any more */
2491		2405
2492	XGetWindowAttributes (disp, display->root, &wrootattr);	2406	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2493	rootdepth = wrootattr.depth;	2407	rootdepth = wrootattr.depth;
2494		2408
2495	XGetWindowAttributes (disp, parent[0], &wattr);	2409	XGetWindowAttributes (xdisp, parent[0], &wattr);
2496		2410
2497	if (rootdepth != wattr.depth)	2411	if (rootdepth != wattr.depth)
2498	{	2412	{
2499	if (am_transparent)	2413	if (am_transparent)
2500	{	2414	{
2501	pchanged = 1;	2415	pchanged = 1;
2502	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2416	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2503	am_transparent = am_pixmap_trans = 0;	2417	am_transparent = am_pixmap_trans = 0;
2504	}	2418	}
2505		2419
2506	return pchanged; /* Don't try any more */	2420	return pchanged; /* Don't try any more */
2507	}	2421	}
2508		2422
2509	/* Get all X ops out of the queue so that our information is up-to-date. */	2423	/* Get all X ops out of the queue so that our information is up-to-date. */
2510	XSync (disp, False);	2424	XSync (xdisp, False);
2511		2425
2512	/*	2426	/*
2513	* Make the frame window set by the window manager have	2427	* Make the frame window set by the window manager have
2514	* the root background. Some window managers put multiple nested frame	2428	* the root background. Some window managers put multiple nested frame
2515	* windows for each client, so we have to take care about that.	2429	* windows for each client, so we have to take care about that.
2516	*/	2430	*/
2517	i = (xa[XA_XROOTPMAP_ID]	2431	i = (xa[XA_XROOTPMAP_ID]
2518	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2432	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2519	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2433	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2520	&nitems, &bytes_after, &prop) == Success);	2434	&nitems, &bytes_after, &prop) == Success);
2521		2435
2522	if (!i \|\| prop == NULL)	2436	if (!i \|\| prop == NULL)
2523	i = (xa[XA_ESETROOT_PMAP_ID]	2437	i = (xa[XA_ESETROOT_PMAP_ID]
2524	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2438	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2525	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2439	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2526	&nitems, &bytes_after, &prop) == Success);	2440	&nitems, &bytes_after, &prop) == Success);
2527		2441
2528	if (!i \|\| prop == NULL	2442	if (!i \|\| prop == NULL
2529	#if TINTING	2443	#if TINTING
2530	\|\| !rs[Rs_color + Color_tint]	2444	\|\| !ISSET_PIXCOLOR (Color_tint)
2531	#endif	2445	#endif
2532	)	2446	)
2533	have_pixmap = 0;	2447	have_pixmap = 0;
2534	else	2448	else
2535	{	2449	{
…		…
2548	Window cr;	2462	Window cr;
2549	XImage *image;	2463	XImage *image;
2550	GC gc;	2464	GC gc;
2551	XGCValues gcvalue;	2465	XGCValues gcvalue;
2552		2466
2553	XTranslateCoordinates (disp, parent[0], display->root,	2467	XTranslateCoordinates (xdisp, parent[0], display->root,
2554	0, 0, &sx, &sy, &cr);	2468	0, 0, &sx, &sy, &cr);
2555	nw = (unsigned int)szHint.width;	2469	nw = (unsigned int)szHint.width;
2556	nh = (unsigned int)szHint.height;	2470	nh = (unsigned int)szHint.height;
2557	nx = ny = 0;	2471	nx = ny = 0;
2558		2472
…		…
2571	}	2485	}
2572		2486
2573	min_it (nw, (unsigned int) (wrootattr.width - sx));	2487	min_it (nw, (unsigned int) (wrootattr.width - sx));
2574	min_it (nh, (unsigned int) (wrootattr.height - sy));	2488	min_it (nh, (unsigned int) (wrootattr.height - sy));
2575		2489
2576	XSync (disp, False);	2490	XSync (xdisp, False);
2577	allowedxerror = -1;	2491	allowedxerror = -1;
2578	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2492	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2579		2493
2580	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2494	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2581	/* XXX: may need a delay here? */	2495	/* XXX: may need a delay here? */
2582	allowedxerror = 0;	2496	allowedxerror = 0;
2583		2497
…		…
2586	if (am_transparent && am_pixmap_trans)	2500	if (am_transparent && am_pixmap_trans)
2587	{	2501	{
2588	pchanged = 1;	2502	pchanged = 1;
2589	if (pixmap != None)	2503	if (pixmap != None)
2590	{	2504	{
2591	XFreePixmap (disp, pixmap);	2505	XFreePixmap (xdisp, pixmap);
2592	pixmap = None;	2506	pixmap = None;
2593	}	2507	}
2594	}	2508	}
2595		2509
2596	am_pixmap_trans = 0;	2510	am_pixmap_trans = 0;
2597	}	2511	}
2598	else	2512	else
2599	{	2513	{
2600	if (pixmap != None)	2514	if (pixmap != None)
2601	XFreePixmap (disp, pixmap);	2515	XFreePixmap (xdisp, pixmap);
2602		2516
2603	#if TINTING	2517	#if TINTING
2604	if (ISSET_PIXCOLOR (Color_tint))	2518	if (ISSET_PIXCOLOR (Color_tint))
2605	{	2519	{
2606	unsigned short rm, gm, bm;
2607	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2520	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2608		2521
		2522	rgba c;
2609	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2523	pix_colors_focused [Color_tint].get (c);
2610		2524
2611	ShadeXImage (display, image, shade, rm, gm, bm);	2525	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2612	}	2526	}
2613	#endif	2527	#endif
2614		2528
2615	pixmap = XCreatePixmap (disp, vt,	2529	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2616	szHint.width, szHint.height, image->depth);
2617	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2530	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2618	XPutImage (disp, pixmap, gc, image, 0, 0,	2531	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2619	nx, ny, image->width, image->height);	2532	nx, ny, image->width, image->height);
2620	XFreeGC (disp, gc);	2533	XFreeGC (xdisp, gc);
2621	XDestroyImage (image);	2534	XDestroyImage (image);
2622	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2535	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2623	XClearWindow (disp, parent[0]);	2536	XClearWindow (xdisp, parent[0]);
2624		2537
2625	if (!am_transparent \|\| !am_pixmap_trans)	2538	if (!am_transparent \|\| !am_pixmap_trans)
2626	pchanged = 1;	2539	pchanged = 1;
2627		2540
2628	am_transparent = am_pixmap_trans = 1;	2541	am_transparent = am_pixmap_trans = 1;
2629	}	2542	}
2630	}	2543	}
2631		2544
2632	if (am_pixmap_trans)	2545	if (am_pixmap_trans)
2633	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2546	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2634	else	2547	else
2635	{	2548	{
2636	unsigned int n;	2549	unsigned int n;
2637	/*	2550	/*
2638	* InheritPixmap transparency	2551	* InheritPixmap transparency
2639	*/	2552	*/
2640	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2553	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2641	{	2554	{
2642	oldp = parent[i];	2555	oldp = parent[i];
2643	XQueryTree (disp, parent[i - 1], &root,	2556	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2644	&parent[i], &list, &n);
2645	XFree (list);	2557	XFree (list);
2646		2558
2647	if (parent[i] == display->root)	2559	if (parent[i] == display->root)
2648	{	2560	{
2649	if (oldp != None)	2561	if (oldp != None)
…		…
2657	}	2569	}
2658		2570
2659	n = 0;	2571	n = 0;
2660		2572
2661	if (pchanged)	2573	if (pchanged)
2662	{
2663	for (; n < (unsigned int)i; n++)	2574	for (; n < (unsigned int)i; n++)
2664	{	2575	{
2665	XGetWindowAttributes (disp, parent[n], &wattr);	2576	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2577
2666	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2578	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2667	{	2579	{
2668	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2580	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2669	break;	2581	break;
2670	}	2582	}
2671	}	2583	}
2672	}
2673		2584
2674	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2585	if (n > (sizeof (parent) / sizeof (parent[0])))
2675	{	2586	{
2676	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2587	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2677	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2588	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2678	am_transparent = 0;	2589	am_transparent = 0;
2679	/* XXX: also turn off Opt_transparent? */	2590	/* XXX: also turn off Opt_transparent? */
2680	}	2591	}
2681	else	2592	else
2682	{	2593	{
2683	#if WAIT_FOR_WM
2684	/* wait (an arbitrary period) for the WM to do its thing
2685	* needed for fvwm2.2.2 (and before?) */
2686	sleep (1);
2687	#endif
2688	for (n = 0; n < (unsigned int)i; n++)	2594	for (n = 0; n < (unsigned int)i; n++)
2689	{	2595	{
2690	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2596	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2691	XClearWindow (disp, parent[n]);	2597	XClearWindow (xdisp, parent[n]);
2692	}	2598	}
2693		2599
2694	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2600	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2695	am_transparent = 1;	2601	am_transparent = 1;
2696	}	2602	}
2697		2603
2698	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2604	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2699	parent[i] = None;	2605	parent[i] = None;
2700	}	2606	}
2701		2607
2702	if (scrollBar.win)	2608	if (scrollBar.win)
2703	{	2609	{
2704	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2610	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2705	scrollBar.setIdle ();	2611	scrollBar.setIdle ();
2706	scrollbar_show (0);	2612	scrollbar_show (0);
2707	}	2613	}
2708		2614
2709	if (am_transparent)	2615	if (am_transparent)
…		…
2784	}	2690	}
2785		2691
2786	// scr_add_lines only works for nlines <= nrow - 1.	2692	// scr_add_lines only works for nlines <= nrow - 1.
2787	if (nlines >= nrow - 1)	2693	if (nlines >= nrow - 1)
2788	{	2694	{
		2695	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2789	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2696	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2790	scr_add_lines (buf, str - buf, nlines);	2697	scr_add_lines (buf, str - buf, nlines);
2791		2698
2792	nlines = 0;	2699	nlines = 0;
2793	str = buf;	2700	str = buf;
2794	eol = str + min (ncol, UBUFSIZ);	2701	eol = str + min (ncol, UBUFSIZ);
…		…
2809		2716
2810	seq_begin = cmdbuf_ptr;	2717	seq_begin = cmdbuf_ptr;
2811	ch = next_char ();	2718	ch = next_char ();
2812	}	2719	}
2813		2720
		2721	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2814	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2722	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2815	scr_add_lines (buf, str - buf, nlines);	2723	scr_add_lines (buf, str - buf, nlines);
2816		2724
2817	/*	2725	/*
2818	* If there have been a lot of new lines, then update the screen	2726	* If there have been a lot of new lines, then update the screen
2819	* What the heck I'll cheat and only refresh less than every page-full.	2727	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2825	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2733	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2826	refresh_limit++;	2734	refresh_limit++;
2827	else	2735	else
2828	{	2736	{
2829	flag = true;	2737	flag = true;
2830	scr_refresh (refresh_type);	2738	scr_refresh ();
2831	want_refresh = 1;	2739	want_refresh = 1;
2832	}	2740	}
2833	}	2741	}
2834		2742
2835	}	2743	}
…		…
2853	return flag;	2761	return flag;
2854	}	2762	}
2855		2763
2856	// read the next character	2764	// read the next character
2857	wchar_t	2765	wchar_t
2858	rxvt_term::next_char ()	2766	rxvt_term::next_char () NOTHROW
2859	{	2767	{
2860	while (cmdbuf_ptr < cmdbuf_endp)	2768	while (cmdbuf_ptr < cmdbuf_endp)
2861	{	2769	{
2862	// assume 7-bit to be ascii ALWAYS	2770	// assume 7-bit to be ascii ALWAYS
2863	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2771	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2884	return NOCHAR;	2792	return NOCHAR;
2885	}	2793	}
2886		2794
2887	// read the next octet	2795	// read the next octet
2888	uint32_t	2796	uint32_t
2889	rxvt_term::next_octet ()	2797	rxvt_term::next_octet () NOTHROW
2890	{	2798	{
2891	return cmdbuf_ptr < cmdbuf_endp	2799	return cmdbuf_ptr < cmdbuf_endp
2892	? (unsigned char)*cmdbuf_ptr++	2800	? (unsigned char)*cmdbuf_ptr++
2893	: NOCHAR;	2801	: NOCHAR;
2894	}	2802	}
		2803
		2804	static class out_of_input out_of_input;
2895		2805
2896	/* rxvt_cmd_getc () - Return next input character */	2806	/* rxvt_cmd_getc () - Return next input character */
2897	/*	2807	/*
2898	* Return the next input character after first passing any keyboard input	2808	* Return the next input character after first passing any keyboard input
2899	* to the command.	2809	* to the command.
2900	*/	2810	*/
2901	wchar_t	2811	wchar_t
2902	rxvt_term::cmd_getc ()	2812	rxvt_term::cmd_getc () THROW ((class out_of_input))
2903	{	2813	{
2904	wchar_t c = next_char ();	2814	wchar_t c = next_char ();
2905		2815
2906	if (c == NOCHAR)	2816	if (c == NOCHAR)
2907	throw out_of_input;	2817	throw out_of_input;
2908		2818
2909	return c;	2819	return c;
2910	}	2820	}
2911		2821
2912	uint32_t	2822	uint32_t
2913	rxvt_term::cmd_get8 ()	2823	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2914	{	2824	{
2915	uint32_t c = next_octet ();	2825	uint32_t c = next_octet ();
2916		2826
2917	if (c == NOCHAR)	2827	if (c == NOCHAR)
2918	throw out_of_input;	2828	throw out_of_input;
…		…
3156	scr_charset_set (2, (unsigned int)cmd_getc ());	3066	scr_charset_set (2, (unsigned int)cmd_getc ());
3157	break;	3067	break;
3158	case '+':	3068	case '+':
3159	scr_charset_set (3, (unsigned int)cmd_getc ());	3069	scr_charset_set (3, (unsigned int)cmd_getc ());
3160	break;	3070	break;
3161	#if ENABLE_FRILLS	3071	#if !ENABLE_MINIMAL
3162	case '6':	3072	case '6':
3163	scr_backindex ();	3073	scr_backindex ();
3164	break;	3074	break;
3165	#endif	3075	#endif
3166	case '7':	3076	case '7':
3167	scr_cursor (SAVE);	3077	scr_cursor (SAVE);
3168	break;	3078	break;
3169	case '8':	3079	case '8':
3170	scr_cursor (RESTORE);	3080	scr_cursor (RESTORE);
3171	break;	3081	break;
3172	#if ENABLE_FRILLS	3082	#if !ENABLE_MINIMAL
3173	case '9':	3083	case '9':
3174	scr_forwardindex ();	3084	scr_forwardindex ();
3175	break;	3085	break;
3176	#endif	3086	#endif
3177	case '=':	3087	case '=':
…		…
3339	ndef = get_byte_array_bit (csi_defaults, i);	3249	ndef = get_byte_array_bit (csi_defaults, i);
3340	for (p = 0; p < nargs; p++)	3250	for (p = 0; p < nargs; p++)
3341	if (arg[p] == -1)	3251	if (arg[p] == -1)
3342	arg[p] = ndef;	3252	arg[p] = ndef;
3343		3253
3344	#ifdef DEBUG_CMD
3345	fprintf (stderr, "CSI ");
3346	for (p = 0; p < nargs; p++)
3347	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3348	fprintf (stderr, "%c\n", ch);
3349	#endif
3350
3351	/*	3254	/*
3352	* private mode handling	3255	* private mode handling
3353	*/	3256	*/
3354	if (priv)	3257	if (priv)
3355	{	3258	{
3356	switch (priv)	3259	switch (priv)
3357	{	3260	{
3358	case '>':	3261	case '>':
3359	if (ch == CSI_DA) /* secondary device attributes */	3262	if (ch == CSI_DA) /* secondary device attributes */
3360	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3263	{
		3264	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3265	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3266	//
		3267	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3268	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3269	// that we do not support xterm mouse reporting (should be 95 when we do).
		3270	//
		3271	tt_printf ("\033[>%d;94;0c", 'U');
		3272	}
3361	break;	3273	break;
3362	case '?':	3274	case '?':
3363	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3275	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3364	process_terminal_mode (ch, priv, nargs, arg);	3276	process_terminal_mode (ch, priv, nargs, arg);
3365	break;	3277	break;
…		…
3568	break;	3480	break;
3569	case CSI_75:	3481	case CSI_75:
3570	scr_cursor (RESTORE);	3482	scr_cursor (RESTORE);
3571	break;	3483	break;
3572		3484
3573	#if ENABLE_FRILLS	3485	#if !ENABLE_MINIMAL
3574	case CSI_74:	3486	case CSI_74:
3575	process_window_ops (arg, nargs);	3487	process_window_ops (arg, nargs);
3576	break;	3488	break;
3577	#endif	3489	#endif
3578		3490
…		…
3585	break;	3497	break;
3586	}	3498	}
3587	}	3499	}
3588	/}}} /	3500	/}}} /
3589		3501
3590	#if ENABLE_FRILLS	3502	#if !ENABLE_MINIMAL
3591	/* ARGSUSED */	3503	/* ARGSUSED */
3592	void	3504	void
3593	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3505	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3594	{	3506	{
3595	int x, y;	3507	int x, y;
3596	XWindowAttributes wattr;	3508	XWindowAttributes wattr;
3597	Window wdummy;	3509	Window wdummy;
3598	dDisp;	3510
		3511	dLocal (Display *, xdisp);
3599		3512
3600	if (nargs == 0)	3513	if (nargs == 0)
3601	return;	3514	return;
3602		3515
3603	switch (args[0])	3516	switch (args[0])
3604	{	3517	{
3605	/*	3518	/*
3606	* commands	3519	* commands
3607	*/	3520	*/
3608	case 1: /* deiconify window */	3521	case 1: /* deiconify window */
3609	XMapWindow (disp, parent[0]);	3522	XMapWindow (xdisp, parent[0]);
3610	break;	3523	break;
3611	case 2: /* iconify window */	3524	case 2: /* iconify window */
3612	XIconifyWindow (disp, parent[0], display->screen);	3525	XIconifyWindow (xdisp, parent[0], display->screen);
3613	break;	3526	break;
3614	case 3: /* set position (pixels) */	3527	case 3: /* set position (pixels) */
3615	XMoveWindow (disp, parent[0], args[1], args[2]);	3528	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3616	break;	3529	break;
3617	case 4: /* set size (pixels) */	3530	case 4: /* set size (pixels) */
3618	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3531	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3619	break;	3532	break;
3620	case 5: /* raise window */	3533	case 5: /* raise window */
3621	XRaiseWindow (disp, parent[0]);	3534	XRaiseWindow (xdisp, parent[0]);
3622	break;	3535	break;
3623	case 6: /* lower window */	3536	case 6: /* lower window */
3624	XLowerWindow (disp, parent[0]);	3537	XLowerWindow (xdisp, parent[0]);
3625	break;	3538	break;
3626	case 7: /* refresh window */	3539	case 7: /* refresh window */
3627	scr_touch (true);	3540	scr_touch (true);
3628	break;	3541	break;
3629	case 8: /* set size (chars) */	3542	case 8: /* set size (chars) */
…		…
3636	if (args[0] >= 24) /* set height (chars) */	3549	if (args[0] >= 24) /* set height (chars) */
3637	set_widthheight ((unsigned int)width,	3550	set_widthheight ((unsigned int)width,
3638	(unsigned int) (args[1] * fheight));	3551	(unsigned int) (args[1] * fheight));
3639	break;	3552	break;
3640		3553
3641
3642	/*	3554	/*
3643	* reports - some output format copied from XTerm	3555	* reports - some output format copied from XTerm
3644	*/	3556	*/
3645	case 11: /* report window state */	3557	case 11: /* report window state */
3646	XGetWindowAttributes (disp, parent[0], &wattr);	3558	XGetWindowAttributes (xdisp, parent[0], &wattr);
3647	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3559	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3648	break;	3560	break;
3649	case 13: /* report window position */	3561	case 13: /* report window position */
3650	XGetWindowAttributes (disp, parent[0], &wattr);	3562	XGetWindowAttributes (xdisp, parent[0], &wattr);
3651	XTranslateCoordinates (disp, parent[0], wattr.root,	3563	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3652	-wattr.border_width, -wattr.border_width,	3564	-wattr.border_width, -wattr.border_width,
3653	&x, &y, &wdummy);	3565	&x, &y, &wdummy);
3654	tt_printf ("\033[3;%d;%dt", x, y);	3566	tt_printf ("\033[3;%d;%dt", x, y);
3655	break;	3567	break;
3656	case 14: /* report window size (pixels) */	3568	case 14: /* report window size (pixels) */
3657	XGetWindowAttributes (disp, parent[0], &wattr);	3569	XGetWindowAttributes (xdisp, parent[0], &wattr);
3658	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3570	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3659	break;	3571	break;
3660	case 18: /* report text area size (chars) */	3572	case 18: /* report text area size (chars) */
3661	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3573	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3662	break;	3574	break;
…		…
3664	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3576	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3665	break;	3577	break;
3666	case 20: /* report icon label */	3578	case 20: /* report icon label */
3667	{	3579	{
3668	char *s;	3580	char *s;
3669	XGetIconName (disp, parent[0], &s);	3581	XGetIconName (xdisp, parent[0], &s);
3670	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3582	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3671	XFree (s);	3583	XFree (s);
3672	}	3584	}
3673	break;	3585	break;
3674	case 21: /* report window title */	3586	case 21: /* report window title */
3675	{	3587	{
3676	char *s;	3588	char *s;
3677	XFetchName (disp, parent[0], &s);	3589	XFetchName (xdisp, parent[0], &s);
3678	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3590	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3679	XFree (s);	3591	XFree (s);
3680	}	3592	}
3681	break;	3593	break;
3682	}	3594	}
…		…
3783	void	3695	void
3784	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3696	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3785	{	3697	{
3786	if (str[0] == '?' && !str[1])	3698	if (str[0] == '?' && !str[1])
3787	{	3699	{
3788	unsigned short r, g, b;	3700	rgba c;
3789	pix_colors_focused[color].get (display, r, g, b);	3701	pix_colors_focused[color].get (c);
		3702
		3703	#if XFT
		3704	if (c.a != rgba::MAX_CC)
		3705	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3706	else
		3707	#endif
3790	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3708	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3791	}	3709	}
3792	else	3710	else
3793	set_window_color (color, str);	3711	set_window_color (color, str);
3794	}	3712	}
3795		3713
…		…
3797	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3715	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3798	*/	3716	*/
3799	void	3717	void
3800	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3718	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3801	{	3719	{
3802	int changed = 0;
3803	int color;	3720	int color;
3804	char buf, name;	3721	char buf, name;
3805	bool query = str[0] == '?' && !str[1];	3722	bool query = str[0] == '?' && !str[1];
3806	int saveop = op;	3723	int saveop = op;
3807	dDisp;	3724
		3725	dLocal (Display *, xdisp);
3808		3726
3809	assert (str != NULL);	3727	assert (str != NULL);
3810	switch (op)	3728	switch (op)
3811	{	3729	{
3812	case XTerm_name:	3730	case XTerm_name:
…		…
3828	unsigned long bytes_after;	3746	unsigned long bytes_after;
3829	unsigned char *value = 0;	3747	unsigned char *value = 0;
3830	const char *str = "";	3748	const char *str = "";
3831		3749
3832	if (prop	3750	if (prop
3833	&& XGetWindowProperty (disp, parent[0],	3751	&& XGetWindowProperty (xdisp, parent[0],
3834	prop, 0, 1<<16, 0, AnyPropertyType,	3752	prop, 0, 1<<16, 0, AnyPropertyType,
3835	&actual_type, &actual_format,	3753	&actual_type, &actual_format,
3836	&nitems, &bytes_after, &value) == Success	3754	&nitems, &bytes_after, &value) == Success
3837	&& actual_type != None	3755	&& actual_type != None
3838	&& actual_format == 8)	3756	&& actual_format == 8)
3839	str = (const char *)(value);	3757	str = (const char *)(value);
3840		3758
3841	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3759	tt_printf ("\033]%d;%s%c", op, str, resp);
3842		3760
3843	XFree (value);	3761	XFree (value);
3844	}	3762	}
3845	else	3763	else
3846	{	3764	{
…		…
3850	{	3768	{
3851	*eq = 0;	3769	*eq = 0;
3852	set_utf8_property (display->atom (str), eq + 1);	3770	set_utf8_property (display->atom (str), eq + 1);
3853	}	3771	}
3854	else	3772	else
3855	XDeleteProperty (disp, parent[0],	3773	XDeleteProperty (xdisp, parent[0],
3856	display->atom (str));	3774	display->atom (str));
3857	}	3775	}
3858	break;	3776	break;
3859		3777
3860	case XTerm_Color:	3778	case XTerm_Color:
…		…
3870	break;	3788	break;
3871		3789
3872	if ((buf = strchr (name, ';')) != NULL)	3790	if ((buf = strchr (name, ';')) != NULL)
3873	*buf++ = '\0';	3791	*buf++ = '\0';
3874		3792
3875	if (name[0] == '?' && !name[1])	3793	process_color_seq (op, color, name, resp);
3876	{
3877	unsigned short r, g, b;
3878	pix_colors_focused[color].get (display, r, g, b);
3879	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3880	}
3881	else
3882	set_window_color (color, name);
3883	}	3794	}
3884	break;	3795	break;
3885	case XTerm_Color00:	3796	case XTerm_Color00:
3886	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3797	process_color_seq (op, Color_fg, str, resp);
3887	break;	3798	break;
3888	case XTerm_Color01:	3799	case XTerm_Color01:
3889	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3800	process_color_seq (op, Color_bg, str, resp);
3890	break;	3801	break;
3891	#ifndef NO_CURSORCOLOR	3802	#ifndef NO_CURSORCOLOR
3892	case XTerm_Color_cursor:	3803	case XTerm_Color_cursor:
3893	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3804	process_color_seq (op, Color_cursor, str, resp);
3894	break;	3805	break;
3895	#endif	3806	#endif
3896	case XTerm_Color_pointer_fg:	3807	case XTerm_Color_pointer_fg:
3897	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3808	process_color_seq (op, Color_pointer_fg, str, resp);
3898	break;	3809	break;
3899	case XTerm_Color_pointer_bg:	3810	case XTerm_Color_pointer_bg:
3900	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3811	process_color_seq (op, Color_pointer_bg, str, resp);
3901	break;	3812	break;
3902	#ifndef NO_BOLD_UNDERLINE_REVERSE	3813	#ifndef NO_BOLD_UNDERLINE_REVERSE
3903	case XTerm_Color_RV:	3814	case XTerm_Color_RV:
3904	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3815	process_color_seq (op, Color_RV, str, resp);
3905	break;	3816	break;
3906	case Rxvt_Color_BD:	3817	case Rxvt_Color_BD:
3907	case URxvt_Color_BD:	3818	case URxvt_Color_BD:
3908	process_color_seq (op, Color_BD, str, resp);	3819	process_color_seq (op, Color_BD, str, resp);
3909	break;	3820	break;
3910	case Rxvt_Color_UL:	3821	case Rxvt_Color_UL:
3911	case URxvt_Color_UL:	3822	case URxvt_Color_UL:
3912	process_color_seq (op, Color_UL, str, resp);	3823	process_color_seq (op, Color_UL, str, resp);
3913	break;	3824	break;
3914	case URxvt_Color_IT:	3825	case URxvt_Color_IT:
3915	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3826	process_color_seq (op, Color_IT, str, resp);
3916	break;	3827	break;
3917	#endif	3828	#endif
3918	#if TRANSPARENT && TINTING	3829	#if TRANSPARENT && TINTING
3919	case URxvt_Color_tint:	3830	case URxvt_Color_tint:
3920	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3831	process_color_seq (op, Color_tint, str, resp);
		3832
3921	check_our_parents ();	3833	check_our_parents ();
		3834
3922	if (am_transparent)	3835	if (am_transparent)
3923	want_full_refresh = want_refresh = 1;	3836	want_full_refresh = want_refresh = 1;
		3837
3924	break;	3838	break;
3925	#endif	3839	#endif
3926		3840
3927	case Rxvt_Pixmap:	3841	case Rxvt_Pixmap:
		3842	{
3928	if (*str != ';')	3843	if (*str != ';')
3929	{	3844	{
3930	#if XPM_BACKGROUND	3845	#if XPM_BACKGROUND
3931	scale_pixmap (""); /* reset to default scaling */	3846	scale_pixmap (""); /* reset to default scaling */
3932	set_bgPixmap (str); /* change pixmap */	3847	set_bgPixmap (str); /* change pixmap */
3933	scr_touch (true);	3848	scr_touch (true);
3934	#endif	3849	#endif
3935	}	3850	}
3936		3851
		3852	int changed = 0;
		3853
3937	while ((str = strchr (str, ';')) != NULL)	3854	while ((str = strchr (str, ';')) != NULL)
3938	{	3855	{
3939	str++;	3856	str++;
3940	#if XPM_BACKGROUND	3857	#if XPM_BACKGROUND
3941	changed += scale_pixmap (str);	3858	changed += scale_pixmap (str);
3942	#endif	3859	#endif
3943	}	3860	}
3944		3861
3945	if (changed)	3862	if (changed)
3946	{	3863	{
3947	#ifdef XPM_BACKGROUND	3864	#ifdef XPM_BACKGROUND
3948	resize_pixmap ();	3865	resize_pixmap ();
3949	scr_touch (true);	3866	scr_touch (true);
3950	#endif	3867	#endif
3951	}	3868	}
		3869	}
3952	break;	3870	break;
3953		3871
3954	case Rxvt_restoreFG:	3872	case Rxvt_restoreFG:
3955	set_window_color (Color_fg, str);	3873	set_window_color (Color_fg, str);
3956	break;	3874	break;
…		…
3960		3878
3961	case XTerm_logfile:	3879	case XTerm_logfile:
3962	// TODO, when secure mode?	3880	// TODO, when secure mode?
3963	break;	3881	break;
3964		3882
3965	#ifdef MENUBAR
3966	case URxvt_Menu:
3967	if (OPTION (Opt_insecure))
3968	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969	break;
3970	#endif
3971	#if 0	3883	#if 0
3972	case Rxvt_dumpscreen: /* no error notices */	3884	case Rxvt_dumpscreen: /* no error notices */
3973	{	3885	{
3974	int fd;	3886	int fd;
3975	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3887	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
…		…
4001	allocated.push_back ((void *)res);	3913	allocated.push_back ((void *)res);
4002	set_fonts ();	3914	set_fonts ();
4003	}	3915	}
4004	break;	3916	break;
4005		3917
4006	#if ENABLE_FRILLS	3918	case URxvt_version:
		3919	if (query)
		3920	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3921	op,
		3922	rs[Rs_name], VERSION[0], VERSION[2],
		3923	resp);
		3924	break;
		3925
		3926	#if !ENABLE_MINIMAL
4007	case URxvt_locale:	3927	case URxvt_locale:
4008	if (query)	3928	if (query)
4009	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3929	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4010	else	3930	else
4011	{	3931	{
4012	set_locale (str);	3932	set_locale (str);
4013	pty.set_utf8_mode (enc_utf8);	3933	pty->set_utf8_mode (enc_utf8);
4014	init_xlocale ();	3934	init_xlocale ();
4015	}	3935	}
4016	break;	3936	break;
4017		3937
4018	case URxvt_view_up:	3938	case URxvt_view_up:
…		…
4071	return state;	3991	return state;
4072	}	3992	}
4073		3993
4074	/* we're not using priv _yet_ */	3994	/* we're not using priv _yet_ */
4075	void	3995	void
4076	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	3996	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4077	{	3997	{
4078	unsigned int i, j;	3998	unsigned int i, j;
4079	int state;	3999	int state;
4080		4000
4081	static const struct	4001	static const struct
…		…
4092	{ 5, PrivMode_rVideo },	4012	{ 5, PrivMode_rVideo },
4093	{ 6, PrivMode_relOrigin },	4013	{ 6, PrivMode_relOrigin },
4094	{ 7, PrivMode_Autowrap },	4014	{ 7, PrivMode_Autowrap },
4095	// 8, bi-directional support mode	4015	// 8, bi-directional support mode
4096	{ 9, PrivMode_MouseX10 },	4016	{ 9, PrivMode_MouseX10 },
4097	#ifdef menuBar_esc
4098	{ menuBar_esc, PrivMode_menuBar },
4099	#endif
4100	// 18, 19 printing-related	4017	// 18, 19 printing-related
4101	{ 25, PrivMode_VisibleCursor },	4018	{ 25, PrivMode_VisibleCursor },
4102	#ifdef scrollBar_esc	4019	#ifdef scrollBar_esc
4103	{ scrollBar_esc, PrivMode_scrollBar },	4020	{ scrollBar_esc, PrivMode_scrollBar },
4104	#endif	4021	#endif
…		…
4199	/* case 8: - auto repeat, can't do on a per window basis */	4116	/* case 8: - auto repeat, can't do on a per window basis */
4200	case 9: /* X10 mouse reporting */	4117	case 9: /* X10 mouse reporting */
4201	if (state) /* orthogonal */	4118	if (state) /* orthogonal */
4202	priv_modes &= ~PrivMode_MouseX11;	4119	priv_modes &= ~PrivMode_MouseX11;
4203	break;	4120	break;
4204	#ifdef menuBar_esc
4205	case menuBar_esc:
4206	#ifdef MENUBAR
4207	map_menuBar (state);
4208	#endif
4209	break;
4210	#endif
4211	#ifdef scrollBar_esc	4121	#ifdef scrollBar_esc
4212	case scrollBar_esc:	4122	case scrollBar_esc:
4213	if (scrollbar_mapping (state))	4123	if (scrollbar_mapping (state))
4214	{	4124	{
4215	resize_all_windows (0, 0, 0);	4125	resize_all_windows (0, 0, 0);
…		…
4385	scr_color (Color_bg, Color_bg);	4295	scr_color (Color_bg, Color_bg);
4386	break;	4296	break;
4387		4297
4388	//case 50: // not variable spacing	4298	//case 50: // not variable spacing
4389		4299
4390	#if ENABLE_FRILLS	4300	#if !ENABLE_MINIMAL
4391	case 90:	4301	case 90:
4392	case 91: /* set bright fg color */	4302	case 91: /* set bright fg color */
4393	case 92:	4303	case 92:
4394	case 93:	4304	case 93:
4395	case 94:	4305	case 94:
…		…
4460	rxvt_term::tt_write (const char *data, unsigned int len)	4370	rxvt_term::tt_write (const char *data, unsigned int len)
4461	{	4371	{
4462	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4372	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4463	return;	4373	return;
4464		4374
4465	if (pty.pty < 0)	4375	if (pty->pty < 0)
4466	return;	4376	return;
4467		4377
4468	if (v_buflen == 0)	4378	if (v_buflen == 0)
4469	{	4379	{
4470	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4380	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4471		4381
4472	if ((unsigned int)written == len)	4382	if ((unsigned int)written == len)
4473	return;	4383	return;
4474		4384
4475	data += written;	4385	data += written;
…		…
4484	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4394	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4485	}	4395	}
4486		4396
4487	void rxvt_term::pty_write ()	4397	void rxvt_term::pty_write ()
4488	{	4398	{
4489	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4399	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4490		4400
4491	if (written > 0)	4401	if (written > 0)
4492	{	4402	{
4493	v_buflen -= written;	4403	v_buflen -= written;
4494		4404

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.262 by root, Sun Jan 15 06:02:40 2006 UTC vs. Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.262 by root, Sun Jan 15 06:02:40 2006 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC