# HG changeset patch
# User Xander Ziiryanoff <psychomaniak@xakep.ru>
# Date 1451335650 0
# Node ID 88d6c3ec605bccefcbf31f3fa53b9c31ec39ad63
# Parent  ce8561c19cb9cd300eea02d8edafa7947d03a9ff
pcmanfm: patch to fix openbox menu

diff -r ce8561c19cb9 -r 88d6c3ec605b pcmanfm/receipt
--- a/pcmanfm/receipt	Sun Dec 27 23:15:58 2015 +0200
+++ b/pcmanfm/receipt	Mon Dec 28 20:47:30 2015 +0000
@@ -27,6 +27,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+	patch -p1 -R -i $stuff/fix_desktop_menus.patch
 	patch -p1 -i $stuff/pcmanfm-network-icon.patch
 	./autogen.sh
 	./configure $CONFIGURE_ARGS &&
diff -r ce8561c19cb9 -r 88d6c3ec605b pcmanfm/stuff/fix_desktop_menus.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pcmanfm/stuff/fix_desktop_menus.patch	Mon Dec 28 20:47:30 2015 +0000
@@ -0,0 +1,90 @@
+Commit: http://git.lxde.org/gitweb/?p=lxde/pcmanfm.git;a=commit;h=ae7ed3af651041a5538634ac9e35dc479e280ad9
+We revert it to fix desktop Openbox menus: Cannot open Right-click and Middle-Click menu in same time.
+--- a/src/desktop.c
++++ b/src/desktop.c
+@@ -3314,9 +3314,12 @@ static gboolean on_button_press(GtkWidget* w, GdkEventButton* evt)
+ 
+     if(evt->type == GDK_BUTTON_PRESS)
+     {
++        /* ignore another buttons while some is in progress */
++        if (self->button_pressed == 0)
++            self->button_pressed = evt->button;
+         if(evt->button == 1)  /* left button */
+         {
+-            self->button_pressed = TRUE;    /* store button state for drag & drop */
++            /* store button state for drag & drop */
+             self->drag_start_x = evt->x;
+             self->drag_start_y = evt->y;
+         }
+@@ -3411,8 +3414,11 @@ static gboolean on_button_press(GtkWidget* w, GdkEventButton* evt)
+             gtk_tree_path_free(tp);
+     }
+     /* forward the event to root window */
+-    else if(evt->button != 1)
++    else if(evt->button != 1 && evt->button == self->button_pressed)
++    {
++        self->forward_pending = TRUE;
+         forward_event_to_rootwin(gtk_widget_get_screen(w), (GdkEvent*)evt);
++    }
+ 
+     if(! gtk_widget_has_focus(w))
+     {
+@@ -3425,10 +3431,6 @@ static gboolean on_button_press(GtkWidget* w, GdkEventButton* evt)
+ static gboolean on_button_release(GtkWidget* w, GdkEventButton* evt)
+ {
+     FmDesktop* self = (FmDesktop*)w;
+-    GtkTreeIter it;
+-    FmDesktopItem* clicked_item = hit_test(self, &it, evt->x, evt->y);
+-
+-    self->button_pressed = FALSE;
+ 
+     if(self->rubber_bending)
+     {
+@@ -3442,17 +3444,21 @@ static gboolean on_button_release(GtkWidget* w, GdkEventButton* evt)
+     }
+     else if(fm_config->single_click && evt->button == 1)
+     {
++        GtkTreeIter it;
++        FmDesktopItem* clicked_item = hit_test(self, &it, evt->x, evt->y);
+         if(clicked_item)
+-        {
+             /* left single click */
+             fm_launch_file_simple(GTK_WINDOW(w), NULL, clicked_item->fi, pcmanfm_open_folder, w);
+-            return TRUE;
+-        }
+     }
+ 
+     /* forward the event to root window */
+-    if(! clicked_item)
+-        forward_event_to_rootwin(gtk_widget_get_screen(w), (GdkEvent*)evt);
++    if (self->button_pressed == evt->button)
++    {
++        if (self->forward_pending)
++            forward_event_to_rootwin(gtk_widget_get_screen(w), (GdkEvent*)evt);
++        self->button_pressed = 0;
++        self->forward_pending = FALSE;
++    }
+ 
+     return TRUE;
+ }
+--- a/src/desktop.h
++++ b/src/desktop.h
+@@ -73,13 +73,14 @@ struct _FmDesktop
+     gint drag_start_x;
+     gint drag_start_y;
+     gboolean rubber_bending : 1;
+-    gboolean button_pressed : 1;
++    gboolean forward_pending : 1;
+     gboolean dragging : 1;
+     gboolean layout_pending : 1;
+     guint idle_layout;
+     FmDndSrc* dnd_src;
+     FmDndDest* dnd_dest;
+     guint single_click_timeout_handler;
++    guint button_pressed;
+     FmFolderModel* model;
+     guint cur_desktop;
+     gint monitor;
+-- 
+2.1.4
+