mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix dependencies and whitespace issues

Browse Source
This commit is contained in:
Albrecht Schlosser 2023-11-14 18:14:48 +01:00
parent 6842a43a31
commit 4b315d190c
29 changed files with 173 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FL/Fl_Window.H
View File

@ -510,7 +510,7 @@ public:
\see void Fl_Window::fullscreen()
*/
void fullscreen_screens(int top, int bottom, int left, int right);
void maximize();
void un_maximize();
/** Returns whether the window is currently maximized */

16
documentation/src/Fl_Terminal.dox
View File

@ -73,7 +73,7 @@ Features will be added as the widget matures.
│ ESC[#e - (LPA) Line Position Relative [row] (NOT IMPLEMENTED)
│ ESC[#f - (CUP) cursor position (#'s 1 based), same as ESC[H
│
│ ESC[#g - (TBC)Tabulation Clear
│ ESC[#g - (TBC)Tabulation Clear
│ │
│ ├── ESC[0g - Clear tabstop at cursor
│ └── ESC[3g - Clear all tabstops
@ -273,7 +273,7 @@ The memory layout of the Utf8Char character array is:
So it's basically a single continuous array of Utf8Char instances
where any character can generally be accessed by index# using the formula:
ring_chars[ (row*ring_cols)+col ]
ring_chars[ (row*ring_cols)+col ]
..where 'row' is the desired row, 'col' is the desired column,
and 'ring_cols' is how many columns "wide" the buffer is.
@ -292,7 +292,7 @@ formulas, namely:
A key concept is the use of the simple 'offset' index integer
to allow the starting point of the history and display to be
moved around to implement 'text scrolling', such as when
moved around to implement 'text scrolling', such as when
crlf at the screen bottom causes a 'scroll up'.
This is simply an "index offset" integer applied to the
@ -423,15 +423,15 @@ So to recap, the concepts here are:
// Entire ring
ring_srow() -- start row index of the ring buffer (always 0)
ring_erow() -- end row index of the ring buffer
ring_erow() -- end row index of the ring buffer
// "history" part of ring
hist_srow() -- start row index of the screen history
hist_erow() -- end row index of the screen history
hist_srow() -- start row index of the screen history
hist_erow() -- end row index of the screen history
// "display" part of ring
disp_srow() -- start row index of the display
disp_erow() -- end row index of the display
disp_srow() -- start row index of the display
disp_erow() -- end row index of the display
The values returned by these are as described above.
For the hist_xxx() and disp_xxx() methods the 'offset' included into

6
fluid/Fl_Grid_Type.cxx
View File

@ -262,7 +262,7 @@ Fl_Grid::Cell *Fl_Grid_Proxy::widget(Fl_Widget *wi, int row, int col, Fl_Grid_Al
return widget(wi, row, col, 1, 1, align);
}
/**
/**
Just like the Fl_Grid original, but removes potential transient cell.
\param[in] wi generate a cell for this widget
\param[in] row, col, rowspan, colspan, align cell parameters
@ -671,7 +671,7 @@ void Fl_Grid_Type::insert_child_at(Fl_Widget *child, int x, int y) {
grid->move_cell(child, row, col, 2);
}
/**
/**
Insert a child widget into the first new cell we can find .
There are many other possible strategies. How about inserting to the right
@ -795,7 +795,7 @@ void grid_child_cb(Fluid_Coord_Input* i, void* v, int what) {
if (v2 == -1 && v >= 0) v2 = 0;
g->move_cell(current_widget->o, v, v2, 2); i->value(v);
break;
case 9:
case 9:
if (v2 == -1 && v >= 0) v2 = 0;
g->move_cell(current_widget->o, v2, v, 2); i->value(v);
break;

2
fluid/Fl_Group_Type.cxx
View File

@ -43,7 +43,7 @@
Fl_Group_Type Fl_Group_type; // the "factory"
/**
/**
Override group's resize behavior to do nothing to children by default.
\param[in] X, Y, W, H new size
*/

2
fluid/Fl_Type.h
View File

@ -190,7 +190,7 @@ public:
void comment(const char *);
virtual Fl_Type* click_test(int,int) { return NULL; }
virtual void add_child(Fl_Type*, Fl_Type* beforethis) { }
virtual void move_child(Fl_Type*, Fl_Type* beforethis) { }
virtual void remove_child(Fl_Type*) { }

2
fluid/Fl_Window_Type.cxx
View File

@ -841,7 +841,7 @@ extern void fix_group_size(Fl_Type *t);
extern Fl_Menu_Item Main_Menu[];
extern Fl_Menu_Item New_Menu[];
/**
/**
Move the selected children according to current dx, dy, drag state.
This is somewhat of a do-all function that received many additions when new

2
fluid/code.h
View File

@ -102,7 +102,7 @@ public:
Fl_Type* write_code(Fl_Type* p);
int write_code(const char *cfile, const char *hfile, bool to_sourceview=false);
void write_public(int state); // writes pubic:/private: as needed
void tag(int type, unsigned short uid);
static unsigned long block_crc(const void *data, int n=-1, unsigned long in_crc=0, bool *inout_line_start=NULL);

2
fluid/documentation/src-dev/index.dox
View File

@ -9,7 +9,7 @@
<TD><CENTER>
\image html fluid-128.png
\image latex fluid-128.png "" width=3cm
<B>FLUID 1.4.0 Developer Documentation</B>
By F.&nbsp;Costantini, D.&nbsp;Gibson, M.&nbsp;Melcher,

2
fluid/documentation/src-dev/page_introduction.dox
View File

@ -30,7 +30,7 @@
## Future ##
As we approach the imminent release of FLTK 1.4.0, FLUID will no longer undergo
As we approach the imminent release of FLTK 1.4.0, FLUID will no longer undergo
significant feature enhancements. Instead, the focus will shift towards
documentation improvements, addressing bugs, and enhancing usability for
recent FLTK additions such as Fl_Grid and Fl_Flex. Following the release of

2
fluid/documentation/src/index.dox
View File

@ -9,7 +9,7 @@
<TD><CENTER>
\image html fluid-128.png
\image latex fluid-128.png "" width=3cm
<B>FLUID 1.4.0 User Manual</B>
By F.&nbsp;Costantini, D.&nbsp;Gibson, M.&nbsp;Melcher,

2
fluid/file.cxx
View File

@ -231,7 +231,7 @@ Fl_Type *Fd_Project_Reader::read_children(Fl_Type *p, int merge, Strategy strate
const char *c = read_word();
REUSE_C:
if (!c) {
if (p && !merge)
if (p && !merge)
read_error("Missing '}'");
break;
}

6
fluid/fluid.cxx
View File

@ -1022,11 +1022,11 @@ Fl_String open_project_filechooser(const Fl_String &title) {
/**
Load a project from the give file name and path.
The project file is inserted at the currently selected type.
If no filename is given, FLUID will open a file chooser dialog.
\param[in] filename_arg path and name of the new project file
\return false if the operation failed
*/

84
fluid/makedepend
View File

@ -151,72 +151,36 @@ code.o: ../FL/Fl.H
code.o: ../FL/fl_ask.H
code.o: ../FL/fl_attr.h
code.o: ../FL/Fl_Bitmap.H
code.o: ../FL/Fl_Box.H
code.o: ../FL/Fl_Browser.H
code.o: ../FL/Fl_Browser_.H
code.o: ../FL/Fl_Button.H
code.o: ../FL/Fl_Cairo.H
code.o: ../FL/fl_casts.H
code.o: ../FL/Fl_Check_Button.H
code.o: ../FL/Fl_Choice.H
code.o: ../FL/fl_config.h
code.o: ../FL/Fl_Device.H
code.o: ../FL/Fl_Double_Window.H
code.o: ../FL/fl_draw.H
code.o: ../FL/Fl_Export.H
code.o: ../FL/Fl_File_Browser.H
code.o: ../FL/Fl_File_Chooser.H
code.o: ../FL/Fl_File_Icon.H
code.o: ../FL/Fl_File_Input.H
code.o: ../FL/Fl_Flex.H
code.o: ../FL/Fl_Graphics_Driver.H
code.o: ../FL/Fl_Group.H
code.o: ../FL/Fl_Image.H
code.o: ../FL/Fl_Input.H
code.o: ../FL/Fl_Input_.H
code.o: ../FL/Fl_Int_Input.H
code.o: ../FL/Fl_Light_Button.H
code.o: ../FL/Fl_Menu.H
code.o: ../FL/Fl_Menu_.H
code.o: ../FL/Fl_Menu_Button.H
code.o: ../FL/Fl_Menu_Item.H
code.o: ../FL/Fl_Native_File_Chooser.H
code.o: ../FL/Fl_Pack.H
code.o: ../FL/Fl_Pixmap.H
code.o: ../FL/Fl_Plugin.H
code.o: ../FL/Fl_Preferences.H
code.o: ../FL/Fl_Rect.H
code.o: ../FL/Fl_Repeat_Button.H
code.o: ../FL/Fl_Return_Button.H
code.o: ../FL/Fl_RGB_Image.H
code.o: ../FL/Fl_Scheme.H
code.o: ../FL/Fl_Scheme_Choice.H
code.o: ../FL/Fl_Scrollbar.H
code.o: ../FL/Fl_Shared_Image.H
code.o: ../FL/Fl_Shortcut_Button.H
code.o: ../FL/Fl_Simple_Terminal.H
code.o: ../FL/Fl_Slider.H
code.o: ../FL/Fl_Spinner.H
code.o: ../FL/fl_string_functions.h
code.o: ../FL/Fl_Tabs.H
code.o: ../FL/Fl_Text_Buffer.H
code.o: ../FL/Fl_Text_Display.H
code.o: ../FL/Fl_Text_Editor.H
code.o: ../FL/Fl_Tile.H
code.o: ../FL/fl_types.h
code.o: ../FL/fl_utf8.h
code.o: ../FL/Fl_Valuator.H
code.o: ../FL/Fl_Value_Input.H
code.o: ../FL/Fl_Widget.H
code.o: ../FL/Fl_Window.H
code.o: ../FL/Fl_Wizard.H
code.o: ../FL/platform_types.h
code.o: ../src/flstring.h
code.o: ../src/Fl_String.H
code.o: alignment_panel.h
code.o: code.h
code.o: ExternalCodeEditor_UNIX.h
code.o: Fd_Snap_Action.h
code.o: file.h
code.o: fluid.h
code.o: fluid_filename.h
@ -226,8 +190,7 @@ code.o: Fl_Group_Type.h
code.o: Fl_Type.h
code.o: Fl_Widget_Type.h
code.o: Fl_Window_Type.h
code.o: shell_command.h
code.o: widget_browser.h
code.o: undo.h
CodeEditor.o: ../FL/Enumerations.H
CodeEditor.o: ../FL/Fl.H
CodeEditor.o: ../FL/fl_attr.h
@ -377,6 +340,7 @@ factory.o: ../FL/Fl_File_Icon.H
factory.o: ../FL/Fl_File_Input.H
factory.o: ../FL/Fl_Flex.H
factory.o: ../FL/Fl_Graphics_Driver.H
factory.o: ../FL/Fl_Grid.H
factory.o: ../FL/Fl_Group.H
factory.o: ../FL/Fl_Help_View.H
factory.o: ../FL/Fl_Image.H
@ -428,6 +392,7 @@ factory.o: Fd_Snap_Action.h
factory.o: fluid.h
factory.o: fluid_filename.h
factory.o: Fl_Button_Type.h
factory.o: Fl_Grid_Type.h
factory.o: Fl_Group_Type.h
factory.o: Fl_Menu_Type.h
factory.o: Fl_Type.h
@ -539,6 +504,7 @@ file.o: ../FL/Fl_File_Icon.H
file.o: ../FL/Fl_File_Input.H
file.o: ../FL/Fl_Flex.H
file.o: ../FL/Fl_Graphics_Driver.H
file.o: ../FL/Fl_Grid.H
file.o: ../FL/Fl_Group.H
file.o: ../FL/Fl_Image.H
file.o: ../FL/Fl_Input.H
@ -593,6 +559,7 @@ file.o: fluid.h
file.o: fluid_filename.h
file.o: Fluid_Image.h
file.o: Fl_Function_Type.h
file.o: Fl_Grid_Type.h
file.o: Fl_Group_Type.h
file.o: Fl_Type.h
file.o: Fl_Widget_Type.h
@ -693,6 +660,7 @@ fluid.o: Fl_Type.h
fluid.o: Fl_Widget_Type.h
fluid.o: Fl_Window_Type.h
fluid.o: function_panel.h
fluid.o: mergeback.h
fluid.o: pixmaps.h
fluid.o: shell_command.h
fluid.o: sourceview_panel.h
@ -899,6 +867,7 @@ Fl_Function_Type.o: Fl_Type.h
Fl_Function_Type.o: Fl_Widget_Type.h
Fl_Function_Type.o: Fl_Window_Type.h
Fl_Function_Type.o: function_panel.h
Fl_Function_Type.o: mergeback.h
Fl_Function_Type.o: StyleParse.h
Fl_Function_Type.o: widget_browser.h
Fl_Grid_Type.o: ../config.h
@ -1013,23 +982,14 @@ Fl_Menu_Type.o: ../FL/Fl.H
Fl_Menu_Type.o: ../FL/fl_ask.H
Fl_Menu_Type.o: ../FL/fl_attr.h
Fl_Menu_Type.o: ../FL/Fl_Bitmap.H
Fl_Menu_Type.o: ../FL/Fl_Box.H
Fl_Menu_Type.o: ../FL/Fl_Browser.H
Fl_Menu_Type.o: ../FL/Fl_Browser_.H
Fl_Menu_Type.o: ../FL/Fl_Button.H
Fl_Menu_Type.o: ../FL/Fl_Cairo.H
Fl_Menu_Type.o: ../FL/fl_casts.H
Fl_Menu_Type.o: ../FL/Fl_Check_Button.H
Fl_Menu_Type.o: ../FL/Fl_Choice.H
Fl_Menu_Type.o: ../FL/fl_config.h
Fl_Menu_Type.o: ../FL/Fl_Device.H
Fl_Menu_Type.o: ../FL/Fl_Double_Window.H
Fl_Menu_Type.o: ../FL/fl_draw.H
Fl_Menu_Type.o: ../FL/Fl_Export.H
Fl_Menu_Type.o: ../FL/Fl_File_Browser.H
Fl_Menu_Type.o: ../FL/Fl_File_Chooser.H
Fl_Menu_Type.o: ../FL/Fl_File_Icon.H
Fl_Menu_Type.o: ../FL/Fl_File_Input.H
Fl_Menu_Type.o: ../FL/Fl_Flex.H
Fl_Menu_Type.o: ../FL/Fl_Graphics_Driver.H
Fl_Menu_Type.o: ../FL/Fl_Group.H
@ -1037,38 +997,26 @@ Fl_Menu_Type.o: ../FL/Fl_Image.H
Fl_Menu_Type.o: ../FL/Fl_Input.H
Fl_Menu_Type.o: ../FL/Fl_Input_.H
Fl_Menu_Type.o: ../FL/Fl_Input_Choice.H
Fl_Menu_Type.o: ../FL/Fl_Int_Input.H
Fl_Menu_Type.o: ../FL/Fl_Light_Button.H
Fl_Menu_Type.o: ../FL/Fl_Menu_.H
Fl_Menu_Type.o: ../FL/Fl_Menu_Bar.H
Fl_Menu_Type.o: ../FL/Fl_Menu_Button.H
Fl_Menu_Type.o: ../FL/Fl_Menu_Item.H
Fl_Menu_Type.o: ../FL/fl_message.H
Fl_Menu_Type.o: ../FL/Fl_Multi_Label.H
Fl_Menu_Type.o: ../FL/Fl_Native_File_Chooser.H
Fl_Menu_Type.o: ../FL/Fl_Output.H
Fl_Menu_Type.o: ../FL/Fl_Pack.H
Fl_Menu_Type.o: ../FL/Fl_Pixmap.H
Fl_Menu_Type.o: ../FL/Fl_Plugin.H
Fl_Menu_Type.o: ../FL/Fl_Preferences.H
Fl_Menu_Type.o: ../FL/Fl_Rect.H
Fl_Menu_Type.o: ../FL/Fl_Repeat_Button.H
Fl_Menu_Type.o: ../FL/Fl_Return_Button.H
Fl_Menu_Type.o: ../FL/Fl_RGB_Image.H
Fl_Menu_Type.o: ../FL/Fl_Scheme.H
Fl_Menu_Type.o: ../FL/Fl_Scheme_Choice.H
Fl_Menu_Type.o: ../FL/Fl_Scrollbar.H
Fl_Menu_Type.o: ../FL/Fl_Shared_Image.H
Fl_Menu_Type.o: ../FL/Fl_Shortcut_Button.H
Fl_Menu_Type.o: ../FL/Fl_Simple_Terminal.H
Fl_Menu_Type.o: ../FL/Fl_Slider.H
Fl_Menu_Type.o: ../FL/Fl_Spinner.H
Fl_Menu_Type.o: ../FL/fl_string_functions.h
Fl_Menu_Type.o: ../FL/Fl_Tabs.H
Fl_Menu_Type.o: ../FL/Fl_Text_Buffer.H
Fl_Menu_Type.o: ../FL/Fl_Text_Display.H
Fl_Menu_Type.o: ../FL/Fl_Text_Editor.H
Fl_Menu_Type.o: ../FL/Fl_Tile.H
Fl_Menu_Type.o: ../FL/fl_types.h
Fl_Menu_Type.o: ../FL/fl_utf8.h
Fl_Menu_Type.o: ../FL/Fl_Valuator.H
@ -1079,7 +1027,6 @@ Fl_Menu_Type.o: ../FL/Fl_Wizard.H
Fl_Menu_Type.o: ../FL/platform_types.h
Fl_Menu_Type.o: ../src/flstring.h
Fl_Menu_Type.o: ../src/Fl_String.H
Fl_Menu_Type.o: alignment_panel.h
Fl_Menu_Type.o: code.h
Fl_Menu_Type.o: custom_widgets.h
Fl_Menu_Type.o: Fd_Snap_Action.h
@ -1093,8 +1040,7 @@ Fl_Menu_Type.o: Fl_Menu_Type.h
Fl_Menu_Type.o: Fl_Type.h
Fl_Menu_Type.o: Fl_Widget_Type.h
Fl_Menu_Type.o: Fl_Window_Type.h
Fl_Menu_Type.o: shell_command.h
Fl_Menu_Type.o: widget_browser.h
Fl_Menu_Type.o: mergeback.h
Fl_Type.o: ../config.h
Fl_Type.o: ../FL/Enumerations.H
Fl_Type.o: ../FL/filename.H
@ -1240,6 +1186,7 @@ Fl_Widget_Type.o: Fl_Menu_Type.h
Fl_Widget_Type.o: Fl_Type.h
Fl_Widget_Type.o: Fl_Widget_Type.h
Fl_Widget_Type.o: Fl_Window_Type.h
Fl_Widget_Type.o: mergeback.h
Fl_Widget_Type.o: pixmaps.h
Fl_Widget_Type.o: shell_command.h
Fl_Widget_Type.o: StyleParse.h
@ -1272,6 +1219,7 @@ Fl_Window_Type.o: ../FL/Fl_File_Icon.H
Fl_Window_Type.o: ../FL/Fl_File_Input.H
Fl_Window_Type.o: ../FL/Fl_Flex.H
Fl_Window_Type.o: ../FL/Fl_Graphics_Driver.H
Fl_Window_Type.o: ../FL/Fl_Grid.H
Fl_Window_Type.o: ../FL/Fl_Group.H
Fl_Window_Type.o: ../FL/Fl_Image.H
Fl_Window_Type.o: ../FL/Fl_Input.H
@ -1308,6 +1256,7 @@ Fl_Window_Type.o: ../FL/Fl_Text_Buffer.H
Fl_Window_Type.o: ../FL/Fl_Text_Display.H
Fl_Window_Type.o: ../FL/Fl_Text_Editor.H
Fl_Window_Type.o: ../FL/Fl_Tile.H
Fl_Window_Type.o: ../FL/Fl_Tooltip.H
Fl_Window_Type.o: ../FL/fl_types.h
Fl_Window_Type.o: ../FL/fl_utf8.h
Fl_Window_Type.o: ../FL/Fl_Valuator.H
@ -1569,6 +1518,7 @@ sourceview_panel.o: ../FL/Fl_Box.H
sourceview_panel.o: ../FL/Fl_Button.H
sourceview_panel.o: ../FL/Fl_Cairo.H
sourceview_panel.o: ../FL/fl_casts.H
sourceview_panel.o: ../FL/Fl_Choice.H
sourceview_panel.o: ../FL/fl_config.h
sourceview_panel.o: ../FL/Fl_Device.H
sourceview_panel.o: ../FL/Fl_Double_Window.H
@ -1577,7 +1527,10 @@ sourceview_panel.o: ../FL/Fl_Export.H
sourceview_panel.o: ../FL/Fl_Graphics_Driver.H
sourceview_panel.o: ../FL/Fl_Group.H
sourceview_panel.o: ../FL/Fl_Image.H
sourceview_panel.o: ../FL/Fl_Input.H
sourceview_panel.o: ../FL/Fl_Input_.H
sourceview_panel.o: ../FL/Fl_Light_Button.H
sourceview_panel.o: ../FL/Fl_Menu_.H
sourceview_panel.o: ../FL/Fl_Menu_Item.H
sourceview_panel.o: ../FL/Fl_Pixmap.H
sourceview_panel.o: ../FL/Fl_Plugin.H
@ -1645,6 +1598,7 @@ undo.o: ../config.h
undo.o: ../FL/Enumerations.H
undo.o: ../FL/filename.H
undo.o: ../FL/Fl.H
undo.o: ../FL/fl_ask.H
undo.o: ../FL/fl_attr.h
undo.o: ../FL/Fl_Bitmap.H
undo.o: ../FL/Fl_Browser_.H
@ -1732,6 +1686,7 @@ widget_panel.o: ../FL/Fl_Device.H
widget_panel.o: ../FL/Fl_Double_Window.H
widget_panel.o: ../FL/fl_draw.H
widget_panel.o: ../FL/Fl_Export.H
widget_panel.o: ../FL/Fl_Flex.H
widget_panel.o: ../FL/Fl_Graphics_Driver.H
widget_panel.o: ../FL/Fl_Grid.H
widget_panel.o: ../FL/Fl_Group.H
@ -1743,6 +1698,7 @@ widget_panel.o: ../FL/Fl_Light_Button.H
widget_panel.o: ../FL/Fl_Menu_.H
widget_panel.o: ../FL/Fl_Menu_Button.H
widget_panel.o: ../FL/Fl_Menu_Item.H
widget_panel.o: ../FL/Fl_Pack.H
widget_panel.o: ../FL/Fl_Pixmap.H
widget_panel.o: ../FL/Fl_Plugin.H
widget_panel.o: ../FL/Fl_Preferences.H
@ -1763,13 +1719,17 @@ widget_panel.o: ../FL/Fl_Valuator.H
widget_panel.o: ../FL/Fl_Value_Input.H
widget_panel.o: ../FL/Fl_Widget.H
widget_panel.o: ../FL/Fl_Window.H
widget_panel.o: ../FL/Fl_Wizard.H
widget_panel.o: ../FL/platform_types.h
widget_panel.o: ../src/Fl_String.H
widget_panel.o: code.h
widget_panel.o: CodeEditor.h
widget_panel.o: custom_widgets.h
widget_panel.o: Fl_Grid_Type.h
widget_panel.o: Fl_Group_Type.h
widget_panel.o: Fl_Type.h
widget_panel.o: Fl_Widget_Type.h
widget_panel.o: pixmaps.h
widget_panel.o: StyleParse.h
widget_panel.o: undo.h
widget_panel.o: widget_panel.h

6
fluid/mergeback.cxx
View File

@ -194,7 +194,7 @@ int Fd_Mergeback::ask_user_to_merge(const Fl_String &code_filename, const Fl_Str
"MergeBack found %3$d modifications in the project structure\n"
"of the source code. These kind of changes can no be\n"
"merged back and will be lost when the source code is\n"
"generated again from the open project.",
"generated again from the open project.",
code_filename.c_str(), proj_filename.c_str(), num_changed_structure);
return -1;
}
@ -294,7 +294,7 @@ void Fd_Mergeback::analyse_code(unsigned long code_crc, unsigned long tag_crc, i
type or widget can not be found in the project
* num_possible_override number of blocks that were changed in the code file,
but also were changed in the project.
\return -1 if reading a tag failed, otherwise 0
*/
int Fd_Mergeback::analyse() {
@ -330,7 +330,7 @@ int Fd_Mergeback::analyse() {
if (n!=3 || tag_type<0 || tag_type>FD_TAG_LAST ) { tag_error = 1; return -1; }
if (code_crc != tag_crc) {
switch (tag_type) {
case FD_TAG_GENERIC:
case FD_TAG_GENERIC:
num_changed_structure++;
break;
case FD_TAG_MENU_CALLBACK:

8
fluid/sourceview_panel.cxx
View File

@ -32,7 +32,7 @@ extern void reveal_in_browser(Fl_Type *t);
/**
Update the header and source code highlighting depending on the
currently selected object
The Source View system offers an immediate preview of the code
files that will be generated by FLUID. It also marks the code
generated for the last selected item in the header and the source
@ -343,11 +343,11 @@ static void cb_1(Fl_Button*, void*) {
static void cb_Reveal(Fl_Button*, void*) {
if (sourceview_panel && sourceview_panel->visible()) {
Fl_Type *node = NULL;
if (sv_source->visible_r())
if (sv_source->visible_r())
node = Fl_Type::find_in_text(0, sv_source->insert_position());
else if (sv_header->visible_r())
else if (sv_header->visible_r())
node = Fl_Type::find_in_text(1, sv_header->insert_position());
else if (sv_project->visible_r())
else if (sv_project->visible_r())
node = Fl_Type::find_in_text(2, sv_project->insert_position());
if (node) {
select_only(node);

6
fluid/sourceview_panel.fl
View File

@ -419,11 +419,11 @@ if (e) {
label Reveal
callback {if (sourceview_panel && sourceview_panel->visible()) {
Fl_Type *node = NULL;
if (sv_source->visible_r())
if (sv_source->visible_r())
node = Fl_Type::find_in_text(0, sv_source->insert_position());
else if (sv_header->visible_r())
else if (sv_header->visible_r())
node = Fl_Type::find_in_text(1, sv_header->insert_position());
else if (sv_project->visible_r())
else if (sv_project->visible_r())
node = Fl_Type::find_in_text(2, sv_project->insert_position());
if (node) {
select_only(node);

2
fluid/template_panel.cxx
View File

@ -252,7 +252,7 @@ void template_load() {
"}\nFl_Button {} {\nlabel Count\ncallback {int i = counter_widget->ivalue();\ni++;\n"
"counter_widget->value(i);}\nxywh {99 15 80 22}\n}\n}\n}\n", f);
fclose(f);
}
}
sample_templates_generated = 2;
fluid_prefs.set("sample_templates_generated", sample_templates_generated);
fluid_prefs.flush();

2
fluid/template_panel.fl
View File

@ -249,7 +249,7 @@ if (sample_templates_generated < 2) {
"}\\nFl_Button {} {\\nlabel Count\\ncallback {int i = counter_widget->ivalue();\\ni++;\\n"
"counter_widget->value(i);}\\nxywh {99 15 80 22}\\n}\\n}\\n}\\n", f);
fclose(f);
}
}
sample_templates_generated = 2;
fluid_prefs.set("sample_templates_generated", sample_templates_generated);
fluid_prefs.flush();

20
fluid/widget_panel.cxx
View File

@ -254,14 +254,14 @@ static void cb_Left(Fl_Value_Input* o, void* v) {
if (!grid) return;
int m = 0;
if (v == LOAD) {
grid->margin(&m, NULL, NULL, NULL);
grid->margin(&m, NULL, NULL, NULL);
o->value(m);
} else {
int m = (int)o->value(), old_m;
grid->margin(&old_m, NULL, NULL, NULL);
grid->margin(&old_m, NULL, NULL, NULL);
if (m != old_m) {
undo_checkpoint();
grid->margin(m, -1, -1, -1);
grid->margin(m, -1, -1, -1);
grid->need_layout(true);
set_modflag(1);
}
@ -273,14 +273,14 @@ static void cb_Top(Fl_Value_Input* o, void* v) {
if (!grid) return;
int m = 0;
if (v == LOAD) {
grid->margin(NULL, &m, NULL, NULL);
grid->margin(NULL, &m, NULL, NULL);
o->value(m);
} else {
int m = (int)o->value(), old_m;
grid->margin(NULL, &old_m, NULL, NULL);
grid->margin(NULL, &old_m, NULL, NULL);
if (m != old_m) {
undo_checkpoint();
grid->margin(-1, m, -1, -1);
grid->margin(-1, m, -1, -1);
grid->need_layout(true);
set_modflag(1);
}
@ -292,14 +292,14 @@ static void cb_Right(Fl_Value_Input* o, void* v) {
if (!grid) return;
int m = 0;
if (v == LOAD) {
grid->margin(NULL, NULL, &m, NULL);
grid->margin(NULL, NULL, &m, NULL);
o->value(m);
} else {
int m = (int)o->value(), old_m;
grid->margin(NULL, NULL, &old_m, NULL);
grid->margin(NULL, NULL, &old_m, NULL);
if (m != old_m) {
undo_checkpoint();
grid->margin(-1, -1, m, -1);
grid->margin(-1, -1, m, -1);
grid->need_layout(true);
set_modflag(1);
}
@ -437,7 +437,7 @@ static void cb_Weight(Fluid_Coord_Input* o, void* v) {
undo_checkpoint();
grid->row_weight(r, h);
grid->need_layout(true);
set_modflag(1);
set_modflag(1);
}
}
}

20
fluid/widget_panel.fl
View File

@ -1175,14 +1175,14 @@ if (v == LOAD) {
if (!grid) return;
int m = 0;
if (v == LOAD) {
grid->margin(&m, NULL, NULL, NULL);
grid->margin(&m, NULL, NULL, NULL);
o->value(m);
} else {
int m = (int)o->value(), old_m;
grid->margin(&old_m, NULL, NULL, NULL);
grid->margin(&old_m, NULL, NULL, NULL);
if (m != old_m) {
undo_checkpoint();
grid->margin(m, -1, -1, -1);
grid->margin(m, -1, -1, -1);
grid->need_layout(true);
set_modflag(1);
}
@ -1195,14 +1195,14 @@ if (v == LOAD) {
if (!grid) return;
int m = 0;
if (v == LOAD) {
grid->margin(NULL, &m, NULL, NULL);
grid->margin(NULL, &m, NULL, NULL);
o->value(m);
} else {
int m = (int)o->value(), old_m;
grid->margin(NULL, &old_m, NULL, NULL);
grid->margin(NULL, &old_m, NULL, NULL);
if (m != old_m) {
undo_checkpoint();
grid->margin(-1, m, -1, -1);
grid->margin(-1, m, -1, -1);
grid->need_layout(true);
set_modflag(1);
}
@ -1215,14 +1215,14 @@ if (v == LOAD) {
if (!grid) return;
int m = 0;
if (v == LOAD) {
grid->margin(NULL, NULL, &m, NULL);
grid->margin(NULL, NULL, &m, NULL);
o->value(m);
} else {
int m = (int)o->value(), old_m;
grid->margin(NULL, NULL, &old_m, NULL);
grid->margin(NULL, NULL, &old_m, NULL);
if (m != old_m) {
undo_checkpoint();
grid->margin(-1, -1, m, -1);
grid->margin(-1, -1, m, -1);
grid->need_layout(true);
set_modflag(1);
}
@ -1395,7 +1395,7 @@ if (v == LOAD) {
undo_checkpoint();
grid->row_weight(r, h);
grid->need_layout(true);
set_modflag(1);
set_modflag(1);
}
}}
xywh {240 175 55 20} labelsize 11 align 5 textsize 11

2
src/Fl.cxx
View File

@ -946,7 +946,7 @@ Fl_Widget* fl_oldfocus; // kludge for Fl_Group...
Use this function inside the \c handle(int) member function of a widget of yours
to give focus to the widget, for example when it receives the FL_FOCUS or the FL_PUSH event.
Otherwise, use Fl_Widget::take_focus() to give focus to a widget;
If you change Fl::focus(), the previous widget and all
parents (that don't contain the new widget) are sent FL_UNFOCUS
events. Changing the focus does \e not send FL_FOCUS to

4
src/Fl_Grid.cxx
View File

@ -641,7 +641,7 @@ void Fl_Grid::margin(int left, int top, int right, int bottom) {
need_layout(1);
}
/**
/**
Returns all outside margin sizes of the grid.
All margin sizes are returned in the given arguments. If any argument
@ -1146,7 +1146,7 @@ int Fl_Grid::computed_col_width(int col) const {
return Cols_[col].w_;
}
int Fl_Grid::computed_row_height(int row) const {
int Fl_Grid::computed_row_height(int row) const {
return Rows_[row].h_;
}

18
src/Fl_Terminal.cxx
View File

@ -2238,15 +2238,15 @@ void Fl_Terminal::handle_SGR(void) { // ESC[...m?
int val = esc.val(i); // each val one at a time
switch ( rgbmode ) {
case 0:
// RGB mode values?
switch (val) {
case 38: // fg RGB mode? e.g. ESC[38;2;<R>;<G>;<B>m
case 48: // bg RGB mode? e.g. ESC[48;2;<R>;<G>;<B>m
rgbmode = 1;
rgbcode = val;
continue;
}
break;
// RGB mode values?
switch (val) {
case 38: // fg RGB mode? e.g. ESC[38;2;<R>;<G>;<B>m
case 48: // bg RGB mode? e.g. ESC[48;2;<R>;<G>;<B>m
rgbmode = 1;
rgbcode = val;
continue;
}
break;
case 1: if (val == 2) { rgbmode++; continue; } // '2'?
rgbcode = rgbmode = 0; // not '2'? cancel
handle_unknown_char();

2
src/Fl_Window.cxx
View File

@ -925,7 +925,7 @@ fl_uintptr_t Fl_Window::os_id() { return pWindowDriver->os_id();}
/**
Maximizes a top-level window to its current screen.
This function is effective only with a show()'n, resizable, top-level window.
Bordered and borderless windows can be used.
\see Fl_Window::un_maximize(), Fl_Window::maximize_active()

2
src/drivers/Wayland/Fl_Wayland_Graphics_Driver.cxx
View File

@ -95,7 +95,7 @@ void Fl_Wayland_Graphics_Driver::create_shm_buffer(Fl_Wayland_Graphics_Driver::w
wl_list_init(&pool_data->buffers);
wl_shm_pool_set_user_data(current_pool, pool_data);
}
buffer->wl_buffer = wl_shm_pool_create_buffer(current_pool, chunk_offset,
buffer->wl_buffer = wl_shm_pool_create_buffer(current_pool, chunk_offset,
width, height, stride, wld_format);
wl_buffer_add_listener(buffer->wl_buffer, &buffer_listener, buffer);
// add this buffer to head of list of current pool's buffers

2
src/drivers/Wayland/fl_wayland_clipboard_dnd.cxx
View File

@ -673,7 +673,7 @@ void Fl_Wayland_Screen_Driver::copy(const char *stuff, int len, int clipboard,
// we transmit the adequate value of index in fl_selection_buffer[index]
wl_data_source_add_listener(seat->data_source, &data_source_listener, (void*)1);
wl_data_source_offer(seat->data_source, wld_plain_text_clipboard);
wl_data_device_set_selection(seat->data_device,
wl_data_device_set_selection(seat->data_device,
seat->data_source,
seat->keyboard_enter_serial);
//fprintf(stderr, "wl_data_device_set_selection len=%d to %d\n", len, clipboard);

2
test/fullscreen.cxx
View File

@ -342,7 +342,7 @@ int main(int argc, char **argv) {
window.b3 = new Fl_Toggle_Light_Button(50,y,window.w()-60,30,"FullScreen");
window.b3->callback(fullscreen_cb,w);
y+=30;
window.b3_maxi = new Fl_Toggle_Light_Button(50,y,window.w()-60,30,"Maximize");
window.b3_maxi->callback(maximize_cb,w);
y+=30;

203
test/makedepend
View File

@ -203,11 +203,8 @@ browser.o: ../FL/Fl_Cairo.H
browser.o: ../FL/fl_casts.H
browser.o: ../FL/Fl_Choice.H
browser.o: ../FL/fl_config.h
browser.o: ../FL/Fl_Device.H
browser.o: ../FL/Fl_Double_Window.H
browser.o: ../FL/fl_draw.H
browser.o: ../FL/Fl_Export.H
browser.o: ../FL/Fl_Graphics_Driver.H
browser.o: ../FL/Fl_Group.H
browser.o: ../FL/Fl_Image.H
browser.o: ../FL/Fl_Input.H
@ -215,17 +212,11 @@ browser.o: ../FL/Fl_Input_.H
browser.o: ../FL/Fl_Int_Input.H
browser.o: ../FL/Fl_Menu_.H
browser.o: ../FL/Fl_Menu_Item.H
browser.o: ../FL/Fl_Pixmap.H
browser.o: ../FL/Fl_Plugin.H
browser.o: ../FL/Fl_Preferences.H
browser.o: ../FL/Fl_Rect.H
browser.o: ../FL/Fl_RGB_Image.H
browser.o: ../FL/Fl_Scrollbar.H
browser.o: ../FL/Fl_Select_Browser.H
browser.o: ../FL/Fl_Terminal.H
browser.o: ../FL/Fl_Slider.H
browser.o: ../FL/Fl_Text_Buffer.H
browser.o: ../FL/Fl_Text_Display.H
browser.o: ../FL/Fl_Terminal.H
browser.o: ../FL/fl_types.h
browser.o: ../FL/fl_utf8.h
browser.o: ../FL/Fl_Valuator.H
@ -236,23 +227,18 @@ button.o: ../FL/Enumerations.H
button.o: ../FL/Fl.H
button.o: ../FL/fl_ask.H
button.o: ../FL/fl_attr.h
button.o: ../FL/Fl_Bitmap.H
button.o: ../FL/Fl_Button.H
button.o: ../FL/Fl_Cairo.H
button.o: ../FL/fl_casts.H
button.o: ../FL/fl_config.h
button.o: ../FL/Fl_Export.H
button.o: ../FL/Fl_Group.H
button.o: ../FL/Fl_Image.H
button.o: ../FL/fl_types.h
button.o: ../FL/fl_utf8.h
button.o: ../FL/Fl_Widget.H
button.o: ../FL/Fl_Window.H
button.o: ../FL/platform_types.h
buttons.o: ../FL/Enumerations.H
buttons.o: ../FL/Fl.H
buttons.o: ../FL/fl_attr.h
buttons.o: ../FL/Fl_Bitmap.H
buttons.o: ../FL/Fl_Button.H
buttons.o: ../FL/Fl_Cairo.H
buttons.o: ../FL/fl_casts.H
@ -260,7 +246,6 @@ buttons.o: ../FL/Fl_Check_Button.H
buttons.o: ../FL/Fl_Choice.H
buttons.o: ../FL/fl_config.h
buttons.o: ../FL/Fl_Export.H
buttons.o: ../FL/Fl_Group.H
buttons.o: ../FL/Fl_Image.H
buttons.o: ../FL/Fl_Light_Button.H
buttons.o: ../FL/Fl_Menu_.H
@ -507,10 +492,8 @@ contrast.o: ../FL/Fl_Return_Button.H
contrast.o: ../FL/Fl_RGB_Image.H
contrast.o: ../FL/Fl_Round_Button.H
contrast.o: ../FL/Fl_Scrollbar.H
contrast.o: ../FL/Fl_Terminal.H
contrast.o: ../FL/Fl_Slider.H
contrast.o: ../FL/Fl_Text_Buffer.H
contrast.o: ../FL/Fl_Text_Display.H
contrast.o: ../FL/Fl_Terminal.H
contrast.o: ../FL/fl_types.h
contrast.o: ../FL/fl_utf8.h
contrast.o: ../FL/Fl_Valuator.H
@ -675,31 +658,20 @@ demo.o: ../FL/Fl_Cairo.H
demo.o: ../FL/fl_casts.H
demo.o: ../FL/Fl_Choice.H
demo.o: ../FL/fl_config.h
demo.o: ../FL/Fl_Device.H
demo.o: ../FL/Fl_Double_Window.H
demo.o: ../FL/fl_draw.H
demo.o: ../FL/Fl_Export.H
demo.o: ../FL/Fl_Graphics_Driver.H
demo.o: ../FL/Fl_Group.H
demo.o: ../FL/Fl_Image.H
demo.o: ../FL/Fl_Menu_.H
demo.o: ../FL/Fl_Menu_Button.H
demo.o: ../FL/Fl_Menu_Item.H
demo.o: ../FL/Fl_Pixmap.H
demo.o: ../FL/Fl_Plugin.H
demo.o: ../FL/Fl_Preferences.H
demo.o: ../FL/Fl_Rect.H
demo.o: ../FL/Fl_RGB_Image.H
demo.o: ../FL/Fl_Scheme.H
demo.o: ../FL/Fl_Scheme_Choice.H
demo.o: ../FL/Fl_Scrollbar.H
demo.o: ../FL/Fl_Terminal.H
demo.o: ../FL/Fl_Slider.H
demo.o: ../FL/Fl_Text_Buffer.H
demo.o: ../FL/Fl_Text_Display.H
demo.o: ../FL/fl_types.h
demo.o: ../FL/fl_utf8.h
demo.o: ../FL/Fl_Valuator.H
demo.o: ../FL/Fl_Widget.H
demo.o: ../FL/Fl_Window.H
demo.o: ../FL/platform.H
@ -885,15 +857,12 @@ file_chooser.o: ../FL/fl_casts.H
file_chooser.o: ../FL/Fl_Check_Button.H
file_chooser.o: ../FL/Fl_Choice.H
file_chooser.o: ../FL/fl_config.h
file_chooser.o: ../FL/Fl_Device.H
file_chooser.o: ../FL/Fl_Double_Window.H
file_chooser.o: ../FL/fl_draw.H
file_chooser.o: ../FL/Fl_Export.H
file_chooser.o: ../FL/Fl_File_Browser.H
file_chooser.o: ../FL/Fl_File_Chooser.H
file_chooser.o: ../FL/Fl_File_Icon.H
file_chooser.o: ../FL/Fl_File_Input.H
file_chooser.o: ../FL/Fl_Graphics_Driver.H
file_chooser.o: ../FL/Fl_Group.H
file_chooser.o: ../FL/Fl_Image.H
file_chooser.o: ../FL/Fl_Input.H
@ -902,19 +871,14 @@ file_chooser.o: ../FL/Fl_Light_Button.H
file_chooser.o: ../FL/Fl_Menu_.H
file_chooser.o: ../FL/Fl_Menu_Button.H
file_chooser.o: ../FL/Fl_Menu_Item.H
file_chooser.o: ../FL/Fl_Pixmap.H
file_chooser.o: ../FL/Fl_Plugin.H
file_chooser.o: ../FL/Fl_PNM_Image.H
file_chooser.o: ../FL/Fl_Preferences.H
file_chooser.o: ../FL/Fl_Rect.H
file_chooser.o: ../FL/Fl_Return_Button.H
file_chooser.o: ../FL/Fl_RGB_Image.H
file_chooser.o: ../FL/Fl_Scrollbar.H
file_chooser.o: ../FL/Fl_Shared_Image.H
file_chooser.o: ../FL/Fl_Terminal.H
file_chooser.o: ../FL/Fl_Slider.H
file_chooser.o: ../FL/Fl_Text_Buffer.H
file_chooser.o: ../FL/Fl_Text_Display.H
file_chooser.o: ../FL/Fl_Terminal.H
file_chooser.o: ../FL/Fl_Tile.H
file_chooser.o: ../FL/fl_types.h
file_chooser.o: ../FL/fl_utf8.h
@ -968,17 +932,13 @@ fltk-versions.o: ../FL/Enumerations.H
fltk-versions.o: ../FL/Fl.H
fltk-versions.o: ../FL/fl_ask.H
fltk-versions.o: ../FL/fl_attr.h
fltk-versions.o: ../FL/Fl_Bitmap.H
fltk-versions.o: ../FL/Fl_Box.H
fltk-versions.o: ../FL/Fl_Cairo.H
fltk-versions.o: ../FL/fl_casts.H
fltk-versions.o: ../FL/fl_config.h
fltk-versions.o: ../FL/Fl_Export.H
fltk-versions.o: ../FL/Fl_Group.H
fltk-versions.o: ../FL/Fl_Image.H
fltk-versions.o: ../FL/fl_types.h
fltk-versions.o: ../FL/fl_utf8.h
fltk-versions.o: ../FL/Fl_Widget.H
fltk-versions.o: ../FL/Fl_Window.H
fltk-versions.o: ../FL/platform_types.h
fonts.o: ../FL/Enumerations.H
@ -1235,17 +1195,13 @@ gl_overlay.o: ../FL/platform_types.h
hello.o: ../FL/Enumerations.H
hello.o: ../FL/Fl.H
hello.o: ../FL/fl_attr.h
hello.o: ../FL/Fl_Bitmap.H
hello.o: ../FL/Fl_Box.H
hello.o: ../FL/Fl_Cairo.H
hello.o: ../FL/fl_casts.H
hello.o: ../FL/fl_config.h
hello.o: ../FL/Fl_Export.H
hello.o: ../FL/Fl_Group.H
hello.o: ../FL/Fl_Image.H
hello.o: ../FL/fl_types.h
hello.o: ../FL/fl_utf8.h
hello.o: ../FL/Fl_Widget.H
hello.o: ../FL/Fl_Window.H
hello.o: ../FL/platform_types.h
help_dialog.o: ../FL/Enumerations.H
@ -1306,18 +1262,14 @@ icon.o: ../FL/platform_types.h
iconize.o: ../FL/Enumerations.H
iconize.o: ../FL/Fl.H
iconize.o: ../FL/fl_attr.h
iconize.o: ../FL/Fl_Bitmap.H
iconize.o: ../FL/Fl_Box.H
iconize.o: ../FL/Fl_Button.H
iconize.o: ../FL/Fl_Cairo.H
iconize.o: ../FL/fl_casts.H
iconize.o: ../FL/fl_config.h
iconize.o: ../FL/Fl_Export.H
iconize.o: ../FL/Fl_Group.H
iconize.o: ../FL/Fl_Image.H
iconize.o: ../FL/fl_types.h
iconize.o: ../FL/fl_utf8.h
iconize.o: ../FL/Fl_Widget.H
iconize.o: ../FL/Fl_Window.H
iconize.o: ../FL/platform_types.h
image.o: ../config.h
@ -1379,7 +1331,6 @@ inactive.o: inactive.h
input.o: ../FL/Enumerations.H
input.o: ../FL/Fl.H
input.o: ../FL/fl_attr.h
input.o: ../FL/Fl_Bitmap.H
input.o: ../FL/Fl_Box.H
input.o: ../FL/Fl_Button.H
input.o: ../FL/Fl_Cairo.H
@ -1387,11 +1338,8 @@ input.o: ../FL/fl_casts.H
input.o: ../FL/Fl_Choice.H
input.o: ../FL/Fl_Color_Chooser.H
input.o: ../FL/fl_config.h
input.o: ../FL/Fl_Device.H
input.o: ../FL/fl_draw.H
input.o: ../FL/Fl_Export.H
input.o: ../FL/Fl_Float_Input.H
input.o: ../FL/Fl_Graphics_Driver.H
input.o: ../FL/Fl_Group.H
input.o: ../FL/Fl_Image.H
input.o: ../FL/Fl_Input.H
@ -1401,18 +1349,11 @@ input.o: ../FL/Fl_Light_Button.H
input.o: ../FL/Fl_Menu_.H
input.o: ../FL/Fl_Menu_Item.H
input.o: ../FL/Fl_Multiline_Input.H
input.o: ../FL/Fl_Pixmap.H
input.o: ../FL/Fl_Plugin.H
input.o: ../FL/Fl_Preferences.H
input.o: ../FL/Fl_Rect.H
input.o: ../FL/Fl_Return_Button.H
input.o: ../FL/Fl_RGB_Image.H
input.o: ../FL/Fl_Scrollbar.H
input.o: ../FL/Fl_Secret_Input.H
input.o: ../FL/Fl_Terminal.H
input.o: ../FL/Fl_Slider.H
input.o: ../FL/Fl_Text_Buffer.H
input.o: ../FL/Fl_Text_Display.H
input.o: ../FL/Fl_Toggle_Button.H
input.o: ../FL/fl_types.h
input.o: ../FL/fl_utf8.h
@ -1429,11 +1370,8 @@ input_choice.o: ../FL/Fl_Button.H
input_choice.o: ../FL/Fl_Cairo.H
input_choice.o: ../FL/fl_casts.H
input_choice.o: ../FL/fl_config.h
input_choice.o: ../FL/Fl_Device.H
input_choice.o: ../FL/Fl_Double_Window.H
input_choice.o: ../FL/fl_draw.H
input_choice.o: ../FL/Fl_Export.H
input_choice.o: ../FL/Fl_Graphics_Driver.H
input_choice.o: ../FL/Fl_Group.H
input_choice.o: ../FL/Fl_Image.H
input_choice.o: ../FL/Fl_Input.H
@ -1442,26 +1380,17 @@ input_choice.o: ../FL/Fl_Input_Choice.H
input_choice.o: ../FL/Fl_Menu_.H
input_choice.o: ../FL/Fl_Menu_Button.H
input_choice.o: ../FL/Fl_Menu_Item.H
input_choice.o: ../FL/Fl_Pixmap.H
input_choice.o: ../FL/Fl_Plugin.H
input_choice.o: ../FL/Fl_Preferences.H
input_choice.o: ../FL/Fl_Rect.H
input_choice.o: ../FL/Fl_RGB_Image.H
input_choice.o: ../FL/Fl_Scrollbar.H
input_choice.o: ../FL/Fl_Terminal.H
input_choice.o: ../FL/Fl_Slider.H
input_choice.o: ../FL/Fl_Text_Buffer.H
input_choice.o: ../FL/Fl_Text_Display.H
input_choice.o: ../FL/fl_types.h
input_choice.o: ../FL/fl_utf8.h
input_choice.o: ../FL/Fl_Valuator.H
input_choice.o: ../FL/Fl_Widget.H
input_choice.o: ../FL/Fl_Window.H
input_choice.o: ../FL/platform_types.h
keyboard.o: ../FL/Enumerations.H
keyboard.o: ../FL/Fl.H
keyboard.o: ../FL/fl_attr.h
keyboard.o: ../FL/Fl_Bitmap.H
keyboard.o: ../FL/Fl_Box.H
keyboard.o: ../FL/Fl_Button.H
keyboard.o: ../FL/Fl_Cairo.H
@ -1469,14 +1398,11 @@ keyboard.o: ../FL/fl_casts.H
keyboard.o: ../FL/fl_config.h
keyboard.o: ../FL/Fl_Dial.H
keyboard.o: ../FL/Fl_Export.H
keyboard.o: ../FL/Fl_Group.H
keyboard.o: ../FL/Fl_Image.H
keyboard.o: ../FL/Fl_Input.H
keyboard.o: ../FL/Fl_Input_.H
keyboard.o: ../FL/Fl_Output.H
keyboard.o: ../FL/fl_types.h
keyboard.o: ../FL/fl_utf8.h
keyboard.o: ../FL/Fl_Widget.H
keyboard.o: ../FL/Fl_Window.H
keyboard.o: ../FL/platform_types.h
keyboard.o: keyboard.h
@ -1626,12 +1552,10 @@ menubar.o: ../FL/Fl_RGB_Image.H
menubar.o: ../FL/Fl_Scheme.H
menubar.o: ../FL/Fl_Scheme_Choice.H
menubar.o: ../FL/Fl_Scrollbar.H
menubar.o: ../FL/Fl_Terminal.H
menubar.o: ../FL/Fl_Slider.H
menubar.o: ../FL/fl_string_functions.h
menubar.o: ../FL/Fl_Sys_Menu_Bar.H
menubar.o: ../FL/Fl_Text_Buffer.H
menubar.o: ../FL/Fl_Text_Display.H
menubar.o: ../FL/Fl_Terminal.H
menubar.o: ../FL/Fl_Toggle_Button.H
menubar.o: ../FL/fl_types.h
menubar.o: ../FL/fl_utf8.h
@ -1644,16 +1568,12 @@ message.o: ../FL/Enumerations.H
message.o: ../FL/Fl.H
message.o: ../FL/fl_ask.H
message.o: ../FL/fl_attr.h
message.o: ../FL/Fl_Bitmap.H
message.o: ../FL/Fl_Cairo.H
message.o: ../FL/fl_casts.H
message.o: ../FL/fl_config.h
message.o: ../FL/Fl_Export.H
message.o: ../FL/Fl_Group.H
message.o: ../FL/Fl_Image.H
message.o: ../FL/fl_types.h
message.o: ../FL/fl_utf8.h
message.o: ../FL/Fl_Widget.H
message.o: ../FL/Fl_Window.H
message.o: ../FL/platform_types.h
minimum.o: ../FL/Enumerations.H
@ -1719,10 +1639,8 @@ native-filechooser.o: ../FL/Fl_Rect.H
native-filechooser.o: ../FL/Fl_Return_Button.H
native-filechooser.o: ../FL/Fl_RGB_Image.H
native-filechooser.o: ../FL/Fl_Scrollbar.H
native-filechooser.o: ../FL/Fl_Terminal.H
native-filechooser.o: ../FL/Fl_Slider.H
native-filechooser.o: ../FL/Fl_Text_Buffer.H
native-filechooser.o: ../FL/Fl_Text_Display.H
native-filechooser.o: ../FL/Fl_Terminal.H
native-filechooser.o: ../FL/Fl_Tile.H
native-filechooser.o: ../FL/fl_types.h
native-filechooser.o: ../FL/fl_utf8.h
@ -1733,19 +1651,15 @@ native-filechooser.o: ../FL/platform_types.h
navigation.o: ../FL/Enumerations.H
navigation.o: ../FL/Fl.H
navigation.o: ../FL/fl_attr.h
navigation.o: ../FL/Fl_Bitmap.H
navigation.o: ../FL/Fl_Cairo.H
navigation.o: ../FL/fl_casts.H
navigation.o: ../FL/fl_config.h
navigation.o: ../FL/Fl_Export.H
navigation.o: ../FL/Fl_Group.H
navigation.o: ../FL/Fl_Image.H
navigation.o: ../FL/Fl_Input.H
navigation.o: ../FL/Fl_Input_.H
navigation.o: ../FL/Fl_Light_Button.H
navigation.o: ../FL/fl_types.h
navigation.o: ../FL/fl_utf8.h
navigation.o: ../FL/Fl_Widget.H
navigation.o: ../FL/Fl_Window.H
navigation.o: ../FL/platform_types.h
offscreen.o: ../FL/Enumerations.H
@ -2322,14 +2236,12 @@ shape.o: ../FL/platform_types.h
subwindow.o: ../FL/Enumerations.H
subwindow.o: ../FL/Fl.H
subwindow.o: ../FL/fl_attr.h
subwindow.o: ../FL/Fl_Bitmap.H
subwindow.o: ../FL/Fl_Box.H
subwindow.o: ../FL/Fl_Button.H
subwindow.o: ../FL/Fl_Cairo.H
subwindow.o: ../FL/fl_casts.H
subwindow.o: ../FL/fl_config.h
subwindow.o: ../FL/Fl_Export.H
subwindow.o: ../FL/Fl_Group.H
subwindow.o: ../FL/Fl_Image.H
subwindow.o: ../FL/Fl_Input.H
subwindow.o: ../FL/Fl_Input_.H
@ -2446,12 +2358,10 @@ table.o: ../FL/Fl_Rect.H
table.o: ../FL/Fl_RGB_Image.H
table.o: ../FL/Fl_Scroll.H
table.o: ../FL/Fl_Scrollbar.H
table.o: ../FL/Fl_Terminal.H
table.o: ../FL/Fl_Slider.H
table.o: ../FL/Fl_Table.H
table.o: ../FL/Fl_Table_Row.H
table.o: ../FL/Fl_Text_Buffer.H
table.o: ../FL/Fl_Text_Display.H
table.o: ../FL/Fl_Terminal.H
table.o: ../FL/fl_types.h
table.o: ../FL/fl_utf8.h
table.o: ../FL/Fl_Valuator.H
@ -2487,6 +2397,40 @@ tabs.o: ../FL/Fl_Window.H
tabs.o: ../FL/Fl_Wizard.H
tabs.o: ../FL/platform_types.h
tabs.o: tabs.h
terminal.o: ../FL/Enumerations.H
terminal.o: ../FL/Fl.H
terminal.o: ../FL/fl_ask.H
terminal.o: ../FL/fl_attr.h
terminal.o: ../FL/Fl_Bitmap.H
terminal.o: ../FL/Fl_Box.H
terminal.o: ../FL/Fl_Button.H
terminal.o: ../FL/Fl_Cairo.H
terminal.o: ../FL/fl_casts.H
terminal.o: ../FL/Fl_Check_Button.H
terminal.o: ../FL/Fl_Choice.H
terminal.o: ../FL/fl_config.h
terminal.o: ../FL/Fl_Double_Window.H
terminal.o: ../FL/Fl_Export.H
terminal.o: ../FL/Fl_Group.H
terminal.o: ../FL/Fl_Image.H
terminal.o: ../FL/Fl_Input.H
terminal.o: ../FL/Fl_Input_.H
terminal.o: ../FL/Fl_Light_Button.H
terminal.o: ../FL/Fl_Menu_.H
terminal.o: ../FL/Fl_Menu_Item.H
terminal.o: ../FL/Fl_Rect.H
terminal.o: ../FL/Fl_Repeat_Button.H
terminal.o: ../FL/Fl_Scheme.H
terminal.o: ../FL/Fl_Scheme_Choice.H
terminal.o: ../FL/Fl_Scrollbar.H
terminal.o: ../FL/Fl_Spinner.H
terminal.o: ../FL/Fl_Terminal.H
terminal.o: ../FL/fl_types.h
terminal.o: ../FL/fl_utf8.h
terminal.o: ../FL/Fl_Widget.H
terminal.o: ../FL/Fl_Window.H
terminal.o: ../FL/platform_types.h
terminal.o: terminal.h
threads.o: ../config.h
threads.o: ../FL/Enumerations.H
threads.o: ../FL/Fl.H
@ -2595,8 +2539,8 @@ tree.o: ../FL/Fl_Rect.H
tree.o: ../FL/Fl_Return_Button.H
tree.o: ../FL/Fl_RGB_Image.H
tree.o: ../FL/Fl_Scrollbar.H
tree.o: ../FL/Fl_Terminal.H
tree.o: ../FL/Fl_Slider.H
tree.o: ../FL/Fl_Terminal.H
tree.o: ../FL/Fl_Text_Buffer.H
tree.o: ../FL/Fl_Text_Display.H
tree.o: ../FL/Fl_Tile.H
@ -2660,11 +2604,9 @@ unittests.o: ../FL/Fl_Preferences.H
unittests.o: ../FL/Fl_Rect.H
unittests.o: ../FL/Fl_RGB_Image.H
unittests.o: ../FL/Fl_Scrollbar.H
unittests.o: ../FL/Fl_Terminal.H
unittests.o: ../FL/Fl_Slider.H
unittests.o: ../FL/fl_string_functions.h
unittests.o: ../FL/Fl_Text_Buffer.H
unittests.o: ../FL/Fl_Text_Display.H
unittests.o: ../FL/Fl_Terminal.H
unittests.o: ../FL/fl_types.h
unittests.o: ../FL/fl_utf8.h
unittests.o: ../FL/Fl_Valuator.H
@ -2775,26 +2717,16 @@ unittest_core.o: ../FL/Fl_Cairo.H
unittest_core.o: ../FL/fl_callback_macros.H
unittest_core.o: ../FL/fl_casts.H
unittest_core.o: ../FL/fl_config.h
unittest_core.o: ../FL/Fl_Device.H
unittest_core.o: ../FL/Fl_Double_Window.H
unittest_core.o: ../FL/fl_draw.H
unittest_core.o: ../FL/Fl_Export.H
unittest_core.o: ../FL/Fl_Graphics_Driver.H
unittest_core.o: ../FL/Fl_Group.H
unittest_core.o: ../FL/Fl_Image.H
unittest_core.o: ../FL/Fl_Pixmap.H
unittest_core.o: ../FL/Fl_Plugin.H
unittest_core.o: ../FL/Fl_Preferences.H
unittest_core.o: ../FL/Fl_Rect.H
unittest_core.o: ../FL/Fl_RGB_Image.H
unittest_core.o: ../FL/Fl_Scrollbar.H
unittest_core.o: ../FL/Fl_Terminal.H
unittest_core.o: ../FL/Fl_Slider.H
unittest_core.o: ../FL/Fl_Text_Buffer.H
unittest_core.o: ../FL/Fl_Text_Display.H
unittest_core.o: ../FL/fl_types.h
unittest_core.o: ../FL/fl_utf8.h
unittest_core.o: ../FL/Fl_Valuator.H
unittest_core.o: ../FL/Fl_Widget.H
unittest_core.o: ../FL/Fl_Window.H
unittest_core.o: ../FL/platform_types.h
@ -2980,26 +2912,6 @@ unittest_scrollbarsize.o: ../FL/Fl_Widget.H
unittest_scrollbarsize.o: ../FL/Fl_Window.H
unittest_scrollbarsize.o: ../FL/platform_types.h
unittest_scrollbarsize.o: unittests.h
unittest_terminal.o: ../FL/Enumerations.H
unittest_terminal.o: ../FL/Fl.H
unittest_terminal.o: ../FL/fl_attr.h
unittest_terminal.o: ../FL/Fl_Bitmap.H
unittest_terminal.o: ../FL/Fl_Cairo.H
unittest_terminal.o: ../FL/fl_casts.H
unittest_terminal.o: ../FL/fl_config.h
unittest_terminal.o: ../FL/Fl_Double_Window.H
unittest_terminal.o: ../FL/Fl_Export.H
unittest_terminal.o: ../FL/Fl_Group.H
unittest_terminal.o: ../FL/Fl_Image.H
unittest_terminal.o: ../FL/Fl_Rect.H
unittest_terminal.o: ../FL/Fl_Scrollbar.H
unittest_terminal.o: ../FL/Fl_Terminal.H
unittest_terminal.o: ../FL/fl_types.h
unittest_terminal.o: ../FL/fl_utf8.h
unittest_terminal.o: ../FL/Fl_Widget.H
unittest_terminal.o: ../FL/Fl_Window.H
unittest_terminal.o: ../FL/platform_types.h
unittest_terminal.o: unittests.h
unittest_symbol.o: ../FL/Enumerations.H
unittest_symbol.o: ../FL/Fl.H
unittest_symbol.o: ../FL/fl_attr.h
@ -3026,6 +2938,26 @@ unittest_symbol.o: ../FL/Fl_Widget.H
unittest_symbol.o: ../FL/Fl_Window.H
unittest_symbol.o: ../FL/platform_types.h
unittest_symbol.o: unittests.h
unittest_terminal.o: ../FL/Enumerations.H
unittest_terminal.o: ../FL/Fl.H
unittest_terminal.o: ../FL/fl_attr.h
unittest_terminal.o: ../FL/Fl_Bitmap.H
unittest_terminal.o: ../FL/Fl_Cairo.H
unittest_terminal.o: ../FL/fl_casts.H
unittest_terminal.o: ../FL/fl_config.h
unittest_terminal.o: ../FL/Fl_Double_Window.H
unittest_terminal.o: ../FL/Fl_Export.H
unittest_terminal.o: ../FL/Fl_Group.H
unittest_terminal.o: ../FL/Fl_Image.H
unittest_terminal.o: ../FL/Fl_Rect.H
unittest_terminal.o: ../FL/Fl_Scrollbar.H
unittest_terminal.o: ../FL/Fl_Terminal.H
unittest_terminal.o: ../FL/fl_types.h
unittest_terminal.o: ../FL/fl_utf8.h
unittest_terminal.o: ../FL/Fl_Widget.H
unittest_terminal.o: ../FL/Fl_Window.H
unittest_terminal.o: ../FL/platform_types.h
unittest_terminal.o: unittests.h
unittest_text.o: ../FL/Enumerations.H
unittest_text.o: ../FL/Fl.H
unittest_text.o: ../FL/fl_attr.h
@ -3174,29 +3106,20 @@ valuators.o: ../FL/Fl_Cairo.H
valuators.o: ../FL/fl_casts.H
valuators.o: ../FL/fl_config.h
valuators.o: ../FL/Fl_Counter.H
valuators.o: ../FL/Fl_Device.H
valuators.o: ../FL/Fl_Dial.H
valuators.o: ../FL/Fl_Double_Window.H
valuators.o: ../FL/fl_draw.H
valuators.o: ../FL/Fl_Export.H
valuators.o: ../FL/Fl_Graphics_Driver.H
valuators.o: ../FL/Fl_Group.H
valuators.o: ../FL/Fl_Image.H
valuators.o: ../FL/Fl_Input.H
valuators.o: ../FL/Fl_Input_.H
valuators.o: ../FL/Fl_Pixmap.H
valuators.o: ../FL/Fl_Plugin.H
valuators.o: ../FL/Fl_Preferences.H
valuators.o: ../FL/Fl_Rect.H
valuators.o: ../FL/Fl_Repeat_Button.H
valuators.o: ../FL/Fl_RGB_Image.H
valuators.o: ../FL/Fl_Roller.H
valuators.o: ../FL/Fl_Scrollbar.H
valuators.o: ../FL/Fl_Terminal.H
valuators.o: ../FL/Fl_Slider.H
valuators.o: ../FL/Fl_Spinner.H
valuators.o: ../FL/Fl_Text_Buffer.H
valuators.o: ../FL/Fl_Text_Display.H
valuators.o: ../FL/Fl_Terminal.H
valuators.o: ../FL/fl_types.h
valuators.o: ../FL/fl_utf8.h
valuators.o: ../FL/Fl_Valuator.H

34
test/terminal.fl
View File

@ -198,11 +198,11 @@ debug_tty->append("\\n");
u8c = u8c_ring_row(hist_srow() + row);
debug_tty->printf("%3d H[", row);
for ( int col=0; col<hist_cols(); col++,u8c++ ) {
// Get Utf8Char's attrib,fg,bg and make that 'current' to draw the char in that style
debug_tty->textattrib(u8c->attrib());
debug_tty->textfgcolor(u8c->fgcolor());
debug_tty->textbgcolor(u8c->bgcolor());
debug_tty->print_char(u8c->text_utf8()); // print the char in current style
// Get Utf8Char's attrib,fg,bg and make that 'current' to draw the char in that style
debug_tty->textattrib(u8c->attrib());
debug_tty->textfgcolor(u8c->fgcolor());
debug_tty->textbgcolor(u8c->bgcolor());
debug_tty->print_char(u8c->text_utf8()); // print the char in current style
}
debug_tty->append("\\033[0m"); // restore default fg/bg/attrib
debug_tty->printf("] ");
@ -216,11 +216,11 @@ debug_tty->append("\\n");
u8c = u8c_ring_row(disp_srow() + row);
debug_tty->printf("%3d D[", row);
for ( int col=0; col<disp_cols(); col++,u8c++ ) {
// Get Utf8Char's attrib,fg,bg and make that 'current' to draw the char in that style
debug_tty->textattrib(u8c->attrib());
debug_tty->textfgcolor(u8c->fgcolor());
debug_tty->textbgcolor(u8c->bgcolor());
debug_tty->print_char(u8c->text_utf8()); // print the char in current style
// Get Utf8Char's attrib,fg,bg and make that 'current' to draw the char in that style
debug_tty->textattrib(u8c->attrib());
debug_tty->textfgcolor(u8c->fgcolor());
debug_tty->textbgcolor(u8c->bgcolor());
debug_tty->print_char(u8c->text_utf8()); // print the char in current style
}
debug_tty->append("\\033[0m"); // restore default fg/bg/attrib
debug_tty->append("]\\033[K\\n");
@ -372,13 +372,13 @@ return 1; // hit end of test, reset} {}
"\\033[0m\\033[H\\033[2J\\033[3J" // color/attr reset, home, cls, clear history
"hello.\\nLine one\\nLine two\\n"
"\\033[0;0;2m Dim text:\\033[31m red\\033[32m grn\\033[33m yel"
"\\033[34m blu\\033[35m mag\\033[36m cyn\\033[37m wht\\n"
"\\033[34m blu\\033[35m mag\\033[36m cyn\\033[37m wht\\n"
"\\033[0;0;0m Normal text:\\033[31m red\\033[32m grn\\033[33m yel"
"\\033[34m blu\\033[35m mag\\033[36m cyn\\033[37m wht\\n"
"\\033[34m blu\\033[35m mag\\033[36m cyn\\033[37m wht\\n"
"\\033[0;0;1m Bold text:\\033[31m red\\033[32m grn\\033[33m yel"
"\\033[34m blu\\033[35m mag\\033[36m cyn\\033[37m wht\\n"
"\\033[34m blu\\033[35m mag\\033[36m cyn\\033[37m wht\\n"
"\\033[0;1;3m Bold Italic text:\\033[31m red\\033[32m grn\\033[33m yel"
"\\033[34m blu\\033[35m mag\\033[36m cyn\\033[37m wht\\n"
"\\033[34m blu\\033[35m mag\\033[36m cyn\\033[37m wht\\n"
"\\033[0m\\n"
// Language Language
// Alignment Alignment
@ -1104,7 +1104,7 @@ const char *test[] = {
"25:456789012345678901234567890123456789012345678901234567890123456789",
"\\033[12H", // to prompt row
"---> Hit 'e' to test [1/4] DELETE LINE 3 with ESC[M: \\033[K",
"\\033[2K", // clear prompt
"\\033[2K", // clear prompt
"\\033[3H", // move to line 3
"\\033[M", // delete line 3
"\\033[12H", // back to line 12H for prompt
@ -1259,7 +1259,7 @@ for (int i=0; i<50; i++ ) {
}
// leave test with white on black
G_tty->textfgcolor(0xd0d0d000);
G_tty->textbgcolor(0xffffffff); // special see thru color
G_tty->textbgcolor(0xffffffff); // special see thru color
// back to rate limited
G_tty->redraw_style(Fl_Terminal::RATE_LIMITED);
// Show the Unicode alignment page
@ -1964,7 +1964,7 @@ decl {////// MAIN //////} {private local
Function {} {open
} {
code {G_tty = NULL;
Application app; // sets G_tty
Application app; // sets G_tty
G_app = &app;
app.show(argc, argv);
// Run the "firstpage" test