* src/split.c (set_active_frame): call switch_frame hook

(show_frame_indicator): only show frame indicator
(set_active_frame): new arg force_indicator. all callers updated.
(show_frame_indicator): new arg force. all callers updated.

* src/main.c (init_defaults): init bar_in_padding

* src/globals.c (rp_switch_screen_hook): new hook

* src/data.h (struct rp_defaults): new slot, bar_in_padding

* src/bar.c (bar_x): honour bar_in_padding setting
(bar_y): likewise

* src/actions.c (init_set_vars): add barinpadding
(set_barinpadding): new function

* src/globals.h: new global rp_switch_screen_hook

1 files changed, 8 insertions, 6 deletions

diff --git a/src/bar.c b/src/bar.c
index 08c8d23..e87f4e5 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -111,17 +111,19 @@ bar_x (rp_screen *s, int width)
     case NorthWestGravity:
     case WestGravity:
     case SouthWestGravity:
-      x = s->left + defaults.padding_left;
+      x = s->left + (defaults.bar_in_padding ? 0 : defaults.padding_left);
       break;
     case NorthGravity:
     case CenterGravity:
     case SouthGravity:
-      x = s->left + (s->width - width - defaults.bar_border_width * 2) / 2 - defaults.padding_right;
+      x = s->left + (s->width - width - defaults.bar_border_width * 2) / 2
+          - (defaults.bar_in_padding ? 0 : defaults.padding_left);
       break;
     case NorthEastGravity:
     case EastGravity:
     case SouthEastGravity:
-      x = s->left + s->width - width - defaults.bar_border_width * 2 - defaults.padding_right;
+      x = s->left + s->width - width - defaults.bar_border_width * 2
+          - (defaults.bar_in_padding ? 0 : defaults.padding_right);
       break;
     }
 
@@ -138,21 +140,21 @@ bar_y (rp_screen *s, int height)
     case NorthEastGravity:
     case NorthGravity:
     case NorthWestGravity:
-      y = s->top + defaults.padding_top;
+      y = s->top + (defaults.bar_in_padding ? 0 : defaults.padding_top);
       break;
     case EastGravity:
     case CenterGravity:
     case WestGravity:
       y = s->top + (s->height - height
            - defaults.bar_border_width * 2) / 2
-	   - defaults.padding_top;
+	   - (defaults.bar_in_padding ? 0 : defaults.padding_top);
       break;
     case SouthEastGravity:
     case SouthGravity:
     case SouthWestGravity:
       y = s->top + (s->height - height
            - defaults.bar_border_width * 2)
- 	   - defaults.padding_top;
+ 	   - (defaults.bar_in_padding ? 0 : defaults.padding_top);
       break;
     }