joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 20:01:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix COLOR command to match behavior on Windows

Browse Source
This commit is contained in:
maron2000 2025-03-28 18:36:07 +09:00
parent 36888dc377
commit 90c33545e7
1 changed files with 98 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/dos/dos_programs.cpp
View File

@ -122,6 +122,8 @@ void getdrivezpath(std::string &path, std::string const& dirname), drivezRegiste
std::string GetDOSBoxXPath(bool withexe=false); std::string GetDOSBoxXPath(bool withexe=false);
FILE *testLoadLangFile(const char *fname); FILE *testLoadLangFile(const char *fname);
bool CheckDBCSCP(int32_t codepage); bool CheckDBCSCP(int32_t codepage);
void ReadCharAttr(uint16_t col,uint16_t row,uint8_t page,uint16_t * result);
void WriteChar(uint16_t col,uint16_t row,uint8_t page,uint16_t chr,uint8_t attr,bool useattr);
#define MAXU32 0xffffffff #define MAXU32 0xffffffff
#include "zip.h" #include "zip.h"
@ -8570,6 +8572,13 @@ static void VHDMAKE_ProgramStart(Program * * make) {
*make=new VHDMAKE; *make=new VHDMAKE;
} }
static int8_t hexToInt(char hex) {
if (hex >= '0' && hex <= '9') return hex - '0';
if (hex >= 'A' && hex <= 'F') return hex - 'A' + 10;
if (hex >= 'a' && hex <= 'f') return hex - 'a' + 10;
return -1; // error
}
class COLORPGM : public Program { class COLORPGM : public Program {
public: public:
void Run(void) override; void Run(void) override;
@ -8614,6 +8623,11 @@ void COLORPGM::Run()
if (strlen(args)==2) { if (strlen(args)==2) {
bg=args[0]; bg=args[0];
fg=args[1]; fg=args[1];
if (fg == bg) {
back=true;
dos.return_code = 1; // foreground and background color is same
}
else {
if (fg=='0'||fg=='8') if (fg=='0'||fg=='8')
fgc=30; fgc=30;
else if (fg=='1'||fg=='9') else if (fg=='1'||fg=='9')
@ -8650,15 +8664,61 @@ void COLORPGM::Run()
bgc=47; bgc=47;
else else
back=true; back=true;
} else }
}
else if(strlen(args)==1){ // Set background color to 0 if only one color is specified
fg=args[0];
bg='0';
bgc=40;
if (fg == '0') {
back=true; back=true;
if (back) dos.return_code = 1; // foreground and background color is same
WriteOut("\033[0m"); }
else { else {
if(fg=='8')
fgc=30;
else if (fg=='1'||fg=='9')
fgc=34;
else if (fg=='2'||tolower(fg)=='a')
fgc=32;
else if (fg=='3'||tolower(fg)=='b')
fgc=36;
else if (fg=='4'||tolower(fg)=='c')
fgc=31;
else if (fg=='5'||tolower(fg)=='d')
fgc=35;
else if (fg=='6'||tolower(fg)=='e')
fgc=32;
else if (fg=='7'||tolower(fg)=='f')
fgc=37;
else
back=true;
}
}
else if (strlen(args)==0){ // default is white character on black background
bg='0';
bgc=40;
fg='7';
bgc=37;
}
else
back=true;
if (!back) {
bool fgl=fg>='0'&&fg<='7', bgl=bg>='0'&&bg<='7'; bool fgl=fg>='0'&&fg<='7', bgl=bg>='0'&&bg<='7';
WriteOut(("\033["+std::string(fgl||bgl?"0;":"")+std::string(fgl?"":"1;")+std::string(bgl?"":"5;")+std::to_string(fgc)+";"+std::to_string(bgc)+"m").c_str()); WriteOut(("\033["+std::string(fgl||bgl?"0;":"")+std::string(fgl?"":"1;")+std::string(bgl?"":"5;")+std::to_string(fgc)+";"+std::to_string(bgc)+"m").c_str());
uint8_t page = real_readb(BIOSMEM_SEG, BIOSMEM_CURRENT_PAGE);
BIOS_NCOLS; BIOS_NROWS;
uint8_t attr = hexToInt(bg) << 4 | hexToInt(fg);
for(uint32_t i=0; i < nrows; i++){
for(uint32_t j=0; j<ncols; j++){
uint16_t get_char;
ReadCharAttr(j, i, page, &get_char);
WriteChar(j, i, page, get_char & 0xFF, attr, true);
} }
} }
}
else if(!dos.return_code) PrintUsage();
}
static void COLOR_ProgramStart(Program * * make) { static void COLOR_ProgramStart(Program * * make) {
*make=new COLORPGM; *make=new COLORPGM;