ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the correct display for cached metrics file name.

Browse Source 
Store metrics in specified config dir.
This commit is contained in:
Alexandre Julliard 2000-05-15 02:47:25 +00:00
parent 8e3e6b5452
commit adcf7b455f
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
graphics/x11drv/xfont.c
View File

@ -34,8 +34,9 @@
#include "ldt.h" #include "ldt.h"
#include "tweak.h" #include "tweak.h"
#include "x11font.h" #include "x11font.h"
#include "server.h"
DEFAULT_DEBUG_CHANNEL(font) DEFAULT_DEBUG_CHANNEL(font);
#define X_PFONT_MAGIC (0xFADE0000) #define X_PFONT_MAGIC (0xFADE0000)
#define X_FMC_MAGIC (0x0000CAFE) #define X_FMC_MAGIC (0x0000CAFE)
@ -72,7 +73,6 @@ TC_CP_STROKE | TC_CR_ANY |
/* X11R6 adds TC_SF_X_YINDEP, maybe more... */ /* X11R6 adds TC_SF_X_YINDEP, maybe more... */
static const char* INIWinePrefix = "/.wine";
static const char* INIFontMetrics = "/cachedmetrics."; static const char* INIFontMetrics = "/cachedmetrics.";
static const char* INIFontSection = "fonts"; static const char* INIFontSection = "fonts";
static const char* INIAliasSection = "Alias"; static const char* INIAliasSection = "Alias";
@ -1684,22 +1684,18 @@ static void XFONT_LoadIgnores(void)
*/ */
static char* XFONT_UserMetricsCache( char* buffer, int* buf_size ) static char* XFONT_UserMetricsCache( char* buffer, int* buf_size )
{ {
char* pchDisplay, *home; const char *confdir = get_config_dir();
const char *display_name = Options.display;
int len = strlen(confdir) + strlen(INIFontMetrics) + strlen(display_name) + 2;
pchDisplay = getenv( "DISPLAY" ); if ((len > *buf_size) &&
if( !pchDisplay ) pchDisplay = "0"; !(buffer = HeapReAlloc( GetProcessHeap(), 0, buffer, *buf_size = len )))
if ((home = getenv( "HOME" )) != NULL)
{ {
int i = strlen( home ) + strlen( INIWinePrefix ) + ERR("out of memory\n");
strlen( INIFontMetrics ) + strlen( pchDisplay ) + 2; ExitProcess(1);
if( i > *buf_size ) }
buffer = (char*) HeapReAlloc( GetProcessHeap(), 0, buffer, *buf_size = i );
strcpy( buffer, home ); sprintf( buffer, "%s/%s%s", confdir, INIFontMetrics, display_name );
strcat( buffer, INIWinePrefix );
strcat( buffer, INIFontMetrics );
strcat( buffer, pchDisplay );
} else buffer[0] = '\0';
return buffer; return buffer;
} }