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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.247 by root, Sat Jan 7 20:23:52 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_STR_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
…		…
1599		1571
1600	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1572	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1601	scr_expose (ev.xexpose.x, ev.xexpose.y,	1573	scr_expose (ev.xexpose.x, ev.xexpose.y,
1602	ev.xexpose.width, ev.xexpose.height, False);	1574	ev.xexpose.width, ev.xexpose.height, False);
1603		1575
1604	scr_refresh (refresh_type);	1576	want_refresh = 1;
1605	}	1577	}
1606	else	1578	else
1607	{	1579	{
1608	XEvent unused_event;	1580	XEvent unused_event;
1609		1581
…		…
1644	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1616	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1645	break;	1617	break;
1646		1618
1647	if (ev.xany.window == vt)	1619	if (ev.xany.window == vt)
1648	{	1620	{
		1621	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1649	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1622	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1650	; // nop	1623	; // nop
1651	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1624	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1652	{	1625	{
1653	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1626	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1654	;	1627	;
…		…
1736	&unused_root_x, &unused_root_y,	1709	&unused_root_x, &unused_root_y,
1737	&ev.xbutton.x, &ev.xbutton.y,	1710	&ev.xbutton.x, &ev.xbutton.y,
1738	&unused_mask);	1711	&unused_mask);
1739	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1712	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1740	scrollbar_size ());	1713	scrollbar_size ());
1741	scr_refresh (refresh_type);	1714	want_refresh = 1;
1742	refresh_limit = 0;	1715	refresh_limit = 0;
1743	scrollbar_show (1);	1716	scrollbar_show (1);
1744	}	1717	}
1745	break;	1718	break;
1746	}	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
1747	}	1749	}
1748		1750
1749	void	1751	void
1750	rxvt_term::focus_in ()	1752	rxvt_term::focus_in ()
1751	{	1753	{
…		…
1817		1819
1818	#if TRANSPARENT	1820	#if TRANSPARENT
1819	void	1821	void
1820	rxvt_term::rootwin_cb (XEvent &ev)	1822	rxvt_term::rootwin_cb (XEvent &ev)
1821	{	1823	{
1822	SET_R (this);	1824	make_current ();
1823	SET_LOCALE (locale);
1824		1825
1825	switch (ev.type)	1826	switch (ev.type)
1826	{	1827	{
1827	case PropertyNotify:	1828	case PropertyNotify:
1828	/*	1829	/*
…		…
1919	#else	1920	#else
1920	selection.rect = false;	1921	selection.rect = false;
1921	#endif	1922	#endif
1922		1923
1923	/* allow shift+left click to extend selection */	1924	/* allow shift+left click to extend selection */
1924	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1925	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1925	{	1926	{
1926	if (MEvent.button == Button1 && clickintime)	1927	if (MEvent.button == Button1 && clickintime)
1927	selection_rotate (ev.x, ev.y);	1928	selection_rotate (ev.x, ev.y);
1928	else	1929	else
1929	selection_extend (ev.x, ev.y, 1);	1930	selection_extend (ev.x, ev.y, 1);
…		…
2213	slip_wheel_ev.start ();	2214	slip_wheel_ev.start ();
2214	}	2215	}
2215	else	2216	else
2216	{	2217	{
2217	# endif	2218	# endif
2218	# ifdef JUMP_MOUSE_WHEEL
2219	scr_page (v, i);	2219	scr_page (v, i);
2220	scr_refresh (SMOOTH_REFRESH);
2221	scrollbar_show (1);	2220	scrollbar_show (1);
2222	# else
2223	while (i--)
2224	{
2225	scr_page (v, 1);
2226	scr_refresh (SMOOTH_REFRESH);
2227	scrollbar_show (1);
2228	}
2229	# endif
2230	# ifdef MOUSE_SLIP_WHEELING	2221	# ifdef MOUSE_SLIP_WHEELING
2231	}	2222	}
2232	#endif	2223	# endif
2233	}	2224	}
2234	break;	2225	break;
2235	#endif	2226	#endif
2236	}	2227	}
2237	}	2228	}
…		…
2831	refresh_limit++;	2822	refresh_limit++;
2832	else	2823	else
2833	{	2824	{
2834	flag = true;	2825	flag = true;
2835	scr_refresh (refresh_type);	2826	scr_refresh (refresh_type);
2836	flush_ev.stop ();	2827	want_refresh = 1;
2837	}	2828	}
2838	}	2829	}
2839		2830
2840	}	2831	}
2841	else	2832	else
…		…
3867	{	3858	{
3868	if ((name = strchr (buf, ';')) == NULL)	3859	if ((name = strchr (buf, ';')) == NULL)
3869	break;	3860	break;
3870		3861
3871	*name++ = '\0';	3862	*name++ = '\0';
3872	color = atoi (buf);	3863	color = atoi (buf) + minCOLOR;
3873		3864
3874	if (color < 0 \|\| color >= TOTAL_COLORS)	3865	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3875	break;	3866	break;
3876		3867
3877	if ((buf = strchr (name, ';')) != NULL)	3868	if ((buf = strchr (name, ';')) != NULL)
3878	*buf++ = '\0';	3869	*buf++ = '\0';
3879		3870
3880	if (name[0] == '?' && !name[1])	3871	if (name[0] == '?' && !name[1])
3881	{	3872	{
3882	unsigned short r, g, b;	3873	unsigned short r, g, b;
3883	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3874	pix_colors_focused[color].get (display, r, g, b);
3884	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);
3885	}	3876	}
3886	else	3877	else
3887	set_window_color (color + minCOLOR, name);	3878	set_window_color (color, name);
3888	}	3879	}
3889	break;	3880	break;
3890	case XTerm_Color00:	3881	case XTerm_Color00:
3891	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3882	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3892	break;	3883	break;
3893	case XTerm_Color01:	3884	case XTerm_Color01:
3894	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3885	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3895	break;	3886	break;
3896	#ifndef NO_CURSORCOLOR	3887	#ifndef NO_CURSORCOLOR
3897	case XTerm_Color_cursor:	3888	case XTerm_Color_cursor:
3898	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3889	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3899	break;	3890	break;
…		…
3903	break;	3894	break;
3904	case XTerm_Color_pointer_bg:	3895	case XTerm_Color_pointer_bg:
3905	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);
3906	break;	3897	break;
3907	#ifndef NO_BOLD_UNDERLINE_REVERSE	3898	#ifndef NO_BOLD_UNDERLINE_REVERSE
3908	case XTerm_Color_BD:
3909	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3910	break;
3911	case XTerm_Color_UL:
3912	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3913	break;
3914	case XTerm_Color_RV:	3899	case XTerm_Color_RV:
3915	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);
3916	break;	3909	break;
3917	case URxvt_Color_IT:	3910	case URxvt_Color_IT:
3918	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3911	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3919	break;	3912	break;
3920	#endif	3913	#endif
…		…
3925	if (am_transparent)	3918	if (am_transparent)
3926	want_full_refresh = want_refresh = 1;	3919	want_full_refresh = want_refresh = 1;
3927	break;	3920	break;
3928	#endif	3921	#endif
3929		3922
3930	case XTerm_Pixmap:	3923	case Rxvt_Pixmap:
3931	if (*str != ';')	3924	if (*str != ';')
3932	{	3925	{
3933	#if XPM_BACKGROUND	3926	#if XPM_BACKGROUND
3934	scale_pixmap (""); /* reset to default scaling */	3927	scale_pixmap (""); /* reset to default scaling */
3935	set_bgPixmap (str); /* change pixmap */	3928	set_bgPixmap (str); /* change pixmap */
3936	#endif
3937	scr_touch (true);	3929	scr_touch (true);
		3930	#endif
3938	}	3931	}
		3932
3939	while ((str = strchr (str, ';')) != NULL)	3933	while ((str = strchr (str, ';')) != NULL)
3940	{	3934	{
3941	str++;	3935	str++;
3942	#if XPM_BACKGROUND	3936	#if XPM_BACKGROUND
3943	changed += scale_pixmap (str);	3937	changed += scale_pixmap (str);
…		…
3946		3940
3947	if (changed)	3941	if (changed)
3948	{	3942	{
3949	#ifdef XPM_BACKGROUND	3943	#ifdef XPM_BACKGROUND
3950	resize_pixmap ();	3944	resize_pixmap ();
3951	#endif
3952	scr_touch (true);	3945	scr_touch (true);
		3946	#endif
3953	}	3947	}
3954	break;	3948	break;
3955		3949
3956	case XTerm_restoreFG:	3950	case Rxvt_restoreFG:
3957	set_window_color (Color_fg, str);	3951	set_window_color (Color_fg, str);
3958	break;	3952	break;
3959	case XTerm_restoreBG:	3953	case Rxvt_restoreBG:
3960	set_window_color (Color_bg, str);	3954	set_window_color (Color_bg, str);
3961	break;	3955	break;
3962		3956
3963	case XTerm_logfile:	3957	case XTerm_logfile:
3964	// TODO, when secure mode?	3958	// TODO, when secure mode?
…		…
3969	if (OPTION (Opt_insecure))	3963	if (OPTION (Opt_insecure))
3970	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3964	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3971	break;	3965	break;
3972	#endif	3966	#endif
3973	#if 0	3967	#if 0
3974	case XTerm_dumpscreen: /* no error notices */	3968	case Rxvt_dumpscreen: /* no error notices */
3975	{	3969	{
3976	int fd;	3970	int fd;
3977	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)
3978	{	3972	{
3979	scr_dump (fd);	3973	scr_dump (fd);
…		…
4153	/* extra handling for values with state unkept */	4147	/* extra handling for values with state unkept */
4154	switch (arg[i])	4148	switch (arg[i])
4155	{	4149	{
4156	#if ENABLE_STYLES	4150	#if ENABLE_STYLES
4157	case 1021:	4151	case 1021:
4158	if (mode)	4152	set_option (Opt_intensityStyles, mode);
4159	SET_OPTION (Opt_intensityStyles);
4160	else
4161	CLR_OPTION (Opt_intensityStyles);
4162		4153
4163	scr_touch (true);	4154	scr_touch (true);
4164	break;	4155	break;
4165	#endif	4156	#endif
4166	case 1048: /* alternative cursor save */	4157	case 1048: /* alternative cursor save */
…		…
4188	case 3: /* 80/132 */	4179	case 3: /* 80/132 */
4189	if (priv_modes & PrivMode_132OK)	4180	if (priv_modes & PrivMode_132OK)
4190	set_widthheight (((state ? 132 : 80) * fwidth), height);	4181	set_widthheight (((state ? 132 : 80) * fwidth), height);
4191	break;	4182	break;
4192	case 4: /* smooth scrolling */	4183	case 4: /* smooth scrolling */
4193	if (!state)	4184	set_option (Opt_jumpScroll, !state);
4194	SET_OPTION (Opt_jumpScroll);
4195	else
4196	CLR_OPTION (Opt_jumpScroll);
4197	break;	4185	break;
4198	case 5: /* reverse video */	4186	case 5: /* reverse video */
4199	scr_rvideo_mode (state);	4187	scr_rvideo_mode (state);
4200	break;	4188	break;
4201	case 6: /* relative/absolute origins */	4189	case 6: /* relative/absolute origins */
…		…
4242	#if 0	4230	#if 0
4243	case 1001:	4231	case 1001:
4244	break; /* X11 mouse highlighting */	4232	break; /* X11 mouse highlighting */
4245	#endif	4233	#endif
4246	case 1010: /* scroll to bottom on TTY output inhibit */	4234	case 1010: /* scroll to bottom on TTY output inhibit */
4247	if (!state)	4235	set_option (Opt_scrollTtyOutput, !state);
4248	SET_OPTION (Opt_scrollTtyOutput);
4249	else
4250	CLR_OPTION (Opt_scrollTtyOutput);
4251	break;	4236	break;
4252	case 1011: /* scroll to bottom on key press */	4237	case 1011: /* scroll to bottom on key press */
4253	if (state)	4238	set_option (Opt_scrollTtyKeypress, state);
4254	SET_OPTION (Opt_scrollTtyKeypress);
4255	else
4256	CLR_OPTION (Opt_scrollTtyKeypress);
4257	break;	4239	break;
4258	case 1047: /* secondary screen w/ clearing last */	4240	case 1047: /* secondary screen w/ clearing last */
4259	if (OPTION (Opt_secondaryScreen))	4241	if (OPTION (Opt_secondaryScreen))
4260	if (current_screen != PRIMARY)	4242	if (current_screen != PRIMARY)
4261	scr_erase_screen (2);	4243	scr_erase_screen (2);
…		…
4471	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4453	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4472		4454
4473	void	4455	void
4474	rxvt_term::tt_write (const char *data, unsigned int len)	4456	rxvt_term::tt_write (const char *data, unsigned int len)
4475	{	4457	{
		4458	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4459	return;
		4460
4476	if (pty.pty < 0)	4461	if (pty.pty < 0)
4477	return;	4462	return;
4478		4463
4479	if (v_buflen == 0)	4464	if (v_buflen == 0)
4480	{	4465	{

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.247 by root, Sat Jan 7 20:23:52 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.247 by root, Sat Jan 7 20:23:52 2006 UTC vs.
Revision 1.265 by root, Mon Jan 16 08:29:57 2006 UTC