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?rev=67844&r1=67843&r2=67844&view=diff ============================================================================== --- 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@suse.de + +- added icewm config to keep Firefox window on top (bnc#749184) + +------------------------------------------------------------------- Mon Apr 02 11:40:42 CEST 2012 - aschnell@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=67844&r1=67843&r2=67844&view=diff ============================================================================== --- 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=67844&view=auto ============================================================================== --- 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&r1=67843&r2=67844&view=diff ============================================================================== --- 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@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org