From 3c28e7ccfa9bc4083bee435744dbd369a5a00db4 Mon Sep 17 00:00:00 2001 From: pdw <> Date: Fri, 25 Oct 2002 14:10:05 +0000 Subject: [PATCH] Pausing / order freeze now have persistent helpmsg lines. --- Makefile | 2 +- ui.c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index bb66f3e..b60388d 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ # $Id$ # -VERSION = 0.10pre3 +VERSION = 0.10pre4 # C compiler to use. #CC = gcc diff --git a/ui.c b/ui.c index 450147c..37aad83 100644 --- a/ui.c +++ b/ui.c @@ -82,7 +82,8 @@ int peaksent, peakrecv, peaktotal; #define HELP_MSG_SIZE 80 int showhelphint = 0; -int helptimer = 0; +int persistenthelp = 0; +time_t helptimer = 0; char helpmsg[HELP_MSG_SIZE]; int dontshowdisplay = 0; @@ -598,7 +599,7 @@ void ui_tick(int print) { if(print) { ui_print(); } - else if(showhelphint && (time(NULL) - helptimer > HELP_TIME)) { + else if(showhelphint && (time(NULL) - helptimer > HELP_TIME) && !persistenthelp) { showhelphint = 0; ui_print(); } @@ -631,6 +632,7 @@ void showhelp(const char * s) { strncpy(helpmsg, s, HELP_MSG_SIZE); showhelphint = 1; helptimer = time(NULL); + persistenthelp = 0; tick(1); } @@ -769,7 +771,15 @@ void ui_loop() { // Don't tick here, otherwise we get a bogus display break; case 'P': - options.paused = !options.paused; + if(options.paused) { + options.paused = 0; + showhelp("Display unpaused"); + } + else { + options.paused = 1; + showhelp("Display paused"); + persistenthelp = 1; + } break; case 'o': if(options.freezeorder) { @@ -779,6 +789,7 @@ void ui_loop() { else { options.freezeorder = 1; showhelp("Order frozen"); + persistenthelp = 1; } break; case '1':