* src/window.c: do not include ctype.h

* src/ratpoison.h (str_comp): new prototype

* src/messages.h (MESSAGE_PROMPT_SWITCH_TO_GROUP): new define

* src/main.c: include ctype.h
(str_comp): moved from window.c

* src/group.h (groups_find_group_by_name): new prototype.
(groups_find_group_by_number): likewise.
(groups_merge): likewise
(group_move_window): likewise

* src/group.c: include string.h
(group_new): new argument, name. All callers updated. prototype
updated.
(init_groups): create the first group with DEFAULT_GROUP_NAME as
its name.
(group_new): new argument, name. All callers updated. Prototype
updated.
(group_free): free the group's name.
(group_add_new_group): new argument, name. All callers
updated. Prototype updated.
(groups_find_group_by_name): new function
(groups_find_group_by_number): likewise
(group_move_window): likewise
(groups_merge): likewise

* src/conf.h (DEFAULT_GROUP_NAME): new define

* src/actions.h (cmd_gselect): new prototype
(cmd_groups): likewise
(cmd_gmove): likewise
(cmd_gmerge): likewise
(cmd_gnewbg): likewise

* src/actions.c (user_commands): new commands gselect, groups,
gmove, gmerge, gnewbg.
(cmd_gnewbg): new function
(find_group): likewise
(cmd_gselect): likewise
(cmd_groups): likewise
(cmd_gmove): likewise
(cmd_gmerge): likewise

1 files changed, 7 insertions, 2 deletions

diff --git a/src/group.h b/src/group.h
index fa58cce..748c273 100644
--- a/src/group.h
+++ b/src/group.h
@@ -5,7 +5,7 @@ void init_groups ();
 void group_add_window (rp_group *g, rp_window *w);
 void group_resort_window (rp_group *g, rp_window_elem *w);
 void group_free (rp_group *g);
-rp_group *group_new (int number);
+rp_group *group_new (int number, char *name);
 
 void group_del_window (rp_group *g, rp_window *win);
 void groups_del_window (rp_window *win);
@@ -18,15 +18,20 @@ void groups_unmap_window (rp_window *win);
 
 rp_window *group_prev_window (rp_group *g, rp_window *win);
 rp_window *group_next_window (rp_group *g, rp_window *win);
+rp_group *groups_find_group_by_name (char *s);
+rp_group *groups_find_group_by_number (int n);
 
 rp_window *group_last_window (rp_group *g);
 
 rp_group *group_prev_group ();
 rp_group *group_next_group ();
 
-rp_group *group_add_new_group ();
+rp_group *group_add_new_group (char *name);
 
 rp_window_elem *group_find_window (struct list_head *list, rp_window *win);
 rp_window_elem *group_find_window_by_number (rp_group *g, int num);
 
+void group_move_window (rp_group *to, rp_window *win);
+void groups_merge (rp_group *from, rp_group *to);
+
 #endif