Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

* 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.
  • Loading branch information...
commit 691e329080abb159f73cef723912a41e0169c6d8 1 parent 008f9d2
Jason Rumney authored
Showing with 31 additions and 10 deletions.
  1. +13 −0 src/ChangeLog
  2. +12 −7 src/w32fns.c
  3. +6 −3 src/xdisp.c
View
13 src/ChangeLog
@@ -1,3 +1,16 @@
+2008-07-15 Jason Rumney <jasonr@gnu.org>
+
+ * 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.
+
2008-07-15 Adrian Robert <Adrian.B.Robert@gmail.com>
* dispextern.h (hourglass_shown_p, hourglass_atimer): New extern
View
19 src/w32fns.c
@@ -307,8 +307,8 @@ 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));
+static void w32_show_hourglass P_ ((struct frame *));
+static void w32_hide_hourglass P_ ((void));
@@ -3480,7 +3480,7 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
{
KillTimer (hwnd, hourglass_timer);
hourglass_timer = 0;
- show_hourglass (x_window_to_frame (dpyinfo, hwnd));
+ w32_show_hourglass (x_window_to_frame (dpyinfo, hwnd));
}
return 0;
@@ -4350,7 +4350,6 @@ This function is an internal primitive--use `make-frame' instead. */)
(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",
@@ -5229,6 +5228,12 @@ value. */)
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. */
@@ -5287,7 +5292,7 @@ cancel_hourglass ()
}
if (hourglass_shown_p)
- hide_hourglass ();
+ w32_hide_hourglass ();
}
@@ -5297,7 +5302,7 @@ cancel_hourglass ()
to indicate that an hourglass cursor is shown. */
static void
-show_hourglass (f)
+w32_show_hourglass (f)
struct frame *f;
{
if (!hourglass_shown_p)
@@ -5313,7 +5318,7 @@ show_hourglass (f)
/* Hide the hourglass cursor on all frames, if it is currently shown. */
static void
-hide_hourglass ()
+w32_hide_hourglass ()
{
if (hourglass_shown_p)
{
View
9 src/xdisp.c
@@ -865,7 +865,7 @@ int hourglass_shown_p;
struct atimer *hourglass_atimer;
/* Number of seconds to wait before displaying an hourglass cursor. */
-static Lisp_Object Vhourglass_delay;
+Lisp_Object Vhourglass_delay;
/* Default number of seconds to wait before displaying an hourglass
cursor. */
@@ -25229,6 +25229,10 @@ init_xdisp ()
help_echo_showing_p = 0;
}
+/* Since w32 does not support atimers, it defines its own implementation of
+ the following three functions in w32fns.c. */
+#ifndef WINDOWSNT
+
/* Platform-independent portion of hourglass implementation. */
/* Return non-zero if houglass timer has been started or hourglass is shown. */
@@ -25238,7 +25242,6 @@ hourglass_started ()
return hourglass_shown_p || hourglass_atimer != NULL;
}
-
/* Cancel a currently active hourglass timer, and start a new one. */
void
start_hourglass ()
@@ -25286,7 +25289,7 @@ cancel_hourglass ()
hide_hourglass ();
#endif
}
-
+#endif /* ! WINDOWSNT */
/* arch-tag: eacc864d-bb6a-4b74-894a-1a4399a1358b
(do not change this comment) */
Please sign in to comment.
Something went wrong with that request. Please try again.