diff -u libsdl1.2-1.2.14/debian/changelog libsdl1.2-1.2.14/debian/changelog --- libsdl1.2-1.2.14/debian/changelog +++ libsdl1.2-1.2.14/debian/changelog @@ -1,3 +1,12 @@ +libsdl1.2 (1.2.14-4ubuntu2~ppa1) lucid; urgency=low + + * Add 310_fixmouseclicks.diff to fix problems with left-mouse clicks + not working in Wesnoth in windowed mode. Partially reverts the fix + for upstream bug #716 (r4872). Patch from Adam D. Barratt. + (Closes: #565788) (LP: #528957) + + -- Julien Lavergne Fri, 16 Apr 2010 15:03:15 +0200 + libsdl1.2 (1.2.14-4ubuntu1) lucid; urgency=low * Drop explicit -Wl,-Bsymbolic-functions LDFLAGS since that's the default in diff -u libsdl1.2-1.2.14/debian/patches/series libsdl1.2-1.2.14/debian/patches/series --- libsdl1.2-1.2.14/debian/patches/series +++ libsdl1.2-1.2.14/debian/patches/series @@ -17,0 +18 @@ +310_fixmouseclicks only in patch2: unchanged: --- libsdl1.2-1.2.14.orig/debian/patches/310_fixmouseclicks +++ libsdl1.2-1.2.14/debian/patches/310_fixmouseclicks @@ -0,0 +1,25 @@ +Index: libsdl1.2-1.2.14/src/video/x11/SDL_x11events.c +=================================================================== +--- libsdl1.2-1.2.14.orig/src/video/x11/SDL_x11events.c 2010-04-06 19:29:05.000000000 +0100 ++++ libsdl1.2-1.2.14/src/video/x11/SDL_x11events.c 2010-04-06 19:29:46.000000000 +0100 +@@ -423,12 +423,15 @@ + if ( xevent.xcrossing.mode == NotifyUngrab ) + printf("Mode: NotifyUngrab\n"); + #endif +- if ( this->input_grab == SDL_GRAB_OFF ) { +- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); ++ if ( (xevent.xcrossing.mode != NotifyGrab) && ++ (xevent.xcrossing.mode != NotifyUngrab) ) { ++ if ( this->input_grab == SDL_GRAB_OFF ) { ++ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); ++ } ++ posted = SDL_PrivateMouseMotion(0, 0, ++ xevent.xcrossing.x, ++ xevent.xcrossing.y); + } +- posted = SDL_PrivateMouseMotion(0, 0, +- xevent.xcrossing.x, +- xevent.xcrossing.y); + } + break; +