← Back to branch summary

~ubuntu-branches/ubuntu/saucy/openbox/saucy-proposed

« back to all changes in this revision

Viewing changes to openbox/mouse.c

  • Committer: Package Import Robot
  • Author(s): Julien Lavergne
  • Date: 2013-08-29 00:47:27 UTC
  • mfrom: (1.1.12)
  • Revision ID: package-import@ubuntu.com-20130829004727-isarfdp00eoloeeq
Tags: 3.5.2-0ubuntu1
* New upstream release. 
* debian/control & debian/*.install:
 - Update SONAME number.
* debian/*.symbols:
 - Update.
* debian/patches:
 - 04_xsession.desktop_translation.patch: Refresh.
 - 01_rc.xml.patch: Refresh.
 - 05_simplify_gnome_session.patch: Refresh.
 - 07_fix_xml_load_file.patch: Refresh.
 - 90_fix_link_obt.patch: Remove, merged upstream.
 - 675991_fix_crash_from_gtk3_apps.patch: Remove, merged upstream.
 - 666676_wrong_undecorated_window_placement.patch: Remove, merged upstream.
 - clever-rectangle-picking.patch: Remove, merged upstream.
 - use-nearest-monitor.patch: Remove, merged upstream.
 - 704724_fix_refers-to-autostart.sh.patch: Remove, merged upstream.
 - 91_fix_loose_focus.patch: Remove, merged upstream.
 - openbox-3.5.0-title-matching.patch: Refresh.
 - openbox-3.5.0-which-2.20.patch: Refresh.
 - 658081_fix_kde_menu.patch: Remove, merged upstream.
 - add_automake1.11_support.patch: Remove, merged upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openbox/mouse.c
211
211
    static Time ltime;
212
212
    static guint button = 0, state = 0, lbutton = 0;
213
213
    static Window lwindow = None;
214
 
    static gint px, py, pwx = -1, pwy = -1;
 
214
    static gint px, py, pwx = -1, pwy = -1, lx = -10, ly = -10;
215
215
    gboolean used = FALSE;
216
216
 
217
217
    ObFrameContext context;
290
290
                if (e->xbutton.x >= (signed)-b &&
291
291
                    e->xbutton.y >= (signed)-b &&
292
292
                    e->xbutton.x < (signed)(w+b) &&
293
 
                    e->xbutton.y < (signed)(h+b)) {
 
293
                    e->xbutton.y < (signed)(h+b))
 
294
                {
294
295
                    click = TRUE;
295
296
                    /* double clicks happen if there were 2 in a row! */
296
297
                    if (lbutton == button &&
297
298
                        lwindow == e->xbutton.window &&
298
299
                        e->xbutton.time - config_mouse_dclicktime <=
299
 
                        ltime) {
 
300
                        ltime &&
 
301
                        ABS(e->xbutton.x - lx) < 8 &&
 
302
                        ABS(e->xbutton.y - ly) < 8)
 
303
                    {
300
304
                        dclick = TRUE;
301
305
                        lbutton = 0;
302
306
                    } else {
303
307
                        lbutton = button;
304
308
                        lwindow = e->xbutton.window;
 
309
                        lx = e->xbutton.x;
 
310
                        ly = e->xbutton.y;
305
311
                    }
306
312
                } else {
307
313
                    lbutton = 0;