comparison src/w32bdf.c @ 89583:01eb71b7bb3f

(w32_load_bdf_font): Clear font_info before filling. encoding becomes encoding_type.
author Jason Rumney <jasonr@gnu.org>
date Sat, 11 Oct 2003 22:18:29 +0000
parents 2f877ed80fa6
children 68c22ea6027c
comparison
equal deleted inserted replaced
89582:25001d51c9f5 89583:01eb71b7bb3f
199 fontp->registry = get_quoted_string(p, q); 199 fontp->registry = get_quoted_string(p, q);
200 } 200 }
201 else if (search_file_line("CHARSET_ENCODING", start, len, 201 else if (search_file_line("CHARSET_ENCODING", start, len,
202 (char **)&p, (char **)&q) == 1) 202 (char **)&p, (char **)&q) == 1)
203 { 203 {
204 fontp->encoding = get_quoted_string(p, q); 204 fontp->encoding = get_quoted_string(p, q);
205 } 205 }
206 else if (search_file_line("SLANT", start, len, 206 else if (search_file_line("SLANT", start, len,
207 (char **)&p, (char **)&q) == 1) 207 (char **)&p, (char **)&q) == 1)
208 { 208 {
209 fontp->slant = get_quoted_string(p, q); 209 fontp->slant = get_quoted_string(p, q);
766 766
767 fontp = dpyinfo->font_table + dpyinfo->n_fonts; 767 fontp = dpyinfo->font_table + dpyinfo->n_fonts;
768 768
769 /* Now fill in the slots of *FONTP. */ 769 /* Now fill in the slots of *FONTP. */
770 BLOCK_INPUT; 770 BLOCK_INPUT;
771 bzero (fontp, sizeof (*fontp));
771 fontp->font = font; 772 fontp->font = font;
772 fontp->font_idx = dpyinfo->n_fonts; 773 fontp->font_idx = dpyinfo->n_fonts;
773 fontp->name = (char *) xmalloc (strlen (fontname) + 1); 774 fontp->name = (char *) xmalloc (strlen (fontname) + 1);
774 bcopy (fontname, fontp->name, strlen (fontname) + 1); 775 bcopy (fontname, fontp->name, strlen (fontname) + 1);
775 fontp->full_name = fontp->name; 776 fontp->full_name = fontp->name;
783 0:0x2020..0x7F7F, 1:0xA0A0..0xFFFF, 3:0x20A0..0x7FFF, or 784 0:0x2020..0x7F7F, 1:0xA0A0..0xFFFF, 3:0x20A0..0x7FFF, or
784 2:0xA020..0xFF7F). For the moment, we don't know which charset 785 2:0xA020..0xFF7F). For the moment, we don't know which charset
785 uses this font. So, we set informatoin in fontp->encoding[1] 786 uses this font. So, we set informatoin in fontp->encoding[1]
786 which is never used by any charset. If mapping can't be 787 which is never used by any charset. If mapping can't be
787 decided, set FONT_ENCODING_NOT_DECIDED. */ 788 decided, set FONT_ENCODING_NOT_DECIDED. */
788 fontp->encoding[1] = FONT_ENCODING_NOT_DECIDED; 789 fontp->encoding_type = FONT_ENCODING_NOT_DECIDED;
789 fontp->baseline_offset = bdf_font->yoffset; 790 fontp->baseline_offset = bdf_font->yoffset;
790 fontp->relative_compose = bdf_font->relative_compose; 791 fontp->relative_compose = bdf_font->relative_compose;
791 fontp->default_ascent = bdf_font->default_ascent; 792 fontp->default_ascent = bdf_font->default_ascent;
792 793
793 /* Set global flag fonts_changed_p to non-zero if the font loaded 794 /* Set global flag fonts_changed_p to non-zero if the font loaded