diff options
Diffstat (limited to 'src')
91 files changed, 841 insertions, 469 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx index 45509a0f6..2a110d935 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -510,7 +510,8 @@ void Fl::add_check(Fl_Timeout_Handler cb, void *argp) { callback that no longer exists. */ void Fl::remove_check(Fl_Timeout_Handler cb, void *argp) { - for (Check** p = &first_check; *p;) { + Check **p; + for (p = &first_check; *p;) { Check* t = *p; if (t->cb == cb && t->arg == argp) { if (next_check == t) next_check = t->next; @@ -527,7 +528,8 @@ void Fl::remove_check(Fl_Timeout_Handler cb, void *argp) { Returns 1 if the check exists and has not been called yet, 0 otherwise. */ int Fl::has_check(Fl_Timeout_Handler cb, void *argp) { - for (Check** p = &first_check; *p;) { + Check **p; + for (p = &first_check; *p;) { Check* t = *p; if (t->cb == cb && t->arg == argp) { return 1; @@ -869,7 +871,8 @@ void Fl::first_window(Fl_Window* window) { Redraws all widgets. */ void Fl::redraw() { - for (Fl_X* i = Fl_X::first; i; i = i->next) i->w->redraw(); + Fl_X *i; + for (i = Fl_X::first; i; i = i->next) i->w->redraw(); } /** @@ -886,7 +889,8 @@ void Fl::redraw() { void Fl::flush() { if (damage()) { damage_ = 0; - for (Fl_X* i = Fl_X::first; i; i = i->next) { + Fl_X *i; + for (i = Fl_X::first; i; i = i->next) { Fl_Window* wi = i->w; if (Fl_Window_Driver::driver(wi)->wait_for_expose_value) {damage_ = 1; continue;} if (!wi->visible_r()) continue; @@ -1006,7 +1010,8 @@ void Fl::remove_handler(Fl_Event_Handler ha) { int (*fl_local_grab)(int); // used by fl_dnd.cxx static int send_handlers(int e) { - for (const handler_link *hl = handlers; hl; hl = hl->next) + const handler_link *hl; + for (hl = handlers; hl; hl = hl->next) if (hl->handle(e)) return 1; return 0; } @@ -1082,7 +1087,8 @@ void Fl::remove_system_handler(Fl_System_Handler ha) { } int fl_send_system_handlers(void *e) { - for (const system_handler_link *hl = sys_handlers; hl; hl = hl->next) { + const system_handler_link *hl; + for (hl = sys_handlers; hl; hl = hl->next) { if (hl->handle(e, hl->data)) return 1; } @@ -1337,7 +1343,8 @@ static int send_event(int event, Fl_Widget* to, Fl_Window* window) { } else { dx = dy = 0; } - for (const Fl_Widget* w = to; w; w = w->parent()) { + const Fl_Widget *w; + for (w = to; w; w = w->parent()) { if (w->type() >= FL_WINDOW) { dx -= w->x(); dy -= w->y(); @@ -1903,7 +1910,8 @@ void Fl::delete_widget(Fl_Widget *wi) { if (win && win->shown()) win->hide(); // case of iconified window // don't add the same widget twice to the widget delete list - for (int i = 0; i < num_dwidgets; i++) { + int i; + for (i = 0; i < num_dwidgets; i++) { if (dwidgets[i]==wi) return; } @@ -1939,7 +1947,8 @@ void Fl::delete_widget(Fl_Widget *wi) { void Fl::do_widget_deletion() { if (!num_dwidgets) return; - for (int i = 0; i < num_dwidgets; i ++) + int i; + for (i = 0; i < num_dwidgets; i ++) delete dwidgets[i]; num_dwidgets = 0; @@ -2509,7 +2518,8 @@ void Fl::screen_scale(int n, float factor) { Fl_Screen_Driver::APP_SCALING_CAPABILITY capability = Fl::screen_driver()->rescalable(); if (!capability || n < 0 || n >= Fl::screen_count()) return; if (capability == Fl_Screen_Driver::SYSTEMWIDE_APP_SCALING) { - for (int s = 0; s < Fl::screen_count(); s++) { + int s; + for (s = 0; s < Fl::screen_count(); s++) { Fl::screen_driver()->rescale_all_windows_from_screen(s, factor, factor); } } else diff --git a/src/Fl_Anim_GIF_Image.cxx b/src/Fl_Anim_GIF_Image.cxx index f026d4961..048c8c580 100644 --- a/src/Fl_Anim_GIF_Image.cxx +++ b/src/Fl_Anim_GIF_Image.cxx @@ -193,7 +193,8 @@ double Fl_Anim_GIF_Image::FrameInfo::convert_delay(int d) const { void Fl_Anim_GIF_Image::FrameInfo::copy(const FrameInfo& fi) { // copy from source - for (int i = 0; i < fi.frames_size; i++) { + int i; + for (i = 0; i < fi.frames_size; i++) { if (!push_back_frame(fi.frames[i])) { break; } @@ -245,7 +246,8 @@ void Fl_Anim_GIF_Image::FrameInfo::dispose(int frame) { else { if ( px + pw > canvas_w ) pw = canvas_w - px; if ( py + ph > canvas_h ) ph = canvas_h - py; - for (int y = 0; y < ph; y++) { + int y; + for (y = 0; y < ph; y++) { memcpy(dst + ( y + py ) * canvas_w * 4 + px, src + y * frames[prev].w * 4, pw * 4); } } @@ -346,8 +348,9 @@ void Fl_Anim_GIF_Image::FrameInfo::on_frame_data(Fl_GIF_Image::GIF_FRAME &gf) { // copy image data to offscreen const uchar *bits = gf.bptr; const uchar *endp = offscreen + canvas_w * canvas_h * 4; - for (int y = frame.y; y < frame.y + frame.h; y++) { - for (int x = frame.x; x < frame.x + frame.w; x++) { + int y, x; + for (y = frame.y; y < frame.y + frame.h; y++) { + for (x = frame.x; x < frame.x + frame.w; x++) { uchar c = *bits++; if (c == gf.trans) continue; @@ -366,8 +369,8 @@ void Fl_Anim_GIF_Image::FrameInfo::on_frame_data(Fl_GIF_Image::GIF_FRAME &gf) { if (optimize_mem) { uchar *buf = new uchar[frame.w * frame.h * 4]; uchar *dest = buf; - for (int y = frame.y; y < frame.y + frame.h; y++) { - for (int x = frame.x; x < frame.x + frame.w; x++) { + for (y = frame.y; y < frame.y + frame.h; y++) { + for (x = frame.x; x < frame.x + frame.w; x++) { if (offscreen + y * canvas_w * 4 + x * 4 < endp) memcpy(dest, &offscreen[y * canvas_w * 4 + x * 4], 4); dest += 4; @@ -403,7 +406,8 @@ bool Fl_Anim_GIF_Image::FrameInfo::push_back_frame(const GifFrame &frame) { void Fl_Anim_GIF_Image::FrameInfo::resize(int W, int H) { double scale_factor_x = (double)W / (double)canvas_w; double scale_factor_y = (double)H / (double)canvas_h; - for (int i=0; i < frames_size; i++) { + int i; + for (i =0; i < frames_size; i++) { if (optimize_mem) { frames[i].x = (unsigned short)round(frames[i].x * scale_factor_x); frames[i].y = (unsigned short)round(frames[i].y * scale_factor_y); @@ -449,7 +453,8 @@ void Fl_Anim_GIF_Image::FrameInfo::set_to_background(int frame) { bg = tp; color.alpha = tp == bg ? T_FULL : tp < 0 ? T_FULL : T_NONE; DEBUG((" set to color %d/%d/%d alpha=%d\n", color.r, color.g, color.b, color.alpha)); - for (uchar *p = offscreen + canvas_w * canvas_h * 4 - 4; p >= offscreen; p -= 4) + uchar *p; + for (p = offscreen + canvas_w * canvas_h * 4 - 4; p >= offscreen; p -= 4) memcpy(p, &color, 4); } @@ -712,7 +717,8 @@ void Fl_Anim_GIF_Image::color_average(Fl_Color c, float i) /* */ { if (i < 0) { // immediate mode i = -i; - for (int f=0; f < frames(); f++) { + int f; + for (f =0; f < frames(); f++) { fi_->frames[f].rgb->color_average(c, i); } return; @@ -817,7 +823,8 @@ void Fl_Anim_GIF_Image::draw(int x, int y, int w, int h, while (f0 > 0 && !(fi_->frames[f0].x == 0 && fi_->frames[f0].y == 0 && fi_->frames[f0].w == this->w() && fi_->frames[f0].h == this->h())) --f0; - for (int f = f0; f <= frame_; f++) { + int f; + for (f = f0; f <= frame_; f++) { if (f < frame_ && fi_->frames[f].dispose == FrameInfo::DISPOSE_PREVIOUS) continue; if (f < frame_ && fi_->frames[f].dispose == FrameInfo::DISPOSE_BACKGROUND) continue; Fl_RGB_Image *rgb = fi_->frames[f].rgb; @@ -1057,7 +1064,8 @@ bool Fl_Anim_GIF_Image::load(const char *name, const unsigned char *imgdata /* = // we have to replicate the actions of the pixmap destructor here uncache(); if (alloc_data) { - for (int i = 0; i < count(); i ++) delete[] (char *)data()[i]; + int i; + for (i = 0; i < count(); i ++) delete[] (char *)data()[i]; delete[] (char **)data(); } alloc_data = 0; @@ -1278,7 +1286,8 @@ bool Fl_Anim_GIF_Image::next() { */ void Fl_Anim_GIF_Image::uncache() /* */ { Fl_GIF_Image::uncache(); - for (int i=0; i < fi_->frames_size; i++) { + int i; + for (i =0; i < fi_->frames_size; i++) { if (fi_->frames[i].rgb) fi_->frames[i].rgb->uncache(); } } diff --git a/src/Fl_BMP_Image.cxx b/src/Fl_BMP_Image.cxx index a0d3e00cc..b9c30fdae 100644 --- a/src/Fl_BMP_Image.cxx +++ b/src/Fl_BMP_Image.cxx @@ -254,7 +254,8 @@ void Fl_BMP_Image::load_bmp_(Fl_Image_Reader &rdr, int ico_height, int ico_width if (colors_used == 0 && depth <= 8) colors_used = 1 << depth; - for (int i = 0; i < colors_used; i++) { + int i; + for (i = 0; i < colors_used; i++) { // Read BGR color... colormap[i][0] = rdr.read_byte(); colormap[i][1] = rdr.read_byte(); diff --git a/src/Fl_Browser.cxx b/src/Fl_Browser.cxx index 9228529e2..b51397c08 100644 --- a/src/Fl_Browser.cxx +++ b/src/Fl_Browser.cxx @@ -58,7 +58,8 @@ struct FL_BLINE { // data is in a linked list of these Example of use: \code // Walk the browser from beginning to end - for ( void *i=item_first(); i; i=item_next(i) ) { + void *i; + for (i =item_first(); i; i=item_next(i) ) { printf("item label='%s'\n", item_text(i)); } \endcode @@ -88,7 +89,7 @@ void* Fl_Browser::item_prev(void* item) const {return ((FL_BLINE*)item)->prev;} Example of use: \code // Walk the browser in reverse, from end to start - for ( void *i=item_last(); i; i=item_prev(i) ) { + for (i =item_last(); i; i=item_prev(i) ) { printf("item label='%s'\n", item_text(i)); } \endcode @@ -372,7 +373,8 @@ int Fl_Browser::item_height(void *item) const { } else { const int* i = column_widths(); // do each column separately as they may all set different fonts: - for (char* str = l->txt; str && *str; str++) { + char *str; + for (str = l->txt; str && *str; str++) { Fl_Font font = textfont(); // default font int tsize = textsize(); // default size if ( format_char() ) { // can be NULL @@ -669,7 +671,8 @@ void Fl_Browser::textsize(Fl_Fontsize newSize) { new_list(); full_height_ = 0; if (lines == 0) return; - for (FL_BLINE* itm=(FL_BLINE *)item_first(); itm; itm=(FL_BLINE *)item_next(itm)) { + FL_BLINE *itm; + for (itm =(FL_BLINE *)item_first(); itm; itm=(FL_BLINE *)item_next(itm)) { full_height_ += item_height(itm) + linespacing(); } } @@ -679,7 +682,8 @@ void Fl_Browser::textsize(Fl_Fontsize newSize) { \see add(), insert(), remove(), swap(int,int), clear() */ void Fl_Browser::clear() { - for (FL_BLINE* l = first; l;) { + FL_BLINE *l; + for (l = first; l;) { FL_BLINE* n = l->next; free(l); l = n; diff --git a/src/Fl_Browser_.cxx b/src/Fl_Browser_.cxx index 56b751415..eee2369b0 100644 --- a/src/Fl_Browser_.cxx +++ b/src/Fl_Browser_.cxx @@ -227,7 +227,8 @@ void Fl_Browser_::hposition(int pos) { int Fl_Browser_::displayed(void* item) const { int X, Y, W, H; bbox(X, Y, W, H); int yy = H+offset_; - for (void* l = top_; l && yy > 0; l = item_next(l)) { + void *l; + for (l = top_; l && yy > 0; l = item_next(l)) { if (l == item) return 1; yy -= item_height(l) + linespacing(); } @@ -583,7 +584,8 @@ void* Fl_Browser_::find_item(int ypos) { update_top(); int X, Y, W, H; bbox(X, Y, W, H); int yy = Y-offset_; - for (void *l = top_; l; l = item_next(l)) { + void *l; + for (l = top_; l; l = item_next(l)) { int hh = item_height(l); if (hh <= 0) continue; yy += hh + linespacing(); if (ypos <= yy || yy>=(Y+H)) return l; @@ -649,7 +651,8 @@ int Fl_Browser_::select(void* item, int val, int docallbacks) { int Fl_Browser_::deselect(int docallbacks) { if (type() == FL_MULTI_BROWSER) { int change = 0; - for (void* p = item_first(); p; p = item_next(p)) + void *p; + for (p = item_first(); p; p = item_next(p)) change |= select(p, 0, docallbacks); return change; } else { @@ -673,7 +676,8 @@ int Fl_Browser_::select_only(void* item, int docallbacks) { int change = 0; Fl_Widget_Tracker wp(this); if (type() == FL_MULTI_BROWSER) { - for (void* p = item_first(); p; p = item_next(p)) { + void *p; + for (p = item_first(); p; p = item_next(p)) { if (p != item) change |= select(p, 0, docallbacks); if (wp.deleted()) return change; } @@ -833,19 +837,20 @@ J1: // see which of the new item or previous selection is earlier, // by searching from the previous forward for this one: int down; + void *m; if (!l) down = 1; - else {for (void* m = selection_; ; m = item_next(m)) { + else {for (m = selection_; ; m = item_next(m)) { if (m == l) {down = 1; break;} if (!m) {down = 0; break;} }} if (down) { - for (void* m = selection_; m != l; m = item_next(m)) { + for (m = selection_; m != l; m = item_next(m)) { select(m, whichway, when() & FL_WHEN_CHANGED); if (wp.deleted()) return 1; } } else { void* e = selection_; - for (void* m = item_next(l); m; m = item_next(m)) { + for (m = item_next(l); m; m = item_next(m)) { select(m, whichway, when() & FL_WHEN_CHANGED); if (wp.deleted()) return 1; if (m == e) break; @@ -1066,7 +1071,8 @@ int Fl_Browser_::incr_height() const { */ int Fl_Browser_::full_height() const { int t = 0; - for (void* p = item_first(); p; p = item_next(p)) + void *p; + for (p = item_first(); p; p = item_next(p)) t += item_quick_height(p); return t; } diff --git a/src/Fl_Button.cxx b/src/Fl_Button.cxx index 3df97875b..d22229ea4 100644 --- a/src/Fl_Button.cxx +++ b/src/Fl_Button.cxx @@ -59,7 +59,8 @@ void Fl_Button::setonly() { // set this radio button on, turn others off value(1); Fl_Group* g = parent(); Fl_Widget*const* a = g->array(); - for (int i = g->children(); i--;) { + int i; + for (i = g->children(); i--;) { Fl_Widget* o = *a++; if (o != this && o->type()==FL_RADIO_BUTTON) ((Fl_Button*)o)->value(0); } diff --git a/src/Fl_Chart.cxx b/src/Fl_Chart.cxx index 2baf632f5..a4aebad49 100644 --- a/src/Fl_Chart.cxx +++ b/src/Fl_Chart.cxx @@ -295,7 +295,8 @@ void Fl_Chart::draw() { if (min >= max) { min = max = 0.0; - for (int i = 0; i < numb; i++) { + int i; + for (i = 0; i < numb; i++) { if (entries[i].val < min) min = entries[i].val; if (entries[i].val > max) diff --git a/src/Fl_Check_Browser.cxx b/src/Fl_Check_Browser.cxx index e1ed61d7f..ca2b8a48b 100644 --- a/src/Fl_Check_Browser.cxx +++ b/src/Fl_Check_Browser.cxx @@ -108,7 +108,8 @@ void *Fl_Check_Browser::item_at(int index) const { // note: index is 1-based if (index < 1 || index > nitems()) return 0L; cb_item *item = (cb_item *)item_first(); - for (int i = 1; i < index; i++) + int i; + for (i = 1; i < index; i++) item = (cb_item *)(item_next(item)); return (void *)item; } diff --git a/src/Fl_Clock.cxx b/src/Fl_Clock.cxx index 15ac88d14..d77b4652e 100644 --- a/src/Fl_Clock.cxx +++ b/src/Fl_Clock.cxx @@ -95,7 +95,8 @@ void Fl_Clock_Output::draw(int X, int Y, int W, int H) { // draw the tick marks: fl_push_matrix(); fl_color(active_r() ? FL_FOREGROUND_COLOR : fl_inactive(FL_FOREGROUND_COLOR)); - for (int i=0; i<12; i++) { + int i; + for (i =0; i<12; i++) { if (i==6) rect(-0.5, 9, 1, 2); else if (i==3 || i==0 || i== 9) rect(-0.5, 9.5, 1, 1); else rect(-0.25, 9.5, .5, 1); diff --git a/src/Fl_Color_Chooser.cxx b/src/Fl_Color_Chooser.cxx index f219906f1..17bb67bc9 100644 --- a/src/Fl_Color_Chooser.cxx +++ b/src/Fl_Color_Chooser.cxx @@ -249,7 +249,8 @@ static void generate_image(void* vv, int X, int Y, int W, uchar* buf) { #else const double V = 1.0; #endif - for (int x = X; x < X+W; x++) { + int x; + for (x = X; x < X+W; x++) { double Xf = double(x)/iw; double H,S; tohs(Xf,Yf,H,S); double r=0, g=0, b=0; @@ -374,7 +375,8 @@ static void generate_vimage(void* vv, int X, int Y, int W, uchar* buf) { uchar r = uchar(tr*Yf+.5); uchar g = uchar(tg*Yf+.5); uchar b = uchar(tb*Yf+.5); - for (int x = X; x < X+W; x++) { + int x; + for (x = X; x < X+W; x++) { *buf++ = r; *buf++ = g; *buf++ = b; } } diff --git a/src/Fl_Counter.cxx b/src/Fl_Counter.cxx index be57c9f1f..059797b59 100644 --- a/src/Fl_Counter.cxx +++ b/src/Fl_Counter.cxx @@ -75,7 +75,8 @@ void Fl_Counter::draw() { if (tbt == FL_THIN_UP_BOX) tbt = FL_THIN_DOWN_BOX; // arrow boxes - for (int i = 0; i < 4; i++) { + int i; + for (i = 0; i < 4; i++) { if (mouseobj_ == i + 1) ab[i].boxtype = fl_down(box()); else @@ -116,7 +117,7 @@ void Fl_Counter::draw() { // draw arrow boxes int xo = x(); - for (int i = 0; i < 4; i++) { + for (i = 0; i < 4; i++) { if (ab[i].width > 0) { draw_box(ab[i].boxtype, xo, y(), ab[i].width, h(), color()); Fl_Rect bb(xo, y(), ab[i].width, h(), ab[i].boxtype); diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx index 46e902c18..bcf22111d 100644 --- a/src/Fl_File_Chooser2.cxx +++ b/src/Fl_File_Chooser2.cxx @@ -1418,7 +1418,8 @@ Fl_File_Chooser::update_preview() This sample code loops through all selected files: \code // Get list of filenames user selected from a MULTI chooser - for ( int t=1; t<=chooser->count(); t++ ) { + int t; + for (t =1; t<=chooser->count(); t++ ) { const char *filename = chooser->value(t); ... } @@ -1588,7 +1589,8 @@ void Fl_File_Chooser::showHidden(int value) void Fl_File_Chooser::remove_hidden_files() { int count = fileList->size(); - for(int num = count; num >= 1; num--) { + int num; + for (num = count; num >= 1; num--) { const char *p = fileList->text(num); if (*p == '.' && strcmp(p, "../") != 0) fileList->remove(num); } diff --git a/src/Fl_File_Icon2.cxx b/src/Fl_File_Icon2.cxx index f81fa8af0..4fe66307b 100644 --- a/src/Fl_File_Icon2.cxx +++ b/src/Fl_File_Icon2.cxx @@ -301,7 +301,8 @@ Fl_File_Icon::load_fti(const char *fti) // I - File to read from #ifdef DEBUG printf("Icon File \"%s\":\n", fti); - for (int i = 0; i < num_data_; i ++) + int i; + for (i = 0; i < num_data_; i ++) printf(" %d,\n", data_[i]); #endif /* DEBUG */ diff --git a/src/Fl_Flex.cxx b/src/Fl_Flex.cxx index 20437783c..ebcdea4e0 100644 --- a/src/Fl_Flex.cxx +++ b/src/Fl_Flex.cxx @@ -212,7 +212,8 @@ void Fl_Flex::layout() { // Precalculate remaining space that can be distributed - for (int i = 0; i < nc; i++) { + int i; + for (i = 0; i < nc; i++) { Fl_Widget *c = child(i); if (c->visible()) { if (fixed(c)) { @@ -239,7 +240,7 @@ void Fl_Flex::layout() { sp++; } - for (int i = 0; i < nc; i++) { + for (i = 0; i < nc; i++) { Fl_Widget *c = child(i); if (!c->visible()) continue; @@ -304,7 +305,8 @@ void Fl_Flex::fixed(Fl_Widget *child, int size) { // find w in our fixed size list int idx = -1; - for (int i = 0; i < fixed_size_size_; i++) { + int i; + for (i = 0; i < fixed_size_size_; i++) { if (fixed_size_[i] == child) { idx = i; break; @@ -313,7 +315,7 @@ void Fl_Flex::fixed(Fl_Widget *child, int size) { // remove from array, if we want the widget to be flexible, but an entry was found if (size == 0 && idx >= 0) { - for (int i = idx; i < fixed_size_size_ - 1; i++) { + for (i = idx; i < fixed_size_size_ - 1; i++) { fixed_size_[i] = fixed_size_[i+1]; } fixed_size_size_--; @@ -352,7 +354,8 @@ void Fl_Flex::fixed(Fl_Widget *child, int size) { \retval 0 the widget resizes dynamically */ int Fl_Flex::fixed(Fl_Widget *w) const { - for (int i = 0; i < fixed_size_size_; i++) { + int i; + for (i = 0; i < fixed_size_size_; i++) { if (w == fixed_size_[i]) { return 1; } diff --git a/src/Fl_GIF_Image.cxx b/src/Fl_GIF_Image.cxx index 93fe22f36..074a4ea32 100644 --- a/src/Fl_GIF_Image.cxx +++ b/src/Fl_GIF_Image.cxx @@ -500,8 +500,9 @@ void Fl_GIF_Image::load_gif_(Fl_Image_Reader &rdr, bool anim/*=false*/) // printf("\nFl_GIF_Image::load_gif_ : %s\n", rdr.name()); + int i; {char b[6] = { 0 }; - for (int i=0; i<6; ++i) b[i] = rdr.read_byte(); + for (i =0; i<6; ++i) b[i] = rdr.read_byte(); if (b[0]!='G' || b[1]!='I' || b[2] != 'F') { Fl::error("Fl_GIF_Image: %s is not a GIF file.\n", rdr.name()); ld(ERR_FORMAT); @@ -539,7 +540,7 @@ void Fl_GIF_Image::load_gif_(Fl_Image_Reader &rdr, bool anim/*=false*/) int YPos = 0; struct ColorMap CMap; /* color map */ if (HasColormap) { - for (int i=0; i < ColorMapSize; i++) { + for (i =0; i < ColorMapSize; i++) { CMap.Red[i] = rdr.read_byte(); CMap.Green[i] = rdr.read_byte(); CMap.Blue[i] = rdr.read_byte(); @@ -658,7 +659,7 @@ void Fl_GIF_Image::load_gif_(Fl_Image_Reader &rdr, bool anim/*=false*/) ColorMapSize = 1 << BitsPerPixel; CMap.Red[0] = CMap.Green[0] = CMap.Blue[0] = 0; // black CMap.Red[1] = CMap.Green[1] = CMap.Blue[1] = 255; // white - for (int i = 2; i < ColorMapSize; i++) { + for (i = 2; i < ColorMapSize; i++) { CMap.Red[i] = CMap.Green[i] = CMap.Blue[i] = (uchar)(255 * i / (ColorMapSize - 1)); } } @@ -670,13 +671,14 @@ void Fl_GIF_Image::load_gif_(Fl_Image_Reader &rdr, bool anim/*=false*/) // Fix transparent pixel index outside ColorMap (Issue #271) if (has_transparent && transparent_pixel >= ColorMapSize) { - for (int k = ColorMapSize; k <= transparent_pixel; k++) + int k; + for (k = ColorMapSize; k <= transparent_pixel; k++) CMap.Red[k] = CMap.Green[k] = CMap.Blue[k] = 0xff; // white (color is irrelevant) ColorMapSize = transparent_pixel + 1; } #if (0) // TEST/DEBUG: fill color table to maximum size - for (int i = ColorMapSize; i < 256; i++) { + for (i = ColorMapSize; i < 256; i++) { CMap.Red[i] = CMap.Green[i] = CMap.Blue[i] = 0; // black } #endif @@ -726,7 +728,8 @@ void Fl_GIF_Image::load_gif_(Fl_Image_Reader &rdr, bool anim/*=false*/) int ystart = YPos; if (ystart < 0) ystart = 0; int xmax = XPos + Width; if (xmax > ScreenWidth) xmax = ScreenWidth; int ymax = YPos + Height; if (ymax > ScreenHeight) ymax = ScreenHeight; - for (int y = ystart; y<ymax; y++) { + int y; + for (y = ystart; y<ymax; y++) { uchar *src = Image + (y-YPos) * Width + (xstart-XPos); uchar *dst = moved_image + y*ScreenWidth + xstart; memcpy(dst, src, xmax-xstart); diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx index 776ea3ff9..560fbe162 100644 --- a/src/Fl_Gl_Window.cxx +++ b/src/Fl_Gl_Window.cxx @@ -616,7 +616,8 @@ Fl_RGB_Image* Fl_Gl_Window_Driver::capture_gl_rectangle(int x, int y, int w, int uchar *tmp = new uchar[mByteWidth]; uchar *p = baseAddress ; uchar *q = baseAddress + (h-1)*mByteWidth; - for (int i = 0; i < h/2; i++, p += mByteWidth, q -= mByteWidth) { + int i; + for (i = 0; i < h/2; i++, p += mByteWidth, q -= mByteWidth) { memcpy(tmp, p, mByteWidth); memcpy(p, q, mByteWidth); memcpy(q, tmp, mByteWidth); diff --git a/src/Fl_Graphics_Driver.cxx b/src/Fl_Graphics_Driver.cxx index fe943d780..793a14d20 100644 --- a/src/Fl_Graphics_Driver.cxx +++ b/src/Fl_Graphics_Driver.cxx @@ -1066,15 +1066,17 @@ void Fl_Scalable_Graphics_Driver::draw_image_rescale(void *buf, Fl_Draw_Image_Cb if (L == 0) L = W*aD; int depth = mono ? (aD%2==0?2:1) : aD; uchar *tmp_buf = new uchar[W*H*depth]; + int i; if (cb) { - for (int i = 0; i < H; i++) { + for (i = 0; i < H; i++) { cb(buf, 0, i, W, tmp_buf + i * W * depth); } } else { uchar *q, *p = tmp_buf; - for (int i = 0; i < H; i++) { + for (i = 0; i < H; i++) { q = (uchar*)buf + i * L; - for (int j = 0; j < W; j++) { + int j; + for (j = 0; j < W; j++) { memcpy(p, q, depth); p += depth; q += D; } diff --git a/src/Fl_Grid.cxx b/src/Fl_Grid.cxx index 4a4d7afd0..f82d2c342 100644 --- a/src/Fl_Grid.cxx +++ b/src/Fl_Grid.cxx @@ -200,7 +200,8 @@ void Fl_Grid::layout(int rows, int cols, int margin, int gap) { if (cols != cols_) { Col *new_cols = new Col[cols]; - for (int c = 0; c < cols; c++) { + int c; + for (c = 0; c < cols; c++) { if (c < cols_) new_cols[c] = Cols_[c]; else @@ -215,7 +216,8 @@ void Fl_Grid::layout(int rows, int cols, int margin, int gap) { if (rows != rows_) { Row *new_rows = new Row[rows]; Row *row = Rows_; - for (int r = 0; r < rows; r++, row++) { + int r; + for (r = 0; r < rows; r++, row++) { if (r < rows_) { new_rows[r] = *row; row->cells_ = 0; @@ -257,7 +259,8 @@ void Fl_Grid::draw_grid() { // draw horizontal lines (gap = 0) or rectangles (gap > 0) - for (int r = 0; r < rows_ - 1; r++) { + int r; + for (r = 0; r < rows_ - 1; r++) { int gap = Rows_[r].gap_ >= 0 ? Rows_[r].gap_ : gap_row_; y0 += Rows_[r].h_; @@ -274,7 +277,8 @@ void Fl_Grid::draw_grid() { x0 = x() + Fl::box_dx(box()) + margin_left_; y0 = y() + Fl::box_dy(box()) + margin_top_; - for (int c = 0; c < cols_ - 1; c++) { + int c; + for (c = 0; c < cols_ - 1; c++) { int gap = Cols_[c].gap_ >= 0 ? Cols_[c].gap_ : gap_col_; x0 += Cols_[c].w_; @@ -345,21 +349,23 @@ void Fl_Grid::layout() { // initialize column widths and row heights col = Cols_; - for (int c = 0; c < cols_; c++, col++) { + int c; + for (c = 0; c < cols_; c++, col++) { col->w_ = col->minw_; } row = Rows_; - for (int r = 0; r < rows_; r++, row++) { + int r; + for (r = 0; r < rows_; r++, row++) { row->h_ = row->minh_; } // calculate minimal column widths and row heights (in one loop) row = Rows_; - for (int r = 0; r < rows_; r++, row++) { + for (r = 0; r < rows_; r++, row++) { col = Cols_; - for (int c = 0; c < cols_; c++, col++) { + for (c = 0; c < cols_; c++, col++) { cel = cell(r, c); if (cel) { Fl_Widget *wi = cel->widget_; @@ -384,7 +390,7 @@ void Fl_Grid::layout() { int irwe = 0; // index of row with highest weight col = Cols_; - for (int c = 0; c < cols_; c++, col++) { + for (c = 0; c < cols_; c++, col++) { tcwi += col->w_; tcwe += col->weight_; if (c < cols_ - 1) @@ -396,7 +402,7 @@ void Fl_Grid::layout() { } row = Rows_; - for (int r = 0; r < rows_; r++, row++) { + for (r = 0; r < rows_; r++, row++) { trhe += row->h_; trwe += row->weight_; if (r < rows_ - 1) @@ -417,7 +423,7 @@ void Fl_Grid::layout() { if (space > 0 && tcwe > 0) { remaining = space; col = Cols_; - for (int c = 0; c < cols_; c++, col++) { + for (c = 0; c < cols_; c++, col++) { if (col->weight_ > 0) { add_space = int(float(space * col->weight_) / tcwe + 0.5); col->w_ += add_space; @@ -433,7 +439,7 @@ void Fl_Grid::layout() { if (space > 0 && trwe > 0) { remaining = space; row = Rows_; - for (int r = 0; r < rows_; r++, row++) { + for (r = 0; r < rows_; r++, row++) { if (row->weight_ > 0) { add_space = int(float(space * row->weight_) / trwe + 0.5); row->h_ += add_space; @@ -451,10 +457,10 @@ void Fl_Grid::layout() { y0 = y() + Fl::box_dy(box()) + margin_top_; row = Rows_; - for (int r = 0; r < rows_; r++, row++) { + for (r = 0; r < rows_; r++, row++) { x0 = x() + Fl::box_dx(box()) + margin_left_; col = Cols_; - for (int c = 0; c < cols_; c++, col++) { + for (c = 0; c < cols_; c++, col++) { int wx = x0; // widget's x int wy = y0; // widget's y cel = cell(r, c); @@ -467,12 +473,13 @@ void Fl_Grid::layout() { int ww = col->w_; int wh = row->h_; - for (int i = 0; i < cel->colspan_ - 1; i++) { + int i; + for (i = 0; i < cel->colspan_ - 1; i++) { ww += (Cols_[c + i].gap_ >= 0) ? Cols_[c + i].gap_ : gap_col_; ww += Cols_[c + i + 1].w_; } - for (int i = 0; i < cel->rowspan_ - 1; i++) { + for (i = 0; i < cel->rowspan_ - 1; i++) { wh += (Rows_[r + i].gap_ >= 0) ? Rows_[r + i].gap_ : gap_row_; wh += Rows_[r + i + 1].h_; } @@ -609,7 +616,8 @@ void Fl_Grid::clear_layout() { delete[] Cols_; delete[] Rows_; init(); - for (int i = 0; i < children(); i++) { + int i; + for (i = 0; i < children(); i++) { child(i)->hide(); } need_layout(1); @@ -766,7 +774,8 @@ Fl_Grid::Cell* Fl_Grid::cell(int row, int col) const { */ Fl_Grid::Cell* Fl_Grid::cell(Fl_Widget *widget) const { Row *row = Rows_; - for (int r = 0; r < rows_; r++, row++) { + int r; + for (r = 0; r < rows_; r++, row++) { Cell *cel = row->cells_; while (cel) { if (cel->widget_ == widget) @@ -914,7 +923,8 @@ void Fl_Grid::col_width(int col, int value) { */ void Fl_Grid::col_width(const int *value, size_t size) { Col *c = Cols_; - for (int i = 0; i < cols_; i++, value++, c++) { + int i; + for (i = 0; i < cols_; i++, value++, c++) { if (i >= (int)size) break; if (*value >= 0) c->minw_ = *value; @@ -984,7 +994,8 @@ void Fl_Grid::col_weight(int col, int value) { */ void Fl_Grid::col_weight(const int *value, size_t size) { Col *c = Cols_; - for (int i = 0; i < cols_; i++, value++, c++) { + int i; + for (i = 0; i < cols_; i++, value++, c++) { if (i >= (int)size) break; if (*value >= 0) c->weight_ = *value; @@ -1020,7 +1031,8 @@ void Fl_Grid::col_gap(int col, int value) { */ void Fl_Grid::col_gap(const int *value, size_t size) { Col *c = Cols_; - for (int i = 0; i < cols_; i++, value++, c++) { + int i; + for (i = 0; i < cols_; i++, value++, c++) { if (i >= (int)size) break; if (*value >= 0) c->gap_ = *value; @@ -1056,7 +1068,8 @@ void Fl_Grid::row_height(int row, int value) { */ void Fl_Grid::row_height(const int *value, size_t size) { Row *r = Rows_; - for (int i = 0; i < rows_; i++, value++, r++) { + int i; + for (i = 0; i < rows_; i++, value++, r++) { if (i >= (int)size) break; if (*value >= 0) r->minh_ = *value; @@ -1092,7 +1105,8 @@ void Fl_Grid::row_weight(int row, int value) { */ void Fl_Grid::row_weight(const int *value, size_t size) { Row *r = Rows_; - for (int i = 0; i < rows_; i++, value++, r++) { + int i; + for (i = 0; i < rows_; i++, value++, r++) { if (i >= (int)size) break; if (*value >= 0) r->weight_ = *value; @@ -1129,7 +1143,8 @@ void Fl_Grid::row_gap(int row, int value) { */ void Fl_Grid::row_gap(const int *value, size_t size) { Row *r = Rows_; - for (int i = 0; i < rows_; i++, value++, r++) { + int i; + for (i = 0; i < rows_; i++, value++, r++) { if (i >= (int)size) break; if (*value >= 0) r->gap_ = *value; @@ -1177,7 +1192,8 @@ void Fl_Grid::debug(int level) { fprintf(stderr, " gaps: (%2d, %2d)\n", gap_row_, gap_col_); Row *row = Rows_; - for (int r = 0; r < rows_; r++, row++) { + int r; + for (r = 0; r < rows_; r++, row++) { fprintf(stderr, "Row %2d: minh = %d, weight = %d, gap = %d, h = %d\n", r, row->minh_, row->weight_, row->gap_, row->h_); Cell *cel = row->cells_; diff --git a/src/Fl_Group.cxx b/src/Fl_Group.cxx index 31fca05d8..1fb22d14f 100644 --- a/src/Fl_Group.cxx +++ b/src/Fl_Group.cxx @@ -290,7 +290,8 @@ int Fl_Group::handle(int event) { if (i >= children()) i = 0; if (children()) { - for (int j = i;;) { + int j; + for (j = i;;) { if (a[j]->takesevents()) if (send(a[j], event)) return 1; j++; if (j >= children()) j = 0; @@ -409,7 +410,8 @@ void Fl_Group::clear() { // child which is much faster than the other way around and // should be the "natural order" (last in, first out). - for (int i = children() - 1; i >= 0; i--) { + int i; + for (i = children() - 1; i >= 0; i--) { // some children may have been deleted, so check always if (i >= children()) continue; delete_child(i); @@ -517,11 +519,12 @@ void Fl_Group::insert(Fl_Widget &o, int index) { // now it's OK to move the child inside this group + int j; if (index > n) { // target > current position: move "up" and all other children "down" - for (int j = n; j < index; j++) + for (j = n; j < index; j++) child_[j] = child_[j + 1]; } else { // n > index: move "down" and all other children "up" - for (int j = n; j > index; j--) + for (j = n; j > index; j--) child_[j] = child_[j - 1]; } child_[index] = &o; @@ -766,7 +769,8 @@ Fl_Rect* Fl_Group::bounds() { // next is all the children's sizes: p += 2; Fl_Widget*const* a = array(); - for (int i = children(); i--;) { + int i; + for (i = children(); i--;) { *p++ = Fl_Rect(*a++); } } @@ -804,7 +808,8 @@ int* Fl_Group::sizes() { // allocate new sizes_ array and copy bounds_ over to sizes_ int* pi = sizes_ = new int[4*(children() + 2)]; Fl_Rect *rb = bounds(); - for (int i = 0; i < children() + 2; i++, rb++) { + int i; + for (i = 0; i < children() + 2; i++, rb++) { *pi++ = rb->x(); *pi++ = rb->r(); *pi++ = rb->y(); @@ -839,6 +844,7 @@ void Fl_Group::resize(int X, int Y, int W, int H) { // just move the children. // This case covers also window rescaling where dw == dh == 0. + int i; if (!resizable() || (dw==0 && dh==0)) { // top window and subwindows must not change the position of their children @@ -851,7 +857,7 @@ void Fl_Group::resize(int X, int Y, int W, int H) { if (Fl_Window::is_a_rescale() || dx || dy) { Fl_Widget*const* a = array(); - for (int i = children(); i--;) { + for (i = children(); i--;) { Fl_Widget* o = *a++; o->resize(o->x() + dx, o->y() + dy, o->w(), o->h()); } @@ -888,7 +894,7 @@ void Fl_Group::resize(int X, int Y, int W, int H) { // resize children Fl_Widget*const* a = array(); - for (int i = children(); i--; p++) { + for (i = children(); i--; p++) { Fl_Widget* o = *a++; int L = p->x(); @@ -929,14 +935,15 @@ void Fl_Group::draw_children() { h() - Fl::box_dh(box())); } + int i; if (damage() & ~FL_DAMAGE_CHILD) { // redraw the entire thing: - for (int i = children(); i--;) { + for (i = children(); i--;) { Fl_Widget& o = **a++; draw_child(o); draw_outside_label(o); } } else { // only redraw the children that need it: - for (int i = children(); i--;) + for (i = children(); i--;) update_child(**a++); } diff --git a/src/Fl_ICO_Image.cxx b/src/Fl_ICO_Image.cxx index 9de71737b..301dc86e6 100644 --- a/src/Fl_ICO_Image.cxx +++ b/src/Fl_ICO_Image.cxx @@ -96,7 +96,8 @@ void Fl_ICO_Image::load_ico_(Fl_Image_Reader &rdr, int id) icondirentry_ = new IconDirEntry[idcount()]; - for (int i = 0; i < idcount(); ++i) { + int i; + for (i = 0; i < idcount(); ++i) { icondirentry_[i].bWidth = (int)rdr.read_byte(); icondirentry_[i].bHeight = (int)rdr.read_byte(); icondirentry_[i].bColorCount = (int)rdr.read_byte(); @@ -120,7 +121,7 @@ void Fl_ICO_Image::load_ico_(Fl_Image_Reader &rdr, int id) if (id == -1) { // pick icon with highest resolution + highest bitcount int highestRes = 0, bitcount = 0; - for (int i = 0; i < idcount(); ++i) { + for (i = 0; i < idcount(); ++i) { int res = icondirentry_[i].bWidth * icondirentry_[i].bHeight; if (res > highestRes || (res == highestRes && icondirentry_[i].wBitCount > bitcount)) { highestRes = res; @@ -147,7 +148,7 @@ void Fl_ICO_Image::load_ico_(Fl_Image_Reader &rdr, int id) // Check for a PNG image resource uchar b[8]; - for (int i=0; i<8; ++i) b[i] = rdr.read_byte(); + for (i =0; i<8; ++i) b[i] = rdr.read_byte(); if (b[0]==0x89 && b[1]=='P' && b[2]=='N' && b[3]=='G' && b[4]=='\r' && b[5]=='\n' && b[6]==0x1A && b[7]=='\n') diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx index aa4837d26..00023bb17 100644 --- a/src/Fl_Image.cxx +++ b/src/Fl_Image.cxx @@ -637,24 +637,26 @@ Fl_RGB_Image *Fl_RGB_Image::copy_scale_down_2h_() const { if ((W==0) || (H==0) || (D==0)) return 0; uchar *data = (uchar*)malloc(W*H*D); uchar *dst = data; - for (int y = 0; y < H; y++) { + int y; + for (y = 0; y < H; y++) { const uchar *src = array + y*LD; switch (D) { case 1: - for (int x=0; x<W; ++x) { + int x; + for (x =0; x<W; ++x) { *dst++ = ((uchar) ( ( ((unsigned)src[0]) + ((unsigned)src[1]) ) >> 1 )); src += 2; } break; case 2: - for (int x=0; x<W; ++x) { + for (x =0; x<W; ++x) { *dst++ = ((uchar) ( ( ((unsigned)src[0]) + ((unsigned)src[2]) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)src[1]) + ((unsigned)src[3]) ) >> 1 )); src += 4; } break; case 3: - for (int x=0; x<W; ++x) { + for (x =0; x<W; ++x) { *dst++ = ((uchar) ( ( ((unsigned)src[0]) + ((unsigned)src[3]) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)src[1]) + ((unsigned)src[4]) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)src[2]) + ((unsigned)src[5]) ) >> 1 )); @@ -662,7 +664,7 @@ Fl_RGB_Image *Fl_RGB_Image::copy_scale_down_2h_() const { } break; case 4: - for (int x=0; x<W; ++x) { + for (x =0; x<W; ++x) { *dst++ = ((uchar) ( ( ((unsigned)src[0]) + ((unsigned)src[4]) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)src[1]) + ((unsigned)src[5]) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)src[2]) + ((unsigned)src[6]) ) >> 1 )); @@ -683,30 +685,32 @@ Fl_RGB_Image *Fl_RGB_Image::copy_scale_down_2v_() const { if ((W==0) || (H==0) || (D==0)) return 0; uchar *data = (uchar*)malloc(W*H*D); uchar *dst = data; - for (int y = 0; y < H; y++) { + int y; + for (y = 0; y < H; y++) { const uchar *s0 = array + 2*y*LD; const uchar *s1 = s0 + LD; switch (D) { case 1: - for (int x=0; x<W; ++x) { + int x; + for (x =0; x<W; ++x) { *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); } break; case 2: - for (int x=0; x<W; ++x) { + for (x =0; x<W; ++x) { *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); } break; case 3: - for (int x=0; x<W; ++x) { + for (x =0; x<W; ++x) { *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); } break; case 4: - for (int x=0; x<W; ++x) { + for (x =0; x<W; ++x) { *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); diff --git a/src/Fl_Image_Surface.cxx b/src/Fl_Image_Surface.cxx index 38cda73d9..cc65175fa 100644 --- a/src/Fl_Image_Surface.cxx +++ b/src/Fl_Image_Surface.cxx @@ -95,12 +95,14 @@ void Fl_Image_Surface_Driver::copy_with_mask(Fl_RGB_Image* mask, uchar *dib_dst, uchar *dib_src, int line_size, bool bottom_to_top) { int w = mask->data_w(), h = mask->data_h(); - for (int i = 0; i < h; i++) { + int i; + for (i = 0; i < h; i++) { const uchar* alpha = (const uchar*)mask->array + (bottom_to_top ? (h-i-1) : i) * w; uchar *src = dib_src + i * line_size; uchar *dst = dib_dst + i * line_size; - for (int j = 0; j < w; j++) { + int j; + for (j = 0; j < w; j++) { // mix src and dst into dst weighted by mask pixel's value uchar u = *alpha++, v = 255 - u; *dst = ((*dst) * v + (*src) * u)/255; @@ -269,7 +271,8 @@ static int count_offscreens = 0; static int find_slot(void) { // return an available slot to memorize an Fl_Image_Surface object static int max = 0; - for (int num = 0; num < count_offscreens; num++) { + int num; + for (num = 0; num < count_offscreens; num++) { if (!offscreen_api_surface[num]) return num; } if (count_offscreens >= max) { @@ -315,7 +318,8 @@ Fl_Offscreen fl_create_offscreen(int w, int h) { */ void fl_delete_offscreen(Fl_Offscreen ctx) { if (!ctx) return; - for (int i = 0; i < count_offscreens; i++) { + int i; + for (i = 0; i < count_offscreens; i++) { if (offscreen_api_surface[i] && offscreen_api_surface[i]->offscreen() == ctx) { delete offscreen_api_surface[i]; offscreen_api_surface[i] = NULL; @@ -329,7 +333,8 @@ void fl_delete_offscreen(Fl_Offscreen ctx) { \note The \p ctx argument must have been created by fl_create_offscreen(). */ void fl_begin_offscreen(Fl_Offscreen ctx) { - for (int i = 0; i < count_offscreens; i++) { + int i; + for (i = 0; i < count_offscreens; i++) { if (offscreen_api_surface[i] && offscreen_api_surface[i]->offscreen() == ctx) { Fl_Surface_Device::push_current(offscreen_api_surface[i]); return; diff --git a/src/Fl_Input_.cxx b/src/Fl_Input_.cxx index c052de10d..e06942539 100644 --- a/src/Fl_Input_.cxx +++ b/src/Fl_Input_.cxx @@ -109,7 +109,8 @@ public: void clear() { if (list_) { - for (int i=0; i<list_size_; i++) { + int i; + for (i =0; i<list_size_; i++) { delete list_[i]; } ::free(list_); @@ -581,7 +582,8 @@ int Fl_Input_::line_end(int i) const { while (j > 0 && index(j-1) != '\n') j--; // now measure lines until we get past i, end of that line is real eol: setfont(); - for (const char* p=value()+j; ;) { + const char *p; + for (p =value()+j; ;) { char buf[MAXBUF]; p = expand(p, buf); int k = (int) (p-value()); @@ -610,7 +612,8 @@ int Fl_Input_::line_start(int i) const { if (wrap()) { // now measure lines until we get past i, start of that line is real eol: setfont(); - for (const char* p=value()+j; ;) { + const char *p; + for (p =value()+j; ;) { char buf[MAXBUF]; const char* e = expand(p, buf); if ((int) (e-value()) >= i) return (int) (p-value()); diff --git a/src/Fl_Input_Choice.cxx b/src/Fl_Input_Choice.cxx index 59aeecfe9..6d9f7e05a 100644 --- a/src/Fl_Input_Choice.cxx +++ b/src/Fl_Input_Choice.cxx @@ -343,7 +343,8 @@ void Fl_Input_Choice::clear_changed() { */ int Fl_Input_Choice::update_menubutton() { // Find item in menu - for ( int i=0; i<menu_->size(); i++ ) { + int i; + for (i =0; i<menu_->size(); i++ ) { const Fl_Menu_Item &item = menu_->menu()[i]; if (item.flags & (FL_SUBMENU|FL_SUBMENU_POINTER)) continue; // ignore submenus const char *name = menu_->text(i); diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index c574d32b1..acddc4e91 100644 --- a/src/Fl_Menu.cxx +++ b/src/Fl_Menu.cxx @@ -345,7 +345,8 @@ public: \return 1 if the coordinates are inside any of the menuwindows */ bool Menu_State::is_inside(int mx, int my) { - for (menu_index_t i=num_menus-1; i>=0; i--) { + menu_index_t i; + for (i =num_menus-1; i>=0; i--) { if (menu_window[i]->is_inside(mx, my)) { return true; } @@ -434,7 +435,8 @@ bool Menu_State::prev_item(menu_index_t menu) { // previous item in menu menu if \return 1 if the shortcut was found in the menu and handled. */ int Menu_State::handle_shortcut() { - for (menu_index_t mymenu = num_menus; mymenu--;) { + menu_index_t mymenu; + for (mymenu = num_menus; mymenu--;) { Menu_Window &mw = *(menu_window[mymenu]); int item; const Fl_Menu_Item* m = mw.menu->find_shortcut(&item); @@ -672,7 +674,8 @@ bool Menu_State::create_submenu(const Fl_Rect &r, Menu_Window& cw, const Fl_Menu int dx = n->x()-nX; int waX, waY, waW, waH; Fl_Window_Driver::driver(n)->menu_window_area(waX, waY, waW, waH, Fl::screen_num(r.x(), r.y())); - for (menu_index_t menu = 0; menu <= current_menu_ix; menu++) { + menu_index_t menu; + for (menu = 0; menu <= current_menu_ix; menu++) { Menu_Window* tt = menu_window[menu]; int nx = tt->x()+dx; if (nx < waX) {nx = waX; dx = -tt->x() + waX;} int ny = tt->y()+dy; if (ny < waY) {ny = waY; dy = -tt->y() + waY;} @@ -1411,7 +1414,8 @@ const Fl_Menu_Item* Fl_Menu_Item::pulldown( button = pbutton; if (pbutton && pbutton->window()) { Menu_Window::parent_ = pbutton->top_window(); - for (Fl_Window* w = pbutton->window(); w; w = w->window()) { + Fl_Window *w; + for (w = pbutton->window(); w; w = w->window()) { X += w->x(); Y += w->y(); } @@ -1464,7 +1468,8 @@ const Fl_Menu_Item* Fl_Menu_Item::pulldown( // make sure all the menus are shown: { - for (menu_index_t k = menubar ? 1 : 0; k < pp.num_menus; k++) { + menu_index_t k; + for (k = menubar ? 1 : 0; k < pp.num_menus; k++) { if (!pp.menu_window[k]->shown()) { if (pp.menu_window[k]->title) pp.menu_window[k]->title->show(); pp.menu_window[k]->show(); diff --git a/src/Fl_Menu_.cxx b/src/Fl_Menu_.cxx index bce89ef39..9d857c11c 100644 --- a/src/Fl_Menu_.cxx +++ b/src/Fl_Menu_.cxx @@ -74,7 +74,8 @@ int Fl_Menu_::item_pathname_(char *name, int level = 0; finditem = finditem ? finditem : mvalue(); menu = menu ? menu : this->menu(); - for ( int t=0; t<size(); t++ ) { + int t; + for (t =0; t<size(); t++ ) { const Fl_Menu_Item *m = menu + t; if (m->submenu()) { // submenu? descend if (m->flags & FL_SUBMENU_POINTER) { @@ -196,7 +197,8 @@ int Fl_Menu_::find_index(const Fl_Menu_Item *item) const { \see find_index(const char*) */ int Fl_Menu_::find_index(Fl_Callback *cb) const { - for ( int t=0; t < size(); t++ ) + int t; + for (t =0; t < size(); t++ ) if (menu_[t].callback_==cb) return(t); return(-1); @@ -217,7 +219,8 @@ int Fl_Menu_::find_index(Fl_Callback *cb) const { */ int Fl_Menu_::find_index(const char *pathname) const { char menupath[1024] = ""; // File/Export - for ( int t=0; t < size(); t++ ) { + int t; + for (t =0; t < size(); t++ ) { Fl_Menu_Item *m = menu_ + t; if (m->flags&FL_SUBMENU) { // IT'S A SUBMENU @@ -257,7 +260,8 @@ int Fl_Menu_::find_index(const char *pathname) const { \see find_item(const char*) */ const Fl_Menu_Item * Fl_Menu_::find_item(Fl_Callback *cb) { - for ( int t=0; t < size(); t++ ) { + int t; + for (t =0; t < size(); t++ ) { const Fl_Menu_Item *m = menu_ + t; if (m->callback_==cb) { return m; @@ -274,7 +278,8 @@ const Fl_Menu_Item * Fl_Menu_::find_item(Fl_Callback *cb) { \see find_item(const char*) */ const Fl_Menu_Item* Fl_Menu_::find_item_with_user_data(void *v) { - for ( int t=0; t < size(); t++ ) { + int t; + for (t =0; t < size(); t++ ) { const Fl_Menu_Item *m = menu_ + t; if (m->user_data_==v) { return m; @@ -291,7 +296,8 @@ const Fl_Menu_Item* Fl_Menu_::find_item_with_user_data(void *v) { \see find_item(const char*) */ const Fl_Menu_Item* Fl_Menu_::find_item_with_argument(long v) { - for ( int t=0; t < size(); t++ ) { + int t; + for (t =0; t < size(); t++ ) { const Fl_Menu_Item *m = menu_ + t; if (m->argument()==v) { return m; @@ -582,7 +588,8 @@ void Fl_Menu_::clear() { // not to free() images or Fl_Multi_Label's because they can // either be static or are allocated by operator new. - for (int i = size(); i--;) { + int i; + for (i = size(); i--;) { if (!menu_[i].text) continue; switch(menu_[i].labeltype_) { diff --git a/src/Fl_Menu_add.cxx b/src/Fl_Menu_add.cxx index 08a9153d9..1519602a4 100644 --- a/src/Fl_Menu_add.cxx +++ b/src/Fl_Menu_add.cxx @@ -498,7 +498,8 @@ void Fl_Menu_::remove(int i) { const Fl_Menu_Item* next_item = item->next(); // delete the text only if all items were created with add(): if (alloc > 1) { - for (Fl_Menu_Item* m = item; m < next_item; m++) + Fl_Menu_Item *m; + for (m = item; m < next_item; m++) if (m->text) free((void*)(m->text)); } // MRS: "n" is the menu size(), which includes the trailing NULL entry... diff --git a/src/Fl_Message.cxx b/src/Fl_Message.cxx index d3112c562..78cf03951 100644 --- a/src/Fl_Message.cxx +++ b/src/Fl_Message.cxx @@ -180,7 +180,8 @@ Fl_Message::Fl_Message(const char *iconlabel) // create the buttons (positions: right to left) // button 1 is a return button - for (int b = 0, x = 310; b < 3; b++, x -= 100) { + int b, x; + for (b = 0, x = 310; b < 3; b++, x -= 100) { if (b == 1) { button_[b] = new Fl_Return_Button(x, 70, 90, 23); } else { @@ -192,7 +193,7 @@ Fl_Message::Fl_Message(const char *iconlabel) // add the buttons left to right for tab navigation - for (int b = 2; b >= 0; b--) { + for (b = 2; b >= 0; b--) { window_->add(button_[b]); } diff --git a/src/Fl_Native_File_Chooser.cxx b/src/Fl_Native_File_Chooser.cxx index 2cafb019b..c5761f8c3 100644 --- a/src/Fl_Native_File_Chooser.cxx +++ b/src/Fl_Native_File_Chooser.cxx @@ -75,7 +75,8 @@ int Fl_Native_File_Chooser::options() const { \code if ( fnfc->show() == 0 ) { // Print all filenames user selected - for (int n=0; n<fnfc->count(); n++ ) { + int n; + for (n =0; n<fnfc->count(); n++ ) { printf("%d) '%s'\n", n, fnfc->filename(n)); } } @@ -103,7 +104,8 @@ const char *Fl_Native_File_Chooser::filename() const { \code if ( fnfc->show() == 0 ) { // Print all filenames user selected - for (int n=0; n<fnfc->count(); n++ ) { + int n; + for (n =0; n<fnfc->count(); n++ ) { printf("%d) '%s'\n", n, fnfc->filename(n)); } } diff --git a/src/Fl_Native_File_Chooser_Kdialog.cxx b/src/Fl_Native_File_Chooser_Kdialog.cxx index 68cb4729e..f4039366c 100644 --- a/src/Fl_Native_File_Chooser_Kdialog.cxx +++ b/src/Fl_Native_File_Chooser_Kdialog.cxx @@ -47,7 +47,8 @@ Fl_Kdialog_Native_File_Chooser_Driver::Fl_Kdialog_Native_File_Chooser_Driver(int Fl_Kdialog_Native_File_Chooser_Driver::~Fl_Kdialog_Native_File_Chooser_Driver() { - for (int i = 0; i < _tpathnames; i++) delete[] _pathnames[i]; + int i; + for (i = 0; i < _tpathnames; i++) delete[] _pathnames[i]; delete[] _pathnames; if (_preset_file) free(_preset_file); if (_directory) free(_directory); @@ -122,6 +123,7 @@ void Fl_Kdialog_Native_File_Chooser_Driver::build_command(char *command, int max int Fl_Kdialog_Native_File_Chooser_Driver::show() { + int i; if (_btype == Fl_Native_File_Chooser::BROWSE_MULTI_DIRECTORY) { // BROWSE_MULTI_DIRECTORY is not supported by kdialog, run GTK chooser instead Fl_Native_File_Chooser fnfc(Fl_Native_File_Chooser::BROWSE_MULTI_DIRECTORY); @@ -131,12 +133,12 @@ int Fl_Kdialog_Native_File_Chooser_Driver::show() { fnfc.filter(filter()); fnfc.options(options()); int retval = fnfc.show(); - for (int i = 0; i < _tpathnames; i++) delete[] _pathnames[i]; + for (i = 0; i < _tpathnames; i++) delete[] _pathnames[i]; delete[] _pathnames; _pathnames = NULL; _tpathnames = fnfc.count(); if (_tpathnames && retval == 0) { _pathnames = new char*[_tpathnames]; - for (int i = 0; i < _tpathnames; i++) { + for (i = 0; i < _tpathnames; i++) { _pathnames[i] = new char[strlen(fnfc.filename(i))+1]; strcpy(_pathnames[i], fnfc.filename(i)); } @@ -167,7 +169,7 @@ int Fl_Kdialog_Native_File_Chooser_Driver::show() { if (data.all_files) { // process text received from pipe if (data.all_files[strlen(data.all_files)-1] == '\n') data.all_files[strlen(data.all_files)-1] = 0; - for (int i = 0; i < _tpathnames; i++) delete[] _pathnames[i]; + for (i = 0; i < _tpathnames; i++) delete[] _pathnames[i]; delete[] _pathnames; char *p = data.all_files; int count = 1; diff --git a/src/Fl_Pack.cxx b/src/Fl_Pack.cxx index f28218c20..26e4f3ecb 100644 --- a/src/Fl_Pack.cxx +++ b/src/Fl_Pack.cxx @@ -75,11 +75,12 @@ void Fl_Pack::draw() { int maximum_position = current_position; uchar d = damage(); Fl_Widget*const* a = array(); + int i; if (horizontal()) { rw = -spacing_; rh = th; - for (int i = children(); i--;) + for (i = children(); i--;) if (child(i)->visible()) { if (child(i) != this->resizable()) rw += child(i)->w(); rw += spacing_; @@ -88,13 +89,13 @@ void Fl_Pack::draw() { rw = tw; rh = -spacing_; - for (int i = children(); i--;) + for (i = children(); i--;) if (child(i)->visible()) { if (child(i) != this->resizable()) rh += child(i)->h(); rh += spacing_; } } - for (int i = children(); i--;) { + for (i = children(); i--;) { Fl_Widget* o = *a++; if (o->visible()) { int X,Y,W,H; diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx index 2b59a86ad..7a9f5f907 100644 --- a/src/Fl_Pixmap.cxx +++ b/src/Fl_Pixmap.cxx @@ -302,7 +302,8 @@ void Fl_Pixmap::color_average(Fl_Color c, float i) { void Fl_Pixmap::delete_data() { if (alloc_data) { - for (int i = 0; i < count(); i ++) delete[] (char *)data()[i]; + int i; + for (i = 0; i < count(); i ++) delete[] (char *)data()[i]; delete[] (char **)data(); } } diff --git a/src/Fl_Preferences.cxx b/src/Fl_Preferences.cxx index ca0b17916..56ed070a1 100644 --- a/src/Fl_Preferences.cxx +++ b/src/Fl_Preferences.cxx @@ -1000,7 +1000,8 @@ static void *decodeHex( const char *src, int &size ) { size = (int) strlen( src )/2; unsigned char *data = (unsigned char*)malloc( size ), *d = data; const char *s = src; - for ( int i=size; i>0; i-- ) { + int i; + for (i =size; i>0; i-- ) { int v; char x = tolower(*s++); if ( x >= 'a' ) v = x-'a'+10; else v = x-'0'; @@ -1517,7 +1518,8 @@ Fl_Preferences::Node::Node( const char *path ) { void Fl_Preferences::Node::deleteAllChildren() { Node *next_node = NULL; - for ( Node *current_node = first_child_; current_node; current_node = next_node ) { + Node *current_node; + for (current_node = first_child_; current_node; current_node = next_node ) { next_node = current_node->next_; delete current_node; } @@ -1528,7 +1530,8 @@ void Fl_Preferences::Node::deleteAllChildren() { void Fl_Preferences::Node::deleteAllEntries() { if ( entry_ ) { - for ( int i = 0; i < nEntry_; i++ ) { + int i; + for (i = 0; i < nEntry_; i++ ) { if ( entry_[i].name ) { ::free( entry_[i].name ); entry_[i].name = NULL; @@ -1583,7 +1586,8 @@ void Fl_Preferences::Node::clearDirtyFlags() { int Fl_Preferences::Node::write( FILE *f ) { if ( next_ ) next_->write( f ); fprintf( f, "\n[%s]\n\n", path_ ); - for ( int i = 0; i < nEntry_; i++ ) { + int i; + for (i = 0; i < nEntry_; i++ ) { char *src = entry_[i].value; if ( src ) { // hack it into smaller pieces if needed fprintf( f, "%s:", entry_[i].name ); @@ -1645,7 +1649,8 @@ Fl_Preferences::Node *Fl_Preferences::Node::addChild( const char *path ) { // create and set, or change an entry within this node void Fl_Preferences::Node::set( const char *name, const char *value ) { - for ( int i=0; i<nEntry_; i++ ) { + int i; + for (i =0; i<nEntry_; i++ ) { if ( strcmp( name, entry_[i].name ) == 0 ) { if ( !value ) return; // annotation if ( strcmp( value, entry_[i].value ) != 0 ) { @@ -1710,7 +1715,8 @@ const char *Fl_Preferences::Node::get( const char *name ) { // find the index of an entry, returns -1 if no such entry int Fl_Preferences::Node::getEntry( const char *name ) { - for ( int i=0; i<nEntry_; i++ ) { + int i; + for (i =0; i<nEntry_; i++ ) { if ( strcmp( name, entry_[i].name ) == 0 ) { return i; } @@ -1784,7 +1790,8 @@ Fl_Preferences::Node *Fl_Preferences::Node::search( const char *path, int offset if ( len > 0 && path[ len ] == 0 ) return this; if ( len <= 0 || path[ len ] == '/' ) { - for ( Node *nd = first_child_; nd; nd = nd->next_ ) { + Node *nd; + for (nd = first_child_; nd; nd = nd->next_ ) { Node *nn = nd->search( path, offset ); if ( nn ) return nn; } @@ -1800,7 +1807,8 @@ int Fl_Preferences::Node::nChildren() { return nIndex_; } else { int cnt = 0; - for ( Node *nd = first_child_; nd; nd = nd->next_ ) + Node *nd; + for (nd = first_child_; nd; nd = nd->next_ ) cnt++; return cnt; } diff --git a/src/Fl_Roller.cxx b/src/Fl_Roller.cxx index 03e665314..15067191f 100644 --- a/src/Fl_Roller.cxx +++ b/src/Fl_Roller.cxx @@ -100,11 +100,13 @@ void Fl_Roller::draw() { int offset = step() ? int(value()/step()) : 0; const double ARC = 1.5; // 1/2 the number of radians visible const double delta = .2; // radians per knurl + int i; + double yy; if (horizontal()) { // horizontal one // draw shaded ends of wheel: int h1 = W/4+1; // distance from end that shading starts fl_color(color()); fl_rectf(X+h1,Y,W-2*h1,H); - for (int i=0; h1; i++) { + for (i =0; h1; i++) { fl_color((Fl_Color)(FL_GRAY-i-1)); int h2 = FL_GRAY-i-1 > FL_DARK3 ? 2*h1/3+1 : 0; fl_rectf(X+h2,Y,h1-h2,H); @@ -114,7 +116,7 @@ void Fl_Roller::draw() { if (active_r()) { // draw ridges: double junk; - for (double yy = -ARC+modf(offset*sin(ARC)/(W/2)/delta,&junk)*delta;; + for (yy = -ARC+modf(offset*sin(ARC)/(W/2)/delta,&junk)*delta;; yy += delta) { int yy1 = int((sin(yy)/sin(ARC)+1)*W/2); if (yy1 <= 0) continue; else if (yy1 >= W-1) break; @@ -138,7 +140,7 @@ void Fl_Roller::draw() { // draw shaded ends of wheel: int h1 = H/4+1; // distance from end that shading starts fl_color(color()); fl_rectf(X,Y+h1,W,H-2*h1); - for (int i=0; h1; i++) { + for (i =0; h1; i++) { fl_color((Fl_Color)(FL_GRAY-i-1)); int h2 = FL_GRAY-i-1 > FL_DARK3 ? 2*h1/3+1 : 0; fl_rectf(X,Y+h2,W,h1-h2); @@ -148,7 +150,7 @@ void Fl_Roller::draw() { if (active_r()) { // draw ridges: double junk; - for (double yy = -ARC+modf(offset*sin(ARC)/(H/2)/delta,&junk)*delta; + for (yy = -ARC+modf(offset*sin(ARC)/(H/2)/delta,&junk)*delta; ; yy += delta) { int yy1 = int((sin(yy)/sin(ARC)+1)*H/2); if (yy1 <= 0) continue; else if (yy1 >= H-1) break; diff --git a/src/Fl_Scheme.cxx b/src/Fl_Scheme.cxx index 0f4b39fb2..ce5dc5387 100644 --- a/src/Fl_Scheme.cxx +++ b/src/Fl_Scheme.cxx @@ -126,7 +126,8 @@ int Fl_Scheme::add_scheme_name(const char *name) { if (nlen > 12) return (-2); - for (int i = 0; i < nlen; i++) { + int i; + for (i = 0; i < nlen; i++) { if ((name[i] >= 'a' && name[i] <= 'z') || (name[i] >= '0' && name[i] <= '9')) continue; @@ -139,7 +140,7 @@ int Fl_Scheme::add_scheme_name(const char *name) { // hence we can use the faster strcmp() for comparison. const char **s = names(); - for (int i = 0; i < num_schemes_; i++) { + for (i = 0; i < num_schemes_; i++) { if (strcmp(name, s[i]) == 0) return 0; } diff --git a/src/Fl_Screen_Driver.cxx b/src/Fl_Screen_Driver.cxx index 3a25f6ec7..a091cea62 100644 --- a/src/Fl_Screen_Driver.cxx +++ b/src/Fl_Screen_Driver.cxx @@ -145,7 +145,8 @@ int Fl_Screen_Driver::screen_num(int x, int y) int screen = 0; if (num_screens < 0) init(); - for (int i = 0; i < num_screens; i ++) { + int i; + for (i = 0; i < num_screens; i ++) { int sx, sy, sw, sh; screen_xywh(sx, sy, sw, sh, i); if ((x >= sx) && (x < (sx+sw)) && (y >= sy) && (y < (sy+sh))) { @@ -176,7 +177,8 @@ int Fl_Screen_Driver::screen_num(int x, int y, int w, int h) int best_screen = 0; float best_intersection = 0.; if (num_screens < 0) init(); - for (int i = 0; i < num_screens; i++) { + int i; + for (i = 0; i < num_screens; i++) { int sx = 0, sy = 0, sw = 0, sh = 0; screen_xywh(sx, sy, sw, sh, i); float sintersection = fl_intersection(x, y, w, h, sx, sy, sw, sh); @@ -234,10 +236,12 @@ Image depths can differ between "to" and "from". uchar *tobytes = (uchar*)to->array + to_y * to_ld + to_x * to->d(); const uchar *frombytes = from->array; int need_alpha = (from->d() == 3 && to->d() == 4); - for (int i = 0; i < from->h(); i++) { + int i; + for (i = 0; i < from->h(); i++) { if (from->d() == to->d()) memcpy(tobytes, frombytes, from->w() * from->d()); else { - for (int j = 0; j < from->w(); j++) { + int j; + for (j = 0; j < from->w(); j++) { memcpy(tobytes + j * to->d(), frombytes + j * from->d(), from->d()); if (need_alpha) *(tobytes + j * to->d() + 3) = 0xff; } @@ -281,7 +285,8 @@ Fl_RGB_Image *Fl_Screen_Driver::traverse_to_gl_subwindows(Fl_Group *g, int x, in if (!full_img) return NULL; float full_img_scale = (full_img && w > 0 ? float(full_img->data_w())/w : 1); int n = (captured_subwin ? 0 : g->children()); - for (int i = 0; i < n; i++) { + int i; + for (i = 0; i < n; i++) { Fl_Widget *c = g->child(i); if ( !c->visible() || !c->as_group()) continue; if ( c->as_window() ) { @@ -564,7 +569,8 @@ int Fl_Screen_Driver::scale_handler(int event) if (f == old_f) return 1; if (screen_dr->rescalable() == SYSTEMWIDE_APP_SCALING) { float old_f = screen_dr->scale(0); - for (int i = 0; i < Fl::screen_count(); i++) { + int i; + for (i = 0; i < Fl::screen_count(); i++) { screen_dr->rescale_all_windows_from_screen(i, f * initial_scale, old_f); } } else { @@ -587,11 +593,12 @@ void Fl_Screen_Driver::use_startup_scale_factor() if ((p = fl_getenv("FLTK_SCALING_FACTOR"))) { float factor = 1; sscanf(p, "%f", &factor); + int i; if (rescalable() == SYSTEMWIDE_APP_SCALING) { float new_val = factor * scale(0); - for (int i = 0; i < s_count; i++) scale(i, new_val); + for (i = 0; i < s_count; i++) scale(i, new_val); } else { - for (int i = 0; i < s_count; i++) scale(i, factor * scale(i)); + for (i = 0; i < s_count; i++) scale(i, factor * scale(i)); } } } diff --git a/src/Fl_Scroll.cxx b/src/Fl_Scroll.cxx index f64dbb952..951d5daae 100644 --- a/src/Fl_Scroll.cxx +++ b/src/Fl_Scroll.cxx @@ -169,7 +169,8 @@ void Fl_Scroll::draw_clip(void* v,int X, int Y, int W, int H) { // draw visible children Fl_Widget*const* a = s->array(); - for (int i=s->children()-2; i--;) { + int i; + for (i =s->children()-2; i--;) { Fl_Widget& o = **a++; s->draw_child(o); s->draw_outside_label(o); @@ -208,7 +209,8 @@ void Fl_Scroll::recalc_scrollbars(ScrollInfo &si) const { si.child.t = si.innerbox.y; int first = 1; Fl_Widget*const* a = array(); - for (int i=children(); i--;) { + int i; + for (i =children(); i--;) { Fl_Widget* o = *a++; if ( o==&scrollbar || o==&hscrollbar || o->visible()==0 ) continue; if ( first ) { @@ -340,6 +342,7 @@ void Fl_Scroll::draw() { draw_box(box(),x(),y(),w(),h(),color()); draw_clip(this, X, Y, W, H); } else { + int i; if (d & FL_DAMAGE_SCROLL) { // scroll the contents: fl_scroll(X, Y, W, H, oldx-xposition_, oldy-yposition_, draw_clip, this); @@ -351,7 +354,7 @@ void Fl_Scroll::draw() { R = 0; T = 999999; B = 0; - for (int i=children()-2; i--; a++) { + for (i =children()-2; i--; a++) { if ((*a)->x() < L) L = (*a)->x(); if (((*a)->x() + (*a)->w()) > R) R = (*a)->x() + (*a)->w(); if ((*a)->y() < T) T = (*a)->y(); @@ -365,7 +368,7 @@ void Fl_Scroll::draw() { if (d & FL_DAMAGE_CHILD) { // draw damaged children fl_push_clip(X, Y, W, H); Fl_Widget*const* a = array(); - for (int i=children()-2; i--;) update_child(**a++); + for (i =children()-2; i--;) update_child(**a++); fl_pop_clip(); } } @@ -454,7 +457,8 @@ void Fl_Scroll::resize(int X, int Y, int W, int H) { fix_scrollbar_order(); // move all the children: Fl_Widget*const* a = array(); - for (int i=children()-2; i--;) { + int i; + for (i =children()-2; i--;) { Fl_Widget* o = *a++; o->position(o->x()+dx, o->y()+dy); } @@ -493,7 +497,8 @@ void Fl_Scroll::scroll_to(int X, int Y) { xposition_ = X; yposition_ = Y; Fl_Widget*const* a = array(); - for (int i=children(); i--;) { + int i; + for (i =children(); i--;) { Fl_Widget* o = *a++; if (o == &hscrollbar || o == &scrollbar) continue; o->position(o->x()+dx, o->y()+dy); diff --git a/src/Fl_Shared_Image.cxx b/src/Fl_Shared_Image.cxx index 82e9be050..ae2bc859a 100644 --- a/src/Fl_Shared_Image.cxx +++ b/src/Fl_Shared_Image.cxx @@ -703,7 +703,8 @@ void Fl_Shared_Image::remove_handler(Fl_Shared_Handler f) { */ void Fl_Shared_Image::print_pool() { printf("Fl_Shared_Image: %d images stored in a pool of %d\n", num_images_, alloc_images_); - for (int i=0; i<num_images_; i++) { + int i; + for (i =0; i<num_images_; i++) { Fl_Shared_Image *img = images_[i]; printf("%3d: %3d(%c) %4dx%4d: %s\n", i, diff --git a/src/Fl_Slider.cxx b/src/Fl_Slider.cxx index f1d0444ac..52fcdaa94 100644 --- a/src/Fl_Slider.cxx +++ b/src/Fl_Slider.cxx @@ -227,7 +227,8 @@ void Fl_Slider::draw_ticks(const Fl_Rect& r, int /*S*/ /*, int min_spacing*/) fl_color(black); int n = num_ticks(); double nd = (double)(n-1); - for (int i=0; i<n; i++) { + int i; + for (i =0; i<n; i++) { double v = i / nd; if (scale() == LOG_SCALE) { v = position_to_value(1.0-v); diff --git a/src/Fl_System_Driver.cxx b/src/Fl_System_Driver.cxx index c93794711..980273443 100644 --- a/src/Fl_System_Driver.cxx +++ b/src/Fl_System_Driver.cxx @@ -252,7 +252,8 @@ int Fl_System_Driver::filename_expand(char *to,int tolen, const char *from) { int ret = 0; - for (char *a=temp; a<end; ) { // for each slash component + char *a; + for (a =temp; a<end; ) { // for each slash component char *e; for (e=a; e<end && *e != '/'; e++) {/*empty*/} // find next slash const char *value = 0; // this will point at substitute value switch (*a) { diff --git a/src/Fl_Table.cxx b/src/Fl_Table.cxx index e19fc2fbe..c238a8d1d 100644 --- a/src/Fl_Table.cxx +++ b/src/Fl_Table.cxx @@ -76,7 +76,8 @@ long Fl_Table::row_scroll_position(int row) { scroll = toprow_scrollpos; startrow = toprow; } - for ( int t=startrow; t<row; t++ ) { + int t; + for (t =startrow; t<row; t++ ) { scroll += row_height(t); } return(scroll); @@ -95,7 +96,8 @@ long Fl_Table::col_scroll_position(int col) { scroll = leftcol_scrollpos; startcol = leftcol; } - for ( int t=startcol; t<col; t++ ) { + int t; + for (t =startcol; t<col; t++ ) { scroll += col_width(t); } return(scroll); @@ -1339,8 +1341,10 @@ void Fl_Table::draw() { // Only redraw a few cells? if ( ! ( damage() & FL_DAMAGE_ALL ) && _redraw_leftcol != -1 ) { fl_push_clip(tix, tiy, tiw, tih); - for ( int c = _redraw_leftcol; c <= _redraw_rightcol; c++ ) { - for ( int r = _redraw_toprow; r <= _redraw_botrow; r++ ) { + int c; + for (c = _redraw_leftcol; c <= _redraw_rightcol; c++ ) { + int r; + for (r = _redraw_toprow; r <= _redraw_botrow; r++ ) { _redraw_cell(CONTEXT_CELL, r, c); } } @@ -1348,11 +1352,12 @@ void Fl_Table::draw() { } if ( damage() & FL_DAMAGE_ALL ) { int X,Y,W,H; + int r, c; // Draw row headers, if any if ( row_header() ) { get_bounds(CONTEXT_ROW_HEADER, X, Y, W, H); fl_push_clip(X,Y,W,H); - for ( int r = toprow; r <= botrow; r++ ) { + for (r = toprow; r <= botrow; r++ ) { _redraw_cell(CONTEXT_ROW_HEADER, r, 0); } fl_pop_clip(); @@ -1361,7 +1366,7 @@ void Fl_Table::draw() { if ( col_header() ) { get_bounds(CONTEXT_COL_HEADER, X, Y, W, H); fl_push_clip(X,Y,W,H); - for ( int c = leftcol; c <= rightcol; c++ ) { + for (c = leftcol; c <= rightcol; c++ ) { _redraw_cell(CONTEXT_COL_HEADER, 0, c); } fl_pop_clip(); @@ -1373,8 +1378,8 @@ void Fl_Table::draw() { // drawing over deadzones; prevent deadzones by sizing columns. // fl_push_clip(tix, tiy, tiw, tih); { - for ( int r = toprow; r <= botrow; r++ ) { - for ( int c = leftcol; c <= rightcol; c++ ) { + for (r = toprow; r <= botrow; r++ ) { + for (c = leftcol; c <= rightcol; c++ ) { _redraw_cell(CONTEXT_CELL, r, c); } } diff --git a/src/Fl_Table_Row.cxx b/src/Fl_Table_Row.cxx index d07db7ac7..9bf665eab 100644 --- a/src/Fl_Table_Row.cxx +++ b/src/Fl_Table_Row.cxx @@ -114,7 +114,8 @@ int Fl_Table_Row::select_row(int row, int flag) { case SELECT_SINGLE: { int oldval; - for ( int t=0; t<rows(); t++ ) { + int t; + for (t =0; t<rows(); t++ ) { if ( t == row ) { oldval = _rowselect[row]; if ( flag == 2 ) { _rowselect[row] ^= 1; } @@ -254,7 +255,8 @@ int Fl_Table_Row::handle(int event) { srow = _last_row; erow = R; } - for ( int row = srow; row <= erow; row++ ) { + int row; + for (row = srow; row <= erow; row++ ) { select_row(row, 1); } } @@ -320,7 +322,8 @@ int Fl_Table_Row::handle(int event) { srow = _last_row; erow = R; } - for ( int row = srow; row <= erow; row++ ) { + int row; + for (row = srow; row <= erow; row++ ) { select_row(row, 1); } } diff --git a/src/Fl_Tabs.cxx b/src/Fl_Tabs.cxx index 7d48d78d1..96ad87f90 100644 --- a/src/Fl_Tabs.cxx +++ b/src/Fl_Tabs.cxx @@ -260,7 +260,8 @@ int Fl_Tabs::tab_height() { int H = h(); int H2 = y(); Fl_Widget*const* a = array(); - for (int i=children(); i--;) { + int i; + for (i =children(); i--;) { Fl_Widget* o = *a++; if (o->y() < y()+H) H = o->y()-y(); if (o->y()+o->h() > H2) H2 = o->y()+o->h(); @@ -292,7 +293,8 @@ Fl_Widget *Fl_Tabs::which(int event_x, int event_y) { Fl_Widget *ret = 0L; const int nc = children(); tab_positions(); - for (int i=0; i<nc; i++) { + int i; + for (i =0; i<nc; i++) { if (event_x < x()+tab_pos[i+1]+tab_offset) { ret = child(i); break; @@ -314,7 +316,8 @@ Fl_Widget *Fl_Tabs::which(int event_x, int event_y) { */ int Fl_Tabs::hit_close(Fl_Widget *o, int event_x, int event_y) { (void)event_y; - for (int i=0; i<children(); i++) { + int i; + for (i =0; i<children(); i++) { if (child(i)==o) { // never hit the "close" button on a compressed tab unless it's the active one if (tab_flags[i] & 1) @@ -721,7 +724,8 @@ int Fl_Tabs::push(Fl_Widget *o) { Fl_Widget* Fl_Tabs::value() { Fl_Widget* v = 0; Fl_Widget*const* a = array(); - for (int i=children(); i--;) { + int i; + for (i =children(); i--;) { Fl_Widget* o = *a++; if (v) o->hide(); else if (o->visible()) v = o; @@ -746,7 +750,8 @@ int Fl_Tabs::value(Fl_Widget *newvalue) { Fl_Widget*const* a = array(); int ret = 0; int selected = -1; - for (int i=children(); i--;) { + int i; + for (i =children(); i--;) { Fl_Widget* o = *a++; if (o == newvalue) { if (!o->visible()) ret = 1; diff --git a/src/Fl_Terminal.cxx b/src/Fl_Terminal.cxx index ef57749cf..99ac7a6f2 100644 --- a/src/Fl_Terminal.cxx +++ b/src/Fl_Terminal.cxx @@ -743,7 +743,8 @@ void Fl_Terminal::RingBuffer::new_copy(int drows, int dcols, int hrows, const Ch while ((src_row >= src_stop_row) && (dst_row >= 0)) { Utf8Char *src = u8c_ring_row(src_row); Utf8Char *dst = new_ring_chars + (dst_row*dst_cols); - for (int col=0; col<tcols; col++ ) *dst++ = *src++; + int col; + for (col =0; col<tcols; col++ ) *dst++ = *src++; --src_row; --dst_row; } @@ -826,15 +827,18 @@ bool Fl_Terminal::RingBuffer::is_disp_ring_row(int grow) const { void Fl_Terminal::RingBuffer::move_disp_row(int src_row, int dst_row) { Utf8Char *src = u8c_disp_row(src_row); Utf8Char *dst = u8c_disp_row(dst_row); - for (int col=0; col<disp_cols(); col++) *dst++ = *src++; + int col; + for (col =0; col<disp_cols(); col++) *dst++ = *src++; } // Clear the display rows 'sdrow' thru 'edrow' inclusive using specified CharStyle 'style' void Fl_Terminal::RingBuffer::clear_disp_rows(int sdrow, int edrow, const CharStyle& style) { - for (int drow=sdrow; drow<=edrow; drow++) { + int drow; + for (drow =sdrow; drow<=edrow; drow++) { int row = hist_rows_ + drow + offset_; Utf8Char *u8c = u8c_ring_row(row); - for (int col=0; col<disp_cols(); col++) u8c++->clear(style); + int col; + for (col =0; col<disp_cols(); col++) u8c++->clear(style); } } @@ -896,7 +900,8 @@ void Fl_Terminal::RingBuffer::scroll(int rows, const CharStyle& style) { // Memory // move rows = clamp(-rows, 1, disp_rows()); // make rows positive + sane - for (int row=disp_rows()-1; row>=0; row--) { // start at end of disp and work up + int row; + for (row =disp_rows()-1; row>=0; row--) { // start at end of disp and work up int src_row = (row - rows); // src is offset #rows being scrolled int dst_row = row; // dst is display if (src_row >= 0) move_disp_row(src_row, dst_row); // ok to move row? move row down @@ -1086,9 +1091,11 @@ const Fl_Terminal::Utf8Char* Fl_Terminal::u8c_disp_row(int drow) const // For walking the terminal lines in order, see examples // for u8c_hist_use_row() and u8c_disp_row(). // - for (int row=0; row<ring_rows(); row++) { + int row; + for (row =0; row<ring_rows(); row++) { Utf8Char *u8c = u8c_ring_row(row); - for (int col=0; col<ring_cols(); col++,u8c++) { + int col; + for (col =0; col<ring_cols(); col++,u8c++) { ..make use of u8c->xxx() methods.. } } @@ -1118,9 +1125,9 @@ Fl_Terminal::Utf8Char* Fl_Terminal::u8c_hist_row(int hrow) Example to walk all "in use" lines of the history buffer: \code // Walk the entire screen history ("in use") and display to stdout - for (int row=0; row<hist_use(); row++) { + for (row =0; row<hist_use(); row++) { const Utf8Char *u8c = u8c_hist_use_row(row); // first char in row - for (int col=0; col<=hist_cols(); col++,u8c++) { // walk columns left-to-right + for (col =0; col<=hist_cols(); col++,u8c++) { // walk columns left-to-right // ..Do things here with each u8c char.. ::printf("%.*s", u8c->length(), u8c->text_utf8()); // show each utf8 char to stdout } @@ -1141,7 +1148,7 @@ Fl_Terminal::Utf8Char* Fl_Terminal::u8c_hist_use_row(int hurow) // Print all chars in first row of display (ASCII and UTF-8) Utf8Char *u8c = u8c_disp_row(0); // first char of first display row int scol = 0, ecol = disp_cols(); // start/end for column loop - for (int col=scol; col<ecol; col++,u8c++) { // loop from first char to last + for (col =scol; col<ecol; col++,u8c++) { // loop from first char to last char *text = u8c->text_utf8(); // text string for char int len = u8c->length(); // text string length for char ::printf("<%.*s>", len, text); // print potentially multibyte char @@ -1151,9 +1158,9 @@ Fl_Terminal::Utf8Char* Fl_Terminal::u8c_hist_use_row(int hurow) - This can also be used to walk all rows on the display screen up to the cursor row, e.g. \code // Write all chars in display up to cursor row to stdout - for (int row=0; row<disp_rows() && row<=cursor_row(); row++) { + for (row =0; row<disp_rows() && row<=cursor_row(); row++) { const Utf8Char *u8c = u8c_disp_row(row); // first char in row - for (int col=0; col<=display_cols(); col++,u8c++) { // walk columns left-to-right + for (col =0; col<=display_cols(); col++,u8c++) { // walk columns left-to-right // ..Do things here with each u8c char.. ::printf("%.*s", u8c->text_utf8(), u8c->length()); // write each utf8 char to stdout } @@ -1197,7 +1204,8 @@ void Fl_Terminal::init_tabstops(int newsize) { char *oldstops = tabstops_; // save old stops int oldsize = tabstops_size_; // save old size tabstops_ = (char*)malloc(newsize); // alloc new - for (int t=0; t<newsize; t++) { // init new tabstops: + int t; + for (t =0; t<newsize; t++) { // init new tabstops: tabstops_[t] = (oldstops && t<oldsize) ? oldstops[t] // copy old : ((t % 8) == 0) ? 1 : 0; // new defaults @@ -1212,7 +1220,8 @@ void Fl_Terminal::init_tabstops(int newsize) { // Reset all tabstops to default 8th char void Fl_Terminal::default_tabstops(void) { init_tabstops(ring_cols()); // issue #882 - for (int t=1; t<tabstops_size_; t++) // t=1: skip 0 + int t; + for (t =1; t<tabstops_size_; t++) // t=1: skip 0 tabstops_[t] = ((t % 8) == 0) ? 1 : 0; // every 8th char is a tabstop } @@ -1345,8 +1354,9 @@ void Fl_Terminal::refit_disp_to_screen(void) { scrollbar->value(0); // force scrollbar to bottom before refit if (drow_diff) { // change in display rows means shrink|enlarge + int i; if (is_enlarge) { // enlarging widget? - for (int i=0; i<drow_diff; i++) { // carefully loop thru each change + for (i =0; i<drow_diff; i++) { // carefully loop thru each change if (history_use() > 0) { // CASE 1: Drag lines down from history cursor_.scroll(-1); // cursor chases ring_.resize() } else { // CASE 2: add blank lines below cursor @@ -1356,7 +1366,7 @@ void Fl_Terminal::refit_disp_to_screen(void) { ring_.resize(display_rows()+1, dcols, hist_rows(), *current_style_); } } else { // shrinking widget? - for (int i=0; i<(-drow_diff); i++) { // carefully loop thru each row change + for (i =0; i<(-drow_diff); i++) { // carefully loop thru each row change int cur_row = cursor_.row(); // cursor row int below_cur = (drows > cur_row); // shrink is below cursor row? if (below_cur) { // CASE 3: shrinking below cursor? drop lines below @@ -1905,8 +1915,9 @@ void Fl_Terminal::clear(Fl_Color val) { */ void Fl_Terminal::clear_screen(bool scroll_to_hist) { if (scroll_to_hist) { scroll(disp_rows()); return; } - for (int drow=0; drow<disp_rows(); drow++) - for (int dcol=0; dcol<disp_cols(); dcol++) + int drow, dcol; + for (drow =0; drow<disp_rows(); drow++) + for (dcol =0; dcol<disp_cols(); dcol++) clear_char_at_disp(drow, dcol); clear_mouse_selection(); } @@ -1932,32 +1943,39 @@ void Fl_Terminal::clear_screen_home(bool scroll_to_hist) { /// Clear from cursor to Start Of Display (EOD), like \c "<ESC>[1J". void Fl_Terminal::clear_sod(void) { - for (int drow=0; drow <= cursor_.row(); drow++) - if (drow == cursor_.row()) - for (int dcol=0; dcol<=cursor_.col(); dcol++) + int drow, dcol; + for (drow =0; drow <= cursor_.row(); drow++) { + if (drow == cursor_.row()) { + for (dcol =0; dcol<=cursor_.col(); dcol++) plot_char(' ', drow, dcol); - else - for (int dcol=0; dcol<disp_cols(); dcol++) + } else { + for (dcol =0; dcol<disp_cols(); dcol++) plot_char(' ', drow, dcol); + } + } //TODO: Clear mouse selection? } /// Clear from cursor to End Of Display (EOD), like \c "<ESC>[J<ESC>[0J". void Fl_Terminal::clear_eod(void) { - for (int drow=cursor_.row(); drow<disp_rows(); drow++) - if (drow == cursor_.row()) - for (int dcol=cursor_.col(); dcol<disp_cols(); dcol++) + int drow, dcol; + for (drow =cursor_.row(); drow<disp_rows(); drow++) { + if (drow == cursor_.row()) { + for (dcol =cursor_.col(); dcol<disp_cols(); dcol++) plot_char(' ', drow, dcol); - else - for (int dcol=0; dcol<disp_cols(); dcol++) + } else { + for (dcol =0; dcol<disp_cols(); dcol++) plot_char(' ', drow, dcol); + } + } //TODO: Clear mouse selection? } /// Clear from cursor to End Of Line (EOL), like \c "<ESC>[K". void Fl_Terminal::clear_eol(void) { Utf8Char *u8c = u8c_disp_row(cursor_.row()) + cursor_.col(); // start at cursor - for (int col=cursor_.col(); col<disp_cols(); col++) // run from cursor to eol + int col; + for (col =cursor_.col(); col<disp_cols(); col++) // run from cursor to eol (u8c++)->clear(*current_style_); //TODO: Clear mouse selection? } @@ -1965,7 +1983,8 @@ void Fl_Terminal::clear_eol(void) { /// Clear from cursor to Start Of Line (SOL), like \c "<ESC>[1K". void Fl_Terminal::clear_sol(void) { Utf8Char *u8c = u8c_disp_row(cursor_.row()); // start at sol - for (int col=0; col<=cursor_.col(); col++) // run from sol to cursor + int col; + for (col =0; col<=cursor_.col(); col++) // run from sol to cursor (u8c++)->clear(*current_style_); //TODO: Clear mouse selection? } @@ -1973,7 +1992,8 @@ void Fl_Terminal::clear_sol(void) { /// Clear entire line for specified row. void Fl_Terminal::clear_line(int drow) { Utf8Char *u8c = u8c_disp_row(drow); // start at sol - for (int col=0; col<disp_cols(); col++) // run to eol + int col; + for (col =0; col<disp_cols(); col++) // run to eol (u8c++)->clear(*current_style_); //TODO: Clear mouse selection? } @@ -2045,12 +2065,14 @@ const Fl_Terminal::Utf8Char* Fl_Terminal::walk_selection( int srow,scol,erow,ecol; if (get_selection(srow,scol,erow,ecol)) { // mouse selection exists? // Walk entire selection from start to end - for (int row=srow; row<=erow; row++) { // walk rows of selection + int row; + for (row =srow; row<=erow; row++) { // walk rows of selection const Utf8Char *u8c = u8c_ring_row(row); // ptr to first character in row int col_start = (row==srow) ? scol : 0; // start row? start at scol int col_end = (row==erow) ? ecol : ring_cols(); // end row? end at ecol u8c += col_start; // include col offset (if any) - for (int col=col_start; col<=col_end; col++,u8c++) { // walk columns + int col; + for (col =col_start; col<=col_end; col++,u8c++) { // walk columns ..do something with each char at *u8c.. } } @@ -2235,15 +2257,16 @@ void Fl_Terminal::scroll(int rows) { void Fl_Terminal::insert_rows(int count) { int dst_drow = disp_rows()-1; // dst is bottom of display int src_drow = clamp((dst_drow-count), 1, (disp_rows()-1)); // src is count lines up from dst + int dcol; while (src_drow >= cursor_.row()) { // walk srcrow upwards to cursor row Utf8Char *src = u8c_disp_row(src_drow--); Utf8Char *dst = u8c_disp_row(dst_drow--); - for (int dcol=0; dcol<disp_cols(); dcol++) *dst++ = *src++; // move + for (dcol =0; dcol<disp_cols(); dcol++) *dst++ = *src++; // move } // Blank remaining rows upwards to and including cursor line while (dst_drow >= cursor_.row()) { // walk srcrow to curs line Utf8Char *dst = u8c_disp_row(dst_drow--); - for (int dcol=0; dcol<disp_cols(); dcol++) + for (dcol =0; dcol<disp_cols(); dcol++) dst++->clear(*current_style_); } clear_mouse_selection(); @@ -2257,16 +2280,17 @@ void Fl_Terminal::insert_rows(int count) { void Fl_Terminal::delete_rows(int count) { int dst_drow = cursor_.row(); // dst is cursor row int src_drow = clamp((dst_drow+count), 1, (disp_rows()-1)); // src is count rows below cursor + int dcol; while (src_drow < disp_rows()) { // walk srcrow to EOD Utf8Char *src = u8c_disp_row(src_drow++); Utf8Char *dst = u8c_disp_row(dst_drow++); - for (int dcol=0; dcol<disp_cols(); dcol++) + for (dcol =0; dcol<disp_cols(); dcol++) *dst++ = *src++; // move } // Blank remaining rows downwards to End Of Display while (dst_drow < disp_rows()) { // walk srcrow to EOD Utf8Char *dst = u8c_disp_row(dst_drow++); - for (int dcol=0; dcol<disp_cols(); dcol++) + for (dcol =0; dcol<disp_cols(); dcol++) dst++->clear(*current_style_); } clear_mouse_selection(); @@ -2298,7 +2322,8 @@ void Fl_Terminal::insert_char_eol(char c, int drow, int dcol, int rep) { const CharStyle &style = *current_style_; Utf8Char *src = u8c_disp_row(drow)+disp_cols()-1-rep; // start src at 'g' Utf8Char *dst = u8c_disp_row(drow)+disp_cols()-1; // start dst at 'j' - for (int col=(disp_cols()-1); col>=dcol; col--) { // loop col in reverse: eol -> dcol + int col; + for (col =(disp_cols()-1); col>=dcol; col--) { // loop col in reverse: eol -> dcol if (col >= (dcol+rep)) *dst-- = *src--; // let assignment do move else (dst--)->text_ascii(c,style);// assign chars displaced } @@ -2318,7 +2343,8 @@ void Fl_Terminal::delete_chars(int drow, int dcol, int rep) { if (rep == 0) return; const CharStyle &style = *current_style_; Utf8Char *u8c = u8c_disp_row(drow); - for (int col=dcol; col<disp_cols(); col++) // delete left-to-right + int col; + for (col =dcol; col<disp_cols(); col++) // delete left-to-right if (col+rep >= disp_cols()) u8c[col].text_ascii(' ', style); // blanks else u8c[col] = u8c[col+rep]; // move } @@ -2337,9 +2363,11 @@ void Fl_Terminal::clear_history(void) { ring_.clear_hist(); scrollbar->value(0); // zero scroll position // Clear entire history buffer - for (int hrow=0; hrow<hist_rows(); hrow++) { + int hrow; + for (hrow =0; hrow<hist_rows(); hrow++) { Utf8Char *u8c = u8c_hist_row(hrow); // walk history rows.. - for (int hcol=0; hcol<hist_cols(); hcol++) { // ..and history cols + int hcol; + for (hcol =0; hcol<hist_cols(); hcol++) { // ..and history cols (u8c++)->clear(*current_style_); } } @@ -2667,7 +2695,8 @@ void Fl_Terminal::handle_SGR(void) { // ESC[...m? int rgbcode = 0; // 0=none, 38=fg, 48=bg int rgbmode = 0; // 0=none, 1="2", 2=<r>, 3=<g>, 4=<b> int r=0,g=0,b=0; - for (int i=0; i<tot; i++) { // expect possibly many values + int i; + for (i =0; i<tot; i++) { // expect possibly many values int val = esc.val(i); // each val one at a time switch (rgbmode) { case 0: @@ -3602,7 +3631,8 @@ void Fl_Terminal::draw_row_bg(int grow, int X, int Y) const { int end_col = disp_cols(); const Utf8Char *u8c = u8c_ring_row(grow) + start_col; // start of spec'd row uchar lastattr = u8c->attrib(); - for (int gcol=start_col; gcol<end_col; gcol++,u8c++) { // walk columns + int gcol; + for (gcol =start_col; gcol<end_col; gcol++,u8c++) { // walk columns // Attribute changed since last char? if (gcol==0 || u8c->attrib() != lastattr) { u8c->fl_font_set(*current_style_); // pwidth_int() needs fl_font set @@ -3652,7 +3682,8 @@ void Fl_Terminal::draw_row(int grow, int Y) const { int start_col = hscrollbar->visible() ? hscrollbar->value() : 0; int end_col = disp_cols(); const Utf8Char *u8c = u8c_ring_row(grow) + start_col; - for (int gcol=start_col; gcol<end_col; gcol++,u8c++) { // walk the columns + int gcol; + for (gcol =start_col; gcol<end_col; gcol++,u8c++) { // walk the columns const int &dcol = gcol; // dcol and gcol are the same // Are we drawing the cursor? Only if inside display is_cursor = inside_display ? cursor_.is_rowcol(drow-scrollval, dcol) : 0; @@ -3711,7 +3742,8 @@ void Fl_Terminal::draw_buff(int Y) const { int srow = disp_srow() - scrollbar->value(); int erow = srow + disp_rows(); const int rowheight = current_style_->fontheight(); - for (int grow=srow; (grow<erow) && (Y<scrn_.b()); grow++) { + int grow; + for (grow =srow; (grow<erow) && (Y<scrn_.b()); grow++) { draw_row(grow, Y); // draw global row at Y Y += rowheight; // advance Y to bottom left corner of row } diff --git a/src/Fl_Text_Buffer.cxx b/src/Fl_Text_Buffer.cxx index 9aa099208..8411342d1 100644 --- a/src/Fl_Text_Buffer.cxx +++ b/src/Fl_Text_Buffer.cxx @@ -181,7 +181,8 @@ public: void clear() { if (locked_) return; if (list_) { - for (int i=0; i<list_size_; i++) { + int i; + for (i =0; i<list_size_; i++) { delete list_[i]; } ::free(list_); @@ -887,7 +888,8 @@ void Fl_Text_Buffer::add_modify_callback(Fl_Text_Modify_Cb bufModifiedCB, Fl_Text_Modify_Cb *newModifyProcs = new Fl_Text_Modify_Cb[mNModifyProcs + 1]; void **newCBArgs = new void *[mNModifyProcs + 1]; - for (int i = 0; i < mNModifyProcs; i++) { + int i; + for (i = 0; i < mNModifyProcs; i++) { newModifyProcs[i + 1] = mModifyProcs[i]; newCBArgs[i + 1] = mCbArgs[i]; } @@ -963,7 +965,8 @@ void Fl_Text_Buffer::add_predelete_callback(Fl_Text_Predelete_Cb bufPreDeleteCB, Fl_Text_Predelete_Cb *newPreDeleteProcs = new Fl_Text_Predelete_Cb[mNPredeleteProcs + 1]; void **newCBArgs = new void *[mNPredeleteProcs + 1]; - for (int i = 0; i < mNPredeleteProcs; i++) { + int i; + for (i = 0; i < mNPredeleteProcs; i++) { newPreDeleteProcs[i + 1] = mPredeleteProcs[i]; newCBArgs[i + 1] = mPredeleteCbArgs[i]; } @@ -1127,7 +1130,8 @@ int Fl_Text_Buffer::skip_displayed_characters(int lineStartPos, int nChars) int pos = lineStartPos; - for (int charCount = 0; charCount < nChars && pos < mLength; charCount++) { + int charCount; + for (charCount = 0; charCount < nChars && pos < mLength; charCount++) { unsigned int c = char_at(pos); if (c == '\n') return pos; @@ -1633,7 +1637,8 @@ void Fl_Text_Buffer::call_modify_callbacks(int pos, int nDeleted, int nInserted, int nRestyled, const char *deletedText) const { IS_UTF8_ALIGNED2(this, pos) - for (int i = 0; i < mNModifyProcs; i++) + int i; + for (i = 0; i < mNModifyProcs; i++) (*mModifyProcs[i]) (pos, nInserted, nDeleted, nRestyled, deletedText, mCbArgs[i]); } @@ -1644,7 +1649,8 @@ void Fl_Text_Buffer::call_modify_callbacks(int pos, int nDeleted, Unicode safe. */ void Fl_Text_Buffer::call_predelete_callbacks(int pos, int nDeleted) const { - for (int i = 0; i < mNPredeleteProcs; i++) + int i; + for (i = 0; i < mNPredeleteProcs; i++) (*mPredeleteProcs[i]) (pos, nDeleted, mPredeleteCbArgs[i]); } @@ -2078,7 +2084,8 @@ int Fl_Text_Buffer::prev_char_clipped(int pos) const const int l_t = 40; char t[l_t + 1]; t[l_t] = 0; int len = l_t, p = pos, ll; - for (int i = l_t; i > 0 && p > 0; i--) { + int i; + for (i = l_t; i > 0 && p > 0; i--) { t[--len] = byte_at(--p); ll = fl_utf8len(t[len]); if (ll == 1 || ll == 2) break; @@ -2123,7 +2130,8 @@ int Fl_Text_Buffer::next_char(int pos) const { t[len++] = b; ll = fl_utf8len1(b); count_points++; - for (int i = 1; i < ll && len < (int)sizeof(t); i++) t[len++] = byte_at(p++); + int i; + for (i = 1; i < ll && len < (int)sizeof(t); i++) t[len++] = byte_at(p++); if (count_points > 1 && (ll == 1 || ll == 2)) { // stop after short codepoint but not if it's the 1st codepoint which can be inside // emoji sequence (e.g. 9️⃣ "keycap 9") diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index 9e0aacc2f..650cf1b7d 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -131,7 +131,8 @@ Fl_Text_Display::Fl_Text_Display(int X, int Y, int W, int H, const char* l) mLineStarts = new int[mNVisibleLines]; #if VISIBLE_LINES_INIT > 1 { // Note: this code is unused unless mNVisibleLines is ever initialized > 1 - for (int i=1; i<mNVisibleLines; i++) mLineStarts[i] = -1; + int i; + for (i =1; i<mNVisibleLines; i++) mLineStarts[i] = -1; } #endif mLineStarts[0] = 0; @@ -462,7 +463,8 @@ void Fl_Text_Display::highlight_data(Fl_Text_Buffer *styleBuffer, */ int Fl_Text_Display::longest_vline() const { int longest = 0; - for (int i = 0; i < mNVisibleLines; i++) + int i; + for (i = 0; i < mNVisibleLines; i++) longest = max(longest, measure_vline(i)); return longest; } @@ -560,7 +562,8 @@ void Fl_Text_Display::recalc_display() { } // End of optimization, see comment above. - for (int again = 1; again;) { + int again; + for (again = 1; again;) { again = 0; /* In continuous wrap mode, a change in width affects the total number of lines in the buffer, and can leave the top line number incorrect, and @@ -2098,7 +2101,8 @@ int Fl_Text_Display::handle_vline( // In DRAW_LINE mode, the first iteration of the loop will draw all // backgrounds. The second iteration will draw the text, so that text // overlapping background color changes will not be clipped. - for (int loop=1; loop<=2; loop++) { + int loop; + for (loop =1; loop<=2; loop++) { int mask = (loop==1) ? BG_ONLY_MASK : TEXT_ONLY_MASK; startX = X; startIndex = 0; @@ -2623,7 +2627,8 @@ void Fl_Text_Display::draw_cursor( int X, int Y ) { } fl_color( mCursor_color ); - for ( int k = 0; k < nSegs; k++ ) { + int k; + for (k = 0; k < nSegs; k++ ) { fl_line( segs[ k ].x1, segs[ k ].y1, segs[ k ].x2, segs[ k ].y2 ); } diff --git a/src/Fl_Text_Editor.cxx b/src/Fl_Text_Editor.cxx index 205687c36..6bbb2a81d 100644 --- a/src/Fl_Text_Editor.cxx +++ b/src/Fl_Text_Editor.cxx @@ -147,7 +147,8 @@ static struct { /** Adds all of the default editor key bindings to the specified key binding list.*/ void Fl_Text_Editor::add_default_key_bindings(Key_Binding** list) { - for (int i = 0; default_key_bindings[i].key; i++) { + int i; + for (i = 0; default_key_bindings[i].key; i++) { add_key_binding(default_key_bindings[i].key, default_key_bindings[i].state, default_key_bindings[i].func, @@ -155,7 +156,7 @@ void Fl_Text_Editor::add_default_key_bindings(Key_Binding** list) { } Key_Binding *extra_key_bindings = Fl::screen_driver()->text_editor_extra_key_bindings; if (extra_key_bindings) { // add platform-specific key bindings, if any - for (int i = 0; extra_key_bindings[i].key; i++) { + for (i = 0; extra_key_bindings[i].key; i++) { add_key_binding(extra_key_bindings[i].key, extra_key_bindings[i].state, extra_key_bindings[i].function, diff --git a/src/Fl_Tile.cxx b/src/Fl_Tile.cxx index 0eb7e0a70..2f84a9a22 100644 --- a/src/Fl_Tile.cxx +++ b/src/Fl_Tile.cxx @@ -177,7 +177,8 @@ static int fl_max(int a, int b) { return a>b ? a : b; } void Fl_Tile::request_shrink_l(int old_l, int &new_l, Fl_Rect *final_size) { Fl_Rect *p = bounds(); int min_l = new_l; - for (int i=0; i<children(); i++) { + int i; + for (i =0; i<children(); i++) { Fl_Rect *ri = p+i+2; if (ri->x() == old_l) { if (ri->w() == 0) { @@ -224,7 +225,8 @@ void Fl_Tile::request_shrink_l(int old_l, int &new_l, Fl_Rect *final_size) { void Fl_Tile::request_shrink_r(int old_r, int &new_r, Fl_Rect *final_size) { Fl_Rect *p = bounds(); int min_r = new_r; - for (int i=0; i<children(); i++) { + int i; + for (i =0; i<children(); i++) { Fl_Rect *ri = p+i+2; if (ri->r() == old_r) { if (ri->w() == 0) { @@ -271,7 +273,8 @@ void Fl_Tile::request_shrink_r(int old_r, int &new_r, Fl_Rect *final_size) { void Fl_Tile::request_shrink_t(int old_t, int &new_t, Fl_Rect *final_size) { Fl_Rect *p = bounds(); int min_y = new_t; - for (int i=0; i<children(); i++) { + int i; + for (i =0; i<children(); i++) { Fl_Rect *ri = p+i+2; if (ri->y() == old_t) { if (ri->h() == 0) { @@ -318,7 +321,8 @@ void Fl_Tile::request_shrink_t(int old_t, int &new_t, Fl_Rect *final_size) { void Fl_Tile::request_shrink_b(int old_b, int &new_b, Fl_Rect *final_size) { Fl_Rect *p = bounds(); int min_b = new_b; - for (int i=0; i<children(); i++) { + int i; + for (i =0; i<children(); i++) { Fl_Rect *ri = p+i+2; if (ri->b() == old_b) { if (ri->h() == 0) { @@ -362,7 +366,8 @@ void Fl_Tile::request_shrink_b(int old_b, int &new_b, Fl_Rect *final_size) { */ void Fl_Tile::request_grow_l(int old_l, int &new_l, Fl_Rect *final_size) { Fl_Rect *p = bounds(); - for (int i=0; i<children(); i++) { + int i; + for (i =0; i<children(); i++) { Fl_Rect *ri = p+i+2; if (ri->x() == old_l) { final_size[i].w(final_size[i].r() - new_l); @@ -383,7 +388,8 @@ void Fl_Tile::request_grow_l(int old_l, int &new_l, Fl_Rect *final_size) { */ void Fl_Tile::request_grow_r(int old_r, int &new_r, Fl_Rect *final_size) { Fl_Rect *p = bounds(); - for (int i=0; i<children(); i++) { + int i; + for (i =0; i<children(); i++) { Fl_Rect *ri = p+i+2; if (ri->r() == old_r) { final_size[i].r(new_r); @@ -403,7 +409,8 @@ void Fl_Tile::request_grow_r(int old_r, int &new_r, Fl_Rect *final_size) { */ void Fl_Tile::request_grow_t(int old_t, int &new_t, Fl_Rect *final_size) { Fl_Rect *p = bounds(); - for (int i=0; i<children(); i++) { + int i; + for (i =0; i<children(); i++) { Fl_Rect *ri = p+i+2; if (ri->y() == old_t) { final_size[i].h(final_size[i].b() - new_t); @@ -424,7 +431,8 @@ void Fl_Tile::request_grow_t(int old_t, int &new_t, Fl_Rect *final_size) { */ void Fl_Tile::request_grow_b(int old_b, int &new_b, Fl_Rect *final_size) { Fl_Rect *p = bounds(); - for (int i=0; i<children(); i++) { + int i; + for (i =0; i<children(); i++) { Fl_Rect *ri = p+i+2; if (ri->b() == old_b) { final_size[i].b(new_b); @@ -458,7 +466,8 @@ void Fl_Tile::move_intersection(int oldx, int oldy, int newx, int newy) { Fl_Widget*const* a = array(); Fl_Rect *p = bounds(); p += 2; // skip group & resizable's saved size - for (int i=children(); i--; p++) { + int i; + for (i =children(); i--; p++) { Fl_Widget* o = *a++; if (o == resizable()) continue; int X = o->x(); @@ -564,7 +573,7 @@ void Fl_Tile::drag_intersection(int oldx, int oldy, int newx, int newy) { See the Fl_Tile class documentation about how the resizable() works. */ void Fl_Tile::resize(int X,int Y,int W,int H) { - + int i; if (size_range_) { // -- handle size_range style resizing int dx = X - x(); @@ -580,7 +589,7 @@ void Fl_Tile::resize(int X,int Y,int W,int H) { } // -- if the position changes, move all widgets first if ((dx!=0) || (dy!=0)) { - for (int i = 0; i < children(); i++) { + for (i = 0; i < children(); i++) { Fl_Widget *c = child(i); c->position(c->x()+dx, c->y()+dy); } @@ -589,7 +598,7 @@ void Fl_Tile::resize(int X,int Y,int W,int H) { init_sizes(); Fl_Rect *p = bounds(); int bbr = X, bbb = Y; - for (int i = 0; i < children(); i++) { + for (i = 0; i < children(); i++) { // find the current bounding box bbr = fl_max(bbr, p[i+2].r()); bbb = fl_max(bbb, p[i+2].b()); @@ -661,7 +670,7 @@ void Fl_Tile::resize(int X,int Y,int W,int H) { // move everything to be on correct side of new resizable: Fl_Widget*const* a = array(); p += 2; - for (int i=children(); i--; p++) { + for (i =children(); i--; p++) { Fl_Widget* o = *a++; int xx = o->x()+dx; int R = xx+o->w(); @@ -723,7 +732,8 @@ int Fl_Tile::handle(int event) { Fl_Widget*const* a = array(); Fl_Rect *q = bounds(); Fl_Rect *p = q+2; - for (int i=children(); i--; p++) { + int i; + for (i =children(); i--; p++) { Fl_Widget* o = *a++; if (!size_range_ && o == resizable()) continue; if (p->r() < q->r() && o->y()<=my+GRABAREA && o->y()+o->h()>=my-GRABAREA) { @@ -896,7 +906,8 @@ void Fl_Tile::init_size_range(int default_min_w, int default_min_h) { size_range_size_ = children(); size_range_capacity_ = (size_range_size_+8) & ~7; // allocate in steps of 8 size_range_ = (Size_Range*)::realloc(size_range_, sizeof(Size_Range)*size_range_capacity_); - for (int i=0; i<size_range_size_; i++) { + int i; + for (i =0; i<size_range_size_; i++) { size_range_[i].minw = default_min_w_; size_range_[i].minh = default_min_h_; size_range_[i].maxw = 0x7FFFFFFF; diff --git a/src/Fl_Tiled_Image.cxx b/src/Fl_Tiled_Image.cxx index 2ec62e79a..80846779f 100644 --- a/src/Fl_Tiled_Image.cxx +++ b/src/Fl_Tiled_Image.cxx @@ -185,9 +185,11 @@ Fl_Tiled_Image::draw(int X, // I - Starting X position if (cx > 0) iw -= cx; // crop image if (cy > 0) ih -= cy; - for (int yy = Y; yy < Y+H; yy += ih) { + int yy; + for (yy = Y; yy < Y+H; yy += ih) { if (fl_not_clipped(X,yy,W,ih)) { - for (int xx = X; xx < X+W; xx += iw) { + int xx; + for (xx = X; xx < X+W; xx += iw) { if (fl_not_clipped(xx,yy,iw,ih)) { image_->draw(xx,yy,iw,ih,cx,cy); } diff --git a/src/Fl_Timeout.cxx b/src/Fl_Timeout.cxx index 9aa89b839..eb3e6cccd 100644 --- a/src/Fl_Timeout.cxx +++ b/src/Fl_Timeout.cxx @@ -217,7 +217,8 @@ void Fl_Timeout::insert() { \see Fl::has_timeout(Fl_Timeout_Handler cb, void *data) */ int Fl_Timeout::has_timeout(Fl_Timeout_Handler cb, void *data) { - for (Fl_Timeout *t = first_timeout; t; t = t->next) { + Fl_Timeout *t; + for (t = first_timeout; t; t = t->next) { if (t->callback == cb && t->data == data) return 1; } @@ -289,7 +290,8 @@ void Fl_Timeout::repeat_timeout(double time, Fl_Timeout_Handler cb, void *data) \see Fl::remove_timeout(Fl_Timeout_Handler cb, void *data) */ void Fl_Timeout::remove_timeout(Fl_Timeout_Handler cb, void *data) { - for (Fl_Timeout** p = &first_timeout; *p;) { + Fl_Timeout **p; + for (p = &first_timeout; *p;) { Fl_Timeout* t = *p; if (t->callback == cb && (t->data == data || !data)) { *p = t->next; @@ -323,7 +325,8 @@ void Fl_Timeout::remove_timeout(Fl_Timeout_Handler cb, void *data) { */ int Fl_Timeout::remove_next_timeout(Fl_Timeout_Handler cb, void *data, void **data_return) { int ret = 0; - for (Fl_Timeout** p = &first_timeout; *p;) { // scan all timeouts + Fl_Timeout **p; + for (p = &first_timeout; *p;) { // scan all timeouts Fl_Timeout* t = *p; if (t->callback == cb && (t->data == data || !data)) { // timeout matches ret++; @@ -356,7 +359,8 @@ int Fl_Timeout::remove_next_timeout(Fl_Timeout_Handler cb, void *data, void **da void Fl_Timeout::make_current() { // printf("[%4d] Fl_Timeout::make_current(%p)\n", __LINE__, this); // remove the timer entry from the active timer queue - for (Fl_Timeout** p = &first_timeout; *p;) { + Fl_Timeout **p; + for (p = &first_timeout; *p;) { Fl_Timeout* t = *p; if (t == this) { *p = t->next; @@ -497,13 +501,14 @@ void Fl_Timeout::elapse_timeouts() { // active timers - for (Fl_Timeout* t = first_timeout; t; t = t->next) { + Fl_Timeout *t; + for (t = first_timeout; t; t = t->next) { t->time -= elapsed; } // "current" timers, i.e. timers being serviced - for (Fl_Timeout* t = current_timeout; t; t = t->next) { + for (t = current_timeout; t; t = t->next) { t->time -= elapsed; } } diff --git a/src/Fl_Tooltip.cxx b/src/Fl_Tooltip.cxx index cb85f520e..43ff1ea0f 100644 --- a/src/Fl_Tooltip.cxx +++ b/src/Fl_Tooltip.cxx @@ -101,7 +101,8 @@ void Fl_TooltipBox::layout() { oy = Fl::event_y_root()+13; } else { oy = currentTooltipY + currentTooltipH+2; - for (Fl_Widget* p = Fl_Tooltip::current(); p; p = p->window()) { + Fl_Widget *p; + for (p = Fl_Tooltip::current(); p; p = p->window()) { oy += p->y(); } } diff --git a/src/Fl_Tree.cxx b/src/Fl_Tree.cxx index 01ab99d33..d4f1be750 100644 --- a/src/Fl_Tree.cxx +++ b/src/Fl_Tree.cxx @@ -67,7 +67,8 @@ static void free_path(char **arr) { // static int find_total_children(Fl_Tree_Item *item, int count=0) { count++; - for ( int t=0; t<item->children(); t++ ) { + int t; + for (t =0; t<item->children(); t++ ) { count = find_total_children(item->child(t), count); } return(count); @@ -138,7 +139,8 @@ Fl_Tree::~Fl_Tree() { int Fl_Tree::extend_selection_dir(Fl_Tree_Item *from, Fl_Tree_Item *to, int dir, int val, bool visible ) { int changed = 0; - for (Fl_Tree_Item *item=from; item; item = next_item(item, dir, visible) ) { + Fl_Tree_Item *item; + for (item =from; item; item = next_item(item, dir, visible) ) { switch (val) { case 0: if ( deselect(item, when()) ) ++changed; @@ -193,8 +195,9 @@ int Fl_Tree::extend_selection(Fl_Tree_Item *from, Fl_Tree_Item *to, } return(changed); } + Fl_Tree_Item *item; char on = 0; - for ( Fl_Tree_Item *item = first(); item; item = item->next_visible(_prefs) ) { + for (item = first(); item; item = item->next_visible(_prefs) ) { if ( visible && !item->is_visible() ) continue; if ( on || (item == from) || (item == to) ) { switch (val) { @@ -1099,11 +1102,12 @@ Fl_Tree_Item* Fl_Tree::item_clicked() { \code : // Walk down the tree (forwards) - for ( Fl_Tree_Item *i=tree->first_visible_item(); i; i=tree->next_visible_item(i, FL_Down) ) + Fl_Tree_Item *i; + for (i =tree->first_visible_item(); i; i=tree->next_visible_item(i, FL_Down) ) printf("Item: %s\n", i->label()); // Walk up the tree (backwards) - for ( Fl_Tree_Item *i=tree->last_visible_item(); i; i=tree->next_visible_item(i, FL_Up) ) + for (i =tree->last_visible_item(); i; i=tree->next_visible_item(i, FL_Up) ) printf("Item: %s\n", i->label()); : \endcode @@ -1123,7 +1127,8 @@ Fl_Tree_Item *Fl_Tree::next_visible_item(Fl_Tree_Item *item, int dir) { \par \code : - for ( Fl_Tree_Item *item = tree->first(); item; item = tree->next(item) ) + Fl_Tree_Item *item; + for (item = tree->first(); item; item = tree->next(item) ) printf("Item: %s\n", item->label()); : \endcode @@ -1161,7 +1166,8 @@ Fl_Tree_Item* Fl_Tree::first_visible_item() { \par \code : - for ( Fl_Tree_Item *i = tree->first(); i; i = tree->next(i) ) + Fl_Tree_Item *i; + for (i = tree->first(); i; i = tree->next(i) ) printf("Item: %s\n", i->label()); : \endcode @@ -1180,7 +1186,8 @@ Fl_Tree_Item *Fl_Tree::next(Fl_Tree_Item *item) { \par \code : - for ( Fl_Tree_Item *item = tree->first(); item; item = tree->prev(item) ) + Fl_Tree_Item *item; + for (item = tree->first(); item; item = tree->prev(item) ) printf("Item: %s\n", item->label()); : \endcode @@ -1198,7 +1205,8 @@ Fl_Tree_Item *Fl_Tree::prev(Fl_Tree_Item *item) { This can be used to walk the tree in reverse, e.g. \par \code - for ( Fl_Tree_Item *item = tree->last(); item; item = tree->prev() ) + Fl_Tree_Item *item; + for (item = tree->last(); item; item = tree->prev() ) printf("Item: %s\n", item->label()); \endcode \returns Last item in the tree, or 0 if none (tree empty). @@ -1249,7 +1257,8 @@ Fl_Tree_Item* Fl_Tree::last_visible_item() { \code : // Walk tree forward, from top to bottom - for ( Fl_Tree_Item *i=tree->first_selected_item(); i; i=tree->next_selected_item(i) ) + Fl_Tree_Item *i; + for (i =tree->first_selected_item(); i; i=tree->next_selected_item(i) ) printf("Selected item: %s\n", i->label()); : \endcode @@ -1270,7 +1279,8 @@ Fl_Tree_Item *Fl_Tree::first_selected_item() { \code : // Walk tree in reverse, from bottom to top - for ( Fl_Tree_Item *i=tree->last_selected_item(); i; i=tree->next_selected_item(i, FL_Up) ) + Fl_Tree_Item *i; + for (i =tree->last_selected_item(); i; i=tree->next_selected_item(i, FL_Up) ) printf("Selected item: %s\n", i->label()); : \endcode @@ -1303,19 +1313,20 @@ Fl_Tree_Item *Fl_Tree::last_selected_item() { \code : // Walk down the tree showing open(), visible items - for ( Fl_Tree_Item *i=tree->first_visible_item(); i; i=tree->next_item(i, FL_Down, true) ) + Fl_Tree_Item *i; + for (i =tree->first_visible_item(); i; i=tree->next_item(i, FL_Down, true) ) printf("Item: %s\n", i->label()); // Walk up the tree showing open(), visible items - for ( Fl_Tree_Item *i=tree->last_visible_item(); i; i=tree->next_item(i, FL_Up, true) ) + for (i =tree->last_visible_item(); i; i=tree->next_item(i, FL_Up, true) ) printf("Item: %s\n", i->label()); // Walk down the tree showing all items (open or closed) - for ( Fl_Tree_Item *i=tree->first(); i; i=tree->next_item(i, FL_Down, false) ) + for (i =tree->first(); i; i=tree->next_item(i, FL_Down, false) ) printf("Item: %s\n", i->label()); // Walk up the tree showing all items (open or closed) - for ( Fl_Tree_Item *i=tree->last(); i; i=tree->next_item(i, FL_Up, false) ) + for (i =tree->last(); i; i=tree->next_item(i, FL_Up, false) ) printf("Item: %s\n", i->label()); : \endcode @@ -1365,11 +1376,12 @@ Fl_Tree_Item *Fl_Tree::next_item(Fl_Tree_Item *item, int dir, bool visible) { \code : // Walk down the tree (forwards) - for ( Fl_Tree_Item *i=tree->first_selected_item(); i; i=tree->next_selected_item(i, FL_Down) ) + Fl_Tree_Item *i; + for (i =tree->first_selected_item(); i; i=tree->next_selected_item(i, FL_Down) ) printf("Item: %s\n", i->label()); // Walk up the tree (backwards) - for ( Fl_Tree_Item *i=tree->last_selected_item(); i; i=tree->next_selected_item(i, FL_Up) ) + for (i =tree->last_selected_item(); i; i=tree->next_selected_item(i, FL_Up) ) printf("Item: %s\n", i->label()); : \endcode @@ -1419,7 +1431,8 @@ Fl_Tree_Item *Fl_Tree::next_selected_item(Fl_Tree_Item *item, int dir) { Fl_Tree_Item_Array items; tree->get_selected_items(items); // Manipulate the returned array - for ( int t=0; t<items.total(); t++ ) { + int t; + for (t =0; t<items.total(); t++ ) { Fl_Tree_Item &item = items[t]; ..do stuff with each selected item.. } @@ -1432,7 +1445,8 @@ Fl_Tree_Item *Fl_Tree::next_selected_item(Fl_Tree_Item *item, int dir) { */ int Fl_Tree::get_selected_items(Fl_Tree_Item_Array &ret_items) { ret_items.clear(); - for ( Fl_Tree_Item *i=first_selected_item(); i; i=next_selected_item(i) ) { + Fl_Tree_Item *i; + for (i =first_selected_item(); i; i=next_selected_item(i) ) { ret_items.add(i); } return ret_items.total(); @@ -1821,7 +1835,8 @@ int Fl_Tree::deselect_all(Fl_Tree_Item *item, int docallback) { if ( deselect(item, docallback) ) ++count; // Deselect its children - for ( int t=0; t<item->children(); t++ ) { + int t; + for (t =0; t<item->children(); t++ ) { count += deselect_all(item->child(t), docallback); // recurse } return(count); @@ -1852,7 +1867,8 @@ int Fl_Tree::select_only(Fl_Tree_Item *selitem, int docallback) { // Deselect everything first. // Prevents callbacks from seeing more than one item selected. // - for ( Fl_Tree_Item *item = first(); item; item = item->next() ) { + Fl_Tree_Item *item; + for (item = first(); item; item = item->next() ) { if ( item == selitem ) continue; // don't do anything to selitem yet.. if ( item->is_selected() ) { deselect(item, docallback); @@ -1898,7 +1914,8 @@ int Fl_Tree::select_all(Fl_Tree_Item *item, int docallback) { if ( select(item, docallback) ) ++count; // Select its children - for ( int t=0; t<item->children(); t++ ) { + int t; + for (t =0; t<item->children(); t++ ) { count += select_all(item->child(t), docallback); // recurse } return(count); @@ -2490,7 +2507,8 @@ void Fl_Tree::hposition(int pos) { \par \code : - for ( int i=0; i<tree->children(); i++ ) { // walk children + int i; + for (i =0; i<tree->children(); i++ ) { // walk children Fl_Widget *w = tree->child(i); if ( tree->is_scrollbar(w) ) continue; // skip scrollbars ..do work here.. diff --git a/src/Fl_Tree_Item.cxx b/src/Fl_Tree_Item.cxx index 5157ea04a..3e07cab72 100644 --- a/src/Fl_Tree_Item.cxx +++ b/src/Fl_Tree_Item.cxx @@ -145,7 +145,8 @@ void Fl_Tree_Item::show_self(const char *indent) const { char *i2 = new char [strlen(indent)+3]; // 2 + nul byte strcpy(i2, indent); strcat(i2, " |"); - for ( int t=0; t<children(); t++ ) { + int t; + for (t =0; t<children(); t++ ) { child(t)->show_self(i2); } delete[] i2; @@ -186,7 +187,8 @@ void Fl_Tree_Item::clear_children() { /// int Fl_Tree_Item::find_child(const char *name) { if ( name ) { - for ( int t=0; t<children(); t++ ) + int t; + for (t =0; t<children(); t++ ) if ( child(t)->label() ) if ( strcmp(child(t)->label(), name) == 0 ) return(t); @@ -201,11 +203,13 @@ int Fl_Tree_Item::find_child(const char *name) { /// \version 1.3.3 /// const Fl_Tree_Item* Fl_Tree_Item::find_child_item(const char *name) const { - if ( name ) - for ( int t=0; t<children(); t++ ) + if ( name ) { + int t; + for (t =0; t<children(); t++ ) if ( child(t)->label() ) if ( strcmp(child(t)->label(), name) == 0 ) return(child(t)); + } return(0); } @@ -224,7 +228,8 @@ Fl_Tree_Item* Fl_Tree_Item::find_child_item(const char *name) { /// \version 1.3.0 release /// const Fl_Tree_Item *Fl_Tree_Item::find_child_item(char **arr) const { - for ( int t=0; t<children(); t++ ) { + int t; + for (t =0; t<children(); t++ ) { if ( child(t)->label() ) { if ( strcmp(child(t)->label(), *arr) == 0 ) { // match? if ( *(arr+1) ) { // more in arr? descend @@ -276,7 +281,8 @@ Fl_Tree_Item *Fl_Tree_Item::find_item(char **names) { /// \returns the index, or -1 if not found. /// int Fl_Tree_Item::find_child(Fl_Tree_Item *item) { - for ( int t=0; t<children(); t++ ) + int t; + for (t =0; t<children(); t++ ) if ( item == child(t) ) return(t); return(-1); @@ -309,13 +315,14 @@ Fl_Tree_Item *Fl_Tree_Item::add(const Fl_Tree_Prefs &prefs, { item = new Fl_Tree_Item(_tree); item->label(new_label); } recalc_tree(); // may change tree geometry item->_parent = this; + int t; switch ( prefs.sortorder() ) { case FL_TREE_SORT_NONE: { _children.add(item); return(item); } case FL_TREE_SORT_ASCENDING: { - for ( int t=0; t<_children.total(); t++ ) { + for (t =0; t<_children.total(); t++ ) { Fl_Tree_Item *c = _children[t]; if ( c->label() && strcmp(c->label(), new_label) > 0 ) { _children.insert(t, item); @@ -326,7 +333,7 @@ Fl_Tree_Item *Fl_Tree_Item::add(const Fl_Tree_Prefs &prefs, return(item); } case FL_TREE_SORT_DESCENDING: { - for ( int t=0; t<_children.total(); t++ ) { + for (t =0; t<_children.total(); t++ ) { Fl_Tree_Item *c = _children[t]; if ( c->label() && strcmp(c->label(), new_label) < 0 ) { _children.insert(t, item); @@ -417,7 +424,8 @@ Fl_Tree_Item *Fl_Tree_Item::insert_above(const Fl_Tree_Prefs &prefs, const char Fl_Tree_Item *p = _parent; if ( ! p ) return(0); // Walk our parent's children to find ourself - for ( int t=0; t<p->children(); t++ ) { + int t; + for (t =0; t<p->children(); t++ ) { Fl_Tree_Item *c = p->child(t); if ( this == c ) { return(p->insert(prefs, new_label, t)); @@ -642,7 +650,8 @@ Fl_Tree_Item *Fl_Tree_Item::replace_child(Fl_Tree_Item *olditem, /// \returns 0 if removed, -1 if item not an immediate child. /// int Fl_Tree_Item::remove_child(Fl_Tree_Item *item) { - for ( int t=0; t<children(); t++ ) { + int t; + for (t =0; t<children(); t++ ) { if ( child(t) == item ) { item->clear_children(); _children.remove(t); @@ -661,7 +670,8 @@ int Fl_Tree_Item::remove_child(Fl_Tree_Item *item) { /// \version 1.3.3 /// int Fl_Tree_Item::remove_child(const char *name) { - for ( int t=0; t<children(); t++ ) { + int t; + for (t =0; t<children(); t++ ) { if ( child(t)->label() ) { if ( strcmp(child(t)->label(), name) == 0 ) { _children.remove(t); @@ -697,7 +707,8 @@ void Fl_Tree_Item::swap_children(int ax, int bx) { /// int Fl_Tree_Item::swap_children(Fl_Tree_Item *a, Fl_Tree_Item *b) { int ax = -1, bx = -1; - for ( int t=0; t<children(); t++ ) { // find index for a and b + int t; + for (t =0; t<children(); t++ ) { // find index for a and b if ( _children[t] == a ) { ax = t; if ( bx != -1 ) break; else continue; } if ( _children[t] == b ) { bx = t; if ( ax != -1 ) break; else continue; } } @@ -722,7 +733,8 @@ void Fl_Tree_Item::draw_horizontal_connector(int x1, int x2, int y, const Fl_Tre case FL_TREE_CONNECTOR_DOTTED: { x1 |= 1; // force alignment w/dot pattern - for ( int xx=x1; xx<=x2; xx+=2 ) { + int xx; + for (xx =x1; xx<=x2; xx+=2 ) { fl_point(xx, y); } return; @@ -751,7 +763,8 @@ void Fl_Tree_Item::draw_vertical_connector(int x, int y1, int y2, const Fl_Tree_ { y1 |= 1; // force alignment w/dot pattern y2 |= 1; // force alignment w/dot pattern - for ( int yy=y1; yy<=y2; yy+=2 ) { + int yy; + for (yy =y1; yy<=y2; yy+=2 ) { fl_point(x, yy); } return; @@ -787,7 +800,8 @@ const Fl_Tree_Item *Fl_Tree_Item::find_clicked(const Fl_Tree_Prefs &prefs, int y } } if ( is_open() ) { // open? check children of this item - for ( int t=0; t<children(); t++ ) { + int t; + for (t =0; t<children(); t++ ) { const Fl_Tree_Item *item; if ( (item = _children[t]->find_clicked(prefs, yonly)) != NULL) // recurse into child for descendents return(item); // found? @@ -1140,7 +1154,8 @@ void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Tree_Item *itemfocus, : X; // unless didn't drawthis int child_w = W - (child_x-X); int child_y_start = Y; - for ( int t=0; t<children(); t++ ) { + int t; + for (t =0; t<children(); t++ ) { int is_lastchild = ((t+1)==children()) ? 1 : 0; _children[t]->draw(child_x, Y, child_w, itemfocus, tree_item_xmax, is_lastchild, render); } @@ -1238,7 +1253,8 @@ int Fl_Tree_Item::event_on_label(const Fl_Tree_Prefs &prefs) const { void Fl_Tree_Item::show_widgets() { if ( _widget ) _widget->show(); if ( is_open() ) { - for ( int t=0; t<_children.total(); t++ ) { + int t; + for (t =0; t<_children.total(); t++ ) { _children[t]->show_widgets(); } } @@ -1249,7 +1265,8 @@ void Fl_Tree_Item::show_widgets() { /// void Fl_Tree_Item::hide_widgets() { if ( _widget ) _widget->hide(); - for ( int t=0; t<_children.total(); t++ ) { + int t; + for (t =0; t<_children.total(); t++ ) { _children[t]->hide_widgets(); } } @@ -1258,7 +1275,8 @@ void Fl_Tree_Item::hide_widgets() { void Fl_Tree_Item::open() { set_flag(OPEN,1); // Tell children to show() their widgets - for ( int t=0; t<_children.total(); t++ ) { + int t; + for (t =0; t<_children.total(); t++ ) { _children[t]->show_widgets(); } recalc_tree(); // may change tree geometry @@ -1268,7 +1286,8 @@ void Fl_Tree_Item::open() { void Fl_Tree_Item::close() { set_flag(OPEN,0); // Tell children to hide() their widgets - for ( int t=0; t<_children.total(); t++ ) { + int t; + for (t =0; t<_children.total(); t++ ) { _children[t]->hide_widgets(); } recalc_tree(); // may change tree geometry @@ -1467,7 +1486,8 @@ Fl_Tree_Item *Fl_Tree_Item::prev_displayed(Fl_Tree_Prefs &prefs) { /// int Fl_Tree_Item::is_visible_r() const { if ( !visible() ) return(0); - for (const Fl_Tree_Item *p=parent(); p; p=p->parent())// move up through parents + const Fl_Tree_Item *p; + for (p =parent(); p; p=p->parent())// move up through parents if (!p->visible() || p->is_close()) return(0); // any parent not visible or closed? return(1); } diff --git a/src/Fl_Tree_Item_Array.cxx b/src/Fl_Tree_Item_Array.cxx index dca358288..9186baff9 100644 --- a/src/Fl_Tree_Item_Array.cxx +++ b/src/Fl_Tree_Item_Array.cxx @@ -50,7 +50,8 @@ Fl_Tree_Item_Array::Fl_Tree_Item_Array(const Fl_Tree_Item_Array* o) { _size = o->_size; _chunksize = o->_chunksize; _flags = o->_flags; - for ( int t=0; t<o->_total; t++ ) { + int t; + for (t =0; t<o->_total; t++ ) { if ( _flags & MANAGE_ITEM ) { _items[t] = new Fl_Tree_Item(o->_items[t]); // make new copy of item ++_total; @@ -69,7 +70,8 @@ Fl_Tree_Item_Array::Fl_Tree_Item_Array(const Fl_Tree_Item_Array* o) { /// void Fl_Tree_Item_Array::clear() { if ( _items ) { - for ( int t=0; t<_total; t++ ) { + int t; + for (t =0; t<_total; t++ ) { if ( _flags & MANAGE_ITEM ) { delete _items[t]; @@ -169,7 +171,8 @@ void Fl_Tree_Item_Array::remove(int index) { } _items[index] = 0; _total--; - for ( int i=index; i<_total; i++ ) { // reshuffle the array + int i; + for (i =index; i<_total; i++ ) { // reshuffle the array _items[i] = _items[i+1]; } if ( _flags & MANAGE_ITEM ) @@ -188,7 +191,8 @@ void Fl_Tree_Item_Array::remove(int index) { /// \returns 0 if removed, or -1 if the item was not in the array. /// int Fl_Tree_Item_Array::remove(Fl_Tree_Item *item) { - for ( int t=0; t<_total; t++ ) { + int t; + for (t =0; t<_total; t++ ) { if ( item == _items[t] ) { remove(t); return(0); @@ -223,16 +227,19 @@ int Fl_Tree_Item_Array::move(int to, int from) { if ( to<0 || to>=_total || from<0 || from>=_total ) return -1; Fl_Tree_Item *item = _items[from]; // Remove item.. - if ( from < to ) - for ( int t=from; t<to && t<(_total+1); t++ ) + int t; + if ( from < to ) { + for (t =from; t<to && t<(_total+1); t++ ) _items[t] = _items[t+1]; - else - for ( int t=from; t>to && t>0; t-- ) + } else { + for (t =from; t>to && t>0; t-- ) _items[t] = _items[t-1]; + } // Move to new position _items[to] = item; // Update all children - for ( int r=0; r<_total; r++ ) // XXX: excessive to do all children, + int r; + for (r =0; r<_total; r++ ) // XXX: excessive to do all children, _items[r]->update_prev_next(r); // XXX: but avoids weird boundary issues return 0; } @@ -252,7 +259,8 @@ int Fl_Tree_Item_Array::deparent(int pos) { Fl_Tree_Item *next = item->next_sibling(); // Remove from parent's list of children _total -= 1; - for ( int t=pos; t<_total; t++ ) + int t; + for (t =pos; t<_total; t++ ) _items[t] = _items[t+1]; // delete, no destroy // Now an orphan: remove association with old parent and siblings item->update_prev_next(-1); // become an orphan @@ -272,7 +280,8 @@ int Fl_Tree_Item_Array::reparent(Fl_Tree_Item *item, Fl_Tree_Item* newparent, in // Add item to new parent enlarge(1); _total += 1; - for ( int t=_total-1; t>pos; --t ) // shuffle array to make room for new entry + int t; + for (t =_total-1; t>pos; --t ) // shuffle array to make room for new entry _items[t] = _items[t-1]; _items[pos] = item; // insert new entry // Attach to new parent and siblings diff --git a/src/Fl_Widget.cxx b/src/Fl_Widget.cxx index 4eee6ef39..aba540802 100644 --- a/src/Fl_Widget.cxx +++ b/src/Fl_Widget.cxx @@ -334,7 +334,8 @@ void Fl_Widget::deactivate() { } int Fl_Widget::active_r() const { - for (const Fl_Widget* o = this; o; o = o->parent()) + const Fl_Widget *o; + for (o = this; o; o = o->parent()) if (!o->active()) return 0; return 1; } @@ -354,7 +355,8 @@ void Fl_Widget::show() { void Fl_Widget::hide() { if (visible_r()) { set_flag(INVISIBLE); - for (Fl_Widget *p = parent(); p; p = p->parent()) + Fl_Widget *p; + for (p = parent(); p; p = p->parent()) if (p->box() || !p->parent()) {p->redraw(); break;} handle(FL_HIDE); fl_throw_focus(this); @@ -364,7 +366,8 @@ void Fl_Widget::hide() { } int Fl_Widget::visible_r() const { - for (const Fl_Widget* o = this; o; o = o->parent()) + const Fl_Widget *o; + for (o = this; o; o = o->parent()) if (!o->visible()) return 0; return 1; } diff --git a/src/Fl_Widget_Surface.cxx b/src/Fl_Widget_Surface.cxx index 98cc736ad..4d9912a65 100644 --- a/src/Fl_Widget_Surface.cxx +++ b/src/Fl_Widget_Surface.cxx @@ -95,7 +95,8 @@ void Fl_Widget_Surface::traverse(Fl_Widget *widget) Fl_Group *g = widget->as_group(); if (!g) return; int n = g->children(); - for (int i = 0; i < n; i++) { + int i; + for (i = 0; i < n; i++) { Fl_Widget *c = g->child(i); if ( !c->visible() ) continue; if ( c->as_window() ) { diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx index e60a68eaa..b777463ac 100644 --- a/src/Fl_Window.cxx +++ b/src/Fl_Window.cxx @@ -105,7 +105,8 @@ Fl_Window::~Fl_Window() { \see top_window() */ Fl_Window *Fl_Widget::window() const { - for (Fl_Widget *o = parent(); o; o = o->parent()) + Fl_Widget *o; + for (o = parent(); o; o = o->parent()) if (o->type() >= FL_WINDOW) return (Fl_Window*)o; return 0; } diff --git a/src/Fl_Window_Driver.cxx b/src/Fl_Window_Driver.cxx index 5c4095104..a31c85d07 100644 --- a/src/Fl_Window_Driver.cxx +++ b/src/Fl_Window_Driver.cxx @@ -140,7 +140,8 @@ int Fl_Window_Driver::hide_common() { pWindow->flx_ = 0; // recursively remove any subwindows: - for (Fl_X *wi = Fl_X::first; wi;) { + Fl_X *wi; + for (wi = Fl_X::first; wi;) { Fl_Window* W = wi->w; if (W->window() == pWindow) { W->hide(); @@ -271,7 +272,8 @@ fl_uintptr_t Fl_Window_Driver::xid(const Fl_Window *win) { \version 1.4.0 */ Fl_Window *Fl_Window_Driver::find(fl_uintptr_t xid) { Fl_X *window; - for (Fl_X **pp = &Fl_X::first; (window = *pp); pp = &window->next) { + Fl_X **pp; + for (pp = &Fl_X::first; (window = *pp); pp = &window->next) { if (window->xid == xid) { if (window != Fl_X::first && !Fl::modal()) { // make this window be first to speed up searches diff --git a/src/Fl_XPM_Image.cxx b/src/Fl_XPM_Image.cxx index 438aa544f..d60f8fd1a 100644 --- a/src/Fl_XPM_Image.cxx +++ b/src/Fl_XPM_Image.cxx @@ -67,6 +67,7 @@ Fl_XPM_Image::Fl_XPM_Image(const char *name) : Fl_Pixmap((char *const*)0) { char *myp = buffer; char *q = buffer+1; while (*q != '\"' && myp < buffer+MAXSIZE) { + int x; if (*q == '\\') switch (*++q) { case '\r': case '\n': @@ -76,7 +77,7 @@ Fl_XPM_Image::Fl_XPM_Image(const char *name) : Fl_Pixmap((char *const*)0) { case 'x': { q++; int n = 0; - for (int x = 0; x < 2; x++) { + for (x = 0; x < 2; x++) { int xd = hexdigit(*q); if (xd > 15) break; n = (n<<4)+xd; @@ -88,7 +89,7 @@ Fl_XPM_Image::Fl_XPM_Image(const char *name) : Fl_Pixmap((char *const*)0) { int c = *q++; if (c>='0' && c<='7') { c -= '0'; - for (int x=0; x<2; x++) { + for (x =0; x<2; x++) { int xd = hexdigit(*q); if (xd>7) break; c = (c<<3)+xd; diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx index 9264ab214..04abde77f 100644 --- a/src/Fl_get_system_colors.cxx +++ b/src/Fl_get_system_colors.cxx @@ -49,7 +49,8 @@ void Fl::background(uchar r, uchar g, uchar b) { double powg = log(g/255.0)/log((FL_GRAY-FL_GRAY_RAMP)/(FL_NUM_GRAY-1.0)); if (!b) b = 1; else if (b==255) b = 254; double powb = log(b/255.0)/log((FL_GRAY-FL_GRAY_RAMP)/(FL_NUM_GRAY-1.0)); - for (int i = 0; i < FL_NUM_GRAY; i++) { + int i; + for (i = 0; i < FL_NUM_GRAY; i++) { double gray = i/(FL_NUM_GRAY-1.0); Fl::set_color(fl_gray_ramp(i), uchar(pow(gray,powr)*255+.5), diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 373378e9b..b95c74a5b 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -1217,7 +1217,8 @@ static void react_to_screen_reconfiguration() { int old_count = Fl::screen_count(); int (*sizes)[4] = new int[old_count][4]; float *scales = new float[old_count]; - for (int screen = 0; screen < old_count; screen++) { + int screen; + for (screen = 0; screen < old_count; screen++) { Fl::screen_xywh(sizes[screen][0], sizes[screen][1], sizes[screen][2], sizes[screen][3], screen); scales[screen] = Fl::screen_scale(screen); } @@ -1227,7 +1228,7 @@ static void react_to_screen_reconfiguration() { // detect whether screen sizes were unchanged bool nochange = (old_count == Fl::screen_count()); if (nochange) { - for (int screen = 0; screen < old_count; screen++) { + for (screen = 0; screen < old_count; screen++) { int X,Y,W,H; Fl::screen_xywh(X,Y,W,H, screen); X /= scales[screen]; @@ -1243,12 +1244,12 @@ static void react_to_screen_reconfiguration() { delete[] sizes; if (nochange || (old_count == 1 && Fl::screen_count() == 1)) { // screen sizes did not change or single screen: re-use previous screen scale values - for (int screen = 0; screen < old_count; screen++) + for (screen = 0; screen < old_count; screen++) Fl::screen_driver()->scale(screen, scales[screen]); } else { Fl::screen_driver()->use_startup_scale_factor(); float new_scale = Fl::screen_driver()->scale(0); - for (int screen = 0; screen < Fl::screen_count(); screen++) { + for (screen = 0; screen < Fl::screen_count(); screen++) { Fl::screen_driver()->scale(screen, 1); Fl::screen_driver()->rescale_all_windows_from_screen(screen, new_scale, 1); } @@ -1269,7 +1270,8 @@ static void after_display_rescale(float *p_current_xft_dpi) { if (fabs(dpi - *p_current_xft_dpi) > 0.1) { *p_current_xft_dpi = dpi; float f = dpi / 96.; - for (int i = 0; i < Fl::screen_count(); i++) + int i; + for (i = 0; i < Fl::screen_count(); i++) Fl::screen_driver()->rescale_all_windows_from_screen(i, f, f); } } @@ -1291,7 +1293,8 @@ static void add_xid_vector(Window xid) { } static bool remove_xid_vector(Window xid) { - for (int pos = xid_vector_count - 1; pos >= 0; pos--) { + int pos; + for (pos = xid_vector_count - 1; pos >= 0; pos--) { if (xid_vector[pos] == xid) { if (pos != --xid_vector_count) xid_vector[pos] = xid_vector[xid_vector_count]; return true; @@ -1679,7 +1682,8 @@ int fl_handle(const XEvent& thisevent) } delete [] fl_dnd_source_types; fl_dnd_source_types = new Atom[count+1]; - for (unsigned i = 0; i < count; i++) { + unsigned i; + for (i = 0; i < count; i++) { fl_dnd_source_types[i] = ((Atom*)cm_buffer)[i]; } fl_dnd_source_types[count] = 0; @@ -2123,7 +2127,8 @@ int fl_handle(const XEvent& thisevent) unsigned long nitems; unsigned long *words = 0; if (0 == get_xwinprop(xid, fl_NET_WM_STATE, 64, &nitems, &words) ) { - for (unsigned long item = 0; item < nitems; item++) { + unsigned long item; + for (item = 0; item < nitems; item++) { if (words[item] == fl_NET_WM_STATE_FULLSCREEN) { fullscreen_state = 1; } @@ -2913,7 +2918,8 @@ static void icons_to_property(const Fl_RGB_Image *icons[], int count, unsigned long *data; sz = 0; - for (int i = 0;i < count;i++) + int i; + for (i = 0;i < count;i++) sz += 2 + icons[i]->data_w() * icons[i]->data_h(); // FIXME: Might want to sort the icons @@ -2921,7 +2927,7 @@ static void icons_to_property(const Fl_RGB_Image *icons[], int count, *property = data = new unsigned long[sz]; *len = sz; - for (int i = 0;i < count;i++) { + for (i = 0;i < count;i++) { const Fl_RGB_Image *image; image = icons[i]; @@ -2938,8 +2944,10 @@ static void icons_to_property(const Fl_RGB_Image *icons[], int count, const int extra_data = image->ld() ? (image->ld() - image->data_w() * image->d()) : 0; const uchar *in = (const uchar*)*image->data(); - for (int y = 0; y < image->data_h(); y++) { - for (int x = 0; x < image->data_w(); x++) { + int y; + for (y = 0; y < image->data_h(); y++) { + int x; + for (x = 0; x < image->data_w(); x++) { switch (image->d()) { case 1: *data = ( 0xff<<24) | (in[0]<<16) | (in[0]<<8) | in[0]; @@ -3151,8 +3159,10 @@ int Fl_X11_Window_Driver::set_cursor(const Fl_RGB_Image *image, int hotx, int ho const int extra_data = image->ld() ? (image->ld()-image->w()*image->d()) : 0; const uchar *i = (const uchar*)*image->data(); XcursorPixel *o = cursor->pixels; - for (int y = 0;y < image->h();y++) { - for (int x = 0;x < image->w();x++) { + int y; + for (y = 0;y < image->h();y++) { + int x; + for (x = 0;x < image->w();x++) { uchar r, g, b, a; switch (image->d()) { case 1: diff --git a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx index 6483dc30b..62f89c38c 100644 --- a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx +++ b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx @@ -530,7 +530,8 @@ void Fl_Cairo_Graphics_Driver::pie(int x, int y, int w, int h, double a1, double } void Fl_Cairo_Graphics_Driver::end_points() { - for (int i = 0; i < n; i++) { + int i; + for (i = 0; i < n; i++) { point(xpoint[i].x, xpoint[i].y); } } @@ -649,7 +650,8 @@ void Fl_Cairo_Graphics_Driver::check_status(void) { void Fl_Cairo_Graphics_Driver::draw_image(Fl_Draw_Image_Cb call, void *data, int ix, int iy, int iw, int ih, int D) { uchar *array = new uchar[iw * D * ih]; - for (int l = 0; l < ih; l++) { + int l; + for (l = 0; l < ih; l++) { call(data, 0, l, iw, array + l*D*iw); if (D%2 == 0) for (int i = 0; i < iw; i++) { *(array + l*D*iw + i*D + D-1) = 0xff; @@ -850,11 +852,12 @@ void Fl_Cairo_Graphics_Driver::cache(Fl_RGB_Image *rgb) { uchar A = 0xff, R,G,B, *q; const uchar *r; float f = 1; + int i, j; if (rgb->d() >= 3) { // color images - for (int j = 0; j < rgb->data_h(); j++) { + for (j = 0; j < rgb->data_h(); j++) { r = rgb->array + j * lrgb; q = BGRA + j * stride; - for (int i = 0; i < rgb->data_w(); i++) { + for (i = 0; i < rgb->data_w(); i++) { R = *r; G = *(r+1); B = *(r+2); @@ -868,10 +871,10 @@ void Fl_Cairo_Graphics_Driver::cache(Fl_RGB_Image *rgb) { } } } else if (rgb->d() == 1 || rgb->d() == 2) { // B&W - for (int j = 0; j < rgb->data_h(); j++) { + for (j = 0; j < rgb->data_h(); j++) { r = rgb->array + j * lrgb; q = BGRA + j * stride; - for (int i = 0; i < rgb->data_w(); i++) { + for (i = 0; i < rgb->data_w(); i++) { G = *r; if (rgb->d() == 2) { A = *(r+1); @@ -939,13 +942,15 @@ cairo_pattern_t *Fl_Cairo_Graphics_Driver::bitmap_to_pattern(Fl_Bitmap *bm, int w_bitmap = ((bm->data_w() + 7) / 8); uchar *BGRA = new uchar[stride * bm->data_h()]; memset(BGRA, 0, stride * bm->data_h()); - for (int j = 0; j < bm->data_h(); j++) { + int j; + for (j = 0; j < bm->data_h(); j++) { uchar *r = (uchar *)bm->array + j * w_bitmap; uint32_t *q = (uint32_t *)(BGRA + j * stride); int k = 0; uint32_t mask32; uchar p; - for (int i = 0; i < bm->data_w(); i++) { + int i; + for (i = 0; i < bm->data_w(); i++) { if (k == 0) { #if WORDS_BIGENDIAN mask32 = (uint32_t)(1 << 31); @@ -1116,13 +1121,15 @@ Fl_Font Fl_Cairo_Graphics_Driver::set_fonts(const char* /*pattern_name*/) static PangoFontMap *pfmap_ = pango_cairo_font_map_get_default(); // 1.10 Fl_Cairo_Graphics_Driver::init_built_in_fonts(); pango_font_map_list_families(pfmap_, &families, &n_families); - for (int fam = 0; fam < n_families; fam++) { + int fam; + for (fam = 0; fam < n_families; fam++) { PangoFontFace **faces; int n_faces; const char *fam_name = pango_font_family_get_name (families[fam]); int lfam = strlen(fam_name); pango_font_family_list_faces(families[fam], &faces, &n_faces); - for (int j = 0; j < n_faces; j++) { + int j; + for (j = 0; j < n_faces; j++) { const char *p = pango_font_face_get_face_name(faces[j]); // Remove " Regular" suffix from font names if (!strcasecmp(p, "regular")) p = NULL; @@ -1156,7 +1163,8 @@ void Fl_Cairo_Graphics_Driver::font_name(int num, const char *name) { Fl_Fontdesc *s = fl_fonts + num; if (s->name) { if (!strcmp(s->name, name)) {s->name = name; return;} - for (Fl_Font_Descriptor* f = s->first; f;) { + Fl_Font_Descriptor *f; + for (f = s->first; f;) { Fl_Font_Descriptor* n = f->next; delete f; f = n; } s->first = 0; @@ -1242,7 +1250,8 @@ Fl_Cairo_Font_Descriptor::Fl_Cairo_Font_Descriptor(const char* name, Fl_Fontsize Fl_Cairo_Font_Descriptor::~Fl_Cairo_Font_Descriptor() { pango_font_description_free(fontref); if (width) { - for (int i = 0; i < 64; i++) delete[] width[i]; + int i; + for (i = 0; i < 64; i++) delete[] width[i]; } delete[] width; } @@ -1378,7 +1387,8 @@ double Fl_Cairo_Graphics_Driver::width(unsigned int utf32) { } if (!desc->width[r]) { desc->width[r] = (int*)new int[0x0400]; - for (int i = 0; i < 0x0400; i++) desc->width[r][i] = -1; + int i; + for (i = 0; i < 0x0400; i++) desc->width[r][i] = -1; } else { if ( desc->width[r][utf32&0x03FF] >= 0 ) { // already cached return desc->width[r][utf32 & 0x03FF] / double(PANGO_SCALE); @@ -1465,7 +1475,8 @@ void Fl_Cairo_Graphics_Driver::restore_clip() { } int count = cairo_region_num_rectangles(r); // 1.10 cairo_rectangle_int_t rect; - for (int i = 0; i < count; i++) { + int i; + for (i = 0; i < count; i++) { cairo_region_get_rectangle(r, i, &rect); // 1.10 cairo_rectangle(cairo_, rect.x - 0.5, rect.y - 0.5, rect.width, rect.height); } diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx index 73b216f01..0204f633e 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx @@ -40,7 +40,8 @@ void Fl_OpenGL_Graphics_Driver::arc(int x,int y,int w,int h,double a1,double a2) double incr = (a2-a1)/(double)nSeg; glBegin(GL_LINE_STRIP); - for (int i=0; i<=nSeg; i++) { + int i; + for (i =0; i<=nSeg; i++) { glVertex2d(cx+cos(a1)*rx, cy-sin(a1)*ry); a1 += incr; } @@ -63,7 +64,8 @@ void Fl_OpenGL_Graphics_Driver::pie(int x,int y,int w,int h,double a1,double a2) glBegin(GL_TRIANGLE_FAN); glVertex2d(cx, cy); - for (int i=0; i<=nSeg; i++) { + int i; + for (i =0; i<=nSeg; i++) { glVertex2d(cx+cos(a1)*rx, cy-sin(a1)*ry); a1 += incr; } diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx index 461e045bb..92de4c561 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx @@ -261,7 +261,8 @@ void Fl_OpenGL_Graphics_Driver::circle(double cx, double cy, double r) { double y = 0; glBegin(GL_LINE_LOOP); - for(int ii = 0; ii < num_segments; ii++) { + int ii; + for (ii = 0; ii < num_segments; ii++) { vertex(x + cx, y + cy); // output vertex double tx = -y; double ty = x; diff --git a/src/drivers/PostScript/Fl_PostScript.cxx b/src/drivers/PostScript/Fl_PostScript.cxx index 9cece371d..35afe46f6 100644 --- a/src/drivers/PostScript/Fl_PostScript.cxx +++ b/src/drivers/PostScript/Fl_PostScript.cxx @@ -1107,7 +1107,8 @@ static uchar *calc_mask(uchar *img, int w, int h, Fl_Color bg) while (h-- > 0) { // for each row bit = 0x80; // byte with last bit set byte = 0; // next mask byte to compute - for (int j = 0; j < w; j++) { // for each column + int j; + for (j = 0; j < w; j++) { // for each column r = *img++; // the pixel color components g = *img++; b = *img++; @@ -1168,9 +1169,11 @@ void Fl_PostScript_Graphics_Driver::transformed_draw_extra(const char* str, int uchar *di; int wmask = (w2+7)/8; void *rle85 = prepare_rle85(); - for (int j = h - 1; j >= 0; j--){ + int j; + for (j = h - 1; j >= 0; j--){ di = img_mask + j * wmask; - for (int i = 0; i < wmask; i++){ + int i; + for (i = 0; i < wmask; i++){ write_rle85(*di, rle85); di++; } @@ -1628,7 +1631,8 @@ static int update_format_layout(int rank, Fl_Paged_Device::Page_Layout layout, modal->begin(); Fl_Choice *psize = new Fl_Choice(140, 10, 110, 30, Fl_PDF_File_Surface::format_dialog_page_size); psize->when(FL_WHEN_CHANGED); - for (int i = 0; i < size_count; i++) { + int i; + for (i = 0; i < size_count; i++) { psize->add(Fl_Paged_Device::page_formats[menu_to_size[i]].name); } psize->value(rank); @@ -1682,7 +1686,8 @@ int Fl_PDF_Pango_File_Surface::begin_job(const char *defaultname, char **perr_me char *pref_format; print_prefs.get("PDF/page_size", pref_format, "A4"); int rank = 1; // corresponds to A4 - for (int i = 0; i < size_count; i++) { + int i; + for (i = 0; i < size_count; i++) { if (strcmp(pref_format, Fl_Paged_Device::page_formats[menu_to_size[i]].name) == 0) { rank = i; break; diff --git a/src/drivers/PostScript/Fl_PostScript_image.cxx b/src/drivers/PostScript/Fl_PostScript_image.cxx index ebb91cf03..26eb31a89 100644 --- a/src/drivers/PostScript/Fl_PostScript_image.cxx +++ b/src/drivers/PostScript/Fl_PostScript_image.cxx @@ -100,6 +100,7 @@ void Fl_PostScript_Graphics_Driver::draw_rgb_bitmap_(Fl_Image *img,int XP, int Y int stride = cairo_format_stride_for_width(format, img->data_w()); uchar *BGRA = new uchar[stride * img->data_h()]; memset(BGRA, 0, stride * img->data_h()); + int i, j; if (img->d() >= 1) { // process Fl_RGB_Image of all depths Fl_RGB_Image *rgb = (Fl_RGB_Image*)img; int lrgb = rgb->ld() ? rgb->ld() : rgb->data_w() * rgb->d(); @@ -107,10 +108,10 @@ void Fl_PostScript_Graphics_Driver::draw_rgb_bitmap_(Fl_Image *img,int XP, int Y const uchar *r; float f = 1; if (rgb->d() >= 3) { // color images - for (int j = 0; j < rgb->data_h(); j++) { + for (j = 0; j < rgb->data_h(); j++) { r = rgb->array + j * lrgb; q = BGRA + j * stride; - for (int i = 0; i < rgb->data_w(); i++) { + for (i = 0; i < rgb->data_w(); i++) { R = *r; G = *(r+1); B = *(r+2); @@ -126,10 +127,10 @@ void Fl_PostScript_Graphics_Driver::draw_rgb_bitmap_(Fl_Image *img,int XP, int Y } } } else if (rgb->d() == 1 || rgb->d() == 2) { // B&W - for (int j = 0; j < rgb->data_h(); j++) { + for (j = 0; j < rgb->data_h(); j++) { r = rgb->array + j * lrgb; q = BGRA + j * stride; - for (int i = 0; i < rgb->data_w(); i++) { + for (i = 0; i < rgb->data_w(); i++) { G = *r; if (rgb->d() == 2) { A = *(r+1); @@ -147,12 +148,12 @@ void Fl_PostScript_Graphics_Driver::draw_rgb_bitmap_(Fl_Image *img,int XP, int Y Fl_Bitmap *bm = (Fl_Bitmap*)img; uchar *r, p; unsigned *q; - for (int j = 0; j < bm->data_h(); j++) { + for (j = 0; j < bm->data_h(); j++) { r = (uchar*)bm->array + j * ((bm->data_w() + 7)/8); q = (unsigned*)(BGRA + j * stride); unsigned k = 0, mask32 = 1; p = *r; - for (int i = 0; i < bm->data_w(); i++) { + for (i = 0; i < bm->data_w(); i++) { if (p&1) (*q) |= mask32; k++; if (k % 8 != 0) p >>= 1; else p = *(++r); diff --git a/src/drivers/SVG/Fl_SVG_File_Surface.cxx b/src/drivers/SVG/Fl_SVG_File_Surface.cxx index 2a1439f74..5109dc9b4 100644 --- a/src/drivers/SVG/Fl_SVG_File_Surface.cxx +++ b/src/drivers/SVG/Fl_SVG_File_Surface.cxx @@ -232,7 +232,8 @@ void Fl_SVG_Graphics_Driver::compute_dasharray(float s, char *dashes) { if (dasharray_) free(dasharray_); int array_len = int(10*strlen(dashes) + 1); dasharray_ = (char*)calloc(array_len, 1); - for (char *p = dashes; *p; p++) { + char *p; + for (p = dashes; *p; p++) { int c = snprintf(dasharray_+strlen(dasharray_), array_len, "%.3f,", (*p)/s); array_len -= c; } @@ -283,7 +284,8 @@ void Fl_SVG_Graphics_Driver::draw(const char *str, int n, int x, int y) { fprintf(out_, "<text x=\"%d\" y=\"%d\" font-family=\"%s\"%s%s font-size=\"%d\" " "xml:space=\"preserve\" " " fill=\"rgb(%u,%u,%u)\" textLength=\"%d\">", x, y, family_, bold_, style_, size(), red_, green_, blue_, (int)width(str, n)); - for (int i = 0; i < n; i++) { + int i; + for (i = 0; i < n; i++) { if (str[i] == '&') fputs("&", out_); else if (str[i] == '<') fputs("<", out_); else if (str[i] == '>') fputs(">", out_); @@ -526,7 +528,8 @@ void Fl_SVG_Graphics_Driver::define_rgb_png(Fl_RGB_Image *rgb, const char *name, png_set_IHDR(png_ptr, info_ptr, rgb->data_w(), rgb->data_h(), 8, color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); const uchar **row_pointers = new const uchar*[rgb->data_h()]; int ld = rgb->ld() ? rgb->ld() : rgb->d() * rgb->data_w(); - for (int i=0; i < rgb->data_h(); i++) row_pointers[i] = (rgb->array + i*ld); + int i; + for (i =0; i < rgb->data_h(); i++) row_pointers[i] = (rgb->array + i*ld); png_set_rows(png_ptr, info_ptr, (png_bytepp)row_pointers); png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL); png_write_end(png_ptr, NULL); @@ -683,12 +686,15 @@ void Fl_SVG_Graphics_Driver::draw_bitmap(Fl_Bitmap *bm, int XP, int YP, int WP, Fl_RGB_Image *rgb = new Fl_RGB_Image(data, bm->data_w(), bm->data_h(), 4); rgb->alloc_array = 1; int rowBytes = (bm->data_w()+7)>>3 ; - for (int j = 0; j < bm->data_h(); j++) { + int j; + for (j = 0; j < bm->data_h(); j++) { const uchar *p = bm->array + j*rowBytes; - for (int i = 0; i < rowBytes; i++) { + int i; + for (i = 0; i < rowBytes; i++) { uchar q = *p; int last = bm->data_w() - 8*i; if (last > 8) last = 8; - for (int k=0; k < last; k++) { + int k; + for (k =0; k < last; k++) { if (q&1) { uchar *r = (uchar*)rgb->array + j*bm->data_w()*4 + i*8*4 + k*4; *r++ = R; *r++ = G; *r++ = B; *r = ~0; @@ -729,7 +735,8 @@ void Fl_SVG_Graphics_Driver::draw_image(const uchar* buf, int x, int y, int w, i void Fl_SVG_Graphics_Driver::draw_image(Fl_Draw_Image_Cb cb, void* data, int x, int y, int w, int h, int d) { uchar *buf = new uchar[w*h*d]; - for (int j = 0; j < h; j++) { + int j; + for (j = 0; j < h; j++) { cb(data, 0, j, w, buf + j*w*d); } draw_image(buf, x, y, w, h, d, 0); @@ -743,7 +750,8 @@ struct mono_image_data { }; static void mono_image_cb(mono_image_data* data, int x, int y, int w, uchar* buf) { - for (int i = 0; i < w; i++) + int i; + for (i = 0; i < w; i++) *buf++ = *(data->buf + y*data->l + (x++)*data->d); } @@ -755,7 +763,8 @@ void Fl_SVG_Graphics_Driver::draw_image_mono(const uchar* buf, int x, int y, int void Fl_SVG_Graphics_Driver::draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int x, int y, int w, int h, int d) { uchar *buf = new uchar[w*h*d]; - for (int j = 0; j < h; j++) { + int j; + for (j = 0; j < h; j++) { cb(data, 0, j, w, buf + j*w*d); } draw_image_mono(buf, x, y, w, h, d, 0); @@ -879,7 +888,8 @@ void Fl_SVG_Graphics_Driver::loop(int x0, int y0, int x1, int y1, int x2, int y2 } void Fl_SVG_Graphics_Driver::end_points() { - for (int i=0; i<n; i++) { + int i; + for (i =0; i<n; i++) { clocale_printf("<path d=\"M %f %f L %f %f\" fill=\"none\" stroke=\"rgb(%u,%u,%u)\" stroke-width=\"%d\" />\n", xpoint[i].x, xpoint[i].y, xpoint[i].x, xpoint[i].y, red_, green_, blue_, width_); } @@ -892,7 +902,8 @@ void Fl_SVG_Graphics_Driver::end_line() { } if (n<=1) return; clocale_printf("<path d=\"M %f %f", xpoint[0].x, xpoint[0].y); - for (int i=1; i<n; i++) + int i; + for (i =1; i<n; i++) clocale_printf(" L %f %f", xpoint[i].x, xpoint[i].y); fprintf(out_, "\" fill=\"none\" stroke=\"rgb(%u,%u,%u)\" stroke-width=\"%d\" stroke-dasharray=\"%s\" stroke-linecap=\"%s\" stroke-linejoin=\"%s\" />\n", red_, green_, blue_, width_, dasharray_, linecap_, linejoin_); @@ -906,7 +917,8 @@ void Fl_SVG_Graphics_Driver::end_polygon() { } if (n<=1) return; clocale_printf("<path d=\"M %f %f", xpoint[0].x, xpoint[0].y); - for (int i=1; i<n; i++) + int i; + for (i =1; i<n; i++) clocale_printf(" L %f %f", xpoint[i].x, xpoint[i].y); fprintf(out_, " z\" fill=\"rgb(%u,%u,%u)\" />\n", red_, green_, blue_); } @@ -936,7 +948,8 @@ void Fl_SVG_Graphics_Driver::end_complex_polygon() { } if (n<=1) return; clocale_printf("<path d=\"M %f %f", xpoint[0].x, xpoint[0].y); - for (int i=1; i<n; i++) + int i; + for (i =1; i<n; i++) clocale_printf(" L %f %f", xpoint[i].x, xpoint[i].y); fprintf(out_, " z\" fill=\"rgb(%u,%u,%u)\" />\n", red_, green_, blue_); } diff --git a/src/drivers/Unix/Fl_Unix_Screen_Driver.cxx b/src/drivers/Unix/Fl_Unix_Screen_Driver.cxx index 97b11b840..7f10036ff 100644 --- a/src/drivers/Unix/Fl_Unix_Screen_Driver.cxx +++ b/src/drivers/Unix/Fl_Unix_Screen_Driver.cxx @@ -67,7 +67,8 @@ int Fl_Unix_Screen_Driver::poll_or_select_with_delay(double time_to_wait) { fl_lock_function(); if (n > 0) { - for (int i=0; i<nfds; i++) { + int i; + for (i =0; i<nfds; i++) { # if USE_POLL if (pollfds[i].revents) fd[i].cb(pollfds[i].fd, fd[i].arg); # else diff --git a/src/drivers/Unix/Fl_Unix_System_Driver.cxx b/src/drivers/Unix/Fl_Unix_System_Driver.cxx index ab6f678aa..c7dd44068 100644 --- a/src/drivers/Unix/Fl_Unix_System_Driver.cxx +++ b/src/drivers/Unix/Fl_Unix_System_Driver.cxx @@ -292,7 +292,8 @@ int Fl_Unix_System_Driver::file_browser_load_filesystem(Fl_File_Browser *browser res = -1; } else { struct vmount *vp = (struct vmount *) list; - for (int i = 0; i < res; ++i) { + int i; + for (i = 0; i < res; ++i) { name = (char *) vp + vp->vmt_data[VMT_STUB].vmt_off; strlcpy(filename, name, lname); // Skip the already added root filesystem @@ -326,7 +327,7 @@ int Fl_Unix_System_Driver::file_browser_load_filesystem(Fl_File_Browser *browser // Get list of statvfs structures res = getmntinfo(&list, ST_WAIT); if (0 < res) { - for (int i = 0; i < res; ++i) { + for (i = 0; i < res; ++i) { strlcpy(filename, list[i].f_mntonname, lname); // Skip the already added root filesystem if (strcmp("/", filename) != 0) { @@ -890,11 +891,13 @@ unsigned char *Fl_Unix_System_Driver::create_bmp(const unsigned char *data, int write_int(&c,0); // Pixel data data+=3*W*H; - for (int y=0;y<H;++y){ + int y; + for (y =0;y<H;++y){ data-=3*W; const unsigned char *s=data; unsigned char *p=c; - for (int x=0;x<W;++x){ + int x; + for (x =0;x<W;++x){ *p++=s[2]; *p++=s[1]; *p++=s[0]; @@ -924,9 +927,11 @@ Fl_RGB_Image *Fl_Unix_System_Driver::own_bmp_to_RGB(char *bmp) { bmp += 54; uchar *data = new uchar[w*h*3]; uchar *p = data; - for (int i = h-1; i >= 0; i--) { + int i; + for (i = h-1; i >= 0; i--) { char *s = bmp + i * R; - for (int j = 0; j < w; j++) { + int j; + for (j = 0; j < w; j++) { *p++=s[2]; *p++=s[1]; *p++=s[0]; diff --git a/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx index 822acc826..929bd0a1c 100644 --- a/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx @@ -96,7 +96,8 @@ void Fl_X11_Gl_Window_Driver::get_list(Fl_Font_Descriptor *fd, int r) { if (gl_fd->glok[r]) return; gl_fd->glok[r] = 1; unsigned int ii = r * 0x400; - for (int i = 0; i < 0x400; i++) { + int i; + for (i = 0; i < 0x400; i++) { XFontStruct *font = NULL; unsigned short id; fl_XGetUtf8FontAndGlyph(gl_fd->font, ii, &font, &id); diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx index 4fa3b8698..80bf4368e 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx @@ -88,7 +88,8 @@ void Fl_X11_Screen_Driver::display(const char *d) { static char e[1024]; strcpy(e, "DISPLAY="); strlcat(e, d, sizeof(e)); - for (char *c = e + 8; *c != ':'; c++) { + char *c; + for (c = e + 8; *c != ':'; c++) { if (!*c) { strlcat(e,":0.0",sizeof(e)); break; @@ -188,7 +189,8 @@ int Fl_X11_Screen_Driver::visual(int flags) XVisualInfo *visualList = XGetVisualInfo(fl_display, 0, &vTemplate, &num); // find all matches, use the one with greatest depth: XVisualInfo *found = 0; - for (int i=0; i<num; i++) if (test_visual(visualList[i], flags)) { + int i; + for (i =0; i<num; i++) if (test_visual(visualList[i], flags)) { if (!found || found->depth < visualList[i].depth) found = &visualList[i]; } @@ -314,6 +316,8 @@ void Fl_X11_Screen_Driver::init() { #endif // USE_XRANDR + int i; + #if HAVE_XINERAMA if (XineramaIsActive(fl_display)) { @@ -321,7 +325,7 @@ void Fl_X11_Screen_Driver::init() { if (num_screens > MAX_SCREENS) num_screens = MAX_SCREENS; /* There's no way to use different DPI for different Xinerama screens. */ - for (int i=0; i<num_screens; i++) { + for (i =0; i<num_screens; i++) { screens[i].x_org = xsi[i].x_org; screens[i].y_org = xsi[i].y_org; screens[i].width = xsi[i].width; @@ -345,7 +349,7 @@ void Fl_X11_Screen_Driver::init() { num_screens = ScreenCount(fl_display); if (num_screens > MAX_SCREENS) num_screens = MAX_SCREENS; - for (int i=0; i<num_screens; i++) { + for (i =0; i<num_screens; i++) { screens[i].x_org = 0; screens[i].y_org = 0; screens[i].width = DisplayWidth(fl_display, i); @@ -450,7 +454,8 @@ void Fl_X11_Screen_Driver::grab(Fl_Window* win) static bool using_kde = ( p = getenv("XDG_CURRENT_DESKTOP") , (p && (strcmp(p, "KDE") == 0)) ); Fl_Window *fullscreen_win = NULL; - for (Fl_Window *W = Fl::first_window(); W; W = Fl::next_window(W)) { + Fl_Window *W; + for (W = Fl::first_window(); W; W = Fl::next_window(W)) { if (W->fullscreen_active()) { fullscreen_win = W; break; @@ -1177,7 +1182,8 @@ int Fl_X11_Screen_Driver::screen_num_unscaled(int x, int y) int screen = -1; if (num_screens < 0) init(); - for (int i = 0; i < num_screens; i ++) { + int i; + for (i = 0; i < num_screens; i ++) { int sx = screens[i].x_org, sy = screens[i].y_org, sw = screens[i].width, sh = screens[i].height; if ((x >= sx) && (x < (sx+sw)) && (y >= sy) && (y < (sy+sh))) { screen = i; @@ -1200,7 +1206,8 @@ void Fl_X11_Screen_Driver::desktop_scale_factor() if (factor < 1.1) factor = 1; else if (factor > 1.8 && factor < 2.2) factor = 2; else if (factor > 10.0) factor = 10.0; - for (int i = 0; i < screen_count(); i++) scale(i, factor); + int i; + for (i = 0; i < screen_count(); i++) scale(i, factor); } } } diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx index 96f43ce26..e2e57b629 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx @@ -316,7 +316,8 @@ void Fl_X11_Window_Driver::icons(const Fl_RGB_Image *icons[], int count) { icon_->icons = new Fl_RGB_Image*[count]; icon_->count = count; // FIXME: Fl_RGB_Image lacks const modifiers on methods - for (int i = 0;i < count;i++) { + int i; + for (i = 0;i < count;i++) { icon_->icons[i] = (Fl_RGB_Image*)((Fl_RGB_Image*)icons[i])->copy(); icon_->icons[i]->normalize(); } @@ -523,7 +524,8 @@ void Fl_X11_Window_Driver::show_with_args_end(int argc, char **argv) { int n=0; for (j=0; j<argc; j++) n += strlen(argv[j])+1; char *buffer = new char[n]; char *p = buffer; - for (j=0; j<argc; j++) for (const char *q = argv[j]; (*p++ = *q++);); + const char *q; + for (j=0; j<argc; j++) for (q = argv[j]; (*p++ = *q++);); XChangeProperty(fl_display, fl_xid(pWindow), XA_WM_COMMAND, XA_STRING, 8, 0, (unsigned char *)buffer, p-buffer-1); delete[] buffer; diff --git a/src/drivers/X11/fl_X11_platform_init.cxx b/src/drivers/X11/fl_X11_platform_init.cxx index 49947c1f3..eee2aa915 100644 --- a/src/drivers/X11/fl_X11_platform_init.cxx +++ b/src/drivers/X11/fl_X11_platform_init.cxx @@ -49,7 +49,8 @@ Fl_Screen_Driver *Fl_Screen_Driver::newScreenDriver() { Fl_X11_Screen_Driver *d = new Fl_X11_Screen_Driver(); #if USE_XFT || FLTK_USE_CAIRO - for (int i = 0; i < MAX_SCREENS; i++) d->screens[i].scale = 1; + int i; + for (i = 0; i < MAX_SCREENS; i++) d->screens[i].scale = 1; d->current_xft_dpi = 0.; // means the value of the Xft.dpi resource is still unknown #else secret_input_character = '*'; diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx index 336e4b429..1fa277520 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx @@ -128,7 +128,8 @@ void Fl_Xlib_Graphics_Driver::font_name(int num, const char *name) { #if !USE_XFT if (s->xlist && s->n >= 0) XFreeFontNames(s->xlist); #endif - for (Fl_Font_Descriptor* f = s->first; f;) { + Fl_Font_Descriptor *f; + for (f = s->first; f;) { Fl_Font_Descriptor* n = f->next; delete f; f = n; } s->first = 0; @@ -146,7 +147,8 @@ Fl_Region Fl_Xlib_Graphics_Driver::scale_clip(float f) { Region r = (Region)rstack[rstackptr]; if (r == 0 || (f == 1 && offset_x_ == 0 && offset_y_ == 0) ) return 0; Region r2 = XCreateRegion(); - for (int i = 0; i < r->numRects; i++) { + int i; + for (i = 0; i < r->numRects; i++) { int x = floor(r->rects[i].x1 + offset_x_, f); int y = floor(r->rects[i].y1 + offset_y_, f); int w = floor((r->rects[i].x2 + offset_x_) , f) - x; diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx index b6297da61..236734d90 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx @@ -232,14 +232,16 @@ ulong fl_xpixel(Fl_Color i) { // the colormap after this and make decisions here wrong. numcolors = fl_visual->colormap_size; if (!allcolors) allcolors = new XColor[numcolors]; - for (int p = numcolors; p--;) allcolors[p].pixel = p; + int p; + for (p = numcolors; p--;) allcolors[p].pixel = p; XQueryColors(fl_display, colormap, allcolors, numcolors); } // find least-squares match: int mindist = 0x7FFFFFFF; unsigned int bestmatch = 0; - for (unsigned int n = numcolors; n--;) { + unsigned int n; + for (n = numcolors; n--;) { XColor &a = allcolors[n]; int d, t; t = int(r)-int(a.red>>8); d = t*t; diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx index 8ba7fb908..176a388ae 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx @@ -159,7 +159,8 @@ const char* Fl_Xlib_Graphics_Driver::get_font_name(Fl_Font fnum, int* ap) { } // collect all the attribute words: - for (int n = 3; n <= 6; n++) { + int n; + for (n = 3; n <= 6; n++) { // get the next word: if (*e) e++; x = e; @@ -228,7 +229,8 @@ static int ultrasort(const void *aa, const void *bb) { // compare the family and all the attribute words: int atype = 0; int btype = 0; - for (int n = 2; n <= 6; n++) { + int n; + for (n = 2; n <= 6; n++) { int at = attribute(n,a); int bt = attribute(n,b); if (at < 0) { @@ -308,7 +310,8 @@ Fl_Font Fl_Xlib_Graphics_Driver::set_fonts(const char* xstarname) { if (!xlist) return (Fl_Font)fl_free_font; qsort(xlist, xlistsize, sizeof(*xlist), ultrasort); int used_xlist = 0; - for (int i=0; i<xlistsize;) { + int i; + for (i =0; i<xlistsize;) { int first_xlist = i; const char *p = xlist[i++]; char canon[1024]; @@ -359,7 +362,8 @@ int Fl_Xlib_Graphics_Driver::get_font_sizes(Fl_Font fnum, int*& sizep) { int listsize = s->n; if (listsize<0) listsize = -listsize; static int sizes[128]; int numsizes = 0; - for (int i = 0; i < listsize; i++) { + int i; + for (i = 0; i < listsize; i++) { char *q = s->xlist[i]; char *d = fl_find_fontsize(q); if (!d) continue; @@ -371,7 +375,8 @@ int Fl_Xlib_Graphics_Driver::get_font_sizes(Fl_Font fnum, int*& sizep) { int n; for (n = numsizes-1; n > 0; n--) if (sizes[n-1] < s) break; if (sizes[n] != s) { - for (int m = numsizes; m > n; m--) sizes[m] = sizes[m-1]; + int m; + for (m = numsizes; m > n; m--) sizes[m] = sizes[m-1]; sizes[n] = s; numsizes++; } @@ -392,7 +397,8 @@ Fl_Xlib_Font_Descriptor::Fl_Xlib_Font_Descriptor(const char* name) : Fl_Font_Des } # if HAVE_GL listbase = 0; - for (int u = 0; u < 64; u++) glok[u] = 0; + int u; + for (u = 0; u < 64; u++) glok[u] = 0; # endif } @@ -464,7 +470,8 @@ static const char *find_best_font(const char *fname, int size) { int matchedlength = 32767; int found_encoding = 0; int m = cnt; if (m<0) m = -m; - for (int n=0; n < m; n++) { + int n; + for (n =0; n < m; n++) { char* thisname = list[n]; if (fl_correct_encoding(thisname)) { if (!found_encoding) ptsize = 0; // force it to choose this diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx index a7537a184..92b0e0ef6 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx @@ -489,7 +489,8 @@ static XftFont* fontopen(const char* name, /*Fl_Fontsize*/double size, bool core int comma_count = 0; unsigned len = strlen(name); if (len > 512) len = 512; // ensure we are not passed an unbounded font name - for(unsigned idx = 0; idx < len; idx++) { + unsigned idx; + for (idx = 0; idx < len; idx++) { if(name[idx] == '-') hyphen_count++; // check for XLFD hyphens if(name[idx] == ',') comma_count++; // are there multiple names? } @@ -897,7 +898,8 @@ int Fl_Xlib_Graphics_Driver::get_font_sizes(Fl_Font fnum, int*& sizep) { array = new int[array_size = fs->nfont+1]; } array[0] = 0; int j = 1; // claim all fonts are scalable - for (int i = 0; i < fs->nfont; i++) { + int i; + for (i = 0; i < fs->nfont; i++) { double v; if (XftPatternGetDouble(fs->fonts[i], XFT_PIXEL_SIZE, 0, &v) == XftResultMatch) { array[j++] = int(v); @@ -1309,7 +1311,8 @@ double Fl_Xlib_Graphics_Driver::width_unscaled(unsigned int utf32) { } if (!desc->width[r]) { desc->width[r] = (int*)new int[0x0400]; - for (int i = 0; i < 0x0400; i++) desc->width[r][i] = -1; + int i; + for (i = 0; i < 0x0400; i++) desc->width[r][i] = -1; } else { if ( desc->width[r][utf32&0x03FF] >= 0 ) { // already cached return double(desc->width[r][utf32 & 0x03FF]); @@ -1412,13 +1415,15 @@ Fl_Font Fl_Xlib_Graphics_Driver::set_fonts(const char* pattern_name) Fl_Xlib_Graphics_Driver::context(); Fl_Xlib_Graphics_Driver::init_built_in_fonts(); pango_font_map_list_families(Fl_Xlib_Graphics_Driver::pfmap_, &families, &n_families); - for (int fam = 0; fam < n_families; fam++) { + int fam; + for (fam = 0; fam < n_families; fam++) { PangoFontFace **faces; int n_faces; const char *fam_name = pango_font_family_get_name (families[fam]); int lfam = strlen(fam_name); pango_font_family_list_faces(families[fam], &faces, &n_faces); - for (int j = 0; j < n_faces; j++) { + int j; + for (j = 0; j < n_faces; j++) { const char *p = pango_font_face_get_face_name(faces[j]); // Remove " Regular" suffix from font names if (!strcasecmp(p, "regular")) p = NULL; diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx index 5dafe503f..6c13f643f 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx @@ -544,7 +544,8 @@ static void innards(const uchar *buf, int X, int Y, int W, int H, xi.bytes_per_line = linesize*sizeof(STORETYPE); if (buf) { buf += delta*dx+linedelta*dy; - for (int j=0; j<h; ) { + int j; + for (j =0; j<h; ) { STORETYPE *to = buffer; int k; for (k = 0; j<h && k<blocking; k++, j++) { @@ -556,7 +557,7 @@ static void innards(const uchar *buf, int X, int Y, int W, int H, } } else { STORETYPE* linebuf = new STORETYPE[(W*delta+(sizeof(STORETYPE)-1))/sizeof(STORETYPE)]; - for (int j=0; j<h; ) { + for (j =0; j<h; ) { STORETYPE *to = buffer; int k; for (k = 0; j<h && k<blocking; k++, j++) { @@ -676,8 +677,10 @@ static void alpha_blend(Fl_RGB_Image *img, int X, int Y, int W, int H, int cx, i if (img->d() == 2) { // Composite grayscale + alpha over RGB... - for (int y = H; y > 0; y--, srcptr+=srcskip) - for (int x = W; x > 0; x--) { + int y; + for (y = H; y > 0; y--, srcptr+=srcskip) + int x; + for (x = W; x > 0; x--) { srcg = *srcptr++; srca = *srcptr++; if (srca == 255) { // special case "copy" @@ -700,8 +703,8 @@ static void alpha_blend(Fl_RGB_Image *img, int X, int Y, int W, int H, int cx, i } } else { // Composite RGBA over RGB... - for (int y = H; y > 0; y--, srcptr+=srcskip) - for (int x = W; x > 0; x--) { + for (y = H; y > 0; y--, srcptr+=srcskip) + for (x = W; x > 0; x--) { srcr = *srcptr++; srcg = *srcptr++; srcb = *srcptr++; @@ -901,7 +904,8 @@ void Fl_Xlib_Graphics_Driver::draw_fixed(Fl_Pixmap *pxm, int X, int Y, int W, in Region r = (Region)XRectangleRegion(X,Y,W,H); XIntersectRegion(r, (Region)clip_region(), r); int X1, Y1, W1, H1; - for (int i = 0; i < r->numRects; i++) { + int i; + for (i = 0; i < r->numRects; i++) { X1 = r->rects[i].x1; Y1 = r->rects[i].y1; W1 = r->rects[i].x2 - r->rects[i].x1; diff --git a/src/fl_curve.cxx b/src/fl_curve.cxx index c3324f96e..497a321be 100644 --- a/src/fl_curve.cxx +++ b/src/fl_curve.cxx @@ -84,7 +84,8 @@ void Fl_Graphics_Driver::curve(double X0, double Y0, double dy2 = dy3 + 2*yb*e*e; // draw points 1 .. nSeg-2: - for (int i=2; i<nSeg; i++) { + int i; + for (i =2; i<nSeg; i++) { x += dx1; dx1 += dx2; dx2 += dx3; diff --git a/src/fl_dnd_x.cxx b/src/fl_dnd_x.cxx index be5d18557..0d2a9b2c3 100644 --- a/src/fl_dnd_x.cxx +++ b/src/fl_dnd_x.cxx @@ -94,7 +94,8 @@ int Fl_X11_Screen_Driver::dnd(int unused) { // figure out what window we are pointing at: Window new_window = 0; int new_version = 0; Fl_Window* new_local_window = 0; - for (Window child = RootWindow(fl_display, fl_screen);;) { + Window child; + for (child = RootWindow(fl_display, fl_screen);;) { Window root; unsigned int junk3; XQueryPointer(fl_display, child, &root, &child, &Fl::e_x_root, &Fl::e_y_root, &dest_x, &dest_y, &junk3); diff --git a/src/fl_draw_pixmap.cxx b/src/fl_draw_pixmap.cxx index 923186889..d24dd8b47 100644 --- a/src/fl_draw_pixmap.cxx +++ b/src/fl_draw_pixmap.cxx @@ -101,7 +101,8 @@ int fl_convert_pixmap(const char*const* cdata, uchar* out, Fl_Color bg) { ncolors--; } // read all the rest of the colors: - for (int i=0; i < ncolors; i++) { + int i; + for (i =0; i < ncolors; i++) { uchar* c = colors[*p++]; if (Fl_Graphics_Driver::need_pixmap_bg_color) { used_colors[color_count].r = *(p+0); @@ -115,7 +116,8 @@ int fl_convert_pixmap(const char*const* cdata, uchar* out, Fl_Color bg) { *c = 255; } } else { // normal XPM colormap with names - for (int i=0; i<ncolors; i++) { + int i; + for (i =0; i<ncolors; i++) { const uchar *p = *data++; // the first 1 or 2 characters are the color index: int ind = *p++; @@ -164,13 +166,14 @@ int fl_convert_pixmap(const char*const* cdata, uchar* out, Fl_Color bg) { } U32 *q = (U32*)out; - for (int Y = 0; Y < h; Y++) { + int Y, X; + for (Y = 0; Y < h; Y++) { const uchar* p = data[Y]; if (chars_per_pixel <= 1) { - for (int X = 0; X < w; X++) + for (X = 0; X < w; X++) memcpy(q++, colors[*p++], 4); } else { - for (int X = 0; X < w; X++) { + for (X = 0; X < w; X++) { int ind = (*p++)<<8; ind |= *p++; memcpy(q++, colors[ind], 4); @@ -202,9 +205,10 @@ int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg) { *p = bitmap; const uchar *alphaPtr = &buffer[3]; uchar b = 0; - for (int Y = 0; Y < h; Y++) { + int Y, X, bit; + for (Y = 0; Y < h; Y++) { b = 0; - for (int X = 0, bit = 1; X < w; X++, alphaPtr += 4) { + for (X = 0, bit = 1; X < w; X++, alphaPtr += 4) { if (*alphaPtr > 127) b |= bit; bit <<= 1; diff --git a/src/fl_engraved_label.cxx b/src/fl_engraved_label.cxx index 3f98e3155..fad4bc9d1 100644 --- a/src/fl_engraved_label.cxx +++ b/src/fl_engraved_label.cxx @@ -25,7 +25,8 @@ static void innards(const char *str, int len, int X, int Y, const int data[][3], int n) { Fl_Color c = fl_color(); - for (int i = 0; i < n; i++) { + int i; + for (i = 0; i < n; i++) { fl_color((Fl_Color)(i < n-1 ? data[i][2] : c)); fl_draw(str, len, X+data[i][0], Y+data[i][1]); } diff --git a/src/fl_gleam.cxx b/src/fl_gleam.cxx index f3278f9d9..005de54e4 100644 --- a/src/fl_gleam.cxx +++ b/src/fl_gleam.cxx @@ -73,7 +73,8 @@ static void shade_rect_top_bottom(int x, int y, int w, int h, Fl_Color fg1, Fl_C float step_size_bottom = h_bottom > 1 ? (0.999f/float(h_bottom)) : 1; // draw the gradient at the top of the widget float k = 1; - for (int i = 0; i < h_top; i++, k -= step_size_top) { + int i; + for (i = 0; i < h_top; i++, k -= step_size_top) { gleam_color(fl_color_average(fl_color_average(fg1, fg2, th), fg1, k)); fl_xyline(x, y+i, x+w-1); } @@ -84,7 +85,7 @@ static void shade_rect_top_bottom(int x, int y, int w, int h, Fl_Color fg1, Fl_C // draw the gradient at the bottom of the widget k = 1; - for (int i = 0; i < h_bottom; i++, k -= step_size_bottom) { + for (i = 0; i < h_bottom; i++, k -= step_size_bottom) { gleam_color(fl_color_average(fg1, fl_color_average(fg1, fg2, th), k)); fl_xyline(x, y+h_top+h_flat+i, x+w-1); } diff --git a/src/fl_oxy.cxx b/src/fl_oxy.cxx index 6332508d6..4bac70f12 100644 --- a/src/fl_oxy.cxx +++ b/src/fl_oxy.cxx @@ -154,7 +154,8 @@ static void _oxy_up_box_(int x, int y, int w, int h, Fl_Color bg) { float stepoffset = (1.0f / (float)h); int xw = x + w - 1; // from bottom to top - for (int _y = y; _y < y + h; _y++) { + int _y; + for (_y = y; _y < y + h; _y++) { fl_color(fl_color_average(bg, FL_WHITE, (gradoffset < 1.0f) ? gradoffset : 1.0f)); fl_xyline(x, _y, xw); gradoffset += stepoffset; @@ -172,7 +173,8 @@ static void _oxy_down_box_(int x, int y, int w, int h, Fl_Color bg) { float stepoffset = (1.0f / (float)h); int xw = x + w - 1; // from top to bottom - for (int _y = y + h - 1; _y >= y; _y--) { + int _y; + for (_y = y + h - 1; _y >= y; _y--) { fl_color(fl_color_average(bg, FL_WHITE, (gradoffset < 1.0f) ? gradoffset : 1.0f)); fl_xyline(x, _y, xw); gradoffset += stepoffset; @@ -186,14 +188,15 @@ static void _oxy_button_up_box_(int x, int y, int w, int h, Fl_Color bg) { float stepoffset = (1.0f / (float)half_h); Fl_Color col = fl_color_average(bg, FL_WHITE, 0.5); int xw = x + w - 1; - for (int _y = y; _y <= y + half_h; _y++) { + int _y; + for (_y = y; _y <= y + half_h; _y++) { fl_color(fl_color_average(col, FL_WHITE, (gradoffset < 1.0f) ? gradoffset : 1.0f)); fl_xyline(x, _y, xw); gradoffset += stepoffset; } gradoffset = 0.0f; col = bg; - for (int _y = y + h - 1; _y >= y + half_h - 1; _y--) { + for (_y = y + h - 1; _y >= y + half_h - 1; _y--) { fl_color(fl_color_average(col, FL_WHITE, (gradoffset < 1.0f) ? gradoffset : 1.0f)); fl_xyline(x, _y, xw); gradoffset += stepoffset; @@ -207,14 +210,15 @@ static void _oxy_button_down_box_(int x, int y, int w, int h, Fl_Color bg) { int half_h = h / 2, xw = x + w - 1; float gradoffset = 0.15f, stepoffset = (1.0f / (float)half_h); Fl_Color col = fl_color_average(bg, FL_WHITE, 0.5); - for (int _y = y; _y <= y + half_h; _y++) { + int _y; + for (_y = y; _y <= y + half_h; _y++) { fl_color(fl_color_average(col, FL_WHITE, (gradoffset < 1.0f) ? gradoffset : 1.0f)); fl_xyline(x, _y, xw); gradoffset += stepoffset; } gradoffset = 0.0f; col = bg; - for (int _y = y + h - 1; _y >= y + half_h - 1; _y--) { + for (_y = y + h - 1; _y >= y + half_h - 1; _y--) { fl_color(fl_color_average(col, FL_WHITE, (gradoffset < 1.0f) ? gradoffset : 1.0f)); fl_xyline(x, _y, xw); gradoffset += stepoffset; diff --git a/src/fl_read_image.cxx b/src/fl_read_image.cxx index 181e2a094..2a36fb794 100644 --- a/src/fl_read_image.cxx +++ b/src/fl_read_image.cxx @@ -61,9 +61,11 @@ uchar *fl_read_image(uchar *p, int X, int Y, int w, int h, int alpha) { uchar *d = data; const uchar *q; int ld = img->ld() ? img->ld() : img->w() * img->d(); - for (int r = 0; r < img->h(); r++) { + int r; + for (r = 0; r < img->h(); r++) { q = img->array + r * ld; - for (int c = 0; c < img->w(); c++) { + int c; + for (c = 0; c < img->w(); c++) { d[0] = q[0]; d[1] = q[1]; d[2] = q[2]; diff --git a/src/fl_show_colormap.cxx b/src/fl_show_colormap.cxx index c9a96f79b..4442bbce9 100644 --- a/src/fl_show_colormap.cxx +++ b/src/fl_show_colormap.cxx @@ -62,7 +62,8 @@ void ColorMenu::drawbox(Fl_Color c) { void ColorMenu::draw() { if (damage() != FL_DAMAGE_CHILD) { fl_draw_box(FL_UP_BOX,0,0,w(),h(),color()); - for (int c = 0; c < 256; c++) drawbox((Fl_Color)c); + int c; + for (c = 0; c < 256; c++) drawbox((Fl_Color)c); } else { drawbox(previous); drawbox(which); diff --git a/src/fl_utf8.cxx b/src/fl_utf8.cxx index 2c52a04b6..1c8be67e3 100644 --- a/src/fl_utf8.cxx +++ b/src/fl_utf8.cxx @@ -72,7 +72,8 @@ static int Toupper(int ucs) { bool test(const char *str) { if (str == 0) return true; const char *src = str; - for (int p = 0; ; p++) { + int p; + for (p = 0; ; p++) { if (src == 0) return true; int len = fl_utf8len(*src); if (len == -1) { diff --git a/src/fl_write_png.cxx b/src/fl_write_png.cxx index c46072933..ad56bc12b 100644 --- a/src/fl_write_png.cxx +++ b/src/fl_write_png.cxx @@ -164,7 +164,8 @@ int fl_write_png(const char *filename, const char *pixels, int w, int h, int d, png_write_info(pptr, iptr); - for (int i = 0; i < h; i++, ptr += ld) { + int i; + for (i = 0; i < h; i++, ptr += ld) { png_write_row(pptr, ptr); } diff --git a/src/forms_compatibility.cxx b/src/forms_compatibility.cxx index c4901fedc..8c42efdc7 100644 --- a/src/forms_compatibility.cxx +++ b/src/forms_compatibility.cxx @@ -28,6 +28,7 @@ void fl_end_form() { void Fl_Group::forms_end() { // set the dimensions of a group to surround contents const int nc = children(); + int i; if (nc && !w()) { Fl_Widget*const* a = array(); Fl_Widget* o = *a++; @@ -35,7 +36,7 @@ void Fl_Group::forms_end() { int ry = o->y(); int rw = rx+o->w(); int rh = ry+o->h(); - for (int i = nc - 1; i--;) { + for (i = nc - 1; i--;) { o = *a++; if (o->x() < rx) rx = o->x(); if (o->y() < ry) ry = o->y(); @@ -52,7 +53,7 @@ void Fl_Group::forms_end() { Fl_Widget* o = as_window() ? this : window(); int Y = o->h(); Fl_Widget*const* a = array(); - for (int i = nc; i--;) { + for (i = nc; i--;) { Fl_Widget* ow = *a++; int newy = Y - ow->y() - ow->h(); ow->y(newy); diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index ae0dc94db..95436a610 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -106,11 +106,13 @@ void gl_remove_displaylist_fonts() // clear variables used mostly in fl_font fl_graphics_driver->font(0, 0); - for (int j = 0 ; j < FL_FREE_FONT ; ++j) + int j; + for (j = 0 ; j < FL_FREE_FONT ; ++j) { Fl_Font_Descriptor *prevDesc = 0L, *nextDesc = 0L; Fl_Font_Descriptor *&firstDesc = *Fl_Gl_Window_Driver::global()->fontnum_to_fontdescriptor(j); - for (Fl_Font_Descriptor *desc = firstDesc; desc; desc = nextDesc) + Fl_Font_Descriptor *desc; + for (desc = firstDesc; desc; desc = nextDesc) { nextDesc = desc->next; if(desc->listbase) { @@ -306,7 +308,8 @@ gl_texture_fifo::gl_texture_fifo(int max) gl_texture_fifo::~gl_texture_fifo() { - for (int i = 0; i < size_; i++) { + int i; + for (i = 0; i < size_; i++) { if (fifo[i].utf8) free(fifo[i].utf8); if (textures_generated) glDeleteTextures(1, &fifo[i].texName); } @@ -556,7 +559,8 @@ char *Fl_Gl_Window_Driver::alpha_mask_for_string(const char *str, int n, int w, delete image_surface; // This gives us an RGB rendering of the text. We build an alpha channel from that. char *alpha_buf = new char [w * h]; - for (int idx = 0; idx < w * h; ++idx) + int idx; + for (idx = 0; idx < w * h; ++idx) { // Fake up the alpha component using the green component's value alpha_buf[idx] = image->array[idx * 3 + 1]; } @@ -581,7 +585,8 @@ void Fl_Gl_Window_Driver::draw_string_legacy_get_list(const char* str, int n) { size = fl_graphics_driver->font_descriptor()->size; gl_font(fl_font(), Fl_Fontsize(size * gl_start_scale)); } - for (unsigned i = 0; i < wn; i++) { + unsigned i; + for (i = 0; i < wn; i++) { unsigned int r; r = (buf[i] & 0xFC00) >> 10; get_list(gl_fontsize, r); @@ -600,7 +605,8 @@ void Fl_Gl_Window_Driver::draw_string_legacy_glut(const char* str, int n) { uchar *str_nul = new uchar[n + 1]; int m = 0; - for (int i = 0; i < n; i++) { + int i; + for (i = 0; i < n; i++) { if ((uchar)str[i] < 128) str_nul[m++] = str[i]; } str_nul[m] = 0; diff --git a/src/glut_compatibility.cxx b/src/glut_compatibility.cxx index df25c456b..53db8a520 100644 --- a/src/glut_compatibility.cxx +++ b/src/glut_compatibility.cxx @@ -331,7 +331,8 @@ static Fl_Menu_Item* additem(menu *m) { if (m->size+1 >= m->alloc) { m->alloc = m->size*2+10; Fl_Menu_Item* nm = new Fl_Menu_Item[m->alloc]; - for (int i=0; i<m->size; i++) nm[i] = m->m[i]; + int i; + for (i =0; i<m->size; i++) nm[i] = m->m[i]; delete[] m->m; m->m = nm; } @@ -382,7 +383,8 @@ void glutChangeToSubMenu(int item, char *label, int submenu) { void glutRemoveMenuItem(int item) { menu *m = &menus[glut_menu]; if (item > m->size || item < 1) return; - for (int i = item-1; i <= m->size; i++) m->m[i] = m->m[i+1]; + int i; + for (i = item-1; i <= m->size; i++) m->m[i] = m->m[i+1]; m->size--; } |