[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.250 by root, Sun Jan 8 06:35:23 2006 UTC

…		…
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
…		…
1311	{	1310	{
1312	dDisp;	1311	dDisp;
1313		1312
1314	SET_R (this);	1313	SET_R (this);
1315	SET_LOCALE (locale);	1314	SET_LOCALE (locale);
1316
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		1315
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
…		…
1378	&& ((ks >= 0x40 && ks <= 0x5f)	1350	&& ((ks >= 0x40 && ks <= 0x5f)
1379	\|\| (ks >= 0x61 && ks <= 0x7f)))	1351	\|\| (ks >= 0x61 && ks <= 0x7f)))
1380	{	1352	{
1381	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1353	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 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] == ks)
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;
…		…
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);
…		…
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	{
…		…
4151	/* extra handling for values with state unkept */	4154	/* extra handling for values with state unkept */
4152	switch (arg[i])	4155	switch (arg[i])
4153	{	4156	{
4154	#if ENABLE_STYLES	4157	#if ENABLE_STYLES
4155	case 1021:	4158	case 1021:
4156	if (mode)	4159	set_option (Opt_intensityStyles, mode);
4157	SET_OPTION (Opt_intensityStyles);
4158	else
4159	CLR_OPTION (Opt_intensityStyles);
4160		4160
4161	scr_touch (true);	4161	scr_touch (true);
4162	break;	4162	break;
4163	#endif	4163	#endif
4164	case 1048: /* alternative cursor save */	4164	case 1048: /* alternative cursor save */
…		…
4186	case 3: /* 80/132 */	4186	case 3: /* 80/132 */
4187	if (priv_modes & PrivMode_132OK)	4187	if (priv_modes & PrivMode_132OK)
4188	set_widthheight (((state ? 132 : 80) * fwidth), height);	4188	set_widthheight (((state ? 132 : 80) * fwidth), height);
4189	break;	4189	break;
4190	case 4: /* smooth scrolling */	4190	case 4: /* smooth scrolling */
4191	if (!state)	4191	set_option (Opt_jumpScroll, !state);
4192	SET_OPTION (Opt_jumpScroll);
4193	else
4194	CLR_OPTION (Opt_jumpScroll);
4195	break;	4192	break;
4196	case 5: /* reverse video */	4193	case 5: /* reverse video */
4197	scr_rvideo_mode (state);	4194	scr_rvideo_mode (state);
4198	break;	4195	break;
4199	case 6: /* relative/absolute origins */	4196	case 6: /* relative/absolute origins */
…		…
4240	#if 0	4237	#if 0
4241	case 1001:	4238	case 1001:
4242	break; /* X11 mouse highlighting */	4239	break; /* X11 mouse highlighting */
4243	#endif	4240	#endif
4244	case 1010: /* scroll to bottom on TTY output inhibit */	4241	case 1010: /* scroll to bottom on TTY output inhibit */
4245	if (!state)	4242	set_option (Opt_scrollTtyOutput, !state);
4246	SET_OPTION (Opt_scrollTtyOutput);
4247	else
4248	CLR_OPTION (Opt_scrollTtyOutput);
4249	break;	4243	break;
4250	case 1011: /* scroll to bottom on key press */	4244	case 1011: /* scroll to bottom on key press */
4251	if (state)	4245	set_option (Opt_scrollTtyKeypress, state);
4252	SET_OPTION (Opt_scrollTtyKeypress);
4253	else
4254	CLR_OPTION (Opt_scrollTtyKeypress);
4255	break;	4246	break;
4256	case 1047: /* secondary screen w/ clearing last */	4247	case 1047: /* secondary screen w/ clearing last */
4257	if (OPTION (Opt_secondaryScreen))	4248	if (OPTION (Opt_secondaryScreen))
4258	if (current_screen != PRIMARY)	4249	if (current_screen != PRIMARY)
4259	scr_erase_screen (2);	4250	scr_erase_screen (2);

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.250 by root, Sun Jan 8 06:35:23 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.250 by root, Sun Jan 8 06:35:23 2006 UTC