From ceb063dfb57ca245a04490a2c7b222a7327fd046 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Fri, 14 Apr 2000 14:44:42 +0000 Subject: [PATCH] r243: Updated the version number and added features display. --- ROX-Filer/Help/README | 1 + ROX-Filer/src/Docs/Manual.lyx | 37 ++++++++++++++++++++++++++++++++++--- ROX-Filer/src/main.c | 26 +++++++++++++++++++++++++- ROX-Filer/src/pixmaps.c | 6 ++++-- ROX-Filer/src/support.c | 2 ++ 5 files changed, 66 insertions(+), 6 deletions(-) diff --git a/ROX-Filer/Help/README b/ROX-Filer/Help/README index 4fbe856f..ecaaf204 100644 --- a/ROX-Filer/Help/README +++ b/ROX-Filer/Help/README @@ -56,6 +56,7 @@ And now, people who've actually sent in code ;-) Jens Askengren GNOME-style toolbar Bernard Jungen lots of patches all over the place! + Christiansen Merel initial support for ImLib Chris Sawer leafname field in the Info box Simon Truss support for mount points on NetBSD diff --git a/ROX-Filer/src/Docs/Manual.lyx b/ROX-Filer/src/Docs/Manual.lyx index 38bd0ff2..bac33f43 100644 --- a/ROX-Filer/src/Docs/Manual.lyx +++ b/ROX-Filer/src/Docs/Manual.lyx @@ -1,4 +1,4 @@ -#This file was created by Fri Apr 14 10:40:15 2000 +#This file was created by Fri Apr 14 15:40:53 2000 #LyX 0.12 (C) 1995-1998 Matthias Ettrich and the LyX Team \lyxformat 2.15 \textclass article @@ -625,7 +625,13 @@ Each object in the directory is shown as a large icon with its name below. \newline Small Icons \newline -Each entry is shown as the top part of its icon with the name beside it. +Items are drawn smaller that usual, allowing you to see more files at once. +\latex latex + +\backslash +dag +\latex default + \newline Full Info \newline @@ -660,6 +666,23 @@ Rereads the contents of the directory and details of all the files in it. \newline Use this if the display becomes out-of-date. +\layout Standard + + +\latex latex + +\backslash +noindent +\backslash +dag{} +\latex default +If ROX-Filer was unable to find ImLib +\begin_inset LatexCommand \cite{ImLib} + +\end_inset + + when it was compiled then the icons are shown cropped rather than scaled. + Get ImLib and recompile if you want it to look nice. \layout Subsubsection @@ -2361,7 +2384,7 @@ The ROX Choices system \emph on Enlightenment, \emph toggle - + \layout Bibliography \bibitem {PODFUK} @@ -2370,4 +2393,12 @@ Enlightenment, POrtable Dodgy Filesystems in Userland (hacK), \emph toggle +\layout Bibliography +\bibitem {ImLib} + + +\emph on +ImLib +\emph toggle +, \the_end diff --git a/ROX-Filer/src/main.c b/ROX-Filer/src/main.c index 630e4ce7..8972bc5b 100644 --- a/ROX-Filer/src/main.c +++ b/ROX-Filer/src/main.c @@ -61,7 +61,11 @@ int ngroups; /* Number of supplemental groups */ gid_t *supplemental_groups = NULL; char *home_dir; -#define VERSION "ROX-Filer 0.1.19\n" \ +/* Static prototypes */ +static void show_features(void); + + +#define VERSION "ROX-Filer 0.1.20\n" \ "Copyright (C) 2000 Thomas Leonard.\n" \ "ROX-Filer comes with ABSOLUTELY NO WARRANTY,\n" \ "to the extent permitted by law.\n" \ @@ -200,6 +204,7 @@ int main(int argc, char **argv) break; case 'v': printf(VERSION); + show_features(); return EXIT_SUCCESS; case 'h': printf(HELP); @@ -301,3 +306,22 @@ int main(int argc, char **argv) return EXIT_SUCCESS; } + +static void show_features(void) +{ + g_printerr("\n-- features set at compile time --\n\n"); + g_printerr("VFS support... " +#ifdef HAVE_LIBVFS + "Yes" +#else + "No (couldn't find a valid libvfs)" +#endif + "\n"); + g_printerr("ImLib support... " +#ifdef HAVE_IMLIB + "Yes" +#else + "No (the imlib-config command didn't work)" +#endif + "\n"); +} diff --git a/ROX-Filer/src/pixmaps.c b/ROX-Filer/src/pixmaps.c index 30e66178..cb9e1ec1 100644 --- a/ROX-Filer/src/pixmaps.c +++ b/ROX-Filer/src/pixmaps.c @@ -84,7 +84,9 @@ static int getref(MaskedPixmap *mp); static gint purge(gpointer data); static MaskedPixmap *image_from_file(char *path); static MaskedPixmap *get_bad_image(void); +#ifdef HAVE_IMLIB static GdkImlibImage *make_half_size(GdkImlibImage *big); +#endif /**************************************************************** @@ -231,8 +233,8 @@ static MaskedPixmap *image_from_file(char *path) if (!pixmap) return NULL; - width = ((GdkPixmapPrivate *) mp->pixmap)->width; - height = ((GdkPixmapPrivate *) mp->pixmap)->height; + width = ((GdkPixmapPrivate *) pixmap)->width; + height = ((GdkPixmapPrivate *) pixmap)->height; #endif mp = g_new(MaskedPixmap, 1); diff --git a/ROX-Filer/src/support.c b/ROX-Filer/src/support.c index 244b5429..16d18bb8 100644 --- a/ROX-Filer/src/support.c +++ b/ROX-Filer/src/support.c @@ -423,6 +423,7 @@ char *pretty_time(time_t *time) # define O_NOFOLLOW 0x0 #endif +#ifdef HAVE_LIBVFS /* Copy data from 'read_fd' FD to 'write_fd' FD until EOF or error. * Returns 0 on success, -1 on error (and sets errno). */ @@ -448,6 +449,7 @@ static int copy_fd(int read_fd, int write_fd) return got; } +#endif /* 'from' and 'to' are complete pathnames of files (not dirs or symlinks). * This spawns 'cp' to do the copy if lstat() succeeds, otherwise we -- 2.11.4.GIT