Merge changes from emacs-23 branch.

8 files changed, 70 insertions, 25 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 04e74667bc3..02c2969242f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,25 @@
+2010-07-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.h (x_menubar_window_to_frame): Second parameter is XEvent*.
+
+        * xterm.c (handle_one_xevent): Pass event to x_menubar_window_to_frame.
+
+        * xmenu.c (x_activate_menubar): Revert previous fix for Bug#6499,
+        i.e. don't put back ButtonRelease (Bug#6608).
+
+        * xfns.c (x_menubar_window_to_frame): Take XEvent as second parameter
+        instead of Window.  Call xg_event_is_for_menubar when
+        USE_GTK (Bug#6499).
+
+        * gtkutil.h (xg_event_is_for_menubar): Declare.
+
+        * gtkutil.c (xg_event_is_for_menubar): New function (Bug#6499).
+
+2010-07-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (x_set_foreground_color): Fix setting the cursor color
+        when it's the same as the old foreground.  (Bug#6609)
+
 2010-07-16  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xmenu.c (free_frame_menubar): Only call x_set_window_size if
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 396d9018e36..8676aa6200c 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -2856,6 +2856,38 @@ free_frame_menubar (FRAME_PTR f)
     }
 }
 
+int
+xg_event_is_for_menubar (FRAME_PTR f, XEvent *event)
+{
+  struct x_output *x = f->output_data.x;
+
+  if (! x->menubar_widget) return 0;
+
+  if (! (event->xbutton.x >= 0
+         && event->xbutton.x < FRAME_PIXEL_WIDTH (f)
+         && event->xbutton.y >= 0
+         && event->xbutton.y < f->output_data.x->menubar_height
+         && event->xbutton.same_screen))
+    return 0;
+
+  GList *list = gtk_container_get_children (GTK_CONTAINER (x->menubar_widget));
+  if (! list) return 0;
+  GList *iter;
+  GdkRectangle rec;
+  rec.x = event->xbutton.x;
+  rec.y = event->xbutton.y;
+  rec.width = 1;
+  rec.height = 1;
+  for (iter = list ; iter; iter = g_list_next (iter))
+    {
+      GtkWidget *w = GTK_WIDGET (iter->data);
+      if (GTK_WIDGET_MAPPED (w) && gtk_widget_intersect (w, &rec, NULL))
+        break;
+    }
+  g_list_free (list);
+  return iter == 0 ? 0 : 1;
+}
+
 
 
 /***********************************************************************
diff --git a/src/gtkutil.h b/src/gtkutil.h
index fcd23b65132..14693650de5 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -153,6 +153,8 @@ extern void xg_modify_menubar_widgets (GtkWidget *menubar,
 
 extern int xg_update_frame_menubar (FRAME_PTR f);
 
+extern int xg_event_is_for_menubar (FRAME_PTR f, XEvent *event);
+
 extern int xg_have_tear_offs (void);
 
 extern int xg_get_scroll_id_for_window (Display *dpy, Window wid);
diff --git a/src/w32fns.c b/src/w32fns.c
index c1791f2bf3e..57786d76795 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1333,7 +1333,10 @@ x_set_foreground_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
   if (FRAME_W32_WINDOW (f) != 0)
     {
       if (x->cursor_pixel == old_fg)
-        x->cursor_pixel = fg;
+        {
+          x->cursor_pixel = fg;
+          x->cursor_gc->background = fg;
+        }
 
       update_face_from_frame_parameter (f, Qforeground_color, arg);
       if (FRAME_VISIBLE_P (f))
diff --git a/src/xfns.c b/src/xfns.c
index c2135781811..ee020371683 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -398,8 +398,9 @@ x_any_window_to_frame (struct x_display_info *dpyinfo, int wdesc)
 /* Likewise, but consider only the menu bar widget.  */
 
 struct frame *
-x_menubar_window_to_frame (struct x_display_info *dpyinfo, int wdesc)
+x_menubar_window_to_frame (struct x_display_info *dpyinfo, XEvent *event)
 {
+  Window wdesc = event->xany.window;
   Lisp_Object tail, frame;
   struct frame *f;
   struct x_output *x;
@@ -415,21 +416,11 @@ x_menubar_window_to_frame (struct x_display_info *dpyinfo, int wdesc)
       if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
         continue;
       x = f->output_data.x;
-      /* Match if the window is this frame's menubar.  */
 #ifdef USE_GTK
-      if (x->menubar_widget)
-        {
-          GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
-
-          /* This gives false positives, but the rectangle check in xterm.c
-             where this is called takes care of that.  */
-          if (gwdesc != 0
-              && (gwdesc == x->menubar_widget
-                  || gtk_widget_is_ancestor (x->menubar_widget, gwdesc)
-                  || gtk_widget_is_ancestor (gwdesc, x->menubar_widget)))
-            return f;
-        }
+      if (x->menubar_widget && xg_event_is_for_menubar (f, event))
+        return f;
 #else
+      /* Match if the window is this frame's menubar.  */
       if (x->menubar_widget
           && lw_window_is_in_menubar (wdesc, x->menubar_widget))
         return f;
diff --git a/src/xmenu.c b/src/xmenu.c
index 82b315f83cb..2fb39339b98 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -664,14 +664,6 @@ x_activate_menubar (FRAME_PTR f)
   BLOCK_INPUT;
   popup_activated_flag = 1;
 #ifdef USE_GTK
-  /* If we click outside any menu item, the menu bar still grabs.
-     So we send Press and the Release.  If outside, grab is released.
-     If on a menu item, it is popped up normally.
-     PutBack is like a stack, so we put back in reverse order.  */
-  f->output_data.x->saved_menu_event->type = ButtonRelease;
-  XPutBackEvent (f->output_data.x->display_info->display,
-                 f->output_data.x->saved_menu_event);
-  f->output_data.x->saved_menu_event->type = ButtonPress;
   XPutBackEvent (f->output_data.x->display_info->display,
                  f->output_data.x->saved_menu_event);
 #else
diff --git a/src/xterm.c b/src/xterm.c
index 0f6d432f979..ddc7a167684 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6743,7 +6743,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventp, int *finish,
           f->mouse_moved = 0;
 
 #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
-        f = x_menubar_window_to_frame (dpyinfo, event.xbutton.window);
+        f = x_menubar_window_to_frame (dpyinfo, &event);
         /* For a down-event in the menu bar,
            don't pass it to Xt right now.
            Instead, save it away
diff --git a/src/xterm.h b/src/xterm.h
index b22c225fed7..5c1213d2bf1 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -381,12 +381,15 @@ extern int use_xim;
 #endif
 
 /* This checks to make sure we have a display.  */
+
 extern void check_x (void);
 
 extern struct frame *x_window_to_frame (struct x_display_info *, int);
 
 extern struct frame *x_any_window_to_frame (struct x_display_info *, int);
-extern struct frame *x_menubar_window_to_frame (struct x_display_info *, int);
+extern struct frame *x_menubar_window_to_frame (struct x_display_info *,
+                                                XEvent *);
+
 extern struct frame *x_top_window_to_frame (struct x_display_info *, int);
 
 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)