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

introduce X11 support for coloring map frame

Browse Source
This commit is contained in:
nhmall
2023-01-01 20:04:27 -05:00
parent 0a03ca1e99
commit 32a030c8c6
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
win/X11/winmap.c
View File

@@ -87,7 +87,7 @@ X11_print_glyph(
winid window, winid window,
coordxy x, coordxy y, coordxy x, coordxy y,
const glyph_info *glyphinfo, const glyph_info *glyphinfo,
const glyph_info *bkglyphinfo UNUSED) const glyph_info *bkglyphinfo)
{ {
struct map_info_t *map_info; struct map_info_t *map_info;
boolean update_bbox = FALSE; boolean update_bbox = FALSE;
@@ -114,6 +114,11 @@ X11_print_glyph(
if (map_info->is_tile) if (map_info->is_tile)
update_bbox = TRUE; update_bbox = TRUE;
} }
if (map_info->tile_map.glyphs[y][x].framecolor != bkglyphinfo->framecolor) {
map_info->tile_map.glyphs[y][x].framecolor = bkglyphinfo->framecolor;
update_bbox = TRUE;
}
} }
{ {
X11_map_symbol ch; X11_map_symbol ch;
@@ -162,6 +167,10 @@ X11_print_glyph(
if (!map_info->is_tile) if (!map_info->is_tile)
update_bbox = TRUE; update_bbox = TRUE;
} }
if (map_info->text_map.framecolors[y][x] != bkglyphinfo->framecolor) {
map_info->text_map.framecolors[y][x] = bkglyphinfo->framecolor;
update_bbox = TRUE;
}
#endif #endif
} }
@@ -1049,10 +1058,12 @@ map_all_unexplored(struct map_info_t *map_info) /* [was map_all_stone()] */
tile_map->glyphs[y][x].glyph = !x ? g_nothg : g_unexp; tile_map->glyphs[y][x].glyph = !x ? g_nothg : g_unexp;
tile_map->glyphs[y][x].glyphflags = 0; tile_map->glyphs[y][x].glyphflags = 0;
tile_map->glyphs[y][x].tileidx = !x ? nothg_idx : unexp_idx; tile_map->glyphs[y][x].tileidx = !x ? nothg_idx : unexp_idx;
tile_map->glyphs[y][x].framecolor = NO_COLOR;
text_map->text[y][x] = (uchar) (!x ? mgnothg : mgunexp); text_map->text[y][x] = (uchar) (!x ? mgnothg : mgunexp);
#ifdef TEXTCOLOR #ifdef TEXTCOLOR
text_map->colors[y][x] = NO_COLOR; text_map->colors[y][x] = NO_COLOR;
text_map->framecolors[y][x] = NO_COLOR;
#endif #endif
} }
} }
@@ -1425,6 +1436,13 @@ map_update(struct xwindow *wp, int start_row, int stop_row, int start_col, int s
XSetForeground(dpy, tile_map->black_gc, XSetForeground(dpy, tile_map->black_gc,
BlackPixelOfScreen(screen)); BlackPixelOfScreen(screen));
} }
if (tile_map->glyphs[row][cur_col].framecolor != NO_COLOR) {
XDrawRectangle(dpy, XtWindow(wp->w),
map_info->text_map.color_gcs[tile_map->glyphs[row][cur_col].framecolor],
dest_x, dest_y,
tile_map->square_width - 1 ,
tile_map->square_height - 1);
}
} }
} }