Include <config.h> when possible - continued.
This commit is contained in:
ManoloFLTK
parent
d93fc2bfa6
commit
5f3d8bc634
@ -266,3 +266,103 @@ const char *Fl_Darwin_System_Driver::filename_name( const char *name )
|
||||
}
|
||||
return q;
|
||||
}
|
||||
|
||||
// These function assume a western code page. If you need to support
|
||||
// scripts that are not part of this code page, you might want to
|
||||
// take a look at FLTK2, which uses utf8 for text encoding.
|
||||
//
|
||||
// By keeping these conversion tables in their own module, they will not
|
||||
// be statically linked (by a smart linker) unless actually used.
|
||||
//
|
||||
// On MS-Windows, nothing need to be converted. We simply return the
|
||||
// original pointer.
|
||||
//
|
||||
// Most X11 implementations seem to default to Latin-1 as a code since it
|
||||
// is a superset of ISO 8859-1, the original wetsern codepage on X11.
|
||||
//
|
||||
// Apple's OS X however renders text in MacRoman for western settings. The
|
||||
// lookup tables below will convert all common character codes and replace
|
||||
// unknown characters with an upsidedown question mark.
|
||||
|
||||
// This table converts Windows-1252/Latin 1 into MacRoman encoding
|
||||
static uchar latin2roman[128] = {
|
||||
0xdb, 0xc0, 0xe2, 0xc4, 0xe3, 0xc9, 0xa0, 0xe0, 0xf6, 0xe4, 0xc0, 0xdc, 0xce, 0xc0, 0xc0, 0xc0,
|
||||
0xc0, 0xd4, 0xd5, 0xd2, 0xd3, 0xa5, 0xd0, 0xd1, 0xf7, 0xaa, 0xc0, 0xdd, 0xcf, 0xc0, 0xc0, 0xd9,
|
||||
0xca, 0xc1, 0xa2, 0xa3, 0xc0, 0xb4, 0xc0, 0xa4, 0xac, 0xa9, 0xbb, 0xc7, 0xc2, 0xc0, 0xa8, 0xf8,
|
||||
0xa1, 0xb1, 0xc0, 0xc0, 0xab, 0xb5, 0xa6, 0xe1, 0xfc, 0xc0, 0xbc, 0xc8, 0xc0, 0xc0, 0xc0, 0xc0,
|
||||
0xcb, 0xe7, 0xe5, 0xcc, 0x80, 0x81, 0xae, 0x82, 0xe9, 0x83, 0xe6, 0xe8, 0xed, 0xea, 0xeb, 0xec,
|
||||
0xc0, 0x84, 0xf1, 0xee, 0xef, 0xcd, 0x85, 0xc0, 0xaf, 0xf4, 0xf2, 0xf3, 0x86, 0xc0, 0xc0, 0xa7,
|
||||
0x88, 0x87, 0x89, 0x8b, 0x8a, 0x8c, 0xbe, 0x8d, 0x8f, 0x8e, 0x90, 0x91, 0x93, 0x92, 0x94, 0x95,
|
||||
0xc0, 0x96, 0x98, 0x97, 0x99, 0x9b, 0x9a, 0xd6, 0xbf, 0x9d, 0x9c, 0x9e, 0x9f, 0xc0, 0xc0, 0xd8
|
||||
};
|
||||
|
||||
// This table converts MacRoman into Windows-1252/Latin 1
|
||||
static uchar roman2latin[128] = {
|
||||
0xc4, 0xc5, 0xc7, 0xc9, 0xd1, 0xd6, 0xdc, 0xe1, 0xe0, 0xe2, 0xe4, 0xe3, 0xe5, 0xe7, 0xe9, 0xe8,
|
||||
0xea, 0xeb, 0xed, 0xec, 0xee, 0xef, 0xf1, 0xf3, 0xf2, 0xf4, 0xf6, 0xf5, 0xfa, 0xf9, 0xfb, 0xfc,
|
||||
0x86, 0xb0, 0xa2, 0xa3, 0xa7, 0x95, 0xb6, 0xdf, 0xae, 0xa9, 0x99, 0xb4, 0xa8, 0xbf, 0xc6, 0xd8,
|
||||
0xbf, 0xb1, 0xbf, 0xbf, 0xa5, 0xb5, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xaa, 0xba, 0xbf, 0xe6, 0xf8,
|
||||
0xbf, 0xa1, 0xac, 0xbf, 0x83, 0xbf, 0xbf, 0xab, 0xbb, 0x85, 0xa0, 0xc0, 0xc3, 0xd5, 0x8c, 0x9c,
|
||||
0x96, 0x97, 0x93, 0x94, 0x91, 0x92, 0xf7, 0xbf, 0xff, 0x9f, 0xbf, 0x80, 0x8b, 0x9b, 0xbf, 0xbf,
|
||||
0x87, 0xb7, 0x82, 0x84, 0x89, 0xc2, 0xca, 0xc1, 0xcb, 0xc8, 0xcd, 0xce, 0xcf, 0xcc, 0xd3, 0xd4,
|
||||
0xbf, 0xd2, 0xda, 0xdb, 0xd9, 0xbf, 0x88, 0x98, 0xaf, 0xbf, 0xbf, 0xbf, 0xb8, 0xbf, 0xbf, 0xbf
|
||||
};
|
||||
|
||||
static char *buf = 0;
|
||||
static int n_buf = 0;
|
||||
|
||||
const char *Fl_Darwin_System_Driver::latin1_to_local(const char *t, int n)
|
||||
{
|
||||
if (n==-1) n = strlen(t);
|
||||
if (n<=n_buf) {
|
||||
n_buf = (n + 257) & 0x7fffff00;
|
||||
if (buf) free(buf);
|
||||
buf = (char*)malloc(n_buf);
|
||||
}
|
||||
const uchar *src = (const uchar*)t;
|
||||
uchar *dst = (uchar*)buf;
|
||||
for ( ; n>0; n--) {
|
||||
uchar c = *src++;
|
||||
if (c>127)
|
||||
*dst = latin2roman[c-128];
|
||||
else
|
||||
*dst = c;
|
||||
}
|
||||
//*dst = 0; // this would be wrong!
|
||||
return buf;
|
||||
}
|
||||
|
||||
const char *Fl_Darwin_System_Driver::local_to_latin1(const char *t, int n)
|
||||
{
|
||||
if (n==-1) n = strlen(t);
|
||||
if (n<=n_buf) {
|
||||
n_buf = (n + 257) & 0x7fffff00;
|
||||
if (buf) free(buf);
|
||||
buf = (char*)malloc(n_buf);
|
||||
}
|
||||
const uchar *src = (const uchar*)t;
|
||||
uchar *dst = (uchar*)buf;
|
||||
for ( ; n>0; n--) {
|
||||
uchar c = *src++;
|
||||
if (c>127)
|
||||
*dst++ = roman2latin[c-128];
|
||||
else
|
||||
*dst++ = c;
|
||||
}
|
||||
//*dst = 0; // this would be wrong
|
||||
return buf;
|
||||
}
|
||||
|
||||
// On Mac OS X, nothing need to be converted. We simply return the
|
||||
// original pointer.
|
||||
const char *Fl_Darwin_System_Driver::mac_roman_to_local(const char *t, int)
|
||||
{
|
||||
return t;
|
||||
}
|
||||
|
||||
// On Mac OS X, nothing need to be converted. We simply return the
|
||||
// original pointer.
|
||||
const char *Fl_Darwin_System_Driver::local_to_mac_roman(const char *t, int)
|
||||
{
|
||||
return t;
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Convert Windows-1252 (Latin-1) encoded text to the local encoding.
|
||||
//
|
||||
// Copyright 1998-2016 by Bill Spitzak and others.
|
||||
// Copyright 1998-2021 by Bill Spitzak and others.
|
||||
//
|
||||
// This library is free software. Distribution and use rights are outlined in
|
||||
// the file "COPYING" which should have been included with this file. If this
|
||||
@ -14,7 +14,7 @@
|
||||
// https://www.fltk.org/bugs.php
|
||||
//
|
||||
|
||||
#include "config_lib.h"
|
||||
#include <config.h>
|
||||
#include <FL/fl_draw.H>
|
||||
#include <FL/Fl.H>
|
||||
#include "Fl_System_Driver.H"
|
||||
@ -22,97 +22,6 @@
|
||||
#include <stdlib.h>
|
||||
#include "flstring.h"
|
||||
|
||||
#ifdef FL_CFG_WIN_COCOA
|
||||
#include "drivers/Darwin/Fl_Darwin_System_Driver.H"
|
||||
|
||||
// These function assume a western code page. If you need to support
|
||||
// scripts that are not part of this code page, you might want to
|
||||
// take a look at FLTK2, which uses utf8 for text encoding.
|
||||
//
|
||||
// By keeping these conversion tables in their own module, they will not
|
||||
// be statically linked (by a smart linker) unless actually used.
|
||||
//
|
||||
// On MS-Windows, nothing need to be converted. We simply return the
|
||||
// original pointer.
|
||||
//
|
||||
// Most X11 implementations seem to default to Latin-1 as a code since it
|
||||
// is a superset of ISO 8859-1, the original wetsern codepage on X11.
|
||||
//
|
||||
// Apple's OS X however renders text in MacRoman for western settings. The
|
||||
// lookup tables below will convert all common character codes and replace
|
||||
// unknown characters with an upsidedown question mark.
|
||||
|
||||
// This table converts Windows-1252/Latin 1 into MacRoman encoding
|
||||
static uchar latin2roman[128] = {
|
||||
0xdb, 0xc0, 0xe2, 0xc4, 0xe3, 0xc9, 0xa0, 0xe0, 0xf6, 0xe4, 0xc0, 0xdc, 0xce, 0xc0, 0xc0, 0xc0,
|
||||
0xc0, 0xd4, 0xd5, 0xd2, 0xd3, 0xa5, 0xd0, 0xd1, 0xf7, 0xaa, 0xc0, 0xdd, 0xcf, 0xc0, 0xc0, 0xd9,
|
||||
0xca, 0xc1, 0xa2, 0xa3, 0xc0, 0xb4, 0xc0, 0xa4, 0xac, 0xa9, 0xbb, 0xc7, 0xc2, 0xc0, 0xa8, 0xf8,
|
||||
0xa1, 0xb1, 0xc0, 0xc0, 0xab, 0xb5, 0xa6, 0xe1, 0xfc, 0xc0, 0xbc, 0xc8, 0xc0, 0xc0, 0xc0, 0xc0,
|
||||
0xcb, 0xe7, 0xe5, 0xcc, 0x80, 0x81, 0xae, 0x82, 0xe9, 0x83, 0xe6, 0xe8, 0xed, 0xea, 0xeb, 0xec,
|
||||
0xc0, 0x84, 0xf1, 0xee, 0xef, 0xcd, 0x85, 0xc0, 0xaf, 0xf4, 0xf2, 0xf3, 0x86, 0xc0, 0xc0, 0xa7,
|
||||
0x88, 0x87, 0x89, 0x8b, 0x8a, 0x8c, 0xbe, 0x8d, 0x8f, 0x8e, 0x90, 0x91, 0x93, 0x92, 0x94, 0x95,
|
||||
0xc0, 0x96, 0x98, 0x97, 0x99, 0x9b, 0x9a, 0xd6, 0xbf, 0x9d, 0x9c, 0x9e, 0x9f, 0xc0, 0xc0, 0xd8
|
||||
};
|
||||
|
||||
// This table converts MacRoman into Windows-1252/Latin 1
|
||||
static uchar roman2latin[128] = {
|
||||
0xc4, 0xc5, 0xc7, 0xc9, 0xd1, 0xd6, 0xdc, 0xe1, 0xe0, 0xe2, 0xe4, 0xe3, 0xe5, 0xe7, 0xe9, 0xe8,
|
||||
0xea, 0xeb, 0xed, 0xec, 0xee, 0xef, 0xf1, 0xf3, 0xf2, 0xf4, 0xf6, 0xf5, 0xfa, 0xf9, 0xfb, 0xfc,
|
||||
0x86, 0xb0, 0xa2, 0xa3, 0xa7, 0x95, 0xb6, 0xdf, 0xae, 0xa9, 0x99, 0xb4, 0xa8, 0xbf, 0xc6, 0xd8,
|
||||
0xbf, 0xb1, 0xbf, 0xbf, 0xa5, 0xb5, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xaa, 0xba, 0xbf, 0xe6, 0xf8,
|
||||
0xbf, 0xa1, 0xac, 0xbf, 0x83, 0xbf, 0xbf, 0xab, 0xbb, 0x85, 0xa0, 0xc0, 0xc3, 0xd5, 0x8c, 0x9c,
|
||||
0x96, 0x97, 0x93, 0x94, 0x91, 0x92, 0xf7, 0xbf, 0xff, 0x9f, 0xbf, 0x80, 0x8b, 0x9b, 0xbf, 0xbf,
|
||||
0x87, 0xb7, 0x82, 0x84, 0x89, 0xc2, 0xca, 0xc1, 0xcb, 0xc8, 0xcd, 0xce, 0xcf, 0xcc, 0xd3, 0xd4,
|
||||
0xbf, 0xd2, 0xda, 0xdb, 0xd9, 0xbf, 0x88, 0x98, 0xaf, 0xbf, 0xbf, 0xbf, 0xb8, 0xbf, 0xbf, 0xbf
|
||||
};
|
||||
|
||||
static char *buf = 0;
|
||||
static int n_buf = 0;
|
||||
|
||||
const char *Fl_Darwin_System_Driver::latin1_to_local(const char *t, int n)
|
||||
{
|
||||
if (n==-1) n = strlen(t);
|
||||
if (n<=n_buf) {
|
||||
n_buf = (n + 257) & 0x7fffff00;
|
||||
if (buf) free(buf);
|
||||
buf = (char*)malloc(n_buf);
|
||||
}
|
||||
const uchar *src = (const uchar*)t;
|
||||
uchar *dst = (uchar*)buf;
|
||||
for ( ; n>0; n--) {
|
||||
uchar c = *src++;
|
||||
if (c>127)
|
||||
*dst = latin2roman[c-128];
|
||||
else
|
||||
*dst = c;
|
||||
}
|
||||
//*dst = 0; // this would be wrong!
|
||||
return buf;
|
||||
}
|
||||
|
||||
const char *Fl_Darwin_System_Driver::local_to_latin1(const char *t, int n)
|
||||
{
|
||||
if (n==-1) n = strlen(t);
|
||||
if (n<=n_buf) {
|
||||
n_buf = (n + 257) & 0x7fffff00;
|
||||
if (buf) free(buf);
|
||||
buf = (char*)malloc(n_buf);
|
||||
}
|
||||
const uchar *src = (const uchar*)t;
|
||||
uchar *dst = (uchar*)buf;
|
||||
for ( ; n>0; n--) {
|
||||
uchar c = *src++;
|
||||
if (c>127)
|
||||
*dst++ = roman2latin[c-128];
|
||||
else
|
||||
*dst++ = c;
|
||||
}
|
||||
//*dst = 0; // this would be wrong
|
||||
return buf;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/**
|
||||
\cond DriverDev
|
||||
\addtogroup DriverDeveloper
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Convert Mac Roman encoded text to the local encoding.
|
||||
//
|
||||
// Copyright 1998-2016 by Bill Spitzak and others.
|
||||
// Copyright 1998-2021 by Bill Spitzak and others.
|
||||
//
|
||||
// This library is free software. Distribution and use rights are outlined in
|
||||
// the file "COPYING" which should have been included with this file. If this
|
||||
@ -14,7 +14,7 @@
|
||||
// https://www.fltk.org/bugs.php
|
||||
//
|
||||
|
||||
#include "config_lib.h"
|
||||
#include <config.h>
|
||||
#include <FL/fl_draw.H>
|
||||
#include "Fl_System_Driver.H"
|
||||
#include <FL/Fl.H>
|
||||
@ -22,31 +22,18 @@
|
||||
#include <stdlib.h>
|
||||
#include "flstring.h"
|
||||
|
||||
/**
|
||||
\cond DriverDev
|
||||
\addtogroup DriverDeveloper
|
||||
\{
|
||||
*/
|
||||
|
||||
// These function assume a western code page.
|
||||
//
|
||||
// On Mac OS X, nothing need to be converted. We simply return the
|
||||
// original pointer.
|
||||
//
|
||||
// Windows and X11 render text in ISO or Latin-1 for western settings. The
|
||||
// lookup tables below will convert all common character codes and replace
|
||||
// unknown characters with an upsidedown question mark.
|
||||
|
||||
#ifdef FL_CFG_WIN_COCOA
|
||||
|
||||
# include "drivers/Darwin/Fl_Darwin_System_Driver.H"
|
||||
|
||||
const char *Fl_Darwin_System_Driver::mac_roman_to_local(const char *t, int)
|
||||
{
|
||||
return t;
|
||||
}
|
||||
|
||||
const char *Fl_Darwin_System_Driver::local_to_mac_roman(const char *t, int)
|
||||
{
|
||||
return t;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
// This table converts Windows-1252/Latin 1 into MacRoman encoding
|
||||
static uchar latin2roman[128] = {
|
||||
0xdb, 0xc0, 0xe2, 0xc4, 0xe3, 0xc9, 0xa0, 0xe0, 0xf6, 0xe4, 0xc0, 0xdc, 0xce, 0xc0, 0xc0, 0xc0,
|
||||
@ -74,12 +61,6 @@ static uchar roman2latin[128] = {
|
||||
static char *buf = 0;
|
||||
static int n_buf = 0;
|
||||
|
||||
/**
|
||||
\cond DriverDev
|
||||
\addtogroup DriverDeveloper
|
||||
\{
|
||||
*/
|
||||
|
||||
const char *Fl_System_Driver::local_to_mac_roman(const char *t, int n)
|
||||
{
|
||||
if (n==-1) n = (int) strlen(t);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user