Changeset 976

Timestamp:

07/04/08 08:20:58 (2 months ago)

Author:

takkaria

Message:

Fix remaining items in #107, and some others (largely graphics-related): (Rowan Beentje)

• Graphics are now enabled in all terms when switched on
  
• Tile cache is now invalidated correctly on tile size changes
  
• Bugfix to ensure the background tile is included in cache resets
  
• Reverse the term size check to prevent rounding errors from incorrectly missing small resizes
  
• Clean up some memory leaks, mostly introduced by me in previous patches
  
• Fix incorrect order of recent items menu instantiation, fixing lack of submenu on first load without a pref file.
  
• Fixed some wacky minimum size enforcement
  
• Fixed window positioning following a close/open to prevent the window being positioned behind the menubar
  

Files:

• trunk/src/Makefile.std (modified) (1 diff)
• trunk/src/main-crb.c (modified) (20 diffs)

trunk/src/Makefile.std

@@ -49 +49 @@
-# Basic compiler stuff
-CC = gcc
-Wall -O2
+O2 -W -Wall
-
-

trunk/src/main-crb.c

@@ -255 +255 @@
-
-static bool CheckEvents(int wait);
-EventRef inEvent
+bool reset_tilesize
-static char *locate_lib(char *buf, size_t size);
-static void graphics_aux(int op);
@@ -781 +781 @@
-        {
-
-
+for the main game window 
-                if (td->cols < 80) td->cols = 80;
-                if (td->rows < 24) td->rows = 24;
-
-        }
-
-        /* Information windows can be much smaller */
-        else
-        {
-
-
+
+
+
+
-        }
-
@@ -798 +798 @@
-        if (td->rows > 255) td->rows = 255;
-
+        /* Minimal tile size */
-        bool dirty = false;
-        /* Minimal tile size */
-        if (td->tile_wid < td->font_wid) {
-                td->tile_wid = td->font_wid;
@@ -857 +857 @@
-                td->t->always_pict = TRUE;
-        }
- && (td == &data[0])
+
-        {
-                /* Use higher pict whenever possible */
@@ -1191 +1191 @@
-{
-        if(frame.tile_images) {
-
+=
-                        if(frame.tile_images[i]) CGImageRelease(frame.tile_images[i]);
-                        frame.tile_images[i] = 0;
@@ -1444 +1444 @@
-        GetWindowBounds((WindowRef)td->w, kWindowTitleBarRgn, &tmpR);
-        int trueTop = td->r.top - (tmpR.bottom-tmpR.top);
-
+
+
+
+
+
-        
-
@@ -2103 +2107 @@
-                        FSRefMakePath(&fsRef, (UInt8 *)prefpath, 1024);
-                        mac_warning(format("Preference file has changed.  If you have display problems, delete %s/%s.plist and restart.", prefpath, bundlename));
+                        CFRelease(bundleid);
-                }
-        }
@@ -2173 +2178 @@
-        if (recentItemsLoaded != NULL)
-        {
+                CFRelease(recentItemsArrayRef);
-                recentItemsArrayRef = CFArrayCreateMutableCopy(kCFAllocatorDefault, 0, recentItemsLoaded);
+                CFRelease(recentItemsLoaded);
-                redrawRecentItemsMenu();
-        }
@@ -2298 +2305 @@
-        HIViewFindByID(HIViewGetRoot(aboutDialog), aboutDialogName, &aboutDialogViewRef);
-        HIViewSetText(aboutDialogViewRef, cfstr_applicationName);
+        CFRelease(cfstr_applicationName);
-        
-        /* Set the application copyright as set up in variable.c */
@@ -2304 +2312 @@
-                                                                                strlen(copyright), kCFStringEncodingASCII, false);
-        HIViewSetText(aboutDialogViewRef, cfstr_applicationCopyright);
+        CFRelease(cfstr_applicationCopyright);
-
-        /* Use a small font for the copyright text */
@@ -2495 +2504 @@
-                        AppendMenuItemTextWithCFString(m, cfstr, 0, j, NULL);
-                        SetMenuItemRefCon(m, i-MIN_FONT+1, i);
+                        CFRelease(cfstr);
-                }
-        }
@@ -2636 +2646 @@
-                        CFStringRef cfstr = CFStringCreateWithCharacters(kCFAllocatorDefault, recentFileName.unicode, recentFileName.length);
-                        AppendMenuItemTextWithCFString(MyGetMenuHandle(kOpenRecentMenu), cfstr, 0, i, NULL);
+                        CFRelease(cfstr);
-                }
-                AppendMenuItemTextWithCFString(MyGetMenuHandle(kOpenRecentMenu), CFSTR("-"), kMenuItemAttrSeparator, -1, NULL);
@@ -2760 +2771 @@
-        for(int i = 0; i < N_ELEMENTS(data); i++) {
-                if(data[i].mapped)
-0
+FALSE
-        }
-
@@ -2970 +2981 @@
-
-        /* Ignore drag effects, other than for moving the mouse origin */
-== y/ td->tile_hgt && td->cols ==x/td->tile_wid
+* td->tile_hgt == y && td->cols * td->tile_wid == x
-                return noErr;
-
@@ -3055 +3066 @@
-                reset_visuals(TRUE);
-        }
-0
+FALSE
-        Term_key_push(KTRL('R'));
-}
@@ -3082 +3093 @@
-        }
-
-inEvent
+FALSE
-
-        return noErr;
@@ -3166 +3177 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                td->tile_wid = td->tile_hgt = 0;
-        }
+
+        /* Clear the graphics tile cache. */
+        graphics_tiles_nuke();
-
-        /* Sanity check for rows, columns, tilesize. */
-        term_data_check_font(td);
-        term_data_check_size(td);
+        
-        /* Window size changes */
-        term_data_resize(td);
@@ -3246 +3256 @@
-                        *toggle_defs[i].var = !(*toggle_defs[i].var);
-                        if(toggle_defs[i].refresh == true) {
-
-
+
-                                // Force redraw.
-                                Term_key_push(KTRL('R'));
@@ -3305 +3314 @@
-        td->font_id = fontID;
-        td->font_size = size;
-0
+TRUE
-}
-
@@ -3832 +3841 @@
-        SetCursor(*(GetCursor(watchCursor)));
-
+        /* Prepare the menubar */
+        init_menubar();
+
-        /* Ensure that the recent items array is always an array and start with an empty menu */
-        recentItemsArrayRef = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks);
-        redrawRecentItemsMenu();
-
-        /* Prepare the menubar */
-        init_menubar();
-
-        /* Initialize */