diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2009-04-15 08:35:28 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2009-04-15 08:35:28 +0000 |
| commit | d3206f01ec18e61e8cd9c7e88b02a6313ab227fa (patch) | |
| tree | ada81f236fbf8b967f5de8d45b39ad23cbd75d7f /FL | |
| parent | b214cef3a8d2d9ecf0df7bef7d10dcdfbca4d9d3 (diff) | |
More Fl_Input keyboard fixes / OS X transparency for RGBA data / some utf8 reorganisation
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6765 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl.H | 5 | ||||
| -rw-r--r-- | FL/Fl_Input_.H | 6 | ||||
| -rw-r--r-- | FL/fl_utf8.h | 18 |
3 files changed, 27 insertions, 2 deletions
@@ -1014,6 +1014,11 @@ public: }; + /** \defgroup fl_unicode Unicode and UTF-8 functions + fl global Unicode and UTF-8 ahndling functions + @{ */ + /** @} */ + #endif // !Fl_H // diff --git a/FL/Fl_Input_.H b/FL/Fl_Input_.H index e72062c2f..dbddbd895 100644 --- a/FL/Fl_Input_.H +++ b/FL/Fl_Input_.H @@ -145,7 +145,7 @@ public: Same as value()[n], but may be faster in plausible implementations. No bounds checking is done. */ -char index(int i) const {return value_[i];} + char index(int i) const {return value_[i];} /** Returns the number of characters in value(). This may be greater than strlen(value()) if there are nul @@ -265,6 +265,10 @@ char index(int i) const {return value_[i];} */ void wrap(int b) { if (b) type((uchar)(type() | FL_INPUT_WRAP)); else type((uchar)(type() & ~FL_INPUT_WRAP)); } + /** + Return the number of lines displayed on a single page. + */ + int linesPerPage(); }; #endif diff --git a/FL/fl_utf8.h b/FL/fl_utf8.h index f365de5be..9db53d3ff 100644 --- a/FL/fl_utf8.h +++ b/FL/fl_utf8.h @@ -30,6 +30,11 @@ /*** NOTE : all functions are LIMITED to 24 bits Unicode values !!! ***/ +/** + \file fl_utf8.h + \brief header for Unicode and UTF8 chracter handling +*/ + #ifndef _HAVE_FL_UTF8_HDR_ #define _HAVE_FL_UTF8_HDR_ @@ -78,12 +83,20 @@ extern "C" { # endif +/** \addtogroup fl_unicode + @{ +*/ + int fl_unichar_to_utf8_size(Fl_Unichar); /* F2: comes from FLTK2 */ /* OD: comes from OksiD */ -/* F2: How many bytes will be used to encode this wide character as UTF8? */ +/** + Return the number of bytes needed to encode the given UCS4 character in UTF8. + \param [in] ucs UCS4 encoded character + \return number of bytes required + */ FL_EXPORT int fl_utf8bytes(unsigned ucs); /* OD: returns the byte length of the first UTF-8 char sequence (returns -1 if not valid) */ @@ -222,6 +235,9 @@ FL_EXPORT void fl_make_path_for_file( const char *path ); /* OD: recursively create a path in the file system */ FL_EXPORT char fl_make_path( const char *path ); + +/** @} */ + /*****************************************************************************/ #ifdef __cplusplus |
