|
|
@ -261,7 +261,7 @@ XUtf8FontStruct* fl_xfont; |
|
|
|
void *fl_xftfont = 0; |
|
|
|
void *fl_xftfont = 0; |
|
|
|
static GC font_gc; |
|
|
|
static GC font_gc; |
|
|
|
|
|
|
|
|
|
|
|
void fl_font(Fl_Font fnum, Fl_Fontsize size) { |
|
|
|
void Fl_Device::font(Fl_Font fnum, Fl_Fontsize size) { |
|
|
|
if (fnum==-1) { |
|
|
|
if (fnum==-1) { |
|
|
|
fl_font_ = 0; fl_size_ = 0; |
|
|
|
fl_font_ = 0; fl_size_ = 0; |
|
|
|
return; |
|
|
|
return; |
|
|
@ -310,7 +310,7 @@ void fl_text_extents(const char *c, int n, int &dx, int &dy, int &W, int &H) { |
|
|
|
} // fl_text_extents
|
|
|
|
} // fl_text_extents
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void fl_draw(const char* c, int n, int x, int y) { |
|
|
|
void Fl_Device::draw(const char* c, int n, int x, int y) { |
|
|
|
if (font_gc != fl_gc) { |
|
|
|
if (font_gc != fl_gc) { |
|
|
|
if (!fl_xfont) fl_font(FL_HELVETICA, 14); |
|
|
|
if (!fl_xfont) fl_font(FL_HELVETICA, 14); |
|
|
|
font_gc = fl_gc; |
|
|
|
font_gc = fl_gc; |
|
|
@ -319,7 +319,7 @@ void fl_draw(const char* c, int n, int x, int y) { |
|
|
|
// XDrawString(fl_display, fl_window, fl_gc, x, y, c, n);
|
|
|
|
// XDrawString(fl_display, fl_window, fl_gc, x, y, c, n);
|
|
|
|
XUtf8DrawString(fl_display, fl_window, fl_xfont, fl_gc, x, y, c, n); |
|
|
|
XUtf8DrawString(fl_display, fl_window, fl_xfont, fl_gc, x, y, c, n); |
|
|
|
} |
|
|
|
} |
|
|
|
void fl_draw(int angle, const char *str, int n, int x, int y) { |
|
|
|
void Fl_Device::draw(int angle, const char *str, int n, int x, int y) { |
|
|
|
fprintf(stderr,"ROTATING TEXT NOT IMPLIMENTED\n"); |
|
|
|
fprintf(stderr,"ROTATING TEXT NOT IMPLIMENTED\n"); |
|
|
|
fl_draw(str, n, (int)x, (int)y); |
|
|
|
fl_draw(str, n, (int)x, (int)y); |
|
|
|
} |
|
|
|
} |
|
|
|