nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

introduce Qt support for color of map frame

Browse Source
This commit is contained in:
nhmall
2023-01-01 20:03:30 -05:00
parent 2fc0d25d45
commit 0a03ca1e99
5 changed files with 86 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
win/Qt/qt_bind.cpp
View File

@@ -524,11 +524,11 @@ void NetHackQtBind::qt_cliparound_window(winid wid, int x, int y)
void NetHackQtBind::qt_print_glyph( void NetHackQtBind::qt_print_glyph(
winid wid, coordxy x, coordxy y, winid wid, coordxy x, coordxy y,
const glyph_info *glyphinfo, const glyph_info *glyphinfo,
const glyph_info *bkglyphinfo UNUSED) const glyph_info *bkglyphinfo)
{ {
/* TODO: bkglyph */ /* TODO: bkglyph */
NetHackQtWindow *window = id_to_window[(int) wid]; NetHackQtWindow *window = id_to_window[(int) wid];
window->PrintGlyph(x, y, glyphinfo); window->PrintGlyph(x, y, glyphinfo, bkglyphinfo);
} }
#if 0 #if 0

101
win/Qt/qt_map.cpp
View File

@@ -193,22 +193,32 @@ void NetHackQtMapViewport::paintEvent(QPaintEvent* event)
for (int j = garea.top(); j <= garea.bottom(); j++) { for (int j = garea.top(); j <= garea.bottom(); j++) {
for (int i = garea.left(); i <= garea.right(); i++) { for (int i = garea.left(); i <= garea.right(); i++) {
uint32 color = Glyphcolor(i, j); uint32 color = Glyphcolor(i, j);
char32_t ch = Glyphttychar(i, j); char32_t ch = Glyphttychar(i, j);
unsigned special = Glyphflags(i, j); unsigned special = Glyphflags(i, j);
/* unsigned short tileidx = Glyphtileidx(i, j); */ uint32 framecolor = GlyphFramecolor(i, j);
if (SYMHANDLING(H_IBM)) { /* unsigned short tileidx = Glyphtileidx(i, j); */
ch = cp437(ch); if (SYMHANDLING(H_IBM)) {
} ch = cp437(ch);
}
if (framecolor != NO_COLOR) {
painter.fillRect(i*qt_settings->glyphs().width(),
j*qt_settings->glyphs().height(),
qt_settings->glyphs().width()-1,
qt_settings->glyphs().height()-1,
nhcolor_to_pen(framecolor).color());
}
#ifdef TEXTCOLOR #ifdef TEXTCOLOR
painter.setPen( nhcolor_to_pen(color) );
painter.setPen( nhcolor_to_pen(color) );
#else #else
painter.setPen( Qt::green ); painter.setPen( Qt::green );
#endif #endif
if (!DrawWalls(painter, i * gW, j * gH, gW, gH, ch)) { if (!DrawWalls(painter, i * gW, j * gH, gW, gH, ch)) {
painter.drawText(i * gW, j * gH, gW, gH, Qt::AlignCenter, painter.drawText(i * gW, j * gH, gW, gH, Qt::AlignCenter,
QString(QChar(ch)).left(1)); QString(QChar(ch)).left(1));
} }
#ifdef TEXTCOLOR #ifdef TEXTCOLOR
if ((special & MG_PET) != 0 && ::iflags.hilite_pet) { if ((special & MG_PET) != 0 && ::iflags.hilite_pet) {
painter.drawPixmap(QPoint(i * gW, j * gH), painter.drawPixmap(QPoint(i * gW, j * gH),
@@ -218,17 +228,25 @@ void NetHackQtMapViewport::paintEvent(QPaintEvent* event)
painter.drawPixmap(QPoint(i * gW, j * gH), painter.drawPixmap(QPoint(i * gW, j * gH),
pile_annotation); pile_annotation);
} }
if (framecolor != NO_COLOR) {
painter.setPen( nhcolor_to_pen(framecolor) );
painter.drawRect(i*qt_settings->glyphs().width(),
j*qt_settings->glyphs().height(),
qt_settings->glyphs().width()-1,
qt_settings->glyphs().height()-1);
}
#endif #endif
} }
} }
painter.setFont(font()); painter.setFont(font());
} else { // tiles } else { // tiles
for (int j = garea.top(); j <= garea.bottom(); j++) { for (int j = garea.top(); j <= garea.bottom(); j++) {
for (int i = garea.left(); i <= garea.right(); i++) { for (int i = garea.left(); i <= garea.right(); i++) {
unsigned short g = Glyph(i,j); unsigned short g = Glyph(i,j);
unsigned special = Glyphflags(i, j); unsigned special = Glyphflags(i, j);
unsigned tileidx = Glyphtileidx(i, j); unsigned tileidx = Glyphtileidx(i, j);
uint32 framecolor = GlyphFramecolor(i, j);
glyphs.drawCell(painter, g, tileidx, i, j); glyphs.drawCell(painter, g, tileidx, i, j);
@@ -240,6 +258,13 @@ void NetHackQtMapViewport::paintEvent(QPaintEvent* event)
painter.drawPixmap(QPoint(i * gW, j * gH), painter.drawPixmap(QPoint(i * gW, j * gH),
pile_annotation); pile_annotation);
} }
if (framecolor != NO_COLOR) {
painter.setPen( nhcolor_to_pen(framecolor) );
painter.drawRect(i*qt_settings->glyphs().width(),
j*qt_settings->glyphs().height(),
qt_settings->glyphs().width()-1,
qt_settings->glyphs().height()-1);
}
} }
} }
} }
@@ -513,6 +538,7 @@ void NetHackQtMapViewport::Clear()
Glyph(0, j) = GLYPH_NOTHING; Glyph(0, j) = GLYPH_NOTHING;
Glyphttychar(0, j) = ' '; Glyphttychar(0, j) = ' ';
Glyphcolor(0, j) = NO_COLOR; Glyphcolor(0, j) = NO_COLOR;
GlyphFramecolor(0, j) = NO_COLOR;
Glyphflags(0, j) = 0U; Glyphflags(0, j) = 0U;
Glyphtileidx(0, j) = ::glyphmap[GLYPH_NOTHING].tileidx; Glyphtileidx(0, j) = ::glyphmap[GLYPH_NOTHING].tileidx;
@@ -520,6 +546,7 @@ void NetHackQtMapViewport::Clear()
Glyph(i, j) = GLYPH_UNEXPLORED; Glyph(i, j) = GLYPH_UNEXPLORED;
Glyphttychar(i, j) = ' '; Glyphttychar(i, j) = ' ';
Glyphcolor(i, j) = NO_COLOR; Glyphcolor(i, j) = NO_COLOR;
GlyphFramecolor(i, j) = NO_COLOR;
Glyphflags(i, j) = 0U; Glyphflags(i, j) = 0U;
Glyphtileidx(i, j) = ::glyphmap[GLYPH_UNEXPLORED].tileidx; Glyphtileidx(i, j) = ::glyphmap[GLYPH_UNEXPLORED].tileidx;
} }
@@ -555,11 +582,13 @@ void NetHackQtMapViewport::CursorTo(int x,int y)
} }
void NetHackQtMapViewport::PrintGlyph(int x, int y, void NetHackQtMapViewport::PrintGlyph(int x, int y,
const glyph_info *glyphinfo) const glyph_info *glyphinfo,
const glyph_info *bkglyphinfo)
{ {
Glyph(x, y) = (unsigned short) glyphinfo->glyph; Glyph(x, y) = (unsigned short) glyphinfo->glyph;
Glyphttychar(x, y) = (char32_t) glyphinfo->ttychar; Glyphttychar(x, y) = (char32_t) glyphinfo->ttychar;
Glyphcolor(x, y) = (uint32) glyphinfo->gm.sym.color; Glyphcolor(x, y) = (uint32) glyphinfo->gm.sym.color;
GlyphFramecolor(x, y) = (uint32) bkglyphinfo->framecolor;
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
if (SYMHANDLING(H_UTF8) if (SYMHANDLING(H_UTF8)
&& glyphinfo->gm.u && glyphinfo->gm.u
@@ -677,9 +706,10 @@ void NetHackQtMapWindow2::ClipAround(int x,int y)
} }
void NetHackQtMapWindow2::PrintGlyph(int x,int y, void NetHackQtMapWindow2::PrintGlyph(int x,int y,
const glyph_info *glyphinfo) const glyph_info *glyphinfo,
const glyph_info *bkglyphinfo)
{ {
m_viewport->PrintGlyph(x, y, glyphinfo); m_viewport->PrintGlyph(x, y, glyphinfo, bkglyphinfo);
} }
#if 0 //RLC #if 0 //RLC
@@ -802,6 +832,7 @@ void NetHackQtMapWindow::Clear()
for (int j = 0; j < ROWNO; ++j) { for (int j = 0; j < ROWNO; ++j) {
Glyph(0, j) = GLYPH_NOTHING; Glyph(0, j) = GLYPH_NOTHING;
Glyphcolor(0, j) = NO_COLOR; Glyphcolor(0, j) = NO_COLOR;
GlyphFramecolor(0, j) = NO_COLOR;
Glyphttychar(0, j) = ' '; Glyphttychar(0, j) = ' ';
Glyphflags(0, j) = 0; Glyphflags(0, j) = 0;
Glyphtileidx(0, j) = ::glyphmap[GLYPH_NOTHING].tileidx; Glyphtileidx(0, j) = ::glyphmap[GLYPH_NOTHING].tileidx;
@@ -809,6 +840,7 @@ void NetHackQtMapWindow::Clear()
for (int i = 1; i < COLNO; ++i) { for (int i = 1; i < COLNO; ++i) {
Glyph(i, j) = GLYPH_UNEXPLORED; Glyph(i, j) = GLYPH_UNEXPLORED;
Glyphcolor(i, j) = NO_COLOR; Glyphcolor(i, j) = NO_COLOR;
GlyphFramecolor(i, j) = NO_COLOR;
Glyphttychar(i, j) = ' '; Glyphttychar(i, j) = ' ';
Glyphflags(i, j) = 0; Glyphflags(i, j) = 0;
Glyphtileidx(i, j) = ::glyphmap[GLYPH_UNEXPLORED].tileidx; Glyphtileidx(i, j) = ::glyphmap[GLYPH_UNEXPLORED].tileidx;
@@ -883,15 +915,18 @@ void NetHackQtMapWindow::paintEvent(QPaintEvent* event)
for (int j=garea.top(); j<=garea.bottom(); j++) { for (int j=garea.top(); j<=garea.bottom(); j++) {
for (int i=garea.left(); i<=garea.right(); i++) { for (int i=garea.left(); i<=garea.right(); i++) {
unsigned short g=Glyph(i,j); unsigned short g=Glyph(i,j);
#if 0
int color;
char32_t ch;
unsigned special;
#else
uint32 color = Glyphcolor(i,j); uint32 color = Glyphcolor(i,j);
uint32 framecolor = GlyphFramecolor(i,j);
char32_t ch = Glyphttychar(i,j); char32_t ch = Glyphttychar(i,j);
unsigned special = Glyphflags(i,j); unsigned special = Glyphflags(i,j);
#endif
if (framecolor != NO_COLOR) {
painter.fillRect(i*qt_settings->glyphs().width(),
j*qt_settings->glyphs().height(),
qt_settings->glyphs().width()-1,
qt_settings->glyphs().height()-1,
nhcolor_to_pen(framecolor).color());
}
painter.setPen( Qt::green ); painter.setPen( Qt::green );
#ifdef TEXTCOLOR #ifdef TEXTCOLOR
painter.setPen( nhcolor_to_pen(color) ); painter.setPen( nhcolor_to_pen(color) );
@@ -916,16 +951,24 @@ void NetHackQtMapWindow::paintEvent(QPaintEvent* event)
pile_annotation); pile_annotation);
} }
#endif #endif
} if (framecolor != NO_COLOR) {
} painter.setPen( nhcolor_to_pen(framecolor) );
painter.drawRect(i*qt_settings->glyphs().width(),
j*qt_settings->glyphs().height(),
qt_settings->glyphs().width()-1,
qt_settings->glyphs().height()-1);
}
}
}
painter.setFont(font()); painter.setFont(font());
} else { } else {
for (int j=garea.top(); j<=garea.bottom(); j++) { for (int j=garea.top(); j<=garea.bottom(); j++) {
for (int i=garea.left(); i<=garea.right(); i++) { for (int i=garea.left(); i<=garea.right(); i++) {
unsigned short g=Glyph(i,j); unsigned short g=Glyph(i,j);
unsigned special = Glyphflags(i,j); unsigned special = Glyphflags(i,j);
unsigned short tileidx = Glyphtileidx(i,j); unsigned short tileidx = Glyphtileidx(i,j);
uint32 framecolor = GlyphFramecolor(i,j);
qt_settings->glyphs().drawCell(painter, g, tileidx, i, j); qt_settings->glyphs().drawCell(painter, g, tileidx, i, j);
#ifdef TEXTCOLOR #ifdef TEXTCOLOR
@@ -940,6 +983,13 @@ void NetHackQtMapWindow::paintEvent(QPaintEvent* event)
pile_annotation); pile_annotation);
} }
#endif #endif
if (framecolor != NO_COLOR) {
painter.setPen( nhcolor_to_pen(framecolor) );
painter.drawRect(i*qt_settings->glyphs().width(),
j*qt_settings->glyphs().height(),
qt_settings->glyphs().width()-1,
qt_settings->glyphs().height()-1);
}
} }
} }
} }
@@ -1041,6 +1091,7 @@ void NetHackQtMapWindow::PrintGlyph(int x,int y, const glyph_info *glyphinfo)
Glyph(x,y)=glyphinfo->glyph; Glyph(x,y)=glyphinfo->glyph;
Glyphttychar(x,y)=glyphinfo->ttychar; Glyphttychar(x,y)=glyphinfo->ttychar;
Glyphcolor(x,y)=glyphinfo->color; Glyphcolor(x,y)=glyphinfo->color;
GlyphFramecolor(x,y)=bkglyphinfo->framecolor;
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
if (SYMHANDLING(H_UTF8) if (SYMHANDLING(H_UTF8)
&& glyphinfo->gm.u && glyphinfo->gm.u

8
win/Qt/qt_map.h
View File

@@ -42,6 +42,10 @@ private:
uint32 &Glyphcolor(int x, int y) { uint32 &Glyphcolor(int x, int y) {
return glyphcolor[y][x]; return glyphcolor[y][x];
} }
uint32 glyphframecolor[ROWNO][COLNO];
uint32 &GlyphFramecolor(int x, int y) {
return glyphframecolor[y][x];
}
unsigned int glyphflags[ROWNO][COLNO]; unsigned int glyphflags[ROWNO][COLNO];
unsigned int &Glyphflags(int x, int y) { unsigned int &Glyphflags(int x, int y) {
return glyphflags[y][x]; return glyphflags[y][x];
@@ -60,7 +64,7 @@ private:
void Clear(); void Clear();
void Display(bool block); void Display(bool block);
void CursorTo(int x,int y); void CursorTo(int x,int y);
void PrintGlyph(int x,int y, const glyph_info *glyphinfo); void PrintGlyph(int x,int y, const glyph_info *glyphinfo, const glyph_info *bkglyphinfo);
void Changed(int x, int y); void Changed(int x, int y);
void updateTiles(); void updateTiles();
void SetupTextmapFont(QPainter &painter); void SetupTextmapFont(QPainter &painter);
@@ -83,7 +87,7 @@ public:
virtual void CursorTo(int x,int y); virtual void CursorTo(int x,int y);
virtual void PutStr(int attr, const QString& text); virtual void PutStr(int attr, const QString& text);
virtual void ClipAround(int x,int y); virtual void ClipAround(int x,int y);
virtual void PrintGlyph(int x,int y, const glyph_info *glyphinfo); virtual void PrintGlyph(int x,int y, const glyph_info *glyphinfo, const glyph_info *bkglyphinfo);
signals: signals:
void resized(); void resized();

2
win/Qt/qt_win.cpp
View File

@@ -110,7 +110,7 @@ void NetHackQtWindow::EndMenu(const QString& prompt UNUSED) { puts("unexpected E
int NetHackQtWindow::SelectMenu(int how UNUSED, MENU_ITEM_P **menu_list UNUSED) int NetHackQtWindow::SelectMenu(int how UNUSED, MENU_ITEM_P **menu_list UNUSED)
{ puts("unexpected SelectMenu"); return 0; } { puts("unexpected SelectMenu"); return 0; }
void NetHackQtWindow::ClipAround(int x UNUSED,int y UNUSED) { puts("unexpected ClipAround"); } void NetHackQtWindow::ClipAround(int x UNUSED,int y UNUSED) { puts("unexpected ClipAround"); }
void NetHackQtWindow::PrintGlyph(int x UNUSED,int y UNUSED,const glyph_info *glyphinfo UNUSED) { puts("unexpected PrintGlyph"); } void NetHackQtWindow::PrintGlyph(int x UNUSED,int y UNUSED,const glyph_info *glyphinfo UNUSED,const glyph_info *bkglyphinfo UNUSED) { puts("unexpected PrintGlyph"); }
//void NetHackQtWindow::PrintGlyphCompose(int x,int y,int,int) { puts("unexpected PrintGlyphCompose"); } //void NetHackQtWindow::PrintGlyphCompose(int x,int y,int,int) { puts("unexpected PrintGlyphCompose"); }
void NetHackQtWindow::UseRIP(int how UNUSED, time_t when UNUSED) { puts("unexpected UseRIP"); } void NetHackQtWindow::UseRIP(int how UNUSED, time_t when UNUSED) { puts("unexpected UseRIP"); }

2
win/Qt/qt_win.h
View File

@@ -42,7 +42,7 @@ public:
virtual void EndMenu(const QString& prompt); virtual void EndMenu(const QString& prompt);
virtual int SelectMenu(int how, MENU_ITEM_P **menu_list); virtual int SelectMenu(int how, MENU_ITEM_P **menu_list);
virtual void ClipAround(int x, int y); virtual void ClipAround(int x, int y);
virtual void PrintGlyph(int x, int y, const glyph_info *glyphinfo); virtual void PrintGlyph(int x, int y, const glyph_info *glyphinfo, const glyph_info *bkglyphinfo);
virtual void UseRIP(int how, time_t when); virtual void UseRIP(int how, time_t when);
int nhid; int nhid;