REPLACE : addition done

HL : Corection of a parser bug

Makefile

@@ -155,8 +155,7 @@ CXXFILES+=		tools/EdnTemplate/EdnVectorBuf.cpp		\
 				tools/EdnBuf/EdnBufHistory.cpp
 				
 
-# Tools internal:
-CXXFILES+=		tools/AL/AL_Mutex.cpp					\
+# Tools internal:
 CXXFILES+=		tools/Display/Display.cpp				\
 				tools/ClipBoard/ClipBoard.cpp			\
 				tools/MsgBroadcast/MsgBroadcast.cpp		\
@@ -221,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,6 +295,8 @@ install: .encadrer .versionFile $(OUTPUT_NAME_RELEASE)
 
 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)

Sources/Buffer/Buffer.cpp

@@ -137,7 +137,6 @@ void Buffer::SetLineDisplay(uint32_t lineNumber)
 	// nothing to do
 }
 
-
 /**
  * @brief
  *
@@ -290,6 +289,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/BufferText.cpp

@@ -229,8 +229,6 @@ void BufferText::SetLineDisplay(uint32_t lineNumber)
 
 }
 
-
-
 void BufferText::DrawLineNumber(DrawerManager &drawer,char *myPrint,  int32_t lineNumber, int32_t positionY)
 {
 	char tmpLineNumber[50];
@@ -1094,6 +1092,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 +1202,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()));
-		// TODO : Reset this : ... SetInsertPosition(SelectionStart + strlen(data.GetDirectPointer()));
-		
+		Edn::VectorType<int8_t> myData = data.GetVector();
+		m_EdnBuf.ReplaceSelected(SELECTION_PRIMARY, myData);
+		SetInsertPosition(SelectionStart + myData.Size());
 	}
 	SetModify(true);
 }

Sources/Buffer/BufferText.h

@@ -65,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

@@ -30,7 +30,7 @@
 #define PFX	"ColorizeManager "
 
 
-ColorizeManager::ColorizeManager(void)
+ColorizeManager::ColorizeManager(void) : MsgBroadcast("Colorize Manager", EDN_CAT_COLOR)
 {
 }
 
@@ -51,6 +51,33 @@ ColorizeManager::~ColorizeManager(void)
 }
 
 
+void ColorizeManager::OnMessage(int32_t id, int32_t dataID)
+{
+	switch (id)
+	{
+		case EDN_MSG__RELOAD_COLOR_FILE:
+			{
+				// Remove all current color
+				int32_t i;
+				// clean all Element
+				for (i=0; i< listMyColor.Size(); i++) {
+					if (NULL != listMyColor[i]) {
+						delete(listMyColor[i]);
+						listMyColor[i] = NULL;
+					}
+				}
+				// clear the compleate list
+				listMyColor.Clear();
+				// Reaload File
+				// TODO : Check this : 
+				Edn::String plop = m_fileColor;
+				LoadFile(plop.c_str());
+			}
+			break;
+	}
+}
+
+
 void ColorizeManager::LoadFile(Edn::String &xmlFilename)
 {
 	LoadFile(xmlFilename.c_str());
@@ -58,6 +85,8 @@ void ColorizeManager::LoadFile(Edn::String &xmlFilename)
 
 void ColorizeManager::LoadFile(const char * xmlFilename)
 {
+	m_fileColor = xmlFilename;
+	EDN_DEBUG("open file (COLOR) \"" << xmlFilename << "\" ? = \"" << m_fileColor << "\"");
 	errorColor = new Colorize();
 	errorColor->SetBgColor("#000000");
 	errorColor->SetFgColor("#FFFFFF");
@@ -203,6 +232,7 @@ void ColorizeManager::LoadFile(const char * xmlFilename)
 			pNode = pNode->NextSibling();
 		}
 	}
+	SendMessage(EDN_MSG__COLOR_HAS_CHANGE);
 }
 
 Colorize *ColorizeManager::Get(const char *colorName)

Sources/Colorize/ColorizeManager.h

@@ -28,6 +28,7 @@
 
 #include "Singleton.h"
 #include "Colorize.h"
+#include "MsgBroadcast.h"
 #include "Edn.h"
 
 typedef enum {
@@ -49,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...
@@ -57,6 +58,8 @@ class ColorizeManager: public Singleton<ColorizeManager>
 		// Constructeur
 		ColorizeManager(void);
 		~ColorizeManager(void);
+	public:
+		void    OnMessage(int32_t id, int32_t dataID);
 	public:
 		void        LoadFile(Edn::String &xmlFilename);
 		void        LoadFile(const char * xmlFilename);
@@ -68,6 +71,7 @@ class ColorizeManager: public Singleton<ColorizeManager>
 		void        DisplayListOfColor(void);
 
 	private:
+		Edn::String                 m_fileColor;
 		Edn::VectorType<Colorize*>  listMyColor;		//!< List of ALL Color
 		Colorize *                  errorColor;
 		color_ts                    basicColors[COLOR_NUMBER_MAX];

Sources/CustumWidget/BufferView/BufferView.cpp

@@ -138,6 +138,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;

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,37 @@ 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 chenge 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);
+	
+	// Add title
+	
+#endif
 	// **********************************************************
 	// *                Horizontal ELEMENTS :                   *
 	// **********************************************************
@@ -67,16 +112,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 +138,7 @@ MainWindows::~MainWindows(void)
 }
 
 
+
 void MainWindows::SetTitle(Edn::File &fileName, bool isModify)
 {
 	Edn::String tmp = "";
@@ -168,6 +214,25 @@ bool MainWindows::OnQuit(GtkWidget *widget, gpointer data)
 }
 
 
+gboolean MainWindows::OnStateChange(GtkWidget *widget, GdkEvent* event, gpointer data)
+{
+	MainWindows * self = reinterpret_cast<MainWindows*>(data);
+	EDN_WARNING("State change");
+	EDN_INFO(" change state mask : " << event->window_state.changed_mask);
+	EDN_INFO(" change state new val : " << event->window_state.new_window_state);
+	if (event->window_state.changed_mask == GDK_WINDOW_STATE_MAXIMIZED) {
+		EDN_INFO("   ==> Maximisation change...");
+		if (event->window_state.new_window_state == GDK_WINDOW_STATE_MAXIMIZED) {
+			EDN_INFO("       ==> ENABLE");
+			gtk_window_set_decorated(GTK_WINDOW(self->m_mainWindow), FALSE);
+		} else {
+			EDN_INFO("       ==> DISABLE");
+			gtk_window_set_decorated(GTK_WINDOW(self->m_mainWindow), TRUE);
+			
+		}
+	}
+}
+
 #if 0
 
 void MainWindows::OnMenuAbout(wxCommandEvent & WXUNUSED(event))

Sources/GuiTools/MainWindows/MainWindows.h

@@ -51,6 +51,7 @@ 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);

Sources/GuiTools/MainWindows/MenuBar.cpp

@@ -36,7 +36,7 @@ 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)	
+#define MSG_LINK(data)
 
 
 static void CB_menuGenerique(GtkMenuItem *menu_item, gpointer data)
@@ -204,12 +204,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__QUIT, true);
 	m_listMenu.PushBack(tmp);
 	
 	tmp = new MenuBarMain("_Edit", m_mainWidget);
@@ -220,7 +220,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 +230,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 +243,18 @@ 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);
+	m_listMenu.PushBack(tmp);
 	/*
 	tmp = new MenuBarMain("Project", m_mainWidget);
 	m_listMenu.PushBack(tmp);
@@ -260,8 +263,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("Back previous",                "ctrl+y",       EDN_MSG__JUMP_BACK, true);
+		tmp->AddGen("Find Definition",              "ctrl+d",       EDN_MSG__JUMP_TO_CURRENT_SELECTION, 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/Search/Search.cpp

@@ -192,15 +192,15 @@ void Search::Display(GtkWindow *parent)
 		} else {
 			gtk_widget_set_sensitive(m_CkMatchCase, true);
 		}
-		
-		Edn::String myDataString;
-		SearchData::GetSearch(myDataString);
+		// Remove data form the search
+		Edn::String myDataString = "";
+		SearchData::SetSearch(myDataString);
 		gtk_entry_set_text(GTK_ENTRY(m_searchEntry), myDataString.c_str());
-		if (0 == strlen(myDataString.c_str())) {
+		//if (0 == strlen(myDataString.c_str())) {
 			m_haveSearchData = false;
-		} else {
-			m_haveSearchData = true;
-		}
+		//} else {
+		//	m_haveSearchData = true;
+		//}
 		
 		SearchData::GetReplace(myDataString);
 		gtk_entry_set_text(GTK_ENTRY(m_replaceEntry), myDataString.c_str());
@@ -220,6 +220,10 @@ void Search::Display(GtkWindow *parent)
 			gtk_widget_set_sensitive(m_BtReplaceAndNext, m_haveReplaceData);
 		}
 		
+		// set focus on a specific widget :
+		gtk_window_set_focus(parent, m_searchEntry);
+		
+		
 		// display the dialogue box
 		gtk_widget_show_all(m_localDialog);
 		

Sources/Highlight/Highlight.cpp

@@ -135,6 +135,20 @@ Highlight::~Highlight(void)
 	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)
 {
@@ -276,7 +290,7 @@ void Highlight::Parse2(int32_t start,
 				//EDN_INFO("Find Pattern in the Buffer : (" << resultat.beginStart << "," << resultat.endStop << ")" );
 				// Add curent element in the list ...
 				metaData.PushBack(resultat);
-				elementStart = resultat.endStop;
+				elementStart = resultat.endStop-1;
 				// Exit current cycle
 				break;
 			}

Sources/Highlight/Highlight.h

@@ -56,6 +56,7 @@ class Highlight {
 		bool HasExtention(Edn::String &ext);
 		bool FileNameCompatible(Edn::File &fileName);
 		void Display(void);
+		void ReloadColor(void);
 		void Parse(int32_t start,
 		           int32_t stop,
 		           Edn::VectorType<colorInformation_ts> &metaData,

Sources/Highlight/HighlightManager.cpp

@@ -30,7 +30,7 @@
 #undef __class__
 #define __class__	"HighlightManager"
 
-HighlightManager::HighlightManager(void)
+HighlightManager::HighlightManager(void) : MsgBroadcast("Hight-light Manager", EDN_CAT_HL)
 {
 
 }
@@ -50,6 +50,21 @@ HighlightManager::~HighlightManager(void)
 }
 
 
+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)
 {
 	int32_t i;
@@ -109,6 +124,16 @@ void HighlightManager::loadLanguages(void)
 	myHightline = new Highlight(xmlFilename);
 	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,10 +29,11 @@
 class HighlightManager;
 
 #include "Singleton.h"
+#include "MsgBroadcast.h"
 #include "Highlight.h"
 
 
-class HighlightManager: public Singleton<HighlightManager>
+class HighlightManager: public Singleton<HighlightManager>, public MsgBroadcast
 {
 	friend class Singleton<HighlightManager>;
 	// specific for sigleton system...
@@ -41,6 +42,8 @@ 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);

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
  *

Sources/Highlight/HighlightPattern.h

@@ -51,23 +51,25 @@ class HighlightPattern {
 		HighlightPattern(void);
 		~HighlightPattern(void);
 		
-		void			SetName(Edn::String &name) { m_paternName = name;};
-		Edn::String		GetName(void) { return m_paternName;};
+		void            SetName(Edn::String &name) { m_paternName = name;};
+		Edn::String     GetName(void) { return m_paternName;};
 		
-		void			SetPaternStart(Edn::String &regExp);
-		void			SetPaternStop(Edn::String &regExp);
-		void			SetColor(Edn::String &colorName);
-		void			SetEscapeChar(Edn::String &EscapeChar);
-		void			SetMultiline(bool enable) { m_multiline = enable; };
+		void            SetPaternStart(Edn::String &regExp);
+		void            SetPaternStop(Edn::String &regExp);
+		void            SetColor(Edn::String &colorName);
+		void            SetEscapeChar(Edn::String &EscapeChar);
+		void            SetMultiline(bool enable) { m_multiline = enable; };
 		
-		void			SetLevel(int32_t newLevel) { m_level = newLevel; };
-		int32_t			GetLevel(void) { return m_level; };
+		void            SetLevel(int32_t newLevel) { m_level = newLevel; };
+		int32_t         GetLevel(void) { return m_level; };
 		
-		bool			IsEnable(void);
-		void			Display(void);
+		bool            IsEnable(void);
+		void            Display(void);
 		resultFind_te   Find(int32_t start, int32_t stop, colorInformation_ts &resultat, EdnVectorBuf &buffer);
-		Colorize *		GetColor(void) { return m_color; };
-		void			ParseRules(TiXmlNode *child, int32_t level);
+		Colorize *      GetColor(void) { return m_color; };
+		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 ....

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;
 			
 	}
@@ -169,31 +184,49 @@ enum
 	CTAGS_NUM_COLS
 };
 
-GtkTreeModel * CTagsManager::CreateAndFillModel(void)
+void CTagsManager::cb_row(GtkTreeView *p_treeview,
+                          GtkTreePath * p_path,
+                          GtkTreeViewColumn * p_column,
+                          gpointer data)
 {
-	GtkListStore *   store;
-	GtkTreeIter      iter;
+	EDN_DEBUG("event");
+	CTagsManager * self = reinterpret_cast<CTagsManager*>(data);
 	
-	store = gtk_list_store_new(CTAGS_NUM_COLS, G_TYPE_STRING, G_TYPE_UINT);
+	gchar * p_file=NULL;
+	gint lineNumber;
+	GtkTreeIter iter;
 	
-	// Append a row and fill in some data
-	for (int32_t iii=0; iii<m_currentList.Size() ; iii++) {
-		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter,
-		                   CTAGS_COL_FILE, m_currentList[iii].filename,
-		                   CTAGS_COL_LINE_NUMBER, m_currentList[iii].lineID,
-		                   -1);
+	
+	if (gtk_tree_model_get_iter( GTK_TREE_MODEL(self->m_listStore), &iter, p_path))
+	{
+		gtk_tree_model_get( GTK_TREE_MODEL(self->m_listStore),
+		                    &iter,
+		                    CTAGS_COL_FILE, &p_file,
+		                    CTAGS_COL_LINE_NUMBER, &lineNumber,
+		                    -1 );
+		EDN_DEBUG("find : " << p_file << ":" << lineNumber);
+		for (int32_t iii = 0; iii < self->m_currentList.Size() ; iii++) {
+			if(    self->m_currentList[iii].lineID == lineNumber
+			    && strcmp(self->m_currentList[iii].filename, p_file)==0)
+			{
+				g_object_unref( GTK_TREE_MODEL(self->m_listStore));
+				// Remove dialogue
+				gtk_widget_destroy(self->m_Dialog);
+				// Jump ...
+				self->JumpAtID(iii);
+				return;
+			}
+		}
 	}
-	
-	return GTK_TREE_MODEL(store);
 }
 
+
+
 GtkWidget * CTagsManager::CreateViewAndModel(void)
 {
 	
-		GtkCellRenderer *   renderer;
-		GtkTreeModel *      model;
-		GtkWidget *         view;
+	GtkCellRenderer *   renderer;
+	GtkWidget *         view;
 	view = gtk_tree_view_new();
 	
 	// Column 1
@@ -214,11 +247,21 @@ GtkWidget * CTagsManager::CreateViewAndModel(void)
 	                                            "text", CTAGS_COL_LINE_NUMBER,
 	                                            NULL);
 	
-	model = CreateAndFillModel();
+	// 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);
-	
-	g_object_unref(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(GTK_TREE_MODEL(m_listStore));
 	
 	return view;
 }
@@ -230,31 +273,34 @@ GtkWidget * CTagsManager::CreateViewAndModel(void)
 int32_t CTagsManager::MultipleJump(void)
 {
 	// dlg to confirm the quit event : 
-	GtkWidget *myDialog = gtk_dialog_new_with_buttons("C-Tags jump...",
-	                                                  NULL,
-	                                                  GTK_DIALOG_MODAL,
-	                                                  "Jump", GTK_RESPONSE_YES,
-	                                                  GTK_STOCK_QUIT, GTK_RESPONSE_NO,
-	                                                  NULL);
+	m_Dialog = gtk_dialog_new_with_buttons("C-Tags jump...",
+	                                       NULL,
+	                                       GTK_DIALOG_MODAL,
+	                                       //"Jump", GTK_RESPONSE_YES,
+	                                       GTK_STOCK_QUIT, GTK_RESPONSE_NO,
+	                                       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 = 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
-	result = 0; // remove warning
-	
+	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;
 }
 /*
@@ -270,7 +316,16 @@ void BufferView::OnCtagsEventList(GtkWidget *menuitem, gpointer data)
 void CTagsManager::JumpAtID(int32_t selectID)
 {
 	BufferManager *myBufferManager = BufferManager::getInstance();
-	Edn::File myFile = m_currentList[0].filename;
+	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 : 
@@ -292,7 +347,7 @@ void CTagsManager::JumpAtID(int32_t selectID)
 	int32_t destLine = myBufferManager->Get(localId)->FindLine(pattern);
 	SendMessage(EDN_MSG__CURRENT_GOTO_LINE, destLine);
 	*/
-	SendMessage(EDN_MSG__CURRENT_GOTO_LINE, m_currentList[0].lineID);
+	SendMessage(EDN_MSG__CURRENT_GOTO_LINE, m_currentList[selectID].lineID - 1);
 }
 
 

Sources/ctags/CTagsManager.h

@@ -68,10 +68,14 @@ class CTagsManager: public Singleton<CTagsManager>, public MsgBroadcast
 		Edn::VectorType<Edn::File*>   m_historyList;
 		Edn::VectorType<TagListFind_ts> m_currentList;
 		void                       JumpAtID(int32_t selectID);
-		GtkTreeModel *             CreateAndFillModel(void);
 		GtkWidget *                CreateViewAndModel(void);
-		
-		// TMP Val :
+		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/MsgBroadcast/MsgBroadcast.cpp

@@ -132,12 +132,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 +169,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 +214,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

@@ -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;
 
 

Sources/tools/NameSpaceEdn/File.cpp

@@ -212,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

@@ -44,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/String.cpp

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

avancement.boo

@@ -16,19 +16,12 @@
 
 # action a faire (ordonner par r<>vision) :
 	* 0.1.X :
-		- ctags : Back simple et multiple
-		- ctags : Multiple files
-		- sys : search complet, replace complet and replace ALL ...
 		- gui : demander l'enregistrement avant de fermer (quand c'est n<>cessaire)
-		- Faire les deplacement de EdnXXX dans le nameSpace Edn::XXX
 		- Edn::VectorType : Rewrite the erase fuction to support start => stop and Erase len methode ...
 	* 0.2.X :
+		- gui : Mise en place d'un display ligne par ligne
 		- gui : Demander la cr<63>ation de nouveaux fichier quand il n'existe pas (a l'ouverture en ligne de commande)
 		- sys : Mise en place des colorisation de base pour le 
-				* makefiles
-				* script bash
-				* python
-				* matlab
 				* java script
 				* SQL
 		- gui : ascenceur quand n<>cessaire
@@ -49,6 +42,7 @@
 	* 0.5.X :
 		- project : list of current files open
 		- 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...
+		- sys : replace ALL
 
 # Text Editor
 

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,7 +16,6 @@
 	<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"/>
 

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_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|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,5 +1,5 @@
 <?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 -->
 		<rule name="comment ##">

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 </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">

test2.c

@@ -18,15 +18,15 @@
 //#include "tools_debug.h"
 #include "tools_globals.h"
 #include "EdnBuf.h"
-
+Edn
 	m_isUndoProcessing = false;
 	m_isRedoProcessing = false;
-	
+	Edn 
 	// Load highlight system : 
 	HighlightManager *myHighlightManager = HighlightManager::getInstance();
 	EdnString plop = ".c";
 	m_Highlight = myHighlightManager->Get(plop);
 	//m_Highlight = NULL;
-	m_nbLine = 1;
+	m_nbLine = 1;Edn
 	m_HLDataSequence = 0;