You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "lwlib-Xlw.h"
#include <X11/StringDefs.h>
#include "xlwmenu.h"
\f/* Menu callbacks */
+
+/* Callback XtNhighlightCallback for Lucid menus. W is the menu
+ widget, CLIENT_DATA contains a pointer to the widget_instance
+ for the menu, CALL_DATA contains a pointer to the widget_value
+ structure for the highlighted menu item. The latter may be null
+ if there isn't any highlighted menu item. */
+
+static void
+highlight_hook (w, client_data, call_data)
+ Widget w;
+ XtPointer client_data;
+ XtPointer call_data;
+{
+ widget_instance *instance = (widget_instance *) client_data;
+
+ if (instance->info->highlight_cb
+ && !w->core.being_destroyed)
+ instance->info->highlight_cb (w, instance->info->id, call_data);
+}
+
static void
pre_hook (w, client_data, call_data)
Widget w;
widget_instance* instance;
{
Widget widget;
-
- widget_value *tem = malloc_widget_value ();
-
- /* _XtCreate is freeing the object we passed,
- so make a copy that we free later. */
- bcopy (instance->info->val, tem, sizeof (widget_value));
-
- widget =
- XtVaCreateWidget (instance->info->name, xlwMenuWidgetClass,
- instance->parent,
- XtNmenu, tem,
- 0);
-
- free_widget_value (tem);
+ Arg al[5];
+ int ac = 0;
+
+ XtSetArg (al[ac], XtNmenu, instance->info->val); ac++;
+#ifdef emacs
+ XtSetArg (al[ac], XtNshowGrip, 0); ac++;
+ XtSetArg (al[ac], XtNresizeToPreferred, 1); ac++;
+ XtSetArg (al[ac], XtNallowResize, 1); ac++;
+#endif
+
+ /* This used to use XtVaCreateWidget, but an old Xt version
+ has a bug in XtVaCreateWidget that frees instance->info->name. */
+ widget
+ = XtCreateWidget (instance->info->name, xlwMenuWidgetClass,
+ instance->parent, al, ac);
XtAddCallback (widget, XtNopen, pre_hook, (XtPointer)instance);
XtAddCallback (widget, XtNselect, pick_hook, (XtPointer)instance);
+ XtAddCallback (widget, XtNhighlightCallback, highlight_hook,
+ (XtPointer)instance);
return widget;
}
xlw_create_popup_menu (instance)
widget_instance* instance;
{
- Widget popup_shell =
- XtCreatePopupShell (instance->info->name, overrideShellWidgetClass,
- instance->parent, NULL, 0);
+ Widget popup_shell
+ = XtCreatePopupShell (instance->info->name, overrideShellWidgetClass,
+ instance->parent, NULL, 0);
Widget widget;
+ Arg al[2];
+ int ac = 0;
- widget_value *tem = malloc_widget_value ();
-
- /* _XtCreate is freeing the object we passed,
- so make a copy that we free later. */
- bcopy (instance->info->val, tem, sizeof (widget_value));
-
- widget =
- XtVaCreateManagedWidget ("popup", xlwMenuWidgetClass,
- popup_shell,
- XtNmenu, tem,
- XtNhorizontal, False,
- 0);
+ XtSetArg (al[ac], XtNmenu, instance->info->val); ac++;
+ XtSetArg (al[ac], XtNhorizontal, False); ac++;
- free_widget_value (tem);
+ /* This used to use XtVaManagedCreateWidget, but an old Xt version
+ has a bug in XtVaManagedCreateWidget that frees instance->info->name. */
+ widget
+ = XtCreateManagedWidget ("popup", xlwMenuWidgetClass,
+ popup_shell, al, ac);
XtAddCallback (widget, XtNselect, pick_hook, (XtPointer)instance);
-
+ XtAddCallback (widget, XtNhighlightCallback, highlight_hook,
+ (XtPointer)instance);
return popup_shell;
}
Widget widget;
{
WidgetClass the_class = XtClass (widget);
+
if (the_class == xlwMenuWidgetClass)
return True;
if (the_class == overrideShellWidgetClass)
- return
- XtClass (((CompositeWidget)widget)->composite.children [0])
- == xlwMenuWidgetClass;
+ return (XtClass (((CompositeWidget)widget)->composite.children [0])
+ == xlwMenuWidgetClass);
return False;
}
Boolean deep_p;
{
XlwMenuWidget mw;
+ Arg al[1];
if (XtIsShell (widget))
mw = (XlwMenuWidget)((CompositeWidget)widget)->composite.children [0];
else
mw = (XlwMenuWidget)widget;
- XtVaSetValues (widget, XtNmenu, val, 0);
+
+ /* This used to use XtVaSetValues, but some old Xt versions
+ that have a bug in XtVaCreateWidget might have it here too. */
+ XtSetArg (al[0], XtNmenu, instance->info->val);
+
+ XtSetValues (widget, al, 1);
}
void
}
void
-xlw_popup_menu (widget)
+xlw_popup_menu (widget, event)
Widget widget;
+ XEvent *event;
{
XButtonPressedEvent dummy;
XlwMenuWidget mw;
mw = (XlwMenuWidget)((CompositeWidget)widget)->composite.children [0];
- dummy.type = ButtonPress;
- dummy.serial = 0;
- dummy.send_event = 0;
- dummy.display = XtDisplay (widget);
- dummy.window = XtWindow (XtParent (widget));
- dummy.time = CurrentTime;
- dummy.button = 0;
- XQueryPointer (dummy.display, dummy.window, &dummy.root,
- &dummy.subwindow, &dummy.x_root, &dummy.y_root,
- &dummy.x, &dummy.y, &dummy.state);
-
- pop_up_menu (mw, &dummy);
+ if (event)
+ pop_up_menu (mw, event);
+ else
+ {
+ dummy.type = ButtonPress;
+ dummy.serial = 0;
+ dummy.send_event = 0;
+ dummy.display = XtDisplay (widget);
+ dummy.window = XtWindow (XtParent (widget));
+ dummy.time = CurrentTime;
+ dummy.button = 0;
+ XQueryPointer (dummy.display, dummy.window, &dummy.root,
+ &dummy.subwindow, &dummy.x_root, &dummy.y_root,
+ &dummy.x, &dummy.y, &dummy.state);
+
+ pop_up_menu (mw, &dummy);
+ }
}
\f/* Destruction of instances */
HCoop / bpt / emacs.git / blobdiff