Ticket #13550: 0001-Fixed-again-the-way-URL-locking-works.patch

src/apps/webpositive/BrowserWindow.cpp

@@ -735 +735 @@
                 // Do it in such a way that the user sees the Go-button go down.
                 _InvokeButtonVisibly(fURLInputGroup->GoButton());
                 return;
-            }
-            // Lock the URL text control to prevent changes while user is
-            // typing and set a timer to unlock it after a set period
-            // of time.
-            else {
-                fURLInputGroup->LockURLInput();
+            } else if (bytes[0] == B_ESCAPE) {
+                // Replace edited text with the current URL.
+                fURLInputGroup->LockURLInput(false);
+                fURLInputGroup->SetText(CurrentWebView()->MainFrameURL());
             }
         } else if (target == fFindTextControl->TextView()) {
             // Handle B_RETURN when the find text control has focus.
@@ -1314 +1312 @@
         } else
             webView->MakeFocus(true);
 
+        bool state = fURLInputGroup->IsURLInputLocked();
+        fURLInputGroup->LockURLInput(false);
+            // Unlock it so the following code can update the URL
+
         if (userData != NULL) {
             fURLInputGroup->SetPageIcon(userData->PageIcon());
             if (userData->URLInputContents().Length())
@@ -1330 +1332 @@
             fURLInputGroup->SetText(webView->MainFrameURL());
         }
 
+        fURLInputGroup->LockURLInput(state);
+            // Restore the state
+
         // Trigger update of the interface to the new page, by requesting
         // to resend all notifications.
         webView->WebPage()->ResendNotifications();
@@ -1474 +1479 @@
 void
 BrowserWindow::LoadNegotiating(const BString& url, BWebView* view)
 {
-    if (view != CurrentWebView())
-        return;
+    if (view != CurrentWebView()) {
+        // Update the userData contents instead so the user sees
+        // the correct URL when they switch back to that tab.
+        PageUserData* userData = static_cast<PageUserData*>(
+            view->GetUserData());
+        if (userData != NULL && userData->URLInputContents().Length() == 0) {
+            userData->SetURLInputContents(url);
+        }
+    }
 
     fURLInputGroup->SetText(url.String());
 
@@ -1729 +1741 @@
 BrowserWindow::UpdateGlobalHistory(const BString& url)
 {
     BrowsingHistory::DefaultInstance()->AddItem(BrowsingHistoryItem(url));
+
+    fURLInputGroup->SetText(CurrentWebView()->MainFrameURL());
 }
 
 

src/apps/webpositive/URLInputGroup.cpp

@@ -151 +151 @@
     virtual void                MouseDown(BPoint where);
     virtual void                KeyDown(const char* bytes, int32 numBytes);
     virtual void                MakeFocus(bool focused = true);
-    virtual void                SetPreviousText(const char* text);
 
     virtual BSize               MinSize();
     virtual BSize               MaxSize();
@@ -170 +169 @@
 private:
             URLInputGroup*      fURLInputGroup;
             TextViewCompleter*  fURLAutoCompleter;
-            BString             fPreviousText;
             bool                fUpdateAutoCompleterChoices;
 };
 
@@ -181 +179 @@
     fURLInputGroup(parent),
     fURLAutoCompleter(new TextViewCompleter(this,
         new BrowsingHistoryChoiceModel())),
-    fPreviousText(""),
     fUpdateAutoCompleterChoices(true)
 {
     MakeResizable(true);
@@ -285 +282 @@
             break;
 
         case B_ESCAPE:
-            // Revert to text as it was when we received keyboard focus.
-            SetText(fPreviousText.String());
+            // Text already unlocked && replaced in BrowserWindow,
+            // now select it.
             SelectAll();
             break;
 
@@ -295 +292 @@
             break;
 
         default:
+        {
+            BString currentText = Text();
             BTextView::KeyDown(bytes, numBytes);
+            // Lock the URL input if it was modified
+            if (!fURLInputGroup->IsURLInputLocked()
+                && Text() != currentText)
+                fURLInputGroup->LockURLInput();
             break;
+        }
     }
 }
 
 void
 URLInputGroup::URLTextView::MakeFocus(bool focus)
 {
-    // Unlock the URL input ahead of time if focus was lost.
-    if (!focus) {
+    // Unlock the URL input if focus was lost.
+    if (!focus)
         fURLInputGroup->LockURLInput(false);
-    }
 
     if (focus == IsFocus())
         return;
 
     BTextView::MakeFocus(focus);
 
-    if (focus) {
-        fPreviousText = Text();
+    if (focus)
         SelectAll();
-    }
 
     fURLInputGroup->Invalidate();
 }
 
 
-void
-URLInputGroup::URLTextView::SetPreviousText(const char* text)
-{
-    fPreviousText = text;
-}
-
-
 BSize
 URLInputGroup::URLTextView::MinSize()
 {
@@ -596 +590 @@
 URLInputGroup::URLInputGroup(BMessage* goMessage)
     :
     BGroupView(B_HORIZONTAL, 0.0),
-    fURLLockTimeout(NULL),
     fWindowActive(false),
     fURLLocked(false)
 {
@@ -629 +622 @@
 
 URLInputGroup::~URLInputGroup()
 {
-    delete fURLLockTimeout;
 }
 
 
@@ -683 +675 @@
 void
 URLInputGroup::SetText(const char* text)
 {
-    // Ignore setting the text, if the user edited the URL in the last
-    // couple of seconds. Instead set the previous text in the text view,
-    // so if the user presses ESC the input will update to show the new
-    // text.
-    if (fURLLocked) {
-        fTextView->SetPreviousText(text);
+    // Ignore setting the text, if the input is locked.
+    if (fURLLocked)
         return;
-    }
 
     if (!text || !Text() || strcmp(Text(), text) != 0) {
         fTextView->SetUpdateAutoCompleterChoices(false);
@@ -721 +708 @@
 }
 
 
-void
-URLInputGroup::LockURLInput(bool lock)
+bool
+URLInputGroup::IsURLInputLocked() const
 {
-    fURLLocked = lock;
-    if (lock) {
-        if (fURLLockTimeout == NULL) {
-            fURLLockTimeout = new BMessageRunner(this,
-                new BMessage(MSG_LOCK_TIMEOUT), LOCK_TIMEOUT, 1);
-        } else {
-            fURLLockTimeout->SetInterval(LOCK_TIMEOUT);
-        }
-    }
+    return fURLLocked;
 }
 
 
 void
-URLInputGroup::MessageReceived(BMessage* message)
+URLInputGroup::LockURLInput(bool lock)
 {
-    switch (message->what) {
-        case MSG_LOCK_TIMEOUT:
-        {
-            delete fURLLockTimeout;
-            fURLLockTimeout = NULL;
-            LockURLInput(false);
-            break;
-        }
-        default:
-        {
-            BGroupView(message);
-            break;
-        }
-    }
+    fURLLocked = lock;
 }
-

src/apps/webpositive/URLInputGroup.h

@@ -6 +6 @@
 #define URL_INPUT_GROUP_H
 
 #include <GroupView.h>
-#include <MessageRunner.h>
 
 class BButton;
 class BTextView;
 
 
 class URLInputGroup : public BGroupView {
-private:
-    static  const   uint32      MSG_LOCK_TIMEOUT = 'loti';
-    static  const   bigtime_t   LOCK_TIMEOUT = 1000000;
-        // Lock will timeout in one second
-
 public:
                                 URLInputGroup(BMessage* goMessage);
     virtual                     ~URLInputGroup();
@@ -35 +29 @@
 
             void                SetPageIcon(const BBitmap* icon);
 
+            bool                IsURLInputLocked() const;
     virtual void                LockURLInput(bool lock = true);
-    virtual void                MessageReceived(BMessage* message);
 
 private:
             class PageIconView;
             class URLTextView;
 
-            BMessageRunner*     fURLLockTimeout;
             PageIconView*       fIconView;
             URLTextView*        fTextView;
             BButton*            fGoButton;