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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.249 by root, Sun Jan 8 01:02:15 2006 UTC vs.
Revision 1.283 by root, Tue Jan 24 19:40:12 2006 UTC

…		…
64		64
65	/----------------------------------------------------------------------/	65	/----------------------------------------------------------------------/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68		68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71
72	#if ENABLE_FRILLS \|\| ISO_14755	69	#if ENABLE_FRILLS \|\| ISO_14755
73		70
74	#define ISO_14755_STARTED 0x80000000UL	71	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	72	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)	73	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
…		…
147	\|\| !IN_RANGE_EXC (y, 0, nrow))	144	\|\| !IN_RANGE_EXC (y, 0, nrow))
148	return;	145	return;
149		146
150	for (;;)	147	for (;;)
151	{	148	{
152	const line_t &l = ROW(y - view_start);	149	const line_t &l = ROW(y + view_start);
153		150
154	text_t t = l.t[x];	151	text_t t = l.t[x];
155		152
156	if (t != NOCHAR \|\| !x)	153	if (t != NOCHAR \|\| !x)
157	{	154	{
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	299	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	300	{
304	int ctrl, meta, shft, len;	301	int ctrl, meta, shft, len;
305	unsigned int newlen;	302	unsigned int newlen;
306	KeySym keysym;	303	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	304	int valid_keysym;
311	char kbuf[KBUFSZ];	305	char kbuf[KBUFSZ];
312		306
313	/*	307	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	308	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
443	scr_move_to (0, 1);	437	scr_move_to (0, 1);
444	return;	438	return;
445	}	439	}
446	else if (keysym == XK_End)	440	else if (keysym == XK_End)
447	{	441	{
448	scr_move_to (1, 0);	442	scr_move_to (1, 1);
449	return;	443	return;
450	}	444	}
451	}	445	}
452	#endif	446	#endif
453	}	447	}
…		…
464	{	458	{
465	switch (keysym)	459	switch (keysym)
466	{	460	{
467	/* normal XTerm key bindings */	461	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	462	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	463	selection_request (ev.time);
470	return;	464	return;
471	#if TODO	465	#if TODO
472	/* rxvt extras */	466	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	467	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	468	change_font (FONT_UP);
…		…
867	#endif	861	#endif
868	/* nil */ ;	862	/* nil */ ;
869	}	863	}
870	}	864	}
871		865
872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))	866	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873	return;	867	return;
874		868
875	if (len <= 0)	869	if (len <= 0)
876	return; /* not mapped */	870	return; /* not mapped */
877		871
…		…
905	{	899	{
906	const char ch = C0_ESC;	900	const char ch = C0_ESC;
907	tt_write (&ch, 1);	901	tt_write (&ch, 1);
908	}	902	}
909		903
910	#if defined(DEBUG_CMD)
911	/* Display keyboard buffer contents */
912	unsigned char *p;
913	int i;
914
915	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916	for (i = 0, p = kbuf; i < len; i++, p++)
917	fprintf (stderr, (p >= ' ' && p < '\177' ? "%c" : "\\%03o"), *p);
918	fprintf (stderr, "'\n");
919	#endif /* DEBUG_CMD */
920	tt_write (kbuf, (unsigned int)len);	904	tt_write (kbuf, (unsigned int)len);
921	}	905	}
922	/}}} /	906	/}}} /
923		907
924	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	908	#if defined (KEYSYM_RESOURCE)
925	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
926	/* attempt to `write' count to the input buffer */
927	unsigned int	909	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	910	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	911	{
930	unsigned int n, s;	912	unsigned int n, s;
931		913
…		…
972		954
973	if (want_refresh)	955	if (want_refresh)
974	{	956	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	957	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	958	{
977	int row = -view_start;	959	int row = view_start;
		960	int end_row = row + nrow;
978		961
979	while (row > -nsaved && ROW (row - 1).is_longer ())	962	while (row > top_row && ROW (row - 1).is_longer ())
980	--row;	963	--row;
981		964
982	while (row < -view_start + nrow)	965	do
983	{	966	{
984	int start_row = row;	967	int start_row = row;
985	line_t *l;	968	line_t *l;
986		969
987	do	970	do
988	{	971	{
989	l = &ROW (row);	972	l = &ROW (row++);
990		973
991	if (!(l->f & LINE_FILTERED))	974	if (!(l->f & LINE_FILTERED))
992	{	975	{
993	// line not filtered, mark it as filtered	976	// line not filtered, mark it as filtered
994	l->f \|= LINE_FILTERED;	977	l->f \|= LINE_FILTERED;
995	while (l->is_longer ())	978	while (l->is_longer ())
996	{	979	{
997	l = &ROW (++row);	980	l = &ROW (row++);
998	l->f \|= LINE_FILTERED;	981	l->f \|= LINE_FILTERED;
999	}	982	}
1000		983
1001	// and filter it	984	// and filter it
1002	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	985	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003		986
1004	break;	987	break;
1005	}	988	}
1006	}	989	}
1007	while (l->is_longer ());	990	while (l->is_longer () && row < end_row);
1008
1009	row++;
1010	}	991	}
		992	while (row < end_row);
1011		993	}
1012	}
1013		994
1014	scr_refresh (refresh_type);	995	scr_refresh ();
1015	scrollbar_show (1);	996	scrollbar_show (1);
1016	#ifdef USE_XIM	997	#ifdef USE_XIM
1017	IMSendSpot ();	998	IMSendSpot ();
1018	#endif	999	#endif
1019	}	1000	}
…		…
1022	}	1003	}
1023		1004
1024	void	1005	void
1025	rxvt_term::check_cb (check_watcher &w)	1006	rxvt_term::check_cb (check_watcher &w)
1026	{	1007	{
1027	SET_R (this);	1008	make_current ();
1028	SET_LOCALE (locale);
1029		1009
1030	display->flush ();	1010	display->flush ();
1031		1011
1032	if (want_refresh && !flush_ev.active)	1012	if (want_refresh && !flush_ev.active)
1033	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1013	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034	}	1014	}
1035		1015
1036	void	1016	void
1037	rxvt_term::flush_cb (time_watcher &w)	1017	rxvt_term::flush_cb (time_watcher &w)
1038	{	1018	{
1039	SET_R (this);	1019	make_current ();
1040	SET_LOCALE (locale);
1041		1020
1042	refresh_limit = 1;	1021	refresh_limit = 1;
1043	refresh_count = 0;	1022	refresh_count = 0;
1044	flush ();	1023	flush ();
1045	}	1024	}
…		…
1049	rxvt_term::cursor_blink_cb (time_watcher &w)	1028	rxvt_term::cursor_blink_cb (time_watcher &w)
1050	{	1029	{
1051	hidden_cursor = !hidden_cursor;	1030	hidden_cursor = !hidden_cursor;
1052	want_refresh = 1;	1031	want_refresh = 1;
1053		1032
1054	w.start (w.at + BLINK_INTERVAL);	1033	w.start (w.at + CURSOR_BLINK_INTERVAL);
1055	}	1034	}
1056	#endif	1035	#endif
1057		1036
1058	#ifdef TEXT_BLINK	1037	#ifdef TEXT_BLINK
1059	void	1038	void
…		…
1073	rxvt_term::cont_scroll_cb (time_watcher &w)	1052	rxvt_term::cont_scroll_cb (time_watcher &w)
1074	{	1053	{
1075	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1054	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1076	scr_page (scrollbar_isUp() ? UP : DN, 1))	1055	scr_page (scrollbar_isUp() ? UP : DN, 1))
1077	{	1056	{
1078	refresh_type \|= SMOOTH_REFRESH;
1079	want_refresh = 1;	1057	want_refresh = 1;
1080	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1058	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081	}	1059	}
1082	}	1060	}
1083	#endif	1061	#endif
…		…
1087	rxvt_term::sel_scroll_cb (time_watcher &w)	1065	rxvt_term::sel_scroll_cb (time_watcher &w)
1088	{	1066	{
1089	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1067	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090	{	1068	{
1091	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1069	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092	refresh_type \|= SMOOTH_REFRESH;
1093	want_refresh = 1;	1070	want_refresh = 1;
1094	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1071	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095	}	1072	}
1096	}	1073	}
1097	#endif	1074	#endif
…		…
1102	{	1079	{
1103	if (mouse_slip_wheel_speed == 0	1080	if (mouse_slip_wheel_speed == 0
1104	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1081	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105	: scr_page (UP, mouse_slip_wheel_speed))	1082	: scr_page (UP, mouse_slip_wheel_speed))
1106	{	1083	{
1107	if (view_start == nsaved \|\|	1084	if (view_start == top_row \|\| view_start == 0)
1108	view_start == 0)
1109	mouse_slip_wheel_speed = 0;	1085	mouse_slip_wheel_speed = 0;
1110		1086
1111	refresh_type \|= SMOOTH_REFRESH;
1112	want_refresh = 1;	1087	want_refresh = 1;
1113	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1088	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114	}	1089	}
1115	}	1090	}
1116	#endif	1091	#endif
…		…
1146		1121
1147	memmove (cmdbuf_base, cmdbuf_ptr, n);	1122	memmove (cmdbuf_base, cmdbuf_ptr, n);
1148	cmdbuf_ptr = cmdbuf_base;	1123	cmdbuf_ptr = cmdbuf_base;
1149	cmdbuf_endp = cmdbuf_ptr + n;	1124	cmdbuf_endp = cmdbuf_ptr + n;
1150		1125
1151	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1126	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152		1127
1153	if (r > 0)	1128	if (r > 0)
1154	{	1129	{
1155	cmdbuf_endp += r;	1130	cmdbuf_endp += r;
1156	return true;	1131	return true;
…		…
1174	}	1149	}
1175		1150
1176	void	1151	void
1177	rxvt_term::pty_cb (io_watcher &w, short revents)	1152	rxvt_term::pty_cb (io_watcher &w, short revents)
1178	{	1153	{
1179	SET_R (this);	1154	make_current ();
1180	SET_LOCALE (locale);
1181		1155
1182	if (revents & EVENT_READ)	1156	if (revents & EVENT_READ)
1183	// loop, but don't allow a single term to monopolize us	1157	// loop, but don't allow a single term to monopolize us
1184	while (pty_fill ())	1158	while (pty_fill ())
1185	if (cmd_parse ())	1159	if (cmd_parse ())
…		…
1217	}	1191	}
1218		1192
1219	void	1193	void
1220	rxvt_term::pointer_cb (time_watcher &w)	1194	rxvt_term::pointer_cb (time_watcher &w)
1221	{	1195	{
1222	SET_R (this);	1196	make_current ();
1223	SET_LOCALE (locale);
1224		1197
1225	pointer_blank ();	1198	pointer_blank ();
1226	}	1199	}
1227	#endif	1200	#endif
1228		1201
…		…
1307		1280
1308	/{{{ process an X event /	1281	/{{{ process an X event /
1309	void	1282	void
1310	rxvt_term::x_cb (XEvent &ev)	1283	rxvt_term::x_cb (XEvent &ev)
1311	{	1284	{
		1285	make_current ();
		1286
1312	dDisp;	1287	dDisp;
1313		1288
1314	SET_R (this);	1289	if (ev.xany.window == vt
1315	SET_LOCALE (locale);	1290	&& SHOULD_INVOKE (HOOK_X_EVENT)
		1291	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
		1292	return;
1316		1293
		1294	// for XQueryPointer
1317	Window unused_root, unused_child;	1295	Window unused_root, unused_child;
1318	int unused_root_x, unused_root_y;	1296	int unused_root_x, unused_root_y;
1319	unsigned int unused_mask;	1297	unsigned int unused_mask;
1320		1298
1321	switch (ev.type)	1299	switch (ev.type)
…		…
1328		1306
1329	break;	1307	break;
1330		1308
1331	case KeyRelease:	1309	case KeyRelease:
1332	{	1310	{
1333	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1311	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1334	KeySym ks;	1312	KeySym keysym;
1335		1313
1336	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1314	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1337	#endif	1315	#endif
1338		1316
1339	#if ENABLE_FRILLS \|\| ISO_14755	1317	#if ENABLE_FRILLS \|\| ISO_14755
1340	// ISO 14755 support	1318	// ISO 14755 support
1341	if (iso14755buf)	1319	if (iso14755buf)
…		…
1346	# endif	1324	# endif
1347	# if ISO_14755	1325	# if ISO_14755
1348	// iso14755 part 5.2 handling: release time	1326	// iso14755 part 5.2 handling: release time
1349	// first: controls	1327	// first: controls
1350	if ((ev.xkey.state & ControlMask)	1328	if ((ev.xkey.state & ControlMask)
1351	&& ((ks >= 0x40 && ks <= 0x5f)	1329	&& ((keysym >= 0x40 && keysym <= 0x5f)
1352	\|\| (ks >= 0x61 && ks <= 0x7f)))	1330	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1353	{	1331	{
1354	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1332	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1355	commit_iso14755 ();	1333	commit_iso14755 ();
1356	goto skip_switch;	1334	goto skip_switch;
1357	}	1335	}
1358		1336
1359	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1337	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1360	if (i[0] == ks)	1338	if (i[0] == keysym)
1361	{	1339	{
1362	iso14755buf = ISO_14755_51 \| i[1];	1340	iso14755buf = ISO_14755_51 \| i[1];
1363	commit_iso14755 ();	1341	commit_iso14755 ();
1364	goto skip_switch;	1342	goto skip_switch;
1365	}	1343	}
…		…
1389	iso14755buf = 0;	1367	iso14755buf = 0;
1390	}	1368	}
1391	#endif	1369	#endif
1392		1370
1393	if (ev.xany.window == vt	1371	if (ev.xany.window == vt
1394	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))	1372	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1395	break;	1373	break;
1396		1374
1397	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1375	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1398	if (!(ev.xkey.state & ControlMask))	1376	if (!(ev.xkey.state & ControlMask))
1399	slip_wheel_ev.stop ();	1377	slip_wheel_ev.stop ();
1400	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1378	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1401	mouse_slip_wheel_speed = 0;	1379	mouse_slip_wheel_speed = 0;
1402	#endif	1380	#endif
1403	break;	1381	break;
1404	}	1382	}
1405		1383
…		…
1411	button_release (ev.xbutton);	1389	button_release (ev.xbutton);
1412	break;	1390	break;
1413		1391
1414	case ClientMessage:	1392	case ClientMessage:
1415	if (ev.xclient.format == 32	1393	if (ev.xclient.format == 32
1416	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1394	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1417	{	1395	{
		1396	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1397	{
		1398	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1399	{
1418	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1400	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1401	{
		1402	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1419	destroy ();	1403	destroy ();
		1404	}
1420	#if ENABLE_EWMH	1405	#if ENABLE_EWMH
1421	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1406	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1422	XSendEvent (disp, ev.xclient.window = display->root,	1407	XSendEvent (disp, ev.xclient.window = display->root,
1423	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1408	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1424	&ev);	1409	&ev);
		1410	#endif
		1411	}
		1412	}
		1413	#if ENABLE_XEMBED
		1414	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1415	{
		1416	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1417	focus_in ();
		1418	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1419	focus_out ();
		1420	}
1425	#endif	1421	#endif
1426	}	1422	}
1427	#if ENABLE_XEMBED
1428	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1429	{
1430	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431	focus_in ();
1432	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433	focus_out ();
1434	}
1435	#endif
1436	#ifdef OFFIX_DND
1437	/* OffiX Dnd (drag 'n' drop) protocol */
1438	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1439	&& (ev.xclient.data.l[0] == DndFile
1440	\|\| ev.xclient.data.l[0] == DndDir
1441	\|\| ev.xclient.data.l[0] == DndLink))
1442	{
1443	/* Get Dnd data */
1444	Atom ActualType;
1445	int ActualFormat;
1446	unsigned char *data;
1447	unsigned long Size, RemainingBytes;
1448
1449	XGetWindowProperty (disp, display->root,
1450	xa[XA_DNDSELECTION],
1451	0L, 1000000L,
1452	False, AnyPropertyType,
1453	&ActualType, &ActualFormat,
1454	&Size, &RemainingBytes,
1455	&data);
1456	set_string_property (XA_CUT_BUFFER0, data);
1457	XFree (data);
1458	selection_paste (display->root, XA_CUT_BUFFER0, true);
1459	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1460	}
1461	#endif /* OFFIX_DND */
1462	break;	1423	break;
1463		1424
1464	case MappingNotify:	1425	case MappingNotify:
1465	XRefreshKeyboardMapping (&ev.xmapping);	1426	XRefreshKeyboardMapping (&ev.xmapping);
1466	break;	1427	break;
…		…
1508	{	1469	{
1509	seen_resize = 1;	1470	seen_resize = 1;
1510	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1471	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1511	}	1472	}
1512		1473
		1474	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1475
1513	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1476	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1514	if (OPTION (Opt_transparent))	1477	if (OPTION (Opt_transparent))
1515	check_our_parents ();	1478	check_our_parents ();
1516	#endif	1479	#endif
1517	}	1480	}
1518	break;	1481	break;
1519		1482
1520	case PropertyNotify:	1483	case PropertyNotify:
		1484	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1521	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1485	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1522	&& ev.xproperty.state == PropertyNewValue)	1486	&& ev.xproperty.state == PropertyNewValue)
1523	selection_property (ev.xproperty.window, ev.xproperty.atom);	1487	selection_property (ev.xproperty.window, ev.xproperty.atom);
1524		1488
1525	break;	1489	break;
1526		1490
1527	case SelectionClear:	1491	case SelectionClear:
1528	selection_clear ();	1492	selection_clear ();
…		…
1572		1536
1573	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1537	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1574	scr_expose (ev.xexpose.x, ev.xexpose.y,	1538	scr_expose (ev.xexpose.x, ev.xexpose.y,
1575	ev.xexpose.width, ev.xexpose.height, False);	1539	ev.xexpose.width, ev.xexpose.height, False);
1576		1540
1577	scr_refresh (refresh_type);	1541	want_refresh = 1;
1578	}	1542	}
1579	else	1543	else
1580	{	1544	{
1581	XEvent unused_event;	1545	XEvent unused_event;
1582		1546
…		…
1588	if (isScrollbarWindow (ev.xany.window))	1552	if (isScrollbarWindow (ev.xany.window))
1589	{	1553	{
1590	scrollBar.setIdle ();	1554	scrollBar.setIdle ();
1591	scrollbar_show (0);	1555	scrollbar_show (0);
1592	}	1556	}
1593	#ifdef MENUBAR
1594	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1595	menubar_expose ();
1596	#endif
1597		1557
1598	#ifdef TRANSPARENT	1558	#ifdef TRANSPARENT
1599	if (am_transparent && ev.xany.window == parent[0])	1559	if (am_transparent && ev.xany.window == parent[0])
1600	XClearWindow (disp, ev.xany.window);	1560	XClearWindow (disp, ev.xany.window);
1601	#endif	1561	#endif
…		…
1605	case MotionNotify:	1565	case MotionNotify:
1606	#ifdef POINTER_BLANK	1566	#ifdef POINTER_BLANK
1607	if (hidden_pointer)	1567	if (hidden_pointer)
1608	pointer_unblank ();	1568	pointer_unblank ();
1609	#endif	1569	#endif
1610	#if MENUBAR
1611	if (isMenuBarWindow (ev.xany.window))
1612	{
1613	menubar_control (ev.xbutton);
1614	break;
1615	}
1616	#endif
1617	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1570	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1618	break;	1571	break;
1619		1572
1620	if (ev.xany.window == vt)	1573	if (ev.xany.window == vt)
1621	{	1574	{
		1575	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1576	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623	; // nop	1577	; // nop
1624	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1578	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1625	{	1579	{
1626	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1580	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1627	;	1581	;
…		…
1709	&unused_root_x, &unused_root_y,	1663	&unused_root_x, &unused_root_y,
1710	&ev.xbutton.x, &ev.xbutton.y,	1664	&ev.xbutton.x, &ev.xbutton.y,
1711	&unused_mask);	1665	&unused_mask);
1712	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1666	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1713	scrollbar_size ());	1667	scrollbar_size ());
1714	scr_refresh (refresh_type);	1668	want_refresh = 1;
1715	refresh_limit = 0;	1669	refresh_limit = 0;
1716	scrollbar_show (1);	1670	scrollbar_show (1);
1717	}	1671	}
1718	break;	1672	break;
1719	}	1673	}
…		…
1727	{	1681	{
1728	hidden_cursor = 0;	1682	hidden_cursor = 0;
1729	want_refresh = 1;	1683	want_refresh = 1;
1730	}	1684	}
1731		1685
1732	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1686	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733	}	1687	}
1734	#endif	1688	#endif
1735		1689
1736	#if defined(POINTER_BLANK)	1690	#if defined(POINTER_BLANK)
1737	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1691	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1765	XSetICFocus (Input_Context);	1719	XSetICFocus (Input_Context);
1766	}	1720	}
1767	#endif	1721	#endif
1768	#if CURSOR_BLINK	1722	#if CURSOR_BLINK
1769	if (OPTION (Opt_cursorBlink))	1723	if (OPTION (Opt_cursorBlink))
1770	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1724	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1771	#endif	1725	#endif
1772	#if OFF_FOCUS_FADING	1726	#if OFF_FOCUS_FADING
1773	if (rs[Rs_fade])	1727	if (rs[Rs_fade])
1774	{	1728	{
1775	pix_colors = pix_colors_focused;	1729	pix_colors = pix_colors_focused;
…		…
1819		1773
1820	#if TRANSPARENT	1774	#if TRANSPARENT
1821	void	1775	void
1822	rxvt_term::rootwin_cb (XEvent &ev)	1776	rxvt_term::rootwin_cb (XEvent &ev)
1823	{	1777	{
1824	SET_R (this);	1778	make_current ();
1825	SET_LOCALE (locale);
1826		1779
1827	switch (ev.type)	1780	switch (ev.type)
1828	{	1781	{
1829	case PropertyNotify:	1782	case PropertyNotify:
1830	/*	1783	/*
…		…
1857	/*	1810	/*
1858	* VT window processing of button press	1811	* VT window processing of button press
1859	*/	1812	*/
1860	if (ev.window == vt)	1813	if (ev.window == vt)
1861	{	1814	{
		1815	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1816	return;
		1817
1862	#if ISO_14755	1818	#if ISO_14755
1863	// 5.4	1819	// 5.4
1864	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1820	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1865	{	1821	{
1866	iso14755_54 (ev.x, ev.y);	1822	iso14755_54 (ev.x, ev.y);
…		…
1908	else	1864	else
1909	{	1865	{
1910	if (ev.button != MEvent.button)	1866	if (ev.button != MEvent.button)
1911	MEvent.clicks = 0;	1867	MEvent.clicks = 0;
1912		1868
1913	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1914	switch (ev.button)	1869	switch (ev.button)
1915	{	1870	{
1916	case Button1:	1871	case Button1:
1917	/* allow meta + click to select rectangular areas */	1872	/* allow meta + click to select rectangular areas */
1918	/* should be done in screen.C */	1873	/* should be done in screen.C */
1919	#if ENABLE_FRILLS	1874	#if ENABLE_FRILLS
1920	selection.rect = !!(ev.state & ModMetaMask);	1875	selection.rect = !!(ev.state & ModMetaMask);
1921	#else	1876	#else
1922	selection.rect = false;	1877	selection.rect = false;
1923	#endif	1878	#endif
1924		1879
1925	/* allow shift+left click to extend selection */	1880	/* allow shift+left click to extend selection */
1926	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1881	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1927	{	1882	{
1928	if (MEvent.button == Button1 && clickintime)	1883	if (MEvent.button == Button1 && clickintime)
1929	selection_rotate (ev.x, ev.y);	1884	selection_rotate (ev.x, ev.y);
1930	else	1885	else
1931	selection_extend (ev.x, ev.y, 1);	1886	selection_extend (ev.x, ev.y, 1);
1932	}	1887	}
1933	else	1888	else
1934	{	1889	{
1935	if (MEvent.button == Button1 && clickintime)	1890	if (MEvent.button == Button1 && clickintime)
1936	MEvent.clicks++;	1891	MEvent.clicks++;
1937	else	1892	else
1938	MEvent.clicks = 1;	1893	MEvent.clicks = 1;
1939		1894
1940	selection_click (MEvent.clicks, ev.x, ev.y);	1895	selection_click (MEvent.clicks, ev.x, ev.y);
1941	}	1896	}
1942		1897
1943	MEvent.button = Button1;	1898	MEvent.button = Button1;
1944	break;	1899	break;
1945		1900
1946	case Button3:	1901	case Button3:
1947	if (MEvent.button == Button3 && clickintime)	1902	if (MEvent.button == Button3 && clickintime)
1948	selection_rotate (ev.x, ev.y);	1903	selection_rotate (ev.x, ev.y);
1949	else	1904	else
1950	selection_extend (ev.x, ev.y, 1);	1905	selection_extend (ev.x, ev.y, 1);
1951		1906
1952	MEvent.button = Button3;	1907	MEvent.button = Button3;
1953	break;	1908	break;
1954	}	1909	}
1955	}	1910	}
1956		1911
1957	MEvent.time = ev.time;	1912	MEvent.time = ev.time;
1958	return;	1913	return;
1959	}	1914	}
1960		1915
…		…
2099	}	2054	}
2100	}	2055	}
2101		2056
2102	return;	2057	return;
2103	}	2058	}
2104
2105	#if MENUBAR
2106	/*
2107	* Menubar window processing of button press
2108	*/
2109	if (isMenuBarWindow (ev.window))
2110	menubar_control (ev);
2111	#endif
2112	}	2059	}
2113		2060
2114	void	2061	void
2115	rxvt_term::button_release (XButtonEvent &ev)	2062	rxvt_term::button_release (XButtonEvent &ev)
2116	{	2063	{
…		…
2122		2069
2123	if (scrollbar_isUpDn ())	2070	if (scrollbar_isUpDn ())
2124	{	2071	{
2125	scrollBar.setIdle ();	2072	scrollBar.setIdle ();
2126	scrollbar_show (0);	2073	scrollbar_show (0);
2127	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2128	refresh_type &= ~SMOOTH_REFRESH;
2129	#endif
2130	}	2074	}
2131		2075
2132	#ifdef SELECTION_SCROLLING	2076	#ifdef SELECTION_SCROLLING
2133	if (sel_scroll_ev.active)	2077	if (sel_scroll_ev.active)
2134	sel_scroll_ev.stop();	2078	sel_scroll_ev.stop();
2135	#endif	2079	#endif
2136		2080
2137	if (ev.window == vt)	2081	if (ev.window == vt)
2138	{	2082	{
		2083	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2084	return;
		2085
2139	#if ISO_14755	2086	#if ISO_14755
2140	// 5.4	2087	// 5.4
2141	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2088	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2142	return;	2089	return;
2143	#endif	2090	#endif
		2091
2144	if (reportmode)	2092	if (reportmode)
2145	{	2093	{
2146	/* mouse report from vt window */	2094	/* mouse report from vt window */
2147	/* don't report release of wheel "buttons" */	2095	/* don't report release of wheel "buttons" */
2148	if (ev.button >= 4)	2096	if (ev.button >= 4)
…		…
2172	if (priv_modes & PrivMode_mouse_report	2120	if (priv_modes & PrivMode_mouse_report
2173	&& bypass_keystate	2121	&& bypass_keystate
2174	&& ev.button == Button1 && MEvent.clicks <= 1)	2122	&& ev.button == Button1 && MEvent.clicks <= 1)
2175	selection_extend (ev.x, ev.y, 0);	2123	selection_extend (ev.x, ev.y, 0);
2176		2124
2177	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2178	return;
2179
2180	switch (ev.button)	2125	switch (ev.button)
2181	{	2126	{
2182	case Button1:	2127	case Button1:
2183	case Button3:	2128	case Button3:
2184	selection_make (ev.time);	2129	selection_make (ev.time);
2185	break;	2130	break;
		2131
2186	case Button2:	2132	case Button2:
2187	selection_request (ev.time, ev.x, ev.y);	2133	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2134	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2188	break;	2135	break;
		2136
2189	#ifdef MOUSE_WHEEL	2137	#ifdef MOUSE_WHEEL
2190	case Button4:	2138	case Button4:
2191	case Button5:	2139	case Button5:
2192	{	2140	{
2193	int i;	2141	int i;
…		…
2215	slip_wheel_ev.start ();	2163	slip_wheel_ev.start ();
2216	}	2164	}
2217	else	2165	else
2218	{	2166	{
2219	# endif	2167	# endif
2220	# ifdef JUMP_MOUSE_WHEEL
2221	scr_page (v, i);	2168	scr_page (v, i);
2222	scr_refresh (SMOOTH_REFRESH);
2223	scrollbar_show (1);	2169	scrollbar_show (1);
2224	# else
2225	while (i--)
2226	{
2227	scr_page (v, 1);
2228	scr_refresh (SMOOTH_REFRESH);
2229	scrollbar_show (1);
2230	}
2231	# endif
2232	# ifdef MOUSE_SLIP_WHEELING	2170	# ifdef MOUSE_SLIP_WHEELING
2233	}	2171	}
2234	#endif	2172	# endif
2235	}	2173	}
2236	break;	2174	break;
2237	#endif	2175	#endif
2238	}	2176	}
2239	}	2177	}
2240	#ifdef MENUBAR
2241	else if (isMenuBarWindow (ev.window))
2242	menubar_control (ev);
2243	#endif
2244	}	2178	}
2245		2179
2246	#ifdef TRANSPARENT	2180	#ifdef TRANSPARENT
2247	#if TINTING	2181	#if TINTING
2248	/* taken from aterm-0.4.2 */	2182	/* taken from aterm-0.4.2 */
…		…
2685	am_transparent = 0;	2619	am_transparent = 0;
2686	/* XXX: also turn off Opt_transparent? */	2620	/* XXX: also turn off Opt_transparent? */
2687	}	2621	}
2688	else	2622	else
2689	{	2623	{
2690	#if WAIT_FOR_WM
2691	/* wait (an arbitrary period) for the WM to do its thing
2692	* needed for fvwm2.2.2 (and before?) */
2693	sleep (1);
2694	#endif
2695	for (n = 0; n < (unsigned int)i; n++)	2624	for (n = 0; n < (unsigned int)i; n++)
2696	{	2625	{
2697	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2626	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2698	XClearWindow (disp, parent[n]);	2627	XClearWindow (disp, parent[n]);
2699	}	2628	}
…		…
2791	}	2720	}
2792		2721
2793	// scr_add_lines only works for nlines <= nrow - 1.	2722	// scr_add_lines only works for nlines <= nrow - 1.
2794	if (nlines >= nrow - 1)	2723	if (nlines >= nrow - 1)
2795	{	2724	{
		2725	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2796	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2726	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2797	scr_add_lines (buf, str - buf, nlines);	2727	scr_add_lines (buf, str - buf, nlines);
2798		2728
2799	nlines = 0;	2729	nlines = 0;
2800	str = buf;	2730	str = buf;
2801	eol = str + min (ncol, UBUFSIZ);	2731	eol = str + min (ncol, UBUFSIZ);
…		…
2816		2746
2817	seq_begin = cmdbuf_ptr;	2747	seq_begin = cmdbuf_ptr;
2818	ch = next_char ();	2748	ch = next_char ();
2819	}	2749	}
2820		2750
		2751	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2821	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2752	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2822	scr_add_lines (buf, str - buf, nlines);	2753	scr_add_lines (buf, str - buf, nlines);
2823		2754
2824	/*	2755	/*
2825	* If there have been a lot of new lines, then update the screen	2756	* If there have been a lot of new lines, then update the screen
2826	* What the heck I'll cheat and only refresh less than every page-full.	2757	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2832	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2763	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2833	refresh_limit++;	2764	refresh_limit++;
2834	else	2765	else
2835	{	2766	{
2836	flag = true;	2767	flag = true;
2837	scr_refresh (refresh_type);	2768	scr_refresh ();
2838	flush_ev.stop ();	2769	want_refresh = 1;
2839	}	2770	}
2840	}	2771	}
2841		2772
2842	}	2773	}
2843	else	2774	else
…		…
2860	return flag;	2791	return flag;
2861	}	2792	}
2862		2793
2863	// read the next character	2794	// read the next character
2864	wchar_t	2795	wchar_t
2865	rxvt_term::next_char ()	2796	rxvt_term::next_char () NOTHROW
2866	{	2797	{
2867	while (cmdbuf_ptr < cmdbuf_endp)	2798	while (cmdbuf_ptr < cmdbuf_endp)
2868	{	2799	{
2869	// assume 7-bit to be ascii ALWAYS	2800	// assume 7-bit to be ascii ALWAYS
2870	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2801	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2891	return NOCHAR;	2822	return NOCHAR;
2892	}	2823	}
2893		2824
2894	// read the next octet	2825	// read the next octet
2895	uint32_t	2826	uint32_t
2896	rxvt_term::next_octet ()	2827	rxvt_term::next_octet () NOTHROW
2897	{	2828	{
2898	return cmdbuf_ptr < cmdbuf_endp	2829	return cmdbuf_ptr < cmdbuf_endp
2899	? (unsigned char)*cmdbuf_ptr++	2830	? (unsigned char)*cmdbuf_ptr++
2900	: NOCHAR;	2831	: NOCHAR;
2901	}	2832	}
		2833
		2834	static class out_of_input out_of_input;
2902		2835
2903	/* rxvt_cmd_getc () - Return next input character */	2836	/* rxvt_cmd_getc () - Return next input character */
2904	/*	2837	/*
2905	* Return the next input character after first passing any keyboard input	2838	* Return the next input character after first passing any keyboard input
2906	* to the command.	2839	* to the command.
2907	*/	2840	*/
2908	wchar_t	2841	wchar_t
2909	rxvt_term::cmd_getc ()	2842	rxvt_term::cmd_getc () THROW ((class out_of_input))
2910	{	2843	{
2911	wchar_t c = next_char ();	2844	wchar_t c = next_char ();
2912		2845
2913	if (c == NOCHAR)	2846	if (c == NOCHAR)
2914	throw out_of_input;	2847	throw out_of_input;
2915		2848
2916	return c;	2849	return c;
2917	}	2850	}
2918		2851
2919	uint32_t	2852	uint32_t
2920	rxvt_term::cmd_get8 ()	2853	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2921	{	2854	{
2922	uint32_t c = next_octet ();	2855	uint32_t c = next_octet ();
2923		2856
2924	if (c == NOCHAR)	2857	if (c == NOCHAR)
2925	throw out_of_input;	2858	throw out_of_input;
…		…
3346	ndef = get_byte_array_bit (csi_defaults, i);	3279	ndef = get_byte_array_bit (csi_defaults, i);
3347	for (p = 0; p < nargs; p++)	3280	for (p = 0; p < nargs; p++)
3348	if (arg[p] == -1)	3281	if (arg[p] == -1)
3349	arg[p] = ndef;	3282	arg[p] = ndef;
3350		3283
3351	#ifdef DEBUG_CMD
3352	fprintf (stderr, "CSI ");
3353	for (p = 0; p < nargs; p++)
3354	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3355	fprintf (stderr, "%c\n", ch);
3356	#endif
3357
3358	/*	3284	/*
3359	* private mode handling	3285	* private mode handling
3360	*/	3286	*/
3361	if (priv)	3287	if (priv)
3362	{	3288	{
3363	switch (priv)	3289	switch (priv)
3364	{	3290	{
3365	case '>':	3291	case '>':
3366	if (ch == CSI_DA) /* secondary device attributes */	3292	if (ch == CSI_DA) /* secondary device attributes */
		3293	{
		3294	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3295	// 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.
		3296	//
		3297	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3298	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3299	// that we do not support xterm mouse reporting (should be 95 when we do).
		3300	//
3367	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3301	tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);
		3302	}
3368	break;	3303	break;
3369	case '?':	3304	case '?':
3370	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3305	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3371	process_terminal_mode (ch, priv, nargs, arg);	3306	process_terminal_mode (ch, priv, nargs, arg);
3372	break;	3307	break;
…		…
3804	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3739	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3805	*/	3740	*/
3806	void	3741	void
3807	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3742	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3808	{	3743	{
3809	int changed = 0;
3810	int color;	3744	int color;
3811	char buf, name;	3745	char buf, name;
3812	bool query = str[0] == '?' && !str[1];	3746	bool query = str[0] == '?' && !str[1];
3813	int saveop = op;	3747	int saveop = op;
3814	dDisp;	3748	dDisp;
…		…
3869	{	3803	{
3870	if ((name = strchr (buf, ';')) == NULL)	3804	if ((name = strchr (buf, ';')) == NULL)
3871	break;	3805	break;
3872		3806
3873	*name++ = '\0';	3807	*name++ = '\0';
3874	color = atoi (buf);	3808	color = atoi (buf) + minCOLOR;
3875		3809
3876	if (color < 0 \|\| color >= TOTAL_COLORS)	3810	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3877	break;	3811	break;
3878		3812
3879	if ((buf = strchr (name, ';')) != NULL)	3813	if ((buf = strchr (name, ';')) != NULL)
3880	*buf++ = '\0';	3814	*buf++ = '\0';
3881		3815
3882	if (name[0] == '?' && !name[1])	3816	if (name[0] == '?' && !name[1])
3883	{	3817	{
3884	unsigned short r, g, b;	3818	unsigned short r, g, b;
3885	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3819	pix_colors_focused[color].get (display, r, g, b);
3886	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3820	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3887	}	3821	}
3888	else	3822	else
3889	set_window_color (color + minCOLOR, name);	3823	set_window_color (color, name);
3890	}	3824	}
3891	break;	3825	break;
3892	case XTerm_Color00:	3826	case XTerm_Color00:
3893	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3827	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3894	break;	3828	break;
3895	case XTerm_Color01:	3829	case XTerm_Color01:
3896	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3830	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3897	break;	3831	break;
3898	#ifndef NO_CURSORCOLOR	3832	#ifndef NO_CURSORCOLOR
3899	case XTerm_Color_cursor:	3833	case XTerm_Color_cursor:
3900	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3834	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3901	break;	3835	break;
…		…
3905	break;	3839	break;
3906	case XTerm_Color_pointer_bg:	3840	case XTerm_Color_pointer_bg:
3907	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3841	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3908	break;	3842	break;
3909	#ifndef NO_BOLD_UNDERLINE_REVERSE	3843	#ifndef NO_BOLD_UNDERLINE_REVERSE
3910	case XTerm_Color_BD:
3911	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3912	break;
3913	case XTerm_Color_UL:
3914	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3915	break;
3916	case XTerm_Color_RV:	3844	case XTerm_Color_RV:
3917	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3845	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3846	break;
		3847	case Rxvt_Color_BD:
		3848	case URxvt_Color_BD:
		3849	process_color_seq (op, Color_BD, str, resp);
		3850	break;
		3851	case Rxvt_Color_UL:
		3852	case URxvt_Color_UL:
		3853	process_color_seq (op, Color_UL, str, resp);
3918	break;	3854	break;
3919	case URxvt_Color_IT:	3855	case URxvt_Color_IT:
3920	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3856	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3921	break;	3857	break;
3922	#endif	3858	#endif
…		…
3927	if (am_transparent)	3863	if (am_transparent)
3928	want_full_refresh = want_refresh = 1;	3864	want_full_refresh = want_refresh = 1;
3929	break;	3865	break;
3930	#endif	3866	#endif
3931		3867
3932	case XTerm_Pixmap:	3868	case Rxvt_Pixmap:
		3869	{
3933	if (*str != ';')	3870	if (*str != ';')
3934	{	3871	{
3935	#if XPM_BACKGROUND	3872	#if XPM_BACKGROUND
3936	scale_pixmap (""); /* reset to default scaling */	3873	scale_pixmap (""); /* reset to default scaling */
3937	set_bgPixmap (str); /* change pixmap */	3874	set_bgPixmap (str); /* change pixmap */
3938	#endif
3939	scr_touch (true);	3875	scr_touch (true);
		3876	#endif
3940	}	3877	}
		3878
		3879	int changed = 0;
		3880
3941	while ((str = strchr (str, ';')) != NULL)	3881	while ((str = strchr (str, ';')) != NULL)
3942	{	3882	{
3943	str++;	3883	str++;
3944	#if XPM_BACKGROUND	3884	#if XPM_BACKGROUND
3945	changed += scale_pixmap (str);	3885	changed += scale_pixmap (str);
3946	#endif	3886	#endif
3947	}	3887	}
3948		3888
3949	if (changed)	3889	if (changed)
3950	{	3890	{
3951	#ifdef XPM_BACKGROUND	3891	#ifdef XPM_BACKGROUND
3952	resize_pixmap ();	3892	resize_pixmap ();
3953	#endif
3954	scr_touch (true);	3893	scr_touch (true);
		3894	#endif
3955	}	3895	}
		3896	}
3956	break;	3897	break;
3957		3898
3958	case XTerm_restoreFG:	3899	case Rxvt_restoreFG:
3959	set_window_color (Color_fg, str);	3900	set_window_color (Color_fg, str);
3960	break;	3901	break;
3961	case XTerm_restoreBG:	3902	case Rxvt_restoreBG:
3962	set_window_color (Color_bg, str);	3903	set_window_color (Color_bg, str);
3963	break;	3904	break;
3964		3905
3965	case XTerm_logfile:	3906	case XTerm_logfile:
3966	// TODO, when secure mode?	3907	// TODO, when secure mode?
3967	break;	3908	break;
3968		3909
3969	#ifdef MENUBAR
3970	case URxvt_Menu:
3971	if (OPTION (Opt_insecure))
3972	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3973	break;
3974	#endif
3975	#if 0	3910	#if 0
3976	case XTerm_dumpscreen: /* no error notices */	3911	case Rxvt_dumpscreen: /* no error notices */
3977	{	3912	{
3978	int fd;	3913	int fd;
3979	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3914	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3980	{	3915	{
3981	scr_dump (fd);	3916	scr_dump (fd);
…		…
4012	if (query)	3947	if (query)
4013	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3948	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4014	else	3949	else
4015	{	3950	{
4016	set_locale (str);	3951	set_locale (str);
4017	pty.set_utf8_mode (enc_utf8);	3952	pty->set_utf8_mode (enc_utf8);
4018	init_xlocale ();	3953	init_xlocale ();
4019	}	3954	}
4020	break;	3955	break;
4021		3956
4022	case URxvt_view_up:	3957	case URxvt_view_up:
…		…
4075	return state;	4010	return state;
4076	}	4011	}
4077		4012
4078	/* we're not using priv _yet_ */	4013	/* we're not using priv _yet_ */
4079	void	4014	void
4080	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4015	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4081	{	4016	{
4082	unsigned int i, j;	4017	unsigned int i, j;
4083	int state;	4018	int state;
4084		4019
4085	static const struct	4020	static const struct
…		…
4096	{ 5, PrivMode_rVideo },	4031	{ 5, PrivMode_rVideo },
4097	{ 6, PrivMode_relOrigin },	4032	{ 6, PrivMode_relOrigin },
4098	{ 7, PrivMode_Autowrap },	4033	{ 7, PrivMode_Autowrap },
4099	// 8, bi-directional support mode	4034	// 8, bi-directional support mode
4100	{ 9, PrivMode_MouseX10 },	4035	{ 9, PrivMode_MouseX10 },
4101	#ifdef menuBar_esc
4102	{ menuBar_esc, PrivMode_menuBar },
4103	#endif
4104	// 18, 19 printing-related	4036	// 18, 19 printing-related
4105	{ 25, PrivMode_VisibleCursor },	4037	{ 25, PrivMode_VisibleCursor },
4106	#ifdef scrollBar_esc	4038	#ifdef scrollBar_esc
4107	{ scrollBar_esc, PrivMode_scrollBar },	4039	{ scrollBar_esc, PrivMode_scrollBar },
4108	#endif	4040	#endif
…		…
4203	/* case 8: - auto repeat, can't do on a per window basis */	4135	/* case 8: - auto repeat, can't do on a per window basis */
4204	case 9: /* X10 mouse reporting */	4136	case 9: /* X10 mouse reporting */
4205	if (state) /* orthogonal */	4137	if (state) /* orthogonal */
4206	priv_modes &= ~PrivMode_MouseX11;	4138	priv_modes &= ~PrivMode_MouseX11;
4207	break;	4139	break;
4208	#ifdef menuBar_esc
4209	case menuBar_esc:
4210	#ifdef MENUBAR
4211	map_menuBar (state);
4212	#endif
4213	break;
4214	#endif
4215	#ifdef scrollBar_esc	4140	#ifdef scrollBar_esc
4216	case scrollBar_esc:	4141	case scrollBar_esc:
4217	if (scrollbar_mapping (state))	4142	if (scrollbar_mapping (state))
4218	{	4143	{
4219	resize_all_windows (0, 0, 0);	4144	resize_all_windows (0, 0, 0);
…		…
4461	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4386	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4462		4387
4463	void	4388	void
4464	rxvt_term::tt_write (const char *data, unsigned int len)	4389	rxvt_term::tt_write (const char *data, unsigned int len)
4465	{	4390	{
4466	if (pty.pty < 0)	4391	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4467	return;	4392	return;
4468		4393
		4394	if (pty->pty < 0)
		4395	return;
		4396
4469	if (v_buflen == 0)	4397	if (v_buflen == 0)
4470	{	4398	{
4471	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4399	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4472		4400
4473	if ((unsigned int)written == len)	4401	if ((unsigned int)written == len)
4474	return;	4402	return;
4475		4403
4476	data += written;	4404	data += written;
…		…
4485	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4413	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4486	}	4414	}
4487		4415
4488	void rxvt_term::pty_write ()	4416	void rxvt_term::pty_write ()
4489	{	4417	{
4490	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4418	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4491		4419
4492	if (written > 0)	4420	if (written > 0)
4493	{	4421	{
4494	v_buflen -= written;	4422	v_buflen -= written;
4495		4423

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.249 by root, Sun Jan 8 01:02:15 2006 UTC vs. Revision 1.283 by root, Tue Jan 24 19:40:12 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.249 by root, Sun Jan 8 01:02:15 2006 UTC vs.
Revision 1.283 by root, Tue Jan 24 19:40:12 2006 UTC