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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.246 by root, Fri Jan 6 18:36:21 2006 UTC vs.
Revision 1.256 by root, Wed Jan 11 05:14:26 2006 UTC

…		…
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
…		…
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 > -nsaved && 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
…		…
1312	dDisp;	1311	dDisp;
1313		1312
1314	SET_R (this);	1313	SET_R (this);
1315	SET_LOCALE (locale);	1314	SET_LOCALE (locale);
1316		1315
1317	#if defined(CURSOR_BLINK)
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
…		…
1734	&unused_root_x, &unused_root_y,	1708	&unused_root_x, &unused_root_y,
1735	&ev.xbutton.x, &ev.xbutton.y,	1709	&ev.xbutton.x, &ev.xbutton.y,
1736	&unused_mask);	1710	&unused_mask);
1737	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1711	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1738	scrollbar_size ());	1712	scrollbar_size ());
1739	scr_refresh (refresh_type);	1713	want_refresh = 1;
1740	refresh_limit = 0;	1714	refresh_limit = 0;
1741	scrollbar_show (1);	1715	scrollbar_show (1);
1742	}	1716	}
1743	break;	1717	break;
1744	}	1718	}
		1719
		1720	skip_switch: ;
		1721
		1722	#if defined(CURSOR_BLINK)
		1723	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1724	{
		1725	if (hidden_cursor)
		1726	{
		1727	hidden_cursor = 0;
		1728	want_refresh = 1;
		1729	}
		1730
		1731	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1732	}
		1733	#endif
		1734
		1735	#if defined(POINTER_BLANK)
		1736	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1737	{
		1738	if (ev.type == MotionNotify
		1739	\|\| ev.type == ButtonPress
		1740	\|\| ev.type == ButtonRelease)
		1741	if (hidden_pointer)
		1742	pointer_unblank ();
		1743
		1744	if (ev.type == KeyPress && hidden_pointer == 0)
		1745	pointer_blank ();
		1746	}
		1747	#endif
1745	}	1748	}
1746		1749
1747	void	1750	void
1748	rxvt_term::focus_in ()	1751	rxvt_term::focus_in ()
1749	{	1752	{
…		…
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	}
…		…
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
…		…
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_EXC (color, minCOLOR, TOTAL_COLORS))
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;
…		…
3929	if (*str != ';')	3922	if (*str != ';')
3930	{	3923	{
3931	#if XPM_BACKGROUND	3924	#if XPM_BACKGROUND
3932	scale_pixmap (""); /* reset to default scaling */	3925	scale_pixmap (""); /* reset to default scaling */
3933	set_bgPixmap (str); /* change pixmap */	3926	set_bgPixmap (str); /* change pixmap */
3934	#endif
3935	scr_touch (true);	3927	scr_touch (true);
		3928	#endif
3936	}	3929	}
		3930
3937	while ((str = strchr (str, ';')) != NULL)	3931	while ((str = strchr (str, ';')) != NULL)
3938	{	3932	{
3939	str++;	3933	str++;
3940	#if XPM_BACKGROUND	3934	#if XPM_BACKGROUND
3941	changed += scale_pixmap (str);	3935	changed += scale_pixmap (str);
…		…
3944		3938
3945	if (changed)	3939	if (changed)
3946	{	3940	{
3947	#ifdef XPM_BACKGROUND	3941	#ifdef XPM_BACKGROUND
3948	resize_pixmap ();	3942	resize_pixmap ();
3949	#endif
3950	scr_touch (true);	3943	scr_touch (true);
		3944	#endif
3951	}	3945	}
3952	break;	3946	break;
3953		3947
3954	case XTerm_restoreFG:	3948	case XTerm_restoreFG:
3955	set_window_color (Color_fg, str);	3949	set_window_color (Color_fg, str);
…		…
4151	/* extra handling for values with state unkept */	4145	/* extra handling for values with state unkept */
4152	switch (arg[i])	4146	switch (arg[i])
4153	{	4147	{
4154	#if ENABLE_STYLES	4148	#if ENABLE_STYLES
4155	case 1021:	4149	case 1021:
4156	if (mode)	4150	set_option (Opt_intensityStyles, mode);
4157	SET_OPTION (Opt_intensityStyles);
4158	else
4159	CLR_OPTION (Opt_intensityStyles);
4160		4151
4161	scr_touch (true);	4152	scr_touch (true);
4162	break;	4153	break;
4163	#endif	4154	#endif
4164	case 1048: /* alternative cursor save */	4155	case 1048: /* alternative cursor save */
…		…
4186	case 3: /* 80/132 */	4177	case 3: /* 80/132 */
4187	if (priv_modes & PrivMode_132OK)	4178	if (priv_modes & PrivMode_132OK)
4188	set_widthheight (((state ? 132 : 80) * fwidth), height);	4179	set_widthheight (((state ? 132 : 80) * fwidth), height);
4189	break;	4180	break;
4190	case 4: /* smooth scrolling */	4181	case 4: /* smooth scrolling */
4191	if (!state)	4182	set_option (Opt_jumpScroll, !state);
4192	SET_OPTION (Opt_jumpScroll);
4193	else
4194	CLR_OPTION (Opt_jumpScroll);
4195	break;	4183	break;
4196	case 5: /* reverse video */	4184	case 5: /* reverse video */
4197	scr_rvideo_mode (state);	4185	scr_rvideo_mode (state);
4198	break;	4186	break;
4199	case 6: /* relative/absolute origins */	4187	case 6: /* relative/absolute origins */
…		…
4240	#if 0	4228	#if 0
4241	case 1001:	4229	case 1001:
4242	break; /* X11 mouse highlighting */	4230	break; /* X11 mouse highlighting */
4243	#endif	4231	#endif
4244	case 1010: /* scroll to bottom on TTY output inhibit */	4232	case 1010: /* scroll to bottom on TTY output inhibit */
4245	if (!state)	4233	set_option (Opt_scrollTtyOutput, !state);
4246	SET_OPTION (Opt_scrollTtyOutput);
4247	else
4248	CLR_OPTION (Opt_scrollTtyOutput);
4249	break;	4234	break;
4250	case 1011: /* scroll to bottom on key press */	4235	case 1011: /* scroll to bottom on key press */
4251	if (state)	4236	set_option (Opt_scrollTtyKeypress, state);
4252	SET_OPTION (Opt_scrollTtyKeypress);
4253	else
4254	CLR_OPTION (Opt_scrollTtyKeypress);
4255	break;	4237	break;
4256	case 1047: /* secondary screen w/ clearing last */	4238	case 1047: /* secondary screen w/ clearing last */
4257	if (OPTION (Opt_secondaryScreen))	4239	if (OPTION (Opt_secondaryScreen))
4258	if (current_screen != PRIMARY)	4240	if (current_screen != PRIMARY)
4259	scr_erase_screen (2);	4241	scr_erase_screen (2);
…		…
4469	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4451	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4470		4452
4471	void	4453	void
4472	rxvt_term::tt_write (const char *data, unsigned int len)	4454	rxvt_term::tt_write (const char *data, unsigned int len)
4473	{	4455	{
		4456	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4457	return;
		4458
4474	if (pty.pty < 0)	4459	if (pty.pty < 0)
4475	return;	4460	return;
4476		4461
4477	if (v_buflen == 0)	4462	if (v_buflen == 0)
4478	{	4463	{

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.246 by root, Fri Jan 6 18:36:21 2006 UTC vs. Revision 1.256 by root, Wed Jan 11 05:14:26 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.246 by root, Fri Jan 6 18:36:21 2006 UTC vs.
Revision 1.256 by root, Wed Jan 11 05:14:26 2006 UTC