Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-27 10:57:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Finish removal of platform-dependent code from Fl_Input_.cxx

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11487 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2016-03-31 17:41:45 +00:00
parent 2de2f54968
commit 740760109d
1 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_Input_.cxx
+7 -20
View File
@@ -28,13 +28,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
#if defined(WIN32) || defined(__APPLE__) // platform editor look and feel
#elif defined(FL_PORTING)
# pragma message "FL_PORTING: manage character composing here"
#else
#endif
#define MAXBUF 1024 #define MAXBUF 1024
static int l_secret; static int l_secret;
@@ -342,25 +335,21 @@ void Fl_Input_::drawtext(int X, int Y, int W, int H) {
int offset2; int offset2;
if (pp <= e) x2 = xpos + (float)expandpos(p, pp, buf, &offset2); if (pp <= e) x2 = xpos + (float)expandpos(p, pp, buf, &offset2);
else offset2 = (int) strlen(buf); else offset2 = (int) strlen(buf);
#ifdef __APPLE__ // PORTME: Fl_Screen_Driver - Mac OS: underline marked ( = selected + Fl::compose_state != 0) text if (Fl::screen_driver()->has_marked_text() && Fl::compose_state) {
if (Fl::compose_state) {
fl_color(textcolor()); fl_color(textcolor());
} }
else else
#endif
{ {
fl_color(selection_color()); fl_color(selection_color());
fl_rectf((int)(x1+0.5), Y+ypos, (int)(x2-x1+0.5), height); fl_rectf((int)(x1+0.5), Y+ypos, (int)(x2-x1+0.5), height);
fl_color(fl_contrast(textcolor(), selection_color())); fl_color(fl_contrast(textcolor(), selection_color()));
} }
fl_draw(buf+offset1, offset2-offset1, x1, (float)(Y+ypos+desc)); fl_draw(buf+offset1, offset2-offset1, x1, (float)(Y+ypos+desc));
#ifdef __APPLE__ // PORTME: Fl_Screen_Driver - Mac OS: underline marked ( = selected + Fl::compose_state != 0) text if (Fl::screen_driver()->has_marked_text() && Fl::compose_state) {
if (Fl::compose_state) {
fl_color( fl_color_average(textcolor(), color(), 0.6) ); fl_color( fl_color_average(textcolor(), color(), 0.6) );
float width = fl_width(buf+offset1, offset2-offset1); float width = fl_width(buf+offset1, offset2-offset1);
fl_line(x1, Y+ypos+height-1, x1+width, Y+ypos+height-1); fl_line(x1, Y+ypos+height-1, x1+width, Y+ypos+height-1);
} }
#endif
if (pp < e) { if (pp < e) {
fl_color(tc); fl_color(tc);
fl_draw(buf+offset2, (int) strlen(buf+offset2), x2, (float)(Y+ypos+desc)); fl_draw(buf+offset2, (int) strlen(buf+offset2), x2, (float)(Y+ypos+desc));
@@ -376,9 +365,7 @@ void Fl_Input_::drawtext(int X, int Y, int W, int H) {
CONTINUE2: CONTINUE2:
// draw the cursor: // draw the cursor:
if (Fl::focus() == this && ( if (Fl::focus() == this && (
#ifdef __APPLE__ // PORTME: Fl_Screen_Driver - compose (Fl::screen_driver()->has_marked_text() && Fl::compose_state) ||
Fl::compose_state ||
#endif
selstart == selend) && selstart == selend) &&
position() >= p-value() && position() <= e-value()) { position() >= p-value() && position() <= e-value()) {
fl_color(cursor_color()); fl_color(cursor_color());