From 6a52c8891d69e45389081a4400c7d3f1314be868 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 11 Feb 2007 19:09:36 +0100 Subject: [PATCH] move gui-related symbols from para.h to new gui.h --- gui.c | 1 + gui.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ gui_theme.c | 3 ++- para.h | 33 --------------------------------- 4 files changed, 53 insertions(+), 34 deletions(-) create mode 100644 gui.h diff --git a/gui.c b/gui.c index d2a5fdcc..5403b9a6 100644 --- a/gui.c +++ b/gui.c @@ -20,6 +20,7 @@ #include "gui.cmdline.h" #include "para.h" +#include "gui.h" #include #include "ringbuffer.h" #include "string.h" diff --git a/gui.h b/gui.h new file mode 100644 index 00000000..97b99690 --- /dev/null +++ b/gui.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2007 Andre Noll + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + */ + +/** \file gui.h symbols used by gui and gui_theme */ + +struct stat_item_data { + const char *prefix, *postfix; + unsigned x, y, len; + int fg, bg, align; +}; + +struct gui_theme { + const char *name; + const char *author; + int sb_fg, sb_bg; + int cmd_fg, cmd_bg; + int output_fg, output_bg; + int msg_fg, msg_bg; + int err_msg_fg, err_msg_bg; + int welcome_fg, welcome_bg; + int sep_fg, sep_bg; + const char *sep_str; + int default_fg, default_bg; + + int top_lines_default, top_lines_min; + int lines_min, cols_min; + struct stat_item_data data[NUM_STAT_ITEMS]; +}; + +void init_theme(int i, struct gui_theme *); +void next_theme(struct gui_theme *); +void prev_theme(struct gui_theme *); +#define LEFT 1 +#define RIGHT 2 +#define CENTER 3 diff --git a/gui_theme.c b/gui_theme.c index 74d416ec..6fea7e5d 100644 --- a/gui_theme.c +++ b/gui_theme.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 Andre Noll + * Copyright (C) 2005-2007 Andre Noll * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,7 @@ */ #include "para.h" +#include "gui.h" #include #define NUM_THEMES 2 diff --git a/para.h b/para.h index 869749d1..271ea90a 100644 --- a/para.h +++ b/para.h @@ -191,39 +191,6 @@ int stat_client_add(int fd, long unsigned mask); unsigned for_each_line(char *, int, void (*)(char *)); #define FOR_EACH_STAT_ITEM(i) for (i = 0; i < NUM_STAT_ITEMS; i++) -struct stat_item_data { - const char *prefix, *postfix; - unsigned x, y, len; - int fg, bg, align; -}; - -/* gui_theme */ -struct gui_theme { - const char *name; - const char *author; - int sb_fg, sb_bg; - int cmd_fg, cmd_bg; - int output_fg, output_bg; - int msg_fg, msg_bg; - int err_msg_fg, err_msg_bg; - int welcome_fg, welcome_bg; - int sep_fg, sep_bg; - const char *sep_str; - int default_fg, default_bg; - - int top_lines_default, top_lines_min; - int lines_min, cols_min; - struct stat_item_data data[NUM_STAT_ITEMS]; -}; - -void init_theme(int i, struct gui_theme *); -void next_theme(struct gui_theme *); -void prev_theme(struct gui_theme *); -#define LEFT 1 -#define RIGHT 2 -#define CENTER 3 - - __printf_2_3 void para_log(int, const char*, ...); /* taken from printf man page */ -- 2.39.5