window-list: Fix duplicate window button entries

applets/wf-window-list/__init__.py

@@ -623,7 +623,6 @@ class WFWindowList(panorama_panel.Applet):

                                
                                
                                
                            
                                
                                    
                                        
                                            623  
                                                                self.foreign_toplevel_closed(handle)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            624  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            625  
                                                def foreign_toplevel_output_enter(self, handle, output):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        626 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            626  
                                                    if self.show_only_this_output and (not hasattr(output, "name") or output.name != self.get_root().monitor_name):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            627  
                                                        return
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            628  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -635,8 +634,22 @@ class WFWindowList(panorama_panel.Applet):

                                
                                
                                
                            
                                
                                    
                                        
                                            634  
                                                    button.set_layout_manager(WindowButtonLayoutManager(self.window_button_options, button))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            635  
                                                    button.connect("clicked", self.on_button_click)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            636  
                                                    self.set_app_id(button, handle.app_id)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        638 -
                                                self.toplevel_buttons[handle] = button
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        639 -
                                                self.append(button)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        637 +
                                                if handle.app_id.rsplit(maxsplit=1)[-1].startswith("wf-ipc-"):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        638 +
                                                    wf_output = self.get_wf_output_by_name(self.get_root().monitor_name)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        639 +
                                                    wf_id = int(handle.app_id.rsplit(maxsplit=1)[-1].removeprefix("wf-ipc-"))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        640 +
                                                    view = self.wf_socket.get_view(wf_id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        641 +
                                                    mid_x = view["geometry"]["x"] + view["geometry"]["width"] / 2
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        642 +
                                                    mid_y = view["geometry"]["y"] + view["geometry"]["height"] / 2
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        643 +
                                                    output_width = wf_output["geometry"]["width"]
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        644 +
                                                    output_height = wf_output["geometry"]["height"]
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        645 +
                                                    if 0 <= mid_x < output_width and 0 <= mid_y < output_height and button.output == self.my_output:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        646 +
                                                        # It is in this workspace; keep it
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        647 +
                                                        if button.get_parent() is None:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        648 +
                                                            self.toplevel_buttons[handle] = button
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        649 +
                                                            self.append(button)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        650 +
                                                else:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        651 +
                                                    self.toplevel_buttons[handle] = button
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        652 +
                                                    self.append(button)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            653  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            654  
                                                def foreign_toplevel_output_leave(self, handle, output):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            655  
                                                    if handle in self.toplevel_buttons:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

main.py

@@ -684,6 +684,8 @@ class PanoramaPanel(Gtk.Application):

                                
                                
                                
                            
                                
                                    
                                        
                                            684  
                                                    self.drags = {}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            685  
                                                    self.wl_output_ids = set()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            686  
                                                    self.started = False
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        687 +
                                                self.all_handles: set[ZwlrForeignToplevelHandleV1] = set()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        688 +
                                                self.obsolete_handles: set[ZwlrForeignToplevelHandleV1] = set()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            689  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            690  
                                                    self.add_main_option(
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            691  
                                                        "trigger",
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -698,6 +700,7 @@ class PanoramaPanel(Gtk.Application):

                                
                                
                                
                            
                                
                                    
                                        
                                            700  
                                                    self.foreign_toplevel_manager.destroy()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            701  
                                                    self.wl_globals.remove(self.foreign_toplevel_manager)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            702  
                                                    self.foreign_toplevel_manager = None
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        703 +
                                                self.foreign_toplevel_refresh()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            704  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            705  
                                                def on_foreign_toplevel_manager_finish(self, manager: ZwlrForeignToplevelManagerV1):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            706  
                                                    if self.foreign_toplevel_manager:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -705,6 +708,8 @@ class PanoramaPanel(Gtk.Application):

                                
                                
                                
                            
                                
                                    
                                        
                                            708  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            709  
                                                def on_new_toplevel(self, manager: ZwlrForeignToplevelManagerV1,
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            710  
                                                                     handle: ZwlrForeignToplevelHandleV1):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        711 +
                                                self.all_handles.add(handle)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        712 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            713  
                                                    for panel in self.panels:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            714  
                                                        panel.foreign_toplevel_new(manager, handle)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            715  
                                                    handle.dispatcher["title"] = self.on_title_changed
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -715,30 +720,44 @@ class PanoramaPanel(Gtk.Application):

                                
                                
                                
                            
                                
                                    
                                        
                                            720  
                                                    handle.dispatcher["closed"] = self.on_closed
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            721  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            722  
                                                def on_output_enter(self, handle, output):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        723 +
                                                if handle in self.obsolete_handles:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        724 +
                                                    return
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            725  
                                                    for panel in self.panels:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            726  
                                                        panel.foreign_toplevel_output_enter(handle, output)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            727  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            728  
                                                def on_output_leave(self, handle, output):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        729 +
                                                if handle in self.obsolete_handles:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        730 +
                                                    return
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            731  
                                                    for panel in self.panels:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            732  
                                                        panel.foreign_toplevel_output_leave(handle, output)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            733  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            734  
                                                def on_title_changed(self, handle, title):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        735 +
                                                if handle in self.obsolete_handles:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        736 +
                                                    return
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            737  
                                                    for panel in self.panels:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            738  
                                                        panel.foreign_toplevel_title(handle, title)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            739  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            740  
                                                def on_app_id_changed(self, handle, app_id):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        741 +
                                                if handle in self.obsolete_handles:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        742 +
                                                    return
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            743  
                                                    for panel in self.panels:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            744  
                                                        panel.foreign_toplevel_app_id(handle, app_id)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            745  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            746  
                                                def on_state_changed(self, handle, state):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        747 +
                                                if handle in self.obsolete_handles:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        748 +
                                                    return
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            749  
                                                    for panel in self.panels:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            750  
                                                        panel.foreign_toplevel_state(handle, state)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            751  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            752  
                                                def on_closed(self, handle):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        753 +
                                                if handle in self.obsolete_handles:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        754 +
                                                    return
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            755  
                                                    for panel in self.panels:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            756  
                                                        panel.foreign_toplevel_closed(handle)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            757  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            758  
                                                def foreign_toplevel_refresh(self):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        759 +
                                                self.obsolete_handles = self.all_handles.copy()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        760 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            761  
                                                    for panel in self.panels:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            762  
                                                        panel.foreign_toplevel_refresh()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            763  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -784,7 +803,6 @@ class PanoramaPanel(Gtk.Application):

                                
                                
                                
                            
                                
                                    
                                        
                                            803  
                                                                self.wl_display.roundtrip()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            804  
                                                                if self.foreign_toplevel_manager:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            805  
                                                                    self.destroy_foreign_toplevel_manager()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        787 -
                                                        self.foreign_toplevel_refresh()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            806  
                                                            self.foreign_toplevel_manager = self.registry.bind(self.foreign_toplevel_manager_id, ZwlrForeignToplevelManagerV1, self.foreign_toplevel_version)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            807  
                                                            self.foreign_toplevel_manager.id = self.foreign_toplevel_manager_id
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            808  
                                                            self.wl_globals.append(self.foreign_toplevel_manager)