Changeset 68 for trunk/src

Timestamp:

12/11/11 18:28:45 (5 months ago)

Author:

mirko

Message:

reverting unwanted changes

Files:

• trunk/src/pdfcube.cc (modified) (5 diffs)

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;
-static animation active_animation = ANIM_NONE;
-static animation previous_animation = ANIM_NONE;
-static animation last_animation = ANIM_NONE;
+animation active_animation = ANIM_NONE;
+animation previous_animation = ANIM_NONE;
+animation last_animation = ANIM_NONE;
 
 // Cube Transitions on the command line 
@@ -140 +135 @@
     page = poppler_document_get_page(d, 1);
     poppler_page_get_size(page, &w, &h);
-
-    /*
-      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;
+    tex_width = 1024;
+    tex_height = 768;
     pixmap =
       cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 
@@ -1877 +1860 @@
 {
 
+  GtkWidget *
+    window;
   GdkGLConfig *
     glconfig;
@@ -2010 +1995 @@
     exit(1);
   }
-
-  /* Create and show the application window. */
-  window = create_window(glconfig);
 
   pc = new pdfcube(document);
@@ -2047 +2029 @@
         }
     }
-    
+  
+  /* Create and show the application window. */
+  window = create_window(glconfig);
+  
   if(vm.count("no-fullscreen"))
     fullscreen = FALSE;