Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/esmart

Dir     : e17/libs/esmart/src/lib/esmart_text_entry


Modified Files:
        Makefile.am esmart_text_entry.c 


Log Message:


use evas's new extended key event info

===================================================================
RCS file: 
/cvsroot/enlightenment/e17/libs/esmart/src/lib/esmart_text_entry/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 23 May 2004 13:29:35 -0000      1.4
+++ Makefile.am 14 Dec 2004 03:21:24 -0000      1.5
@@ -13,5 +13,5 @@
                                                                                
        Esmart_Text_Entry.h
 
 libesmart_text_entry_la_LDFLAGS = -version-info 0:9:0
-libesmart_text_entry_la_LIBADD = @evas_libs@ -lecore -lecore_x @edje_libs@
+libesmart_text_entry_la_LIBADD = @evas_libs@ -lecore @edje_libs@
 
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/libs/esmart/src/lib/esmart_text_entry/esmart_text_entry.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- esmart_text_entry.c 11 Nov 2004 00:24:31 -0000      1.6
+++ esmart_text_entry.c 14 Dec 2004 03:21:24 -0000      1.7
@@ -5,7 +5,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <Ecore.h>
-#include <Ecore_X.h>
 #include <stdlib.h>
 #include "Esmart_Text_Entry.h"
 
@@ -213,35 +212,16 @@
 _key_down_cb (void *data, Evas * e, Evas_Object * o, void *ev)
 {
   Evas_Event_Key_Down *down = NULL;
-  Ecore_X_Event_Key_Down *evx = NULL;
   Esmart_Text_Entry *entry = NULL;
 
-  if (ecore_event_current_type_get () != ECORE_X_EVENT_KEY_DOWN)
-    return;
-
-  if (!(evx = (Ecore_X_Event_Key_Down *) ecore_event_current_event_get ()))
-    return;
-
   down = ev;
   entry = evas_object_smart_data_get (data);
 
   /* handle modifiers */
-  if ((!strcmp (evx->keyname, "Control_L"))
-      || (!strcmp (evx->keyname, "Control_R"))
-      || (!strcmp (evx->keyname, "Shift_R"))
-      || (!strcmp (evx->keyname, "Shift_L"))
-      || (!strcmp (evx->keyname, "Alt_R"))
-      || (!strcmp (evx->keyname, "Alt_L")))
-     {
-       evas_key_modifier_on (e, evx->keyname);
-     }
-   
-  if (evas_key_modifier_is_set_get (down->modifiers, evx->keyname))
-     evas_key_modifier_off (e, evx->keyname);
-   else if (evas_key_modifier_is_set_get (down->modifiers, "Control_L")
-           || evas_key_modifier_is_set_get (down->modifiers, "Control_R"))
+   if (evas_key_modifier_is_set_get (down->modifiers, "Control_L")
+       || evas_key_modifier_is_set_get (down->modifiers, "Control_R"))
      {
-       switch ((int) evx->keyname[0])
+       switch ((int) down->keyname[0])
          {
           case 117:
             esmart_text_entry_text_set (data, "");
@@ -249,27 +229,27 @@
           default:
 #if DEBUG
             fprintf (stderr, "(%d) is the key value\n",
-                     (int) evx->keyname[0]);
+                     (int) down->keyname[0]);
 #endif
             break;
          }
        
      }
-   else if ((strlen (evx->keyname) > 1)
-           && (!evx->key_compose || (strlen (evx->key_compose) > 1)))
+   else if ((strlen (down->keyname) > 1)
+           && (!down->string || (strlen (down->string) > 1)))
      {
-       if (!strcmp (evx->keyname, "BackSpace"))
+       if (!strcmp (down->keyname, "BackSpace"))
          {
             esmart_text_entry_buffer_backspace (data);
          }
        else
          {
-            fprintf (stderr, "Unknown string %s\n", evx->keyname);
+            fprintf (stderr, "Unknown string %s\n", down->keyname);
          }
      }
-   else
+   else if (down->string)
      {
-       switch ((int) evx->key_compose[0])
+       switch ((int) down->string[0])
          {
           case 127: /* Delete */
           case 9:        /* \t */
@@ -290,10 +270,10 @@
             break;
           default:
             esmart_text_entry_buffer_char_append (data,
-                                                  evx->key_compose[0]);
+                                                  down->string[0]);
 #if DEBUG
-            fprintf (stderr, "(%d) is the key_compose value\n",
-                     (int) evx->key_compose[0]);
+            fprintf (stderr, "(%d) is the string value\n",
+                     (int) down->key_string[0]);
 #endif
             break;
          }




-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now. 
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to