* cosmetics to Workspace.hh CurrentWindowCmd.cc

* added first draft of new docs in asciidoc format, needs to be converted
  properly to roff-format, right now its just a temporary "home"
* rename of Coding_style to CODESTYLE

ChangeLog

@@ -1,5 +1,8 @@
 (Format: Year/Month/Day)
 Changes for 0.9.16:
+*06/04/22:
+   * First draft of new docs in docs/asciidoc (Mathias)
+   * Cosmetics to Workspace.hh CurrentWindowCmd.cc
 *06/04/21:
    * Minor fixes to slit transparency (esp if autohidden) (Simon)
      Slit.cc
@@ -213,6 +216,7 @@ Changes for 0.9.16:
      fluxbox.cc Screen.hh/cc Window.hh/cc FbWinFrame.hh/cc Remember.cc
      Container.hh/cc FbTk/XLayer.hh/cc XLayerItem.cc fluxbox-nls.hh
      RowSmart/ColSmart/UnderMousePlacement.cc WinButton.cc
+
 -------------------------------------------------------------
 Changes for 0.9.15:
 *06/03/19:
@@ -377,6 +381,8 @@ Changes for 0.9.15:
      src/ScreenResources.cc
    * Use fbsetroot in Default-Styles (Mathias)
      data/styles/*
+
+-------------------------------------------------------------
 Changes for 0.9.14:
 *05/09/12:
    * Fixes #1281708, MenuIcon doesnt scale properly (thanx Erik-Jan)

doc/asciidoc/README.txt

@@ -0,0 +1,31 @@
+whats this? this is the attempt to write the documentation for 
+fluxbox in ascii-doc format. how does it work?
+
+well, we just edit fluxbox.txt from this directory. save it.
+then we can produce pretty much any format we like:
+
+man:
+
+  $> asciidoc -b docbook -d manpage fluxbox.txt
+  $> xmlto man fluxbox.xml
+
+pdf:
+
+  $> asciidoc -b docbook -d manpage fluxbox.txt
+  $> docbook2pdf fluxbox.xml
+
+docbook:
+
+  $> asciidoc -b docbook-sgml -d manpage fluxbox.txt
+
+html:
+
+  $> asciidoc -b xhtml -d manpage fluxbox.txt
+
+and many many more ways to do it.
+what do we need? well, at least:
+
+  http://www.methods.co.nz/asciidoc/
+  http://cyberelk.net/tim/xmlto/
+
+and the rest of the docbook-family + maybe pdftex.

src/CurrentWindowCmd.cc

@@ -53,15 +53,15 @@ void SendToWorkspaceCmd::real_execute() {
 }
 
 void SendToNextWorkspaceCmd::real_execute() {
-    const int ws_nr = 
+    const int ws_nr =
-        ( fbwindow().screen().currentWorkspaceID() + m_workspace_num ) % 
+        ( fbwindow().screen().currentWorkspaceID() + m_workspace_num ) %
           fbwindow().screen().numberOfWorkspaces();
     fbwindow().screen().sendToWorkspace(ws_nr, &fbwindow(), false);
 }
 
 void SendToPrevWorkspaceCmd::real_execute() {
     int ws_nr = fbwindow().screen().currentWorkspaceID() - m_workspace_num;
-    if ( ws_nr < 0 ) 
+    if ( ws_nr < 0 )
         ws_nr += fbwindow().screen().numberOfWorkspaces();
     fbwindow().screen().sendToWorkspace(ws_nr, &fbwindow(), false);
 }
@@ -71,15 +71,15 @@ void TakeToWorkspaceCmd::real_execute() {
 }
 
 void TakeToNextWorkspaceCmd::real_execute() {
-    unsigned int workspace_num= 
+    unsigned int workspace_num=
-        ( fbwindow().screen().currentWorkspaceID() + m_workspace_num ) % 
+        ( fbwindow().screen().currentWorkspaceID() + m_workspace_num ) %
           fbwindow().screen().numberOfWorkspaces();
     fbwindow().screen().sendToWorkspace(workspace_num, &fbwindow());
 }
 
 void TakeToPrevWorkspaceCmd::real_execute() {
     int workspace_num= fbwindow().screen().currentWorkspaceID() - m_workspace_num;
-    if ( workspace_num < 0 ) 
+    if ( workspace_num < 0 )
         workspace_num += fbwindow().screen().numberOfWorkspaces();
     fbwindow().screen().sendToWorkspace(workspace_num, &fbwindow());
 }
@@ -125,12 +125,12 @@ ResizeCmd::ResizeCmd(const int step_size_x, const int step_size_y) :
     m_step_size_x(step_size_x), m_step_size_y(step_size_y) { }
 
 void ResizeCmd::real_execute() {
-  
+
-    int w = std::max<int>(static_cast<int>(fbwindow().width() + 
+    int w = std::max<int>(static_cast<int>(fbwindow().width() +
-                                      m_step_size_x * fbwindow().winClient().width_inc), 
+                                      m_step_size_x * fbwindow().winClient().width_inc),
                      fbwindow().frame().titlebarHeight() * 2 + 10);
-    int h = std::max<int>(static_cast<int>(fbwindow().height() + 
+    int h = std::max<int>(static_cast<int>(fbwindow().height() +
-                                      m_step_size_y * fbwindow().winClient().height_inc), 
+                                      m_step_size_y * fbwindow().winClient().height_inc),
                      fbwindow().frame().titlebarHeight() + 10);
     fbwindow().resize(w, h);
 }
@@ -143,7 +143,7 @@ void MoveToCmd::real_execute() {
     int y = 0;
 
     const int head = fbwindow().screen().getHead(fbwindow().fbWindow());
-    
+
     if (m_refc & MoveToCmd::LOWER)
         y = fbwindow().screen().maxBottom(head) - fbwindow().height() - 2 * fbwindow().frame().window().borderWidth() - m_step_size_y;
     if (m_refc & MoveToCmd::UPPER)
@@ -157,7 +157,7 @@ void MoveToCmd::real_execute() {
         x = fbwindow().x();
     if (m_refc & MoveToCmd::IGNORE_Y)
         y = fbwindow().y();
-    
+
     fbwindow().move(x, y);
 }
 

src/Workspace.hh

@@ -22,8 +22,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef	 WORKSPACE_HH
+#ifndef     WORKSPACE_HH
-#define	 WORKSPACE_HH
+#define     WORKSPACE_HH
 
 
 
@@ -42,7 +42,7 @@ class FluxboxWindow;
 class WinClient;
 
 /**
-	Handles a single workspace
+    Handles a single workspace
 */
 class Workspace:private FbTk::NotCopyable, private FbTk::Observer {
 public:
@@ -51,7 +51,7 @@ public:
     Workspace(BScreen &screen, FbTk::MultLayers &layermanager, const std::string &name,
               unsigned int workspaceid = 0);
     ~Workspace();
-	
+
     void setLastFocusedWindow(FluxboxWindow *w);
 
     ///   Set workspace name
@@ -66,19 +66,19 @@ public:
     void updateClientmenu();
 
     BScreen &screen() { return m_screen; }
-    const BScreen &screen() const { return m_screen; }	
+    const BScreen &screen() const { return m_screen; }
 
     FluxboxWindow *lastFocusedWindow() { return m_lastfocus; }
-    const FluxboxWindow *lastFocusedWindow() const { return m_lastfocus; }	
+    const FluxboxWindow *lastFocusedWindow() const { return m_lastfocus; }
 
-    inline FbTk::Menu &menu() { return m_clientmenu; }
+    FbTk::Menu &menu() { return m_clientmenu; }
-    inline const FbTk::Menu &menu() const { return m_clientmenu; }
+    const FbTk::Menu &menu() const { return m_clientmenu; }
-    ///	name of this workspace
+    ///    name of this workspace
-    inline const std::string &name() const { return m_name; }
+    const std::string &name() const { return m_name; }
     /**
        @return the number of this workspace, note: obsolete, should be in BScreen
     */
-    inline unsigned int workspaceID() const { return m_id; }	
+    unsigned int workspaceID() const { return m_id; }
 
     const Windows &windowList() const { return m_windowlist; }
     Windows &windowList() { return m_windowlist; }
@@ -98,14 +98,14 @@ private:
 
     typedef std::vector<std::string> Group;
     typedef std::vector<Group> GroupList;
-	
+
     static GroupList m_groups; ///< handle auto groupings
 
     FbTk::MultLayers &m_layermanager;
     Windows m_windowlist;
 
     std::string m_name;  ///< name of this workspace
-    unsigned int m_id;	///< id, obsolete, this should be in BScreen
+    unsigned int m_id;    ///< id, obsolete, this should be in BScreen
 
 };