comparison lwlib/xlwmenu.c @ 9092:0033f98d2ffd

Clean up of temporary changes used to try to find a workaround for the X11R4 Xt bug whereby motion events are not generated from submenus.

9091:557a04cd151b

#include <X11/ObjectP.h>
#include <X11/StringDefs.h>
#include <X11/cursorfont.h>
#include <X11/bitmaps/gray>
#include "xlwmenuP.h"

static int disable_add_grab, disable_grab_pointer;

static int pointer_grabbed;
static XEvent menu_post_event;

static char 

    pop_new_stack_if_no_contents (mw);
  else
    set_new_state (mw, val, level);
  remap_menubar (mw);
  
#if 1
  /* Sync with the display.  Makes it feel better on X terms. */
  XSync (XtDisplay (mw), False);
#endif
}

static void
handle_motion_event (mw, ev)
     XlwMenuWidget mw;

  int state = ev->state;

  handle_single_motion_event (mw, ev);

  /* allow motion events to be generated again */
#if 0
  if (ev->is_hint
      && XQueryPointer (XtDisplay (mw), ev->window,
			&ev->root, &ev->subwindow,
			&ev->x_root, &ev->y_root,
			&ev->x, &ev->y,
			&ev->state)
      && ev->state == state
      && (ev->x_root != x || ev->y_root != y))
    handle_single_motion_event (mw, ev);
#else
  XQueryPointer (XtDisplay (mw), ev->window,
		 &ev->root, &ev->subwindow,
		 &ev->x_root, &ev->y_root,
		 &ev->x, &ev->y,
		 &ev->state);
  handle_single_motion_event (mw, ev);
#endif
}

static void 
Start (w, ev, params, num_params)
     Widget w;

    }
  else
    {
      XEvent *ev = (XEvent *) event;

      if (!disable_add_grab)
	XtAddGrab ((Widget) mw, True, True);

      /* notes the absolute position of the menubar window */
      mw->menu.windows [0].x = ev->xmotion.x_root - ev->xmotion.x;
      mw->menu.windows [0].y = ev->xmotion.y_root - ev->xmotion.y;
    }

#ifdef emacs
  x_catch_errors ();
#endif
  if (!disable_grab_pointer)
    {
      XtGrabPointer ((Widget)mw, False,
		     (PointerMotionMask
		      | PointerMotionHintMask
		      | ButtonReleaseMask
		      | ButtonPressMask),
		     GrabModeAsync, GrabModeAsync, None,
		     mw->menu.cursor_shape,
		     event->time);
      pointer_grabbed = 1;
    }
#ifdef emacs
  if (x_had_errors_p ())
    {
      pointer_grabbed = 0;
      XtUngrabPointer ((Widget)mw, event->time);

  x_uncatch_errors ();
#endif

  handle_motion_event (mw, (XMotionEvent*)event);
}

void GetWindowAttributes (w)
     Widget w;
{
  XWindowAttributes attrs;

  XGetWindowAttributes (XtDisplay (w),
			XtWindow (w),
			&attrs);
}

9092:0033f98d2ffd

#include <X11/ObjectP.h>
#include <X11/StringDefs.h>
#include <X11/cursorfont.h>
#include <X11/bitmaps/gray>
#include "xlwmenuP.h"

static int pointer_grabbed;
static XEvent menu_post_event;

static char 

    pop_new_stack_if_no_contents (mw);
  else
    set_new_state (mw, val, level);
  remap_menubar (mw);
  
  /* Sync with the display.  Makes it feel better on X terms. */
  XSync (XtDisplay (mw), False);
}

static void
handle_motion_event (mw, ev)
     XlwMenuWidget mw;

  int state = ev->state;

  handle_single_motion_event (mw, ev);

  /* allow motion events to be generated again */
  if (ev->is_hint
      && XQueryPointer (XtDisplay (mw), ev->window,
			&ev->root, &ev->subwindow,
			&ev->x_root, &ev->y_root,
			&ev->x, &ev->y,
			&ev->state)
      && ev->state == state
      && (ev->x_root != x || ev->y_root != y))
    handle_single_motion_event (mw, ev);
}

static void 
Start (w, ev, params, num_params)
     Widget w;

    }
  else
    {
      XEvent *ev = (XEvent *) event;

      XtAddGrab ((Widget) mw, True, True);

      /* notes the absolute position of the menubar window */
      mw->menu.windows [0].x = ev->xmotion.x_root - ev->xmotion.x;
      mw->menu.windows [0].y = ev->xmotion.y_root - ev->xmotion.y;
    }

#ifdef emacs
  x_catch_errors ();
#endif
  XtGrabPointer ((Widget)mw, False,
		 (PointerMotionMask
		  | PointerMotionHintMask
		  | ButtonReleaseMask
		  | ButtonPressMask),
		 GrabModeAsync, GrabModeAsync, None,
		 mw->menu.cursor_shape,
		 event->time);
  pointer_grabbed = 1;
#ifdef emacs
  if (x_had_errors_p ())
    {
      pointer_grabbed = 0;
      XtUngrabPointer ((Widget)mw, event->time);

  x_uncatch_errors ();
#endif

  handle_motion_event (mw, (XMotionEvent*)event);
}