update po files, use vector in kbsequence

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1219 a592a061-630c-0410-9148-cb99ea01b6c8

ChangeLog

@@ -1,5 +1,10 @@
 2000-11-15  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
+	* src/kbsequence.C (addkey): use a vector as per Andre Poenitz patch.
+
+	* lib/Makefile.am (dist-hook): also delete doc/.cvsignore from
+	distdir. 
+
 	* src/support/lyxfunctional.h: make back_insert_fun_iterator(s)
 	match the requirements from the standard better. This is required
 	to work with gnu libstdc++-v3

lib/Makefile.am

@@ -56,7 +56,7 @@ uninstall-local:
 
 dist-hook:
 	cd ${distdir} ; rm -rf `find . -name \*CVS\*` ; \
-	rm -rf doc/BUGS.lyx ; \
+	rm -rf doc/BUGS.lyx doc/.cvsignore; \
 	{ cvs -Q export -r HEAD -d doc lyxdoc || \
 	  echo "WARNING: Unable to get LyX Documentation from CVS!" ; true ; }
 

po/ChangeLog

@@ -1,3 +1,7 @@
+2000-11-15  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+	* merge te po files with latest pot
+
 2000-10-26  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
 	* merge the po files with latest pot

src/kbsequence.C

@@ -61,6 +61,7 @@ void printKeysym(unsigned int key, unsigned int mod, string & buf);
 int kb_sequence::addkey(unsigned int key,
 			unsigned int mod, unsigned int nmod /*= 0*/)
 {
+#if 0
 	if (length < 0) length = 0;
 
 	if (length + 1 >= size) {
@@ -74,10 +75,24 @@ int kb_sequence::addkey(unsigned int key,
 		if (modifiers != staticmod) delete modifiers;
 		modifiers = nseq;
 	}
-
+#else
+	if (length < 0) {
+		length = 0;
+		sequence.clear();
+		modifiers.clear();
+		//sequence.resize(0);
+		//modifiers.resize(0);
+	}
+#endif
+	
+#if 0
 	modifiers[length]  = mod + (nmod << 16);
 	sequence[length++] = key;
-   
+#else
+	modifiers.push_back(mod + (nmod << 16));
+	sequence.push_back(key);
+	++length;
+#endif
 	if (curmap)
 		return curmap->lookup(key, mod, this);
 	

src/kbsequence.h

@@ -13,9 +13,12 @@
 #pragma interface
 #endif
 
+#include <vector>
 #include "LString.h"
 
+#if 0
 #define KB_PREALLOC  16
+#endif
 
 class kb_keymap;
 
@@ -25,12 +28,17 @@ public:
 	///
 	kb_sequence() {
 		stdmap = curmap = 0;
+#if 0
 		sequence = staticseq;
 		modifiers = staticmod;
-		length = 0; 
+#endif
+		length = 0;
+#if 0
 		size = KB_PREALLOC;
+#endif
 	}
-	
+
+#if 0
 	///
 	~kb_sequence() {
 		if (sequence != staticseq) {
@@ -38,6 +46,7 @@ public:
 			delete modifiers;
 		}
 	}
+#endif
 	
 	/** Add a key to the key sequence and look it up in the curmap
 	    if the latter is defined. */
@@ -72,14 +81,22 @@ public:
 	
 	/** Array holding the current key sequence.
 	    If sequence[length-1] < 0xff it can be used as ISO8859 char */
+#if 0
 	unsigned int * sequence;
+#else
+	std::vector<unsigned int> sequence;
+#endif
 	
 	///
+#if 0
 	unsigned int * modifiers;
+#else
+	std::vector<unsigned int> modifiers;
+#endif
 	
 	/// Current length of key sequence
 	int length;
-	
+#if 0
 private:
 	/// Static array preallocated for sequence
 	unsigned int staticseq[KB_PREALLOC];
@@ -89,6 +106,7 @@ private:
 	
 	/// Physically allocated storage size
 	int size;
+#endif
 };
 
 #endif