Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_button.c etk_entry.c etk_scale.c etk_widget.c etk_widget.h
Log Message:
* Add "focus_on_press" and "can_pass_focus" flags to Etk_Widget
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_button.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_button.c 28 Oct 2005 14:06:25 -0000 1.2
+++ etk_button.c 1 Nov 2005 00:18:40 -0000 1.3
@@ -87,7 +87,7 @@
*/
Etk_Widget *etk_button_new()
{
- return etk_widget_new(ETK_BUTTON_TYPE, "theme_group", "button",
"focusable", TRUE, NULL);
+ return etk_widget_new(ETK_BUTTON_TYPE, "theme_group", "button",
"focusable", TRUE, "focus_on_press", TRUE, NULL);
}
/**
@@ -96,7 +96,7 @@
*/
Etk_Widget *etk_button_new_with_label(const char *label)
{
- return etk_widget_new(ETK_BUTTON_TYPE, "theme_group", "button", "label",
label, "focusable", TRUE, NULL);
+ return etk_widget_new(ETK_BUTTON_TYPE, "theme_group", "button", "label",
label, "focusable", TRUE, "focus_on_press", TRUE, NULL);
}
/**
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_entry.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_entry.c 29 Oct 2005 19:57:20 -0000 1.4
+++ etk_entry.c 1 Nov 2005 00:18:41 -0000 1.5
@@ -22,7 +22,6 @@
static void _etk_entry_realize_cb(Etk_Object *object, void *data);
static void _etk_entry_unrealize_cb(Etk_Object *object, void *data);
static void _etk_entry_key_down_cb(Etk_Object *object, void *event, void
*data);
-static void _etk_entry_mouse_down_cb(Etk_Object *object,
Etk_Event_Mouse_Up_Down *event, void *data);
static void _etk_entry_mouse_in_cb(Etk_Object *object, Etk_Event_Mouse_In_Out
*event, void *data);
static void _etk_entry_mouse_out_cb(Etk_Object *object, Etk_Event_Mouse_In_Out
*event, void *data);
static void _etk_entry_focus_cb(Etk_Object *object, void *data);
@@ -60,7 +59,7 @@
*/
Etk_Widget *etk_entry_new()
{
- return etk_widget_new(ETK_ENTRY_TYPE, "theme_group", "entry", "focusable",
TRUE, NULL);
+ return etk_widget_new(ETK_ENTRY_TYPE, "theme_group", "entry", "focusable",
TRUE, "focus_on_press", TRUE, NULL);
}
/**
@@ -93,7 +92,6 @@
etk_signal_connect_after("realize", ETK_OBJECT(entry),
ETK_CALLBACK(_etk_entry_realize_cb), NULL);
etk_signal_connect("unrealize", ETK_OBJECT(entry),
ETK_CALLBACK(_etk_entry_unrealize_cb), NULL);
etk_signal_connect("key_down", ETK_OBJECT(entry),
ETK_CALLBACK(_etk_entry_key_down_cb), NULL);
- etk_signal_connect("mouse_down", ETK_OBJECT(entry),
ETK_CALLBACK(_etk_entry_mouse_down_cb), NULL);
etk_signal_connect("mouse_in", ETK_OBJECT(entry),
ETK_CALLBACK(_etk_entry_mouse_in_cb), NULL);
etk_signal_connect("mouse_out", ETK_OBJECT(entry),
ETK_CALLBACK(_etk_entry_mouse_out_cb), NULL);
etk_signal_connect("focus", ETK_OBJECT(entry),
ETK_CALLBACK(_etk_entry_focus_cb), NULL);
@@ -162,17 +160,6 @@
etk_signal_emit(_etk_entry_signals[ETK_ENTRY_TEXT_CHANGED_SIGNAL],
object, NULL);
}
-/* Called when the user presses the entry with the mouse */
-/* TODO: move the cursor under the mouse pointer */
-static void _etk_entry_mouse_down_cb(Etk_Object *object,
Etk_Event_Mouse_Up_Down *event, void *data)
-{
- Etk_Entry *entry;
-
- if (!(entry = ETK_ENTRY(object)))
- return;
- etk_widget_focus(ETK_WIDGET(entry));
-}
-
/* Called when the mouse enters the entry */
static void _etk_entry_mouse_in_cb(Etk_Object *object, Etk_Event_Mouse_In_Out
*event, void *data)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_scale.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_scale.c 29 Oct 2005 19:57:20 -0000 1.3
+++ etk_scale.c 1 Nov 2005 00:18:41 -0000 1.4
@@ -68,7 +68,7 @@
Etk_Widget *etk_hscale_new(double lower, double upper, double value, double
step_increment, double page_increment)
{
return etk_widget_new(ETK_HSCALE_TYPE, "theme_group", "hscale",
"focusable", TRUE, "lower", lower, "upper", upper,
- "value", value, "step_increment", step_increment, "page_increment",
page_increment, NULL);
+ "value", value, "step_increment", step_increment, "page_increment",
page_increment, "focus_on_press", TRUE, NULL);
}
/**
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_widget.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_widget.c 31 Oct 2005 21:36:40 -0000 1.7
+++ etk_widget.c 1 Nov 2005 00:18:41 -0000 1.8
@@ -74,7 +74,9 @@
ETK_WIDGET_VISIBLE_PROPERTY,
ETK_WIDGET_REPEAT_EVENTS_PROPERTY,
ETK_WIDGET_PASS_EVENTS_PROPERTY,
- ETK_WIDGET_FOCUSABLE_PROPERTY
+ ETK_WIDGET_FOCUSABLE_PROPERTY,
+ ETK_WIDGET_FOCUS_ON_PRESS_PROPERTY,
+ ETK_WIDGET_CAN_PASS_FOCUS_PROPERTY
};
static void _etk_widget_constructor(Etk_Widget *widget);
@@ -84,7 +86,6 @@
static void _etk_widget_show_handler(Etk_Widget *widget);
static void _etk_widget_hide_handler(Etk_Widget *widget);
-static void _etk_widget_key_down_handler(Etk_Widget *widget,
Etk_Event_Key_Up_Down *event);
static void _etk_widget_enter_handler(Etk_Widget *widget);
static void _etk_widget_leave_handler(Etk_Widget *widget);
static void _etk_widget_focus_handler(Etk_Widget *widget);
@@ -96,9 +97,11 @@
static void _etk_widget_signal_mouse_out_cb(Etk_Object *object,
Etk_Event_Mouse_In_Out *event, void *data);
static void _etk_widget_mouse_move_cb(void *data, Evas *evas, Evas_Object
*object, void *event_info);
static void _etk_widget_mouse_down_cb(void *data, Evas *evas, Evas_Object
*object, void *event_info);
+static void _etk_widget_signal_mouse_down_cb(Etk_Object *object,
Etk_Event_Mouse_Up_Down *event, void *data);
static void _etk_widget_mouse_up_cb(void *data, Evas *evas, Evas_Object
*object, void *event_info);
static void _etk_widget_mouse_wheel_cb(void *data, Evas *evas, Evas_Object
*object, void *event_info);
static void _etk_widget_key_down_cb(void *data, Evas *evas, Evas_Object
*object, void *event_info);
+static void _etk_widget_signal_key_down_cb(Etk_Object *object,
Etk_Event_Key_Up_Down *event, void *data);
static void _etk_widget_key_up_cb(void *data, Evas *evas, Evas_Object *object,
void *event_info);
static void _etk_widget_toplevel_parent_set(Etk_Widget *widget, void *data);
@@ -155,8 +158,8 @@
_etk_widget_signals[ETK_WIDGET_MOUSE_UP_SIGNAL] =
etk_signal_new("mouse_up", widget_type, -1,
etk_marshaller_VOID__POINTER, NULL, NULL);
_etk_widget_signals[ETK_WIDGET_MOUSE_CLICKED_SIGNAL] =
etk_signal_new("mouse_clicked", widget_type, -1,
etk_marshaller_VOID__POINTER, NULL, NULL);
_etk_widget_signals[ETK_WIDGET_MOUSE_WHEEL_SIGNAL] =
etk_signal_new("mouse_wheel", widget_type, -1,
etk_marshaller_VOID__POINTER, NULL, NULL);
- _etk_widget_signals[ETK_WIDGET_KEY_DOWN_SIGNAL] =
etk_signal_new("key_down", widget_type, ETK_MEMBER_OFFSET(Etk_Widget,
key_down), etk_marshaller_VOID__POINTER, NULL, NULL);
- _etk_widget_signals[ETK_WIDGET_KEY_UP_SIGNAL] =
etk_signal_new("key_up", widget_type, ETK_MEMBER_OFFSET(Etk_Widget,
key_up), etk_marshaller_VOID__POINTER, NULL, NULL);
+ _etk_widget_signals[ETK_WIDGET_KEY_DOWN_SIGNAL] =
etk_signal_new("key_down", widget_type, -1,
etk_marshaller_VOID__POINTER, NULL, NULL);
+ _etk_widget_signals[ETK_WIDGET_KEY_UP_SIGNAL] =
etk_signal_new("key_up", widget_type, -1,
etk_marshaller_VOID__POINTER, NULL, NULL);
_etk_widget_signals[ETK_WIDGET_ENTER_SIGNAL] =
etk_signal_new("enter", widget_type, ETK_MEMBER_OFFSET(Etk_Widget,
enter), etk_marshaller_VOID__VOID, NULL, NULL);
_etk_widget_signals[ETK_WIDGET_LEAVE_SIGNAL] =
etk_signal_new("leave", widget_type, ETK_MEMBER_OFFSET(Etk_Widget,
leave), etk_marshaller_VOID__VOID, NULL, NULL);
_etk_widget_signals[ETK_WIDGET_FOCUS_SIGNAL] =
etk_signal_new("focus", widget_type, ETK_MEMBER_OFFSET(Etk_Widget,
focus), etk_marshaller_VOID__VOID, NULL, NULL);
@@ -172,6 +175,8 @@
etk_type_property_add(widget_type, "repeat_events",
ETK_WIDGET_REPEAT_EVENTS_PROPERTY, ETK_PROPERTY_BOOL,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(FALSE));
etk_type_property_add(widget_type, "pass_events",
ETK_WIDGET_PASS_EVENTS_PROPERTY, ETK_PROPERTY_BOOL,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(FALSE));
etk_type_property_add(widget_type, "focusable",
ETK_WIDGET_FOCUSABLE_PROPERTY, ETK_PROPERTY_BOOL,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(FALSE));
+ etk_type_property_add(widget_type, "focus_on_press",
ETK_WIDGET_FOCUS_ON_PRESS_PROPERTY, ETK_PROPERTY_BOOL,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(FALSE));
+ etk_type_property_add(widget_type, "can_pass_focus",
ETK_WIDGET_CAN_PASS_FOCUS_PROPERTY, ETK_PROPERTY_BOOL,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(TRUE));
widget_type->property_set = _etk_widget_property_set;
widget_type->property_get = _etk_widget_property_get;
@@ -1258,8 +1263,6 @@
widget->member_objects = NULL;
widget->show = _etk_widget_show_handler;
widget->hide = _etk_widget_hide_handler;
- widget->key_down = _etk_widget_key_down_handler;
- widget->key_up = NULL;
widget->enter = _etk_widget_enter_handler;
widget->leave = _etk_widget_leave_handler;
widget->focus = _etk_widget_focus_handler;
@@ -1290,6 +1293,8 @@
widget->realized = FALSE;
widget->visible = FALSE;
widget->focusable = FALSE;
+ widget->focus_on_press = FALSE;
+ widget->can_pass_focus = TRUE;
widget->repeat_events = FALSE;
widget->pass_events = FALSE;
widget->need_size_recalc = FALSE;
@@ -1302,6 +1307,9 @@
etk_signal_connect_full(_etk_widget_signals[ETK_WIDGET_MOUSE_IN_SIGNAL],
ETK_OBJECT(widget), ETK_CALLBACK(_etk_widget_signal_mouse_in_cb), NULL, FALSE,
FALSE);
etk_signal_connect_full(_etk_widget_signals[ETK_WIDGET_MOUSE_OUT_SIGNAL],
ETK_OBJECT(widget), ETK_CALLBACK(_etk_widget_signal_mouse_out_cb), NULL, FALSE,
FALSE);
+ etk_signal_connect_full(_etk_widget_signals[ETK_WIDGET_MOUSE_DOWN_SIGNAL],
ETK_OBJECT(widget), ETK_CALLBACK(_etk_widget_signal_mouse_down_cb), NULL,
FALSE, FALSE);
+ etk_signal_connect_full(_etk_widget_signals[ETK_WIDGET_KEY_DOWN_SIGNAL],
ETK_OBJECT(widget), ETK_CALLBACK(_etk_widget_signal_key_down_cb), NULL, FALSE,
FALSE);
+
}
/* Destroys the widget */
@@ -1368,6 +1376,14 @@
case ETK_WIDGET_FOCUSABLE_PROPERTY:
widget->focusable = etk_property_value_bool_get(value);
etk_object_notify(object, "focusable");
+ case ETK_WIDGET_FOCUS_ON_PRESS_PROPERTY:
+ widget->focus_on_press = etk_property_value_bool_get(value);
+ etk_object_notify(object, "focus_on_press");
+ break;
+ case ETK_WIDGET_CAN_PASS_FOCUS_PROPERTY:
+ widget->can_pass_focus = etk_property_value_bool_get(value);
+ etk_object_notify(object, "can_pass_focus");
+ break;
default:
break;
}
@@ -1413,6 +1429,12 @@
case ETK_WIDGET_FOCUSABLE_PROPERTY:
etk_property_value_bool_set(value, widget->focusable);
break;
+ case ETK_WIDGET_FOCUS_ON_PRESS_PROPERTY:
+ etk_property_value_bool_set(value, widget->focus_on_press);
+ break;
+ case ETK_WIDGET_CAN_PASS_FOCUS_PROPERTY:
+ etk_property_value_bool_set(value, widget->can_pass_focus);
+ break;
default:
break;
}
@@ -1424,26 +1446,6 @@
*
**************************/
-/* Default handler for the "key_down" signal */
-static void _etk_widget_key_down_handler(Etk_Widget *widget,
Etk_Event_Key_Up_Down *event)
-{
- Etk_Toplevel_Widget *toplevel;
-
- if (!widget || !event || !(toplevel = (widget->toplevel_parent)) ||
!event->key)
- return;
-
- if (strcmp(event->key, "Tab") == 0)
- {
- etk_widget_focus(etk_toplevel_widget_focused_widget_next_get(toplevel));
- etk_widget_event_propagation_stop();
- }
- else if (strcmp(event->key, "ISO_Left_Tab") == 0)
- {
- etk_widget_focus(etk_toplevel_widget_focused_widget_prev_get(toplevel));
- etk_widget_event_propagation_stop();
- }
-}
-
/* Default handler for the "enter" signal */
static void _etk_widget_enter_handler(Etk_Widget *widget)
{
@@ -1674,6 +1676,16 @@
etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_DOWN_SIGNAL],
ETK_OBJECT(widget), NULL, &event);
}
+/* Called when the widget is pressed */
+static void _etk_widget_signal_mouse_down_cb(Etk_Object *object,
Etk_Event_Mouse_Up_Down *event, void *data)
+{
+ Etk_Widget *widget;
+
+ if (!(widget = ETK_WIDGET(object)) || !widget->focus_on_press)
+ return;
+ etk_widget_focus(widget);
+}
+
/* Called when the mouse releases the widget */
static void _etk_widget_mouse_up_cb(void *data, Evas *evas, Evas_Object
*object, void *event_info)
{
@@ -1779,6 +1791,27 @@
etk_signal_emit(_etk_widget_signals[ETK_WIDGET_KEY_DOWN_SIGNAL],
ETK_OBJECT(widget), NULL, &event);
}
+/* Called when a key is pressed */
+static void _etk_widget_signal_key_down_cb(Etk_Object *object,
Etk_Event_Key_Up_Down *event, void *data)
+{
+ Etk_Widget *widget;
+ Etk_Toplevel_Widget *toplevel;
+
+ if (!(widget = ETK_WIDGET(object)) || !widget->can_pass_focus || !event ||
!(toplevel = (widget->toplevel_parent)) || !event->key)
+ return;
+
+ if (strcmp(event->key, "Tab") == 0)
+ {
+ etk_widget_focus(etk_toplevel_widget_focused_widget_next_get(toplevel));
+ etk_widget_event_propagation_stop();
+ }
+ else if (strcmp(event->key, "ISO_Left_Tab") == 0)
+ {
+ etk_widget_focus(etk_toplevel_widget_focused_widget_prev_get(toplevel));
+ etk_widget_event_propagation_stop();
+ }
+}
+
/* Called when the user releases a key and if the widget is focused */
static void _etk_widget_key_up_cb(void *data, Evas *evas, Evas_Object *object,
void *event_info)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_widget.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_widget.h 31 Oct 2005 21:36:40 -0000 1.6
+++ etk_widget.h 1 Nov 2005 00:18:41 -0000 1.7
@@ -170,8 +170,6 @@
void (*show)(Etk_Widget *widget);
void (*hide)(Etk_Widget *widget);
- void (*key_down)(Etk_Widget *widget, Etk_Event_Key_Up_Down *event);
- void (*key_up)(Etk_Widget *widget, Etk_Event_Key_Up_Down *event);
void (*enter)(Etk_Widget *widget);
void (*leave)(Etk_Widget *widget);
void (*focus)(Etk_Widget *widget);
@@ -182,6 +180,8 @@
unsigned char repeat_events : 1;
unsigned char pass_events : 1;
unsigned char focusable : 1;
+ unsigned char focus_on_press : 1;
+ unsigned char can_pass_focus : 1;
unsigned char need_size_recalc : 1;
unsigned char need_redraw : 1;
unsigned char need_theme_min_size_recalc : 1;
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs