all repos — openbox @ b3f0cbf76630e878c8e7cabddfcd45cf557849fe

openbox fork - make it a bit more like ryudo

split the header up for obt
Dana Jansens danakj@orodu.net
commit

b3f0cbf76630e878c8e7cabddfcd45cf557849fe

parent

ebce321a72331697287838b864735e7b81e60b33

5 files changed, 101 insertions(+), 25 deletions(-)

jump to
M Makefile.amMakefile.am

@@ -126,7 +126,9 @@ $(GLIB_LIBS) \

$(XML_LIBS) obt_libobt_la_SOURCES = \ obt/obt.h \ - obt/instance.c + obt/instance.h \ + obt/instance.c \ + obt/util.h ## openbox ##

@@ -400,7 +402,9 @@ render/mask.h \

render/render.h \ render/theme.h \ parser/parse.h \ - obt/obt.h + obt/obt.h \ + obt/instance.h \ + obt/util.h nodist_pubinclude_HEADERS = \ version.h
M obt/instance.cobt/instance.c

@@ -1,3 +1,21 @@

+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + obt/instance.c for the Openbox window manager + Copyright (c) 2007 Dana Jansens + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + #include "obt/obt.h" #ifdef HAVE_STRING_H
A obt/instance.h

@@ -0,0 +1,38 @@

+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + obt/instance.h for the Openbox window manager + Copyright (c) 2007 Dana Jansens + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + +#ifndef __obt_instance_h +#define __obt_instance_h + +#include <X11/Xlib.h> +#include <glib.h> + +G_BEGIN_DECLS + +typedef struct _ObtInstance ObtInstance; + +/* Instance funcs */ +ObtInstance* obt_instance_new (const char *display_name); +void obt_instance_ref (ObtInstance *inst); +void obt_instance_unref (ObtInstance *inst); + +Display* obt_display (const ObtInstance *inst); + +G_END_DECLS + +#endif /*__obt_instance_h*/
M obt/obt.hobt/obt.h

@@ -19,28 +19,7 @@

#ifndef __obt_h #define __obt_h -#include <X11/Xlib.h> -#include <glib.h> - -#ifdef HAVE_STRING_H -# include <string.h> /* for memset() */ -#endif - -G_BEGIN_DECLS - -typedef struct _ObtInstance ObtInstance; - -/* Instance funcs */ -ObtInstance* obt_instance_new (const char *display_name); -void obt_instance_ref (ObtInstance *inst); -void obt_instance_unref (ObtInstance *inst); - -Display* obt_display (const ObtInstance *inst); - -/* Util funcs */ -#define obt_free g_free -#define obt_free0(p, type, num) memset((p), 0, sizeof(type) * (num)), g_free(p) - -G_END_DECLS +#include "obt/instance.h" +#include "obt/util.h" #endif /*__obt_h*/
A obt/util.h

@@ -0,0 +1,37 @@

+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + obt/util.h for the Openbox window manager + Copyright (c) 2007 Dana Jansens + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + +#ifndef __obt_util_h +#define __obt_util_h + +#include <glib.h> + +#ifdef HAVE_STRING_H +# include <string.h> /* for memset() */ +#endif + +G_BEGIN_DECLS + +/* Util funcs */ +#define obt_free g_free +#define obt_free0(p, type, num) memset((p), 0, sizeof(type) * (num)), g_free(p) + +G_END_DECLS + + +#endif /*__obt_util_h*/