* 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, 21 insertions, 21 deletions

diff --git a/src/manage.c b/src/manage.c
index 60f7971..c389e22 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -263,7 +263,7 @@ update_window_information (rp_window *win)
   /* Transient status */
   win->transient = XGetTransientForHint (dpy, win->w, &win->transient_for);  
 
-  update_window_position (win);
+  update_window_gravity (win);
 }
 
 void
@@ -370,41 +370,41 @@ move_window (rp_window *win)
     return;
 
   /* X coord. */
-  switch (win->position)
+  switch (win->gravity)
     {
-    case TOP_LEFT:
-    case CENTER_LEFT:
-    case BOTTOM_LEFT:
+    case NorthWestGravity:
+    case WestGravity:
+    case SouthWestGravity:
       win->x = win->frame->x;
       break;
-    case TOP_CENTER:
-    case BOTTOM_CENTER:
-    case CENTER_CENTER:
+    case NorthGravity:
+    case CenterGravity:
+    case SouthGravity:
       win->x = win->frame->x + (win->frame->width - win->border * 2) / 2 - win->width / 2;
       break;
-    case TOP_RIGHT:
-    case CENTER_RIGHT:
-    case BOTTOM_RIGHT:
+    case NorthEastGravity:
+    case EastGravity:
+    case SouthEastGravity:
       win->x = win->frame->x + win->frame->width - win->width - win->border;
       break;
     }
 
   /* Y coord. */
-  switch (win->position)
+  switch (win->gravity)
     {
-    case TOP_LEFT:
-    case TOP_CENTER:
-    case TOP_RIGHT:
+    case NorthEastGravity:
+    case NorthGravity:
+    case NorthWestGravity:
       win->y = win->frame->y;
       break;
-    case CENTER_LEFT:
-    case CENTER_CENTER:
-    case CENTER_RIGHT:
+    case EastGravity:
+    case CenterGravity:
+    case WestGravity:
       win->y = win->frame->y + (win->frame->height - win->border * 2) / 2 - win->height / 2;
       break;
-    case BOTTOM_LEFT:
-    case BOTTOM_CENTER:
-    case BOTTOM_RIGHT:
+    case SouthEastGravity:
+    case SouthGravity:
+    case SouthWestGravity:
       win->y = win->frame->y + win->frame->height - win->height - win->border;
       break;
     }