Changeset 114

Timestamp:

05/06/07 10:18:41 (1 year ago)

Author:

takkaria

Message:

Update SDL port. (Iain McFall?)

Files:

• trunk/lib/pref/font-sdl.prf (added)
• trunk/lib/pref/font.prf (modified) (1 diff)
• trunk/lib/pref/graf-sdl.prf (added)
• trunk/lib/pref/graf.prf (modified) (1 diff)
• trunk/src/Makefile.src (modified) (1 diff)
• trunk/src/main-sdl.c (modified) (55 diffs)

trunk/lib/pref/font.prf

@@ -57 +57 @@
-
-?:[EQU $SYS sdl]
-win
+sdl
-
-?:1

trunk/lib/pref/graf.prf

@@ -47 +47 @@
-%:graf-acn.prf
-
+?:[EQU $SYS sdl]
+%:graf-sdl.prf
+
-?:1
-

trunk/src/Makefile.src

@@ -14 +14 @@
-ZFILES = z-file z-form z-rand z-term z-type z-util z-virt
-MAINFILES = main maid-x11 \
-
+dl s
-
-ANGFILES = \

trunk/src/main-sdl.c

@@ -2 +2 @@
-
-/*
-by
+(c) 2007
- * 
- * Based on the sangband SDL port, by Leon Marrick & others.
- *
- * This port is definately in its early stages and as yet
- * has no support for graphics or sound. Its current purpose is
- * to see how it works on different machines.
- * There is no support for 256 colours at the moment either.
- *
- * Comments and suggestions are welcome. The UI probably needs some
@@ -18 +14 @@
-
-/*
- * Copyright (c) 2007 Leon Marrick and others
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License.  Parts may also be
@@ -40 +34 @@
- * you are new to all this, read "makefile.sdl".
- *
-
-
-
-
+
+
+
- *
- *
@@ -51 +44 @@
- * - If "USE_GRAPHICS" is defined, then it also needs some bitmapped (.bmp)
- *   graphics files in /lib/xtra/graf, such as "16x16.bmp" and "16x16m.bmp".
- * - If "USE_SOUND" is defined "*.WAV" sound files must be placed into
- *   "lib/xtra/sound/".
- *
- * - The "lib/pref/pref-sdl.prf" file contains keymaps, macro definitions,
@@ -59 +50 @@
- *   normal "*.fon" font files in the "lib/xtra/font/" directory.
- *
- * - The files "win/angband.rc" and "win/angband.ico" can be included in your
- *   project if using MSVC++.  "win/angband.ico" can also be added if using
- *   DevC++ and probably other Windows compilers.
- *
- *
@@ -112 +100 @@
- *   Windows machines.
- */
+#include "angband.h"
-
-#ifdef USE_SDL
-
+
-#include "main.h"
+#include "SDL.h"
-#include "SDL_ttf.h"
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/*
@@ -131 +126 @@
- */
-static cptr ANGBAND_DIR_XTRA_FONT;
+static cptr ANGBAND_DIR_XTRA_GRAF;
-/* Later...
-static cptr ANGBAND_DIR_XTRA_GRAF;
-static cptr ANGBAND_DIR_XTRA_SOUND;
-static cptr ANGBAND_DIR_XTRA_MUSIC;
-*/
-
+/*
+ * Used as 'system' font
+ */
-static cptr DEFAULT_FONT_FILE = "6x10.fon";
-
-
-
-
-
-
+
+
-cptr FontList[MAX_FONTS];
-static int num_fonts = 0;
@@ -307 +300 @@
-static bool popped;
-
+/*
+ * Term windows
+ */
-static term_window windows[ANGBAND_TERM_MAX];
-static int Zorder[ANGBAND_TERM_MAX];
@@ -338 +334 @@
-
-static int StatusHeight;        /* The height in pixels of the status bar */
-
-static int SelectedTerm;        /* Current selected Term */
-
+static int AboutSelect;         /* About button */
-static int TermSelect;          /* Term selector button */
-static int FontSelect;          /* Font selector button */
-static int VisibleSelect;       /* Hide/unhide window button*/
+static int MoreSelect;          /* Other options button */
-static int QuitSelect;          /* Quit button */
+
+/* Buttons on the 'More' panel */
+static int MoreOK;                      /* Accept changes */
+static int MoreFullscreen;      /* Fullscreen toggle button */
-
-static bool Moving;                             /* Moving a window */
-static bool Sizing;                             /* Sizing a window */
-
+
+
-static SDL_Rect SizingRect;             /* Rect to describe the current resize window */
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-static u32b text_colours[16];
@@ -930 +968 @@
- * sdl_Window functions
- */
-
-static void sdl_WindowFree(sdl_Window* window)
-{
@@ -1025 +1062 @@
-        }
-        
+#ifdef USE_GRAPHICS
+        /* Free the graphics surface */
+        if (GfxSurface) SDL_FreeSurface(GfxSurface);
+#endif
-        /* Free the 'System font' */
-        sdl_FontFree(&SystemFont);
@@ -1096 +1137 @@
-                SDL_Rect rc;
-                
+                if (!win->visible) continue;
-                if (!point_in(RECT(win->left, win->top, win->width, win->height, &rc), x, y)) continue;
-                
@@ -1106 +1148 @@
-static void draw_statusbar(sdl_Window *window)
-{
-
+
+
-        int fw = window->font.width;
-        int x = 1;
@@ -1112 +1155 @@
-        
-        SDL_Rect rc;
-        my_strcpy(buf, format("%s v%s", VERSION_NAME, VERSION_STRING), sizeof(buf));
-        
-        u32b c = SDL_MapRGB(window->surface->format, 160, 160, 60);
@@ -1119 +1161 @@
-        SDL_FillRect(StatusBar.surface, &rc, c);
-        
+        button = sdl_ButtonBankGet(&StatusBar.buttons, AboutSelect);
+        x += button->pos.w + 20;
+        
+        sdl_WindowText(&StatusBar, c, x, 1, "Term:");
+        x += 5 * fw;
+        
+        button = sdl_ButtonBankGet(&StatusBar.buttons, TermSelect);
+        button->pos.x = x;
+        x += button->pos.w + 10;
+        
+        my_strcpy(buf, format("(%dx%d)", win->cols, win->rows), sizeof(buf));
-        sdl_WindowText(&StatusBar, c, x, 1, buf);
-        x += strlen(buf) * fw + 20;
-        
-        sdl_WindowText(&StatusBar, c, x, 1, "Term:");
-        x += 5 * fw;
-        
-        button = sdl_ButtonBankGet(&StatusBar.buttons, TermSelect);
-        button->pos.x = x;
-        x += button->pos.w + 20;
-        
-        sdl_WindowText(&StatusBar, c, x, 1, "Visible:");
@@ -1142 +1188 @@
-        
-        button->pos.x = x;
-
+
+
+
+
+
+
+
+
-}
-
@@ -1171 +1224 @@
-        int i;
-        Uint32 colour = SDL_MapRGB(AppWin->format, 160, 160, 60);
-
+//
-        SDL_FillRect(AppWin, NULL, back_colour);
-        
@@ -1190 +1243 @@
-                        SizingSpot.x = win->left + win->width - 10;
-                        SizingSpot.y = win->top + win->height - 10;
-
+//
-                        
-                        if (Sizing)
@@ -1239 +1292 @@
-        
-        sdl_ButtonCaption(button, angband_term_name[SelectedTerm]);
-
+
-        if (!win->visible)
-        {
@@ -1265 +1318 @@
-        sdl_BlitAll();
-}       
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-static void SelectTerm(sdl_Button *sender)
-{
@@ -1318 +1398 @@
-                term_windowFree(window);
-                angband_term[SelectedTerm] = NULL;
-sdl_BlitAll();
+
-        }
-        else
@@ -1328 +1408 @@
-        
-        SetStatusButtons();
+        sdl_BlitAll();
-}
-
@@ -1342 +1423 @@
-        sdl_CheckFont(window->req_font, &w, &h);
-        
-
+
+
-        
-        SetStatusButtons();
@@ -1348 +1430 @@
-        RemovePopUp();
-        
-       
+
-
-
@@ -1380 +1462 @@
-}
-
+#ifdef USE_GRAPHICS
+static errr load_gfx(void);
+
+static void SelectGfx(sdl_Button *sender)
+{
+        SelectedGfx = sender->tag;
+}
+#endif
+
+static void AcceptChanges(sdl_Button *sender)
+{
+        sdl_Button *button;
+        bool do_update = FALSE;
+        bool do_video_reset = FALSE;
+        
+#ifdef USE_GRAPHICS
+        /* Check to see if bigtile has changed */
+        button = sdl_ButtonBankGet(&PopUp.buttons, MoreBigtile);
+        
+        if (button->tag != use_bigtile)
+        {
+                do_update = TRUE;
+                
+                use_bigtile = !use_bigtile;
+        }
+        
+        if (use_graphics != SelectedGfx)
+        {
+                do_update = TRUE;
+                
+                use_graphics = SelectedGfx;
+                
+                if (use_graphics)
+                {
+                        arg_graphics = TRUE;
+                        load_gfx();
+                }
+                else
+                {
+                        arg_graphics = FALSE;
+                        use_bigtile = FALSE;
+                        reset_visuals(TRUE);
+                }
+        }
+        
+        
+#endif
+        
+        button = sdl_ButtonBankGet(&PopUp.buttons, MoreFullscreen);
+        
+        if (button->tag != fullscreen)
+        {
+                fullscreen = !fullscreen;
+                
+                do_video_reset = TRUE;
+        }
+        
+        
+        SetStatusButtons();
+        
+        RemovePopUp();
+        
+        if (do_update)
+        {
+                if (character_dungeon) do_cmd_redraw();
+        }
+        
+        if (do_video_reset)
+        {
+                SDL_Event Event;
+                
+                WIPE(&Event, SDL_Event);
+                
+                Event.type = SDL_VIDEORESIZE;
+                Event.resize.w = screen_w;
+                Event.resize.h = screen_h;
+                
+                SDL_PushEvent(&Event);
+        }
+        
+}
+
+static void FlipTag(sdl_Button *sender)
+{
+        if (sender->tag)
+        {
+                sender->tag = 0;
+                sdl_ButtonCaption(sender, "Off");
+        }
+        else
+        {
+                sender->tag = 1;
+                sdl_ButtonCaption(sender, "On");
+        }
+}
+
+static void MoreDraw(sdl_Window *win)
+{
+        SDL_Rect rc;
+        sdl_Button *button;
+        int y = 20, i;
+        
+        /* Wow - a different colour! */
+        Uint32 colour = SDL_MapRGB(win->surface->format, 160, 60, 60);
+        
+        RECT(0, 0, win->width, win->height, &rc);
+        
+        /* Draw a nice box */
+        sdl_DrawBox(win->surface, &rc, colour, 5);
+        
+#ifdef USE_GRAPHICS
+        
+        button = sdl_ButtonBankGet(&win->buttons, MoreBigtile);
+        
+        if (SelectedGfx)
+        {
+                sdl_ButtonVisible(button, TRUE);
+                sdl_WindowText(win, colour, 20, y, "Bigtile is:");
+                
+                sdl_ButtonMove(button, 200, y);
+                
+                y += 20;
+        }
+        else
+        {
+                sdl_ButtonVisible(button, FALSE);
+        }
+        
+        
+        
+        sdl_WindowText(win, colour, 20, y, "Selected Graphics:");
+        sdl_WindowText(win, SDL_MapRGB(win->surface->format, 210, 110, 110),
+                                   200, y, GfxDesc[SelectedGfx].name);
+        
+        y += 20;
+        
+        sdl_WindowText(win, colour, 20, y, "Available Graphics:");
+        
+        for (i = 0; i < GfxModes; i++)
+        {
+                if (!GfxDesc[i].avail) continue;
+                button = sdl_ButtonBankGet(&win->buttons, GfxButtons[i]);
+                sdl_ButtonMove(button, 200, y);
+                y += 20;
+        }
+#endif  
+        
+        button = sdl_ButtonBankGet(&win->buttons, MoreFullscreen);
+        sdl_WindowText(win, colour, 20, y, "Fullscreen is:");
+        
+        sdl_ButtonMove(button, 200, y);
+}
+
+static void MoreActivate(sdl_Button *sender)
+{
+        int width = 300;
+        int height = 300;
+        int i;
+        sdl_Button *button;
+        
+        Uint32 ucolour;
+        Uint32 scolour;
+        
+        sdl_WindowInit(&PopUp, width, height, AppWin, StatusBar.font.name);
+        PopUp.left = (AppWin->w / 2) - width / 2;
+        PopUp.top = (AppWin->h / 2) - height / 2;
+        PopUp.draw_extra = MoreDraw;
+        
+        ucolour = SDL_MapRGB(PopUp.surface->format, 160, 60, 60);
+        scolour = SDL_MapRGB(PopUp.surface->format, 210, 110, 110);
+        
+#ifdef USE_GRAPHICS
+        MoreBigtile = sdl_ButtonBankNew(&PopUp.buttons);
+        button = sdl_ButtonBankGet(&PopUp.buttons, MoreBigtile);
+        
+        button->unsel_colour = ucolour;
+        button->sel_colour = scolour;
+        sdl_ButtonSize(button, 50 , PopUp.font.height + 2);
+        sdl_ButtonVisible(button, TRUE);
+        sdl_ButtonCaption(button, use_bigtile ? "On" : "Off");
+        button->tag = use_bigtile;
+        button->activate = FlipTag;
+        
+        SelectedGfx = use_graphics;
+        
+        for (i = 0; i < GfxModes; i++)
+        {
+                if (!GfxDesc[i].avail) continue;
+                GfxButtons[i] = sdl_ButtonBankNew(&PopUp.buttons);
+                button = sdl_ButtonBankGet(&PopUp.buttons, GfxButtons[i]);
+                
+                button->unsel_colour = ucolour;
+                button->sel_colour = scolour;
+                sdl_ButtonSize(button, 50 , PopUp.font.height + 2);
+                sdl_ButtonVisible(button, TRUE);
+                sdl_ButtonCaption(button, GfxDesc[i].name);
+                button->tag = i;
+                button->activate = SelectGfx;
+        }
+#endif
+        MoreFullscreen = sdl_ButtonBankNew(&PopUp.buttons);
+        button = sdl_ButtonBankGet(&PopUp.buttons, MoreFullscreen);
+        
+        button->unsel_colour = ucolour;
+        button->sel_colour = scolour;
+        sdl_ButtonSize(button, 50 , PopUp.font.height + 2);
+        sdl_ButtonVisible(button, TRUE);
+        sdl_ButtonCaption(button, fullscreen ? "On" : "Off");
+        button->tag = fullscreen;
+        button->activate = FlipTag;
+        
+        MoreOK = sdl_ButtonBankNew(&PopUp.buttons);
+        button = sdl_ButtonBankGet(&PopUp.buttons, MoreOK);
+        
+        button->unsel_colour = ucolour;
+        button->sel_colour = scolour;
+        sdl_ButtonSize(button, 50 , PopUp.font.height + 2);
+        sdl_ButtonVisible(button, TRUE);
+        sdl_ButtonCaption(button, "OK");
+        sdl_ButtonMove(button, width / 2 - 25, height - 40);
+        button->activate = AcceptChanges;
+        
+        popped = TRUE;
+}
+
-static errr Term_xtra_sdl_clear(void);
-
@@ -1387 +1694 @@
- * This may be called when a window wants resizing,
- * is made visible, or the font has changed.
+ * This function doesn't go in for heavy optimization, and doesn't need it-
+ * it may initialize a few too many redraws or whatnot, but everything gets done!
- */
-static void ResizeWin(term_window* win, int w, int h)
@@ -1487 +1796 @@
-        }
-        
+        StatusBar.need_update = TRUE;
+        
-        /* Hmmmm... */
-        if (character_dungeon) do_cmd_redraw();
@@ -1498 +1809 @@
-        term_window *win;
-        int i;
-        
-        screen_w = 800;
-        screen_h = 600;
-        fullscreen = 0;
-        
-        /* Initialize the windows with crappy defaults! */
@@ -1554 +1861 @@
-                
-                s = strchr(buf, '=');
+                s++;
+                while (!isalnum(*s)) s++;
-                
-                if (strstr(buf, "Resolution"))
-                {
- + 1
+
-                        s = strchr(buf, 'x');
-                        screen_h = atoi(s + 1);
@@ -1563 +1872 @@
-                else if (strstr(buf, "Fullscreen"))
-                {
-
+
+
+
+
+
+
+
+
+
+
-                }
-                else if (strstr(buf, "Window"))
-                {
- + 1
+
-                }
-                else if (strstr(buf, "Visible"))
-                {
-
-
-
+
-                }
-                else if (strstr(buf, "Left"))
-                {
- + 1
+
-                }
-                else if (strstr(buf, "Top"))
-                {
- + 1
+
-                }
-                else if (strstr(buf, "Width"))
-                {
- + 1
+
-                }
-                else if (strstr(buf, "Height"))
-                {
- + 1
+
-                }
-                else if (strstr(buf, "Keys"))
-                {
- + 1
+
-                }
-                else if (strstr(buf, "Font"))
-                {
-
-
-
-
-
+
+
+
+
+
+
+
+
-        
-        my_fclose(fff);
@@ -1625 +1944 @@
-        fprintf(fff, "Resolution = %dx%d\n", screen_w, screen_h);
-        fprintf(fff, "Fullscreen = %d\n", fullscreen);
+        fprintf(fff, "Graphics = %d\n", use_graphics);
+        fprintf(fff, "Bigtile = %d\n", use_bigtile);
-        for (i = 0; i < ANGBAND_TERM_MAX; i++)
-        {
@@ -1647 +1968 @@
-}
-
-
+
+
+
+
+
+
+
+
-
-static int Movingx;
@@ -1666 +1994 @@
-                        mouse.x = event->motion.x;
-                        mouse.y = event->motion.y;
+                        win = &windows[SelectedTerm];
-                        
-                        /* We are moving a window */
-                        if (Moving)
-                        {
-                                win = &windows[SelectedTerm];
-                                
-                                /* Move the window */
-                                win->left = (mouse.x - Movingx);
@@ -1711 +2038 @@
-                        else if (Sizing)
-                        {
-                                win = &windows[SelectedTerm];
-                                
-                                /* Adjust the sizing rectangle */
-                                SizingRect.w = win->width - win->left + (mouse.x - Movingx);
@@ -1720 +2045 @@
-                                if (SelectedTerm == 0)
-                                {
-
-
-
-
+
+
+
+
+
+
-                                }
-                                
@@ -1729 +2056 @@
-                                sdl_BlitAll();
-                        }
+                        else
+                        {
+                                /* Have a look for the corner stuff */
+                                if (point_in(&SizingSpot, mouse.x, mouse.y))
+                                {
+                                        if (!Sizingshow)
+                                        {
+                                                /* Indicate the hotspot */
+                                                Sizingshow = TRUE;
+                                                DrawSizeWidget();
+                                        }
+                                }
+                                else if (Sizingshow)
+                                {
+                                        SDL_Rect rc;
+                                        Sizingshow = FALSE;
+                                        RECT(win->width - 10, win->height - 10, 10, 10, &rc);
+                                        set_update_rect(win, &rc);
+                                        sdl_BlitWin(win);
+                                }
+                        }
-                        break;
-                }
@@ -1742 +2090 @@
-                        if (event->button.button == SDL_BUTTON_LEFT)
-                        {
-
+bool just_gained_focus = FALSE;
-                                mouse.left = 1;
-                                mouse.leftx = event->button.x;
@@ -1766 +2114 @@
-                                if (idx < 0) break;
-                                
--> set focus and exit 
+
-                                if (idx != SelectedTerm)
-                                {
-                                        TermFocus(idx);
-break
+just_gained_focus = TRUE
-                                }
-        
@@ -1804 +2152 @@
-                                }
-                                
-
-
+(only if the window is already focused) 
+ if (!just_gained_focus)
-                                {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                                }
-                        }
@@ -1977 +2328 @@
-
-
-
+
+
-/*
- * Handle a single message sent to the application.
@@ -2032 +2384 @@
-                case SDL_VIDEORESIZE:
-                {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        break;
-                }
@@ -2260 +2639 @@
-        SDL_Rect rc;
-        
+        //if (use_bigtile) n*=2;
-        /* Build the area to black out */
-        rc.x = col * win->tile_wid;
@@ -2303 +2683 @@
-}
-
+#ifdef USE_GRAPHICS
+/*