summaryrefslogtreecommitdiff
path: root/fluid/nodes/Window_Node.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'fluid/nodes/Window_Node.cxx')
-rw-r--r--fluid/nodes/Window_Node.cxx57
1 files changed, 36 insertions, 21 deletions
diff --git a/fluid/nodes/Window_Node.cxx b/fluid/nodes/Window_Node.cxx
index 9a53d2ecb..5cdda615d 100644
--- a/fluid/nodes/Window_Node.cxx
+++ b/fluid/nodes/Window_Node.cxx
@@ -163,8 +163,9 @@ void Overlay_Window::draw() {
if ((damage()&FL_DAMAGE_ALL) &&
(!box() || (box()>=4&&!(box()&2)) || box()>=FL_ROUNDED_BOX)) {
// if so, draw checkerboard so user can see what areas are clear:
- for (int Y = 0; Y < h(); Y += CHECKSIZE)
- for (int X = 0; X < w(); X += CHECKSIZE) {
+ int Y, X;
+ for (Y = 0; Y < h(); Y += CHECKSIZE)
+ for (X = 0; X < w(); X += CHECKSIZE) {
fl_color(((Y/(2*CHECKSIZE))&1) != ((X/(2*CHECKSIZE))&1) ?
FL_WHITE : FL_BLACK);
fl_rectf(X,Y,CHECKSIZE,CHECKSIZE);
@@ -402,7 +403,8 @@ void Window_Node::newdx() {
if (Fluid.show_guides && (drag & (FD_DRAG|FD_TOP|FD_LEFT|FD_BOTTOM|FD_RIGHT))) {
Node *selection = 0; // special power for the first selected widget
- for (Node *q=next; q && q->level>level; q = q->next) {
+ Node *q;
+ for (q =next; q && q->level>level; q = q->next) {
if (q->selected && q->is_true_widget()) {
selection = q;
break;
@@ -492,7 +494,8 @@ void fd_hatch(int x, int y, int w, int h, int size=6, int offset=0, int pad=3) {
\param[in] x, y, w, h bounding box of this group
*/
void Window_Node::draw_out_of_bounds(Widget_Node *group, int x, int y, int w, int h) {
- for (Node *p = group->next; p && p->level>group->level; p = p->next) {
+ Node *p;
+ for (p = group->next; p && p->level>group->level; p = p->next) {
if (p->level == group->level+1 && p->is_true_widget()) {
Fl_Widget *o = ((Widget_Node*)p)->o;
if (o->x() < x) fd_hatch(o->x(), o->y(), x-o->x(), o->h());
@@ -510,7 +513,8 @@ void Window_Node::draw_out_of_bounds() {
// get every group in the hierarchy, then draw any overlap of a direct child with that group
fl_color(FL_DARK_RED);
draw_out_of_bounds(this, 0, 0, o->w(), o->h());
- for (Node *q=next; q && q->level>level; q = q->next) {
+ Node *q;
+ for (q =next; q && q->level>level; q = q->next) {
// don't do this for Fl_Scroll (which we currently can't handle in FLUID anyway)
if (q->is_a(FLD_NODE_TYPE_Group) && !q->is_a(FLD_NODE_TYPE_Scroll)) {
Widget_Node *w = (Widget_Node*)q;
@@ -526,7 +530,8 @@ void Window_Node::draw_out_of_bounds() {
void Window_Node::draw_overlaps() {
fl_color(FL_DARK_YELLOW);
// loop through all widgets in this window
- for (Node *q=next; q && q->level>level; q = q->next) {
+ Node *q;
+ for (q =next; q && q->level>level; q = q->next) {
// is it a valid widget
if (q->is_true_widget()) {
Widget_Node *w = (Widget_Node*)q;
@@ -534,7 +539,8 @@ void Window_Node::draw_overlaps() {
if (w->o->visible()) {
int x = w->o->x(), y = w->o->y();
int r = x + w->o->w(), b = y + w->o->h();
- for (Node *p=q->next; p && p->level>=q->level; p = p->next) {
+ Node *p;
+ for (p =q->next; p && p->level>=q->level; p = p->next) {
if (p->level==q->level && p->is_true_widget()) {
Widget_Node *wp = (Widget_Node*)p;
if (wp->o->visible()) {
@@ -557,10 +563,11 @@ void Window_Node::draw_overlaps() {
}
void Window_Node::draw_overlay() {
+ Node *q;
if (recalc) {
bx = o->w(); by = o->h(); br = 0; bt = 0;
numselected = 0;
- for (Node *q=next; q && q->level>level; q=q->next)
+ for (q =next; q && q->level>level; q=q->next)
if (q->selected && q->is_true_widget()) {
numselected++;
Widget_Node* myo = (Widget_Node*)q;
@@ -592,7 +599,7 @@ void Window_Node::draw_overlay() {
int mysx,mysy,mysr,myst;
mybx = mysx = o->w(); myby = mysy = o->h(); mybr = mysr = 0; mybt = myst = 0;
Node *selection = 0; // special power for the first selected widget
- for (Node *q=next; q && q->level>level; q = q->next)
+ for (q =next; q && q->level>level; q = q->next)
if (q->selected && q->is_true_widget()) {
if (!selection) selection = q;
Widget_Node* myo = (Widget_Node*)q;
@@ -674,7 +681,8 @@ void Window_Node::fix_overlay() {
void check_redraw_corresponding_parent(Node *s) {
Widget_Node * prev_parent = 0;
if( !s || !s->selected || !s->is_widget()) return;
- for (Node *i=s; i && i->parent; i=i->parent) {
+ Node *i;
+ for (i =s; i && i->parent; i=i->parent) {
if (i->is_a(FLD_NODE_TYPE_Group) && prev_parent) {
if (i->is_a(FLD_NODE_TYPE_Tabs)) {
((Fl_Tabs*)((Widget_Node*)i)->o)->value(prev_parent->o);
@@ -692,7 +700,8 @@ void check_redraw_corresponding_parent(Node *s) {
// do that for every window (when selected set changes):
void redraw_overlays() {
- for (Node *o=Fluid.proj.tree.first; o; o=o->next)
+ Node *o;
+ for (o =Fluid.proj.tree.first; o; o=o->next)
if (o->is_a(FLD_NODE_TYPE_Window)) ((Window_Node*)o)->fix_overlay();
}
@@ -707,7 +716,8 @@ void toggle_overlays(Fl_Widget *,void *) {
if (overlay_button) overlay_button->label("Hide &Overlays");
}
- for (Node *o=Fluid.proj.tree.first; o; o=o->next)
+ Node *o;
+ for (o =Fluid.proj.tree.first; o; o=o->next)
if (o->is_a(FLD_NODE_TYPE_Window)) {
Widget_Node* w = (Widget_Node*)o;
((Overlay_Window*)(w->o))->redraw_overlay();
@@ -730,7 +740,8 @@ void toggle_guides(Fl_Widget *,void *) {
if (guides_button)
guides_button->value(Fluid.show_guides);
- for (Node *o=Fluid.proj.tree.first; o; o=o->next) {
+ Node *o;
+ for (o =Fluid.proj.tree.first; o; o=o->next) {
if (o->is_a(FLD_NODE_TYPE_Window)) {
Widget_Node* w = (Widget_Node*)o;
((Overlay_Window*)(w->o))->redraw_overlay();
@@ -762,7 +773,8 @@ void toggle_restricted(Fl_Widget *,void *) {
if (restricted_button)
restricted_button->value(Fluid.show_restricted);
- for (Node *o=Fluid.proj.tree.first; o; o=o->next) {
+ Node *o;
+ for (o =Fluid.proj.tree.first; o; o=o->next) {
if (o->is_a(FLD_NODE_TYPE_Window)) {
Widget_Node* w = (Widget_Node*)o;
((Overlay_Window*)(w->o))->redraw_overlay();
@@ -776,7 +788,8 @@ void toggle_restricted(Fl_Widget *,void *) {
void toggle_ghosted_outline_cb(Fl_Check_Button *,void *) {
Fluid.show_ghosted_outline = !Fluid.show_ghosted_outline;
Fluid.preferences.set("Fluid.show_ghosted_outline", Fluid.show_ghosted_outline);
- for (Node *o=Fluid.proj.tree.first; o; o=o->next) {
+ Node *o;
+ for (o =Fluid.proj.tree.first; o; o=o->next) {
if (o->is_a(FLD_NODE_TYPE_Window)) {
Widget_Node* w = (Widget_Node*)o;
((Overlay_Window*)(w->o))->redraw();
@@ -914,6 +927,8 @@ int Window_Node::popupy = 0x7FFFFFFF;
int Window_Node::handle(int event) {
static Node* selection = 0;
+ Node *i;
+ Fl_Widget *o1;
switch (event) {
case FL_DND_ENTER:
// printf("DND enter\n");
@@ -922,7 +937,7 @@ int Window_Node::handle(int event) {
{
// find the innermost item clicked on:
selection = this;
- for (Node* i=next; i && i->level>level; i=i->next)
+ for (i =next; i && i->level>level; i=i->next)
if (i->is_a(FLD_NODE_TYPE_Group)) {
Widget_Node* myo = (Widget_Node*)i;
if (Fl::event_inside(myo->o) && myo->o->visible_r()) {
@@ -974,7 +989,7 @@ int Window_Node::handle(int event) {
// ok, so it is an image - now add it as image() or deimage() to the widget
// printf("DND check for target %s\n", fn);
Widget_Node *tgt = 0;
- for (Node* i=next; i && i->level>level; i=i->next) {
+ for (i =next; i && i->level>level; i=i->next) {
if (i->is_widget()) {
Widget_Node* myo = (Widget_Node*)i;
if (Fl::event_inside(myo->o) && myo->o->visible_r())
@@ -1044,10 +1059,10 @@ int Window_Node::handle(int event) {
}
// find the innermost item clicked on:
selection = this;
- {for (Node* i=next; i && i->level>level; i=i->next)
+ {for (i =next; i && i->level>level; i=i->next)
if (i->is_true_widget()) {
Widget_Node* myo = (Widget_Node*)i;
- for (Fl_Widget *o1 = myo->o; o1; o1 = o1->parent())
+ for (o1 = myo->o; o1; o1 = o1->parent())
if (!o1->visible()) goto CONTINUE2;
if (Fl::event_inside(myo->o)) {
selection = myo;
@@ -1107,10 +1122,10 @@ int Window_Node::handle(int event) {
// clear selection on everything:
if (!toggle) deselect(); else Fl::event_is_click(0);
// select everything in box:
- for (Node*i=next; i&&i->level>level; i=i->next)
+ for (i =next; i&&i->level>level; i=i->next)
if (i->is_true_widget()) {
Widget_Node* myo = (Widget_Node*)i;
- for (Fl_Widget *o1 = myo->o; o1; o1 = o1->parent())
+ for (o1 = myo->o; o1; o1 = o1->parent())
if (!o1->visible()) goto CONTINUE;
if (Fl::event_inside(myo->o)) selection = myo;
if (myo && myo->o && myo->o->x()>=x1 && myo->o->y()>y1 &&
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-08 02:26:04 +0000