nyje/medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use ige-mac-integration for dock

Browse Source
This commit is contained in:
Yevgen Muntyan 2008-05-06 15:06:47 -05:00
parent 85228b67e8
commit 6caf04508d
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
m4/moo-flags.m4
View File

@ -44,6 +44,12 @@ AC_DEFUN_ONCE([MOO_AC_FLAGS],[
]) ])
AC_MSG_RESULT([$_moo_ac_have_carbon]) AC_MSG_RESULT([$_moo_ac_have_carbon])
if "$GDK_QUARTZ"; then
PKG_CHECK_MODULES(IGE_MAC,ige-mac-integration)
GTK_CFLAGS="$IGE_MAC_CFLAGS"
GTK_LIBS="$IGE_MAC_LIBS"
fi
AC_CHECK_LIB(Xrender, XRenderFindFormat,[ AC_CHECK_LIB(Xrender, XRenderFindFormat,[
AC_SUBST(RENDER_LIBS, "-lXrender -lXext") AC_SUBST(RENDER_LIBS, "-lXrender -lXext")
AC_DEFINE(HAVE_RENDER, 1, [Define if libXrender is available.]) AC_DEFINE(HAVE_RENDER, 1, [Define if libXrender is available.])

50
moo/mooapp/mooapp.c
View File

@ -42,6 +42,10 @@
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#ifdef GDK_WINDOWING_QUARTZ
#include <ige-mac-dock.h>
#endif
#ifdef HAVE_SIGNAL_H #ifdef HAVE_SIGNAL_H
#include <signal.h> #include <signal.h>
#endif #endif
@ -98,6 +102,10 @@ struct _MooAppPrivate {
guint quit_handler_id; guint quit_handler_id;
gboolean use_editor; gboolean use_editor;
gboolean quit_on_editor_close; gboolean quit_on_editor_close;
#ifdef GDK_WINDOWING_QUARTZ
IgeMacDock *dock;
#endif
}; };
@ -867,6 +875,47 @@ moo_app_init_ui (MooApp *app)
} }
#ifdef GDK_WINDOWING_QUARTZ
static void
dock_open_documents (MooApp *app,
char **files)
{
moo_app_open_files (app, files, 0, 0, 0);
}
static void
dock_clicked (G_GNUC_UNUSED MooApp *app)
{
/* XXX */
g_print ("dock_clicked\n");
}
static void
dock_quit_activate (MooApp *app)
{
moo_app_quit (app);
}
static void
moo_app_init_mac (MooApp *app)
{
app->priv->dock = ige_mac_dock_get_default ();
g_signal_connect_swapped (app->priv->dock, "clicked",
G_CALLBACK (dock_clicked), app);
g_signal_connect_swapped (app->priv->dock, "open-documents",
G_CALLBACK (dock_open_documents), app);
g_signal_connect_swapped (app->priv->dock, "quit-activate",
G_CALLBACK (dock_quit_activate), app);
}
#else /* !GDK_WINDOWING_QUARTZ */
static void
moo_app_init_mac (G_GNUC_UNUSED MooApp *app)
{
}
#endif
static gboolean static gboolean
moo_app_init_real (MooApp *app) moo_app_init_real (MooApp *app)
{ {
@ -877,6 +926,7 @@ moo_app_init_real (MooApp *app)
moo_app_load_prefs (app); moo_app_load_prefs (app);
moo_app_init_ui (app); moo_app_init_ui (app);
moo_app_init_mac (app);
#ifdef MOO_BUILD_EDIT #ifdef MOO_BUILD_EDIT
if (app->priv->use_editor) if (app->priv->use_editor)