Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-27 02:46:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update GCC test in configure script.

Browse Source 
Add range checking to BMP loader, and fix colormap + 4-bit BMP file
loading.

Copy 2.0 window position fix for XFree86 4.x and others.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2315 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2002-06-24 02:04:54 +00:00
parent 04f6fbbe03
commit bb056f7805
4 changed files with 98 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+5
View File
@@ -1,5 +1,10 @@
CHANGES IN FLTK 1.1.0 CHANGES IN FLTK 1.1.0
- Now translate the window coordinates when a window is
shown, moved, or resized. This should fix the "menus
showing up at the wrong position" bug under XFree86.
- Fixed some more problems with the Fl_BMP_Image file
loader.
- BC++ fixes. - BC++ fixes.
- The pixmap_browser demo didn't check for a NULL image - The pixmap_browser demo didn't check for a NULL image
pointer. pointer.
configure.in
+3 -3
View File
@@ -1,7 +1,7 @@
dnl -*- sh -*- dnl -*- sh -*-
dnl the "configure" script is made from this by running GNU "autoconf" dnl the "configure" script is made from this by running GNU "autoconf"
dnl dnl
dnl "$Id: configure.in,v 1.33.2.31.2.71 2002/06/08 12:51:38 easysw Exp $" dnl "$Id: configure.in,v 1.33.2.31.2.72 2002/06/24 02:04:54 easysw Exp $"
dnl dnl
dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl dnl
@@ -553,7 +553,7 @@ AC_SUBST(MAKEDEPEND)
dnl Add warnings to compiler switches: dnl Add warnings to compiler switches:
dnl do this last so messing with switches does not break tests dnl do this last so messing with switches does not break tests
if test -n "$GXX"; then if test -n "$GCC"; then
# Starting with GCC 3.0, you must link C++ programs against either # Starting with GCC 3.0, you must link C++ programs against either
# libstdc++ (shared by default), or libsupc++ (always static). If # libstdc++ (shared by default), or libsupc++ (always static). If
# you care about binary portability between Linux distributions, # you care about binary portability between Linux distributions,
@@ -748,5 +748,5 @@ dnl Make sure the fltk-config script is executable...
chmod +x fltk-config chmod +x fltk-config
dnl dnl
dnl End of "$Id: configure.in,v 1.33.2.31.2.71 2002/06/08 12:51:38 easysw Exp $". dnl End of "$Id: configure.in,v 1.33.2.31.2.72 2002/06/24 02:04:54 easysw Exp $".
dnl dnl
src/Fl_BMP_Image.cxx
+64 -46
View File
@@ -1,5 +1,5 @@
// //
// "$Id: Fl_BMP_Image.cxx,v 1.1.2.6 2002/06/13 18:18:33 easysw Exp $" // "$Id: Fl_BMP_Image.cxx,v 1.1.2.7 2002/06/24 02:04:54 easysw Exp $"
// //
// Fl_BMP_Image routines. // Fl_BMP_Image routines.
// //
@@ -85,8 +85,13 @@ Fl_BMP_Image::Fl_BMP_Image(const char *bmp) // I - File to read
if ((fp = fopen(bmp, "rb")) == NULL) return; if ((fp = fopen(bmp, "rb")) == NULL) return;
// Get the header... // Get the header...
getc(fp); // Skip "BM" sync chars byte = getc(fp); // Check "BM" sync chars
getc(fp); bit = getc(fp);
if (byte != 'B' || bit != 'M') {
fclose(fp);
return;
}
read_dword(fp); // Skip size read_dword(fp); // Skip size
read_word(fp); // Skip reserved stuff read_word(fp); // Skip reserved stuff
read_word(fp); read_word(fp);
@@ -95,6 +100,8 @@ Fl_BMP_Image::Fl_BMP_Image(const char *bmp) // I - File to read
// Then the bitmap information... // Then the bitmap information...
info_size = read_dword(fp); info_size = read_dword(fp);
// printf("offbits = %ld, info_size = %d\n", offbits, info_size);
if (info_size < 40) { if (info_size < 40) {
// Old Windows/OS2 BMP header... // Old Windows/OS2 BMP header...
w(read_word(fp)); w(read_word(fp));
@@ -121,19 +128,28 @@ Fl_BMP_Image::Fl_BMP_Image(const char *bmp) // I - File to read
count = info_size - 40; count = info_size - 40;
} }
// printf("w() = %d, h() = %d, depth = %d, compression = %d, colors_used = %d, count = %d\n",
// w(), h(), depth, compression, colors_used, count);
// Skip remaining header bytes... // Skip remaining header bytes...
while (count > 0) { while (count > 0) {
getc(fp); getc(fp);
count --; count --;
} }
// Check header data...
if (!w() || !h() || !depth) {
fclose(fp);
return;
}
// Get colormap... // Get colormap...
if (colors_used == 0 && depth <= 8) if (colors_used == 0 && depth <= 8)
colors_used = 1 << depth; colors_used = 1 << depth;
for (count = 0; count < colors_used; count ++) { for (count = 0; count < colors_used; count ++) {
// Read BGR color... // Read BGR color...
fread(colormap[count], colors_used, 3, fp); fread(colormap[count], 1, 3, fp);
// Skip pad byte for new BMP files... // Skip pad byte for new BMP files...
if (info_size > 12) getc(fp); if (info_size > 12) getc(fp);
@@ -141,7 +157,7 @@ Fl_BMP_Image::Fl_BMP_Image(const char *bmp) // I - File to read
// Setup image and buffers... // Setup image and buffers...
d(3); d(3);
fseek(fp, offbits, SEEK_SET); if (offbits) fseek(fp, offbits, SEEK_SET);
array = new uchar[w() * h() * d()]; array = new uchar[w() * h() * d()];
alloc_array = 1; alloc_array = 1;
@@ -187,58 +203,60 @@ Fl_BMP_Image::Fl_BMP_Image(const char *bmp) // I - File to read
case 4 : // 16-color case 4 : // 16-color
for (x = w(), bit = 0xf0; x > 0; x --) { for (x = w(), bit = 0xf0; x > 0; x --) {
// Get a new count as needed... // Get a new count as needed...
if (compression != BI_RLE4 && count == 0) {
count = 2;
color = -1;
}
if (count == 0) { if (count == 0) {
while (align > 0) { if (compression != BI_RLE4) {
align --; count = 2;
getc(fp); color = -1;
} } else {
while (align > 0) {
align --;
getc(fp);
}
if ((count = getc(fp)) == 0) {
if ((count = getc(fp)) == 0) { if ((count = getc(fp)) == 0) {
// End of line... if ((count = getc(fp)) == 0) {
x ++; // End of line...
continue; x ++;
} else if (count == 1) { continue;
// End of image... } else if (count == 1) {
break; // End of image...
} else if (count == 2) { break;
// Delta... } else if (count == 2) {
count = getc(fp) * getc(fp) * w(); // Delta...
color = 0; count = getc(fp) * getc(fp) * w();
color = 0;
} else {
// Absolute...
color = -1;
align = ((4 - (count & 3)) / 2) & 1;
}
} else { } else {
// Absolute... color = getc(fp);
color = -1;
align = ((4 - (count & 3)) / 2) & 1;
} }
} else {
color = getc(fp);
} }
} }
// Get a new color as needed... // Get a new color as needed...
count --; count --;
if (bit == 0xf0) { // Get the next color byte as needed...
if (color < 0) temp = getc(fp); if (color < 0) color = getc(fp);
else temp = color;
// Copy the color value... // Extract the next pixel...
*ptr++ = colormap[temp >> 4][2]; if (bit == 0xf0) {
*ptr++ = colormap[temp >> 4][1]; temp = (color >> 4) & 15;
*ptr++ = colormap[temp >> 4][0]; bit = 0x0f;
bit = 0x0f; } else {
} else { temp = color & 15;
// Copy the color value... bit = 0xf0;
*ptr++ = colormap[temp & 15][2];
*ptr++ = colormap[temp & 15][1];
*ptr++ = colormap[temp & 15][0];
bit = 0xf0;
} }
// printf("temp = %d\n", temp);
// Copy the color value...
*ptr++ = colormap[temp][2];
*ptr++ = colormap[temp][1];
*ptr++ = colormap[temp][0];
} }
if (!compression) { if (!compression) {
@@ -375,5 +393,5 @@ read_long(FILE *fp) { // I - File to read from
// //
// End of "$Id: Fl_BMP_Image.cxx,v 1.1.2.6 2002/06/13 18:18:33 easysw Exp $". // End of "$Id: Fl_BMP_Image.cxx,v 1.1.2.7 2002/06/24 02:04:54 easysw Exp $".
// //
src/Fl_x.cxx
+26 -20
View File
@@ -1,5 +1,5 @@
// //
// "$Id: Fl_x.cxx,v 1.24.2.24.2.21 2002/05/25 13:38:25 easysw Exp $" // "$Id: Fl_x.cxx,v 1.24.2.24.2.22 2002/06/24 02:04:54 easysw Exp $"
// //
// X specific code for the Fast Light Tool Kit (FLTK). // X specific code for the Fast Light Tool Kit (FLTK).
// //
@@ -693,10 +693,6 @@ int fl_handle(const XEvent& xevent)
} }
break;} break;}
case MapNotify:
event = FL_SHOW;
break;
case UnmapNotify: case UnmapNotify:
event = FL_HIDE; event = FL_HIDE;
break; break;
@@ -858,21 +854,31 @@ int fl_handle(const XEvent& xevent)
fl_xmousewin = 0; fl_xmousewin = 0;
break; break;
case ConfigureNotify: { // We cannot rely on the x,y position in the configure notify event.
// We cannot rely on the x,y position in the configure notify event. // I now think this is an unavoidable problem with X: it is impossible
// I now think this is an unavoidable problem with X: it is impossible // for a window manager to prevent the "real" notify event from being
// for a window manager to prevent the "real" notify event from being // sent when it resizes the contents, even though it can send an
// sent when it resizes the contents, even though it can send an // artificial event with the correct position afterwards (and some
// artificial event with the correct position afterwards (and some // window managers do not send this fake event anyway)
// window managers do not send this fake event anyway) // So anyway, do a round trip to find the correct x,y:
// So anyway, do a round trip to find the correct x,y: case MapNotify:
Window r, c; int X, Y, wX, wY; unsigned int m; event = FL_SHOW;
XQueryPointer(fl_display, fl_xid(window), &r, &c, &X, &Y, &wX, &wY, &m);
resize_bug_fix = window;
window->resize(X-wX, Y-wY,
xevent.xconfigure.width, xevent.xconfigure.height);
return 1;}
case ConfigureNotify: {
if (window->parent()) break; // ignore child windows
// figure out where OS really put window
XWindowAttributes actual;
XGetWindowAttributes(fl_display, fl_xid(window), &actual);
Window cr; int X, Y, W = actual.width, H = actual.height;
XTranslateCoordinates(fl_display, fl_xid(window), actual.root,
0, 0, &X, &Y, &cr);
// tell Fl_Window about it and set flag to prevent echoing:
resize_bug_fix = window;
window->resize(X, Y, W, H);
break; // allow add_handler to do something too
}
} }
return Fl::handle(event, window); return Fl::handle(event, window);
@@ -1227,5 +1233,5 @@ void Fl_Window::make_current() {
#endif #endif
// //
// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.21 2002/05/25 13:38:25 easysw Exp $". // End of "$Id: Fl_x.cxx,v 1.24.2.24.2.22 2002/06/24 02:04:54 easysw Exp $".
// //