Changeset 4150

Timestamp:

08/22/06 22:12:03 (2 years ago)

Author:

miyoshi

Message:

* mw32term.c: Use FRAME_FOREGROUND_PIXEL and
FRAME_BACKGROUND_PIXEL to get the frame colors. Refer to
ticket:334.

* mw32fns.c (mw32_set_foreground_color): Ditto.

* image.c (get_image_data_from_icon): Ditto.

* mw32term.h (struct mw32_output): New member `x_compatible'.
(struct mw32_output): Removed members `background_pixel' and
`foreground_pixel'. Refer to ticket:334.

Files:

• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/image.c (modified) (2 diffs)
• trunk/src/mw32fns.c (modified) (10 diffs)
• trunk/src/mw32term.c (modified) (3 diffs)
• trunk/src/mw32term.h (modified) (3 diffs)

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2006-08-22  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * mw32term.c: Use FRAME_FOREGROUND_PIXEL and
+        FRAME_BACKGROUND_PIXEL to get the frame colors.  Refer to
+        ticket:334.
+
+        * mw32fns.c (mw32_set_foreground_color): Ditto.
+
+        * image.c (get_image_data_from_icon): Ditto.
+
+        * mw32term.h (struct mw32_output): New member `x_compatible'.
+        (struct mw32_output): Removed members `background_pixel' and
+        `foreground_pixel'.  Refer to ticket:334.
+
-2006-08-22  YAMAZAKI Katsuhiro <yamazaki-k@mwe.biglobe.ne.jp>
-

trunk/src/image.c

@@ -9899 +9899 @@
-                                     RGBQUAD *prgb)
-{
-f->output_data.mw32->foreground_pixel
-f->output_data.mw32->background_pixel
+FRAME_FOREGROUND_PIXEL (f)
+FRAME_BACKGROUND_PIXEL (f)
-  Lisp_Object value;
-  RGBQUAD *pfg = prgb;
@@ -10307 +10307 @@
-  hobj_orig = SelectObject (cdc, hbmp);
-
-f->output_data.mw32->background_pixel
+FRAME_BACKGROUND_PIXEL (f)
-  rect.right = width;
-  rect.bottom = height;

trunk/src/mw32fns.c

@@ -650 +650 @@
-
-  fg = mw32_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
-x->foreground_pixel
-x->foreground_pixel
+FRAME_FOREGROUND_PIXEL (f)
+FRAME_FOREGROUND_PIXEL (f)
-
-  if (FRAME_MW32_WINDOW (f) != 0)
@@ -674 +674 @@
-  bg = mw32_decode_color (f, arg, WHITE_PIX_DEFAULT (f));
-#if 0 /* TODO: color */
-x->background_pixel
+  FRAME_BACKGROUND_PIXEL (f)
-#endif
-x->background_pixel
+FRAME_BACKGROUND_PIXEL (f)
-
-  if (FRAME_MW32_WINDOW (f) != 0)
@@ -696 +696 @@
-    f->output_data.mw32->mouse_pixel
-      = mw32_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
-f->output_data.mw32->background_pixel
+FRAME_BACKGROUND_PIXEL (f)
-                                /* No invisible pointers. */
-  if (mask_color == f->output_data.mw32->mouse_pixel
-       && mask_color == f->output_data.mw32->background_pixel
-f->output_data.mw32->foreground_pixel
+      && mask_color == FRAME_BACKGROUND_PIXEL (f)
+FRAME_FOREGROUND_PIXEL (f)
-
-#else
@@ -708 +708 @@
-  int count;
-  unsigned long pixel = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
-x->background_pixel
+FRAME_BACKGROUND_PIXEL (f)
-
-  /* Don't let pointers be invisible.  */
@@ -714 +714 @@
-    {
-      x_free_colors (f, &pixel, 1);
-x->foreground_pixel);
+FRAME_FOREGROUND_PIXEL (f))
-    }
-
@@ -869 +869 @@
-                                    WHITE_PIX_DEFAULT (f));
-  else
-out->background_pixel
+FRAME_BACKGROUND_PIXEL (f)
-  out->cursor_pixel = mw32_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
-
-  /* Make sure that the cursor color differs from the background color.  */
-out->background_pixel
+FRAME_BACKGROUND_PIXEL (f)
-    {
-      out->cursor_pixel = out->mouse_pixel;
-      if (out->cursor_pixel == fore_pixel)
-out->background_pixel
+FRAME_BACKGROUND_PIXEL (f)
-    }
-  out->cursor_foreground_pixel = fore_pixel;
@@ -901 +901 @@
-    }
-  else
-x->background_pixel
+FRAME_BACKGROUND_PIXEL (f)
-
-  pixel = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
@@ -907 +907 @@
-
-  /* Make sure that the cursor color differs from the background color.  */
-x->background_pixel
+FRAME_BACKGROUND_PIXEL (f)
-    {
-      if (pixel_allocated_p)
@@ -923 +923 @@
-              fore_pixel_allocated_p = 0;
-            }
-x->background_pixel
+FRAME_BACKGROUND_PIXEL (f)
-        }
-    }
@@ -1717 +1717 @@
-mw32m_flash_window (struct frame *f)
-{
-
-
+
-  HDC hdc = GetDC (FRAME_MW32_WINDOW (f));
-  HBRUSH hbrush = CreateSolidBrush (pixel);

trunk/src/mw32term.c

@@ -700 +700 @@
-mw32_fill_area (struct frame *f, int x0, int y0, int x1, int y1)
-{
-
-
+
-}
-
@@ -707 +706 @@
-mw32_clear_native_frame_area (struct frame *f, int x0, int y0, int x1, int y1)
-{
-
-
+
-}
-
@@ -714 +712 @@
-mw32_clear_frame_area (struct frame *f, int x, int y, int width, int height)
-{
-f->output_data.mw32->background_pixel
+FRAME_BACKGROUND_PIXEL (f)
-                      x, y, x + width, y + height);
-}

trunk/src/mw32term.h

@@ -361 +361 @@
-struct mw32_output
-{
+  /* Placeholder for things accessed through output_data.x.  */
+  struct x_output x_compatible;
+
-  /* caret bitmap handle */
-  HBITMAP caret_bitmap;
@@ -441 +444 @@
-  /* Pixel values used for various purposes.
-     border_pixel may be -1 meaning use a gray tile.  */
-  PIX_TYPE background_pixel;
-  PIX_TYPE foreground_pixel;
-  PIX_TYPE cursor_pixel;
-  PIX_TYPE border_pixel;
@@ -593 +594 @@
-   Refer make_terminal_frame()@frame.c for the detail.  These
-   are only for a terminal frame!  */
+/* Now it's safe to use these macros. Miyoshi */
-#define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel)
-#define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel)