summaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc45
1 files changed, 22 insertions, 23 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 60ae159e..5e52e10e 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1,4 +1,3 @@
-#include <iostream.h>
// Screen.cc for Openbox
// Copyright (c) 2001 Sean 'Shaleh' Perry <shaleh@debian.org>
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
@@ -105,7 +104,7 @@
#include <string>
#include <algorithm>
#include <functional>
-using namespace std;
+using std::ends;
static Bool running = True;
@@ -916,7 +915,7 @@ XFontSet BScreen::createFontSet(const char *fontname) {
void BScreen::setSloppyFocus(bool b) {
resource.sloppy_focus = b;
- ostrstream s;
+ std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".focusModel" << ends;
config.setValue(s.str(),
(resource.sloppy_focus ?
@@ -928,7 +927,7 @@ void BScreen::setSloppyFocus(bool b) {
void BScreen::setAutoRaise(bool a) {
resource.auto_raise = a;
- ostrstream s;
+ std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".focusModel" << ends;
config.setValue(s.str(),
(resource.sloppy_focus ?
@@ -940,7 +939,7 @@ void BScreen::setAutoRaise(bool a) {
void BScreen::setImageDither(bool d, bool reconfig) {
image_control->setDither(d);
- ostrstream s;
+ std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".imageDither" << ends;
config.setValue(s.str(), imageDither());
if (reconfig)
@@ -951,7 +950,7 @@ void BScreen::setImageDither(bool d, bool reconfig) {
void BScreen::setOpaqueMove(bool o) {
resource.opaque_move = o;
- ostrstream s;
+ std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".opaqueMove" << ends;
config.setValue(s.str(), resource.opaque_move);
s.rdbuf()->freeze(0);
@@ -960,7 +959,7 @@ void BScreen::setOpaqueMove(bool o) {
void BScreen::setFullMax(bool f) {
resource.full_max = f;
- ostrstream s;
+ std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".fullMaximization" << ends;
config.setValue(s.str(), resource.full_max);
s.rdbuf()->freeze(0);
@@ -969,7 +968,7 @@ void BScreen::setFullMax(bool f) {
void BScreen::setFocusNew(bool f) {
resource.focus_new = f;
- ostrstream s;
+ std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".focusNewWindows" << ends;
config.setValue(s.str(), resource.focus_new);
s.rdbuf()->freeze(0);
@@ -978,7 +977,7 @@ void BScreen::setFocusNew(bool f) {
void BScreen::setFocusLast(bool f) {
resource.focus_last = f;
- ostrstream s;
+ std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".focusLastWindow" << ends;
config.setValue(s.str(), resource.focus_last);
s.rdbuf()->freeze(0);
@@ -987,7 +986,7 @@ void BScreen::setFocusLast(bool f) {
void BScreen::setWindowZones(int z) {
resource.zones = z;
- ostrstream s;
+ std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".windowZones" << ends;
config.setValue(s.str(), resource.zones);
s.rdbuf()->freeze(0);
@@ -996,7 +995,7 @@ void BScreen::setWindowZones(int z) {
void BScreen::setWorkspaceCount(int w) {
resource.workspaces = w;
- ostrstream s;
+ std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".workspaces" << ends;
config.setValue(s.str(), resource.workspaces);
s.rdbuf()->freeze(0);
@@ -1005,7 +1004,7 @@ void BScreen::setWorkspaceCount(int w) {
void BScreen::setPlacementPolicy(int p) {
resource.placement_policy = p;
- ostrstream s;
+ std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".windowPlacement" << ends;
const char *placement;
switch (resource.placement_policy) {
@@ -1024,7 +1023,7 @@ void BScreen::setPlacementPolicy(int p) {
void BScreen::setEdgeSnapThreshold(int t) {
resource.edge_snap_threshold = t;
- ostrstream s;
+ std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".edgeSnapThreshold" << ends;
config.setValue(s.str(), resource.edge_snap_threshold);
s.rdbuf()->freeze(0);
@@ -1033,7 +1032,7 @@ void BScreen::setEdgeSnapThreshold(int t) {
void BScreen::setRowPlacementDirection(int d) {
resource.row_direction = d;
- ostrstream s;
+ std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".rowPlacementDirection" << ends;
config.setValue(s.str(),
resource.row_direction == LeftRight ?
@@ -1044,7 +1043,7 @@ void BScreen::setRowPlacementDirection(int d) {
void BScreen::setColPlacementDirection(int d) {
resource.col_direction = d;
- ostrstream s;
+ std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".colPlacementDirection" << ends;
config.setValue(s.str(),
resource.col_direction == TopBottom ?
@@ -1072,7 +1071,7 @@ void BScreen::setStrftimeFormat(const char *f) {
delete [] resource.strftime_format;
resource.strftime_format = bstrdup(f);
- ostrstream s;
+ std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".strftimeFormat" << ends;
config.setValue(s.str(), resource.strftime_format);
s.rdbuf()->freeze(0);
@@ -1082,7 +1081,7 @@ void BScreen::setStrftimeFormat(const char *f) {
void BScreen::setDateFormat(int f) {
resource.date_format = f;
- ostrstream s;
+ std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".dateFormat" << ends;
config.setValue(s.str(), resource.date_format == B_EuropeanDate ?
"European" : "American");
@@ -1092,7 +1091,7 @@ void BScreen::setDateFormat(int f) {
void BScreen::setClock24Hour(Bool c) {
resource.clock24hour = c;
- ostrstream s;
+ std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".clockFormat" << ends;
config.setValue(s.str(), resource.clock24hour ? 24 : 12);
s.rdbuf()->freeze(0);
@@ -1106,7 +1105,7 @@ void BScreen::setHideToolbar(bool b) {
getToolbar()->unMapToolbar();
else
getToolbar()->mapToolbar();
- ostrstream s;
+ std::ostrstream s;
s << "session.screen" << getScreenNumber() << ".hideToolbar" << ends;
config.setValue(s.str(), resource.hide_toolbar ? "True" : "False");
s.rdbuf()->freeze(0);
@@ -1114,7 +1113,7 @@ void BScreen::setHideToolbar(bool b) {
void BScreen::saveWorkspaceNames() {
- ostrstream rc, names;
+ std::ostrstream rc, names;
wkspList::iterator it;
wkspList::iterator last = workspacesList.end() - 1;
@@ -1165,7 +1164,7 @@ void BScreen::save() {
void BScreen::load() {
- ostrstream rscreen, rname, rclass;
+ std::ostrstream rscreen, rname, rclass;
std::string s;
bool b;
long l;
@@ -1251,9 +1250,9 @@ void BScreen::load() {
rname << rscreen.str() << "workspaceNames" << ends;
rclass << rscreen.str() << "WorkspaceNames" << ends;
if (config.getValue(rname.str(), rclass.str(), s)) {
- string::const_iterator it = s.begin(), end = s.end();
+ std::string::const_iterator it = s.begin(), end = s.end();
while(1) {
- string::const_iterator tmp = it;// current string.begin()
+ std::string::const_iterator tmp = it;// current string.begin()
it = std::find(tmp, end, ','); // look for comma between tmp and end
std::string name(tmp, it); // name = s[tmp:it]
addWorkspaceName(name.c_str());
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-17 17:16:43 +0000