X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxdraw.C;h=ae05fe64475e4bfd0d4cd64b664cc8176e549807;hb=617cfbe80f7dca3cab8de7b13f076393b465e11a;hp=77cf269def896afa9293a252ca7a8579138261b2;hpb=35584afc1162dec2cf9fff79305e95cb3b75aefb;p=lyx.git

diff --git a/src/lyxdraw.C b/src/lyxdraw.C
index 77cf269def..ae05fe6447 100644
--- a/src/lyxdraw.C
+++ b/src/lyxdraw.C
@@ -24,7 +24,7 @@ Colormap color_map = 0;
 long int background_pixels;
 
 // X11 color names
-char const * const X11Color[11] =
+char const * const X11Color[11] = 
 { "black", "black", "white", "red", "green", "blue", "cyan", "magenta", 
   "yellow", "black", "black" };
  
@@ -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;
 }
@@ -78,15 +79,15 @@ static
 void do_reverse_video(XGCValues &val)
 {
 	if (reverse_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));
 	}
 }
 
@@ -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.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);
 	
@@ -215,17 +221,17 @@ GC GetClearGC()
 	XGCValues val;
 
 	if (reverse_video) {
-		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));
 	} else {
-		val.background=BlackPixel(fl_display,
-					  DefaultScreen(fl_display));
-		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.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);
 	
@@ -249,7 +256,7 @@ GC GetOnOffLineGC()
 	XGCValues val;
 	do_reverse_video(val);
 
-	val.function=GXcopy;
+	val.function= GXcopy;
 	val.graphics_exposures = false;
 	setForegroundColor(on_off_line_color, val);
 	val.line_width = 0;
@@ -271,12 +278,13 @@ GC GetThickLineGC()
 	XGCValues val;
 	do_reverse_video(val);
 
-	val.function=GXcopy;
+	val.function= GXcopy;
 	val.graphics_exposures = false;
 	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);
 	
@@ -291,11 +299,11 @@ GC GetThinOnOffLineGC()
 	XGCValues val;
 	do_reverse_video(val);
 
-	val.function=GXcopy;
+	val.function= GXcopy;
 	val.graphics_exposures = false;
 	val.line_style = LineOnOffDash;
 	val.line_width = 0;
-	thin_on_off_line_gc =
+	thin_on_off_line_gc = 
 		XCreateGC(fl_display, fl_root, GCBackground
 			  | GCForeground | GCFunction | GCGraphicsExposures
 			  | GCLineWidth | GCLineStyle , &val);
@@ -312,7 +320,7 @@ GC GetCopyGC()
 	XGCValues val;
 	do_reverse_video(val);
 
-	val.function=GXcopy;
+	val.function= GXcopy;
 	val.graphics_exposures = false;
 	val.line_style = LineSolid;
 	val.line_width = 0;
@@ -336,10 +344,10 @@ GC GetSelectGC()
 	val.line_style = LineSolid;
 	val.line_width = 2;
 	val.graphics_exposures = false;
-	val.function=GXinvert;
+	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; 
@@ -354,18 +362,18 @@ GC GetSelectionGC()
 	XGCValues val;
 
 	if (!reverse_video) {
-		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));
 	} else {
-		val.background=BlackPixel(fl_display,
-					  DefaultScreen(fl_display));
-		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.function=GXcopy;
+	val.function= GXcopy;
 	val.graphics_exposures = false;
 	if (!fast_selection && selection_color[0] != 0) {
 		if (!setForegroundColor(selection_color, val)) {
@@ -389,18 +397,21 @@ 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;
+	val.foreground= val.background;
+	val.function= GXcopy;
 	val.graphics_exposures = false;
 	val.line_style = LineSolid;
 	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);
 
@@ -415,7 +426,7 @@ GC GetColorGC(LyXFont::FONT_COLOR color)
 	XGCValues val;
 	do_reverse_video(val);
 
-	val.function=GXcopy;
+	val.function= GXcopy;
 	val.graphics_exposures = false;
 	setForegroundColor(X11Color[color], val);
 	val.line_width = 0;
@@ -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];
 	
@@ -466,7 +477,7 @@ GC GetMinipageGC()
         XGCValues val;
 	do_reverse_video(val);
 
-        val.function=GXcopy;
+        val.function= GXcopy;
         val.graphics_exposures = false;
         val.line_style = LineOnOffDash;
         val.line_width = 0;