Mercurial > hg > xemacs-beta
comparison src/font-mgr.c @ 4834:b3ea9c582280
Use new cygwin_conv_path API with Cygwin 1.7 for converting names between Win32 and POSIX, UTF-8-aware, with attendant changes elsewhere
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Tue, 12 Jan 2010 01:38:04 -0600 |
parents | 0d3ccd5a2509 |
children | 5eacb04a2e62 |
comparison
equal
deleted
inserted
replaced
4833:4dd2389173fc | 4834:b3ea9c582280 |
---|---|
780 { | 780 { |
781 CHECK_FCCONFIG (config); | 781 CHECK_FCCONFIG (config); |
782 CHECK_STRING (file); | 782 CHECK_STRING (file); |
783 if (FcConfigAppFontAddFile | 783 if (FcConfigAppFontAddFile |
784 (XFCCONFIG_PTR (config), | 784 (XFCCONFIG_PTR (config), |
785 /* #### FIXME! is this really Qnative? */ | 785 /* #### FIXME! is Qfile_name right? */ |
786 (FcChar8 *) NEW_LISP_STRING_TO_EXTERNAL ((file), Qnative)) == FcFalse) | 786 (FcChar8 *) NEW_LISP_STRING_TO_EXTERNAL (file, Qfile_name) == FcFalse) |
787 return Qnil; | 787 return Qnil; |
788 else | 788 else |
789 return Qt; | 789 return Qt; |
790 } | 790 } |
791 | 791 |
799 { | 799 { |
800 CHECK_FCCONFIG (config); | 800 CHECK_FCCONFIG (config); |
801 CHECK_STRING (dir); | 801 CHECK_STRING (dir); |
802 if (FcConfigAppFontAddDir | 802 if (FcConfigAppFontAddDir |
803 (XFCCONFIG_PTR (config), | 803 (XFCCONFIG_PTR (config), |
804 /* #### FIXME! is this really Qnative? */ | 804 /* #### FIXME! is Qfile_name right? */ |
805 (FcChar8 *) NEW_LISP_STRING_TO_EXTERNAL ((dir), Qnative)) == FcFalse) | 805 (FcChar8 *) NEW_LISP_STRING_TO_EXTERNAL (dir), Qfile_name) == FcFalse) |
806 return Qnil; | 806 return Qnil; |
807 else | 807 else |
808 return Qt; | 808 return Qt; |
809 } | 809 } |
810 | 810 |
842 char *fcname = ""; | 842 char *fcname = ""; |
843 | 843 |
844 if (!NILP (name)) | 844 if (!NILP (name)) |
845 { | 845 { |
846 CHECK_STRING (name); | 846 CHECK_STRING (name); |
847 /* #### FIXME! is this really Qnative? */ | 847 /* #### FIXME! is Qfile_name right? */ |
848 fcname = NEW_LISP_STRING_TO_EXTERNAL (name, Qnative); | 848 fcname = NEW_LISP_STRING_TO_EXTERNAL (name, Qfile_name); |
849 } | 849 } |
850 return (build_fcapi_string (FcConfigFilename ((FcChar8 *) fcname))); | 850 return (build_fcapi_string (FcConfigFilename ((FcChar8 *) fcname))); |
851 } | 851 } |
852 | 852 |
853 DEFUN("fc-init-load-config", Ffc_init_load_config, 0, 0, 0, /* | 853 DEFUN("fc-init-load-config", Ffc_init_load_config, 0, 0, 0, /* |