File 0130-Completed-list-of-handled-MacOS-app-events... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0130-Completed-list-of-handled-MacOS-app-events.patch of Package erlang (Revision 146c22f3078afb21ca566b2f59ce9bb4)

Currently displaying revision 146c22f3078afb21ca566b2f59ce9bb4 , Show latest

From 3e398c1d6b2be8b684cb3e3224cea1821bf49b7f Mon Sep 17 00:00:00 2001
From: Dominic Letz <dominic@diode.io>
Date: Mon, 26 Apr 2021 19:10:01 +0200
Subject: [PATCH] Completed list of handled MacOS app events

So far only `new_file` was handled and there was only an
undocumented function to fetch those events. Now all
currently existing application events are captured and
can be subscribed to from a client application.
---
 lib/wx/c_src/wxe_impl.cpp | 18 ++++++++++++++++++
 lib/wx/c_src/wxe_impl.h   |  4 ++++
 lib/wx/src/wx.erl         | 19 ++++++++++++++++++-
 lib/wx/src/wxe_master.erl | 23 ++++++++++++++++-------
 4 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp
index 4a355bc180..28c493ff15 100644
--- a/lib/wx/c_src/wxe_impl.cpp
+++ b/lib/wx/c_src/wxe_impl.cpp
@@ -178,9 +178,27 @@ bool WxeApp::OnInit()
 
 
 #ifdef  _MACOSX
+void WxeApp::MacPrintFile(const wxString &filename) {
+  send_msg("print_file", &filename);
+}
+
 void WxeApp::MacOpenFile(const wxString &filename) {
   send_msg("open_file", &filename);
 }
+
+void WxeApp::MacOpenURL(const wxString &url) {
+  send_msg("open_url", &url);
+}
+
+void WxeApp::MacNewFile() {
+  wxString empty;
+  send_msg("new_file", &empty);
+}
+
+void WxeApp::MacReopenApp() {
+  wxString empty;
+  send_msg("reopen_app", &empty);
+}
 #endif
 
 void WxeApp::shutdown(wxeMetaCommand& Ecmd) {
diff --git a/lib/wx/c_src/wxe_impl.h b/lib/wx/c_src/wxe_impl.h
index 38a307aa71..022edaa156 100644
--- a/lib/wx/c_src/wxe_impl.h
+++ b/lib/wx/c_src/wxe_impl.h
@@ -59,7 +59,11 @@ public:
 				const wxChar *cond, const wxChar *msg);
 
 #ifdef  _MACOSX
+  virtual void MacPrintFile(const wxString &filename);
   virtual void MacOpenFile(const wxString &filename);
+  virtual void MacOpenURL(const wxString &url);
+  virtual void MacNewFile();
+  virtual void MacReopenApp();
 #endif
 
   void init_consts(wxeMetaCommand& event);
diff --git a/lib/wx/src/wx.erl b/lib/wx/src/wx.erl
index fb1cb67aa5..660b83a5d7 100644
--- a/lib/wx/src/wx.erl
+++ b/lib/wx/src/wx.erl
@@ -63,7 +63,7 @@
 -module(wx).
 
 -export([parent_class/1, new/0, new/1, destroy/0,
-	 get_env/0,set_env/1, debug/1,
+	 get_env/0, set_env/1, subscribe_events/0, debug/1,
 	 batch/1,foreach/2,map/2,foldl/3,foldr/3,
 	 getObjectType/1, typeCast/2,
 	 null/0, is_null/1, equal/2]).
@@ -144,6 +144,23 @@ set_env(#wx_env{sv=Pid} = Env) ->
     wxe_server:register_me(Pid),
     ok.
 
+%% @doc Adds the calling process to the list of of processes that are
+%% listening to wx application events. At the moment these are
+%% all MacOSX specific events corresponding to MacNewFile() and friends
+%% from wxWidgets wxApp https://docs.wxwidgets.org/trunk/classwx_app.html
+%%
+%% * `{file_new, ""}` 
+%% * `{file_open, Filename}`
+%% * `{file_print, Filename}`
+%% * `{url_open, Url}`
+%% * `{reopen_app, ""}`
+%%
+%% The call always returns ok but will have sent any already received
+%% events to the calling process. 
+-spec subscribe_events() -> 'ok'.
+subscribe_events() ->
+    gen_server:call(wxe_master, subscribe_msgs, infinity).
+
 %% @doc Returns the null object
 -spec null() -> wx_object().
 null() ->
diff --git a/lib/wx/src/wxe_master.erl b/lib/wx/src/wxe_master.erl
index 1c5bb3c3da..4ce500268a 100644
--- a/lib/wx/src/wxe_master.erl
+++ b/lib/wx/src/wxe_master.erl
@@ -35,10 +35,8 @@
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
 	 terminate/2, code_change/3]).
 
--record(state, {cb_port,  %% Callback port and to erlang messages goes via it.
-		users,    %% List of wx servers, needed ??
-		driver,   %% Driver name so wx_server can create it's own port
-		msgs=[]   %% Early messages (such as openfiles on OSX)
+-record(state, {subscribers=[],  %% WxApp messages listeners
+		msgs=[]   %% WxApp messages (open_file and new_file on MacOSX)
 	       }).
 
 -include("wxe.hrl").
@@ -141,7 +139,12 @@ init([SilentStart]) ->
 handle_call(init_env, _From, State) ->
     {reply, ok, State};
 handle_call(fetch_msgs, _From, State=#state{msgs=Msgs}) ->
-    {reply, lists:reverse(Msgs), State#state{msgs=[]}};
+    NewFiles = [Data || {Type, Data} <- lists:reverse(Msgs), Type == new_file],
+    {reply, NewFiles, State#state{msgs=[]}};
+handle_call(subscribe_msgs, {Pid, _Tag}, State=#state{subscribers=Subs}) ->
+    monitor(process, Pid),
+    lists:foreach(fun(Msg) -> Pid ! Msg end, lists:reverse(State#state.msgs)),
+    {reply, ok, State#state{subscribers=[Pid|Subs], msgs=[]}};
 handle_call(_Request, _From, State) ->
     %%io:format("Unknown request ~p sent to ~p from ~p ~n",[_Request, ?MODULE, _From]),
     Reply = ok,
@@ -172,8 +175,14 @@ handle_info({wxe_driver, internal_error, Msg}, State) ->
 handle_info({wxe_driver, debug, Msg}, State) ->
     io:format("WX DBG: ~s~n", [Msg]),
     {noreply, State};
-handle_info({wxe_driver, open_file, File}, State=#state{msgs=Msgs}) ->
-    {noreply, State#state{msgs=[File|Msgs]}};
+handle_info({wxe_driver, Cmd, File}, State = #state{subscribers=Subs, msgs=Msgs}) 
+  when Cmd =:= open_file; Cmd =:= new_file; Cmd =:= print_file; 
+       Cmd =:= open_url; Cmd =:= reopen_app ->
+    lists:foreach(fun(Pid) -> Pid ! {Cmd, File} end, Subs),
+    {noreply, State#state{msgs=[{Cmd, File}|Msgs]}};
+handle_info({'DOWN', _Ref, process, Pid, _Info}, State) ->
+    Subs = State#state.subscribers -- [Pid],
+    {noreply, State#state{subscribers=Subs}};
 handle_info(_Info, State) ->
     io:format("Unknown message ~p sent to ~p~n",[_Info, ?MODULE]),
     {noreply, State}.
-- 
2.26.2

Places

File 0130-Completed-list-of-handled-MacOS-app-events.patch of Package erlang (Revision 146c22f3078afb21ca566b2f59ce9bb4)

Places