+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+ moveresize.c for the Openbox window manager
+ Copyright (c) 2003 Ben Jansens
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ See the COPYING file for a copy of the GNU General Public License.
+*/
+
#include "grab.h"
#include "framerender.h"
#include "screen.h"
static guint32 corner;
static ObCorner lockcorner;
-static Popup *popup = NULL;
+static ObPopup *popup = NULL;
static void client_dest(gpointer client)
{
void moveresize_shutdown(gboolean reconfig)
{
- if (!reconfig)
+ if (!reconfig) {
+ if (moveresize_in_progress)
+ moveresize_end(FALSE);
client_remove_destructor(client_dest);
+ }
popup_free(popup);
popup = NULL;
c->area.width / 2,
c->frame->area.y + c->frame->size.top +
c->area.height / 2);
- popup_show(popup, text, NULL);
+ popup_show(popup, text);
g_free(text);
}
{
ObCursor cur;
- g_assert(!moveresize_in_progress);
-
- if (!c->frame->visible)
+ if (moveresize_in_progress || !c->frame->visible)
return;
moveresize_client = c;