* src/events.c (handle_key): revert the focus immediately after

reading the key.

* src/list.c (give_window_focus): update rp_current_frame when
setting the window focus.

* src/main.c (main): scan for windows in a seperate pass after
initializing the screen structures.
(init_screen): build a display string for each screen.
(init_screen): remove the call to scanwins.

* src/manage.c (current_screen): return the current screen using
rp_current_screen.

* src/split.h (init_frame_lists): new function

* src/split.c (rp_window_frame_sentinel): remove.
(rp_current_frame): remove.
(frames_screen): new function
(maximize_frame): use the frame's screen to find out the width and
height of the display.
(create_initial_frame): take a pointer to a screen_info as an
argument.
(init_frame_lists): new function
(init_frame_list): take a pointer to a screen_info as an argument.
(find_last_frame): take a pointer to a screen_info as an argument.

* src/actions.c (spawn): Set the DISPLAY environment variable to
point to the current screen.

* src/data.h (struct screen_info): add display_string,
rp_window_frame_sentinel, rp_current_frame.
(rp_current_screen): new global
(rp_current_frame): Remove. Dependant code uses
screen_info.rp_current_frame.

1 files changed, 1 insertions, 4 deletions

diff --git a/src/manage.c b/src/manage.c
index c389e22..7d14fc9 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -64,10 +64,7 @@ ungrab_prefix_key (Window w)
 screen_info*
 current_screen ()
 {
-  if (current_window())
-    return current_window()->scr;
-  else
-    return &screens[0];
+  return &screens[rp_current_screen];
 }
 
 void