introduce Qt support for color of map frame

diff --git a/win/Qt/qt_bind.cpp b/win/Qt/qt_bind.cpp
index 9f4d48da21f9e5235a50d4e38cda42fc50c91054..482e85fba28d2a5cb76f6dd7f540dc56e5a37f52 100644 (file)
--- a/win/Qt/qt_bind.cpp
+++ b/win/Qt/qt_bind.cpp
@@ -524,11 +524,11 @@ void NetHackQtBind::qt_cliparound_window(winid wid, int x, int y)
 void NetHackQtBind::qt_print_glyph(
     winid wid, coordxy x, coordxy y,
     const glyph_info *glyphinfo,
-    const glyph_info *bkglyphinfo UNUSED)
+    const glyph_info *bkglyphinfo)
 {
     /* TODO: bkglyph */
     NetHackQtWindow *window = id_to_window[(int) wid];
-    window->PrintGlyph(x, y, glyphinfo);
+    window->PrintGlyph(x, y, glyphinfo, bkglyphinfo);
 }
 
 #if 0

diff --git a/win/Qt/qt_map.cpp b/win/Qt/qt_map.cpp
index 42f0e68d265ad6981d2dfa9695020f5837e36679..19940138f98cd764ae98661ad5aaf84b6e6cd5d7 100644 (file)
--- a/win/Qt/qt_map.cpp
+++ b/win/Qt/qt_map.cpp
@@ -193,22 +193,32 @@ void NetHackQtMapViewport::paintEvent(QPaintEvent* event)
 
         for (int j = garea.top(); j <= garea.bottom(); j++) {
             for (int i = garea.left(); i <= garea.right(); i++) {
-               uint32 color = Glyphcolor(i, j);
-               char32_t ch = Glyphttychar(i, j);
-               unsigned special = Glyphflags(i, j);
-/*             unsigned short tileidx = Glyphtileidx(i, j); */
-        if (SYMHANDLING(H_IBM)) {
-            ch = cp437(ch);
-        }
+                uint32 color = Glyphcolor(i, j);
+                char32_t ch = Glyphttychar(i, j);
+                unsigned special = Glyphflags(i, j);
+                uint32 framecolor = GlyphFramecolor(i, j);
+/*              unsigned short tileidx = Glyphtileidx(i, j); */
+                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
-               painter.setPen( nhcolor_to_pen(color) );
+
+                 painter.setPen( nhcolor_to_pen(color) );
 #else
-               painter.setPen( Qt::green );
+                 painter.setPen( Qt::green );
 #endif
-               if (!DrawWalls(painter, i * gW, j * gH, gW, gH, ch)) {
-                   painter.drawText(i * gW, j * gH, gW, gH, Qt::AlignCenter,
+                if (!DrawWalls(painter, i * gW, j * gH, gW, gH, ch)) {
+                    painter.drawText(i * gW, j * gH, gW, gH, Qt::AlignCenter,
                                      QString(QChar(ch)).left(1));
-               }
+                }
 #ifdef TEXTCOLOR
                 if ((special & MG_PET) != 0 && ::iflags.hilite_pet) {
                     painter.drawPixmap(QPoint(i * gW, j * gH),
@@ -218,17 +228,25 @@ void NetHackQtMapViewport::paintEvent(QPaintEvent* event)
                     painter.drawPixmap(QPoint(i * gW, j * gH),
                                        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
             }
         }
 
-       painter.setFont(font());
+        painter.setFont(font());
     } else { // tiles
         for (int j = garea.top(); j <= garea.bottom(); j++) {
             for (int i = garea.left(); i <= garea.right(); i++) {
                 unsigned short g = Glyph(i,j);
                unsigned special = Glyphflags(i, j);
                unsigned tileidx = Glyphtileidx(i, j);
+                uint32 framecolor = GlyphFramecolor(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),
                                        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;
         Glyphttychar(0, j) = ' ';
         Glyphcolor(0, j) = NO_COLOR;
+        GlyphFramecolor(0, j) = NO_COLOR;
         Glyphflags(0, j) = 0U;
         Glyphtileidx(0, j) = ::glyphmap[GLYPH_NOTHING].tileidx;
 
@@ -520,6 +546,7 @@ void NetHackQtMapViewport::Clear()
             Glyph(i, j) = GLYPH_UNEXPLORED;
             Glyphttychar(i, j) = ' ';
             Glyphcolor(i, j) = NO_COLOR;
+            GlyphFramecolor(i, j) = NO_COLOR;
             Glyphflags(i, j) = 0U;
             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,
-                                      const glyph_info *glyphinfo)
+                                      const glyph_info *glyphinfo,
+                                      const glyph_info *bkglyphinfo)
 {
     Glyph(x, y) = (unsigned short) glyphinfo->glyph;
     Glyphttychar(x, y) = (char32_t) glyphinfo->ttychar;
     Glyphcolor(x, y) = (uint32) glyphinfo->gm.sym.color;
+    GlyphFramecolor(x, y) = (uint32) bkglyphinfo->framecolor;
 #ifdef ENHANCED_SYMBOLS
     if (SYMHANDLING(H_UTF8)
         && glyphinfo->gm.u
@@ -677,9 +706,10 @@ void NetHackQtMapWindow2::ClipAround(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
@@ -802,6 +832,7 @@ void NetHackQtMapWindow::Clear()
     for (int j = 0; j < ROWNO; ++j) {
         Glyph(0, j) = GLYPH_NOTHING;
         Glyphcolor(0, j) = NO_COLOR;
+        GlyphFramecolor(0, j) = NO_COLOR;
         Glyphttychar(0, j) = ' ';
         Glyphflags(0, j) = 0;
         Glyphtileidx(0, j) = ::glyphmap[GLYPH_NOTHING].tileidx;
@@ -809,6 +840,7 @@ void NetHackQtMapWindow::Clear()
         for (int i = 1; i < COLNO; ++i) {
             Glyph(i, j) = GLYPH_UNEXPLORED;
             Glyphcolor(i, j) = NO_COLOR;
+            GlyphFramecolor(i, j) = NO_COLOR;
             Glyphttychar(i, j) = ' ';
             Glyphflags(i, j) = 0;
             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 i=garea.left(); i<=garea.right(); i++) {
                unsigned short g=Glyph(i,j);
-#if 0
-               int color;
-               char32_t ch;
-               unsigned special;
-#else
                uint32 color = Glyphcolor(i,j);
+                uint32 framecolor = GlyphFramecolor(i,j);
                char32_t ch = Glyphttychar(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 );
 #ifdef TEXTCOLOR
                painter.setPen( nhcolor_to_pen(color) );
@@ -916,16 +951,24 @@ void NetHackQtMapWindow::paintEvent(QPaintEvent* event)
                                        pile_annotation);
                 }
 #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 {
        for (int j=garea.top(); j<=garea.bottom(); j++) {
            for (int i=garea.left(); i<=garea.right(); i++) {
                unsigned short g=Glyph(i,j);
                unsigned special = Glyphflags(i,j);
                unsigned short tileidx = Glyphtileidx(i,j);
+                uint32 framecolor = GlyphFramecolor(i,j);
 
                 qt_settings->glyphs().drawCell(painter, g, tileidx, i, j);
 #ifdef TEXTCOLOR
@@ -940,6 +983,13 @@ void NetHackQtMapWindow::paintEvent(QPaintEvent* event)
                                        pile_annotation);
                 }
 #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;
     Glyphttychar(x,y)=glyphinfo->ttychar;
     Glyphcolor(x,y)=glyphinfo->color;
+    GlyphFramecolor(x,y)=bkglyphinfo->framecolor;
 #ifdef ENHANCED_SYMBOLS
     if (SYMHANDLING(H_UTF8)
         && glyphinfo->gm.u

diff --git a/win/Qt/qt_map.h b/win/Qt/qt_map.h
index 2d4e93218b7bc3437f5ef12b7bae8b7b539ba0a8..321db2541fe575f410e5f085ebcede4fd8cc8900 100644 (file)
--- a/win/Qt/qt_map.h
+++ b/win/Qt/qt_map.h
@@ -42,6 +42,10 @@ private:
         uint32 &Glyphcolor(int x, int y) {
             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(int x, int y) {
             return glyphflags[y][x];
@@ -60,7 +64,7 @@ private:
        void Clear();
        void Display(bool block);
        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 updateTiles();
         void SetupTextmapFont(QPainter &painter);
@@ -83,7 +87,7 @@ public:
        virtual void CursorTo(int x,int y);
        virtual void PutStr(int attr, const QString& text);
        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:
        void resized();

diff --git a/win/Qt/qt_win.cpp b/win/Qt/qt_win.cpp
index b957a22822d837c9d781a0266774a8b3858bcbda..907d260d02d001389e79597691132c22e26a75d1 100644 (file)
--- a/win/Qt/qt_win.cpp
+++ b/win/Qt/qt_win.cpp
@@ -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)
                                { puts("unexpected SelectMenu"); return 0; }
 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::UseRIP(int how UNUSED, time_t when UNUSED) { puts("unexpected UseRIP"); }
 

diff --git a/win/Qt/qt_win.h b/win/Qt/qt_win.h
index 6227563f15eef985bcf548a4f56678dc4d7d150a..adc05f63dd9f0f252222d2a5feb41e504f72e66a 100644 (file)
--- a/win/Qt/qt_win.h
+++ b/win/Qt/qt_win.h
@@ -42,7 +42,7 @@ public:
        virtual void EndMenu(const QString& prompt);
        virtual int SelectMenu(int how, MENU_ITEM_P **menu_list);
         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);
 
        int nhid;