Added debug messages to most functions.

merge-requests/2/head
Henning Geinitz 2003-12-15 21:44:27 +00:00
rodzic eacfc4c1c7
commit df76db9165
1 zmienionych plików z 67 dodań i 1 usunięć

Wyświetl plik

@ -200,6 +200,7 @@ encode_devname (const char *devname, int n, char *buf)
const char *src;
char ch;
DBG(DBG_debug, "encode_devname\n");
limit = buf + n;
for (src = devname, dst = buf; *src; ++src)
{
@ -234,6 +235,8 @@ encode_devname (const char *devname, int n, char *buf)
if (dst >= limit)
return -1;
*dst = '\0';
DBG(DBG_debug, "encode_devname: %s --> %s\n", devname, buf);
return 0;
}
@ -244,6 +247,7 @@ decode_devname (const char *encoded_devname, int n, char *buf)
const char *src;
char ch, val;
DBG(DBG_debug, "decode_devname\n");
limit = buf + n;
for (src = encoded_devname, dst = buf; *src; ++dst)
{
@ -285,6 +289,7 @@ decode_devname (const char *encoded_devname, int n, char *buf)
if (dst >= limit)
return -1;
*dst = '\0';
DBG(DBG_debug, "deccode_devname: %s -> %s\n", encoded_devname, buf);
return 0;
}
@ -303,6 +308,7 @@ query (void)
size_t len;
int i, j;
DBG(DBG_debug, "query\n");
gimp_install_procedure (
"xscanimage",
"Front-end to the SANE interface",
@ -348,6 +354,7 @@ query (void)
nargs, nreturn_vals, args, return_vals);
}
sane_exit ();
DBG(DBG_debug, "query: finished\n");
}
#ifdef ENABLE_GIMP_1_3
@ -370,6 +377,7 @@ run (char *name, int nparams, GimpParam * param,
char *args[2];
int nargs;
DBG(DBG_debug, "run\n");
run_mode = param[0].data.d_int32;
scan_win.mode = SANE_GIMP_EXTENSION;
@ -407,6 +415,7 @@ run (char *name, int nparams, GimpParam * param,
default:
break;
}
DBG(DBG_debug, "run: finished\n");
}
static void
@ -424,6 +433,7 @@ SANE_Word get_resolution (SANE_Handle dev)
SANE_Int num_options, i;
const SANE_Option_Descriptor *option_desc;
DBG(DBG_debug, "get_resolution\n");
status = sane_control_option (dev, 0, SANE_ACTION_GET_VALUE, &num_options, 0);
if (status != SANE_STATUS_GOOD)
return 0;
@ -450,6 +460,7 @@ SANE_Word get_resolution (SANE_Handle dev)
}
}
}
DBG(DBG_debug, "get_resolution: finished\n");
return 0;
}
@ -467,6 +478,7 @@ update_param (GSGDialog *dialog, void *arg)
SANE_Parameters params;
gchar buf[200];
DBG(DBG_debug, "update_param\n");
if (!scan_win.info_label)
return;
@ -506,6 +518,7 @@ update_param (GSGDialog *dialog, void *arg)
if (scan_win.preview)
preview_update (scan_win.preview);
DBG(DBG_debug, "update_param: finished\n");
}
static void
@ -514,6 +527,7 @@ pref_xscanimage_save (void)
char filename[PATH_MAX];
int fd;
DBG(DBG_debug, "pref_xscanimage_save\n");
/* first save xscanimage-specific preferences: */
gsg_make_path (sizeof (filename), filename, "xscanimage", "xscanimage",
0, ".rc");
@ -529,6 +543,7 @@ pref_xscanimage_save (void)
}
preferences_save (fd);
close (fd);
DBG(DBG_debug, "pref_xscanimage_save: finished\n");
}
static void
@ -537,6 +552,7 @@ pref_xscanimage_restore (void)
char filename[PATH_MAX];
int fd;
DBG(DBG_debug, "pref_xscanimage_restore\n");
gsg_make_path (sizeof (filename), filename, "xscanimage", "xscanimage",
0, ".rc");
fd = open (filename, O_RDONLY);
@ -547,11 +563,13 @@ pref_xscanimage_restore (void)
}
if (!preferences.filename)
preferences.filename = strdup (OUTFILENAME);
DBG(DBG_debug, "pref_xscanimage_restore: finished\n");
}
static void
quit_xscanimage (void)
{
DBG (DBG_debug, "quit_xscanimage\n");
if (scan_win.preview)
{
Preview *preview = scan_win.preview;
@ -574,7 +592,7 @@ quit_xscanimage (void)
if (scan_win.mode == SANE_GIMP_EXTENSION)
gimp_quit ();
#endif
DBG(DBG_debug, "xscanimage exiting.\n");
DBG (DBG_debug, "quit_xscanimage: exiting\n");
exit (0);
}
@ -598,6 +616,8 @@ preview_window_destroyed (GtkWidget *widget, gpointer call_data)
static void
scan_preview (GtkWidget * widget, gpointer call_data)
{
DBG(DBG_debug, "scan_preview\n");
if (GTK_TOGGLE_BUTTON (widget)->active)
{
if (!scan_win.preview)
@ -619,12 +639,15 @@ scan_preview (GtkWidget * widget, gpointer call_data)
preview_destroy (scan_win.preview);
scan_win.preview = 0;
}
DBG(DBG_debug, "scan_preview: finished\n");
}
#ifdef HAVE_LIBGIMP_GIMP_H
static void
advance (void)
{
DBG(DBG_debug, "advance\n");
if (++scan_win.x >= scan_win.param.pixels_per_line)
{
int tile_height = gimp_tile_height ();
@ -658,6 +681,7 @@ advance (void)
scan_win.tile_offset = 0;
}
}
DBG(DBG_debug, "advance: finished\n");
}
#endif /* HAVE_LIBGIMP_GIMP_H */
@ -669,6 +693,7 @@ write_swapped_words(FILE *f, char *buf, guint len)
char tmp;
unsigned int i;
DBG(DBG_debug, "write_swapped_words\n");
if (!len)
return;
if (scan_win.have_odd_byte)
@ -694,6 +719,7 @@ write_swapped_words(FILE *f, char *buf, guint len)
scan_win.odd_byte = buf[len - 1];
}
}
DBG(DBG_debug, "write_swapped_words: finished\n");
}
static void
@ -705,6 +731,7 @@ input_available (gpointer data, gint source, GdkInputCondition cond)
SANE_Int len;
int i;
DBG(DBG_debug, "input_available\n");
while (1)
{
status = sane_read (dev, (unsigned char *) buf, sizeof (buf), &len);
@ -908,6 +935,7 @@ input_available (gpointer data, gint source, GdkInputCondition cond)
return;
}
}
DBG(DBG_debug, "input_available: finished\n");
return;
#ifdef HAVE_LIBGIMP_GIMP_H
@ -923,6 +951,7 @@ bad_depth:
static void
scan_done (void)
{
DBG(DBG_debug, "scan_done\n");
gsg_set_sensitivity (dialog, TRUE);
if (scan_win.preview)
gtk_widget_set_sensitive (scan_win.preview->preview, TRUE);
@ -969,12 +998,15 @@ scan_done (void)
scan_win.tile = 0;
}
#endif /* HAVE_LIBGIMP_GIMP_H */
DBG(DBG_debug, "scan_done: finished\n");
}
static void
progress_cancel (void)
{
DBG(DBG_debug, "progress_cancel\n");
sane_cancel (gsg_dialog_get_device (dialog));
DBG(DBG_debug, "progress_cancel: done\n");
}
static void
@ -991,6 +1023,8 @@ scan_start (void)
char buf[256];
int fd;
DBG(DBG_debug, "scan_start\n");
gsg_set_sensitivity (dialog, FALSE);
if (scan_win.preview)
gtk_widget_set_sensitive (scan_win.preview->preview, FALSE);
@ -1199,6 +1233,7 @@ scan_start (void)
gtk_main_iteration ();
input_available (0, -1, GDK_INPUT_READ);
}
DBG(DBG_debug, "scan_start: finished\n");
}
/* Invoked when the scan button is pressed */
@ -1208,6 +1243,7 @@ scan_dialog (GtkWidget * widget, gpointer call_data)
char buf[256];
char testfilename[256];
DBG(DBG_debug, "scan_dialog\n");
if (scan_win.mode == STANDALONE)
{ /* We are running in standalone mode */
/* test for pnm formats*/
@ -1239,6 +1275,7 @@ scan_dialog (GtkWidget * widget, gpointer call_data)
}
gsg_sync (dialog);
scan_start ();
DBG(DBG_debug, "scan_dialog: finished\n");
}
#if 0
@ -1282,6 +1319,7 @@ files_build_menu (void)
{
GtkWidget *menu, *item;
DBG(DBG_debug, "files_build_menu\n");
menu = gtk_menu_new ();
item = gtk_menu_item_new ();
@ -1294,6 +1332,7 @@ files_build_menu (void)
(GtkSignalFunc) files_exit_callback, 0);
gtk_widget_show (item);
DBG(DBG_debug, "files_build_menu: finished\n");
return menu;
}
@ -1303,6 +1342,8 @@ pref_set_unit_callback (GtkWidget *widget, gpointer data)
const char *unit = data;
double unit_conversion_factor = 1.0;
DBG(DBG_debug, "pref_set_unit_callback\n");
if (strcmp (unit, "cm") == 0)
unit_conversion_factor = 10.0;
else if (strcmp (unit, "in") == 0)
@ -1315,6 +1356,7 @@ pref_set_unit_callback (GtkWidget *widget, gpointer data)
preview_update (scan_win.preview);
pref_xscanimage_save ();
DBG(DBG_debug, "pref_set_unit_callback: finished\n");
}
static void
@ -1348,6 +1390,8 @@ preview_options_ok_callback (GtkWidget *widget, gpointer data)
GtkWidget *dialog = data;
char buf[1024];
DBG(DBG_debug, "preview_options_ok_callback\n");
/* gamma min, max test*/
if (preferences.preview_gamma < 0.0 || preferences.preview_gamma > 255.0)
{
@ -1366,6 +1410,7 @@ preview_options_ok_callback (GtkWidget *widget, gpointer data)
"It is necessary to restart %s for the changes to take effect.",
prog_name);
gsg_warning (buf);
DBG(DBG_debug, "preview_options_ok_callback: finished\n");
}
static void
@ -1382,6 +1427,7 @@ preview_options_dialog (GtkWidget *widget, gpointer data)
GtkWidget *dialog, *vbox, *hbox, *button, *label, *text;
char buf[64];
DBG(DBG_debug, "preview_options_dialog\n");
dialog = gtk_dialog_new ();
sprintf (buf, "%s preview options", prog_name);
gtk_window_set_title (GTK_WINDOW (dialog), buf);
@ -1455,6 +1501,7 @@ preview_options_dialog (GtkWidget *widget, gpointer data)
gtk_widget_show (button);
gtk_widget_show (dialog);
DBG(DBG_debug, "preview_options_dialog: finished\n");
}
static void
@ -1463,6 +1510,7 @@ pref_device_save (GtkWidget *widget, gpointer data)
char filename[PATH_MAX];
int fd;
DBG(DBG_debug, "pref_device_save\n");
gsg_make_path (sizeof (filename), filename,
"xscanimage", 0, dialog->dev_name, ".rc");
fd = open (filename, O_WRONLY | O_CREAT | O_TRUNC, 0666);
@ -1478,6 +1526,7 @@ pref_device_save (GtkWidget *widget, gpointer data)
gsg_sync (dialog);
sanei_save_values (fd, dialog->dev);
close (fd);
DBG(DBG_debug, "pref_device_save: finished\n");
}
static void
@ -1486,6 +1535,7 @@ pref_device_restore (void)
char filename[PATH_MAX];
int fd;
DBG(DBG_debug, "pref_device_restore\n");
gsg_make_path (sizeof (filename), filename,
"xscanimage", 0, dialog->dev_name, ".rc");
fd = open (filename, O_RDONLY);
@ -1495,6 +1545,7 @@ pref_device_restore (void)
close (fd);
gsg_refresh_dialog (dialog);
DBG(DBG_debug, "pref_device_restore: finished\n");
}
static void
@ -1521,6 +1572,7 @@ pref_build_menu (void)
GSList *units_group = NULL;
double unit;
DBG(DBG_debug, "pref_build_menu\n");
menu = gtk_menu_new ();
/* advanced user option: */
@ -1608,6 +1660,7 @@ pref_build_menu (void)
(GtkSignalFunc) pref_device_restore, 0);
gtk_widget_show (item);
DBG(DBG_debug, "pref_build_menu: finished\n");
return menu;
}
@ -1616,6 +1669,7 @@ browse_filename_callback (GtkWidget *widget, gpointer data)
{
char filename[1024];
DBG(DBG_debug, "browse_filename_callback\n");
if (preferences.filename)
{
strncpy (filename, preferences.filename, sizeof (filename));
@ -1629,6 +1683,7 @@ browse_filename_callback (GtkWidget *widget, gpointer data)
if (preferences.filename)
free ((void *) preferences.filename);
preferences.filename = strdup (filename);
DBG(DBG_debug, "browse_filename_callback: finished\n");
}
static void
@ -1647,6 +1702,7 @@ device_dialog (void)
GtkWidget *menubar, *menubar_item;
const gchar *devname;
DBG(DBG_debug, "device_dialog\n");
/* first, restore xscanimage preferences */
pref_xscanimage_restore ();
@ -1798,6 +1854,7 @@ device_dialog (void)
pref_device_restore (); /* restore device-settings */
gtk_widget_show (scan_win.shell);
DBG(DBG_debug, "device_dialog: finished\n");
}
static void
@ -1824,6 +1881,7 @@ choose_device (void)
const SANE_Device *adev;
gint i;
DBG(DBG_debug, "choose_device\n");
choose_device_dialog = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (choose_device_dialog), "Select device");
gtk_signal_connect (GTK_OBJECT (choose_device_dialog), "delete_event",
@ -1875,6 +1933,7 @@ choose_device (void)
gtk_widget_show (button);
gtk_widget_show (choose_device_dialog);
DBG(DBG_debug, "choose_device: finished\n");
return 0;
}
@ -1896,6 +1955,7 @@ init (int argc, char **argv)
char filename[PATH_MAX];
struct stat st;
DBG(DBG_debug, "init\n");
gtk_init (&argc, &argv);
#ifdef HAVE_LIBGIMP_GIMP_H
gtk_rc_parse (gimp_gtkrc ());
@ -1985,6 +2045,7 @@ init (int argc, char **argv)
DBG (DBG_info, "default device is `%s'\n", defdevname);
}
}
DBG(DBG_debug, "init: finished\n");
}
static void
@ -1992,6 +2053,7 @@ interface (int argc, char **argv)
{
scan_win.info_label = NULL;
DBG(DBG_debug, "interface\n");
init (argc, argv);
for (ndevs = 0; devlist[ndevs]; ++ndevs);
@ -2033,14 +2095,17 @@ interface (int argc, char **argv)
}
}
gtk_quit_flag = 1;
DBG(DBG_debug, "interface: now running gtk_main ()\n");
gtk_main ();
sane_exit ();
DBG(DBG_debug, "interface: finished\n");
}
int
main (int argc, char **argv)
{
DBG_INIT();
DBG(DBG_debug, "main\n");
DBG(DBG_error, "xscanimage (version: %s, package: %s) starting\n", VERSION,
PACKAGE);
little_endian = calc_little_endian();
@ -2081,5 +2146,6 @@ main (int argc, char **argv)
#else
interface (argc, argv);
#endif /* HAVE_LIBGIMP_GIMP_H */
DBG(DBG_debug, "main: finished\n");
return 0;
}