summaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-04-23 17:56:35 +0000
committerDana Jansens <danakj@orodu.net>2007-04-23 17:56:35 +0000
commit2442cdfd85e5229c7ee4ac49ca66a7d55ffcb919 (patch)
treef651e82bc6e640e21e12f7eb7a2f84870850382e /render
parentea088eb88d7c29558fa59563a934545bc122d5eb (diff)
1) translate all of openbox's output
2) update copyrights. 3) make release. ok that part not quite yet.
Diffstat (limited to 'render')
-rw-r--r--render/color.c15
-rw-r--r--render/color.h2
-rw-r--r--render/font.c2
-rw-r--r--render/font.h2
-rw-r--r--render/geom.h2
-rw-r--r--render/gradient.c2
-rw-r--r--render/gradient.h2
-rw-r--r--render/icon.h2
-rw-r--r--render/image.c2
-rw-r--r--render/image.h2
-rw-r--r--render/instance.c4
-rw-r--r--render/instance.h2
-rw-r--r--render/mask.c2
-rw-r--r--render/mask.h2
-rw-r--r--render/render.c2
-rw-r--r--render/test.c2
-rw-r--r--render/theme.c8
17 files changed, 31 insertions, 24 deletions
diff --git a/render/color.c b/render/color.c
index 600fc335..a247673f 100644
--- a/render/color.c
+++ b/render/color.c
@@ -2,7 +2,7 @@
color.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
Copyright (c) 2003 Derek Foreman
This program is free software; you can redistribute it and/or modify
@@ -49,7 +49,7 @@ RrColor *RrColorParse(const RrInstance *inst, gchar *colorname)
xcol.blue = 0;
xcol.pixel = 0;
if (!XParseColor(RrDisplay(inst), RrColormap(inst), colorname, &xcol)) {
- g_warning("unable to parse color '%s'", colorname);
+ g_message("Unable to parse color '%s'", colorname);
return NULL;
}
return RrColorNew(inst, xcol.red >> 8, xcol.green >> 8, xcol.blue >> 8);
@@ -191,7 +191,8 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
}
break;
default:
- g_warning("your bit depth is currently unhandled\n");
+ g_error("Your bit depth is currently unhandled\n");
+
}
}
@@ -228,7 +229,8 @@ static void swap_byte_order(XImage *im)
case 1:
break;
default:
- g_warning("Your bit depth is currently unhandled");
+ g_error("Your bit depth (%i) is currently unhandled",
+ im->bits_per_pixel);
}
}
di += im->bytes_per_line;
@@ -289,7 +291,7 @@ void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
}
break;
case 8:
- g_warning("this image bit depth is currently unhandled");
+ g_error("This image bit depth (%i) is currently unhandled", 8);
break;
case 1:
for (y = 0; y < im->height; y++) {
@@ -304,7 +306,8 @@ void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
}
break;
default:
- g_warning("this image bit depth is currently unhandled");
+ g_error("This image bit depth (%i) is currently unhandled",
+ im->bits_per_pixel);
}
}
diff --git a/render/color.h b/render/color.h
index 703fc3e3..26fa7afe 100644
--- a/render/color.h
+++ b/render/color.h
@@ -1,7 +1,7 @@
/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
color.h for the Openbox window manager
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
Copyright (c) 2003 Derek Foreman
This program is free software; you can redistribute it and/or modify
diff --git a/render/font.c b/render/font.c
index e91925b5..266a0086 100644
--- a/render/font.c
+++ b/render/font.c
@@ -2,7 +2,7 @@
font.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
Copyright (c) 2003 Derek Foreman
This program is free software; you can redistribute it and/or modify
diff --git a/render/font.h b/render/font.h
index 03f960c6..26affc9e 100644
--- a/render/font.h
+++ b/render/font.h
@@ -1,7 +1,7 @@
/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
font.h for the Openbox window manager
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
Copyright (c) 2003 Derek Foreman
This program is free software; you can redistribute it and/or modify
diff --git a/render/geom.h b/render/geom.h
index a83636f8..4d81e4b3 100644
--- a/render/geom.h
+++ b/render/geom.h
@@ -2,7 +2,7 @@
geom.h for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-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
diff --git a/render/gradient.c b/render/gradient.c
index 620848b0..d3a09955 100644
--- a/render/gradient.c
+++ b/render/gradient.c
@@ -2,7 +2,7 @@
gradient.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
Copyright (c) 2003 Derek Foreman
This program is free software; you can redistribute it and/or modify
diff --git a/render/gradient.h b/render/gradient.h
index 50a22c52..8613f0ce 100644
--- a/render/gradient.h
+++ b/render/gradient.h
@@ -1,7 +1,7 @@
/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
gradient.h for the Openbox window manager
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
Copyright (c) 2003 Derek Foreman
This program is free software; you can redistribute it and/or modify
diff --git a/render/icon.h b/render/icon.h
index eafa6961..0e241562 100644
--- a/render/icon.h
+++ b/render/icon.h
@@ -1,7 +1,7 @@
/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
icon.h for the Openbox window manager
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-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
diff --git a/render/image.c b/render/image.c
index aa30ee62..f8789332 100644
--- a/render/image.c
+++ b/render/image.c
@@ -2,7 +2,7 @@
image.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-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
diff --git a/render/image.h b/render/image.h
index c373ce09..1c535960 100644
--- a/render/image.h
+++ b/render/image.h
@@ -1,7 +1,7 @@
/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
image.h for the Openbox window manager
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-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
diff --git a/render/instance.c b/render/instance.c
index a9b70ffe..91f9db77 100644
--- a/render/instance.c
+++ b/render/instance.c
@@ -2,7 +2,7 @@
instance.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-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
@@ -134,7 +134,7 @@ void RrPseudoColorSetup (RrInstance *inst)
_ncolors = RrPseudoNcolors(inst);
if (_ncolors > 1 << inst->depth) {
- g_warning("PseudoRenderControl: Invalid colormap size. Resizing.\n");
+ g_message("Invalid colormap size. Resizing.");
inst->pseudo_bpc = 1 << (inst->depth/3) >> 3;
_ncolors = 1 << (inst->pseudo_bpc * 3);
}
diff --git a/render/instance.h b/render/instance.h
index 8a15f423..324f061a 100644
--- a/render/instance.h
+++ b/render/instance.h
@@ -1,7 +1,7 @@
/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
instance.h for the Openbox window manager
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-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
diff --git a/render/mask.c b/render/mask.c
index 11e589bc..10ce8d0f 100644
--- a/render/mask.c
+++ b/render/mask.c
@@ -1,7 +1,7 @@
/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
mask.c for the Openbox window manager
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
Copyright (c) 2003 Derek Foreman
This program is free software; you can redistribute it and/or modify
diff --git a/render/mask.h b/render/mask.h
index e6a158fa..4dc85031 100644
--- a/render/mask.h
+++ b/render/mask.h
@@ -1,7 +1,7 @@
/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
mask.h for the Openbox window manager
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
Copyright (c) 2003 Derek Foreman
This program is free software; you can redistribute it and/or modify
diff --git a/render/render.c b/render/render.c
index a1120570..8c39fcd2 100644
--- a/render/render.c
+++ b/render/render.c
@@ -2,7 +2,7 @@
render.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
Copyright (c) 2003 Derek Foreman
This program is free software; you can redistribute it and/or modify
diff --git a/render/test.c b/render/test.c
index c867cf78..6cf41c1b 100644
--- a/render/test.c
+++ b/render/test.c
@@ -2,7 +2,7 @@
test.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
Copyright (c) 2003 Derek Foreman
This program is free software; you can redistribute it and/or modify
diff --git a/render/theme.c b/render/theme.c
index ade6f6c5..8d61d23d 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -76,15 +76,19 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
if (name) {
if (!parse_load_theme(name, &ps.doc, &root, &ps.path)) {
- g_warning("Falling back to the default theme: '%s'",
+ g_message("Unable to load the theme '%s'", name);
+ g_message("Falling back to the default theme '%s'",
DEFAULT_THEME);
/* make it fall back to default theme */
name = NULL;
}
}
if (!name) {
- if (!parse_load_theme(DEFAULT_THEME, &ps.doc, &root, &ps.path))
+ if (!parse_load_theme(DEFAULT_THEME, &ps.doc, &root, &ps.path)) {
+ g_message("Unable to load the theme '%s'",
+ name, DEFAULT_THEME);
return NULL;
+ }
}
ps.inst = inst;