notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP Dropping in code for Haiku trash can support

Browse source 
h/t Jérôme Duval <https://github.com/korli> for pointing us to this
(see https://github.com/haikuports/haikuports/issues/10568)
Code used is copyright (c) 2004, Francois Revol <revol@free.fr>,
provided under the MIT licence.

(Also, ran `indent.sh`)
This commit is contained in:
Bill Kendrick 2024-06-06 23:00:36 -07:00
parent 33db4c16f5
commit 3c5303563a
6 changed files with 172 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/tuxpaint.c
View file

@ -331,6 +331,8 @@ typedef struct safer_dirent
char d_name[FILENAME_MAX];
} safer_dirent;
extern status_t haiku_trash(const char *f);
#define dirent safer_dirent
#else /* __BEOS__ */
@ -652,7 +654,7 @@ int TP_EventFilter(void *data, EVENT_FILTER_EVENT_TYPE * event);
/* #define fmemopen_alternative *//* Uncomment this to test the fmemopen alternative in systems were fmemopen exists */
/* *INDENT-ON* */
#if defined (WIN32) || defined (__APPLE__) || defined(__NetBSD__) || defined(__sun) || defined(__OS2__) || defined(__ANDROID__) /* MINGW/MSYS, NetBSD, and MacOSX need it, at least for now */
#if defined (WIN32) || defined (__APPLE__) || defined(__NetBSD__) || defined(__sun) || defined(__OS2__) || defined(__ANDROID__) /* MINGW/MSYS, NetBSD, and MacOSX need it, at least for now */
#define fmemopen_alternative
#endif
@ -2220,7 +2222,8 @@ static int do_slideshow(void);
static void play_slideshow(int *selected, int num_selected, char *dirname, char **d_names, char **d_exts, int speed);
static void draw_selection_digits(int right, int bottom, int n);
static int export_gif(int *selected, int num_selected, char *dirname, char **d_names, char **d_exts, int speed, char **dest_fname);
static int export_gif(int *selected, int num_selected, char *dirname, char **d_names, char **d_exts, int speed,
char **dest_fname);
int export_gif_monitor_events(void);
/* Locations where export_pict() can save */
@ -17377,13 +17380,13 @@ static int do_open(void)
{
instructions =
gettext_noop
("Choose a picture and then click “Open”, “Export”, “Template“, or “Erase”. Click “Slides” to create a slideshow animation or “Back“ to return to your current picture.");
("Choose a picture and then click “Open”, “Export”, “Template“, or “Erase”. Click “Slides” to create a slideshow animation or “Back“ to return to your current picture.");
}
else
{
instructions =
gettext_noop
("Choose a picture and then click “Open”, “Export”, or “Erase”. Click “Slides” to create a slideshow animation or “Back“ to return to your current picture.");
("Choose a picture and then click “Open”, “Export”, or “Erase”. Click “Slides” to create a slideshow animation or “Back“ to return to your current picture.");
}
draw_tux_text(TUX_BORED, instructions, 1);
@ -18133,7 +18136,7 @@ static int do_open(void)
if (want_export)
{
int res;
char * dest_fname;
char *dest_fname;
want_export = 0;
@ -18144,7 +18147,7 @@ static int do_open(void)
if (res == EXPORT_SUCCESS)
{
int n;
char * msg;
char *msg;
if (dest_fname != NULL)
{
@ -19079,7 +19082,7 @@ static int do_slideshow(void)
}
else
{
char * dest_fname;
char *dest_fname;
export_successful = export_gif(selected, num_selected, dirname, d_names, d_exts, speed, &dest_fname);
@ -19093,7 +19096,7 @@ static int do_slideshow(void)
if (export_successful)
{
int n;
char * msg;
char *msg;
if (dest_fname != NULL)
{
@ -30962,6 +30965,8 @@ static int trash(char *path)
return win32_trash(path);
#elif defined(__APPLE__)
return apple_trash(path);
#elif defined __BEOS__ || defined __HAIKU__
return haiku_trash(path);
#else
char fname[MAX_PATH], trashpath[MAX_PATH], dest[MAX_PATH], infoname[MAX_PATH], bname[MAX_PATH + 1], ext[MAX_PATH];
char deldate[32];
@ -31713,7 +31718,8 @@ char *get_xdg_user_dir(const char *dir_type, const char *fallback)
* @param int speed -- how fast to play the slideshow (0 and 1 both = slowest, 10 = fasted)
* @return int -- 0 if export failed or was aborted, 1 if successful
*/
static int export_gif(int *selected, int num_selected, char *dirname, char **d_names, char **d_exts, int speed, char **dest_fname)
static int export_gif(int *selected, int num_selected, char *dirname, char **d_names, char **d_exts, int speed,
char **dest_fname)
{
char *tmp_starter_id, *tmp_template_id, *tmp_file_id;
int tmp_starter_mirrored, tmp_starter_flipped, tmp_starter_personal;
@ -31995,7 +32001,7 @@ int export_gif_monitor_events(void)
* + unused by EXPORT_LOC_PICTURES (just send NULL)
* @return EXPORT_SUCCESS on success, or one of the EXPORT_ERR_... values on failure
*/
static int export_pict(char *fname, int where, char *orig_fname, char ** dest_fname)
static int export_pict(char *fname, int where, char *orig_fname, char **dest_fname)
{
FILE *fi, *fo;
size_t len;