Merge pull request #1896 from koreader/houqp-master

bump bump bump

base

@@ -1 +1 @@
-Subproject commit 8cdf526854572969436f7820eab73d99a57e9bed
+Subproject commit b4b578c0b9f2108231af33acb6534c526daab9ed

kodev

@@ -213,9 +213,13 @@ usage: run <OPTIONS> <ARGS>
 
 OPTIONS:
 
+    -h, --screen-height set height of the emulator screen (default: 720)
+    -w, --screen-width  set width of the emulator screen (default: 540)
     --no-build          run reader without rebuilding
     --disable-touch     use this if you want to simulate keyboard only devices
     "
+    screen_width=540
+    screen_height=720
     while [[ $1 == '-'* ]]; do
         PARAM=`echo $1 | awk -F= '{print $1}'`
         VALUE=`echo $1 | awk -F= '{print $2}'`
@@ -226,6 +230,12 @@ OPTIONS:
             --no-build)
                 no_build=true
                 ;;
+            -w | --screen-width)
+                screen_width=${VALUE}
+                ;;
+            -h | --screen-height)
+                screen_height=${VALUE}
+                ;;
             -h | --help)
                 echo "${RUN_HELP_MSG}"
                 exit 0
@@ -261,7 +271,8 @@ OPTIONS:
         [[ $args != /* ]] && args="${CURDIR}/$1"
     fi
 
-    EMULATE_READER_W=540 EMULATE_READER_H=720 ./reader.lua -d $args
+    EMULATE_READER_W=${screen_width} EMULATE_READER_H=${screen_height} \
+        ./reader.lua -d $args
     popd
 }
 

platform/android/luajit-launcher

@@ -1 +1 @@
-Subproject commit f0284840b3a8d618381b1e4cb6ca330369a02eb5
+Subproject commit f355af98916e9d534d4c73d7772e7924f1ad8b31