Merge branch 'master' into pm-flat

Conflicts: build/jam/HaikuImage build/jam/OptionalBuildFeatures build/jam/OptionalPackages build/jam/UserBuildConfig.sample data/bin/installoptionalpackage src/apps/deskbar/DeskbarMenu.cpp src/servers/debug/DebugServer.cpp src/system/kernel/fs/vfs.cpp
2011-11-05 17:00:01 +01:00
parent 7723ae9df2 dd58fc68f4
commit 19ae20e67e
1559 changed files with 98536 additions and 42861 deletions
@@ -164,6 +164,11 @@ if [ "$SAFEMODE" != "yes" ]; then
 	launch $SERVERS/notification_server ""
 fi

+# Launch Power Daemon
+if [ "$SAFEMODE" != "yes" ]; then
+	launch $SERVERS/power_daemon ""
+fi
+
 # Check for daylight saving time
 launch system/bin/dstcheck

@@ -1,4 +1,4 @@
-name = Apple aluminium
+name = Apple Aluminium Extended International

 # Size shortcuts
 default-size = 10,10
@@ -15,9 +15,8 @@ $f = 10,20
 $two = 20,10

 # Key rows
-[ 0,0;  4,5:-; d$fn:0x01; $fn:+12; d$fn:0x00; 5,6:-; 10,6:0x04+2; 5,6:-;
-	10,6:+4 ]
-[ 0,6; 4,5:-; :0x11+12; d$back:+; $b:-; d:+3; $b:-; d:+1; d:0x6a; d:0x23+1 ]
+[ 0,0;  4,5:-; d$fn:0x01; $fn:+12; 15.5,6:-; 10,6:0x70068; 10,6:+2; 5,6:-; 10,6:+4; ]
+[ 0,6; 4,5:-; :0x11+12; d$back:+; $b:-; :-; d:0x20; d:+1; $b:-; d:+1; d:0x6a; d:0x23+1 ]
 [ 0,16; 4,5:-; d$d:0x26; :+12; d$e:0x47; $b:-; d:0x34-0x36; $b:-; :+3; d:0x25 ]
 [ 0,26; 4,5:led-caps; # integrated into caps key
 	d17,10:0x3b; :+11; :0x33; 50,10:-; :0x48-0x4a; d:0x3a ]
@@ -0,0 +1,27 @@
+name = Apple Aluminium International
+
+# Size shortcuts
+default-size = 10,10
+$back = 17,10
+$fn = 10.5,6
+$lshift = 13,10
+$b = 2,12
+$d = 15,10
+$e = l12,20,8
+$f = 10,20
+$two = 20,10
+$last = 10,12
+$cmd = 14,12
+$arrow = 10,6
+
+# Key rows
+[ 0,0;  4,5:-; d$fn:0x01; $fn:+12; ]
+[ 0,6;  4,5:-; :0x11+12; d$back:+; ]
+[ 0,16; 4,5:-; d$d:0x26; :+12; d$e:0x47; ]
+[ 0,26; 4,5:led-caps; # integrated into caps key
+	d17,10:0x3b; :+11; :0x33; ]
+[ 0,36; 4,5:-; d$lshift:0x4b; :0x69; :0x4c+9; d24,10:+1; ]
+[ 0,46; 4,5:-; d$last:-; # fn key
+	d$last:0x5c; d$last:0x5d; d$cmd:0x66; 49,12:0x5e; d$cmd:0x67;
+	d$last:0x5f; $arrow:-; d$arrow:0x57; $arrow:-; ]
+[ 121,52; d$arrow:0x61+2; ]
@@ -0,0 +1,24 @@
+name = Apple Aluminum (US)
+
+# Size shortcuts
+default-size = 10,10
+$back = 17,10
+$fn = 10.5,6
+$b = 2,12
+$f = 10,20
+$two = 20,10
+$last = 10,12
+$cmd = 14,12
+$arrow = 10,6
+
+# Key rows
+[ 0,0;  4,5:-; d$fn:0x01; $fn:+12; ]
+[ 0,6;  4,5:-; :0x11+12; d$back:+; ]
+[ 0,16; 4,5:-; d17,10:0x26; :+13; ]
+[ 0,26; 4,5:led-caps; # integrated into caps key
+	d19,10:0x3b; :+11; d18,10:0x47; ]
+[ 0,36; 4,5:-; d24,10:0x4b; :+10; d23,10:+1; ]
+[ 0,46; 4,5:-; d$last:-; # fn key
+	d$last:0x5c; d$last:0x5d; d$cmd:0x66; 49,12:0x5e; d$cmd:0x67;
+	d$last:0x5f; $arrow:-; d$arrow:0x57; $arrow:-; ]
+[ 121,52; d$arrow:0x61+2; ]
@@ -0,0 +1,23 @@
+name = Apple Aluminum Extended (US)
+
+# Size shortcuts
+default-size = 10,10
+$back = 17,10
+$fn = 10.5,6
+$shift = 24,10
+$ctrl = 14,10
+$alt = 12,10
+$cmd = 14,10
+$b = 5,10
+$f = 10,20
+$two = 20,10
+
+# Key rows
+[ 0,0;  4,5:-; d$fn:0x01; $fn:+12; 15.5,6:-; 10,6:0x70068; 10,6:+2; 5,6:-; 10,6:+4; ]
+[ 0,6;  4,5:-; :0x11+12; d$back:+; $b:-; :-; d:0x20; d:+1; $b:-; d:+1; d:0x6a; d:0x23+1 ]
+[ 0,16; 4,5:-; 0,16; 4,5:-; d17,10:0x26; :+13; $b:-; d:0x34-0x36; $b:-; :+3; d:0x25 ]
+[ 0,26; 4,5:led-caps; # integrated into caps key
+	d19,10:0x3b; :+11; d18,10:0x47; 40,10:-; :0x48-0x4a; d:0x3a ]
+[ 0,36; 4,5:-; d24,10:0x4b; :+10; d23,10:+1; 15,10:-; d:+1; 15,10:-; :+3; d$f:+1 ]
+[ 0,46; 4,5:-; d$ctrl:0x5c; d$alt:0x5d; d$cmd:0x66; 67,10:0x5e; d$cmd:0x67;
+	d$alt:0x5f; d$ctrl:0x60; $b:-; d:+3; $b:-; $two:+1; :+1 ]
@@ -0,0 +1,27 @@
+name = ThinkPad (US)
+
+# Size shortcuts
+default-size = 18,18
+$s = 17,10
+$gap = 6,10
+$sgap = 5,10
+$backspace = 38,18
+$tab = 28,18
+$caps = 32,18
+$enter = d42,18
+$lshift = 41,18
+$rshift = 51,18
+$lctrl = 23,18
+$option = 13,18
+$space = 95,18
+
+# Key rows
+[ 0,0; $s:0x01; 148,10:-; $s:0x0e+2; $sgap:-; $s:0x1f+2; ]
+[ 0,10; $s:0x02+3; $gap:-; $s:+4; $gap:-; $s:+4; $sgap:-; $s:0x34+2; ]
+[ 0,20; :0x11+12; $backspace:+1; ]
+[ 0,38; $tab:0x26; :+12; 28,18:+1; ]
+[ 0,56; $caps:0x3b; :+11; $enter:0x47; ]
+[ 0,74; $lshift:0x4b; :0x4c+9; $rshift:+1 ]
+[ 0,92; :-; $lctrl:0x5c; $option:0x66; :0x5d; $space:+1;
+	:+1; :0x68; :0x60; $s:0x9a; $s:0x57; $s:0x9b ]
+[ 221,102; $s:0x61+2; ]
@@ -1,4 +1,4 @@
-name = IBM Laptop International
+name = ThinkPad International

 # Size shortcuts
 default-size = 18,18
@@ -17,10 +17,10 @@ $space = 95,18
 # Key rows
 [ 0,0; $s:0x01; 148,10:-; $s:0x0e+2; $sgap:-; $s:0x1f+2; ]
 [ 0,10; $s:0x02+3; $gap:-; $s:+4; $gap:-; $s:+4; $sgap:-; $s:0x34+2; ]
-[ 0,20; :0x11+12; $backspace:+1 ]
+[ 0,20; :0x11+12; $backspace:+1; ]
 [ 0,38; $tab:0x26; :+12; $enter:0x47; ]
 [ 0,56; $caps:0x3b; :+11; :0x33 ]
 [ 0,74; $l-shift-ctrl:0x4b; :0x69; :0x4c+9; $r-shift:+1 ]
-[ 0,92; :0x99; $l-shift-ctrl:0x5c; $option:0x66; :0x5d; $space:+1;
+[ 0,92; :-; $l-shift-ctrl:0x5c; $option:0x66; :0x5d; $space:+1;
 	:+1; :0x68; :0x60; $s:0x9a; $s:0x57; $s:0x9b ]
 [ 221,102; $s:0x61+2; ]
@@ -0,0 +1,28 @@
+name = ThinkPad T400s (US)
+
+# Size shortcuts
+default-size = 18,18
+$s = 16,10
+$sdouble = 16,20
+$gap = 4,10
+$backspace = 38,18
+$tab = 28,18
+$caps = 32,18
+$enter = d42,18
+$lshift = 41,18
+$rshift = 51,18
+$lctrl = 23,18
+$option = 13,18
+$space = 95,18
+$arrow = 17,10
+
+# Key rows
+[ 0,0; $sdouble:0x01; 140,10:-; $s:0x0e+2; $s:0x1f; $gap:-; $sdouble:0x34; $s:0x20+1; ]
+[ 0,10; 20,10:-; $s:0x02+3; $gap:-; $s:+4; $gap:-; $s:+4; 20,10:-; $s:0x35+1; ]
+[ 0,20; :0x11+12; $backspace:+1; ]
+[ 0,38; $tab:0x26; :+12; 28,18:+1; ]
+[ 0,56; $caps:0x3b; :+11; $enter:0x47; ]
+[ 0,74; $lshift:0x4b; :0x4c+9; $rshift:+1 ]
+[ 0,92; :-; $lctrl:0x5c; $option:0x66; :0x5d; $space:+1;
+	:+1; :0x68; :0x60; $arrow:0x9a; $arrow:0x57; $arrow:0x9b ]
+[ 221,102; $arrow:0x61+2; ]
@@ -0,0 +1,27 @@
+name = ThinkPad T400s International
+
+# Size shortcuts
+default-size = 18,18
+$s = 16,10
+$sdouble = 16,20
+$gap = 4,10
+$backspace = 38,18
+$tab = 28,18
+$caps = 32,18
+$enter = dl28,36,22
+$l-shift-ctrl = 23,18
+$r-shift = 51,18
+$option = 13,18
+$space = 95,18
+$arrow = 17,10
+
+# Key rows
+[ 0,0; $sdouble:0x01; 140,10:-; $s:0x0e+2; $s:0x1f; $gap:-; $sdouble:0x34; $s:0x20+1; ]
+[ 0,10; 20,10:-; $s:0x02+3; $gap:-; $s:+4; $gap:-; $s:+4; 20,10:-; $s:0x35+1; ]
+[ 0,20; :0x11+12; $backspace:+1; ]
+[ 0,38; $tab:0x26; :+12; $enter:0x47; ]
+[ 0,56; $caps:0x3b; :+11; :0x33 ]
+[ 0,74; $l-shift-ctrl:0x4b; :0x69; :0x4c+9; $r-shift:+1 ]
+[ 0,92; :-; $l-shift-ctrl:0x5c; $option:0x66; :0x5d; $space:+1;
+	:+1; :0x68; :0x60; $arrow:0x9a; $arrow:0x57; $arrow:0x9b ]
+[ 221,102; $arrow:0x61+2; ]
@@ -0,0 +1,28 @@
+name = ThinkPad X1 (US)
+
+# Size shortcuts
+default-size = 18,18
+$s = 15,10
+$s2 = 23.5,10
+$backspace = 38,18
+$tab = 28,18
+$caps = 32,18
+$enter = d42,18
+$lshift = 42,18
+$rshift = 50,18
+$lctrl = 24,20
+$bottom = 18,20
+$space = 90,20
+$sarrow = 16,10
+$arrow = 18,10
+
+# Key rows
+[ 0,0; $s2:0x01; $s:+12; $s:0x20; $s:0x35; $s:0x1f; $s2:0x34; ]
+[ 0,10; :0x11+12; $backspace:+1; ]
+[ 0,28; $tab:0x26; :+12; 28,18:+1; ]
+[ 0,46; $caps:0x3b; :+11; $enter:0x47; ]
+[ 0,64; $lshift:0x4b; :0x4c+9; $rshift:+1 ]
+[ 0,82; $bottom:-; $lctrl:0x5c; $bottom:0x66; $bottom:0x5d; $space:+1;
+	$bottom:+1; $bottom:0x0e; $bottom:0x60; $sarrow:0x21; $arrow:0x57;
+	$sarrow:0x36; ]
+[ 222,92; $sarrow:0x61; $arrow:0x62; $sarrow:0x63; ]
@@ -0,0 +1,28 @@
+name = ThinkPad X1 International
+
+# Size shortcuts
+default-size = 18,18
+$s = 15,10
+$s2 = 23.5,10
+$backspace = 38,18
+$tab = 28,18
+$caps = 32,18
+$enter = dl28,36,22
+$lshift = 24,18
+$rshift = 50,18
+$lctrl = 24,20
+$bottom = 18,20
+$space = 90,20
+$sarrow = 16,10
+$arrow = 18,10
+
+# Key rows
+[ 0,0; $s2:0x01; $s:+12; $s:0x20; $s:0x35; $s:0x1f; $s2:0x34; ]
+[ 0,10; :0x11+12; $backspace:+1; ]
+[ 0,28; $tab:0x26; :+12; $enter:0x47; ]
+[ 0,46; $caps:0x3b; :+11; :0x33 ]
+[ 0,64; $lshift:0x4b; :0x69; :0x4c+9; $rshift:+1 ]
+[ 0,82; $bottom:-; $lctrl:0x5c; $bottom:0x66; $bottom:0x5d; $space:+1;
+	$bottom:+1; $bottom:0x0e; $bottom:0x60; $sarrow:0x21; $arrow:0x57;
+	$sarrow:0x36; ]
+[ 222,92; $sarrow:0x61; $arrow:0x62; $sarrow:0x63; ]
@@ -0,0 +1,26 @@
+name = ThinkPad X100e (US)
+
+# Size shortcuts
+default-size = 19,18
+$s = 15.5,10
+$gap = 2.125,10
+$backspace = 25,18
+$tab = 25,18
+$caps = 32,18
+$enter = d31,18
+$shift = 41,18
+$bottom = 19,20
+$space = 105,20
+$sarrow = 17,10
+$arrow = 19,10
+
+# Key rows
+[ 0,0; $s:0x01; $gap:-; $s:+4; $gap:-; $s:+4; $gap:-; $s:+4; $gap:-; $s:0x1f;
+	$s:0x34; $s:0x20; $s:0x35; ]
+[ 0,10; :0x11+12; $backspace:+1; ]
+[ 0,28; $tab:0x26; :+13; ]
+[ 0,46; $caps:0x3b; :+11; $enter:0x47; ]
+[ 0,64; $shift:0x4b; :0x4c+9; $shift:+1 ]
+[ 0,82; $bottom:-; $bottom:0x5c; $bottom:0x66; $bottom:0x5d; $space:+1;
+	$bottom:+1; $bottom:0x60; 17,9:0x21; $arrow:0x57; 17,9:0x36; ]
+[ 219,92; $sarrow:0x61; $arrow:0x62; $sarrow:0x63; ]
@@ -0,0 +1,29 @@
+name = ThinkPad X100e International
+
+# Size shortcuts
+default-size = 19,18
+$s = 15.5,10
+$gap = 2.125,10
+$backspace = 25,18
+$tab = 27,18
+$caps = 33,18
+$small = 16,18
+$enter = dl23,36,15
+$lshift = 22,18
+$rshift = 41,18
+$bottom = 19,20
+$space = 105,20
+$sarrow = 17,10
+$arrow = 19,10
+
+# Key rows
+[ 0,0; $s:0x01; $gap:-; $s:+4; $gap:-; $s:+4; $gap:-; $s:+4; $gap:-; $s:0x1f;
+	$s:0x34; $s:0x20; $s:0x35; ]
+[ 0,10; :0x11+12; $backspace:+1; ]
+[ 0,28; $tab:0x26; :+10; $small:+1; $small:+1; $enter:0x47; ]
+[ 0,46; $caps:0x3b; :+10; $small:+1; $small:0x33; ]
+[ 0,64; $lshift:0x4b; :0x69; :0x4c+9; $rshift:+1; ]
+[ 0,82; $bottom:-; $bottom:0x5c; $bottom:0x66; $bottom:0x5d; $space:+1;
+	$bottom:+1; $bottom:0x60; 17,9:0x21; $arrow:0x57;
+	17,9:0x36; ]
+[ 219,92; $sarrow:0x61; $arrow:0x62; $sarrow:0x63; ]
@@ -0,0 +1,31 @@
+----------------------
+Be Sample Code License
+----------------------
+
+Copyright 1991-1999, Be Incorporated.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions, and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions, and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.