April 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67844 - in /trunk/x11: package/yast2-x11.changes src/config/Makefile.am src/config/winoptions src/tools/testX.c
by aschnell＠svn2.opensuse.org 02 Apr '12

02 Apr '12

Author: aschnell Date: Mon Apr 2 12:40:16 2012 New Revision: 67844 URL: http://svn.opensuse.org/viewcvs/yast?rev=67844&view=rev Log: - added icewm config to keep Firefox window on top (bnc#749184) Added: trunk/x11/src/config/winoptions Modified: trunk/x11/package/yast2-x11.changes trunk/x11/src/config/Makefile.am trunk/x11/src/tools/testX.c Modified: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?re… ============================================================================== --- trunk/x11/package/yast2-x11.changes (original) +++ trunk/x11/package/yast2-x11.changes Mon Apr 2 12:40:16 2012 @@ -1,6 +1,12 @@ ------------------------------------------------------------------- +Mon Apr 02 12:33:52 CEST 2012 - aschnell(a)suse.de + +- added icewm config to keep Firefox window on top (bnc#749184) + +------------------------------------------------------------------- Mon Apr 02 11:40:42 CEST 2012 - aschnell(a)suse.de - created package with testX binary from sax2-tools and window-manager config from yast2-installation +- 2.22.0 Modified: trunk/x11/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/config/Makefile.am?rev=6… ============================================================================== --- trunk/x11/src/config/Makefile.am (original) +++ trunk/x11/src/config/Makefile.am Mon Apr 2 12:40:16 2012 @@ -2,9 +2,12 @@ # Makefile.am for x11/src/config # -icewmdir= /etc/icewm +icewmdir = /etc/icewm icewm_DATA = preferences.yast2 -EXTRA_DIST = $(icewm_DATA) +icewmprivdir = /etc/icewm/yast2 +icewmpriv_DATA = winoptions + +EXTRA_DIST = $(icewm_DATA) $(icewmpriv_DATA) include $(top_srcdir)/Makefile.am.common Added: trunk/x11/src/config/winoptions URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/config/winoptions?rev=67… ============================================================================== --- trunk/x11/src/config/winoptions (added) +++ trunk/x11/src/config/winoptions Mon Apr 2 12:40:16 2012 @@ -0,0 +1 @@ +Toplevel.Mozilla.layer: OnTop Modified: trunk/x11/src/tools/testX.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/tools/testX.c?rev=67844&… ============================================================================== --- trunk/x11/src/tools/testX.c (original) +++ trunk/x11/src/tools/testX.c Mon Apr 2 12:40:16 2012 @@ -5,14 +5,14 @@ : BELONGS TO : Configuration tool X11 version 4.x : YaST2 inst-sys tools - : + : DESCRIPTION : Checks if the X server is ok and sets the root : window's color. Forks a child that creates an - : invisible X client. The child exits when the - : X server exits. + : invisible X client. The child exits when the + : X server exits. : : Exit code: 0: X server ok, 1: no X server. - : + : STATUS : Status: Up-to-date **************/ @@ -29,19 +29,17 @@ //====================================== // Defines //-------------------------------------- -#define TWM "twm" -#define MWM "mwm" -#define FVWM "fvwm2" #define ICEWM "icewm" +#define FVWM "fvwm2" +#define MWM "mwm" +#define TWM "twm" -#define FVWMRC "fvwmrc.yast2" #define ICEWMPREFS "preferences.yast2" +#define FVWMRC "fvwmrc.yast2" //====================================== // Globals //-------------------------------------- -char *fore_color = NULL; -char *back_color = NULL; int screen; //====================================== @@ -51,17 +49,17 @@ XColor NameToXColor(Display* dpy, const char* name, unsigned long pixel); int RunWindowManager(void); -int main(int argc, char **argv) +int main(int argc, char** argv) { Cursor cursor; Display *display; Window root; unsigned long pixel; - char *cname; + char* cname; XColor color; Atom prop; Pixmap save_pixmap = (Pixmap)None; - + //============================================ // open display and check if we got a display //-------------------------------------------- @@ -81,7 +79,7 @@ screen = DefaultScreen(display); root = RootWindow(display, screen); pixel = BlackPixel(display, screen); - + if (XParseColor(display, DefaultColormap(display, screen), cname, &color)) { if (XAllocColor(display, DefaultColormap(display, screen), &color)) { pixel = color.pixel; @@ -89,7 +87,7 @@ } XSetWindowBackground(display, root, pixel); XClearWindow(display, root); - + //============================================ // set watch cursor //-------------------------------------------- @@ -98,12 +96,12 @@ XDefineCursor(display, root, cursor); XFreeCursor(display, cursor); } - + //============================================ // run the windowmanager (FVWM) //-------------------------------------------- RunWindowManager(); - + //============================================ // save background as pixmap //-------------------------------------------- @@ -112,7 +110,7 @@ XChangeProperty(display, root, prop, XA_PIXMAP, 32, PropModeReplace, (unsigned char*) &save_pixmap, 1); XSetCloseDownMode(display, RetainPermanent); - + //============================================ // close display and exit //-------------------------------------------- @@ -128,7 +126,9 @@ XColor fg, bg; int i; Font fid; - + char* fore_color = NULL; + char* back_color = NULL; + fg = NameToXColor(dpy, fore_color, BlackPixel(dpy, screen)); bg = NameToXColor(dpy, back_color, WhitePixel(dpy, screen)); @@ -147,7 +147,7 @@ XColor NameToXColor(Display* dpy, const char* name, unsigned long pixel) { XColor c; - + if (!name || !*name) { c.pixel = pixel; XQueryColor(dpy, DefaultColormap(dpy, screen), &c); @@ -170,6 +170,7 @@ return 0; break; case 0: + setenv("ICEWM_PRIVCFG", "/etc/icewm/yast2", 1); execlp(ICEWM, "icewm", "-c", ICEWMPREFS, "-t", "yast2", NULL); execlp(FVWM, "fvwm2", "-f", FVWMRC, NULL); execlp(MWM, "mwm", NULL); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67843 - in /trunk/x11: ./ package/ src/ src/config/ src/tools/
by aschnell＠svn2.opensuse.org 02 Apr '12

02 Apr '12

Author: aschnell Date: Mon Apr 2 12:27:34 2012 New Revision: 67843 URL: http://svn.opensuse.org/viewcvs/yast?rev=67843&view=rev Log: - updated ignores Modified: trunk/x11/ (props changed) trunk/x11/package/ (props changed) trunk/x11/src/ (props changed) trunk/x11/src/config/ (props changed) trunk/x11/src/tools/ (props changed) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67842 - in /trunk/x11: ./ package/ src/ src/config/ src/tools/
by aschnell＠svn2.opensuse.org 02 Apr '12

02 Apr '12

Author: aschnell Date: Mon Apr 2 12:22:27 2012 New Revision: 67842 URL: http://svn.opensuse.org/viewcvs/yast?rev=67842&view=rev Log: - created package with testX binary from sax2-tools and window-manager config from yast2-installation Added: trunk/x11/ trunk/x11/MAINTAINER trunk/x11/Makefile.am trunk/x11/Makefile.cvs trunk/x11/RPMNAME trunk/x11/VERSION trunk/x11/configure.in.in trunk/x11/package/ trunk/x11/package/yast2-x11.changes trunk/x11/src/ trunk/x11/src/Makefile.am trunk/x11/src/config/ trunk/x11/src/config/Makefile.am trunk/x11/src/config/fvwmrc.yast2 trunk/x11/src/config/preferences.yast2 trunk/x11/src/tools/ trunk/x11/src/tools/Makefile.am trunk/x11/src/tools/testX.c trunk/x11/yast2-x11.spec.in Added: trunk/x11/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/MAINTAINER?rev=67842&view=au… ============================================================================== --- trunk/x11/MAINTAINER (added) +++ trunk/x11/MAINTAINER Mon Apr 2 12:22:27 2012 @@ -0,0 +1 @@ +Arvin Schnell <aschnell(a)suse.de> Added: trunk/x11/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/Makefile.am?rev=67842&view=a… ============================================================================== --- trunk/x11/Makefile.am (added) +++ trunk/x11/Makefile.am Mon Apr 2 12:22:27 2012 @@ -0,0 +1,201 @@ +# Emacs: -*- makefile -*- +# +# Toplevel Makefile.am for a YaST2 subproject +# +# -- This file is generated by y2automake - DO NOT EDIT! -- +# (Edit ./SUBDIRS instead) +# + +#where devtools are +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool + +VERSION = $(shell cat $(srcdir)/VERSION) +RPMNAME = $(shell cat $(srcdir)/RPMNAME) +SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) +ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) + +HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) + +# do we do Makefile.am for devtools? It is a little special... +IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) + +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) +LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) + +COPYRIGHT_files_gpl = README COPYING + +COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ + COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish + +extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) + +# less strict; prefer bzip2 +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip +# where devtools install m4 snippets +# argh, executed literally +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal + +Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common + cmp -s $< $@ || cp -f $< $@ + +# create bzip2ed tar and make some sanity checks +$(RPMNAME)-$(VERSION).tar.bz2: checkpo dist-bzip2 + @if [ `bunzip2 -c $(RPMNAME)-$(VERSION).tar.bz2 | wc --bytes` = 0 ] ; then \ + echo "Error: created tar is empty" ; \ + exit 1 ; \ + fi + +CLEANFILES = +MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec + +POT_DST = $(shell find -type d -name testsuite -prune , \ + -type f -name "*.pot") + +EXTRA_DIST = \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ + $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) + +show-extra-dist: + @echo $(EXTRA_DIST) + +# info '(automake)Conditionals' +if CREATE_PKGCONFIG +# create the file here instead of by configure +# because the prerequisite is made here (not anymore!) +# and we don't want any paths in y2autoconf +# info '(autoconf)config.status Invocation' +$(RPMNAME).pc: $(RPMNAME).pc.in config.status + ./config.status --file=$@:$< + +if CREATE_PKGCONFIG_NOARCH +pkgconfigdata_DATA = $(RPMNAME).pc +else +pkgconfig_DATA = $(RPMNAME).pc +endif + +EXTRA_DIST += $(RPMNAME).pc.in +endif + +dist-hook: + @for I in $(extra_COPYRIGHT_files) ; \ + do \ + EX="" ; \ + if test -f $(srcdir)/$$I ; then \ + EX=$(srcdir)/$$I ; \ + elif test -f $(LEGALESE_DIR)/$$I ; then \ + EX=$(LEGALESE_DIR)/$$I ; \ + else \ + echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ + exit 1 ; \ + fi ; \ + echo "cp $$EX $(distdir)" ; \ + cp $$EX "$(distdir)" ; \ + done + +pot: + $(Y2TOOL) y2makepot -s $(srcdir) + +install-pot: pot + @POT_DST=`find -type d -name testsuite -prune , \ + -type f -name "*.pot"` ; \ + if [ -n "$$POT_DST" ] ; then \ + echo "mkdir -p $(DESTDIR)$(potdir)" ; \ + mkdir -p $(DESTDIR)$(potdir) ; \ + list="$$POT_DST"; \ + for I in $$list ; \ + do \ + echo $$I ; \ + if [ "$$I" == "pot" ] ; then \ + continue ; \ + fi ; \ + echo "$(INSTALL_DATA) $$I $(DESTDIR)$(potdir)" ; \ + $(INSTALL_DATA) $$I $(DESTDIR)$(potdir) ; \ + done ; \ + fi + +spellcheck: pot + $(Y2TOOL) pot-spellcheck + +# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) + +install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) + mkdir -p $(DESTDIR)$(docdir) + @for I in $(extra_COPYRIGHT_files) ; \ + do \ + EX="" ; \ + if test -f $(srcdir)/$$I ; then \ + EX=$(srcdir)/$$I ; \ + elif test -f $(LEGALESE_DIR)/$$I ; then \ + EX=$(LEGALESE_DIR)/$$I ; \ + else \ + echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ + exit 1 ; \ + fi ; \ + echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ + $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ + done + +package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 + rm -f package/$(RPMNAME)-*.tar.bz2 + rm -f package/*~ + rm -f package/*.bak + rm -f package/*.auto + mv $(RPMNAME)-$(VERSION).tar.bz2 package/ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ + echo "You have to install yast2-devtools to making a package"; \ + false; \ + fi + here=`pwd`; \ + cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + done + +package: check-up-to-date check-tagversion check-textdomain package-local + +TAGVERSION = $(Y2TOOL) tagversion + +check-up-to-date check-cvs-up-to-date check-svn-up-to-date: + if [ -d $(srcdir)/CVS ]; then \ + cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ + else \ + cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ + fi + +check-tagversion: + @if [ -d $(srcdir)/CVS ]; then \ + cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ + else \ + cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ + fi >/dev/null; \ + [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) + +check-parse-old: + @if [ `find -type f -name "*.ycp" | wc -l` -gt 0 -a "$(RPMNAME)" != "yast2-core" ] ; then \ + echo "Running parseycp..." ; \ + parseycp -q -R ; \ + else \ + echo "Not running parseycp." ; \ + fi + +check-parse: + @echo "Not running parseycp." + +check-textdomain: + $(Y2TOOL) check-textdomain $(srcdir) + +stable: checkin-stable + +checkin-stable: package + $(Y2TOOL) checkin-stable + + +# For po/ modules +checkpo: + test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo +# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox +# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am +SUBDIRS = src Added: trunk/x11/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/Makefile.cvs?rev=67842&view=… ============================================================================== --- trunk/x11/Makefile.cvs (added) +++ trunk/x11/Makefile.cvs Mon Apr 2 12:22:27 2012 @@ -0,0 +1,23 @@ +# +# Makefile.cvs +# + +LIB = $(shell y2tool get-lib) + +PREFIX = /usr + +configure: all + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) + +all: + y2tool y2autoconf + y2tool y2automake + autoreconf --force --install -v + +install: configure + make + make install + +reconf: all + ./config.status --recheck + ./config.status Added: trunk/x11/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/RPMNAME?rev=67842&view=auto ============================================================================== --- trunk/x11/RPMNAME (added) +++ trunk/x11/RPMNAME Mon Apr 2 12:22:27 2012 @@ -0,0 +1 @@ +yast2-x11 Added: trunk/x11/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/VERSION?rev=67842&view=auto ============================================================================== --- trunk/x11/VERSION (added) +++ trunk/x11/VERSION Mon Apr 2 12:22:27 2012 @@ -0,0 +1 @@ +2.22.0 Added: trunk/x11/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/configure.in.in?rev=67842&vi… ============================================================================== --- trunk/x11/configure.in.in (added) +++ trunk/x11/configure.in.in Mon Apr 2 12:22:27 2012 @@ -0,0 +1,12 @@ +## configure.in.in for yast2-x11 + +## Initialize +@YAST2-INIT-COMMON@ +@YAST2-INIT-PROGRAM@ + +## some common checks +@YAST2-CHECKS-COMMON@ +@YAST2-CHECKS-PROGRAM@ + +## and generate the output... +@YAST2-OUTPUT@ Added: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?re… ============================================================================== --- trunk/x11/package/yast2-x11.changes (added) +++ trunk/x11/package/yast2-x11.changes Mon Apr 2 12:22:27 2012 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Mon Apr 02 11:40:42 CEST 2012 - aschnell(a)suse.de + +- created package with testX binary from sax2-tools and + window-manager config from yast2-installation + Added: trunk/x11/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/Makefile.am?rev=67842&vi… ============================================================================== --- trunk/x11/src/Makefile.am (added) +++ trunk/x11/src/Makefile.am Mon Apr 2 12:22:27 2012 @@ -0,0 +1,5 @@ +# +# Makefile.am for x11/src +# + +SUBDIRS = config tools Added: trunk/x11/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/config/Makefile.am?rev=6… ============================================================================== --- trunk/x11/src/config/Makefile.am (added) +++ trunk/x11/src/config/Makefile.am Mon Apr 2 12:22:27 2012 @@ -0,0 +1,10 @@ +# +# Makefile.am for x11/src/config +# + +icewmdir= /etc/icewm +icewm_DATA = preferences.yast2 + +EXTRA_DIST = $(icewm_DATA) + +include $(top_srcdir)/Makefile.am.common Added: trunk/x11/src/config/fvwmrc.yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/config/fvwmrc.yast2?rev=… ============================================================================== --- trunk/x11/src/config/fvwmrc.yast2 (added) +++ trunk/x11/src/config/fvwmrc.yast2 Mon Apr 2 12:22:27 2012 @@ -0,0 +1,77 @@ +# -*- coding: utf-8 -*- +# +#============================= +# Colorset dark/dark +#----------------------------- +# *FvwmTheme: Colorset 20 fg black, bg black +# ModuleSynchronous Timeout 5 FvwmTheme + +#============================= +# Globals +#----------------------------- +EdgeResistance 250 10 +EdgeScroll 100 100 +ClickTime 750 +DeskTopSize 1x1 +ColormapFocus FollowsMouse +OpaqueMoveSize unlimited + +#============================= +# Menu Style +#----------------------------- +HideGeometryWindow +MenuStyle * Foreground black, Background grey80 + +#============================= +# Default Style +#----------------------------- +DefaultFont "StringEncoding=UTF-8:xft:sans-serif:encoding=iso10646-1:size=13;-gnu-unifont-medium-r-normal--16-160-75-75-c-80-*-*,-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-*-*,*" + +#============================= +# Global Styles +#----------------------------- +Style * BorderWidth 3, HandleWidth 3 +Style * MWMFunctions +Style * MWMDecor, HintOverride +Style * DecorateTransient, NoPPosition +Style * ClickToFocus +Style * TileCascadePlacement +Style * ResizeOpaque +Style * MWMBorder +Style * HilightFore white, HilightBack black +Style * ForeColor black, BackColor white +Style * BorderColorset 0 +Style * HilightBorderColorset 0 + +#============================= +# Title Style +#----------------------------- +TitleStyle ActiveUp (solid #4e6f9f -- Flat) +TitleStyle ActiveDown (solid #4e6f9f -- Flat) +TitleStyle Inactive (solid #c3c3c3 -- Flat) + +#============================= +# Mouse Bindings +#----------------------------- +Mouse 1 R A WindowList +Mouse 2 R A WindowList +Mouse 3 R A WindowList +Mouse 4 R A WindowList +Mouse 5 R A WindowList +Mouse 1 F A Resize-or-Raise +Mouse 1 TS A Move-or-Raise +Mouse 1 I A Move-or-Iconify + +#============================= +# Functions +#----------------------------- +AddToFunc Move-or-Raise I Raise ++ M Move + +AddToFunc Move-or-Iconify I Raise ++ M Move + +AddToFunc Resize-or-Raise I Raise ++ M Resize + +AddToFunc InitFunction I Module FvwmCommandS Added: trunk/x11/src/config/preferences.yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/config/preferences.yast2… ============================================================================== --- trunk/x11/src/config/preferences.yast2 (added) +++ trunk/x11/src/config/preferences.yast2 Mon Apr 2 12:22:27 2012 @@ -0,0 +1,117 @@ +# IceWM configuration file for use during installation + +# Hide taskbar +ShowTaskBar=0 + +# Hide titlebar buttons and window menu +TitleButtonsLeft="" +TitleButtonsRight="" +WinMenuItems="" + +# Enable Alt+Tab +QuickSwitch=1 +KeySysSwitchNext="Alt+Tab" +KeySysSwitchLast="Alt+Shift+Tab" + +# Disable Windows key +Win95Keys=0 + +# Colors +ColorActiveTitleBar="rgb:4e/6f/9f" +ColorNormalTitleBar="rgb:c3/c3/c3" + +# Borders +BorderSizeX=3 +BorderSizeY=3 +DlgBorderSizeX=3 +DlgBorderSizeY=3 + +# Disable most shortcuts +# :r !grep -o '\<Key[^=]*' /etc/icewm/preferences | grep -v Switch | sed 's/$/=""/' +KeyWinRaise="" +KeyWinOccupyAll="" +KeyWinLower="" +KeyWinClose="" +KeyWinRestore="" +KeyWinPrev="" +KeyWinNext="" +KeyWinMove="" +KeyWinSize="" +KeyWinMinimize="" +KeyWinMaximize="" +KeyWinMaximizeVert="" +KeyWinMaximizeHoriz="" +KeyWinFullscreen="" +KeyWinHide="" +KeyWinRollup="" +KeyWinMenu="" +KeyWinArrangeN="" +KeyWinArrangeNE="" +KeyWinArrangeE="" +KeyWinArrangeSE="" +KeyWinArrangeS="" +KeyWinArrangeSW="" +KeyWinArrangeW="" +KeyWinArrangeNW="" +KeyWinArrangeC="" +KeySysWinNext="" +KeySysWinPrev="" +KeySysWinMenu="" +KeySysDialog="" +KeySysMenu="" +KeySysWindowList="" +KeySysWinListMenu="" +KeySysAddressBar="" +KeySysWorkspacePrev="" +KeySysWorkspaceNext="" +KeySysWorkspaceLast="" +KeySysWorkspacePrevTakeWin="" +KeySysWorkspaceNextTakeWin="" +KeySysWorkspaceLastTakeWin="" +KeySysWorkspace1="" +KeySysWorkspace2="" +KeySysWorkspace3="" +KeySysWorkspace4="" +KeySysWorkspace5="" +KeySysWorkspace6="" +KeySysWorkspace7="" +KeySysWorkspace8="" +KeySysWorkspace9="" +KeySysWorkspace10="" +KeySysWorkspace11="" +KeySysWorkspace12="" +KeySysWorkspace1TakeWin="" +KeySysWorkspace2TakeWin="" +KeySysWorkspace3TakeWin="" +KeySysWorkspace4TakeWin="" +KeySysWorkspace5TakeWin="" +KeySysWorkspace6TakeWin="" +KeySysWorkspace7TakeWin="" +KeySysWorkspace8TakeWin="" +KeySysWorkspace9TakeWin="" +KeySysWorkspace10TakeWin="" +KeySysWorkspace11TakeWin="" +KeySysWorkspace12TakeWin="" +KeySysTileVertical="" +KeySysTileHorizontal="" +KeySysCascade="" +KeySysArrange="" +KeySysArrangeIcons="" +KeySysMinimizeAll="" +KeySysHideAll="" +KeySysUndoArrange="" +KeySysShowDesktop="" +KeySysCollapseTaskBar="" + +# Disable root window menus +# :r !grep -o '\<Desktop[^=]*Button=' /etc/icewm/preferences | sed 's/$/0/' +DesktopWinMenuButton=0 +DesktopWinListButton=0 +DesktopMenuButton=0 + +# Disable maximize and rollup +TitleBarMaximizeButton=0 +TitleBarRollupButton=0 + +# Disable possibility to move the base window, BNC 466827 +ClientWindowMouseActions=0 Added: trunk/x11/src/tools/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/tools/Makefile.am?rev=67… ============================================================================== --- trunk/x11/src/tools/Makefile.am (added) +++ trunk/x11/src/tools/Makefile.am Mon Apr 2 12:22:27 2012 @@ -0,0 +1,11 @@ +# +# Makefile.am for x11/src/tools +# + +ybin_PROGRAMS = testX + +testX_SOURCES = \ + testX.c + +testX_LDFLAGS = \ + -L/usr/X11R6/lib -L/usr/X11R6/lib64 -lX11 -lXmu Added: trunk/x11/src/tools/testX.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/tools/testX.c?rev=67842&… ============================================================================== --- trunk/x11/src/tools/testX.c (added) +++ trunk/x11/src/tools/testX.c Mon Apr 2 12:22:27 2012 @@ -0,0 +1,184 @@ +/************** +FILE : testX.c +*************** +PROJECT : SaX ( SuSE advanced X configuration ) + : +BELONGS TO : Configuration tool X11 version 4.x + : YaST2 inst-sys tools + : +DESCRIPTION : Checks if the X server is ok and sets the root + : window's color. Forks a child that creates an + : invisible X client. The child exits when the + : X server exits. + : + : Exit code: 0: X server ok, 1: no X server. + : +STATUS : Status: Up-to-date +**************/ + +#include <stdio.h> +#include <unistd.h> +#include <stdlib.h> +#include <string.h> +#include <X11/Xlib.h> +#include <X11/Xatom.h> +#include <X11/Xmu/CurUtil.h> +#include <sys/types.h> +#include <sys/wait.h> + +//====================================== +// Defines +//-------------------------------------- +#define TWM "twm" +#define MWM "mwm" +#define FVWM "fvwm2" +#define ICEWM "icewm" + +#define FVWMRC "fvwmrc.yast2" +#define ICEWMPREFS "preferences.yast2" + +//====================================== +// Globals +//-------------------------------------- +char *fore_color = NULL; +char *back_color = NULL; +int screen; + +//====================================== +// Functions +//-------------------------------------- +Cursor CreateCursorFromName(Display* dpy, const char* name); +XColor NameToXColor(Display* dpy, const char* name, unsigned long pixel); +int RunWindowManager(void); + +int main(int argc, char **argv) +{ + Cursor cursor; + Display *display; + Window root; + unsigned long pixel; + char *cname; + XColor color; + Atom prop; + Pixmap save_pixmap = (Pixmap)None; + + //============================================ + // open display and check if we got a display + //-------------------------------------------- + display = XOpenDisplay(NULL); + if (!display) { + exit (1); + } + if ((argc == 2) && (strcmp(argv[1], "--fast") == 0)) { + XCloseDisplay(display); + exit (0); + } + + //============================================ + // install color map for background pixels + //-------------------------------------------- + cname = argc == 2 ? argv[1] : "black"; + screen = DefaultScreen(display); + root = RootWindow(display, screen); + pixel = BlackPixel(display, screen); + + if (XParseColor(display, DefaultColormap(display, screen), cname, &color)) { + if (XAllocColor(display, DefaultColormap(display, screen), &color)) { + pixel = color.pixel; + } + } + XSetWindowBackground(display, root, pixel); + XClearWindow(display, root); + + //============================================ + // set watch cursor + //-------------------------------------------- + cursor = CreateCursorFromName(display, "top_left_arrow"); + if (cursor) { + XDefineCursor(display, root, cursor); + XFreeCursor(display, cursor); + } + + //============================================ + // run the windowmanager (FVWM) + //-------------------------------------------- + RunWindowManager(); + + //============================================ + // save background as pixmap + //-------------------------------------------- + save_pixmap = XCreatePixmap(display, root, 1, 1, 1); + prop = XInternAtom(display, "_XSETROOT_ID", False); + XChangeProperty(display, root, prop, XA_PIXMAP, 32, PropModeReplace, + (unsigned char*) &save_pixmap, 1); + XSetCloseDownMode(display, RetainPermanent); + + //============================================ + // close display and exit + //-------------------------------------------- + XCloseDisplay(display); + exit (0); +} + +//========================================= +// CreateCursorFromName +//----------------------------------------- +Cursor CreateCursorFromName(Display* dpy, const char* name) +{ + XColor fg, bg; + int i; + Font fid; + + fg = NameToXColor(dpy, fore_color, BlackPixel(dpy, screen)); + bg = NameToXColor(dpy, back_color, WhitePixel(dpy, screen)); + + i = XmuCursorNameToIndex(name); + if (i == -1) + return (Cursor) 0; + fid = XLoadFont (dpy, "cursor"); + if (!fid) + return (Cursor) 0; + return XCreateGlyphCursor(dpy, fid, fid, i, i+1, &fg, &bg); +} + +//========================================= +// NameToXColor +//----------------------------------------- +XColor NameToXColor(Display* dpy, const char* name, unsigned long pixel) +{ + XColor c; + + if (!name || !*name) { + c.pixel = pixel; + XQueryColor(dpy, DefaultColormap(dpy, screen), &c); + } else if (!XParseColor(dpy, DefaultColormap(dpy, screen), name, &c)) { + fprintf(stderr, "testX: unknown color or bad color format: %s\n", name); + exit(1); + } + return c; +} + +//========================================= +// RunWindowManager +//----------------------------------------- +int RunWindowManager(void) +{ + int wmpid = fork(); + switch (wmpid) + { + case -1: + return 0; + break; + case 0: + execlp(ICEWM, "icewm", "-c", ICEWMPREFS, "-t", "yast2", NULL); + execlp(FVWM, "fvwm2", "-f", FVWMRC, NULL); + execlp(MWM, "mwm", NULL); + execlp(TWM, "twm", NULL); + fprintf(stderr, "testX: could not run any windowmanager"); + return 0; + break; + default: + waitpid(wmpid, NULL, WNOHANG | WUNTRACED); + } + return 1; +} Added: trunk/x11/yast2-x11.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/yast2-x11.spec.in?rev=67842&… ============================================================================== --- trunk/x11/yast2-x11.spec.in (added) +++ trunk/x11/yast2-x11.spec.in Mon Apr 2 12:22:27 2012 @@ -0,0 +1,29 @@ +@HEADER-COMMENT@ + +@HEADER@ +Group: System/YaST +License: GPL-2.0, GPL-2.0+ +BuildRequires: autoconf automake libtool xorg-x11-libX11-devel xorg-x11-libXmu-devel +BuildRequires: yast2-devtools +Summary: YaST2 - X11 support + +%description +This package contains the programs and files for YaST2 X11 support. + +@PREP@ + +@BUILD@ + +@INSTALL@ + +@CLEAN@ + +%files +%defattr(-,root,root) + +@ybindir@/testX +/etc/icewm + +%doc %dir @docdir@ +%doc @docdir@/README* +%doc @docdir@/COPY* -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67841 - /tags/stable-2_22_5/security/
by jsuchome＠svn2.opensuse.org 02 Apr '12

02 Apr '12

Author: jsuchome Date: Mon Apr 2 10:45:15 2012 New Revision: 67841 URL: http://svn.opensuse.org/viewcvs/yast?rev=67841&view=rev Log: Created tag stable-2_22_5 for security Added: tags/stable-2_22_5/security/ - copied from r67840, trunk/security/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67840 - in /trunk/security: VERSION package/yast2-security.changes testsuite/tests/Level2.ycp
by jsuchome＠svn2.opensuse.org 02 Apr '12

02 Apr '12

Author: jsuchome Date: Mon Apr 2 10:44:56 2012 New Revision: 67840 URL: http://svn.opensuse.org/viewcvs/yast?rev=67840&view=rev Log: - testsuite: explicitely set the output of target.stat - 2.22.5 Modified: trunk/security/VERSION trunk/security/package/yast2-security.changes trunk/security/testsuite/tests/Level2.ycp Modified: trunk/security/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/VERSION?rev=67840&r1=67… ============================================================================== --- trunk/security/VERSION (original) +++ trunk/security/VERSION Mon Apr 2 10:44:56 2012 @@ -1 +1 @@ -2.22.4 +2.22.5 Modified: trunk/security/package/yast2-security.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/package/yast2-security.… ============================================================================== --- trunk/security/package/yast2-security.changes (original) +++ trunk/security/package/yast2-security.changes Mon Apr 2 10:44:56 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Apr 2 10:27:53 CEST 2012 - jsuchome(a)suse.cz + +- testsuite: explicitely set the output of target.stat +- 2.22.5 + +------------------------------------------------------------------- Thu Mar 29 15:59:20 CEST 2012 - jsuchome(a)suse.cz - merge proofread texts Modified: trunk/security/testsuite/tests/Level2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Level2.… ============================================================================== --- trunk/security/testsuite/tests/Level2.ycp (original) +++ trunk/security/testsuite/tests/Level2.ycp Mon Apr 2 10:44:56 2012 @@ -29,7 +29,11 @@ "displaymanager" : $[ "DISPLAYMANAGER" : "", ] - ] + ], + "target" : $[ + // FileUtils::Exists returns false: + "stat" : $[] + ], ]; Security::Settings = Levels["Level2"]:$[]; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0