X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcommand.C;h=69322ae8905cc40caa50164553a0d2bf939f3760;hb=3c8aba3b556871fb1100a2f98cd93d5d4e3f70c9;hp=595e644fbc3c97b9a2fb5489dfc0878cb00256aa;hpb=1d7d3cc4afa2205c801ccc2aa71c7ac59359dc5f;p=lyx.git

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index 595e644fbc..69322ae890 100644
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  * 	 
  *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -15,8 +15,12 @@
 #endif
 
 #include "insetcommand.h"
-#include "lyxdraw.h"
 #include "debug.h"
+#include "Painter.h"
+
+using std::ostream;
+using std::endl;
+
 
 InsetCommand::InsetCommand()
 {
@@ -30,68 +34,92 @@ InsetCommand::InsetCommand(string const & cmd, string const & arg,
 }
 
 
-int InsetCommand::Ascent(LyXFont const & font) const
+int InsetCommand::ascent(Painter & pain, LyXFont const &) const
 {
-	LyXFont f = font;
-	f.decSize();
-	return f.maxAscent() + 3;
+	LyXFont font(LyXFont::ALL_SANE);
+	font.decSize();
+	
+	int width, ascent, descent;
+        string s = getScreenLabel();
+	
+        if (Editable()) {
+		pain.buttonText(0, 0, s, font,
+				false, width, ascent, descent);
+	} else {
+		pain.rectText(0, 0, s, font,
+			      LColor::commandbg, LColor::commandframe,
+			      false, width, ascent, descent);
+	}
+	return ascent;
 }
 
 
-int InsetCommand::Descent(LyXFont const & font) const
+int InsetCommand::descent(Painter & pain, LyXFont const &) const
 {
-	LyXFont f = font;
-	f.decSize();
-	return f.maxDescent() + 3;
+	LyXFont font(LyXFont::ALL_SANE);
+	font.decSize();
+	
+	int width, ascent, descent;
+        string s = getScreenLabel();
+	
+        if (Editable()) {
+		pain.buttonText(0, 0, s, font,
+				false, width, ascent, descent);
+	} else {
+		pain.rectText(0, 0, s, font,
+			      LColor::commandbg, LColor::commandframe,
+			      false, width, ascent, descent);
+	}
+	return descent;
 }
 
 
-int InsetCommand::Width(LyXFont const & font) const
+int InsetCommand::width(Painter & pain, LyXFont const &) const
 {
-	LyXFont f = font;
-	f.decSize();
-	string s = getScreenLabel();
-	return 10 + f.stringWidth(s);
+	LyXFont font(LyXFont::ALL_SANE);
+	font.decSize();
+	
+	int width, ascent, descent;
+        string s = getScreenLabel();
+	
+        if (Editable()) {
+		pain.buttonText(0, 0, s, font,
+				false, width, ascent, descent);
+	} else {
+		pain.rectText(0, 0, s, font,
+			      LColor::commandbg, LColor::commandframe,
+			      false, width, ascent, descent);
+	}
+	return width + 4;
 }
 
 
-void InsetCommand::Draw(LyXFont font, LyXScreen & scr,
-		      int baseline, float & x)
+void InsetCommand::draw(Painter & pain, LyXFont const &,
+			int baseline, float & x) const
 {
 	// Draw it as a box with the LaTeX text
-	x += 3;
-
-	scr.fillRectangle(gc_lighted,
-			  int(x), baseline - Ascent(font) + 1,
-			  Width(font) - 6,
-			  Ascent(font) + Descent(font)-2);
-        // Tell whether this slows down the drawing  (ale)
-	// lets draw editable and non-editable insets differently
-        if (Editable()) {
-		int y = baseline - Ascent(font)+1, w = Width(font)-6,
-			h = (Ascent(font)+Descent(font)-2);
-		scr.drawFrame(FL_UP_FRAME, int(x), y, w, h, FL_BLACK, -1);
+	LyXFont font(LyXFont::ALL_SANE);
+	font.setColor(LColor::command).decSize();
+
+	int width;
+	string s = getScreenLabel();
+
+	if (Editable()) {
+		pain.buttonText(int(x)+2, baseline, s, font, true, width);
 	} else {
-		scr.drawRectangle(gc_note_frame,
-				  int(x), baseline - Ascent(font)+1,
-				  Width(font)-6,
-				  Ascent(font)+Descent(font)-2); 
+		pain.rectText(int(x)+2, baseline, s, font,
+			      LColor::commandbg, LColor::commandframe,
+			      true, width);
 	}
-        string s = getScreenLabel();
-       	LyXFont f = font;
-	f.decSize();
-	f.setColor(LyXFont::NONE);
-	f.setLatex(LyXFont::OFF);
-	scr.drawString(f, s, baseline, int(x+2));
 
-	x +=  Width(font) - 3;
+	x += width + 4;
 }
 
 
 // In lyxf3 this will be just LaTeX
-void InsetCommand::Write(FILE * file)
+void InsetCommand::Write(ostream & os) const
 {
-	fprintf(file, "LatexCommand %s\n", getCommand().c_str());
+	os << "LatexCommand " << getCommand() << "\n";
 }
 
 
@@ -118,12 +146,12 @@ void InsetCommand::scanCommand(string const & cmd)
 			if (nestdepth == 0) {
 				state = WS;
 			} else {
-				nestdepth--;
+				--nestdepth;
 			}
 		}
 		if ((state == Option  && c == '[') ||
 		    (state == Content && c == '{')) {
-		    	nestdepth++;
+		    	++nestdepth;
 		}
 		switch (state) {
 		case Command:	tcommand += c; break;
@@ -169,33 +197,32 @@ void InsetCommand::Read(LyXLex & lex)
 }
 
 
-int InsetCommand::Latex(FILE * file, signed char /*fragile*/)
+int InsetCommand::Latex(ostream & os, bool /*fragile*/, bool/*fs*/) const
 {
-	fprintf(file, "%s", getCommand().c_str());
+	os << getCommand();
 	return 0;
 }
 
 
-int InsetCommand::Latex(string & file, signed char /*fragile*/)
+int InsetCommand::Ascii(ostream &) const
 {
-	file += getCommand();
 	return 0;
 }
 
 
-int InsetCommand::Linuxdoc(string &/*file*/)
+int InsetCommand::Linuxdoc(ostream &) const
 {
 	return 0;
 }
 
 
-int InsetCommand::DocBook(string &/*file*/)
+int InsetCommand::DocBook(ostream &) const
 {
 	return 0;
 }
 
 
-InsetCommand * InsetCommand::Clone() const
+Inset * InsetCommand::Clone() const
 {
 	return new InsetCommand(command, contents, options);
 }