aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/TextureRender.cc
diff options
context:
space:
mode:
authorsimonb <simonb>2006-06-21 14:41:16 (GMT)
committersimonb <simonb>2006-06-21 14:41:16 (GMT)
commit3ada3b1f0d6d2debaaab48eecf828a406e964c8e (patch)
tree3c2f02462317408ee8604d0c7bb41092ecfd1c3a /src/FbTk/TextureRender.cc
parent62a298b0b30aa5b4990f462aece224e09e4fafe6 (diff)
downloadfluxbox-3ada3b1f0d6d2debaaab48eecf828a406e964c8e.zip
fluxbox-3ada3b1f0d6d2debaaab48eecf828a406e964c8e.tar.bz2
fix nls... notably classify text on conversion whether its for X or
console, plus handle catalogs better.
Diffstat (limited to 'src/FbTk/TextureRender.cc')
-rw-r--r--src/FbTk/TextureRender.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/FbTk/TextureRender.cc b/src/FbTk/TextureRender.cc
index 7af8f08..7626c3b 100644
--- a/src/FbTk/TextureRender.cc
+++ b/src/FbTk/TextureRender.cc
@@ -70,12 +70,12 @@ TextureRender::TextureRender(ImageControl &imgctrl,
70 _FB_USES_NLS; 70 _FB_USES_NLS;
71 // clamp to "normal" size 71 // clamp to "normal" size
72 if (width > texture_max_width) { 72 if (width > texture_max_width) {
73 cerr<<"TextureRender: "<<_FBTKTEXT(Error, BigWidth, "Warning! Width > 3200 setting Width = 3200", "Image width seems too big, clamping")<<endl; 73 cerr<<"TextureRender: "<<_FBTK_CONSOLETEXT(Error, BigWidth, "Warning! Width > 3200 setting Width = 3200", "Image width seems too big, clamping")<<endl;
74 width = texture_max_width; 74 width = texture_max_width;
75 } 75 }
76 76
77 if (height > texture_max_height) { 77 if (height > texture_max_height) {
78 cerr<<"TextureRender: "<<_FBTKTEXT(Error, BigHeight, "Warning! Height > 3200 setting Height = 3200", "Image height seems too big, clamping")<<endl; 78 cerr<<"TextureRender: "<<_FBTK_CONSOLETEXT(Error, BigHeight, "Warning! Height > 3200 setting Height = 3200", "Image height seems too big, clamping")<<endl;
79 height = texture_max_height; 79 height = texture_max_height;
80 } 80 }
81 81
@@ -120,7 +120,7 @@ void TextureRender::allocateColorTables() {
120 char sbuf[128]; 120 char sbuf[128];
121 sprintf(sbuf, "%ld", (long int) size); 121 sprintf(sbuf, "%ld", (long int) size);
122 throw std::string("TextureRender::TextureRender(): " + 122 throw std::string("TextureRender::TextureRender(): " +
123 std::string(_FBTKTEXT(Error, OutOfMemoryRed, "Out of memory while allocating red buffer.", "")) + string(sbuf)); 123 std::string(_FBTK_CONSOLETEXT(Error, OutOfMemoryRed, "Out of memory while allocating red buffer.", "")) + string(sbuf));
124 } 124 }
125 125
126 126
@@ -129,7 +129,7 @@ void TextureRender::allocateColorTables() {
129 char sbuf[128]; 129 char sbuf[128];
130 sprintf(sbuf, "%ld", (long int) size); 130 sprintf(sbuf, "%ld", (long int) size);
131 throw std::string("TextureRender::TextureRender(): " + 131 throw std::string("TextureRender::TextureRender(): " +
132 std::string(_FBTKTEXT(Error, OutOfMemoryGreen, "Out of memory while allocating green buffer.", ""))+ string(sbuf)); 132 std::string(_FBTK_CONSOLETEXT(Error, OutOfMemoryGreen, "Out of memory while allocating green buffer.", ""))+ string(sbuf));
133 } 133 }
134 134
135 blue = FB_new_nothrow unsigned char[size]; 135 blue = FB_new_nothrow unsigned char[size];
@@ -137,7 +137,7 @@ void TextureRender::allocateColorTables() {
137 char sbuf[128]; 137 char sbuf[128];
138 sprintf(sbuf, "%ld", (long int) size); 138 sprintf(sbuf, "%ld", (long int) size);
139 throw std::string("TextureRender::TextureRender(): " + 139 throw std::string("TextureRender::TextureRender(): " +
140 std::string(_FBTKTEXT(Error, OutOfMemoryBlue, "Out of memory while allocating blue buffer.", ""))+ string(sbuf)); 140 std::string(_FBTK_CONSOLETEXT(Error, OutOfMemoryBlue, "Out of memory while allocating blue buffer.", ""))+ string(sbuf));
141 } 141 }
142 142
143 143
@@ -152,7 +152,7 @@ Pixmap TextureRender::renderSolid(const FbTk::Texture &texture) {
152 152
153 if (pixmap.drawable() == None) { 153 if (pixmap.drawable() == None) {
154 _FB_USES_NLS; 154 _FB_USES_NLS;
155 cerr<<"FbTk::TextureRender::render_solid(): "<<_FBTKTEXT(Error, CreatePixmap, "Error creating pixmap", "Couldn't create a pixmap - image - for some reason")<<endl; 155 cerr<<"FbTk::TextureRender::render_solid(): "<<_FBTK_CONSOLETEXT(Error, CreatePixmap, "Error creating pixmap", "Couldn't create a pixmap - image - for some reason")<<endl;
156 return None; 156 return None;
157 } 157 }
158 158
@@ -321,7 +321,7 @@ XImage *TextureRender::renderXImage() {
321 321
322 if (! image) { 322 if (! image) {
323 _FB_USES_NLS; 323 _FB_USES_NLS;
324 cerr << "FbTk::TextureRender::renderXImage(): " << _FBTKTEXT(Error, CreateXImage, "Can't create XImage", "Couldn't create an XImage") << "." << endl; 324 cerr << "FbTk::TextureRender::renderXImage(): " << _FBTK_CONSOLETEXT(Error, CreateXImage, "Can't create XImage", "Couldn't create an XImage") << "." << endl;
325 return 0; 325 return 0;
326 } 326 }
327 327
@@ -594,7 +594,7 @@ XImage *TextureRender::renderXImage() {
594 default: 594 default:
595 _FB_USES_NLS; 595 _FB_USES_NLS;
596 cerr << "TextureRender::renderXImage(): " << 596 cerr << "TextureRender::renderXImage(): " <<
597 _FBTKTEXT(Error, UnsupportedVisual, "Unsupported visual", "A visual is a technical term in X") << endl; 597 _FBTK_CONSOLETEXT(Error, UnsupportedVisual, "Unsupported visual", "A visual is a technical term in X") << endl;
598 delete [] d; 598 delete [] d;
599 XDestroyImage(image); 599 XDestroyImage(image);
600 return (XImage *) 0; 600 return (XImage *) 0;
@@ -697,7 +697,7 @@ XImage *TextureRender::renderXImage() {
697 default: 697 default:
698 _FB_USES_NLS; 698 _FB_USES_NLS;
699 cerr << "TextureRender::renderXImage(): " << 699 cerr << "TextureRender::renderXImage(): " <<
700 _FBTKTEXT(Error, UnsupportedVisual, "Unsupported visual", "A visual is a technical term in X") << endl; 700 _FBTK_CONSOLETEXT(Error, UnsupportedVisual, "Unsupported visual", "A visual is a technical term in X") << endl;
701 delete [] d; 701 delete [] d;
702 XDestroyImage(image); 702 XDestroyImage(image);
703 return (XImage *) 0; 703 return (XImage *) 0;
@@ -716,7 +716,7 @@ Pixmap TextureRender::renderPixmap() {
716 716
717 if (pixmap.drawable() == None) { 717 if (pixmap.drawable() == None) {
718 _FB_USES_NLS; 718 _FB_USES_NLS;
719 cerr<<"FbTk::TextureRender::renderPixmap(): "<<_FBTKTEXT(Error, CreatePixmap, "Error creating pixmap", "Couldn't create a pixmap - image - for some reason")<<endl; 719 cerr<<"FbTk::TextureRender::renderPixmap(): "<<_FBTK_CONSOLETEXT(Error, CreatePixmap, "Error creating pixmap", "Couldn't create a pixmap - image - for some reason")<<endl;
720 return None; 720 return None;
721 } 721 }
722 722