XFree86 4.3.99.902 (RC 2)xf86-4_3_99_902

29 files changed, 327 insertions, 36 deletions

diff --git a/hw/darwin/bundle/Dutch.lproj/Credits.rtf b/hw/darwin/bundle/Dutch.lproj/Credits.rtf
index 3cd250116..7d9a594e6 100644
--- a/hw/darwin/bundle/Dutch.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Dutch.lproj/Credits.rtf
@@ -1,11 +1,41 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5160\viewh4480\viewkind0
+\vieww9000\viewh9000\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
diff --git a/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/classes.nib
index ba1e3a206..77f345a4e 100644
--- a/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/classes.nib
+++ b/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/classes.nib
@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }
diff --git a/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/objects.nib
index 034396156..e2d721c66 100644
--- a/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/English.lproj/Credits.rtf b/hw/darwin/bundle/English.lproj/Credits.rtf
index 7d9a594e6..32c64f026 100644
--- a/hw/darwin/bundle/English.lproj/Credits.rtf
+++ b/hw/darwin/bundle/English.lproj/Credits.rtf
@@ -2,7 +2,7 @@
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww9000\viewh9000\viewkind0
+\vieww5160\viewh6300\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
 \f0\b\fs24 \cf0 Contributors to XFree86 4.4:
diff --git a/hw/darwin/bundle/French.lproj/Credits.rtf b/hw/darwin/bundle/French.lproj/Credits.rtf
index 5e52d1177..66c1bdae0 100644
--- a/hw/darwin/bundle/French.lproj/Credits.rtf
+++ b/hw/darwin/bundle/French.lproj/Credits.rtf
@@ -1,11 +1,40 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
 \vieww5160\viewh4480\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 Participants \'88 XonX pour XFree86 4.2 :
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+
+\f0\b \cf0 \
+Participants \'88 XonX pour XFree86 4.2 :
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
diff --git a/hw/darwin/bundle/French.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/French.lproj/MainMenu.nib/classes.nib
index ba1e3a206..77f345a4e 100644
--- a/hw/darwin/bundle/French.lproj/MainMenu.nib/classes.nib
+++ b/hw/darwin/bundle/French.lproj/MainMenu.nib/classes.nib
@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }
diff --git a/hw/darwin/bundle/French.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/French.lproj/MainMenu.nib/objects.nib
index ef15f00f1..cc6620bcb 100644
--- a/hw/darwin/bundle/French.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/French.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/German.lproj/Credits.rtf b/hw/darwin/bundle/German.lproj/Credits.rtf
index 3cd250116..32c64f026 100644
--- a/hw/darwin/bundle/German.lproj/Credits.rtf
+++ b/hw/darwin/bundle/German.lproj/Credits.rtf
@@ -1,11 +1,41 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5160\viewh4480\viewkind0
+\vieww5160\viewh6300\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
diff --git a/hw/darwin/bundle/German.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/German.lproj/MainMenu.nib/classes.nib
index ba1e3a206..77f345a4e 100644
--- a/hw/darwin/bundle/German.lproj/MainMenu.nib/classes.nib
+++ b/hw/darwin/bundle/German.lproj/MainMenu.nib/classes.nib
@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }
diff --git a/hw/darwin/bundle/German.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/German.lproj/MainMenu.nib/objects.nib
index d3e7c5d57..7855fa3df 100644
--- a/hw/darwin/bundle/German.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/German.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/Japanese.lproj/Credits.rtf b/hw/darwin/bundle/Japanese.lproj/Credits.rtf
index 6b1f82d8a..a7d24c2a6 100644
--- a/hw/darwin/bundle/Japanese.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Japanese.lproj/Credits.rtf
@@ -1,11 +1,43 @@
-{\rtf1\mac\ansicpg10001\cocoartf100
+{\rtf1\mac\ansicpg10001\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 \f3\fnil\fcharset78 HiraKakuPro-W3;}
 {\colortbl;\red255\green255\blue255;}
 \vieww13980\viewh11160\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper
+\f2\i \
+
+\f3\i0    \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'41\'83\'4e\'83\'5a\'83\'89\'83\'8c\'81\'5b\'83\'56\'83\'87\'83\'93 \'82\'a8\'82\'e6\'82\'d1 Apple-WM \'8a\'67\'92\'a3
+\f1 \
+Torrey T. Lyons\
+     
+\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b\
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f3 \'83\'7c\'83\'8b\'83\'67\'83\'4b\'83\'8b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
+Michael Oland\
+     
+\f3 \'90\'56\'82\'b5\'82\'a2
+\f1 XDarwin 
+\f3 \'83\'41\'83\'43\'83\'52\'83\'93
+\f1 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
diff --git a/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/classes.nib
index ba1e3a206..77f345a4e 100644
--- a/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/classes.nib
+++ b/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/classes.nib
@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }
diff --git a/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/objects.nib
index fbfb4dd42..7903eb622 100644
--- a/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/Portuguese.lproj/Credits.rtf b/hw/darwin/bundle/Portuguese.lproj/Credits.rtf
index cbf13779f..56a287ca5 100644
--- a/hw/darwin/bundle/Portuguese.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Portuguese.lproj/Credits.rtf
@@ -1,20 +1,40 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5340\viewh4520\viewkind0
+\vieww5140\viewh4980\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 Contribuidores do XonX ao XFree86 4.2.99.x:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Contribuidores do XonX ao XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200
 \cf0 Fabr\'92cio Luis de Castro
 \f0\b \
-     
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0      
 \f2\i\b0 Localiza\'8d\'8bo para o Portugu\'90s\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\i0\b \cf0 \
+\f1\i0 \cf0 Michael Oland\
+     
+\f2\i New XDarwin icon
+\f0\i0\b \
+\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Contribuidores do XonX ao XFree86 4.2:
 \f1\b0 \
diff --git a/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/classes.nib
index ba1e3a206..77f345a4e 100644
--- a/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/classes.nib
+++ b/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/classes.nib
@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }
diff --git a/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/objects.nib
index 4b7736a12..6fc5aa2a3 100644
--- a/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/Spanish.lproj/Credits.rtf b/hw/darwin/bundle/Spanish.lproj/Credits.rtf
index 3cd250116..32c64f026 100644
--- a/hw/darwin/bundle/Spanish.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Spanish.lproj/Credits.rtf
@@ -1,11 +1,41 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5160\viewh4480\viewkind0
+\vieww5160\viewh6300\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
diff --git a/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/classes.nib
index ba1e3a206..77f345a4e 100644
--- a/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/classes.nib
+++ b/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/classes.nib
@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }
diff --git a/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/objects.nib
index 83647d675..0a6953c69 100644
--- a/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/Swedish.lproj/Credits.rtf b/hw/darwin/bundle/Swedish.lproj/Credits.rtf
index 3cd250116..32c64f026 100644
--- a/hw/darwin/bundle/Swedish.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Swedish.lproj/Credits.rtf
@@ -1,11 +1,41 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5160\viewh4480\viewkind0
+\vieww5160\viewh6300\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
diff --git a/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/classes.nib
index ba1e3a206..77f345a4e 100644
--- a/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/classes.nib
+++ b/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/classes.nib
@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }
diff --git a/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/objects.nib
index 230436b31..0ace83098 100644
--- a/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/ko.lproj/Credits.rtf b/hw/darwin/bundle/ko.lproj/Credits.rtf
index 3cd250116..32c64f026 100644
--- a/hw/darwin/bundle/ko.lproj/Credits.rtf
+++ b/hw/darwin/bundle/ko.lproj/Credits.rtf
@@ -1,11 +1,41 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5160\viewh4480\viewkind0
+\vieww5160\viewh6300\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
diff --git a/hw/darwin/bundle/ko.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/ko.lproj/MainMenu.nib/classes.nib
index ba1e3a206..77f345a4e 100644
--- a/hw/darwin/bundle/ko.lproj/MainMenu.nib/classes.nib
+++ b/hw/darwin/bundle/ko.lproj/MainMenu.nib/classes.nib
@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }
diff --git a/hw/darwin/bundle/ko.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/ko.lproj/MainMenu.nib/objects.nib
index e35148d76..ab141ba99 100644
--- a/hw/darwin/bundle/ko.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/ko.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/iokit/xfIOKit.c b/hw/darwin/iokit/xfIOKit.c
index 6b4bd75c2..a7f5f18ee 100644
--- a/hw/darwin/iokit/xfIOKit.c
+++ b/hw/darwin/iokit/xfIOKit.c
@@ -33,7 +33,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2003/10/16 23:50:09 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2003/12/09 04:42:36 torrey Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
@@ -516,8 +516,7 @@ static Bool SetupFBandHID(
     dfb->bitsPerComponent = pixelInfo.bitsPerComponent;
 
     // allocate shadow framebuffer
-    iokitScreen->shadowPtr = shadowAlloc(dfb->width, dfb->height,
-                                         dfb->bitsPerPixel);
+    iokitScreen->shadowPtr = xalloc(dfb->pitch * dfb->height);
     dfb->framebuffer = iokitScreen->shadowPtr;
 
     // Note: Darwin kIORGBDirectPixels = X TrueColor, not DirectColor
diff --git a/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj b/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj
index 3afc9177b..54b1d7180 100644
--- a/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj
+++ b/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj
@@ -334,7 +334,7 @@
 	<key>CFBundleExecutable</key>
 	<string>XDarwin</string>
 	<key>CFBundleGetInfoString</key>
-	<string>XDarwin 1.3b4, ©2001-2003 XFree86 Project, Inc.</string>
+	<string>XDarwin 1.3.0, ©2001-2003 XFree86 Project, Inc.</string>
 	<key>CFBundleIconFile</key>
 	<string>XDarwin.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -346,7 +346,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>XDarwin 1.3b4</string>
+	<string>XDarwin 1.3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/hw/darwin/quartz/cr/crFrame.m b/hw/darwin/quartz/cr/crFrame.m
index 305d42aa6..b308dec74 100644
--- a/hw/darwin/quartz/cr/crFrame.m
+++ b/hw/darwin/quartz/cr/crFrame.m
@@ -27,7 +27,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.7 2003/11/27 01:53:39 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.8 2003/12/05 07:00:10 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "cr.h"
@@ -206,7 +206,7 @@ CRReshapeFrame(RootlessFrameID wid, RegionPtr pShape)
 
     if (pShape != NULL) {
         // Calculate the region outside the new shape.
-        REGION_INVERSE(NULL, pShape, pShape, &localBox);
+        miInverse(pShape, pShape, &localBox);
     }
 
     // If window is currently shaped we need to undo the previous shape.
diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c
index bbea46cab..470528943 100644
--- a/hw/darwin/quartz/fullscreen/fullscreen.c
+++ b/hw/darwin/quartz/fullscreen/fullscreen.c
@@ -25,7 +25,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.3 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.4 2003/12/09 04:41:27 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "darwin.h"
@@ -461,8 +461,6 @@ static void FSShadowUpdate(
     int pitch = dfb->pitch;
     int bpp = dfb->bitsPerPixel/8;
 
-ErrorF("FSShadowUpdate: %i\n", quartzServerVisible);
-
     // Don't update if the X server is not visible
     if (!quartzServerVisible)
         return;
@@ -502,7 +500,6 @@ static Bool FSSetupScreen(
     FSScreenPtr fsDisplayInfo = FULLSCREEN_PRIV(pScreen);
     CGDirectDisplayID cgID = fsDisplayInfo->displayID;
 
-ErrorF("FSSetupScreen\n");
     // Initialize shadow framebuffer support
     if (! shadowInit(pScreen, FSShadowUpdate, NULL)) {
         ErrorF("Failed to initalize shadow framebuffer for screen %i.\n",