aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-04-04 11:28:19 (GMT)
committerfluxgen <fluxgen>2002-04-04 11:28:19 (GMT)
commit2526e4bce821eedcd4bcc13e0f27ac7b9e255350 (patch)
treef86898efe146ecb882e597955e1e94b375154b19 /src/Screen.cc
parentbd05695cfa6d066e5e5368d857eef8c0b11987c1 (diff)
downloadfluxbox_pavel-2526e4bce821eedcd4bcc13e0f27ac7b9e255350.zip
fluxbox_pavel-2526e4bce821eedcd4bcc13e0f27ac7b9e255350.tar.bz2
moved nls defines to enums in namespace FBNLS
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc222
1 files changed, 63 insertions, 159 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index cce934d..652c7ac 100644
--- a/src/Screen.cc
+++ b/src/Screen.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: Screen.cc,v 1.41 2002/04/03 23:02:16 fluxgen Exp $ 25// $Id: Screen.cc,v 1.42 2002/04/04 11:28:19 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -104,11 +104,7 @@ static int anotherWMRunning(Display *display, XErrorEvent *) {
104 fprintf(stderr, 104 fprintf(stderr,
105 I18n::instance()-> 105 I18n::instance()->
106 getMessage( 106 getMessage(
107#ifdef NLS 107 FBNLS::ScreenSet, FBNLS::ScreenAnotherWMRunning,
108 ScreenSet, ScreenAnotherWMRunning,
109#else // !NLS
110 0, 0,
111#endif // NLS
112 "BScreen::BScreen: an error occured while querying the X server.\n" 108 "BScreen::BScreen: an error occured while querying the X server.\n"
113 " another window manager already running on display %s.\n"), 109 " another window manager already running on display %s.\n"),
114 DisplayString(display)); 110 DisplayString(display));
@@ -252,15 +248,11 @@ resource(rm, screenname, altscreenname)
252 fprintf(stderr, 248 fprintf(stderr,
253 i18n-> 249 i18n->
254 getMessage( 250 getMessage(
255 #ifdef NLS 251 FBNLS::ScreenSet, FBNLS::ScreenManagingScreen,
256 ScreenSet, ScreenManagingScreen, 252 "BScreen::BScreen: managing screen %d "
257 #else // !NLS 253 "using visual 0x%lx, depth %d\n"),
258 0, 0, 254 getScreenNumber(), XVisualIDFromVisual(getVisual()),
259 #endif // NLS 255 getDepth());
260 "BScreen::BScreen: managing screen %d "
261 "using visual 0x%lx, depth %d\n"),
262 getScreenNumber(), XVisualIDFromVisual(getVisual()),
263 getDepth());
264 256
265 rootmenu = 0; 257 rootmenu = 0;
266 258
@@ -311,11 +303,7 @@ resource(rm, screenname, altscreenname)
311 #endif //!NEWWMSPEC 303 #endif //!NEWWMSPEC
312 304
313 const char *s = i18n->getMessage( 305 const char *s = i18n->getMessage(
314 #ifdef NLS 306 FBNLS::ScreenSet, FBNLS::ScreenPositionLength,
315 ScreenSet, ScreenPositionLength,
316 #else // !NLS
317 0, 0,
318 #endif // NLS
319 "0: 0000 x 0: 0000"); 307 "0: 0000 x 0: 0000");
320 308
321 int l = strlen(s); 309 int l = strlen(s);
@@ -393,11 +381,7 @@ resource(rm, screenname, altscreenname)
393 381
394 workspacemenu->insert(i18n-> 382 workspacemenu->insert(i18n->
395 getMessage( 383 getMessage(
396 #ifdef NLS 384 FBNLS::IconSet, FBNLS::IconIcons,
397 IconSet, IconIcons,
398 #else // !NLS
399 0, 0,
400 #endif // NLS
401 "Icons"), 385 "Icons"),
402 iconmenu); 386 iconmenu);
403 workspacemenu->update(); 387 workspacemenu->update();
@@ -555,12 +539,8 @@ void BScreen::reconfigure(void) {
555 I18n *i18n = I18n::instance(); 539 I18n *i18n = I18n::instance();
556 540
557 const char *s = i18n->getMessage( 541 const char *s = i18n->getMessage(
558#ifdef NLS 542 FBNLS::ScreenSet, FBNLS::ScreenPositionLength,
559 ScreenSet, ScreenPositionLength, 543 "0: 0000 x 0: 0000");
560#else // !NLS
561 0, 0,
562#endif // NLS
563 "0: 0000 x 0: 0000");
564 int l = strlen(s); 544 int l = strlen(s);
565 545
566 if (i18n->multibyte()) { 546 if (i18n->multibyte()) {
@@ -1251,11 +1231,7 @@ void BScreen::initMenu(void) {
1251 } else { 1231 } else {
1252 fprintf(stderr, 1232 fprintf(stderr,
1253 i18n->getMessage( 1233 i18n->getMessage(
1254 #ifdef NLS 1234 FBNLS::ScreenSet, FBNLS::ScreenEmptyMenuFile,
1255 ScreenSet, ScreenEmptyMenuFile,
1256 #else // !NLS
1257 0, 0,
1258 #endif // NLS
1259 "%s: Empty menu file"), 1235 "%s: Empty menu file"),
1260 fluxbox->getMenuFilename()); 1236 fluxbox->getMenuFilename());
1261 } 1237 }
@@ -1267,36 +1243,20 @@ void BScreen::initMenu(void) {
1267 if (defaultMenu) { 1243 if (defaultMenu) {
1268 rootmenu->setInternalMenu(); 1244 rootmenu->setInternalMenu();
1269 rootmenu->insert(i18n->getMessage( 1245 rootmenu->insert(i18n->getMessage(
1270 #ifdef NLS 1246 FBNLS::ScreenSet, FBNLS::Screenxterm,
1271 ScreenSet, Screenxterm, 1247 "xterm"),
1272 #else // !NLS 1248 BScreen::EXECUTE,
1273 0, 0, 1249 i18n->getMessage(
1274 #endif // NLS 1250 FBNLS::ScreenSet, FBNLS::Screenxterm,
1275 "xterm"), 1251 "xterm"));
1276 BScreen::EXECUTE,
1277 i18n->getMessage(
1278 #ifdef NLS
1279 ScreenSet, Screenxterm,
1280 #else // !NLS
1281 0, 0,
1282 #endif // NLS
1283 "xterm"));
1284 rootmenu->insert(i18n->getMessage( 1252 rootmenu->insert(i18n->getMessage(
1285 #ifdef NLS 1253 FBNLS::ScreenSet, FBNLS::ScreenRestart,
1286 ScreenSet, ScreenRestart, 1254 "Restart"),
1287 #else // !NLS 1255 BScreen::RESTART);
1288 0, 0,
1289 #endif // NLS
1290 "Restart"),
1291 BScreen::RESTART);
1292 rootmenu->insert(i18n->getMessage( 1256 rootmenu->insert(i18n->getMessage(
1293 #ifdef NLS 1257 FBNLS::ScreenSet, FBNLS::ScreenExit,
1294 ScreenSet, ScreenExit, 1258 "Exit"),
1295 #else // !NLS 1259 BScreen::EXIT);
1296 0, 0,
1297 #endif // NLS
1298 "Exit"),
1299 BScreen::EXIT);
1300 } else 1260 } else
1301 fluxbox->saveMenuFilename(fluxbox->getMenuFilename()); 1261 fluxbox->saveMenuFilename(fluxbox->getMenuFilename());
1302} 1262}
@@ -1339,13 +1299,9 @@ Bool BScreen::parseMenuFile(ifstream &file, Rootmenu *menu, int &row) {
1339 if (!(str_label.size() && str_cmd.size())) { 1299 if (!(str_label.size() && str_cmd.size())) {
1340 fprintf(stderr, 1300 fprintf(stderr,
1341 i18n->getMessage( 1301 i18n->getMessage(
1342 #ifdef NLS 1302 FBNLS::ScreenSet, FBNLS::ScreenEXECError,
1343 ScreenSet, ScreenEXECError, 1303 "BScreen::parseMenuFile: [exec] error, "
1344 #else // !NLS 1304 "no menu label and/or command defined\n"));
1345 0, 0,
1346 #endif // NLS
1347 "BScreen::parseMenuFile: [exec] error, "
1348 "no menu label and/or command defined\n"));
1349 cerr<<"Row: "<<row<<endl; 1305 cerr<<"Row: "<<row<<endl;
1350 } else 1306 } else
1351 menu->insert(str_label.c_str(), BScreen::EXECUTE, str_cmd.c_str()); 1307 menu->insert(str_label.c_str(), BScreen::EXECUTE, str_cmd.c_str());
@@ -1354,13 +1310,9 @@ Bool BScreen::parseMenuFile(ifstream &file, Rootmenu *menu, int &row) {
1354 if (!str_label.size()) { 1310 if (!str_label.size()) {
1355 fprintf(stderr, 1311 fprintf(stderr,
1356 i18n->getMessage( 1312 i18n->getMessage(
1357 #ifdef NLS 1313 FBNLS::ScreenSet, FBNLS::ScreenEXITError,
1358 ScreenSet, ScreenEXITError, 1314 "BScreen::parseMenuFile: [exit] error, "
1359 #else // !NLS 1315 "no menu label defined\n"));
1360 0, 0,
1361 #endif // NLS
1362 "BScreen::parseMenuFile: [exit] error, "
1363 "no menu label defined\n"));
1364 cerr<<"Row: "<<row<<endl; 1316 cerr<<"Row: "<<row<<endl;
1365 } else 1317 } else
1366 menu->insert(str_label.c_str(), BScreen::EXIT); 1318 menu->insert(str_label.c_str(), BScreen::EXIT);
@@ -1370,13 +1322,9 @@ Bool BScreen::parseMenuFile(ifstream &file, Rootmenu *menu, int &row) {
1370 fprintf(stderr, 1322 fprintf(stderr,
1371 i18n-> 1323 i18n->
1372 getMessage( 1324 getMessage(
1373 #ifdef NLS 1325 FBNLS::ScreenSet, FBNLS::ScreenSTYLEError,
1374 ScreenSet, ScreenSTYLEError, 1326 "BScreen::parseMenuFile: [style] error, "
1375 #else // !NLS 1327 "no menu label and/or filename defined\n"));
1376 0, 0,
1377 #endif // NLS
1378 "BScreen::parseMenuFile: [style] error, "
1379 "no menu label and/or filename defined\n"));
1380 cerr<<"Row: "<<row<<endl; 1328 cerr<<"Row: "<<row<<endl;
1381 } else { 1329 } else {
1382 char *style; 1330 char *style;
@@ -1393,13 +1341,9 @@ Bool BScreen::parseMenuFile(ifstream &file, Rootmenu *menu, int &row) {
1393 fprintf(stderr, 1341 fprintf(stderr,
1394 i18n-> 1342 i18n->
1395 getMessage( 1343 getMessage(
1396 #ifdef NLS 1344 FBNLS::ScreenSet, FBNLS::ScreenCONFIGError,
1397 ScreenSet, ScreenCONFIGError, 1345 "BScreen::parseMenufile: [config] error, "
1398 #else // !NLS 1346 "no label defined"));
1399 0, 0,
1400 #endif // NLS
1401 "BScreen::parseMenufile: [config] error, "
1402 "no label defined"));
1403 cerr<<"Row: "<<row<<endl; 1347 cerr<<"Row: "<<row<<endl;
1404 } else 1348 } else
1405 menu->insert(str_label.c_str(), configmenu); 1349 menu->insert(str_label.c_str(), configmenu);
@@ -1409,13 +1353,9 @@ Bool BScreen::parseMenuFile(ifstream &file, Rootmenu *menu, int &row) {
1409 fprintf(stderr, 1353 fprintf(stderr,
1410 i18n-> 1354 i18n->
1411 getMessage( 1355 getMessage(
1412 #ifdef NLS 1356 FBNLS::ScreenSet, FBNLS::ScreenINCLUDEError,
1413 ScreenSet, ScreenINCLUDEError, 1357 "BScreen::parseMenuFile: [include] error, "
1414 #else // !NLS 1358 "no filename defined\n"));
1415 0, 0,
1416 #endif // NLS
1417 "BScreen::parseMenuFile: [include] error, "
1418 "no filename defined\n"));
1419 cerr<<"Row: "<<row<<endl; 1359 cerr<<"Row: "<<row<<endl;
1420 } else { // start of else 'x' 1360 } else { // start of else 'x'
1421 char *newfile; 1361 char *newfile;
@@ -1433,13 +1373,9 @@ Bool BScreen::parseMenuFile(ifstream &file, Rootmenu *menu, int &row) {
1433 fprintf(stderr, 1373 fprintf(stderr,
1434 i18n-> 1374 i18n->
1435 getMessage( 1375 getMessage(
1436 #ifdef NLS 1376 FBNLS::ScreenSet, FBNLS::ScreenINCLUDEErrorReg,
1437 ScreenSet, ScreenINCLUDEErrorReg, 1377 "BScreen::parseMenuFile: [include] error: "
1438 #else // !NLS 1378 "'%s' is not a regular file\n"), newfile);
1439 0, 0,
1440 #endif // NLS
1441 "BScreen::parseMenuFile: [include] error: "
1442 "'%s' is not a regular file\n"), newfile);
1443 cerr<<"Row: "<<row<<endl; 1379 cerr<<"Row: "<<row<<endl;
1444 } 1380 }
1445 1381
@@ -1460,13 +1396,9 @@ Bool BScreen::parseMenuFile(ifstream &file, Rootmenu *menu, int &row) {
1460 fprintf(stderr, 1396 fprintf(stderr,
1461 i18n-> 1397 i18n->
1462 getMessage( 1398 getMessage(
1463 #ifdef NLS 1399 FBNLS::ScreenSet, FBNLS::ScreenSUBMENUError,
1464 ScreenSet, ScreenSUBMENUError, 1400 "BScreen::parseMenuFile: [submenu] error, "
1465 #else // !NLS 1401 "no menu label defined\n"));
1466 0, 0,
1467 #endif // NLS
1468 "BScreen::parseMenuFile: [submenu] error, "
1469 "no menu label defined\n"));
1470 cerr<<"Row: "<<row<<endl; 1402 cerr<<"Row: "<<row<<endl;
1471 } else { 1403 } else {
1472 Rootmenu *submenu = new Rootmenu(this); 1404 Rootmenu *submenu = new Rootmenu(this);
@@ -1487,13 +1419,9 @@ Bool BScreen::parseMenuFile(ifstream &file, Rootmenu *menu, int &row) {
1487 fprintf(stderr, 1419 fprintf(stderr,
1488 i18n-> 1420 i18n->
1489 getMessage( 1421 getMessage(
1490 #ifdef NLS 1422 FBNLS::ScreenSet, FBNLS::ScreenRESTARTError,
1491 ScreenSet, ScreenRESTARTError, 1423 "BScreen::parseMenuFile: [restart] error, "
1492 #else // !NLS 1424 "no menu label defined\n"));
1493 0, 0,
1494 #endif // NLS
1495 "BScreen::parseMenuFile: [restart] error, "
1496 "no menu label defined\n"));
1497 cerr<<"Row: "<<row<<endl; 1425 cerr<<"Row: "<<row<<endl;
1498 } else { 1426 } else {
1499 if (str_cmd.size()) 1427 if (str_cmd.size())
@@ -1507,13 +1435,9 @@ Bool BScreen::parseMenuFile(ifstream &file, Rootmenu *menu, int &row) {
1507 fprintf(stderr, 1435 fprintf(stderr,
1508 i18n-> 1436 i18n->
1509 getMessage( 1437 getMessage(
1510 #ifdef NLS 1438 FBNLS::ScreenSet, FBNLS::ScreenRECONFIGError,
1511 ScreenSet, ScreenRECONFIGError, 1439 "BScreen::parseMenuFile: [reconfig] error, "
1512 #else // !NLS 1440 "no menu label defined\n"));
1513 0, 0,
1514 #endif // NLS
1515 "BScreen::parseMenuFile: [reconfig] error, "
1516 "no menu label defined\n"));
1517 cerr<<"Row: "<<row<<endl; 1441 cerr<<"Row: "<<row<<endl;
1518 } else 1442 } else
1519 menu->insert(str_label.c_str(), BScreen::RECONFIGURE); 1443 menu->insert(str_label.c_str(), BScreen::RECONFIGURE);
@@ -1524,13 +1448,9 @@ Bool BScreen::parseMenuFile(ifstream &file, Rootmenu *menu, int &row) {
1524 fprintf(stderr, 1448 fprintf(stderr,
1525 i18n-> 1449 i18n->
1526 getMessage( 1450 getMessage(
1527 #ifdef NLS 1451 FBNLS::ScreenSet, FBNLS::ScreenSTYLESDIRError,
1528 ScreenSet, ScreenSTYLESDIRError, 1452 "BScreen::parseMenuFile: [stylesdir/stylesmenu]"
1529 #else // !NLS 1453 " error, no directory defined\n"));
1530 0, 0,
1531 #endif // NLS
1532 "BScreen::parseMenuFile: [stylesdir/stylesmenu]"
1533 " error, no directory defined\n"));
1534 cerr<<"Row: "<<row<<endl; 1454 cerr<<"Row: "<<row<<endl;
1535 } else { // else 'y' 1455 } else { // else 'y'
1536 createStyleMenu(menu, newmenu, str_label.c_str(), (newmenu) ? str_cmd.c_str() : str_label.c_str()); 1456 createStyleMenu(menu, newmenu, str_label.c_str(), (newmenu) ? str_cmd.c_str() : str_label.c_str());
@@ -1540,7 +1460,7 @@ Bool BScreen::parseMenuFile(ifstream &file, Rootmenu *menu, int &row) {
1540 if (!str_label.size()) { 1460 if (!str_label.size()) {
1541 fprintf(stderr, 1461 fprintf(stderr,
1542 i18n->getMessage( 1462 i18n->getMessage(
1543 ScreenSet, ScreenWORKSPACESError, 1463 FBNLS::ScreenSet, FBNLS::ScreenWORKSPACESError,
1544 "BScreen:parseMenuFile: [workspaces] error, " 1464 "BScreen:parseMenuFile: [workspaces] error, "
1545 "no menu label defined\n")); 1465 "no menu label defined\n"));
1546 cerr<<"Row: "<<row<<endl; 1466 cerr<<"Row: "<<row<<endl;
@@ -1612,11 +1532,7 @@ void BScreen::createStyleMenu(Rootmenu *menu, bool newmenu, const char *label, c
1612 fprintf(stderr, 1532 fprintf(stderr,
1613 i18n-> 1533 i18n->
1614 getMessage( 1534 getMessage(
1615 #ifdef NLS 1535 FBNLS::ScreenSet, FBNLS::ScreenSTYLESDIRErrorNotDir,
1616 ScreenSet, ScreenSTYLESDIRErrorNotDir,
1617 #else // !NLS
1618 0, 0,
1619 #endif // NLS
1620 "BScreen::parseMenuFile:" 1536 "BScreen::parseMenuFile:"
1621 " [stylesdir/stylesmenu] error, %s is not a" 1537 " [stylesdir/stylesmenu] error, %s is not a"
1622 " directory\n"), stylesdir.get()); 1538 " directory\n"), stylesdir.get());
@@ -1625,13 +1541,9 @@ void BScreen::createStyleMenu(Rootmenu *menu, bool newmenu, const char *label, c
1625 fprintf(stderr, 1541 fprintf(stderr,
1626 i18n-> 1542 i18n->
1627 getMessage( 1543 getMessage(
1628 #ifdef NLS 1544 FBNLS::ScreenSet, FBNLS::ScreenSTYLESDIRErrorNoExist,
1629 ScreenSet, ScreenSTYLESDIRErrorNoExist, 1545 "BScreen::parseMenuFile: [stylesdir/stylesmenu]"
1630 #else // !NLS 1546 " error, %s does not exist\n"), stylesdir.get());
1631 0, 0,
1632 #endif // NLS
1633 "BScreen::parseMenuFile: [stylesdir/stylesmenu]"
1634 " error, %s does not exist\n"), stylesdir.get());
1635 } // end of 'stat' 1547 } // end of 'stat'
1636 1548
1637} 1549}
@@ -1689,12 +1601,8 @@ void BScreen::showPosition(int x, int y) {
1689 1601
1690 snprintf(label, label_size, 1602 snprintf(label, label_size,
1691 I18n::instance()->getMessage( 1603 I18n::instance()->getMessage(
1692#ifdef NLS 1604 FBNLS::ScreenSet, FBNLS::ScreenPositionFormat,
1693 ScreenSet, ScreenPositionFormat, 1605 "X: %4d x Y: %4d"), x, y);
1694#else // !NLS
1695 0, 0,
1696#endif // NLS
1697 "X: %4d x Y: %4d"), x, y);
1698 1606
1699 XClearWindow(getBaseDisplay()->getXDisplay(), geom_window); 1607 XClearWindow(getBaseDisplay()->getXDisplay(), geom_window);
1700 1608
@@ -1737,12 +1645,8 @@ void BScreen::showGeometry(unsigned int gx, unsigned int gy) {
1737 1645
1738 sprintf(label, 1646 sprintf(label,
1739 I18n::instance()->getMessage( 1647 I18n::instance()->getMessage(
1740#ifdef NLS 1648 FBNLS::ScreenSet, FBNLS::ScreenGeometryFormat,
1741 ScreenSet, ScreenGeometryFormat, 1649 "W: %4d x H: %4d"), gx, gy);
1742#else // !NLS
1743 0, 0,
1744#endif // NLS
1745 "W: %4d x H: %4d"), gx, gy);
1746 1650
1747 XClearWindow(getBaseDisplay()->getXDisplay(), geom_window); 1651 XClearWindow(getBaseDisplay()->getXDisplay(), geom_window);
1748 1652
generated by cgit v0.11.2 at 2025-01-01 06:07:12 (GMT)