[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.275 by root, Fri Jan 20 10:35:25 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
…		…
1508	{	1499	{
1509	seen_resize = 1;	1500	seen_resize = 1;
1510	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1501	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1511	}	1502	}
1512		1503
		1504	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1505
1513	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1506	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1514	if (OPTION (Opt_transparent))	1507	if (OPTION (Opt_transparent))
1515	check_our_parents ();	1508	check_our_parents ();
1516	#endif	1509	#endif
1517	}	1510	}
…		…
1572		1565
1573	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1566	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1574	scr_expose (ev.xexpose.x, ev.xexpose.y,	1567	scr_expose (ev.xexpose.x, ev.xexpose.y,
1575	ev.xexpose.width, ev.xexpose.height, False);	1568	ev.xexpose.width, ev.xexpose.height, False);
1576		1569
1577	scr_refresh (refresh_type);	1570	want_refresh = 1;
1578	}	1571	}
1579	else	1572	else
1580	{	1573	{
1581	XEvent unused_event;	1574	XEvent unused_event;
1582		1575
…		…
1588	if (isScrollbarWindow (ev.xany.window))	1581	if (isScrollbarWindow (ev.xany.window))
1589	{	1582	{
1590	scrollBar.setIdle ();	1583	scrollBar.setIdle ();
1591	scrollbar_show (0);	1584	scrollbar_show (0);
1592	}	1585	}
1593	#ifdef MENUBAR
1594	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1595	menubar_expose ();
1596	#endif
1597		1586
1598	#ifdef TRANSPARENT	1587	#ifdef TRANSPARENT
1599	if (am_transparent && ev.xany.window == parent[0])	1588	if (am_transparent && ev.xany.window == parent[0])
1600	XClearWindow (disp, ev.xany.window);	1589	XClearWindow (disp, ev.xany.window);
1601	#endif	1590	#endif
…		…
1605	case MotionNotify:	1594	case MotionNotify:
1606	#ifdef POINTER_BLANK	1595	#ifdef POINTER_BLANK
1607	if (hidden_pointer)	1596	if (hidden_pointer)
1608	pointer_unblank ();	1597	pointer_unblank ();
1609	#endif	1598	#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)	1599	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1618	break;	1600	break;
1619		1601
1620	if (ev.xany.window == vt)	1602	if (ev.xany.window == vt)
1621	{	1603	{
		1604	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1605	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623	; // nop	1606	; // nop
1624	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1607	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1625	{	1608	{
1626	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1609	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1627	;	1610	;
…		…
1709	&unused_root_x, &unused_root_y,	1692	&unused_root_x, &unused_root_y,
1710	&ev.xbutton.x, &ev.xbutton.y,	1693	&ev.xbutton.x, &ev.xbutton.y,
1711	&unused_mask);	1694	&unused_mask);
1712	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1695	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1713	scrollbar_size ());	1696	scrollbar_size ());
1714	scr_refresh (refresh_type);	1697	want_refresh = 1;
1715	refresh_limit = 0;	1698	refresh_limit = 0;
1716	scrollbar_show (1);	1699	scrollbar_show (1);
1717	}	1700	}
1718	break;	1701	break;
1719	}	1702	}
…		…
1727	{	1710	{
1728	hidden_cursor = 0;	1711	hidden_cursor = 0;
1729	want_refresh = 1;	1712	want_refresh = 1;
1730	}	1713	}
1731		1714
1732	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1715	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733	}	1716	}
1734	#endif	1717	#endif
1735		1718
1736	#if defined(POINTER_BLANK)	1719	#if defined(POINTER_BLANK)
1737	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1720	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1765	XSetICFocus (Input_Context);	1748	XSetICFocus (Input_Context);
1766	}	1749	}
1767	#endif	1750	#endif
1768	#if CURSOR_BLINK	1751	#if CURSOR_BLINK
1769	if (OPTION (Opt_cursorBlink))	1752	if (OPTION (Opt_cursorBlink))
1770	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1753	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1771	#endif	1754	#endif
1772	#if OFF_FOCUS_FADING	1755	#if OFF_FOCUS_FADING
1773	if (rs[Rs_fade])	1756	if (rs[Rs_fade])
1774	{	1757	{
1775	pix_colors = pix_colors_focused;	1758	pix_colors = pix_colors_focused;
…		…
1819		1802
1820	#if TRANSPARENT	1803	#if TRANSPARENT
1821	void	1804	void
1822	rxvt_term::rootwin_cb (XEvent &ev)	1805	rxvt_term::rootwin_cb (XEvent &ev)
1823	{	1806	{
1824	SET_R (this);	1807	make_current ();
1825	SET_LOCALE (locale);
1826		1808
1827	switch (ev.type)	1809	switch (ev.type)
1828	{	1810	{
1829	case PropertyNotify:	1811	case PropertyNotify:
1830	/*	1812	/*
…		…
1921	#else	1903	#else
1922	selection.rect = false;	1904	selection.rect = false;
1923	#endif	1905	#endif
1924		1906
1925	/* allow shift+left click to extend selection */	1907	/* allow shift+left click to extend selection */
1926	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1908	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1927	{	1909	{
1928	if (MEvent.button == Button1 && clickintime)	1910	if (MEvent.button == Button1 && clickintime)
1929	selection_rotate (ev.x, ev.y);	1911	selection_rotate (ev.x, ev.y);
1930	else	1912	else
1931	selection_extend (ev.x, ev.y, 1);	1913	selection_extend (ev.x, ev.y, 1);
…		…
2099	}	2081	}
2100	}	2082	}
2101		2083
2102	return;	2084	return;
2103	}	2085	}
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	}	2086	}
2113		2087
2114	void	2088	void
2115	rxvt_term::button_release (XButtonEvent &ev)	2089	rxvt_term::button_release (XButtonEvent &ev)
2116	{	2090	{
…		…
2122		2096
2123	if (scrollbar_isUpDn ())	2097	if (scrollbar_isUpDn ())
2124	{	2098	{
2125	scrollBar.setIdle ();	2099	scrollBar.setIdle ();
2126	scrollbar_show (0);	2100	scrollbar_show (0);
2127	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2128	refresh_type &= ~SMOOTH_REFRESH;
2129	#endif
2130	}	2101	}
2131		2102
2132	#ifdef SELECTION_SCROLLING	2103	#ifdef SELECTION_SCROLLING
2133	if (sel_scroll_ev.active)	2104	if (sel_scroll_ev.active)
2134	sel_scroll_ev.stop();	2105	sel_scroll_ev.stop();
…		…
2181	{	2152	{
2182	case Button1:	2153	case Button1:
2183	case Button3:	2154	case Button3:
2184	selection_make (ev.time);	2155	selection_make (ev.time);
2185	break;	2156	break;
		2157
2186	case Button2:	2158	case Button2:
2187	selection_request (ev.time, ev.x, ev.y);	2159	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2160	selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2188	break;	2161	break;
		2162
2189	#ifdef MOUSE_WHEEL	2163	#ifdef MOUSE_WHEEL
2190	case Button4:	2164	case Button4:
2191	case Button5:	2165	case Button5:
2192	{	2166	{
2193	int i;	2167	int i;
…		…
2215	slip_wheel_ev.start ();	2189	slip_wheel_ev.start ();
2216	}	2190	}
2217	else	2191	else
2218	{	2192	{
2219	# endif	2193	# endif
2220	# ifdef JUMP_MOUSE_WHEEL
2221	scr_page (v, i);	2194	scr_page (v, i);
2222	scr_refresh (SMOOTH_REFRESH);
2223	scrollbar_show (1);	2195	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	2196	# ifdef MOUSE_SLIP_WHEELING
2233	}	2197	}
2234	#endif	2198	# endif
2235	}	2199	}
2236	break;	2200	break;
2237	#endif	2201	#endif
2238	}	2202	}
2239	}	2203	}
2240	#ifdef MENUBAR
2241	else if (isMenuBarWindow (ev.window))
2242	menubar_control (ev);
2243	#endif
2244	}	2204	}
2245		2205
2246	#ifdef TRANSPARENT	2206	#ifdef TRANSPARENT
2247	#if TINTING	2207	#if TINTING
2248	/* taken from aterm-0.4.2 */	2208	/* taken from aterm-0.4.2 */
…		…
2791	}	2751	}
2792		2752
2793	// scr_add_lines only works for nlines <= nrow - 1.	2753	// scr_add_lines only works for nlines <= nrow - 1.
2794	if (nlines >= nrow - 1)	2754	if (nlines >= nrow - 1)
2795	{	2755	{
		2756	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2796	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2757	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2797	scr_add_lines (buf, str - buf, nlines);	2758	scr_add_lines (buf, str - buf, nlines);
2798		2759
2799	nlines = 0;	2760	nlines = 0;
2800	str = buf;	2761	str = buf;
2801	eol = str + min (ncol, UBUFSIZ);	2762	eol = str + min (ncol, UBUFSIZ);
…		…
2816		2777
2817	seq_begin = cmdbuf_ptr;	2778	seq_begin = cmdbuf_ptr;
2818	ch = next_char ();	2779	ch = next_char ();
2819	}	2780	}
2820		2781
		2782	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2821	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2783	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2822	scr_add_lines (buf, str - buf, nlines);	2784	scr_add_lines (buf, str - buf, nlines);
2823		2785
2824	/*	2786	/*
2825	* If there have been a lot of new lines, then update the screen	2787	* 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.	2788	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2832	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2794	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2833	refresh_limit++;	2795	refresh_limit++;
2834	else	2796	else
2835	{	2797	{
2836	flag = true;	2798	flag = true;
2837	scr_refresh (refresh_type);	2799	scr_refresh ();
2838	flush_ev.stop ();	2800	want_refresh = 1;
2839	}	2801	}
2840	}	2802	}
2841		2803
2842	}	2804	}
2843	else	2805	else
…		…
2860	return flag;	2822	return flag;
2861	}	2823	}
2862		2824
2863	// read the next character	2825	// read the next character
2864	wchar_t	2826	wchar_t
2865	rxvt_term::next_char ()	2827	rxvt_term::next_char () NOTHROW
2866	{	2828	{
2867	while (cmdbuf_ptr < cmdbuf_endp)	2829	while (cmdbuf_ptr < cmdbuf_endp)
2868	{	2830	{
2869	// assume 7-bit to be ascii ALWAYS	2831	// assume 7-bit to be ascii ALWAYS
2870	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2832	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2891	return NOCHAR;	2853	return NOCHAR;
2892	}	2854	}
2893		2855
2894	// read the next octet	2856	// read the next octet
2895	uint32_t	2857	uint32_t
2896	rxvt_term::next_octet ()	2858	rxvt_term::next_octet () NOTHROW
2897	{	2859	{
2898	return cmdbuf_ptr < cmdbuf_endp	2860	return cmdbuf_ptr < cmdbuf_endp
2899	? (unsigned char)*cmdbuf_ptr++	2861	? (unsigned char)*cmdbuf_ptr++
2900	: NOCHAR;	2862	: NOCHAR;
2901	}	2863	}
		2864
		2865	static class out_of_input out_of_input;
2902		2866
2903	/* rxvt_cmd_getc () - Return next input character */	2867	/* rxvt_cmd_getc () - Return next input character */
2904	/*	2868	/*
2905	* Return the next input character after first passing any keyboard input	2869	* Return the next input character after first passing any keyboard input
2906	* to the command.	2870	* to the command.
2907	*/	2871	*/
2908	wchar_t	2872	wchar_t
2909	rxvt_term::cmd_getc ()	2873	rxvt_term::cmd_getc () THROW ((class out_of_input))
2910	{	2874	{
2911	wchar_t c = next_char ();	2875	wchar_t c = next_char ();
2912		2876
2913	if (c == NOCHAR)	2877	if (c == NOCHAR)
2914	throw out_of_input;	2878	throw out_of_input;
2915		2879
2916	return c;	2880	return c;
2917	}	2881	}
2918		2882
2919	uint32_t	2883	uint32_t
2920	rxvt_term::cmd_get8 ()	2884	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2921	{	2885	{
2922	uint32_t c = next_octet ();	2886	uint32_t c = next_octet ();
2923		2887
2924	if (c == NOCHAR)	2888	if (c == NOCHAR)
2925	throw out_of_input;	2889	throw out_of_input;
…		…
3804	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3768	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3805	*/	3769	*/
3806	void	3770	void
3807	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3771	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3808	{	3772	{
3809	int changed = 0;
3810	int color;	3773	int color;
3811	char buf, name;	3774	char buf, name;
3812	bool query = str[0] == '?' && !str[1];	3775	bool query = str[0] == '?' && !str[1];
3813	int saveop = op;	3776	int saveop = op;
3814	dDisp;	3777	dDisp;
…		…
3869	{	3832	{
3870	if ((name = strchr (buf, ';')) == NULL)	3833	if ((name = strchr (buf, ';')) == NULL)
3871	break;	3834	break;
3872		3835
3873	*name++ = '\0';	3836	*name++ = '\0';
3874	color = atoi (buf);	3837	color = atoi (buf) + minCOLOR;
3875		3838
3876	if (color < 0 \|\| color >= TOTAL_COLORS)	3839	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3877	break;	3840	break;
3878		3841
3879	if ((buf = strchr (name, ';')) != NULL)	3842	if ((buf = strchr (name, ';')) != NULL)
3880	*buf++ = '\0';	3843	*buf++ = '\0';
3881		3844
3882	if (name[0] == '?' && !name[1])	3845	if (name[0] == '?' && !name[1])
3883	{	3846	{
3884	unsigned short r, g, b;	3847	unsigned short r, g, b;
3885	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3848	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);	3849	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3887	}	3850	}
3888	else	3851	else
3889	set_window_color (color + minCOLOR, name);	3852	set_window_color (color, name);
3890	}	3853	}
3891	break;	3854	break;
3892	case XTerm_Color00:	3855	case XTerm_Color00:
3893	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3856	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3894	break;	3857	break;
3895	case XTerm_Color01:	3858	case XTerm_Color01:
3896	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3859	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3897	break;	3860	break;
3898	#ifndef NO_CURSORCOLOR	3861	#ifndef NO_CURSORCOLOR
3899	case XTerm_Color_cursor:	3862	case XTerm_Color_cursor:
3900	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3863	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3901	break;	3864	break;
…		…
3905	break;	3868	break;
3906	case XTerm_Color_pointer_bg:	3869	case XTerm_Color_pointer_bg:
3907	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3870	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3908	break;	3871	break;
3909	#ifndef NO_BOLD_UNDERLINE_REVERSE	3872	#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:	3873	case XTerm_Color_RV:
3917	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3874	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3875	break;
		3876	case Rxvt_Color_BD:
		3877	case URxvt_Color_BD:
		3878	process_color_seq (op, Color_BD, str, resp);
		3879	break;
		3880	case Rxvt_Color_UL:
		3881	case URxvt_Color_UL:
		3882	process_color_seq (op, Color_UL, str, resp);
3918	break;	3883	break;
3919	case URxvt_Color_IT:	3884	case URxvt_Color_IT:
3920	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3885	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3921	break;	3886	break;
3922	#endif	3887	#endif
…		…
3927	if (am_transparent)	3892	if (am_transparent)
3928	want_full_refresh = want_refresh = 1;	3893	want_full_refresh = want_refresh = 1;
3929	break;	3894	break;
3930	#endif	3895	#endif
3931		3896
3932	case XTerm_Pixmap:	3897	case Rxvt_Pixmap:
		3898	{
3933	if (*str != ';')	3899	if (*str != ';')
3934	{	3900	{
3935	#if XPM_BACKGROUND	3901	#if XPM_BACKGROUND
3936	scale_pixmap (""); /* reset to default scaling */	3902	scale_pixmap (""); /* reset to default scaling */
3937	set_bgPixmap (str); /* change pixmap */	3903	set_bgPixmap (str); /* change pixmap */
3938	#endif
3939	scr_touch (true);	3904	scr_touch (true);
		3905	#endif
3940	}	3906	}
		3907
		3908	int changed = 0;
		3909
3941	while ((str = strchr (str, ';')) != NULL)	3910	while ((str = strchr (str, ';')) != NULL)
3942	{	3911	{
3943	str++;	3912	str++;
3944	#if XPM_BACKGROUND	3913	#if XPM_BACKGROUND
3945	changed += scale_pixmap (str);	3914	changed += scale_pixmap (str);
3946	#endif	3915	#endif
3947	}	3916	}
3948		3917
3949	if (changed)	3918	if (changed)
3950	{	3919	{
3951	#ifdef XPM_BACKGROUND	3920	#ifdef XPM_BACKGROUND
3952	resize_pixmap ();	3921	resize_pixmap ();
3953	#endif
3954	scr_touch (true);	3922	scr_touch (true);
		3923	#endif
3955	}	3924	}
		3925	}
3956	break;	3926	break;
3957		3927
3958	case XTerm_restoreFG:	3928	case Rxvt_restoreFG:
3959	set_window_color (Color_fg, str);	3929	set_window_color (Color_fg, str);
3960	break;	3930	break;
3961	case XTerm_restoreBG:	3931	case Rxvt_restoreBG:
3962	set_window_color (Color_bg, str);	3932	set_window_color (Color_bg, str);
3963	break;	3933	break;
3964		3934
3965	case XTerm_logfile:	3935	case XTerm_logfile:
3966	// TODO, when secure mode?	3936	// TODO, when secure mode?
3967	break;	3937	break;
3968		3938
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	3939	#if 0
3976	case XTerm_dumpscreen: /* no error notices */	3940	case Rxvt_dumpscreen: /* no error notices */
3977	{	3941	{
3978	int fd;	3942	int fd;
3979	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3943	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3980	{	3944	{
3981	scr_dump (fd);	3945	scr_dump (fd);
…		…
4012	if (query)	3976	if (query)
4013	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3977	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4014	else	3978	else
4015	{	3979	{
4016	set_locale (str);	3980	set_locale (str);
4017	pty.set_utf8_mode (enc_utf8);	3981	pty->set_utf8_mode (enc_utf8);
4018	init_xlocale ();	3982	init_xlocale ();
4019	}	3983	}
4020	break;	3984	break;
4021		3985
4022	case URxvt_view_up:	3986	case URxvt_view_up:
…		…
4075	return state;	4039	return state;
4076	}	4040	}
4077		4041
4078	/* we're not using priv _yet_ */	4042	/* we're not using priv _yet_ */
4079	void	4043	void
4080	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4044	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4081	{	4045	{
4082	unsigned int i, j;	4046	unsigned int i, j;
4083	int state;	4047	int state;
4084		4048
4085	static const struct	4049	static const struct
…		…
4096	{ 5, PrivMode_rVideo },	4060	{ 5, PrivMode_rVideo },
4097	{ 6, PrivMode_relOrigin },	4061	{ 6, PrivMode_relOrigin },
4098	{ 7, PrivMode_Autowrap },	4062	{ 7, PrivMode_Autowrap },
4099	// 8, bi-directional support mode	4063	// 8, bi-directional support mode
4100	{ 9, PrivMode_MouseX10 },	4064	{ 9, PrivMode_MouseX10 },
4101	#ifdef menuBar_esc
4102	{ menuBar_esc, PrivMode_menuBar },
4103	#endif
4104	// 18, 19 printing-related	4065	// 18, 19 printing-related
4105	{ 25, PrivMode_VisibleCursor },	4066	{ 25, PrivMode_VisibleCursor },
4106	#ifdef scrollBar_esc	4067	#ifdef scrollBar_esc
4107	{ scrollBar_esc, PrivMode_scrollBar },	4068	{ scrollBar_esc, PrivMode_scrollBar },
4108	#endif	4069	#endif
…		…
4203	/* case 8: - auto repeat, can't do on a per window basis */	4164	/* case 8: - auto repeat, can't do on a per window basis */
4204	case 9: /* X10 mouse reporting */	4165	case 9: /* X10 mouse reporting */
4205	if (state) /* orthogonal */	4166	if (state) /* orthogonal */
4206	priv_modes &= ~PrivMode_MouseX11;	4167	priv_modes &= ~PrivMode_MouseX11;
4207	break;	4168	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	4169	#ifdef scrollBar_esc
4216	case scrollBar_esc:	4170	case scrollBar_esc:
4217	if (scrollbar_mapping (state))	4171	if (scrollbar_mapping (state))
4218	{	4172	{
4219	resize_all_windows (0, 0, 0);	4173	resize_all_windows (0, 0, 0);
…		…
4461	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4415	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4462		4416
4463	void	4417	void
4464	rxvt_term::tt_write (const char *data, unsigned int len)	4418	rxvt_term::tt_write (const char *data, unsigned int len)
4465	{	4419	{
4466	if (pty.pty < 0)	4420	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4467	return;	4421	return;
4468		4422
		4423	if (pty->pty < 0)
		4424	return;
		4425
4469	if (v_buflen == 0)	4426	if (v_buflen == 0)
4470	{	4427	{
4471	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4428	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4472		4429
4473	if ((unsigned int)written == len)	4430	if ((unsigned int)written == len)
4474	return;	4431	return;
4475		4432
4476	data += written;	4433	data += written;
…		…
4485	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4442	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4486	}	4443	}
4487		4444
4488	void rxvt_term::pty_write ()	4445	void rxvt_term::pty_write ()
4489	{	4446	{
4490	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4447	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4491		4448
4492	if (written > 0)	4449	if (written > 0)
4493	{	4450	{
4494	v_buflen -= written;	4451	v_buflen -= written;
4495		4452

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.275 by root, Fri Jan 20 10:35:25 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.275 by root, Fri Jan 20 10:35:25 2006 UTC