Merge remote-tracking branch 'origin/master' into central-info

Author: trigg

.github/workflows/ci.yaml

@@ -12,6 +12,7 @@ jobs:
       - run: apk --no-cache add git g++ binutils pkgconf meson ninja musl-dev gtkmm4-dev vala gobject-introspection gobject-introspection-dev pulseaudio-dev pipewire-dev wireplumber-dev libdbusmenu-glib-dev alsa-lib-dev yyjson-dev linux-pam-dev util-linux-login openssl-dev
       - run: echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories
       - run: echo 'http://dl-cdn.alpinelinux.org/alpine/edge/main' >> /etc/apk/repositories
+      - run: echo 'http://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories
       - run: apk --no-cache add wayland-protocols wayfire-dev gtk4-layer-shell-dev gtk4-layer-shell
 
       - name: wf-shell

data/css/default.css

@@ -278,6 +278,14 @@ text-shadow: 1px  1px 0 var(--bcol),
     padding-bottom: 75px;
 }
 
+.wf-locker .failure {
+    animation-name: shake;
+    animation-duration:0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: 1;
+    animation-fill-mode: forwards;
+}
+
 .wf-locker.sized-480 {
     font-size:6px;
 }
@@ -329,3 +337,25 @@ text-shadow: 1px  1px 0 var(--bcol),
         padding-right: 0rem;
     }
 }
+
+@keyframes shake {
+  0% {
+    transform: translateX(0px);
+  }
+  20% {
+    transform: translateX(20px);
+  }
+  40% {
+    transform: translateX(-20px);
+  }
+  60% {
+    transform: translateX(20px);
+  }
+  80% {
+    transform: translateX(-20px);
+  }
+  100% {
+    transform: translateX(0px);
+  }
+}
+

data/css/panel-wp-mixer-dim-mute.css

@@ -1,3 +1,3 @@
-.wf-panel .wireplumber-popover .muted {
+.wf-panel .wp-mixer-popover .muted {
     opacity: 0.5;
-}
+}

data/meson.build

@@ -13,6 +13,6 @@ install_data(join_paths('icons', '256x256', 'wayfire.png'), install_dir: join_pa
 install_data(join_paths('icons', '512x512', 'wayfire.png'), install_dir: join_paths(get_option('prefix'), 'share', 'icons', 'hicolor', '512x512', 'apps'))
 install_data(join_paths('icons', 'scalable', 'wayfire.svg'), install_dir: join_paths(get_option('prefix'), 'share', 'icons', 'hicolor', 'scalable', 'apps'))
 
-install_data('wf-locker-password', install_dir:'/etc/pam.d/')
+install_data('wf-locker', install_dir:'/etc/pam.d/')
 
-subdir('css')
+subdir('css')

data/wf-locker

@@ -0,0 +1,2 @@
+auth    required pam_unix.so nodelay unlock_time=60
+account required pam_unix.so nodelay unlock_time=60

data/wf-locker-password

@@ -65,11 +65,11 @@ add_project_arguments(
 	language: 'cpp',
 )
 
-resource_dir = join_paths(get_option('prefix'), 'share', 'wayfire')
-metadata_dir = join_paths(resource_dir, 'metadata', 'wf-shell')
+resource_dir = join_paths(get_option('prefix'), 'share', 'wf-shell')
+metadata_dir = join_paths(resource_dir, 'metadata')
 sysconf_dir = join_paths(get_option('prefix'), get_option('sysconfdir'))
 
-icon_dir = join_paths(get_option('prefix'), 'share', 'wayfire', 'icons')
+icon_dir = join_paths(get_option('prefix'), 'share', 'wf-shell', 'icons')
 add_project_arguments('-DICONDIR="' + icon_dir + '"', language: 'cpp')
 add_project_arguments('-DRESOURCEDIR="' + resource_dir + '"', language: 'cpp')
 add_project_arguments('-DMETADATA_DIR="' + metadata_dir + '"', language: 'cpp')

meson.build

@@ -189,6 +189,10 @@
 	</group>
 	<group>
 	<_short>Menu</_short>
+	<option name="menu_fullscreen" type="bool">
+		<_short>Fullscreen Menu</_short>
+		<default>false</default>
+	</option>
 	<option name="menu_fuzzy_search" type="bool">
 		<_short>Use Fuzzy Search in Menu</_short>
 		<default>true</default>
@@ -203,6 +207,11 @@
 		<default>42</default>
 		<min>0</min>
 	</option>
+	<option name="menu_force_show_popup" type="bool">
+		<_short>Force showing the menu popup</_short>
+		<_long>Show the menu popup over other windows, even if it and the panel would be hidden otherwise.</_long>
+		<default>true</default>
+	</option>
 	<option name="menu_min_category_width" type="int">
 		<_short>Menu Minimum Category Width</_short>
 		<default>200</default>

metadata/panel.xml

@@ -71,8 +71,9 @@ void WayfireBackgroundApp::create(int argc, char **argv)
 void WayfireBackgroundApp::on_activate()
 {
     WayfireShellApp::on_activate();
-
     prep_cache();
+    // Initial setup of timer etc.
+    change_background();
 }
 
 void WayfireBackgroundApp::prep_cache()
@@ -92,7 +93,10 @@ void WayfireBackgroundApp::handle_new_output(WayfireOutput *output)
 {
     backgrounds[output] = std::unique_ptr<WayfireBackground>(
         new WayfireBackground(output));
-    change_background();
+    if (!current_background.empty())
+    {
+        backgrounds[output]->gl_area->show_image(current_background);
+    }
 }
 
 void WayfireBackgroundApp::handle_output_removed(WayfireOutput *output)
@@ -108,7 +112,8 @@ std::string WayfireBackgroundApp::get_application_name()
 std::vector<std::string> WayfireBackgroundApp::get_background_list(std::string path)
 {
     wordexp_t exp;
-    std::cout << "Looking in " << path << std::endl;
+    LOGD("Looking for background images in ", path);
+
     /* Expand path */
     if (wordexp(path.c_str(), &exp, 0))
     {
@@ -187,18 +192,20 @@ void WayfireBackgroundApp::change_background()
     std::string background_path = WfOption<std::string>{"background/image"};
     auto list = get_background_list(background_path);
     auto idx  = find(list.begin(), list.end(), current_background) - list.begin();
-
-    std::cout << current_background << "  " << idx << std::endl;
     idx = (idx + 1) % list.size();
-    // gl_area->show_image(list[idx]);
-    for (auto & it : backgrounds)
+
+    if (current_background != list[idx])
     {
-        it.second->gl_area->show_image(list[idx]);
+        for (auto & it : backgrounds)
+        {
+            it.second->gl_area->show_image(list[idx]);
+        }
+
+        current_background = list[idx];
+        write_cache(list[idx]);
     }
 
-    write_cache(list[idx]);
     reset_cycle_timeout();
-    current_background = list[idx];
 }
 
 gboolean WayfireBackgroundApp::sigusr1_handler(void *instance)

src/background/background.cpp

@@ -26,5 +26,7 @@ class WayfireLockerPlugin
     virtual void deinit() = 0; /* Called after lockscreen unlocked. */
     virtual void lockout_changed(bool lockout)
     {} /* Called when too many failed logins have occured */
+    virtual void failure()
+    {}
     virtual ~WayfireLockerPlugin() = default;
 };