From 79cf72d17ff42e5bc8eb1adbd98bb42aa71fb085 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 14 Jun 2010 12:15:02 -0400 Subject: Fix the EXTENTS reported on window frames. Change the order things are done on map, so we apply startup state without any states set first, thus getting all the functions possible for the window type etc. then change the order states are applied, as some remove the ability to apply others (ie fullscreen comes last). Add an oldsize to ObFrame that remembers the size of the frame last reported to the world through the EXTENTS property. If you frame_adjust_area(FAKE) then frame_adjust_area(NONFAKE), the EXTENTS would not be updated since the oldsize wasn't remembered across fake updates. Make the extentsrequest test ask about windows with states set also. --- openbox/frame.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'openbox/frame.c') diff --git a/openbox/frame.c b/openbox/frame.c index c6a47b08..1623a834 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -190,7 +190,7 @@ ObFrame *frame_new(ObClient *client) /* make sure the size will be different the first time, so the extent hints will be set */ - STRUT_SET(self->size, -1, -1, -1, -1); + STRUT_SET(self->oldsize, -1, -1, -1, -1); set_theme_statics(self); @@ -330,10 +330,6 @@ void frame_adjust_shape(ObFrame *self) void frame_adjust_area(ObFrame *self, gboolean moved, gboolean resized, gboolean fake) { - Strut oldsize; - - oldsize = self->size; - if (resized) { /* do this before changing the frame's status like max_horz max_vert */ frame_adjust_cursors(self); @@ -849,7 +845,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved, frame_adjust_shape(self); } - if (!STRUT_EQUAL(self->size, oldsize)) { + if (!STRUT_EQUAL(self->size, self->oldsize)) { gulong vals[4]; vals[0] = self->size.left; vals[1] = self->size.right; @@ -859,6 +855,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved, CARDINAL, vals, 4); OBT_PROP_SETA32(self->client->window, KDE_NET_WM_FRAME_STRUT, CARDINAL, vals, 4); + self->oldsize = self->size; } /* if this occurs while we are focus cycling, the indicator needs to -- cgit v1.2.3