sys : rework seem fonctionnal (slow) and a correction start selection error

Makefile

@@ -53,9 +53,9 @@ DEBUG:=1
 ###############################################################################
 ### Compilation Define                                                      ###
 ###############################################################################
-ifeq ("$(DEBUG)", "0")
+ifeq ("$(DEBUG)", "0")
     DEFINE= -DEDN_DEBUG_LEVEL=1 -DNDEBUG -DVERSION_TAG_NAME="\"$(VERSION_TAG)-release\""
-else
+else
     DEFINE= -DEDN_DEBUG_LEVEL=3 -DVERSION_TAG_NAME="\"$(VERSION_TAG)-debug\""
 endif
 DEFINE+= -DVERSION_BUILD_TIME="\"$(VERSION_BUILD_TIME)\""
@@ -294,9 +294,11 @@ install: .encadrer .versionFile $(OUTPUT_NAME_RELEASE)
 	wc -l Makefile `find $(FILE_DIRECTORY)/ -name "*.cpp"` `find $(FILE_DIRECTORY)/ -name "*.h"` 
 
 install: .encadrer .versionFile $(OUTPUT_NAME_RELEASE)
+	@echo $(CADRE_HAUT_BAS)
 	@echo '           INSTALL : $(F_VIOLET)$(OUTPUT_NAME_RELEASE)=>$(PROG_NAME)$(F_NORMALE)'$(CADRE_COTERS)
 	@echo $(CADRE_HAUT_BAS)
 	@echo $(F_ROUGE)"
+          (stripped) $(OUTPUT_NAME_RELEASE) => $(PROG_NAME) "$(F_NORMALE)
 	@cp $(OUTPUT_NAME_RELEASE) $(PROG_NAME)
 	@strip -s $(PROG_NAME)
 	@echo $(F_VERT)"

README

@@ -1,21 +0,0 @@
-Edn (Editeur De N'ours) is a FREE software.
-
-This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY.
-
-Terms of license:
-
-You can:
-	- Redistribute the sources code and binaries.
-	- Modify the Sources code.
-	- Use a part of the sources (less than 50%) in an other software, just write somewhere "Edn is great" visible by the user (on your product or on your website with a link to my page).
-	- Redistribute the modification only if you want.
-	- Send me the bug-fix (it could be great).
-	- Pay me a beer or some other things.
-	- Print the source code on WC paper ...
-You can NOT:
-	- Earn money with this Software (But I can).
-	- Add malware in the Sources.
-	- Do something bad with the sources.
-	- Use it to travel in the space with a toaster.
-
-I reserve the right to change this licence. If it change the version of the copy you have keep its own license

README.md

@@ -0,0 +1,41 @@
+Edn
+====
+
+`Edn` (Editeur De N'ours) is a FREE software.
+
+This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY.
+
+Instructions
+============
+
+download the software :
+
+	git clone git://github.com/HeeroYui/edn.git
+	cd edn
+
+Compile software and install :
+
+	sudo make DEBUG=0 install
+
+Run Software :
+
+	edn exemple.txt
+
+License
+=======
+
+	You can:
+		- Redistribute the sources code and binaries.
+		- Modify the Sources code.
+		- Use a part of the sources (less than 50%) in an other software, just write somewhere "Edn is great" visible by the user (on your product or on your website with a link to my page).
+		- Redistribute the modification only if you want.
+		- Send me the bug-fix (it could be great).
+		- Pay me a beer or some other things.
+		- Print the source code on WC paper ...
+	You can NOT:
+		- Earn money with this Software (But I can).
+		- Add malware in the Sources.
+		- Do something bad with the sources.
+		- Use it to travel in the space with a toaster.
+	
+	I reserve the right to change this licence. If it change the version of the copy you have keep its own license

Sources/Buffer/Buffer.cpp

@@ -41,12 +41,28 @@
  */
 Buffer::Buffer()
 {
+	static int32_t bufID = 0;
+	m_uniqueID = bufID++;
 	static int32_t fileBasicID = 0;
 	m_fileModify = true;
 	m_haveName = false;
 	Edn::String mString = "Untitle - ";
 	mString += fileBasicID++;
 	SetFileName(mString);
+	m_haveName = false;
+	// Set basic anchor
+	bufferAnchorReference_ts tmpAnchor;
+	tmpAnchor.m_displaySize.x = 0;
+	tmpAnchor.m_displaySize.y = 0;
+	tmpAnchor.m_displayStart.x = 0;
+	tmpAnchor.m_curent = true;
+	tmpAnchor.m_idAnchor = -1;
+	tmpAnchor.m_lineId = 0;
+	tmpAnchor.m_bufferPos = 0;
+	m_AnchorList.PushBack(tmpAnchor);
+	
+	m_lineWidth = 10;
+	m_lineHeight = 10;
 }
 
 /**
@@ -61,6 +77,16 @@ Buffer::Buffer(Edn::File &newName)
 {
 	m_fileModify = false;
 	SetFileName(newName);
+	// Set basic anchor
+	bufferAnchorReference_ts tmpAnchor;
+	tmpAnchor.m_displaySize.x = 0;
+	tmpAnchor.m_displaySize.y = 0;
+	tmpAnchor.m_displayStart.x = 0;
+	tmpAnchor.m_curent = true;
+	tmpAnchor.m_idAnchor = -1;
+	tmpAnchor.m_lineId = 0;
+	tmpAnchor.m_bufferPos = 0;
+	m_AnchorList .PushBack(tmpAnchor);
 }
 
 /**
@@ -145,11 +171,12 @@ void Buffer::SetLineDisplay(uint32_t lineNumber)
  * @return ---
  *
  */
-int32_t	Buffer::Display(DrawerManager &drawer)
+void Buffer::DrawLine(DrawerManager &drawer, bufferAnchor_ts &anchor)
 {
-	return ERR_NONE;
+	return;
 }
 
+
 /**
  * @brief
  *
@@ -234,7 +261,6 @@ void Buffer::ScrollUp(void)
 	// nothing to do
 }
 
-
 /**
  * @brief
  *
@@ -243,13 +269,6 @@ void Buffer::ScrollUp(void)
  * @return ---
  *
  */
-void Buffer::ForceReDraw(bool allElement)
-{
-	// nothing to do
-}
-
-
-
 void Buffer::cursorMove(int32_t gtkKey)
 {
 	// nothing to do
@@ -347,7 +366,7 @@ void Buffer::Paste(int8_t clipboardID)
 
 void Buffer::RemoveLine(void)
 {
-	// nothing to do
+	// nothing to do;
 }
 
 void Buffer::SelectAll(void)
@@ -370,3 +389,99 @@ void Buffer::Redo(void)
 	// nothing to do
 }
 
+
+void Buffer::AnchorAdd(int32_t anchorID)
+{
+	int32_t localID = AnchorRealId(anchorID);
+	if (localID >=0) {
+		EDN_ERROR("[" << m_uniqueID << "] AnchorID="<< anchorID << " already exist !!!");
+	} else {
+		bufferAnchorReference_ts tmpAnchor = m_AnchorList[0];
+		m_AnchorList[0].m_curent = false;
+		tmpAnchor.m_idAnchor = anchorID;
+		m_AnchorList.PushBack(tmpAnchor);
+		EDN_DEBUG("[" << m_uniqueID << "] AnchorID="<< anchorID << " ==> Added");
+	}
+}
+
+
+void Buffer::AnchorRm(int32_t anchorID)
+{
+	if (anchorID == -1) {
+		EDN_ERROR("[" << m_uniqueID << "] AnchorID="<< anchorID << " Can not remove this one !!!");
+		return;
+	}
+	int32_t localID = AnchorRealId(anchorID);
+	if (localID >=0) {
+		if (m_AnchorList.Size() == 2) {
+			m_AnchorList[0] = m_AnchorList[1];
+		}
+		m_AnchorList.Erase(localID);
+		EDN_DEBUG("[" << m_uniqueID << "] AnchorID="<< anchorID << " ==> Remove");
+	} else {
+		EDN_ERROR("[" << m_uniqueID << "] AnchorID="<< anchorID << " does not exist !!!");
+	}
+}
+
+
+bool Buffer::AnchorGet(int32_t anchorID, bufferAnchor_ts & anchor)
+{
+	EDN_ERROR("[" << m_uniqueID << "] AnchorID="<< anchorID << " Main buffer ==> can not manage Anchor (type buffer specific)");
+	return false;
+}
+
+
+bool Buffer::AnchorNext(bufferAnchor_ts & anchor)
+{
+	EDN_ERROR("[" << m_uniqueID << "] AnchorID=?? Main buffer ==> can not manage Anchor (type buffer specific)");
+	return false;
+}
+
+
+void Buffer::AnchorSetSize(int32_t anchorID, int32_t sizePixelX, int32_t sizePixelY)
+{
+	int32_t localID = AnchorRealId(anchorID);
+	if (localID >=0) {
+		m_AnchorList[localID].m_displaySize.x = sizePixelX / m_lineWidth;
+		m_AnchorList[localID].m_displaySize.y = sizePixelY / m_lineHeight;
+	}
+}
+
+
+void Buffer::AnchorSetStartOffset(int32_t anchorID, int32_t offsetX, int32_t offsetY)
+{
+	int32_t localID = AnchorRealId(anchorID);
+	if (localID >=0) {
+		m_AnchorList[localID].m_displayStart.x += offsetX;
+		if (0<m_AnchorList[localID].m_displayStart.x) {
+			m_AnchorList[localID].m_displayStart.x = 0;
+		}
+		m_AnchorList[localID].m_displayStart.y += offsetY;
+		if (0<m_AnchorList[localID].m_displayStart.y) {
+			m_AnchorList[localID].m_displayStart.y = 0;
+		}
+	}
+}
+
+
+int32_t Buffer::AnchorRealId(int32_t anchorID)
+{
+	//EDN_DEBUG("Get real ID : " << anchorID << " in the anchor list size()=" << m_AnchorList.Size());
+	for(int32_t iii=0; iii < m_AnchorList.Size(); iii++) {
+		//EDN_DEBUG("check if equal : " << m_AnchorList[iii].m_idAnchor << " id=" << iii);
+		if (m_AnchorList[iii].m_idAnchor == anchorID) {
+			return iii;
+		}
+	}
+	return -1;
+}
+
+int32_t Buffer::AnchorCurrentId(void)
+{
+	for(int32_t iii=0; iii < m_AnchorList.Size(); iii++) {
+		if (m_AnchorList[iii].m_curent == true) {
+			return iii;
+		}
+	}
+	return 0;
+}

Sources/Buffer/Buffer.h

@@ -31,15 +31,37 @@
 #include "charset.h"
 #include "Edn.h"
 
-
+extern "C"
-typedef struct{
+{
+	typedef struct{
 		uint32_t nbTotalLine;				//!< Number of line in the buffer
 		uint32_t nbTotalColomn;				//!< Number of line in the buffer
 		uint32_t startLineDisplay;			//!< First line display.
 		uint32_t startColomnDisplay;		//!< First Colomn displayed
 		uint32_t diplayableColomn;			//!< NB colomn that can be displayed
 		uint32_t diplayableLine;			//!< NB Line that can be displayed
-}infoStatBuffer_ts;
+	}infoStatBuffer_ts;
+	
+	typedef struct {
+		int32_t      m_idAnchor;     //!< reference id of the anchor (real id of the upper displayer of CodeView)
+		bool         m_curent;       //!< set at true if the anchor is a reference with the curent display
+		int32_t      m_lineId;       //!< first line ID to display
+		int32_t      m_bufferPos;    //!< position of the first lineId
+		position_ts  m_displayStart; //!< start display position
+		position_ts  m_displaySize;  //!< size of the curent display
+	} bufferAnchorReference_ts;
+	
+	typedef struct {
+		position_ts  m_displayStart;       //!< start display position
+		position_ts  m_displaySize;        //!< size of the curent display
+		int32_t      m_lineNumber;         //!< current line-number id
+		int32_t      m_nbIterationMax;     //!< number of cycle needed to end the dispalay
+		int32_t      m_posStart;           //!< position of the start of the line
+		int32_t      m_posStop;            //!< position of the end of the line
+		int32_t      m_selectionPosStart;  //!< position of the selection start
+		int32_t      m_selectionPosStop;   //!< position of the selection stop
+	} bufferAnchor_ts;
+}
 
 
 class Buffer {
@@ -81,23 +103,25 @@ class Buffer {
 		virtual void      GetInfo(infoStatBuffer_ts &infoToUpdate);
 		virtual void      SetLineDisplay(uint32_t lineNumber);
 		
-		virtual int32_t   Display(DrawerManager &drawer);
+		virtual void      DrawLine(DrawerManager &drawer, bufferAnchor_ts &anchor);
-		virtual void      ForceReDraw(bool allElement);
+		// return the new cursor position ...
 		virtual void      AddChar(char * UTF8data);
 		virtual void      cursorMove(int32_t gtkKey);
 		virtual void      MouseSelectFromCursorTo(int32_t width, int32_t height);
 		virtual void      MouseEvent(int32_t width, int32_t height);
 		virtual void      MouseEventDouble(void);
 		virtual void      MouseEventTriple(void);
-		virtual void      ScrollDown(void);
-		virtual void      ScrollUp(void);
 		virtual void      RemoveLine(void);
 		virtual void      SelectAll(void);
 		virtual void      SelectNone(void);
 		virtual void      Undo(void);
 		virtual void      Redo(void);
+		
 		virtual void      SetCharset(charset_te newCharset) {};
 		
+		virtual void      ScrollDown(void); // must be deprecated
+		virtual void      ScrollUp(void);   // must be deprecated
+
 		//virtual void	SelectAll(void);
 		virtual void      Copy(int8_t clipboardID);
 		virtual void      Cut(int8_t clipboardID);
@@ -113,6 +137,24 @@ class Buffer {
 		// naming
 		Edn::File         m_fileName;             //!< filename of the curent buffer
 		bool              m_haveName;             //!< to know if the file have a name or NOT
+
+	// anchor section
+	public:
+		void              AnchorAdd(int32_t anchorID);
+		void              AnchorRm(int32_t anchorID);
+		virtual bool      AnchorGet(int32_t anchorID, bufferAnchor_ts & anchor);
+		virtual bool      AnchorNext(bufferAnchor_ts & anchor);
+		void              AnchorSetSize(int32_t anchorID, int32_t sizePixelX, int32_t sizePixelY);
+		void              AnchorSetStartOffset(int32_t anchorID, int32_t offsetX, int32_t offsetY);
+		
+	protected:
+		int32_t           m_lineWidth;
+		int32_t           m_lineHeight;
+		int32_t           AnchorRealId(int32_t anchorID);
+		int32_t           AnchorCurrentId(void);
+		Edn::VectorType<bufferAnchorReference_ts> m_AnchorList;              //!< list of all line anchor in the current buffer
+		int32_t           m_uniqueID;
+
 };
 
 

Sources/Buffer/BufferAnchor.cpp

@@ -0,0 +1,38 @@
+/**
+ *******************************************************************************
+ * @file BufferAnchor.cpp
+ * @brief Editeur De N'ours : anchor on a secific buffer (Sources)
+ * @author Edouard DUPIN
+ * @date 11/09/2011
+ * @par Project
+ * Edn
+ *
+ * @par Copyright
+ * Copyright 2010 Edouard DUPIN, all right reserved
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY.
+ *
+ * Licence summary : 
+ *    You can modify and redistribute the sources code and binaries.
+ *    You can send me the bug-fix
+ *    You can not earn money with this Software (if the source extract from Edn
+ *        represent less than 50% of original Sources)
+ * Term of the licence in in the file licence.txt.
+ *
+ *******************************************************************************
+ */
+
+
+#include "BufferAnchor.h"
+
+BufferAnchor::BufferAnchor(void)
+{
+	
+}
+
+BufferAnchor::~BufferAnchor(void)
+{
+	
+}
+

Sources/Buffer/BufferAnchor.h

@@ -0,0 +1,56 @@
+/**
+ *******************************************************************************
+ * @file BufferAnchor.h
+ * @brief Editeur De N'ours : anchor on a secific buffer (header)
+ * @author Edouard DUPIN
+ * @date 11/09/2011
+ * @par Project
+ * Edn
+ *
+ * @par Copyright
+ * Copyright 2010 Edouard DUPIN, all right reserved
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY.
+ *
+ * Licence summary : 
+ *    You can modify and redistribute the sources code and binaries.
+ *    You can send me the bug-fix
+ *    You can not earn money with this Software (if the source extract from Edn
+ *        represent less than 50% of original Sources)
+ * Term of the licence in in the file licence.txt.
+ *
+ *******************************************************************************
+ */
+
+#ifndef __BUFFER_ANCHOR_H__
+#define __BUFFER_ANCHOR_H__
+
+#include "Display.h"
+#include "charset.h"
+#include "Edn.h"
+
+
+class BufferAnchor
+{
+	public :
+		BufferAnchor(void);
+		~BufferAnchor(void);
+		MoveAnchor(int32_t offsetLine);
+		//BufModification(...);
+		bool DisplayUpdateFirstLine(void);
+		bool DisplayUpdateNextLine(void);
+	private :
+		int32_t      m_lineId;
+		int32_t      m_bufferPos;
+	public:
+		int32_t      m_lineNumber;
+		int32_t      m_posStart;
+		int32_t      m_posStop;
+		int32_t      m_selectionPosStart;
+		int32_t      m_selectionPosStop;
+};
+
+
+#endif
+

Sources/Buffer/BufferEmpty.cpp

@@ -42,7 +42,8 @@
  */
 BufferEmpty::BufferEmpty()
 {
-
+	m_lineWidth = Display::GetFontWidth();
+	m_lineHeight = Display::GetFontHeight();
 }
 
 /**
@@ -67,32 +68,58 @@ BufferEmpty::~BufferEmpty(void)
  * @return ---
  *
  */
-int32_t	BufferEmpty::Display(DrawerManager &drawer)
+void BufferEmpty::DrawLine(DrawerManager &drawer, bufferAnchor_ts &anchor)
 {
-
+	EDN_DEBUG("Request draw : " << anchor.m_lineNumber);
 	ColorizeManager * myColorManager = ColorizeManager::getInstance();
 	// Get color : 
 	Colorize	*myColor = NULL;
+	if (anchor.m_lineNumber == 0) {
 		// Clean Buffer
 		drawer.Clean(myColorManager->Get(COLOR_CODE_BASIC_BG) );
-	
 		myColor = myColorManager->Get("normal");
-	// Draw the 2 comments Lines :
 		drawer.Text(myColor, 20,20, "edn - Editeur De N'ours, l'Editeur Desoxyribo-Nucleique");
-	//drawer.Flush();
+	}
+	if (anchor.m_lineNumber == 1) {
 		myColor = myColorManager->Get("commentDoxygen");
 		drawer.Text(myColor, 20,25 + Display::GetFontHeight(), "No Buffer Availlable to display");
-	drawer.Flush();
+	}
-	/*
+	return;
-	myColor = myColorManager->Get(("SelectedText"));
-	drawer.Cursor(20, 50);
-	drawer.EndOfLine(20, 70);
-	drawer.Tabulation(myColor, 20, 90, 5);
-	drawer.UTF8UnknownElement(myColor, 20, 120, 3, false);
-	drawer.Flush();
-	*/
-	return ERR_NONE;
 }
 
 
 
+
+bool BufferEmpty::AnchorGet(int32_t anchorID, bufferAnchor_ts & anchor)
+{
+	int32_t localID = AnchorRealId(anchorID);
+	if (localID >=0) {
+		EDN_DEBUG("Request anchor");
+		anchor.m_displaySize.x = m_AnchorList[localID].m_displaySize.x;
+		anchor.m_displaySize.y = m_AnchorList[localID].m_displaySize.y;
+		anchor.m_displayStart.x = m_AnchorList[localID].m_displayStart.x;
+		anchor.m_displayStart.y = m_AnchorList[localID].m_displayStart.y;
+		anchor.m_nbIterationMax = 2;
+		anchor.m_lineNumber = m_AnchorList[localID].m_lineId;
+		anchor.m_posStart = -1;
+		anchor.m_posStop = -1;
+		anchor.m_selectionPosStart = -1;
+		anchor.m_selectionPosStop = -1;
+		return true;
+	} else {
+		return false;
+	}
+}
+
+
+bool BufferEmpty::AnchorNext(bufferAnchor_ts & anchor)
+{
+	anchor.m_lineNumber++;
+	EDN_DEBUG("Anchor Next : " << anchor.m_lineNumber);
+	anchor.m_nbIterationMax--;
+	if (anchor.m_nbIterationMax<=0) {
+		return false;
+	}
+	return true;
+}
+

Sources/Buffer/BufferEmpty.h

@@ -32,7 +32,9 @@ class BufferEmpty : public Buffer {
 	public:
 		BufferEmpty(void);
 		virtual ~BufferEmpty(void);
-		virtual int32_t	Display(DrawerManager &drawer);
+		void    DrawLine(DrawerManager &drawer, bufferAnchor_ts &anchor);
+		bool    AnchorGet(int32_t anchorID, bufferAnchor_ts & anchor);
+		bool    AnchorNext(bufferAnchor_ts & anchor);
 		
 };
 

Sources/Buffer/BufferText.cpp

@@ -37,8 +37,10 @@
 
 const uint32_t nbLineAllocatedInBase = 300;
 
-
+extern "C"
-
+{
+	const char * g_pointerForTheDisplayLine[] = {"%1d", "%2d","%3d","%4d","%5d","%6d","%7d","%8d","%9d","%d"};
+}
 
 /**
  * @brief
@@ -50,12 +52,8 @@ const uint32_t nbLineAllocatedInBase = 300;
  */
 void BufferText::BasicInit(void)
 {
-	NeedToCleanEndPage = true;
-	// set the first element that is displayed
-	m_displayStartBufferPos = 0;
-	
 	// set the number of the lineNumber;
-	nbColoneForLineNumber = 1;
+	m_nbColoneForLineNumber = 1;
 	// init the link with the buffer manager
 	myColorManager = ColorizeManager::getInstance();
 	// Init Selection mode : 
@@ -65,12 +63,9 @@ void BufferText::BasicInit(void)
 	m_cursorPos = 0;
 	m_cursorPreferredCol = -1;
 	m_cursorOn = true;
-	//m_cursorMode = CURSOR_DISPLAY_MODE_NORMAL;
+	
-	m_displayStart.x = 0;
+	m_lineWidth = Display::GetFontWidth();
-	m_displayStart.y = 0;
+	m_lineHeight = Display::GetFontHeight();
-	m_displaySize.x = 200;
-	m_displaySize.y = 20;
-	m_displayLocalSyntax.idSequence = -1;
 }
 
 
@@ -141,7 +136,6 @@ BufferText::BufferText(Edn::File &fileName) : Buffer(fileName)
 		SetModify(true);
 	}
 	UpdateWindowsPosition();
-	ForceReDraw(true);
 }
 
 
@@ -229,101 +223,88 @@ void BufferText::SetLineDisplay(uint32_t lineNumber)
 
 }
 
-void BufferText::DrawLineNumber(DrawerManager &drawer,char *myPrint,  int32_t lineNumber, int32_t positionY)
+
+
+
+void BufferText::DrawLineNumber(DrawerManager &drawer, int32_t lineNumber, int32_t positionY)
 {
+	int32_t letterHeight = Display::GetFontHeight();
 	char tmpLineNumber[50];
-	sprintf(tmpLineNumber, myPrint, lineNumber);
+	sprintf(tmpLineNumber, g_pointerForTheDisplayLine[m_nbColoneForLineNumber-1], lineNumber);
 	drawer.Text(myColorManager->Get(COLOR_CODE_LINE_NUMBER), 1, positionY, tmpLineNumber);
 }
 
-
 /**
- * @brief Display the curent buffer with all the probematic imposed by the xharset and the user contraint.
+ * @brief Update internal data of the pointer to display
  *
- * @param[in,out] drawer the basic user drawer of EDN.
+ * @param[in,out] ---
  *
- * @return 
+ * @return ---
  *
  */
-int32_t	BufferText::Display(DrawerManager &drawer)
+void BufferText::UpdatePointerNumber(void)
 {
-	int32_t letterHeight = Display::GetFontHeight();
-	int32_t letterWidth = Display::GetFontWidth();
-	// update the number of element that can be displayed
-	m_displaySize.x = (drawer.GetWidth()/letterWidth) + 1 - nbColoneForLineNumber;;
-	m_displaySize.y = (drawer.GetHeight()/letterHeight) + 1;
-	EDN_INFO("main DIPLAY " << m_displaySize.x << " char * " << m_displaySize.y << " char");
-	
-	int32_t selStart, selEnd, selRectStart, selRectEnd;
-	bool selIsRect;
-	int32_t selHave = m_EdnBuf.GetSelectionPos(SELECTION_PRIMARY, selStart, selEnd, selIsRect, selRectStart, selRectEnd);
-	
-	colorInformation_ts * HLColor = NULL;
-	
-	//displayLineNumber(drawer);
 	// get the number of line in the buffer
 	int32_t maxNumberLine = m_EdnBuf.NumberOfLines();
 	//int32_t maxNumberLine = 2096;
-	char *myPrint = NULL;
+	if (10 > maxNumberLine) {				m_nbColoneForLineNumber = 1;
-	if (10 > maxNumberLine) {				nbColoneForLineNumber = 1;	myPrint = (char *)"%1d";
+	} else if (100 > maxNumberLine) {		m_nbColoneForLineNumber = 2;
-	} else if (100 > maxNumberLine) {		nbColoneForLineNumber = 2;	myPrint = (char *)"%2d";
+	} else if (1000 > maxNumberLine) {		m_nbColoneForLineNumber = 3;
-	} else if (1000 > maxNumberLine) {		nbColoneForLineNumber = 3;	myPrint = (char *)"%3d";
+	} else if (10000 > maxNumberLine) {		m_nbColoneForLineNumber = 4;
-	} else if (10000 > maxNumberLine) {		nbColoneForLineNumber = 4;	myPrint = (char *)"%4d";
+	} else if (100000 > maxNumberLine) {	m_nbColoneForLineNumber = 5;
-	} else if (100000 > maxNumberLine) {	nbColoneForLineNumber = 5;	myPrint = (char *)"%5d";
+	} else if (1000000 > maxNumberLine) {	m_nbColoneForLineNumber = 6;
-	} else if (1000000 > maxNumberLine) {	nbColoneForLineNumber = 6;	myPrint = (char *)"%6d";
+	} else if (1000000 > maxNumberLine) {	m_nbColoneForLineNumber = 7;
-	} else if (1000000 > maxNumberLine) {	nbColoneForLineNumber = 7;	myPrint = (char *)"%7d";
+	} else if (10000000 > maxNumberLine) {	m_nbColoneForLineNumber = 8;
-	} else if (10000000 > maxNumberLine) {	nbColoneForLineNumber = 8;	myPrint = (char *)"%8d";
+	} else if (100000000 > maxNumberLine) {	m_nbColoneForLineNumber = 9;
-	} else if (100000000 > maxNumberLine) {	nbColoneForLineNumber = 9;	myPrint = (char *)"%9d";
+	} else {								m_nbColoneForLineNumber = 10;
-	} else {								nbColoneForLineNumber = 10;	myPrint = (char *)"%d";
 	}
+}
 
-	uint32_t y = 0;
+
-	int32_t iii, new_i;
+void BufferText::DrawLine(DrawerManager &drawer, bufferAnchor_ts &anchor)
-	// Get color : 
+{
-	Colorize *  myColor           = myColorManager->Get("normal");
+
-	Colorize *  myColorSel        = myColorManager->Get("SelectedText");
+	int32_t letterHeight = Display::GetFontHeight();
-	color_ts &  myColorSpace      = myColorManager->Get(COLOR_CODE_SPACE);
+	int32_t letterWidth = Display::GetFontWidth();
-	color_ts &  myColorTab        = myColorManager->Get(COLOR_CODE_TAB);
+	int32_t positionY = letterHeight * (anchor.m_lineNumber - anchor.m_displayStart.y - 1);
+
+	int32_t idX = 0;
+	int32_t pixelX = m_nbColoneForLineNumber*letterWidth + 3;
+
+	Colorize * myColorNormal     = myColorManager->Get("normal");
+	Colorize * myColorSelected   = myColorManager->Get("SelectedText");
 	Colorize * selectColor = NULL;
+	colorInformation_ts * HLColor = NULL;
+	
+	// Regenerate the colorizing if necessary ...
+	displayHLData_ts  myDisplayLocalSyntax;
+	m_EdnBuf.HightlightOneLine(myDisplayLocalSyntax, anchor.m_posStart, anchor.m_posStop);
+	
+	// clean the current Line
+	drawer.Rectangle(myColorManager->Get(COLOR_CODE_BASIC_BG), 0, positionY, drawer.GetWidth(), letterHeight);
+	
+	DrawLineNumber(drawer, anchor.m_lineNumber, positionY);
+	
+	bool selHave = anchor.m_selectionPosStart == -1 ? false : true;
 	char displayChar[MAX_EXP_CHAR_LEN];
 	memset(displayChar, 0, sizeof(char)*MAX_EXP_CHAR_LEN);
-
+	int32_t iii;
-
+	for (iii=anchor.m_posStart; iii<anchor.m_posStop; ) {
-	int mylen = m_EdnBuf.Size();
+		uint32_t currentChar;
-	int32_t x_base=nbColoneForLineNumber*letterWidth + 3;
+		int32_t savePositionForCursor = iii;
-	uint32_t xx = 0;
+		int32_t  displaywidth = m_EdnBuf.GetExpandedChar(iii, idX, displayChar, currentChar);
-	int32_t idX = 0;
+		selectColor = myColorNormal;
-	drawer.Clean(myColorManager->Get(COLOR_CODE_BASIC_BG));
-	int displayLines = 0;
-	// Regenerate the colorizing if necessary ...
-	m_EdnBuf.HightlightGenerateLines(m_displayLocalSyntax, m_displayStartBufferPos, m_displaySize.y);
-	GTimeVal timeStart;
-	g_get_current_time(&timeStart);
-
-	// draw the lineNumber : 
-	int32_t currentLineID = m_displayStart.y+1;
-	DrawLineNumber(drawer, myPrint, currentLineID, y);
-	for (iii=m_displayStartBufferPos; iii<mylen && displayLines < m_displaySize.y ; iii = new_i) {
-		//EDN_INFO("diplay element=" << iii);
-		int32_t pixelX = xx*letterWidth + x_base;
-		int displaywidth;
-		uint32_t currentChar = '\0';
-		new_i = iii;
-		displaywidth = m_EdnBuf.GetExpandedChar(new_i, idX, displayChar, currentChar);
-		//EDN_INFO("diplay element=" << new_i);
-		if (currentChar!='\n') {
-			selectColor = myColor;
 		//kwow size to display
 		int32_t widthToDisplay;
 		char * tmpDisplayOfset;
 		bool inTheScreen = true;
-			if (m_displayStart.x <= idX) {
+		if (anchor.m_displayStart.x <= idX) {
 			// Normal display
 			tmpDisplayOfset = displayChar;
 			widthToDisplay = displaywidth;
-			} else if (m_displayStart.x < idX + displaywidth) {
+		} else if (anchor.m_displayStart.x < idX + displaywidth) {
 			// special case of partial display : 
-				widthToDisplay = idX + displaywidth - m_displayStart.x;
+			widthToDisplay = idX + displaywidth - anchor.m_displayStart.x;
 			tmpDisplayOfset = displayChar + (displaywidth-widthToDisplay);
 		} else {
 			// Out of range ...
@@ -332,112 +313,92 @@ int32_t	BufferText::Display(DrawerManager &drawer)
 			inTheScreen = false;
 		}
 		if (true==inTheScreen) {
-				HLColor = m_EdnBuf.GetElementColorAtPosition(m_displayLocalSyntax, iii);
+			HLColor = m_EdnBuf.GetElementColorAtPosition(myDisplayLocalSyntax, savePositionForCursor);
 			if (NULL != HLColor) {
 				if (NULL != HLColor->patern) {
 					selectColor = HLColor->patern->GetColor();
 				}
 			}
-
 			// If user want to display space char : overwrite curent color
 			if(		' ' == currentChar
 				&&	true == globals::IsSetDisplaySpaceChar() )
 			{
-					//selectColor = myColorSel;
+				//selectColor = myColorSelected;
 				//SpaceText(color_ts & SelectColor, int32_t x, int32_t y,int32_t nbChar)
-
 				if(	true == selHave
-						&&	selStart <= iii
+					&&	anchor.m_selectionPosStart <= iii
-						&&	selEnd   > iii)
+					&&	anchor.m_selectionPosStop   > iii)
 				{
-						drawer.SpaceText(myColorSel->GetBG(), pixelX ,y , 1);
+					drawer.SpaceText(myColorSelected->GetBG(), pixelX ,positionY , 1);
 				} else if (true == selectColor->HaveBg()) {
-						drawer.SpaceText(selectColor->GetBG(), pixelX ,y , 1);
+					drawer.SpaceText(selectColor->GetBG(), pixelX ,positionY , 1);
 				} else {
-						drawer.SpaceText(myColorSpace, pixelX ,y , 1);
+					drawer.SpaceText(myColorManager->Get(COLOR_CODE_SPACE), pixelX ,positionY , 1);
 				}
 			} else if(		'\t' == currentChar
 						&&	true == globals::IsSetDisplaySpaceChar() )
 			{
 				if(	true == selHave
-						&&	selStart <= iii
+					&&	anchor.m_selectionPosStart <= iii
-						&&	selEnd   > iii)
+					&&	anchor.m_selectionPosStop   > iii)
 				{
-						drawer.SpaceText(myColorSel->GetBG(), pixelX ,y , strlen(tmpDisplayOfset));
+					drawer.SpaceText(myColorSelected->GetBG(), pixelX ,positionY , strlen(tmpDisplayOfset));
 				} else if (true == selectColor->HaveBg()) {
-						drawer.SpaceText(selectColor->GetBG(), pixelX ,y , strlen(tmpDisplayOfset));
+					drawer.SpaceText(selectColor->GetBG(), pixelX ,positionY , strlen(tmpDisplayOfset));
 				} else {
-						drawer.SpaceText(myColorTab, pixelX ,y , strlen(tmpDisplayOfset));
+					drawer.SpaceText(myColorManager->Get(COLOR_CODE_TAB), pixelX ,positionY , strlen(tmpDisplayOfset));
 				}
 			} else {
 				if(	true == selHave
-						&&	selStart <= iii
+					&&	anchor.m_selectionPosStart <= iii
-						&&	selEnd   > iii)
+					&&	anchor.m_selectionPosStop   > iii)
 				{
-						selectColor = myColorSel;
+					selectColor = myColorSelected;
 				}
 				if (currentChar <= 0x7F) {
-						drawer.Text(selectColor, pixelX ,y, tmpDisplayOfset);
+					drawer.Text(selectColor, pixelX ,positionY, tmpDisplayOfset);
 				} else {
-						drawer.Text(selectColor, pixelX ,y, displayChar);
+					drawer.Text(selectColor, pixelX ,positionY, displayChar);
 				}
 			}
-				xx+=widthToDisplay;
-			}
-			idX += displaywidth;
 		}
 		// display cursor : 
-		if (m_cursorPos == iii) {
+		if (m_cursorPos == savePositionForCursor) {
 			// display the cursor:
 			if (true == m_cursorOn) {
-				drawer.Cursor(pixelX, y+letterHeight);
+				drawer.Cursor(pixelX, positionY+letterHeight);
 				//m_cursorOn = false;
 			} else {
 				m_cursorOn = true;
 			}
 		}
-		// move to next line ...
+		if (true==inTheScreen) {
-		if (currentChar=='\n') {
+			pixelX += widthToDisplay*letterWidth;
-			drawer.EndOfLine(pixelX, y+letterHeight);
-			drawer.Flush();
-			xx = 0;
-			idX =0;
-			y += letterHeight;
-			displayLines++;
-			currentLineID++;
-			DrawLineNumber(drawer, myPrint, currentLineID, y);
 		}
+		idX += displaywidth;
 	}
 	// special case : the cursor is at the end of the buffer...
 	if (m_cursorPos == iii) {
 		// display the cursor:
 		if (true == m_cursorOn) {
-			drawer.Cursor(xx*letterWidth + x_base, y+letterHeight);
+			drawer.Cursor(pixelX, positionY+letterHeight);
-			m_cursorOn = false;
+			//m_cursorOn = false;
 		} else {
 			m_cursorOn = true;
 		}
 	}
-	drawer.Flush();
-	
-	GTimeVal timeStop;
-	g_get_current_time(&timeStop);
-	EDN_DEBUG("Display Generation = " << timeStop.tv_usec - timeStart.tv_usec << " micro-s");
-
-	return ERR_NONE;
 }
 
 
-
 void BufferText::GetMousePosition(int32_t width, int32_t height, int32_t &x, int32_t &y)
 {
-	x = (width - 3) / Display::GetFontWidth() - nbColoneForLineNumber;
+	x = (width - 3) / Display::GetFontWidth() - m_nbColoneForLineNumber;
 	y = height / Display::GetFontHeight();
 	if (x < 0) {
 		x = 0;
 	}
-	x += m_displayStart.x;
+	x += m_AnchorList[AnchorCurrentId()].m_displayStart.x;
-	y += m_displayStart.y;
+	y += m_AnchorList[AnchorCurrentId()].m_displayStart.y;
 	//EDN_DEBUG("BufferText::GetMousePosition(" << width << "," << height << "); ==> (" << x << "," << y << ")" );
 }
 
@@ -472,7 +433,6 @@ void BufferText::MouseEvent(int32_t width, int32_t height)
 		}
 		m_EdnBuf.Unselect(SELECTION_PRIMARY);
 
-		ForceReDraw(true);
 		UpdateWindowsPosition();
 	}
 }
@@ -522,7 +482,6 @@ void BufferText::MouseSelectFromCursorTo(int32_t width, int32_t height)
 			m_EdnBuf.Select(SELECTION_PRIMARY, selStart, m_cursorPos);
 		}
 	}
-	ForceReDraw(true);
 	UpdateWindowsPosition();
 }
 
@@ -542,7 +501,6 @@ void BufferText::MouseEventDouble(void)
 	if (true == m_EdnBuf.SelectAround(m_cursorPos, beginPos, endPos)) {
 		m_EdnBuf.Select(SELECTION_PRIMARY, beginPos, endPos);
 		m_cursorPos = endPos;
-		ForceReDraw(true);
 	}
 	// no else
 }
@@ -559,7 +517,6 @@ void BufferText::MouseEventTriple(void)
 {
 	m_EdnBuf.Select(SELECTION_PRIMARY, m_EdnBuf.StartOfLine(m_cursorPos), m_EdnBuf.EndOfLine(m_cursorPos));
 	m_cursorPos = m_EdnBuf.EndOfLine(m_cursorPos);
-	ForceReDraw(true);
 }
 
 void BufferText::RemoveLine(void)
@@ -575,13 +532,11 @@ void BufferText::SelectAll(void)
 {
 	m_EdnBuf.Select(SELECTION_PRIMARY, 0, m_EdnBuf.Size());
 	m_cursorPos = m_EdnBuf.Size();
-	ForceReDraw(true);
 }
 
 void BufferText::SelectNone(void)
 {
 	m_EdnBuf.Unselect(SELECTION_PRIMARY);
-	ForceReDraw(true);
 }
 
 /**
@@ -622,44 +577,31 @@ void BufferText::ScrollUp(void)
  */
 void BufferText::MoveUpDown(int32_t ofset)
 {
-	m_displayLocalSyntax.idSequence = -1;
+	int32_t iii=AnchorCurrentId();
 	if (ofset >= 0) {
 		int32_t nbLine = m_EdnBuf.NumberOfLines();
-		if (m_displayStart.y+ofset+3 > nbLine) {
+		if (m_AnchorList[iii].m_displayStart.y+ofset+3 > nbLine) {
-			m_displayStart.y = nbLine-3;
+			m_AnchorList[iii].m_displayStart.y = nbLine-3;
 		} else {
-			m_displayStart.y += ofset;
+			m_AnchorList[iii].m_displayStart.y += ofset;
 		}
-		m_displayStartBufferPos = m_EdnBuf.CountForwardNLines(0, m_displayStart.y);
+		m_AnchorList[iii].m_bufferPos = m_EdnBuf.CountForwardNLines(0, m_AnchorList[iii].m_displayStart.y);
+		m_AnchorList[iii].m_lineId = m_AnchorList[iii].m_displayStart.y;
 	} else {
 		ofset *= -1;
-		if (m_displayStart.y < ofset) {
+		if (m_AnchorList[iii].m_displayStart.y < ofset) {
-			m_displayStart.y = 0;
+			m_AnchorList[iii].m_displayStart.y = 0;
-			m_displayStartBufferPos = 0;
+			m_AnchorList[iii].m_bufferPos = 0;
+			m_AnchorList[iii].m_lineId = 0;
 		} else {
-			m_displayStart.y -= ofset;
+			m_AnchorList[iii].m_displayStart.y -= ofset;
-			m_displayStartBufferPos = m_EdnBuf.CountForwardNLines(0, m_displayStart.y);
+			m_AnchorList[iii].m_bufferPos = m_EdnBuf.CountForwardNLines(0, m_AnchorList[iii].m_displayStart.y);
+			m_AnchorList[iii].m_lineId = m_AnchorList[iii].m_displayStart.y;
 		}
 	}
-	
 }
 
 
-
-/**
- * @brief
- *
- * @param[in,out] ---
- *
- * @return ---
- *
- */
-void BufferText::ForceReDraw(bool allElement)
-{
-	NeedToCleanEndPage = true;
-	//m_displayLocalSyntax.idSequence = -1;
-}
-
 void BufferText::SetInsertPosition(int32_t newPos, bool insertChar)
 {
 	int32_t SelectionStart, SelectionEnd, SelectionRectStart, SelectionRectEnd;
@@ -842,7 +784,7 @@ void BufferText::cursorMove(int32_t gtkKey)
 		case GDK_Page_Up:
 #		endif
 			//EDN_INFO("keyEvent : <PAGE-UP>");
-			TextDMoveUp(m_displaySize.x);
+			TextDMoveUp(m_AnchorList[AnchorCurrentId()].m_displaySize.x);
 			break;
 #		ifdef USE_GTK_VERSION_3_0
 		case GDK_KEY_Page_Down:
@@ -850,7 +792,7 @@ void BufferText::cursorMove(int32_t gtkKey)
 		case GDK_Page_Down:
 #		endif
 			//EDN_INFO("keyEvent : <PAGE-DOWN>");
-			TextDMoveDown(m_displaySize.x);
+			TextDMoveDown(m_AnchorList[AnchorCurrentId()].m_displaySize.x);
 			break;
 #		ifdef USE_GTK_VERSION_3_0
 		case GDK_KEY_Begin:
@@ -889,40 +831,38 @@ void BufferText::cursorMove(int32_t gtkKey)
  */
 void BufferText::UpdateWindowsPosition(bool centerPage)
 {
+	for (int32_t iii=0; iii < m_AnchorList.Size() ; iii++) {
 		if (centerPage == false) {
 			// Display position (Y mode):
-		//EDN_INFO("BufferText::UpdateWindowsPosition() m_displayStart(" << m_displayStart.x << "," << m_displayStart.y << ") m_displaySize(" << m_displaySize.x << "," <<m_displaySize.y << ")");
+			//EDN_INFO(" m_displayStart(" << m_displayStart.x << "," << m_displayStart.y << ") m_displaySize(" << m_displaySize.x << "," <<m_displaySize.y << ")");
 			position_ts cursorPosition;
 			cursorPosition.y = m_EdnBuf.CountLines(0, m_cursorPos);
 			int32_t lineStartPos = m_EdnBuf.StartOfLine(m_cursorPos);
 			cursorPosition.x = m_EdnBuf.CountDispChars(lineStartPos, m_cursorPos);
-		//EDN_INFO("BufferText::UpdateWindowsPosition() curent cursor position : (" << cursorPosition.x << "," << cursorPosition.y << ")");
+			//EDN_INFO(" curent cursor position : (" << cursorPosition.x << "," << cursorPosition.y << ")");
 			
-		if (m_displayStart.y > (int32_t)cursorPosition.y - globals::getNbLineBorder() ) {
+			if (m_AnchorList[iii].m_displayStart.y > (int32_t)cursorPosition.y - globals::getNbLineBorder() ) {
-			m_displayStart.y = cursorPosition.y - globals::getNbLineBorder();
+				m_AnchorList[iii].m_displayStart.y = cursorPosition.y - globals::getNbLineBorder();
-			if (m_displayStart.y < 0) {
+				if (m_AnchorList[iii].m_displayStart.y < 0) {
-				m_displayStart.y = 0;
+					m_AnchorList[iii].m_displayStart.y = 0;
-				ForceReDraw(true);
 				}
-		} else if (m_displayStart.y + m_displaySize.y <= (int32_t)cursorPosition.y + globals::getNbLineBorder() ) {
+			} else if (m_AnchorList[iii].m_displayStart.y + m_AnchorList[iii].m_displaySize.y <= (int32_t)cursorPosition.y + globals::getNbLineBorder() ) {
-			m_displayStart.y = cursorPosition.y - m_displaySize.y + globals::getNbLineBorder() + 1;
+				m_AnchorList[iii].m_displayStart.y = cursorPosition.y - m_AnchorList[iii].m_displaySize.y + globals::getNbLineBorder() + 1;
-			ForceReDraw(true);
 			}
 			// Display position (X mode):
 			//EDN_INFO("cursorPosition X : " << cursorPosition.y << " windows " << m_displayStart.y << "=>" << m_displayStart.x + m_displaySize.x);
-		if (m_displayStart.x > cursorPosition.x - globals::getNbColoneBorder() ) {
+			if (m_AnchorList[iii].m_displayStart.x > cursorPosition.x - globals::getNbColoneBorder() ) {
-			m_displayStart.x = cursorPosition.x - globals::getNbColoneBorder();
+				m_AnchorList[iii].m_displayStart.x = cursorPosition.x - globals::getNbColoneBorder();
-			if (m_displayStart.x < 0) {
+				if (m_AnchorList[iii].m_displayStart.x < 0) {
-				m_displayStart.x = 0;
+					m_AnchorList[iii].m_displayStart.x = 0;
-				ForceReDraw(true);
 				}
-		} else if (m_displayStart.x + m_displaySize.x <= cursorPosition.x + globals::getNbColoneBorder() ) {
+			} else if (m_AnchorList[iii].m_displayStart.x + m_AnchorList[iii].m_displaySize.x <= cursorPosition.x + globals::getNbColoneBorder() ) {
-			m_displayStart.x = cursorPosition.x - m_displaySize.x + globals::getNbColoneBorder() + 1;
+				m_AnchorList[iii].m_displayStart.x = cursorPosition.x - m_AnchorList[iii].m_displaySize.x + globals::getNbColoneBorder() + 1;
-			ForceReDraw(true);
 			}
 			
 			//update the buffer position ID : 
-		m_displayStartBufferPos = m_EdnBuf.CountForwardNLines(0, m_displayStart.y);
+			m_AnchorList[iii].m_bufferPos = m_EdnBuf.CountForwardNLines(0, m_AnchorList[iii].m_displayStart.y);
+			m_AnchorList[iii].m_lineId = m_AnchorList[iii].m_displayStart.y;
 		} else {
 			// center the line at the middle of the screen :
 			position_ts cursorPosition;
@@ -931,16 +871,16 @@ void BufferText::UpdateWindowsPosition(bool centerPage)
 			//EDN_DEBUG(" cursor position : " << m_cursorPos << " ==> ligne=" << cursorPosition.y);
 			cursorPosition.x = 0;
 			
-		m_displayStart.x = 0;
+			m_AnchorList[iii].m_displayStart.x = 0;
 			//EDN_DEBUG(" display size : " << m_displaySize.y);
-		m_displayStart.y = cursorPosition.y - m_displaySize.y/2;
+			m_AnchorList[iii].m_displayStart.y = cursorPosition.y - m_AnchorList[iii].m_displaySize.y/2;
-		m_displayStart.y = edn_max(m_displayStart.y, 0);
+			m_AnchorList[iii].m_displayStart.y = edn_max(m_AnchorList[iii].m_displayStart.y, 0);
-		
+			m_AnchorList[iii].m_bufferPos = m_EdnBuf.CountForwardNLines(0, m_AnchorList[iii].m_displayStart.y);
-		m_displayStartBufferPos = m_EdnBuf.CountForwardNLines(0, m_displayStart.y);
+			m_AnchorList[iii].m_lineId = m_AnchorList[iii].m_displayStart.y;
-		ForceReDraw(true);
 			//EDN_DEBUG(" display start : " << m_displayStart.x << "x" << m_displayStart.y);
 			//EDN_DEBUG(" -------------------------------------------------");
 		}
+	}
 }
 
 
@@ -968,15 +908,28 @@ void BufferText::AddChar(char * UTF8data)
 				m_EdnBuf.Insert(m_cursorPos, tmpVect);
 				SetInsertPosition(m_cursorPos+1, true);
 			} else {
-				if (true == globals::IsSetCtrl() ) {
+				// Indent depend of the multiline in the selection ...
+				// count the number of line : 
+				int32_t nbSelectedLines = m_EdnBuf.CountLines(SelectionStart, SelectionEnd);
+				if (0 == nbSelectedLines) {
+					Edn::VectorType<int8_t> tmpVect;
+					tmpVect.PushBack(0x09);
+					m_EdnBuf.ReplaceSelected(SELECTION_PRIMARY, tmpVect);
+					SetInsertPosition(SelectionStart+tmpVect.Size(), true);
+				} else {
+					if (true == globals::IsSetShift() ) {
 						m_cursorPos = m_EdnBuf.UnIndent(SELECTION_PRIMARY);
 					} else {
 						m_cursorPos = m_EdnBuf.Indent(SELECTION_PRIMARY);
 					}
 				}
+			}
 			actionDone = true;
 		} else if (UTF8data[0] == '\n') {
 			Edn::VectorType<int8_t> tmpVect;
+			if (true == globals::IsSetShift()) {
+				tmpVect.PushBack('\r');
+			} else {
 				tmpVect.PushBack('\n');
 				// if Auto indent Enable ==> we get the start of the previous line and add it to tne new one
 				if (true == globals::IsSetAutoIndent() ) {
@@ -998,6 +951,7 @@ void BufferText::AddChar(char * UTF8data)
 						}
 					}
 				}
+			}
 			// Set temporary buffer in the real buffer
 			if (false == haveSelectionActive) {
 				m_EdnBuf.Insert(m_cursorPos, tmpVect);
@@ -1240,7 +1194,6 @@ void BufferText::Copy(int8_t clipboardID)
  */
 void BufferText::Cut(int8_t clipboardID)
 {
-
 	int32_t SelectionStart, SelectionEnd, SelectionRectStart, SelectionRectEnd;
 	bool SelectionIsRect;
 	bool haveSelectionActive = m_EdnBuf.GetSelectionPos(SELECTION_PRIMARY, SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
@@ -1254,7 +1207,6 @@ void BufferText::Cut(int8_t clipboardID)
 		m_cursorPos = SelectionStart;
 	}
 	UpdateWindowsPosition();
-	ForceReDraw(true);
 	SetModify(true);
 }
 
@@ -1288,7 +1240,6 @@ void BufferText::Paste(int8_t clipboardID)
 	}
 	
 	UpdateWindowsPosition();
-	ForceReDraw(true);
 	SetModify(true);
 }
 
@@ -1299,7 +1250,6 @@ void BufferText::Undo(void)
 	if (newPos >= 0) {
 		SetInsertPosition(newPos, true);
 		UpdateWindowsPosition();
-		ForceReDraw(true);
 		SetModify(true);
 	}
 }
@@ -1310,7 +1260,6 @@ void BufferText::Redo(void)
 	if (newPos >= 0) {
 		SetInsertPosition(newPos, true);
 		UpdateWindowsPosition();
-		ForceReDraw(true);
 		SetModify(true);
 	}
 }
@@ -1319,6 +1268,59 @@ void BufferText::Redo(void)
 void BufferText::SetCharset(charset_te newCharset)
 {
 	m_EdnBuf.SetCharsetType(newCharset);
-	ForceReDraw(true);
 }
 
+
+bool BufferText::AnchorGet(int32_t anchorID, bufferAnchor_ts & anchor)
+{
+	int32_t localID = AnchorRealId(anchorID);
+	if (localID >=0) {
+		// update internal sise of the width of lineID
+		UpdatePointerNumber();
+		// Updata uper size of display
+		anchor.m_displaySize.x = m_AnchorList[localID].m_displaySize.x;
+		anchor.m_displaySize.y = m_AnchorList[localID].m_displaySize.y;
+		anchor.m_displayStart.x = m_AnchorList[localID].m_displayStart.x;
+		anchor.m_displayStart.y = m_AnchorList[localID].m_displayStart.y;
+		anchor.m_nbIterationMax = anchor.m_displaySize.y;
+		// update to buffer position
+		anchor.m_lineNumber = m_AnchorList[localID].m_lineId +1;
+		anchor.m_posStart = m_AnchorList[localID].m_bufferPos;
+		if (anchor.m_posStart >= m_EdnBuf.Size()+1) {
+			return false;
+		}
+		anchor.m_posStop = m_EdnBuf.EndOfLine(anchor.m_posStart);
+		// Update selection current
+		int32_t selStart, selEnd, selRectStart, selRectEnd;
+		bool selIsRect;
+		bool selHave = m_EdnBuf.GetSelectionPos(SELECTION_PRIMARY, selStart, selEnd, selIsRect, selRectStart, selRectEnd);
+		if (false == selHave){
+			anchor.m_selectionPosStart = -1;
+			anchor.m_selectionPosStop = -1;
+		} else {
+			anchor.m_selectionPosStart = selStart+1;
+			anchor.m_selectionPosStop = selEnd+1;
+		}
+		EDN_DEBUG("Request display : line=" << anchor.m_lineNumber << " (" << anchor.m_posStart << "," << anchor.m_posStop << ")");
+		EDN_DEBUG("     ==> select : (" << anchor.m_selectionPosStart << "," << anchor.m_selectionPosStop << ")");
+		return true;
+	} else {
+		return false;
+	}
+}
+
+
+bool BufferText::AnchorNext(bufferAnchor_ts & anchor)
+{
+	anchor.m_lineNumber++;
+	anchor.m_posStart = anchor.m_posStop+1;
+	if (anchor.m_posStart >= m_EdnBuf.Size()+1) {
+		return false;
+	}
+	anchor.m_posStop = m_EdnBuf.EndOfLine(anchor.m_posStart);
+	anchor.m_nbIterationMax--;
+	if (anchor.m_nbIterationMax<0) {
+		return false;
+	}
+	return true;
+}

Sources/Buffer/BufferText.h

@@ -36,6 +36,7 @@ typedef enum {
 	CURSOR_DISPLAY_MODE_NOT_FOCUS,
 } cursorDisplayMode_te;
 
+
 class BufferText : public Buffer {
 	public:
 		            BufferText(void);
@@ -46,8 +47,7 @@ class BufferText : public Buffer {
 		void        GetInfo(infoStatBuffer_ts &infoToUpdate);
 		void        SetLineDisplay(uint32_t lineNumber);
 		
-		int32_t   Display(DrawerManager &drawer);
+		void        DrawLine(DrawerManager &drawer, bufferAnchor_ts &anchor);
-		void      ForceReDraw(bool allElement);
 		void        AddChar(char * UTF8data);
 		void        cursorMove(int32_t gtkKey);
 		void        MouseSelectFromCursorTo(int32_t width, int32_t height);
@@ -73,29 +73,30 @@ class BufferText : public Buffer {
 		void        Undo(void);
 		void        Redo(void);
 		void        SetCharset(charset_te newCharset);
+
+		bool        AnchorGet(int32_t anchorID, bufferAnchor_ts & anchor);
+		bool        AnchorNext(bufferAnchor_ts & anchor);
 	protected:
 		void        NameChange(void);
 
 	private:
 		// Display
-		bool                    NeedToCleanEndPage;         //!< if true, the end of the page need to be clean (arrive after a remove line)
-		uint32_t                nbColoneForLineNumber;      //!< number of colome used to display the line Number
 		ColorizeManager *       myColorManager;                 //!< for the background color : 
-		
+		int32_t                 m_nbColoneForLineNumber;        //!< number of colomn use for linenumber display
 		
 		// Direct buffer IO
 		EdnBuf                  m_EdnBuf;                       //!< buffer associated on this displayer
-		position_ts             m_displayStart;             //!< position where the display is starting
+		
-		position_ts             m_displaySize;              //!< number of char displayable in the screan
+		//position_ts             m_displayStart;                 //!< position where the display is starting
-		int32_t                 m_displayStartBufferPos;    //!< position where the buffer start
+		//position_ts             m_displaySize;                  //!< number of char displayable in the screan
+		//int32_t                 m_displayStartBufferPos;        //!< position where the buffer start
+		
 		// Cursor :
 		int32_t                 m_cursorPos;                    //!< position in the buffer of the cursor
 		int32_t                 m_cursorPreferredCol;           //!< colomn of the last up and down ...
 		bool                    m_cursorOn;                     //!< the blink of the cursor ...
 		cursorDisplayMode_te    m_cursorMode;                   //!< type of cursor Selected
 		
-		displayHLData_ts        m_displayLocalSyntax;       //!< for the display of the local elements (display HL mode)
-		
 		// internal function
 		void     BasicInit(void);
 		void     UpdateWindowsPosition(bool centerPage = false);
@@ -114,7 +115,9 @@ class BufferText : public Buffer {
 		
 		void     GetMousePosition(int32_t width, int32_t height, int32_t &x, int32_t &y);
 		void     MoveUpDown(int32_t ofset);
-		void     DrawLineNumber(DrawerManager &drawer,char *myPrint,  int32_t lineNumber, int32_t positionY);
+		void     DrawLineNumber(DrawerManager &drawer, int32_t lineNumber, int32_t positionY);
+		void     UpdatePointerNumber(void);
+
 
 };
 

Sources/Colorize/ColorizeManager.cpp

@@ -1,6 +1,6 @@
 /**
  *******************************************************************************
- * @file ColoriseManager.cpp
+ * @file ColorizeManager.cpp
  * @brief Editeur De N'ours : Colorising Manager
  * @author Edouard DUPIN
  * @date 14/12/2010
@@ -57,19 +57,8 @@ void ColorizeManager::OnMessage(int32_t id, int32_t dataID)
 	{
 		case EDN_MSG__RELOAD_COLOR_FILE:
 			{
-				// Remove all current color
-				int32_t i;
-				// clean all Element
-				for (i=0; i< listMyColor.Size(); i++) {
-					if (NULL != listMyColor[i]) {
-						delete(listMyColor[i]);
-						listMyColor[i] = NULL;
-					}
-				}
-				// clear the compleate list
-				listMyColor.Clear();
 				// Reaload File
-				// TODO : Check this : 
+				// TODO : Check this : Pb in the recopy Edn::String element
 				Edn::String plop = m_fileColor;
 				LoadFile(plop.c_str());
 			}
@@ -85,6 +74,18 @@ void ColorizeManager::LoadFile(Edn::String &xmlFilename)
 
 void ColorizeManager::LoadFile(const char * xmlFilename)
 {
+	// Remove all old color : 
+	int32_t i;
+	// clean all Element
+	for (i=0; i< listMyColor.Size(); i++) {
+		if (NULL != listMyColor[i]) {
+			delete(listMyColor[i]);
+			listMyColor[i] = NULL;
+		}
+	}
+	// clear the compleate list
+	listMyColor.Clear();
+
 	m_fileColor = xmlFilename;
 	EDN_DEBUG("open file (COLOR) \"" << xmlFilename << "\" ? = \"" << m_fileColor << "\"");
 	errorColor = new Colorize();
@@ -96,22 +97,17 @@ void ColorizeManager::LoadFile(const char * xmlFilename)
 	// open the curent File
 	XmlDocument.LoadFile(xmlFilename);
 	TiXmlElement* root = XmlDocument.FirstChildElement( "EdnColor" );
-	if (NULL == root )
+	if (NULL == root ) {
-	{
 		EDN_ERROR(PFX"(l ?) main node not find: \"EdnColor\" in \"" << xmlFilename << "\"");
 		return;
-	}
+	} else {
-	else
-	{
 		TiXmlNode * pNode = root->FirstChild();
-		while(NULL != pNode)
+		while(NULL != pNode) {
-		{
 			if (pNode->Type()==TiXmlNode::TINYXML_COMMENT) {
 				// nothing to do, just proceed to next step
 			} else if (!strcmp(pNode->Value(), "gui")) {
 				TiXmlNode * pGuiNode = pNode->FirstChild();
-				while(NULL != pGuiNode)
+				while(NULL != pGuiNode) {
-				{
 					if (pGuiNode->Type()==TiXmlNode::TINYXML_COMMENT) {
 						// nothing to do, just proceed to next step
 					} else if (!strcmp(pGuiNode->Value(), "color")) {
@@ -233,6 +229,7 @@ void ColorizeManager::LoadFile(const char * xmlFilename)
 		}
 	}
 	SendMessage(EDN_MSG__COLOR_HAS_CHANGE);
+	SendMessage(EDN_MSG__USER_DISPLAY_CHANGE);
 }
 
 Colorize *ColorizeManager::Get(const char *colorName)

Sources/Colorize/ColorizeManager.h

@@ -1,6 +1,6 @@
 /**
  *******************************************************************************
- * @file ColoriseManager.h
+ * @file ColorizeManager.h
  * @brief Editeur De N'ours : Colorising Manager (header)
  * @author Edouard DUPIN
  * @date 14/12/2010

Sources/CustumWidget/BufferView/BufferView.cpp

@@ -100,6 +100,10 @@ void BufferView::OnMessage(int32_t id, int32_t dataID)
 			// change Title :
 			gtk_widget_queue_draw(m_widget);
 			break;
+		case EDN_MSG__USER_DISPLAY_CHANGE:
+			// Redraw all the display ...
+			gtk_widget_queue_draw(m_widget);
+			break;
 	}
 }
 
@@ -335,25 +339,8 @@ gint BufferView::CB_mouseButtonEvent(GtkWidget *widget, GdkEventButton *event, g
 			//EDN_INFO(" plop %d / %d = %d ==> %d", (uint32_t)event->y, fontHeight, ((uint32_t)event->y / fontHeight), selectBuf);
 			if ( 0 <= selectBuf) {
 				self->SendMessage(EDN_MSG__CURRENT_CHANGE_BUFFER_ID, selectBuf);
-				/*
-				MainWindows *window = MainWindows::getInstance();
-				EDN_INFO(" Event on Buffer " << selectBuf);
-				// set the new seected Buffer
-				window->SetSelected(selectBuf);
-				*/
 			}
-		}/* else if (event->type == GDK_3BUTTON_PRESS) {
-			EDN_INFO("mouse-event BT1  ==> Triple Clicked");
-		}else if (event->type == GDK_BUTTON_RELEASE) {
-			EDN_INFO("mouse-event BT1  ==> Realease");
-		}*/
-	} else if (event->button == 2) {
-		/*
-		if (event->type == GDK_BUTTON_PRESS) {
-			EDN_INFO("mouse-event BT2 PRESS");
-			self->m_menuContext->Show(event->x, event->y, false);
 		}
-		*/
 	} else if (event->button == 3) {
 		if (event->type == GDK_BUTTON_PRESS) {
 			EDN_INFO("mouse-event BT3 PRESS");
@@ -364,7 +351,8 @@ gint BufferView::CB_mouseButtonEvent(GtkWidget *widget, GdkEventButton *event, g
 			}
 		}
 	} else {
-		EDN_INFO("mouse-event BT? PRESS");
+		// not usefull to redraw
+		return true;
 	}
 	gtk_widget_queue_draw( widget );
 	return true;

Sources/CustumWidget/CodeView/CodeView.cpp

@@ -38,15 +38,19 @@
 
 CodeView::CodeView(void) : MsgBroadcast("Code View", EDN_CAT_WORK_AREA)
 {
-	m_bufferID = -1;
-	m_buttunOneSelected = false;
-	m_shawableAreaX = 0;
-	m_shawableAreaY = 0;
-
 	// Init link with the buffer Manager
 	m_bufferManager = BufferManager::getInstance();
 	m_colorManager = ColorizeManager::getInstance();
 
+	static int32_t staticIntLocal = 100;
+	m_displayUniqueId = staticIntLocal++;
+
+	m_bufferID = -1;
+	m_bufferManager->Get(m_bufferID)->AnchorAdd(m_displayUniqueId);
+	m_buttunOneSelected = false;
+	m_shawableAreaX = 0;
+	m_shawableAreaY = 0;
+
 	m_widget = gtk_drawing_area_new();
 	gtk_widget_set_size_request( m_widget, 200, 100);
 
@@ -98,8 +102,9 @@ void CodeView::OnMessage(int32_t id, int32_t dataID)
 	{
 		case EDN_MSG__CURRENT_CHANGE_BUFFER_ID:
 			//EDN_INFO("Select a new Buffer ... " << dataID);
+			m_bufferManager->Get(m_bufferID)->AnchorRm(m_displayUniqueId);
 			m_bufferID = dataID;
-			m_bufferManager->Get(m_bufferID)->ForceReDraw(true);
+			m_bufferManager->Get(m_bufferID)->AnchorAdd(m_displayUniqueId);
 			// request the dispplay of the curent Editor
 			SendMessage(EDN_MSG__BUFFER_CHANGE_CURRENT, m_bufferID);
 			break;
@@ -179,12 +184,16 @@ void CodeView::OnMessage(int32_t id, int32_t dataID)
 		case EDN_MSG__CURRENT_SET_CHARSET:
 			m_bufferManager->Get(m_bufferID)->SetCharset((charset_te)dataID);
 			break;
+		case EDN_MSG__USER_DISPLAY_CHANGE:
+			// Redraw all the display ... Done under ...
+			break;
 	}
 	// Force redraw of the widget
 	gtk_widget_queue_draw(m_widget);
 }
 
 
+#define COUNT_TIME plop
 
 gboolean CodeView::CB_displayDraw( GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
@@ -194,6 +203,7 @@ gboolean CodeView::CB_displayDraw( GtkWidget *widget, GdkEventExpose *event, gpo
 #	ifdef USE_GTK_VERSION_3_0
 	GtkAllocation allocation;
 	gtk_widget_get_allocation(widget, &allocation);
+	EDN_INFO("GTK+ request a diplay of : "<< allocation.width <<"px * "<< allocation.height <<"px");
 	bool needRedrawAll = false;
 	if (self->m_shawableAreaX != allocation.width) {
 		needRedrawAll = true;
@@ -204,6 +214,7 @@ gboolean CodeView::CB_displayDraw( GtkWidget *widget, GdkEventExpose *event, gpo
 		self->m_shawableAreaY = allocation.height;
 	}
 #	elif defined( USE_GTK_VERSION_2_0)
+	EDN_INFO("GTK+ request a diplay of : "<< widget->allocation.width <<"px * "<< widget->allocation.height <<"px");
 	bool needRedrawAll = false;
 	if (self->m_shawableAreaX != widget->allocation.width) {
 		needRedrawAll = true;
@@ -214,32 +225,44 @@ gboolean CodeView::CB_displayDraw( GtkWidget *widget, GdkEventExpose *event, gpo
 		self->m_shawableAreaY = widget->allocation.height;
 	}
 #	endif
-	if (true == needRedrawAll) {
+	EDN_INFO("Edn request a display of : " << self->m_shawableAreaX << "px * "<<  self->m_shawableAreaY<<"px");
-		//updateScrollElement();
-		self->m_bufferManager->Get(self->m_bufferID)->ForceReDraw(true);
-	}
-	EDN_INFO("Request a display of : " << self->m_shawableAreaX << "px * "<<  self->m_shawableAreaY<<"px");
-	/*
-	EDN_INFO("widget width=%d", widget->allocation.width);
-	EDN_INFO("widget height=%d", widget->allocation.height);
-	*/
 
-	//EDN_INFO("BufferView Display");
 	// Get the color Manager :
 	ColorizeManager *myColorManager = NULL;
 	myColorManager = ColorizeManager::getInstance();
 	
-	//(void)m_bufferManager->Get(m_bufferID)->Display(m_displayParameters, m_shawableAreaX, m_shawableAreaY);
 	DrawerManager monDrawer(widget, self->m_shawableAreaX, self->m_shawableAreaY);
-	//EDN_INFO("Display buffer ID = " << m_bufferID);
+	Buffer * tmpBuf = self->m_bufferManager->Get(self->m_bufferID);
-	(void)self->m_bufferManager->Get(self->m_bufferID)->Display(monDrawer);
+
-//	EDN_WARNING("Must display here ... ");
+	#ifdef COUNT_TIME
+		GTimeVal timeStart;
+		g_get_current_time(&timeStart);
+	#endif
+	bufferAnchor_ts anchor;
+	
+	tmpBuf->AnchorSetSize(self->m_displayUniqueId, self->m_shawableAreaX, self->m_shawableAreaY);
+	bool enableToWrite = tmpBuf->AnchorGet(self->m_displayUniqueId, anchor);
+	while (true == enableToWrite) {
+		tmpBuf->DrawLine(monDrawer, anchor);
+		enableToWrite = tmpBuf->AnchorNext(anchor);
+	}
+	monDrawer.Flush();
+	
+	// Need to clean the end of windows (sometimes)...
+	/*
+	if (iii<lineIdEnd+1) {
+		int32_t positionY = letterHeight * (iii - m_displayStart.y - 1);
+		drawer.Rectangle(myColorManager->Get(COLOR_CODE_BASIC_BG), 0, positionY, drawer.GetWidth(), letterHeight*(lineIdEnd+1-iii) );
+	}
+	*/
+	#ifdef COUNT_TIME
+		GTimeVal timeStop;
+		g_get_current_time(&timeStop);
+		EDN_DEBUG("Display Generation = " << timeStop.tv_usec - timeStart.tv_usec << " micro-s ==> " << (timeStop.tv_usec - timeStart.tv_usec)/1000. << "ms");
+	#endif
 	return TRUE;
 }
 
-
-
-
 // sur : émis lors du premier affichage de la GtkDrawingArea
 gboolean CodeView::CB_displayInit( GtkWidget *widget, gpointer data)
 {
@@ -247,22 +270,15 @@ gboolean CodeView::CB_displayInit( GtkWidget *widget, gpointer data)
 #	ifdef USE_GTK_VERSION_3_0
 	GtkAllocation allocation;
 	gtk_widget_get_allocation(widget, &allocation);
-	int32_t size_x = allocation.width;
+	EDN_INFO("GTK+ request a diplay of : "<< allocation.width <<"px * "<< allocation.height <<"px");
-	int32_t size_y = allocation.height;
-	
 	self->m_shawableAreaX = allocation.width;
 	self->m_shawableAreaY = allocation.height;
 #	elif defined( USE_GTK_VERSION_2_0)
-	int32_t size_x = widget->allocation.width;
+	EDN_INFO("GTK+ request a diplay of : "<< widget->allocation.width <<"px * "<< widget->allocation.height <<"px");
-	int32_t size_y = widget->allocation.height;
-	
 	self->m_shawableAreaX = widget->allocation.width;
 	self->m_shawableAreaY = widget->allocation.height;
 #	endif
-	EDN_INFO("Request a diplay of : "<< size_x <<"px * "<< size_y <<"px");
-
 	gtk_widget_queue_draw( widget );
-
 	return TRUE;
 }
 

Sources/CustumWidget/CodeView/CodeView.h

@@ -54,6 +54,9 @@ class CodeView : public MsgBroadcast
 	private:
 		// main windows widget : 
 		GtkWidget *         m_widget;
+		int32_t             m_displayUniqueId;
+		//position_ts         m_displayStart;                 //!< position where the display is starting
+		//position_ts         m_displaySize;                  //!< number of char displayable in the screan
 		// récupération des proprieter général...
 		BufferManager *     m_bufferManager;
 		ColorizeManager *   m_colorManager;

Sources/GuiTools/MainWindows/MainWindows.cpp

@@ -85,7 +85,7 @@ MainWindows::MainWindows(void) : MsgBroadcast("Main Windows", EDN_CAT_GUI)
 #else
 	ExitIconeFile = "./data/imagesSources/delete-24px.png";
 #endif
-	// TODO : find a good way to chenge the size of an image
+	// TODO : find a good way to change the size of an image
 	GtkWidget *myImageQuit = gtk_image_new_from_file(ExitIconeFile.c_str());
 	GtkIconSize mySize = GTK_ICON_SIZE_SMALL_TOOLBAR;
 	//EDN_DEBUG(" plop : " << mySize);
@@ -100,9 +100,24 @@ MainWindows::MainWindows(void) : MsgBroadcast("Main Windows", EDN_CAT_GUI)
 	
 	// add the real menu bar
 	gtk_box_pack_start(	GTK_BOX (hboxMenu), m_MenuBar.GetWidget(), FALSE, FALSE, 0);
+	GdkColor color;
+	GtkStateType tmpppppp = GTK_STATE_NORMAL;
+	//GtkStateType tmpppppp = GTK_STATE_ACTIVE;
+	//GtkStateType tmpppppp = GTK_STATE_PRELIGHT;
+	//GtkStateType tmpppppp = GTK_STATE_SELECTED;
+	//GtkStateType tmpppppp = GTK_STATE_INSENSITIVE;
+	//gdk_color_parse ("green", &color);
+	//gtk_widget_modify_fg(m_MenuBar.GetWidget(), tmpppppp, &color);
+	//gdk_color_parse ("blue", &color);
+	//gtk_widget_modify_bg(m_MenuBar.GetWidget(), tmpppppp, &color);
+	gdk_color_parse ("red", &color);
+	gtk_widget_modify_text(m_MenuBar.GetWidget(), tmpppppp, &color);
+	//gdk_color_parse ("orange", &color);
+	gtk_widget_modify_base(m_MenuBar.GetWidget(), tmpppppp, &color);
 
 	// Add title
-	
+	m_internalTitleLabel = gtk_label_new("Edn");
+	gtk_box_pack_start(	GTK_BOX (hboxMenu), m_internalTitleLabel, FALSE, FALSE, 0);
 #endif
 	// **********************************************************
 	// *                Horizontal ELEMENTS :                   *
@@ -150,12 +165,23 @@ void MainWindows::SetTitle(Edn::File &fileName, bool isModify)
 	}
 	tmp += "Edn";
 	gtk_window_set_title(GTK_WINDOW(m_mainWindow), tmp.c_str());
+	tmp = "  ";
+	if (fileName.GetShortFilename() != "") {
+		tmp = fileName.GetFolder();
+		tmp += "/";
+		tmp += fileName.GetShortFilename();
+	} else {
+		tmp = "Edn";
+	}
+	gtk_label_set_text(GTK_LABEL(m_internalTitleLabel), tmp.c_str());
+	
 }
 
 void MainWindows::SetNoTitle(void)
 {
 	Edn::String tmp = "Edn";
 	gtk_window_set_title(GTK_WINDOW(m_mainWindow), tmp.c_str());
+	gtk_label_set_text(GTK_LABEL(m_internalTitleLabel), tmp.c_str());
 }
 
 void MainWindows::OnMessage(int32_t id, int32_t dataID)
@@ -175,49 +201,22 @@ void MainWindows::OnMessage(int32_t id, int32_t dataID)
 				}
 			}
 			break;
-		case EDN_MSG__QUIT:
-			OnQuit(m_mainWindow, this);
-			break;
 	}
 }
 
 bool MainWindows::OnQuit(GtkWidget *widget, gpointer data)
 {
-	EDN_INFO("quit requested");
+	//MainWindows * self = reinterpret_cast<MainWindows*>(data);
-	// dlg to confirm the quit event : 
+	GeneralSendMessage(EDN_MSG__GUI_SHOW_EXIT_CONFIRMATION);
-	GtkWidget *p_dialog = gtk_dialog_new_with_buttons("Exit",
+	// Close is not managed here ...
-	                                                  GTK_WINDOW(widget),
-	                                                  GTK_DIALOG_MODAL,
-	                                                  GTK_STOCK_YES, GTK_RESPONSE_YES,
-	                                                  GTK_STOCK_NO, GTK_RESPONSE_NO,
-	                                                  NULL);
-	GtkWidget *p_label =  gtk_label_new ("Do you want exit Edn?");
-	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area( GTK_DIALOG(p_dialog) )), p_label, TRUE, TRUE, 0);
-	
-	gtk_widget_show(p_label);
-	
-	switch (gtk_dialog_run (GTK_DIALOG (p_dialog)))
-	{
-		case GTK_RESPONSE_YES:
-			gtk_widget_destroy (p_dialog);
-			
-			break;
-		case GTK_RESPONSE_NO:
-			gtk_widget_destroy (p_dialog);
-			// do not close the windows
 	return true;
-			break;
-	}
-	
-	gtk_main_quit();
-	return false;
 }
 
 
 gboolean MainWindows::OnStateChange(GtkWidget *widget, GdkEvent* event, gpointer data)
 {
 	MainWindows * self = reinterpret_cast<MainWindows*>(data);
-	EDN_WARNING("State change");
+	EDN_DEBUG("State change");
 	EDN_INFO(" change state mask : " << event->window_state.changed_mask);
 	EDN_INFO(" change state new val : " << event->window_state.new_window_state);
 	if (event->window_state.changed_mask == GDK_WINDOW_STATE_MAXIMIZED) {
@@ -233,31 +232,6 @@ gboolean MainWindows::OnStateChange(GtkWidget *widget, GdkEvent* event, gpointer
 	}
 }
 
-#if 0
-
-void MainWindows::OnMenuAbout(wxCommandEvent & WXUNUSED(event))
-{
-	//EDN_INFO("MainWindows::OnMenuAbout (event)");
-	wxAboutDialogInfo info;
-	info.SetName(wxT("edn"));
-	info.SetVersion(wxT("0.1.0 pre-Beta"));
-	info.SetDescription(wxT("Editeur De N'ours, l'Editeur Desoxyribo-Nucleique\n"
-							"Source Code Editor"));
-	info.SetCopyright(wxT(	"Copyright 2010 Edouard DUPIN, all right reserved\n"
-							"This software is distributed in the hope that it will be useful, but WITHOUT\n"
-							"ANY WARRANTY\n\n"
-							"Licence summary : \n"
-							"   You can modify and redistribute the sources code and binaries.\n"
-							"   You can send me the bug-fix\n"
-							"   You can not earn money with this Software (if the source extract from Edn\n"
-							"       represent less than 50% of original Sources)\n"
-							"Term of the licence in in the file licence.txt"));
-	wxAboutBox(info);
-
-}
-
-#endif
-
 
 
 

Sources/GuiTools/MainWindows/MainWindows.h

@@ -58,6 +58,7 @@ class MainWindows: public Singleton<MainWindows>, public MsgBroadcast
 		void            SetNoTitle(void);
 		// main windows widget : 
 		GtkWidget *     m_mainWindow;
+		GtkWidget *     m_internalTitleLabel;
 		BufferView      m_BufferView;
 		CodeView        m_CodeView;
 		MenuBar         m_MenuBar;

Sources/GuiTools/MainWindows/MenuBar.cpp

@@ -28,6 +28,7 @@
 #include "MenuBar.h"
 #include "ClipBoard.h"
 #include "charset.h"
+#include "ColorizeManager.h"
 
 #define MENU_MSG
 const char * MSG_TogleDisplayChar    = "Request a Togle of char displaying";
@@ -36,6 +37,8 @@ const char * MSG_TogleAutoIndent     = "Request a Togle of Auto Indent";
 const char * MSG_SetCharsetIso559_1  = "Set ISO 5589-1";
 const char * MSG_SetCharsetIso559_15 = "Set ISO 5589-15";
 const char * MSG_SetCharsetUTF8      = "Set UTF 8";
+const char * MSG_LoadColorBlack      = "Load Color Black";
+const char * MSG_LoadColorWhite      = "Load Color White";
 #define MSG_LINK(data)
 
 
@@ -74,6 +77,26 @@ static void CB_menuInternal(GtkMenuItem *menu_item, gpointer data)
 		GeneralSendMessage(EDN_MSG__CURRENT_SET_CHARSET, EDN_CHARSET_ISO_8859_15);
 	} else if (myPointer == MSG_SetCharsetUTF8) {
 		GeneralSendMessage(EDN_MSG__CURRENT_SET_CHARSET, EDN_CHARSET_UTF8);
+	} else if (myPointer == MSG_LoadColorWhite) {
+		ColorizeManager * myColorSystem = ColorizeManager::getInstance();
+		Edn::String homedir;
+#		ifdef NDEBUG
+			homedir = "/usr/share/edn/";
+#		else
+			homedir = "./data/";
+#		endif
+		homedir += "color_white.xml";
+		myColorSystem->LoadFile(homedir);
+	} else if (myPointer == MSG_LoadColorBlack) {
+		ColorizeManager * myColorSystem = ColorizeManager::getInstance();
+		Edn::String homedir;
+#		ifdef NDEBUG
+			homedir = "/usr/share/edn/";
+#		else
+			homedir = "./data/";
+#		endif
+		homedir += "color_black.xml";
+		myColorSystem->LoadFile(homedir);
 	}
 }
 
@@ -164,6 +187,11 @@ class MenuBarMain
 			m_message.PushBack(message);
 			// create ITEM
 			GtkWidget *tmpWidget = gtk_image_menu_item_new_from_stock( title, AccelKey::getInstance()->GetAccel() );
+			GdkColor color;
+			gdk_color_parse ("red", &color);
+			gtk_widget_modify_fg(tmpWidget, GTK_STATE_NORMAL, &color);
+			gtk_widget_modify_bg(tmpWidget, GTK_STATE_NORMAL, &color);
+			gtk_widget_modify_text(tmpWidget, GTK_STATE_NORMAL, &color);
 			// set grisage : 
 			gtk_widget_set_sensitive(tmpWidget, enable);
 			// add to the menu : 
@@ -209,7 +237,7 @@ MenuBar::MenuBar(void) : MsgBroadcast("Menu bar", EDN_CAT_GUI)
 		tmp->AddGen(GTK_STOCK_SAVE,                "ctrl+s",       EDN_MSG__CURRENT_SAVE, true);
 		tmp->AddGen(GTK_STOCK_SAVE_AS,             "ctrl+shift+s", EDN_MSG__CURRENT_SAVE_AS, true);
 		tmp->AddSeparator();
-		tmp->AddGen(GTK_STOCK_QUIT,                "ctrl+shift+q", EDN_MSG__QUIT, true);
+		tmp->AddGen(GTK_STOCK_QUIT,                "ctrl+shift+q", EDN_MSG__GUI_SHOW_EXIT_CONFIRMATION, true);
 	m_listMenu.PushBack(tmp);
 	
 	tmp = new MenuBarMain("_Edit", m_mainWidget);
@@ -254,6 +282,9 @@ MenuBar::MenuBar(void) : MsgBroadcast("Menu bar", EDN_CAT_GUI)
 		tmp->AddInternal("Set charset Internationnal (UTF 8)",   NULL, MSG_SetCharsetUTF8, true);
 		tmp->AddSeparator();
 		tmp->AddGen(     "Reload Color File",                    NULL, EDN_MSG__RELOAD_COLOR_FILE, true);
+		tmp->AddSeparator();
+		tmp->AddInternal("Set Color Black",                      NULL, MSG_LoadColorBlack, true);
+		tmp->AddInternal("Set Color White",                      NULL, MSG_LoadColorWhite, true);
 	m_listMenu.PushBack(tmp);
 	/*
 	tmp = new MenuBarMain("Project", m_mainWidget);

Sources/GuiTools/Search/Search.cpp

@@ -196,11 +196,11 @@ void Search::Display(GtkWindow *parent)
 		Edn::String myDataString = "";
 		SearchData::SetSearch(myDataString);
 		gtk_entry_set_text(GTK_ENTRY(m_searchEntry), myDataString.c_str());
-		//if (0 == strlen(myDataString.c_str())) {
+		if (0 == strlen(myDataString.c_str())) {
 			m_haveSearchData = false;
-		//} else {
+		} else {
-		//	m_haveSearchData = true;
+			m_haveSearchData = true;
-		//}
+		}
 		
 		SearchData::GetReplace(myDataString);
 		gtk_entry_set_text(GTK_ENTRY(m_replaceEntry), myDataString.c_str());
@@ -212,17 +212,14 @@ void Search::Display(GtkWindow *parent)
 		
 		gtk_widget_set_sensitive(m_BtPrevious, m_haveSearchData);
 		gtk_widget_set_sensitive(m_BtNext, m_haveSearchData);
-		if (false == m_haveSearchData) {
+		// basic no search data
 		gtk_widget_set_sensitive(m_BtReplace, false);
 		gtk_widget_set_sensitive(m_BtReplaceAndNext, false);
-		} else {
+		
-			gtk_widget_set_sensitive(m_BtReplace, m_haveReplaceData);
-			gtk_widget_set_sensitive(m_BtReplaceAndNext, m_haveReplaceData);
-		}
 		
 		// set focus on a specific widget :
-		gtk_window_set_focus(parent, m_searchEntry);
+		//gtk_window_set_focus(parent, m_searchEntry);
-		
+		gtk_widget_grab_focus(m_searchEntry);
 		
 		// display the dialogue box
 		gtk_widget_show_all(m_localDialog);
@@ -331,8 +328,8 @@ void Search::OnEntrySearchChange(GtkWidget *widget, gpointer data)
 			gtk_widget_set_sensitive(self->m_BtReplace, false);
 			gtk_widget_set_sensitive(self->m_BtReplaceAndNext, false);
 		} else {
-			gtk_widget_set_sensitive(self->m_BtReplace, self->m_haveReplaceData);
+			gtk_widget_set_sensitive(self->m_BtReplace, true);
-			gtk_widget_set_sensitive(self->m_BtReplaceAndNext, self->m_haveReplaceData);
+			gtk_widget_set_sensitive(self->m_BtReplaceAndNext, true);
 		}
 	}
 }
@@ -351,7 +348,12 @@ void Search::OnEntryReplaceChange(GtkWidget *widget, gpointer data)
 		} else {
 			self->m_haveReplaceData = true;
 		}
-		gtk_widget_set_sensitive(self->m_BtReplace, self->m_haveReplaceData);
+		if (false == self->m_haveSearchData) {
-		gtk_widget_set_sensitive(self->m_BtReplaceAndNext, self->m_haveReplaceData);
+			gtk_widget_set_sensitive(self->m_BtReplace, false);
+			gtk_widget_set_sensitive(self->m_BtReplaceAndNext, false);
+		} else {
+			gtk_widget_set_sensitive(self->m_BtReplace, true);
+			gtk_widget_set_sensitive(self->m_BtReplaceAndNext, true);
+		}
 	}
 }

Sources/GuiTools/WindowsManager/WindowsManager.cpp

@@ -93,10 +93,8 @@ void WindowsManager::OnMessage(int32_t id, int32_t dataID)
 				
 				GtkWidget *dialog = gtk_file_chooser_dialog_new( "Open File", NULL,
 				                                                 GTK_FILE_CHOOSER_ACTION_OPEN,
-				                                                 GTK_STOCK_CANCEL, // button text
+				                                                 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				                                                 GTK_RESPONSE_CANCEL, // response id
+				                                                 GTK_STOCK_OPEN,   GTK_RESPONSE_ACCEPT,
-				                                                 GTK_STOCK_OPEN, // button text
-				                                                 GTK_RESPONSE_ACCEPT, // response id
 				                                                 NULL); // end button/response list
 				// this element did not apear in the miniature of the windows
 				gtk_window_set_skip_pager_hint(GTK_WINDOW(dialog), TRUE);
@@ -137,10 +135,8 @@ void WindowsManager::OnMessage(int32_t id, int32_t dataID)
 				tmpString += myBuffer->GetFileName().GetShortFilename().c_str();
 				GtkWidget *dialog = gtk_file_chooser_dialog_new( tmpString.c_str(), NULL,
 				                                                 GTK_FILE_CHOOSER_ACTION_SAVE,
-				                                                 GTK_STOCK_CANCEL, // button text
+				                                                 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				                                                 GTK_RESPONSE_CANCEL, // response id
+				                                                 GTK_STOCK_SAVE,   GTK_RESPONSE_ACCEPT,
-				                                                 GTK_STOCK_SAVE, // button text
-				                                                 GTK_RESPONSE_ACCEPT, // response id
 				                                                 NULL); // end button/response list
 				// this element did not apear in the miniature of the windows
 				gtk_window_set_skip_pager_hint(GTK_WINDOW(dialog), TRUE);
@@ -159,54 +155,40 @@ void WindowsManager::OnMessage(int32_t id, int32_t dataID)
 			break;
 		case EDN_MSG__GUI_SHOW_ABOUT:
 			{
-				// dlg to confirm the quit event : 
+				GtkWidget  *myDialog = gtk_about_dialog_new();
-				GtkWidget *myDialog = gtk_dialog_new_with_buttons("About",
+				gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(myDialog), "Edn");
-				                                                  NULL,
+				gtk_about_dialog_set_version(     GTK_ABOUT_DIALOG(myDialog), VERSION_TAG_NAME);
-				                                                  GTK_DIALOG_MODAL,
+				gtk_about_dialog_set_comments(    GTK_ABOUT_DIALOG(myDialog), "Editeur De N'ours\n"
-				                                                  GTK_STOCK_QUIT, GTK_RESPONSE_NO,
+				                                                              "L'Editeur Desoxyribo-Nucleique.\n"
-				                                                  NULL);
+				                                                              "Source Code Editor\n"
-				// this element did not apear in the miniature of the windows
+				                                                              "Build Time : " VERSION_BUILD_TIME);
-				gtk_window_set_skip_pager_hint(GTK_WINDOW(myDialog), TRUE);
+				gtk_about_dialog_set_copyright(   GTK_ABOUT_DIALOG(myDialog), "Copyright 2010 Edouard DUPIN, all right reserved");
-				GtkWidget *myContentArea = gtk_dialog_get_content_area( GTK_DIALOG(myDialog));
+				gtk_about_dialog_set_license(     GTK_ABOUT_DIALOG(myDialog), "This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY\n\n"
-				GtkWidget *myLabel =  gtk_label_new("");
+				                                                              "You can:\n"
-				gtk_label_set_markup (GTK_LABEL (myLabel),
-				    "<b>Name :</b> Edn\n"
-				    "<b>Version :</b> " VERSION_TAG_NAME "\n"
-				    "<b>Build Time :</b> " VERSION_BUILD_TIME "\n\n"
-				    "<b>Description :</b> Editeur De N'ours, l'Editeur Desoxyribo-Nucleique\n"
-				    "    Source Code Editor\n\n" 
-				    "<b>Copyright 2010 Edouard DUPIN, all right reserved</b>\n\n"
-				    "<b>Terms of license : </b>\n"
-				    "This software is distributed in the hope that it will be useful, but \n"
-				    "WITHOUT ANY WARRANTY\n"
-				    "    <b>You can:</b>\n"
 				                                                              "    * Redistribute the sources code and binaries.\n"
 				                                                              "    * Modify the Sources code.\n"
-				    "        * Use a part of the sources (less than 50%) in an other software,\n"
+				                                                              "    * Use a part of the sources (less than 50%) in an other software, just write somewhere \"Edn is great\" visible by the user (on your product or on your website with a link to my page).\n"
-				    "          just write somewhere \"Edn is great\" visible by the user (on \n"
-				    "          your product or on your website with a link to my page).\n"
 				                                                              "    * Redistribute the modification only if you want.\n"
 				                                                              "    * Send me the bug-fix (it could be great).\n"
 				                                                              "    * Pay me a beer or some other things.\n"
-				    "        Print the source code on WC paper ...\n"
+				                                                              "    * Print the source code on WC paper ...\n\n"
-				    "    <b>You can NOT:</b>\n"
+				                                                              "You can NOT:\n"
 				                                                              "    * Earn money with this Software (But I can).\n"
 				                                                              "    * Add malware in the Sources.\n"
 				                                                              "    * Do something bad with the sources.\n"
-				    "        * Use it to travel in the space with a toaster.\n"
+				                                                              "    * Use it to travel in the space with a toaster.\n\n"
-				    "I reserve the right to change this licence. If it change the version of \n"
+				                                                              "I reserve the right to change this licence. If it change the version of the copy you have keep its own license.");
-				    "the copy you have keep its own license.\n\n"
+				gtk_about_dialog_set_wrap_license(GTK_ABOUT_DIALOG(myDialog), true);
-				    "<b>Sources : </b> git://github.com/HeeroYui/edn.git ");
+#				if USE_GTK_VERSION_3_0
-				gtk_box_pack_start(GTK_BOX(myContentArea), myLabel, TRUE, TRUE, 0);
+				gtk_about_dialog_set_license_type(GTK_ABOUT_DIALOG(myDialog), GTK_LICENSE_CUSTOM);
-				
+#				endif
-				gtk_widget_show_all(myContentArea);
+				gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(myDialog), "http://HeeroYui.github.com/edn");
-				int32_t result = gtk_dialog_run (GTK_DIALOG (myDialog));
+				gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(myDialog), "Edn on github");
+				const char * listAutor[] = {"Edouard DUPIN", NULL};
+				gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(myDialog), listAutor);
+				// Display About
+				gtk_dialog_run(GTK_DIALOG(myDialog));
 				gtk_widget_destroy(myDialog);
-				switch (result)
-				{
-					case GTK_RESPONSE_NO:
-						break;
-				}
 			}
 			break;
 		case EDN_MSG__GUI_SHOW_GOTO_LINE:
@@ -250,5 +232,89 @@ void WindowsManager::OnMessage(int32_t id, int32_t dataID)
 				gtk_widget_destroy(myDialog);
 			}
 			break;
+		case EDN_MSG__GUI_SHOW_EXIT_CONFIRMATION:
+			{
+				EDN_INFO("quit requested");
+				// dlg to confirm the quit event : 
+				GtkWidget *p_dialog = gtk_dialog_new_with_buttons("Exit",
+				                                                  GTK_WINDOW(m_mainWindow->GetWidget()),
+				                                                  GTK_DIALOG_MODAL,
+				                                                  GTK_STOCK_YES, GTK_RESPONSE_YES,
+				                                                  GTK_STOCK_NO, GTK_RESPONSE_NO,
+				                                                  NULL);
+				GtkWidget *p_label =  gtk_label_new ("Do you want exit Edn ?");
+				gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area( GTK_DIALOG(p_dialog) )), p_label, TRUE, TRUE, 0);
+				gtk_widget_show(p_label);
+				
+				switch (gtk_dialog_run (GTK_DIALOG (p_dialog)))
+				{
+					case GTK_RESPONSE_YES:
+						gtk_widget_destroy (p_dialog);
+						p_dialog = NULL;
+						{
+							BufferManager * myBufferMng = BufferManager::getInstance();
+							for (int32_t iii=0 ; iii<myBufferMng->Size() ; iii++) {
+								if (true==myBufferMng->Exist(iii) ) {
+									Buffer * myBuffer = myBufferMng->Get(iii);
+									if (NULL != myBuffer) {
+										if (true == myBuffer->IsModify()) {
+											if (true == myBuffer->HaveName()) {
+												p_dialog = gtk_dialog_new_with_buttons("Save Before Exit",
+												                                       GTK_WINDOW(m_mainWindow->GetWidget()),
+												                                       GTK_DIALOG_MODAL,
+												                                       GTK_STOCK_SAVE,    GTK_RESPONSE_YES,
+												                                       GTK_STOCK_SAVE_AS, GTK_RESPONSE_ACCEPT,
+												                                       GTK_STOCK_NO,      GTK_RESPONSE_NO,
+												                                       GTK_STOCK_CANCEL,  GTK_RESPONSE_CANCEL,
+												                                       NULL);
+											} else {
+												p_dialog = gtk_dialog_new_with_buttons("Save Before Exit",
+												                                       GTK_WINDOW(m_mainWindow->GetWidget()),
+												                                       GTK_DIALOG_MODAL,
+												                                       GTK_STOCK_SAVE_AS, GTK_RESPONSE_ACCEPT,
+												                                       GTK_STOCK_NO,      GTK_RESPONSE_NO,
+												                                       GTK_STOCK_CANCEL,  GTK_RESPONSE_CANCEL,
+												                                       NULL);
+											}
+											char tmpName[1024];
+											sprintf(tmpName, "Save file \"%s\" ?", myBuffer->GetFileName().GetCompleateName().c_str());
+											p_label = gtk_label_new(tmpName);
+											gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area( GTK_DIALOG(p_dialog) )), p_label, TRUE, TRUE, 0);
+											gtk_widget_show(p_label);
+											
+											switch (gtk_dialog_run (GTK_DIALOG (p_dialog)))
+											{
+												case GTK_RESPONSE_YES:
+													myBuffer->Save();
+													break;
+												case GTK_RESPONSE_ACCEPT:
+													OnMessage(EDN_MSG__GUI_SHOW_SAVE_AS, iii);
+													break;
+												case GTK_RESPONSE_NO:
+													// nothing to do ...
+													break;
+												case GTK_RESPONSE_CANCEL:
+													gtk_widget_destroy (p_dialog);
+													return;
+													break;
+											}
+											gtk_widget_destroy (p_dialog);
+											p_dialog = NULL;
+										}
+									}
+								}
+							}
+						}
+						gtk_main_quit();
+						break;
+					case GTK_RESPONSE_NO:
+						gtk_widget_destroy (p_dialog);
+						break;
+				}
+				
+				
+			}
+			break;
+	
 	}
 }

Sources/Highlight/Highlight.cpp

@@ -233,7 +233,7 @@ void Highlight::Parse(int32_t start,
 					if (metaData[kkk].beginStart <= resultat.endStop) {
 						// Remove element
 						//EDN_INFO("Erase element=" << kkk);
-						metaData.Erase(kkk, kkk+1);
+						metaData.EraseLen(kkk, kkk+1);
 						// Increase the end of search
 						if (kkk < metaData.Size()) {
 							// just befor the end of the next element

Sources/ctags/CTagsManager.cpp

@@ -170,7 +170,7 @@ void CTagsManager::AddToHistory(int32_t bufferID)
 		for(int32_t iii= m_historyPos; iii < m_historyList.Size(); iii++) {
 			delete(m_historyList[iii]);
 		}
-		m_historyList.Erase(m_historyPos, m_historyList.Size() - m_historyPos);
+		m_historyList.EraseLen(m_historyPos, m_historyList.Size() - m_historyPos);
 	}
 	// add the current element
 	BufferManager *myBufferManager = BufferManager::getInstance();

Sources/tools/Display/Display.cpp

@@ -61,13 +61,6 @@ static cairo_font_face_t	* m_cairoFont[2][2] = {{NULL, NULL},{ NULL, NULL}};
 static cairo_font_face_t	* m_cairoFont[2][2] = {{NULL, NULL},{ NULL, NULL}};
 void Display::Init(void)
 {
-	/*
-	charWidth = gdk_char_width(myFont[FONT_ITALIC_YES][FONT_BOLD_NO], 'Z');
-	EDN_INFO("Font Width = %d", charWidth);
-	charHeignt = gdk_char_height(myFont[FONT_ITALIC_YES][FONT_BOLD_NO], 'Z');
-	EDN_INFO("Font Height = %d", charHeignt);
-	*/
-	
 	m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_NO]    = cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
 	m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_NO]   = cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_ITALIC, CAIRO_FONT_WEIGHT_NORMAL);
 	m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_YES]   = cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
@@ -96,10 +89,10 @@ void Display::Init(void)
 void Display::UnInit(void)
 {
 	// clean the builder...
-	free(m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_NO]);
+	cairo_font_face_destroy(m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_NO]);
-	free(m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_NO]);
+	cairo_font_face_destroy(m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_NO]);
-	free(m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_YES]);
+	cairo_font_face_destroy(m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_YES]);
-	free(m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_YES]);
+	cairo_font_face_destroy(m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_YES]);
 }
 
 
@@ -166,6 +159,8 @@ DrawerManager::DrawerManager(GtkWidget * widget, int32_t x, int32_t y)
 	
 	cairo_scale(m_cairo, 1.0, 1.0);
 	
+	m_nbElement = 0;
+	
 	// http://cairographics.org/FAQ/#clear_a_surface
 	// http://gtk.developpez.com/faq/?page=gtkwidget#GTK_WIDGET_transparent
 	//cairo_set_source_rgba(m_cairo, 1, 1, 1, 0);
@@ -289,16 +284,15 @@ void DrawerManager::SpaceText(color_ts & SelectColor, int32_t x, int32_t y,int32
 void DrawerManager::Flush(void)
 {
 	if (true == m_haveWork) {
-		//EDN_WARNING("flush : \"" << m_dataToDisplay << "\"");
+		//EDN_WARNING("flush : \"" << m_dataToDisplay << "\"" << " bold=" << m_selectColor->GetBold() << " italic=" << m_selectColor->GetItalic());
 		m_haveWork = false;
 
 		cairo_set_font_face(m_cairo, Display::GetFont(m_selectColor->GetBold(), m_selectColor->GetItalic()));
 		int32_t letterHeight = Display::GetFontHeight();
 		if (true == m_selectColor->HaveBg() ) {
 			int32_t letterWidth = Display::GetFontWidth();
-			int32_t stringLen = m_nbElement;
 			// generate Clean BG:
-			DirectRectangle(m_selectColor, m_pos.x, m_pos.y, letterWidth*stringLen, letterHeight);
+			DirectRectangle(m_selectColor, m_pos.x, m_pos.y, letterWidth*m_nbElement, letterHeight);
 		}
 		cairo_move_to(m_cairo, m_pos.x, m_pos.y+letterHeight-4);
 		m_selectColor->ApplyFG(m_cairo);
@@ -357,9 +351,10 @@ void DrawerManager::DirectRectangle(Colorize *SelectColor, int32_t x, int32_t y,
 	// flush
 	cairo_fill(m_cairo);
 }
+
+
 void DrawerManager::DirectRectangle(color_ts &SelectColor, int32_t x, int32_t y, int32_t width, int32_t height)
 {
-
 	cairo_set_source_rgb(m_cairo, SelectColor.red, SelectColor.green, SelectColor.blue);
 	// set postion
 	cairo_rectangle(m_cairo, x, y, width, height);

Sources/tools/EdnBuf/EdnBuf.h

@@ -164,7 +164,8 @@ class EdnBuf {
 		void                                    FindMainHighLightPosition(int32_t startPos, int32_t endPos, int32_t &startId, int32_t &stopId, bool backPreviousNotEnded);
 	public:
 		void                                    SetHLSystem(  Highlight * newHLSystem);
-		void                                    HightlightGenerateLines(displayHLData_ts & MData, int32_t startPos, int32_t nbLines);
+		void                                    HightlightOneLine(displayHLData_ts & MData, int32_t HLStart, int32_t HLStop);
+		void                                    HightlightGenerateLines(displayHLData_ts & MData, int32_t startPos, int32_t nbLines); // TODO : deprecated ...
 		colorInformation_ts *                   GetElementColorAtPosition(displayHLData_ts & MData, int32_t pos);
 	private:
 		colorInformation_ts *                   GetElementColorAtPosition(int32_t pos, int32_t &starPos);

Sources/tools/EdnBuf/EdnBuf_HighLight.cpp

@@ -90,17 +90,17 @@ void EdnBuf::RegenerateHighLightAt(int32_t pos, int32_t nbDeleted, int32_t nbAdd
 				m_HLDataPass1.Erase(0);
 				//EDN_DEBUG("1 * Erase 0");
 			} else {
-				m_HLDataPass1.Erase(0,stopId);
+				m_HLDataPass1.EraseLen(0,stopId);
 				//EDN_DEBUG("2 * Erase 0->" << stopId);
 			}
 		} else if(-1 == stopId) {
 			//EDN_DEBUG("3 * Erase " << startId+1 << "-> end");
-			m_HLDataPass1.Erase(startId+1, m_HLDataPass1.Size() - startId);
+			m_HLDataPass1.EraseLen(startId+1, m_HLDataPass1.Size() - startId);
 			stopId = -1;
 		} else {
 			int32_t currentSize = m_HLDataPass1.Size();
 			//EDN_DEBUG("4 * Erase " << startId+1 << "->" << stopId << " in " << currentSize << " elements" );
-			m_HLDataPass1.Erase(startId+1, stopId - startId);
+			m_HLDataPass1.EraseLen(startId+1, stopId - startId);
 			if (stopId == currentSize-1) {
 				stopId = -1;
 			}
@@ -286,6 +286,71 @@ colorInformation_ts *EdnBuf::GetElementColorAtPosition(int32_t pos, int32_t &sta
 	return NULL;
 }
 
+//#define COUNT_TIME plop
+
+void EdnBuf::HightlightOneLine(displayHLData_ts & MData, int32_t HLStart, int32_t HLStop)
+{
+	MData.posHLPass1 = 0;
+	MData.posHLPass2 = 0;
+	if (NULL == m_Highlight) {
+		return;
+	}
+	#ifdef COUNT_TIME
+		GTimeVal timeStart;
+		g_get_current_time(&timeStart);
+	#endif
+	int32_t startId, stopId;
+	// find element previous
+	FindMainHighLightPosition(HLStart, HLStop, startId, stopId, true);
+
+	int32_t k;
+	//EDN_DEBUG("List of section between : "<< startId << " & " << stopId);
+	int32_t endSearch = stopId+1;
+	if (-1 == stopId) {
+		endSearch = m_HLDataPass1.Size();
+	}
+	for (k=edn_max(startId, 0); k<endSearch; k++) {
+		// empty section :
+		if (0==k) {
+			if (HLStart < m_HLDataPass1[k].beginStart) {
+				//EDN_DEBUG("  ==> (empty section 1 ) k="<<k<<" start="<<HLStart<<" stop="<<m_HLDataPass1[k].beginStart );
+				m_Highlight->Parse2(HLStart,
+									m_HLDataPass1[k].beginStart,
+									MData.HLData,
+									m_data);
+			} // else : nothing to do ...
+		} else {
+			//EDN_DEBUG("  ==> (empty section 2 ) k="<<k<<" start="<<m_HLDataPass1[k-1].endStop<<" stop="<<m_HLDataPass1[k].beginStart );
+			m_Highlight->Parse2(m_HLDataPass1[k-1].endStop,
+								m_HLDataPass1[k].beginStart,
+								MData.HLData,
+								m_data);
+		}
+		// under section :
+		//EDN_DEBUG("  ==> (under section   ) k="<<k<<" start="<<m_HLDataPass1[k].beginStart<<" stop="<<m_HLDataPass1[k].endStop << " subSectionOfID=" << 99999999);
+		// TODO : ...
+	}
+	if (endSearch == (int32_t)m_HLDataPass1.Size() ){
+		if (m_HLDataPass1.Size() != 0) {
+			//EDN_DEBUG("  ==> (empty section 3 ) k="<<k<<" start="<<m_HLDataPass1[k-1].endStop<<" stop="<<HLStop );
+			m_Highlight->Parse2(m_HLDataPass1[k-1].endStop,
+								HLStop,
+								MData.HLData,
+								m_data);
+		} else {
+			//EDN_DEBUG("  ==> (empty section 4 ) k="<<k<<" start=0 stop="<<HLStop );
+			m_Highlight->Parse2(0,
+								HLStop,
+								MData.HLData,
+								m_data);
+		}
+	}
+	#ifdef COUNT_TIME
+		GTimeVal timeStop;
+		g_get_current_time(&timeStop);
+		EDN_DEBUG("Display reAnnalyse = " << timeStop.tv_usec - timeStart.tv_usec << " micro-s");
+	#endif
+}
 
 
 void EdnBuf::HightlightGenerateLines(displayHLData_ts & MData, int32_t HLStart, int32_t nbLines)
@@ -354,7 +419,6 @@ void EdnBuf::HightlightGenerateLines(displayHLData_ts & MData, int32_t HLStart,
 		g_get_current_time(&timeStop);
 		EDN_DEBUG("Display reAnnalyse = " << timeStop.tv_usec - timeStart.tv_usec << " micro-s");
 	}
-
 }
 
 

Sources/tools/MsgBroadcast/MsgBroadcast.cpp

@@ -79,8 +79,8 @@ static char * GetMessageChar(messageType_te Id)
 {
 	switch(Id)
 	{
-		MACRO_DISPLAY_MSG(EDN_MSG__QUIT)
 		MACRO_DISPLAY_MSG(EDN_MSG__BUFFER_CHANGE_CURRENT)
+		MACRO_DISPLAY_MSG(EDN_MSG__USER_DISPLAY_CHANGE)
 
 		MACRO_DISPLAY_MSG(EDN_MSG__GUI_SHOW_MAIN_WINDOWS)
 		MACRO_DISPLAY_MSG(EDN_MSG__GUI_SHOW_SEARCH)
@@ -90,6 +90,7 @@ static char * GetMessageChar(messageType_te Id)
 		MACRO_DISPLAY_MSG(EDN_MSG__GUI_SHOW_SAVE_AS)
 		MACRO_DISPLAY_MSG(EDN_MSG__GUI_SHOW_GOTO_LINE)
 		MACRO_DISPLAY_MSG(EDN_MSG__GUI_SHOW_ABOUT)
+		MACRO_DISPLAY_MSG(EDN_MSG__GUI_SHOW_EXIT_CONFIRMATION)
 	
 		MACRO_DISPLAY_MSG(EDN_MSG__BUFFER_REMOVE)
 		MACRO_DISPLAY_MSG(EDN_MSG__BUFFER_REMOVE_ALL)

Sources/tools/MsgBroadcast/MsgBroadcast.h

@@ -38,9 +38,8 @@
 // the ID we'll use to identify our event
 typedef enum {
 	EDN_MSG__NONE = 0,
-	// Programm is Quitting... close all if needed ...
-	EDN_MSG__QUIT,
 	EDN_MSG__BUFFER_CHANGE_CURRENT,  // set the new current BUFFER ...
+	EDN_MSG__USER_DISPLAY_CHANGE,    // User change the display ==> need to reload all the display depending on color internal
 	
 	// DESTINATION : GUI_MANAGER
 	MSG_TO_GUI_MANAGER__START,
@@ -53,6 +52,7 @@ typedef enum {
 		EDN_MSG__GUI_SHOW_SAVE_AS,
 		EDN_MSG__GUI_SHOW_GOTO_LINE,
 		EDN_MSG__GUI_SHOW_ABOUT,
+		EDN_MSG__GUI_SHOW_EXIT_CONFIRMATION,
 	MSG_TO_GUI_MANAGER__STOP,
 	
 	// DESTINATION : GUI

Sources/tools/NameSpaceEdn/String.cpp

@@ -471,7 +471,7 @@ void Edn::String::Remove(int32_t currentID, int32_t len)
 		return;
 	}
 	// TODO : check the size of the data
-	m_data.Erase(currentID, len);
+	m_data.EraseLen(currentID, len);
 }
 
 

Sources/tools/NameSpaceEdn/VectorType.h

@@ -474,7 +474,33 @@ template<typename MY_TYPE=int32_t> class VectorType
 		}
 
 		/**
-		 * @brief Remove one element
+		 * @brief Remove N elements
+		 *
+		 * @param[in] pos Position to remove the data
+		 * @param[in] posEnd Last position number
+		 *
+		 * @return ---
+		 *
+		 */
+		void Erase(int32_t pos, int32_t posEnd)
+		{
+			if (pos>m_size) {
+				EDN_ERROR(" can not Erase Element at this position : " << pos << " > " << m_size);
+				return;
+			}
+			if (posEnd>m_size) {
+				posEnd = m_size;
+			}
+			int32_t nbElement = m_size - pos;
+			int32_t tmpSize = m_size;
+			// move curent data
+			memmove((m_data + pos), (m_data + pos + nbElement), (tmpSize - (pos+nbElement))*sizeof(MY_TYPE) );
+			// Request resize of the current buffer
+			Resize(m_size-nbElement);
+		}
+
+		/**
+		 * @brief Remove N element
 		 *
 		 * @param[in] pos Position to remove the data
 		 * @param[in] nbElement number of element to remove
@@ -482,10 +508,10 @@ template<typename MY_TYPE=int32_t> class VectorType
 		 * @return ---
 		 *
 		 */
-		void Erase(int32_t pos, int32_t nbElement)
+		void EraseLen(int32_t pos, int32_t nbElement)
 		{
 			if (pos>m_size) {
-				EDN_ERROR(" can not Erase Element at this position : " << pos << " > " << m_size);
+				EDN_ERROR(" can not Erase Len Element at this position : " << pos << " > " << m_size);
 				return;
 			}
 			if (pos+nbElement>m_size) {

Sources/tools/charset/charset.cpp

@@ -422,7 +422,11 @@ static uint32_t Utf8_GetValue(UTF8Element_ts &Element)
 int32_t strUtf8Len(const char *input_UTF8)
 {
 	int32_t count = 0;
-	int32_t size = strlen(input_UTF8);
+	int32_t sizeInput = strlen(input_UTF8);
+	int32_t size = sizeInput;
+	if (size>20) {
+		EDN_DEBUG("check SIZE...");
+	}
 	uint8_t tmpSize;
 	bool baseValid;
 	while (size > 0) {
@@ -593,18 +597,18 @@ void ConvertInput(GdkEventKey *event, char* Utf8Out, bool &controlKey, bool &mov
 #       elif USE_GTK_VERSION_2_0
 		case GDK_KP_Tab:
 #		endif
+		// shift + TAB ... same as a tab here ...
+		case 0xfe20: //GDK_ISO_Left_Tab
 		case 65289:
 			key = (int32_t)'\t';
 			break;
 #		ifdef USE_GTK_VERSION_3_0
 		case GDK_KEY_KP_Enter:
-			key = GDK_KEY_Return;
-			break;
 #       elif USE_GTK_VERSION_2_0
 		case GDK_KP_Enter:
-			key = GDK_Return;
-			break;
 #		endif
+			key = '\n';
+			break;
 #		ifdef USE_GTK_VERSION_3_0
 		case GDK_KEY_KP_F1:
 		case GDK_KEY_F1:
@@ -1038,17 +1042,129 @@ void ConvertInput(GdkEventKey *event, char* Utf8Out, bool &controlKey, bool &mov
 #		endif
 			key = 0x08;
 			break;
+
+#		ifdef USE_GTK_VERSION_3_0
+		case GDK_KEY_dead_grave:
+		case GDK_KEY_dead_acute:
+		case GDK_KEY_dead_circumflex:
+		case GDK_KEY_dead_tilde:
+		case GDK_KEY_dead_macron:
+		case GDK_KEY_dead_breve:
+		case GDK_KEY_dead_abovedot:
+		case GDK_KEY_dead_diaeresis:
+		case GDK_KEY_dead_abovering:
+		case GDK_KEY_dead_doubleacute:
+		case GDK_KEY_dead_caron:
+		case GDK_KEY_dead_cedilla:
+		case GDK_KEY_dead_ogonek:
+		case GDK_KEY_dead_iota:
+		case GDK_KEY_dead_voiced_sound:
+		case GDK_KEY_dead_semivoiced_sound:
+		case GDK_KEY_dead_belowdot:
+		case GDK_KEY_dead_hook:
+		case GDK_KEY_dead_horn:
+		case GDK_KEY_dead_stroke:
+		case GDK_KEY_dead_abovecomma:
+		case GDK_KEY_dead_abovereversedcomma:
+		case GDK_KEY_dead_doublegrave:
+		case GDK_KEY_dead_belowring:
+		case GDK_KEY_dead_belowmacron:
+		case GDK_KEY_dead_belowcircumflex:
+		case GDK_KEY_dead_belowtilde:
+		case GDK_KEY_dead_belowbreve:
+		case GDK_KEY_dead_belowdiaeresis:
+		case GDK_KEY_dead_invertedbreve:
+		case GDK_KEY_dead_belowcomma:
+		case GDK_KEY_dead_currency:
+		case GDK_KEY_dead_a:
+		case GDK_KEY_dead_A:
+		case GDK_KEY_dead_e:
+		case GDK_KEY_dead_E:
+		case GDK_KEY_dead_i:
+		case GDK_KEY_dead_I:
+		case GDK_KEY_dead_o:
+		case GDK_KEY_dead_O:
+		case GDK_KEY_dead_u:
+		case GDK_KEY_dead_U:
+		case GDK_KEY_dead_small_schwa:
+		case GDK_KEY_dead_capital_schwa:
+#       elif USE_GTK_VERSION_2_0
+		case GDK_dead_grave:
+		case GDK_dead_acute:
+		case GDK_dead_circumflex:
+			key = '^';
+			break;
+		case GDK_dead_tilde:
+		case GDK_dead_macron:
+		case GDK_dead_breve:
+		case GDK_dead_abovedot:
+		case GDK_dead_diaeresis:
+		case GDK_dead_abovering:
+		case GDK_dead_doubleacute:
+		case GDK_dead_caron:
+		case GDK_dead_cedilla:
+		case GDK_dead_ogonek:
+		case GDK_dead_iota:
+		case GDK_dead_voiced_sound:
+		case GDK_dead_semivoiced_sound:
+		case GDK_dead_belowdot:
+		case GDK_dead_hook:
+		case GDK_dead_horn:
+		case GDK_dead_stroke:
+		case GDK_dead_abovecomma:
+		case GDK_dead_abovereversedcomma:
+		case GDK_dead_doublegrave:
+		case GDK_dead_belowring:
+		case GDK_dead_belowmacron:
+		case GDK_dead_belowcircumflex:
+		case GDK_dead_belowtilde:
+		case GDK_dead_belowbreve:
+		case GDK_dead_belowdiaeresis:
+		case GDK_dead_invertedbreve:
+		case GDK_dead_belowcomma:
+		case GDK_dead_currency:
+			key = '?';
+			break;
+		case GDK_dead_a:
+			EDN_INFO("dead a");
+			//key = 'a';
+			break;
+		case GDK_dead_A:
+		case GDK_dead_e:
+		case GDK_dead_E:
+		case GDK_dead_i:
+		case GDK_dead_I:
+		case GDK_dead_o:
+		case GDK_dead_O:
+		case GDK_dead_u:
+		case GDK_dead_U:
+		case GDK_dead_small_schwa:
+		case GDK_dead_capital_schwa:
+#		endif
+			key = '?';
+			break;
+#		ifdef USE_GTK_VERSION_3_0
+		case GDK_KEY_Caps_Lock:
+#		elif USE_GTK_VERSION_2_0
+		case GDK_Caps_Lock:
+#       endif
+			controlKey = true;
+			break;
 		default:
 			break;
 	}
 	// Transform in unicode the input : 
+	//EDN_INFO("key : " << key);
 	int32_t unichar = gdk_keyval_to_unicode(key);
+	//EDN_INFO("unichar : " << unichar);
 	if (unichar == 0) {
 		Utf8Out[0] = (char)key;
 		Utf8Out[1] = '\0';
+		//EDN_INFO("NON UTF8 : " << Utf8Out);
 	} else {
 		// Generate UTF8 form UniCode
 		convertUnicodeToUtf8(unichar, Utf8Out);
+		//EDN_INFO("UTF8 : " << Utf8Out);
 		#if 0
 		printf(" convertUnicodeToUtf8 : \"0x%08x\" ==> unichar=%d %s\n", key, unichar, Utf8Out);
 		for (int32_t uu=0; uu < strlen(Utf8Out); uu++) {

avancement.boo

@@ -1,130 +1,69 @@
-# For the first realease 1.0 :
-	* Syst<73>mes : 
-		- Affichage ligne par ligne
-		- Correction du bug de hl(sub patern empty)
-		- Verifier si le hldisplay reaserch marche avec l'id et pas l'id-1
-		- Gestion correct des charsets
-	* Gui :
-		- Confirmer avant de fermer
-		- Demander de sauver
-		- Controle des droits
-		- Hl-gui management
-		- Event quand un fichier ouvert a changer
-		- Affichage des fichiers binaires
-		- Ctags phase 1
-		- Project manager phase 1
-
 # action a faire (ordonner par r<>vision) :
-	* 0.1.X :
+* 0.2.X :
-		- gui : demander l'enregistrement avant de fermer (quand c'est n<>cessaire)
+	- gui : Amelioration du full-screen et du display de base (sans l'entete de la fenetre)
-		- Edn::VectorType : Rewrite the erase fuction to support start => stop and Erase len methode ...
+	- gui : display partielle de la fenetre
-	* 0.2.X :
+	- gui : ascenceur quand n<>cessaire
-		- gui : Mise en place d'un display ligne par ligne
 	- gui : Demander la cr<63>ation de nouveaux fichier quand il n'existe pas (a l'ouverture en ligne de commande)
 	- sys : Mise en place des colorisation de base pour le
 			* java script
 			* SQL
-		- gui : ascenceur quand n<>cessaire
+	- sys : replace TAB with space when Tab is pressed
-		- Catch Shift+TAB
+	- sys : Catch F[1-12] ==> for user personal event
-		- Correction du bug des entr<74> bizard tel que les chapot et les guillemets
+	- BUG : Correction du bug des entr<74> bizard tel que les chapot et les guillemets
-		- pb de s<>lection quand la ligne est pleine et la premi<6D>re ligne s<>ctionn<6E>e.
+	- BUG : de copier coller sur les <20><><EFBFBD> ...
-		- PB de copier coller sur les <20><><EFBFBD> ...
+	- BUG : les caract<63>re multiples type chapot ...
-	* 0.3.X :
+	- BUG : italique non g<>n<EFBFBD>r<EFBFBD>
-		- Charset UTF-8 et iso 8859-15 correcte
+* 0.3.X :
-		- Transformation de charset a la vol<6F>e
-		- Charset par defaut
-		- D<>tection de charset (<28> mettre dans les todo de charset)
-			==> regarder les librairies open sources
-	* 0.4.X :
 	- SEARCH : get selected text in the search windows
 	- SEARCH : Select the search windows when call crtl+F
-		- gui : ordonner les fichier ouvert par nom ...
+	- sys : personal property file in the ~/.edn ou ~/.gnome/edn
-	* 0.5.X :
+	- gui : Ordonner les fichier ouvert par nom ...
-		- project : list of current files open
+	- gui : parameter gui : et en autre la taille de la police ... et voir pour la r<>cup<75>rer sur le system... et ce serait cool...
-		- gui : Parameters : et en autre la taille de la police ... et voir pour la r<>cup<75>rer sur le system... et ce serait cool...
+	- gui : Color list selection
+	- gui : Hightlight gui management
+* 0.4.X :
+	- sys : Charset UTF-8 et iso 8859-15 correcte
+	- sys : Transformation de charset a la vol<6F>e
+	- sys : Charset par defaut
+	- Sys : D<>tection de charset (<28> mettre dans les todo de charset)
+				==> regarder les librairies open sources
+* 0.5.X :
+	- prj : list of current files open
+	- prj : open ctags file
 	- sys : replace ALL
-
+	- sys : Undo / Redo ajout de caract<63>res autre que " ", "\t" et "\n"
-# Text Editor
+* 0.6.X :
-
+	- sys : right management ...
-	-  90% Indent group with Tabulation and shift+tabulation
+	- HL  : Normalyse all the system of regular expression with <> chapot ...
-	- 100% Basic smart indent : Recopy the start of the previous line when return (copy '\t' and ' ')
+	- HL  : sub parsing of the reg exp
-	-   0% Replace Tab with space when press the key
+	- sys : update all language
-	-   0% Request save user when quit the software
+* 0.7.X :
-	-   0% Hide/Display scroll element when not usefull
+- sys : Select in colones
-	-  10% Regular expression search
+	- sys : Select all the same search in the current buffer ... ( HL en vert ou jaune ...)
-	-  80% Colorisation syntaxique
+	- sys : Multi-file search ==> display it in a result buffer (clickable only)
-	-  80% Copier / coller ==> probleme sur les caract<63>res sp<73>ciaux comme <20> <20> <20> ...
+* 0.9.X :
-	-  10% Search 
+	- int : Redo all the doxygen ...
-	-  10% Replace
+* 1.0.X :
-	-  80% Undo / Redo ajout de caract<63>res autre que " ", "\t" et "\n"
+	- gui : open file in binary
-	-   0% Selectionner en colone
+	- sys : compare binary files
-	-   0% Supression multiple de ligne par la commande ctrl+D
+	- sys : compare normal files
-	-   0% Multi-file search ==> display it in a result buffer (clickable only)
+* 1.1.X :
-	-   0% basic UTF8 string management ==> bad with the curent buffer
+	- gui : Display content of a folder
-	-   0% Replace in all elements of the project file or a part
+	- gui : add a treeview display
-	-   0% Multiple Text Editor in the same Time
+	- sys : evenement losqu'un fichier est modifier a l'exterieur...
-	-   0% Support des Macros ==> In python ??? or other ...
+	- sys : image du type de fichier dans le buffer list view
-
+* 1.2.X :
-# Ctags :
+	- PRJ : treeview des dossier a ouvrir
-	- 100% Parse (use the ctags parser)
+	- PRJ : GUI de management
-	- 100% Find
+	- PRJ : Save all in project
-	-  50% Jump
+	- SYS : Save all modify files
-	-  10% History of move (with display)
+* 1.3.X :
-
+	- sys : version system management (git, cvs, ...)
-# Buffer Viewer :
+* 1.4.X :
-	- 100% Right menu
+	- SYS : Macro generation and acquisition
-	- 100% Display buffer in color
+* 1.5.X :
-	- 100% Display buffer Saved / not Saved
+	- GDB : Acces interne pour un debuggeur ==> comme cgdb ... avec l'acces assembleur en plus
-	-   0% Image of the type of buffer (optionnal)
-
-# Configuration :
-	-   0% Creer une IHM pour les configurations de base
-	-   0% Creer une IHM pour l'edition du hightliner syntaxique (quand il marchera...)
-	-   0% Creer une IHM pour les couleurs (voir la lier avec l'IHM pour le hightliner)
-	-   0% saugegarde automatique de la configuration ou sur demande...
-
-# Project manager :
-	-   0% Faire un editeur des dossiers du projet a ouvrir ==> automatiquement ajouter dans les Ctags
-	-   0% Base
-	-   0% Save All
-	-   0% TreeView
-
-# Tree View :
-	-   0% View
-	-   0% Open File
-	-   0% Jump to the curent File
-	-   0% Hide CVS / Git / SVN elements
-
-# Diff :
-	-   0% generate a Diff between files
-	-   0% same in binary
-
-# Git :
-	-   0% Diff with the current wersion commited (local)
-	-   0% Git branch local display (as gitk --all) ...
-	-   0% view git chawan history ... (git Log)
-
-# CVS :
-	-   0% check the version with CVS
-	-   0% commit
-	-   0% display the Branch
-	-   0% Select a new repository ...
-
-# Publication : 
-	-   0% faire une publication du logiciel sur le Web... (need a stable version)
-	-   0% faire un package
-
-# Repository : 
-	-   0% create my own repository (@home)
-	-   0% manage right with Git
-	-   0% create a website fot it (@home)
-	-   0% reserve edn.org
-
-# plugin : (never i think ...)
-	-   0% Comprendre comment faire un system avec des plugin (interne et simple)...
-	-   0% En c++ compiler seulement, pas d'interface pyton ou autre c'est trop moche.
-
 
 # note utiles : 
 http://majutsushi.github.com/tagbar/		==> je devrais regarder ca pour savoir ce que je peux faire avec du ctags
-CTags : Set the parsing methode : "ctags -R --fields=+n Sources/"
+CTags : Set the parsing methode : "ctags -R --fields=+n Sources/ /usr/include/gtk-3.0/"

data/lang_bash.xml

@@ -30,7 +30,7 @@
 	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
 		<rule name="my keyword">
 			<color>keyword</color>
-			<start>\@for|done|do|while|in|if|then|else|fi\@</start>
+			<start>\@for|done|do|while|in|if|elif|then|else|fi\@</start>
 		</rule>
 		<rule name="my Variable">
 			<color>keyword</color>

data/lang_matlab.xml

@@ -28,7 +28,7 @@
 		</rule>
 		<rule name="global inclusion">
 			<color>preprocesseur</color>
-			<start>global </start>
+			<start>global( |\t)+</start>
 			<end>\n</end>
 			<EscapeChar>\</EscapeChar>
 		</rule>

test2.c

@@ -13,7 +13,7 @@
 /*
 #if 0
 */
-
+^a^a^aa
 
 //#include "tools_debug.h"
 #include "tools_globals.h"

test_transparence.c

@@ -20,7 +20,7 @@ static gboolean expose(GtkWidget *widget, GdkEventExpose *event, gpointer user_d
 static void clicked(GtkWindow *win, GdkEventButton *event, gpointer user_data);
 
 
-#	if USE_GTK_VERSION_3_0
+#if USE_GTK_VERSION_3_0
 const GdkRGBA color = { 1.0, 1.0, 0.0, 0.0};
 #endif