From 2df3459457eb7c83fea191fa6105fca0c8ca7e8d Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 24 Feb 2005 21:14:22 +0000 Subject: [PATCH] Added Greg Ercolano's simple Fl_Input_Choice widget which is a combination of the Fl_Input and Fl_Menu_Button widgets (STR #650) FL/Fl_Input_Choice.H: documentation/Fl_Input_Choice.html: - Added. documentation/fltk.book: - Added Fl_Input_Choice.html + --no-embedfonts option. documentation/index.html: - Update version number and revision. documentation/input_choice.jpg: - Added. documentation/preface.html: - Update version number and revision. documentation/widgets.html: - Add Fl_Input_Choice to lists. fluid/Fl_Menu_Type.cxx: - Add Fl_Input_Choice_Type class and instance. fluid/Fl_Type.h: - Add Fl_Input_Choice_Type class and instance. fluid/factory.cxx: - Add Fl_Input_Choice menu item. test/Makefile: - Add input_choice example. test/input_choice.cxx: - Added. test/demo.menu: - Add input_choice example. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4050 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 3 + FL/Fl_Input_Choice.H | 128 +++++++++++++++++++++++++++++ documentation/Fl_Input_Choice.html | 100 ++++++++++++++++++++++ documentation/fltk.book | 3 +- documentation/index.html | 6 +- documentation/input_choice.jpg | Bin 0 -> 5320 bytes documentation/preface.html | 4 +- documentation/widgets.html | 2 + fluid/Fl_Menu_Type.cxx | 2 + fluid/Fl_Type.h | 18 +++- fluid/factory.cxx | 2 + test/Makefile | 8 +- test/demo.menu | 1 + test/input_choice.cxx | 57 +++++++++++++ 14 files changed, 324 insertions(+), 10 deletions(-) create mode 100644 FL/Fl_Input_Choice.H create mode 100644 documentation/Fl_Input_Choice.html create mode 100644 documentation/input_choice.jpg create mode 100644 test/input_choice.cxx diff --git a/CHANGES b/CHANGES index 3c0780446..b932c5361 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ CHANGES IN FLTK 1.1.7 - Documentation fixes (STR #648, STR #692) + - Added Greg Ercolano's simple Fl_Input_Choice widget + which is a combination of the Fl_Input and + Fl_Menu_Button widgets (STR #650) - Fl_Multiline_Input now scrolls the full height of the widget instead of 5 lines when the user presses PageUp or PageDown (STR #727) diff --git a/FL/Fl_Input_Choice.H b/FL/Fl_Input_Choice.H new file mode 100644 index 000000000..2b7d1424e --- /dev/null +++ b/FL/Fl_Input_Choice.H @@ -0,0 +1,128 @@ +// +// "$Id$" +// +// An input/chooser widget. +// ______________ ____ +// | || __ | +// | input area || \/ | +// |______________||____| +// +// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 2004 by Greg Ercolano. +// +// 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 to "fltk-bugs@fltk.org". +// + +#ifndef Fl_Input_Choice_H +#define Fl_Input_Choice_H + +#include +#include +#include +#include + +class Fl_Input_Choice : public Fl_Group { + // Private class to handle slightly 'special' behavior of menu button + class InputMenuButton : public Fl_Menu_Button { + void draw() { + draw_box(FL_UP_BOX, color()); + fl_color(active_r() ? labelcolor() : fl_inactive(labelcolor())); + int xc = x()+w()/2, yc=y()+h()/2; + fl_polygon(xc-5,yc-3,xc+5,yc-3,xc,yc+3); + if (Fl::focus() == this) draw_focus(); + } + public: + InputMenuButton(int x,int y,int w,int h,const char*l=0) : + Fl_Menu_Button(x,y,w,h,l) { box(FL_UP_BOX); } + }; + + Fl_Input *inp_; + InputMenuButton *menu_; + + static void menu_cb(Fl_Widget*, void *data) { + Fl_Input_Choice *o=(Fl_Input_Choice *)data; + o->inp_->value(o->menu_->text()); + o->do_callback(); + } + + static void inp_cb(Fl_Widget*, void *data) { + Fl_Input_Choice *o=(Fl_Input_Choice *)data; + o->do_callback(); + } + + // Custom resize behavior -- input stretches, menu button doesn't + inline int inp_x() { return(x() + Fl::box_dx(box())); } + inline int inp_y() { return(y() + Fl::box_dy(box())); } + inline int inp_w() { return(w() - Fl::box_dw(box()) - 20); } + inline int inp_h() { return(h() - Fl::box_dh(box())); } + + inline int menu_x() { return(x() + w() - 20 - Fl::box_dx(box())); } + inline int menu_y() { return(y() + Fl::box_dy(box()) + (Fl::scheme()?1:0)); } + inline int menu_w() { return(20); } + inline int menu_h() { return(h() - Fl::box_dh(box()) - (Fl::scheme()?1:0)); } + +public: + Fl_Input_Choice (int x,int y,int w,int h,const char*l=0) : Fl_Group(x,y,w,h,l) { + Fl_Group::box(FL_DOWN_BOX); + align(FL_ALIGN_LEFT); // default like Fl_Input + inp_ = new Fl_Input(inp_x(), inp_y(), + inp_w(), inp_h()); + inp_->callback(inp_cb, (void*)this); + inp_->box(FL_FLAT_BOX); // cosmetic + menu_ = new InputMenuButton(menu_x(), menu_y(), + menu_w(), menu_h()); + menu_->callback(menu_cb, (void*)this); + menu_->box(FL_FLAT_BOX); // cosmetic + end(); + } + void add(const char *s) { + menu_->add(s); + } + void clear() { + menu_->clear(); + } + const Fl_Menu_Item *menu() { + return (menu_->menu()); + } + void menu(const Fl_Menu_Item *m) { + menu_->menu(m); + } + void resize(int X, int Y, int W, int H) { + Fl_Group::resize(X,Y,W,H); + inp_->resize(inp_x(), inp_y(), inp_w(), inp_h()); + menu_->resize(menu_x(), menu_y(), menu_w(), menu_h()); + } + const char* value() const { + return(inp_->value()); + } + void value(const char *val) { + inp_->value(val); + } + void value(int val) { + menu_->value(val); + inp_->value(menu_->text(val)); + } + Fl_Menu_Button *menubutton() { return menu_; } + Fl_Input *input() { return inp_; } +}; + +#endif // !Fl_Input_Choice_H + +// +// End of "$Id$". +// diff --git a/documentation/Fl_Input_Choice.html b/documentation/Fl_Input_Choice.html new file mode 100644 index 000000000..b941e3447 --- /dev/null +++ b/documentation/Fl_Input_Choice.html @@ -0,0 +1,100 @@ + + + + + +

class Fl_Input_Choice

+ +
+ +

Class Hierarchy

+ + + +

Include Files

+ +
    +#include <FL/Fl_Input_Choice.H>
+
+ +

+
+Plastic and normal Fl::scheme()s. +

+ +

Description

+

A combination of the input widget and a menu button. +The user can either type into the input area, or use the +menu button chooser on the right, which loads the input area +with predefined text. Normally it is drawn with an inset box +and a white background. +

+The application can directly access both the input and menu +widgets directly, using the menubutton() +and input() accessor methods. + +

Methods

+
+
+
+
+ +

Fl_Input_Choice::Fl_Input_Choice(int x, int y, int w, +int h, const char *label = 0)

+ +

Creates a new Fl_Input_Choice widget using the given position, size, +and label string. + +

virtual Fl_Input_Choice::~Fl_Input_Choice()

+ +

Destroys the widget and any value associated with it. + +

void Fl_Input_Choice::add(const char *s)

+ +

Adds an item to the menu.

+ +

void Fl_Input_Choice::clear()

+ +

Removes all items from the menu.

+ +

Fl_Input *Fl_Input_Choice::input()

+ +

Returns a reference to the internal Fl_Input widget.

+ +

void Fl_Input_Choice::menu(const Fl_Menu_Item *m)
+const Fl_Menu_Item *menu()

+ +

Gets or sets the Fl_Menu_Item array used for the menu.

+ +

Fl_Menu_Button *Fl_Input_Choice::menubutton()

+ +

Returns a reference to the internal Fl_Menu_Button widget. + +

void Fl_Input_Choice::value(const char *s)
+void Fl_Input_Choice::value(int v)
+const char *Fl_Input_Choice::value() const

+ +

Sets or returns the input widget's current contents. The +second form sets the contents using the index into the menu +which you can set as an integer. Setting the value effectively +'chooses' this menu item, and sets it as the new input text, +deleting the previous text.

+ + + diff --git a/documentation/fltk.book b/documentation/fltk.book index 50915a6b9..2dd70f748 100644 --- a/documentation/fltk.book +++ b/documentation/fltk.book @@ -1,5 +1,5 @@ #HTMLDOC 1.8.20 --t pdf13 -f fltk.pdf --book --toclevels 2 --no-numbered --toctitle "Table of Contents" --title --titleimage FL.gif --linkstyle underline --size Universal --left 1.00in --right 0.50in --top 0.50in --bottom 0.50in --header .t. --footer h.1 --tocheader .t. --tocfooter ..i --duplex --portrait --color --no-pscommands --no-xrxcomments --compression=9 --jpeg=50 --fontsize 11.0 --fontspacing 1.2 --headingfont Helvetica --bodyfont Times --headfootsize 11.0 --headfootfont Helvetica --charset 8859-1 --links --no-truetype --pagemode outline --pagelayout single --firstpage c1 --pageeffect none --pageduration 10 --effectduration 1.0 --no-encryption --permissions all --owner-password "" --user-password "" --browserwidth 680 +-t pdf13 -f fltk.pdf --book --toclevels 2 --no-numbered --toctitle "Table of Contents" --title --titleimage FL.gif --linkstyle underline --size Universal --left 1.00in --right 0.50in --top 0.50in --bottom 0.50in --header .t. --footer h.1 --tocheader .t. --tocfooter ..i --duplex --portrait --color --no-pscommands --no-xrxcomments --compression=9 --jpeg=50 --no-embedfonts --fontsize 11.0 --fontspacing 1.2 --headingfont Helvetica --bodyfont Times --headfootsize 11.0 --headfootfont Helvetica --charset 8859-1 --links --no-truetype --pagemode outline --pagelayout single --firstpage c1 --pageeffect none --pageduration 10 --effectduration 1.0 --no-encryption --permissions all --owner-password "" --user-password "" --browserwidth 680 preface.html intro.html basics.html @@ -44,6 +44,7 @@ Fl_Hold_Browser.html Fl_Image.html Fl_Input.html Fl_Input_.html +Fl_Input_Choice.html Fl_Int_Input.html Fl_JPEG_Image.html Fl_Light_Button.html diff --git a/documentation/index.html b/documentation/index.html index 2853526ba..489623036 100644 --- a/documentation/index.html +++ b/documentation/index.html @@ -1,7 +1,7 @@ - FLTK 1.1.6 Programming Manual + FLTK 1.1.7 Programming Manual @@ -10,8 +10,8 @@ FL -

FLTK 1.1.6 Programming Manual

-

Revision 6 by Michael Sweet, Craig P. Earls, and Bill Spitzak
+

FLTK 1.1.7 Programming Manual

+

Revision 7 by Michael Sweet, Craig P. Earls, and Bill Spitzak
Copyright 1998-2004 by Bill Spitzak and others.

diff --git a/documentation/input_choice.jpg b/documentation/input_choice.jpg new file mode 100644 index 0000000000000000000000000000000000000000..7f7b93f8556052de0aff9221fd9a2be8a919198e GIT binary patch literal 5320 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 - FLTK 1.1.6 Programming Manual + FLTK 1.1.7 Programming Manual

Preface

This manual describes the Fast Light Tool Kit ("FLTK") -version 1.1.6, a C++ Graphical User Interface +version 1.1.7, a C++ Graphical User Interface ("GUI") toolkit for UNIX, Microsoft Windows and MacOS. Each of the chapters in this manual is designed as a tutorial for using FLTK, while the appendices provide a convenient reference diff --git a/documentation/widgets.html b/documentation/widgets.html index d0c1967e4..d101330c6 100644 --- a/documentation/widgets.html +++ b/documentation/widgets.html @@ -45,6 +45,7 @@ description of the fl_ functions, see Fl_Image
Fl_Input_
Fl_Input
+Fl_Input_Choice
Fl_Int_Input
Fl_JPEG_Image
Fl_Light_Button
@@ -161,6 +162,7 @@ description of the fl_ functions, see

  • Fl_File_Chooser
  • Fl_Help_Dialog
  • Fl_Help_View +
  • Fl_Input_Choice
  • Fl_Pack
  • Fl_Scroll
  • Fl_Tabs diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx index 08d109916..954aa5051 100644 --- a/fluid/Fl_Menu_Type.cxx +++ b/fluid/Fl_Menu_Type.cxx @@ -419,6 +419,8 @@ Fl_Menu_Item dummymenu[] = {{"CHOICE"},{0}}; Fl_Choice_Type Fl_Choice_type; +Fl_Input_Choice_Type Fl_Input_Choice_type; + //////////////////////////////////////////////////////////////// Fl_Menu_Bar_Type Fl_Menu_Bar_type; diff --git a/fluid/Fl_Type.h b/fluid/Fl_Type.h index 1a732ad2e..cc0c246cb 100644 --- a/fluid/Fl_Type.h +++ b/fluid/Fl_Type.h @@ -1,5 +1,5 @@ // -// "$Id: Fl_Type.h,v 1.5.2.11.2.13 2004/04/11 04:38:55 easysw Exp $" +// "$Id$" // // Widget type header file for the Fast Light Tool Kit (FLTK). // @@ -549,6 +549,20 @@ public: int pixmapID() { return 15; } }; +#include +class Fl_Input_Choice_Type : public Fl_Menu_Type { +public: + virtual const char *type_name() {return "Fl_Input_Choice";} + Fl_Widget *widget(int X,int Y,int W,int H) { + Fl_Input_Choice *myo = new Fl_Input_Choice(X,Y,W,H,"input choice:"); + myo->menu(dummymenu); + myo->value("input"); + return myo; + } + Fl_Widget_Type *_make() {return new Fl_Input_Choice_Type();} + int pixmapID() { return 15; } +}; + #include class Fl_Menu_Bar_Type : public Fl_Menu_Type { public: @@ -599,5 +613,5 @@ int storestring(const char *n, const char * & p, int nostrip=0); extern int include_H_from_C; // -// End of "$Id: Fl_Type.h,v 1.5.2.11.2.13 2004/04/11 04:38:55 easysw Exp $". +// End of "$Id$". // diff --git a/fluid/factory.cxx b/fluid/factory.cxx index 995c93182..efba7d6de 100644 --- a/fluid/factory.cxx +++ b/fluid/factory.cxx @@ -690,6 +690,7 @@ extern class Fl_Pack_Type Fl_Pack_type; extern class Fl_Tabs_Type Fl_Tabs_type; extern class Fl_Scroll_Type Fl_Scroll_type; extern class Fl_Tile_Type Fl_Tile_type; +extern class Fl_Input_Choice_Type Fl_Input_Choice_type; extern class Fl_Choice_Type Fl_Choice_type; extern class Fl_Menu_Bar_Type Fl_Menu_Bar_type; extern class Fl_Menu_Button_Type Fl_Menu_Button_type; @@ -753,6 +754,7 @@ Fl_Menu_Item New_Menu[] = { {0,0,cb,(void*)&Fl_Menu_Bar_type}, {0,0,cb,(void*)&Fl_Menu_Button_type}, {0,0,cb,(void*)&Fl_Choice_type}, + {0,0,cb,(void*)&Fl_Input_Choice_type}, {0,0,cb, (void*)&Fl_Submenu_type}, {0,0,cb, (void*)&Fl_Menu_Item_type}, {0}, diff --git a/test/Makefile b/test/Makefile index 3c7d74bb4..ead8a4753 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.19.2.7.2.42 2004/08/26 22:24:24 matthiaswm Exp $" +# "$Id$" # # Test/example program makefile for the Fast Light Tool Kit (FLTK). # @@ -61,6 +61,7 @@ CPPFILES =\ image.cxx \ inactive.cxx \ input.cxx \ + input_choice.cxx \ keyboard.cxx \ label.cxx \ line_style.cxx \ @@ -118,6 +119,7 @@ ALL = \ image$(EXEEXT) \ inactive$(EXEEXT) \ input$(EXEEXT) \ + input_choice$(EXEEXT) \ keyboard$(EXEEXT) \ label$(EXEEXT) \ line_style$(EXEEXT) \ @@ -259,6 +261,8 @@ inactive.cxx: inactive.fl input$(EXEEXT): input.o +input_choice$(EXEEXT): input_choice.o + keyboard$(EXEEXT): keyboard_ui.o keyboard.o echo Linking $@... $(CXX) -I.. $(CXXFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS) @@ -376,5 +380,5 @@ shape$(EXEEXT): shape.o # -# End of "$Id: Makefile,v 1.19.2.7.2.42 2004/08/26 22:24:24 matthiaswm Exp $". +# End of "$Id$". # diff --git a/test/demo.menu b/test/demo.menu index 75417d01f..a8678a08b 100644 --- a/test/demo.menu +++ b/test/demo.menu @@ -65,6 +65,7 @@ @o:File Chooser:file_chooser @o:Fonts:fonts @o:HelpDialog:help + @o:Input Choice:input_choice @o:Preferences:preferences @o:Threading:threads @o:XForms Emulation:forms diff --git a/test/input_choice.cxx b/test/input_choice.cxx new file mode 100644 index 000000000..45a50916b --- /dev/null +++ b/test/input_choice.cxx @@ -0,0 +1,57 @@ +// Test program for Fl_Input_Choice +// +// Copyright 1998-2004 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. +// + +#include +#include +#include +#include + +void buttcb(Fl_Widget*,void*data) { + Fl_Input_Choice *in=(Fl_Input_Choice *)data; + static int flag = 1; + flag ^= 1; + if ( flag ) in->activate(); + else in->deactivate(); +} + +void input_choice_cb(Fl_Widget*,void*data) { + Fl_Input_Choice *in=(Fl_Input_Choice *)data; + fprintf(stderr, "Value='%s'\n", (const char*)in->value()); +} + +int main(int argc, char **argv) { + Fl::scheme("plastic"); // optional + Fl_Window win(300, 200); + + Fl_Input_Choice in(40,40,100,28,"Test"); + in.callback(input_choice_cb, (void*)&in); + in.add("one"); + in.add("two"); + in.add("three"); + in.value(1); + + Fl_Button onoff(40,150,200,28,"Activate/Deactivate"); + onoff.callback(buttcb, (void*)&in); + + win.end(); + win.resizable(win); + win.show(argc, argv); + return Fl::run(); +}