diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop')
2 files changed, 87 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch new file mode 100644 index 000000000..46397dc8a --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch @@ -0,0 +1,60 @@ +From 5fe37ef38500f858a22ecdf9bf69bf06e213bf68 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 22 Mar 2016 12:41:35 +0200 +Subject: [PATCH] Do nothing on delete-event when not STANDALONE + +This prevents an opportunistic alt-F4 from closing the desktop. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Signed-off-by: Ross Burton <ross.burton@intel.com> + + +Upstream-Status: Backport +--- + src/desktop.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/desktop.c b/src/desktop.c +index d4fc2fb..94b4ddf 100644 +--- a/src/desktop.c ++++ b/src/desktop.c +@@ -122,6 +122,15 @@ load_items (TakuMenu *menu) + + } + ++#ifndef STANDALONE ++static gboolean ++delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer user_data) ++{ ++ /* prevent default handler from destroying the window */ ++ return TRUE; ++} ++#endif ++ + static void + workarea_changed (int x, int y, int w, int h) + { +@@ -144,11 +153,11 @@ create_desktop (void) + gtk_icon_size_register ("taku-icon", 64, 64); + + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); +- g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL); + gtk_widget_set_name (window, "TakuWindow"); + gtk_window_set_title (GTK_WINDOW (window), _("Desktop")); + + #ifndef STANDALONE ++ g_signal_connect (window, "delete-event", G_CALLBACK (delete_event_cb), NULL); + gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DESKTOP); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (window), TRUE); + +@@ -156,6 +165,7 @@ create_desktop (void) + screen_w = gdk_screen_get_width (screen); + screen_h = gdk_screen_get_height (screen); + #else ++ g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL); + screen_w = 640; + screen_h = 480; + #endif +-- +2.7.0 + diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb new file mode 100644 index 000000000..dbe8c1145 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb @@ -0,0 +1,27 @@ +SUMMARY = "Matchbox Window Manager Desktop" +HOMEPAGE = "http://matchbox-project.org/" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://libtaku/eggsequence.h;endline=20;md5=b91f68f7642a1459fa1f4c9df94a8f15 \ + file://src/desktop.c;endline=20;md5=36c9bf295e6007f3423095f405af5a2d \ + file://src/main.c;endline=19;md5=2044244f97a195c25b7dc602ac7e9a00" + +DEPENDS = "gtk+ startup-notification dbus" +SECTION = "x11/wm" +SRCREV = "71e3e6e04271e9d5a14f1c231ef100c7f320134d" +PV = "2.0+git${SRCPV}" + +SRC_URI = "git://git.yoctoproject.org/${BPN}-2 \ + file://0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch \ + " + +EXTRA_OECONF = "--enable-startup-notification --with-dbus" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig distro_features_check + +# The startup-notification requires x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" |