Changeset 50

Timestamp:

Jun 11, 2006, 4:12:09 PM (15 years ago)

Author:

Eugene Romanenko

Message:

added settings dialog, asynch opening, fixed many crashes and bugs

Location:

trunk

Files:

• Lucide/BIN/Lucide.lng (modified) (3 diffs)
• Lucide/SOURCE/gui/Lucide.rc (modified) (1 diff)
• Lucide/SOURCE/gui/Lucide_res.H (modified) (2 diffs)
• Lucide/SOURCE/gui/dialogs.rc (modified) (1 diff)
• Lucide/SOURCE/gui/docViewer.cpp (modified) (13 diffs)
• Lucide/SOURCE/gui/docViewer.h (modified) (2 diffs)
• Lucide/SOURCE/gui/lucide.cpp (modified) (12 diffs)
• Lucide/SOURCE/gui/lucide.h (modified) (2 diffs)
• Lucide/SOURCE/gui/lusettings.cpp (added)
• Lucide/SOURCE/gui/lusettings.h (added)
• Lucide/SOURCE/gui/luutils.cpp (modified) (2 diffs)
• Lucide/SOURCE/gui/luutils.h (modified) (1 diff)
• Lucide/SOURCE/gui/makefile (modified) (4 diffs)
• Lucide/SOURCE/gui/messages.cpp (modified) (2 diffs)
• Lucide/SOURCE/gui/messages.h (modified) (2 diffs)
• Lucide/SOURCE/gui/progressDlg.cpp (modified) (5 diffs)
• Lucide/SOURCE/gui/settingsDlg.cpp (added)
• Lucide/SOURCE/gui/settingsDlg.h (added)
• Lucide/SOURCE/gui/toolbar.cpp (modified) (3 diffs)
• Lucide/SOURCE/plugins/ludjvu/ludjvu.cpp (modified) (2 diffs)
• Lucide/SOURCE/plugins/ludoc/lutypes.h (modified) (1 diff)
• Lucide/SOURCE/plugins/lupoppler/lupoppler.cpp (modified) (3 diffs)
• Lucide/SOURCE/plugins/lupoppler/makefile (modified) (1 diff)
• poppler/mypoppler/poppler/Page.cc (modified) (1 diff)

trunk/Lucide/BIN/Lucide.lng

@@ -21 +21 @@
 MENU_FIND=Find...\tCtrl+F
 MENU_FINDAGAIN=Find again\tCtrl+G
+MENU_SETTINGS=Settings
 MENU_DOCUMENT=~Document
 MENU_FIRST_PAGE=First page
@@ -64 +65 @@
 MSGS_NO_SUIT_PLUG=Can't find suitable plugin for specified document!
 MSGS_FILE_LOAD_ERROR=File load error!
+MSGS_LOADING_DOCUMENT=Loading document, please wait...
 
 #
@@ -126 +128 @@
 AD_COPYRIGHTS=(c) by Eugene Romanenko, netlabs.org in co-operation with Serenity Systems International
 AD_OK=OK
+
+#
+# Settings dialog
+#
+SD_SETTINGS=Settings
+SD_DEFAULT_PAGE_LAYOUT=Default Page Layout:
+SD_DEFAULT_ZOOM=Default Zoom:
+SD_OK=~OK
+SD_CANCEL=~Cancel

trunk/Lucide/SOURCE/gui/Lucide.rc

@@ -40 +40 @@
         MENUITEM "MENU_FIND", CM_FIND
         MENUITEM "MENU_FINDAGAIN", CM_FINDAGAIN
+        MENUITEM SEPARATOR
+        MENUITEM "MENU_SETTINGS", CM_SETTINGS
     END
 

trunk/Lucide/SOURCE/gui/Lucide_res.H

@@ -67 +67 @@
 #define CM_FIND                 203
 #define CM_FINDAGAIN    204
+#define CM_SETTINGS             205
 
 #define CM_FIRSTPAGE    301
@@ -116 +117 @@
 #define IDC_NETLABSURL          12
 
+#define IDD_SETTINGS            1006
+#define IDC_DEFPGLAYOUT         10
+#define IDC_DEFZOOM                     11
+
 #endif // __LUCIDE_RES_H

trunk/Lucide/SOURCE/gui/dialogs.rc

@@ -91 +91 @@
 
 END
+
+DLGTEMPLATE IDD_SETTINGS 
+BEGIN
+        DIALOG "SD_SETTINGS", -1, 60, 94, 207, 71, WS_VISIBLE, FCF_SYSMENU | FCF_TITLEBAR
+        BEGIN
+                CONTROL "", -1, 2, 24, 203, 45, WC_STATIC, SS_GROUPBOX | DT_LEFT | DT_TOP | WS_VISIBLE | WS_GROUP
+                CONTROL "SD_DEFAULT_PAGE_LAYOUT", -1, 9, 48, 76, 14, WC_STATIC, SS_TEXT | DT_LEFT | DT_TOP | DT_MNEMONIC | WS_VISIBLE | WS_GROUP
+                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
+                CONTROL "", IDC_DEFPGLAYOUT, 88, 20, 111, 40, WC_COMBOBOX, CBS_DROPDOWNLIST | ES_ANY | WS_VISIBLE | WS_GROUP | WS_TABSTOP
+                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
+                CONTROL "SD_DEFAULT_ZOOM", -1, 9, 28, 77, 14, WC_STATIC, SS_TEXT | DT_LEFT | DT_TOP | DT_MNEMONIC | WS_VISIBLE | WS_GROUP
+                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
+                CONTROL "", IDC_DEFZOOM, 88, -3, 111, 43, WC_COMBOBOX, CBS_DROPDOWNLIST | ES_ANY | WS_VISIBLE | WS_GROUP | WS_TABSTOP
+                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
+                DEFPUSHBUTTON "SD_OK", DID_OK, 91, 4, 51, 14
+                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
+                PUSHBUTTON "SD_CANCEL", DID_CANCEL, 152, 4, 51, 14
+                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
+        END
+END
+

trunk/Lucide/SOURCE/gui/docViewer.cpp

@@ -58 +58 @@
 }
 
+ULONG APIENTRY GPFHandler( PEXCEPTIONREPORTRECORD pxcptrec,
+                           PEXCEPTIONREGISTRATIONRECORD prr,
+                           PCONTEXTRECORD pcr, PVOID pv );
+
+
 typedef LuDocument_LuRectSequence    *PLuRectSequence;
 typedef LuDocument_LuLinkMapSequence *PLuLinkMapSequence;
@@ -96 +101 @@
     drawareas   = NULL;
     drawareaIndex = 0;
+    closed        = true;
     // continuous view
     continuous  = false;
@@ -181 +187 @@
     if ( doc != NULL )
     {
+        closed = false;
+
         totalpages = doc->getPageCount( ev );
         bpp = doc->getBpp( ev );
+        if ( !doc->isScalable( ev ) ) {
+            zoom = 1;
+        }
 
         pagesizes = new LuSize[ totalpages ];
@@ -205 +216 @@
         enableAsynchDraw = doc->isAsynchRenderingSupported( ev );
         goToPage( 0 );
+
+        if ( continuous ) {
+            drawPage();
+        }
     }
 }
@@ -212 +227 @@
 void DocumentViewer::close()
 {
+    if ( closed ) {
+        return;
+    }
+
+    closed = true;
     abortAsynch = true;
     DosRequestMutexSem( todrawAccess, SEM_INDEFINITE_WAIT );
@@ -236 +256 @@
     doc         = NULL;
     totalpages  = 0;
-    zoom        = 1;
     currentpage = 0;
     fullwidth   = 0;
@@ -244 +263 @@
 }
 
-// sets the view mode
-void DocumentViewer::setViewMode( ViewMode mode )
-{
-    continuous = ( mode == Continuous );
+// sets the page layout
+void DocumentViewer::setPageLayout( PgLayout layout )
+{
+    continuous = ( layout == Continuous );
     if ( doc != NULL ) {
         long pg = currentpage;
@@ -294 +313 @@
         double pgpos = pagenumToPos( page ) / VScrollStep;
         vertScroll( hWndDoc, MPFROM2SHORT( pgpos, SB_SLIDERPOSITION ), NULLHANDLE );
-        //drawPage();
     }
     else
@@ -755 +773 @@
         }
     }
-
     WinDestroyMsgQueue( thmq );
     WinTerminate( thab );
@@ -767 +784 @@
     RECTL rcl;
     HPS hps = WinBeginPaint( hwnd, 0L, &rcl );
-    if ( hps != NULLHANDLE )
-    {
-        RECTL rclWin = { 0 };
-        WinQueryWindowRect( hwnd, &rclWin );
-        if ( WinEqualRect( hab, &rcl, &rclWin ) ) {
-            GpiErase( hps );
-        }
-        WinEndPaint( hps );
-    }
-
-    RECTL rclPage = { 0, 0, width, height };
-    if ( height < cyClient )
-    {
-        rclPage.yBottom = cyClient - height;
-        rclPage.yTop = cyClient;
-    }
-    RECTL rclDraw = { 0 };
-    if ( WinIntersectRect( hab, &rclDraw, &rcl, &rclPage ) )
-    {
-        if ( ( drawareas != NULL ) && ( drawareas->size() > 0 ) ) {
-            if ( isSubrect( &((*drawareas)[0].drawrect), &rclDraw ) &&
-                 ( sVscrollInc == 0 ) && ( sHscrollInc == 0 ) ) {
-                return;
-            }
+    RECTL rclWin = { 0 };
+    WinQueryWindowRect( hwnd, &rclWin );
+    if ( WinEqualRect( hab, &rcl, &rclWin ) ) {
+        GpiErase( hps );
+    }
+    WinEndPaint( hps );
+
+    if ( doc != NULL )
+    {
+        RECTL rclPage = { 0, 0, width, height };
+        if ( height < cyClient )
+        {
+            rclPage.yBottom = cyClient - height;
+            rclPage.yTop = cyClient;
+        }
+        RECTL rclDraw = { 0 };
+        if ( WinIntersectRect( hab, &rclDraw, &rcl, &rclPage ) )
+        {
+            if ( ( drawareas != NULL ) && ( drawareas->size() > 0 ) ) {
+                if ( isSubrect( &((*drawareas)[0].drawrect), &rclDraw ) &&
+                     ( sVscrollInc == 0 ) && ( sHscrollInc == 0 ) ) {
+                    return;
+                }
+            }
+
+            abortAsynch = true;
+            DosRequestMutexSem( todrawAccess, SEM_INDEFINITE_WAIT );
+
+            if ( drawareas == NULL ) {
+                drawareas = new DrawAreas;
+            }
+            if ( drawareas->size() == 0 ) {
+                PageDrawArea pda;
+                memset( &pda, 0, sizeof( pda ) );
+                pda.pagenum = currentpage;
+                drawareas->push_back( pda );
+            }
+
+            PageDrawArea *ppda = &((*drawareas)[0]);
+
+            if ( !WinIsRectEmpty( hab, &ppda->drawrect ) )
+            {
+                if ( sVscrollInc > 0 ) {
+                    ppda->drawrect.yTop    += sVscrollInc;
+                } else if ( sVscrollInc < 0 ) {
+                    ppda->drawrect.yBottom += sVscrollInc;
+                }
+                if ( sHscrollInc > 0 ) {
+                    ppda->drawrect.xLeft  -= sHscrollInc;
+                } else if ( sHscrollInc < 0 ) {
+                    ppda->drawrect.xRight -= sHscrollInc;
+                }
+            }
+            WinUnionRect( hab, &ppda->drawrect, &ppda->drawrect, &rclDraw );
+            ppda->startpos.x = sHscrollPos + ppda->drawrect.xLeft;
+            ppda->startpos.y = ( cyClient - ppda->drawrect.yTop ) + sVscrollPos;
+
+            // workaround ?
+            ppda->drawrect.xRight++;
+            ppda->drawrect.yTop++;
+
+            DosReleaseMutexSem( todrawAccess );
+            DosPostEventSem( haveDraw );
+        }
+    }
+}
+
+
+// handles WM_PAINT if continuous asynchronous rendering used
+void DocumentViewer::wmPaintContAsynch( HWND hwnd )
+{
+    RECTL rcl, rclWin, rclDraw = { 0 };
+    HPS hps = WinBeginPaint( hwnd, 0L, &rcl );
+    GpiErase( hpsBuffer );
+    BlitGraphicsBuffer( hps, hpsBuffer, &rcl );
+    WinEndPaint( hps );
+
+    if ( doc != NULL )
+    {
+        if ( isSubrect( &savedRcl, &rcl ) && ( sVscrollInc == 0 ) && ( sHscrollInc == 0 ) ) {
+            return;
         }
 
@@ -796 +870 @@
         DosRequestMutexSem( todrawAccess, SEM_INDEFINITE_WAIT );
 
-        if ( drawareas == NULL ) {
-            drawareas = new DrawAreas;
-        }
-        if ( drawareas->size() == 0 ) {
-            PageDrawArea pda;
-            memset( &pda, 0, sizeof( pda ) );
-            pda.pagenum = currentpage;
-            drawareas->push_back( pda );
-        }
-
-        PageDrawArea *ppda = &((*drawareas)[0]);
-
-        if ( !WinIsRectEmpty( hab, &ppda->drawrect ) )
-        {
-            if ( sVscrollInc > 0 ) {
-                ppda->drawrect.yTop    += sVscrollInc;
-            } else if ( sVscrollInc < 0 ) {
-                ppda->drawrect.yBottom += sVscrollInc;
-            }
-            if ( sHscrollInc > 0 ) {
-                ppda->drawrect.xLeft  -= sHscrollInc;
-            } else if ( sHscrollInc < 0 ) {
-                ppda->drawrect.xRight -= sHscrollInc;
-            }
-        }
-        WinUnionRect( hab, &ppda->drawrect, &ppda->drawrect, &rclDraw );
-        ppda->startpos.x = sHscrollPos + ppda->drawrect.xLeft;
-        ppda->startpos.y = ( cyClient - ppda->drawrect.yTop ) + sVscrollPos;
-
-        // workaround ?
-        ppda->drawrect.xRight++;
-        ppda->drawrect.yTop++;
-
+        WinQueryWindowRect( hwnd, &rclWin );
+        WinUnionRect( hab, &rcl, &rcl, &savedRcl );
+
+        if ( sVscrollInc > 0 ) {
+            rcl.yTop    += sVscrollInc;
+        } else if ( sVscrollInc < 0 ) {
+            rcl.yBottom += sVscrollInc;
+        }
+        if ( sHscrollInc > 0 ) {
+            rcl.xLeft  -= sHscrollInc;
+        } else if ( sHscrollInc < 0 ) {
+            rcl.xRight -= sHscrollInc;
+        }
+
+        WinIntersectRect( hab, &rclDraw, &rcl, &rclWin );
+        WinCopyRect( hab, &rcl, &rclDraw );
+        WinCopyRect( hab, &savedRcl, &rcl );
+
+        delete drawareas;
+        drawareas = findDrawAreas( &rcl );
+
+        for ( int i = 0; i < drawareas->size(); i++ )
+        {
+            PageDrawArea *pda = &(*drawareas)[ i ];
+
+            // load links for page if not loaded before
+            if ( links[ pda->pagenum ] == NULL ) {
+                links[ pda->pagenum ] = doc->getLinkMapping( ev, pda->pagenum );
+            }
+        }
         DosReleaseMutexSem( todrawAccess );
         DosPostEventSem( haveDraw );
-    }
-}
-
-
-// handles WM_PAINT if continuous asynchronous rendering used
-void DocumentViewer::wmPaintContAsynch( HWND hwnd )
-{
-    RECTL rcl, rclWin, rclDraw = { 0 };
-    HPS hps = WinBeginPaint( hwnd, 0L, &rcl );
-    if ( hps != NULLHANDLE ) {
-        GpiErase( hpsBuffer );
-        BlitGraphicsBuffer( hps, hpsBuffer, &rcl );
-        WinEndPaint( hps );
-    }
-
-    if ( isSubrect( &savedRcl, &rcl ) && ( sVscrollInc == 0 ) && ( sHscrollInc == 0 ) ) {
-        return;
-    }
-
-    abortAsynch = true;
-    DosRequestMutexSem( todrawAccess, SEM_INDEFINITE_WAIT );
-
-    WinQueryWindowRect( hwnd, &rclWin );
-    WinUnionRect( hab, &rcl, &rcl, &savedRcl );
-
-    if ( sVscrollInc > 0 ) {
-        rcl.yTop    += sVscrollInc;
-    } else if ( sVscrollInc < 0 ) {
-        rcl.yBottom += sVscrollInc;
-    }
-    if ( sHscrollInc > 0 ) {
-        rcl.xLeft  -= sHscrollInc;
-    } else if ( sHscrollInc < 0 ) {
-        rcl.xRight -= sHscrollInc;
-    }
-
-    WinIntersectRect( hab, &rclDraw, &rcl, &rclWin );
-    WinCopyRect( hab, &rcl, &rclDraw );
-    WinCopyRect( hab, &savedRcl, &rcl );
-
-    delete drawareas;
-    drawareas = findDrawAreas( &rcl );
-
-    for ( int i = 0; i < drawareas->size(); i++ )
-    {
-        PageDrawArea *pda = &(*drawareas)[ i ];
-
-        // load links for page if not loaded before
-        if ( links[ pda->pagenum ] == NULL ) {
-            links[ pda->pagenum ] = doc->getLinkMapping( ev, pda->pagenum );
-        }
-    }
-    DosReleaseMutexSem( todrawAccess );
-    DosPostEventSem( haveDraw );
-
-    determineCurrentPage();
+
+        determineCurrentPage();
+    }
 }
 
@@ -897 +915 @@
     GpiErase( hpsBuffer );
 
-    RECTL rclPage = { 0, 0, width, height };
-    if ( height < cyClient )
-    {
-        rclPage.yBottom = cyClient - height;
-        rclPage.yTop = cyClient;
-    }
-    RECTL rclDraw = { 0 };
-    if ( WinIntersectRect( hab, &rclDraw, &rcl, &rclPage ) )
-    {
-        spos_x = sHscrollPos + rclDraw.xLeft;
-        spos_y = (cyClient - rclDraw.yTop) + sVscrollPos;
-        LONG rclx = rclDraw.xRight - rclDraw.xLeft;
-        LONG rcly = rclDraw.yTop - rclDraw.yBottom;
-
-        pixbuf = new LuPixbuf( ev, rclx, rcly, bpp );
-        POINTL aptlPoints[4]={ rclDraw.xLeft, rclDraw.yBottom,
-                               rclDraw.xRight-1, rclDraw.yTop-1,
-                               0, 0, rclx, rcly };
-
-        doc->renderPageToPixbuf( ev, currentpage, spos_x, spos_y,
-                                 rclx, rcly, realzoom, 0, pixbuf );
-        LONG lRop = ROP_SRCCOPY;
-        BITMAPINFO2 pbmi;
-        pbmi.cbFix = 16L;
-        pbmi.cx = rclx;
-        pbmi.cy = rcly;
-        pbmi.cPlanes = 1;
-        pbmi.cBitCount = bpp * 8;
-        GpiDrawBits( hpsBuffer, pixbuf->getDataPtr( ev ), &pbmi, 4L,
-                     aptlPoints, lRop, BBO_IGNORE );
-
-        drawSelection( currentpage, hpsBuffer, &rclDraw );
-        drawFound( currentpage, hpsBuffer, &rclDraw );
-
+    if ( doc != NULL )
+    {
+        RECTL rclPage = { 0, 0, width, height };
+        if ( height < cyClient )
+        {
+            rclPage.yBottom = cyClient - height;
+            rclPage.yTop = cyClient;
+        }
+        RECTL rclDraw = { 0 };
+        if ( WinIntersectRect( hab, &rclDraw, &rcl, &rclPage ) )
+        {
+            spos_x = sHscrollPos + rclDraw.xLeft;
+            spos_y = (cyClient - rclDraw.yTop) + sVscrollPos;
+            LONG rclx = rclDraw.xRight - rclDraw.xLeft;
+            LONG rcly = rclDraw.yTop - rclDraw.yBottom;
+
+            pixbuf = new LuPixbuf( ev, rclx, rcly, bpp );
+            POINTL aptlPoints[4]={ rclDraw.xLeft, rclDraw.yBottom,
+                                   rclDraw.xRight-1, rclDraw.yTop-1,
+                                   0, 0, rclx, rcly };
+
+            doc->renderPageToPixbuf( ev, currentpage, spos_x, spos_y,
+                                     rclx, rcly, realzoom, 0, pixbuf );
+            LONG lRop = ROP_SRCCOPY;
+            BITMAPINFO2 pbmi;
+            pbmi.cbFix = 16L;
+            pbmi.cx = rclx;
+            pbmi.cy = rcly;
+            pbmi.cPlanes = 1;
+            pbmi.cBitCount = bpp * 8;
+            GpiDrawBits( hpsBuffer, pixbuf->getDataPtr( ev ), &pbmi, 4L,
+                         aptlPoints, lRop, BBO_IGNORE );
+
+            drawSelection( currentpage, hpsBuffer, &rclDraw );
+            drawFound( currentpage, hpsBuffer, &rclDraw );
+
+            BlitGraphicsBuffer( hps, hpsBuffer, &rcl );
+            delete pixbuf;
+            pixbuf = NULL;
+        }
+    }
+    else {
         BlitGraphicsBuffer( hps, hpsBuffer, &rcl );
-        delete pixbuf;
-        pixbuf = NULL;
-    }
-
+    }
     WinEndPaint( hps );
 }
@@ -1038 +1061 @@
     GpiErase( hpsBuffer );
 
-    delete drawareas;
-    drawareas = findDrawAreas( &rcl );
-
-    for ( int i = 0; i < drawareas->size(); i++ )
-    {
-        PageDrawArea *pda = &(*drawareas)[ i ];
-
-        // load links for page if not loaded before
-        if ( links[ pda->pagenum ] == NULL ) {
-            links[ pda->pagenum ] = doc->getLinkMapping( ev, pda->pagenum );
-        }
-
-        spos_x = pda->startpos.x;
-        //spos_y = ( cyClient - pda->drawrect.yTop ) + ( sVscrollPos * VScrollStep );
-        spos_y = pda->startpos.y;
-        LONG rclx = pda->drawrect.xRight - pda->drawrect.xLeft;
-        LONG rcly = pda->drawrect.yTop - pda->drawrect.yBottom;
-
-        pixbuf = new LuPixbuf( ev, rclx, rcly, bpp );
-        POINTL aptlPoints[4]={ pda->drawrect.xLeft, pda->drawrect.yBottom,
-                               pda->drawrect.xRight-1, pda->drawrect.yTop-1,
-                               0, 0, rclx, rcly };
-
-        doc->renderPageToPixbuf( ev, pda->pagenum, spos_x, spos_y,
-                                 rclx, rcly, realzoom, 0, pixbuf );
-        LONG lRop = ROP_SRCCOPY;
-        BITMAPINFO2 pbmi;
-        pbmi.cbFix = 16L;
-        pbmi.cx = rclx;
-        pbmi.cy = rcly;
-        pbmi.cPlanes = 1;
-        pbmi.cBitCount = bpp * 8;
-        GpiDrawBits( hpsBuffer, pixbuf->getDataPtr( ev ), &pbmi, 4L,
-                     aptlPoints, lRop, BBO_IGNORE );
-
-        drawSelection( pda->pagenum, hpsBuffer, &pda->drawrect );
-        drawFound( pda->pagenum, hpsBuffer, &pda->drawrect );
-
-        delete pixbuf;
-        pixbuf = NULL;
-    }
-    delete drawareas;
-    drawareas = NULL;
+    if ( doc != NULL )
+    {
+        delete drawareas;
+        drawareas = findDrawAreas( &rcl );
+
+        for ( int i = 0; i < drawareas->size(); i++ )
+        {
+            PageDrawArea *pda = &(*drawareas)[ i ];
+
+            // load links for page if not loaded before
+            if ( links[ pda->pagenum ] == NULL ) {
+                links[ pda->pagenum ] = doc->getLinkMapping( ev, pda->pagenum );
+            }
+
+            spos_x = pda->startpos.x;
+            //spos_y = ( cyClient - pda->drawrect.yTop ) + ( sVscrollPos * VScrollStep );
+            spos_y = pda->startpos.y;
+            LONG rclx = pda->drawrect.xRight - pda->drawrect.xLeft;
+            LONG rcly = pda->drawrect.yTop - pda->drawrect.yBottom;
+
+            pixbuf = new LuPixbuf( ev, rclx, rcly, bpp );
+            POINTL aptlPoints[4]={ pda->drawrect.xLeft, pda->drawrect.yBottom,
+                                   pda->drawrect.xRight-1, pda->drawrect.yTop-1,
+                                   0, 0, rclx, rcly };
+
+            doc->renderPageToPixbuf( ev, pda->pagenum, spos_x, spos_y,
+                                     rclx, rcly, realzoom, 0, pixbuf );
+            LONG lRop = ROP_SRCCOPY;
+            BITMAPINFO2 pbmi;
+            pbmi.cbFix = 16L;
+            pbmi.cx = rclx;
+            pbmi.cy = rcly;
+            pbmi.cPlanes = 1;
+            pbmi.cBitCount = bpp * 8;
+            GpiDrawBits( hpsBuffer, pixbuf->getDataPtr( ev ), &pbmi, 4L,
+                         aptlPoints, lRop, BBO_IGNORE );
+
+            drawSelection( pda->pagenum, hpsBuffer, &pda->drawrect );
+            drawFound( pda->pagenum, hpsBuffer, &pda->drawrect );
+
+            delete pixbuf;
+            pixbuf = NULL;
+        }
+        delete drawareas;
+        drawareas = NULL;
+    }
     BlitGraphicsBuffer( hps, hpsBuffer, &rcl );
     WinEndPaint( hps );
 
-    determineCurrentPage();
+    if ( doc != NULL ) {
+        determineCurrentPage();
+    }
 }
 

trunk/Lucide/SOURCE/gui/docViewer.h

@@ -60 +60 @@
         virtual ~DocumentViewer();
 
-        void setViewMode( ViewMode mode );
+        void setPageLayout( PgLayout layout );
 
         HWND getHWND() { return hWndDocFrame; }
@@ -147 +147 @@
         DrawAreas *drawareas;
         int drawareaIndex;
+        bool closed;
 
         // continuous view

trunk/Lucide/SOURCE/gui/lucide.cpp

@@ -50 +50 @@
 #include "findDlg.h"
 #include "progressDlg.h"
+#include "settingsDlg.h"
 #include "docViewer.h"
 #include "indexWindow.h"
+#include "lusettings.h"
 #include "luutils.h"
 #include "tb_spl.h"
@@ -67 +69 @@
 const char *showind    = "ShowIndex";
 
+ULONG APIENTRY GPFHandler( PEXCEPTIONREPORTRECORD pxcptrec,
+                           PEXCEPTIONREGISTRATIONRECORD prr,
+                           PCONTEXTRECORD pcr, PVOID pv );
 
 HWND createToolbar( HWND hwnd );
@@ -86 +91 @@
 IndexWindow    *indexWin  = NULL;
 FindDlg        *findDlg   = NULL;
+LuSettings     *settings  = NULL;
 char           *title     = NULL;
 
@@ -291 +297 @@
 }
 
-void Lucide::setViewMode( ViewMode mode )
-{
-    if ( mode == SinglePage )
+void Lucide::setPageLayout( PgLayout layout )
+{
+    if ( layout == SinglePage )
     {
         WinSendMsg( hWndMenu, MM_SETITEMATTR,
@@ -312 +318 @@
     }
 
-    docViewer->setViewMode( mode );
+    docViewer->setPageLayout( layout );
 }
 
@@ -371 +377 @@
                 loadError = NULL;
 
-#if 0
+                // Load document asynchronously
                 loadProgressDlg = new ProgressDlg( hWndFrame );
-                loadProgressDlg->setText( "Loading document, please wait..." );
+                char *ldmsg = newstrdupL( MSGS_LOADING_DOCUMENT );
+                loadProgressDlg->setText( ldmsg );
+                delete ldmsg;
                 loadProgressDlg->show( loadthread, NULL ); // doc will be loaded
                 delete loadProgressDlg;
-#else
-                docLoaded = doc->loadFile( ev, docName, NULL, &loadError );
-#endif
 
                 if ( docLoaded )
                 {
                     char *t = new char[ 2048 ];
-                    char _fn[ _MAX_NAME ];
+                    char _fn[ _MAX_FNAME ];
                     char _ex[ _MAX_EXT ];
                     _splitpath( fn, NULL, NULL, _fn, _ex );
-                    strcpy( t, _fn );
-                    strcat( t, _ex );
-                    strcat( t, " - " );
-                    strcat( t, title );
+                    snprintf( t, 2048, "%s%s - %s", _fn, _ex, title );
                     WinSetWindowText( hWndFrame, t );
                     delete t;
@@ -602 +604 @@
                     return (MRESULT)FALSE;
 
+                case CM_SETTINGS:
+                {
+                    SettingsDlg *d = new SettingsDlg( hWndFrame, settings );
+                    d->doDialog();
+                    return (MRESULT)FALSE;
+                }
+
                 case CM_FIRSTPAGE:
                     Lucide::goToPage( 0 );
@@ -631 +640 @@
 
                 case CM_SINGLEPAGE:
-                    Lucide::setViewMode( SinglePage );
+                    Lucide::setPageLayout( SinglePage );
                     return (MRESULT)FALSE;
 
                 case CM_CONTINUOUS:
-                    Lucide::setViewMode( Continuous );
+                    Lucide::setPageLayout( Continuous );
                     return (MRESULT)FALSE;
 
@@ -681 +690 @@
 
     loadLang();
+
+    settings = new LuSettings;
+    settings->load();
 
     pluginMan = new PluginManager;
@@ -737 +749 @@
     findDlg = new FindDlg( hWndFrame );
     Lucide::checkMenus();
+    Lucide::setPageLayout( settings->layout );
+    Lucide::setZoom( settings->zoom );
 
     // ®ª § âì ®ª­® ¯à®£à ¬¬ë
@@ -767 +781 @@
 
     WinDestroyWindow( hWndFrame );
-    WinDestroyMsgQueue( hmq );
-    WinTerminate( hab );
 
     delete docViewer;
@@ -779 +791 @@
     delete findDlg;
     delete title;
-
+    delete settings;
+
+    WinDestroyMsgQueue( hmq );
+    WinTerminate( hab );
     return 0;
 }

trunk/Lucide/SOURCE/gui/lucide.h

@@ -45 +45 @@
 class ProgressDlg;
 
-enum ViewMode { SinglePage, Continuous };
+enum PgLayout { SinglePage = 0, Continuous = 1 };
 
 struct LuWindowPos
@@ -89 +89 @@
         static void setZoom( double zoom );
         static void enableCopy( bool enable );
-        static void setViewMode( ViewMode mode );
+        static void setPageLayout( PgLayout layout );
         static void toggleFullscreen();
 };

trunk/Lucide/SOURCE/gui/luutils.cpp

@@ -45 +45 @@
 
 #include "luutils.h"
+#include "messages.h"
 
 bool initCountryInfo();
@@ -441 +442 @@
 }
 
+void setZoomValues( HWND lbox )
+{
+    std::string actsizetext = getLocalizedString( TBHINT_ACTUAL_SIZE );
+    WinSetWindowText( lbox, actsizetext.c_str() );
+    WinSendMsg( lbox, LM_INSERTITEM, MPFROMSHORT(LIT_END),
+                MPFROMP( actsizetext.c_str() ) );
+    WinSendMsg( lbox, LM_INSERTITEM, MPFROMSHORT(LIT_END),
+                MPFROMP( getLocalizedString( TBHINT_FIT_WINDOW ).c_str() ) );
+    WinSendMsg( lbox, LM_INSERTITEM, MPFROMSHORT(LIT_END),
+                MPFROMP( getLocalizedString( TBHINT_FIT_WIDTH ).c_str() ) );
+    WinSendMsg( lbox, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "12.5%" ) );
+    WinSendMsg( lbox, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "25%" ) );
+    WinSendMsg( lbox, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "50%" ) );
+    WinSendMsg( lbox, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "100%" ) );
+    WinSendMsg( lbox, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "125%" ) );
+    WinSendMsg( lbox, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "150%" ) );
+    WinSendMsg( lbox, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "200%" ) );
+    WinSendMsg( lbox, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "300%" ) );
+    WinSendMsg( lbox, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "400%" ) );
+    WinSendMsg( lbox, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "800%" ) );
+    WinSendMsg( lbox, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "1600%" ) );
+}
+
+double convZoom( SHORT v )
+{
+        double z = -3;
+    switch ( v )
+    {
+        case 0:   z = 1;      break;
+        case 1:   z = -2;     break;
+        case 2:   z = -1;     break;
+        case 3:   z = 0.125;  break;
+        case 4:   z = 0.25;   break;
+        case 5:   z = 0.5;    break;
+        case 6:   z = 1;      break;
+        case 7:   z = 1.25;   break;
+        case 8:   z = 1.5;    break;
+        case 9:   z = 2;      break;
+        case 10:  z = 3;      break;
+        case 11:  z = 4;      break;
+        case 12:  z = 8;      break;
+        case 13:  z = 16;     break;
+    }
+    return z;
+}

trunk/Lucide/SOURCE/gui/luutils.h

@@ -66 +66 @@
 void textToClipbrd( HAB hab, const char *text );
 void centerWindow( HWND parent, HWND hwnd );
+void setZoomValues( HWND lbox );
+double convZoom( SHORT v );
 #endif
 

trunk/Lucide/SOURCE/gui/makefile

@@ -2 +2 @@
 
 TEST=0
-VERSION=Beta 1
+VERSION=Beta 1.1
 
 !if $(TEST)==1
@@ -36 +36 @@
        linklab.obj wwbtn.obj intern.obj messages.obj indexWindow.obj \
        fontsInfoDlg.obj docInfoDlg.obj findDlg.obj progressDlg.obj \
-       aboutDlg.obj
+       aboutDlg.obj settingsDlg.obj lusettings.obj
 
 Lucide.exe: $(OBJS) Lucide.res
@@ -57 +57 @@
 file $(OBJDIR)\progressDlg.obj
 file $(OBJDIR)\aboutDlg.obj
+file $(OBJDIR)\settingsDlg.obj
+file $(OBJDIR)\lusettings.obj
 file $(OBJDIR)\docViewer.obj
 file $(OBJDIR)\indexWindow.obj
@@ -91 +93 @@
 progressDlg.obj:    progressDlg.cpp
 aboutDlg.obj:       aboutDlg.cpp
+settingsDlg.obj:    settingsDlg.cpp
+lusettings.obj:     lusettings.cpp
 docViewer.obj:      docViewer.cpp
 indexWindow.obj:    indexWindow.cpp

trunk/Lucide/SOURCE/gui/messages.cpp

@@ -36 +36 @@
 
 
+// Some menu item, which used not only in menu
+const char *MENU_SINGLE_PAGE = "MENU_SINGLE_PAGE";
+const char *MENU_CONTINUOUS  = "MENU_CONTINUOUS";
+
+
 // Toolbar hints
 const char *TBHINT_OPEN          = "TBHINT_OPEN";
@@ -53 +58 @@
 
 // Lucide messages
-const char *MSGS_MAIN_WIN_TITLE  = "MSGS_MAIN_WIN_TITLE";
-const char *MSGS_NO_SUIT_PLUG    = "MSGS_NO_SUIT_PLUG";
-const char *MSGS_FILE_LOAD_ERROR = "MSGS_FILE_LOAD_ERROR";
+const char *MSGS_MAIN_WIN_TITLE   = "MSGS_MAIN_WIN_TITLE";
+const char *MSGS_NO_SUIT_PLUG     = "MSGS_NO_SUIT_PLUG";
+const char *MSGS_FILE_LOAD_ERROR  = "MSGS_FILE_LOAD_ERROR";
+const char *MSGS_LOADING_DOCUMENT = "MSGS_LOADING_DOCUMENT";
 
 // Plugins List columns titles

trunk/Lucide/SOURCE/gui/messages.h

@@ -37 +37 @@
 
 
+// Some menu item, which used not only in menu
+extern const char *MENU_SINGLE_PAGE;
+extern const char *MENU_CONTINUOUS;
+
 // Toolbar hints
 extern const char *TBHINT_OPEN;
@@ -56 +60 @@
 extern const char *MSGS_NO_SUIT_PLUG;
 extern const char *MSGS_FILE_LOAD_ERROR;
+extern const char *MSGS_LOADING_DOCUMENT;
 
 // Plugins List columns titles

trunk/Lucide/SOURCE/gui/progressDlg.cpp

@@ -22 +22 @@
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the LGPL are applicable instead of those
- * above. If you wish to allow use of your version of this file only under the 
+ * above. If you wish to allow use of your version of this file only under the
  * terms of the LGPL, and not to allow others to use your version of this file
  * under the terms of the CDDL, indicate your decision by deleting the
  * provisions above and replace them with the notice and other provisions
  * required by the LGPL. If you do not delete the provisions above, a recipient
- * may use your version of this file under the terms of any one of the CDDL 
+ * may use your version of this file under the terms of any one of the CDDL
  * or the LGPL.
  *
@@ -38 +38 @@
 
 #include <process.h>
+#include <stdio.h>
 
 #include "luutils.h"
@@ -119 +120 @@
             _this->hDialog = hwnd;
             WinSetDlgItemText( hwnd, IDC_PTEXT, _this->text );
+            WinEnableControl( hwnd, DID_CANCEL, _this->fn != NULL );
 
             _this->startPos = 0;
@@ -139 +141 @@
             _this->pOldBarProc = WinSubclassWindow( hBar, progressBarProc );
             WinStartTimer( hBarHab, hBar, TID_PAINT, 1 );
-
+            
             _beginthread( _this->threadFn, NULL, 65536, _this->threadData );
 
@@ -165 +167 @@
                 case DID_CANCEL:
                     WinEnableControl( hwnd, DID_CANCEL, FALSE );
-                    _this->fn( _this->data );
+                    if ( _this->fn != NULL ) {
+                        _this->fn( _this->data );
+                    }
                     return (MRESULT)FALSE;
             };

trunk/Lucide/SOURCE/gui/toolbar.cpp

@@ -22 +22 @@
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the LGPL are applicable instead of those
- * above. If you wish to allow use of your version of this file only under the 
+ * above. If you wish to allow use of your version of this file only under the
  * terms of the LGPL, and not to allow others to use your version of this file
  * under the terms of the CDDL, indicate your decision by deleting the
  * provisions above and replace them with the notice and other provisions
  * required by the LGPL. If you do not delete the provisions above, a recipient
- * may use your version of this file under the terms of any one of the CDDL 
+ * may use your version of this file under the terms of any one of the CDDL
  * or the LGPL.
  *
@@ -74 +74 @@
                 if ( ( controlId == TBID_ZOOM ) && ( notifyCode == CBN_ENTER ) )
                 {
-                    SHORT rc = (SHORT)WinSendDlgItemMsg( hwnd, TBID_ZOOM, LM_QUERYSELECTION,
-                                            MPFROMSHORT( LIT_CURSOR ), MPVOID );
-                    if ( rc != LIT_NONE )
+                    bool shortValueOk = false;
+                    SHORT sResult = 0;
+                    if ( WinQueryDlgItemShort( hwnd, TBID_ZOOM, &sResult, FALSE ) )
                     {
-                        switch ( rc )
+                        if ( ( sResult > 0 ) && ( sResult < 1600 ) ) {
+                            shortValueOk = true;
+                            Lucide::setZoom( (double)sResult / 100.0 );
+                        }
+                    }
+
+                    if ( !shortValueOk )
+                    {
+                        SHORT rc = (SHORT)WinSendDlgItemMsg( hwnd, TBID_ZOOM, LM_QUERYSELECTION,
+                                                MPFROMSHORT( LIT_CURSOR ), MPVOID );
+                        if ( rc != LIT_NONE )
                         {
-                            case 0:   Lucide::setZoom( 1 );      break;
-                            case 1:   Lucide::setZoom( -2 );     break;
-                            case 2:   Lucide::setZoom( -1 );     break;
-                            case 3:   Lucide::setZoom( 0.125 );  break;
-                            case 4:   Lucide::setZoom( 0.25 );   break;
-                            case 5:   Lucide::setZoom( 0.5 );    break;
-                            case 6:   Lucide::setZoom( 1 );      break;
-                            case 7:   Lucide::setZoom( 1.25 );   break;
-                            case 8:   Lucide::setZoom( 1.5 );    break;
-                            case 9:   Lucide::setZoom( 2 );      break;
-                            case 10:  Lucide::setZoom( 3 );      break;
-                            case 11:  Lucide::setZoom( 4 );      break;
-                            case 12:  Lucide::setZoom( 8 );      break;
-                            case 13:  Lucide::setZoom( 16 );     break;
+                            double z = convZoom( rc );
+                            if ( z >= -2 ) {
+                                Lucide::setZoom( z );
+                            }
                         }
                     }
@@ -269 +269 @@
 
     cs.ctrlHandle = WinCreateWindow( hToolBar, WC_COMBOBOX, NULL,
-                                     WS_VISIBLE | CBS_DROPDOWNLIST,
+                                     WS_VISIBLE | CBS_DROPDOWN,
                                      0,0,0,0, hToolBar, HWND_TOP, TBID_ZOOM, NULL, NULL );
     WinSetPresParam( cs.ctrlHandle, PP_FONTNAMESIZE, deffontlen, deffont );
     std::string actsizetext = getLocalizedString( TBHINT_ACTUAL_SIZE );
-    WinSetWindowText( cs.ctrlHandle, actsizetext.c_str() );
-    WinSendMsg( cs.ctrlHandle, LM_INSERTITEM, MPFROMSHORT(LIT_END),
-                MPFROMP( actsizetext.c_str() ) );
-    WinSendMsg( cs.ctrlHandle, LM_INSERTITEM, MPFROMSHORT(LIT_END),
-                MPFROMP( getLocalizedString( TBHINT_FIT_WINDOW ).c_str() ) );
-    WinSendMsg( cs.ctrlHandle, LM_INSERTITEM, MPFROMSHORT(LIT_END),
-                MPFROMP( getLocalizedString( TBHINT_FIT_WIDTH ).c_str() ) );
-    WinSendMsg( cs.ctrlHandle, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "12.5%" ) );
-    WinSendMsg( cs.ctrlHandle, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "25%" ) );
-    WinSendMsg( cs.ctrlHandle, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "50%" ) );
-    WinSendMsg( cs.ctrlHandle, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "100%" ) );
-    WinSendMsg( cs.ctrlHandle, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "125%" ) );
-    WinSendMsg( cs.ctrlHandle, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "150%" ) );
-    WinSendMsg( cs.ctrlHandle, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "200%" ) );
-    WinSendMsg( cs.ctrlHandle, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "300%" ) );
-    WinSendMsg( cs.ctrlHandle, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "400%" ) );
-    WinSendMsg( cs.ctrlHandle, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "800%" ) );
-    WinSendMsg( cs.ctrlHandle, LM_INSERTITEM, MPFROMSHORT(LIT_END), MPFROMP( "1600%" ) );
+    setZoomValues( cs.ctrlHandle );
     cs.cx = 80;
     cs.cy = -100;

trunk/Lucide/SOURCE/plugins/ludjvu/ludjvu.cpp

@@ -218 +218 @@
 {
     LuDjvuDocumentData *somThis = LuDjvuDocumentGetData(somSelf);
-    
+
     double page_ratio;
     double p_width = 0, p_height = 0;
@@ -242 +242 @@
     while ( ddjvu_thumbnail_status( d->d_document, pagenum, 1 ) < DDJVU_JOB_OK ) {
             ddjvu_message_wait( d->d_context );
-            ddjvu_message_pop( d->d_context );  
-    }
-        
+            ddjvu_message_pop( d->d_context );
+    }
+
     int t_width = thumb_width;
     int t_height = thumb_height;

trunk/Lucide/SOURCE/plugins/ludoc/lutypes.h

@@ -129 +129 @@
 {
         char *title;
-        char *format; /* eg, "pdf-1.5" */
+        char *format;
         char *author;
         char *subject;

trunk/Lucide/SOURCE/plugins/lupoppler/lupoppler.cpp

@@ -313 +313 @@
     Environment      *ev;
     LuPixbuf         *pixbuf;
-    SplashBitmap     *bitmap;
+    SplashOutputDev  *out;
     void             *fndata;
     _asynchCallbackFn fnd;
@@ -328 +328 @@
     DosQuerySysInfo( QSV_MS_COUNT, QSV_MS_COUNT, &now, sizeof( long ) );
     long dist = ( now - cd->tmr );
-    if ( ( dist > cd->delay ) || cd->forceDraw ) {
-        copy_page_to_pixbuf( cd->ev, cd->bitmap, cd->pixbuf );
+    if ( ( dist > cd->delay ) || cd->forceDraw ) 
+    {
+        // Note: we use out->getBitmap() on each iteration instead
+        //       of remembering pointer to bitmap before call
+        //       page->displaySlice() because OutputDev may change
+        //       bitmap during page->displaySlice() processing.
+        copy_page_to_pixbuf( cd->ev, cd->out->getBitmap(), cd->pixbuf );
         cd->fnd( cd->fndata );
         cd->tmr = now;
@@ -362 +367 @@
     acd.ev        = ev;
     acd.pixbuf    = pixbuf;
-    acd.bitmap    = document->output_dev->getBitmap();
+    acd.out       = document->output_dev;
     acd.fndata    = fndata;
     acd.fnd       = (_asynchCallbackFn)fnd;

trunk/Lucide/SOURCE/plugins/lupoppler/makefile

@@ -20 +20 @@
    DEL MAKE.CFG
     
-lupplr.dll: lupoppler.obj ..\ludoc\ludoc.lib
+lupplr.dll: lupoppler.obj ..\ludoc\ludoc.lib ..\..\..\..\poppler\poppler.lib
   copy &&|
 option quiet

trunk/poppler/mypoppler/poppler/Page.cc

@@ -350 +350 @@
 }
 
+
 void Page::displaySlice(OutputDev *out, double hDPI, double vDPI,
                         int rotate, GBool useMediaBox, GBool crop,