Changeset 3912

Timestamp:

10/14/05 20:55:27 (3 years ago)

Author:

horiguti

Message:

Use IDC_ARROW instead of IDC_HAND on the systems that doesn't has
IDC_HAND like Windows 95/NT.
Support --fullscreen, --fullwidth, --fullheight.

Files:

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

trunk/src/ChangeLog.Meadow

@@ -9 +9 @@
-
-        * mw32fns.c (mw32_init_app): Don't set window class cursor.
+        (x-create-frame): Load IDC_ARROW cursor when failed to load
+        IDC_HAND. Windows NT, 95 does not has IDC_HAND cursor.
+        (mw32_real_positions): New function imported from w32fns.c.
+        (mw32_check_fullscreen): New function imported from w32term.c.
+        (mw32_WndProc<WM_ACTIVATE>): New message handler.
+        (mw32_WndProc<WM_ACTIVATEAPP>): New message handler.
-
-2005-10-14  Hideyuki SHIRAI  <shirai@meadowy.org>

trunk/src/mw32fns.c

@@ -154 +154 @@
-    error ("Non-mw32 frame used");
-  return f;
+}
+
+
+/* Store the screen positions of frame F into XPTR and YPTR.
+   These are the positions of the containing window manager window,
+   not Emacs's own window.  */
+
+void
+mw32_real_positions (f, xptr, yptr)
+     FRAME_PTR f;
+     int *xptr, *yptr;
+{
+  POINT pt;
+  RECT rect;
+
+  GetClientRect((HWND)FRAME_MW32_WINDOW(f), &rect);
+  AdjustWindowRect(&rect, f->output_data.mw32->dwStyle, FRAME_EXTERNAL_MENU_BAR(f));
+
+  pt.x = rect.left;
+  pt.y = rect.top;
+
+  ClientToScreen ((HWND)FRAME_MW32_WINDOW(f), &pt);
+
+  /* Remember x_pixels_diff and y_pixels_diff.  */
+  f->x_pixels_diff = pt.x - rect.left;
+  f->y_pixels_diff = pt.y - rect.top;
+
+  *xptr = pt.x;
+  *yptr = pt.y;
+}
+
+/* Check if we need to resize the frame due to a fullscreen request.
+   If so needed, resize the frame. */
+static void
+mw32_check_fullscreen (f)
+     struct frame *f;
+{
+  if (f->want_fullscreen & FULLSCREEN_BOTH)
+    {
+      int width, height, ign;
+
+      mw32_real_positions (f, &f->left_pos, &f->top_pos);
+
+      x_fullscreen_adjust (f, &width, &height, &ign, &ign);
+
+      /* We do not need to move the window, it shall be taken care of
+         when setting WM manager hints.  */
+      if (FRAME_COLS (f) != width || FRAME_LINES (f) != height)
+        {
+          change_frame_size (f, height, width, 0, 1, 0);
+          SET_FRAME_GARBAGED (f);
+          cancel_mouse_face (f);
+
+          /* Wait for the change of frame size to occur */
+          f->want_fullscreen |= FULLSCREEN_WAIT;
+        }
+    }
-}
-
@@ -2153 +2210 @@
-    goto dflt;
-
+  case WM_ACTIVATE:
+  case WM_ACTIVATEAPP:
+    mw32_check_fullscreen (f);
+    break;
+
-  case WM_CLOSE:
-    PostMessage (hwnd, WM_EMACS_DESTROY, wParam, lParam);
@@ -2853 +2915 @@
-  f->output_data.mw32->modeline_cursor
-    = mw32_load_cursor (IDC_SIZENS);
-  f->output_data.mw32->hand_cursor
-    = mw32_load_cursor (IDC_HAND);
-  f->output_data.mw32->hourglass_cursor
-    = mw32_load_cursor (IDC_WAIT);
-  f->output_data.mw32->horizontal_drag_cursor
-    = mw32_load_cursor (IDC_SIZEWE);
+  
+  f->output_data.mw32->hand_cursor
+    = mw32_load_cursor (IDC_HAND);
+  if (f->output_data.mw32->hand_cursor == NULL)
+    f->output_data.mw32->hand_cursor
+      = mw32_load_cursor (IDC_ARROW);
- 
-  f->output_data.mw32->current_cursor