Merge lp:~tai271828/ubuntu/precise/pcmanx-gtk2/fix-for-1284447 into lp:ubuntu/precise/pcmanx-gtk2

[Taihsiang Ho]

This is a function enhancement for LP: #1284447 and backport from upstream.
Please see the upstream bug report
https://code.google.com/p/pcmanx-gtk2/issues/detail?id=67&can=1

[Test Case]
open few connection windows, and then
* middle click to close what your middle button select - verify the new feature
* alt+w button to close the current window - verify the OnCloseCon behavior is the same after refactoring
* ctrl+d button to close the current window - verify the OnCloseCon behavior is the same after refactoring

[Regression Potential]
No, this is a userspace application to connect a telnet message window.
The most risk is the user could not close the exact telnet message window launched by the pcmanx-gtk2 application.

[Sebastien Bacher (seb128)]

Thank you for your work. Could you include a changelog entry to your update? Before fixing that in precise you also need the fix uploaded to the current serie (trusty), could you work on that?

review: Needs Fixing

Unmerged revisions

18. By Taihsiang Ho on 2014-03-18

Refactoring to modulize query dialogue on closing connection (LP: #1284447)

17. By Taihsiang Ho on 2014-03-18

Close tabs selected by middle clicks. (LP: #1284447)

=== modified file 'src/mainframe.cpp'
--- src/mainframe.cpp	2012-02-02 22:53:10 +0000
+++ src/mainframe.cpp	2014-03-19 07:54:51 +0000
@@ -799,21 +799,86 @@
 		t_pView->PasteFromClipboard(true);
 }
 
+void CMainFrame::OnCloseSelectCon(GtkWidget *notebook, GtkMenuItem* mitem, CMainFrame* _this)
+{
+	/**
+	*   Close pages selected by middle click of tabs.
+	*
+	*   At first choose which tab is the closet tab to the click location.
+	*   Then switch to the selected page.
+	*   Finally close it, and then switch back to the original page.
+	*
+	*   TODO:
+	*   The most right hand tab will be selected
+	*   even the click location is not exactly on the tab.
+	*/
+	int window_w = 0;
+	int window_h = 0;
+	gtk_window_get_size(GTK_WINDOW(gtk_widget_get_toplevel(notebook)), &window_w, &window_h);
+
+	GtkWidget *closet_tab;
+
+	int closet_tab_x = window_w;
+	int number_of_pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook));
+	int nth_page_number = 0;
+	int number_of_closet_tab = 0;
+	/* pick up the tab which is closet to the click location. */
+	for(nth_page_number = 0; nth_page_number < number_of_pages; nth_page_number++)
+	{
+		GtkWidget *tab_label;
+		tab_label = gtk_notebook_get_tab_label(  GTK_NOTEBOOK(notebook),
+			gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
+			nth_page_number));
+		int lx, ly;
+		gtk_widget_get_pointer(tab_label, &lx, &ly);
+		if(lx > 0 && lx < closet_tab_x)
+		{
+			closet_tab_x = lx;
+			closet_tab = tab_label;
+			number_of_closet_tab = nth_page_number;
+		}
+	}
+
+	/* switch to the page which is clicked. */
+	int page_idx_before_close = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook));
+	gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), number_of_closet_tab);
+	_this->SetCurView( _this->m_Views[number_of_closet_tab] );
+
+	if ( !(_this->QueryOnCloseCon(_this)) ) return;
+
+	int page_idx_after_close = 0;
+	page_idx_before_close < number_of_closet_tab ? page_idx_after_close = page_idx_before_close : page_idx_after_close = page_idx_before_close - 1;
+	/* close the current page and then switch page back to the original one. */
+	_this->CloseConAndPageSwitch(_this->m_pNotebook->GetCurPage(), true, notebook, page_idx_after_close);
+}
+
 void CMainFrame::OnCloseCon(GtkMenuItem* mitem UNUSED, CMainFrame* _this)
 {
+    if ( !(_this->QueryOnCloseCon(_this)) ) return;
+    _this->CloseCon(_this->m_pNotebook->GetCurPage(), true);
+}
+
+bool CMainFrame::QueryOnCloseCon(CMainFrame* _this)
+{
+
 	CTelnetCon* con = _this->GetCurCon();
 	if( !con )
-		return;
+		return false;
 	if( AppConfig.QueryOnCloseCon && !con->IsClosed() )
 	{
-		GtkWidget* dlg = gtk_message_dialog_new(GTK_WINDOW(_this->m_Widget), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, _("Close Connection?"));
+        GtkWidget* dlg = gtk_message_dialog_new(GTK_WINDOW(_this->m_Widget),                                               
+                GTK_DIALOG_MODAL,
+                GTK_MESSAGE_QUESTION,
+                GTK_BUTTONS_OK_CANCEL,
+                _("Close Connection?"));
 		bool can_close = ( gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_OK );
 		gtk_widget_destroy(dlg);
 		if( !can_close )
-			return;
+			return false;
 	}
 
-	_this->CloseCon(_this->m_pNotebook->GetCurPage(), true);
+	return true;
+
 }
 
 
@@ -1015,7 +1080,7 @@
 	_this->SetCurView( _this->m_Views[page_num] );
 }
 
-gboolean CMainFrame::OnNotebookPopupMenu(GtkWidget *widget UNUSED,
+gboolean CMainFrame::OnNotebookPopupMenu(GtkWidget *widget,
                                          GdkEventButton *event,
                                          CMainFrame* _this)
 {
@@ -1075,7 +1140,7 @@
 	// similar to the behavior under Firefox
 	if (AppConfig.MidClickAsClose &&
 	    event->type == GDK_BUTTON_PRESS && event->button == 2) {
-		_this->OnCloseCon(GTK_MENU_ITEM(menu_item_close), _this);
+		_this->OnCloseSelectCon(widget, GTK_MENU_ITEM(menu_item_close), _this);
 		return TRUE;
 	}
 
@@ -1089,6 +1154,14 @@
 	return TRUE;
 }
 
+void CMainFrame::CloseConAndPageSwitch(int idx, bool confirm UNUSED, GtkWidget *notebook, int page_idx)
+{
+	m_pNotebook->RemovePage(idx);
+	m_Views.erase( m_Views.begin() + idx );
+
+	gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), page_idx);
+	SetCurView( page_idx >= 0 ? m_Views[page_idx] : NULL );
+}
 
 void CMainFrame::CloseCon(int idx, bool confirm UNUSED)
 {

=== modified file 'src/mainframe.h'
--- src/mainframe.h	2012-02-02 22:53:10 +0000
+++ src/mainframe.h	2014-03-19 07:54:51 +0000
@@ -63,6 +63,7 @@
 	static void OnFont(GtkMenuItem* mitem, CMainFrame* _this);
 	static void OnAbout(GtkMenuItem* mitem, CMainFrame* _this);
 	static void pasteFromClipboard(GtkMenuItem* mitem, CMainFrame* _this);
+	static void OnCloseSelectCon(GtkWidget* notebook, GtkMenuItem* mitem, CMainFrame* _this);
 	static void OnCloseCon(GtkMenuItem* mitem, CMainFrame* _this);
 	static void OnCopy(GtkMenuItem* mitem, CMainFrame* _this);
 	static void OnCopyWithColor(GtkMenuItem* mitem, CMainFrame* _this);
@@ -136,7 +137,9 @@
 	void LoadIcons();
 	void LoadStartupSites();
 	static void OnJumpToPage(GObject* obj, CMainFrame* _this);
+	void CloseConAndPageSwitch(int idx, bool confirm UNUSED, GtkWidget *notebook, int page_idx);
 	void CloseCon(int idx, bool confirm = false);
+        static bool QueryOnCloseCon(CMainFrame* _this);
 	static void OnAddToFavorites(GtkMenuItem* widget, CMainFrame* _this);
 	void CreateFavoritesMenu();
 	void CreateTrayIcon();