← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libsdl1.2/trusty

« back to all changes in this revision

Viewing changes to debian/patches/310_fixmouseclicks

  • Committer: Bazaar Package Importer
  • Author(s): Andrew Mitchell
  • Date: 2010-05-19 16:37:00 UTC
  • Revision ID: james.westby@ubuntu.com-20100519163700-251y1027jolyzepl
Tags: 1.2.14-6ubuntu1
* Merge from Debian unstable, remaining changes:
  * Drop aRts support: drop libarts1-dev and libartsc0-dev build-deps,
    deps, drop libsdl1.2debian-arts package from control, drop alternate dep
    of libsdl1.2-debian on libsdl1.2debian-arts, pass --enable-arts=no in
    confflags, drop arts from FLAVOURS in rules.
  * Drop svgalib support: drop build-dep and deps on libsvga1-dev, drop
    mention of "svga" driver in libsdl1.2debian's description.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/310_fixmouseclicks
 
1
Index: libsdl1.2-1.2.14/src/video/x11/SDL_x11events.c
 
2
===================================================================
 
3
--- libsdl1.2-1.2.14.orig/src/video/x11/SDL_x11events.c 2010-04-06 19:29:05.000000000 +0100
 
4
+++ libsdl1.2-1.2.14/src/video/x11/SDL_x11events.c      2010-04-06 19:29:46.000000000 +0100
 
5
@@ -423,12 +423,15 @@
 
6
 if ( xevent.xcrossing.mode == NotifyUngrab )
 
7
 printf("Mode: NotifyUngrab\n");
 
8
 #endif
 
9
-               if ( this->input_grab == SDL_GRAB_OFF ) {
 
10
-                       posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
 
11
+               if ( (xevent.xcrossing.mode != NotifyGrab) &&
 
12
+                    (xevent.xcrossing.mode != NotifyUngrab) ) {
 
13
+                       if ( this->input_grab == SDL_GRAB_OFF ) {
 
14
+                               posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
 
15
+                       }
 
16
+                       posted = SDL_PrivateMouseMotion(0, 0,
 
17
+                                       xevent.xcrossing.x,
 
18
+                                       xevent.xcrossing.y);
 
19
                }
 
20
-               posted = SDL_PrivateMouseMotion(0, 0,
 
21
-                               xevent.xcrossing.x,
 
22
-                               xevent.xcrossing.y);
 
23
            }
 
24
            break;
 
25