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