[Xfce4-commits] r30397 - xfwm4/trunk/themes/default

[Olivier Fourdan]

Author: olivier
Date: 2009-07-26 14:21:38 + (Sun, 26 Jul 2009)
New Revision: 30397

Modified:
   xfwm4/trunk/themes/default/top-left-inactive.png
   xfwm4/trunk/themes/default/top-left-inactive.svg
   xfwm4/trunk/themes/default/top-right-inactive.png
   xfwm4/trunk/themes/default/top-right-inactive.svg
Log:
Fix height of gradients on top window corners when unfocused


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

Modified: xfwm4/trunk/themes/default/top-left-inactive.svg
===
--- xfwm4/trunk/themes/default/top-left-inactive.svg2009-07-26 14:14:01 UTC 
(rev 30396)
+++ xfwm4/trunk/themes/default/top-left-inactive.svg2009-07-26 14:21:38 UTC 
(rev 30397)
@@ -163,7 +163,7 @@
 path
id=path6057

style=fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1
-   d=M 8,1 L 5.75,1 C 5.75,1 3,1 3,5 C 3,5 3.75,5 3.75,5 L 8,4 L 8,4 z  
/
+   d=M 8,1 L 5,1 C 4,1 1,1 1,4 C 1,7.5 1,11 1,14 L 8,14 L 8,14 L 8,1 z  
/
   /g
   g
  inkscape:label=hilight

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

Modified: xfwm4/trunk/themes/default/top-right-inactive.svg
===
--- xfwm4/trunk/themes/default/top-right-inactive.svg   2009-07-26 14:14:01 UTC 
(rev 30396)
+++ xfwm4/trunk/themes/default/top-right-inactive.svg   2009-07-26 14:21:38 UTC 
(rev 30397)
@@ -162,7 +162,7 @@
  style=display:inline
 path

style=fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1
-   d=M 0,1 L 2.25,1 C 2.25,1 5,1 5,5 C 5,5 4.25,5 4.25,5 L 0,4 L 0,4 z 
+   d=M 0,1 L 3,1 C 4,1 7,1 7,4 C 7,7.5 7,11 7,14 L 0,14 L 0,14 L 0,1 z 
id=path6057 /
   /g
   g

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r30404 - in xfwm4/branches/xfce_4_6: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-07-27 05:58:56 + (Mon, 27 Jul 2009)
New Revision: 30404

Modified:
   xfwm4/branches/xfce_4_6/ChangeLog
   xfwm4/branches/xfce_4_6/NEWS
   xfwm4/branches/xfce_4_6/src/client.c
   xfwm4/branches/xfce_4_6/src/focus.c
Log:
* src/focus.c: Place windows on top of stack even when not focused in
  focus follow mouse (Bug #5479).
* src/client.c: Transition fullscreen windows back to their original
  layer when another window is activated (Bug #3551)

Modified: xfwm4/branches/xfce_4_6/ChangeLog
===
--- xfwm4/branches/xfce_4_6/ChangeLog   2009-07-27 02:27:43 UTC (rev 30403)
+++ xfwm4/branches/xfce_4_6/ChangeLog   2009-07-27 05:58:56 UTC (rev 30404)
@@ -1,3 +1,10 @@
+2009-07-27 olivier
+
+   * src/focus.c: Place windows on top of stack even when not focused in
+ focus follow mouse (Bug #5479).
+   * src/client.c: Transition fullscreen windows back to their original
+ layer when another window is activated (Bug #3551)
+
 2009-05-22 olivier
* frame.c, tabwin.c: Fix mixed RTL/LTR text not rendering properly 
  in title and tabwin

Modified: xfwm4/branches/xfce_4_6/NEWS
===
--- xfwm4/branches/xfce_4_6/NEWS2009-07-27 02:27:43 UTC (rev 30403)
+++ xfwm4/branches/xfce_4_6/NEWS2009-07-27 05:58:56 UTC (rev 30404)
@@ -1,7 +1,11 @@
 4.6.2
 =
 
+- Transition fullscreen windows back to their original layer 
+  when another window is activated (Bug #3551)
 - 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
+  (Bug #5479)
 
 4.6.1
 =

Modified: xfwm4/branches/xfce_4_6/src/client.c
===
--- xfwm4/branches/xfce_4_6/src/client.c2009-07-27 02:27:43 UTC (rev 
30403)
+++ xfwm4/branches/xfce_4_6/src/client.c2009-07-27 05:58:56 UTC (rev 
30404)
@@ -2548,6 +2548,7 @@
 clientActivate (Client * c, guint32 timestamp)
 {
 ScreenInfo *screen_info;
+Client *focused;
 Client *sibling;
 
 g_return_if_fail (c != NULL);
@@ -2555,8 +2556,15 @@
 
 screen_info = c-screen_info;
 sibling = clientGetTransientFor(c);
+focused = clientGetFocus ();
+
 if ((screen_info-current_ws == c-win_workspace) || 
(screen_info-params-activate_action != ACTIVATE_ACTION_NONE))
 {
+if ((focused)  (c != focused))
+{
+/* We might be able to avoid this if we are about to switch 
workspace */
+clientAdjustFullscreenLayer (focused, FALSE);
+}
 if (screen_info-current_ws != c-win_workspace)
 {
 if (screen_info-params-activate_action == ACTIVATE_ACTION_BRING)

Modified: xfwm4/branches/xfce_4_6/src/focus.c
===
--- xfwm4/branches/xfce_4_6/src/focus.c 2009-07-27 02:27:43 UTC (rev 30403)
+++ xfwm4/branches/xfce_4_6/src/focus.c 2009-07-27 05:58:56 UTC (rev 30404)
@@ -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);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29972 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-05-22 12:52:55 + (Fri, 22 May 2009)
New Revision: 29972

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/frame.c
   xfwm4/trunk/src/tabwin.c
Log:
* frame.c, tabwin.c: Fix mixed RTL/LTR text not rendering properly 
  in title and tabwin

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-05-22 11:50:43 UTC (rev 29971)
+++ xfwm4/trunk/ChangeLog   2009-05-22 12:52:55 UTC (rev 29972)
@@ -1,3 +1,7 @@
+2009-05-22 olivier
+   * frame.c, tabwin.c: Fix mixed RTL/LTR text not rendering properly 
+ in title and tabwin
+
 2009-04-12 olivier
 
* configure.ac.in, themes/Makefile.am: Update versions

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-05-22 11:50:43 UTC (rev 29971)
+++ xfwm4/trunk/NEWS2009-05-22 12:52:55 UTC (rev 29972)
@@ -1,3 +1,8 @@
+4.6.2
+=
+
+- Fix mixed RTL/LTR text not rendering properly in title and tabwin
+
 4.6.1
 =
 

Modified: xfwm4/trunk/src/frame.c
===
--- xfwm4/trunk/src/frame.c 2009-05-22 11:50:43 UTC (rev 29971)
+++ xfwm4/trunk/src/frame.c 2009-05-22 12:52:55 UTC (rev 29972)
@@ -313,9 +313,6 @@
 return;
 }
 
-layout = gtk_widget_create_pango_layout (myScreenGetGtkWidget 
(screen_info), c-name);
-pango_layout_get_pixel_extents (layout, NULL, logical_rect);
-
 if (left  frameTopLeftWidth (c, state))
 {
 left = frameTopLeftWidth (c, state);
@@ -344,6 +341,10 @@
 voffset = screen_info-params-title_vertical_offset_inactive;
 }
 
+layout = gtk_widget_create_pango_layout (myScreenGetGtkWidget 
(screen_info), c-name);
+pango_layout_set_auto_dir (layout, FALSE);
+pango_layout_get_pixel_extents (layout, NULL, logical_rect);
+
 title_height = screen_info-font_height;
 if (!title_height)
 {

Modified: xfwm4/trunk/src/tabwin.c
===
--- xfwm4/trunk/src/tabwin.c2009-05-22 11:50:43 UTC (rev 29971)
+++ xfwm4/trunk/src/tabwin.c2009-05-22 12:52:55 UTC (rev 29972)
@@ -107,9 +107,9 @@
 {
 gchar *markup;
 gchar *message;
+PangoLayout *layout;
 
 message = pretty_string (class);
-gtk_label_set_use_markup (GTK_LABEL (t-class), TRUE);
 markup = g_strconcat (span size=\larger\ weight=\bold\, message, 
/span, NULL);
 g_free (message);
 
@@ -124,7 +124,13 @@
 {
 message = g_strdup_printf (%s, label);
 }
+
 gtk_label_set_text (GTK_LABEL (t-label), message);
+/* Need to update the layout after setting the text */
+layout = gtk_label_get_layout (GTK_LABEL(t-label));
+pango_layout_set_auto_dir (layout, FALSE);
+/* the layout belong to the gtk_label and must not be freed */
+
 g_free (message);
 }
 
@@ -287,7 +293,7 @@
 gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 gtk_container_add (GTK_CONTAINER (colorbox2), vbox);
 
-tabwin-class = gtk_label_new (NULL);
+tabwin-class = gtk_label_new ();
 gtk_label_set_use_markup (GTK_LABEL (tabwin-class), TRUE);
 gtk_label_set_justify (GTK_LABEL (tabwin-class), GTK_JUSTIFY_CENTER);
 gtk_box_pack_start (GTK_BOX (vbox), tabwin-class, TRUE, TRUE, 0);
@@ -300,6 +306,7 @@
 tabwin-label = gtk_label_new ();
 gtk_label_set_use_markup (GTK_LABEL (tabwin-label), FALSE);
 gtk_label_set_justify (GTK_LABEL (tabwin-label), GTK_JUSTIFY_CENTER);
+gtk_label_set_use_markup (GTK_LABEL (tabwin-class), TRUE);
 gtk_box_pack_start (GTK_BOX (vbox), tabwin-label, TRUE, TRUE, 0);
 gtk_widget_set_size_request (GTK_WIDGET (tabwin-label), 240, -1);
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29973 - in xfwm4/branches/xfce_4_6: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-05-22 13:19:13 + (Fri, 22 May 2009)
New Revision: 29973

Modified:
   xfwm4/branches/xfce_4_6/ChangeLog
   xfwm4/branches/xfce_4_6/NEWS
   xfwm4/branches/xfce_4_6/src/frame.c
   xfwm4/branches/xfce_4_6/src/tabwin.c
Log:
* frame.c, tabwin.c: Fix mixed RTL/LTR text not rendering properly 
  in title and tabwin

Modified: xfwm4/branches/xfce_4_6/ChangeLog
===
--- xfwm4/branches/xfce_4_6/ChangeLog   2009-05-22 12:52:55 UTC (rev 29972)
+++ xfwm4/branches/xfce_4_6/ChangeLog   2009-05-22 13:19:13 UTC (rev 29973)
@@ -1,3 +1,7 @@
+2009-05-22 olivier
+   * frame.c, tabwin.c: Fix mixed RTL/LTR text not rendering properly 
+ in title and tabwin
+
 2009-04-14 olivier
 
* configure.ac.in: === xfwm4 4.6.1 ===

Modified: xfwm4/branches/xfce_4_6/NEWS
===
--- xfwm4/branches/xfce_4_6/NEWS2009-05-22 12:52:55 UTC (rev 29972)
+++ xfwm4/branches/xfce_4_6/NEWS2009-05-22 13:19:13 UTC (rev 29973)
@@ -1,3 +1,8 @@
+4.6.2
+=
+
+- Fix mixed RTL/LTR text not rendering properly in title and tabwin
+
 4.6.1
 =
 

Modified: xfwm4/branches/xfce_4_6/src/frame.c
===
--- xfwm4/branches/xfce_4_6/src/frame.c 2009-05-22 12:52:55 UTC (rev 29972)
+++ xfwm4/branches/xfce_4_6/src/frame.c 2009-05-22 13:19:13 UTC (rev 29973)
@@ -313,9 +313,6 @@
 return;
 }
 
-layout = gtk_widget_create_pango_layout (myScreenGetGtkWidget 
(screen_info), c-name);
-pango_layout_get_pixel_extents (layout, NULL, logical_rect);
-
 if (left  frameTopLeftWidth (c, state))
 {
 left = frameTopLeftWidth (c, state);
@@ -344,6 +341,10 @@
 voffset = screen_info-params-title_vertical_offset_inactive;
 }
 
+layout = gtk_widget_create_pango_layout (myScreenGetGtkWidget 
(screen_info), c-name);
+pango_layout_set_auto_dir (layout, FALSE);
+pango_layout_get_pixel_extents (layout, NULL, logical_rect);
+
 title_height = screen_info-font_height;
 if (!title_height)
 {

Modified: xfwm4/branches/xfce_4_6/src/tabwin.c
===
--- xfwm4/branches/xfce_4_6/src/tabwin.c2009-05-22 12:52:55 UTC (rev 
29972)
+++ xfwm4/branches/xfce_4_6/src/tabwin.c2009-05-22 13:19:13 UTC (rev 
29973)
@@ -107,9 +107,9 @@
 {
 gchar *markup;
 gchar *message;
+PangoLayout *layout;
 
 message = pretty_string (class);
-gtk_label_set_use_markup (GTK_LABEL (t-class), TRUE);
 markup = g_strconcat (span size=\larger\ weight=\bold\, message, 
/span, NULL);
 g_free (message);
 
@@ -124,7 +124,13 @@
 {
 message = g_strdup_printf (%s, label);
 }
+
 gtk_label_set_text (GTK_LABEL (t-label), message);
+/* Need to update the layout after setting the text */
+layout = gtk_label_get_layout (GTK_LABEL(t-label));
+pango_layout_set_auto_dir (layout, FALSE);
+/* the layout belong to the gtk_label and must not be freed */
+
 g_free (message);
 }
 
@@ -287,7 +293,7 @@
 gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 gtk_container_add (GTK_CONTAINER (colorbox2), vbox);
 
-tabwin-class = gtk_label_new (NULL);
+tabwin-class = gtk_label_new ();
 gtk_label_set_use_markup (GTK_LABEL (tabwin-class), TRUE);
 gtk_label_set_justify (GTK_LABEL (tabwin-class), GTK_JUSTIFY_CENTER);
 gtk_box_pack_start (GTK_BOX (vbox), tabwin-class, TRUE, TRUE, 0);
@@ -300,6 +306,7 @@
 tabwin-label = gtk_label_new ();
 gtk_label_set_use_markup (GTK_LABEL (tabwin-label), FALSE);
 gtk_label_set_justify (GTK_LABEL (tabwin-label), GTK_JUSTIFY_CENTER);
+gtk_label_set_use_markup (GTK_LABEL (tabwin-class), TRUE);
 gtk_box_pack_start (GTK_BOX (vbox), tabwin-label, TRUE, TRUE, 0);
 gtk_widget_set_size_request (GTK_WIDGET (tabwin-label), 240, -1);
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29879 - xfce4-panel/branches/xfce_4_6/plugins/launcher

[Olivier Fourdan]

Author: olivier
Date: 2009-04-21 13:36:06 + (Tue, 21 Apr 2009)
New Revision: 29879

Modified:
   xfce4-panel/branches/xfce_4_6/plugins/launcher/launcher.c
Log:
Fix typo preventing build on older gtk versions

Modified: xfce4-panel/branches/xfce_4_6/plugins/launcher/launcher.c
===
--- xfce4-panel/branches/xfce_4_6/plugins/launcher/launcher.c   2009-04-21 
13:33:08 UTC (rev 29878)
+++ xfce4-panel/branches/xfce_4_6/plugins/launcher/launcher.c   2009-04-21 
13:36:06 UTC (rev 29879)
@@ -425,7 +425,7 @@
 /* create tooltip text */
 if (entry != NULL
  entry-name 
- launcher-arrow_position != LAUNCHER_ARROW_INSIDE_BUTTON))
+ launcher-arrow_position != LAUNCHER_ARROW_INSIDE_BUTTON)
 {
 if (entry-comment)
 string = g_strdup_printf (%s\n%s, entry-name, entry-comment);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29880 - xfce4-panel/trunk/plugins/launcher

[Olivier Fourdan]

Author: olivier
Date: 2009-04-21 13:36:21 + (Tue, 21 Apr 2009)
New Revision: 29880

Modified:
   xfce4-panel/trunk/plugins/launcher/launcher.c
Log:
Fix typo preventing build on older gtk versions

Modified: xfce4-panel/trunk/plugins/launcher/launcher.c
===
--- xfce4-panel/trunk/plugins/launcher/launcher.c   2009-04-21 13:36:06 UTC 
(rev 29879)
+++ xfce4-panel/trunk/plugins/launcher/launcher.c   2009-04-21 13:36:21 UTC 
(rev 29880)
@@ -425,7 +425,7 @@
 /* create tooltip text */
 if (entry != NULL
  entry-name 
- launcher-arrow_position != LAUNCHER_ARROW_INSIDE_BUTTON))
+ launcher-arrow_position != LAUNCHER_ARROW_INSIDE_BUTTON)
 {
 if (entry-comment)
 string = g_strdup_printf (%s\n%s, entry-name, entry-comment);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29800 - xfwm4/branches/xfce_4_6

[Olivier Fourdan]

Author: olivier
Date: 2009-04-14 20:50:46 + (Tue, 14 Apr 2009)
New Revision: 29800

Modified:
   xfwm4/branches/xfce_4_6/ChangeLog
   xfwm4/branches/xfce_4_6/configure.ac.in
Log:
* configure.ac.in: === xfwm4 4.6.1 ===

Modified: xfwm4/branches/xfce_4_6/ChangeLog
===
--- xfwm4/branches/xfce_4_6/ChangeLog   2009-04-14 20:23:04 UTC (rev 29799)
+++ xfwm4/branches/xfce_4_6/ChangeLog   2009-04-14 20:50:46 UTC (rev 29800)
@@ -1,3 +1,7 @@
+2009-04-14 olivier
+
+   * configure.ac.in: === xfwm4 4.6.1 ===
+
 2009-04-09 olivier
 
* src/events.c, src/keyboard.c: Fix grab remaining if shortcut is not

Modified: xfwm4/branches/xfce_4_6/configure.ac.in
===
--- xfwm4/branches/xfce_4_6/configure.ac.in 2009-04-14 20:23:04 UTC (rev 
29799)
+++ xfwm4/branches/xfce_4_6/configure.ac.in 2009-04-14 20:50:46 UTC (rev 
29800)
@@ -5,7 +5,7 @@
 
 m4_define([xfwm4_version_major], [4])
 m4_define([xfwm4_version_minor], [6])
-m4_define([xfwm4_version_micro], [0])
+m4_define([xfwm4_version_micro], [1])
 m4_define([xfwm4_version_build], [...@revision@])
 m4_define([xfwm4_version_tag],   [])
 m4_define([xfwm4_version], 
[xfwm4_version_major().xfwm4_version_minor().xfwm4_version_micro()ifelse(xfwm4_version_tag(),
 [svn], [xfwm4_version_tag().xfwm4_version_build()], [xfwm4_version_tag()])])

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29801 - xfwm4/tags

[Olivier Fourdan]

Author: olivier
Date: 2009-04-14 20:54:22 + (Tue, 14 Apr 2009)
New Revision: 29801

Added:
   xfwm4/tags/xfce_4_6_1/
Log:
=== Xfce 4.6.1 released ===

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29734 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-04-09 11:30:27 + (Thu, 09 Apr 2009)
New Revision: 29734

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/events.c
   xfwm4/trunk/src/keyboard.c
Log:
* src/events.c, src/keyboard.c: Fix grab remaining if shortcut is not
  used (Bug #5207)

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-04-09 08:06:49 UTC (rev 29733)
+++ xfwm4/trunk/ChangeLog   2009-04-09 11:30:27 UTC (rev 29734)
@@ -1,3 +1,8 @@
+2009-04-09 olivier
+
+   * src/events.c, src/keyboard.c: Fix grab remaining if shortcut is not
+ used (Bug #5207)
+
 2009-04-08 olivier
 
* src/compositor.c: Ignore stacking when detecting overlays

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-04-09 08:06:49 UTC (rev 29733)
+++ xfwm4/trunk/NEWS2009-04-09 11:30:27 UTC (rev 29734)
@@ -15,6 +15,7 @@
   (Bug #5030)
 - Check fullscreen status against each monitor and not just the overall screen
   size in the compositor. 
+- Fix remaining active grab if shortcut if shortcut is not used (Bug #5207) 
 - Plug various memory leaks
 
 

Modified: xfwm4/trunk/src/events.c
===
--- xfwm4/trunk/src/events.c2009-04-09 08:06:49 UTC (rev 29733)
+++ xfwm4/trunk/src/events.c2009-04-09 11:30:27 UTC (rev 29734)
@@ -291,6 +291,7 @@
 eventFilterStatus status;
 ScreenInfo *screen_info;
 ScreenInfo *ev_screen_info;
+gboolean handled;
 Client *c;
 int key;
 
@@ -304,6 +305,7 @@
 return EVENT_FILTER_PASS;
 }
 
+handled = FALSE;
 status = EVENT_FILTER_PASS;
 c = clientGetFocus ();
 if (c)
@@ -315,23 +317,28 @@
 switch (key)
 {
 case KEY_MOVE:
+handled = TRUE;
 XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientMove (c, (XEvent *) ev);
 break;
 case KEY_RESIZE:
+handled = TRUE;
 XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientResize (c, CORNER_BOTTOM_RIGHT, (XEvent *) ev);
 break;
 case KEY_CYCLE_WINDOWS:
 case KEY_CYCLE_REVERSE_WINDOWS:
+handled = TRUE;
 XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientCycle (c, ev);
 break;
 case KEY_CLOSE_WINDOW:
+handled = TRUE;
 XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientClose (c);
 break;
 case KEY_HIDE_WINDOW:
+handled = TRUE;
 XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 if (CLIENT_CAN_HIDE_WINDOW (c))
 {
@@ -339,22 +346,27 @@
 }
 break;
 case KEY_MAXIMIZE_WINDOW:
+handled = TRUE;
 XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientToggleMaximized (c, WIN_STATE_MAXIMIZED, TRUE);
 break;
 case KEY_MAXIMIZE_VERT:
+handled = TRUE;
 XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientToggleMaximized (c, WIN_STATE_MAXIMIZED_VERT, TRUE);
 break;
 case KEY_MAXIMIZE_HORIZ:
+handled = TRUE;
 XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientToggleMaximized (c, WIN_STATE_MAXIMIZED_HORIZ, TRUE);
 break;
 case KEY_SHADE_WINDOW:
+handled = TRUE;
 XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientToggleShaded (c);
 break;
 case KEY_STICK_WINDOW:
+handled = TRUE;
 XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 if (FLAG_TEST(c-xfwm_flags, XFWM_FLAG_HAS_STICK))
 {
@@ -363,42 +375,52 @@
 }
 break;
 case KEY_RAISE_WINDOW:
+handled = TRUE;
 XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientRaise (c, None);
 break;
 case KEY_LOWER_WINDOW:
+handled = TRUE;
 XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientLower (c, None);
 break;
 case KEY_TOGGLE_ABOVE:
+handled = TRUE;
 XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientToggleLayerAbove (c);
 break;
 case KEY_TOGGLE_FULLSCREEN:
+handled = TRUE;
 

[Xfce4-commits] r29735 - xfwm4/trunk

[Olivier Fourdan]

Author: olivier
Date: 2009-04-09 12:11:33 + (Thu, 09 Apr 2009)
New Revision: 29735

Modified:
   xfwm4/trunk/NEWS
Log:
Typo

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-04-09 11:30:27 UTC (rev 29734)
+++ xfwm4/trunk/NEWS2009-04-09 12:11:33 UTC (rev 29735)
@@ -15,7 +15,7 @@
   (Bug #5030)
 - Check fullscreen status against each monitor and not just the overall screen
   size in the compositor. 
-- Fix remaining active grab if shortcut if shortcut is not used (Bug #5207) 
+- Fix remaining active grab if shortcut is not used (Bug #5207) 
 - Plug various memory leaks
 
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29726 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-04-08 10:55:35 + (Wed, 08 Apr 2009)
New Revision: 29726

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/events.c
   xfwm4/trunk/src/parserc.c
   xfwm4/trunk/src/settings.c
Log:
* src/parserc.c, src/settings.c, src/events.c: Plug various memory
  leaks

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-04-07 22:53:42 UTC (rev 29725)
+++ xfwm4/trunk/ChangeLog   2009-04-08 10:55:35 UTC (rev 29726)
@@ -1,3 +1,8 @@
+2009-04-08 olivier
+
+   * src/parserc.c, src/settings.c, src/events.c: Plug various memory
+ leaks
+
 2009-04-07 olivier
 
* src/compositor.c: Make fullscreen override opaque, so screensaver

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-04-07 22:53:42 UTC (rev 29725)
+++ xfwm4/trunk/NEWS2009-04-08 10:55:35 UTC (rev 29726)
@@ -15,7 +15,9 @@
   (Bug #5030)
 - Check fullscreen status against each monitor and not just the overall screen
   size in the compositor. 
+- Plug various memory leaks
 
+
 4.6.0
 =
 

Modified: xfwm4/trunk/src/events.c
===
--- xfwm4/trunk/src/events.c2009-04-07 22:53:42 UTC (rev 29725)
+++ xfwm4/trunk/src/events.c2009-04-08 10:55:35 UTC (rev 29726)
@@ -1762,6 +1762,13 @@
 else if (ev-atom == XA_WM_HINTS)
 {
 TRACE (client \%s\ (0x%lx) has received a XA_WM_HINTS notify, 
c-name, c-window);
+
+/* Free previous wmhints if any */
+if (c-wmhints)
+{
+XFree (c-wmhints);
+}
+
 c-wmhints = XGetWMHints (display_info-dpy, c-window);
 if (c-wmhints)
 {

Modified: xfwm4/trunk/src/parserc.c
===
--- xfwm4/trunk/src/parserc.c   2009-04-07 22:53:42 UTC (rev 29725)
+++ xfwm4/trunk/src/parserc.c   2009-04-08 10:55:35 UTC (rev 29726)
@@ -213,7 +213,7 @@
 {
 GValue tmp_val = {0, };
 g_value_init(tmp_val, G_TYPE_STRING);
-g_value_set_string(tmp_val, value);
+g_value_set_static_string(tmp_val, value);
 return setGValue (lvalue, tmp_val, rc);
 }
 

Modified: xfwm4/trunk/src/settings.c
===
--- xfwm4/trunk/src/settings.c  2009-04-07 22:53:42 UTC (rev 29725)
+++ xfwm4/trunk/src/settings.c  2009-04-08 10:55:35 UTC (rev 29726)
@@ -305,6 +305,7 @@
 static void
 loadTheme (ScreenInfo *screen_info, Settings *rc)
 {
+
 static const char *side_names[] = {
 left,
 right,
@@ -338,6 +339,58 @@
 toggled-pressed
 };
 
+static const char *ui_part[] = {
+fg,
+fg,
+dark,
+dark,
+fg,
+fg,
+bg,
+light,
+dark,
+mid,
+bg,
+light,
+dark,
+mid,
+bg,
+light,
+dark,
+mid,
+bg,
+light,
+dark,
+mid,
+NULL
+};
+
+static const char *ui_state[] = {
+selected,
+insensitive,
+selected,
+insensitive,
+normal,
+normal,
+selected,
+selected,
+selected,
+selected,
+normal,
+normal,
+normal,
+normal,
+insensitive,
+insensitive,
+insensitive,
+insensitive,
+normal,
+normal,
+normal,
+normal,
+NULL
+};
+
 gchar imagename[30];
 GValue tmp_val = { 0, };
 DisplayInfo *display_info;
@@ -354,30 +407,17 @@
 
 desc = NULL;
 context = NULL;
+i = 0;
 
-setStringValue (rc[0].option, getUIStyle (widget, fg,selected), 
rc);
-setStringValue (rc[1].option, getUIStyle (widget, fg,insensitive), 
rc);
-setStringValue (rc[2].option, getUIStyle (widget, dark,  selected), 
rc);
-setStringValue (rc[3].option, getUIStyle (widget, dark,  insensitive), 
rc);
-setStringValue (rc[4].option, getUIStyle (widget, fg,normal), rc);
-setStringValue (rc[5].option, getUIStyle (widget, fg,normal), rc);
-setStringValue (rc[6].option, getUIStyle (widget, bg,selected), 
rc);
-setStringValue (rc[7].option, getUIStyle (widget, light, selected), 
rc);
-setStringValue (rc[8].option, getUIStyle (widget, dark,  selected), 
rc);
-setStringValue (rc[9].option, getUIStyle (widget, mid,   selected), 
rc);
-setStringValue (rc[10].option, getUIStyle (widget, bg,normal), rc);
-setStringValue (rc[11].option, getUIStyle (widget, light, normal), rc);
-setStringValue (rc[12].option, getUIStyle (widget, dark,  normal), rc);
-setStringValue (rc[13].option, getUIStyle (widget, mid,   normal), rc);
-setStringValue (rc[14].option, getUIStyle (widget, bg,

[Xfce4-commits] r29732 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-04-08 12:13:43 + (Wed, 08 Apr 2009)
New Revision: 29732

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/compositor.c
Log:
* src/compositor.c: Ignore stacking when detecting overlays

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-04-08 12:13:35 UTC (rev 29731)
+++ xfwm4/trunk/ChangeLog   2009-04-08 12:13:43 UTC (rev 29732)
@@ -1,5 +1,9 @@
 2009-04-08 olivier
 
+   * src/compositor.c: Ignore stacking when detecting overlays
+
+2009-04-08 olivier
+
* src/parserc.c, src/settings.c, src/events.c: Plug various memory
  leaks
 

Modified: xfwm4/trunk/src/compositor.c
===
--- xfwm4/trunk/src/compositor.c2009-04-08 12:13:35 UTC (rev 29731)
+++ xfwm4/trunk/src/compositor.c2009-04-08 12:13:43 UTC (rev 29732)
@@ -1799,21 +1799,12 @@
 WIN_IS_NATIVE_OPAQUE(cw)  WIN_IS_REDIRECTED(cw)  !WIN_IS_SHAPED(cw)
  ((screen_info-wins_unredirected  0) || is_fullscreen(cw)))
 {
-CWindow *top;
-GList *index;
-
-index = screen_info-cwindows;
-top = (CWindow *) index-data;
-
-if (cw == top)
+/* Make those opaque, we don't want them to be transparent */
+cw-opacity = NET_WM_OPAQUE;
+if (screen_info-params-unredirect_overlays)
 {
-/* Make those opaque, we don't want them to be transparent */
-cw-opacity = NET_WM_OPAQUE;
-if (screen_info-params-unredirect_overlays)
-{
-TRACE (Unredirecting toplevel window 0x%lx, cw-id);
-unredirect_win (cw);
-}
+TRACE (Unredirecting toplevel window 0x%lx, cw-id);
+unredirect_win (cw);
 }
 }
 }

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29705 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-04-07 12:33:09 + (Tue, 07 Apr 2009)
New Revision: 29705

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/compositor.c
Log:
* src/compositor.c: Make fullscreen override opaque, so screensaver
  is not partly transparent even if not unredirecting fullscreen
  windows.

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-04-05 17:00:43 UTC (rev 29704)
+++ xfwm4/trunk/ChangeLog   2009-04-07 12:33:09 UTC (rev 29705)
@@ -1,3 +1,9 @@
+2009-04-07 olivier
+
+   * src/compositor.c: Make fullscreen override opaque, so screensaver
+ is not partly transparent even if not unredirecting fullscreen
+ windows.
+
 2009-04-05 olivier
 
* src/compositor.c: Check fullscreen status against each monitor and not

Modified: xfwm4/trunk/src/compositor.c
===
--- xfwm4/trunk/src/compositor.c2009-04-05 17:00:43 UTC (rev 29704)
+++ xfwm4/trunk/src/compositor.c2009-04-07 12:33:09 UTC (rev 29705)
@@ -73,6 +73,10 @@
 #define WIN_IS_ARGB(cw) (cw-argb)
 #define WIN_IS_OPAQUE(cw)   ((cw-opacity == NET_WM_OPAQUE)  
!WIN_IS_ARGB(cw))
 #define WIN_IS_NATIVE_OPAQUE(cw)((cw-native_opacity)  
!WIN_IS_ARGB(cw))
+#define WIN_IS_FULLSCREEN(cw)   ((cw-attr.x = 0)  \
+   (cw-attr.y = 0)  \
+   (cw-attr.width + 2 * 
cw-attr.border_width = cw-screen_info-width)  \
+   (cw-attr.height + 2 * 
cw-attr.border_width = cw-screen_info-height))
 #define WIN_IS_SHAPED(cw)   ((WIN_HAS_CLIENT(cw)  FLAG_TEST 
(cw-c-flags, CLIENT_FLAG_HAS_SHAPE)) || \
(WIN_IS_OVERRIDE(cw)  
(cw-shaped)))
 #define WIN_IS_VIEWABLE(cw) (cw-viewable)
@@ -190,10 +194,7 @@
 GdkRectangle rect;
 
 /* First, check the good old way, the window is larger than the screen 
size */
-if ((cw-attr.x = 0) 
-(cw-attr.y = 0) 
-(cw-attr.width + 2 * cw-attr.border_width = cw-screen_info-width) 

-(cw-attr.height + 2 * cw-attr.border_width = 
cw-screen_info-height))
+if (WIN_IS_FULLSCREEN(cw))
 {
 return TRUE;
 }
@@ -951,7 +952,7 @@
 if ((screen_info-params-show_popup_shadow 
   WIN_IS_OVERRIDE(cw) 
   !(WIN_IS_ARGB(cw) || WIN_IS_SHAPED(cw)) 
-  !is_fullscreen(cw)) ||
+  !WIN_IS_FULLSCREEN(cw)) ||
   (screen_info-params-show_frame_shadow 
   !WIN_IS_OVERRIDE(cw) 
   !WIN_NO_SHADOW(cw) 
@@ -1793,15 +1794,10 @@
 cw-viewable = TRUE;
 cw-damaged = FALSE;
 
-if (!screen_info-params-unredirect_overlays)
-{
-TRACE (Not unredirecting wins_unredirected);
-return;
-}
-
 /* Check for new windows to un-redirect. */
-if (((screen_info-wins_unredirected  0) || is_fullscreen(cw))  
WIN_HAS_DAMAGE(cw)  WIN_IS_OVERRIDE(cw) 
-WIN_IS_NATIVE_OPAQUE(cw)  WIN_IS_REDIRECTED(cw)  
!WIN_IS_SHAPED(cw))
+if (WIN_HAS_DAMAGE(cw)  WIN_IS_OVERRIDE(cw) 
+WIN_IS_NATIVE_OPAQUE(cw)  WIN_IS_REDIRECTED(cw)  !WIN_IS_SHAPED(cw)
+ ((screen_info-wins_unredirected  0) || is_fullscreen(cw)))
 {
 CWindow *top;
 GList *index;
@@ -1811,8 +1807,13 @@
 
 if (cw == top)
 {
-TRACE (Unredirecting toplevel window 0x%lx, cw-id);
-unredirect_win (cw);
+/* Make those opaque, we don't want them to be transparent */
+cw-opacity = NET_WM_OPAQUE;
+if (screen_info-params-unredirect_overlays)
+{
+TRACE (Unredirecting toplevel window 0x%lx, cw-id);
+unredirect_win (cw);
+}
 }
 }
 }

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29685 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-03-27 15:55:13 + (Fri, 27 Mar 2009)
New Revision: 29685

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/placement.c
Log:
* src/placement.c: Do not not fill over adjacent windows (Bug #5152)

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-03-25 20:34:37 UTC (rev 29684)
+++ xfwm4/trunk/ChangeLog   2009-03-27 15:55:13 UTC (rev 29685)
@@ -1,3 +1,7 @@
+2009-03-26 olivier
+
+   * src/placement.c: Do not not fill over adjacent windows (Bug #5152)
+
 2009-03-25 olivier
 
* src/client.c, src/cycle.c: Fix a long standing bug in xfwm4 4.6 

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-03-25 20:34:37 UTC (rev 29684)
+++ xfwm4/trunk/NEWS2009-03-27 15:55:13 UTC (rev 29685)
@@ -10,6 +10,7 @@
 - Avoid unecessary warnings about timestamps at startup
 - Fix a long standing bug in xfwm4 4.6 were activating a transient would not
   regrab the mouse on parent window.
+- Do not go over adjacent windows with fill (Bug #5152)
 
 4.6.0
 =

Modified: xfwm4/trunk/src/placement.c
===
--- xfwm4/trunk/src/placement.c 2009-03-25 20:34:37 UTC (rev 29684)
+++ xfwm4/trunk/src/placement.c 2009-03-27 15:55:13 UTC (rev 29685)
@@ -792,7 +792,7 @@
  */
 if (segment_overlap (frameY(c), frameY(c) + frameHeight(c), 
frameY(c2), frameY(c2) + frameHeight(c2)))
 {
-if ((frameX(c2) + frameWidth(c2))  frameX(c))
+if ((frameX(c2) + frameWidth(c2)) = frameX(c))
 {
 if (west_neighbour)
 {
@@ -809,7 +809,7 @@
 west_neighbour = c2;
 }
 }
-if ((frameX(c) + frameWidth(c))  frameX(c2))
+if ((frameX(c) + frameWidth(c)) = frameX(c2))
 {
 /* Check if c2 is closer to the client
  * then the west neighbour already found
@@ -837,7 +837,7 @@
  */
 if (segment_overlap (frameX(c), frameX(c) + frameWidth(c), 
frameX(c2), frameX(c2) + frameWidth(c2)))
 {
-if ((frameY(c2) + frameHeight(c2))  frameY(c))
+if ((frameY(c2) + frameHeight(c2)) = frameY(c))
 {
 if (north_neighbour)
 {
@@ -854,7 +854,7 @@
 north_neighbour = c2;
 }
 }
-if ((frameY(c) + frameHeight(c))  frameY(c2))
+if ((frameY(c) + frameHeight(c)) = frameY(c2))
 {
 if (south_neighbour)
 {

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29683 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-03-25 10:34:05 + (Wed, 25 Mar 2009)
New Revision: 29683

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/client.c
   xfwm4/trunk/src/cycle.c
Log:
* src/client.c, src/cycle.c: Fix a long standing bug in xfwm4 4.6 
  were activating a transient would not regrab the mouse on parent
  window.

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-03-23 10:13:59 UTC (rev 29682)
+++ xfwm4/trunk/ChangeLog   2009-03-25 10:34:05 UTC (rev 29683)
@@ -1,3 +1,9 @@
+2009-03-25 olivier
+
+   * src/client.c, src/cycle.c: Fix a long standing bug in xfwm4 4.6 
+ were activating a transient would not regrab the mouse on parent
+ window.
+
 2009-03-19 olivier
 
* src/netwm.c: Do not try to update last user timestamp if the given

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-03-23 10:13:59 UTC (rev 29682)
+++ xfwm4/trunk/NEWS2009-03-25 10:34:05 UTC (rev 29683)
@@ -8,6 +8,8 @@
   too much)
 - Fix raise delay settings in xfwm4 dialog being totally ignored
 - Avoid unecessary warnings about timestamps at startup
+- Fix a long standing bug in xfwm4 4.6 were activating a transient would not
+  regrab the mouse on parent window.
 
 4.6.0
 =

Modified: xfwm4/trunk/src/client.c
===
--- xfwm4/trunk/src/client.c2009-03-23 10:13:59 UTC (rev 29682)
+++ xfwm4/trunk/src/client.c2009-03-25 10:34:05 UTC (rev 29683)
@@ -2572,6 +2572,7 @@
 clientShow (sibling, TRUE);
 clientClearAllShowDesktop (screen_info);
 clientSetFocus (screen_info, c, timestamp, NO_FOCUS_FLAG);
+clientSetLastRaise (c);
 }
 else
 {

Modified: xfwm4/trunk/src/cycle.c
===
--- xfwm4/trunk/src/cycle.c 2009-03-23 10:13:59 UTC (rev 29682)
+++ xfwm4/trunk/src/cycle.c 2009-03-25 10:34:05 UTC (rev 29683)
@@ -302,6 +302,7 @@
 clientRaise (sibling, None);
 clientShow (sibling, TRUE);
 clientSetFocus (screen_info, c, myDisplayGetCurrentTime 
(display_info), NO_FOCUS_FLAG);
+clientSetLastRaise (c);
 }
 
 /*

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29673 - in xfwm4/trunk: . settings-dialogs src

[Olivier Fourdan]

Author: olivier
Date: 2009-03-19 09:16:34 + (Thu, 19 Mar 2009)
New Revision: 29673

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade
   xfwm4/trunk/settings-dialogs/xfwm4-settings.c
   xfwm4/trunk/src/settings.c
Log:
* settings-dialogs/xfwm4-settings.c, 
  settings-dialogs/xfwm4-dialog.glade,
  src/settings.c: Reduce minimum timeout for focus delay in focus 
  follow mouse (100ms was way too much),

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-03-17 21:01:51 UTC (rev 29672)
+++ xfwm4/trunk/ChangeLog   2009-03-19 09:16:34 UTC (rev 29673)
@@ -1,3 +1,11 @@
+2009-03-19 olivier
+
+   * settings-dialogs/xfwm4-settings.c, 
+ settings-dialogs/xfwm4-dialog.glade,
+ src/settings.c: Reduce minimum timeout for focus delay in focus 
+ follow mouse (100ms was way too much),
+  Fix raise delay settings in xfwm4 dialog being totally ignored
+
 2009-03-13 olivier
 
* src/focus.c: do not set the demand attendtion flag if the 

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-03-17 21:01:51 UTC (rev 29672)
+++ xfwm4/trunk/NEWS2009-03-19 09:16:34 UTC (rev 29673)
@@ -4,6 +4,9 @@
 - Reduce repaint timeout in the compositor (Bug #5080)
 - Fix applications getting focused when focus on map is unset even 
   without focus stealing prevention enabled (Bug #5044)
+- Reduce minimum timeout for focus delay in focus follow mouse (100ms was way
+  too much)
+- Fix raise delay settings in xfwm4 dialog being totally ignored
 
 4.6.0
 =

Modified: xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade
===
--- xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade 2009-03-17 21:01:51 UTC 
(rev 29672)
+++ xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade 2009-03-19 09:16:34 UTC 
(rev 29673)
@@ -592,7 +592,7 @@
 property 
name=visibleTrue/property
 property 
name=can_focusTrue/property
 property 
name=update_policyGTK_UPDATE_DISCONTINUOUS/property
-property name=adjustment100 100 
2000 1 10 0/property
+property name=adjustment5 5 2000 1 
10 0/property
 property 
name=draw_valueFalse/property
   /widget
   packing
@@ -744,7 +744,7 @@
 property 
name=visibleTrue/property
 property 
name=can_focusTrue/property
 property 
name=update_policyGTK_UPDATE_DISCONTINUOUS/property
-property name=adjustment100 
100 2000 1 10 0/property
+property name=adjustment5 5 
2000 1 10 0/property
 property 
name=draw_valueFalse/property
   /widget
   packing

Modified: xfwm4/trunk/settings-dialogs/xfwm4-settings.c
===
--- xfwm4/trunk/settings-dialogs/xfwm4-settings.c   2009-03-17 21:01:51 UTC 
(rev 29672)
+++ xfwm4/trunk/settings-dialogs/xfwm4-settings.c   2009-03-19 09:16:34 UTC 
(rev 29673)
@@ -405,6 +405,7 @@
   GtkWidget  *shortcuts_clear_button;
   GtkWidget  *shortcuts_reset_button;
   GtkWidget  *focus_delay_scale;
+  GtkWidget  *focus_raise_delay_scale;
   GtkWidget  *raise_on_click_check;
   GtkWidget  *raise_on_focus_check;
   GtkWidget  *click_to_focus_radio;
@@ -614,6 +615,7 @@
 
   /* Focus tab widgets */
   focus_delay_scale = glade_xml_get_widget (settings-priv-glade_xml, 
focus_delay_scale);
+  focus_raise_delay_scale = glade_xml_get_widget (settings-priv-glade_xml, 
focus_raise_delay_scale);
   focus_new_check = glade_xml_get_widget (settings-priv-glade_xml, 
focus_new_check);
   raise_on_focus_check = glade_xml_get_widget (settings-priv-glade_xml, 
raise_on_focus_check);
   raise_on_click_check = glade_xml_get_widget (settings-priv-glade_xml, 
raise_on_click_check);
@@ -622,6 +624,8 @@
   /* Focus tab */
   xfconf_g_property_bind (settings-priv-wm_channel, /general/focus_delay, 
G_TYPE_INT,
   gtk_range_get_adjustment (GTK_RANGE 
(focus_delay_scale)), value);
+  xfconf_g_property_bind (settings-priv-wm_channel, /general/raise_delay, 
G_TYPE_INT,
+  gtk_range_get_adjustment (GTK_RANGE 
(focus_raise_delay_scale)), value);
   xfconf_g_property_bind 

[Xfce4-commits] r29674 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-03-19 12:46:50 + (Thu, 19 Mar 2009)
New Revision: 29674

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/netwm.c
Log:
* src/netwm.c: Do not try to update last user timestamp if the given
  timestamp is outdated, that avoids some unecessary warnings for
  Last user time set back to... upon restart.
  Fix raise delay settings in xfwm4 dialog being totally ignored

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-03-19 09:16:34 UTC (rev 29673)
+++ xfwm4/trunk/ChangeLog   2009-03-19 12:46:50 UTC (rev 29674)
@@ -1,10 +1,16 @@
 2009-03-19 olivier
 
+   * src/netwm.c: Do not try to update last user timestamp if the given
+ timestamp is outdated, that avoids some unecessary warnings for
+ Last user time set back to... upon restart.
+
+2009-03-19 olivier
+
* settings-dialogs/xfwm4-settings.c, 
  settings-dialogs/xfwm4-dialog.glade,
  src/settings.c: Reduce minimum timeout for focus delay in focus 
  follow mouse (100ms was way too much),
-  Fix raise delay settings in xfwm4 dialog being totally ignored
+ Fix raise delay settings in xfwm4 dialog being totally ignored
 
 2009-03-13 olivier
 

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-03-19 09:16:34 UTC (rev 29673)
+++ xfwm4/trunk/NEWS2009-03-19 12:46:50 UTC (rev 29674)
@@ -7,6 +7,7 @@
 - Reduce minimum timeout for focus delay in focus follow mouse (100ms was way
   too much)
 - Fix raise delay settings in xfwm4 dialog being totally ignored
+- Avoid unecessary warnings about timestamps at startup
 
 4.6.0
 =

Modified: xfwm4/trunk/src/netwm.c
===
--- xfwm4/trunk/src/netwm.c 2009-03-19 09:16:34 UTC (rev 29673)
+++ xfwm4/trunk/src/netwm.c 2009-03-19 12:46:50 UTC (rev 29674)
@@ -1467,7 +1467,10 @@
 
 if (getNetWMUserTime (display_info, c-user_time_win, c-user_time))
 {
-if (c-user_time != 0)
+guint32 last_user_time;
+
+last_user_time = myDisplayGetLastUserTime (display_info);
+if (c-user_time  TIMESTAMP_IS_BEFORE(last_user_time, c-user_time))
 {
 myDisplaySetLastUserTime (display_info, c-user_time);
 }

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29656 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-03-13 10:07:48 + (Fri, 13 Mar 2009)
New Revision: 29656

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/compositor.c
Log:
* src/compositor.c: Reduce repaint timeout in the compositor 
  (Bug #5080)

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-03-13 05:27:33 UTC (rev 29655)
+++ xfwm4/trunk/ChangeLog   2009-03-13 10:07:48 UTC (rev 29656)
@@ -1,3 +1,8 @@
+2009-03-13 olivier
+
+   * src/compositor.c: Reduce repaint timeout in the compositor 
+ (Bug #5080)
+
 2009-02-24 olivier
 
* settings-dialogs/xfwm4-settings.c, 

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-03-13 05:27:33 UTC (rev 29655)
+++ xfwm4/trunk/NEWS2009-03-13 10:07:48 UTC (rev 29656)
@@ -1,3 +1,8 @@
+4.6.1
+=
+
+- Reduce repaint timeout in the compositor (Bug #5080)
+
 4.6.0
 =
 

Modified: xfwm4/trunk/src/compositor.c
===
--- xfwm4/trunk/src/compositor.c2009-03-13 05:27:33 UTC (rev 29655)
+++ xfwm4/trunk/src/compositor.c2009-03-13 10:07:48 UTC (rev 29656)
@@ -86,7 +86,7 @@
 #define WIN_IS_REDIRECTED(cw)   (cw-redirected)
 
 /* Set TIMEOUT_REPAINT to 0 to disable timeout repaint */
-#define TIMEOUT_REPAINT   20 /* (1/50 sec.) */
+#define TIMEOUT_REPAINT   10 /* msec.) */
 
 typedef struct _CWindow CWindow;
 struct _CWindow
@@ -1464,7 +1464,7 @@
 
 for (screens = display_info-screens; screens; screens = g_slist_next 
(screens))
 {
-add_repair ((ScreenInfo *) screens-data);
+repair_screen ((ScreenInfo *) screens-data);
 }
 }
 #endif

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29657 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-03-13 10:28:32 + (Fri, 13 Mar 2009)
New Revision: 29657

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/focus.c
   xfwm4/trunk/src/netwm.c
Log:
* src/focus.c, serc/netwm.c: Check for nil timestamp regardless of 
  focus stealing prevention setting, so that applications using
  gtk_window_set_focus_on_map() don't get focused even when focus
  stealing prevention is disabled (Bug #5044)

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-03-13 10:07:48 UTC (rev 29656)
+++ xfwm4/trunk/ChangeLog   2009-03-13 10:28:32 UTC (rev 29657)
@@ -1,5 +1,12 @@
 2009-03-13 olivier
 
+   * src/focus.c, serc/netwm.c: Check for nil timestamp regardless of 
+ focus stealing prevention setting, so that applications using
+ gtk_window_set_focus_on_map() don't get focused even when focus
+ stealing prevention is disabled (Bug #5044)
+
+2009-03-13 olivier
+
* src/compositor.c: Reduce repaint timeout in the compositor 
  (Bug #5080)
 

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-03-13 10:07:48 UTC (rev 29656)
+++ xfwm4/trunk/NEWS2009-03-13 10:28:32 UTC (rev 29657)
@@ -2,6 +2,8 @@
 =
 
 - Reduce repaint timeout in the compositor (Bug #5080)
+- Fix applications getting focused when focus on map is unset even 
+  without focus stealing prevention enabled (Bug #5044)
 
 4.6.0
 =

Modified: xfwm4/trunk/src/focus.c
===
--- xfwm4/trunk/src/focus.c 2009-03-13 10:07:48 UTC (rev 29656)
+++ xfwm4/trunk/src/focus.c 2009-03-13 10:28:32 UTC (rev 29657)
@@ -162,6 +162,12 @@
 {
 give_focus = FALSE;
 }
+else if (FLAG_TEST (c-flags, CLIENT_FLAG_HAS_STARTUP_TIME | 
CLIENT_FLAG_HAS_USER_TIME)  (c-user_time == (guint32) 0))
+{
+TRACE (Given startup time is nil, not focusing \%s\, c-name);
+give_focus = FALSE;
+prevented = TRUE;
+}
 else if ((client_focus)  (prevent_focus_stealing))
 {
 if (client_focus-win_layer  c-win_layer)
@@ -177,12 +183,6 @@
 give_focus = TRUE;
 prevented = FALSE;
 }
-else if (FLAG_TEST (c-flags, CLIENT_FLAG_HAS_STARTUP_TIME)  
(c-user_time == CurrentTime))
-{
-TRACE (Given startup time is nil, not focusing \%s\, c-name);
-give_focus = FALSE;
-prevented = TRUE;
-}
 else if (FLAG_TEST (c-flags, CLIENT_FLAG_HAS_STARTUP_TIME | 
CLIENT_FLAG_HAS_USER_TIME))
 {
 TRACE (Current time is %u, time for \%s\ is %u,

Modified: xfwm4/trunk/src/netwm.c
===
--- xfwm4/trunk/src/netwm.c 2009-03-13 10:07:48 UTC (rev 29656)
+++ xfwm4/trunk/src/netwm.c 2009-03-13 10:28:32 UTC (rev 29657)
@@ -1465,9 +1465,12 @@
  * NET_WM_USER_TIME_WINDOW
  */
 
-if (getNetWMUserTime (display_info, c-user_time_win, c-user_time)  
(c-user_time != 0))
+if (getNetWMUserTime (display_info, c-user_time_win, c-user_time))
 {
-myDisplaySetLastUserTime (display_info, c-user_time);
+if (c-user_time != 0)
+{
+myDisplaySetLastUserTime (display_info, c-user_time);
+}
 FLAG_SET (c-flags, CLIENT_FLAG_HAS_USER_TIME);
 
 return TRUE;

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29658 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-03-13 10:36:42 + (Fri, 13 Mar 2009)
New Revision: 29658

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/focus.c
Log:
* src/focus.c: do not set the demand attendtion flag if the 
  application itself has set a nil timestamp.

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-03-13 10:28:32 UTC (rev 29657)
+++ xfwm4/trunk/ChangeLog   2009-03-13 10:36:42 UTC (rev 29658)
@@ -1,5 +1,10 @@
 2009-03-13 olivier
 
+   * src/focus.c: do not set the demand attendtion flag if the 
+ application itself has set a nil timestamp.
+
+2009-03-13 olivier
+
* src/focus.c, serc/netwm.c: Check for nil timestamp regardless of 
  focus stealing prevention setting, so that applications using
  gtk_window_set_focus_on_map() don't get focused even when focus

Modified: xfwm4/trunk/src/focus.c
===
--- xfwm4/trunk/src/focus.c 2009-03-13 10:28:32 UTC (rev 29657)
+++ xfwm4/trunk/src/focus.c 2009-03-13 10:36:42 UTC (rev 29658)
@@ -166,7 +166,7 @@
 {
 TRACE (Given startup time is nil, not focusing \%s\, c-name);
 give_focus = FALSE;
-prevented = TRUE;
+prevented = FALSE;
 }
 else if ((client_focus)  (prevent_focus_stealing))
 {

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29637 - in xfce4-settings/trunk: dialogs/appearance-settings dialogs/keyboard-settings xfce4-settings-helper

[Olivier Fourdan]

Author: olivier
Date: 2009-02-28 12:14:57 + (Sat, 28 Feb 2009)
New Revision: 29637

Modified:
   xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
   xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade
   xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
   xfce4-settings/trunk/xfce4-settings-helper/keyboard-layout.c
Log:
Do not set keyboard layout by default

Modified: 
xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
===
--- xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
2009-02-28 07:10:29 UTC (rev 29636)
+++ xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
2009-02-28 12:14:57 UTC (rev 29637)
@@ -205,6 +205,7 @@
 property name=tooltip 
translatable=yesAnti-aliasing, or font smoothing, can improve the look of 
text on the screen/property
 property name=label 
translatable=yesEnable _anti-aliasing/property
 property name=use_underlineTrue/property
+property name=activeTrue/property
 property name=response_id0/property
 property name=draw_indicatorTrue/property
   /widget

Modified: xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade
===
--- xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade
2009-02-28 07:10:29 UTC (rev 29636)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade
2009-02-28 12:14:57 UTC (rev 29637)
@@ -412,6 +412,7 @@
 property name=tooltip translatable=yesSpecifies 
whether the keyboard layout is controlled with this settings dialog, or by the 
X server/property
 property name=label translatable=yes_Use system 
defaults/property
 property name=use_underlineTrue/property
+property name=activeTrue/property
 property name=response_id0/property
 property name=draw_indicatorTrue/property
   /widget

Modified: 
xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
===
--- xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c 
2009-02-28 07:10:29 UTC (rev 29636)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c 
2009-02-28 12:14:57 UTC (rev 29637)
@@ -139,7 +139,7 @@
 #ifdef HAVE_LIBXKLAVIER
 
 static gchar *   xfce_keyboard_settings_model_description 
(XklConfigItem *config_item);
-static gboolean  xfce_keyboard_settings_update_sensitive  
(GtkToggleButton   *toggle, 
+static gboolean  xfce_keyboard_settings_update_sensitive  
(GtkToggleButton   *toggle,

XfceKeyboardSettings  *settings);
 static void  xfce_keyboard_settings_system_default_cb 
(GtkToggleButton   *toggle,

XfceKeyboardSettings  *settings);

Modified: xfce4-settings/trunk/xfce4-settings-helper/keyboard-layout.c
===
--- xfce4-settings/trunk/xfce4-settings-helper/keyboard-layout.c
2009-02-28 07:10:29 UTC (rev 29636)
+++ xfce4-settings/trunk/xfce4-settings-helper/keyboard-layout.c
2009-02-28 12:14:57 UTC (rev 29637)
@@ -106,7 +106,7 @@
 #endif /* HAVE_LIBXKLAVIER */
 
 /* load settings */
-helper-xkb_disable_settings = xfconf_channel_get_bool (helper-channel, 
/Default/XkbDisable, FALSE);
+helper-xkb_disable_settings = xfconf_channel_get_bool (helper-channel, 
/Default/XkbDisable, TRUE);
 xfce_keyboard_layout_helper_set_model (helper);
 xfce_keyboard_layout_helper_set_layout (helper);
 xfce_keyboard_layout_helper_set_variant (helper);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29572 - in xfwm4/trunk: . settings-dialogs

[Olivier Fourdan]

Author: olivier
Date: 2009-02-24 18:53:37 + (Tue, 24 Feb 2009)
New Revision: 29572

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/settings-dialogs/tweaks-settings.c
   xfwm4/trunk/settings-dialogs/xfwm4-settings.c
Log:
* settings-dialogs/xfwm4-settings.c, 
  settings-dialogs/tweaks-settings.c: Do not run setting dialogs if
  current window manager is not xfwm4 (Bug #4989).

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-02-24 16:20:14 UTC (rev 29571)
+++ xfwm4/trunk/ChangeLog   2009-02-24 18:53:37 UTC (rev 29572)
@@ -1,3 +1,9 @@
+2009-02-24 olivier
+
+   * settings-dialogs/xfwm4-settings.c, 
+ settings-dialogs/tweaks-settings.c: Do not run setting dialogs if
+ current window manager is not xfwm4 (Bug #4989).
+
 2009-02-23 olivier
 
* src/cycle.c, src/moveresize.c: Make sure any active grab on the

Modified: xfwm4/trunk/settings-dialogs/tweaks-settings.c
===
--- xfwm4/trunk/settings-dialogs/tweaks-settings.c  2009-02-24 16:20:14 UTC 
(rev 29571)
+++ xfwm4/trunk/settings-dialogs/tweaks-settings.c  2009-02-24 18:53:37 UTC 
(rev 29572)
@@ -18,8 +18,13 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include config.h
+#endif
+
+#ifdef HAVE_STRING_H
 #include string.h
+#endif
 
 #include glib.h
 
@@ -425,6 +430,7 @@
 GtkWidget *plug_child;
 GladeXML *gxml;
 GError *cli_error = NULL;
+const gchar  *wm_name;
 
 #ifdef ENABLE_NLS
 xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, UTF-8);
@@ -440,6 +446,13 @@
 }
 }
 
+wm_name = gdk_x11_screen_get_window_manager_name (gdk_screen_get_default 
());
+if (G_UNLIKELY (g_ascii_strcasecmp (wm_name, Xfwm4)))
+{
+g_print (These settings cannot work with your current window manager 
(%s)\n, wm_name);
+return 1;
+}
+
 if (opt_version)
 {
 g_print (%s\n, PACKAGE_STRING);

Modified: xfwm4/trunk/settings-dialogs/xfwm4-settings.c
===
--- xfwm4/trunk/settings-dialogs/xfwm4-settings.c   2009-02-24 16:20:14 UTC 
(rev 29571)
+++ xfwm4/trunk/settings-dialogs/xfwm4-settings.c   2009-02-24 18:53:37 UTC 
(rev 29572)
@@ -926,8 +926,11 @@
   GtkWidget*dialog;
   GtkWidget*plug;
   GError   *error = NULL;
+  const gchar  *wm_name;
 
+#ifdef ENABLE_NLS
   xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, UTF-8);
+#endif
 
   if (G_UNLIKELY (!gtk_init_with_args (argc, argv, _(.), opt_entries, 
PACKAGE, error)))
 {
@@ -941,6 +944,13 @@
   return EXIT_FAILURE;
 }
 
+  wm_name = gdk_x11_screen_get_window_manager_name (gdk_screen_get_default ());
+  if (G_UNLIKELY (g_ascii_strcasecmp (wm_name, Xfwm4)))
+{
+  g_print (These settings cannot work with your current window manager 
(%s)\n, wm_name);
+  return EXIT_FAILURE;
+}
+
   if (G_UNLIKELY (opt_version))
 {
   g_print (%s\n, PACKAGE_STRING);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29573 - in xfwm4/trunk: . settings-dialogs

[Olivier Fourdan]

Author: olivier
Date: 2009-02-24 19:06:19 + (Tue, 24 Feb 2009)
New Revision: 29573

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/settings-dialogs/tweaks-settings.c
   xfwm4/trunk/settings-dialogs/xfwm4-settings.c
Log:
  settings-dialogs/tweaks-settings.c: Include gdk.h  gdkx.h
* settings-dialogs/xfwm4-settings.c, 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-02-24 18:53:37 UTC (rev 29572)
+++ xfwm4/trunk/ChangeLog   2009-02-24 19:06:19 UTC (rev 29573)
@@ -1,6 +1,11 @@
 2009-02-24 olivier
 
* settings-dialogs/xfwm4-settings.c, 
+ settings-dialogs/tweaks-settings.c: Include gdk.h  gdkx.h
+
+2009-02-24 olivier
+
+   * settings-dialogs/xfwm4-settings.c, 
  settings-dialogs/tweaks-settings.c: Do not run setting dialogs if
  current window manager is not xfwm4 (Bug #4989).
 

Modified: xfwm4/trunk/settings-dialogs/tweaks-settings.c
===
--- xfwm4/trunk/settings-dialogs/tweaks-settings.c  2009-02-24 18:53:37 UTC 
(rev 29572)
+++ xfwm4/trunk/settings-dialogs/tweaks-settings.c  2009-02-24 19:06:19 UTC 
(rev 29573)
@@ -34,6 +34,8 @@
 #include glib/gi18n.h
 #endif
 
+#include gdk/gdk.h
+#include gdk/gdkx.h
 #include gtk/gtk.h
 #include glade/glade.h
 

Modified: xfwm4/trunk/settings-dialogs/xfwm4-settings.c
===
--- xfwm4/trunk/settings-dialogs/xfwm4-settings.c   2009-02-24 18:53:37 UTC 
(rev 29572)
+++ xfwm4/trunk/settings-dialogs/xfwm4-settings.c   2009-02-24 19:06:19 UTC 
(rev 29573)
@@ -34,8 +34,9 @@
 #include glib.h
 #include glib-object.h
 
+#include gdk/gdk.h
+#include gdk/gdkx.h
 #include gtk/gtk.h
-
 #include glade/glade.h
 
 #include libxfce4util/libxfce4util.h

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29542 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-02-23 10:06:52 + (Mon, 23 Feb 2009)
New Revision: 29542

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/client.c
   xfwm4/trunk/src/client.h
   xfwm4/trunk/src/events.c
   xfwm4/trunk/src/focus.c
   xfwm4/trunk/src/netwm.c
   xfwm4/trunk/src/netwm.h
Log:
* src/netwm.h, src/netwm.c, src/client.h, src/client.c, src/events.c,
  src/focus.c: Capture user time at startup, a bit of refactoring to
  avoid duplication of code (that led to this bug to remain after a
  similar fix went previously in to events.c in revision 29456).

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-02-23 09:08:34 UTC (rev 29541)
+++ xfwm4/trunk/ChangeLog   2009-02-23 10:06:52 UTC (rev 29542)
@@ -1,3 +1,10 @@
+2009-02-23 olivier
+
+   * src/netwm.h, src/netwm.c, src/client.h, src/client.c, src/events.c,
+ src/focus.c: Capture user time at startup, a bit of refactoring to
+ avoid duplication of code (that led to this bug to remain after a
+ similar fix went previously in to events.c in revision 29456).
+
 2009-02-19 olivier
 
* src/events.c: Only release events on identified key shortcut

Modified: xfwm4/trunk/src/client.c
===
--- xfwm4/trunk/src/client.c2009-02-23 09:08:34 UTC (rev 29541)
+++ xfwm4/trunk/src/client.c2009-02-23 10:06:52 UTC (rev 29542)
@@ -1457,61 +1457,6 @@
 }
 
 static void
-clientGetUserTime (Client * c)
-{
-ScreenInfo *screen_info;
-DisplayInfo *display_info;
-
-g_return_if_fail (c != NULL);
-g_return_if_fail (c-window != None);
-
-screen_info = c-screen_info;
-display_info = screen_info-display_info;
-
-if (getNetWMUserTime (display_info, c-window, c-user_time)  
(c-user_time != 0))
-{
-FLAG_SET (c-flags, CLIENT_FLAG_HAS_USER_TIME);
-myDisplayUpdateLastUserTime (display_info, c-user_time);
-}
-}
-
-void
-clientAddUserTimeWin (Client * c)
-{
-ScreenInfo *screen_info;
-DisplayInfo *display_info;
-
-g_return_if_fail (c != NULL);
-g_return_if_fail (c-window != None);
-
-screen_info = c-screen_info;
-display_info = screen_info-display_info;
-
-if ((c-user_time_win != None)  (c-user_time_win != c-window))
-{
-XSelectInput (display_info-dpy, c-user_time_win, PropertyChangeMask);
-}
-}
-
-void
-clientRemoveUserTimeWin (Client * c)
-{
-ScreenInfo *screen_info;
-DisplayInfo *display_info;
-
-g_return_if_fail (c != NULL);
-g_return_if_fail (c-window != None);
-
-screen_info = c-screen_info;
-display_info = screen_info-display_info;
-
-if ((c-user_time_win != None)  (c-user_time_win != c-window))
-{
-XSelectInput (display_info-dpy, c-user_time_win, NoEventMask);
-}
-}
-
-static void
 clientUpdateIconPix (Client * c)
 {
 ScreenInfo *screen_info;

Modified: xfwm4/trunk/src/client.h
===
--- xfwm4/trunk/src/client.h2009-02-23 09:08:34 UTC (rev 29541)
+++ xfwm4/trunk/src/client.h2009-02-23 10:06:52 UTC (rev 29542)
@@ -339,8 +339,6 @@
 void clientClearLastOpTime  (Client *);
 void clientUpdateWinState   (Client *,
  
XClientMessageEvent *);
-void clientAddUserTimeWin   (Client *);
-void clientRemoveUserTimeWin(Client *);
 void clientUpdateUrgency(Client *);
 void clientCoordGravitate   (Client *,
  int,

Modified: xfwm4/trunk/src/events.c
===
--- xfwm4/trunk/src/events.c2009-02-23 09:08:34 UTC (rev 29541)
+++ xfwm4/trunk/src/events.c2009-02-23 10:06:52 UTC (rev 29542)
@@ -1832,16 +1832,7 @@
 else if (ev-atom == display_info-atoms[NET_WM_USER_TIME])
 {
 TRACE (client \%s\ (0x%lx) has received a NET_WM_USER_TIME 
notify, c-name, c-window);
-/*
- * We can use c-user_time_win safely here because this will be
- * the same as c-window if the app does not support the protocol
- * NET_WM_USER_TIME_WINDOW
- */
-if (getNetWMUserTime (display_info, c-user_time_win, 
c-user_time)  (c-user_time != 0))
-{
-myDisplaySetLastUserTime (display_info, c-user_time);
-FLAG_SET (c-flags, CLIENT_FLAG_HAS_USER_TIME);
-}
+clientGetUserTime (c);
 }
 else if (ev-atom == display_info-atoms[NET_WM_USER_TIME_WINDOW])
 {

Modified: xfwm4/trunk/src/focus.c

[Xfce4-commits] r29544 - in xfdesktop/trunk: settings src

[Olivier Fourdan]

Author: olivier
Date: 2009-02-23 13:36:27 + (Mon, 23 Feb 2009)
New Revision: 29544

Modified:
   xfdesktop/trunk/settings/xfdesktop-settings.glade
   xfdesktop/trunk/src/xfce-backdrop.c
Log:
Update default background color before final 4.6, to match gtk theme colors 
more closely

Modified: xfdesktop/trunk/settings/xfdesktop-settings.glade
===
--- xfdesktop/trunk/settings/xfdesktop-settings.glade   2009-02-23 12:49:16 UTC 
(rev 29543)
+++ xfdesktop/trunk/settings/xfdesktop-settings.glade   2009-02-23 13:36:27 UTC 
(rev 29544)
@@ -343,7 +343,7 @@
 property 
name=tooltip translatable=yesSpecifies the solid color, or the left or 
top color of the gradient/property
 property 
name=response_id0/property
 property name=title 
translatable=yesSelect First Color/property
-property 
name=color#0f0f17172121/property
+property 
name=color#1515/property
 signal 
name=color_set handler=color1_changed/
   /widget
   packing
@@ -359,7 +359,7 @@
 property 
name=tooltip translatable=yesSpecifies the right or bottom color of 
the gradient/property
 property 
name=response_id0/property
 property name=title 
translatable=yesSelect Second Color/property
-property 
name=color#0f0f17172121/property
+property 
name=color#1515/property
 signal 
name=color_set handler=color2_changed/
   /widget
   packing

Modified: xfdesktop/trunk/src/xfce-backdrop.c
===
--- xfdesktop/trunk/src/xfce-backdrop.c 2009-02-23 12:49:16 UTC (rev 29543)
+++ xfdesktop/trunk/src/xfce-backdrop.c 2009-02-23 13:36:27 UTC (rev 29544)
@@ -316,12 +316,12 @@
 backdrop-priv-show_image = TRUE;
 
 /* color defaults */
-backdrop-priv-color1.red = 0x0f0f;
-backdrop-priv-color1.green = 0x1717;
-backdrop-priv-color1.blue = 0x2121;
-backdrop-priv-color2.red = 0x0f0f;
-backdrop-priv-color2.green = 0x1717;
-backdrop-priv-color2.blue = 0x2121;
+backdrop-priv-color1.red = 0x1515;
+backdrop-priv-color1.green = 0x;
+backdrop-priv-color1.blue = 0x;
+backdrop-priv-color2.red = 0x1515;
+backdrop-priv-color2.green = 0x;
+backdrop-priv-color2.blue = 0x;
 }
 
 static void

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29546 - xfce4-panel/trunk/config

[Olivier Fourdan]

Author: olivier
Date: 2009-02-23 14:35:19 + (Mon, 23 Feb 2009)
New Revision: 29546

Modified:
   xfce4-panel/trunk/config/clock-14.rc
   xfce4-panel/trunk/config/panels.xml
   xfce4-panel/trunk/config/systray-4.rc
Log:
Update default layout for 4.6, previous defaults have not been changed for ages 
and are not only just plain ugly but also totally subobtimal.

Modified: xfce4-panel/trunk/config/clock-14.rc
===
--- xfce4-panel/trunk/config/clock-14.rc2009-02-23 14:21:56 UTC (rev 
29545)
+++ xfce4-panel/trunk/config/clock-14.rc2009-02-23 14:35:19 UTC (rev 
29546)
@@ -1,5 +1,10 @@
-mode=2
-military=true
-ampm=false
-secs=false
-show_frame=false
+DigitalFormat=%R
+TooltipFormat=%A %d %B %Y
+ClockType=2
+ShowFrame=false
+ShowSeconds=false
+ShowMilitary=true
+ShowMeridiem=false
+TrueBinary=false
+FlashSeparators=false
+

Modified: xfce4-panel/trunk/config/panels.xml
===
--- xfce4-panel/trunk/config/panels.xml 2009-02-23 14:21:56 UTC (rev 29545)
+++ xfce4-panel/trunk/config/panels.xml 2009-02-23 14:35:19 UTC (rev 29546)
@@ -3,9 +3,9 @@
 panels
panel
properties
-   property name=size value=30/
+   property name=size value=28/
property name=monitor value=0/
-   property name=screen-position value=1/
+   property name=screen-position value=11/
property name=fullwidth value=1/
property name=xoffset value=0/
property name=yoffset value=0/
@@ -15,36 +15,20 @@
property name=activetrans value=0/
/properties
items
-   item name=showdesktop id=1/
-   item name=pager id=2/
-   item name=tasklist id=3/
-   item name=systray id=4/
-   /items
-   /panel
-   panel
-   properties
-   property name=size value=36/
-   property name=monitor value=0/
-   property name=screen-position value=11/
-   property name=fullwidth value=0/
-   property name=xoffset value=303/
-   property name=yoffset value=732/
-   property name=handlestyle value=0/
-   property name=autohide value=0/
-   property name=transparency value=20/
-   property name=activetrans value=0/
-   /properties
-   items
item name=xfce4-menu id=5/
item name=separator id=6/
item name=launcher id=7/
item name=launcher id=8/
item name=launcher id=9/
item name=launcher id=10/
+   item name=tasklist id=3/
+   item name=systray id=4/
+   item name=pager id=2/
+   item name=showdesktop id=1/
item name=separator id=11/
-   item name=actions id=12/
-   item name=separator id=13/
item name=clock id=14/
+   item name=separator id=13/
+   item name=actions id=12/
/items
/panel
 /panels

Modified: xfce4-panel/trunk/config/systray-4.rc
===
--- xfce4-panel/trunk/config/systray-4.rc   2009-02-23 14:21:56 UTC (rev 
29545)
+++ xfce4-panel/trunk/config/systray-4.rc   2009-02-23 14:35:19 UTC (rev 
29546)
@@ -1 +1,3 @@
-show_frame=1
+[Global]
+ShowFrame=false
+

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29547 - xfce4-session/trunk/settings

[Olivier Fourdan]

Author: olivier
Date: 2009-02-23 14:48:17 + (Mon, 23 Feb 2009)
New Revision: 29547

Modified:
   xfce4-session/trunk/settings/xfce4-session.xml
Log:
Use no engine by default, startup feels faster without

Modified: xfce4-session/trunk/settings/xfce4-session.xml
===
--- xfce4-session/trunk/settings/xfce4-session.xml  2009-02-23 14:35:19 UTC 
(rev 29546)
+++ xfce4-session/trunk/settings/xfce4-session.xml  2009-02-23 14:48:17 UTC 
(rev 29547)
@@ -31,4 +31,7 @@
   property name=Client4_PerScreen type=bool value=false/
 /property
   /property
+  property name=splash type=empty
+property name=Engine type=string value=/
+  /property
 /channel

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29550 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-02-23 23:59:06 + (Mon, 23 Feb 2009)
New Revision: 29550

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/cycle.c
   xfwm4/trunk/src/moveresize.c
Log:
* src/cycle.c, src/moveresize.c: Make sure any active grab on the
  keyboard and pointer are released  (Corollary to bug #4959).

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-02-23 20:24:02 UTC (rev 29549)
+++ xfwm4/trunk/ChangeLog   2009-02-23 23:59:06 UTC (rev 29550)
@@ -1,5 +1,10 @@
 2009-02-23 olivier
 
+   * src/cycle.c, src/moveresize.c: Make sure any active grab on the
+ keyboard and pointer are released  (Corollary to bug #4959).
+
+2009-02-23 olivier
+
* src/netwm.h, src/netwm.c, src/client.h, src/client.c, src/events.c,
  src/focus.c: Capture user time at startup, a bit of refactoring to
  avoid duplication of code (that led to this bug to remain after a

Modified: xfwm4/trunk/src/cycle.c
===
--- xfwm4/trunk/src/cycle.c 2009-02-23 20:24:02 UTC (rev 29549)
+++ xfwm4/trunk/src/cycle.c 2009-02-23 23:59:06 UTC (rev 29550)
@@ -214,8 +214,8 @@
 TRACE (grab failed in clientCycle);
 
 gdk_beep ();
-myScreenUngrabKeyboard (screen_info, ev-time);
-myScreenUngrabPointer (screen_info, ev-time);
+myScreenUngrabKeyboard (screen_info, CurrentTime);
+myScreenUngrabPointer (screen_info, CurrentTime);
 
 return;
 }
@@ -304,6 +304,10 @@
 clientSetFocus (screen_info, c, myDisplayGetCurrentTime 
(display_info), NO_FOCUS_FLAG);
 }
 
-myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime 
(display_info));
-myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime 
(display_info));
+/*
+ * Use CurrentTime instead of actual last event time to make sure
+ * that the grab is released in any case.
+ */
+myScreenUngrabKeyboard (screen_info, CurrentTime);
+myScreenUngrabPointer (screen_info, CurrentTime);
 }

Modified: xfwm4/trunk/src/moveresize.c
===
--- xfwm4/trunk/src/moveresize.c2009-02-23 20:24:02 UTC (rev 29549)
+++ xfwm4/trunk/src/moveresize.c2009-02-23 23:59:06 UTC (rev 29550)
@@ -952,8 +952,8 @@
 TRACE (grab failed in clientMove);
 
 gdk_beep ();
-myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime 
(display_info));
-myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime 
(display_info));
+myScreenUngrabKeyboard (screen_info, CurrentTime);
+myScreenUngrabPointer (screen_info, CurrentTime);
 
 return;
 }
@@ -1022,9 +1022,14 @@
 gtk_main ();
 eventFilterPop (display_info-xfilter);
 }
-myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime 
(display_info));
-myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime 
(display_info));
 
+/*
+ * Use CurrentTime instead of actual last event time to make sure
+ * that the grab is released in any case.
+ */
+myScreenUngrabKeyboard (screen_info, CurrentTime);
+myScreenUngrabPointer (screen_info, CurrentTime);
+
 if (passdata.grab  screen_info-params-box_move)
 {
 myDisplayUngrabServer (display_info);
@@ -1491,8 +1496,8 @@
 TRACE (grab failed in clientResize);
 
 gdk_beep ();
-myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime 
(display_info));
-myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime 
(display_info));
+myScreenUngrabKeyboard (screen_info, CurrentTime);
+myScreenUngrabPointer (screen_info, CurrentTime);
 
 return;
 }
@@ -1563,9 +1568,14 @@
 gtk_main ();
 eventFilterPop (display_info-xfilter);
 }
-myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime 
(display_info));
-myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime 
(display_info));
 
+/*
+ * Use CurrentTime instead of actual last event time to make sure
+ * that the grab is released in any case.
+ */
+myScreenUngrabKeyboard (screen_info, CurrentTime);
+myScreenUngrabPointer (screen_info, CurrentTime);
+
 if (passdata.grab  screen_info-params-box_resize)
 {
 myDisplayUngrabServer (display_info);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29519 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-02-20 12:37:26 + (Fri, 20 Feb 2009)
New Revision: 29519

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/events.c
Log:
* src/events.c: And do not release events on key release, as Super is
  both a modifier and a regular key that repeats, it breaks when used
  as a modifier (Bug #4959). 
 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-02-19 21:59:36 UTC (rev 29518)
+++ xfwm4/trunk/ChangeLog   2009-02-20 12:37:26 UTC (rev 29519)
@@ -1,5 +1,11 @@
 2009-02-19 olivier
 
+   * src/events.c: And do not release events on key release, as Super is
+ both a modifier and a regular key that repeats, it breaks when used
+ as a modifier (Bug #4959).
+
+2009-02-19 olivier
+
* src/events.c: Use timestamp provided by the event itself to 
  release queued events (Bug #4959).
 

Modified: xfwm4/trunk/src/events.c
===
--- xfwm4/trunk/src/events.c2009-02-19 21:59:36 UTC (rev 29518)
+++ xfwm4/trunk/src/events.c2009-02-20 12:37:26 UTC (rev 29519)
@@ -297,11 +297,10 @@
 TRACE (entering handleKeyEvent);
 
 ev_screen_info = myDisplayGetScreenFromRoot (display_info, ev-root);
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
+
 if (!ev_screen_info)
 {
-/* Release queued events */
-XAllowEvents (display_info-dpy, SyncKeyboard, ev-time);
-
 return EVENT_FILTER_PASS;
 }
 
@@ -402,10 +401,9 @@
 }
 break;
 case KEY_POPUP_MENU:
-XAllowEvents (display_info-dpy, SyncKeyboard, CurrentTime);
 show_window_menu (c, frameX (c) + frameLeft (c),
  frameY (c) + frameTop (c),
- Button1, GDK_CURRENT_TIME);
+ Button1, ev-time);
 break;
 case KEY_FILL_WINDOW:
 clientFill (c, CLIENT_FILL);
@@ -510,9 +508,6 @@
 break;
 }
 
-/* Release queued events */
-XAllowEvents (display_info-dpy, SyncKeyboard, ev-time);
-
 return status;
 }
 
@@ -520,10 +515,13 @@
 handleKeyRelease (DisplayInfo *display_info, XKeyEvent * ev)
 {
 TRACE (entering handleKeyRelease);
-
-/* Release queued events */
-XAllowEvents (display_info-dpy, SyncKeyboard, ev-time);
-
+#if 0
+/*
+ * Do not release queued events here, that breaks with keys
+ * that are both modifier and regular key as they repeat
+ */
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
+#endif
 return EVENT_FILTER_PASS;
 }
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29524 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-02-20 22:02:35 + (Fri, 20 Feb 2009)
New Revision: 29524

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/events.c
Log:
* src/events.c: Only release events on identified key shortcut
  (Bug #4959). 
 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-02-20 20:45:10 UTC (rev 29523)
+++ xfwm4/trunk/ChangeLog   2009-02-20 22:02:35 UTC (rev 29524)
@@ -1,5 +1,10 @@
 2009-02-19 olivier
 
+   * src/events.c: Only release events on identified key shortcut
+ (Bug #4959).
+
+2009-02-19 olivier
+
* src/events.c: And do not release events on key release, as Super is
  both a modifier and a regular key that repeats, it breaks when used
  as a modifier (Bug #4959).

Modified: xfwm4/trunk/src/events.c
===
--- xfwm4/trunk/src/events.c2009-02-20 20:45:10 UTC (rev 29523)
+++ xfwm4/trunk/src/events.c2009-02-20 22:02:35 UTC (rev 29524)
@@ -297,10 +297,10 @@
 TRACE (entering handleKeyEvent);
 
 ev_screen_info = myDisplayGetScreenFromRoot (display_info, ev-root);
-XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 
 if (!ev_screen_info)
 {
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 return EVENT_FILTER_PASS;
 }
 
@@ -315,37 +315,47 @@
 switch (key)
 {
 case KEY_MOVE:
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientMove (c, (XEvent *) ev);
 break;
 case KEY_RESIZE:
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientResize (c, CORNER_BOTTOM_RIGHT, (XEvent *) ev);
 break;
 case KEY_CYCLE_WINDOWS:
 case KEY_CYCLE_REVERSE_WINDOWS:
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientCycle (c, ev);
 break;
 case KEY_CLOSE_WINDOW:
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientClose (c);
 break;
 case KEY_HIDE_WINDOW:
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 if (CLIENT_CAN_HIDE_WINDOW (c))
 {
 clientWithdraw (c, c-win_workspace, TRUE);
 }
 break;
 case KEY_MAXIMIZE_WINDOW:
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientToggleMaximized (c, WIN_STATE_MAXIMIZED, TRUE);
 break;
 case KEY_MAXIMIZE_VERT:
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientToggleMaximized (c, WIN_STATE_MAXIMIZED_VERT, TRUE);
 break;
 case KEY_MAXIMIZE_HORIZ:
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientToggleMaximized (c, WIN_STATE_MAXIMIZED_HORIZ, TRUE);
 break;
 case KEY_SHADE_WINDOW:
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientToggleShaded (c);
 break;
 case KEY_STICK_WINDOW:
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 if (FLAG_TEST(c-xfwm_flags, XFWM_FLAG_HAS_STICK))
 {
 clientToggleSticky (c, TRUE);
@@ -353,33 +363,43 @@
 }
 break;
 case KEY_RAISE_WINDOW:
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientRaise (c, None);
 break;
 case KEY_LOWER_WINDOW:
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientLower (c, None);
 break;
 case KEY_TOGGLE_ABOVE:
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientToggleLayerAbove (c);
 break;
 case KEY_TOGGLE_FULLSCREEN:
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 clientToggleFullscreen (c);
 break;
 case KEY_MOVE_NEXT_WORKSPACE:
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 workspaceSwitch (screen_info, screen_info-current_ws + 1, c, 
TRUE, ev-time);
 break;
 case KEY_MOVE_PREV_WORKSPACE:
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 workspaceSwitch (screen_info, screen_info-current_ws - 1, c, 
TRUE, ev-time);
 break;
 case KEY_MOVE_UP_WORKSPACE:
+XAllowEvents (display_info-dpy, AsyncKeyboard, ev-time);
 workspaceMove (screen_info, -1, 0, 

[Xfce4-commits] r29514 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-02-19 09:56:25 + (Thu, 19 Feb 2009)
New Revision: 29514

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/events.c
   xfwm4/trunk/src/screen.c
   xfwm4/trunk/src/screen.h
   xfwm4/trunk/src/settings.c
Log:
* src/settings.c, src/events.c, src/screen.c, src/screen.h: Apply
  font settings changes in real time (DPI, hinting, hint style, rgba). 
 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-02-18 22:21:16 UTC (rev 29513)
+++ xfwm4/trunk/ChangeLog   2009-02-19 09:56:25 UTC (rev 29514)
@@ -1,3 +1,8 @@
+2009-02-19 olivier
+
+   * src/settings.c, src/events.c, src/screen.c, src/screen.h: Apply
+ font settings changes in real time (DPI, hinting, hint style, rgba).
+
 2009-02-18 olivier
 
* settings-dialogs/workspace-settings.c: Fix limits for margin being

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-02-18 22:21:16 UTC (rev 29513)
+++ xfwm4/trunk/NEWS2009-02-19 09:56:25 UTC (rev 29514)
@@ -17,6 +17,7 @@
 - Fix ICCCM synthetic unmap notify handling causing a race condition with
   amule when started hidden to system tray (Bug #4928)
 - Fix margin max value (Bug #4931)
+- Apply font settings changes in real time (DPI, hinting, hint style, rgba).
 
 4.5.99.1 (Xfce 4.6rc1)
 ==

Modified: xfwm4/trunk/src/events.c
===
--- xfwm4/trunk/src/events.c2009-02-18 22:21:16 UTC (rev 29513)
+++ xfwm4/trunk/src/events.c2009-02-19 09:56:25 UTC (rev 29514)
@@ -2728,6 +2728,19 @@
 return (FALSE);
 }
 
+static gboolean
+refresh_frames_cb (GObject * obj, GdkEvent * ev, gpointer data)
+{
+ScreenInfo *screen_info;
+
+screen_info = (ScreenInfo *) data;
+g_return_val_if_fail (screen_info, TRUE);
+
+myScreenUpdateFontHeight (screen_info);
+clientUpdateAllFrames (screen_info, UPDATE_FRAME);
+return (TRUE);
+}
+
 static void
 size_changed_cb(GdkScreen *gscreen, gpointer data)
 {
@@ -2823,6 +2836,16 @@
 G_CALLBACK (set_reload), (gpointer) (screen_info-display_info));
 g_signal_connect (settings, notify::gtk-double-click-time,
 G_CALLBACK (dbl_click_time_cb), (gpointer) 
(screen_info-display_info));
+g_signal_connect_after (settings, notify::gtk-xft-antialias,
+G_CALLBACK (refresh_frames_cb), (gpointer) (screen_info));
+g_signal_connect_after (settings, notify::gtk-xft-dpi,
+G_CALLBACK (refresh_frames_cb), (gpointer) (screen_info));
+g_signal_connect_after (settings, notify::gtk-xft-hinting,
+G_CALLBACK (refresh_frames_cb), (gpointer) (screen_info));
+g_signal_connect_after (settings, notify::gtk-xft-hintstyle,
+G_CALLBACK (refresh_frames_cb), (gpointer) (screen_info));
+g_signal_connect_after (settings, notify::gtk-xft-rgba,
+G_CALLBACK (refresh_frames_cb), (gpointer) (screen_info));
 }
 }
 

Modified: xfwm4/trunk/src/screen.c
===
--- xfwm4/trunk/src/screen.c2009-02-18 22:21:16 UTC (rev 29513)
+++ xfwm4/trunk/src/screen.c2009-02-19 09:56:25 UTC (rev 29514)
@@ -31,6 +31,7 @@
 #include gdk/gdk.h
 #include gdk/gdkx.h
 #include gtk/gtk.h
+#include pango/pango.h
 #include libxfce4util/libxfce4util.h
 
 #ifdef HAVE_RENDER
@@ -47,6 +48,7 @@
 #include misc.h
 #include mywindow.h
 #include compositor.h
+#include ui_style.h
 
 gboolean
 myScreenCheckWMAtom (ScreenInfo *screen_info, Atom atom)
@@ -631,3 +633,32 @@
 screen_info-cache_monitor = nearest_monitor;
 *rect = screen_info-cache_monitor;
 }
+
+gboolean
+myScreenUpdateFontHeight (ScreenInfo *screen_info)
+{
+PangoFontDescription *desc;
+PangoContext *context;
+PangoFontMetrics *metrics;
+PangoLanguage *language;
+GtkWidget *widget;
+
+widget = myScreenGetGtkWidget (screen_info);
+context = getUIPangoContext (widget);
+desc = getUIPangoFontDesc (widget);
+
+if (desc  context)
+{
+language = pango_context_get_language (context);
+metrics = pango_context_get_metrics (context, desc, language);
+screen_info-font_height =
+ PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
+   pango_font_metrics_get_descent (metrics));
+pango_font_metrics_unref (metrics);
+
+return TRUE;
+}
+
+return FALSE;
+
+}

Modified: xfwm4/trunk/src/screen.h
===
--- xfwm4/trunk/src/screen.h2009-02-18 22:21:16 UTC (rev 29513)
+++ xfwm4/trunk/src/screen.h2009-02-19 09:56:25 UTC (rev 29514)
@@ -218,5 +218,6 @@
  gint,

[Xfce4-commits] r29515 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-02-19 11:21:29 + (Thu, 19 Feb 2009)
New Revision: 29515

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/events.c
Log:
* src/events.c: Use more appropriate callback function name (trivial). 
 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-02-19 09:56:25 UTC (rev 29514)
+++ xfwm4/trunk/ChangeLog   2009-02-19 11:21:29 UTC (rev 29515)
@@ -1,5 +1,9 @@
 2009-02-19 olivier
 
+   * src/events.c: Use more appropriate callback function name (trivial).
+
+2009-02-19 olivier
+
* src/settings.c, src/events.c, src/screen.c, src/screen.h: Apply
  font settings changes in real time (DPI, hinting, hint style, rgba).
 

Modified: xfwm4/trunk/src/events.c
===
--- xfwm4/trunk/src/events.c2009-02-19 09:56:25 UTC (rev 29514)
+++ xfwm4/trunk/src/events.c2009-02-19 11:21:29 UTC (rev 29515)
@@ -2729,7 +2729,7 @@
 }
 
 static gboolean
-refresh_frames_cb (GObject * obj, GdkEvent * ev, gpointer data)
+refresh_font_cb (GObject * obj, GdkEvent * ev, gpointer data)
 {
 ScreenInfo *screen_info;
 
@@ -2837,15 +2837,15 @@
 g_signal_connect (settings, notify::gtk-double-click-time,
 G_CALLBACK (dbl_click_time_cb), (gpointer) 
(screen_info-display_info));
 g_signal_connect_after (settings, notify::gtk-xft-antialias,
-G_CALLBACK (refresh_frames_cb), (gpointer) (screen_info));
+G_CALLBACK (refresh_font_cb), (gpointer) (screen_info));
 g_signal_connect_after (settings, notify::gtk-xft-dpi,
-G_CALLBACK (refresh_frames_cb), (gpointer) (screen_info));
+G_CALLBACK (refresh_font_cb), (gpointer) (screen_info));
 g_signal_connect_after (settings, notify::gtk-xft-hinting,
-G_CALLBACK (refresh_frames_cb), (gpointer) (screen_info));
+G_CALLBACK (refresh_font_cb), (gpointer) (screen_info));
 g_signal_connect_after (settings, notify::gtk-xft-hintstyle,
-G_CALLBACK (refresh_frames_cb), (gpointer) (screen_info));
+G_CALLBACK (refresh_font_cb), (gpointer) (screen_info));
 g_signal_connect_after (settings, notify::gtk-xft-rgba,
-G_CALLBACK (refresh_frames_cb), (gpointer) (screen_info));
+G_CALLBACK (refresh_font_cb), (gpointer) (screen_info));
 }
 }
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29516 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-02-19 12:54:58 + (Thu, 19 Feb 2009)
New Revision: 29516

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/events.c
Log:
* src/events.c: Use timestamp provided by the event itself to 
  release queued events (Bug #4959). 
 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-02-19 11:21:29 UTC (rev 29515)
+++ xfwm4/trunk/ChangeLog   2009-02-19 12:54:58 UTC (rev 29516)
@@ -1,5 +1,10 @@
 2009-02-19 olivier
 
+   * src/events.c: Use timestamp provided by the event itself to 
+ release queued events (Bug #4959).
+
+2009-02-19 olivier
+
* src/events.c: Use more appropriate callback function name (trivial).
 
 2009-02-19 olivier

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-02-19 11:21:29 UTC (rev 29515)
+++ xfwm4/trunk/NEWS2009-02-19 12:54:58 UTC (rev 29516)
@@ -18,6 +18,8 @@
   amule when started hidden to system tray (Bug #4928)
 - Fix margin max value (Bug #4931)
 - Apply font settings changes in real time (DPI, hinting, hint style, rgba).
+- Fix key Super remaining sticky when used as a modifier shortcut 
+  (Bug #4959).
 
 4.5.99.1 (Xfce 4.6rc1)
 ==

Modified: xfwm4/trunk/src/events.c
===
--- xfwm4/trunk/src/events.c2009-02-19 11:21:29 UTC (rev 29515)
+++ xfwm4/trunk/src/events.c2009-02-19 12:54:58 UTC (rev 29516)
@@ -300,7 +300,7 @@
 if (!ev_screen_info)
 {
 /* Release queued events */
-XAllowEvents (display_info-dpy, SyncKeyboard, CurrentTime);
+XAllowEvents (display_info-dpy, SyncKeyboard, ev-time);
 
 return EVENT_FILTER_PASS;
 }
@@ -511,7 +511,7 @@
 }
 
 /* Release queued events */
-XAllowEvents (display_info-dpy, SyncKeyboard, CurrentTime);
+XAllowEvents (display_info-dpy, SyncKeyboard, ev-time);
 
 return status;
 }
@@ -522,7 +522,7 @@
 TRACE (entering handleKeyRelease);
 
 /* Release queued events */
-XAllowEvents (display_info-dpy, SyncKeyboard, CurrentTime);
+XAllowEvents (display_info-dpy, SyncKeyboard, ev-time);
 
 return EVENT_FILTER_PASS;
 }

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29511 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-02-18 19:39:36 + (Wed, 18 Feb 2009)
New Revision: 29511

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/placement.c
Log:
* src/placement.c: Fix size not properly computed by the fill 
  function with a dock on top or left (Bug #4960). 
 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-02-18 17:57:58 UTC (rev 29510)
+++ xfwm4/trunk/ChangeLog   2009-02-18 19:39:36 UTC (rev 29511)
@@ -1,3 +1,8 @@
+2009-02-18 olivier
+
+   * src/placement.c: Fix size not properly computed by the fill 
+ function with a dock on top or left (Bug #4960).
+
 2009-02-17 olivier
 
* src/keyboard.c: Use proper type for returned value.

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-02-18 17:57:58 UTC (rev 29510)
+++ xfwm4/trunk/NEWS2009-02-18 19:39:36 UTC (rev 29511)
@@ -3,6 +3,8 @@
 
 - Fix possible monitor cache size inconsistency when the screen size changes.
 - Fix fill function not working with multiscreen.
+- Fix size not properly computed by the fill function with a dock on top or
+  left (Bug #4960).
 - Only display the shortcut conflict dialog if the conflict is with a different
   shortcut than the one being edited.
 - When stealing a shortcut from another shortcuts provider, clear the shortcut

Modified: xfwm4/trunk/src/placement.c
===
--- xfwm4/trunk/src/placement.c 2009-02-18 17:57:58 UTC (rev 29510)
+++ xfwm4/trunk/src/placement.c 2009-02-18 19:39:36 UTC (rev 29511)
@@ -917,45 +917,29 @@
  * If not, resize to the largest size available that you just have 
computed.
  */
 
-wc.x = frameLeft(c);
+wc.x = full_x + frameLeft(c);
 if (west_neighbour)
 {
-wc.x += MAX (frameX(west_neighbour) + frameWidth(west_neighbour), 
full_x);
+wc.x += MAX (frameX(west_neighbour) + frameWidth(west_neighbour) - 
full_x, 0);
 }
-else
-{
-wc.x += full_x;
-}
 
-wc.width = full_x - frameRight(c) - wc.x;
+wc.width = full_w - frameRight(c) - (wc.x - rect.x);
 if (east_neighbour)
 {
-wc.width += MIN (frameX(east_neighbour) - rect.x, full_w);
+wc.width -= MAX (full_w - (frameX(east_neighbour) - rect.x), 0);
 }
-else
-{
-wc.width += full_w;
-}
 
-wc.y = frameTop(c);
+wc.y = full_y + frameTop(c);
 if (north_neighbour)
 {
-wc.y += MAX (frameY(north_neighbour) + frameHeight(north_neighbour), 
full_y);
+wc.y += MAX (frameY(north_neighbour) + frameHeight(north_neighbour) - 
full_y, 0);
 }
-else
-{
-wc.y += full_y;
-}
 
-wc.height = full_y - frameBottom(c) - wc.y;
+wc.height = full_h - frameBottom(c) - (wc.y - rect.y);
 if (south_neighbour)
 {
-wc.height += MIN (frameY(south_neighbour) - rect.y, full_h);
+wc.height -= MAX (full_h - (frameY(south_neighbour) - rect.y), 0);
 }
-else
-{
-wc.height += full_h;
-}
 
 TRACE (Fill size request: (%d,%d) %dx%d, wc.x, wc.y, wc.width, 
wc.height);
 if (FLAG_TEST (c-xfwm_flags, XFWM_FLAG_MANAGED))

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29512 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-02-18 22:17:27 + (Wed, 18 Feb 2009)
New Revision: 29512

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/placement.c
Log:
* src/placement.c: Same, still not right (Bug #4960). 
 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-02-18 19:39:36 UTC (rev 29511)
+++ xfwm4/trunk/ChangeLog   2009-02-18 22:17:27 UTC (rev 29512)
@@ -1,5 +1,9 @@
 2009-02-18 olivier
 
+   * src/placement.c: Same, still not right (Bug #4960).
+
+2009-02-18 olivier
+
* src/placement.c: Fix size not properly computed by the fill 
  function with a dock on top or left (Bug #4960).
 

Modified: xfwm4/trunk/src/placement.c
===
--- xfwm4/trunk/src/placement.c 2009-02-18 19:39:36 UTC (rev 29511)
+++ xfwm4/trunk/src/placement.c 2009-02-18 22:17:27 UTC (rev 29512)
@@ -923,10 +923,10 @@
 wc.x += MAX (frameX(west_neighbour) + frameWidth(west_neighbour) - 
full_x, 0);
 }
 
-wc.width = full_w - frameRight(c) - (wc.x - rect.x);
+wc.width = full_w - frameRight(c) - (wc.x - full_x);
 if (east_neighbour)
 {
-wc.width -= MAX (full_w - (frameX(east_neighbour) - rect.x), 0);
+wc.width -= MAX (full_w - (frameX(east_neighbour) - full_x), 0);
 }
 
 wc.y = full_y + frameTop(c);
@@ -935,10 +935,10 @@
 wc.y += MAX (frameY(north_neighbour) + frameHeight(north_neighbour) - 
full_y, 0);
 }
 
-wc.height = full_h - frameBottom(c) - (wc.y - rect.y);
+wc.height = full_h - frameBottom(c) - (wc.y - full_y);
 if (south_neighbour)
 {
-wc.height -= MAX (full_h - (frameY(south_neighbour) - rect.y), 0);
+wc.height -= MAX (full_h - (frameY(south_neighbour) - full_y), 0);
 }
 
 TRACE (Fill size request: (%d,%d) %dx%d, wc.x, wc.y, wc.width, 
wc.height);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29513 - in xfwm4/trunk: . settings-dialogs

[Olivier Fourdan]

Author: olivier
Date: 2009-02-18 22:21:16 + (Wed, 18 Feb 2009)
New Revision: 29513

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/settings-dialogs/workspace-settings.c
Log:
* settings-dialogs/workspace-settings.c: Fix limits for margin being
  inverted - patch by Mike Massonnet mike.masson...@gmail.com 
  (Bug #4931). 
 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-02-18 22:17:27 UTC (rev 29512)
+++ xfwm4/trunk/ChangeLog   2009-02-18 22:21:16 UTC (rev 29513)
@@ -1,5 +1,11 @@
 2009-02-18 olivier
 
+   * settings-dialogs/workspace-settings.c: Fix limits for margin being
+ inverted - patch by Mike Massonnet mike.masson...@gmail.com 
+ (Bug #4931).
+
+2009-02-18 olivier
+
* src/placement.c: Same, still not right (Bug #4960).
 
 2009-02-18 olivier

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-02-18 22:17:27 UTC (rev 29512)
+++ xfwm4/trunk/NEWS2009-02-18 22:21:16 UTC (rev 29513)
@@ -16,6 +16,7 @@
 - Fix compilation failure in debug full without render
 - Fix ICCCM synthetic unmap notify handling causing a race condition with
   amule when started hidden to system tray (Bug #4928)
+- Fix margin max value (Bug #4931)
 
 4.5.99.1 (Xfce 4.6rc1)
 ==

Modified: xfwm4/trunk/settings-dialogs/workspace-settings.c
===
--- xfwm4/trunk/settings-dialogs/workspace-settings.c   2009-02-18 22:17:27 UTC 
(rev 29512)
+++ xfwm4/trunk/settings-dialogs/workspace-settings.c   2009-02-18 22:21:16 UTC 
(rev 29513)
@@ -320,10 +320,10 @@
 wmax = gdk_screen_width () / 4;
 hmax = gdk_screen_height () / 4;
 
-gtk_spin_button_set_range (GTK_SPIN_BUTTON (margin_top_spinbutton), 0, 
wmax);
-gtk_spin_button_set_range (GTK_SPIN_BUTTON (margin_right_spinbutton), 0, 
hmax);
-gtk_spin_button_set_range (GTK_SPIN_BUTTON (margin_bottom_spinbutton), 0, 
wmax);
-gtk_spin_button_set_range (GTK_SPIN_BUTTON (margin_left_spinbutton), 0, 
hmax);
+gtk_spin_button_set_range (GTK_SPIN_BUTTON (margin_top_spinbutton), 0, 
hmax);
+gtk_spin_button_set_range (GTK_SPIN_BUTTON (margin_right_spinbutton), 0, 
wmax);
+gtk_spin_button_set_range (GTK_SPIN_BUTTON (margin_bottom_spinbutton), 0, 
hmax);
+gtk_spin_button_set_range (GTK_SPIN_BUTTON (margin_left_spinbutton), 0, 
wmax);
 
 /* Bind easy properties */
 xfconf_g_property_bind (channel,

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29498 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-02-17 09:31:28 + (Tue, 17 Feb 2009)
New Revision: 29498

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/keyboard.c
Log:
* src/keyboard.c: Use proper type for returned value. 
 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-02-17 00:24:18 UTC (rev 29497)
+++ xfwm4/trunk/ChangeLog   2009-02-17 09:31:28 UTC (rev 29498)
@@ -1,3 +1,7 @@
+2009-02-17 olivier
+
+   * src/keyboard.c: Use proper type for returned value.
+
 2009-02-16 olivier
 
* src/events.c, src/client.c: Fix ICCCM synthetic unmap notify 

Modified: xfwm4/trunk/src/keyboard.c
===
--- xfwm4/trunk/src/keyboard.c  2009-02-17 00:24:18 UTC (rev 29497)
+++ xfwm4/trunk/src/keyboard.c  2009-02-17 09:31:28 UTC (rev 29498)
@@ -122,7 +122,7 @@
 gboolean
 grabKey (Display * dpy, MyKey * key, Window w)
 {
-gboolean status;
+int status;
 
 TRACE (entering grabKey);
 
@@ -187,7 +187,7 @@
 gboolean
 grabButton (Display * dpy, int button, int modifier, Window w)
 {
-gboolean status;
+int status;
 
 TRACE (entering grabButton);
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29493 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-02-16 11:11:27 + (Mon, 16 Feb 2009)
New Revision: 29493

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/client.c
   xfwm4/trunk/src/events.c
Log:
* src/events.c, src/client.c: Fix ICCCM synthetic unmap notify 
  handling causing a race condition with amule when started hidden 
  to system tray (Bug #4928). Note: This is still unclear to me
  what is correct behaviour here, the problem reported in bug
  #4928 happens with some other window managers too (e.g. kwin from
  kde 4.2, fluxbox) but not with others (openbox, metacity, icewm).

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-02-16 10:31:08 UTC (rev 29492)
+++ xfwm4/trunk/ChangeLog   2009-02-16 11:11:27 UTC (rev 29493)
@@ -1,3 +1,12 @@
+2009-02-16 olivier
+
+   * src/events.c, src/client.c: Fix ICCCM synthetic unmap notify 
+ handling causing a race condition with amule when started hidden 
+ to system tray (Bug #4928). Note: This is still unclear to me
+ what is correct behaviour here, the problem reported in bug
+ #4928 happens with some other window managers too (e.g. kwin from
+ kde 4.2, fluxbox) but not with others (openbox, metacity, icewm).
+
 2009-02-07 jannis
 
* settings-dialogs/xfwm4-settings.c : Add the new parameter required

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-02-16 10:31:08 UTC (rev 29492)
+++ xfwm4/trunk/NEWS2009-02-16 11:11:27 UTC (rev 29493)
@@ -12,6 +12,8 @@
 - Do not automatically give focus to windows placed on lower layers, but 
   focus those on upper layers at first map.
 - Fix compilation failure in debug full without render
+- Fix ICCCM synthetic unmap notify handling causing a race condition with
+  amule when started hidden to system tray (Bug #4928)
 
 4.5.99.1 (Xfce 4.6rc1)
 ==

Modified: xfwm4/trunk/src/client.c
===
--- xfwm4/trunk/src/client.c2009-02-16 10:31:08 UTC (rev 29492)
+++ xfwm4/trunk/src/client.c2009-02-16 11:11:27 UTC (rev 29493)
@@ -1940,7 +1940,7 @@
 XCreateWindow (display_info-dpy, screen_info-xroot, 0, 0, 1, 1, 0,
 c-depth, InputOutput, c-visual, valuemask, attributes);
 
-XSelectInput (display_info-dpy, c-window, 0);
+XSelectInput (display_info-dpy, c-window, NoEventMask);
 XSetWindowBorderWidth (display_info-dpy, c-window, 0);
 if (FLAG_TEST (c-flags, CLIENT_FLAG_SHADED))
 {
@@ -1950,7 +1950,6 @@
 valuemask = CWEventMask;
 attributes.event_mask = (CLIENT_EVENT_MASK);
 XChangeWindowAttributes (display_info-dpy, c-window, valuemask, 
attributes);
-XSelectInput (display_info-dpy, c-window, CLIENT_EVENT_MASK);
 if (display_info-have_shape)
 {
 XShapeSelectInput (display_info-dpy, c-window, ShapeNotifyMask);
@@ -2652,6 +2651,7 @@
 screen_info = c-screen_info;
 display_info = screen_info-display_info;
 timestamp = myDisplayGetCurrentTime (display_info);
+timestamp = myDisplayGetTime (display_info, timestamp);
 
 if (FLAG_TEST (c-wm_flags, WM_FLAG_DELETE))
 {

Modified: xfwm4/trunk/src/events.c
===
--- xfwm4/trunk/src/events.c2009-02-16 10:31:08 UTC (rev 29492)
+++ xfwm4/trunk/src/events.c2009-02-16 11:11:27 UTC (rev 29493)
@@ -1186,12 +1186,14 @@
  */
 if ((ev-event == screen_info-xroot)  (ev-send_event))
 {
-TRACE (ICCCM UnmapNotify for \%s\, c-name);
-list_of_windows = clientListTransientOrModal (c);
-clientPassFocus (screen_info, c, list_of_windows);
-clientUnframe (c, FALSE);
-g_list_free (list_of_windows);
-
+if (!FLAG_TEST (c-xfwm_flags, XFWM_FLAG_VISIBLE))
+{
+TRACE (ICCCM UnmapNotify for \%s\, c-name);
+list_of_windows = clientListTransientOrModal (c);
+clientPassFocus (screen_info, c, list_of_windows);
+clientUnframe (c, FALSE);
+g_list_free (list_of_windows);
+}
 return status;
 }
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29474 - gtk-xfce-engine-2/trunk/themes/xfce/gtk-2.0

[Olivier Fourdan]

Author: olivier
Date: 2009-02-09 08:56:51 + (Mon, 09 Feb 2009)
New Revision: 29474

Modified:
   gtk-xfce-engine-2/trunk/themes/xfce/gtk-2.0/gtkrc
Log:
Use continuous focus line only on buttons and text entries

Modified: gtk-xfce-engine-2/trunk/themes/xfce/gtk-2.0/gtkrc
===
--- gtk-xfce-engine-2/trunk/themes/xfce/gtk-2.0/gtkrc   2009-02-09 00:43:54 UTC 
(rev 29473)
+++ gtk-xfce-engine-2/trunk/themes/xfce/gtk-2.0/gtkrc   2009-02-09 08:56:51 UTC 
(rev 29474)
@@ -12,12 +12,12 @@
 GtkWidget::focus_padding = 0
 GtkWidget::interior_focus= 0
 GtkWidget::internal_padding  = 0
-GtkWidget::focus-line-pattern= \0
 
 GtkButton::child_displacement_x  = 0
 GtkButton::child_displacement_y  = 1
 GtkButton::default_border= {0, 0, 0, 0}
 GtkButton::default_outside_border= {0, 0, 0, 0}
+GtkButton::focus-line-pattern= \0
 
 GtkButtonBox::child_internal_pad_x   = 0
 GtkButtonBox::child_internal_pad_y   = 0
@@ -25,16 +25,24 @@
 GtkButtonBox::child_min_width= 0
 
 GtkCheckButton::indicator_size   = 12
+GtkCheckButton::focus-line-pattern   = \1\1
+
+GtkEntry::focus-line-pattern = \0
+
 GtkRadioButton::indicator_size   = 12
+GtkRadioButton::focus-line-pattern   = \1\1
 
 GtkExpander::expander-size   = 11
 GtkExpander::expander_spacing= 0
 
 GtkMenuBar::internal-padding = 0
+
 GtkMenu::horizontal-padding  = 0
+GtkMenu::vertical-padding= 0
+
 GtkMenuItem::internal_padding= 2
 GtkMenuItem::selected_shadow_type= etched-in
-GtkMenu::vertical-padding= 0
+
 GtkOptionMenu::indicator_size= 0
 GtkOptionMenu::indicator_spacing = 0
 
@@ -47,15 +55,21 @@
 GtkRange::stepper_spacing= 0
 GtkRange::trough_border  = 0
 GtkRange::trough-border  = 0
+
 GtkScale::trough-side-details= 1
 GtkScale::value_spacing  = 0
 
 GtkScrollbar::has_backward_stepper   = 1
 GtkScrollbar::min_slider_length  = 20
+
 GtkScrolledWindow::scrollbar_spacing = 0
+
+GtkTextView::focus-line-pattern  = \0
+
 GtkToolbar::internal-padding = 0
 GtkToolbar::space-size   = 10
 GtkTreeView::expander-size   = 11
+
 GtkTreeView::horizontal-separator= 0
 GtkTreeView::vertical-separator  = 0
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29475 - gtk-xfce-engine-2/trunk/themes/xfce/gtk-2.0

[Olivier Fourdan]

Author: olivier
Date: 2009-02-09 15:42:18 + (Mon, 09 Feb 2009)
New Revision: 29475

Modified:
   gtk-xfce-engine-2/trunk/themes/xfce/gtk-2.0/gtkrc
Log:
Reduce menubar height for smaller screens

Modified: gtk-xfce-engine-2/trunk/themes/xfce/gtk-2.0/gtkrc
===
--- gtk-xfce-engine-2/trunk/themes/xfce/gtk-2.0/gtkrc   2009-02-09 08:56:51 UTC 
(rev 29474)
+++ gtk-xfce-engine-2/trunk/themes/xfce/gtk-2.0/gtkrc   2009-02-09 15:42:18 UTC 
(rev 29475)
@@ -172,7 +172,7 @@
 style menubar = menu
 {
 xthickness = 1
-ythickness = 3
+ythickness = 2
 
 bg[INSENSITIVE]   = #ec
 bg[NORMAL]= #ec

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29462 - in libxfcegui4/trunk: . libxfce4kbd-private

[Olivier Fourdan]

Author: olivier
Date: 2009-02-07 16:40:40 + (Sat, 07 Feb 2009)
New Revision: 29462

Modified:
   libxfcegui4/trunk/NEWS
   libxfcegui4/trunk/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
Log:
Add default xrandr --auto for XF86Display so that monitor switching works with 
recent Xorg

Modified: libxfcegui4/trunk/NEWS
===
--- libxfcegui4/trunk/NEWS  2009-02-07 14:36:26 UTC (rev 29461)
+++ libxfcegui4/trunk/NEWS  2009-02-07 16:40:40 UTC (rev 29462)
@@ -3,6 +3,8 @@
 - Fix translations of libxfce4kbd-private not being used (Bug #4784).
 - Fix lib ageing (Bug #4864)
 - Update translations (tr, uk, fi)
+- Add default xrandr --auto for XF86Display so that monitor switching works
+  with recent Xorg
 
 4.5.99.1 (Xfce 4.6rc1)
 ==

Modified: libxfcegui4/trunk/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
===
--- libxfcegui4/trunk/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml  
2009-02-07 14:36:26 UTC (rev 29461)
+++ libxfcegui4/trunk/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml  
2009-02-07 16:40:40 UTC (rev 29462)
@@ -5,6 +5,7 @@
 property name=default type=empty
   property name=lt;Altgt;F2 type=string value=xfrun4/
   property name=lt;Controlgt;lt;Altgt;Delete type=string 
value=xflock4/
+  property name=XF86Display type=string value=xrandr --auto/
 /property
   /property
   property name=xfwm4 type=empty

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29463 - in libxfcegui4/trunk: . libxfce4kbd-private

[Olivier Fourdan]

Author: olivier
Date: 2009-02-07 17:30:37 + (Sat, 07 Feb 2009)
New Revision: 29463

Modified:
   libxfcegui4/trunk/configure.in.in
   libxfcegui4/trunk/libxfce4kbd-private/Makefile.am
   libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.c
   libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.h
Log:
Add parent parameter to xfce_shortcut_dialog_run() to fix the transient
mode. This breaks the API/ABI, thus adding a separate library version 
for libxfce4kbd-private which his higher than the one before. 


Modified: libxfcegui4/trunk/configure.in.in
===
--- libxfcegui4/trunk/configure.in.in   2009-02-07 16:40:40 UTC (rev 29462)
+++ libxfcegui4/trunk/configure.in.in   2009-02-07 17:30:37 UTC (rev 29463)
@@ -8,6 +8,7 @@
 dnl *** Version information ***
 dnl ***
 m4_define([libxfcegui4_verinfo], [7:0:3])
+m4_define([libxfce4kbd_private_verinfo], [5:0:0])
 m4_define([libxfcegui4_version_major], [4])
 m4_define([libxfcegui4_version_minor], [5])
 m4_define([libxfcegui4_version_micro], [99])
@@ -49,6 +50,11 @@
 LIBXFCEGUI4_VERINFO=libxfcegui4_verinfo()
 AC_SUBST([LIBXFCEGUI4_VERINFO])
 
+dnl ***
+dnl *** Libtool versioning from libxfce4kbd-private ***
+dnl ***
+LIBXFCE4KBD_PRIVATE_VERINFO=libxfce4kbd_private_verinfo()
+AC_SUBST([LIBXFCE4KBD_PRIVATE_VERINFO])
 
 dnl *
 dnl *** Subst libxfcegui4 version ***

Modified: libxfcegui4/trunk/libxfce4kbd-private/Makefile.am
===
--- libxfcegui4/trunk/libxfce4kbd-private/Makefile.am   2009-02-07 16:40:40 UTC 
(rev 29462)
+++ libxfcegui4/trunk/libxfce4kbd-private/Makefile.am   2009-02-07 17:30:37 UTC 
(rev 29463)
@@ -42,7 +42,7 @@
 
 libxfce4kbd_private_la_LDFLAGS =   \
-export-dynamic \
-   -version-info $(LIBXFCEGUI4_VERINFO)\
+   -version-info $(LIBXFCE4KBD_PRIVATE_VERINFO)\
-export-symbols-regex ^[^_].* \
-no-undefined   \
$(LIBX11_LDFLAGS)

Modified: libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.c
===
--- libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.c
2009-02-07 16:40:40 UTC (rev 29462)
+++ libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.c
2009-02-07 17:30:37 UTC (rev 29463)
@@ -317,14 +317,14 @@
 
 
 gint
-xfce_shortcut_dialog_run (XfceShortcutDialog *dialog)
+xfce_shortcut_dialog_run (XfceShortcutDialog *dialog,
+  GtkWidget  *parent)
 {
   gint response = GTK_RESPONSE_CANCEL;
-
+ 
   g_return_val_if_fail (XFCE_IS_SHORTCUT_DIALOG (dialog), GTK_RESPONSE_CANCEL);
 
-  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW 
(gtk_widget_get_toplevel (GTK_WIDGET (dialog;
-  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
   gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
 
   /* Take control on the keyboard */

Modified: libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.h
===
--- libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.h
2009-02-07 16:40:40 UTC (rev 29462)
+++ libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.h
2009-02-07 17:30:37 UTC (rev 29463)
@@ -42,7 +42,8 @@
 GtkWidget   *xfce_shortcut_dialog_new (const gchar
*provider,
const gchar
*action_name,
const gchar*action) 
G_GNUC_MALLOC;
-gint xfce_shortcut_dialog_run (XfceShortcutDialog *dialog);
+gint xfce_shortcut_dialog_run (XfceShortcutDialog *dialog,
+   GtkWidget  *parent);
 const gchar *xfce_shortcut_dialog_get_shortcut(XfceShortcutDialog *dialog);
 const gchar *xfce_shortcut_dialog_get_action  (XfceShortcutDialog *action);
 const gchar *xfce_shortcut_dialog_get_action_name (XfceShortcutDialog *action);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29465 - libxfcegui4/trunk

[Olivier Fourdan]

Author: olivier
Date: 2009-02-07 20:01:31 + (Sat, 07 Feb 2009)
New Revision: 29465

Modified:
   libxfcegui4/trunk/configure.in.in
Log:
Fix version number

Modified: libxfcegui4/trunk/configure.in.in
===
--- libxfcegui4/trunk/configure.in.in   2009-02-07 17:34:42 UTC (rev 29464)
+++ libxfcegui4/trunk/configure.in.in   2009-02-07 20:01:31 UTC (rev 29465)
@@ -12,9 +12,9 @@
 m4_define([libxfcegui4_version_major], [4])
 m4_define([libxfcegui4_version_minor], [5])
 m4_define([libxfcegui4_version_micro], [99])
-m4_define([libxfcegui4_version_nano], [2])   dnl leave this empty to have no 
nano version
+m4_define([libxfcegui4_version_nano], [1])   dnl leave this empty to have no 
nano version
 m4_define([libxfcegui4_version_build], [...@revision@])
-m4_define([libxfcegui4_version_tag], [])
+m4_define([libxfcegui4_version_tag], [svn])
 m4_define([libxfcegui4_version], 
[libxfcegui4_version_major().libxfcegui4_version_minor().libxfcegui4_version_micro()ifelse(libxfcegui4_version_nano(),
 [], [], [.libxfcegui4_version_nano()])ifelse(libxfcegui4_version_tag(), [svn], 
[libxfcegui4_version_tag()-libxfcegui4_version_build()], 
[libxfcegui4_version_tag()])])
 
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29468 - in xfce4-settings/trunk: . dialogs/keyboard-settings

[Olivier Fourdan]

Author: olivier
Date: 2009-02-07 20:13:22 + (Sat, 07 Feb 2009)
New Revision: 29468

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/configure.ac.in
   xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
Log:
* dialogs/keyboard-settings/xfce-keyboard-settings.c: Add the new 
  parameter required for the API change for xfce_shortcut_dialog_run(), 
  configure.ac.in: Add dependecy on libxfce4kbd_private revision. 
 

Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2009-02-07 20:10:39 UTC (rev 29467)
+++ xfce4-settings/trunk/ChangeLog  2009-02-07 20:13:22 UTC (rev 29468)
@@ -1,3 +1,9 @@
+2009-02-07 jannis
+
+   * dialogs/keyboard-settings/xfce-keyboard-settings.c: Add the new 
+ parameter required for the API change for xfce_shortcut_dialog_run(), 
+ configure.ac.in: Add dependecy on libxfce4kbd_private revision.
+
 2009-01-25 23:42  jannis
 
* NEWS, configure.ac.in, po/ChangeLog, po/fi.po:

Modified: xfce4-settings/trunk/configure.ac.in
===
--- xfce4-settings/trunk/configure.ac.in2009-02-07 20:10:39 UTC (rev 
29467)
+++ xfce4-settings/trunk/configure.ac.in2009-02-07 20:13:22 UTC (rev 
29468)
@@ -78,7 +78,7 @@
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.12.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.5.99.1])
 XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.5.99.1])
-XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], [libxfce4kbd-private-1.0], [4.5.99.1])
+XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], [libxfce4kbd-private-1.0], 
[4.5.99.1svn-r29463])
 XDT_CHECK_PACKAGE([GLADE], [libglade-2.0], [2.0.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.5.99.1])
 XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.34])

Modified: 
xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
===
--- xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c 
2009-02-07 20:10:39 UTC (rev 29467)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c 
2009-02-07 20:13:22 UTC (rev 29468)
@@ -653,7 +653,7 @@
   /* Request a new shortcut from the user */
   dialog = xfce_shortcut_dialog_new (commands, command, command);
   g_signal_connect (dialog, validate-shortcut, G_CALLBACK 
(xfce_keyboard_settings_validate_shortcut), settings);
-  response = xfce_shortcut_dialog_run (XFCE_SHORTCUT_DIALOG (dialog));
+  response = xfce_shortcut_dialog_run (XFCE_SHORTCUT_DIALOG (dialog), 
gtk_widget_get_toplevel (GTK_WIDGET (tree_view)));
 
   if (G_LIKELY (response == GTK_RESPONSE_OK))
 {
@@ -908,6 +908,7 @@
 {
   GtkWidget   *command_dialog;
   GtkWidget   *shortcut_dialog;
+  GtkWidget   *parent;
   const gchar *shortcut;
   const gchar *command;
   gboolean finished = FALSE;
@@ -945,7 +946,8 @@
   g_signal_connect (shortcut_dialog, validate-shortcut, G_CALLBACK 
(xfce_keyboard_settings_validate_shortcut), settings);
 
   /* Run shortcut dialog until a valid shortcut is entered or the dialog 
is cancelled */
-  response = xfce_shortcut_dialog_run (XFCE_SHORTCUT_DIALOG 
(shortcut_dialog));
+  parent = glade_xml_get_widget (settings-priv-glade_xml, 
keyboard-shortcuts-dialog);
+  response = xfce_shortcut_dialog_run (XFCE_SHORTCUT_DIALOG 
(shortcut_dialog), parent);
 
   /* Only continue if the shortcut dialog succeeded */
   if (G_LIKELY (response == GTK_RESPONSE_OK))

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29469 - xfwm4/trunk

[Olivier Fourdan]

Author: olivier
Date: 2009-02-07 20:14:26 + (Sat, 07 Feb 2009)
New Revision: 29469

Modified:
   xfwm4/trunk/configure.ac.in
Log:
Use revision 29463 for libxfce4kbd_private minimum revision just like in 
xfce4-settings

Modified: xfwm4/trunk/configure.ac.in
===
--- xfwm4/trunk/configure.ac.in 2009-02-07 20:13:22 UTC (rev 29468)
+++ xfwm4/trunk/configure.ac.in 2009-02-07 20:14:26 UTC (rev 29469)
@@ -13,7 +13,7 @@
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.5.93])
 m4_define([libxfcegui4_minimum_version], [4.5.93])
-m4_define([libxfce4kbd_private_minimum_version], [4.5.99.1svn-r29462])
+m4_define([libxfce4kbd_private_minimum_version], [4.5.99.1svn-r29463])
 m4_define([xfconf_minimum_version], [4.5.93])
 m4_define([xcomposite_minimum_version], [0.2])
 m4_define([wnck_minimum_version], [2.12])

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29456 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-02-07 00:39:28 + (Sat, 07 Feb 2009)
New Revision: 29456

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/events.c
   xfwm4/trunk/src/focus.c
   xfwm4/trunk/src/mypixmap.c
   xfwm4/trunk/src/mywindow.c
Log:
* src/events.c, : Fix user time not being taken from the user time
  window for apps which support that protocol, that was breaking
  focus stealing prevention for all gtk,
  src/focus.c: Do not automatically give focus to windows placed on 
  lower layers, but focus those on upper layers at first map. 
 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-02-05 13:21:12 UTC (rev 29455)
+++ xfwm4/trunk/ChangeLog   2009-02-07 00:39:28 UTC (rev 29456)
@@ -1,5 +1,13 @@
-2009-05-01 olivier
+2009-02-06 olivier
 
+   * src/events.c, : Fix user time not being taken from the user time
+ window for apps which support that protocol, that was breaking
+ focus stealing prevention for all gtk,
+ src/focus.c: Do not automatically give focus to windows placed on 
+ lower layers, but focus those on upper layers at first map.
+
+2009-02-05 olivier
+
* settings-dialogs/xfwm4-dialog.glade: Set minimum value for 
  wrap_resistance and snap_width (0 is not a valid value)
  src/settings.c: clamp values to sensible defaults

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-02-05 13:21:12 UTC (rev 29455)
+++ xfwm4/trunk/NEWS2009-02-07 00:39:28 UTC (rev 29456)
@@ -7,6 +7,11 @@
   shortcut than the one being edited.
 - When stealing a shortcut from another shortcuts provider, clear the shortcut
   of that provider first.
+- Fix focus stealing prevention with applications which support the 
+  NET_WM_USER_TIME_WINDOW protocol
+- Do not automatically give focus to windows placed on lower layers, but 
+  focus those on upper layers at first map.
+- Fix compilation failure in debug full without render
 
 4.5.99.1 (Xfce 4.6rc1)
 ==

Modified: xfwm4/trunk/src/events.c
===
--- xfwm4/trunk/src/events.c2009-02-05 13:21:12 UTC (rev 29455)
+++ xfwm4/trunk/src/events.c2009-02-07 00:39:28 UTC (rev 29456)
@@ -1799,7 +1799,12 @@
 else if (ev-atom == display_info-atoms[NET_WM_USER_TIME])
 {
 TRACE (client \%s\ (0x%lx) has received a NET_WM_USER_TIME 
notify, c-name, c-window);
-if (getNetWMUserTime (display_info, c-window, c-user_time)  
(c-user_time != 0))
+/*
+ * We can use c-user_time_win safely here because this will be
+ * the same as c-window if the app does not support the protocol
+ * NET_WM_USER_TIME_WINDOW
+ */
+if (getNetWMUserTime (display_info, c-user_time_win, 
c-user_time)  (c-user_time != 0))
 {
 myDisplaySetLastUserTime (display_info, c-user_time);
 FLAG_SET (c-flags, CLIENT_FLAG_HAS_USER_TIME);

Modified: xfwm4/trunk/src/focus.c
===
--- xfwm4/trunk/src/focus.c 2009-02-05 13:21:12 UTC (rev 29455)
+++ xfwm4/trunk/src/focus.c 2009-02-07 00:39:28 UTC (rev 29456)
@@ -164,17 +164,32 @@
 }
 else if ((client_focus)  (prevent_focus_stealing))
 {
-if (FLAG_TEST (c-flags, CLIENT_FLAG_HAS_STARTUP_TIME)  
(c-user_time == CurrentTime))
+if (client_focus-win_layer  c-win_layer)
 {
-TRACE (Given startup time is 0, not focusing);
+TRACE (Not focusing \%s\ because the current focused window is 
on a upper layer, c-name);
 give_focus = FALSE;
 prevented = TRUE;
 }
+else if (client_focus-win_layer  c-win_layer)
+{
+/* We short don't use focus stealing prevention against upper 
layers */
+TRACE (Ignoring startup prevention because the current focused 
window is on a lower layer);
+give_focus = TRUE;
+prevented = FALSE;
+}
+else if (FLAG_TEST (c-flags, CLIENT_FLAG_HAS_STARTUP_TIME)  
(c-user_time == CurrentTime))
+{
+TRACE (Given startup time is nil, not focusing \%s\, c-name);
+give_focus = FALSE;
+prevented = TRUE;
+}
 else if (FLAG_TEST (c-flags, CLIENT_FLAG_HAS_STARTUP_TIME | 
CLIENT_FLAG_HAS_USER_TIME))
 {
 if (TIMESTAMP_IS_BEFORE (c-user_time, client_focus-user_time))
 {
-TRACE (Current %u, new %u, (unsigned int) 
client_focus-user_time, (unsigned int) c-user_time);
+TRACE (Current time is %u, new time is %u, not focusing 
\%s\ \n,
+   (unsigned int) client_focus-user_time,
+ 

[Xfce4-commits] r29418 - in gtk-xfce-engine-2/trunk: . themes/xfce/gtk-2.0

[Olivier Fourdan]

===
--- gtk-xfce-engine-2/trunk/NEWS2009-01-31 17:38:45 UTC (rev 29417)
+++ gtk-xfce-engine-2/trunk/NEWS2009-01-31 21:34:36 UTC (rev 29418)
@@ -1,5 +1,15 @@
+2.6.0 ?
+===
+
+- Much compact version of the default theme.
+
+2.5.99.1
+
+
+- Update WM colors to match the new xfwm4 decoration theme
+
 2.5.92
-=
+==
 
 - Fix bg color being shown under group box title (Bug #1018)
 - Remove README.html files (Bug #3280)

Modified: gtk-xfce-engine-2/trunk/configure.in
===
--- gtk-xfce-engine-2/trunk/configure.in2009-01-31 17:38:45 UTC (rev 
29417)
+++ gtk-xfce-engine-2/trunk/configure.in2009-01-31 21:34:36 UTC (rev 
29418)
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT([gtk-xfce-engine], [2.5.99.1], [http://bugzilla.xfce.org])
+AC_INIT([gtk-xfce-engine], [2.5.99.2], [http://bugzilla.xfce.org])
 
 AC_PREREQ(2.52)
 

Modified: gtk-xfce-engine-2/trunk/themes/xfce/gtk-2.0/gtkrc
===
--- gtk-xfce-engine-2/trunk/themes/xfce/gtk-2.0/gtkrc   2009-01-31 17:38:45 UTC 
(rev 29417)
+++ gtk-xfce-engine-2/trunk/themes/xfce/gtk-2.0/gtkrc   2009-01-31 21:34:36 UTC 
(rev 29418)
@@ -2,35 +2,65 @@
 # Modified Dec. 2006
 # Modified Jan. 2007
 # Modified Jul. 2008 for xfce 4.6
+# Modified Feb. 2009 for xfce 4.6
 # Olivier Fourdan four...@xfce.org
 # Released under the GPL license
 
 style default
 {
 GtkWidget::focus-line-width  = 1
-GtkWidget::focus_padding = 4
-GtkWidget::interior_focus= 5
-GtkWidget::internal_padding  = 4
+GtkWidget::focus_padding = 0
+GtkWidget::interior_focus= 0
+GtkWidget::internal_padding  = 0
+GtkWidget::focus-line-pattern= \0
+
+GtkButton::child_displacement_x  = 0
+GtkButton::child_displacement_y  = 1
 GtkButton::default_border= {0, 0, 0, 0}
 GtkButton::default_outside_border= {0, 0, 0, 0}
-GtkButton::child_displacement_x  = 0
-GtkButton::child_displacement_y  = 1
-GtkButton::default_spacing   = 5
-GtkButton::focus-padding = 1
+
+GtkButtonBox::child_internal_pad_x   = 0
+GtkButtonBox::child_internal_pad_y   = 0
+GtkButtonBox::child_min_heigth   = 0
+GtkButtonBox::child_min_width= 0
+
 GtkCheckButton::indicator_size   = 12
+GtkRadioButton::indicator_size   = 12
+
+GtkExpander::expander-size   = 11
+GtkExpander::expander_spacing= 0
+
+GtkMenuBar::internal-padding = 0
+GtkMenu::horizontal-padding  = 0
+GtkMenuItem::internal_padding= 2
 GtkMenuItem::selected_shadow_type= etched-in
-GtkMenuItem::internal_padding= 5
+GtkMenu::vertical-padding= 0
+GtkOptionMenu::indicator_size= 0
+GtkOptionMenu::indicator_spacing = 0
+
 GtkPaned::handle_full_size   = 1
-GtkPaned::handle_size= 7
-GtkRadioButton::indicator_size   = 15
+GtkPaned::handle_size= 3
+
 GtkRange::slider_width   = 15
 GtkRange::stepper_size   = 15
 GtkRange::stepper_spacing= 0
+GtkRange::stepper_spacing= 0
 GtkRange::trough_border  = 0
+GtkRange::trough-border  = 0
+GtkScale::trough-side-details= 1
+GtkScale::value_spacing  = 0
+
 GtkScrollbar::has_backward_stepper   = 1
 GtkScrollbar::min_slider_length  = 20
-ExoIconBar::focus_padding= 2 
+GtkScrolledWindow::scrollbar_spacing = 0
+GtkToolbar::internal-padding = 0
+GtkToolbar::space-size   = 10
+GtkTreeView::expander-size   = 11
+GtkTreeView::horizontal-separator= 0
+GtkTreeView::vertical-separator  = 0
 
+ExoIconBar::focus_padding= 1
+
 xthickness = 2
 ythickness = 2
 
@@ -186,6 +216,9 @@
 
 style notebook = default
 {
+xthickness = 1
+ythickness = 1
+
 bg[ACTIVE]= #e8e8e6
 bg[NORMAL]= #ff
 fg[NORMAL]= #101010

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29408 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-01-29 20:47:48 + (Thu, 29 Jan 2009)
New Revision: 29408

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/events.c
Log:
* src/events.c: Clear monitor cache when the screen size changes, but 
  avoid redoing the work twice in the case of a monitor-changed event. 
 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-01-28 07:23:55 UTC (rev 29407)
+++ xfwm4/trunk/ChangeLog   2009-01-29 20:47:48 UTC (rev 29408)
@@ -1,3 +1,8 @@
+2009-01-29 olivier
+
+   * src/events.c: Clear monitor cache when the screen size changes, but 
+ avoid redoing the work twice in the case of a monitor-changed event.
+
 2009-01-26 jannis
 
* == 4.5.99.1 released! ==

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-01-28 07:23:55 UTC (rev 29407)
+++ xfwm4/trunk/NEWS2009-01-29 20:47:48 UTC (rev 29408)
@@ -1,3 +1,8 @@
+4.6.0?
+=
+
+- Fix possible monitor cache size inconsistency when the screen size changes
+
 4.5.99.1 (Xfce 4.6rc1)
 ==
 

Modified: xfwm4/trunk/src/events.c
===
--- xfwm4/trunk/src/events.c2009-01-28 07:23:55 UTC (rev 29407)
+++ xfwm4/trunk/src/events.c2009-01-29 20:47:48 UTC (rev 29408)
@@ -2724,17 +2724,43 @@
 {
 ScreenInfo *screen_info;
 DisplayInfo *display_info;
+int new_width, new_height;
 
 TRACE (entering size_changed_cb);
 
 screen_info = (ScreenInfo *) data;
 g_return_if_fail (screen_info);
 
+/*
+ * We have added/removed a monitor or even changed the layout,
+ * the cache for monitor position we use in our screen structure
+ * is not valid anymore and potentially refers to a monitor that
+ * was just removed, so invalidate it.
+ */
+screen_info-cache_monitor.x = -1;
+screen_info-cache_monitor.y = -1;
+screen_info-cache_monitor.width = 0;
+screen_info-cache_monitor.height = 0;
+
+/*
+ * If the overall size of the screen hasn't changed,
+ * there is no need to continue any further...
+ */
+new_width  = WidthOfScreen (screen_info-xscreen);
+new_height = HeightOfScreen (screen_info-xscreen);
+
+if ((screen_info-width  == new_width) 
+(screen_info-height == new_height))
+{
+return;
+}
+
 display_info = screen_info-display_info;
-screen_info-width = WidthOfScreen (screen_info-xscreen);
-screen_info-height = HeightOfScreen (screen_info-xscreen);
+screen_info-width = new_width;
+screen_info-height = new_height;
+
 setNetWorkarea (display_info, screen_info-xroot, 
screen_info-workspace_count,
-screen_info-width, screen_info-height, 
screen_info-margins);
+new_width, new_height, screen_info-margins);
 placeSidewalks (screen_info, screen_info-params-wrap_workspaces);
 clientScreenResize (screen_info);
 compositorUpdateScreenSize (screen_info);
@@ -2750,16 +2776,6 @@
 screen_info = (ScreenInfo *) data;
 g_return_if_fail (screen_info);
 
-/* We have added/removed a monitor or even changed the layout,
- * the cache for monitor position we use in our screen structure
- * is not valid anymore and potentially refers to a monitor that
- * was just removed, so invalidate it.
- */
-screen_info-cache_monitor.x = -1;
-screen_info-cache_monitor.y = -1;
-screen_info-cache_monitor.width = 0;
-screen_info-cache_monitor.height = 0;
-
 /*
  * From the window manager point of view,
  * a XRand 1.2 monitor change is similar to

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29409 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-01-29 20:50:40 + (Thu, 29 Jan 2009)
New Revision: 29409

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/placement.c
Log:
* src/placement.c: Apparently someone is confusing East and West :)
  Fix fill function not working with multiscreen. 
 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-01-29 20:47:48 UTC (rev 29408)
+++ xfwm4/trunk/ChangeLog   2009-01-29 20:50:40 UTC (rev 29409)
@@ -1,5 +1,10 @@
 2009-01-29 olivier
 
+   * src/placement.c: Apparently someone is confusing East and West :)
+ Fix fill function not working with multiscreen.
+
+2009-01-29 olivier
+
* src/events.c: Clear monitor cache when the screen size changes, but 
  avoid redoing the work twice in the case of a monitor-changed event.
 

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-01-29 20:47:48 UTC (rev 29408)
+++ xfwm4/trunk/NEWS2009-01-29 20:50:40 UTC (rev 29409)
@@ -1,7 +1,8 @@
 4.6.0?
 =
 
-- Fix possible monitor cache size inconsistency when the screen size changes
+- Fix possible monitor cache size inconsistency when the screen size changes.
+- Fix fill function not working with multiscreen.
 
 4.5.99.1 (Xfce 4.6rc1)
 ==

Modified: xfwm4/trunk/src/placement.c
===
--- xfwm4/trunk/src/placement.c 2009-01-29 20:47:48 UTC (rev 29408)
+++ xfwm4/trunk/src/placement.c 2009-01-29 20:50:40 UTC (rev 29409)
@@ -760,6 +760,7 @@
 int tmp_x, tmp_y, tmp_w, tmp_h;
 
 g_return_if_fail (c != NULL);
+TRACE (entering clientFill);
 
 if (!CLIENT_CAN_FILL_WINDOW (c))
 {
@@ -793,19 +794,19 @@
 {
 if ((frameX(c2) + frameWidth(c2))  frameX(c))
 {
-if (east_neighbour)
+if (west_neighbour)
 {
 /* Check if c2 is closer to the client
- * then the east neighbour already found
+ * then the west neighbour already found
  */
-if ((frameX(east_neighbour) + 
frameWidth(east_neighbour))  (frameX(c2) + frameWidth(c2)))
+if ((frameX(west_neighbour) + 
frameWidth(west_neighbour))  (frameX(c2) + frameWidth(c2)))
 {
-east_neighbour = c2;
+west_neighbour = c2;
 }
 }
 else
 {
-east_neighbour = c2;
+west_neighbour = c2;
 }
 }
 if ((frameX(c) + frameWidth(c))  frameX(c2))
@@ -813,16 +814,16 @@
 /* Check if c2 is closer to the client
  * then the west neighbour already found
  */
-if (west_neighbour)
+if (east_neighbour)
 {
-if (frameX(c2)  frameX(west_neighbour))
+if (frameX(c2)  frameX(east_neighbour))
 {
-west_neighbour = c2;
+east_neighbour = c2;
 }
 }
 else
 {
-west_neighbour = c2;
+east_neighbour = c2;
 }
 }
 }
@@ -917,9 +918,9 @@
  */
 
 wc.x = frameLeft(c);
-if (east_neighbour)
+if (west_neighbour)
 {
-wc.x += MAX (frameX(east_neighbour) + frameWidth(east_neighbour), 
full_x);
+wc.x += MAX (frameX(west_neighbour) + frameWidth(west_neighbour), 
full_x);
 }
 else
 {
@@ -927,9 +928,9 @@
 }
 
 wc.width = full_x - frameRight(c) - wc.x;
-if (west_neighbour)
+if (east_neighbour)
 {
-wc.width += MIN (frameX(west_neighbour), full_w);
+wc.width += MIN (frameX(east_neighbour) - rect.x, full_w);
 }
 else
 {
@@ -949,7 +950,7 @@
 wc.height = full_y - frameBottom(c) - wc.y;
 if (south_neighbour)
 {
-wc.height += MIN (frameY(south_neighbour), full_h);
+wc.height += MIN (frameY(south_neighbour) - rect.y, full_h);
 }
 else
 {

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29405 - thunar/trunk/po

[Olivier Fourdan]

Author: olivier
Date: 2009-01-27 09:13:30 + (Tue, 27 Jan 2009)
New Revision: 29405

Modified:
   thunar/trunk/po/eu.po
Log:
msgctxt is not supported and breaks in older gettext

Modified: thunar/trunk/po/eu.po
===
--- thunar/trunk/po/eu.po   2009-01-27 07:53:26 UTC (rev 29404)
+++ thunar/trunk/po/eu.po   2009-01-27 09:13:30 UTC (rev 29405)
@@ -3543,9 +3543,5 @@
 #~ msgid Thunar Settings
 #~ msgstr Thunar ezarpenak
 
-#~ msgctxt CategoryName (FolderName)
-#~ msgid %s (%s)
-#~ msgstr %s (%s)
-
 #~ msgid Trash is full
 #~ msgstr Zakarrontzia betea dago

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29406 - libxfcegui4/trunk

[Olivier Fourdan]

Author: olivier
Date: 2009-01-27 22:43:12 + (Tue, 27 Jan 2009)
New Revision: 29406

Modified:
   libxfcegui4/trunk/ChangeLog
   libxfcegui4/trunk/NEWS
   libxfcegui4/trunk/configure.in.in
Log:
* configure.in.in: Fix lib ageing (Bug #4864) 
 

Modified: libxfcegui4/trunk/ChangeLog
===
--- libxfcegui4/trunk/ChangeLog 2009-01-27 09:13:30 UTC (rev 29405)
+++ libxfcegui4/trunk/ChangeLog 2009-01-27 22:43:12 UTC (rev 29406)
@@ -1,3 +1,7 @@
+2009-01-27 olivier
+
+   * configure.in.in: Fix lib ageing (Bug #4864)
+
 2009-01-23 22:16  mmassonnet
 
* po/fr.po:

Modified: libxfcegui4/trunk/NEWS
===
--- libxfcegui4/trunk/NEWS  2009-01-27 09:13:30 UTC (rev 29405)
+++ libxfcegui4/trunk/NEWS  2009-01-27 22:43:12 UTC (rev 29406)
@@ -1,3 +1,7 @@
+4.6.0 (Xfce 4.6.0)
+==
+- Fix lib ageing (Bug #4864)
+
 4.5.99.1 (Xfce 4.6rc1)
 ==
 - Define libglade_module_path, glade_module_path, glade_catalog_path and

Modified: libxfcegui4/trunk/configure.in.in
===
--- libxfcegui4/trunk/configure.in.in   2009-01-27 09:13:30 UTC (rev 29405)
+++ libxfcegui4/trunk/configure.in.in   2009-01-27 22:43:12 UTC (rev 29406)
@@ -7,7 +7,7 @@
 dnl ***
 dnl *** Version information ***
 dnl ***
-m4_define([libxfcegui4_verinfo], [6:5:2])
+m4_define([libxfcegui4_verinfo], [7:0:3])
 m4_define([libxfcegui4_version_major], [4])
 m4_define([libxfcegui4_version_minor], [5])
 m4_define([libxfcegui4_version_micro], [99])

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29349 - in xfwm4/trunk: . settings-dialogs

[Olivier Fourdan]

Author: olivier
Date: 2009-01-25 17:59:12 + (Sun, 25 Jan 2009)
New Revision: 29349

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/configure.ac.in
   xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade
   xfwm4/trunk/settings-dialogs/xfwm4-settings.c
Log:
* settings-dialogs/xfwm4-settings.c, 
  settings-dialogs/xfwm4-dialog.glade: Make title alignment and button
  layout insensitive when not supported by the theme selected, fix a
  memory leak,
  configure.ac.in: Remove AC_C_CONST
* settings-dialogs/xfwm4-settings.c: Fix dragging button layout when 
  the dialog is embedded in the settings dialog (Bug #4524).

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-01-25 16:43:14 UTC (rev 29348)
+++ xfwm4/trunk/ChangeLog   2009-01-25 17:59:12 UTC (rev 29349)
@@ -1,3 +1,16 @@
+2009-01-25 nick
+
+   * settings-dialogs/xfwm4-settings.c, 
+ settings-dialogs/xfwm4-dialog.glade: Make title alignment and button
+ layout insensitive when not supported by the theme selected, fix a
+ memory leak,
+ configure.ac.in: Remove AC_C_CONST
+
+2009-01-25 nick
+
+   * settings-dialogs/xfwm4-settings.c: Fix dragging button layout when 
+ the dialog is embedded in the settings dialog (Bug #4524).
+
 2009-01-24 olivier
 
* src/display.c, src/display.h, src/events.c, src/client.c

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-01-25 16:43:14 UTC (rev 29348)
+++ xfwm4/trunk/NEWS2009-01-25 17:59:12 UTC (rev 29349)
@@ -9,6 +9,8 @@
 - Add support for NET_WM_FULLSCREEN_MONITORS
 - Fix dragging button layout when the dialog is embedded in the settings
   dialog (Bug #4524).
+- Make title alignment and button layout insensitive when not supported by the 
+  theme selected.
 
 4.5.93 (Xfce 4.6beta3)
 ==

Modified: xfwm4/trunk/configure.ac.in
===
--- xfwm4/trunk/configure.ac.in 2009-01-25 16:43:14 UTC (rev 29348)
+++ xfwm4/trunk/configure.ac.in 2009-01-25 17:59:12 UTC (rev 29349)
@@ -47,7 +47,6 @@
 AC_PROG_LIBTOOL
 
 dnl Check C Compiler Characteristics
-AC_C_CONST
 AC_C_INLINE
 
 dnl check for standard header files

Modified: xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade
===
--- xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade 2009-01-25 16:43:14 UTC 
(rev 29348)
+++ xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade 2009-01-25 17:59:12 UTC 
(rev 29349)
@@ -114,7 +114,7 @@
 property name=label_xalign0/property
 property name=shadow_typeGTK_SHADOW_NONE/property
 child
-  widget class=GtkAlignment id=alignment15
+  widget class=GtkAlignment id=title_align_box
 property name=visibleTrue/property
 property name=border_width6/property
 property name=bottom_padding6/property
@@ -152,7 +152,7 @@
 property name=label_xalign0/property
 property name=shadow_typeGTK_SHADOW_NONE/property
 child
-  widget class=GtkAlignment id=alignment16
+  widget class=GtkAlignment id=button_layout_box
 property name=visibleTrue/property
 property name=bottom_padding6/property
 property name=left_padding12/property

Modified: xfwm4/trunk/settings-dialogs/xfwm4-settings.c
===
--- xfwm4/trunk/settings-dialogs/xfwm4-settings.c   2009-01-25 16:43:14 UTC 
(rev 29348)
+++ xfwm4/trunk/settings-dialogs/xfwm4-settings.c   2009-01-25 17:59:12 UTC 
(rev 29349)
@@ -205,8 +205,15 @@
   const gchar *shortcut;
 };
 
+enum
+{
+  COL_THEME_NAME,
+  COL_THEME_RC,
+  N_COLUMNS
+};
 
 
+
 static GObjectClass  *xfwm_settings_parent_class = NULL;
 
 static const MenuTemplate double_click_values[] = {
@@ -333,26 +340,7 @@
 }
 
 
-/*
- * Xfce 4.6 depends on glib 2.12,
- * Glib 2.14 comes with g_hash_table_get_keys(),
- * until then... use the following function with
- * g_hash_table_foreach()
- */
-#if !GLIB_CHECK_VERSION (2,14,0)
-static void
-xfwm4_settings_get_list_keys_foreach (gpointer key,
-  gpointer value,
-  gpointer user_data)
-{
-  GList **keys = user_data;
-  *keys = g_list_prepend (*keys, key);
-}
-#endif
 
-
-
-
 static void
 xfwm_settings_class_init (XfwmSettingsClass *klass)
 {
@@ -446,12 +434,13 @@
 
   /* Style tab: theme name */
   {
-list_store = 

[Xfce4-commits] r29352 - in xfwm4/trunk: . settings-dialogs

[Olivier Fourdan]

Author: olivier
Date: 2009-01-25 21:00:33 + (Sun, 25 Jan 2009)
New Revision: 29352

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/settings-dialogs/xfwm4-settings.c
Log:
* settings-dialogs/xfwm4-settings.c: gtk_selection_data_get_data() is
  gtk+2.14 (Bug #4855)

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-01-25 20:51:11 UTC (rev 29351)
+++ xfwm4/trunk/ChangeLog   2009-01-25 21:00:33 UTC (rev 29352)
@@ -1,3 +1,8 @@
+2009-01-25 olivier
+
+   * settings-dialogs/xfwm4-settings.c: gtk_selection_data_get_data() is
+ gtk+2.14 (Bug #4855)
+
 2009-01-25 nick
 
* settings-dialogs/xfwm4-settings.c, 

Modified: xfwm4/trunk/settings-dialogs/xfwm4-settings.c
===
--- xfwm4/trunk/settings-dialogs/xfwm4-settings.c   2009-01-25 20:51:11 UTC 
(rev 29351)
+++ xfwm4/trunk/settings-dialogs/xfwm4-settings.c   2009-01-25 21:00:33 UTC 
(rev 29352)
@@ -841,7 +841,7 @@
   xfce_resource_push_path (XFCE_RESOURCE_THEMES, DATADIR G_DIR_SEPARATOR_S 
themes);
   theme_dirs = xfce_resource_dirs (XFCE_RESOURCE_THEMES);
   xfce_resource_pop_path (XFCE_RESOURCE_THEMES);
-  
+
   active_theme_name = xfconf_channel_get_string (settings-priv-wm_channel, 
/general/theme, DEFAULT_THEME);
 
   for (i = 0; theme_dirs[i] != NULL; ++i)
@@ -864,10 +864,10 @@
 
   /* insert in the list store */
   gtk_list_store_append (GTK_LIST_STORE (model), iter);
-  gtk_list_store_set (GTK_LIST_STORE (model), iter, 
+  gtk_list_store_set (GTK_LIST_STORE (model), iter,
   COL_THEME_NAME, file,
   COL_THEME_RC, filename, -1);
-  
+
   if (G_UNLIKELY (g_str_equal (active_theme_name, file)))
 {
   gtk_tree_selection_select_iter (gtk_tree_view_get_selection 
(GTK_TREE_VIEW (view)),
@@ -1008,18 +1008,18 @@
   if (gtk_tree_selection_get_selected (selection, model, iter))
 {
   gtk_tree_model_get (model, iter,
-  COL_THEME_NAME, theme, 
+  COL_THEME_NAME, theme,
   COL_THEME_RC, filename, -1);
-  
+
   /* set the theme name */
   xfconf_channel_set_string (settings-priv-wm_channel, /general/theme, 
theme);
   g_free (theme);
-  
+
   /* check in the rc if the theme supports a custom button layout and/or
* title alignement */
   rc = xfce_rc_simple_open (filename, TRUE);
   g_free (filename);
-  
+
   if (G_LIKELY (rc != NULL))
 {
   button_layout = !xfce_rc_has_entry (rc, button_layout);
@@ -1027,10 +1027,10 @@
   xfce_rc_close (rc);
 }
 }
-
+
   widget = glade_xml_get_widget (settings-priv-glade_xml, 
button_layout_box);
   gtk_widget_set_sensitive (widget, button_layout);
-  
+
   widget = glade_xml_get_widget (settings-priv-glade_xml, title_align_box);
   gtk_widget_set_sensitive (widget, title_alignment);
 }
@@ -1079,10 +1079,14 @@
 
   g_return_if_fail (XFWM_IS_SETTINGS (settings));
 
-  source = glade_xml_get_widget (settings-priv-glade_xml, 
+  source = glade_xml_get_widget (settings-priv-glade_xml,
+#if GLIB_CHECK_VERSION (2,14,0)
  (const gchar *)gtk_selection_data_get_data 
(data));
+#else
+ (const gchar *) data-data);
+#endif
   parent = gtk_widget_get_parent (source);
-  
+
   active_box = glade_xml_get_widget (settings-priv-glade_xml, active-box);
 
   g_object_ref (source);
@@ -1203,7 +1207,11 @@
   g_return_if_fail (XFWM_IS_SETTINGS (settings));
 
   source = glade_xml_get_widget (settings-priv-glade_xml,
+#if GLIB_CHECK_VERSION (2,14,0)
  (const gchar *)gtk_selection_data_get_data 
(data));
+#else
+ (const gchar *) data-data);
+#endif
   parent = gtk_widget_get_parent (source);
 
   hidden_box = glade_xml_get_widget (settings-priv-glade_xml, hidden-box);
@@ -1310,8 +1318,8 @@
   guint time)
 {
   gtk_widget_hide (widget);
-  gtk_selection_data_set (data, gdk_atom_intern (_xfwm4_button_layout, 
FALSE), 8, 
-  (const guchar *)gtk_widget_get_name (widget), 
+  gtk_selection_data_set (data, gdk_atom_intern (_xfwm4_button_layout, 
FALSE), 8,
+  (const guchar *)gtk_widget_get_name (widget),
   strlen (gtk_widget_get_name (widget)));
 }
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29365 - in xfwm4/trunk: . settings-dialogs

[Olivier Fourdan]

Author: olivier
Date: 2009-01-25 23:15:32 + (Sun, 25 Jan 2009)
New Revision: 29365

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/settings-dialogs/xfwm4-settings.c
Log:
* settings-dialogs/xfwm4-settings.c: gtk, not glib for 
  gtk_selection_data_get_data()

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-01-25 23:10:56 UTC (rev 29364)
+++ xfwm4/trunk/ChangeLog   2009-01-25 23:15:32 UTC (rev 29365)
@@ -1,5 +1,10 @@
 2009-01-25 olivier
 
+   * settings-dialogs/xfwm4-settings.c: gtk, not glib for 
+ gtk_selection_data_get_data()
+
+2009-01-25 olivier
+
* settings-dialogs/xfwm4-settings.c: gtk_selection_data_get_data() is
  gtk+2.14 (Bug #4855)
 

Modified: xfwm4/trunk/settings-dialogs/xfwm4-settings.c
===
--- xfwm4/trunk/settings-dialogs/xfwm4-settings.c   2009-01-25 23:10:56 UTC 
(rev 29364)
+++ xfwm4/trunk/settings-dialogs/xfwm4-settings.c   2009-01-25 23:15:32 UTC 
(rev 29365)
@@ -1080,7 +1080,7 @@
   g_return_if_fail (XFWM_IS_SETTINGS (settings));
 
   source = glade_xml_get_widget (settings-priv-glade_xml,
-#if GLIB_CHECK_VERSION (2,14,0)
+#if GTK_CHECK_VERSION (2,14,0)
  (const gchar *)gtk_selection_data_get_data 
(data));
 #else
  (const gchar *) data-data);
@@ -1207,7 +1207,7 @@
   g_return_if_fail (XFWM_IS_SETTINGS (settings));
 
   source = glade_xml_get_widget (settings-priv-glade_xml,
-#if GLIB_CHECK_VERSION (2,14,0)
+#if GTK_CHECK_VERSION (2,14,0)
  (const gchar *)gtk_selection_data_get_data 
(data));
 #else
  (const gchar *) data-data);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29311 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-01-24 23:42:37 + (Sat, 24 Jan 2009)
New Revision: 29311

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/README
   xfwm4/trunk/src/client.c
   xfwm4/trunk/src/client.h
   xfwm4/trunk/src/display.c
   xfwm4/trunk/src/display.h
   xfwm4/trunk/src/events.c
   xfwm4/trunk/src/hints.c
   xfwm4/trunk/src/hints.h
   xfwm4/trunk/src/netwm.c
Log:
* src/display.c, src/display.h, src/events.c, src/client.c
  src/client.h, src/hints.c, src/hints.h, src/netwm.c, README:
  Add support for NET_WM_FULLSCREEN_MONITORS

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-01-24 21:03:15 UTC (rev 29310)
+++ xfwm4/trunk/ChangeLog   2009-01-24 23:42:37 UTC (rev 29311)
@@ -1,3 +1,9 @@
+2009-01-24 olivier
+
+   * src/display.c, src/display.h, src/events.c, src/client.c
+ src/client.h, src/hints.c, src/hints.h, src/netwm.c, README:
+ Add support for NET_WM_FULLSCREEN_MONITORS
+
 2009-01-23 olivier
 
* src/parserc.c, src/settings.c, src/settings.c: Fix settings not

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-01-24 21:03:15 UTC (rev 29310)
+++ xfwm4/trunk/NEWS2009-01-24 23:42:37 UTC (rev 29311)
@@ -6,6 +6,7 @@
   the session manager (Bug #4839).
 - Fix settings not being set at startup (Bug #4845)
 - Flatten default theme
+- Add support for NET_WM_FULLSCREEN_MONITORS
 
 4.5.93 (Xfce 4.6beta3)
 ==

Modified: xfwm4/trunk/README
===
--- xfwm4/trunk/README  2009-01-24 21:03:15 UTC (rev 29310)
+++ xfwm4/trunk/README  2009-01-24 23:42:37 UTC (rev 29311)
@@ -20,14 +20,17 @@
 NET_NUMBER_OF_DESKTOPS
 NET_REQUEST_FRAME_EXTENTS
 NET_SHOWING_DESKTOP
-NET_STARTUP_ID
 NET_SUPPORTED
 NET_SUPPORTING_WM_CHECK
 NET_SYSTEM_TRAY_OPCODE
+NET_WM_ACTION_ABOVE
+NET_WM_ACTION_BELOW
 NET_WM_ACTION_CHANGE_DESKTOP
 NET_WM_ACTION_CLOSE
+NET_WM_ACTION_FULLSCREEN
 NET_WM_ACTION_MAXIMIZE_HORZ
 NET_WM_ACTION_MAXIMIZE_VERT
+NET_WM_ACTION_MINIMIZE
 NET_WM_ACTION_MOVE
 NET_WM_ACTION_RESIZE
 NET_WM_ACTION_SHADE
@@ -35,13 +38,14 @@
 NET_WM_ALLOWED_ACTIONS
 NET_WM_CONTEXT_HELP
 NET_WM_DESKTOP
+NET_WM_FULLSCREEN_MONITORS
 NET_WM_ICON
 NET_WM_ICON_GEOMETRY
 NET_WM_ICON_NAME
 NET_WM_MOVERESIZE
 NET_WM_NAME
-NET_WM_WINDOW_OPACITY
-NET_WM_WINDOW_OPACITY_LOCKED
+NET_WM_PID
+NET_WM_PING
 NET_WM_STATE
 NET_WM_STATE_ABOVE
 NET_WM_STATE_BELOW
@@ -60,6 +64,9 @@
 NET_WM_SYNC_REQUEST
 NET_WM_SYNC_REQUEST_COUNTER
 NET_WM_USER_TIME
+NET_WM_USER_TIME_WINDOW
+NET_WM_WINDOW_OPACITY
+NET_WM_WINDOW_OPACITY_LOCKED
 NET_WM_WINDOW_TYPE
 NET_WM_WINDOW_TYPE_DESKTOP
 NET_WM_WINDOW_TYPE_DIALOG

Modified: xfwm4/trunk/src/client.c
===
--- xfwm4/trunk/src/client.c2009-01-24 21:03:15 UTC (rev 29310)
+++ xfwm4/trunk/src/client.c2009-01-24 23:42:37 UTC (rev 29311)
@@ -1760,6 +1760,11 @@
 c-ncmap = 0;
 }
 
+c-fullscreen_monitors[0] = 0;
+c-fullscreen_monitors[1] = 0;
+c-fullscreen_monitors[2] = 0;
+c-fullscreen_monitors[3] = 0;
+
 /* Opacity for compositing manager */
 c-opacity = NET_WM_OPAQUE;
 getOpacity (display_info, c-window, c-opacity);
@@ -2973,6 +2978,70 @@
 }
 }
 
+void
+clientUpdateFullscreenSize (Client * c)
+{
+ScreenInfo *screen_info;
+DisplayInfo *display_info;
+XWindowChanges wc;
+GdkRectangle monitor, rect;
+int i;
+
+g_return_if_fail (c != NULL);
+TRACE (entering clientUpdateFullscreenSize);
+TRACE (Update fullscreen size for client \%s\ (0x%lx), c-name, 
c-window);
+
+screen_info = c-screen_info;
+display_info = screen_info-display_info;
+
+if (FLAG_TEST (c-flags, CLIENT_FLAG_FULLSCREEN))
+{
+if (FLAG_TEST (c-flags, CLIENT_FLAG_FULLSCREN_MONITORS))
+{
+gdk_screen_get_monitor_geometry (screen_info-gscr, 
c-fullscreen_monitors[0], rect);
+for (i = 1; i  4; i++)
+{
+gdk_screen_get_monitor_geometry (screen_info-gscr, 
c-fullscreen_monitors[i], monitor);
+gdk_rectangle_union (rect, monitor, rect);
+}
+}
+else
+{
+int cx, cy;
+
+cx = frameX (c) + (frameWidth (c) / 2);
+cy = frameY (c) + (frameHeight (c) / 2);
+
+myScreenFindMonitorAtPoint (screen_info, cx, cy, rect);
+}
+
+wc.x = rect.x;
+wc.y = rect.y;
+wc.width = rect.width;
+wc.height = rect.height;
+}
+
+else
+{
+wc.x = c-fullscreen_old_x;
+wc.y = c-fullscreen_old_y;
+wc.width = c-fullscreen_old_width;
+ 

[Xfce4-commits] r29304 - in gtk-xfce-engine-2/trunk: . themes/xfce/gtk-2.0

[Olivier Fourdan]

Author: olivier
Date: 2009-01-23 22:37:56 + (Fri, 23 Jan 2009)
New Revision: 29304

Modified:
   gtk-xfce-engine-2/trunk/configure.in
   gtk-xfce-engine-2/trunk/themes/xfce/gtk-2.0/gtkrc
Log:
Use a light blue for window decoration with default theme to match the change 
in xfwm4 default theme

Modified: gtk-xfce-engine-2/trunk/configure.in
===
--- gtk-xfce-engine-2/trunk/configure.in2009-01-23 22:36:35 UTC (rev 
29303)
+++ gtk-xfce-engine-2/trunk/configure.in2009-01-23 22:37:56 UTC (rev 
29304)
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT([gtk-xfce-engine], [2.5.93], [http://bugzilla.xfce.org])
+AC_INIT([gtk-xfce-engine], [2.5.99.1], [http://bugzilla.xfce.org])
 
 AC_PREREQ(2.52)
 

Modified: gtk-xfce-engine-2/trunk/themes/xfce/gtk-2.0/gtkrc
===
--- gtk-xfce-engine-2/trunk/themes/xfce/gtk-2.0/gtkrc   2009-01-23 22:36:35 UTC 
(rev 29303)
+++ gtk-xfce-engine-2/trunk/themes/xfce/gtk-2.0/gtkrc   2009-01-23 22:37:56 UTC 
(rev 29304)
@@ -279,7 +279,7 @@
 
 style titlebar = default
 {
-bg[SELECTED]  = #1a2738
+bg[SELECTED]  = #5e98e3
 fg[SELECTED]  = #ff
 bg[INSENSITIVE]   = #ec
 fg[INSENSITIVE]   = #888a85

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29288 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-01-21 19:02:13 + (Wed, 21 Jan 2009)
New Revision: 29288

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/main.c
Log:
* src/main.c: Command line option --daemon would have no effect 
  when xfwm4 connects to the session manager.

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-01-21 10:54:53 UTC (rev 29287)
+++ xfwm4/trunk/ChangeLog   2009-01-21 19:02:13 UTC (rev 29288)
@@ -1,3 +1,8 @@
+2009-01-21 olivier
+
+   * src/main.c: Command line option --daemon would have no effect 
+ when xfwm4 connects to the session manager.
+
 2009-01-20 olivier
 
* mcs-plugin: Removed.

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-01-21 10:54:53 UTC (rev 29287)
+++ xfwm4/trunk/NEWS2009-01-21 19:02:13 UTC (rev 29288)
@@ -2,6 +2,8 @@
 ==
 
 - Fix a crash when removing a monitor with xrandr 1.2
+- Command line option --daemon would have no effect when xfwm4 connects to 
+  the session manager (Bug #4839).
 
 4.5.93 (Xfce 4.6beta3)
 ==

Modified: xfwm4/trunk/src/main.c
===
--- xfwm4/trunk/src/main.c  2009-01-21 10:54:53 UTC (rev 29287)
+++ xfwm4/trunk/src/main.c  2009-01-21 19:02:13 UTC (rev 29288)
@@ -589,6 +589,7 @@
 exit (1);
 break;
 case 0:
+case 1:
 if (daemon_mode)
 {
 #ifdef HAVE_DAEMON
@@ -616,8 +617,6 @@
 }
 #endif /* !HAVE_DAEMON */
 }
-/* Walk through */
-case 1:
 /* enter GTK main loop */
 gtk_main ();
 break;

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29274 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-01-18 21:42:47 + (Sun, 18 Jan 2009)
New Revision: 29274

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/client.c
   xfwm4/trunk/src/events.c
   xfwm4/trunk/src/moveresize.c
   xfwm4/trunk/src/netwm.c
   xfwm4/trunk/src/placement.c
   xfwm4/trunk/src/screen.c
   xfwm4/trunk/src/screen.h
   xfwm4/trunk/src/tabwin.c
Log:
* src/client.c, src/events.c, src/moveresize.c, src/netwm.c,
  src/placement.c, src/screen.c, src/screen.h, src/tabwin.c: Cache
  the monitor geometry instead of just the monitor number, it's more
  efficient.

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-01-18 18:07:18 UTC (rev 29273)
+++ xfwm4/trunk/ChangeLog   2009-01-18 21:42:47 UTC (rev 29274)
@@ -1,3 +1,10 @@
+2009-01-18 olivier
+
+   * src/client.c, src/events.c, src/moveresize.c, src/netwm.c,
+ src/placement.c, src/screen.c, src/screen.h, src/tabwin.c: Cache
+ the monitor geometry instead of just the monitor number, it's more
+ efficient.
+
 2009-01-17 olivier
 
* settings-dialogs/xfwm4-settings.c, 

Modified: xfwm4/trunk/src/client.c
===
--- xfwm4/trunk/src/client.c2009-01-18 18:07:18 UTC (rev 29273)
+++ xfwm4/trunk/src/client.c2009-01-18 21:42:47 UTC (rev 29274)
@@ -2983,14 +2983,12 @@
 if (!FLAG_TEST (c-flags, CLIENT_FLAG_FULLSCREEN)  (c-size-flags  
PMaxSize))
 {
 GdkRectangle rect;
-gint monitor_nbr;
 int cx, cy;
 
 cx = frameX (c) + (frameWidth (c) / 2);
 cy = frameY (c) + (frameHeight (c) / 2);
 
-monitor_nbr = myScreenFindMonitorAtPoint (c-screen_info, cx, cy);
-gdk_screen_get_monitor_geometry (c-screen_info-gscr, monitor_nbr, 
rect);
+myScreenFindMonitorAtPoint (c-screen_info, cx, cy, rect);
 
 if ((c-size-max_width  rect.width) || (c-size-max_height  
rect.height))
 {
@@ -3117,7 +3115,6 @@
 GdkRectangle rect;
 int cx, cy, full_x, full_y, full_w, full_h;
 int tmp_x, tmp_y, tmp_w, tmp_h;
-gint monitor_nbr;
 
 tmp_x = frameX (c);
 tmp_y = frameY (c);
@@ -3129,8 +3126,7 @@
 
 screen_info = c-screen_info;
 
-monitor_nbr = myScreenFindMonitorAtPoint (screen_info, cx, cy);
-gdk_screen_get_monitor_geometry (screen_info-gscr, monitor_nbr, rect);
+myScreenFindMonitorAtPoint (screen_info, cx, cy, rect);
 
 full_x = MAX (screen_info-params-xfwm_margins[STRUTS_LEFT], rect.x);
 full_y = MAX (screen_info-params-xfwm_margins[STRUTS_TOP], rect.y);

Modified: xfwm4/trunk/src/events.c
===
--- xfwm4/trunk/src/events.c2009-01-18 18:07:18 UTC (rev 29273)
+++ xfwm4/trunk/src/events.c2009-01-18 21:42:47 UTC (rev 29274)
@@ -50,6 +50,7 @@
 #include client.h
 #include moveresize.h
 #include cycle.h
+#include placement.h
 #include stacking.h
 #include transients.h
 #include focus.h
@@ -2748,7 +2749,10 @@
  * is not valid anymore and potentially refers to a monitor that
  * was just removed, so invalidate it.
  */
-screen_info-cache_monitor = -1;
+screen_info-cache_monitor.x = -1;
+screen_info-cache_monitor.y = -1;
+screen_info-cache_monitor.width = 0;
+screen_info-cache_monitor.height = 0;
 
 /*
  * From the window manager point of view,

Modified: xfwm4/trunk/src/moveresize.c
===
--- xfwm4/trunk/src/moveresize.c2009-01-18 18:07:18 UTC (rev 29273)
+++ xfwm4/trunk/src/moveresize.c2009-01-18 21:42:47 UTC (rev 29274)
@@ -378,7 +378,6 @@
 int best_delta_x, best_delta_y;
 int c_frame_x1, c_frame_x2, c_frame_y1, c_frame_y2;
 GdkRectangle rect;
-gint monitor_nbr;
 
 g_return_if_fail (c != NULL);
 TRACE (entering clientSnapPosition);
@@ -405,8 +404,7 @@
 best_frame_x = frame_x;
 best_frame_y = frame_y;
 
-monitor_nbr = myScreenFindMonitorAtPoint (screen_info, cx, cy);
-gdk_screen_get_monitor_geometry (screen_info-gscr, monitor_nbr, rect);
+myScreenFindMonitorAtPoint (screen_info, cx, cy, rect);
 
 disp_x = rect.x;
 disp_y = rect.y;
@@ -1106,7 +1104,6 @@
 int frame_top, frame_left, frame_right, frame_bottom;
 int move_top, move_bottom, move_left, move_right;
 int temp;
-gint monitor_nbr;
 gint min_visible;
 gboolean resizing;
 
@@ -1149,8 +1146,7 @@
 || (passdata-handle == CORNER_COUNT + SIDE_LEFT)) ?
 1 : 0;
 
-monitor_nbr = myScreenFindMonitorAtPoint (screen_info, cx, cy);
-gdk_screen_get_monitor_geometry (screen_info-gscr, monitor_nbr, rect);
+myScreenFindMonitorAtPoint (screen_info, cx, cy, rect);
 
 disp_x = rect.x;
 disp_y = rect.y;

Modified: xfwm4/trunk/src/netwm.c
===
--- 

[Xfce4-commits] r29275 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-01-18 21:45:33 + (Sun, 18 Jan 2009)
New Revision: 29275

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/client.c
   xfwm4/trunk/src/client.h
   xfwm4/trunk/src/compositor.c
   xfwm4/trunk/src/compositor.h
   xfwm4/trunk/src/cycle.c
   xfwm4/trunk/src/cycle.h
   xfwm4/trunk/src/display.c
   xfwm4/trunk/src/display.h
   xfwm4/trunk/src/event_filter.c
   xfwm4/trunk/src/event_filter.h
   xfwm4/trunk/src/events.c
   xfwm4/trunk/src/events.h
   xfwm4/trunk/src/focus.c
   xfwm4/trunk/src/focus.h
   xfwm4/trunk/src/frame.c
   xfwm4/trunk/src/frame.h
   xfwm4/trunk/src/hints.c
   xfwm4/trunk/src/hints.h
   xfwm4/trunk/src/icons.c
   xfwm4/trunk/src/icons.h
   xfwm4/trunk/src/keyboard.c
   xfwm4/trunk/src/keyboard.h
   xfwm4/trunk/src/main.c
   xfwm4/trunk/src/menu.c
   xfwm4/trunk/src/menu.h
   xfwm4/trunk/src/misc.c
   xfwm4/trunk/src/misc.h
   xfwm4/trunk/src/moveresize.c
   xfwm4/trunk/src/moveresize.h
   xfwm4/trunk/src/mypixmap.c
   xfwm4/trunk/src/mypixmap.h
   xfwm4/trunk/src/mywindow.c
   xfwm4/trunk/src/mywindow.h
   xfwm4/trunk/src/netwm.c
   xfwm4/trunk/src/netwm.h
   xfwm4/trunk/src/parserc.c
   xfwm4/trunk/src/parserc.h
   xfwm4/trunk/src/placement.c
   xfwm4/trunk/src/placement.h
   xfwm4/trunk/src/poswin.c
   xfwm4/trunk/src/poswin.h
   xfwm4/trunk/src/screen.c
   xfwm4/trunk/src/screen.h
   xfwm4/trunk/src/session.c
   xfwm4/trunk/src/session.h
   xfwm4/trunk/src/settings.c
   xfwm4/trunk/src/settings.h
   xfwm4/trunk/src/spinning_cursor.c
   xfwm4/trunk/src/spinning_cursor.h
   xfwm4/trunk/src/stacking.c
   xfwm4/trunk/src/stacking.h
   xfwm4/trunk/src/startup_notification.c
   xfwm4/trunk/src/startup_notification.h
   xfwm4/trunk/src/stock_icons.c
   xfwm4/trunk/src/stock_icons.h
   xfwm4/trunk/src/tabwin.c
   xfwm4/trunk/src/tabwin.h
   xfwm4/trunk/src/terminate.c
   xfwm4/trunk/src/terminate.h
   xfwm4/trunk/src/transients.c
   xfwm4/trunk/src/transients.h
   xfwm4/trunk/src/ui_style.c
   xfwm4/trunk/src/ui_style.h
   xfwm4/trunk/src/wireframe.c
   xfwm4/trunk/src/wireframe.h
   xfwm4/trunk/src/workspaces.c
   xfwm4/trunk/src/workspaces.h
   xfwm4/trunk/src/xsync.c
   xfwm4/trunk/src/xsync.h
Log:
* src/*.c, src/*.h: Update year.

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-01-18 21:42:47 UTC (rev 29274)
+++ xfwm4/trunk/ChangeLog   2009-01-18 21:45:33 UTC (rev 29275)
@@ -1,5 +1,9 @@
 2009-01-18 olivier
 
+   * src/*.c, src/*.h: Update year.
+
+2009-01-18 olivier
+
* src/client.c, src/events.c, src/moveresize.c, src/netwm.c,
  src/placement.c, src/screen.c, src/screen.h, src/tabwin.c: Cache
  the monitor geometry instead of just the monitor number, it's more

Modified: xfwm4/trunk/src/client.c
===
--- xfwm4/trunk/src/client.c2009-01-18 21:42:47 UTC (rev 29274)
+++ xfwm4/trunk/src/client.c2009-01-18 21:45:33 UTC (rev 29275)
@@ -17,7 +17,7 @@
 
 
 oroborus - (c) 2001 Ken Lynch
-xfwm4- (c) 2002-2008 Olivier Fourdan
+xfwm4- (c) 2002-2009 Olivier Fourdan
 
  */
 

Modified: xfwm4/trunk/src/client.h
===
--- xfwm4/trunk/src/client.h2009-01-18 21:42:47 UTC (rev 29274)
+++ xfwm4/trunk/src/client.h2009-01-18 21:45:33 UTC (rev 29275)
@@ -17,7 +17,7 @@
 
 
 oroborus - (c) 2001 Ken Lynch
-xfwm4- (c) 2002-2008 Olivier Fourdan
+xfwm4- (c) 2002-2009 Olivier Fourdan
 
  */
 

Modified: xfwm4/trunk/src/compositor.c
===
--- xfwm4/trunk/src/compositor.c2009-01-18 21:42:47 UTC (rev 29274)
+++ xfwm4/trunk/src/compositor.c2009-01-18 21:45:33 UTC (rev 29275)
@@ -18,7 +18,7 @@
 
 xcompmgr - (c) 2003 Keith Packard
 metacity - (c) 2003, 2004 Red Hat, Inc.
-xfwm4- (c) 2005-2008 Olivier Fourdan
+xfwm4- (c) 2005-2009 Olivier Fourdan
 
 */
 

Modified: xfwm4/trunk/src/compositor.h
===
--- xfwm4/trunk/src/compositor.h2009-01-18 21:42:47 UTC (rev 29274)
+++ xfwm4/trunk/src/compositor.h2009-01-18 21:45:33 UTC (rev 29275)
@@ -17,7 +17,7 @@
 
 
 xcompmgr - (c) 2003 Keith Packard
-xfwm4- (c) 2005-2008 Olivier Fourdan
+xfwm4- (c) 2005-2009 Olivier Fourdan
 
  */
 

Modified: xfwm4/trunk/src/cycle.c
===
--- xfwm4/trunk/src/cycle.c 2009-01-18 21:42:47 UTC (rev 29274)
+++ xfwm4/trunk/src/cycle.c 2009-01-18 21:45:33 UTC (rev 29275)
@@ -17,7 +17,7 @@
 
 
 oroborus - (c) 2001 Ken Lynch
-xfwm4- (c) 2002-2008 Olivier Fourdan
+xfwm4- (c) 2002-2009 Olivier Fourdan
 
  */
 

Modified: xfwm4/trunk/src/cycle.h

[Xfce4-commits] r29276 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-01-18 21:51:46 + (Sun, 18 Jan 2009)
New Revision: 29276

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/screen.c
Log:
* src/screen.c: Use G_MAXINT as default to make sure it's off bound.

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-01-18 21:45:33 UTC (rev 29275)
+++ xfwm4/trunk/ChangeLog   2009-01-18 21:51:46 UTC (rev 29276)
@@ -1,5 +1,9 @@
 2009-01-18 olivier
 
+   * src/screen.c: Use G_MAXINT as default to make sure it's off bound.
+
+2009-01-18 olivier
+
* src/*.c, src/*.h: Update year.
 
 2009-01-18 olivier

Modified: xfwm4/trunk/src/screen.c
===
--- xfwm4/trunk/src/screen.c2009-01-18 21:45:33 UTC (rev 29275)
+++ xfwm4/trunk/src/screen.c2009-01-18 21:51:46 UTC (rev 29276)
@@ -569,10 +569,10 @@
 {
 g_return_if_fail (screen_info != NULL);
 
-screen_info-cache_monitor.x = -1;
-screen_info-cache_monitor.y = -1;
-screen_info-cache_monitor.width = -1;
-screen_info-cache_monitor.height = -1;
+screen_info-cache_monitor.x = G_MAXINT;
+screen_info-cache_monitor.y = G_MAXINT;
+screen_info-cache_monitor.width = 0;
+screen_info-cache_monitor.height = 0;
 }
 
 /*
@@ -584,7 +584,7 @@
 {
 gint dx, dy, center_x, center_y, num_monitors, i;
 guint32 distsquare, min_distsquare;
-GdkRectangle monitor, nearest_monitor = { 0, 0, 0, 0 };
+GdkRectangle monitor, nearest_monitor = { G_MAXINT, G_MAXINT, 0, 0 };
 
 g_return_if_fail (screen_info != NULL);
 g_return_if_fail (rect != NULL);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29267 - in xfwm4/trunk: . settings-dialogs

[Olivier Fourdan]

Author: olivier
Date: 2009-01-17 13:57:48 + (Sat, 17 Jan 2009)
New Revision: 29267

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade
   xfwm4/trunk/settings-dialogs/xfwm4-settings.c
Log:
* settings-dialogs/xfwm4-settings.c, 
  settings-dialogs/xfwm4-dialog.glade: Make focus delay insensitive
  in click to focus mode. 
 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-01-16 17:44:57 UTC (rev 29266)
+++ xfwm4/trunk/ChangeLog   2009-01-17 13:57:48 UTC (rev 29267)
@@ -1,3 +1,9 @@
+2009-01-17 olivier
+
+   * settings-dialogs/xfwm4-settings.c, 
+ settings-dialogs/xfwm4-dialog.glade: Make focus delay insensitive
+ in click to focus mode.
+
 2009-01-16 olivier
 
* src/misc.h, src/misc.c, src/screen.h, src/screen.c, src/events.c,

Modified: xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade
===
--- xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade 2009-01-16 17:44:57 UTC 
(rev 29266)
+++ xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade 2009-01-17 13:57:48 UTC 
(rev 29267)
@@ -573,7 +573,7 @@
 property name=visibleTrue/property
 property name=left_padding12/property
 child
-  widget class=GtkHBox id=hbox6
+  widget class=GtkHBox 
id=focus_delay_hbox
 property name=visibleTrue/property
 property name=spacing12/property
 child

Modified: xfwm4/trunk/settings-dialogs/xfwm4-settings.c
===
--- xfwm4/trunk/settings-dialogs/xfwm4-settings.c   2009-01-16 17:44:57 UTC 
(rev 29266)
+++ xfwm4/trunk/settings-dialogs/xfwm4-settings.c   2009-01-17 13:57:48 UTC 
(rev 29267)
@@ -1602,6 +1602,7 @@
 {
   GtkWidget *click_to_focus_radio;
   GtkWidget *focus_follows_mouse_radio;
+  GtkWidget *focus_delay_hbox;
 
   g_return_if_fail (XFWM_IS_SETTINGS (settings));
   g_return_if_fail (GLADE_IS_XML (settings-priv-glade_xml));
@@ -1610,6 +1611,8 @@
click_to_focus_radio);
   focus_follows_mouse_radio = glade_xml_get_widget (settings-priv-glade_xml,
 
focus_follows_mouse_radio);
+  focus_delay_hbox = glade_xml_get_widget (settings-priv-glade_xml,
+   focus_delay_hbox);
 
   if (G_UNLIKELY (G_VALUE_TYPE (value) != G_TYPE_BOOLEAN))
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (click_to_focus_radio), 
TRUE);
@@ -1620,10 +1623,14 @@
   else
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON 
(focus_follows_mouse_radio), TRUE);
 }
+  gtk_widget_set_sensitive (GTK_WIDGET (focus_delay_hbox),
+gtk_toggle_button_get_active (
+  GTK_TOGGLE_BUTTON 
(focus_follows_mouse_radio)));
 }
 
 
 
+
 static void
 xfwm_settings_initialize_shortcuts (XfwmSettings *settings)
 {

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29263 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-01-16 12:54:57 + (Fri, 16 Jan 2009)
New Revision: 29263

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/client.c
   xfwm4/trunk/src/events.c
   xfwm4/trunk/src/menu.c
   xfwm4/trunk/src/misc.c
   xfwm4/trunk/src/misc.h
   xfwm4/trunk/src/moveresize.c
   xfwm4/trunk/src/netwm.c
   xfwm4/trunk/src/placement.c
   xfwm4/trunk/src/screen.c
   xfwm4/trunk/src/screen.h
   xfwm4/trunk/src/tabwin.c
Log:
* src/misc.h, src/misc.c, src/screen.h, src/screen.c, src/events.c,
  src/menu.c, src/tabwin.c, src/placement.c, src/client.c, 
  src/moveresize.c, src/netwm.c: Need to invalidate our internal 
  monitor caching when adding/removing monitors with randr 1.2 
 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-01-15 14:16:34 UTC (rev 29262)
+++ xfwm4/trunk/ChangeLog   2009-01-16 12:54:57 UTC (rev 29263)
@@ -1,3 +1,10 @@
+2009-01-16 olivier
+
+   * src/misc.h, src/misc.c, src/screen.h, src/screen.c, src/events.c,
+ src/menu.c, src/tabwin.c, src/placement.c, src/client.c, 
+ src/moveresize.c, src/netwm.c: Need to invalidate our internal 
+ monitor caching when adding/removing monitors with randr 1.2
+
 2009-01-14 jannis
 
* configure.in.in: Post-release version bump.

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-01-15 14:16:34 UTC (rev 29262)
+++ xfwm4/trunk/NEWS2009-01-16 12:54:57 UTC (rev 29263)
@@ -1,6 +1,11 @@
 4.5.99.1 (Xfce 4.6rc1)
 ==
 
+- Fix a crash when removing a monitor with xrandr 1.2
+
+4.5.93 (Xfce 4.6beta3)
+==
+
 - Work around a problem affecting the use of the Super key as modifier for 
   moving windows (Bug #4632).
 - Fix smart placement not working for windows with height or width larger than 

Modified: xfwm4/trunk/src/client.c
===
--- xfwm4/trunk/src/client.c2009-01-15 14:16:34 UTC (rev 29262)
+++ xfwm4/trunk/src/client.c2009-01-16 12:54:57 UTC (rev 29263)
@@ -2989,7 +2989,7 @@
 cx = frameX (c) + (frameWidth (c) / 2);
 cy = frameY (c) + (frameHeight (c) / 2);
 
-monitor_nbr = find_monitor_at_point (c-screen_info-gscr, cx, cy);
+monitor_nbr = myScreenFindMonitorAtPoint (c-screen_info, cx, cy);
 gdk_screen_get_monitor_geometry (c-screen_info-gscr, monitor_nbr, 
rect);
 
 if ((c-size-max_width  rect.width) || (c-size-max_height  
rect.height))
@@ -3129,7 +3129,7 @@
 
 screen_info = c-screen_info;
 
-monitor_nbr = find_monitor_at_point (screen_info-gscr, cx, cy);
+monitor_nbr = myScreenFindMonitorAtPoint (screen_info, cx, cy);
 gdk_screen_get_monitor_geometry (screen_info-gscr, monitor_nbr, rect);
 
 full_x = MAX (screen_info-params-xfwm_margins[STRUTS_LEFT], rect.x);

Modified: xfwm4/trunk/src/events.c
===
--- xfwm4/trunk/src/events.c2009-01-15 14:16:34 UTC (rev 29262)
+++ xfwm4/trunk/src/events.c2009-01-16 12:54:57 UTC (rev 29263)
@@ -2736,14 +2736,26 @@
 static void
 monitors_changed_cb(GdkScreen *gscreen, gpointer data)
 {
+ScreenInfo *screen_info;
+
 TRACE (entering monitors_changed_cb);
 
+screen_info = (ScreenInfo *) data;
+g_return_if_fail (screen_info);
+
+/* We have added/removed a monitor or even changed the layout,
+ * the cache for monitor position we use in our screen structure
+ * is not valid anymore and potentially refers to a monitor that
+ * was just removed, so invalidate it.
+ */
+screen_info-cache_monitor = -1;
+
 /*
  * From the window manager point of view,
  * a XRand 1.2 monitor change is similar to
  * a screen size change.
  */
-size_changed_cb(gscreen, data);
+size_changed_cb (gscreen, data);
 }
 
 void
@@ -2756,15 +2768,15 @@
   button_press_event, GTK_SIGNAL_FUNC 
(show_popup_cb), (gpointer) NULL);
 g_signal_connect (GTK_OBJECT (myScreenGetGtkWidget (screen_info)), 
client_event,
   GTK_SIGNAL_FUNC (client_event_cb), (gpointer) 
(screen_info-display_info));
-g_signal_connect(G_OBJECT(screen_info-gscr), size-changed,
- G_CALLBACK(size_changed_cb),
- (gpointer) (screen_info));
+g_signal_connect (G_OBJECT(screen_info-gscr), size-changed,
+  G_CALLBACK(size_changed_cb),
+  (gpointer) (screen_info));
 if(gtk_major_version  2 || (gtk_major_version == 2  gtk_minor_version 
= 13))
 {
 TRACE (connect \monitors-changed\ cb);
-g_signal_connect(G_OBJECT(screen_info-gscr), monitors-changed,
- G_CALLBACK(monitors_changed_cb),
- (gpointer) (screen_info));
+

[Xfce4-commits] r29187 - xfwm4/trunk

[Olivier Fourdan]

Author: olivier
Date: 2009-01-12 08:44:51 + (Mon, 12 Jan 2009)
New Revision: 29187

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
Log:
* NEWS: Typos

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-01-11 22:40:55 UTC (rev 29186)
+++ xfwm4/trunk/ChangeLog   2009-01-12 08:44:51 UTC (rev 29187)
@@ -1,3 +1,7 @@
+2009-01-12  olivier
+
+   * NEWS: Typos
+
 2009-01-11  olivier
 
* src/focus.c: Do not place unfocused windows on top of the focused

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-01-11 22:40:55 UTC (rev 29186)
+++ xfwm4/trunk/NEWS2009-01-12 08:44:51 UTC (rev 29187)
@@ -1,7 +1,7 @@
 4.5.99.1 (Xfce 4.6rc1)
 ==
 
-- Work arround a problem affecting the use of the Super key as modifier for 
+- Work around a problem affecting the use of the Super key as modifier for 
   moving windows (Bug #4632).
 - Fix smart placement not working for windows with height or width larger than 
   actual screen size (Bug# 3126).
@@ -101,7 +101,7 @@
   frames at once.
 - Use timeout for frame redraw, check actual WM name changes to work around
   apps that falsely update their WM name property (Bug #2810).
-- Uodate Hungarian translation
+- Update Hungarian translation
 - Update Catalan translation
 - Update Italian translation
 - Update Polish translation
@@ -138,7 +138,7 @@
 - Update the NET_WM_STATE when the client requests an update of
   NET_WM_STATE_DEMANDS_ATTENTION (Bug #2678)
 - Focus the internal fallback window
-  when focus is transfered to a window that doesn't have InputHint set but
+  when focus is transferred to a window that doesn't have InputHint set but
   still use WM_PROTOCOLS_TAKE_FOCUS (ie, there is no way for the window
   manager to tell whether or not the client will accept focus in the end
   since focus is set by the client alone through the 'take focus' mechanism)
@@ -150,7 +150,7 @@
   started un-focused (Bug #2664), re-add some traces (which compile with
   -Werror this time), small code/api cleanup.
 - Remove shadow on dock-type windows (bug #2648)
-- Prevent fullscreen windows from beeing maximized (Bug #2663).
+- Prevent fullscreen windows from being maximized (Bug #2663).
 - Use timestamp provided by NET_ACTIVE_WINDOW and NET_CURRENT_DESKTOP messages
   from EWMH version 1.3 and above, fix focus transition with
   NET_CURRENT_DESKTOP messages causing either flickering or wrong restacking
@@ -181,7 +181,7 @@
 - Hide as more windows when showing desktop (Bug #2518)
 - Don't skip windows that have the skip pager/taskbar properties when
   searching for windows below the pointer (bug #2550)
-- Fix focus transitionning to root taking into account the pending focus too,
+- Fix focus transitioning to root taking into account the pending focus too,
   so that focus doesn't return to the fallback internal window when it should
   return to some other client window (like when an application closes with a
   modal dialog opened).
@@ -273,5 +273,5 @@
 4.3.90.1 (beta1)
 
 
-- First public release
+- First public release for xfce-4.4
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29163 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-01-11 16:29:13 + (Sun, 11 Jan 2009)
New Revision: 29163

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/focus.c
Log:
* src/focus.c: Do not place unfocused windows on top of the focused
  window, when not focusing new windows (Bug #4795)

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2009-01-11 16:02:32 UTC (rev 29162)
+++ xfwm4/trunk/ChangeLog   2009-01-11 16:29:13 UTC (rev 29163)
@@ -1,3 +1,8 @@
+2009-01-11  olivier
+
+   * src/focus.c: Do not place unfocused windows on top of the focused
+ window, when not focusing new windows (Bug #4795)
+
 2009-01-07  olivier
 
* settings-dialogs/xfwm4-settings.c: Remove markup not supported

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2009-01-11 16:02:32 UTC (rev 29162)
+++ xfwm4/trunk/NEWS2009-01-11 16:29:13 UTC (rev 29163)
@@ -8,11 +8,13 @@
 - Remove maximization if a client updates its size max size hint (Bug #4706).
 - String review by Josh Saddler nightmo...@gentoo.org (Bug #4703).
 - Fix fill horizontally and vertically not working as expected (Bug #4712).
-- Prevent fill from expanding beyound physical monitor.
+- Prevent fill from expanding beyond physical monitor.
 - Do not mark gtk+ stock labels as translatable (Bug #4722).
 - Change default shadow radius and position.
 - Fix some controls not being localized (Bug #4740).
 - Remove markup not supported by xfce_message_dialog() (Bug #4786).
+- Avoid placing unfocused windows on top of the current focused window when 
not 
+  focusing new windows (Bug #4795).
 
 4.5.92 (Xfce 4.6beta2)
 ==

Modified: xfwm4/trunk/src/focus.c
===
--- xfwm4/trunk/src/focus.c 2009-01-11 16:02:32 UTC (rev 29162)
+++ xfwm4/trunk/src/focus.c 2009-01-11 16:29:13 UTC (rev 29163)
@@ -199,10 +199,13 @@
 {
 Client *c2 = clientGetFocus();
 
-if ((prevented)  (c2 != NULL)  (c2-win_layer == c-win_layer))
+if ((c2 != NULL)  (c2-win_layer == c-win_layer))
 {
-TRACE (clientFocusNew: Setting WM_STATE_DEMANDS_ATTENTION flag on 
\%s\ (0x%lx), c-name, c-window);
-FLAG_SET (c-flags, CLIENT_FLAG_DEMANDS_ATTENTION);
+if (prevented)
+{
+TRACE (clientFocusNew: Setting WM_STATE_DEMANDS_ATTENTION 
flag on \%s\ (0x%lx), c-name, c-window);
+FLAG_SET (c-flags, CLIENT_FLAG_DEMANDS_ATTENTION);
+}
 clientSortRing(c);
 clientLower (c, c2-frame);
 clientSortRing(c2);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29104 - xfce-mcs-plugins/branches/xfce_4_4/plugins/ui_plugin

[Olivier Fourdan]

Author: olivier
Date: 2009-01-06 08:52:02 + (Tue, 06 Jan 2009)
New Revision: 29104

Modified:
   xfce-mcs-plugins/branches/xfce_4_4/plugins/ui_plugin/ui_plugin.c
Log:
Fix capitalization - patch from Michael Gilbbert michael.s.gilb...@gmail.com 
(bug #3286)

Modified: xfce-mcs-plugins/branches/xfce_4_4/plugins/ui_plugin/ui_plugin.c
===
--- xfce-mcs-plugins/branches/xfce_4_4/plugins/ui_plugin/ui_plugin.c
2009-01-06 00:25:06 UTC (rev 29103)
+++ xfce-mcs-plugins/branches/xfce_4_4/plugins/ui_plugin/ui_plugin.c
2009-01-06 08:52:02 UTC (rev 29104)
@@ -1183,7 +1183,7 @@
 create_channel(mcs_plugin);
 mcs_plugin-plugin_name = g_strdup(PLUGIN_NAME);
 /* the button label in the xfce-mcs-manager dialog */
-mcs_plugin-caption = g_strdup(Q_ (Button Label|User interface));
+mcs_plugin-caption = g_strdup(Q_ (Button Label|User Interface));
 mcs_plugin-run_dialog = run_dialog;
 mcs_manager_notify(mcs_plugin-manager, CHANNEL);
 mcs_plugin-icon = xfce_themed_icon_load (xfce4-ui, 48);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

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

[Olivier Fourdan]

Author: olivier
Date: 2008-12-24 18:17:20 + (Wed, 24 Dec 2008)
New Revision: 29046

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/defaults/defaults
   xfwm4/trunk/src/compositor.c
   xfwm4/trunk/themes/default/themerc
Log:
* src/compositor.c, default/defaults, themes/default/themerc: Increase
  shadow radius, center shadow by default.

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-12-23 12:26:16 UTC (rev 29045)
+++ xfwm4/trunk/ChangeLog   2008-12-24 18:17:20 UTC (rev 29046)
@@ -1,3 +1,8 @@
+2008-12-24  olivier
+
+   * src/compositor.c, default/defaults, themes/default/themerc: Increase
+ shadow radius, center shadow by default.
+
 2008-12-16  olivier
 
* settings-dialogs/xfwm4-workspace-dialog.glade,

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2008-12-23 12:26:16 UTC (rev 29045)
+++ xfwm4/trunk/NEWS2008-12-24 18:17:20 UTC (rev 29046)
@@ -10,6 +10,7 @@
 - Fix fill horizontally and vertically not working as expected (Bug #4712).
 - Prevent fill from expanding beyound physical monitor.
 - Do not mark gtk+ stock labels as translatable (Bug #4722).
+- Change default shadow radius and position.
 
 4.5.92 (Xfce 4.6beta2)
 ==

Modified: xfwm4/trunk/defaults/defaults
===
--- xfwm4/trunk/defaults/defaults   2008-12-23 12:26:16 UTC (rev 29045)
+++ xfwm4/trunk/defaults/defaults   2008-12-24 18:17:20 UTC (rev 29046)
@@ -36,8 +36,8 @@
 shadow_delta_height=0
 shadow_delta_width=0
 shadow_delta_x=0
-shadow_delta_y=0
-shadow_opacity=66
+shadow_delta_y=-3
+shadow_opacity=50
 show_app_icon=false
 show_dock_shadow=true
 show_frame_shadow=false

Modified: xfwm4/trunk/src/compositor.c
===
--- xfwm4/trunk/src/compositor.c2008-12-23 12:26:16 UTC (rev 29045)
+++ xfwm4/trunk/src/compositor.c2008-12-24 18:17:20 UTC (rev 29046)
@@ -50,15 +50,15 @@
 #include X11/extensions/Xrender.h
 
 #ifndef SHADOW_RADIUS
-#define SHADOW_RADIUS   6
+#define SHADOW_RADIUS   12
 #endif /* SHADOW_RADIUS */
 
 #ifndef SHADOW_OFFSET_X
-#define SHADOW_OFFSET_X (SHADOW_RADIUS * -3 /2)
+#define SHADOW_OFFSET_X (-3 * SHADOW_RADIUS / 2)
 #endif /* SHADOW_OFFSET_X */
 
 #ifndef SHADOW_OFFSET_Y
-#define SHADOW_OFFSET_Y (SHADOW_RADIUS * -5 / 4)
+#define SHADOW_OFFSET_Y (-3 * SHADOW_RADIUS / 2)
 #endif /* SHADOW_OFFSET_Y */
 
 /* Some convenient macros */

Modified: xfwm4/trunk/themes/default/themerc
===
--- xfwm4/trunk/themes/default/themerc  2008-12-23 12:26:16 UTC (rev 29045)
+++ xfwm4/trunk/themes/default/themerc  2008-12-24 18:17:20 UTC (rev 29046)
@@ -3,11 +3,11 @@
 button_spacing=-1
 full_width_title=false
 maximized_offset=0
-shadow_delta_height=4
+shadow_delta_height=2
 shadow_delta_width=1
 shadow_delta_x=1
 shadow_delta_y=1
-shadow_opacity=90
+shadow_opacity=60
 show_app_icon=true
 title_horizontal_offset=1
 title_shadow_active=frame

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29045 - xfwm4/trunk/themes/kokodi

[Olivier Fourdan]

Author: olivier
Date: 2008-12-23 12:26:16 + (Tue, 23 Dec 2008)
New Revision: 29045

Modified:
   xfwm4/trunk/themes/kokodi/themerc
Log:
Play with shadow params

Modified: xfwm4/trunk/themes/kokodi/themerc
===
--- xfwm4/trunk/themes/kokodi/themerc   2008-12-23 12:18:06 UTC (rev 29044)
+++ xfwm4/trunk/themes/kokodi/themerc   2008-12-23 12:26:16 UTC (rev 29045)
@@ -3,10 +3,11 @@
 button_spacing=0
 full_width_title=false
 maximized_offset=0
-shadow_delta_height=-2
-shadow_delta_width=-2
-shadow_delta_x=-2
-shadow_delta_y=-2
+shadow_delta_height=8
+shadow_delta_width=2
+shadow_delta_x=2
+shadow_delta_y=0
+shadow_opacity=50
 show_app_icon=true
 title_horizontal_offset=1
 title_shadow_active=frame

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29029 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2008-12-16 22:16:01 + (Tue, 16 Dec 2008)
New Revision: 29029

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/placement.c
Log:
* src/placement.c: Prevent fill from expanding beyound physical 
  monitor.

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-12-16 18:38:14 UTC (rev 29028)
+++ xfwm4/trunk/ChangeLog   2008-12-16 22:16:01 UTC (rev 29029)
@@ -1,3 +1,8 @@
+2008-12-16  olivier
+
+   * src/placement.c: Prevent fill from expanding beyound physical 
+ monitor.
+
 2008-12-14  olivier
 
* src/placement.c, src/placement.h, src/client.c, src/client.h:

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2008-12-16 18:38:14 UTC (rev 29028)
+++ xfwm4/trunk/NEWS2008-12-16 22:16:01 UTC (rev 29029)
@@ -8,6 +8,7 @@
 - Remove maximization if a client updates its size max size hint (Bug #4706).
 - String review by Josh Saddler nightmo...@gentoo.org (Bug #4703).
 - Fix fill horizontally and vertically not working as expected (Bug #4712).
+- Prevent fill from expanding beyound physical monitor.
 
 4.5.92 (Xfce 4.6beta2)
 ==

Modified: xfwm4/trunk/src/placement.c
===
--- xfwm4/trunk/src/placement.c 2008-12-16 18:38:14 UTC (rev 29028)
+++ xfwm4/trunk/src/placement.c 2008-12-16 22:16:01 UTC (rev 29029)
@@ -918,43 +918,47 @@
 }
 
 /* If there are neighbours, resize to their borders.
- * If not, resize to the largest size available taht you just have 
computed.
+ * If not, resize to the largest size available that you just have 
computed.
  */
 
+wc.x = frameLeft(c);
 if (east_neighbour)
 {
-wc.x = frameX(east_neighbour) + frameWidth(east_neighbour) + 
frameLeft(c);
+wc.x += MAX (frameX(east_neighbour) + frameWidth(east_neighbour), 
full_x);
 }
 else
 {
-wc.x = full_x + frameLeft(c);
+wc.x += full_x;
 }
 
+wc.width = full_x - frameRight(c) - wc.x;
 if (west_neighbour)
 {
-wc.width = full_x + frameX(west_neighbour) - frameRight(c) - wc.x;
+wc.width += MIN (frameX(west_neighbour), full_w);
 }
 else
 {
-wc.width = full_x + full_w - frameRight(c) - wc.x;
+wc.width += full_w;
 }
 
+wc.y = frameTop(c);
 if (north_neighbour)
 {
-wc.y = frameY(north_neighbour) + frameHeight(north_neighbour) + 
frameTop(c);
+wc.y += MAX (frameY(north_neighbour) + frameHeight(north_neighbour), 
full_y);
 }
 else
 {
-wc.y = full_y + frameTop(c);
+wc.y += full_y;
 }
 
+wc.height = full_y - frameBottom(c) - wc.y;
 if (south_neighbour)
 {
-wc.height = full_y + frameY(south_neighbour) - frameBottom(c) - wc.y;
+wc.height += MIN (frameY(south_neighbour), full_h);
 }
 else
 {
-wc.height = full_y + full_h - frameBottom(c) - wc.y;
+wc.height += full_h;
 }
 
 TRACE (Fill size request: (%d,%d) %dx%d, wc.x, wc.y, wc.width, 
wc.height);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r29030 - in xfwm4/trunk: . settings-dialogs

[Olivier Fourdan]

Author: olivier
Date: 2008-12-16 22:25:58 + (Tue, 16 Dec 2008)
New Revision: 29030

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade
   xfwm4/trunk/settings-dialogs/xfwm4-tweaks-dialog.glade
   xfwm4/trunk/settings-dialogs/xfwm4-workspace-dialog.glade
Log:
* settings-dialogs/xfwm4-workspace-dialog.glade,
  settings-dialogs/xfwm4-tweaks-dialog.glade,
  settings-dialogs/xfwm4-dialog.glade: Do not mark gtk+ stock labels as
  translatable (Bug #4722)

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-12-16 22:16:01 UTC (rev 29029)
+++ xfwm4/trunk/ChangeLog   2008-12-16 22:25:58 UTC (rev 29030)
@@ -1,5 +1,12 @@
 2008-12-16  olivier
 
+   * settings-dialogs/xfwm4-workspace-dialog.glade,
+ settings-dialogs/xfwm4-tweaks-dialog.glade,
+ settings-dialogs/xfwm4-dialog.glade: Do not mark gtk+ stock labels as
+ translatable (Bug #4722)
+
+2008-12-16  olivier
+
* src/placement.c: Prevent fill from expanding beyound physical 
  monitor.
 

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2008-12-16 22:16:01 UTC (rev 29029)
+++ xfwm4/trunk/NEWS2008-12-16 22:25:58 UTC (rev 29030)
@@ -9,6 +9,7 @@
 - String review by Josh Saddler nightmo...@gentoo.org (Bug #4703).
 - Fix fill horizontally and vertically not working as expected (Bug #4712).
 - Prevent fill from expanding beyound physical monitor.
+- Do not mark gtk+ stock labels as translatable (Bug #4722).
 
 4.5.92 (Xfce 4.6beta2)
 ==

Modified: xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade
===
--- xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade 2008-12-16 22:16:01 UTC 
(rev 29029)
+++ xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade 2008-12-16 22:25:58 UTC 
(rev 29030)
@@ -445,7 +445,7 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property 
name=receives_defaultTrue/property
-property name=label 
translatable=yesgtk-clear/property
+property name=labelgtk-clear/property
 property name=use_stockTrue/property
 property name=response_id0/property
   /widget
@@ -1254,7 +1254,7 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
-property name=label translatable=yes 
context=yesgtk-help/property
+property name=label context=yesgtk-help/property
 property name=use_stockTrue/property
 property name=response_id0/property
   /widget
@@ -1264,7 +1264,7 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
-property name=label translatable=yes 
context=yesgtk-close/property
+property name=label context=yesgtk-close/property
 property name=use_stockTrue/property
 property name=response_id0/property
   /widget

Modified: xfwm4/trunk/settings-dialogs/xfwm4-tweaks-dialog.glade
===
--- xfwm4/trunk/settings-dialogs/xfwm4-tweaks-dialog.glade  2008-12-16 
22:16:01 UTC (rev 29029)
+++ xfwm4/trunk/settings-dialogs/xfwm4-tweaks-dialog.glade  2008-12-16 
22:25:58 UTC (rev 29030)
@@ -1069,7 +1069,7 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
-property name=label translatable=yes 
context=yesgtk-help/property
+property name=label context=yesgtk-help/property
 property name=use_stockTrue/property
 property name=response_id0/property
   /widget
@@ -1079,7 +1079,7 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
-property name=label translatable=yes 
context=yesgtk-close/property
+property name=label context=yesgtk-close/property
 property name=use_stockTrue/property
 property name=response_id0/property
   /widget

Modified: xfwm4/trunk/settings-dialogs/xfwm4-workspace-dialog.glade
===
--- 

[Xfce4-commits] r29025 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2008-12-14 21:55:28 + (Sun, 14 Dec 2008)
New Revision: 29025

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/client.c
   xfwm4/trunk/src/client.h
   xfwm4/trunk/src/placement.c
   xfwm4/trunk/src/placement.h
Log:
* src/placement.c, src/placement.h, src/client.c, src/client.h:
  Fix fill horizontally and vertically not working as expected 
  (Bug #4712)

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-12-14 12:29:48 UTC (rev 29024)
+++ xfwm4/trunk/ChangeLog   2008-12-14 21:55:28 UTC (rev 29025)
@@ -1,5 +1,11 @@
 2008-12-14  olivier
 
+   * src/placement.c, src/placement.h, src/client.c, src/client.h:
+ Fix fill horizontally and vertically not working as expected 
+ (Bug #4712)
+
+2008-12-14  olivier
+
* settings-dialogs/xfwm4-dialog.glade, 
  settings-dialogs/xfwm4-tweaks-dialog.glade: String review by 
  Josh Saddler nightmo...@gentoo.org (Bug #4703)

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2008-12-14 12:29:48 UTC (rev 29024)
+++ xfwm4/trunk/NEWS2008-12-14 21:55:28 UTC (rev 29025)
@@ -7,6 +7,7 @@
   actual screen size (Bug# 3126).
 - Remove maximization if a client updates its size max size hint (Bug #4706).
 - String review by Josh Saddler nightmo...@gentoo.org (Bug #4703).
+- Fix fill horizontally and vertically not working as expected (Bug #4712).
 
 4.5.92 (Xfce 4.6beta2)
 ==

Modified: xfwm4/trunk/src/client.c
===
--- xfwm4/trunk/src/client.c2008-12-14 12:29:48 UTC (rev 29024)
+++ xfwm4/trunk/src/client.c2008-12-14 21:55:28 UTC (rev 29025)
@@ -3235,224 +3235,6 @@
 }
 
 void
-clientFill (Client * c, int fill_type)
-{
-ScreenInfo *screen_info;
-DisplayInfo *display_info;
-Client *east_neighbour;
-Client *west_neighbour;
-Client *north_neighbour;
-Client *south_neighbour;
-Client *c2;
-GdkRectangle rect;
-XWindowChanges wc;
-unsigned short mask;
-int i, cx, cy, full_x, full_y, full_w, full_h;
-int tmp_x, tmp_y, tmp_w, tmp_h;
-gint monitor_nbr;
-
-g_return_if_fail (c != NULL);
-
-if (!CLIENT_CAN_FILL_WINDOW (c))
-{
-return;
-}
-
-screen_info = c-screen_info;
-display_info = screen_info-display_info;
-mask = 0;
-east_neighbour = NULL;
-west_neighbour = NULL;
-north_neighbour = NULL;
-south_neighbour = NULL;
-
-for (c2 = screen_info-clients, i = 0; i  screen_info-client_count; c2 = 
c2-next, i++)
-{
-
-/* Filter out all windows which are not visible, or not on the same 
layer
- * as well as the client window itself
- */
-if ((c != c2)  FLAG_TEST (c2-xfwm_flags, XFWM_FLAG_VISIBLE)  
(c2-win_layer == c-win_layer))
-{
-/* Fill horizontally */
-if (fill_type  CLIENT_FILL_HORIZ)
-{
-/*
- * check if the neigbour client (c2) is located
- * east or west of our client.
- */
-if (!(((frameY(c) + frameHeight(c))  (frameY(c2) - 
frameTop(c2))) || ((frameY(c2) + frameHeight(c2))  (frameY(c) - frameTop(c)
-{
-if ((frameX(c2) + frameWidth(c2))  frameX(c))
-{
-if (east_neighbour)
-{
-/* Check if c2 is closer to the client
- * then the east neighbour already found
- */
-if ((frameX(east_neighbour) + 
frameWidth(east_neighbour))  (frameX(c2) + frameWidth(c2)))
-{
-east_neighbour = c2;
-}
-}
-else
-{
-east_neighbour = c2;
-}
-}
-if ((frameX(c) + frameWidth(c))  frameX(c2))
-{
-/* Check if c2 is closer to the client
- * then the west neighbour already found
- */
-if (west_neighbour)
-{
-if (frameX(c2)  frameX(west_neighbour))
-{
-west_neighbour = c2;
-}
-}
-else
-{
-west_neighbour = c2;
-}
-}
-}
-}
-
-/* Fill vertically */
-if (fill_type  CLIENT_FILL_VERT)
-{
-

[Xfce4-commits] r29015 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2008-12-12 23:58:50 + (Fri, 12 Dec 2008)
New Revision: 29015

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/client.c
Log:
* src/client.c: Remove maximization if a client updates its size max
  size hint (Bug #4706)

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-12-12 11:54:53 UTC (rev 29014)
+++ xfwm4/trunk/ChangeLog   2008-12-12 23:58:50 UTC (rev 29015)
@@ -1,3 +1,8 @@
+2008-12-12  olivier
+
+   * src/client.c: Remove maximization if a client updates its size max
+ size hint (Bug #4706)
+
 2008-12-11  olivier
 
* settings-dialogs/monitor-icon.svg, settings-dialogs/monitor-icon.png,

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2008-12-12 11:54:53 UTC (rev 29014)
+++ xfwm4/trunk/NEWS2008-12-12 23:58:50 UTC (rev 29015)
@@ -4,7 +4,8 @@
 - Work arround a problem affecting the use of the Super key as modifier for 
   moving windows (Bug #4632).
 - Fix smart placement not working for windows with height or width larger than 
-  actual screen size (Bug# 3126). 
+  actual screen size (Bug# 3126).
+- Remove maximization if a client updates its size max size hint (Bug #4706).
 
 4.5.92 (Xfce 4.6beta2)
 ==

Modified: xfwm4/trunk/src/client.c
===
--- xfwm4/trunk/src/client.c2008-12-12 11:54:53 UTC (rev 29014)
+++ xfwm4/trunk/src/client.c2008-12-12 23:58:50 UTC (rev 29015)
@@ -1143,7 +1143,11 @@
 {
 if ((c-width != wc.width) || (c-height != wc.height))
 {
-clientConfigure (c, wc, CWX | CWY | CWWidth | CWHeight, 
CFG_CONSTRAINED);
+if (FLAG_TEST (c-flags, CLIENT_FLAG_MAXIMIZED))
+{
+clientRemoveMaximizeFlag (c);
+}
+clientConfigure (c, wc, CWX | CWY | CWWidth | CWHeight, 
CFG_CONSTRAINED | CFG_FORCE_REDRAW);
 }
 else if (FLAG_TEST (c-xfwm_flags, XFWM_FLAG_IS_RESIZABLE) != 
previous_value)
 {

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28924 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2008-11-27 13:27:18 + (Thu, 27 Nov 2008)
New Revision: 28924

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/focus.c
   xfwm4/trunk/src/focus.h
Log:
* src/focus.c, src/focus.h: Only focus the fallback window when 
  transitioning focus from a destroy or unmap (Should fix Bug #4652)
  Do some small cleanup, remove older code ifdef'ed.
* src/moveresize.c: Work around a problem affecting the use of 
  to check the value for each iteration.

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-11-27 12:26:04 UTC (rev 28923)
+++ xfwm4/trunk/ChangeLog   2008-11-27 13:27:18 UTC (rev 28924)
@@ -1,3 +1,9 @@
+2008-11-27  olivier
+
+   * src/focus.c, src/focus.h: Only focus the fallback window when 
+ transitioning focus from a destroy or unmap (Should fix Bug #4652)
+ Do some small cleanup, remove older code ifdef'ed.
+
 2008-11-25  olivier
 
* themes/daloa: Enlarge active zone of buttons
@@ -8,13 +14,13 @@
 
 2008-11-20  olivier
 
-   * src/moveresize.c: Work arround a problem affecting the use of 
+   * src/moveresize.c: Work around a problem affecting the use of 
  the Super key as modifier for moving windows (Bug #4632)
 
 2008-11-19  olivier
 
* settings-dialogs/workspace-settings.c: Trivial optimization, no need 
- to check the value for eatch iteration.
+ to check the value for each iteration.
 
 2008-11-18  olivier
 

Modified: xfwm4/trunk/src/focus.c
===
--- xfwm4/trunk/src/focus.c 2008-11-27 12:26:04 UTC (rev 28923)
+++ xfwm4/trunk/src/focus.c 2008-11-27 13:27:18 UTC (rev 28924)
@@ -323,12 +323,12 @@
 new_focus = NULL;
 current_focus = client_focus;
 c2 = NULL;
-#if 1
+
 if (pending_focus)
 {
 current_focus = pending_focus;
 }
-#endif
+
 if ((c || current_focus)  (c != current_focus))
 {
 return;
@@ -341,39 +341,7 @@
 
 display_info = screen_info-display_info;
 top_most = clientGetTopMostFocusable (screen_info, look_in_layer, 
exclude_list);
-#if 0
-if (screen_info-params-click_to_focus)
-{
-if (c)
-{
-if (clientIsModal (c))
-{
-/* If the window is a modal, send focus back to its parent
- * window.
- * Modals are transients, and we aren't interested in modal
- * for group, so it safe to use clientGetTransient because
- * it's really what we want...
- */
-c2 = clientGetTransient (c);
-if (c2  FLAG_TEST(c2-xfwm_flags, XFWM_FLAG_VISIBLE))
-{
-new_focus = c2;
-/* Usability: raise the parent, to grab user's attention */
-clientRaise (c2, None);
-}
-}
-else
-{
-c2 = clientGetNext (c, 0);
-if ((c2)  (c2-win_layer = c-win_layer))
-{
-new_focus = c2;
-}
-}
-}
-}
-else
-#endif
+
 if (!(screen_info-params-click_to_focus) 
 XQueryPointer (myScreenGetXDisplay (screen_info), screen_info-xroot, 
dr, window, rx, ry, wx, wy, mask))
 {
@@ -385,7 +353,7 @@
 }
 clientSetFocus (screen_info, new_focus,
 myDisplayGetCurrentTime (display_info),
-FOCUS_IGNORE_MODAL | FOCUS_FORCE);
+FOCUS_IGNORE_MODAL | FOCUS_FORCE | FOCUS_TRANSITION);
 }
 
 gboolean
@@ -604,7 +572,7 @@
 XSetInputFocus (myScreenGetXDisplay (screen_info), c-window, 
RevertToPointerRoot, timestamp);
 }
 }
-else
+else if (flags  FOCUS_TRANSITION)
 {
 /*
  * If we are relying only on the client application to take focus, 
we need to set the focus

Modified: xfwm4/trunk/src/focus.h
===
--- xfwm4/trunk/src/focus.h 2008-11-27 12:26:04 UTC (rev 28923)
+++ xfwm4/trunk/src/focus.h 2008-11-27 13:27:18 UTC (rev 28924)
@@ -38,6 +38,7 @@
 #define FOCUS_SORT  (10)
 #define FOCUS_IGNORE_MODAL  (11)
 #define FOCUS_FORCE (12)
+#define FOCUS_TRANSITION(13)
 
 void clientFocusTop (ScreenInfo *,
  int,

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28925 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2008-11-27 13:41:33 + (Thu, 27 Nov 2008)
New Revision: 28925

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/transients.c
Log:
* src/transients.c: Do not consider all windows of the same group for
  modality (See comment in Bug #3586)

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-11-27 13:27:18 UTC (rev 28924)
+++ xfwm4/trunk/ChangeLog   2008-11-27 13:41:33 UTC (rev 28925)
@@ -1,5 +1,10 @@
 2008-11-27  olivier
 
+   * src/transients.c: Do not consider all windows of the same group for
+ modality (See comment in Bug #3586)
+
+2008-11-27  olivier
+
* src/focus.c, src/focus.h: Only focus the fallback window when 
  transitioning focus from a destroy or unmap (Should fix Bug #4652)
  Do some small cleanup, remove older code ifdef'ed.

Modified: xfwm4/trunk/src/transients.c
===
--- xfwm4/trunk/src/transients.c2008-11-27 13:27:18 UTC (rev 28924)
+++ xfwm4/trunk/src/transients.c2008-11-27 13:41:33 UTC (rev 28925)
@@ -134,7 +134,13 @@
 
 if (FLAG_TEST (c1-flags, CLIENT_FLAG_STATE_MODAL)  (c1-type  
WINDOW_REGULAR_FOCUSABLE)  (c1-serial = c2-serial))
 {
-return (clientIsTransientFor (c1, c2) || clientSameGroup (c1, c2));
+/*
+ * We used to consider all windows of the same group here
+ * (ie. clientSameGroup (c1, c2)) but that seems too
+ * wide so we restric modality to transient relationship
+ * for now.
+ */
+return (clientIsTransientFor (c1, c2));
 }
 return FALSE;
 }

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28923 - thunar/trunk/po

[Olivier Fourdan]

Author: olivier
Date: 2008-11-27 12:26:04 + (Thu, 27 Nov 2008)
New Revision: 28923

Modified:
   thunar/trunk/po/eu.po
Log:
Fix eu.po breaking build because of msgctxt

Modified: thunar/trunk/po/eu.po
===
--- thunar/trunk/po/eu.po   2008-11-27 00:22:10 UTC (rev 28922)
+++ thunar/trunk/po/eu.po   2008-11-27 12:26:04 UTC (rev 28923)
@@ -3529,7 +3529,3 @@
 
 #~ msgid Thunar Settings
 #~ msgstr Thunar ezarpenak
-
-#~ msgctxt CategoryName (FolderName)
-#~ msgid %s (%s)
-#~ msgstr %s (%s)

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28926 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2008-11-27 14:54:19 + (Thu, 27 Nov 2008)
New Revision: 28926

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/transients.c
Log:
* src/transients.c: Based on previous change, we an now optimize 
  clientGetModalFor() and make it a lot simpler and more efficient.

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-11-27 13:41:33 UTC (rev 28925)
+++ xfwm4/trunk/ChangeLog   2008-11-27 14:54:19 UTC (rev 28926)
@@ -1,5 +1,10 @@
 2008-11-27  olivier
 
+   * src/transients.c: Based on previous change, we an now optimize 
+ clientGetModalFor() and make it a lot simpler and more efficient.
+
+2008-11-27  olivier
+
* src/transients.c: Do not consider all windows of the same group for
  modality (See comment in Bug #3586)
 

Modified: xfwm4/trunk/src/transients.c
===
--- xfwm4/trunk/src/transients.c2008-11-27 13:41:33 UTC (rev 28925)
+++ xfwm4/trunk/src/transients.c2008-11-27 14:54:19 UTC (rev 28926)
@@ -256,49 +256,25 @@
 clientGetModalFor (Client * c)
 {
 ScreenInfo *screen_info;
-Client *latest_modal;
-Client *c2, *c3;
-GList *modals;
-GList *index1, *index2;
+Client *c2;
+GList *index;
 
 g_return_val_if_fail (c != NULL, NULL);
 TRACE (entering clientGetModalFor);
 
-modals = NULL;
-latest_modal = NULL;
 screen_info = c-screen_info;
-for (index1 = screen_info-windows_stack; index1; index1 = g_list_next 
(index1))
+for (index = g_list_last(screen_info-windows_stack); index; index = 
g_list_previous (index))
 {
-c2 = (Client *) index1-data;
+c2 = (Client *) index-data;
 if (c2)
 {
 if ((c2 != c)  clientIsModalFor (c2, c))
 {
-modals = g_list_append (modals, c2);
-latest_modal = c2;
+return c2;
 }
-else
-{
-for (index2 = modals; index2;
-index2 = g_list_next (index2))
-{
-c3 = (Client *) index2-data;
-if ((c3 != c2)  clientIsModalFor (c2, c3))
-{
-modals = g_list_append (modals, c2);
-latest_modal = c2;
-break;
-}
-}
-}
 }
 }
-if (modals)
-{
-g_list_free (modals);
-}
-
-return latest_modal;
+return NULL;
 }
 
 Client *

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28910 - in xfwm4/trunk: . themes/daloa

[Olivier Fourdan]

Author: olivier
Date: 2008-11-25 19:33:43 + (Tue, 25 Nov 2008)
New Revision: 28910

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/themes/daloa/close-active.xpm
   xfwm4/trunk/themes/daloa/close-inactive.xpm
   xfwm4/trunk/themes/daloa/close-prelight.xpm
   xfwm4/trunk/themes/daloa/close-pressed.xpm
   xfwm4/trunk/themes/daloa/hide-active.xpm
   xfwm4/trunk/themes/daloa/hide-inactive.xpm
   xfwm4/trunk/themes/daloa/hide-prelight.xpm
   xfwm4/trunk/themes/daloa/hide-pressed.xpm
   xfwm4/trunk/themes/daloa/maximize-active.xpm
   xfwm4/trunk/themes/daloa/maximize-inactive.xpm
   xfwm4/trunk/themes/daloa/maximize-prelight.xpm
   xfwm4/trunk/themes/daloa/maximize-pressed.xpm
   xfwm4/trunk/themes/daloa/maximize-toggled-active.xpm
   xfwm4/trunk/themes/daloa/maximize-toggled-inactive.xpm
   xfwm4/trunk/themes/daloa/maximize-toggled-prelight.xpm
   xfwm4/trunk/themes/daloa/maximize-toggled-pressed.xpm
   xfwm4/trunk/themes/daloa/shade-active.xpm
   xfwm4/trunk/themes/daloa/shade-inactive.xpm
   xfwm4/trunk/themes/daloa/shade-prelight.xpm
   xfwm4/trunk/themes/daloa/shade-pressed.xpm
   xfwm4/trunk/themes/daloa/shade-toggled-active.xpm
   xfwm4/trunk/themes/daloa/shade-toggled-inactive.xpm
   xfwm4/trunk/themes/daloa/shade-toggled-prelight.xpm
   xfwm4/trunk/themes/daloa/shade-toggled-pressed.xpm
   xfwm4/trunk/themes/daloa/stick-active.xpm
   xfwm4/trunk/themes/daloa/stick-inactive.xpm
   xfwm4/trunk/themes/daloa/stick-prelight.xpm
   xfwm4/trunk/themes/daloa/stick-pressed.xpm
   xfwm4/trunk/themes/daloa/stick-toggled-active.xpm
   xfwm4/trunk/themes/daloa/stick-toggled-inactive.xpm
   xfwm4/trunk/themes/daloa/stick-toggled-prelight.xpm
   xfwm4/trunk/themes/daloa/stick-toggled-pressed.xpm
Log:
* themes/daloa: Enlarge active zone of buttons

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-11-25 19:12:30 UTC (rev 28909)
+++ xfwm4/trunk/ChangeLog   2008-11-25 19:33:43 UTC (rev 28910)
@@ -1,3 +1,7 @@
+2008-11-25  olivier
+
+   * themes/daloa: Enlarge active zone of buttons
+
 2008-11-20  olivier
 
* defaults/defaults: Fix default value for easy_click

Modified: xfwm4/trunk/themes/daloa/close-active.xpm
===
--- xfwm4/trunk/themes/daloa/close-active.xpm   2008-11-25 19:12:30 UTC (rev 
28909)
+++ xfwm4/trunk/themes/daloa/close-active.xpm   2008-11-25 19:33:43 UTC (rev 
28910)
@@ -3,8 +3,6 @@
 24 19 2 1,
   c None,
 . c #C0C0FF s active_color_1,
-,
-,
 ,
 ,
 ,
@@ -21,4 +19,6 @@
 ,
 ,
 ,
+,
+,
 };

Modified: xfwm4/trunk/themes/daloa/close-inactive.xpm
===
--- xfwm4/trunk/themes/daloa/close-inactive.xpm 2008-11-25 19:12:30 UTC (rev 
28909)
+++ xfwm4/trunk/themes/daloa/close-inactive.xpm 2008-11-25 19:33:43 UTC (rev 
28910)
@@ -3,8 +3,6 @@
 24 19 2 1,
   c None,
 . c #C0C0FF s inactive_color_1,
-,
-,
 ,
 ,
 ,
@@ -21,4 +19,6 @@
 ,
 ,
 ,
+,
+,
 };

Modified: xfwm4/trunk/themes/daloa/close-prelight.xpm
===
--- xfwm4/trunk/themes/daloa/close-prelight.xpm 2008-11-25 19:12:30 UTC (rev 
28909)
+++ xfwm4/trunk/themes/daloa/close-prelight.xpm 2008-11-25 19:33:43 UTC (rev 
28910)
@@ -3,8 +3,6 @@
 24 19 2 1,
   c None,
 . c #C0C0FF s active_color_1,
-,
-,
 ,
 ,
 ,
@@ -21,4 +19,6 @@
 ,
 ,
 ,
+,
+,
 };

Modified: xfwm4/trunk/themes/daloa/close-pressed.xpm
===
--- xfwm4/trunk/themes/daloa/close-pressed.xpm  2008-11-25 19:12:30 UTC (rev 
28909)
+++ xfwm4/trunk/themes/daloa/close-pressed.xpm  2008-11-25 19:33:43 UTC (rev 
28910)
@@ -3,8 +3,6 @@
 24 19 2 1,
   c None,
 . c #C0C0FF s active_color_1,
-,
-,
 ,
 ,
 ,
@@ -21,4 +19,6 @@
 ,
 ,
 ,
+,
+,
 };

Modified: xfwm4/trunk/themes/daloa/hide-active.xpm

[Xfce4-commits] r28864 - xfwm4/trunk

[Olivier Fourdan]

Author: olivier
Date: 2008-11-19 22:11:57 + (Wed, 19 Nov 2008)
New Revision: 28864

Modified:
   xfwm4/trunk/TODO
Log:
Update TODO

Modified: xfwm4/trunk/TODO
===
--- xfwm4/trunk/TODO2008-11-19 20:39:22 UTC (rev 28863)
+++ xfwm4/trunk/TODO2008-11-19 22:11:57 UTC (rev 28864)
@@ -3,12 +3,4 @@
 
 Add your favorite wish list here :
 
-* Multiscreen mode (not Xinerama)*done*
-* Use daemon(3) if available to daemonize the process*done*
-* Add compositor for newer X.org *done*
-* Add support for alpha in window frame components   *done*
-* Remove keyboard shortcut support from the WM   *done*
-* Implement keyboard shortcut in a separate MCS plugin   *done*
-* Add new power tweak MCS plugin   *done*
-* Remove dependency on libXPM*done*
-* Add support for multiple image formats in themes   *done*
+* Rewrite transients management efficiently

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28849 - in xfwm4/trunk: . settings-dialogs

[Olivier Fourdan]

Author: olivier
Date: 2008-11-18 22:44:01 + (Tue, 18 Nov 2008)
New Revision: 28849

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/settings-dialogs/workspace-settings.c
Log:
* settings-dialogs/workspace-settings.c: Make sure the data retrieved
  from xfconf is not null (Bug #4616) 
 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-11-18 21:54:09 UTC (rev 28848)
+++ xfwm4/trunk/ChangeLog   2008-11-18 22:44:01 UTC (rev 28849)
@@ -1,3 +1,8 @@
+2008-11-18  olivier
+
+   * settings-dialogs/workspace-settings.c: Make sure the data retrieved
+ from xfconf is not null (Bug #4616)
+
 2008-11-15  olivier
 
* settings-dialogs/xfwm4-workspace-dialog.glade: Set page-size

Modified: xfwm4/trunk/settings-dialogs/workspace-settings.c
===
--- xfwm4/trunk/settings-dialogs/workspace-settings.c   2008-11-18 21:54:09 UTC 
(rev 28848)
+++ xfwm4/trunk/settings-dialogs/workspace-settings.c   2008-11-18 22:44:01 UTC 
(rev 28849)
@@ -264,7 +264,7 @@
 
 n_workspaces = wnck_screen_get_workspace_count(screen);
 i = 0;
-for(; i  n_workspaces  names[i]; ++i) {
+for(; i  n_workspaces  names  names[i]; ++i) {
 gtk_list_store_append(ls, iter);
 gtk_list_store_set(ls, iter,
COL_NUMBER, i + 1,

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28852 - in xfwm4/trunk: . settings-dialogs

[Olivier Fourdan]

Author: olivier
Date: 2008-11-19 06:37:49 + (Wed, 19 Nov 2008)
New Revision: 28852

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/settings-dialogs/workspace-settings.c
Log:
* settings-dialogs/workspace-settings.c: Trivial optimization, no need 
  to check the value for eatch iteration. 
 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-11-19 06:17:22 UTC (rev 28851)
+++ xfwm4/trunk/ChangeLog   2008-11-19 06:37:49 UTC (rev 28852)
@@ -1,3 +1,8 @@
+2008-11-19  olivier
+
+   * settings-dialogs/workspace-settings.c: Trivial optimization, no need 
+ to check the value for eatch iteration.
+
 2008-11-18  olivier
 
* settings-dialogs/workspace-settings.c: Make sure the data retrieved

Modified: xfwm4/trunk/settings-dialogs/workspace-settings.c
===
--- xfwm4/trunk/settings-dialogs/workspace-settings.c   2008-11-19 06:17:22 UTC 
(rev 28851)
+++ xfwm4/trunk/settings-dialogs/workspace-settings.c   2008-11-19 06:37:49 UTC 
(rev 28852)
@@ -264,12 +264,14 @@
 
 n_workspaces = wnck_screen_get_workspace_count(screen);
 i = 0;
-for(; i  n_workspaces  names  names[i]; ++i) {
-gtk_list_store_append(ls, iter);
-gtk_list_store_set(ls, iter,
-   COL_NUMBER, i + 1,
-   COL_NAME, names[i],
-   -1);
+if (names) {
+for(; i  n_workspaces  names[i]; ++i) {
+gtk_list_store_append(ls, iter);
+gtk_list_store_set(ls, iter,
+   COL_NUMBER, i + 1,
+   COL_NAME, names[i],
+   -1);
+}
 }
 for(; i  n_workspaces; ++i) {
 WnckWorkspace *space = wnck_screen_get_workspace(screen, i);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28814 - in xfwm4/trunk: . settings-dialogs

[Olivier Fourdan]

Author: olivier
Date: 2008-11-15 19:27:55 + (Sat, 15 Nov 2008)
New Revision: 28814

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/settings-dialogs/xfwm4-workspace-dialog.glade
Log:
* settings-dialogs/xfwm4-workspace-dialog.glade: Set page-size
  to 0 for gtk+ 2.14 
 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-11-15 15:17:30 UTC (rev 28813)
+++ xfwm4/trunk/ChangeLog   2008-11-15 19:27:55 UTC (rev 28814)
@@ -1,3 +1,8 @@
+2008-11-15  olivier
+
+   * settings-dialogs/xfwm4-workspace-dialog.glade: Set page-size
+ to 0 for gtk+ 2.14
+
 2008-11-11  olivier
 
* po/*.po, po/xfwm4.pot: update po

Modified: xfwm4/trunk/settings-dialogs/xfwm4-workspace-dialog.glade
===
--- xfwm4/trunk/settings-dialogs/xfwm4-workspace-dialog.glade   2008-11-15 
15:17:30 UTC (rev 28813)
+++ xfwm4/trunk/settings-dialogs/xfwm4-workspace-dialog.glade   2008-11-15 
19:27:55 UTC (rev 28814)
@@ -165,7 +165,7 @@
   widget class=GtkSpinButton 
id=margin_left_spinbutton
 property 
name=visibleTrue/property
 property 
name=can_focusTrue/property
-property name=adjustment0 0 100 1 
10 10/property
+property name=adjustment0 0 100 1 
10 0/property
   /widget
   packing
 property 
name=top_attach1/property
@@ -178,7 +178,7 @@
   widget class=GtkSpinButton 
id=margin_bottom_spinbutton
 property 
name=visibleTrue/property
 property 
name=can_focusTrue/property
-property name=adjustment0 0 100 1 
10 10/property
+property name=adjustment0 0 100 1 
10 0/property
   /widget
   packing
 property 
name=left_attach1/property
@@ -193,7 +193,7 @@
   widget class=GtkSpinButton 
id=margin_right_spinbutton
 property 
name=visibleTrue/property
 property 
name=can_focusTrue/property
-property name=adjustment0 0 100 1 
10 10/property
+property name=adjustment0 0 100 1 
10 0/property
   /widget
   packing
 property 
name=left_attach2/property
@@ -222,7 +222,7 @@
   widget class=GtkSpinButton 
id=margin_top_spinbutton
 property 
name=visibleTrue/property
 property 
name=can_focusTrue/property
-property name=adjustment0 0 100 1 
10 10/property
+property name=adjustment0 0 100 1 
10 0/property
   /widget
   packing
 property 
name=left_attach1/property

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28762 - xfwm4/tags

[Olivier Fourdan]

Author: olivier
Date: 2008-11-11 20:40:24 + (Tue, 11 Nov 2008)
New Revision: 28762

Removed:
   xfwm4/tags/xfce_4_6_beta2/
Log:
Remove tag

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28763 - xfwm4/tags

[Olivier Fourdan]

Author: olivier
Date: 2008-11-11 20:41:47 + (Tue, 11 Nov 2008)
New Revision: 28763

Added:
   xfwm4/tags/xfce_4_6_beta2/
Log:
Re-tag Xfce 4.6 beta2

Copied: xfwm4/tags/xfce_4_6_beta2 (from rev 28762, xfwm4/trunk)

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28757 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2008-11-11 14:57:04 + (Tue, 11 Nov 2008)
New Revision: 28757

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/Makefile.am
Log:
* src/Makefile.am: add missing inline icons

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-11-11 14:43:19 UTC (rev 28756)
+++ xfwm4/trunk/ChangeLog   2008-11-11 14:57:04 UTC (rev 28757)
@@ -1,5 +1,9 @@
 2008-11-11  olivier
 
+   * src/Makefile.am: add missing inline icons
+
+2008-11-11  olivier
+
* settings-dialogs/xfwm4-settings.c: Fix build with -Werror.
 
 2008-11-11  olivier

Modified: xfwm4/trunk/src/Makefile.am
===
--- xfwm4/trunk/src/Makefile.am 2008-11-11 14:43:19 UTC (rev 28756)
+++ xfwm4/trunk/src/Makefile.am 2008-11-11 14:57:04 UTC (rev 28757)
@@ -22,6 +22,11 @@
icons.c \
icons.h \
inline-default-icon.h   \
+   inline-stock-maximize.h \
+   inline-stock-minimize.h \
+   inline-stock-rolldown.h \
+   inline-stock-rollup.h   \
+   inline-stock-unmaximize.h   \
inline-tabwin-icon.h\
keyboard.c  \
keyboard.h  \
@@ -106,6 +111,7 @@
$(RANDR_LIBS)
 
 EXTRA_DIST =   \
+   inline-default-icon.h default_icon.png default_icon.svg \
inline-tabwin-icon.h tabwin-icon.png\
inline-stock-maximize.h stock_maximize.png  \
inline-stock-unmaximize.h stock_unmaximize.png  \
@@ -115,6 +121,7 @@
gen-color-table.pl
 
 noinst_DATA =  \
+   inline-default-icon.h default_icon.png default_icon.svg \
inline-tabwin-icon.h tabwin-icon.png\
inline-stock-maximize.h stock_maximize.png  \
inline-stock-unmaximize.h stock_unmaximize.png  \

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28739 - in xfwm4/trunk: . settings-dialogs src

[Olivier Fourdan]

Author: olivier
Date: 2008-11-11 13:49:45 + (Tue, 11 Nov 2008)
New Revision: 28739

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/settings-dialogs/workspace-settings.c
   xfwm4/trunk/src/Makefile.am
Log:
* src/Makefile.am: stock_rolldown.png missing in Makefile.am

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-11-11 13:38:26 UTC (rev 28738)
+++ xfwm4/trunk/ChangeLog   2008-11-11 13:49:45 UTC (rev 28739)
@@ -1,3 +1,7 @@
+2008-11-11  olivier
+
+   * src/Makefile.am: stock_rolldown.png missing in Makefile.am
+
 2008-11-09  olivier
 
* po/POTFILES.in, settings-dialogs/Makefile.am: Fix make distcheck

Modified: xfwm4/trunk/settings-dialogs/workspace-settings.c
===
--- xfwm4/trunk/settings-dialogs/workspace-settings.c   2008-11-11 13:38:26 UTC 
(rev 28738)
+++ xfwm4/trunk/settings-dialogs/workspace-settings.c   2008-11-11 13:49:45 UTC 
(rev 28739)
@@ -266,10 +266,12 @@
 col = gtk_tree_view_column_new_with_attributes(, render,
text, COL_NUMBER,
NULL);
+   
   
 gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col);
 
 render = gtk_cell_renderer_text_new();
 g_object_set(G_OBJECT(render),
+ editable, TRUE,
  ellipsize, PANGO_ELLIPSIZE_END,
  ellipsize-set, TRUE,
  NULL);
@@ -277,6 +279,8 @@
render,
text, COL_NAME,
NULL);
+g_signal_connect (renderer, edited, G_CALLBACK (cell_edited), 
items_model);
+
 gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col);
 
 screen = wnck_screen_get_default();

Modified: xfwm4/trunk/src/Makefile.am
===
--- xfwm4/trunk/src/Makefile.am 2008-11-11 13:38:26 UTC (rev 28738)
+++ xfwm4/trunk/src/Makefile.am 2008-11-11 13:49:45 UTC (rev 28739)
@@ -111,7 +111,7 @@
inline-stock-unmaximize.h stock_unmaximize.png  \
inline-stock-minimize.h stock_minimize.png  \
inline-stock-rollup.h stock_rollup.png  \
-   inline-stock-rolldown.h stock_rollup.png\
+   inline-stock-rolldown.h stock_rolldown.png  \
gen-color-table.pl
 
 noinst_DATA =  \
@@ -120,7 +120,7 @@
inline-stock-unmaximize.h stock_unmaximize.png  \
inline-stock-minimize.h stock_minimize.png  \
inline-stock-rollup.h stock_rollup.png  \
-   inline-stock-rolldown.h stock_rollup.png
+   inline-stock-rolldown.h stock_rolldown.png
 
 build.h:
echo #define BUILD_ID \`date +%H%M-%y%m%d`\  build.h

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28680 - in xfwm4/trunk: . settings-dialogs src

[Olivier Fourdan]

Author: olivier
Date: 2008-11-09 11:46:07 + (Sun, 09 Nov 2008)
New Revision: 28680

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/settings-dialogs/xfwm4-settings.c
   xfwm4/trunk/src/cycle.c
   xfwm4/trunk/src/events.c
   xfwm4/trunk/src/screen.c
   xfwm4/trunk/src/screen.h
   xfwm4/trunk/src/settings.c
   xfwm4/trunk/src/settings.h
Log:
* settings-dialogs/xfwm4-settings.c, src/cycle.c, src/settings.c,
  src/events.c, src/settings.h, src/screen.c, src/screen.h:
  Prepare code for reverse cycling (not finished yet).

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-11-09 10:44:29 UTC (rev 28679)
+++ xfwm4/trunk/ChangeLog   2008-11-09 11:46:07 UTC (rev 28680)
@@ -1,3 +1,9 @@
+2008-11-09  olivier
+
+   * settings-dialogs/xfwm4-settings.c, src/cycle.c, src/settings.c,
+ src/events.c, src/settings.h, src/screen.c, src/screen.h:
+ Prepare code for reverse cycling (not finished yet).
+
 2008-11-08  olivier
 
* src/tabwin.c: Draw focus in tabwin to make sure the selection is

Modified: xfwm4/trunk/settings-dialogs/xfwm4-settings.c
===
--- xfwm4/trunk/settings-dialogs/xfwm4-settings.c   2008-11-09 10:44:29 UTC 
(rev 28679)
+++ xfwm4/trunk/settings-dialogs/xfwm4-settings.c   2008-11-09 11:46:07 UTC 
(rev 28680)
@@ -3,19 +3,19 @@
  * Copyright (c) 2008 Stephan Arts [EMAIL PROTECTED]
  * Copyright (c) 2008 Jannis Pohlmann [EMAIL PROTECTED]
  *
- * 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 
+ * 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 
+ * 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.
  *
- * You should have received a copy of the GNU General Public License 
- * along with this program; if not, write to the Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA  02111-1307  USA
  */
 
@@ -107,10 +107,10 @@
   guint
 info,
   guint
 time,
   
XfwmSettings *settings);
-static gboolean   xfwm_settings_active_frame_drag_motion 
(GtkWidget*widget, 
-  
GdkDragContext   *drag_context, 
+static gboolean   xfwm_settings_active_frame_drag_motion 
(GtkWidget*widget,
+  
GdkDragContext   *drag_context,
   gint 
 x,
-  gint 
 y, 
+  gint 
 y,
   guint
 time,
   
XfwmSettings *settings);
 static void   xfwm_settings_active_frame_drag_leave  
(GtkWidget*widget,
@@ -231,6 +231,7 @@
   { N_(Right), right_key, NULL },
   { N_(Cancel), cancel_key, NULL },
   { N_(Cycle windows), cycle_windows_key, NULL },
+  { N_(Cycle windows (Reverse)), cycle_reverse_windows_key, NULL },
   { N_(Close window), close_window_key, NULL },
   { N_(Maximize window horizontally), maximize_horiz_key, NULL },
   { N_(Maximize window vertically), maximize_vert_key, NULL },
@@ -294,9 +295,9 @@
 static gboolean   opt_version = FALSE;
 static GdkNativeWindowopt_socket_id = 0;
 static GOptionEntry   opt_entries[] = {
-  { socket-id, 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_INT, opt_socket_id, 
+  { socket-id, 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_INT, opt_socket_id,

[Xfce4-commits] r28679 - libxfcegui4/trunk/libxfce4kbd-private

[Olivier Fourdan]

Author: olivier
Date: 2008-11-09 10:44:29 + (Sun, 09 Nov 2008)
New Revision: 28679

Modified:
   libxfcegui4/trunk/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
Log:
Add cycle_reverse_windows_key

Modified: libxfcegui4/trunk/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
===
--- libxfcegui4/trunk/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml  
2008-11-09 09:38:36 UTC (rev 28678)
+++ libxfcegui4/trunk/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml  
2008-11-09 10:44:29 UTC (rev 28679)
@@ -19,6 +19,7 @@
   property name=lt;Altgt;F4 type=string value=close_window_key/
   property name=lt;Altgt;Tab type=string value=cycle_windows_key/
   property name=lt;Altgt;Delete type=string 
value=del_workspace_key/
+  property name=lt;Altgt;lt;Shiftgt;Tab type=string 
value=cycle_reverse_windows_key/
   property name=lt;Controlgt;lt;Altgt;Down type=string 
value=down_workspace_key/
   property name=lt;Altgt;F11 type=string value=fullscreen_key/
   property name=lt;Altgt;F9 type=string value=hide_window_key/

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28686 - in xfwm4/trunk: . settings-dialogs src

[Olivier Fourdan]

Author: olivier
Date: 2008-11-09 15:34:51 + (Sun, 09 Nov 2008)
New Revision: 28686

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/settings-dialogs/workspace-settings.c
   xfwm4/trunk/src/cycle.c
Log:
* settings-dialogs/workspace-settings.c: Fix compiler warning
  src/cycle.c: Add key shortcut for reverse cycling (Bug #2778)

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-11-09 13:23:28 UTC (rev 28685)
+++ xfwm4/trunk/ChangeLog   2008-11-09 15:34:51 UTC (rev 28686)
@@ -1,5 +1,10 @@
 2008-11-09  olivier
 
+   * settings-dialogs/workspace-settings.c: Fix compiler warning
+ src/cycle.c: Add key shortcut for reverse cycling (Bug #2778)
+
+2008-11-09  olivier
+
* settings-dialogs/xfwm4-settings.c, src/cycle.c, src/settings.c,
  src/events.c, src/settings.h, src/screen.c, src/screen.h:
  Prepare code for reverse cycling (not finished yet).

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2008-11-09 13:23:28 UTC (rev 28685)
+++ xfwm4/trunk/NEWS2008-11-09 15:34:51 UTC (rev 28686)
@@ -14,6 +14,7 @@
   (typically theme settings).
 - Draw focus in tabwin to make sure the selection is visible even with themes 
   that do not show selected items.
+- Add key shortcut for reverse cycling (Bug #2778)
 
 4.5.91 (Xfce 4.6beta1)
 ==

Modified: xfwm4/trunk/settings-dialogs/workspace-settings.c
===
--- xfwm4/trunk/settings-dialogs/workspace-settings.c   2008-11-09 13:23:28 UTC 
(rev 28685)
+++ xfwm4/trunk/settings-dialogs/workspace-settings.c   2008-11-09 15:34:51 UTC 
(rev 28686)
@@ -286,8 +286,6 @@
 n_workspaces = wnck_screen_get_workspace_count(screen);
 i = 0;
 for(; i  n_workspaces  names[i]; ++i) {
-WnckWorkspace *space = wnck_screen_get_workspace(screen, i);
-
 gtk_list_store_append(ls, iter);
 gtk_list_store_set(ls, iter,
COL_NUMBER, i + 1,

Modified: xfwm4/trunk/src/cycle.c
===
--- xfwm4/trunk/src/cycle.c 2008-11-09 13:23:28 UTC (rev 28685)
+++ xfwm4/trunk/src/cycle.c 2008-11-09 15:34:51 UTC (rev 28686)
@@ -65,9 +65,8 @@
 ClientCycleData *passdata;
 Client *c, *removed;
 eventFilterStatus status;
-KeyCode cycle;
 KeyCode cancel;
-int modifier;
+int key, modifier;
 gboolean key_pressed, cycling, gone;
 
 TRACE (entering clientCycleEventFilter);
@@ -81,11 +80,8 @@
 c = passdata-c;
 screen_info = c-screen_info;
 display_info = screen_info-display_info;
-cycle = screen_info-params-keys[KEY_CYCLE_WINDOWS].keycode;
 cancel = screen_info-params-keys[KEY_CANCEL].keycode;
 modifier = screen_info-params-keys[KEY_CYCLE_WINDOWS].modifier;
-key_pressed = ((xevent-type == KeyPress)  ((xevent-xkey.keycode == 
cycle) ||
-  (xevent-xkey.keycode == 
cancel)));
 status = EVENT_FILTER_STOP;
 cycling = TRUE;
 gone = FALSE;
@@ -110,24 +106,28 @@
 status = EVENT_FILTER_CONTINUE;
 /* Walk through */
 case KeyPress:
+key_pressed = (xevent-type == KeyPress);
 if (gone || key_pressed)
 {
 if (key_pressed)
 {
 Client *c2 = NULL;
-
+key = myScreenGetKeyPressed (screen_info, (XKeyEvent *) 
xevent);
+/*
+ * We cannot simply check for key == KEY_CANCEL here 
because of the
+ * mofidier being pressed, so we need to look at the 
keycode directly.
+ */
 if (xevent-xkey.keycode == cancel)
 {
 c2 = tabwinGetHead (passdata-tabwin);
 cycling = FALSE;
 }
-/* If KEY_CYCLE_WINDOWS has Shift, then do not reverse */
-else if (!(modifier  ShiftMask)  (xevent-xkey.state  
ShiftMask))
+else if (key == KEY_CYCLE_REVERSE_WINDOWS)
 {
 TRACE (Cycle: previous);
 c2 = tabwinSelectPrev(passdata-tabwin);
 }
-else
+else if (key == KEY_CYCLE_WINDOWS)
 {
 TRACE (Cycle: next);
 c2 = tabwinSelectNext(passdata-tabwin);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28688 - xfwm4/trunk/themes

[Olivier Fourdan]

Author: olivier
Date: 2008-11-09 16:08:20 + (Sun, 09 Nov 2008)
New Revision: 28688

Removed:
   xfwm4/trunk/themes/default.keys/
Log:
Remove default.keys

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28689 - in xfwm4/trunk: . po settings-dialogs

[Olivier Fourdan]

Author: olivier
Date: 2008-11-09 16:36:28 + (Sun, 09 Nov 2008)
New Revision: 28689

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/po/POTFILES.in
   xfwm4/trunk/settings-dialogs/Makefile.am
Log:
* po/POTFILES.in, settings-dialogs/Makefile.am: Fix make distcheck

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-11-09 16:08:20 UTC (rev 28688)
+++ xfwm4/trunk/ChangeLog   2008-11-09 16:36:28 UTC (rev 28689)
@@ -1,5 +1,9 @@
 2008-11-09  olivier
 
+   * po/POTFILES.in, settings-dialogs/Makefile.am: Fix make distcheck
+
+2008-11-09  olivier
+
* configure.ac.in: Update version
  po/*: Update po
 

Modified: xfwm4/trunk/po/POTFILES.in
===
--- xfwm4/trunk/po/POTFILES.in  2008-11-09 16:08:20 UTC (rev 28688)
+++ xfwm4/trunk/po/POTFILES.in  2008-11-09 16:36:28 UTC (rev 28689)
@@ -1,15 +1,6 @@
 # List of source files containing translatable strings.
 
 helper-dialog/helper-dialog.c
-mcs-plugin/margins.c
-mcs-plugin/wmtweaks_plugin.c
-mcs-plugin/workspaces.c
-mcs-plugin/workspaces_plugin.c
-mcs-plugin/xfce-wm-settings.desktop.in
-mcs-plugin/xfce-wmtweaks-settings.desktop.in
-mcs-plugin/xfce-workspaces-settings.desktop.in
-mcs-plugin/xfwm4_plugin.c
-mcs-plugin/xfwm4_shortcuteditor.c
 settings-dialogs/tweaks-settings.c
 settings-dialogs/workspace-settings.c
 settings-dialogs/xfce-wm-settings.desktop.in

Modified: xfwm4/trunk/settings-dialogs/Makefile.am
===
--- xfwm4/trunk/settings-dialogs/Makefile.am2008-11-09 16:08:20 UTC (rev 
28688)
+++ xfwm4/trunk/settings-dialogs/Makefile.am2008-11-09 16:36:28 UTC (rev 
28689)
@@ -39,6 +39,7 @@
 
 xfwm4_settings_SOURCES = \
xfwm4-settings.c \
+   xfwm4-settings.h \
xfwm4-dialog_glade.h
 
 xfwm4_settings_CFLAGS = \

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28692 - in gtk-xfce-engine-2/trunk: . src themes/b5 themes/basic themes/cadmium themes/curve themes/dawn themes/dusk themes/kde2 themes/kolors themes/light themes/orange themes/redmon

[Olivier Fourdan]

Author: olivier
Date: 2008-11-09 21:42:17 + (Sun, 09 Nov 2008)
New Revision: 28692

Removed:
   gtk-xfce-engine-2/trunk/themes/b5/README.html
   gtk-xfce-engine-2/trunk/themes/basic/README.html
   gtk-xfce-engine-2/trunk/themes/cadmium/README.html
   gtk-xfce-engine-2/trunk/themes/curve/README.html
   gtk-xfce-engine-2/trunk/themes/dawn/README.html
   gtk-xfce-engine-2/trunk/themes/dusk/README.html
   gtk-xfce-engine-2/trunk/themes/kde2/README.html
   gtk-xfce-engine-2/trunk/themes/kolors/README.html
   gtk-xfce-engine-2/trunk/themes/light/README.html
   gtk-xfce-engine-2/trunk/themes/orange/README.html
   gtk-xfce-engine-2/trunk/themes/redmondxp/README.html
   gtk-xfce-engine-2/trunk/themes/saltlake/README.html
   gtk-xfce-engine-2/trunk/themes/smooth/README.html
   gtk-xfce-engine-2/trunk/themes/stellar/README.html
   gtk-xfce-engine-2/trunk/themes/winter/README.html
   gtk-xfce-engine-2/trunk/themes/xfce-4.0/README.html
   gtk-xfce-engine-2/trunk/themes/xfce-4.2/README.html
   gtk-xfce-engine-2/trunk/themes/xfce-4.4/README.html
   gtk-xfce-engine-2/trunk/themes/xfce/README.html
Modified:
   gtk-xfce-engine-2/trunk/ChangeLog
   gtk-xfce-engine-2/trunk/NEWS
   gtk-xfce-engine-2/trunk/configure.in
   gtk-xfce-engine-2/trunk/src/gradient_draw.c
   gtk-xfce-engine-2/trunk/src/xfce_theme_draw.c
Log:
* src/xfce_theme_draw.c: Fix bg color being shown under group box 
  title (Bug #1018),
  src/gradient_draw.c: Fix wrong UTF8 character in credit header
  themes/*/README.html: Remove README.html files (Bug #3280)
* ChangeLog, configure.in: Update ChangeLog and version-number for 
2.5.91

Modified: gtk-xfce-engine-2/trunk/ChangeLog
===
--- gtk-xfce-engine-2/trunk/ChangeLog   2008-11-09 18:38:04 UTC (rev 28691)
+++ gtk-xfce-engine-2/trunk/ChangeLog   2008-11-09 21:42:17 UTC (rev 28692)
@@ -1,5 +1,12 @@
+2008-11-09 olivier
+
+   * src/xfce_theme_draw.c: Fix bg color being shown under group box 
+ title (Bug #1018),
+ src/gradient_draw.c: Fix wrong UTF8 character in credit header
+ themes/*/README.html: Remove README.html files (Bug #3280)
+
 2008-10-13 12:51  stephan
-   * ChangeLog, convigure.in: Update ChangeLog and version-number for 
2.5.91
+   * ChangeLog, configure.in: Update ChangeLog and version-number for 
2.5.91
 
 2007-05-09 19:55  olivier
 

Modified: gtk-xfce-engine-2/trunk/NEWS
===
--- gtk-xfce-engine-2/trunk/NEWS2008-11-09 18:38:04 UTC (rev 28691)
+++ gtk-xfce-engine-2/trunk/NEWS2008-11-09 21:42:17 UTC (rev 28692)
@@ -1,3 +1,9 @@
+2.5.92
+=
+
+- Fix bg color being shown under group box title (Bug #1018)
+- Remove README.html files (Bug #3280)
+
 2.4.0
 =
 - Several improvements to the default theme.

Modified: gtk-xfce-engine-2/trunk/configure.in
===
--- gtk-xfce-engine-2/trunk/configure.in2008-11-09 18:38:04 UTC (rev 
28691)
+++ gtk-xfce-engine-2/trunk/configure.in2008-11-09 21:42:17 UTC (rev 
28692)
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT([gtk-xfce-engine], [2.5.91], [http://bugzilla.xfce.org])
+AC_INIT([gtk-xfce-engine], [2.5.92], [http://bugzilla.xfce.org])
 
 AC_PREREQ(2.52)
 

Modified: gtk-xfce-engine-2/trunk/src/gradient_draw.c
===
--- gtk-xfce-engine-2/trunk/src/gradient_draw.c 2008-11-09 18:38:04 UTC (rev 
28691)
+++ gtk-xfce-engine-2/trunk/src/gradient_draw.c 2008-11-09 21:42:17 UTC (rev 
28692)
@@ -16,21 +16,21 @@
  *
  *  Copyright (C) 1999-2004 Olivier Fourdan ([EMAIL PROTECTED])
  *
- *  Portions based Thinice port by 
+ *  Portions based Thinice port by
  *   Tim Gerla [EMAIL PROTECTED],
  *   Tomas �gren [EMAIL PROTECTED],
  *   Richard Hult [EMAIL PROTECTED]
  *  Portions based on Smooth theme by
  *   Andrew Johnson [EMAIL PROTECTED]
- *  Portions based on IceGradient theme by  
+ *  Portions based on IceGradient theme by
  *   Tim Gerla [EMAIL PROTECTED]
- *   Tomas Ögren [EMAIL PROTECTED]
+ *   Tomas �gren [EMAIL PROTECTED]
  *   JM Perez [EMAIL PROTECTED]
- *  Portions based on Wonderland theme by   
+ *  Portions based on Wonderland theme by
  *   Garrett LeSage
  *   Alexander Larsson
  *   Owen Taylor [EMAIL PROTECTED]
- *  Portions based on Raleigh theme by 
+ *  Portions based on Raleigh theme by
  *   Owen Taylor [EMAIL PROTECTED]
  *  Portions based on Notif theme
  *  Portions based on Notif2 theme

Modified: gtk-xfce-engine-2/trunk/src/xfce_theme_draw.c

[Xfce4-commits] r28693 - in gtk-xfce-engine-2/trunk: . themes/b5 themes/basic themes/cadmium themes/curve themes/dawn themes/dusk themes/kde2 themes/kolors themes/light themes/orange themes/redmondxp

[Olivier Fourdan]

Author: olivier
Date: 2008-11-09 21:49:47 + (Sun, 09 Nov 2008)
New Revision: 28693

Modified:
   gtk-xfce-engine-2/trunk/ChangeLog
   gtk-xfce-engine-2/trunk/themes/b5/Makefile.am
   gtk-xfce-engine-2/trunk/themes/basic/Makefile.am
   gtk-xfce-engine-2/trunk/themes/cadmium/Makefile.am
   gtk-xfce-engine-2/trunk/themes/curve/Makefile.am
   gtk-xfce-engine-2/trunk/themes/dawn/Makefile.am
   gtk-xfce-engine-2/trunk/themes/dusk/Makefile.am
   gtk-xfce-engine-2/trunk/themes/kde2/Makefile.am
   gtk-xfce-engine-2/trunk/themes/kolors/Makefile.am
   gtk-xfce-engine-2/trunk/themes/light/Makefile.am
   gtk-xfce-engine-2/trunk/themes/orange/Makefile.am
   gtk-xfce-engine-2/trunk/themes/redmondxp/Makefile.am
   gtk-xfce-engine-2/trunk/themes/saltlake/Makefile.am
   gtk-xfce-engine-2/trunk/themes/smooth/Makefile.am
   gtk-xfce-engine-2/trunk/themes/stellar/Makefile.am
   gtk-xfce-engine-2/trunk/themes/winter/Makefile.am
   gtk-xfce-engine-2/trunk/themes/xfce-4.0/Makefile.am
   gtk-xfce-engine-2/trunk/themes/xfce-4.2/Makefile.am
   gtk-xfce-engine-2/trunk/themes/xfce-4.4/Makefile.am
   gtk-xfce-engine-2/trunk/themes/xfce/Makefile.am
Log:
* themes/*/Makefile.am: Forgot to remove the README.html from the
  Makefile.am

Modified: gtk-xfce-engine-2/trunk/ChangeLog
===
--- gtk-xfce-engine-2/trunk/ChangeLog   2008-11-09 21:42:17 UTC (rev 28692)
+++ gtk-xfce-engine-2/trunk/ChangeLog   2008-11-09 21:49:47 UTC (rev 28693)
@@ -1,5 +1,10 @@
 2008-11-09 olivier
 
+   * themes/*/Makefile.am: Forgot to remove the README.html from the
+ Makefile.am
+
+2008-11-09 olivier
+
* src/xfce_theme_draw.c: Fix bg color being shown under group box 
  title (Bug #1018),
  src/gradient_draw.c: Fix wrong UTF8 character in credit header

Modified: gtk-xfce-engine-2/trunk/themes/b5/Makefile.am
===
--- gtk-xfce-engine-2/trunk/themes/b5/Makefile.am   2008-11-09 21:42:17 UTC 
(rev 28692)
+++ gtk-xfce-engine-2/trunk/themes/b5/Makefile.am   2008-11-09 21:49:47 UTC 
(rev 28693)
@@ -1,5 +1,3 @@
 SUBDIRS = gtk-2.0
 themedir = $(datadir)/themes/Xfce-b5
-theme_DATA = README.html
 
-EXTRA_DIST = $(theme_DATA)

Modified: gtk-xfce-engine-2/trunk/themes/basic/Makefile.am
===
--- gtk-xfce-engine-2/trunk/themes/basic/Makefile.am2008-11-09 21:42:17 UTC 
(rev 28692)
+++ gtk-xfce-engine-2/trunk/themes/basic/Makefile.am2008-11-09 21:49:47 UTC 
(rev 28693)
@@ -1,5 +1,3 @@
 SUBDIRS = gtk-2.0
 themedir = $(datadir)/themes/Xfce-basic
-theme_DATA = README.html
 
-EXTRA_DIST = $(theme_DATA)

Modified: gtk-xfce-engine-2/trunk/themes/cadmium/Makefile.am
===
--- gtk-xfce-engine-2/trunk/themes/cadmium/Makefile.am  2008-11-09 21:42:17 UTC 
(rev 28692)
+++ gtk-xfce-engine-2/trunk/themes/cadmium/Makefile.am  2008-11-09 21:49:47 UTC 
(rev 28693)
@@ -1,5 +1,3 @@
 SUBDIRS = gtk-2.0
 themedir = $(datadir)/themes/Xfce-cadmium
-theme_DATA = README.html
 
-EXTRA_DIST = $(theme_DATA)

Modified: gtk-xfce-engine-2/trunk/themes/curve/Makefile.am
===
--- gtk-xfce-engine-2/trunk/themes/curve/Makefile.am2008-11-09 21:42:17 UTC 
(rev 28692)
+++ gtk-xfce-engine-2/trunk/themes/curve/Makefile.am2008-11-09 21:49:47 UTC 
(rev 28693)
@@ -1,5 +1,3 @@
 SUBDIRS = gtk-2.0
 themedir = $(datadir)/themes/Xfce-curve
-theme_DATA = README.html
 
-EXTRA_DIST = $(theme_DATA)

Modified: gtk-xfce-engine-2/trunk/themes/dawn/Makefile.am
===
--- gtk-xfce-engine-2/trunk/themes/dawn/Makefile.am 2008-11-09 21:42:17 UTC 
(rev 28692)
+++ gtk-xfce-engine-2/trunk/themes/dawn/Makefile.am 2008-11-09 21:49:47 UTC 
(rev 28693)
@@ -1,5 +1,3 @@
 SUBDIRS = gtk-2.0
 themedir = $(datadir)/themes/Xfce-dawn
-theme_DATA = README.html
 
-EXTRA_DIST = $(theme_DATA)

Modified: gtk-xfce-engine-2/trunk/themes/dusk/Makefile.am
===
--- gtk-xfce-engine-2/trunk/themes/dusk/Makefile.am 2008-11-09 21:42:17 UTC 
(rev 28692)
+++ gtk-xfce-engine-2/trunk/themes/dusk/Makefile.am 2008-11-09 21:49:47 UTC 
(rev 28693)
@@ -1,5 +1,3 @@
 SUBDIRS = gtk-2.0
 themedir = $(datadir)/themes/Xfce-dusk
-theme_DATA = README.html
 
-EXTRA_DIST = $(theme_DATA)

Modified: gtk-xfce-engine-2/trunk/themes/kde2/Makefile.am
===
--- gtk-xfce-engine-2/trunk/themes/kde2/Makefile.am 2008-11-09 21:42:17 UTC 
(rev 28692)
+++ gtk-xfce-engine-2/trunk/themes/kde2/Makefile.am 2008-11-09 21:49:47 UTC 
(rev 28693)
@@ -1,5 +1,3 @@
 SUBDIRS = gtk-2.0
 themedir = $(datadir)/themes/Xfce-kde2
-theme_DATA = README.html
 
-EXTRA_DIST = $(theme_DATA)

Modified: 

[Xfce4-commits] r28690 - libxfcegui4/trunk/libxfce4kbd-private

[Olivier Fourdan]

Author: olivier
Date: 2008-11-09 18:29:30 + (Sun, 09 Nov 2008)
New Revision: 28690

Modified:
   libxfcegui4/trunk/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
Log:
Keep in alphabetic order

Modified: libxfcegui4/trunk/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
===
--- libxfcegui4/trunk/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml  
2008-11-09 16:36:28 UTC (rev 28689)
+++ libxfcegui4/trunk/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml  
2008-11-09 18:29:30 UTC (rev 28690)
@@ -18,8 +18,8 @@
   property name=Down type=string value=down_key/
   property name=lt;Altgt;F4 type=string value=close_window_key/
   property name=lt;Altgt;Tab type=string value=cycle_windows_key/
+  property name=lt;Altgt;lt;Shiftgt;Tab type=string 
value=cycle_reverse_windows_key/
   property name=lt;Altgt;Delete type=string 
value=del_workspace_key/
-  property name=lt;Altgt;lt;Shiftgt;Tab type=string 
value=cycle_reverse_windows_key/
   property name=lt;Controlgt;lt;Altgt;Down type=string 
value=down_workspace_key/
   property name=lt;Altgt;F11 type=string value=fullscreen_key/
   property name=lt;Altgt;F9 type=string value=hide_window_key/

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28660 - libxfce4util/branches/xfce_4_4/libxfce4util

[Olivier Fourdan]

Author: olivier
Date: 2008-11-08 10:51:18 + (Sat, 08 Nov 2008)
New Revision: 28660

Modified:
   libxfce4util/branches/xfce_4_4/libxfce4util/libxfce4util-private.h
   libxfce4util/branches/xfce_4_4/libxfce4util/xfce-rc-private.h
Log:
Place G_GNUC_INTERNAL before the function declaration for Sun Studio 
compatibility - Patch from William Bonnet [EMAIL PROTECTED] (Bug #4580)

Modified: libxfce4util/branches/xfce_4_4/libxfce4util/libxfce4util-private.h
===
--- libxfce4util/branches/xfce_4_4/libxfce4util/libxfce4util-private.h  
2008-11-08 08:39:53 UTC (rev 28659)
+++ libxfce4util/branches/xfce_4_4/libxfce4util/libxfce4util-private.h  
2008-11-08 10:51:18 UTC (rev 28660)
@@ -30,7 +30,7 @@
 
 G_BEGIN_DECLS;
 
-void _xfce_i18n_init (void) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void _xfce_i18n_init (void);
 
 G_END_DECLS;
 

Modified: libxfce4util/branches/xfce_4_4/libxfce4util/xfce-rc-private.h
===
--- libxfce4util/branches/xfce_4_4/libxfce4util/xfce-rc-private.h   
2008-11-08 08:39:53 UTC (rev 28659)
+++ libxfce4util/branches/xfce_4_4/libxfce4util/xfce-rc-private.h   
2008-11-08 10:51:18 UTC (rev 28660)
@@ -61,71 +61,71 @@
 #define XFCE_RC_SIMPLE_CONST(obj) ((const XfceRcSimple *) (obj))
 
 
-void  _xfce_rc_init   (XfceRc   *rc) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void  _xfce_rc_init   (XfceRc   *rc);
 
-XfceRcSimple* _xfce_rc_simple_new (XfceRcSimple *shared,
+G_GNUC_INTERNAL XfceRcSimple* _xfce_rc_simple_new (XfceRcSimple 
*shared,
const gchar  *filename,
-   gboolean  readonly) 
G_GNUC_INTERNAL;
-gboolean  _xfce_rc_simple_parse   (XfceRcSimple *simple) 
G_GNUC_INTERNAL;
-void  _xfce_rc_simple_close   (XfceRc   *rc) G_GNUC_INTERNAL;
-void  _xfce_rc_simple_flush   (XfceRc   *rc) G_GNUC_INTERNAL;
-void  _xfce_rc_simple_rollback(XfceRc   *rc) G_GNUC_INTERNAL;
-gboolean  _xfce_rc_simple_is_dirty(const XfceRc *rc) G_GNUC_CONST 
G_GNUC_INTERNAL;
-gboolean  _xfce_rc_simple_is_readonly (const XfceRc *rc) G_GNUC_CONST 
G_GNUC_INTERNAL;
-const gchar*  _xfce_rc_simple_get_filename(const XfceRc *rc) G_GNUC_CONST 
G_GNUC_INTERNAL;
-gchar**   _xfce_rc_simple_get_groups  (const XfceRc *rc) G_GNUC_CONST 
G_GNUC_INTERNAL;
-gchar**   _xfce_rc_simple_get_entries (const XfceRc *rc,
-   const gchar  *name) G_GNUC_CONST 
G_GNUC_INTERNAL;
-void  _xfce_rc_simple_delete_group(XfceRc   *rc,
+   gboolean  readonly);
+G_GNUC_INTERNAL gboolean  _xfce_rc_simple_parse   (XfceRcSimple 
*simple);
+G_GNUC_INTERNAL void  _xfce_rc_simple_close   (XfceRc   *rc);
+G_GNUC_INTERNAL void  _xfce_rc_simple_flush   (XfceRc   *rc);
+G_GNUC_INTERNAL void  _xfce_rc_simple_rollback(XfceRc   *rc);
+G_GNUC_INTERNAL gboolean  _xfce_rc_simple_is_dirty(const XfceRc *rc) 
G_GNUC_CONST;
+G_GNUC_INTERNAL gboolean  _xfce_rc_simple_is_readonly (const XfceRc *rc) 
G_GNUC_CONST;
+G_GNUC_INTERNAL const gchar*  _xfce_rc_simple_get_filename(const XfceRc *rc) 
G_GNUC_CONST;
+G_GNUC_INTERNAL gchar**   _xfce_rc_simple_get_groups  (const XfceRc *rc) 
G_GNUC_CONST;
+G_GNUC_INTERNAL gchar**   _xfce_rc_simple_get_entries (const XfceRc *rc,
+   const gchar  *name) G_GNUC_CONST;
+G_GNUC_INTERNAL void  _xfce_rc_simple_delete_group(XfceRc   *rc,
const gchar  *name,
-   gboolean  global) 
G_GNUC_INTERNAL;
+   gboolean  global);
 const gchar*  _xfce_rc_simple_get_group   (const XfceRc *rc) G_GNUC_CONST;
-gboolean  _xfce_rc_simple_has_group   (const XfceRc *rc,
-   const gchar  *name) G_GNUC_CONST 
G_GNUC_INTERNAL;
-void  _xfce_rc_simple_set_group   (XfceRc   *rc,
-   const gchar  *name) G_GNUC_INTERNAL;
-void  _xfce_rc_simple_delete_entry(XfceRc   *rc,
+G_GNUC_INTERNAL gboolean  _xfce_rc_simple_has_group   (const XfceRc *rc,
+   const gchar  *name) G_GNUC_CONST;
+G_GNUC_INTERNAL void  _xfce_rc_simple_set_group   (XfceRc   *rc,
+   const gchar  *name);
+G_GNUC_INTERNAL void  _xfce_rc_simple_delete_entry(XfceRc   *rc,
const gchar  *key,
-   gboolean  global) 
G_GNUC_INTERNAL;
-gboolean  _xfce_rc_simple_has_entry   (const XfceRc *rc,
-   

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

[Olivier Fourdan]

Author: olivier
Date: 2008-11-08 16:48:10 + (Sat, 08 Nov 2008)
New Revision: 28666

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/settings.c
   xfwm4/trunk/themes/default.keys/keythemerc
Log:
* src/settings.c: Do not display warnings for workspace_names either. 
* settings-dialogs/xfwm4-settings.c: Fix possible crash when the 
  dbl_click_action setting gets unset.

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-11-08 16:01:26 UTC (rev 28665)
+++ xfwm4/trunk/ChangeLog   2008-11-08 16:48:10 UTC (rev 28666)
@@ -1,3 +1,12 @@
+2008-11-08  olivier
+
+   * src/settings.c: Do not display warnings for workspace_names either. 
+
+2008-11-08  brian
+
+   * settings-dialogs/xfwm4-settings.c: Fix possible crash when the 
+ dbl_click_action setting gets unset.
+
 2008-11-02  olivier
 
* src/parserc.c, src/settings.c: Do not display warnings for values 

Modified: xfwm4/trunk/src/settings.c
===
--- xfwm4/trunk/src/settings.c  2008-11-08 16:01:26 UTC (rev 28665)
+++ xfwm4/trunk/src/settings.c  2008-11-08 16:48:10 UTC (rev 28666)
@@ -1138,7 +1138,8 @@
 set_placement_mode (screen_info, g_value_get_string 
(value));
 }
 else if ((!strcmp (name, title_shadow_active))
-  || (!strcmp (name, title_shadow_inactive)))
+  || (!strcmp (name, title_shadow_inactive))
+  || (!strcmp (name, workspace_names)))
 {
 /* These properties are not configurable via xfconf */
 }

Modified: xfwm4/trunk/themes/default.keys/keythemerc
===
--- xfwm4/trunk/themes/default.keys/keythemerc  2008-11-08 16:01:26 UTC (rev 
28665)
+++ xfwm4/trunk/themes/default.keys/keythemerc  2008-11-08 16:48:10 UTC (rev 
28666)
@@ -1,67 +1,255 @@
-above_key=Alt+F12
-add_workspace_key=Alt+Insert
-add_adjacent_workspace_key=None
-cancel_key=Escape
-left_key=Left
-right_key=Right
-up_key=Up
-down_key=Down
-close_window_key=Alt+F4
-cycle_windows_key=Alt+Tab
-del_workspace_key=Alt+Delete
-del_active_workspace_key=None
-down_workspace_key=Control+Alt+Down
-fill_horiz_key=None
-fill_vert_key=None
-fill_window_key=None
-fullscreen_key=Alt+F11
-hide_window_key=Alt+F9
-left_workspace_key=Control+Alt+Left
-lower_window_key=Shift+Alt+Page_Down
-maximize_horiz_key=None
-maximize_vert_key=None
-maximize_window_key=Alt+F10
-move_window_key=Alt+F7
-move_window_down_workspace_key=None
-move_window_left_key=Control+Shift+Alt+Left
-move_window_left_workspace_key=None
-move_window_next_workspace_key=Alt+Control+End
-move_window_prev_workspace_key=Alt+Control+Home
-move_window_right_key=Control+Shift+Alt+Right
-move_window_right_workspace_key=None
-move_window_up_key=Control+Shift+Alt+Up
-move_window_up_workspace_key=None
-move_window_workspace_10_key=None
-move_window_workspace_11_key=None
-move_window_workspace_12_key=None
-move_window_workspace_1_key=Alt+Control+KP_1
-move_window_workspace_2_key=Alt+Control+KP_2
-move_window_workspace_3_key=Alt+Control+KP_3
-move_window_workspace_4_key=Alt+Control+KP_4
-move_window_workspace_5_key=Alt+Control+KP_5
-move_window_workspace_6_key=Alt+Control+KP_6
-move_window_workspace_7_key=Alt+Control+KP_7
-move_window_workspace_8_key=Alt+Control+KP_8
-move_window_workspace_9_key=Alt+Control+KP_9
-next_workspace_key=None
-popup_menu_key=Alt+space
-prev_workspace_key=None
-raise_window_key=Shift+Alt+Page_Up
-resize_window_key=Alt+F8
-right_workspace_key=Control+Alt+Right
-shade_window_key=Alt+F9
-show_desktop_key=Control+Alt+d
-stick_window_key=Alt+F6
-up_workspace_key=Control+Alt+Up
-workspace_10_key=Control+F10
-workspace_11_key=Control+F11
-workspace_12_key=Control+F12
-workspace_1_key=Control+F1
-workspace_2_key=Control+F2
-workspace_3_key=Control+F3
-workspace_4_key=Control+F4
-workspace_5_key=Control+F5
-workspace_6_key=Control+F6
-workspace_7_key=Control+F7
-workspace_8_key=Control+F8
-workspace_9_key=Control+F9
+  property name=xfwm4 type=empty
+property name=default type=empty
+  property name=lt;Altgt;F12 type=string value=above_key/
+/property
+  /property
+  property name=xfwm4 type=empty
+property name=default type=empty
+  property name=lt;Altgt;Insert type=string 
value=add_workspace_key/
+/property
+  /property
+  property name=xfwm4 type=empty
+property name=default type=empty
+  property name=Escape type=string value=cancel_key/
+/property
+  /property
+  property name=xfwm4 type=empty
+property name=default type=empty
+  property name=Left type=string value=left_key/
+/property
+  /property
+  property name=xfwm4 type=empty
+property name=default type=empty
+  property name=Right type=string value=right_key/
+/property
+  /property
+  

[Xfce4-commits] r28668 - in xfwm4/trunk: . settings-dialogs

[Olivier Fourdan]

Author: olivier
Date: 2008-11-08 17:19:10 + (Sat, 08 Nov 2008)
New Revision: 28668

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/settings-dialogs/workspace-settings.c
Log:
* settings-dialogs/workspace-settings.c: Fix workspaces names not being
  set in the workspace settings GUI.

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-11-08 16:54:06 UTC (rev 28667)
+++ xfwm4/trunk/ChangeLog   2008-11-08 17:19:10 UTC (rev 28668)
@@ -1,5 +1,10 @@
 2008-11-08  olivier
 
+   * settings-dialogs/workspace-settings.c: Fix workspaces names not being
+ set in the workspace settings GUI.
+
+2008-11-08  olivier
+
* src/settings.c: Do not display warnings for workspace_names either. 
 
 2008-11-08  brian

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2008-11-08 16:54:06 UTC (rev 28667)
+++ xfwm4/trunk/NEWS2008-11-08 17:19:10 UTC (rev 28668)
@@ -9,6 +9,9 @@
 - Add support for keyboard shortcuts (Bug #4492).
 - Add new option do disable blinking of urgent windows.
 - Fix possible crash when the dbl_click_action setting gets unset.
+- Fix workspaces names not being set in the workspace settings GUI.
+- Do not display warnings for values that are not configurable via xfconf 
+  (typically theme settings).
 
 4.5.91 (Xfce 4.6beta1)
 ==

Modified: xfwm4/trunk/settings-dialogs/workspace-settings.c
===
--- xfwm4/trunk/settings-dialogs/workspace-settings.c   2008-11-08 16:54:06 UTC 
(rev 28667)
+++ xfwm4/trunk/settings-dialogs/workspace-settings.c   2008-11-08 17:19:10 UTC 
(rev 28668)
@@ -248,6 +248,7 @@
 WnckScreen *screen;
 gint n_workspaces, i;
 GtkTreeIter iter;
+gchar **names;
 
 dialog = glade_xml_get_widget(gxml, change_name_dialog);
 g_object_set_data(G_OBJECT(dialog), name-entry,
@@ -280,10 +281,21 @@
 
 screen = wnck_screen_get_default();
 wnck_screen_force_update(screen);
+names = xfconf_channel_get_string_list(channel, WORKSPACE_NAMES_PROP);
 
 n_workspaces = wnck_screen_get_workspace_count(screen);
-for(i = 0; i  n_workspaces; ++i) {
+i = 0;
+for(; i  n_workspaces  names[i]; ++i) {
 WnckWorkspace *space = wnck_screen_get_workspace(screen, i);
+
+gtk_list_store_append(ls, iter);
+gtk_list_store_set(ls, iter,
+   COL_NUMBER, i + 1,
+   COL_NAME, names[i],
+   -1);
+}
+for(; i  n_workspaces; ++i) {
+WnckWorkspace *space = wnck_screen_get_workspace(screen, i);
 const char *name = wnck_workspace_get_name(space);
 
 gtk_list_store_append(ls, iter);
@@ -292,6 +304,7 @@
COL_NAME, name,
-1);
 }
+g_strfreev(names);
 
 gtk_tree_view_set_model(GTK_TREE_VIEW(treeview), GTK_TREE_MODEL(ls));
 
@@ -334,7 +347,7 @@
 gtk_spin_button_set_range (GTK_SPIN_BUTTON (margin_left_spinbutton), 0, 
hmax);
 
 /* Bind easy properties */
-xfconf_g_property_bind (channel, 
+xfconf_g_property_bind (channel,
 /general/workspace_count,
 G_TYPE_INT,
 (GObject *)workspace_count_spinbutton, value);
@@ -372,7 +385,7 @@
 };
 
 
-int 
+int
 main(int argc, gchar **argv)
 {
 GladeXML *gxml;
@@ -417,7 +430,7 @@
 
 if(opt_socket_id == 0) {
 dialog = glade_xml_get_widget (gxml, main-dialog);
-
+
 while(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_HELP) {
 /* FIXME: launch help */
 }

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28667 - xfwm4/trunk/themes/default.keys

[Olivier Fourdan]

Author: olivier
Date: 2008-11-08 16:54:06 + (Sat, 08 Nov 2008)
New Revision: 28667

Modified:
   xfwm4/trunk/themes/default.keys/keythemerc
Log:
Revert some temporary change that were not meant to be committed

Modified: xfwm4/trunk/themes/default.keys/keythemerc
===
--- xfwm4/trunk/themes/default.keys/keythemerc  2008-11-08 16:48:10 UTC (rev 
28666)
+++ xfwm4/trunk/themes/default.keys/keythemerc  2008-11-08 16:54:06 UTC (rev 
28667)
@@ -1,255 +1,67 @@
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Altgt;F12 type=string value=above_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Altgt;Insert type=string 
value=add_workspace_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=Escape type=string value=cancel_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=Left type=string value=left_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=Right type=string value=right_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=Up type=string value=up_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=Down type=string value=down_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Altgt;F4 type=string value=close_window_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Altgt;Tab type=string value=cycle_windows_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Altgt;Delete type=string 
value=del_workspace_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Controlgt;lt;Altgt;Down type=string 
value=down_workspace_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Altgt;F11 type=string value=fullscreen_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Altgt;F9 type=string value=hide_window_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Controlgt;lt;Altgt;Left type=string 
value=left_workspace_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Shiftgt;lt;Altgt;Page_Down type=string 
value=lower_window_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Altgt;F10 type=string 
value=maximize_window_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Altgt;F7 type=string value=move_window_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Controlgt;lt;Shiftgt;lt;Altgt;Left 
type=string value=move_window_left_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Altgt;lt;Controlgt;End type=string 
value=move_window_next_workspace_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Altgt;lt;Controlgt;Home type=string 
value=move_window_prev_workspace_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Controlgt;lt;Shiftgt;lt;Altgt;Right 
type=string value=move_window_right_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Controlgt;lt;Shiftgt;lt;Altgt;Up type=string 
value=move_window_up_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Altgt;lt;Controlgt;KP_1 type=string 
value=move_window_workspace_1_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Altgt;lt;Controlgt;KP_2 type=string 
value=move_window_workspace_2_key/
-/property
-  /property
-  property name=xfwm4 type=empty
-property name=default type=empty
-  property name=lt;Altgt;lt;Controlgt;KP_3 type=string 
value=move_window_workspace_3_key/
-/property
-  /property
-  property name=xfwm4 

[Xfce4-commits] r28669 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2008-11-08 17:28:50 + (Sat, 08 Nov 2008)
New Revision: 28669

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/settings.c
Log:
* src/settings.c: Do not display warnings for workspace_names, for
  real this time... 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-11-08 17:19:10 UTC (rev 28668)
+++ xfwm4/trunk/ChangeLog   2008-11-08 17:28:50 UTC (rev 28669)
@@ -1,5 +1,10 @@
 2008-11-08  olivier
 
+   * src/settings.c: Do not display warnings for workspace_names, for
+ real this time... 
+
+2008-11-08  olivier
+
* settings-dialogs/workspace-settings.c: Fix workspaces names not being
  set in the workspace settings GUI.
 

Modified: xfwm4/trunk/src/settings.c
===
--- xfwm4/trunk/src/settings.c  2008-11-08 17:19:10 UTC (rev 28668)
+++ xfwm4/trunk/src/settings.c  2008-11-08 17:28:50 UTC (rev 28669)
@@ -1138,8 +1138,7 @@
 set_placement_mode (screen_info, g_value_get_string 
(value));
 }
 else if ((!strcmp (name, title_shadow_active))
-  || (!strcmp (name, title_shadow_inactive))
-  || (!strcmp (name, workspace_names)))
+  || (!strcmp (name, title_shadow_inactive)))
 {
 /* These properties are not configurable via xfconf */
 }
@@ -1378,7 +1377,14 @@
 }
 break;
 default:
-g_warning(The type of property '%s' is not supported, 
property_name);
+if (!strcmp (name, workspace_names))
+{
+/* These properties are not configurable via xfconf */
+}
+else
+{
+g_warning(The property '%s' is not supported, 
property_name);
+}
 break;
 }
 }

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28671 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2008-11-08 20:20:40 + (Sat, 08 Nov 2008)
New Revision: 28671

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/tabwin.c
Log:
* src/tabwin.c: Draw focus in tabwin to make sure the selection is
  visible even with themes that do not show selected items. 

Modified: xfwm4/trunk/ChangeLog
===
--- xfwm4/trunk/ChangeLog   2008-11-08 20:06:57 UTC (rev 28670)
+++ xfwm4/trunk/ChangeLog   2008-11-08 20:20:40 UTC (rev 28671)
@@ -1,5 +1,10 @@
 2008-11-08  olivier
 
+   * src/tabwin.c: Draw focus in tabwin to make sure the selection is
+ visible even with themes that do not show selected items. 
+
+2008-11-08  olivier
+
* src/settings.c: Do not display warnings for workspace_names, for
  real this time... 
 

Modified: xfwm4/trunk/NEWS
===
--- xfwm4/trunk/NEWS2008-11-08 20:06:57 UTC (rev 28670)
+++ xfwm4/trunk/NEWS2008-11-08 20:20:40 UTC (rev 28671)
@@ -12,6 +12,8 @@
 - Fix workspaces names not being set in the workspace settings GUI.
 - Do not display warnings for values that are not configurable via xfconf 
   (typically theme settings).
+- Draw focus in tabwin to make sure the selection is visible even with themes 
+  that do not show selected items.
 
 4.5.91 (Xfce 4.6beta1)
 ==

Modified: xfwm4/trunk/src/tabwin.c
===
--- xfwm4/trunk/src/tabwin.c2008-11-08 20:06:57 UTC (rev 28670)
+++ xfwm4/trunk/src/tabwin.c2008-11-08 20:20:40 UTC (rev 28671)
@@ -67,14 +67,18 @@
 static gboolean
 paint_selected (GtkWidget * w, GdkEventExpose * event, gpointer data)
 {
-gtk_paint_box (w-style, w-window,
+gtk_draw_flat_box (w-style, w-window,
 GTK_STATE_SELECTED,
-GTK_SHADOW_IN,
-NULL, w, box,
+GTK_SHADOW_NONE,
 w-allocation.x - WIN_ICON_BORDER,
 w-allocation.y - WIN_ICON_BORDER,
 w-allocation.width + 2 * WIN_ICON_BORDER,
 w-allocation.height + 2 * WIN_ICON_BORDER);
+   gtk_draw_focus (w-style, w-window,
+w-allocation.x - WIN_ICON_BORDER,
+w-allocation.y - WIN_ICON_BORDER,
+w-allocation.width + 2 * WIN_ICON_BORDER,
+w-allocation.height + 2 * WIN_ICON_BORDER);
 return FALSE;
 }
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28672 - xfwm4/trunk/src

[Olivier Fourdan]

Author: olivier
Date: 2008-11-08 20:21:41 + (Sat, 08 Nov 2008)
New Revision: 28672

Modified:
   xfwm4/trunk/src/tabwin.c
Log:
indentation

Modified: xfwm4/trunk/src/tabwin.c
===
--- xfwm4/trunk/src/tabwin.c2008-11-08 20:20:40 UTC (rev 28671)
+++ xfwm4/trunk/src/tabwin.c2008-11-08 20:21:41 UTC (rev 28672)
@@ -74,7 +74,7 @@
 w-allocation.y - WIN_ICON_BORDER,
 w-allocation.width + 2 * WIN_ICON_BORDER,
 w-allocation.height + 2 * WIN_ICON_BORDER);
-   gtk_draw_focus (w-style, w-window,
+gtk_draw_focus (w-style, w-window,
 w-allocation.x - WIN_ICON_BORDER,
 w-allocation.y - WIN_ICON_BORDER,
 w-allocation.width + 2 * WIN_ICON_BORDER,

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r28628 - thunar/trunk/po

[Olivier Fourdan]

Author: olivier
Date: 2008-11-06 10:51:37 + (Thu, 06 Nov 2008)
New Revision: 28628

Modified:
   thunar/trunk/po/ar.po
   thunar/trunk/po/be.po
   thunar/trunk/po/ca.po
   thunar/trunk/po/cs.po
   thunar/trunk/po/da.po
   thunar/trunk/po/de.po
   thunar/trunk/po/dz.po
   thunar/trunk/po/el.po
   thunar/trunk/po/en_GB.po
   thunar/trunk/po/eo.po
   thunar/trunk/po/es.po
   thunar/trunk/po/et.po
   thunar/trunk/po/eu.po
   thunar/trunk/po/fi.po
   thunar/trunk/po/fr.po
   thunar/trunk/po/gl.po
   thunar/trunk/po/he.po
   thunar/trunk/po/hu.po
   thunar/trunk/po/id.po
   thunar/trunk/po/it.po
   thunar/trunk/po/ja.po
   thunar/trunk/po/ka.po
   thunar/trunk/po/ko.po
   thunar/trunk/po/ku.po
   thunar/trunk/po/lt.po
   thunar/trunk/po/lv.po
   thunar/trunk/po/mk.po
   thunar/trunk/po/nb_NO.po
   thunar/trunk/po/nl.po
   thunar/trunk/po/nn_NO.po
   thunar/trunk/po/pa.po
   thunar/trunk/po/pl.po
   thunar/trunk/po/pt_BR.po
   thunar/trunk/po/pt_PT.po
   thunar/trunk/po/ro.po
   thunar/trunk/po/ru.po
   thunar/trunk/po/sq.po
   thunar/trunk/po/sv.po
   thunar/trunk/po/tr.po
   thunar/trunk/po/uk.po
   thunar/trunk/po/ur.po
   thunar/trunk/po/zh_CN.po
Log:
msgctxt requires gnu gettext 0.15 or later

Modified: thunar/trunk/po/ar.po
===
--- thunar/trunk/po/ar.po   2008-11-06 10:22:28 UTC (rev 28627)
+++ thunar/trunk/po/ar.po   2008-11-06 10:51:37 UTC (rev 28628)
@@ -2653,7 +2653,6 @@
 
 #: ../thunar/thunar-window.c:688
 #, c-format
-msgctxt CategoryName (FolderName)
 msgid %s (%s)
 msgstr 
 

Modified: thunar/trunk/po/be.po
===
--- thunar/trunk/po/be.po   2008-11-06 10:22:28 UTC (rev 28627)
+++ thunar/trunk/po/be.po   2008-11-06 10:51:37 UTC (rev 28628)
@@ -2708,7 +2708,6 @@
 
 #: ../thunar/thunar-window.c:688
 #, fuzzy, c-format
-msgctxt CategoryName (FolderName)
 msgid %s (%s)
 msgstr \%s\ (%s) %s
 

Modified: thunar/trunk/po/ca.po
===
--- thunar/trunk/po/ca.po   2008-11-06 10:22:28 UTC (rev 28627)
+++ thunar/trunk/po/ca.po   2008-11-06 10:51:37 UTC (rev 28628)
@@ -2672,7 +2672,6 @@
 
 #: ../thunar/thunar-window.c:688
 #, fuzzy, c-format
-msgctxt CategoryName (FolderName)
 msgid %s (%s)
 msgstr «%s» (%s) %s
 

Modified: thunar/trunk/po/cs.po
===
--- thunar/trunk/po/cs.po   2008-11-06 10:22:28 UTC (rev 28627)
+++ thunar/trunk/po/cs.po   2008-11-06 10:51:37 UTC (rev 28628)
@@ -2656,7 +2656,6 @@
 
 #: ../thunar/thunar-window.c:688
 #, c-format
-msgctxt CategoryName (FolderName)
 msgid %s (%s)
 msgstr %s (%s)
 

Modified: thunar/trunk/po/da.po
===
--- thunar/trunk/po/da.po   2008-11-06 10:22:28 UTC (rev 28627)
+++ thunar/trunk/po/da.po   2008-11-06 10:51:37 UTC (rev 28628)
@@ -2631,7 +2631,6 @@
 
 #: ../thunar/thunar-window.c:688
 #, c-format
-msgctxt CategoryName (FolderName)
 msgid %s (%s)
 msgstr %s (%s)
 

Modified: thunar/trunk/po/de.po
===
--- thunar/trunk/po/de.po   2008-11-06 10:22:28 UTC (rev 28627)
+++ thunar/trunk/po/de.po   2008-11-06 10:51:37 UTC (rev 28628)
@@ -2686,7 +2686,6 @@
 
 #: ../thunar/thunar-window.c:688
 #, c-format
-msgctxt CategoryName (FolderName)
 msgid %s (%s)
 msgstr »%s« (%s)
 

Modified: thunar/trunk/po/dz.po
===
--- thunar/trunk/po/dz.po   2008-11-06 10:22:28 UTC (rev 28627)
+++ thunar/trunk/po/dz.po   2008-11-06 10:51:37 UTC (rev 28628)
@@ -2677,7 +2677,6 @@
 
 #: ../thunar/thunar-window.c:688
 #, fuzzy, c-format
-msgctxt CategoryName (FolderName)
 msgid %s (%s)
 msgstr \%s\ (%s) %s
 

Modified: thunar/trunk/po/el.po
===
--- thunar/trunk/po/el.po   2008-11-06 10:22:28 UTC (rev 28627)
+++ thunar/trunk/po/el.po   2008-11-06 10:51:37 UTC (rev 28628)
@@ -2690,7 +2690,6 @@
 
 #: ../thunar/thunar-window.c:688
 #, fuzzy, c-format
-msgctxt CategoryName (FolderName)
 msgid %s (%s)
 msgstr \%s\ (%s) %s
 

Modified: thunar/trunk/po/en_GB.po
===
--- thunar/trunk/po/en_GB.po2008-11-06 10:22:28 UTC (rev 28627)
+++ thunar/trunk/po/en_GB.po2008-11-06 10:51:37 UTC (rev 28628)
@@ -2661,7 +2661,6 @@
 
 #: ../thunar/thunar-window.c:688
 #, fuzzy, c-format
-msgctxt CategoryName (FolderName)
 msgid %s (%s)
 msgstr \%s\ (%s) %s
 

Modified: thunar/trunk/po/eo.po
===
--- thunar/trunk/po/eo.po   2008-11-06 10:22:28 UTC (rev 28627)
+++ thunar/trunk/po/eo.po   2008-11-06 10:51:37 UTC (rev 28628)
@@ -2666,7 +2666,6 @@
 
 #: ../thunar/thunar-window.c:688
 #, fuzzy, c-format
-msgctxt CategoryName