Changeset 2999

Timestamp:

02/18/03 19:20:21 (6 years ago)

Author:

miyoshi

Message:

* mw32font.c (mw32_wf_allocator_reserve): New function.
(mw32_wf_allocator_cancel): Ditto.
(mw32_set_windows_logical_font): Call mw32_wf_allocator_cancel()
instead of xfree().
(set_font_info): Allocate heap memory after set_ccl_method()
successfully has finished.
(mw32_find_ccl_program): Ditto.
(mw32_internal_add_font): Allocate memory chunk for pointers to
MW32LogicalFont.
(mw32_lf_allocator_reserve): New function.
(mw32_lf_allocater_cancel): Ditto.
(mw32_add_logical_font): Call mw32_lf_allocator_reserve() instead
of xmalloc().
(mw32_add_logical_font): Expand memory chunk if no space is left.
(mw32_delete_logical_font): Call mw32_lf_allocater_cancel()
instead of xfree().

* mw32font.h (struct MW32FontRequest): New member variable.

Files:

• work/cvs2svn/src/ChangeLog.Meadow (modified) (1 diff)
• work/cvs2svn/src/mw32font.c (modified) (17 diffs)
• work/cvs2svn/src/mw32font.h (modified) (1 diff)

work/cvs2svn/src/ChangeLog.Meadow

@@ +1 @@
+2003-02-18  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
+
+        * mw32font.c (mw32_wf_allocator_reserve): New function.
+        (mw32_wf_allocator_cancel): Ditto.
+        (mw32_set_windows_logical_font): Call mw32_wf_allocator_cancel()
+        instead of xfree().
+        (set_font_info): Allocate heap memory after set_ccl_method()
+        successfully has finished.
+        (mw32_find_ccl_program): Ditto.
+        (mw32_internal_add_font): Allocate memory chunk for pointers to
+        MW32LogicalFont.
+        (mw32_lf_allocator_reserve): New function.
+        (mw32_lf_allocater_cancel): Ditto.
+        (mw32_add_logical_font): Call mw32_lf_allocator_reserve() instead
+        of xmalloc().
+        (mw32_add_logical_font): Expand memory chunk if no space is left.
+        (mw32_delete_logical_font): Call mw32_lf_allocater_cancel()
+        instead of xfree().
+
+        * mw32font.h (struct MW32FontRequest): New member variable.
+
-2003-02-17  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
-

work/cvs2svn/src/mw32font.c

@@ -115 +115 @@
-
-Lisp_Object Vmw32_windows_font_charset_database;
+
+static mw32_windows_font *mw32_wf_allocator_current_data = 0;
+static mw32_windows_font *mw32_wf_allocator_last_data = 0;
+
+static mw32_windows_font *
+mw32_wf_allocator_reserve (void)
+{
+  if (!mw32_wf_allocator_current_data)
+    {
+      mw32_wf_allocator_last_data
+        = (mw32_windows_font *) xmalloc (sizeof (mw32_windows_font));
+    }
+  else
+    {
+      mw32_wf_allocator_last_data = mw32_wf_allocator_current_data;
+      mw32_wf_allocator_current_data = 0;
+    }
+  
+  return mw32_wf_allocator_last_data;
+}
+
+static void
+mw32_wf_allocator_cancel (void)
+{
+  mw32_wf_allocator_current_data = mw32_wf_allocator_last_data;
+  mw32_wf_allocator_last_data = 0;
+}
-
-static void
@@ -330 +357 @@
-}
-
-
+ 
-{
-  mw32_windows_font *pwf = (mw32_windows_font*) plf->pphys;
@@ -336 +363 @@
-  if (pwf->pfont != INVALID_HANDLE_VALUE)
-    DeleteObject(pwf->pfont);
-xfree(pwf
+mw32_wf_allocator_cancel (
-}
-
@@ -367 +394 @@
-
-static int
-
-
+ 
+ 
-{
-  mw32_windows_font *pwf;
-  HFONT hf;
-
-(mw32_windows_font*) xmalloc(sizeof(mw32_windows_font)
+mw32_wf_allocator_reserve (
-
-  /* set attributes. */
-
+ 
-    {
-      HWND hwnd;
@@ -392 +419 @@
-        }
-
-
+ 
-      if (hwnd)
-
+ 
-      else
-(GetDesktopWindow
-
-
-
-
+ (GetDesktopWindow 
+
+ 
+ 
+ 
-      if (!hwnd)
-(GetDesktopWindow
+ (GetDesktopWindow 
-      else if (mhdc != INVALID_HANDLE_VALUE)
-        {
@@ -426 +453 @@
-  else
-    {
-xfree(pwf
+mw32_wf_allocator_cancel (
-      return 0;
-    }
@@ -443 +470 @@
-  {
-    int i;
-
-(pwf->cmcache) / sizeof
-
+ 
+ (pwf->cmcache) / sizeof 
+ 
-  }
-
@@ -512 +539 @@
-  bdffont* pbf = (bdffont*) plf->pphys;
-
-
+ 
-    {
-      mw32_free_bdf_font(pbf);
@@ -673 +700 @@
-    {
-      int i;
+      struct ccl_program ccl_prog;
-
-      fontp->charset = CHAR_CHARSET(c);
-fontp->font_encoder
-= (struct ccl_program *) xmalloc (sizeof (struct ccl_program))
-if (!set_ccl_method(plf->ccl_method, fontp->font_encoder))
+if (!set_ccl_method (plf->ccl_method, &ccl_prog))
+fontp->font_encoder = NULL
+else
-        {
-
-
+
+
+
-        }
-      fontp->encoding[0] = fontp->encoding[1] = plf->encoding_type;
@@ -767 +796 @@
-  MW32LogicalFont *plf;
-  Lisp_Object encoding;
+  struct ccl_program ccl_prog;
-
-  plf = (MW32LogicalFont*) fontp->font;
-  if (!plf) return;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-  return;
@@ -815 +846 @@
-      Vmw32_font_request_table = tem;
-
-
-
+
+
+
-    }
-  AREF (Vmw32_font_request_table, idx) = alist;
@@ -822 +854 @@
-  pfr->idx = idx;
-  pfr->loaded_LF_num = 0;
-
+
+
+
+
-  pfr->name = xstrdup(name);
-
@@ -1376 +1411 @@
-                           LF loaders
- ***********************************************************************/
+static MW32LogicalFont *mw32_lf_allocator_last_data = 0;
+static MW32LogicalFont *mw32_lf_allocator_current_data = 0;
+
+static MW32LogicalFont *
+mw32_lf_allocator_reserve (void)
+{
+  if (!mw32_lf_allocator_current_data)
+    {
+      mw32_lf_allocator_last_data
+        = (MW32LogicalFont *) xmalloc (sizeof (MW32LogicalFont));
+    }
+  else
+    {
+      mw32_lf_allocator_last_data = mw32_lf_allocator_current_data;
+      mw32_lf_allocator_current_data = 0;
+    }
+  
+  return mw32_lf_allocator_last_data;
+}
+
+static void
+mw32_lf_allocater_cancel (void)
+{
+  mw32_lf_allocator_current_data = mw32_lf_allocator_last_data;
+  mw32_lf_allocator_last_data = 0;
+}
-
-int
@@ -1477 +1538 @@
-          mw32_plf_alloced_num *= 2;
-        }
-(MW32LogicalFont*) xmalloc(sizeof(MW32LogicalFont)
+mw32_lf_allocator_reserve (
-      mw32_plf_table[mw32_lf_num] = plf;
-      i = mw32_lf_num;
@@ -1489 +1550 @@
-          if (!*pplf)
-            {
-(MW32LogicalFont*) xmalloc(sizeof(MW32LogicalFont)
+mw32_lf_allocator_reserve (
-              break;
-            }
@@ -1502 +1563 @@
-  plf->hash = mw32_default_hash_function;
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-  mw32_lf_num++;
@@ -1553 +1618 @@
-
-  mw32_plf_table[plf->idx] = NULL;
-xfree(plf
+mw32_lf_allocater_cancel (
-  mw32_lf_num--;
-}

work/cvs2svn/src/mw32font.h

@@ -82 +82 @@
-  int loaded_LF_num;
-  MW32LogicalFont **pLFs;
+  int num_pLFs;
-};
-