Emacs-unicode-2: w32_font_match

Emacs-unicode-2: w32_font_match

[KOBAYASHI Yasuhiro]

[-- Attachment #1: Type: text/plain, Size: 1605 bytes --]

It seems that w32_font_match() dose't work correctly in the
case of using font name with multibyte in emacs-unicode-2.

The variable 'encoded_font_name' may include the charactor
'-', then 'xlfd_strip_height (font_name_copy)' return -1, so
I think that string_make_unibyte should not be used.

For example:
(create-fontset-from-fontset-spec
 "-*-Courier New-normal-r-*-*-12-*-*-*-c-*-fontset-TTG12c,
 japanese-jisx0208:-*-ＭＳ ゴシック-*-*-*-*-*-*-*-*-*-*-jisx0208-sjis,
 latin-jisx0201:-*-ＭＳ ゴシック-*-*-*-*-*-*-*-*-*-*-jisx0208-sjis,
 katakana-jisx0201:-*-ＭＳ ゴシック-*-*-*-*-*-*-*-*-*-*-jisx0208-sjis" t)

(gdb) b  w32_font_match
Breakpoint 4, w32_font_match (fontname=0x83e020 "-outline-?ｭ?ｳ 綵202ｴ綵202ｷ綵203\203綵202ｯ-normal-r-normal-normal-12-90-96-96-c-*-jisx0208-sjis", pattern=0x2dcc9b0 "-outline-hgp藹211ｵ鐔213ｱ隗\222?ｺ?\236?ｼ?ｯ?ｸub-normal-r-normal-normal-12-*-96-96-p-*-jisx0208-sjis") at w32fns.c:5809
(gdb) p encoded_font_name 
$3 = 35884144
(gdb) xstring 
$4 = (struct Lisp_String *) 0x2238c70
"-outline--3 ｴｷﾃｯ-normal-r-normal-normal-12-90-96-96-c-*-jisx0208-sjis"

The attached patch use fast_string_match for comparing
font names, just like

2004-10-18  Kenichi Handa  <handa@m17n.org>

	* fontset.c (fs_load_font): Use fast_string_match_ignore_case for
	comparing font names.
	(fs_query_fontset): Use fast_string_match for comparing fontset names.
	(list_fontsets): Likewise.

	* search.c (fast_string_match_ignore_case): New function.

	* lisp.h (fast_string_match_ignore_case): Extern it.


-- 
KOBAYASHI Yasuhiro <kobayays@otsukakj.co.jp>

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: w32fns.c --]
[-- Type: text/x-patch, Size: 1259 bytes --]

Index: src/w32fns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32fns.c,v
retrieving revision 1.219.2.11
diff -u -r1.219.2.11 w32fns.c
--- src/w32fns.c	22 Oct 2004 10:13:34 -0000	1.219.2.11
+++ src/w32fns.c	1 Nov 2004 15:41:37 -0000
@@ -5667,14 +5667,12 @@
     char * fontname;
     char * pattern;
 {
-  char *font_name_copy;
-  char *ptr;
-  Lisp_Object encoded_font_name;
   char *regex = alloca (strlen (pattern) * 2 + 3);
+  char *font_name_copy = alloca (strlen (fontname) + 1);
+  char *ptr;
 
-  /* Convert fontname to unibyte for match.  */
-  encoded_font_name = string_make_unibyte (build_string (fontname));
-  font_name_copy = SDATA (encoded_font_name);
+   /* Copy fontname so we can modify it during comparison.  */
+  strcpy (font_name_copy, fontname);
 
   ptr = regex;
   *ptr++ = '^';
@@ -5712,8 +5710,8 @@
       return FALSE;
   }
 
-  return (fast_c_string_match_ignore_case (build_string (regex),
-                                           font_name_copy) >= 0);
+  return (fast_string_match_ignore_case (build_string (regex),
+                                         build_string (fontname)) >= 0);
 }
 
 /* Callback functions, and a structure holding info they need, for

[-- Attachment #3: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel

Re: Emacs-unicode-2: w32_font_match

[Jason Rumney]

KOBAYASHI Yasuhiro <kobayays@otsukakj.co.jp> writes:

> The attached patch use fast_string_match for comparing
> font names.

Thank you, I installed it.

-  return (fast_c_string_match_ignore_case (build_string (regex),
-                                           font_name_copy) >= 0);
+  return (fast_string_match_ignore_case (build_string (regex),
+                                         build_string (fontname)) >= 0);

Shouldn't that last line be "build_string (font_name_copy)) >= 0);"?

Otherwise you create font_name_copy, modify it, then never use it.