M src/Toolbar.cc → src/Toolbar.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.cc,v 1.40 2002/11/16 22:17:06 fluxgen Exp $
+// $Id: Toolbar.cc,v 1.41 2002/11/26 16:46:05 fluxgen Exp $
 
 #include "Toolbar.hh"
 
@@ -598,39 +598,18 @@ }
 		}
 #endif // HAVE_STRFTIME
 
-		int dx = (frame.bevel_w * 2), dlen = strlen(t);
-		unsigned int l;
-		l = screen->getToolbarStyle()->font.textWidth(t, dlen);
-		
-		l += (frame.bevel_w * 4);
-		
-		if (l > frame.clock_w) {
-			for (; dlen >= 0; dlen--) {
-				l = screen->getToolbarStyle()->font.textWidth(t, dlen);
-				l += (frame.bevel_w * 4);
-	
-				if (l < frame.clock_w)
-					break;
-			}
-
-		}
-
-		switch (screen->getToolbarStyle()->justify) {
-			case DrawUtil::Font::RIGHT:
-				dx += frame.clock_w - l;
-			break;
-			case DrawUtil::Font::CENTER:
-				dx += (frame.clock_w - l) / 2;
-			break;
-			default: //LEFT, no justification
-			break;
-		}
-
+		size_t newlen = strlen(t);
+		int dx = DrawUtil::doAlignment(frame.clock_w,
+			frame.bevel_w*2,
+			screen->getToolbarStyle()->justify,
+			screen->getToolbarStyle()->font,
+			t, strlen(t), newlen);
+			
 		screen->getToolbarStyle()->font.drawText(
 			frame.clock,
 			screen->getScreenNumber(),
 			screen->getToolbarStyle()->c_text_gc,
-			t, dlen,
+			t, newlen,
 			dx, 1 + screen->getToolbarStyle()->font.ascent());
 	}
 }
@@ -645,39 +624,17 @@ FluxboxWindow *foc = Fluxbox::instance()->getFocusedWindow();
 		if (foc->getScreen() != screen || foc->getTitle().size() == 0)
 			return;
 		
-		int dx = (frame.bevel_w * 2), dlen = foc->getTitle().size();
-		unsigned int l;
-
-		l = screen->getToolbarStyle()->font.textWidth(foc->getTitle().c_str(), dlen);
-		
-		l += (frame.bevel_w * 4);
-
-		if (l > frame.window_label_w) {
-			for (; dlen >= 0; dlen--) {
-				l = screen->getToolbarStyle()->font.textWidth(foc->getTitle().c_str(), dlen);
-	
-				l += (frame.bevel_w * 4);
-	
-				if (l < frame.window_label_w)
-					break;
-			}
-		}
-		switch (screen->getToolbarStyle()->justify) {
-		case DrawUtil::Font::RIGHT:
-			dx += frame.window_label_w - l;
-			break;
-
-		case DrawUtil::Font::CENTER:
-			dx += (frame.window_label_w - l) / 2;
-			break;
-		default:
-			break;
-		}
+		size_t newlen = foc->getTitle().size();
+		int dx = DrawUtil::doAlignment(frame.window_label_w, frame.bevel_w*2,
+			screen->getToolbarStyle()->justify,
+			screen->getToolbarStyle()->font,
+			foc->getTitle().c_str(), foc->getTitle().size(), newlen);
+			
 		screen->getToolbarStyle()->font.drawText(
 			frame.window_label,
 			screen->getScreenNumber(),
 			screen->getToolbarStyle()->w_text_gc,
-			foc->getTitle().c_str(), dlen,
+			foc->getTitle().c_str(), newlen,
 			dx, 1 + screen->getToolbarStyle()->font.ascent());
 	} else
 		XClearWindow(display, frame.window_label);
@@ -685,50 +642,26 @@ }
  
  
 void Toolbar::redrawWorkspaceLabel(bool redraw) {
-	if (screen->getCurrentWorkspace()->name().size()>0) {
+	if (screen->getCurrentWorkspace()->name().size()==0)
+		return;
 		
-		if (redraw)
-			XClearWindow(display, frame.workspace_label);
-
-		int dx = (frame.bevel_w * 2), dlen =
-						screen->getCurrentWorkspace()->name().size();
-		unsigned int l;
-		
-		l = screen->getToolbarStyle()->font.textWidth(screen->getCurrentWorkspace()->name().c_str(), dlen);
-		
-		l += (frame.bevel_w * 4);
-		
-		if (l > frame.workspace_label_w) {
-			for (; dlen >= 0; dlen--) {
-				l = screen->getToolbarStyle()->font.textWidth(
-					screen->getCurrentWorkspace()->name().c_str(), dlen);
-	
-				l += (frame.bevel_w * 4);
-	
-				if (l < frame.workspace_label_w)
-					break;
-			}
-		}
-		
-		switch (screen->getToolbarStyle()->justify) {
-		case DrawUtil::Font::RIGHT:
-			dx += frame.workspace_label_w - l;
-			break;
-
-		case DrawUtil::Font::CENTER:
-			dx += (frame.workspace_label_w - l) / 2;
-			break;
-		default:
-			break;
-		}
+	if (redraw)
+		XClearWindow(display, frame.workspace_label);
 		
-		screen->getToolbarStyle()->font.drawText(
-			frame.workspace_label,
-			screen->getScreenNumber(),
-			screen->getToolbarStyle()->l_text_gc,
-			screen->getCurrentWorkspace()->name().c_str(), dlen,
-			dx, 1 + screen->getToolbarStyle()->font.ascent());
-	}
+	const char *text = screen->getCurrentWorkspace()->name().c_str();
+	size_t textlen = screen->getCurrentWorkspace()->name().size();
+	size_t newlen = textlen;
+	int dx = DrawUtil::doAlignment(frame.workspace_label_w, frame.bevel_w,
+		screen->getToolbarStyle()->justify,
+		screen->getToolbarStyle()->font,
+		text, textlen, newlen);
+			
+	screen->getToolbarStyle()->font.drawText(
+		frame.workspace_label,
+		screen->getScreenNumber(),
+		screen->getToolbarStyle()->l_text_gc,
+		text, newlen,
+		dx, 1 + screen->getToolbarStyle()->font.ascent());
 }
 
 
@@ -1097,7 +1030,9 @@ 
 			tw = screen->getToolbarStyle()->font.textWidth(new_workspace_name.c_str(), l);
 			x = (frame.workspace_label_w - tw) / 2;
 
-			if (x < (signed) frame.bevel_w) x = frame.bevel_w;
+			if (x < (signed) frame.bevel_w)
+				x = frame.bevel_w;
+
 			screen->getToolbarStyle()->font.drawText(
 				frame.workspace_label,
 				screen->getScreenNumber(),

M src/Window.cc → src/Window.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.101 2002/11/23 16:07:19 rathnor Exp $
+// $Id: Window.cc,v 1.102 2002/11/26 16:44:48 fluxgen Exp $
 
 #include "Window.hh"
 
@@ -2426,44 +2426,36 @@ 
 	XClearWindow(display, frame.label);
 
 	//no need to draw the title if we don't have any
-	if (getTitle().size() != 0) {
-		GC gc = ((focused) ? screen->getWindowStyle()->l_text_focus_gc :
-				 screen->getWindowStyle()->l_text_unfocus_gc);
-		unsigned int l = client.title_text_w;
-		int dlen = getTitle().size();
-		int dx = frame.bevel_w;
-		FbTk::Font &font = screen->getWindowStyle()->font;
-		if (l > frame.label_w) {
-			for (; dlen >= 0; dlen--) {
-				l = font.textWidth(getTitle().c_str(), dlen) + frame.bevel_w*4; 
-				if (l < frame.label_w)
-					break;
-			}
-		}
-		switch (screen->getWindowStyle()->justify) {
-			case DrawUtil::Font::RIGHT:
-				dx += frame.label_w - l;
-			break;
-			case DrawUtil::Font::CENTER:
-				dx += (frame.label_w - l)/2;
-			break;
-		}
+	if (getTitle().size() == 0)
+		return;
 
-		font.drawText(
-			frame.label,
-			screen->getScreenNumber(),
-			gc,
-			getTitle().c_str(), getTitle().size(),
-			dx, screen->getWindowStyle()->font.ascent() + 1);
-	}
+	GC gc = ((focused) ? screen->getWindowStyle()->l_text_focus_gc :
+			 screen->getWindowStyle()->l_text_unfocus_gc);
+
+	size_t newlen = getTitle().size();
+	const char *labeltext = getTitle().c_str();
+	FbTk::Font &font = screen->getWindowStyle()->font;
+
+	int align_x = DrawUtil::doAlignment(
+		frame.label_w, frame.bevel_w*2,
+		screen->getWindowStyle()->justify,
+		font,
+		labeltext, newlen, newlen);
+	
+	font.drawText(
+		frame.label,
+		screen->getScreenNumber(),
+		gc,
+		labeltext, newlen,
+		align_x, font.ascent() + 1);
 }
 
 
 void FluxboxWindow::redrawAllButtons() {
-	for (unsigned int i=0; i<buttonlist.size(); i++)
+	for (unsigned int i=0; i<buttonlist.size(); i++) {
 		if (buttonlist[i].draw)
 			buttonlist[i].draw(this, buttonlist[i].win, false);
-
+	}
 }
 
 void FluxboxWindow::mapRequestEvent(XMapRequestEvent *re) {