More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / ColorHandler.C

diff --git a/src/ColorHandler.C b/src/ColorHandler.C
index 578bc335be4f9a903851322c48c91f42f09ca4f1..43ec7f4606d403c71b866520133f08cbd3c9aa69 100644 (file)
--- a/src/ColorHandler.C
+++ b/src/ColorHandler.C
@@ -20,13 +20,14 @@
 #include "debug.h"
 
 #include "ColorHandler.h"
+#include "LColor.h"
 #include "gettext.h"
 
 using std::endl;
 
 LyXColorHandler::LyXColorHandler() 
 {
-       display = fl_display;
+       display = fl_get_display();
        drawable = XCreatePixmap(display, fl_root, 10, 10,
                                 fl_get_visual_depth());
        
@@ -105,7 +106,7 @@ GC LyXColorHandler::getGCForeground(LColor::color c)
 
                XColor * cmap = new XColor[vi->map_entries];
 
-               for(int i = 0; i < vi->map_entries; ++i) {
+               for (int i = 0; i < vi->map_entries; ++i) {
                        cmap[i].pixel = i;
                }
                XQueryColors(display, colormap, cmap, vi->map_entries);
@@ -114,7 +115,7 @@ GC LyXColorHandler::getGCForeground(LColor::color c)
                int closest_pixel = 0;
                double closest_distance = 1e20; // we want to minimize this
                double distance = 0;
-               for(int t = 0; t < vi->map_entries; ++t) {
+               for (int t = 0; t < vi->map_entries; ++t) {
                        // The Euclidean distance between two points in 
                        // a three-dimensional space, the RGB color-cube,
                        // is used as the distance measurement between two
@@ -144,8 +145,9 @@ GC LyXColorHandler::getGCForeground(LColor::color c)
                            "color with (r,g,b)=(") 
                       << cmap[closest_pixel].red << ","
                       << cmap[closest_pixel].green << ","
-                      << cmap[closest_pixel].blue << ") instead.\n"
-                      << "Pixel [" << closest_pixel << "] is used." << endl;
+                      << cmap[closest_pixel].blue << _(") instead.\n")
+                      << _("Pixel [") << closest_pixel << _("] is used.") 
+                      << endl;
                val.foreground = cmap[closest_pixel].pixel;
                delete[] cmap;
        }
@@ -194,5 +196,34 @@ GC LyXColorHandler::getGCLinepars(PainterBase::line_style ls,
                          GCCapStyle | GCJoinStyle | GCFunction, &val);
 }
 
+
+// update GC cache after color redefinition
+void LyXColorHandler::updateColor (LColor::color c)
+{
+       // color GC cache
+       GC gc = colorGCcache[c];
+       if (gc != NULL) {
+               XFreeGC(display, gc);
+               colorGCcache[c] = NULL;
+               getGCForeground(c);
+       }
+
+       // line GC cache
+
+       int index, ls, lw;
+       for (ls=0; ls<3; ++ls)
+               for (lw=0; lw<2; ++lw) {
+                       index = lw + (ls << 1) + (c << 3);
+                       if (lineGCcache.find(index) != lineGCcache.end()) {
+                               gc = lineGCcache[index];
+                               XFreeGC(display,gc);
+                               lineGCcache.erase(index);
+                               getGCLinepars(PainterBase::line_style(ls),
+                                               PainterBase::line_width(lw), c);
+                       }
+               }
+ 
+}
+
 //
 LyXColorHandler * lyxColorHandler;