From 3fab73f16358dc13d0513df6778337dc5045add3 Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Wed, 18 May 2005 16:43:39 +0000
Subject: . Update to 2.1.0. . Quieten seach and replace. . Remove a warning
 message that is no longer relevant.

---
 x11-wm/afterstep-stable/files/patch-Arrange.c | 48 ++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 12 deletions(-)

(limited to 'x11-wm/afterstep-stable/files/patch-Arrange.c')

diff --git a/x11-wm/afterstep-stable/files/patch-Arrange.c b/x11-wm/afterstep-stable/files/patch-Arrange.c
index 4c9d2d40bd98..9983898f945b 100644
--- a/x11-wm/afterstep-stable/files/patch-Arrange.c
+++ b/x11-wm/afterstep-stable/files/patch-Arrange.c
@@ -1,8 +1,28 @@
 $FreeBSD$
 
---- src/Arrange/Arrange.c.orig	Wed May  4 14:15:17 2005
-+++ src/Arrange/Arrange.c	Wed May  4 14:16:39 2005
-@@ -457,11 +457,12 @@
+--- src/Arrange/Arrange.c.orig	Wed May 18 10:38:10 2005
++++ src/Arrange/Arrange.c	Wed May 18 10:39:48 2005
+@@ -488,15 +488,14 @@
+ {
+ 	int buf_size = 256;
+ 	char buf[buf_size];
+-	
+-	ASWindowData *wd = fetch_window_by_id( ((client_item *) data)->cl );
+-	if(!wd)
+-		return True;
+-
+ 	/* used by SendNumCommand */
+ 	send_signed_data_type vals[2] ;	
+ 	send_signed_data_type units[2] ;
+ 
++	ASWindowData *wd = fetch_window_by_id( ((client_item *) data)->cl );
++	if(!wd)
++		return True;
++
+ 	if(! window_is_suitable( wd ))
+ 	  return True; /* Next window please */
+ 
+@@ -550,6 +549,7 @@
  void 
  tile_windows()
  {
@@ -10,20 +30,24 @@ $FreeBSD$
  	int n_windows = 0;
  	iterate_asbidirlist( ArrangeState.clients_order,
  			     count_managed_windows, &n_windows, NULL, False);
+@@ -561,7 +561,7 @@
+ 	if(ArrangeState.count == 0)
+ 	  ArrangeState.count = n_windows; /*Put all elements in one group*/
  	
--	int n_groups = ArrangeState.clients_order->count / ArrangeState.count;
-+	n_groups = ArrangeState.clients_order->count / ArrangeState.count;
- 	if(ArrangeState.clients_order->count % ArrangeState.count)
- 		n_groups++;
- 	
-@@ -505,12 +506,11 @@
- Bool 
- cascade_window(void *data, void *aux_data)
+-	int n_groups = n_windows / ArrangeState.count;
++	n_groups = n_windows / ArrangeState.count;
+ 	/* If not all windows fit in n_groups groups, an
+ 	 * extra group for remaining windows is needed.*/
+ 	if(n_windows % ArrangeState.count)
+@@ -614,13 +614,12 @@
  {
+ 	int buf_size = 256;
+ 	char buf[buf_size];
 +	send_signed_data_type vals[2] ;	
 +	send_signed_data_type units[2] ;	
+ 	
  	ASWindowData *wd = fetch_window_by_id( ((client_item *) data)->cl );
- 	if(wd == NULL)
+ 	if(!wd)
  		return True;
 -
 -	send_signed_data_type vals[2] ;	
-- 
cgit v1.2.3