[debian-edu-commits] debian-edu/ 02/437: First try on usplash theme.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository debian-edu-artwork.

commit e1fe86240707872c88fd7e5e7c4d746291e9f11e
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Aug 1 08:19:17 2006 +0000

    First try on usplash theme.
---
 art/usplash/Makefile.am                |  27 +++++++-------
 art/usplash/debian-edu-usplash-theme.c |  65 +++++++++++++++++++++++++++++++++
 art/usplash/debian-edu-usplash.png     | Bin 0 -> 18448 bytes
 art/usplash/debian-edu-usplash.xcf     | Bin 0 -> 59495 bytes
 4 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/art/usplash/Makefile.am b/art/usplash/Makefile.am
index 2cc006f..55d3029 100644
--- a/art/usplash/Makefile.am
+++ b/art/usplash/Makefile.am
@@ -1,6 +1,4 @@
-BUILT_SOURCES = usplash-artwork.c usplash-artwork.o debian-edu-usplash.so
-
-AM_INCLUDES = -I/usr/include/bogl
+BUILT_SOURCES = debian-edu-usplash.c debian-edu-usplash.o debian-edu-usplash.so
 
 usplashdir = $(libdir)/usplash
 
@@ -8,22 +6,23 @@ install-exec-local: debian-edu-usplash.so
 	$(mkinstalldirs) $(DESTDIR)$(usplashdir)
 	cp debian-edu-usplash.so $(DESTDIR)$(usplashdir)
 
-usplash_DATA = debian-edu-usplash.png
+usplash_DATA = debian-edu-usplash.xcf debian-edu-usplash.png \
+	debian-edu-usplash-theme.c usplash-theme.h
 
 EXTRA_DIST = $(usplash_DATA)
 
-usplash-artwork.c: debian-edu-usplash.png
-	cp $< usplash-artwork.png
-	pngtobogl usplash-artwork.png >$@
+debian-edu-usplash.c: debian-edu-usplash.png
+	pngtobogl $(srcdir)/debian-edu-usplash.png >$@.new && mv $@.new $@
 
-usplash-artwork.o: usplash-artwork.c
-	$(CC) -Os -g -I/usr/include/bogl -fPIC -c $< -o $@
+.c.o:
+	$(CC) -Os -g -I/usr/include/bogl -I$(srcdir) -fPIC -c $< -o $@
 
-debian-edu-usplash.so: usplash-artwork.o
-	$(CC) -shared -Wl,-soname,usplash-artwork.so $< -o $@
+debian-edu-usplash.so: debian-edu-usplash.o debian-edu-usplash-theme.o
+	$(CC) -shared -Wl,-soname,debian-edu-usplash.so $^ -o $@
 
 DISTCLEANFILES = \
-	usplash-artwork.c \
-	usplash-artwork.o \
-	usplash-artwork.png \
+	debian-edu-usplash.c \
 	debian-edu-usplash.so
+CLEANFILES = \
+	debian-edu-usplash.o \
+	debian-edu-usplash-theme.o
diff --git a/art/usplash/debian-edu-usplash-theme.c b/art/usplash/debian-edu-usplash-theme.c
new file mode 100644
index 0000000..8c6c4a6
--- /dev/null
+++ b/art/usplash/debian-edu-usplash-theme.c
@@ -0,0 +1,65 @@
+/* usplash
+ *
+ * usplash-testcard-theme.c - definition of testcard theme
+ *
+ * Copyright (c) 2006 Petter Reinholdtsen
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+ /* Based on usplash-testcard-theme.c from the usplash package */
+
+#include "usplash-theme.h"
+
+/* Pixmap structure from autogenerated debian-edu-usplash.c */
+extern struct bogl_pixmap pixmap_debian_edu_usplash;
+
+/* Font structure built-in to bogl */
+extern struct bogl_font font_helvB10;
+
+/* Theme definition */
+struct usplash_theme usplash_theme = {
+  .version = THEME_VERSION,
+
+  /* Background and font */
+  .pixmap = &pixmap_debian_edu_usplash,
+  .font   = &font_helvB10,
+
+  /* Palette indexes */
+  .background             = 0x0,
+  .progressbar_background = 0x7,
+  .progressbar_foreground = 0x8,
+  .text_background        = 0x7,
+  .text_foreground        = 0xf,
+  .text_success           = 0xf,
+  .text_failure           = 0xc,
+
+  /* Progress bar position and size in pixels */
+  .progressbar_x      = 220,
+  .progressbar_y      = 210,
+  .progressbar_width  = 200,
+  .progressbar_height = 10,
+
+  /* Text box position and size in pixels */
+  .text_x      = 160,
+  .text_y      = 256,
+  .text_width  = 320,
+  .text_height = 84,
+
+  /* Text details */
+  .line_height  = 15,
+  .line_length  = 32,
+  .status_width = 30,
+};
diff --git a/art/usplash/debian-edu-usplash.png b/art/usplash/debian-edu-usplash.png
new file mode 100644
index 0000000..4666c94
Binary files /dev/null and b/art/usplash/debian-edu-usplash.png differ
diff --git a/art/usplash/debian-edu-usplash.xcf b/art/usplash/debian-edu-usplash.xcf
new file mode 100644
index 0000000..5175186
Binary files /dev/null and b/art/usplash/debian-edu-usplash.xcf differ

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git