widget (this should eliminate the extra flicker some users have complained
about...)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2652 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
inside the root group and to allow for relative and absolute path names.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2619 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Move the "preview" button over so there is room for localization.
Fix the order of buttons in convenience dialogs.
Update "ask" to use the fl_input function.
Fix 4-bit BMP file loading.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2608 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
the fltk_images library; saves about 16k in the FLTK core library on my
Intel system.
Fix a memory leak bug in most of the fl_set_fonts*.cxx implementations;
as a result, the Fl_Fontdesc structure now has a fontname member to old
the human-readable font name.
Lots of fixes for shadowed variables, etc.
Use snprintf, strlcpy, and strlcat in more places.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2566 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Don't use png_read_destroy() - it doesn't free all memory.
Add uncache() method to image classes.
Memory/initialization bugs in Fl_File_Chooser (valgrind)
Make sure both Fl_Window constructors have default cursor initialization
code...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2562 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
on this (wrap margin is the width of the widget less box borders)
Don't select the text in value() for a readonly() (output) field.
Display a caret instead of a vertical bar for the cursor in output fields.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2545 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
instead, use a constant +1 offset.
Add another bit to flags_, VISIBLE_FOCUS, which provides
per-widget keyboard focus control. The default is for all
widgets to participate in keyboard focus navigation. Use the
set_visible_focus(), clear_visible_focus(), and visible_focus()
methods on Fl_Widget to control this.
Clean up the Fl_Widget documentation and add missing stuff.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2543 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Use ANSI C comments in flstring.h, which is included from both C++ and
C code.
Move prototypes for OSX inside existing "C" wrapper in flstring.h.
Simplify M_PI and M_SQRT2 definitions in FL/math.h; no need to define
them twice...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2537 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
(Praise the day when I finally stop screwing up cvs ;-/ )
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2536 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Fix more export problems, make some more static inline methods regular
functions, don't use FL_NORMAL_SIZE in a static initializer since BC++
doesn't seem to support it...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2531 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
inline; this should make shared libraries work better on all platforms.
Link FLUID against shared libraries, too, so that the installed fluid is
also using shared libraries (still make a statically linked fluid for the
build)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2525 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
properly distinguish between type names and variable names...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2492 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
different WIN32 message for threading under Windows.
(didn't include the cleanup or release changes)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2336 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Add new fl_register_images() function to register the extra file formats
with Fl_Shared_Image.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2329 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Revert focus check in fl_fix_focus().
Don't click the click count in Fl_Browser_::select().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2324 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Convert C++ comments to C comments in filename.H, which is included
from some C files.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2321 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Document this in the migration appendix, and add a section on keyboard
focus.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2316 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Change "text" and "selecion" methods to return char *, not const char *,
since they return a changeable copy of the text.
Add range checking to style lookup in Fl_Text_Display.
Add syntax hilighting to editor example.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2299 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Add some other NEdit text display data that wasn't in the current
implementation (wrap + line number stuff).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2296 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
for now just remove the char (boolean) methods since the integer methods
can also be used for the same thing.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2274 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Make style data const in Fl_Text_Display.
Use INT input only when step() is an integral value.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2246 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
and strncat() in almost all places (there are still a few strncpy's
that need to be used...)
Added configure check for strlcat() and strlcpy().
Added emulation code for strlcat() and strlcpy().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2239 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
as Fl_Widget::tooltip(x) is no longer an inline (though the previous version
will work if there is at least one call to the new one). It may be better
to just enable tooltips all the time. Also Fl_Tooltip::enable() is changed,
but few programs call that.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2210 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Tweek plastic boxtypes (didn't draw to the edge of the bounding box)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2205 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Add docos for sort functions and changes to fl_filename_list() and
Fl_File_Browser::load().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2176 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
fl_alphasort, fl_casealphasort, fl_casenumericsort, and fl_numericsort.
Still need to document this and provide hooks in the file chooser and
browsers.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2174 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
same, eliminating any filename completion value.
Added relative argument to fl_file_chooser() and fl_dir_chooser(); both
default to 0 (return absolute paths)
Give focus to the filename field in the chooser when show() is called.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2157 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
widget (Fl_File_Input is much lighter-weight, and is simpler in function.)
Update file chooser dialog to use new Fl_File_Input widget and always
display absolute path.
Still need to do docos, new screenshots, and update FLUID to support the
new widget.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2145 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
length parameter for the string.
Added GUI preferences and file history to FLUID, using Fl_Preferences.
FLUID now uses getUserdataPath() for the cut buffer location.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2141 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
buffer limiting fixes, include "flstring.h" instead of <string.h>,
and replace all use of bool, true, and false, with char, 1, and 0.
(bool is not universally supported by the C++ compilers we currently
use with FLTK 1.x, so 1.x cannot use bool, true, or false without a
lot of configure crap that will make use/distribution a lot more
difficult...)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2132 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Add Fl_File_Chooser::directory_label, filename_label, and filter_label
static string pointers for labels (allows for I18N of the file chooser).
Fix typos in other docos.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2098 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Implemented Fl_RGB_Image alpha blending for MacOS X - others still
get 1-bit screen-door transparency...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2083 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
for...
Add "tooltips" resource for default state of tooltips.
Fix another tooltip cycling problem.
Fix default help and argument processing (didn't have the right min
chars for matching, and didn't list new options)
Update docos to list new tooltip resource and list of standard arguments.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2079 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Fl_Input now conditionally supports DND out via run-time option.
Fl_Input now clears selection if you click inside the selection when
DND is turned on.
Added support for scheme, dndTextOps, and visibleFocus resources under
X11.
Documented all X resources supported under X11...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2078 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
methods/constants to support Fl_Output as a special case of Fl_Input
(you can do everything but change the text in Fl_Output...)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2073 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Add FL_BACKGROUND_COLOR, FL_BACKGROUND2_COLOR, and FL_FOREGROUND_COLOR,
and use them instead of FL_GRAY, FL_WHITE, and FL_BLACK, respectively.
(FL_GRAY defined to FL_BACKGROUND_COLOR for back-compatibility)
Add fl_rgb_color(uchar g) inline method to map 8-bit grayscale to
24-bit RGB color.
Doco updates for all of this...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2072 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
show tooltips for box widgets.
Add docos for Fl_Widget::tooltip() methods.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2060 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This code splits the cut & paste into two buffers. The "SELECTION" is
used for the currently highlighted text and for middle-mouse paste and
(if possible) for handling drag & drop. The "CLIPBOARD" is for Ctrl+C
and Ctrl+V style cut & paste.
This matches how Motif, GTK, and KDE 3.0 work. But many older X
applications (including KDE 2) can only see SELECTION, this results in
cut & paste incompatability that is familiar to X users. However this
now moves fltk over to the majority camp. On all systems this
eliminates the annoying inability to select a region and replace it
with Ctrl+V.
On Mac and Win32 the SELECTION is local to the application, so
middle-mouse paste only works between fields in the application. There
may be tricks (special clipboard data types? use drag & drop?) to make
it communicate, but unless there are standards it would be fltk-only.
The file Fl_cutpaste.cxx has been deleted, so update the IDE files!
The Win32 and Mac versions have NOT BEEN TESTED! I tried to be careful
editing them but they may need some work.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1989 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
TODO: Fl::set_fonts() should add all of the fonts returned by Xft;
right now it is a no-op.
BUG: Getting X messages like "XRequest.155: 202 0x260002b" for some
reason on my system.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1987 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Update fltk-config to support all C++ file extensions.
Make background of FLTK logo transparent.
Disable overlays if the scheme is set.
Fix table cell formatting in Fl_Help_View. Still need to resolve an
issue with column widths vs. table widths.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1965 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Change how tabs are colored, and update the tabs demo to show it...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1951 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Add Fl_BMP_Image.H links to fltk.list.in.
Reset colors to standard FLTK ones in Fl::get_system_colors().
Don't clear button events when fixing focus.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1918 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Add fl_parse_color() to X11 version, too, and use it instead of XParseColor
in the image handling code.
Move the default color stuff in the plastic scheme to the MacOS
get_system_colors(), and apply the background color to the tile image.
More fixes for test makefile.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1901 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Added show(argc, argv) method to Fl_Help_Dialog.
Don't clear tab area in Fl_Tabs...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1896 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
keys and iBook keys, several fixes to keyboard focus.
Happy Holidays!
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1894 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
for new FLTK_SCHEME environment variable, which should get added to
FLTK 2.0 CVS, as well as the -scheme option...)
Revert Fl_Group/Fl_Widget destructor change - it doesn't work for
statically initialized widgets (like the widgets in a color chooser...)
Export fl_round_up_box() and fl_round_down_box() so they can be
restored in Fl::reload_scheme().
Use FL_DOWN_BOX and FL_ROUND_DOWN_BOX in menu drawing code.
Use a static string for the display environment variable in Fl::display().
Updated MacOS README file...
Added window tile image...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1883 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
all message handling now in Carbon.
mouse capture support added.
timer support added.
overlay support added.
getting there...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1881 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
- Fl_GIF_Image and Fl_PNG_Image didn't close the file before
calling Fl::error().
- Fl_Help_View didn't clear the line array in Fl_Help_Block,
and Fl_Help_Block::font and ::size were not used.
- Fl_Shared_Image::get() didn't return NULL if the image
could not be loaded.
- Switched to more efficient code for
Fl_Tiled_Image::color_average() and ::desaturate().
- Don't delete children in Fl_Text_Display since the group
will do it.
- Fixes to filename_isdir(), filename_absolute(), and
filename_relative().
- Was using numbers instead of define constants for some
OpenGL stuff under WIN32.
- Wasn't exporting threading functions under WIN32.
- The Fl_Widget destructor now removes from the parent to
avoid a Purify error since the old widget would be
referenced by the parent when it was destroyed; this has
no apparent performance impact since Fl_Group::clear()
sets children_ to 0, making Fl_Group::remove() very
fast...
- WIN32 font enumeration datatype fixes...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1878 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Use "while shown" instead of "while visible" in chooser functions,
since a desktop switch will make FLTK think the window is not visible
and prematurely return whatever file you have selected.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1849 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Add "--post program" option to fltk-config so that MacOS apps can bind
the resources. Also binds resources with --compile.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1846 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Redraw parent if child button loses focus and is using FL_NO_BOX.
Fix test/Makefile to build mandelbrot and shiny demos right.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1844 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
compare the file modification time against the symbol table time...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1815 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Almost all test applications run out of the box (->Makefile). See more
information in README.mac .
Changes:
- message handling
- access to opaque port structures
- image, bitmap, pixmap support
- most OpenGL stuff
- window styles
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1812 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Reversed to outdated (but working) event handling.
Added README.mac
Added mac.r minimal resource fork
Still lots of bugs, but initial rendering works
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1804 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
needed for updating the version numbers automatically, and I've
gotten update conflicts on several occasions.
The other files (fltk-config, etc.) are still generated by
autoconf.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1800 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
in boxier tabs, but you can customize as desired.
Fix plastic box types when drawing larger boxes that would default to
the color (without any adjustment).
Don't need to build fluid files anymore for source distro - visual C
projects now create them as needed.
Changelog update.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1797 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Enable tooltips by default, and don't enable them when setting the
tooltip value, since that will negate any changes a program might
make when displaying the file chooser dialog, etc.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1777 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Doco updates (use <!-- NEW PAGE --> instead of <HR break>, plus more
Fl_Text_Buffer docos)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1773 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
**** THIS CODE COMPILES BUT DOES NOT WORK. ****
TODO: fix event handling - getting blank windows, etc.
TODO: re-port OpenGL code.
TODO: add support for images with alpha.
TODO: add support for more then just beeps in fl_beep().
TODO: other stuff I'm sure...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1765 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
fl_dir_chooser(), so that apps like FLUID won't get absolute paths all
the time...
Update filename_xyz() functions to take a destination size, and provide
inline methods for the old FL_PATH_MAX convention.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1731 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
definitions, and (v)snprintf function declarations...
Fix Fl_File_Chooser so it always checks for an empty directory_ (so
that is doesn't add the leading slash to drive letters and mount
points)
Make Fl_File_Icon use Fl_Shared_Image, and look in all KDE icon
directories.
Fl::error() no longer exits by default; only Fl::fatal() does...
Wasn't doing callbacks in Fl_Tabs when the current tab was changed
via the keyboard.
FLUID wasn't writing the tooltips in message files, and didn't count
tooltips when computing the message number for catgets.
Update dependencies.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1729 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
The pixmap_browser demo now supports all image formats via Fl_Shared_Image.
Dropped image file stuff from image demo.
Added Fl_Tiled_Image class, which tiles an Fl_Image, useful for tiling a
background image in groups.
Added tiled_image demo.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1725 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Add Fl_Shared_Image class, with get() and release() methods.
Update Fl_Help_View to use Fl_Shared_Image class.
Update image demo to accept a filename, and to use the Fl_Shared_Image
class.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1714 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Update Fl_Image() class to track depth and data, so FLUID will be
able to use it as the base class.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1712 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
configure.
Comment out symlink stuff for Cygwin, and (hopefully) soon for OSX, too.
Add uninstall targets where needed.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1707 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
classes: new copy(), copy(w,h), desaturate(), color_average(), and
inactive() methods, alloc_xyz member for copied data, etc.
Updated test programs to use inactive() and copy() methods to create
inactive images for the test buttons, plus the inactive button to toggle
it...
Added start of separate image classes, a la 2.0, for various image formats.
FLUID will also be updated for it...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1703 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
for common mask generation stuff (need to test under WIN32!)
Add alpha channel support to Fl_RGB_Image class; currently uses "screen
door" transparency.
Update image demo to draw an RGBA image to show alpha channel.
Comment out debug printf in tooltip code.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1696 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Don't allow non-int/float text to be pasted into an Fl_Int_Input or
Fl_Float_Input widget.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1690 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
library isn't present or needed.
PNG image support updates for Fl_Help_View and Fl_File_Icon; didn't
handle transparency properly.
Support KDE 2.x icons.
Separate image/load_system_icons code from main Fl_File_Icon sources,
so that apps that don't use load_system_icons() won't need the image
libraries...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1687 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
function to generate an RGB Fl_Color value.
Sort button names in FLUID.
Fix focus and scroll problems in Fl_Text_Display/Editor.
Fix radio/button demo.
Removed D2 menubar.H header...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1663 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Change the help link function to get both the widget and pathname.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1659 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
in the FLUID window and havoc for the KDE 2.2 window manager...
Changed the default tooltip position to be +10, +10 from the
mouse pointer, and the default tooltip background color to a
pale yellow to match other toolkit defaults.
Update Fl_Widget::flags_ to be an integer, to support more flag
bits.
Update Fl_Window to support override() and set_override() methods.
The configure script did not set the default library path to
/usr/lib32 under IRIX 6.2 and higher when prefix is /usr.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1637 ea41ed52-d2ee-0310-a9c1-e6b18d33e121