aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-01-21 14:16:41 (GMT)
committerfluxgen <fluxgen>2004-01-21 14:16:41 (GMT)
commitb479fdc7dfb6bc61ebcd0d7134aa46e59ac235ec (patch)
tree1eec8203406d7c55c7b4e389b758586cb17599b8
parentbb6b80e4e4f994aa99e5924943459a53fd15bd62 (diff)
downloadfluxbox_pavel-b479fdc7dfb6bc61ebcd0d7134aa46e59ac235ec.zip
fluxbox_pavel-b479fdc7dfb6bc61ebcd0d7134aa46e59ac235ec.tar.bz2
minor stuff
-rw-r--r--src/FbTk/TextureRender.cc17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/FbTk/TextureRender.cc b/src/FbTk/TextureRender.cc
index 669f067..6525d71 100644
--- a/src/FbTk/TextureRender.cc
+++ b/src/FbTk/TextureRender.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: TextureRender.cc,v 1.6 2004/01/11 12:52:37 fluxgen Exp $ 25// $Id: TextureRender.cc,v 1.7 2004/01/21 14:16:41 fluxgen Exp $
26 26
27#include "TextureRender.hh" 27#include "TextureRender.hh"
28 28
@@ -114,11 +114,10 @@ Pixmap TextureRender::render(const FbTk::Texture &texture) {
114 114
115Pixmap TextureRender::renderSolid(const FbTk::Texture &texture) { 115Pixmap TextureRender::renderSolid(const FbTk::Texture &texture) {
116 116
117 Display *disp = FbTk::App::instance()->display(); 117 FbPixmap pixmap(RootWindow(FbTk::App::instance()->display(),
118 118 control.screenNumber()),
119 FbPixmap pixmap(RootWindow(disp, control.screenNum()), 119 width, height,
120 width, height, 120 control.depth());
121 control.depth());
122 121
123 if (pixmap.drawable() == None) { 122 if (pixmap.drawable() == None) {
124 cerr<<"FbTk::TextureRender::render_solid(): error creating pixmap"<<endl; 123 cerr<<"FbTk::TextureRender::render_solid(): error creating pixmap"<<endl;
@@ -271,7 +270,7 @@ XImage *TextureRender::renderXImage() {
271 Display *disp = FbTk::App::instance()->display(); 270 Display *disp = FbTk::App::instance()->display();
272 XImage *image = 271 XImage *image =
273 XCreateImage(disp, 272 XCreateImage(disp,
274 DefaultVisual(disp, control.screenNum()), control.depth(), ZPixmap, 0, 0, 273 DefaultVisual(disp, control.screenNumber()), control.depth(), ZPixmap, 0, 0,
275 width, height, 32, 0); 274 width, height, 32, 0);
276 275
277 if (! image) { 276 if (! image) {
@@ -659,7 +658,7 @@ return image;
659 658
660Pixmap TextureRender::renderPixmap() { 659Pixmap TextureRender::renderPixmap() {
661 Display *disp = FbTk::App::instance()->display(); 660 Display *disp = FbTk::App::instance()->display();
662 FbPixmap pixmap(RootWindow(disp, control.screenNum()), 661 FbPixmap pixmap(RootWindow(disp, control.screenNumber()),
663 width, height, control.depth()); 662 width, height, control.depth());
664 663
665 if (pixmap.drawable() == None) { 664 if (pixmap.drawable() == None) {
@@ -677,7 +676,7 @@ Pixmap TextureRender::renderPixmap() {
677 } 676 }
678 677
679 XPutImage(disp, pixmap.drawable(), 678 XPutImage(disp, pixmap.drawable(),
680 DefaultGC(disp, control.screenNum()), 679 DefaultGC(disp, control.screenNumber()),
681 image, 0, 0, 0, 0, width, height); 680 image, 0, 0, 0, 0, width, height);
682 681
683 if (image->data != 0) { 682 if (image->data != 0) {