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

FLUID: Fixes missing DISPLAY connection.

Browse Source 
Fl_Terminal opens the X11 Display before shown, so we need
to generate a proxy in batch mode. This will no longer  work
when we add more Fl_Terminal attributes to FLUID.
This commit is contained in:
Matthias Melcher 2023-11-15 16:05:14 +01:00
parent d5a9be6b5e
commit 69189c8f07
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fluid/Fl_Grid_Type.cxx
View File

@ -166,7 +166,7 @@ void Fl_Grid_Proxy::move_cell(Fl_Widget *in_child, int to_row, int to_col, int h
\param[in] row, col, row_span, col_span, align cell parameters
*/
Fl_Grid::Cell* Fl_Grid_Proxy::transient_widget(Fl_Widget *wi, int row, int col, int row_span, int col_span, Fl_Grid_Align align) {
int i;
int i = 0;
bool remove_old_cell = false;
Cell *old_cell = cell(wi);
if (old_cell) {

10
fluid/factory.cxx
View File

@ -856,11 +856,15 @@ public:
// Older .fl files with Fl_Simple_Terminal will create a Fl_Terminal instead.
const char *alt_type_name() FL_OVERRIDE { return "Fl_Simple_Terminal"; }
Fl_Widget *widget(int x, int y, int w, int h) FL_OVERRIDE {
Fl_Terminal *term = new Fl_Terminal(x, y, w, h);
if (!batch_mode) {
Fl_Widget *ret = NULL;
if (batch_mode) {
ret = new Fl_Group(x, y, w, h);
} else {
Fl_Terminal *term = new Fl_Terminal(x, y, w, h);
//term->append("> ls -als"); // TODO: text color does not show
ret = term;
}
return term;
return ret;
}
// int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) FL_OVERRIDE {
// Fl_Terminal *myo = (Fl_Terminal*)(w==4 ? ((Fl_Widget_Type*)factory)->o : o);