From edbebf84b9d5bf7d3dde71f7337e4ce48d7de7c6 Mon Sep 17 00:00:00 2001
From: Omri Litov <omrilitov@gmail.com>
Date: Tue, 27 Oct 2015 03:12:01 +0200
Subject: [PATCH] Added browser-window event 'message'

---
 atom/browser/api/atom_api_window.cc     | 6 ++++++
 atom/browser/api/atom_api_window.h      | 5 +++++
 atom/browser/native_window.cc           | 8 ++++++++
 atom/browser/native_window.h            | 4 ++++
 atom/browser/native_window_observer.h   | 9 +++++++++
 atom/browser/native_window_views_win.cc | 2 ++
 docs/api/browser-window.md              | 4 ++++
 7 files changed, 38 insertions(+)

diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc
index 62994c9c93d..7daab4d1a08 100644
--- a/atom/browser/api/atom_api_window.cc
+++ b/atom/browser/api/atom_api_window.cc
@@ -189,6 +189,12 @@ void Window::OnExecuteWindowsCommand(const std::string& command_name) {
   Emit("app-command", command_name);
 }
 
+#if defined(OS_WIN)
+void Window::OnWindowMessage(UINT message, LPARAM l_param, WPARAM w_param) {
+  Emit("message", message, l_param, w_param);
+}
+#endif
+
 // static
 mate::Wrappable* Window::New(v8::Isolate* isolate,
                              const mate::Dictionary& options) {
diff --git a/atom/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h
index 8a8ff266a88..41956414614 100644
--- a/atom/browser/api/atom_api_window.h
+++ b/atom/browser/api/atom_api_window.h
@@ -75,6 +75,11 @@ class Window : public mate::TrackableObject<Window>,
   void OnRendererResponsive() override;
   void OnExecuteWindowsCommand(const std::string& command_name) override;
 
+  #if defined(OS_WIN)
+  void OnWindowMessage(unsigned int message, LPARAM l_param,
+                       WPARAM w_param) override;
+  #endif
+
   // mate::Wrappable:
   bool IsDestroyed() const override;
 
diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index c19bcdf467f..e3abed473e7 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -464,6 +464,14 @@ void NativeWindow::NotifyWindowExecuteWindowsCommand(
                     OnExecuteWindowsCommand(command));
 }
 
+#if defined(OS_WIN)
+void NativeWindow::NotifyWindowMessage(UINT message, WPARAM w_param,
+                                       LPARAM l_param) {
+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_,
+                    OnWindowMessage(message, w_param, l_param));
+}
+#endif
+
 scoped_ptr<SkRegion> NativeWindow::DraggableRegionsToSkRegion(
     const std::vector<DraggableRegion>& regions) {
   scoped_ptr<SkRegion> sk_region(new SkRegion);
diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h
index 37a59ff8a9e..e32b9481182 100644
--- a/atom/browser/native_window.h
+++ b/atom/browser/native_window.h
@@ -210,6 +210,10 @@ class NativeWindow : public base::SupportsUserData,
   void NotifyWindowLeaveHtmlFullScreen();
   void NotifyWindowExecuteWindowsCommand(const std::string& command);
 
+  #if defined(OS_WIN)
+  void NotifyWindowMessage(UINT message, WPARAM w_param, LPARAM l_param);
+  #endif
+
   void AddObserver(NativeWindowObserver* obs) {
     observers_.AddObserver(obs);
   }
diff --git a/atom/browser/native_window_observer.h b/atom/browser/native_window_observer.h
index 33ab1ecb6b3..db693b47d53 100644
--- a/atom/browser/native_window_observer.h
+++ b/atom/browser/native_window_observer.h
@@ -11,6 +11,10 @@
 #include "ui/base/window_open_disposition.h"
 #include "url/gurl.h"
 
+#if defined(OS_WIN)
+#include <windows.h>
+#endif
+
 namespace atom {
 
 class NativeWindowObserver {
@@ -55,6 +59,11 @@ class NativeWindowObserver {
   virtual void OnWindowEnterHtmlFullScreen() {}
   virtual void OnWindowLeaveHtmlFullScreen() {}
 
+  // Called when window message received
+  #if defined(OS_WIN)
+  virtual void OnWindowMessage(UINT message, LPARAM l_param, WPARAM w_param) {}
+  #endif
+
   // Called when renderer is hung.
   virtual void OnRendererUnresponsive() {}
 
diff --git a/atom/browser/native_window_views_win.cc b/atom/browser/native_window_views_win.cc
index 6092a2242ac..d49683acb3c 100644
--- a/atom/browser/native_window_views_win.cc
+++ b/atom/browser/native_window_views_win.cc
@@ -80,6 +80,8 @@ bool NativeWindowViews::ExecuteWindowsCommand(int command_id) {
 
 bool NativeWindowViews::PreHandleMSG(
     UINT message, WPARAM w_param, LPARAM l_param, LRESULT* result) {
+  NotifyWindowMessage(message, w_param, l_param);
+
   switch (message) {
     case WM_COMMAND:
       // Handle thumbar button click message.
diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index aa46590c746..99578c902ef 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -232,6 +232,10 @@ Emitted when the window enters full screen state triggered by html api.
 
 Emitted when the window leaves full screen state triggered by html api.
 
+### Event: 'message' _WINDOWS_
+
+Emitted when the window receives a message from the operating system.
+
 ### Event: 'app-command':
 
 Emitted when an [App Command](https://msdn.microsoft.com/en-us/library/windows/desktop/ms646275(v=vs.85).aspx)