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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.237 by root, Fri Jan 6 01:16:58 2006 UTC vs.
Revision 1.259 by root, Fri Jan 13 04:59:04 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.
…		…
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_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
		873	return;
		874
872	if (len <= 0)	875	if (len <= 0)
873	return; /* not mapped */	876	return; /* not mapped */
874		877
875	if (OPTION (Opt_scrollTtyKeypress))	878	if (OPTION (Opt_scrollTtyKeypress))
876	if (view_start)	879	if (view_start)
…		…
970	if (want_refresh)	973	if (want_refresh)
971	{	974	{
972	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973	{	976	{
974	int row = -view_start;	977	int row = -view_start;
		978	int end_row = row + nrow;
975		979
976	while (row > -nsaved && ROW (row - 1).is_longer ())	980	while (row > -nsaved && ROW (row - 1).is_longer ())
977	--row;	981	--row;
978		982
979	while (row < -view_start + nrow)	983	do
980	{	984	{
981	int start_row = row;	985	int start_row = row;
982	line_t *l;	986	line_t *l;
983		987
984	do	988	do
985	{	989	{
986	l = &ROW (row);	990	l = &ROW (row++);
987		991
988	if (!(l->f & LINE_FILTERED))	992	if (!(l->f & LINE_FILTERED))
989	{	993	{
990	// line not filtered, mark it as filtered	994	// line not filtered, mark it as filtered
991	l->f \|= LINE_FILTERED;	995	l->f \|= LINE_FILTERED;
992	while (l->is_longer ())	996	while (l->is_longer ())
993	{	997	{
994	l = &ROW (++row);	998	l = &ROW (row++);
995	l->f \|= LINE_FILTERED;	999	l->f \|= LINE_FILTERED;
996	}	1000	}
997		1001
998	// and filter it	1002	// and filter it
999	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));
1000		1004
1001	break;	1005	break;
1002	}	1006	}
1003	}	1007	}
1004	while (l->is_longer ());	1008	while (l->is_longer () && row < end_row);
1005
1006	row++;
1007	}	1009	}
1008		1010	while (row < end_row);
1009	}	1011	}
1010		1012
1011	scr_refresh (refresh_type);	1013	scr_refresh (refresh_type);
1012	scrollbar_show (1);	1014	scrollbar_show (1);
1013	#ifdef USE_XIM	1015	#ifdef USE_XIM
…		…
1202		1204
1203	#ifdef POINTER_BLANK	1205	#ifdef POINTER_BLANK
1204	void	1206	void
1205	rxvt_term::pointer_blank ()	1207	rxvt_term::pointer_blank ()
1206	{	1208	{
1207	if (! OPTION (Opt_pointerBlank))	1209	if (!OPTION (Opt_pointerBlank))
1208	return;	1210	return;
1209		1211
1210	XDefineCursor (display->display, vt, display->blank_cursor);	1212	XDefineCursor (display->display, vt, display->blank_cursor);
1211	XFlush (display->display);	1213	XFlush (display->display);
1212		1214
…		…
1309	dDisp;	1311	dDisp;
1310		1312
1311	SET_R (this);	1313	SET_R (this);
1312	SET_LOCALE (locale);	1314	SET_LOCALE (locale);
1313		1315
1314	#if defined(CURSOR_BLINK)	1316	if (ev.xany.window == vt
1315	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1317	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1316	{	1318	return;
1317	if (hidden_cursor)
1318	{
1319	hidden_cursor = 0;
1320	want_refresh = 1;
1321	}
1322
1323	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1324	}
1325	#endif
1326
1327	#if defined(POINTER_BLANK)
1328	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1329	{
1330	if (ev.type == MotionNotify
1331	\|\| ev.type == ButtonPress
1332	\|\| ev.type == ButtonRelease)
1333	if (hidden_pointer)
1334	pointer_unblank ();
1335
1336	if (ev.type == KeyPress && hidden_pointer == 0)
1337	pointer_blank ();
1338	}
1339	#endif
1340		1319
1341	Window unused_root, unused_child;	1320	Window unused_root, unused_child;
1342	int unused_root_x, unused_root_y;	1321	int unused_root_x, unused_root_y;
1343	unsigned int unused_mask;	1322	unsigned int unused_mask;
1344		1323
…		…
1352		1331
1353	break;	1332	break;
1354		1333
1355	case KeyRelease:	1334	case KeyRelease:
1356	{	1335	{
1357	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1336	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1358	KeySym ks;	1337	KeySym keysym;
1359		1338
1360	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 :/
1361	#endif	1340	#endif
1362		1341
1363	#if ENABLE_FRILLS \|\| ISO_14755	1342	#if ENABLE_FRILLS \|\| ISO_14755
1364	// ISO 14755 support	1343	// ISO 14755 support
1365	if (iso14755buf)	1344	if (iso14755buf)
…		…
1370	# endif	1349	# endif
1371	# if ISO_14755	1350	# if ISO_14755
1372	// iso14755 part 5.2 handling: release time	1351	// iso14755 part 5.2 handling: release time
1373	// first: controls	1352	// first: controls
1374	if ((ev.xkey.state & ControlMask)	1353	if ((ev.xkey.state & ControlMask)
1375	&& ((ks >= 0x40 && ks <= 0x5f)	1354	&& ((keysym >= 0x40 && keysym <= 0x5f)
1376	\|\| (ks >= 0x61 && ks <= 0x7f)))	1355	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1377	{	1356	{
1378	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1357	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1379	commit_iso14755 ();	1358	commit_iso14755 ();
1380	return; // case-break;	1359	goto skip_switch;
1381	}	1360	}
1382		1361
1383	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1362	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1384	if (i[0] == ks)	1363	if (i[0] == keysym)
1385	{	1364	{
1386	iso14755buf = ISO_14755_51 \| i[1];	1365	iso14755buf = ISO_14755_51 \| i[1];
1387	commit_iso14755 ();	1366	commit_iso14755 ();
1388	return; // case-break;	1367	goto skip_switch;
1389	}	1368	}
1390		1369
1391	scr_bell ();	1370	scr_bell ();
1392	# endif	1371	# endif
1393	iso14755buf = 0;	1372	iso14755buf = 0;
…		…
1412	else	1391	else
1413	iso14755buf = 0;	1392	iso14755buf = 0;
1414	}	1393	}
1415	#endif	1394	#endif
1416		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
1417	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1400	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1418	if (!(ev.xkey.state & ControlMask))	1401	if (!(ev.xkey.state & ControlMask))
1419	slip_wheel_ev.stop ();	1402	slip_wheel_ev.stop ();
1420	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1403	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1421	mouse_slip_wheel_speed = 0;	1404	mouse_slip_wheel_speed = 0;
1422	#endif	1405	#endif
1423	break;	1406	break;
1424	}	1407	}
1425		1408
…		…
1555		1538
1556	case SelectionRequest:	1539	case SelectionRequest:
1557	selection_send (ev.xselectionrequest);	1540	selection_send (ev.xselectionrequest);
1558	break;	1541	break;
1559		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
1560	case UnmapNotify:	1551	case UnmapNotify:
1561	mapped = 0;	1552	mapped = 0;
1562	#ifdef TEXT_BLINK	1553	#ifdef TEXT_BLINK
1563	text_blink_ev.stop ();	1554	text_blink_ev.stop ();
1564	#endif	1555	#endif
1565	break;	1556	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1566
1567	case MapNotify:
1568	mapped = 1;
1569	#ifdef TEXT_BLINK
1570	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571	#endif
1572	break;	1557	break;
1573		1558
1574	#ifdef TRANSPARENT	1559	#ifdef TRANSPARENT
1575	case ReparentNotify:	1560	case ReparentNotify:
1576	rootwin_cb (ev);	1561	rootwin_cb (ev);
…		…
1590		1575
1591	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1576	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1592	scr_expose (ev.xexpose.x, ev.xexpose.y,	1577	scr_expose (ev.xexpose.x, ev.xexpose.y,
1593	ev.xexpose.width, ev.xexpose.height, False);	1578	ev.xexpose.width, ev.xexpose.height, False);
1594		1579
1595	scr_refresh (refresh_type);	1580	want_refresh = 1;
1596	}	1581	}
1597	else	1582	else
1598	{	1583	{
1599	XEvent unused_event;	1584	XEvent unused_event;
1600		1585
…		…
1619	#endif	1604	#endif
1620	}	1605	}
1621	break;	1606	break;
1622		1607
1623	case MotionNotify:	1608	case MotionNotify:
		1609	printf ("motion notify\n");//D
1624	#ifdef POINTER_BLANK	1610	#ifdef POINTER_BLANK
1625	if (hidden_pointer)	1611	if (hidden_pointer)
1626	pointer_unblank ();	1612	pointer_unblank ();
1627	#endif	1613	#endif
1628	#if MENUBAR	1614	#if MENUBAR
…		…
1635	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1621	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1636	break;	1622	break;
1637		1623
1638	if (ev.xany.window == vt)	1624	if (ev.xany.window == vt)
1639	{	1625	{
		1626	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
		1627	; // nop
1640	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1628	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1641	{	1629	{
1642	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1630	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1643	;	1631	;
1644		1632
1645	XQueryPointer (disp, vt,	1633	XQueryPointer (disp, vt,
…		…
1725	&unused_root_x, &unused_root_y,	1713	&unused_root_x, &unused_root_y,
1726	&ev.xbutton.x, &ev.xbutton.y,	1714	&ev.xbutton.x, &ev.xbutton.y,
1727	&unused_mask);	1715	&unused_mask);
1728	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1716	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1729	scrollbar_size ());	1717	scrollbar_size ());
1730	scr_refresh (refresh_type);	1718	want_refresh = 1;
1731	refresh_limit = 0;	1719	refresh_limit = 0;
1732	scrollbar_show (1);	1720	scrollbar_show (1);
1733	}	1721	}
1734	break;	1722	break;
1735	}	1723	}
		1724
		1725	skip_switch: ;
		1726
		1727	#if defined(CURSOR_BLINK)
		1728	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1729	{
		1730	if (hidden_cursor)
		1731	{
		1732	hidden_cursor = 0;
		1733	want_refresh = 1;
		1734	}
		1735
		1736	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1737	}
		1738	#endif
		1739
		1740	#if defined(POINTER_BLANK)
		1741	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1742	{
		1743	if (ev.type == MotionNotify
		1744	\|\| ev.type == ButtonPress
		1745	\|\| ev.type == ButtonRelease)
		1746	if (hidden_pointer)
		1747	pointer_unblank ();
		1748
		1749	if (ev.type == KeyPress && hidden_pointer == 0)
		1750	pointer_blank ();
		1751	}
		1752	#endif
1736	}	1753	}
1737		1754
1738	void	1755	void
1739	rxvt_term::focus_in ()	1756	rxvt_term::focus_in ()
1740	{	1757	{
…		…
1865	#ifdef MOUSE_REPORT_DOUBLECLICK	1882	#ifdef MOUSE_REPORT_DOUBLECLICK
1866	if (ev.button == MEvent.button && clickintime)	1883	if (ev.button == MEvent.button && clickintime)
1867	{	1884	{
1868	/* same button, within alloted time */	1885	/* same button, within alloted time */
1869	MEvent.clicks++;	1886	MEvent.clicks++;
		1887
1870	if (MEvent.clicks > 1)	1888	if (MEvent.clicks > 1)
1871	{	1889	{
1872	/* only report double clicks */	1890	/* only report double clicks */
1873	MEvent.clicks = 2;	1891	MEvent.clicks = 2;
1874	mouse_report (ev);	1892	mouse_report (ev);
…		…
1894	else	1912	else
1895	{	1913	{
1896	if (ev.button != MEvent.button)	1914	if (ev.button != MEvent.button)
1897	MEvent.clicks = 0;	1915	MEvent.clicks = 0;
1898		1916
1899	if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))	1917	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1900	switch (ev.button)	1918	switch (ev.button)
1901	{	1919	{
1902	case Button1:	1920	case Button1:
1903	/* allow meta + click to select rectangular areas */	1921	/* allow meta + click to select rectangular areas */
1904	/* should be done in screen.C */	1922	/* should be done in screen.C */
…		…
1907	#else	1925	#else
1908	selection.rect = false;	1926	selection.rect = false;
1909	#endif	1927	#endif
1910		1928
1911	/* allow shift+left click to extend selection */	1929	/* allow shift+left click to extend selection */
1912	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1930	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913	{	1931	{
1914	if (MEvent.button == Button1 && clickintime)	1932	if (MEvent.button == Button1 && clickintime)
1915	selection_rotate (ev.x, ev.y);	1933	selection_rotate (ev.x, ev.y);
1916	else	1934	else
1917	selection_extend (ev.x, ev.y, 1);	1935	selection_extend (ev.x, ev.y, 1);
…		…
2082	}	2100	}
2083		2101
2084	break;	2102	break;
2085	}	2103	}
2086	}	2104	}
		2105
2087	return;	2106	return;
2088	}	2107	}
		2108
2089	#if MENUBAR	2109	#if MENUBAR
2090	/*	2110	/*
2091	* Menubar window processing of button press	2111	* Menubar window processing of button press
2092	*/	2112	*/
2093	if (isMenuBarWindow (ev.window))	2113	if (isMenuBarWindow (ev.window))
…		…
2156	if (priv_modes & PrivMode_mouse_report	2176	if (priv_modes & PrivMode_mouse_report
2157	&& bypass_keystate	2177	&& bypass_keystate
2158	&& ev.button == Button1 && MEvent.clicks <= 1)	2178	&& ev.button == Button1 && MEvent.clicks <= 1)
2159	selection_extend (ev.x, ev.y, 0);	2179	selection_extend (ev.x, ev.y, 0);
2160		2180
		2181	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2182	return;
		2183
2161	switch (ev.button)	2184	switch (ev.button)
2162	{	2185	{
2163	case Button1:	2186	case Button1:
2164	case Button3:	2187	case Button3:
2165	selection_make (ev.time);	2188	selection_make (ev.time);
…		…
2196	slip_wheel_ev.start ();	2219	slip_wheel_ev.start ();
2197	}	2220	}
2198	else	2221	else
2199	{	2222	{
2200	# endif	2223	# endif
2201	# ifdef JUMP_MOUSE_WHEEL
2202	scr_page (v, i);	2224	scr_page (v, i);
2203	scr_refresh (SMOOTH_REFRESH);
2204	scrollbar_show (1);	2225	scrollbar_show (1);
2205	# else
2206	while (i--)
2207	{
2208	scr_page (v, 1);
2209	scr_refresh (SMOOTH_REFRESH);
2210	scrollbar_show (1);
2211	}
2212	# endif
2213	# ifdef MOUSE_SLIP_WHEELING	2226	# ifdef MOUSE_SLIP_WHEELING
2214	}	2227	}
2215	#endif	2228	# endif
2216	}	2229	}
2217	break;	2230	break;
2218	#endif	2231	#endif
2219	}	2232	}
2220	}	2233	}
…		…
2709		2722
2710	bool	2723	bool
2711	rxvt_term::cmd_parse ()	2724	rxvt_term::cmd_parse ()
2712	{	2725	{
2713	bool flag = false;	2726	bool flag = false;
2714	unicode_t ch = NOCHAR;	2727	wchar_t ch = NOCHAR;
2715	char *seq_begin; // remember start of esc-sequence here	2728	char *seq_begin; // remember start of esc-sequence here
2716		2729
2717	for (;;)	2730	for (;;)
2718	{	2731	{
2719	if (ch == NOCHAR)	2732	if (ch == NOCHAR)
2720	{	2733	{
2721	seq_begin = cmdbuf_ptr;	2734	seq_begin = cmdbuf_ptr;
2722	ch = next_char ();	2735	ch = next_char ();
2723	}
2724		2736
2725	if (ch == NOCHAR) // TODO: improve	2737	if (ch == NOCHAR)
2726	break;	2738	break;
		2739	}
2727		2740
2728	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2741	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)
2729	{	2742	{
2730	if (!seen_input)	2743	if (!seen_input)
2731	{	2744	{
…		…
2740	if (seen_resize && cmd_pid)	2753	if (seen_resize && cmd_pid)
2741	kill (-cmd_pid, SIGWINCH);	2754	kill (-cmd_pid, SIGWINCH);
2742	}	2755	}
2743		2756
2744	/* Read a text string from the input buffer */	2757	/* Read a text string from the input buffer */
2745	unicode_t buf[UBUFSIZ];	2758	wchar_t buf[UBUFSIZ];
2746	bool refreshnow = false;	2759	bool refreshnow = false;
2747	int nlines = 0;	2760	int nlines = 0;
2748	unicode_t *str = buf;	2761	wchar_t *str = buf;
2749	unicode_t *eol = str + min (ncol, UBUFSIZ);	2762	wchar_t *eol = str + min (ncol, UBUFSIZ);
2750		2763
2751	for (;;)	2764	for (;;)
2752	{	2765	{
2753	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2766	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2754	break;	2767	break;
…		…
2772	}	2785	}
2773		2786
2774	// scr_add_lines only works for nlines <= nrow - 1.	2787	// scr_add_lines only works for nlines <= nrow - 1.
2775	if (nlines >= nrow - 1)	2788	if (nlines >= nrow - 1)
2776	{	2789	{
2777	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2790	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2778	scr_add_lines (buf, nlines, str - buf);	2791	scr_add_lines (buf, str - buf, nlines);
2779		2792
2780	nlines = 0;	2793	nlines = 0;
2781	str = buf;	2794	str = buf;
2782	eol = str + min (ncol, UBUFSIZ);	2795	eol = str + min (ncol, UBUFSIZ);
2783	}	2796	}
…		…
2797		2810
2798	seq_begin = cmdbuf_ptr;	2811	seq_begin = cmdbuf_ptr;
2799	ch = next_char ();	2812	ch = next_char ();
2800	}	2813	}
2801		2814
2802	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2815	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2803	scr_add_lines (buf, nlines, str - buf);	2816	scr_add_lines (buf, str - buf, nlines);
2804		2817
2805	/*	2818	/*
2806	* If there have been a lot of new lines, then update the screen	2819	* If there have been a lot of new lines, then update the screen
2807	* What the heck I'll cheat and only refresh less than every page-full.	2820	* What the heck I'll cheat and only refresh less than every page-full.
2808	* the number of pages between refreshes is refresh_limit, which	2821	* the number of pages between refreshes is refresh_limit, which
…		…
2814	refresh_limit++;	2827	refresh_limit++;
2815	else	2828	else
2816	{	2829	{
2817	flag = true;	2830	flag = true;
2818	scr_refresh (refresh_type);	2831	scr_refresh (refresh_type);
2819	flush_ev.stop ();	2832	want_refresh = 1;
2820	}	2833	}
2821	}	2834	}
2822		2835
2823	}	2836	}
2824	else	2837	else
…		…
2839	}	2852	}
2840		2853
2841	return flag;	2854	return flag;
2842	}	2855	}
2843		2856
2844	// read the next octet
2845	unicode_t
2846	rxvt_term::next_octet ()
2847	{
2848	return cmdbuf_ptr < cmdbuf_endp
2849	? *cmdbuf_ptr++
2850	: NOCHAR;
2851	}
2852
2853	// read the next character	2857	// read the next character
2854	unicode_t	2858	wchar_t
2855	rxvt_term::next_char ()	2859	rxvt_term::next_char ()
2856	{	2860	{
2857	while (cmdbuf_ptr < cmdbuf_endp)	2861	while (cmdbuf_ptr < cmdbuf_endp)
2858	{	2862	{
2859	// assume 7-bit to be ascii ALWAYS	2863	// assume 7-bit to be ascii ALWAYS
…		…
2869	cmdbuf_ptr = cmdbuf_endp;	2873	cmdbuf_ptr = cmdbuf_endp;
2870	break;	2874	break;
2871	}	2875	}
2872		2876
2873	if (len == (size_t)-1)	2877	if (len == (size_t)-1)
2874	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2878	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2875		2879
2876	// assume wchar == unicode	2880	// assume wchar == unicode
2877	cmdbuf_ptr += len;	2881	cmdbuf_ptr += len;
2878	return wc & UNICODE_MASK;	2882	return wc & UNICODE_MASK;
2879	}	2883	}
2880		2884
2881	return NOCHAR;	2885	return NOCHAR;
		2886	}
		2887
		2888	// read the next octet
		2889	uint32_t
		2890	rxvt_term::next_octet ()
		2891	{
		2892	return cmdbuf_ptr < cmdbuf_endp
		2893	? (unsigned char)*cmdbuf_ptr++
		2894	: NOCHAR;
2882	}	2895	}
2883		2896
2884	/* rxvt_cmd_getc () - Return next input character */	2897	/* rxvt_cmd_getc () - Return next input character */
2885	/*	2898	/*
2886	* Return the next input character after first passing any keyboard input	2899	* Return the next input character after first passing any keyboard input
2887	* to the command.	2900	* to the command.
2888	*/	2901	*/
2889	unicode_t	2902	wchar_t
2890	rxvt_term::cmd_getc ()	2903	rxvt_term::cmd_getc ()
2891	{	2904	{
2892	unicode_t c = next_char ();	2905	wchar_t c = next_char ();
2893		2906
2894	if (c == NOCHAR)	2907	if (c == NOCHAR)
2895	throw out_of_input;	2908	throw out_of_input;
2896		2909
2897	return c;	2910	return c;
2898	}	2911	}
2899		2912
2900	unicode_t	2913	uint32_t
2901	rxvt_term::cmd_get8 ()	2914	rxvt_term::cmd_get8 ()
2902	{	2915	{
2903	unicode_t c = next_octet ();	2916	uint32_t c = next_octet ();
2904		2917
2905	if (c == NOCHAR)	2918	if (c == NOCHAR)
2906	throw out_of_input;	2919	throw out_of_input;
2907		2920
2908	return c;	2921	return c;
…		…
3175	break;	3188	break;
3176		3189
3177	/* 8.3.87: NEXT LINE */	3190	/* 8.3.87: NEXT LINE */
3178	case C1_NEL: /* ESC E */	3191	case C1_NEL: /* ESC E */
3179	{	3192	{
3180	unicode_t nlcr[] = { C0_LF, C0_CR };	3193	wchar_t nlcr[] = { C0_LF, C0_CR };
3181	scr_add_lines (nlcr, 1, 2);	3194	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3182	}	3195	}
3183	break;	3196	break;
3184		3197
3185	/* kidnapped escape sequence: Should be 8.3.48 */	3198	/* kidnapped escape sequence: Should be 8.3.48 */
3186	case C1_ESA: /* ESC G */	3199	case C1_ESA: /* ESC G */
…		…
3850	{	3863	{
3851	if ((name = strchr (buf, ';')) == NULL)	3864	if ((name = strchr (buf, ';')) == NULL)
3852	break;	3865	break;
3853		3866
3854	*name++ = '\0';	3867	*name++ = '\0';
3855	color = atoi (buf);	3868	color = atoi (buf) + minCOLOR;
3856		3869
3857	if (color < 0 \|\| color >= TOTAL_COLORS)	3870	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3858	break;	3871	break;
3859		3872
3860	if ((buf = strchr (name, ';')) != NULL)	3873	if ((buf = strchr (name, ';')) != NULL)
3861	*buf++ = '\0';	3874	*buf++ = '\0';
3862		3875
3863	if (name[0] == '?' && !name[1])	3876	if (name[0] == '?' && !name[1])
3864	{	3877	{
3865	unsigned short r, g, b;	3878	unsigned short r, g, b;
3866	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3879	pix_colors_focused[color].get (display, r, g, b);
3867	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3880	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3868	}	3881	}
3869	else	3882	else
3870	set_window_color (color + minCOLOR, name);	3883	set_window_color (color, name);
3871	}	3884	}
3872	break;	3885	break;
3873	case XTerm_Color00:	3886	case XTerm_Color00:
3874	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3887	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3875	break;	3888	break;
3876	case XTerm_Color01:	3889	case XTerm_Color01:
3877	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3890	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3878	break;	3891	break;
3879	#ifndef NO_CURSORCOLOR	3892	#ifndef NO_CURSORCOLOR
3880	case XTerm_Color_cursor:	3893	case XTerm_Color_cursor:
3881	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3894	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3882	break;	3895	break;
…		…
3886	break;	3899	break;
3887	case XTerm_Color_pointer_bg:	3900	case XTerm_Color_pointer_bg:
3888	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3901	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3889	break;	3902	break;
3890	#ifndef NO_BOLD_UNDERLINE_REVERSE	3903	#ifndef NO_BOLD_UNDERLINE_REVERSE
3891	case XTerm_Color_BD:
3892	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3893	break;
3894	case XTerm_Color_UL:
3895	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3896	break;
3897	case XTerm_Color_RV:	3904	case XTerm_Color_RV:
3898	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3905	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3906	break;
		3907	case Rxvt_Color_BD:
		3908	case URxvt_Color_BD:
		3909	process_color_seq (op, Color_BD, str, resp);
		3910	break;
		3911	case Rxvt_Color_UL:
		3912	case URxvt_Color_UL:
		3913	process_color_seq (op, Color_UL, str, resp);
3899	break;	3914	break;
3900	case URxvt_Color_IT:	3915	case URxvt_Color_IT:
3901	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3916	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3902	break;	3917	break;
3903	#endif	3918	#endif
…		…
3908	if (am_transparent)	3923	if (am_transparent)
3909	want_full_refresh = want_refresh = 1;	3924	want_full_refresh = want_refresh = 1;
3910	break;	3925	break;
3911	#endif	3926	#endif
3912		3927
3913	case XTerm_Pixmap:	3928	case Rxvt_Pixmap:
3914	if (*str != ';')	3929	if (*str != ';')
3915	{	3930	{
3916	#if XPM_BACKGROUND	3931	#if XPM_BACKGROUND
3917	scale_pixmap (""); /* reset to default scaling */	3932	scale_pixmap (""); /* reset to default scaling */
3918	set_bgPixmap (str); /* change pixmap */	3933	set_bgPixmap (str); /* change pixmap */
3919	#endif
3920	scr_touch (true);	3934	scr_touch (true);
		3935	#endif
3921	}	3936	}
		3937
3922	while ((str = strchr (str, ';')) != NULL)	3938	while ((str = strchr (str, ';')) != NULL)
3923	{	3939	{
3924	str++;	3940	str++;
3925	#if XPM_BACKGROUND	3941	#if XPM_BACKGROUND
3926	changed += scale_pixmap (str);	3942	changed += scale_pixmap (str);
…		…
3929		3945
3930	if (changed)	3946	if (changed)
3931	{	3947	{
3932	#ifdef XPM_BACKGROUND	3948	#ifdef XPM_BACKGROUND
3933	resize_pixmap ();	3949	resize_pixmap ();
3934	#endif
3935	scr_touch (true);	3950	scr_touch (true);
		3951	#endif
3936	}	3952	}
3937	break;	3953	break;
3938		3954
3939	case XTerm_restoreFG:	3955	case Rxvt_restoreFG:
3940	set_window_color (Color_fg, str);	3956	set_window_color (Color_fg, str);
3941	break;	3957	break;
3942	case XTerm_restoreBG:	3958	case Rxvt_restoreBG:
3943	set_window_color (Color_bg, str);	3959	set_window_color (Color_bg, str);
3944	break;	3960	break;
3945		3961
3946	case XTerm_logfile:	3962	case XTerm_logfile:
3947	// TODO, when secure mode?	3963	// TODO, when secure mode?
…		…
3952	if (OPTION (Opt_insecure))	3968	if (OPTION (Opt_insecure))
3953	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3969	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3954	break;	3970	break;
3955	#endif	3971	#endif
3956	#if 0	3972	#if 0
3957	case XTerm_dumpscreen: /* no error notices */	3973	case Rxvt_dumpscreen: /* no error notices */
3958	{	3974	{
3959	int fd;	3975	int fd;
3960	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3976	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3961	{	3977	{
3962	scr_dump (fd);	3978	scr_dump (fd);
…		…
4014	break;	4030	break;
4015	#endif	4031	#endif
4016		4032
4017	#if ENABLE_PERL	4033	#if ENABLE_PERL
4018	case URxvt_perl:	4034	case URxvt_perl:
4019	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))	4035	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4020	; // no responses yet	4036	; // no responses yet
4021	break;	4037	break;
4022	#endif	4038	#endif
4023	}	4039	}
4024	}	4040	}
…		…
4136	/* extra handling for values with state unkept */	4152	/* extra handling for values with state unkept */
4137	switch (arg[i])	4153	switch (arg[i])
4138	{	4154	{
4139	#if ENABLE_STYLES	4155	#if ENABLE_STYLES
4140	case 1021:	4156	case 1021:
4141	if (mode)	4157	set_option (Opt_intensityStyles, mode);
4142	SET_OPTION (Opt_intensityStyles);
4143	else
4144	CLR_OPTION (Opt_intensityStyles);
4145		4158
4146	scr_touch (true);	4159	scr_touch (true);
4147	break;	4160	break;
4148	#endif	4161	#endif
4149	case 1048: /* alternative cursor save */	4162	case 1048: /* alternative cursor save */
…		…
4171	case 3: /* 80/132 */	4184	case 3: /* 80/132 */
4172	if (priv_modes & PrivMode_132OK)	4185	if (priv_modes & PrivMode_132OK)
4173	set_widthheight (((state ? 132 : 80) * fwidth), height);	4186	set_widthheight (((state ? 132 : 80) * fwidth), height);
4174	break;	4187	break;
4175	case 4: /* smooth scrolling */	4188	case 4: /* smooth scrolling */
4176	if (!state)	4189	set_option (Opt_jumpScroll, !state);
4177	SET_OPTION (Opt_jumpScroll);
4178	else
4179	CLR_OPTION (Opt_jumpScroll);
4180	break;	4190	break;
4181	case 5: /* reverse video */	4191	case 5: /* reverse video */
4182	scr_rvideo_mode (state);	4192	scr_rvideo_mode (state);
4183	break;	4193	break;
4184	case 6: /* relative/absolute origins */	4194	case 6: /* relative/absolute origins */
…		…
4225	#if 0	4235	#if 0
4226	case 1001:	4236	case 1001:
4227	break; /* X11 mouse highlighting */	4237	break; /* X11 mouse highlighting */
4228	#endif	4238	#endif
4229	case 1010: /* scroll to bottom on TTY output inhibit */	4239	case 1010: /* scroll to bottom on TTY output inhibit */
4230	if (!state)	4240	set_option (Opt_scrollTtyOutput, !state);
4231	SET_OPTION (Opt_scrollTtyOutput);
4232	else
4233	CLR_OPTION (Opt_scrollTtyOutput);
4234	break;	4241	break;
4235	case 1011: /* scroll to bottom on key press */	4242	case 1011: /* scroll to bottom on key press */
4236	if (state)	4243	set_option (Opt_scrollTtyKeypress, state);
4237	SET_OPTION (Opt_scrollTtyKeypress);
4238	else
4239	CLR_OPTION (Opt_scrollTtyKeypress);
4240	break;	4244	break;
4241	case 1047: /* secondary screen w/ clearing last */	4245	case 1047: /* secondary screen w/ clearing last */
4242	if (OPTION (Opt_secondaryScreen))	4246	if (OPTION (Opt_secondaryScreen))
4243	if (current_screen != PRIMARY)	4247	if (current_screen != PRIMARY)
4244	scr_erase_screen (2);	4248	scr_erase_screen (2);
…		…
4454	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4458	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455		4459
4456	void	4460	void
4457	rxvt_term::tt_write (const char *data, unsigned int len)	4461	rxvt_term::tt_write (const char *data, unsigned int len)
4458	{	4462	{
		4463	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4464	return;
		4465
		4466	if (pty.pty < 0)
		4467	return;
		4468
4459	if (v_buflen == 0)	4469	if (v_buflen == 0)
4460	{	4470	{
4461	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4471	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4462		4472
4463	if ((unsigned int)written == len)	4473	if ((unsigned int)written == len)

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.237 by root, Fri Jan 6 01:16:58 2006 UTC vs. Revision 1.259 by root, Fri Jan 13 04:59:04 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.237 by root, Fri Jan 6 01:16:58 2006 UTC vs.
Revision 1.259 by root, Fri Jan 13 04:59:04 2006 UTC