From 2da65827a06af9fa3e8ee309831fa77794fba1d8 Mon Sep 17 00:00:00 2001 From: beru Date: Tue, 5 May 2015 14:13:16 +0900 Subject: [PATCH 1/8] improve cursor move keys support in text editor refs refs #1 --- .../gui/widgets/skeletons/text_editor.hpp | 6 +- source/gui/widgets/combox.cpp | 6 +- source/gui/widgets/skeletons/text_editor.cpp | 165 +++++++++++++++++- source/gui/widgets/spinbox.cpp | 4 +- source/gui/widgets/textbox.cpp | 4 +- 5 files changed, 173 insertions(+), 12 deletions(-) diff --git a/include/nana/gui/widgets/skeletons/text_editor.hpp b/include/nana/gui/widgets/skeletons/text_editor.hpp index 976c168d..952d6ba2 100644 --- a/include/nana/gui/widgets/skeletons/text_editor.hpp +++ b/include/nana/gui/widgets/skeletons/text_editor.hpp @@ -157,8 +157,8 @@ namespace nana{ namespace widgets void set_accept(std::function); void set_accept(accepts); - bool respond_char(char_type); - bool respond_key(char_type); + bool respond_char(const arg_keyboard& arg); + bool respond_key(const arg_keyboard& arg); void typeface_changed(); @@ -286,6 +286,8 @@ namespace nana{ namespace widgets unsigned _m_char_by_pixels(const nana::char_t*, std::size_t len, unsigned* pxbuf, int str_px, int pixels, bool is_rtl); unsigned _m_pixels_by_char(const nana::string&, std::size_t pos) const; static bool _m_is_right_text(const unicode_bidi::entity&); + void _handle_move_key(const arg_keyboard& arg); + private: std::unique_ptr behavior_; undoable undo_; diff --git a/source/gui/widgets/combox.cpp b/source/gui/widgets/combox.cpp index b1d401f5..24dfd5e1 100644 --- a/source/gui/widgets/combox.cpp +++ b/source/gui/widgets/combox.cpp @@ -685,7 +685,7 @@ namespace nana { case keyboard::os_arrow_left: case keyboard::os_arrow_right: - drawer_->editor()->respond_key(arg.key); + drawer_->editor()->respond_key(arg); drawer_->editor()->reset_caret(); break; case keyboard::os_arrow_up: @@ -714,14 +714,14 @@ namespace nana } } if (call_other_keys) - drawer_->editor()->respond_key(arg.key); + drawer_->editor()->respond_key(arg); API::lazy_refresh(); } void trigger::key_char(graph_reference graph, const arg_keyboard& arg) { - if (drawer_->editor()->respond_char(arg.key)) + if (drawer_->editor()->respond_char(arg)) API::lazy_refresh(); } //end class trigger diff --git a/source/gui/widgets/skeletons/text_editor.cpp b/source/gui/widgets/skeletons/text_editor.cpp index 0a2f9261..562446b5 100644 --- a/source/gui/widgets/skeletons/text_editor.cpp +++ b/source/gui/widgets/skeletons/text_editor.cpp @@ -461,6 +461,7 @@ namespace nana{ namespace widgets editor_._m_scrollbar(); return (adjusted_cond || adjusted_cond2); } + private: std::size_t _m_textline_from_screen(int y) const { @@ -1349,8 +1350,9 @@ namespace nana{ namespace widgets attributes_.acceptive = acceptive; } - bool text_editor::respond_char(char_type key) //key is a character of ASCII code + bool text_editor::respond_char(const arg_keyboard& arg) //key is a character of ASCII code { + char_type key = arg.key; switch (key) { case keyboard::end_of_text: @@ -1400,14 +1402,28 @@ namespace nana{ namespace widgets return false; } - bool text_editor::respond_key(char_type key) + bool text_editor::respond_key(const arg_keyboard& arg) { + char_type key = arg.key; switch (key) - { + { +#if 0 case keyboard::os_arrow_left: move_left(); break; case keyboard::os_arrow_right: move_right(); break; case keyboard::os_arrow_up: move_ns(true); break; case keyboard::os_arrow_down: move_ns(false); break; +#else + case keyboard::os_arrow_left: + case keyboard::os_arrow_right: + case keyboard::os_arrow_up: + case keyboard::os_arrow_down: + case keyboard::os_home: + case keyboard::os_end: + case keyboard::os_pageup: + case keyboard::os_pagedown: + _handle_move_key(arg); + break; +#endif case keyboard::os_del: if (this->attr().editable) del(); @@ -2217,6 +2233,149 @@ namespace nana{ namespace widgets points_.xpos = points_.caret.x; } + void text_editor::_handle_move_key(const arg_keyboard& arg) + { + bool changed = false; + nana::upoint caret = points_.caret; + char_t key = arg.key; + size_t nlines = textbase_.lines(); + if (arg.ctrl) { + switch (key) { + case keyboard::os_arrow_left: + case keyboard::os_arrow_right: + // TODO: move the caret word by word + break; + case keyboard::os_home: + if (caret.y != 0) { + caret.y = 0; + points_.offset.y = 0; + changed = true; + } + break; + case keyboard::os_end: + if (caret.y != nlines - 1) { + caret.y = nlines - 1; + changed = true; + } + break; + } + } + size_t lnsz = textbase_.getline(caret.y).size(); + switch (key) { + case keyboard::os_arrow_left: + if (caret.x != 0) { + --caret.x; + changed = true; + }else { + if (caret.y != 0) { + --caret.y; + caret.x = textbase_.getline(caret.y).size(); + changed = true; + } + } + break; + case keyboard::os_arrow_right: + if (caret.x < lnsz) { + ++caret.x; + changed = true; + }else { + if (caret.y != nlines - 1) { + ++caret.y; + caret.x = 0; + changed = true; + } + } + break; + case keyboard::os_arrow_up: + case keyboard::os_arrow_down: + { + auto screen_pt = behavior_->caret_to_screen(caret); + int offset = line_height(); + if (key == keyboard::os_arrow_up) { + offset = -offset; + } + screen_pt.y += offset; + auto new_caret = behavior_->screen_to_caret(screen_pt); + if (new_caret != caret) { + caret = new_caret; + if (screen_pt.y < 0) { + scroll(true, true); + } + changed = true; + } + } + break; + case keyboard::os_home: + if (caret.x != 0) { + caret.x = 0; + changed = true; + } + break; + case keyboard::os_end: + if (caret.x < lnsz) { + caret.x = lnsz; + changed = true; + } + break; + case keyboard::os_pageup: + if (caret.y >= (int)screen_lines() && points_.offset.y >= (int)screen_lines()) { + points_.offset.y -= screen_lines(); + caret.y -= screen_lines(); + changed = true; + } + break; + case keyboard::os_pagedown: + if (caret.y + screen_lines() <= behavior_->take_lines()) { + points_.offset.y += screen_lines(); + caret.y += screen_lines(); + changed = true; + } + break; + } + if (select_.a != caret || select_.b != caret) { + changed = true; + } + if (changed) { + if (arg.shift) { + switch (key) { + case keyboard::os_arrow_left: + case keyboard::os_arrow_up: + case keyboard::os_home: + case keyboard::os_pageup: + if (points_.caret == select_.b) { + select_.b = select_.a; + }else { + select_.b = std::max(select_.b, points_.caret); + } + select_.a = caret; + break; + case keyboard::os_arrow_right: + case keyboard::os_arrow_down: + case keyboard::os_end: + case keyboard::os_pagedown: + if (select_.b == points_.caret) { + select_.a = std::min(select_.a, points_.caret); + }else { + select_.a = std::max(select_.b, points_.caret); + } + select_.b = caret; + break; + } + }else { + select_.b = caret; + select_.a = caret; + } + if (select_.a > select_.b) { + std::swap(select_.a, select_.b); + } + points_.caret = caret; + behavior_->adjust_caret_into_screen(); + render(true); + _m_scrollbar(); + points_.xpos = points_.caret.x; + } + } + nana::upoint text_editor::mouse_caret(const point& scrpos) //From screen position { points_.caret = behavior_->screen_to_caret(scrpos); diff --git a/source/gui/widgets/spinbox.cpp b/source/gui/widgets/spinbox.cpp index 6be8deb2..c5830b1f 100644 --- a/source/gui/widgets/spinbox.cpp +++ b/source/gui/widgets/spinbox.cpp @@ -560,7 +560,7 @@ namespace nana void drawer::key_press(graph_reference, const arg_keyboard& arg) { - if (impl_->editor()->respond_key(arg.key)) + if (impl_->editor()->respond_key(arg)) { impl_->editor()->reset_caret(); impl_->draw_spins(); @@ -570,7 +570,7 @@ namespace nana void drawer::key_char(graph_reference, const arg_keyboard& arg) { - if (impl_->editor()->respond_char(arg.key)) + if (impl_->editor()->respond_char(arg)) { if (!impl_->value(impl_->editor()->text())) impl_->draw_spins(); diff --git a/source/gui/widgets/textbox.cpp b/source/gui/widgets/textbox.cpp index 4bb6a670..fd2d9c86 100644 --- a/source/gui/widgets/textbox.cpp +++ b/source/gui/widgets/textbox.cpp @@ -136,7 +136,7 @@ namespace drawerbase { void drawer::key_press(graph_reference, const arg_keyboard& arg) { - if(editor_->respond_key(arg.key)) + if(editor_->respond_key(arg)) { editor_->reset_caret(); API::lazy_refresh(); @@ -145,7 +145,7 @@ namespace drawerbase { void drawer::key_char(graph_reference, const arg_keyboard& arg) { - if (editor_->respond_char(arg.key)) + if (editor_->respond_char(arg)) API::lazy_refresh(); } From 990de7867b799612881ec03e667cf7490f683f13 Mon Sep 17 00:00:00 2001 From: beru Date: Sat, 16 May 2015 21:10:20 +0900 Subject: [PATCH 2/8] add OFN_NOCHANGEDIR flag to OPENFILENAME::Flags in nana::filebox::show http://blogs.msdn.com/b/oldnewthing/archive/2010/11/12/10089878.aspx setting OFN_NOCHANGEDIR flag to OPENFILENAME::Flags is effective for GetOpenFileName API on Windows7. add const qualifier to nana::paint::graphics::save_as_file add support for small icon on Windows. The system displays the large icon in the ALT+TAB dialog box, and the small icon in the window caption. https://msdn.microsoft.com/en-us/library/windows/desktop/ms632643%28v=vs.85%29.aspx --- .../gui/detail/native_window_interface.hpp | 2 ++ include/nana/gui/detail/window_manager.hpp | 4 ++- include/nana/gui/programming_interface.hpp | 3 ++ include/nana/paint/detail/image_bmp.hpp | 6 ++++ include/nana/paint/detail/image_ico.hpp | 1 + .../paint/detail/image_impl_interface.hpp | 1 + include/nana/paint/graphics.hpp | 2 +- include/nana/paint/image.hpp | 1 + source/gui/detail/native_window_interface.cpp | 24 +++++++++++++ source/gui/detail/window_manager.cpp | 35 +++++++++++++++---- source/gui/filebox.cpp | 1 + source/gui/programming_interface.cpp | 10 ++++++ source/paint/graphics.cpp | 2 +- source/paint/image.cpp | 32 +++++++++++++++++ 14 files changed, 114 insertions(+), 10 deletions(-) diff --git a/include/nana/gui/detail/native_window_interface.hpp b/include/nana/gui/detail/native_window_interface.hpp index 39cd7c49..66f6ac94 100644 --- a/include/nana/gui/detail/native_window_interface.hpp +++ b/include/nana/gui/detail/native_window_interface.hpp @@ -45,6 +45,8 @@ namespace detail static void enable_dropfiles(native_window_type, bool); static void enable_window(native_window_type, bool); static bool window_icon(native_window_type, const paint::image&); + // (On Windows) The system displays the large icon in the ALT+TAB dialog box, and the small icon in the window caption. + static bool window_icon(native_window_type, const paint::image& big_icon, const paint::image& small_icon); static void activate_owner(native_window_type); static void activate_window(native_window_type); static void close_window(native_window_type); diff --git a/include/nana/gui/detail/window_manager.hpp b/include/nana/gui/detail/window_manager.hpp index 37c9c150..1d9d70b2 100644 --- a/include/nana/gui/detail/window_manager.hpp +++ b/include/nana/gui/detail/window_manager.hpp @@ -112,7 +112,6 @@ namespace detail void signal_fire_caption(core_window_t*, const nana::char_t*); nana::string signal_fire_caption(core_window_t*); void event_filter(core_window_t*, bool is_make, event_code); - void default_icon(const nana::paint::image&); bool available(core_window_t*); bool available(core_window_t *, core_window_t*); @@ -133,7 +132,10 @@ namespace detail //@brief: Delete window handle, the handle type must be a root and a frame. void destroy_handle(core_window_t*); + void default_icon(const paint::image&); + void default_icon(const paint::image& big_icon, const paint::image& small_icon); void icon(core_window_t*, const paint::image&); + void icon(core_window_t*, const paint::image& big_icon, const paint::image& small_icon); //show //@brief: show or hide a window diff --git a/include/nana/gui/programming_interface.hpp b/include/nana/gui/programming_interface.hpp index c2430ccd..d1a0536f 100644 --- a/include/nana/gui/programming_interface.hpp +++ b/include/nana/gui/programming_interface.hpp @@ -120,7 +120,10 @@ namespace API } void window_icon_default(const paint::image&); + void window_icon_default(const paint::image& big_icon, const paint::image& small_icon); void window_icon(window, const paint::image&); + void window_icon(window, const paint::image& big_icon, const paint::image& small_icon); + bool empty_window(window); ///< Determines whether a window is existing. bool is_window(window); ///< Determines whether a window is existing, equal to !empty_window. void enable_dropfiles(window, bool); diff --git a/include/nana/paint/detail/image_bmp.hpp b/include/nana/paint/detail/image_bmp.hpp index 5397faef..8ffba1ba 100644 --- a/include/nana/paint/detail/image_bmp.hpp +++ b/include/nana/paint/detail/image_bmp.hpp @@ -75,6 +75,12 @@ namespace nana{ namespace paint this->close(); } + bool open(void* buff, size_t sz) + { + // TODO: read a BMP file from memory + return false; + } + bool open(const nana::char_t* filename) { if(nullptr == filename) return false; diff --git a/include/nana/paint/detail/image_ico.hpp b/include/nana/paint/detail/image_ico.hpp index 8c66d19b..58a31d00 100644 --- a/include/nana/paint/detail/image_ico.hpp +++ b/include/nana/paint/detail/image_ico.hpp @@ -23,6 +23,7 @@ namespace nana{ namespace paint image_ico(bool is_ico); bool open(const nana::char_t* filename); + bool open(void* buff, size_t sz); bool alpha_channel() const; bool empty() const; void close(); diff --git a/include/nana/paint/detail/image_impl_interface.hpp b/include/nana/paint/detail/image_impl_interface.hpp index b2a7df50..b1fa8d37 100644 --- a/include/nana/paint/detail/image_impl_interface.hpp +++ b/include/nana/paint/detail/image_impl_interface.hpp @@ -16,6 +16,7 @@ namespace nana{ namespace paint{ typedef nana::paint::graphics& graph_reference; virtual ~image_impl_interface() = 0; //The destructor is defined in ../image.cpp virtual bool open(const nana::char_t* filename) = 0; + virtual bool open(void* buff, size_t sz) = 0; // reads image from memory virtual bool alpha_channel() const = 0; virtual bool empty() const = 0; virtual void close() = 0; diff --git a/include/nana/paint/graphics.hpp b/include/nana/paint/graphics.hpp index aac4712a..e790fc89 100644 --- a/include/nana/paint/graphics.hpp +++ b/include/nana/paint/graphics.hpp @@ -130,7 +130,7 @@ namespace nana void setsta(); ///< Clears the status if the graphics object had been changed void set_changed(); void release(); - void save_as_file(const char*); + void save_as_file(const char*) const; // saves image as a bitmap file void set_color(const ::nana::color&); void set_text_color(const ::nana::color&); diff --git a/include/nana/paint/image.hpp b/include/nana/paint/image.hpp index b335a4fe..4f9fa0df 100644 --- a/include/nana/paint/image.hpp +++ b/include/nana/paint/image.hpp @@ -37,6 +37,7 @@ namespace paint image& operator=(const image& rhs); image& operator=(image&&); bool open(const nana::string& filename); + bool open_icon(void* buff, size_t sz); // opens a icon from memory bool empty() const; operator unspecified_bool_t() const; void close(); diff --git a/source/gui/detail/native_window_interface.cpp b/source/gui/detail/native_window_interface.cpp index 0101a804..61e38772 100644 --- a/source/gui/detail/native_window_interface.cpp +++ b/source/gui/detail/native_window_interface.cpp @@ -537,6 +537,30 @@ namespace nana{ return false; } + bool native_interface::window_icon(native_window_type wd, const paint::image& big_icon, const paint::image& small_icon) + { +#if defined(NANA_WINDOWS) + HICON h_big_icon = paint::image_accessor::icon(big_icon); + HICON h_small_icon = paint::image_accessor::icon(small_icon); + if (h_big_icon || h_small_icon) + { + nana::detail::platform_spec::instance().keep_window_icon(wd, (!big_icon.empty() ? big_icon : small_icon)); + if (h_big_icon) { + ::SendMessage(reinterpret_cast(wd), WM_SETICON, ICON_BIG, reinterpret_cast(h_big_icon)); + } + if (h_small_icon) { + ::SendMessage(reinterpret_cast(wd), WM_SETICON, ICON_SMALL, reinterpret_cast(h_small_icon)); + } + return true; + } +#elif defined(NANA_X11) + return window_icon(wd, big_icon); +#endif + return false; + } + + + void native_interface::activate_owner(native_window_type wd) { #if defined(NANA_WINDOWS) diff --git a/source/gui/detail/window_manager.cpp b/source/gui/detail/window_manager.cpp index b7719985..df217407 100644 --- a/source/gui/detail/window_manager.cpp +++ b/source/gui/detail/window_manager.cpp @@ -43,7 +43,8 @@ namespace detail root_register misc_register; handle_manager wd_register; signal_manager signal; - paint::image default_icon; + paint::image default_icon_big; + paint::image default_icon_small; }; //end struct wdm_private_impl @@ -199,11 +200,6 @@ namespace detail } } - void window_manager::default_icon(const paint::image& img) - { - impl_->default_icon = img; - } - bool window_manager::available(core_window_t* wd) { return impl_->wd_register.available(wd); @@ -264,7 +260,7 @@ namespace detail insert_frame(owner, wd); bedrock::inc_window(wd->thread_id); - this->icon(wd, impl_->default_icon); + this->icon(wd, impl_->default_icon_big, impl_->default_icon_small); return wd; } return nullptr; @@ -404,6 +400,18 @@ namespace detail } } + void window_manager::default_icon(const paint::image& img) + { + impl_->default_icon_big = img; + impl_->default_icon_small = img; + } + + void window_manager::default_icon(const nana::paint::image& big, const nana::paint::image& small) + { + impl_->default_icon_big = big; + impl_->default_icon_small = small; + } + void window_manager::icon(core_window_t* wd, const paint::image& img) { if(false == img.empty()) @@ -417,6 +425,19 @@ namespace detail } } + void window_manager::icon(core_window_t* wd, const paint::image& big_icon, const paint::image& small_icon) + { + if(!big_icon.empty() || !small_icon.empty()) + { + std::lock_guard lock(mutex_); + if (impl_->wd_register.available(wd)) + { + if(wd->other.category == category::root_tag::value) + native_interface::window_icon(wd->root, big_icon, small_icon); + } + } + } + //show //@brief: show or hide a window bool window_manager::show(core_window_t* wd, bool visible) diff --git a/source/gui/filebox.cpp b/source/gui/filebox.cpp index 14ab8b67..0e0171df 100644 --- a/source/gui/filebox.cpp +++ b/source/gui/filebox.cpp @@ -1021,6 +1021,7 @@ namespace nana if (!impl_->open_or_save) ofn.Flags = OFN_OVERWRITEPROMPT; //Overwrite prompt if it is save mode + ofn.Flags |= OFN_NOCHANGEDIR; if(FALSE == (impl_->open_or_save ? ::GetOpenFileName(&ofn) : ::GetSaveFileName(&ofn))) return false; diff --git a/source/gui/programming_interface.cpp b/source/gui/programming_interface.cpp index d6f8b483..5170b54b 100644 --- a/source/gui/programming_interface.cpp +++ b/source/gui/programming_interface.cpp @@ -359,11 +359,21 @@ namespace API restrict::window_manager.default_icon(img); } + void window_icon_default(const paint::image& big_icon, const paint::image& small_icon) + { + restrict::window_manager.default_icon(big_icon, small_icon); + } + void window_icon(window wd, const paint::image& img) { restrict::window_manager.icon(reinterpret_cast(wd), img); } + void window_icon(window wd, const paint::image& big_icon, const paint::image& small_icon) + { + restrict::window_manager.icon(reinterpret_cast(wd), big_icon, small_icon); + } + bool empty_window(window wd) { return (restrict::window_manager.available(reinterpret_cast(wd)) == false); diff --git a/source/paint/graphics.cpp b/source/paint/graphics.cpp index 8e61e8dd..155d650e 100644 --- a/source/paint/graphics.cpp +++ b/source/paint/graphics.cpp @@ -812,7 +812,7 @@ namespace paint size_.width = size_.height = 0; } - void graphics::save_as_file(const char* file) + void graphics::save_as_file(const char* file) const { if(handle_) { diff --git a/source/paint/image.cpp b/source/paint/image.cpp index a6fcd598..dbcc6510 100644 --- a/source/paint/image.cpp +++ b/source/paint/image.cpp @@ -69,6 +69,31 @@ namespace paint return false; } + bool image_ico::open(void* buff, size_t sz) + { + close(); +#if defined(NANA_WINDOWS) + HICON handle = CreateIconFromResource((PBYTE)buff, sz, TRUE, 0x00030000); + if(handle) + { + ICONINFO info; + if (::GetIconInfo(handle, &info) != 0) + { + HICON * p = new HICON(handle); + ptr_ = std::shared_ptr(p, handle_deleter()); + size_.width = (info.xHotspot << 1); + size_.height = (info.yHotspot << 1); + ::DeleteObject(info.hbmColor); + ::DeleteObject(info.hbmMask); + return true; + } + } +#else + if(is_ico_){} //kill the unused compiler warning in Linux. +#endif + return false; + } + bool image_ico::alpha_channel() const { return false; @@ -235,6 +260,13 @@ namespace paint return false; } + bool image::open_icon(void* buff, size_t sz) + { + image::image_impl_interface * helper = new detail::image_ico(true); + image_ptr_ = std::shared_ptr(helper); + return helper->open(buff, sz); + } + bool image::empty() const { return ((nullptr == image_ptr_) || image_ptr_->empty()); From 80da9007ef1577b8911f44d08706bb9b318e864a Mon Sep 17 00:00:00 2001 From: beru Date: Sun, 17 May 2015 15:02:09 +0900 Subject: [PATCH 3/8] add functionality to associate label with other widget as a "for" attribute of HTML