[fltk.commit] [Library] r9375 - branches/branch-1.3/src
Author: fabien Date: 2012-04-21 20:09:31 -0700 (Sat, 21 Apr 2012) New Revision: 9375 Log: fixed missing win32 preprocessor clause Modified: branches/branch-1.3/src/fl_draw_pixmap.cxx Modified: branches/branch-1.3/src/fl_draw_pixmap.cxx === --- branches/branch-1.3/src/fl_draw_pixmap.cxx 2012-04-22 02:59:27 UTC (rev 9374) +++ branches/branch-1.3/src/fl_draw_pixmap.cxx 2012-04-22 03:09:31 UTC (rev 9375) @@ -230,7 +230,9 @@ #endif transparent_index = ' '; Fl::get_color(bg, c[0], c[1], c[2]); c[3] = 0; +#ifdef WIN32 transparent_c = c; +#endif p += 4; ncolors--; } ___ fltk-commit mailing list fltk-commit@easysw.com http://lists.easysw.com/mailman/listinfo/fltk-commit
[fltk.commit] [Library] r9374 - branches/branch-1.3/src
Author: fabien Date: 2012-04-21 19:59:27 -0700 (Sat, 21 Apr 2012) New Revision: 9374 Log: restore transparent_c use for win32... Modified: branches/branch-1.3/src/fl_draw_pixmap.cxx Modified: branches/branch-1.3/src/fl_draw_pixmap.cxx === --- branches/branch-1.3/src/fl_draw_pixmap.cxx 2012-04-22 02:45:09 UTC (rev 9373) +++ branches/branch-1.3/src/fl_draw_pixmap.cxx 2012-04-22 02:59:27 UTC (rev 9374) @@ -209,8 +209,8 @@ if (!fl_measure_pixmap(cdata, d.w, d.h)) return 0; const uchar*const* data = (const uchar*const*)(cdata+1); int transparent_index = -1; -// uchar *transparent_c = (uchar *)0; // such that transparent_c[0,1,2] are the RGB of the transparent color #ifdef WIN32 + uchar *transparent_c = (uchar *)0; // such that transparent_c[0,1,2] are the RGB of the transparent color color_count = 0; used_colors = (uchar *)malloc(abs(ncolors)*3*sizeof(uchar)); #endif @@ -230,7 +230,7 @@ #endif transparent_index = ' '; Fl::get_color(bg, c[0], c[1], c[2]); c[3] = 0; - // transparent_c = c; + transparent_c = c; p += 4; ncolors--; } @@ -316,7 +316,9 @@ c[3] = 0; #endif transparent_index = ind; - //transparent_c = c; +#ifdef WIN32 + transparent_c = c; +#endif } } } ___ fltk-commit mailing list fltk-commit@easysw.com http://lists.easysw.com/mailman/listinfo/fltk-commit
[fltk.commit] [Library] r9373 - in branches/branch-1.3: . FL src src/xutf8
Author: fabien
Date: 2012-04-21 19:45:09 -0700 (Sat, 21 Apr 2012)
New Revision: 9373
Log:
Fixed linux 64 gcc 4.6.1 compilation problems
Modified:
branches/branch-1.3/FL/glut.H
branches/branch-1.3/configure.in
branches/branch-1.3/src/fl_ask.cxx
branches/branch-1.3/src/fl_draw_pixmap.cxx
branches/branch-1.3/src/glut_compatability.cxx
branches/branch-1.3/src/xutf8/utf8Input.c
branches/branch-1.3/src/xutf8/utf8Wrap.c
Modified: branches/branch-1.3/FL/glut.H
===
--- branches/branch-1.3/FL/glut.H 2012-04-22 00:34:11 UTC (rev 9372)
+++ branches/branch-1.3/FL/glut.H 2012-04-22 02:45:09 UTC (rev 9373)
@@ -233,7 +233,11 @@
// Warning: this cast may not work on all machines:
inline void glutTimerFunc(unsigned int msec, void (*f)(int), int value) {
+#if defined(__LP64__)
+ Fl::add_timeout(msec*.001, (void (*)(void *))f, (void *) (long long) value);
+#else
Fl::add_timeout(msec*.001, (void (*)(void *))f, (void *)value);
+#endif
}
inline void glutMenuStateFunc(void (*f)(int state)) {
Modified: branches/branch-1.3/configure.in
===
--- branches/branch-1.3/configure.in2012-04-22 00:34:11 UTC (rev 9372)
+++ branches/branch-1.3/configure.in2012-04-22 02:45:09 UTC (rev 9373)
@@ -487,7 +487,7 @@
dnl Define both HAVE_SCANDIR... macros, if the POSIX compatible function is
dnl available. Otherwise: check, whether any scandir prototype is available,
-dnl but don't use it on SunOS and QNX because of an incompatibility in pre-Y2K
+dnl but dont use it on SunOS and QNX because of an incompatibility in pre-Y2K
dnl SunOS scandir versions. We assume, though, that the POSIX compatible
dnl version on newer SunOS/Solaris versions works as expected.
if test "$ac_cv_cxx_scandir_posix" = yes; then
Modified: branches/branch-1.3/src/fl_ask.cxx
===
--- branches/branch-1.3/src/fl_ask.cxx 2012-04-22 00:34:11 UTC (rev 9372)
+++ branches/branch-1.3/src/fl_ask.cxx 2012-04-22 02:45:09 UTC (rev 9373)
@@ -99,7 +99,11 @@
else
button[b] = new Fl_Button(x, 70, 90, 23);
button[b]->align(FL_ALIGN_INSIDE|FL_ALIGN_WRAP);
+#if defined (__LP64__)
+ button[b]->callback(button_cb,(void *)(long long) b);
+#else
button[b]->callback(button_cb,(void *)b);
+#endif
}
}
button[0]->shortcut(FL_Escape);
Modified: branches/branch-1.3/src/fl_draw_pixmap.cxx
===
--- branches/branch-1.3/src/fl_draw_pixmap.cxx 2012-04-22 00:34:11 UTC (rev
9372)
+++ branches/branch-1.3/src/fl_draw_pixmap.cxx 2012-04-22 02:45:09 UTC (rev
9373)
@@ -209,7 +209,7 @@
if (!fl_measure_pixmap(cdata, d.w, d.h)) return 0;
const uchar*const* data = (const uchar*const*)(cdata+1);
int transparent_index = -1;
- uchar *transparent_c = (uchar *)0; // such that transparent_c[0,1,2] are the
RGB of the transparent color
+// uchar *transparent_c = (uchar *)0; // such that transparent_c[0,1,2] are
the RGB of the transparent color
#ifdef WIN32
color_count = 0;
used_colors = (uchar *)malloc(abs(ncolors)*3*sizeof(uchar));
@@ -230,7 +230,7 @@
#endif
transparent_index = ' ';
Fl::get_color(bg, c[0], c[1], c[2]); c[3] = 0;
- transparent_c = c;
+ // transparent_c = c;
p += 4;
ncolors--;
}
@@ -316,7 +316,7 @@
c[3] = 0;
#endif
transparent_index = ind;
- transparent_c = c;
+ //transparent_c = c;
}
}
}
Modified: branches/branch-1.3/src/glut_compatability.cxx
===
--- branches/branch-1.3/src/glut_compatability.cxx 2012-04-22 00:34:11 UTC
(rev 9372)
+++ branches/branch-1.3/src/glut_compatability.cxx 2012-04-22 02:45:09 UTC
(rev 9373)
@@ -333,7 +333,12 @@
Fl_Menu_Item* i = additem(m);
i->text = label;
i->callback_ = (Fl_Callback*)(m->cb);
+
+#if defined(__LP64__)
+ i->user_data_ = (void *) (long long) value;
+#else
i->user_data_ = (void *)value;
+#endif
}
void glutAddSubMenu(char *label, int submenu) {
@@ -350,7 +355,11 @@
Fl_Menu_Item* i = &m->m[item-1];
i->text = label;
i->callback_ = (Fl_Callback*)(m->cb);
+#if defined(__LP64__)
+ i->user_data_ = (void *) (long long) value;
+#else
i->user_data_ = (void *)value;
+#endif
i->flags = 0;
}
Modified: branches/branch-1.3/src/xutf8/utf8Input.c
===
--- branches/branch-1.3/src/xutf8/utf8Input.c 2012-04-22 00:34:11 UTC (rev
9372)
+++ branches/branch-1.3/src/xutf8/utf8Input.c 2012-04-22 02:45:09 UTC (rev
9373)
@@ -62,10 +62,10 @@
int i = 0;
#endif
int l = 0;
- char *buf, *b;
+ char *buf; // , *b;
if (len < 1) return 0;
- b = buf = (char*) malloc((unsigned)len);
+ /*b = */ buf = (char*) malloc((unsigned)len);
memcpy(buf, buffer_re
[fltk.commit] [Library] r9371 - in branches/branch-3.0: fluid include/FL include/fltk3 src/fltk3
Author: matt Date: 2012-04-21 17:25:08 -0700 (Sat, 21 Apr 2012) New Revision: 9371 Log: Fixing some warnings and errors on Xcode Modified: branches/branch-3.0/fluid/Fl_Type.cxx branches/branch-3.0/include/FL/Fl_Widget.H branches/branch-3.0/include/fltk3/Widget.h branches/branch-3.0/src/fltk3/Preferences.cxx Modified: branches/branch-3.0/fluid/Fl_Type.cxx === --- branches/branch-3.0/fluid/Fl_Type.cxx 2012-04-22 00:06:25 UTC (rev 9370) +++ branches/branch-3.0/fluid/Fl_Type.cxx 2012-04-22 00:25:08 UTC (rev 9371) @@ -17,47 +17,35 @@ // // Copyright 1998-2010 by Bill Spitzak and others. // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. +// This library is free software. Distribution and use rights are outlined in +// the file "COPYING" which should have been included with this file. If this +// file is missing or damaged, see the license at: // -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. +// http://www.fltk.org/COPYING.php // -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// // Please report all bugs and problems on the following page: // // http://www.fltk.org/str.php // -#include -#include -#include -#include -#include +#include +#include +#include #include #include "../src/fltk3/flstring.h" #include #include "Fl_Type.h" -#include "workspace_panel.h" #include "undo.h" -#include +#include #include "pixmaps/lock.xpm" #include "pixmaps/protected.xpm" //#include "pixmaps/unlock.xpm" -static fltk3::Pixmap lock_pixmap(lock_xpm); -static fltk3::Pixmap protected_pixmap(protected_xpm); -//static fltk3::Pixmap unlock_pixmap(unlock_xpm); +static Fl_Pixmap lock_pixmap(lock_xpm); +static Fl_Pixmap protected_pixmap(protected_xpm); +//static Fl_Pixmap unlock_pixmap(unlock_xpm); #include "pixmaps/flWindow.xpm" #include "pixmaps/flButton.xpm" @@ -110,84 +98,60 @@ #include "pixmaps/flWidgetClass.xpm" #include "pixmaps/flTree.xpm" #include "pixmaps/flTable.xpm" -#include "pixmaps/flAppTarget.xpm" -#include "pixmaps/flLibTarget.xpm" -#include "pixmaps/flFile.xpm" -#include "pixmaps/flFolder.xpm" -#include "pixmaps/flFluidFile.xpm" -#include "pixmaps/flCodeFile.xpm" -#include "pixmaps/flMenuNone.xpm" -#include "pixmaps/flMenuMulti.xpm" -#include "pixmaps/flMenuAll.xpm" -#include "pixmaps/flWorkspace.xpm" -#include "pixmaps/flDependency.xpm" -#include "pixmaps/flOption.xpm" -static fltk3::Pixmap window_pixmap(flWindow_xpm); -static fltk3::Pixmap button_pixmap(flButton_xpm); -static fltk3::Pixmap checkbutton_pixmap(flCheckButton_xpm); -static fltk3::Pixmap roundbutton_pixmap(flRoundButton_xpm); -static fltk3::Pixmap box_pixmap(flBox_xpm); -static fltk3::Pixmap group_pixmap(flGroup_xpm); -static fltk3::Pixmap function_pixmap(flFunction_xpm); -static fltk3::Pixmap code_pixmap(flCode_xpm); -static fltk3::Pixmap codeblock_pixmap(flCodeBlock_xpm); -static fltk3::Pixmap comment_pixmap(flComment_xpm); -static fltk3::Pixmap declaration_pixmap(flDeclaration_xpm); -static fltk3::Pixmap declarationblock_pixmap(flDeclarationBlock_xpm); -static fltk3::Pixmap class_pixmap(flClass_xpm); -static fltk3::Pixmap tabs_pixmap(flTabs_xpm); -static fltk3::Pixmap input_pixmap(flInput_xpm); -static fltk3::Pixmap choice_pixmap(flChoice_xpm); -static fltk3::Pixmap menuitem_pixmap(flMenuitem_xpm); -static fltk3::Pixmap menubar_pixmap(flMenubar_xpm); -static fltk3::Pixmap submenu_pixmap(flSubmenu_xpm); -static fltk3::Pixmap scroll_pixmap(flScroll_xpm); -static fltk3::Pixmap tile_pixmap(flTile_xpm); -static fltk3::Pixmap wizard_pixmap(flWizard_xpm); -static fltk3::Pixmap pack_pixmap(flPack_xpm); -static fltk3::Pixmap returnbutton_pixmap(flReturnButton_xpm); -static fltk3::Pixmap lightbutton_pixmap(flLightButton_xpm); -static fltk3::Pixmap repeatbutton_pixmap(flRepeatButton_xpm); -static fltk3::Pixmap menubutton_pixmap(flMenuButton_xpm); -static fltk3::Pixmap output_pixmap(flOutput_xpm); -static fltk3::Pixmap textdisplay_pixmap(flTextDisplay_xpm); -static fltk3::Pixmap textedit_pixmap(flTextEdit_xpm); -static fltk3::Pixmap fileinput_pixmap(flFileInput_xpm); -static fltk3::Pixmap browser_pixmap(flBrowser_xpm); -static fltk3::Pixmap checkbrowser_pixmap(flCheckBrowser_xpm); -static fltk3::Pixmap filebrowser_pixmap(flFileBrowser_xpm); -sta
[fltk.commit] [Library] r9369 - branches/branch-1.3/src
Author: fabien
Date: 2012-04-21 10:40:07 -0700 (Sat, 21 Apr 2012)
New Revision: 9369
Log:
STR 2771 fix cont'd used the new api in scheme(const char*)
Modified:
branches/branch-1.3/src/Fl_get_system_colors.cxx
Modified: branches/branch-1.3/src/Fl_get_system_colors.cxx
===
--- branches/branch-1.3/src/Fl_get_system_colors.cxx2012-04-21 17:21:11 UTC
(rev 9368)
+++ branches/branch-1.3/src/Fl_get_system_colors.cxx2012-04-21 17:40:07 UTC
(rev 9369)
@@ -290,9 +290,9 @@
}
if (s) {
-if (!strcasecmp(s, "none") || !strcasecmp(s, "base") || !*s) s = 0;
-else if (!strcasecmp(s, "gtk+")) s = strdup("gtk+");
-else if (!strcasecmp(s, "plastic")) s = strdup("plastic");
+if (!fl_ascii_strcasecmp(s, "none") || !fl_ascii_strcasecmp(s, "base") ||
!*s) s = 0;
+else if (!fl_ascii_strcasecmp(s, "gtk+")) s = strdup("gtk+");
+else if (!fl_ascii_strcasecmp(s, "plastic")) s = strdup("plastic");
else s = 0;
}
if (scheme_) free((void*)scheme_);
___
fltk-commit mailing list
fltk-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/fltk-commit
[fltk.commit] [Library] r9368 - branches/branch-1.3/src
Author: fabien
Date: 2012-04-21 10:21:11 -0700 (Sat, 21 Apr 2012)
New Revision: 9368
Log:
STR 2771 fix: introduce a new ascii strcasecmp that does not rely on locale
sensitive toupper tolower.
Modified:
branches/branch-1.3/src/Fl_get_system_colors.cxx
branches/branch-1.3/src/flstring.c
branches/branch-1.3/src/flstring.h
Modified: branches/branch-1.3/src/Fl_get_system_colors.cxx
===
--- branches/branch-1.3/src/Fl_get_system_colors.cxx2012-04-21 15:16:27 UTC
(rev 9367)
+++ branches/branch-1.3/src/Fl_get_system_colors.cxx2012-04-21 17:21:11 UTC
(rev 9368)
@@ -312,7 +312,7 @@
int Fl::reload_scheme() {
Fl_Window *win;
- if (scheme_ && !strcasecmp(scheme_, "plastic")) {
+ if (scheme_ && !fl_ascii_strcasecmp(scheme_, "plastic")) {
// Update the tile image to match the background color...
uchar r, g, b;
int nr, ng, nb;
@@ -358,7 +358,7 @@
// Use standard size scrollbars...
Fl::scrollbar_size(16);
- } else if (scheme_ && !strcasecmp(scheme_, "gtk+")) {
+ } else if (scheme_ && !fl_ascii_strcasecmp(scheme_, "gtk+")) {
// Use a GTK+ inspired look-n-feel...
if (scheme_bg_) {
delete scheme_bg_;
Modified: branches/branch-1.3/src/flstring.c
===
--- branches/branch-1.3/src/flstring.c 2012-04-21 15:16:27 UTC (rev 9367)
+++ branches/branch-1.3/src/flstring.c 2012-04-21 17:21:11 UTC (rev 9368)
@@ -90,6 +90,21 @@
return (srclen);
}
+/**
+* locale independent ascii oriented case cmp
+* returns 0 if string successfully compare, non zero otherwise
+*/
+int fl_ascii_strcasecmp(const char *s, const char *t) {
+ if (!s || !t) return (s!=t);
+ if (strlen(s) != strlen(t)) return -1;
+ for(;*s; s++,t++) {
+ if ( *s != *t) {
+ if (*s<*t && (*s+0x20)!=*t ) return -1;
+ if (*s>*t && *s!=(*t+0x20) ) return +1;
+ }
+ }
+ return 0;
+}
/*
* End of "$Id$".
Modified: branches/branch-1.3/src/flstring.h
===
--- branches/branch-1.3/src/flstring.h 2012-04-21 15:16:27 UTC (rev 9367)
+++ branches/branch-1.3/src/flstring.h 2012-04-21 17:21:11 UTC (rev 9368)
@@ -84,12 +84,15 @@
#define strlcpy fl_strlcpy
# endif /* !HAVE_STRLCPY */
+// locale independent ascii compare, does not introduce locale pbs as w/ case
cmp
+FL_EXPORT extern int fl_ascii_strcasecmp(const char *s, const char *t);
+
# ifdef __cplusplus
}
# endif /* __cplusplus */
+
#endif /* !flstring_h */
-
/*
* End of "$Id$".
*/
___
fltk-commit mailing list
fltk-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/fltk-commit
[fltk.commit] [Library] r9367 - in branches/branch-3.0: include/fltk3 src/fltk3
Author: fabien
Date: 2012-04-21 08:16:27 -0700 (Sat, 21 Apr 2012)
New Revision: 9367
Log:
Applied recent 1.3 fix to fltk3.
Modified:
branches/branch-3.0/include/fltk3/TextBuffer.h
branches/branch-3.0/src/fltk3/TextBuffer.cxx
Modified: branches/branch-3.0/include/fltk3/TextBuffer.h
===
--- branches/branch-3.0/include/fltk3/TextBuffer.h 2012-04-21 15:05:00 UTC
(rev 9366)
+++ branches/branch-3.0/include/fltk3/TextBuffer.h 2012-04-21 15:16:27 UTC
(rev 9367)
@@ -195,7 +195,7 @@
/**
Replaces the entire contents of the text buffer.
- \param text Text must be valid utf8.
+ \param text Text must be utf8, if null an empty string is substituted.
*/
void text(const char* text);
Modified: branches/branch-3.0/src/fltk3/TextBuffer.cxx
===
--- branches/branch-3.0/src/fltk3/TextBuffer.cxx2012-04-21 15:05:00 UTC
(rev 9366)
+++ branches/branch-3.0/src/fltk3/TextBuffer.cxx2012-04-21 15:16:27 UTC
(rev 9367)
@@ -174,7 +174,11 @@
void fltk3::TextBuffer::text(const char *t)
{
IS_UTF8_ALIGNED(t)
-
+
+ // if t is null then substitute it with an empty string
+ // then don't return so that internal cleanup can happen
+ if (!t) t="";
+
call_predelete_callbacks(0, length());
/* Save information for redisplay, and get rid of the old buffer */
___
fltk-commit mailing list
fltk-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/fltk-commit
[fltk.commit] [Library] r9366 - in branches/branch-1.3: FL src
Author: fabien
Date: 2012-04-21 08:05:00 -0700 (Sat, 21 Apr 2012)
New Revision: 9366
Log:
STR2783: make potential null string substituted to an empty string, still
achieve internal cleanup in Fl_Text_Buffer::text(s)
Modified:
branches/branch-1.3/FL/Fl_Text_Buffer.H
branches/branch-1.3/src/Fl_Text_Buffer.cxx
Modified: branches/branch-1.3/FL/Fl_Text_Buffer.H
===
--- branches/branch-1.3/FL/Fl_Text_Buffer.H 2012-04-21 11:13:10 UTC (rev
9365)
+++ branches/branch-1.3/FL/Fl_Text_Buffer.H 2012-04-21 15:05:00 UTC (rev
9366)
@@ -188,7 +188,7 @@
/**
Replaces the entire contents of the text buffer.
- \param text Text must be valid utf8.
+ \param text Text must be valid utf8. if null an empty string is substituted.
*/
void text(const char* text);
Modified: branches/branch-1.3/src/Fl_Text_Buffer.cxx
===
--- branches/branch-1.3/src/Fl_Text_Buffer.cxx 2012-04-21 11:13:10 UTC (rev
9365)
+++ branches/branch-1.3/src/Fl_Text_Buffer.cxx 2012-04-21 15:05:00 UTC (rev
9366)
@@ -165,7 +165,11 @@
void Fl_Text_Buffer::text(const char *t)
{
IS_UTF8_ALIGNED(t)
-
+
+ // if t is null then substitute it with an empty string
+ // then don't return so that internal cleanup can happen
+ if (!t) t="";
+
call_predelete_callbacks(0, length());
/* Save information for redisplay, and get rid of the old buffer */
___
fltk-commit mailing list
fltk-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/fltk-commit
[fltk.commit] [Library] r9365 - branches/branch-1.3/src
Author: matt
Date: 2012-04-21 04:13:10 -0700 (Sat, 21 Apr 2012)
New Revision: 9365
Log:
Fl::arg now removes a command line argument that is added by Xcode. This will
help "Demo" to run again
Modified:
branches/branch-1.3/src/Fl_arg.cxx
Modified: branches/branch-1.3/src/Fl_arg.cxx
===
--- branches/branch-1.3/src/Fl_arg.cxx 2012-04-21 03:41:36 UTC (rev 9364)
+++ branches/branch-1.3/src/Fl_arg.cxx 2012-04-21 11:13:10 UTC (rev 9365)
@@ -173,9 +173,13 @@
#ifdef __APPLE__
// The Finder application in MacOS X passes the "-psn_N_N" option
// to all apps...
- else if (strncmp(s, "psn_", 4) == 0) {
+ else if (strcmp(s, "NSDocumentRevisionsDebugMode") == 0) {
i++;
+if (argv[i]) i++;
return 1;
+ } else if (strncmp(s, "psn_", 4) == 0) {
+i++;
+return 1;
}
#endif // __APPLE__
___
fltk-commit mailing list
fltk-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/fltk-commit
