(struct rp_screen): rename from

screen_info. Dependant code updated.

18 files changed, 99 insertions, 109 deletions

diff --git a/src/actions.c b/src/actions.c
index 9f1cdeb..7c270ce 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1222,7 +1222,7 @@ cmd_windows (int interactive, char *data)
   struct sbuf *window_list = NULL;
   char *tmp;
   int dummy;
-  screen_info *s;
+  rp_screen *s;
 
   if (interactive)
     {
@@ -1403,7 +1403,7 @@ cmd_only (int interactive, char *data)
 char *
 cmd_remove (int interactive, char *data)
 {
-  screen_info *s = current_screen();
+  rp_screen *s = current_screen();
   rp_window_frame *frame;
 
   if (num_frames(s) <= 1)
@@ -1433,7 +1433,7 @@ cmd_shrink (int interactive, char *data)
 char *
 cmd_resize (int interactive, char *data)
 {
-  screen_info *s = current_screen ();
+  rp_screen *s = current_screen ();
 
   /* If the user calls resize with arguments, treat it like the
      non-interactive version. */
@@ -1539,7 +1539,7 @@ cmd_defresizeunit (int interactive, char *data)
 char *
 cmd_banish (int interactive, char *data)
 {
-  screen_info *s;
+  rp_screen *s;
 
   s = current_screen ();
 
@@ -1559,7 +1559,7 @@ cmd_curframe (int interactive, char *data)
 char *
 cmd_license (int interactive, char *data)
 {
-  screen_info *s = current_screen();
+  rp_screen *s = current_screen();
   XEvent ev;
   Window fwin;			/* Window currently in focus */
   int revert;			
@@ -1641,7 +1641,7 @@ cmd_help (int interactive, char *data)
 {
   if (interactive) 
     {
-      screen_info *s = current_screen();
+      rp_screen *s = current_screen();
       XEvent ev;
       Window fwin;			/* Window currently in focus */
       int revert;			
@@ -2005,7 +2005,7 @@ cmd_defbargravity (int interactive, char *data)
 }
 
 static void
-update_gc (screen_info *s)
+update_gc (rp_screen *s)
 {
   XGCValues gv;
 
@@ -2893,7 +2893,7 @@ char *
 cmd_fselect (int interactive, char *data)
 {
   rp_window_frame *frame;
-  screen_info *s = current_screen();
+  rp_screen *s = current_screen();
   int fnum = -1;
 
   /* If the command was specified on the command line or an argument
@@ -3024,7 +3024,7 @@ cmd_fdump (int interactively, char *data)
 char *
 cmd_frestore (int interactively, char *data)
 {
-  screen_info *s = current_screen();
+  rp_screen *s = current_screen();
   char *token;
   char *dup;
   rp_window_frame *new, *cur;
diff --git a/src/bar.c b/src/bar.c
index 6e4ceb2..0859d7f 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -46,7 +46,7 @@ static int last_mark_end = 0;
 
 /* Hide the bar from sight. */
 int
-hide_bar (screen_info *s)
+hide_bar (rp_screen *s)
 {
   if (s->bar_is_raised)
     {
@@ -60,7 +60,7 @@ hide_bar (screen_info *s)
 
 /* Show window listing in bar. */
 int
-show_bar (screen_info *s)
+show_bar (rp_screen *s)
 {
   if (!s->bar_is_raised)
     {
@@ -81,7 +81,7 @@ show_bar (screen_info *s)
 }
 
 int
-bar_x (screen_info *s, int width)
+bar_x (rp_screen *s, int width)
 {
   int x = 0;
 
@@ -108,7 +108,7 @@ bar_x (screen_info *s, int width)
 }
 
 int
-bar_y (screen_info *s, int height)
+bar_y (rp_screen *s, int height)
 {
   int y = 0;
 
@@ -137,7 +137,7 @@ bar_y (screen_info *s, int height)
 }
 
 void
-update_bar (screen_info *s)
+update_bar (rp_screen *s)
 {
   if (s->bar_is_raised == BAR_IS_HIDDEN)
     return;
@@ -154,7 +154,7 @@ update_bar (screen_info *s)
 }
 
 void
-update_window_names (screen_info *s)
+update_window_names (rp_screen *s)
 {
   struct sbuf *bar_buffer;
   int mark_start = 0;
@@ -274,7 +274,7 @@ marked_wrapped_message (char *msg, int mark_start, int mark_end)
   XGCValues lgv;
   GC lgc;
   unsigned long mask;
-  screen_info *s = current_screen ();
+  rp_screen *s = current_screen ();
   int i=0;
   int j=0;
   int num_lines;
@@ -436,7 +436,7 @@ marked_message (char *msg, int mark_start, int mark_end)
   XGCValues lgv;
   GC lgc;
   unsigned long mask;
-  screen_info *s = current_screen ();
+  rp_screen *s = current_screen ();
 
   int width = defaults.bar_x_padding * 2 + XTextWidth (defaults.font, msg, strlen (msg));
   int height = (FONT_HEIGHT (defaults.font) + defaults.bar_y_padding * 2);
diff --git a/src/bar.h b/src/bar.h
index e89aff8..324b35a 100644
--- a/src/bar.h
+++ b/src/bar.h
@@ -22,12 +22,12 @@
 #ifndef _RATPOISON_BAR_H
 #define _RATPOISON_BAR_H 1
 
-void update_window_names (screen_info *s);
-void update_bar (screen_info *s);
-int show_bar (screen_info *s);
-int hide_bar (screen_info *s);
-int bar_y (screen_info *s, int height);
-int bar_x (screen_info *s, int width);
+void update_window_names (rp_screen *s);
+void update_bar (rp_screen *s);
+int show_bar (rp_screen *s);
+int hide_bar (rp_screen *s);
+int bar_y (rp_screen *s, int height);
+int bar_x (rp_screen *s, int width);
 
 #define message(msg) marked_message ((msg), 0, 0)
 void marked_message (char *msg, int hl_start, int hl_end);
diff --git a/src/data.h b/src/data.h
index db54432..46115e1 100644
--- a/src/data.h
+++ b/src/data.h
@@ -47,7 +47,7 @@
 #define WIN_NAME_RES_NAME 	2
 
 typedef struct rp_window rp_window;
-typedef struct screen_info screen_info;
+typedef struct rp_screen rp_screen;
 typedef struct rp_action rp_action;
 typedef struct rp_window_frame rp_window_frame;
 
@@ -67,7 +67,7 @@ struct rp_window_frame
 
 struct rp_window
 {
-  screen_info *scr;
+  rp_screen *scr;
   Window w;
   int number;
   int state;
@@ -108,7 +108,7 @@ struct rp_window
   struct list_head node;
 };
 
-struct screen_info
+struct rp_screen
 {
   GC normal_gc;
   XWindowAttributes root_attr;
@@ -207,16 +207,6 @@ extern struct rp_defaults defaults;
 /* The prefix key also known as the command character under screen. */
 extern struct rp_key prefix_key;
 
-/* These _sentinel pointers point to a special rp_window whose next
-   pointer points to the head of the list and whose prev pointer
-   points to the tail. This is done to simplify removing an element
-   from the list: since there are no head and tail global variable
-   pointers that need to be updated, functions that manipulate
-   elements in a list don't need to know what list they belong to. The
-   last element's next pointer points to the sentinel as does the
-   first element's prev pointer. An empty list is represented by the
-   sentinel's prev and next pointers pointing to itself. */
-
 /* A list of mapped windows. These windows show up in the window
    list and have a number assigned to them. */
 extern struct list_head rp_mapped_window;
@@ -226,7 +216,7 @@ extern struct list_head rp_mapped_window;
 extern struct list_head rp_unmapped_window;
 
 extern int rp_current_screen;
-extern screen_info *screens;
+extern rp_screen *screens;
 extern int num_screens;
 
 extern XEvent rp_current_event;
diff --git a/src/events.c b/src/events.c
index 488ef93..94647a5 100644
--- a/src/events.c
+++ b/src/events.c
@@ -45,7 +45,7 @@ static void
 new_window (XCreateWindowEvent *e)
 {
   rp_window *win;
-  screen_info *s;
+  rp_screen *s;
 
   if (e->override_redirect)
     return;
@@ -337,7 +337,7 @@ ungrab_rat ()
 }
 
 static void
-handle_key (screen_info *s)
+handle_key (rp_screen *s)
 {
   char *keysym_name;
   rp_action *key_action;
@@ -395,7 +395,7 @@ handle_key (screen_info *s)
 static void
 key_press (XEvent *ev)
 {
-  screen_info *s;
+  rp_screen *s;
   unsigned int modifier;
   KeySym ks;
 
diff --git a/src/frame.c b/src/frame.c
index 8572981..821f47f 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -108,7 +108,7 @@ frame_move_down (rp_window_frame *frame, int amount)
 }
 
 rp_window_frame *
-frame_new (screen_info *s)
+frame_new (rp_screen *s)
 {
   rp_window_frame *f;
 
@@ -120,7 +120,7 @@ frame_new (screen_info *s)
 }
 
 void
-frame_free (screen_info *s, rp_window_frame *f)
+frame_free (rp_screen *s, rp_window_frame *f)
 {
   numset_release (s->frames_numset, f->number);
   free (f);
diff --git a/src/frame.h b/src/frame.h
index f531f84..75fbb95 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -36,8 +36,8 @@ int frame_right (rp_window_frame *frame);
 int frame_top (rp_window_frame *frame);
 int frame_left (rp_window_frame *frame);
 
-rp_window_frame *frame_new (screen_info *s);
-void frame_free (screen_info *s, rp_window_frame *f);
+rp_window_frame *frame_new (rp_screen *s);
+void frame_free (rp_screen *s, rp_window_frame *f);
 rp_window_frame *frame_copy (rp_window_frame *frame);
 char *frame_dump (rp_window_frame *frame);
 rp_window_frame *frame_read (char *str);
diff --git a/src/input.c b/src/input.c
index 0679b1e..94e2c9a 100644
--- a/src/input.c
+++ b/src/input.c
@@ -286,7 +286,7 @@ read_key (KeySym *keysym, unsigned int *modifiers, char *keysym_name, int len, i
 }
 
 static void
-update_input_window (screen_info *s, char *prompt, char *input, int input_len)
+update_input_window (rp_screen *s, char *prompt, char *input, int input_len)
 {
   int 	prompt_width = XTextWidth (defaults.font, prompt, strlen (prompt));
   int 	input_width  = XTextWidth (defaults.font, input, input_len);
@@ -337,7 +337,7 @@ get_more_input (char *prompt, char *preinput)
   char keysym_buf[513];	
   int keysym_bufsize = sizeof (keysym_buf);
   int nbytes;
-  screen_info *s = current_screen ();
+  rp_screen *s = current_screen ();
   int cur_len = 0;		/* Current length of the string. */
   int allocated_len=100; /* The amount of memory we allocated for str */
   KeySym ch;
diff --git a/src/main.c b/src/main.c
index 7a03eba..07eec84 100644
--- a/src/main.c
+++ b/src/main.c
@@ -43,7 +43,7 @@
 # define WAIT_ANY -1
 #endif
 
-static void init_screen (screen_info *s, int screen_num);
+static void init_screen (rp_screen *s, int screen_num);
 
 int alarm_signalled = 0;
 int kill_signalled = 0;
@@ -66,7 +66,7 @@ Atom rp_command_request;
 Atom rp_command_result;
 
 int rp_current_screen;
-screen_info *screens;
+rp_screen *screens;
 int num_screens;
 Display *dpy;
 
@@ -620,7 +620,7 @@ main (int argc, char *argv[])
     }
 
   /* Initialize the screens */
-  screens = (screen_info *)xmalloc (sizeof (screen_info) * num_screens);
+  screens = (rp_screen *)xmalloc (sizeof (rp_screen) * num_screens);
   PRINT_DEBUG (("%d screens.\n", num_screens));
 
   if (screen_arg)
@@ -671,13 +671,13 @@ main (int argc, char *argv[])
 }
 
 static void
-init_rat_cursor (screen_info *s)
+init_rat_cursor (rp_screen *s)
 {
   s->rat = XCreateFontCursor( dpy, XC_icon );
 }
 
 static void
-init_screen (screen_info *s, int screen_num)
+init_screen (rp_screen *s, int screen_num)
 {
   XGCValues gv;
 
@@ -761,7 +761,7 @@ init_screen (screen_info *s, int screen_num)
 }
 
 static void
-free_screen (screen_info *s)
+free_screen (rp_screen *s)
 {
   rp_window_frame *frame;
   struct list_head *iter, *tmp;
@@ -811,8 +811,8 @@ clean_up ()
   XCloseDisplay (dpy);
 }
 
-/* Given a root window, return the screen_info struct */
-screen_info *
+/* Given a root window, return the rp_screen struct */
+rp_screen *
 find_screen (Window w)
 {
   int i;
diff --git a/src/manage.c b/src/manage.c
index f7df78a..ee7de02 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -122,7 +122,7 @@ ungrab_prefix_key (Window w)
 #endif
 }
 
-screen_info*
+rp_screen*
 current_screen ()
 {
   int i;
@@ -369,7 +369,7 @@ unmanage (rp_window *w)
 
 /* When starting up scan existing windows and start managing them. */
 void
-scanwins(screen_info *s)
+scanwins(rp_screen *s)
 {
   rp_window *win;
   XWindowAttributes attr;
diff --git a/src/manage.h b/src/manage.h
index c85067b..651355f 100644
--- a/src/manage.h
+++ b/src/manage.h
@@ -28,8 +28,8 @@ void clear_unmanaged_list ();
 char *list_unmanaged_windows ();
 void add_unmanaged_window (char *name);
 int unmanaged_window (Window w);
-screen_info* current_screen ();
-void scanwins(screen_info *s);
+rp_screen* current_screen ();
+void scanwins(rp_screen *s);
 void unmanage (rp_window *w);
 int update_window_name (rp_window *win);
 void update_normal_hints (rp_window *win);
diff --git a/src/ratpoison.h b/src/ratpoison.h
index cc1420f..e4d58eb 100644
--- a/src/ratpoison.h
+++ b/src/ratpoison.h
@@ -72,7 +72,7 @@ extern XGCValues gv;
 #include "screen.h"
 
 void clean_up ();
-screen_info *find_screen (Window w);
+rp_screen *find_screen (Window w);
 
 void read_rc_file (FILE *file);
 
diff --git a/src/screen.c b/src/screen.c
index aa7b1df..bfa7ee4 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -21,44 +21,44 @@
 #include "ratpoison.h"
 
 int
-screen_width (screen_info *s)
+screen_width (rp_screen *s)
 {
   return DisplayWidth (dpy, s->screen_num) - defaults.padding_right - defaults.padding_left;
 }
 
 int
-screen_height (screen_info *s)
+screen_height (rp_screen *s)
 {
   return DisplayHeight (dpy, s->screen_num) - defaults.padding_bottom - defaults.padding_top;
 }
 
 int
-screen_left (screen_info *s)
+screen_left (rp_screen *s)
 {
   return defaults.padding_left;
 }
 
 int
-screen_right (screen_info *s)
+screen_right (rp_screen *s)
 {
   return screen_left (s) + screen_width (s);
 }
 
 int
-screen_top (screen_info *s)
+screen_top (rp_screen *s)
 {
   return defaults.padding_top;
 }
 
 int
-screen_bottom (screen_info *s)
+screen_bottom (rp_screen *s)
 {
   return screen_top (s) + screen_height (s);
 }
 
 /* Returns a pointer to a list of frames. */
 struct list_head *
-screen_copy_frameset (screen_info *s)
+screen_copy_frameset (rp_screen *s)
 {
   struct list_head *head;
   rp_window_frame *cur;
@@ -78,7 +78,7 @@ screen_copy_frameset (screen_info *s)
 
 /* Set head as the frameset, deleting the existing one. */
 void
-screen_restore_frameset (screen_info *s, struct list_head *head)
+screen_restore_frameset (rp_screen *s, struct list_head *head)
 {
   frameset_free (&s->rp_window_frames);
   INIT_LIST_HEAD (&s->rp_window_frames);
@@ -104,7 +104,7 @@ frameset_free (struct list_head *head)
 }
 
 rp_window_frame *
-screen_get_frame (screen_info *s, int frame_num)
+screen_get_frame (rp_screen *s, int frame_num)
 {
   rp_window_frame *cur;
 
diff --git a/src/screen.h b/src/screen.h
index 5b0bbc2..614bb04 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -21,16 +21,16 @@
 #ifndef SCREEN_H
 #define SCREEN_H
 
-int screen_bottom (screen_info *s);
-int screen_top (screen_info *s);
-int screen_right (screen_info *s);
-int screen_left (screen_info *s);
-int screen_height (screen_info *s);
-int screen_width (screen_info *s);
+int screen_bottom (rp_screen *s);
+int screen_top (rp_screen *s);
+int screen_right (rp_screen *s);
+int screen_left (rp_screen *s);
+int screen_height (rp_screen *s);
+int screen_width (rp_screen *s);
 
-struct list_head *screen_copy_frameset (screen_info *s);
-void screen_restore_frameset (screen_info *s, struct list_head *head);
+struct list_head *screen_copy_frameset (rp_screen *s);
+void screen_restore_frameset (rp_screen *s, struct list_head *head);
 void frameset_free (struct list_head *head);
-rp_window_frame *screen_get_frame (screen_info *s, int frame_num);
+rp_window_frame *screen_get_frame (rp_screen *s, int frame_num);
 
 #endif
diff --git a/src/split.c b/src/split.c
index def1349..f6f8a09 100644
--- a/src/split.c
+++ b/src/split.c
@@ -41,12 +41,12 @@ update_last_access (rp_window_frame *frame)
 rp_window_frame *
 current_frame ()
 {
-  screen_info *s = current_screen();
+  rp_screen *s = current_screen();
   return screen_get_frame (s, s->current_frame);
 }
 
 int
-num_frames (screen_info *s)
+num_frames (rp_screen *s)
 {
  int count = 0;
  rp_window_frame *cur;
@@ -108,7 +108,7 @@ set_frames_window (rp_window_frame *frame, rp_window *win)
   return find_window_number (last_win);
 }
 
-static screen_info *
+static rp_screen *
 frames_screen (rp_window_frame *frame)
 {
   int i;
@@ -144,7 +144,7 @@ maximize_all_windows_in_frame (rp_window_frame *frame)
 static void
 maximize_frame (rp_window_frame *frame)
 {
-  screen_info *s = frames_screen (frame);
+  rp_screen *s = frames_screen (frame);
 
   frame->x = defaults.padding_left;
   frame->y = defaults.padding_top;
@@ -155,7 +155,7 @@ maximize_frame (rp_window_frame *frame)
 
 /* Create a full screen frame */
 static void
-create_initial_frame (screen_info *screen)
+create_initial_frame (rp_screen *screen)
 {
   rp_window_frame *frame;
 
@@ -179,7 +179,7 @@ init_frame_lists ()
 }
 
 void
-init_frame_list (screen_info *screen)
+init_frame_list (rp_screen *screen)
 {
   INIT_LIST_HEAD (&screen->rp_window_frames);
 
@@ -187,7 +187,7 @@ init_frame_list (screen_info *screen)
 }
 
 rp_window_frame *
-find_last_frame (screen_info *s)
+find_last_frame (rp_screen *s)
 {
   rp_window_frame *cur, *last = NULL;
   int last_access = -1;
@@ -209,7 +209,7 @@ find_last_frame (screen_info *s)
 rp_window_frame *
 find_windows_frame (rp_window *win)
 {
-  screen_info *s;
+  rp_screen *s;
   rp_window_frame *cur;
 
   s = win->scr;
@@ -265,7 +265,7 @@ window_fits_in_frame (rp_window *win, rp_window_frame *frame)
 rp_window *
 find_window_for_frame (rp_window_frame *frame)
 {
-  screen_info *s = frames_screen (frame);
+  rp_screen *s = frames_screen (frame);
   int last_access = 0;
   rp_window *most_recent = NULL;
   rp_window *cur;
@@ -292,7 +292,7 @@ find_window_for_frame (rp_window_frame *frame)
 static void
 split_frame (rp_window_frame *frame, int way, int pixels)
 {
-  screen_info *s;
+  rp_screen *s;
   rp_window *win;
   rp_window_frame *new_frame;
 
@@ -374,7 +374,7 @@ void
 remove_all_splits ()
 {
   struct list_head *tmp, *iter;
-  screen_info *s = current_screen();
+  rp_screen *s = current_screen();
   rp_window_frame *frame;
   rp_window *win;
 
@@ -426,7 +426,7 @@ resize_frame (rp_window_frame *frame, rp_window_frame *pusher, int diff,
 	      void (*resize2)(rp_window_frame *, int),
 	      int (*resize3)(rp_window_frame *, rp_window_frame *, int))
 {
-  screen_info *s = frames_screen (frame);
+  rp_screen *s = frames_screen (frame);
   rp_window_frame *cur;
 
   /* Loop through the frames and determine which ones are affected by
@@ -532,7 +532,7 @@ resize_frame_horizontally (rp_window_frame *frame, int diff)
 {
   int (*resize_fn)(rp_window_frame *, rp_window_frame*, int);
   struct list_head *l;
-  screen_info *s = frames_screen (frame);
+  rp_screen *s = frames_screen (frame);
 
   if (num_frames (s) < 2 || diff == 0)
     return;
@@ -578,7 +578,7 @@ resize_frame_vertically (rp_window_frame *frame, int diff)
 {
   int (*resize_fn)(rp_window_frame *, rp_window_frame*, int);
   struct list_head *l;
-  screen_info *s = frames_screen (frame);
+  rp_screen *s = frames_screen (frame);
 
   if (num_frames (s) < 2 || diff == 0)
     return;
@@ -646,7 +646,7 @@ frame_is_right (rp_window_frame *src, rp_window_frame *frame)
 }
 
 static int
-total_frame_area (screen_info *s)
+total_frame_area (rp_screen *s)
 {
   int area = 0;
   rp_window_frame *cur;
@@ -677,7 +677,7 @@ frames_overlap (rp_window_frame *f1, rp_window_frame *f2)
 static int
 frame_overlaps (rp_window_frame *frame)
 {
-  screen_info *s;
+  rp_screen *s;
   rp_window_frame *cur;
 
   s = frames_screen (frame);
@@ -695,7 +695,7 @@ frame_overlaps (rp_window_frame *frame)
 void
 remove_frame (rp_window_frame *frame)
 {
-  screen_info *s;
+  rp_screen *s;
   int area;
   rp_window_frame *cur;
   rp_window *win;
@@ -814,8 +814,8 @@ remove_frame (rp_window_frame *frame)
 void
 set_active_frame (rp_window_frame *frame)
 {
-  screen_info *old_s = current_screen();
-  screen_info *s = frames_screen (frame);
+  rp_screen *old_s = current_screen();
+  rp_screen *s = frames_screen (frame);
   int old = current_screen()->current_frame;
   rp_window *win, *old_win;
   rp_window_frame *old_frame;
@@ -860,7 +860,7 @@ set_active_frame (rp_window_frame *frame)
 void
 blank_frame (rp_window_frame *frame)
 {
-  screen_info *s;
+  rp_screen *s;
   rp_window *win;
 
   if (frame->win_number == EMPTY) return;
@@ -896,7 +896,7 @@ show_frame_indicator ()
 void
 show_frame_message (char *msg)
 {
-  screen_info *s = current_screen ();
+  rp_screen *s = current_screen ();
   int width, height;
   rp_window_frame *frame;
 
@@ -923,7 +923,7 @@ show_frame_message (char *msg)
 rp_window_frame *
 find_frame_up (rp_window_frame *frame)
 {
-  screen_info *s = frames_screen (frame);
+  rp_screen *s = frames_screen (frame);
   rp_window_frame *cur;
 
   list_for_each_entry (cur, &s->rp_window_frames, node)
@@ -941,7 +941,7 @@ find_frame_up (rp_window_frame *frame)
 rp_window_frame *
 find_frame_down (rp_window_frame *frame)
 {
-  screen_info *s = frames_screen (frame);
+  rp_screen *s = frames_screen (frame);
   rp_window_frame *cur;
 
   list_for_each_entry (cur, &s->rp_window_frames, node)
@@ -959,7 +959,7 @@ find_frame_down (rp_window_frame *frame)
 rp_window_frame *
 find_frame_left (rp_window_frame *frame)
 {
-  screen_info *s = frames_screen (frame);
+  rp_screen *s = frames_screen (frame);
   rp_window_frame *cur;
 
   list_for_each_entry (cur, &s->rp_window_frames, node)
@@ -977,7 +977,7 @@ find_frame_left (rp_window_frame *frame)
 rp_window_frame *
 find_frame_right (rp_window_frame *frame)
 {
-  screen_info *s = frames_screen (frame);
+  rp_screen *s = frames_screen (frame);
   rp_window_frame *cur;
 
   list_for_each_entry (cur, &s->rp_window_frames, node)
@@ -993,7 +993,7 @@ find_frame_right (rp_window_frame *frame)
 }
 
 rp_window_frame *
-find_frame_number (screen_info *s, int num)
+find_frame_number (rp_screen *s, int num)
 {
   rp_window_frame *cur;
 
diff --git a/src/split.h b/src/split.h
index 53661b0..cf308ae 100644
--- a/src/split.h
+++ b/src/split.h
@@ -22,7 +22,7 @@
 #ifndef SPLIT_H
 #define SPLIT_H
 
-int num_frames (screen_info *s);
+int num_frames (rp_screen *s);
 rp_window *set_frames_window (rp_window_frame *frame, rp_window *win);
 void cleanup_frame (rp_window_frame *frame);
 void maximize_all_windows_in_frame (rp_window_frame *frame);
@@ -39,7 +39,7 @@ rp_window_frame *find_frame_next (rp_window_frame *frame);
 rp_window_frame *find_frame_prev (rp_window_frame *frame);
 rp_window *current_window ();
 void init_frame_lists ();
-void init_frame_list (screen_info *screen);
+void init_frame_list (rp_screen *screen);
 void set_active_frame (rp_window_frame *frame);
 void blank_frame (rp_window_frame *frame);
 void show_frame_indicator ();
@@ -51,8 +51,8 @@ rp_window_frame *find_frame_right (rp_window_frame *frame);
 rp_window_frame *find_frame_left (rp_window_frame *frame);
 rp_window_frame *find_frame_down (rp_window_frame *frame);
 rp_window_frame *find_frame_up (rp_window_frame *frame);
-rp_window_frame *find_last_frame (screen_info *s);
-rp_window_frame *find_frame_number (screen_info *s, int num);
+rp_window_frame *find_last_frame (rp_screen *s);
+rp_window_frame *find_frame_number (rp_screen *s, int num);
 
 rp_window_frame *current_frame ();
 
diff --git a/src/window.c b/src/window.c
index 8e939b7..cb17d60 100644
--- a/src/window.c
+++ b/src/window.c
@@ -108,7 +108,7 @@ window_name (rp_window *win)
 
 /* Allocate a new window and add it to the list of managed windows */
 rp_window *
-add_to_window_list (screen_info *s, Window w)
+add_to_window_list (rp_screen *s, Window w)
 {
   rp_window *new_window;
 
diff --git a/src/window.h b/src/window.h
index 1ecf16b..75d83ea 100644
--- a/src/window.h
+++ b/src/window.h
@@ -25,7 +25,7 @@
 #include "sbuf.h"
 
 void free_window (rp_window *w);
-rp_window *add_to_window_list (screen_info *s, Window w);
+rp_window *add_to_window_list (rp_screen *s, Window w);
 void last_window ();
 rp_window *find_window_in_list (Window w, struct list_head *list);
 rp_window *find_window (Window w);