comparison src/w32fns.c @ 96674:ff312a846b25 before-merge-emacs-app-to-trunk

* w32fns.c (Fx_create_frame): Remove duplicate unwind_protect. (w32_show_hourglass): Rename from show_hourglass. (w32_hide_hourglass): Rename from hide_hourglass. (DEFAULT_HOURGLASS_DELAY): Revert from last change. (Vhourglass_delay): Declare extern. (hourglass_started): Remove. * xdisp.c (Vhourglass_delay): Remove static. (hourglass_started, start_hourglass, cancel_hourglass): Don't include these versions on WINDOWSNT.

96673:5dc035add002

/* From w32uniscribe.c  */
extern void syms_of_w32uniscribe ();
extern int uniscribe_available;

/* 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

	}
      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

  f->output_method = output_w32;
  f->output_data.w32 =
    (struct w32_output *) xmalloc (sizeof (struct w32_output));
  bzero (f->output_data.w32, sizeof (struct w32_output));
  FRAME_FONTSET (f) = -1;
  record_unwind_protect (unwind_create_frame, frame);

  f->icon_name
    = x_get_arg (dpyinfo, parameters, Qicon_name, "iconName", "Title",
                   RES_TYPE_STRING);
  if (! STRINGP (f->icon_name))


/***********************************************************************
				Busy cursor
 ***********************************************************************/

/* Return non-zero if houglass timer has been started or hourglass is shown.  */
/* PENDING: if W32 can use atimers (atimer.[hc]) then the common impl in
   	    xdisp.c could be used. */

int

      KillTimer (hourglass_hwnd, hourglass_timer);
      hourglass_timer = 0;
    }

  if (hourglass_shown_p)
    hide_hourglass ();
}


/* Timer function of hourglass_timer.

   Display an hourglass cursor.  Set the hourglass_p flag in display info
   to indicate that an hourglass cursor is shown.  */

static void
show_hourglass (f)
     struct frame *f;
{
  if (!hourglass_shown_p)
    {
      f->output_data.w32->hourglass_p = 1;

/* Hide the hourglass cursor on all frames, if it is currently shown.  */

static void
hide_hourglass ()
{
  if (hourglass_shown_p)
    {
      struct frame *f = x_window_to_frame (&one_w32_display_info,
					   hourglass_hwnd);

96674:ff312a846b25

/* From w32uniscribe.c  */
extern void syms_of_w32uniscribe ();
extern int uniscribe_available;

/* Function prototypes for hourglass support.  */
static void w32_show_hourglass P_ ((struct frame *));
static void w32_hide_hourglass P_ ((void));



/* Error if we are not connected to MS-Windows.  */
void

	}
      else if (wParam == hourglass_timer)
	{
	  KillTimer (hwnd, hourglass_timer);
	  hourglass_timer = 0;
	  w32_show_hourglass (x_window_to_frame (dpyinfo, hwnd));
	}
      return 0;

    case WM_NCACTIVATE:
      /* Windows doesn't send us focus messages when putting up and

  f->output_method = output_w32;
  f->output_data.w32 =
    (struct w32_output *) xmalloc (sizeof (struct w32_output));
  bzero (f->output_data.w32, sizeof (struct w32_output));
  FRAME_FONTSET (f) = -1;

  f->icon_name
    = x_get_arg (dpyinfo, parameters, Qicon_name, "iconName", "Title",
                   RES_TYPE_STRING);
  if (! STRINGP (f->icon_name))


/***********************************************************************
				Busy cursor
 ***********************************************************************/

/* Default number of seconds to wait before displaying an hourglass
   cursor.  Duplicated from xdisp.c, but cannot use the version there
   due to lack of atimers on w32.  */
#define DEFAULT_HOURGLASS_DELAY 1
extern Lisp_Object Vhourglass_delay;

/* Return non-zero if houglass timer has been started or hourglass is shown.  */
/* PENDING: if W32 can use atimers (atimer.[hc]) then the common impl in
   	    xdisp.c could be used. */

int

      KillTimer (hourglass_hwnd, hourglass_timer);
      hourglass_timer = 0;
    }

  if (hourglass_shown_p)
    w32_hide_hourglass ();
}


/* Timer function of hourglass_timer.

   Display an hourglass cursor.  Set the hourglass_p flag in display info
   to indicate that an hourglass cursor is shown.  */

static void
w32_show_hourglass (f)
     struct frame *f;
{
  if (!hourglass_shown_p)
    {
      f->output_data.w32->hourglass_p = 1;

/* Hide the hourglass cursor on all frames, if it is currently shown.  */

static void
w32_hide_hourglass ()
{
  if (hourglass_shown_p)
    {
      struct frame *f = x_window_to_frame (&one_w32_display_info,
					   hourglass_hwnd);