* src/split.h (find_frame_up): new prototype

(find_frame_down): likewise
(find_frame_left): likewise
(find_frame_right): likewise

* src/split.c (find_frame_up): new function
(find_frame_down): likewise
(find_frame_left): likewise
(find_frame_right): likewise

* src/manage.c (move_window): use x11 gravity constants to denote
gravity.

* src/main.c (ratpoison_longopts): remove --kill and
--restart. Dependant code updated.
(init_defaults): use x11 gravity constants to denote gravity.
(main): only display the startup message if
defaults.startup_message is on.

* src/list.c (update_window_gravity): rename from
update_window_position. dependant code updated

* src/events.c (client_msg): don't test for restart or kill client
messages.
(client_msg): properly handle iconify requests.
(get_event): kill and restart the process here.

* src/data.h (TOP_LEFT): remove define
(TOP_CENTER): likewise
(TOP_RIGHT): likewise
(CENTER_LEFT): likewise
(CENTER_CENTER): likewise
(CENTER_RIGHT): likewise
(BOTTOM_LEFT): likewise
(BOTTOM_CENTER): likewise
(BOTTOM_RIGHT): likewise
(struct rp_window): rename field to position to gravity.
(struct rp_defaults): rename win_pos to win_gravity, trans_pos to
trans_gravity and maxsize_pos to maxsize_gravity.
(rp_restart): remove global variable
(rp_kill): likewise

* src/communications.h (send_kill): remove prototype
(send_restart): likewise

* src/communications.c (send_restart): remove function. obsolete.
(send_kill): likewise

* src/bar.c (bar_x): Use X11 gravity constants to denote location.
(bar_y): likewise

* src/actions.h (cmd_focusup): new prototype
(cmd_focusdown): likewise
(cmd_focusleft): likewise
(cmd_focusright): likewise
(cmd_startup_message): likewise
(cmd_restart): likewise

* src/actions.c (cmd_quit): just set the kill_signalled variable.
(parse_wingravity): use compass directions to describe the gravity
(parse_wingravity): renamed from parse_winpos. dependant code
updated.
(cmd_gravity): renamed from cmd_pos. dependant code updated.
(cmd_defwingravity): renamed from cmd_defwinpos. dependant code
updated.
(cmd_deftransgravity): renamed from cmd_deftranspos. dependant
code updated.
(cmd_defmaxsizegravity): renamed from cmd_defmaxsizepos. dependant
code updated.
(cmd_focusup): new function
(cmd_focusdown): likewise
(cmd_focusleft): likewise
(cmd_focusright): likewise
(cmd_restart): likewise
(cmd_startup_message): likewise
(user_commands): new commands "focusup" "focusdown" "focusright"
"focusleft" "startup_message" "restart".

1 files changed, 8 insertions, 22 deletions

diff --git a/src/data.h b/src/data.h
index b29047f..a1f799c 100644
--- a/src/data.h
+++ b/src/data.h
@@ -43,20 +43,6 @@ struct rp_window_frame
   rp_window_frame *prev, *next;
 };
 
-
-/* Possible positions for a window. */
-#define TOP_LEFT      0
-#define TOP_CENTER    1
-#define TOP_RIGHT     2
-
-#define CENTER_LEFT   3
-#define CENTER_CENTER 4
-#define CENTER_RIGHT  5
-
-#define BOTTOM_LEFT   6
-#define BOTTOM_CENTER 7
-#define BOTTOM_RIGHT  8
-
 struct rp_window
 {
   screen_info *scr;
@@ -88,9 +74,9 @@ struct rp_window
   /* Saved mouse position */
   int mouse_x, mouse_y;
 
-  /* The alignment of the window. To what side or corner should the
-     window stick to. */
-  int position;
+  /* The alignment of the window. Decides to what side or corner the
+     window sticks to. */
+  int gravity;
 
   /* A window can be visible inside a frame but not the frame's
      current window. This keeps track of what frame the window was
@@ -130,9 +116,9 @@ struct rp_defaults
 {
   /* Default positions for new normal windows, transient windows, and
      normal windows with maxsize hints. */
-  int win_pos;
-  int trans_pos;
-  int maxsize_pos;
+  int win_gravity;
+  int trans_gravity;
+  int maxsize_gravity;
 
   int input_window_size;
   int window_border_width;
@@ -157,6 +143,8 @@ struct rp_defaults
 
   /* Which name to use: wm_name, res_name, res_class. */
   int win_name;
+
+  int startup_message;
 };
 
 extern struct rp_defaults defaults;
@@ -195,8 +183,6 @@ extern int num_screens;
 extern XEvent rp_current_event;
 
 extern Display *dpy;
-extern Atom rp_restart;
-extern Atom rp_kill;
 extern Atom rp_command;
 extern Atom rp_command_request;
 extern Atom rp_command_result;