From b08e5e8fad06457a56c6b4fc1cab15a172de5eaa Mon Sep 17 00:00:00 2001
From: tariq <tariq@b624d157-de02-0410-bad0-e51aec6abb33>
Date: Mon, 24 Apr 2006 19:42:13 +0000
Subject: [PATCH] added main window icon, implemented template replacement for
 Auto-Type

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@76 b624d157-de02-0410-bad0-e51aec6abb33
---
 share/keepass/icons/keepassx.png | Bin 0 -> 806 bytes
 src/lib/AutoType.cpp             | 114 +++++++++++++++++++++++--------
 src/lib/AutoType.h               |   2 +
 src/main.cpp                     |   2 +
 src/mainwindow.cpp               |   1 +
 5 files changed, 90 insertions(+), 29 deletions(-)
 create mode 100644 share/keepass/icons/keepassx.png

diff --git a/share/keepass/icons/keepassx.png b/share/keepass/icons/keepassx.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3f1198ffac155dc909d47a3a52a68b05c46ddf7
GIT binary patch
literal 806
zcmV+>1KIqEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)&vy}1uWmi;Zpzr0<%d(
zK~y-)Ws*;5TvZf@zj^ODnT%uq1WH?pNt{k&aS^Ja#S|;31)+7N8=(j;x)DTNs8A?~
zE~>?qE4OtmxNsxX2C9WdZIhH(s?{(_W3By{nD?eL^X@zMoabUP$=Kf2J#g=L?(aLd
zzys^euZ~ni{RduU!g3qPB*RQs)O5;;`~2MdzuxaXU+684o<6)+RK6MAx#!89TLuXV
z0hSwadzGbob*?PVEtuJB7mi=M{1D*i>BE)GyV>#TbG3HX;_8h#8m$Iu$|GUK@b)SI
z7k`_YSF^F%kC)m2K^KsD_x7$Gqc!mv7yrCaPnz+F6IXOuT8x|V$n>>eZnj;Ek;khw
zk?fuBy{NlU(}^wR0jBFeA?jcK{=MnzJ?XAL^U=_uKW_Yfb#!nKYBuo@z-4Y*6htJ=
zm`vQlgL1u>g`|-Y1|i<dw*NUeIe9#vssGG!vW%+dz|$`PAYM@Ohzd>|=P#ebOnJ0i
zVfWA|Umu$+L;!hioO=CB0Q#eHr=tmdQK<t`p)F0`eW``00PxATA8thO>H)ZNYnIKW
ztwcd5*{0HF)QmX&m%rmBR@*B$NjbRd5Ki0%!1)xff;Z3k`Ll#!#EZLM;fu+Wgki)R
z``+Tx;uMW`LT$%WSgxq)20%^GT=6RG8$Lj#Z&P=)+`L@}U~KSNmYa8RK3(&ZvHlOT
zwZfa{$N97TFn@-i5a4`9D{bP<b7^skxuqG*3{hE+9d$c(#f=Y7u(f{xfD=bP#d*iw
z`?nZ-Vw^k4KRBOaxgjDO08znmBbAi7zh<bE9;3flrWh8n+*oa`a3{G<(u%2WuK{4a
z4l;2#pR#}Gc@9=zrY|bdAC(D%5H+QlHAq}cTUuCdo!6@NPQmfncPH@Pujf-!#AldU
kr&h&GQ8V&9N7o$u2WK{`21HHOQ2+n{07*qoM6N<$f<Nqj)&Kwi

literal 0
HcmV?d00001

diff --git a/src/lib/AutoType.cpp b/src/lib/AutoType.cpp
index c9f20ff..7027812 100644
--- a/src/lib/AutoType.cpp
+++ b/src/lib/AutoType.cpp
@@ -47,14 +47,14 @@ switch(mods){
 	case 0: //no modifier
 			break;
 	case 1: //Shift
-			XTestFakeKeyEvent(d,XKeysymToKeycode(d,XK_Shift_L),press,5);
+			XTestFakeKeyEvent(d,XKeysymToKeycode(d,XK_Shift_L),press,2);
 			break;
 	case 2: //AltGr
-			XTestFakeKeyEvent(d,XKeysymToKeycode(d,XK_ISO_Level3_Shift),press,5);
+			XTestFakeKeyEvent(d,XKeysymToKeycode(d,XK_ISO_Level3_Shift),press,2);
 			break;
 	case 3: //Shift+AltGr
-			XTestFakeKeyEvent(d,XKeysymToKeycode(d,XK_Shift_L),press,5);
-			XTestFakeKeyEvent(d,XKeysymToKeycode(d,XK_ISO_Level3_Shift),press,5);
+			XTestFakeKeyEvent(d,XKeysymToKeycode(d,XK_Shift_L),press,2);
+			XTestFakeKeyEvent(d,XKeysymToKeycode(d,XK_ISO_Level3_Shift),press,2);
 			break;
 }
 }
@@ -79,46 +79,102 @@ if(c==1){
 else
 	str="{USERNAME}{TAB}{PASSWORD}{ENTER}";
 
-/*
-KeePass/Win template compatibility:
-only supported syntax is:{TEMPLATE-NAME}
-%TEMPLATE-NAME% syntax is not supported!
-*/
-
-str.replace("{TITLE}",entry->Title,Qt::CaseInsensitive);
-str.replace("{USERNAME}",entry->UserName,Qt::CaseInsensitive);
-entry->Password.unlock();
-str.replace("{PASSWORD}",entry->Password.string(),Qt::CaseInsensitive);
-entry->Password.lock();
-str.replace("{URL}",entry->URL,Qt::CaseInsensitive);
-str.replace("{SPACE}",QString(" "),Qt::CaseInsensitive);
-str.replace("{ADD}",QString("+"),Qt::CaseInsensitive);
-str.replace("{SUBTRACT}",QString("-"),Qt::CaseInsensitive);
-str.replace("{DIVIDE}",QString("/"),Qt::CaseInsensitive);
-str.replace("{MULTIPLY}",QString("*"),Qt::CaseInsensitive);
-str.replace("{PLUS}",QString("+"),Qt::CaseInsensitive);
-
-
-
 QList<Q_UINT16> Keys;
-for(int i=0;i<str.length();i++){
-	Keys << getKeysym(str.at(i));
+for(int i=0;i<str.size();i++){
+	if(str[i]=='{'){
+		int start=i;
+		QString tmpl;
+		i++;
+		while(str[i]!='}' && i<str.size()){
+			tmpl += str[i];
+			i++;
+		}
+		if(i>=str.size()){
+			err=tr("Syntax Error in Auto-Type sequence near character %1\n\
+					Found '{' without closing '}'").arg(i+10);
+			return;
+		}
+		templateToKeysyms(tmpl.lower(),Keys,entry);
+		continue;
+	}
+	else
+		Keys << getKeysym(str[i]);
 }
 
+
+
 MainWin->hide();
 Display* pDisplay = XOpenDisplay( NULL );
 for(int i=0;i<Keys.size();i++){
 	int keycode=XKeysymToKeycode(pDisplay,Keys[i]);
 	int mods=getModifiers(pDisplay,Keys[i],keycode);
 	pressModifiers(pDisplay,mods);
-	XTestFakeKeyEvent(pDisplay,keycode,True,5);
-	XTestFakeKeyEvent(pDisplay,keycode,False,5);
+	XTestFakeKeyEvent(pDisplay,keycode,True,0);
+	XTestFakeKeyEvent(pDisplay,keycode,False,1);
 	releaseModifiers(pDisplay,mods);
 }
 XCloseDisplay(pDisplay);
 MainWin->show();
 }
 
+void AutoType::templateToKeysyms(const QString& tmpl, QList<quint16>& keys,CEntry* entry){
+//tmpl must be lower case!!!
+if(!tmpl.compare("title")){
+	stringToKeysyms(entry->Title,keys);
+	return;}
+if(!tmpl.compare("username")){
+	stringToKeysyms(entry->UserName,keys);
+	return;}
+if(!tmpl.compare("url")){
+	stringToKeysyms(entry->URL,keys);
+	return;}
+if(!tmpl.compare("password")){
+	entry->Password.unlock();
+	stringToKeysyms(entry->Password.string(),keys);
+	entry->Password.lock();
+	return;
+}
+if(!tmpl.compare("space")){
+	keys << getKeysym(' ');
+	return;}
+
+if(!tmpl.compare("backspace") || !tmpl.compare("bs") || !tmpl.compare("bksp")){
+	keys << XK_BackSpace;
+	return;}
+
+if(!tmpl.compare("break")){
+	keys << XK_Break;
+	return;}
+
+if(!tmpl.compare("capslock")){
+	keys << XK_Caps_Lock;
+	return;}
+
+if(!tmpl.compare("del") || !tmpl.compare("delete")){
+	keys << XK_Delete;
+	return;}
+
+if(!tmpl.compare("end")){
+	keys << XK_End;
+	return;}
+
+if(!tmpl.compare("enter")){
+	keys << XK_Return;
+	return;}
+
+if(!tmpl.compare("esc")){
+	keys << XK_Escape;
+	return;}
+
+if(!tmpl.compare("help")){
+	keys << XK_Help;
+	return;}
+}
+
+void AutoType::stringToKeysyms(const QString& string,QList<quint16>& KeySymList){
+for(int i=0; i<string.length();i++)
+	KeySymList << getKeysym(string[i]);
+}
 
 
 
diff --git a/src/lib/AutoType.h b/src/lib/AutoType.h
index b50f5ac..cab1121 100644
--- a/src/lib/AutoType.h
+++ b/src/lib/AutoType.h
@@ -48,6 +48,8 @@ private:
  static int getModifiers(Display*,KeySym,int);
  static void pressModifiers(Display*,int,bool Press=true);
  static void releaseModifiers(Display*,int);
+ static void templateToKeysyms(const QString& Template, QList<quint16>& KeySymList,CEntry* entry);
+ static void stringToKeysyms(const QString& string,QList<quint16>& KeySymList);
  
 
 
diff --git a/src/main.cpp b/src/main.cpp
index 6c2a47b..1111cdd 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -233,6 +233,8 @@ void loadImages(){
 
 bool small=true;
 QString ThemeDir=AppDir+"/../share/keepass/icons/nuvola/32x32";
+
+
 QPixmap tmpImg;
 
 //-----------------------
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 64c77d0..9011b54 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -174,6 +174,7 @@ void KeepassMainWindow::setupToolbar(){
 }
 
 void KeepassMainWindow::setupIcons(){
+setWindowIcon(QIcon(AppDir+"/../share/keepass/icons/keepassx.png"));
 FileNewAction->setIcon(*Icon_FileNew);
 FileOpenAction->setIcon(*Icon_FileOpen);
 FileSaveAction->setIcon(*Icon_FileSave);