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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.240 by root, Fri Jan 6 03:40:19 2006 UTC vs.
Revision 1.263 by root, Sun Jan 15 16:48:17 2006 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31	*	31	*
32	* This program is free software; you can redistribute it and/or modify	32	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	33	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	34	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	35	* (at your option) any later version.
…		…
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
…		…
1102	{	1101	{
1103	if (mouse_slip_wheel_speed == 0	1102	if (mouse_slip_wheel_speed == 0
1104	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1103	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105	: scr_page (UP, mouse_slip_wheel_speed))	1104	: scr_page (UP, mouse_slip_wheel_speed))
1106	{	1105	{
1107	if (view_start == nsaved \|\|	1106	if (view_start == top_row \|\| view_start == 0)
1108	view_start == 0)
1109	mouse_slip_wheel_speed = 0;	1107	mouse_slip_wheel_speed = 0;
1110		1108
1111	refresh_type \|= SMOOTH_REFRESH;	1109	refresh_type \|= SMOOTH_REFRESH;
1112	want_refresh = 1;	1110	want_refresh = 1;
1113	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1111	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
…		…
1205		1203
1206	#ifdef POINTER_BLANK	1204	#ifdef POINTER_BLANK
1207	void	1205	void
1208	rxvt_term::pointer_blank ()	1206	rxvt_term::pointer_blank ()
1209	{	1207	{
1210	if (! OPTION (Opt_pointerBlank))	1208	if (!OPTION (Opt_pointerBlank))
1211	return;	1209	return;
1212		1210
1213	XDefineCursor (display->display, vt, display->blank_cursor);	1211	XDefineCursor (display->display, vt, display->blank_cursor);
1214	XFlush (display->display);	1212	XFlush (display->display);
1215		1213
…		…
1312	dDisp;	1310	dDisp;
1313		1311
1314	SET_R (this);	1312	SET_R (this);
1315	SET_LOCALE (locale);	1313	SET_LOCALE (locale);
1316		1314
1317	#if defined(CURSOR_BLINK)	1315	if (ev.xany.window == vt
1318	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1316	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1319	{	1317	return;
1320	if (hidden_cursor)
1321	{
1322	hidden_cursor = 0;
1323	want_refresh = 1;
1324	}
1325		1318
1326	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1319	// for XQueryPointer
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;	1320	Window unused_root, unused_child;
1345	int unused_root_x, unused_root_y;	1321	int unused_root_x, unused_root_y;
1346	unsigned int unused_mask;	1322	unsigned int unused_mask;
1347		1323
1348	switch (ev.type)	1324	switch (ev.type)
…		…
1355		1331
1356	break;	1332	break;
1357		1333
1358	case KeyRelease:	1334	case KeyRelease:
1359	{	1335	{
1360	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1336	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1361	KeySym ks;	1337	KeySym keysym;
1362		1338
1363	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1339	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364	#endif	1340	#endif
1365		1341
1366	#if ENABLE_FRILLS \|\| ISO_14755	1342	#if ENABLE_FRILLS \|\| ISO_14755
1367	// ISO 14755 support	1343	// ISO 14755 support
1368	if (iso14755buf)	1344	if (iso14755buf)
…		…
1373	# endif	1349	# endif
1374	# if ISO_14755	1350	# if ISO_14755
1375	// iso14755 part 5.2 handling: release time	1351	// iso14755 part 5.2 handling: release time
1376	// first: controls	1352	// first: controls
1377	if ((ev.xkey.state & ControlMask)	1353	if ((ev.xkey.state & ControlMask)
1378	&& ((ks >= 0x40 && ks <= 0x5f)	1354	&& ((keysym >= 0x40 && keysym <= 0x5f)
1379	\|\| (ks >= 0x61 && ks <= 0x7f)))	1355	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1380	{	1356	{
1381	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1357	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1382	commit_iso14755 ();	1358	commit_iso14755 ();
1383	return; // case-break;	1359	goto skip_switch;
1384	}	1360	}
1385		1361
1386	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1362	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387	if (i[0] == ks)	1363	if (i[0] == keysym)
1388	{	1364	{
1389	iso14755buf = ISO_14755_51 \| i[1];	1365	iso14755buf = ISO_14755_51 \| i[1];
1390	commit_iso14755 ();	1366	commit_iso14755 ();
1391	return; // case-break;	1367	goto skip_switch;
1392	}	1368	}
1393		1369
1394	scr_bell ();	1370	scr_bell ();
1395	# endif	1371	# endif
1396	iso14755buf = 0;	1372	iso14755buf = 0;
…		…
1415	else	1391	else
1416	iso14755buf = 0;	1392	iso14755buf = 0;
1417	}	1393	}
1418	#endif	1394	#endif
1419		1395
		1396	if (ev.xany.window == vt
		1397	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		1398	break;
		1399
1420	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1400	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1421	if (!(ev.xkey.state & ControlMask))	1401	if (!(ev.xkey.state & ControlMask))
1422	slip_wheel_ev.stop ();	1402	slip_wheel_ev.stop ();
1423	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1403	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1424	mouse_slip_wheel_speed = 0;	1404	mouse_slip_wheel_speed = 0;
1425	#endif	1405	#endif
1426	break;	1406	break;
1427	}	1407	}
1428		1408
…		…
1558		1538
1559	case SelectionRequest:	1539	case SelectionRequest:
1560	selection_send (ev.xselectionrequest);	1540	selection_send (ev.xselectionrequest);
1561	break;	1541	break;
1562		1542
		1543	case MapNotify:
		1544	mapped = 1;
		1545	#ifdef TEXT_BLINK
		1546	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1547	#endif
		1548	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
		1549	break;
		1550
1563	case UnmapNotify:	1551	case UnmapNotify:
1564	mapped = 0;	1552	mapped = 0;
1565	#ifdef TEXT_BLINK	1553	#ifdef TEXT_BLINK
1566	text_blink_ev.stop ();	1554	text_blink_ev.stop ();
1567	#endif	1555	#endif
1568	break;	1556	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1569
1570	case MapNotify:
1571	mapped = 1;
1572	#ifdef TEXT_BLINK
1573	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1574	#endif
1575	break;	1557	break;
1576		1558
1577	#ifdef TRANSPARENT	1559	#ifdef TRANSPARENT
1578	case ReparentNotify:	1560	case ReparentNotify:
1579	rootwin_cb (ev);	1561	rootwin_cb (ev);
…		…
1593		1575
1594	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1576	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1595	scr_expose (ev.xexpose.x, ev.xexpose.y,	1577	scr_expose (ev.xexpose.x, ev.xexpose.y,
1596	ev.xexpose.width, ev.xexpose.height, False);	1578	ev.xexpose.width, ev.xexpose.height, False);
1597		1579
1598	scr_refresh (refresh_type);	1580	want_refresh = 1;
1599	}	1581	}
1600	else	1582	else
1601	{	1583	{
1602	XEvent unused_event;	1584	XEvent unused_event;
1603		1585
…		…
1730	&unused_root_x, &unused_root_y,	1712	&unused_root_x, &unused_root_y,
1731	&ev.xbutton.x, &ev.xbutton.y,	1713	&ev.xbutton.x, &ev.xbutton.y,
1732	&unused_mask);	1714	&unused_mask);
1733	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1715	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1734	scrollbar_size ());	1716	scrollbar_size ());
1735	scr_refresh (refresh_type);	1717	want_refresh = 1;
1736	refresh_limit = 0;	1718	refresh_limit = 0;
1737	scrollbar_show (1);	1719	scrollbar_show (1);
1738	}	1720	}
1739	break;	1721	break;
1740	}	1722	}
		1723
		1724	skip_switch: ;
		1725
		1726	#if defined(CURSOR_BLINK)
		1727	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1728	{
		1729	if (hidden_cursor)
		1730	{
		1731	hidden_cursor = 0;
		1732	want_refresh = 1;
		1733	}
		1734
		1735	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1736	}
		1737	#endif
		1738
		1739	#if defined(POINTER_BLANK)
		1740	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1741	{
		1742	if (ev.type == MotionNotify
		1743	\|\| ev.type == ButtonPress
		1744	\|\| ev.type == ButtonRelease)
		1745	if (hidden_pointer)
		1746	pointer_unblank ();
		1747
		1748	if (ev.type == KeyPress && hidden_pointer == 0)
		1749	pointer_blank ();
		1750	}
		1751	#endif
1741	}	1752	}
1742		1753
1743	void	1754	void
1744	rxvt_term::focus_in ()	1755	rxvt_term::focus_in ()
1745	{	1756	{
…		…
1870	#ifdef MOUSE_REPORT_DOUBLECLICK	1881	#ifdef MOUSE_REPORT_DOUBLECLICK
1871	if (ev.button == MEvent.button && clickintime)	1882	if (ev.button == MEvent.button && clickintime)
1872	{	1883	{
1873	/* same button, within alloted time */	1884	/* same button, within alloted time */
1874	MEvent.clicks++;	1885	MEvent.clicks++;
		1886
1875	if (MEvent.clicks > 1)	1887	if (MEvent.clicks > 1)
1876	{	1888	{
1877	/* only report double clicks */	1889	/* only report double clicks */
1878	MEvent.clicks = 2;	1890	MEvent.clicks = 2;
1879	mouse_report (ev);	1891	mouse_report (ev);
…		…
1912	#else	1924	#else
1913	selection.rect = false;	1925	selection.rect = false;
1914	#endif	1926	#endif
1915		1927
1916	/* allow shift+left click to extend selection */	1928	/* allow shift+left click to extend selection */
1917	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1929	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1918	{	1930	{
1919	if (MEvent.button == Button1 && clickintime)	1931	if (MEvent.button == Button1 && clickintime)
1920	selection_rotate (ev.x, ev.y);	1932	selection_rotate (ev.x, ev.y);
1921	else	1933	else
1922	selection_extend (ev.x, ev.y, 1);	1934	selection_extend (ev.x, ev.y, 1);
…		…
2087	}	2099	}
2088		2100
2089	break;	2101	break;
2090	}	2102	}
2091	}	2103	}
		2104
2092	return;	2105	return;
2093	}	2106	}
		2107
2094	#if MENUBAR	2108	#if MENUBAR
2095	/*	2109	/*
2096	* Menubar window processing of button press	2110	* Menubar window processing of button press
2097	*/	2111	*/
2098	if (isMenuBarWindow (ev.window))	2112	if (isMenuBarWindow (ev.window))
…		…
2161	if (priv_modes & PrivMode_mouse_report	2175	if (priv_modes & PrivMode_mouse_report
2162	&& bypass_keystate	2176	&& bypass_keystate
2163	&& ev.button == Button1 && MEvent.clicks <= 1)	2177	&& ev.button == Button1 && MEvent.clicks <= 1)
2164	selection_extend (ev.x, ev.y, 0);	2178	selection_extend (ev.x, ev.y, 0);
2165		2179
2166	if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2180	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2167	return;	2181	return;
2168		2182
2169	switch (ev.button)	2183	switch (ev.button)
2170	{	2184	{
2171	case Button1:	2185	case Button1:
…		…
2204	slip_wheel_ev.start ();	2218	slip_wheel_ev.start ();
2205	}	2219	}
2206	else	2220	else
2207	{	2221	{
2208	# endif	2222	# endif
2209	# ifdef JUMP_MOUSE_WHEEL
2210	scr_page (v, i);	2223	scr_page (v, i);
2211	scr_refresh (SMOOTH_REFRESH);
2212	scrollbar_show (1);	2224	scrollbar_show (1);
2213	# else
2214	while (i--)
2215	{
2216	scr_page (v, 1);
2217	scr_refresh (SMOOTH_REFRESH);
2218	scrollbar_show (1);
2219	}
2220	# endif
2221	# ifdef MOUSE_SLIP_WHEELING	2225	# ifdef MOUSE_SLIP_WHEELING
2222	}	2226	}
2223	#endif	2227	# endif
2224	}	2228	}
2225	break;	2229	break;
2226	#endif	2230	#endif
2227	}	2231	}
2228	}	2232	}
…		…
2717		2721
2718	bool	2722	bool
2719	rxvt_term::cmd_parse ()	2723	rxvt_term::cmd_parse ()
2720	{	2724	{
2721	bool flag = false;	2725	bool flag = false;
2722	unicode_t ch = NOCHAR;	2726	wchar_t ch = NOCHAR;
2723	char *seq_begin; // remember start of esc-sequence here	2727	char *seq_begin; // remember start of esc-sequence here
2724		2728
2725	for (;;)	2729	for (;;)
2726	{	2730	{
2727	if (ch == NOCHAR)	2731	if (ch == NOCHAR)
…		…
2748	if (seen_resize && cmd_pid)	2752	if (seen_resize && cmd_pid)
2749	kill (-cmd_pid, SIGWINCH);	2753	kill (-cmd_pid, SIGWINCH);
2750	}	2754	}
2751		2755
2752	/* Read a text string from the input buffer */	2756	/* Read a text string from the input buffer */
2753	unicode_t buf[UBUFSIZ];	2757	wchar_t buf[UBUFSIZ];
2754	bool refreshnow = false;	2758	bool refreshnow = false;
2755	int nlines = 0;	2759	int nlines = 0;
2756	unicode_t *str = buf;	2760	wchar_t *str = buf;
2757	unicode_t *eol = str + min (ncol, UBUFSIZ);	2761	wchar_t *eol = str + min (ncol, UBUFSIZ);
2758		2762
2759	for (;;)	2763	for (;;)
2760	{	2764	{
2761	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2765	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2762	break;	2766	break;
…		…
2780	}	2784	}
2781		2785
2782	// scr_add_lines only works for nlines <= nrow - 1.	2786	// scr_add_lines only works for nlines <= nrow - 1.
2783	if (nlines >= nrow - 1)	2787	if (nlines >= nrow - 1)
2784	{	2788	{
2785	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2789	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2786	scr_add_lines (buf, nlines, str - buf);	2790	scr_add_lines (buf, str - buf, nlines);
2787		2791
2788	nlines = 0;	2792	nlines = 0;
2789	str = buf;	2793	str = buf;
2790	eol = str + min (ncol, UBUFSIZ);	2794	eol = str + min (ncol, UBUFSIZ);
2791	}	2795	}
…		…
2805		2809
2806	seq_begin = cmdbuf_ptr;	2810	seq_begin = cmdbuf_ptr;
2807	ch = next_char ();	2811	ch = next_char ();
2808	}	2812	}
2809		2813
2810	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2814	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2811	scr_add_lines (buf, nlines, str - buf);	2815	scr_add_lines (buf, str - buf, nlines);
2812		2816
2813	/*	2817	/*
2814	* If there have been a lot of new lines, then update the screen	2818	* If there have been a lot of new lines, then update the screen
2815	* What the heck I'll cheat and only refresh less than every page-full.	2819	* What the heck I'll cheat and only refresh less than every page-full.
2816	* the number of pages between refreshes is refresh_limit, which	2820	* the number of pages between refreshes is refresh_limit, which
…		…
2822	refresh_limit++;	2826	refresh_limit++;
2823	else	2827	else
2824	{	2828	{
2825	flag = true;	2829	flag = true;
2826	scr_refresh (refresh_type);	2830	scr_refresh (refresh_type);
2827	flush_ev.stop ();	2831	want_refresh = 1;
2828	}	2832	}
2829	}	2833	}
2830		2834
2831	}	2835	}
2832	else	2836	else
…		…
2847	}	2851	}
2848		2852
2849	return flag;	2853	return flag;
2850	}	2854	}
2851		2855
2852	// read the next octet
2853	unicode_t
2854	rxvt_term::next_octet ()
2855	{
2856	return cmdbuf_ptr < cmdbuf_endp
2857	? *cmdbuf_ptr++
2858	: NOCHAR;
2859	}
2860
2861	// read the next character	2856	// read the next character
2862	unicode_t	2857	wchar_t
2863	rxvt_term::next_char ()	2858	rxvt_term::next_char ()
2864	{	2859	{
2865	while (cmdbuf_ptr < cmdbuf_endp)	2860	while (cmdbuf_ptr < cmdbuf_endp)
2866	{	2861	{
2867	// assume 7-bit to be ascii ALWAYS	2862	// assume 7-bit to be ascii ALWAYS
…		…
2877	cmdbuf_ptr = cmdbuf_endp;	2872	cmdbuf_ptr = cmdbuf_endp;
2878	break;	2873	break;
2879	}	2874	}
2880		2875
2881	if (len == (size_t)-1)	2876	if (len == (size_t)-1)
2882	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2877	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2883		2878
2884	// assume wchar == unicode	2879	// assume wchar == unicode
2885	cmdbuf_ptr += len;	2880	cmdbuf_ptr += len;
2886	return wc & UNICODE_MASK;	2881	return wc & UNICODE_MASK;
2887	}	2882	}
2888		2883
2889	return NOCHAR;	2884	return NOCHAR;
		2885	}
		2886
		2887	// read the next octet
		2888	uint32_t
		2889	rxvt_term::next_octet ()
		2890	{
		2891	return cmdbuf_ptr < cmdbuf_endp
		2892	? (unsigned char)*cmdbuf_ptr++
		2893	: NOCHAR;
2890	}	2894	}
2891		2895
2892	/* rxvt_cmd_getc () - Return next input character */	2896	/* rxvt_cmd_getc () - Return next input character */
2893	/*	2897	/*
2894	* Return the next input character after first passing any keyboard input	2898	* Return the next input character after first passing any keyboard input
2895	* to the command.	2899	* to the command.
2896	*/	2900	*/
2897	unicode_t	2901	wchar_t
2898	rxvt_term::cmd_getc ()	2902	rxvt_term::cmd_getc ()
2899	{	2903	{
2900	unicode_t c = next_char ();	2904	wchar_t c = next_char ();
2901		2905
2902	if (c == NOCHAR)	2906	if (c == NOCHAR)
2903	throw out_of_input;	2907	throw out_of_input;
2904		2908
2905	return c;	2909	return c;
2906	}	2910	}
2907		2911
2908	unicode_t	2912	uint32_t
2909	rxvt_term::cmd_get8 ()	2913	rxvt_term::cmd_get8 ()
2910	{	2914	{
2911	unicode_t c = next_octet ();	2915	uint32_t c = next_octet ();
2912		2916
2913	if (c == NOCHAR)	2917	if (c == NOCHAR)
2914	throw out_of_input;	2918	throw out_of_input;
2915		2919
2916	return c;	2920	return c;
…		…
3183	break;	3187	break;
3184		3188
3185	/* 8.3.87: NEXT LINE */	3189	/* 8.3.87: NEXT LINE */
3186	case C1_NEL: /* ESC E */	3190	case C1_NEL: /* ESC E */
3187	{	3191	{
3188	unicode_t nlcr[] = { C0_LF, C0_CR };	3192	wchar_t nlcr[] = { C0_LF, C0_CR };
3189	scr_add_lines (nlcr, 1, 2);	3193	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3190	}	3194	}
3191	break;	3195	break;
3192		3196
3193	/* kidnapped escape sequence: Should be 8.3.48 */	3197	/* kidnapped escape sequence: Should be 8.3.48 */
3194	case C1_ESA: /* ESC G */	3198	case C1_ESA: /* ESC G */
…		…
3858	{	3862	{
3859	if ((name = strchr (buf, ';')) == NULL)	3863	if ((name = strchr (buf, ';')) == NULL)
3860	break;	3864	break;
3861		3865
3862	*name++ = '\0';	3866	*name++ = '\0';
3863	color = atoi (buf);	3867	color = atoi (buf) + minCOLOR;
3864		3868
3865	if (color < 0 \|\| color >= TOTAL_COLORS)	3869	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3866	break;	3870	break;
3867		3871
3868	if ((buf = strchr (name, ';')) != NULL)	3872	if ((buf = strchr (name, ';')) != NULL)
3869	*buf++ = '\0';	3873	*buf++ = '\0';
3870		3874
3871	if (name[0] == '?' && !name[1])	3875	if (name[0] == '?' && !name[1])
3872	{	3876	{
3873	unsigned short r, g, b;	3877	unsigned short r, g, b;
3874	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3878	pix_colors_focused[color].get (display, r, g, b);
3875	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3879	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3876	}	3880	}
3877	else	3881	else
3878	set_window_color (color + minCOLOR, name);	3882	set_window_color (color, name);
3879	}	3883	}
3880	break;	3884	break;
3881	case XTerm_Color00:	3885	case XTerm_Color00:
3882	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3886	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3883	break;	3887	break;
3884	case XTerm_Color01:	3888	case XTerm_Color01:
3885	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3889	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3886	break;	3890	break;
3887	#ifndef NO_CURSORCOLOR	3891	#ifndef NO_CURSORCOLOR
3888	case XTerm_Color_cursor:	3892	case XTerm_Color_cursor:
3889	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3893	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3890	break;	3894	break;
…		…
3894	break;	3898	break;
3895	case XTerm_Color_pointer_bg:	3899	case XTerm_Color_pointer_bg:
3896	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3900	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3897	break;	3901	break;
3898	#ifndef NO_BOLD_UNDERLINE_REVERSE	3902	#ifndef NO_BOLD_UNDERLINE_REVERSE
3899	case XTerm_Color_BD:
3900	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3901	break;
3902	case XTerm_Color_UL:
3903	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3904	break;
3905	case XTerm_Color_RV:	3903	case XTerm_Color_RV:
3906	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3904	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3905	break;
		3906	case Rxvt_Color_BD:
		3907	case URxvt_Color_BD:
		3908	process_color_seq (op, Color_BD, str, resp);
		3909	break;
		3910	case Rxvt_Color_UL:
		3911	case URxvt_Color_UL:
		3912	process_color_seq (op, Color_UL, str, resp);
3907	break;	3913	break;
3908	case URxvt_Color_IT:	3914	case URxvt_Color_IT:
3909	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3915	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3910	break;	3916	break;
3911	#endif	3917	#endif
…		…
3916	if (am_transparent)	3922	if (am_transparent)
3917	want_full_refresh = want_refresh = 1;	3923	want_full_refresh = want_refresh = 1;
3918	break;	3924	break;
3919	#endif	3925	#endif
3920		3926
3921	case XTerm_Pixmap:	3927	case Rxvt_Pixmap:
3922	if (*str != ';')	3928	if (*str != ';')
3923	{	3929	{
3924	#if XPM_BACKGROUND	3930	#if XPM_BACKGROUND
3925	scale_pixmap (""); /* reset to default scaling */	3931	scale_pixmap (""); /* reset to default scaling */
3926	set_bgPixmap (str); /* change pixmap */	3932	set_bgPixmap (str); /* change pixmap */
3927	#endif
3928	scr_touch (true);	3933	scr_touch (true);
		3934	#endif
3929	}	3935	}
		3936
3930	while ((str = strchr (str, ';')) != NULL)	3937	while ((str = strchr (str, ';')) != NULL)
3931	{	3938	{
3932	str++;	3939	str++;
3933	#if XPM_BACKGROUND	3940	#if XPM_BACKGROUND
3934	changed += scale_pixmap (str);	3941	changed += scale_pixmap (str);
…		…
3937		3944
3938	if (changed)	3945	if (changed)
3939	{	3946	{
3940	#ifdef XPM_BACKGROUND	3947	#ifdef XPM_BACKGROUND
3941	resize_pixmap ();	3948	resize_pixmap ();
3942	#endif
3943	scr_touch (true);	3949	scr_touch (true);
		3950	#endif
3944	}	3951	}
3945	break;	3952	break;
3946		3953
3947	case XTerm_restoreFG:	3954	case Rxvt_restoreFG:
3948	set_window_color (Color_fg, str);	3955	set_window_color (Color_fg, str);
3949	break;	3956	break;
3950	case XTerm_restoreBG:	3957	case Rxvt_restoreBG:
3951	set_window_color (Color_bg, str);	3958	set_window_color (Color_bg, str);
3952	break;	3959	break;
3953		3960
3954	case XTerm_logfile:	3961	case XTerm_logfile:
3955	// TODO, when secure mode?	3962	// TODO, when secure mode?
…		…
3960	if (OPTION (Opt_insecure))	3967	if (OPTION (Opt_insecure))
3961	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3968	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3962	break;	3969	break;
3963	#endif	3970	#endif
3964	#if 0	3971	#if 0
3965	case XTerm_dumpscreen: /* no error notices */	3972	case Rxvt_dumpscreen: /* no error notices */
3966	{	3973	{
3967	int fd;	3974	int fd;
3968	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3975	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3969	{	3976	{
3970	scr_dump (fd);	3977	scr_dump (fd);
…		…
4022	break;	4029	break;
4023	#endif	4030	#endif
4024		4031
4025	#if ENABLE_PERL	4032	#if ENABLE_PERL
4026	case URxvt_perl:	4033	case URxvt_perl:
4027	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))	4034	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4028	; // no responses yet	4035	; // no responses yet
4029	break;	4036	break;
4030	#endif	4037	#endif
4031	}	4038	}
4032	}	4039	}
…		…
4144	/* extra handling for values with state unkept */	4151	/* extra handling for values with state unkept */
4145	switch (arg[i])	4152	switch (arg[i])
4146	{	4153	{
4147	#if ENABLE_STYLES	4154	#if ENABLE_STYLES
4148	case 1021:	4155	case 1021:
4149	if (mode)	4156	set_option (Opt_intensityStyles, mode);
4150	SET_OPTION (Opt_intensityStyles);
4151	else
4152	CLR_OPTION (Opt_intensityStyles);
4153		4157
4154	scr_touch (true);	4158	scr_touch (true);
4155	break;	4159	break;
4156	#endif	4160	#endif
4157	case 1048: /* alternative cursor save */	4161	case 1048: /* alternative cursor save */
…		…
4179	case 3: /* 80/132 */	4183	case 3: /* 80/132 */
4180	if (priv_modes & PrivMode_132OK)	4184	if (priv_modes & PrivMode_132OK)
4181	set_widthheight (((state ? 132 : 80) * fwidth), height);	4185	set_widthheight (((state ? 132 : 80) * fwidth), height);
4182	break;	4186	break;
4183	case 4: /* smooth scrolling */	4187	case 4: /* smooth scrolling */
4184	if (!state)	4188	set_option (Opt_jumpScroll, !state);
4185	SET_OPTION (Opt_jumpScroll);
4186	else
4187	CLR_OPTION (Opt_jumpScroll);
4188	break;	4189	break;
4189	case 5: /* reverse video */	4190	case 5: /* reverse video */
4190	scr_rvideo_mode (state);	4191	scr_rvideo_mode (state);
4191	break;	4192	break;
4192	case 6: /* relative/absolute origins */	4193	case 6: /* relative/absolute origins */
…		…
4233	#if 0	4234	#if 0
4234	case 1001:	4235	case 1001:
4235	break; /* X11 mouse highlighting */	4236	break; /* X11 mouse highlighting */
4236	#endif	4237	#endif
4237	case 1010: /* scroll to bottom on TTY output inhibit */	4238	case 1010: /* scroll to bottom on TTY output inhibit */
4238	if (!state)	4239	set_option (Opt_scrollTtyOutput, !state);
4239	SET_OPTION (Opt_scrollTtyOutput);
4240	else
4241	CLR_OPTION (Opt_scrollTtyOutput);
4242	break;	4240	break;
4243	case 1011: /* scroll to bottom on key press */	4241	case 1011: /* scroll to bottom on key press */
4244	if (state)	4242	set_option (Opt_scrollTtyKeypress, state);
4245	SET_OPTION (Opt_scrollTtyKeypress);
4246	else
4247	CLR_OPTION (Opt_scrollTtyKeypress);
4248	break;	4243	break;
4249	case 1047: /* secondary screen w/ clearing last */	4244	case 1047: /* secondary screen w/ clearing last */
4250	if (OPTION (Opt_secondaryScreen))	4245	if (OPTION (Opt_secondaryScreen))
4251	if (current_screen != PRIMARY)	4246	if (current_screen != PRIMARY)
4252	scr_erase_screen (2);	4247	scr_erase_screen (2);
…		…
4462	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4457	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4463		4458
4464	void	4459	void
4465	rxvt_term::tt_write (const char *data, unsigned int len)	4460	rxvt_term::tt_write (const char *data, unsigned int len)
4466	{	4461	{
		4462	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4463	return;
		4464
4467	if (pty.pty < 0)	4465	if (pty.pty < 0)
4468	return;	4466	return;
4469		4467
4470	if (v_buflen == 0)	4468	if (v_buflen == 0)
4471	{	4469	{

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.240 by root, Fri Jan 6 03:40:19 2006 UTC vs. Revision 1.263 by root, Sun Jan 15 16:48:17 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.240 by root, Fri Jan 6 03:40:19 2006 UTC vs.
Revision 1.263 by root, Sun Jan 15 16:48:17 2006 UTC