aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/FbDrawable.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-09-11 23:01:34 (GMT)
committerfluxgen <fluxgen>2004-09-11 23:01:34 (GMT)
commit049e40c9eb6e6e8651b171a2a78465398c87f6a1 (patch)
tree7aef9d57e82336221d6d953617c7a5d53ee95db0 /src/FbTk/FbDrawable.cc
parentacd2176355876a7bb7afe9d026f9780a3d1c2737 (diff)
downloadfluxbox_pavel-049e40c9eb6e6e8651b171a2a78465398c87f6a1.zip
fluxbox_pavel-049e40c9eb6e6e8651b171a2a78465398c87f6a1.tar.bz2
Font::drawText takes reference to FbDrawable instead of X Drawable + some code cleaning
Diffstat (limited to 'src/FbTk/FbDrawable.cc')
-rw-r--r--src/FbTk/FbDrawable.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/FbTk/FbDrawable.cc b/src/FbTk/FbDrawable.cc
index f10f894..157f991 100644
--- a/src/FbTk/FbDrawable.cc
+++ b/src/FbTk/FbDrawable.cc
@@ -1,5 +1,5 @@
1// FbDrawable.cc for FbTk - Fluxbox ToolKit 1// FbDrawable.cc for FbTk - Fluxbox ToolKit
2// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net) 2// Copyright (c) 2003-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
3// 3//
4// Permission is hereby granted, free of charge, to any person obtaining a 4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"), 5// copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbDrawable.cc,v 1.3 2004/09/10 15:46:08 akir Exp $ 22// $Id: FbDrawable.cc,v 1.4 2004/09/11 22:58:20 fluxgen Exp $
23 23
24#include "FbDrawable.hh" 24#include "FbDrawable.hh"
25 25
@@ -37,9 +37,9 @@ FbDrawable::FbDrawable() {
37} 37}
38 38
39void FbDrawable::copyArea(Drawable src, GC gc, 39void FbDrawable::copyArea(Drawable src, GC gc,
40 int src_x, int src_y, 40 int src_x, int src_y,
41 int dest_x, int dest_y, 41 int dest_x, int dest_y,
42 unsigned int width, unsigned int height) { 42 unsigned int width, unsigned int height) {
43 if (drawable() == 0 || src == 0 || gc == 0) 43 if (drawable() == 0 || src == 0 || gc == 0)
44 return; 44 return;
45 XCopyArea(s_display, 45 XCopyArea(s_display,
@@ -50,7 +50,7 @@ void FbDrawable::copyArea(Drawable src, GC gc,
50} 50}
51 51
52void FbDrawable::fillRectangle(GC gc, int x, int y, 52void FbDrawable::fillRectangle(GC gc, int x, int y,
53 unsigned int width, unsigned int height) { 53 unsigned int width, unsigned int height) {
54 if (drawable() == 0 || gc == 0) 54 if (drawable() == 0 || gc == 0)
55 return; 55 return;
56 XFillRectangle(s_display, 56 XFillRectangle(s_display,
@@ -60,7 +60,7 @@ void FbDrawable::fillRectangle(GC gc, int x, int y,
60} 60}
61 61
62void FbDrawable::drawRectangle(GC gc, int x, int y, 62void FbDrawable::drawRectangle(GC gc, int x, int y,
63 unsigned int width, unsigned int height) { 63 unsigned int width, unsigned int height) {
64 if (drawable() == 0 || gc == 0) 64 if (drawable() == 0 || gc == 0)
65 return; 65 return;
66 XDrawRectangle(s_display, 66 XDrawRectangle(s_display,
@@ -70,7 +70,7 @@ void FbDrawable::drawRectangle(GC gc, int x, int y,
70} 70}
71 71
72void FbDrawable::drawLine(GC gc, int start_x, int start_y, 72void FbDrawable::drawLine(GC gc, int start_x, int start_y,
73 int end_x, int end_y) { 73 int end_x, int end_y) {
74 if (drawable() == 0 || gc == 0) 74 if (drawable() == 0 || gc == 0)
75 return; 75 return;
76 XDrawLine(s_display, 76 XDrawLine(s_display,
@@ -81,7 +81,7 @@ void FbDrawable::drawLine(GC gc, int start_x, int start_y,
81} 81}
82 82
83void FbDrawable::fillPolygon(GC gc, XPoint *points, int npoints, 83void FbDrawable::fillPolygon(GC gc, XPoint *points, int npoints,
84 int shape, int mode) { 84 int shape, int mode) {
85 if (drawable() == 0 || gc == 0 || points == 0 || npoints == 0) 85 if (drawable() == 0 || gc == 0 || points == 0 || npoints == 0)
86 return; 86 return;
87 XFillPolygon(s_display, 87 XFillPolygon(s_display,