Browse Source

ok - this makes xfree86 to start compile (build still running)

+ seperation of the twm config changes out of startwm.patch into an own patch


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1233 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Rene Rebe 21 years ago
parent
commit
b9396b57d9
3 changed files with 143 additions and 147 deletions
  1. +0
    -0
      package/x11/xfree86/macintosh-xkb-us-de-tweak.patch-x
  2. +2
    -147
      package/x11/xfree86/startwm.patch
  3. +141
    -0
      package/x11/xfree86/twm-defaults.patch

package/x11/xfree86/macintosh-xkb-us-de-tweak.patch → package/x11/xfree86/macintosh-xkb-us-de-tweak.patch-x


+ 2
- 147
package/x11/xfree86/startwm.patch

@ -20,153 +20,8 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./programs/twm/system.twmrc.orig Fri Jan 21 19:41:50 2000
+++ ./programs/twm/system.twmrc Thu Dec 28 15:23:15 2000
@@ -12,6 +12,8 @@
# $XFree86: xc/programs/twm/system.twmrc,v 1.3 2000/01/21 18:41:50 dawes Exp $
#
+NoDefaults
+
NoGrabServer
RestartPreviousState
DecorateTransients
@@ -21,23 +23,26 @@
IconFont "-adobe-helvetica-bold-r-normal--*-100-*-*-*-*-*-*"
IconManagerFont "-adobe-helvetica-bold-r-normal--*-100-*-*-*"
#ClientBorderWidth
+RandomPlacement
+AutoRelativeResize
+IconifyByUnmapping
Color
{
- BorderColor "slategrey"
- DefaultBackground "rgb:2/a/9"
- DefaultForeground "gray85"
- TitleBackground "rgb:2/a/9"
- TitleForeground "gray85"
- MenuBackground "rgb:2/a/9"
- MenuForeground "gray85"
- MenuTitleBackground "gray70"
- MenuTitleForeground "rgb:2/a/9"
- IconBackground "rgb:2/a/9"
- IconForeground "gray85"
- IconBorderColor "gray85"
- IconManagerBackground "rgb:2/a/9"
- IconManagerForeground "gray85"
+ BorderColor "slategrey"
+ DefaultBackground "rgb:2/a/9"
+ DefaultForeground "gray85"
+ TitleBackground "rgb:2/a/9"
+ TitleForeground "gray85"
+ MenuBackground "rgb:2/a/9"
+ MenuForeground "gray85"
+ MenuTitleBackground "gray70"
+ MenuTitleForeground "rgb:2/a/9"
+ IconBackground "rgb:2/a/9"
+ IconForeground "gray85"
+ IconBorderColor "gray85"
+ IconManagerBackground "rgb:2/a/9"
+ IconManagerForeground "gray85"
}
#
@@ -46,48 +51,65 @@
MoveDelta 3
Function "move-or-lower" { f.move f.deltastop f.lower }
Function "move-or-raise" { f.move f.deltastop f.raise }
-Function "move-or-iconify" { f.move f.deltastop f.iconify }
+Function "xiconify" { f.iconify f.showiconmgr }
#
# Set some useful bindings. Sort of uwm-ish, sort of simple-button-ish
#
-Button1 = : root : f.menu "defops"
-Button1 = m : window|icon : f.function "move-or-lower"
-Button2 = m : window|icon : f.iconify
-Button3 = m : window|icon : f.function "move-or-raise"
+LeftTitleButton "opendotMask" = f.function "xiconify"
+RightTitleButton "star" = f.delete
+
+Button1 = : root : f.menu "defops"
+Button2 = : root : f.menu "apps"
+Button3 = : root : f.exec "xterm &"
Button1 = : title : f.function "move-or-raise"
-Button2 = : title : f.raiselower
+Button2 = : title : f.fullzoom
+Button3 = : title : f.function "move-or-lower"
-Button1 = : icon : f.function "move-or-iconify"
-Button2 = : icon : f.iconify
+Button1 = : icon : f.function "xiconify"
+Button3 = : icon : f.identify
+
+Button1 = : iconmgr : f.function "xiconify"
+Button2 = : iconmgr : f.raise
+Button3 = : iconmgr : f.identify
+
+Button1 = : frame : f.resize
+Button2 = : frame : f.raiselower
+Button3 = : frame : f.function "move-or-raise"
-Button1 = : iconmgr : f.iconify
-Button2 = : iconmgr : f.iconify
#
# And a menus with the usual things
#
menu "defops"
{
-"Twm" f.title
-"Iconify" f.iconify
-"Resize" f.resize
-"Move" f.move
-"Raise" f.raise
-"Lower" f.lower
-"" f.nop
-"Focus" f.focus
-"Unfocus" f.unfocus
-"Show Iconmgr" f.showiconmgr
-"Hide Iconmgr" f.hideiconmgr
-"" f.nop
-"Xterm" f.exec "exec xterm &"
-"" f.nop
-"Kill" f.destroy
-"Delete" f.delete
-"" f.nop
-"Restart" f.restart
-"Exit" f.quit
+ "TWM" f.title
+ "Iconify" f.iconify
+ "Resize" f.resize
+ "Move" f.move
+ "Raise" f.raise
+ "Lower" f.lower
+ "Zoom" f.fullzoom
+ "" f.nop
+ "Focus" f.focus
+ "Unfocus" f.unfocus
+ "Show Iconmgr" f.showiconmgr
+ "Hide Iconmgr" f.hideiconmgr
+ "" f.nop
+ "Kill" f.destroy
+ "Delete" f.delete
+ "" f.nop
+ "Restart" f.restart
+ "Exit" f.quit
+}
+
+menu "apps"
+{
+ "Applications" f.title
+ "xTerm" f.exec "xterm &"
+ "xTerm (black)" f.exec "xterm -fg white -bg black &"
+ "Mozilla" f.exec "mozilla &"
+ "Icon Manager" f.showiconmgr
}
More flexible root application startup. Kind of ROCK Linux specific.
--- ./programs/xdm/config/Xsession.orig Sun Jan 11 04:48:32 1998
+++ ./programs/xdm/config/Xsession Thu Dec 28 15:23:15 2000
@@ -33,5 +33,11 @@

+ 141
- 0
package/x11/xfree86/twm-defaults.patch

@ -0,0 +1,141 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/x11/xfree86/startwm.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
Some twm configs Clifford likes more ...
--- xc/programs/twm/system.twmrc.orig 2003-08-28 02:06:28.000000000 +0200
+++ xc/programs/twm/system.twmrc 2003-08-28 02:36:46.000000000 +0200
@@ -12,6 +12,8 @@
# $XFree86: xc/programs/twm/system.twmrc,v 1.5 2003/08/04 10:32:30 eich Exp $
#
+NoDefaults
+
NoGrabServer
RestartPreviousState
DecorateTransients
@@ -21,6 +23,9 @@
IconFont "-adobe-helvetica-bold-r-normal--*-100-*-*-*-*-*-*"
IconManagerFont "-adobe-helvetica-bold-r-normal--*-100-*-*-*"
#ClientBorderWidth
+RandomPlacement
+AutoRelativeResize
+IconifyByUnmapping
Color
{
@@ -47,48 +52,65 @@
MoveDelta 3
Function "move-or-lower" { f.move f.deltastop f.lower }
Function "move-or-raise" { f.move f.deltastop f.raise }
-Function "move-or-iconify" { f.move f.deltastop f.iconify }
+Function "xiconify" { f.iconify f.showiconmgr }
#
# Set some useful bindings. Sort of uwm-ish, sort of simple-button-ish
#
-Button1 = : root : f.menu "defops"
-Button1 = m : window|icon : f.function "move-or-lower"
-Button2 = m : window|icon : f.iconify
-Button3 = m : window|icon : f.function "move-or-raise"
+LeftTitleButton "opendotMask" = f.function "xiconify"
+RightTitleButton "star" = f.delete
+
+Button1 = : root : f.menu "defops"
+Button2 = : root : f.menu "apps"
+Button3 = : root : f.exec "xterm &"
Button1 = : title : f.function "move-or-raise"
-Button2 = : title : f.raiselower
+Button2 = : title : f.fullzoom
+Button3 = : title : f.function "move-or-lower"
-Button1 = : icon : f.function "move-or-iconify"
-Button2 = : icon : f.iconify
+Button1 = : icon : f.function "xiconify"
+Button3 = : icon : f.identify
+
+Button1 = : iconmgr : f.function "xiconify"
+Button2 = : iconmgr : f.raise
+Button3 = : iconmgr : f.identify
+
+Button1 = : frame : f.resize
+Button2 = : frame : f.raiselower
+Button3 = : frame : f.function "move-or-raise"
-Button1 = : iconmgr : f.iconify
-Button2 = : iconmgr : f.iconify
#
# And a menus with the usual things
#
menu "defops"
{
-"Twm" f.title
-"Iconify" f.iconify
-"Resize" f.resize
-"Move" f.move
-"Raise" f.raise
-"Lower" f.lower
-"" f.nop
-"Focus" f.focus
-"Unfocus" f.unfocus
-"Show Iconmgr" f.showiconmgr
-"Hide Iconmgr" f.hideiconmgr
-"" f.nop
-"Xterm" f.exec "exec xterm &"
-"" f.nop
-"Kill" f.destroy
-"Delete" f.delete
-"" f.nop
-"Restart" f.restart
-"Exit" f.quit
+ "TWM" f.title
+ "Iconify" f.iconify
+ "Resize" f.resize
+ "Move" f.move
+ "Raise" f.raise
+ "Lower" f.lower
+ "Zoom" f.fullzoom
+ "" f.nop
+ "Focus" f.focus
+ "Unfocus" f.unfocus
+ "Show Iconmgr" f.showiconmgr
+ "Hide Iconmgr" f.hideiconmgr
+ "" f.nop
+ "Kill" f.destroy
+ "Delete" f.delete
+ "" f.nop
+ "Restart" f.restart
+ "Exit" f.quit
+}
+
+menu "apps"
+{
+ "Applications" f.title
+ "xTerm" f.exec "xterm &"
+ "xTerm (black)" f.exec "xterm -fg white -bg black &"
+ "Mozilla" f.exec "mozilla &"
+ "Icon Manager" f.showiconmgr
}

Loading…
Cancel
Save