--- programs/Xserver/hw/xfree86/xf86cfg/accessx.c.~1~ 2005-01-04 00:25:12.000000000 +0100 +++ programs/Xserver/hw/xfree86/xf86cfg/accessx.c 2005-04-03 12:55:46.000000000 +0200 @@ -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); --- programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c +++ programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c @@ -280,7 +280,7 @@ 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 @@ 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 @@ driver = XtVaCreateManagedWidget("driver", menuButtonWidgetClass, model, XtNmenuName, "driverM", - NULL, 0); + NULL); { Widget menu, sme; xf86cfgModuleOptions *opts = module_options; @@ -419,13 +419,13 @@ 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); } --- programs/Xserver/hw/xfree86/xf86cfg/config.c.~1~ 2005-01-04 00:25:12.000000000 +0100 +++ programs/Xserver/hw/xfree86/xf86cfg/config.c 2005-04-03 12:56:44.000000000 +0200 @@ -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, --- programs/Xserver/hw/xfree86/xf86cfg/expert.c +++ programs/Xserver/hw/xfree86/xf86cfg/expert.c @@ -326,7 +326,7 @@ XtPopup(shell, XtGrabExclusive); if (optionsShell == NULL) CreateOptionsShell(); - XtVaSetValues(optionsShell, XtNtransientFor, shell, NULL, 0); + XtVaSetValues(optionsShell, XtNtransientFor, shell, NULL); } void @@ -336,7 +336,7 @@ Widget sme, layopt, layoutsme = NULL; XF86ConfLayoutPtr lay; - XtVaSetValues(optionsShell, XtNtransientFor, toplevel, NULL, 0); + XtVaSetValues(optionsShell, XtNtransientFor, toplevel, NULL); XtPopdown(shell); /* Need to do this to avoid all code elsewhere needing to update the @@ -403,7 +403,7 @@ ExpertConfigureEnd(void) XtNlabel, lay->lay_identifier, XtNmenuName, lay->lay_identifier, XtNleftBitmap, menuPixmap, - NULL, 0); + NULL); XtAddCallback(sme, XtNcallback, SelectLayoutCallback, (XtPointer)lay); if (layoutsme == NULL) layoutsme = sme; @@ -483,13 +483,13 @@ CreateFilesField(node, "RgbPath", value); w = XtVaCreateManagedWidget("ModulePath", toggleWidgetClass, tree, - XtNtreeParent, files->node, NULL, 0); + XtNtreeParent, files->node, NULL); node->next = modulepath = NewNode(files, w, w, files->node, NULL); node = node->next; CreateModulePath(modulepath, NULL); w = XtVaCreateManagedWidget("FontPath", toggleWidgetClass, tree, - XtNtreeParent, files->node, NULL, 0); + XtNtreeParent, files->node, NULL); node->next = fontpath = NewNode(files, w, w, files->node, NULL); node = node->next; CreateFontPath(fontpath, NULL); @@ -501,13 +501,13 @@ Widget box, text; box = XtVaCreateManagedWidget(name, boxWidgetClass, tree, - XtNtreeParent, node->node, NULL, 0); + XtNtreeParent, node->node, NULL); node->node = box; (void) XtVaCreateManagedWidget("label", labelWidgetClass, box, - XtNlabel, name, NULL, 0); + XtNlabel, name, NULL); text = XtVaCreateManagedWidget("value", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, value, - NULL, 0); + NULL); node->data->files.text = text; } @@ -518,7 +518,7 @@ /* LogFile */ files = files->child; - XtVaGetValues(files->data->files.text, XtNstring, &str, NULL, 0); + XtVaGetValues(files->data->files.text, XtNstring, &str, NULL); XtFree(XF86Config->conf_files->file_logfile); if (*str) XF86Config->conf_files->file_logfile = XtNewString(str); @@ -527,7 +527,7 @@ /* LogFile */ files = files->next; - XtVaGetValues(files->data->files.text, XtNstring, &str, NULL, 0); + XtVaGetValues(files->data->files.text, XtNstring, &str, NULL); XtFree(XF86Config->conf_files->file_rgbpath); if (*str) XF86Config->conf_files->file_rgbpath = XtNewString(str); @@ -592,7 +592,7 @@ TreeData *data; box = XtVaCreateWidget("fontpath", formWidgetClass, tree, - XtNtreeParent, fontpath->treeParent, NULL, 0); + XtNtreeParent, fontpath->treeParent, NULL); fontpath->node = box; if (!addnew) { command = XtCreateManagedWidget("remove", commandWidgetClass, box, @@ -607,7 +607,7 @@ (XtPointer)fontpath); text = XtVaCreateManagedWidget("value", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - XtNstring, value, NULL, 0); + XtNstring, value, NULL); } else { command = XtCreateManagedWidget("new", commandWidgetClass, box, NULL, 0); @@ -615,7 +615,7 @@ (XtPointer)fontpath); text = XtVaCreateManagedWidget("valueNew", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - XtNstring, value, NULL, 0); + XtNstring, value, NULL); } data = (TreeData*)XtCalloc(1, sizeof(TreeData)); data->files.text = text; @@ -768,7 +768,7 @@ TreeData *data; box = XtVaCreateWidget("modulepath", formWidgetClass, tree, - XtNtreeParent, modulepath->treeParent, NULL, 0); + XtNtreeParent, modulepath->treeParent, NULL); modulepath->node = box; if (!addnew) { command = XtCreateManagedWidget("remove", commandWidgetClass, box, @@ -777,7 +777,7 @@ (XtPointer)modulepath); text = XtVaCreateManagedWidget("value", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - XtNstring, value, NULL, 0); + XtNstring, value, NULL); } else { command = XtCreateManagedWidget("new", commandWidgetClass, box, NULL, 0); @@ -785,7 +785,7 @@ (XtPointer)modulepath); text = XtVaCreateManagedWidget("valueNew", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - XtNstring, value, NULL, 0); + XtNstring, value, NULL); } data = (TreeData*)XtCalloc(1, sizeof(TreeData)); data->files.text = text; @@ -883,7 +883,7 @@ Widget box, command, label; box = XtVaCreateWidget("module", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { @@ -898,7 +898,7 @@ NULL, 0); XtAddCallback(command, XtNcallback, OptionsCallback, (XtPointer)options); label = XtVaCreateManagedWidget("label", labelWidgetClass, box, - XtNlabel, load->load_name, NULL, 0); + XtNlabel, load->load_name, NULL); } else { command = XtCreateManagedWidget("new", commandWidgetClass, box, @@ -906,7 +906,7 @@ XtAddCallback(command, XtNcallback, NewModuleCallback, (XtPointer)node); label = XtVaCreateManagedWidget("value", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - NULL, 0); + NULL); node->data->module.text = label; } if (XtIsRealized(node->treeParent)) @@ -988,7 +988,7 @@ Widget box, command, label; box = XtVaCreateWidget("modes", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { @@ -1000,7 +1000,7 @@ label = XtVaCreateManagedWidget("mode", toggleWidgetClass, box, XtNlabel, modes->modes_identifier, XtNstate, True, - NULL, 0); + NULL); node->toggle = label; XtAddCallback(label, XtNcallback, ToggleCallback, (XtPointer)node); CreateModesModeLine(node, node->data->modes.modes->mon_modeline_lst); @@ -1011,7 +1011,7 @@ XtAddCallback(command, XtNcallback, NewModesCallback, (XtPointer)node); label = XtVaCreateManagedWidget("value", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - NULL, 0); + NULL); node->data->modes.text = label; } if (XtIsRealized(node->treeParent)) @@ -1147,7 +1147,7 @@ char buf[512], tmp[32]; box = XtVaCreateWidget("modeline", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { @@ -1157,7 +1157,7 @@ box, NULL, 0); XtAddCallback(command, XtNcallback, DestroyCallback, (XtPointer)node); XtVaCreateManagedWidget("label", labelWidgetClass, box, - XtNlabel, mod->ml_identifier, NULL, 0); + XtNlabel, mod->ml_identifier, NULL); XmuSnprintf(buf, sizeof(buf), "%g %d %d %d %d %d %d %d %d", mod->ml_clock / 1000., mod->ml_hdisplay, mod->ml_hsyncstart, @@ -1196,7 +1196,7 @@ node->data->modeline.value = XtVaCreateManagedWidget("modeline", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - XtNstring, buf, NULL, 0); + XtNstring, buf, NULL); } else { *buf = '\0'; @@ -1207,10 +1207,10 @@ (XtPointer)node); node->data->modeline.text = XtVaCreateManagedWidget("value", asciiTextWidgetClass, box, - XtNeditType, XawtextEdit, NULL, 0); + XtNeditType, XawtextEdit, NULL); node->data->modeline.value = XtVaCreateManagedWidget("modelineNew", asciiTextWidgetClass, box, - XtNeditType, XawtextEdit, NULL, 0); + XtNeditType, XawtextEdit, NULL); } if (XtIsRealized(node->treeParent)) XtRealizeWidget(box); @@ -1407,7 +1407,7 @@ Widget box, command, label; box = XtVaCreateWidget("video", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { @@ -1424,7 +1424,7 @@ (XtPointer)&(video->va_option_lst)); label = XtVaCreateManagedWidget("adaptor", labelWidgetClass, box, XtNlabel, video->va_identifier, - NULL, 0); + NULL); XtCreateManagedWidget("vendorL", labelWidgetClass, box, NULL, 0); str = video->va_vendor ? video->va_vendor : ""; @@ -1432,7 +1432,7 @@ XtVaCreateManagedWidget("vendor", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); XtCreateManagedWidget("boardL", labelWidgetClass, box, NULL, 0); str = video->va_board ? video->va_board : ""; @@ -1440,7 +1440,7 @@ XtVaCreateManagedWidget("board", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); XtCreateManagedWidget("busidL", labelWidgetClass, box, NULL, 0); str = video->va_busid ? video->va_busid : ""; @@ -1448,7 +1448,7 @@ XtVaCreateManagedWidget("busid", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); XtCreateManagedWidget("driverL", labelWidgetClass, box, NULL, 0); str = video->va_driver ? video->va_driver : ""; @@ -1456,12 +1456,12 @@ XtVaCreateManagedWidget("driver", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); label = XtVaCreateManagedWidget("VideoPort", toggleWidgetClass, tree, XtNstate, True, XtNtreeParent, box, - NULL, 0); + NULL); port = NewNode(node, label, label, node->node, NULL); node->child = port; CreateVideoPort(port, video->va_port_lst); @@ -1473,7 +1473,7 @@ (XtPointer)node); label = XtVaCreateManagedWidget("value", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - NULL, 0); + NULL); node->data->video.text = label; } if (XtIsRealized(node->treeParent)) @@ -1571,7 +1571,7 @@ char *str; /* vendor */ - XtVaGetValues(node->data->video.vendor, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->video.vendor, XtNstring, &str, NULL); XtFree(node->data->video.video->va_vendor); if (*str) node->data->video.video->va_vendor = XtNewString(str); @@ -1579,7 +1579,7 @@ node->data->video.video->va_vendor = NULL; /* board */ - XtVaGetValues(node->data->video.board, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->video.board, XtNstring, &str, NULL); XtFree(node->data->video.video->va_board); if (*str) node->data->video.video->va_board = XtNewString(str); @@ -1587,7 +1587,7 @@ node->data->video.video->va_board = NULL; /* busid */ - XtVaGetValues(node->data->video.busid, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->video.busid, XtNstring, &str, NULL); XtFree(node->data->video.video->va_busid); if (*str) node->data->video.video->va_busid = XtNewString(str); @@ -1595,7 +1595,7 @@ node->data->video.video->va_busid = NULL; /* driver */ - XtVaGetValues(node->data->video.driver, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->video.driver, XtNstring, &str, NULL); XtFree(node->data->video.video->va_driver); if (*str) node->data->video.video->va_driver = XtNewString(str); @@ -1642,7 +1642,7 @@ Widget box, command, label; box = XtVaCreateWidget("port", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { @@ -1657,7 +1657,7 @@ NULL, 0); XtAddCallback(command, XtNcallback, OptionsCallback, (XtPointer)options); label = XtVaCreateManagedWidget("label", labelWidgetClass, box, - XtNlabel, port->vp_identifier, NULL, 0); + XtNlabel, port->vp_identifier, NULL); } else { command = XtCreateManagedWidget("new", commandWidgetClass, box, @@ -1665,7 +1665,7 @@ XtAddCallback(command, XtNcallback, NewVideoPortCallback, (XtPointer)node); label = XtVaCreateManagedWidget("value", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - NULL, 0); + NULL); node->data->port.text = label; } if (XtIsRealized(node->treeParent)) @@ -1748,7 +1748,7 @@ Widget box, command, label; box = XtVaCreateWidget("monitor", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { @@ -1766,7 +1766,7 @@ NULL, 0); XtAddCallback(command, XtNcallback, OptionsCallback, (XtPointer)options); label = XtVaCreateManagedWidget("label", labelWidgetClass, box, - XtNlabel, mon->mon_identifier, NULL, 0); + XtNlabel, mon->mon_identifier, NULL); XtCreateManagedWidget("vendorL", labelWidgetClass, box, NULL, 0); str = mon->mon_vendor ? mon->mon_vendor : ""; @@ -1774,7 +1774,7 @@ XtVaCreateManagedWidget("vendor", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); XtCreateManagedWidget("modelnameL", labelWidgetClass, box, NULL, 0); str = mon->mon_modelname ? mon->mon_modelname : ""; @@ -1782,7 +1782,7 @@ XtVaCreateManagedWidget("modelname", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); XtCreateManagedWidget("widthL", labelWidgetClass, box, NULL, 0); if (mon->mon_width) @@ -1793,7 +1793,7 @@ XtVaCreateManagedWidget("width", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("heightL", labelWidgetClass, box, NULL, 0); if (mon->mon_height) @@ -1804,7 +1804,7 @@ XtVaCreateManagedWidget("height", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("hsyncL", labelWidgetClass, box, NULL, 0); if (mon->mon_n_hsync > 0) @@ -1816,7 +1816,7 @@ XtVaCreateManagedWidget("hsync", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("vrefreshL", labelWidgetClass, box, NULL, 0); if (mon->mon_n_vrefresh > 0) @@ -1828,7 +1828,7 @@ XtVaCreateManagedWidget("vrefresh", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("gammaRedL", labelWidgetClass, box, NULL, 0); if (mon->mon_gamma_red) @@ -1839,7 +1839,7 @@ XtVaCreateManagedWidget("gammaRed", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("gammaGreenL", labelWidgetClass, box, NULL, 0); if (mon->mon_gamma_green) @@ -1850,7 +1850,7 @@ XtVaCreateManagedWidget("gammaGreen", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("gammaBlueL", labelWidgetClass, box, NULL, 0); if (mon->mon_gamma_blue) @@ -1861,14 +1861,14 @@ XtVaCreateManagedWidget("gammaBlue", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); if ((prev = node->child) != NULL) while (prev->next) prev = prev->next; command = XtVaCreateManagedWidget("ModeLine", toggleWidgetClass, tree, XtNstate, True, - XtNtreeParent, box, NULL, 0); + XtNtreeParent, box, NULL); modeline = NewNode(node, command, command, node->node, NULL); CreateMonitorModeLine(modeline, node->data->monitor.monitor->mon_modeline_lst); @@ -1881,7 +1881,7 @@ useModes = XtVaCreateManagedWidget("UseModes", toggleWidgetClass, tree, XtNstate, True, - XtNtreeParent, box, NULL, 0); + XtNtreeParent, box, NULL); prev->next = modes = NewNode(node, useModes, useModes, node->node, NULL); CreateMonitorModes(modes, node->data->monitor.monitor->mon_modes_sect_lst); @@ -1892,7 +1892,7 @@ XtAddCallback(command, XtNcallback, NewMonitorCallback, (XtPointer)node); label = XtVaCreateManagedWidget("value", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - NULL, 0); + NULL); node->data->monitor.text = label; } if (XtIsRealized(node->treeParent)) @@ -1973,7 +1973,7 @@ char *str; /* vendor */ - XtVaGetValues(node->data->monitor.vendor, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->monitor.vendor, XtNstring, &str, NULL); XtFree(node->data->monitor.monitor->mon_vendor); if (*str) node->data->monitor.monitor->mon_vendor = XtNewString(str); @@ -1981,7 +1981,7 @@ node->data->monitor.monitor->mon_vendor = NULL; /* model */ - XtVaGetValues(node->data->monitor.model, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->monitor.model, XtNstring, &str, NULL); XtFree(node->data->monitor.monitor->mon_modelname); if (*str) node->data->monitor.monitor->mon_modelname = XtNewString(str); @@ -1989,37 +1989,37 @@ node->data->monitor.monitor->mon_modelname = NULL; /* width */ - XtVaGetValues(node->data->monitor.width, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->monitor.width, XtNstring, &str, NULL); node->data->monitor.monitor->mon_width = strtoul(str, NULL, 0); /* height */ - XtVaGetValues(node->data->monitor.height, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->monitor.height, XtNstring, &str, NULL); node->data->monitor.monitor->mon_height = strtoul(str, NULL, 0); /* hsync */ - XtVaGetValues(node->data->monitor.hsync, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->monitor.hsync, XtNstring, &str, NULL); node->data->monitor.monitor->mon_n_hsync = string_to_parser_range(str, &(node->data->monitor.monitor->mon_hsync[0]), CONF_MAX_HSYNC); /* vrefresh */ - XtVaGetValues(node->data->monitor.vrefresh, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->monitor.vrefresh, XtNstring, &str, NULL); node->data->monitor.monitor->mon_n_vrefresh = string_to_parser_range(str, &(node->data->monitor.monitor->mon_vrefresh[0]), CONF_MAX_VREFRESH); /* gammaRed */ - XtVaGetValues(node->data->monitor.gammaRed, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->monitor.gammaRed, XtNstring, &str, NULL); node->data->monitor.monitor->mon_gamma_red = strtod(str, NULL); /* gammaGreen */ - XtVaGetValues(node->data->monitor.gammaGreen, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->monitor.gammaGreen, XtNstring, &str, NULL); node->data->monitor.monitor->mon_gamma_green = strtod(str, NULL); /* gammaBlue */ - XtVaGetValues(node->data->monitor.gammaBlue, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->monitor.gammaBlue, XtNstring, &str, NULL); node->data->monitor.monitor->mon_gamma_blue = strtod(str, NULL); } @@ -2131,7 +2131,7 @@ Widget box, command; box = XtVaCreateWidget("modes", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { @@ -2141,19 +2141,19 @@ NULL, 0); XtAddCallback(command, XtNcallback, DestroyCallback, (XtPointer)node); (void) XtVaCreateManagedWidget("mode", labelWidgetClass, box, - XtNlabel, lnk->ml_modes_str, NULL, 0); + XtNlabel, lnk->ml_modes_str, NULL); } else { Widget sme; XF86ConfModesPtr ptr = XF86Config->conf_modes_lst; command = XtVaCreateManagedWidget("new", menuButtonWidgetClass, box, - XtNmenuName, "modesMenu", NULL, 0); + XtNmenuName, "modesMenu", NULL); node->data->modeslink.menu = XtVaCreatePopupShell("modesMenu", simpleMenuWidgetClass, box, XtNleftMargin, 1, XtNrightMargin, 1, XtNtopMargin, 1, XtNbottomMargin, 1, - NULL, 0); + NULL); while (ptr) { sme = XtCreateManagedWidget(ptr->modes_identifier, smeBSBObjectClass, node->data->modeslink.menu, NULL, 0); @@ -2237,7 +2237,7 @@ Widget box, command, label; box = XtVaCreateWidget("device", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { @@ -2254,7 +2254,7 @@ NULL, 0); XtAddCallback(command, XtNcallback, OptionsCallback, (XtPointer)options); label = XtVaCreateManagedWidget("label", labelWidgetClass, box, - XtNlabel, dev->dev_identifier, NULL, 0); + XtNlabel, dev->dev_identifier, NULL); XtCreateManagedWidget("vendorL", labelWidgetClass, box, NULL, 0); str = dev->dev_vendor ? dev->dev_vendor : ""; @@ -2262,7 +2262,7 @@ XtVaCreateManagedWidget("vendor", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); XtCreateManagedWidget("boardL", labelWidgetClass, box, NULL, 0); str = dev->dev_board ? dev->dev_board : ""; @@ -2270,7 +2270,7 @@ XtVaCreateManagedWidget("board", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); XtCreateManagedWidget("chipsetL", labelWidgetClass, box, NULL, 0); str = dev->dev_chipset ? dev->dev_chipset : ""; @@ -2278,7 +2278,7 @@ XtVaCreateManagedWidget("chipset", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); XtCreateManagedWidget("busidL", labelWidgetClass, box, NULL, 0); str = dev->dev_busid ? dev->dev_busid : ""; @@ -2286,7 +2286,7 @@ XtVaCreateManagedWidget("busid", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); XtCreateManagedWidget("cardL", labelWidgetClass, box, NULL, 0); str = dev->dev_card ? dev->dev_card : ""; @@ -2294,7 +2294,7 @@ XtVaCreateManagedWidget("card", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); XtCreateManagedWidget("driverL", labelWidgetClass, box, NULL, 0); str = dev->dev_driver ? dev->dev_driver : ""; @@ -2302,7 +2302,7 @@ XtVaCreateManagedWidget("driver", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); XtCreateManagedWidget("ramdacL", labelWidgetClass, box, NULL, 0); str = dev->dev_ramdac ? dev->dev_ramdac : ""; @@ -2310,7 +2310,7 @@ XtVaCreateManagedWidget("ramdac", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); XtCreateManagedWidget("dacSpeedL", labelWidgetClass, box, NULL, 0); if (dev->dev_dacSpeeds[0] > 0) { @@ -2327,7 +2327,7 @@ XtVaCreateManagedWidget("dacSpeed", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("videoRamL", labelWidgetClass, box, NULL, 0); if (dev->dev_videoram) @@ -2338,7 +2338,7 @@ XtVaCreateManagedWidget("videoRam", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("textClockFreqL", labelWidgetClass, box, NULL, 0); if (dev->dev_textclockfreq) @@ -2350,7 +2350,7 @@ XtVaCreateManagedWidget("textClockFreq", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("biosBaseL", labelWidgetClass, box, NULL, 0); if (dev->dev_bios_base) @@ -2361,7 +2361,7 @@ XtVaCreateManagedWidget("biosBase", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("memBaseL", labelWidgetClass, box, NULL, 0); if (dev->dev_mem_base) @@ -2372,7 +2372,7 @@ XtVaCreateManagedWidget("memBase", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("ioBaseL", labelWidgetClass, box, NULL, 0); if (dev->dev_io_base) @@ -2383,7 +2383,7 @@ XtVaCreateManagedWidget("ioBase", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("clockChipL", labelWidgetClass, box, NULL, 0); str = dev->dev_clockchip ? dev->dev_clockchip : ""; @@ -2391,7 +2391,7 @@ XtVaCreateManagedWidget("clockChip", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); *buf = '\0'; for (i = len = 0; i < dev->dev_clocks; i++) { @@ -2404,7 +2404,7 @@ XtVaCreateManagedWidget("devClock", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("chipIdL", labelWidgetClass, box, NULL, 0); if (dev->dev_chipid != -1) @@ -2415,7 +2415,7 @@ XtVaCreateManagedWidget("chipId", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("chipRevL", labelWidgetClass, box, NULL, 0); if (dev->dev_chiprev != -1) @@ -2426,7 +2426,7 @@ XtVaCreateManagedWidget("chipRev", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("irqL", labelWidgetClass, box, NULL, 0); if (dev->dev_irq != -1) @@ -2437,7 +2437,7 @@ XtVaCreateManagedWidget("irq", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("screenL", labelWidgetClass, box, NULL, 0); if (dev->dev_screen > 0) @@ -2448,7 +2448,7 @@ XtVaCreateManagedWidget("screen", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); } else { command = XtCreateManagedWidget("new", commandWidgetClass, box, @@ -2456,7 +2456,7 @@ XtAddCallback(command, XtNcallback, NewDeviceCallback, (XtPointer)node); label = XtVaCreateManagedWidget("value", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - NULL, 0); + NULL); node->data->device.text = label; } if (XtIsRealized(node->treeParent)) @@ -2542,7 +2542,7 @@ char *str, *tmp; /* vendor */ - XtVaGetValues(node->data->device.vendor, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.vendor, XtNstring, &str, NULL); XtFree(node->data->device.device->dev_vendor); if (*str) node->data->device.device->dev_vendor = XtNewString(str); @@ -2550,7 +2550,7 @@ node->data->device.device->dev_vendor = NULL; /* board */ - XtVaGetValues(node->data->device.board, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.board, XtNstring, &str, NULL); XtFree(node->data->device.device->dev_board); if (*str) node->data->device.device->dev_board = XtNewString(str); @@ -2558,7 +2558,7 @@ node->data->device.device->dev_board = NULL; /* chipset */ - XtVaGetValues(node->data->device.chipset, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.chipset, XtNstring, &str, NULL); XtFree(node->data->device.device->dev_chipset); if (*str) node->data->device.device->dev_chipset = XtNewString(str); @@ -2566,7 +2566,7 @@ node->data->device.device->dev_chipset = NULL; /* busid */ - XtVaGetValues(node->data->device.busid, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.busid, XtNstring, &str, NULL); XtFree(node->data->device.device->dev_busid); if (*str) node->data->device.device->dev_busid = XtNewString(str); @@ -2574,7 +2574,7 @@ node->data->device.device->dev_busid = NULL; /* card */ - XtVaGetValues(node->data->device.card, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.card, XtNstring, &str, NULL); XtFree(node->data->device.device->dev_card); if (*str) node->data->device.device->dev_card = XtNewString(str); @@ -2582,7 +2582,7 @@ node->data->device.device->dev_card = NULL; /* driver */ - XtVaGetValues(node->data->device.driver, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.driver, XtNstring, &str, NULL); XtFree(node->data->device.device->dev_driver); if (*str) node->data->device.device->dev_driver = XtNewString(str); @@ -2590,7 +2590,7 @@ node->data->device.device->dev_driver = NULL; /* ramdac */ - XtVaGetValues(node->data->device.ramdac, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.ramdac, XtNstring, &str, NULL); XtFree(node->data->device.device->dev_ramdac); if (*str) node->data->device.device->dev_ramdac = XtNewString(str); @@ -2599,7 +2599,7 @@ /* dacSpeed */ tmp = NULL; - XtVaGetValues(node->data->device.dacSpeed, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.dacSpeed, XtNstring, &str, NULL); for (i = 0; i < CONF_MAXDACSPEEDS && str != tmp; i++) { if ((node->data->device.device->dev_dacSpeeds[i] = (strtod(str, &tmp) * 1000. + .5)) == 0) @@ -2610,28 +2610,28 @@ } /* videoRam */ - XtVaGetValues(node->data->device.videoRam, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.videoRam, XtNstring, &str, NULL); node->data->device.device->dev_videoram = strtoul(str, NULL, 0); /* textClockFreq */ - XtVaGetValues(node->data->device.textClockFreq, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.textClockFreq, XtNstring, &str, NULL); node->data->device.device->dev_textclockfreq = strtod(str, NULL) * 1000. + .5; /* biosBase */ - XtVaGetValues(node->data->device.biosBase, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.biosBase, XtNstring, &str, NULL); node->data->device.device->dev_bios_base = strtoul(str, NULL, 0); /* memBase */ - XtVaGetValues(node->data->device.memBase, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.memBase, XtNstring, &str, NULL); node->data->device.device->dev_mem_base = strtoul(str, NULL, 0); /* ioBase */ - XtVaGetValues(node->data->device.ioBase, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.ioBase, XtNstring, &str, NULL); node->data->device.device->dev_io_base = strtoul(str, NULL, 0); /* clockChip */ - XtVaGetValues(node->data->device.clockChip, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.clockChip, XtNstring, &str, NULL); XtFree(node->data->device.device->dev_clockchip); if (*str) node->data->device.device->dev_clockchip = XtNewString(str); @@ -2640,7 +2640,7 @@ /* devSpeed */ tmp = NULL; - XtVaGetValues(node->data->device.devClock, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.devClock, XtNstring, &str, NULL); for (i = 0; i < CONF_MAXCLOCKS && str != tmp; i++) { if ((node->data->device.device->dev_clock[i] = (strtod(str, &tmp) * 1000. + .5)) == 0) @@ -2652,28 +2652,28 @@ node->data->device.device->dev_clocks = i; /* chipId */ - XtVaGetValues(node->data->device.chipId, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.chipId, XtNstring, &str, NULL); if (*str) node->data->device.device->dev_chipid = strtoul(str, NULL, 0); else node->data->device.device->dev_chipid = -1; /* chipRev */ - XtVaGetValues(node->data->device.chipRev, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.chipRev, XtNstring, &str, NULL); if (*str) node->data->device.device->dev_chiprev = strtoul(str, NULL, 0); else node->data->device.device->dev_chiprev = -1; /* irq */ - XtVaGetValues(node->data->device.irq, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.irq, XtNstring, &str, NULL); if (*str) node->data->device.device->dev_irq = strtoul(str, NULL, 0); else node->data->device.device->dev_irq = -1; /* screen */ - XtVaGetValues(node->data->device.screen, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->device.screen, XtNstring, &str, NULL); if (*str) node->data->device.device->dev_screen = strtoul(str, NULL, 0); else @@ -2721,7 +2721,7 @@ Widget box, command, label; box = XtVaCreateWidget("screen", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { @@ -2738,7 +2738,7 @@ NULL, 0); XtAddCallback(command, XtNcallback, OptionsCallback, (XtPointer)options); label = XtVaCreateManagedWidget("label", labelWidgetClass, box, - XtNlabel, scrn->scrn_identifier, NULL, 0); + XtNlabel, scrn->scrn_identifier, NULL); XtCreateManagedWidget("defaultDepthL", labelWidgetClass, box, NULL, 0); if (scrn->scrn_defaultdepth) @@ -2749,7 +2749,7 @@ XtVaCreateManagedWidget("defaultDepth", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("defaultBppL", labelWidgetClass, box, NULL, 0); if (scrn->scrn_defaultbpp) @@ -2760,7 +2760,7 @@ XtVaCreateManagedWidget("defaultBpp", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("defaultFbBppL", labelWidgetClass, box, NULL, 0); if (scrn->scrn_defaultfbbpp) @@ -2771,7 +2771,7 @@ XtVaCreateManagedWidget("defaultFbBpp", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("monitorL", labelWidgetClass, box, NULL, 0); str = scrn->scrn_monitor_str ? scrn->scrn_monitor_str : ""; @@ -2779,7 +2779,7 @@ XtVaCreateManagedWidget("monitor", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); XtCreateManagedWidget("deviceL", labelWidgetClass, box, NULL, 0); str = scrn->scrn_device_str ? scrn->scrn_device_str : ""; @@ -2787,18 +2787,18 @@ XtVaCreateManagedWidget("device", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); command = XtVaCreateManagedWidget("videoAdaptor", toggleWidgetClass, tree, XtNstate, True, - XtNtreeParent, box, NULL, 0); + XtNtreeParent, box, NULL); adaptor = NewNode(node, command, command, node->node, NULL); CreateScreenAdaptor(adaptor, scrn->scrn_adaptor_lst); node->child = adaptor; command = XtVaCreateManagedWidget("Display", toggleWidgetClass, tree, XtNstate, True, - XtNtreeParent, box, NULL, 0); + XtNtreeParent, box, NULL); display = NewNode(node, command, command, node->node, NULL); CreateScreenDisplay(display, scrn->scrn_display_lst); adaptor->next = display; @@ -2809,7 +2809,7 @@ XtAddCallback(command, XtNcallback, NewScreenCallback, (XtPointer)node); label = XtVaCreateManagedWidget("value", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - NULL, 0); + NULL); node->data->screen.text = label; } if (XtIsRealized(node->treeParent)) @@ -2914,21 +2914,21 @@ char *str; /* defautDepth */ - XtVaGetValues(node->data->screen.defaultDepth, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->screen.defaultDepth, XtNstring, &str, NULL); node->data->screen.screen->scrn_defaultdepth = strtoul(str, NULL, 0); /* defautBpp */ - XtVaGetValues(node->data->screen.defaultBpp, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->screen.defaultBpp, XtNstring, &str, NULL); node->data->screen.screen->scrn_defaultbpp = strtoul(str, NULL, 0); /* defautFbBpp */ - XtVaGetValues(node->data->screen.defaultFbBpp, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->screen.defaultFbBpp, XtNstring, &str, NULL); node->data->screen.screen->scrn_defaultfbbpp = strtoul(str, NULL, 0); /* XXX Monitor and Device should be changed to a menu interface */ /* monitor */ - XtVaGetValues(node->data->screen.monitor, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->screen.monitor, XtNstring, &str, NULL); XtFree(node->data->screen.screen->scrn_monitor_str); if (*str) node->data->screen.screen->scrn_monitor_str = XtNewString(str); @@ -2937,7 +2937,7 @@ /* XXX Monitor and Device should be changed to a menu interface */ /* device */ - XtVaGetValues(node->data->screen.device, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->screen.device, XtNstring, &str, NULL); XtFree(node->data->screen.screen->scrn_device_str); if (*str) node->data->screen.screen->scrn_device_str = XtNewString(str); @@ -2984,7 +2984,7 @@ Widget box, command; box = XtVaCreateWidget("adaptor", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { @@ -2994,19 +2994,19 @@ NULL, 0); XtAddCallback(command, XtNcallback, DestroyCallback, (XtPointer)node); (void) XtVaCreateManagedWidget("label", labelWidgetClass, box, - XtNlabel, lnk->al_adaptor_str, NULL, 0); + XtNlabel, lnk->al_adaptor_str, NULL); } else { Widget sme; XF86ConfVideoAdaptorPtr ptr = XF86Config->conf_videoadaptor_lst; command = XtVaCreateManagedWidget("new", menuButtonWidgetClass, box, - XtNmenuName, "adaptorMenu", NULL, 0); + XtNmenuName, "adaptorMenu", NULL); node->data->adaptorlink.menu = XtVaCreatePopupShell("adaptorMenu", simpleMenuWidgetClass, box, XtNleftMargin, 1, XtNrightMargin, 1, XtNtopMargin, 1, XtNbottomMargin, 1, - NULL, 0); + NULL); while (ptr) { sme = XtCreateManagedWidget(ptr->va_identifier, smeBSBObjectClass, node->data->adaptorlink.menu, NULL, 0); @@ -3088,7 +3088,7 @@ Widget box, command; box = XtVaCreateWidget("display", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { @@ -3113,7 +3113,7 @@ node->data->display.viewport = XtVaCreateManagedWidget("viewport", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - XtNstring, buf, NULL, 0); + XtNstring, buf, NULL); XtCreateManagedWidget("virtualL", labelWidgetClass, box, NULL, 0); if (dsp->disp_virtualX != 0 || dsp->disp_virtualY != 0) @@ -3123,7 +3123,7 @@ node->data->display.c_virtual = XtVaCreateManagedWidget("virtual", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - XtNstring, buf, NULL, 0); + XtNstring, buf, NULL); XtCreateManagedWidget("depthL", labelWidgetClass, box, NULL, 0); if (dsp->disp_depth != 0) @@ -3133,7 +3133,7 @@ node->data->display.depth = XtVaCreateManagedWidget("depth", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - XtNstring, buf, NULL, 0); + XtNstring, buf, NULL); XtCreateManagedWidget("bppL", labelWidgetClass, box, NULL, 0); if (dsp->disp_bpp != 0) @@ -3143,14 +3143,14 @@ node->data->display.bpp = XtVaCreateManagedWidget("bpp", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - XtNstring, buf, NULL, 0); + XtNstring, buf, NULL); XtCreateManagedWidget("visualL", labelWidgetClass, box, NULL, 0); str = dsp->disp_visual != NULL ? dsp->disp_visual : ""; node->data->display.visual = XtVaCreateManagedWidget("visual", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - XtNstring, str, NULL, 0); + XtNstring, str, NULL); XtCreateManagedWidget("weightL", labelWidgetClass, box, NULL, 0); if (dsp->disp_weight.red > 0) @@ -3161,7 +3161,7 @@ node->data->display.weight = XtVaCreateManagedWidget("weight", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - XtNstring, buf, NULL, 0); + XtNstring, buf, NULL); XtCreateManagedWidget("blackL", labelWidgetClass, box, NULL, 0); if (dsp->disp_black.red >= 0) @@ -3172,7 +3172,7 @@ node->data->display.black = XtVaCreateManagedWidget("black", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - XtNstring, buf, NULL, 0); + XtNstring, buf, NULL); XtCreateManagedWidget("whiteL", labelWidgetClass, box, NULL, 0); if (dsp->disp_white.red >= 0) @@ -3183,11 +3183,11 @@ node->data->display.white = XtVaCreateManagedWidget("white", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - XtNstring, buf, NULL, 0); + XtNstring, buf, NULL); command = XtVaCreateManagedWidget("Modes", toggleWidgetClass, tree, XtNstate, True, XtNtreeParent, box, - NULL, 0); + NULL); modes = NewNode(node, command, command, node->node, NULL); node->child = modes; CreateDisplayMode(modes, dsp->disp_mode_lst); @@ -3237,29 +3237,29 @@ int x, y; /* viewport */ - XtVaGetValues(node->data->display.viewport, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->display.viewport, XtNstring, &str, NULL); if (sscanf(str, "%d %d", &x, &y) == 2) { node->data->display.display->disp_frameX0 = x; node->data->display.display->disp_frameY0 = y; } /* virtual */ - XtVaGetValues(node->data->display.c_virtual, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->display.c_virtual, XtNstring, &str, NULL); if (sscanf(str, "%d %d", &x, &y) == 2) { node->data->display.display->disp_virtualX = x; node->data->display.display->disp_virtualY = y; } /* depth */ - XtVaGetValues(node->data->display.depth, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->display.depth, XtNstring, &str, NULL); node->data->display.display->disp_depth = strtoul(str, NULL, 0); /* bpp */ - XtVaGetValues(node->data->display.bpp, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->display.bpp, XtNstring, &str, NULL); node->data->display.display->disp_bpp = strtoul(str, NULL, 0); /* visual */ - XtVaGetValues(node->data->display.visual, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->display.visual, XtNstring, &str, NULL); XtFree(node->data->display.display->disp_visual); if (*str) node->data->display.display->disp_visual = XtNewString(str); @@ -3267,7 +3267,7 @@ node->data->display.display->disp_visual = NULL; /* weight */ - XtVaGetValues(node->data->display.weight, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->display.weight, XtNstring, &str, NULL); node->data->display.display->disp_weight.red = strtoul(str, &tmp, 0); if (str == tmp) node->data->display.display->disp_weight.red = 0; @@ -3285,7 +3285,7 @@ } /* black */ - XtVaGetValues(node->data->display.black, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->display.black, XtNstring, &str, NULL); node->data->display.display->disp_black.red = strtoul(str, &tmp, 0); if (str == tmp) node->data->display.display->disp_black.red = -1; @@ -3303,7 +3303,7 @@ } /* white */ - XtVaGetValues(node->data->display.white, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->display.white, XtNstring, &str, NULL); node->data->display.display->disp_white.red = strtoul(str, &tmp, 0); if (str == tmp) node->data->display.display->disp_white.red = -1; @@ -3360,7 +3360,7 @@ Widget box, command, text; box = XtVaCreateWidget("mode", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { XF86ModePtr mode = node->data->mode.mode; @@ -3370,14 +3370,14 @@ XtAddCallback(command, XtNcallback, DestroyCallback, (XtPointer)node); text = XtVaCreateManagedWidget("label", labelWidgetClass, box, - XtNlabel, mode->mode_name, NULL, 0); + XtNlabel, mode->mode_name, NULL); } else { command = XtCreateManagedWidget("new", commandWidgetClass, box, NULL, 0); XtAddCallback(command, XtNcallback, NewDisplayModeCallback, (XtPointer)node); text = XtVaCreateManagedWidget("value", asciiTextWidgetClass, box, - XtNeditType, XawtextEdit, NULL, 0); + XtNeditType, XawtextEdit, NULL); } node->data->mode.text = text; if (node->treeParent && XtIsRealized(node->treeParent)) @@ -3461,7 +3461,7 @@ Widget box, command; box = XtVaCreateWidget("input", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { @@ -3477,14 +3477,14 @@ NULL, 0); XtAddCallback(command, XtNcallback, OptionsCallback, (XtPointer)options); XtVaCreateManagedWidget("label", labelWidgetClass, box, - XtNlabel, inp->inp_identifier, NULL, 0); + XtNlabel, inp->inp_identifier, NULL); XtCreateManagedWidget("driverL", labelWidgetClass, box, NULL, 0); str = inp->inp_driver != NULL ? inp->inp_driver : ""; node->data->input.text = XtVaCreateManagedWidget("driver", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - XtNstring, str, NULL, 0); + XtNstring, str, NULL); } else { command = XtCreateManagedWidget("new", commandWidgetClass, box, NULL, 0); @@ -3492,7 +3492,7 @@ (XtPointer)node); node->data->input.text = XtVaCreateManagedWidget("value", asciiTextWidgetClass, box, - XtNeditType, XawtextEdit, NULL, 0); + XtNeditType, XawtextEdit, NULL); } if (XtIsRealized(node->treeParent)) XtRealizeWidget(box); @@ -3591,7 +3591,7 @@ char *str; /* vendor */ - XtVaGetValues(node->data->input.text, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->input.text, XtNstring, &str, NULL); XtFree(node->data->input.input->inp_driver); if (*str) node->data->input.input->inp_driver = XtNewString(str); @@ -3639,7 +3639,7 @@ Widget box, command, label; box = XtVaCreateWidget("layout", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { @@ -3655,18 +3655,18 @@ NULL, 0); XtAddCallback(command, XtNcallback, OptionsCallback, (XtPointer)options); label = XtVaCreateManagedWidget("label", labelWidgetClass, box, - XtNlabel, lay->lay_identifier, NULL, 0); + XtNlabel, lay->lay_identifier, NULL); command = XtVaCreateManagedWidget("Adjacency", toggleWidgetClass, tree, XtNstate, True, XtNtreeParent, box, - NULL, 0); + NULL); adjacency = NewNode(node, command, command, box, NULL); node->child = adjacency; CreateAdjacency(adjacency, lay->lay_adjacency_lst); command = XtVaCreateManagedWidget("Inputref", toggleWidgetClass, tree, XtNstate, True, XtNtreeParent, box, - NULL, 0); + NULL); inputref = NewNode(node, command, command, box, NULL); adjacency->next = inputref; CreateInputref(inputref, lay->lay_input_lst); @@ -3677,7 +3677,7 @@ XtAddCallback(command, XtNcallback, NewLayoutCallback, (XtPointer)node); label = XtVaCreateManagedWidget("value", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - NULL, 0); + NULL); node->data->layout.text = label; } if (XtIsRealized(node->treeParent)) @@ -3758,14 +3758,14 @@ XF86ConfScreenPtr ptr = XF86Config->conf_screen_lst; box = XtVaCreateWidget("adjacency", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; node->data->adjacency.menu = XtVaCreatePopupShell("screenMenu", simpleMenuWidgetClass, box, XtNleftMargin, 1, XtNrightMargin, 1, XtNtopMargin, 1, XtNbottomMargin, 1, - NULL, 0); + NULL); while (ptr) { sme = XtCreateManagedWidget(ptr->scrn_identifier, smeBSBObjectClass, node->data->adjacency.menu, NULL, 0); @@ -3786,7 +3786,7 @@ XtAddCallback(command, XtNcallback, DestroyCallback, (XtPointer)node); (void) XtVaCreateManagedWidget("label", labelWidgetClass, box, XtNlabel, adj->adj_screen->scrn_identifier, - NULL, 0); + NULL); XtCreateManagedWidget("scrnumL", labelWidgetClass, box, NULL, 0); if (adj->adj_scrnum >= 0) @@ -3796,40 +3796,40 @@ node->data->adjacency.scrnum = XtVaCreateManagedWidget("scrnum", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - XtNstring, buf, NULL, 0); + XtNstring, buf, NULL); above = XtVaCreateManagedWidget("above", toggleWidgetClass, box, XtNstate, adj->adj_where == CONF_ADJ_ABOVE ? - True : False, NULL, 0); + True : False, NULL); XtAddCallback(above, XtNcallback, AdjacencyToggleCallback, (XtPointer)node); left = XtVaCreateManagedWidget("leftOf", toggleWidgetClass, box, XtNradioGroup, above, XtNstate, adj->adj_where == CONF_ADJ_LEFTOF ? - True : False, NULL, 0); + True : False, NULL); XtAddCallback(left, XtNcallback, AdjacencyToggleCallback, (XtPointer)node); node->data->adjacency.button = XtVaCreateManagedWidget("screen", menuButtonWidgetClass, box, - XtNmenuName, "screenMenu", NULL, 0); + XtNmenuName, "screenMenu", NULL); right = XtVaCreateManagedWidget("rightOf", toggleWidgetClass, box, XtNradioGroup, left, XtNstate, adj->adj_where == CONF_ADJ_RIGHTOF ? - True : False, NULL, 0); + True : False, NULL); XtAddCallback(right, XtNcallback, AdjacencyToggleCallback, (XtPointer)node); below = XtVaCreateManagedWidget("below", toggleWidgetClass, box, XtNradioGroup, right, XtNstate, adj->adj_where == CONF_ADJ_BELOW ? - True : False, NULL, 0); + True : False, NULL); XtAddCallback(below, XtNcallback, AdjacencyToggleCallback, (XtPointer)node); relative = XtVaCreateManagedWidget("relative", toggleWidgetClass, box, XtNradioGroup, below, XtNstate, adj->adj_where == CONF_ADJ_RELATIVE ? - True : False, NULL, 0); + True : False, NULL); XtAddCallback(relative, XtNcallback, AdjacencyToggleCallback, (XtPointer)node); absolute = XtVaCreateManagedWidget("absolute", toggleWidgetClass, box, XtNradioGroup, relative, XtNstate, adj->adj_where == CONF_ADJ_ABSOLUTE ? - True : False, NULL, 0); + True : False, NULL); XtAddCallback(absolute, XtNcallback, AdjacencyToggleCallback, (XtPointer)node); XtCreateManagedWidget("adjxL", labelWidgetClass, box, NULL, 0); @@ -3837,29 +3837,29 @@ node->data->adjacency.adjx = XtVaCreateManagedWidget("adjx", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - XtNstring, buf, NULL, 0); + XtNstring, buf, NULL); XtCreateManagedWidget("adjyL", labelWidgetClass, box, NULL, 0); XmuSnprintf(buf, sizeof(buf), "%d", adj->adj_y); node->data->adjacency.adjy = XtVaCreateManagedWidget("adjy", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, - XtNstring, buf, NULL, 0); + XtNstring, buf, NULL); XtVaGetValues(node->data->adjacency.button, XtNwidth, &width, - XtNheight, &height, NULL, 0); + XtNheight, &height, NULL); if (adj->adj_where > CONF_ADJ_ABSOLUTE && adj->adj_where <= CONF_ADJ_RELATIVE) XtVaSetValues(node->data->adjacency.button, XtNlabel, adj->adj_refscreen, XtNwidth, width, - XtNheight, height, NULL, 0); + XtNheight, height, NULL); else XtVaSetValues(node->data->adjacency.button, XtNlabel, "", - XtNwidth, width, XtNheight, height, NULL, 0); + XtNwidth, width, XtNheight, height, NULL); } else XtVaCreateManagedWidget("new", menuButtonWidgetClass, box, - XtNmenuName, "screenMenu", NULL, 0); + XtNmenuName, "screenMenu", NULL); if (XtIsRealized(node->treeParent)) XtRealizeWidget(box); @@ -3905,7 +3905,7 @@ XtFree(adj->adj_refscreen); adj->adj_refscreen = XtNewString(XtName(w)); - XtVaSetValues(node->data->adjacency.button, XtNlabel, XtName(w), NULL, 0); + XtVaSetValues(node->data->adjacency.button, XtNlabel, XtName(w), NULL); } static void @@ -3918,14 +3918,14 @@ if ((Bool)(long)call_data == False) return; - XtVaGetValues(node->data->adjacency.adjx, XtNstring, &x, NULL, 0); - XtVaGetValues(node->data->adjacency.adjy, XtNstring, &y, NULL, 0); + XtVaGetValues(node->data->adjacency.adjx, XtNstring, &x, NULL); + XtVaGetValues(node->data->adjacency.adjy, XtNstring, &y, NULL); adj->adj_x = strtol(x, NULL, 0); adj->adj_y = strtol(y, NULL, 0); if (strcmp(XtName(w), "absolute") == 0) { - XtVaSetValues(node->data->adjacency.button, XtNlabel, "", NULL, 0); + XtVaSetValues(node->data->adjacency.button, XtNlabel, "", NULL); adj->adj_where = CONF_ADJ_ABSOLUTE; return; } @@ -3981,7 +3981,7 @@ Widget box, command; box = XtVaCreateWidget("inputref", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { @@ -3996,19 +3996,19 @@ NULL, 0); XtAddCallback(command, XtNcallback, OptionsCallback, (XtPointer)options); XtVaCreateManagedWidget("label", labelWidgetClass, box, - XtNlabel, inp->iref_inputdev_str, NULL, 0); + XtNlabel, inp->iref_inputdev_str, NULL); } else { Widget sme; XF86ConfInputPtr ptr = XF86Config->conf_input_lst; XtVaCreateManagedWidget("new", menuButtonWidgetClass, box, - XtNmenuName, "inputMenu", NULL, 0); + XtNmenuName, "inputMenu", NULL); node->data->inputref.menu = XtVaCreatePopupShell("inputMenu", simpleMenuWidgetClass, box, XtNleftMargin, 1, XtNrightMargin, 1, XtNtopMargin, 1, XtNbottomMargin, 1, - NULL, 0); + NULL); while (ptr) { sme = XtCreateManagedWidget(ptr->inp_identifier, smeBSBObjectClass, @@ -4090,7 +4090,7 @@ Widget box, command; box = XtVaCreateWidget("vendor", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { @@ -4106,12 +4106,12 @@ NULL, 0); XtAddCallback(command, XtNcallback, OptionsCallback, (XtPointer)options); XtVaCreateManagedWidget("label", labelWidgetClass, box, - XtNlabel, vendor->vnd_identifier, NULL, 0); + XtNlabel, vendor->vnd_identifier, NULL); command = XtVaCreateManagedWidget("VendSub", toggleWidgetClass, tree, XtNstate, True, XtNtreeParent, box, - NULL, 0); + NULL); sub = NewNode(node, command, command, box, NULL); node->child = sub; CreateVendorSub(sub, vendor->vnd_sub_lst); @@ -4122,7 +4122,7 @@ XtAddCallback(command, XtNcallback, NewVendorCallback, (XtPointer)node); node->data->vendor.text = XtVaCreateManagedWidget("value", asciiTextWidgetClass, box, - XtNeditType, XawtextEdit, NULL, 0); + XtNeditType, XawtextEdit, NULL); } if (XtIsRealized(node->treeParent)) XtRealizeWidget(box); @@ -4200,7 +4200,7 @@ Widget box, command; box = XtVaCreateWidget("vendorSub", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { @@ -4215,14 +4215,14 @@ NULL, 0); XtAddCallback(command, XtNcallback, OptionsCallback, (XtPointer)options); XtVaCreateManagedWidget("label", labelWidgetClass, box, - XtNlabel, vendor->vs_identifier, NULL, 0); + XtNlabel, vendor->vs_identifier, NULL); XtCreateManagedWidget("nameL", labelWidgetClass, box, NULL, 0); node->data->vendsub.text = XtVaCreateManagedWidget("name", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, vendor->vs_name ? vendor->vs_name : "", - NULL, 0); + NULL); } else { command = XtCreateManagedWidget("new", commandWidgetClass, box, @@ -4230,7 +4230,7 @@ XtAddCallback(command, XtNcallback, NewVendorSubCallback, (XtPointer)node); node->data->vendsub.text = XtVaCreateManagedWidget("value", asciiTextWidgetClass, box, - XtNeditType, XawtextEdit, NULL, 0); + XtNeditType, XawtextEdit, NULL); } if (XtIsRealized(node->treeParent)) XtRealizeWidget(box); @@ -4250,7 +4250,7 @@ { char *str; - XtVaGetValues(node->data->vendsub.text, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->vendsub.text, XtNstring, &str, NULL); XtFree(node->data->vendsub.vendsub->vs_name); if (*str) node->data->vendsub.vendsub->vs_name = XtNewString(str); @@ -4306,14 +4306,14 @@ char buf[32]; box = XtVaCreateWidget("dri", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; XtCreateManagedWidget("nameL", labelWidgetClass, box, NULL, 0); node->data->dri.name = XtVaCreateManagedWidget("name", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, dri->dri_group_name ? dri->dri_group_name : "", - NULL, 0); + NULL); XtCreateManagedWidget("groupL", labelWidgetClass, box, NULL, 0); if (dri->dri_group >= 0) @@ -4323,7 +4323,7 @@ node->data->dri.group = XtVaCreateManagedWidget("group", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); XtCreateManagedWidget("modeL", labelWidgetClass, box, NULL, 0); if (dri->dri_mode > 0) @@ -4333,11 +4333,11 @@ node->data->dri.mode = XtVaCreateManagedWidget("mode", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf, - NULL, 0); + NULL); toggle = XtVaCreateManagedWidget("Buffers", toggleWidgetClass, tree, XtNstate, True, XtNtreeParent, box, - NULL, 0); + NULL); buffers = NewNode(node, toggle, toggle, box, NULL); node->child = buffers; CreateBuffers(buffers, dri->dri_buffers_lst); @@ -4353,7 +4353,7 @@ char *str; /* name */ - XtVaGetValues(node->data->dri.name, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->dri.name, XtNstring, &str, NULL); XtFree(node->data->dri.dri->dri_group_name); if (*str) node->data->dri.dri->dri_group_name = XtNewString(str); @@ -4361,14 +4361,14 @@ node->data->dri.dri->dri_group_name = NULL; /* group */ - XtVaGetValues(node->data->dri.group, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->dri.group, XtNstring, &str, NULL); if (*str) node->data->dri.dri->dri_group = strtoul(str, NULL, 0); else node->data->dri.dri->dri_group = -1; /* mode */ - XtVaGetValues(node->data->dri.mode, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->dri.mode, XtNstring, &str, NULL); node->data->dri.dri->dri_mode = strtoul(str, NULL, 0); } @@ -4412,7 +4412,7 @@ Widget box, command; box = XtVaCreateWidget("buffers", formWidgetClass, tree, - XtNtreeParent, node->treeParent, NULL, 0); + XtNtreeParent, node->treeParent, NULL); node->node = box; if (!addnew) { @@ -4428,21 +4428,21 @@ node->data->buffers.count = XtVaCreateManagedWidget("count", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); XtCreateManagedWidget("sizeL", labelWidgetClass, box, NULL, 0); XmuSnprintf(str, sizeof(str), "%d", buf->buf_size); node->data->buffers.size = XtVaCreateManagedWidget("size", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, str, - NULL, 0); + NULL); XtCreateManagedWidget("flagsL", labelWidgetClass, box, NULL, 0); node->data->buffers.flags = XtVaCreateManagedWidget("flags", asciiTextWidgetClass, box, XtNeditType, XawtextEdit, XtNstring, buf->buf_flags ? buf->buf_flags : "", - NULL, 0); + NULL); } else { command = XtCreateManagedWidget("new", commandWidgetClass, box, @@ -4485,15 +4485,15 @@ char *str; /* count */ - XtVaGetValues(node->data->buffers.count, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->buffers.count, XtNstring, &str, NULL); node->data->buffers.buffers->buf_count = strtoul(str, NULL, 0); /* size */ - XtVaGetValues(node->data->buffers.size, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->buffers.size, XtNstring, &str, NULL); node->data->buffers.buffers->buf_size = strtoul(str, NULL, 0); /* flags */ - XtVaGetValues(node->data->buffers.flags, XtNstring, &str, NULL, 0); + XtVaGetValues(node->data->buffers.flags, XtNstring, &str, NULL); if (*str) node->data->buffers.buffers->buf_flags = XtNewString(str); else @@ -4546,7 +4546,7 @@ /* sets treeParent to NULL so that RelayoutTree works correctly, * as the tree will properly calculate it's new size. */ - XtVaSetValues(node->node, XtNtreeParent, NULL, NULL, 0); + XtVaSetValues(node->node, XtNtreeParent, NULL, NULL); XtDestroyWidget(node->node); XtFree((XtPointer)node); @@ -4568,7 +4568,7 @@ while (node) { if (!XtIsRealized(node->node)) XtRealizeWidget(node->node); - XtVaSetValues(node->node, XtNtreeParent, node->treeParent, NULL, 0); + XtVaSetValues(node->node, XtNtreeParent, node->treeParent, NULL); XtManageChild(node->node); if (node->child && !node->toggle) @@ -4585,7 +4585,7 @@ if (toggle) { if (!XtIsRealized(node->node)) XtRealizeWidget(node->node); - XtVaSetValues(node->node, XtNtreeParent, node->treeParent, NULL, 0); + XtVaSetValues(node->node, XtNtreeParent, node->treeParent, NULL); XtManageChild(node->node); if (node->child && !node->toggle) @@ -4594,10 +4594,10 @@ else { if (node->child) ToggleNode(node->child, False); - XtVaSetValues(node->node, XtNtreeParent, NULL, NULL, 0); + XtVaSetValues(node->node, XtNtreeParent, NULL, NULL); XtUnmanageChild(node->node); if (node->toggle) - XtVaSetValues(node->toggle, XtNstate, False, NULL, 0); + XtVaSetValues(node->toggle, XtNstate, False, NULL); } node = node->next; } @@ -4731,7 +4731,7 @@ shell = XtCreatePopupShell("Expert", transientShellWidgetClass, toplevel, NULL, 0); paned = XtVaCreateManagedWidget("paned", panedWidgetClass, shell, - XtNorientation, XtorientHorizontal, NULL, 0); + XtNorientation, XtorientHorizontal, NULL); vpane = XtCreateManagedWidget("vpane", panedWidgetClass, paned, NULL, 0); panner = XtCreateManagedWidget ("panner", pannerWidgetClass, vpane, NULL, 0); close = XtCreateManagedWidget("close", commandWidgetClass, vpane, NULL, 0); @@ -4743,24 +4743,24 @@ tree = XtCreateManagedWidget("tree", treeWidgetClass, expert, NULL, 0); config = XtVaCreateManagedWidget(__XCONFIGFILE__, toggleWidgetClass, tree, - XtNstate, True, NULL, 0); + XtNstate, True, NULL); mainNode = NewNode(NULL, config, config, NULL, NULL); files = XtVaCreateManagedWidget("Files", toggleWidgetClass, tree, - XtNtreeParent, config, NULL, 0); + XtNtreeParent, config, NULL); node = NewNode(mainNode, files, files, config, NULL); mainNode->child = node; CreateFiles(node); modules = XtVaCreateManagedWidget("Module", toggleWidgetClass, tree, - XtNtreeParent, config, NULL, 0); + XtNtreeParent, config, NULL); node->next = NewNode(mainNode, modules, modules, config, NULL); node = node->next; CreateModule(node, XF86Config->conf_modules ? XF86Config->conf_modules->mod_load_lst : NULL); flags = XtVaCreateManagedWidget("ServerFlags", commandWidgetClass, tree, - XtNtreeParent, config, NULL, 0); + XtNtreeParent, config, NULL); node->next = NewNode(mainNode, flags, NULL, config, NULL); node = node->next; if (XF86Config->conf_flags == NULL) @@ -4770,55 +4770,55 @@ (XtPointer)&(XF86Config->conf_flags->flg_option_lst)); video = XtVaCreateManagedWidget("VideoAdaptor", toggleWidgetClass, tree, - XtNtreeParent, config, NULL, 0); + XtNtreeParent, config, NULL); node->next = NewNode(mainNode, video, video, config, NULL); node = node->next; CreateVideoAdaptor(node, XF86Config->conf_videoadaptor_lst); modes = XtVaCreateManagedWidget("Mode", toggleWidgetClass, tree, - XtNtreeParent, config, NULL, 0); + XtNtreeParent, config, NULL); node->next = NewNode(mainNode, modes, modes, config, NULL); node = node->next; CreateModes(node, XF86Config->conf_modes_lst); monitor = XtVaCreateManagedWidget("Monitor", toggleWidgetClass, tree, - XtNtreeParent, config, NULL, 0); + XtNtreeParent, config, NULL); node->next = NewNode(mainNode, monitor, monitor, config, NULL); node = node->next; CreateMonitor(monitorTree = node, XF86Config->conf_monitor_lst); device = XtVaCreateManagedWidget("Device", toggleWidgetClass, tree, - XtNtreeParent, config, NULL, 0); + XtNtreeParent, config, NULL); node->next = NewNode(mainNode, device, device, config, NULL); node = node->next; CreateDevice(node, XF86Config->conf_device_lst); screen = XtVaCreateManagedWidget("Screen", toggleWidgetClass, tree, - XtNtreeParent, config, NULL, 0); + XtNtreeParent, config, NULL); node->next = NewNode(mainNode, screen, screen, config, NULL); node = node->next; CreateScreen(screenTree = node, XF86Config->conf_screen_lst); input = XtVaCreateManagedWidget("Input", toggleWidgetClass, tree, - XtNtreeParent, config, NULL, 0); + XtNtreeParent, config, NULL); node->next = NewNode(mainNode, input, input, config, NULL); node = node->next; CreateInput(node, XF86Config->conf_input_lst); layout = XtVaCreateManagedWidget("Layout", toggleWidgetClass, tree, - XtNtreeParent, config, NULL, 0); + XtNtreeParent, config, NULL); node->next = NewNode(mainNode, layout, layout, config, NULL); node = node->next; CreateLayout(layoutTree = node, XF86Config->conf_layout_lst); vendor = XtVaCreateManagedWidget("Vendor", toggleWidgetClass, tree, - XtNtreeParent, config, NULL, 0); + XtNtreeParent, config, NULL); node->next = NewNode(mainNode, vendor, vendor, config, NULL); node = node->next; CreateVendor(node, XF86Config->conf_vendor_lst); dri = XtVaCreateManagedWidget("DRI", toggleWidgetClass, tree, - XtNtreeParent, config, NULL, 0); + XtNtreeParent, config, NULL); node->next = NewNode(mainNode, dri, dri, config, NULL); node = node->next; if (XF86Config->conf_dri == NULL) --- programs/Xserver/hw/xfree86/xf86cfg/help.c +++ programs/Xserver/hw/xfree86/xf86cfg/help.c @@ -95,7 +95,7 @@ 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 @@ 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 @@ 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 @@ else parser->alink = 0L; - XtVaSetValues(src, XtNeditType, XawtextEdit, NULL, 0); + XtVaSetValues(src, XtNeditType, XawtextEdit, NULL); Html_ModeInit(); @@ -512,7 +512,7 @@ } XmuDestroyScanline(parser->mask); - XtVaSetValues(src, XtNeditType, XawtextRead, NULL, 0); + XtVaSetValues(src, XtNeditType, XawtextRead, NULL); XtFree((XtPointer)parser); @@ -534,9 +534,9 @@ 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; --- programs/Xserver/hw/xfree86/xf86cfg/interface.c +++ programs/Xserver/hw/xfree86/xf86cfg/interface.c @@ -333,7 +333,7 @@ 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 @@ 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 @@ (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 @@ (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 @@ (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 @@ 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 @@ 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 @@ 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 @@ dialog = XtVaCreateManagedWidget("notice", dialogWidgetClass, shell, XtNvalue, NULL, - NULL, 0); + NULL); XawDialogAddButton(dialog, "ok", PopdownErrorCallback, (XtPointer)shell); XtRealizeWidget(shell); @@ -900,7 +900,7 @@ 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 @@ XtNlabel, name, XtNmenuName, l->lay_identifier, XtNleftBitmap, menuPixmap, - NULL, 0); + NULL); XtAddCallback(layoutsme, XtNcallback, SelectLayoutCallback, (XtPointer)l); @@ -1177,7 +1177,7 @@ XtNlabel, lay->lay_identifier, XtNmenuName, lay->lay_identifier, XtNleftBitmap, menuPixmap, - NULL, 0); + NULL); XtAddCallback(sme, XtNcallback, SelectLayoutCallback, (XtPointer)lay); if (layoutsme == NULL) layoutsme = sme; --- programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c +++ programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c @@ -1182,7 +1182,7 @@ 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 @@ 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 @@ 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 @@ sme = XtVaCreateManagedWidget("None", smeBSBObjectClass, optionsp, XtNlabel, "None", - NULL, 0); + NULL); XtAddCallback(sme, XtNcallback, KeyboardOptionsCallback, NULL); optparent = optionsp; optname = NULL; @@ -1239,7 +1239,7 @@ smeBSBObjectClass, optpopup, XtNlabel, "None", - NULL, 0); + NULL); XtAddCallback(sme, XtNcallback, KeyboardOptionsCallback, NULL); } else { @@ -1251,7 +1251,7 @@ 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 @@ 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 @@ 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 @@ 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(); --- programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c +++ programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c @@ -382,25 +382,25 @@ 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 @@ XtSetValues(cmenu, args, 1); ++men; sme = XtVaCreateManagedWidget("none", smeBSBObjectClass, menu, - NULL, 0); + NULL); XtAddCallback(sme, XtNcallback, MonitorSelectCardCallback, NULL); while (device != NULL) { --- programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c +++ programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c @@ -367,7 +367,7 @@ text = XtVaCreateManagedWidget("device", asciiTextWidgetClass, mouse_dp, XtNeditType, XawtextEdit, - NULL, 0); + NULL); viewport = XtCreateManagedWidget("viewportD", viewportWidgetClass, mouse_dp, NULL, 0); @@ -375,7 +375,7 @@ viewport, XtNlist, devices, XtNnumberStrings, ndevices, - NULL, 0); + NULL); XtAddCallback(listD, XtNcallback, MouseDeviceCallback, (XtPointer)text); /* PROTOCOL */ @@ -392,11 +392,11 @@ 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); --- programs/Xserver/hw/xfree86/xf86cfg/options.c +++ programs/Xserver/hw/xfree86/xf86cfg/options.c @@ -136,7 +136,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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); } } --- programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c +++ programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c @@ -444,16 +444,16 @@ 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 @@ 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 @@ (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); --- programs/Xserver/hw/xfree86/xf86cfg/vidmode.c +++ programs/Xserver/hw/xfree86/xf86cfg/vidmode.c @@ -449,7 +449,7 @@ 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 @@ vtune, XtNmenuName, "screenP", XtNlabel, name, - NULL, 0); + NULL); } } XtRealizeWidget(screenp); @@ -568,7 +568,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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); --- programs/editres/widgets.c.~1~ 2005-04-03 12:51:09.000000000 +0200 +++ programs/editres/widgets.c 2005-04-03 12:51:18.000000000 +0200 @@ -492,7 +492,7 @@ char **names, **cons_names; transientShellWidgetClass, node->widget, XtNmaxWidth, max_width, - XtNmaxHeight, max_height, NULL, ZERO); + XtNmaxHeight, max_height, NULL); XtAddCallback(res_box->shell, XtNdestroyCallback, FreeResBox, (XtPointer) node); --- programs/xedit/ispell.c.~1~ 2005-04-03 12:52:28.000000000 +0200 +++ programs/xedit/ispell.c 2005-04-03 12:53:11.000000000 +0200 @@ -2053,7 +2053,7 @@ InitIspell(void) ispell.text = XtVaCreateManagedWidget("text", asciiTextWidgetClass, ispell.form, XtNeditType, XawtextEdit, - NULL, 0); + NULL); ispell.suggestions = XtCreateManagedWidget("suggestions", labelWidgetClass, ispell.form, NULL, 0); ispell.viewport = XtCreateManagedWidget("viewport", viewportWidgetClass, @@ -2099,7 +2099,7 @@ InitIspell(void) ispell.terse = XtVaCreateManagedWidget("terse", toggleWidgetClass, ispell.commands, XtNstate, ispell.terse_mode, - NULL, 0); + NULL); XtAddCallback(ispell.terse, XtNcallback, ToggleTerseIspell, NULL); ispell.status = XtCreateManagedWidget("status", labelWidgetClass, ispell.form, NULL, 0); @@ -2108,7 +2108,7 @@ InitIspell(void) ispell.dict = XtVaCreateManagedWidget("dict", menuButtonWidgetClass, ispell.options, XtNmenuName, "dictionaries", - NULL, 0); + NULL); ispell.dictMenu = XtCreatePopupShell("dictionaries", simpleMenuWidgetClass, ispell.options, NULL, 0); XtRealizeWidget(ispell.dictMenu); @@ -2116,7 +2116,7 @@ InitIspell(void) ispell.format = XtVaCreateManagedWidget("format", menuButtonWidgetClass, ispell.options, XtNmenuName, "formats", - NULL, 0); + NULL); ispell.formatMenu = XtCreatePopupShell("formats", simpleMenuWidgetClass, ispell.options, NULL, 0); XtRealizeWidget(ispell.formatMenu); --- programs/xedit/options.c.~1~ 2005-04-03 12:53:41.000000000 +0200 +++ programs/xedit/options.c 2005-04-03 12:54:08.000000000 +0200 @@ -349,11 +349,11 @@ CreateColumnsShell(void) XtCreateManagedWidget("leftLabel", labelWidgetClass, form, NULL, 0); left_text = XtVaCreateManagedWidget("left", asciiTextWidgetClass, form, XtNeditType, XawtextEdit, - NULL, 0); + NULL); XtCreateManagedWidget("rightLabel", labelWidgetClass, form, NULL, 0); right_text = XtVaCreateManagedWidget("right", asciiTextWidgetClass, form, XtNeditType, XawtextEdit, - NULL, 0); + NULL); ok = XtCreateManagedWidget("ok", commandWidgetClass, form, NULL, 0); XtAddCallback(ok, XtNcallback, ProcessColumnsCallback, (XtPointer)True);