Commit a92170b6 authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson

For linux-fb get the pangoft2 cflags and libs. This needs a recent pango

2000-12-21  Alexander Larsson  <alexl@redhat.com>

	* configure.in:
	For linux-fb get the pangoft2 cflags and libs. This needs a recent
	pango version.
	Remove modules/linux-fb/Makefile.

	* gdk/linux-fb/gdkdrawable-fb2.c:
	Render glyphs using freetype.

	* gdk/linux-fb/gdkfb.h:
	Add new fb-specific functions needed for managing windows.

	* gdk/linux-fb/gdkmain-fb.c:
	Remove gdk_font_init/fini() calls.

	* gdk/linux-fb/gdkpango-fb.c:
	Remove old implementation. Use pangoft2 instead.

	* gdk/linux-fb/gdkprivate-fb.h:
	Remove PangoFBFont and related stuff.

	* gdk/linux-fb/gdkwindow-fb.c:
	Implement drawable->get_visible_region.
	Implement support for _gdk_window_set_child_handler () and
	_gdk_window_get_decorations().

	* modules/Makefile.am:
	Remove linux-fb subdir.

	* modules/linux-fb/*:
	Removed all.
parent dadf966b
2000-12-21 Alexander Larsson <alexl@redhat.com>
* configure.in:
For linux-fb get the pangoft2 cflags and libs. This needs a recent
pango version.
Remove modules/linux-fb/Makefile.
* gdk/linux-fb/gdkdrawable-fb2.c:
Render glyphs using freetype.
* gdk/linux-fb/gdkfb.h:
Add new fb-specific functions needed for managing windows.
* gdk/linux-fb/gdkmain-fb.c:
Remove gdk_font_init/fini() calls.
* gdk/linux-fb/gdkpango-fb.c:
Remove old implementation. Use pangoft2 instead.
* gdk/linux-fb/gdkprivate-fb.h:
Remove PangoFBFont and related stuff.
* gdk/linux-fb/gdkwindow-fb.c:
Implement drawable->get_visible_region.
Implement support for _gdk_window_set_child_handler () and
_gdk_window_get_decorations().
* modules/Makefile.am:
Remove linux-fb subdir.
* modules/linux-fb/*:
Removed all.
2000-12-20 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
......
2000-12-21 Alexander Larsson <alexl@redhat.com>
* configure.in:
For linux-fb get the pangoft2 cflags and libs. This needs a recent
pango version.
Remove modules/linux-fb/Makefile.
* gdk/linux-fb/gdkdrawable-fb2.c:
Render glyphs using freetype.
* gdk/linux-fb/gdkfb.h:
Add new fb-specific functions needed for managing windows.
* gdk/linux-fb/gdkmain-fb.c:
Remove gdk_font_init/fini() calls.
* gdk/linux-fb/gdkpango-fb.c:
Remove old implementation. Use pangoft2 instead.
* gdk/linux-fb/gdkprivate-fb.h:
Remove PangoFBFont and related stuff.
* gdk/linux-fb/gdkwindow-fb.c:
Implement drawable->get_visible_region.
Implement support for _gdk_window_set_child_handler () and
_gdk_window_get_decorations().
* modules/Makefile.am:
Remove linux-fb subdir.
* modules/linux-fb/*:
Removed all.
2000-12-20 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
......
2000-12-21 Alexander Larsson <alexl@redhat.com>
* configure.in:
For linux-fb get the pangoft2 cflags and libs. This needs a recent
pango version.
Remove modules/linux-fb/Makefile.
* gdk/linux-fb/gdkdrawable-fb2.c:
Render glyphs using freetype.
* gdk/linux-fb/gdkfb.h:
Add new fb-specific functions needed for managing windows.
* gdk/linux-fb/gdkmain-fb.c:
Remove gdk_font_init/fini() calls.
* gdk/linux-fb/gdkpango-fb.c:
Remove old implementation. Use pangoft2 instead.
* gdk/linux-fb/gdkprivate-fb.h:
Remove PangoFBFont and related stuff.
* gdk/linux-fb/gdkwindow-fb.c:
Implement drawable->get_visible_region.
Implement support for _gdk_window_set_child_handler () and
_gdk_window_get_decorations().
* modules/Makefile.am:
Remove linux-fb subdir.
* modules/linux-fb/*:
Removed all.
2000-12-20 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
......
2000-12-21 Alexander Larsson <alexl@redhat.com>
* configure.in:
For linux-fb get the pangoft2 cflags and libs. This needs a recent
pango version.
Remove modules/linux-fb/Makefile.
* gdk/linux-fb/gdkdrawable-fb2.c:
Render glyphs using freetype.
* gdk/linux-fb/gdkfb.h:
Add new fb-specific functions needed for managing windows.
* gdk/linux-fb/gdkmain-fb.c:
Remove gdk_font_init/fini() calls.
* gdk/linux-fb/gdkpango-fb.c:
Remove old implementation. Use pangoft2 instead.
* gdk/linux-fb/gdkprivate-fb.h:
Remove PangoFBFont and related stuff.
* gdk/linux-fb/gdkwindow-fb.c:
Implement drawable->get_visible_region.
Implement support for _gdk_window_set_child_handler () and
_gdk_window_get_decorations().
* modules/Makefile.am:
Remove linux-fb subdir.
* modules/linux-fb/*:
Removed all.
2000-12-20 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
......
2000-12-21 Alexander Larsson <alexl@redhat.com>
* configure.in:
For linux-fb get the pangoft2 cflags and libs. This needs a recent
pango version.
Remove modules/linux-fb/Makefile.
* gdk/linux-fb/gdkdrawable-fb2.c:
Render glyphs using freetype.
* gdk/linux-fb/gdkfb.h:
Add new fb-specific functions needed for managing windows.
* gdk/linux-fb/gdkmain-fb.c:
Remove gdk_font_init/fini() calls.
* gdk/linux-fb/gdkpango-fb.c:
Remove old implementation. Use pangoft2 instead.
* gdk/linux-fb/gdkprivate-fb.h:
Remove PangoFBFont and related stuff.
* gdk/linux-fb/gdkwindow-fb.c:
Implement drawable->get_visible_region.
Implement support for _gdk_window_set_child_handler () and
_gdk_window_get_decorations().
* modules/Makefile.am:
Remove linux-fb subdir.
* modules/linux-fb/*:
Removed all.
2000-12-20 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
......
2000-12-21 Alexander Larsson <alexl@redhat.com>
* configure.in:
For linux-fb get the pangoft2 cflags and libs. This needs a recent
pango version.
Remove modules/linux-fb/Makefile.
* gdk/linux-fb/gdkdrawable-fb2.c:
Render glyphs using freetype.
* gdk/linux-fb/gdkfb.h:
Add new fb-specific functions needed for managing windows.
* gdk/linux-fb/gdkmain-fb.c:
Remove gdk_font_init/fini() calls.
* gdk/linux-fb/gdkpango-fb.c:
Remove old implementation. Use pangoft2 instead.
* gdk/linux-fb/gdkprivate-fb.h:
Remove PangoFBFont and related stuff.
* gdk/linux-fb/gdkwindow-fb.c:
Implement drawable->get_visible_region.
Implement support for _gdk_window_set_child_handler () and
_gdk_window_get_decorations().
* modules/Makefile.am:
Remove linux-fb subdir.
* modules/linux-fb/*:
Removed all.
2000-12-20 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
......
2000-12-21 Alexander Larsson <alexl@redhat.com>
* configure.in:
For linux-fb get the pangoft2 cflags and libs. This needs a recent
pango version.
Remove modules/linux-fb/Makefile.
* gdk/linux-fb/gdkdrawable-fb2.c:
Render glyphs using freetype.
* gdk/linux-fb/gdkfb.h:
Add new fb-specific functions needed for managing windows.
* gdk/linux-fb/gdkmain-fb.c:
Remove gdk_font_init/fini() calls.
* gdk/linux-fb/gdkpango-fb.c:
Remove old implementation. Use pangoft2 instead.
* gdk/linux-fb/gdkprivate-fb.h:
Remove PangoFBFont and related stuff.
* gdk/linux-fb/gdkwindow-fb.c:
Implement drawable->get_visible_region.
Implement support for _gdk_window_set_child_handler () and
_gdk_window_get_decorations().
* modules/Makefile.am:
Remove linux-fb subdir.
* modules/linux-fb/*:
Removed all.
2000-12-20 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
......
......@@ -601,6 +601,9 @@ if test "x$gdktarget" = "xx11"; then
if $have_xft = true ; then
PANGO_LIBS="$PANGO_LIBS -lpangoxft"
fi
elif test "x$gdktarget" = "xlinux-fb"; then
PANGO_CFLAGS="`$PANGO_CONFIG --cflags pangoft2`"
PANGO_LIBS="`$PANGO_CONFIG --libs pangoft2`"
else
PANGO_CFLAGS="`$PANGO_CONFIG --cflags pango`"
PANGO_LIBS="`$PANGO_CONFIG --libs pango`"
......@@ -1116,7 +1119,6 @@ gtk/gtkcompat.h
gtk/gtk-win32.rc
gtk/stock-icons/Makefile
modules/Makefile
modules/linux-fb/Makefile
modules/input/Makefile
contrib/Makefile
contrib/gdk-pixbuf-xlib/Makefile
......
SUBDIRS=linux-fb input
SUBDIRS=input
Makefile.in
Makefile
.deps
.libs
\ No newline at end of file
## Process this file with automake to produce Makefile.in
INCLUDES = @STRIP_BEGIN@ \
-DG_LOG_DOMAIN=\"Gdk\" \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk/linux-fb \
@FREETYPE_CFLAGS@ \
@GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \
@GTK_LOCALE_FLAGS@ \
@GLIB_CFLAGS@ \
@PANGO_CFLAGS@ \
@STRIP_END@
LDFLAGS = @STRIP_BEGIN@ \
@GLIB_LIBS@ \
@PANGO_CFLAGS@ \
@FREETYPE_LIBS@ \
-lm \
@STRIP_END@
fb_basic_la_SOURCES = basic.c
fb_basic_la_LDFLAGS = -export-dynamic -avoid-version -module
fb_basic_la_LIBADD = $(PANGO_LIBS) \
-L$(top_builddir)/gdk/.libs -lgdk-linux-fb-1.3 \
-L$(top_builddir)/gdk-pixbuf/.libs -lgdk_pixbuf-1.3
if USE_LINUX_FB
moduledir = $(libdir)/pango/modules
module_LTLIBRARIES = fb-basic.la
endif
EXTRA_DIST = \
tables-big.i \
tables-small.i
/* Pango
* basic.c:
*
* Copyright (C) 1999 Red Hat Software
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include <glib.h>
#include <gconvert.h>
#include <pango/pango.h>
#include <pango/pango-utils.h>
#include "gdkprivate-fb.h"
#include <string.h>
typedef struct _CharCache CharCache;
struct _CharCache
{
};
static PangoEngineRange basic_ranges[] = {
/* Language characters */
{ 0x0000, 0x02af, "*" },
{ 0x02b0, 0x02ff, "" },
{ 0x0380, 0x058f, "*" },
{ 0x0591, 0x05f4, "*" }, /* Hebrew */
{ 0x060c, 0x06f9, "" }, /* Arabic */
{ 0x0e01, 0x0e5b, "" }, /* Thai */
{ 0x10a0, 0x10ff, "*" }, /* Georgian */
{ 0x1200, 0x16ff, "*" }, /* Ethiopic,Cherokee,Canadian,Ogham,Runic */
{ 0x1e00, 0x1fff, "*" },
{ 0x2000, 0x9fff, "*" },
{ 0xac00, 0xd7a3, "kr" },
{ 0xf900, 0xfa0b, "kr" },
{ 0xff00, 0xffe3, "*" }
};
static PangoEngineInfo script_engines[] = {
{
"BasicScriptEngineFB",
PANGO_ENGINE_TYPE_SHAPE,
"PangoRenderTypeFB",
basic_ranges, G_N_ELEMENTS(basic_ranges)
}
};
static gint n_script_engines = G_N_ELEMENTS (script_engines);
/*
* FB window system script engine portion
*/
static CharCache *
char_cache_new (void)
{
CharCache *result;
result = g_new0 (CharCache, 1);
return result;
}
static void
char_cache_free (CharCache *cache)
{
g_free (cache);
}
PangoGlyph
find_char (CharCache *cache, PangoFont *font, gunichar wc, const char *input)
{
return FT_Get_Char_Index(PANGO_FB_FONT(font)->ftf, wc);
}
static void
set_glyph (PangoFont *font, PangoGlyphString *glyphs, int i, int offset, PangoGlyph glyph)
{
PangoRectangle logical_rect;
glyphs->glyphs[i].glyph = glyph;
glyphs->glyphs[i].geometry.x_offset = 0;
glyphs->glyphs[i].geometry.y_offset = 0;
glyphs->log_clusters[i] = offset;
pango_font_get_glyph_extents (font, glyphs->glyphs[i].glyph, NULL, &logical_rect);
glyphs->glyphs[i].geometry.width = logical_rect.width;
}
static void
swap_range (PangoGlyphString *glyphs, int start, int end)
{
int i, j;
for (i = start, j = end - 1; i < j; i++, j--)
{
PangoGlyphInfo glyph_info;
gint log_cluster;
glyph_info = glyphs->glyphs[i];
glyphs->glyphs[i] = glyphs->glyphs[j];
glyphs->glyphs[j] = glyph_info;
log_cluster = glyphs->log_clusters[i];
glyphs->log_clusters[i] = glyphs->log_clusters[j];
glyphs->log_clusters[j] = log_cluster;
}
}
static PangoGlyph
pango_fb_get_unknown_glyph(PangoFont *font)
{
return FT_Get_Char_Index (PANGO_FB_FONT (font)->ftf, '~');
}
static CharCache *
get_char_cache (PangoFont *font)
{
GQuark cache_id = g_quark_from_string ("basic-char-cache");
CharCache *cache = g_object_get_qdata (G_OBJECT (font), cache_id);
if (!cache)
{
cache = char_cache_new ();
g_object_set_qdata_full (G_OBJECT (font), cache_id,
cache, (GDestroyNotify)char_cache_free);
}
return cache;
}
static void
basic_engine_shape (PangoFont *font,
const char *text,
gint length,
PangoAnalysis *analysis,
PangoGlyphString *glyphs)
{
int n_chars;
int i;
const char *p;
CharCache *cache;
g_return_if_fail (font != NULL);
g_return_if_fail (text != NULL);
g_return_if_fail (length >= 0);
g_return_if_fail (analysis != NULL);
cache = get_char_cache (font);
n_chars = g_utf8_strlen (text, length);
pango_glyph_string_set_size (glyphs, n_chars);
p = text;
for (i=0; i < n_chars; i++)
{
gunichar wc;
gunichar mirrored_ch;
PangoGlyph index;
char buf[6];
const char *input;
wc = g_utf8_get_char (p);
input = p;
if (analysis->level % 2)
if (pango_get_mirror_char (wc, &mirrored_ch))
{
wc = mirrored_ch;
g_unichar_to_utf8 (wc, buf);
input = buf;
}
if (wc == 0x200B || wc == 0x200E || wc == 0x200F) /* Zero-width characters */
{
set_glyph (font, glyphs, i, p - text, 0);
}
else
{
index = find_char (cache, font, wc, input);
if (index)
{
set_glyph (font, glyphs, i, p - text, index);
if (g_unichar_type (wc) == G_UNICODE_NON_SPACING_MARK)
{
if (i > 0)
{
PangoRectangle logical_rect, ink_rect;
glyphs->glyphs[i].geometry.width = MAX (glyphs->glyphs[i-1].geometry.width,
glyphs->glyphs[i].geometry.width);
glyphs->glyphs[i-1].geometry.width = 0;
glyphs->log_clusters[i] = glyphs->log_clusters[i-1];
/* Some heuristics to try to guess how overstrike glyphs are
* done and compensate
*/
pango_font_get_glyph_extents (font, glyphs->glyphs[i].glyph, &ink_rect, &logical_rect);
if (logical_rect.width == 0 && ink_rect.x == 0)
glyphs->glyphs[i].geometry.x_offset = (glyphs->glyphs[i].geometry.width - ink_rect.width) / 2;
}
}
}
else
set_glyph (font, glyphs, i, p - text, pango_fb_get_unknown_glyph (font));
}
p = g_utf8_next_char (p);
}
/* Simple bidi support... may have separate modules later */
if (analysis->level % 2)
{
int start, end;
/* Swap all glyphs */
swap_range (glyphs, 0, n_chars);
/* Now reorder glyphs within each cluster back to LTR */
for (start=0; start<n_chars;)
{
end = start;
while (end < n_chars &&
glyphs->log_clusters[end] == glyphs->log_clusters[start])
end++;
swap_range (glyphs, start, end);
start = end;
}
}
}
static PangoCoverage *
basic_engine_get_coverage (PangoFont *font,
const char *lang)
{
CharCache *cache = get_char_cache (font);
PangoCoverage *result = pango_coverage_new ();
gunichar wc;
for (wc = 0; wc < 65536; wc++)
{
char buf[6];
g_unichar_to_utf8 (wc, buf);
if (find_char (cache, font, wc, buf))
pango_coverage_set (result, wc, PANGO_COVERAGE_EXACT);
}
return result;
}
static PangoEngine *
basic_engine_fb_new ()
{
PangoEngineShape *result;
result = g_new (PangoEngineShape, 1);
result->engine.id = "BasicScriptEngineFB";
result->engine.type = PANGO_ENGINE_TYPE_LANG;
result->engine.length = sizeof (result);
result->script_shape = basic_engine_shape;
result->get_coverage = basic_engine_get_coverage;
return (PangoEngine *)result;
}
/* The following three functions provide the public module API for
* Pango
*/
#ifdef MODULE_PREFIX
#define MODULE_ENTRY(func) _pango_basic_##func
#else
#define MODULE_ENTRY(func) func
#endif
void
MODULE_ENTRY(script_engine_list) (PangoEngineInfo **engines, gint *n_engines)
{
*engines = script_engines;
*n_engines = n_script_engines;
}
PangoEngine *
MODULE_ENTRY(script_engine_load) (const char *id)
{
if (!strcmp (id, "BasicScriptEngineFB"))
return basic_engine_fb_new ();
else
return NULL;
}
void
MODULE_ENTRY(script_engine_unload) (PangoEngine *engine)
{
}
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment