add patch correction done in branch display line by line

stop the developpement of the display line by line because it did not work corectly and was a little cpu leacher, the display has maany error and the comphehention is hard.

.gitignore

@@ -26,6 +26,7 @@ doxygen/ALL/
 *.o
 *.so
 *.pyc
+tags
 edn
 out
 edn_debug

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)\""
@@ -155,8 +155,7 @@ CXXFILES+=		tools/EdnTemplate/EdnVectorBuf.cpp		\
 				tools/EdnBuf/EdnBufHistory.cpp
 				
 
-# Tools internal:
+# Tools internal:
-CXXFILES+=		tools/AL/AL_Mutex.cpp					\
 CXXFILES+=		tools/Display/Display.cpp				\
 				tools/ClipBoard/ClipBoard.cpp			\
 				tools/MsgBroadcast/MsgBroadcast.cpp		\
@@ -175,8 +174,7 @@ CXXFILES+=		CustumWidget/BufferView/BufferView.cpp		\
 				GuiTools/MainWindows/StatusBar.cpp			\
 				GuiTools/MainWindows/MenuBar.cpp			\
 				GuiTools/MainWindows/ToolBar.cpp			\
-				GuiTools/Search/Search.cpp					\
+				GuiTools/Search/Search.cpp					\
-				GuiTools/Search/SearchData.cpp              \
 				GuiTools/Search/SearchData.cpp
 
 # Basic Interface :
@@ -222,11 +220,10 @@ build: .encadrer .versionFile $(OUTPUT_NAME)
 	@echo $(CADRE_COTERS)
 	@echo '
            DEBUT DE COMPILATION DU PROGRAMME :'$(CADRE_COTERS)
-	@echo '
+	@echo '
              Repertoire Sources : $(FILE_DIRECTORY)/'$(CADRE_COTERS)
 	@echo '
              Repertoire object  : $(OBJECT_DIRECTORY)/'$(CADRE_COTERS)
-	@echo '
 	@echo '
              Binaire de sortie  : $(F_VIOLET)$(OUTPUT_NAME) $(F_NORMALE)'$(CADRE_COTERS)
 	@echo $(CADRE_COTERS)
@@ -297,7 +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

@@ -47,6 +47,7 @@ Buffer::Buffer()
 	Edn::String mString = "Untitle - ";
 	mString += fileBasicID++;
 	SetFileName(mString);
+	m_haveName = false;
 }
 
 /**
@@ -137,7 +138,6 @@ void Buffer::SetLineDisplay(uint32_t lineNumber)
 	// nothing to do
 }
 
-
 /**
  * @brief
  *
@@ -282,6 +282,7 @@ void Buffer::Replace(Edn::String &data)
 int32_t Buffer::FindLine(Edn::String &data)
 {
 	// nothing to do
+	return 0;
 }
 
 void Buffer::JumpAtLine(int32_t newLine)
@@ -289,6 +290,21 @@ void Buffer::JumpAtLine(int32_t newLine)
 	// nothing to do
 }
 
+
+/**
+ * @brief Get the current line (to know where to jump)
+ *
+ * @param ---
+ *
+ * @return Return the current line number
+ *
+ */
+int32_t Buffer::GetCurrentLine(void)
+{
+	return 0;
+}
+
+
 /**
  * @brief request a copy of the selection in the named clipBoard ID
  *

Sources/Buffer/Buffer.h

@@ -106,6 +106,7 @@ class Buffer {
 		virtual void      Replace(Edn::String &data);
 		virtual int32_t   FindLine(Edn::String &data);
 		virtual void      JumpAtLine(int32_t newLine);
+		virtual int32_t   GetCurrentLine(void);
 		
 	protected:
 		bool              m_fileModify;           //!< 

Sources/Buffer/BufferManager.h

@@ -51,7 +51,7 @@ class BufferManager: public Singleton<BufferManager>, public MsgBroadcast
 		int32_t		Open(Edn::File &myFile);
 		int32_t     GetSelected(void) { return m_idSelected;};
 		void        SetSelected(int32_t id) {m_idSelected = id;};
-		Buffer		* Get(int32_t BufferID);
+		Buffer *    Get(int32_t BufferID);
 		bool		Exist(int32_t BufferID);
 		bool		Exist(Edn::File &myFile);
 		int32_t		GetId(Edn::File &myFile);

Sources/Buffer/BufferText.cpp

@@ -37,6 +37,10 @@
 
 const uint32_t nbLineAllocatedInBase = 300;
 
+extern "C"
+{
+	const char * g_pointerForTheDisplayLine[] = {"%1d", "%2d","%3d","%4d","%5d","%6d","%7d","%8d","%9d","%d"};
+}
 
 
 
@@ -229,8 +233,6 @@ void BufferText::SetLineDisplay(uint32_t lineNumber)
 
 }
 
-
-
 void BufferText::DrawLineNumber(DrawerManager &drawer,char *myPrint,  int32_t lineNumber, int32_t positionY)
 {
 	char tmpLineNumber[50];
@@ -238,7 +240,33 @@ void BufferText::DrawLineNumber(DrawerManager &drawer,char *myPrint,  int32_t li
 	drawer.Text(myColorManager->Get(COLOR_CODE_LINE_NUMBER), 1, positionY, tmpLineNumber);
 }
 
-
+/**
+ * @brief Update internal data of the pointer to display
+ *
+ * @param[in,out] ---
+ *
+ * @return ---
+ *
+ */
+/*
+void BufferText::UpdatePointerNumber(void)
+{
+	// get the number of line in the buffer
+	int32_t maxNumberLine = m_EdnBuf.NumberOfLines();
+	//int32_t maxNumberLine = 2096;
+	if (10 > maxNumberLine) {				m_nbColoneForLineNumber = 1;
+	} else if (100 > maxNumberLine) {		m_nbColoneForLineNumber = 2;
+	} else if (1000 > maxNumberLine) {		m_nbColoneForLineNumber = 3;
+	} else if (10000 > maxNumberLine) {		m_nbColoneForLineNumber = 4;
+	} else if (100000 > maxNumberLine) {	m_nbColoneForLineNumber = 5;
+	} else if (1000000 > maxNumberLine) {	m_nbColoneForLineNumber = 6;
+	} else if (1000000 > maxNumberLine) {	m_nbColoneForLineNumber = 7;
+	} else if (10000000 > maxNumberLine) {	m_nbColoneForLineNumber = 8;
+	} else if (100000000 > maxNumberLine) {	m_nbColoneForLineNumber = 9;
+	} else {								m_nbColoneForLineNumber = 10;
+	}
+}
+*/
 /**
  * @brief Display the curent buffer with all the probematic imposed by the xharset and the user contraint.
  *
@@ -844,7 +872,7 @@ void BufferText::cursorMove(int32_t gtkKey)
 		case GDK_Page_Up:
 #		endif
 			//EDN_INFO("keyEvent : <PAGE-UP>");
-			TextDMoveUp(m_displaySize.x);
+			TextDMoveUp(m_displaySize.y);
 			break;
 #		ifdef USE_GTK_VERSION_3_0
 		case GDK_KEY_Page_Down:
@@ -852,7 +880,7 @@ void BufferText::cursorMove(int32_t gtkKey)
 		case GDK_Page_Down:
 #		endif
 			//EDN_INFO("keyEvent : <PAGE-DOWN>");
-			TextDMoveDown(m_displaySize.x);
+			TextDMoveDown(m_displaySize.y);
 			break;
 #		ifdef USE_GTK_VERSION_3_0
 		case GDK_KEY_Begin:
@@ -970,33 +998,47 @@ 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 ...
-					m_cursorPos = m_EdnBuf.UnIndent(SELECTION_PRIMARY);
+				// 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 {
-					m_cursorPos = m_EdnBuf.Indent(SELECTION_PRIMARY);
+					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;
-			tmpVect.PushBack('\n');
+			if (true == globals::IsSetShift()) {
-			// if Auto indent Enable ==> we get the start of the previous line and add it to tne new one
+				tmpVect.PushBack('\r');
-			if (true == globals::IsSetAutoIndent() ) {
+			} else {
-				int32_t l_lineStart;
+				tmpVect.PushBack('\n');
-				// Get the begin of the line or the begin of the line befor selection
+				// if Auto indent Enable ==> we get the start of the previous line and add it to tne new one
-				if (false == haveSelectionActive) {
+				if (true == globals::IsSetAutoIndent() ) {
-					l_lineStart = m_EdnBuf.StartOfLine(m_cursorPos);
+					int32_t l_lineStart;
-				} else {
+					// Get the begin of the line or the begin of the line befor selection
-					l_lineStart = m_EdnBuf.StartOfLine(SelectionStart);
+					if (false == haveSelectionActive) {
-				}
+						l_lineStart = m_EdnBuf.StartOfLine(m_cursorPos);
-				// add same characters in the temporar buffer
-				for (int32_t kk=l_lineStart; kk<m_cursorPos; kk++) {
-					if (' ' == m_EdnBuf[kk]) {
-						tmpVect.PushBack(' ');
-					} else if('\t' == m_EdnBuf[kk]) {
-						tmpVect.PushBack('\t');
 					} else {
-						break;
+						l_lineStart = m_EdnBuf.StartOfLine(SelectionStart);
+					}
+					// add same characters in the temporar buffer
+					for (int32_t kk=l_lineStart; kk<m_cursorPos; kk++) {
+						if (' ' == m_EdnBuf[kk]) {
+							tmpVect.PushBack(' ');
+						} else if('\t' == m_EdnBuf[kk]) {
+							tmpVect.PushBack('\t');
+						} else {
+							break;
+						}
 					}
 				}
 			}
@@ -1094,6 +1136,21 @@ void BufferText::JumpAtLine(int32_t newLine)
 	UpdateWindowsPosition(true);
 }
 
+/**
+ * @brief Get the current line (to know where to jump)
+ *
+ * @param ---
+ *
+ * @return Return the current line number
+ *
+ */
+int32_t BufferText::GetCurrentLine(void)
+{
+	return m_EdnBuf.CountLines(0, m_cursorPos);
+}
+
+
+
 void BufferText::Search(Edn::String &data, bool back, bool caseSensitive, bool wrap, bool regExp)
 {
 	EDN_INFO("Search data : \"" << data << "\"");
@@ -1189,9 +1246,9 @@ void BufferText::Replace(Edn::String &data)
 	bool haveSelectionActive = m_EdnBuf.GetSelectionPos(SELECTION_PRIMARY, SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
 	if (true == haveSelectionActive) {
 		// Replace Data : 
-		// TODO : Reset this : ... m_EdnBuf.ReplaceSelected(SELECTION_PRIMARY, data.GetDirectPointer());//, strlen(data.GetDirectPointer()));
+		Edn::VectorType<int8_t> myData = data.GetVector();
-		// TODO : Reset this : ... SetInsertPosition(SelectionStart + strlen(data.GetDirectPointer()));
+		m_EdnBuf.ReplaceSelected(SELECTION_PRIMARY, myData);
-		
+		SetInsertPosition(SelectionStart + myData.Size());
 	}
 	SetModify(true);
 }

Sources/Buffer/BufferText.h

@@ -26,8 +26,6 @@
 #ifndef __BUFFER_TEXT_H__
 #define __BUFFER_TEXT_H__
 
-#include <vector>
-#include <string>
 #include "ColorizeManager.h"
 #include "Buffer.h"
 #include "EdnBuf.h"
@@ -67,6 +65,8 @@ class BufferText : public Buffer {
 		void      Replace(Edn::String &data);
 		int32_t   FindLine(Edn::String &data);
 		void      JumpAtLine(int32_t newLine);
+		int32_t   GetCurrentLine(void);
+		
 		void      RemoveLine(void);
 		void      SelectAll(void);
 		void      SelectNone(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
@@ -30,15 +30,40 @@
 #define PFX	"ColorizeManager "
 
 
-ColorizeManager::ColorizeManager(void)
+ColorizeManager::ColorizeManager(void) : MsgBroadcast("Colorize Manager", EDN_CAT_COLOR)
 {
 }
 
 ColorizeManager::~ColorizeManager(void)
 {
 	delete(errorColor);
-	// TODO : delete all color previously
+
-	listMyColor.clear();
+	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();
+}
+
+
+void ColorizeManager::OnMessage(int32_t id, int32_t dataID)
+{
+	switch (id)
+	{
+		case EDN_MSG__RELOAD_COLOR_FILE:
+			{
+				// Reaload File
+				// TODO : Check this : Pb in the recopy Edn::String element
+				Edn::String plop = m_fileColor;
+				LoadFile(plop.c_str());
+			}
+			break;
+	}
 }
 
 
@@ -49,6 +74,20 @@ 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();
 	errorColor->SetBgColor("#000000");
 	errorColor->SetFgColor("#FFFFFF");
@@ -58,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")) {
@@ -181,7 +215,7 @@ void ColorizeManager::LoadFile(const char * xmlFilename)
 								myNewColor->SetItalic(true);
 							}
 						}
-						listMyColor.push_back(myNewColor);
+						listMyColor.PushBack(myNewColor);
 					} else {
 						EDN_ERROR(PFX"(l "<<pNode->Row()<<") node not suported : \""<<pNode->Value()<<"\" must be [color]");
 					}
@@ -194,12 +228,14 @@ void ColorizeManager::LoadFile(const char * xmlFilename)
 			pNode = pNode->NextSibling();
 		}
 	}
+	SendMessage(EDN_MSG__COLOR_HAS_CHANGE);
+	SendMessage(EDN_MSG__USER_DISPLAY_CHANGE);
 }
 
 Colorize *ColorizeManager::Get(const char *colorName)
 {
-	uint32_t i;
+	int32_t i;
-	for (i=0; i<listMyColor.size(); i++) {
+	for (i=0; i<listMyColor.Size(); i++) {
 		Edn::String elementName = listMyColor[i]->GetName();
 		if (elementName == colorName) {
 			return listMyColor[i];
@@ -227,8 +263,8 @@ color_ts & ColorizeManager::Get(basicColor_te myColor)
 
 bool ColorizeManager::Exist(const char *colorName)
 {
-	uint32_t i;
+	int32_t i;
-	for (i=0; i<listMyColor.size(); i++) {
+	for (i=0; i<listMyColor.Size(); i++) {
 		Edn::String elementName = listMyColor[i]->GetName();
 		if (elementName == colorName) {
 			return true;
@@ -243,9 +279,9 @@ bool ColorizeManager::Exist(Edn::String &colorName)
 
 void ColorizeManager::DisplayListOfColor(void)
 {
-	uint32_t i;
+	int32_t i;
 	EDN_INFO(PFX"List of ALL COLOR : ");
-	for (i=0; i<listMyColor.size(); i++) {
+	for (i=0; i<listMyColor.Size(); i++) {
 		//Edn::String elementName = listMyColor[i]->GetName();
 		//EDN_INFO(i << " : \"" <<  elementName.c_str() << "\"" );
 		listMyColor[i]->Display(i);

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
@@ -27,9 +27,9 @@
 #define __COLORIZE_MANAGER_H__
 
 #include "Singleton.h"
-#include <vector>
-#include <string>
 #include "Colorize.h"
+#include "MsgBroadcast.h"
+#include "Edn.h"
 
 typedef enum {
 	// BASIC color for codeViewer
@@ -50,7 +50,7 @@ typedef enum {
 
 
 
-class ColorizeManager: public Singleton<ColorizeManager>
+class ColorizeManager: public Singleton<ColorizeManager>, public MsgBroadcast
 {
 	friend class Singleton<ColorizeManager>;
 	// specific for sigleton system...
@@ -59,19 +59,22 @@ class ColorizeManager: public Singleton<ColorizeManager>
 		ColorizeManager(void);
 		~ColorizeManager(void);
 	public:
-		void		  LoadFile(Edn::String &xmlFilename);
+		void    OnMessage(int32_t id, int32_t dataID);
-		void		  LoadFile(const char * xmlFilename);
+	public:
-		Colorize	* Get(const char *colorName);
+		void        LoadFile(Edn::String &xmlFilename);
-		Colorize	* Get(Edn::String &colorName);
+		void        LoadFile(const char * xmlFilename);
-		color_ts	& Get(basicColor_te myColor);
+		Colorize *  Get(const char *colorName);
-		bool		  Exist(Edn::String &colorName);
+		Colorize *  Get(Edn::String &colorName);
-		bool		  Exist(const char *colorName);
+		color_ts &  Get(basicColor_te myColor);
-		void		  DisplayListOfColor(void);
+		bool        Exist(Edn::String &colorName);
+		bool        Exist(const char *colorName);
+		void        DisplayListOfColor(void);
 
 	private:
-		std::vector<Colorize*>	listMyColor;		//!< List of ALL Color
+		Edn::String                 m_fileColor;
-		Colorize*				errorColor;
+		Edn::VectorType<Colorize*>  listMyColor;		//!< List of ALL Color
-		color_ts				basicColors[COLOR_NUMBER_MAX];
+		Colorize *                  errorColor;
+		color_ts                    basicColors[COLOR_NUMBER_MAX];
 };
 
 #endif

Sources/CustumWidget/BufferView/BufferView.cpp

@@ -41,7 +41,6 @@ BufferView::BufferView(void) : MsgBroadcast("Buffer View", EDN_CAT_GUI)
 	// Init link with the buffer Manager
 	m_bufferManager = BufferManager::getInstance();
 	m_colorManager = ColorizeManager::getInstance();
-	m_menuContext = MenuContext::getInstance();
 
 	m_widget = gtk_drawing_area_new();
 	gtk_widget_set_size_request( m_widget, 250, 100);
@@ -101,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;
 	}
 }
 
@@ -139,6 +142,9 @@ gboolean BufferView::CB_displayDraw( GtkWidget *widget, GdkEventExpose *event, g
 	EDN_INFO("Request a display of : " << self->m_shawableAreaX << "px * "<<  self->m_shawableAreaY<<"px");
 	DrawerManager monDrawer(widget, self->m_shawableAreaX, self->m_shawableAreaY);
 	
+	// clean buffer
+	monDrawer.Clean(self->m_colorManager->Get(COLOR_LIST_BG_1));
+	
 	// get the number of buffer open
 	int32_t nbBufferOpen = self->m_bufferManager->Size();
 	int32_t i;
@@ -230,13 +236,12 @@ gint BufferView::CB_focusGet(	GtkWidget *widget, GdkEventFocus *event, gpointer
 
 gint BufferView::CB_focusLost(	GtkWidget *widget, GdkEventFocus *event, gpointer data)
 {
-	BufferView * self = reinterpret_cast<BufferView*>(data);
+	//BufferView * self = reinterpret_cast<BufferView*>(data);
 	
 #	ifdef USE_GTK_VERSION_2_0
 	GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
 #	endif
 	EDN_INFO("Focus - out");
-	self->m_menuContext->Hide();
 	return FALSE;
 }
 
@@ -245,7 +250,7 @@ gint BufferView::CB_keyboardEvent(	GtkWidget *widget, GdkEventKey *event, gpoint
 	//BufferView * self = reinterpret_cast<BufferView*>(data);
 	
 	if(event->type == GDK_KEY_PRESS) {
-	gtk_widget_queue_draw( widget );
+		gtk_widget_queue_draw( widget );
 	}
 	return true;
 }
@@ -322,9 +327,6 @@ void BufferView::ViewPopupMenu(GtkWidget *parrent, GdkEventButton *event, int32_
 gint BufferView::CB_mouseButtonEvent(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
 	BufferView * self = reinterpret_cast<BufferView*>(data);
-	if (event->type != GDK_BUTTON_RELEASE) {
-		self->m_menuContext->Hide();
-	}
 	// get focus on the widget
 	gtk_widget_grab_focus(widget);
 	if (event->button == 1) {
@@ -337,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");
@@ -366,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/BufferView/BufferView.h

@@ -26,14 +26,11 @@
 #define __BUFFER_VIEW_H__
 
 #include "tools_debug.h"
-#include <vector>
-#include <string>
 #include "Singleton.h"
 #include "CodeView.h"
 #include "BufferManager.h"
 #include "Display.h"
 #include "MsgBroadcast.h"
-#include "MenuContext.h"
 
 
 
@@ -68,7 +65,6 @@ class BufferView : public MsgBroadcast
 		// r<>cup<75>ration des proprieter g<>n<EFBFBD>ral...
 		BufferManager *       m_bufferManager;
 		ColorizeManager *     m_colorManager;
-		MenuContext *         m_menuContext;
 		int32_t               m_shawableAreaX;
 		int32_t               m_shawableAreaY;
 		int32_t               m_selectedID;

Sources/CustumWidget/CodeView/CodeView.cpp

@@ -46,7 +46,6 @@ CodeView::CodeView(void) : MsgBroadcast("Code View", EDN_CAT_WORK_AREA)
 	// Init link with the buffer Manager
 	m_bufferManager = BufferManager::getInstance();
 	m_colorManager = ColorizeManager::getInstance();
-	m_menuContext = MenuContext::getInstance();
 
 	m_widget = gtk_drawing_area_new();
 	gtk_widget_set_size_request( m_widget, 200, 100);
@@ -180,6 +179,9 @@ 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);

Sources/CustumWidget/CodeView/CodeView.h

@@ -32,7 +32,6 @@
 #include "BufferManager.h"
 #include "Display.h"
 #include "MsgBroadcast.h"
-#include "MenuContext.h"
 
 class CodeView : public MsgBroadcast
 {
@@ -58,7 +57,6 @@ class CodeView : public MsgBroadcast
 		// récupération des proprieter général...
 		BufferManager *     m_bufferManager;
 		ColorizeManager *   m_colorManager;
-		MenuContext *       m_menuContext;
 		int32_t             m_shawableAreaX;
 		int32_t             m_shawableAreaY;
 		int32_t             m_bufferID;

Sources/CustumWidget/MainAreaView/MainAreaView.cpp

@@ -28,8 +28,7 @@
 
 #include "tools_debug.h"
 #include "Singleton.h"
-#include <string>
+
-#include <vector>
 
 
 class MainAreaView: public Singleton<MainAreaView>

Sources/GuiTools/MainWindows/MainWindows.cpp

@@ -40,15 +40,31 @@ MainWindows::MainWindows(void) : MsgBroadcast("Main Windows", EDN_CAT_GUI)
 	m_mainWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
 	// select the program icone
-	gtk_window_set_default_icon_name("text-editor");
+	GError *err = NULL;
+	Edn::String iconeFile;
+#ifdef NDEBUG
+	iconeFile = "/usr/share/edn/images/icone.png";
+#else
+	iconeFile = "./data/imagesSources/icone.png";
+#endif
 
+	GdkPixbuf * icone = gdk_pixbuf_new_from_file(iconeFile.c_str(), &err);
+	if (err != NULL) {
+		gtk_window_set_default_icon_name("text-editor");
+	} else {
+		gtk_window_set_icon(GTK_WINDOW(m_mainWindow), icone);
+	}
 	// Default size open windows
 	gtk_window_set_default_size(GTK_WINDOW(m_mainWindow), 800, 600);
 
 	// enable the close signal of the windows 
 	g_signal_connect(G_OBJECT(m_mainWindow), "delete-event", G_CALLBACK(OnQuit), this);
+	g_signal_connect(G_OBJECT(m_mainWindow), "window-state-event", G_CALLBACK(OnStateChange), this);
 	//g_signal_connect(G_OBJECT(m_mainWindow), "destroy", G_CALLBACK(OnQuit), this);
-
+	
+	// remove decoration
+	//gtk_window_set_decorated(GTK_WINDOW(m_mainWindow), FALSE);
+	
 	// Create a vertical box for stacking the menu and editor widgets in.
 	GtkWidget *vbox = gtk_vbox_new (FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(m_mainWindow), vbox);
@@ -57,8 +73,52 @@ MainWindows::MainWindows(void) : MsgBroadcast("Main Windows", EDN_CAT_GUI)
 	AccelKey::getInstance()->LinkCommonAccel(GTK_WINDOW(m_mainWindow));
 
 	// Create the menu bar.
+#if 0
 	gtk_box_pack_start(	GTK_BOX (vbox), m_MenuBar.GetWidget(), FALSE, FALSE, 0);
+#else
+	GtkWidget *hboxMenu = gtk_hbox_new (FALSE, 0);
+	gtk_box_pack_start(	GTK_BOX (vbox), hboxMenu, FALSE, FALSE, 0);
+	// Add Exit boutton
+	Edn::String ExitIconeFile;
+#ifdef NDEBUG
+	ExitIconeFile = "/usr/share/edn/images/delete-24px.png";
+#else
+	ExitIconeFile = "./data/imagesSources/delete-24px.png";
+#endif
+	// 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);
+	//gtk_image_get_icon_set( GTK_IMAGE(myImageQuit), NULL, &mySize);
+	//EDN_DEBUG(" plop : " << mySize);
+	GtkWidget *event_box = gtk_event_box_new();
+	gtk_container_add(GTK_CONTAINER(event_box),myImageQuit);
+	gtk_widget_add_events(event_box,GDK_BUTTON_PRESS_MASK);
+	g_signal_connect(G_OBJECT(event_box), "button_press_event", G_CALLBACK(OnQuit), this);
+	
+	gtk_box_pack_start(	GTK_BOX(hboxMenu), event_box, FALSE, FALSE, 0);
+	
+	// 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 :                   *
 	// **********************************************************
@@ -67,16 +127,16 @@ MainWindows::MainWindows(void) : MsgBroadcast("Main Windows", EDN_CAT_GUI)
 		gtk_container_add(GTK_CONTAINER (vbox), hbox);
 		// create the toolbar :
 #		if USE_GTK_VERSION_2_0
-		gtk_box_pack_start(GTK_BOX(hbox), m_ToolBar.GetWidget(), FALSE, FALSE, 0);
+		//gtk_box_pack_start(GTK_BOX(hbox), m_ToolBar.GetWidget(), FALSE, FALSE, 0);
 #		endif
 		// TreeView :
 		gtk_box_pack_start(GTK_BOX(hbox), m_BufferView.GetMainWidget(), FALSE, TRUE, 1);
 
-		// Tex displayer : 
+		// Text displayer : 
 		gtk_box_pack_start(	GTK_BOX (hbox), m_CodeView.GetMainWidget(), TRUE, TRUE, 0);
 
 	// Create the status bar
-	gtk_box_pack_end(GTK_BOX(vbox), m_StatusBar.GetWidget(), FALSE, FALSE, 0);
+	//gtk_box_pack_end(GTK_BOX(vbox), m_StatusBar.GetWidget(), FALSE, FALSE, 0);
 
 	// recursive version of gtk_widget_show
 	gtk_widget_show_all(m_mainWindow); 
@@ -93,6 +153,7 @@ MainWindows::~MainWindows(void)
 }
 
 
+
 void MainWindows::SetTitle(Edn::File &fileName, bool isModify)
 {
 	Edn::String tmp = "";
@@ -104,12 +165,20 @@ void MainWindows::SetTitle(Edn::File &fileName, bool isModify)
 	}
 	tmp += "Edn";
 	gtk_window_set_title(GTK_WINDOW(m_mainWindow), tmp.c_str());
+	if (fileName.GetShortFilename() != "") {
+		tmp = fileName.GetFolder();
+	} 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)
@@ -129,70 +198,37 @@ 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),
+	return true;
-	                                                  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;
 }
 
 
-#if 0
+gboolean MainWindows::OnStateChange(GtkWidget *widget, GdkEvent* event, gpointer data)
-
-void MainWindows::OnMenuAbout(wxCommandEvent & WXUNUSED(event))
 {
-	//EDN_INFO("MainWindows::OnMenuAbout (event)");
+	MainWindows * self = reinterpret_cast<MainWindows*>(data);
-	wxAboutDialogInfo info;
+	EDN_DEBUG("State change");
-	info.SetName(wxT("edn"));
+	EDN_INFO(" change state mask : " << event->window_state.changed_mask);
-	info.SetVersion(wxT("0.1.0 pre-Beta"));
+	EDN_INFO(" change state new val : " << event->window_state.new_window_state);
-	info.SetDescription(wxT("Editeur De N'ours, l'Editeur Desoxyribo-Nucleique\n"
+	if (event->window_state.changed_mask == GDK_WINDOW_STATE_MAXIMIZED) {
-							"Source Code Editor"));
+		EDN_INFO("   ==> Maximisation change...");
-	info.SetCopyright(wxT(	"Copyright 2010 Edouard DUPIN, all right reserved\n"
+		if (event->window_state.new_window_state == GDK_WINDOW_STATE_MAXIMIZED) {
-							"This software is distributed in the hope that it will be useful, but WITHOUT\n"
+			EDN_INFO("       ==> ENABLE");
-							"ANY WARRANTY\n\n"
+			gtk_window_set_decorated(GTK_WINDOW(self->m_mainWindow), FALSE);
-							"Licence summary : \n"
+		} else {
-							"   You can modify and redistribute the sources code and binaries.\n"
+			EDN_INFO("       ==> DISABLE");
-							"   You can send me the bug-fix\n"
+			gtk_window_set_decorated(GTK_WINDOW(self->m_mainWindow), TRUE);
-							"   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

@@ -51,12 +51,14 @@ class MainWindows: public Singleton<MainWindows>, public MsgBroadcast
 		GtkWidget *     GetWidget(void) { return m_mainWindow;};
 		void            OnMessage(int32_t id, int32_t dataID);
 		static bool     OnQuit(GtkWidget *widget, gpointer data);
+		static gboolean OnStateChange(GtkWidget *widget, GdkEvent* event, gpointer data);
 	
 	private:
 		void            SetTitle(Edn::File &fileName, bool isModify);
 		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,7 +37,9 @@ 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";
-#define MSG_LINK(data)	
+const char * MSG_LoadColorBlack      = "Load Color Black";
+const char * MSG_LoadColorWhite      = "Load Color White";
+#define MSG_LINK(data)
 
 
 static void CB_menuGenerique(GtkMenuItem *menu_item, gpointer 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 : 
@@ -204,12 +232,12 @@ MenuBar::MenuBar(void) : MsgBroadcast("Menu bar", EDN_CAT_GUI)
 		tmp->AddGen(GTK_STOCK_NEW,                 "ctrl+n",       EDN_MSG__NEW, true);
 		tmp->AddGen(GTK_STOCK_OPEN,                "ctrl+o",       EDN_MSG__GUI_SHOW_OPEN_FILE, true);
 		tmp->AddSeparator();
-		tmp->AddGen("Close file",                  NULL,           EDN_MSG__CURRENT_CLOSE, true);
+		tmp->AddGen("Close file",                  "ctrl+q",       EDN_MSG__CURRENT_CLOSE, true);
 		tmp->AddSeparator();
 		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+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);
@@ -220,7 +248,7 @@ MenuBar::MenuBar(void) : MsgBroadcast("Menu bar", EDN_CAT_GUI)
 		tmp->AddGen(GTK_STOCK_COPY,                "ctrl+c",       EDN_MSG__CURRENT_COPY, true, COPY_STD);
 		tmp->AddGen(GTK_STOCK_PASTE,               "ctrl+v",       EDN_MSG__CURRENT_PASTE, true, COPY_STD);
 //		tmp->AddGen(GTK_STOCK_DELETE,              NULL);
-		tmp->AddGen("Remove line",                 "ctrl+d",       EDN_MSG__CURRENT_REMOVE_LINE, true);
+		tmp->AddGen("Remove line",                 "ctrl+w",       EDN_MSG__CURRENT_REMOVE_LINE, true);
 		tmp->AddSeparator();
 		tmp->AddGen(GTK_STOCK_SELECT_ALL,          "ctrl+a",       EDN_MSG__CURRENT_SELECT_ALL, true);
 		tmp->AddGen("Unselect",                    "ctrl+shift+a", EDN_MSG__CURRENT_UN_SELECT, true);
@@ -230,15 +258,6 @@ MenuBar::MenuBar(void) : MsgBroadcast("Menu bar", EDN_CAT_GUI)
 //		tmp->AddGen(GTK_STOCK_PREFERENCES,         NULL,           EDN_MSG__GUI_SHOW_PREFERENCE, true);
 	m_listMenu.PushBack(tmp);
 	
-	tmp = new MenuBarMain("Display", m_mainWidget);
-		tmp->AddInternal("Show space & tabs",                    NULL, MSG_TogleDisplayChar, true);
-		tmp->AddInternal("Show end of lines",                    NULL, MSG_TogleDisplayEOL, true);
-		tmp->AddInternal("Audo Indent",                          NULL, MSG_TogleAutoIndent, true);
-		tmp->AddInternal("Set charset Occidental (ISO-8859-1)",  NULL, MSG_SetCharsetIso559_1, true);
-		tmp->AddInternal("Set charset Occidental (ISO-8859-15)", NULL, MSG_SetCharsetIso559_15, true);
-		tmp->AddInternal("Set charset Internationnal (UTF 8)",   NULL, MSG_SetCharsetUTF8, true);
-	m_listMenu.PushBack(tmp);
-	
 	tmp = new MenuBarMain("_Search", m_mainWidget);
 		tmp->AddGen(GTK_STOCK_FIND,                 "ctrl+f",       EDN_MSG__GUI_SHOW_SEARCH, true);
 		tmp->AddGen(GTK_STOCK_FIND_AND_REPLACE,     "ctrl+r",       EDN_MSG__GUI_SHOW_REPLACE, true);
@@ -252,6 +271,21 @@ MenuBar::MenuBar(void) : MsgBroadcast("Menu bar", EDN_CAT_GUI)
 //		tmp->AddSeparator();
 //		tmp->AddGen("Goto Line",                    "ctrl+l",       EDN_MSG__CURRENT_GOTO_LINE, true);
 	m_listMenu.PushBack(tmp);
+	
+	tmp = new MenuBarMain("Display", m_mainWidget);
+		tmp->AddInternal("Show space & tabs",                    NULL, MSG_TogleDisplayChar, true);
+		tmp->AddInternal("Show end of lines",                    NULL, MSG_TogleDisplayEOL, true);
+		tmp->AddInternal("Audo Indent",                          NULL, MSG_TogleAutoIndent, true);
+		tmp->AddSeparator();
+		tmp->AddInternal("Set charset Occidental (ISO-8859-1)",  NULL, MSG_SetCharsetIso559_1, true);
+		tmp->AddInternal("Set charset Occidental (ISO-8859-15)", NULL, MSG_SetCharsetIso559_15, true);
+		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);
 	m_listMenu.PushBack(tmp);
@@ -260,8 +294,8 @@ MenuBar::MenuBar(void) : MsgBroadcast("Menu bar", EDN_CAT_GUI)
 		tmp->AddGen("load Ctags file",              NULL,           EDN_MSG__OPEN_CTAGS, true);
 		tmp->AddGen("re-load Ctags file",           NULL,           EDN_MSG__RELOAD_CTAGS, true);
 		tmp->AddSeparator();
-		tmp->AddGen("Find Definition",              "ctrl+u",       EDN_MSG__JUMP_TO_CURRENT_SELECTION, true);
+		tmp->AddGen("Find Definition",              "ctrl+d",       EDN_MSG__JUMP_TO_CURRENT_SELECTION, true);
-		tmp->AddGen("Back previous",                "ctrl+y",       EDN_MSG__JUMP_BACK, true);
+		tmp->AddGen("Back previous",                "ctrl+shift+d", EDN_MSG__JUMP_BACK, true);
 	/*
 		tmp->AddGen("Gestion Ctags",                NULL);
 		tmp->AddGen("Add Ctags Folder",             NULL);

Sources/GuiTools/MenuContext/MenuContext.cpp

@@ -1,490 +0,0 @@
-/**
- *******************************************************************************
- * @file MenuContext.cpp
- * @brief Editeur De N'ours : special Menu (left button or normal menu) (Sources)
- * @author Edouard DUPIN
- * @date 22/07/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 "tools_debug.h"
-#include "tools_globals.h"
-#include "MenuContext.h"
-
-
-#undef  __class__
-#define __class__    "MenuContext"
-
-/**
- * @brief
- *
- * @param[in,out] ---
- *
- * @return ---
- *
- */
-MenuContext::MenuContext(void) : MsgBroadcast("Menu Context", EDN_CAT_MENU_CONTEXT)
-{
-	//m_currentBufferID = -1;
-	m_dialog = NULL;
-	m_shawableSize.x=200;
-	m_shawableSize.y=200;
-	// Init link with the buffer Manager
-	m_bufferManager = BufferManager::getInstance();
-	m_colorManager = ColorizeManager::getInstance();
-}
-
-/**
- * @brief
- *
- * @param[in,out] ---
- *
- * @return ---
- *
- */
-MenuContext::~MenuContext(void)
-{
-	if(NULL != m_dialog) {
-		gtk_widget_destroy(m_dialog);
-		m_dialog = NULL;
-	}
-}
-
-void MenuContext::OnMessage(int32_t id, int32_t dataID)
-{
-	switch (id)
-	{
-		/*
-		case EDN_MSG__BUFFER_CHANGE_CURRENT:
-			m_currentBufferID = dataID;
-			break;
-		*/
-	}
-}
-
-
-
-void MenuContext::Clear(void)
-{
-	
-}
-
-void MenuContext::AddCommonElem(int32_t id)
-{
-	
-}
-
-void MenuContext::AddSpecificElem(Edn::String &text)
-{
-	
-}
-
-
-/* This is called when we need to draw the windows contents */
-static gboolean expose (GtkWidget *widget, GdkEventExpose *event, gpointer userdata)
-{
-  gint width;
-  gint height;
-  cairo_t *cr = NULL;
-
-
-#	if USE_GTK_VERSION_3_0
-	cr = gdk_cairo_create(gtk_widget_get_window(widget));
-#	elif USE_GTK_VERSION_2_0
-	cr = gdk_cairo_create(widget->window);
-#	endif
-  //if (supports_alpha)
-  {
-    // transparent
-    cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.0);
-  }
-  /*
-  else
-  {
-    // opaque white
-    cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
-  }
-  */
-
-  /* draw the background */
-  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-  cairo_paint (cr);
-
-  /* draw a circle */
-  //gtk_window_get_size (GTK_WINDOW (widget), &width, &height);
-
-  //cairo_set_source_rgba (cr, 1, 0.2, 0.2, 0.6);
-  //cairo_arc (cr, width / 2, height / 2, (width < height ? width : height) / 2 - 8 , 0, 2 * 3.14);
-  //cairo_fill (cr);
-  //cairo_stroke (cr);
-  //cairo_paint (cr);
-  
-  cairo_destroy (cr);
-  return FALSE;
-}
-
-
-
-// http://zetcode.com/tutorials/cairographicstutorial/transparency/
-
-void MenuContext::Show(int32_t x, int32_t y, bool top)
-{
-	if(NULL != m_dialog) {
-		gtk_widget_destroy(m_dialog);
-		m_dialog = NULL;
-	}
-	m_dialog = gtk_window_new(GTK_WINDOW_POPUP);
-	//m_dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	// Set the dialog on top of the selected windows
-	//gtk_window_set_transient_for(GTK_WINDOW(m_dialog), parent);
-	// unset the border of the windows
-	//gtk_window_set_decorated(GTK_WINDOW(m_dialog), FALSE);
-	
-	EDN_INFO("Set position X=" << x+2 << " Y=" << y+27);
-	
-#	if USE_GTK_VERSION_3_0
-	gtk_window_move(GTK_WINDOW(m_dialog), x+2, y+27);
-#	elif USE_GTK_VERSION_2_0
-	gtk_widget_set_uposition(m_dialog, x+2, y+27);
-#	endif
-	
-#if 0
-	/* sdsfsdf */
-	gtk_widget_set_app_paintable (m_dialog, TRUE);
-#	ifdef USE_GTK_VERSION_3_0
-	g_signal_connect(       G_OBJECT(m_dialog), "draw",					G_CALLBACK(expose),		this);
-#	elif defined( USE_GTK_VERSION_2_0 )
-	g_signal_connect(       G_OBJECT(m_dialog), "expose_event",			G_CALLBACK(expose),		this);
-#	endif
-#endif
-
-	//gtk_window_set_opacity(GTK_WINDOW(m_dialog), 0.25);
-	
-
-
-	// enable the close signal of the windows 
-	//g_signal_connect(G_OBJECT(m_mainWindow), "delete-event", G_CALLBACK(OnQuit), this);
-	//g_signal_connect(G_OBJECT(m_mainWindow), "destroy", G_CALLBACK(OnQuit), this);
-/*
-	// Create a vertical box for stacking the menu and editor widgets in.
-	GtkWidget *vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add(GTK_CONTAINER(m_dialog), vbox);
-	
-	GtkWidget *myLabel =  gtk_label_new("plop 1 ");
-	gtk_container_add(GTK_CONTAINER(vbox), myLabel);
-	
-	myLabel =  gtk_label_new("plop 2 ");
-	gtk_container_add(GTK_CONTAINER(vbox), myLabel);
-*/
-	// Set key Accelerator :
-	//AccelKey::getInstance()->LinkCommonAccel(GTK_WINDOW(m_dialog));
-
-	// Create the menu bar.
-	//gtk_box_pack_start(	GTK_BOX (vbox), m_MenuBar.GetWidget(), FALSE, FALSE, 0);
-	m_widget = gtk_drawing_area_new();
-	//gtk_window_set_opacity(GTK_WINDOW(m_widget), 0.8);
-	gtk_widget_set_size_request( m_widget, 250, 100);
-
-	gtk_widget_add_events(	m_widget, 
-								GDK_KEY_PRESS_MASK
-							|	GDK_BUTTON_PRESS_MASK
-							|	GDK_BUTTON_RELEASE_MASK
-							|	GDK_POINTER_MOTION_MASK
-							|	GDK_POINTER_MOTION_HINT_MASK);
-
-#	ifdef USE_GTK_VERSION_3_0
-	g_object_set(m_widget,"can-focus", TRUE, NULL);
-#	elif defined( USE_GTK_VERSION_2_0 )
-	GTK_WIDGET_SET_FLAGS(m_widget, GTK_CAN_FOCUS);
-#	endif
-	// Focus Event
-	g_signal_connect(       G_OBJECT(m_widget), "focus_in_event",		G_CALLBACK(CB_focusGet),         this);
-	g_signal_connect(       G_OBJECT(m_widget), "focus_out_event",		G_CALLBACK(CB_focusLost),        this);
-	// Keyboard Event
-	g_signal_connect_after( G_OBJECT(m_widget), "key_press_event",		G_CALLBACK(CB_keyboardEvent),    this);
-	g_signal_connect_after( G_OBJECT(m_widget), "key_release_event",	G_CALLBACK(CB_keyboardEvent),    this);
-	// Mouse Event
-	g_signal_connect(       G_OBJECT(m_widget), "button_press_event",	G_CALLBACK(CB_mouseButtonEvent), this);
-	g_signal_connect(       G_OBJECT(m_widget), "button_release_event",	G_CALLBACK(CB_mouseButtonEvent), this);
-	g_signal_connect(       G_OBJECT(m_widget), "motion_notify_event",	G_CALLBACK(CB_mouseMotionEvent), this);
-	// Display Event
-	g_signal_connect(       G_OBJECT(m_widget), "realize",				G_CALLBACK(CB_displayInit),      this);
-#	ifdef USE_GTK_VERSION_3_0
-	g_signal_connect(       G_OBJECT(m_widget), "draw",					G_CALLBACK(CB_displayDraw),		this);
-#	elif defined( USE_GTK_VERSION_2_0 )
-	g_signal_connect(       G_OBJECT(m_widget), "expose_event",			G_CALLBACK(CB_displayDraw),		this);
-#	endif
-
-	gtk_container_add(GTK_CONTAINER(m_dialog), m_widget);
-
-	// recursive version of gtk_widget_show
-	gtk_widget_show_all(m_dialog);
-	
-	// Set the Focus
-	gtk_widget_grab_focus(m_widget);
-
-}
-
-void MenuContext::Hide(void)
-{
-	if(NULL != m_dialog) {
-		gtk_widget_destroy(m_dialog);
-		m_dialog = NULL;
-	}
-}
-
-
-gboolean MenuContext::CB_displayDraw( GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
-	MenuContext * self = reinterpret_cast<MenuContext*>(data);
-
-#	ifdef USE_GTK_VERSION_3_0
-	GtkAllocation allocation;
-	gtk_widget_get_allocation(widget, &allocation);
-	if (self->m_shawableSize.x != allocation.width) {
-		self->m_shawableSize.x = allocation.width;
-	}
-	if (self->m_shawableSize.y != allocation.height) {
-		self->m_shawableSize.y = allocation.height;
-	}
-#	elif defined( USE_GTK_VERSION_2_0)
-	if (self->m_shawableSize.x != widget->allocation.width) {
-		self->m_shawableSize.x = widget->allocation.width;
-	}
-	if (self->m_shawableSize.y != widget->allocation.height) {
-		self->m_shawableSize.y = widget->allocation.height;
-	}
-#	endif
-	EDN_INFO("Request a display of : " << self->m_shawableSize.x << "px * "<<  self->m_shawableSize.y<<"px");
-
-	DrawerManager monDrawer(widget, self->m_shawableSize.x, self->m_shawableSize.y);
-	
-	// get the number of buffer open
-	int32_t nbBufferOpen = self->m_bufferManager->Size();
-	int32_t i;
-	uint32_t lineID = 0;
-	uint32_t fontHeight = Display::GetFontHeight();
-	basicColor_te selectFG = COLOR_LIST_TEXT_NORMAL;
-	basicColor_te selectBG = COLOR_LIST_BG_1;
-	Edn::VectorType<Edn::String *> myData;
-	Edn::String * plop = new Edn::String("Save");
-	myData.PushBack(plop);
-	plop = new Edn::String("Show");
-	myData.PushBack(plop);
-	plop = new Edn::String("Close");
-	myData.PushBack(plop);
-	for (i=0; i < myData.Size(); i++) {
-		selectFG = COLOR_LIST_TEXT_NORMAL;
-		if (lineID%2==0) {
-			selectBG = COLOR_LIST_BG_1;
-		} else {
-			selectBG = COLOR_LIST_BG_2;
-		}
-		monDrawer.Rectangle(self->m_colorManager->Get(selectBG), 0, lineID*fontHeight, self->m_shawableSize.x, Display::GetFontHeight());
-		
-		monDrawer.Text(self->m_colorManager->Get(selectFG), 2, lineID*fontHeight, myData[i]->c_str());
-		monDrawer.Flush();
-		lineID ++;
-	}
-	return TRUE;
-
-}
-
-
-
-
-gboolean MenuContext::CB_displayDraw2( GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
-	MenuContext * self = reinterpret_cast<MenuContext*>(data);
-
-  gint width;
-  gint height;
-  cairo_t *cr = NULL;
-
-
-#	if USE_GTK_VERSION_3_0
-	cr = gdk_cairo_create(gtk_widget_get_window(widget));
-#	elif USE_GTK_VERSION_2_0
-	cr = gdk_cairo_create(widget->window);
-#	endif
-	// transparent
-	cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.0);
-
-	/* draw the background */
-	cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-	cairo_paint (cr);
-
-	/* draw a circle */
-	gtk_window_get_size (GTK_WINDOW(widget), &width, &height);
-	
-	cairo_set_source_rgba (cr, 1, 0.2, 0.2, 0.6);
-	cairo_arc (cr, width / 2, height / 2, (width < height ? width : height) / 2 - 8 , 0, 2 * 3.14);
-	cairo_fill (cr);
-	cairo_stroke (cr);
-	cairo_paint (cr);
-	
-	cairo_destroy (cr);
-	return FALSE;
-}
-
-
-
-
-// sur : <20>mis lors du premier affichage de la GtkDrawingArea
-gboolean MenuContext::CB_displayInit( GtkWidget *widget, gpointer data)
-{
-	MenuContext * self = reinterpret_cast<MenuContext*>(data);
-	
-#	ifdef USE_GTK_VERSION_3_0
-	GtkAllocation allocation;
-	gtk_widget_get_allocation(widget, &allocation);
-	int32_t size_x = allocation.width;
-	int32_t size_y = allocation.height;
-	
-	self->m_shawableSize.x = allocation.width;
-	self->m_shawableSize.y = allocation.height;
-#	elif defined( USE_GTK_VERSION_2_0)
-	int32_t size_x = widget->allocation.width;
-	int32_t size_y = widget->allocation.height;
-	
-	self->m_shawableSize.x = widget->allocation.width;
-	self->m_shawableSize.y = widget->allocation.height;
-#	endif
-	EDN_INFO("Request a diplay of : " << size_x << "px * " << size_y << "px");
-
-	gtk_widget_queue_draw( widget );
-	return TRUE;
-}
-
-gint MenuContext::CB_focusGet(	GtkWidget *widget, GdkEventFocus *event, gpointer data)
-{
-	//MenuContext * self = reinterpret_cast<MenuContext*>(data);
-	
-#	ifdef USE_GTK_VERSION_2_0
-	GTK_WIDGET_SET_FLAGS(widget, GTK_HAS_FOCUS);
-#	endif
-	EDN_INFO("Focus - In");
-	gtk_widget_queue_draw( widget );
-	return FALSE;
-}
-
-gint MenuContext::CB_focusLost(	GtkWidget *widget, GdkEventFocus *event, gpointer data)
-{
-	MenuContext * self = reinterpret_cast<MenuContext*>(data);
-	
-#	ifdef USE_GTK_VERSION_2_0
-	GTK_WIDGET_UNSET_FLAGS(widget, GTK_HAS_FOCUS);
-#	endif
-	EDN_INFO("Focus - out");
-	self->Hide();
-	return FALSE;
-}
-
-gint MenuContext::CB_keyboardEvent(	GtkWidget *widget, GdkEventKey *event, gpointer data)
-{
-	//MenuContext * self = reinterpret_cast<MenuContext*>(data);
-	
-	if(event->type == GDK_KEY_PRESS) {
-		gtk_widget_queue_draw( widget );
-	}
-	return true;
-}
-
-
-gint MenuContext::CB_mouseButtonEvent(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-	MenuContext * self = reinterpret_cast<MenuContext*>(data);
-	
-	// get focus on the widget
-	gtk_widget_grab_focus(widget);
-	if (event->button == 1) {
-		/*
-		if (event->type == GDK_BUTTON_PRESS) {
-			EDN_INFO("mouse-event BT1  ==> One Clicked");
-		}else*/ if (event->type == GDK_2BUTTON_PRESS) {
-			//EDN_INFO("mouse-event BT1  ==> Double Clicked %d, %d", (uint32_t)event->x, (uint32_t)event->y);
-			uint32_t fontHeight = Display::GetFontHeight();
-			int32_t selectBuf = self->m_bufferManager->WitchBuffer((event->y / fontHeight) + 1);
-			//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");
-			uint32_t fontHeight = Display::GetFontHeight();
-			int32_t selectBuf = self->m_bufferManager->WitchBuffer((event->y / fontHeight) + 1);
-			if ( 0 <= selectBuf) {
-				// TODO : Find a simple methode
-				int32_t windowsPosX, windowsPosY;
-				gtk_window_get_position(GTK_WINDOW(gtk_widget_get_toplevel(widget)), &windowsPosX, &windowsPosY);
-				//EDN_INFO("windowsPosX=" << windowsPosX << " windowsPosY=" << windowsPosY);
-				int32_t widgetPosX, widgetPosY;
-				gtk_widget_translate_coordinates(widget, gtk_widget_get_toplevel(widget), 0, 0, &widgetPosX, &widgetPosY);
-				//EDN_INFO("widgetPosX=" << widgetPosX << " widgetPosY=" << widgetPosY);
-				self->m_menuContext->Show(self->m_shawableAreaX+2+widgetPosX+windowsPosX, ((int32_t)(event->y / fontHeight)*fontHeight)+(fontHeight/2)+widgetPosY+windowsPosY, false);
-			}
-		}
-	}*/ else {
-		EDN_INFO("mouse-event BT? PRESS");
-	}
-	gtk_widget_queue_draw( widget );
-	return true;
-}
-
-
-
-gint MenuContext::CB_mouseMotionEvent( GtkWidget *widget, GdkEventMotion *event, gpointer data)
-{
-	//MenuContexterView * self = reinterpret_cast<MenuContext*>(data);
-	
-/*
-	if (true == ButtunOneSelected) {
-		int x, y;
-		GdkModifierType state;
-
-		if (event->is_hint) {
-			gdk_window_get_pointer(event->window, &x, &y, &state);
-		} else {
-			x = event->x;
-			y = event->y;
-			state = (GdkModifierType)event->state;
-		}
-		EDN_INFO("mouse-motion BT1 %d, %d", x, y);
-	}
-*/
-	return true;
-}

Sources/GuiTools/MenuContext/MenuContext.h

@@ -1,72 +0,0 @@
-/**
- *******************************************************************************
- * @file MenuContext.h
- * @brief Editeur De N'ours : special Menu (left button or normal menu) (header)
- * @author Edouard DUPIN
- * @date 22/07/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 __MENU_CONTEXT_H__
-#define __MENU_CONTEXT_H__
-
-#include "Singleton.h"
-#include "MsgBroadcast.h"
-#include "Edn.h"
-#include "BufferManager.h"
-#include "ColorizeManager.h"
-
-class MenuContext: public Singleton<MenuContext>, public MsgBroadcast
-{
-	friend class Singleton<MenuContext>;
-	// specific for sigleton system...
-	private:
-		// Constructeur
-		MenuContext(void);
-		~MenuContext(void);
-
-	public:
-		void    OnMessage(int32_t id, int32_t dataID);
-		// sur : GTK+ callback :
-		static gboolean CB_displayDraw( GtkWidget *widget, GdkEventExpose *event, gpointer data);
-		static gboolean CB_displayDraw2( GtkWidget *widget, GdkEventExpose *event, gpointer data);
-		static gboolean CB_displayInit( GtkWidget *widget, gpointer data);
-		static gint     CB_focusGet( GtkWidget *widget, GdkEventFocus *event, gpointer data);
-		static gint     CB_focusLost( GtkWidget *widget, GdkEventFocus *event, gpointer data);
-		static gint     CB_keyboardEvent( GtkWidget *widget, GdkEventKey *event, gpointer data);
-		static gint     CB_mouseButtonEvent(GtkWidget *widget, GdkEventButton *event, gpointer data);
-		static gint     CB_mouseMotionEvent( GtkWidget *widget, GdkEventMotion *event, gpointer data);
-		static void     CB_EventOnBufferManager(gpointer data);
-		static void     CB_ScreenChange(GtkWidget *widget, GdkScreen *old_screen, gpointer userdata);
-	public:
-		void    Clear(void);
-		void    AddCommonElem(int32_t id);
-		void    AddSpecificElem(Edn::String &text);
-		void    Show(int32_t x, int32_t y, bool top);
-		void    Hide(void);
-	private:
-		BufferManager *       m_bufferManager;
-		ColorizeManager *     m_colorManager;
-		GtkWidget *     m_dialog;
-		GtkWidget *     m_widget;
-		position_ts     m_requestedPos;
-		position_ts     m_shawableSize;
-};
-
-#endif

Sources/GuiTools/Search/Search.cpp

@@ -192,9 +192,9 @@ void Search::Display(GtkWindow *parent)
 		} else {
 			gtk_widget_set_sensitive(m_CkMatchCase, true);
 		}
-		
+		// Remove data form the search
-		Edn::String myDataString;
+		Edn::String myDataString = "";
-		SearchData::GetSearch(myDataString);
+		SearchData::SetSearch(myDataString);
 		gtk_entry_set_text(GTK_ENTRY(m_searchEntry), myDataString.c_str());
 		if (0 == strlen(myDataString.c_str())) {
 			m_haveSearchData = false;
@@ -212,13 +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_BtReplace, false);
-			gtk_widget_set_sensitive(m_BtReplaceAndNext, 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_widget_grab_focus(m_searchEntry);
 		
 		// display the dialogue box
 		gtk_widget_show_all(m_localDialog);
@@ -327,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);
 		}
 	}
 }
@@ -347,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/Search/Search.h

@@ -28,8 +28,6 @@
 
 #include "tools_debug.h"
 #include "Singleton.h"
-#include <string>
-#include <vector>
 
 
 class Search: public Singleton<Search>

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),
+				                                                              "    * Redistribute the sources code and binaries.\n"
-				    "<b>Name :</b> Edn\n"
+				                                                              "    * Modify the Sources code.\n"
-				    "<b>Version :</b> " VERSION_TAG_NAME "\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"
-				    "<b>Build Time :</b> " VERSION_BUILD_TIME "\n\n"
+				                                                              "    * Redistribute the modification only if you want.\n"
-				    "<b>Description :</b> Editeur De N'ours, l'Editeur Desoxyribo-Nucleique\n"
+				                                                              "    * Send me the bug-fix (it could be great).\n"
-				    "    Source Code Editor\n\n" 
+				                                                              "    * Pay me a beer or some other things.\n"
-				    "<b>Copyright 2010 Edouard DUPIN, all right reserved</b>\n\n"
+				                                                              "    * Print the source code on WC paper ...\n\n"
-				    "<b>Terms of license : </b>\n"
+				                                                              "You can NOT:\n"
-				    "This software is distributed in the hope that it will be useful, but \n"
+				                                                              "    * Earn money with this Software (But I can).\n"
-				    "WITHOUT ANY WARRANTY\n"
+				                                                              "    * Add malware in the Sources.\n"
-				    "    <b>You can:</b>\n"
+				                                                              "    * Do something bad with the sources.\n"
-				    "        * Redistribute the sources code and binaries.\n"
+				                                                              "    * Use it to travel in the space with a toaster.\n\n"
-				    "        * Modify the Sources code.\n"
+				                                                              "I reserve the right to change this licence. If it change the version of the copy you have keep its own license.");
-				    "        * Use a part of the sources (less than 50%) in an other software,\n"
+				gtk_about_dialog_set_wrap_license(GTK_ABOUT_DIALOG(myDialog), true);
-				    "          just write somewhere \"Edn is great\" visible by the user (on \n"
+#				if USE_GTK_VERSION_3_0
-				    "          your product or on your website with a link to my page).\n"
+				gtk_about_dialog_set_license_type(GTK_ABOUT_DIALOG(myDialog), GTK_LICENSE_CUSTOM);
-				    "        * Redistribute the modification only if you want.\n"
+#				endif
-				    "        * Send me the bug-fix (it could be great).\n"
+				gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(myDialog), "http://HeeroYui.github.com/edn");
-				    "        * Pay me a beer or some other things.\n"
+				gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(myDialog), "Edn on github");
-				    "        Print the source code on WC paper ...\n"
+				const char * listAutor[] = {"Edouard DUPIN", NULL};
-				    "    <b>You can NOT:</b>\n"
+				gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(myDialog), listAutor);
-				    "        * Earn money with this Software (But I can).\n"
+				// Display About
-				    "        * Add malware in the Sources.\n"
+				gtk_dialog_run(GTK_DIALOG(myDialog));
-				    "        * Do something bad with the sources.\n"
-				    "        * Use it to travel in the space with a toaster.\n"
-				    "I reserve the right to change this licence. If it change the version of \n"
-				    "the copy you have keep its own license.\n\n"
-				    "<b>Sources : </b> git://github.com/HeeroYui/edn.git ");
-				gtk_box_pack_start(GTK_BOX(myContentArea), myLabel, TRUE, TRUE, 0);
-				
-				gtk_widget_show_all(myContentArea);
-				int32_t result = 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

@@ -33,14 +33,14 @@
 #define __class__	"Highlight"
 
 
-void Highlight::ParseRules(TiXmlNode *child, std::vector<HighlightPattern*> &mListPatern, int32_t level)
+void Highlight::ParseRules(TiXmlNode *child, Edn::VectorType<HighlightPattern*> &mListPatern, int32_t level)
 {
 	// Create the patern ...
 	HighlightPattern *myPattern = new HighlightPattern();
 	// parse under Element
 	myPattern->ParseRules(child, level);
 	// add element in the list
-	mListPatern.push_back(myPattern);
+	mListPatern.PushBack(myPattern);
 }
 
 
@@ -72,8 +72,8 @@ Highlight::Highlight(Edn::String &xmlFilename)
 			const char *myData = child->ToElement()->GetText();
 			if (NULL != myData) {
 				//EDN_INFO(PFX"(l %d) node fined : %s=\"%s\"", child->Row(), child->Value() , myData);
-				Edn::String myEdnData = myData;
+				Edn::String * myEdnData = new Edn::String(myData);
-				m_listExtentions.push_back(myEdnData);
+				m_listExtentions.PushBack(myEdnData);
 			}
 		} else if (!strcmp(child->Value(), "pass1")) {
 			// Get sub Nodes ...
@@ -113,21 +113,48 @@ Highlight::Highlight(Edn::String &xmlFilename)
 
 Highlight::~Highlight(void)
 {
-	uint32_t i;
+	int32_t i;
 	// clean all Element
-	for (i=0; i< m_listHighlightPass1.size(); i++) {
+	for (i=0; i< m_listHighlightPass1.Size(); i++) {
-		delete(m_listHighlightPass1[i]);
+		if (NULL != m_listHighlightPass1[i]) {
+			delete(m_listHighlightPass1[i]);
+			m_listHighlightPass1[i] = NULL;
+		}
 	}
 	// clear the compleate list
-	m_listHighlightPass1.clear();
+	m_listHighlightPass1.Clear();
+
+	// clean all Element
+	for (i=0; i< m_listExtentions.Size(); i++) {
+		if (NULL != m_listExtentions[i]) {
+			delete(m_listExtentions[i]);
+			m_listExtentions[i] = NULL;
+		}
+	}
+	// clear the compleate list
+	m_listExtentions.Clear();
 }
 
+void Highlight::ReloadColor(void)
+{
+	int32_t i;
+	for (i=0; i< m_listHighlightPass1.Size(); i++) {
+		if (NULL != m_listHighlightPass1[i]) {
+			m_listHighlightPass1[i]->ReloadColor();
+		}
+	}
+	for (i=0; i< m_listHighlightPass2.Size(); i++) {
+		if (NULL != m_listHighlightPass2[i]) {
+			m_listHighlightPass2[i]->ReloadColor();
+		}
+	}
+}
 
 bool Highlight::HasExtention(Edn::String &ext)
 {
-	uint32_t i;
+	int32_t i;
-	for (i=0; i<m_listExtentions.size(); i++) {
+	for (i=0; i<m_listExtentions.Size(); i++) {
-		if (ext == m_listExtentions[i] ) {
+		if (ext == *m_listExtentions[i] ) {
 			return true;
 		}
 	}
@@ -136,7 +163,7 @@ bool Highlight::HasExtention(Edn::String &ext)
 
 bool Highlight::FileNameCompatible(Edn::File &fileName)
 {
-	uint32_t i;
+	int32_t i;
 	Edn::String extention;
 	if (true == fileName.HasExtention() ) {
 		extention = "*.";
@@ -146,8 +173,8 @@ bool Highlight::FileNameCompatible(Edn::File &fileName)
 	}
 	EDN_DEBUG(" try to find : in \"" << fileName << "\" extention:\"" << extention << "\" ");
 
-	for (i=0; i<m_listExtentions.size(); i++) {
+	for (i=0; i<m_listExtentions.Size(); i++) {
-		if (extention == m_listExtentions[i] ) {
+		if (extention == *m_listExtentions[i] ) {
 			return true;
 		}
 	}
@@ -157,134 +184,119 @@ bool Highlight::FileNameCompatible(Edn::File &fileName)
 
 void Highlight::Display(void)
 {
-	uint32_t i;
+	int32_t i;
 	EDN_INFO("List of ALL Highlight : ");
-	for (i=0; i< m_listExtentions.size(); i++) {
+	for (i=0; i< m_listExtentions.Size(); i++) {
-		EDN_INFO("        Extention : " << i << " : " << m_listExtentions[i] );
+		EDN_INFO("        Extention : " << i << " : " << *m_listExtentions[i] );
 	}
 	// Display all elements
-	for (i=0; i< m_listHighlightPass1.size(); i++) {
+	for (i=0; i< m_listHighlightPass1.Size(); i++) {
 		EDN_INFO("        " << i << " Pass 1 : " << m_listHighlightPass1[i]->GetName() );
 		//m_listHighlightPass1[i]->Display();
 	}
 	// Display all elements
-	for (i=0; i< m_listHighlightPass2.size(); i++) {
+	for (i=0; i< m_listHighlightPass2.Size(); i++) {
 		EDN_INFO("        " << i << " Pass 2 : " << m_listHighlightPass2[i]->GetName() );
 		//m_listHighlightPass2[i]->Display();
 	}
 }
+// 13h 46min 22s | (l=  214) Highlight::Parse                     | [II] Find Pattern in the Buffer : (2457,2479)
 
 
-void Highlight::Parse(int32_t start, int32_t stop, std::vector<colorInformation_ts> &metaData, int32_t &addingPos, EdnVectorBuf &buffer, int32_t elementID)
+// TODO : Celui qui appelle suprime des element pour rien ... Enfin c'est pas tr<74>grave... Il suffirait juste de suprimer celuis d'avant si il n'est pas terminer...
+void Highlight::Parse(int32_t start,
+                      int32_t stop,
+                      Edn::VectorType<colorInformation_ts> &metaData,
+                      int32_t addingPos,
+                      EdnVectorBuf &buffer)
 {
 	if (0 > addingPos) {
 		addingPos = 0;
 	}
-	/*int32_t emptyId = -1;
+	//EDN_DEBUG("Parse element 0 => " << m_listHighlightPass1.Size() << " ==> position search: (" << start << "," << stop << ")" );
-	for (i=0; i< (int32_t)metaData.size(); i++) {
-		
-	}*/
-	//EDN_DEBUG("Parse element " << elementID << " / " << m_listHighlightPass1.size() << " ==> position search: (" << start << "," << stop << ")" );
-	if (elementID >= (int32_t)m_listHighlightPass1.size() ){
-		//EDN_DEBUG("Return at " << elementID << " / " << m_listHighlightPass1.size() );
-		return;
-	}
 	int32_t elementStart = start;
 	int32_t elementStop = stop;
-	resultFind_te ret = HLP_FIND_OK;
 	colorInformation_ts resultat;
-	while (HLP_FIND_ERROR != ret && elementStart<elementStop) {
+	while (elementStart<elementStop) {
-		ret = m_listHighlightPass1[elementID]->Find(elementStart, elementStop, resultat, buffer);
+		//EDN_DEBUG("Parse element in the buffer id=" << elementStart);
-		if (HLP_FIND_ERROR != ret) {
+		//try to fond the HL in ALL of we have
-			//EDN_INFO("Find Pattern in the Buffer : (" << resultat.beginStart << "," << resultat.endStop << ")" );
+		for (int32_t jjj=0; jjj<m_listHighlightPass1.Size(); jjj++){
-			// Add curent element in the list ...
+			resultFind_te ret = HLP_FIND_OK;
-			if (HLP_FIND_OK_NO_END == ret) {
+			//EDN_DEBUG("Parse HL id=" << jjj << " position search: (" << start << "," << buffer.Size() << ")" );
-				// find if we have a next element with th save Pointer and not higher the this one
+			// Stop the search to the end (to get the end of the pattern)
-				int32_t findNextElement = -1;
+			ret = m_listHighlightPass1[jjj]->Find(elementStart, buffer.Size(), resultat, buffer);
-				int32_t i;
+			if (HLP_FIND_ERROR != ret) {
-				int32_t curentLevel = ((HighlightPattern*)resultat.patern)->GetLevel();
+				//EDN_INFO("Find Pattern in the Buffer : (" << resultat.beginStart << "," << resultat.endStop << ")" );
-				for (i=addingPos; i< (int32_t)metaData.size(); i++) {
+				// Remove element in the current List where the current Element have a end inside the next...
-					if (curentLevel > ((HighlightPattern*)metaData[i].patern)->GetLevel() ) {
+				int32_t kkk=addingPos;
-						//EDN_DEBUG("    -> Find upper element at "<< i );
+				while(kkk < metaData.Size() ) {
-						break;
+					if (metaData[kkk].beginStart <= resultat.endStop) {
-					} else if (curentLevel < ((HighlightPattern*)metaData[i].patern)->GetLevel() ) {
+						// Remove element
-						findNextElement = i;
+						//EDN_INFO("Erase element=" << kkk);
-						//EDN_DEBUG("    -> Find under element at "<< i );
+						metaData.EraseLen(kkk, kkk+1);
-					}
+						// Increase the end of search
-					if (metaData[i].patern == resultat.patern)
+						if (kkk < metaData.Size()) {
-					{
+							// just befor the end of the next element
-						findNextElement = i;
+							elementStop = metaData[kkk].beginStart-1;
-						//EDN_DEBUG("    -> Find a same element at "<< i );
+						} else {
-						break;
+							// end of the buffer
-					}
+							elementStop = buffer.Size();
-				}
+						}
-
-				if (-1 != findNextElement) {
-					// if not find a end, we need to search the end of this one and parse all data inside...
-					int32_t newEnd   = buffer.Size();
-					if (findNextElement >= (int32_t)metaData.size()-1) {
-						// Remove old element : 
-						//EDN_DEBUG("        --> Remove : " << addingPos << "==>" << (int32_t)metaData.size() << " (end)" );
-						metaData.erase(metaData.begin()+addingPos,metaData.end());
 					} else {
-						// Remove old element : 
+						// Not find ==> exit the cycle : 
-						//EDN_DEBUG("        --> Remove : " << addingPos << "==>" << findNextElement+1 );
+						break;
-						metaData.erase(metaData.begin()+addingPos,metaData.begin()+findNextElement+1);
-						newEnd   = metaData[addingPos].beginStart-1;
 					}
-					// Regenerate a local parsing : in a higher range of text
-					Parse(elementStart, edn_max(newEnd, stop), metaData, addingPos, buffer, elementID);
-					// Break the curent process, beacause we reparse the data in all range...
-					return;
-				} else {
-					//EDN_DEBUG("        --> No element removed " );
-					metaData.insert(metaData.begin() + addingPos, resultat);
-					//EDN_DEBUG("INSERT at "<< addingPos << " S=" << resultat.beginStart << " E=" << resultat.endStop );
 				}
-			} else {
+				// Add curent element in the list ...
-				metaData.insert(metaData.begin() + addingPos, resultat);
+				metaData.Insert(addingPos, resultat);
 				//EDN_DEBUG("INSERT at "<< addingPos << " S=" << resultat.beginStart << " E=" << resultat.endStop );
+				// Update the current research starting element: (Set position at the end of the current element
+				elementStart = resultat.endStop-1;
+				// increment the position of insertion:
+				addingPos++;
+				// We find a pattern ==> Stop search for the current element
+				break;
 			}
-			// parse the under element : 
-			Parse(elementStart, resultat.beginStart-1, metaData, addingPos, buffer, elementID+1);
-			addingPos++;
-			elementStart = resultat.endStop;
 		}
+		// Go to the next element (and search again ...).
+		elementStart++;
 	}
-	// parse the under element : 
-	Parse(elementStart, elementStop, metaData, addingPos, buffer, elementID+1);
 }
 
+
 /**
  * @brief second pass of the hightlight
  *
  */
-void Highlight::Parse2(int32_t start, int32_t stop, std::vector<colorInformation_ts> &metaData, EdnVectorBuf &buffer, int32_t elementID)
+void Highlight::Parse2(int32_t start,
+                       int32_t stop,
+                       Edn::VectorType<colorInformation_ts> &metaData,
+                       EdnVectorBuf &buffer)
 {
-	if (elementID >= (int32_t)m_listHighlightPass2.size() ){
+	//EDN_DEBUG("Parse element 0 => " << m_listHighlightPass2.size() << " ==> position search: (" << start << "," << stop << ")" );
-		return;
-	}
 	int32_t elementStart = start;
 	int32_t elementStop = stop;
-	resultFind_te ret = HLP_FIND_OK;
 	colorInformation_ts resultat;
-	while (HLP_FIND_ERROR != ret && elementStart<elementStop) {
+	while (elementStart<elementStop) {
-		if (m_listHighlightPass2[elementID]!=NULL) {
+		//EDN_DEBUG("Parse element in the buffer id=" << elementStart);
-			ret = m_listHighlightPass2[elementID]->Find(elementStart, elementStop, resultat, buffer);
+		//try to fond the HL in ALL of we have
-		} else {
+		int32_t jjj;
-			ret = HLP_FIND_ERROR;
+		for (jjj=0; jjj<m_listHighlightPass2.Size(); jjj++){
-		}
+			resultFind_te ret = HLP_FIND_OK;
-		if (HLP_FIND_ERROR != ret) {
+			//EDN_DEBUG("Parse HL id=" << jjj << " position search: (" << start << "," << buffer.Size() << ")" );
-			//EDN_INFO("Find Pattern in the Buffer : (" << resultat.beginStart << "," << resultat.endStop << ")" );
+			// Stop the search to the end (to get the end of the pattern)
-			// parse the under element :
+			ret = m_listHighlightPass2[jjj]->Find(elementStart, elementStop, resultat, buffer);
-			Parse2(elementStart, resultat.beginStart, metaData, buffer, elementID+1);
+			if (HLP_FIND_ERROR != ret) {
-			// Add curent element in the list ...
+				//EDN_INFO("Find Pattern in the Buffer : (" << resultat.beginStart << "," << resultat.endStop << ")" );
-			metaData.push_back(resultat);
+				// Add curent element in the list ...
-			elementStart = resultat.endStop;
+				metaData.PushBack(resultat);
+				elementStart = resultat.endStop-1;
+				// Exit current cycle
+				break;
+			}
 		}
+		// Go to the next element (and search again ...).
+		elementStart++;
 	}
-	// parse the under element :
-	Parse2(elementStart, elementStop, metaData, buffer, elementID+1);
 }
 
-

Sources/Highlight/Highlight.h

@@ -23,6 +23,7 @@
  *******************************************************************************
  */
 
+#include "Edn.h"
 #ifndef __HIGHLIGHT_H__
 #define __HIGHLIGHT_H__
 
@@ -38,14 +39,12 @@ extern "C" {
 		int32_t             endStart;
 		int32_t             endStop;
 		bool                notEnded;
-		HighlightPattern *  patern;		// pointer on class : 
+		HighlightPattern *  patern;     // pointer on class : 
 	} colorInformation_ts;
 }
 
-#include <vector>
 #include "HighlightPattern.h"
 #include "Colorize.h"
-#include "Edn.h"
 #include "EdnVectorBuf.h"
 #include "tinyxml.h"
 
@@ -57,15 +56,22 @@ class Highlight {
 		bool HasExtention(Edn::String &ext);
 		bool FileNameCompatible(Edn::File &fileName);
 		void Display(void);
-		void Parse( int32_t start, int32_t stop, std::vector<colorInformation_ts> &metaData, int32_t &addingPos, EdnVectorBuf &buffer, int32_t elementID=0);
+		void ReloadColor(void);
-		void Parse2(int32_t start, int32_t stop, std::vector<colorInformation_ts> &metaData, EdnVectorBuf &buffer, int32_t elementID=0);
+		void Parse(int32_t start,
-
+		           int32_t stop,
+		           Edn::VectorType<colorInformation_ts> &metaData,
+		           int32_t addingPos,
+		           EdnVectorBuf &buffer);
+		void Parse2(int32_t start,
+		            int32_t stop,
+		            Edn::VectorType<colorInformation_ts> &metaData,
+		            EdnVectorBuf &buffer);
 	private:
-		void                            ParseRules(TiXmlNode *child, std::vector<HighlightPattern*> &mListPatern, int32_t level);
+		void                                ParseRules(TiXmlNode *child, Edn::VectorType<HighlightPattern*> &mListPatern, int32_t level);
-		Edn::String                     m_styleName;               //!< curent style name (like "c++" or "c" or "script Bash")
+		Edn::String                         m_styleName;               //!< curent style name (like "c++" or "c" or "script Bash")
-		std::vector<Edn::String>        m_listExtentions;          //!< List of possible extention for this high-light, like : ".c", ".cpp", ".h"
+		Edn::VectorType<Edn::String*>       m_listExtentions;          //!< List of possible extention for this high-light, like : ".c", ".cpp", ".h"
-		std::vector<HighlightPattern*>  m_listHighlightPass1;      //!< List of ALL hightlight modules (pass 1 ==> when we load and wride data on the buffer)
+		Edn::VectorType<HighlightPattern*>  m_listHighlightPass1;      //!< List of ALL hightlight modules (pass 1 ==> when we load and wride data on the buffer)
-		std::vector<HighlightPattern*>  m_listHighlightPass2;      //!< List of ALL hightlight modules (pass 2 ==> When we display the buffer( only the display area (100 lines)) )
+		Edn::VectorType<HighlightPattern*>  m_listHighlightPass2;      //!< List of ALL hightlight modules (pass 2 ==> When we display the buffer( only the display area (100 lines)) )
 };
 
 

Sources/Highlight/HighlightManager.cpp

@@ -30,21 +30,45 @@
 #undef __class__
 #define __class__	"HighlightManager"
 
-HighlightManager::HighlightManager(void)
+HighlightManager::HighlightManager(void) : MsgBroadcast("Hight-light Manager", EDN_CAT_HL)
 {
 
 }
 
 HighlightManager::~HighlightManager(void)
 {
-	listHighlight.clear();
+	int32_t i;
+	// clean all Element
+	for (i=0; i< listHighlight.Size(); i++) {
+		if (NULL != listHighlight[i]) {
+			delete(listHighlight[i]);
+			listHighlight[i] = NULL;
+		}
+	}
+	// clear the compleate list
+	listHighlight.Clear();
 }
 
 
+void HighlightManager::OnMessage(int32_t id, int32_t dataID)
+{
+	switch (id)
+	{
+		case EDN_MSG__COLOR_HAS_CHANGE:
+			EDN_INFO("UPDATE the color pointer on the HL");
+			for (int32_t i=0; i<listHighlight.Size(); i++) {
+				if (NULL != listHighlight[i]) {
+					listHighlight[i]->ReloadColor();
+				}
+			}
+			break;
+	}
+}
+
 Highlight *HighlightManager::Get(Edn::File &fileName)
 {
-	uint32_t i;
+	int32_t i;
-	for (i=0; i<listHighlight.size(); i++) {
+	for (i=0; i<listHighlight.Size(); i++) {
 		if (true == listHighlight[i]->FileNameCompatible(fileName) ) {
 			return listHighlight[i];
 		}
@@ -73,33 +97,43 @@ void HighlightManager::loadLanguages(void)
 	Edn::String xmlFilename = homedir;
 	xmlFilename += "lang_c.xml";
 	Highlight *myHightline = new Highlight(xmlFilename);
-	listHighlight.push_back(myHightline);
+	listHighlight.PushBack(myHightline);
 	
 	xmlFilename = homedir;
 	xmlFilename += "lang_boo.xml";
 	myHightline = new Highlight(xmlFilename);
-	listHighlight.push_back(myHightline);
+	listHighlight.PushBack(myHightline);
 	
 	xmlFilename = homedir;
 	xmlFilename += "lang_Makefile.xml";
 	myHightline = new Highlight(xmlFilename);
-	listHighlight.push_back(myHightline);
+	listHighlight.PushBack(myHightline);
 	
 	xmlFilename = homedir;
 	xmlFilename += "lang_asm.xml";
 	myHightline = new Highlight(xmlFilename);
-	listHighlight.push_back(myHightline);
+	listHighlight.PushBack(myHightline);
 	
 	xmlFilename = homedir;
 	xmlFilename += "lang_xml.xml";
 	myHightline = new Highlight(xmlFilename);
-	listHighlight.push_back(myHightline);
+	listHighlight.PushBack(myHightline);
 	
 	xmlFilename = homedir;
 	xmlFilename += "lang_php.xml";
 	myHightline = new Highlight(xmlFilename);
-	listHighlight.push_back(myHightline);
+	listHighlight.PushBack(myHightline);
 	
-	myHightline->Display();
+	xmlFilename = homedir;
+	xmlFilename += "lang_bash.xml";
+	myHightline = new Highlight(xmlFilename);
+	listHighlight.PushBack(myHightline);
+	
+	xmlFilename = homedir;
+	xmlFilename += "lang_matlab.xml";
+	myHightline = new Highlight(xmlFilename);
+	listHighlight.PushBack(myHightline);
+	
+	//myHightline->Display();
 }
 

Sources/Highlight/HighlightManager.h

@@ -29,12 +29,11 @@
 class HighlightManager;
 
 #include "Singleton.h"
-#include <vector>
+#include "MsgBroadcast.h"
-#include <string>
 #include "Highlight.h"
 
 
-class HighlightManager: public Singleton<HighlightManager>
+class HighlightManager: public Singleton<HighlightManager>, public MsgBroadcast
 {
 	friend class Singleton<HighlightManager>;
 	// specific for sigleton system...
@@ -43,13 +42,15 @@ class HighlightManager: public Singleton<HighlightManager>
 		HighlightManager(void);
 		~HighlightManager(void);
 
+	public:
+		void    OnMessage(int32_t id, int32_t dataID);
 	public:
 		void loadLanguages(void);
 		Highlight	* Get(Edn::File &fileName);
 		bool		  Exist(Edn::File &fileName);
 
 	private:
-		std::vector<Highlight*> listHighlight;		//!< List of ALL hightlight modules
+		Edn::VectorType<Highlight*> listHighlight;		//!< List of ALL hightlight modules
 };
 
 #endif

Sources/Highlight/HighlightPattern.cpp

@@ -87,6 +87,13 @@ bool HighlightPattern::IsEnable(void)
 	return true;
 }
 
+
+void HighlightPattern::ReloadColor(void)
+{
+	ColorizeManager *myColorManager = ColorizeManager::getInstance();
+	m_color = myColorManager->Get(m_colorName);
+}
+
 /**
  * @brief
  *
@@ -190,6 +197,19 @@ void HighlightPattern::ParseRules(TiXmlNode *child, int32_t level)
 	}
 }
 
+
+/**
+ * @brief Find Element only in the specify start characters and find the end with the range done
+ *
+ * @param[in] start First character to search data (if recognise it start here)
+ * @param[in] stop End of the possibility whe search can continue
+ * @param[out] resultat Position where find data
+ * @param[in] buffer : Where to search data
+ *
+ * @return HLP_FIND_OK We find a compleate pattern
+ * @return HLP_FIND_OK_NO_END Xe find a partial pattern (missing end)
+ * @return HLP_FIND_ERROR Not find the pattern
+ */
 resultFind_te HighlightPattern::Find(int32_t start, int32_t stop, colorInformation_ts &resultat, EdnVectorBuf &buffer)
 {
 	//EDN_DEBUG(" try to find the element");
@@ -202,7 +222,7 @@ resultFind_te HighlightPattern::Find(int32_t start, int32_t stop, colorInformati
 	
 	// when we have only one element : 
 	if (false == m_haveStopPatern) {
-		if (true == m_regExpStart->Process(buffer, start, stop)) {
+		if (true == m_regExpStart->ProcessOneElement(buffer, start, stop)) {
 			resultat.beginStart = m_regExpStart->Start();
 			resultat.beginStop  = m_regExpStart->Stop();
 			resultat.endStart = m_regExpStart->Start();
@@ -212,7 +232,7 @@ resultFind_te HighlightPattern::Find(int32_t start, int32_t stop, colorInformati
 		//EDN_DEBUG("NOT find hightlightpatern ...");
 	} else {
 		// try while we find the first element
-		if (true == m_regExpStart->Process(buffer, start, stop, m_escapeChar)) {
+		if (true == m_regExpStart->ProcessOneElement(buffer, start, stop, m_escapeChar)) {
 			resultat.beginStart = m_regExpStart->Start();
 			resultat.beginStop  = m_regExpStart->Stop();
 			if (true == m_regExpStop->Process(buffer, resultat.beginStop, stop, m_escapeChar)) {

Sources/Highlight/HighlightPattern.h

@@ -51,23 +51,25 @@ class HighlightPattern {
 		HighlightPattern(void);
 		~HighlightPattern(void);
 		
-		void			SetName(Edn::String &name) { m_paternName = name;};
+		void            SetName(Edn::String &name) { m_paternName = name;};
-		Edn::String		GetName(void) { return m_paternName;};
+		Edn::String     GetName(void) { return m_paternName;};
 		
-		void			SetPaternStart(Edn::String &regExp);
+		void            SetPaternStart(Edn::String &regExp);
-		void			SetPaternStop(Edn::String &regExp);
+		void            SetPaternStop(Edn::String &regExp);
-		void			SetColor(Edn::String &colorName);
+		void            SetColor(Edn::String &colorName);
-		void			SetEscapeChar(Edn::String &EscapeChar);
+		void            SetEscapeChar(Edn::String &EscapeChar);
-		void			SetMultiline(bool enable) { m_multiline = enable; };
+		void            SetMultiline(bool enable) { m_multiline = enable; };
 		
-		void			SetLevel(int32_t newLevel) { m_level = newLevel; };
+		void            SetLevel(int32_t newLevel) { m_level = newLevel; };
-		int32_t			GetLevel(void) { return m_level; };
+		int32_t         GetLevel(void) { return m_level; };
 		
-		bool			IsEnable(void);
+		bool            IsEnable(void);
-		void			Display(void);
+		void            Display(void);
-		resultFind_te	Find(int32_t start, int32_t stop, colorInformation_ts &resultat, EdnVectorBuf &buffer);
+		resultFind_te   Find(int32_t start, int32_t stop, colorInformation_ts &resultat, EdnVectorBuf &buffer);
-		Colorize *		GetColor(void) { return m_color; };
+		Colorize *      GetColor(void) { return m_color; };
-		void			ParseRules(TiXmlNode *child, int32_t level);
+		void            ParseRules(TiXmlNode *child, int32_t level);
+		
+		void            ReloadColor(void);
 
 	private:
 		int32_t                             m_level;                    //!< Level of the pattern ==> this is to overwrite next pattern when we create an higher ....
@@ -79,8 +81,8 @@ class HighlightPattern {
 		bool                                m_haveStopPatern;           //!< Stop patern presence
 		bool                                m_multiline;                //!< The patern is multiline
 		char                                m_escapeChar;               //!< Escape char to prevent exeit of patern ....
-		Edn::VectorType<HighlightPattern *>    m_subPatern;                //!< Under patern of this one
+		Edn::VectorType<HighlightPattern *> m_subPatern;                //!< Under patern of this one
-//		Edn::VectorType<HighlightPattern *>    m_subColor;                 //!< Under Color in the start RegExp ...
+//		Edn::VectorType<HighlightPattern *> m_subColor;                 //!< Under Color in the start RegExp ...
 };
 
 #endif

Sources/ctags/CTagsManager.cpp

@@ -119,7 +119,22 @@ void CTagsManager::OnMessage(int32_t id, int32_t dataID)
 			JumpTo();
 			break;
 		case EDN_MSG__JUMP_BACK:
-			EDN_INFO("TODO .... jump back");
+			if (m_historyList.Size() > 0) {
+				BufferManager *myBufferManager = BufferManager::getInstance();
+				int32_t id = m_historyList.Size()-1;
+				if (false == myBufferManager->Exist(*m_historyList[id]) ) {
+					// need to open the file : 
+					int32_t openID = myBufferManager->Open(*m_historyList[id]);
+					SendMessage(EDN_MSG__CURRENT_CHANGE_BUFFER_ID, openID);
+				} else {
+					SendMessage(EDN_MSG__CURRENT_CHANGE_BUFFER_ID, myBufferManager->GetId(*m_historyList[id]));
+				}
+				SendMessage(EDN_MSG__CURRENT_GOTO_LINE, m_historyList[id]->GetLineNumber());
+				// Remove element ....
+				delete(m_historyList[id]);
+				m_historyList[id]=NULL;
+				m_historyList.PopBack();
+			}
 			break;
 			
 	}
@@ -155,61 +170,68 @@ 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();
 	Edn::File currentFilename = myBufferManager->Get(bufferID)->GetFileName();
-	
 }
 
 enum
 {
 	CTAGS_COL_FILE = 0,
-	CTAGS_COL_REGEXP,
+	CTAGS_COL_LINE_NUMBER,
 	CTAGS_NUM_COLS
 };
 
-static GtkTreeModel * create_and_fill_model(void)
+void CTagsManager::cb_row(GtkTreeView *p_treeview,
+                          GtkTreePath * p_path,
+                          GtkTreeViewColumn * p_column,
+                          gpointer data)
 {
-	GtkListStore *   store;
+	EDN_DEBUG("event");
-	GtkTreeIter      iter;
+	CTagsManager * self = reinterpret_cast<CTagsManager*>(data);
 	
-	store = gtk_list_store_new(CTAGS_NUM_COLS, G_TYPE_STRING, G_TYPE_STRING);
+	gchar * p_file=NULL;
+	gint lineNumber;
+	GtkTreeIter iter;
 	
-	// Append a row and fill in some data
-	gtk_list_store_append(store, &iter);
-	gtk_list_store_set(store, &iter,
-	                   CTAGS_COL_FILE, "file1.c",
-	                   CTAGS_COL_REGEXP, "void function1(void);",
-	                   -1);
 	
-	gtk_list_store_append(store, &iter);
+	if (gtk_tree_model_get_iter( GTK_TREE_MODEL(self->m_listStore), &iter, p_path))
-	gtk_list_store_set(store, &iter,
+	{
-	                   CTAGS_COL_FILE, "file2.c",
+		gtk_tree_model_get( GTK_TREE_MODEL(self->m_listStore),
-	                   CTAGS_COL_REGEXP, "void function2(void);",
+		                    &iter,
-	                   -1);
+		                    CTAGS_COL_FILE, &p_file,
-	
+		                    CTAGS_COL_LINE_NUMBER, &lineNumber,
-	gtk_list_store_append(store, &iter);
+		                    -1 );
-	gtk_list_store_set(store, &iter,
+		EDN_DEBUG("find : " << p_file << ":" << lineNumber);
-	                   CTAGS_COL_FILE, "file3.c",
+		for (int32_t iii = 0; iii < self->m_currentList.Size() ; iii++) {
-	                   CTAGS_COL_REGEXP, "void function3(void);",
+			if(    self->m_currentList[iii].lineID == lineNumber
-	                   -1);
+			    && strcmp(self->m_currentList[iii].filename, p_file)==0)
-	
+			{
-	return GTK_TREE_MODEL(store);
+				g_object_unref( GTK_TREE_MODEL(self->m_listStore));
+				// Remove dialogue
+				gtk_widget_destroy(self->m_Dialog);
+				// Jump ...
+				self->JumpAtID(iii);
+				return;
+			}
+		}
+	}
 }
 
-static GtkWidget * create_view_and_model(void)
+
+
+GtkWidget * CTagsManager::CreateViewAndModel(void)
 {
-	GtkCellRenderer *   renderer;
-	GtkTreeModel *      model;
-	GtkWidget *         view;
 	
+	GtkCellRenderer *   renderer;
+	GtkWidget *         view;
 	view = gtk_tree_view_new();
 	
 	// Column 1
 	renderer = gtk_cell_renderer_text_new();
-	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW (view),
+	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view),
 	                                            -1,
 	                                            "File",
 	                                            renderer,
@@ -218,18 +240,28 @@ static GtkWidget * create_view_and_model(void)
 	
 	// Column 2
 	renderer = gtk_cell_renderer_text_new();
-	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW (view),
+	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view),
 	                                            -1,
-	                                            "Regular Expression",
+	                                            "lineNumber",
 	                                            renderer,
-	                                            "text", CTAGS_COL_REGEXP,
+	                                            "text", CTAGS_COL_LINE_NUMBER,
 	                                            NULL);
 	
-	model = create_and_fill_model();
+	// Set data in the list : 
+	GtkTreeIter      iter;
+	m_listStore = gtk_list_store_new(CTAGS_NUM_COLS, G_TYPE_STRING, G_TYPE_UINT);
+	// Append a row and fill in some data
+	for (int32_t iii=0; iii<m_currentList.Size() ; iii++) {
+		gtk_list_store_append(m_listStore, &iter);
+		gtk_list_store_set(m_listStore, &iter,
+		                   CTAGS_COL_FILE, m_currentList[iii].filename,
+		                   CTAGS_COL_LINE_NUMBER, m_currentList[iii].lineID,
+		                   -1);
+	}
 	
-	gtk_tree_view_set_model(GTK_TREE_VIEW (view), model);
+	gtk_tree_view_set_model( GTK_TREE_VIEW(view), GTK_TREE_MODEL(m_listStore) );
-	
+	g_signal_connect( G_OBJECT(view), "row-activated", G_CALLBACK(cb_row), /*(gpointer)p_model*/ this );
-	g_object_unref(model);
+	//g_object_unref(GTK_TREE_MODEL(m_listStore));
 	
 	return view;
 }
@@ -238,33 +270,90 @@ static GtkWidget * create_view_and_model(void)
 
 
 
-void CTagsManager::MultipleJump(void)
+int32_t CTagsManager::MultipleJump(void)
 {
 	// dlg to confirm the quit event : 
-	GtkWidget *myDialog = gtk_dialog_new_with_buttons("C-Tags jump...",
+	m_Dialog = gtk_dialog_new_with_buttons("C-Tags jump...",
-	                                                  NULL,
+	                                       NULL,
-	                                                  GTK_DIALOG_MODAL,
+	                                       GTK_DIALOG_MODAL,
-	                                                  "Jump", GTK_RESPONSE_YES,
+	                                       //"Jump", GTK_RESPONSE_YES,
-	                                                  GTK_STOCK_QUIT, GTK_RESPONSE_NO,
+	                                       GTK_STOCK_QUIT, GTK_RESPONSE_NO,
-	                                                  NULL);
+	                                       NULL);
 	// Set over main windows
 	//gtk_window_set_transient_for(GTK_WINDOW(myDialog), GTK_WINDOW(m_mainWindow->GetWidget()));
 	// add writting area
-	GtkWidget *myContentArea = gtk_dialog_get_content_area( GTK_DIALOG(myDialog));
+	GtkWidget *myContentArea = gtk_dialog_get_content_area( GTK_DIALOG(m_Dialog));
-	GtkWidget *listView = create_view_and_model ();
+	GtkWidget *listView = CreateViewAndModel();
 	gtk_box_pack_start(GTK_BOX(myContentArea), listView, TRUE, TRUE, 0);
 	// Display it
 	gtk_widget_show_all(myContentArea);
-	int32_t result = gtk_dialog_run (GTK_DIALOG (myDialog));
+	int32_t result = gtk_dialog_run(GTK_DIALOG(m_Dialog));
 	// Get data from the gtk entry
+	if (result == GTK_RESPONSE_NO) {
+		g_object_unref(GTK_TREE_MODEL(m_listStore));
+		// Remove dialogue
+		gtk_widget_destroy(m_Dialog);
+	}
+	//GtkTreeIter *myIter;
+	//gtk_tree_selection_get_selected(selection, &model, myIter);
+
+	
 	
 	// Remove dialogue
-	gtk_widget_destroy(myDialog);
+	//gtk_widget_destroy(myDialog);
+	return 0;
 }
+/*
+void BufferView::OnCtagsEventList(GtkWidget *menuitem, gpointer data)
+{
+	//BufferView * self = reinterpret_cast<BufferView*>(data);
+	//self->SendMessage(EDN_MSG__GUI_SHOW_SAVE_AS, self->m_contectMenuSelectID);
+	//self->m_contectMenuSelectID = -1;
+}
+*/
+
+
+void CTagsManager::JumpAtID(int32_t selectID)
+{
+	BufferManager *myBufferManager = BufferManager::getInstance();
+	Edn::File myFile = m_currentList[selectID].filename;
+	EDN_INFO("save curent filename and position : ");
+	int32_t currentSelected = myBufferManager->GetSelected();
+	Buffer* tmpBuf = myBufferManager->Get(currentSelected);
+	if (NULL != tmpBuf) {
+		Edn::File * bufferFilename = new Edn::File();
+		*bufferFilename = tmpBuf->GetFileName();
+		bufferFilename->SetLineNumber(tmpBuf->GetCurrentLine());
+		m_historyList.PushBack(bufferFilename);
+	}
+	EDN_INFO(" OPEN the TAG file Destination : " << myFile );
+	if (false == myBufferManager->Exist(myFile) ) {
+		// need to open the file : 
+		int32_t openID = myBufferManager->Open(myFile);
+		SendMessage(EDN_MSG__CURRENT_CHANGE_BUFFER_ID, openID);
+	} else {
+		SendMessage(EDN_MSG__CURRENT_CHANGE_BUFFER_ID, myBufferManager->GetId(myFile));
+	}
+	/*
+	int32_t localId = myBufferManager->GetId(myFile);
+	Edn::String pattern = entry.address.pattern;
+	EDN_DEBUG("try to find line with : \"" << pattern << "\"" );
+	if (pattern.Size() > 4) {
+		pattern.Remove(0,2);
+		pattern.Remove(pattern.Size()-1,2);
+	}
+	// TODO : remove '\' char when needed ...
+	EDN_DEBUG("try to find line with : \"" << pattern << "\"" );
+	int32_t destLine = myBufferManager->Get(localId)->FindLine(pattern);
+	SendMessage(EDN_MSG__CURRENT_GOTO_LINE, destLine);
+	*/
+	SendMessage(EDN_MSG__CURRENT_GOTO_LINE, m_currentList[selectID].lineID - 1);
+}
+
 
 void CTagsManager::JumpTo(void)
 {
-	MultipleJump();
+	m_currentList.Clear();
 	if (NULL != m_ctagFile) {
 		Edn::VectorType<int8_t> data;
 		// get the middle button of the clipboard ==> represent the current selection ...
@@ -276,33 +365,37 @@ void CTagsManager::JumpTo(void)
 		data.PushBack('\0');
 		EDN_INFO("try to find the tag : " << (const char *)&data[0]);
 		if (tagsFind (m_ctagFile, &entry, (const char *)&data[0], 0) == TagSuccess) {
-			//EDN_INFO("find the tag");
+			tagEntry entrySave = entry;
-			BufferManager *myBufferManager = BufferManager::getInstance();
+			int32_t numberOfTags = 0;
-			Edn::String destinationFilename = m_tagFolderBase;
+			
-			destinationFilename += entry.file;
+			// For all tags : Save in an internal Structure :
-			Edn::File myfile = destinationFilename;
-			EDN_INFO(" OPEN the TAG file Destination : " << myfile );
-			if (false == myBufferManager->Exist(myfile) ) {
-				// need to open the file : 
-				int32_t openID = myBufferManager->Open(myfile);
-				SendMessage(EDN_MSG__CURRENT_CHANGE_BUFFER_ID, openID);
-			} else {
-				SendMessage(EDN_MSG__CURRENT_CHANGE_BUFFER_ID, myBufferManager->GetId(myfile));
-			}
-			int32_t localId = myBufferManager->GetId(myfile);
-			Edn::String pattern = entry.address.pattern;
-			EDN_DEBUG("try to find line with : \"" << pattern << "\"" );
-			if (pattern.Size() > 4) {
-				pattern.Remove(0,2);
-				pattern.Remove(pattern.Size()-1,2);
-			}
-			// TODO : remove '\' char when needed ...
-			EDN_DEBUG("try to find line with : \"" << pattern << "\"" );
-			int32_t destLine = myBufferManager->Get(localId)->FindLine(pattern);
-			SendMessage(EDN_MSG__CURRENT_GOTO_LINE, destLine);
-			/*
 			do {
-				PrintTag (&entry);
+				Edn::String destinationFilename = m_tagFolderBase;
+				destinationFilename += entry.file;
+				Edn::File myfile = destinationFilename;
+				TagListFind_ts myStruct;
+				strncpy(myStruct.filename, myfile.GetCompleateName().c_str(), MAX_FILE_NAME);
+				myStruct.filename[MAX_FILE_NAME-1] = '\0';
+				strncpy(myStruct.RegExp, entry.address.pattern, MAX_REG_EXP_SEARCH);
+				myStruct.RegExp[MAX_REG_EXP_SEARCH-1] = '\0';
+				myStruct.lineID = entry.address.lineNumber;
+				// at at the corect position
+				m_currentList.PushBack(myStruct);
+				PrintTag(&entry, true);
+			} while (tagsFindNext (m_ctagFile, &entry) == TagSuccess);
+			
+			
+			if (1==m_currentList.Size() ) {
+				JumpAtID(0);
+				
+			} else {
+				// Open a choice windows...
+				int32_t SelectID = MultipleJump();
+			}
+			/*
+			// Display all the element : 
+			do {
+				PrintTag(&entry, true);
 			} while (tagsFindNext (m_ctagFile, &entry) == TagSuccess);
 			*/
 		} else {
@@ -311,21 +404,26 @@ void CTagsManager::JumpTo(void)
 	}
 }
 
-void CTagsManager::PrintTag (const tagEntry *entry)
+void CTagsManager::PrintTag (const tagEntry *entry, bool small)
 {
-	int i;
+	if (small==true) {
-	EDN_INFO("find Tag file : name=\"" << entry->name << "\" in file=\"" << entry->file 
+		EDN_INFO("find Tag file : name=\"" << entry->name << "\" in file=\"" << entry->file 
-	<< "\" pattern=\"" <<entry->address.pattern 
+			<< "\" at line="<< entry->address.lineNumber);
-	<< "\" at line="<<entry->address.lineNumber);
+	} else {
-	
+		int i;
-	EDN_INFO("Extention field : ");
+		EDN_INFO("find Tag file : name=\"" << entry->name << "\" in file=\"" << entry->file 
-	if (entry->kind != NULL  &&  entry->kind [0] != '\0') {
+			<< "\" pattern=\"" <<entry->address.pattern 
-		EDN_INFO("        kind : " << entry->kind);
+			<< "\" at line="<<entry->address.lineNumber);
-	}
+		
-	if (entry->fileScope) {
+		EDN_INFO("Extention field : ");
-		EDN_INFO("        file : ");
+		if (entry->kind != NULL  &&  entry->kind [0] != '\0') {
-	}
+			EDN_INFO("        kind : " << entry->kind);
-	for (i = 0  ;  i < entry->fields.count  ;  ++i) {
+		}
-		EDN_INFO("               " << entry->fields.list[i].key << ":" << entry->fields.list[i].value );
+		if (entry->fileScope) {
+			EDN_INFO("        file : ");
+		}
+		for (i = 0  ;  i < entry->fields.count  ;  ++i) {
+			EDN_INFO("               " << entry->fields.list[i].key << ":" << entry->fields.list[i].value );
+		}
 	}
 }

Sources/ctags/CTagsManager.h

@@ -32,6 +32,14 @@
 #include "readtags.h"
 #include "Edn.h"
 
+#define MAX_REG_EXP_SEARCH	(1024)
+
+typedef struct{
+	char    filename[MAX_FILE_NAME];
+	char    RegExp[MAX_REG_EXP_SEARCH];
+	int32_t lineID;
+} TagListFind_ts;
+
 
 class CTagsManager: public Singleton<CTagsManager>, public MsgBroadcast
 {
@@ -47,9 +55,9 @@ class CTagsManager: public Singleton<CTagsManager>, public MsgBroadcast
 	private:
 		int32_t                    m_currentSelectedID;
 		void                       LoadTagFile(void);
-		void                       MultipleJump(void);
+		int32_t                    MultipleJump(void);
 		void                       JumpTo(void);
-		void                       PrintTag(const tagEntry *entry);
+		void                       PrintTag(const tagEntry *entry, bool small);
 		Edn::String                GetFolder(Edn::String &inputString);
 		Edn::String                m_tagFolderBase;
 		Edn::String                m_tagFilename;
@@ -58,6 +66,16 @@ class CTagsManager: public Singleton<CTagsManager>, public MsgBroadcast
 		void                       AddToHistory(int32_t bufferID);
 		int32_t                    m_historyPos;
 		Edn::VectorType<Edn::File*>   m_historyList;
+		Edn::VectorType<TagListFind_ts> m_currentList;
+		void                       JumpAtID(int32_t selectID);
+		GtkWidget *                CreateViewAndModel(void);
+		static void cb_row (GtkTreeView *p_treeview,
+                    GtkTreePath * p_path,
+                    GtkTreeViewColumn * p_column,
+                    gpointer p_data);
+		// save data in the list : 
+		GtkListStore *   m_listStore;
+		GtkWidget *      m_Dialog;
 };
 
 #endif

Sources/init.cpp

@@ -66,8 +66,6 @@ int main (int argc, char *argv[])
 	ClipBoard::Init();
 	Display::Init();
 	
-	//MainWindows *window = MainWindows::getInstance();
-	
 	
 	// init ALL Singleton :
 	(void)MsgBroadcastCore::getInstance();
@@ -86,7 +84,8 @@ int main (int argc, char *argv[])
 #else
 	homedir = "./data/";
 #endif
-	homedir += "color_black.xml";
+	//homedir += "color_black.xml";
+	homedir += "color_white.xml";
 	myColorManager->LoadFile( homedir.c_str() );
 	myColorManager->DisplayListOfColor();
 	

Sources/tools/AL/AL_Mutex.cpp

@@ -1,179 +0,0 @@
-/**
- *******************************************************************************
- * @file AL_Mutex.c
- * @brief Editeur De N'ours : Abstraction Layer Mutex
- * @author Edouard DUPIN
- * @date 04/12/2010
- * @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 "tools_debug.h"
-#include "AL_Mutex.h"
-// /usr/include/pthread.h
-
-
-/**
- * @brief initialize the curent Mutex
- *
- * @param[in,out]  pointerMutex    Pointer on the mutex that might be init
- * @param[in]      recursive       Enable the possibility that one thread can lock multiple time the same Mutex
- *
- * @return an standard Error Code (ERR_NONE / ERR_FAIL)
- *
- */
-erreurCode_te AL_mutex_init(AL_MUTEX * pointerMutex,bool recursive)
-{
-	int systemRet;
-	pthread_mutexattr_t mutexattr;
-	erreurCode_te myError= ERR_NONE;
-	EDN_CHECK_INOUT(pointerMutex);
-	// init mutex attributes
-	systemRet = pthread_mutexattr_init(&mutexattr);
-	if (0 == systemRet) {
-		if (true == recursive) {
-			systemRet = pthread_mutexattr_settype(&mutexattr, PTHREAD_MUTEX_RECURSIVE_NP);
-			EDN_ASSERT(!systemRet, "pthread_mutexattr_settype Error");
-		}
-		else {
-			systemRet = pthread_mutexattr_settype(&mutexattr, PTHREAD_MUTEX_ERRORCHECK_NP);
-			EDN_ASSERT(!systemRet, "pthread_mutexattr_settype Error");
-		}
-	}
-	if (0 == systemRet) {
-		systemRet = pthread_mutex_init(pointerMutex, &mutexattr);
-		EDN_ASSERT(!systemRet, "pthread_mutex_init Error Mutex Init");
-		if (systemRet) {
-			myError = ERR_FAIL;
-		}
-	}
-	systemRet = pthread_mutexattr_destroy(&mutexattr);
-	EDN_ASSERT(0 == systemRet, "pthread_mutexattr_destroy Error");
-	return myError;
-}
-
-
-/**
- * @brief Destroy the current Mutex
- *
- * @param[in,out]  pointerMutex    Pointer on the mutex that might be init
- *
- * @return an standard Error Code (ERR_NONE / ERR_FAIL)
- *
- */
-erreurCode_te AL_mutex_destroy(AL_MUTEX * pointerMutex)
-{
-	int systemRet;
-	EDN_CHECK_INOUT(pointerMutex);
-	systemRet = pthread_mutex_destroy(pointerMutex);
-	EDN_ASSERT(!systemRet, "pthread_mutex_destroy Error Mutex Destroy");
-	if (systemRet) {
-		return ERR_FAIL;
-	}
-	return ERR_NONE;
-}
-
-
-/**
- * @brief Lock the curent Mutex. Lock call
- *
- * @param[in,out]  pointerMutex    Pointer on the mutex that might be init
- *
- * @return ---
- *
- */
-void AL_mutex_lock(AL_MUTEX * pointerMutex)
-{
-	int systemRet;
-	EDN_CHECK_INOUT(pointerMutex);
-	systemRet = pthread_mutex_lock(pointerMutex);
-	EDN_ASSERT(!systemRet, "pthread_mutex_lock Error Mutex lock");
-}
-
-
-/**
- * @brief Unlock the current Mutex
- *
- * @param[in,out]  pointerMutex    Pointer on the mutex that might be init
- *
- * @return ---
- *
- */
-void AL_mutex_unlock(AL_MUTEX * pointerMutex)
-{
-	int systemRet;
-	EDN_CHECK_INOUT(pointerMutex);
-	systemRet = pthread_mutex_unlock(pointerMutex);
-	EDN_ASSERT(!systemRet, "pthread_mutex_unlock Error Mutex unlock");
-}
-
-
-/**
- * @brief Try the lock of the curent Mutex
- *
- * @param[in,out]  pointerMutex    Pointer on the mutex that might be init
- *
- * @return an standard Error Code (ERR_NONE / ERR_BUSY)
- *
- */
-erreurCode_te AL_mutex_trylock(AL_MUTEX * pointerMutex)
-{
-	int systemRet;
-	EDN_CHECK_INOUT(pointerMutex);
-	systemRet = pthread_mutex_trylock(pointerMutex);
-	EDN_ASSERT(0==systemRet || EBUSY==systemRet, "pthread_mutex_trylock Error Mutex unlock");
-	if (EBUSY==systemRet) {
-		return ERR_BUSY;
-	}
-	return ERR_NONE;
-}
-
-
-/**
- * @brief try lock in a periode of time
- *
- * @param[in,out]  pointerMutex    Pointer on the mutex that might be init
- *
- * @return an standard Error Code (ERR_NONE / ERR_TIMEOUT)
- *
- */
-erreurCode_te AL_mutex_timedlock(AL_MUTEX * pointerMutex, int32_t delay)
-{
-/*
-	int systemRet;
-	EDN_CHECK_INOUT(pointerMutex);
-	if (0 == delay) {
-		return ERR_NONE;
-	}
-	// TODO ... check is it OK...
-	systemRet = pthread_mutex_timedlock(pointerMutex, delay);
-	EDN_ASSERT(0 == systemRet || ETIMEDOUT == systemRet, "pthread_mutex_timedlock Error");
-	if (ETIMEDOUT == systemRet) {
-		return ERR_TIMEOUT;
-	}
-*/
-	return ERR_NONE;
-}
-
-
-
-
-
-
-

Sources/tools/AL/AL_Mutex.h

@@ -1,45 +0,0 @@
-/**
- *******************************************************************************
- * @file AL_Mutex.h
- * @brief Editeur De N'ours : Abstraction Layer Mutex
- * @author Edouard DUPIN
- * @date 04/12/2010
- * @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 __AL_MUTEX_H__
-#define __AL_MUTEX_H__
-
-//basic mutex with pthread system
-#include <pthread.h>
-#include <errno.h>
-
-
-typedef pthread_mutex_t     AL_MUTEX;
-
-erreurCode_te AL_mutex_init(AL_MUTEX * pointerMutex,bool recursive);
-erreurCode_te AL_mutex_destroy(AL_MUTEX * pointerMutex);
-void          AL_mutex_lock(AL_MUTEX * pointerMutex);
-void          AL_mutex_unlock(AL_MUTEX * pointerMutex);
-erreurCode_te AL_mutex_trylock(AL_MUTEX * pointerMutex);
-//erreurCode_te AL_mutex_timedlock(AL_MUTEX * pointerMutex, int32_t delay);
-
-#endif
-
-

Sources/tools/Display/Display.cpp

@@ -61,17 +61,10 @@ 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)
 {
-	/*
+	m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_NO]    = cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-	charWidth = gdk_char_width(myFont[FONT_ITALIC_YES][FONT_BOLD_NO], 'Z');
+	m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_NO]   = cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_ITALIC, CAIRO_FONT_WEIGHT_NORMAL);
-	EDN_INFO("Font Width = %d", charWidth);
+	m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_YES]   = cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
-	charHeignt = gdk_char_height(myFont[FONT_ITALIC_YES][FONT_BOLD_NO], 'Z');
+	m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_YES]  = cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_ITALIC, CAIRO_FONT_WEIGHT_BOLD);
-	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);
-	m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_YES]		= cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_ITALIC, CAIRO_FONT_WEIGHT_BOLD);
 	if ( NULL == m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_NO]) {
 		EDN_ASSERT(FALSE, "basic font ERROR");
 	}
@@ -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]);
 }
 
 
@@ -246,7 +239,6 @@ void DrawerManager::Text(color_ts & SelectColorFg, color_ts & SelectColorBg, int
 	cairo_set_font_face(m_cairo, Display::GetFont(false, false));
 	int32_t letterHeight = Display::GetFontHeight();
 	int32_t letterWidth = Display::GetFontWidth();
-	int32_t stringLen = strUtf8Len(myText);
 	DirectRectangle(SelectColorBg, x, y, letterWidth*strlen(myText), letterHeight);
 	cairo_fill(m_cairo);
 	cairo_move_to(m_cairo, x, y+letterHeight-4);
@@ -290,7 +282,7 @@ 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()));

Sources/tools/Display/Display.h

@@ -26,11 +26,9 @@
 #ifndef __TOOLS_DISPLAY_H__
 #define __TOOLS_DISPLAY_H__
 
-	#include "tools_debug.h"
+#include "tools_debug.h"
-	#include "Colorize.h"
+#include "Colorize.h"
-	#include "ColorizeManager.h"
+#include "ColorizeManager.h"
-	#include <string>
-	#include <vector>
 
 
 /**

Sources/tools/EdnBuf/EdnBuf.h

@@ -49,13 +49,13 @@ end   ***************                          *************
                                                                                                     
 */
 typedef struct {
-	bool selected;			//!< True if the selection is active
+	bool selected;          //!< True if the selection is active
-	bool rectangular;		//!< True if the selection is rectangular
+	bool rectangular;       //!< True if the selection is rectangular
-	bool zeroWidth;			//!< Width 0 selections aren't "real" selections, but they can be useful when creating rectangular selections from the keyboard.
+	bool zeroWidth;         //!< Width 0 selections aren't "real" selections, but they can be useful when creating rectangular selections from the keyboard.
-	int32_t start;			//!< Pos. of start of selection, or if rectangular start of line containing it.
+	int32_t start;          //!< Pos. of start of selection, or if rectangular start of line containing it.
-	int32_t end;			//!< Pos. of end of selection, or if rectangular end of line containing it.
+	int32_t end;            //!< Pos. of end of selection, or if rectangular end of line containing it.
-	int32_t rectStart;		//!< Indent of left edge of rect. selection
+	int32_t rectStart;      //!< Indent of left edge of rect. selection
-	int32_t rectEnd;		//!< Indent of right edge of rect. selection
+	int32_t rectEnd;        //!< Indent of right edge of rect. selection
 } selection;
 
 typedef enum{
@@ -67,10 +67,10 @@ typedef enum{
 
 
 typedef struct {
-	std::vector<colorInformation_ts>    HLData;
+	Edn::VectorType<colorInformation_ts>    HLData;
-	int32_t                             idSequence;
+	int32_t                                 idSequence;
-	int32_t                             posHLPass1;
+	int32_t                                 posHLPass1;
-	int32_t                             posHLPass2;
+	int32_t                                 posHLPass2;
 }displayHLData_ts;
 
 
@@ -125,54 +125,54 @@ class EdnBuf {
 	// selection remember...
 	// -----------------------------------------
 	public:
-		bool	SelectHasSelection(		selectionType_te select);
+		bool        SelectHasSelection(     selectionType_te select);
-		void	Select(					selectionType_te select, int32_t start, int32_t end);
+		void        Select(                 selectionType_te select, int32_t start, int32_t end);
-		void	Unselect(				selectionType_te select);
+		void        Unselect(               selectionType_te select);
-		void	RectSelect(				selectionType_te select, int32_t start, int32_t end, int32_t rectStart, int32_t rectEnd);
+		void        RectSelect(             selectionType_te select, int32_t start, int32_t end, int32_t rectStart, int32_t rectEnd);
-		bool	GetSelectionPos(		selectionType_te select, int32_t &start, int32_t &end, bool &isRect, int32_t &rectStart, int32_t &rectEnd);
+		bool        GetSelectionPos(        selectionType_te select, int32_t &start, int32_t &end, bool &isRect, int32_t &rectStart, int32_t &rectEnd);
-		void	GetSelectionText(		selectionType_te select, Edn::VectorType<int8_t> &text);
+		void        GetSelectionText(       selectionType_te select, Edn::VectorType<int8_t> &text);
-		void	RemoveSelected(			selectionType_te select);
+		void        RemoveSelected(         selectionType_te select);
-		void	ReplaceSelected(		selectionType_te select, Edn::VectorType<int8_t> &text);
+		void        ReplaceSelected(        selectionType_te select, Edn::VectorType<int8_t> &text);
 	private:
 		// current selection of the buffer
-		selection m_selectionList[SELECTION_SIZE];		//!< Selection area of the buffer
+		selection   m_selectionList[SELECTION_SIZE];    //!< Selection area of the buffer
-		void	UpdateSelection(		selectionType_te select, int32_t pos, int32_t nDeleted, int32_t nInserted);
+		void        UpdateSelection(        selectionType_te select, int32_t pos, int32_t nDeleted, int32_t nInserted);
-		void	UpdateSelections(		int32_t pos, int32_t nDeleted, int32_t nInserted);
+		void        UpdateSelections(       int32_t pos, int32_t nDeleted, int32_t nInserted);
 
 	// -----------------------------------------
 	// History section : 
 	// -----------------------------------------
 	public:
-		int32_t	Undo(					void);
+		int32_t                                 Undo(void);
-		int32_t	Redo(					void);
+		int32_t                                 Redo(void);
 	private:
-		bool							m_isUndoProcessing;
+		bool                                    m_isUndoProcessing;
-		bool							m_isRedoProcessing;
+		bool                                    m_isRedoProcessing;
-		Edn::VectorType<EdnBufHistory*>	m_historyUndo;
+		Edn::VectorType<EdnBufHistory*>         m_historyUndo;
-		Edn::VectorType<EdnBufHistory*>	m_historyRedo;
+		Edn::VectorType<EdnBufHistory*>         m_historyRedo;
 
 	// -----------------------------------------
 	// hightlight section : 
 	// -----------------------------------------
 	private:
-		Highlight *							m_Highlight;					//!< internal link with the Highlight system
+		Highlight *                             m_Highlight;         //!< internal link with the Highlight system
-		std::vector<colorInformation_ts>	m_HLDataPass1;					//!< colorisation position in the current buffer pass 1
+		Edn::VectorType<colorInformation_ts>    m_HLDataPass1;       //!< colorisation position in the current buffer pass 1
-		int32_t								m_HLDataSequence;				//!< position of the start of line requested by the screen viewer
+		int32_t                                 m_HLDataSequence;    //!< position of the start of line requested by the screen viewer
-		void								RegenerateHighLightAt(int32_t pos, int32_t nbDeleted, int32_t nbAdded);
+		void                                    RegenerateHighLightAt(int32_t pos, int32_t nbDeleted, int32_t nbAdded);
-		void								GenerateHighLightAt(int32_t pos, int32_t endPos, int32_t addinPos=0);
+		void                                    GenerateHighLightAt(int32_t pos, int32_t endPos, int32_t addinPos=0);
-		void								CleanHighLight(void);
+		void                                    CleanHighLight(void);
-		void								FindMainHighLightPosition(int32_t startPos, int32_t endPos, int32_t &startId, int32_t &stopId, bool backPreviousNotEnded);
+		void                                    FindMainHighLightPosition(int32_t startPos, int32_t endPos, int32_t &startId, int32_t &stopId, bool backPreviousNotEnded);
 	public:
-		void                                SetHLSystem(  Highlight * newHLSystem);
+		void                                    SetHLSystem(  Highlight * newHLSystem);
-		void								HightlightGenerateLines(displayHLData_ts & MData, int32_t startPos, int32_t nbLines);
+		void                                    HightlightGenerateLines(displayHLData_ts & MData, int32_t startPos, int32_t nbLines);
-		colorInformation_ts *				GetElementColorAtPosition(displayHLData_ts & MData, int32_t pos);
+		colorInformation_ts *                   GetElementColorAtPosition(displayHLData_ts & MData, int32_t pos);
 	private:
-		colorInformation_ts *				GetElementColorAtPosition(int32_t pos, int32_t &starPos);
+		colorInformation_ts *                   GetElementColorAtPosition(int32_t pos, int32_t &starPos);
 
 	private:
-		EdnVectorBuf						m_data;			//!< buffer of the data in the mode int8_t
+		EdnVectorBuf                            m_data;                     //!< buffer of the data in the mode int8_t
-		void								CountNumberOfLines(void);
+		void                                    CountNumberOfLines(void);
-		int32_t								m_nbLine;		//!< Number of line in the biffer
+		int32_t                                 m_nbLine;                   //!< Number of line in the biffer
 
 	// -----------------------------------------
 	// Display property and charset ...
@@ -186,27 +186,27 @@ class EdnBuf {
 		void        SetUTF8Mode(bool newOne)          { m_isUtf8 = newOne; m_charsetType=EDN_CHARSET_UTF8; };
 	private:
 		// Special mode of the buffer :
-		bool		m_isUtf8;								//!< true if we are in UTF8 mode ==> if true the size of a char is 0, otherwise .. 1->4 ( TODO : not now)
+		bool        m_isUtf8;           //!< true if we are in UTF8 mode ==> if true the size of a char is 0, otherwise .. 1->4 ( TODO : not now)
-		charset_te	m_charsetType;							//!< if UTF8 mode is at false : the charset type of the buffer
+		charset_te  m_charsetType;      //!< if UTF8 mode is at false : the charset type of the buffer
 		// Local Tabulation policies
-		int32_t		m_tabDist;								//!< equiv. number of characters in a tab
+		int32_t     m_tabDist;          //!< equiv. number of characters in a tab
-		bool		m_useTabs;								//!< True if buffer routines are allowed to use tabs for padding in rectangular operations
+		bool        m_useTabs;          //!< True if buffer routines are allowed to use tabs for padding in rectangular operations
 	
 	// -----------------------------------------
 	// Local function : 
 	// -----------------------------------------
 	private:
-		void	findRectSelBoundariesForCopy(	int32_t lineStartPos, int32_t rectStart, int32_t rectEnd, int32_t *selStart, int32_t *selEnd);
+		void    findRectSelBoundariesForCopy(   int32_t lineStartPos, int32_t rectStart, int32_t rectEnd, int32_t *selStart, int32_t *selEnd);
-		char	*getSelectionText(				selection &sel);
+		char *  getSelectionText(               selection &sel);
-		void	removeSelected(					selection &sel);
+		void    removeSelected(                 selection &sel);
-		void	replaceSelected(				selection &sel, const char *text);
+		void    replaceSelected(                selection &sel, const char *text);
 
-		void	eventModification(				int32_t pos, int32_t nInserted, Edn::VectorType<int8_t> &deletedText);
+		void    eventModification(              int32_t pos, int32_t nInserted, Edn::VectorType<int8_t> &deletedText);
 
 
-		int32_t insert(							int32_t pos, Edn::VectorType<int8_t> &insertText);
+		int32_t insert(                         int32_t pos, Edn::VectorType<int8_t> &insertText);
 		
-		bool	charMatch(						char first, char second, bool caseSensitive = true);
+		bool    charMatch(                      char first, char second, bool caseSensitive = true);
 };
 
 #endif

Sources/tools/EdnBuf/EdnBuf_HighLight.cpp

@@ -35,12 +35,12 @@ void EdnBuf::SetHLSystem(Highlight * newHLSystem)
 {
 	if (m_Highlight != newHLSystem) {
 		m_Highlight = newHLSystem;
-		m_HLDataPass1.clear();
+		m_HLDataPass1.Clear();
 		RegenerateHighLightAt(0, 0, m_data.Size());
 	}
 }
 
-
+// TODO : Check this fuction it have too many conditionnal inside ==> can do a better algo
 void EdnBuf::RegenerateHighLightAt(int32_t pos, int32_t nbDeleted, int32_t nbAdded)
 {
 	GTimeVal timeStart;
@@ -60,14 +60,23 @@ void EdnBuf::RegenerateHighLightAt(int32_t pos, int32_t nbDeleted, int32_t nbAdd
 		return;
 	}
 	// normal case
-	EDN_INFO("(pos="<<pos<<", nbDeleted="<<nbDeleted<<", nbAdded=" << nbAdded << "\");");
+	//EDN_INFO("(pos="<<pos<<", nbDeleted="<<nbDeleted<<", nbAdded=" << nbAdded << "\");");
 	int32_t i;
+	/*
+	for (i=0; i< (int32_t)m_HLDataPass1.Size(); i++) {
+		Edn::String ploppp;
+		if (NULL != m_HLDataPass1[i].patern ) {
+			ploppp = ((HighlightPattern*)m_HLDataPass1[i].patern)->GetName();
+		}
+		EDN_DEBUG("HighLight (previous) element id=" << i << " S=" << m_HLDataPass1[i].beginStart << " E=" << m_HLDataPass1[i].endStop << " patern name=" << ploppp );
+	}
+	*/
 	int32_t posEnd = pos + nbDeleted;
 	// search position of the old element to reparse IT...
 	int32_t startId;
 	int32_t stopId;
 	// clean data if needed
-	if (0 != m_HLDataPass1.size()) {
+	if (0 != m_HLDataPass1.Size()) {
 		// find element previous
 		FindMainHighLightPosition(pos, posEnd, startId, stopId, true);
 
@@ -75,19 +84,37 @@ void EdnBuf::RegenerateHighLightAt(int32_t pos, int32_t nbDeleted, int32_t nbAdd
 		if(		-1 == startId
 			&&	-1 == stopId)
 		{
-			m_HLDataPass1.clear();
+			m_HLDataPass1.Clear();
 		} else if(-1 == startId) {
 			if (0 == stopId){
-				m_HLDataPass1.erase(m_HLDataPass1.begin());
+				m_HLDataPass1.Erase(0);
+				//EDN_DEBUG("1 * Erase 0");
 			} else {
-				m_HLDataPass1.erase(m_HLDataPass1.begin(),m_HLDataPass1.begin()+stopId);
+				m_HLDataPass1.EraseLen(0,stopId);
+				//EDN_DEBUG("2 * Erase 0->" << stopId);
 			}
 		} else if(-1 == stopId) {
-			m_HLDataPass1.erase(m_HLDataPass1.begin()+startId+1,m_HLDataPass1.end());
+			//EDN_DEBUG("3 * Erase " << startId+1 << "-> end");
+			m_HLDataPass1.EraseLen(startId+1, m_HLDataPass1.Size() - startId);
+			stopId = -1;
 		} else {
-			m_HLDataPass1.erase(m_HLDataPass1.begin()+startId+1,m_HLDataPass1.begin()+stopId);
+			int32_t currentSize = m_HLDataPass1.Size();
+			//EDN_DEBUG("4 * Erase " << startId+1 << "->" << stopId << " in " << currentSize << " elements" );
+			m_HLDataPass1.EraseLen(startId+1, stopId - startId);
+			if (stopId == currentSize-1) {
+				stopId = -1;
+			}
 		}
-		EDN_DEBUG("new size=" << (int32_t)m_HLDataPass1.size()-1);
+		//EDN_DEBUG("new size=" << (int32_t)m_HLDataPass1.Size()-1);
+		/*
+				for (i=0; i< (int32_t)m_HLDataPass1.Size(); i++) {
+					Edn::String ploppp;
+					if (NULL != m_HLDataPass1[i].patern ) {
+						ploppp = ((HighlightPattern*)m_HLDataPass1[i].patern)->GetName();
+					}
+					EDN_DEBUG("HighLight (Middle) element id=" << i << " S=" << m_HLDataPass1[i].beginStart << " E=" << m_HLDataPass1[i].endStop << " patern name=" << ploppp );
+				}
+		*/
 		// update position after the range position : 
 		int32_t elemStart;
 		if(-1 == startId) {
@@ -95,7 +122,7 @@ void EdnBuf::RegenerateHighLightAt(int32_t pos, int32_t nbDeleted, int32_t nbAdd
 		} else {
 			elemStart = startId+1;
 		}
-		for (i=elemStart; i< (int32_t)m_HLDataPass1.size(); i++) {
+		for (i=elemStart; i< (int32_t)m_HLDataPass1.Size(); i++) {
 			//EDN_DEBUG("move element=" << i);
 			m_HLDataPass1[i].beginStart += nbAdded - nbDeleted;
 			m_HLDataPass1[i].beginStop  += nbAdded - nbDeleted;
@@ -113,23 +140,24 @@ void EdnBuf::RegenerateHighLightAt(int32_t pos, int32_t nbDeleted, int32_t nbAdd
 			GenerateHighLightAt(0, m_HLDataPass1[0].beginStart, 0);
 		} else if(-1 == stopId) {
 			//EDN_DEBUG("*******  Regenerate STOP");
-			GenerateHighLightAt(m_HLDataPass1[m_HLDataPass1.size() -1].endStop, m_data.Size(), m_HLDataPass1.size());
+			GenerateHighLightAt(m_HLDataPass1[m_HLDataPass1.Size() -1].endStop, m_data.Size(), m_HLDataPass1.Size());
 		} else {
 			//EDN_DEBUG("*******  Regenerate RANGE");
 			GenerateHighLightAt(m_HLDataPass1[startId].endStop, m_HLDataPass1[startId+1].beginStart, startId+1);
 		}
 	} else {
 		// Parse the new element ...
-		//GenerateHighLightAt(pos, nbAdded);
 		GenerateHighLightAt(0, m_data.Size());
 	}
-	for (i=0; i< (int32_t)m_HLDataPass1.size(); i++) {
+	/*
+	for (i=0; i< (int32_t)m_HLDataPass1.Size(); i++) {
 		Edn::String ploppp;
 		if (NULL != m_HLDataPass1[i].patern ) {
 			ploppp = ((HighlightPattern*)m_HLDataPass1[i].patern)->GetName();
 		}
-		//EDN_DEBUG("HighLight element id=" << i << " S=" << m_HLDataPass1[i].beginStart << " E=" << m_HLDataPass1[i].endStop << " patern name=" << ploppp.c_str() );
+		EDN_DEBUG("HighLight (end) element id=" << i << " S=" << m_HLDataPass1[i].beginStart << " E=" << m_HLDataPass1[i].endStop << " patern name=" << ploppp );
 	}
+	*/
 	GTimeVal timeStop;
 	g_get_current_time(&timeStop);
 	EDN_DEBUG("HL General = " << timeStop.tv_usec - timeStart.tv_usec << " micro-s");
@@ -177,7 +205,7 @@ void EdnBuf::FindMainHighLightPosition(int32_t startPos, int32_t endPos, int32_t
 			      S=-1      ***************        E                                  
 	*/
 	int32_t i;
-	for (i=0; i< (int32_t)m_HLDataPass1.size(); i++) {
+	for (i=0; i< (int32_t)m_HLDataPass1.Size(); i++) {
 		if (m_HLDataPass1[i].endStop > startPos) {
 			break;
 		}
@@ -198,7 +226,7 @@ void EdnBuf::FindMainHighLightPosition(int32_t startPos, int32_t endPos, int32_t
 	} else {
 		elemStart = startId+1;
 	}
-	for (i=elemStart; i< (int32_t)m_HLDataPass1.size(); i++) {
+	for (i=elemStart; i< (int32_t)m_HLDataPass1.Size(); i++) {
 		if (m_HLDataPass1[i].beginStart > endPos)
 		{
 			stopId = i;
@@ -206,13 +234,13 @@ void EdnBuf::FindMainHighLightPosition(int32_t startPos, int32_t endPos, int32_t
 		}
 	}
 	/*
-	if (-1 != startId && startId < (int32_t)m_HLDataPass1.size()) {
+	if (-1 != startId && startId < (int32_t)m_HLDataPass1.Size()) {
-		EDN_DEBUG("==> BEGIN : start="<<m_HLDataPass1[startId].beginStart<<", stop="<<m_HLDataPass1[startId].endStop<<" id=" << startId << "/" << (int32_t)m_HLDataPass1.size()-1);
+		EDN_DEBUG("==> BEGIN : start="<<m_HLDataPass1[startId].beginStart<<", stop="<<m_HLDataPass1[startId].endStop<<" id=" << startId << "/" << (int32_t)m_HLDataPass1.Size()-1);
 	} else {
 		EDN_DEBUG("==> BEGIN : start=???, stop=??? id=" << startId);
 	}
-	if (-1 != stopId && stopId < (int32_t)m_HLDataPass1.size()) {
+	if (-1 != stopId && stopId < (int32_t)m_HLDataPass1.Size()) {
-		EDN_DEBUG("==> END   : start="<<m_HLDataPass1[stopId].beginStart<<", stop="<<m_HLDataPass1[stopId].endStop<<" id=" << stopId<< "/" << (int32_t)m_HLDataPass1.size()-1);
+		EDN_DEBUG("==> END   : start="<<m_HLDataPass1[stopId].beginStart<<", stop="<<m_HLDataPass1[stopId].endStop<<" id=" << stopId<< "/" << (int32_t)m_HLDataPass1.Size()-1);
 	} else {
 		EDN_DEBUG("==> END   : start=???, stop=??? id=" << stopId);
 	}
@@ -236,7 +264,7 @@ void EdnBuf::GenerateHighLightAt(int32_t pos, int32_t endPos, int32_t addinPos)
 void EdnBuf::CleanHighLight(void)
 {
 	// Remove all element in the list...
-	m_HLDataPass1.clear();
+	m_HLDataPass1.Clear();
 }
 
 
@@ -244,7 +272,7 @@ colorInformation_ts *EdnBuf::GetElementColorAtPosition(int32_t pos, int32_t &sta
 {
 	int32_t i;
 	int32_t start = edn_max(0, starPos-1);
-	for (i=start; i<(int32_t)m_HLDataPass1.size(); i++) {
+	for (i=start; i<(int32_t)m_HLDataPass1.Size(); i++) {
 		starPos = i;
 		if(		m_HLDataPass1[i].beginStart <= pos
 			&&	m_HLDataPass1[i].endStop    > pos)
@@ -272,7 +300,7 @@ void EdnBuf::HightlightGenerateLines(displayHLData_ts & MData, int32_t HLStart,
 		g_get_current_time(&timeStart);
 		MData.idSequence = m_HLDataSequence;
 		HLStart = StartOfLine(HLStart);
-		MData.HLData.clear();
+		MData.HLData.Clear();
 		int32_t HLStop = CountForwardNLines(HLStart, nbLines);
 		int32_t startId, stopId;
 		// find element previous
@@ -282,7 +310,7 @@ void EdnBuf::HightlightGenerateLines(displayHLData_ts & MData, int32_t HLStart,
 		//EDN_DEBUG("List of section between : "<< startId << " & " << stopId);
 		int32_t endSearch = stopId+1;
 		if (-1 == stopId) {
-			endSearch = m_HLDataPass1.size();
+			endSearch = m_HLDataPass1.Size();
 		}
 		for (k=edn_max(startId, 0); k<endSearch; k++) {
 			// empty section :
@@ -305,9 +333,9 @@ void EdnBuf::HightlightGenerateLines(displayHLData_ts & MData, int32_t HLStart,
 			//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 (endSearch == (int32_t)m_HLDataPass1.Size() ){
-			//if(		k < (int32_t)m_HLDataPass1.size()) {
+			//if(		k < (int32_t)m_HLDataPass1.Size()) {
-			if (m_HLDataPass1.size() != 0) {
+			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,
@@ -334,7 +362,7 @@ colorInformation_ts * EdnBuf::GetElementColorAtPosition(displayHLData_ts & MData
 {
 	int32_t i;
 	int32_t start = edn_max(0, MData.posHLPass2-1);
-	for (i=start; i<(int32_t)MData.HLData.size(); i++) {
+	for (i=start; i<(int32_t)MData.HLData.Size(); i++) {
 		MData.posHLPass2 = i;
 		if(		MData.HLData[i].beginStart <= pos
 			&&	MData.HLData[i].endStop    > pos)

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)
@@ -132,12 +133,18 @@ static char * GetMessageChar(messageType_te Id)
 		MACRO_DISPLAY_MSG(EDN_MSG__REFRESH_DISPLAY)
 		MACRO_DISPLAY_MSG(EDN_MSG__CURRENT_SET_CHARSET)
 	
-		// Ctags MESSAGE : 
+		// Ctags MESSAGE :
 		MACRO_DISPLAY_MSG(EDN_MSG__OPEN_CTAGS)
 		MACRO_DISPLAY_MSG(EDN_MSG__RELOAD_CTAGS)
 		MACRO_DISPLAY_MSG(EDN_MSG__JUMP_TO_CURRENT_SELECTION)
 		MACRO_DISPLAY_MSG(EDN_MSG__JUMP_BACK)
 	
+		// HL message :
+		MACRO_DISPLAY_MSG(EDN_MSG__COLOR_HAS_CHANGE)
+	
+		// Color message :
+		MACRO_DISPLAY_MSG(EDN_MSG__RELOAD_COLOR_FILE)
+	
 		default:
 			return (char*)"??";
 	}
@@ -163,6 +170,10 @@ static char * GetMessageTypeChar(messageCat_te Id)
 			return (char*)"C-TAGS_MANAGER";
 		case EDN_CAT_MENU_CONTEXT:
 			return (char*)"MENU CONTEXT";
+		case EDN_CAT_HL:
+			return (char*)"HIGHT-LIGHT";
+		case EDN_CAT_COLOR:
+			return (char*)"COLOR";
 		default:
 			return (char*)"??";
 	}
@@ -204,6 +215,14 @@ void MsgBroadcastCore::SendMessage(MsgBroadcast * pointerOnSender, messageType_t
 	           && MSG_TO_CONTEXT__STOP  >= id )
 	{
 		catDest = EDN_CAT_MENU_CONTEXT;
+	} else if(    MSG_TO_HL__START <= id
+	           && MSG_TO_HL__STOP  >= id )
+	{
+		catDest = EDN_CAT_HL;
+	} else if(    MSG_TO_COLOR__START <= id
+	           && MSG_TO_COLOR__STOP  >= id )
+	{
+		catDest = EDN_CAT_COLOR;
 	}
 	
 	myStructMessage.localMessageID = m_messageID++;

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
@@ -125,6 +125,16 @@ typedef enum {
 	MSG_TO_CONTEXT__START,
 	MSG_TO_CONTEXT__STOP,
 
+	// DESTINATION : highlight system ...
+	MSG_TO_HL__START,
+		EDN_MSG__COLOR_HAS_CHANGE,
+	MSG_TO_HL__STOP,
+
+	// DESTINATION : Color System ...
+	MSG_TO_COLOR__START,
+		EDN_MSG__RELOAD_COLOR_FILE,
+	MSG_TO_COLOR__STOP,
+
 
 }messageType_te;
 
@@ -137,6 +147,8 @@ typedef enum {
 	EDN_CAT_GUI_MANAGER,
 	EDN_CAT_CTAGS,
 	EDN_CAT_MENU_CONTEXT,
+	EDN_CAT_HL,
+	EDN_CAT_COLOR,
 }messageCat_te;
 
 
@@ -189,7 +201,7 @@ class MsgBroadcastCore: public Singleton<MsgBroadcastCore>
 
 	private:
 		Edn::VectorType<MsgBroadcast*>         m_listMessage;
-		uint32_t                            m_messageID;
+		uint32_t                               m_messageID;
 		Edn::VectorType<messageElement_ts>     m_listOfMessage;
 };
 

Sources/tools/NameSpaceEdn/File.cpp

@@ -28,7 +28,6 @@
 #include "tools_globals.h"
 #include "Edn.h"
 
-#define MAX_FILE_NAME      (10240)
 
 #undef __class__
 #define __class__	"Edn::File"
@@ -154,7 +153,7 @@ void Edn::File::SetCompleateName(Edn::String &newFilename)
 	} else {
 		destFilename = newFilename;
 	}
-	//EDN_DEBUG("2 : Get file Name : " << destFilename );
+	EDN_DEBUG("2 : Get file Name : " << destFilename );
 	if ('/' != *destFilename.c_str()) {
 		// Get the command came from the running of the program : 
 		char cCurrentPath[FILENAME_MAX];
@@ -167,7 +166,7 @@ void Edn::File::SetCompleateName(Edn::String &newFilename)
 		destFilename += '/';
 		destFilename += tmpFilename;
 	}
-	//EDN_DEBUG("3 : Get file Name : " << destFilename );
+	EDN_DEBUG("3 : Get file Name : " << destFilename );
 	
 	// Get the real Path of the current File
 	ok = realpath(destFilename.c_str(), buf);
@@ -177,7 +176,7 @@ void Edn::File::SetCompleateName(Edn::String &newFilename)
 			// Get the FileName
 			Edn::String tmpFilename = destFilename.Extract(lastPos+1);
 			destFilename.Remove(lastPos, destFilename.Size() - lastPos);
-			//EDN_DEBUG("try to find :\"" << destFilename << "\" / \"" << tmpFilename << "\" ");
+			EDN_DEBUG("try to find :\"" << destFilename << "\" / \"" << tmpFilename << "\" ");
 			ok = realpath(destFilename.c_str(), buf);
 			if (!ok) {
 				EDN_ERROR("Can not find real Path name of \"" << destFilename << "\"");
@@ -213,6 +212,10 @@ int32_t Edn::File::GetLineNumber(void)
 	return m_lineNumberOpen;
 }
 
+void Edn::File::SetLineNumber(int32_t newline)
+{
+	m_lineNumberOpen = newline;
+}
 
 bool Edn::File::HasExtention(void)
 {

Sources/tools/NameSpaceEdn/File.h

@@ -26,6 +26,8 @@
 #ifndef __EDN__FILE_H__
 #define __EDN__FILE_H__
 
+#define MAX_FILE_NAME      (10240)
+
 namespace Edn
 {
 	class File
@@ -42,6 +44,7 @@ namespace Edn
 			bool        HasExtention(void);
 			Edn::String GetExtention(void);
 			int32_t     GetLineNumber(void);
+			void        SetLineNumber(int32_t newline);
 			void        SetCompleateName(Edn::String &newFilename);
 			
 			const Edn::File& operator=  (const Edn::File &ednF );

Sources/tools/NameSpaceEdn/RegExp.h

@@ -1801,13 +1801,13 @@ template<class CLASS_TYPE> class EdnRegExp {
 				if (true == m_notBeginWithChar) {
 					if (i>0) {
 						char tmpVal = SearchIn[i-1];
-						if(		(		'a' <= tmpVal
+						if(    (    'a' <= tmpVal
-									&&	'z' >= tmpVal	)
+						         && 'z' >= tmpVal )
-							||	(		'A' <= tmpVal
+						    || (    'A' <= tmpVal
-									&&	'Z' >= tmpVal	)
+						         && 'Z' >= tmpVal )
-							||	(		'0' <= tmpVal
+						    || (    '0' <= tmpVal
-									&&	'9' >= tmpVal	)
+						         && '9' >= tmpVal )
-							||	(		'_' == tmpVal	)	)
+						    || (    '_' == tmpVal ) )
 						{
 							// go on the next char ...
 							continue;
@@ -1827,13 +1827,13 @@ template<class CLASS_TYPE> class EdnRegExp {
 					if (true == m_notEndWithChar) {
 						if (i+findLen < SearchIn.Size() ) {
 							char tmpVal = SearchIn[i+findLen];
-							if(		(		'a' <= tmpVal
+							if(    (    'a' <= tmpVal
-										&&	'z' >= tmpVal	)
+							         && 'z' >= tmpVal )
-								||	(		'A' <= tmpVal
+							    || (    'A' <= tmpVal
-										&&	'Z' >= tmpVal	)
+							         && 'Z' >= tmpVal )
-								||	(		'0' <= tmpVal
+							    || (    '0' <= tmpVal
-										&&	'9' >= tmpVal	)
+							         && '9' >= tmpVal )
-								||	(		'_' == tmpVal	)	)
+							    || (    '_' == tmpVal ) )
 							{
 								// go on the next char ...
 								continue;
@@ -1860,6 +1860,72 @@ template<class CLASS_TYPE> class EdnRegExp {
 			return false;
 		};
 		
+		bool ProcessOneElement( CLASS_TYPE   &SearchIn,
+		                        int32_t      startPos,
+		                        int32_t      endPos,
+		                        char         escapeChar=0)
+		{
+			if (false == m_isOk) {
+				return false;
+			}
+			int32_t buflen = SearchIn.Size();
+			if (endPos > buflen) {
+				endPos = buflen;
+			}
+			if (startPos > endPos) {
+				return false;
+			}
+			int32_t findLen=0;
+			int32_t maxlen = endPos-startPos;
+			if (true == m_notBeginWithChar) {
+				if (startPos>0) {
+					char tmpVal = SearchIn[startPos-1];
+					if(    (    'a' <= tmpVal
+					         && 'z' >= tmpVal )
+					    || (    'A' <= tmpVal
+					         && 'Z' >= tmpVal )
+					    || (    '0' <= tmpVal
+					         && '9' >= tmpVal )
+					    || (    '_' == tmpVal ) )
+					{
+						// go on the next char ...
+						return false;
+					}
+				}
+			}
+			if (true == m_exprRootNode.Parse(SearchIn, startPos, maxlen, findLen)) {
+				if(		0!=escapeChar
+					&&	startPos>0)
+				{
+					if (escapeChar == (char)SearchIn[startPos-1]) {
+						//==> detected escape char ==> try find again ...
+						return false;
+					}
+				}
+				// Check end :
+				if (true == m_notEndWithChar) {
+					if (startPos+findLen < SearchIn.Size() ) {
+						char tmpVal = SearchIn[startPos+findLen];
+						if(    (    'a' <= tmpVal
+						         && 'z' >= tmpVal )
+						    || (    'A' <= tmpVal
+						         && 'Z' >= tmpVal )
+						    || (    '0' <= tmpVal
+						         && '9' >= tmpVal )
+						    || (    '_' == tmpVal ) )
+						{
+							// go on the next char ...
+							return false;
+						}
+					}
+				}
+				m_areaFind.start = startPos;
+				m_areaFind.stop  = startPos + findLen;
+				return true;
+			}
+			return false;
+		};
+		
 		
 		/**
 		 * @brief

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);
 }
 
 
@@ -584,6 +584,8 @@ Edn::VectorType<int8_t> Edn::String::GetVector(void)
 	return out;
 }
 
+
+
 /**
  * @brief Unitary test for the string system
  *

Sources/tools/NameSpaceEdn/VectorType.h

@@ -36,8 +36,6 @@
  *
  * @tparam[in] SIZE Size of the current element.
  *
- * @todo : Need to add : popBack / Assign / Insert / Erase / Swap / Clear
- *
  *              m_data
  *               <------------ m_dataSize ------------>
  *              ----------------------------------------
@@ -476,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
@@ -484,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

@@ -301,6 +301,7 @@ void Utf8_SizeElement(const char * data, int32_t lenMax , uint8_t &size, bool &b
 	}
 }
 
+#if 0 // Remove for the moment ...
 /**
  * @brief Get the number of element of the previous UTF8 char (in the curent Buffer) 
  *
@@ -349,7 +350,7 @@ static void Utf8_SizePreviousElement(const char * data, int32_t lenMax, uint8_t
 		size = 1;
 	}
 }
-
+#endif
 
 /**
  * @brief 
@@ -592,18 +593,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:
@@ -1037,17 +1038,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++) {

Sources/tools/globals/tools_globals.cpp

@@ -26,14 +26,11 @@
 #include "tools_globals.h"
 #include "ColorizeManager.h"
 #include "MsgBroadcast.h"
-#include <string>
 
 #undef __class__
 #define __class__	"globals"
 
-// Variables privé du namespace
 
-static std::string curentFileName = "???";
 
 
 erreurCode_te globals::init(void)
@@ -201,36 +198,3 @@ bool globals::IsSetInsert(void)
 
 
 
-
-/*
- * Basic GUI system : 
- *
- *
- *
- *
- */
-
-
-
-void globals::DisplaySystemString(std::vector<int32_t> &data)
-{
-	// Display the copyed data ... 
-	uint32_t i;
-	EDN_INFO("Display Data : ");
-	printf(" ========================================================\n");
-	for(i=0; i<data.size(); i++) {
-#		ifdef USE_GTK_VERSION_2_0
-		if (GDK_Return == data[i]) {
-#       elif USE_GTK_VERSION_3_0
-		if (GDK_KEY_Return == data[i]) {
-#       endif
-			printf("\n = ");
-		} else {
-			printf("%c", (char)data[i]);
-		}
-	}
-	printf("\n ========================================================\n");
-}
-
-
-

Sources/tools/globals/tools_globals.h

@@ -27,14 +27,12 @@
 #define __TOOLS_GLOBALS_H__
 
 #include "tools_debug.h"
-#include <string>
-#include <vector>
 
 namespace globals
 {
-	erreurCode_te	init(void);
+	erreurCode_te   init(void);
-	int32_t			getNbColoneBorder(void);
+	int32_t         getNbColoneBorder(void);
-	int32_t			getNbLineBorder(void);
+	int32_t         getNbLineBorder(void);
 
 	bool    IsSetDisplayEndOfLine(void);
 	void    SetDisplayEndOfLine(bool newVal);
@@ -45,25 +43,24 @@ namespace globals
 	bool    IsSetAutoIndent(void);
 	void    SetAutoIndent(bool newVal);
 
-	void			init2(void);
+	void    init2(void);
 
-	void	SetShift(void);
+	void    SetShift(void);
-	void	UnSetShift(void);
+	void    UnSetShift(void);
-	bool	IsSetShift(void);
+	bool    IsSetShift(void);
-	void	SetAlt(void);
+	void    SetAlt(void);
-	void	UnSetAlt(void);
+	void    UnSetAlt(void);
-	bool	IsSetAlt(void);
+	bool    IsSetAlt(void);
-	void	SetCtrl(void);
+	void    SetCtrl(void);
-	void	UnSetCtrl(void);
+	void    UnSetCtrl(void);
-	bool	IsSetCtrl(void);
+	bool    IsSetCtrl(void);
-	void	SetPomme(void);
+	void    SetPomme(void);
-	void	UnSetPomme(void);
+	void    UnSetPomme(void);
-	bool	IsSetPomme(void);
+	bool    IsSetPomme(void);
-	void	SetInsert(void);
+	void    SetInsert(void);
-	void	UnSetInsert(void);
+	void    UnSetInsert(void);
-	void	ToggleInsert(void);
+	void    ToggleInsert(void);
-	bool	IsSetInsert(void);
+	bool    IsSetInsert(void);
-	void	DisplaySystemString(std::vector<int32_t> &data);
 }
 
 #endif

avancement.boo

@@ -1,140 +1,70 @@
-/* pour voir les appels system*/
+# action a faire (ordonner par r<>vision) :
-
+* 0.2.X :
-# For the first realease :
+	- gui : Amelioration du full-screen et du display de base (sans l'entete de la fenetre)
-	* Syst<73>mes : 
+	- gui : Mise en place d'un display ligne par ligne
-		- 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) :
-	- HL : Parsing caracter/caract<63>re et plus section par section ...
-	- ctags : Back simple et multiple
-	- ctags : Multiple files
-	- sys : search complet, replace complet
-	- gui : ordonner les fichier ouvert par nom ...
-	- sys : Mise en place des colorisation de base pour le 
-			* xml
-			* makefiles
-			* script bash
-			* python
-			* matlab
-			* java script
-			* SQL
-	- project : list of current files open
-	- gui : demander l'enregistrement avant de fermer (quand c'est n<>cessaire)
-	- gui : demande de cr<63>ation de nouveaux fichier ou quiter l'editeur ...
 	- gui : ascenceur quand n<>cessaire
 	- gui : Demander la cr<63>ation de nouveaux fichier quand il n'existe pas (a l'ouverture en ligne de commande)
-	- Catch Shift+TAB
+	- sys : Mise en place des colorisation de base pour le
-	- Correction du bug des entr<74> bizard tel que les chapot et les guillemets
+			* java script
-	- 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...
+			* SQL
-	- PB de copier coller sur les <20><> ...
+	- sys : replace TAB with space when Tab is pressed
-	- Charset UTF-8 et iso 8859-15 correcte
+	- sys : Catch F[1-12] ==> for user personal event
-	- Transformation de charset a la vol<6F>
+	- BUG : Correction du bug des entr<74> bizard tel que les chapot et les guillemets
-	- Charset par defaut
+	- BUG : de s<>lection quand la ligne est pleine et la premi<6D>re ligne s<>ctionn<6E>e. ==> regarder apr<70>s avoir fait le display ligne par ligne...
-	- D<EFBFBD>ction de charset (<28> mettre dans les todo de charset)
+	- BUG : de copier coller sur les <20><><EFBFBD> ...
-	- Faire les deplacement de EdnXXX dans le nameSpace Edn::XXX
+	- BUG : les caract<63>re multiples type chapot ...
-	- pb de s<>lection quand la ligne est pleine et la premi<6D>re ligne s<>lectionn<6E>...
+	- BUG : italique non g<>n<EFBFBD>r<EFBFBD>
-
+* 0.3.X :
-# Text Editor
+	- SEARCH : get selected text in the search windows
-
+	- SEARCH : Select the search windows when call crtl+F
-	- [1]  90% Indent group with Tabulation and shift+tabulation
+	- sys : personal property file in the ~/.edn ou ~/.gnome/edn
-	- [1] 100% Basic smart indent : Recopy the start of the previous line when return (copy '\t' and ' ')
+	- gui : Ordonner les fichier ouvert par nom ...
-	- [1]   0% Replace Tab with space when press the key
+	- 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...
-	- [1]   0% Request save user when quit the software
+	- gui : Color list selection
-	- [1]   0% Hide/Display scroll element when not usefull
+	- gui : Hightlight gui management
-	- [1]  10% Regular expression search
+* 0.4.X :
-	- [1]  80% Colorisation syntaxique
+	- sys : Charset UTF-8 et iso 8859-15 correcte
-	- [1]  80% Copier / coller ==> probleme sur les caract<EFBFBD>res sp<73>ciaux comme <20> <20> <20> ...
+	- sys : Transformation de charset a la vol<6F>e
-	- [1]  10% Search 
+	- sys : Charset par defaut
-	- [1]  10% Replace
+	- Sys : D<>tection de charset (<28> mettre dans les todo de charset)
-	- [1]  80% Undo / Redo ajout de caract<63>res autre que " ", "\t" et "\n"
+				==> regarder les librairies open sources
-	- [2]   0% Selectionner en colone
+* 0.5.X :
-	- [2]   0% Supression multiple de ligne par la commande ctrl+D
+	- prj : list of current files open
-	- [3]   0% Multi-file search ==> display it in a result buffer (clickable only)
+	- prj : open ctags file
-	- [3]   0% basic UTF8 string management ==> bad with the curent buffer
+	- sys : replace ALL
-	- [5]   0% Replace in all elements of the project file or a part
+	- sys : Undo / Redo ajout de caract<63>res autre que " ", "\t" et "\n"
-	- [5]   0% Multiple Text Editor in the same Time
+* 0.6.X :
-	- [5]   0% Support des Macros ==> In python ??? or other ...
+	- sys : right management ...
-
+	- HL  : Normalyse all the system of regular expression with <> chapot ...
-# Ctags :
+	- HL  : sub parsing of the reg exp
-	- [1] 100% Parse (use the ctags parser)
+	- sys : update all language
-	- [1]  50% Find
+* 0.7.X :
-	- [1]  50% Jump
+- sys : Select in colones
-	- [1]  10% History of move (with display)
+	- sys : Select all the same search in the current buffer ... ( HL en vert ou jaune ...)
-
+	- sys : Multi-file search ==> display it in a result buffer (clickable only)
-# Buffer Viewer :
+* 0.9.X :
-	- [1]   0% Right menu
+	- int : Redo all the doxygen ...
-	- [1] 100% Display buffer in color
+* 1.0.X :
-	- [1] 100% Display buffer Saved / not Saved
+	- gui : open file in binary
-	- [2]   0% Image of the type of buffer (optionnal)
+	- sys : compare binary files
-
+	- sys : compare normal files
-# Configuration :
+* 1.1.X :
-	- [1]   0% Creer une IHM pour les configurations de base
+	- gui : Display content of a folder
-	- [1]   0% Creer une IHM pour l'edition du hightliner syntaxique (quand il marchera...)
+	- gui : add a treeview display
-	- [1]   0% Creer une IHM pour les couleurs (voir la lier avec l'IHM pour le hightliner)
+	- sys : evenement losqu'un fichier est modifier a l'exterieur...
-	- [1]   0% saugegarde automatique de la configuration ou sur demande...
+	- sys : image du type de fichier dans le buffer list view
-
+* 1.2.X :
-# Project manager :
+	- PRJ : treeview des dossier a ouvrir
-	- [2]   0% Faire un editeur des dossiers du projet a ouvrir ==> automatiquement ajouter dans les Ctags
+	- PRJ : GUI de management
-	- [2]   0% Base
+	- PRJ : Save all in project
-	- [2]   0% Save All
+	- SYS : Save all modify files
-	- [2]   0% TreeView
+* 1.3.X :
-
+	- sys : version system management (git, cvs, ...)
-# Tree View :
+* 1.4.X :
-	- [2]   0% View
+	- SYS : Macro generation and acquisition
-	- [2]   0% Open File
+* 1.5.X :
-	- [2]   0% Jump to the curent File
+	- GDB : Acces interne pour un debuggeur ==> comme cgdb ... avec l'acces assembleur en plus
-	- [2]   0% Hide CVS / Git / SVN elements
-
-# Diff :
-	- [4]   0% generate a Diff between files
-	- [4]   0% same in binary
-
-# Git :
-	- [4]   0% Diff with the current wersion commited (local)
-	- [9]   0% Git branch local display (as gitk --all) ...
-	- [4]   0% view git chawan history ... (git Log)
-
-# CVS :
-	- [6]   0% check the version with CVS
-	- [6]   0% commit
-	- [6]   0% display the Branch
-	- [6]   0% Select a new repository ...
-
-# Publication : 
-	- [1]   0% faire une publication du logiciel sur le Web... (need a stable version)
-	- [2]   0% faire un package
-
-# Repository : 
-	- [2]   0% create my own repository (@home)
-	- [2]   0% manage right with Git
-	- [2]   0% create a website fot it (@home)
-	- [2]   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.
-
-# notes : 
-	The [x] Represent the version expected of the feature
-
-
-# Global TODO List:
-	- [1]   0% EdnString ==> a revoir pour etre plus rapide et plus compl<70>te... et suporter le << et >>
-	- [1]   0% Remove wxString from the current code...
-
 
 # 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/ /usr/include/gtk-3.0/"

data/color_black.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EdnColor version="0.1">
 	<gui> <!-- Doivent tous y <20>tre de prf<72>rence ... global system acces -->
+		<color name="CODE_basicBackgroung"		val="#151515"/>
 		<color name="CODE_space" 				val="#333333"/>
 		<color name="CODE_tabulation"			val="#444444"/>
-		<color name="CODE_basicBackgroung"		val="#151515"/>
 		<color name="CODE_cursor"				val="#eadd05"/>
 		<color name="CODE_lineNumber"			val="#fff725"/>
 		<!-- Buffer list property -->
@@ -16,10 +16,9 @@
 	<syntax>
 		<color name="normal"				FG="#EEEEEE"/>
 		<color name="SelectedText"			FG="#AAAAAA" BG="#225a09"/>
-		<color name="SelectedNoText"		             BG="#124a00"/>
 		<color name="error"					FG="#FF0000"/>
 		<color name="doubleQuoteText"		FG="#00fF00"/>
-
+ 
 		<!-- hightline description : -->
 		<color name="type"					FG="#56bf10" bold="yes"/>
 		<color name="storageKeyword"		FG="#5c8fed"/>
@@ -34,6 +33,8 @@
 		<color name="macro" 				FG="#6c09c8" bold="yes"/>
 		<color name="SYNTAX_ERROR"  		FG="#000000" BG="#FF0000" bold="yes"/>
 		<color name="functionName"  		FG="#24d1e0" bold="yes"/>
+		<color name="TestResultOK"			FG="#000000" BG="#00FF00" bold="yes"/>
+		<color name="TestResultERROR"		FG="#000000" BG="#FF0000" bold="yes"/>
 	</syntax>
 </EdnColor>
 

data/color_white.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EdnColor version="0.1">
+	<gui> <!-- Doivent tous y <20>tre de prf<72>rence ... global system acces -->
+		<color name="CODE_basicBackgroung"		val="#d9d7d7"/>
+		<color name="CODE_space" 				val="#b7b6b6"/>
+		<color name="CODE_tabulation"			val="#a7a5a5"/>
+		<color name="CODE_cursor"				val="#2a00ff"/>
+		<color name="CODE_lineNumber"			val="#1a00a0"/>
+		<!-- Buffer list property -->
+		<color name="LIST_backgroung1"			val="#d9d7d7"/>
+		<color name="LIST_backgroung2"			val="#b7b6b6"/>
+		<color name="LIST_backgroungSelected"	val="#3da3f9"/>
+		<color name="LIST_textNormal"			val="#000000"/>
+		<color name="LIST_textModify"			val="#FF0000"/>
+	</gui>
+	<syntax>
+		<color name="normal"				FG="#000000"/>
+		<color name="SelectedText"			FG="#292929" BG="#009ce7"/>
+		<color name="error"					FG="#FF0000"/>
+		<color name="doubleQuoteText"		FG="#008e00"/>
+
+		<!-- hightline description : -->
+		<color name="type"					FG="#376d0a" bold="yes"/>
+		<color name="storageKeyword"		FG="#466cb4"/>
+		<color name="number"				FG="#007b00"/>
+		<color name="systemFunction"		FG="#acaa00"/>
+		<color name="commonDefine"			FG="#3c850b"/>
+		<color name="boolean"				FG="#1633a3"/>
+		<color name="preprocesseur"			FG="#ac0000"/>
+		<color name="comment"				FG="#b704b5" italic="yes"/>
+		<color name="commentDoxygen"		FG="#bf3e00" bold="yes" italic="yes"/>
+		<color name="keyword"				FG="#215eb8" bold="yes"/>
+		<color name="macro" 				FG="#571793" bold="yes"/>
+		<color name="SYNTAX_ERROR"  		FG="#000000" BG="#c20000" bold="yes"/>
+		<color name="functionName"  		FG="#09857e" bold="yes"/>
+		<color name="TestResultOK"			FG="#000000" BG="#009c00" bold="yes"/>
+		<color name="TestResultERROR"		FG="#000000" BG="#c20000" bold="yes"/>
+	</syntax>
+</EdnColor>
+

data/lang_Makefile.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="c">
+<EdnLang version="0.1" lang="Makefiles">
 	<ext>Makefile</ext>
 	<ext>*.mk</ext>
 	<ext>*.global</ext>

data/lang_asm.xml

@@ -39,7 +39,7 @@
 		</rule>
 		<rule name="my comment">
 			<color>comment</color>
-			<start>//</start>
+			<start>(//|@)</start>
 			<end>\n</end>
 			<EscapeChar>\</EscapeChar>
 		</rule>

data/lang_bash.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EdnLang version="0.1" lang="Bash script">
+	<ext>*.sh</ext>
+	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
+		<rule name="first line">
+			<color>commentDoxygen</color>
+			<start>#!</start>
+			<end>\n</end>
+			<EscapeChar>\</EscapeChar>
+		</rule>
+		<rule name="comment line">
+			<color>comment</color>
+			<start>#</start>
+			<end>\n</end>
+			<EscapeChar>\</EscapeChar>
+		</rule>
+		<rule name="doubleQuteText">
+			<color>doubleQuoteText</color>
+			<start>"</start>
+			<end>"</end>
+			<EscapeChar>\</EscapeChar>
+		</rule>
+		<rule name="simpleQuteText">
+			<color>doubleQuoteText</color>
+			<start>'</start>
+			<end>'</end>
+			<!--<EscapeChar>\</EscapeChar>-->
+		</rule>
+	</pass1>
+	<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|elif|then|else|fi\@</start>
+		</rule>
+		<rule name="my Variable">
+			<color>keyword</color>
+			<start>[\$]+[a-zA-Z_][a-zA-Z0-9_]*</start>
+		</rule>
+		<rule name="Function name">
+			<color>functionName</color>
+			<start>function (\w|_)+[ \t]*\(</start>
+		</rule>
+		<rule name="condition">
+			<color>boolean</color>
+			<start>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}|</start>
+		</rule>
+	</pass2>
+</EdnLang>

data/lang_boo.xml

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="c">
+<EdnLang version="0.1" lang="boulou log">
 	<ext>*.boo</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
-	</pass1>
-	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
 		<rule name="comment ##">
 			<color>SYNTAX_ERROR</color>
 			<start>##</start>
@@ -14,5 +12,49 @@
 			<start>#</start>
 			<end>\n</end>
 		</rule>
+		<rule name="notes ... ">
+			<color>preprocesseur</color>
+			<start>(NOTE|TODO) : </start>
+			<end>\n</end>
+		</rule>
+		<rule name="doubleQuteText">
+			<color>doubleQuoteText</color>
+			<start>"</start>
+			<end>"</end>
+			<EscapeChar>\</EscapeChar>
+		</rule>
+		<rule name="simpleQuteText">
+			<color>doubleQuoteText</color>
+			<start>\@'</start>
+			<end>'</end>
+			<!--<EscapeChar>\</EscapeChar>-->
+		</rule>
+	</pass1>
+	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
+
+		<rule name="pourcentage OK">
+			<color>TestResultOK</color>
+			<start>100%</start>
+		</rule>
+		<rule name="pourcentage">
+			<color>number</color>
+			<start>[0-9]*%</start>
+		</rule>
+		<rule name="R<>sultat OK">
+			<color>TestResultOK</color>
+			<start>\[( )*(OK|Ok|ok)( )*\]</start>
+		</rule>
+		<rule name="resultat en erreur">
+			<color>TestResultERROR</color>
+			<start>\[(ERREUR|Erreur|erreur)\]</start>
+		</rule>
+		<rule name="resultat vide">
+			<color>number</color>
+			<start>\[( )*\]</start>
+		</rule>
+		<rule name="notes ... ">
+			<color>macro</color>
+			<start>==&gt;</start>
+		</rule>
 	</pass2>
 </EdnLang>

data/lang_c.xml

@@ -111,7 +111,7 @@
 		</rule>
 		<rule name="condition">
 			<color>boolean</color>
-			<start>==|&lt;=|&gt;=|!=|&lt;|&gt;|&amp;&amp;|\{|\}|</start>
+			<start>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}|</start>
 		</rule>
         <!-- With all elementes : 
 		<rule name="BIG LETTER">

data/lang_matlab.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EdnLang version="0.1" lang="matlab">
+	<ext>*.m</ext>
+	<ext>*.M</ext>
+	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
+		<rule name="my comment doxygen">
+			<color>commentDoxygen</color>
+			<start>%%</start>
+			<end>\n</end>
+		</rule>
+		<rule name="my comment">
+			<color>comment</color>
+			<start>%</start>
+			<end>\n</end>
+			<EscapeChar>\</EscapeChar>
+		</rule>
+		<rule name="doubleQuteText">
+			<color>doubleQuoteText</color>
+			<start> "</start>
+			<end>("|\n)</end>
+			<EscapeChar>\</EscapeChar>
+		</rule>
+		<rule name="simpleQuteText">
+			<color>doubleQuoteText</color>
+			<start> '</start>
+			<end>('|\n)</end>
+			<!--<EscapeChar>\</EscapeChar>-->
+		</rule>
+		<rule name="global inclusion">
+			<color>preprocesseur</color>
+			<start>global( |\t)+</start>
+			<end>\n</end>
+			<EscapeChar>\</EscapeChar>
+		</rule>
+	</pass1>
+	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
+		<rule name="my keyword">
+			<color>keyword</color>
+			<start>\@return|goto|if|else|case|default|switch|break|continue|while|do|for|otherwise|end\@</start>
+		</rule>
+		<rule name="my boolean">
+			<color>boolean</color>
+			<start>\@true|false\@</start>
+		</rule>
+		<rule name="Function name">
+			<color>functionName</color>
+			<start>\@(\w|_)+[ \t]*\(</start>
+		</rule>
+		<rule name="condition">
+			<color>boolean</color>
+			<start>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}|</start>
+		</rule>
+		<rule name="numeric constant">
+			<color>number</color>
+			<start>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</start>
+		</rule>
+		<rule name="BIG LETTER">
+			<color>macro</color>
+			<start>\@[A-Z_][A-Z_0-9]{3,500}\@</start>
+		</rule>
+	</pass2>
+</EdnLang>

data/lang_php.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="c">
+<EdnLang version="0.1" lang="php: pretty home page">
 	<ext>*.php</ext>
 	<ext>*.php3</ext>
 	<ext>*.php4</ext>

data/lang_xml.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="Assembleur">
+<EdnLang version="0.1" lang="XML">
 	<ext>*.xml</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
 		<rule name="Comment">
@@ -7,9 +7,28 @@
 			<start>&lt;!\-\-</start>
 			<end>\-\-&gt;</end>
 		</rule>
+		<rule name="doubleQuteText">
+			<color>doubleQuoteText</color>
+			<start>"</start>
+			<end>"</end>
+			<EscapeChar>\</EscapeChar>
+		</rule>
+		<rule name="simpleQuteText">
+			<color>doubleQuoteText</color>
+			<start>\@'</start>
+			<end>('|\n)</end>
+			<!--<EscapeChar>\</EscapeChar>-->
+		</rule>
 	</pass1>
 	<pass2>
-	
+		<rule name="special Balise">
+			<color>error</color>
+			<start>&lt;\?\w*|\?&gt;</start>
+		</rule>
+		<rule name="normale Balise">
+			<color>functionName</color>
+			<start>&lt;/\w*|&lt;\w*|/&gt;|&gt;</start>
+		</rule>
 	</pass2>
 </EdnLang>