Attachment #237853 for bug #326961

Lines 33-38 Link Here

(-)id_in.cpp.orig (-1 / +2 lines)
33	// configuration variables	33	// configuration variables
34	//	34	//
35	boolean MousePresent;	35	boolean MousePresent;
		36	boolean windowmouse;
36		37
37		38
38	// Global variables	39	// Global variables
Lines 388-394 Link Here
388		389
389	SDL_EventState(SDL_MOUSEMOTION, SDL_IGNORE);	390	SDL_EventState(SDL_MOUSEMOTION, SDL_IGNORE);
390		391
391	if(fullscreen)	392	if(fullscreen \|\| windowmouse)
392	{	393	{
393	GrabInput = true;	394	GrabInput = true;
394	SDL_WM_GrabInput(SDL_GRAB_ON);	395	SDL_WM_GrabInput(SDL_GRAB_ON);

Lines 142-147 Link Here

(-)id_in.h.orig (+1 lines)
142	extern volatile char LastASCII;	142	extern volatile char LastASCII;
143	extern volatile ScanCode LastScan;	143	extern volatile ScanCode LastScan;
144	extern int JoyNumButtons;	144	extern int JoyNumButtons;
		145	extern boolean windowmouse;
145		146
146		147
147	// Function prototypes	148	// Function prototypes

Lines 1699-1704 Link Here

(-)wl_main.cpp.orig (-1 / +6 lines)
1699	}	1699	}
1700	else IFARG("--windowed")	1700	else IFARG("--windowed")
1701	fullscreen = false;	1701	fullscreen = false;
		1702	else IFARG("--windowed-mouse")
		1703	{
		1704	fullscreen = false;
		1705	windowmouse = true;
		1706	}
1702	else IFARG("--res")	1707	else IFARG("--res")
1703	{	1708	{
1704	if(i + 2 >= argc)	1709	if(i + 2 >= argc)
Lines 1828-1834 Link Here
1828	" --normal Sets the difficulty to normal for tedlevel\n"	1833	" --normal Sets the difficulty to normal for tedlevel\n"
1829	" --hard Sets the difficulty to hard for tedlevel\n"	1834	" --hard Sets the difficulty to hard for tedlevel\n"
1830	" --nowait Skips intro screens\n"	1835	" --nowait Skips intro screens\n"
1831	" --windowed Starts the game in a window\n"	1836	" --windowed[-mouse] Starts the game in a window [and grabs mouse]\n"
1832	" --res <width> <height> Sets the screen resolution\n"	1837	" --res <width> <height> Sets the screen resolution\n"
1833	" (must be multiple of 320x200 or 320x240)\n"	1838	" (must be multiple of 320x200 or 320x240)\n"
1834	" --resf <w> <h> Sets any screen resolution >= 320x200\n"	1839	" --resf <w> <h> Sets any screen resolution >= 320x200\n"

Return to bug 326961