comparison src/glyphs.c @ 2526:902d5bd9b75c

[xemacs-hg @ 2005-01-28 02:36:11 by ben] Support symlinks under Windows nt.c, fileio.c: Fix sync comments. config.h.in, dired-msw.c, emacs.c, event-msw.c, fileio.c, glyphs.c, lisp.h, nt.c, process-nt.c, realpath.c, sound.c, symsinit.h, sysdep.c, sysfile.h, syswindows.h, win32.c: Add support for treating shortcuts under Windows as symbolic links. Enabled with mswindows-shortcuts-are-links (t by default). Rewrite lots of places to use PATHNAME_CONVERT_OUT, which is moved to sysfile.h. Add PATHNAME_RESOLVE_LINKS, which only does things under Windows. Add profiling section for expand_file_name calls. nt.c, sysdep.c: Unicode-ize. realpath.c: Renamed from readlink_and_correct_case. Fix some problems with Windows implementation due to incorrect understanding of workings of the function. sound.c, ntplay.c, sound.h: Rename play_sound_file to nt_play_sound_file and pass internally-formatted data to it to avoid converting out and back again. text.h: is_c -> is_ascii.
author ben
date Fri, 28 Jan 2005 02:36:28 +0000
parents 3d8143fc88e1
children 9f70af3ac939
comparison
equal deleted inserted replaced
2525:52f00344a629 2526:902d5bd9b75c
1 /* Generic glyph/image implementation + display tables 1 /* Generic glyph/image implementation + display tables
2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. 2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
3 Copyright (C) 1995 Tinker Systems 3 Copyright (C) 1995 Tinker Systems
4 Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing 4 Copyright (C) 1995, 1996, 2000, 2001, 2002, 2004 Ben Wing
5 Copyright (C) 1995 Sun Microsystems 5 Copyright (C) 1995 Sun Microsystems
6 Copyright (C) 1998, 1999, 2000 Andy Piper 6 Copyright (C) 1998, 1999, 2000 Andy Piper
7 7
8 This file is part of XEmacs. 8 This file is part of XEmacs.
9 9
2915 } 2915 }
2916 #else 2916 #else
2917 Lisp_Object 2917 Lisp_Object
2918 pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid) 2918 pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid)
2919 { 2919 {
2920 char **data; 2920 Ascbyte **data;
2921 int result; 2921 int result;
2922 char *fname = 0; 2922 Extbyte *fname = 0;
2923 2923 Ibyte *resolved;
2924 LISP_STRING_TO_EXTERNAL (name, fname, Qfile_name); 2924
2925 LISP_PATHNAME_RESOLVE_LINKS (name, resolved);
2926 C_STRING_TO_EXTERNAL (resolved, fname, Qfile_name);
2925 result = XpmReadFileToData (fname, &data); 2927 result = XpmReadFileToData (fname, &data);
2926 2928
2927 if (result == XpmSuccess) 2929 if (result == XpmSuccess)
2928 { 2930 {
2929 Lisp_Object retval = Qnil; 2931 Lisp_Object retval = Qnil;