Fixed rotate_server_screen.

The ServerScreen option in LCDd.conf and the -i command line parameter were parsed in server/main.c, but the value of rotate_server_screen was not respected in server/serverscreens.[c,h].
This commit is contained in:
reenoo
2003-06-01 09:51:38 +00:00
parent eb51be352c
commit fa1adf7317
3 changed files with 11 additions and 2 deletions
-1
View File
@@ -112,7 +112,6 @@ char configfile[256]; /* a lot of space in the executable. */
char user[64]; /* The values will be overwritten anyway... */
int daemon_mode = UNSET_INT;
int rotate_server_screen = UNSET_INT;
static int report_level = UNSET_INT;
static int report_to_syslog = UNSET_INT;
+9 -1
View File
@@ -31,7 +31,10 @@
#include "widget.h"
#include "serverscreens.h"
#define UNSET_INT -1
Screen * server_screen;
int rotate_server_screen = UNSET_INT;
#define MAX_SERVERSCREEN_WIDTH 40
@@ -51,7 +54,12 @@ server_screen_init ()
}
server_screen->name = "Server screen";
server_screen->duration = 8; /* 1 second, instead of 4...*/
server_screen->priority = PRI_INFO;
if ((rotate_server_screen == UNSET_INT ) || (rotate_server_screen == 1)) {
server_screen->priority = PRI_INFO;
} else {
server_screen->priority = PRI_BACKGROUND;
}
/* Create all the widgets...*/
for (line=1; line<=4; line++) {
+2
View File
@@ -16,6 +16,8 @@
extern Screen * server_screen;
extern int rotate_server_screen;
int server_screen_init ();
int server_screen_shutdown ();
int update_server_screen ();