Display corection of the enter and rm will now redisplay all the screen

HL : Corection of a parser bug

.gitignore

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

Makefile

@@ -31,6 +31,14 @@ export F_GRIS=
 export CADRE_HAUT_BAS='	$(F_INVERSER)                                                                    $(F_NORMALE)'
 export CADRE_COTERS='
 	$(F_INVERSER)  $(F_NORMALE)								  $(F_INVERSER)  $(F_NORMALE)'
+
+VERSION_TAG=$(shell git describe --tags)
+#$(info $(VERSION_TAG))
+
+VERSION_TAG_SHORT=$(shell git describe --tags --abbrev=0)
+#$(info $(VERSION_TAG_SHORT))
+
+VERSION_BUILD_TIME=$(shell date)
 #$(info $(VERSION_BUILD_TIME))
 
 ###############################################################################
@@ -45,10 +53,11 @@ 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)\""
 
 GTKFLAGS= 
@@ -146,16 +155,15 @@ 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		\
 				tools/MsgBroadcast/AccelKey.cpp			\
 				tools/charset/charsetTable.cpp			\
-				tools/charset/charset.cpp				\
 				tools/charset/charset.cpp				\
-				tools/NameSpaceEdn/File.cpp				\
+				tools/NameSpaceEdn/File.cpp				\
+				tools/NameSpaceEdn/String.cpp			\
 				tools/NameSpaceEdn/RegExp.cpp
 
 # Gui:
@@ -203,7 +211,7 @@ all: build
 all: build
 
 -include $(OBJ:.o=.d) 
-
+
 build: .encadrer .versionFile $(OUTPUT_NAME)
 
 
@@ -212,15 +220,19 @@ build: .encadrer $(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)
 	@echo $(CADRE_HAUT_BAS)
+	@mkdir -p $(addprefix $(OBJECT_DIRECTORY)/, $(LISTE_MODULES))
+
+
+FILE_IMAGES=	data/imagesSources/*.png
+
 
 .versionFile :
 	@rm -f $(OBJECT_DIRECTORY)/GuiTools/WindowsManager/WindowsManager.o
@@ -230,14 +242,12 @@ pngToCpp: tools/pngToCpp/pngToCpp.c
 pngToCpp: tools/pngToCpp/pngToCpp.c
 	@echo $(F_ROUGE)"
           (bin) $@"$(F_NORMALE)
-	@$(CXX) $< -o $@
 	@$(CXX) $< -o $@
 	@strip -s $@
 
 # Generate basic 
 $(FILE_DIRECTORY)/GuiTools/myImage.cpp: $(FILE_IMAGES) $(MAKE_DEPENDENCE) pngToCpp
 	@echo $(F_BLUE)"
-	@#echo ./pngToCpp $@ $(FILE_IMAGES)
           (.cpp)  *.png ==> $@"$(F_NORMALE)
 	@./pngToCpp $@ $(FILE_IMAGES)
 
@@ -273,18 +283,54 @@ clean:
 	@echo Remove File : pngToCpp
 	@rm -f pngToCpp
 	@echo Remove File : $(FILE_DIRECTORY)/GuiTools/myImage.*
-	@rm -f $(FILE_DIRECTORY)/GuiTools/myImage.*
+	@rm -f $(FILE_DIRECTORY)/GuiTools/myImage.*
 	@echo Remove doxygen  files : doxygen/*
 	@rm -rf doxygen
 	@rm -f doxygen.log
 	@echo Remove temporary files *.bck
 	@rm -f `find . -name "*.bck"`
 
-count:
-	wc -l Makefile `find $(FILE_DIRECTORY)/ -name "*.cpp"` `find $(FILE_DIRECTORY)/ -name "*.h"` 
-
-install: .encadrer $(OUTPUT_NAME_RELEASE)
-	@echo $(CADRE_HAUT_BAS)
+count:
+	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)"
+          (copy) $(PROG_NAME) /usr/bin/ "$(F_NORMALE)
+	@cp -vf $(PROG_NAME) /usr/bin/
+	@echo $(F_VERT)"
+          (data) data/* ==> /usr/share/edn/ "$(F_NORMALE)
+	@mkdir -p /usr/share/edn/
+	@rm -rf /usr/share/edn/*
+	@cp -vf data/*.xml /usr/share/edn/
+	@mkdir -p /usr/share/edn/images/
+	@cp -vf data/imagesSources/icone.png /usr/share/edn/images/
+	@cp -vf data/imagesSources/delete-24px.png /usr/share/edn/images/
+
+
+# http://alp.developpez.com/tutoriels/debian/creer-paquet/
+package: .encadrer
+	@echo 'Create Folders ...'
+	@mkdir -p package/$(PROG_NAME)/DEBIAN/
+	@mkdir -p package/$(PROG_NAME)/usr/bin/
+	@mkdir -p package/$(PROG_NAME)/usr/share/doc/
+	@mkdir -p package/$(PROG_NAME)/usr/share/edn/
+	# Create the control file
+	@echo "Package: "$(PROG_NAME) > package/$(PROG_NAME)/DEBIAN/control
+	@echo "Version: "$(VERSION_TAG_SHORT) >> package/$(PROG_NAME)/DEBIAN/control
+	@echo "Section: Development,Editors" >> package/$(PROG_NAME)/DEBIAN/control
+	@echo "Priority: optional" >>package/$(PROG_NAME)/DEBIAN/control
+	@echo "Architecture: all" >> package/$(PROG_NAME)/DEBIAN/control
+	@echo "Depends: bash" >> package/$(PROG_NAME)/DEBIAN/control
+	@echo "Maintainer: Mr DUPIN Edouard <yui.heero@gmail.com>" >> package/$(PROG_NAME)/DEBIAN/control
+	@echo "Description: Text editor for sources code with ctags management" >> package/$(PROG_NAME)/DEBIAN/control
+	@echo "" >> package/$(PROG_NAME)/DEBIAN/control
+	# Create the PostRm
+	@echo "#!/bin/bash" > package/$(PROG_NAME)/DEBIAN/postrm
 	@echo "rm ~/."$(PROG_NAME) >> package/$(PROG_NAME)/DEBIAN/postrm

README

@@ -1,22 +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.
-	- Write Java sources code with this software.
-
-I reserve the right to change this licence. If it change the version of the copy you have keep its own license

README.md

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

Sources/Buffer/Buffer.cpp

@@ -41,10 +41,32 @@
  */
 Buffer::Buffer()
 {
+	static int32_t bufID = 0;
+	m_uniqueID = bufID++;
+	static int32_t fileBasicID = 0;
 	m_fileModify = true;
 	m_haveName = false;
-	Edn::String mString = "No-Name";
-	m_fileName.SetCompleateName(mString);
+	Edn::String mString = "Untitle - ";
+	mString += fileBasicID++;
+	SetFileName(mString);
+	m_haveName = false;
+	// Set basic anchor
+	bufferAnchorReference_ts tmpAnchor;
+	tmpAnchor.m_displaySize.x = 0;
+	tmpAnchor.m_displaySize.y = 0;
+	tmpAnchor.m_displayStart.x = 0;
+	tmpAnchor.m_curent = true;
+	tmpAnchor.m_idAnchor = -1;
+	tmpAnchor.m_lineId = 0;
+	tmpAnchor.m_bufferPos = 0;
+	for(int32_t iii=0; iii<MAX_LINE_DISPLAYABLE_BY_BUFFER; iii++) {
+		tmpAnchor.m_redrawLine[iii] = true;
+	}
+	tmpAnchor.m_BufferNumberLineOffset = 0;
+	m_AnchorList.PushBack(tmpAnchor);
+	
+	m_lineWidth = 10;
+	m_lineHeight = 10;
 }
 
 /**
@@ -55,11 +77,24 @@ Buffer::Buffer()
  * @return ---
  *
  */
-Buffer::Buffer(Edn::String &newFileName)
+Buffer::Buffer(Edn::File &newName)
 {
 	m_fileModify = false;
-	m_haveName = true;
-	m_fileName.SetCompleateName(newFileName);
+	SetFileName(newName);
+	// Set basic anchor
+	bufferAnchorReference_ts tmpAnchor;
+	tmpAnchor.m_displaySize.x = 0;
+	tmpAnchor.m_displaySize.y = 0;
+	tmpAnchor.m_displayStart.x = 0;
+	tmpAnchor.m_curent = true;
+	tmpAnchor.m_idAnchor = -1;
+	tmpAnchor.m_lineId = 0;
+	tmpAnchor.m_bufferPos = 0;
+	for(int32_t iii=0; iii<MAX_LINE_DISPLAYABLE_BY_BUFFER; iii++) {
+		tmpAnchor.m_redrawLine[iii] = true;
+	}
+	tmpAnchor.m_BufferNumberLineOffset = 0;
+	m_AnchorList .PushBack(tmpAnchor);
 }
 
 /**
@@ -95,85 +130,6 @@ void Buffer::SetModify(bool status)
 	}
 }
 
-
-Edn::File Buffer::GetFileName(void)
-{
-	return m_fileName;
-}
-
-
-/**
- * @brief
- *
- * @param[in,out] ---
- *
- * @return ---
- *
- */
-Edn::String Buffer::GetName(void)
-{
-	// nothing to do
-	return m_fileName.GetCompleateName();
-}
-
-/**
- * @brief
- *
- * @param[in,out] ---
- *
- * @return ---
- *
- */
-Edn::String Buffer::GetShortName(void)
-{
-
-	// nothing to do
-	return m_fileName.GetShortFilename();
-}
-
-/**
- * @brief
- *
- * @param[in,out] ---
- *
- * @return ---
- *
- */
-Edn::String Buffer::GetFolder(void)
-{
-
-	// nothing to do
-	return m_fileName.GetFolder();
-}
-
-
-/**
- * @brief
- *
- * @param[in,out] ---
- *
- * @return ---
- *
- */
-bool Buffer::HaveName(void)
-{
-	// nothing to do
-	return true;
-}
-
-/**
- * @brief
- *
- * @param[in,out] ---
- *
- * @return ---
- *
- */
-void Buffer::SetName(Edn::String &newName)
-{
-	// nothing to do
-}
-
 /**
  * @brief
  *
@@ -215,6 +171,19 @@ void Buffer::SetLineDisplay(uint32_t lineNumber)
 	// nothing to do
 }
 
+/**
+ * @brief
+ *
+ * @param[in,out] ---
+ *
+ * @return ---
+ *
+ */
+void Buffer::DrawLine(DrawerManager &drawer, bufferAnchor_ts &anchor)
+{
+	return;
+}
+
 
 /**
  * @brief
@@ -224,9 +193,15 @@ void Buffer::SetLineDisplay(uint32_t lineNumber)
  * @return ---
  *
  */
-int32_t	Buffer::Display(DrawerManager &drawer)
+void Buffer::DrawLineEmpty(DrawerManager &drawer, int32_t lineScreenID)
 {
-	return ERR_NONE;
+	ColorizeManager * myColorManager = ColorizeManager::getInstance();
+	int32_t positionY = m_lineHeight * (lineScreenID);
+#	ifdef NDEBUG
+	drawer.Rectangle(myColorManager->Get(COLOR_CODE_BASIC_BG), 0, positionY, drawer.GetWidth(), m_lineHeight );
+#	else
+	drawer.Rectangle(myColorManager->Get(COLOR_CODE_CURSOR), 0, positionY, drawer.GetWidth(), m_lineHeight );
+#	endif
 }
 
 /**
@@ -313,7 +288,6 @@ void Buffer::ScrollUp(void)
 	// nothing to do
 }
 
-
 /**
  * @brief
  *
@@ -322,13 +296,6 @@ void Buffer::ScrollUp(void)
  * @return ---
  *
  */
-void Buffer::ForceReDraw(bool allElement)
-{
-	// nothing to do
-}
-
-
-
 void Buffer::cursorMove(int32_t gtkKey)
 {
 	// nothing to do
@@ -360,6 +327,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)
@@ -367,6 +335,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
  *
@@ -410,7 +393,7 @@ void Buffer::Paste(int8_t clipboardID)
 
 void Buffer::RemoveLine(void)
 {
-	// nothing to do
+	// nothing to do;
 }
 
 void Buffer::SelectAll(void)
@@ -433,3 +416,220 @@ void Buffer::Redo(void)
 	// nothing to do
 }
 
+
+void Buffer::AnchorAdd(int32_t anchorID)
+{
+	int32_t localID = AnchorRealId(anchorID);
+	if (localID >=0) {
+		EDN_ERROR("[" << m_uniqueID << "] AnchorID="<< anchorID << " already exist !!!");
+	} else {
+		bufferAnchorReference_ts tmpAnchor = m_AnchorList[0];
+		m_AnchorList[0].m_curent = false;
+		tmpAnchor.m_idAnchor = anchorID;
+		for(int32_t iii=0; iii<MAX_LINE_DISPLAYABLE_BY_BUFFER; iii++) {
+			tmpAnchor.m_redrawLine[iii] = true;
+		}
+		m_AnchorList.PushBack(tmpAnchor);
+		EDN_DEBUG("[" << m_uniqueID << "] AnchorID="<< anchorID << " ==> Added");
+	}
+}
+
+
+void Buffer::AnchorRm(int32_t anchorID)
+{
+	if (anchorID == -1) {
+		EDN_ERROR("[" << m_uniqueID << "] AnchorID="<< anchorID << " Can not remove this one !!!");
+		return;
+	}
+	int32_t localID = AnchorRealId(anchorID);
+	if (localID >=0) {
+		if (m_AnchorList.Size() == 2) {
+			m_AnchorList[0] = m_AnchorList[1];
+			for(int32_t iii=0; iii<MAX_LINE_DISPLAYABLE_BY_BUFFER; iii++) {
+				m_AnchorList[0].m_redrawLine[iii] = true;
+			}
+			m_AnchorList[0].m_BufferNumberLineOffset = 0;
+		}
+		m_AnchorList.Erase(localID);
+		EDN_DEBUG("[" << m_uniqueID << "] AnchorID="<< anchorID << " ==> Remove");
+	} else {
+		EDN_ERROR("[" << m_uniqueID << "] AnchorID="<< anchorID << " does not exist !!!");
+	}
+}
+
+
+void Buffer::AnchorRedrawAll(int32_t anchorID)
+{
+	if (anchorID == -1) {
+		EDN_ERROR("[" << m_uniqueID << "] AnchorID="<< anchorID << " Can not redraw this one !!!");
+		return;
+	}
+	int32_t localID = AnchorRealId(anchorID);
+	if (localID >=0) {
+		AnchorForceRedrawAll(localID);
+	} else {
+		EDN_ERROR("[" << m_uniqueID << "] AnchorID="<< anchorID << " does not exist !!!");
+	}
+}
+
+
+bool Buffer::AnchorGet(int32_t anchorID, bufferAnchor_ts & anchor)
+{
+	EDN_ERROR("[" << m_uniqueID << "] AnchorID="<< anchorID << " Main buffer ==> can not manage Anchor (type buffer specific)");
+	return false;
+}
+
+
+bool Buffer::AnchorNext(bufferAnchor_ts & anchor)
+{
+	EDN_ERROR("[" << m_uniqueID << "] AnchorID=?? Main buffer ==> can not manage Anchor (type buffer specific)");
+	return false;
+}
+
+
+void Buffer::AnchorSetSize(int32_t anchorID, int32_t sizePixelX, int32_t sizePixelY)
+{
+	int32_t localID = AnchorRealId(anchorID);
+	if (localID >=0) {
+		position_ts mySize;
+		mySize.x = sizePixelX / m_lineWidth;
+		mySize.y = sizePixelY / m_lineHeight;
+		if(    m_AnchorList[localID].m_displaySize.x != mySize.x
+		    || m_AnchorList[localID].m_displaySize.y != mySize.y )
+		{
+			AnchorForceRedrawAll(localID);
+		}
+		m_AnchorList[localID].m_displaySize = mySize;
+	}
+}
+
+
+void Buffer::AnchorSetStartOffset(int32_t anchorID, int32_t offsetX, int32_t offsetY)
+{
+	int32_t localID = AnchorRealId(anchorID);
+	if (localID >=0) {
+		m_AnchorList[localID].m_displayStart.x += offsetX;
+		if (0<m_AnchorList[localID].m_displayStart.x) {
+			m_AnchorList[localID].m_displayStart.x = 0;
+		}
+		m_AnchorList[localID].m_displayStart.y += offsetY;
+		if (0<m_AnchorList[localID].m_displayStart.y) {
+			m_AnchorList[localID].m_displayStart.y = 0;
+		}
+		AnchorForceRedrawAll(localID);
+	}
+}
+
+
+int32_t Buffer::AnchorRealId(int32_t anchorID)
+{
+	//EDN_DEBUG("Get real ID : " << anchorID << " in the anchor list size()=" << m_AnchorList.Size());
+	for(int32_t iii=0; iii < m_AnchorList.Size(); iii++) {
+		//EDN_DEBUG("check if equal : " << m_AnchorList[iii].m_idAnchor << " id=" << iii);
+		if (m_AnchorList[iii].m_idAnchor == anchorID) {
+			return iii;
+		}
+	}
+	return -1;
+}
+
+int32_t Buffer::AnchorCurrentId(void)
+{
+	for(int32_t iii=0; iii < m_AnchorList.Size(); iii++) {
+		if (m_AnchorList[iii].m_curent == true) {
+			return iii;
+		}
+	}
+	return 0;
+}
+
+void Buffer::AnchorForceRedrawAll(int32_t realAnchorId)
+{
+	EDN_DEBUG("AnchorForceRedrawAll(" << realAnchorId << ")");
+	if (-5000 == realAnchorId) {
+		int32_t localID = AnchorCurrentId();
+		if (localID >=0) {
+			m_AnchorList[localID].m_BufferNumberLineOffset = 0;
+			for(int32_t iii=0; iii < MAX_LINE_DISPLAYABLE_BY_BUFFER; iii++) {
+				m_AnchorList[localID].m_redrawLine[iii] = true;
+			}
+		}
+	} else {
+		m_AnchorList[realAnchorId].m_BufferNumberLineOffset = 0;
+		for(int32_t iii=0; iii < MAX_LINE_DISPLAYABLE_BY_BUFFER; iii++) {
+			m_AnchorList[realAnchorId].m_redrawLine[iii] = true;
+		}
+	}
+}
+
+void Buffer::AnchorForceRedrawLine(int32_t lineID)
+{
+	for(int32_t iii=0; iii < m_AnchorList.Size(); iii++) {
+		if(    m_AnchorList[iii].m_displayStart.y <= lineID
+		    && m_AnchorList[iii].m_displayStart.y + MAX_LINE_DISPLAYABLE_BY_BUFFER > lineID )
+		{
+			m_AnchorList[iii].m_redrawLine[lineID-m_AnchorList[iii].m_displayStart.y] = true;
+		}
+	}
+}
+
+
+// TODO : optimiser cette fonction qui met plusieurs fois des variables a true ....
+
+void Buffer::AnchorForceRedrawOffsef(int32_t offset)
+{
+	EDN_DEBUG("** => set ofset : " << offset);
+	if (0 == offset) {
+		EDN_DEBUG("No apply offset ...");
+		return;
+	}
+	int32_t localID = AnchorCurrentId();
+	if (localID >=0) {
+		EDN_DEBUG("offset ID=" << localID);
+		m_AnchorList[localID].m_BufferNumberLineOffset += offset;
+		
+		EDN_DEBUG("move redraw request : [" << m_AnchorList[localID].m_displaySize.y << "," << MAX_LINE_DISPLAYABLE_BY_BUFFER << "[=true");
+		for(int32_t iii=m_AnchorList[localID].m_displaySize.y; iii < MAX_LINE_DISPLAYABLE_BY_BUFFER; iii++) {
+			m_AnchorList[localID].m_redrawLine[iii] = true;
+		}
+		
+		int32_t maxSize = edn_min(m_AnchorList[localID].m_displaySize.y, MAX_LINE_DISPLAYABLE_BY_BUFFER);
+		
+		if (offset < 0) {
+			if (-1 * offset < maxSize) {
+				EDN_DEBUG("move redraw request : ]" << maxSize << "," << -1*offset << "]=]" << maxSize+offset << "," << -1*offset + offset << "]");
+				for(int32_t iii=maxSize-1; iii >= -1*offset; iii--) {
+					m_AnchorList[localID].m_redrawLine[iii] = m_AnchorList[localID].m_redrawLine[iii+offset];
+				}
+				EDN_DEBUG("move redraw request : [" << 0 << "," << -1*offset << "[=true");
+				for(int32_t iii=0; iii < -1*offset; iii++) {
+					m_AnchorList[localID].m_redrawLine[iii] = true;
+				}
+			} else {
+				EDN_WARNING("FORCE a total redraw... 1");
+				for(int32_t iii=0; iii < maxSize; iii++) {
+					m_AnchorList[localID].m_redrawLine[iii] = true;
+				}
+			}
+		} else {
+			if (offset < maxSize) {
+				EDN_DEBUG("move redraw request : [" << 0 << "," << maxSize-offset << "[=[" << offset << "," << maxSize << "[");
+				for(int32_t iii=0; iii < maxSize-offset ; iii++) {
+					m_AnchorList[localID].m_redrawLine[iii] = m_AnchorList[localID].m_redrawLine[iii+offset];
+				}
+				// note the -1 is to force the redisplay of the previous of the last line ==> special case of the gtk 3.0 marker to resize the windows
+				EDN_DEBUG("move redraw request : [" << maxSize-offset-1 << "," << maxSize << "[=true");
+				for(int32_t iii=maxSize-offset-1; iii < maxSize; iii++) {
+					m_AnchorList[localID].m_redrawLine[iii] = true;
+				}
+			} else {
+				EDN_WARNING("FORCE a total redraw... 2");
+				for(int32_t iii=0; iii < maxSize; iii++) {
+					m_AnchorList[localID].m_redrawLine[iii] = true;
+				}
+			}
+		}
+	} else {
+		EDN_ERROR("can not find the real ID in linste.Size()=" << m_AnchorList.Size());
+	}
+}

Sources/Buffer/Buffer.h

@@ -31,52 +31,103 @@
 #include "charset.h"
 #include "Edn.h"
 
+#define MAX_LINE_DISPLAYABLE_BY_BUFFER (200)
 
-typedef struct{
-	uint32_t nbTotalLine;				//!< Number of line in the buffer
-	uint32_t nbTotalColomn;				//!< Number of line in the buffer
-	uint32_t startLineDisplay;			//!< First line display.
-	uint32_t startColomnDisplay;		//!< First Colomn displayed
-	uint32_t diplayableColomn;			//!< NB colomn that can be displayed
-	uint32_t diplayableLine;			//!< NB Line that can be displayed
-}infoStatBuffer_ts;
+extern "C"
+{
+	typedef struct{
+		uint32_t nbTotalLine;				//!< Number of line in the buffer
+		uint32_t nbTotalColomn;				//!< Number of line in the buffer
+		uint32_t startLineDisplay;			//!< First line display.
+		uint32_t startColomnDisplay;		//!< First Colomn displayed
+		uint32_t diplayableColomn;			//!< NB colomn that can be displayed
+		uint32_t diplayableLine;			//!< NB Line that can be displayed
+	}infoStatBuffer_ts;
+	
+	typedef struct {
+		int32_t      m_idAnchor;                                   //!< reference id of the anchor (real id of the upper displayer of CodeView)
+		bool         m_curent;                                     //!< set at true if the anchor is a reference with the curent display
+		int32_t      m_lineId;                                     //!< first line ID to display
+		int32_t      m_bufferPos;                                  //!< position of the first lineId
+		position_ts  m_displayStart;                               //!< start display position
+		position_ts  m_displaySize;                                //!< size of the curent display
+		bool         m_redrawLine[MAX_LINE_DISPLAYABLE_BY_BUFFER]; //!< List of the current line that must be redisplayed
+		int32_t      m_BufferNumberLineOffset;                     //!< number of line that might be an ofset on the curent screen
+	} bufferAnchorReference_ts;
+	
+	typedef struct {
+		position_ts  m_displayStart;                               //!< start display position
+		position_ts  m_displaySize;                                //!< size of the curent display
+		int32_t      m_lineNumber;                                 //!< current line-number id
+		int32_t      m_nbIterationMax;                             //!< number of cycle needed to end the dispalay
+		int32_t      m_posStart;                                   //!< position of the start of the line
+		int32_t      m_posStop;                                    //!< position of the end of the line
+		int32_t      m_selectionPosStart;                          //!< position of the selection start
+		int32_t      m_selectionPosStop;                           //!< position of the selection stop
+		bool         m_redrawLine[MAX_LINE_DISPLAYABLE_BY_BUFFER]; //!< List of the current line that must be redisplayed
+		int32_t      m_BufferNumberLineOffset;                     //!< number of line that might be an ofset on the curent screen
+	} bufferAnchor_ts;
+}
 
 
 class Buffer {
 	public:
 		                  Buffer(void);
-		                  Buffer(Edn::String &filename);
+		                  Buffer(Edn::File &newName);
 		virtual          ~Buffer(void);
-		Edn::File         GetFileName(void);
-		virtual Edn::String GetName(void);
-		virtual Edn::String GetShortName(void);
-		virtual Edn::String GetFolder(void);
-		virtual void      SetName(Edn::String &newName);
+		
+		Edn::File         GetFileName(void)
+		{
+			return m_fileName;
+		};
+		
+		void              SetFileName(Edn::File &newName)
+		{
+			m_fileName = newName;
+			m_haveName = true;
+			NameChange();
+		};
+		
+		void              SetFileName(Edn::String &newName)
+		{
+			m_fileName.SetCompleateName(newName);
+			m_haveName = true;
+			NameChange();
+		};
+		
+		bool              HaveName(void)
+		{
+			return m_haveName;
+		}
+		
 		virtual void      Save(void);
-		virtual bool      HaveName(void);
 				bool      IsModify(void);
 	protected:
 				void      SetModify(bool status);
+		virtual void      NameChange(void) { /*EDN_DEBUG("check name change ==> no HL change possible");*/};
 	public:
 		virtual void      GetInfo(infoStatBuffer_ts &infoToUpdate);
 		virtual void      SetLineDisplay(uint32_t lineNumber);
 		
-		virtual int32_t   Display(DrawerManager &drawer);
-		virtual void      ForceReDraw(bool allElement);
+		virtual void      DrawLine(DrawerManager &drawer, bufferAnchor_ts &anchor);
+		virtual void      DrawLineEmpty(DrawerManager &drawer, int32_t lineScreenID);
+		// return the new cursor position ...
 		virtual void      AddChar(char * UTF8data);
 		virtual void      cursorMove(int32_t gtkKey);
 		virtual void      MouseSelectFromCursorTo(int32_t width, int32_t height);
 		virtual void      MouseEvent(int32_t width, int32_t height);
 		virtual void      MouseEventDouble(void);
 		virtual void      MouseEventTriple(void);
-		virtual void      ScrollDown(void);
-		virtual void      ScrollUp(void);
 		virtual void      RemoveLine(void);
 		virtual void      SelectAll(void);
 		virtual void      SelectNone(void);
 		virtual void      Undo(void);
 		virtual void      Redo(void);
+		
 		virtual void      SetCharset(charset_te newCharset) {};
+		
+		virtual void      ScrollDown(void); // must be deprecated
+		virtual void      ScrollUp(void);   // must be deprecated
 
 		//virtual void	SelectAll(void);
 		virtual void      Copy(int8_t clipboardID);
@@ -86,11 +137,35 @@ 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;
-		Edn::File         m_fileName;
-		bool              m_haveName;                   //!< to know if the file have a name or NOT
+		bool              m_fileModify;           //!< 
+		// naming
+		Edn::File         m_fileName;             //!< filename of the curent buffer
+		bool              m_haveName;             //!< to know if the file have a name or NOT
+
+	// anchor section
+	public:
+		void              AnchorAdd(int32_t anchorID);
+		void              AnchorRm(int32_t anchorID);
+		void              AnchorRedrawAll(int32_t anchorID);
+		virtual bool      AnchorGet(int32_t anchorID, bufferAnchor_ts & anchor);
+		virtual bool      AnchorNext(bufferAnchor_ts & anchor);
+		void              AnchorSetSize(int32_t anchorID, int32_t sizePixelX, int32_t sizePixelY);
+		void              AnchorSetStartOffset(int32_t anchorID, int32_t offsetX, int32_t offsetY);
+		
+	protected:
+		int32_t           m_lineWidth;
+		int32_t           m_lineHeight;
+		int32_t           AnchorRealId(int32_t anchorID);
+		int32_t           AnchorCurrentId(void);
+		void              AnchorForceRedrawAll(int32_t realAnchorId = -5000);
+		void              AnchorForceRedrawLine(int32_t lineID);
+		void              AnchorForceRedrawOffsef(int32_t offset);
+		Edn::VectorType<bufferAnchorReference_ts> m_AnchorList;              //!< list of all line anchor in the current buffer
+		int32_t           m_uniqueID;
+
 };
 
 

Sources/Buffer/BufferEmpty.cpp

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

Sources/Buffer/BufferEmpty.h

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

Sources/Buffer/BufferManager.cpp

@@ -62,8 +62,8 @@ BufferManager::~BufferManager(void)
 	EDN_INFO("~BufferManager::RemoveAll();");
 	RemoveAll();
 	// clear The list of Buffer
-	EDN_INFO("~BufferManager::listBuffer.clear();");
-	listBuffer.clear();
+	EDN_INFO("~BufferManager::listBuffer.Clear();");
+	listBuffer.Clear();
 	EDN_INFO("~BufferManager::delete(BufferNotExiste);");
 	delete(BufferNotExiste);
 }
@@ -73,6 +73,9 @@ void BufferManager::OnMessage(int32_t id, int32_t dataID)
 {
 	switch (id)
 	{
+		case EDN_MSG__BUFFER_CHANGE_CURRENT:
+			m_idSelected = dataID;
+			break;
 		case EDN_MSG__NEW:
 			{
 				int32_t newOne = Create();
@@ -81,6 +84,49 @@ void BufferManager::OnMessage(int32_t id, int32_t dataID)
 				}
 			}
 			break;
+		case EDN_MSG__BUFF_ID_CLOSE:
+			// Check buffer existence
+			if(true == Exist(dataID)) {
+				// Get the new display buffer 
+				if (m_idSelected == dataID) {
+					// Try previous buffer
+					int32_t destBuffer = -1;
+					for(int32_t ii=dataID-1; ii >= 0; ii--) {
+						if (true == Exist(ii) ) {
+							destBuffer = ii;
+							break;
+						}
+					}
+					//EDN_DEBUG("new buffer selected : ?? " << destBuffer);
+					// try next buffer
+					if (-1 == destBuffer) {
+						for(int32_t ii=dataID+1; ii < listBuffer.Size(); ii++) {
+							if (true == Exist(ii) ) {
+								destBuffer = ii;
+								break;
+							}
+						}
+					}
+					//EDN_DEBUG("new buffer selected : ?? " << destBuffer);
+					// set it to the currect display
+					SendMessage(EDN_MSG__CURRENT_CHANGE_BUFFER_ID, destBuffer);
+				}
+				//EDN_DEBUG("Remove : " << dataID);
+				// Remove requested buffer
+				Remove(dataID);
+			}
+			break;
+		case EDN_MSG__BUFF_ID_SAVE:
+			// Check buffer existence
+			if(true == Exist(dataID)) {
+				// If no name ==> request a Gui display ...
+				if (Get(dataID)->HaveName() == false) {
+					SendMessage(EDN_MSG__GUI_SHOW_SAVE_AS, dataID);
+				} else {
+					Get(dataID)->Save();
+				}
+			}
+			break;
 	}
 }
 
@@ -101,7 +147,7 @@ void BufferManager::OnMessage(int32_t id, int32_t dataID)
 void BufferManager::RemoveAll(void)
 {
 	int32_t i;
-	for (i=0; i<(int32_t)listBuffer.size(); i++) {
+	for (i=0; i<listBuffer.Size(); i++) {
 		Remove(i);
 	}
 	SendMessage(EDN_MSG__BUFFER_REMOVE_ALL);
@@ -122,8 +168,8 @@ int32_t	BufferManager::Create(void)
 	// allocate a new Buffer
 	Buffer *myBuffer = new BufferText();
 	// Add at the list of element
-	listBuffer.push_back(myBuffer);
-	int32_t basicID = (int32_t)listBuffer.size() - 1;
+	listBuffer.PushBack(myBuffer);
+	int32_t basicID = listBuffer.Size() - 1;
 	SendMessage(EDN_MSG__BUFFER_ADD, basicID);
 	return basicID;
 }
@@ -139,13 +185,14 @@ int32_t	BufferManager::Create(void)
  * @todo : check if this file is not curently open and return the old ID
  *
  */
-int32_t BufferManager::Open(Edn::String &filename)
+int32_t BufferManager::Open(Edn::File &myFile)
 {
+	// TODO : Check here if the file is already open ==> and display it if needed
 	// allocate a new Buffer
-	Buffer *myBuffer = new BufferText(filename);
+	Buffer *myBuffer = new BufferText(myFile);
 	// Add at the list of element
-	listBuffer.push_back(myBuffer);
-	int32_t basicID = (int32_t)listBuffer.size() - 1;
+	listBuffer.PushBack(myBuffer);
+	int32_t basicID = listBuffer.Size() - 1;
 	SendMessage(EDN_MSG__BUFFER_ADD, basicID);
 	return basicID;
 }
@@ -159,7 +206,7 @@ Buffer * BufferManager::Get(int32_t BufferID)
 		return BufferNotExiste;
 	}
 	// check if the Buffer existed
-	if (BufferID < (int32_t)listBuffer.size()) {
+	if (BufferID < listBuffer.Size()) {
 		// check if the buffer already existed
 		if (NULL != listBuffer[BufferID]) {
 			return listBuffer[BufferID];
@@ -167,7 +214,7 @@ Buffer * BufferManager::Get(int32_t BufferID)
 			EDN_ERROR("non existing Buffer " << BufferID);
 		}
 	} else {
-		EDN_ERROR("call an non existing Buffer number too hight : " << BufferID << " > " << listBuffer.size());
+		EDN_ERROR("call an non existing Buffer number too hight : " << BufferID << " > " << listBuffer.Size());
 	}
 	return BufferNotExiste;
 }
@@ -179,7 +226,7 @@ bool BufferManager::Exist(int32_t BufferID)
 		return false;
 	}
 	// check if the Buffer existed
-	if (BufferID < (int32_t)listBuffer.size()) {
+	if (BufferID < listBuffer.Size()) {
 		// check if the buffer already existed
 		if (NULL != listBuffer[BufferID]) {
 			return true;
@@ -189,14 +236,23 @@ bool BufferManager::Exist(int32_t BufferID)
 }
 
 
-int32_t BufferManager::GetId(Edn::String &filename)
+bool BufferManager::Exist(Edn::File &myFile )
+{
+	if (-1 == GetId(myFile)) {
+		return false;
+	}
+	return true;
+}
+
+
+int32_t BufferManager::GetId(Edn::File &myFile)
 {
 	int32_t iii;
 	// check if the Buffer existed
-	for (iii=0; iii < (int32_t)listBuffer.size(); iii++) {
+	for (iii=0; iii < listBuffer.Size(); iii++) {
 		// check if the buffer already existed
 		if (NULL != listBuffer[iii]) {
-			if ( listBuffer[iii]->GetName() == filename) {
+			if ( listBuffer[iii]->GetFileName() == myFile) {
 				return iii;
 			}
 		}
@@ -204,19 +260,11 @@ int32_t BufferManager::GetId(Edn::String &filename)
 	return -1;
 }
 
-bool BufferManager::Exist(Edn::String &filename)
-{
-	if (-1 == GetId(filename)) {
-		return false;
-	}
-	return true;
-}
-
 
 // return the number of buffer (open in the past) if 5 buffer open and 4 close ==> return 5
 uint32_t BufferManager::Size(void)
 {
-	return listBuffer.size();
+	return listBuffer.Size();
 }
 
 
@@ -234,7 +282,7 @@ bool BufferManager::Remove(int32_t BufferID)
 		return false;
 	}
 	// check if the Buffer existed
-	if (BufferID < (int32_t)listBuffer.size()) {
+	if (BufferID < listBuffer.Size()) {
 		// check if the buffer already existed
 		if (NULL != listBuffer[BufferID]) {
 			// TODO : Check if it saved...
@@ -253,7 +301,7 @@ bool BufferManager::Remove(int32_t BufferID)
 			return false;
 		}
 	} else {
-		EDN_INFO("call an non existing Buffer number too hight : " << BufferID << " > " << listBuffer.size());
+		EDN_INFO("call an non existing Buffer number too hight : " << BufferID << " > " << listBuffer.Size());
 		return false;
 	}
 }
@@ -269,7 +317,7 @@ bool BufferManager::Remove(int32_t BufferID)
 int32_t BufferManager::WitchBuffer(int32_t iEmeElement)
 {
 	int32_t i;
-	for (i=0; i<(int32_t)listBuffer.size(); i++) {
+	for (i=0; i<listBuffer.Size(); i++) {
 		if (NULL != listBuffer[i]) {
 			iEmeElement--;
 			// find the element : 

Sources/Buffer/BufferManager.h

@@ -31,8 +31,6 @@
 #include "BufferEmpty.h"
 #include "Singleton.h"
 #include "MsgBroadcast.h"
-#include <vector>
-#include <string>
 
 class BufferManager: public Singleton<BufferManager>, public MsgBroadcast
 {
@@ -50,13 +48,13 @@ class BufferManager: public Singleton<BufferManager>, public MsgBroadcast
 		// create a buffer with no element
 		int32_t		Create(void);
 		// open curent filename
-		int32_t		Open(Edn::String &filename);
+		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::String &filename);
-		int32_t		GetId(Edn::String &filename);
+		bool		Exist(Edn::File &myFile);
+		int32_t		GetId(Edn::File &myFile);
 		// return the number of buffer (open in the past) if 5 buffer open and 4 close ==> return 5
 		uint32_t	Size(void);
 		int32_t		WitchBuffer(int32_t iEmeElement);
@@ -65,7 +63,7 @@ class BufferManager: public Singleton<BufferManager>, public MsgBroadcast
 
 	private:
 		
-		std::vector<Buffer*> listBuffer;						//!< element List of the char Elements
+		Edn::VectorType<Buffer*> listBuffer;						//!< element List of the char Elements
 		
 		void	RemoveAll(void);						//!< remove all buffer
 		int32_t m_idSelected;

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"
@@ -38,69 +36,63 @@ typedef enum {
 	CURSOR_DISPLAY_MODE_NOT_FOCUS,
 } cursorDisplayMode_te;
 
+
 class BufferText : public Buffer {
 	public:
-		          BufferText(void);
-		          BufferText(Edn::String &filename);
-		virtual  ~BufferText(void);
-		Edn::String GetName(void);
-		Edn::String GetShortName(void);
-		Edn::String GetFolder(void);
-		void      SetName(Edn::String &newName);
-		void      Save(void);
-		bool      HaveName(void);
+		            BufferText(void);
+		            BufferText(Edn::File &fileName);
+		virtual    ~BufferText(void);
+		void        Save(void);
 		
-		void      GetInfo(infoStatBuffer_ts &infoToUpdate);
-		void      SetLineDisplay(uint32_t lineNumber);
+		void        GetInfo(infoStatBuffer_ts &infoToUpdate);
+		void        SetLineDisplay(uint32_t lineNumber);
 		
-		int32_t   Display(DrawerManager &drawer);
-		void      ForceReDraw(bool allElement);
-		void      AddChar(char * UTF8data);
-		void      cursorMove(int32_t gtkKey);
-		void      MouseSelectFromCursorTo(int32_t width, int32_t height);
-		void      MouseEvent(int32_t width, int32_t height);
-		void      MouseEventDouble(void);
-		void      MouseEventTriple(void);
-		void      ScrollDown(void);
-		void      ScrollUp(void);
+		void        DrawLine(DrawerManager &drawer, bufferAnchor_ts &anchor);
+		void        AddChar(char * UTF8data);
+		void        cursorMove(int32_t gtkKey);
+		void        MouseSelectFromCursorTo(int32_t width, int32_t height);
+		void        MouseEvent(int32_t width, int32_t height);
+		void        MouseEventDouble(void);
+		void        MouseEventTriple(void);
+		void        ScrollDown(void);
+		void        ScrollUp(void);
 
-		void      Copy(int8_t clipboardID);
-		void      Cut(int8_t clipboardID);
-		void      Paste(int8_t clipboardID);
+		void        Copy(int8_t clipboardID);
+		void        Cut(int8_t clipboardID);
+		void        Paste(int8_t clipboardID);
 
-		void      Search(Edn::String &data, bool back, bool caseSensitive, bool wrap, bool regExp);
-		void      Replace(Edn::String &data);
-		int32_t   FindLine(Edn::String &data);
-		void      JumpAtLine(int32_t newLine);
-		void      RemoveLine(void);
-		void      SelectAll(void);
-		void      SelectNone(void);
-		void      Undo(void);
-		void      Redo(void);
-		void      SetCharset(charset_te newCharset);
+		void        Search(Edn::String &data, bool back, bool caseSensitive, bool wrap, bool regExp);
+		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);
+		void        Undo(void);
+		void        Redo(void);
+		void        SetCharset(charset_te newCharset);
+
+		bool        AnchorGet(int32_t anchorID, bufferAnchor_ts & anchor);
+		bool        AnchorNext(bufferAnchor_ts & anchor);
+	protected:
+		void        NameChange(void);
 
 	private:
-		// naming
-		Edn::String               filename;                   //!< filename of the curent buffer
-		bool                    haveName;                   //!< to know if the file have a name or NOT
 		// Display
-		bool                    NeedToCleanEndPage;         //!< if true, the end of the page need to be clean (arrive after a remove line)
-		uint32_t                nbColoneForLineNumber;      //!< number of colome used to display the line Number
-		ColorizeManager *       myColorManager;             //!< for the background color : 
-		
+		ColorizeManager *       myColorManager;                 //!< for the background color : 
+		int32_t                 m_nbColoneForLineNumber;        //!< number of colomn use for linenumber display
 		
 		// Direct buffer IO
-		EdnBuf                  m_EdnBuf;                   //!< buffer associated on this displayer
-		position_ts             m_displayStart;             //!< position where the display is starting
-		position_ts             m_displaySize;              //!< number of char displayable in the screan
-		int32_t                 m_displayStartBufferPos;    //!< position where the buffer start
-		// Cursor :
-		int32_t                 m_cursorPos;                //!< position in the buffer of the cursor
-		int32_t                 m_cursorPreferredCol;       //!< colomn of the last up and down ...
-		bool                    m_cursorOn;                 //!< the blink of the cursor ...
-		cursorDisplayMode_te    m_cursorMode;               //!< type of cursor Selected
+		EdnBuf                  m_EdnBuf;                       //!< buffer associated on this displayer
 		
-		displayHLData_ts        m_displayLocalSyntax;       //!< for the display of the local elements (display HL mode)
+		// Cursor :
+		int32_t                 m_cursorPosPrevious;            //!< Previous position in the buffer of the cursor
+		int32_t                 m_cursorPos;                    //!< position in the buffer of the cursor
+		int32_t                 m_cursorPreferredCol;           //!< colomn of the last up and down ...
+		bool                    m_cursorOn;                     //!< the blink of the cursor ...
+		cursorDisplayMode_te    m_cursorMode;                   //!< type of cursor Selected
 		
 		// internal function
 		void     BasicInit(void);
@@ -109,10 +101,6 @@ class BufferText : public Buffer {
 		
 		void     CleanSelectLine(void);
 		
-		void     SelectionStart(void);
-		void     SelectionEnd(void);
-		void     SelectionCheckMode(void);
-		
 		void     CheckAndUpdateLineForModification(uint32_t lineID);
 		bool     TextDMoveUp(int32_t offset);
 		bool     TextDMoveDown(int32_t offset);
@@ -120,7 +108,9 @@ class BufferText : public Buffer {
 		
 		void     GetMousePosition(int32_t width, int32_t height, int32_t &x, int32_t &y);
 		void     MoveUpDown(int32_t ofset);
-		void     DrawLineNumber(DrawerManager &drawer,char *myPrint,  int32_t lineNumber, int32_t positionY);
+		void     DrawLineNumber(DrawerManager &drawer, int32_t lineNumber, int32_t positionY);
+		void     UpdatePointerNumber(void);
+
 
 };
 

Sources/Colorize/Colorize.h

@@ -49,8 +49,8 @@ class Colorize {
 		Edn::String GetName(void);
 		void SetFgColor(const char *myColor);
 		void SetBgColor(const char *myColor);
-		void ApplyFG(cairo_t * cr) { cairo_set_source_rgb(cr, m_colorFG.red, m_colorFG.green, m_colorFG.blue); };
-		void ApplyBG(cairo_t * cr) { cairo_set_source_rgb(cr, m_colorBG.red, m_colorBG.green, m_colorBG.blue); };
+		void ApplyFG(cairo_t * cr) { cairo_set_source_rgba(cr, m_colorFG.red, m_colorFG.green, m_colorFG.blue, 1); };
+		void ApplyBG(cairo_t * cr) { cairo_set_source_rgba(cr, m_colorBG.red, m_colorBG.green, m_colorBG.blue, 1); };
 		
 		color_ts & GetFG(void) { return m_colorFG; };
 		color_ts & GetBG(void) { return m_colorBG; };

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;
-	for (i=0; i<listMyColor.size(); i++) {
+	int32_t 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;
-	for (i=0; i<listMyColor.size(); i++) {
+	int32_t 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		  LoadFile(const char * xmlFilename);
-		Colorize	* Get(const char *colorName);
-		Colorize	* Get(Edn::String &colorName);
-		color_ts	& Get(basicColor_te myColor);
-		bool		  Exist(Edn::String &colorName);
-		bool		  Exist(const char *colorName);
-		void		  DisplayListOfColor(void);
+		void    OnMessage(int32_t id, int32_t dataID);
+	public:
+		void        LoadFile(Edn::String &xmlFilename);
+		void        LoadFile(const char * xmlFilename);
+		Colorize *  Get(const char *colorName);
+		Colorize *  Get(Edn::String &colorName);
+		color_ts &  Get(basicColor_te myColor);
+		bool        Exist(Edn::String &colorName);
+		bool        Exist(const char *colorName);
+		void        DisplayListOfColor(void);
 
 	private:
-		std::vector<Colorize*>	listMyColor;		//!< List of ALL Color
-		Colorize*				errorColor;
-		color_ts				basicColors[COLOR_NUMBER_MAX];
+		Edn::String                 m_fileColor;
+		Edn::VectorType<Colorize*>  listMyColor;		//!< List of ALL Color
+		Colorize *                  errorColor;
+		color_ts                    basicColors[COLOR_NUMBER_MAX];
 };
 
 #endif

Sources/CustumWidget/BufferView/BufferView.cpp

@@ -57,6 +57,8 @@ BufferView::BufferView(void) : MsgBroadcast("Buffer View", EDN_CAT_GUI)
 #	elif defined( USE_GTK_VERSION_2_0 )
 	GTK_WIDGET_SET_FLAGS(m_widget, GTK_CAN_FOCUS);
 #	endif
+	// Remove double-buffering ==> in the current case we can not get the previous display...
+	gtk_widget_set_double_buffered(m_widget, false);
 	// 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);
@@ -100,6 +102,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;
 	}
 }
 
@@ -138,6 +144,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;
@@ -146,17 +155,17 @@ gboolean BufferView::CB_displayDraw( GtkWidget *widget, GdkEventExpose *event, g
 	basicColor_te selectFG = COLOR_LIST_TEXT_NORMAL;
 	basicColor_te selectBG = COLOR_LIST_BG_1;
 	for (i=0; i < nbBufferOpen; i++) {
-		Edn::String name;
+		Edn::File name;
 		bool isModify;
 		if (self->m_bufferManager->Exist(i)) {
 			isModify = self->m_bufferManager->Get(i)->IsModify();
-			name = self->m_bufferManager->Get(i)->GetShortName();
+			name = self->m_bufferManager->Get(i)->GetFileName();
 			char *tmpModify = (char*)" ";
 			if (true == isModify) {
 				tmpModify = (char*)"M";
 			}
 			char name2[1024] = "";
-			sprintf(name2, "[%2d](%s) %s", i, tmpModify, name.c_str() );
+			sprintf(name2, "[%2d](%s) %s", i, tmpModify, name.GetShortFilename().c_str() );
 			
 			if (true == isModify) {
 				selectFG = COLOR_LIST_TEXT_MODIFY;
@@ -187,7 +196,7 @@ gboolean BufferView::CB_displayDraw( GtkWidget *widget, GdkEventExpose *event, g
 
 
 
-// sur : émis lors du premier affichage de la GtkDrawingArea
+// sur : <EFBFBD>mis lors du premier affichage de la GtkDrawingArea
 gboolean BufferView::CB_displayInit( GtkWidget *widget, gpointer data)
 {
 	BufferView * self = reinterpret_cast<BufferView*>(data);
@@ -249,46 +258,104 @@ gint BufferView::CB_keyboardEvent(	GtkWidget *widget, GdkEventKey *event, gpoint
 }
 
 
+void BufferView::OnPopupEventShow(GtkWidget *menuitem, gpointer data)
+{
+	BufferView * self = reinterpret_cast<BufferView*>(data);
+	self->SendMessage(EDN_MSG__CURRENT_CHANGE_BUFFER_ID, self->m_contectMenuSelectID);
+	self->m_contectMenuSelectID = -1;
+}
+
+void BufferView::OnPopupEventClose(GtkWidget *menuitem, gpointer data)
+{
+	BufferView * self = reinterpret_cast<BufferView*>(data);
+	self->SendMessage(EDN_MSG__BUFF_ID_CLOSE, self->m_contectMenuSelectID);
+	self->m_contectMenuSelectID = -1;
+}
+
+void BufferView::OnPopupEventSave(GtkWidget *menuitem, gpointer data)
+{
+	BufferView * self = reinterpret_cast<BufferView*>(data);
+	self->SendMessage(EDN_MSG__BUFF_ID_SAVE, self->m_contectMenuSelectID);
+	self->m_contectMenuSelectID = -1;
+}
+
+void BufferView::OnPopupEventSaveAs(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 BufferView::ViewPopupMenu(GtkWidget *parrent, GdkEventButton *event, int32_t BufferID)
+{
+	// Save the slected buffer
+	m_contectMenuSelectID = BufferID;
+	if (m_bufferManager->Exist(m_contectMenuSelectID)) {
+		GtkWidget *menu, *menuitem;
+		menu = gtk_menu_new();
+		menuitem = gtk_menu_item_new_with_label("Show");
+		g_signal_connect(    G_OBJECT(menuitem),     "activate",     G_CALLBACK(OnPopupEventShow),     this);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+		if (true == m_bufferManager->Get(m_contectMenuSelectID)->HaveName()) {
+			if (true == m_bufferManager->Get(m_contectMenuSelectID)->IsModify()) {
+				menuitem = gtk_menu_item_new_with_label("Save");
+			} else {
+				menuitem = gtk_menu_item_new_with_label("Force Save");
+			}
+			g_signal_connect(G_OBJECT(menuitem),     "activate",     G_CALLBACK(OnPopupEventSave),     this);
+			gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+		}
+		menuitem = gtk_menu_item_new_with_label("Save As ...");
+		g_signal_connect(    G_OBJECT(menuitem),     "activate",     G_CALLBACK(OnPopupEventSaveAs),   this);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+		menuitem = gtk_menu_item_new_with_label("Close");
+		g_signal_connect(    G_OBJECT(menuitem),     "activate",     G_CALLBACK(OnPopupEventClose),    this);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+		gtk_widget_show_all(menu);
+		// Note: event can be NULL here when called from view_onPopupMenu; 
+		// gdk_event_get_time() accepts a NULL argument
+		gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
+		               (event != NULL) ? event->button : 0,
+		               gdk_event_get_time((GdkEvent*)event));
+	} else {
+		EDN_ERROR("Buffer does not Exist !!! " << m_contectMenuSelectID);
+	}
+}
+
+
+
+
 gint BufferView::CB_mouseButtonEvent(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
 	BufferView * self = reinterpret_cast<BufferView*>(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) {
+		}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");
 		}
 	} 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) {
+				self->ViewPopupMenu(widget, event, selectBuf);
+			}
 		}
 	} 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,8 +26,6 @@
 #define __BUFFER_VIEW_H__
 
 #include "tools_debug.h"
-#include <vector>
-#include <string>
 #include "Singleton.h"
 #include "CodeView.h"
 #include "BufferManager.h"
@@ -35,6 +33,7 @@
 #include "MsgBroadcast.h"
 
 
+
 class BufferView : public MsgBroadcast
 {
 	public:
@@ -53,9 +52,14 @@ class BufferView : public MsgBroadcast
 		static gint		CB_mouseMotionEvent( GtkWidget *widget, GdkEventMotion *event, gpointer data);
 		static void		CB_EventOnBufferManager(gpointer data);
 
+		static void     OnPopupEventShow(GtkWidget *menuitem, gpointer data);
+		static void     OnPopupEventClose(GtkWidget *menuitem, gpointer data);
+		static void     OnPopupEventSave(GtkWidget *menuitem, gpointer data);
+		static void     OnPopupEventSaveAs(GtkWidget *menuitem, gpointer data);
 	
 	
 	private:
+		void        ViewPopupMenu(GtkWidget *parrent, GdkEventButton *event, int32_t BufferID);
 		// main windows widget : 
 		GtkWidget *           m_widget;
 		// r<>cup<75>ration des proprieter g<>n<EFBFBD>ral...
@@ -64,6 +68,7 @@ class BufferView : public MsgBroadcast
 		int32_t               m_shawableAreaX;
 		int32_t               m_shawableAreaY;
 		int32_t               m_selectedID;
+		int32_t               m_contectMenuSelectID;
 };
 
 

Sources/CustumWidget/CodeView/CodeView.cpp

@@ -38,46 +38,53 @@
 
 CodeView::CodeView(void) : MsgBroadcast("Code View", EDN_CAT_WORK_AREA)
 {
-	m_bufferID = -1;
-	m_buttunOneSelected = false;
-	m_shawableAreaX = 0;
-	m_shawableAreaY = 0;
-
 	// Init link with the buffer Manager
 	m_bufferManager = BufferManager::getInstance();
 	m_colorManager = ColorizeManager::getInstance();
 
+	static int32_t staticIntLocal = 100;
+	m_displayUniqueId = staticIntLocal++;
+
+	m_bufferID = -1;
+	m_bufferManager->Get(m_bufferID)->AnchorAdd(m_displayUniqueId);
+	m_buttunOneSelected = false;
+	m_shawableAreaX = 0;
+	m_shawableAreaY = 0;
+
 	m_widget = gtk_drawing_area_new();
 	gtk_widget_set_size_request( m_widget, 200, 100);
 
-	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);
+	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
+	// Remove double-buffering ==> in the current case we can not get the previous display...
+	gtk_widget_set_double_buffered(m_widget, false);
+	
 	// 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);
+	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);
+	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);
-	g_signal_connect(		G_OBJECT(m_widget), "scroll-event",			G_CALLBACK(CB_mouseScrollEvent), this);
+	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);
+	g_signal_connect(       G_OBJECT(m_widget), "scroll-event",         G_CALLBACK(CB_mouseScrollEvent), this);
 	// Display Event
-	g_signal_connect(		G_OBJECT(m_widget), "realize",				G_CALLBACK(CB_displayInit), 	 this);
+	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);
+	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);
+	g_signal_connect(       G_OBJECT(m_widget), "expose_event",         G_CALLBACK(CB_displayDraw),      this);
 #	endif
 }
 
@@ -98,17 +105,14 @@ void CodeView::OnMessage(int32_t id, int32_t dataID)
 	{
 		case EDN_MSG__CURRENT_CHANGE_BUFFER_ID:
 			//EDN_INFO("Select a new Buffer ... " << dataID);
+			m_bufferManager->Get(m_bufferID)->AnchorRm(m_displayUniqueId);
 			m_bufferID = dataID;
-			m_bufferManager->Get(m_bufferID)->ForceReDraw(true);
+			m_bufferManager->Get(m_bufferID)->AnchorAdd(m_displayUniqueId);
 			// request the dispplay of the curent Editor
 			SendMessage(EDN_MSG__BUFFER_CHANGE_CURRENT, m_bufferID);
 			break;
 		case EDN_MSG__CURRENT_SAVE:
-			if (m_bufferManager->Get(m_bufferID)->HaveName() == false) {
-				SendMessage(EDN_MSG__GUI_SHOW_SAVE_AS, m_bufferID);
-			} else {
-				m_bufferManager->Get(m_bufferID)->Save();
-			}
+			SendMessage(EDN_MSG__BUFF_ID_SAVE, m_bufferID);
 			break;
 		case EDN_MSG__CURRENT_SAVE_AS:
 			SendMessage(EDN_MSG__GUI_SHOW_SAVE_AS, m_bufferID);
@@ -164,9 +168,7 @@ void CodeView::OnMessage(int32_t id, int32_t dataID)
 		case EDN_MSG__CURRENT_REPLACE_ALL:
 			break;
 		case EDN_MSG__CURRENT_CLOSE:
-			m_bufferManager->Remove(m_bufferID);
-			m_bufferID = -1;
-			SendMessage(EDN_MSG__BUFFER_CHANGE_CURRENT, m_bufferID);
+			SendMessage(EDN_MSG__BUFF_ID_CLOSE, m_bufferID);
 			break;
 		case EDN_MSG__CURRENT_UNDO:
 			m_bufferManager->Get(m_bufferID)->Undo();
@@ -185,13 +187,16 @@ void CodeView::OnMessage(int32_t id, int32_t dataID)
 		case EDN_MSG__CURRENT_SET_CHARSET:
 			m_bufferManager->Get(m_bufferID)->SetCharset((charset_te)dataID);
 			break;
+		case EDN_MSG__USER_DISPLAY_CHANGE:
+			// Redraw all the display ... Done under ...
+			break;
 	}
 	// Force redraw of the widget
-	gtk_widget_queue_draw(m_widget);
+	gtk_widget_queue_draw_area(m_widget, 0, 0, m_shawableAreaX, m_shawableAreaY);
+	
 }
 
 
-
 gboolean CodeView::CB_displayDraw( GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
 	CodeView * self = reinterpret_cast<CodeView*>(data);
@@ -200,6 +205,7 @@ gboolean CodeView::CB_displayDraw( GtkWidget *widget, GdkEventExpose *event, gpo
 #	ifdef USE_GTK_VERSION_3_0
 	GtkAllocation allocation;
 	gtk_widget_get_allocation(widget, &allocation);
+	EDN_INFO("GTK+ request a diplay of : "<< allocation.width <<"px * "<< allocation.height <<"px");
 	bool needRedrawAll = false;
 	if (self->m_shawableAreaX != allocation.width) {
 		needRedrawAll = true;
@@ -210,6 +216,7 @@ gboolean CodeView::CB_displayDraw( GtkWidget *widget, GdkEventExpose *event, gpo
 		self->m_shawableAreaY = allocation.height;
 	}
 #	elif defined( USE_GTK_VERSION_2_0)
+	EDN_INFO("GTK+ request a diplay of : "<< widget->allocation.width <<"px * "<< widget->allocation.height <<"px");
 	bool needRedrawAll = false;
 	if (self->m_shawableAreaX != widget->allocation.width) {
 		needRedrawAll = true;
@@ -220,32 +227,51 @@ gboolean CodeView::CB_displayDraw( GtkWidget *widget, GdkEventExpose *event, gpo
 		self->m_shawableAreaY = widget->allocation.height;
 	}
 #	endif
-	if (true == needRedrawAll) {
-		//updateScrollElement();
-		self->m_bufferManager->Get(self->m_bufferID)->ForceReDraw(true);
-	}
-	EDN_INFO("Request a display of : " << self->m_shawableAreaX << "px * "<<  self->m_shawableAreaY<<"px");
-	/*
-	EDN_INFO("widget width=%d", widget->allocation.width);
-	EDN_INFO("widget height=%d", widget->allocation.height);
-	*/
+	EDN_INFO("Edn request a display of : " << self->m_shawableAreaX << "px * "<<  self->m_shawableAreaY<<"px");
 
-	//EDN_INFO("BufferView Display");
 	// Get the color Manager :
 	ColorizeManager *myColorManager = NULL;
 	myColorManager = ColorizeManager::getInstance();
 	
-	//(void)m_bufferManager->Get(m_bufferID)->Display(m_displayParameters, m_shawableAreaX, m_shawableAreaY);
-	DrawerManager monDrawer(widget, self->m_shawableAreaX, self->m_shawableAreaY);
-	//EDN_INFO("Display buffer ID = " << m_bufferID);
-	(void)self->m_bufferManager->Get(self->m_bufferID)->Display(monDrawer);
-//	EDN_WARNING("Must display here ... ");
+	Buffer * tmpBuf = self->m_bufferManager->Get(self->m_bufferID);
+
+	#ifndef NDEBUG
+		GTimeVal timeStart;
+		g_get_current_time(&timeStart);
+	#endif
+	bufferAnchor_ts anchor;
+	
+	tmpBuf->AnchorSetSize(self->m_displayUniqueId, self->m_shawableAreaX, self->m_shawableAreaY);
+	bool enableToWrite = tmpBuf->AnchorGet(self->m_displayUniqueId, anchor);
+	DrawerManager monDrawer(widget, self->m_shawableAreaX, self->m_shawableAreaY, Display::GetFontHeight()*anchor.m_BufferNumberLineOffset);
+	
+	int32_t currentLineID = 0;
+	while (true == enableToWrite) {
+		if (true == anchor.m_redrawLine[currentLineID]) {
+			#ifndef NDEBUG
+				EDN_DEBUG("draw line=" << currentLineID << " realID=" << anchor.m_lineNumber );
+			#endif
+			tmpBuf->DrawLine(monDrawer, anchor);
+		}
+		enableToWrite = tmpBuf->AnchorNext(anchor);
+		currentLineID++;
+	}
+	monDrawer.Flush();
+	
+	// Need to clean the end of windows (sometimes)...
+	if(currentLineID<anchor.m_displaySize.y+1) {
+		for (int32_t iii=currentLineID; iii < anchor.m_displaySize.y; iii++) {
+			tmpBuf->DrawLineEmpty(monDrawer, iii);
+		}
+	}
+	#ifndef NDEBUG
+		GTimeVal timeStop;
+		g_get_current_time(&timeStop);
+		EDN_DEBUG("Display Generation = " << timeStop.tv_usec - timeStart.tv_usec << " micro-s ==> " << (timeStop.tv_usec - timeStart.tv_usec)/1000. << "ms");
+	#endif
 	return TRUE;
 }
 
-
-
-
 // sur : émis lors du premier affichage de la GtkDrawingArea
 gboolean CodeView::CB_displayInit( GtkWidget *widget, gpointer data)
 {
@@ -253,22 +279,15 @@ gboolean CodeView::CB_displayInit( GtkWidget *widget, gpointer data)
 #	ifdef USE_GTK_VERSION_3_0
 	GtkAllocation allocation;
 	gtk_widget_get_allocation(widget, &allocation);
-	int32_t size_x = allocation.width;
-	int32_t size_y = allocation.height;
-	
+	EDN_INFO("GTK+ request a diplay of : "<< allocation.width <<"px * "<< allocation.height <<"px");
 	self->m_shawableAreaX = allocation.width;
 	self->m_shawableAreaY = allocation.height;
 #	elif defined( USE_GTK_VERSION_2_0)
-	int32_t size_x = widget->allocation.width;
-	int32_t size_y = widget->allocation.height;
-	
+	EDN_INFO("GTK+ request a diplay of : "<< widget->allocation.width <<"px * "<< widget->allocation.height <<"px");
 	self->m_shawableAreaX = widget->allocation.width;
 	self->m_shawableAreaY = widget->allocation.height;
 #	endif
-	EDN_INFO("Request a diplay of : "<< size_x <<"px * "<< size_y <<"px");
-
 	gtk_widget_queue_draw( widget );
-
 	return TRUE;
 }
 
@@ -279,6 +298,12 @@ gint CodeView::CB_focusGet(	GtkWidget *widget, GdkEventFocus *event, gpointer da
 	GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
 #	endif
 	self->SendMessage(EDN_MSG__BUFFER_CHANGE_CURRENT, self->m_bufferID);
+#	ifdef USE_GTK_VERSION_2_0
+	Buffer * tmpBuf = self->m_bufferManager->Get(self->m_bufferID);
+	tmpBuf->AnchorRedrawAll(self->m_displayUniqueId);
+	// Force redraw of the widget
+	gtk_widget_queue_draw_area(self->m_widget, 0, 0, self->m_shawableAreaX, self->m_shawableAreaY);
+#	endif
 	EDN_INFO("Focus - In");
 	return FALSE;
 }
@@ -358,7 +383,7 @@ gint CodeView::CB_mouseButtonEvent(GtkWidget *widget, GdkEventButton *event, gpo
 			EDN_INFO("mouse-event BT3 PRESS");
 		}
 	} else {
-		EDN_INFO("mouse-event BT? PRESS");
+		EDN_INFO("mouse-event BT" << event->type <<" PRESS");
 	}
 	return true;
 }

Sources/CustumWidget/CodeView/CodeView.h

@@ -53,14 +53,18 @@ class CodeView : public MsgBroadcast
 
 	private:
 		// main windows widget : 
-		GtkWidget			* m_widget;
+		GtkWidget *         m_widget;
+		DrawerManager *     m_Drawer;
+		int32_t             m_displayUniqueId;
+		//position_ts         m_displayStart;                 //!< position where the display is starting
+		//position_ts         m_displaySize;                  //!< number of char displayable in the screan
 		// récupération des proprieter général...
-		BufferManager		* m_bufferManager;
-		ColorizeManager		* m_colorManager;
-		int32_t				  m_shawableAreaX;
-		int32_t				  m_shawableAreaY;
-		int32_t				  m_bufferID;
-		bool				  m_buttunOneSelected;
+		BufferManager *     m_bufferManager;
+		ColorizeManager *   m_colorManager;
+		int32_t             m_shawableAreaX;
+		int32_t             m_shawableAreaY;
+		int32_t             m_bufferID;
+		bool                m_buttunOneSelected;
 };
 #endif
 

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,15 +153,35 @@ MainWindows::~MainWindows(void)
 }
 
 
-void MainWindows::SetTitle(Edn::String &fileName, bool isModify)
+
+void MainWindows::SetTitle(Edn::File &fileName, bool isModify)
 {
 	Edn::String tmp = "";
-	if (fileName != "") {
-		tmp += fileName;
+	if (fileName.GetShortFilename() != "") {
+		tmp += fileName.GetShortFilename();
+		tmp += " - ";
+		tmp += fileName.GetFolder();
 		tmp += " - ";
 	}
 	tmp += "Edn";
 	gtk_window_set_title(GTK_WINDOW(m_mainWindow), tmp.c_str());
+	tmp = "  ";
+	if (fileName.GetShortFilename() != "") {
+		tmp = fileName.GetFolder();
+		tmp += "/";
+		tmp += fileName.GetShortFilename();
+	} else {
+		tmp = "Edn";
+	}
+	gtk_label_set_text(GTK_LABEL(m_internalTitleLabel), tmp.c_str());
+	
+}
+
+void MainWindows::SetNoTitle(void)
+{
+	Edn::String tmp = "Edn";
+	gtk_window_set_title(GTK_WINDOW(m_mainWindow), tmp.c_str());
+	gtk_label_set_text(GTK_LABEL(m_internalTitleLabel), tmp.c_str());
 }
 
 void MainWindows::OnMessage(int32_t id, int32_t dataID)
@@ -112,80 +192,46 @@ void MainWindows::OnMessage(int32_t id, int32_t dataID)
 			// change Title :
 			// TODO : String error when remove the error with -1;
 			if (-1 == dataID) {
-				Edn::String plop = "";
-				SetTitle(plop, false );
+				SetNoTitle();
 			} else {
 				Buffer *mybuf = BufferManager::getInstance()->Get(dataID);
 				if (NULL != mybuf) {
-					Edn::String plop = mybuf->GetName();
+					Edn::File plop = mybuf->GetFileName();
 					SetTitle(plop, mybuf->IsModify() );
 				}
 			}
 			break;
-		case EDN_MSG__QUIT:
-			OnQuit(m_mainWindow, this);
-			break;
 	}
 }
 
 bool MainWindows::OnQuit(GtkWidget *widget, gpointer data)
 {
-	EDN_INFO("quit requested");
-	// dlg to confirm the quit event : 
-	GtkWidget *p_dialog = gtk_dialog_new_with_buttons("Exit",
-	                                                  GTK_WINDOW(widget),
-	                                                  GTK_DIALOG_MODAL,
-	                                                  GTK_STOCK_YES, GTK_RESPONSE_YES,
-	                                                  GTK_STOCK_NO, GTK_RESPONSE_NO,
-	                                                  NULL);
-	GtkWidget *p_label =  gtk_label_new ("Do you want exit Edn?");
-	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area( GTK_DIALOG(p_dialog) )), p_label, TRUE, TRUE, 0);
-	
-	gtk_widget_show(p_label);
-	
-	switch (gtk_dialog_run (GTK_DIALOG (p_dialog)))
-	{
-		case GTK_RESPONSE_YES:
-			gtk_widget_destroy (p_dialog);
-			
-			break;
-		case GTK_RESPONSE_NO:
-			gtk_widget_destroy (p_dialog);
-			// do not close the windows
-			return true;
-			break;
-	}
-	
-	gtk_main_quit();
-	return false;
+	//MainWindows * self = reinterpret_cast<MainWindows*>(data);
+	GeneralSendMessage(EDN_MSG__GUI_SHOW_EXIT_CONFIRMATION);
+	// Close is not managed here ...
+	return true;
 }
 
 
-#if 0
-
-void MainWindows::OnMenuAbout(wxCommandEvent & WXUNUSED(event))
+gboolean MainWindows::OnStateChange(GtkWidget *widget, GdkEvent* event, gpointer data)
 {
-	//EDN_INFO("MainWindows::OnMenuAbout (event)");
-	wxAboutDialogInfo info;
-	info.SetName(wxT("edn"));
-	info.SetVersion(wxT("0.1.0 pre-Beta"));
-	info.SetDescription(wxT("Editeur De N'ours, l'Editeur Desoxyribo-Nucleique\n"
-							"Source Code Editor"));
-	info.SetCopyright(wxT(	"Copyright 2010 Edouard DUPIN, all right reserved\n"
-							"This software is distributed in the hope that it will be useful, but WITHOUT\n"
-							"ANY WARRANTY\n\n"
-							"Licence summary : \n"
-							"   You can modify and redistribute the sources code and binaries.\n"
-							"   You can send me the bug-fix\n"
-							"   You can not earn money with this Software (if the source extract from Edn\n"
-							"       represent less than 50% of original Sources)\n"
-							"Term of the licence in in the file licence.txt"));
-	wxAboutBox(info);
-
+	MainWindows * self = reinterpret_cast<MainWindows*>(data);
+	EDN_DEBUG("State change");
+	EDN_INFO(" change state mask : " << event->window_state.changed_mask);
+	EDN_INFO(" change state new val : " << event->window_state.new_window_state);
+	if (event->window_state.changed_mask == GDK_WINDOW_STATE_MAXIMIZED) {
+		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);
+			
+		}
+	}
 }
 
-#endif
-
 
 
 

Sources/GuiTools/MainWindows/MainWindows.h

@@ -51,11 +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::String &fileName, bool isModify);
+		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 : 
@@ -189,7 +217,7 @@ class MenuBarMain
 		GtkWidget *       m_parent;
 		GtkWidget *       m_menu;
 		GtkWidget *       m_menuListe;
-		EdnVectorBin<messageData_ts*>    m_message;
+		Edn::VectorType<messageData_ts*>    m_message;
 };
 
 #undef __class__
@@ -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,23 +248,16 @@ 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);
+		tmp->AddSeparator();
+		tmp->AddGen("Goto Line number ...",        "ctrl+l",       EDN_MSG__GUI_SHOW_GOTO_LINE, true);
 //		tmp->AddSeparator();
 //		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);
@@ -250,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);
@@ -258,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("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/MainWindows/MenuBar.h

@@ -26,7 +26,7 @@
 #include "tools_debug.h"
 #include "tools_globals.h"
 #include "MsgBroadcast.h"
-#include "EdnVectorBin.h"
+#include "VectorType.h"
 #include "AccelKey.h"
 
 #ifndef __MENU_BAR_H__
@@ -46,7 +46,7 @@ class MenuBar: public MsgBroadcast
 	private:
 		GtkWidget *                     m_mainWidget;
 		GtkAccelGroup *                 m_accelGroup;
-		EdnVectorBin<MenuBarMain*>      m_listMenu;
+		Edn::VectorType<MenuBarMain*>   m_listMenu;
 };
 
 

Sources/GuiTools/MainWindows/ToolBar.h

@@ -42,7 +42,7 @@ class ToolBar: public MsgBroadcast
 		void AddSeparator(void);
 		void Add(const char * title, const char * labelHelp, messageType_te id = EDN_MSG__NONE, bool enable = false);
 		GtkWidget *                      m_mainWidget;
-		EdnVectorBin<messageData_ts*>    m_message;
+		Edn::VectorType<messageData_ts*>    m_message;
 };
 
 

Sources/GuiTools/Search/Search.cpp

@@ -56,13 +56,22 @@ Search::~Search(void)
 	}
 }
 
-void Search::Display(void)
+void Search::Display(GtkWindow *parent)
 {
 	if(NULL == m_localDialog) {
 		m_localDialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+		// set dialog not resisable
 		gtk_window_set_resizable(GTK_WINDOW(m_localDialog), FALSE);
-		gtk_window_set_keep_above(GTK_WINDOW(m_localDialog), TRUE);
-		
+		// set the windows alwais on top of every all system windows
+		//gtk_window_set_keep_above(GTK_WINDOW(m_localDialog), TRUE);
+		// Set the dialog on top of the selected windows
+		gtk_window_set_transient_for(GTK_WINDOW(m_localDialog), parent);
+		// set the dialog on the top right
+		gtk_window_set_gravity(GTK_WINDOW(m_localDialog), GDK_GRAVITY_NORTH_EAST);
+		// Remove the dialogue from the task bar
+		gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_localDialog), TRUE);
+		// this element did not apear in the miniature of the windows
+		gtk_window_set_skip_pager_hint(GTK_WINDOW(m_localDialog), TRUE);
 		// select the program icone
 		//gtk_window_set_default_icon_name("Replace");
 		
@@ -183,9 +192,9 @@ void Search::Display(void)
 		} 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())) {
 			m_haveSearchData = false;
@@ -203,13 +212,14 @@ void Search::Display(void)
 		
 		gtk_widget_set_sensitive(m_BtPrevious, m_haveSearchData);
 		gtk_widget_set_sensitive(m_BtNext, m_haveSearchData);
-		if (false == m_haveSearchData) {
-			gtk_widget_set_sensitive(m_BtReplace, false);
-			gtk_widget_set_sensitive(m_BtReplaceAndNext, false);
-		} else {
-			gtk_widget_set_sensitive(m_BtReplace, m_haveReplaceData);
-			gtk_widget_set_sensitive(m_BtReplaceAndNext, m_haveReplaceData);
-		}
+		// basic no search data
+		gtk_widget_set_sensitive(m_BtReplace, false);
+		gtk_widget_set_sensitive(m_BtReplaceAndNext, false);
+		
+		
+		// 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);
@@ -318,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_BtReplaceAndNext, self->m_haveReplaceData);
+			gtk_widget_set_sensitive(self->m_BtReplace, true);
+			gtk_widget_set_sensitive(self->m_BtReplaceAndNext, true);
 		}
 	}
 }
@@ -338,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);
-		gtk_widget_set_sensitive(self->m_BtReplaceAndNext, self->m_haveReplaceData);
+		if (false == self->m_haveSearchData) {
+			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>
@@ -43,7 +41,7 @@ class Search: public Singleton<Search>
 
 	public:
 		void Destroy(void);
-		void Display(void);
+		void Display(GtkWindow *parent);
 		void Hide(void);
 
 	private:

Sources/GuiTools/WindowsManager/WindowsManager.cpp

@@ -76,7 +76,7 @@ void WindowsManager::OnMessage(int32_t id, int32_t dataID)
 			EDN_INFO("Request opening SEARCH");
 			{
 				Search *myInstance = Search::getInstance();
-				myInstance->Display();
+				myInstance->Display(GTK_WINDOW(m_mainWindow->GetWidget()));
 			}
 			break;
 		case EDN_MSG__GUI_SHOW_PREFERENCE:
@@ -93,21 +93,21 @@ 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_RESPONSE_CANCEL, // response id
-				                                                 GTK_STOCK_OPEN, // button text
-				                                                 GTK_RESPONSE_ACCEPT, // response id
+				                                                 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+				                                                 GTK_STOCK_OPEN,   GTK_RESPONSE_ACCEPT,
 				                                                 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);
 				if(    -1   != m_currentBufferID
 				    && true == myBufferManager->Exist(m_currentBufferID) )
 				{
-					Edn::String fileFolder = myBufferManager->Get(m_currentBufferID)->GetFolder();
-					gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER(dialog), fileFolder.c_str());
-					//gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER(dialog), "Untitled document");
+					Edn::File fileName = myBufferManager->Get(m_currentBufferID)->GetFileName();
+					gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), fileName.GetFolder().c_str());
+					gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), fileName.GetShortFilename().c_str());
 				}
 				if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
 				{
-					Edn::String myfilename;
+					Edn::File myfilename;
 					myfilename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER (dialog));
 
 					if (false == myBufferManager->Exist(myfilename) ) {
@@ -132,20 +132,20 @@ void WindowsManager::OnMessage(int32_t id, int32_t dataID)
 				}
 				Buffer *myBuffer = BufferManager::getInstance()->Get(idSelected);
 				Edn::String tmpString = "Save as file : ";
-				tmpString += myBuffer->GetShortName().c_str();
+				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_RESPONSE_CANCEL, // response id
-				                                                 GTK_STOCK_SAVE, // button text
-				                                                 GTK_RESPONSE_ACCEPT, // response id
+				                                                 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+				                                                 GTK_STOCK_SAVE,   GTK_RESPONSE_ACCEPT,
 				                                                 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);
 				if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
 				{
 					Edn::String myfilename;
 					myfilename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER (dialog));
 					
-					myBuffer->SetName(myfilename);
+					myBuffer->SetFileName(myfilename);
 					myBuffer->Save();
 					
 					SendMessage(EDN_MSG__CURRENT_CHANGE_BUFFER_ID, idSelected);
@@ -154,30 +154,167 @@ void WindowsManager::OnMessage(int32_t id, int32_t dataID)
 			}
 			break;
 		case EDN_MSG__GUI_SHOW_ABOUT:
+			{
+				GtkWidget  *myDialog = gtk_about_dialog_new();
+				gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(myDialog), "Edn");
+				gtk_about_dialog_set_version(     GTK_ABOUT_DIALOG(myDialog), VERSION_TAG_NAME);
+				gtk_about_dialog_set_comments(    GTK_ABOUT_DIALOG(myDialog), "Editeur De N'ours\n"
+				                                                              "L'Editeur Desoxyribo-Nucleique.\n"
+				                                                              "Source Code Editor\n"
+				                                                              "Build Time : " VERSION_BUILD_TIME);
+				gtk_about_dialog_set_copyright(   GTK_ABOUT_DIALOG(myDialog), "Copyright 2010 Edouard DUPIN, all right reserved");
+				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"
+				                                                              "You can:\n"
+				                                                              "    * Redistribute the sources code and binaries.\n"
+				                                                              "    * Modify the Sources code.\n"
+				                                                              "    * Use a part of the sources (less than 50%) in an other software, just write somewhere \"Edn is great\" visible by the user (on your product or on your website with a link to my page).\n"
+				                                                              "    * Redistribute the modification only if you want.\n"
+				                                                              "    * Send me the bug-fix (it could be great).\n"
+				                                                              "    * Pay me a beer or some other things.\n"
+				                                                              "    * Print the source code on WC paper ...\n\n"
+				                                                              "You can NOT:\n"
+				                                                              "    * Earn money with this Software (But I can).\n"
+				                                                              "    * Add malware in the Sources.\n"
+				                                                              "    * Do something bad with the sources.\n"
+				                                                              "    * Use it to travel in the space with a toaster.\n\n"
+				                                                              "I reserve the right to change this licence. If it change the version of the copy you have keep its own license.");
+				gtk_about_dialog_set_wrap_license(GTK_ABOUT_DIALOG(myDialog), true);
+#				if USE_GTK_VERSION_3_0
+				gtk_about_dialog_set_license_type(GTK_ABOUT_DIALOG(myDialog), GTK_LICENSE_CUSTOM);
+#				endif
+				gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(myDialog), "http://HeeroYui.github.com/edn");
+				gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(myDialog), "Edn on github");
+				const char * listAutor[] = {"Edouard DUPIN", NULL};
+				gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(myDialog), listAutor);
+				// Display About
+				gtk_dialog_run(GTK_DIALOG(myDialog));
+				gtk_widget_destroy(myDialog);
+			}
+			break;
+		case EDN_MSG__GUI_SHOW_GOTO_LINE:
 			{
 				// dlg to confirm the quit event : 
-				GtkWidget *p_dialog = gtk_dialog_new_with_buttons("About",
-				                                                  NULL,
+				GtkWidget *myDialog = gtk_dialog_new_with_buttons("Goto Line",
+				                                                  GTK_WINDOW(m_mainWindow->GetWidget()),
+				                                                  GTK_DIALOG_MODAL,
+				                                                  "Jump", GTK_RESPONSE_YES,
+				                                                  GTK_STOCK_QUIT, GTK_RESPONSE_NO,
+				                                                  NULL);
+				// this element did not apear in the miniature of the windows
+				gtk_window_set_skip_pager_hint(GTK_WINDOW(myDialog), TRUE);
+				// 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 *myEntry =  gtk_entry_new();
+				gtk_box_pack_start(GTK_BOX(myContentArea), myEntry, TRUE, TRUE, 0);
+				// Display it
+				gtk_widget_show_all(myContentArea);
+				int32_t result = gtk_dialog_run (GTK_DIALOG (myDialog));
+				// Get data from the gtk entry
+				const char *myData = gtk_entry_get_text(GTK_ENTRY(myEntry));
+				if (NULL != myData) {
+					int32_t lineID=0;
+					if (1==sscanf(myData, "%d",&lineID)) {
+						EDN_DEBUG("find in : \"" << myData << "\" = " << lineID);
+						if(GTK_RESPONSE_YES == result) {
+							SendMessage(EDN_MSG__CURRENT_GOTO_LINE, lineID-1);
+						}
+					} else {
+						if (GTK_RESPONSE_YES == result) {
+							EDN_WARNING("find in : \"" << myData << "\" line Number is not correct ");
+						}
+					}
+				} else {
+					EDN_DEBUG("no line Writen ...");
+				}
+				// Remove dialogue
+				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?");
+				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);
-				int32_t result = gtk_dialog_run (GTK_DIALOG (p_dialog));
-				gtk_widget_destroy(p_dialog);
-				switch (result)
+				
+				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);
 }
 
 
@@ -52,7 +52,7 @@ Highlight::Highlight(Edn::String &xmlFilename)
 	// open the curent File
 	bool loadError = XmlDocument.LoadFile(xmlFilename.c_str());
 	if (false == loadError) {
-		EDN_ERROR( "can not load Hightlight XML: PARSING error: \"" << xmlFilename.c_str() << "\"");
+		EDN_ERROR( "can not load Hightlight XML: PARSING error: \"" << xmlFilename << "\"");
 		return;
 	}
 	TiXmlElement* root = XmlDocument.FirstChildElement( "EdnLang" );
@@ -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;
-				m_listExtentions.push_back(myEdnData);
+				Edn::String * myEdnData = new Edn::String(myData);
+				m_listExtentions.PushBack(myEdnData);
 			}
 		} else if (!strcmp(child->Value(), "pass1")) {
 			// Get sub Nodes ...
@@ -113,48 +113,68 @@ 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++) {
-		delete(m_listHighlightPass1[i]);
+	for (i=0; i< m_listHighlightPass1.Size(); 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;
-	for (i=0; i<m_listExtentions.size(); i++) {
-		if (ext == m_listExtentions[i] ) {
+	int32_t i;
+	for (i=0; i<m_listExtentions.Size(); i++) {
+		if (ext == *m_listExtentions[i] ) {
 			return true;
 		}
 	}
 	return false;
 }
 
-bool Highlight::FileNameCompatible(Edn::String &fileName)
+bool Highlight::FileNameCompatible(Edn::File &fileName)
 {
-	uint32_t i;
-	int32_t posCopy = fileName.FindBack('/');
-	Edn::String shortFilename;
-	if (-1 != posCopy) {
-		shortFilename = fileName.Extract(posCopy+1);
-	} else {
-		shortFilename = fileName;
-	}
-	posCopy = shortFilename.FindBack('.');
+	int32_t i;
 	Edn::String extention;
-	if (-1 != posCopy) {
-		extention = shortFilename.Extract(posCopy);
+	if (true == fileName.HasExtention() ) {
+		extention = "*.";
+		extention += fileName.GetExtention();
 	} else {
-		extention = shortFilename;
+		extention = fileName.GetShortFilename();
 	}
-	EDN_DEBUG(" try to find : in \"" << fileName.c_str() << "\"  shortfilename\"" << shortFilename.c_str() << "\"  extention:\"" << extention.c_str() << "\" ");
+	EDN_DEBUG(" try to find : in \"" << fileName << "\" extention:\"" << extention << "\" ");
 
-	for (i=0; i<m_listExtentions.size(); i++) {
-		if (extention == m_listExtentions[i] ) {
+	for (i=0; i<m_listExtentions.Size(); i++) {
+		if (extention == *m_listExtentions[i] ) {
 			return true;
 		}
 	}
@@ -164,134 +184,119 @@ bool Highlight::FileNameCompatible(Edn::String &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++) {
-		EDN_INFO("        Extention : " << i << " : " << m_listExtentions[i].c_str() );
+	for (i=0; i< m_listExtentions.Size(); i++) {
+		EDN_INFO("        Extention : " << i << " : " << *m_listExtentions[i] );
 	}
 	// Display all elements
-	for (i=0; i< m_listHighlightPass1.size(); i++) {
-		EDN_INFO("        " << i << " Pass 1 : " << m_listHighlightPass1[i]->GetName().c_str() );
+	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++) {
-		EDN_INFO("        " << i << " Pass 2 : " << m_listHighlightPass2[i]->GetName().c_str() );
+	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;
-	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;
-	}
+	//EDN_DEBUG("Parse element 0 => " << m_listHighlightPass1.Size() << " ==> position search: (" << start << "," << stop << ")" );
 	int32_t elementStart = start;
 	int32_t elementStop = stop;
-	resultFind_te ret = HLP_FIND_OK;
 	colorInformation_ts resultat;
-	while (HLP_FIND_ERROR != ret && elementStart<elementStop) {
-		ret = m_listHighlightPass1[elementID]->Find(elementStart, elementStop, resultat, buffer);
-		if (HLP_FIND_ERROR != ret) {
-			//EDN_INFO("Find Pattern in the Buffer : (" << resultat.beginStart << "," << resultat.endStop << ")" );
-			// Add curent element in the list ...
-			if (HLP_FIND_OK_NO_END == ret) {
-				// find if we have a next element with th save Pointer and not higher the this one
-				int32_t findNextElement = -1;
-				int32_t i;
-				int32_t curentLevel = ((HighlightPattern*)resultat.patern)->GetLevel();
-				for (i=addingPos; i< (int32_t)metaData.size(); i++) {
-					if (curentLevel > ((HighlightPattern*)metaData[i].patern)->GetLevel() ) {
-						//EDN_DEBUG("    -> Find upper element at "<< i );
-						break;
-					} else if (curentLevel < ((HighlightPattern*)metaData[i].patern)->GetLevel() ) {
-						findNextElement = i;
-						//EDN_DEBUG("    -> Find under element at "<< i );
-					}
-					if (metaData[i].patern == resultat.patern)
-					{
-						findNextElement = i;
-						//EDN_DEBUG("    -> Find a same element at "<< i );
-						break;
-					}
-				}
-
-				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());
+	while (elementStart<elementStop) {
+		//EDN_DEBUG("Parse element in the buffer id=" << elementStart);
+		//try to fond the HL in ALL of we have
+		for (int32_t jjj=0; jjj<m_listHighlightPass1.Size(); jjj++){
+			resultFind_te ret = HLP_FIND_OK;
+			//EDN_DEBUG("Parse HL id=" << jjj << " position search: (" << start << "," << buffer.Size() << ")" );
+			// Stop the search to the end (to get the end of the pattern)
+			ret = m_listHighlightPass1[jjj]->Find(elementStart, buffer.Size(), resultat, buffer);
+			if (HLP_FIND_ERROR != ret) {
+				//EDN_INFO("Find Pattern in the Buffer : (" << resultat.beginStart << "," << resultat.endStop << ")" );
+				// Remove element in the current List where the current Element have a end inside the next...
+				int32_t kkk=addingPos;
+				while(kkk < metaData.Size() ) {
+					if (metaData[kkk].beginStart <= resultat.endStop) {
+						// Remove element
+						//EDN_INFO("Erase element=" << kkk);
+						metaData.EraseLen(kkk, kkk+1);
+						// Increase the end of search
+						if (kkk < metaData.Size()) {
+							// just befor the end of the next element
+							elementStop = metaData[kkk].beginStart-1;
+						} else {
+							// end of the buffer
+							elementStop = buffer.Size();
+						}
 					} else {
-						// Remove old element : 
-						//EDN_DEBUG("        --> Remove : " << addingPos << "==>" << findNextElement+1 );
-						metaData.erase(metaData.begin()+addingPos,metaData.begin()+findNextElement+1);
-						newEnd   = metaData[addingPos].beginStart-1;
+						// Not find ==> exit the cycle : 
+						break;
 					}
-					// 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 {
-				metaData.insert(metaData.begin() + addingPos, resultat);
+				// Add curent element in the list ...
+				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() ){
-		return;
-	}
+	//EDN_DEBUG("Parse element 0 => " << m_listHighlightPass2.size() << " ==> position search: (" << start << "," << stop << ")" );
 	int32_t elementStart = start;
 	int32_t elementStop = stop;
-	resultFind_te ret = HLP_FIND_OK;
 	colorInformation_ts resultat;
-	while (HLP_FIND_ERROR != ret && elementStart<elementStop) {
-		if (m_listHighlightPass2[elementID]!=NULL) {
-			ret = m_listHighlightPass2[elementID]->Find(elementStart, elementStop, resultat, buffer);
-		} else {
-			ret = HLP_FIND_ERROR;
-		}
-		if (HLP_FIND_ERROR != ret) {
-			//EDN_INFO("Find Pattern in the Buffer : (" << resultat.beginStart << "," << resultat.endStop << ")" );
-			// parse the under element :
-			Parse2(elementStart, resultat.beginStart, metaData, buffer, elementID+1);
-			// Add curent element in the list ...
-			metaData.push_back(resultat);
-			elementStart = resultat.endStop;
+	while (elementStart<elementStop) {
+		//EDN_DEBUG("Parse element in the buffer id=" << elementStart);
+		//try to fond the HL in ALL of we have
+		int32_t jjj;
+		for (jjj=0; jjj<m_listHighlightPass2.Size(); jjj++){
+			resultFind_te ret = HLP_FIND_OK;
+			//EDN_DEBUG("Parse HL id=" << jjj << " position search: (" << start << "," << buffer.Size() << ")" );
+			// Stop the search to the end (to get the end of the pattern)
+			ret = m_listHighlightPass2[jjj]->Find(elementStart, elementStop, resultat, buffer);
+			if (HLP_FIND_ERROR != ret) {
+				//EDN_INFO("Find Pattern in the Buffer : (" << resultat.beginStart << "," << resultat.endStop << ")" );
+				// Add curent element in the list ...
+				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"
 
@@ -55,17 +54,24 @@ class Highlight {
 		Highlight(Edn::String &xmlFilename);
 		~Highlight(void);
 		bool HasExtention(Edn::String &ext);
-		bool FileNameCompatible(Edn::String &fileName);
+		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 Parse2(int32_t start, int32_t stop, std::vector<colorInformation_ts> &metaData, EdnVectorBuf &buffer, int32_t elementID=0);
-
+		void ReloadColor(void);
+		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);
-		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"
-		std::vector<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)) )
+		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::VectorType<Edn::String*>       m_listExtentions;          //!< List of possible extention for this high-light, like : ".c", ".cpp", ".h"
+		Edn::VectorType<HighlightPattern*>  m_listHighlightPass1;      //!< List of ALL hightlight modules (pass 1 ==> when we load and wride data on the buffer)
+		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();
 }
 
 
-Highlight *HighlightManager::Get(Edn::String &fileName)
+void HighlightManager::OnMessage(int32_t id, int32_t dataID)
 {
-	uint32_t i;
-	for (i=0; i<listHighlight.size(); i++) {
+	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;
+	for (i=0; i<listHighlight.Size(); i++) {
 		if (true == listHighlight[i]->FileNameCompatible(fileName) ) {
 			return listHighlight[i];
 		}
@@ -52,13 +76,10 @@ Highlight *HighlightManager::Get(Edn::String &fileName)
 	return NULL;
 }
 
-bool HighlightManager::Exist(Edn::String &fileName)
+bool HighlightManager::Exist(Edn::File &fileName)
 {
-	uint32_t i;
-	for (i=0; i<listHighlight.size(); i++) {
-		if (true == listHighlight[i]->FileNameCompatible(fileName) ) {
-			return true;
-		}
+	if (NULL != Get(fileName) ) {
+		return true;
 	}
 	return false;
 }
@@ -68,37 +89,51 @@ void HighlightManager::loadLanguages(void)
 {
 	Edn::String homedir;
 #ifdef NDEBUG
-	homedir = getenv("HOME");
-	homedir += "/.edn/";
+	homedir = "/usr/share/edn/";
 #else
-	homedir = "./";
+	homedir = "./data/";
 #endif
 
 	Edn::String xmlFilename = homedir;
-	xmlFilename += "data/lang_c.xml";
+	xmlFilename += "lang_c.xml";
 	Highlight *myHightline = new Highlight(xmlFilename);
-	listHighlight.push_back(myHightline);
+	listHighlight.PushBack(myHightline);
 	
 	xmlFilename = homedir;
-	xmlFilename += "data/lang_boo.xml";
+	xmlFilename += "lang_boo.xml";
 	myHightline = new Highlight(xmlFilename);
-	listHighlight.push_back(myHightline);
+	listHighlight.PushBack(myHightline);
 	
 	xmlFilename = homedir;
-	xmlFilename += "data/lang_Makefile.xml";
+	xmlFilename += "lang_Makefile.xml";
 	myHightline = new Highlight(xmlFilename);
-	listHighlight.push_back(myHightline);
+	listHighlight.PushBack(myHightline);
 	
 	xmlFilename = homedir;
-	xmlFilename += "data/lang_asm.xml";
+	xmlFilename += "lang_asm.xml";
 	myHightline = new Highlight(xmlFilename);
-	listHighlight.push_back(myHightline);
+	listHighlight.PushBack(myHightline);
 	
 	xmlFilename = homedir;
-	xmlFilename += "data/lang_xml.xml";
+	xmlFilename += "lang_xml.xml";
 	myHightline = new Highlight(xmlFilename);
-	listHighlight.push_back(myHightline);
+	listHighlight.PushBack(myHightline);
 	
-	myHightline->Display();
+	xmlFilename = homedir;
+	xmlFilename += "lang_php.xml";
+	myHightline = new Highlight(xmlFilename);
+	listHighlight.PushBack(myHightline);
+	
+	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 <string>
+#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...
@@ -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::String &fileName);
-		bool		  Exist(Edn::String &fileName);
+		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

@@ -39,8 +39,8 @@ HighlightPattern::HighlightPattern(void)
 	m_multiline = false;
 	ColorizeManager *myColorManager = ColorizeManager::getInstance();
 	m_color = myColorManager->Get("normal");
-	m_regExpStart = new EdnRegExp();
-	m_regExpStop = new EdnRegExp();
+	m_regExpStart = new EdnRegExp<EdnVectorBuf>();
+	m_regExpStop = new EdnRegExp<EdnVectorBuf>();
 	m_escapeChar = 0;
 }
 
@@ -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
  *
@@ -98,10 +105,10 @@ bool HighlightPattern::IsEnable(void)
 void HighlightPattern::Display(void)
 {
 	/*
-	EDN_INFO("patern : \"" << m_paternName.c_str() << "\" level=" << m_level );
-	EDN_INFO(" ==> colorName \"" << m_colorName.c_str() << "\"");
-	EDN_INFO(" ==> regExpStart \"" << m_regExpStart->GetRegExp().c_str() << "\"");
-	EDN_INFO(" ==> regExpStop \"" << m_regExpStop->GetRegExp().c_str() << "\"");
+	EDN_INFO("patern : \"" << m_paternName << "\" level=" << m_level );
+	EDN_INFO(" ==> colorName \"" << m_colorName << "\"");
+	EDN_INFO(" ==> regExpStart \"" << m_regExpStart->GetRegExp() << "\"");
+	EDN_INFO(" ==> regExpStop \"" << m_regExpStop->GetRegExp() << "\"");
 	if (true == m_haveStopPatern) {
 		EDN_INFO(" ==> stop pattern: YES");
 	} else {
@@ -115,7 +122,7 @@ void HighlightPattern::Display(void)
 	*/
 	// Display all elements
 	for (int32_t i=0; i< m_subPatern.Size(); i++) {
-		EDN_INFO("        " << i << " SubPattern : " << m_subPatern[i]->GetName().c_str() );
+		EDN_INFO("        " << i << " SubPattern : " << m_subPatern[i]->GetName() );
 		m_subPatern[i]->Display();
 	}
 }
@@ -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

@@ -22,17 +22,20 @@
  *
  *******************************************************************************
  */
- 
+
+#include "Highlight.h"
+
 #ifndef __HIGHLIGHT_PATTERN_H__
 #define __HIGHLIGHT_PATTERN_H__
 
 class HighlightPattern;
 
 #include "Edn.h"
-#include "EdnRegExp.h"
+#include "RegExp.h"
 #include "Colorize.h"
-#include "EdnVectorBin.h"
+#include "VectorType.h"
 #include "tinyxml.h"
+#include "EdnVectorBuf.h"
 
 typedef enum {
 	HLP_FIND_ERROR,
@@ -48,36 +51,38 @@ 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);
-		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);
+		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);
+		
+		void            ReloadColor(void);
 
 	private:
-		int32_t								m_level;					//!< Level of the pattern ==> this is to overwrite next pattern when we create an higher ....
-		Edn::String							m_paternName;				//!< Current style name (like "c++" or "c" or "script Bash")
-		Edn::String							m_colorName;				//!< Current color name
-		Colorize *							m_color;					//!< Link to the color manager
-		EdnRegExp *							m_regExpStart;				//!< Start of Regular expression
-		EdnRegExp *							m_regExpStop;				//!< Stop of Regular Expression
-		bool								m_haveStopPatern;			//!< Stop patern presence
-		bool								m_multiline;				//!< The patern is multiline
-		char								m_escapeChar;				//!< Escape char to prevent exeit of patern ....
-		EdnVectorBin<HighlightPattern *>	m_subPatern;				//!< Under patern of this one
-//		EdnVectorBin<HighlightPattern *>	m_subColor;					//!< Under Color in the start RegExp ...
+		int32_t                             m_level;                    //!< Level of the pattern ==> this is to overwrite next pattern when we create an higher ....
+		Edn::String                         m_paternName;               //!< Current style name (like "c++" or "c" or "script Bash")
+		Edn::String                         m_colorName;                //!< Current color name
+		Colorize *                          m_color;                    //!< Link to the color manager
+		EdnRegExp<EdnVectorBuf> *           m_regExpStart;              //!< Start of Regular expression
+		EdnRegExp<EdnVectorBuf> *           m_regExpStop;               //!< Stop of Regular Expression
+		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_subColor;                 //!< Under Color in the start RegExp ...
 };
 
 #endif

Sources/ctags/CTagsManager.cpp

@@ -99,10 +99,8 @@ void CTagsManager::OnMessage(int32_t id, int32_t dataID)
 			{
 				GtkWidget *dialog = gtk_file_chooser_dialog_new( "Open Exuberant Ctags File", NULL,
 				                                                 GTK_FILE_CHOOSER_ACTION_OPEN,
-				                                                 GTK_STOCK_CANCEL, // button text
-				                                                 GTK_RESPONSE_CANCEL, // response id
-				                                                 GTK_STOCK_OPEN, // button text
-				                                                 GTK_RESPONSE_ACCEPT, // response id
+				                                                 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+				                                                 GTK_STOCK_OPEN,   GTK_RESPONSE_ACCEPT,
 				                                                 NULL); // end button/response list
 				if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
 				{
@@ -121,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;
 			
 	}
@@ -141,7 +154,7 @@ void CTagsManager::LoadTagFile(void)
 		return;
 	}
 	// load (open) the tag file : 
-	EDN_INFO("try to open tag file : " << m_tagFilename.c_str());
+	EDN_INFO("try to open tag file : " << m_tagFilename);
 	m_ctagFile = tagsOpen(m_tagFilename.c_str(), &info);
 	if (NULL != m_ctagFile) {
 		EDN_INFO("open exuberant Ctags file is OK ...");
@@ -157,21 +170,192 @@ 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::String currentFilename = myBufferManager->Get(bufferID)->GetName();
-	int32_t currentLineId = 0;
-	Edn::File * currentFile = new Edn::File(currentFilename);
+	Edn::File currentFilename = myBufferManager->Get(bufferID)->GetFileName();
+}
+
+enum
+{
+	CTAGS_COL_FILE = 0,
+	CTAGS_COL_LINE_NUMBER,
+	CTAGS_NUM_COLS
+};
+
+void CTagsManager::cb_row(GtkTreeView *p_treeview,
+                          GtkTreePath * p_path,
+                          GtkTreeViewColumn * p_column,
+                          gpointer data)
+{
+	EDN_DEBUG("event");
+	CTagsManager * self = reinterpret_cast<CTagsManager*>(data);
 	
+	gchar * p_file=NULL;
+	gint lineNumber;
+	GtkTreeIter iter;
+	
+	
+	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;
+			}
+		}
+	}
+}
+
+
+
+GtkWidget * CTagsManager::CreateViewAndModel(void)
+{
+	
+	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),
+	                                            -1,
+	                                            "File",
+	                                            renderer,
+	                                            "text", CTAGS_COL_FILE,
+	                                            NULL);
+	
+	// Column 2
+	renderer = gtk_cell_renderer_text_new();
+	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view),
+	                                            -1,
+	                                            "lineNumber",
+	                                            renderer,
+	                                            "text", CTAGS_COL_LINE_NUMBER,
+	                                            NULL);
+	
+	// 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), 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;
+}
+
+
+
+
+
+int32_t CTagsManager::MultipleJump(void)
+{
+	// dlg to confirm the quit event : 
+	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(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(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);
+	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)
 {
+	m_currentList.Clear();
 	if (NULL != m_ctagFile) {
-		EdnVectorBin<int8_t> data;
+		Edn::VectorType<int8_t> data;
 		// get the middle button of the clipboard ==> represent the current selection ...
 		ClipBoard::Get(COPY_MIDDLE_BUTTON, data);
 		if (data.Size() == 0) {
@@ -181,32 +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");
-			BufferManager *myBufferManager = BufferManager::getInstance();
-			Edn::String destinationFilename = m_tagFolderBase;
-			destinationFilename += entry.file;
-			EDN_INFO(" OPEN the TAG file Destination : " << destinationFilename.c_str() );
-			if (false == myBufferManager->Exist(destinationFilename) ) {
-				// need to open the file : 
-				int32_t openID = myBufferManager->Open(destinationFilename);
-				SendMessage(EDN_MSG__CURRENT_CHANGE_BUFFER_ID, openID);
-			} else {
-				SendMessage(EDN_MSG__CURRENT_CHANGE_BUFFER_ID, myBufferManager->GetId(destinationFilename));
-			}
-			int32_t localId = myBufferManager->GetId(destinationFilename);
-			Edn::String pattern = entry.address.pattern;
-			EDN_DEBUG("try to find line with : \"" << pattern.c_str() << "\"" );
-			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.c_str() << "\"" );
-			int32_t destLine = myBufferManager->Get(localId)->FindLine(pattern);
-			SendMessage(EDN_MSG__CURRENT_GOTO_LINE, destLine);
-			/*
+			tagEntry entrySave = entry;
+			int32_t numberOfTags = 0;
+			
+			// For all tags : Save in an internal Structure :
 			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 {
@@ -215,21 +404,26 @@ void CTagsManager::JumpTo(void)
 	}
 }
 
-void CTagsManager::PrintTag (const tagEntry *entry)
+void CTagsManager::PrintTag (const tagEntry *entry, bool small)
 {
-	int i;
-	EDN_INFO("find Tag file : name=\"" << entry->name << "\" in file=\"" << entry->file 
-	<< "\" pattern=\"" <<entry->address.pattern 
-	<< "\" at line="<<entry->address.lineNumber);
-	
-	EDN_INFO("Extention field : ");
-	if (entry->kind != NULL  &&  entry->kind [0] != '\0') {
-		EDN_INFO("        kind : " << entry->kind);
-	}
-	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 );
+	if (small==true) {
+		EDN_INFO("find Tag file : name=\"" << entry->name << "\" in file=\"" << entry->file 
+			<< "\" at line="<< entry->address.lineNumber);
+	} else {
+		int i;
+		EDN_INFO("find Tag file : name=\"" << entry->name << "\" in file=\"" << entry->file 
+			<< "\" pattern=\"" <<entry->address.pattern 
+			<< "\" at line="<<entry->address.lineNumber);
+		
+		EDN_INFO("Extention field : ");
+		if (entry->kind != NULL  &&  entry->kind [0] != '\0') {
+			EDN_INFO("        kind : " << entry->kind);
+		}
+		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,8 +55,9 @@ class CTagsManager: public Singleton<CTagsManager>, public MsgBroadcast
 	private:
 		int32_t                    m_currentSelectedID;
 		void                       LoadTagFile(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;
@@ -56,7 +65,17 @@ class CTagsManager: public Singleton<CTagsManager>, public MsgBroadcast
 		// history system
 		void                       AddToHistory(int32_t bufferID);
 		int32_t                    m_historyPos;
-		EdnVectorBin<Edn::File*>   m_historyList;
+		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();
@@ -80,13 +78,14 @@ int main (int argc, char *argv[])
 	ColorizeManager *myColorManager = NULL;
 	myColorManager = ColorizeManager::getInstance();
 	Edn::String homedir;
+	//homedir = getenv("HOME");
 #ifdef NDEBUG
-	homedir = getenv("HOME");
-	homedir += "/.edn/";
+	homedir = "/usr/share/edn/";
 #else
-	homedir = "./";
+	homedir = "./data/";
 #endif
-	homedir += "data/color_black.xml";
+	//homedir += "color_black.xml";
+	homedir += "color_white.xml";
 	myColorManager->LoadFile( homedir.c_str() );
 	myColorManager->DisplayListOfColor();
 	
@@ -110,13 +109,8 @@ int main (int argc, char *argv[])
 	EDN_INFO("show list of files : ");
 	for( int32_t i=1 ; i<argc; i++) {
 		EDN_INFO("need load file : \"" << argv[i] << "\"" );
-		Edn::String myfile = "";
-		// Special case for the root file origin
-		if ('/' != argv[i][0]) {
-			myfile+=cCurrentPath;
-			myfile+="/";
-		}
-		myfile+=(char *)argv[i];
+		Edn::File myfile = (char *)argv[i];
+
 		if (false == myBufferManager->Exist(myfile) ) {
 			int32_t idBuffOpened = myBufferManager->Open(myfile);
 			if (1==i) {

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/ClipBoard/ClipBoard.cpp

@@ -35,7 +35,7 @@ note: la copy dans le :
    [1..9] : copy interne
        10 : bouton du milieux
 */
-static EdnVectorBin<int8_t> mesCopy[TOTAL_OF_CLICKBOARD];
+static Edn::VectorType<int8_t> mesCopy[TOTAL_OF_CLICKBOARD];
 
 
 void ClipBoard::Init(void)
@@ -47,13 +47,13 @@ void ClipBoard::Init(void)
 }
 
 
-void ClipBoard::Set(uint8_t clipboardID, EdnVectorBin<int8_t> &data)
+void ClipBoard::Set(uint8_t clipboardID, Edn::VectorType<int8_t> &data)
 {
 	// check if ID is correct
 	if(clipboardID >= TOTAL_OF_CLICKBOARD) {
 		EDN_WARNING("request ClickBoard id error");
 	} else if(0 == data.Size()) {
-		EDN_WARNING("request a copy of nothing");
+		EDN_INFO("request a copy of nothing");
 	} else if (COPY_STD == clipboardID) {
 		GtkClipboard * clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
 		gtk_clipboard_set_text(clipboard, (const gchar*)&data[0], data.Size() );
@@ -66,7 +66,7 @@ void ClipBoard::Set(uint8_t clipboardID, EdnVectorBin<int8_t> &data)
 }
 
 
-void ClipBoard::Get(uint8_t clipboardID, EdnVectorBin<int8_t> &data)
+void ClipBoard::Get(uint8_t clipboardID, Edn::VectorType<int8_t> &data)
 {
 	if(clipboardID >= TOTAL_OF_CLICKBOARD) {
 		EDN_WARNING("request ClickBoard id error");

Sources/tools/ClipBoard/ClipBoard.h

@@ -27,7 +27,7 @@
 #define __CLIP_BOARD_H__
 
 	#include "tools_debug.h"
-	#include "EdnVectorBin.h"
+	#include "VectorType.h"
 
 	#define TOTAL_OF_CLICKBOARD			(11)
 	#define COPY_MIDDLE_BUTTON			(10)
@@ -36,8 +36,8 @@
 	namespace ClipBoard
 	{
 		void	Init(void);
-		void	Set(uint8_t clipboardID, EdnVectorBin<int8_t> &data);
-		void	Get(uint8_t clipboardID, EdnVectorBin<int8_t> &data);
+		void	Set(uint8_t clipboardID, Edn::VectorType<int8_t> &data);
+		void	Get(uint8_t clipboardID, Edn::VectorType<int8_t> &data);
 	}
 
 #endif

Sources/tools/Display/Display.cpp

@@ -40,7 +40,7 @@
 #define FONT_ITALIC_YES	(1)
 
 
-// Variables privé du namespace
+// Variables priv<EFBFBD> du namespace
 #define		POLICE_NAME		"Monospace"
 
 #ifdef USE_GTK_VERSION_3_0
@@ -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)
 {
-	/*
-	charWidth = gdk_char_width(myFont[FONT_ITALIC_YES][FONT_BOLD_NO], 'Z');
-	EDN_INFO("Font Width = %d", charWidth);
-	charHeignt = gdk_char_height(myFont[FONT_ITALIC_YES][FONT_BOLD_NO], 'Z');
-	EDN_INFO("Font Height = %d", charHeignt);
-	*/
-	
-	m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_NO]		= cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-	m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_NO]		= cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_ITALIC, CAIRO_FONT_WEIGHT_NORMAL);
-	m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_YES]		= cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
-	m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_YES]		= cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_ITALIC, CAIRO_FONT_WEIGHT_BOLD);
+	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]);
-	free(m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_NO]);
-	free(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_NO][FONT_BOLD_NO]);
+	cairo_font_face_destroy(m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_NO]);
+	cairo_font_face_destroy(m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_YES]);
+	cairo_font_face_destroy(m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_YES]);
 }
 
 
@@ -134,6 +127,7 @@ cairo_font_face_t * Display::GetFont(bool bold, bool italic)
 #undef __class__
 #define __class__	"DrawerManager"
 
+//#define megaplop  mlkjmlk
 /**
  * @brief DrawerManager constructor : generate a memoryDC where we can draw everything...
  *
@@ -146,26 +140,56 @@ cairo_font_face_t * Display::GetFont(bool bold, bool italic)
  * @return ---
  *
  */
-DrawerManager::DrawerManager(GtkWidget * widget, int32_t x, int32_t y)
+DrawerManager::DrawerManager(GtkWidget * widget, int32_t x, int32_t y, int32_t scrollOffset)
 {
-
 	m_size.x = x;
 	m_size.y = y;
 	m_haveWork = false;
-	// Create the Cairo Element
 #   if USE_GTK_VERSION_3_0
-	m_cairo = gdk_cairo_create(gtk_widget_get_window(widget));
+	m_windows = gtk_widget_get_window(widget);
 #   elif USE_GTK_VERSION_2_0
-	m_cairo = gdk_cairo_create(widget->window);
+	m_windows = widget->window;
 #   endif
-	//cairo_translate(m_cairo, 0, 7);
-	cairo_set_source_rgb(m_cairo, 0, 0, 0);
-	cairo_paint(m_cairo);
-	cairo_set_font_size(m_cairo, POLICE_SIZE);
-	m_dataToDisplay[0] = '\0';
+
+	// Double buffer with previous copy management :
+	{
+		// Create the Cairo context from the current windows
+		cairo_t * cairoWindows = gdk_cairo_create(m_windows);
+		// inform that we nee a double buffer
+		GdkRectangle myRect = {0, 0, x, y};
+		gdk_window_begin_paint_rect(m_windows, &myRect);
+		// Create the Cairo context from the double Buffer just created
+		m_cairo = gdk_cairo_create(m_windows);
+		// Copy the previous display data from the current display to the double buffer area:
+		cairo_surface_t * drawableSurface = cairo_get_target(cairoWindows);
+		TranslateVertical(-1* scrollOffset);
+		cairo_set_source_surface(m_cairo, drawableSurface, 0, 0);
+		cairo_paint(m_cairo);
+		TranslateVertical(scrollOffset);
+		//cairo_surface_destroy(drawableSurface);
+		cairo_destroy(cairoWindows);
+	}
 	
 	cairo_scale(m_cairo, 1.0, 1.0);
 	
+#	ifndef NDEBUG
+		// for Test only : this remove slowly the old line that is not rewritten
+		cairo_set_source_rgb(m_cairo, 0, 0, 0);
+		cairo_set_source_rgba(m_cairo, 1, 1, 1, 0.05);
+		cairo_paint(m_cairo);
+#	endif
+	cairo_set_font_size(m_cairo, POLICE_SIZE);
+	m_dataToDisplay[0] = '\0';
+	
+	m_nbElement = 0;
+	
+	// http://cairographics.org/FAQ/#clear_a_surface
+	// http://gtk.developpez.com/faq/?page=gtkwidget#GTK_WIDGET_transparent
+	//cairo_set_source_rgba(m_cairo, 1, 1, 1, 0);
+	//cairo_set_operator(m_cairo, CAIRO_OPERATOR_SOURCE);
+	//cairo_paint(m_cairo);
+	//cairo_fill(m_cairo);
+	//cairo_stroke (m_cairo);
 }
 
 
@@ -181,6 +205,9 @@ DrawerManager::DrawerManager(GtkWidget * widget, int32_t x, int32_t y)
  */
 DrawerManager::~DrawerManager()
 {
+	// call the painting of the double buffer in the displayed current buffer
+	gdk_window_end_paint(m_windows);
+	// Destroy cairo context
 	cairo_destroy(m_cairo);
 }
 
@@ -235,7 +262,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);
@@ -279,16 +305,15 @@ void DrawerManager::SpaceText(color_ts & SelectColor, int32_t x, int32_t y,int32
 void DrawerManager::Flush(void)
 {
 	if (true == m_haveWork) {
-		//EDN_WARNING("flush : \"" << m_dataToDisplay << "\"");
+		//EDN_WARNING("flush : \"" << m_dataToDisplay << "\"" << " bold=" << m_selectColor->GetBold() << " italic=" << m_selectColor->GetItalic());
 		m_haveWork = false;
 
 		cairo_set_font_face(m_cairo, Display::GetFont(m_selectColor->GetBold(), m_selectColor->GetItalic()));
 		int32_t letterHeight = Display::GetFontHeight();
 		if (true == m_selectColor->HaveBg() ) {
 			int32_t letterWidth = Display::GetFontWidth();
-			int32_t stringLen = m_nbElement;
 			// generate Clean BG:
-			DirectRectangle(m_selectColor, m_pos.x, m_pos.y, letterWidth*stringLen, letterHeight);
+			DirectRectangle(m_selectColor, m_pos.x, m_pos.y, letterWidth*m_nbElement, letterHeight);
 		}
 		cairo_move_to(m_cairo, m_pos.x, m_pos.y+letterHeight-4);
 		m_selectColor->ApplyFG(m_cairo);
@@ -347,9 +372,10 @@ void DrawerManager::DirectRectangle(Colorize *SelectColor, int32_t x, int32_t y,
 	// flush
 	cairo_fill(m_cairo);
 }
+
+
 void DrawerManager::DirectRectangle(color_ts &SelectColor, int32_t x, int32_t y, int32_t width, int32_t height)
 {
-
 	cairo_set_source_rgb(m_cairo, SelectColor.red, SelectColor.green, SelectColor.blue);
 	// set postion
 	cairo_rectangle(m_cairo, x, y, width, height);
@@ -427,6 +453,7 @@ void DrawerManager::Cursor(int32_t x, int32_t y)
 		cairo_rel_line_to(m_cairo, 0, -letterHeight);
 	}
 	cairo_stroke(m_cairo);
+	//cairo_set_fill_rule(m_cairo, CAIRO_FILL_RULE_EVEN_ODD);
 	cairo_fill(m_cairo);
 }
 
@@ -574,6 +601,14 @@ void DrawerManager::UTF8UnknownElement(Colorize *SelectColor, int32_t x, int32_t
 }
 
 
+void DrawerManager::TranslateVertical(int32_t nbPixelTranslation)
+{
+	Flush();
+	//scale((xmax-xmin)/W, (ymax-ymin)/H)
+	cairo_translate(m_cairo, 0, nbPixelTranslation);
+	cairo_fill(m_cairo);
+	cairo_paint(m_cairo);
+}
 
 
 /* Basic axample with cairo and pango...

Sources/tools/Display/Display.h

@@ -26,11 +26,9 @@
 #ifndef __TOOLS_DISPLAY_H__
 #define __TOOLS_DISPLAY_H__
 
-	#include "tools_debug.h"
-	#include "Colorize.h"
-	#include "ColorizeManager.h"
-	#include <string>
-	#include <vector>
+#include "tools_debug.h"
+#include "Colorize.h"
+#include "ColorizeManager.h"
 
 
 /**
@@ -54,7 +52,7 @@ class DrawerManager;
 class DrawerManager {
 	public:
 		// Constructeur
-		DrawerManager(GtkWidget * widget, int32_t x, int32_t y);
+		DrawerManager(GtkWidget * widget, int32_t x, int32_t y, int32_t scrollOffset=0);
 		~DrawerManager();
 
 		void    Rectangle(Colorize *SelectColor, int32_t x, int32_t y, int32_t width, int32_t height);
@@ -74,6 +72,7 @@ class DrawerManager {
 		void    Flush(void);
 		int32_t GetWidth(void) { return m_size.x; };
 		int32_t GetHeight(void) { return m_size.y; };
+		void    TranslateVertical(int32_t nbPixelTranslation);
 
 	private:
 		void    DirectRectangle(Colorize *SelectColor, int32_t x, int32_t y, int32_t width, int32_t height);
@@ -87,7 +86,7 @@ class DrawerManager {
 
 		position_ts     m_size;                                 //!< Total size
 		cairo_t *       m_cairo;                                //!< Cairo Layout pointer
-		
+		GdkWindow *     m_windows;                              //!< remember the current widget ==> for some internal problems
 };
 
 

Sources/tools/EdnBuf/EdnBuf.cpp

@@ -126,7 +126,7 @@ bool EdnBuf::DumpFrom(FILE *myFile)
 }
 
 
-void EdnBuf::GetAll(EdnVectorBin<int8_t> &text)
+void EdnBuf::GetAll(Edn::VectorType<int8_t> &text)
 {
 	// Clean output vector
 	text.Clear();
@@ -135,9 +135,9 @@ void EdnBuf::GetAll(EdnVectorBin<int8_t> &text)
 }
 
 
-void EdnBuf::SetAll(EdnVectorBin<int8_t> &text)
+void EdnBuf::SetAll(Edn::VectorType<int8_t> &text)
 {
-	EdnVectorBin<int8_t> deletedText;
+	Edn::VectorType<int8_t> deletedText;
 	
 	// extract all data of the buffer :
 	GetAll(deletedText);
@@ -155,7 +155,7 @@ void EdnBuf::SetAll(EdnVectorBin<int8_t> &text)
 	eventModification(0, m_data.Size(), deletedText); 
 }
 
-void EdnBuf::GetRange(int32_t start, int32_t end, EdnVectorBin<int8_t> &output)
+void EdnBuf::GetRange(int32_t start, int32_t end, Edn::VectorType<int8_t> &output)
 {
 	// Remove all data ...
 	output.Clear();
@@ -189,7 +189,7 @@ int8_t EdnBuf::operator[] (int32_t pos)
  * @return ---
  * 
  */
-void EdnBuf::Insert(int32_t pos, EdnVectorBin<int8_t> &insertText)
+void EdnBuf::Insert(int32_t pos, Edn::VectorType<int8_t> &insertText)
 {
 	// if pos is not contiguous to existing text, make it
 	pos = edn_average(0, pos, m_data.Size() );
@@ -197,7 +197,7 @@ void EdnBuf::Insert(int32_t pos, EdnVectorBin<int8_t> &insertText)
 	insert(pos, insertText);
 
 	// Call the redisplay ...
-	EdnVectorBin<int8_t> deletedText;
+	Edn::VectorType<int8_t> deletedText;
 	eventModification(pos, insertText.Size(), deletedText);
 }
 
@@ -212,9 +212,9 @@ void EdnBuf::Insert(int32_t pos, EdnVectorBin<int8_t> &insertText)
  * @return ---
  * 
  */
-void EdnBuf::Replace(int32_t start, int32_t end, EdnVectorBin<int8_t> &insertText)
+void EdnBuf::Replace(int32_t start, int32_t end, Edn::VectorType<int8_t> &insertText)
 {
-	EdnVectorBin<int8_t> deletedText;
+	Edn::VectorType<int8_t> deletedText;
 	GetRange(start, end, deletedText);
 	m_data.Replace(start, end-start, insertText);
 	// update internal elements
@@ -234,7 +234,7 @@ void EdnBuf::Replace(int32_t start, int32_t end, EdnVectorBin<int8_t> &insertTex
 void EdnBuf::Remove(int32_t start, int32_t end)
 {
 
-	EdnVectorBin<int8_t> deletedText;
+	Edn::VectorType<int8_t> deletedText;
 	// Make sure the arguments make sense
 	if (start > end) {
 		int32_t temp = start;
@@ -265,7 +265,7 @@ int32_t EdnBuf::Indent(selectionType_te select)
 	// Get Range :
 	int32_t l_start = StartOfLine(SelectionStart);
 	int32_t l_end = EndOfLine(SelectionEnd);
-	EdnVectorBin<int8_t> l_tmpData;
+	Edn::VectorType<int8_t> l_tmpData;
 	GetRange(l_start, l_end, l_tmpData);
 	
 	l_tmpData.Insert(0, '\n');
@@ -304,7 +304,7 @@ int32_t EdnBuf::UnIndent(selectionType_te select)
 	// Get Range :
 	int32_t l_start = StartOfLine(SelectionStart);
 	int32_t l_end = EndOfLine(SelectionEnd);
-	EdnVectorBin<int8_t> l_tmpData;
+	Edn::VectorType<int8_t> l_tmpData;
 	GetRange(l_start, l_end, l_tmpData);
 	
 	l_tmpData.Insert(0, '\n');
@@ -346,7 +346,7 @@ int32_t EdnBuf::UnIndent(selectionType_te select)
  * @return ---
  * 
  */
-void EdnBuf::GetLineText(int32_t pos, EdnVectorBin<int8_t> &text)
+void EdnBuf::GetLineText(int32_t pos, Edn::VectorType<int8_t> &text)
 {
 	GetRange( StartOfLine(pos), EndOfLine(pos), text);
 }
@@ -646,8 +646,22 @@ int32_t EdnBuf::CountLines(int32_t startPos, int32_t endPos)
 	EdnVectorBuf::Iterator myPosIt = m_data.Position(startPos);
 	int32_t lineCount = 0;
 	
+	#ifndef NDEBUG
+		GTimeVal timeStart;
+		if (0 == startPos) {
+			g_get_current_time(&timeStart);
+		}
+	#endif
+	
 	while (myPosIt) {
 		if (myPosIt.Position() == endPos) {
+			#ifndef NDEBUG
+				if (0 == startPos) {
+					GTimeVal timeStop;
+					g_get_current_time(&timeStop);
+					EDN_ERROR("Count line (" << startPos << "," << endPos << ") time = " << timeStop.tv_usec - timeStart.tv_usec << " micro-s ==> " << (timeStop.tv_usec - timeStart.tv_usec)/1000. << "ms");
+				}
+			#endif
 			return lineCount;
 		}
 		if ('\n' == *myPosIt) {
@@ -655,6 +669,76 @@ int32_t EdnBuf::CountLines(int32_t startPos, int32_t endPos)
 		}
 		myPosIt++;
 	}
+	
+	#ifndef NDEBUG
+		if (0 == startPos) {
+			GTimeVal timeStop;
+			g_get_current_time(&timeStop);
+			EDN_ERROR("Count line (" << startPos << "," << endPos << ") time = " << timeStop.tv_usec - timeStart.tv_usec << " micro-s ==> " << (timeStop.tv_usec - timeStart.tv_usec)/1000. << "ms");
+		}
+	#endif
+	
+	return lineCount;
+}
+
+/**
+ * @brief Get the Id of the line where is positionned the current pos element
+ * 
+ * @param[in] pos posithion in the buffer where we need to know the current line
+ * @param[in] refPos reference position
+ * @param[in] refLine reference Line of the position
+ * 
+ * @return the current line ID of the pos
+ * 
+ */
+int32_t EdnBuf::GetLinesIdWithRef(int32_t pos, int32_t refPos, int32_t refLine)
+{
+	EdnVectorBuf::Iterator myPosIt = m_data.Position(refPos);
+	int32_t lineCount = refLine;
+	
+	#ifndef NDEBUG
+		GTimeVal timeStart;
+		g_get_current_time(&timeStart);
+	#endif
+	if (pos == refPos) {
+		return refLine;
+	} else if (pos > refPos) {
+		while (myPosIt) {
+			if (myPosIt.Position() == pos) {
+				#ifndef NDEBUG
+					GTimeVal timeStop;
+					g_get_current_time(&timeStop);
+					EDN_DEBUG("Count line " << pos << " with ref(" << refPos << "," << refPos << ") time = " << timeStop.tv_usec - timeStart.tv_usec << " micro-s ==> " << (timeStop.tv_usec - timeStart.tv_usec)/1000. << "ms");
+				#endif
+				return lineCount;
+			}
+			if ('\n' == *myPosIt) {
+				lineCount++;
+			}
+			myPosIt++;
+		}
+	} else {
+		while (myPosIt) {
+			if (myPosIt.Position() == pos) {
+				#ifndef NDEBUG
+					GTimeVal timeStop;
+					g_get_current_time(&timeStop);
+					EDN_DEBUG("Count line " << pos << " with ref(" << refPos << "," << refPos << ") time = " << timeStop.tv_usec - timeStart.tv_usec << " micro-s ==> " << (timeStop.tv_usec - timeStart.tv_usec)/1000. << "ms");
+				#endif
+				return lineCount;
+			}
+			if ('\n' == *myPosIt) {
+				lineCount--;
+			}
+			myPosIt--;
+		}
+	}
+	#ifndef NDEBUG
+		GTimeVal timeStop;
+		g_get_current_time(&timeStop);
+		EDN_DEBUG("Count line " << pos << " with ref(" << refPos << "," << refPos << ") time = " << timeStop.tv_usec - timeStart.tv_usec << " micro-s ==> " << (timeStop.tv_usec - timeStart.tv_usec)/1000. << "ms");
+	#endif
+	
 	return lineCount;
 }
 
@@ -666,9 +750,9 @@ int32_t EdnBuf::CountLines(int32_t startPos, int32_t endPos)
  * @return number of line found
  * 
  */
-int32_t EdnBuf::CountLines(EdnVectorBin<int8_t> &data)
+int32_t EdnBuf::CountLines(Edn::VectorType<int8_t> &data)
 {
-	EdnVectorBin<int8_t>::Iterator myPosIt = data.Begin();
+	Edn::VectorType<int8_t>::Iterator myPosIt = data.Begin();
 	int32_t lineCount = 0;
 	
 	while(myPosIt) {
@@ -685,12 +769,21 @@ int32_t EdnBuf::CountLines(void)
 	EdnVectorBuf::Iterator myPosIt = m_data.Begin();
 	int32_t lineCount = 0;
 	
+	#ifndef NDEBUG
+		GTimeVal timeStart;
+		g_get_current_time(&timeStart);
+	#endif
 	while(myPosIt) {
 		if ('\n' == *myPosIt) {
 			lineCount++;
 		}
 		myPosIt++;
 	}
+	#ifndef NDEBUG
+		GTimeVal timeStop;
+		g_get_current_time(&timeStop);
+		EDN_DEBUG("count total number of line time = " << timeStop.tv_usec - timeStart.tv_usec << " micro-s ==> " << (timeStop.tv_usec - timeStart.tv_usec)/1000. << "ms");
+	#endif
 	return lineCount;
 }
 
@@ -720,6 +813,12 @@ void EdnBuf::CountNumberOfLines(void)
  */
 int32_t EdnBuf::CountForwardNLines(int32_t startPos, int32_t nLines)
 {
+	#ifndef NDEBUG
+		GTimeVal timeStart;
+		if (0 == startPos) {
+			g_get_current_time(&timeStart);
+		}
+	#endif
 	if (nLines == 0) {
 		return startPos;
 	} else if (startPos > m_data.Size() ) {
@@ -739,6 +838,14 @@ int32_t EdnBuf::CountForwardNLines(int32_t startPos, int32_t nLines)
 		}
 		myPosIt++;
 	}
+	
+	#ifndef NDEBUG
+		if (0 == startPos) {
+			GTimeVal timeStop;
+			g_get_current_time(&timeStop);
+			EDN_DEBUG("get poiner line (pos=" << startPos << "=>" << nLines << "lines) time = " << timeStop.tv_usec - timeStart.tv_usec << " micro-s ==> " << (timeStop.tv_usec - timeStart.tv_usec)/1000. << "ms");
+		}
+	#endif
 	//EDN_INFO("   ==> (2) at position=" << myPosIt.Position() );
 	return myPosIt.Position();
 }
@@ -810,7 +917,7 @@ bool EdnBuf::charMatch(char first, char second, bool caseSensitive)
  * @return false ==> not found data
  * 
  */
-bool EdnBuf::SearchForward(int32_t startPos, EdnVectorBin<int8_t> &searchVect, int32_t *foundPos, bool caseSensitive)
+bool EdnBuf::SearchForward(int32_t startPos, Edn::VectorType<int8_t> &searchVect, int32_t *foundPos, bool caseSensitive)
 {
 	int32_t position;
 	int32_t searchLen = searchVect.Size();
@@ -851,7 +958,7 @@ bool EdnBuf::SearchForward(int32_t startPos, EdnVectorBin<int8_t> &searchVect, i
  * @return false ==> not found data
  * 
  */
-bool EdnBuf::SearchBackward(int32_t startPos, EdnVectorBin<int8_t> &searchVect, int32_t *foundPos, bool caseSensitive)
+bool EdnBuf::SearchBackward(int32_t startPos, Edn::VectorType<int8_t> &searchVect, int32_t *foundPos, bool caseSensitive)
 {
 	int32_t position;
 	int32_t searchLen = searchVect.Size();
@@ -977,7 +1084,7 @@ bool EdnBuf::SelectAround(int32_t startPos, int32_t &beginPos, int32_t &endPos)
  * @return number of element inserted.
  * 
  */
-int32_t EdnBuf::insert(int32_t pos, EdnVectorBin<int8_t> &insertText)
+int32_t EdnBuf::insert(int32_t pos, Edn::VectorType<int8_t> &insertText)
 {
 	// Insert data in buffer
 	m_data.Insert(pos, insertText);
@@ -998,7 +1105,7 @@ int32_t EdnBuf::insert(int32_t pos, EdnVectorBin<int8_t> &insertText)
  * @return ---
  * 
  */
-void EdnBuf::eventModification(int32_t pos, int32_t nInserted, EdnVectorBin<int8_t> &deletedText)
+void EdnBuf::eventModification(int32_t pos, int32_t nInserted, Edn::VectorType<int8_t> &deletedText)
 {
 	if(		0 == deletedText.Size()
 		&&	0 == nInserted)

Sources/tools/EdnBuf/EdnBuf.h

@@ -49,13 +49,13 @@ end   ***************                          *************
                                                                                                     
 */
 typedef struct {
-	bool selected;			//!< True if the selection is active
-	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.
-	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 rectStart;		//!< Indent of left edge of rect. selection
-	int32_t rectEnd;		//!< Indent of right edge of rect. selection
+	bool selected;          //!< True if the selection is active
+	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.
+	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 rectStart;      //!< Indent of left 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;
-	int32_t                             idSequence;
-	int32_t                             posHLPass1;
-	int32_t                             posHLPass2;
+	Edn::VectorType<colorInformation_ts>    HLData;
+	int32_t                                 idSequence;
+	int32_t                                 posHLPass1;
+	int32_t                                 posHLPass2;
 }displayHLData_ts;
 
 
@@ -82,21 +82,21 @@ class EdnBuf {
 		// destructer
 		~EdnBuf(void);
 		// public function :
-		void    GetAll(                 EdnVectorBin<int8_t> &text);
-		void    SetAll(                 EdnVectorBin<int8_t> &text);
-		void    GetRange(               int32_t start, int32_t end, EdnVectorBin<int8_t> &output);
+		void    GetAll(                 Edn::VectorType<int8_t> &text);
+		void    SetAll(                 Edn::VectorType<int8_t> &text);
+		void    GetRange(               int32_t start, int32_t end, Edn::VectorType<int8_t> &output);
 		bool    DumpIn(                 FILE *myFile);
 		bool    DumpFrom(               FILE *myFile);
 		// replace with operator [] ...
 		int8_t  operator[] (int32_t);
-		void    Insert(                 int32_t pos, EdnVectorBin<int8_t> &insertText);
-		void    Replace(                int32_t start, int32_t end, EdnVectorBin<int8_t> &insertText);
+		void    Insert(                 int32_t pos, Edn::VectorType<int8_t> &insertText);
+		void    Replace(                int32_t start, int32_t end, Edn::VectorType<int8_t> &insertText);
 		void    Remove(                 int32_t start, int32_t end);
 		int32_t Indent(                 selectionType_te select);
 		int32_t UnIndent(               selectionType_te select);
 		
 		
-		void    GetLineText(            int32_t pos, EdnVectorBin<int8_t> &text);
+		void    GetLineText(            int32_t pos, Edn::VectorType<int8_t> &text);
 		int32_t StartOfLine(            int32_t pos);
 		int32_t EndOfLine(              int32_t pos);
 		
@@ -105,14 +105,15 @@ class EdnBuf {
 		int32_t CharWidth(              char c,      int32_t indent); 	// TODO : rework this
 		int32_t CountDispChars(         int32_t lineStartPos, int32_t targetPos);
 		int32_t CountForwardDispChars(  int32_t lineStartPos, int32_t nChars);
+		int32_t GetLinesIdWithRef(      int32_t pos, int32_t refPos, int32_t refLine);
 		int32_t CountLines(             int32_t startPos, int32_t endPos);
 		int32_t CountLines(             void);
-		int32_t CountLines(             EdnVectorBin<int8_t> &data);
+		int32_t CountLines(             Edn::VectorType<int8_t> &data);
 		int32_t CountForwardNLines(     int32_t startPos, int32_t nLines);
 		int32_t CountBackwardNLines(    int32_t startPos, int32_t nLines);
 		
-		bool    SearchForward(          int32_t startPos, EdnVectorBin<int8_t> &searchVect, int32_t *foundPos, bool caseSensitive = true);
-		bool    SearchBackward(         int32_t startPos, EdnVectorBin<int8_t> &searchVect, int32_t *foundPos, bool caseSensitive = true);
+		bool    SearchForward(          int32_t startPos, Edn::VectorType<int8_t> &searchVect, int32_t *foundPos, bool caseSensitive = true);
+		bool    SearchBackward(         int32_t startPos, Edn::VectorType<int8_t> &searchVect, int32_t *foundPos, bool caseSensitive = true);
 		bool    SearchForward(          int32_t startPos, char searchChar, int32_t *foundPos);
 		bool    SearchBackward(         int32_t startPos, char searchChar, int32_t *foundPos);
 		bool    SelectAround(           int32_t startPos, int32_t &beginPos, int32_t &endPos);
@@ -125,54 +126,55 @@ class EdnBuf {
 	// selection remember...
 	// -----------------------------------------
 	public:
-		bool	SelectHasSelection(		selectionType_te select);
-		void	Select(					selectionType_te select, int32_t start, int32_t end);
-		void	Unselect(				selectionType_te select);
-		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);
-		void	GetSelectionText(		selectionType_te select, EdnVectorBin<int8_t> &text);
-		void	RemoveSelected(			selectionType_te select);
-		void	ReplaceSelected(		selectionType_te select, EdnVectorBin<int8_t> &text);
+		bool        SelectHasSelection(     selectionType_te select);
+		void        Select(                 selectionType_te select, int32_t start, int32_t end);
+		void        Unselect(               selectionType_te select);
+		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);
+		void        GetSelectionText(       selectionType_te select, Edn::VectorType<int8_t> &text);
+		void        RemoveSelected(         selectionType_te select);
+		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
-		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);
+		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        UpdateSelections(       int32_t pos, int32_t nDeleted, int32_t nInserted);
 
 	// -----------------------------------------
 	// History section : 
 	// -----------------------------------------
 	public:
-		int32_t	Undo(					void);
-		int32_t	Redo(					void);
+		int32_t                                 Undo(void);
+		int32_t                                 Redo(void);
 	private:
-		bool							m_isUndoProcessing;
-		bool							m_isRedoProcessing;
-		EdnVectorBin<EdnBufHistory*>	m_historyUndo;
-		EdnVectorBin<EdnBufHistory*>	m_historyRedo;
+		bool                                    m_isUndoProcessing;
+		bool                                    m_isRedoProcessing;
+		Edn::VectorType<EdnBufHistory*>         m_historyUndo;
+		Edn::VectorType<EdnBufHistory*>         m_historyRedo;
 
 	// -----------------------------------------
 	// hightlight section : 
 	// -----------------------------------------
 	private:
-		Highlight *							m_Highlight;					//!< internal link with the Highlight system
-		std::vector<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
-		void								RegenerateHighLightAt(int32_t pos, int32_t nbDeleted, int32_t nbAdded);
-		void								GenerateHighLightAt(int32_t pos, int32_t endPos, int32_t addinPos=0);
-		void								CleanHighLight(void);
-		void								FindMainHighLightPosition(int32_t startPos, int32_t endPos, int32_t &startId, int32_t &stopId, bool backPreviousNotEnded);
+		Highlight *                             m_Highlight;         //!< internal link with the Highlight system
+		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
+		void                                    RegenerateHighLightAt(int32_t pos, int32_t nbDeleted, int32_t nbAdded);
+		void                                    GenerateHighLightAt(int32_t pos, int32_t endPos, int32_t addinPos=0);
+		void                                    CleanHighLight(void);
+		void                                    FindMainHighLightPosition(int32_t startPos, int32_t endPos, int32_t &startId, int32_t &stopId, bool backPreviousNotEnded);
 	public:
-		void                                SetHLSystem(  Highlight * newHLSystem);
-		void								HightlightGenerateLines(displayHLData_ts & MData, int32_t startPos, int32_t nbLines);
-		colorInformation_ts *				GetElementColorAtPosition(displayHLData_ts & MData, int32_t pos);
+		void                                    SetHLSystem(  Highlight * newHLSystem);
+		void                                    HightlightOneLine(displayHLData_ts & MData, int32_t HLStart, int32_t HLStop);
+		void                                    HightlightGenerateLines(displayHLData_ts & MData, int32_t startPos, int32_t nbLines); // TODO : deprecated ...
+		colorInformation_ts *                   GetElementColorAtPosition(displayHLData_ts & MData, int32_t pos);
 	private:
-		colorInformation_ts *				GetElementColorAtPosition(int32_t pos, int32_t &starPos);
+		colorInformation_ts *                   GetElementColorAtPosition(int32_t pos, int32_t &starPos);
 
 	private:
-		EdnVectorBuf						m_data;			//!< buffer of the data in the mode int8_t
-		void								CountNumberOfLines(void);
-		int32_t								m_nbLine;		//!< Number of line in the biffer
+		EdnVectorBuf                            m_data;                     //!< buffer of the data in the mode int8_t
+		void                                    CountNumberOfLines(void);
+		int32_t                                 m_nbLine;                   //!< Number of line in the biffer
 
 	// -----------------------------------------
 	// Display property and charset ...
@@ -186,27 +188,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)
-		charset_te	m_charsetType;							//!< if UTF8 mode is at false : the charset type 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)
+		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
-		bool		m_useTabs;								//!< True if buffer routines are allowed to use tabs for padding in rectangular operations
+		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
 	
 	// -----------------------------------------
 	// Local function : 
 	// -----------------------------------------
 	private:
-		void	findRectSelBoundariesForCopy(	int32_t lineStartPos, int32_t rectStart, int32_t rectEnd, int32_t *selStart, int32_t *selEnd);
-		char	*getSelectionText(				selection &sel);
-		void	removeSelected(					selection &sel);
-		void	replaceSelected(				selection &sel, const char *text);
+		void    findRectSelBoundariesForCopy(   int32_t lineStartPos, int32_t rectStart, int32_t rectEnd, int32_t *selStart, int32_t *selEnd);
+		char *  getSelectionText(               selection &sel);
+		void    removeSelected(                 selection &sel);
+		void    replaceSelected(                selection &sel, const char *text);
 
-		void	eventModification(				int32_t pos, int32_t nInserted, EdnVectorBin<int8_t> &deletedText);
+		void    eventModification(              int32_t pos, int32_t nInserted, Edn::VectorType<int8_t> &deletedText);
 
 
-		int32_t insert(							int32_t pos, EdnVectorBin<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/EdnBufHistory.cpp

@@ -39,7 +39,7 @@ EdnBufHistory::EdnBufHistory(void)
 	m_nInserted = 0;
 }
 
-EdnBufHistory::EdnBufHistory(int32_t pos, int32_t nInserted, EdnVectorBin<int8_t> &deletedText)
+EdnBufHistory::EdnBufHistory(int32_t pos, int32_t nInserted, Edn::VectorType<int8_t> &deletedText)
 {
 	//EDN_INFO("EdnBufHistory new + data");
 	m_pos = pos;
@@ -47,7 +47,7 @@ EdnBufHistory::EdnBufHistory(int32_t pos, int32_t nInserted, EdnVectorBin<int8_t
 	m_deletedText = deletedText;
 }
 
-void EdnBufHistory::Set(int32_t pos, int32_t nInserted, EdnVectorBin<int8_t> &deletedText)
+void EdnBufHistory::Set(int32_t pos, int32_t nInserted, Edn::VectorType<int8_t> &deletedText)
 {
 	//EDN_INFO("EdnBufHistory new + data");
 	m_pos = pos;
@@ -75,7 +75,7 @@ int32_t EdnBufHistory::getnbInserted(void)
 	return m_nInserted;
 }
 
-void EdnBufHistory::getData(EdnVectorBin<int8_t> &deletedText)
+void EdnBufHistory::getData(Edn::VectorType<int8_t> &deletedText)
 {
 	deletedText = m_deletedText;
 }

Sources/tools/EdnBuf/EdnBufHistory.h

@@ -27,22 +27,22 @@
 #define __EDN_BUFFER_HISTORY_H__
 
 
-#include "EdnVectorBin.h"
+#include "VectorType.h"
 
 class EdnBufHistory{
 	public:
 					 EdnBufHistory(void);
-					 EdnBufHistory(int32_t pos, int32_t nInserted, EdnVectorBin<int8_t> &deletedText);
+					 EdnBufHistory(int32_t pos, int32_t nInserted, Edn::VectorType<int8_t> &deletedText);
 					~EdnBufHistory(void);
-		void		 Set(int32_t pos, int32_t nInserted, EdnVectorBin<int8_t> &deletedText);
+		void		 Set(int32_t pos, int32_t nInserted, Edn::VectorType<int8_t> &deletedText);
 		int32_t		 getPos(void);
 		int32_t		 getnbDeleted(void);
 		int32_t		 getnbInserted(void);
-		void		 getData(EdnVectorBin<int8_t> &deletedText);
+		void		 getData(Edn::VectorType<int8_t> &deletedText);
 	private:
 		int32_t m_pos;
 		int32_t m_nInserted;
-		EdnVectorBin<int8_t> m_deletedText;
+		Edn::VectorType<int8_t> m_deletedText;
 };
 
 #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()) {
-		EDN_DEBUG("==> BEGIN : start="<<m_HLDataPass1[startId].beginStart<<", stop="<<m_HLDataPass1[startId].endStop<<" id=" << startId << "/" << (int32_t)m_HLDataPass1.size()-1);
+	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);
 	} else {
 		EDN_DEBUG("==> BEGIN : start=???, stop=??? id=" << startId);
 	}
-	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);
+	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);
 	} 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)
@@ -258,6 +286,71 @@ colorInformation_ts *EdnBuf::GetElementColorAtPosition(int32_t pos, int32_t &sta
 	return NULL;
 }
 
+//#define COUNT_TIME plop
+
+void EdnBuf::HightlightOneLine(displayHLData_ts & MData, int32_t HLStart, int32_t HLStop)
+{
+	MData.posHLPass1 = 0;
+	MData.posHLPass2 = 0;
+	if (NULL == m_Highlight) {
+		return;
+	}
+	#ifdef COUNT_TIME
+		GTimeVal timeStart;
+		g_get_current_time(&timeStart);
+	#endif
+	int32_t startId, stopId;
+	// find element previous
+	FindMainHighLightPosition(HLStart, HLStop, startId, stopId, true);
+
+	int32_t k;
+	//EDN_DEBUG("List of section between : "<< startId << " & " << stopId);
+	int32_t endSearch = stopId+1;
+	if (-1 == stopId) {
+		endSearch = m_HLDataPass1.Size();
+	}
+	for (k=edn_max(startId, 0); k<endSearch; k++) {
+		// empty section :
+		if (0==k) {
+			if (HLStart < m_HLDataPass1[k].beginStart) {
+				//EDN_DEBUG("  ==> (empty section 1 ) k="<<k<<" start="<<HLStart<<" stop="<<m_HLDataPass1[k].beginStart );
+				m_Highlight->Parse2(HLStart,
+									m_HLDataPass1[k].beginStart,
+									MData.HLData,
+									m_data);
+			} // else : nothing to do ...
+		} else {
+			//EDN_DEBUG("  ==> (empty section 2 ) k="<<k<<" start="<<m_HLDataPass1[k-1].endStop<<" stop="<<m_HLDataPass1[k].beginStart );
+			m_Highlight->Parse2(m_HLDataPass1[k-1].endStop,
+								m_HLDataPass1[k].beginStart,
+								MData.HLData,
+								m_data);
+		}
+		// under section :
+		//EDN_DEBUG("  ==> (under section   ) k="<<k<<" start="<<m_HLDataPass1[k].beginStart<<" stop="<<m_HLDataPass1[k].endStop << " subSectionOfID=" << 99999999);
+		// TODO : ...
+	}
+	if (endSearch == (int32_t)m_HLDataPass1.Size() ){
+		if (m_HLDataPass1.Size() != 0) {
+			//EDN_DEBUG("  ==> (empty section 3 ) k="<<k<<" start="<<m_HLDataPass1[k-1].endStop<<" stop="<<HLStop );
+			m_Highlight->Parse2(m_HLDataPass1[k-1].endStop,
+								HLStop,
+								MData.HLData,
+								m_data);
+		} else {
+			//EDN_DEBUG("  ==> (empty section 4 ) k="<<k<<" start=0 stop="<<HLStop );
+			m_Highlight->Parse2(0,
+								HLStop,
+								MData.HLData,
+								m_data);
+		}
+	}
+	#ifdef COUNT_TIME
+		GTimeVal timeStop;
+		g_get_current_time(&timeStop);
+		EDN_DEBUG("Display reAnnalyse = " << timeStop.tv_usec - timeStart.tv_usec << " micro-s");
+	#endif
+}
 
 
 void EdnBuf::HightlightGenerateLines(displayHLData_ts & MData, int32_t HLStart, int32_t nbLines)
@@ -272,7 +365,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 +375,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 +398,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(		k < (int32_t)m_HLDataPass1.size()) {
-			if (m_HLDataPass1.size() != 0) {
+		if (endSearch == (int32_t)m_HLDataPass1.Size() ){
+			//if(		k < (int32_t)m_HLDataPass1.Size()) {
+			if (m_HLDataPass1.Size() != 0) {
 				//EDN_DEBUG("  ==> (empty section 3 ) k="<<k<<" start="<<m_HLDataPass1[k-1].endStop<<" stop="<<HLStop );
 				m_Highlight->Parse2(m_HLDataPass1[k-1].endStop,
 									HLStop,
@@ -326,7 +419,6 @@ void EdnBuf::HightlightGenerateLines(displayHLData_ts & MData, int32_t HLStart,
 		g_get_current_time(&timeStop);
 		EDN_DEBUG("Display reAnnalyse = " << timeStop.tv_usec - timeStart.tv_usec << " micro-s");
 	}
-
 }
 
 
@@ -334,7 +426,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/EdnBuf/EdnBuf_History.cpp

@@ -53,7 +53,7 @@ int32_t EdnBuf::Undo(void)
 	int32_t pos        = m_historyUndo[nbElement]->getPos();
 	int32_t nbDeleted  = m_historyUndo[nbElement]->getnbDeleted();
 	int32_t nbInserted = m_historyUndo[nbElement]->getnbInserted();
-	EdnVectorBin<int8_t> deletedText;
+	Edn::VectorType<int8_t> deletedText;
 	m_historyUndo[nbElement]->getData(deletedText);
 	m_isUndoProcessing = true;
 	if (0 == nbInserted) {
@@ -101,7 +101,7 @@ int32_t EdnBuf::Redo(void)
 	int32_t pos        = m_historyRedo[nbElement]->getPos();
 	int32_t nbDeleted  = m_historyRedo[nbElement]->getnbDeleted();
 	int32_t nbInserted = m_historyRedo[nbElement]->getnbInserted();
-	EdnVectorBin<int8_t> deletedText;
+	Edn::VectorType<int8_t> deletedText;
 	m_historyRedo[nbElement]->getData(deletedText);
 	m_isRedoProcessing = true;
 	if (0 == nbInserted) {

Sources/tools/EdnBuf/EdnBuf_Selection.cpp

@@ -136,7 +136,7 @@ bool EdnBuf::GetSelectionPos(selectionType_te select, int32_t &start, int32_t &e
  * @return ---
  * 
  */
-void EdnBuf::GetSelectionText(selectionType_te select, EdnVectorBin<int8_t> &text)
+void EdnBuf::GetSelectionText(selectionType_te select, Edn::VectorType<int8_t> &text)
 {
 	int32_t start, end, rectStart, rectEnd;
 	bool isRect;
@@ -198,7 +198,7 @@ void EdnBuf::RemoveSelected(selectionType_te select)
  * @return ---
  * 
  */
-void EdnBuf::ReplaceSelected(selectionType_te select, EdnVectorBin<int8_t> &text)
+void EdnBuf::ReplaceSelected(selectionType_te select, Edn::VectorType<int8_t> &text)
 {
 	int32_t start, end, rectStart, rectEnd;
 	bool isRect;

Sources/tools/EdnRegExp/EdnRegExp.h

@@ -1,261 +0,0 @@
-/**
- *******************************************************************************
- * @file EdnRegExp.h
- * @brief Editeur De N'ours : Regular expression annalyser (header)
- * @author Edouard DUPIN
- * @date 04/04/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 __EDN_REG_EXP_H__
-#define __EDN_REG_EXP_H__
-
-class EdnRegExp;
-
-#include "EdnTree.h"
-#include "EdnBuf.h"
-#include "EdnVectorBin.h"
-#include "EdnVectorBuf.h"
-
-
-/*
-normal mode :
-	(...)				sub element is separate with |
-	\d					Digits									[0-9]
-	\D					NOT a digit								[^0-9]
-	\l					Letters									[a-zA-Z]
-	\L					NOT a Letter							[^a-zA-Z]
-	\s					Whitespace								[ \t\n\r\f\v]
-	\S					NOT Whitespace							[^ \t\n\r\f\v]
-	\w					"Word" character						[a-zA-Z0-9_]
-	\W					NOT a "Word" character					[^a-zA-Z0-9_]
-	\@					at the start or the end					not in the parsing of element ==> check if \w is not present   (other regExp will be <> ...)
-	[anjdi] or [a-gt-j]	range
-	.					dot										[^\x00-\x08\x0A-\x1F\x7F]
-==> TODO :
-	$					End / Start of line of line 			==> ce sera un truc supl<70>mentaire comme le \@
-	^in the []			invertion of the range element
-
-multiplicity :
-	*     ==> {0, 2147483647}
-	?     ==> {0, 1}
-	+     ==> {1, 2147483647}
-	{x}   ==> {x, x}
-	{x,y} ==> {x, y}
-*/
-
-class RegExpNode;
-
-/**
- *	@brief Node Elements for every-one
- */
-class RegExpNode{
-	public :
-		                        RegExpNode(void);
-		virtual                 ~RegExpNode(void) { };
-		virtual int32_t         Generate(EdnVectorBin<int16_t> &data, int32_t startPos, int32_t nbElement);
-		virtual bool            Parse(EdnVectorBuf &data, int32_t currentPos, int32_t lenMax, int32_t &findLen);
-		virtual void            Display(int32_t level);
-		void                    SetMult(int32_t min, int32_t max);
-	protected:
-		int32_t                 GetMultMin(void) { return m_multipleMin; };
-		int32_t                 GetMultMax(void) { return m_multipleMax; };
-	protected :
-		int32_t                 m_multipleMin;      //!< minimum repetition (included)
-		int32_t                 m_multipleMax;      //!< maximum repetition (included)
-		// Data Section ... (can have no data...)
-		EdnVectorBin<int16_t>   m_RegExpData;       //!< data to parse and compare in some case ...
-};
-
-
-class RegExpNodePThese : public RegExpNode {
-	public :
-		        RegExpNodePThese(void) { };
-		        ~RegExpNodePThese(void);
-		int32_t Generate(EdnVectorBin<int16_t> &data);
-		bool    Parse(EdnVectorBuf &data, int32_t currentPos, int32_t lenMax, int32_t &findLen);
-		void    Display(int32_t level);
-	protected :
-		// SubNodes :
-		EdnVectorBin<RegExpNode*> m_subNode;
-		//int32_t						m_posPthese;		//!< position of the element is detected in the output element
-};
-
-class RegExpNodePTheseElem : public RegExpNode {
-	public :
-		        RegExpNodePTheseElem(void) { };
-		        ~RegExpNodePTheseElem(void);
-		int32_t Generate(EdnVectorBin<int16_t> &data);
-		bool    Parse(EdnVectorBuf &data, int32_t currentPos, int32_t lenMax, int32_t &findLen);
-		void    Display(int32_t level);
-	protected :
-		// SubNodes :
-		EdnVectorBin<RegExpNode*> m_subNode;
-	private :
-		bool    SetMultiplicityOnLastNode(int32_t min, int32_t max);
-};
-
-
-class RegExpNodeValue : public RegExpNode {
-	public :
-		        RegExpNodeValue(void) { };
-		        ~RegExpNodeValue(void) { };
-		int32_t Generate(EdnVectorBin<int16_t> &data);
-		bool    Parse(EdnVectorBuf &data, int32_t currentPos, int32_t lenMax, int32_t &findLen);
-		void    Display(int32_t level);
-	protected :
-		// SubNodes :
-		EdnVectorBin<char> m_data;
-};
-
-class RegExpNodeBracket : public RegExpNode {
-	public :
-		        RegExpNodeBracket(void) { };
-		        ~RegExpNodeBracket(void) { };
-		int32_t Generate(EdnVectorBin<int16_t> &data);
-		bool    Parse(EdnVectorBuf &data, int32_t currentPos, int32_t lenMax, int32_t &findLen);
-		void    Display(int32_t level);
-	protected :
-		// SubNodes :
-		EdnVectorBin<char> m_data;
-};
-
-class RegExpNodeDigit : public RegExpNode {
-	public :
-		        RegExpNodeDigit(void) { };
-		        ~RegExpNodeDigit(void) { };
-		bool    Parse(EdnVectorBuf &data, int32_t currentPos, int32_t lenMax, int32_t &findLen);
-		void    Display(int32_t level);
-};
-class RegExpNodeDigitNot : public RegExpNode {
-	public :
-		        RegExpNodeDigitNot(void) { };
-		        ~RegExpNodeDigitNot(void) { };
-		bool    Parse(EdnVectorBuf &data, int32_t currentPos, int32_t lenMax, int32_t &findLen);
-		void    Display(int32_t level);
-};
-class RegExpNodeLetter : public RegExpNode {
-	public :
-		        RegExpNodeLetter(void) { };
-		        ~RegExpNodeLetter(void) { };
-		bool    Parse(EdnVectorBuf &data, int32_t currentPos, int32_t lenMax, int32_t &findLen);
-		void    Display(int32_t level);
-};
-class RegExpNodeLetterNot : public RegExpNode {
-	public :
-		        RegExpNodeLetterNot(void) { };
-		        ~RegExpNodeLetterNot(void) { };
-		bool    Parse(EdnVectorBuf &data, int32_t currentPos, int32_t lenMax, int32_t &findLen);
-		void    Display(int32_t level);
-};
-class RegExpNodeWhiteSpace : public RegExpNode {
-	public :
-		        RegExpNodeWhiteSpace(void) { };
-		        ~RegExpNodeWhiteSpace(void) { };
-		bool    Parse(EdnVectorBuf &data, int32_t currentPos, int32_t lenMax, int32_t &findLen);
-		void    Display(int32_t level);
-};
-class RegExpNodeWhiteSpaceNot : public RegExpNode {
-	public :
-		        RegExpNodeWhiteSpaceNot(void) { };
-		        ~RegExpNodeWhiteSpaceNot(void) { };
-		bool    Parse(EdnVectorBuf &data, int32_t currentPos, int32_t lenMax, int32_t &findLen);
-		void    Display(int32_t level);
-};
-class RegExpNodeWordChar : public RegExpNode {
-	public :
-		        RegExpNodeWordChar(void) { };
-		        ~RegExpNodeWordChar(void) { };
-		bool    Parse(EdnVectorBuf &data, int32_t currentPos, int32_t lenMax, int32_t &findLen);
-		void    Display(int32_t level);
-};
-class RegExpNodeWordCharNot : public RegExpNode {
-	public :
-		        RegExpNodeWordCharNot(void) { };
-		        ~RegExpNodeWordCharNot(void) { };
-		bool    Parse(EdnVectorBuf &data, int32_t currentPos, int32_t lenMax, int32_t &findLen);
-		void    Display(int32_t level);
-};
-class RegExpNodeDot : public RegExpNode {
-	public :
-		        RegExpNodeDot(void) { };
-		        ~RegExpNodeDot(void) { };
-		bool    Parse(EdnVectorBuf &data, int32_t currentPos, int32_t lenMax, int32_t &findLen);
-		void    Display(int32_t level);
-};
-
-class RegExpNodeSOL : public RegExpNode {
-	public :
-		        RegExpNodeSOL(void) { };
-		        ~RegExpNodeSOL(void) { };
-		bool    Parse(EdnVectorBuf &data, int32_t currentPos, int32_t lenMax, int32_t &findLen);
-		void    Display(int32_t level);
-};
-
-class RegExpNodeEOL : public RegExpNode {
-	public :
-		        RegExpNodeEOL(void) { };
-		        ~RegExpNodeEOL(void) { };
-		bool    Parse(EdnVectorBuf &data, int32_t currentPos, int32_t lenMax, int32_t &findLen);
-		void    Display(int32_t level);
-};
-
-typedef struct {
-	int32_t start;
-	int32_t stop;
-}elementPos_ts;
-
-
-// Regular expression manager
-class EdnRegExp {
-	// public API : 
-	public:
-		// create the regular expression
-		EdnRegExp(const char *exp);
-		EdnRegExp(Edn::String &exp);
-		EdnRegExp(void);
-		~EdnRegExp(void);
-		void		SetRegExp(const char *exp);
-		void		SetRegExp(Edn::String &exp);
-		Edn::String	GetRegExp(void) { return m_expressionRequested;};
-		bool		GetStatus(void)  { return m_isOk;};
-		// process the regular expression
-		bool	Process(	EdnVectorBuf			&SearchIn,
-							int32_t					startPos,
-							int32_t					endPos,
-							char					escapeChar=0);
-		int32_t	Start(void)	{ return m_areaFind.start; };
-		int32_t	Stop(void)	{ return m_areaFind.stop; };
-		void	Display(void);
-	// internal parameters
-	private:
-		Edn::String					m_expressionRequested;	// TODO : Remove ...
-		elementPos_ts				m_areaFind;					//!< position around selection
-		RegExpNodePThese			m_exprRootNode;				//!< The tree where data is set
-		bool						m_isOk;						//!< Known if we can process with this regExp
-		bool						m_notBeginWithChar;			//!< The regular expression must not have previously a char [a-zA-Z0-9_]
-		bool						m_notEndWithChar;			//!< The regular expression must not have after the end a char [a-zA-Z0-9_]
-	// internal access
-	private:
-		bool CheckGoodPosition(EdnVectorBin<int16_t> tmpExp, int32_t &pos);
-		bool CheckGoodPosition(EdnVectorBin<int16_t> tmpExp);
-
-
-};
-
-#endif

Sources/tools/EdnTemplate/EdnTemplateTest.cpp

@@ -1,29 +0,0 @@
-
-#include "tools_debug.h"
-#include "tools_globals.h"
-
-#include "EdnVectorBin.h"
-
-void TestTemplate(void)
-{
-	
-	EDN_WARNING("Start Template Test ...");
-	EdnVectorBin<int32_t> plop;
-	EdnVectorBin<int8_t> plop2;
-	
-	plop.PushBack(15365);
-	plop.PushBack(1);
-	plop.PushBack(2);
-	plop.PushBack(3);
-	plop.PushBack(4);
-	
-	EDN_INFO("data is : " << plop[0]);
-	EDN_INFO("data is : " << plop[1]);
-	EDN_INFO("data is : " << plop[2]);
-	EDN_INFO("data is : " << plop[3]);
-	
-	plop2.PushBack(65);
-	
-	EDN_INFO("data is : " << plop2[0]);
-	
-}

Sources/tools/EdnTemplate/EdnTree.h

@@ -1,186 +0,0 @@
-/**
- *******************************************************************************
- * @file EdnTree.h
- * @brief Editeur De N'ours : Basic tree in a vector For none expensive tree (template)
- * @author Edouard DUPIN
- * @date 04/04/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 __EDN_TREE_H__
-#define __EDN_TREE_H__
-
-#undef __class__
-#define __class__	"EdnTreeElement"
-
-template < class T > class EdnTreeElement
-{
-	public:
-		EdnTreeElement(int32_t parent, int32_t id, T &maNouvelleClass) : elementPtr(NULL), m_parent(parent), m_id(id)
-		{
-			elementPtr = new T(maNouvelleClass);
-		};
-		~EdnTreeElement(void)
-		{
-			delete(elementPtr);
-		};
-		EdnTreeElement(const EdnTreeElement &mustCopy ) : elementPtr(NULL), m_parent(mustCopy.m_parent), m_id(mustCopy.m_id)
-		{
-			elementPtr = new T(*mustCopy.elementPtr);
-		}
-		int32_t	GetParrent(void) { return m_parent;};
-		int32_t	GetId(void) { return m_id;};
-		T*		GetPtr() const 
-		{
-			return elementPtr;
-		};
-
-	private:
-		T* elementPtr;		// pointer on the curent element
-		int32_t m_parent;
-		int32_t m_id;
-};
-
-#undef __class__
-#define __class__	"EdnTree"
-
-#define ROOT_NODE_ID	(-1)
-
-template < class T > class EdnTree 
-{
-	public: 
-		// constructeur et destructeur
-		EdnTree(void)
-		{
-			m_LastId = 0;
-		};
-		
-		~EdnTree(void)
-		{
-			
-		};
-		// Common function ...
-		int32_t GetNumberNode(void)
-		{
-			return m_listElement.size();
-		};
-		
-		int32_t GetDepth(void)
-		{
-			// TODO : ...
-			return 0;
-		};
-		//!< add an element in the tree
-		int32_t Add(T &maNouvelleClass, int32_t parent=-1)
-		{
-			if (true == CheckPresenceParrent(parent)) {
-				// create the local element
-				EdnTreeElement<T> nouvelElement(parent, m_LastId, maNouvelleClass);
-				// add it in the list
-				m_listElement.push_back(nouvelElement);
-				// increment the ID of the element
-				m_LastId++;
-				// Add is Ok, in theory ...
-				return m_LastId-1;
-			}
-			return -2;
-		};
-		
-		bool Remove(int32_t id)
-		{
-			return false;
-		};
-		
-		bool Clear(void)
-		{
-			return false;
-		};
-		
-		T* Get(int32_t id)
-		{
-			// try to find ID
-			int32_t realID = FindElementWithId(id);
-			// when we find it, check it
-			if (0 > realID || realID >= m_LastId) {
-				return NULL;
-			}
-			// Return the element :
-			return m_listElement[realID].GetPtr();
-		};
-		
-		std::vector<int32_t> GetListSubNode( int32_t parentId = ROOT_NODE_ID)
-		{
-			std::vector<int32_t> res;
-			int32_t i;
-			for (i=0; i<(int32_t)m_listElement.size(); i++) {
-				if (m_listElement[i].GetParrent() == parentId) {
-					// Add the element ID in the list ...
-					res.push_back(m_listElement[i].GetId());
-				}
-			}
-			return res;
-		};
-		
-		std::vector<int32_t> Root(void)
-		{
-			return GetListSubNode(ROOT_NODE_ID);
-		};
-		
-		
-	private:
-		int32_t								m_LastId;
-		std::vector< EdnTreeElement<T> >	m_listElement;		//!< list of element...
-		
-		bool CheckPresence(int32_t id)
-		{
-			int32_t i;
-			for (i=0; i<(int32_t)m_listElement.size(); i++) {
-				if (m_listElement[i].GetId() == id) {
-					return true;
-				}
-			}
-			return false;
-		};
-		
-		bool CheckPresenceParrent(int32_t parrentId)
-		{
-			if (ROOT_NODE_ID == parrentId) {
-				return true;
-			}
-			return CheckPresence(parrentId);
-		};
-		
-		int32_t	FindElementWithId(int32_t id)
-		{
-			int32_t i;
-			for (i=0; i<(int32_t)m_listElement.size(); i++) {
-				if (m_listElement[i].GetId() == id) {
-					return i;
-				}
-			}
-			return ROOT_NODE_ID;
-		};
-};
-
-
-
-#undef __class__
-#define __class__	NULL
-
-#endif
-

Sources/tools/EdnTemplate/EdnVectorBuf.cpp

@@ -227,7 +227,7 @@ int8_t& EdnVectorBuf::Get(int32_t pos)
  * @return ---
  * 
  */
-void EdnVectorBuf::Get(int32_t pos, int32_t nbElement, EdnVectorBin<int8_t> &tmpBuffer)
+void EdnVectorBuf::Get(int32_t pos, int32_t nbElement, Edn::VectorType<int8_t> &tmpBuffer)
 {
 	tmpBuffer.Clear();
 	if (pos < m_gapStart) {
@@ -399,7 +399,7 @@ void EdnVectorBuf::Insert(int32_t pos, const int8_t& item)
  * @return ---
  * 
  */
-void EdnVectorBuf::Insert(int32_t pos, EdnVectorBin<int8_t>& items)
+void EdnVectorBuf::Insert(int32_t pos, Edn::VectorType<int8_t>& items)
 {
 	if(		pos > Size()
 		||	pos < 0 ) {
@@ -455,7 +455,7 @@ void EdnVectorBuf::Replace(int32_t pos, const int8_t& item)
  * @return ---
  * 
  */
-void EdnVectorBuf::Replace(int32_t pos, int32_t nbRemoveElement, EdnVectorBin<int8_t>& items)
+void EdnVectorBuf::Replace(int32_t pos, int32_t nbRemoveElement, Edn::VectorType<int8_t>& items)
 {
 	if(		pos > Size()
 		||	pos < 0 ) {
@@ -652,7 +652,7 @@ void TestEdnVectorBuf(void)
 	myBufferTmp.Display();
 	plop='m';
 	
-	EdnVectorBin<int8_t> items;
+	Edn::VectorType<int8_t> items;
 	items.PushBack('i');
 	items.PushBack('j');
 	items.PushBack('k');

Sources/tools/EdnTemplate/EdnVectorBuf.h

@@ -27,7 +27,7 @@
 #define __EDN_VECTOR_BUF_H__
 
 #include "toolsMemory.h"
-#include "EdnVectorBin.h"
+#include "VectorType.h"
 
 #undef __class__
 #define __class__	"EdnVectorBuf"
@@ -272,14 +272,14 @@ class EdnVectorBuf
 		EdnVectorBuf &					operator=(	const EdnVectorBuf & Evb);
 		int8_t							operator[] (int32_t pos);
 		int8_t &						Get(		int32_t pos);
-		void							Get(		int32_t pos, int32_t nbElement, EdnVectorBin<int8_t> &tmpBuffer);
+		void							Get(		int32_t pos, int32_t nbElement, Edn::VectorType<int8_t> &tmpBuffer);
 		// insert functions
 		void							PushBack(	const int8_t& item);
 		void							Insert(		int32_t pos, const int8_t& item);
-		void							Insert(		int32_t pos, EdnVectorBin<int8_t>& items);
+		void							Insert(		int32_t pos, Edn::VectorType<int8_t>& items);
 		// Remove and insert functions
 		void							Replace(	int32_t pos, const int8_t& item);
-		void							Replace(	int32_t pos, int32_t nbRemoveElement, EdnVectorBin<int8_t>& items);
+		void							Replace(	int32_t pos, int32_t nbRemoveElement, Edn::VectorType<int8_t>& items);
 		// Revove fonctions
 		void							Remove(		int32_t pos, int32_t nbRemoveElement = 1);
 		void							PopBack(	void);

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*)"??";
 	}
@@ -161,6 +168,12 @@ static char * GetMessageTypeChar(messageCat_te Id)
 			return (char*)"GUI_MANAGER";
 		case EDN_CAT_CTAGS:
 			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*)"??";
 	}
@@ -198,6 +211,18 @@ void MsgBroadcastCore::SendMessage(MsgBroadcast * pointerOnSender, messageType_t
 	           && MSG_TO_CTAGS__STOP  >= id )
 	{
 		catDest = EDN_CAT_CTAGS;
+	} else if(    MSG_TO_CONTEXT__START <= id
+	           && 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
@@ -121,6 +121,20 @@ typedef enum {
 		EDN_MSG__JUMP_BACK,
 	MSG_TO_CTAGS__STOP,
 
+	// DESTINATION : context popup ...
+	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;
 
@@ -132,6 +146,9 @@ typedef enum {
 	EDN_CAT_BUFFER_MANAGER,
 	EDN_CAT_GUI_MANAGER,
 	EDN_CAT_CTAGS,
+	EDN_CAT_MENU_CONTEXT,
+	EDN_CAT_HL,
+	EDN_CAT_COLOR,
 }messageCat_te;
 
 
@@ -183,9 +200,9 @@ class MsgBroadcastCore: public Singleton<MsgBroadcastCore>
 		void RmReceiver(MsgBroadcast * pointerOnReceiver);
 
 	private:
-		EdnVectorBin<MsgBroadcast*>         m_listMessage;
-		uint32_t                            m_messageID;
-		EdnVectorBin<messageElement_ts>     m_listOfMessage;
+		Edn::VectorType<MsgBroadcast*>         m_listMessage;
+		uint32_t                               m_messageID;
+		Edn::VectorType<messageElement_ts>     m_listOfMessage;
 };
 
 

Sources/tools/NameSpaceEdn/Edn.h

@@ -26,19 +26,11 @@
 
 #include "tools_debug.h"
 #include "toolsMemory.h"
-#include "EdnVectorBin.h"
+//#include "Vector.h"   // TODO : Set the vector of edn enable
+#include "VectorType.h"
 
-#ifndef __EDN_H__
-#define __EDN_H__
 
-#define _IN_NAMESPACE_EDN_ (plop)
+#include "String.h"
 
-namespace Edn
-{
-	#include "String.h"
-	#include "File.h"
-}
+#include "File.h"
 
-#undef IN_NAMESPACE_EDN
-
-#endif

Sources/tools/NameSpaceEdn/File.cpp

@@ -28,12 +28,34 @@
 #include "tools_globals.h"
 #include "Edn.h"
 
+
+#undef __class__
+#define __class__	"Edn::File"
+
+
+std::ostream& Edn::operator <<(std::ostream &os, const Edn::File &obj)
+{
+	os << obj.m_folder;
+	os << "/";
+	os << obj.m_shortFilename;
+	return os;
+}
+
 Edn::File::File(Edn::String &filename, int32_t LineNumber)
 {
-	m_lineNumberOpen = 0;
+	m_lineNumberOpen = LineNumber;
 	SetCompleateName(filename);
 }
 
+
+Edn::File::File(const char  *filename, int32_t LineNumber)
+{
+	Edn::String tmpString = filename;
+	m_lineNumberOpen = LineNumber;
+	SetCompleateName(tmpString);
+}
+
+
 Edn::File::File(Edn::String &filename, Edn::String &folder, int32_t lineNumber)
 {
 	Edn::String tmpString = folder;
@@ -43,72 +65,182 @@ Edn::File::File(Edn::String &filename, Edn::String &folder, int32_t lineNumber)
 	m_lineNumberOpen = lineNumber;
 }
 
-
 Edn::File::~File(void)
 {
 	// nothing to do ...
 }
 
-void Edn::File::ExtranctAndName(Edn::String &inputString)
-{
-	m_folder = "";
-	m_shortFilename = "";
-	
-	for (int32_t iii=inputString.Size()-1; iii >= 0 ; iii--) {
-		/*
-		if (inputString[iii] != '/') {
-			m_shortFilename.Insert(0, inputString[iii]);
-		} else {
-			break;
-		}
-		*/
-	}
-	
 
-
-/*
-	char tmpVal[4096];
-	strncpy(tmpVal, inputString.c_str(), 4096);
-	tmpVal[4096-1] = '\0';
-	char *ptr = strrchr(tmpVal, '/');
-	if (NULL == ptr) {
-		ptr = strrchr(tmpVal, '\\');
-	}
-	Edn::String out = "./";
-	if (NULL != ptr) {
-		*ptr = '\0';
-		out = tmpVal;
-		out+= '/';
-	}
-	return out;
-*/
-}
-
-
-Edn::String Edn::File::GetFolder(void)
+Edn::String Edn::File::GetFolder(void) const
 {
 	return m_folder;
 }
 
-Edn::String Edn::File::GetShortFilename(void)
+Edn::String Edn::File::GetShortFilename(void) const
 {
 	return m_shortFilename;
 }
 
-Edn::String Edn::File::GetCompleateName(void)
+Edn::String Edn::File::GetCompleateName(void) const
 {
 	Edn::String out;
 	out  = m_folder;
 	out += '/';
 	out += m_shortFilename;
+	return out;
 }
 
+const Edn::File& Edn::File::operator= (const Edn::File &ednF )
+{
+	if( this != &ednF ) // avoid copy to itself
+	{
+		m_folder = ednF.m_folder;
+		m_shortFilename = ednF.m_shortFilename;
+		m_lineNumberOpen = ednF.m_lineNumberOpen;
+	}
+	return *this;
+}
+
+
+/**
+ * @brief 
+ *
+ * @param[in,out] 
+ *
+ * @return 
+ *
+ */
+bool Edn::File::operator== (const Edn::File &ednF) const
+{
+	if( this != &ednF ) {
+		if (ednF.GetCompleateName() == GetCompleateName() ) {
+			return true;
+		} else {
+			return false;
+		}
+		return true;
+	}
+	return true;
+}
+
+/**
+ * @brief 
+ *
+ * @param[in,out] 
+ *
+ * @return 
+ *
+ */
+bool Edn::File::operator!= (const Edn::File &ednF) const
+{
+	return !(*this == ednF);
+}
+
+
 void Edn::File::SetCompleateName(Edn::String &newFilename)
 {
+	char buf[MAX_FILE_NAME];
+	memset(buf, 0, MAX_FILE_NAME);
+	char * ok;
+	// Reset ALL DATA : 
+	m_folder = "";
+	m_shortFilename = "";
+	m_lineNumberOpen = 0;
+	EDN_DEBUG("1 :Set Name : " << newFilename );
+	Edn::String destFilename;
+	if (newFilename.Size() == 0) {
+		destFilename = "no-name";
+	} else {
+		destFilename = newFilename;
+	}
+	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];
+		if (!getcwd(cCurrentPath, FILENAME_MAX)) {
+			return;
+		}
+		cCurrentPath[FILENAME_MAX - 1] = '\0';
+		Edn::String tmpFilename = destFilename;
+		destFilename = cCurrentPath;
+		destFilename += '/';
+		destFilename += tmpFilename;
+	}
+	EDN_DEBUG("3 : Get file Name : " << destFilename );
 	
+	// Get the real Path of the current File
+	ok = realpath(destFilename.c_str(), buf);
+	if (!ok) {
+		int32_t lastPos = destFilename.FindBack('/');
+		if (-1 != lastPos) {
+			// Get the FileName
+			Edn::String tmpFilename = destFilename.Extract(lastPos+1);
+			destFilename.Remove(lastPos, destFilename.Size() - lastPos);
+			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 << "\"");
+				m_shortFilename = tmpFilename;
+				m_folder        = destFilename;
+			} else {
+				// ALL is OK ...
+				m_shortFilename = tmpFilename;
+				m_folder        = destFilename;
+			}
+		} else {
+			EDN_WARNING("file : \"" << destFilename << "\" ==> No data???");
+			// Basic ERROR ...
+			m_shortFilename = destFilename;
+		}
+	} else {
+		destFilename = buf;
+		int32_t lastPos = destFilename.FindBack('/');
+		if (-1 != lastPos) {
+			m_shortFilename = destFilename.Extract(lastPos+1);
+			m_folder        = destFilename.Extract(0, lastPos);
+		} else {
+			// Basic ERROR ...
+			EDN_WARNING("file : \"" << destFilename << "\" ==> No data???");
+			m_shortFilename = destFilename;
+		}
+	}
+	EDN_DEBUG("Set FileName :\"" << m_folder << "\" / \"" << m_shortFilename << "\" ");
 }
 
 int32_t Edn::File::GetLineNumber(void)
 {
 	return m_lineNumberOpen;
-}
+}
+
+void Edn::File::SetLineNumber(int32_t newline)
+{
+	m_lineNumberOpen = newline;
+}
+
+bool Edn::File::HasExtention(void)
+{
+	int32_t lastPos = m_shortFilename.FindBack('.');
+	if(    -1 != lastPos                       // not find the .
+	    && 0  != lastPos                       // Find a . at the fist position .jdlskjdfklj ==> hiden file
+	    && m_shortFilename.Size() != lastPos ) // Remove file ended with .
+	{
+		return true;
+	} else {
+		return false;
+	}
+}
+
+
+Edn::String Edn::File::GetExtention(void)
+{
+	Edn::String tmpExt = "";
+	int32_t lastPos = m_shortFilename.FindBack('.');
+	if(    -1 != lastPos                       // not find the .
+	    && 0  != lastPos                       // Find a . at the fist position .jdlskjdfklj ==> hiden file
+	    && m_shortFilename.Size() != lastPos ) // Remove file ended with .
+	{
+		// Get the FileName
+		tmpExt = m_shortFilename.Extract(lastPos+1);
+	}
+	return tmpExt;
+}

Sources/tools/NameSpaceEdn/File.h

@@ -23,31 +23,44 @@
  *******************************************************************************
  */
 
+#ifndef __EDN__FILE_H__
+#define __EDN__FILE_H__
 
-#ifndef _IN_NAMESPACE_EDN_
-#	error This will be include only in "edn.h"
-#else 
+#define MAX_FILE_NAME      (10240)
 
-class File
+namespace Edn
 {
-	public:
-		            File(void) { m_lineNumberOpen=0; }
-		            File(Edn::String &filename, int32_t LineNumber = 0);
-		            File(Edn::String &filename, Edn::String &folder, int32_t lineNumber = 0);
-		            ~File(void);
-		Edn::String GetFolder(void);
-		Edn::String GetShortFilename(void);
-		Edn::String GetCompleateName(void);
-		int32_t     GetLineNumber(void);
-		
-		void        SetCompleateName(Edn::String &newFilename);
-		
-	private :
-		void        ExtranctAndName(Edn::String &inputString);
-		Edn::String m_folder;
-		Edn::String m_shortFilename;
-		int32_t     m_lineNumberOpen;
-};
+	class File
+	{
+		public:
+			            File(void) { m_lineNumberOpen=0; }
+			            File(Edn::String &filename, int32_t LineNumber = 0);
+			            File(const char  *filename, int32_t LineNumber = 0);
+			            File(Edn::String &filename, Edn::String &folder, int32_t lineNumber = 0);
+			            ~File(void);
+			Edn::String GetFolder(void) const;
+			Edn::String GetShortFilename(void) const;
+			Edn::String GetCompleateName(void) const;
+			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 );
+			bool             operator== (const Edn::File &ednF ) const;
+			bool             operator!= (const Edn::File &ednF ) const;
+			friend std::ostream& operator <<( std::ostream &os,const Edn::File &obj);
+			
+		private :
+			Edn::String m_folder;
+			Edn::String m_shortFilename;
+			int32_t     m_lineNumberOpen;
+	};
+	
+	std::ostream& operator <<(std::ostream &os, const Edn::File &obj);
+	
+}
 
 #endif
 

Sources/tools/NameSpaceEdn/RegExp.cpp

@@ -0,0 +1,488 @@
+/**
+ *******************************************************************************
+ * @file RegExp.cpp
+ * @brief Editeur De N'ours : Regular expression annalyser (sources)
+ * @author Edouard DUPIN
+ * @date 04/04/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 "toolsMemory.h"
+#include "RegExp.h"
+
+
+
+const convertionTable_ts constConvertionTable[] = {
+	// haveBackSlash, inputValue, newValue
+	{ false			, '('		, OPCODE_PTHESE_IN},
+	{ true			, '('		, (int16_t)'('},
+	{ false			, ')'		, OPCODE_PTHESE_OUT},
+	{ true			, ')'		, (int16_t)')'},
+	{ false			, '['		, OPCODE_BRACKET_IN},
+	{ true			, '['		, (int16_t)'['},
+	{ false			, ']'		, OPCODE_BRACKET_OUT},
+	{ true			, ']'		, (int16_t)']'},
+	{ false			, '{'		, OPCODE_BRACE_IN},
+	{ true			, '{'		, (int16_t)'{'},
+	{ false			, '}'		, OPCODE_BRACE_OUT},
+	{ true			, '}'		, (int16_t)'}'},
+	{ false			, '-'		, OPCODE_TO},
+	{ true			, '-'		, (int16_t)'-'},
+	{ false			, '*'		, OPCODE_STAR},
+	{ true			, '*'		, (int16_t)'*'},
+	{ false			, '.'		, OPCODE_DOT},
+	{ true			, '.'		, (int16_t)'.'},
+	{ false			, '?'		, OPCODE_QUESTION},
+	{ true			, '?'		, (int16_t)'?'},
+	{ false			, '+'		, OPCODE_PLUS},
+	{ true			, '+'		, (int16_t)'+'},
+	{ false			, '|'		, OPCODE_PIPE},
+	{ true			, '|'		, (int16_t)'|'},
+	{ false			, '^'		, OPCODE_START_OF_LINE},
+	{ true			, '^'		, (int16_t)'^'},
+	{ false			, '$'		, OPCODE_END_OF_LINE},
+	{ true			, '$'		, (int16_t)'$'},
+	{ true			, 'd'		, OPCODE_DIGIT},
+	{ true			, 'D'		, OPCODE_DIGIT_NOT},
+	{ true			, 'l'		, OPCODE_LETTER},
+	{ true			, 'L'		, OPCODE_LETTER_NOT},
+	{ true			, 's'		, OPCODE_SPACE},
+	{ true			, 'S'		, OPCODE_SPACE_NOT},
+	{ true			, 'w'		, OPCODE_WORD},
+	{ true			, 'W'		, OPCODE_WORD_NOT},
+	{ true			, 'a'		, (int16_t)'\a'},
+	{ true			, 'b'		, (int16_t)'\b'},
+	{ true			, 'e'		, 0x001B}, // Escape character <Esc>
+	{ true			, 'f'		, (int16_t)'\f'},
+	{ true			, 'n'		, (int16_t)'\n'},
+	{ true			, 'r'		, (int16_t)'\r'},
+	{ true			, 't'		, (int16_t)'\t'},
+	{ true			, 'v'		, (int16_t)'\v'},
+	{ true			, '\\'		, (int16_t)'\\'},
+	{ true			, '&'		, (int16_t)'&'},
+	{ true			, '0'		, (int16_t)'\0'},
+	{ true			, '@'		, OPCODE_NO_CHAR},
+};
+const int32_t constConvertionTableSize = sizeof(constConvertionTable) / sizeof(convertionTable_ts) ;
+
+
+/**
+ * @brief Display the internal data of a node
+ *
+ * @param[in] data	element do display in the console
+ *
+ * @return ---
+ *
+ */
+void DisplayData(Edn::VectorType<char> &data)
+{
+	int32_t i;
+	for (i=0; i<(int32_t)data.Size() ; i++) {
+		std::cout<< (char)(data[i]&0x00FF );
+	}
+}
+
+/**
+ * @brief Display of a part of the Regexp element
+ *
+ * @param[in] data		Vector where data is constain
+ * @param[in] start		Position where the display might start
+ * @param[in] stop		Position where the display might stop
+ *
+ * @return ---
+ *
+ */
+void DisplayElem(Edn::VectorType<int16_t> &data, int32_t start, int32_t stop)
+{
+	int32_t i;
+	std::cout<< COLOR_NORMAL;
+	for (i=start; i<(int32_t)data.Size() && i<stop ; i++) {
+		switch(data[i])
+		{
+			case OPCODE_PTHESE_IN:		std::cout<<COLOR_RED		<< (char*)"(" << COLOR_NORMAL;		break;
+			case OPCODE_PTHESE_OUT:		std::cout<<COLOR_RED		<< (char*)")" << COLOR_NORMAL;		break;
+			case OPCODE_BRACKET_IN:		std::cout<<COLOR_YELLOW		<< (char*)"[" << COLOR_NORMAL;		break;
+			case OPCODE_BRACKET_OUT:	std::cout<<COLOR_YELLOW		<< (char*)"]" << COLOR_NORMAL;		break;
+			case OPCODE_TO:				std::cout<<COLOR_YELLOW		<< (char*)"-" << COLOR_NORMAL;		break;
+			case OPCODE_BRACE_IN:		std::cout<<COLOR_GREEN		<< (char*)"{" << COLOR_NORMAL;		break;
+			case OPCODE_BRACE_OUT:		std::cout<<COLOR_GREEN		<< (char*)"}" << COLOR_NORMAL;		break;
+			case OPCODE_STAR:			std::cout<<COLOR_BLUE		<< (char*)"*" << COLOR_NORMAL;		break;
+			case OPCODE_DOT:			std::cout<<COLOR_BLUE		<< (char*)"." << COLOR_NORMAL;		break;
+			case OPCODE_QUESTION:		std::cout<<COLOR_BLUE		<< (char*)"?" << COLOR_NORMAL;		break;
+			case OPCODE_PLUS:			std::cout<<COLOR_BLUE		<< (char*)"+" << COLOR_NORMAL;		break;
+			case OPCODE_PIPE:			std::cout<<COLOR_BLUE		<< (char*)"|" << COLOR_NORMAL;		break;
+			case OPCODE_NO_CHAR:		std::cout<<COLOR_MAGENTA	<< (char*)"@" << COLOR_NORMAL;		break;
+			case OPCODE_START_OF_LINE:	std::cout<<COLOR_MAGENTA	<< (char*)"^" << COLOR_NORMAL;		break;
+			case OPCODE_END_OF_LINE:	std::cout<<COLOR_MAGENTA	<< (char*)"$" << COLOR_NORMAL;		break;
+			case OPCODE_DIGIT:			std::cout<<COLOR_MAGENTA	<< (char*)"\\d" << COLOR_NORMAL;	break;
+			case OPCODE_DIGIT_NOT:		std::cout<<COLOR_MAGENTA	<< (char*)"\\D" << COLOR_NORMAL;	break;
+			case OPCODE_LETTER:			std::cout<<COLOR_MAGENTA	<< (char*)"\\l" << COLOR_NORMAL;	break;
+			case OPCODE_LETTER_NOT:		std::cout<<COLOR_MAGENTA	<< (char*)"\\L" << COLOR_NORMAL;	break;
+			case OPCODE_SPACE:			std::cout<<COLOR_MAGENTA	<< (char*)"\\s" << COLOR_NORMAL;	break;
+			case OPCODE_SPACE_NOT:		std::cout<<COLOR_MAGENTA	<< (char*)"\\S" << COLOR_NORMAL;	break;
+			case OPCODE_WORD:			std::cout<<COLOR_MAGENTA	<< (char*)"\\w" << COLOR_NORMAL;	break;
+			case OPCODE_WORD_NOT:		std::cout<<COLOR_MAGENTA	<< (char*)"\\W" << COLOR_NORMAL;	break;
+			case '\n':					std::cout<<COLOR_MAGENTA	<< (char*)"\\n" << COLOR_NORMAL;	break;
+			case '\t':					std::cout<<COLOR_MAGENTA	<< (char*)"\\t" << COLOR_NORMAL;	break;
+			default:					std::cout<< (char)(data[i]&0x00FF );							break;
+		}
+	}
+}
+char * levelSpace(int32_t level)
+{
+	switch(level)
+	{
+		case 0:		return (char*)"";
+		case 1:		return (char*)"  ";
+		case 2:		return (char*)"    ";
+		case 3:		return (char*)"      ";
+		case 4:		return (char*)"        ";
+		case 5:		return (char*)"          ";
+		case 6:		return (char*)"            ";
+		case 7:		return (char*)"              ";
+		case 8:		return (char*)"                ";
+		case 9:		return (char*)"                  ";
+		case 10:	return (char*)"                    ";
+		case 11:	return (char*)"                      ";
+		case 12:	return (char*)"                        ";
+		case 13:	return (char*)"                          ";
+		case 14:	return (char*)"                            ";
+		case 15:	return (char*)"                              ";
+		case 16:	return (char*)"                                ";
+		default:	return (char*)"                                  ";
+	}
+}
+
+
+/**
+ * @brief
+ *
+ * @param[in,out] ---
+ *
+ * @return ---
+ *
+ */
+int32_t GetLenOfPTheseElem(Edn::VectorType<int16_t> &data, int32_t startPos)
+{
+	int32_t pos = startPos;
+	int32_t nbOpen = 0;
+	// special case of the (...) or | ==> we search '|' or ')'
+	if(		OPCODE_PTHESE_OUT	== data[pos]
+		||	OPCODE_PIPE			== data[pos]) {
+		return 0;
+	}
+	// find size ...
+	while (pos < (int32_t)data.Size() ) {
+		if(OPCODE_PTHESE_IN == data[pos]) {
+			// find a sub section : 
+			nbOpen++;
+		} else if(0 < nbOpen) {
+			if (OPCODE_PTHESE_OUT == data[pos])
+			{
+				nbOpen--;
+				if (0 > nbOpen) {
+					EDN_ERROR("Error in the (...) find element at "<< pos);
+					return -1;
+				}
+			}
+		} else if(		OPCODE_PTHESE_OUT	== data[pos]
+					||	OPCODE_PIPE			== data[pos])
+		{
+			// Find the end of the (...)
+			// just return the size inside
+			int32_t sizeInside = pos - startPos;
+			if (0 >= sizeInside) {
+				EDN_ERROR("Error in the (...) no data at "<< pos-1);
+				return -1;
+			} else {
+					return sizeInside;
+			}
+		}
+		pos++;
+	}
+	return pos - startPos;
+}
+
+/**
+ * @brief
+ *
+ * @param[in,out] ---
+ *
+ * @return ---
+ *
+ */
+int32_t GetLenOfPThese(Edn::VectorType<int16_t> &data, int32_t startPos)
+{
+	int32_t pos = startPos;
+	int32_t nbOpen = 0;
+	// special case of the (...) or | ==> we search '|' or ')'
+	if( OPCODE_PTHESE_OUT == data[pos]) {
+		return 0;
+	} else if( OPCODE_PTHESE_IN == data[pos])
+	{
+		pos++;
+		// find size ...
+		while (pos < (int32_t)data.Size() ) {
+			if(OPCODE_PTHESE_IN == data[pos]) {
+				// find a sub section : 
+				nbOpen++;
+			} else if(0 < nbOpen) {
+				if (OPCODE_PTHESE_OUT == data[pos])
+				{
+					nbOpen--;
+					if (0 > nbOpen) {
+						EDN_ERROR("Error in the (...) find element at "<< pos);
+						return -1;
+					}
+				}
+			} else if( OPCODE_PTHESE_OUT	== data[pos])
+			{
+				// Find the end of the (...)
+				// just return the size inside
+				int32_t sizeInside = pos - startPos-1;
+				if (0 >= sizeInside) {
+					EDN_ERROR("Error in the (...) no data at "<< pos-1);
+					return -1;
+				} else {
+					return sizeInside;
+				}
+			}
+			pos++;
+		}
+	} else {
+		return -1;
+	}
+	return 0;
+}
+
+
+/**
+ * @brief
+ *
+ * @param[in,out] ---
+ *
+ * @return ---
+ *
+ */
+int32_t GetLenOfBracket(Edn::VectorType<int16_t> &data, int32_t startPos)
+{
+	int32_t pos = startPos;
+	// special case of the (...) or | ==> we search '|' or ')'
+	if( OPCODE_BRACKET_OUT == data[pos]) {
+		return 0;
+	} else if( OPCODE_BRACKET_IN == data[pos]) {
+		pos++;
+		// find size ...
+		while (pos < (int32_t)data.Size() ) {
+			if(OPCODE_BRACKET_OUT == data[pos]) {
+				// Find the end of the [...]
+				// just return the size inside
+				int32_t sizeInside = pos - startPos -1 ;
+				if (0 >= sizeInside) {
+					EDN_ERROR("Error in the [...] no data at "<< pos-1);
+					return sizeInside;
+				} else {
+					return sizeInside;
+				}
+			} else if(		OPCODE_TO != data[pos]
+						&&	(		0 > data[pos]
+								||	0xFF < data[pos]) )
+			{
+				EDN_ERROR("Error in the [...] not permited element at "<< pos << " '" << (char)data[pos] << "'");
+				return false;
+			}
+			pos++;
+		}
+	} else {
+		return -1;
+	}
+	return 0;
+}
+
+
+/**
+ * @brief
+ *
+ * @param[in,out] ---
+ *
+ * @return ---
+ *
+ */
+int32_t GetLenOfBrace(Edn::VectorType<int16_t> &data, int32_t startPos)
+{
+	int32_t pos = startPos;
+	// special case of the (...) or | ==> we search '|' or ')'
+	if( OPCODE_BRACE_OUT == data[pos]) {
+		return 0;
+	} else if( OPCODE_BRACE_IN == data[pos]) {
+		pos++;
+		// find size ...
+		while (pos < (int32_t)data.Size() ) {
+			if(OPCODE_BRACE_OUT == data[pos]) {
+				// Find the end of the [...]
+				// just return the size inside
+				int32_t sizeInside = pos - startPos -1 ;
+				if (0 >= sizeInside) {
+					EDN_ERROR("Error in the {...} no data at "<< pos-1);
+					return sizeInside;
+				} else {
+					return sizeInside;
+				}
+			} else if(		',' != data[pos]
+						&&	(		'0' > data[pos]
+								||	'9' < data[pos]) )
+			{
+				EDN_ERROR("Error in the {...} not permited element at "<< pos << " '" << (char)data[pos] << "'");
+				return false;
+			}
+			pos++;
+		}
+	} else {
+		return -1;
+	}
+	return 0;
+}
+
+
+/**
+ * @brief
+ *
+ * @param[in,out] ---
+ *
+ * @return ---
+ *
+ */
+int32_t GetLenOfNormal(Edn::VectorType<int16_t> &data, int32_t startPos)
+{
+	int32_t pos = startPos;
+
+	// find size ...
+	while (pos < (int32_t)data.Size() ) {
+		switch(data[pos])
+		{
+			case OPCODE_PTHESE_IN:
+			case OPCODE_PTHESE_OUT:
+			case OPCODE_BRACKET_IN:
+			case OPCODE_BRACKET_OUT:
+			case OPCODE_BRACE_IN:
+			case OPCODE_BRACE_OUT:
+			case OPCODE_TO:
+			case OPCODE_STAR:
+			case OPCODE_DOT:
+			case OPCODE_QUESTION:
+			case OPCODE_PLUS:
+			case OPCODE_PIPE:
+			case OPCODE_START_OF_LINE:
+			case OPCODE_END_OF_LINE:
+			case OPCODE_DIGIT:
+			case OPCODE_DIGIT_NOT:
+			case OPCODE_LETTER:
+			case OPCODE_LETTER_NOT:
+			case OPCODE_SPACE:
+			case OPCODE_SPACE_NOT:
+			case OPCODE_WORD:
+			case OPCODE_WORD_NOT:
+				{
+					// just return the size inside
+					int32_t sizeInside = pos - startPos;
+					if (0 >= sizeInside) {
+						EDN_ERROR("Error in the normal data :  no data ...");
+					}
+					return sizeInside;
+				}
+				break;
+			default :
+				// nothing to do ...
+				break;
+		}
+		pos++;
+	}
+	return pos - startPos ;
+}
+
+
+/**
+ * @brief
+ *
+ * @param[in,out] ---
+ *
+ * @return ---
+ *
+ */
+bool ParseBrace(Edn::VectorType<int16_t> &data, int32_t &min, int32_t &max)
+{
+	//EDN_INFO("parse {...} in "; DisplayElem(data); );
+	int32_t k=0;
+	
+	int32_t firstElement = 0;
+	int32_t SecondElement = 0;
+	
+	while(k<data.Size()) {
+		if (',' == (char)data[k]) {
+			k++;
+			break;
+		} if ('}' == (char)data[k]) {
+			SecondElement = firstElement;
+			goto allIsSet;
+		} else if ('0' <= (char)data[k] && '9' >= (char)data[k]) {
+			firstElement *=10;
+			firstElement += (char)data[k] - '0';
+		} else {
+			EDN_ERROR("Can not parse this element " << (char)data[k] << " at pos " << k);
+			return false;
+		}
+		k++;
+	}
+	if (k==data.Size()) {
+		SecondElement = firstElement;
+	}
+	while(k<data.Size()) {
+		if (',' == (char)data[k]) {
+			EDN_ERROR("Can not find a second , in {} at pos " << k);
+			return false;
+		} if ('}' == (char)data[k]) {
+			goto allIsSet;
+		} else if ('0' <= (char)data[k] && '9' >= (char)data[k]) {
+			SecondElement *=10;
+			SecondElement += (char)data[k] - '0';
+		} else {
+			EDN_ERROR("Can not parse this element " << (char)data[k] << " at pos " << k);
+			return false;
+		}
+		k++;
+	}
+	
+allIsSet:
+	if (SecondElement == 0 && firstElement != 0) {
+		min = 0;
+		max = firstElement;
+	} else {
+		min = firstElement;
+		max = SecondElement;
+	}
+	if (min > max) {
+		EDN_ERROR("Minimum=" << min << " can not be < maximum=" << max );
+		return false;
+	}
+	return true;
+}
+
+

Sources/tools/NameSpaceEdn/String.cpp

@@ -28,8 +28,13 @@
 
 
 #undef __class__
-#define __class__	"EdnString"
+#define __class__	"Edn::String"
 
+std::ostream& Edn::operator <<(std::ostream &os, const Edn::String &obj)
+{
+	os << (char*)&obj.m_data[0];
+	return os;
+}
 
 /**
  * @brief 
@@ -205,7 +210,7 @@ const Edn::String& Edn::String::operator= (const char * inputData)
  * @return 
  *
  */
-const Edn::String& Edn::String::operator= (EdnVectorBin<int8_t> inputData)
+const Edn::String& Edn::String::operator= (Edn::VectorType<int8_t> inputData)
 {
 	m_data = inputData;
 	if (m_data.Size()>0) {
@@ -385,6 +390,9 @@ Edn::String Edn::String::operator+ (const char * inputData)
 }
 
 
+
+
+
 /**
  * @brief 
  *
@@ -463,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);
 }
 
 
@@ -569,13 +577,15 @@ Edn::String Edn::String::Extract(int32_t posStart, int32_t posEnd)
  * @return The desired vector with data
  *
  */
-EdnVectorBin<int8_t> Edn::String::GetVector(void)
+Edn::VectorType<int8_t> Edn::String::GetVector(void)
 {
-	EdnVectorBin<int8_t> out = m_data;
+	Edn::VectorType<int8_t> out = m_data;
 	out.PopBack();
 	return out;
 }
 
+
+
 /**
  * @brief Unitary test for the string system
  *
@@ -592,57 +602,57 @@ void Edn::TestUntaire_String(void)
 	
 	int32_t iddd = 0;
 	Edn::String * monString = new Edn::String();
-	EDN_INFO("phase : " << iddd++ << " : \"" << monString->c_str() << "\"");
+	EDN_INFO("phase : " << iddd++ << " : \"" << monString << "\"");
 	delete(monString);
 	
 	monString = new Edn::String("test de direct data");
-	EDN_INFO("phase : " << iddd++ << " : \"" << monString->c_str() << "\"");
+	EDN_INFO("phase : " << iddd++ << " : \"" << monString << "\"");
 	delete(monString);
 	
 	monString = new Edn::String("test de direct data", 7);
-	EDN_INFO("phase : " << iddd++ << " : \"" << monString->c_str() << "\"");
+	EDN_INFO("phase : " << iddd++ << " : \"" << monString << "\"");
 	delete(monString);
 	
 	int32_t testId = -6789;
 	monString = new Edn::String(testId);
-	EDN_INFO("phase : " << iddd++ << " : \"" << monString->c_str() << "\"");
+	EDN_INFO("phase : " << iddd++ << " : \"" << monString << "\"");
 	delete(monString);
 	
 	uint32_t testId2 = 12345;
 	monString = new Edn::String((unsigned int)testId2);
-	EDN_INFO("phase : " << iddd++ << " : \"" << monString->c_str() << "\"");
+	EDN_INFO("phase : " << iddd++ << " : \"" << monString << "\"");
 	delete(monString);
 	
 	Edn::String plop = "otherString";
 	monString = new Edn::String(plop);
-	EDN_INFO("phase : " << iddd++ << " : \"" << monString->c_str() << "\"");
+	EDN_INFO("phase : " << iddd++ << " : \"" << monString << "\"");
 	delete(monString);
 	
 	
 	Edn::String s1 = "test de base ...";
 	s1 += s1;
-	EDN_INFO("phase : " << iddd++ << " : \"" << s1.c_str() << "\"");
+	EDN_INFO("phase : " << iddd++ << " : \"" << s1 << "\"");
 	s1 += " plop 2 ";
-	EDN_INFO("phase : " << iddd++ << " : \"" << s1.c_str() << "\"");
+	EDN_INFO("phase : " << iddd++ << " : \"" << s1 << "\"");
 	s1 += plop;
-	EDN_INFO("phase : " << iddd++ << " : \"" << s1.c_str() << "\"");
+	EDN_INFO("phase : " << iddd++ << " : \"" << s1 << "\"");
 	s1 = plop;
-	EDN_INFO("phase : " << iddd++ << " : \"" << s1.c_str() << "\"");
+	EDN_INFO("phase : " << iddd++ << " : \"" << s1 << "\"");
 	s1 = "test direct 44";
-	EDN_INFO("phase : " << iddd++ << " : \"" << s1.c_str() << "\"");
-	EdnVectorBin<int8_t> vb1;
+	EDN_INFO("phase : " << iddd++ << " : \"" << s1 << "\"");
+	Edn::VectorType<int8_t> vb1;
 	vb1.PushBack('v');
 	vb1.PushBack('b');
 	vb1.PushBack('1');
 	s1 = vb1;
-	EDN_INFO("phase : " << iddd++ << " : \"" << s1.c_str() << "\"");
+	EDN_INFO("phase : " << iddd++ << " : \"" << s1 << "\"");
 	vb1.Clear();
 	vb1.PushBack('v');
 	vb1.PushBack('b');
 	vb1.PushBack('2');
 	vb1.PushBack('\0');
 	s1 = vb1;
-	EDN_INFO("phase : " << iddd++ << " : \"" << s1.c_str() << "\"");
+	EDN_INFO("phase : " << iddd++ << " : \"" << s1 << "\"");
 	
 	if (s1 == "vb2") {
 		EDN_INFO("phase : " << iddd++ << " : == OK");

Sources/tools/NameSpaceEdn/String.h

@@ -22,11 +22,13 @@
  *
  *******************************************************************************
  */
+#ifndef __END__STRING_H__
+#define __END__STRING_H__
 
-#ifndef _IN_NAMESPACE_EDN_
-#	error This will be include only in "edn.h"
-#else 
+#include <iostream>
 
+namespace Edn
+{
 	class String
 	{
 		public:
@@ -45,17 +47,17 @@
 			
 			const Edn::String& operator= (const Edn::String &ednS );	// assigment
 			const Edn::String& operator= (const char * inputData);
-			const Edn::String& operator= (EdnVectorBin<int8_t> inputData);
-			bool operator== (const Edn::String& ednS) const;			// == operator
-			bool operator== (const char * inputData) const;
-			bool operator!= (const Edn::String& ednS) const;			// != operator
-			bool operator!= (const char * inputData) const;
+			const Edn::String& operator= (Edn::VectorType<int8_t> inputData);
+			bool  operator== (const Edn::String& ednS) const;			// == operator
+			bool  operator== (const char * inputData) const;
+			bool  operator!= (const Edn::String& ednS) const;			// != operator
+			bool  operator!= (const char * inputData) const;
 			const Edn::String& operator+= (const Edn::String &ednS);	// += operator
 			const Edn::String& operator+= (const char * inputData);
 			Edn::String operator+ (const Edn::String &ednS);			// + operator
 			Edn::String operator+ (const char * inputData);
 			//operator const char *()
-	
+			friend std::ostream& operator <<( std::ostream &os,const Edn::String &obj);
 	
 			bool          IsEmpty(void) const;
 			int32_t       Size(void) const;
@@ -64,7 +66,7 @@
 			void          Remove(int32_t currentID, int32_t len);
 			void          Clear(void);
 	
-			EdnVectorBin<int8_t>    GetVector(void);
+			Edn::VectorType<int8_t> GetVector(void);
 			char *                  c_str(void) { return (char*)&m_data[0]; };
 	
 			// Sting operation :
@@ -73,10 +75,18 @@
 			Edn::String   Extract(int32_t posStart=0, int32_t posEnd=0x7FFFFFFF);
 	
 		private :
-			EdnVectorBin<int8_t> m_data;
+			Edn::VectorType<int8_t> m_data;
 	};
 
 	void TestUntaire_String(void);
+	
+	std::ostream& operator <<(std::ostream &os, const Edn::String &obj);
+	
+}
+
+
+
+
 
 #endif
 

Sources/tools/NameSpaceEdn/Vector.h

@@ -1,7 +1,7 @@
 /**
  *******************************************************************************
- * @file EdnEdnVector.h
- * @brief Editeur De N'ours : Basic EdnVector (template)
+ * @file Vector.h
+ * @brief Editeur De N'ours : Basic Edn::Vector (template)
  * @author Edouard DUPIN
  * @date 07/04/2011
  * @par Project
@@ -26,7 +26,7 @@
 #define __EDN_EdnVector_H__
 
 #undef __class__
-#define __class__	"EdnEdnVector"
+#define __class__	"Edn::Vector"
 
 /**
  * @brief EdnVector classes ...
@@ -62,32 +62,35 @@
  *         ----------                                                               
  *
  */
-template<class T, int32_t INC=0> class EdnVector:
+namespace Edn
+{
+
+template<class T, int32_t INC=0> class Vector
 {
 	public:
-		class Iterator:
+		class Iterator
 		{
 			// Private data : 
 			private:
 				int32_t			  m_current;		// curent Id on the vector
-				EdnVector<T>	* m_EdnVector;		// Pointer on the curent element of the vector
+				Edn::Vector<T>	* m_Vector;		// Pointer on the curent element of the vector
 			public:
 				/**
-				 * @brief Basic itarator constructor with no link with an EdnVector
+				 * @brief Basic itarator constructor with no link with an Vector
 				 */
 				Iterator():
 					m_current(-1),
-					m_EdnVector(NULL)
+					m_Vector(NULL)
 				{
 					// nothing to do ...
 				}
 				/**
-				 * @brief Recopy constructor on a specific EdnVector.
+				 * @brief Recopy constructor on a specific Vector.
 				 * @param[in] otherIterator		The Iterator that might be copy
 				 */
 				Iterator(const Iterator & otherIterator):
 					m_current(otherIterator.m_current),
-					m_EdnVector(otherIterator.m_EdnVector)
+					m_Vector(otherIterator.m_Vector)
 				{
 					// nothing to do ...
 				}
@@ -99,7 +102,7 @@ template<class T, int32_t INC=0> class EdnVector:
 				Iterator& operator=(const Iterator & otherIterator)
 				{
 					m_current = otherIterator.m_current;
-					m_EdnVector = otherIterator.m_EdnVector;
+					m_Vector = otherIterator.m_Vector;
 					return *this;
 				}
 				/**
@@ -108,11 +111,11 @@ template<class T, int32_t INC=0> class EdnVector:
 				~Iterator()
 				{
 					m_current = -1;
-					m_EdnVector = NULL;
+					m_Vector = NULL;
 				}
 				/**
 				 * @brief basic boolean cast
-				 * @return true if the element is present in the EdnVector size
+				 * @return true if the element is present in the Vector size
 				 */
 				operator bool ()
 				{
@@ -204,13 +207,13 @@ template<class T, int32_t INC=0> class EdnVector:
 				 * @return ---
 				 *
 				 */
-				Iterator(EdnVector<T> * EdnVector, int pos):
+				Iterator(Edn::Vector<T> * myVector, int pos):
 					m_current(pos),
-					m_EdnVector(EdnVector)
+					m_Vector(myVector)
 				{
 					// nothing to do ...
 				}
-				friend class EdnVector;
+				friend class Edn::Vector<T>;
 		};
 
 	/**
@@ -221,7 +224,7 @@ template<class T, int32_t INC=0> class EdnVector:
 	 * @return ---
 	 *
 	 */
-	EdnVector(int count = 0):
+	Vector(int count = 0):
 		m_data(NULL),
 		m_count(0),
 		m_size(0)
@@ -237,15 +240,15 @@ template<class T, int32_t INC=0> class EdnVector:
 	 * @return ---
 	 *
 	 */
-	EdnVector(const EdnVector<T> & EdnVector):
-		m_size(EdnVector.m_size),
-		m_count(EdnVector.m_count),
+	Vector(const Edn::Vector<T> & myVector):
+		m_size(myVector.m_size),
+		m_count(myVector.m_count),
 		m_data(NULL)
 	{
 		int32_t i;
 		EDN_MALLOC_CAST(m_data, m_size, T, reinterpret_cast<T*>);
 		for(i=0; i<m_count; i++) {
-			new (&m_data[i]) T(EdnVector[i]);
+			new (&m_data[i]) T(myVector[i]);
 		}
 	}
 	
@@ -257,7 +260,7 @@ template<class T, int32_t INC=0> class EdnVector:
 	 * @return ---
 	 *
 	 */
-	~EdnVector()
+	~Vector()
 	{
 		Destroy();
 	}
@@ -270,7 +273,7 @@ template<class T, int32_t INC=0> class EdnVector:
 	 * @return ---
 	 *
 	 */
-	EdnVector& operator=(const EdnVector<T> & EdnVector)
+	Vector& operator=(const Edn::Vector<T> & EdnVector)
 	{
 		int32_t i;
 		this->~EdnVector(); 
@@ -493,5 +496,11 @@ private:
 		}
 	}
 };
+
+}
+
 #undef __class__
-#define __class__	NULL
+#define __class__	NULL
+
+#endif
+

Sources/tools/NameSpaceEdn/VectorType.h

@@ -1,7 +1,7 @@
 /**
  *******************************************************************************
- * @file EdnEdnVectorBin.h
- * @brief Editeur De N'ours : Basic EdnVectorBin for direct data insertion (template)
+ * @file VectorType.h
+ * @brief Editeur De N'ours : Basic VectorType for direct data insertion (template)
  * @author Edouard DUPIN
  * @date 07/04/2011
  * @par Project
@@ -29,15 +29,13 @@
 #include "toolsMemory.h"
 
 #undef __class__
-#define __class__	"EdnEdnVectorBin"
+#define __class__	"Edn::VectorType"
 
 /**
- * @brief EdnVectorBin classes ...
+ * @brief VectorType classes ...
  *
  * @tparam[in] SIZE Size of the current element.
  *
- * @todo : Need to add : popBack / Assign / Insert / Erase / Swap / Clear
- *
  *              m_data
  *               <------------ m_dataSize ------------>
  *              ----------------------------------------
@@ -65,22 +63,26 @@
  *              ----------------------------------------
  *
  */
-template<typename MY_TYPE=int32_t> class EdnVectorBin
+
+namespace Edn
+{
+
+template<typename MY_TYPE=int32_t> class VectorType
 {
 	public:
 		class Iterator
 		{
-			// Private data : 
+			// Private data :
 			private:
-				int32_t						  m_current;		// curent Id on the vector
-				EdnVectorBin<MY_TYPE>		* m_EdnVectorBin;	// Pointer on the curent element of the vectorBin
+				int32_t                     m_current;          //!< curent Id on the vector
+				VectorType<MY_TYPE> *       m_VectorType;       //!< Pointer on the curent element of the vectorBin
 			public:
 				/**
 				 * @brief Basic itarator constructor with no link with an EdnVector
 				 */
 				Iterator():
 					m_current(-1),
-					m_EdnVectorBin(NULL)
+					m_VectorType(NULL)
 				{
 					// nothing to do ...
 				}
@@ -90,7 +92,7 @@ template<typename MY_TYPE=int32_t> class EdnVectorBin
 				 */
 				Iterator(const Iterator & otherIterator):
 					m_current(otherIterator.m_current),
-					m_EdnVectorBin(otherIterator.m_EdnVectorBin)
+					m_VectorType(otherIterator.m_VectorType)
 				{
 					// nothing to do ...
 				}
@@ -102,7 +104,7 @@ template<typename MY_TYPE=int32_t> class EdnVectorBin
 				Iterator& operator=(const Iterator & otherIterator)
 				{
 					m_current = otherIterator.m_current;
-					m_EdnVectorBin = otherIterator.m_EdnVectorBin;
+					m_VectorType = otherIterator.m_VectorType;
 					return *this;
 				}
 				/**
@@ -111,7 +113,7 @@ template<typename MY_TYPE=int32_t> class EdnVectorBin
 				~Iterator()
 				{
 					m_current = -1;
-					m_EdnVectorBin = NULL;
+					m_VectorType = NULL;
 				}
 				/**
 				 * @brief basic boolean cast
@@ -120,7 +122,7 @@ template<typename MY_TYPE=int32_t> class EdnVectorBin
 				operator bool ()
 				{
 					if(		0 <= m_current
-						&&	m_current < m_EdnVectorBin->Size() )
+						&&	m_current < m_VectorType->Size() )
 					{
 						return true;
 					} else {
@@ -133,8 +135,8 @@ template<typename MY_TYPE=int32_t> class EdnVectorBin
 				 */
 				Iterator& operator++ ()
 				{
-					if(		NULL != m_EdnVectorBin
-						&&	m_current < m_EdnVectorBin->Size() )
+					if(		NULL != m_VectorType
+						&&	m_current < m_VectorType->Size() )
 					{
 						m_current++;
 					}
@@ -177,8 +179,8 @@ template<typename MY_TYPE=int32_t> class EdnVectorBin
 				 */
 				MY_TYPE & operator-> () const
 				{
-					EDN_CHECK_INOUT(m_current >= 0 && m_current < m_EdnVectorBin->Size());
-					return &m_EdnVectorBin->Get(m_current);
+					EDN_CHECK_INOUT(m_current >= 0 && m_current < m_VectorType->Size());
+					return &m_VectorType->Get(m_current);
 				}
 				/**
 				 * @brief Get reference on the current Element
@@ -186,8 +188,8 @@ template<typename MY_TYPE=int32_t> class EdnVectorBin
 				 */
 				MY_TYPE & operator* () const
 				{
-					EDN_CHECK_INOUT(m_current >= 0 && m_current < m_EdnVectorBin->Size());
-					return m_EdnVectorBin->Get(m_current);
+					EDN_CHECK_INOUT(m_current >= 0 && m_current < m_VectorType->Size());
+					return m_VectorType->Get(m_current);
 				}
 			private:
 				/**
@@ -198,26 +200,26 @@ template<typename MY_TYPE=int32_t> class EdnVectorBin
 				 * @return ---
 				 *
 				 */
-				Iterator(EdnVectorBin<MY_TYPE> * Evb, int32_t pos):
+				Iterator(VectorType<MY_TYPE> * Evb, int32_t pos):
 					m_current(pos),
-					m_EdnVectorBin(Evb)
+					m_VectorType(Evb)
 				{
 					// nothing to do ...
 				}
-				friend class EdnVectorBin;
+				friend class VectorType;
 		};
 
 	private:
-		MY_TYPE		* m_data;		//!< pointer on the curetn table of Data
-		int32_t		  m_size;		//!< nb Element in the buffer
-		int32_t		  m_allocated;	//!< Current allocated size
-		int32_t		  m_increment;	//!< methode of increment
+		MY_TYPE *   m_data;         //!< pointer on the curetn table of Data
+		int32_t     m_size;         //!< nb Element in the buffer
+		int32_t     m_allocated;    //!< Current allocated size
+		int32_t     m_increment;    //!< methode of increment
 	public:
 		/**
 		 * @brief Create an empty vector
 		 * @param[in] count		Minimum request size of the Buffer
 		 */
-		EdnVectorBin(int32_t count = 0):
+		VectorType(int32_t count = 0):
 			m_data(NULL),
 			m_size(0),
 			m_allocated(0),
@@ -230,12 +232,12 @@ template<typename MY_TYPE=int32_t> class EdnVectorBin
 		 * @brief Re-copy constructor (copy all needed data)
 		 * @param[in] Evb	Vector that might be copy
 		 */
-		EdnVectorBin(const EdnVectorBin<MY_TYPE> & Evb)
+		VectorType(const Edn::VectorType<MY_TYPE> & Evb)
 		{
 			m_allocated = Evb.m_allocated;
-			m_size = Evb.m_size;
+			m_size      = Evb.m_size;
 			m_increment = Evb.m_increment;
-			m_data = NULL;
+			m_data      = NULL;
 			//EDN_DEBUG("USE Specific vector allocator ... Evb.m_size=" << Evb.m_size << " Evb.m_increment=" << Evb.m_increment);
 			// allocate all same data
 			EDN_MALLOC(m_data, m_allocated, MY_TYPE);
@@ -247,7 +249,7 @@ template<typename MY_TYPE=int32_t> class EdnVectorBin
 		/**
 		 * @brief Destructor of the current Class
 		 */
-		~EdnVectorBin()
+		~VectorType()
 		{
 			if (NULL!=m_data) {
 				EDN_FREE(m_data);
@@ -263,7 +265,7 @@ template<typename MY_TYPE=int32_t> class EdnVectorBin
 		 * @param[in] Evb	Vector that might be copy
 		 * @return reference on the curent re-copy vector
 		 */
-		EdnVectorBin& operator=(const EdnVectorBin<MY_TYPE> & Evb)
+		VectorType& operator=(const Edn::VectorType<MY_TYPE> & Evb)
 		{
 			//EDN_DEBUG("USE RECOPY vector ... Evb.m_size=" << Evb.m_size << " Evb.m_increment=" << Evb.m_increment);
 			if( this != &Evb ) // avoid copy to itself
@@ -290,7 +292,7 @@ template<typename MY_TYPE=int32_t> class EdnVectorBin
 		 * @brief Add at the Last position of the Vector
 		 * @param[in] item	Element to add at the end of vector
 		 */
-		EdnVectorBin& operator+= (const EdnVectorBin<MY_TYPE> & Evb)	// += operator
+		VectorType& operator+= (const Edn::VectorType<MY_TYPE> & Evb)	// += operator
 		{
 			int32_t nbElememt = Evb.Size();
 			int32_t idx = m_size;
@@ -472,7 +474,33 @@ template<typename MY_TYPE=int32_t> class EdnVectorBin
 		}
 
 		/**
-		 * @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
@@ -480,10 +508,10 @@ template<typename MY_TYPE=int32_t> class EdnVectorBin
 		 * @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) {
@@ -502,9 +530,9 @@ template<typename MY_TYPE=int32_t> class EdnVectorBin
 		 * @param[in] posEnd End position to extract data
 		 * @return the extracted vector
 		 */
-		EdnVectorBin Extract(int32_t posStart = 0, int32_t posEnd=0x7FFFFFFF)
+		VectorType Extract(int32_t posStart = 0, int32_t posEnd=0x7FFFFFFF)
 		{
-			EdnVectorBin<MY_TYPE> out;
+			VectorType<MY_TYPE> out;
 			if (posStart < 0) {
 				posStart = 0;
 			} else if (posStart >= Size() ) {
@@ -633,10 +661,11 @@ template<typename MY_TYPE=int32_t> class EdnVectorBin
 			// set the new allocation size
 			m_allocated = requestSize;
 		}
-
 };
+}
 
 #undef __class__
 #define __class__	NULL
 
 #endif
+

Sources/tools/charset/charset.cpp

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

Sources/tools/charset/charset.h

@@ -26,7 +26,7 @@
 #ifndef __CHARSET_H__
 #define __CHARSET_H__
 
-#include "EdnVectorBin.h"
+#include "VectorType.h"
 
 typedef enum {
 	EDN_CHARSET_UTF8,
@@ -49,18 +49,18 @@ typedef enum {
 // transform ISO <==> Unicode
 void    convertIsoToUnicode(charset_te inputCharset, char                   input_ISO,     int32_t &              output_Unicode);
 void    convertUnicodeToIso(charset_te inputCharset, int32_t                input_Unicode, char &                 output_ISO);
-int32_t convertIsoToUnicode(charset_te inputCharset, EdnVectorBin<char>&    input_ISO,     EdnVectorBin<int32_t>& output_Unicode);
-int32_t convertUnicodeToIso(charset_te inputCharset, EdnVectorBin<int32_t>& input_Unicode, EdnVectorBin<char>&    output_ISO);
+int32_t convertIsoToUnicode(charset_te inputCharset, Edn::VectorType<char>&    input_ISO,     Edn::VectorType<int32_t>& output_Unicode);
+int32_t convertUnicodeToIso(charset_te inputCharset, Edn::VectorType<int32_t>& input_Unicode, Edn::VectorType<char>&    output_ISO);
 // Transform UTF-8 <==> Unicode
 void    convertUnicodeToUtf8(                        int32_t                input_Unicode, char *                 output_UTF8);
 void    convertUtf8ToUnicode(                        char *                 input_UTF8,    int32_t&               output_Unicode);
-int32_t convertUnicodeToUtf8(                        EdnVectorBin<int32_t>& input_Unicode, EdnVectorBin<char>&    output_UTF8);
-int32_t convertUtf8ToUnicode(                        EdnVectorBin<char>&    input_UTF8,    EdnVectorBin<int32_t>& output_Unicode);
+int32_t convertUnicodeToUtf8(                        Edn::VectorType<int32_t>& input_Unicode, Edn::VectorType<char>&    output_UTF8);
+int32_t convertUtf8ToUnicode(                        Edn::VectorType<char>&    input_UTF8,    Edn::VectorType<int32_t>& output_Unicode);
 // Transform ISO <==> UTF-8
 void    convertIsoToUtf8(  charset_te inputCharset,  char                   input_ISO,     char *                 output_UTF8);
 void    convertUtf8ToIso(  charset_te inputCharset,  char *                 input_UTF8,    char &                 output_ISO);
-int32_t convertIsoToUtf8(  charset_te inputCharset,  EdnVectorBin<char>&    input_ISO,     EdnVectorBin<char>&    output_UTF8);
-int32_t convertUtf8ToIso(  charset_te inputCharset,  EdnVectorBin<char>&    input_UTF8,    EdnVectorBin<char>&    output_ISO);
+int32_t convertIsoToUtf8(  charset_te inputCharset,  Edn::VectorType<char>&    input_ISO,     Edn::VectorType<char>&    output_UTF8);
+int32_t convertUtf8ToIso(  charset_te inputCharset,  Edn::VectorType<char>&    input_UTF8,    Edn::VectorType<char>&    output_ISO);
 
 void    Utf8_SizeElement(const char * data, int32_t lenMax , uint8_t &size, bool &baseValid);
 int32_t strUtf8Len(const char *input_UTF8);

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);
-	int32_t			getNbColoneBorder(void);
-	int32_t			getNbLineBorder(void);
+	erreurCode_te   init(void);
+	int32_t         getNbColoneBorder(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	UnSetShift(void);
-	bool	IsSetShift(void);
-	void	SetAlt(void);
-	void	UnSetAlt(void);
-	bool	IsSetAlt(void);
-	void	SetCtrl(void);
-	void	UnSetCtrl(void);
-	bool	IsSetCtrl(void);
-	void	SetPomme(void);
-	void	UnSetPomme(void);
-	bool	IsSetPomme(void);
-	void	SetInsert(void);
-	void	UnSetInsert(void);
-	void	ToggleInsert(void);
-	bool	IsSetInsert(void);
-	void	DisplaySystemString(std::vector<int32_t> &data);
+	void    SetShift(void);
+	void    UnSetShift(void);
+	bool    IsSetShift(void);
+	void    SetAlt(void);
+	void    UnSetAlt(void);
+	bool    IsSetAlt(void);
+	void    SetCtrl(void);
+	void    UnSetCtrl(void);
+	bool    IsSetCtrl(void);
+	void    SetPomme(void);
+	void    UnSetPomme(void);
+	bool    IsSetPomme(void);
+	void    SetInsert(void);
+	void    UnSetInsert(void);
+	void    ToggleInsert(void);
+	bool    IsSetInsert(void);
 }
 
 #endif

avancement.boo

@@ -1,142 +1,69 @@
-/* pour voir les appels system*/
-
-# For the first realease :
-	* Syst<73>mes : 
-		- Affichage ligne par ligne
-		- Correction du bug de hl(sub patern empty)
-		- Verifier si le hldisplay reaserch marche avec l'id et pas l'id-1
-		- Gestion correct des charsets
-	* Gui :
-		- Confirmer avant de fermer
-		- Demander de sauver
-		- Controle des droits
-		- Hl-gui management
-		- Event quand un fichier ouvert a changer
-		- Affichage des fichiers binaires
-		- Ctags phase 1
-		- Project manager phase 1
-
-# action a faire (ordonner) :
-	- sys : la methode de close est mauvaise...
-	- gui : Goto line (need only the gui)
-	- 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
-			* Assembleur
-	- 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 ...
+# action a faire (ordonner par r<>vision) :
+* 0.2.X :
+	- gui : Amelioration du full-screen et du display de base (sans l'entete de la fenetre)
+	- gui : display partielle de la fenetre
 	- 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
-	- Correction du bug de display quand on vas vers la fin, et mise en place d'un display qui met toujours le meme temps
-	- Correction du bug des entr<74> bizard tel que les chapot et les guillemets
-	- 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...
-	- PB de copier coller sur les <20><> ...
-	- Charset UTF-8 et iso 8859-15 correcte
-	- Transformation de charset a la vol<6F>
-	- Charset par defaut
-	- D<EFBFBD>ction de charset (<28> mettre dans les todo de charset)
-	
-
-# Text Editor
-
-	- [1]   0% Indent group with Tabulation and shift+tabulation
-	- [1]   0% Basic smart indent : Recopy the start of the previous line when return (copy '\t' and ' ')
-	- [1]   0% Replace Tab with space when press the key
-	- [1]   0% Request save user when quit the software
-	- [1]   0% Hide/Display scroll element when not usefull
-	- [1]   0% Regular expression search
-	- [1]  80% Colorisation syntaxique
-	- [1]  80% Copier / coller ==> probleme sur les caract<63>res sp<73>ciaux comme <20> <20> <20> ...
-	- [1]  10% Search 
-	- [1]  10% Replace
-	- [1]  80% Undo / Redo ajout de caract<63>res autre que " ", "\t" et "\n"
-	- [2]   0% Selectionner en colone
-	- [2]   0% Supression multiple de ligne par la commande ctrl+D
-	- [3]   0% Multi-file search ==> display it in a result buffer (clickable only)
-	- [3]   0% basic UTF8 string management ==> bad with the curent buffer
-	- [5]   0% Replace in all elements of the project file or a part
-	- [5]   0% Multiple Text Editor in the same Time
-	- [5]   0% Support des Macros ==> In python ??? or other ...
-
-# Ctags :
-	- [1] 100% Parse (use the ctags parser)
-	- [1]  50% Find
-	- [1]  50% Jump
-	- [1]  10% History of move (with display)
-
-# Buffer Viewer :
-	- [1]   0% Right menu
-	- [1] 100% Display buffer in color
-	- [1] 100% Display buffer Saved / not Saved
-	- [2]   0% Image of the type of buffer (optionnal)
-
-# Configuration :
-	- [1]   0% Creer une IHM pour les configurations de base
-	- [1]   0% Creer une IHM pour l'edition du hightliner syntaxique (quand il marchera...)
-	- [1]   0% Creer une IHM pour les couleurs (voir la lier avec l'IHM pour le hightliner)
-	- [1]   0% saugegarde automatique de la configuration ou sur demande...
-
-# Project manager :
-	- [2]   0% Faire un editeur des dossiers du projet a ouvrir ==> automatiquement ajouter dans les Ctags
-	- [2]   0% Base
-	- [2]   0% Save All
-	- [2]   0% TreeView
-
-# Tree View :
-	- [2]   0% View
-	- [2]   0% Open File
-	- [2]   0% Jump to the curent File
-	- [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...
-
+	- sys : Mise en place des colorisation de base pour le
+			* java script
+			* SQL
+	- sys : replace TAB with space when Tab is pressed
+	- sys : Catch F[1-12] ==> for user personal event
+	- BUG : Correction du bug des entr<74> bizard tel que les chapot et les guillemets
+	- BUG : de copier coller sur les <20><><EFBFBD> ...
+	- BUG : les caract<63>re multiples type chapot ...
+	- BUG : italique non g<>n<EFBFBD>r<EFBFBD>
+* 0.3.X :
+	- SEARCH : get selected text in the search windows
+	- SEARCH : Select the search windows when call crtl+F
+	- sys : personal property file in the ~/.edn ou ~/.gnome/edn
+	- gui : Ordonner les fichier ouvert par nom ...
+	- gui : parameter gui : et en autre la taille de la police ... et voir pour la r<>cup<75>rer sur le system... et ce serait cool...
+	- gui : Color list selection
+	- gui : Hightlight gui management
+* 0.4.X :
+	- sys : Charset UTF-8 et iso 8859-15 correcte
+	- sys : Transformation de charset a la vol<6F>e
+	- sys : Charset par defaut
+	- Sys : D<>tection de charset (<28> mettre dans les todo de charset)
+				==> regarder les librairies open sources
+* 0.5.X :
+	- prj : list of current files open
+	- prj : open ctags file
+	- sys : replace ALL
+	- sys : Undo / Redo ajout de caract<63>res autre que " ", "\t" et "\n"
+* 0.6.X :
+	- sys : right management ...
+	- HL  : Normalyse all the system of regular expression with <> chapot ...
+	- HL  : sub parsing of the reg exp
+	- sys : update all language
+* 0.7.X :
+- sys : Select in colones
+	- 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)
+* 0.9.X :
+	- int : Redo all the doxygen ...
+* 1.0.X :
+	- gui : open file in binary
+	- sys : compare binary files
+	- sys : compare normal files
+* 1.1.X :
+	- gui : Display content of a folder
+	- gui : add a treeview display
+	- sys : evenement losqu'un fichier est modifier a l'exterieur...
+	- sys : image du type de fichier dans le buffer list view
+* 1.2.X :
+	- PRJ : treeview des dossier a ouvrir
+	- PRJ : GUI de management
+	- PRJ : Save all in project
+	- SYS : Save all modify files
+* 1.3.X :
+	- sys : version system management (git, cvs, ...)
+* 1.4.X :
+	- SYS : Macro generation and acquisition
+* 1.5.X :
+	- GDB : Acces interne pour un debuggeur ==> comme cgdb ... avec l'acces assembleur en plus
 
 # 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,7 +1,8 @@
 <?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>*.mk</ext>
+	<ext>*.global</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
 		<rule name="my preprocesseur">
 			<color>preprocesseur</color>
@@ -9,9 +10,23 @@
 			<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>
+		</rule>
 	</pass1>
 	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
-		
+		<rule name="my keyword">
+			<color>keyword</color>
+			<start>\$\([a-zA-Z_][a-zA-Z0-9_]*\)</start>
+		</rule>
 	</pass2>
 </EdnLang>
 

data/lang_asm.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EdnLang version="0.1" lang="Assembleur">
-	<ext>.s</ext>
-	<ext>.S</ext>
-	<ext>.asm</ext>
+	<ext>*.s</ext>
+	<ext>*.S</ext>
+	<ext>*.asm</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
 		<rule name="my comment multiline doxygen">
 			<color>commentDoxygen</color>
@@ -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">
-	<ext>.boo</ext>
+<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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EdnLang version="0.1" lang="c">
-	<ext>.c</ext>
-	<ext>.cpp</ext>
-	<ext>.h</ext>
-	<ext>.hpp</ext>
+	<ext>*.c</ext>
+	<ext>*.cpp</ext>
+	<ext>*.h</ext>
+	<ext>*.hpp</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
 		<rule name="my comment multiline doxygen">
 			<color>commentDoxygen</color>
@@ -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

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EdnLang version="0.1" lang="php: pretty home page">
+	<ext>*.php</ext>
+	<ext>*.php3</ext>
+	<ext>*.php4</ext>
+	<ext>*.phtml</ext>
+	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
+		<rule name="my comment multiline">
+			<color>comment</color>
+			<start>/\*</start>
+			<end>\*/</end>
+		</rule>
+		<rule name="my todo comment">
+			<color>SYNTAX_ERROR</color>
+			<start>//[ \t]*TODO[ \t]*:</start>
+			<end>\n</end>
+			<EscapeChar>\</EscapeChar>
+		</rule>
+		<rule name="my comment inline">
+			<color>comment</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>"</end>
+			<EscapeChar>\</EscapeChar>
+		</rule>
+		<rule name="simpleQuteText">
+			<color>doubleQuoteText</color>
+			<start>'</start>
+			<end>'</end>
+		</rule>
+	</pass1>
+	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
+		<rule name="my keyword">
+			<color>keyword</color>
+			<start>[\$]+[a-zA-Z_][a-zA-Z0-9_]*</start>
+		</rule>
+		<rule name="my type">
+			<color>type</color>
+			<start>\@array|bool|boolean|double|float|int|integer|numeric|object|resource|string|unset\@</start>
+		</rule>
+		<rule name="my storage keyword">
+			<color>storageKeyword</color>
+			<start>\@abstract|and|as|break|case|catch|class|clone|const|continue|declare|default|die|do|echo|else|elseif|empty|enddeclare|endfor|endforeach|endif|endswitch|endwhile|eval|exit|extends|final|for|foreach|function|global|goto|if|implements|include|include_once|instanceof|interface|isset|list|namespace|new|or|print|private|protected|public|require|require_once|return|static|switch|throw|trait|try|unset|use|var|while|xor\@</start>
+		</rule>
+		<rule name="my common Define">
+			<color>commonDefine</color>
+			<start>\@doubleval|floatval|gettype|intval|print_r|serialize|settype|strval|unserialize|var_dump|var_export\@</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="my boolean">
+			<color>boolean</color>
+			<start>\@true|TRUE|false|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;|&gt;|&amp;&amp;|\{|\}|</start>
+		</rule>
+	</pass2>
+</EdnLang>

data/lang_xml.xml

@@ -1,15 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="Assembleur">
-	<ext>.xml</ext>
+<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">
 			<color>comment</color>
 			<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>
 

licence.txt

@@ -21,7 +21,6 @@ You can NOT:
 	- Add malware in the Sources.
 	- Do something bad with the sources.
 	- Use it to travel in the space with a toaster.
-	- Write Java sources code with this software.
 
-I reserve the right to change this licence. If it change the version of the copy you have keep its own license
+I reserve the right to change this license. If it change the version of the copy you have keep its own license
 

test_transparence.c

@@ -0,0 +1,162 @@
+
+// gcc test_transparence.c -o out `pkg-config --cflags --libs gtk+-3.0` -DUSE_GTK_VERSION_3_0
+// gcc test_transparence.c -o out `pkg-config --cflags --libs gtk+-2.0` -DUSE_GTK_VERSION_2_0
+
+// includes system, malloc, EXIT_SUCCESS
+#include <stdlib.h>
+// includes fopen, fwrite, fseek, ftell
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <assert.h>
+
+
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+#include <cairo.h>
+
+static void screen_changed(GtkWidget *widget, GdkScreen *old_screen, gpointer user_data);
+static gboolean expose(GtkWidget *widget, GdkEventExpose *event, gpointer user_data);
+static void clicked(GtkWindow *win, GdkEventButton *event, gpointer user_data);
+
+
+#if USE_GTK_VERSION_3_0
+const GdkRGBA color = { 1.0, 1.0, 0.0, 0.0};
+#endif
+
+int main(int argc, char **argv)
+{
+    gtk_init(&argc, &argv);
+
+    GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+    gtk_window_set_default_size(GTK_WINDOW(window), 400, 400);
+    gtk_window_set_title(GTK_WINDOW(window), "Alpha Demo");
+    g_signal_connect(G_OBJECT(window), "delete-event", gtk_main_quit, NULL);
+
+    gtk_widget_set_app_paintable(window, TRUE);
+
+	// Remove double-buffering ==> in the current case we can not get the previous display...
+	gtk_widget_set_double_buffered(window, FALSE);
+	
+#	if USE_GTK_VERSION_3_0
+	g_signal_connect(G_OBJECT(window), "draw", G_CALLBACK(expose), NULL);
+#	elif USE_GTK_VERSION_2_0
+    g_signal_connect(G_OBJECT(window), "expose-event", G_CALLBACK(expose), NULL);
+#	endif
+    g_signal_connect(G_OBJECT(window), "screen-changed", G_CALLBACK(screen_changed), NULL);
+#	if USE_GTK_VERSION_3_0
+	GtkStyleContext *context;
+	GdkRGBA rgba;
+	context = gtk_widget_get_style_context(window);
+	gtk_style_context_get_background_color(context, GTK_STATE_FLAG_NORMAL,
+	                                       &rgba);
+	gtk_widget_override_background_color(window,
+	                                     GTK_STATE_FLAG_NORMAL, &rgba);
+/*
+    gtk_widget_override_background_color(window, 
+	                                     GTK_STATE_FLAG_NORMAL,// | GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_INSENSITIVE | GTK_STATE_FLAG_INCONSISTENT | GTK_STATE_FLAG_FOCUSED,
+	                                     &color);
+	
+	gtk_widget_override_color(window, 
+	                                     GTK_STATE_FLAG_NORMAL,// | GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_INSENSITIVE | GTK_STATE_FLAG_INCONSISTENT | GTK_STATE_FLAG_FOCUSED,
+	                                     &color);
+*/
+#endif
+    //gtk_window_set_decorated(GTK_WINDOW(window), FALSE);
+    //gtk_widget_add_events(window, GDK_BUTTON_PRESS_MASK);
+   /* //g_signal_connect(G_OBJECT(window), "button-press-event", G_CALLBACK(clicked), NULL);
+
+    GtkWidget* fixed_container = gtk_fixed_new();
+    gtk_container_add(GTK_CONTAINER(window), fixed_container);
+    GtkWidget* button = gtk_button_new_with_label("button1");
+    gtk_widget_set_size_request(button, 100, 100);
+    gtk_container_add(GTK_CONTAINER(fixed_container), button);
+*/
+    //screen_changed(window, NULL, NULL);
+
+    gtk_widget_show_all(window);
+    gtk_main();
+
+    return 0;
+}
+
+	
+gboolean supports_alpha = FALSE;
+static void screen_changed(GtkWidget *widget, GdkScreen *old_screen, gpointer userdata)
+{
+    /* To check if the display supports alpha channels, get the colormap */
+#	ifdef USE_GTK_VERSION_2_0
+    GdkScreen *screen = gtk_widget_get_screen(widget);
+    
+    GdkColormap *colormap = gdk_screen_get_rgba_colormap(screen);
+
+    if (!colormap)
+    {
+        printf("Your screen does not support alpha channels!\n");
+        colormap = gdk_screen_get_rgb_colormap(screen);
+        supports_alpha = FALSE;
+    }
+    else
+    {
+        printf("Your screen supports alpha channels!\n");
+        supports_alpha = TRUE;
+    }
+
+    gtk_widget_set_colormap(widget, colormap);
+#endif
+   /*
+    gtk_widget_override_background_color(widget, 
+	                                     GTK_STATE_FLAG_NORMAL,// | GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_INSENSITIVE | GTK_STATE_FLAG_INCONSISTENT | GTK_STATE_FLAG_FOCUSED,
+	                                     &color);
+    gtk_widget_override_color(widget, 
+	                                     GTK_STATE_FLAG_NORMAL,// | GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_INSENSITIVE | GTK_STATE_FLAG_INCONSISTENT | GTK_STATE_FLAG_FOCUSED,
+	                                     &color);
+*/
+}
+
+static gboolean expose(GtkWidget *widget, GdkEventExpose *event, gpointer userdata)
+{
+
+	//return FALSE;
+	GdkWindow * m_windows = NULL;
+#   if USE_GTK_VERSION_3_0
+	m_windows = gtk_widget_get_window(widget);
+#   elif USE_GTK_VERSION_2_0
+	m_windows = widget->window;
+#   endif
+	gtk_widget_shape_combine_mask(widget, NULL, 0, 0);
+	cairo_t *cr = gdk_cairo_create(m_windows);
+	
+	
+	
+	//if (TRUE == supports_alpha) {
+		cairo_set_source_rgba (cr, 0.0, 0.0, 1.0, 0.2); // transparent
+	/*} else {
+		cairo_set_source_rgb (cr, 1.0, 0.0, 0.0); // opaque white 
+	}*/
+	/* draw the background */
+	cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+	cairo_paint (cr);
+	
+    /* draw a circle */
+    int width, height;
+    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_destroy(cr);
+
+    return FALSE;
+}
+
+static void clicked(GtkWindow *win, GdkEventButton *event, gpointer user_data)
+{
+    /* toggle window manager frames */
+    gtk_window_set_decorated(win, !gtk_window_get_decorated(win));
+}
+
+

test_transparence2.c

@@ -0,0 +1,292 @@
+/*******************************************************************************
+**3456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 
+**      10        20        30        40        50        60        70        80
+**
+** program:
+**    input_shape_test
+**
+** created:
+**    19.2.2006
+**
+** last change:
+**    20.2.2006
+**
+** author:
+**    Mirco "MacSlow" Mueller <macslow@bangang.de>
+**
+** license:
+**    GPL
+**
+** notes:
+**    - this is a test I did to figure out how to use input-shapes (XShape 1.1)
+**    - opens a decoration-less and transparent gtk+-window and draws a red
+**      cross with a circle around it
+**    - only the parts drawn will be "draggable"
+**    - window can be dragged around with LMB-drag
+**    - window can be resized with MMB-drag (the input-shape also resizes!)
+**    - window can be exited with ESC or q
+**    - needs a compositing manager to run in order to look as intended
+**    - tested with xcompmgr and compiz
+**    - tested with gtk+-2.8.11 and gtk+-2.9.0 (CVS-head)
+**
+** bugs:
+**    - there are no size-checks done for the input-shape, so I don't know what
+**      will happen, if you make the window super large
+**
+** todo:
+**    - nothing
+**
+** compile with:
+**    gcc `pkg-config --cflags --libs gtk+-2.0` input_shape_test.c -o input_shape_test
+**
+*******************************************************************************/
+
+#include <math.h>
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+#if !GTK_CHECK_VERSION(2,9,0)
+#include <X11/Xlib.h>
+#include <X11/extensions/shape.h>
+#include <gdk/gdkx.h>
+#endif
+
+#define WIN_WIDTH 300
+#define WIN_HEIGHT 300
+
+gint g_iCurrentWidth = WIN_WIDTH;
+gint g_iCurrentHeight = WIN_HEIGHT;
+
+void update_input_shape (GtkWidget* pWindow, int iWidth, int iHeight);
+void on_alpha_screen_changed (GtkWidget* pWidget, GdkScreen* pOldScreen, GtkWidget* pLabel);
+void render (cairo_t* pCairoContext, gint iWidth, gint iHeight);
+gboolean on_expose (GtkWidget* pWidget, GdkEventExpose* pExpose);
+gboolean on_key_press (GtkWidget* pWidget, GdkEventKey* pKey, gpointer userData);
+gboolean on_button_press (GtkWidget* pWidget, GdkEventButton* pButton, GdkWindowEdge edge);
+gboolean on_configure (GtkWidget* pWidget, GdkEventConfigure* pEvent, gpointer data);
+#if !GTK_CHECK_VERSION(2,9,0)
+void do_shape_combine_mask (GdkWindow* window, GdkBitmap* mask, gint x, gint y);
+#endif
+void update_input_shape (GtkWidget* pWindow, int iWidth, int iHeight);
+
+void on_alpha_screen_changed (GtkWidget* pWidget,
+							  GdkScreen* pOldScreen,
+							  GtkWidget* pLabel)
+{                       
+	GdkScreen* pScreen = gtk_widget_get_screen (pWidget);
+	GdkColormap* pColormap = gdk_screen_get_rgba_colormap (pScreen);
+      
+	if (!pColormap)
+		pColormap = gdk_screen_get_rgb_colormap (pScreen);
+
+	gtk_widget_set_colormap (pWidget, pColormap);
+}
+
+void render (cairo_t* pCairoContext, gint iWidth, gint iHeight)
+{
+	cairo_scale (pCairoContext, (double) iWidth, (double) iHeight);
+	cairo_set_source_rgba (pCairoContext, 1.0f, 1.0f, 1.0f, 0.0f);
+	cairo_set_operator (pCairoContext, CAIRO_OPERATOR_SOURCE);
+	cairo_paint (pCairoContext);
+	cairo_set_source_rgba (pCairoContext, 1.0f, 0.0f, 0.0f, 0.75f);
+	cairo_set_line_width (pCairoContext, 0.1f);
+	cairo_move_to (pCairoContext, 0.15f, 0.15f);
+	cairo_line_to (pCairoContext, 0.85f, 0.85f);
+	cairo_move_to (pCairoContext, 0.85f, 0.15f);
+	cairo_line_to (pCairoContext, 0.15f, 0.85f);
+	cairo_stroke (pCairoContext);
+	cairo_arc (pCairoContext, 0.5f, 0.5f, 0.45f, 0.0f, M_PI/180.0f * 360.0f);
+	cairo_stroke (pCairoContext);
+}
+
+gboolean on_expose (GtkWidget*		pWidget,
+					GdkEventExpose*	pExpose)
+{
+	gint iWidth;
+	gint iHeight;
+	cairo_t* pCairoContext = NULL;
+
+	pCairoContext = gdk_cairo_create (pWidget->window);
+	if (!pCairoContext)
+		return FALSE;
+
+	gtk_window_get_size (GTK_WINDOW (pWidget), &iWidth, &iHeight);
+	render (pCairoContext, iWidth, iHeight);
+	cairo_destroy (pCairoContext);
+
+	return FALSE;
+}
+
+gboolean on_configure (GtkWidget* pWidget,
+					   GdkEventConfigure* pEvent,
+					   gpointer userData)
+{
+	gint iNewWidth = pEvent->width;
+	gint iNewHeight = pEvent->height;
+
+	if (iNewWidth != g_iCurrentWidth || iNewHeight != g_iCurrentHeight)
+	{
+		update_input_shape (pWidget, iNewWidth, iNewHeight);
+		g_iCurrentWidth = iNewWidth;
+		g_iCurrentHeight = iNewHeight;
+	}
+
+	return FALSE;
+}
+
+gboolean on_key_press (GtkWidget*	pWidget,
+					   GdkEventKey*	pKey,
+					   gpointer		userData)
+{
+	gint iWidth;
+	gint iHeight;
+
+	if (pKey->type == GDK_KEY_PRESS)
+	{
+		switch (pKey->keyval)
+		{
+			case GDK_Escape :
+			case GDK_q :
+				gtk_main_quit ();
+			break;
+		}
+	}
+
+	return FALSE;
+}
+
+gboolean on_button_press (GtkWidget* pWidget,
+						  GdkEventButton* pButton,
+						  GdkWindowEdge edge)
+{
+	if (pButton->type == GDK_BUTTON_PRESS)
+	{
+		if (pButton->button == 1)
+			gtk_window_begin_move_drag (GTK_WINDOW (gtk_widget_get_toplevel (pWidget)),
+										pButton->button,
+										pButton->x_root,
+										pButton->y_root,
+										pButton->time);
+		if (pButton->button == 2)
+			gtk_window_begin_resize_drag (GTK_WINDOW (gtk_widget_get_toplevel (pWidget)),
+										  edge,
+										  pButton->button,
+										  pButton->x_root,
+										  pButton->y_root,
+										  pButton->time);
+    }
+
+	return FALSE;
+}
+
+#if !GTK_CHECK_VERSION(2,9,0)
+/* this is piece by piece taken from gtk+ 2.9.0 (CVS-head with a patch applied
+regarding XShape's input-masks) so people without gtk+ >= 2.9.0 can compile and
+run input_shape_test.c */
+void do_shape_combine_mask (GdkWindow* window,
+							GdkBitmap* mask,
+							gint x,
+							gint y)
+{
+	Pixmap pixmap;
+	int ignore;
+	int maj;
+	int min;
+
+	if (!XShapeQueryExtension (GDK_WINDOW_XDISPLAY (window), &ignore, &ignore))
+		return;
+
+	if (!XShapeQueryVersion (GDK_WINDOW_XDISPLAY (window), &maj, &min))
+		return;
+
+	/* for shaped input we need at least XShape 1.1 */
+	if (maj != 1 && min < 1)
+		return;
+
+	if (mask)
+		pixmap = GDK_DRAWABLE_XID (mask);
+	else
+	{
+		x = 0;
+		y = 0;
+		pixmap = None;
+	}
+
+	XShapeCombineMask (GDK_WINDOW_XDISPLAY (window),
+					   GDK_DRAWABLE_XID (window),
+					   ShapeInput,
+					   x,
+					   y,
+					   pixmap,
+					   ShapeSet);
+}
+#endif
+
+void update_input_shape (GtkWidget* pWindow, int iWidth, int iHeight)
+{
+	static GdkBitmap* pShapeBitmap = NULL;
+	static cairo_t* pCairoContext = NULL;
+
+	pShapeBitmap = (GdkBitmap*) gdk_pixmap_new (NULL, iWidth, iHeight, 1);
+	if (pShapeBitmap)
+	{
+		pCairoContext = gdk_cairo_create (pShapeBitmap);
+		if (cairo_status (pCairoContext) == CAIRO_STATUS_SUCCESS)
+		{
+			render (pCairoContext, iWidth, iHeight);
+			cairo_destroy (pCairoContext);
+#if !GTK_CHECK_VERSION(2,9,0)
+			do_shape_combine_mask (pWindow->window, NULL, 0, 0);
+			do_shape_combine_mask (pWindow->window, pShapeBitmap, 0, 0);
+#else
+			gtk_widget_input_shape_combine_mask (pWindow, NULL, 0, 0);
+			gtk_widget_input_shape_combine_mask (pWindow, pShapeBitmap, 0, 0);
+#endif
+		}
+		g_object_unref ((gpointer) pShapeBitmap);
+	}
+}
+
+int main (int argc, char** argv)
+{
+	GtkWidget* pWindow = NULL;
+	GdkBitmap* pShapeMaskBitmap = NULL;
+
+	gtk_init (&argc, &argv);
+
+	pWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	on_alpha_screen_changed (pWindow, NULL, NULL);
+	gtk_widget_set_app_paintable (pWindow, TRUE);
+	gtk_window_set_decorated (GTK_WINDOW (pWindow), FALSE);
+	gtk_window_set_resizable (GTK_WINDOW (pWindow), TRUE);
+	gtk_window_set_title (GTK_WINDOW (pWindow), "gtk+/XShape 1.1 test");
+	gtk_widget_set_size_request (pWindow, g_iCurrentWidth, g_iCurrentHeight);
+	gtk_widget_add_events (pWindow, GDK_BUTTON_PRESS_MASK);
+	gtk_widget_show (pWindow);
+
+	g_signal_connect (G_OBJECT (pWindow),
+					  "destroy",
+					  G_CALLBACK (gtk_main_quit),
+					  NULL);
+	g_signal_connect (G_OBJECT (pWindow),
+					  "expose-event",
+					  G_CALLBACK (on_expose),
+					  NULL);
+	g_signal_connect (G_OBJECT (pWindow),
+					  "configure-event",
+					  G_CALLBACK (on_configure),
+					  NULL);
+	g_signal_connect (G_OBJECT (pWindow),
+					  "key-press-event",
+					  G_CALLBACK (on_key_press),
+					  NULL);
+	g_signal_connect (G_OBJECT (pWindow),
+					  "button-press-event",
+					  G_CALLBACK (on_button_press),
+					  NULL);
+
+	update_input_shape (pWindow, g_iCurrentWidth, g_iCurrentHeight);
+
+	gtk_main ();
+
+	return 0;
+}