Changeset 3935

Timestamp:

10/29/05 02:52:19 (3 years ago)

Author:

horiguti

Message:

Prevent the title bar from overlapping with the task bar at the top of
the screen on creating frame.
Suppress the warning messages.

Files:

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

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2005-10-28  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * mw32term.c (mw32-get-window-position): New lisp function.
+        (mw32_update_frame_alpha): Cast the parameter to suppress the
+        warning.
+
+        * mw32fns.c (mw32m_create_frame_window): Prevent the title bar
+        from overlapping with the task bar at the top of the screen on
+        creating frame.
+        (mw32_WndProc<WM_EMACS_UPDATE_ALPHA>): Cast the parameter to
+        suppress the warning.
+        
-2005-10-26  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
-

trunk/src/mw32fns.c

@@ -1503 +1503 @@
-{
-  HWND hwnd;
+  RECT rc;
+
+  /* Prevent the title bar from overlapping with the task bar at the
+     top of the screen on creating frame. */
+  hwnd = FindWindow (TEXT ("Shell_TrayWnd"), NULL);
+  if (hwnd
+      && GetWindowRect (hwnd, &rc) && rc.top <= 0 && rc.bottom > f->top_pos)
+    f->top_pos = rc.bottom;
-
-  hwnd = CreateWindowEx (f->output_data.mw32->dwStyleEx,
@@ -2642 +2650 @@
-  case WM_EMACS_UPDATE_ALPHA:
-    {
-
+(struct frame *)
-      break;
-    }

trunk/src/mw32term.c

@@ -714 +714 @@
-    {
-      POST_INFORM_MESSAGE (FRAME_MW32_WINDOW (f),
-
+(WPARAM)
-      return;
-    }   
@@ -3597 +3597 @@
-}
-
+DEFUN ("mw32-get-window-position", Fmw32_get_window_position,
+       Smw32_get_window_position, 0, 2, 0,
+       doc: /* Get the window position in screen coordinates.
+CLASS-NAME is the window class name and WINDOW-NAME is the window's title.
+Returns the dimensions as (LEFT TOP RIGHT BOTTOM) in screen coordinates,
+or nil if specified window is not found, or failed to get the position. */)
+  (class_name, window_name)
+{
+  HWND hwnd;
+  RECT rc;
+  char *classname = NULL;
+  char *windowname = NULL;
+  
+  if (STRINGP (class_name))
+    classname = SDATA (class_name);
+  
+  if (STRINGP (window_name))
+    windowname = SDATA (window_name);
+    
+  hwnd = FindWindow (classname, windowname);
+  if (hwnd == NULL) return Qnil;
+  
+  if (! GetWindowRect (hwnd, &rc)) return Qnil;
+
+  return Fcons (make_number (rc.left),
+                Fcons (make_number (rc.top),
+                       Fcons (make_number (rc.right),
+                              Fcons (make_number (rc.bottom),
+                                     Qnil))));
+}
+
+
-DEFUN ("mw32-get-scroll-bar-info", Fmw32_get_scroll_bar_info,
-       Smw32_get_scroll_bar_info, 0, 1, 0,
@@ -6836 +6868 @@
-  mw32_rbutton_to_emacs_button = 1;
-
+  defsubr (&Smw32_get_window_position);
-  defsubr (&Smw32_get_scroll_bar_info);
-  defsubr (&Sw32_get_system_metrics);