aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-01-06 11:07:42 (GMT)
committerfluxgen <fluxgen>2002-01-06 11:07:42 (GMT)
commit68d83ecc98409b3de783b3f213951018fd258a54 (patch)
tree4c0d1c9c7427208e84deaf368cee44637b23626f /src/Window.cc
parentad3923a371d8f64a506cbaacb170a911be73093a (diff)
downloadfluxbox-68d83ecc98409b3de783b3f213951018fd258a54.zip
fluxbox-68d83ecc98409b3de783b3f213951018fd258a54.tar.bz2
Changed Misc::
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 7275ba3..71ca471 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -41,6 +41,7 @@
41#include "Windowmenu.hh" 41#include "Windowmenu.hh"
42#include "Workspace.hh" 42#include "Workspace.hh"
43#include "misc.hh" 43#include "misc.hh"
44#include "StringUtil.hh"
44 45
45#ifdef SLIT 46#ifdef SLIT
46# include "Slit.hh" 47# include "Slit.hh"
@@ -1201,17 +1202,17 @@ void FluxboxWindow::getWMName(void) {
1201 if ((XmbTextPropertyToTextList(display, &text_prop, 1202 if ((XmbTextPropertyToTextList(display, &text_prop,
1202 &list, &num) == Success) && 1203 &list, &num) == Success) &&
1203 (num > 0) && *list) { 1204 (num > 0) && *list) {
1204 client.title = Misc::strdup(*list); 1205 client.title = StringUtil::strdup(*list);
1205 XFreeStringList(list); 1206 XFreeStringList(list);
1206 } else 1207 } else
1207 client.title = Misc::strdup((char *) text_prop.value); 1208 client.title = StringUtil::strdup((char *) text_prop.value);
1208 1209
1209 } else 1210 } else
1210 client.title = Misc::strdup((char *) text_prop.value); 1211 client.title = StringUtil::strdup((char *) text_prop.value);
1211 1212
1212 XFree((char *) text_prop.value); 1213 XFree((char *) text_prop.value);
1213 } else 1214 } else
1214 client.title = Misc::strdup(i18n->getMessage( 1215 client.title = StringUtil::strdup(i18n->getMessage(
1215#ifdef NLS 1216#ifdef NLS
1216 WindowSet, WindowUnnamed, 1217 WindowSet, WindowUnnamed,
1217#else // !NLS 1218#else // !NLS
@@ -1219,7 +1220,7 @@ void FluxboxWindow::getWMName(void) {
1219#endif // 1220#endif //
1220 "Unnamed")); 1221 "Unnamed"));
1221 } else { 1222 } else {
1222 client.title = Misc::strdup(i18n->getMessage( 1223 client.title = StringUtil::strdup(i18n->getMessage(
1223#ifdef NLS 1224#ifdef NLS
1224 WindowSet, WindowUnnamed, 1225 WindowSet, WindowUnnamed,
1225#else // !NLS 1226#else // !NLS
@@ -1263,18 +1264,18 @@ void FluxboxWindow::getWMIconName(void) {
1263 if ((XmbTextPropertyToTextList(display, &text_prop, 1264 if ((XmbTextPropertyToTextList(display, &text_prop,
1264 &list, &num) == Success) && 1265 &list, &num) == Success) &&
1265 (num > 0) && *list) { 1266 (num > 0) && *list) {
1266 client.icon_title = Misc::strdup(*list); 1267 client.icon_title = StringUtil::strdup(*list);
1267 XFreeStringList(list); 1268 XFreeStringList(list);
1268 } else 1269 } else
1269 client.icon_title = Misc::strdup((char *) text_prop.value); 1270 client.icon_title = StringUtil::strdup((char *) text_prop.value);
1270 } else 1271 } else
1271 client.icon_title = Misc::strdup((char *) text_prop.value); 1272 client.icon_title = StringUtil::strdup((char *) text_prop.value);
1272 1273
1273 XFree((char *) text_prop.value); 1274 XFree((char *) text_prop.value);
1274 } else 1275 } else
1275 client.icon_title = Misc::strdup(client.title); 1276 client.icon_title = StringUtil::strdup(client.title);
1276 } else 1277 } else
1277 client.icon_title = Misc::strdup(client.title); 1278 client.icon_title = StringUtil::strdup(client.title);
1278} 1279}
1279 1280
1280 1281
@@ -2416,7 +2417,7 @@ void FluxboxWindow::redrawLabel(void) {
2416 GC gc = ((focused) ? screen->getWindowStyle()->l_text_focus_gc : 2417 GC gc = ((focused) ? screen->getWindowStyle()->l_text_focus_gc :
2417 screen->getWindowStyle()->l_text_unfocus_gc); 2418 screen->getWindowStyle()->l_text_unfocus_gc);
2418 2419
2419 Misc::DrawString(display, frame.label, gc, 2420 DrawUtil::DrawString(display, frame.label, gc,
2420 &screen->getWindowStyle()->font, 2421 &screen->getWindowStyle()->font,
2421 client.title_text_w, frame.label_w, 2422 client.title_text_w, frame.label_w,
2422 frame.bevel_w, client.title); 2423 frame.bevel_w, client.title);