← Back to branch summary

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

« back to all changes in this revision

Viewing changes to openbox/moveresize.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/moveresize.c
83
83
{
84
84
    if (moveresize_client == client)
85
85
        moveresize_end(TRUE);
 
86
    if (popup && client == popup->client)
 
87
        popup->client = NULL;
86
88
}
87
89
 
88
90
void moveresize_startup(gboolean reconfig)
167
169
 
168
170
        popup_position(popup, gravity, x, y);
169
171
    }
 
172
    popup->client = c;
170
173
    popup_show(popup, text);
171
174
    g_free(text);
172
175
}
312
315
    ungrab_pointer();
313
316
 
314
317
    popup_hide(popup);
 
318
    popup->client = NULL;
315
319
 
316
320
    if (!moving) {
317
321
#ifdef SYNC
582
586
    a = screen_physical_area_all_monitors();
583
587
 
584
588
    switch (edge_warp_dir) {
585
 
        case OB_DIRECTION_NORTH:
586
 
            y = a->height - 1;
587
 
            break;
588
 
        case OB_DIRECTION_EAST:
589
 
            x = a->x;
590
 
            break;
591
 
        case OB_DIRECTION_SOUTH:
592
 
            y = a->y;
593
 
            break;
594
 
        case OB_DIRECTION_WEST:
595
 
            x = a->width - 1;
596
 
            break;
597
 
        default:
 
589
    case OB_DIRECTION_NORTH:
 
590
        y = a->height - 1;
 
591
        break;
 
592
    case OB_DIRECTION_EAST:
 
593
        x = a->x;
 
594
        break;
 
595
    case OB_DIRECTION_SOUTH:
 
596
        y = a->y;
 
597
        break;
 
598
    case OB_DIRECTION_WEST:
 
599
        x = a->width - 1;
 
600
        break;
 
601
    default:
598
602
        g_assert_not_reached();
599
603
    }
600
604
 
630
634
 
631
635
    for (i = 0; i < screen_num_monitors; ++i) {
632
636
        const Rect *a = screen_physical_area_monitor(i);
 
637
 
 
638
        if (!RECT_CONTAINS(*a, x, y))
 
639
            continue;
 
640
 
633
641
        if (x == RECT_LEFT(*a)) dir = OB_DIRECTION_WEST;
634
642
        if (x == RECT_RIGHT(*a)) dir = OB_DIRECTION_EAST;
635
643
        if (y == RECT_TOP(*a)) dir = OB_DIRECTION_NORTH;