summaryrefslogtreecommitdiff
path: root/src/screen.c
diff options
context:
space:
mode:
authorsabetts <sabetts>2003-05-15 07:36:21 +0000
committersabetts <sabetts>2003-05-15 07:36:21 +0000
commit55fadaecf93dfdf6a7c9510098057c5152e3b920 (patch)
treef1fc81a4aa497466f1cf5a497386ae994265984c /src/screen.c
parent2d8945e4ee37ceee9d58e91681c6d3722a83c956 (diff)
downloadratpoison-55fadaecf93dfdf6a7c9510098057c5152e3b920.zip
* src/data.h (struct rp_frame): renamed from rp_window_frame. All
dependant code updated. * src/main.c: remove child_info global. Add rp_children global. (chld_handler): update the terminated and status fields of any terminated children. * src/events.c (handle_signals): loop through each child process and remove them from the list. Print a message for any child that doesn't return a 0 status. * src/data.h (rp_child_info): new fields, terminated and node. remove child_info global. Add rp_children global. * src/actions.c (spawn): Add the command to the list of children.
Diffstat (limited to 'src/screen.c')
-rw-r--r--src/screen.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/screen.c b/src/screen.c
index bfa7ee4..ff9c7d0 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -61,14 +61,14 @@ struct list_head *
screen_copy_frameset (rp_screen *s)
{
struct list_head *head;
- rp_window_frame *cur;
+ rp_frame *cur;
/* Init our new list. */
head = xmalloc (sizeof (struct list_head));
INIT_LIST_HEAD (head);
/* Copy each frame to our new list. */
- list_for_each_entry (cur, &s->rp_window_frames, node)
+ list_for_each_entry (cur, &s->frames, node)
{
list_add_tail (&(frame_copy (cur))->node, head);
}
@@ -80,11 +80,11 @@ screen_copy_frameset (rp_screen *s)
void
screen_restore_frameset (rp_screen *s, struct list_head *head)
{
- frameset_free (&s->rp_window_frames);
- INIT_LIST_HEAD (&s->rp_window_frames);
+ frameset_free (&s->frames);
+ INIT_LIST_HEAD (&s->frames);
/* Hook in our new frameset. */
- list_splice (head, &s->rp_window_frames);
+ list_splice (head, &s->frames);
}
/* Given a list of frames, free them, but don't remove their numbers
@@ -92,23 +92,23 @@ screen_restore_frameset (rp_screen *s, struct list_head *head)
void
frameset_free (struct list_head *head)
{
- rp_window_frame *frame;
+ rp_frame *frame;
struct list_head *iter, *tmp;
list_for_each_safe_entry (frame, iter, tmp, head, node)
{
- /* FIXME: what if rp_window_frames has memory inside its struct
+ /* FIXME: what if frames has memory inside its struct
that needs to be freed? */
free (frame);
}
}
-rp_window_frame *
+rp_frame *
screen_get_frame (rp_screen *s, int frame_num)
{
- rp_window_frame *cur;
+ rp_frame *cur;
- list_for_each_entry (cur, &s->rp_window_frames, node)
+ list_for_each_entry (cur, &s->frames, node)
{
if (cur->number == frame_num)
return cur;