SecBSD/xenocara
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-07-10 12:51:13 +00:00
parent 81739016d9
commit 48226b7c51
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
178 changed files with 76551 additions and 36405 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lib/libXaw/src/SimpleMenu.c
View file

@ -272,6 +272,9 @@ static CompositeClassExtensionRec extension_rec = {
XtCompositeExtensionVersion, /* version */
sizeof(CompositeClassExtensionRec), /* record_size */
True, /* accepts_objects */
#ifndef OLDXAW
False, /* allows_change_managed_set */
#endif
};
#define Superclass (&overrideShellClassRec)
@ -1070,7 +1073,9 @@ CreateLabel(Widget w)
*next_child = *child;
next_child = child;
}
*child = (Widget)smw->simple_menu.label;
if (child != NULL)
*child = (Widget)smw->simple_menu.label;
}
/*
@ -1105,8 +1110,6 @@ Layout(Widget w, Dimension *width_ret, Dimension *height_ret)
short vadd, hadd, x_ins, y_ins;
Dimension *widths;
height = 0;
if (XtIsSubclass(w, simpleMenuWidgetClass)) {
smw = (SimpleMenuWidget)w;
current_entry = NULL;
@ -1196,7 +1199,7 @@ Layout(Widget w, Dimension *width_ret, Dimension *height_ret)
++n;
}
height = (tmp_h + smw->simple_menu.bottom_margin);
height = (Dimension)(tmp_h + smw->simple_menu.bottom_margin);
width = (Dimension)(width + tmp_w);
if (smw->simple_menu.label && width < XtWidth(smw->simple_menu.label)) {
@ -1306,12 +1309,14 @@ AddPositionAction(XtAppContext app_con, XPointer data _X_UNUSED)
static Widget
FindMenu(Widget widget, String name)
{
Widget w, menu;
Widget w;
for (w = widget; w != NULL; w = XtParent(w))
if ((menu = XtNameToWidget(w, name)) != NULL)
for (w = widget; w != NULL; w = XtParent(w)) {
Widget menu = XtNameToWidget(w, name);
if (menu != NULL)
return (menu);
}
return (NULL);
}
@ -1458,11 +1463,12 @@ static void
MakeSetValuesRequest(Widget w, unsigned int width, unsigned int height)
{
SimpleMenuWidget smw = (SimpleMenuWidget)w;
Arg arglist[2];
Cardinal num_args = 0;
if (!smw->simple_menu.recursive_set_values) {
if (XtWidth(smw) != width || XtHeight(smw) != height) {
Arg arglist[2];
Cardinal num_args = 0;
smw->simple_menu.recursive_set_values = True;
XtSetArg(arglist[num_args], XtNwidth, width); num_args++;
XtSetArg(arglist[num_args], XtNheight, height); num_args++;
@ -1553,7 +1559,6 @@ GetEventEntry(Widget w, XEvent *event)
*/
if (x_root == WidthOfScreen(XtScreen(w)) - 1 &&
XtX(w) + XtWidth(w) + (XtBorderWidth(w)) > x_root) {
warp = -8;
if (smw->simple_menu.entry_set) {
entry = DoGetEventEntry(w,
XtX(smw->simple_menu.entry_set)