Changeset 122

Timestamp:

05/07/07 12:59:02 (1 year ago)

Author:

takkaria

Message:

Update to the latest SDL code, with snap-to-edge behaviour, and requiring SDL_Image. (Iain McFall?)

Files:

• trunk/lib/xtra/graf/16x16.png (modified) (previous)
• trunk/lib/xtra/graf/32x32.png (modified) (previous)
• trunk/src/main-sdl.c (modified) (45 diffs)

trunk/src/main-sdl.c

@@ -9 +9 @@
- * Comments and suggestions are welcome. The UI probably needs some
- * adjustment, and I need comments from you.
-
+
+
+
- */
-
@@ -107 +109 @@
-#include "SDL.h"
-#include "SDL_ttf.h"
+#include "SDL_image.h"
-
-/* SDL flags used for the main window surface */
@@ -127 +130 @@
-static cptr ANGBAND_DIR_XTRA_FONT;
-static cptr ANGBAND_DIR_XTRA_GRAF;
+
+/* XXXXXXXXX */
+static cptr ANGBAND_DIR_USER_SDL;
+
-/* Later...
-static cptr ANGBAND_DIR_XTRA_SOUND;
@@ -176 +183 @@
-        
-        SDL_Surface *surface;   /* The surface for this window */
-
+
+
+
-        byte Term_idx;                  /* Index of term that relates to this */
-        
@@ -333 +342 @@
- (k == SDLK_KP7) || (k == SDLK_KP8) || (k == SDLK_KP9) || (k == SDLK_KP_ENTER))
-
+static int SnapRange = 5;       /* Window snap range (pixels) */
-static int StatusHeight;        /* The height in pixels of the status bar */
-static int SelectedTerm;        /* Current selected Term */
@@ -346 +356 @@
-static int MoreOK;                      /* Accept changes */
-static int MoreFullscreen;      /* Fullscreen toggle button */
+static int MoreSnapPlus;        /* Increase snap range */
+static int MoreSnapMinus;       /* Decrease snap range */
-
-static bool Moving;                             /* Moving a window */
@@ -359 +371 @@
-        cptr name;                              /* Name to show on button */
-        cptr gfxfile;                   /* The file with tiles */
-        cptr maskfile;                  /* The mask file (if any) */
-        int width;                              /* Width of a tile */
-        int height;                             /* Height of a tile */
-        cptr pref;                              /* Preference file to use */
+        int x;                                  /* Yuk - Pixel location of colour key */
+        int y;                                  /* ditto */
-        bool avail;                             /* Are the appropriate files available? */
-};
@@ -372 +385 @@
-{
-        /* No gfx (GRAPHICS_NONE) */
-NULL, -1, -1, NULL
+-1, -1, NULL, 0, 0
-        /* 8x8 tiles (GRAPHICS_ORIGINAL) */
-bmp", NULL, 8, 8, "old"
+png", 8, 8, "old", 0, 0
-        /* 16x16 tiles (GRAPHICS_ADAM_BOLT) */
-bmp", "mask.bmp", 16, 16, "new"
+png", 16, 16, "new", 0, 65
-        /* XXX (GRAPHICS_DAVID_GERVAIS) */
-bmp", "mask32.bmp", 32, 32, "david"
+png", 32, 32, "david", 0, 0
-        
-        /* XXX (GRAPHICS_PSEUDO ???) */
@@ -392 +405 @@
- * The basic angband text colours in an sdl friendly form
- */
-16
+MAX_COLORS
-
-u32b back_colour;               /* Background colour */
@@ -1044 +1057 @@
-static void term_windowFree(term_window* win)
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        sdl_FontFree(&win->font);
-}
-
+static errr save_prefs(void);
-static void hook_quit(cptr str)
-{
-        int i;
-        
-
+
+
+
+
-        /* Free the surfaces of the windows */
-        for (i = 0; i < ANGBAND_TERM_MAX; i++)
@@ -1395 +1424 @@
-        {
-                window->visible = FALSE;
-                term_nuke(&window->term_data);
-                term_windowFree(window);
-                angband_term[SelectedTerm] = NULL;
@@ -1422 +1450 @@
-        
-        sdl_CheckFont(window->req_font, &w, &h);
+#ifdef USE_GRAPHICS     
+        /* Invalidate the gfx surface */
+        if (window->tiles)
+        {
+                SDL_FreeSurface(window->tiles);
+                window->tiles = NULL;
+        }
+#endif
-        
-        ResizeWin(window, (w * window->cols) + (2 * window->border),
@@ -1507 +1543 @@
-        }
-        
+        /* Invalidate all the gfx surfaces */
+        if (do_update)
+        {
+                int i;
+                for (i = 0; i < ANGBAND_TERM_MAX; i++)
+                {
+                        term_window *win = &windows[i];
+                        if (win->tiles)
+                        {
+                                SDL_FreeSurface(win->tiles);
+                                win->tiles = NULL;
+                        }
+                }
+        }       
-        
-#endif
@@ -1556 +1606 @@
-                sdl_ButtonCaption(sender, "On");
-        }
+}
+
+static void SnapChange(sdl_Button *sender)
+{
+        SnapRange += sender->tag;
+        if (SnapRange < 0) SnapRange = 0;
+        if (SnapRange > 20) SnapRange = 20;
+        PopUp.need_update = TRUE;
-}
-
@@ -1613 +1671 @@
-        
-        sdl_ButtonMove(button, 200, y);
+        y+= 20;
+        
+        sdl_WindowText(win, colour, 20, y, format("Snap range is %d.", SnapRange));
+        button = sdl_ButtonBankGet(&win->buttons, MoreSnapMinus);
+        sdl_ButtonMove(button, 200, y);
+        
+        button = sdl_ButtonBankGet(&win->buttons, MoreSnapPlus);
+        sdl_ButtonMove(button, 230, y);
-}
-
@@ -1673 +1739 @@
-        button->activate = FlipTag;
-        
+        MoreSnapPlus = sdl_ButtonBankNew(&PopUp.buttons);
+        button = sdl_ButtonBankGet(&PopUp.buttons, MoreSnapPlus);
+        
+        button->unsel_colour = ucolour;
+        button->sel_colour = scolour;
+        sdl_ButtonSize(button, 20, PopUp.font.height + 2);
+        sdl_ButtonCaption(button, "+");
+        button->tag = 1;
+        sdl_ButtonVisible(button, TRUE);
+        button->activate = SnapChange;
+        
+        MoreSnapMinus = sdl_ButtonBankNew(&PopUp.buttons);
+        button = sdl_ButtonBankGet(&PopUp.buttons, MoreSnapMinus);
+        
+        button->unsel_colour = ucolour;
+        button->sel_colour = scolour;
+        sdl_ButtonSize(button, 20, PopUp.font.height + 2);
+        sdl_ButtonCaption(button, "-");
+        button->tag = -1;
+        sdl_ButtonVisible(button, TRUE);
+        button->activate = SnapChange;
+        
-        MoreOK = sdl_ButtonBankNew(&PopUp.buttons);
-        button = sdl_ButtonBankGet(&PopUp.buttons, MoreOK);
@@ -1798 +1886 @@
-        StatusBar.need_update = TRUE;
-        
-mmmm...
+ACK - Redraw all windows
-        if (character_dungeon) do_cmd_redraw();
-}
@@ -1846 +1934 @@
-        path_build(buf, sizeof(buf), ANGBAND_DIR_USER , "sdlinit.txt");
-        
+        /* XXXXX */
+        ANGBAND_DIR_USER_SDL = string_make(buf);
+        
-        /* Open the file */
-        fff = my_fopen(buf, "r");
@@ -1929 +2020 @@
-static errr save_prefs()
-{
-        char buf[1024];
-        FILE *fff;
-        int i;
-        
-        /* Build the path */
-        path_build(buf, sizeof(buf), ANGBAND_DIR_USER , "sdlinit.txt");
-        
-        /* Open the file */
-buf
+ANGBAND_DIR_USER_SDL
-        
-        /* Check it */
@@ -1979 +2066 @@
-static int Movingx;
-static int Movingy;
+
+/*
+ * Is What within Range units of Origin
+ */
+
+#define closeto(Origin, What, Range) \
+        ((ABS((Origin) - (What))) < (Range))
+
-/*
- * This function keeps the 'mouse' info up to date,
@@ -1999 +2094 @@
-                        if (Moving)
-                        {
+                                int i;
+                                
-                                /* Move the window */
-                                win->left = (mouse.x - Movingx);
@@ -2031 +2128 @@
-                                }
-                                
+                                for (i = 0; i < ANGBAND_TERM_MAX; i++)
+                                {
+                                        term_window *snapper = &windows[i];
+                                        
+                                        /* Can't snap to self... */
+                                        if (i == SelectedTerm) continue;
+                                        
+                                        /* Can't snap to the invisible */
+                                        if (!snapper->visible) continue;
+                                        
+                                        /* Check the windows are across from each other */
+                                        if ((snapper->top < win->top + win->height) && (win->top < snapper->top + snapper->height))
+                                        {
+                                                /* Lets try to the left... */
+                                                if (closeto(win->left, snapper->left + snapper->width, SnapRange))
+                                                {
+                                                        win->left = snapper->left + snapper->width;
+                                                        Movingx = mouse.x - win->left;
+                                                }
+                                                /* Maybe to the right */
+                                                if (closeto(win->left + win->width, snapper->left, SnapRange))
+                                                {
+                                                        win->left = snapper->left - win->width;
+                                                        Movingx = mouse.x - win->left;
+                                                }
+                                        }
+                                        
+                                        /* Check the windows are above/below each other */
+                                        if ((snapper->left < win->left + win->width) && (win->left < snapper->left + snapper->width))
+                                        {
+                                                /* Lets try to the top... */
+                                                if (closeto(win->top, snapper->top + snapper->height, SnapRange))
+                                                {
+                                                        win->top = snapper->top + snapper->height;
+                                                        Movingy = mouse.y - win->top;
+                                                }
+                                                /* Maybe to the bottom */
+                                                if (closeto(win->top + win->height, snapper->top, SnapRange))
+                                                {
+                                                        win->top = snapper->top - win->height;
+                                                        Movingy = mouse.y - win->top;
+                                                }
+                                        }
+                                        
+                                }
+                                
-                                /* Show on the screen */
-                                sdl_BlitAll();
@@ -2056 +2199 @@
-                                sdl_BlitAll();
-                        }
-
+ if (!popped)
-                        {
-                                /* Have a look for the corner stuff */
@@ -2365 +2508 @@
-                case SDL_QUIT:
-                {
-, and are not using the infinite lives cheat
-(character_generated) && (inkey_flag)
+
+character_generated && inkey_flag
-                        {
-                                /* Hack -- Forget messages */
@@ -2555 +2698 @@
-}
-
+static errr Term_bigcurs_sdl(int col, int row)
+{
+        term_window *win = (term_window*)(Term->data);
+        
+        Uint32 colour = text_colours[TERM_YELLOW];
+        
+        SDL_Rect rc;
+        
+        /* Make a rectangle */
+        RECT(col * win->tile_wid, row * win->tile_hgt, win->tile_wid * 2, win->tile_hgt, &rc);
+        
+        /* Translate it */
+        rc.x += win->border;
+        rc.y += win->title_height;
+        
+        /* Draw it */
+        sdl_DrawBox(win->surface, &rc, colour, 1);
+        
+        /* Update area */
+        set_update_rect(win, &rc);
+        
+        /* Success */
+        return (0);
+}
+
-static errr Term_curs_sdl(int col, int row)
-{
@@ -2626 +2794 @@
-                        return (Term_xtra_sdl_delay(v));
-                }
+                case TERM_XTRA_REACT:
+                {
+                        int i;
+                        /* Re-initialize the colours */
+                        for (i = 0; i < MAX_COLORS; i++)
+                        {
+                                text_colours[i] = SDL_MapRGB(AppWin->format, angband_color_table[i][1],
+                                                                                         angband_color_table[i][2],
+                                                                                         angband_color_table[i][3]);
+                        }
+                }
-        }
-        
@@ -2687 +2866 @@
- * Do a 'stretched blit'
- * SDL has no support for stretching... What a bastard!
-XXX - The 'source' surface has alpha properties, so we assume it's 32-bit!
+
- */
-static void sdl_StretchBlit(SDL_Surface *src, SDL_Rect *srcRect, SDL_Surface *dest, SDL_Rect *destRect)
@@ -2694 +2873 @@
-        int sx, sy, dx, dy;
-        Uint8 *ps, *pd;
-        Uint32 *ps1;
-        
-        for (y = 0; y < destRect->h; y++)
@@ -2706 +2884 @@
-                        /* Find a source pixel */
-                        ps = (Uint8 *)src->pixels + (sx * src->format->BytesPerPixel) + (sy * src->pitch);
-
-
+
-                        /* Do we need to draw it? */
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        /* Actual destination pixel coords */
-                        dx = x + destRect->x;
@@ -2722 +2920 @@
-                                case 1:
-                                {
-
-
-
+
-                                        break;
-                                }
-                                case 2:
-                                {
-
-
-
-
+
+
+
-                                        break;
-                                }
@@ -2738 +2933 @@
-                                case 4:
-                                {
-
-
+
+
+
-                                }
-                        }
@@ -2747 +2943 @@
-        
-}
+
+/*
+ * Make the 'pre-stretched' tiles for this window
+ * Assumes the tiles surface was freed elsewhere
+ */
+static errr sdl_BuildTileset(term_window *win)
+{
+        int x, y;
+        int ta, td;
+        int xx, yy;
+        GfxInfo *info = &GfxDesc[use_graphics];
+        
+        /* Calculate the number of tiles across & down*/
+        ta = GfxSurface->w / info->width;
+        td = GfxSurface->h / info->height;
+        
+        /* Calculate the size of the new surface */
+        x = ta * win->tile_wid;
+        if (use_bigtile) x *= 2;
+        y = td * win->tile_hgt;
+        
+        /* Make it */
+        win->tiles = SDL_CreateRGBSurface(SDL_SWSURFACE, x, y,
+                                                                          GfxSurface->format->BitsPerPixel,
+                                                                          GfxSurface->format->Rmask, GfxSurface->format->Gmask,
+                                                                          GfxSurface->format->Bmask, GfxSurface->format->Amask);
+        
+        /* Bugger */
+        if (!win->tiles) return (1);
+        
+        /* For every tile... */
+        for (xx = 0; xx < ta; xx++)
+        {
+                for (yy = 0; yy < td; yy++)
+                {
+                        SDL_Rect src, dest;
+                        int dwid = (use_bigtile ? win->tile_wid * 2 : win->tile_wid);
+                        
+                        /* Source rectangle (on GfxSurface) */
+                        RECT(xx * info->width, yy * info->height, info->width, info->height, &src);
+                        
+                        /* Destination rectangle (win->tiles) */
+                        RECT(xx * dwid, yy * win->tile_hgt, dwid, win->tile_hgt, &dest);
+                        
+                        /* Do the stretch thing */
+                        sdl_StretchBlit(GfxSurface, &src, win->tiles, &dest);
+                }
+        }
+        
+        /* Copy across the colour key */
+        SDL_SetColorKey(win->tiles, SDL_SRCCOLORKEY, GfxSurface->format->colorkey);
+                                        
+        return (0);
+}
-#endif
-
@@ -2765 +3015 @@
-        int i;
-        
+        /* First time a pict is requested we load the tileset in */
+        if (!win->tiles)
+        {
+                sdl_BuildTileset(win);
+                if (!win->tiles) return (1);
+        }
+        
-        /* Make the destination rectangle */
-        RECT(col * win->tile_wid, row * win->tile_hgt, win->tile_wid, win->tile_hgt, &rc);
@@ -2776 +3033 @@
-        
-        /* Get the dimensions of the graphic surface */
-GfxDesc[use_graphics].width
-GfxDesc[use_graphics].height
+rc.w
+rc.h
-        
-        /* Clear the way */
@@ -2789 +3046 @@
-                src.y = (tap[i] & 0x7F) * src.h;
-                
-
-
+
-                
-                /* If foreground is the same as background, we're done */
@@ -2799 +3055 @@
-                src.y = (ap[i] & 0x7F) * src.h;
-                
-
-
+
-        }
-        
@@ -2837 +3092 @@
-        t->xtra_hook = Term_xtra_sdl;
-        t->curs_hook = Term_curs_sdl;
+        t->bigcurs_hook = Term_bigcurs_sdl;
-        t->wipe_hook = Term_wipe_sdl;
-        t->text_hook = Term_text_sdl;
@@ -2940 +3196 @@
-
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
- */
-static errr load_gfx(void)
@@ -2960 +3204 @@
-        char buf[1024];
-        cptr filename = GfxDesc[use_graphics].gfxfile;
-
+
+
+
+
+
-        
-        /* This may be called when GRAPHICS_NONE is set */
@@ -2970 +3218 @@
-        /* Find and load the file into a temporary surface */
-        path_build(buf, sizeof(buf), ANGBAND_DIR_XTRA_GRAF, filename);
-SDL_LoadBMP
+IMG_Load
-        
-        /* Oops */
@@ -2976 +3224 @@
-        
-        /* Change the surface type to the current video surface format */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        SDL_FreeSurface(temp);
-        
@@ -3122 +3287 @@
-        use_bigtile = FALSE;
-#else
-const 
+
-        int i;
-        
@@ -3144 +3309 @@
-                        }
-                }
-                
-                /* Check the mask file */
-                if (GfxDesc[i].maskfile)
-                {
-                        path_build(path, sizeof(path), ANGBAND_DIR_XTRA_GRAF, GfxDesc[i].maskfile);
-                        fd = fd_open(path, O_WRONLY);
-                        
-                        if (fd >= 0) fd_close(fd);
-                        else
-                        {
-                                plog_fmt("Can't find file %s - graphics mode '%s' will be disabled.", path, GfxDesc[i].name);
-                                GfxDesc[i].avail = FALSE;
-                        }
-                }
-        }
-        
@@ -3190 +3341 @@
-                        /* Don't crowd out the status bar... */
-                        if (win->top < StatusHeight) win->top = StatusHeight;
-
+
+
+
+
+
+
+
+
-                        /* This will set up the window correctly */
-                        ResizeWin(win, win->width, win->height);
@@ -3267 +3425 @@
-        
-        /* Initialize the colours */
-16
+MAX_COLORS
-        {
-                text_colours[i] = SDL_MapRGB(AppWin->format, angband_color_table[i][1],