[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.277 by root, Fri Jan 20 12:16:28 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_STR_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
		1307	// for XQueryPointer
1317	Window unused_root, unused_child;	1308	Window unused_root, unused_child;
1318	int unused_root_x, unused_root_y;	1309	int unused_root_x, unused_root_y;
1319	unsigned int unused_mask;	1310	unsigned int unused_mask;
1320		1311
1321	switch (ev.type)	1312	switch (ev.type)
…		…
1328		1319
1329	break;	1320	break;
1330		1321
1331	case KeyRelease:	1322	case KeyRelease:
1332	{	1323	{
1333	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1324	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1334	KeySym ks;	1325	KeySym keysym;
1335		1326
1336	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 :/
1337	#endif	1328	#endif
1338		1329
1339	#if ENABLE_FRILLS \|\| ISO_14755	1330	#if ENABLE_FRILLS \|\| ISO_14755
1340	// ISO 14755 support	1331	// ISO 14755 support
1341	if (iso14755buf)	1332	if (iso14755buf)
…		…
1346	# endif	1337	# endif
1347	# if ISO_14755	1338	# if ISO_14755
1348	// iso14755 part 5.2 handling: release time	1339	// iso14755 part 5.2 handling: release time
1349	// first: controls	1340	// first: controls
1350	if ((ev.xkey.state & ControlMask)	1341	if ((ev.xkey.state & ControlMask)
1351	&& ((ks >= 0x40 && ks <= 0x5f)	1342	&& ((keysym >= 0x40 && keysym <= 0x5f)
1352	\|\| (ks >= 0x61 && ks <= 0x7f)))	1343	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1353	{	1344	{
1354	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1345	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1355	commit_iso14755 ();	1346	commit_iso14755 ();
1356	goto skip_switch;	1347	goto skip_switch;
1357	}	1348	}
1358		1349
1359	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1350	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1360	if (i[0] == ks)	1351	if (i[0] == keysym)
1361	{	1352	{
1362	iso14755buf = ISO_14755_51 \| i[1];	1353	iso14755buf = ISO_14755_51 \| i[1];
1363	commit_iso14755 ();	1354	commit_iso14755 ();
1364	goto skip_switch;	1355	goto skip_switch;
1365	}	1356	}
…		…
1389	iso14755buf = 0;	1380	iso14755buf = 0;
1390	}	1381	}
1391	#endif	1382	#endif
1392		1383
1393	if (ev.xany.window == vt	1384	if (ev.xany.window == vt
1394	&& 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)))
1395	break;	1386	break;
1396		1387
1397	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1388	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1398	if (!(ev.xkey.state & ControlMask))	1389	if (!(ev.xkey.state & ControlMask))
1399	slip_wheel_ev.stop ();	1390	slip_wheel_ev.stop ();
1400	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1391	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1401	mouse_slip_wheel_speed = 0;	1392	mouse_slip_wheel_speed = 0;
1402	#endif	1393	#endif
1403	break;	1394	break;
1404	}	1395	}
1405		1396
…		…
1411	button_release (ev.xbutton);	1402	button_release (ev.xbutton);
1412	break;	1403	break;
1413		1404
1414	case ClientMessage:	1405	case ClientMessage:
1415	if (ev.xclient.format == 32	1406	if (ev.xclient.format == 32
1416	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1407	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1417	{	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	{
1418	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)))
1419	destroy ();	1416	destroy ();
		1417	}
1420	#if ENABLE_EWMH	1418	#if ENABLE_EWMH
1421	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])
1422	XSendEvent (disp, ev.xclient.window = display->root,	1420	XSendEvent (disp, ev.xclient.window = display->root,
1423	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1421	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1424	&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	}
1425	#endif	1434	#endif
1426	}	1435	}
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;	1436	break;
1463		1437
1464	case MappingNotify:	1438	case MappingNotify:
1465	XRefreshKeyboardMapping (&ev.xmapping);	1439	XRefreshKeyboardMapping (&ev.xmapping);
1466	break;	1440	break;
…		…
1508	{	1482	{
1509	seen_resize = 1;	1483	seen_resize = 1;
1510	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1484	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1511	}	1485	}
1512		1486
		1487	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1488
1513	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1489	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1514	if (OPTION (Opt_transparent))	1490	if (OPTION (Opt_transparent))
1515	check_our_parents ();	1491	check_our_parents ();
1516	#endif	1492	#endif
1517	}	1493	}
…		…
1572		1548
1573	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1549	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1574	scr_expose (ev.xexpose.x, ev.xexpose.y,	1550	scr_expose (ev.xexpose.x, ev.xexpose.y,
1575	ev.xexpose.width, ev.xexpose.height, False);	1551	ev.xexpose.width, ev.xexpose.height, False);
1576		1552
1577	scr_refresh (refresh_type);	1553	want_refresh = 1;
1578	}	1554	}
1579	else	1555	else
1580	{	1556	{
1581	XEvent unused_event;	1557	XEvent unused_event;
1582		1558
…		…
1588	if (isScrollbarWindow (ev.xany.window))	1564	if (isScrollbarWindow (ev.xany.window))
1589	{	1565	{
1590	scrollBar.setIdle ();	1566	scrollBar.setIdle ();
1591	scrollbar_show (0);	1567	scrollbar_show (0);
1592	}	1568	}
1593	#ifdef MENUBAR
1594	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1595	menubar_expose ();
1596	#endif
1597		1569
1598	#ifdef TRANSPARENT	1570	#ifdef TRANSPARENT
1599	if (am_transparent && ev.xany.window == parent[0])	1571	if (am_transparent && ev.xany.window == parent[0])
1600	XClearWindow (disp, ev.xany.window);	1572	XClearWindow (disp, ev.xany.window);
1601	#endif	1573	#endif
…		…
1605	case MotionNotify:	1577	case MotionNotify:
1606	#ifdef POINTER_BLANK	1578	#ifdef POINTER_BLANK
1607	if (hidden_pointer)	1579	if (hidden_pointer)
1608	pointer_unblank ();	1580	pointer_unblank ();
1609	#endif	1581	#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)	1582	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1618	break;	1583	break;
1619		1584
1620	if (ev.xany.window == vt)	1585	if (ev.xany.window == vt)
1621	{	1586	{
		1587	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1588	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623	; // nop	1589	; // nop
1624	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1590	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1625	{	1591	{
1626	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1592	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1627	;	1593	;
…		…
1709	&unused_root_x, &unused_root_y,	1675	&unused_root_x, &unused_root_y,
1710	&ev.xbutton.x, &ev.xbutton.y,	1676	&ev.xbutton.x, &ev.xbutton.y,
1711	&unused_mask);	1677	&unused_mask);
1712	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1678	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1713	scrollbar_size ());	1679	scrollbar_size ());
1714	scr_refresh (refresh_type);	1680	want_refresh = 1;
1715	refresh_limit = 0;	1681	refresh_limit = 0;
1716	scrollbar_show (1);	1682	scrollbar_show (1);
1717	}	1683	}
1718	break;	1684	break;
1719	}	1685	}
…		…
1727	{	1693	{
1728	hidden_cursor = 0;	1694	hidden_cursor = 0;
1729	want_refresh = 1;	1695	want_refresh = 1;
1730	}	1696	}
1731		1697
1732	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1698	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733	}	1699	}
1734	#endif	1700	#endif
1735		1701
1736	#if defined(POINTER_BLANK)	1702	#if defined(POINTER_BLANK)
1737	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1703	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1765	XSetICFocus (Input_Context);	1731	XSetICFocus (Input_Context);
1766	}	1732	}
1767	#endif	1733	#endif
1768	#if CURSOR_BLINK	1734	#if CURSOR_BLINK
1769	if (OPTION (Opt_cursorBlink))	1735	if (OPTION (Opt_cursorBlink))
1770	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1736	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1771	#endif	1737	#endif
1772	#if OFF_FOCUS_FADING	1738	#if OFF_FOCUS_FADING
1773	if (rs[Rs_fade])	1739	if (rs[Rs_fade])
1774	{	1740	{
1775	pix_colors = pix_colors_focused;	1741	pix_colors = pix_colors_focused;
…		…
1819		1785
1820	#if TRANSPARENT	1786	#if TRANSPARENT
1821	void	1787	void
1822	rxvt_term::rootwin_cb (XEvent &ev)	1788	rxvt_term::rootwin_cb (XEvent &ev)
1823	{	1789	{
1824	SET_R (this);	1790	make_current ();
1825	SET_LOCALE (locale);
1826		1791
1827	switch (ev.type)	1792	switch (ev.type)
1828	{	1793	{
1829	case PropertyNotify:	1794	case PropertyNotify:
1830	/*	1795	/*
…		…
1921	#else	1886	#else
1922	selection.rect = false;	1887	selection.rect = false;
1923	#endif	1888	#endif
1924		1889
1925	/* allow shift+left click to extend selection */	1890	/* allow shift+left click to extend selection */
1926	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1891	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1927	{	1892	{
1928	if (MEvent.button == Button1 && clickintime)	1893	if (MEvent.button == Button1 && clickintime)
1929	selection_rotate (ev.x, ev.y);	1894	selection_rotate (ev.x, ev.y);
1930	else	1895	else
1931	selection_extend (ev.x, ev.y, 1);	1896	selection_extend (ev.x, ev.y, 1);
…		…
2099	}	2064	}
2100	}	2065	}
2101		2066
2102	return;	2067	return;
2103	}	2068	}
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	}	2069	}
2113		2070
2114	void	2071	void
2115	rxvt_term::button_release (XButtonEvent &ev)	2072	rxvt_term::button_release (XButtonEvent &ev)
2116	{	2073	{
…		…
2122		2079
2123	if (scrollbar_isUpDn ())	2080	if (scrollbar_isUpDn ())
2124	{	2081	{
2125	scrollBar.setIdle ();	2082	scrollBar.setIdle ();
2126	scrollbar_show (0);	2083	scrollbar_show (0);
2127	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2128	refresh_type &= ~SMOOTH_REFRESH;
2129	#endif
2130	}	2084	}
2131		2085
2132	#ifdef SELECTION_SCROLLING	2086	#ifdef SELECTION_SCROLLING
2133	if (sel_scroll_ev.active)	2087	if (sel_scroll_ev.active)
2134	sel_scroll_ev.stop();	2088	sel_scroll_ev.stop();
…		…
2181	{	2135	{
2182	case Button1:	2136	case Button1:
2183	case Button3:	2137	case Button3:
2184	selection_make (ev.time);	2138	selection_make (ev.time);
2185	break;	2139	break;
		2140
2186	case Button2:	2141	case Button2:
2187	selection_request (ev.time, ev.x, ev.y);	2142	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2143	selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2188	break;	2144	break;
		2145
2189	#ifdef MOUSE_WHEEL	2146	#ifdef MOUSE_WHEEL
2190	case Button4:	2147	case Button4:
2191	case Button5:	2148	case Button5:
2192	{	2149	{
2193	int i;	2150	int i;
…		…
2215	slip_wheel_ev.start ();	2172	slip_wheel_ev.start ();
2216	}	2173	}
2217	else	2174	else
2218	{	2175	{
2219	# endif	2176	# endif
2220	# ifdef JUMP_MOUSE_WHEEL
2221	scr_page (v, i);	2177	scr_page (v, i);
2222	scr_refresh (SMOOTH_REFRESH);
2223	scrollbar_show (1);	2178	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	2179	# ifdef MOUSE_SLIP_WHEELING
2233	}	2180	}
2234	#endif	2181	# endif
2235	}	2182	}
2236	break;	2183	break;
2237	#endif	2184	#endif
2238	}	2185	}
2239	}	2186	}
2240	#ifdef MENUBAR
2241	else if (isMenuBarWindow (ev.window))
2242	menubar_control (ev);
2243	#endif
2244	}	2187	}
2245		2188
2246	#ifdef TRANSPARENT	2189	#ifdef TRANSPARENT
2247	#if TINTING	2190	#if TINTING
2248	/* taken from aterm-0.4.2 */	2191	/* taken from aterm-0.4.2 */
…		…
2791	}	2734	}
2792		2735
2793	// scr_add_lines only works for nlines <= nrow - 1.	2736	// scr_add_lines only works for nlines <= nrow - 1.
2794	if (nlines >= nrow - 1)	2737	if (nlines >= nrow - 1)
2795	{	2738	{
		2739	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2796	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2740	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2797	scr_add_lines (buf, str - buf, nlines);	2741	scr_add_lines (buf, str - buf, nlines);
2798		2742
2799	nlines = 0;	2743	nlines = 0;
2800	str = buf;	2744	str = buf;
2801	eol = str + min (ncol, UBUFSIZ);	2745	eol = str + min (ncol, UBUFSIZ);
…		…
2816		2760
2817	seq_begin = cmdbuf_ptr;	2761	seq_begin = cmdbuf_ptr;
2818	ch = next_char ();	2762	ch = next_char ();
2819	}	2763	}
2820		2764
		2765	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2821	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2766	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2822	scr_add_lines (buf, str - buf, nlines);	2767	scr_add_lines (buf, str - buf, nlines);
2823		2768
2824	/*	2769	/*
2825	* If there have been a lot of new lines, then update the screen	2770	* 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.	2771	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2832	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2777	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2833	refresh_limit++;	2778	refresh_limit++;
2834	else	2779	else
2835	{	2780	{
2836	flag = true;	2781	flag = true;
2837	scr_refresh (refresh_type);	2782	scr_refresh ();
2838	flush_ev.stop ();	2783	want_refresh = 1;
2839	}	2784	}
2840	}	2785	}
2841		2786
2842	}	2787	}
2843	else	2788	else
…		…
2860	return flag;	2805	return flag;
2861	}	2806	}
2862		2807
2863	// read the next character	2808	// read the next character
2864	wchar_t	2809	wchar_t
2865	rxvt_term::next_char ()	2810	rxvt_term::next_char () NOTHROW
2866	{	2811	{
2867	while (cmdbuf_ptr < cmdbuf_endp)	2812	while (cmdbuf_ptr < cmdbuf_endp)
2868	{	2813	{
2869	// assume 7-bit to be ascii ALWAYS	2814	// assume 7-bit to be ascii ALWAYS
2870	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2815	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2891	return NOCHAR;	2836	return NOCHAR;
2892	}	2837	}
2893		2838
2894	// read the next octet	2839	// read the next octet
2895	uint32_t	2840	uint32_t
2896	rxvt_term::next_octet ()	2841	rxvt_term::next_octet () NOTHROW
2897	{	2842	{
2898	return cmdbuf_ptr < cmdbuf_endp	2843	return cmdbuf_ptr < cmdbuf_endp
2899	? (unsigned char)*cmdbuf_ptr++	2844	? (unsigned char)*cmdbuf_ptr++
2900	: NOCHAR;	2845	: NOCHAR;
2901	}	2846	}
		2847
		2848	static class out_of_input out_of_input;
2902		2849
2903	/* rxvt_cmd_getc () - Return next input character */	2850	/* rxvt_cmd_getc () - Return next input character */
2904	/*	2851	/*
2905	* Return the next input character after first passing any keyboard input	2852	* Return the next input character after first passing any keyboard input
2906	* to the command.	2853	* to the command.
2907	*/	2854	*/
2908	wchar_t	2855	wchar_t
2909	rxvt_term::cmd_getc ()	2856	rxvt_term::cmd_getc () THROW ((class out_of_input))
2910	{	2857	{
2911	wchar_t c = next_char ();	2858	wchar_t c = next_char ();
2912		2859
2913	if (c == NOCHAR)	2860	if (c == NOCHAR)
2914	throw out_of_input;	2861	throw out_of_input;
2915		2862
2916	return c;	2863	return c;
2917	}	2864	}
2918		2865
2919	uint32_t	2866	uint32_t
2920	rxvt_term::cmd_get8 ()	2867	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2921	{	2868	{
2922	uint32_t c = next_octet ();	2869	uint32_t c = next_octet ();
2923		2870
2924	if (c == NOCHAR)	2871	if (c == NOCHAR)
2925	throw out_of_input;	2872	throw out_of_input;
…		…
3804	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3751	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3805	*/	3752	*/
3806	void	3753	void
3807	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3754	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3808	{	3755	{
3809	int changed = 0;
3810	int color;	3756	int color;
3811	char buf, name;	3757	char buf, name;
3812	bool query = str[0] == '?' && !str[1];	3758	bool query = str[0] == '?' && !str[1];
3813	int saveop = op;	3759	int saveop = op;
3814	dDisp;	3760	dDisp;
…		…
3869	{	3815	{
3870	if ((name = strchr (buf, ';')) == NULL)	3816	if ((name = strchr (buf, ';')) == NULL)
3871	break;	3817	break;
3872		3818
3873	*name++ = '\0';	3819	*name++ = '\0';
3874	color = atoi (buf);	3820	color = atoi (buf) + minCOLOR;
3875		3821
3876	if (color < 0 \|\| color >= TOTAL_COLORS)	3822	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3877	break;	3823	break;
3878		3824
3879	if ((buf = strchr (name, ';')) != NULL)	3825	if ((buf = strchr (name, ';')) != NULL)
3880	*buf++ = '\0';	3826	*buf++ = '\0';
3881		3827
3882	if (name[0] == '?' && !name[1])	3828	if (name[0] == '?' && !name[1])
3883	{	3829	{
3884	unsigned short r, g, b;	3830	unsigned short r, g, b;
3885	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3831	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);	3832	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3887	}	3833	}
3888	else	3834	else
3889	set_window_color (color + minCOLOR, name);	3835	set_window_color (color, name);
3890	}	3836	}
3891	break;	3837	break;
3892	case XTerm_Color00:	3838	case XTerm_Color00:
3893	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3839	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3894	break;	3840	break;
3895	case XTerm_Color01:	3841	case XTerm_Color01:
3896	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3842	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3897	break;	3843	break;
3898	#ifndef NO_CURSORCOLOR	3844	#ifndef NO_CURSORCOLOR
3899	case XTerm_Color_cursor:	3845	case XTerm_Color_cursor:
3900	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3846	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3901	break;	3847	break;
…		…
3905	break;	3851	break;
3906	case XTerm_Color_pointer_bg:	3852	case XTerm_Color_pointer_bg:
3907	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3853	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3908	break;	3854	break;
3909	#ifndef NO_BOLD_UNDERLINE_REVERSE	3855	#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:	3856	case XTerm_Color_RV:
3917	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3857	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3858	break;
		3859	case Rxvt_Color_BD:
		3860	case URxvt_Color_BD:
		3861	process_color_seq (op, Color_BD, str, resp);
		3862	break;
		3863	case Rxvt_Color_UL:
		3864	case URxvt_Color_UL:
		3865	process_color_seq (op, Color_UL, str, resp);
3918	break;	3866	break;
3919	case URxvt_Color_IT:	3867	case URxvt_Color_IT:
3920	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3868	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3921	break;	3869	break;
3922	#endif	3870	#endif
…		…
3927	if (am_transparent)	3875	if (am_transparent)
3928	want_full_refresh = want_refresh = 1;	3876	want_full_refresh = want_refresh = 1;
3929	break;	3877	break;
3930	#endif	3878	#endif
3931		3879
3932	case XTerm_Pixmap:	3880	case Rxvt_Pixmap:
		3881	{
3933	if (*str != ';')	3882	if (*str != ';')
3934	{	3883	{
3935	#if XPM_BACKGROUND	3884	#if XPM_BACKGROUND
3936	scale_pixmap (""); /* reset to default scaling */	3885	scale_pixmap (""); /* reset to default scaling */
3937	set_bgPixmap (str); /* change pixmap */	3886	set_bgPixmap (str); /* change pixmap */
3938	#endif
3939	scr_touch (true);	3887	scr_touch (true);
		3888	#endif
3940	}	3889	}
		3890
		3891	int changed = 0;
		3892
3941	while ((str = strchr (str, ';')) != NULL)	3893	while ((str = strchr (str, ';')) != NULL)
3942	{	3894	{
3943	str++;	3895	str++;
3944	#if XPM_BACKGROUND	3896	#if XPM_BACKGROUND
3945	changed += scale_pixmap (str);	3897	changed += scale_pixmap (str);
3946	#endif	3898	#endif
3947	}	3899	}
3948		3900
3949	if (changed)	3901	if (changed)
3950	{	3902	{
3951	#ifdef XPM_BACKGROUND	3903	#ifdef XPM_BACKGROUND
3952	resize_pixmap ();	3904	resize_pixmap ();
3953	#endif
3954	scr_touch (true);	3905	scr_touch (true);
		3906	#endif
3955	}	3907	}
		3908	}
3956	break;	3909	break;
3957		3910
3958	case XTerm_restoreFG:	3911	case Rxvt_restoreFG:
3959	set_window_color (Color_fg, str);	3912	set_window_color (Color_fg, str);
3960	break;	3913	break;
3961	case XTerm_restoreBG:	3914	case Rxvt_restoreBG:
3962	set_window_color (Color_bg, str);	3915	set_window_color (Color_bg, str);
3963	break;	3916	break;
3964		3917
3965	case XTerm_logfile:	3918	case XTerm_logfile:
3966	// TODO, when secure mode?	3919	// TODO, when secure mode?
3967	break;	3920	break;
3968		3921
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	3922	#if 0
3976	case XTerm_dumpscreen: /* no error notices */	3923	case Rxvt_dumpscreen: /* no error notices */
3977	{	3924	{
3978	int fd;	3925	int fd;
3979	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3926	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3980	{	3927	{
3981	scr_dump (fd);	3928	scr_dump (fd);
…		…
4012	if (query)	3959	if (query)
4013	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3960	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4014	else	3961	else
4015	{	3962	{
4016	set_locale (str);	3963	set_locale (str);
4017	pty.set_utf8_mode (enc_utf8);	3964	pty->set_utf8_mode (enc_utf8);
4018	init_xlocale ();	3965	init_xlocale ();
4019	}	3966	}
4020	break;	3967	break;
4021		3968
4022	case URxvt_view_up:	3969	case URxvt_view_up:
…		…
4075	return state;	4022	return state;
4076	}	4023	}
4077		4024
4078	/* we're not using priv _yet_ */	4025	/* we're not using priv _yet_ */
4079	void	4026	void
4080	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4027	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4081	{	4028	{
4082	unsigned int i, j;	4029	unsigned int i, j;
4083	int state;	4030	int state;
4084		4031
4085	static const struct	4032	static const struct
…		…
4096	{ 5, PrivMode_rVideo },	4043	{ 5, PrivMode_rVideo },
4097	{ 6, PrivMode_relOrigin },	4044	{ 6, PrivMode_relOrigin },
4098	{ 7, PrivMode_Autowrap },	4045	{ 7, PrivMode_Autowrap },
4099	// 8, bi-directional support mode	4046	// 8, bi-directional support mode
4100	{ 9, PrivMode_MouseX10 },	4047	{ 9, PrivMode_MouseX10 },
4101	#ifdef menuBar_esc
4102	{ menuBar_esc, PrivMode_menuBar },
4103	#endif
4104	// 18, 19 printing-related	4048	// 18, 19 printing-related
4105	{ 25, PrivMode_VisibleCursor },	4049	{ 25, PrivMode_VisibleCursor },
4106	#ifdef scrollBar_esc	4050	#ifdef scrollBar_esc
4107	{ scrollBar_esc, PrivMode_scrollBar },	4051	{ scrollBar_esc, PrivMode_scrollBar },
4108	#endif	4052	#endif
…		…
4203	/* case 8: - auto repeat, can't do on a per window basis */	4147	/* case 8: - auto repeat, can't do on a per window basis */
4204	case 9: /* X10 mouse reporting */	4148	case 9: /* X10 mouse reporting */
4205	if (state) /* orthogonal */	4149	if (state) /* orthogonal */
4206	priv_modes &= ~PrivMode_MouseX11;	4150	priv_modes &= ~PrivMode_MouseX11;
4207	break;	4151	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	4152	#ifdef scrollBar_esc
4216	case scrollBar_esc:	4153	case scrollBar_esc:
4217	if (scrollbar_mapping (state))	4154	if (scrollbar_mapping (state))
4218	{	4155	{
4219	resize_all_windows (0, 0, 0);	4156	resize_all_windows (0, 0, 0);
…		…
4461	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4398	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4462		4399
4463	void	4400	void
4464	rxvt_term::tt_write (const char *data, unsigned int len)	4401	rxvt_term::tt_write (const char *data, unsigned int len)
4465	{	4402	{
4466	if (pty.pty < 0)	4403	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4467	return;	4404	return;
4468		4405
		4406	if (pty->pty < 0)
		4407	return;
		4408
4469	if (v_buflen == 0)	4409	if (v_buflen == 0)
4470	{	4410	{
4471	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4411	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4472		4412
4473	if ((unsigned int)written == len)	4413	if ((unsigned int)written == len)
4474	return;	4414	return;
4475		4415
4476	data += written;	4416	data += written;
…		…
4485	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4425	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4486	}	4426	}
4487		4427
4488	void rxvt_term::pty_write ()	4428	void rxvt_term::pty_write ()
4489	{	4429	{
4490	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4430	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4491		4431
4492	if (written > 0)	4432	if (written > 0)
4493	{	4433	{
4494	v_buflen -= written;	4434	v_buflen -= written;
4495		4435

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.277 by root, Fri Jan 20 12:16:28 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.277 by root, Fri Jan 20 12:16:28 2006 UTC