ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/SheepShaver/src/Unix/video_x.cpp

Comparing SheepShaver/src/Unix/video_x.cpp (file contents):
Revision 1.38 by gbeauche, 2005-03-27T19:05:18Z vs.
Revision 1.45 by gbeauche, 2005-06-24T22:31:28Z

#	Line 53 | Line 53
53		# include <X11/extensions/xf86vmode.h>
54		#endif
55
56	+	#ifdef ENABLE_FBDEV_DGA
57	+	# include <sys/mman.h>
58	+	#endif
59	+
60		#include "main.h"
61		#include "adb.h"
62		#include "prefs.h"
#	Line 633 | Line 637 | static bool open_window(int width, int h
637		return true;
638		}
639
640	<	// Open FBDev display
641	<	static bool open_fbdev(int width, int height)
640	>	// Open FBDev DGA display
641	>	static bool open_fbdev_dga(int width, int height)
642		{
643		#ifdef ENABLE_FBDEV_DGA
644	+	#ifdef ENABLE_XF86_VIDMODE
645	+	// Switch to best mode
646	+	if (has_vidmode) {
647	+	int best = -1;
648	+	for (int i = 0; i < num_x_video_modes; i++) {
649	+	if (x_video_modes[i]->hdisplay == width && x_video_modes[i]->vdisplay == height) {
650	+	best = i;
651	+	break;
652	+	}
653	+	};
654	+	assert(best != -1);
655	+	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]);
656	+	XF86VidModeSetViewPort(x_display, screen, 0, 0);
657	+	D(bug("[fbdev] VideoMode %d: %d x %d @ %d\n", best,
658	+	x_video_modes[best]->hdisplay, x_video_modes[best]->vdisplay,
659	+	1000 * x_video_modes[best]->dotclock / (x_video_modes[best]->htotal * x_video_modes[best]->vtotal)));
660	+	}
661	+	#endif
662	+
663		if (ioctl(fb_dev_fd, FBIOGET_FSCREENINFO, &fb_finfo) != 0) {
664		D(bug("[fbdev] Can't get FSCREENINFO: %s\n", strerror(errno)));
665		return false;
666		}
667		D(bug("[fbdev] Device ID: %s\n", fb_finfo.id));
668		D(bug("[fbdev] smem_start: %p [%d bytes]\n", fb_finfo.smem_start, fb_finfo.smem_len));
669	+
670		int fb_type = fb_finfo.type;
671		const char *fb_type_str = NULL;
672		switch (fb_type) {
#	Line 654 | Line 678 | static bool open_fbdev(int width, int he
678		default:                                                        fb_type_str = "<unknown>";                              break;
679		}
680		D(bug("[fbdev] type: %s\n", fb_type_str));
681	+
682	+	if (fb_type != FB_TYPE_PACKED_PIXELS) {
683	+	D(bug("[fbdev] type '%s' not supported\n", fb_type_str));
684	+	return false;
685	+	}
686	+
687		int fb_visual = fb_finfo.visual;
688		const char *fb_visual_str;
689		switch (fb_visual) {
#	Line 667 | Line 697 | static bool open_fbdev(int width, int he
697		}
698		D(bug("[fbdev] visual: %s\n", fb_visual_str));
699
700	<	if (fb_type != FB_TYPE_PACKED_PIXELS) {
701	<	D(bug("[fbdev] type %s not supported\n", fb_type_str));
700	>	if (fb_visual != FB_VISUAL_TRUECOLOR && fb_visual != FB_VISUAL_DIRECTCOLOR) {
701	>	D(bug("[fbdev] visual '%s' not supported\n", fb_visual_str));
702		return false;
703		}
704
#	Line 686 | Line 716 | static bool open_fbdev(int width, int he
716		XSetWindowAttributes wattr;
717		wattr.event_mask = eventmask = dga_eventmask;
718		wattr.override_redirect = True;
689	–	wattr.colormap = (depth == 1 ? DefaultColormap(x_display, screen) : cmap[0]);
719		the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
720	<	InputOutput, vis, CWEventMask | CWOverrideRedirect |
721	<	(color_class == DirectColor ? CWColormap : 0), &wattr);
720	>	InputOutput, DefaultVisual(x_display, screen),
721	>	CWEventMask | CWOverrideRedirect, &wattr);
722
723		// Show window
724		XMapRaised(x_display, the_win);
#	Line 700 | Line 729 | static bool open_fbdev(int width, int he
729		GrabModeAsync, GrabModeAsync, CurrentTime);
730		XGrabPointer(x_display, the_win, True,
731		PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
732	<	GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
732	>	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
733		disable_mouse_accel();
734
735		// Create no_cursor
#	Line 713 | Line 742 | static bool open_fbdev(int width, int he
742		// Init blitting routines
743		int bytes_per_row = TrivialBytesPerRow((width + 7) & ~7, DepthModeForPixelDepth(depth));
744		#if ENABLE_VOSF
745	<	bool native_byte_order;
746	<	#ifdef WORDS_BIGENDIAN
747	<	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
748	<	#else
749	<	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
750	<	#endif
751	<	#if REAL_ADDRESSING || DIRECT_ADDRESSING
745	>	// Extract current screen color masks (we are in True Color mode)
746	>	VisualFormat visualFormat;
747	>	visualFormat.depth = xdepth = DefaultDepth(x_display, screen);
748	>	XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo);
749	>	assert(visualFormat.depth == visualInfo.depth);
750	>	visualFormat.Rmask = visualInfo.red_mask;
751	>	visualFormat.Gmask = visualInfo.green_mask;
752	>	visualFormat.Bmask = visualInfo.blue_mask;
753	>	D(bug("[fbdev] %d bpp, (%08x,%08x,%08x)\n",
754	>	visualFormat.depth,
755	>	visualFormat.Rmask, visualFormat.Gmask, visualFormat.Bmask));
756	>	D(bug("[fbdev] Mac depth %d bpp\n", depth));
757	>
758		// Screen_blitter_init() returns TRUE if VOSF is mandatory
759		// i.e. the framebuffer update function is not Blit_Copy_Raw
760	<	use_vosf = Screen_blitter_init(visualFormat, native_byte_order, depth);
761	<
727	<	if (use_vosf) {
728	<	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
729	<	the_host_buffer = the_buffer;
730	<	the_buffer_size = page_extend((height + 2) * bytes_per_row);
731	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
732	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
733	<	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
734	<	}
760	>	#ifdef WORDS_BIGENDIAN
761	>	const bool native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
762		#else
763	<	use_vosf = false;
763	>	const bool native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
764		#endif
765	+	Screen_blitter_init(visualFormat, native_byte_order, depth);
766	+
767	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
768	+	use_vosf = true;
769	+	the_host_buffer = the_buffer;
770	+	the_buffer_size = page_extend((height + 2) * bytes_per_row);
771	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
772	+	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
773	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
774		#endif
775
776		// Set frame buffer base
#	Line 748 | Line 784 | static bool open_fbdev(int width, int he
784		#endif
785		}
786
787	<	// Open DGA display (!! should use X11 VidMode extensions to set mode)
788	<	static bool open_dga(int width, int height)
787	>	// Open XF86 DGA display (!! should use X11 VidMode extensions to set mode)
788	>	static bool open_xf86_dga(int width, int height)
789		{
790		if (is_fbdev_dga_mode)
791		return false;
#	Line 843 | Line 879 | static bool open_dga(int width, int heig
879		#endif
880		}
881
882	+	// Open DGA display
883	+	static bool open_dga(int width, int height)
884	+	{
885	+	bool display_open;
886	+
887	+	display_open = open_xf86_dga(width, height);
888	+	#ifdef ENABLE_FBDEV_DGA
889	+	// Try to fallback to FBDev DGA mode
890	+	if (!display_open) {
891	+	is_fbdev_dga_mode = true;
892	+	display_open = open_fbdev_dga(width, height);
893	+	}
894	+	#endif
895	+
896	+	// Common DGA display initialization
897	+	if (display_open) {
898	+
899	+	// Fake image to get display bounds in the refresh function
900	+	if ((img = (XImage *)malloc(sizeof(*img))) == NULL)
901	+	return false;
902	+	img->width = DisplayWidth(x_display, screen);
903	+	img->height = DisplayHeight(x_display, screen);
904	+	img->depth = is_fbdev_dga_mode ? xdepth : depth;
905	+	img->bytes_per_line = TrivialBytesPerRow(img->width, DepthModeForPixelDepth(img->depth));
906	+	}
907	+
908	+	return display_open;
909	+	}
910	+
911		static bool open_display(void)
912		{
913		D(bug("open_display()\n"));
#	Line 858 | Line 923 | static bool open_display(void)
923		}
924
925		// Build up visualFormat structure
926	+	visualFormat.fullscreen = (display_type == DIS_SCREEN);
927		visualFormat.depth = visualInfo.depth;
928		visualFormat.Rmask = visualInfo.red_mask;
929		visualFormat.Gmask = visualInfo.green_mask;
#	Line 930 | Line 996 | static bool open_display(void)
996		display_type = mode.viType;
997		depth = depth_of_video_mode(mode.viAppleMode);
998
999	<	bool display_open = false;
1000	<	if (display_type == DIS_SCREEN) {
999	>	bool display_open;
1000	>	switch (display_type) {
1001	>	case DIS_SCREEN:
1002		display_open = open_dga(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
1003	<	#ifdef ENABLE_FBDEV_DGA
1004	<	// Try to fallback to FBDev DGA mode
938	<	if (!display_open) {
939	<	is_fbdev_dga_mode = true;
940	<	display_open = open_fbdev(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
941	<	}
942	<	#endif
943	<
944	<	}
945	<	else if (display_type == DIS_WINDOW)
1003	>	break;
1004	>	case DIS_WINDOW:
1005		display_open = open_window(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
1006	+	break;
1007	+	default:
1008	+	display_open = false;
1009	+	break;
1010	+	}
1011
1012		#ifdef ENABLE_VOSF
1013		if (use_vosf) {
1014		// Initialize the VOSF system
1015	+	LOCK_VOSF;
1016		if (!video_vosf_init()) {
1017		ErrorAlert(GetString(STR_VOSF_INIT_ERR));
1018	+	UNLOCK_VOSF;
1019		return false;
1020		}
1021	+	UNLOCK_VOSF;
1022		}
1023		#endif
1024	<
1024	>
1025	>	// Zero screen buffers, viRowBytes is initialized at this stage
1026	>	if (display_open) {
1027	>	memset(the_buffer, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
1028	>	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
1029	>	}
1030		return display_open;
1031		}
1032
#	Line 991 | Line 1063 | static void close_window(void)
1063		}
1064
1065		// Close FBDev mode
1066	<	static void close_fbdev(void)
1066	>	static void close_fbdev_dga(void)
1067		{
1068		#ifdef ENABLE_FBDEV_DGA
997	–	XUngrabPointer(x_display, CurrentTime);
998	–	XUngrabKeyboard(x_display, CurrentTime);
999	–
1069		uint8 *fb_base;
1070	<	if (!use_vosf) {
1002	<	// don't free() the screen buffer in driver_base dtor
1070	>	if (!use_vosf)
1071		fb_base = the_buffer;
1004	–	the_buffer = NULL;
1005	–	}
1072		#ifdef ENABLE_VOSF
1073	<	else {
1008	<	// don't free() the screen buffer in driver_base dtor
1073	>	else
1074		fb_base = the_host_buffer;
1010	–	the_host_buffer = NULL;
1011	–	}
1075		#endif
1076		munmap(fb_base, fb_finfo.smem_len);
1077		#endif
1078		}
1079
1080	+	// Close XF86 DGA mode
1081	+	static void close_xf86_dga(void)
1082	+	{
1083	+	#ifdef ENABLE_XF86_DGA
1084	+	XF86DGADirectVideo(x_display, screen, 0);
1085	+	#endif
1086	+	}
1087	+
1088		// Close DGA mode
1089		static void close_dga(void)
1090		{
1091		if (is_fbdev_dga_mode)
1092	<	return;
1092	>	close_fbdev_dga();
1093	>	else
1094	>	close_xf86_dga();
1095
1023	–	#ifdef ENABLE_XF86_DGA
1024	–	XF86DGADirectVideo(x_display, screen, 0);
1096		XUngrabPointer(x_display, CurrentTime);
1097		XUngrabKeyboard(x_display, CurrentTime);
1027	–	#endif
1098
1099		#ifdef ENABLE_XF86_VIDMODE
1100		if (has_vidmode)
1101		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1102		#endif
1103
1104	+	// Release fake image (it's not a normal XImage!)
1105	+	free(img);
1106	+	img = NULL;
1107	+
1108		if (!use_vosf) {
1109		// don't free() the screen buffer in driver_base dtor
1110		the_buffer = NULL;
#	Line 1045 | Line 1119 | static void close_dga(void)
1119
1120		static void close_display(void)
1121		{
1122	<	if (display_type == DIS_SCREEN) {
1123	<	if (is_fbdev_dga_mode)
1050	<	close_fbdev();
1051	<	else
1052	<	close_dga();
1053	<	}
1122	>	if (display_type == DIS_SCREEN)
1123	>	close_dga();
1124		else if (display_type == DIS_WINDOW)
1125		close_window();
1126
#	Line 1280 | Line 1350 | static void add_window_modes(VideoInfo *
1350		static bool has_mode(int x, int y)
1351		{
1352		#ifdef ENABLE_XF86_VIDMODE
1353	<	for (int i=0; i<num_x_video_modes; i++)
1354	<	if (x_video_modes[i]->hdisplay >= x && x_video_modes[i]->vdisplay >= y)
1355	<	return true;
1356	<	return false;
1357	<	#else
1358	<	return DisplayWidth(x_display, screen) >= x && DisplayHeight(x_display, screen) >= y;
1353	>	if (has_vidmode) {
1354	>	for (int i=0; i<num_x_video_modes; i++)
1355	>	if (x_video_modes[i]->hdisplay == x && x_video_modes[i]->vdisplay == y)
1356	>	return true;
1357	>	return false;
1358	>	}
1359		#endif
1360	+	return DisplayWidth(x_display, screen) >= x && DisplayHeight(x_display, screen) >= y;
1361		}
1362
1363		bool VideoInit(void)
#	Line 1353 | Line 1424 | bool VideoInit(void)
1424		// VidMode available?
1425		int vm_event_base, vm_error_base;
1426		has_vidmode = XF86VidModeQueryExtension(x_display, &vm_event_base, &vm_error_base);
1427	<	if (has_vidmode)
1427	>	if (has_vidmode) {
1428	>	int vm_major_version, vm_minor_version;
1429	>	XF86VidModeQueryVersion(x_display, &vm_major_version, &vm_minor_version);
1430	>	D(bug("VidMode extension %d.%d available\n", vm_major_version, vm_minor_version));
1431		XF86VidModeGetAllModeLines(x_display, screen, &num_x_video_modes, &x_video_modes);
1432	+	}
1433		#endif
1434
1435		#ifdef ENABLE_FBDEV_DGA
1436		// FBDev available?
1437	<	if (!has_dga && local_X11) {
1437	>	bool has_fbdev_dga = false;
1438	>	if (local_X11) {
1439		if ((fb_dev_fd = open("/dev/fb0", O_RDWR)) > 0) {
1440		if (ioctl(fb_dev_fd, FBIOGET_VSCREENINFO, &fb_vinfo) != 0)
1441		close(fb_dev_fd);
1442		else {
1443	<	has_dga = true;
1444	<	is_fbdev_dga_mode = true;
1443	>	has_fbdev_dga = true;
1444	>	if (!has_dga) {
1445	>	// Fallback to FBDev DGA mode if XF86 DGA is not possible
1446	>	has_dga = true;
1447	>	is_fbdev_dga_mode = true;
1448	>	}
1449		fb_orig_vinfo = fb_vinfo;
1450		D(bug("Frame buffer device initial resolution: %dx%dx%d\n", fb_vinfo.xres, fb_vinfo.yres, fb_vinfo.bits_per_pixel));
1451		}
#	Line 1409 | Line 1489 | bool VideoInit(void)
1489		else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1490		display_type = DIS_SCREEN;
1491		#endif
1492	+	#ifdef ENABLE_FBDEV_DGA
1493	+	else if (has_fbdev_dga && sscanf(mode_str, "fbdev/%d/%d", &default_width, &default_height) == 2) {
1494	+	is_fbdev_dga_mode = true;
1495	+	display_type = DIS_SCREEN;
1496	+	}
1497	+	#endif
1498		if (display_type == DIS_INVALID) {
1499		D(bug("Invalid screen mode specified, defaulting to old modes selection\n"));
1500		mode_str = NULL;
#	Line 1447 | Line 1533 | bool VideoInit(void)
1533		add_custom_mode(p, display_type, default_width, default_height, d, APPLE_CUSTOM);
1534		}
1535		}
1536	+	#ifdef ENABLE_VOSF
1537	+	} else if (display_type == DIS_SCREEN && is_fbdev_dga_mode) {
1538	+	for (unsigned int d = APPLE_1_BIT; d <= default_mode; d++)
1539	+	if (find_visual_for_depth(d))
1540	+	add_custom_mode(p, display_type, default_width, default_height, d, APPLE_CUSTOM);
1541	+	#endif
1542		} else
1543		add_custom_mode(p, display_type, default_width, default_height, default_mode, APPLE_CUSTOM);
1544	+
1545	+	// Add extra VidMode capable modes
1546	+	if (display_type == DIS_SCREEN) {
1547	+	struct {
1548	+	int w;
1549	+	int h;
1550	+	int apple_id;
1551	+	}
1552	+	video_modes[] = {
1553	+	{  640,  480, APPLE_640x480   },
1554	+	{  800,  600, APPLE_800x600   },
1555	+	{ 1024,  768, APPLE_1024x768  },
1556	+	{ 1152,  768, APPLE_1152x768  },
1557	+	{ 1152,  900, APPLE_1152x900  },
1558	+	{ 1280, 1024, APPLE_1280x1024 },
1559	+	{ 1600, 1200, APPLE_1600x1200 },
1560	+	{ 0, }
1561	+	};
1562	+
1563	+	for (int i = 0; video_modes[i].w != 0; i++) {
1564	+	const int w = video_modes[i].w;
1565	+	const int h = video_modes[i].h;
1566	+	if (w >= default_width || h >= default_height)
1567	+	continue;
1568	+	if (has_mode(w, h)) {
1569	+	#ifdef ENABLE_VOSF
1570	+	if (is_fbdev_dga_mode) {
1571	+	for (unsigned int d = APPLE_1_BIT; d <= default_mode; d++)
1572	+	if (find_visual_for_depth(d))
1573	+	add_custom_mode(p, display_type, w, h, d, video_modes[i].apple_id);
1574	+	} else
1575	+	#endif
1576	+	add_custom_mode(p, display_type, w, h, default_mode, video_modes[i].apple_id);
1577	+	}
1578	+	}
1579	+	}
1580		} else if (window_modes) {
1581		for (unsigned int d = APPLE_1_BIT; d <= APPLE_32_BIT; d++)
1582		if (find_visual_for_depth(d))
#	Line 1517 | Line 1645 | bool VideoInit(void)
1645		#endif
1646
1647		// Open window/screen
1648	<	if (!open_display())
1648	>	if (!open_display()) {
1649	>	ErrorAlert(GetString(STR_OPEN_WINDOW_ERR));
1650		return false;
1651	+	}
1652
1653		#if 0
1654		// Ignore errors from now on
#	Line 1644 | Line 1774 | static void resume_emul(void)
1774		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1775		Window w = is_fbdev_dga_mode ? the_win : rootwin;
1776		XGrabKeyboard(x_display, w, True, GrabModeAsync, GrabModeAsync, CurrentTime);
1777	<	XGrabPointer(x_display, w, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1777	>	XGrabPointer(x_display, w, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, is_fbdev_dga_mode ? w : None, None, CurrentTime);
1778		disable_mouse_accel();
1779		#ifdef ENABLE_XF86_DGA
1780		if (!is_fbdev_dga_mode) {
#	Line 1661 | Line 1791 | static void resume_emul(void)
1791		if (use_vosf) {
1792		LOCK_VOSF;
1793		PFLAG_SET_ALL;
1664	–	UNLOCK_VOSF;
1794		memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
1795	+	UNLOCK_VOSF;
1796		}
1797		#endif
1798
#	Line 1676 | Line 1806 | static void resume_emul(void)
1806		free(fb_save);
1807		fb_save = NULL;
1808		}
1679	–	if (depth == 8)
1680	–	palette_changed = true;
1809
1810		// Unlock frame buffer (and continue MacOS thread)
1811		UNLOCK_FRAME_BUFFER;
#	Line 1978 | Line 2106 | static void handle_events(void)
2106		if (use_vosf) {                 // VOSF refresh
2107		LOCK_VOSF;
2108		PFLAG_SET_ALL;
2109	+	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
2110		UNLOCK_VOSF;
2111		}
2112	+	else
2113		#endif
2114	<	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
2114	>	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
2115		break;
2116		}
2117		}
#	Line 2098 | Line 2228 | void video_set_palette(void)
2228		// We have to redraw everything because the interpretation of pixel values changed
2229		LOCK_VOSF;
2230		PFLAG_SET_ALL;
2231	+	if (display_type == DIS_SCREEN)
2232	+	PFLAG_SET_VERY_DIRTY;
2233		UNLOCK_VOSF;
2102	–	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
2234		}
2235		#endif
2236
#	Line 2328 | Line 2459 | static void *redraw_func(void *arg)
2459		XDisplayLock();
2460		#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
2461		#ifdef ENABLE_XF86_DGA
2462	<	if (is_fbdev_dga_mode)
2462	>	if (!is_fbdev_dga_mode)
2463		XF86DGADirectVideo(x_display, screen, 0);
2464		#endif
2465		XUngrabPointer(x_display, CurrentTime);

Diff Legend

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