X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_freetype%2Flyr_freetype.cpp;h=0fbab0918c814771123e2d3f2d4b6ad390fdf411;hb=4ec81d053bf1d0cbcd9f0bf048914ec8eca08f4c;hp=fa68cdeaa6cedf876466f94aa0dfb800e442766c;hpb=5ddcf36f04cfbd10fabda4e3c5633cb27cdd4c0a;p=synfig.git diff --git a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp index fa68cde..0fbab09 100644 --- a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp +++ b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp @@ -1,8 +1,10 @@ -/*! ======================================================================== -** Synfig -** Template File -** $Id: lyr_freetype.cpp,v 1.5 2005/01/24 05:00:18 darco Exp $ +/* === S Y N F I G ========================================================= */ +/*! \file lyr_freetype.cpp +** \brief Template Header ** +** $Id$ +** +** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** Copyright (c) 2006 Paul Wise ** @@ -15,6 +17,7 @@ ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ** General Public License for more details. +** \endlegal ** ** === N O T E S =========================================================== ** @@ -57,12 +60,12 @@ using namespace synfig; /* === G L O B A L S ======================================================= */ -SYNFIG_LAYER_INIT(lyr_freetype); -SYNFIG_LAYER_SET_NAME(lyr_freetype,"text"); -SYNFIG_LAYER_SET_LOCAL_NAME(lyr_freetype,_("Simple Text")); -SYNFIG_LAYER_SET_CATEGORY(lyr_freetype,_("Typography")); -SYNFIG_LAYER_SET_VERSION(lyr_freetype,"0.2"); -SYNFIG_LAYER_SET_CVS_ID(lyr_freetype,"$Id: lyr_freetype.cpp,v 1.5 2005/01/24 05:00:18 darco Exp $"); +SYNFIG_LAYER_INIT(Layer_Freetype); +SYNFIG_LAYER_SET_NAME(Layer_Freetype,"text"); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Freetype,_("Text")); +SYNFIG_LAYER_SET_CATEGORY(Layer_Freetype,_("Other")); +SYNFIG_LAYER_SET_VERSION(Layer_Freetype,"0.2"); +SYNFIG_LAYER_SET_CVS_ID(Layer_Freetype,"$Id$"); /* === P R O C E D U R E S ================================================= */ @@ -85,7 +88,7 @@ TextLine::clear_and_free() /* === M E T H O D S ======================================================= */ -lyr_freetype::lyr_freetype() +Layer_Freetype::Layer_Freetype() { face=0; @@ -110,14 +113,14 @@ lyr_freetype::lyr_freetype() invert=false; } -lyr_freetype::~lyr_freetype() +Layer_Freetype::~Layer_Freetype() { if(face) FT_Done_Face(face); } void -lyr_freetype::new_font(const synfig::String &family, int style, int weight) +Layer_Freetype::new_font(const synfig::String &family, int style, int weight) { if( !new_font_(family,style,weight) && @@ -132,7 +135,7 @@ lyr_freetype::new_font(const synfig::String &family, int style, int weight) } bool -lyr_freetype::new_font_(const synfig::String &font_fam_, int style, int weight) +Layer_Freetype::new_font_(const synfig::String &font_fam_, int style, int weight) { synfig::String font_fam(font_fam_); @@ -322,7 +325,7 @@ void fss2path(char *path, FSSpec *fss) #endif bool -lyr_freetype::new_face(const String &newfont) +Layer_Freetype::new_face(const String &newfont) { int error; FT_Long face_index=0; @@ -342,8 +345,8 @@ lyr_freetype::new_face(const String &newfont) if(get_canvas()) { - if(error)error=FT_New_Face(ft_library,(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPERATOR+newfont).c_str(),face_index,&face); - if(error)error=FT_New_Face(ft_library,(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPERATOR+newfont+".ttf").c_str(),face_index,&face); + if(error)error=FT_New_Face(ft_library,(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+newfont).c_str(),face_index,&face); + if(error)error=FT_New_Face(ft_library,(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+newfont+".ttf").c_str(),face_index,&face); } #ifdef USE_MAC_FT_FUNCS @@ -377,7 +380,7 @@ lyr_freetype::new_face(const String &newfont) FcResult result; if( !FcInit() ) { - synfig::warning("lyr_freetype: fontconfig: %s",_("unable to initialise")); + synfig::warning("Layer_Freetype: fontconfig: %s",_("unable to initialise")); error = 1; } else { FcPattern* pat = FcNameParse((FcChar8 *) newfont.c_str()); @@ -396,7 +399,7 @@ lyr_freetype::new_face(const String &newfont) error=FT_New_Face(ft_library,(const char*)file,face_index,&face); FcFontSetDestroy(fs); } else - synfig::warning("lyr_freetype: fontconfig: %s",_("empty font set")); + synfig::warning("Layer_Freetype: fontconfig: %s",_("empty font set")); } } #endif @@ -431,7 +434,7 @@ lyr_freetype::new_face(const String &newfont) #endif if(error) { - //synfig::error(strprintf("lyr_freetype:%s (err=%d)",_("Unable to open face."),error)); + //synfig::error(strprintf("Layer_Freetype:%s (err=%d)",_("Unable to open face."),error)); return false; } @@ -442,11 +445,11 @@ lyr_freetype::new_face(const String &newfont) } bool -lyr_freetype::set_param(const String & param, const ValueBase &value) +Layer_Freetype::set_param(const String & param, const ValueBase &value) { Mutex::Lock lock(mutex); /* - if(param=="font" && value.same_as(font)) + if(param=="font" && value.same_type_as(font)) { new_font(etl::basename(value.get(font)),style,weight); family=etl::basename(value.get(font)); @@ -471,7 +474,7 @@ lyr_freetype::set_param(const String & param, const ValueBase &value) } ValueBase -lyr_freetype::get_param(const String& param)const +Layer_Freetype::get_param(const String& param)const { EXPORT(font); EXPORT(family); @@ -495,7 +498,7 @@ lyr_freetype::get_param(const String& param)const } Layer::Vocab -lyr_freetype::get_param_vocab(void)const +Layer_Freetype::get_param_vocab(void)const { Layer::Vocab ret(Layer_Composite::get_param_vocab()); @@ -534,7 +537,7 @@ lyr_freetype::get_param_vocab(void)const .add_enum_value(900, "heavy" ,_("Heavy")) ); ret.push_back(ParamDesc("compress") - .set_local_name(_("Hozontal Spacing")) + .set_local_name(_("Horizontal Spacing")) .set_description(_("Describes how close glyphs are horizontally")) ); @@ -586,7 +589,7 @@ lyr_freetype::get_param_vocab(void)const } void -lyr_freetype::sync() +Layer_Freetype::sync() { needs_sync_=false; @@ -596,10 +599,10 @@ lyr_freetype::sync() } Color -lyr_freetype::get_color(Context context, const synfig::Point &pos)const +Layer_Freetype::get_color(Context context, const synfig::Point &pos)const { if(needs_sync_) - const_cast(this)->sync(); + const_cast(this)->sync(); if(!face) return context.get_color(pos); @@ -607,18 +610,18 @@ lyr_freetype::get_color(Context context, const synfig::Point &pos)const } bool -lyr_freetype::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const +Layer_Freetype::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const { static synfig::RecMutex freetype_mutex; if(needs_sync_) - const_cast(this)->sync(); + const_cast(this)->sync(); int error; - Vector size(lyr_freetype::size*2); + Vector size(Layer_Freetype::size*2); if(!context.accelerated_render(surface,quality,renddesc,cb)) return false; @@ -629,11 +632,11 @@ lyr_freetype::accelerated_render(Context context,Surface *surface,int quality, c // If there is no font loaded, just bail if(!face) { - if(cb)cb->warning(string("lyr_freetype:")+_("No face loaded, no text will be rendered.")); + if(cb)cb->warning(string("Layer_Freetype:")+_("No face loaded, no text will be rendered.")); return true; } - String text(lyr_freetype::text); + String text(Layer_Freetype::text); if(text=="@_FILENAME_@" && get_canvas() && !get_canvas()->get_file_name().empty()) { text=basename(get_canvas()->get_file_name()); @@ -655,7 +658,7 @@ lyr_freetype::accelerated_render(Context context,Surface *surface,int quality, c // If the font is the size of a pixel, don't bother rendering any text if(w<=1 || h<=1) { - if(cb)cb->warning(string("lyr_freetype:")+_("Text too small, no text will be rendered.")); + if(cb)cb->warning(string("Layer_Freetype:")+_("Text too small, no text will be rendered.")); return true; } @@ -674,12 +677,12 @@ lyr_freetype::accelerated_render(Context context,Surface *surface,int quality, c const float xerror(abs(size[0]*pw)/(float)face->size->metrics.x_ppem/1.13f/0.996); const float yerror(abs(size[1]*ph)/(float)face->size->metrics.y_ppem/1.13f/0.996); //synfig::info("xerror=%f, yerror=%f",xerror,yerror); - const float compress(lyr_freetype::compress*xerror); - const float vcompress(lyr_freetype::vcompress*yerror); + const float compress(Layer_Freetype::compress*xerror); + const float vcompress(Layer_Freetype::vcompress*yerror); if(error) { - if(cb)cb->warning(string("lyr_freetype:")+_("Unable to set face size.")+strprintf(" (err=%d)",error)); + if(cb)cb->warning(string("Layer_Freetype:")+_("Unable to set face size.")+strprintf(" (err=%d)",error)); } FT_GlyphSlot slot = face->glyph; // a small shortcut @@ -863,10 +866,10 @@ lyr_freetype::accelerated_render(Context context,Surface *surface,int quality, c } synfig::Rect -lyr_freetype::get_bounding_rect()const +Layer_Freetype::get_bounding_rect()const { if(needs_sync_) - const_cast(this)->sync(); + const_cast(this)->sync(); // if(!is_disabled()) return synfig::Rect::full_plane(); }