Changeset 67

Timestamp:

12/11/11 18:10:26 (5 months ago)

Author:

mirko

Message:

distributing man file. still missing man file installation.

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• man/Makefile.am (added)
• src/pdfcube.cc (modified) (5 diffs)

trunk/Makefile.am

@@ -5 +5 @@
 
 #Build in these directories:
-SUBDIRS = src m4
+SUBDIRS = src 
 
 #Distribute these directories:
-DIST_SUBDIRS = src m4
+DIST_SUBDIRS = src m4 man
 
 EXTRA_DIST = autogen.sh

trunk/configure.ac

@@ -60 +60 @@
 AC_OUTPUT(Makefile \
           src/Makefile \
-          m4/Makefile
+          m4/Makefile \
+          man/Makefile
 )

trunk/src/pdfcube.cc

@@ -73 +73 @@
 };
 
+enum imagescale_t { IMAGE_FILL, IMAGE_SCALE, IMAGE_ZOOM };
+
+static GtkWidget* window;
+
+static imagescale_t imagescale = IMAGE_FILL;
 static gboolean fullscreen;
 static gboolean animating = FALSE;
-animation active_animation = ANIM_NONE;
-animation previous_animation = ANIM_NONE;
-animation last_animation = ANIM_NONE;
+static animation active_animation = ANIM_NONE;
+static animation previous_animation = ANIM_NONE;
+static animation last_animation = ANIM_NONE;
 
 // Cube Transitions on the command line 
@@ -135 +140 @@
     page = poppler_document_get_page(d, 1);
     poppler_page_get_size(page, &w, &h);
-    tex_width = 1024;
-    tex_height = 768;
+
+    /*
+      GdkScreen* screen = gdk_screen_get_default();
+      gint monitor_num = gdk_screen_get_monitor_at_window(gdk_screen_get_default(), 
+      window->window);
+      GdkRectangle dest;
+      gdk_screen_get_monitor_geometry(screen,
+      monitor_num,
+      &dest);
+      
+    std::cerr << dest.width << " " << dest.height << std::endl;
+    */
+    tex_width = 320;
+    tex_height = 240;
     pixmap =
       cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 
@@ -1860 +1877 @@
 {
 
-  GtkWidget *
-    window;
   GdkGLConfig *
     glconfig;
@@ -1995 +2010 @@
     exit(1);
   }
+
+  /* Create and show the application window. */
+  window = create_window(glconfig);
 
   pc = new pdfcube(document);
@@ -2029 +2047 @@
         }
     }
-  
-  /* Create and show the application window. */
-  window = create_window(glconfig);
-  
+    
   if(vm.count("no-fullscreen"))
     fullscreen = FALSE;