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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.244 by root, Fri Jan 6 17:09:27 2006 UTC vs.
Revision 1.265 by root, Mon Jan 16 08:29:57 2006 UTC

…		…
147	\|\| !IN_RANGE_EXC (y, 0, nrow))	147	\|\| !IN_RANGE_EXC (y, 0, nrow))
148	return;	148	return;
149		149
150	for (;;)	150	for (;;)
151	{	151	{
152	const line_t &l = ROW(y - view_start);	152	const line_t &l = ROW(y + view_start);
153		153
154	text_t t = l.t[x];	154	text_t t = l.t[x];
155		155
156	if (t != NOCHAR \|\| !x)	156	if (t != NOCHAR \|\| !x)
157	{	157	{
…		…
443	scr_move_to (0, 1);	443	scr_move_to (0, 1);
444	return;	444	return;
445	}	445	}
446	else if (keysym == XK_End)	446	else if (keysym == XK_End)
447	{	447	{
448	scr_move_to (1, 0);	448	scr_move_to (1, 1);
449	return;	449	return;
450	}	450	}
451	}	451	}
452	#endif	452	#endif
453	}	453	}
…		…
867	#endif	867	#endif
868	/* nil */ ;	868	/* nil */ ;
869	}	869	}
870	}	870	}
871		871
872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END)))	872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873	return;	873	return;
874		874
875	if (len <= 0)	875	if (len <= 0)
876	return; /* not mapped */	876	return; /* not mapped */
877		877
…		…
972		972
973	if (want_refresh)	973	if (want_refresh)
974	{	974	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	976	{
977	int row = -view_start;	977	int row = view_start;
		978	int end_row = row + nrow;
978		979
979	while (row > -nsaved && ROW (row - 1).is_longer ())	980	while (row > top_row && ROW (row - 1).is_longer ())
980	--row;	981	--row;
981		982
982	while (row < -view_start + nrow)	983	do
983	{	984	{
984	int start_row = row;	985	int start_row = row;
985	line_t *l;	986	line_t *l;
986		987
987	do	988	do
988	{	989	{
989	l = &ROW (row);	990	l = &ROW (row++);
990		991
991	if (!(l->f & LINE_FILTERED))	992	if (!(l->f & LINE_FILTERED))
992	{	993	{
993	// line not filtered, mark it as filtered	994	// line not filtered, mark it as filtered
994	l->f \|= LINE_FILTERED;	995	l->f \|= LINE_FILTERED;
995	while (l->is_longer ())	996	while (l->is_longer ())
996	{	997	{
997	l = &ROW (++row);	998	l = &ROW (row++);
998	l->f \|= LINE_FILTERED;	999	l->f \|= LINE_FILTERED;
999	}	1000	}
1000		1001
1001	// and filter it	1002	// and filter it
1002	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	1003	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003		1004
1004	break;	1005	break;
1005	}	1006	}
1006	}	1007	}
1007	while (l->is_longer ());	1008	while (l->is_longer () && row < end_row);
1008
1009	row++;
1010	}	1009	}
1011		1010	while (row < end_row);
1012	}	1011	}
1013		1012
1014	scr_refresh (refresh_type);	1013	scr_refresh (refresh_type);
1015	scrollbar_show (1);	1014	scrollbar_show (1);
1016	#ifdef USE_XIM	1015	#ifdef USE_XIM
…		…
1022	}	1021	}
1023		1022
1024	void	1023	void
1025	rxvt_term::check_cb (check_watcher &w)	1024	rxvt_term::check_cb (check_watcher &w)
1026	{	1025	{
1027	SET_R (this);	1026	make_current ();
1028	SET_LOCALE (locale);
1029		1027
1030	display->flush ();	1028	display->flush ();
1031		1029
1032	if (want_refresh && !flush_ev.active)	1030	if (want_refresh && !flush_ev.active)
1033	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1031	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034	}	1032	}
1035		1033
1036	void	1034	void
1037	rxvt_term::flush_cb (time_watcher &w)	1035	rxvt_term::flush_cb (time_watcher &w)
1038	{	1036	{
1039	SET_R (this);	1037	make_current ();
1040	SET_LOCALE (locale);
1041		1038
1042	refresh_limit = 1;	1039	refresh_limit = 1;
1043	refresh_count = 0;	1040	refresh_count = 0;
1044	flush ();	1041	flush ();
1045	}	1042	}
…		…
1102	{	1099	{
1103	if (mouse_slip_wheel_speed == 0	1100	if (mouse_slip_wheel_speed == 0
1104	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1101	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105	: scr_page (UP, mouse_slip_wheel_speed))	1102	: scr_page (UP, mouse_slip_wheel_speed))
1106	{	1103	{
1107	if (view_start == nsaved \|\|	1104	if (view_start == top_row \|\| view_start == 0)
1108	view_start == 0)
1109	mouse_slip_wheel_speed = 0;	1105	mouse_slip_wheel_speed = 0;
1110		1106
1111	refresh_type \|= SMOOTH_REFRESH;	1107	refresh_type \|= SMOOTH_REFRESH;
1112	want_refresh = 1;	1108	want_refresh = 1;
1113	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1109	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
…		…
1174	}	1170	}
1175		1171
1176	void	1172	void
1177	rxvt_term::pty_cb (io_watcher &w, short revents)	1173	rxvt_term::pty_cb (io_watcher &w, short revents)
1178	{	1174	{
1179	SET_R (this);	1175	make_current ();
1180	SET_LOCALE (locale);
1181		1176
1182	if (revents & EVENT_READ)	1177	if (revents & EVENT_READ)
1183	// loop, but don't allow a single term to monopolize us	1178	// loop, but don't allow a single term to monopolize us
1184	while (pty_fill ())	1179	while (pty_fill ())
1185	if (cmd_parse ())	1180	if (cmd_parse ())
…		…
1217	}	1212	}
1218		1213
1219	void	1214	void
1220	rxvt_term::pointer_cb (time_watcher &w)	1215	rxvt_term::pointer_cb (time_watcher &w)
1221	{	1216	{
1222	SET_R (this);	1217	make_current ();
1223	SET_LOCALE (locale);
1224		1218
1225	pointer_blank ();	1219	pointer_blank ();
1226	}	1220	}
1227	#endif	1221	#endif
1228		1222
…		…
1307		1301
1308	/{{{ process an X event /	1302	/{{{ process an X event /
1309	void	1303	void
1310	rxvt_term::x_cb (XEvent &ev)	1304	rxvt_term::x_cb (XEvent &ev)
1311	{	1305	{
		1306	make_current ();
		1307
1312	dDisp;	1308	dDisp;
1313		1309
1314	SET_R (this);	1310	if (ev.xany.window == vt
1315	SET_LOCALE (locale);	1311	&& SHOULD_INVOKE (HOOK_X_EVENT)
		1312	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
		1313	return;
1316		1314
1317	#if defined(CURSOR_BLINK)	1315	// 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;	1316	Window unused_root, unused_child;
1345	int unused_root_x, unused_root_y;	1317	int unused_root_x, unused_root_y;
1346	unsigned int unused_mask;	1318	unsigned int unused_mask;
1347		1319
1348	switch (ev.type)	1320	switch (ev.type)
…		…
1355		1327
1356	break;	1328	break;
1357		1329
1358	case KeyRelease:	1330	case KeyRelease:
1359	{	1331	{
1360	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1332	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1361	KeySym ks;	1333	KeySym keysym;
1362		1334
1363	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1335	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364	#endif	1336	#endif
1365		1337
1366	#if ENABLE_FRILLS \|\| ISO_14755	1338	#if ENABLE_FRILLS \|\| ISO_14755
1367	// ISO 14755 support	1339	// ISO 14755 support
1368	if (iso14755buf)	1340	if (iso14755buf)
…		…
1373	# endif	1345	# endif
1374	# if ISO_14755	1346	# if ISO_14755
1375	// iso14755 part 5.2 handling: release time	1347	// iso14755 part 5.2 handling: release time
1376	// first: controls	1348	// first: controls
1377	if ((ev.xkey.state & ControlMask)	1349	if ((ev.xkey.state & ControlMask)
1378	&& ((ks >= 0x40 && ks <= 0x5f)	1350	&& ((keysym >= 0x40 && keysym <= 0x5f)
1379	\|\| (ks >= 0x61 && ks <= 0x7f)))	1351	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1380	{	1352	{
1381	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1353	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1382	commit_iso14755 ();	1354	commit_iso14755 ();
1383	return; // case-break;	1355	goto skip_switch;
1384	}	1356	}
1385		1357
1386	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1358	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387	if (i[0] == ks)	1359	if (i[0] == keysym)
1388	{	1360	{
1389	iso14755buf = ISO_14755_51 \| i[1];	1361	iso14755buf = ISO_14755_51 \| i[1];
1390	commit_iso14755 ();	1362	commit_iso14755 ();
1391	return; // case-break;	1363	goto skip_switch;
1392	}	1364	}
1393		1365
1394	scr_bell ();	1366	scr_bell ();
1395	# endif	1367	# endif
1396	iso14755buf = 0;	1368	iso14755buf = 0;
…		…
1416	iso14755buf = 0;	1388	iso14755buf = 0;
1417	}	1389	}
1418	#endif	1390	#endif
1419		1391
1420	if (ev.xany.window == vt	1392	if (ev.xany.window == vt
1421	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))	1393	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1422	break;	1394	break;
1423		1395
1424	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1396	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1425	if (!(ev.xkey.state & ControlMask))	1397	if (!(ev.xkey.state & ControlMask))
1426	slip_wheel_ev.stop ();	1398	slip_wheel_ev.stop ();
1427	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1399	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1428	mouse_slip_wheel_speed = 0;	1400	mouse_slip_wheel_speed = 0;
1429	#endif	1401	#endif
1430	break;	1402	break;
1431	}	1403	}
1432		1404
…		…
1562		1534
1563	case SelectionRequest:	1535	case SelectionRequest:
1564	selection_send (ev.xselectionrequest);	1536	selection_send (ev.xselectionrequest);
1565	break;	1537	break;
1566		1538
		1539	case MapNotify:
		1540	mapped = 1;
		1541	#ifdef TEXT_BLINK
		1542	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1543	#endif
		1544	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
		1545	break;
		1546
1567	case UnmapNotify:	1547	case UnmapNotify:
1568	mapped = 0;	1548	mapped = 0;
1569	#ifdef TEXT_BLINK	1549	#ifdef TEXT_BLINK
1570	text_blink_ev.stop ();	1550	text_blink_ev.stop ();
1571	#endif	1551	#endif
1572	break;	1552	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573
1574	case MapNotify:
1575	mapped = 1;
1576	#ifdef TEXT_BLINK
1577	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1578	#endif
1579	break;	1553	break;
1580		1554
1581	#ifdef TRANSPARENT	1555	#ifdef TRANSPARENT
1582	case ReparentNotify:	1556	case ReparentNotify:
1583	rootwin_cb (ev);	1557	rootwin_cb (ev);
…		…
1597		1571
1598	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1572	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1599	scr_expose (ev.xexpose.x, ev.xexpose.y,	1573	scr_expose (ev.xexpose.x, ev.xexpose.y,
1600	ev.xexpose.width, ev.xexpose.height, False);	1574	ev.xexpose.width, ev.xexpose.height, False);
1601		1575
1602	scr_refresh (refresh_type);	1576	want_refresh = 1;
1603	}	1577	}
1604	else	1578	else
1605	{	1579	{
1606	XEvent unused_event;	1580	XEvent unused_event;
1607		1581
…		…
1642	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1616	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1643	break;	1617	break;
1644		1618
1645	if (ev.xany.window == vt)	1619	if (ev.xany.window == vt)
1646	{	1620	{
		1621	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1647	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1622	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1648	; // nop	1623	; // nop
1649	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1624	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1650	{	1625	{
1651	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1626	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1652	;	1627	;
…		…
1734	&unused_root_x, &unused_root_y,	1709	&unused_root_x, &unused_root_y,
1735	&ev.xbutton.x, &ev.xbutton.y,	1710	&ev.xbutton.x, &ev.xbutton.y,
1736	&unused_mask);	1711	&unused_mask);
1737	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1712	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1738	scrollbar_size ());	1713	scrollbar_size ());
1739	scr_refresh (refresh_type);	1714	want_refresh = 1;
1740	refresh_limit = 0;	1715	refresh_limit = 0;
1741	scrollbar_show (1);	1716	scrollbar_show (1);
1742	}	1717	}
1743	break;	1718	break;
1744	}	1719	}
		1720
		1721	skip_switch: ;
		1722
		1723	#if defined(CURSOR_BLINK)
		1724	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1725	{
		1726	if (hidden_cursor)
		1727	{
		1728	hidden_cursor = 0;
		1729	want_refresh = 1;
		1730	}
		1731
		1732	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1733	}
		1734	#endif
		1735
		1736	#if defined(POINTER_BLANK)
		1737	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1738	{
		1739	if (ev.type == MotionNotify
		1740	\|\| ev.type == ButtonPress
		1741	\|\| ev.type == ButtonRelease)
		1742	if (hidden_pointer)
		1743	pointer_unblank ();
		1744
		1745	if (ev.type == KeyPress && hidden_pointer == 0)
		1746	pointer_blank ();
		1747	}
		1748	#endif
1745	}	1749	}
1746		1750
1747	void	1751	void
1748	rxvt_term::focus_in ()	1752	rxvt_term::focus_in ()
1749	{	1753	{
…		…
1815		1819
1816	#if TRANSPARENT	1820	#if TRANSPARENT
1817	void	1821	void
1818	rxvt_term::rootwin_cb (XEvent &ev)	1822	rxvt_term::rootwin_cb (XEvent &ev)
1819	{	1823	{
1820	SET_R (this);	1824	make_current ();
1821	SET_LOCALE (locale);
1822		1825
1823	switch (ev.type)	1826	switch (ev.type)
1824	{	1827	{
1825	case PropertyNotify:	1828	case PropertyNotify:
1826	/*	1829	/*
…		…
1917	#else	1920	#else
1918	selection.rect = false;	1921	selection.rect = false;
1919	#endif	1922	#endif
1920		1923
1921	/* allow shift+left click to extend selection */	1924	/* allow shift+left click to extend selection */
1922	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1925	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1923	{	1926	{
1924	if (MEvent.button == Button1 && clickintime)	1927	if (MEvent.button == Button1 && clickintime)
1925	selection_rotate (ev.x, ev.y);	1928	selection_rotate (ev.x, ev.y);
1926	else	1929	else
1927	selection_extend (ev.x, ev.y, 1);	1930	selection_extend (ev.x, ev.y, 1);
…		…
2211	slip_wheel_ev.start ();	2214	slip_wheel_ev.start ();
2212	}	2215	}
2213	else	2216	else
2214	{	2217	{
2215	# endif	2218	# endif
2216	# ifdef JUMP_MOUSE_WHEEL
2217	scr_page (v, i);	2219	scr_page (v, i);
2218	scr_refresh (SMOOTH_REFRESH);
2219	scrollbar_show (1);	2220	scrollbar_show (1);
2220	# else
2221	while (i--)
2222	{
2223	scr_page (v, 1);
2224	scr_refresh (SMOOTH_REFRESH);
2225	scrollbar_show (1);
2226	}
2227	# endif
2228	# ifdef MOUSE_SLIP_WHEELING	2221	# ifdef MOUSE_SLIP_WHEELING
2229	}	2222	}
2230	#endif	2223	# endif
2231	}	2224	}
2232	break;	2225	break;
2233	#endif	2226	#endif
2234	}	2227	}
2235	}	2228	}
…		…
2724		2717
2725	bool	2718	bool
2726	rxvt_term::cmd_parse ()	2719	rxvt_term::cmd_parse ()
2727	{	2720	{
2728	bool flag = false;	2721	bool flag = false;
2729	unicode_t ch = NOCHAR;	2722	wchar_t ch = NOCHAR;
2730	char *seq_begin; // remember start of esc-sequence here	2723	char *seq_begin; // remember start of esc-sequence here
2731		2724
2732	for (;;)	2725	for (;;)
2733	{	2726	{
2734	if (ch == NOCHAR)	2727	if (ch == NOCHAR)
…		…
2755	if (seen_resize && cmd_pid)	2748	if (seen_resize && cmd_pid)
2756	kill (-cmd_pid, SIGWINCH);	2749	kill (-cmd_pid, SIGWINCH);
2757	}	2750	}
2758		2751
2759	/* Read a text string from the input buffer */	2752	/* Read a text string from the input buffer */
2760	unicode_t buf[UBUFSIZ];	2753	wchar_t buf[UBUFSIZ];
2761	bool refreshnow = false;	2754	bool refreshnow = false;
2762	int nlines = 0;	2755	int nlines = 0;
2763	unicode_t *str = buf;	2756	wchar_t *str = buf;
2764	unicode_t *eol = str + min (ncol, UBUFSIZ);	2757	wchar_t *eol = str + min (ncol, UBUFSIZ);
2765		2758
2766	for (;;)	2759	for (;;)
2767	{	2760	{
2768	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2761	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2769	break;	2762	break;
…		…
2787	}	2780	}
2788		2781
2789	// scr_add_lines only works for nlines <= nrow - 1.	2782	// scr_add_lines only works for nlines <= nrow - 1.
2790	if (nlines >= nrow - 1)	2783	if (nlines >= nrow - 1)
2791	{	2784	{
2792	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2785	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2793	scr_add_lines (buf, nlines, str - buf);	2786	scr_add_lines (buf, str - buf, nlines);
2794		2787
2795	nlines = 0;	2788	nlines = 0;
2796	str = buf;	2789	str = buf;
2797	eol = str + min (ncol, UBUFSIZ);	2790	eol = str + min (ncol, UBUFSIZ);
2798	}	2791	}
…		…
2812		2805
2813	seq_begin = cmdbuf_ptr;	2806	seq_begin = cmdbuf_ptr;
2814	ch = next_char ();	2807	ch = next_char ();
2815	}	2808	}
2816		2809
2817	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2810	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2818	scr_add_lines (buf, nlines, str - buf);	2811	scr_add_lines (buf, str - buf, nlines);
2819		2812
2820	/*	2813	/*
2821	* If there have been a lot of new lines, then update the screen	2814	* If there have been a lot of new lines, then update the screen
2822	* What the heck I'll cheat and only refresh less than every page-full.	2815	* What the heck I'll cheat and only refresh less than every page-full.
2823	* the number of pages between refreshes is refresh_limit, which	2816	* the number of pages between refreshes is refresh_limit, which
…		…
2829	refresh_limit++;	2822	refresh_limit++;
2830	else	2823	else
2831	{	2824	{
2832	flag = true;	2825	flag = true;
2833	scr_refresh (refresh_type);	2826	scr_refresh (refresh_type);
2834	flush_ev.stop ();	2827	want_refresh = 1;
2835	}	2828	}
2836	}	2829	}
2837		2830
2838	}	2831	}
2839	else	2832	else
…		…
2854	}	2847	}
2855		2848
2856	return flag;	2849	return flag;
2857	}	2850	}
2858		2851
2859	// read the next octet
2860	unicode_t
2861	rxvt_term::next_octet ()
2862	{
2863	return cmdbuf_ptr < cmdbuf_endp
2864	? *cmdbuf_ptr++
2865	: NOCHAR;
2866	}
2867
2868	// read the next character	2852	// read the next character
2869	unicode_t	2853	wchar_t
2870	rxvt_term::next_char ()	2854	rxvt_term::next_char ()
2871	{	2855	{
2872	while (cmdbuf_ptr < cmdbuf_endp)	2856	while (cmdbuf_ptr < cmdbuf_endp)
2873	{	2857	{
2874	// assume 7-bit to be ascii ALWAYS	2858	// assume 7-bit to be ascii ALWAYS
…		…
2884	cmdbuf_ptr = cmdbuf_endp;	2868	cmdbuf_ptr = cmdbuf_endp;
2885	break;	2869	break;
2886	}	2870	}
2887		2871
2888	if (len == (size_t)-1)	2872	if (len == (size_t)-1)
2889	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2873	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2890		2874
2891	// assume wchar == unicode	2875	// assume wchar == unicode
2892	cmdbuf_ptr += len;	2876	cmdbuf_ptr += len;
2893	return wc & UNICODE_MASK;	2877	return wc & UNICODE_MASK;
2894	}	2878	}
2895		2879
2896	return NOCHAR;	2880	return NOCHAR;
		2881	}
		2882
		2883	// read the next octet
		2884	uint32_t
		2885	rxvt_term::next_octet ()
		2886	{
		2887	return cmdbuf_ptr < cmdbuf_endp
		2888	? (unsigned char)*cmdbuf_ptr++
		2889	: NOCHAR;
2897	}	2890	}
2898		2891
2899	/* rxvt_cmd_getc () - Return next input character */	2892	/* rxvt_cmd_getc () - Return next input character */
2900	/*	2893	/*
2901	* Return the next input character after first passing any keyboard input	2894	* Return the next input character after first passing any keyboard input
2902	* to the command.	2895	* to the command.
2903	*/	2896	*/
2904	unicode_t	2897	wchar_t
2905	rxvt_term::cmd_getc ()	2898	rxvt_term::cmd_getc ()
2906	{	2899	{
2907	unicode_t c = next_char ();	2900	wchar_t c = next_char ();
2908		2901
2909	if (c == NOCHAR)	2902	if (c == NOCHAR)
2910	throw out_of_input;	2903	throw out_of_input;
2911		2904
2912	return c;	2905	return c;
2913	}	2906	}
2914		2907
2915	unicode_t	2908	uint32_t
2916	rxvt_term::cmd_get8 ()	2909	rxvt_term::cmd_get8 ()
2917	{	2910	{
2918	unicode_t c = next_octet ();	2911	uint32_t c = next_octet ();
2919		2912
2920	if (c == NOCHAR)	2913	if (c == NOCHAR)
2921	throw out_of_input;	2914	throw out_of_input;
2922		2915
2923	return c;	2916	return c;
…		…
3190	break;	3183	break;
3191		3184
3192	/* 8.3.87: NEXT LINE */	3185	/* 8.3.87: NEXT LINE */
3193	case C1_NEL: /* ESC E */	3186	case C1_NEL: /* ESC E */
3194	{	3187	{
3195	unicode_t nlcr[] = { C0_LF, C0_CR };	3188	wchar_t nlcr[] = { C0_LF, C0_CR };
3196	scr_add_lines (nlcr, 1, 2);	3189	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3197	}	3190	}
3198	break;	3191	break;
3199		3192
3200	/* kidnapped escape sequence: Should be 8.3.48 */	3193	/* kidnapped escape sequence: Should be 8.3.48 */
3201	case C1_ESA: /* ESC G */	3194	case C1_ESA: /* ESC G */
…		…
3865	{	3858	{
3866	if ((name = strchr (buf, ';')) == NULL)	3859	if ((name = strchr (buf, ';')) == NULL)
3867	break;	3860	break;
3868		3861
3869	*name++ = '\0';	3862	*name++ = '\0';
3870	color = atoi (buf);	3863	color = atoi (buf) + minCOLOR;
3871		3864
3872	if (color < 0 \|\| color >= TOTAL_COLORS)	3865	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3873	break;	3866	break;
3874		3867
3875	if ((buf = strchr (name, ';')) != NULL)	3868	if ((buf = strchr (name, ';')) != NULL)
3876	*buf++ = '\0';	3869	*buf++ = '\0';
3877		3870
3878	if (name[0] == '?' && !name[1])	3871	if (name[0] == '?' && !name[1])
3879	{	3872	{
3880	unsigned short r, g, b;	3873	unsigned short r, g, b;
3881	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3874	pix_colors_focused[color].get (display, r, g, b);
3882	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3875	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3883	}	3876	}
3884	else	3877	else
3885	set_window_color (color + minCOLOR, name);	3878	set_window_color (color, name);
3886	}	3879	}
3887	break;	3880	break;
3888	case XTerm_Color00:	3881	case XTerm_Color00:
3889	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3882	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3890	break;	3883	break;
3891	case XTerm_Color01:	3884	case XTerm_Color01:
3892	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3885	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3893	break;	3886	break;
3894	#ifndef NO_CURSORCOLOR	3887	#ifndef NO_CURSORCOLOR
3895	case XTerm_Color_cursor:	3888	case XTerm_Color_cursor:
3896	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3889	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3897	break;	3890	break;
…		…
3901	break;	3894	break;
3902	case XTerm_Color_pointer_bg:	3895	case XTerm_Color_pointer_bg:
3903	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3896	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3904	break;	3897	break;
3905	#ifndef NO_BOLD_UNDERLINE_REVERSE	3898	#ifndef NO_BOLD_UNDERLINE_REVERSE
3906	case XTerm_Color_BD:
3907	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3908	break;
3909	case XTerm_Color_UL:
3910	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3911	break;
3912	case XTerm_Color_RV:	3899	case XTerm_Color_RV:
3913	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3900	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3901	break;
		3902	case Rxvt_Color_BD:
		3903	case URxvt_Color_BD:
		3904	process_color_seq (op, Color_BD, str, resp);
		3905	break;
		3906	case Rxvt_Color_UL:
		3907	case URxvt_Color_UL:
		3908	process_color_seq (op, Color_UL, str, resp);
3914	break;	3909	break;
3915	case URxvt_Color_IT:	3910	case URxvt_Color_IT:
3916	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3911	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3917	break;	3912	break;
3918	#endif	3913	#endif
…		…
3923	if (am_transparent)	3918	if (am_transparent)
3924	want_full_refresh = want_refresh = 1;	3919	want_full_refresh = want_refresh = 1;
3925	break;	3920	break;
3926	#endif	3921	#endif
3927		3922
3928	case XTerm_Pixmap:	3923	case Rxvt_Pixmap:
3929	if (*str != ';')	3924	if (*str != ';')
3930	{	3925	{
3931	#if XPM_BACKGROUND	3926	#if XPM_BACKGROUND
3932	scale_pixmap (""); /* reset to default scaling */	3927	scale_pixmap (""); /* reset to default scaling */
3933	set_bgPixmap (str); /* change pixmap */	3928	set_bgPixmap (str); /* change pixmap */
3934	#endif
3935	scr_touch (true);	3929	scr_touch (true);
		3930	#endif
3936	}	3931	}
		3932
3937	while ((str = strchr (str, ';')) != NULL)	3933	while ((str = strchr (str, ';')) != NULL)
3938	{	3934	{
3939	str++;	3935	str++;
3940	#if XPM_BACKGROUND	3936	#if XPM_BACKGROUND
3941	changed += scale_pixmap (str);	3937	changed += scale_pixmap (str);
…		…
3944		3940
3945	if (changed)	3941	if (changed)
3946	{	3942	{
3947	#ifdef XPM_BACKGROUND	3943	#ifdef XPM_BACKGROUND
3948	resize_pixmap ();	3944	resize_pixmap ();
3949	#endif
3950	scr_touch (true);	3945	scr_touch (true);
		3946	#endif
3951	}	3947	}
3952	break;	3948	break;
3953		3949
3954	case XTerm_restoreFG:	3950	case Rxvt_restoreFG:
3955	set_window_color (Color_fg, str);	3951	set_window_color (Color_fg, str);
3956	break;	3952	break;
3957	case XTerm_restoreBG:	3953	case Rxvt_restoreBG:
3958	set_window_color (Color_bg, str);	3954	set_window_color (Color_bg, str);
3959	break;	3955	break;
3960		3956
3961	case XTerm_logfile:	3957	case XTerm_logfile:
3962	// TODO, when secure mode?	3958	// TODO, when secure mode?
…		…
3967	if (OPTION (Opt_insecure))	3963	if (OPTION (Opt_insecure))
3968	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3964	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969	break;	3965	break;
3970	#endif	3966	#endif
3971	#if 0	3967	#if 0
3972	case XTerm_dumpscreen: /* no error notices */	3968	case Rxvt_dumpscreen: /* no error notices */
3973	{	3969	{
3974	int fd;	3970	int fd;
3975	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3971	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3976	{	3972	{
3977	scr_dump (fd);	3973	scr_dump (fd);
…		…
4029	break;	4025	break;
4030	#endif	4026	#endif
4031		4027
4032	#if ENABLE_PERL	4028	#if ENABLE_PERL
4033	case URxvt_perl:	4029	case URxvt_perl:
4034	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))	4030	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4035	; // no responses yet	4031	; // no responses yet
4036	break;	4032	break;
4037	#endif	4033	#endif
4038	}	4034	}
4039	}	4035	}
…		…
4151	/* extra handling for values with state unkept */	4147	/* extra handling for values with state unkept */
4152	switch (arg[i])	4148	switch (arg[i])
4153	{	4149	{
4154	#if ENABLE_STYLES	4150	#if ENABLE_STYLES
4155	case 1021:	4151	case 1021:
4156	if (mode)	4152	set_option (Opt_intensityStyles, mode);
4157	SET_OPTION (Opt_intensityStyles);
4158	else
4159	CLR_OPTION (Opt_intensityStyles);
4160		4153
4161	scr_touch (true);	4154	scr_touch (true);
4162	break;	4155	break;
4163	#endif	4156	#endif
4164	case 1048: /* alternative cursor save */	4157	case 1048: /* alternative cursor save */
…		…
4186	case 3: /* 80/132 */	4179	case 3: /* 80/132 */
4187	if (priv_modes & PrivMode_132OK)	4180	if (priv_modes & PrivMode_132OK)
4188	set_widthheight (((state ? 132 : 80) * fwidth), height);	4181	set_widthheight (((state ? 132 : 80) * fwidth), height);
4189	break;	4182	break;
4190	case 4: /* smooth scrolling */	4183	case 4: /* smooth scrolling */
4191	if (!state)	4184	set_option (Opt_jumpScroll, !state);
4192	SET_OPTION (Opt_jumpScroll);
4193	else
4194	CLR_OPTION (Opt_jumpScroll);
4195	break;	4185	break;
4196	case 5: /* reverse video */	4186	case 5: /* reverse video */
4197	scr_rvideo_mode (state);	4187	scr_rvideo_mode (state);
4198	break;	4188	break;
4199	case 6: /* relative/absolute origins */	4189	case 6: /* relative/absolute origins */
…		…
4240	#if 0	4230	#if 0
4241	case 1001:	4231	case 1001:
4242	break; /* X11 mouse highlighting */	4232	break; /* X11 mouse highlighting */
4243	#endif	4233	#endif
4244	case 1010: /* scroll to bottom on TTY output inhibit */	4234	case 1010: /* scroll to bottom on TTY output inhibit */
4245	if (!state)	4235	set_option (Opt_scrollTtyOutput, !state);
4246	SET_OPTION (Opt_scrollTtyOutput);
4247	else
4248	CLR_OPTION (Opt_scrollTtyOutput);
4249	break;	4236	break;
4250	case 1011: /* scroll to bottom on key press */	4237	case 1011: /* scroll to bottom on key press */
4251	if (state)	4238	set_option (Opt_scrollTtyKeypress, state);
4252	SET_OPTION (Opt_scrollTtyKeypress);
4253	else
4254	CLR_OPTION (Opt_scrollTtyKeypress);
4255	break;	4239	break;
4256	case 1047: /* secondary screen w/ clearing last */	4240	case 1047: /* secondary screen w/ clearing last */
4257	if (OPTION (Opt_secondaryScreen))	4241	if (OPTION (Opt_secondaryScreen))
4258	if (current_screen != PRIMARY)	4242	if (current_screen != PRIMARY)
4259	scr_erase_screen (2);	4243	scr_erase_screen (2);
…		…
4469	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4453	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4470		4454
4471	void	4455	void
4472	rxvt_term::tt_write (const char *data, unsigned int len)	4456	rxvt_term::tt_write (const char *data, unsigned int len)
4473	{	4457	{
		4458	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4459	return;
		4460
4474	if (pty.pty < 0)	4461	if (pty.pty < 0)
4475	return;	4462	return;
4476		4463
4477	if (v_buflen == 0)	4464	if (v_buflen == 0)
4478	{	4465	{

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.244 by root, Fri Jan 6 17:09:27 2006 UTC vs. Revision 1.265 by root, Mon Jan 16 08:29:57 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.244 by root, Fri Jan 6 17:09:27 2006 UTC vs.
Revision 1.265 by root, Mon Jan 16 08:29:57 2006 UTC