* src/main.c (main): call init_window_stuff(). Remove call to init_numbers().

(clean_up): call free_window_stuff(). Remove call to free_numbers().

* src/list.h (free_window_stuff): new prototype
(init_window_stuff): likewise

* src/list.c (rp_window_numset): new global
(init_window_stuff): new function
(free_window_stuff): new function

* src/data.h (rp_window_numset): new extern

* src/number.c (numset_init): new function
(number_is_taken): rename to numset_num_is_taken, callers updated.
(find_empty_cell): rename to numset_find_empty_cell, callers updated.
(add_window_number): rename to numset_add_num, callers updated.
(return_window_number): rename to numset_release, callers updated.
(init_numbers): remove function
(free_numbers): rename to numset_free, callers updated.
(numset_num_is_taken): take struct numset* as an argument.
(numset_find_empty_cell): likewise
(numset_add_num): likewise
(numset_request): likewise
(numset_release): likewise
(numset_free): likewise
(numset_new): new function

1 files changed, 3 insertions, 3 deletions

diff --git a/src/manage.c b/src/manage.c
index 1cdb66a..7a19934 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -267,7 +267,7 @@ update_window_information (rp_window *win)
 void
 unmanage (rp_window *w)
 {
-  return_window_number (w->number);
+  numset_release (rp_window_numset, w->number);
   list_del (&w->node);
   free_window (w);  
 
@@ -635,7 +635,7 @@ map_window (rp_window *win)
 
   /* Fill in the necessary data about the window */
   update_window_information (win);
-  win->number = get_unique_window_number ();
+  win->number = numset_request (rp_window_numset);
   grab_prefix_key (win->w);
 
   /* Put win in the mapped window list */
@@ -719,7 +719,7 @@ withdraw_window (rp_window *win)
 
   /* Give back the window number. the window will get another one,
      if it is remapped. */
-  return_window_number (win->number);
+  numset_release (rp_window_numset, win->number);
   win->number = -1;
 
   list_move_tail(&win->node, &rp_unmapped_window);