Changeset 3902

Timestamp:

10/12/05 21:58:53 (3 years ago)

Author:

horiguti

Message:

Make it possible to compile on old versions of VC, maybe.

Files:

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

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2005-10-12  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * mw32term.h(SETLAYEREDWINDOWATTRPROC): New typedef.
+        (WS_EX_LAYERED): New constant for Win32 API.
+        (LWA_ALPHA): New constant for Win32 API.
+
+        * mw32term.c: Remove include windows.h.
+        (mw32_initialize): Setup SetLayeredWindowAttributes() of
+        user32.dll.
+
+        * mw32fns.c: Remove include windows.h.
+        (mw32_set_frame_alpha): Return if SetLayeredWindowAttributes
+        cannot be used.
+
-2005-10-12  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
-

trunk/src/mw32fns.c

@@ -21 +21 @@
-
-/* MW32 implementation by MIYASHITA Hisashi <himi@meadowy.org> */
-
-/* This is included to use SetLayeredWindowAttributes() */
-#define _WIN32_WINNT 0x0500
-#include <windows.h>
-
-#include <config.h>
@@ -934 +930 @@
-/* defined in mw32term.c */
-extern void mw32_update_frame_alpha (struct frame *f, int change_style);
+extern SETLAYEREDWINDOWATTRPROC SetLayeredWindowAttributes;
-
-static void
@@ -941 +938 @@
-  int newalpha_active, newalpha_inactive, newalpha_moving, newalpha;
-  int obj;
+
+  if (SetLayeredWindowAttributes == NULL)
+    return;
-
-  if (NILP (arg))

trunk/src/mw32term.c

@@ -39 +39 @@
-
-#include <stdio.h>
-
-/* This is included to use SetLayeredWindowAttributes() */
-#define _WIN32_WINNT 0x0500
-#include <windows.h>
-#ifdef WHEEL_PAGESCROLL
-#undef WHEEL_PAGESCROLL
-#endif
-
-#include "lisp.h"
@@ -230 +223 @@
-/* last_mouse_motion_message describes the mouse movement last time.  */
-static MSG last_mouse_motion_message;
+
+/* Layered Window */
+SETLAYEREDWINDOWATTRPROC SetLayeredWindowAttributes = NULL;
-
-/* Incremented by XTread_socket whenever it really tries to read
@@ -6107 +6103 @@
-  int argc = 0;
-  char** argv = 0;
+  HMODULE hUser32;
-
-  rif = &mw32_redisplay_interface;
@@ -6189 +6186 @@
-      = (TrackMouseEvent_Proc) GetProcAddress (user32_lib, "TrackMouseEvent");
-  }
+
+  /* Layered Window */
+  if (hUser32 = LoadLibrary ("USER32.DLL"))
+    {
+      SetLayeredWindowAttributes = (SETLAYEREDWINDOWATTRPROC)
+        GetProcAddress (hUser32, "SetLayeredWindowAttributes");
+    }
-}
-

trunk/src/mw32term.h

@@ -1161 +1161 @@
-#define FONT_TYPE_FOR_MULTIBYTE(font, ch) (FONT_TYPE_UNKNOWN)
-
+/* Layered Window */
+typedef BOOL (WINAPI *SETLAYEREDWINDOWATTRPROC)(HWND, COLORREF, BYTE, DWORD);
+#define WS_EX_LAYERED   0x00080000
+#define LWA_ALPHA       2
+
-#endif /* not _MW32TERM_H_ */