[Xfce4-commits] r30377 - in xfwm4/trunk: . src themes/default

Olivier Fourdan olivier at xfce.org
Wed Jul 22 10:16:40 CEST 2009


Author: olivier
Date: 2009-07-22 08:16:40 +0000 (Wed, 22 Jul 2009)
New Revision: 30377

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/client.c
   xfwm4/trunk/src/client.h
   xfwm4/trunk/src/events.c
   xfwm4/trunk/src/focus.c
   xfwm4/trunk/themes/default/bottom-active.png
   xfwm4/trunk/themes/default/bottom-inactive.png
   xfwm4/trunk/themes/default/bottom-left-active.png
   xfwm4/trunk/themes/default/bottom-left-inactive.png
   xfwm4/trunk/themes/default/bottom-right-active.png
   xfwm4/trunk/themes/default/bottom-right-inactive.png
   xfwm4/trunk/themes/default/close-active.png
   xfwm4/trunk/themes/default/close-inactive.png
   xfwm4/trunk/themes/default/close-prelight.png
   xfwm4/trunk/themes/default/close-pressed.png
   xfwm4/trunk/themes/default/hide-active.png
   xfwm4/trunk/themes/default/hide-inactive.png
   xfwm4/trunk/themes/default/hide-prelight.png
   xfwm4/trunk/themes/default/hide-pressed.png
   xfwm4/trunk/themes/default/left-active.png
   xfwm4/trunk/themes/default/left-inactive.png
   xfwm4/trunk/themes/default/maximize-active.png
   xfwm4/trunk/themes/default/maximize-inactive.png
   xfwm4/trunk/themes/default/maximize-prelight.png
   xfwm4/trunk/themes/default/maximize-pressed.png
   xfwm4/trunk/themes/default/maximize-toggled-active.png
   xfwm4/trunk/themes/default/maximize-toggled-inactive.png
   xfwm4/trunk/themes/default/maximize-toggled-prelight.png
   xfwm4/trunk/themes/default/maximize-toggled-pressed.png
   xfwm4/trunk/themes/default/menu-active.png
   xfwm4/trunk/themes/default/menu-inactive.png
   xfwm4/trunk/themes/default/menu-prelight.png
   xfwm4/trunk/themes/default/menu-pressed.png
   xfwm4/trunk/themes/default/right-active.png
   xfwm4/trunk/themes/default/right-inactive.png
   xfwm4/trunk/themes/default/shade-active.png
   xfwm4/trunk/themes/default/shade-inactive.png
   xfwm4/trunk/themes/default/shade-prelight.png
   xfwm4/trunk/themes/default/shade-pressed.png
   xfwm4/trunk/themes/default/shade-toggled-active.png
   xfwm4/trunk/themes/default/shade-toggled-inactive.png
   xfwm4/trunk/themes/default/shade-toggled-prelight.png
   xfwm4/trunk/themes/default/shade-toggled-pressed.png
   xfwm4/trunk/themes/default/stick-active.png
   xfwm4/trunk/themes/default/stick-inactive.png
   xfwm4/trunk/themes/default/stick-prelight.png
   xfwm4/trunk/themes/default/stick-pressed.png
   xfwm4/trunk/themes/default/stick-toggled-active.png
   xfwm4/trunk/themes/default/stick-toggled-inactive.png
   xfwm4/trunk/themes/default/stick-toggled-prelight.png
   xfwm4/trunk/themes/default/stick-toggled-pressed.png
   xfwm4/trunk/themes/default/title-1-active.png
   xfwm4/trunk/themes/default/title-1-inactive.png
   xfwm4/trunk/themes/default/title-2-active.png
   xfwm4/trunk/themes/default/title-2-inactive.png
   xfwm4/trunk/themes/default/title-3-active.png
   xfwm4/trunk/themes/default/title-3-inactive.png
   xfwm4/trunk/themes/default/title-4-active.png
   xfwm4/trunk/themes/default/title-4-inactive.png
   xfwm4/trunk/themes/default/title-5-active.png
   xfwm4/trunk/themes/default/title-5-inactive.png
   xfwm4/trunk/themes/default/top-left-active.png
   xfwm4/trunk/themes/default/top-left-inactive.png
   xfwm4/trunk/themes/default/top-right-active.png
   xfwm4/trunk/themes/default/top-right-inactive.png
Log:
	* src/focus.c: Place windows on top of stack even when not focused in
	  focus follow mouse.
	  (patch by Clifford Jolly<cliff at cliffjolly.com>).

Modified: xfwm4/trunk/ChangeLog
===================================================================
--- xfwm4/trunk/ChangeLog	2009-07-22 08:13:15 UTC (rev 30376)
+++ xfwm4/trunk/ChangeLog	2009-07-22 08:16:40 UTC (rev 30377)
@@ -1,3 +1,8 @@
+2009-07-19	olivier
+
+	* src/focus.c: Place windows on top of stack even when not focused in
+	  focus follow mouse.
+
 2009-07-09	olivier
 	* src/cycle.c, src/events.c, src/client.c: Transition fullscreen
 	  windows back to their original layer when another window is 
@@ -4,7 +9,7 @@
 	  activated (Bug #3551), do not clear the show desktop flag upon 
 	  activation of already visible windows,
 	* src/moveresize.c: prelinminary support for snap on resize 
-	  (patch by Clifford Jolly<cliff at cliffjolly.com>)
+	  (patch by Clifford Jolly<cliff at cliffjolly.com>).
 
 2009-06-29	jannis
 

Modified: xfwm4/trunk/NEWS
===================================================================
--- xfwm4/trunk/NEWS	2009-07-22 08:13:15 UTC (rev 30376)
+++ xfwm4/trunk/NEWS	2009-07-22 08:16:40 UTC (rev 30377)
@@ -6,6 +6,7 @@
   already visible windows
 - Implement prelinminary support for snap on resize (patch by Clifford Jolly <cliff at cliffjolly.com>)
 - Fix mixed RTL/LTR text not rendering properly in title and tabwin
+- Place windows on top of stack even when not focused in focus follow mouse
 
 4.6.1
 =====

Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c	2009-07-22 08:13:15 UTC (rev 30376)
+++ xfwm4/trunk/src/client.c	2009-07-22 08:16:40 UTC (rev 30377)
@@ -873,7 +873,7 @@
             }
             else
             {
-                clientActivate (c, getXServerTime (display_info));
+                clientActivate (c, getXServerTime (display_info), TRUE);
             }
         }
     }
@@ -2545,7 +2545,7 @@
 }
 
 void
-clientActivate (Client * c, guint32 timestamp)
+clientActivate (Client * c, guint32 timestamp, gboolean source_is_application)
 {
     ScreenInfo *screen_info;
     Client *focused;
@@ -2583,7 +2583,10 @@
         }
         clientRaise (sibling, None);
         clientShow (sibling, TRUE);
-        clientSetFocus (screen_info, c, timestamp, NO_FOCUS_FLAG);
+        if (!source_is_application || screen_info->params->click_to_focus)
+        {
+            clientSetFocus (screen_info, c, timestamp, NO_FOCUS_FLAG);
+        }
         clientSetLastRaise (c);
     }
     else

Modified: xfwm4/trunk/src/client.h
===================================================================
--- xfwm4/trunk/src/client.h	2009-07-22 08:13:15 UTC (rev 30376)
+++ xfwm4/trunk/src/client.h	2009-07-22 08:16:40 UTC (rev 30377)
@@ -389,7 +389,8 @@
 void                     clientClearAllShowDesktop              (ScreenInfo *);
 void                     clientToggleShowDesktop                (ScreenInfo *);
 void                     clientActivate                         (Client *,
-                                                                 guint32);
+                                                                 guint32,
+                                                                 gboolean);
 void                     clientClose                            (Client *);
 void                     clientKill                             (Client *);
 void                     clientTerminate                        (Client *);

Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c	2009-07-22 08:13:15 UTC (rev 30376)
+++ xfwm4/trunk/src/events.c	2009-07-22 08:16:40 UTC (rev 30377)
@@ -2100,13 +2100,13 @@
                 }
                 else
                 {
-                    clientActivate (c, ev_time);
+                    clientActivate (c, ev_time, source_is_application);
                 }
             }
             else
             {
                 /* The request is either from a pager or an older client, use the most accurate timestamp */
-                clientActivate (c, getXServerTime (display_info));
+                clientActivate (c, getXServerTime (display_info), source_is_application);
             }
         }
         else if (ev->message_type == display_info->atoms[NET_REQUEST_FRAME_EXTENTS])

Modified: xfwm4/trunk/src/focus.c
===================================================================
--- xfwm4/trunk/src/focus.c	2009-07-22 08:13:15 UTC (rev 30376)
+++ xfwm4/trunk/src/focus.c	2009-07-22 08:16:40 UTC (rev 30377)
@@ -214,7 +214,12 @@
     {
         Client *c2 = clientGetFocus();
 
-        if ((c2 != NULL) && (c2->win_layer == c->win_layer))
+        /*
+         * Place windows under the currently focused only if focus
+         * stealing prevention had prevented the focus transition,
+         * otherwise, leave the unfocused window on top.
+         */
+        if ((c2 != NULL) && (c2->win_layer == c->win_layer) && prevented)
         {
             clientSortRing(c);
             clientLower (c, c2->frame);

Modified: xfwm4/trunk/themes/default/bottom-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/bottom-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/bottom-left-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/bottom-left-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/bottom-right-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/bottom-right-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/close-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/close-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/close-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/close-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/hide-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/hide-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/hide-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/hide-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/left-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/left-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/maximize-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/maximize-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/maximize-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/maximize-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/maximize-toggled-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/maximize-toggled-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/maximize-toggled-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/maximize-toggled-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/menu-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/menu-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/menu-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/menu-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/right-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/right-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/shade-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/shade-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/shade-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/shade-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/shade-toggled-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/shade-toggled-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/shade-toggled-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/shade-toggled-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/stick-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/stick-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/stick-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/stick-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/stick-toggled-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/stick-toggled-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/stick-toggled-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/stick-toggled-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-1-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-1-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-2-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-2-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-3-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-3-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-4-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-4-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-5-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-5-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/top-left-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/top-left-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/top-right-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/top-right-inactive.png
===================================================================
(Binary files differ)




More information about the Xfce4-commits mailing list