summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorRafael Antognolli <rafael.antognolli@intel.com>2013-10-31 18:02:04 -0200
committerRafael Antognolli <rafael.antognolli@intel.com>2013-10-31 21:35:13 -0200
commit35d2f195de262d846c5e3f6dc5634921afe46606 (patch)
treec8f08ab9e58f94cc81d4f7ce1d7fbe4db9026e03 /src/modules
parent20f6676eb6ed0020c07272c9f59a20faf6ff651c (diff)
ecore/wayland: Hide Ecore_Wl_Display.
This struct is only used inside ecore_wayland itself, so there's no real reason to expose it. Apparently, hiding it doesn't break anything, except for the ecore_imf wayland module, which was easily fixed. If anyone notices a breakage, please let me know.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/ecore_imf/wayland/wayland_imcontext.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.c b/src/modules/ecore_imf/wayland/wayland_imcontext.c
index a3e88d3c2a..07072e4760 100644
--- a/src/modules/ecore_imf/wayland/wayland_imcontext.c
+++ b/src/modules/ecore_imf/wayland/wayland_imcontext.c
@@ -39,6 +39,7 @@ struct _WaylandIMContext
39 struct wl_text_input *text_input; 39 struct wl_text_input *text_input;
40 40
41 Ecore_Wl_Window *window; 41 Ecore_Wl_Window *window;
42 Ecore_Wl_Input *input;
42 Evas *canvas; 43 Evas *canvas;
43 44
44 char *preedit_text; 45 char *preedit_text;
@@ -627,6 +628,8 @@ wayland_im_context_focus_in(Ecore_IMF_Context *ctx)
627 if (!input || !input->seat) 628 if (!input || !input->seat)
628 return; 629 return;
629 630
631 imcontext->input = input;
632
630 if (imcontext->text_input) 633 if (imcontext->text_input)
631 { 634 {
632 wl_text_input_show_input_panel(imcontext->text_input); 635 wl_text_input_show_input_panel(imcontext->text_input);
@@ -643,11 +646,13 @@ wayland_im_context_focus_out(Ecore_IMF_Context *ctx)
643 646
644 EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "focus-out"); 647 EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "focus-out");
645 648
646 if (!imcontext->window) return; 649 if (!imcontext->input) return;
647 650
648 if (imcontext->text_input) 651 if (imcontext->text_input)
649 wl_text_input_deactivate(imcontext->text_input, 652 wl_text_input_deactivate(imcontext->text_input,
650 imcontext->window->display->input->seat); 653 imcontext->input->seat);
654
655 imcontext->input = NULL;
651} 656}
652 657
653EAPI void 658EAPI void