From 3db5f7c209975f4c271d4e8587576c1b7fcf583f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AB=8F=E8=A8=AA=E5=AD=90?= Date: Fri, 16 Aug 2024 02:14:19 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=95=E3=82=A3=E3=82=B0:?= =?UTF-8?q?=20=E3=80=8Cshow|hide=20logo=20big|small=20custom=E3=80=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config.c | 15 +++++++++++---- src/config.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/config.c b/src/config.c index 252dd9b..d7e1ee3 100644 --- a/src/config.c +++ b/src/config.c @@ -26,6 +26,7 @@ bool islogob = true; bool islogos = false; bool islogod = true; +bool islogocustom = false; bool isos = true; bool ishost = true; #if defined(__linux__) || defined(__sunos) @@ -187,13 +188,21 @@ void getconf() { // デフォルトは大きいロゴ if (strstr(line, "show logo") != NULL) { + puts("show logo"); if (containvocab(line, "small")) { + puts("small"); islogob = false; islogos = true; } else { + puts("big"); islogob = true; islogos = false; } + + if (containvocab(line, "custom")) { + puts("custom"); + islogocustom = true; + } } // カスタムロゴ @@ -204,9 +213,8 @@ void getconf() { mksmalllogo = true; } - if (mkbiglogo) { + if (mkbiglogo && islogocustom && islogob) { isbiglogo = true; - islogob = true; if (strstr(line, "define custom big logo:") != NULL) { continue; } else if (strstr(line, "EOL") != NULL) { @@ -230,9 +238,8 @@ void getconf() { } } - if (mksmalllogo) { + if (mksmalllogo && islogocustom && islogos) { issmalllogo = true; - islogos = true; if (strstr(line, "define custom small logo:") != NULL) { continue; } else if (strstr(line, "EOL") != NULL) { diff --git a/src/config.h b/src/config.h index f266edf..1afda6c 100644 --- a/src/config.h +++ b/src/config.h @@ -7,6 +7,7 @@ extern bool islogob; extern bool islogos; extern bool islogod; +extern bool islogocustom; extern bool isos; extern bool ishost; #if defined(__linux__) || defined(__sunos)