summaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx39
-rw-r--r--src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx6
-rw-r--r--src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx3
-rw-r--r--src/drivers/PostScript/Fl_PostScript.cxx15
-rw-r--r--src/drivers/PostScript/Fl_PostScript_image.cxx13
-rw-r--r--src/drivers/SVG/Fl_SVG_File_Surface.cxx39
-rw-r--r--src/drivers/Unix/Fl_Unix_Screen_Driver.cxx3
-rw-r--r--src/drivers/Unix/Fl_Unix_System_Driver.cxx17
-rw-r--r--src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx3
-rw-r--r--src/drivers/X11/Fl_X11_Screen_Driver.cxx21
-rw-r--r--src/drivers/X11/Fl_X11_Window_Driver.cxx6
-rw-r--r--src/drivers/X11/fl_X11_platform_init.cxx3
-rw-r--r--src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx6
-rw-r--r--src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx6
-rw-r--r--src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx21
-rw-r--r--src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx15
-rw-r--r--src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx18
17 files changed, 152 insertions, 82 deletions
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("&amp;", out_);
else if (str[i] == '<') fputs("&lt;", out_);
else if (str[i] == '>') fputs("&gt;", 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;
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-08 06:29:55 +0000