Removed USE_PRECOMPILED_HEADER option.

This commit is contained in:
David Capello 2008-02-11 01:56:20 +00:00
parent 3290dfb7d5
commit a408d8917b
175 changed files with 16 additions and 889 deletions

View File

@ -12,13 +12,7 @@ NEWS
My Computer, etc.
+ Optimized the loading/saving operations (using threads).
+ Restructured all the menus (more user friendly options).
- Temporaly removed a lot of complex functionality:
Mask-Repository (but you can use .msk files yet), Draw-Text,
Layer-Sets and Linked-Cels.
+ New XML format for the menus.
- Removed menu scripting customization.
- Removed screen saver.
- Removed sessions.
+ Enhanced GUI:
+ more borders for windows and more spacing between widgets.
+ better mouse behavior (now in Windows the mouse is captured).
@ -27,6 +21,17 @@ NEWS
(screen-scaling x2). This is the new default video mode for ASE.
+ Fixed other minor problems when you drawn in 'tiled mode' or 'paste'
the clipboard.
- Removed a lot of complex functionality:
- Removed mask-repositories (you can use .msk files instead).
- Removed menu scripting customization.
- Removed screen saver.
- Removed sessions.
- Removed draw-text (it'll return in next versions).
- Removed layer-sets (the Film-Editor can't handle them right at the
moment)
- Removed linked-cels (were complex for the end-user).
- Also the scripting support is broken, next versions of ASE will
contain a better set of routines to create scripts.
0.5
---

View File

@ -4,7 +4,6 @@ High priority work
- search for TODO;
- rename jcombox.c to jcombobox.c
- remove the jfilesel.c
- remove USE_PRECOMPILED_HEADER
- fix copyright years (2001-2008)
- fix a bug in the film editor when move the separator (panel) outside
the screen (to left or right)

172
all.h
View File

@ -1,172 +0,0 @@
#include "allegro.h"
#include "allegro/internal/aintern.h"
#include "console/console.h"
#include "core/app.h"
#include "core/cfg.h"
#include "core/core.h"
#include "core/dirs.h"
#include "core/modules.h"
#include "core/shutdown.h"
#include "dialogs/about.h"
#include "dialogs/canvasze.h"
#include "dialogs/colsel.h"
#include "dialogs/dfrlen.h"
#include "dialogs/dmapgen.h"
#include "dialogs/dpaledit.h"
#include "dialogs/drawtext.h"
#include "dialogs/effect.h"
#include "dialogs/filesel.h"
#include "dialogs/filmedit.h"
#include "dialogs/gfxsel.h"
#include "dialogs/maskcol.h"
#include "dialogs/maskrepo.h"
#include "dialogs/minipal.h"
#include "dialogs/options.h"
#include "dialogs/playfli.h"
#include "dialogs/quick.h"
#include "dialogs/repo.h"
#include "dialogs/scrsaver.h"
#include "dialogs/tips.h"
#include "dialogs/toolconf.h"
#include "dialogs/vectmap.h"
#include "dialogs/viewspr.h"
#include "effect/colcurve.h"
#include "effect/convmatr.h"
#include "effect/effect.h"
#include "effect/invrtcol.h"
#include "effect/median.h"
#include "effect/replcol.h"
#include "file/ase.h"
#include "file/file.h"
#include "file/gif/format.h"
#include "file/gif/lzw.h"
#include "gfli.h"
#include "intl/intl.h"
#include "intl/msgids.h"
#include "jinete.h"
#include "jinete/alert.h"
#include "jinete/base.h"
#include "jinete/box.h"
#include "jinete/button.h"
#include "jinete/draw.h"
#include "jinete/entry.h"
#include "jinete/hook.h"
#include "jinete/intern.h"
#include "jinete/label.h"
#include "jinete/list.h"
#include "jinete/listbox.h"
#include "jinete/manager.h"
#include "jinete/menu.h"
#include "jinete/message.h"
#include "jinete/rect.h"
#include "jinete/region.h"
#include "jinete/sep.h"
#include "jinete/slider.h"
#include "jinete/system.h"
#include "jinete/textbox.h"
#include "jinete/theme.h"
#include "jinete/view.h"
#include "jinete/widget.h"
#include "jinete/window.h"
#include "lauxlib.h"
#include "libart_lgpl/libart-features.h"
#include "libart_lgpl/libart.h"
#include "lua.h"
#include "lualib.h"
#include "modules/chkmthds.h"
#include "modules/color.h"
#include "modules/editors.h"
#include "modules/gfx.h"
#include "modules/gui.h"
#include "modules/palette.h"
#include "modules/recent.h"
#include "modules/rootmenu.h"
#include "modules/sprites.h"
#include "modules/tools.h"
#include "modules/tools2.h"
#include "png.h"
#include "raster/algo.h"
#include "raster/blend.h"
#include "raster/brush.h"
#include "raster/dirty.h"
#include "raster/frame.h"
#include "raster/gfxobj.h"
#include "raster/image.h"
#include "raster/layer.h"
#include "raster/mask.h"
#include "raster/path.h"
#include "raster/quant.h"
#include "raster/raster.h"
#include "raster/rotate.h"
#include "raster/sprite.h"
#include "raster/stock.h"
#include "raster/undo.h"
#include "script/bindings.h"
#include "script/import.h"
#include "script/script.h"
#include "util/autocrop.h"
#include "util/boundary.h"
#include "util/clipbrd.h"
#include "util/col_file.h"
#include "util/crop.h"
#include "util/filetoks.h"
#include "util/flip.h"
#include "util/frmove.h"
#include "util/hash.h"
#include "util/mapgen.h"
#include "util/misc.h"
#include "util/msk_file.h"
#include "util/pic_file.h"
#include "util/quantize.h"
#include "util/recscr.h"
#include "util/render.h"
#include "util/scrshot.h"
#include "util/setgfx.h"
#include "util/thmbnail.h"
#include "widgets/colbar.h"
#include "widgets/colbut.h"
#include "widgets/colview.h"
#include "widgets/curvedit.h"
#include "widgets/editor.h"
#include "widgets/groupbut.h"
#include "widgets/menu.h"
#include "widgets/paledit.h"
#include "widgets/preview.h"
#include "widgets/statebar.h"
#include "widgets/target.h"
#include "widgets/toolbar.h"
#include "zlib.h"
#include <allegro.h>
#include <allegro/base.h>
#include <allegro/color.h>
#include <allegro/config.h>
#include <allegro/draw.h>
#include <allegro/file.h>
#include <allegro/gfx.h>
#include <allegro/internal/aintern.h>
#include <allegro/keyboard.h>
#include <allegro/system.h>
#include <allegro/unicode.h>
#include <ctype.h>
#include <errno.h>
#ifdef HAVE_LIBJPEG
#include <jpeglib.h>
#endif
#ifdef HAVE_JPGALLEG
#include <jpgalleg.h>
#endif
#include <limits.h>
#include <math.h>
#include <setjmp.h>
#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <assert.h>
#if 0
#include "ft2build.h"
#include FT_FREETYPE_H
#endif

View File

@ -25,18 +25,13 @@
/* general information */
#define PACKAGE "ase"
#define VERSION "0.6"
#define VERSION "0.6 BETA 2"
#define WEBSITE "http://www.aseprite.org/"
#define BUGREPORT "aseprite@googlegroups.com"
#define COPYRIGHT "Copyright (C) 2001-2008 David A. Capello"
#define PRINTF verbose_printf
/* include everything headers files to precompile */
#ifdef USE_PRECOMPILED_HEADER
#include "all.h"
#endif
/* defined in src/core/core.c */
void verbose_printf(const char *format, ...);

12
fix.sh
View File

@ -35,12 +35,6 @@ else
prefix=""
fi
######################################################################
# precompiled header
readln "Do you want use precompiled header (needs GCC >= 3.4) (y/n)?" "n"
precompiled_header=$ans
######################################################################
# show information
@ -65,9 +59,6 @@ if [ "$prefix" != "" ] ; then
echo " Prefix: $prefix"
fi
echo -n " Precompiled header: "
if [ "$precompiled_header" == "y" ] ; then echo "yes" ; else echo "no" ; fi
echo ""
readln "Is it right (y/n)?" "y"
if [ $ans != "y" ] ; then exit ; fi
@ -111,9 +102,6 @@ gen_makefile()
if [ "$prefix" == "" ] ; then echo -n "#" >> $makefile ; fi
echo "DEFAULT_PREFIX = \"$prefix\"" >> $makefile
if [ "$precompiled_header" != "y" ] ; then echo -n "#" >> $makefile ; fi
echo "USE_PRECOMPILED_HEADER = 1" >> $makefile
echo "#USE_X86_INT_MULT = 1" >> $makefile
echo "" >> $makefile
echo "include $makefile_name" >> $makefile

View File

@ -20,11 +20,6 @@
#DEFAULT_PREFIX = /usr/local
######################################################################
# Use the GCC precompiled header facility
#USE_PRECOMPILED_HEADER = 1
######################################################################
# Uncomment if you want to use the "_int_mult" routine written in
# assembler for i386 processors in replacement of the INT_MULT() macro

View File

@ -41,10 +41,6 @@ ifdef DEFAULT_PREFIX
CFLAGS += -DDEFAULT_PREFIX="\"$(DEFAULT_PREFIX)\""
endif
ifdef USE_PRECOMPILED_HEADER
CFLAGS += -DUSE_PRECOMPILED_HEADER
endif
ifdef USE_X86_INT_MULT
CFLAGS += -DUSE_X86_INT_MULT
endif
@ -130,17 +126,7 @@ VPATH = src \
$(LIBPNG_DIR) \
$(ZLIB_DIR)
ifdef USE_PRECOMPILED_HEADER
ASE_DEPS = config.h.gch
else
ASE_DEPS =
endif
ASE_DEPS += $(ASE_OBJS) $(THIRD_PARTY_LIBS)
ifdef USE_PRECOMPILED_HEADER
config.h.gch: config.h
$(CC) $(CFLAGS) -o $@ -c $<
endif
ASE_DEPS = $(ASE_OBJS) $(THIRD_PARTY_LIBS)
######################################################################
# Rules to build the object files

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include "jinete/jinete.h"
@ -28,8 +26,6 @@
#include "core/core.h"
#include "core/dirs.h"
#endif
static char *read_authors_txt(const char *filename);
static void cmd_about_execute(const char *argument)

View File

@ -18,16 +18,12 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
#include "core/app.h"
#include "core/cfg.h"
#endif
static bool advanced_mode = FALSE;
static void cmd_advanced_mode_execute(const char *argument)

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
@ -31,8 +29,6 @@
#include "raster/sprite.h"
#include "raster/undo.h"
#endif
static bool cmd_cel_properties_enabled(const char *argument)
{
return

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
@ -32,8 +30,6 @@
#include "raster/quant.h"
#include "raster/sprite.h"
#endif
static bool cmd_change_image_type_enabled(const char *argument)
{
return current_sprite != NULL;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "commands/commands.h"
#include "core/app.h"
#include "modules/gui.h"
@ -28,8 +26,6 @@
#include "util/misc.h"
#include "widgets/colbar.h"
#endif
static bool cmd_clear_enabled(const char *argument)
{
return current_sprite != NULL;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include "jinete/jinete.h"
@ -28,8 +26,6 @@
#include "modules/sprites.h"
#include "raster/sprite.h"
#endif
static bool close_current_sprite(void);
/* ======================== */

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include "jinete/jinete.h"
@ -30,8 +28,6 @@
#include "modules/gui.h"
#include "modules/palette.h"
#endif
#define DEPTH_TO_INDEX(bpp) \
((bpp == 8)? 0: \
(bpp == 15)? 1: \

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include "jinete/jinete.h"
@ -41,8 +39,6 @@
#include "widgets/groupbut.h"
#include "widgets/statebar.h"
#endif
static JWidget window = NULL;
static bool brush_preview_msg_proc(JWidget widget, JMessage msg);

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jbase.h"
#include "commands/commands.h"
@ -30,8 +28,6 @@
#include "util/clipbrd.h"
#include "util/misc.h"
#endif
static bool cmd_copy_enabled(const char *argument)
{
if ((!current_sprite) ||

View File

@ -18,16 +18,12 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jbase.h"
#include "commands/commands.h"
#include "dialogs/filmedit.h"
#include "util/celmove.h"
#endif
static bool cmd_copy_cel_enabled(const char *argument)
{
return is_movingcel();

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "commands/commands.h"
#include "modules/sprites.h"
#include "raster/image.h"
@ -30,8 +28,6 @@
#include "util/crop.h"
#include "util/misc.h"
#endif
static bool cmd_crop_enabled(const char *argument);
/* ======================== */

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jbase.h"
#include "commands/commands.h"
@ -30,8 +28,6 @@
#include "util/clipbrd.h"
#include "util/misc.h"
#endif
static bool cmd_cut_enabled(const char *argument)
{
if ((!current_sprite) ||

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "commands/commands.h"
#include "modules/gui.h"
#include "modules/sprites.h"
@ -27,8 +25,6 @@
#include "raster/sprite.h"
#include "raster/undo.h"
#endif
static bool cmd_deselect_mask_enabled(const char *argument)
{
return

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
@ -27,8 +25,6 @@
#include "modules/sprites.h"
#include "raster/sprite.h"
#endif
/* static void cmd_draw_text_execute(const char *argument) */
/* { */
/* } */

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro/unicode.h>
#include "jinete/jbase.h"
@ -27,8 +25,6 @@
#include "commands/commands.h"
#include "modules/tools.h"
#endif
/* ======================== */
/* brush_tool */
/* ======================== */

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
@ -31,8 +29,6 @@
#include "raster/sprite.h"
#include "raster/undo.h"
#endif
static Layer *duplicate_layer(void);
static bool cmd_duplicate_layer_enabled(const char *argument)

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include "jinete/jinete.h"
@ -31,8 +29,6 @@
#include "modules/sprites.h"
#include "raster/sprite.h"
#endif
static bool cmd_duplicate_sprite_enabled(const char *argument)
{
return current_sprite != NULL;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
@ -27,8 +25,6 @@
#include "modules/sprites.h"
#include "raster/sprite.h"
#endif
static void cmd_exit_execute(const char *argument)
{
Sprite *sprite = get_first_sprite();

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
@ -28,8 +26,6 @@
/* #include "raster/sprite.h" */
#include "dialogs/filmedit.h"
#endif
static bool cmd_film_editor_enabled(const char *argument)
{
return current_sprite != NULL;

View File

@ -18,14 +18,10 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "commands/commands.h"
#include "modules/sprites.h"
#include "script/functions.h"
#endif
static bool cmd_flatten_layers_enabled(const char *argument)
{
return current_sprite != NULL;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "commands/commands.h"
#include "modules/editors.h"
#include "modules/gui.h"
@ -30,8 +28,6 @@
#include "raster/undo.h"
#include "util/misc.h"
#endif
static void do_flip(int horz);
/* ======================== */

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
@ -31,8 +29,6 @@
#include "raster/sprite.h"
/* #include "raster/undo.h" */
#endif
void dialogs_frame_length(int sprite_frame);
static bool cmd_frame_properties_enabled(const char *argument)

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "commands/commands.h"
#include "modules/gui.h"
#include "modules/editors.h"
@ -27,8 +25,6 @@
#include "raster/sprite.h"
#include "widgets/editor.h"
#endif
/* ======================== */
/* goto_first_frame */
/* ======================== */

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "commands/commands.h"
#include "modules/gui.h"
#include "modules/sprites.h"
@ -28,8 +26,6 @@
#include "raster/sprite.h"
#include "raster/undo.h"
#endif
static bool cmd_invert_mask_enabled(const char *argument)
{
return current_sprite != NULL;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
@ -29,8 +27,6 @@
#include "raster/layer.h"
#include "raster/sprite.h"
#endif
static bool cmd_layer_properties_enabled(const char *argument)
{
return current_sprite != NULL;

View File

@ -18,16 +18,12 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jbase.h"
#include "commands/commands.h"
#include "dialogs/filmedit.h"
#include "util/celmove.h"
#endif
static bool cmd_link_cel_enabled(const char *argument)
{
return is_movingcel();

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jalert.h"
#include "commands/commands.h"
@ -31,8 +29,6 @@
#include "raster/undo.h"
#include "util/msk_file.h"
#endif
static bool cmd_load_mask_enabled(const char *argument)
{
return current_sprite != NULL;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
@ -27,8 +25,6 @@
#include "modules/sprites.h"
#include "raster/sprite.h"
#endif
/* static void cmd_mapgen_execute(const char *argument) */
/* { */
/* } */

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "commands/commands.h"
#include "modules/gui.h"
#include "modules/sprites.h"
@ -27,8 +25,6 @@
#include "raster/sprite.h"
#include "raster/undo.h"
#endif
static bool cmd_mask_all_enabled(const char *argument)
{
return current_sprite != NULL;

View File

@ -18,16 +18,12 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jbase.h"
#include "commands/commands.h"
#include "dialogs/maskcol.h"
#include "modules/sprites.h"
#endif
static bool cmd_mask_by_color_enabled(const char *argument)
{
return current_sprite != NULL;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
@ -33,8 +31,6 @@
#include "raster/stock.h"
#include "raster/undo.h"
#endif
static bool cmd_merge_down_layer_enabled(const char *argument)
{
Layer *src_layer, *dst_layer;

View File

@ -18,16 +18,12 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jbase.h"
#include "commands/commands.h"
#include "dialogs/filmedit.h"
#include "util/celmove.h"
#endif
static bool cmd_move_cel_enabled(const char *argument)
{
return is_movingcel();

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
@ -34,8 +32,6 @@
#include "raster/stock.h"
#include "raster/undo.h"
#endif
static bool cmd_new_cel_enabled(const char *argument)
{
return

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <assert.h>
#include <allegro/config.h>
#include <allegro/unicode.h>
@ -39,8 +37,6 @@
#include "script/functions.h"
#include "util/misc.h"
#endif
static const char *bg_table[] = {
"mask",
"rgb{0,0,0}",

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
@ -34,8 +32,6 @@
#include "raster/stock.h"
#include "raster/undo.h"
#endif
static bool new_frame_for_layer(Sprite *sprite, Layer *layer, int frame);
static bool copy_cel_in_next_frame(Sprite *sprite, Layer *layer, int frame);

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
@ -31,8 +29,6 @@
#include "raster/undo.h"
#include "script/functions.h"
#endif
static bool cmd_new_layer_enabled(const char *argument)
{
return current_sprite != NULL;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
@ -30,8 +28,6 @@
#include "raster/sprite.h"
#include "script/functions.h"
#endif
static bool cmd_new_layer_set_enabled(const char *argument)
{
return current_sprite != NULL;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <stdio.h>
#include "jinete/jinete.h"
@ -36,8 +34,6 @@
#include "modules/sprites.h"
#include "widgets/statebar.h"
#endif
typedef struct OpenFileData
{
Monitor *monitor;

View File

@ -18,15 +18,11 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jbase.h"
#include "commands/commands.h"
#include "dialogs/options.h"
#endif
static void cmd_options_execute(const char *argument)
{
dialogs_options();

View File

@ -18,16 +18,12 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jbase.h"
#include "commands/commands.h"
#include "dialogs/dpaledit.h"
#include "modules/sprites.h"
#endif
static void cmd_palette_editor_execute(const char *argument)
{
dialogs_palette_editor();

View File

@ -18,15 +18,11 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "commands/commands.h"
#include "modules/sprites.h"
#include "raster/sprite.h"
#include "util/clipbrd.h"
#endif
static bool cmd_paste_enabled(const char *argument)
{
Sprite *sprite = current_sprite;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include "jinete/jinete.h"
@ -32,8 +30,6 @@
#include "raster/sprite.h"
#include "widgets/editor.h"
#endif
static int speed_timer;
static void speed_timer_callback(void)

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
@ -27,8 +25,6 @@
#include "modules/sprites.h"
#include "raster/sprite.h"
#endif
/* static void cmd_play_flic_execute(const char *argument) */
/* { */
/* } */

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "modules/sprites.h"
#include <allegro.h>
@ -37,8 +35,6 @@
#include "widgets/editor.h"
#include "widgets/statebar.h"
#endif
#define PREVIEW_TILED 1
#define PREVIEW_FIT_ON_SCREEN 2

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro/gfx.h>
#include "jinete/jbase.h"
@ -28,8 +26,6 @@
#include "commands/commands.h"
#include "util/recscr.h"
#endif
static bool cmd_record_screen_checked(const char *argument)
{
return is_rec_screen();

View File

@ -18,16 +18,12 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "commands/commands.h"
#include "modules/gui.h"
#include "modules/sprites.h"
#include "raster/sprite.h"
#include "raster/undo.h"
#endif
static bool cmd_redo_enabled(const char *argument)
{
return current_sprite != NULL && undo_can_redo(current_sprite->undo);

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <stdio.h>
#include <allegro.h>
#if defined ALLEGRO_WINDOWS && defined MEMLEAK
@ -32,8 +30,6 @@
#include "commands/commands.h"
#include "core/app.h"
#endif
static void cmd_refresh_execute(const char *argument)
{
jmouse_hide();

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "commands/commands.h"
#include "modules/gui.h"
#include "modules/sprites.h"
@ -28,8 +26,6 @@
#include "raster/sprite.h"
#include "script/functions.h"
#endif
static bool cmd_remove_cel_enabled(const char *argument)
{
return

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
@ -31,8 +29,6 @@
#include "raster/undo.h"
#include "script/functions.h"
#endif
static void remove_frame_for_layer(Sprite *sprite, Layer *layer, int frame);
static bool cmd_remove_frame_enabled(const char *argument)

View File

@ -18,16 +18,12 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "commands/commands.h"
#include "modules/gui.h"
#include "modules/sprites.h"
#include "raster/sprite.h"
#include "script/functions.h"
#endif
static bool cmd_remove_layer_enabled(const char *argument)
{
return current_sprite != NULL;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "commands/commands.h"
#include "modules/gui.h"
#include "modules/sprites.h"
@ -27,8 +25,6 @@
#include "raster/sprite.h"
#include "raster/undo.h"
#endif
static bool cmd_reselect_mask_enabled(const char *argument)
{
return

View File

@ -18,15 +18,11 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
#include "script/script.h"
#endif
static void cmd_run_script_execute(const char *argument)
{
char *filename = ji_file_select(_("Load Script File(.lua)"), "", "lua");

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include "jinete/jbase.h"
@ -33,8 +31,6 @@
#include "raster/sprite.h"
#include "widgets/statebar.h"
#endif
static bool cmd_save_file_enabled(const char *argument)
{
return current_sprite != NULL;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include "jinete/jalert.h"
@ -34,8 +32,6 @@
#include "modules/sprites.h"
#include "raster/sprite.h"
#endif
static bool cmd_save_file_as_enabled(const char *argument)
{
return current_sprite != NULL;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro/file.h>
#include "jinete/jalert.h"
@ -31,8 +29,6 @@
#include "raster/sprite.h"
#include "util/msk_file.h"
#endif
static bool cmd_save_mask_enabled(const char *argument)
{
if (!current_sprite)

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include "jinete/jsystem.h"
@ -30,8 +28,6 @@
#include "raster/raster.h"
#include "util/misc.h"
#endif
static void cmd_screen_shot_execute(const char *argument)
{
int c, old_flag;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <assert.h>
#include <allegro/debug.h>
#include <allegro/unicode.h>
@ -31,8 +29,6 @@
#include "modules/sprites.h"
#include "raster/sprite.h"
#endif
static bool cmd_select_file_enabled(const char *argument)
{
/* with argument, the argument specified the ID of the GfxObj */

View File

@ -18,13 +18,9 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "commands/commands.h"
#include "modules/editors.h"
#endif
static void cmd_close_editor_execute(const char *argument)
{
close_editor(current_editor);

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro/unicode.h>
#include "jinete/jinete.h"
@ -33,8 +31,6 @@
#include "raster/undo.h"
#include "widgets/colbut.h"
#endif
/* TODO remove this */
void dialogs_frame_length(int sprite_frpos);

View File

@ -18,15 +18,11 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jbase.h"
#include "commands/commands.h"
#include "dialogs/tips.h"
#endif
static void cmd_tips_execute(const char *argument)
{
dialogs_tips(TRUE);

View File

@ -18,16 +18,12 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "commands/commands.h"
#include "modules/gui.h"
#include "modules/sprites.h"
#include "raster/sprite.h"
#include "raster/undo.h"
#endif
static bool cmd_undo_enabled(const char *argument)
{
return current_sprite != NULL && undo_can_undo(current_sprite->undo);

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
/* #include <stdio.h> */
#include <string.h>
#include <allegro/unicode.h>
@ -29,8 +27,6 @@
#include "console/console.h"
#include "commands/commands.h"
#endif
/* file */
extern Command cmd_new_file;
extern Command cmd_open_file;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jinete.h"
#include "commands/commands.h"
@ -41,8 +39,6 @@
#include "widgets/preview.h"
#include "widgets/target.h"
#endif
static Curve *the_curve = NULL;
static JWidget check_preview, preview;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <string.h>
#include "jinete/jbox.h"
@ -54,8 +52,6 @@
#include "widgets/preview.h"
#include "widgets/target.h"
#endif
static JWidget check_preview, preview;
static JWidget check_tiled;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <stdio.h>
#include "jinete/jbox.h"
@ -45,8 +43,6 @@
#include "widgets/preview.h"
#include "widgets/target.h"
#endif
static JWidget entry_width, entry_height;
static JWidget check_preview, preview;
static JWidget check_tiled;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jbox.h"
#include "jinete/jbutton.h"
#include "jinete/jhook.h"
@ -44,8 +42,6 @@
#include "widgets/preview.h"
#include "widgets/target.h"
#endif
static JWidget check_preview, preview;
static int target_change_hook(JWidget widget, int user_data);

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <stdio.h>
#include "jinete/jinete.h"
@ -43,8 +41,6 @@
#include "widgets/preview.h"
#include "widgets/target.h"
#endif
static JWidget button_color1, button_color2;
static JWidget slider_fuzziness, check_preview;
static JWidget preview;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include <stdio.h>
#include <stdarg.h>
@ -31,8 +29,6 @@
#include "modules/gui.h"
#include "widgets/statebar.h"
#endif
static JWidget wid_console = NULL;
static JWidget wid_view = NULL;
static JWidget wid_textbox = NULL;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
/* #include <allegro/internal/aintern.h> */
#include <stdarg.h>
@ -60,8 +58,6 @@
#include "widgets/tabs.h"
#include "widgets/toolbar.h"
#endif
/* options */
enum {
OPEN_GFX_FILE,

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro/config.h>
#include <allegro/file.h>
#include <allegro/unicode.h>
@ -30,8 +28,6 @@
#include "core/core.h"
#include "core/dirs.h"
#endif
static char config_filename[512];
void ase_config_init(void)

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro/file.h>
#include <allegro/unicode.h>
#include <stdarg.h>
@ -31,8 +29,6 @@
#include "core/core.h"
#include "core/dirs.h"
#endif
/* DOS and Windows needs "log" files (because their poor stderr support) */
#if defined ALLEGRO_DOS || defined ALLEGRO_WINDOWS
# define NEED_LOG

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro/file.h>
#include <allegro/system.h>
#include <stdio.h>
@ -31,8 +29,6 @@
#include "core/core.h"
#include "core/dirs.h"
#endif
#undef UNIX_LIKE
#if defined ALLEGRO_UNIX || \
defined ALLEGRO_LINUX || \

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "core/core.h"
#include "core/modules.h"
#include "effect/effect.h"
@ -34,8 +32,6 @@
#include "modules/tools.h"
#include "script/script.h"
#endif
#define DEF_MODULE(name, reqs) \
{ #name, init_module_##name, exit_module_##name, (reqs), FALSE }

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include "jinete/jbox.h"
@ -41,8 +39,6 @@
#include "widgets/colbut.h"
#include "widgets/groupbut.h"
#endif
void canvas_resize(void)
{
JWidget window, box1, box2, box3, box4, box5, box6;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include <stdio.h>
#include <string.h>
@ -39,8 +37,6 @@
#include "widgets/colview.h"
#include "widgets/paledit.h"
#endif
static JWidget slider_R, slider_G, slider_B, slider_A;
static JWidget slider_H, slider_S, slider_V;
static JWidget color_viewer;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include <math.h>
#include <stdio.h>
@ -41,8 +39,6 @@
#include "util/mapgen.h"
#include "util/misc.h"
#endif
#ifndef M_SQRT2
#define M_SQRT2 1.41421356237309504880
#endif

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include <stdio.h>
#include <string.h>
@ -39,8 +37,6 @@
#include "widgets/colview.h"
#include "widgets/paledit.h"
#endif
static PALETTE *palettes;
static JWidget slider_R, slider_G, slider_B;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include "jinete/jinete.h"
@ -42,8 +40,6 @@
#include "widgets/colbar.h"
#include "widgets/colbut.h"
#endif
static JWidget font_button;
static Image *render_text(FONT *f, const char *text, int color);

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <assert.h>
#include <allegro.h>
#include <allegro/internal/aintern.h>
@ -34,8 +32,6 @@
#include "modules/gui.h"
#include "widgets/fileview.h"
#endif
#if (DEVICE_SEPARATOR != 0) && (DEVICE_SEPARATOR != '\0')
# define HAVE_DRIVES
#endif

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include "jinete/jinete.h"
@ -43,8 +41,6 @@
#include "util/celmove.h"
#include "util/thmbnail.h"
#endif
#define THUMBSIZE (32)
#define FRMSIZE (3 + THUMBSIZE + 2)
#define LAYSIZE (3 + MAX(text_height(widget->text_font), THUMBSIZE) + 2)

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jbox.h"
#include "jinete/jbutton.h"
#include "jinete/jhook.h"
@ -43,8 +41,6 @@
#include "widgets/colbar.h"
#include "widgets/colbut.h"
#endif
static JWidget button_color, slider_fuzziness, check_preview;
static void button_1_command(JWidget widget);

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <assert.h>
#include <stdio.h>
@ -31,8 +29,6 @@
#include "widgets/colbar.h"
#include "widgets/paledit.h"
#endif
static int paledit_change_signal(JWidget widget, int user_data);
static bool window_hook(JWidget widget, JMessage msg);

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include "jinete/jinete.h"
@ -30,8 +28,6 @@
#include "modules/gui.h"
#include "intl/intl.h"
#endif
void dialogs_select_language(bool force)
{
/* only english */

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include <stdio.h>
#include <string.h>
@ -33,8 +31,6 @@
/* GFLI header file */
#include "gfli.h"
#endif
static bool my_callback(void);
static void my_play_fli(const char *filename, bool loop, bool fullscreen,
bool (*callback)());

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro/keyboard.h>
#include "core/app.h"
@ -39,8 +37,6 @@
#include "util/misc.h"
#include "widgets/colbar.h"
#endif
enum { ACTION_MOVE, ACTION_COPY, ACTION_SWAP };
static Layer *handle_layer;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro/gfx.h>
#include <allegro/unicode.h>
@ -29,8 +27,6 @@
#include "dialogs/repo.h"
#include "modules/gui.h"
#endif
static void fill_listbox(RepoDlg *repo_dlg);
static void kill_listbox(RepoDlg *repo_dlg);

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include <ctype.h>
#include <stdio.h>
@ -34,8 +32,6 @@
#include "modules/gui.h"
#include "modules/palette.h"
#endif
static JWidget tips_new(void);
static int tips_type(void);
static bool tips_msg_proc(JWidget widget, JMessage msg);

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include <math.h>
@ -31,8 +29,6 @@
#include "raster/undo.h"
#include "util/misc.h"
#endif
static void project(Image *image, int x, int y, double dmax, double *out_x, double *out_y)
{
int center_x = image->w/2; /* center point */

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "jinete/jlist.h"
#include "effect/colcurve.h"
@ -27,8 +25,6 @@
#include "modules/palette.h"
#include "raster/image.h"
#endif
static struct {
Curve *curve;
int cmap[256];

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include <stdio.h>
#include <string.h>
@ -35,8 +33,6 @@
#include "raster/image.h"
#include "util/filetoks.h"
#endif
/* TODO warning: this number could be dangerous for big filters */
#define PRECISION (256)

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <stdlib.h>
#include <string.h>
@ -47,8 +45,6 @@
#include "util/misc.h"
#include "widgets/editor.h"
#endif
typedef struct EffectData
{
const char *name;

View File

@ -18,14 +18,10 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include "effect/effect.h"
#include "modules/palette.h"
#include "raster/image.h"
#endif
void apply_invert_color4(Effect *effect)
{
ase_uint32 *src_address;

View File

@ -18,8 +18,6 @@
#include "config.h"
#ifndef USE_PRECOMPILED_HEADER
#include <allegro.h>
#include "effect/effect.h"
@ -27,8 +25,6 @@
#include "modules/tools.h"
#include "raster/image.h"
#endif
static struct {
int tiled;
int w, h;

Some files were not shown because too many files have changed in this diff Show More