thooge
/
keepassx1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve autotype: 

- remove unneeded variables
- don't move the pointer

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@285 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
sniperbeamer 2009-03-17 16:47:04 +00:00
parent 84aa876dd0
commit d6f675a18b
2 changed files with 3 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/lib/AutoTypeX11.cpp
View File

@ -35,8 +35,6 @@ void initAutoType(KeepassMainWindow* mainWin) {
AutoTypeAction::AutoTypeAction(AutoTypeActionType t, KeySym d) : type(t), data(d){ AutoTypeAction::AutoTypeAction(AutoTypeActionType t, KeySym d) : type(t), data(d){
} }
bool AutoTypeX11::error_detected = false;
AutoTypeX11::AutoTypeX11(KeepassMainWindow* mainWin) { AutoTypeX11::AutoTypeX11(KeepassMainWindow* mainWin) {
this->mainWin = mainWin; this->mainWin = mainWin;
dpy = QX11Info::display(); dpy = QX11Info::display();
@ -46,8 +44,6 @@ AutoTypeX11::AutoTypeX11(KeepassMainWindow* mainWin) {
meta_mask = 0; meta_mask = 0;
altgr_mask = 0; altgr_mask = 0;
altgr_keysym = NoSymbol; altgr_keysym = NoSymbol;
focused_window = None;
focused_subwindow = None;
ReadKeymap(); ReadKeymap();
if (!altgr_mask) if (!altgr_mask)
@ -618,54 +614,11 @@ void AutoTypeX11::ReadKeymap()
*/ */
void AutoTypeX11::SendEvent(XKeyEvent *event) void AutoTypeX11::SendEvent(XKeyEvent *event)
{ {
static bool first = TRUE;
XSync(event->display, FALSE); XSync(event->display, FALSE);
int (*oldHandler) (Display*, XErrorEvent*) = XSetErrorHandler(MyErrorHandler); int (*oldHandler) (Display*, XErrorEvent*) = XSetErrorHandler(MyErrorHandler);
error_detected = FALSE; XTestFakeKeyEvent(event->display, event->keycode, event->type == KeyPress, 0);
if (focused_window != None) { XFlush(event->display);
/* set input focus if input focus is set explicitly */
XSetInputFocus(event->display, focused_window, RevertToParent, CurrentTime);
XSync(event->display, FALSE);
}
if (!error_detected) {
Window root, child, w;
int root_x, root_y, x, y;
unsigned int mask;
int revert_to;
w = None;
first = FALSE;
w = focused_subwindow;
if (w == None)
XGetInputFocus(event->display, &w, &revert_to);
if (w != None) {
XQueryPointer(event->display, w,
&root, &child, &root_x, &root_y, &x, &y, &mask);
XWarpPointer(event->display, None, w, 0, 0, 0, 0, 1, 1);
XFlush(event->display);
}
XTestFakeKeyEvent(event->display, event->keycode, event->type == KeyPress, 0);
XFlush(event->display);
if (w != None) {
XWarpPointer(event->display, None, root, 0, 0, 0, 0, root_x, root_y);
XFlush(event->display);
}
} else {
XTestFakeKeyEvent(event->display, event->keycode, event->type == KeyPress, 0);
XFlush(event->display);
}
if (error_detected) {
/* reset focus because focused window is (probably) no longer exist */
focused_window = None;
focused_subwindow = None;
}
XSetErrorHandler(oldHandler); XSetErrorHandler(oldHandler);
} }
@ -684,10 +637,7 @@ void AutoTypeX11::SendKeyPressedEvent(KeySym keysym, unsigned int shift)
int phase, inx; int phase, inx;
bool found; bool found;
if (focused_subwindow != None) XGetInputFocus(dpy, &cur_focus, &revert_to);
cur_focus = focused_subwindow;
else
XGetInputFocus(dpy, &cur_focus, &revert_to);
found = FALSE; found = FALSE;
keycode = 0; keycode = 0;
@ -856,7 +806,6 @@ int AutoTypeX11::MyErrorHandler(Display *my_dpy, XErrorEvent *event)
{ {
char msg[200]; char msg[200];
error_detected = TRUE;
if (event->error_code == BadWindow) { if (event->error_code == BadWindow) {
return 0; return 0;
} }

3
src/lib/AutoTypeX11.h
View File

@ -59,13 +59,10 @@ class AutoTypeX11 : public AutoType {
KeySym *keysym_table; KeySym *keysym_table;
int min_keycode, max_keycode; int min_keycode, max_keycode;
int keysym_per_keycode; int keysym_per_keycode;
static bool error_detected;
int alt_mask; int alt_mask;
int meta_mask; int meta_mask;
int altgr_mask; int altgr_mask;
KeySym altgr_keysym; KeySym altgr_keysym;
Window focused_window;
Window focused_subwindow;
}; };
#endif // _AUTOTYPEX11_H_ #endif // _AUTOTYPEX11_H_