Include a stripped-down version of FLTK in tree and add a USE_INCLUDED_FLTK option to build against it.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4603 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/fltk/src/Fl_Choice.cxx b/common/fltk/src/Fl_Choice.cxx
new file mode 100644
index 0000000..6f3b06f
--- /dev/null
+++ b/common/fltk/src/Fl_Choice.cxx
@@ -0,0 +1,213 @@
+//
+// "$Id: Fl_Choice.cxx 7903 2010-11-28 21:06:39Z matt $"
+//
+// Choice widget for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+// http://www.fltk.org/str.php
+//
+
+#include <FL/Fl.H>
+#include <FL/Fl_Choice.H>
+#include <FL/fl_draw.H>
+#include "flstring.h"
+
+// Emulates the Forms choice widget. This is almost exactly the same
+// as an Fl_Menu_Button. The only difference is the appearance of the
+// button: it draws the text of the current pick and a down-arrow.
+
+void Fl_Choice::draw() {
+ int dx = Fl::box_dx(FL_DOWN_BOX);
+ int dy = Fl::box_dy(FL_DOWN_BOX);
+ int H = h() - 2 * dy;
+ int W = (H > 20) ? 20 : H;
+ int X = x() + w() - W - dx;
+ int Y = y() + dy;
+ int w1 = (W - 4) / 3; if (w1 < 1) w1 = 1;
+ int x1 = X + (W - 2 * w1 - 1) / 2;
+ int y1 = Y + (H - w1 - 1) / 2;
+
+ if (Fl::scheme()) {
+ draw_box(FL_UP_BOX, color());
+
+ fl_color(active_r() ? labelcolor() : fl_inactive(labelcolor()));
+ if (!strcmp(Fl::scheme(), "plastic")) {
+ // Show larger up/down arrows...
+ fl_polygon(x1, y1 + 3, x1 + w1, y1 + w1 + 3, x1 + 2 * w1, y1 + 3);
+ fl_polygon(x1, y1 + 1, x1 + w1, y1 - w1 + 1, x1 + 2 * w1, y1 + 1);
+ } else {
+ // Show smaller up/down arrows with a divider...
+ x1 = x() + w() - 13 - dx;
+ y1 = y() + h() / 2;
+ fl_polygon(x1, y1 - 2, x1 + 3, y1 - 5, x1 + 6, y1 - 2);
+ fl_polygon(x1, y1 + 2, x1 + 3, y1 + 5, x1 + 6, y1 + 2);
+
+ fl_color(fl_darker(color()));
+ fl_yxline(x1 - 7, y1 - 8, y1 + 8);
+
+ fl_color(fl_lighter(color()));
+ fl_yxline(x1 - 6, y1 - 8, y1 + 8);
+ }
+ } else {
+ if (fl_contrast(textcolor(), FL_BACKGROUND2_COLOR) == textcolor()) {
+ draw_box(FL_DOWN_BOX, FL_BACKGROUND2_COLOR);
+ } else {
+ draw_box(FL_DOWN_BOX, fl_lighter(color()));
+ }
+ draw_box(FL_UP_BOX,X,Y,W,H,color());
+
+ fl_color(active_r() ? labelcolor() : fl_inactive(labelcolor()));
+ fl_polygon(x1, y1, x1 + w1, y1 + w1, x1 + 2 * w1, y1);
+ }
+
+ W += 2 * dx;
+
+ if (mvalue()) {
+ Fl_Menu_Item m = *mvalue();
+ if (active_r()) m.activate(); else m.deactivate();
+
+ // ERCO
+ int xx = x() + dx, yy = y() + dy + 1, ww = w() - W, hh = H - 2;
+
+ fl_push_clip(xx, yy, ww, hh);
+
+ if ( Fl::scheme()) {
+ Fl_Label l;
+ l.value = m.text;
+ l.image = 0;
+ l.deimage = 0;
+ l.type = m.labeltype_;
+ l.font = m.labelsize_ || m.labelfont_ ? m.labelfont_ : textfont();
+ l.size = m.labelsize_ ? m.labelsize_ : textsize();
+ l.color= m.labelcolor_ ? m.labelcolor_ : textcolor();
+ if (!m.active()) l.color = fl_inactive((Fl_Color)l.color);
+ fl_draw_shortcut = 2; // hack value to make '&' disappear
+ l.draw(xx+3, yy, ww>6 ? ww-6 : 0, hh, FL_ALIGN_LEFT);
+ fl_draw_shortcut = 0;
+ if ( Fl::focus() == this ) draw_focus(box(), xx, yy, ww, hh);
+ }
+ else {
+ fl_draw_shortcut = 2; // hack value to make '&' disappear
+ m.draw(xx, yy, ww, hh, this, Fl::focus() == this);
+ fl_draw_shortcut = 0;
+ }
+
+ fl_pop_clip();
+ }
+
+ draw_label();
+}
+
+/**
+ Create a new Fl_Choice widget using the given position, size and label string.
+ The default boxtype is \c FL_UP_BOX.
+
+ The constructor sets menu() to NULL.
+ See Fl_Menu_ for the methods to set or change the menu.
+
+ \param[in] X, Y, W, H position and size of the widget
+ \param[in] L widget label, default is no label
+ */
+Fl_Choice::Fl_Choice(int X, int Y, int W, int H, const char *L)
+: Fl_Menu_(X,Y,W,H,L) {
+ align(FL_ALIGN_LEFT);
+ when(FL_WHEN_RELEASE);
+ textfont(FL_HELVETICA);
+ box(FL_FLAT_BOX);
+ down_box(FL_BORDER_BOX);
+}
+
+/**
+ Sets the currently selected value using a pointer to menu item.
+ Changing the selected value causes a redraw().
+ \param[in] v pointer to menu item in the menu item array.
+ \returns non-zero if the new value is different to the old one.
+ */
+int Fl_Choice::value(const Fl_Menu_Item *v) {
+ if (!Fl_Menu_::value(v)) return 0;
+ redraw();
+ return 1;
+}
+
+/**
+ Sets the currently selected value using the index into the menu item array.
+ Changing the selected value causes a redraw().
+ \param[in] v index of value in the menu item array.
+ \returns non-zero if the new value is different to the old one.
+ */
+int Fl_Choice::value(int v) {
+ if (v == -1) return value((const Fl_Menu_Item *)0);
+ if (v < 0 || v >= (size() - 1)) return 0;
+ if (!Fl_Menu_::value(v)) return 0;
+ redraw();
+ return 1;
+}
+
+int Fl_Choice::handle(int e) {
+ if (!menu() || !menu()->text) return 0;
+ const Fl_Menu_Item* v;
+ switch (e) {
+ case FL_ENTER:
+ case FL_LEAVE:
+ return 1;
+
+ case FL_KEYBOARD:
+ if (Fl::event_key() != ' ' ||
+ (Fl::event_state() & (FL_SHIFT | FL_CTRL | FL_ALT | FL_META))) return 0;
+ case FL_PUSH:
+ if (Fl::visible_focus()) Fl::focus(this);
+ J1:
+ if (Fl::scheme()
+ || fl_contrast(textcolor(), FL_BACKGROUND2_COLOR) != textcolor()) {
+ v = menu()->pulldown(x(), y(), w(), h(), mvalue(), this);
+ } else {
+ // In order to preserve the old look-n-feel of "white" menus,
+ // temporarily override the color() of this widget...
+ Fl_Color c = color();
+ color(FL_BACKGROUND2_COLOR);
+ v = menu()->pulldown(x(), y(), w(), h(), mvalue(), this);
+ color(c);
+ }
+ if (!v || v->submenu()) return 1;
+ if (v != mvalue()) redraw();
+ picked(v);
+ return 1;
+ case FL_SHORTCUT:
+ if (Fl_Widget::test_shortcut()) goto J1;
+ v = menu()->test_shortcut();
+ if (!v) return 0;
+ if (v != mvalue()) redraw();
+ picked(v);
+ return 1;
+ case FL_FOCUS:
+ case FL_UNFOCUS:
+ if (Fl::visible_focus()) {
+ redraw();
+ return 1;
+ } else return 0;
+ default:
+ return 0;
+ }
+}
+
+//
+// End of "$Id: Fl_Choice.cxx 7903 2010-11-28 21:06:39Z matt $".
+//