observer: Fix crash when clicking on pid inside a html-term

4 files changed, 42 insertions, 34 deletions

diff --git a/lib/observer/src/cdv_bin_cb.erl b/lib/observer/src/cdv_bin_cb.erl
index 0266047ee3..d5fbceff1e 100644
--- a/lib/observer/src/cdv_bin_cb.erl
+++ b/lib/observer/src/cdv_bin_cb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -21,26 +21,26 @@
 	 detail_pages/0]).
 
 %% Callbacks for cdv_detail_wx
-get_details({_, {T,Key}}) ->
+get_details({Type, {T,Key}}) ->
     [{Key,Term}] = ets:lookup(T,Key),
-    {ok,{"Expanded Binary", Term, []}};
+    {ok,{"Expanded Binary", {Type, Term}, []}};
 get_details({cdv, Id}) ->
     {ok,Bin} = crashdump_viewer:expand_binary(Id),
-    {ok,{"Expanded Binary", Bin, []}}.
+    {ok,{"Expanded Binary", {cvd, Bin}, []}}.
 
 detail_pages() ->
     [{"Binary", fun init_bin_page/2}].
 
-init_bin_page(Parent,Bin) ->
+init_bin_page(Parent,{Type,Bin}) ->
     cdv_multi_wx:start_link(
       Parent,
-      [{"Format \~p",cdv_html_wx,format_bin_fun("~p",Bin)},
-       {"Format \~tp",cdv_html_wx,format_bin_fun("~tp",Bin)},
-       {"Format \~w",cdv_html_wx,format_bin_fun("~w",Bin)},
-       {"Format \~s",cdv_html_wx,format_bin_fun("~s",Bin)},
-       {"Format \~ts",cdv_html_wx,format_bin_fun("~ts",Bin)},
-       {"Hex",cdv_html_wx,hex_binary_fun(Bin)},
-       {"Term",cdv_html_wx,binary_to_term_fun(Bin)}]).
+      [{"Format \~p",cdv_html_wx,{Type,format_bin_fun("~p",Bin)}},
+       {"Format \~tp",cdv_html_wx,{Type,format_bin_fun("~tp",Bin)}},
+       {"Format \~w",cdv_html_wx,{Type,format_bin_fun("~w",Bin)}},
+       {"Format \~s",cdv_html_wx,{Type,format_bin_fun("~s",Bin)}},
+       {"Format \~ts",cdv_html_wx,{Type,format_bin_fun("~ts",Bin)}},
+       {"Hex",cdv_html_wx,{Type,hex_binary_fun(Bin)}},
+       {"Term",cdv_html_wx,{Type,binary_to_term_fun(Bin)}}]).
 
 format_bin_fun(Format,Bin) ->
     fun() ->
diff --git a/lib/observer/src/cdv_html_wx.erl b/lib/observer/src/cdv_html_wx.erl
index fe77a41f59..b79c647f63 100644
--- a/lib/observer/src/cdv_html_wx.erl
+++ b/lib/observer/src/cdv_html_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -30,6 +30,7 @@
 %% Records
 -record(state,
 	{panel,
+	 app,         %% which tool is the user
 	 expand_table,
 	 expand_wins=[]}).
 
@@ -38,16 +39,21 @@ start_link(ParentWin, Info) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-init([ParentWin, Fun]) when is_function(Fun) ->
-    init([ParentWin, Fun()]);
+init([ParentWin, {App, Fun}]) when is_function(Fun) ->
+    init([ParentWin, {App, Fun()}]);
 init([ParentWin, {expand,HtmlText,Tab}]) ->
-    HtmlWin = observer_lib:html_window(ParentWin),
-    wxHtmlWindow:setPage(HtmlWin,HtmlText),
-    {HtmlWin, #state{panel=HtmlWin,expand_table=Tab}};
+    init(ParentWin, HtmlText, Tab, cdv);
+init([ParentWin, {App, {expand,HtmlText,Tab}}]) ->
+    init(ParentWin, HtmlText, Tab, App);
+init([ParentWin, {App,HtmlText}]) ->
+    init(ParentWin, HtmlText, undefined, App);
 init([ParentWin, HtmlText]) ->
+    init(ParentWin, HtmlText, undefined, cdv).
+
+init(ParentWin, HtmlText, Tab, App) ->
     HtmlWin = observer_lib:html_window(ParentWin),
     wxHtmlWindow:setPage(HtmlWin,HtmlText),
-    {HtmlWin, #state{panel=HtmlWin}}.
+    {HtmlWin, #state{panel=HtmlWin,expand_table=Tab,app=App}}.
 
 %%%%%%%%%%%%%%%%%%%%%%% Callbacks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -78,7 +84,7 @@ handle_cast(Msg, State) ->
 
 handle_event(#wx{event=#wxHtmlLink{type=command_html_link_clicked,
 				   linkInfo=#wxHtmlLinkInfo{href=Target}}},
-	     #state{expand_table=Tab}=State) ->
+	     #state{expand_table=Tab, app=App}=State) ->
     NewState=
 	case Target of
 	    "#Binary?" ++ BinSpec ->
@@ -102,10 +108,12 @@ handle_event(#wx{event=#wxHtmlLink{type=command_html_link_clicked,
 				 list_to_integer(Key2),
 				 list_to_integer(Key3)}}},
 		expand(Id,cdv_term_cb,State);
+	    _ when App =:= obs ->
+		observer ! {open_link, Target};
 	    _ ->
 		cdv_virtual_list_wx:start_detail_win(Target),
 		State
-    end,
+	end,
     {noreply, NewState};
 
 handle_event(Event, State) ->
diff --git a/lib/observer/src/cdv_term_cb.erl b/lib/observer/src/cdv_term_cb.erl
index 6426cc0803..2ba908b909 100644
--- a/lib/observer/src/cdv_term_cb.erl
+++ b/lib/observer/src/cdv_term_cb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -21,23 +21,23 @@
 	 detail_pages/0]).
 
 %% Callbacks for cdv_detail_wx
-get_details({_, {T,Key}}) ->
+get_details({Type, {T,Key}}) ->
     [{Key,Term}] = ets:lookup(T,Key),
-    {ok,{"Expanded Term", [Term, T], []}}.
+    {ok,{"Expanded Term", {Type,[Term, T]}, []}}.
 
 detail_pages() ->
     [{"Term", fun init_term_page/2}].
 
-init_term_page(ParentWin, [Term, Tab]) ->
+init_term_page(ParentWin, {Type, [Term, Tab]}) ->
     Expanded = expand(Term, true),
     BinSaved = expand(Term, Tab),
     cdv_multi_wx:start_link(
       ParentWin,
-      [{"Format \~p",cdv_html_wx,format_term_fun("~p",BinSaved,Tab)},
-       {"Format \~tp",cdv_html_wx,format_term_fun("~tp",BinSaved,Tab)},
-       {"Format \~w",cdv_html_wx,format_term_fun("~w",BinSaved,Tab)},
-       {"Format \~s",cdv_html_wx,format_term_fun("~s",Expanded,Tab)},
-       {"Format \~ts",cdv_html_wx,format_term_fun("~ts",Expanded,Tab)}]).
+      [{"Format \~p",cdv_html_wx,{Type, format_term_fun("~p",BinSaved,Tab)}},
+       {"Format \~tp",cdv_html_wx,{Type,format_term_fun("~tp",BinSaved,Tab)}},
+       {"Format \~w",cdv_html_wx,{Type,format_term_fun("~w",BinSaved,Tab)}},
+       {"Format \~s",cdv_html_wx,{Type,format_term_fun("~s",Expanded,Tab)}},
+       {"Format \~ts",cdv_html_wx,{Type,format_term_fun("~ts",Expanded,Tab)}}]).
 
 format_term_fun(Format,Term,Tab) ->
     fun() ->
diff --git a/lib/observer/src/observer_procinfo.erl b/lib/observer/src/observer_procinfo.erl
index 988e04993c..3ffa5fc77d 100644
--- a/lib/observer/src/observer_procinfo.erl
+++ b/lib/observer/src/observer_procinfo.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -136,9 +136,9 @@ handle_event(#wx{event=#wxHtmlLink{linkInfo=#wxHtmlLinkInfo{href=Href}}},
 	    {noreply, State};
 	Callback ->
 	    [{"key1",Key1},{"key2",Key2},{"key3",Key3}] = httpd:parse_query(Rest),
-	    Id = {observer, {T,{list_to_integer(Key1),
-				list_to_integer(Key2),
-				list_to_integer(Key3)}}},
+	    Id = {obs, {T,{list_to_integer(Key1),
+			   list_to_integer(Key2),
+			   list_to_integer(Key3)}}},
 	    Opened =
 		case lists:keyfind(Id,1,Opened0) of
 		    false ->