kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

code code.. fix 

SVN revision: 6496
This commit is contained in:
Carsten Haitzler 2002-12-18 06:02:32 +00:00
parent 06320cc301
commit 81fd6f6c3d
4 changed files with 46 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/evas/src/bin/Makefile.am
View File

@ -27,37 +27,37 @@ evas_software_x11_test_SOURCES = evas_test_main.h evas_test_main.c evas_software
evas_software_x11_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm @x_libs@
evas_software_x11_test_LDFLAGS = $(LDFLAGS)
evas_software_x11_test_CFLAGS = $(CFLAGS) @x_cflags@
evas_software_x11_test_DEPENDANCIES = $(top_builddir)/src/lib/libevas.la
evas_software_x11_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
evas_software_x11_perf_test_SOURCES = evas_software_x11_perf_test.c
evas_software_x11_perf_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm @x_libs@
evas_software_x11_perf_test_LDFLAGS = $(LDFLAGS)
evas_software_x11_perf_test_CFLAGS = $(CFLAGS) @x_cflags@
evas_software_x11_perf_test_DEPENDANCIES = $(top_builddir)/src/lib/libevas.la
evas_software_x11_perf_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
evas_software_x11_perf_load_SOURCES = evas_software_x11_perf_load.c
evas_software_x11_perf_load_LDADD = $(top_builddir)/src/lib/libevas.la -lm @x_libs@
evas_software_x11_perf_load_LDFLAGS = $(LDFLAGS)
evas_software_x11_perf_load_CFLAGS = $(CFLAGS) @x_cflags@
evas_software_x11_perf_load_DEPENDANCIES = $(top_builddir)/src/lib/libevas.la
evas_software_x11_perf_load_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
evas_directfb_test_SOURCES = evas_test_main.h evas_test_main.c evas_directfb_main.c
evas_directfb_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm @DIRECTFB_LIBS@
evas_directfb_test_LDFLAGS = $(LDFLAGS)
evas_directfb_test_CFLAGS = $(CFLAGS) @DIRECTFB_CFLAGS@
evas_directfb_test_DEPENDANCIES = $(top_builddir)/src/lib/libevas.la
evas_directfb_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
evas_directfb_window_SOURCES = evas_test_main.h evas_test_main.c evas_directfb_window.c
evas_directfb_window_LDADD = $(top_builddir)/src/lib/libevas.la -lm @DIRECTFB_LIBS@
evas_directfb_window_LDFLAGS = $(LDFLAGS)
evas_directfb_window_CFLAGS = $(CFLAGS) @DIRECTFB_CFLAGS@
evas_directfb_window_DEPENDANCIES = $(top_builddir)/src/lib/libevas.la
evas_directfb_window_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
evas_fb_test_SOURCES = evas_test_main.h evas_test_main.c evas_fb_main.c
evas_fb_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm
evas_fb_test_LDFLAGS = $(LDFLAGS)
evas_fb_test_CFLAGS = $(CFLAGS)
evas_fb_test_DEPENDANCIES = $(top_builddir)/src/lib/libevas.la
evas_fb_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
moc_evas_software_qtopia_main.cpp: evas_software_qtopia_main.h
@qt_moc@ evas_software_qtopia_main.h -o moc_evas_software_qtopia_main.cpp
@ -67,10 +67,10 @@ evas_software_qtopia_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm @qt_lib
evas_software_qtopia_test_LDFLAGS = $(LDFLAGS)
evas_software_qtopia_test_CFLAGS = $(CFLAGS) @qt_cflags@
evas_software_qtopia_test_CXXFLAGS = $(CFLAGS) $(CXXFLAGS) @qt_cflags@
evas_software_qtopia_test_DEPENDANCIES = $(top_builddir)/src/lib/libevas.la
evas_software_qtopia_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
evas_gl_x11_test_SOURCES = evas_test_main.h evas_test_main.c evas_gl_x11_main.c
evas_gl_x11_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm @x_libs@ @gl_libs@
evas_gl_x11_test_LDFLAGS = $(LDFLAGS)
evas_gl_x11_test_CFLAGS = $(CFLAGS) @x_cflags@ @gl_cflags@
evas_gl_x11_test_DEPENDANCIES = $(top_builddir)/src/lib/libevas.la
evas_gl_x11_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la

8
legacy/evas/src/lib/Evas.h
View File

@ -66,6 +66,8 @@ typedef void Evas_Modifier;
typedef void Evas_Lock;
/** An Evas Smart Object handle */
typedef void Evas_Smart;
/** An Evas modifier mask type */
typedef unsigned long long Evas_Modifier_Mask;
#endif
#endif
@ -434,9 +436,11 @@ extern "C" {
void evas_key_modifier_off (Evas *e, char *keyname);
void evas_key_lock_on (Evas *e, char *keyname);
void evas_key_lock_off (Evas *e, char *keyname);
Evas_Modifier_Mask evas_key_modifier_mask_get (Evas *e, char *keyname);
int evas_object_key_grab (Evas_Object *obj, char *keyname, int exclusive);
void evas_object_key_ungrab (Evas_Object *obj, char *keyname);
int evas_object_key_grab (Evas_Object *obj, char *keyname, Evas_Modifier_Mask modifiers, int exclusive);
void evas_object_key_ungrab (Evas_Object *obj, char *keyname, Evas_Modifier_Mask modifiers);
void evas_object_pass_events_set (Evas_Object *obj, int pass);
int evas_object_pass_events_get (Evas_Object *obj);

43
legacy/evas/src/lib/canvas/evas_key.c
View File

@ -56,11 +56,11 @@ evas_key_lock_get(Evas *e)
int
evas_key_modifier_is_set_get(Evas_Modifier *m, char *keyname)
{
unsigned long long num;
Evas_Modifier_Mask num;
if (!m) return 0;
if (!keyname) return 0;
num = (unsigned long long)evas_key_modifier_number(m, keyname);
num = (Evas_Modifier_Mask)evas_key_modifier_number(m, keyname);
if (num < 0) return 0;
num = 1 << num;
if (m->mask & num) return 1;
@ -70,11 +70,11 @@ evas_key_modifier_is_set_get(Evas_Modifier *m, char *keyname)
int
evas_key_lock_is_set_get(Evas_Lock *l, char *keyname)
{
unsigned long long num;
Evas_Modifier_Mask num;
if (!l) return 0;
if (!keyname) return 0;
num = (unsigned long long)evas_key_lock_number(l, keyname);
num = (Evas_Modifier_Mask)evas_key_lock_number(l, keyname);
if (num < 0) return 0;
num = 1 << num;
if (l->mask & num) return 1;
@ -165,12 +165,12 @@ evas_key_lock_del(Evas *e, char *keyname)
void
evas_key_modifier_on(Evas *e, char *keyname)
{
unsigned long long num;
Evas_Modifier_Mask num;
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
num = (unsigned long long)evas_key_modifier_number(&(e->modifiers), keyname);
num = (Evas_Modifier_Mask)evas_key_modifier_number(&(e->modifiers), keyname);
if (num < 0) return;
num = 1 << num;
e->modifiers.mask |= num;
@ -179,12 +179,12 @@ evas_key_modifier_on(Evas *e, char *keyname)
void
evas_key_modifier_off(Evas *e, char *keyname)
{
unsigned long long num;
Evas_Modifier_Mask num;
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
num = (unsigned long long)evas_key_modifier_number(&(e->modifiers), keyname);
num = (Evas_Modifier_Mask)evas_key_modifier_number(&(e->modifiers), keyname);
if (num < 0) return;
num = 1 << num;
e->modifiers.mask &= ~num;
@ -193,12 +193,12 @@ evas_key_modifier_off(Evas *e, char *keyname)
void
evas_key_lock_on(Evas *e, char *keyname)
{
unsigned long long num;
Evas_Modifier_Mask num;
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
num = (unsigned long long)evas_key_lock_number(&(e->locks), keyname);
num = (Evas_Modifier_Mask)evas_key_lock_number(&(e->locks), keyname);
if (num < 0) return;
num = 1 << num;
e->locks.mask |= num;
@ -207,24 +207,39 @@ evas_key_lock_on(Evas *e, char *keyname)
void
evas_key_lock_off(Evas *e, char *keyname)
{
unsigned long long num;
Evas_Modifier_Mask num;
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
num = (unsigned long long)evas_key_lock_number(&(e->locks), keyname);
num = (Evas_Modifier_Mask)evas_key_lock_number(&(e->locks), keyname);
if (num < 0) return;
num = 1 << num;
e->locks.mask &= ~num;
}
/* errr need to add key grabbing/ungrabbing calls - missing modifier stuff. */
Evas_Modifier_Mask
evas_key_modifier_mask_get(Evas *e, char *keyname)
{
Evas_Modifier_Mask num;
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return 0;
MAGIC_CHECK_END();
if (!keyname) return 0;
num = evas_key_modifier_number(&(e->modifiers), keyname);
if (num < 0) return 0;
return 1 << num;
}
int
evas_object_key_grab(Evas_Object *obj, char *keyname, int exclusive)
evas_object_key_grab(Evas_Object *obj, char *keyname, Evas_Modifier_Mask modifiers, int exclusive)
{
}
void
evas_object_key_ungrab(Evas_Object *obj, char *keyname)
evas_object_key_ungrab(Evas_Object *obj, char *keyname, Evas_Modifier_Mask modifiers)
{
}

5
legacy/evas/src/lib/include/evas_private.h
View File

@ -44,6 +44,7 @@ typedef struct _Evas_Func Evas_Func;
typedef struct _Evas_Object_Func Evas_Object_Func;
typedef struct _Evas_Modifier Evas_Modifier;
typedef struct _Evas_Lock Evas_Lock;
typedef unsigned long long Evas_Modifier_Mask;
typedef struct _Evas_Smart Evas_Smart;
typedef struct _Evas_Intercept_Func Evas_Intercept_Func;
typedef struct _Evas_Intercept_Func_Basic Evas_Intercept_Func_Basic;
@ -167,7 +168,7 @@ struct _Evas_Modifier
int count;
char **list;
} mod;
unsigned long long mask; /* ok we have a max of 64 modifiers */
Evas_Modifier_Mask mask; /* ok we have a max of 64 modifiers */
};
struct _Evas_Lock
@ -176,7 +177,7 @@ struct _Evas_Lock
int count;
char **list;
} lock;
unsigned long long mask; /* we have a max of 64 locks */
Evas_Modifier_Mask mask; /* we have a max of 64 locks */
};
struct _Evas