Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
Tag: SPLIT
Ecore_X.h ecore_x_events.c
Log Message:
also pass along the symbol name not just keycode name
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/Attic/Ecore_X.h,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -u -3 -r1.1.2.29 -r1.1.2.30
--- Ecore_X.h 25 May 2003 09:43:39 -0000 1.1.2.29
+++ Ecore_X.h 1 Jun 2003 02:37:48 -0000 1.1.2.30
@@ -103,6 +103,7 @@
struct _Ecore_X_Event_Key_Down
{
char *keyname;
+ char *keysymbol;
char *key_compose;
int modifiers;
Ecore_X_Window win;
@@ -113,6 +114,7 @@
struct _Ecore_X_Event_Key_Up
{
char *keyname;
+ char *keysymbol;
char *key_compose;
int modifiers;
Ecore_X_Window win;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/Attic/ecore_x_events.c,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -3 -r1.1.2.14 -r1.1.2.15
--- ecore_x_events.c 25 May 2003 09:43:39 -0000 1.1.2.14
+++ ecore_x_events.c 1 Jun 2003 02:37:48 -0000 1.1.2.15
@@ -36,6 +36,7 @@
e = ev;
if (e->keyname) free(e->keyname);
+ if (e->keysymbol) free(e->keysymbol);
if (e->key_compose) free(e->key_compose);
free(e);
}
@@ -47,6 +48,7 @@
e = ev;
if (e->keyname) free(e->keyname);
+ if (e->keysymbol) free(e->keysymbol);
if (e->key_compose) free(e->key_compose);
free(e);
}
@@ -90,6 +92,16 @@
e->key_compose = strdup(buf);
}
else e->key_compose = NULL;
+ keyname = XKeysymToString(sym);
+ if (keyname) e->keysymbol = strdup(keyname);
+ else e->keysymbol = strdup("");
+ if (!e->keysymbol)
+ {
+ if (e->keyname) free(e->keyname);
+ if (e->key_compose) free(e->key_compose);
+ free(e);
+ return;
+ }
if (xevent->xkey.subwindow) e->win = xevent->xkey.subwindow;
else e->win = xevent->xkey.window;
e->event_win = xevent->xkey.window;
@@ -131,6 +143,16 @@
e->key_compose = strdup(buf);
}
else e->key_compose = NULL;
+ keyname = XKeysymToString(sym);
+ if (keyname) e->keysymbol = strdup(keyname);
+ else e->keysymbol = strdup("");
+ if (!e->keysymbol)
+ {
+ if (e->keyname) free(e->keyname);
+ if (e->key_compose) free(e->key_compose);
+ free(e);
+ return;
+ }
if (xevent->xkey.subwindow) e->win = xevent->xkey.subwindow;
else e->win = xevent->xkey.window;
e->event_win = xevent->xkey.window;
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
