Attachment #237823 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 1693-1698 Link Here

(-)wl_main.cpp.orig (-1 / +6 lines)
1693	}	1693	}
1694	else IFARG("--windowed")	1694	else IFARG("--windowed")
1695	fullscreen = false;	1695	fullscreen = false;
		1696	else IFARG("--windowed-mouse")
		1697	{
		1698	fullscreen = false;
		1699	windowmouse = true;
		1700	}
1696	else IFARG("--res")	1701	else IFARG("--res")
1697	{	1702	{
1698	if(i + 2 >= argc)	1703	if(i + 2 >= argc)
Lines 1822-1828 Link Here
1822	" --normal Sets the difficulty to normal for tedlevel\n"	1827	" --normal Sets the difficulty to normal for tedlevel\n"
1823	" --hard Sets the difficulty to hard for tedlevel\n"	1828	" --hard Sets the difficulty to hard for tedlevel\n"
1824	" --nowait Skips intro screens\n"	1829	" --nowait Skips intro screens\n"
1825	" --windowed Starts the game in a window\n"	1830	" --windowed[-mouse] Starts the game in a window [and grabs mouse]\n"
1826	" --res <width> <height> Sets the screen resolution\n"	1831	" --res <width> <height> Sets the screen resolution\n"
1827	" (must be multiple of 320x200 or 320x240)\n"	1832	" (must be multiple of 320x200 or 320x240)\n"
1828	" --resf <w> <h> Sets any screen resolution >= 320x200\n"	1833	" --resf <w> <h> Sets any screen resolution >= 320x200\n"

Return to bug 326961