From: Dmitry Antipov <dmantipov@yandex.ru>
To: Emacs development discussions <emacs-devel@gnu.org>
Subject: w32 hourglass cursor
Date: Thu, 03 Jul 2014 14:35:02 +0400 [thread overview]
Message-ID: <53B531D6.4000207@yandex.ru> (raw)
[-- Attachment #1: Type: text/plain, Size: 120 bytes --]
Can someone test this small cleanup with trunk on MS-Windows?
This looks correct, but I can't verify it myself.
Dmitry
[-- Attachment #2: w32_hourglass_cursor.patch --]
[-- Type: text/x-patch, Size: 1198 bytes --]
=== modified file 'src/w32fns.c'
--- src/w32fns.c 2014-06-29 16:12:08 +0000
+++ src/w32fns.c 2014-07-03 10:28:58 +0000
@@ -5501,27 +5501,13 @@
***********************************************************************/
void
-w32_note_current_window (void)
-{
- struct frame * f = SELECTED_FRAME ();
-
- if (!FRAME_W32_P (f))
- return;
-
- hourglass_hwnd = FRAME_W32_WINDOW (f);
-}
-
-void
show_hourglass (struct atimer *timer)
{
- struct frame *f;
+ struct frame *f = (struct frame *) timer->client_data;
hourglass_atimer = NULL;
block_input ();
- f = x_window_to_frame (&one_w32_display_info,
- hourglass_hwnd);
-
if (f)
f->output_data.w32->hourglass_p = 0;
else
=== modified file 'src/xdisp.c'
--- src/xdisp.c 2014-07-03 06:00:53 +0000
+++ src/xdisp.c 2014-07-03 10:29:14 +0000
@@ -30683,15 +30683,8 @@
else
delay = make_timespec (DEFAULT_HOURGLASS_DELAY, 0);
-#ifdef HAVE_NTGUI
- {
- extern void w32_note_current_window (void);
- w32_note_current_window ();
- }
-#endif /* HAVE_NTGUI */
-
hourglass_atimer = start_atimer (ATIMER_RELATIVE, delay,
- show_hourglass, NULL);
+ show_hourglass, SELECTED_FRAME ());
}
next reply other threads:[~2014-07-03 10:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-03 10:35 Dmitry Antipov [this message]
2014-07-03 16:18 ` w32 hourglass cursor Dani Moncayo
2014-07-03 16:30 ` Dmitry Antipov
2014-07-03 17:07 ` Dani Moncayo
2014-07-03 17:33 ` Dmitry Antipov
2014-07-03 17:53 ` Dani Moncayo
2014-07-03 18:15 ` Dmitry Antipov
2014-07-03 16:42 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53B531D6.4000207@yandex.ru \
--to=dmantipov@yandex.ru \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).