Commit Graph

58 Commits

Author SHA1 Message Date
Jacek Jendrzej
4c3002cb26 Merge branch 'master' into pu/mp 2017-06-15 12:32:31 +02:00
Thilo Graf
71d0c42a47 FBFontRenderClass/CNeutrinoFonts: ensure reset of some instances
Only for safety.
2017-06-15 01:01:54 +02:00
svenhoefer
404e609553 Merge branch 'master' into pu/mp 2017-03-31 17:41:29 +02:00
svenhoefer
ffcb1ec609 - neutrino: add fribidi support; ported from mohousch's nhd2
This requires libfribidi and a font with arabic or hebrew glyphs.
To build libfribidi add something like this to your makefiles:

FRIBIDI_VER = 0.19.7
$(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2:
	$(WGET) https://fribidi.org/download/fribidi-$(FRIBIDI_VER).tar.bz2

$(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2 | $(TARGETPREFIX)
	$(REMOVE)/fribidi-$(FRIBIDI_VER)
	$(UNTAR)/fribidi-$(FRIBIDI_VER).tar.bz2
	set -e; cd $(BUILD_TMP)/fribidi-$(FRIBIDI_VER); \
		$(CONFIGURE) \
			--prefix= \
			--mandir=/.remove \
			--disable-debug \
			--disable-deprecated \
			--enable-charsets \
			--with-glib=no \
			; \
		$(MAKE); \
		$(MAKE) install DESTDIR=$(TARGETPREFIX)
	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/fribidi.pc
	$(REWRITE_LIBTOOL)/libfribidi.la
	$(REMOVE)/fribidi-$(FRIBIDI_VER)
	touch $@

If you want to link libfribidi statically add --disable-shared
and --enable-static to configure call.
2017-03-30 23:14:11 +02:00
Stefan Seyfried
dec601a9dc fontrenderer: add hack to work around broken fullBG code 2017-02-09 12:57:18 +01:00
Stefan Seyfried
0f4e6298c8 fontrenderer: add hack to work around broken fullBG code 2017-02-09 00:01:50 +01:00
Stefan Seyfried
e490f84ea8 replace framebuffer.h include with forward declaration
instead of including framebuffer.h almost everywhere, replace it with
class CFrameBuffer forward declarations and/or generic system includes.
Add a hack to define fb_pixel_t to config.h (one reason for
framebuffer.h includes was the fb_pixel_t define)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
63b6efd1f5 replace framebuffer.h include with forward declaration
instead of including framebuffer.h almost everywhere, replace it with
class CFrameBuffer forward declarations and/or generic system includes.
Add a hack to define fb_pixel_t to config.h (one reason for
framebuffer.h includes was the fb_pixel_t define)
2017-02-05 13:05:07 +01:00
Stefan Seyfried
7497722646 Merge remote-tracking branch 'tuxbox/master' 2017-02-01 22:03:40 +01:00
M. Liebmann
97d1d93c93 fontrenderer: Rework rendering for better font presentation
- For the correct use of the changes should be built freetype
   with the following settings:
     #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
     #define TT_CONFIG_OPTION_SUBPIXEL_HINTING

BS-Patch for freetype 2.5-2.7
-----------------------------
** include/freetype/config/ftoption.h **

-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING

-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */
+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING

BS-Patch for freetype 2.7.1
---------------------------
** include/freetype/config/ftoption.h **

-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
2017-01-31 16:36:40 +01:00
Stefan Seyfried
a409047714 Merge remote-tracking branch 'tuxbox/master' 2017-01-22 22:59:39 +01:00
Thilo Graf
3ecb94fc21 fontrenderer.cpp: Use additional percentage height offset.
Different font types could have different glyph heights,
Therfore static values seems not really senseful.
eg. chars like ÄÁÂÅÈÉÊËÌÍÎÏÑÒÓÕÖÙÛÜÝ could paint over defined height,

Note: 	However, depending of implementations, the font image may change.
	Most likely this must be adapted to some parts.
2017-01-05 22:19:18 +01:00
Stefan Seyfried
13ab1ebc8a Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)
2016-10-22 11:37:40 +02:00
Jacek Jendrzej
0d9fbd5378 some never read compil warning fixes 2016-04-24 17:18:37 +02:00
Stefan Seyfried
69c4dbbdba Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp
2014-12-25 18:03:08 +01:00
M. Liebmann
9ab1f62cf0 Fontrenderer: Fix RenderString() for better drawing fonts 2014-09-25 11:07:33 +04:00
svenhoefer
8b91cda918 - change getRenderWidth() default to UTF8 2014-06-11 23:07:00 +02:00
martii
2047b51780 driver/fontrenderer: adding an additional bool to RenderString() seems inappropriate. 2014-06-11 23:06:50 +02:00
Stefan Seyfried
b5e736e81b Merge branch 'check/next-cc'
Only compile-tested.
2013-11-30 20:17:31 +01:00
martii
15b2b2ec05 remove widest_number definition and usage, add Font::getMaxDigitWidth() method instead
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>
2013-11-29 23:02:50 +01:00
Stefan Seyfried
32de6beef0 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h
2013-09-01 19:46:10 +02:00
Michael Liebmann
ce91ca7f13 Fontrenderer: Fixed error when rendering the font
- Add comment for parameter 'useFullBg'
2013-07-23 06:29:47 +02:00
Michael Liebmann
20fd26a65d Fontrenderer: Use real color values for Renderstring() 2013-07-21 22:01:52 +02:00
Stefan Seyfried
a7f1e0e25e Merge remote-tracking branch 'check/next-cc'
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
2013-05-24 20:24:39 +02:00
Michael Liebmann
d460c50bd5 * CFrameBuffer::waitForIdle: Added a parameter
to identify the execution at Debug Output
- For example: name of the calling function
2013-05-18 14:44:20 +01:00
Michael Liebmann
5eb7f4aea8 * Mute icon: Fix minor bugs
- Fix display the mute icon when leaving the audio player
- Disable mute icon in channellist when 'Quickzap in list' active or allow
- Fix hide the mute icon in movie browser, picture viewer,
  file browser and upnp browser
- Font::RenderString(): Use correct value of y for CFrameBuffer::checkFbArea()
2013-05-18 14:44:20 +01:00
Michael Liebmann
1049b337bb * Rework handling muteicon
- Integrated for monitoring the mute icon into the frame buffer class.
  If the icon is overwritten by an element, it is restored from the
  framebuffer.

Signed-off-by: Thilo Graf <dbt@novatux.de>
2013-05-16 11:01:41 +01:00
Stefan Seyfried
ca9b85b3f5 fontrenderer: fix rendering problems with accelerated blitting 2013-04-09 13:12:09 +02:00
Stefan Seyfried
90c252f6f9 fontrenderer: allow using customcolor.h colors for fonts 2013-04-09 13:12:00 +02:00
Stefan Seyfried
e66b57cd88 fontrenderer: use background color of framebuffer 2013-04-09 13:11:53 +02:00
Stefan Seyfried
fa87c27dfe fontrenderer: fix rendering problems with accelerated blitting 2013-04-09 08:23:32 +02:00
Jacek Jendrzej
f3dcf52ea0 revert 89251f648e && 89251f648e 2013-04-08 18:03:33 +02:00
Stefan Seyfried
89251f648e fontrenderer: allow using customcolor.h colors for fonts 2013-04-08 10:36:50 +02:00
Stefan Seyfried
629dc8562f fontrenderer: use background color of framebuffer 2013-04-08 10:34:33 +02:00
Stefan Seyfried
304c7e8daa fontrenderer: allow using customcolor.h colors for fonts 2013-04-07 18:15:49 +02:00
Stefan Seyfried
454a80f3ac fontrenderer: use background color of framebuffer 2013-04-06 17:47:06 +02:00
Stefan Seyfried
b8379ebbc6 fontrenderer: mark only the really used FB area dirty 2012-04-17 19:33:59 +02:00
Stefan Seyfried
f44dcf26a9 fontrenderer: mark used region, so that blitting works 2012-04-17 19:33:58 +02:00
Stefan Seyfried
7fcd36ed66 spark: revert framebuffer scaling commits
we're going to use the STFB blitter instead of manually
scaling everything if the videomode is not 720p, so more
or less revert all commits regarding FB scaling:

Revert "fontrenderer: scale fonts for nonstandard FB resolutions"
Revert "neutrino: resize framebuffer on videomode change"
Revert "fontrenderer: fix issue with epgwindow font when FB is scaling"
Revert "neutrino: fix artefacts with scaling framebuffer and 1080i"
Revert "spark: draw lines 2px wide instead of 1 in full-HD mode"
Revert "spark: do not scale framebuffer for PAL mode"
Revert "spark: fix framebuffer glitches"
Revert "spark: do not sync blitter after every rectangle (improves performance)"
2012-04-17 19:33:57 +02:00
Stefan Seyfried
dd025e6622 fontrenderer: fix issue with epgwindow font when FB is scaling 2012-04-17 19:33:54 +02:00
Stefan Seyfried
b34e7205b9 neutrino: resize framebuffer on videomode change
this is needed on spark because the framebuffer has the same resolution
as the video plane...
2012-04-17 19:33:53 +02:00
Stefan Seyfried
7e6a49e8b8 fontrenderer: scale fonts for nonstandard FB resolutions 2012-04-17 19:33:53 +02:00
micha-bbg
0aeeb601bd * neutrino: GUI Painting of Vol. Mute and Clock (Part1)
- Added getDigitHeight() and getDigitOffset() to fontrenderer (better numerics display)

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2151 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-03-18 18:46:36 +00:00
focus
0b32b39bdf Experimental option for non-transparent fonts, to make them readable with high transparency levels. Looking a bit ugly, must be improved
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1858 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-11-17 10:53:53 +00:00
seife
f0d56fe6e7 fontrenderer: bring RenderString() and getRenderWidth() in line
both functions had slightly different ideas on how wide a string
would render, leading to occational off-by-ones and eventually
stripped characters

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1264 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-03-06 18:08:23 +00:00
seife
b666fab10b fontrenderer: remove '\n' handling
'\n' in a text was not working correctly - it did not reset the
X position correctly and it did jump out of the assigned box.
Visible errors were e.g. on epgplus, 13.0E SF1, where the short
description often contains '\n' and thus garbage was painted
below the epgplus window (and did not get cleared afterwards).
For now we replace '\n' with '¶' (0x00b6). Later, if no offenders
are found, it should simply be removed.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@872 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-10-31 10:04:39 +00:00
focus
253324226e Windows fade emulation. Some main windows at the moment only. New drivers needed.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@644 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-06-27 13:06:12 +00:00
satbaby
f548d2e3c0 -add: getWidth()
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@255 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-02-04 11:45:37 +00:00
seife
6b4f0ad178 fontrenderer: do not paint background color
do not paint the background color, making the font "transparent"
this works around display problems in e.g. streaminfo, because the
"wrong" background color is used

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@224 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-01-30 14:09:10 +00:00
satbaby
45f9fc1e75 #ifndef
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@206 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-01-24 08:57:44 +00:00