← Back to branch summary

~ubuntu-branches/ubuntu/precise/xfwm4/precise-proposed

« back to all changes in this revision

Viewing changes to src/cycle.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2009-03-01 15:56:17 UTC
  • mfrom: (1.3.1 upstream)
  • mto: (3.1.4 experimental)
  • mto: This revision was merged to the branch mainline in revision 41.
  • Revision ID: james.westby@ubuntu.com-20090301155617-bncliru9lmlosuwk
Tags: upstream-4.6.0
Import upstream version 4.6.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cycle.c
1
 
/*      $Id$
 
1
/*      $Id: cycle.c 29550 2009-02-23 23:59:06Z olivier $
2
2
 
3
3
        This program is free software; you can redistribute it and/or modify
4
4
        it under the terms of the GNU General Public License as published by
214
214
        TRACE ("grab failed in clientCycle");
215
215
 
216
216
        gdk_beep ();
217
 
        myScreenUngrabKeyboard (screen_info, ev->time);
218
 
        myScreenUngrabPointer (screen_info, ev->time);
 
217
        myScreenUngrabKeyboard (screen_info, CurrentTime);
 
218
        myScreenUngrabPointer (screen_info, CurrentTime);
219
219
 
220
220
        return;
221
221
    }
304
304
        clientSetFocus (screen_info, c, myDisplayGetCurrentTime (display_info), NO_FOCUS_FLAG);
305
305
    }
306
306
 
307
 
    myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
308
 
    myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
 
307
    /*
 
308
     * Use CurrentTime instead of actual last event time to make sure
 
309
     * that the grab is released in any case.
 
310
     */
 
311
    myScreenUngrabKeyboard (screen_info, CurrentTime);
 
312
    myScreenUngrabPointer (screen_info, CurrentTime);
309
313
}