removed mapNotifyEvent since its handled in Window.cc
This commit is contained in:
parent
58e19dc91e
commit
f679d372d3
1 changed files with 7 additions and 10 deletions
|
@ -22,7 +22,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: fluxbox.cc,v 1.107 2003/04/15 00:50:25 rathnor Exp $
|
// $Id: fluxbox.cc,v 1.108 2003/04/15 08:54:40 fluxgen Exp $
|
||||||
|
|
||||||
#include "fluxbox.hh"
|
#include "fluxbox.hh"
|
||||||
|
|
||||||
|
@ -688,12 +688,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case MapNotify:
|
case MapNotify:
|
||||||
{
|
// handled directly in FluxboxWindow::handleEvent
|
||||||
FluxboxWindow *win = searchWindow(e->xmap.window);
|
|
||||||
if (win != 0)
|
|
||||||
win->mapNotifyEvent(e->xmap);
|
|
||||||
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
|
@ -713,7 +708,8 @@ void Fluxbox::handleEvent(XEvent * const e) {
|
||||||
break;
|
break;
|
||||||
case DestroyNotify: {
|
case DestroyNotify: {
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
cerr<<__FILE__<<"("<<__FUNCTION__<<"): DestroyNotify"<<endl;
|
cerr<<__FILE__<<"("<<__FUNCTION__<<"): DestroyNotify window="<<hex<<
|
||||||
|
e->xdestroywindow.window<<dec<<endl;
|
||||||
#endif // DEBUG
|
#endif // DEBUG
|
||||||
FluxboxWindow *win = searchWindow(e->xdestroywindow.window);
|
FluxboxWindow *win = searchWindow(e->xdestroywindow.window);
|
||||||
if (win != 0) {
|
if (win != 0) {
|
||||||
|
@ -943,8 +939,8 @@ void Fluxbox::handleUnmapNotify(XUnmapEvent &ue) {
|
||||||
if ((win = searchWindow(ue.window)) != 0) {
|
if ((win = searchWindow(ue.window)) != 0) {
|
||||||
WinClient *client = win->findClient(ue.window);
|
WinClient *client = win->findClient(ue.window);
|
||||||
|
|
||||||
|
|
||||||
if (client != 0) {
|
if (client != 0) {
|
||||||
|
|
||||||
win->unmapNotifyEvent(ue);
|
win->unmapNotifyEvent(ue);
|
||||||
client = 0; // it's invalid now when win destroyed the client
|
client = 0; // it's invalid now when win destroyed the client
|
||||||
|
|
||||||
|
@ -953,6 +949,7 @@ void Fluxbox::handleUnmapNotify(XUnmapEvent &ue) {
|
||||||
|
|
||||||
// finaly destroy window if empty
|
// finaly destroy window if empty
|
||||||
if (win->numClients() == 0) {
|
if (win->numClients() == 0) {
|
||||||
|
|
||||||
delete win;
|
delete win;
|
||||||
win = 0;
|
win = 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue