forked from enlightenment/enlightenment
remove e_comp_get() use in grabinput
This commit is contained in:
parent
f8d846e0c9
commit
0d82fcf71c
|
@ -37,7 +37,7 @@ e_grabinput_shutdown(void)
|
||||||
EAPI int
|
EAPI int
|
||||||
e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win)
|
e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win)
|
||||||
{
|
{
|
||||||
if (e_comp_get(NULL)->comp_type != E_PIXMAP_TYPE_X) return 1;
|
if (e_comp->comp_type != E_PIXMAP_TYPE_X) return 1;
|
||||||
if (grab_mouse_win)
|
if (grab_mouse_win)
|
||||||
{
|
{
|
||||||
#ifndef HAVE_WAYLAND_ONLY
|
#ifndef HAVE_WAYLAND_ONLY
|
||||||
|
@ -93,7 +93,7 @@ e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win)
|
||||||
EAPI void
|
EAPI void
|
||||||
e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win)
|
e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win)
|
||||||
{
|
{
|
||||||
if (e_comp_get(NULL)->comp_type != E_PIXMAP_TYPE_X) return;
|
if (e_comp->comp_type != E_PIXMAP_TYPE_X) return;
|
||||||
if (mouse_win == grab_mouse_win)
|
if (mouse_win == grab_mouse_win)
|
||||||
{
|
{
|
||||||
#ifndef HAVE_WAYLAND_ONLY
|
#ifndef HAVE_WAYLAND_ONLY
|
||||||
|
@ -120,7 +120,7 @@ e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win)
|
||||||
EAPI void
|
EAPI void
|
||||||
e_grabinput_focus(Ecore_Window win, E_Focus_Method method)
|
e_grabinput_focus(Ecore_Window win, E_Focus_Method method)
|
||||||
{
|
{
|
||||||
if (e_comp_get(NULL)->comp_type != E_PIXMAP_TYPE_X) return;
|
if (e_comp->comp_type != E_PIXMAP_TYPE_X) return;
|
||||||
if (grab_key_win != 0)
|
if (grab_key_win != 0)
|
||||||
{
|
{
|
||||||
/* fprintf(stderr, "while grabbed focus changed to %x\n", win); */
|
/* fprintf(stderr, "while grabbed focus changed to %x\n", win); */
|
||||||
|
|
Loading…
Reference in New Issue