Changeset 3905

Timestamp:

10/13/05 21:29:45 (3 years ago)

Author:

horiguti

Message:

Refine alpha control.

Files:

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

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2005-10-13  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * mw32term.h (mw32_alpha_type): New enumeration.
+        (struct mw32_output): Remove *_alpha except current_alpha, and add
+        alpha[].
+
+        * mw32term.c (mw32_update_frame_alpha): Refine code and sadd
+        upport of alpha of resizing window.
+
+        * mw32fns.c (CHECK_ALPHA_RANGE): New macro.
+        (mw32_set_frame_alpha): Refine code and sadd upport of alpha of
+        resizing window.
+        (mw32_WndProc<WM_SETFOCUS>): Immediately udpate alpha.
+        (mw32_WndProc<WM_KILLFOCUS>): Immediately udpate alpha.
+        (mw32_WndProc<WM_MOVING>): Refine.
+        (mw32_WndProc<WM_SIZING>): New event handler.
+        (mw32_WndProc<WM_EXITSIZEMOVE>): Ditto.
+        (x-create-frame): Following changes of mw32_output.
+
-2005-10-12  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
-

trunk/src/mw32fns.c

@@ -932 +932 @@
-extern SETLAYEREDWINDOWATTRPROC SetLayeredWindowAttributes;
-
+#define CHECK_ALPHA_RANGE(alpha) if (alpha < 0 || alpha > 100)  \
+    args_out_of_range (make_number (0), make_number (100));
+
-static void
-mw32_set_frame_alpha (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
-{
-oldalpha= f->output_data.mw32->current_alpha
-newalpha_active, newalpha_inactive, newalpha_moving, newalpha
-in
-
+newalpha[NUM_OF_ALPHAS]
+i, tmp
+Lisp_Objec
+
-  if (SetLayeredWindowAttributes == NULL)
-    return;
-
-
-
-
+
+
+
+
+
-    {
-      if (NUMBERP (arg))
-        {
-
-
-
-
-
-
+
+
+
+
-        }
-
+ && NUMBERP (CAR (arg))
-        {
-
-
-
+
+
+
+
-          
-          if (NUMBERP (CDR (arg)))
-newalpha_inactive = XINT (CDR (arg));
-else if (CONSP (CDR (arg)) && NUMBERP (CAR (CDR (arg))))
-newalpha_inactive = XINT (CAR (CDR (arg)));
-  else
-wrong_type_argument (Qnumberp, (CDR (arg)));
+{
+    tmp = XINT (CDR (arg));
+  CHECK_ALPHA_RANGE (tmp)
+       newalpha[ALPHA_INACTIVE] = tmp;
+}
-          
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            }
-        }
-      else
-        wrong_type_argument (Qnumberp, arg);
-
+
+
+
+
-      /* Apply lower limit silently */
-
-
-
-
-
-
+
+
+
+
-    }
-  
-  f->output_data.mw32->active_alpha = newalpha_active;  
-  f->output_data.mw32->inactive_alpha = newalpha_inactive;  
-  f->output_data.mw32->moving_alpha = newalpha_moving;  
-
-  mw32_update_frame_alpha (f, TRUE);
-}
@@ -1931 +1923 @@
-                   (WPARAM) 0, (LPARAM) 0);
-
+    mw32_update_frame_alpha (f, FALSE);
-    return 0;
-
@@ -1947 +1940 @@
-    PostMessage (hwnd, WM_EMACS_CLEAR_MOUSE_FACE,
-                 (WPARAM) 1, (LPARAM) 0);
+
+    mw32_update_frame_alpha (f, FALSE);
-    return 0;
-
-  case WM_MOVING:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  case WM_MOVE:
@@ -2805 +2799 @@
-  f->output_data.mw32->hdc = INVALID_HANDLE_VALUE;
-  f->output_data.mw32->message_thread_hdc = INVALID_HANDLE_VALUE;
-
-
-
-
+
+
+
+
+
+
+
+
-  {
-    LOGFONT lf;

trunk/src/mw32term.c

@@ -709 +709 @@
-  oldalpha = f->output_data.mw32->current_alpha;
-
-
-
+
+
+
+
+
+
-  else
-inactive_alpha
+alpha[ALPHA_INACTIVE]
-
-  if (change_style)
@@ -4228 +4232 @@
-              clear_mouse_face (dpyinfo);
-            }
-
-        }
-      break;

trunk/src/mw32term.h

@@ -332 +332 @@
-};
-
+/* Index of alpha set in mw32_output */
+enum mw32_alpha_type
+{
+  ALPHA_ACTIVE,
+  ALPHA_INACTIVE,
+  ALPHA_MOVING,
+  ALPHA_SIZING,
+  NUM_OF_ALPHAS
+};
+
-/* Each X frame object points to its own struct x_output object
-   in the output_data.x field.  The x_output structure contains
@@ -478 +488 @@
-  LOGFONT ime_logfont;
-
+  int frame_moving_or_sizing;  /* 0: none, 1: moving, 2:sizing */
+
-  /* Transparent frame. Range is -1 to 100, -1 means alpha disabled. */
-
-
-
+
-  int current_alpha;   /* Current alpha value of this frame */
-};