added a regex to be used when the system is missing one, use noinst instead of pkglib...

[lyx.git] / src / lyxdraw.C

diff --git a/src/lyxdraw.C b/src/lyxdraw.C
index 326d8edd00e25d8e5b95414f57127e63f72dea7a..ae05fe64475e4bfd0d4cd64b664cc8176e549807 100644 (file)
--- a/src/lyxdraw.C
+++ b/src/lyxdraw.C
@@ -63,12 +63,13 @@ bool setForegroundColor(char const * const color, XGCValues & val)
        if (!mono_video) {
                if (XParseColor(fl_display, color_map, color, &xcol)
                    && XAllocColor(fl_display, color_map, &xcol))
-               {
-                       val.foreground = xcol.pixel;
-               } else {
-                       lyxerr << "LyX: Couldn't get color " << color << endl;
-                       return false;
-               }
+                       {
+                               val.foreground = xcol.pixel;
+                       } else {
+                               lyxerr << "LyX: Couldn't get color "
+                                      << color << endl;
+                               return false;
+                       }
        }
        return true;
 }
@@ -79,14 +80,14 @@ void do_reverse_video(XGCValues &val)
 {
        if (reverse_video) {
                val.foreground= WhitePixel(fl_display,
-                                         DefaultScreen(fl_display));
+                                          DefaultScreen(fl_display));
                val.background= BlackPixel(fl_display,
-                                         DefaultScreen(fl_display));
+                                          DefaultScreen(fl_display));
        } else {
                val.foreground= BlackPixel(fl_display,
-                                         DefaultScreen(fl_display));
+                                          DefaultScreen(fl_display));
                val.background= WhitePixel(fl_display,
-                                         DefaultScreen(fl_display));
+                                          DefaultScreen(fl_display));
        }
 }
 
@@ -145,17 +146,22 @@ GC GetLatexGC()
 
        XGCValues val;
        if (reverse_video ^ mono_video) {
-               val.foreground= WhitePixel(fl_display, DefaultScreen(fl_display));
-               val.background= BlackPixel(fl_display, DefaultScreen(fl_display));
+               val.foreground= WhitePixel(fl_display,
+                                          DefaultScreen(fl_display));
+               val.background= BlackPixel(fl_display,
+                                          DefaultScreen(fl_display));
        } else {
-               val.foreground= BlackPixel(fl_display, DefaultScreen(fl_display));
-               val.background= WhitePixel(fl_display, DefaultScreen(fl_display));
+               val.foreground= BlackPixel(fl_display,
+                                          DefaultScreen(fl_display));
+               val.background= WhitePixel(fl_display,
+                                          DefaultScreen(fl_display));
        }
        val.function= GXcopy;
        val.graphics_exposures = false;
        setForegroundColor(latex_color, val);
        latex_gc = XCreateGC(fl_display, fl_root, GCBackground 
-                            | GCForeground | GCFunction | GCGraphicsExposures, 
+                            | GCForeground | GCFunction
+                            | GCGraphicsExposures, 
                             &val);
        XFlush(fl_display);
        
@@ -216,16 +222,16 @@ GC GetClearGC()
 
        if (reverse_video) {
                val.foreground= BlackPixel(fl_display,
-                                         DefaultScreen(fl_display));
+                                          DefaultScreen(fl_display));
                val.background= WhitePixel(fl_display,
-                                         DefaultScreen(fl_display));
+                                          DefaultScreen(fl_display));
        } else {
                val.background= BlackPixel(fl_display,
-                                         DefaultScreen(fl_display));
+                                          DefaultScreen(fl_display));
                val.foreground= WhitePixel(fl_display,
-                                         DefaultScreen(fl_display));
+                                          DefaultScreen(fl_display));
        }
-       val.function= GXcopy;
+       val.function = GXcopy;
        val.graphics_exposures = false;
        if (!fast_selection && background_color != "white") {
                setForegroundColor(background_color.c_str(), val);
@@ -233,7 +239,8 @@ GC GetClearGC()
        background_pixels = val.foreground;
        
        clear_gc = XCreateGC(fl_display, fl_root, GCBackground 
-                            | GCForeground | GCFunction | GCGraphicsExposures, 
+                            | GCForeground | GCFunction
+                            | GCGraphicsExposures, 
                             &val);
        XFlush(fl_display);
        
@@ -276,7 +283,8 @@ GC GetThickLineGC()
        val.line_width = 2;
        val.line_style = LineSolid;
        thick_line_gc = XCreateGC(fl_display, fl_root, GCBackground 
-                                 | GCForeground | GCFunction | GCGraphicsExposures
+                                 | GCForeground | GCFunction
+                                 | GCGraphicsExposures
                                  | GCLineWidth | GCLineStyle , &val);
        XFlush(fl_display);
        
@@ -339,7 +347,7 @@ GC GetSelectGC()
        val.function= GXinvert;
        select_gc = XCreateGC(fl_display, fl_root,
                              GCFunction | GCGraphicsExposures | GCPlaneMask
-                                     | GCLineWidth | GCLineStyle , &val);
+                             | GCLineWidth | GCLineStyle , &val);
        XFlush(fl_display);
 
        return select_gc; 
@@ -355,14 +363,14 @@ GC GetSelectionGC()
 
        if (!reverse_video) {
                val.foreground= BlackPixel(fl_display,
-                                         DefaultScreen(fl_display));
+                                          DefaultScreen(fl_display));
                val.background= WhitePixel(fl_display,
-                                         DefaultScreen(fl_display));
+                                          DefaultScreen(fl_display));
        } else {
                val.background= BlackPixel(fl_display,
-                                         DefaultScreen(fl_display));
+                                          DefaultScreen(fl_display));
                val.foreground= WhitePixel(fl_display,
-                                         DefaultScreen(fl_display));
+                                          DefaultScreen(fl_display));
        }
        
        val.function= GXcopy;
@@ -389,9 +397,11 @@ GC GetLightedGC()
        if (lighted_gc) return lighted_gc;
        XGCValues val;
        if (reverse_video) {
-               val.background= BlackPixel(fl_display, DefaultScreen(fl_display));
+               val.background= BlackPixel(fl_display,
+                                          DefaultScreen(fl_display));
        } else {
-               val.background= WhitePixel(fl_display, DefaultScreen(fl_display));
+               val.background= WhitePixel(fl_display,
+                                          DefaultScreen(fl_display));
        }
        val.foreground= val.background;
        val.function= GXcopy;
@@ -400,7 +410,8 @@ GC GetLightedGC()
        val.line_width = 0;
        setForegroundColor(lighted_color, val);
        lighted_gc = XCreateGC(fl_display, fl_root, GCBackground
-                              | GCForeground | GCFunction | GCGraphicsExposures
+                              | GCForeground | GCFunction
+                              | GCGraphicsExposures
                               | GCLineWidth | GCLineStyle , &val);
        XFlush(fl_display);
 
@@ -432,7 +443,7 @@ GC GetColorGC(LyXFont::FONT_COLOR color)
 
 GC GetAccentGC(LyXFont const &f, int line_width)
 {
-       if (line_width>= 10) line_width = 9;
+       if (line_width >= 10) line_width = 9;
        
        if (accent_gc[line_width]) return accent_gc[line_width];