added ability to parse multiple urls from plaintext selection and bumped versions

git-svn-id: http://svn.klever.net/kin/dipstick/trunk@126 fe716a7a-6dde-0310-88d9-d003556173a8

1 files changed, 52 insertions, 10 deletions

diff --git a/DipstickDlg.cpp b/DipstickDlg.cpp
index ace2aff..f27b219 100644
--- a/DipstickDlg.cpp
+++ b/DipstickDlg.cpp
@@ -100,16 +100,18 @@ WORD hi,lo;
         //}}AFX_DATA_INIT

         // Note that LoadIcon does not require a subsequent DestroyIcon in Win32

         m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);

         m_bmpBack.LoadBitmap(IDB_DIABACK);

         m_bmpBack.GetBitmap(&m_bitmapBack);

 CString tmp;

         VERIFY(tmp.LoadString(IDS_REGEX_HTMLURL));

         VERIFY(m_reHTMLURL.Compile(tmp,CRegEx::regExtended|CRegEx::regIgnoreCase));

+        VERIFY(tmp.LoadString(IDS_REGEX_URL));

+        VERIFY(m_reURL.Compile(tmp,CRegEx::regExtended|CRegEx::regIgnoreCase));

 }

 

 CDipstickDlg::~CDipstickDlg()

 {

 }

 

 void CDipstickDlg::DoDataExchange(CDataExchange* pDX)

 {

@@ -130,16 +132,17 @@ void CDipstickDlg::DoDataExchange(CDataExchange* pDX)
 

 BEGIN_MESSAGE_MAP(CDipstickDlg, CDialog)

         //{{AFX_MSG_MAP(CDipstickDlg)

         ON_WM_SYSCOMMAND()

         ON_WM_PAINT()

         ON_WM_QUERYDRAGICON()

         ON_WM_DESTROY()

         ON_BN_CLICKED(IDC_OPTIONS, OnOptions)

+        ON_MESSAGE(WM_DNP_URLSPING, OnURLSPing)

         ON_MESSAGE(WM_DNP_URLPING, OnUrlPing)

         ON_MESSAGE(WM_DNP_ACTIVITYCOUNT, OnActivityCount)

         ON_MESSAGE(WM_DNP_UPDATEHOSTDATA, OnUpdateHostData)

         ON_MESSAGE(WM_DNP_HTML, OnHTMLTransfer)

         ON_NOTIFY(LVN_COLUMNCLICK, IDC_HOSTLIST, OnColumnclickHostlist)

         ON_WM_WINDOWPOSCHANGING()

         ON_COMMAND(ID_DRAGPAD_OPTIONS, OnDragpadOptions)

         ON_COMMAND(ID_DRAGPAD_SHOWMAINWINDOW, OnDragpadShowmainwindow)

@@ -1180,16 +1183,17 @@ UINT	cfNIF = RegisterClipboardFormat("Netscape Image Format");
                         memmove(htmlBuff,&lps[startSelection],endSelection-startSelection+1);

                         htmlBuff[endSelection-startSelection+1]=0;

                         xf->html.ReleaseBuffer();

                         if(bTestOnly){

                                 rv = m_reHTMLURL.Match(xf->html);

                                 delete xf;

                         }else{

                                 PostMessage(WM_DNP_HTML,0,(LPARAM)xf);

+                                rv = TRUE;

                         }

                 }while(FALSE);

                 GlobalUnlock(hg);

                 GlobalFree(hg);

                 return rv;

         }

         if(pDO->IsDataAvailable(cfNIF)){

                 if(!bTestOnly){

@@ -1205,26 +1209,38 @@ UINT	cfNIF = RegisterClipboardFormat("Netscape Image Format");
                 } *nif = (_nif*)lpv;

                         PostMessage(WM_DNP_URLPING,0,(LPARAM)new CString((LPCTSTR)&nif->data[nif->m_offURL]));

                         GlobalUnlock(hg);

                         GlobalFree(hg);

                 }

                 return TRUE;

         }

         if(pDO->IsDataAvailable(CF_TEXT)){

-                if(!bTestOnly){

-                HGLOBAL hg = pDO->GetGlobalData(CF_TEXT);

-                        ASSERT(hg);

-                LPVOID lpv = GlobalLock(hg);

-                        ASSERT(lpv);

-                        PostMessage(WM_DNP_URLPING,0,(LPARAM)new CString((LPCTSTR)lpv));

-                        GlobalUnlock(hg);

-                        GlobalFree(hg);

+        BOOL rv = FALSE;

+        HGLOBAL hg = pDO->GetGlobalData(CF_TEXT);

+                ASSERT(hg);

+        LPVOID lpv = GlobalLock(hg);

+                ASSERT(lpv);

+                if(bTestOnly){

+                        rv = m_reURL.Match((LPCSTR)lpv);

+                }else{

+                        CString sel = (LPCSTR)lpv;

+                        if(m_reURL.Match(sel)) {

+                                rv = TRUE;

+                                CString tmp = m_reURL.GetMatch(CRegEx::matchPostMatch);

+                                if(m_reURL.Match(tmp)) {

+                                         PostMessage(WM_DNP_URLSPING,0,(LPARAM)new CString((LPCSTR)lpv));

+                                }else{

+                                        PostMessage(WM_DNP_URLPING,0,(LPARAM)new CString((LPCTSTR)lpv));

+                                }

+                        }

                 }

-                return TRUE;

+                GlobalUnlock(hg);

+                GlobalFree(hg);

+                return rv;

         }

         return FALSE;

 }

 

 LRESULT CDipstickDlg::OnHTMLTransfer(WPARAM wP, LPARAM lP)

 {

 _xferHTML* xf = (_xferHTML*)lP;

 CSelectURLsDlg su;

@@ -1252,16 +1268,42 @@ CSelectURLsDlg su;
                 while(p){

                 CString url = su.m_URLs.GetNext(p);

                         PostMessage(WM_DNP_URLPING,0,(LPARAM)new CString(url));

                 }

         }

         return 0;

 }

 

+LRESULT CDipstickDlg::OnURLSPing(WPARAM wP,LPARAM lP)

+{

+CString *sel = (CString*)lP;

+TRACE1("URLS: %s\n",(LPCTSTR)*sel);

+CSelectURLsDlg su;

+        su.m_bAdjust = m_bSmartAdjust;

+        su.m_bAdjustInnermost = m_bAdjustInnermost;

+        BeginWaitCursor();

+        while(m_reURL.Match(*sel)){

+        CString url = m_reURL.GetMatch(CRegEx::matchMatch);

+                (*sel) = m_reURL.GetMatch(CRegEx::matchPostMatch);

+                if(!su.m_URLs.Find(url))

+                        VERIFY(su.m_URLs.AddTail(url));

+        }

+        EndWaitCursor();

+        delete sel;

+        if(su.DoModal()==IDOK){

+        POSITION p = su.m_URLs.GetHeadPosition();

+                while(p){

+                CString url = su.m_URLs.GetNext(p);

+                        PostMessage(WM_DNP_URLPING,0,(LPARAM)new CString(url));

+                }

+        }

+        return 0;

+}

+

 UINT CPingyHost::PingProc(LPVOID pParam)

 {

 CPingyHost* pThis = (CPingyHost*)pParam;

         ASSERT(pThis->m_Daddy);

         return pThis->DoPing();

 }

 

 UINT CPingyHost::DoPing()

@@ -1578,9 +1620,9 @@ CSingleLock sl(&m_mutex);
 UINT CPingyHost::SuicideProc(LPVOID pParam)

 {

 CPingyHost* pThis = (CPingyHost*)pParam;

 CSingleLock sl(&pThis->m_mutex);

         sl.Lock();

         VERIFY(sl.Unlock());

         delete pThis;

         return 0;

-}

+}
\ No newline at end of file