reflexion 0.5.2 → 0.6.0

data/src/menu.cpp

@@ -0,0 +1,325 @@
+#include "menu.h"
+
+
+#include <algorithm>
+#include <rays/point.h>
+#include "reflex/exception.h"
+
+
+namespace Reflex
+{
+
+
+	Menu::Data::Data ()
+	{
+	}
+
+	Menu::Data::~Data ()
+	{
+	}
+
+
+	Menu::Menu (const char* label)
+	:	self(Menu_create_data())
+	{
+		if (label) set_label(label);
+	}
+
+	Menu::~Menu ()
+	{
+	}
+
+	void
+	Menu::popup (coord x, coord y)
+	{
+		Menu_popup(this, NULL, x, y);
+	}
+
+	void
+	Menu::popup (const Point& position)
+	{
+		Menu_popup(this, NULL, position.x, position.y);
+	}
+
+	void
+	Menu::popup (View* view, coord x, coord y)
+	{
+		Menu_popup(this, view, x, y);
+	}
+
+	void
+	Menu::popup (View* view, const Point& position)
+	{
+		Menu_popup(this, view, position.x, position.y);
+	}
+
+	void
+	Menu::add_child (Menu* child, int index)
+	{
+		if (!child)
+			argument_error(__FILE__, __LINE__);
+
+		if (child->parent() == this)
+			return;
+
+		if (child->parent())
+			argument_error(__FILE__, __LINE__);
+
+		ChildList* children = self->children();
+		if (index < 0 || (int) children->size() < index)
+			index = (int) children->size();
+
+		children->insert(children->begin() + (size_t) index, child);
+
+		child->self->parent.reset(this);
+
+		Menu_child_added(this, child, index);
+	}
+
+	void
+	Menu::remove_child (Menu* child)
+	{
+		if (!child || child->parent() != this)
+			return;
+
+		auto* children = self->pchildren.get();
+		if (!children) return;
+
+		auto it = std::find(children->begin(), children->end(), child);
+		if (it == children->end()) return;
+
+		children->erase(it);
+		if (children->empty())
+			self->pchildren.reset();
+
+		child->self->parent.reset();
+
+		Menu_child_removed(this, child);
+	}
+
+	void
+	Menu::clear_children ()
+	{
+		while (self->pchildren && !self->pchildren->empty())
+			remove_child(self->pchildren->back().get());
+	}
+
+	static void
+	find_all_children (
+		Menu::ChildList* result, const Menu* menu, const Selector& selector,
+		bool recursive)
+	{
+		auto* children = menu->self->pchildren.get();
+		if (!children) return;
+
+		for (auto& child : *children)
+		{
+			if (!child)
+				invalid_state_error(__FILE__, __LINE__);
+
+			if (child->selector().contains(selector))
+				result->push_back(child);
+
+			if (recursive)
+				find_all_children(result, child.get(), selector, true);
+		}
+	}
+
+	Menu::ChildList
+	Menu::find_children (const Selector& selector, bool recursive) const
+	{
+		ChildList result;
+		find_all_children(&result, this, selector, recursive);
+		return result;
+	}
+
+	static bool
+	is_separator_label (const char* s)
+	{
+		if (!s || !*s) return false;
+		for (const char* p = s; *p; ++p)
+			if (*p != '-') return false;
+		return true;
+	}
+
+	void
+	Menu::set_label (const char* label)
+	{
+		if (!label) label = "";
+		if (label == self->label)
+			return;
+
+		self->label     = label;
+		self->separator = is_separator_label(label);
+
+		Menu_update(this);
+	}
+
+	const char*
+	Menu::label () const
+	{
+		return self->label.c_str();
+	}
+
+	void
+	Menu::enable (bool state)
+	{
+		if (state == self->enabled)
+			return;
+
+		self->enabled = state;
+		Menu_update(this);
+	}
+
+	bool
+	Menu::is_enabled () const
+	{
+		return self->enabled;
+	}
+
+	void
+	Menu::check (bool state)
+	{
+		if (state == self->checked)
+			return;
+
+		self->checked = state;
+		Menu_update(this);
+	}
+
+	bool
+	Menu::is_checked () const
+	{
+		return self->checked;
+	}
+
+	void
+	Menu::set_shortcut (const char* key, uint modifiers)
+	{
+		if (!key) key = "";
+		if (key == self->key && modifiers == self->modifiers)
+			return;
+
+		self->key       = key;
+		self->modifiers = modifiers;
+		Menu_update(this);
+	}
+
+	const char*
+	Menu::shortcut_key () const
+	{
+		return self->key.c_str();
+	}
+
+	uint
+	Menu::shortcut_modifiers () const
+	{
+		return self->modifiers;
+	}
+
+	void
+	Menu::set_image (const Image& image)
+	{
+		self->image = image;
+		Menu_update(this);
+	}
+
+	const Image&
+	Menu::image () const
+	{
+		return self->image;
+	}
+
+	bool
+	Menu::is_separator () const
+	{
+		return self->separator;
+	}
+
+	Menu*
+	Menu::parent ()
+	{
+		return self->parent;
+	}
+
+	const Menu*
+	Menu::parent () const
+	{
+		return const_cast<Menu*>(this)->parent();
+	}
+
+	size_t
+	Menu::size () const
+	{
+		return self->pchildren ? self->pchildren->size() : 0;
+	}
+
+	bool
+	Menu::empty () const
+	{
+		return self->pchildren ? self->pchildren->empty() : true;
+	}
+
+	static Menu::ChildList empty_children;
+
+	Menu::iterator
+	Menu::begin ()
+	{
+		if (!self->pchildren) return empty_children.begin();
+		return self->pchildren->begin();
+	}
+
+	Menu::const_iterator
+	Menu::begin () const
+	{
+		if (!self->pchildren) return empty_children.begin();
+		return self->pchildren->begin();
+	}
+
+	Menu::iterator
+	Menu::end ()
+	{
+		if (!self->pchildren) return empty_children.end();
+		return self->pchildren->end();
+	}
+
+	Menu::const_iterator
+	Menu::end () const
+	{
+		if (!self->pchildren) return empty_children.end();
+		return self->pchildren->end();
+	}
+
+	void
+	Menu::on_show (Event* e)
+	{
+	}
+
+	void
+	Menu::on_hide (Event* e)
+	{
+	}
+
+	void
+	Menu::on_open_submenu (Event* e)
+	{
+	}
+
+	void
+	Menu::on_close_submenu (Event* e)
+	{
+	}
+
+	void
+	Menu::on_click (Event* e)
+	{
+	}
+
+	SelectorPtr*
+	Menu::get_selector_ptr ()
+	{
+		return &self->pselector;
+	}
+
+
+}// Reflex

data/src/menu.h

@@ -0,0 +1,65 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SRC_MENU_H__
+#define __REFLEX_SRC_MENU_H__
+
+
+#include <memory>
+#include <rays/image.h>
+#include "reflex/menu.h"
+#include "selector.h"
+
+
+namespace Reflex
+{
+
+
+	struct Menu::Data
+	{
+
+		Xot::WeakRef<Menu> parent;
+
+		String label, key;
+
+		Image image;
+
+		uint modifiers = MOD_NONE;
+
+		bool enabled   = true;
+
+		bool checked   = false;
+
+		bool separator = false;
+
+		std::unique_ptr<ChildList> pchildren;
+
+		SelectorPtr pselector;
+
+		Data ();
+
+		virtual ~Data ();
+
+		ChildList* children ()
+		{
+			if (!pchildren) pchildren.reset(new ChildList);
+			return pchildren.get();
+		}
+
+	};// Menu::Data
+
+
+	Menu::Data* Menu_create_data ();
+
+	void Menu_update (Menu* menu);
+
+	void Menu_popup (Menu* menu, View* view, coord x, coord y);
+
+	void Menu_child_added   (Menu* parent, Menu* child, int index);
+
+	void Menu_child_removed (Menu* parent, Menu* child);
+
+
+}// Reflex
+
+
+#endif//EOH

data/src/osx/app_delegate.mm

@@ -6,6 +6,74 @@
 #import <Cocoa/Cocoa.h>
 #include "reflex/event.h"
 #include "reflex/exception.h"
+#include "menu.h"
+
+
+static Reflex::Menu::Ref
+create_menu (
+	const char* label, const char* name, SEL action = NULL,
+	const char* key = NULL, uint modifiers = Reflex::MOD_COMMAND)
+{
+	Reflex::Menu* item = new Reflex::Menu(label);
+	item->set_name(name);
+	if (key) item->set_shortcut(key, modifiers);
+	Reflex::Menu_set_native_action(item, action);
+	return item;
+}
+
+static Reflex::Menu::Ref
+create_sep ()
+{
+	return new Reflex::Menu("-");
+}
+
+static Reflex::Menu::Ref
+create_application_menu (Reflex::Application* application)
+{
+	using namespace Reflex;
+
+	String name = application->name();
+	if (!name.empty()) name = " " + name;
+
+	Menu::Ref app      = create_menu("Application", "application");
+	Menu::Ref services = create_menu("Services",    "services");
+
+	app->add_child(create_menu(("About" + name).c_str(), "about", @selector(showAbout)));
+	app->add_child(create_sep());
+	app->add_child(create_menu("Preferences", "preferences", @selector(showPreference), ","));
+	app->add_child(create_sep());
+	app->add_child(services.get());
+	app->add_child(create_sep());
+	app->add_child(create_menu(("Hide" + name).c_str(), "hide", @selector(hide:), "h"));
+	app->add_child(create_menu(
+		"Hide Others", "hide_others", @selector(hideOtherApplications:),
+		"h", MOD_OPTION | MOD_COMMAND));
+	app->add_child(create_menu("ShowAll", "show_all", @selector(unhideAllApplications:)));
+	app->add_child(create_sep());
+	app->add_child(create_menu(("Quit" + name).c_str(), "quit", @selector(quit), "q"));
+
+	[NSApp setServicesMenu: Menu_get_nssubmenu(services)];
+	if ([NSApp respondsToSelector: @selector(setAppleMenu:)])
+		[NSApp performSelector: @selector(setAppleMenu:) withObject: Menu_get_nssubmenu(app)];
+
+	return app;
+}
+
+static Reflex::Menu::Ref
+create_window_menu ()
+{
+	Reflex::Menu::Ref win = create_menu("Window", "window");
+
+	win->add_child(create_menu("Minimize", "minimize", @selector(performMiniaturize:), "m"));
+	win->add_child(create_menu("Zoom", "zoom", @selector(performZoom:)));
+	win->add_child(create_sep());
+	win->add_child(create_menu(
+		"Bring All to Front", "bring_all_to_front", @selector(arrangeInFront:)));
+
+	[NSApp setWindowsMenu: Menu_get_nssubmenu(win)];
+
+	return win;
+}
 
 
 @implementation ReflexAppDelegate
@@ -105,7 +173,12 @@
 
 	- (void) applicationWillFinishLaunching: (NSNotification*) notification
 	{
-		[self setupMenu];
+		if (!application || [NSApp mainMenu]) return;
+
+		Reflex::Menu::Ref menu = new Reflex::Menu();
+		menu->add_child(create_application_menu(application));
+		menu->add_child(create_window_menu());
+		application->set_menu(menu);
 	}
 
 	- (void) applicationDidFinishLaunching: (NSNotification*) notification
@@ -138,128 +211,4 @@
 		[self unbind];
 	}
 
-	- (BOOL) setupApplicationMenu: (NSMenu*) parent
-	{
-		if (!application || !parent) return NO;
-
-		NSMenu* menu = [[[NSMenu alloc]
-			initWithTitle: @"Application"]
-			autorelease];
-		if ([NSApp respondsToSelector: @selector(setAppleMenu:)])
-			[NSApp performSelector: @selector(setAppleMenu:) withObject: menu];
-
-		NSString* name = !application->self->name.empty() ?
-			[NSString stringWithUTF8String: application->self->name.c_str()] : @"";
-		if ([name length] > 0)
-			name = [@" " stringByAppendingString: name];
-
-		NSMenu* submenu = nil;
-		NSMenuItem* item = nil;
-
-		[menu
-			addItemWithTitle: [@"About" stringByAppendingString: name]
-			action: @selector(showAbout)
-			keyEquivalent: @""];
-
-		[menu addItem: [NSMenuItem separatorItem]];
-
-		[menu
-			addItemWithTitle: @"Preferences"
-			action: @selector(showPreference)
-			keyEquivalent: @","];
-
-		[menu addItem: [NSMenuItem separatorItem]];
-
-		item = [menu
-			addItemWithTitle: @"Services"
-			action: nil
-			keyEquivalent: @""];
-		submenu = [[[NSMenu alloc] initWithTitle: @"Services"] autorelease];
-		[item setSubmenu: submenu];
-		[NSApp setServicesMenu: submenu];
-
-		[menu addItem: [NSMenuItem separatorItem]];
-
-		[menu
-			addItemWithTitle: [@"Hide" stringByAppendingString: name]
-			action: @selector(hide:)
-			keyEquivalent: @"h"];
-
-		item = [menu
-			addItemWithTitle: @"Hide Others"
-			action: @selector(hideOtherApplications:)
-			keyEquivalent: @"h"];
-		[item setKeyEquivalentModifierMask: NSAlternateKeyMask | NSCommandKeyMask];
-
-		[menu
-			addItemWithTitle: @"ShowAll"
-			action: @selector(unhideAllApplications:)
-			keyEquivalent: @""];
-
-		[menu addItem: [NSMenuItem separatorItem]];
-
-		[menu
-			addItemWithTitle: [@"Quit" stringByAppendingString: name]
-			action: @selector(quit)
-			keyEquivalent: @"q"];
-
-		item =
-			[parent addItemWithTitle: @"Application" action: nil keyEquivalent: @""];
-		[parent setSubmenu: menu forItem: item];
-
-		return YES;
-	}
-
-	- (BOOL) setupWindowMenu: (NSMenu*) parent
-	{
-		if (!parent) return NO;
-
-		NSMenu* menu = [[[NSMenu alloc]
-			initWithTitle: @"Window"]
-			autorelease];
-
-		[menu
-			addItemWithTitle: @"Minimize"
-			action: @selector(performMiniaturize:)
-			keyEquivalent: @"m"];
-
-		[menu
-			addItemWithTitle: @"Zoom"
-			action: @selector(performZoom:)
-			keyEquivalent: @""];
-
-		[menu addItem: [NSMenuItem separatorItem]];
-
-		[menu
-			addItemWithTitle: @"Bring All to Front"
-			action: @selector(arrangeInFront:)
-			keyEquivalent: @""];
-
-		NSMenuItem* item =
-			[parent addItemWithTitle: @"Window" action: nil keyEquivalent: @""];
-		[parent setSubmenu: menu forItem: item];
-
-		[NSApp setWindowsMenu: menu];
-
-		return YES;
-	}
-
-	- (BOOL) setupMenu
-	{
-		if ([NSApp mainMenu]) return NO;
-
-		NSMenu* menu = [[[NSMenu alloc] initWithTitle: @"MainMenu"] autorelease];
-
-		if (
-			![self setupApplicationMenu: menu] ||
-			![self setupWindowMenu: menu])
-		{
-			return NO;
-		}
-
-		[NSApp setMainMenu: menu];
-
-		return YES;
-	}
-
 @end// ReflexAppDelegate

data/src/osx/application.mm

@@ -5,6 +5,9 @@
 #import <AppKit/NSApplication.h>
 #include "reflex/exception.h"
 #include "reflex/debug.h"
+#include "menu.h"
+#include "window.h"
+#import "native_window.h"
 #import "app_delegate.h"
 
 
@@ -33,6 +36,19 @@ namespace Reflex
 		return Application_get_data(const_cast<Application*>(app));
 	}
 
+	void
+	Application_set_menu (Application* app, Menu* menu)
+	{
+		for (auto it = app->window_begin(), end = app->window_end(); it != end; ++it)
+		{
+			Window* win = it->get();
+			if (win->menu() && Window_get_data(win).native.isMainWindow)
+				return;
+		}
+
+		Menu_apply_to_main_menu(menu);
+	}
+
 
 	ApplicationData::ApplicationData ()
 	:	delegate(nil)

data/src/osx/clipboard.mm

@@ -0,0 +1,45 @@
+// -*- objc -*-
+#include "reflex/clipboard.h"
+
+
+#import <AppKit/NSPasteboard.h>
+#include "reflex/exception.h"
+
+
+namespace Reflex
+{
+
+
+	void
+	set_clipboard (const Clipboard& clipboard)
+	{
+		const char* text = clipboard.text();
+		NSString* nstext = nil;
+		if (text)
+		{
+			nstext = [NSString stringWithUTF8String: text];
+			if (!nstext)
+				argument_error(__FILE__, __LINE__);
+		}
+
+		NSPasteboard* pasteboard = NSPasteboard.generalPasteboard;
+		[pasteboard clearContents];
+
+		if (nstext)
+			[pasteboard setString: nstext forType: NSPasteboardTypeString];
+	}
+
+	Clipboard
+	get_clipboard ()
+	{
+		Clipboard clipboard;
+
+		NSString* nstext = [NSPasteboard.generalPasteboard stringForType: NSPasteboardTypeString];
+		const char* text = nstext ? nstext.UTF8String : NULL;
+		if (text) clipboard.set_text(text);
+
+		return clipboard;
+	}
+
+
+}// Reflex