diff --git a/ChangeLog b/ChangeLog index fbce80d0ba..36780fc028 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jul 6 13:18:12 1998 Scott Goehring + + * pixmaps.h pixmaps2.h tools.c: splits pixmaps up into two headers + * tile.c: fixed a doublelock deadlock + Sun Jul 5 15:49:02 EDT 1998 Adrian Likins * applied a patch from Adam D. Moss diff --git a/app/base/tile.c b/app/base/tile.c index 3aba49b79f..d21b79878a 100644 --- a/app/base/tile.c +++ b/app/base/tile.c @@ -439,6 +439,10 @@ tile_ref2 (Tile *tile, int dirty) } +#if USE_PTHREADS + pthread_mutex_unlock(&(tile->mutex)); +#endif + /* Read/write attachment to a mirrored/ing tile - must be * thoughtful. */ @@ -464,10 +468,6 @@ tile_ref2 (Tile *tile, int dirty) */ tile->dirty |= dirty; -#if USE_PTHREADS - pthread_mutex_unlock(&(tile->mutex)); -#endif - /* Call 'tile_manager_validate' if the tile was invalid. */ if (!tile->valid) diff --git a/app/pixmaps.h b/app/pixmaps.h index fc0306fd0d..47ea48fbd3 100644 --- a/app/pixmaps.h +++ b/app/pixmaps.h @@ -1,886 +1,4 @@ /* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: airbrush */ - - -#define airbrush_width 22 -#define airbrush_height 22 -static char *airbrush_bits [] = -{ - "......................", - "......................", - "......................", - "................aaa...", - "...............aaaae..", - "..............aaaaae..", - ".............aaaaaee..", - "............aaaaaee...", - ".......aa..aaaaaee....", - "......aa..aaaaaee.....", - "......a.aaaaaaee......", - "........ahaaaee.......", - ".......ahhgaee........", - "......ahhgaee.........", - ".....ahhgaae.....aa...", - "....ahhgaeea....a.....", - "....ahgaee.a....a.....", - "...ahaaee...a..a......", - "...aaeee.....aa.......", - "....ee................", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: bezier */ - - -#define bezier_width 22 -#define bezier_height 22 -static char *bezier_bits [] = -{ - "......................", - "......................", - "........eaaaaaae......", - "......aaa......a......", - ".....a.........ae.....", - "....a.........aaae....", - "....a........ahagae...", - "...a.........ahahae...", - "...a.........ahahae...", - "..aaa.......ahgaggae..", - "..aaae......ahgaggae..", - "..aaae.....ahgaaaggae.", - "...aee.....ahgeaeggae.", - "...a........agggggaee.", - "...a.........agggaee..", - "...a.........aaaaae...", - "...a.........aeaaae...", - "..a..........aeaaae...", - "..a..........aeaaae...", - ".a...........aeaaae...", - "..............eeeee...", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: blur */ - - -#define blur_width 22 -#define blur_height 22 -static char *blur_bits [] = -{ - "......................", - "......................", - "......................", - "..........e...........", - "..........e...........", - ".........ehe..........", - ".........ehee.........", - "........ehhge.........", - "........ehhgee........", - ".......ehhhgge........", - "......ehhhhhgge.......", - "......ehhhhhggee......", - ".....ehhhhhgggga......", - ".....ehhhhhggggae.....", - ".....egghhhggggae.....", - ".....egggggggggae.....", - "......agggggggaee.....", - ".......agggggaee......", - "........aaaaaee.......", - ".........eeeee........", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: circ */ - - -#define circ_width 22 -#define circ_height 22 -static char *circ_bits [] = -{ - "......................", - "......................", - "......................", - "......................", - "........aahha.........", - "......hhgggggah.......", - ".....ahgggggggha......", - ".....aggggggggga......", - "....hgggggggggggh.....", - "....agggggggggggh.....", - "....aggggggggggga.....", - "....hggggggggggga.....", - "....hgggggggggggh.....", - ".....agggggggggh......", - ".....ahgggggggaa......", - "......haggggghh.......", - "........ahhaa.........", - "......................", - "......................", - "......................", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: clone */ - - -#define clone_width 22 -#define clone_height 22 -static char *clone_bits [] = -{ - "......................", - "......................", - "......................", - "........eaaae.........", - ".......eahhgae........", - ".......aheeega........", - ".......ahgggga........", - ".......aggggga........", - ".......eagggae........", - "........eaaae.........", - ".........aha..........", - ".....aaaaahaaaaa......", - "....ahhhhaaahhhha.....", - "...ahhhhhhhhhhhhha....", - "...aaaaaaaaaaaaaaae...", - "...aggggaaaaaggggae...", - "...agggggaaagggggae...", - "...aggggggaggggggae...", - "....aaaaaaaaaaaaaee...", - ".....eeeeeeeeeeeee....", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: colorpicker */ - - -#define colorpicker_width 22 -#define colorpicker_height 22 -static char *colorpicker_bits [] = -{ - "......................", - "......................", - "......................", - "...............aaa....", - "..............aaaaa...", - "..............aaaaae..", - "...........aaaaaaaae..", - "............aaaaaaee..", - "...........ehaaaeee...", - "..........ehhhaae.....", - ".........ehhhaeae.....", - "........ehhhaee.e.....", - ".......ehhhaee........", - "......ehhhaee.........", - ".....ehhhaee..........", - "....ehhhaee...........", - "....ehhaee............", - "...ehaaee.............", - "....aeee..............", - ".....e................", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: crop */ - - -#define crop_width 22 -#define crop_height 22 -static char *crop_bits [] = -{ - "......................", - "......................", - "......................", - "................eae...", - "...............eaaa...", - "..............eaaae...", - ".............eaaaee...", - "............eaaaee....", - "...........eaaaee.....", - "..........eaaaee......", - ".........eaaaee.......", - "........eaaaee........", - ".......eaaaee.........", - "......eaaaee..........", - ".....eahhae...........", - "....eahhae............", - "...eehhae.............", - "...aaaae..............", - "......................", - "......................", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: erase */ - - -#define erase_width 22 -#define erase_height 22 -static char *erase_bits [] = -{ - "......................", - "......................", - "......................", - "......................", - "......................", - "......................", - "..........aaaaaaaa....", - ".........ahhhhhhaae...", - "........ahhhhhhagae...", - ".......ahhhhhhaggae...", - "......ahhhhhhaggaee...", - ".....ahhhhhhaggaee....", - "....ahhhhhhaggaee.....", - "...aaaaaaaaggaee......", - "...aggggggagaee.......", - "...aggggggaaee........", - "...aaaaaaaaee.........", - "....eeeeeeee..........", - "......................", - "......................", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: fill */ - - -#define fill_width 22 -#define fill_height 22 -static char *fill_bits [] = -{ - "......................", - "......................", - ".........ee...........", - "........eeee..........", - ".......eeggee.........", - ".......eegaee.........", - ".......eeahee.........", - ".......aahheeaa.......", - ".......ahhgeegaaa.....", - "......ahhghaeggaaa....", - ".....ahhghagaggeaaa...", - "....ahhghggaggeeaaae..", - "...ahhghgggggeeaaaae..", - "...ahghgggggeeaeaaae..", - "....ahgggggeeaeeaaae..", - ".....ahgggeeaee.aaae..", - "......aggeeaee..aaee..", - ".......aeeaee...aee...", - "........aaee.....e....", - ".........ee...........", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: free */ - - -#define free_width 22 -#define free_height 22 -static char *free_bits [] = -{ - "......................", - "......................", - "......................", - "......................", - ".........aaaaaaa......", - "......aaaeeeeeeeaa....", - ".....aeeee.......ea...", - "....ae............ae..", - "...ae.............ae..", - "...ae...........aaee..", - "...ae........aaaee....", - "....aaa...aaaeee......", - "...aa..aaae...........", - "...a.a.ae.............", - "....aaa...............", - "......a...............", - "......a...............", - ".....a................", - "......................", - "......................", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: fuzzy */ - - -#define fuzzy_width 22 -#define fuzzy_height 22 -static char *fuzzy_bits [] = -{ - "......................", - "......................", - "......h...............", - "....hgagh.............", - "....ahgha.............", - "...hgahagh............", - "...aghahga............", - "....hagah.............", - "....aghga.e...........", - "......a..ege..........", - "........eghge.........", - ".........eghge........", - "..........egaae.......", - "...........eaaae......", - "............eaaae.....", - ".............eaaae....", - "..............eaaae...", - "...............eaaae..", - "................eae...", - ".................e....", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: gradient */ - - -#define gradient_width 22 -#define gradient_height 22 -static char *gradient_bits [] = -{ - "......................", - "......................", - "......................", - "..eeeeeeeeeeeeeeeeee..", - "..aaaeeeegggggggghhe..", - "..aaeaeegegggggghghe..", - "..aaaeeeegggggggghhe..", - "..aaeaeegegggggghghe..", - "..aaaeeeegggggggghhe..", - "..aaeaeegegggggghghe..", - "..aaaeeeegggggggghhe..", - "..aaeaeegegggggghghe..", - "..aaaeeeegggggggghhe..", - "..aaeaeegegggggghghe..", - "..aaaeeeegggggggghhe..", - "..aaeaeegegggggghghe..", - "..aaaeeeegggggggghhe..", - "..aaaaeegegggggghghe..", - "..eeeeeeeeeeeeeeeeee..", - "......................", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: horizflip */ - - -#define horizflip_width 22 -#define horizflip_height 22 -static char *horizflip_bits [] = -{ - "......................", - "......................", - "......................", - "......................", - "......................", - "......................", - "......................", - "......a........a......", - ".....aa........aa.....", - "....aaaaaaaaaaaaaa....", - "...aaaeeeeeeeeeeaaa...", - "....aaaaaaaaaaaaaaee..", - ".....aaeeeeeeeeaaee...", - "......ae.......aee....", - ".......e........e.....", - "......................", - "......................", - "......................", - "......................", - "......................", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: iscissors */ - - -#define iscissors_width 22 -#define iscissors_height 22 -static char *iscissors_bits [] = -{ - "......................", - ".eaae.....aaa.........", - ".aaaa...eee.ea........", - ".aaaa...a....a........", - ".eaae..ea....aha......", - "..a....e..ha..hae.....", - "..a....a..hae.hae.....", - "..a....a..hae.hae.....", - "..ee...a...hahaee.....", - "...a..ee...hahae......", - "...a..a.....haae......", - "...a..a.....haae......", - "...eeea.....haha......", - ".....a.....haeha......", - "...........hae.ha.....", - "..........haee..haa...", - ".........haae..haeha..", - "........haeha..haehae.", - "........haehae..haaee.", - ".........haaee....ee..", - "...........ee.........", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: magnify */ - - -#define magnify_width 22 -#define magnify_height 22 -static char *magnify_bits [] = -{ - "......................", - "......................", - "......................", - "...........aaaa.......", - ".........eaghh.ae.....", - ".........ahheehhae....", - "........aghehhhhga....", - "........ahehhhhhhae...", - "........ahhhhhhhhae...", - "........aghhhhhhgae...", - ".........ahhhhhhaee...", - "........aaaghhgaee....", - ".......aaaeaaaaee.....", - "......aaaee.eeee......", - ".....aaaee............", - "....aaaee.............", - "...aaaee..............", - "...eaee...............", - "....ee................", - "......................", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: move */ - - -#define move_width 22 -#define move_height 22 -static char *move_bits [] = -{ - "......................", - "......................", - "......................", - "..........a...........", - ".........aaa..........", - "........aaaaa.........", - "..........aeee........", - "..........ae..........", - ".....a....ae...a......", - "....aa....ae...aa.....", - "...aaaaaaaaaaaaaaa....", - "....aaeeeeaeeeeaaee...", - ".....ae...ae...aee....", - "......e...ae....e.....", - "..........ae..........", - "........aaaaa.........", - ".........aaae.........", - "..........ae..........", - "..........e...........", - "......................", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: new */ - - -/* -#define new_width 22 -#define new_height 22 -static char *new_bits [] = -{ - "......................", - "......................", - "......................", - ".....aaaaaaaaa........", - ".....ahhhhhhhaa.......", - ".....ahhhhhhhaga......", - ".....ahhhhhhhagga.....", - ".....ahhhhhhhaaaae....", - ".....ahhhhhhhhggae....", - ".....ahhhhhhhhhhae....", - ".....ahhhhhhhhhhae....", - ".....ahhhhhhhhhhae....", - ".....ahhhhhhhhhhae....", - ".....ahhhhhhhhhhae....", - ".....ahhhhhhhhhhae....", - ".....ahhhhhhhhhhae....", - ".....ahhhhhhhhhhae....", - ".....aaaaaaaaaaaae....", - "......eeeeeeeeeeee....", - "......................", - "......................", - "......................" -}; -*/ -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: open */ - - -/* -#define open_width 22 -#define open_height 22 -static char *open_bits [] = -{ - "......................", - "......................", - "......................", - "......................", - "....eaaaae............", - "...eaggggae...........", - "...aggggggaaaaaaaae...", - "...agggggggggggggga...", - ".aaaaaaaaaaaaaagggae..", - ".aegegegegegegagggae..", - "..aegegegegegegaggae..", - "..agegegegegegeaggae..", - "...agegegegegegeagae..", - "...aegegegegegegagae..", - "...agegegegegegeagae..", - "....agegegegegegeaae..", - "....aegegegegegegaae..", - ".....aaaaaaaaaaaaaae..", - "......eeeeeeeeeeeeee..", - "......................", - "......................", - "......................" -}; -*/ -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: paint */ - - -#define paint_width 22 -#define paint_height 22 -static char *paint_bits [] = -{ - "......................", - "......................", - "......................", - ".............aggae....", - ".............aggae....", - "............aggaee....", - "............aggae.....", - "...........aggaee.....", - "...........aggae......", - "..........aggaee......", - "..........aggae.......", - ".........aaaaee.......", - "........aggaae........", - ".......ahhgaae........", - ".......ahgeaae........", - "......ahgeaaee........", - "......ageaaee.........", - ".....aheaaee..........", - "....aaaaeee...........", - ".....eeee.............", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: pencil */ - - -#define pencil_width 22 -#define pencil_height 22 -static char *pencil_bits [] = -{ - "......................", - "......................", - "......................", - "..........aaaa........", - "..........aggga.......", - ".........aggggae......", - ".........aaggaee......", - "........ahhaaae.......", - "........ahggaee.......", - ".......ahhggae........", - ".......ahggaee........", - "......ahhggae.........", - "......ahggaee.........", - "......aaggae..........", - "......aaaaee..........", - "......aaaee...........", - "......aaee............", - "......aee.............", - ".......e..............", - "......................", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: perspective */ - - -/* -#define perspective_width 22 -#define perspective_height 22 -static char *perspective_bits [] = -{ - "......................", - "......................", - "......................", - "......aaaaaaaaa.......", - ".....eegggggggee......", - ".....aegggggggea......", - "....agegggggggega.....", - "....agegggggggega.....", - "...eagegggggggegae....", - "...aggeeeeeeeeegga....", - "...aggggggggggggga....", - "..eagagagggggagagae...", - "..aggaagggggggaagga...", - "..aggaaagggggaaagga...", - ".aegggggggggggggggea..", - ".aaaaaaaaaaaaaaaaaaa..", - "......................", - "......................", - "......................", - "......................", - "......................", - "......................" -}; -*/ -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: rect */ - - -#define rect_width 22 -#define rect_height 22 -static char *rect_bits [] = -{ - "......................", - "......................", - "......................", - "......................", - "......................", - "....aahhaahhaahha.....", - "....hggggggggggga.....", - "....hgggggggggggh.....", - "....agggggggggggh.....", - "....aggggggggggga.....", - "....hggggggggggga.....", - "....hgggggggggggh.....", - "....agggggggggggh.....", - "....aggggggggggga.....", - "....hggggggggggga.....", - "....haahhaahhaahh.....", - "......................", - "......................", - "......................", - "......................", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: rotate */ - - -/* -#define rotate_width 22 -#define rotate_height 22 -static char *rotate_bits [] = -{ - "......................", - "......................", - ".aaaaaaaaaaa...aaa....", - ".aeeeeeeeeea..a...a.a.", - ".aeeeeeeeeea.......aa.", - ".aeeeeeeeeea......aaa.", - ".aeeeeeeeeeaae........", - ".aeeeeeeeeeggae.......", - ".aeeeeeeeegeggae......", - ".aeeeeeeeggegggae.....", - ".aeeeeeegggeggggae....", - ".aaaaaageeeegggggae...", - ".....eagggggggggggae..", - ".....agggggggggggggae.", - ".....eagggggggggggaee.", - "......eagggggggggaee..", - ".......eagggggggaee...", - ".aaa....eagggggaee....", - ".aa......eagggaee.....", - ".a.a...a..eagaee......", - "....aaa....eaee.......", - "............ee........" -}; -*/ -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: scale */ - - -#define scale_width 22 -#define scale_height 22 -static char *scale_bits [] = -{ - "......................", - "......................", - "..aaaaaaa.............", - "..aeeeeeaeaeaea.......", - "..aeeeeeaggggge.......", - "..aeeggggaaaaaaaaaa...", - "..aeegggegggggegggae..", - "..aaageeegggggagggae..", - "...egaggggggggegggae..", - "...agaggggggggegggae..", - "...egagggggggaggggae..", - "...aeaeaeaeaegagagae..", - ".....agggggggggaagae..", - ".....aggggggggaaagae..", - ".....aggggggggggggae..", - ".....aaaaaaaaaaaaaae..", - "......eeeeeeeeeeeeee..", - "......................", - "......................", - "......................", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: sharpen */ - - -/* -#define sharpen_width 22 -#define sharpen_height 22 -static char *sharpen_bits [] = -{ - "......................", - "......................", - "......................", - "..........a...........", - "..........ae..........", - ".........eha..........", - ".........eha..........", - ".........ehae.........", - "........ehgga.........", - "........ehgga.........", - "........ehggae........", - ".......ehgggga........", - ".......ehgggga........", - ".......ehggggae.......", - "......ehhggggga.......", - "......ehggggggae......", - "......ehggggggae......", - ".....ehhgggggeeae.....", - "......aaaaaaaaaee.....", - ".......eeeeeeeee......", - "......................", - "......................" -}; -*/ -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: skew */ - - -/* -#define skew_width 22 -#define skew_height 22 -static char *skew_bits [] = -{ - "......................", - "......................", - "......................", - "......................", - "...aaaaaaaaaaa........", - "...agggggggggea.......", - "...aeggggggggega......", - "...aeggggggggega......", - "...aeegggggggegga.....", - "...aeegggggggegga.....", - "...aeeeggggggeggga....", - "...aeeeggggggeggga....", - "...aeeeegggggegggga...", - "...aaaaageeeeegggga...", - "........agggggggggga..", - ".....a...aaaaaaaaaaa..", - "..aaaaa...............", - ".....a................", - "......................", - "......................", - "......................", - "......................" -}; -*/ -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: text */ - - -#define text_width 22 -#define text_height 22 -static char *text_bits [] = -{ - "......................", - "......................", - "......................", - "......................", - ".....aaaaaaaaaaa......", - ".....aaeeaaaeeaae.....", - ".....aee.aaae..ae.....", - "......e..aaae...e.....", - "........eaae..........", - "........eaae..........", - "........eaae..........", - "........aaae..........", - "........aae...........", - ".......eaae...........", - ".......eaae...........", - ".......aaae...........", - "......aaaaa...........", - ".......eeeee..........", - "......................", - "......................", - "......................", - "......................" -}; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: vertflip */ - - -/* -#define vertflip_width 22 -#define vertflip_height 22 -static char *vertflip_bits [] = -{ - "......................", - "......................", - "......................", - "..........a...........", - ".........aaa..........", - "........aaaaa.........", - ".......aaaeaaa........", - ".........aeaeee.......", - ".........aeae.........", - ".........aeae.........", - ".........aeae.........", - ".........aeae.........", - ".........aeae.........", - ".........aeae.........", - ".........aeae.........", - ".......aaaeaaa........", - "........aaaaaee.......", - ".........aaaee........", - "..........aee.........", - "...........e..........", - "......................", - "......................" -}; -*/ -/* GIMP icon image format -- S. Kimball, P. Mattis */ /* Image name: default */ @@ -925,37 +43,6 @@ static char *swap_bits [] = ".........e..." }; -/* GIMP icon image format -- S. Kimball, P. Mattis */ -/* Image name: ink */ - -#define ink_width 22 -#define ink_height 22 -static char *ink_bits [] = -{ - "......................", - "......................", - "...............aa.....", - "..............aaea....", - ".............aaeaaa...", - "............aaeaaaa...", - "...........aaeaaaae...", - "..........aaeaaaae....", - ".........aaeaaaae.....", - ".......aaaeaaaae......", - ".....aaaaaaaaae.......", - "....aaghhaaaae........", - "....ahaeagaae.........", - "...aahgaegaae.........", - "...ahhaeaeae..........", - "...ahaeggaae..........", - "..ahaegaaae...........", - "..aaeaaaee............", - ".aaaaeee..............", - ".aaee.................", - "..ee.................." - "......................", -}; - /* FIXME dialog is basically a temporary pixmap so the device status * window doesn't have problems showing the dialog devices, it doesn't * really represent anything and really should be changed diff --git a/app/pixmaps2.h b/app/pixmaps2.h new file mode 100644 index 0000000000..5843ebe5ae --- /dev/null +++ b/app/pixmaps2.h @@ -0,0 +1,914 @@ +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: airbrush */ + + +#define airbrush_width 22 +#define airbrush_height 22 +static char *airbrush_bits [] = +{ + "......................", + "......................", + "......................", + "................aaa...", + "...............aaaae..", + "..............aaaaae..", + ".............aaaaaee..", + "............aaaaaee...", + ".......aa..aaaaaee....", + "......aa..aaaaaee.....", + "......a.aaaaaaee......", + "........ahaaaee.......", + ".......ahhgaee........", + "......ahhgaee.........", + ".....ahhgaae.....aa...", + "....ahhgaeea....a.....", + "....ahgaee.a....a.....", + "...ahaaee...a..a......", + "...aaeee.....aa.......", + "....ee................", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: bezier */ + + +#define bezier_width 22 +#define bezier_height 22 +static char *bezier_bits [] = +{ + "......................", + "......................", + "........eaaaaaae......", + "......aaa......a......", + ".....a.........ae.....", + "....a.........aaae....", + "....a........ahagae...", + "...a.........ahahae...", + "...a.........ahahae...", + "..aaa.......ahgaggae..", + "..aaae......ahgaggae..", + "..aaae.....ahgaaaggae.", + "...aee.....ahgeaeggae.", + "...a........agggggaee.", + "...a.........agggaee..", + "...a.........aaaaae...", + "...a.........aeaaae...", + "..a..........aeaaae...", + "..a..........aeaaae...", + ".a...........aeaaae...", + "..............eeeee...", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: blur */ + + +#define blur_width 22 +#define blur_height 22 +static char *blur_bits [] = +{ + "......................", + "......................", + "......................", + "..........e...........", + "..........e...........", + ".........ehe..........", + ".........ehee.........", + "........ehhge.........", + "........ehhgee........", + ".......ehhhgge........", + "......ehhhhhgge.......", + "......ehhhhhggee......", + ".....ehhhhhgggga......", + ".....ehhhhhggggae.....", + ".....egghhhggggae.....", + ".....egggggggggae.....", + "......agggggggaee.....", + ".......agggggaee......", + "........aaaaaee.......", + ".........eeeee........", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: circ */ + + +#define circ_width 22 +#define circ_height 22 +static char *circ_bits [] = +{ + "......................", + "......................", + "......................", + "......................", + "........aahha.........", + "......hhgggggah.......", + ".....ahgggggggha......", + ".....aggggggggga......", + "....hgggggggggggh.....", + "....agggggggggggh.....", + "....aggggggggggga.....", + "....hggggggggggga.....", + "....hgggggggggggh.....", + ".....agggggggggh......", + ".....ahgggggggaa......", + "......haggggghh.......", + "........ahhaa.........", + "......................", + "......................", + "......................", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: clone */ + + +#define clone_width 22 +#define clone_height 22 +static char *clone_bits [] = +{ + "......................", + "......................", + "......................", + "........eaaae.........", + ".......eahhgae........", + ".......aheeega........", + ".......ahgggga........", + ".......aggggga........", + ".......eagggae........", + "........eaaae.........", + ".........aha..........", + ".....aaaaahaaaaa......", + "....ahhhhaaahhhha.....", + "...ahhhhhhhhhhhhha....", + "...aaaaaaaaaaaaaaae...", + "...aggggaaaaaggggae...", + "...agggggaaagggggae...", + "...aggggggaggggggae...", + "....aaaaaaaaaaaaaee...", + ".....eeeeeeeeeeeee....", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: colorpicker */ + + +#define colorpicker_width 22 +#define colorpicker_height 22 +static char *colorpicker_bits [] = +{ + "......................", + "......................", + "......................", + "...............aaa....", + "..............aaaaa...", + "..............aaaaae..", + "...........aaaaaaaae..", + "............aaaaaaee..", + "...........ehaaaeee...", + "..........ehhhaae.....", + ".........ehhhaeae.....", + "........ehhhaee.e.....", + ".......ehhhaee........", + "......ehhhaee.........", + ".....ehhhaee..........", + "....ehhhaee...........", + "....ehhaee............", + "...ehaaee.............", + "....aeee..............", + ".....e................", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: crop */ + + +#define crop_width 22 +#define crop_height 22 +static char *crop_bits [] = +{ + "......................", + "......................", + "......................", + "................eae...", + "...............eaaa...", + "..............eaaae...", + ".............eaaaee...", + "............eaaaee....", + "...........eaaaee.....", + "..........eaaaee......", + ".........eaaaee.......", + "........eaaaee........", + ".......eaaaee.........", + "......eaaaee..........", + ".....eahhae...........", + "....eahhae............", + "...eehhae.............", + "...aaaae..............", + "......................", + "......................", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: erase */ + + +#define erase_width 22 +#define erase_height 22 +static char *erase_bits [] = +{ + "......................", + "......................", + "......................", + "......................", + "......................", + "......................", + "..........aaaaaaaa....", + ".........ahhhhhhaae...", + "........ahhhhhhagae...", + ".......ahhhhhhaggae...", + "......ahhhhhhaggaee...", + ".....ahhhhhhaggaee....", + "....ahhhhhhaggaee.....", + "...aaaaaaaaggaee......", + "...aggggggagaee.......", + "...aggggggaaee........", + "...aaaaaaaaee.........", + "....eeeeeeee..........", + "......................", + "......................", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: fill */ + + +#define fill_width 22 +#define fill_height 22 +static char *fill_bits [] = +{ + "......................", + "......................", + ".........ee...........", + "........eeee..........", + ".......eeggee.........", + ".......eegaee.........", + ".......eeahee.........", + ".......aahheeaa.......", + ".......ahhgeegaaa.....", + "......ahhghaeggaaa....", + ".....ahhghagaggeaaa...", + "....ahhghggaggeeaaae..", + "...ahhghgggggeeaaaae..", + "...ahghgggggeeaeaaae..", + "....ahgggggeeaeeaaae..", + ".....ahgggeeaee.aaae..", + "......aggeeaee..aaee..", + ".......aeeaee...aee...", + "........aaee.....e....", + ".........ee...........", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: free */ + + +#define free_width 22 +#define free_height 22 +static char *free_bits [] = +{ + "......................", + "......................", + "......................", + "......................", + ".........aaaaaaa......", + "......aaaeeeeeeeaa....", + ".....aeeee.......ea...", + "....ae............ae..", + "...ae.............ae..", + "...ae...........aaee..", + "...ae........aaaee....", + "....aaa...aaaeee......", + "...aa..aaae...........", + "...a.a.ae.............", + "....aaa...............", + "......a...............", + "......a...............", + ".....a................", + "......................", + "......................", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: fuzzy */ + + +#define fuzzy_width 22 +#define fuzzy_height 22 +static char *fuzzy_bits [] = +{ + "......................", + "......................", + "......h...............", + "....hgagh.............", + "....ahgha.............", + "...hgahagh............", + "...aghahga............", + "....hagah.............", + "....aghga.e...........", + "......a..ege..........", + "........eghge.........", + ".........eghge........", + "..........egaae.......", + "...........eaaae......", + "............eaaae.....", + ".............eaaae....", + "..............eaaae...", + "...............eaaae..", + "................eae...", + ".................e....", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: gradient */ + + +#define gradient_width 22 +#define gradient_height 22 +static char *gradient_bits [] = +{ + "......................", + "......................", + "......................", + "..eeeeeeeeeeeeeeeeee..", + "..aaaeeeegggggggghhe..", + "..aaeaeegegggggghghe..", + "..aaaeeeegggggggghhe..", + "..aaeaeegegggggghghe..", + "..aaaeeeegggggggghhe..", + "..aaeaeegegggggghghe..", + "..aaaeeeegggggggghhe..", + "..aaeaeegegggggghghe..", + "..aaaeeeegggggggghhe..", + "..aaeaeegegggggghghe..", + "..aaaeeeegggggggghhe..", + "..aaeaeegegggggghghe..", + "..aaaeeeegggggggghhe..", + "..aaaaeegegggggghghe..", + "..eeeeeeeeeeeeeeeeee..", + "......................", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: horizflip */ + + +#define horizflip_width 22 +#define horizflip_height 22 +static char *horizflip_bits [] = +{ + "......................", + "......................", + "......................", + "......................", + "......................", + "......................", + "......................", + "......a........a......", + ".....aa........aa.....", + "....aaaaaaaaaaaaaa....", + "...aaaeeeeeeeeeeaaa...", + "....aaaaaaaaaaaaaaee..", + ".....aaeeeeeeeeaaee...", + "......ae.......aee....", + ".......e........e.....", + "......................", + "......................", + "......................", + "......................", + "......................", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: iscissors */ + + +#define iscissors_width 22 +#define iscissors_height 22 +static char *iscissors_bits [] = +{ + "......................", + ".eaae.....aaa.........", + ".aaaa...eee.ea........", + ".aaaa...a....a........", + ".eaae..ea....aha......", + "..a....e..ha..hae.....", + "..a....a..hae.hae.....", + "..a....a..hae.hae.....", + "..ee...a...hahaee.....", + "...a..ee...hahae......", + "...a..a.....haae......", + "...a..a.....haae......", + "...eeea.....haha......", + ".....a.....haeha......", + "...........hae.ha.....", + "..........haee..haa...", + ".........haae..haeha..", + "........haeha..haehae.", + "........haehae..haaee.", + ".........haaee....ee..", + "...........ee.........", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: magnify */ + + +#define magnify_width 22 +#define magnify_height 22 +static char *magnify_bits [] = +{ + "......................", + "......................", + "......................", + "...........aaaa.......", + ".........eaghh.ae.....", + ".........ahheehhae....", + "........aghehhhhga....", + "........ahehhhhhhae...", + "........ahhhhhhhhae...", + "........aghhhhhhgae...", + ".........ahhhhhhaee...", + "........aaaghhgaee....", + ".......aaaeaaaaee.....", + "......aaaee.eeee......", + ".....aaaee............", + "....aaaee.............", + "...aaaee..............", + "...eaee...............", + "....ee................", + "......................", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: move */ + + +#define move_width 22 +#define move_height 22 +static char *move_bits [] = +{ + "......................", + "......................", + "......................", + "..........a...........", + ".........aaa..........", + "........aaaaa.........", + "..........aeee........", + "..........ae..........", + ".....a....ae...a......", + "....aa....ae...aa.....", + "...aaaaaaaaaaaaaaa....", + "....aaeeeeaeeeeaaee...", + ".....ae...ae...aee....", + "......e...ae....e.....", + "..........ae..........", + "........aaaaa.........", + ".........aaae.........", + "..........ae..........", + "..........e...........", + "......................", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: new */ + + +/* +#define new_width 22 +#define new_height 22 +static char *new_bits [] = +{ + "......................", + "......................", + "......................", + ".....aaaaaaaaa........", + ".....ahhhhhhhaa.......", + ".....ahhhhhhhaga......", + ".....ahhhhhhhagga.....", + ".....ahhhhhhhaaaae....", + ".....ahhhhhhhhggae....", + ".....ahhhhhhhhhhae....", + ".....ahhhhhhhhhhae....", + ".....ahhhhhhhhhhae....", + ".....ahhhhhhhhhhae....", + ".....ahhhhhhhhhhae....", + ".....ahhhhhhhhhhae....", + ".....ahhhhhhhhhhae....", + ".....ahhhhhhhhhhae....", + ".....aaaaaaaaaaaae....", + "......eeeeeeeeeeee....", + "......................", + "......................", + "......................" +}; +*/ +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: open */ + + +/* +#define open_width 22 +#define open_height 22 +static char *open_bits [] = +{ + "......................", + "......................", + "......................", + "......................", + "....eaaaae............", + "...eaggggae...........", + "...aggggggaaaaaaaae...", + "...agggggggggggggga...", + ".aaaaaaaaaaaaaagggae..", + ".aegegegegegegagggae..", + "..aegegegegegegaggae..", + "..agegegegegegeaggae..", + "...agegegegegegeagae..", + "...aegegegegegegagae..", + "...agegegegegegeagae..", + "....agegegegegegeaae..", + "....aegegegegegegaae..", + ".....aaaaaaaaaaaaaae..", + "......eeeeeeeeeeeeee..", + "......................", + "......................", + "......................" +}; +*/ +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: paint */ + + +#define paint_width 22 +#define paint_height 22 +static char *paint_bits [] = +{ + "......................", + "......................", + "......................", + ".............aggae....", + ".............aggae....", + "............aggaee....", + "............aggae.....", + "...........aggaee.....", + "...........aggae......", + "..........aggaee......", + "..........aggae.......", + ".........aaaaee.......", + "........aggaae........", + ".......ahhgaae........", + ".......ahgeaae........", + "......ahgeaaee........", + "......ageaaee.........", + ".....aheaaee..........", + "....aaaaeee...........", + ".....eeee.............", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: pencil */ + + +#define pencil_width 22 +#define pencil_height 22 +static char *pencil_bits [] = +{ + "......................", + "......................", + "......................", + "..........aaaa........", + "..........aggga.......", + ".........aggggae......", + ".........aaggaee......", + "........ahhaaae.......", + "........ahggaee.......", + ".......ahhggae........", + ".......ahggaee........", + "......ahhggae.........", + "......ahggaee.........", + "......aaggae..........", + "......aaaaee..........", + "......aaaee...........", + "......aaee............", + "......aee.............", + ".......e..............", + "......................", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: perspective */ + + +/* +#define perspective_width 22 +#define perspective_height 22 +static char *perspective_bits [] = +{ + "......................", + "......................", + "......................", + "......aaaaaaaaa.......", + ".....eegggggggee......", + ".....aegggggggea......", + "....agegggggggega.....", + "....agegggggggega.....", + "...eagegggggggegae....", + "...aggeeeeeeeeegga....", + "...aggggggggggggga....", + "..eagagagggggagagae...", + "..aggaagggggggaagga...", + "..aggaaagggggaaagga...", + ".aegggggggggggggggea..", + ".aaaaaaaaaaaaaaaaaaa..", + "......................", + "......................", + "......................", + "......................", + "......................", + "......................" +}; +*/ +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: rect */ + + +#define rect_width 22 +#define rect_height 22 +static char *rect_bits [] = +{ + "......................", + "......................", + "......................", + "......................", + "......................", + "....aahhaahhaahha.....", + "....hggggggggggga.....", + "....hgggggggggggh.....", + "....agggggggggggh.....", + "....aggggggggggga.....", + "....hggggggggggga.....", + "....hgggggggggggh.....", + "....agggggggggggh.....", + "....aggggggggggga.....", + "....hggggggggggga.....", + "....haahhaahhaahh.....", + "......................", + "......................", + "......................", + "......................", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: rotate */ + + +/* +#define rotate_width 22 +#define rotate_height 22 +static char *rotate_bits [] = +{ + "......................", + "......................", + ".aaaaaaaaaaa...aaa....", + ".aeeeeeeeeea..a...a.a.", + ".aeeeeeeeeea.......aa.", + ".aeeeeeeeeea......aaa.", + ".aeeeeeeeeeaae........", + ".aeeeeeeeeeggae.......", + ".aeeeeeeeegeggae......", + ".aeeeeeeeggegggae.....", + ".aeeeeeegggeggggae....", + ".aaaaaageeeegggggae...", + ".....eagggggggggggae..", + ".....agggggggggggggae.", + ".....eagggggggggggaee.", + "......eagggggggggaee..", + ".......eagggggggaee...", + ".aaa....eagggggaee....", + ".aa......eagggaee.....", + ".a.a...a..eagaee......", + "....aaa....eaee.......", + "............ee........" +}; +*/ +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: scale */ + + +#define scale_width 22 +#define scale_height 22 +static char *scale_bits [] = +{ + "......................", + "......................", + "..aaaaaaa.............", + "..aeeeeeaeaeaea.......", + "..aeeeeeaggggge.......", + "..aeeggggaaaaaaaaaa...", + "..aeegggegggggegggae..", + "..aaageeegggggagggae..", + "...egaggggggggegggae..", + "...agaggggggggegggae..", + "...egagggggggaggggae..", + "...aeaeaeaeaegagagae..", + ".....agggggggggaagae..", + ".....aggggggggaaagae..", + ".....aggggggggggggae..", + ".....aaaaaaaaaaaaaae..", + "......eeeeeeeeeeeeee..", + "......................", + "......................", + "......................", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: sharpen */ + + +/* +#define sharpen_width 22 +#define sharpen_height 22 +static char *sharpen_bits [] = +{ + "......................", + "......................", + "......................", + "..........a...........", + "..........ae..........", + ".........eha..........", + ".........eha..........", + ".........ehae.........", + "........ehgga.........", + "........ehgga.........", + "........ehggae........", + ".......ehgggga........", + ".......ehgggga........", + ".......ehggggae.......", + "......ehhggggga.......", + "......ehggggggae......", + "......ehggggggae......", + ".....ehhgggggeeae.....", + "......aaaaaaaaaee.....", + ".......eeeeeeeee......", + "......................", + "......................" +}; +*/ +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: skew */ + + +/* +#define skew_width 22 +#define skew_height 22 +static char *skew_bits [] = +{ + "......................", + "......................", + "......................", + "......................", + "...aaaaaaaaaaa........", + "...agggggggggea.......", + "...aeggggggggega......", + "...aeggggggggega......", + "...aeegggggggegga.....", + "...aeegggggggegga.....", + "...aeeeggggggeggga....", + "...aeeeggggggeggga....", + "...aeeeegggggegggga...", + "...aaaaageeeeegggga...", + "........agggggggggga..", + ".....a...aaaaaaaaaaa..", + "..aaaaa...............", + ".....a................", + "......................", + "......................", + "......................", + "......................" +}; +*/ +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: text */ + + +#define text_width 22 +#define text_height 22 +static char *text_bits [] = +{ + "......................", + "......................", + "......................", + "......................", + ".....aaaaaaaaaaa......", + ".....aaeeaaaeeaae.....", + ".....aee.aaae..ae.....", + "......e..aaae...e.....", + "........eaae..........", + "........eaae..........", + "........eaae..........", + "........aaae..........", + "........aae...........", + ".......eaae...........", + ".......eaae...........", + ".......aaae...........", + "......aaaaa...........", + ".......eeeee..........", + "......................", + "......................", + "......................", + "......................" +}; +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: vertflip */ + + +/* +#define vertflip_width 22 +#define vertflip_height 22 +static char *vertflip_bits [] = +{ + "......................", + "......................", + "......................", + "..........a...........", + ".........aaa..........", + "........aaaaa.........", + ".......aaaeaaa........", + ".........aeaeee.......", + ".........aeae.........", + ".........aeae.........", + ".........aeae.........", + ".........aeae.........", + ".........aeae.........", + ".........aeae.........", + ".........aeae.........", + ".......aaaeaaa........", + "........aaaaaee.......", + ".........aaaee........", + "..........aee.........", + "...........e..........", + "......................", + "......................" +}; +*/ + +/* GIMP icon image format -- S. Kimball, P. Mattis */ +/* Image name: ink */ + +#define ink_width 22 +#define ink_height 22 +static char *ink_bits [] = +{ + "......................", + "......................", + "...............aa.....", + "..............aaea....", + ".............aaeaaa...", + "............aaeaaaa...", + "...........aaeaaaae...", + "..........aaeaaaae....", + ".........aaeaaaae.....", + ".......aaaeaaaae......", + ".....aaaaaaaaae.......", + "....aaghhaaaae........", + "....ahaeagaae.........", + "...aahgaegaae.........", + "...ahhaeaeae..........", + "...ahaeggaae..........", + "..ahaegaaae...........", + "..aaeaaaee............", + ".aaaaeee..............", + ".aaee.................", + "..ee..................", + "......................" +}; + diff --git a/app/tile.c b/app/tile.c index 3aba49b79f..d21b79878a 100644 --- a/app/tile.c +++ b/app/tile.c @@ -439,6 +439,10 @@ tile_ref2 (Tile *tile, int dirty) } +#if USE_PTHREADS + pthread_mutex_unlock(&(tile->mutex)); +#endif + /* Read/write attachment to a mirrored/ing tile - must be * thoughtful. */ @@ -464,10 +468,6 @@ tile_ref2 (Tile *tile, int dirty) */ tile->dirty |= dirty; -#if USE_PTHREADS - pthread_mutex_unlock(&(tile->mutex)); -#endif - /* Call 'tile_manager_validate' if the tile was invalid. */ if (!tile->valid) diff --git a/app/tools.c b/app/tools.c index 1263a5dfe6..7e800554c8 100644 --- a/app/tools.c +++ b/app/tools.c @@ -56,7 +56,8 @@ #include "threshold.h" #include "tools.h" #include "transform_tool.h" -#include "pixmaps.h" + +#include "pixmaps2.h" /* Global Data */ diff --git a/app/tools/tools.c b/app/tools/tools.c index 1263a5dfe6..7e800554c8 100644 --- a/app/tools/tools.c +++ b/app/tools/tools.c @@ -56,7 +56,8 @@ #include "threshold.h" #include "tools.h" #include "transform_tool.h" -#include "pixmaps.h" + +#include "pixmaps2.h" /* Global Data */