mirror of https://github.com/GNOME/gimp.git
First version of global menubar support for OSX. Work in progress.
2007-08-30 Michael Natterer <mitch@gimp.org> First version of global menubar support for OSX. Work in progress. * app/gui/Makefile.am * app/gui/sync-menu.[ch]: new files containing code that takes a GtkMenuShell and proxies it in the OSX global menubar. Taken from http://developer.imendio.com/projects/gtk-macosx/menubar * app/gui/gui.c: put the global image popup menu to the menubar. * app/dialogs/preferences-dialog.c * app/display/gimpdisplayshell.c * app/widgets/gimptoolbox.c: #ifdef out all menubars in windows. * app/Makefile.am (AM_LDFLAGS): add $(CARBON_LDFLAGS) svn path=/trunk/; revision=23408
This commit is contained in:
Michael Natterer
Michael Natterer
parent
558bdfc4ed
commit
3736ea8284
17
ChangeLog
17
ChangeLog
|
|
@ -1,3 +1,20 @@
|
|||
2007-08-30 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
First version of global menubar support for OSX. Work in progress.
|
||||
|
||||
* app/gui/Makefile.am
|
||||
* app/gui/sync-menu.[ch]: new files containing code that takes
|
||||
a GtkMenuShell and proxies it in the OSX global menubar. Taken
|
||||
from http://developer.imendio.com/projects/gtk-macosx/menubar
|
||||
|
||||
* app/gui/gui.c: put the global image popup menu to the menubar.
|
||||
|
||||
* app/dialogs/preferences-dialog.c
|
||||
* app/display/gimpdisplayshell.c
|
||||
* app/widgets/gimptoolbox.c: #ifdef out all menubars in windows.
|
||||
|
||||
* app/Makefile.am (AM_LDFLAGS): add $(CARBON_LDFLAGS)
|
||||
|
||||
2007-08-30 Jakub Friedl <jfriedl@suse.cz>
|
||||
|
||||
* plug-ins/common/scatter_hsv.c: Randomizing hue of desaturated
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@ INCLUDES = \
|
|||
-I$(includedir)
|
||||
|
||||
AM_LDFLAGS = $(mwindows) $(munix) \
|
||||
$(CARBON_LDFLAGS) \
|
||||
-u $(SYMPREFIX)xcf_init \
|
||||
-u $(SYMPREFIX)internal_procs_init \
|
||||
-u $(SYMPREFIX)gimp_coords_mix \
|
||||
|
|
|
|||
|
|
@ -1298,9 +1298,11 @@ prefs_display_options_frame_add (Gimp *gimp,
|
|||
gtk_box_pack_start (GTK_BOX (hbox), checks_vbox, TRUE, TRUE, 0);
|
||||
gtk_widget_show (checks_vbox);
|
||||
|
||||
#ifndef HAVE_CARBON
|
||||
prefs_check_button_add (object, "show-menubar",
|
||||
_("Show _menubar"),
|
||||
GTK_BOX (checks_vbox));
|
||||
#endif /* !HAVE_CARBON */
|
||||
prefs_check_button_add (object, "show-rulers",
|
||||
_("Show _rulers"),
|
||||
GTK_BOX (checks_vbox));
|
||||
|
|
|
|||
|
|
@ -796,9 +796,11 @@ gimp_display_shell_new (GimpDisplay *display,
|
|||
main_vbox = gtk_vbox_new (FALSE, 1);
|
||||
gtk_container_add (GTK_CONTAINER (shell), main_vbox);
|
||||
|
||||
#ifndef HAVE_CARBON
|
||||
shell->menubar =
|
||||
gtk_ui_manager_get_widget (GTK_UI_MANAGER (shell->menubar_manager),
|
||||
"/image-menubar");
|
||||
#endif /* !HAVE_CARBON */
|
||||
|
||||
if (shell->menubar)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -29,6 +29,8 @@ libappgui_a_SOURCES = \
|
|||
splash.c \
|
||||
splash.h \
|
||||
themes.c \
|
||||
themes.h
|
||||
themes.h \
|
||||
sync-menu.c \
|
||||
sync-menu.h
|
||||
|
||||
EXTRA_DIST = makefile.msc
|
||||
|
|
|
|||
|
|
@ -84,6 +84,9 @@
|
|||
#include "session.h"
|
||||
#include "splash.h"
|
||||
#include "themes.h"
|
||||
#ifdef HAVE_CARBON
|
||||
#include "sync-menu.h"
|
||||
#endif /* HAVE_CARBON */
|
||||
|
||||
#include "gimp-intl.h"
|
||||
|
||||
|
|
@ -457,6 +460,21 @@ gui_restore_after_callback (Gimp *gimp,
|
|||
"<Image>",
|
||||
gimp,
|
||||
gui_config->tearoff_menus);
|
||||
gimp_ui_manager_update (image_ui_manager, NULL);
|
||||
|
||||
#ifdef HAVE_CARBON
|
||||
{
|
||||
GtkWidget *menu;
|
||||
|
||||
menu = gtk_ui_manager_get_widget (image_ui_manager,
|
||||
"/dummy-menubar/image-popup");
|
||||
|
||||
if (GTK_IS_MENU_ITEM (menu))
|
||||
menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
|
||||
|
||||
sync_menu_takeover_menu (GTK_MENU_SHELL (menu));
|
||||
}
|
||||
#endif /* HAVE_CARBON */
|
||||
|
||||
g_signal_connect_object (gui_config, "notify::tearoff-menus",
|
||||
G_CALLBACK (gui_tearoff_menus_notify),
|
||||
|
|
|
|||
|
|
@ -0,0 +1,711 @@
|
|||
/* GTK+ Integration for the Mac OS X Menubar.
|
||||
*
|
||||
* Copyright (C) 2007 Pioneer Research Center USA, Inc.
|
||||
*
|
||||
* For further information, see:
|
||||
* http://developer.imendio.com/projects/gtk-macosx/menubar
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#ifdef HAVE_CARBON
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
|
||||
#include <Carbon/Carbon.h>
|
||||
|
||||
#include "sync-menu.h"
|
||||
|
||||
|
||||
/* TODO
|
||||
*
|
||||
* - Setup shortcuts, possibly transforming ctrl->cmd
|
||||
* - Sync menus
|
||||
* - Create on demand? (can this be done with gtk+? ie fill in menu items when the menu is opened)
|
||||
* - Figure out what to do per app/window...
|
||||
* - Toggle/radio items
|
||||
*
|
||||
*/
|
||||
|
||||
#define GTK_QUARTZ_MENU_CREATOR 'GTKC'
|
||||
#define GTK_QUARTZ_ITEM_WIDGET 'GWID'
|
||||
|
||||
|
||||
static void sync_menu_shell (GtkMenuShell *menu_shell,
|
||||
MenuRef carbon_menu,
|
||||
gboolean toplevel);
|
||||
|
||||
|
||||
/*
|
||||
* utility functions
|
||||
*/
|
||||
|
||||
static GtkWidget *
|
||||
find_menu_label (GtkWidget *widget)
|
||||
{
|
||||
GtkWidget *label = NULL;
|
||||
|
||||
if (GTK_IS_LABEL (widget))
|
||||
return widget;
|
||||
|
||||
if (GTK_IS_CONTAINER (widget))
|
||||
{
|
||||
GList *children;
|
||||
GList *l;
|
||||
|
||||
children = gtk_container_get_children (GTK_CONTAINER (widget));
|
||||
|
||||
for (l = children; l; l = l->next)
|
||||
{
|
||||
label = find_menu_label (l->data);
|
||||
if (label)
|
||||
break;
|
||||
}
|
||||
|
||||
g_list_free (children);
|
||||
}
|
||||
|
||||
return label;
|
||||
}
|
||||
|
||||
static const gchar *
|
||||
get_menu_label_text (GtkWidget *menu_item,
|
||||
GtkWidget **label)
|
||||
{
|
||||
*label = find_menu_label (menu_item);
|
||||
if (!*label)
|
||||
return NULL;
|
||||
|
||||
return gtk_label_get_text (GTK_LABEL (*label));
|
||||
}
|
||||
|
||||
static gboolean
|
||||
accel_find_func (GtkAccelKey *key,
|
||||
GClosure *closure,
|
||||
gpointer data)
|
||||
{
|
||||
return (GClosure *) data == closure;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* CarbonMenu functions
|
||||
*/
|
||||
|
||||
typedef struct
|
||||
{
|
||||
MenuRef menu;
|
||||
} CarbonMenu;
|
||||
|
||||
static GQuark carbon_menu_quark = 0;
|
||||
|
||||
static CarbonMenu *
|
||||
carbon_menu_new (void)
|
||||
{
|
||||
return g_slice_new0 (CarbonMenu);
|
||||
}
|
||||
|
||||
static void
|
||||
carbon_menu_free (CarbonMenu *menu)
|
||||
{
|
||||
g_slice_free (CarbonMenu, menu);
|
||||
}
|
||||
|
||||
static CarbonMenu *
|
||||
carbon_menu_get (GtkWidget *widget)
|
||||
{
|
||||
return g_object_get_qdata (G_OBJECT (widget), carbon_menu_quark);
|
||||
}
|
||||
|
||||
static void
|
||||
carbon_menu_connect (GtkWidget *menu,
|
||||
MenuRef menuRef)
|
||||
{
|
||||
CarbonMenu *carbon_menu = carbon_menu_get (menu);
|
||||
|
||||
if (!carbon_menu)
|
||||
{
|
||||
carbon_menu = carbon_menu_new ();
|
||||
|
||||
g_object_set_qdata_full (G_OBJECT (menu), carbon_menu_quark,
|
||||
carbon_menu,
|
||||
(GDestroyNotify) carbon_menu_free);
|
||||
}
|
||||
|
||||
carbon_menu->menu = menuRef;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* CarbonMenuItem functions
|
||||
*/
|
||||
|
||||
typedef struct
|
||||
{
|
||||
MenuRef menu;
|
||||
MenuItemIndex index;
|
||||
MenuRef submenu;
|
||||
GClosure *accel_closure;
|
||||
} CarbonMenuItem;
|
||||
|
||||
static GQuark carbon_menu_item_quark = 0;
|
||||
|
||||
static CarbonMenuItem *
|
||||
carbon_menu_item_new (void)
|
||||
{
|
||||
return g_slice_new0 (CarbonMenuItem);
|
||||
}
|
||||
|
||||
static void
|
||||
carbon_menu_item_free (CarbonMenuItem *menu_item)
|
||||
{
|
||||
if (menu_item->accel_closure)
|
||||
g_closure_unref (menu_item->accel_closure);
|
||||
|
||||
g_slice_free (CarbonMenuItem, menu_item);
|
||||
}
|
||||
|
||||
static CarbonMenuItem *
|
||||
carbon_menu_item_get (GtkWidget *widget)
|
||||
{
|
||||
return g_object_get_qdata (G_OBJECT (widget), carbon_menu_item_quark);
|
||||
}
|
||||
|
||||
static void
|
||||
carbon_menu_item_update_state (CarbonMenuItem *carbon_item,
|
||||
GtkWidget *widget)
|
||||
{
|
||||
gboolean sensitive;
|
||||
gboolean visible;
|
||||
UInt32 set_attrs = 0;
|
||||
UInt32 clear_attrs = 0;
|
||||
|
||||
g_object_get (widget,
|
||||
"sensitive", &sensitive,
|
||||
"visible", &visible,
|
||||
NULL);
|
||||
|
||||
if (!sensitive)
|
||||
set_attrs |= kMenuItemAttrDisabled;
|
||||
else
|
||||
clear_attrs |= kMenuItemAttrDisabled;
|
||||
|
||||
if (!visible)
|
||||
set_attrs |= kMenuItemAttrHidden;
|
||||
else
|
||||
clear_attrs |= kMenuItemAttrHidden;
|
||||
|
||||
ChangeMenuItemAttributes (carbon_item->menu, carbon_item->index,
|
||||
set_attrs, clear_attrs);
|
||||
}
|
||||
|
||||
static void
|
||||
carbon_menu_item_update_active (CarbonMenuItem *carbon_item,
|
||||
GtkWidget *widget)
|
||||
{
|
||||
gboolean active;
|
||||
|
||||
g_object_get (widget,
|
||||
"active", &active,
|
||||
NULL);
|
||||
|
||||
CheckMenuItem (carbon_item->menu, carbon_item->index,
|
||||
active);
|
||||
}
|
||||
|
||||
static void
|
||||
carbon_menu_item_update_submenu (CarbonMenuItem *carbon_item,
|
||||
GtkWidget *widget)
|
||||
{
|
||||
GtkWidget *submenu;
|
||||
|
||||
submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (widget));
|
||||
|
||||
if (submenu)
|
||||
{
|
||||
GtkWidget *label = NULL;
|
||||
const gchar *label_text;
|
||||
CFStringRef cfstr = NULL;
|
||||
|
||||
label_text = get_menu_label_text (widget, &label);
|
||||
if (label_text)
|
||||
cfstr = CFStringCreateWithCString (NULL, label_text,
|
||||
kCFStringEncodingUTF8);
|
||||
|
||||
CreateNewMenu (0, 0, &carbon_item->submenu);
|
||||
SetMenuTitleWithCFString (carbon_item->submenu, cfstr);
|
||||
SetMenuItemHierarchicalMenu (carbon_item->menu, carbon_item->index,
|
||||
carbon_item->submenu);
|
||||
|
||||
sync_menu_shell (GTK_MENU_SHELL (submenu), carbon_item->submenu, FALSE);
|
||||
|
||||
if (cfstr)
|
||||
CFRelease (cfstr);
|
||||
}
|
||||
else
|
||||
{
|
||||
SetMenuItemHierarchicalMenu (carbon_item->menu, carbon_item->index,
|
||||
NULL);
|
||||
carbon_item->submenu = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
carbon_menu_item_update_label (CarbonMenuItem *carbon_item,
|
||||
GtkWidget *widget)
|
||||
{
|
||||
GtkWidget *label;
|
||||
const gchar *label_text;
|
||||
CFStringRef cfstr = NULL;
|
||||
|
||||
label_text = get_menu_label_text (widget, &label);
|
||||
if (label_text)
|
||||
cfstr = CFStringCreateWithCString (NULL, label_text,
|
||||
kCFStringEncodingUTF8);
|
||||
|
||||
SetMenuItemTextWithCFString (carbon_item->menu, carbon_item->index,
|
||||
cfstr);
|
||||
|
||||
if (cfstr)
|
||||
CFRelease (cfstr);
|
||||
}
|
||||
|
||||
static void
|
||||
carbon_menu_item_update_accelerator (CarbonMenuItem *carbon_item,
|
||||
GtkWidget *widget)
|
||||
{
|
||||
GtkWidget *label;
|
||||
|
||||
get_menu_label_text (widget, &label);
|
||||
|
||||
if (GTK_IS_ACCEL_LABEL (label) &&
|
||||
GTK_ACCEL_LABEL (label)->accel_closure)
|
||||
{
|
||||
GtkAccelKey *key;
|
||||
|
||||
key = gtk_accel_group_find (GTK_ACCEL_LABEL (label)->accel_group,
|
||||
accel_find_func,
|
||||
GTK_ACCEL_LABEL (label)->accel_closure);
|
||||
|
||||
if (key &&
|
||||
key->accel_key &&
|
||||
key->accel_flags & GTK_ACCEL_VISIBLE)
|
||||
{
|
||||
GdkDisplay *display = gtk_widget_get_display (widget);
|
||||
GdkKeymap *keymap = gdk_keymap_get_for_display (display);
|
||||
GdkKeymapKey *keys;
|
||||
gint n_keys;
|
||||
|
||||
if (gdk_keymap_get_entries_for_keyval (keymap, key->accel_key,
|
||||
&keys, &n_keys))
|
||||
{
|
||||
UInt8 modifiers = 0;
|
||||
|
||||
SetMenuItemCommandKey (carbon_item->menu, carbon_item->index,
|
||||
true, keys[0].keycode);
|
||||
|
||||
g_free (keys);
|
||||
|
||||
if (key->accel_mods)
|
||||
{
|
||||
if (key->accel_mods & GDK_SHIFT_MASK)
|
||||
modifiers |= kMenuShiftModifier;
|
||||
|
||||
if (key->accel_mods & GDK_MOD1_MASK)
|
||||
modifiers |= kMenuOptionModifier;
|
||||
}
|
||||
|
||||
if (!(key->accel_mods & GDK_CONTROL_MASK))
|
||||
{
|
||||
modifiers |= kMenuNoCommandModifier;
|
||||
}
|
||||
|
||||
SetMenuItemModifiers (carbon_item->menu, carbon_item->index,
|
||||
modifiers);
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* otherwise, clear the menu shortcut */
|
||||
SetMenuItemModifiers (carbon_item->menu, carbon_item->index,
|
||||
kMenuNoModifiers | kMenuNoCommandModifier);
|
||||
ChangeMenuItemAttributes (carbon_item->menu, carbon_item->index,
|
||||
0, kMenuItemAttrUseVirtualKey);
|
||||
SetMenuItemCommandKey (carbon_item->menu, carbon_item->index,
|
||||
false, 0);
|
||||
}
|
||||
|
||||
static void
|
||||
carbon_menu_item_accel_changed (GtkAccelGroup *accel_group,
|
||||
guint keyval,
|
||||
GdkModifierType modifier,
|
||||
GClosure *accel_closure,
|
||||
GtkWidget *widget)
|
||||
{
|
||||
CarbonMenuItem *carbon_item = carbon_menu_item_get (widget);
|
||||
GtkWidget *label;
|
||||
|
||||
get_menu_label_text (widget, &label);
|
||||
|
||||
if (GTK_IS_ACCEL_LABEL (label) &&
|
||||
GTK_ACCEL_LABEL (label)->accel_closure == accel_closure)
|
||||
carbon_menu_item_update_accelerator (carbon_item, widget);
|
||||
}
|
||||
|
||||
static void
|
||||
carbon_menu_item_update_accel_closure (CarbonMenuItem *carbon_item,
|
||||
GtkWidget *widget)
|
||||
{
|
||||
GtkAccelGroup *group;
|
||||
GtkWidget *label;
|
||||
|
||||
get_menu_label_text (widget, &label);
|
||||
|
||||
if (carbon_item->accel_closure)
|
||||
{
|
||||
group = gtk_accel_group_from_accel_closure (carbon_item->accel_closure);
|
||||
|
||||
g_signal_handlers_disconnect_by_func (group,
|
||||
carbon_menu_item_accel_changed,
|
||||
widget);
|
||||
|
||||
g_closure_unref (carbon_item->accel_closure);
|
||||
carbon_item->accel_closure = NULL;
|
||||
}
|
||||
|
||||
if (GTK_IS_ACCEL_LABEL (label))
|
||||
carbon_item->accel_closure = GTK_ACCEL_LABEL (label)->accel_closure;
|
||||
|
||||
if (carbon_item->accel_closure)
|
||||
{
|
||||
g_closure_ref (carbon_item->accel_closure);
|
||||
|
||||
group = gtk_accel_group_from_accel_closure (carbon_item->accel_closure);
|
||||
|
||||
g_signal_connect_object (group, "accel-changed",
|
||||
G_CALLBACK (carbon_menu_item_accel_changed),
|
||||
widget, 0);
|
||||
}
|
||||
|
||||
carbon_menu_item_update_accelerator (carbon_item, widget);
|
||||
}
|
||||
|
||||
static void
|
||||
carbon_menu_item_notify (GObject *object,
|
||||
GParamSpec *pspec,
|
||||
CarbonMenuItem *carbon_item)
|
||||
{
|
||||
if (!strcmp (pspec->name, "sensitive") ||
|
||||
!strcmp (pspec->name, "visible"))
|
||||
{
|
||||
carbon_menu_item_update_state (carbon_item, GTK_WIDGET (object));
|
||||
}
|
||||
else if (!strcmp (pspec->name, "active"))
|
||||
{
|
||||
carbon_menu_item_update_active (carbon_item, GTK_WIDGET (object));
|
||||
}
|
||||
else if (!strcmp (pspec->name, "submenu"))
|
||||
{
|
||||
carbon_menu_item_update_submenu (carbon_item, GTK_WIDGET (object));
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
carbon_menu_item_notify_label (GObject *object,
|
||||
GParamSpec *pspec,
|
||||
gpointer data)
|
||||
{
|
||||
CarbonMenuItem *carbon_item = carbon_menu_item_get (GTK_WIDGET (object));
|
||||
|
||||
if (!strcmp (pspec->name, "label"))
|
||||
{
|
||||
carbon_menu_item_update_label (carbon_item,
|
||||
GTK_WIDGET (object));
|
||||
}
|
||||
else if (!strcmp (pspec->name, "accel-closure"))
|
||||
{
|
||||
carbon_menu_item_update_accel_closure (carbon_item,
|
||||
GTK_WIDGET (object));
|
||||
}
|
||||
}
|
||||
|
||||
static CarbonMenuItem *
|
||||
carbon_menu_item_connect (GtkWidget *menu_item,
|
||||
GtkWidget *label,
|
||||
MenuRef menu,
|
||||
MenuItemIndex index)
|
||||
{
|
||||
CarbonMenuItem *carbon_item = carbon_menu_item_get (menu_item);
|
||||
|
||||
if (!carbon_item)
|
||||
{
|
||||
carbon_item = carbon_menu_item_new ();
|
||||
|
||||
g_object_set_qdata_full (G_OBJECT (menu_item), carbon_menu_item_quark,
|
||||
carbon_item,
|
||||
(GDestroyNotify) carbon_menu_item_free);
|
||||
|
||||
g_signal_connect (menu_item, "notify",
|
||||
G_CALLBACK (carbon_menu_item_notify),
|
||||
carbon_item);
|
||||
|
||||
if (label)
|
||||
g_signal_connect_swapped (label, "notify::label",
|
||||
G_CALLBACK (carbon_menu_item_notify_label),
|
||||
menu_item);
|
||||
}
|
||||
|
||||
carbon_item->menu = menu;
|
||||
carbon_item->index = index;
|
||||
|
||||
return carbon_item;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* carbon event handler
|
||||
*/
|
||||
|
||||
static OSStatus
|
||||
menu_event_handler_func (EventHandlerCallRef event_handler_call_ref,
|
||||
EventRef event_ref,
|
||||
void *data)
|
||||
{
|
||||
UInt32 event_class = GetEventClass (event_ref);
|
||||
UInt32 event_kind = GetEventKind (event_ref);
|
||||
MenuRef menu_ref;
|
||||
|
||||
switch (event_class)
|
||||
{
|
||||
case kEventClassCommand:
|
||||
/* This is called when activating (is that the right GTK+ term?)
|
||||
* a menu item.
|
||||
*/
|
||||
if (event_kind == kEventCommandProcess)
|
||||
{
|
||||
HICommand command;
|
||||
OSStatus err;
|
||||
|
||||
//g_print ("Menu: kEventClassCommand/kEventCommandProcess\n");
|
||||
|
||||
err = GetEventParameter (event_ref, kEventParamDirectObject,
|
||||
typeHICommand, 0,
|
||||
sizeof (command), 0, &command);
|
||||
|
||||
if (err == noErr)
|
||||
{
|
||||
GtkWidget *widget = NULL;
|
||||
|
||||
if (command.commandID == kHICommandQuit)
|
||||
{
|
||||
gtk_main_quit (); /* Just testing... */
|
||||
return noErr;
|
||||
}
|
||||
|
||||
/* Get any GtkWidget associated with the item. */
|
||||
err = GetMenuItemProperty (command.menu.menuRef,
|
||||
command.menu.menuItemIndex,
|
||||
GTK_QUARTZ_MENU_CREATOR,
|
||||
GTK_QUARTZ_ITEM_WIDGET,
|
||||
sizeof (widget), 0, &widget);
|
||||
if (err == noErr && widget)
|
||||
{
|
||||
gtk_menu_item_activate (GTK_MENU_ITEM (widget));
|
||||
return noErr;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case kEventClassMenu:
|
||||
GetEventParameter (event_ref,
|
||||
kEventParamDirectObject,
|
||||
typeMenuRef,
|
||||
NULL,
|
||||
sizeof (menu_ref),
|
||||
NULL,
|
||||
&menu_ref);
|
||||
|
||||
switch (event_kind)
|
||||
{
|
||||
case kEventMenuTargetItem:
|
||||
/* This is called when an item is selected (what is the
|
||||
* GTK+ term? prelight?)
|
||||
*/
|
||||
//g_print ("kEventClassMenu/kEventMenuTargetItem\n");
|
||||
break;
|
||||
|
||||
case kEventMenuOpening:
|
||||
/* Is it possible to dynamically build the menu here? We
|
||||
* can at least set visibility/sensitivity.
|
||||
*/
|
||||
//g_print ("kEventClassMenu/kEventMenuOpening\n");
|
||||
break;
|
||||
|
||||
case kEventMenuClosed:
|
||||
//g_print ("kEventClassMenu/kEventMenuClosed\n");
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return CallNextEventHandler (event_handler_call_ref, event_ref);
|
||||
}
|
||||
|
||||
static void
|
||||
setup_menu_event_handler (void)
|
||||
{
|
||||
EventHandlerUPP menu_event_handler_upp;
|
||||
EventHandlerRef menu_event_handler_ref;
|
||||
const EventTypeSpec menu_events[] = {
|
||||
{ kEventClassCommand, kEventCommandProcess },
|
||||
{ kEventClassMenu, kEventMenuTargetItem },
|
||||
{ kEventClassMenu, kEventMenuOpening },
|
||||
{ kEventClassMenu, kEventMenuClosed }
|
||||
};
|
||||
|
||||
/* FIXME: We might have to install one per window? */
|
||||
|
||||
menu_event_handler_upp = NewEventHandlerUPP (menu_event_handler_func);
|
||||
InstallEventHandler (GetApplicationEventTarget (), menu_event_handler_upp,
|
||||
GetEventTypeCount (menu_events), menu_events, 0,
|
||||
&menu_event_handler_ref);
|
||||
|
||||
#if 0
|
||||
/* FIXME: Remove the handler with: */
|
||||
RemoveEventHandler(menu_event_handler_ref);
|
||||
DisposeEventHandlerUPP(menu_event_handler_upp);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
sync_menu_shell (GtkMenuShell *menu_shell,
|
||||
MenuRef carbon_menu,
|
||||
gboolean toplevel)
|
||||
{
|
||||
GList *children;
|
||||
GList *l;
|
||||
MenuItemIndex carbon_index = 1;
|
||||
|
||||
carbon_menu_connect (GTK_WIDGET (menu_shell), carbon_menu);
|
||||
|
||||
children = gtk_container_get_children (GTK_CONTAINER (menu_shell));
|
||||
|
||||
for (l = children; l; l = l->next)
|
||||
{
|
||||
GtkWidget *menu_item = l->data;
|
||||
CarbonMenuItem *carbon_item;
|
||||
|
||||
if (GTK_IS_TEAROFF_MENU_ITEM (menu_item))
|
||||
continue;
|
||||
|
||||
if (toplevel && g_object_get_data (G_OBJECT (menu_item), "gtk-empty-menu-item"))
|
||||
continue;
|
||||
|
||||
carbon_item = carbon_menu_item_get (menu_item);
|
||||
|
||||
if (carbon_item && carbon_item->index != carbon_index)
|
||||
{
|
||||
DeleteMenuItem (carbon_item->menu,
|
||||
carbon_item->index);
|
||||
carbon_item = NULL;
|
||||
}
|
||||
|
||||
if (!carbon_item)
|
||||
{
|
||||
GtkWidget *label = NULL;
|
||||
const gchar *label_text;
|
||||
CFStringRef cfstr = NULL;
|
||||
MenuItemAttributes attributes = 0;
|
||||
|
||||
label_text = get_menu_label_text (menu_item, &label);
|
||||
if (label_text)
|
||||
cfstr = CFStringCreateWithCString (NULL, label_text,
|
||||
kCFStringEncodingUTF8);
|
||||
|
||||
if (GTK_IS_SEPARATOR_MENU_ITEM (menu_item))
|
||||
attributes |= kMenuItemAttrSeparator;
|
||||
|
||||
if (!GTK_WIDGET_IS_SENSITIVE (menu_item))
|
||||
attributes |= kMenuItemAttrDisabled;
|
||||
|
||||
if (!GTK_WIDGET_VISIBLE (menu_item))
|
||||
attributes |= kMenuItemAttrHidden;
|
||||
|
||||
InsertMenuItemTextWithCFString (carbon_menu, cfstr,
|
||||
carbon_index,
|
||||
attributes, 0);
|
||||
SetMenuItemProperty (carbon_menu, carbon_index,
|
||||
GTK_QUARTZ_MENU_CREATOR,
|
||||
GTK_QUARTZ_ITEM_WIDGET,
|
||||
sizeof (menu_item), &menu_item);
|
||||
|
||||
if (cfstr)
|
||||
CFRelease (cfstr);
|
||||
|
||||
carbon_item = carbon_menu_item_connect (menu_item, label,
|
||||
carbon_menu,
|
||||
carbon_index);
|
||||
|
||||
if (GTK_IS_CHECK_MENU_ITEM (menu_item))
|
||||
carbon_menu_item_update_active (carbon_item, menu_item);
|
||||
|
||||
carbon_menu_item_update_accel_closure (carbon_item, menu_item);
|
||||
|
||||
if (gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu_item)))
|
||||
carbon_menu_item_update_submenu (carbon_item, menu_item);
|
||||
}
|
||||
|
||||
carbon_index++;
|
||||
}
|
||||
|
||||
g_list_free (children);
|
||||
}
|
||||
|
||||
void
|
||||
sync_menu_takeover_menu (GtkMenuShell *menu_shell)
|
||||
{
|
||||
MenuRef carbon_menubar;
|
||||
|
||||
g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell));
|
||||
|
||||
if (carbon_menu_quark == 0)
|
||||
carbon_menu_quark = g_quark_from_static_string ("CarbonMenu");
|
||||
|
||||
if (carbon_menu_item_quark == 0)
|
||||
carbon_menu_item_quark = g_quark_from_static_string ("CarbonMenuItem");
|
||||
|
||||
CreateNewMenu (0 /*id*/, 0 /*options*/, &carbon_menubar);
|
||||
SetRootMenu (carbon_menubar);
|
||||
|
||||
setup_menu_event_handler ();
|
||||
|
||||
sync_menu_shell (menu_shell, carbon_menubar, TRUE);
|
||||
}
|
||||
|
||||
#endif /* HAVE_CARBON */
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
/* GTK+ Integration for the Mac OS X Menubar.
|
||||
*
|
||||
* Copyright (C) 2007 Pioneer Research Center USA, Inc.
|
||||
*
|
||||
* For further information, see:
|
||||
* http://developer.imendio.com/projects/gtk-macosx/menubar
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef __SYNC_MENU_H__
|
||||
#define __SYNC_MENU_H__
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
void sync_menu_takeover_menu (GtkMenuShell *menu_shell);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __SYNC_MENU_H__ */
|
||||
|
|
@ -202,7 +202,9 @@ gimp_toolbox_constructor (GType type,
|
|||
|
||||
manager = GTK_UI_MANAGER (GIMP_IMAGE_DOCK (toolbox)->ui_manager);
|
||||
|
||||
#ifndef HAVE_CARBON
|
||||
toolbox->menu_bar = gtk_ui_manager_get_widget (manager, "/toolbox-menubar");
|
||||
#endif /* !HAVE_CARBON */
|
||||
|
||||
if (toolbox->menu_bar)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue