Changeset 2995

Timestamp:

2003年02月14日 23時04分57秒 (6 years ago)

Author:

miyoshi

Message:

* mw32term.c (mw32_destroy_frame_hdc): Clear *pf instead of pf.
(mw32_draw_relief_rect): Unify the calls of RestoreDC().
(mw32_draw_image_foreground): Narrow the clipping rectangle.
Ensure deletion of HDC and HGDIOBJ.

* mw32font.c (mw32_set_windows_logical_font): Defer initializing
message_thread_hdc.

Files:

• work/cvs2svn/src/ChangeLog.Meadow (modified) (1 diff)
• work/cvs2svn/src/mw32font.c (modified) (2 diffs)
• work/cvs2svn/src/mw32term.c (modified) (16 diffs)

work/cvs2svn/src/ChangeLog.Meadow

@@ +1 @@
+2003-02-14  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
+
+        * mw32term.c (mw32_destroy_frame_hdc): Clear *pf instead of pf.
+        (mw32_draw_relief_rect): Unify the calls of RestoreDC().
+        (mw32_draw_image_foreground): Narrow the clipping rectangle.
+        Ensure deletion of HDC and HGDIOBJ.
+
+        * mw32font.c (mw32_set_windows_logical_font): Defer initializing
+        message_thread_hdc.
+
-2003-02-13  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
-

work/cvs2svn/src/mw32font.c

@@ -372 +372 @@
-  mw32_windows_font *pwf;
-  HFONT hf;
-  HDC mhdc = INVALID_HANDLE_VALUE;
-
-  if (f->output_data.mw32->message_thread_hdc == INVALID_HANDLE_VALUE)
-    {
-      mhdc = GetDC (FRAME_MW32_WINDOW (f));
-      mw32_setup_default_hdc (mhdc);
-      f->output_data.mw32->message_thread_hdc = mhdc;
-    }
-
-  pwf = (mw32_windows_font*) xmalloc(sizeof(mw32_windows_font));
@@ -391 +383 @@
-      TEXTMETRIC tm;
-      int flag;
+      HDC mhdc = INVALID_HANDLE_VALUE;
+
+      if (f->output_data.mw32->message_thread_hdc == INVALID_HANDLE_VALUE)
+        {
+          mhdc = GetDC (FRAME_MW32_WINDOW (f));
+          mw32_setup_default_hdc (mhdc);
+          f->output_data.mw32->message_thread_hdc = mhdc;
+        }
-
-      hwnd = FRAME_MW32_WINDOW(f);

work/cvs2svn/src/mw32term.c

@@ -544 +544 @@
-
-HDC
-
+ 
-{
-  int i;
-  HDC *phdc, hdc;
-  struct frame **pf;
-
+ 
-
-  phdc = dpyinfo->alloced_DCs;
-  pf = dpyinfo->alloced_DC_frames;
-i < MAX_DC_NUM;
+ i < MAX_DC_NUM; 
-    {
-      if (*phdc == INVALID_HANDLE_VALUE)
-        {
-
+ 
-          f->output_data.mw32->hdc = *phdc = hdc;
-          *pf = f;
@@ -571 +571 @@
-
-      RestoreDC (*phdc, -1);
-
+ 
-      pf[0]->output_data.mw32->hdc = INVALID_HANDLE_VALUE;
-(phdc, phdc + 1, sizeof
-(pf, pf + 1, sizeof
-
+ (phdc, phdc + 1, sizeof 
+ (pf, pf + 1, sizeof 
+ 
-      f->output_data.mw32->hdc = phdc[MAX_DC_NUM - 1] = hdc;
-      pf[MAX_DC_NUM - 1] = f;
@@ -589 +589 @@
-
-void
-
+ 
-{
-  HDC hdc;
@@ -597 +597 @@
-    {
-      int i;
-
+ 
-      HDC *phdc = dpyinfo->alloced_DCs;
-      struct frame **pf = dpyinfo->alloced_DC_frames;
-
-i < MAX_DC_NUM;
+ i < MAX_DC_NUM; 
-        {
-          if (*phdc == hdc)
-            {
-
+ 
-              f->output_data.mw32->hdc = *phdc = INVALID_HANDLE_VALUE;
-
+*
-              break;
-            }
@@ -613 +613 @@
-          pf++;
-        }
-
+ 
-      RestoreDC (hdc, -1);
-      ReleaseDC (FRAME_MW32_WINDOW(f), hdc);
-      f->output_data.mw32->hdc = INVALID_HANDLE_VALUE;
-    }
-}
@@ -3623 +3622 @@
-  bottom_y--;
-  right_x--;
-  if (width <= 0) return;
-  if (width == 1)
-    {
@@ -3650 +3648 @@
-      /* To draw the point (left_x, bottom_y), sub 1 to the end.  */
-      LineTo (hdc, left_x - 1, bottom_y);
-
-
-
-
+
+
-    {
-      HBRUSH hb1, hb2;
@@ -3708 +3704 @@
-                     right_x + 1, bottom_y + 1);
-        }
-      RestoreDC (hdc, -1);
-      DeleteObject (hb1);
-      DeleteObject (hb2);
-    }
+  RestoreDC (hdc, -1);
-  DeleteObject (hp1);
-  DeleteObject (hp2);
@@ -3860 +3856 @@
-        {
-          DeleteObject (*phbmp);
+          *phbmp = 0;
-          return 0;
-        }
@@ -3873 +3870 @@
-mw32_draw_image_foreground (struct glyph_string *s)
-{
-
-
+
-  int x;
-  int y = s->ybase - image_ascent (s->img, s->face);
@@ -3895 +3891 @@
-    {
-      RECT clip_rect, image_rect, r;
-
+HDC 
-      if (!hdcimg) return;
-
@@ -3901 +3897 @@
-      image_rect.left = x;
-      image_rect.top = y;
-
-
+ - 1
+ - 1
-
-      if (mw32_intersect_rectangles (&clip_rect, &image_rect, &r))
-        {
-
+HGDIOBJ 
-          /* we ignore s->img->mask.  Use hbmpmask instead.  */
-          if (hbmpmask)
@@ -3914 +3910 @@
-                {
-                  HBITMAP hsrc = CreateCompatibleBitmap (s->hdc,
-
+ 
-                                                         r.bottom - r.top + 1);
-                  if (hsrc)
-                    {
-
+HGDIOBJ hsrc_old = 
-              
-                      /* Fill the background area with black mask. */
@@ -3944 +3940 @@
-                              r.right - r.left + 1, r.bottom - r.top + 1,
-                              hdc_src, 0, 0, SRCPAINT);
-DeleteObject (hsrc
+SelectObject (hdc_src, hsrc_old
-                    }
-
+
+
-                }
-            }
-          else
-            {
-              holdbmp = SelectObject (hdcimg, hbmp);
-              BitBlt (s->hdc,
-                      r.left, r.top,
@@ -3957 +3953 @@
-                      hdcimg, 0, 0, SRCCOPY);
-            }
-
+
+
+
+
+
+
-      /* When the image has a mask, we can expect that at
-         least part of a mouse highlight or a block cursor will
@@ -3973 +3974 @@
-          SelectObject (s->hdc, hold);
-        }
-
-      SelectObject (hdcimg, holdbmp);
-      DeleteDC (hdcimg);
-      DeleteObject (hbmp);
-      if (hbmpmask) DeleteObject (hbmpmask);
-    }
-  else