mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
a592125294
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Fixed handling user activity for shutdown, which I had messed when adopting Udo's original patch (thanks to Udo Richter). - Added Turkish language texts (thanks to Oktay Yolgeçen). - Added missing rules for generating iso8859-13 font to Makefile. - 'libsi' now converts the incoming strings into the system's character set according to the DVB standard. The system's character set is determined from the LANG environment variable. If no recognizable setting can be found, no conversion will take place. Note that currently only the strings received from the SI data stream are converted, there have not been any changes regarding displaying UTF-8 characters on the OSD, yet - this will follow in one of the next steps. With this conversion, it should now be safe to run VDR on a UTF-8 file system, because all incoming characters are converted to UTF-8. This will most likely result in wrong characters being displayed on the OSD (because there UTF-8 is not known, yet), but the file names should be ok (haven't tested this myself, though, because I don't do UTF-8 - so please be very careful when testing!). There's one piece of bad news here: the German pay-tv broadcaster Premiere apparently encodes all EPG strings as ISO8859-1, but fails to correctly mark these strings as such. Therefore 'libsi' (following the DVB standard) considers the strings to be encoded in the default ISO6937 and converts them to whatever the system's character set is. This, of course, results in wrong umlauts. On its old transponder, the ProSieben/SAT.1 channels also had their EPG data wrongly encoded, but apparently on the new transponder they started broadcasting on this month, they got it right.
92 lines
2.5 KiB
C++
92 lines
2.5 KiB
C++
/*
|
|
* font.h: Font handling for the DVB On Screen Display
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: font.h 1.15 2007/03/11 09:50:42 kls Exp $
|
|
*/
|
|
|
|
#ifndef __FONT_H
|
|
#define __FONT_H
|
|
|
|
#include <stdint.h>
|
|
#include <stdlib.h>
|
|
|
|
enum eDvbFont {
|
|
fontOsd,
|
|
fontFix,
|
|
fontSml
|
|
#define eDvbFontSize (fontSml + 1)
|
|
};
|
|
|
|
enum eDvbCode {
|
|
code_iso8859_1,
|
|
code_iso8859_2,
|
|
code_iso8859_5,
|
|
code_iso8859_7,
|
|
code_iso8859_9,
|
|
code_iso8859_13,
|
|
code_iso8859_15,
|
|
#define eDvbCodeSize (code_iso8859_15 + 1)
|
|
};
|
|
|
|
class cFont {
|
|
public:
|
|
enum { NUMCHARS = 256 };
|
|
typedef uint32_t tPixelData;
|
|
struct tCharData {
|
|
tPixelData width, height;
|
|
tPixelData lines[1];
|
|
};
|
|
private:
|
|
static eDvbCode code;
|
|
static cFont *fonts[];
|
|
const tCharData *data[NUMCHARS];
|
|
int height;
|
|
public:
|
|
cFont(const void *Data);
|
|
virtual ~cFont() {}
|
|
void SetData(const void *Data);
|
|
virtual int Width(unsigned char c) const { return data[c]->width; }
|
|
///< Returns the width of the given character.
|
|
virtual int Width(const char *s) const;
|
|
///< Returns the width of the given string.
|
|
virtual int Height(unsigned char c) const { return data[c]->height; }
|
|
///< Returns the height of the given character.
|
|
virtual int Height(const char *s) const;
|
|
///< Returns the height of the given string.
|
|
virtual int Height(void) const { return height; }
|
|
///< Returns the height of this font (all characters have the same height).
|
|
const tCharData *CharData(unsigned char c) const { return data[c]; }
|
|
static bool SetCode(const char *Code);
|
|
static void SetCode(eDvbCode Code);
|
|
static void SetFont(eDvbFont Font, const void *Data = NULL);
|
|
static const cFont *GetFont(eDvbFont Font);
|
|
};
|
|
|
|
class cTextWrapper {
|
|
private:
|
|
char *text;
|
|
char *eol;
|
|
int lines;
|
|
int lastLine;
|
|
public:
|
|
cTextWrapper(void);
|
|
cTextWrapper(const char *Text, const cFont *Font, int Width);
|
|
~cTextWrapper();
|
|
void Set(const char *Text, const cFont *Font, int Width);
|
|
///< Wraps the Text to make it fit into the area defined by the given Width
|
|
///< when displayed with the given Font.
|
|
///< Wrapping is done by inserting the necessary number of newline
|
|
///< characters into the string.
|
|
const char *Text(void);
|
|
///< Returns the full wrapped text.
|
|
int Lines(void) { return lines; }
|
|
///< Returns the actual number of lines needed to display the full wrapped text.
|
|
const char *GetLine(int Line);
|
|
///< Returns the given Line. The first line is numbered 0.
|
|
};
|
|
|
|
#endif //__FONT_H
|