Changeset 3906

Timestamp:

10/13/05 21:40:58 (3 years ago)

Author:

horiguti

Message:

Add mouse cursor image handling.

Files:

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

trunk/src/ChangeLog.Meadow

@@ -3 +3 @@
-        * mw32term.h (mw32_alpha_type): New enumeration.
-        (struct mw32_output): Remove *_alpha except current_alpha, and add
-
+ Add new member current_cursor;
-
-        * mw32term.c (mw32_update_frame_alpha): Refine code and sadd
-        upport of alpha of resizing window.
+        (show_or_hide_mouse_cursor): Set mouse cursor.
+        (show_or_hide_mouse_cursor<WM_MOUSELEAVE>): Restore mouse cursor
+        when leaving.
+        (mw32_define_frame_cursor): Set current cursor.
+        (mw32_term_init): Initialize mouse cursor image.
-
-        * mw32fns.c (CHECK_ALPHA_RANGE): New macro.
-        (mw32_set_frame_alpha): Refine code and sadd upport of alpha of
-
+ Remove excessive whitespaces.
-        (mw32_WndProc<WM_SETFOCUS>): Immediately udpate alpha.
-        (mw32_WndProc<WM_KILLFOCUS>): Immediately udpate alpha.
@@ -16 +21 @@
-        (mw32_WndProc<WM_SIZING>): New event handler.
-        (mw32_WndProc<WM_EXITSIZEMOVE>): Ditto.
-
-
+
+
+
+
-2005-10-12  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
-

trunk/src/mw32fns.c

@@ -778 +778 @@
-}
-
+Cursor
+mw32_load_cursor (LPCTSTR name)
+{
+  /* Try first to load cursor from application resource.  */
+  Cursor cursor = LoadImage ((HINSTANCE) GetModuleHandle(NULL),
+                             name, IMAGE_CURSOR, 0, 0,
+                             LR_DEFAULTCOLOR | LR_DEFAULTSIZE | LR_SHARED);
+  if (!cursor)
+    {
+      /* Then try to load a shared predefined cursor.  */
+      cursor = LoadImage (NULL, name, IMAGE_CURSOR, 0, 0,
+                          LR_DEFAULTCOLOR | LR_DEFAULTSIZE | LR_SHARED);
+    }
+  return cursor;
+}
+
-static void
-mw32_set_cursor_color (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
@@ -941 +957 @@
-  int i, tmp;
-  Lisp_Object obj;
-
+
-  if (SetLayeredWindowAttributes == NULL)
-    return;
-
+
-  for (i = 0 ; i < NUM_OF_ALPHAS ; i++)
-    newalpha[i] = -1;
-
+
-  if (!NILP (arg))
-    {
@@ -963 +979 @@
-          for (i = 0 ; i < NUM_OF_ALPHAS ; i++)
-            newalpha[i] = tmp;
-  
+
-          if (NUMBERP (CDR (arg)))
-            {
@@ -970 +986 @@
-                newalpha[ALPHA_INACTIVE] = tmp;
-            }
-  
+
-          obj = CDR (arg);
-          for (i = ALPHA_INACTIVE ;
@@ -995 +1011 @@
-      f->output_data.mw32->alpha[i] = newalpha[i];
-    }
-
+
-  mw32_update_frame_alpha (f, TRUE);
-}
@@ -2831 +2847 @@
-#endif
-
+  f->output_data.mw32->text_cursor
+    = mw32_load_cursor (IDC_IBEAM);
+  f->output_data.mw32->nontext_cursor
+    = mw32_load_cursor (IDC_ARROW);
+  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->current_cursor
+    = f->output_data.mw32->nontext_cursor;
+ 
-#if 0
-  /* These colors will be set anyway later, but it's important

trunk/src/mw32term.c

@@ -4190 +4190 @@
-{
-  static unsigned int mouse_hide_timer = 0;
+  SetCursor (FRAME_MW32_OUTPUT (XFRAME (selected_frame))->current_cursor);
-
-  if (mw32_inhibit_hide_mouse)
@@ -4277 +4278 @@
-        }      
-      dpyinfo->mouse_face_hidden = 0;
+      
+      FRAME_MW32_OUTPUT (XFRAME (selected_frame))->current_cursor
+        = FRAME_MW32_OUTPUT (XFRAME (selected_frame))->nontext_cursor;
+      SetCursor (FRAME_MW32_OUTPUT (XFRAME (selected_frame))->current_cursor);
-
-      break;
@@ -5172 +5177 @@
-mw32_define_frame_cursor (struct frame *f, Cursor cursor)
-{
-
-
-
+
-}
-
@@ -6002 +6005 @@
-  dpyinfo->image_cache = make_image_cache ();
-
-0
+mw32_load_cursor (IDC_SIZENS)
-
-#if 0

trunk/src/mw32term.h

@@ -493 +493 @@
-  int alpha[NUM_OF_ALPHAS];
-  int current_alpha;   /* Current alpha value of this frame */
+
+  Cursor current_cursor;
-};
-