X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fscreen.C;h=1688ccaa2574bdb00434504b00a675e2846619cc;hb=f448e22d483e1370bcbfbb7be8cb47ad7251ed77;hp=2e29133e4330aacd32b40988ea3cb43dd33e35c0;hpb=bd659b25fb6e2df5d02273ee1ce4699aa5723e2e;p=lyx.git

diff --git a/src/screen.C b/src/screen.C
index 2e29133e43..1688ccaa25 100644
--- a/src/screen.C
+++ b/src/screen.C
@@ -24,6 +24,7 @@
 #include "buffer.h"
 #include "font.h"
 #include "insets/insettext.h"
+#include "ColorHandler.h"
 
 using std::max;
 using std::min;
@@ -32,22 +33,22 @@ static
 GC createGC()
 {
 	XGCValues val;
-	val.foreground = BlackPixel(fl_display, 
-				    DefaultScreen(fl_display));
+	val.foreground = BlackPixel(fl_get_display(), 
+				    DefaultScreen(fl_get_display()));
 	
-	val.function=GXcopy;
+	val.function = GXcopy;
 	val.graphics_exposures = false;
 	val.line_style = LineSolid;
 	val.line_width = 0;
-	return XCreateGC(fl_display, RootWindow(fl_display, 0), 
+	return XCreateGC(fl_get_display(), RootWindow(fl_get_display(), 0), 
 			 GCForeground | GCFunction | GCGraphicsExposures
 			 | GCLineWidth | GCLineStyle , &val);
 }
 
 
 // Constructor
-LyXScreen::LyXScreen(WorkArea & o) //, LyXText * text_ptr)
-	: owner(o), force_clear(true) //, text(text_ptr)
+LyXScreen::LyXScreen(WorkArea & o)
+	: owner(o), force_clear(true)
 {
 	// the cursor isnt yet visible
 	cursor_visible = false;
@@ -62,6 +63,19 @@ LyXScreen::LyXScreen(WorkArea & o) //, LyXText * text_ptr)
 }
 
 
+void LyXScreen::setCursorColor() 
+{
+	if (!lyxColorHandler) return;
+
+	GC gc = lyxColorHandler->getGCForeground(LColor::cursor);
+	
+	XGCValues val;
+	XGetGCValues(fl_get_display(),
+		     gc, GCForeground, &val);
+	XChangeGC(fl_get_display(), gc_copy, GCForeground, &val);
+}
+
+
 void LyXScreen::Redraw(LyXText * text)
 {
 	DrawFromTo(text, 0, owner.height());
@@ -75,7 +89,7 @@ void LyXScreen::Redraw(LyXText * text)
 
 void LyXScreen::expose(int x, int y, int exp_width, int exp_height)
 {
-	XCopyArea(fl_display,
+	XCopyArea(fl_get_display(),
 		  owner.getPixmap(),
 		  owner.getWin(),
 		  gc_copy,
@@ -102,7 +116,7 @@ void LyXScreen::DrawFromTo(LyXText * text,
 		LyXText::text_status st = text->status;
 		do {
 			text->status = st;
-			text->GetVisibleRow(owner.owner(), y+y_offset,
+			text->GetVisibleRow(owner.owner(), y + y_offset,
 					    x_offset, row, y + text->first);
 		} while (text->status == LyXText::CHANGED_IN_DRAW);
 		text->status = st;
@@ -124,11 +138,10 @@ void LyXScreen::DrawFromTo(LyXText * text,
 void LyXScreen::DrawOneRow(LyXText * text, Row * row, int y_text,
 			   int y_offset, int x_offset)
 {
-	int y = y_text - text->first + y_offset;
+	int const y = y_text - text->first + y_offset;
 
-	if (((y+row->height()) > 0) &&
-	    ((y-row->height()) <= (int)owner.height()))
-	{
+	if (((y + row->height()) > 0) &&
+	    ((y - row->height()) <= static_cast<int>(owner.height()))) {
 		// ok there is something visible
 		LyXText::text_status st = text->status;
 		do {
@@ -148,7 +161,7 @@ void LyXScreen::Draw(LyXText * text, unsigned int y)
 {
 	if (cursor_visible) HideCursor();
 
-	unsigned int old_first = text->first;
+	int const old_first = text->first;
 	text->first = y;
 
 	// is any optimiziation possible?
@@ -156,7 +169,7 @@ void LyXScreen::Draw(LyXText * text, unsigned int y)
 	    && (old_first - y) < owner.height()) {
 		if (text->first < old_first) {
 			DrawFromTo(text, 0, old_first - text->first);
-			XCopyArea (fl_display,
+			XCopyArea (fl_get_display(),
 				   owner.getWin(),
 				   owner.getWin(),
 				   gc_copy,
@@ -175,7 +188,7 @@ void LyXScreen::Draw(LyXText * text, unsigned int y)
 			DrawFromTo(text,
 				   owner.height() + old_first - text->first,
 				   owner.height());
-			XCopyArea (fl_display,
+			XCopyArea (fl_get_display(),
 				   owner.getWin(),
 				   owner.getWin(),
 				   gc_copy,
@@ -221,16 +234,16 @@ bool LyXScreen::FitManualCursor(LyXText * text,
 {
 	int newtop = text->first;
   
-	if (y + desc - text->first >= owner.height())
+	if (y + desc - text->first >= static_cast<int>(owner.height()))
 		newtop = y - 3 * owner.height() / 4;  // the scroll region must be so big!!
-	else if (y - asc < (int)text->first
+	else if (y - asc < static_cast<int>(text->first)
 		&& text->first > 0) {
 		newtop = y - owner.height() / 4;
 	}
 
 	newtop = max(newtop, 0); // can newtop ever be < 0? (Lgb)
   
-	if (newtop != (int)text->first) {
+	if (newtop != static_cast<int>(text->first)) {
 		Draw(text, newtop);
 		text->first = newtop;
 		return true;
@@ -242,24 +255,26 @@ bool LyXScreen::FitManualCursor(LyXText * text,
 void LyXScreen::ShowManualCursor(LyXText const * text, int x, int y,
 				 int asc, int desc, Cursor_Shape shape)
 {
-	unsigned int y1 = max(y - text->first - asc, 0U);
-	typedef unsigned int uint;
+	// Update the cursor color.
+	setCursorColor();
 	
-	unsigned int y2 = min(y - text->first + desc, owner.height());
+	int const y1 = max(y - text->first - asc, 0);
+	int const y_tmp = min(y - text->first + desc,
+			      static_cast<int>(owner.height()));
 
 	// Secure against very strange situations
-	y2 = max(y2, y1);
+	int const y2 = max(y_tmp, y1);
 	
 	if (cursor_pixmap){
-		XFreePixmap(fl_display, cursor_pixmap);
+		XFreePixmap(fl_get_display(), cursor_pixmap);
 		cursor_pixmap = 0;
 	}
 
-	if (y2 > 0 && y1 < owner.height()) {
+	if (y2 > 0 && y1 < int(owner.height())) {
 		cursor_pixmap_h = y2 - y1 + 1;
 		cursor_pixmap_y = y1;
 
-		switch(shape) {
+		switch (shape) {
 		case BAR_SHAPE:
 			cursor_pixmap_w = 1;
 			cursor_pixmap_x = x;
@@ -275,12 +290,12 @@ void LyXScreen::ShowManualCursor(LyXText const * text, int x, int y,
 		}
 
 		cursor_pixmap = 
-			XCreatePixmap (fl_display,
+			XCreatePixmap (fl_get_display(),
 				       fl_root,
 				       cursor_pixmap_w,
 				       cursor_pixmap_h,
 				       fl_get_visual_depth());
-		XCopyArea (fl_display,
+		XCopyArea (fl_get_display(),
 			   owner.getWin(),
 			   cursor_pixmap,
 			   gc_copy,
@@ -289,20 +304,20 @@ void LyXScreen::ShowManualCursor(LyXText const * text, int x, int y,
 			   cursor_pixmap_w,
 			   cursor_pixmap_h,
 			   0, 0);
-		XDrawLine(fl_display,
+		XDrawLine(fl_get_display(),
 			  owner.getWin(),
 			  gc_copy,
 			  x + owner.xpos(),
 			  y1 + owner.ypos(),
 			  x + owner.xpos(),
 			  y2 + owner.ypos());
-		switch(shape) {
+		switch (shape) {
 		case BAR_SHAPE:
 			break;
 		case L_SHAPE:
 		case REVERSED_L_SHAPE:
-			int rectangle_h = (cursor_pixmap_h+10)/20;
-			XFillRectangle(fl_display,
+			int const rectangle_h = (cursor_pixmap_h + 10) / 20;
+			XFillRectangle(fl_get_display(),
 				       owner.getWin(),
 				       gc_copy,
 				       cursor_pixmap_x + owner.xpos(),
@@ -321,7 +336,7 @@ void LyXScreen::HideCursor()
 	if (!cursor_visible) return;
 
 	if (cursor_pixmap){
-		XCopyArea (fl_display, 
+		XCopyArea (fl_get_display(), 
 			   cursor_pixmap,
 			   owner.getWin(),
 			   gc_copy,
@@ -360,8 +375,9 @@ unsigned int LyXScreen::TopCursorVisible(LyXText const * text)
 		else
 			newtop = text->cursor.y()
 				- 3 * owner.height() / 4;   /* the scroll region must be so big!! */
-	} else if (text->cursor.y() - text->cursor.row()->baseline() < text->first
-		   && text->first > 0) {
+	} else if (static_cast<int>((text->cursor.y()) - text->cursor.row()->baseline()) <
+		   text->first && text->first > 0)
+	{
 		if (text->cursor.row()->height() < owner.height()
 		    && text->cursor.row()->height() > owner.height() / 4)
 			newtop = text->cursor.y() - text->cursor.row()->baseline();
@@ -382,8 +398,8 @@ unsigned int LyXScreen::TopCursorVisible(LyXText const * text)
 bool LyXScreen::FitCursor(LyXText * text)
 {
 	// Is a change necessary?
-	unsigned int newtop = TopCursorVisible(text);
-	bool result = (newtop != text->first);
+	int const newtop = TopCursorVisible(text);
+	bool const result = (newtop != text->first);
 	if (result)
 		Draw(text, newtop);
 	return result;
@@ -392,23 +408,14 @@ bool LyXScreen::FitCursor(LyXText * text)
    
 void LyXScreen::Update(LyXText * text, int y_offset, int x_offset)
 {
-	switch(text->status) {
+	switch (text->status) {
 	case LyXText::NEED_MORE_REFRESH:
 	{
-		int y = max(int(text->refresh_y - text->first), 0);
-		int height;
-		if (text->inset_owner)
-			height = text->inset_owner->ascent(owner.owner(),
-							   text->real_current_font)
-				+ text->inset_owner->descent(owner.owner(),
-							     text->real_current_font);
-		else
-			height = owner.height();
+		int const y = max(int(text->refresh_y - text->first), 0);
 		DrawFromTo(text, y, owner.height(), y_offset, x_offset);
 		text->refresh_y = 0;
 		text->status = LyXText::UNCHANGED;
-		expose(0, y,
-		       owner.workWidth(), owner.height() - y);
+		expose(0, y, owner.workWidth(), owner.height() - y);
 	}
 	break;
 	case LyXText::NEED_VERY_LITTLE_REFRESH:
@@ -435,13 +442,17 @@ void LyXScreen::ToggleSelection(LyXText * text,  bool kill_selection,
 	// only if there is a selection
 	if (!text->selection) return;
 
-	int bottom = min(max(text->sel_end_cursor.y()
-			      - text->sel_end_cursor.row()->baseline()
-			      + text->sel_end_cursor.row()->height(), text->first),
-			  text->first + owner.height());
-	int top = min(max(text->sel_start_cursor.y()
-			   - text->sel_start_cursor.row()->baseline(), text->first),
-		       text->first + owner.height());
+	int const bottom = min(
+		max(static_cast<int>(text->sel_end_cursor.y()
+				     - text->sel_end_cursor.row()->baseline()
+				     + text->sel_end_cursor.row()->height()),
+		    text->first),
+		static_cast<int>(text->first + owner.height()));
+	int const top = min(
+		max(static_cast<int>(text->sel_start_cursor.y() -
+				     text->sel_start_cursor.row()->baseline()),
+		    text->first),
+		static_cast<int>(text->first + owner.height()));
 
 	if (kill_selection)
 		text->selection = 0;
@@ -459,16 +470,16 @@ void LyXScreen::ToggleToggle(LyXText * text, int y_offset, int x_offset)
 	    && text->toggle_cursor.pos() == text->toggle_end_cursor.pos())
 		return;
 	
-	int top = text->toggle_cursor.y()
+	int const top_tmp = text->toggle_cursor.y()
 		- text->toggle_cursor.row()->baseline();
-	int bottom = text->toggle_end_cursor.y()
+	int const bottom_tmp = text->toggle_end_cursor.y()
 		- text->toggle_end_cursor.row()->baseline() 
 		+ text->toggle_end_cursor.row()->height();
 	
-	typedef unsigned int uint;
-	
-	bottom = min(max(uint(bottom), text->first), text->first + owner.height());
-	top = min(max(uint(top), text->first), text->first + owner.height());
+	int const bottom = min(max(bottom_tmp, text->first),
+		     static_cast<int>(text->first + owner.height()));
+	int const top = min(max(top_tmp, text->first),
+		  static_cast<int>(text->first + owner.height()));
 
 	DrawFromTo(text, top - text->first, bottom - text->first, y_offset,
 		   x_offset);