diff --git a/annotated.html b/annotated.html index 5ffb8bb..18bdc1a 100644 --- a/annotated.html +++ b/annotated.html @@ -3,13 +3,15 @@ - + camlib: Class List + + @@ -32,24 +34,35 @@ - + + +
+
-Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
+
diff --git a/camlib_8h.html b/camlib_8h.html index 2455c4c..998dda0 100644 --- a/camlib_8h.html +++ b/camlib_8h.html @@ -3,13 +3,15 @@ - + camlib: src/camlib.h File Reference + + @@ -32,23 +34,33 @@
- + + + +
Classes | @@ -246,6 +259,9 @@ int ptp_read_uint16_array (uint8_t *dat, uint16_t *buf, int max, int *length)   + +int ptp_read_uint16_array_s (uint8_t *bs, uint8_t *be, uint16_t *buf, int max, int *length) +  int ptp_new_cmd_packet (struct PtpRuntime *r, struct PtpCommand *cmd)   @@ -274,7 +290,8 @@
-Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
+
diff --git a/camlib_8h_source.html b/camlib_8h_source.html index 73e82c6..e2e4a18 100644 --- a/camlib_8h_source.html +++ b/camlib_8h_source.html @@ -3,13 +3,15 @@ - + camlib: src/camlib.h Source File + + @@ -32,18 +34,23 @@
- + + @@ -80,6 +87,7 @@
  • src
    • +
    camlib.h
    @@ -113,7 +121,7 @@
    27void ptp_verbose_log(char *fmt, ...);
    28__attribute__ ((noreturn)) void ptp_panic(char *fmt, ...);
    29
    -
    30// 4mb recommended default buffer size
    +
    30// 1mb default buffer size
    31#define CAMLIB_DEFAULT_SIZE 1000000
    32
    @@ -284,53 +292,54 @@
    267int ptp_write_string(uint8_t *dat, char *string);
    268int ptp_write_utf8_string(void *dat, char *string);
    269int ptp_read_uint16_array(uint8_t *dat, uint16_t *buf, int max, int *length);
    -
    270inline static int ptp_write_u8 (void *buf, uint8_t out) { ((uint8_t *)buf)[0] = out; return 1; }
    -
    271inline static int ptp_write_u16(void *buf, uint16_t out) { ((uint16_t *)buf)[0] = out; return 2; }
    -
    272inline static int ptp_write_u32(void *buf, uint32_t out) { ((uint32_t *)buf)[0] = out; return 4; }
    -
    273inline static int ptp_read_u32 (void *buf, uint32_t *out) { *out = ((uint32_t *)buf)[0]; return 4; }
    -
    274inline static int ptp_read_u16 (void *buf, uint16_t *out) { *out = ((uint16_t *)buf)[0]; return 2; }
    -
    275inline static int ptp_read_u8 (void *buf, uint8_t *out) { *out = ((uint8_t *)buf)[0]; return 1; }
    -
    276
    -
    277// Build a new PTP/IP or PTP/USB command packet in r->data
    -
    278int ptp_new_cmd_packet(struct PtpRuntime *r, struct PtpCommand *cmd);
    -
    279
    -
    280// Only for PTP_USB or PTP_USB_IP use
    -
    281int ptp_new_data_packet(struct PtpRuntime *r, struct PtpCommand *cmd, void *data, int data_length);
    -
    282
    -
    283// Only use for PTP_IP
    -
    284int ptpip_data_start_packet(struct PtpRuntime *r, int data_length);
    -
    285int ptpip_data_end_packet(struct PtpRuntime *r, void *data, int data_length);
    -
    286
    -
    287// Used only by ptp_open_session
    -
    288void ptp_update_transaction(struct PtpRuntime *r, int t);
    -
    289
    -
    290// Set avail info for prop
    -
    291void ptp_set_prop_avail_info(struct PtpRuntime *r, int code, int memb_size, int cnt, void *data);
    -
    292
    -
    293void *ptp_dup_payload(struct PtpRuntime *r);
    -
    294
    -
    295// Write r->data to a file called DUMP
    -
    296int ptp_dump(struct PtpRuntime *r);
    -
    297
    -
    298#define CAMLIB_INCLUDE_IMPL
    -
    299#include "cl_data.h"
    -
    300#include "cl_backend.h"
    -
    301#include "cl_ops.h"
    -
    302#include "cl_enum.h"
    -
    303#include "cl_bind.h"
    -
    304
    -
    305// Backwards compatibility (mostly renamed functions)
    -
    306#ifndef CAMLIB_NO_COMPAT
    -
    307 #define ptp_get_last_transaction(...) ptp_get_last_transaction_id(__VA_ARGS__)
    -
    308 #define ptp_generic_new(...) ptp_new(__VA_ARGS__)
    -
    309 #define ptp_generic_close(...) ptp_close(__VA_ARGS__)
    -
    310 #define ptp_generic_reset(...) ptp_reset(__VA_ARGS__)
    -
    311 #define ptp_generic_init(...) ptp_init(__VA_ARGS__)
    -
    312 #define ptp_generic_send(...) ptp_send(__VA_ARGS__)
    -
    313 #define ptp_generic_send_data(...) ptp_send_data(__VA_ARGS__)
    -
    314#endif
    -
    315
    -
    316#endif
    +
    270int ptp_read_uint16_array_s(uint8_t *bs, uint8_t *be, uint16_t *buf, int max, int *length);
    +
    271inline static int ptp_write_u8 (void *buf, uint8_t out) { ((uint8_t *)buf)[0] = out; return 1; }
    +
    272inline static int ptp_write_u16(void *buf, uint16_t out) { ((uint16_t *)buf)[0] = out; return 2; }
    +
    273inline static int ptp_write_u32(void *buf, uint32_t out) { ((uint32_t *)buf)[0] = out; return 4; }
    +
    274inline static int ptp_read_u32 (void *buf, uint32_t *out) { *out = ((uint32_t *)buf)[0]; return 4; }
    +
    275inline static int ptp_read_u16 (void *buf, uint16_t *out) { *out = ((uint16_t *)buf)[0]; return 2; }
    +
    276inline static int ptp_read_u8 (void *buf, uint8_t *out) { *out = ((uint8_t *)buf)[0]; return 1; }
    +
    277
    +
    278// Build a new PTP/IP or PTP/USB command packet in r->data
    +
    279int ptp_new_cmd_packet(struct PtpRuntime *r, struct PtpCommand *cmd);
    +
    280
    +
    281// Only for PTP_USB or PTP_USB_IP use
    +
    282int ptp_new_data_packet(struct PtpRuntime *r, struct PtpCommand *cmd, void *data, int data_length);
    +
    283
    +
    284// Only use for PTP_IP
    +
    285int ptpip_data_start_packet(struct PtpRuntime *r, int data_length);
    +
    286int ptpip_data_end_packet(struct PtpRuntime *r, void *data, int data_length);
    +
    287
    +
    288// Used only by ptp_open_session
    +
    289void ptp_update_transaction(struct PtpRuntime *r, int t);
    +
    290
    +
    291// Set avail info for prop
    +
    292void ptp_set_prop_avail_info(struct PtpRuntime *r, int code, int memb_size, int cnt, void *data);
    +
    293
    +
    294void *ptp_dup_payload(struct PtpRuntime *r);
    +
    295
    +
    296// Write r->data to a file called DUMP
    +
    297int ptp_dump(struct PtpRuntime *r);
    +
    298
    +
    299#define CAMLIB_INCLUDE_IMPL
    +
    300#include "cl_data.h"
    +
    301#include "cl_backend.h"
    +
    302#include "cl_ops.h"
    +
    303#include "cl_enum.h"
    +
    304#include "cl_bind.h"
    +
    305
    +
    306// Backwards compatibility (mostly renamed functions)
    +
    307#ifndef CAMLIB_NO_COMPAT
    +
    308 #define ptp_get_last_transaction(...) ptp_get_last_transaction_id(__VA_ARGS__)
    +
    309 #define ptp_generic_new(...) ptp_new(__VA_ARGS__)
    +
    310 #define ptp_generic_close(...) ptp_close(__VA_ARGS__)
    +
    311 #define ptp_generic_reset(...) ptp_reset(__VA_ARGS__)
    +
    312 #define ptp_generic_init(...) ptp_init(__VA_ARGS__)
    +
    313 #define ptp_generic_send(...) ptp_send(__VA_ARGS__)
    +
    314 #define ptp_generic_send_data(...) ptp_send_data(__VA_ARGS__)
    +
    315#endif
    +
    316
    +
    317#endif
    ptp_perror
    const char * ptp_perror(int rc)
    Evaluates PtpGeneralError into string message.
    PtpConnType
    PtpConnType
    Tells lib what backend and packet style to use.
    Definition camlib.h:79
    PtpGeneralError
    PtpGeneralError
    Camlib library errors, not PTP return codes.
    Definition camlib.h:34
    @@ -376,7 +385,8 @@
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    + diff --git a/cl__ops_8h.html b/cl__ops_8h.html index 9b6aa87..02d465c 100644 --- a/cl__ops_8h.html +++ b/cl__ops_8h.html @@ -3,13 +3,15 @@ - + camlib: src/cl_ops.h File Reference + + @@ -32,23 +34,33 @@ - + + + +
    Functions
    @@ -187,7 +200,8 @@
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/cl__ops_8h_source.html b/cl__ops_8h_source.html index 56b6a2f..12b4cab 100644 --- a/cl__ops_8h_source.html +++ b/cl__ops_8h_source.html @@ -3,13 +3,15 @@ - + camlib: src/cl_ops.h Source File + + @@ -32,18 +34,23 @@ - + + @@ -80,6 +87,7 @@
  • src
    • +
    cl_ops.h
    @@ -209,7 +217,8 @@
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    + diff --git a/classes.html b/classes.html index 6845f1c..8029cc5 100644 --- a/classes.html +++ b/classes.html @@ -3,13 +3,15 @@ - + camlib: Class Index + + @@ -32,24 +34,35 @@ - + + +
    +
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/dir_49e56c817e5e54854c35e136979f97ca.html b/dir_49e56c817e5e54854c35e136979f97ca.html index c175533..a70954b 100644 --- a/dir_49e56c817e5e54854c35e136979f97ca.html +++ b/dir_49e56c817e5e54854c35e136979f97ca.html @@ -3,13 +3,15 @@ - + camlib: docs Directory Reference + + @@ -32,23 +34,33 @@
    - + + + +
    docs Directory Reference
    @@ -82,7 +95,8 @@
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    + diff --git a/dir_68267d1309a1af8e8297ef4c3efbcdba.html b/dir_68267d1309a1af8e8297ef4c3efbcdba.html index 34fdd78..2e8243a 100644 --- a/dir_68267d1309a1af8e8297ef4c3efbcdba.html +++ b/dir_68267d1309a1af8e8297ef4c3efbcdba.html @@ -3,13 +3,15 @@ - + camlib: src Directory Reference + + @@ -32,23 +34,33 @@ - + + + +
    src Directory Reference
    @@ -90,7 +103,8 @@
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    + diff --git a/doxygen.css b/doxygen.css index 7b7d851..209912c 100644 --- a/doxygen.css +++ b/doxygen.css @@ -1,4 +1,4 @@ -/* The standard CSS for doxygen 1.10.0*/ +/* The standard CSS for doxygen 1.11.0*/ html { /* page base colors */ @@ -657,7 +657,24 @@ dl.el { margin-left: -1cm; } +ul.check { + list-style:none; + text-indent: -16px; + padding-left: 38px; +} +li.unchecked:before { + content: "\2610\A0"; +} +li.checked:before { + content: "\2611\A0"; +} + +ol { + text-indent: 0px; +} + ul { + text-indent: 0px; overflow: visible; } @@ -1614,7 +1631,7 @@ dl.note { border-color: #D0C000; } -dl.warning, dl.attention { +dl.warning, dl.attention, dl.important { margin-left: -7px; padding-left: 3px; border-left: 4px solid; @@ -1662,7 +1679,7 @@ dl.bug dt a, dl.deprecated dt a, dl.todo dt a, dl.test a { font-weight: bold !important; } -dl.warning, dl.attention, dl.note, dl.deprecated, dl.bug, +dl.warning, dl.attention, dl.important, dl.note, dl.deprecated, dl.bug, dl.invariant, dl.pre, dl.post, dl.todo, dl.test, dl.remark { padding: 10px; margin: 10px 0px; @@ -1675,13 +1692,13 @@ dl.section dd { margin-bottom: 2px; } -dl.warning, dl.attention { +dl.warning, dl.attention, dl.important { background: var(--warning-color-bg); border-left: 8px solid var(--warning-color-hl); color: var(--warning-color-text); } -dl.warning dt, dl.attention dt { +dl.warning dt, dl.attention dt, dl.important dt { color: var(--warning-color-hl); } @@ -1739,7 +1756,9 @@ dl.deprecated dt a { color: var(--deprecated-color-hl) !important; } -dl.section dd, dl.bug dd, dl.deprecated dd, dl.todo dd, dl.test dd { +dl.note dd, dl.warning dd, dl.pre dd, dl.post dd, +dl.remark dd, dl.attention dd, dl.important dd, dl.invariant dd, +dl.bug dd, dl.deprecated dd, dl.todo dd, dl.test dd { margin-inline-start: 0px; } diff --git a/doxygen_crawl.html b/doxygen_crawl.html index a6917f0..a0c1707 100644 --- a/doxygen_crawl.html +++ b/doxygen_crawl.html @@ -4,7 +4,7 @@ Validator / crawler helper - + @@ -54,5 +54,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dynsections.js b/dynsections.js index 8f49326..b05f4c8 100644 --- a/dynsections.js +++ b/dynsections.js @@ -23,6 +23,10 @@ @licend The above is the entire license notice for the JavaScript code in this file */ +function toggleVisibility(linkObj) { + return dynsection.toggleVisibility(linkObj); +} + let dynsection = { // helper function diff --git a/files.html b/files.html index 24bcf7d..b5ace73 100644 --- a/files.html +++ b/files.html @@ -3,13 +3,15 @@ - + camlib: File List + + @@ -32,24 +34,35 @@ - + + +
    +
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/functions.html b/functions.html index f8d8a4c..abb507f 100644 --- a/functions.html +++ b/functions.html @@ -3,13 +3,15 @@ - + camlib: Class Members + + @@ -32,24 +34,35 @@
    - + + +
    +
    - w -
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/functions_func.html b/functions_func.html index 34f0413..5e1fb70 100644 --- a/functions_func.html +++ b/functions_func.html @@ -3,13 +3,15 @@ - + camlib: Class Members - Functions + + @@ -32,24 +34,35 @@ - + + +
    +
    - p -
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/functions_vars.html b/functions_vars.html index f986fbe..2dc8147 100644 --- a/functions_vars.html +++ b/functions_vars.html @@ -3,13 +3,15 @@ - + camlib: Class Members - Variables + + @@ -32,24 +34,35 @@ - + + +
    +
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/globals.html b/globals.html index d713990..6ceb295 100644 --- a/globals.html +++ b/globals.html @@ -3,13 +3,15 @@ - + camlib: File Members + + @@ -32,24 +34,35 @@
    - + + +
    +
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/globals_enum.html b/globals_enum.html index 9a0c334..cdce28a 100644 --- a/globals_enum.html +++ b/globals_enum.html @@ -3,13 +3,15 @@ - + camlib: File Members + + @@ -32,24 +34,35 @@
    - + + +
    +
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/globals_func.html b/globals_func.html index a889d85..b080af1 100644 --- a/globals_func.html +++ b/globals_func.html @@ -3,13 +3,15 @@ - + camlib: File Members + + @@ -32,24 +34,35 @@
    - + + +
    +
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/index.html b/index.html index 32ad112..578abd2 100644 --- a/index.html +++ b/index.html @@ -3,13 +3,15 @@ - + camlib: camlib + + @@ -32,24 +34,35 @@
    - + + +
    +

    Checklist

    -
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/md_docs_2chdk.html b/md_docs_2chdk.html index 31f61a6..e5f2f9b 100644 --- a/md_docs_2chdk.html +++ b/md_docs_2chdk.html @@ -3,13 +3,15 @@ - + camlib: CHDK PTP Extension + + @@ -32,23 +34,33 @@ - + + +
    +
    CHDK PTP Extension
    @@ -84,7 +97,8 @@
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/md_docs_2ml.html b/md_docs_2ml.html index 71c4c11..47f2bd5 100644 --- a/md_docs_2ml.html +++ b/md_docs_2ml.html @@ -3,13 +3,15 @@ - + camlib: Magic Lantern PTP Ext (WIP) + + @@ -32,23 +34,33 @@ - + + +
    +
    Magic Lantern PTP Ext (WIP)
    @@ -125,7 +138,8 @@

    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/md_docs_2ptp.html b/md_docs_2ptp.html index 4a4a7de..cd76cad 100644 --- a/md_docs_2ptp.html +++ b/md_docs_2ptp.html @@ -3,13 +3,15 @@ - + camlib: Documentation For Camlib + + @@ -32,23 +34,33 @@ - + + +
    +
    Documentation For Camlib
    @@ -123,7 +136,8 @@

    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/menu.js b/menu.js index 717761d..0fd1e99 100644 --- a/menu.js +++ b/menu.js @@ -22,7 +22,7 @@ @licend The above is the entire license notice for the JavaScript code in this file */ -function initMenu(relPath,searchEnabled,serverSide,searchPage,search) { +function initMenu(relPath,searchEnabled,serverSide,searchPage,search,treeview) { function makeTree(data,relPath) { let result=''; if ('children' in data) { @@ -91,7 +91,7 @@ function initMenu(relPath,searchEnabled,serverSide,searchPage,search) { let prevWidth = 0; if ($mainMenuState.length) { const initResizableIfExists = function() { - if (typeof initResizable==='function') initResizable(); + if (typeof initResizable==='function') initResizable(treeview); } // animate mobile menu $mainMenuState.change(function() { diff --git a/navtree.css b/navtree.css new file mode 100644 index 0000000..69211d4 --- /dev/null +++ b/navtree.css @@ -0,0 +1,149 @@ +#nav-tree .children_ul { + margin:0; + padding:4px; +} + +#nav-tree ul { + list-style:none outside none; + margin:0px; + padding:0px; +} + +#nav-tree li { + white-space:nowrap; + margin:0px; + padding:0px; +} + +#nav-tree .plus { + margin:0px; +} + +#nav-tree .selected { + background-image: url('tab_a.png'); + background-repeat:repeat-x; + color: var(--nav-text-active-color); + text-shadow: var(--nav-text-active-shadow); +} + +#nav-tree .selected .arrow { + color: var(--nav-arrow-selected-color); + text-shadow: none; +} + +#nav-tree img { + margin:0px; + padding:0px; + border:0px; + vertical-align: middle; +} + +#nav-tree a { + text-decoration:none; + padding:0px; + margin:0px; +} + +#nav-tree .label { + margin:0px; + padding:0px; + font: 12px var(--font-family-nav); +} + +#nav-tree .label a { + padding:2px; +} + +#nav-tree .selected a { + text-decoration:none; + color:var(--nav-text-active-color); +} + +#nav-tree .children_ul { + margin:0px; + padding:0px; +} + +#nav-tree .item { + margin:0px; + padding:0px; +} + +#nav-tree { + padding: 0px 0px; + font-size:14px; + overflow:auto; +} + +#doc-content { + overflow:auto; + display:block; + padding:0px; + margin:0px; + -webkit-overflow-scrolling : touch; /* iOS 5+ */ +} + +#side-nav { + padding:0 6px 0 0; + margin: 0px; + display:block; + position: absolute; + left: 0px; + width: $width; + overflow : hidden; +} + +.ui-resizable .ui-resizable-handle { + display:block; +} + +.ui-resizable-e { + background-image:var(--nav-splitbar-image); + background-size:100%; + background-repeat:repeat-y; + background-attachment: scroll; + cursor:ew-resize; + height:100%; + right:0; + top:0; + width:6px; +} + +.ui-resizable-handle { + display:none; + font-size:0.1px; + position:absolute; + z-index:1; +} + +#nav-tree-contents { + margin: 6px 0px 0px 0px; +} + +#nav-tree { + background-repeat:repeat-x; + background-color: var(--nav-background-color); + -webkit-overflow-scrolling : touch; /* iOS 5+ */ +} + +#nav-sync { + position:absolute; + top:5px; + right:24px; + z-index:0; +} + +#nav-sync img { + opacity:0.3; +} + +#nav-sync img:hover { + opacity:0.9; +} + +@media print +{ + #nav-tree { display: none; } + div.ui-resizable-handle { display: none; position: relative; } +} + diff --git a/pages.html b/pages.html index 5bfaac0..76304d6 100644 --- a/pages.html +++ b/pages.html @@ -3,13 +3,15 @@ - + camlib: Related Pages + + @@ -32,24 +34,35 @@ - + + +
    +
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/resize.js b/resize.js new file mode 100644 index 0000000..7d8cdc7 --- /dev/null +++ b/resize.js @@ -0,0 +1,145 @@ +/* + @licstart The following is the entire license notice for the JavaScript code in this file. + + The MIT License (MIT) + + Copyright (C) 1997-2020 by Dimitri van Heesch + + Permission is hereby granted, free of charge, to any person obtaining a copy of this software + and associated documentation files (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, publish, distribute, + sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all copies or + substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING + BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + @licend The above is the entire license notice for the JavaScript code in this file + */ + +function initResizable(treeview) { + let sidenav,navtree,content,header,footer,barWidth=6; + const RESIZE_COOKIE_NAME = ''+'width'; + + function resizeWidth() { + const sidenavWidth = $(sidenav).outerWidth(); + content.css({marginLeft:parseInt(sidenavWidth)+"px"}); + if (typeof page_layout!=='undefined' && page_layout==1) { + footer.css({marginLeft:parseInt(sidenavWidth)+"px"}); + } + Cookie.writeSetting(RESIZE_COOKIE_NAME,sidenavWidth-barWidth); + } + + function restoreWidth(navWidth) { + content.css({marginLeft:parseInt(navWidth)+barWidth+"px"}); + if (typeof page_layout!=='undefined' && page_layout==1) { + footer.css({marginLeft:parseInt(navWidth)+barWidth+"px"}); + } + sidenav.css({width:navWidth + "px"}); + } + + function resizeHeight(treeview) { + const headerHeight = header.outerHeight(); + const windowHeight = $(window).height(); + let contentHeight; + if (treeview) + { + const footerHeight = footer.outerHeight(); + let navtreeHeight,sideNavHeight; + if (typeof page_layout==='undefined' || page_layout==0) { /* DISABLE_INDEX=NO */ + contentHeight = windowHeight - headerHeight - footerHeight; + navtreeHeight = contentHeight; + sideNavHeight = contentHeight; + } else if (page_layout==1) { /* DISABLE_INDEX=YES */ + contentHeight = windowHeight - footerHeight; + navtreeHeight = windowHeight - headerHeight; + sideNavHeight = windowHeight; + } + navtree.css({height:navtreeHeight + "px"}); + sidenav.css({height:sideNavHeight + "px"}); + } + else + { + contentHeight = windowHeight - headerHeight; + } + content.css({height:contentHeight + "px"}); + if (location.hash.slice(1)) { + (document.getElementById(location.hash.slice(1))||document.body).scrollIntoView(); + } + } + + function collapseExpand() { + let newWidth; + if (sidenav.width()>0) { + newWidth=0; + } else { + const width = Cookie.readSetting(RESIZE_COOKIE_NAME,250); + newWidth = (width>250 && width<$(window).width()) ? width : 250; + } + restoreWidth(newWidth); + const sidenavWidth = $(sidenav).outerWidth(); + Cookie.writeSetting(RESIZE_COOKIE_NAME,sidenavWidth-barWidth); + } + + header = $("#top"); + content = $("#doc-content"); + footer = $("#nav-path"); + sidenav = $("#side-nav"); + if (!treeview) { +// title = $("#titlearea"); +// titleH = $(title).height(); +// let animating = false; +// content.on("scroll", function() { +// slideOpts = { duration: 200, +// step: function() { +// contentHeight = $(window).height() - header.outerHeight(); +// content.css({ height : contentHeight + "px" }); +// }, +// done: function() { animating=false; } +// }; +// if (content.scrollTop()>titleH && title.css('display')!='none' && !animating) { +// title.slideUp(slideOpts); +// animating=true; +// } else if (content.scrollTop()<=titleH && title.css('display')=='none' && !animating) { +// title.slideDown(slideOpts); +// animating=true; +// } +// }); + } else { + navtree = $("#nav-tree"); + $(".side-nav-resizable").resizable({resize: function(e, ui) { resizeWidth(); } }); + $(sidenav).resizable({ minWidth: 0 }); + } + $(window).resize(function() { resizeHeight(treeview); }); + if (treeview) + { + const device = navigator.userAgent.toLowerCase(); + const touch_device = device.match(/(iphone|ipod|ipad|android)/); + if (touch_device) { /* wider split bar for touch only devices */ + $(sidenav).css({ paddingRight:'20px' }); + $('.ui-resizable-e').css({ width:'20px' }); + $('#nav-sync').css({ right:'34px' }); + barWidth=20; + } + const width = Cookie.readSetting(RESIZE_COOKIE_NAME,250); + if (width) { restoreWidth(width); } else { resizeWidth(); } + } + resizeHeight(treeview); + const url = location.href; + const i=url.indexOf("#"); + if (i>=0) window.location.hash=url.substr(i); + const _preventDefault = function(evt) { evt.preventDefault(); }; + if (treeview) + { + $("#splitbar").bind("dragstart", _preventDefault).bind("selectstart", _preventDefault); + $(".ui-resizable-handle").dblclick(collapseExpand); + } + $(window).on('load',resizeHeight); +} +/* @license-end */ diff --git a/search/all_1.js b/search/all_1.js index d7f1199..6258ac9 100644 --- a/search/all_1.js +++ b/search/all_1.js @@ -1,7 +1,7 @@ var searchData= [ - ['camlib_0',['camlib',['../index.html',1,'']]], - ['camlib_1',['Documentation For Camlib',['../md_docs_2ptp.html',1,'']]], + ['camlib_0',['Documentation For Camlib',['../md_docs_2ptp.html',1,'']]], + ['camlib_1',['camlib',['../index.html',1,'']]], ['camlib_2eh_2',['camlib.h',['../camlib_8h.html',1,'']]], ['chdk_20ptp_20extension_3',['CHDK PTP Extension',['../md_docs_2chdk.html',1,'']]], ['checklist_4',['Checklist',['../index.html#autotoc_md2',1,'']]], diff --git a/search/pages_0.js b/search/pages_0.js index 37cdea9..8154f36 100644 --- a/search/pages_0.js +++ b/search/pages_0.js @@ -1,6 +1,6 @@ var searchData= [ - ['camlib_0',['camlib',['../index.html',1,'']]], - ['camlib_1',['Documentation For Camlib',['../md_docs_2ptp.html',1,'']]], + ['camlib_0',['Documentation For Camlib',['../md_docs_2ptp.html',1,'']]], + ['camlib_1',['camlib',['../index.html',1,'']]], ['chdk_20ptp_20extension_2',['CHDK PTP Extension',['../md_docs_2chdk.html',1,'']]] ]; diff --git a/structPtpArray-members.html b/structPtpArray-members.html index 2923d41..b7ac248 100644 --- a/structPtpArray-members.html +++ b/structPtpArray-members.html @@ -3,13 +3,15 @@ - + camlib: Member List + + @@ -32,23 +34,33 @@
    - + + +
    +
    PtpArray Member List
    @@ -83,7 +96,8 @@
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    + diff --git a/structPtpArray.html b/structPtpArray.html index 3e087b9..2be28ad 100644 --- a/structPtpArray.html +++ b/structPtpArray.html @@ -3,13 +3,15 @@ - + camlib: PtpArray Struct Reference + + @@ -32,23 +34,33 @@ - + + +
    +
    Public Attributes | @@ -101,7 +114,8 @@
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/structPtpCommand-members.html b/structPtpCommand-members.html index 3511769..c3e51fc 100644 --- a/structPtpCommand-members.html +++ b/structPtpCommand-members.html @@ -3,13 +3,15 @@ - + camlib: Member List + + @@ -32,23 +34,33 @@
    - + + +
    +
    PtpCommand Member List
    @@ -85,7 +98,8 @@
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    + diff --git a/structPtpCommand.html b/structPtpCommand.html index 218779f..d4607bd 100644 --- a/structPtpCommand.html +++ b/structPtpCommand.html @@ -3,13 +3,15 @@ - + camlib: PtpCommand Struct Reference + + @@ -32,23 +34,33 @@ - + + +
    +
    Public Attributes | @@ -107,7 +120,8 @@
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/structPtpGenericEvent-members.html b/structPtpGenericEvent-members.html index 3bb9144..2a77a2e 100644 --- a/structPtpGenericEvent-members.html +++ b/structPtpGenericEvent-members.html @@ -3,13 +3,15 @@ - + camlib: Member List + + @@ -32,23 +34,33 @@
    - + + +
    +
    PtpGenericEvent Member List
    @@ -85,7 +98,8 @@
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    + diff --git a/structPtpGenericEvent.html b/structPtpGenericEvent.html index 939a1de..b6287f9 100644 --- a/structPtpGenericEvent.html +++ b/structPtpGenericEvent.html @@ -3,13 +3,15 @@ - + camlib: PtpGenericEvent Struct Reference + + @@ -32,23 +34,33 @@ - + + +
    +
    Public Attributes | @@ -107,7 +120,8 @@
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/structPtpPropAvail-members.html b/structPtpPropAvail-members.html index 1e0888c..2fa31b1 100644 --- a/structPtpPropAvail-members.html +++ b/structPtpPropAvail-members.html @@ -3,13 +3,15 @@ - + camlib: Member List + + @@ -32,23 +34,33 @@
    - + + +
    +
    PtpPropAvail Member List
    @@ -87,7 +100,8 @@
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    + diff --git a/structPtpPropAvail.html b/structPtpPropAvail.html index c49cf4d..e75b442 100644 --- a/structPtpPropAvail.html +++ b/structPtpPropAvail.html @@ -3,13 +3,15 @@ - + camlib: PtpPropAvail Struct Reference + + @@ -32,23 +34,33 @@ - + + +
    +
    Public Attributes | @@ -113,7 +126,8 @@
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +
    diff --git a/structPtpRuntime-members.html b/structPtpRuntime-members.html index 223e764..facb25d 100644 --- a/structPtpRuntime-members.html +++ b/structPtpRuntime-members.html @@ -3,13 +3,15 @@ - + camlib: Member List + + @@ -32,23 +34,33 @@
    - + + +
    +
    PtpRuntime Member List
    @@ -142,7 +155,8 @@
    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    + diff --git a/structPtpRuntime.html b/structPtpRuntime.html index 1206e2a..7481465 100644 --- a/structPtpRuntime.html +++ b/structPtpRuntime.html @@ -3,13 +3,15 @@ - + camlib: PtpRuntime Struct Reference + + @@ -32,23 +34,33 @@ - + + +
    +
    Public Member Functions | @@ -301,7 +314,7 @@

    int ptp_buffer_resize ( - struct PtpRuntime * r, + struct PtpRuntime * r, @@ -325,7 +338,7 @@

    int ptp_check_opcode ( - struct PtpRuntime * r, + struct PtpRuntime * r, @@ -349,7 +362,7 @@

    int ptp_check_prop ( - struct PtpRuntime * r, + struct PtpRuntime * r, @@ -393,12 +406,12 @@

    int ptp_get_all_known ( - struct PtpRuntime * r, + struct PtpRuntime * r, - struct PtpGenericEvent ** s, + struct PtpGenericEvent ** s, @@ -447,7 +460,7 @@

    uint32_t ptp_get_param ( - struct PtpRuntime * r, + struct PtpRuntime * r, @@ -491,17 +504,17 @@

    int ptp_get_partial_object ( - struct PtpRuntime * r, + struct PtpRuntime * r, - uint32_t handle, + uint32_t handle, - int offset, + int offset, @@ -583,7 +596,7 @@

    int ptp_get_thumbnail ( - struct PtpRuntime * r, + struct PtpRuntime * r, @@ -649,12 +662,12 @@

    int ptp_set_generic_property ( - struct PtpRuntime * r, + struct PtpRuntime * r, - const char * name, + const char * name, @@ -678,7 +691,7 @@

    int ptpip_init_command_request ( - struct PtpRuntime * r, + struct PtpRuntime * r, @@ -815,7 +828,8 @@

    -Generated by doxygen 1.10.0 +Generated by doxygen 1.11.0
    +