*
* Copyright (c) 1991-2000, University of Groningen, The Netherlands.
* Copyright (c) 2001-2013, The GROMACS development team.
- * Copyright (c) 2013, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014, by the GROMACS development team, led by
* Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
* and including many others, as listed in the AUTHORS file in the
* top-level source directory and at http://www.gromacs.org.
* To help us fund GROMACS development, we humbly ask that you cite
* the research papers on the package. Check out http://www.gromacs.org.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
+
+#include "x11.h"
+#include <stdlib.h>
#include <string.h>
-#include "typedefs.h"
-#include "sysstuff.h"
-#include "smalloc.h"
-#include "string2.h"
+
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/utility/cstringutil.h"
+#include "gromacs/utility/smalloc.h"
+
#include "Xstuff.h"
-#include "x11.h"
/* These colours will be mapped to black on a monochrome screen */
unsigned long BLACK, BLUE, GREEN, CYAN, RED, BROWN, GREY, DARKGREY;
bool bVerbose = false;
int i;
- title = strdup(argv[0]);
+ title = gmx_strdup(argv[0]);
/* First check environment */
- fontname = getenv("GMXFONT");
+ fontname = getenv("GMX_FONT");
display = getenv("DISPLAY");
snew(ARGV, *argc);
break;
case 't':
sfree(title);
- title = strdup(argv[++i]);
+ title = gmx_strdup(argv[++i]);
break;
case 'v':
bVerbose = true;
{
x11->bg = LIGHTGREY;
}
- x11->title = strdup(title);
+ x11->title = gmx_strdup(title);
sfree(title);
x11->wlist = NULL;
x11->GetNamedColor = &GetNamedColor;