1--- 20130430.1710/src/gui/sdlmain.cpp	2013-03-25 18:10:03 -0400
2+++ 20130430.1710-buttonswap/src/gui/sdlmain.cpp	2013-04-30 18:55:02 -0400
3@@ -206,6 +206,7 @@
4 		bool autoenable;
5 		bool requestlock;
6 		bool locked;
7+		bool buttonswap;
8 		Bitu sensitivity;
9 	} mouse;
10 	SDL_Rect updateRects[1024];
11@@ -1200,6 +1201,7 @@
12 #endif
13 	}
14 	sdl.mouse.autoenable=section->Get_bool("autolock");
15+	sdl.mouse.buttonswap=section->Get_bool("buttonswap");
16 	if (!sdl.mouse.autoenable) SDL_ShowCursor(SDL_DISABLE);
17 	sdl.mouse.autolock=false;
18 	sdl.mouse.sensitivity=section->Get_int("sensitivity");
19@@ -1392,10 +1394,16 @@
20 		}
21 		switch (button->button) {
22 		case SDL_BUTTON_LEFT:
23-			Mouse_ButtonPressed(0);
24+			if(sdl.mouse.buttonswap)
25+				Mouse_ButtonPressed(1);
26+			else
27+				Mouse_ButtonPressed(0);
28 			break;
29 		case SDL_BUTTON_RIGHT:
30-			Mouse_ButtonPressed(1);
31+			if(sdl.mouse.buttonswap)
32+				Mouse_ButtonPressed(0);
33+			else
34+				Mouse_ButtonPressed(1);
35 			break;
36 		case SDL_BUTTON_MIDDLE:
37 			Mouse_ButtonPressed(2);
38@@ -1647,6 +1655,9 @@
39 
40 	Pbool = sdl_sec->Add_bool("usescancodes",Property::Changeable::Always,true);
41 	Pbool->Set_help("Avoid usage of symkeys, might not work on all operating systems.");
42+
43+	Pbool = sdl_sec->Add_bool("buttonswap",Property::Changeable::Always,false);
44+	Pbool->Set_help("Swaps left and right buttons on the mouse.");
45 }
46 
47 static void show_warning(char const * const message) {