projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add auto next/prev tab (alt-a), update shortcuts, fix keyframe paste track tabbing...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
guicast
/
bcwindowdraw.C
diff --git
a/cinelerra-5.1/guicast/bcwindowdraw.C
b/cinelerra-5.1/guicast/bcwindowdraw.C
index ab44e7cc9b5fec47a9b49e9b6bbd70614d7e61f0..eb35b63e7ca34e2cf0fed664a641e2926d24b187 100644
(file)
--- a/
cinelerra-5.1/guicast/bcwindowdraw.C
+++ b/
cinelerra-5.1/guicast/bcwindowdraw.C
@@
-211,21
+211,21
@@
void BC_WindowBase::draw_xft_text(int x, int y,
const char *text, int length, BC_Pixmap *pixmap, int is_utf8)
{
int l = length + 1;
const char *text, int length, BC_Pixmap *pixmap, int is_utf8)
{
int l = length + 1;
- wch
a
r_t wide_text[l];
+ wchr_t wide_text[l];
length = BC_Resources::encode(
is_utf8 ? "UTF8" : BC_Resources::encoding, BC_Resources::wide_encoding,
length = BC_Resources::encode(
is_utf8 ? "UTF8" : BC_Resources::encoding, BC_Resources::wide_encoding,
- (char*)text, length, (char*)wide_text, l*sizeof(wch
ar_t)) / sizeof(wcha
r_t);
+ (char*)text, length, (char*)wide_text, l*sizeof(wch
r_t)) / sizeof(wch
r_t);
draw_xft_text(x, y, wide_text, length, pixmap);
}
void BC_WindowBase::draw_xft_text(int x, int y,
draw_xft_text(x, y, wide_text, length, pixmap);
}
void BC_WindowBase::draw_xft_text(int x, int y,
- const wch
a
r_t *text, int length, BC_Pixmap *pixmap)
+ const wchr_t *text, int length, BC_Pixmap *pixmap)
{
int dy = -1;
{
int dy = -1;
- const wch
a
r_t *wsp = text, *wep = wsp + length;
+ const wchr_t *wsp = text, *wep = wsp + length;
int font = top_level->current_font;
while( wsp < wep ) {
int font = top_level->current_font;
while( wsp < wep ) {
- const wch
a
r_t *wcp = wsp;
+ const wchr_t *wcp = wsp;
while( wcp < wep && *wcp != '\n' ) ++wcp;
int len = wcp - wsp;
if( len > 0 )
while( wcp < wep && *wcp != '\n' ) ++wcp;
int len = wcp - wsp;
if( len > 0 )
@@
-272,16
+272,16
@@
void BC_WindowBase::xft_draw_string(XftColor *xft_color, XftFont *xft_font,
}
}
}
}
-int BC_WindowBase::get_single_text_width(int font, const wch
a
r_t *text, int length)
+int BC_WindowBase::get_single_text_width(int font, const wchr_t *text, int length)
{
return draw_single_text(0, font, 0,0, text, length);
}
int BC_WindowBase::draw_single_text(int draw, int font,
{
return draw_single_text(0, font, 0,0, text, length);
}
int BC_WindowBase::draw_single_text(int draw, int font,
- int x, int y, const wch
a
r_t *text, int length, BC_Pixmap *pixmap)
+ int x, int y, const wchr_t *text, int length, BC_Pixmap *pixmap)
{
if( length < 0 )
{
if( length < 0 )
- length = w
cs
len(text);
+ length = w
str
len(text);
if( !length ) return 0;
if( !get_resources()->use_xft ) {
if( !length ) return 0;
if( !get_resources()->use_xft ) {
@@
-319,7
+319,7
@@
int BC_WindowBase::draw_single_text(int draw, int font,
int x0 = x;
XftFont *basefont = top_level->get_xft_struct(font);
XftFont *curfont = 0, *altfont = 0;
int x0 = x;
XftFont *basefont = top_level->get_xft_struct(font);
XftFont *curfont = 0, *altfont = 0;
- const wch
a
r_t *up = text, *ubp = up, *uep = ubp + length;
+ const wchr_t *up = text, *ubp = up, *uep = ubp + length;
while( up < uep ) {
XftFont *xft_font = 0;
while( up < uep ) {
XftFont *xft_font = 0;