* Copyright 1995 Matthias Ettrich
* Copyright 1995-1999 The LyX Team.
*
- * ======================================================*/
+ * ====================================================== */
#include <config.h>
#endif
#include "insetcommand.h"
-#include "lyxdraw.h"
#include "debug.h"
+#include "Painter.h"
InsetCommand::InsetCommand()
{
}
-InsetCommand::~InsetCommand()
-{
-}
-
-
-int InsetCommand::Ascent(LyXFont const & font) const
+int InsetCommand::ascent(Painter & pain, LyXFont const &) const
{
+#if 1
+ 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;
+#else
LyXFont f = font;
f.decSize();
return f.maxAscent() + 3;
+#endif
}
-int InsetCommand::Descent(LyXFont const & font) const
+int InsetCommand::descent(Painter & pain, LyXFont const &) const
{
+#if 1
+ 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;
+#else
LyXFont f = font;
f.decSize();
return f.maxDescent() + 3;
+#endif
}
-int InsetCommand::Width(LyXFont const & font) const
+int InsetCommand::width(Painter & pain, LyXFont const &) const
{
+#if 1
+ 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;
+#else
LyXFont f = font;
f.decSize();
string s = getScreenLabel();
return 10 + f.stringWidth(s);
+#endif
}
-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
+#if 1
+ LyXFont font(LyXFont::ALL_SANE);
+ font.setColor(LColor::command).decSize();
+
+ int width;
+ string s = getScreenLabel();
+
+ if (Editable()) {
+ pain.buttonText(int(x), baseline, s, font, true, width);
+ } else {
+ pain.rectText(int(x), baseline, s, font,
+ LColor::commandbg, LColor::commandframe,
+ true, width);
+ }
+
+ x += width;
+#else
+
x += 3;
- scr.fillRectangle(gc_lighted,
- int(x), baseline - Ascent(font) + 1,
- Width(font) - 6,
- Ascent(font) + Descent(font)-2);
+ pain.fillRectangle(int(x), baseline - ascent(pain, font) + 1,
+ width(pain, font) - 6,
+ ascent(pain, font) + descent(pain, font) - 2,
+ LColor::insetbg);
// 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);
+ int y = baseline - ascent(pain, font) + 1;
+ int w = width(pain, font) - 6;
+ int h = ascent(pain, font) + descent(pain, font) - 2;
+ pain.rectangle(int(x), y, w, h, LColor::insetframe);
} else {
- scr.drawRectangle(gc_note_frame,
- int(x), baseline - Ascent(font)+1,
- Width(font)-6,
- Ascent(font)+Descent(font)-2);
+
+ pain.rectangle(int(x), baseline - ascent(pain, font) + 1,
+ width(pain, font) - 6,
+ ascent(pain, font) + descent(pain, font) - 2,
+ LColor::insetframe);
}
string s = getScreenLabel();
- LyXFont f = font;
+ LyXFont f(font);
f.decSize();
- f.setColor(LyXFont::NONE);
+ f.setColor(LColor::none);
f.setLatex(LyXFont::OFF);
- scr.drawString(f, s, baseline, int(x+2));
-
- x += Width(font) - 3;
+ pain.text(int(x + 2), baseline, s, f);
+
+ x += width(pain, font) - 3;
+#endif
}
// 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";
}
for (string::size_type i = 0; i < cmd.length(); ++i) {
char c = cmd[i];
- if ((state==Command && c == ' ') ||
- (state==Command && c == '[') ||
- (state==Command && c == '{')) {
+ if ((state == Command && c == ' ') ||
+ (state == Command && c == '[') ||
+ (state == Command && c == '{')) {
state = WS;
}
- if ((state==Option && c == ']') ||
- (state==Content && c == '}')) {
- if (nestdepth==0) {
+ if ((state == Option && c == ']') ||
+ (state == Content && c == '}')) {
+ if (nestdepth == 0) {
state = WS;
} else {
- nestdepth--;
+ --nestdepth;
}
}
- if ((state==Option && c == '[') ||
- (state==Content && c == '{')) {
- nestdepth++;
+ if ((state == Option && c == '[') ||
+ (state == Content && c == '{')) {
+ ++nestdepth;
}
switch (state) {
case Command: tcommand += c; break;
}
-int InsetCommand::Latex(FILE * file, signed char /*fragile*/)
+int InsetCommand::Latex(ostream & os, signed char /*fragile*/) const
{
- fprintf(file, "%s", getCommand().c_str());
+ os << getCommand();
return 0;
}
-int InsetCommand::Latex(string & file, signed char /*fragile*/)
+#ifndef USE_OSTREAM_ONLY
+int InsetCommand::Latex(string & file, signed char /*fragile*/) const
{
file += getCommand();
return 0;
}
-int InsetCommand::Linuxdoc(string &/*file*/)
+int InsetCommand::Linuxdoc(string &/*file*/) const
{
return 0;
}
-int InsetCommand::DocBook(string &/*file*/)
+int InsetCommand::DocBook(string &/*file*/) const
{
return 0;
}
+#else
+
+int InsetCommand::Linuxdoc(ostream &) const
+{
+ return 0;
+}
+
+
+int InsetCommand::DocBook(ostream &) const
+{
+ return 0;
+}
+#endif
+
-Inset * InsetCommand::Clone()
+Inset * InsetCommand::Clone() const
{
- InsetCommand * result = new InsetCommand(command, contents, options);
- return result;
+ return new InsetCommand(command, contents, options);
}
projects / lyx.git / blobdiff