From 1d054725dd5165d349f5c8fd425e6161bf67c6f5 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 3 Mar 2012 20:59:35 +0100 Subject: Refactor: USE_TRANSPARENCY compile-time flag always set --- src/cave.c | 64 --------------------- src/externs.h | 4 -- src/main-crb.c | 24 -------- src/main-gtk2.c | 58 ------------------- src/main-sdl.c | 8 --- src/main-win.c | 33 ----------- src/main-x11.c | 30 ---------- src/main-xaw.c | 44 --------------- src/z-term.c | 171 -------------------------------------------------------- src/z-term.h | 15 ----- 10 files changed, 451 deletions(-) (limited to 'src') diff --git a/src/cave.c b/src/cave.c index 3464a634..572b9181 100644 --- a/src/cave.c +++ b/src/cave.c @@ -866,12 +866,8 @@ static byte darker_attrs[16] = }; -#ifdef USE_TRANSPARENCY void map_info(int y, int x, byte *ap, char *cp, byte *tap, char *tcp, byte *eap, char *ecp) -#else /* USE_TRANSPARENCY */ -void map_info(int y, int x, byte *ap, char *cp) -#endif /* USE_TRANSPARENCY */ { cave_type *c_ptr; @@ -1225,14 +1221,10 @@ void map_info(int y, int x, byte *ap, char *cp) image_random(ap, cp); } -#ifdef USE_TRANSPARENCY - /* Save the terrain info for the transparency effects */ *tap = a; *tcp = c; -#endif /* USE_TRANSPARENCY */ - /* Save the info */ *ap = a; *cp = c; @@ -2161,21 +2153,16 @@ void lite_spot(int y, int x) byte a, a2; byte c, c2; -#ifdef USE_TRANSPARENCY byte ta; char tc; byte ea; char ec; -#endif /* USE_TRANSPARENCY */ - /* Redraw if on screen */ if (panel_contains(y, x)) { -#ifdef USE_TRANSPARENCY - /* Examine the grid */ map_info(y, x, &a, (char*)&c, &ta, &tc, &ea, &ec); @@ -2196,30 +2183,6 @@ void lite_spot(int y, int x) Term_queue_char(panel_col_of(x) + 1, y - panel_row_prt, a2, c2, 0, 0, 0, 0); } -#else /* USE_TRANSPARENCY */ - - /* Examine the grid */ - map_info(y, x, &a, (char *) &c); - - /* Hack -- Queue it */ - Term_queue_char(panel_col_of(x), y - panel_row_prt, a, c); - if (use_bigtile) - { - if (a & 0x80) - { - a2 = 255; - c2 = 255; - } - else - { - a2 = TERM_WHITE; - c2 = ' '; - } - Term_queue_char(panel_col_of(x) + 1, y - panel_row_prt, a2, c2); - } - -#endif /* USE_TRANSPARENCY */ - } } @@ -2254,7 +2217,6 @@ void prt_map(void) byte a, a2; char c, c2; -#ifdef USE_TRANSPARENCY byte ta; char tc; byte ea; @@ -2279,28 +2241,6 @@ void prt_map(void) } Term_queue_char(panel_col_of(x) + 1, y - panel_row_prt, a2, c2, 0, 0, 0, 0); } - -#else /* USE_TRANSPARENCY */ - /* Determine what is there */ - map_info(y, x, &a, &c); - - /* Efficiency -- Redraw that grid of the map */ - Term_queue_char(panel_col_of(x), y - panel_row_prt, a, c); - if (use_bigtile) - { - if (a & 0x80) - { - a2 = 255; - c2 = 255; - } - else - { - a2 = TERM_WHITE; - c2 = ' '; - } - Term_queue_char(panel_col_of(x) + 1, y - panel_row_prt, a2, c2); - } -#endif /* USE_TRANSPARENCY */ } } @@ -2543,11 +2483,7 @@ void display_map(int *cy, int *cx) x = i * xfactor / xrat + 1; /* Extract the current attr/char at that map location */ -#ifdef USE_TRANSPARENCY map_info(j, i, &ta, &tc, &ta, &tc, &ta, &tc); -#else /* USE_TRANSPARENCY */ - map_info(j, i, &ta, &tc); -#endif /* USE_TRANSPARENCY */ /* Extract the priority of that attr/char */ tp = priority(ta, tc); diff --git a/src/externs.h b/src/externs.h index e7f5cf47..4673236c 100644 --- a/src/externs.h +++ b/src/externs.h @@ -633,11 +633,7 @@ extern int distance(int y1, int x1, int y2, int x2); extern bool_ los(int y1, int x1, int y2, int x2); extern bool_ cave_valid_bold(int y, int x); extern bool_ no_lite(void); -#ifdef USE_TRANSPARENCY extern void map_info(int y, int x, byte *ap, char *cp, byte *tap, char *tcp, byte *eap, char *ecp); -#else /* USE_TRANSPARENCY */ -extern void map_info(int y, int x, byte *ap, char *cp); -#endif /* USE_TRANSPARENCY */ extern void map_info_default(int y, int x, byte *ap, char *cp); extern void move_cursor_relative(int row, int col); extern void print_rel(char c, byte a, int y, int x); diff --git a/src/main-crb.c b/src/main-crb.c index 34b735d1..a4a1a742 100644 --- a/src/main-crb.c +++ b/src/main-crb.c @@ -586,8 +586,6 @@ static bool_ check_create_user_dir(void) # define ALLOW_BIG_SCREEN # define HAS_SCORE_MENU # define NEW_ZVIRT_HOOKS -/* I can't ditch this, yet, because there are many variants */ -# define USE_TRANSPARENCY #endif /* ANGBAND30X */ # define USE_DOUBLE_TILES @@ -2872,13 +2870,9 @@ static errr Term_text_mac(int x, int y, int n, byte a, const char *cp) * * Erase "n" characters starting at (x,y) */ -#ifdef USE_TRANSPARENCY static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp, const byte *tap, const char *tcp, const byte *eap, const char *ecp) -#else /* USE_TRANSPARENCY */ -static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp) -#endif /* USE_TRANSPARENCY */ { int i; Rect dst_r; @@ -2916,13 +2910,11 @@ static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp) byte a = *ap++; char c = *cp++; -#ifdef USE_TRANSPARENCY byte ta = *tap++; char tc = *tcp++; byte ea = *eap++; char ec = *ecp++; bool_ has_overlay = (ea && ec); -#endif #ifdef USE_DOUBLE_TILES @@ -2947,12 +2939,10 @@ static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp) { int col, row; Rect src_r; -#ifdef USE_TRANSPARENCY int t_col, t_row; Rect terrain_r; int e_col, e_row; Rect ego_r; -#endif /* USE_TRANSPARENCY */ /* Row and Col */ row = ((byte)a & 0x7F) % pict_rows; @@ -2964,7 +2954,6 @@ static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp) src_r.right = src_r.left + graf_width; src_r.bottom = src_r.top + graf_height; -#ifdef USE_TRANSPARENCY /* Row and Col */ t_row = ((byte)ta & 0x7F) % pict_rows; t_col = ((byte)tc & 0x7F) % pict_cols; @@ -2989,8 +2978,6 @@ static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp) ego_r.bottom = ego_r.top + graf_height; } -#endif /* USE_TRANSPARENCY */ - /* Hardwire CopyBits */ RGBBackColor(&white); RGBForeColor(&black); @@ -3018,8 +3005,6 @@ static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp) /* Get Pixmap handle */ pixmap_h = GetPortPixMap(port); -#ifdef USE_TRANSPARENCY - /* Transparency effect */ switch (transparency_mode) { @@ -3064,15 +3049,6 @@ static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp) } } -#else /* USE_TRANSPARENCY */ - - /* Draw the picture */ - CopyBits((BitMap*)frameP->framePix, - (BitMap*)*pixmap_h, - &src_r, &dst_r, srcCopy, NULL); - -#endif /* USE_TRANSPARENCY */ - /* Release the lock and dispose the PixMap handle */ UnlockPortBits(port); diff --git a/src/main-gtk2.c b/src/main-gtk2.c index 10188657..20659f80 100644 --- a/src/main-gtk2.c +++ b/src/main-gtk2.c @@ -73,7 +73,6 @@ #ifdef ANGBAND300 # define can_save TRUE /* Mimick the short-lived flag */ # define C_FREE(P, N, T) FREE(P) /* Emulate the long-lived macro */ -# define USE_TRANSPARENCY /* Because it's default now */ #endif /* ANGBAND300 */ #ifdef GUMBAND @@ -187,10 +186,8 @@ struct term_data int tile_hgt; GdkRGBImage *tiles; -# ifdef USE_TRANSPARENCY guint32 bg_pixel; GdkRGBImage *trans_buf; -# endif /* USE_TRANSPARENCY */ #endif /* USE_GRAPHICS */ @@ -2190,16 +2187,11 @@ static void graf_nuke() /* Forget pointer */ td->tiles = NULL; -# ifdef USE_TRANSPARENCY - /* Free previously allocated transparency buffer */ if (td->trans_buf) gdk_rgb_image_destroy(td->trans_buf); /* Forget stale pointer */ td->trans_buf = NULL; - -# endif /* USE_TRANSPARENCY */ - } } @@ -2223,9 +2215,7 @@ static bool_ graf_init( GdkRGBImage *raw_tiles, *scaled_tiles; -# ifdef USE_TRANSPARENCY GdkRGBImage *buffer; -# endif /* USE_TRANSPARENCY */ int i; @@ -2300,8 +2290,6 @@ static bool_ graf_init( td->tiles = scaled_tiles; } -# ifdef USE_TRANSPARENCY - /* See if we have to (re)allocate a new buffer XXX */ if ((td->trans_buf == NULL) || (td->trans_buf->width != td->tile_wid) || @@ -2338,8 +2326,6 @@ static bool_ graf_init( 0, tile_hgt * 6); -# endif /* USE_TRANSPARENCY */ - } @@ -2502,16 +2488,12 @@ static void Term_nuke_gtk(term *t) /* Forget pointer */ td->tiles = NULL; -# ifdef USE_TRANSPARENCY - /* Free transparency buffer */ if (td->trans_buf) gdk_rgb_image_destroy(td->trans_buf); /* Amnesia */ td->trans_buf = NULL; -# endif /* USE_TRANSPARENCY */ - #endif /* USE_GRAPHICS */ } @@ -2670,8 +2652,6 @@ static errr Term_curs_gtk(int x, int y) #ifdef USE_GRAPHICS -# ifdef USE_TRANSPARENCY - /* * XXX XXX Low level graphics helper * Draw a tile at (s_x, s_y) over one at (t_x, t_y) and store the @@ -2757,7 +2737,6 @@ static void overlay_tiles_3( } } -# endif /* USE_TRANSPARENCY */ /* @@ -2765,17 +2744,11 @@ static void overlay_tiles_3( * * Draw "n" tiles/characters starting at (x,y) */ -# ifdef USE_TRANSPARENCY static errr Term_pict_gtk( int x, int y, int n, const byte *ap, const char *cp, const byte *tap, const char *tcp, const byte *eap, const char *ecp) -# else /* USE_TRANSPARENCY */ -static errr Term_pict_gtk( - int x, int y, int n, - const byte *ap, const char *cp) -# endif /* USE_TRANSPARENCY */ { term_data *td = (term_data*)(Term->data); @@ -2816,8 +2789,6 @@ static errr Term_pict_gtk( char c; int s_x, s_y; -# ifdef USE_TRANSPARENCY - byte ta; char tc; int t_x, t_y; @@ -2827,15 +2798,11 @@ static errr Term_pict_gtk( int e_x = 0, e_y = 0; bool_ has_overlay; -# endif /* USE_TRANSPARENCY */ - /* Grid attr/char */ a = *ap++; c = *cp++; -# ifdef USE_TRANSPARENCY - /* Terrain attr/char */ ta = *tap++; tc = *tcp++; @@ -2845,14 +2812,10 @@ static errr Term_pict_gtk( ec = *ecp++; has_overlay = (ea && ec); -# endif /* USE_TRANSPARENCY */ - /* Row and Col */ s_y = (((byte)a & 0x7F) % tile_rows) * td->tile_hgt; s_x = (((byte)c & 0x7F) % tile_cols) * td->tile_wid; -# ifdef USE_TRANSPARENCY - /* Terrain Row and Col */ t_y = (((byte)ta & 0x7F) % tile_rows) * td->tile_hgt; t_x = (((byte)tc & 0x7F) % tile_cols) * td->tile_wid; @@ -2949,17 +2912,6 @@ static errr Term_pict_gtk( gdk_flush(); } -# else /* USE_TRANSPARENCY */ - - /* Draw the tile */ - gdk_draw_rgb_image_2( - TERM_DATA_DRAWABLE(td), td->gc, td->tiles, - s_x, s_y, - d_x, d_y, - td->tile_wid, td->tile_hgt); - -# endif /* USE_TRANSPARENCY */ - /* * Advance x-coordinate - wide font fillers are taken care of * before entering the tile drawing code. @@ -3665,8 +3617,6 @@ static void change_wide_tile_mode_event_handler( # endif /* USE_DOUBLE_TILES */ -# ifdef USE_TRANSPARENCY - /* * Toggles the boolean value of use_transparency */ @@ -3682,8 +3632,6 @@ static void change_trans_mode_event_handler( Term_key_push(KTRL('R')); } -# endif /* USE_TRANSPARENCY */ - #endif /* USE_GRAPHICS */ @@ -4435,10 +4383,8 @@ static GtkItemFactoryEntry main_menu_items[] = NULL, 0, "", NULL }, { "/Options/Graphics/Smoothing", NULL, change_smooth_mode_event_handler, 0, "", NULL }, -# ifdef USE_TRANSPARENCY { "/Options/Graphics/Transparency", NULL, change_trans_mode_event_handler, 0, "", NULL }, -# endif /* USE_TRANSPARENCY */ #endif /* USE_GRAPHICS */ @@ -4769,13 +4715,9 @@ static void graf_menu_update_handler( "/Options/Graphics/Smoothing", smooth_rescaling); -# ifdef USE_TRANSPARENCY - check_menu_item( "/Options/Graphics/Transparency", use_transparency); - -# endif /* USE_TRANSPARENCY */ } #endif /* USE_GRAPHICS */ diff --git a/src/main-sdl.c b/src/main-sdl.c index c3bff0f9..840859e9 100644 --- a/src/main-sdl.c +++ b/src/main-sdl.c @@ -217,10 +217,6 @@ struct _term_data rendered to before blitting to main screen */ int black,white,purple; /* basic colors keyed to this terminal's surface */ -#ifdef USE_GRAPHICS -#ifdef USE_TRANSPARENCY -#endif -#endif }; /* The array of term data structures */ @@ -1907,10 +1903,6 @@ static errr term_data_init(term_data *td, int i) printf("Init-int term: %d\n",i); -#ifdef USE_GRAPHICS -#ifdef USE_TRANSPARENCY -#endif -#endif /* Success */ return (0); diff --git a/src/main-win.c b/src/main-win.c index d0548d3b..420ac858 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -467,15 +467,11 @@ static bool_ can_use_graphics = FALSE; */ static DIBINIT infGraph; -#ifdef USE_TRANSPARENCY - /* * The global bitmap mask */ static DIBINIT infMask; -#endif /* USE_TRANSPARENCY */ - #endif /* USE_GRAPHICS */ @@ -1245,8 +1241,6 @@ static bool_ init_graphics() int wid, hgt; cptr name; -#ifdef USE_TRANSPARENCY - /* Unused */ PALETTEENTRY entry = { @@ -1254,8 +1248,6 @@ static bool_ init_graphics() }; (void)entry; -#endif /* USE_TRANSPARENCY */ - if (arg_graphics == 2) { wid = 16; @@ -1289,8 +1281,6 @@ static bool_ init_graphics() infGraph.CellHeight = hgt; -#ifdef USE_TRANSPARENCY - path_build(buf, 1024, ANGBAND_DIR_XTRA_GRAF, "mask.bmp"); /* Load the bitmap or quit */ if (!ReadDIB(data[0].w, buf, &infMask)) @@ -1299,8 +1289,6 @@ static bool_ init_graphics() return (FALSE); } -#endif /* USE_TRANSPARENCY */ - /* Activate a palette */ if (!new_palette()) { @@ -2212,11 +2200,7 @@ static errr Term_text_win(int x, int y, int n, byte a, const char *s) * * If "graphics" is not available, we simply "wipe" the given grids. */ -# ifdef USE_TRANSPARENCY static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp, const byte *tap, const char *tcp, const byte *eap, const char *ecp) -# else /* USE_TRANSPARENCY */ -static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp) -# endif /* USE_TRANSPARENCY */ { term_data *td = (term_data*)(Term->data); @@ -2226,16 +2210,12 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp) int x1, y1, w1, h1; int x2, y2, w2, h2, tw2; -# ifdef USE_TRANSPARENCY - int x3, y3; HDC hdcMask = NULL; int x4, y4; -# endif /* USE_TRANSPARENCY */ - HDC hdc; HDC hdcSrc; HBITMAP hbmSrcOld; @@ -2270,16 +2250,12 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp) hdcSrc = CreateCompatibleDC(hdc); hbmSrcOld = SelectObject(hdcSrc, infGraph.hBitmap); -# ifdef USE_TRANSPARENCY - if (arg_graphics == 2) { hdcMask = CreateCompatibleDC(hdc); SelectObject(hdcMask, infMask.hBitmap); } -# endif /* USE_TRANSPARENCY */ - /* Draw attr/char pairs */ for (i = 0; i < n; i++, x2 += w2) { @@ -2294,8 +2270,6 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp) x1 = col * w1; y1 = row * h1; -# ifdef USE_TRANSPARENCY - if (arg_graphics == 2) { x3 = (tcp[i] & 0x7F) * w1; @@ -2359,9 +2333,6 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp) } } else - -# endif /* USE_TRANSPARENCY */ - { /* Perfect size */ if ((w1 == tw2) && (h1 == h2)) @@ -2386,8 +2357,6 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp) SelectObject(hdcSrc, hbmSrcOld); DeleteDC(hdcSrc); -# ifdef USE_TRANSPARENCY - if (arg_graphics == 2) { /* Release */ @@ -2395,8 +2364,6 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp) DeleteDC(hdcMask); } -# endif /* USE_TRANSPARENCY */ - /* Release */ ReleaseDC(td->w, hdc); diff --git a/src/main-x11.c b/src/main-x11.c index 4f03b396..e32e2617 100644 --- a/src/main-x11.c +++ b/src/main-x11.c @@ -1547,15 +1547,11 @@ struct term_data XImage *tiles; -#ifdef USE_TRANSPARENCY - /* Tempory storage for overlaying tiles. */ XImage *TmpImage; #endif -#endif - }; @@ -2563,20 +2559,14 @@ static errr Term_text_x11(int x, int y, int n, byte a, cptr s) /* * Draw some graphical characters. */ -# ifdef USE_TRANSPARENCY static errr Term_pict_x11(int x, int y, int n, const byte *ap, const char *cp, const byte *tap, const char *tcp, const byte *eap, const char *ecp) -# else /* USE_TRANSPARENCY */ -static errr Term_pict_x11(int x, int y, int n, const byte *ap, const char *cp) -# endif /* USE_TRANSPARENCY */ { int i, x1, y1; byte a; char c; - -#ifdef USE_TRANSPARENCY byte ta; char tc; int x2, y2; @@ -2589,7 +2579,6 @@ static errr Term_pict_x11(int x, int y, int n, const byte *ap, const char *cp) int k, l; unsigned long pixel, blank; -#endif /* USE_TRANSPARENCY */ term_data *td = (term_data*)(Term->data); @@ -2609,8 +2598,6 @@ static errr Term_pict_x11(int x, int y, int n, const byte *ap, const char *cp) x1 = (c & 0x7F) * td->fnt->twid; y1 = (a & 0x7F) * td->fnt->hgt; -#ifdef USE_TRANSPARENCY - ta = *tap++; tc = *tcp++; @@ -2720,17 +2707,6 @@ static errr Term_pict_x11(int x, int y, int n, const byte *ap, const char *cp) td->fnt->twid, td->fnt->hgt); } -#else /* USE_TRANSPARENCY */ - -/* Draw object / terrain */ - XPutImage(Metadpy->dpy, td->win->win, - clr[0]->gc, - td->tiles, - x1, y1, - x, y, - td->fnt->twid, td->fnt->hgt); - -#endif /* USE_TRANSPARENCY */ x += td->fnt->wid; } @@ -3017,10 +2993,7 @@ errr init_x11(int argc, char *argv[]) int pict_hgt = 0; bool_ force_old_graphics = FALSE; -#ifdef USE_TRANSPARENCY - char *TmpData; -#endif /* USE_TRANSPARENCY */ #endif /* USE_GRAPHICS */ @@ -3198,7 +3171,6 @@ errr init_x11(int argc, char *argv[]) td->fnt->twid, td->fnt->hgt); } -#ifdef USE_TRANSPARENCY /* Initialize the transparency masks */ for (i = 0; i < num_term; i++) { @@ -3223,8 +3195,6 @@ errr init_x11(int argc, char *argv[]) td->fnt->twid, td->fnt->hgt, 8, 0); } -#endif /* USE_TRANSPARENCY */ - /* Free tiles_raw? XXX XXX */ } diff --git a/src/main-xaw.c b/src/main-xaw.c index 1f74aaf7..8795e00d 100644 --- a/src/main-xaw.c +++ b/src/main-xaw.c @@ -195,13 +195,9 @@ struct AngbandPart /* Tiles */ XImage *tiles; -#ifdef USE_TRANSPARENCY - /* Tempory storage for overlaying tiles. */ XImage *TmpImage; -#endif - #endif /* USE_GRAPHICS */ /* Private state */ @@ -446,23 +442,15 @@ static void AngbandOutputText(AngbandWidget widget, int x, int y, /* * Draw some graphical characters. */ -# ifdef USE_TRANSPARENCY static void AngbandOutputPict(AngbandWidget widget, int x, int y, int n, const byte *ap, const char *cp, const byte *tap, const char *tcp, const byte *eap, const char *ecp) -# else /* USE_TRANSPARENCY */ -static void AngbandOutputPict(AngbandWidget widget, int x, int y, int n, - const byte *ap, const char *cp) -# endif /* USE_TRANSPARENCY */ - - { int i, x1, y1; byte a; char c; -#ifdef USE_TRANSPARENCY byte ta; char tc; @@ -477,8 +465,6 @@ static void AngbandOutputPict(AngbandWidget widget, int x, int y, int n, int k, l; unsigned long pixel, blank; -#endif /* USE_TRANSPARENCY */ - /* Figure out where to place the text */ y = (y * widget->angband.fontheight + widget->angband.internal_border); x = (x * widget->angband.fontwidth + widget->angband.internal_border); @@ -492,8 +478,6 @@ static void AngbandOutputPict(AngbandWidget widget, int x, int y, int n, x1 = (c & 0x7F) * widget->angband.fontwidth; y1 = (a & 0x7F) * widget->angband.fontheight; -#ifdef USE_TRANSPARENCY - ta = *tap++; tc = *tcp++; @@ -619,19 +603,6 @@ static void AngbandOutputPict(AngbandWidget widget, int x, int y, int n, widget->angband.fontheight); } -#else /* USE_TRANSPARENCY */ - - /* Draw object / terrain */ - XPutImage(XtDisplay(widget), XtWindow(widget), - widget->angband.gc[0], - widget->angband.tiles, - x1, y1, - x, y, - widget->angband.fontwidth, - widget->angband.fontheight); - -#endif /* USE_TRANSPARENCY */ - x += widget->angband.fontwidth; } } @@ -1582,21 +1553,13 @@ static errr Term_text_xaw(int x, int y, int n, byte a, cptr s) /* * Draw some graphical characters. */ -# ifdef USE_TRANSPARENCY static errr Term_pict_xaw(int x, int y, int n, const byte *ap, const char *cp, const byte *tap, const char *tcp, const byte *eap, const char *ecp) -# else /* USE_TRANSPARENCY */ -static errr Term_pict_xaw(int x, int y, int n, const byte *ap, const char *cp) -# endif /* USE_TRANSPARENCY */ { term_data *td = (term_data*)(Term->data); /* Draw the pictures */ -# ifdef USE_TRANSPARENCY AngbandOutputPict(td->widget, x, y, n, ap, cp, tap, tcp, eap, ecp); -# else /* USE_TRANSPARENCY */ - AngbandOutputPict(td->widget, x, y, n, ap, cp); -# endif /* USE_TRANSPARENCY */ /* Success */ return (0); @@ -1730,10 +1693,7 @@ errr init_xaw(int argc, char *argv[]) int pict_hgt = 0; bool_ force_old_graphics = FALSE; -#ifdef USE_TRANSPARENCY - char *TmpData; -#endif /* USE_TRANSPARENCY */ #endif /* USE_GRAPHICS */ @@ -1886,8 +1846,6 @@ errr init_xaw(int argc, char *argv[]) td->widget->angband.fontheight); } -#ifdef USE_TRANSPARENCY - /* Initialize the transparency temp storage*/ for (i = 0; i < num_term; i++) { @@ -1916,8 +1874,6 @@ errr init_xaw(int argc, char *argv[]) } -#endif /* USE_TRANSPARENCY */ - /* Free tiles_raw? XXX XXX */ } diff --git a/src/z-term.c b/src/z-term.c index ef4dfeaa..4e89ffb7 100644 --- a/src/z-term.c +++ b/src/z-term.c @@ -300,8 +300,6 @@ static errr term_win_nuke(term_win *s, int w, int h) C_KILL(s->va, h * w, byte); C_KILL(s->vc, h * w, char); -#ifdef USE_TRANSPARENCY - /* Free the terrain access arrays */ C_KILL(s->ta, h, byte*); C_KILL(s->tc, h, char*); @@ -318,8 +316,6 @@ static errr term_win_nuke(term_win *s, int w, int h) C_KILL(s->vea, h * w, byte); C_KILL(s->vec, h * w, char); -#endif /* USE_TRANSPARENCY */ - /* Success */ return (0); } @@ -340,8 +336,6 @@ static errr term_win_init(term_win *s, int w, int h) C_MAKE(s->va, h * w, byte); C_MAKE(s->vc, h * w, char); -#ifdef USE_TRANSPARENCY - /* Make the terrain access arrays */ C_MAKE(s->ta, h, byte*); C_MAKE(s->tc, h, char*); @@ -358,8 +352,6 @@ static errr term_win_init(term_win *s, int w, int h) C_MAKE(s->vea, h * w, byte); C_MAKE(s->vec, h * w, char); -#endif /* USE_TRANSPARENCY */ - /* Prepare the window access arrays */ for (y = 0; y < h; y++) @@ -367,16 +359,12 @@ static errr term_win_init(term_win *s, int w, int h) s->a[y] = s->va + w * y; s->c[y] = s->vc + w * y; -#ifdef USE_TRANSPARENCY - s->ta[y] = s->vta + w * y; s->tc[y] = s->vtc + w * y; s->ea[y] = s->vea + w * y; s->ec[y] = s->vec + w * y; -#endif /* USE_TRANSPARENCY */ - } /* Success */ @@ -400,8 +388,6 @@ static errr term_win_copy(term_win *s, term_win *f, int w, int h) byte *s_aa = s->a[y]; char *s_cc = s->c[y]; -#ifdef USE_TRANSPARENCY - byte *f_taa = f->ta[y]; char *f_tcc = f->tc[y]; @@ -414,21 +400,16 @@ static errr term_win_copy(term_win *s, term_win *f, int w, int h) byte *s_eaa = s->ea[y]; char *s_ecc = s->ec[y]; -#endif /* USE_TRANSPARENCY */ - for (x = 0; x < w; x++) { *s_aa++ = *f_aa++; *s_cc++ = *f_cc++; -#ifdef USE_TRANSPARENCY *s_taa++ = *f_taa++; *s_tcc++ = *f_tcc++; *s_eaa++ = *f_eaa++; *s_ecc++ = *f_ecc++; -#endif /* USE_TRANSPARENCY */ - } } @@ -520,18 +501,10 @@ static errr Term_text_hack(int x, int y, int n, byte a, const char *cp) /* * Hack -- fake hook for "Term_pict()" (see above) */ -#ifdef USE_TRANSPARENCY static errr Term_pict_hack(int x, int y, int n, const byte *ap, const char *cp, const byte *tap, const char *tcp, const byte *eap, const char *ecp) -#else /* USE_TRANSPARENCY */ -static errr Term_pict_hack(int x, int y, int n, const byte *ap, const char *cp) -#endif /* USE_TRANSPARENCY */ { /* Compiler silliness */ -#ifdef USE_TRANSPARENCY if (x || y || n || ap || cp || tap || tcp || eap || ecp) return ( -2); -#else /* USE_TRANSPARENCY */ - if (x || y || n || ap || cp) return ( -2); -#endif /* USE_TRANSPARENCY */ /* Oops */ return ( -1); @@ -547,19 +520,13 @@ static errr Term_pict_hack(int x, int y, int n, const byte *ap, const char *cp) * * Assumes given location and values are valid. */ -#ifdef USE_TRANSPARENCY void Term_queue_char(int x, int y, byte a, char c, byte ta, char tc, byte ea, char ec) -#else /* USE_TRANSPARENCY */ -void Term_queue_char(int x, int y, byte a, char c) -#endif /* USE_TRANSPARENCY */ { term_win *scrn = Term->scr; byte *scr_aa = &scrn->a[y][x]; char *scr_cc = &scrn->c[y][x]; -#ifdef USE_TRANSPARENCY - byte *scr_taa = &scrn->ta[y][x]; char *scr_tcc = &scrn->tc[y][x]; @@ -571,27 +538,16 @@ void Term_queue_char(int x, int y, byte a, char c) (*scr_taa == ta) && (*scr_tcc == tc) && (*scr_eaa == ea) && (*scr_ecc == ec)) return; -#else /* USE_TRANSPARENCY */ - - /* Hack -- Ignore non-changes */ - if ((*scr_aa == a) && (*scr_cc == c)) return; - -#endif /* USE_TRANSPARENCY */ - /* Save the "literal" information */ *scr_aa = a; *scr_cc = c; -#ifdef USE_TRANSPARENCY - *scr_taa = ta; *scr_tcc = tc; *scr_eaa = ea; *scr_ecc = ec; -#endif /* USE_TRANSPARENCY */ - /* Check for new min/max row info */ if (y < Term->y1) Term->y1 = y; if (y > Term->y2) Term->y2 = y; @@ -610,11 +566,7 @@ void Term_queue_char(int x, int y, byte a, char c) * This function is designed to be fast, with no consistancy checking. * It is used to update the map in the game. */ -#ifdef USE_TRANSPARENCY void Term_queue_line(int x, int y, int n, byte *a, char *c, byte *ta, char *tc, byte *ea, char *ec) -#else /* USE_TRANSPARENCY */ -void Term_queue_line(int x, int y, int n, byte *a, char *c) -#endif /* USE_TRANSPARENCY */ { term_win *scrn = Term->scr; @@ -624,21 +576,15 @@ void Term_queue_line(int x, int y, int n, byte *a, char *c) byte *scr_aa = &scrn->a[y][x]; char *scr_cc = &scrn->c[y][x]; -#ifdef USE_TRANSPARENCY - byte *scr_taa = &scrn->ta[y][x]; char *scr_tcc = &scrn->tc[y][x]; byte *scr_eaa = &scrn->ea[y][x]; char *scr_ecc = &scrn->ec[y][x]; -#endif /* USE_TRANSPARENCY */ - while (n--) { -#ifdef USE_TRANSPARENCY - /* Hack -- Ignore non-changes */ if ((*scr_aa == *a) && (*scr_cc == *c) && (*scr_taa == *ta) && (*scr_tcc == *tc) && @@ -668,21 +614,6 @@ void Term_queue_line(int x, int y, int n, byte *a, char *c) *scr_eaa++ = *ea++; *scr_ecc++ = *ec++; -#else /* USE_TRANSPARENCY */ - - /* Hack -- Ignore non-changes */ - if ((*scr_aa == *a) && (*scr_cc == *c)) - { - x++; - a++; - c++; - scr_aa++; - scr_cc++; - continue; - } - -#endif /* USE_TRANSPARENCY */ - /* Save the "literal" information */ *scr_aa++ = *a++; *scr_cc++ = *c++; @@ -726,24 +657,18 @@ void Term_queue_chars(int x, int y, int n, byte a, cptr s) byte *scr_aa = Term->scr->a[y]; char *scr_cc = Term->scr->c[y]; -#ifdef USE_TRANSPARENCY - byte *scr_taa = Term->scr->ta[y]; char *scr_tcc = Term->scr->tc[y]; byte *scr_eaa = Term->scr->ea[y]; char *scr_ecc = Term->scr->ec[y]; -#endif /* USE_TRANSPARENCY */ - /* Queue the attr/chars */ for ( ; n; x++, s++, n--) { int oa = scr_aa[x]; int oc = scr_cc[x]; -#ifdef USE_TRANSPARENCY - int ota = scr_taa[x]; int otc = scr_tcc[x]; @@ -755,27 +680,17 @@ void Term_queue_chars(int x, int y, int n, byte a, cptr s) (ota == 0) && (otc == 0) && (oea == 0) && (oec == 0)) continue; -#else /* USE_TRANSPARENCY */ - - /* Hack -- Ignore non-changes */ - if ((oa == a) && (oc == *s)) continue; - -#endif /* USE_TRANSPARENCY */ /* Save the "literal" information */ scr_aa[x] = a; scr_cc[x] = *s; -#ifdef USE_TRANSPARENCY - scr_taa[x] = 0; scr_tcc[x] = 0; scr_taa[x] = 0; scr_tcc[x] = 0; -#endif /* USE_TRANSPARENCY */ - /* Note the "range" of window updates */ if (x1 < 0) x1 = x; x2 = x; @@ -814,8 +729,6 @@ static void Term_fresh_row_pict(int y, int x1, int x2) byte *scr_aa = Term->scr->a[y]; char *scr_cc = Term->scr->c[y]; -#ifdef USE_TRANSPARENCY - byte *old_taa = Term->old->ta[y]; char *old_tcc = Term->old->tc[y]; @@ -840,7 +753,6 @@ static void Term_fresh_row_pict(int y, int x1, int x2) byte nea; char nec; -#endif /* USE_TRANSPARENCY */ /* Pending length */ @@ -866,8 +778,6 @@ static void Term_fresh_row_pict(int y, int x1, int x2) na = scr_aa[x]; nc = scr_cc[x]; -#ifdef USE_TRANSPARENCY - ota = old_taa[x]; otc = old_tcc[x]; @@ -884,26 +794,15 @@ static void Term_fresh_row_pict(int y, int x1, int x2) if ((na == oa) && (nc == oc) && (nta == ota) && (ntc == otc) && (nea == oea) && (nec == oec)) - -#else /* USE_TRANSPARENCY */ - - /* Handle unchanged grids */ - if ((na == oa) && (nc == oc)) - -#endif /* USE_TRANSPARENCY */ { /* Flush */ if (fn) { /* Draw pending attr/char pairs */ -#ifdef USE_TRANSPARENCY (void)((*Term->pict_hook)(fx, y, fn, &scr_aa[fx], &scr_cc[fx], &scr_taa[fx], &scr_tcc[fx], &scr_eaa[fx], &scr_ecc[fx])); -#else /* USE_TRANSPARENCY */ - (void)((*Term->pict_hook)(fx, y, fn, &scr_aa[fx], &scr_cc[fx])); -#endif /* USE_TRANSPARENCY */ /* Forget */ fn = 0; @@ -916,13 +815,11 @@ static void Term_fresh_row_pict(int y, int x1, int x2) old_aa[x] = na; old_cc[x] = nc; -#ifdef USE_TRANSPARENCY old_taa[x] = nta; old_tcc[x] = ntc; old_eaa[x] = nea; old_ecc[x] = nec; -#endif /* USE_TRANSPARENCY */ /* Restart and Advance */ if (fn++ == 0) fx = x; @@ -932,14 +829,10 @@ static void Term_fresh_row_pict(int y, int x1, int x2) if (fn) { /* Draw pending attr/char pairs */ -#ifdef USE_TRANSPARENCY (void)((*Term->pict_hook)(fx, y, fn, &scr_aa[fx], &scr_cc[fx], &scr_taa[fx], &scr_tcc[fx], &scr_eaa[fx], &scr_ecc[fx])); -#else /* USE_TRANSPARENCY */ - (void)((*Term->pict_hook)(fx, y, fn, &scr_aa[fx], &scr_cc[fx])); -#endif /* USE_TRANSPARENCY */ } } @@ -961,7 +854,6 @@ static void Term_fresh_row_both(int y, int x1, int x2) byte *scr_aa = Term->scr->a[y]; char *scr_cc = Term->scr->c[y]; -#ifdef USE_TRANSPARENCY byte *old_taa = Term->old->ta[y]; char *old_tcc = Term->old->tc[y]; byte *scr_taa = Term->scr->ta[y]; @@ -981,7 +873,6 @@ static void Term_fresh_row_both(int y, int x1, int x2) char oec; byte nea; char nec; -#endif /* USE_TRANSPARENCY */ /* The "always_text" flag */ int always_text = Term->always_text; @@ -1012,8 +903,6 @@ static void Term_fresh_row_both(int y, int x1, int x2) na = scr_aa[x]; nc = scr_cc[x]; -#ifdef USE_TRANSPARENCY - ota = old_taa[x]; otc = old_tcc[x]; @@ -1030,14 +919,6 @@ static void Term_fresh_row_both(int y, int x1, int x2) if ((na == oa) && (nc == oc) && (nta == ota) && (ntc == otc) && (nea == oea) && (nec == oec)) - -#else /* USE_TRANSPARENCY */ - - /* Handle unchanged grids */ - if ((na == oa) && (nc == oc)) - -#endif /* USE_TRANSPARENCY */ - { /* Flush */ if (fn) @@ -1064,16 +945,12 @@ static void Term_fresh_row_both(int y, int x1, int x2) old_aa[x] = na; old_cc[x] = nc; -#ifdef USE_TRANSPARENCY - old_taa[x] = nta; old_tcc[x] = ntc; old_eaa[x] = nea; old_ecc[x] = nec; -#endif /* USE_TRANSPARENCY */ - /* 2nd byte of bigtile */ if (na == 255) continue; @@ -1097,18 +974,9 @@ static void Term_fresh_row_both(int y, int x1, int x2) fn = 0; } -#ifdef USE_TRANSPARENCY - /* Hack -- Draw the special attr/char pair */ (void)((*Term->pict_hook)(x, y, 1, &na, &nc, &nta, &ntc, &nea, &nec)); -#else /* USE_TRANSPARENCY */ - - /* Hack -- Draw the special attr/char pair */ - (void)((*Term->pict_hook)(x, y, 1, &na, &nc)); - -#endif /* USE_TRANSPARENCY */ - /* Skip */ continue; } @@ -1461,16 +1329,12 @@ errr Term_fresh(void) byte *aa = old->a[y]; char *cc = old->c[y]; -#ifdef USE_TRANSPARENCY - byte *taa = old->ta[y]; char *tcc = old->tc[y]; byte *eaa = old->ea[y]; char *ecc = old->ec[y]; -#endif /* USE_TRANSPARENCY */ - /* Wipe each column */ for (x = 0; x < w; x++) @@ -1479,16 +1343,11 @@ errr Term_fresh(void) *aa++ = na; *cc++ = nc; -#ifdef USE_TRANSPARENCY - *taa++ = na; *tcc++ = nc; *eaa++ = na; *ecc++ = nc; - -#endif /* USE_TRANSPARENCY */ - } } @@ -1523,8 +1382,6 @@ errr Term_fresh(void) byte oa = old_aa[tx]; char oc = old_cc[tx]; -#ifdef USE_TRANSPARENCY - byte *old_taa = old->ta[ty]; char *old_tcc = old->tc[ty]; @@ -1537,26 +1394,16 @@ errr Term_fresh(void) byte oea = old_eaa[tx]; char oec = old_ecc[tx]; -#endif /* USE_TRANSPARENCY */ - /* Hack -- use "Term_pict()" always */ if (Term->always_pict) { -#ifdef USE_TRANSPARENCY (void)((*Term->pict_hook)(tx, ty, 1, &oa, &oc, &ota, &otc, &oea, &oec)); -#else /* USE_TRANSPARENCY */ - (void)((*Term->pict_hook)(tx, ty, 1, &oa, &oc)); -#endif /* USE_TRANSPARENCY */ } /* Hack -- use "Term_pict()" sometimes */ else if (Term->higher_pict && (oa & 0x80)) { -#ifdef USE_TRANSPARENCY (void)((*Term->pict_hook)(tx, ty, 1, &oa, &oc, &ota, &otc, &oea, &oec)); -#else /* USE_TRANSPARENCY */ - (void)((*Term->pict_hook)(tx, ty, 1, &oa, &oc)); -#endif /* USE_TRANSPARENCY */ } /* Hack -- restore the actual character */ @@ -1782,11 +1629,7 @@ errr Term_draw(int x, int y, byte a, char c) if (!c) return ( -2); /* Queue it for later */ -#ifdef USE_TRANSPARENCY Term_queue_char(x, y, a, c, 0, 0, 0, 0); -#else /* USE_TRANSPARENCY */ - Term_queue_char(x, y, a, c); -#endif /* USE_TRANSPARENCY */ /* Success */ return (0); @@ -1820,11 +1663,7 @@ errr Term_addch(byte a, char c) if (!c) return ( -2); /* Queue the given character for display */ -#ifdef USE_TRANSPARENCY Term_queue_char(Term->scr->cx, Term->scr->cy, a, c, 0, 0, 0, 0); -#else /* USE_TRANSPARENCY */ - Term_queue_char(Term->scr->cx, Term->scr->cy, a, c); -#endif /* USE_TRANSPARENCY */ /* Advance the cursor */ Term->scr->cx++; @@ -1949,13 +1788,11 @@ errr Term_erase(int x, int y, int n) byte *scr_aa; char *scr_cc; -#ifdef USE_TRANSPARENCY byte *scr_taa; char *scr_tcc; byte *scr_eaa; char *scr_ecc; -#endif /* USE_TRANSPARENCY */ /* Place cursor */ if (Term_gotoxy(x, y)) return ( -1); @@ -1967,13 +1804,11 @@ errr Term_erase(int x, int y, int n) scr_aa = Term->scr->a[y]; scr_cc = Term->scr->c[y]; -#ifdef USE_TRANSPARENCY scr_taa = Term->scr->ta[y]; scr_tcc = Term->scr->tc[y]; scr_eaa = Term->scr->ea[y]; scr_ecc = Term->scr->ec[y]; -#endif /* USE_TRANSPARENCY */ if (n > 0 && (byte)scr_cc[x] == 255 && scr_aa[x] == 255) { @@ -1994,13 +1829,11 @@ errr Term_erase(int x, int y, int n) scr_aa[x] = na; scr_cc[x] = nc; -#ifdef USE_TRANSPARENCY scr_taa[x] = 0; scr_tcc[x] = 0; scr_eaa[x] = 0; scr_ecc[x] = 0; -#endif /* USE_TRANSPARENCY */ /* Track minimum changed column */ if (x1 < 0) x1 = x; @@ -2053,13 +1886,11 @@ errr Term_clear(void) byte *scr_aa = Term->scr->a[y]; char *scr_cc = Term->scr->c[y]; -#ifdef USE_TRANSPARENCY byte *scr_taa = Term->scr->ta[y]; char *scr_tcc = Term->scr->tc[y]; byte *scr_eaa = Term->scr->ea[y]; char *scr_ecc = Term->scr->ec[y]; -#endif /* USE_TRANSPARENCY */ /* Wipe each column */ for (x = 0; x < w; x++) @@ -2067,13 +1898,11 @@ errr Term_clear(void) scr_aa[x] = na; scr_cc[x] = nc; -#ifdef USE_TRANSPARENCY scr_taa[x] = 0; scr_tcc[x] = 0; scr_eaa[x] = 0; scr_ecc[x] = 0; -#endif /* USE_TRANSPARENCY */ } /* This row has changed */ diff --git a/src/z-term.h b/src/z-term.h index e5371825..31e5b308 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -48,7 +48,6 @@ struct term_win byte *va; char *vc; -#ifdef USE_TRANSPARENCY byte **ta; char **tc; @@ -61,8 +60,6 @@ struct term_win byte *vea; char *vec; -#endif /* USE_TRANSPARENCY */ - }; @@ -232,11 +229,7 @@ struct term void (*resize_hook)(void); -#ifdef USE_TRANSPARENCY errr (*pict_hook)(int x, int y, int n, const byte *ap, const char *cp, const byte *tap, const char *tcp, const byte *eap, const char *ecp); -#else /* USE_TRANSPARENCY */ - errr (*pict_hook)(int x, int y, int n, const byte *ap, const char *cp); -#endif /* USE_TRANSPARENCY */ }; @@ -301,16 +294,8 @@ extern char scansubdir_dir[1024]; extern int scansubdir_max; extern cptr scansubdir_result[255]; -#ifdef USE_TRANSPARENCY extern void Term_queue_char(int x, int y, byte a, char c, byte ta, char tc, byte ea, char ec); - extern void Term_queue_line(int x, int y, int n, byte *a, char *c, byte *ta, char *tc, byte *ea, char *ec); -#else /* USE_TRANSPARENCY */ -extern void Term_queue_char(int x, int y, byte a, char c); - -extern void Term_queue_line(int x, int y, int n, byte *a, char *c); -#endif /* USE_TRANSPARENCY */ - extern void Term_queue_chars(int x, int y, int n, byte a, cptr s); extern errr Term_fresh(void); -- cgit v1.2.3