Bugfix: kdvi did not always notice when the dvifile was changed; doesn't always go to first page any more

svn path=/trunk/kdegraphics/kdvi/; revision=45126

dvi_init.cpp

@@ -51,6 +51,7 @@
 
 
 #include <qbitmap.h> 
+#include <qfileinfo.h>
 
 extern "C" {
 #include <kpathsea/config.h>
@@ -79,12 +80,11 @@ extern FILE *font_open (char *font, char **font_ret, double dpi, int *dpi_ret, i
 
 #define	dvi_oops(str)	(dvi_oops_msg = (str), longjmp(dvi_env, 1))
 
-static	struct stat fstatbuf;
-
 static	Boolean	font_not_found;
 Boolean	_hush_spec;
 Boolean	_hush_chk;
 Boolean	_list_fonts;
+QDateTime dvi_time;
 
 /*
  * DVI preamble and postamble information.
@@ -447,8 +447,7 @@ find_postamble()
  *      It also takes care of reading in all of the pixel files for the fonts
  *      used in the job.
  */
-static	void
+static	void read_postamble()
-read_postamble()
 {
 	ubyte   cmnd;
 	struct font	*fontp;
@@ -520,8 +519,7 @@ read_postamble()
 	    }
 }
 
-static	void
+static	void prepare_pages()
-prepare_pages()
 {
 	int i;
 
@@ -546,28 +544,23 @@ void init_page()
 	page_h = ROUNDUP(unshrunk_page_h, mane.shrinkfactor) + 2;
 }
 
-#ifndef	S_ISDIR
-#define	S_ISDIR(m)	(((m) & S_IFMT) == S_IFDIR)
-#endif
-
 /*
  *	init_dvi_file is the main subroutine for reading the startup
  *	information from the dvi file.  Returns True on success.
  */
 
-static	Boolean
+static Boolean init_dvi_file()
-init_dvi_file()
 {
-	(void) fstat(fileno(dvi_file), &fstatbuf);
+  if (QFileInfo(dvi_name).isDir())
-	if (S_ISDIR(fstatbuf.st_mode))
     return False;
-	dvi_time = fstatbuf.st_mtime;
+  dvi_time = QFileInfo(dvi_name).lastModified();
   process_preamble();
   find_postamble();
   read_postamble();
   prepare_pages();
   init_page();
-	if (current_page >= total_pages) current_page = total_pages - 1;
+  if (current_page >= total_pages)
+    current_page = total_pages - 1;
   hush_spec_now = hush_spec;
   return True;
 }
@@ -579,18 +572,15 @@ init_dvi_file()
 
 extern Boolean check_dvi_file(void)
 {
-	struct font *fontp;
+  if (dvi_file == NULL || (dvi_time != QFileInfo(dvi_name).lastModified())) {
-
-	if (dvi_file == NULL || fstat(fileno(dvi_file), &fstatbuf) != 0
-	    || fstatbuf.st_mtime != dvi_time) {
     if (dvi_file) {
       Fclose(dvi_file);
       dvi_file = NULL;
-		    if (list_fonts) Putchar('\n');
+      if (list_fonts) 
+	Putchar('\n');
     }
     dvi_file = fopen(dvi_name, OPEN_MODE);
-		if (dvi_file == NULL
+    if (dvi_file == NULL || !init_dvi_file())
-			|| !init_dvi_file())
       dvi_oops("Cannot reopen dvi file.");
     return False;
   }

dviwin.cpp

@@ -97,9 +97,7 @@ extern  void qt_processEvents(void)
 
 //------ now comes the dviWindow class implementation ----------
 
-dviWindow::dviWindow( int bdpi, const char *mfm, const char *ppr,
+dviWindow::dviWindow( int bdpi, const char *mfm, const char *ppr, int mkpk, QWidget *parent, const char *name ) : QScrollView( parent, name )
-                      int mkpk, QWidget *parent, const char *name )
-	: QScrollView( parent, name )
 {
 	ChangesPossible = 1;
 	FontPath = QString::null;
@@ -366,24 +364,23 @@ void dviWindow::initDVI()
 #include <setjmp.h>
 extern	jmp_buf	dvi_env;	/* mechanism to communicate dvi file errors */
 extern	char *dvi_oops_msg;
-extern	time_t dvi_time;
+extern	QDateTime dvi_time;
 
 //------ this function calls the dvi interpreter ----------
 
-void dviWindow::drawDVI()
+
+void dviWindow::drawPage()
 {
   psp_interrupt();
   if (filename.isEmpty())	// must call setFile first
     return;
-	if (!dvi_name)
+  if (!dvi_name) {			//  dvi file not initialized yet
-	{			//  dvi file not initialized yet
     QApplication::setOverrideCursor( waitCursor );
     dvi_name = const_cast<char*>(filename.ascii());
 
     dvi_file = NULL;
-		if (setjmp(dvi_env))
+    if (setjmp(dvi_env)) {	// dvi_oops called
-		{	// dvi_oops called
+      dvi_time.setTime_t(0); // force init_dvi_file
-			dvi_time = 0; // force init_dvi_file
       QApplication::restoreOverrideCursor();
       KMessageBox::error( this,
 			  i18n("What's this? DVI problem!\n")
@@ -392,7 +389,6 @@ void dviWindow::drawDVI()
     }
     if ( !check_dvi_file() )
       emit fileChanged();
-
     QApplication::restoreOverrideCursor();
     gotoPage(1);
     changePageSize();
@@ -405,25 +401,22 @@ void dviWindow::drawDVI()
   max_x = page_w;
   max_y = page_h;
 
-	if ( !pixmap )	return;
+  if ( !pixmap )
-	if ( !pixmap->paintingActive() )
+    return;
-	{
+  if ( !pixmap->paintingActive() ) {
     QPainter paint;
     paint.begin( pixmap );
     QApplication::setOverrideCursor( waitCursor );
     dcp = &paint;
-		if (setjmp(dvi_env))
+    if (setjmp(dvi_env)) {	// dvi_oops called
-		{	// dvi_oops called
+      dvi_time.setTime_t(0); // force init_dvi_file
-			dvi_time = 0; // force init_dvi_file
       QApplication::restoreOverrideCursor();
       paint.end();
       KMessageBox::error( this,
 			  i18n("What's this? DVI problem!\n") 
 			  + dvi_oops_msg);
       return;
-		}
+    } else {
-		else
-		{
       if ( !check_dvi_file() )
 	emit fileChanged();
       pixmap->fill( white );
@@ -432,13 +425,7 @@ void dviWindow::drawDVI()
     QApplication::restoreOverrideCursor();
     paint.end();
   }
-}
+  repaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight(), FALSE);
-
-void dviWindow::drawPage()
-{
-  drawDVI();
-  repaintContents(contentsX(), contentsY(), 
-                  visibleWidth(), visibleHeight(), FALSE);
 }
 
 bool dviWindow::changedDVI()
@@ -462,6 +449,7 @@ bool dviWindow::correctDVI()
   // We suppose now that the dvi file is complete	and OK
   return TRUE;
 }
+
 void dviWindow::timerEvent()
 {
   static int changing = 0;
@@ -476,6 +464,7 @@ void dviWindow::timerEvent()
   changing = 0;
   emit statusChange( i18n("File reloaded.") );
   changetime = QFileInfo(filename).lastModified();
+
   drawPage();
   emit fileChanged();
 }
@@ -630,9 +619,7 @@ void   dviWindow::contentsMoving( int x, int y )
 }
 
 
-void   dviWindow::drawContents(QPainter *p, 
+void   dviWindow::drawContents(QPainter *p, int clipx, int clipy, int clipw, int cliph ) 
-                               int clipx, int clipy, 
-                               int clipw, int cliph ) 
 {
   if ( pixmap )
     p->drawPixmap(clipx, clipy, *pixmap, clipx, clipy, clipw, cliph);

dviwin.h

@@ -90,7 +90,6 @@ private:
 	bool		changedDVI();
 	bool		correctDVI();
 	void		initDVI();
-	void		drawDVI();
 	void		changePageSize();
 	QPoint		mouse;
 	QString		filename;

kdvi.cpp

@@ -473,7 +473,7 @@ void kdvi::updateMarklist()
 		s.sprintf( "%4d", i );
 		marklist->insertItem( s, 0 );
 	}
-	marklist->select(0);
+	//	marklist->select(0); //@@@
 	marklist->setAutoUpdate( TRUE );
 	marklist->update();
 }
@@ -824,8 +824,10 @@ void kdvi::setPage( int pg )
 {
   QString str;
 
-	if (!pg) pg = dviwin->page();
+  if (!pg)
-	if (!pg) return;
+    pg = dviwin->page();
+  if (!pg) 
+    return;
   str.setNum( pg );
   str = i18n("Page: ") + str + i18n(" / ") + QString().setNum(dviwin->totalPages());
   statusBar()->changeItem( str, ID_STAT_PAGE );
@@ -887,6 +889,9 @@ void kdvi::shrinkChanged(int s)
 	statusBar()->changeItem( t, ID_STAT_SHRINK);
 }
 
+
+// This slot is called after the dvi-file has been reloaded.
+
 void kdvi::fileChanged()
 {
 	message( i18n("File reloaded.") );

xdvi.h

@@ -266,7 +266,6 @@ EXTERN	long	magnification;
 EXTERN	double	dimconv;
 EXTERN	double	tpic_conv;
 EXTERN	int	n_files_left;	/* for LRU closing of fonts */
-EXTERN	time_t	dvi_time;		/* last mod. time for dvi file */
 EXTERN	unsigned int	page_w, page_h;
 
 #if	defined(PS_DPS) || defined(PS_NEWS) || defined(PS_GS)