vte r2119 - in trunk: . src

[behdad svn gnome org]

Author: behdad
Date: Tue Oct 14 20:47:50 2008
New Revision: 2119
URL: http://svn.gnome.org/viewvc/vte?rev=2119&view=rev

Log:
2008-10-14  Behdad Esfahbod  <behdad gnome org>

        * src/vte-private.h:
        * src/vte.c (vte_terminal_draw_line), (vte_terminal_paint_cursor):
        Remove VTE_CURSOR_OUTLINE in favor of VTE_LINE_WIDTH.



Modified:
   trunk/ChangeLog
   trunk/src/vte-private.h
   trunk/src/vte.c

Modified: trunk/src/vte-private.h
==============================================================================
--- trunk/src/vte-private.h	(original)
+++ trunk/src/vte-private.h	Tue Oct 14 20:47:50 2008
@@ -52,7 +52,6 @@
 
 G_BEGIN_DECLS
 
-#define VTE_CURSOR_OUTLINE		1
 #define VTE_PAD_WIDTH			1
 #define VTE_TAB_WIDTH			8
 #define VTE_LINE_WIDTH			1

Modified: trunk/src/vte.c
==============================================================================
--- trunk/src/vte.c	(original)
+++ trunk/src/vte.c	Tue Oct 14 20:47:50 2008
@@ -8640,7 +8640,7 @@
 {
 	vte_terminal_fill_rectangle(terminal, entry,
 				    x, y,
-				    MAX(1, xp - x + 1), MAX(1, yp - y + 1));
+				    MAX(VTE_LINE_WIDTH, xp - x + 1), MAX(VTE_LINE_WIDTH, yp - y + 1));
 }
 
 static void
@@ -10386,9 +10386,9 @@
 		case VTE_CURSOR_SHAPE_IBEAM:
 		 	
 			vte_terminal_draw_line(terminal, &terminal->pvt->palette[back],
-					       x - 2,
+					       x - 2*VTE_LINE_WIDTH,
 					       y,
-					       x - 2,
+					       x - 2*VTE_LINE_WIDTH,
 					       y + height - 1);
 			break;
 
@@ -10396,9 +10396,9 @@
 
 			vte_terminal_draw_line(terminal, &terminal->pvt->palette[back],
 					       x,
-					       y + height - 1,
+					       y + height - VTE_LINE_WIDTH,
 					       x + cursor_width - 1,
-					       y + height - 1);
+					       y + height - VTE_LINE_WIDTH);
 			break;
 
 		case VTE_CURSOR_SHAPE_BLOCK:
@@ -10455,10 +10455,10 @@
 				/* draw a box around the character */
 
 				_vte_draw_draw_rectangle(terminal->pvt->draw,
-							 x - VTE_CURSOR_OUTLINE,
-							 y - VTE_CURSOR_OUTLINE,
-							 cursor_width + 2*VTE_CURSOR_OUTLINE,
-							 height + 2*VTE_CURSOR_OUTLINE,
+							 x - VTE_LINE_WIDTH,
+							 y - VTE_LINE_WIDTH,
+							 cursor_width + 2*VTE_LINE_WIDTH,
+							 height + 2*VTE_LINE_WIDTH,
 							 &color,
 							 VTE_DRAW_OPAQUE);
 			}