fixed resize_all_clients call, updated welcome

cmd/wm/client.c

@@ -540,8 +540,12 @@ resize_all_clients()
 	unsigned int i;
 	for(i = 0; i < nclient; i++) {
 		Client *c = client[i];
-		if(c->nframe && c->frame[c->sel]->area)
+		if(c->nframe && c->frame[c->sel]->area) {
-			resize_client(c, &c->frame[c->sel]->rect, False);
+			if(area2index(c->frame[c->sel]->area))
+				resize_area(c, &c->frame[c->sel]->rect, nil);
+			else
+				resize_client(c, &c->frame[c->sel]->rect, False);
+		}
 	}
 }
 

rc/extern

@@ -3,6 +3,7 @@
 
 PATH=$OLD_PATH export PATH
 unset OLD_PATH
+unset MODKEY
 unset WMII_FONT
 unset WMII_NORMCOLORS
 unset WMII_SELCOLORS

rc/welcome

@@ -1,65 +1,47 @@
 #!/bin/sh
 # display a welcome message that contains the wmii tutorial
 
-xmessage -file - <<'EOF'
+xmessage -file - <<EOF
 Welcome to wmii, the non-wimp environment of the WMI Project.
 
 This is a small step by step tutorial, intended to make you a little bit
 familiar with wmii.
 
-NOTE: Some characters in shortcuts have a special meaning.  S is the Shift
-key, C is the Ctrl key, M is the Meta key (usually Alt), and the hyphen means
-that you have to press the surrounding keys at the same time.
-
 Let's go!
 
-- Start two xterms by pressing M-t twice.
+- Start two xterms by pressing $MODKEY-t twice.
-- Switch between the three windows: M-j, M-k
+- Switch between the three windows: $MODKEY-j, $MODKEY-k
-  You can also use M-Tab instead of M-j.  If you prefer the mouse, then
+  You can also use $MODKEY-Tab instead of $MODKEY-j.  If you prefer the mouse,
-  just click the desired window.
+  then just click the desired window.
-- Create a new page: M-C-y
+- Create a new column with: $MODKEY-n
-  IMPORTANT: this text will then no longer be visible.  In order to continue
+- Tag the selected client with another tag: $MODKEY-Shift-2
-  reading you'll now often have to go back to the first page.  Use M-h
+  IMPORTANT: before you do next step, note that you can select the current tag
-  or M-l for cycling through the existing pages.  The digit in the left
+		  with $MODKEY-1.
-  corner at the bottom indicates which page you're on.  You can directly
+- Select the new tag: $MODKEY-2
-  select a specific page as well: M-S-1, etc.  Make sure that you are on the
+- Select the floating area: $MODKEY-space
-  second page before performing the next steps.
+- Open the programs menu: $MODKEY-Control-p
-- Apply the float layout to the current page: M-S-f
-  Watch the leftmost bar label: the 't', which stood for 'tiled', has now
-  turned into an 'f', for 'float'.
-- Open the programs menu: M-C-p
   Type 'xclock' and press Enter.
 - Resize the xclock window: left-click on the border and, while holding the
   button down, move the cursor around.
 - Move the xclock window: left-click on the title bar and, while holding
   the button down, move the cursor around.
-- Open the actions menu: M-C-a
+- Open the actions menu: $MODKEY-Control-a
-  Remove the current page by selecting the rmpage action.  The xclock window
+  Rerun wmiirc by selecting 'wmiirc'.
-  will be automatically detached and we'll land on the first page.
-- Attach the xclock window again: M-a
-- Select one of the terminals and close it: M-C-c
-  Close xclock as well.
-- Swap the remaining terminal with the left master tile by moving the terminal
-  window somewhere to the left.  Afterwards, swap them once again, but this
-  time by pressing M-Enter.
 - Working with mouse efficiently:
   selecting a window: just click the desired window
-  move a window : press M+Button1Press and move the window
+  move a window: press $MODKEY-Button1Press
-  resize a window (only with non managed): press M+Button3Press and resize it
+  and resize a window: press $MODKEY-Button3Press and resize it
   (this can also be done by clicking the titlebar of the window/borders respectively)
 - We'll now have a look at the internal filesystem used by wmii.  Executing
   	wmiir read /
   in the shell of the terminal will list all the files in the root directory.
-  Files ending with a slash are directories.  As you can see, / contains a
+  Entries beginning with a d  are directories.
-  "normal" file and four directories.  These directories correspond to the
+  If you are curious, you can now dig deeper into the directory trees. For instance,
-  four main components of wmii: wmiiwm, wmiibar, wmiikeys, and wmiimenu.  If you
+  	wmiir read /bar/
-  are curious, you can now dig deeper into the directory trees.  For instance,
+  will show you the content of the bar.
-  	wmiir read /bar/1/b1press
-  will show you which command gets executed when you left-click on the page
-  label in the bar.
 
 We hope that these steps gave you an idea of how wmii works.  You can reread
-them at any time by pressing M-C-a and selecting 'welcome'.
+them at any time by pressing $MODKEY-Control-a and selecting 'welcome'.
 
 You should now take a look at the wmii(1) man page.  An FAQ is available on
 <http://wmii.de>.

rc/wmiirc

@@ -17,7 +17,7 @@ do
 	sleep 1
 done
 
-MODKEY=Alt
+MODKEY=Alt export MODKEY
 WMII_FONT='fixed' export WMII_FONT
 WMII_NORMCOLORS='#222222 #eeeeee #666666' export WMII_NORMCOLORS
 WMII_SELCOLORS='#ffffff #285577 #4c7899' export WMII_SELCOLORS