used only if the XVKBD_HACKED environment var is defined.
Made keytest.py exploit the -wait_idle option of the hacked xvkbd.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37521
a592a061-630c-0410-9148-
cb99ea01b6c8
FNULL = open('/dev/null', 'w')
FNULL = open('/dev/null', 'w')
+def_delay = '60'
+key_delay = ''
intr_system('import -window root '+screenshot_out+str(x.count)+".png")
time.sleep(0.1)
sys.stdout.flush()
intr_system('import -window root '+screenshot_out+str(x.count)+".png")
time.sleep(0.1)
sys.stdout.flush()
- if (subprocess.call(
- [xvkbd_exe, "-no_root", "-xsendevent", "-window", lyx_window_name, "-delay", DELAY, "-text", keystr],
- stdout=FNULL,stderr=FNULL
- ) == 0):
- sys.stdout.write('*')
+ actual_delay = key_delay
+ if actual_delay == '':
+ actual_delay = def_delay
+ if not xvkbd_hacked:
+ subprocess.call([xvkbd_exe, "-xsendevent", "-window", lyx_window_name,
+ "-delay", actual_delay, "-text", keystr], stdout = FNULL, stderr = FNULL)
+ subprocess.call([xvkbd_exe, "-no_root", "-wait_idle", lyx_pid,
+ "-xsendevent", "-window", lyx_window_name,
+ "-delay", actual_delay, "-text", keystr], stdout = FNULL, stderr = FNULL)
def system_retry(num_retry, cmd):
i = 0
def system_retry(num_retry, cmd):
i = 0
if xvkbd_exe is None:
xvkbd_exe = "xvkbd"
if xvkbd_exe is None:
xvkbd_exe = "xvkbd"
+xvkbd_hacked = os.environ.get('XVKBD_HACKED') != None
+
file_new_command = os.environ.get('FILE_NEW_COMMAND')
if file_new_command is None:
file_new_command = "\Afn"
file_new_command = os.environ.get('FILE_NEW_COMMAND')
if file_new_command is None:
file_new_command = "\Afn"
print 'No path /proc/' + lyx_pid + '/status, exiting'
os._exit(1)
elif c[0:4] == 'KD: ':
print 'No path /proc/' + lyx_pid + '/status, exiting'
os._exit(1)
elif c[0:4] == 'KD: ':
- DELAY = c[4:].rstrip('\n')
- print 'Setting DELAY to ' + DELAY + '.'
+ key_delay = c[4:].rstrip('\n')
+ print 'Setting DELAY to ' + key_delay + '.'
elif c == 'Loop':
RaiseWindow()
sendKeystring(ResetCommand, lyx_pid)
elif c == 'Loop':
RaiseWindow()
sendKeystring(ResetCommand, lyx_pid)
fi
export LYX_EXE=../../../src/lyx
fi
export LYX_EXE=../../../src/lyx
-export XVKBD_EXE=../xvkbd/xvkbd
+
+if [ "$XVKBD_HACKED" != "" ]; then
+ export XVKBD_EXE=${XVKBD:-../xvkbd/xvkbd};
+fi
+
export KEYTEST=../keytest.py
LYX_HOME=out-home
export LYX_USERDIR=$(pwd)/$LYX_HOME/.lyx
export KEYTEST=../keytest.py
LYX_HOME=out-home
export LYX_USERDIR=$(pwd)/$LYX_HOME/.lyx
fi
export MAX_LOOPS=1
export LYX_EXE=${LYX_EXE:-../../src/lyx}
fi
export MAX_LOOPS=1
export LYX_EXE=${LYX_EXE:-../../src/lyx}
-export XVKBD_EXE=${XVKBD_EXE:-./xvkbd/xvkbd}
+
+if [ "$XVKBD_HACKED" != "" ]; then
+ export XVKBD_EXE=${XVKBD_EXE:-./xvkbd/xvkbd};
+else
+ export XVKBD_EXE=${XVKBD_EXE:-xvkbd};
+fi