summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/split.c33
2 files changed, 18 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 6eb8c67..9be6f93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2001-04-15 shawn <sabetts@diggin.lamenet.tmp>
+ * src/split.c (show_frame_indicator): contents of
+ update_frame_indicator merged into here.
+ (update_frame_indicator): remove function
+
* src/number.h (add_window_number): new prototype
* src/number.c (add_window_number): renamed from
diff --git a/src/split.c b/src/split.c
index f8150f0..eafef7a 100644
--- a/src/split.c
+++ b/src/split.c
@@ -500,8 +500,18 @@ blank_frame (rp_window_frame *frame)
}
}
-static void
-update_frame_indicator ()
+void
+hide_frame_indicator ()
+{
+ /* Only hide the frame indicator if a window occupies the frame */
+ if (rp_current_frame->win)
+ {
+ XUnmapWindow (dpy, current_screen()->frame_window);
+ }
+}
+
+void
+show_frame_indicator ()
{
screen_info *s = current_screen ();
int width, height;
@@ -514,28 +524,13 @@ update_frame_indicator ()
rp_current_frame->y + rp_current_frame->height / 2 - height / 2,
width, height);
+ XMapRaised (dpy, current_screen()->frame_window);
+
XClearWindow (dpy, s->frame_window);
XDrawString (dpy, s->frame_window, s->normal_gc,
BAR_X_PADDING,
BAR_Y_PADDING + s->font->max_bounds.ascent,
FRAME_STRING, strlen (FRAME_STRING));
-}
-
-void
-hide_frame_indicator ()
-{
- /* Only hide the frame indicator if a window occupies the frame */
- if (rp_current_frame->win)
- {
- XUnmapWindow (dpy, current_screen()->frame_window);
- }
-}
-
-void
-show_frame_indicator ()
-{
- XMapRaised (dpy, current_screen()->frame_window);
- update_frame_indicator();
alarm (FRAME_INDICATOR_TIMEOUT);
}