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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.243 by root, Fri Jan 6 05:43:36 2006 UTC vs.
Revision 1.279 by root, Sat Jan 21 14:25:05 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	{
…		…
443	scr_move_to (0, 1);	440	scr_move_to (0, 1);
444	return;	441	return;
445	}	442	}
446	else if (keysym == XK_End)	443	else if (keysym == XK_End)
447	{	444	{
448	scr_move_to (1, 0);	445	scr_move_to (1, 1);
449	return;	446	return;
450	}	447	}
451	}	448	}
452	#endif	449	#endif
453	}	450	}
…		…
464	{	461	{
465	switch (keysym)	462	switch (keysym)
466	{	463	{
467	/* normal XTerm key bindings */	464	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	465	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	466	selection_request (ev.time);
470	return;	467	return;
471	#if TODO	468	#if TODO
472	/* rxvt extras */	469	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	470	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	471	change_font (FONT_UP);
…		…
867	#endif	864	#endif
868	/* nil */ ;	865	/* nil */ ;
869	}	866	}
870	}	867	}
871		868
872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END)))	869	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873	return;	870	return;
874		871
875	if (len <= 0)	872	if (len <= 0)
876	return; /* not mapped */	873	return; /* not mapped */
877		874
…		…
919	#endif /* DEBUG_CMD */	916	#endif /* DEBUG_CMD */
920	tt_write (kbuf, (unsigned int)len);	917	tt_write (kbuf, (unsigned int)len);
921	}	918	}
922	/}}} /	919	/}}} /
923		920
924	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	921	#if defined (KEYSYM_RESOURCE)
925	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
926	/* attempt to `write' count to the input buffer */
927	unsigned int	922	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	923	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	924	{
930	unsigned int n, s;	925	unsigned int n, s;
931		926
…		…
972		967
973	if (want_refresh)	968	if (want_refresh)
974	{	969	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	970	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	971	{
977	int row = -view_start;	972	int row = view_start;
		973	int end_row = row + nrow;
978		974
979	while (row > -nsaved && ROW (row - 1).is_longer ())	975	while (row > top_row && ROW (row - 1).is_longer ())
980	--row;	976	--row;
981		977
982	while (row < -view_start + nrow)	978	do
983	{	979	{
984	int start_row = row;	980	int start_row = row;
985	line_t *l;	981	line_t *l;
986		982
987	do	983	do
988	{	984	{
989	l = &ROW (row);	985	l = &ROW (row++);
990		986
991	if (!(l->f & LINE_FILTERED))	987	if (!(l->f & LINE_FILTERED))
992	{	988	{
993	// line not filtered, mark it as filtered	989	// line not filtered, mark it as filtered
994	l->f \|= LINE_FILTERED;	990	l->f \|= LINE_FILTERED;
995	while (l->is_longer ())	991	while (l->is_longer ())
996	{	992	{
997	l = &ROW (++row);	993	l = &ROW (row++);
998	l->f \|= LINE_FILTERED;	994	l->f \|= LINE_FILTERED;
999	}	995	}
1000		996
1001	// and filter it	997	// and filter it
1002	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	998	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003		999
1004	break;	1000	break;
1005	}	1001	}
1006	}	1002	}
1007	while (l->is_longer ());	1003	while (l->is_longer () && row < end_row);
1008
1009	row++;
1010	}	1004	}
		1005	while (row < end_row);
1011		1006	}
1012	}
1013		1007
1014	scr_refresh (refresh_type);	1008	scr_refresh ();
1015	scrollbar_show (1);	1009	scrollbar_show (1);
1016	#ifdef USE_XIM	1010	#ifdef USE_XIM
1017	IMSendSpot ();	1011	IMSendSpot ();
1018	#endif	1012	#endif
1019	}	1013	}
…		…
1022	}	1016	}
1023		1017
1024	void	1018	void
1025	rxvt_term::check_cb (check_watcher &w)	1019	rxvt_term::check_cb (check_watcher &w)
1026	{	1020	{
1027	SET_R (this);	1021	make_current ();
1028	SET_LOCALE (locale);
1029		1022
1030	display->flush ();	1023	display->flush ();
1031		1024
1032	if (want_refresh && !flush_ev.active)	1025	if (want_refresh && !flush_ev.active)
1033	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1026	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034	}	1027	}
1035		1028
1036	void	1029	void
1037	rxvt_term::flush_cb (time_watcher &w)	1030	rxvt_term::flush_cb (time_watcher &w)
1038	{	1031	{
1039	SET_R (this);	1032	make_current ();
1040	SET_LOCALE (locale);
1041		1033
1042	refresh_limit = 1;	1034	refresh_limit = 1;
1043	refresh_count = 0;	1035	refresh_count = 0;
1044	flush ();	1036	flush ();
1045	}	1037	}
…		…
1049	rxvt_term::cursor_blink_cb (time_watcher &w)	1041	rxvt_term::cursor_blink_cb (time_watcher &w)
1050	{	1042	{
1051	hidden_cursor = !hidden_cursor;	1043	hidden_cursor = !hidden_cursor;
1052	want_refresh = 1;	1044	want_refresh = 1;
1053		1045
1054	w.start (w.at + BLINK_INTERVAL);	1046	w.start (w.at + CURSOR_BLINK_INTERVAL);
1055	}	1047	}
1056	#endif	1048	#endif
1057		1049
1058	#ifdef TEXT_BLINK	1050	#ifdef TEXT_BLINK
1059	void	1051	void
…		…
1073	rxvt_term::cont_scroll_cb (time_watcher &w)	1065	rxvt_term::cont_scroll_cb (time_watcher &w)
1074	{	1066	{
1075	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1067	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1076	scr_page (scrollbar_isUp() ? UP : DN, 1))	1068	scr_page (scrollbar_isUp() ? UP : DN, 1))
1077	{	1069	{
1078	refresh_type \|= SMOOTH_REFRESH;
1079	want_refresh = 1;	1070	want_refresh = 1;
1080	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1071	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081	}	1072	}
1082	}	1073	}
1083	#endif	1074	#endif
…		…
1087	rxvt_term::sel_scroll_cb (time_watcher &w)	1078	rxvt_term::sel_scroll_cb (time_watcher &w)
1088	{	1079	{
1089	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1080	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090	{	1081	{
1091	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1082	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092	refresh_type \|= SMOOTH_REFRESH;
1093	want_refresh = 1;	1083	want_refresh = 1;
1094	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1084	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095	}	1085	}
1096	}	1086	}
1097	#endif	1087	#endif
…		…
1102	{	1092	{
1103	if (mouse_slip_wheel_speed == 0	1093	if (mouse_slip_wheel_speed == 0
1104	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1094	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105	: scr_page (UP, mouse_slip_wheel_speed))	1095	: scr_page (UP, mouse_slip_wheel_speed))
1106	{	1096	{
1107	if (view_start == nsaved \|\|	1097	if (view_start == top_row \|\| view_start == 0)
1108	view_start == 0)
1109	mouse_slip_wheel_speed = 0;	1098	mouse_slip_wheel_speed = 0;
1110		1099
1111	refresh_type \|= SMOOTH_REFRESH;
1112	want_refresh = 1;	1100	want_refresh = 1;
1113	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1101	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114	}	1102	}
1115	}	1103	}
1116	#endif	1104	#endif
…		…
1146		1134
1147	memmove (cmdbuf_base, cmdbuf_ptr, n);	1135	memmove (cmdbuf_base, cmdbuf_ptr, n);
1148	cmdbuf_ptr = cmdbuf_base;	1136	cmdbuf_ptr = cmdbuf_base;
1149	cmdbuf_endp = cmdbuf_ptr + n;	1137	cmdbuf_endp = cmdbuf_ptr + n;
1150		1138
1151	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1139	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152		1140
1153	if (r > 0)	1141	if (r > 0)
1154	{	1142	{
1155	cmdbuf_endp += r;	1143	cmdbuf_endp += r;
1156	return true;	1144	return true;
…		…
1174	}	1162	}
1175		1163
1176	void	1164	void
1177	rxvt_term::pty_cb (io_watcher &w, short revents)	1165	rxvt_term::pty_cb (io_watcher &w, short revents)
1178	{	1166	{
1179	SET_R (this);	1167	make_current ();
1180	SET_LOCALE (locale);
1181		1168
1182	if (revents & EVENT_READ)	1169	if (revents & EVENT_READ)
1183	// loop, but don't allow a single term to monopolize us	1170	// loop, but don't allow a single term to monopolize us
1184	while (pty_fill ())	1171	while (pty_fill ())
1185	if (cmd_parse ())	1172	if (cmd_parse ())
…		…
1217	}	1204	}
1218		1205
1219	void	1206	void
1220	rxvt_term::pointer_cb (time_watcher &w)	1207	rxvt_term::pointer_cb (time_watcher &w)
1221	{	1208	{
1222	SET_R (this);	1209	make_current ();
1223	SET_LOCALE (locale);
1224		1210
1225	pointer_blank ();	1211	pointer_blank ();
1226	}	1212	}
1227	#endif	1213	#endif
1228		1214
…		…
1307		1293
1308	/{{{ process an X event /	1294	/{{{ process an X event /
1309	void	1295	void
1310	rxvt_term::x_cb (XEvent &ev)	1296	rxvt_term::x_cb (XEvent &ev)
1311	{	1297	{
		1298	make_current ();
		1299
1312	dDisp;	1300	dDisp;
1313		1301
1314	SET_R (this);	1302	if (ev.xany.window == vt
1315	SET_LOCALE (locale);	1303	&& SHOULD_INVOKE (HOOK_X_EVENT)
		1304	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
		1305	return;
1316		1306
1317	#if defined(CURSOR_BLINK)	1307	// for XQueryPointer
1318	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1319	{
1320	if (hidden_cursor)
1321	{
1322	hidden_cursor = 0;
1323	want_refresh = 1;
1324	}
1325
1326	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1327	}
1328	#endif
1329
1330	#if defined(POINTER_BLANK)
1331	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332	{
1333	if (ev.type == MotionNotify
1334	\|\| ev.type == ButtonPress
1335	\|\| ev.type == ButtonRelease)
1336	if (hidden_pointer)
1337	pointer_unblank ();
1338
1339	if (ev.type == KeyPress && hidden_pointer == 0)
1340	pointer_blank ();
1341	}
1342	#endif
1343
1344	Window unused_root, unused_child;	1308	Window unused_root, unused_child;
1345	int unused_root_x, unused_root_y;	1309	int unused_root_x, unused_root_y;
1346	unsigned int unused_mask;	1310	unsigned int unused_mask;
1347		1311
1348	switch (ev.type)	1312	switch (ev.type)
…		…
1355		1319
1356	break;	1320	break;
1357		1321
1358	case KeyRelease:	1322	case KeyRelease:
1359	{	1323	{
1360	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1324	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1361	KeySym ks;	1325	KeySym keysym;
1362		1326
1363	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1327	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364	#endif	1328	#endif
1365		1329
1366	#if ENABLE_FRILLS \|\| ISO_14755	1330	#if ENABLE_FRILLS \|\| ISO_14755
1367	// ISO 14755 support	1331	// ISO 14755 support
1368	if (iso14755buf)	1332	if (iso14755buf)
…		…
1373	# endif	1337	# endif
1374	# if ISO_14755	1338	# if ISO_14755
1375	// iso14755 part 5.2 handling: release time	1339	// iso14755 part 5.2 handling: release time
1376	// first: controls	1340	// first: controls
1377	if ((ev.xkey.state & ControlMask)	1341	if ((ev.xkey.state & ControlMask)
1378	&& ((ks >= 0x40 && ks <= 0x5f)	1342	&& ((keysym >= 0x40 && keysym <= 0x5f)
1379	\|\| (ks >= 0x61 && ks <= 0x7f)))	1343	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1380	{	1344	{
1381	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1345	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1382	commit_iso14755 ();	1346	commit_iso14755 ();
1383	return; // case-break;	1347	goto skip_switch;
1384	}	1348	}
1385		1349
1386	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1350	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387	if (i[0] == ks)	1351	if (i[0] == keysym)
1388	{	1352	{
1389	iso14755buf = ISO_14755_51 \| i[1];	1353	iso14755buf = ISO_14755_51 \| i[1];
1390	commit_iso14755 ();	1354	commit_iso14755 ();
1391	return; // case-break;	1355	goto skip_switch;
1392	}	1356	}
1393		1357
1394	scr_bell ();	1358	scr_bell ();
1395	# endif	1359	# endif
1396	iso14755buf = 0;	1360	iso14755buf = 0;
…		…
1415	else	1379	else
1416	iso14755buf = 0;	1380	iso14755buf = 0;
1417	}	1381	}
1418	#endif	1382	#endif
1419		1383
		1384	if (ev.xany.window == vt
1420	if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))	1385	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1421	break;	1386	break;
1422		1387
1423	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1388	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1424	if (!(ev.xkey.state & ControlMask))	1389	if (!(ev.xkey.state & ControlMask))
1425	slip_wheel_ev.stop ();	1390	slip_wheel_ev.stop ();
1426	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1391	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1427	mouse_slip_wheel_speed = 0;	1392	mouse_slip_wheel_speed = 0;
1428	#endif	1393	#endif
1429	break;	1394	break;
1430	}	1395	}
1431		1396
…		…
1437	button_release (ev.xbutton);	1402	button_release (ev.xbutton);
1438	break;	1403	break;
1439		1404
1440	case ClientMessage:	1405	case ClientMessage:
1441	if (ev.xclient.format == 32	1406	if (ev.xclient.format == 32
1442	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1407	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1443	{	1408	{
		1409	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1410	{
		1411	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1412	{
1444	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1413	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1414	{
		1415	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1445	destroy ();	1416	destroy ();
		1417	}
1446	#if ENABLE_EWMH	1418	#if ENABLE_EWMH
1447	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1419	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1448	XSendEvent (disp, ev.xclient.window = display->root,	1420	XSendEvent (disp, ev.xclient.window = display->root,
1449	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1421	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1450	&ev);	1422	&ev);
		1423	#endif
		1424	}
		1425	}
		1426	#if ENABLE_XEMBED
		1427	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1428	{
		1429	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1430	focus_in ();
		1431	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1432	focus_out ();
		1433	}
1451	#endif	1434	#endif
1452	}	1435	}
1453	#if ENABLE_XEMBED
1454	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1455	{
1456	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1457	focus_in ();
1458	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1459	focus_out ();
1460	}
1461	#endif
1462	#ifdef OFFIX_DND
1463	/* OffiX Dnd (drag 'n' drop) protocol */
1464	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1465	&& (ev.xclient.data.l[0] == DndFile
1466	\|\| ev.xclient.data.l[0] == DndDir
1467	\|\| ev.xclient.data.l[0] == DndLink))
1468	{
1469	/* Get Dnd data */
1470	Atom ActualType;
1471	int ActualFormat;
1472	unsigned char *data;
1473	unsigned long Size, RemainingBytes;
1474
1475	XGetWindowProperty (disp, display->root,
1476	xa[XA_DNDSELECTION],
1477	0L, 1000000L,
1478	False, AnyPropertyType,
1479	&ActualType, &ActualFormat,
1480	&Size, &RemainingBytes,
1481	&data);
1482	set_string_property (XA_CUT_BUFFER0, data);
1483	XFree (data);
1484	selection_paste (display->root, XA_CUT_BUFFER0, true);
1485	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1486	}
1487	#endif /* OFFIX_DND */
1488	break;	1436	break;
1489		1437
1490	case MappingNotify:	1438	case MappingNotify:
1491	XRefreshKeyboardMapping (&ev.xmapping);	1439	XRefreshKeyboardMapping (&ev.xmapping);
1492	break;	1440	break;
…		…
1534	{	1482	{
1535	seen_resize = 1;	1483	seen_resize = 1;
1536	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1484	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1537	}	1485	}
1538		1486
		1487	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1488
1539	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1489	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1540	if (OPTION (Opt_transparent))	1490	if (OPTION (Opt_transparent))
1541	check_our_parents ();	1491	check_our_parents ();
1542	#endif	1492	#endif
1543	}	1493	}
1544	break;	1494	break;
1545		1495
1546	case PropertyNotify:	1496	case PropertyNotify:
		1497	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1547	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1498	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1548	&& ev.xproperty.state == PropertyNewValue)	1499	&& ev.xproperty.state == PropertyNewValue)
1549	selection_property (ev.xproperty.window, ev.xproperty.atom);	1500	selection_property (ev.xproperty.window, ev.xproperty.atom);
1550		1501
1551	break;	1502	break;
1552		1503
1553	case SelectionClear:	1504	case SelectionClear:
1554	selection_clear ();	1505	selection_clear ();
…		…
1559	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1510	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1560	break;	1511	break;
1561		1512
1562	case SelectionRequest:	1513	case SelectionRequest:
1563	selection_send (ev.xselectionrequest);	1514	selection_send (ev.xselectionrequest);
		1515	break;
		1516
		1517	case MapNotify:
		1518	mapped = 1;
		1519	#ifdef TEXT_BLINK
		1520	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1521	#endif
		1522	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1564	break;	1523	break;
1565		1524
1566	case UnmapNotify:	1525	case UnmapNotify:
1567	mapped = 0;	1526	mapped = 0;
1568	#ifdef TEXT_BLINK	1527	#ifdef TEXT_BLINK
1569	text_blink_ev.stop ();	1528	text_blink_ev.stop ();
1570	#endif	1529	#endif
1571	break;	1530	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1572
1573	case MapNotify:
1574	mapped = 1;
1575	#ifdef TEXT_BLINK
1576	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1577	#endif
1578	break;	1531	break;
1579		1532
1580	#ifdef TRANSPARENT	1533	#ifdef TRANSPARENT
1581	case ReparentNotify:	1534	case ReparentNotify:
1582	rootwin_cb (ev);	1535	rootwin_cb (ev);
…		…
1596		1549
1597	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1550	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1598	scr_expose (ev.xexpose.x, ev.xexpose.y,	1551	scr_expose (ev.xexpose.x, ev.xexpose.y,
1599	ev.xexpose.width, ev.xexpose.height, False);	1552	ev.xexpose.width, ev.xexpose.height, False);
1600		1553
1601	scr_refresh (refresh_type);	1554	want_refresh = 1;
1602	}	1555	}
1603	else	1556	else
1604	{	1557	{
1605	XEvent unused_event;	1558	XEvent unused_event;
1606		1559
…		…
1612	if (isScrollbarWindow (ev.xany.window))	1565	if (isScrollbarWindow (ev.xany.window))
1613	{	1566	{
1614	scrollBar.setIdle ();	1567	scrollBar.setIdle ();
1615	scrollbar_show (0);	1568	scrollbar_show (0);
1616	}	1569	}
1617	#ifdef MENUBAR
1618	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1619	menubar_expose ();
1620	#endif
1621		1570
1622	#ifdef TRANSPARENT	1571	#ifdef TRANSPARENT
1623	if (am_transparent && ev.xany.window == parent[0])	1572	if (am_transparent && ev.xany.window == parent[0])
1624	XClearWindow (disp, ev.xany.window);	1573	XClearWindow (disp, ev.xany.window);
1625	#endif	1574	#endif
…		…
1629	case MotionNotify:	1578	case MotionNotify:
1630	#ifdef POINTER_BLANK	1579	#ifdef POINTER_BLANK
1631	if (hidden_pointer)	1580	if (hidden_pointer)
1632	pointer_unblank ();	1581	pointer_unblank ();
1633	#endif	1582	#endif
1634	#if MENUBAR
1635	if (isMenuBarWindow (ev.xany.window))
1636	{
1637	menubar_control (ev.xbutton);
1638	break;
1639	}
1640	#endif
1641	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1583	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1642	break;	1584	break;
1643		1585
1644	if (ev.xany.window == vt)	1586	if (ev.xany.window == vt)
1645	{	1587	{
		1588	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1646	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1589	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647	; // nop	1590	; // nop
1648	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1591	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1649	{	1592	{
1650	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1593	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1651	;	1594	;
…		…
1733	&unused_root_x, &unused_root_y,	1676	&unused_root_x, &unused_root_y,
1734	&ev.xbutton.x, &ev.xbutton.y,	1677	&ev.xbutton.x, &ev.xbutton.y,
1735	&unused_mask);	1678	&unused_mask);
1736	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1679	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1737	scrollbar_size ());	1680	scrollbar_size ());
1738	scr_refresh (refresh_type);	1681	want_refresh = 1;
1739	refresh_limit = 0;	1682	refresh_limit = 0;
1740	scrollbar_show (1);	1683	scrollbar_show (1);
1741	}	1684	}
1742	break;	1685	break;
1743	}	1686	}
		1687
		1688	skip_switch: ;
		1689
		1690	#if defined(CURSOR_BLINK)
		1691	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1692	{
		1693	if (hidden_cursor)
		1694	{
		1695	hidden_cursor = 0;
		1696	want_refresh = 1;
		1697	}
		1698
		1699	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
		1700	}
		1701	#endif
		1702
		1703	#if defined(POINTER_BLANK)
		1704	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1705	{
		1706	if (ev.type == MotionNotify
		1707	\|\| ev.type == ButtonPress
		1708	\|\| ev.type == ButtonRelease)
		1709	if (hidden_pointer)
		1710	pointer_unblank ();
		1711
		1712	if (ev.type == KeyPress && hidden_pointer == 0)
		1713	pointer_blank ();
		1714	}
		1715	#endif
1744	}	1716	}
1745		1717
1746	void	1718	void
1747	rxvt_term::focus_in ()	1719	rxvt_term::focus_in ()
1748	{	1720	{
…		…
1760	XSetICFocus (Input_Context);	1732	XSetICFocus (Input_Context);
1761	}	1733	}
1762	#endif	1734	#endif
1763	#if CURSOR_BLINK	1735	#if CURSOR_BLINK
1764	if (OPTION (Opt_cursorBlink))	1736	if (OPTION (Opt_cursorBlink))
1765	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1737	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1766	#endif	1738	#endif
1767	#if OFF_FOCUS_FADING	1739	#if OFF_FOCUS_FADING
1768	if (rs[Rs_fade])	1740	if (rs[Rs_fade])
1769	{	1741	{
1770	pix_colors = pix_colors_focused;	1742	pix_colors = pix_colors_focused;
…		…
1814		1786
1815	#if TRANSPARENT	1787	#if TRANSPARENT
1816	void	1788	void
1817	rxvt_term::rootwin_cb (XEvent &ev)	1789	rxvt_term::rootwin_cb (XEvent &ev)
1818	{	1790	{
1819	SET_R (this);	1791	make_current ();
1820	SET_LOCALE (locale);
1821		1792
1822	switch (ev.type)	1793	switch (ev.type)
1823	{	1794	{
1824	case PropertyNotify:	1795	case PropertyNotify:
1825	/*	1796	/*
…		…
1916	#else	1887	#else
1917	selection.rect = false;	1888	selection.rect = false;
1918	#endif	1889	#endif
1919		1890
1920	/* allow shift+left click to extend selection */	1891	/* allow shift+left click to extend selection */
1921	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1892	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1922	{	1893	{
1923	if (MEvent.button == Button1 && clickintime)	1894	if (MEvent.button == Button1 && clickintime)
1924	selection_rotate (ev.x, ev.y);	1895	selection_rotate (ev.x, ev.y);
1925	else	1896	else
1926	selection_extend (ev.x, ev.y, 1);	1897	selection_extend (ev.x, ev.y, 1);
…		…
2094	}	2065	}
2095	}	2066	}
2096		2067
2097	return;	2068	return;
2098	}	2069	}
2099
2100	#if MENUBAR
2101	/*
2102	* Menubar window processing of button press
2103	*/
2104	if (isMenuBarWindow (ev.window))
2105	menubar_control (ev);
2106	#endif
2107	}	2070	}
2108		2071
2109	void	2072	void
2110	rxvt_term::button_release (XButtonEvent &ev)	2073	rxvt_term::button_release (XButtonEvent &ev)
2111	{	2074	{
…		…
2117		2080
2118	if (scrollbar_isUpDn ())	2081	if (scrollbar_isUpDn ())
2119	{	2082	{
2120	scrollBar.setIdle ();	2083	scrollBar.setIdle ();
2121	scrollbar_show (0);	2084	scrollbar_show (0);
2122	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2123	refresh_type &= ~SMOOTH_REFRESH;
2124	#endif
2125	}	2085	}
2126		2086
2127	#ifdef SELECTION_SCROLLING	2087	#ifdef SELECTION_SCROLLING
2128	if (sel_scroll_ev.active)	2088	if (sel_scroll_ev.active)
2129	sel_scroll_ev.stop();	2089	sel_scroll_ev.stop();
…		…
2167	if (priv_modes & PrivMode_mouse_report	2127	if (priv_modes & PrivMode_mouse_report
2168	&& bypass_keystate	2128	&& bypass_keystate
2169	&& ev.button == Button1 && MEvent.clicks <= 1)	2129	&& ev.button == Button1 && MEvent.clicks <= 1)
2170	selection_extend (ev.x, ev.y, 0);	2130	selection_extend (ev.x, ev.y, 0);
2171		2131
2172	if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2132	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2173	return;	2133	return;
2174		2134
2175	switch (ev.button)	2135	switch (ev.button)
2176	{	2136	{
2177	case Button1:	2137	case Button1:
2178	case Button3:	2138	case Button3:
2179	selection_make (ev.time);	2139	selection_make (ev.time);
2180	break;	2140	break;
		2141
2181	case Button2:	2142	case Button2:
2182	selection_request (ev.time, ev.x, ev.y);	2143	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2144	selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2183	break;	2145	break;
		2146
2184	#ifdef MOUSE_WHEEL	2147	#ifdef MOUSE_WHEEL
2185	case Button4:	2148	case Button4:
2186	case Button5:	2149	case Button5:
2187	{	2150	{
2188	int i;	2151	int i;
…		…
2210	slip_wheel_ev.start ();	2173	slip_wheel_ev.start ();
2211	}	2174	}
2212	else	2175	else
2213	{	2176	{
2214	# endif	2177	# endif
2215	# ifdef JUMP_MOUSE_WHEEL
2216	scr_page (v, i);	2178	scr_page (v, i);
2217	scr_refresh (SMOOTH_REFRESH);
2218	scrollbar_show (1);	2179	scrollbar_show (1);
2219	# else
2220	while (i--)
2221	{
2222	scr_page (v, 1);
2223	scr_refresh (SMOOTH_REFRESH);
2224	scrollbar_show (1);
2225	}
2226	# endif
2227	# ifdef MOUSE_SLIP_WHEELING	2180	# ifdef MOUSE_SLIP_WHEELING
2228	}	2181	}
2229	#endif	2182	# endif
2230	}	2183	}
2231	break;	2184	break;
2232	#endif	2185	#endif
2233	}	2186	}
2234	}	2187	}
2235	#ifdef MENUBAR
2236	else if (isMenuBarWindow (ev.window))
2237	menubar_control (ev);
2238	#endif
2239	}	2188	}
2240		2189
2241	#ifdef TRANSPARENT	2190	#ifdef TRANSPARENT
2242	#if TINTING	2191	#if TINTING
2243	/* taken from aterm-0.4.2 */	2192	/* taken from aterm-0.4.2 */
…		…
2680	am_transparent = 0;	2629	am_transparent = 0;
2681	/* XXX: also turn off Opt_transparent? */	2630	/* XXX: also turn off Opt_transparent? */
2682	}	2631	}
2683	else	2632	else
2684	{	2633	{
2685	#if WAIT_FOR_WM
2686	/* wait (an arbitrary period) for the WM to do its thing
2687	* needed for fvwm2.2.2 (and before?) */
2688	sleep (1);
2689	#endif
2690	for (n = 0; n < (unsigned int)i; n++)	2634	for (n = 0; n < (unsigned int)i; n++)
2691	{	2635	{
2692	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2636	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2693	XClearWindow (disp, parent[n]);	2637	XClearWindow (disp, parent[n]);
2694	}	2638	}
…		…
2723		2667
2724	bool	2668	bool
2725	rxvt_term::cmd_parse ()	2669	rxvt_term::cmd_parse ()
2726	{	2670	{
2727	bool flag = false;	2671	bool flag = false;
2728	unicode_t ch = NOCHAR;	2672	wchar_t ch = NOCHAR;
2729	char *seq_begin; // remember start of esc-sequence here	2673	char *seq_begin; // remember start of esc-sequence here
2730		2674
2731	for (;;)	2675	for (;;)
2732	{	2676	{
2733	if (ch == NOCHAR)	2677	if (ch == NOCHAR)
…		…
2754	if (seen_resize && cmd_pid)	2698	if (seen_resize && cmd_pid)
2755	kill (-cmd_pid, SIGWINCH);	2699	kill (-cmd_pid, SIGWINCH);
2756	}	2700	}
2757		2701
2758	/* Read a text string from the input buffer */	2702	/* Read a text string from the input buffer */
2759	unicode_t buf[UBUFSIZ];	2703	wchar_t buf[UBUFSIZ];
2760	bool refreshnow = false;	2704	bool refreshnow = false;
2761	int nlines = 0;	2705	int nlines = 0;
2762	unicode_t *str = buf;	2706	wchar_t *str = buf;
2763	unicode_t *eol = str + min (ncol, UBUFSIZ);	2707	wchar_t *eol = str + min (ncol, UBUFSIZ);
2764		2708
2765	for (;;)	2709	for (;;)
2766	{	2710	{
2767	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2711	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2768	break;	2712	break;
…		…
2786	}	2730	}
2787		2731
2788	// scr_add_lines only works for nlines <= nrow - 1.	2732	// scr_add_lines only works for nlines <= nrow - 1.
2789	if (nlines >= nrow - 1)	2733	if (nlines >= nrow - 1)
2790	{	2734	{
		2735	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2791	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2736	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2792	scr_add_lines (buf, nlines, str - buf);	2737	scr_add_lines (buf, str - buf, nlines);
2793		2738
2794	nlines = 0;	2739	nlines = 0;
2795	str = buf;	2740	str = buf;
2796	eol = str + min (ncol, UBUFSIZ);	2741	eol = str + min (ncol, UBUFSIZ);
2797	}	2742	}
…		…
2811		2756
2812	seq_begin = cmdbuf_ptr;	2757	seq_begin = cmdbuf_ptr;
2813	ch = next_char ();	2758	ch = next_char ();
2814	}	2759	}
2815		2760
		2761	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2816	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2762	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2817	scr_add_lines (buf, nlines, str - buf);	2763	scr_add_lines (buf, str - buf, nlines);
2818		2764
2819	/*	2765	/*
2820	* If there have been a lot of new lines, then update the screen	2766	* If there have been a lot of new lines, then update the screen
2821	* What the heck I'll cheat and only refresh less than every page-full.	2767	* What the heck I'll cheat and only refresh less than every page-full.
2822	* the number of pages between refreshes is refresh_limit, which	2768	* the number of pages between refreshes is refresh_limit, which
…		…
2827	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2773	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2828	refresh_limit++;	2774	refresh_limit++;
2829	else	2775	else
2830	{	2776	{
2831	flag = true;	2777	flag = true;
2832	scr_refresh (refresh_type);	2778	scr_refresh ();
2833	flush_ev.stop ();	2779	want_refresh = 1;
2834	}	2780	}
2835	}	2781	}
2836		2782
2837	}	2783	}
2838	else	2784	else
…		…
2853	}	2799	}
2854		2800
2855	return flag;	2801	return flag;
2856	}	2802	}
2857		2803
2858	// read the next octet
2859	unicode_t
2860	rxvt_term::next_octet ()
2861	{
2862	return cmdbuf_ptr < cmdbuf_endp
2863	? *cmdbuf_ptr++
2864	: NOCHAR;
2865	}
2866
2867	// read the next character	2804	// read the next character
2868	unicode_t	2805	wchar_t
2869	rxvt_term::next_char ()	2806	rxvt_term::next_char () NOTHROW
2870	{	2807	{
2871	while (cmdbuf_ptr < cmdbuf_endp)	2808	while (cmdbuf_ptr < cmdbuf_endp)
2872	{	2809	{
2873	// assume 7-bit to be ascii ALWAYS	2810	// assume 7-bit to be ascii ALWAYS
2874	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2811	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2883	cmdbuf_ptr = cmdbuf_endp;	2820	cmdbuf_ptr = cmdbuf_endp;
2884	break;	2821	break;
2885	}	2822	}
2886		2823
2887	if (len == (size_t)-1)	2824	if (len == (size_t)-1)
2888	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2825	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2889		2826
2890	// assume wchar == unicode	2827	// assume wchar == unicode
2891	cmdbuf_ptr += len;	2828	cmdbuf_ptr += len;
2892	return wc & UNICODE_MASK;	2829	return wc & UNICODE_MASK;
2893	}	2830	}
2894		2831
2895	return NOCHAR;	2832	return NOCHAR;
2896	}	2833	}
		2834
		2835	// read the next octet
		2836	uint32_t
		2837	rxvt_term::next_octet () NOTHROW
		2838	{
		2839	return cmdbuf_ptr < cmdbuf_endp
		2840	? (unsigned char)*cmdbuf_ptr++
		2841	: NOCHAR;
		2842	}
		2843
		2844	static class out_of_input out_of_input;
2897		2845
2898	/* rxvt_cmd_getc () - Return next input character */	2846	/* rxvt_cmd_getc () - Return next input character */
2899	/*	2847	/*
2900	* Return the next input character after first passing any keyboard input	2848	* Return the next input character after first passing any keyboard input
2901	* to the command.	2849	* to the command.
2902	*/	2850	*/
2903	unicode_t	2851	wchar_t
2904	rxvt_term::cmd_getc ()	2852	rxvt_term::cmd_getc () THROW ((class out_of_input))
2905	{	2853	{
2906	unicode_t c = next_char ();	2854	wchar_t c = next_char ();
2907		2855
2908	if (c == NOCHAR)	2856	if (c == NOCHAR)
2909	throw out_of_input;	2857	throw out_of_input;
2910		2858
2911	return c;	2859	return c;
2912	}	2860	}
2913		2861
2914	unicode_t	2862	uint32_t
2915	rxvt_term::cmd_get8 ()	2863	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2916	{	2864	{
2917	unicode_t c = next_octet ();	2865	uint32_t c = next_octet ();
2918		2866
2919	if (c == NOCHAR)	2867	if (c == NOCHAR)
2920	throw out_of_input;	2868	throw out_of_input;
2921		2869
2922	return c;	2870	return c;
…		…
3189	break;	3137	break;
3190		3138
3191	/* 8.3.87: NEXT LINE */	3139	/* 8.3.87: NEXT LINE */
3192	case C1_NEL: /* ESC E */	3140	case C1_NEL: /* ESC E */
3193	{	3141	{
3194	unicode_t nlcr[] = { C0_LF, C0_CR };	3142	wchar_t nlcr[] = { C0_LF, C0_CR };
3195	scr_add_lines (nlcr, 1, 2);	3143	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3196	}	3144	}
3197	break;	3145	break;
3198		3146
3199	/* kidnapped escape sequence: Should be 8.3.48 */	3147	/* kidnapped escape sequence: Should be 8.3.48 */
3200	case C1_ESA: /* ESC G */	3148	case C1_ESA: /* ESC G */
…		…
3799	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3747	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3800	*/	3748	*/
3801	void	3749	void
3802	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3750	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3803	{	3751	{
3804	int changed = 0;
3805	int color;	3752	int color;
3806	char buf, name;	3753	char buf, name;
3807	bool query = str[0] == '?' && !str[1];	3754	bool query = str[0] == '?' && !str[1];
3808	int saveop = op;	3755	int saveop = op;
3809	dDisp;	3756	dDisp;
…		…
3864	{	3811	{
3865	if ((name = strchr (buf, ';')) == NULL)	3812	if ((name = strchr (buf, ';')) == NULL)
3866	break;	3813	break;
3867		3814
3868	*name++ = '\0';	3815	*name++ = '\0';
3869	color = atoi (buf);	3816	color = atoi (buf) + minCOLOR;
3870		3817
3871	if (color < 0 \|\| color >= TOTAL_COLORS)	3818	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3872	break;	3819	break;
3873		3820
3874	if ((buf = strchr (name, ';')) != NULL)	3821	if ((buf = strchr (name, ';')) != NULL)
3875	*buf++ = '\0';	3822	*buf++ = '\0';
3876		3823
3877	if (name[0] == '?' && !name[1])	3824	if (name[0] == '?' && !name[1])
3878	{	3825	{
3879	unsigned short r, g, b;	3826	unsigned short r, g, b;
3880	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3827	pix_colors_focused[color].get (display, r, g, b);
3881	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3828	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3882	}	3829	}
3883	else	3830	else
3884	set_window_color (color + minCOLOR, name);	3831	set_window_color (color, name);
3885	}	3832	}
3886	break;	3833	break;
3887	case XTerm_Color00:	3834	case XTerm_Color00:
3888	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3835	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3889	break;	3836	break;
3890	case XTerm_Color01:	3837	case XTerm_Color01:
3891	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3838	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3892	break;	3839	break;
3893	#ifndef NO_CURSORCOLOR	3840	#ifndef NO_CURSORCOLOR
3894	case XTerm_Color_cursor:	3841	case XTerm_Color_cursor:
3895	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3842	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3896	break;	3843	break;
…		…
3900	break;	3847	break;
3901	case XTerm_Color_pointer_bg:	3848	case XTerm_Color_pointer_bg:
3902	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3849	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3903	break;	3850	break;
3904	#ifndef NO_BOLD_UNDERLINE_REVERSE	3851	#ifndef NO_BOLD_UNDERLINE_REVERSE
3905	case XTerm_Color_BD:
3906	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3907	break;
3908	case XTerm_Color_UL:
3909	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3910	break;
3911	case XTerm_Color_RV:	3852	case XTerm_Color_RV:
3912	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3853	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3854	break;
		3855	case Rxvt_Color_BD:
		3856	case URxvt_Color_BD:
		3857	process_color_seq (op, Color_BD, str, resp);
		3858	break;
		3859	case Rxvt_Color_UL:
		3860	case URxvt_Color_UL:
		3861	process_color_seq (op, Color_UL, str, resp);
3913	break;	3862	break;
3914	case URxvt_Color_IT:	3863	case URxvt_Color_IT:
3915	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3864	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3916	break;	3865	break;
3917	#endif	3866	#endif
…		…
3922	if (am_transparent)	3871	if (am_transparent)
3923	want_full_refresh = want_refresh = 1;	3872	want_full_refresh = want_refresh = 1;
3924	break;	3873	break;
3925	#endif	3874	#endif
3926		3875
3927	case XTerm_Pixmap:	3876	case Rxvt_Pixmap:
		3877	{
3928	if (*str != ';')	3878	if (*str != ';')
3929	{	3879	{
3930	#if XPM_BACKGROUND	3880	#if XPM_BACKGROUND
3931	scale_pixmap (""); /* reset to default scaling */	3881	scale_pixmap (""); /* reset to default scaling */
3932	set_bgPixmap (str); /* change pixmap */	3882	set_bgPixmap (str); /* change pixmap */
3933	#endif
3934	scr_touch (true);	3883	scr_touch (true);
		3884	#endif
3935	}	3885	}
		3886
		3887	int changed = 0;
		3888
3936	while ((str = strchr (str, ';')) != NULL)	3889	while ((str = strchr (str, ';')) != NULL)
3937	{	3890	{
3938	str++;	3891	str++;
3939	#if XPM_BACKGROUND	3892	#if XPM_BACKGROUND
3940	changed += scale_pixmap (str);	3893	changed += scale_pixmap (str);
3941	#endif	3894	#endif
3942	}	3895	}
3943		3896
3944	if (changed)	3897	if (changed)
3945	{	3898	{
3946	#ifdef XPM_BACKGROUND	3899	#ifdef XPM_BACKGROUND
3947	resize_pixmap ();	3900	resize_pixmap ();
3948	#endif
3949	scr_touch (true);	3901	scr_touch (true);
		3902	#endif
3950	}	3903	}
		3904	}
3951	break;	3905	break;
3952		3906
3953	case XTerm_restoreFG:	3907	case Rxvt_restoreFG:
3954	set_window_color (Color_fg, str);	3908	set_window_color (Color_fg, str);
3955	break;	3909	break;
3956	case XTerm_restoreBG:	3910	case Rxvt_restoreBG:
3957	set_window_color (Color_bg, str);	3911	set_window_color (Color_bg, str);
3958	break;	3912	break;
3959		3913
3960	case XTerm_logfile:	3914	case XTerm_logfile:
3961	// TODO, when secure mode?	3915	// TODO, when secure mode?
3962	break;	3916	break;
3963		3917
3964	#ifdef MENUBAR
3965	case URxvt_Menu:
3966	if (OPTION (Opt_insecure))
3967	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3968	break;
3969	#endif
3970	#if 0	3918	#if 0
3971	case XTerm_dumpscreen: /* no error notices */	3919	case Rxvt_dumpscreen: /* no error notices */
3972	{	3920	{
3973	int fd;	3921	int fd;
3974	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3922	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3975	{	3923	{
3976	scr_dump (fd);	3924	scr_dump (fd);
…		…
4007	if (query)	3955	if (query)
4008	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3956	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4009	else	3957	else
4010	{	3958	{
4011	set_locale (str);	3959	set_locale (str);
4012	pty.set_utf8_mode (enc_utf8);	3960	pty->set_utf8_mode (enc_utf8);
4013	init_xlocale ();	3961	init_xlocale ();
4014	}	3962	}
4015	break;	3963	break;
4016		3964
4017	case URxvt_view_up:	3965	case URxvt_view_up:
…		…
4028	break;	3976	break;
4029	#endif	3977	#endif
4030		3978
4031	#if ENABLE_PERL	3979	#if ENABLE_PERL
4032	case URxvt_perl:	3980	case URxvt_perl:
4033	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))	3981	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4034	; // no responses yet	3982	; // no responses yet
4035	break;	3983	break;
4036	#endif	3984	#endif
4037	}	3985	}
4038	}	3986	}
…		…
4070	return state;	4018	return state;
4071	}	4019	}
4072		4020
4073	/* we're not using priv _yet_ */	4021	/* we're not using priv _yet_ */
4074	void	4022	void
4075	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4023	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4076	{	4024	{
4077	unsigned int i, j;	4025	unsigned int i, j;
4078	int state;	4026	int state;
4079		4027
4080	static const struct	4028	static const struct
…		…
4091	{ 5, PrivMode_rVideo },	4039	{ 5, PrivMode_rVideo },
4092	{ 6, PrivMode_relOrigin },	4040	{ 6, PrivMode_relOrigin },
4093	{ 7, PrivMode_Autowrap },	4041	{ 7, PrivMode_Autowrap },
4094	// 8, bi-directional support mode	4042	// 8, bi-directional support mode
4095	{ 9, PrivMode_MouseX10 },	4043	{ 9, PrivMode_MouseX10 },
4096	#ifdef menuBar_esc
4097	{ menuBar_esc, PrivMode_menuBar },
4098	#endif
4099	// 18, 19 printing-related	4044	// 18, 19 printing-related
4100	{ 25, PrivMode_VisibleCursor },	4045	{ 25, PrivMode_VisibleCursor },
4101	#ifdef scrollBar_esc	4046	#ifdef scrollBar_esc
4102	{ scrollBar_esc, PrivMode_scrollBar },	4047	{ scrollBar_esc, PrivMode_scrollBar },
4103	#endif	4048	#endif
…		…
4150	/* extra handling for values with state unkept */	4095	/* extra handling for values with state unkept */
4151	switch (arg[i])	4096	switch (arg[i])
4152	{	4097	{
4153	#if ENABLE_STYLES	4098	#if ENABLE_STYLES
4154	case 1021:	4099	case 1021:
4155	if (mode)	4100	set_option (Opt_intensityStyles, mode);
4156	SET_OPTION (Opt_intensityStyles);
4157	else
4158	CLR_OPTION (Opt_intensityStyles);
4159		4101
4160	scr_touch (true);	4102	scr_touch (true);
4161	break;	4103	break;
4162	#endif	4104	#endif
4163	case 1048: /* alternative cursor save */	4105	case 1048: /* alternative cursor save */
…		…
4185	case 3: /* 80/132 */	4127	case 3: /* 80/132 */
4186	if (priv_modes & PrivMode_132OK)	4128	if (priv_modes & PrivMode_132OK)
4187	set_widthheight (((state ? 132 : 80) * fwidth), height);	4129	set_widthheight (((state ? 132 : 80) * fwidth), height);
4188	break;	4130	break;
4189	case 4: /* smooth scrolling */	4131	case 4: /* smooth scrolling */
4190	if (!state)	4132	set_option (Opt_jumpScroll, !state);
4191	SET_OPTION (Opt_jumpScroll);
4192	else
4193	CLR_OPTION (Opt_jumpScroll);
4194	break;	4133	break;
4195	case 5: /* reverse video */	4134	case 5: /* reverse video */
4196	scr_rvideo_mode (state);	4135	scr_rvideo_mode (state);
4197	break;	4136	break;
4198	case 6: /* relative/absolute origins */	4137	case 6: /* relative/absolute origins */
…		…
4204	/* case 8: - auto repeat, can't do on a per window basis */	4143	/* case 8: - auto repeat, can't do on a per window basis */
4205	case 9: /* X10 mouse reporting */	4144	case 9: /* X10 mouse reporting */
4206	if (state) /* orthogonal */	4145	if (state) /* orthogonal */
4207	priv_modes &= ~PrivMode_MouseX11;	4146	priv_modes &= ~PrivMode_MouseX11;
4208	break;	4147	break;
4209	#ifdef menuBar_esc
4210	case menuBar_esc:
4211	#ifdef MENUBAR
4212	map_menuBar (state);
4213	#endif
4214	break;
4215	#endif
4216	#ifdef scrollBar_esc	4148	#ifdef scrollBar_esc
4217	case scrollBar_esc:	4149	case scrollBar_esc:
4218	if (scrollbar_mapping (state))	4150	if (scrollbar_mapping (state))
4219	{	4151	{
4220	resize_all_windows (0, 0, 0);	4152	resize_all_windows (0, 0, 0);
…		…
4239	#if 0	4171	#if 0
4240	case 1001:	4172	case 1001:
4241	break; /* X11 mouse highlighting */	4173	break; /* X11 mouse highlighting */
4242	#endif	4174	#endif
4243	case 1010: /* scroll to bottom on TTY output inhibit */	4175	case 1010: /* scroll to bottom on TTY output inhibit */
4244	if (!state)	4176	set_option (Opt_scrollTtyOutput, !state);
4245	SET_OPTION (Opt_scrollTtyOutput);
4246	else
4247	CLR_OPTION (Opt_scrollTtyOutput);
4248	break;	4177	break;
4249	case 1011: /* scroll to bottom on key press */	4178	case 1011: /* scroll to bottom on key press */
4250	if (state)	4179	set_option (Opt_scrollTtyKeypress, state);
4251	SET_OPTION (Opt_scrollTtyKeypress);
4252	else
4253	CLR_OPTION (Opt_scrollTtyKeypress);
4254	break;	4180	break;
4255	case 1047: /* secondary screen w/ clearing last */	4181	case 1047: /* secondary screen w/ clearing last */
4256	if (OPTION (Opt_secondaryScreen))	4182	if (OPTION (Opt_secondaryScreen))
4257	if (current_screen != PRIMARY)	4183	if (current_screen != PRIMARY)
4258	scr_erase_screen (2);	4184	scr_erase_screen (2);
…		…
4468	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4394	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4469		4395
4470	void	4396	void
4471	rxvt_term::tt_write (const char *data, unsigned int len)	4397	rxvt_term::tt_write (const char *data, unsigned int len)
4472	{	4398	{
4473	if (pty.pty < 0)	4399	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4474	return;	4400	return;
4475		4401
		4402	if (pty->pty < 0)
		4403	return;
		4404
4476	if (v_buflen == 0)	4405	if (v_buflen == 0)
4477	{	4406	{
4478	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4407	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4479		4408
4480	if ((unsigned int)written == len)	4409	if ((unsigned int)written == len)
4481	return;	4410	return;
4482		4411
4483	data += written;	4412	data += written;
…		…
4492	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4421	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4493	}	4422	}
4494		4423
4495	void rxvt_term::pty_write ()	4424	void rxvt_term::pty_write ()
4496	{	4425	{
4497	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4426	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4498		4427
4499	if (written > 0)	4428	if (written > 0)
4500	{	4429	{
4501	v_buflen -= written;	4430	v_buflen -= written;
4502		4431

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.243 by root, Fri Jan 6 05:43:36 2006 UTC vs. Revision 1.279 by root, Sat Jan 21 14:25:05 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.243 by root, Fri Jan 6 05:43:36 2006 UTC vs.
Revision 1.279 by root, Sat Jan 21 14:25:05 2006 UTC