mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
VDR developer version 1.7.38 is now available at
ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.38.tar.bz2
A 'diff' against the previous version is available at
ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.37-1.7.38.diff
MD5 checksums:
f4ef0f60ed662f3c983a830da67df9b2 vdr-1.7.38.tar.bz2
e945b0f44e13ed768de726cf6e66317c vdr-1.7.37-1.7.38.diff
WARNING:
========
This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.
Approaching version 2.0.0:
==========================
If all goes well, there should be no more functional or API changes
before the final version 2.0.0. There will just be a few more fixes.
From the HISTORY file:
- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Updated the Romanian OSD texts (thanks to Lucian Muresan).
- Updated the French OSD texts (thanks to Marc Perrudin, Bernard Jaulini and Peter
Münster).
- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
- Fixed moving editing marks, so that they don't get overwritten with old values
through an update of the marks file.
- Removed an invalid line from channels.conf.terr (reported by Lars Hanisch).
- Fixed an unexpected k_Repeat key event after a k_Release in lirc.c.
- Fixed permissions of po/sr_SR.po (reported by Dominic Evans).
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed using "Pause" and "Slow motion" near the end of a recording (replay stopped
a few seconds after the end of the recording file has been reached).
- Fixed selecting the last replayed recording in the Recordings menu in case there
are folders and plain recordings with names that differ only in non-alphanumeric
characters (reported by Andre Weidemann).
- Fixed the description of the OSD drawing functions DrawEllipse() (the values -5...-8
for the Quadrants parameter are not implemented).
- Made cOsd::DestroyPixmap() "NULL proof".
- Now deleting any previously allocated pixmaps in cOsd::SetAreas().
- Added demos of the DrawEllipse() and DrawSlope() function to the 'osddemo'
plugin (press '1' or '2', respectively).
- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
- The timeout for trying to switch to a valid programme is now reset immediately once
a programme has been found.
- No longer checking for EOPNOTSUPP in cDvbTuner::GetSignalQuality() to avoid breaking
this function in case the driver suddenly decides to return a different errno value
if an operation is not supported.
- Moved the definition of TIMERMACRO_TITLE and TIMERMACRO_EPISODE from recording.h to
config.h and using them to initialize Setup.NameInstantRecord (avoids having the same
information in two places).
- Fixed the return value of cOsdProvider::StoreImage() in case there is no OSD provider.
- Fixed a crash in cMenuEditChanItem::Set() when entering a channel number that
doesn't exist (reported by Mikael Hübsch).
- Fixed displaying pending timers in "alert" mode in the LCARS skin.
- Added missing $(LDFLAGS) to the Makefile of the dvbhddevice plugin (thanks to Ville
Skyttä).
- Fixed some spellings in PLUGINS.html and Doxyfile (thanks to Ville Skyttä).
- Added '-p' to the cp command in the install-conf target of the Makefile (thanks to
Ville Skyttä).
- Added missing 'const' to cDevice::HasProgramme() and cDevice::HasLock().
- Fixed determining the priority of the primary device in case it is neither replaying
nor receiving a live channel (thanks to Matthias Senzel for reporting a problem with
switching back to live viewing after replay in a setup with device bonding).
- Removed all \return and \param tags from comment lines marked with "///<" for Doxygen.
There was only a rather small number of these, and I would probably always forget to
put them in place when writing future comments, so I decided to drop them entirely.
- Added Doxyfile.filter to have special characters escaped that would otherwise be
dropped by Doxygen (reported by Ville Skyttä).
- Using 'cat' instead of 'cp' to copy the Doxyfile to avoid problems in case Doxyfile
is write protected.
- Updated the Doxyfile with a newer version of Doxygen.
- Turned off following symlinks in the Doxyfile.
- Removed trailing whitespace.
- Expanded tabs in PLUGINS/src/dvbhddevice/setup.c.
- Some formatting fixes.
120 lines
5.3 KiB
C++
120 lines
5.3 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 2.7 2013/02/17 13:17:42 kls Exp $
|
|
*/
|
|
|
|
#ifndef __FONT_H
|
|
#define __FONT_H
|
|
|
|
#include <stdint.h>
|
|
#include <stdlib.h>
|
|
#include "tools.h"
|
|
|
|
#define MAXFONTNAME 64
|
|
#define MINFONTSIZE 10
|
|
#define MAXFONTSIZE 64
|
|
|
|
enum eDvbFont {
|
|
fontOsd,
|
|
fontFix,
|
|
fontSml
|
|
#define eDvbFontSize (fontSml + 1)
|
|
};
|
|
|
|
class cBitmap;
|
|
class cPixmap;
|
|
typedef uint32_t tColor; // see also osd.h
|
|
typedef uint8_t tIndex;
|
|
|
|
extern const char *DefaultFontOsd;
|
|
extern const char *DefaultFontSml;
|
|
extern const char *DefaultFontFix;
|
|
|
|
class cFont {
|
|
private:
|
|
static cFont *fonts[];
|
|
public:
|
|
virtual ~cFont() {}
|
|
virtual const char *FontName(void) const { return ""; }
|
|
///< Returns the font name.
|
|
virtual int Size(void) const { return Height(); }
|
|
///< Returns the original size as requested when the font was created.
|
|
///< This may be different than the actual height.
|
|
virtual int Width(uint c) const = 0;
|
|
///< Returns the width of the given character in pixel.
|
|
virtual int Width(const char *s) const = 0;
|
|
///< Returns the width of the given string in pixel.
|
|
virtual int Height(void) const = 0;
|
|
///< Returns the height of this font in pixel (all characters have the same height).
|
|
int Height(const char *s) const { return Height(); }
|
|
///< Returns the height of this font in pixel (obsolete, just for backwards compatibility).
|
|
virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const = 0;
|
|
///< Draws the given text into the Bitmap at position (x, y) with the given colors.
|
|
///< The text will not exceed the given Width (if > 0), and will end with a complete character.
|
|
virtual void DrawText(cPixmap *Pixmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {}; // not "pure", so that existing implementations still compile
|
|
///< Draws the given text into the Pixmap at position (x, y) with the given colors.
|
|
///< The text will not exceed the given Width (if > 0), and will end with a complete character.
|
|
static void SetFont(eDvbFont Font, const char *Name, int CharHeight);
|
|
///< Sets the given Font to use the font data according to Name (see CreateFont())
|
|
///< and make its characters CharHeight pixels high.
|
|
static const cFont *GetFont(eDvbFont Font);
|
|
///< Gets the given Font, which was previously set by a call to SetFont().
|
|
///< If no SetFont() call has been made, the font as defined in the setup is returned.
|
|
///< GetFont() is not thread-safe, and shall only be called from the main
|
|
///< thread! A font returned by GetFont() must only be used locally inside the
|
|
///< function it was retrieved from, and no long term pointer to it shall be kept,
|
|
///< because the cFont object may become invalid at any time after the
|
|
///< function that called GetFont() has returned.
|
|
static cFont *CreateFont(const char *Name, int CharHeight, int CharWidth = 0);
|
|
///< Creates a new font object with the given Name and makes its characters
|
|
///< CharHeight pixels high. If CharWidth is given, it overwrites the font's
|
|
///< default width. Name is of the form "Family:Style", for instance
|
|
///< "Verdana:Bold Italic" or "Times New Roman". See GetAvailableFontNames()
|
|
///< for how to get a list of all available font names.
|
|
///< If the requested font can't be created, NULL is returned.
|
|
///< The caller must delete the font when it is no longer needed.
|
|
static bool GetAvailableFontNames(cStringList *FontNames, bool Monospaced = false);
|
|
///< Queries the font configuration for a list of available font names,
|
|
///< which is returned in FontNames. If Monospaced is true, only
|
|
///< monospaced fonts will be returned. The resulting font names are
|
|
///< in a format that can be used with GetFontFileName() to get the name
|
|
///< of the actual font file.
|
|
///< Returns true if any font names were found.
|
|
static cString GetFontFileName(const char *FontName);
|
|
///< Returns the actual font file name for the given FontName.
|
|
#ifdef BIDI
|
|
static cString Bidi(const char *Ltr);
|
|
///< Converts any "right-to-left" parts in the "left-to-right" string Ltr
|
|
///< to the proper language specific representation and returns the resulting string.
|
|
#endif
|
|
};
|
|
|
|
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
|