diff options
| -rw-r--r-- | Makefile | 8 | ||||
| -rwxr-xr-x | cd/src/sim/cd_truetype.c | 177 | ||||
| -rw-r--r-- | src/plugin-luaiup.cc | 2 |
3 files changed, 5 insertions, 182 deletions
@@ -142,7 +142,6 @@ cdpicture.c \ cddebug.c \ cdfontex.c \ sim.c \ -cd_truetype.c \ sim_other.c \ sim_primitives.c \ sim_linepolyfill.c \ @@ -287,13 +286,14 @@ iupmat_getset.c \ iupmatrix.c \ iupmat_scroll.c \ iupmat_edit.c \ -iup_glcanvas_x.c \ iupPPlot.cpp \ iupPPlotInteraction.cpp \ iup_pplot.cpp \ iup_im.c \ iup_image_library.c \ ledc.c \ +lex.yy.c \ +y.tab.c \ iuplua.c \ iuplua_api.c \ il_tree_aux.c \ @@ -349,13 +349,11 @@ il_matrix.c \ il_cells.c \ iuplua_pplot.c \ il_pplot.c \ -iuplua_glcanvas.c \ -il_glcanvas.c \ iuplua_im.c \ iuplua_imglib.c \ plugin-luaiup.cc \ -IUP_LIBS = +IUP_LIBS = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lm WHOLE_SOURCES = \ $(IM_SOURCES) \ diff --git a/cd/src/sim/cd_truetype.c b/cd/src/sim/cd_truetype.c deleted file mode 100755 index be0e860..0000000 --- a/cd/src/sim/cd_truetype.c +++ /dev/null @@ -1,177 +0,0 @@ -/** \file - * \brief Text and Font Simulation using FreeType library. - * - * See Copyright Notice in cd.h - */ - -#include <string.h> -#include <stdlib.h> -#include <memory.h> -#include <stdio.h> - -#include "cd_truetype.h" - -/******************************************* - Inicializa o Rasterizador -********************************************/ - -#ifdef WIN32 -#include <windows.h> -static int ReadStringKey(HKEY base_key, char* key_name, char* value_name, char* value) -{ - HKEY key; - DWORD max_size = 512; - - if (RegOpenKeyEx(base_key, key_name, 0, KEY_READ, &key) != ERROR_SUCCESS) - return 0; - - if (RegQueryValueEx(key, value_name, NULL, NULL, (LPBYTE)value, &max_size) != ERROR_SUCCESS) - { - RegCloseKey(key); - return 0; - } - - RegCloseKey(key); - return 1; -} - -char* GetFontDir(void) -{ - static char font_dir[512]; - if (!ReadStringKey(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "Fonts", font_dir)) - return ""; - else - { - int i, size = (int)strlen(font_dir); - for(i = 0; i < size; i++) - { - if (font_dir[i] == '\\') - font_dir[i] = '/'; - } - return font_dir; - } -} -#endif - -int cdTT_load(cdTT_Text * tt_text, const char *font, int size, double xres, double yres) -{ - char filename[10240]; - FILE *file; /* usado apenas para procurar pelo arquivo */ - FT_Error error; - FT_Face face; - - /* abre arq. no dir. corrente */ - sprintf(filename, "%s.ttf", font); - file = fopen(filename, "r"); - - if (file) - fclose(file); - else - { - /* se nao conseguiu, abre arq. no dir. do cd, */ - char* env = getenv("CDDIR"); - if (env) - { - sprintf(filename, "%s/%s.ttf", env, font); - file = fopen(filename, "r"); - } - - if (file) - fclose(file); - else - { -#ifdef WIN32 - /* no caso do Windows procura no seu diretorio de fontes. */ - sprintf(filename, "%s/%s.ttf", GetFontDir(), font); - file = fopen(filename, "r"); - - if (file) - fclose(file); - else - return 0; -#else - return 0; -#endif - } - } - - error = FT_New_Face(tt_text->library, filename, 0, &face ); - if (error) - return 0; - - /* char_height is 1/64th of points */ - error = FT_Set_Char_Size(face, 0, size*64, (int)(xres*25.4), (int)(yres*25.4)); - if (error) - { - FT_Done_Face(face); - return 0; - } - - if (tt_text->face && tt_text->face != face) - FT_Done_Face(tt_text->face); - - tt_text->face = face; - - tt_text->ascent = face->size->metrics.ascender >> 6; - tt_text->descent = abs(face->size->metrics.descender >> 6); - tt_text->max_height = face->size->metrics.height >> 6; - tt_text->max_width = face->size->metrics.max_advance >> 6; - - if (!face->charmap) - FT_Set_Charmap(face, face->charmaps[0]); - - return 1; -} - -static void cdTT_checkversion(cdTT_Text* tt_text) -{ - FT_Int major, minor, patch; - FT_Library_Version(tt_text->library, &major, &minor, &patch); - if (major != FREETYPE_MAJOR || - minor != FREETYPE_MINOR || - patch != FREETYPE_PATCH) - { - printf("CD - Canvas Draw: Warning - Different FreeType library used!\n" - " Compiled = %d.%d.%d\n" - " RunTime = %d.%d.%d\n", - FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH, major, minor, patch); - } -} - -/******************************************* - Inicializaccao -********************************************/ -cdTT_Text* cdTT_create(void) -{ - cdTT_Text * tt_text = malloc(sizeof(cdTT_Text)); - memset(tt_text, 0, sizeof(cdTT_Text)); - - FT_Init_FreeType(&tt_text->library); - - cdTT_checkversion(tt_text); - - return tt_text; -} - -/******************************************* - Desaloca Recursos -********************************************/ -void cdTT_free(cdTT_Text * tt_text) -{ - if (tt_text->rgba_data) - free(tt_text->rgba_data); - - if (tt_text->face) - FT_Done_Face(tt_text->face); - - FT_Done_FreeType(tt_text->library); - - free(tt_text); -} - -#ifdef SunOS_OLD -void *memmove( void *dest, const void *src, size_t count ) -{ - return memcpy(dest, src, count); -} -#endif diff --git a/src/plugin-luaiup.cc b/src/plugin-luaiup.cc index 7a77eb8..e989d47 100644 --- a/src/plugin-luaiup.cc +++ b/src/plugin-luaiup.cc @@ -21,7 +21,9 @@ #define WEAK #endif +extern "C" { int luaopen_iupluaimglib(lua_State* L); +} static void _init_plugin(Lua * L) { static bool done = false; |