X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=bd9527b0956119adefaa38343495590e84293c47;hb=1ffc0021325e30db7bb7f8b2a17ca7f5546b3324;hp=4f26255437f6a6124e220796312f025033d203bb;hpb=c129c236919694e8daef2250f0485a933478b1dc;p=chaz%2Fopenbox

diff --git a/openbox/frame.c b/openbox/frame.c
index 4f262554..bd9527b0 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -41,7 +41,7 @@
                            EnterWindowMask | LeaveWindowMask)
 
 #define FRAME_ANIMATE_ICONIFY_TIME 150000 /* .15 seconds */
-#define FRAME_ANIMATE_ICONIFY_STEP_TIME (G_USEC_PER_SEC / 60) /* 60 Hz */
+#define FRAME_ANIMATE_ICONIFY_STEP_TIME (1000 / 60) /* 60 Hz */
 
 #define FRAME_HANDLE_Y(f) (f->size.top + f->client->area.height + f->cbwidth_b)
 
@@ -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
@@ -1060,8 +1057,8 @@ static gboolean find_reparent(XEvent *e, gpointer data)
 void frame_release_client(ObFrame *self)
 {
     /* if there was any animation going on, kill it */
-    obt_main_loop_timeout_remove_data(ob_main_loop, frame_animate_iconify,
-                                      self, FALSE);
+    if (self->iconify_animation_timer)
+        g_source_remove(self->iconify_animation_timer);
 
     /* check if the app has already reparented its window away */
     if (!xqueue_exists_local(find_reparent, self)) {
@@ -1118,7 +1115,7 @@ void frame_release_client(ObFrame *self)
     window_remove(self->rgriptop);
     window_remove(self->rgripbottom);
 
-    obt_main_loop_timeout_remove_data(ob_main_loop, flash_timeout, self, TRUE);
+    if (self->flash_timer) g_source_remove(self->flash_timer);
 }
 
 /* is there anything present between us and the label? */
@@ -1371,18 +1368,27 @@ ObFrameContext frame_context_from_string(const gchar *name)
         return OB_FRAME_CONTEXT_CLOSE;
     else if (!g_ascii_strcasecmp("MoveResize", name))
         return OB_FRAME_CONTEXT_MOVE_RESIZE;
+    else if (!g_ascii_strcasecmp("Dock", name))
+        return OB_FRAME_CONTEXT_DOCK;
+
     return OB_FRAME_CONTEXT_NONE;
 }
 
 ObFrameContext frame_context(ObClient *client, Window win, gint x, gint y)
 {
     ObFrame *self;
+    ObWindow *obwin;
 
     if (moveresize_in_progress)
         return OB_FRAME_CONTEXT_MOVE_RESIZE;
 
     if (win == obt_root(ob_screen))
-        return OB_FRAME_CONTEXT_ROOT ;
+        return OB_FRAME_CONTEXT_ROOT;
+    if ((obwin = window_find(win))) {
+        if (WINDOW_IS_DOCK(obwin)) {
+          return OB_FRAME_CONTEXT_DOCK;
+        }
+    }
     if (client == NULL) return OB_FRAME_CONTEXT_NONE;
     if (win == client->window) {
         /* conceptually, this is the desktop, as far as users are
@@ -1666,6 +1672,7 @@ static gboolean flash_timeout(gpointer data)
         self->focused = FALSE;
     }
 
+    XFlush(obt_display);
     return TRUE; /* go again */
 }
 
@@ -1674,12 +1681,9 @@ void frame_flash_start(ObFrame *self)
     self->flash_on = self->focused;
 
     if (!self->flashing)
-        obt_main_loop_timeout_add(ob_main_loop,
-                                  G_USEC_PER_SEC * 0.6,
-                                  flash_timeout,
-                                  self,
-                                  g_direct_equal,
-                                  flash_done);
+        self->flash_timer = g_timeout_add_full(G_PRIORITY_DEFAULT,
+                                               600, flash_timeout, self,
+                                               flash_done);
     g_get_current_time(&self->flash_end);
     g_time_val_add(&self->flash_end, G_USEC_PER_SEC * 5);
 
@@ -1766,11 +1770,11 @@ static gboolean frame_animate_iconify(gpointer p)
     }
 
     XMoveResizeWindow(obt_display, self->window, x, y, w, h);
-    XFlush(obt_display);
 
     if (time == 0)
         frame_end_iconify_animation(self);
 
+    XFlush(obt_display);
     return time > 0; /* repeat until we're out of time */
 }
 
@@ -1837,12 +1841,13 @@ void frame_begin_iconify_animation(ObFrame *self, gboolean iconifying)
     }
 
     if (new_anim) {
-        obt_main_loop_timeout_remove_data(ob_main_loop, frame_animate_iconify,
-                                          self, FALSE);
-        obt_main_loop_timeout_add(ob_main_loop,
-                                  FRAME_ANIMATE_ICONIFY_STEP_TIME,
-                                  frame_animate_iconify, self,
-                                  g_direct_equal, NULL);
+        if (self->iconify_animation_timer)
+            g_source_remove(self->iconify_animation_timer);
+        self->iconify_animation_timer =
+            g_timeout_add_full(G_PRIORITY_DEFAULT,
+                               FRAME_ANIMATE_ICONIFY_STEP_TIME,
+                               frame_animate_iconify, self, NULL);
+                               
 
         /* do the first step */
         frame_animate_iconify(self);