sync with OpenBSD -current
This commit is contained in:
parent
5d45cd7ee8
commit
155eb8555e
5506 changed files with 1786257 additions and 1416034 deletions
|
@ -24,6 +24,10 @@ in this Software without prior written authorization from The Open Group.
|
|||
*/
|
||||
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <X11/Intrinsic.h>
|
||||
#include <X11/StringDefs.h>
|
||||
|
||||
|
@ -180,8 +184,8 @@ PannerCallback(Widget w, XtPointer closure, XtPointer report_ptr)
|
|||
if (global_tree_info == NULL)
|
||||
return;
|
||||
|
||||
XtSetArg (args[0], XtNx, -report->slider_x);
|
||||
XtSetArg (args[1], XtNy, -report->slider_y);
|
||||
XtSetArg (args[0], (String)XtNx, -report->slider_x);
|
||||
XtSetArg (args[1], (String)XtNy, -report->slider_y);
|
||||
|
||||
XtSetValues(global_tree_info->tree_widget, args, TWO);
|
||||
}
|
||||
|
@ -204,13 +208,13 @@ PortholeCallback(Widget w, XtPointer panner_ptr, XtPointer report_ptr)
|
|||
XawPannerReport *report = (XawPannerReport *) report_ptr;
|
||||
Widget panner = (Widget) panner_ptr;
|
||||
|
||||
XtSetArg (args[n], XtNsliderX, report->slider_x); n++;
|
||||
XtSetArg (args[n], XtNsliderY, report->slider_y); n++;
|
||||
XtSetArg (args[n], (String)XtNsliderX, report->slider_x); n++;
|
||||
XtSetArg (args[n], (String)XtNsliderY, report->slider_y); n++;
|
||||
if (report->changed != (XawPRSliderX | XawPRSliderY)) {
|
||||
XtSetArg (args[n], XtNsliderWidth, report->slider_width); n++;
|
||||
XtSetArg (args[n], XtNsliderHeight, report->slider_height); n++;
|
||||
XtSetArg (args[n], XtNcanvasWidth, report->canvas_width); n++;
|
||||
XtSetArg (args[n], XtNcanvasHeight, report->canvas_height); n++;
|
||||
XtSetArg (args[n], (String)XtNsliderWidth, report->slider_width); n++;
|
||||
XtSetArg (args[n], (String)XtNsliderHeight, report->slider_height); n++;
|
||||
XtSetArg (args[n], (String)XtNcanvasWidth, report->canvas_width); n++;
|
||||
XtSetArg (args[n], (String)XtNcanvasHeight, report->canvas_height); n++;
|
||||
}
|
||||
XtSetValues (panner, args, n);
|
||||
}
|
||||
|
@ -320,7 +324,7 @@ AnyChosen(Widget w, XtPointer any_info_ptr, XtPointer state_ptr)
|
|||
XtSetSensitive(any_info->left_dot, FALSE);
|
||||
XtSetSensitive(any_info->left_star, FALSE);
|
||||
|
||||
XtSetArg(args[0], XtNstate, TRUE);
|
||||
XtSetArg(args[0], (String)XtNstate, TRUE);
|
||||
XtSetValues(any_info->left_star, args, ONE);
|
||||
}
|
||||
|
||||
|
@ -328,7 +332,7 @@ AnyChosen(Widget w, XtPointer any_info_ptr, XtPointer state_ptr)
|
|||
XtSetSensitive(any_info->right_dot, FALSE);
|
||||
XtSetSensitive(any_info->right_star, FALSE);
|
||||
|
||||
XtSetArg(args[0], XtNstate, TRUE);
|
||||
XtSetArg(args[0], (String)XtNstate, TRUE);
|
||||
XtSetValues(any_info->right_star, args, ONE);
|
||||
}
|
||||
any_info->left_count++;
|
||||
|
@ -346,7 +350,7 @@ AnyChosen(Widget w, XtPointer any_info_ptr, XtPointer state_ptr)
|
|||
XtSetSensitive(any_info->left_dot, TRUE);
|
||||
XtSetSensitive(any_info->left_star, TRUE);
|
||||
|
||||
XtSetArg(args[0], XtNstate, TRUE);
|
||||
XtSetArg(args[0], (String)XtNstate, TRUE);
|
||||
XtSetValues(any_info->left_dot, args, ONE);
|
||||
}
|
||||
|
||||
|
@ -354,7 +358,7 @@ AnyChosen(Widget w, XtPointer any_info_ptr, XtPointer state_ptr)
|
|||
XtSetSensitive(any_info->right_dot, TRUE);
|
||||
XtSetSensitive(any_info->right_star, TRUE);
|
||||
|
||||
XtSetArg(args[0], XtNstate, TRUE);
|
||||
XtSetArg(args[0], (String)XtNstate, TRUE);
|
||||
XtSetValues(any_info->right_dot, args, ONE);
|
||||
}
|
||||
}
|
||||
|
@ -382,7 +386,7 @@ GetResourceName(ResourceBoxInfo *res_box)
|
|||
}
|
||||
|
||||
if (list_info->list_index == XAW_LIST_NONE)
|
||||
result = "unknown";
|
||||
result = (String)"unknown";
|
||||
else
|
||||
result = list_info->string;
|
||||
|
||||
|
@ -467,7 +471,7 @@ SetResourceString(Widget w, XtPointer node_ptr, XtPointer junk)
|
|||
len = strlen(buf) + 2; /* Leave space for ':' and '\0' */
|
||||
|
||||
#ifdef notdef
|
||||
XtSetArg(args[0], XtNstring, &temp);
|
||||
XtSetArg(args[0], (String)XtNstring, &temp);
|
||||
XtGetValues(res_box->value_wid, args, ONE);
|
||||
len += strlen(temp);
|
||||
#endif
|
||||
|
@ -483,7 +487,7 @@ SetResourceString(Widget w, XtPointer node_ptr, XtPointer junk)
|
|||
strcat(malloc_string, temp);
|
||||
#endif
|
||||
|
||||
XtSetArg(args[0], XtNlabel, malloc_string);
|
||||
XtSetArg(args[0], (String)XtNlabel, malloc_string);
|
||||
XtSetValues(res_box->res_label, args, ONE);
|
||||
}
|
||||
|
||||
|
@ -571,10 +575,10 @@ _AppendResourceString(Widget w, XtPointer res_box_ptr, XtPointer filename_ptr)
|
|||
return;
|
||||
}
|
||||
|
||||
XtSetArg(args[0], XtNlabel, &resource_string);
|
||||
XtSetArg(args[0], (String)XtNlabel, &resource_string);
|
||||
XtGetValues(res_box->res_label, args, ONE);
|
||||
|
||||
XtSetArg(args[0], XtNstring, &value_ptr);
|
||||
XtSetArg(args[0], (String)XtNstring, &value_ptr);
|
||||
XtGetValues(res_box->value_wid, args, ONE);
|
||||
|
||||
fprintf(fp, "%s %s\n", resource_string, value_ptr);
|
||||
|
@ -677,7 +681,7 @@ ApplyResource(Widget w, XtPointer node_ptr, XtPointer junk)
|
|||
info.stream = stream;
|
||||
info.count = 0;
|
||||
|
||||
XtSetArg(args[0], XtNlabel, &value);
|
||||
XtSetArg(args[0], (String)XtNlabel, &value);
|
||||
XtGetValues(node->resources->res_box->res_label, args, ONE);
|
||||
|
||||
info.database = NULL;
|
||||
|
@ -743,7 +747,7 @@ ObtainResource(XtPointer node_ptr)
|
|||
info.stream = stream;
|
||||
info.count = 1;
|
||||
|
||||
XtSetArg(args[0], XtNlabel, &value);
|
||||
XtSetArg(args[0], (String)XtNlabel, &value);
|
||||
XtGetValues(node->resources->res_box->res_label, args, ONE);
|
||||
|
||||
info.database = NULL;
|
||||
|
@ -858,7 +862,7 @@ ActivateResourceWidgets(Widget w, XtPointer node_ptr, XtPointer junk)
|
|||
info.count = 0;
|
||||
info.stream = NULL;
|
||||
|
||||
XtSetArg(args[0], XtNlabel, &line);
|
||||
XtSetArg(args[0], (String)XtNlabel, &line);
|
||||
XtGetValues(node->resources->res_box->res_label, args, ONE);
|
||||
|
||||
info.database = NULL;
|
||||
|
@ -895,7 +899,7 @@ SetOnlyMatchingWidgets(WNode *node, XtPointer info_ptr)
|
|||
|
||||
state = CheckDatabase(info->database, name_quarks, class_quarks);
|
||||
|
||||
XtSetArg(args[0], XtNstate, state);
|
||||
XtSetArg(args[0], (String)XtNstate, state);
|
||||
XtSetValues(node->widget, args, ONE);
|
||||
TreeToggle(node->widget, (XtPointer) node, (XtPointer)(long) state);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue