Skip to content

Jessica Hawkwell / nitrogen

Go to a project
Commit f6faaf81 by Jessica Hawkwell
Options

updating and fixing broken linker

1 parent 8618a838
Inline Side-by-side
Showing with 27 additions and 284 deletions
.gitignore
# Created by https://www.gitignore.io/api/git,c++,cmake,netbeans,kdevelop4
### C++ ###
# Prerequisites
*.d
# Compiled Object files
*.slo
*.lo
*.o
*.obj
# Precompiled Headers
*.gch
*.pch
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Fortran module files
*.mod
*.smod
# Compiled Static libraries
*.lai
*.la
*.a
*.lib
# Executables
*.exe
*.out
*.app
### CMake ###
CMakeCache.txt
CMakeFiles
CMakeScripts
Testing
Makefile
cmake_install.cmake
install_manifest.txt
compile_commands.json
CTestTestfile.cmake
build
### Git ###
*.orig
### KDevelop4 ###
*.kdev4
.kdev4/
*.kateproject
### NetBeans ###
nbproject/
build/
nbbuild/
dist/
nbdist/
.nb-gradle/
nbactions.xml
# End of https://www.gitignore.io/api/git,c++,cmake,netbeans,kdevelop4
*.core
# Created by https://www.gitignore.io/api/codeblocks
### CodeBlocks ###
# specific to CodeBlocks IDE
*.cbp
*.save
*.layout
*.depend
# generated directories
bin/
obj/
generated-doc/
*-prefix
*-patched *-patched
# End of https://www.gitignore.io/api/codeblocks build
src/libnde/nde.h
src/libntk/ntk.h
src/NitroWin/NitroWin.h
CMakeLists.txt
...@@ -23,6 +23,6 @@ find_package(X11) ...@@ -23,6 +23,6 @@ find_package(X11)
#add_subdirectory(deps) #add_subdirectory(deps)
add_subdirectory(src/libnde) add_subdirectory(src/nde)
#add_subdirectory(src/libntk) #add_subdirectory(src/ntk)
add_subdirectory(src/NitroWin) add_subdirectory(src/NitroWin)
clean.sh
...@@ -7,6 +7,9 @@ INSTALL=`find * -type f -name cmake_install.cmake` ...@@ -7,6 +7,9 @@ INSTALL=`find * -type f -name cmake_install.cmake`
PKGLIST=`find * -type f -name install_manifest.txt` PKGLIST=`find * -type f -name install_manifest.txt`
VIMS=`find * -type f -name "*~"` VIMS=`find * -type f -name "*~"`
BUILDS=`find * -type d -name build` BUILDS=`find * -type d -name build`
CORES=`find * -type f -name "*.core"`
FILES="src/nde/nde.h src/ntk/ntk.h src/NitroWin/NitroWin.h"
if [ -n "${CMAKEFILES}" ]; then if [ -n "${CMAKEFILES}" ]; then
echo Removing CMakeFiles echo Removing CMakeFiles
...@@ -43,8 +46,19 @@ if [ -n "${BUILDS}" ]; then ...@@ -43,8 +46,19 @@ if [ -n "${BUILDS}" ]; then
rm -rf ${BUILDS} rm -rf ${BUILDS}
fi fi
if [ -n "${CORES}" ]; then
echo Removing core dumps
rm ${CORES}
fi
if [ -d localized ]; then if [ -d localized ]; then
echo Removing localized text echo Removing localized text
rm -rf localized rm -rf localized
fi fi
for F in ${FILES}
do
if [ -f $F ]; then
rm -v $F
fi
done
src/NitroWin/NitroWin.h deleted 100644 → 0
/*
* Copyright (c) 2018, jlhawkwell
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
/*
* File: NitroWin.h
* Author: jlhawkwell
*
* Created on March 16, 2018, 12:49 PM
*/
#ifndef NITROWIN_H
#define NITROWIN_H
#define NITROWIN_NAME "NitroWin"
#define NITROWIN_VERSION_MAJOR 1
#define NITROWIN_VERSION_MINOR 0
#define NITROWIN_VERSION_PATCH 0
#define NITROWIN_VERSION_TWEAK 0
#define NITROWIN_VERSION "1.0.0.0"
#include <X11/Xlib.h>
#include <X11/X.h>
#ifndef GC_NAME_CONFLICT
#define GC_NAME_CONFLICT
#include <gc/gc.h>
#include <gc/gc_cpp.h>
#include <gc/gc_allocator.h>
#include <gc/gc_backptr.h>
#endif
#endif /* NITROWIN_H */
src/libnde/nde.h deleted 100644 → 0
/*
* Copyright (c) 2018, jlhawkwell
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
/*
* File: nde.h
* Author: jlhawkwell
*
* Created on March 16, 2018, 12:49 PM
*/
#ifndef NDE_H
#define NDE_H
#ifndef GC_NAME_CONFLICT
#define GC_NAME_CONFLICT
#include <gc/gc.h>
#include <gc/gc_cpp.h>
#include <gc/gc_allocator.h>
#include <gc/gc_backptr.h>
#endif
#define NDE_NAME "nde"
#define NDE_VERSION_MAJOR 1
#define NDE_VERSION_MINOR 0
#define NDE_VERSION_PATCH 0
#define NDE_VERSION_TWEAK 0
#define NDE_VERSION "1.0.0.0"
#include <typeinfo>
#include <iosfwd>
#include <string>
namespace nitrogen {
template <typename T>
char * getTypeName(const T obj) {
return (char *)typeid(obj).name();
}
}
#endif /* NDE_H */
src/libntk/ntk.h deleted 100644 → 0
/*
* Copyright (c) 2018, jlhawkwell
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
/*
* File: ntk.h
* Author: jlhawkwell
*
* Created on March 16, 2018, 12:49 PM
*/
#ifndef NTK_H
#define NTK_H
#ifndef GC_NAME_CONFLICT
#define GC_NAME_CONFLICT
#include <gc/gc.h>
#include <gc/gc_cpp.h>
#include <gc/gc_allocator.h>
#include <gc/gc_backptr.h>
#endif
#include <nde.h>
#include <X11/Xlib.h>
#include <ostream>
#define NTK_NAME "ntk"
#define NTK_VERSION_MAJOR 1
#define NTK_VERSION_MINOR 0
#define NTK_VERSION_PATCH 0
#define NTK_VERSION_TWEAK 0
#define NTK_VERSION "1.0.0.0"
#ifndef OBJECT_H
#include <nitrogen/Object.h>
#endif
namespace nitrogen {
static Display* disp;
static Window* root;
void init();
}
#endif /* NTK_H */
src/libnde/nde.h.in → src/nde/nde.h.in
...@@ -59,5 +59,6 @@ namespace nitrogen { ...@@ -59,5 +59,6 @@ namespace nitrogen {
return (char *)typeid(obj).name(); return (char *)typeid(obj).name();
} }
} }
#endif /* NDE_H */ #endif /* NDE_H */
src/libntk/CMakeLists.txt → src/ntk/CMakeLists.txt
...@@ -39,7 +39,7 @@ nitrogen/util/ComponentRenderer.cpp ...@@ -39,7 +39,7 @@ nitrogen/util/ComponentRenderer.cpp
) )
target_link_libraries(${PROJECT_NAME} LINK_PUBLIC nde ${BoehmGC} ${X11_LIBRARIES} ${BoehmGC} ${RESVG} ${Cairo}) target_link_libraries(${PROJECT_NAME} LINK_PUBLIC nde ${BoehmGC} ${X11_LIBRARIES} ${Cairo})
target_include_directories (ntk PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories (ntk PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
install(FILES ${PROJECT_NAME}.h DESTINATION include) install(FILES ${PROJECT_NAME}.h DESTINATION include)
......
src/libntk/nitrogen/util/ComponentRenderer.h → src/ntk/nitrogen/util/ComponentRenderer.h
...@@ -38,15 +38,12 @@ ...@@ -38,15 +38,12 @@
#include <nitrogen/nwt/Component.h> #include <nitrogen/nwt/Component.h>
#define RESVG_CAIRO_BACKEND
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/extensions/Xrender.h> #include <X11/extensions/Xrender.h>
#include <cairo/cairo-xlib-xrender.h> #include <cairo/cairo-xlib-xrender.h>
#include <cairo/cairo-xlib.h> #include <cairo/cairo-xlib.h>
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <resvg.h>
namespace nitrogen { namespace nitrogen {
namespace util { namespace util {
...@@ -67,8 +64,6 @@ namespace nitrogen { ...@@ -67,8 +64,6 @@ namespace nitrogen {
nwt::Component* comp; nwt::Component* comp;
cairo_t* cairo; cairo_t* cairo;
cairo_surface_t* surface; cairo_surface_t* surface;
//resvg_handle* svg_handle;
resvg_render_tree* svg_tree;
void init(); void init();
private: private:
......
test_NitroWin.sh
#!/bin/sh #!/bin/sh
XEPHYR=$(which Xephyr) XEPHYR=$(which Xephyr)
xinit ./xinitrc -- "$XEPHYR" :100 -screen 800x600 -host-cursor xinit ./xinitrc -- "$XEPHYR" :100 -screen 1000x750 -host-cursor
xinitrc
xsetroot -solid grey & xsetroot -solid grey &
xterm &
XTERM=`which xfce4-terminal`
${XTERM:=xterm} &
exec build/bin/NitroWin exec build/bin/NitroWin
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!