diff --git a/0000-change-workspace-titlebar-and-font-and-composite-49944cb7.patch b/0000-change-workspace-titlebar-and-font-and-composite-49944cb7.patch deleted file mode 100644 index 73e5a2873c6a84703bdf9970d88eeecfc6af478f..0000000000000000000000000000000000000000 --- a/0000-change-workspace-titlebar-and-font-and-composite-49944cb7.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 49944cb7e9cda0a56e4e0c367e73d025b1e20983 Mon Sep 17 00:00:00 2001 -From: longcheng -Date: Thu, 24 Mar 2022 18:53:11 +0800 -Subject: [PATCH 0/5] change workspace titlebar and font and composite - ---- - configure | 2 +- - src/org.mate.marco.gschema.xml | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure b/configure -index f89f5be..3135a6e 100755 ---- a/configure -+++ b/configure -@@ -14897,7 +14897,7 @@ fi - if test x$have_xcomposite = xyes; then - MARCO_PC_MODULES="$MARCO_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage" - --$as_echo "#define HAVE_COMPOSITE_EXTENSIONS 1" >>confdefs.h -+$as_echo "#define HAVE_COMPOSITE_EXTENSIONS 0" >>confdefs.h - - echo "Building with compositing manager" - -diff --git a/src/org.mate.marco.gschema.xml b/src/org.mate.marco.gschema.xml -index 6632e6b..afd64b8 100644 ---- a/src/org.mate.marco.gschema.xml -+++ b/src/org.mate.marco.gschema.xml -@@ -116,13 +116,13 @@ - If true, ignore the titlebar_font option, and use the standard application font for window titles. - - -- 'Sans Bold 10' -+ 'Noto Sans CJK SC Regular 9' - Window title font - A font description string describing a font for window titlebars. The size from the description will only be used if the titlebar_font_size option is set to 0. Also, this option is disabled if the titlebar_uses_desktop_font option is set to true. - - - -- 4 -+ 2 - Number of workspaces - Number of workspaces. Must be more than zero, and has a fixed maximum to prevent making the desktop unusable by accidentally asking for too many workspaces. - --- -2.27.0 - diff --git a/0001-fix-disabled-Alt-F1-to-popop-mate-menu-b638cc7c.patch b/0001-fix-disabled-Alt-F1-to-popop-mate-menu-b638cc7c.patch deleted file mode 100644 index f849f1979d5624702ee214b643a15281acb80add..0000000000000000000000000000000000000000 --- a/0001-fix-disabled-Alt-F1-to-popop-mate-menu-b638cc7c.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b638cc7c8bb7cfb9d61ae85e3ad00b3cfd1ec884 Mon Sep 17 00:00:00 2001 -From: longcheng -Date: Thu, 24 Mar 2022 18:54:48 +0800 -Subject: [PATCH 1/5] fix: disabled Alt+F1 to popop mate menu - ---- - src/org.mate.marco.gschema.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/org.mate.marco.gschema.xml b/src/org.mate.marco.gschema.xml -index afd64b8..94f63b4 100644 ---- a/src/org.mate.marco.gschema.xml -+++ b/src/org.mate.marco.gschema.xml -@@ -603,7 +603,7 @@ - The format looks like "<Control>a" or "<Shift><Alt>F1". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as "<Ctl>" and "<Ctrl>". If you set the option to the special string "disabled", then there will be no keybinding for this action. - - -- '<Alt>F1' -+ 'disabled' - Show the panel's main menu - The format looks like "<Control>a" or "<Shift><Alt>F1". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as "<Ctl>" and "<Ctrl>". If you set the option to the special string "disabled", then there will be no keybinding for this action. - --- -2.27.0 - diff --git a/0002-feature-menu-pop-up-start-menu-when-press-super-key-bf212ac7.patch b/0002-feature-menu-pop-up-start-menu-when-press-super-key-bf212ac7.patch deleted file mode 100644 index 3cde2a9046358e95159e710813bdceea2b52f4a8..0000000000000000000000000000000000000000 --- a/0002-feature-menu-pop-up-start-menu-when-press-super-key-bf212ac7.patch +++ /dev/null @@ -1,179 +0,0 @@ -From bf212ac737d114d639457802ce8b1363a465c7a3 Mon Sep 17 00:00:00 2001 -From: longcheng -Date: Thu, 24 Mar 2022 18:58:13 +0800 -Subject: [PATCH 2/5] feature[menu] : pop up start menu when press super key - ---- - po/zh_CN.po | 3 +++ - src/50-marco-desktop-key.xml.in | 2 ++ - src/core/atomnames.h | 1 + - src/core/keybindings.c | 48 +++++++++++++++++++++++++++++++++ - src/include/all-keybindings.h | 2 ++ - src/include/prefs.h | 3 ++- - src/org.mate.marco.gschema.xml | 5 ++++ - src/ui/ui.c | 8 ++++++ - 8 files changed, 71 insertions(+), 1 deletion(-) - -diff --git a/po/zh_CN.po b/po/zh_CN.po -index ad1d1eb..4399cda 100644 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -42,6 +42,9 @@ msgstr "显示面板的“运行应用程序”对话框" - msgid "Show the panel's main menu" - msgstr "显示面板主菜单" - -+msgid "Show the panel's main menu of kiran" -+msgstr "显示开始菜单" -+ - #: ../src/50-marco-desktop-key.xml.in.h:4 - #: ../src/org.mate.marco.gschema.xml.h:101 - msgid "Take a screenshot" -diff --git a/src/50-marco-desktop-key.xml.in b/src/50-marco-desktop-key.xml.in -index 219109e..1719291 100644 ---- a/src/50-marco-desktop-key.xml.in -+++ b/src/50-marco-desktop-key.xml.in -@@ -5,6 +5,8 @@ - - - -+ -+ - - - -diff --git a/src/core/atomnames.h b/src/core/atomnames.h -index 3744f42..48582aa 100644 ---- a/src/core/atomnames.h -+++ b/src/core/atomnames.h -@@ -64,6 +64,7 @@ item(_GTK_SHOW_WINDOW_MENU) - item(_MATE_PANEL_ACTION) - item(_MATE_PANEL_ACTION_MAIN_MENU) - item(_MATE_PANEL_ACTION_RUN_DIALOG) -+item(_MATE_PANEL_ACTION_KIRAN_MENU) - item(_MARCO_SENTINEL) - item(_MARCO_VERSION) - item(WM_CLIENT_MACHINE) -diff --git a/src/core/keybindings.c b/src/core/keybindings.c -index 83ff985..542c89f 100644 ---- a/src/core/keybindings.c -+++ b/src/core/keybindings.c -@@ -2917,6 +2917,54 @@ handle_panel (MetaDisplay *display, - meta_error_trap_pop (display, FALSE); - } - -+static void -+handle_kiran_panel (MetaDisplay *display, -+ MetaScreen *screen, -+ MetaWindow *window, -+ XEvent *event, -+ MetaKeyBinding *binding) -+ { -+ /*MetaKeyBindingAction action = binding->handler->data;*/ -+ MetaKeyBindingAction action = META_KEYBINDING_ACTION_KIRAN_PANEL_MENU; -+ Atom action_atom; -+ XClientMessageEvent ev; -+ -+ action_atom = None; -+ switch (action) -+ { -+ /* FIXME: The numbers are wrong */ -+ case META_KEYBINDING_ACTION_KIRAN_PANEL_MENU: -+ action_atom = display->atom__MATE_PANEL_ACTION_KIRAN_MENU; -+ break; -+ default: -+ return; -+ } -+ -+ ev.type = ClientMessage; -+ ev.window = screen->xroot; -+ ev.message_type = display->atom__MATE_PANEL_ACTION; -+ ev.format = 32; -+ ev.data.l[0] = action_atom; -+ ev.data.l[1] = event->xkey.time; -+ -+ meta_topic (META_DEBUG_KEYBINDINGS, -+ "Sending panel message with timestamp %lu, and turning mouse_mode " -+ "off due to keybinding press\n", event->xkey.time); -+ display->mouse_mode = FALSE; -+ -+ meta_error_trap_push (display); -+ -+ /* Release the grab for the panel before sending the event */ -+ XUngrabKeyboard (display->xdisplay, event->xkey.time); -+ XSendEvent (display->xdisplay, -+ screen->xroot, -+ False, -+ StructureNotifyMask, -+ (XEvent*) &ev); -+ -+ meta_error_trap_pop (display, FALSE); -+} -+ - static void - handle_activate_window_menu (MetaDisplay *display, - MetaScreen *screen, -diff --git a/src/include/all-keybindings.h b/src/include/all-keybindings.h -index cba8e9f..a7ade33 100644 ---- a/src/include/all-keybindings.h -+++ b/src/include/all-keybindings.h -@@ -154,6 +154,8 @@ keybind (show-desktop, handle_show_desktop, 0, 0) - keybind (panel-main-menu, handle_panel, META_KEYBINDING_ACTION_PANEL_MAIN_MENU, 0) - keybind (panel-run-dialog, handle_panel, META_KEYBINDING_ACTION_PANEL_RUN_DIALOG, 0) - -+keybind (panel-kiran-menu, handle_kiran_panel, META_KEYBINDING_ACTION_KIRAN_PANEL_MENU, 0) -+ - /* Yes, the param is offset by one. Historical reasons. (Maybe worth fixing - * at some point.) The description is NULL here because the stanza is - * irregularly shaped in marco.schemas.in. This will probably be fixed -diff --git a/src/include/prefs.h b/src/include/prefs.h -index 34ab802..eda0693 100644 ---- a/src/include/prefs.h -+++ b/src/include/prefs.h -@@ -205,7 +205,8 @@ typedef enum _MetaKeyBindingAction - META_KEYBINDING_ACTION_COMMAND_9, - META_KEYBINDING_ACTION_COMMAND_10, - META_KEYBINDING_ACTION_COMMAND_11, -- META_KEYBINDING_ACTION_COMMAND_12 -+ META_KEYBINDING_ACTION_COMMAND_12, -+ META_KEYBINDING_ACTION_KIRAN_PANEL_MENU - } MetaKeyBindingAction; - - typedef struct -diff --git a/src/org.mate.marco.gschema.xml b/src/org.mate.marco.gschema.xml -index 94f63b4..5716af3 100644 ---- a/src/org.mate.marco.gschema.xml -+++ b/src/org.mate.marco.gschema.xml -@@ -607,6 +607,11 @@ - Show the panel's main menu - The format looks like "<Control>a" or "<Shift><Alt>F1". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as "<Ctl>" and "<Ctrl>". If you set the option to the special string "disabled", then there will be no keybinding for this action. - -+ -+ '<Super>' -+ Show the panel's main menu of kiran -+ The format looks like "<Control>a" or "<Shift><Alt>F1". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as "<Ctl>" and "<Ctrl>". If you set the option to the special string "disabled", then there will be no keybinding for this action. -+ - - '<Alt>F2' - Show the panel's "Run Application" dialog box -diff --git a/src/ui/ui.c b/src/ui/ui.c -index ed2c577..ddfa9bc 100644 ---- a/src/ui/ui.c -+++ b/src/ui/ui.c -@@ -772,6 +772,14 @@ meta_ui_parse_accelerator (const char *accel, - return TRUE; - - meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask); -+ if(gdk_mask & GDK_SUPER_MASK) -+ { -+ unsigned char super_L_keycode=0; -+ Display *display = XOpenDisplay(NULL); -+ super_L_keycode = XKeysymToKeycode(display , XK_Super_L); -+ gdk_code = super_L_keycode; -+ gdk_mask = 0; -+ } - if (gdk_mask == 0 && gdk_sym == 0 && gdk_code == 0) - return FALSE; - --- -2.27.0 - diff --git a/marco-1.22.3.tar.xz b/marco-1.22.3.tar.xz deleted file mode 100644 index da88f4d838223ae54e9afeae8e6ded3d9b7abb1b..0000000000000000000000000000000000000000 Binary files a/marco-1.22.3.tar.xz and /dev/null differ diff --git a/marco-1.26.1.tar.xz b/marco-1.26.1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..8fa486c06034b4d147359874521991a59ceaceab Binary files /dev/null and b/marco-1.26.1.tar.xz differ diff --git a/marco.spec b/marco.spec index 90bec323f0680084457269293c79cc98a75e6784..226f42bb5c16135107120934a544cb4d164ef51b 100644 --- a/marco.spec +++ b/marco.spec @@ -2,7 +2,7 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.22 +%global branch 1.26 # Settings used for build from snapshots. %{!?rel_build:%global commit 62a708d461e08275d6b85985f5fa13fa8fbc85f7} @@ -13,12 +13,8 @@ %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} Name: marco -Version: %{branch}.3 -%if 0%{?rel_build} -Release: 4 -%else -Release: 0.12%{?git_rel} -%endif +Version: %{branch}.1 +Release: 1 Summary: MATE Desktop window manager License: LGPLv2+ and GPLv2+ URL: http://mate-desktop.org @@ -29,10 +25,6 @@ URL: http://mate-desktop.org # Source for snapshot-builds. %{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} -Patch0: 0000-change-workspace-titlebar-and-font-and-composite-49944cb7.patch -Patch1: 0001-fix-disabled-Alt-F1-to-popop-mate-menu-b638cc7c.patch -Patch2: 0002-feature-menu-pop-up-start-menu-when-press-super-key-bf212ac7.patch - BuildRequires: desktop-file-utils BuildRequires: gtk3-devel BuildRequires: libcanberra-devel @@ -41,6 +33,8 @@ BuildRequires: libSM-devel BuildRequireS: libsoup-devel BuildRequires: libXdamage-devel BuildRequires: libXpresent-devel +BuildRequires: libXres-devel +BuildRequires: make BuildRequires: mate-common BuildRequires: mate-desktop-devel BuildRequires: zenity @@ -118,10 +112,15 @@ desktop-file-install \ %{_bindir}/marco-message %{_bindir}/marco-theme-viewer %{_datadir}/applications/marco.desktop +%{_datadir}/themes/Atlanta %{_datadir}/themes/ClearlooksRe %{_datadir}/themes/Dopple-Left %{_datadir}/themes/Dopple %{_datadir}/themes/DustBlue +%{_datadir}/themes/Esco +%{_datadir}/themes/Gorilla +%{_datadir}/themes/Motif +%{_datadir}/themes/Raleigh %{_datadir}/themes/Spidey-Left %{_datadir}/themes/Spidey %{_datadir}/themes/Splint-Left @@ -149,10 +148,8 @@ desktop-file-install \ %changelog -* Wed Jul 06 2022 longcheng - 1.22.3-4 -- KYOS-F: changed number of workspace to 2; set marco compositor to 0; changed title-bar font to 'Noto Sans CJK SC Regular' -- KYOS-F: fix: disabled Alt+F1 to popop mate menu Related #28275 -- KYOS-F: pop up start menu when press super key, Related #28467 +* Mon Aug 19 2024 yueyaoqiang - 1.26.1-1 +- update to 1.26.1 * Thu Mar 24 2022 caodongxia - 1.22.3-3 - restore else branch release