+2006-05-23 Jan Dj\e,Ad\e(Brv <jan.h.d@swipnet.se>
+
+ * xlwmenu.c: Include xterm.h if emacs instead of declaring functions
+ used.
+ (string_width): Declare as static.
+ (Start, pop_up_menu): Set is_hint to 0 before calling
+ handle_motion_event.
+ (pop_up_menu): Return value and parameters for x_catch_errors and
+ x_uncatch_errors changed.
+
2005-09-27 Dan Nicolaescu <dann@ics.uci.edu>
* xlwmenu.c (find_next_selectable):
extern int gray_bitmap_height;
extern char *gray_bitmap_bits;
-/* Defined in xterm.c. */
-extern int x_alloc_nearest_color_for_widget __P ((Widget, Colormap, XColor*));
-extern int x_alloc_lighter_color_for_widget __P ((Widget, Display*, Colormap,
- unsigned long *,
- double, int));
-extern int x_catch_errors __P ((Display*));
-extern void x_uncatch_errors P_ ((Display *, int));
-extern int x_had_errors_p __P ((Display*));
-extern void x_clear_errors __P ((Display*));
-extern unsigned long x_copy_dpy_color __P ((Display *, Colormap,
- unsigned long));
-
-/* Defined in xfaces.c. */
-extern void x_free_dpy_colors __P ((Display *, Screen *, Colormap,
- unsigned long *pixels, int npixels));
+#include "xterm.h"
+
#else /* not emacs */
#include <X11/bitmaps/gray>
}
\f/* Size code */
-int
+static int
string_width (mw, s)
XlwMenuWidget mw;
char *s;
mw->menu.windows [0].y = ev->xmotion.y_root - ev->xmotion.y;
/* handles the down like a move, slots are compatible */
+ ev->xmotion.is_hint = 0;
handle_motion_event (mw, &ev->xmotion);
}
}
int borderwidth = mw->menu.shadow_thickness;
Screen* screen = XtScreen (mw);
Display *display = XtDisplay (mw);
- int count;
next_release_must_exit = 0;
}
#ifdef emacs
- count = x_catch_errors (display);
+ x_catch_errors (display);
#endif
if (XtGrabPointer ((Widget)mw, False,
(PointerMotionMask
pointer_grabbed = 0;
XtUngrabPointer ((Widget)mw, event->time);
}
- x_uncatch_errors (display, count);
+ x_uncatch_errors ();
#endif
+ ((XMotionEvent*)event)->is_hint = 0;
handle_motion_event (mw, (XMotionEvent*)event);
}