Changeset 4120

Timestamp:

07/25/06 22:21:26 (2 years ago)

Author:

miyoshi

Message:

* w32term.h: Sync up with Emacs CVS HEAD.

* w32proc.c: Don't include "w32term.h"

* mw32font.c (FONTSET_FROM_ID): Use mw32_get_fontset_table().
(FONTSET_REF_VIA_BASE): Use mw32_fontset_ref_via_base().
(FONTSET_SET): Use mw32_fontset_set().

* fontset.c: Sync up with Emacs CVS HEAD.
(lookup_overriding_fontspec): Validated as a stub.
(mw32_get_fontset_table): New function.
(mw32_fontset_set): Ditto.
(mw32_fontset_ref_via_base): Ditto.

Files:

• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/fontset.c (modified) (10 diffs)
• trunk/src/mw32font.c (modified) (2 diffs)
• trunk/src/w32proc.c (modified) (1 diff)
• trunk/src/w32term.h (modified) (20 diffs)

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2006-07-25  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * w32term.h: Sync up with Emacs CVS HEAD.
+
+        * w32proc.c: Don't include "w32term.h"
+
+        * mw32font.c (FONTSET_FROM_ID): Use mw32_get_fontset_table().
+        (FONTSET_REF_VIA_BASE): Use mw32_fontset_ref_via_base().
+        (FONTSET_SET): Use mw32_fontset_set().
+
+        * fontset.c: Sync up with Emacs CVS HEAD.
+        (lookup_overriding_fontspec): Validated as a stub.
+        (mw32_get_fontset_table): New function.
+        (mw32_fontset_set): Ditto.
+        (mw32_fontset_ref_via_base): Ditto.
+
-2006-07-22  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

trunk/src/fontset.c

@@ -137 +137 @@
-
-/* Vector containing all fontsets.  */
-#ifdef MEADOW
-Lisp_Object Vfontset_table;
-#else
-static Lisp_Object Vfontset_table;
-#endif
-
-/* Next possibly free fontset ID.  Usually this keeps the minimum
@@ -200 +196 @@
-static Lisp_Object fontset_ref P_ ((Lisp_Object, int));
-static Lisp_Object lookup_overriding_fontspec P_ ((Lisp_Object, int));
-#ifdef MEADOW
-void fontset_set P_ ((Lisp_Object, int, Lisp_Object));
-#else
-static void fontset_set P_ ((Lisp_Object, int, Lisp_Object));
-#endif
-static Lisp_Object make_fontset P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
-static int fontset_id_valid_p P_ ((int));
@@ -262 +254 @@
-
-
-#ifndef MEADOW
-static Lisp_Object
-lookup_overriding_fontspec (frame, c)
@@ -268 +259 @@
-     int c;
-{
+#ifndef MEADOW
-  Lisp_Object tail;
-
@@ -300 +292 @@
-        }
-    }
+#endif /* not MEADOW */
-  return Qnil;
-}
-#endif /* not MEADOW */
-
-#define FONTSET_REF_VIA_BASE(fontset, c) fontset_ref_via_base (fontset, &c)
-
-#ifdef MEADOW
-Lisp_Object
-#else
-static Lisp_Object
-#endif
-fontset_ref_via_base (fontset, c)
-     Lisp_Object fontset;
@@ -324 +312 @@
-  if (! EQ (FONTSET_BASE (fontset), Vdefault_fontset))
-    elt = FONTSET_REF (FONTSET_BASE (fontset), *c);
-#ifndef MEADOW
-  if (NILP (elt))
-    elt = lookup_overriding_fontspec (FONTSET_FRAME (fontset), *c);
-#endif
-  if (NILP (elt))
-    elt = FONTSET_REF (Vdefault_fontset, *c);
@@ -353 +339 @@
-#define FONTSET_SET(fontset, c, newelt) fontset_set(fontset, c, newelt)
-
-#ifdef MEADOW
-void
-#else
-static void
-#endif
-fontset_set (fontset, c, newelt)
-     Lisp_Object fontset;
@@ -632 +614 @@
-        elt = FONTSET_REF (fontset, c);
-    }
-#ifndef MEADOW
-  if (NILP (elt))
-    {
@@ -640 +621 @@
-      elt = lookup_overriding_fontspec (frame, c);
-    }
-#endif
-  if (NILP (elt))
-    elt = FONTSET_REF (Vdefault_fontset, c);
@@ -1752 +1732 @@
-}
-
+
+#ifdef MEADOW
+/* export static variables and functions to MEADOW */
+Lisp_Object
+mw32_get_fontset_table (void)
+{
+  return Vfontset_table;
+}
+
+void
+mw32_fontset_set (Lisp_Object fontset, int c, Lisp_Object newelt)
+{
+  fontset_set (fontset, c, newelt);
+}
+
+Lisp_Object
+mw32_fontset_ref_via_base (Lisp_Object fontset, int *c)
+{
+  return fontset_ref_via_base (fontset, c);
+}
+#endif
+
+
-/* arch-tag: ea861585-2f5f-4e5b-9849-d04a9c3a3537
-   (do not change this comment) */

trunk/src/mw32font.c

@@ -93 +93 @@
-/* for fontset.c. */
-
-
-
-
+
+
+
+
-#define FONTSET_ID(fontset)             XCHAR_TABLE (fontset)->extras[0]
-#define FONTSET_NAME(fontset)           XCHAR_TABLE (fontset)->extras[1]
@@ -102 +103 @@
-#define FONTSET_BASE(fontset)           XCHAR_TABLE (fontset)->parent
-#define BASE_FONTSET_P(fontset)         NILP (FONTSET_BASE (fontset))
-Vfontset_table
-
-
+mw32_get_fontset_table ()
+mw32_
+mw32_
-
-

trunk/src/w32proc.c

@@ -61 +61 @@
-#include "process.h"
-#include "syssignal.h"
+#ifndef MEADOW
-#include "w32term.h"
+#endif
-
-#define RVA_TO_PTR(var,section,filedata) \

trunk/src/w32term.h

@@ -28 +28 @@
-#define WHITE_PIX_DEFAULT(f) PALETTERGB(255,255,255)
-
-#if !defined (MEADOW)
-#define FONT_WIDTH(f)       \
-  ((f)->bdf ? (f)->bdf->width : (f)->tm.tmAveCharWidth)
@@ -39 +38 @@
-#define FONT_MAX_WIDTH(f)   \
-  ((f)->bdf ? (f)->bdf->width : (f)->tm.tmMaxCharWidth)
-#endif /* MEADOW */
-
-#define CP_DEFAULT 1004
@@ -65 +63 @@
-extern struct frame *x_window_to_frame ();
-
-enum text_cursor_kinds {
-  NO_CURSOR = -1,
-  FILLED_BOX_CURSOR,
-  HOLLOW_BOX_CURSOR,
-  BAR_CURSOR
-};
-
-/* Structure recording bitmaps and reference count.
-   If REFCOUNT is 0 then this record is free to be reused.  */
@@ -142 +133 @@
-  /* The cursor to use for vertical scroll bars.  */
-  Cursor vertical_scroll_bar_cursor;
+
+  /* Resource data base */
+  XrmDatabase xrdb;
-
-  /* color palette information.  */
@@ -197 +191 @@
-  int mouse_face_defer;
-
+  /* Nonzero means that the mouse highlight should not be shown.  */
+  int mouse_face_hidden;
+
-  int mouse_face_image_state;
-
@@ -233 +230 @@
-     frame.  It differs from w32_focus_frame when we're using a global
-     minibuffer.  */
-w32
+x
-
-  /* Cache of images.  */
@@ -253 +250 @@
-
-struct w32_display_info *x_display_info_for_name ();
+
+Lisp_Object display_x_get_resource P_ ((struct w32_display_info *,
+                                        Lisp_Object, Lisp_Object,
+                                        Lisp_Object, Lisp_Object));
-
-extern struct w32_display_info *w32_term_init ();
@@ -305 +306 @@
-  HPALETTE old_palette;
-
-  /* Position of the W32 window (x and y offsets in root window).  */
-  int left_pos;
-  int top_pos;
-
-  /* Border width of the W32 window as known by the window system.  */
-  int border_width;
-
-  /* Size of the W32 window in pixels.  */
-  int pixel_height, pixel_width;
-
-  /* Height of a line, in pixels.  */
-  int line_height;
-
-  /* Here are the Graphics Contexts for the default font.  */
-  XGCValues *cursor_gc;                         /* cursor drawing */
-
-  /* Width of the internal border.  This is a line of background color
-     just inside the window's border.  When the frame is selected,
-     a highlighting is displayed inside the internal border.  */
-  int internal_border_width;
-
-  /* The window used for this frame.
@@ -367 +350 @@
-  Cursor nontext_cursor;
-  Cursor modeline_cursor;
-cross
+hand
-  Cursor hourglass_cursor;
-  Cursor horizontal_drag_cursor;
@@ -381 +364 @@
-  int needs_exposure;
-
-  /* What kind of text cursor is drawn in this window right now?
-     (If there is no cursor (phys_cursor_x < 0), then this means nothing.)  */
-  enum text_cursor_kinds current_cursor;
-
-  /* What kind of text cursor should we draw in the future?
-     This should always be filled_box_cursor or bar_cursor.  */
-  enum text_cursor_kinds desired_cursor;
-
-  /* Width of bar cursor (if we are using that).  */
-  int cursor_width;
-
-  DWORD dwStyle;
-
-  /* The size of the extra width currently allotted for vertical
-     scroll bars, in pixels.  */
-  int vertical_scroll_bar_extra;
-
-  /* The extra width currently allotted for the areas in which
-     truncation marks, continuation marks, and overlay arrows are
-     displayed.  */
-  int flags_areas_extra;
-
-  /* This is the gravity value for the specified window position.  */
-  int win_gravity;
-
-  /* The geometry flags for this window.  */
-  int size_hint_flags;
-
-  /* This is the Emacs structure for the display this frame is on.  */
@@ -421 +378 @@
-  /* Nonzero means menubar is currently active.  */
-  char menubar_active;
+
+  /* Nonzero means a menu command is being processed.  */
+  char menu_command_in_progress;
-
-  /* Nonzero means menubar is about to become active, but should be
@@ -442 +402 @@
-extern struct w32_output w32term_display;
-
+/* Return the X output data for frame F.  */
+#define FRAME_X_OUTPUT(f) ((f)->output_data.w32)
+
-/* Return the window associated with the frame F.  */
-#define FRAME_W32_WINDOW(f) ((f)->output_data.w32->window_desc)
+#define FRAME_X_WINDOW(f) ((f)->output_data.w32->window_desc)
-
-#define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel)
@@ -449 +413 @@
-#define FRAME_FONT(f) ((f)->output_data.w32->font)
-#define FRAME_FONTSET(f) ((f)->output_data.w32->fontset)
-#define FRAME_INTERNAL_BORDER_WIDTH(f) ((f)->output_data.w32->internal_border_width)
-#define FRAME_LINE_HEIGHT(f) ((f)->output_data.w32->line_height)
-/* Width of the default font of frame F.  Must be defined by each
-   terminal specific header.  */
-#define FRAME_DEFAULT_FONT_WIDTH(F)     FONT_WIDTH (FRAME_FONT (F))
-#define FRAME_BASELINE_OFFSET(f) ((f)->output_data.w32->baseline_offset)
-
@@ -460 +419 @@
-#define FRAME_X_DISPLAY_INFO(f) (&one_w32_display_info)
-
+/* This is the `Display *' which frame F is on.  */
+#define FRAME_X_DISPLAY(f) (0)
+
-/* This is the 'font_info *' which frame F has.  */
-#define FRAME_W32_FONT_TABLE(f) (FRAME_W32_DISPLAY_INFO (f)->font_table)
-
-/* These two really ought to be called FRAME_PIXEL_{WIDTH,HEIGHT}.  */
-#define PIXEL_WIDTH(f) ((f)->output_data.w32->pixel_width)
-#define PIXEL_HEIGHT(f) ((f)->output_data.w32->pixel_height)
-
-#define FRAME_DESIRED_CURSOR(f) ((f)->output_data.w32->desired_cursor)
-
-/* Value is the smallest width of any character in any font on frame F.  */
-
@@ -482 +438 @@
-
-#define FRAME_X_IMAGE_CACHE(F) FRAME_W32_DISPLAY_INFO ((F))->image_cache
-
-
-/* Pixel width of the bitmaps drawn to indicate truncation,
-   continuation etc.  */
-
-#define FRAME_FLAGS_BITMAP_WIDTH(f)     8
-#define FRAME_FLAGS_BITMAP_HEIGHT(f)    8
-
-/* Total width of areas reserved for drawing truncation bitmaps,
-   continuation bitmaps and alike.  The width is in canonical char
-   units of the frame.  This must currently be the case because window
-   sizes aren't pixel values.  If it weren't the case, we wouldn't be
-   able to split windows horizontally nicely.  */
-
-#define FRAME_X_FLAGS_AREA_COLS(F)                              \
-     ((2 * FRAME_FLAGS_BITMAP_WIDTH ((F)) + CANON_X_UNIT ((F)) - 1)     \
-      / CANON_X_UNIT ((F)))
-
-/* Total width of flags areas in pixels.  */
-
-#define FRAME_X_FLAGS_AREA_WIDTH(F) \
-     (FRAME_X_FLAGS_AREA_COLS ((F)) * CANON_X_UNIT ((F)))
-
-/* Pixel-width of the left flags area.  */
-
-#define FRAME_X_LEFT_FLAGS_AREA_WIDTH(F) \
-     (FRAME_X_FLAGS_AREA_WIDTH (F) / 2)
-
-/* Pixel-width of the right flags area.  Note that we are doing
-   integer arithmetic here, so don't loose a pixel if the total
-   width is an odd number.  */
-
-#define FRAME_X_RIGHT_FLAGS_AREA_WIDTH(F)       \
-     (FRAME_X_FLAGS_AREA_WIDTH (F) - FRAME_X_FLAGS_AREA_WIDTH (F) / 2)
-
-
-
@@ -653 +574 @@
-   text from glomming up against the scroll bar */
-#define VERTICAL_SCROLL_BAR_WIDTH_TRIM (0)
-
-
-/* Manipulating pixel sizes and character sizes.
-   Knowledge of which factors affect the overall size of the window should
-   be hidden in these macros, if that's possible.
-
-   Return the upper/left pixel position of the character cell on frame F
-   at ROW/COL.  */
-#define CHAR_TO_PIXEL_ROW(f, row) \
-  ((f)->output_data.w32->internal_border_width \
-   + (row) * (f)->output_data.w32->line_height)
-#define CHAR_TO_PIXEL_COL(f, col) \
-  ((f)->output_data.w32->internal_border_width \
-   + (col) * FONT_WIDTH ((f)->output_data.w32->font))
-
-/* Return the pixel width/height of frame F if it has
-   WIDTH columns/HEIGHT rows.  */
-#define CHAR_TO_PIXEL_WIDTH(f, width) \
-  (CHAR_TO_PIXEL_COL (f, width) \
-   + (f)->output_data.w32->vertical_scroll_bar_extra \
-   + (f)->output_data.w32->flags_areas_extra \
-   + (f)->output_data.w32->internal_border_width)
-#define CHAR_TO_PIXEL_HEIGHT(f, height) \
-  (CHAR_TO_PIXEL_ROW (f, height) \
-   + (f)->output_data.w32->internal_border_width)
-
-
-/* Return the row/column (zero-based) of the character cell containing
-   the pixel on FRAME at ROW/COL.  */
-#define PIXEL_TO_CHAR_ROW(f, row) \
-  (((row) - (f)->output_data.w32->internal_border_width) \
-   / (f)->output_data.w32->line_height)
-#define PIXEL_TO_CHAR_COL(f, col) \
-  (((col) - (f)->output_data.w32->internal_border_width) \
-   / FONT_WIDTH ((f)->output_data.w32->font))
-
-/* How many columns/rows of text can we fit in WIDTH/HEIGHT pixels on
-   frame F?  */
-#define PIXEL_TO_CHAR_WIDTH(f, width) \
-  (PIXEL_TO_CHAR_COL (f, ((width) \
-                          - (f)->output_data.w32->internal_border_width \
-                          - (f)->output_data.w32->flags_areas_extra \
-                          - (f)->output_data.w32->vertical_scroll_bar_extra)))
-#define PIXEL_TO_CHAR_HEIGHT(f, height) \
-  (PIXEL_TO_CHAR_ROW (f, ((height) \
-                          - (f)->output_data.w32->internal_border_width)))
-
-
@@ -730 +605 @@
-#define MSH_MOUSEWHEEL                 "MSWHEEL_ROLLMSG"
-#endif /* MSH_MOUSEWHEEL */
+#ifndef WM_XBUTTONDOWN
+#define WM_XBUTTONDOWN                 (WM_MOUSEWHEEL + 1)
+#define WM_XBUTTONUP                   (WM_MOUSEWHEEL + 2)
+#endif /* WM_XBUTTONDOWN */
-
-#define WM_EMACS_START                 (WM_USER + 1)
@@ -747 +626 @@
-#define WM_EMACS_UNREGISTER_HOT_KEY    (WM_EMACS_START + 13)
-#define WM_EMACS_TOGGLE_LOCK_KEY       (WM_EMACS_START + 14)
-
+
+
+
+
+
+
-
-#define WND_FONTWIDTH_INDEX    (0)
@@ -835 +719 @@
-#define APPS_PRESSED           0x2000
-
+/* When compiling on Windows 9x/ME and NT 3.x, the following are not defined
+   (even though they are supported on 98 and ME.  */
+#ifndef WM_MOUSELEAVE
+#define WM_MOUSELEAVE 0x02A3
+#define TME_LEAVE 0x00000002;
+
+typedef struct tagTRACKMOUSEEVENT
+{
+  DWORD cbSize;
+  DWORD dwFlags;
+  HWND hwndTrack;
+  DWORD dwHoverTime;
+} TRACKMOUSEEVENT;
+#endif
+
-struct image;
-struct face;
@@ -840 +739 @@
-XGCValues *XCreateGC (void *, Window, unsigned long, XGCValues *);
-struct frame * check_x_frame (Lisp_Object);
+Lisp_Object vga_stdcolor_name (int);
+
-EXFUN (Fx_display_color_p, 1);
-EXFUN (Fx_display_grayscale_p, 1);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+