From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#10299: Emacs doesn't handle Unicode characters in keyboard layout on MS Windows Date: Mon, 16 Jan 2012 09:03:17 -0500 Message-ID: References: <8739clgapc.fsf@gnu.org> <83zket20xw.fsf@gnu.org> <83vcph0w9t.fsf@gnu.org> <83obv821wv.fsf@gnu.org> <831us31atj.fsf@gnu.org> <83pqflzr1d.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1326722668 26652 80.91.229.12 (16 Jan 2012 14:04:28 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 16 Jan 2012 14:04:28 +0000 (UTC) Cc: 10299@debbugs.gnu.org To: Joakim =?UTF-8?Q?H=C3=A5rsman?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Jan 16 15:04:24 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RmnAd-0006w1-I1 for geb-bug-gnu-emacs@m.gmane.org; Mon, 16 Jan 2012 15:04:23 +0100 Original-Received: from localhost ([::1]:57707 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RmnAc-0001zh-PB for geb-bug-gnu-emacs@m.gmane.org; Mon, 16 Jan 2012 09:04:22 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:36019) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RmnAV-0001zH-H6 for bug-gnu-emacs@gnu.org; Mon, 16 Jan 2012 09:04:21 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RmnAO-0001tK-NS for bug-gnu-emacs@gnu.org; Mon, 16 Jan 2012 09:04:15 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:36956) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RmnAO-0001t7-Lr for bug-gnu-emacs@gnu.org; Mon, 16 Jan 2012 09:04:08 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1RmnBG-0007av-A7 for bug-gnu-emacs@gnu.org; Mon, 16 Jan 2012 09:05:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 16 Jan 2012 14:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 10299 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 10299-submit@debbugs.gnu.org id=B10299.132672265429130 (code B ref 10299); Mon, 16 Jan 2012 14:05:02 +0000 Original-Received: (at 10299) by debbugs.gnu.org; 16 Jan 2012 14:04:14 +0000 Original-Received: from localhost ([127.0.0.1]:59862 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RmnAT-0007Zn-SC for submit@debbugs.gnu.org; Mon, 16 Jan 2012 09:04:14 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:24799) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RmnAS-0007Zg-Hx for 10299@debbugs.gnu.org; Mon, 16 Jan 2012 09:04:12 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av8EAJotFE9FxKkV/2dsb2JhbABCqweBJYEKgQaBcgEBBVYjEAs0EhQYDSS9WoldAgEBCAIMEQMJAQEGAQUeCgQBAgEBCAEBAQECgngBBgIDBwEEAQEBAYQNBIg7mmOEUg X-IronPort-AV: E=Sophos;i="4.71,518,1320642000"; d="scan'208";a="156987134" Original-Received: from 69-196-169-21.dsl.teksavvy.com (HELO ceviche.home) ([69.196.169.21]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 16 Jan 2012 09:03:17 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id 433DB6610D; Mon, 16 Jan 2012 09:03:17 -0500 (EST) In-Reply-To: ("Joakim =?UTF-8?Q?H=C3=A5rsman?="'s message of "Sat, 14 Jan 2012 17:40:51 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:55785 Archived-At: Note: I know very little about w32. > - SetWindowText (FRAME_W32_WINDOW (f), SDATA (name)); > + if (os_subtype == OS_NT) > + SetWindowTextW (FRAME_W32_WINDOW (f), SDATA (name)); > + else > + SetWindowText (FRAME_W32_WINDOW (f), SDATA (name)); Can we move the test elsewhere by defining (or #defining) our own SetWindowText which uses either of the two? > @@ -1785,20 +1791,39 @@ > static BOOL > w32_init_class (HINSTANCE hinst) > { > - WNDCLASS wc; > - > - wc.style = CS_HREDRAW | CS_VREDRAW; > - wc.lpfnWndProc = (WNDPROC) w32_wnd_proc; > - wc.cbClsExtra = 0; > - wc.cbWndExtra = WND_EXTRA_BYTES; > - wc.hInstance = hinst; > - wc.hIcon = LoadIcon (hinst, EMACS_CLASS); > - wc.hCursor = w32_load_cursor (IDC_ARROW); > - wc.hbrBackground = NULL; /* GetStockObject (WHITE_BRUSH); */ > - wc.lpszMenuName = NULL; > - wc.lpszClassName = EMACS_CLASS; > - > - return (RegisterClass (&wc)); > + WNDCLASSW uwc; > + WNDCLASS wc; > + > + if (os_subtype == OS_NT) > + { > + uwc.style = CS_HREDRAW | CS_VREDRAW; > + uwc.lpfnWndProc = (WNDPROC) w32_wnd_proc; > + uwc.cbClsExtra = 0; > + uwc.cbWndExtra = WND_EXTRA_BYTES; > + uwc.hInstance = hinst; > + uwc.hIcon = LoadIcon (hinst, EMACS_CLASS); > + uwc.hCursor = w32_load_cursor (IDC_ARROW); > + uwc.hbrBackground = NULL; /* GetStockObject (WHITE_BRUSH); */ > + uwc.lpszMenuName = NULL; > + uwc.lpszClassName = L"Emacs"; > + > + return (RegisterClassW (&uwc)); > + } > + else > + { > + wc.style = CS_HREDRAW | CS_VREDRAW; > + wc.lpfnWndProc = (WNDPROC) w32_wnd_proc; > + wc.cbClsExtra = 0; > + wc.cbWndExtra = WND_EXTRA_BYTES; > + wc.hInstance = hinst; > + wc.hIcon = LoadIcon (hinst, EMACS_CLASS); > + wc.hCursor = w32_load_cursor (IDC_ARROW); > + wc.hbrBackground = NULL; /* GetStockObject (WHITE_BRUSH); */ > + wc.lpszMenuName = NULL; > + wc.lpszClassName = EMACS_CLASS; > + > + return (RegisterClass (&wc)); > + } > } The two var declarations (WNDCLASSW uwc and WNDCLASS wc) should be moved within their respective branch. And it'd be better if we could share some code between the two branches, e.g. using a macro. Stefan