Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 148 insertions, 148 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
index 6da1c67bf..36f4429cc 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
@@ -1,148 +1,148 @@
-// symbols definition for a Macintosh "Extended" keyboard

-

-xkb_symbols "extended" {

-

-    name[Group1]= "USA";

-    key <ESC>  {	[ Escape			]	};

-

-    // Alphanumeric section

-    key <TLDE> {	[ quoteleft,	asciitilde	]	};

-    key <AE01> {	[	  1,	exclam 		]	};

-    key <AE02> {	[	  2,	at		]	};

-    key <AE03> {	[	  3,	numbersign	]	};

-    key <AE04> {	[	  4,	dollar		]	};

-    key <AE05> {	[	  5,	percent		]	};

-    key <AE06> {	[	  6,	asciicircum	]	};

-    key <AE07> {	[	  7,	ampersand	]	};

-    key <AE08> {	[	  8,	asterisk	]	};

-    key <AE09> {	[	  9,	parenleft	]	};

-    key <AE10> {	[	  0,	parenright	]	};

-    key <AE11> {	[     minus,	underscore	]	};

-    key <AE12> {	[     equal,	plus		]	};

-

-    key <AD01> {	[	  q,	Q 		]	};

-    key <AD02> {	[	  w,	W		]	};

-    key <AD03> {	[	  e,	E		]	};

-    key <AD04> {	[	  r,	R		]	};

-    key <AD05> {	[	  t,	T		]	};

-    key <AD06> {	[	  y,	Y		]	};

-    key <AD07> {	[	  u,	U		]	};

-    key <AD08> {	[	  i,	I		]	};

-    key <AD09> {	[	  o,	O		]	};

-    key <AD10> {	[	  p,	P		]	};

-    key <AD11> {	[ bracketleft,	braceleft	]	};

-    key <AD12> {	[ bracketright,	braceright	]	};

-    key <BKSL> {	[ backslash,	bar		]	};

-

-    key <AC01> {	[	  a,	A 		]	};

-    key <AC02> {	[	  s,	S		]	};

-    key <AC03> {	[	  d,	D		]	};

-    key <AC04> {	[	  f,	F		]	};

-    key <AC05> {	[	  g,	G		]	};

-    key <AC06> {	[	  h,	H		]	};

-    key <AC07> {	[	  j,	J		]	};

-    key <AC08> {	[	  k,	K		]	};

-    key <AC09> {	[	  l,	L		]	};

-    key <AC10> {	[ semicolon,	colon		]	};

-    key <AC11> {	[ quoteright,	quotedbl	]	};

-

-    key <AB01> {	[	  z,	Z 		]	};

-    key <AB02> {	[	  x,	X		]	};

-    key <AB03> {	[	  c,	C		]	};

-    key <AB04> {	[	  v,	V		]	};

-    key <AB05> {	[	  b,	B		]	};

-    key <AB06> {	[	  n,	N		]	};

-    key <AB07> {	[	  m,	M		]	};

-    key <AB08> {	[     comma,	less		]	};

-    key <AB09> {	[    period,	greater		]	};

-    key <AB10> {	[     slash,	question	]	};

-

-    key <SPCE> {	[  space			]	};

-    // End alphanumeric section

-

-

-    include "eurosign(e)"

-    include "keypad"

-

-    key <KPEQ> {	[  equal				]	};

-};

-

-hidden

-xkb_symbols "oldmac" {

-

-    include "macintosh_vndr/us(extended)"

-

-    // Begin "Function" section

-    key <FK01> {	[  F1		]	};

-    key <FK02> {	[  F2		]	};

-    key <FK03> {	[  F3		]	};

-    key <FK04> {	[  F4		]	};

-    key <FK05> {	[  F5		]	};

-    key <FK06> {	[  F6		]	};

-    key <FK07> {	[  F7		]	};

-    key <FK08> {	[  F8		]	};

-    key <FK09> {	[  F9		]	};

-    key <FK10> {	[  F10		]	};

-    key <FK11> {	[  F11		]	};

-    key <FK12> {	[  F12		]	};

-    key <FK13> {	[  Print	]	};

-    key <FK14> {	[  Scroll_Lock	]	};

-    key <FK15> {	[  Pause	]	};

-    // End "Function" section

-

-    // Begin "Editing" section

-    key  <INS> {	[  Insert	]	};

-    key <HOME> {	[  Home		]	};

-    key <PGUP> {	[  Prior	]	};

-    key <DELE> {	[  Delete	]	};

-    key  <END> {	[  End		]	};

-    key <PGDN> {	[  Next		]	};

-

-    key   <UP> {	[  Up		]	};

-    key <LEFT> {	[  Left		]	};

-    key <DOWN> {	[  Down		]	};

-    key <RGHT> {	[  Right	]	};

-    // End "Editing" section

-

-    key <BKSP> {	[ BackSpace			]	};

-    key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};

-    key <RTRN> {	[ Return	]	};

-    key <CAPS> {	[ Caps_Lock	]	};

-    key <NMLK> {	[ Num_Lock, Pointer_EnableKeys		]	};

-

-    // Begin "Modifier" section

-    key <LFSH> {	[  Shift_L	]	};

-    key <RTSH> {	[  Shift_R	]	};

-    key <LCTL> {	[  Control_L	]	};

-    key <RCTL> {	[  Control_R	]	};

-    key <LALT> {	[  Alt_L, Meta_L ]	};

-    key <RALT> {	[  Alt_R, Meta_R ]	};

-    key <LWIN> {	[  Super_L	]	};

-    key <RWIN> {	[  Super_R	]	};

-    // End "Modifier" section

-

-    // begin modifier mappings

-    modifier_map Shift  { Shift_L, Shift_R };

-    modifier_map Lock   { Caps_Lock, ISO_Lock };

-    modifier_map Control{ Control_L, Control_R };

-    modifier_map Mod2   { Num_Lock };

-

-    //  Fake keys for virtual<->real modifiers mapping 

-    key <LVL3> {	[ ISO_Level3_Shift	]	};

-    key <MDSW> {	[ Mode_switch 		]	};

-    modifier_map Mod5   { <LVL3>, <MDSW> };

-

-    key <ALT>  {	[ NoSymbol, Alt_L	]	};

-    modifier_map Mod1   { <ALT>, <LALT> };

-

-    key <META> {	[ NoSymbol, Meta_L	]	};

-    modifier_map Mod1   { <META> };

-

-    key <SUPR> {	[ NoSymbol, Super_L	]	};

-    modifier_map Mod4   { <SUPR> };

-

-    key <HYPR> {	[ NoSymbol, Hyper_L	]	};

-    modifier_map Mod4   { <HYPR> };

-    // end modifier mappings

-

-};

+// symbols definition for a Macintosh "Extended" keyboard
+
+xkb_symbols "extended" {
+
+    name[Group1]= "USA";
+    key <ESC>  {	[ Escape			]	};
+
+    // Alphanumeric section
+    key <TLDE> {	[ quoteleft,	asciitilde	]	};
+    key <AE01> {	[	  1,	exclam 		]	};
+    key <AE02> {	[	  2,	at		]	};
+    key <AE03> {	[	  3,	numbersign	]	};
+    key <AE04> {	[	  4,	dollar		]	};
+    key <AE05> {	[	  5,	percent		]	};
+    key <AE06> {	[	  6,	asciicircum	]	};
+    key <AE07> {	[	  7,	ampersand	]	};
+    key <AE08> {	[	  8,	asterisk	]	};
+    key <AE09> {	[	  9,	parenleft	]	};
+    key <AE10> {	[	  0,	parenright	]	};
+    key <AE11> {	[     minus,	underscore	]	};
+    key <AE12> {	[     equal,	plus		]	};
+
+    key <AD01> {	[	  q,	Q 		]	};
+    key <AD02> {	[	  w,	W		]	};
+    key <AD03> {	[	  e,	E		]	};
+    key <AD04> {	[	  r,	R		]	};
+    key <AD05> {	[	  t,	T		]	};
+    key <AD06> {	[	  y,	Y		]	};
+    key <AD07> {	[	  u,	U		]	};
+    key <AD08> {	[	  i,	I		]	};
+    key <AD09> {	[	  o,	O		]	};
+    key <AD10> {	[	  p,	P		]	};
+    key <AD11> {	[ bracketleft,	braceleft	]	};
+    key <AD12> {	[ bracketright,	braceright	]	};
+    key <BKSL> {	[ backslash,	bar		]	};
+
+    key <AC01> {	[	  a,	A 		]	};
+    key <AC02> {	[	  s,	S		]	};
+    key <AC03> {	[	  d,	D		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G		]	};
+    key <AC06> {	[	  h,	H		]	};
+    key <AC07> {	[	  j,	J		]	};
+    key <AC08> {	[	  k,	K		]	};
+    key <AC09> {	[	  l,	L		]	};
+    key <AC10> {	[ semicolon,	colon		]	};
+    key <AC11> {	[ quoteright,	quotedbl	]	};
+
+    key <AB01> {	[	  z,	Z 		]	};
+    key <AB02> {	[	  x,	X		]	};
+    key <AB03> {	[	  c,	C		]	};
+    key <AB04> {	[	  v,	V		]	};
+    key <AB05> {	[	  b,	B		]	};
+    key <AB06> {	[	  n,	N		]	};
+    key <AB07> {	[	  m,	M		]	};
+    key <AB08> {	[     comma,	less		]	};
+    key <AB09> {	[    period,	greater		]	};
+    key <AB10> {	[     slash,	question	]	};
+
+    key <SPCE> {	[  space			]	};
+    // End alphanumeric section
+
+
+    include "eurosign(e)"
+    include "keypad"
+
+    key <KPEQ> {	[  equal				]	};
+};
+
+hidden
+xkb_symbols "oldmac" {
+
+    include "macintosh_vndr/us(extended)"
+
+    // Begin "Function" section
+    key <FK01> {	[  F1		]	};
+    key <FK02> {	[  F2		]	};
+    key <FK03> {	[  F3		]	};
+    key <FK04> {	[  F4		]	};
+    key <FK05> {	[  F5		]	};
+    key <FK06> {	[  F6		]	};
+    key <FK07> {	[  F7		]	};
+    key <FK08> {	[  F8		]	};
+    key <FK09> {	[  F9		]	};
+    key <FK10> {	[  F10		]	};
+    key <FK11> {	[  F11		]	};
+    key <FK12> {	[  F12		]	};
+    key <FK13> {	[  Print	]	};
+    key <FK14> {	[  Scroll_Lock	]	};
+    key <FK15> {	[  Pause	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key  <INS> {	[  Insert	]	};
+    key <HOME> {	[  Home		]	};
+    key <PGUP> {	[  Prior	]	};
+    key <DELE> {	[  Delete	]	};
+    key  <END> {	[  End		]	};
+    key <PGDN> {	[  Next		]	};
+
+    key   <UP> {	[  Up		]	};
+    key <LEFT> {	[  Left		]	};
+    key <DOWN> {	[  Down		]	};
+    key <RGHT> {	[  Right	]	};
+    // End "Editing" section
+
+    key <BKSP> {	[ BackSpace			]	};
+    key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
+    key <RTRN> {	[ Return	]	};
+    key <CAPS> {	[ Caps_Lock	]	};
+    key <NMLK> {	[ Num_Lock, Pointer_EnableKeys		]	};
+
+    // Begin "Modifier" section
+    key <LFSH> {	[  Shift_L	]	};
+    key <RTSH> {	[  Shift_R	]	};
+    key <LCTL> {	[  Control_L	]	};
+    key <RCTL> {	[  Control_R	]	};
+    key <LALT> {	[  Alt_L, Meta_L ]	};
+    key <RALT> {	[  Alt_R, Meta_R ]	};
+    key <LWIN> {	[  Super_L	]	};
+    key <RWIN> {	[  Super_R	]	};
+    // End "Modifier" section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L, Control_R };
+    modifier_map Mod2   { Num_Lock };
+
+    //  Fake keys for virtual<->real modifiers mapping 
+    key <LVL3> {	[ ISO_Level3_Shift	]	};
+    key <MDSW> {	[ Mode_switch 		]	};
+    modifier_map Mod5   { <LVL3>, <MDSW> };
+
+    key <ALT>  {	[ NoSymbol, Alt_L	]	};
+    modifier_map Mod1   { <ALT>, <LALT> };
+
+    key <META> {	[ NoSymbol, Meta_L	]	};
+    modifier_map Mod1   { <META> };
+
+    key <SUPR> {	[ NoSymbol, Super_L	]	};
+    modifier_map Mod4   { <SUPR> };
+
+    key <HYPR> {	[ NoSymbol, Hyper_L	]	};
+    modifier_map Mod4   { <HYPR> };
+    // end modifier mappings
+
+};