From 3a117a899c6abb192f2498e88cc30997ad5763c2 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Fri, 24 May 2002 14:19:19 +0000 Subject: Get rid of as many compiler warnings as possible. Add missing offbits seek when reading BMP files. Add -OPT:Olimit=4000 to SGI compiler options (for keyboard_ui) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2253 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Text_Display.cxx | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'src/Fl_Text_Display.cxx') diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index 74303de78..6548c1787 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Text_Display.cxx,v 1.12.2.14 2002/05/21 11:14:59 easysw Exp $" +// "$Id: Fl_Text_Display.cxx,v 1.12.2.15 2002/05/24 14:19:19 easysw Exp $" // // Copyright 2001-2002 by Bill Spitzak and others. // Original code Copyright Mark Edel. Permission to distribute under @@ -881,8 +881,8 @@ void Fl_Text_Display::draw_vline(int visLineNum, int leftClip, int rightClip, Fl_Text_Buffer * buf = mBuffer; int i, X, Y, startX, charIndex, lineStartPos, lineLen, fontHeight; int stdCharWidth, charWidth, startIndex, charStyle, style; - int charLen, outStartIndex, outIndex, cursorX, hasCursor = 0; - int dispIndexOffset, cursorPos = mCursorPos; + int charLen, outStartIndex, outIndex; + int dispIndexOffset; char expandedChar[ FL_TEXT_MAX_EXP_CHAR_LEN ], outStr[ MAX_DISP_LINE_LEN ]; char *outPtr; const char *lineStr; @@ -960,16 +960,6 @@ void Fl_Text_Display::draw_vline(int visLineNum, int leftClip, int rightClip, outIndex = outStartIndex; X = startX; for ( charIndex = startIndex; charIndex < rightCharIndex; charIndex++ ) { - if ( lineStartPos + charIndex == cursorPos ) { - if ( charIndex < lineLen || ( charIndex == lineLen && - cursorPos >= buf->length() ) ) { - hasCursor = 1; // CET - FIXME - cursorX = X - 1; - } else if ( charIndex == lineLen ) { - hasCursor = 1; - cursorX = X - 1; - } - } charLen = charIndex >= lineLen ? 1 : Fl_Text_Buffer::expand_character( lineStr[ charIndex ], outIndex, expandedChar, buf->tab_distance(), buf->null_substitution_character() ); @@ -1958,5 +1948,5 @@ int Fl_Text_Display::handle(int event) { // -// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.14 2002/05/21 11:14:59 easysw Exp $". +// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.15 2002/05/24 14:19:19 easysw Exp $". // -- cgit v1.2.3