Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_entry.c ewl_password.c ewl_password.h
Log Message:
- fixup the ewl_password a bit
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_entry.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- ewl_entry.c 29 Nov 2005 02:11:50 -0000 1.38
+++ ewl_entry.c 29 Nov 2005 06:13:22 -0000 1.39
@@ -274,7 +274,6 @@
{
Ewl_Event_Key_Down *event;
Ewl_Entry *e;
- char *evd;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -314,12 +313,7 @@
|| (!strcmp(event->keyname, "KP_Enter")))
{
if (!e->multiline)
- {
- evd = ewl_text_text_get(EWL_TEXT(e));
- ewl_callback_call_with_event_data(w,
- EWL_CALLBACK_VALUE_CHANGED, evd);
- IF_FREE(evd);
- }
+ ewl_callback_call(w, EWL_CALLBACK_VALUE_CHANGED);
else
{
ewl_entry_selection_clear(e);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_password.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_password.c 25 Oct 2005 02:03:46 -0000 1.7
+++ ewl_password.c 29 Nov 2005 06:13:22 -0000 1.8
@@ -3,6 +3,8 @@
#include "ewl_macros.h"
#include "ewl_private.h"
+static void ewl_password_text_insert(Ewl_Password *e, const char *s);
+
/**
* @param text: the initial text to display in the widget
* @return Returns a new password widget on success, NULL on failure.
@@ -58,7 +60,7 @@
ewl_callback_del(w, EWL_CALLBACK_MOUSE_MOVE, ewl_entry_cb_mouse_move);
ewl_callback_append(w, EWL_CALLBACK_KEY_DOWN, ewl_password_key_down_cb,
NULL);
- ewl_callback_prepend(w, EWL_CALLBACK_DESTROY, ewl_password_destroy,
+ ewl_callback_prepend(w, EWL_CALLBACK_DESTROY, ewl_password_destroy_cb,
NULL);
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -73,7 +75,7 @@
* Change the text of the password widget @a e to the string @a t.
*/
void
-ewl_password_text_set(Ewl_Password *e, char *t)
+ewl_password_text_set(Ewl_Password *e, const char *t)
{
char *vis = NULL;
int len;
@@ -157,8 +159,8 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-ewl_password_text_insert(Ewl_Password *e, char *s)
+static void
+ewl_password_text_insert(Ewl_Password *e, const char *s)
{
char *s2, *s3;
int l = 0, l2 = 0;
@@ -173,7 +175,11 @@
s3 = NEW(char, l + l2 + 1);
if (!s3) {
- IF_FREE(s2);
+ if (s2)
+ {
+ ZERO(s2, char, strlen(s2));
+ FREE(s2);
+ }
DRETURN(DLEVEL_STABLE);
}
@@ -183,7 +189,13 @@
ewl_password_text_set(e, s3);
- IF_FREE(s2);
+ if (s2)
+ {
+ ZERO(s2, char, strlen(s2));
+ FREE(s2);
+ }
+
+ ZERO(s3, char, strlen(s3));
FREE(s3);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -197,7 +209,6 @@
void *user_data __UNUSED__)
{
int len;
- char *tmp;
Ewl_Password *e;
Ewl_Event_Key_Down *ev;
@@ -209,31 +220,29 @@
ev = ev_data;
if (!strcmp(ev->keyname, "BackSpace")) {
- tmp = ewl_text_text_get(EWL_TEXT(e));
- if (tmp && (len = strlen(tmp))) {
- tmp[len - 1] = '\0';
- ewl_text_text_set(EWL_TEXT(e), tmp);
+ if ((len = ewl_text_length_get(EWL_TEXT(e))) > 0)
e->real_text[len - 1] = '\0';
- FREE(tmp);
- }
+
+ ewl_entry_delete_left(EWL_ENTRY(e));
+
+ /* XXX note that this dosen't handle selections at all */
}
else if (!strcmp(ev->keyname, "Return") || !strcmp(ev->keyname,
"KP_Return"))
- ewl_callback_call_with_event_data(w, EWL_CALLBACK_VALUE_CHANGED,
- ewl_text_text_get(EWL_TEXT(w)));
+ ewl_callback_call(w, EWL_CALLBACK_VALUE_CHANGED);
+
else if (!strcmp(ev->keyname, "Enter") || !strcmp(ev->keyname,
"KP_Enter"))
- ewl_callback_call_with_event_data(w, EWL_CALLBACK_VALUE_CHANGED,
- ewl_text_text_get(EWL_TEXT(w)));
- else if (ev->keyname) {
+ ewl_callback_call(w, EWL_CALLBACK_VALUE_CHANGED);
+
+ else if (ev->keyname)
ewl_password_text_insert(e, ev->keyname);
- }
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
void
-ewl_password_destroy(Ewl_Widget *w, void *ev_data __UNUSED__,
+ewl_password_destroy_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
void *user_data __UNUSED__)
{
Ewl_Password *p;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_password.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_password.h 25 Oct 2005 02:03:46 -0000 1.4
+++ ewl_password.h 29 Nov 2005 06:13:22 -0000 1.5
@@ -38,18 +38,18 @@
Ewl_Widget *ewl_password_new(void);
int ewl_password_init(Ewl_Password *e);
-void ewl_password_text_set(Ewl_Password *e, char *t);
+
+void ewl_password_text_set(Ewl_Password *e, const char *t);
char *ewl_password_text_get(Ewl_Password *e);
+
void ewl_password_obscure_set(Ewl_Password *e, char o);
char ewl_password_obscure_get(Ewl_Password *e);
-void ewl_password_text_insert(Ewl_Password *e, char *s);
-
/*
* Internally used callbacks, override at your own risk.
*/
void ewl_password_key_down_cb(Ewl_Widget *w, void *ev_data, void *user_data);
-void ewl_password_destroy(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_password_destroy_cb(Ewl_Widget *w, void *ev_data, void *user_data);
/**
* @}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
