Changeset 4192

Timestamp:

2007年03月14日 21時13分21秒 (1 year ago)

Author:

miyoshi

Message:

* mw32term.h (WM_EMACS_GET_IME_FONT_PROP): Removed.
(WM_EMACS_MODIFY_IME_FONT_PROP): Ditto.
(WM_EMACS_HIDE_TOOLTIP): Packed.
(WM_EMACS_UPDATE_CURSOR): Ditto.

* mw32term.c (get_face_height): Removed.
(mw32_get_ime_font_property): Ditto.
(mw32_process_main_thread_message<WM_EMACS_GET_IME_FONT_PROP>):
Ditto.

* mw32fns.c (get_face_height): New function from `mw32ter.c'.
(mw32_get_ime_font_property): Ditto.
(mw32_WndProc<WM_IME_STARTCOMPOSITION>): Call
mw32_get_ime_font_property().
(mw32_WndProc<WM_EMACS_MODIFY_IME_FONT_PROP>): Removed.

Files:

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

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2007-03-14  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * mw32term.h (WM_EMACS_GET_IME_FONT_PROP): Removed.
+        (WM_EMACS_MODIFY_IME_FONT_PROP): Ditto.
+        (WM_EMACS_HIDE_TOOLTIP): Packed.
+        (WM_EMACS_UPDATE_CURSOR): Ditto.
+
+        * mw32term.c (get_face_height): Removed.
+        (mw32_get_ime_font_property): Ditto.
+        (mw32_process_main_thread_message<WM_EMACS_GET_IME_FONT_PROP>):
+        Ditto.
+
+        * mw32fns.c (get_face_height): New function from `mw32ter.c'.
+        (mw32_get_ime_font_property): Ditto.
+        (mw32_WndProc<WM_IME_STARTCOMPOSITION>): Call
+        mw32_get_ime_font_property().
+        (mw32_WndProc<WM_EMACS_MODIFY_IME_FONT_PROP>): Removed.
+
-2007-02-10  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

trunk/src/mw32fns.c

@@ -1872 +1872 @@
-      *width = GetSystemMetrics (SM_CXFULLSCREEN);
-      *height = GetSystemMetrics (SM_CYFULLSCREEN);
+    }
+}
+
+static Lisp_Object
+get_face_height (Lisp_Object face)
+{
+  Lisp_Object height = Qnil;
+  extern Lisp_Object QCheight;
+
+  if (!NILP (face) && SYMBOLP (face))
+    {
+      height = Finternal_get_lisp_face_attribute (face, QCheight, Qnil);
+      if (!INTEGERP (height) && !FLOATP (height))
+        height = Qnil;
+    }
+  else if (CONSP (face))
+    {
+      height = get_face_height (XCAR (face));
+      if (NILP (height))
+        height = get_face_height (XCDR (face));
+    }
+  return height;
+}
+
+static void
+mw32_get_ime_font_property (FRAME_PTR f)
+{
+  /* set logfont for IME */
+  LOGFONT lf = f->output_data.mw32->ime_logfont;
+
+  if (lf.lfHeight == 0)
+    {
+      extern Lisp_Object Qface, QCheight, Qdefault;
+      Lisp_Object p, face, height;
+
+      if (!NILP (Feolp ()))
+        XSETFASTINT (p, max (XINT (Fline_beginning_position (Qnil)), PT - 1));
+      else
+        XSETFASTINT (p, PT);
+      face = Fget_text_property (p, Qface, Qnil);
+
+      height = get_face_height (face);
+
+      if (NILP (height))
+        height = Finternal_get_lisp_face_attribute (Qdefault, QCheight, Qnil);
+      if (INTEGERP (height))
+        lf.lfHeight = (int) (- XINT (height)
+                             * FRAME_MW32_DISPLAY_INFO (f)->resy / 720);
+      else if (FLOATP (height))
+        lf.lfHeight = (int) (XFLOATINT (height) * FRAME_LINE_HEIGHT (f));
+      mw32_set_ime_font (FRAME_MW32_WINDOW (f), &lf);
-    }
-}
@@ -2391 +2442 @@
-      mw32_set_ime_conv_window (hwnd, XWINDOW (f->selected_window));
-      f->output_data.mw32->ime_composition_state = 1;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-      goto dflt;
-

trunk/src/mw32term.c

@@ -4390 +4390 @@
-}
-
-static Lisp_Object
-get_face_height (Lisp_Object face)
-{
-  Lisp_Object height = Qnil;
-  extern Lisp_Object QCheight;
-
-  if (!NILP (face) && SYMBOLP (face))
-    {
-      height = Finternal_get_lisp_face_attribute (face, QCheight, Qnil);
-      if (!INTEGERP (height) && !FLOATP (height))
-        height = Qnil;
-    }
-  else if (CONSP (face))
-    {
-      height = get_face_height (XCAR (face));
-      if (NILP (height))
-        height = get_face_height (XCDR (face));
-    }
-  return height;
-}
-
-static void
-mw32_get_ime_font_property (FRAME_PTR f)
-{
-  /* set logfont for IME */
-  LOGFONT lf = f->output_data.mw32->ime_logfont;
-
-  if (lf.lfHeight == 0)
-    {
-      extern Lisp_Object Qface, QCheight, Qdefault;
-      Lisp_Object p, face, height;
-
-      if (!NILP (Feolp ()))
-        XSETFASTINT (p, max (XINT (Fline_beginning_position (Qnil)), PT - 1));
-      else
-        XSETFASTINT (p, PT);
-      face = Fget_text_property (p, Qface, Qnil);
-
-      height = get_face_height (face);
-
-      if (NILP (height))
-        height = Finternal_get_lisp_face_attribute (Qdefault, QCheight, Qnil);
-      if (INTEGERP (height))
-        lf.lfHeight = (int) (- XINT (height)
-                             * FRAME_MW32_DISPLAY_INFO (f)->resy / 720);
-      else if (FLOATP (height))
-        lf.lfHeight = (int) (XFLOATINT (height) * FRAME_LINE_HEIGHT (f));
-    }
-
-  SEND_MSGTHREAD_INFORM_MESSAGE (WM_EMACS_MODIFY_IME_FONT_PROP,
-                                 (WPARAM) lf.lfHeight, 0);
-}
-
-struct mw32_tool_bar_parm
-{
@@ -4474 +4421 @@
-            mw32_handle_tool_bar_click (tbparm->f, &msg, tbparm->modifier);
-            xfree (tbparm);
-            break;
-          }
-        case WM_EMACS_GET_IME_FONT_PROP:
-          {
-            FRAME_PTR f = (FRAME_PTR) msg.wParam;
-            mw32_get_ime_font_property (f);
-            break;
-          }

trunk/src/mw32term.h

@@ -842 +842 @@
-#define WM_EMACS_TOOL_BAR_UP                    (WM_USER+2024)
-#define WM_EMACS_TOOL_BAR_DOWN                  (WM_USER+2025)
-
-
-
-
+
+
-
-#define WM_EMACS_CREATE_FRAME_REPLY             (WM_USER+2050)