Changeset 523

Timestamp:

08/14/07 12:02:48 (1 year ago)

Author:

ajps

Message:

Reduce the use of full-map redraws, and trigger the redrawing of map locations with a UI 'event' instead of doing them directly.

Files:

• trunk/src/cave.c (modified) (9 diffs)
• trunk/src/defines.h (modified) (1 diff)
• trunk/src/monster2.c (modified) (2 diffs)
• trunk/src/object2.c (modified) (2 diffs)
• trunk/src/spells2.c (modified) (5 diffs)
• trunk/src/ui-event.h (modified) (1 diff)
• trunk/src/xtra1.c (modified) (2 diffs)
• trunk/src/xtra3.c (modified) (13 diffs)

trunk/src/cave.c

@@ -17 +17 @@
- */
-#include "angband.h"
+#include "ui-event.h"
-
-/*
@@ -1109 +1110 @@
-                                Term_queue_char(t, kx+1, ky, TERM_WHITE, ' ', 0, 0);
-                }
-
-                /* Redraw map */
-                p_ptr->redraw |= (PR_MAP);
-        }
-}
@@ -1245 +1243 @@
-
-
-static void lite_spot_map(int y, int x)
-{
-        grid_data g;
-        byte a, ta;
-        char c, tc;
-
-        int ky, kx;
-
-        int j;
-
-        /* Scan windows */
-        for (j = 0; j < ANGBAND_TERM_MAX; j++)
-        {
-                term *t = angband_term[j];
-
-                /* No window */
-                if (!t) continue;
-
-                /* No relevant flags */
-                if (!(op_ptr->window_flag[j] & (PW_MAP))) continue;
-
-                /* Location relative to panel */
-                ky = y - t->offset_y;
-                kx = x - t->offset_x;
-
-                if (use_bigtile)
-                {
-                        kx += kx;
-                        if (kx + 1 >= t->wid) continue;
-                }
-
-                /* Verify location */
-                if ((ky < 0) || (ky >= t->hgt)) continue;
-                if ((kx < 0) || (kx >= t->wid)) continue;
-
-                /* Hack -- redraw the grid spot */
-                map_info(y, x, &g);
-                grid_data_as_text(&g, &a, &c, &ta, &tc);
-                Term_queue_char(t, kx, ky, a, c, ta, tc);
-
-                if (use_bigtile)
-                {
-                        kx++;
-
-                        /* Mega-Hack : Queue dummy char */
-                        if (a & 0x80)
-                                Term_queue_char(t, kx, ky, 255, -1, 0, 0);
-                        else
-                                Term_queue_char(t, kx, ky, TERM_WHITE, ' ', TERM_WHITE, ' ');
-                }
-
-                /* Redraw map */
-                p_ptr->redraw |= (PR_MAP);
-        }
-}
-
-
-
-/*
@@ -1307 +1248 @@
- *
- * This function should only be called on "legal" grids.
- *
- * Note the inline use of "print_rel()" for efficiency.
- *
- * The main screen will always be at least 24x80 in size.
- */
-void lite_spot(int y, int x)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -1422 +1313 @@
-                        }
-                }
-        
-                /* Redraw map */
-                p_ptr->redraw |= (PR_MAP);
-        }
-}
@@ -3293 +3181 @@
-                                        /* Memorize the object */
-                                        cave_info[y][x] |= (CAVE_MARK);
+                                        lite_spot(y, x);
-                                }
-
@@ -3306 +3195 @@
-                                                /* Memorize the walls */
-                                                cave_info[yy][xx] |= (CAVE_MARK);
+                                                lite_spot(yy, xx);
-                                        }
-                                }
@@ -3311 +3201 @@
-                }
-        }
-
-        /* Redraw map */
-        p_ptr->redraw |= (PR_MAP);
-}
-
@@ -3393 +3280 @@
-        p_ptr->update |= (PU_FORGET_VIEW | PU_UPDATE_VIEW | PU_MONSTERS);
-
-
+whole 
-        p_ptr->redraw |= (PR_MAP | PR_MONLIST);
-}

trunk/src/defines.h

@@ -1609 +1609 @@
-#define PR_DTRAP                0x00010000L /* Trap detection indicator */
-#define PR_STATE                0x00020000L     /* Display Extra (State) */
-Display M
+Redraw whole m
-
-#define PR_INVEN                0x00080000L /* Display inven/equip */

trunk/src/monster2.c

@@ -1366 +1366 @@
-                /* Update the flow */
-                p_ptr->update |= (PU_UPDATE_FLOW);
-
-                /* Window stuff */
-                p_ptr->redraw |= (PR_MAP);
-        }
-
@@ -1402 +1399 @@
-                /* Update the flow */
-                p_ptr->update |= (PU_UPDATE_FLOW);
-
-                /* Window stuff */
-                p_ptr->redraw |= (PR_MAP);
-        }
-

trunk/src/object2.c

@@ -336 +336 @@
-        msg_print("Compacting objects...");
-
-        /* Redraw map */
-        p_ptr->redraw |= (PR_MAP);
-
-
-
-
-        /*** Try destroying objects ***/
-
@@ -732 +726 @@
-void object_aware(object_type *o_ptr)
-{
+        int i;
+
-        /* Fully aware of the effects */
-        k_info[o_ptr->k_idx].aware = TRUE;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-}

trunk/src/spells2.c

@@ -2473 +2473 @@
-                        /* Lose light and knowledge */
-                        cave_info[y][x] &= ~(CAVE_GLOW | CAVE_MARK);
+                        
+                        lite_spot(y, x);
-
-                        /* Hack -- Notice player affect */
@@ -2550 +2552 @@
-        p_ptr->update |= (PU_FORGET_FLOW | PU_UPDATE_FLOW);
-
-ap, m
-AP | PR_M
+
+
-}
-
@@ -2624 +2626 @@
-                        /* Lose light and knowledge */
-                        cave_info[yy][xx] &= ~(CAVE_GLOW | CAVE_MARK);
-
+
-                        /* Skip the epicenter */
-                        if (!dx && !dy) continue;
@@ -2842 +2844 @@
-                        xx = cx + dx;
-
-Skip unaffected grids
- continue;
-
-/* Paranoia -- never affect player */
-if ((yy == py) && (xx == px)) continue;
+Note unaffected grids for light changes, etc.
+
+
+       lite_spot(yy, xx);
+}
-
-                        /* Destroy location (if valid) */
-
+else 
-                        {
-                                int feat = FEAT_FLOOR;
@@ -2894 +2896 @@
-        /* Fully update the flow */
-        p_ptr->update |= (PU_FORGET_FLOW | PU_UPDATE_FLOW);
-
-        /* Redraw map */
-        p_ptr->redraw |= (PR_MAP);
-
-        /* Update the health bar */

trunk/src/ui-event.h

@@ -34 +34 @@
-        ui_MESSAGES_CHANGED,
-
-A 'set' of events has finished
+It's the end of a "set" of events, so safe to update
-} ui_event_type;
-

trunk/src/xtra1.c

@@ -1610 +1610 @@
-        if (character_icky) return;
-
-Deal with the basic signals
+For each listed flag, send the appropriate signal to the UI
-        for (i = 0; i < N_ELEMENTS(redraw_events); i++)
-        {
-                const struct flag_event_trigger *hnd = &redraw_events[i];
+
-                if (p_ptr->redraw & hnd->flag)
-                        ui_event_signal(hnd->event);
@@ -1621 +1622 @@
-        if (p_ptr->redraw & PR_MAP)
-        {
-We probably really want map changes to be incremental
+Mark the whole map to be redrawn
-                ui_event_signal_point(ui_MAP_CHANGED, -1, -1);
-        }
-
-        p_ptr->redraw = 0;
+
+        /* 
+         * Do any plotting, etc. delayed from earlier - this set of updates
+         * is over. 
+         */
+        ui_event_signal(ui_event_REDRAW);
-}
-

trunk/src/xtra3.c

@@ -904 +904 @@
-
-
+/* ------------------------------------------------------------------------
+ * Map redraw.
+ * ------------------------------------------------------------------------ */
+static void trace_map_updates(ui_event_type type, ui_event_data *data, void *user)
+{
+        if (data->point.x == -1 && data->point.y == -1)
+        {
+                printf("Redraw whole map\n");
+        }
+        else
+        {
+                printf("Redraw (%i, %i)\n", data->point.x, data->point.y);
+        }
+}
+
+static void update_maps(ui_event_type type, ui_event_data *data, void *user)
+{
+        term *t = user;
+
+        /* This signals a whole-map redraw. */
+        if (data->point.x == -1 && data->point.y == -1)
+        {
+                prt_map();
+        }
+        /* Single point to be redrawn */
+        else
+        {
+                grid_data g;
+                byte a, ta;
+                char c, tc;
+                
+                int ky, kx;
+                int vy, vx;
+                
+                /* Location relative to panel */
+                ky = data->point.y - t->offset_y;
+                kx = data->point.x - t->offset_x;
+
+                if (t == angband_term[0])
+                {
+                        /* Verify location */
+                        if ((ky < 0) || (ky >= SCREEN_HGT)) return;
+                        
+                        /* Verify location */
+                        if ((kx < 0) || (kx >= SCREEN_WID)) return;
+                        
+                        /* Location in window */
+                        vy = ky + ROW_MAP;
+                        vx = kx + COL_MAP;
+
+                        if (use_bigtile) vx += kx;
+                }
+                else
+                {
+                        if (use_bigtile)
+                        {
+                                kx += kx;
+                                if (kx + 1 >= t->wid) return;
+                        }
+                        
+                        /* Verify location */
+                        if ((ky < 0) || (ky >= t->hgt)) return;
+                        if ((kx < 0) || (kx >= t->wid)) return;
+                        
+                        /* Location in window */
+                        vy = ky;
+                        vx = kx;
+                }
+
+                
+                /* Redraw the grid spot */
+                map_info(data->point.y, data->point.x, &g);
+                grid_data_as_text(&g, &a, &c, &ta, &tc);
+                Term_queue_char(t, vx, vy, TERM_L_GREEN, c, ta, tc);
+/*              Term_queue_char(t, vx, vy, a, c, ta, tc);*/
+                
+                if (use_bigtile)
+                {
+                        vx++;
+                        
+                        /* Mega-Hack : Queue dummy char */
+                        if (a & 0x80)
+                                Term_queue_char(t, vx, vy, 255, -1, 0, 0);
+                        else
+                                Term_queue_char(t, vx, vy, TERM_WHITE, ' ', TERM_WHITE, ' ');
+                }
+        }
+}
-
-/* ------------------------------------------------------------------------
@@ -1044 +1132 @@
-}
-
-
-
-
-
+
+
+
+
+
+
-static void update_minimap_subwindow(ui_event_type type, ui_event_data *data, void *user)
+{
+        struct minimap_flags *flags = user;
+
+        if (type == ui_MAP_CHANGED)
+        {
+                flags->needs_redraw = TRUE;
+        }
+        else if (type == ui_event_REDRAW)
+        {
+                term *old = Term;
+                term *t = angband_term[flags->win_idx];
+                
+                /* Activate */
+                Term_activate(t);
+                
+                /* Redraw map */
+                display_map(NULL, NULL);
+                Term_fresh();
+                
+                /* Restore */
+                Term_activate(old);
+
+                flags->needs_redraw = FALSE;
+        }
+}
+
+
+/*
+ * Hack -- display player in sub-windows (mode 0)
+ */
+static void update_player0_subwindow(ui_event_type type, ui_event_data *data, void *user)
-{
-        term *old = Term;
@@ -1056 +1177 @@
-        Term_activate(inv_term);
-
-
-
+
+
+
-        Term_fresh();
-        
@@ -1064 +1186 @@
-}
-
-
-
-
-
-
+
+
+
+
-{
-        term *old = Term;
@@ -1077 +1198 @@
-
-        /* Display flags */
-0
+1
-
-        Term_fresh();
@@ -1085 +1206 @@
-}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        term *old = Term;
-        term *inv_term = user;
@@ -1096 +1223 @@
-        Term_activate(inv_term);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        Term_fresh();
@@ -1106 +1265 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        term *old = Term;
-inv_term
+t
-
-        /* Activate */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        Term_fresh();
@@ -1162 +1278 @@
-        Term_activate(old);
-}
-
-
-
@@ -1228 +1343 @@
-
-                case PW_MAP:
-
+
+
+
+
+
+
+
+
-                        break;
+                }
-
-
@@ -1242 +1365 @@
-                case PW_OVERHEAD:
-                {
+                        minimap_data[win_idx].win_idx = win_idx;
+
-                        register_or_deregister(ui_MAP_CHANGED,
-                                               update_minimap_subwindow,
-
+
+
+
+
+
-                        break;
-                }
@@ -1331 +1460 @@
- * Temporary (hopefully) hackish solutions.
- * ------------------------------------------------------------------------ */
-static void update_maps(ui_event_type type, ui_event_data *data, void *user)
-{
-        prt_map();
-}
-
-static void check_panel(ui_event_type type, ui_event_data *data, void *user)
-{
@@ -1360 +1484 @@
-
-        /* Simplest way to keep the map up to date - will do for now */
-
-
+
+
+
+
-        /* Check if the panel should shift when the player's moved */
-        ui_event_register(ui_PLAYER_MOVED, check_panel, NULL);