X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fmoveresize.c;h=7b9460073160bf6949900486b9e2abf5bb624e77;hb=78ff91ae6c225cf80b77d1e3e57370c01a693ff0;hp=8ef18a87f56a556e02ab41b03021d4d176618617;hpb=2e529e3ff3db902cdf0c7b1fbf796ea2372a299b;p=chaz%2Fopenbox diff --git a/openbox/moveresize.c b/openbox/moveresize.c index 8ef18a87..7b946007 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -152,12 +152,11 @@ static void popup_coords(ObClient *c, const gchar *format, gint a, gint b) void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr) { ObCursor cur; - - moving = (cnr == prop_atoms.net_wm_moveresize_move || - cnr == prop_atoms.net_wm_moveresize_move_keyboard); + gboolean mv = (cnr == prop_atoms.net_wm_moveresize_move || + cnr == prop_atoms.net_wm_moveresize_move_keyboard); if (moveresize_in_progress || !c->frame->visible || - !(moving ? + !(mv ? (c->functions & OB_CLIENT_FUNC_MOVE) : (c->functions & OB_CLIENT_FUNC_RESIZE))) return; @@ -197,6 +196,7 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr) frame_end_iconify_animation(c->frame); + moving = mv; moveresize_client = c; start_cx = c->area.x; start_cy = c->area.y;