File lxpanel-0.5.4.1-fix-#sf2834685-#sf2937420.patch of Package lxpanel

Overview Repositories Revisions Requests Users Attributes Meta

File lxpanel-0.5.4.1-fix-#sf2834685-#sf2937420.patch of Package lxpanel (Revision a17d6bd4f7b37c2cebd5a63625803f26)

Currently displaying revision a17d6bd4f7b37c2cebd5a63625803f26 , Show latest

diff -uNr old-panel/src//menu-policy.c lxpanel/src//menu-policy.c
--- old-panel/src//menu-policy.c	2010-01-31 11:12:59.893555684 +0100
+++ lxpanel/src//menu-policy.c	2010-01-31 11:13:14.462545884 +0100
@@ -50,6 +50,5 @@
 /* Evaluate the visibility of a menu item. */
 gboolean panel_menu_item_evaluate_visibility(MenuCacheItem * item, guint32 visibility_flags)
 {
-    g_debug("flags: %d\n", visibility_flags);
     return menu_cache_app_get_is_visible(MENU_CACHE_APP(item), visibility_flags);
 }
diff -uNr old-panel/src//panel.c lxpanel/src//panel.c
--- old-panel/src//panel.c	2010-01-31 11:12:59.804548682 +0100
+++ lxpanel/src//panel.c	2010-01-31 11:13:14.460545699 +0100
@@ -819,29 +819,48 @@
 
 static gboolean panel_leave_real(Panel *p)
 {
+    /* If the pointer is grabbed by this application, leave the panel displayed.
+     * There is no way to determine if it is grabbed by another application, such as an application that has a systray icon. */
     if (gdk_display_pointer_is_grabbed(p->display))
         return TRUE;
 
+    /* If the pointer is inside the panel, leave the panel displayed. */
     gint x, y;
     gdk_display_get_pointer(p->display, NULL, &x, &y, NULL);
     if ((p->cx <= x) && (x <= (p->cx + p->cw)) && (p->cy <= y) && (y <= (p->cy + p->ch)))
         return TRUE;
 
+    /* If the panel is configured to autohide and if it is visible, hide the panel. */
     if ((p->autohide) && (p->visible))
         panel_set_visibility(p, FALSE);
 
+    /* Clear the timer. */
     p->hide_timeout = 0;
     return FALSE;
 }
 
 static gboolean panel_enter(GtkImage *widget, GdkEventCrossing *event, Panel *p)
 {
-    if (p->hide_timeout)
-        return FALSE;
-
-    p->hide_timeout = g_timeout_add(500, (GSourceFunc) panel_leave_real, p);
-
-    panel_set_visibility(p, TRUE);
+    /* We may receive multiple enter-notify events when the pointer crosses into the panel.
+     * Do extra tests to make sure this does not cause misoperation such as blinking.
+     * If the pointer is inside the panel, unhide it. */
+    gint x, y;
+    gdk_display_get_pointer(p->display, NULL, &x, &y, NULL);
+    if ((p->cx <= x) && (x <= (p->cx + p->cw)) && (p->cy <= y) && (y <= (p->cy + p->ch)))
+    {
+        /* If the pointer is inside the panel and we have not already unhidden it, do so and
+         * set a timer to recheck it in a half second. */
+        if (p->hide_timeout == 0)
+        {
+            p->hide_timeout = g_timeout_add(500, (GSourceFunc) panel_leave_real, p);
+            panel_set_visibility(p, TRUE);
+        }
+    }
+    else
+    {
+        /* If the pointer is not inside the panel, simulate a timer expiration. */
+        panel_leave_real(p);
+    }
     return TRUE;
 }
 
diff -uNr old-panel/src//plugins/taskbar.c lxpanel/src//plugins/taskbar.c
--- old-panel/src//plugins/taskbar.c	2010-01-31 11:13:00.415545108 +0100
+++ lxpanel/src//plugins/taskbar.c	2010-01-31 11:13:14.442548785 +0100
@@ -110,6 +110,7 @@
     int task_width_max;				/* Maximum width of a taskbar button in horizontal orientation */
     int spacing;				/* Spacing between taskbar buttons */
     gboolean use_net_active;			/* NET_WM_ACTIVE_WINDOW is supported by the window manager */
+    gboolean net_active_checked;		/* True if use_net_active is valid */
 } TaskbarPlugin;
 
 static gchar *taskbar_rc = "style 'taskbar-style'\n"
@@ -185,6 +186,7 @@
 static void menu_move_to_workspace(GtkWidget * widget, TaskbarPlugin * tb);
 static void menu_close_window(GtkWidget * widget, TaskbarPlugin * tb);
 static void taskbar_make_menu(TaskbarPlugin * tb);
+static void taskbar_window_manager_changed(GdkScreen * screen, TaskbarPlugin * tb);
 static void taskbar_build_gui(Plugin * p);
 static int taskbar_constructor(Plugin * p, char ** fp);
 static void taskbar_destructor(Plugin * p);
@@ -1006,6 +1008,15 @@
     if ((tk->desktop != -1) && (tk->desktop != tk->tb->current_desktop))
         Xclimsg(GDK_ROOT_WINDOW(), a_NET_CURRENT_DESKTOP, tk->desktop, 0, 0, 0, 0);
 
+    /* Evaluate use_net_active if not yet done. */
+    if ( ! tk->tb->net_active_checked)
+    {
+        TaskbarPlugin * tb = tk->tb;
+        GdkAtom net_active_atom = gdk_x11_xatom_to_atom(a_NET_ACTIVE_WINDOW);
+        tb->use_net_active = gdk_x11_screen_supports_net_wm_hint(gtk_widget_get_screen(tb->plug->pwid), net_active_atom);
+        tb->net_active_checked = TRUE;
+    }
+
     /* Raise the window.  We can use NET_ACTIVE_WINDOW if the window manager supports it.
      * Otherwise, do it the old way with XMapRaised and XSetInputFocus. */
     if (tk->tb->use_net_active)
@@ -1017,8 +1028,13 @@
             gdk_window_show(gdkwindow);
         else
             XMapRaised(GDK_DISPLAY(), tk->win);
-        XSync(GDK_DISPLAY(), False);	/* This we need to avoid BadMatch */
-        XSetInputFocus(GDK_DISPLAY(), tk->win, RevertToNone, time);
+
+	/* There is a race condition between the X server actually executing the XMapRaised and this code executing XSetInputFocus.
+	 * If the window is not viewable, the XSetInputFocus will fail with BadMatch. */
+	XWindowAttributes attr;
+	XGetWindowAttributes(GDK_DISPLAY(), tk->win, &attr);
+	if (attr.map_state == IsViewable)
+            XSetInputFocus(GDK_DISPLAY(), tk->win, RevertToNone, time);
     }
 
     /* Change viewport if needed. */
@@ -1775,12 +1791,11 @@
     tb->menu = menu;
 }
 
-static void on_window_manager_changed(GdkScreen* screen, TaskbarPlugin* tb)
+/* Handler for "window-manager-changed" event. */
+static void taskbar_window_manager_changed(GdkScreen * screen, TaskbarPlugin * tb)
 {
-    GdkAtom net_active_atom;
-    GdkDisplay* display = gdk_screen_get_display(screen);
-    net_active_atom = gdk_x11_xatom_to_atom(a_NET_ACTIVE_WINDOW);
-    tb->use_net_active = gdk_x11_screen_supports_net_wm_hint(display, net_active_atom);
+    /* Force re-evaluation of use_net_active. */
+    tb->net_active_checked = FALSE;
 }
 
 /* Build graphic elements needed for the taskbar. */
@@ -1822,8 +1837,8 @@
      * Number of desktops and edge is needed for this operation. */
     taskbar_make_menu(tb);
 
-    g_signal_connect(gtk_widget_get_screen(p->pwid), "window-manager-changed", G_CALLBACK(on_window_manager_changed), tb);
-    on_window_manager_changed(gtk_widget_get_screen(p->pwid), tb);
+    /* Connect a signal to be notified when the window manager changes.  This causes re-evaluation of the "use_net_active" status. */
+    g_signal_connect(gtk_widget_get_screen(p->pwid), "window-manager-changed", G_CALLBACK(taskbar_window_manager_changed), tb);
 }
 
 /* Plugin constructor. */
@@ -1915,9 +1930,8 @@
     g_signal_handlers_disconnect_by_func(fbev, taskbar_net_number_of_desktops, tb);
     g_signal_handlers_disconnect_by_func(fbev, taskbar_net_client_list, tb);
 
-    /* Remove 'window-manager-changed' handler */
-    g_signal_handlers_disconnect_by_func(gtk_widget_get_screen(p->pwid),
-                                         on_window_manager_changed, tb);
+    /* Remove "window-manager-changed" handler. */
+    g_signal_handlers_disconnect_by_func(gtk_widget_get_screen(p->pwid), taskbar_window_manager_changed, tb);
 
     /* Deallocate task list. */
     while (tb->task_list != NULL)

Places

File lxpanel-0.5.4.1-fix-#sf2834685-#sf2937420.patch of Package lxpanel (Revision a17d6bd4f7b37c2cebd5a63625803f26)

Places