emacs: src/w32fns.c comparison

comparison src/w32fns.c @ 93075:66248fc5b523

* w32fns.c (hourglass_timer, hourglass_hwnd): New variables. (syms_of_w32fns): Initialize them. (HOURGLASS_ID): New constant. (x_window_to_frame): Don't check hourglass_window. (w32_wnd_proc) <WM_TIMER>: Handle hourglass_timer. (w32_wnd_proc) <WM_EXITMENULOOP>: Set pending hourglass cursor. (w32_wnd_proc) <WM_SETCURSOR>: Set the hourglass or current cursor. (w32_wnd_proc) <WM_EMACS_SETCURSOR>: Set frame's current_cursor. Only change the cursor if hourglass is not active. (Fx_create_frame): Initialize frame's current_cursor. (hourglass_atimer): Remove. (hourglass_started): New function. (start_hourglass, cancel_hourglass, hide_hourglass): Adapt to w32. (show_hourglass): Adapt to w32, changing argument to frame. * w32term.h (struct w32_output): Remove hourglass_window. Add current_cursor. * eval.c (call_debugger, Fsignal): * keyboard.c (recursive_edit_1, cmd_error, Ftop_level) (command_loop_1, Fread_key_sequence, Fread_key_sequence_vector) (Fexecute_extended_command, cancel_hourglass_unwind): * minibuf.c (read_minibuf): * fns.c (Fy_or_n_p): Enable hourglass when HAVE_WINDOW_SYSTEM.

author	Jason Rumney <jasonr@gnu.org>
date	Wed, 19 Mar 2008 17:04:14 +0000
parents	23d6a73f69ad
children	a461c5c16bd5

comparison

equal deleted inserted replaced

-:620496d91e55
+:66248fc5b523
 /* Non-zero means we're allowed to display a hourglass pointer.  */
 int display_hourglass_p;
+/* If non-zero, a w32 timer that, when it expires, displays an
+hourglass cursor on all frames.  */
+static unsigned hourglass_timer = 0;
+static HWND hourglass_hwnd = NULL;
 /* The background and shape of the mouse pointer, and shape when not
 over text or in the modeline.  */
 Lisp_Object Vx_pointer_shape, Vx_nontext_pointer_shape, Vx_mode_pointer_shape;
 Lisp_Object Vx_hourglass_pointer_shape, Vx_window_horizontal_drag_shape;
 /* Timers */
 #define MOUSE_BUTTON_ID	1
 #define MOUSE_MOVE_ID	2
 #define MENU_FREE_ID 3
+#define HOURGLASS_ID 4
 /* The delay (milliseconds) before a menu is freed after WM_EXITMENULOOP
 is received.  */
 #define MENU_FREE_DELAY 1000
 static unsigned menu_free_timer = 0;
 static HWND w32_visible_system_caret_hwnd;
 /* From w32menu.c  */
 extern HMENU current_popup_menu;
 static int menubar_in_use = 0;
+/* Function prototypes for hourglass support.  */
+static void show_hourglass P_ ((struct frame *));
+static void hide_hourglass P_ ((void));
 /* Error if we are not connected to MS-Windows.  */
 void
 check_w32 ()
 if (!FRAMEP (frame))
 continue;
 f = XFRAME (frame);
 if (!FRAME_W32_P (f) || FRAME_W32_DISPLAY_INFO (f) != dpyinfo)
 	continue;
-if (f->output_data.w32->hourglass_window == wdesc)
-return f;
 if (FRAME_W32_WINDOW (f) == wdesc)
 return f;
 }
 return 0;
 	      w32_free_menu_strings (hwnd);
 	      f->output_data.w32->menubar_active = 0;
 menubar_in_use = 0;
 	    }
 	}
+else if (wParam == hourglass_timer)
+	{
+	  KillTimer (hwnd, hourglass_timer);
+	  hourglass_timer = 0;
+	  show_hourglass (x_window_to_frame (dpyinfo, hwnd));
+	}
 return 0;
 case WM_NCACTIVATE:
 /* Windows doesn't send us focus messages when putting up and
 	 taking down a system popup dialog as for Ctrl-Alt-Del on Windows 95.
 Don't do this if a popup menu is active, since it is only
 menubar menus that require cleaning up in this way.
 */
 if (f && menubar_in_use && current_popup_menu == NULL)
 	menu_free_timer = SetTimer (hwnd, MENU_FREE_ID, MENU_FREE_DELAY, NULL);
+/* If hourglass cursor should be displayed, display it now.  */
+if (f && f->output_data.w32->hourglass_p)
+	SetCursor (f->output_data.w32->hourglass_cursor);
 goto dflt;
 case WM_MENUSELECT:
 /* Direct handling of help_echo in menus.  Should be safe now
 	 that we generate the help_echo by placing a help event in the
 ((LPMINMAXINFO) lParam)->ptMaxTrackSize.y = 32767;
 return 0;
 case WM_SETCURSOR:
 if (LOWORD (lParam) == HTCLIENT)
-	return 0;
+	{
+	  f = x_window_to_frame (dpyinfo, hwnd);
+	  if (f->output_data.w32->hourglass_p && !menubar_in_use
+	      && !current_popup_menu)
+	    SetCursor (f->output_data.w32->hourglass_cursor);
+	  else
+	    SetCursor (f->output_data.w32->current_cursor);
+	  return 0;
+	}
 goto dflt;
 case WM_EMACS_SETCURSOR:
 {
 	Cursor cursor = (Cursor) wParam;
-	if (cursor)
+	f = x_window_to_frame (dpyinfo, hwnd);
-	  SetCursor (cursor);
+	if (f && cursor)
+	  {
+	    f->output_data.w32->current_cursor = cursor;
+	    if (!f->output_data.w32->hourglass_p)
+	      SetCursor (cursor);
+	  }
 	return 0;
 }
 case WM_EMACS_CREATESCROLLBAR:
 return (LRESULT) w32_createscrollbar ((struct frame *) wParam,
 f->output_data.w32->nontext_cursor = w32_load_cursor (IDC_ARROW);
 f->output_data.w32->modeline_cursor = w32_load_cursor (IDC_ARROW);
 f->output_data.w32->hand_cursor = w32_load_cursor (IDC_HAND);
 f->output_data.w32->hourglass_cursor = w32_load_cursor (IDC_WAIT);
 f->output_data.w32->horizontal_drag_cursor = w32_load_cursor (IDC_SIZEWE);
+f->output_data.w32->current_cursor = f->output_data.w32->nontext_cursor;
 window_prompting = x_figure_window_size (f, parameters, 1);
 tem = w32_get_arg (parameters, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN);
 f->no_split = minibuffer_only || EQ (tem, Qt);
 /***********************************************************************
 				Busy cursor
 ***********************************************************************/
-/* If non-null, an asynchronous timer that, when it expires, displays
-an hourglass cursor on all frames.  */
-static struct atimer *hourglass_atimer;
 /* Non-zero means an hourglass cursor is currently shown.  */
 static int hourglass_shown_p;
 /* Number of seconds to wait before displaying an hourglass cursor.  */
 /* Default number of seconds to wait before displaying an hourglass
 cursor.  */
 #define DEFAULT_HOURGLASS_DELAY 1
-/* Function prototypes.  */
+/* Return non-zero if houglass timer has been started or hourglass is shown.  */
-static void show_hourglass P_ ((struct atimer *));
+int
-static void hide_hourglass P_ ((void));
+hourglass_started ()
+{
+return hourglass_shown_p || hourglass_timer;
+}
 /* Cancel a currently active hourglass timer, and start a new one.  */
 void
 start_hourglass ()
 {
-#if 0 /* TODO: cursor shape changes.  */
+DWORD delay;
-EMACS_TIME delay;
+int secs, msecs = 0;
-int secs, usecs = 0;
+struct frame * f = SELECTED_FRAME ();
 cancel_hourglass ();
 if (INTEGERP (Vhourglass_delay)
 && XINT (Vhourglass_delay) > 0)
 	   && XFLOAT_DATA (Vhourglass_delay) > 0)
 {
 Lisp_Object tem;
 tem = Ftruncate (Vhourglass_delay, Qnil);
 secs = XFASTINT (tem);
-usecs = (XFLOAT_DATA (Vhourglass_delay) - secs) * 1000000;
+msecs = (XFLOAT_DATA (Vhourglass_delay) - secs) * 1000;
 }
 else
 secs = DEFAULT_HOURGLASS_DELAY;
-EMACS_SET_SECS_USECS (delay, secs, usecs);
+delay = secs * 1000 + msecs;
-hourglass_atimer = start_atimer (ATIMER_RELATIVE, delay,
+hourglass_hwnd = FRAME_W32_WINDOW (f);
-				   show_hourglass, NULL);
+hourglass_timer = SetTimer (hourglass_hwnd, HOURGLASS_ID, delay, NULL);
-#endif
 }
 /* Cancel the hourglass cursor timer if active, hide an hourglass
 cursor if shown.  */
 void
 cancel_hourglass ()
 {
-if (hourglass_atimer)
+if (hourglass_timer)
 {
-cancel_atimer (hourglass_atimer);
+KillTimer (hourglass_hwnd, hourglass_timer);
-hourglass_atimer = NULL;
+hourglass_timer = 0;
 }
 if (hourglass_shown_p)
 hide_hourglass ();
 }
-/* Timer function of hourglass_atimer.  TIMER is equal to
+/* Timer function of hourglass_timer.
-hourglass_atimer.
+Display an hourglass cursor.  Set the hourglass_p flag in display info
-Display an hourglass cursor on all frames by mapping the frames'
+to indicate that an hourglass cursor is shown.  */
-hourglass_window.  Set the hourglass_p flag in the frames'
-output_data.x structure to indicate that an hourglass cursor is
-shown on the frames.  */
 static void
-show_hourglass (timer)
+show_hourglass (f)
-struct atimer *timer;
+struct frame *f;
 {
-#if 0  /* TODO: cursor shape changes.  */
-/* The timer implementation will cancel this timer automatically
-after this function has run.  Set hourglass_atimer to null
-so that we know the timer doesn't have to be canceled.  */
-hourglass_atimer = NULL;
 if (!hourglass_shown_p)
 {
-Lisp_Object rest, frame;
+f->output_data.w32->hourglass_p = 1;
+if (!menubar_in_use && !current_popup_menu)
-BLOCK_INPUT;
+	SetCursor (f->output_data.w32->hourglass_cursor);
-FOR_EACH_FRAME (rest, frame)
-	if (FRAME_W32_P (XFRAME (frame)))
-	  {
-	    struct frame *f = XFRAME (frame);
-	    f->output_data.w32->hourglass_p = 1;
-	    if (!f->output_data.w32->hourglass_window)
-	      {
-		unsigned long mask = CWCursor;
-		XSetWindowAttributes attrs;
-		attrs.cursor = f->output_data.w32->hourglass_cursor;
-		f->output_data.w32->hourglass_window
-		  = XCreateWindow (FRAME_X_DISPLAY (f),
-				   FRAME_OUTER_WINDOW (f),
-				   0, 0, 32000, 32000, 0, 0,
-				   InputOnly,
-				   CopyFromParent,
-				   mask, &attrs);
-	      }
-	    XMapRaised (FRAME_X_DISPLAY (f),
-			f->output_data.w32->hourglass_window);
-	    XFlush (FRAME_X_DISPLAY (f));
-	  }
 hourglass_shown_p = 1;
-UNBLOCK_INPUT;
+}
-}
-#endif
 }
 /* Hide the hourglass cursor on all frames, if it is currently shown.  */
 static void
 hide_hourglass ()
 {
-#if 0 /* TODO: cursor shape changes.  */
 if (hourglass_shown_p)
 {
-Lisp_Object rest, frame;
+struct frame *f = x_window_to_frame (&one_w32_display_info,
+					   hourglass_hwnd);
-BLOCK_INPUT;
-FOR_EACH_FRAME (rest, frame)
+f->output_data.w32->hourglass_p = 0;
-	{
+SetCursor (f->output_data.w32->current_cursor);
-	  struct frame *f = XFRAME (frame);
-	  if (FRAME_W32_P (f)
-	      /* Watch out for newly created frames.  */
-	      && f->output_data.x->hourglass_window)
-	    {
-	      XUnmapWindow (FRAME_X_DISPLAY (f),
-			    f->output_data.x->hourglass_window);
-	      /* Sync here because XTread_socket looks at the
-		 hourglass_p flag that is reset to zero below.  */
-	      XSync (FRAME_X_DISPLAY (f), False);
-	      f->output_data.x->hourglass_p = 0;
-	    }
-	}
 hourglass_shown_p = 0;
-UNBLOCK_INPUT;
+}
-}
-#endif
 }
 /***********************************************************************
 set_frame_fontset_func = x_set_font;
 get_font_repertory_func = x_get_font_repertory;
 check_window_system_func = check_w32;
-hourglass_atimer = NULL;
+hourglass_timer = 0;
+hourglass_hwnd = NULL;
 hourglass_shown_p = 0;
 defsubr (&Sx_show_tip);
 defsubr (&Sx_hide_tip);
 tip_timer = Qnil;
 staticpro (&tip_timer);

Mercurial > emacs

comparison src/w32fns.c @ 93075:66248fc5b523