mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: add fribidi support; ported from mohousch's nhd2

Browse Source 
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.


Origin commit data
------------------
Commit: ffcb1ec609
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-30 (Thu, 30 Mar 2017)

Origin message was:
------------------
- 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.
This commit is contained in:
vanhofen
2017-03-30 23:04:26 +02:00
parent 2f636cd9f3
commit a95874932e
4 changed files with 88 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/driver/fontrenderer.cpp
View File

@@ -39,6 +39,10 @@
#include <system/debug.h>
#include <global.h>
#ifdef ENABLE_FRIBIDI
#include <fribidi/fribidi.h>
#endif
FT_Error FBFontRenderClass::myFTC_Face_Requester(FTC_FaceID face_id,
FT_Library /*library*/,
FT_Pointer request_data,
@@ -388,6 +392,49 @@ int UTF8ToUnicode(const char * &text, const bool utf8_encoded) // returns -1 on
return unicode_value;
}
#ifdef ENABLE_FRIBIDI
static std::string fribidi_shape_char(const char * text)
{
if(text && *text)
{
int len = strlen(text);
char * rtl_text = NULL;
int rtl_len = 0;
fribidi_set_mirroring(true);
fribidi_set_reorder_nsm(false);
// init to utf-8
FriBidiCharSet fribidi_charset = FRIBIDI_CHAR_SET_UTF8;
// tell bidi that we need bidirectional
FriBidiCharType fribidi_chartype = FRIBIDI_TYPE_L;
// our buffer
FriBidiChar *logical = (FriBidiChar *)alloca(sizeof(FriBidiChar)*(len + 1));
FriBidiChar *visual = (FriBidiChar *)alloca(sizeof(FriBidiChar)*(len + 1));
// convert from the selected charset to Unicode
rtl_len = fribidi_charset_to_unicode(fribidi_charset, const_cast<char *>(text), len, logical);
//printf("len: %d rtl_len: %d\n", len, rtl_len);
// logical to visual
if (fribidi_log2vis(logical, rtl_len, &fribidi_chartype, visual, NULL, NULL, NULL))
{
// removes bidirectional marks
fribidi_remove_bidi_marks(visual, rtl_len, NULL, NULL, NULL);
rtl_text = (char *)alloca(sizeof(char)*(rtl_len * 4 + 1));
fribidi_unicode_to_charset(fribidi_charset, visual, rtl_len, rtl_text);
return std::string(rtl_text);
}
}
return std::string(text);
}
#endif
void Font::paintFontPixel(fb_pixel_t *td, uint8_t src)
{
#define DST_BLUE 0x80
@@ -448,6 +495,11 @@ void Font::RenderString(int x, int y, const int width, const char *text, const f
pthread_mutex_lock( &renderer->render_mutex );
#ifdef ENABLE_FRIBIDI
std::string Text = fribidi_shape_char(text);
text = Text.c_str();
#endif
FT_Error err = FTC_Manager_LookupSize(renderer->cacheManager, &scaler, &size);
if (err != 0)
{
@@ -638,6 +690,11 @@ int Font::getRenderWidth(const char *text, const bool utf8_encoded)
{
pthread_mutex_lock( &renderer->render_mutex );
#ifdef ENABLE_FRIBIDI
std::string Text = fribidi_shape_char(text);
text = Text.c_str();
#endif
FT_Error err = FTC_Manager_LookupSize(renderer->cacheManager, &scaler, &size);
if (err != 0)
{