(bar_y): take into account screen padding

(bar_x): likewise

2 files changed, 11 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 00fb67f..90eadaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-11-17  Shawn Betts  <sabetts@vcn.bc.ca>
 
+	* src/bar.c (bar_y): take into account screen padding
+	(bar_x): likewise
+
 	* src/split.c (show_frame_indicator): use defaults.frame_fmt
 	(show_frame_message): format frame_fmt string with format_string
 
diff --git a/src/bar.c b/src/bar.c
index 769b3b7..01ecfcd 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -98,17 +98,17 @@ bar_x (rp_screen *s, int width)
     case NorthWestGravity:
     case WestGravity:
     case SouthWestGravity:
-      x = s->left;
+      x = s->left + defaults.padding_left;
       break;
     case NorthGravity:
     case CenterGravity:
     case SouthGravity:
-      x = s->left + (s->width - width - defaults.bar_border_width * 2) / 2;
+      x = s->left + (s->width - width - defaults.bar_border_width * 2) / 2 - defaults.padding_right;
       break;
     case NorthEastGravity:
     case EastGravity:
     case SouthEastGravity:
-      x = s->left + s->width - width - defaults.bar_border_width * 2;
+      x = s->left + s->width - width - defaults.bar_border_width * 2 - defaults.padding_right;
       break;
     }
 
@@ -125,19 +125,21 @@ bar_y (rp_screen *s, int height)
     case NorthEastGravity:
     case NorthGravity:
     case NorthWestGravity:
-      y = s->top;
+      y = s->top + defaults.padding_top;
       break;
     case EastGravity:
     case CenterGravity:
     case WestGravity:
       y = s->top + (s->height - height
-           - defaults.bar_border_width * 2) / 2;
+           - defaults.bar_border_width * 2) / 2
+	   - defaults.padding_top;
       break;
     case SouthEastGravity:
     case SouthGravity:
     case SouthWestGravity:
       y = s->top + (s->height - height
-           - defaults.bar_border_width * 2);
+           - defaults.bar_border_width * 2)
+ 	   - defaults.padding_top;
       break;
     }