diff options
author | sabetts <sabetts> | 2003-03-31 07:06:22 +0000 |
---|---|---|
committer | sabetts <sabetts> | 2003-03-31 07:06:22 +0000 |
commit | eac6dda17283fe9f312d0c8576f4370f82fc5c0a (patch) | |
tree | b21d6e62bee0b6e4374e240537dfb975fd8a6680 /src/events.c | |
parent | 84ee56d66b889363903eddd81a8b2a07f180656f (diff) | |
download | ratpoison-eac6dda17283fe9f312d0c8576f4370f82fc5c0a.zip |
* src/split.c (current_window): call screen_get_frame.
(split_frame): call screen_get_frame to get appropriate structure.
(split_frame): call find_window_number to get appropriate
structure.
(remove_all_splits): call screen_get_frame to get appropriate
structure.
(resize_frame): make sure all frames that will be resized are big
enough for the resize.
(resize_frame): return int
(resize_shrink_to_window): call find_window_number to get the
appropriate structure.
(resize_frame_right): return int
(resize_frame_left): likewise
(resize_frame_top): likewise
(resize_frame_bottom): likewise
(resize_frame_horizontally): backup the frameset and restore it if
the resize fails. Do not allow a frame to be resized too small or
too big.
(resize_frame_vertically): likewise
(remove_frame): call find_window_number to get the appropriate
structure.
(set_active_frame): likewise
(blank_frame): likewise
(show_frame_message): call screen_get_frame to get the appropriate
structure.
* src/screen.c (screen_width): new function (and prototype)
(screen_height): likewise
(screen_left): likewise
(screen_right): likewise
(screen_top): likewise
(screen_bottom): likewise
(screen_copy_frameset): likewise
(screen_restore_frameset): likewise
(frameset_free): likewise
(screen_get_frame): likewise
* src/split.c (maximize_frame): call screen_width and
screen_height to get the size for the frame.
* src/ratpoison.h: include screen.h
* src/manage.c (move_window):
* src/frame.h (frame_copy): new prototype
(frame_dump): likewise
* src/frame.c (frame_copy): new function
(frame_dump): likewise
* src/events.c (unmap_notify): compare frame numbers, not
pointers.
(client_msg): call screen_get_frame when blanking the frame.
* src/data.h (EMPTY): new define
(struct rp_window_frame): replace the win field with
win_number. Dependant code updated.
(struct rp_window): replace frame with frame_number. Dependant
code updated.
(struct screen_info): replace rp_current_frame with current_frame
and change type to int. Dependant code updated.
* src/Makefile.am (ratpoison_SOURCES): added screen.h and screen.c
Diffstat (limited to 'src/events.c')
-rw-r--r-- | src/events.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/events.c b/src/events.c index b656f16..e73661f 100644 --- a/src/events.c +++ b/src/events.c @@ -94,7 +94,7 @@ unmap_notify (XEvent *ev) window. */ frame = find_windows_frame (win); if (frame) cleanup_frame (frame); - if (frame == win->scr->rp_current_frame) set_active_frame (frame); + if (frame->number == win->scr->current_frame) set_active_frame (frame); withdraw_window (win); break; @@ -180,8 +180,12 @@ destroy_window (XDestroyWindowEvent *ev) have been cleaned up with an unmap notify event, but just in case... */ frame = find_windows_frame (win); - if (frame) cleanup_frame (frame); - if (frame == win->scr->rp_current_frame) set_active_frame (frame); + if (frame) + { + cleanup_frame (frame); + if (frame->number == win->scr->current_frame) + set_active_frame (frame); + } unmanage (win); @@ -319,7 +323,7 @@ client_msg (XClientMessageEvent *ev) if (w) set_active_window (w); else - blank_frame (win->scr->rp_current_frame); + blank_frame (screen_get_frame (win->scr, win->scr->current_frame)); } } else |