diff --git a/Makefile.am b/Makefile.am index 263372e..7ac5c1c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -420,6 +420,19 @@ mod_pango_la_LDFLAGS = \ -module \ -avoid-version +if BUILD_ENABLE_RENDERER_BBULK +module_LTLIBRARIES += mod-bbulk.la +endif + +mod_bbulk_la_SOURCES = \ + src/kmscon_module_interface.h \ + src/githead.h \ + src/text_bbulk.c \ + src/kmscon_mod_bbulk.c +mod_bbulk_la_LDFLAGS = \ + -module \ + -avoid-version + # # Binaries # These are the sources for the main binaries and test programs. They mostly @@ -499,10 +512,6 @@ if BUILD_ENABLE_RENDERER_BBLIT kmscon_SOURCES += src/text_bblit.c endif -if BUILD_ENABLE_RENDERER_BBULK -kmscon_SOURCES += src/text_bbulk.c -endif - if BUILD_ENABLE_RENDERER_GLTEX kmscon_SOURCES += \ src/text_gltex.c \ diff --git a/src/kmscon_mod_bbulk.c b/src/kmscon_mod_bbulk.c new file mode 100644 index 0000000..fe2ad31 --- /dev/null +++ b/src/kmscon_mod_bbulk.c @@ -0,0 +1,58 @@ +/* + * kmscon - BBulk rendering backend module + * + * Copyright (c) 2011-2013 David Herrmann + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files + * (the "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +/* + * BBulk rendering backend module + * This module provides the bbulk renderer backend. + */ + +#include +#include +#include "text.h" +#include "kmscon_module_interface.h" +#include "log.h" + +#define LOG_SUBSYSTEM "mod_bbulk" + +static int kmscon_bbulk_load(void) +{ + int ret; + + kmscon_text_bbulk_ops.owner = KMSCON_THIS_MODULE; + ret = kmscon_text_register(&kmscon_text_bbulk_ops); + if (ret) { + log_error("cannot register bbulk renderer"); + return ret; + } + + return 0; +} + +static void kmscon_bbulk_unload(void) +{ + kmscon_text_unregister(kmscon_text_bbulk_ops.name); +} + +KMSCON_MODULE(NULL, kmscon_bbulk_load, kmscon_bbulk_unload, NULL); diff --git a/src/kmscon_terminal.c b/src/kmscon_terminal.c index 582c047..d122238 100644 --- a/src/kmscon_terminal.c +++ b/src/kmscon_terminal.c @@ -247,7 +247,7 @@ static int add_display(struct kmscon_terminal *term, struct uterm_display *disp) else if (!ret) be = "gltex"; else - be = NULL; + be = "bbulk"; ret = kmscon_text_new(&scr->txt, be); if (ret) { diff --git a/src/text.h b/src/text.h index 5fdcd8e..3e65b05 100644 --- a/src/text.h +++ b/src/text.h @@ -132,24 +132,6 @@ static inline void kmscon_text_bblit_unload(void) #endif -#ifdef BUILD_ENABLE_RENDERER_BBULK - -int kmscon_text_bbulk_load(void); -void kmscon_text_bbulk_unload(void); - -#else - -static inline int kmscon_text_bbulk_load(void) -{ - return -EOPNOTSUPP; -} - -static inline void kmscon_text_bbulk_unload(void) -{ -} - -#endif - #ifdef BUILD_ENABLE_RENDERER_GLTEX int kmscon_text_gltex_load(void); @@ -170,7 +152,6 @@ static inline void kmscon_text_gltex_unload(void) static inline void kmscon_text_load_all(void) { - kmscon_text_bbulk_load(); kmscon_text_bblit_load(); kmscon_text_gltex_load(); } @@ -179,7 +160,6 @@ static inline void kmscon_text_unload_all(void) { kmscon_text_gltex_unload(); kmscon_text_bblit_unload(); - kmscon_text_bbulk_unload(); } #endif /* KMSCON_TEXT_H */