Fixed sentinels in Xt, editres and xedit to reduce number of warnings with
gcc4 (Andreas Schwab).
This commit is contained in:
parent
277ff06e99
commit
de5d24a200
|
@ -122,7 +122,7 @@ CreateAccessXHelpDialog()
|
|||
|
||||
shell = XtVaCreatePopupShell("accessx", transientShellWidgetClass, toplevel,
|
||||
XtNx, toplevel->core.x + toplevel->core.width,
|
||||
XtNy, toplevel->core.y, NULL, 0);
|
||||
XtNy, toplevel->core.y, NULL);
|
||||
form = XtCreateManagedWidget("form", formWidgetClass, shell, NULL, 0);
|
||||
XtCreateManagedWidget("label", labelWidgetClass, form, NULL, 0);
|
||||
XtCreateManagedWidget("lock", labelWidgetClass, form, NULL, 0);
|
||||
|
@ -181,7 +181,7 @@ AccessXInitialize(void)
|
|||
XtNstate,
|
||||
(xkb_info->xkb->ctrls->enabled_ctrls &
|
||||
(XkbAccessXKeysMask | XkbStickyKeysMask |
|
||||
XkbSlowKeysMask | XkbBounceKeysMask)) != 0, NULL, 0);
|
||||
XkbSlowKeysMask | XkbBounceKeysMask)) != 0, NULL);
|
||||
|
||||
apply = XtCreateManagedWidget("apply", commandWidgetClass, accessx, NULL, 0);
|
||||
XtAddCallback(apply, XtNcallback, ApplyCallback, NULL);
|
||||
|
@ -191,7 +191,7 @@ AccessXInitialize(void)
|
|||
form, XtNstate,
|
||||
xkb_info->xkb->ctrls->ax_timeout > 60
|
||||
&& xkb_info->xkb->ctrls->ax_timeout
|
||||
< 30000, NULL, 0);
|
||||
< 30000, NULL);
|
||||
XtAddCallback(timeoutToggle, XtNcallback, ScaleEnableCallback,
|
||||
(XtPointer)timeout);
|
||||
timeout->label = XtCreateManagedWidget("timeoutLabel", labelWidgetClass,
|
||||
|
@ -211,24 +211,24 @@ AccessXInitialize(void)
|
|||
sticky = XtVaCreateManagedWidget("sticky", toggleWidgetClass, form,
|
||||
XtNstate,
|
||||
(xkb_info->xkb->ctrls->enabled_ctrls &
|
||||
XkbStickyKeysMask) != 0, NULL, 0);
|
||||
XkbStickyKeysMask) != 0, NULL);
|
||||
stickyForm = XtCreateManagedWidget("stickyForm", formWidgetClass,
|
||||
form, NULL, 0);
|
||||
XtAddCallback(sticky, XtNcallback, EnableCallback, (XtPointer)stickyForm);
|
||||
stickyAuto = XtVaCreateManagedWidget("auto", toggleWidgetClass, stickyForm,
|
||||
XtNstate,
|
||||
(xkb_info->xkb->ctrls->ax_options &
|
||||
XkbAX_LatchToLockMask) == 0, NULL, 0);
|
||||
XkbAX_LatchToLockMask) == 0, NULL);
|
||||
stickyBeep = XtVaCreateManagedWidget("beep", toggleWidgetClass, stickyForm,
|
||||
XtNstate,
|
||||
(xkb_info->xkb->ctrls->ax_options &
|
||||
XkbAX_StickyKeysFBMask) != 0, NULL, 0);
|
||||
XkbAX_StickyKeysFBMask) != 0, NULL);
|
||||
|
||||
mouse = XtVaCreateManagedWidget("mouseKeys", toggleWidgetClass, form,
|
||||
XtNstate,
|
||||
(xkb_info->xkb->ctrls->enabled_ctrls &
|
||||
(XkbMouseKeysMask | XkbMouseKeysAccelMask))
|
||||
!= 0, NULL, 0);
|
||||
!= 0, NULL);
|
||||
mouseForm = XtCreateManagedWidget("mouseForm", formWidgetClass,
|
||||
form, NULL, 0);
|
||||
XtAddCallback(mouse, XtNcallback, EnableCallback, (XtPointer)mouseForm);
|
||||
|
@ -278,7 +278,7 @@ AccessXInitialize(void)
|
|||
repeat = XtVaCreateManagedWidget("repeatKeys", toggleWidgetClass, form,
|
||||
XtNstate,
|
||||
(xkb_info->xkb->ctrls->enabled_ctrls &
|
||||
XkbRepeatKeysMask) != 0, NULL, 0);
|
||||
XkbRepeatKeysMask) != 0, NULL);
|
||||
repeatForm = XtCreateManagedWidget("repeatForm", formWidgetClass,
|
||||
form, NULL, 0);
|
||||
XtAddCallback(repeat, XtNcallback, EnableCallback, (XtPointer)repeatForm);
|
||||
|
@ -314,7 +314,7 @@ AccessXInitialize(void)
|
|||
slowToggle = XtVaCreateManagedWidget("slow", toggleWidgetClass,
|
||||
form, XtNstate,
|
||||
(xkb_info->xkb->ctrls->enabled_ctrls &
|
||||
XkbSlowKeysMask) != 0, NULL, 0);
|
||||
XkbSlowKeysMask) != 0, NULL);
|
||||
slowForm = XtCreateManagedWidget("slowForm", formWidgetClass,
|
||||
form, NULL, 0);
|
||||
XtAddCallback(slowToggle, XtNcallback, EnableCallback, (XtPointer)slowForm);
|
||||
|
@ -323,12 +323,12 @@ AccessXInitialize(void)
|
|||
slowForm, XtNstate,
|
||||
(xkb_info->xkb->ctrls->ax_options &
|
||||
XkbAX_SKPressFBMask) != 0,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
slowAccepted = XtVaCreateManagedWidget("accepted", toggleWidgetClass,
|
||||
slowForm, XtNstate,
|
||||
(xkb_info->xkb->ctrls->ax_options &
|
||||
XkbAX_SKAcceptFBMask) != 0,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
slow = XtNew(Scale);
|
||||
slow->label = XtCreateManagedWidget("slowLabel", labelWidgetClass,
|
||||
slowForm, NULL, 0);
|
||||
|
@ -348,7 +348,7 @@ AccessXInitialize(void)
|
|||
form, XtNstate,
|
||||
(xkb_info->xkb->ctrls->enabled_ctrls &
|
||||
XkbBounceKeysMask) != 0,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
bounceForm = XtCreateManagedWidget("bounceForm", formWidgetClass,
|
||||
form, NULL, 0);
|
||||
XtAddCallback(bounceToggle, XtNcallback, EnableCallback, (XtPointer)bounceForm);
|
||||
|
|
|
@ -280,7 +280,7 @@ CardModelCallback(Widget w, XtPointer user_data, XtPointer call_data)
|
|||
if (!nomodules) {
|
||||
XtFree(driver_str);
|
||||
driver_str = XtNewString(card_entry->driver);
|
||||
XtVaSetValues(driver, XtNlabel, driver_str, NULL, 0);
|
||||
XtVaSetValues(driver, XtNlabel, driver_str, NULL);
|
||||
}
|
||||
#endif
|
||||
len += XmuSnprintf(tip + len, sizeof(tip) - len,
|
||||
|
@ -381,14 +381,14 @@ CardModel(XF86SetupInfo *info)
|
|||
filter = XtVaCreateManagedWidget("filter", asciiTextWidgetClass,
|
||||
model,
|
||||
XtNeditType, XawtextEdit,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
viewport = XtCreateManagedWidget("viewport", viewportWidgetClass,
|
||||
model, NULL, 0);
|
||||
list = XtVaCreateManagedWidget("list", listWidgetClass,
|
||||
viewport,
|
||||
XtNlist, cards,
|
||||
XtNnumberStrings, ncards,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XtAddCallback(list, XtNcallback, CardModelCallback,
|
||||
(XtPointer)info);
|
||||
XtCreateManagedWidget("driverL", labelWidgetClass, model, NULL, 0);
|
||||
|
@ -397,7 +397,7 @@ CardModel(XF86SetupInfo *info)
|
|||
driver = XtVaCreateManagedWidget("driver", menuButtonWidgetClass,
|
||||
model,
|
||||
XtNmenuName, "driverM",
|
||||
NULL, 0);
|
||||
NULL);
|
||||
{
|
||||
Widget menu, sme;
|
||||
xf86cfgModuleOptions *opts = module_options;
|
||||
|
@ -419,13 +419,13 @@ CardModel(XF86SetupInfo *info)
|
|||
driver = XtVaCreateManagedWidget("driver", asciiTextWidgetClass,
|
||||
model,
|
||||
XtNeditType, XawtextEdit,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
|
||||
XtCreateManagedWidget("busidL", labelWidgetClass, model, NULL, 0);
|
||||
busid = XtVaCreateManagedWidget("busid", asciiTextWidgetClass,
|
||||
model,
|
||||
XtNeditType, XawtextEdit,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
|
||||
XtRealizeWidget(model);
|
||||
}
|
||||
|
|
|
@ -149,7 +149,7 @@ StartConfig(void)
|
|||
ident_widget = XtVaCreateManagedWidget("identifier", asciiTextWidgetClass,
|
||||
top,
|
||||
XtNeditType, XawtextEdit,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
configp = XtCreateManagedWidget("work", formWidgetClass,
|
||||
pane, NULL, 0);
|
||||
current = XtCreateManagedWidget("wellcome", labelWidgetClass,
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -95,7 +95,7 @@ Help(char *topic)
|
|||
str = XtMalloc(len = strlen(topic) + strlen(def_text) + 1);
|
||||
XmuSnprintf(str, len, def_text, topic);
|
||||
}
|
||||
XtVaSetValues(text, XtNstring, str, NULL, 0);
|
||||
XtVaSetValues(text, XtNstring, str, NULL);
|
||||
if (error)
|
||||
XtFree(str);
|
||||
|
||||
|
@ -128,7 +128,7 @@ StartHelp(void)
|
|||
pane = XtCreateManagedWidget("pane", panedWidgetClass,
|
||||
shell, NULL, 0);
|
||||
text = XtVaCreateManagedWidget("text", asciiTextWidgetClass,
|
||||
pane, XtNeditType, XawtextRead, NULL, 0);
|
||||
pane, XtNeditType, XawtextRead, NULL);
|
||||
commands = XtCreateManagedWidget("commands", formWidgetClass, pane,
|
||||
NULL, 0);
|
||||
close = XtCreateManagedWidget("close", commandWidgetClass,
|
||||
|
@ -142,7 +142,7 @@ StartHelp(void)
|
|||
toplevel->core.screen,
|
||||
toplevel->core.colormap,
|
||||
toplevel->core.depth);
|
||||
XtVaSetValues(XawTextGetSink(text), XawNtextProperties, propl, NULL, 0);
|
||||
XtVaSetValues(XawTextGetSink(text), XawNtextProperties, propl, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -428,7 +428,7 @@ Html_ModeStart(Widget src)
|
|||
else
|
||||
parser->alink = 0L;
|
||||
|
||||
XtVaSetValues(src, XtNeditType, XawtextEdit, NULL, 0);
|
||||
XtVaSetValues(src, XtNeditType, XawtextEdit, NULL);
|
||||
|
||||
Html_ModeInit();
|
||||
|
||||
|
@ -512,7 +512,7 @@ Html_ModeStart(Widget src)
|
|||
}
|
||||
XmuDestroyScanline(parser->mask);
|
||||
|
||||
XtVaSetValues(src, XtNeditType, XawtextRead, NULL, 0);
|
||||
XtVaSetValues(src, XtNeditType, XawtextRead, NULL);
|
||||
|
||||
XtFree((XtPointer)parser);
|
||||
|
||||
|
@ -534,9 +534,9 @@ Html_ModeEnd(Widget src)
|
|||
return;
|
||||
|
||||
XawTextSourceClearEntities(src, 0, info->last);
|
||||
XtVaSetValues(src, XtNeditType, XawtextEdit, NULL, 0);
|
||||
XtVaSetValues(src, XtNeditType, XawtextEdit, NULL);
|
||||
XawTextSourceReplace(src, 0, info->last, &info->block);
|
||||
XtVaSetValues(src, XtNeditType, XawtextRead, NULL, 0);
|
||||
XtVaSetValues(src, XtNeditType, XawtextRead, NULL);
|
||||
|
||||
if (info == source_info)
|
||||
source_info = source_info->next;
|
||||
|
|
|
@ -333,7 +333,7 @@ main(int argc, char *argv[])
|
|||
pane = XtCreateManagedWidget("pane", panedWidgetClass,
|
||||
toplevel, NULL, 0);
|
||||
hpane = XtVaCreateManagedWidget("hpane", panedWidgetClass, pane,
|
||||
XtNorientation, XtorientHorizontal, NULL, 0);
|
||||
XtNorientation, XtorientHorizontal, NULL);
|
||||
topMenu = XtCreateManagedWidget("topM", menuButtonWidgetClass,
|
||||
hpane, NULL, 0);
|
||||
expert = XtCreateManagedWidget("expert", commandWidgetClass, hpane, NULL, 0);
|
||||
|
@ -361,7 +361,7 @@ main(int argc, char *argv[])
|
|||
pane, NULL, 0);
|
||||
|
||||
mouse = XtVaCreateManagedWidget("mouse", menuButtonWidgetClass,
|
||||
commands, XtNmenuName, "mouseP", NULL, 0);
|
||||
commands, XtNmenuName, "mouseP", NULL);
|
||||
popup = XtCreatePopupShell("mouseP", simpleMenuWidgetClass,
|
||||
mouse, NULL, 0);
|
||||
sme = XtCreateManagedWidget("new", smeBSBObjectClass,
|
||||
|
@ -373,7 +373,7 @@ main(int argc, char *argv[])
|
|||
(XtPointer)MOUSE);
|
||||
|
||||
keyboard = XtVaCreateManagedWidget("keyboard", menuButtonWidgetClass,
|
||||
commands, XtNmenuName, "keyboardP", NULL, 0);
|
||||
commands, XtNmenuName, "keyboardP", NULL);
|
||||
popup = XtCreatePopupShell("keyboardP", simpleMenuWidgetClass,
|
||||
keyboard, NULL, 0);
|
||||
sme = XtCreateManagedWidget("new", smeBSBObjectClass,
|
||||
|
@ -385,7 +385,7 @@ main(int argc, char *argv[])
|
|||
(XtPointer)KEYBOARD);
|
||||
|
||||
card = XtVaCreateManagedWidget("card", menuButtonWidgetClass,
|
||||
commands, XtNmenuName, "cardP", NULL, 0);
|
||||
commands, XtNmenuName, "cardP", NULL);
|
||||
popup = XtCreatePopupShell("cardP", simpleMenuWidgetClass,
|
||||
card, NULL, 0);
|
||||
sme = XtCreateManagedWidget("new", smeBSBObjectClass,
|
||||
|
@ -397,7 +397,7 @@ main(int argc, char *argv[])
|
|||
(XtPointer)CARD);
|
||||
|
||||
monitor = XtVaCreateManagedWidget("monitor", menuButtonWidgetClass,
|
||||
commands, XtNmenuName, "monitorP", NULL, 0);
|
||||
commands, XtNmenuName, "monitorP", NULL);
|
||||
popup = XtCreatePopupShell("monitorP", simpleMenuWidgetClass,
|
||||
monitor, NULL, 0);
|
||||
sme = XtCreateManagedWidget("new", smeBSBObjectClass,
|
||||
|
@ -418,7 +418,7 @@ main(int argc, char *argv[])
|
|||
layout = XtVaCreateManagedWidget("layout", asciiTextWidgetClass,
|
||||
bottom,
|
||||
XtNeditType, XawtextEdit,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
layoutp = XtCreatePopupShell("menu", simpleMenuWidgetClass,
|
||||
bottom, NULL, 0);
|
||||
sme = XtCreateManagedWidget("new", smeBSBObjectClass, layoutp,
|
||||
|
@ -480,7 +480,7 @@ main(int argc, char *argv[])
|
|||
XtNlabel, lay->lay_identifier,
|
||||
XtNmenuName, lay->lay_identifier,
|
||||
XtNleftBitmap, menuPixmap,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XtAddCallback(sme, XtNcallback, SelectLayoutCallback, (XtPointer)lay);
|
||||
if (layoutsme == NULL)
|
||||
layoutsme = sme;
|
||||
|
@ -594,7 +594,7 @@ AskConfig(void)
|
|||
shell_cf = XtCreatePopupShell("quit", transientShellWidgetClass,
|
||||
toplevel, NULL, 0);
|
||||
dialog = XtVaCreateManagedWidget("ask", dialogWidgetClass, shell_cf,
|
||||
XtNvalue, XF86Config_path, NULL, 0);
|
||||
XtNvalue, XF86Config_path, NULL);
|
||||
XawDialogAddButton(dialog, "yes", WriteConfig, (XtPointer)1);
|
||||
XawDialogAddButton(dialog, "no", WriteConfig, (XtPointer)0);
|
||||
XawDialogAddButton(dialog, "cancel", WriteConfig, (XtPointer)-1);
|
||||
|
@ -718,7 +718,7 @@ QuitCallback(Widget w, XtPointer user_data, XtPointer call_data)
|
|||
dialog = XtVaCreateManagedWidget("notice",
|
||||
dialogWidgetClass,
|
||||
shell, XtNvalue, NULL,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XawDialogAddButton(dialog, "ok", PopdownErrorCallback,
|
||||
(XtPointer)shell);
|
||||
XtRealizeWidget(shell);
|
||||
|
@ -900,7 +900,7 @@ AddDevice(int type, XtPointer config, int x, int y)
|
|||
XtNx, x,
|
||||
XtNy, y,
|
||||
XtNtip, NULL,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
computer.devices[computer.num_devices]->type = type;
|
||||
computer.devices[computer.num_devices]->state = UNUSED;
|
||||
computer.devices[computer.num_devices]->refcount = 0;
|
||||
|
@ -1062,7 +1062,7 @@ SelectLayoutCallback(Widget w, XtPointer user_data, XtPointer call_data)
|
|||
XtNlabel, name,
|
||||
XtNmenuName, l->lay_identifier,
|
||||
XtNleftBitmap, menuPixmap,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XtAddCallback(layoutsme, XtNcallback,
|
||||
SelectLayoutCallback, (XtPointer)l);
|
||||
|
||||
|
@ -1177,7 +1177,7 @@ DefaultLayoutCallback(Widget w, XtPointer user_data, XtPointer call_data)
|
|||
XtNlabel, lay->lay_identifier,
|
||||
XtNmenuName, lay->lay_identifier,
|
||||
XtNleftBitmap, menuPixmap,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XtAddCallback(sme, XtNcallback, SelectLayoutCallback, (XtPointer)lay);
|
||||
if (layoutsme == NULL)
|
||||
layoutsme = sme;
|
||||
|
|
|
@ -1182,7 +1182,7 @@ UpdateRulesPopups(void)
|
|||
sme = XtVaCreateManagedWidget(xkb_rules->model.name[i], smeBSBObjectClass,
|
||||
modelp,
|
||||
XtNlabel, xkb_rules->model.desc[i],
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XtAddCallback(sme, XtNcallback, KeyboardModelCallback, NULL);
|
||||
}
|
||||
|
||||
|
@ -1195,7 +1195,7 @@ UpdateRulesPopups(void)
|
|||
sme = XtVaCreateManagedWidget(xkb_rules->layout.name[i], smeBSBObjectClass,
|
||||
layoutp,
|
||||
XtNlabel, xkb_rules->layout.desc[i],
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XtAddCallback(sme, XtNcallback, KeyboardLayoutCallback, NULL);
|
||||
}
|
||||
|
||||
|
@ -1207,13 +1207,13 @@ UpdateRulesPopups(void)
|
|||
sme = XtVaCreateManagedWidget("None", smeBSBObjectClass,
|
||||
variantp,
|
||||
XtNlabel, "None",
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XtAddCallback(sme, XtNcallback, KeyboardVariantCallback, NULL);
|
||||
for (i = 0; i < xkb_rules->variant.nelem; i++) {
|
||||
sme = XtVaCreateManagedWidget(xkb_rules->variant.name[i], smeBSBObjectClass,
|
||||
variantp,
|
||||
XtNlabel, xkb_rules->variant.desc[i],
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XtAddCallback(sme, XtNcallback, KeyboardVariantCallback, NULL);
|
||||
}
|
||||
|
||||
|
@ -1225,7 +1225,7 @@ UpdateRulesPopups(void)
|
|||
sme = XtVaCreateManagedWidget("None", smeBSBObjectClass,
|
||||
optionsp,
|
||||
XtNlabel, "None",
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XtAddCallback(sme, XtNcallback, KeyboardOptionsCallback, NULL);
|
||||
optparent = optionsp;
|
||||
optname = NULL;
|
||||
|
@ -1239,7 +1239,7 @@ UpdateRulesPopups(void)
|
|||
smeBSBObjectClass,
|
||||
optpopup,
|
||||
XtNlabel, "None",
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XtAddCallback(sme, XtNcallback, KeyboardOptionsCallback, NULL);
|
||||
}
|
||||
else {
|
||||
|
@ -1251,7 +1251,7 @@ UpdateRulesPopups(void)
|
|||
XtNlabel, xkb_rules->option.desc[i],
|
||||
XtNmenuName, optname,
|
||||
XtNleftBitmap, optname ? menuPixmap : None,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
if (optparent != optionsp)
|
||||
XtAddCallback(sme, XtNcallback, KeyboardOptionsCallback, NULL);
|
||||
}
|
||||
|
@ -1277,7 +1277,7 @@ KeyboardModelAndLayout(XF86SetupInfo *info)
|
|||
XtCreateManagedWidget("labelR", labelWidgetClass, kbdml, NULL, 0);
|
||||
rulesb = XtVaCreateManagedWidget("rules", menuButtonWidgetClass, kbdml,
|
||||
XtNmenuName, "rulesP",
|
||||
NULL, 0);
|
||||
NULL);
|
||||
popup = XtCreatePopupShell("rulesP", simpleMenuWidgetClass,
|
||||
rulesb, NULL, 0);
|
||||
{
|
||||
|
@ -1294,7 +1294,7 @@ KeyboardModelAndLayout(XF86SetupInfo *info)
|
|||
sme = XtVaCreateManagedWidget(ent->d_name, smeBSBObjectClass,
|
||||
popup,
|
||||
XtNlabel, ent->d_name,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XtAddCallback(sme, XtNcallback, KeyboardRulesCallback, NULL);
|
||||
}
|
||||
closedir(dir);
|
||||
|
@ -1305,28 +1305,28 @@ KeyboardModelAndLayout(XF86SetupInfo *info)
|
|||
XtCreateManagedWidget("labelM", labelWidgetClass, kbdml, NULL, 0);
|
||||
modelb = XtVaCreateManagedWidget("model", menuButtonWidgetClass, kbdml,
|
||||
XtNmenuName, "modelP",
|
||||
NULL, 0);
|
||||
NULL);
|
||||
|
||||
/* LAYOUT */
|
||||
XtCreateManagedWidget("labelL", labelWidgetClass, kbdml, NULL, 0);
|
||||
layoutb = XtVaCreateManagedWidget("layout", menuButtonWidgetClass, kbdml,
|
||||
XtNmenuName, "layoutP",
|
||||
XtNlabel, xkb_rules->layout.desc[0],
|
||||
NULL, 0);
|
||||
NULL);
|
||||
|
||||
/* VARIANT */
|
||||
XtCreateManagedWidget("labelV", labelWidgetClass, kbdml, NULL, 0);
|
||||
variantb = XtVaCreateManagedWidget("variant", menuButtonWidgetClass, kbdml,
|
||||
XtNmenuName, "variantP",
|
||||
XtNlabel, "",
|
||||
NULL, 0);
|
||||
NULL);
|
||||
|
||||
/* OPTIONS */
|
||||
XtCreateManagedWidget("labelO", labelWidgetClass, kbdml, NULL, 0);
|
||||
optionsb = XtVaCreateManagedWidget("options", menuButtonWidgetClass, kbdml,
|
||||
XtNmenuName, "optionsP",
|
||||
XtNlabel, "",
|
||||
NULL, 0);
|
||||
NULL);
|
||||
|
||||
UpdateRulesPopups();
|
||||
|
||||
|
|
|
@ -382,25 +382,25 @@ MonitorLayout(XF86SetupInfo *info)
|
|||
XtCreateManagedWidget("hlabel", labelWidgetClass, layout, NULL, 0);
|
||||
hsync = XtVaCreateManagedWidget("hsync", asciiTextWidgetClass, layout,
|
||||
XtNeditType, XawtextEdit,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
viewport = XtCreateManagedWidget("hviewport", viewportWidgetClass,
|
||||
layout, NULL, 0);
|
||||
hlist = XtVaCreateManagedWidget("hlist", listWidgetClass, viewport,
|
||||
XtNlist, hmodes,
|
||||
XtNnumberStrings, sizeof(hmodes) /
|
||||
sizeof(hmodes[0]), NULL, 0);
|
||||
sizeof(hmodes[0]), NULL);
|
||||
XtAddCallback(hlist, XtNcallback, MonitorHsyncCallback, NULL);
|
||||
|
||||
XtCreateManagedWidget("vlabel", labelWidgetClass, layout, NULL, 0);
|
||||
vsync = XtVaCreateManagedWidget("vsync", asciiTextWidgetClass, layout,
|
||||
XtNeditType, XawtextEdit,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
viewport = XtCreateManagedWidget("vviewport", viewportWidgetClass,
|
||||
layout, NULL, 0);
|
||||
vlist = XtVaCreateManagedWidget("vlist", listWidgetClass, viewport,
|
||||
XtNlist, vmodes,
|
||||
XtNnumberStrings, sizeof(vmodes) /
|
||||
sizeof(vmodes[0]), NULL, 0);
|
||||
sizeof(vmodes[0]), NULL);
|
||||
XtAddCallback(vlist, XtNcallback, MonitorVsyncCallback, NULL);
|
||||
|
||||
XtCreateManagedWidget("clabel", labelWidgetClass, layout, NULL, 0);
|
||||
|
@ -424,7 +424,7 @@ MonitorLayout(XF86SetupInfo *info)
|
|||
XtSetValues(cmenu, args, 1);
|
||||
++men;
|
||||
sme = XtVaCreateManagedWidget("none", smeBSBObjectClass, menu,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XtAddCallback(sme, XtNcallback, MonitorSelectCardCallback, NULL);
|
||||
|
||||
while (device != NULL) {
|
||||
|
|
|
@ -367,7 +367,7 @@ MouseDeviceAndProtocol(XF86SetupInfo *info)
|
|||
text = XtVaCreateManagedWidget("device", asciiTextWidgetClass,
|
||||
mouse_dp,
|
||||
XtNeditType, XawtextEdit,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
viewport = XtCreateManagedWidget("viewportD", viewportWidgetClass,
|
||||
mouse_dp, NULL, 0);
|
||||
|
||||
|
@ -375,7 +375,7 @@ MouseDeviceAndProtocol(XF86SetupInfo *info)
|
|||
viewport,
|
||||
XtNlist, devices,
|
||||
XtNnumberStrings, ndevices,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XtAddCallback(listD, XtNcallback, MouseDeviceCallback, (XtPointer)text);
|
||||
|
||||
/* PROTOCOL */
|
||||
|
@ -392,11 +392,11 @@ MouseDeviceAndProtocol(XF86SetupInfo *info)
|
|||
viewport,
|
||||
XtNlist, list,
|
||||
XtNnumberStrings, count,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XtAddCallback(listP, XtNcallback, MouseProtocolCallback, NULL);
|
||||
|
||||
emul3 = XtVaCreateManagedWidget("emulate3", toggleWidgetClass,
|
||||
mouse_dp, XtNstate, True, NULL, 0);
|
||||
mouse_dp, XtNstate, True, NULL);
|
||||
XtAddCallback(emul3, XtNcallback, MouseEmulateCallback, NULL);
|
||||
apply = XtCreateManagedWidget("apply", commandWidgetClass,
|
||||
mouse_dp, NULL, 0);
|
||||
|
|
|
@ -136,7 +136,7 @@ ModuleOptionsPopup(Widget w, XtPointer user_data, XtPointer call_data)
|
|||
modList = XtVaCreateManagedWidget("modL", listWidgetClass,
|
||||
viewport, XtNlist, ops,
|
||||
XtNnumberStrings, nops,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XtAddCallback(modList, XtNcallback, SelectModuleCallback, NULL);
|
||||
XtCreateManagedWidget("option", labelWidgetClass, form, NULL, 0);
|
||||
viewport = XtCreateManagedWidget("viewO", viewportWidgetClass,
|
||||
|
@ -145,16 +145,16 @@ ModuleOptionsPopup(Widget w, XtPointer user_data, XtPointer call_data)
|
|||
ops[0] = XtNewString("");
|
||||
optList = XtVaCreateManagedWidget("optL", listWidgetClass,
|
||||
viewport, XtNlist, ops,
|
||||
XtNnumberStrings, 1, NULL, 0);
|
||||
XtNnumberStrings, 1, NULL);
|
||||
XtAddCallback(optList, XtNcallback, SelectModuleOptionCallback, NULL);
|
||||
desc = XtVaCreateManagedWidget("desc", asciiTextWidgetClass,
|
||||
form, XtNeditType, XawtextRead,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
|
||||
bottom = XtCreateManagedWidget("bottom", formWidgetClass,
|
||||
pane, NULL, 0);
|
||||
popdown = XtVaCreateManagedWidget("popdown", commandWidgetClass,
|
||||
bottom, NULL, 0);
|
||||
bottom, NULL);
|
||||
XtAddCallback(popdown, XtNcallback, ModuleOptionsPopdown, NULL);
|
||||
XtRealizeWidget(modOptionsShell);
|
||||
XSetWMProtocols(DPY, XtWindow(modOptionsShell), &wm_delete_window, 1);
|
||||
|
@ -282,20 +282,20 @@ OptionsPopup(XF86OptionPtr *opts)
|
|||
pane, NULL, 0);
|
||||
XtVaCreateManagedWidget("label1", labelWidgetClass, form,
|
||||
XtNlabel, " Option \"",
|
||||
NULL, 0);
|
||||
NULL);
|
||||
name = XtVaCreateManagedWidget("name", asciiTextWidgetClass, form,
|
||||
XtNeditType, XawtextEdit,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XtVaCreateManagedWidget("label2", labelWidgetClass,
|
||||
form,
|
||||
XtNlabel, "\" \"",
|
||||
NULL, 0);
|
||||
NULL);
|
||||
value = XtVaCreateManagedWidget("value", asciiTextWidgetClass, form,
|
||||
XtNeditType, XawtextEdit,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
XtVaCreateManagedWidget("label3", labelWidgetClass, form,
|
||||
XtNlabel, "\" ",
|
||||
NULL, 0);
|
||||
NULL);
|
||||
viewport = XtCreateManagedWidget("viewport", viewportWidgetClass,
|
||||
form, NULL, 0);
|
||||
list = XtCreateManagedWidget("list", listWidgetClass,
|
||||
|
@ -309,10 +309,10 @@ OptionsPopup(XF86OptionPtr *opts)
|
|||
bottom, NULL, 0);
|
||||
#endif
|
||||
popdown = XtVaCreateManagedWidget("popdown", commandWidgetClass,
|
||||
bottom, NULL, 0);
|
||||
bottom, NULL);
|
||||
#ifdef USE_MODULES
|
||||
if (!nomodules)
|
||||
XtVaSetValues(popdown, XtNfromHoriz, button, NULL, 0);
|
||||
XtVaSetValues(popdown, XtNfromHoriz, button, NULL);
|
||||
#endif
|
||||
|
||||
XtAddCallback(popdown, XtNcallback, PopdownCallback, NULL);
|
||||
|
@ -338,7 +338,7 @@ OptionsPopup(XF86OptionPtr *opts)
|
|||
menuN = !menuN;
|
||||
menu = XtCreatePopupShell(menuName, simpleMenuWidgetClass, button,
|
||||
NULL, 0);
|
||||
XtVaSetValues(button, XtNmenuName, menuName, NULL, 0);
|
||||
XtVaSetValues(button, XtNmenuName, menuName, NULL);
|
||||
if (drv_opts) {
|
||||
int len, longest = 0;
|
||||
char fmt[32];
|
||||
|
@ -359,7 +359,7 @@ OptionsPopup(XF86OptionPtr *opts)
|
|||
|
||||
XmuSnprintf(buf, sizeof(buf), fmt, drv_opts->name, type);
|
||||
sme = XtVaCreateManagedWidget(drv_opts->name, smeBSBObjectClass,
|
||||
menu, XtNlabel, buf, NULL, 0);
|
||||
menu, XtNlabel, buf, NULL);
|
||||
XtAddCallback(sme, XtNcallback, AddDriverOption, (XtPointer)drv_opts);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -444,16 +444,16 @@ ScreenDialog(XF86SetupInfo *info)
|
|||
d1 = XtCreateManagedWidget("1", toggleWidgetClass, dialog, NULL, 0);
|
||||
XtAddCallback(d1, XtNcallback, DepthCallback, (XtPointer)1);
|
||||
d4 = XtVaCreateManagedWidget("4", toggleWidgetClass, dialog,
|
||||
XtNradioGroup, d1, NULL, 0);
|
||||
XtNradioGroup, d1, NULL);
|
||||
XtAddCallback(d4, XtNcallback, DepthCallback, (XtPointer)4);
|
||||
d8 = XtVaCreateManagedWidget("8", toggleWidgetClass, dialog,
|
||||
XtNradioGroup, d4, NULL, 0);
|
||||
XtNradioGroup, d4, NULL);
|
||||
XtAddCallback(d8, XtNcallback, DepthCallback, (XtPointer)8);
|
||||
d16 = XtVaCreateManagedWidget("16", toggleWidgetClass, dialog,
|
||||
XtNradioGroup, d8, NULL, 0);
|
||||
XtNradioGroup, d8, NULL);
|
||||
XtAddCallback(d16, XtNcallback, DepthCallback, (XtPointer)16);
|
||||
d24 = XtVaCreateManagedWidget("24", toggleWidgetClass, dialog,
|
||||
XtNradioGroup, d16, NULL, 0);
|
||||
XtNradioGroup, d16, NULL);
|
||||
XtAddCallback(d24, XtNcallback, DepthCallback, (XtPointer)24);
|
||||
|
||||
XtCreateManagedWidget("modeL", labelWidgetClass, dialog, NULL, 0);
|
||||
|
@ -485,7 +485,7 @@ ScreenDialog(XF86SetupInfo *info)
|
|||
cw = XtCreateManagedWidget("CW", toggleWidgetClass, dialog, NULL, 0);
|
||||
XtAddCallback(cw, XtNcallback, RotateCallback, (XtPointer)CW);
|
||||
ccw = XtVaCreateManagedWidget("CCW", toggleWidgetClass, dialog,
|
||||
XtNradioGroup, cw, NULL, 0);
|
||||
XtNradioGroup, cw, NULL);
|
||||
XtAddCallback(ccw, XtNcallback, RotateCallback, (XtPointer)CCW);
|
||||
|
||||
XtRealizeWidget(dialog);
|
||||
|
@ -525,16 +525,16 @@ ScreenDialog(XF86SetupInfo *info)
|
|||
(void)labelRotate;
|
||||
#endif
|
||||
if (rotate == CW) {
|
||||
XtVaSetValues(cw, XtNstate, True, NULL, 0);
|
||||
XtVaSetValues(ccw, XtNstate, False, NULL, 0);
|
||||
XtVaSetValues(cw, XtNstate, True, NULL);
|
||||
XtVaSetValues(ccw, XtNstate, False, NULL);
|
||||
}
|
||||
else if (rotate == CCW) {
|
||||
XtVaSetValues(cw, XtNstate, False, NULL, 0);
|
||||
XtVaSetValues(ccw, XtNstate, True, NULL, 0);
|
||||
XtVaSetValues(cw, XtNstate, False, NULL);
|
||||
XtVaSetValues(ccw, XtNstate, True, NULL);
|
||||
}
|
||||
else {
|
||||
XtVaSetValues(cw, XtNstate, False, NULL, 0);
|
||||
XtVaSetValues(ccw, XtNstate, False, NULL, 0);
|
||||
XtVaSetValues(cw, XtNstate, False, NULL);
|
||||
XtVaSetValues(ccw, XtNstate, False, NULL);
|
||||
}
|
||||
|
||||
XtSetArg(args[0], XtNlist, modes);
|
||||
|
|
|
@ -449,7 +449,7 @@ VideoModeInitialize(void)
|
|||
work, NULL, 0);
|
||||
|
||||
(void) XtVaCreateManagedWidget("vesaB", menuButtonWidgetClass, vtune,
|
||||
XtNmenuName, "vesaP", NULL, 0);
|
||||
XtNmenuName, "vesaP", NULL);
|
||||
vesap = XtCreatePopupShell("vesaP", simpleMenuWidgetClass, vtune, NULL, 0);
|
||||
for (i = 0; i < sizeof(vesamodes) / sizeof(vesamodes[0]); i++) {
|
||||
rep = XtCreateManagedWidget(vesamodes[i].ident, smeBSBObjectClass,
|
||||
|
@ -487,7 +487,7 @@ VideoModeInitialize(void)
|
|||
vtune,
|
||||
XtNmenuName, "screenP",
|
||||
XtNlabel, name,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
}
|
||||
}
|
||||
XtRealizeWidget(screenp);
|
||||
|
@ -568,7 +568,7 @@ VideoModeInitialize(void)
|
|||
NULL, 0);
|
||||
XtCreateManagedWidget("as", labelWidgetClass, vtune, NULL, 0);
|
||||
text = XtVaCreateManagedWidget("text", asciiTextWidgetClass, vtune,
|
||||
XtNeditType, XawtextEdit, NULL, 0);
|
||||
XtNeditType, XawtextEdit, NULL);
|
||||
|
||||
XtRealizeWidget(vtune);
|
||||
|
||||
|
@ -626,7 +626,7 @@ VideoModeConfigureStart(void)
|
|||
menuN = !menuN;
|
||||
monitor = XtCreatePopupShell(menuName, simpleMenuWidgetClass,
|
||||
vtune, NULL, 0);
|
||||
XtVaSetValues(monitorb, XtNmenuName, menuName, NULL, 0);
|
||||
XtVaSetValues(monitorb, XtNmenuName, menuName, NULL);
|
||||
|
||||
mon = XF86Config->conf_monitor_lst;
|
||||
while (mon != NULL) {
|
||||
|
@ -1138,7 +1138,7 @@ GetModes(void)
|
|||
if (menu)
|
||||
XtDestroyWidget(menu);
|
||||
menu = XtCreatePopupShell(menuName, simpleMenuWidgetClass, vtune, NULL, 0);
|
||||
XtVaSetValues(mode, XtNmenuName, menuName, NULL, 0);
|
||||
XtVaSetValues(mode, XtNmenuName, menuName, NULL);
|
||||
for (i = 0; i < vidtune->num_infos; i++) {
|
||||
Widget sme;
|
||||
|
||||
|
@ -1190,7 +1190,7 @@ ForceAddMode(void)
|
|||
forceshell = XtCreatePopupShell("force", transientShellWidgetClass,
|
||||
toplevel, NULL, 0);
|
||||
dialog = XtVaCreateManagedWidget("dialog", dialogWidgetClass,
|
||||
forceshell, XtNvalue, NULL, NULL, 0);
|
||||
forceshell, XtNvalue, NULL, NULL);
|
||||
XawDialogAddButton(dialog, "yes", PopdownForce, (XtPointer)True);
|
||||
XawDialogAddButton(dialog, "no", PopdownForce, (XtPointer)False);
|
||||
XtRealizeWidget(forceshell);
|
||||
|
@ -1235,7 +1235,7 @@ AddMode(void)
|
|||
addshell = XtCreatePopupShell("addMode", transientShellWidgetClass,
|
||||
toplevel, NULL, 0);
|
||||
dialog = XtVaCreateManagedWidget("dialog", dialogWidgetClass,
|
||||
addshell, XtNvalue, NULL, NULL, 0);
|
||||
addshell, XtNvalue, NULL, NULL);
|
||||
XawDialogAddButton(dialog, "yes", PopdownAdd, (XtPointer)True);
|
||||
XawDialogAddButton(dialog, "no", PopdownAdd, (XtPointer)False);
|
||||
XtRealizeWidget(addshell);
|
||||
|
@ -1331,7 +1331,7 @@ TestCallback(Widget w, XtPointer call_data, XtPointer client_data)
|
|||
testshell = XtCreatePopupShell("test", transientShellWidgetClass,
|
||||
toplevel, NULL, 0);
|
||||
dialog = XtVaCreateManagedWidget("dialog", dialogWidgetClass,
|
||||
testshell, XtNvalue, NULL, NULL, 0);
|
||||
testshell, XtNvalue, NULL, NULL);
|
||||
XawDialogAddButton(dialog, "stop", StopTestCallback, NULL);
|
||||
XtRealizeWidget(testshell);
|
||||
XSetWMProtocols(DPY, XtWindow(testshell), &wm_delete_window, 1);
|
||||
|
|
Loading…
Reference in New Issue
Block a user