Changeset 9

Timestamp:

03/11/07 17:41:03 (5 years ago)

Author:

mirko

Message:

Better command line parsing,

Location:

trunk/pdfcube/src

Files:

• Makefile.am (modified) (1 diff)
• cmdline.c (added)
• cmdline.h (added)
• llcube.cc (modified) (3 diffs)
• pdfcube.cc (modified) (7 diffs)
• pdfcube.ggo (added)

trunk/pdfcube/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = pdfcube
 
-pdfcube_SOURCES = pdfcube.cc
-pdfcube_CXXFLAGS=-Wall -Weffc++
+pdfcube_SOURCES = pdfcube.cc cmdline.c cmdline.h
+
+pdfcube_CXXFLAGS=-Wall -Weffc++ 
 
 INCLUDES = $(glib_CFLAGS) $(gtk_CFLAGS) $(gtkglext_CFLAGS) $(poppler_CFLAGS) $(poppler_glib_CFLAGS)

trunk/pdfcube/src/llcube.cc

@@ +1 @@
+// -*- mode: C++ -*-
+//
+// PDF-Cube source file - llcube.cc (low level cube code)
+// 
+// Copyright (C) 2006 Mirko Maischberger <mirko.maischberger@gmail.com>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WAPRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
 namespace 100allora {
   
@@ -51 +71 @@
            point3d<GLfloat>& looking_at, 
            GLfloat perspective, 
-           GLfloat angley, GLfloat anglex, GLfloat anglez)
+           GLfloat anglex, GLfloat angley, GLfloat anglez)
     { }
     
@@ -178 +198 @@
     point3d camera_position;
     point3d looking_at;
-
-
   }
-
 }

trunk/pdfcube/src/pdfcube.cc

@@ -33 +33 @@
 #include <gtk/gtkgl.h>
 
-// OpenGL (-lglut)
+// OpenGL
 #include <GL/gl.h>
 #include <GL/glu.h>
@@ -39 +39 @@
 // PDF to GdkPixbuf (pkg-config poppler-glib)
 #include <poppler.h>
+
+#include "cmdline.h"
 
 using namespace std;
@@ -54 +56 @@
 // Globals (will be moved inside classes some day)
 
-static gboolean fullscreen = TRUE;
+static gboolean fullscreen = FALSE;
 static gboolean animating = FALSE;
 
@@ -733 +735 @@
     double w, h;
     poppler_page_get_size(page, &w, &h);
-    poppler_page_render_to_pixbuf(page, 0,0,iWidth,iHeight,1.0*iWidth/w,0,pm);
+    poppler_page_render_to_pixbuf(page, 0, 0, iWidth, iHeight,
+                                  ((double)iWidth)/w, 0, pm);
   }
 
@@ -1475 +1478 @@
   GdkGLConfig *glconfig;
 
+  gengetopt_args_info args_info;
+  
+  if(cmdline_parser(argc, argv, &args_info) != 0)
+    exit(1);
+     
   /* Initialize GTK. */
   gtk_init (&argc, &argv);
@@ -1484 +1492 @@
   glconfig = configure_gl();
 
-  if(argc < 2)
-    {
-      perror("usage: pdfcube file_uri [cube_page ...]");
+  if(args_info.inputs_num != 1)
+    {
+      cerr << "You must specify a PDF file name";
       exit(1);
     }
-  gchar *absoluteFileName = get_absolute_file_name (argv[1]);
+
+  gchar *absoluteFileName = get_absolute_file_name (args_info.inputs[0]);
   gchar *filename_uri = g_filename_to_uri (absoluteFileName, NULL, NULL);
   g_free (absoluteFileName);
@@ -1514 +1523 @@
     }
   
-  for(int ii = 2; ii < argc; ii++)    
-    {
-      page_transition[atoi(argv[ii])] = true;
-    }
+  for(int ii = 0; ii < args_info.cube_given; ii++)    
+    {
+      assert(args_info.cube_arg[ii] >= 2);
+      assert(args_info.cube_arg[ii] <= pc->pages()+1);
+      page_transition[args_info.cube_arg[ii]-2] = true;
+    }
+  
 
   /* Create and show the application window. */
   window = create_window(glconfig);
+  
+  if(args_info.fullscreen_given) fullscreen = true;
 
   if(fullscreen)