From: Stefan Monnier <monnier@iro.umontreal.ca>
To: "Joakim Hårsman" <joakim.harsman@gmail.com>
Cc: 10299@debbugs.gnu.org
Subject: bug#10299: Emacs doesn't handle Unicode characters in keyboard layout on MS Windows
Date: Mon, 23 Jan 2012 20:35:17 -0500 [thread overview]
Message-ID: <jwvty3l3n0r.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <CAFJF9wVcJ+gcOybJF4Cv-s_BUtpUKVZj-OK0qJeQohKZZtbJYA@mail.gmail.com> ("Joakim Hårsman"'s message of "Mon, 23 Jan 2012 20:15:15 +0100")
> I've amended the patch to take your comments into account.
Thank you.
> --- src/w32.h 2011-10-28 09:54:02 +0000
> +++ src/w32.h 2012-01-23 19:10:04 +0000
> @@ -159,5 +159,18 @@
> const void* buf, size_t sz);
> #endif /* HAVE_GNUTLS */
> +#define INIT_WINDOW_CLASS(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; \
> + wc.lpszMenuName = NULL; \
> +
> +
> +
> #endif /* EMACS_W32_H */
Please don't put this macro there: it's not something that's exported to
other files, so it is better to keep it close to where it's used.
> +/* Set text of w32 frame with handle HWND to TEXT.
> +
> + We explicitly switch between the Unicode and ANSI version of
> + SetWindowText because Emacs isn't compiled with UNICODE defined to
> + retain compatibility with Windows 95. */
> +
> +void
> +w32_set_frame_text(HWND hwnd, LPCSTR text)
This should be `static', I think, and with a space before the open-paren.
> + if (os_subtype == OS_NT)
> + result = GetMessageW (&msg, NULL, 0, 0);
> + else
> + result = GetMessage (&msg, NULL, 0, 0);
I'd write it as follows:
result = (os_subtype == OS_NT ? GetMessageW : GetMessage) (&msg, NULL, 0, 0);
other than that, the code looks fine for me (I'll let Windows users
assess whether it actually does what it's meant to do ;-),
Stefan
next prev parent reply other threads:[~2012-01-24 1:35 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-14 20:39 bug#10299: Emacs doesn't handle Unicode characters in keyboard layout on MS Windows Joakim Hårsman
2011-12-15 6:22 ` Eli Zaretskii
2011-12-15 6:51 ` Kenichi Handa
2011-12-15 7:53 ` Joakim Hårsman
2011-12-15 10:52 ` Eli Zaretskii
2011-12-15 11:11 ` Joakim Hårsman
2011-12-15 13:16 ` Eli Zaretskii
2011-12-15 14:40 ` Jason Rumney
2011-12-15 15:08 ` Lennart Borgman
2011-12-15 15:40 ` Joakim Hårsman
2011-12-15 17:34 ` Eli Zaretskii
2011-12-15 20:50 ` Joakim Hårsman
2011-12-15 21:47 ` Joakim Hårsman
2011-12-16 8:13 ` Eli Zaretskii
2011-12-16 11:01 ` Joakim Hårsman
2011-12-16 11:14 ` Dani Moncayo
2011-12-16 11:26 ` Eli Zaretskii
2011-12-17 12:52 ` Joakim Hårsman
2011-12-17 15:23 ` Eli Zaretskii
[not found] ` <CAFJF9wW7Cfmad+BmjQ4A-sVeLi+eRvOXSWfD=--=QJmr3Ver6w@mail.gmail.com>
2011-12-18 18:13 ` Eli Zaretskii
2011-12-19 10:44 ` Joakim Hårsman
2011-12-19 10:59 ` Lennart Borgman
2011-12-19 11:04 ` Joakim Hårsman
2011-12-19 11:17 ` Lennart Borgman
2011-12-19 11:50 ` Joakim Hårsman
2011-12-19 13:31 ` Jason Rumney
2011-12-20 21:16 ` Joakim Hårsman
2012-01-14 16:40 ` Joakim Hårsman
2012-01-16 14:03 ` Stefan Monnier
2012-01-23 19:15 ` Joakim Hårsman
2012-01-24 1:35 ` Stefan Monnier [this message]
2012-01-24 9:40 ` Andreas Schwab
2012-01-24 12:03 ` Juanma Barranquero
2012-01-24 20:42 ` Joakim Hårsman
2012-07-28 14:50 ` Eli Zaretskii
2012-08-06 20:20 ` Joakim Hårsman
2012-08-07 2:53 ` Eli Zaretskii
2012-08-07 19:47 ` Joakim Hårsman
2012-08-08 2:48 ` Eli Zaretskii
2012-08-08 18:54 ` Joakim Hårsman
2012-08-10 6:56 ` Eli Zaretskii
2012-08-07 12:15 ` Jason Rumney
2012-08-07 19:49 ` Joakim Hårsman
2011-12-16 11:22 ` 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=jwvty3l3n0r.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=10299@debbugs.gnu.org \
--cc=joakim.harsman@gmail.com \
/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).