diff --git a/base b/base index 8c6551aa6..55025930a 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 8c6551aa615a79ed5d3892f993806056997d3009 +Subproject commit 55025930a2d524073afd7f62d62afc97281ea02c diff --git a/doc/config.ld b/doc/config.ld index 4491ff97f..518126e38 100644 --- a/doc/config.ld +++ b/doc/config.ld @@ -18,4 +18,7 @@ topics = { package = '' format = 'markdown' sort_modules = true -file = '../frontend' +file = { + '../frontend', + '../base/ffi', +} diff --git a/kodev b/kodev index 589251a7f..336d95f6a 100755 --- a/kodev +++ b/kodev @@ -300,10 +300,11 @@ OPTIONS: -h=X, --screen-height=X set height of the emulator screen (default: 720) -w=X, --screen-width=X set width of the emulator screen (default: 540) + -d=X, --screen-dpi=X set DPI of the emulator screen (default: 160) --no-build run reader without rebuilding --disable-touch use this if you want to simulate keyboard only devices -s=FOO --simulate=FOO simulate dimension and other specs for a given device model - supported model: kobo-aura-one, kindle3 + supported model: kobo-aura-one, kindle3, hidpi " screen_width=540 screen_height=720 @@ -323,6 +324,9 @@ OPTIONS: -h | --screen-height) screen_height=${VALUE} ;; + -d | --screen-dpi) + screen_dpi=${VALUE} + ;; -s | --simulate) device_model=${VALUE} case ${device_model} in @@ -333,6 +337,12 @@ OPTIONS: kobo-aura-one) screen_width=1404 screen_height=1872 + screen_dpi=300 + ;; + hidpi) + screen_width=1500 + screen_height=2000 + screen_dpi=600 ;; *) echo "ERROR: spec unknown for ${device_model}." @@ -375,7 +385,7 @@ OPTIONS: RETURN_VALUE=85 while [ $RETURN_VALUE -eq 85 ]; do - EMULATE_READER_W=${screen_width} EMULATE_READER_H=${screen_height} \ + EMULATE_READER_W=${screen_width} EMULATE_READER_H=${screen_height} EMULATE_READER_DPI=${screen_dpi} \ ./reader.lua -d "$args" RETURN_VALUE=$? done