Merge pull request #105 from atom/windows-menu

Implement menu API on Windows, fixes #75.

browser/api/atom_api_menu.cc

@@ -351,6 +351,10 @@ void Menu::Initialize(v8::Handle<v8::Object> target) {
 
   NODE_SET_PROTOTYPE_METHOD(t, "popup", Popup);
 
+#if defined(OS_WIN)
+  NODE_SET_PROTOTYPE_METHOD(t, "attachToWindow", AttachToWindow);
+#endif
+
   target->Set(v8::String::NewSymbol("Menu"), t->GetFunction());
 
 #if defined(OS_MACOSX)

browser/api/atom_api_menu.h

@@ -68,7 +68,9 @@ class Menu : public EventEmitter,
 
   static v8::Handle<v8::Value> Popup(const v8::Arguments &args);
 
-#if defined(OS_MACOSX)
+#if defined(OS_WIN)
+  static v8::Handle<v8::Value> AttachToWindow(const v8::Arguments &args);
+#elif defined(OS_MACOSX)
   static v8::Handle<v8::Value> SetApplicationMenu(const v8::Arguments &args);
   static v8::Handle<v8::Value> SendActionToFirstResponder(
       const v8::Arguments &args);

browser/api/atom_api_menu_win.cc

@@ -4,8 +4,11 @@
 
 #include "browser/api/atom_api_menu_win.h"
 
+#include "browser/native_window_win.h"
 #include "browser/ui/win/menu_2.h"
+#include "common/v8_conversions.h"
 #include "ui/gfx/point.h"
+#include "ui/gfx/screen.h"
 
 namespace atom {
 
@@ -19,8 +22,26 @@ MenuWin::~MenuWin() {
 }
 
 void MenuWin::Popup(NativeWindow* native_window) {
+  gfx::Point cursor = gfx::Screen::GetNativeScreen()->GetCursorScreenPoint();
   menu_.reset(new atom::Menu2(model_.get()));
-  menu_->RunContextMenuAt(gfx::Point(0, 0));
+  menu_->RunContextMenuAt(cursor);
+}
+
+// static
+v8::Handle<v8::Value> Menu::AttachToWindow(const v8::Arguments& args) {
+  v8::HandleScope scope;
+
+  Menu* self = ObjectWrap::Unwrap<Menu>(args.This());
+  if (self == NULL)
+    return node::ThrowError("Menu is already destroyed");
+
+  NativeWindow* native_window;
+  if (!FromV8Arguments(args, &native_window))
+    return node::ThrowTypeError("Bad argument");
+
+  static_cast<NativeWindowWin*>(native_window)->SetMenu(self->model_.get());
+
+  return v8::Undefined();
 }
 
 // static

browser/api/atom_api_window.cc

@@ -101,6 +101,9 @@ v8::Handle<v8::Value> Window::New(const v8::Arguments &args) {
 
   new Window(args.This(), static_cast<base::DictionaryValue*>(options.get()));
 
+  // Give js code a chance to do initialization.
+  node::MakeCallback(args.This(), "_init", 0, NULL);
+
   return args.This();
 }
 

browser/api/lib/app.coffee

@@ -9,6 +9,15 @@ app = new Application
 app.getHomeDir = ->
   process.env[if process.platform is 'win32' then 'USERPROFILE' else 'HOME']
 
+app.getBrowserWindows = ->
+  require('../../atom/objects-registry.js').getAllWindows()
+
+app.setApplicationMenu = (menu) ->
+  require('menu').setApplicationMenu menu
+
+app.getApplicationMenu = ->
+  require('menu').getApplicationMenu()
+
 app.commandLine =
   appendSwitch: bindings.appendSwitch,
   appendArgument: bindings.appendArgument

browser/api/lib/browser-window.coffee

@@ -1,10 +1,16 @@
 EventEmitter = require('events').EventEmitter
+app = require 'app'
 v8Util = process.atomBinding 'v8_util'
-objectsRegistry = require '../../atom/objects-registry.js'
 
 BrowserWindow = process.atomBinding('window').BrowserWindow
 BrowserWindow::__proto__ = EventEmitter.prototype
 
+BrowserWindow::_init = ->
+  # Simulate the application menu on platforms other than OS X.
+  if process.platform isnt 'darwin'
+    menu = app.getApplicationMenu()
+    @setMenu menu if menu?
+
 BrowserWindow::toggleDevTools = ->
   opened = v8Util.getHiddenValue this, 'devtoolsOpened'
   if opened
@@ -17,12 +23,20 @@ BrowserWindow::toggleDevTools = ->
 BrowserWindow::restart = ->
   @loadUrl(@getUrl())
 
+BrowserWindow::setMenu = (menu) ->
+  throw new Error('BrowserWindow.setMenu is only available on Windows') unless process.platform is 'win32'
+
+  throw new TypeError('Invalid menu') unless menu?.constructor?.name is 'Menu'
+
+  @menu = menu  # Keep a reference of menu in case of GC.
+  @menu.attachToWindow this
+
 BrowserWindow.getFocusedWindow = ->
-  windows = objectsRegistry.getAllWindows()
+  windows = app.getBrowserWindows()
   return window for window in windows when window.isFocused()
 
 BrowserWindow.fromProcessIdAndRoutingId = (processId, routingId) ->
-  windows = objectsRegistry.getAllWindows()
+  windows = app.getBrowserWindows()
   return window for window in windows when window.getProcessId() == processId and
                                            window.getRoutingId() == routingId
 

browser/api/lib/menu-item.coffee

@@ -1,3 +1,5 @@
+BrowserWindow = require 'browser-window'
+
 nextCommandId = 0
 
 class MenuItem
@@ -26,7 +28,7 @@ class MenuItem
     @commandId = ++nextCommandId
     @click = =>
       if typeof click is 'function'
-        click.apply this, arguments
+        click this, BrowserWindow.getFocusedWindow()
       else if typeof @selector is 'string'
         Menu.sendActionToFirstResponder @selector
 

browser/api/lib/menu.coffee

@@ -3,6 +3,7 @@ EventEmitter = require('events').EventEmitter
 IDWeakMap = require 'id-weak-map'
 MenuItem = require 'menu-item'
 
+app = require 'app'
 bindings = process.atomBinding 'menu'
 
 Menu = bindings.Menu
@@ -39,13 +40,22 @@ Menu::insert = (pos, item) ->
       getAcceleratorForCommandId: (commandId) => @commandsMap[commandId]?.accelerator
       executeCommand: (commandId) =>
         activeItem = @commandsMap[commandId]
-        activeItem.click(activeItem) if activeItem?
+        activeItem.click() if activeItem?
   @items.splice pos, 0, item
   @commandsMap[item.commandId] = item
 
+applicationMenu = null
 Menu.setApplicationMenu = (menu) ->
   throw new TypeError('Invalid menu') unless menu?.constructor is Menu
-  bindings.setApplicationMenu menu
+  applicationMenu = menu  # Keep a reference.
+
+  if process.platform is 'darwin'
+    bindings.setApplicationMenu menu
+  else
+    windows = app.getBrowserWindows()
+    w.setMenu menu for w in windows
+
+Menu.getApplicationMenu = -> applicationMenu
 
 Menu.sendActionToFirstResponder = bindings.sendActionToFirstResponder