no log...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1698 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/po/POTFILES.in b/po/POTFILES.in
index fec449e83bc599b669e097bebe337a27cfb283b3..61022eaf3d72cee2e14c716048b0be5f522ac84c 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -73,50 +73,50 @@ src/frontends/qt2/FormTabularCreate.C
 src/frontends/qt2/paragraphdlgimpl.C
 src/frontends/qt2/tabularcreatedlgimpl.C
 src/frontends/xforms/FormBase.h
-src/frontends/xforms/FormBibitem.C
 src/frontends/xforms/form_bibitem.C
-src/frontends/xforms/FormBibtex.C
+src/frontends/xforms/FormBibitem.C
 src/frontends/xforms/form_bibtex.C
+src/frontends/xforms/FormBibtex.C
 src/frontends/xforms/form_browser.C
-src/frontends/xforms/FormCharacter.C
 src/frontends/xforms/form_character.C
-src/frontends/xforms/FormCitation.C
+src/frontends/xforms/FormCharacter.C
 src/frontends/xforms/form_citation.C
-src/frontends/xforms/FormCopyright.C
+src/frontends/xforms/FormCitation.C
 src/frontends/xforms/form_copyright.C
-src/frontends/xforms/FormDocument.C
+src/frontends/xforms/FormCopyright.C
 src/frontends/xforms/form_document.C
-src/frontends/xforms/FormError.C
+src/frontends/xforms/FormDocument.C
 src/frontends/xforms/form_error.C
-src/frontends/xforms/FormGraphics.C
+src/frontends/xforms/FormError.C
 src/frontends/xforms/form_graphics.C
-src/frontends/xforms/FormInclude.C
+src/frontends/xforms/FormGraphics.C
 src/frontends/xforms/form_include.C
-src/frontends/xforms/FormIndex.C
+src/frontends/xforms/FormInclude.C
 src/frontends/xforms/form_index.C
+src/frontends/xforms/FormIndex.C
 src/frontends/xforms/FormInset.h
 src/frontends/xforms/FormLog.C
-src/frontends/xforms/FormParagraph.C
 src/frontends/xforms/form_paragraph.C
-src/frontends/xforms/FormPreamble.C
+src/frontends/xforms/FormParagraph.C
 src/frontends/xforms/form_preamble.C
-src/frontends/xforms/FormPreferences.C
+src/frontends/xforms/FormPreamble.C
 src/frontends/xforms/form_preferences.C
-src/frontends/xforms/FormPrint.C
+src/frontends/xforms/FormPreferences.C
 src/frontends/xforms/form_print.C
-src/frontends/xforms/FormRef.C
+src/frontends/xforms/FormPrint.C
 src/frontends/xforms/form_ref.C
-src/frontends/xforms/FormSearch.C
+src/frontends/xforms/FormRef.C
 src/frontends/xforms/form_search.C
+src/frontends/xforms/FormSearch.C
 src/frontends/xforms/FormSplash.C
-src/frontends/xforms/FormTabular.C
 src/frontends/xforms/form_tabular.C
-src/frontends/xforms/FormTabularCreate.C
+src/frontends/xforms/FormTabular.C
 src/frontends/xforms/form_tabular_create.C
-src/frontends/xforms/FormToc.C
+src/frontends/xforms/FormTabularCreate.C
 src/frontends/xforms/form_toc.C
-src/frontends/xforms/FormUrl.C
+src/frontends/xforms/FormToc.C
 src/frontends/xforms/form_url.C
+src/frontends/xforms/FormUrl.C
 src/frontends/xforms/FormVCLog.C
 src/frontends/xforms/input_validators.C
 src/frontends/xforms/Menubar_pimpl.C

diff --git a/src/BufferView.C b/src/BufferView.C
index 12ac9b7e02d8d8a7cbce7678ec59d8c5b4aa2a47..1e7db9e20b2b39d0dc69d57a2001c3ae1c6820ac 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -46,13 +46,13 @@ Buffer * BufferView::buffer() const
 
 LyXScreen * BufferView::screen() const
 {
-       return pimpl_->screen_;
+       return pimpl_->screen_.get();
 }
 
 
 WorkArea * BufferView::workarea() const
 {
-       return pimpl_->workarea_;
+       return &pimpl_->workarea_;
 }
 
 
@@ -233,7 +233,7 @@ bool BufferView::active() const
 
 int BufferView::workWidth() const
 {
-    return pimpl_->workarea_->workWidth();
+    return pimpl_->workarea_.workWidth();
 }
 
 

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 09ef7f22d347760c062250e4d804238d751a5115..ef248328b92528ad33e568298455346b04ace6f2 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -106,47 +106,50 @@ void SetXtermCursor(Window win)
 
 BufferView::Pimpl::Pimpl(BufferView * b, LyXView * o,
             int xpos, int ypos, int width, int height)
-       : bv_(b), owner_(o), cursor_timeout(400)
+       : bv_(b), owner_(o), buffer_(0),
+         current_scrollbar_value(0), cursor_timeout(400),
+         workarea_(xpos, ypos, width, height), using_xterm_cursor(false)
 {
-       buffer_ = 0;
-       workarea_ = new WorkArea(xpos, ypos, width, height);
+       //buffer_ = 0;
+       //workarea_ = new WorkArea(xpos, ypos, width, height);
+       
        // Setup the signals
-       workarea_->scrollCB.connect(slot(this, &BufferView::Pimpl::scrollCB));
-       workarea_->workAreaExpose
+       workarea_.scrollCB.connect(slot(this, &BufferView::Pimpl::scrollCB));
+       workarea_.workAreaExpose
                .connect(slot(this, &BufferView::Pimpl::workAreaExpose));
-       workarea_->workAreaEnter
+       workarea_.workAreaEnter
                .connect(slot(this, &BufferView::Pimpl::enterView));
-       workarea_->workAreaLeave
+       workarea_.workAreaLeave
                .connect(slot(this, &BufferView::Pimpl::leaveView));
-       workarea_->workAreaButtonPress
+       workarea_.workAreaButtonPress
                .connect(slot(this, &BufferView::Pimpl::workAreaButtonPress));
-       workarea_->workAreaButtonRelease
+       workarea_.workAreaButtonRelease
                .connect(slot(this,
                              &BufferView::Pimpl::workAreaButtonRelease));
-       workarea_->workAreaMotionNotify
+       workarea_.workAreaMotionNotify
                .connect(slot(this, &BufferView::Pimpl::workAreaMotionNotify));
-       workarea_->workAreaDoubleClick
+       workarea_.workAreaDoubleClick
                .connect(slot(this, &BufferView::Pimpl::doubleClick));
-       workarea_->workAreaTripleClick
+       workarea_.workAreaTripleClick
                .connect(slot(this, &BufferView::Pimpl::tripleClick));
-       workarea_->workAreaKeyPress
+       workarea_.workAreaKeyPress
                .connect(slot(this, &BufferView::Pimpl::workAreaKeyPress));
        
-       screen_ = 0;
+       //screen_ = 0;
 
        cursor_timeout.timeout.connect(slot(this,
                                            &BufferView::Pimpl::cursorToggle));
-       current_scrollbar_value = 0;
+       //current_scrollbar_value = 0;
        cursor_timeout.start();
-       workarea_->setFocus();
-       using_xterm_cursor = false;
+       workarea_.setFocus();
+       //using_xterm_cursor = false;
        saved_positions.resize(saved_positions_num);
 }
 
 
 Painter & BufferView::Pimpl::painter() 
 {
-       return workarea_->getPainter();
+       return workarea_.getPainter();
 }
 
 
@@ -162,7 +165,7 @@ void BufferView::Pimpl::buffer(Buffer * b)
                // only if the buffer is still loaded.
                // Also set the owner of the test to 0
                //              bv_->text->owner(0);
-               textcache.add(buffer_, workarea_->workWidth(), bv_->text);
+               textcache.add(buffer_, workarea_.workWidth(), bv_->text);
                if (lyxerr.debugging())
                        textcache.show(lyxerr, "BufferView::buffer");
                
@@ -176,8 +179,9 @@ void BufferView::Pimpl::buffer(Buffer * b)
        
        // Nuke old image
        // screen is always deleted when the buffer is changed.
-       delete screen_;
-       screen_ = 0;
+       screen_.reset(0);
+       //delete screen_;
+       //screen_ = 0;
 
        // If we are closing the buffer, use the first buffer as current
        if (!buffer_) {
@@ -209,7 +213,7 @@ void BufferView::Pimpl::buffer(Buffer * b)
                owner_->updateToolbar();
                owner_->getDialogs()->hideBufferDependent();
                updateScrollbar();
-               workarea_->redraw();
+               workarea_.redraw();
 
                // Also remove all remaining text's from the testcache.
                // (there should not be any!) (if there is any it is a
@@ -227,7 +231,7 @@ void BufferView::Pimpl::buffer(Buffer * b)
 
 void BufferView::Pimpl::resize(int xpos, int ypos, int width, int height)
 {
-       workarea_->resize(xpos, ypos, width, height);
+       workarea_.resize(xpos, ypos, width, height);
        update(bv_->text, SELECT);
        redraw();
 }
@@ -243,13 +247,13 @@ void BufferView::Pimpl::resize()
 void BufferView::Pimpl::redraw()
 {
        lyxerr[Debug::INFO] << "BufferView::redraw()" << endl;
-       workarea_->redraw();
+       workarea_.redraw();
 }
 
 
 bool BufferView::Pimpl::fitCursor(LyXText * text)
 {
-       Assert(screen_);
+       Assert(screen_.get());
  
        bool ret = screen_->FitCursor(text, bv_);
        if (ret)
@@ -302,11 +306,11 @@ int BufferView::Pimpl::resizeCurrentBuffer()
        } else {
                // See if we have a text in TextCache that fits
                // the new buffer_ with the correct width.
-               bv_->text = textcache.findFit(buffer_, workarea_->workWidth());
+               bv_->text = textcache.findFit(buffer_, workarea_.workWidth());
                if (bv_->text) {
                        if (lyxerr.debugging()) {
                                lyxerr << "Found a LyXText that fits:\n";
-                               textcache.show(lyxerr, make_pair(buffer_, make_pair(workarea_->workWidth(), bv_->text)));
+                               textcache.show(lyxerr, make_pair(buffer_, make_pair(workarea_.workWidth(), bv_->text)));
                        }
                        // Set the owner of the newly found text
                        //      bv_->text->owner(bv_);
@@ -355,8 +359,9 @@ int BufferView::Pimpl::resizeCurrentBuffer()
 void BufferView::Pimpl::updateScreen()
 {
        // Regenerate the screen.
-       delete screen_;
-       screen_ = new LyXScreen(*workarea_);
+       screen_.reset(new LyXScreen(workarea_));
+       //delete screen_;
+       //screen_ = new LyXScreen(workarea_);
 }
 
 
@@ -367,7 +372,7 @@ void BufferView::Pimpl::updateScrollbar()
         * be possible */
 
        if (!buffer_) {
-               workarea_->setScrollbar(0, 1.0);
+               workarea_.setScrollbar(0, 1.0);
                return;
        }
        
@@ -384,31 +389,31 @@ void BufferView::Pimpl::updateScrollbar()
 
        // check if anything has changed.
        if (max2 == cbth &&
-           height2 == workarea_->height() &&
+           height2 == workarea_.height() &&
            current_scrollbar_value == cbsf)
                return; // no
        max2 = cbth;
-       height2 = workarea_->height();
+       height2 = workarea_.height();
        current_scrollbar_value = cbsf;
 
        if (cbth <= height2) { // text is smaller than screen
-               workarea_->setScrollbar(0, 1.0); // right?
+               workarea_.setScrollbar(0, 1.0); // right?
                return;
        }
 
-       long maximum_height = workarea_->height() * 3 / 4 + cbth;
+       long maximum_height = workarea_.height() * 3 / 4 + cbth;
        long value = cbsf;
 
        // set the scrollbar
-       double hfloat = workarea_->height();
+       double hfloat = workarea_.height();
        double maxfloat = maximum_height;
 
        float slider_size = 0.0;
        int slider_value = value;
 
-       workarea_->setScrollbarBounds(0, bv_->text->height - workarea_->height());
-       double lineh = bv_->text->DefaultHeight();
-       workarea_->setScrollbarIncrements(lineh);
+       workarea_.setScrollbarBounds(0, bv_->text->height - workarea_.height());
+       double const lineh = bv_->text->DefaultHeight();
+       workarea_.setScrollbarIncrements(lineh);
        if (maxfloat > 0.0) {
                if ((hfloat / maxfloat) * float(height2) < 3)
                        slider_size = 3.0/float(height2);
@@ -417,7 +422,7 @@ void BufferView::Pimpl::updateScrollbar()
        } else
                slider_size = hfloat;
 
-       workarea_->setScrollbar(slider_value, slider_size / workarea_->height());
+       workarea_.setScrollbar(slider_value, slider_size / workarea_.height());
 }
 
 
@@ -430,7 +435,7 @@ void BufferView::Pimpl::scrollCB(double value)
        if (current_scrollbar_value < 0)
                current_scrollbar_value = 0;
    
-       if (!screen_)
+       if (!screen_.get())
                return;
 
        screen_->Draw(bv_->text, bv_, current_scrollbar_value);
@@ -444,7 +449,7 @@ void BufferView::Pimpl::scrollCB(double value)
  
        int const height = vbt->DefaultHeight();
        int const first = static_cast<int>((bv_->text->first + height));
-       int const last = static_cast<int>((bv_->text->first + workarea_->height() - height));
+       int const last = static_cast<int>((bv_->text->first + workarea_.height() - height));
 
        if (vbt->cursor.y() < first)
                vbt->SetCursorFromCoordinates(bv_, 0, first);
@@ -458,17 +463,17 @@ void BufferView::Pimpl::scrollCB(double value)
 int BufferView::Pimpl::scrollUp(long time)
 {
        if (!buffer_) return 0;
-       if (!screen_) return 0;
+       if (!screen_.get()) return 0;
    
-       double value = workarea_->getScrollbarValue();
+       double value = workarea_.getScrollbarValue();
    
        if (value == 0) return 0;
 
        float add_value =  (bv_->text->DefaultHeight()
                            + float(time) * float(time) * 0.125);
    
-       if (add_value > workarea_->height())
-               add_value = float(workarea_->height() -
+       if (add_value > workarea_.height())
+               add_value = float(workarea_.height() -
                                  bv_->text->DefaultHeight());
    
        value -= add_value;
@@ -476,7 +481,7 @@ int BufferView::Pimpl::scrollUp(long time)
        if (value < 0)
                value = 0;
    
-       workarea_->setScrollbarValue(value);
+       workarea_.setScrollbarValue(value);
    
        scrollCB(value); 
        return 0;
@@ -486,10 +491,10 @@ int BufferView::Pimpl::scrollUp(long time)
 int BufferView::Pimpl::scrollDown(long time)
 {
        if (!buffer_) return 0;
-       if (!screen_) return 0;
+       if (!screen_.get()) return 0;
    
-       double value= workarea_->getScrollbarValue();
-       pair<float, float> p = workarea_->getScrollbarBounds();
+       double value = workarea_.getScrollbarValue();
+       pair<float, float> p = workarea_.getScrollbarBounds();
        double max = p.second;
        
        if (value == max) return 0;
@@ -497,8 +502,8 @@ int BufferView::Pimpl::scrollDown(long time)
        float add_value =  (bv_->text->DefaultHeight()
                            + float(time) * float(time) * 0.125);
    
-       if (add_value > workarea_->height())
-               add_value = float(workarea_->height() -
+       if (add_value > workarea_.height())
+               add_value = float(workarea_.height() -
                                  bv_->text->DefaultHeight());
    
        value += add_value;
@@ -506,7 +511,7 @@ int BufferView::Pimpl::scrollDown(long time)
        if (value > max)
                value = max;
 
-       workarea_->setScrollbarValue(value);
+       workarea_.setScrollbarValue(value);
        
        scrollCB(value); 
        return 0;
@@ -525,7 +530,7 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
        if (!(state & Button1MotionMask))
                return;
 
-       if (!buffer_ || !screen_) return;
+       if (!buffer_ || !screen_.get()) return;
 
        // Check for inset locking
        if (bv_->theLockingInset()) {
@@ -570,7 +575,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
        last_click_x = -1;
        last_click_y = -1;
 
-       if (!buffer_ || !screen_) return;
+       if (!buffer_ || !screen_.get()) return;
 
        Inset * inset_hit = checkInsetHit(bv_->text, xpos, ypos, button);
 
@@ -679,7 +684,7 @@ void BufferView::Pimpl::doubleClick(int /*x*/, int /*y*/, unsigned int button)
        if (text->bv_owner && bv_->theLockingInset())
            return;
 
-       if (screen_ && button == 1) {
+       if (screen_.get() && button == 1) {
            if (text->bv_owner) {
                screen_->HideCursor();
                screen_->ToggleSelection(text, bv_);
@@ -706,7 +711,7 @@ void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button)
        if (text->bv_owner && bv_->theLockingInset())
            return;
 
-       if (screen_ && (button == 1)) {
+       if (screen_.get() && (button == 1)) {
                screen_->HideCursor();
                screen_->ToggleSelection(text, bv_);
                text->CursorHome(bv_);
@@ -724,7 +729,7 @@ void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button)
 void BufferView::Pimpl::enterView()
 {
        if (active() && available()) {
-               SetXtermCursor(workarea_->getWin());
+               SetXtermCursor(workarea_.getWin());
                using_xterm_cursor = true;
        }
 }
@@ -733,7 +738,7 @@ void BufferView::Pimpl::enterView()
 void BufferView::Pimpl::leaveView()
 {
        if (using_xterm_cursor) {
-               XUndefineCursor(fl_get_display(), workarea_->getWin());
+               XUndefineCursor(fl_get_display(), workarea_.getWin());
                using_xterm_cursor = false;
        }
 }
@@ -742,7 +747,7 @@ void BufferView::Pimpl::leaveView()
 void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
                                              unsigned int button)
 {
-       if (!buffer_ || !screen_) return;
+       if (!buffer_ || !screen_.get()) return;
 
        // If we hit an inset, we have the inset coordinates in these
        // and inset_hit points to the inset.  If we do not hit an
@@ -898,7 +903,7 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
                                         unsigned int /* button */)
 {
-       if (!screen_)
+       if (!screen_.get())
                return 0;
   
        int y_tmp = y + text->first;
@@ -967,12 +972,12 @@ void BufferView::Pimpl::workAreaExpose()
        static int work_area_width = 0;
        static unsigned int work_area_height = 0;
 
-       bool widthChange = workarea_->workWidth() != work_area_width;
-       bool heightChange = workarea_->height() != work_area_height;
+       bool widthChange = workarea_.workWidth() != work_area_width;
+       bool heightChange = workarea_.height() != work_area_height;
 
        // update from work area
-       work_area_width = workarea_->workWidth();
-       work_area_height = workarea_->height();
+       work_area_width = workarea_.workWidth();
+       work_area_height = workarea_.height();
        if (buffer_ != 0) {
                if (widthChange) {
                        // All buffers need a resize
@@ -1000,11 +1005,11 @@ void BufferView::Pimpl::workAreaExpose()
                        // ...including the minibuffer
                        owner_->getMiniBuffer()->Init();
 
-               } else if (screen_)
+               } else if (screen_.get())
                    screen_->Redraw(bv_->text, bv_);
        } else {
                // Grey box when we don't have a buffer
-               workarea_->greyOut();
+               workarea_.greyOut();
        }
 
        // always make sure that the scrollbar is sane.
@@ -1016,7 +1021,7 @@ void BufferView::Pimpl::workAreaExpose()
 
 void BufferView::Pimpl::update()
 {
-       if (screen_) screen_->Update(bv_->text, bv_);
+       if (screen_.get()) screen_->Update(bv_->text, bv_);
 }
 
 // Values used when calling update:
@@ -1107,7 +1112,7 @@ void BufferView::Pimpl::cursorToggle()
 
        updatelist.update(bv_);
        
-       if (!screen_) {
+       if (!screen_.get()) {
                cursor_timeout.restart();
                return;
        }
@@ -1138,12 +1143,12 @@ void BufferView::Pimpl::cursorPrevious(LyXText * text)
                text->CursorUp(bv_);
        
        if (text->inset_owner ||
-           text->cursor.row()->height() < workarea_->height())
+           text->cursor.row()->height() < workarea_.height())
                screen_->Draw(bv_->text, bv_,
                              text->cursor.y()
                              - text->cursor.row()->baseline()
                              + text->cursor.row()->height()
-                             - workarea_->height() + 1 );
+                             - workarea_.height() + 1 );
        updateScrollbar();
 }
 
@@ -1153,7 +1158,7 @@ void BufferView::Pimpl::cursorNext(LyXText * text)
        if (!text->cursor.row()->next())
                return;
        
-       int y = text->first + workarea_->height();
+       int y = text->first + workarea_.height();
 //     if (text->inset_owner)
 //             y += bv_->text->first;
        text->GetRowNearY(y);
@@ -1166,7 +1171,7 @@ void BufferView::Pimpl::cursorNext(LyXText * text)
                text->CursorDown(bv_);
        
        if (text->inset_owner ||
-           text->cursor.row()->height() < workarea_->height())
+           text->cursor.row()->height() < workarea_.height())
                screen_->Draw(bv_->text, bv_, text->cursor.y() -
                              text->cursor.row()->baseline());
        updateScrollbar();
@@ -1286,52 +1291,52 @@ void BufferView::Pimpl::insetUnlock()
 
 bool BufferView::Pimpl::focus() const
 {
-       return workarea_->hasFocus();
+       return workarea_.hasFocus();
 }
 
 
 void BufferView::Pimpl::focus(bool f)
 {
-       if (f) workarea_->setFocus();
+       if (f) workarea_.setFocus();
 }
 
 
 bool BufferView::Pimpl::active() const
 {
-       return workarea_->active();
+       return workarea_.active();
 }
 
 
 bool BufferView::Pimpl::belowMouse() const 
 {
-       return workarea_->belowMouse();
+       return workarea_.belowMouse();
 }
 
 
 void BufferView::Pimpl::showCursor()
 {
-       if (screen_)
+       if (screen_.get())
                screen_->ShowCursor(bv_->text, bv_);
 }
 
 
 void BufferView::Pimpl::hideCursor()
 {
-       if (screen_)
+       if (screen_.get())
                screen_->HideCursor();
 }
 
 
 void BufferView::Pimpl::toggleSelection(bool b)
 {
-       if (screen_)
+       if (screen_.get())
                screen_->ToggleSelection(bv_->text, bv_, b);
 }
 
 
 void BufferView::Pimpl::toggleToggle()
 {
-       if (screen_)
+       if (screen_.get())
                screen_->ToggleToggle(bv_->text, bv_);
 }
 
@@ -1339,8 +1344,8 @@ void BufferView::Pimpl::toggleToggle()
 void BufferView::Pimpl::center() 
 {
        beforeChange(bv_->text);
-       if (bv_->text->cursor.y() > static_cast<int>((workarea_->height() / 2))) {
-               screen_->Draw(bv_->text, bv_, bv_->text->cursor.y() - workarea_->height() / 2);
+       if (bv_->text->cursor.y() > static_cast<int>((workarea_.height() / 2))) {
+               screen_->Draw(bv_->text, bv_, bv_->text->cursor.y() - workarea_.height() / 2);
        } else {
                screen_->Draw(bv_->text, bv_, 0);
        }
@@ -1356,7 +1361,7 @@ void BufferView::Pimpl::pasteClipboard(bool asPara)
        screen_->HideCursor();
        beforeChange(bv_->text);
        
-       string const clip(workarea_->getClipboard());
+       string const clip(workarea_.getClipboard());
        
        if (clip.empty()) return;
 
@@ -1371,7 +1376,7 @@ void BufferView::Pimpl::pasteClipboard(bool asPara)
 
 void BufferView::Pimpl::stuffClipboard(string const & stuff) const
 {
-       workarea_->putClipboard(stuff);
+       workarea_.putClipboard(stuff);
 }
 
 

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index 136e8209df73550deea4cafecec9f12118cc61d1..be5fe4f2c835d2e8206a93fa00e8ee37b07b287a 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -3,10 +3,13 @@
 #ifndef BUFFERVIEW_PIMPL_H
 #define BUFFERVIEW_PIMPL_H
 
+#include <boost/smart_ptr.hpp>
+
 #include "BufferView.h"
 #include "UpdateInset.h"
 #include "commandtags.h"
 #include "frontends/Timeout.h"
+#include "WorkArea.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -120,6 +123,10 @@ struct BufferView::Pimpl : public Object {
        void center();
        ///
        bool Dispatch(kb_action action, string const & argument);
+private:
+       ///
+       friend class BufferView;
+       
        ///
        BufferView * bv_;
        ///
@@ -127,7 +134,7 @@ struct BufferView::Pimpl : public Object {
        ///
        Buffer * buffer_;
        ///
-       LyXScreen * screen_;
+       boost::scoped_ptr<LyXScreen> screen_;
        ///
        long current_scrollbar_value;
        ///
@@ -139,17 +146,16 @@ struct BufferView::Pimpl : public Object {
        ///
        int last_click_y;
        ///
-       WorkArea * workarea_;
+       WorkArea workarea_;
        ///
        UpdateInset updatelist;
        ///
        void pasteClipboard(bool asPara);
        ///
        void stuffClipboard(string const &) const;
-private:
        ///
        bool using_xterm_cursor;
-
+       ///
        struct Position {
                /// Filename
                 string filename;
@@ -163,11 +169,13 @@ private:
                Position(string const & f, int id, LyXParagraph::size_type pos)
                         : filename(f), par_id(id), par_pos(pos) {}
        };
+       ///
        std::vector<Position> saved_positions;
-
+       ///
        void moveCursorUpdate(bool selecting);
         /// Get next inset of this class from current cursor position  
        Inset * getInsetByCode(Inset::Code code);
+       ///
        void MenuInsertLyXFile(string const & filen);
 };
 #endif

diff --git a/src/ShareContainer.h b/src/ShareContainer.h
index a4aa23fa828a34b86aa7323522ab907d7d4134a8..b83140ffdb44cd8e7c960cfbcbd6b2cc34d47941 100644 (file)
--- a/src/ShareContainer.h
+++ b/src/ShareContainer.h
@@ -5,6 +5,7 @@
 
 #include <vector>
 #include <algorithm>
+#include <functional>
 #include <boost/utility.hpp>
 #include <boost/smart_ptr.hpp>
 
@@ -20,14 +21,20 @@ public:
        value_type
        get(Share const & ps) const {
                // First see if we already have this ps in the container
+#if 0
                Params::iterator it = params.begin();
                Params::iterator end = params.end();
                for (; it != end; ++it) {
                        if (ps == *(*it).get())
                                break;
                }
+#else
+               Params::iterator it = find_if(params.begin(),
+                                             params.end(),
+                                             isEqual(ps));
+#endif
                value_type tmp;
-               if (it == end) {
+               if (it == params.end()) {
                        // ok we don't have it so we should
                        // insert it.
                        tmp.reset(new Share(ps));
@@ -44,10 +51,19 @@ public:
                return tmp;
        }
 private:
+       ///
+       struct isEqual {
+               isEqual(Share const & s) : p_(s) {}
+               bool operator()(value_type const & p1) const {
+                       return *p1.get() == p_;
+               }
+       private:
+               Share const & p_;
+       };
        ///
        struct comp {
                int operator()(value_type const & p1,
-                              value_type const & p2) {
+                              value_type const & p2) const {
                        return p1.use_count() < p2.use_count();
                }
        };

diff --git a/src/intl.C b/src/intl.C
index b50580712e6c132116f6c1e033323a53732afad8..ce3adf106828d8c5905b4eec6ca083a4ed79fd39 100644 (file)
--- a/src/intl.C
+++ b/src/intl.C
@@ -62,7 +62,7 @@ Intl::~Intl()
 
 void Intl::redraw()
 {
-       if (fd_form_keymap && fd_form_keymap->KeyMap->visible)
+       if (fd_form_keymap.get() && fd_form_keymap->KeyMap->visible)
                fl_redraw_form(fd_form_keymap->KeyMap);
 }
 
@@ -110,7 +110,7 @@ void Intl::KeyMapOn(bool on)
 {
        keymapon = on;
 
-       if (!fd_form_keymap) return;
+       if (!fd_form_keymap.get()) return;
        
        fl_set_button(fd_form_keymap->KeyOffBtn, 0);
        fl_set_button(fd_form_keymap->KeyOnBtn, 0);
@@ -205,9 +205,9 @@ void Intl::KeyMapSec()
 void Intl::LCombo(int, void * v, Combox * combox)
 {
        Intl * itl = static_cast<Intl*>(v);
-       if (combox == itl->Language)
+       if (combox == itl->Language.get())
            itl->Keymap(23);
-       else if (combox == itl->Language2)
+       else if (combox == itl->Language2.get())
            itl->Keymap(43);
        return;
 }
@@ -244,12 +244,12 @@ void Intl::InitKeyMapper(bool on)
        else
                keymapon = on;
 
-       Language = new Combox(FL_COMBOX_DROPLIST);
-       Language2 = new Combox(FL_COMBOX_DROPLIST);
+       Language.reset(new Combox(FL_COMBOX_DROPLIST));
+       Language2.reset(new Combox(FL_COMBOX_DROPLIST));
        Language->setcallback(LCombo, this);
        Language2->setcallback(LCombo, this);
 
-       fd_form_keymap = create_form_KeyMap();
+       fd_form_keymap.reset(create_form_KeyMap());
 
        // Add the Intl* pointer
        fd_form_keymap->AcceptChset->u_vdata =

diff --git a/src/intl.h b/src/intl.h
index 2e173f5cb89e01fdcfc3948ac5ddc250542363f8..117d56966a5953dc01809dc0f94602b6a00ffa5a 100644 (file)
--- a/src/intl.h
+++ b/src/intl.h
@@ -12,6 +12,7 @@
 #pragma interface
 #endif
 
+#include <boost/smart_ptr.hpp>
 #include <sigc++/signal_system.h>
 #include "LString.h"
 #include "form1.h"
@@ -88,11 +89,11 @@ private:
        int otherkeymap;
        
        ///
-       FD_KeyMap * fd_form_keymap;
+       boost::scoped_ptr<FD_KeyMap> fd_form_keymap;
        ///
-       Combox * Language;
+       boost::scoped_ptr<Combox> Language;
        ///
-       Combox * Language2;
+       boost::scoped_ptr<Combox> Language2;
        ///
        string & prim_lang;
        ///

diff --git a/src/trans_mgr.C b/src/trans_mgr.C
index 6172725245dcb39f7bda7bb84fd0179006d84efd..88b4190e48ee0d3922946376850910e04c3e089b 100644 (file)
--- a/src/trans_mgr.C
+++ b/src/trans_mgr.C
@@ -205,14 +205,15 @@ TransFSM::TransFSM():
 
 // TransManager
 
+// Initialize static member.
+Trans TransManager::default_;
+
+
 TransManager::TransManager()
        : active_(0), t1_(new Trans), t2_(new Trans)
 {}
 
 
-Trans * TransManager::default_ = new Trans;
-
-
 TransManager::~TransManager() 
 { 
        delete t1_;
@@ -263,7 +264,7 @@ void TransManager::EnableSecondary()
 
 void TransManager::DisableKeymap()
 {
-       active_ = default_;
+       active_ = &default_;
        lyxerr[Debug::KBMAP] << "Disabling keymap" << endl;
 }
 
@@ -326,7 +327,7 @@ void TransManager::insert(string const & str, LyXText * text)
 
 void TransManager::deadkey(char c, tex_accent accent, LyXText * t)
 {
-       if (c == 0 && active_ != default_) {
+       if (c == 0 && active_ != &default_) {
                // A deadkey was pressed that cannot be printed
                // or a accent command was typed in the minibuffer
                KmodInfo i;
@@ -337,7 +338,7 @@ void TransManager::deadkey(char c, tex_accent accent, LyXText * t)
                }
        }
        
-       if (active_ == default_ || c == 0) {
+       if (active_ == &default_ || c == 0) {
                KmodInfo i;
                i.accent = accent;
                i.allowed = lyx_accent_table[accent].native;

diff --git a/src/trans_mgr.h b/src/trans_mgr.h
index e45bf55adaa56a99202751ab2c7a02eb2bc550e1..842c07ae2eac898a20aa3554b7f0c20baf2dc65b 100644 (file)
--- a/src/trans_mgr.h
+++ b/src/trans_mgr.h
@@ -135,7 +135,7 @@ private:
        ///
        Trans * t2_;
        ///
-       static Trans * default_;
+       static Trans default_;
        ///
        CharacterSet chset_;
        ///