window-list: Use single wl_surface object

applets/wf-window-list/__init__.py

@@ -509,9 +509,11 @@ class WFWindowList(panorama_panel.Applet):

                                
                                
                                
                            
                                
                                    
                                        
                                            509  
                                                        self.seat = registry.bind(name, WlSeat, version)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            510  
                                                    elif interface == "wl_compositor":
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            511  
                                                        self.compositor = registry.bind(name, WlCompositor, version)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        512 -
                                                    self.wl_surface_ptr = gtk.gdk_wayland_surface_get_wl_surface(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        512 +
                                                    wl_surface_ptr = gtk.gdk_wayland_surface_get_wl_surface(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            513  
                                                                ffi.cast("void *", ctypes.pythonapi.PyCapsule_GetPointer(
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            514  
                                                                    self.get_root().get_native().get_surface().__gpointer__, None)))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        515 +
                                                    self.wl_surface = WlSurface()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        516 +
                                                    self.wl_surface._ptr = wl_surface_ptr
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            517  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            518  
                                                def on_new_toplevel(self, manager: ZwlrForeignToplevelManagerV1,
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            519  
                                                                     handle: ZwlrForeignToplevelHandleV1):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -561,17 +563,13 @@ class WFWindowList(panorama_panel.Applet):

                                
                                
                                
                            
                                
                                    
                                        
                                            563  
                                                    child = self.get_first_child()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            564  
                                                    while child is not None:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            565  
                                                        if isinstance(child, WindowButton):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        564 -
                                                        surface = WlSurface()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        565 -
                                                        surface._ptr = self.wl_surface_ptr
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        566 -
                                                        child.window_id.set_rectangle(surface, *get_widget_rect(child))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        566 +
                                                        child.window_id.set_rectangle(self.wl_surface, *get_widget_rect(child))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            567  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            568  
                                                        child = child.get_next_sibling()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            569  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            570  
                                                def on_button_click(self, button: WindowButton):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            571  
                                                    # Set a rectangle for animation
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        572 -
                                                surface = WlSurface()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        573 -
                                                surface._ptr = self.wl_surface_ptr
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        574 -
                                                button.window_id.set_rectangle(surface, *get_widget_rect(button))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        572 +
                                                button.window_id.set_rectangle(self.wl_surface, *get_widget_rect(button))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            573  
                                                    if button.window_state.focused:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            574  
                                                        # Already pressed in, so minimise the focused window
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            575  
                                                        button.window_id.set_minimized()