From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Antipov Newsgroups: gmane.emacs.devel Subject: w32 hourglass cursor Date: Thu, 03 Jul 2014 14:35:02 +0400 Message-ID: <53B531D6.4000207@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------070700080400080706070901" X-Trace: ger.gmane.org 1404383734 22603 80.91.229.3 (3 Jul 2014 10:35:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 3 Jul 2014 10:35:34 +0000 (UTC) To: Emacs development discussions Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 03 12:35:26 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1X2eMM-0001Y0-6D for ged-emacs-devel@m.gmane.org; Thu, 03 Jul 2014 12:35:22 +0200 Original-Received: from localhost ([::1]:58963 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X2eML-0003Jk-Q3 for ged-emacs-devel@m.gmane.org; Thu, 03 Jul 2014 06:35:21 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X2eMC-0003Hk-1y for emacs-devel@gnu.org; Thu, 03 Jul 2014 06:35:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X2eM4-0000fX-Aj for emacs-devel@gnu.org; Thu, 03 Jul 2014 06:35:11 -0400 Original-Received: from forward5l.mail.yandex.net ([84.201.143.138]:34089) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X2eM3-0000dO-TA for emacs-devel@gnu.org; Thu, 03 Jul 2014 06:35:04 -0400 Original-Received: from smtp2h.mail.yandex.net (smtp2h.mail.yandex.net [84.201.187.145]) by forward5l.mail.yandex.net (Yandex) with ESMTP id E67EDC413F2 for ; Thu, 3 Jul 2014 14:35:02 +0400 (MSK) Original-Received: from smtp2h.mail.yandex.net (localhost [127.0.0.1]) by smtp2h.mail.yandex.net (Yandex) with ESMTP id A42F217044F1 for ; Thu, 3 Jul 2014 14:35:02 +0400 (MSK) Original-Received: from unknown (unknown [37.139.80.10]) by smtp2h.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id vNzCwOsKGc-Z2DCWlbI; Thu, 3 Jul 2014 14:35:02 +0400 (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client certificate not present) X-Yandex-Uniq: 8ba6e075-dc38-401e-94c8-d3d95c239393 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1404383702; bh=VtA4tEglvnDxddAxCfjpmVmE7b5R7Z5vKIUi2x4dmUY=; h=Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: Content-Type; b=oO3bpgj01AIGngwJ7tFSpucNk+jo83f33ABojXalRzTnCFcbaFC2egy0qZI66+6jp INaRrKjP3Bm4GoRm1gMN3TMlsZ2h+Tf8SJsluAudRztFutj9Dr/00H/7GC/L0Uc7xU r6Sa0wpCWkotjn856oQhagY95wQqtWiMUFYmUH7Q= Authentication-Results: smtp2h.mail.yandex.net; dkim=pass header.i=@yandex.ru User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 84.201.143.138 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:172859 Archived-At: This is a multi-part message in MIME format. --------------070700080400080706070901 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Can someone test this small cleanup with trunk on MS-Windows? This looks correct, but I can't verify it myself. Dmitry --------------070700080400080706070901 Content-Type: text/x-patch; name="w32_hourglass_cursor.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="w32_hourglass_cursor.patch" === 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 ()); } --------------070700080400080706070901--