mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

librdtk: improve text positioning

This commit is contained in:
Marc-André Moreau 2014-10-01 12:18:17 -04:00
parent 75d609741a
commit 7da4621334
16 changed files with 344 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rdtk/include/rdtk/rdtk.h
View File

@ -32,6 +32,7 @@ typedef struct rdtk_font rdtkFont;
typedef struct rdtk_glyph rdtkGlyph;
typedef struct rdtk_surface rdtkSurface;
typedef struct rdtk_button rdtkButton;
typedef struct rdtk_label rdtkLabel;
typedef struct rdtk_text_field rdtkTextField;
typedef struct rdtk_nine_patch rdtkNinePatch;
@ -60,6 +61,11 @@ RDTK_EXPORT int rdtk_font_draw_text(rdtkSurface* surface, int nXDst, int nYDst,
RDTK_EXPORT int rdtk_button_draw(rdtkSurface* surface, int nXDst, int nYDst, int nWidth, int nHeight,
rdtkButton* button, const char* text);
/* Label */
RDTK_EXPORT int rdtk_label_draw(rdtkSurface* surface, int nXDst, int nYDst, int nWidth, int nHeight,
rdtkLabel* label, const char* text, int hAlign, int vAlign);
/* TextField */
RDTK_EXPORT int rdtk_text_field_draw(rdtkSurface* surface, int nXDst, int nYDst, int nWidth, int nHeight,

2
rdtk/librdtk/CMakeLists.txt
View File

@ -28,6 +28,8 @@ set(${MODULE_PREFIX}_SRCS
rdtk_font.h
rdtk_button.c
rdtk_button.h
rdtk_label.c
rdtk_label.h
rdtk_nine_patch.c
rdtk_nine_patch.h
rdtk_text_field.c

54
rdtk/librdtk/rdtk_button.c
View File

@ -20,14 +20,52 @@
#include "config.h"
#endif
#include "rdtk_font.h"
#include "rdtk_button.h"
int rdtk_button_draw(rdtkSurface* surface, int nXDst, int nYDst, int nWidth, int nHeight,
rdtkButton* button, const char* text)
{
button = surface->engine->button;
int offsetX;
int offsetY;
int textWidth;
int textHeight;
int fillWidth;
int fillHeight;
rdtkFont* font;
rdtkEngine* engine;
rdtkNinePatch* ninePatch;
rdtk_nine_patch_draw(surface, nXDst, nYDst, nWidth, nHeight, button->ninePatch);
engine = surface->engine;
font = engine->font;
button = engine->button;
ninePatch = button->ninePatch;
rdtk_font_text_draw_size(font, &textWidth, &textHeight, text);
rdtk_nine_patch_draw(surface, nXDst, nYDst, nWidth, nHeight, ninePatch);
if ((textWidth > 0) && (textHeight > 0))
{
fillWidth = nWidth - (ninePatch->width - ninePatch->fillWidth);
fillHeight = nHeight - (ninePatch->height - ninePatch->fillHeight);
offsetX = ninePatch->fillLeft;
offsetY = ninePatch->fillTop;
if (textWidth < fillWidth)
offsetX = ((fillWidth - textWidth) / 2) + ninePatch->fillLeft;
else if (textWidth < ninePatch->width)
offsetX = ((ninePatch->width - textWidth) / 2);
if (textHeight < fillHeight)
offsetY = ((fillHeight - textHeight) / 2) + ninePatch->fillTop;
else if (textHeight < ninePatch->height)
offsetY = ((ninePatch->height - textHeight) / 2);
rdtk_font_draw_text(surface, nXDst + offsetX, nYDst + offsetY, font, text);
}
return 1;
}
@ -64,3 +102,15 @@ int rdtk_button_engine_init(rdtkEngine* engine)
return 1;
}
int rdtk_button_engine_uninit(rdtkEngine* engine)
{
if (engine->button)
{
rdtk_button_free(engine->button);
engine->button = NULL;
}
return 1;
}

1
rdtk/librdtk/rdtk_button.h
View File

@ -37,6 +37,7 @@ extern "C" {
#endif
int rdtk_button_engine_init(rdtkEngine* engine);
int rdtk_button_engine_uninit(rdtkEngine* engine);
rdtkButton* rdtk_button_new(rdtkEngine* engine, rdtkNinePatch* ninePatch);
void rdtk_button_free(rdtkButton* button);

5
rdtk/librdtk/rdtk_engine.c
View File

@ -49,5 +49,10 @@ void rdtk_engine_free(rdtkEngine* engine)
if (!engine)
return;
rdtk_font_engine_uninit(engine);
rdtk_nine_patch_engine_uninit(engine);
rdtk_button_engine_uninit(engine);
rdtk_text_field_engine_uninit(engine);
free(engine);
}

2
rdtk/librdtk/rdtk_engine.h
View File

@ -25,6 +25,8 @@ struct rdtk_engine
{
rdtkFont* font;
rdtkLabel* label;
rdtkButton* button;
rdtkNinePatch* button9patch;

53
rdtk/librdtk/rdtk_font.c
View File

@ -137,6 +137,34 @@ int rdtk_font_draw_text(rdtkSurface* surface, int nXDst, int nYDst, rdtkFont* fo
return 1;
}
int rdtk_font_text_draw_size(rdtkFont* font, int* width, int* height, const char* text)
{
int index;
int length;
int glyphIndex;
rdtkGlyph* glyph;
*width = 0;
*height = 0;
length = strlen(text);
for (index = 0; index < length; index++)
{
glyphIndex = text[index] - 32;
if (glyphIndex < font->glyphCount)
{
glyph = &font->glyphs[glyphIndex];
*width += (glyph->width + 1);
}
}
*height = font->height + 2;
return 1;
}
char* rdtk_font_load_descriptor_file(const char* filename, int* pSize)
{
BYTE* buffer;
@ -618,7 +646,9 @@ rdtkFont* rdtk_font_new(rdtkEngine* engine, const char* path, const char* file)
rdtkFont* rdtk_embedded_font_new(rdtkEngine* engine, BYTE* imageData, int imageSize, BYTE* descriptorData, int descriptorSize)
{
int size;
int status;
BYTE* buffer;
rdtkFont* font;
font = (rdtkFont*) calloc(1, sizeof(rdtkFont));
@ -638,7 +668,17 @@ rdtkFont* rdtk_embedded_font_new(rdtkEngine* engine, BYTE* imageData, int imageS
if (status < 0)
return NULL;
status = rdtk_font_parse_descriptor_buffer(font, descriptorData, descriptorSize);
size = descriptorSize;
buffer = (BYTE*) malloc(size);
if (!buffer)
return NULL;
CopyMemory(buffer, descriptorData, size);
status = rdtk_font_parse_descriptor_buffer(font, buffer, size);
free(buffer);
return font;
}
@ -671,3 +711,14 @@ int rdtk_font_engine_init(rdtkEngine* engine)
return 1;
}
int rdtk_font_engine_uninit(rdtkEngine* engine)
{
if (engine->font)
{
rdtk_font_free(engine->font);
engine->font = NULL;
}
return 1;
}

3
rdtk/librdtk/rdtk_font.h
View File

@ -56,7 +56,10 @@ struct rdtk_font
extern "C" {
#endif
int rdtk_font_text_draw_size(rdtkFont* font, int* width, int* height, const char* text);
int rdtk_font_engine_init(rdtkEngine* engine);
int rdtk_font_engine_uninit(rdtkEngine* engine);
rdtkFont* rdtk_font_new(rdtkEngine* engine, const char* path, const char* file);
void rdtk_font_free(rdtkFont* font);

100
rdtk/librdtk/rdtk_label.c Normal file
View File

@ -0,0 +1,100 @@
/**
* RdTk: Remote Desktop Toolkit
*
* Copyright 2014 Marc-Andre Moreau <marcandre.moreau@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "rdtk_font.h"
#include "rdtk_label.h"
int rdtk_label_draw(rdtkSurface* surface, int nXDst, int nYDst, int nWidth, int nHeight,
rdtkLabel* label, const char* text, int hAlign, int vAlign)
{
int offsetX;
int offsetY;
int textWidth;
int textHeight;
rdtkFont* font;
rdtkEngine* engine;
engine = surface->engine;
font = engine->font;
rdtk_font_text_draw_size(font, &textWidth, &textHeight, text);
if ((textWidth > 0) && (textHeight > 0))
{
offsetX = 0;
offsetY = 0;
if (textWidth < nWidth)
offsetX = ((nWidth - textWidth) / 2);
if (textHeight < nHeight)
offsetY = ((nHeight - textHeight) / 2);
rdtk_font_draw_text(surface, nXDst + offsetX, nYDst + offsetY, font, text);
}
return 1;
}
rdtkLabel* rdtk_label_new(rdtkEngine* engine)
{
rdtkLabel* label;
label = (rdtkLabel*) calloc(1, sizeof(rdtkLabel));
if (!label)
return NULL;
label->engine = engine;
return label;
}
void rdtk_label_free(rdtkLabel* label)
{
if (!label)
return;
free(label);
}
int rdtk_label_engine_init(rdtkEngine* engine)
{
if (!engine->label)
{
engine->label = rdtk_label_new(engine);
}
return 1;
}
int rdtk_label_engine_uninit(rdtkEngine* engine)
{
if (engine->label)
{
rdtk_label_free(engine->label);
engine->label = NULL;
}
return 1;
}

48
rdtk/librdtk/rdtk_label.h Normal file
View File

@ -0,0 +1,48 @@
/**
* RdTk: Remote Desktop Toolkit
*
* Copyright 2014 Marc-Andre Moreau <marcandre.moreau@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef RDTK_LABEL_PRIVATE_H
#define RDTK_LABEL_PRIVATE_H
#include <rdtk/rdtk.h>
#include "rdtk_surface.h"
#include "rdtk_engine.h"
struct rdtk_label
{
rdtkEngine* engine;
};
#ifdef __cplusplus
extern "C" {
#endif
int rdtk_label_engine_init(rdtkEngine* engine);
int rdtk_label_engine_uninit(rdtkEngine* engine);
rdtkLabel* rdtk_label_new(rdtkEngine* engine);
void rdtk_label_free(rdtkLabel* label);
#ifdef __cplusplus
}
#endif
#endif /* RDTK_LABEL_PRIVATE_H */

17
rdtk/librdtk/rdtk_nine_patch.c
View File

@ -494,3 +494,20 @@ int rdtk_nine_patch_engine_init(rdtkEngine* engine)
return 1;
}
int rdtk_nine_patch_engine_uninit(rdtkEngine* engine)
{
if (engine->button9patch)
{
rdtk_nine_patch_free(engine->button9patch);
engine->button9patch = NULL;
}
if (engine->textField9patch)
{
rdtk_nine_patch_free(engine->textField9patch);
engine->textField9patch = NULL;
}
return 1;
}

1
rdtk/librdtk/rdtk_nine_patch.h
View File

@ -61,6 +61,7 @@ int rdtk_nine_patch_set_image(rdtkNinePatch* ninePatch, wImage* image);
int rdtk_nine_patch_draw(rdtkSurface* surface, int nXDst, int nYDst, int nWidth, int nHeight, rdtkNinePatch* ninePatch);
int rdtk_nine_patch_engine_init(rdtkEngine* engine);
int rdtk_nine_patch_engine_uninit(rdtkEngine* engine);
rdtkNinePatch* rdtk_nine_patch_new(rdtkEngine* engine);
void rdtk_nine_patch_free(rdtkNinePatch* ninePatch);

53
rdtk/librdtk/rdtk_text_field.c
View File

@ -20,14 +20,52 @@
#include "config.h"
#endif
#include "rdtk_font.h"
#include "rdtk_text_field.h"
int rdtk_text_field_draw(rdtkSurface* surface, int nXDst, int nYDst, int nWidth, int nHeight,
rdtkTextField* textField, const char* text)
{
textField = surface->engine->textField;
int offsetX;
int offsetY;
int textWidth;
int textHeight;
int fillWidth;
int fillHeight;
rdtkFont* font;
rdtkEngine* engine;
rdtkNinePatch* ninePatch;
rdtk_nine_patch_draw(surface, nXDst, nYDst, nWidth, nHeight, textField->ninePatch);
engine = surface->engine;
font = engine->font;
textField = surface->engine->textField;
ninePatch = textField->ninePatch;
rdtk_font_text_draw_size(font, &textWidth, &textHeight, text);
rdtk_nine_patch_draw(surface, nXDst, nYDst, nWidth, nHeight, ninePatch);
if ((textWidth > 0) && (textHeight > 0))
{
fillWidth = nWidth - (ninePatch->width - ninePatch->fillWidth);
fillHeight = nHeight - (ninePatch->height - ninePatch->fillHeight);
offsetX = ninePatch->fillLeft;
offsetY = ninePatch->fillTop;
if (textWidth < fillWidth)
offsetX = ((fillWidth - textWidth) / 2) + ninePatch->fillLeft;
else if (textWidth < ninePatch->width)
offsetX = ((ninePatch->width - textWidth) / 2);
if (textHeight < fillHeight)
offsetY = ((fillHeight - textHeight) / 2) + ninePatch->fillTop;
else if (textHeight < ninePatch->height)
offsetY = ((ninePatch->height - textHeight) / 2);
rdtk_font_draw_text(surface, nXDst + offsetX, nYDst + offsetY, font, text);
}
return 1;
}
@ -64,3 +102,14 @@ int rdtk_text_field_engine_init(rdtkEngine* engine)
return 1;
}
int rdtk_text_field_engine_uninit(rdtkEngine* engine)
{
if (engine->textField)
{
rdtk_text_field_free(engine->textField);
engine->textField = NULL;
}
return 1;
}

1
rdtk/librdtk/rdtk_text_field.h
View File

@ -37,6 +37,7 @@ extern "C" {
#endif
int rdtk_text_field_engine_init(rdtkEngine* engine);
int rdtk_text_field_engine_uninit(rdtkEngine* engine);
rdtkTextField* rdtk_text_field_new(rdtkEngine* engine, rdtkNinePatch* ninePatch);
void rdtk_text_field_free(rdtkTextField* textField);

3
server/shadow/shadow_lobby.c
View File

@ -50,8 +50,7 @@ int shadow_client_init_lobby(rdpShadowClient* client)
surface = rdtk_surface_new(engine, lobby->data, lobby->width, lobby->height, lobby->scanline);
rdtk_surface_fill(surface, 0, 0, width, height, 0x3BB9FF);
//rdtk_font_draw_text(surface, 16, 16, NULL, "Welcome to the shadow server!");
//rdtk_label_draw(surface, 16, 16, 128, 32, NULL, "label", 0, 0);
//rdtk_button_draw(surface, 16, 64, 128, 32, NULL, "button");
//rdtk_text_field_draw(surface, 16, 128, 128, 32, NULL, "text field");

2
winpr/tools/makecert/makecert.c
View File

@ -446,6 +446,7 @@ int makecert_context_parse_arguments(MAKECERT_CONTEXT* context, int argc, char**
int makecert_context_set_output_file_name(MAKECERT_CONTEXT* context, char* name)
{
free(context->output_file);
context->output_file = _strdup(name);
return 1;
}
@ -967,6 +968,7 @@ void makecert_context_free(MAKECERT_CONTEXT* context)
EVP_PKEY_free(context->pkey);
free(context->default_name);
free(context->common_name);
CRYPTO_cleanup_all_ex_data();