E CVS: apps/evfs lordchaos
Enlightenment CVS committal Author : lordchaos Project : e17 Module : apps/evfs Dir : e17/apps/evfs/src/common Modified Files: evfs_cleanup.c Log Message: * More leak fixes === RCS file: /cvsroot/enlightenment/e17/apps/evfs/src/common/evfs_cleanup.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- evfs_cleanup.c 3 Feb 2006 23:12:13 - 1.14 +++ evfs_cleanup.c 8 Feb 2006 10:15:29 - 1.15 @@ -27,6 +27,7 @@ free(command-file_command.files[i]-plugin_uri); free(command-file_command.files[i]); } + free(command-file_command.files); } void --- 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://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/widgets Added Files: spinner.edc Log Message: - add skeleton for spin button widget (doesnt work yet!) - add xdnd drop support per widget - see test. --- 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://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
Etk.h Makefile.am etk_main.c etk_types.h etk_widget.c
etk_widget.h etk_window.c
Added Files:
etk_spin_button.c etk_spin_button.h
Log Message:
- add skeleton for spin button widget (doesnt work yet!)
- add xdnd drop support per widget - see test.
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/Etk.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- Etk.h 19 Jan 2006 13:56:10 - 1.16
+++ Etk.h 8 Feb 2006 12:49:38 - 1.17
@@ -57,5 +57,6 @@
#include etk_filechooser_widget.h
#include etk_notebook.h
#include etk_progress_bar.h
+#include etk_spin_button.h
#endif
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- Makefile.am 19 Jan 2006 13:56:10 - 1.19
+++ Makefile.am 8 Feb 2006 12:49:38 - 1.20
@@ -40,7 +40,8 @@
etk_statusbar.h \
etk_filechooser_widget.h \
etk_notebook.h \
-etk_progress_bar.h
+etk_progress_bar.h \
+etk_spin_button.h
libetk_la_SOURCES = \
etk_main.c etk_utils.c \
@@ -68,6 +69,7 @@
etk_filechooser_widget.c \
etk_notebook.c \
etk_progress_bar.c \
+etk_spin_button.c \
$(ETKHEADERS)
installed_headersdir = $(prefix)/include/etk
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- etk_main.c 15 Jan 2006 11:07:16 - 1.10
+++ etk_main.c 8 Feb 2006 12:49:38 - 1.11
@@ -1,7 +1,10 @@
/** @file etk_main.c */
#include etk_main.h
#include locale.h
+#include string.h
+#include stdlib.h
#include Ecore.h
+#include Ecore_X.h
#include Ecore_Job.h
#include Ecore_Evas.h
#include Evas.h
@@ -12,6 +15,7 @@
#include etk_toplevel_widget.h
#include etk_utils.h
#include etk_theme.h
+#include etk_window.h
#include config.h
/**
@@ -23,10 +27,19 @@
static void _etk_main_size_request_recursive(Etk_Widget *widget);
static void _etk_main_size_allocate_recursive(Etk_Widget *widget, Etk_Bool
is_top_level);
+#if HAVE_ECORE_X
+static int _etk_xdnd_enter_handler(void *data, int type, void *event);
+static int _etk_xdnd_position_handler(void *data, int type, void *event);
+static int _etk_xdnd_drop_handler(void *data, int type, void *event);
+static int _etk_xdnd_leave_handler(void *data, int type, void *event);
+static int _etk_xdnd_selection_handler(void *data, int type, void *event);
+#endif
+
static Evas_List *_etk_main_toplevel_widgets = NULL;
static Etk_Bool _etk_main_running = ETK_FALSE;
static Etk_Bool _etk_main_initialized = ETK_FALSE;
static Ecore_Job *_etk_main_iterate_job = NULL;
+static Etk_Widget *_etk_dnd_widget = NULL;
/**
*
@@ -63,6 +76,15 @@
ETK_WARNING(Edje initialization failed!);
return ETK_FALSE;
}
+
+#if HAVE_ECORE_X
+ if (!ecore_x_init(NULL))
+ {
+ ETK_WARNING(Ecore_X initialzation failed!);
+ return ETK_FALSE;
+ }
+#endif
+
etk_theme_init();
/* Gettext */
@@ -70,6 +92,14 @@
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
+#if HAVE_ECORE_X
+ ecore_event_handler_add(ECORE_X_EVENT_XDND_ENTER, _etk_xdnd_enter_handler,
NULL);
+ ecore_event_handler_add(ECORE_X_EVENT_XDND_POSITION,
_etk_xdnd_position_handler, NULL);
+ ecore_event_handler_add(ECORE_X_EVENT_XDND_DROP, _etk_xdnd_drop_handler,
NULL);
+ ecore_event_handler_add(ECORE_X_EVENT_XDND_LEAVE, _etk_xdnd_leave_handler,
NULL);
+ ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY,
_etk_xdnd_selection_handler, NULL);
+#endif
+
_etk_main_initialized = ETK_TRUE;
return ETK_TRUE;
}
@@ -214,4 +244,205 @@
}
}
+
+#if HAVE_ECORE_X
+#define E_INSIDE(x, y, xx, yy, ww, hh) (((x) ((xx) + (ww))) ((y) ((yy)
+ (hh))) ((x) = (xx)) ((y) = (yy)))
+static int _etk_xdnd_enter_handler(void *data, int type, void *event)
+{
+ Ecore_X_Event_Xdnd_Enter *ev;
+ int i;
+
+ /* printf(enter\n); */
+ ev = event;
+ /*
+for (i = 0; i ev-num_types; i++)
+ printf(type: %s\n, ev-types[i]);
+*/
+ return 1;
+}
+
+/* Search the container recursively for the widget that accepts xdnd */
+static void _etk_xdnd_container_get_widgets_at(Etk_Container *cont, int x, int
y, int offx, int offy, Evas_List **list)
+{
+ Evas_List *child;
+
+ for(child = etk_container_children_get(cont); child; child = child-next)
+ {
+ Etk_Widget *widget;
+
+ if(!(widget = ETK_WIDGET(child-data)))
+ continue;
+
+ if(E_INSIDE(x, y,
+ widget-inner_geometry.x + offx,
+
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/images Modified Files: images.edc Added Files: spinner_button_down1.png spinner_button_down2.png spinner_button_up1.png spinner_button_up2.png Log Message: - add skeleton for spin button widget (doesnt work yet!) - add xdnd drop support per widget - see test. === RCS file: /cvsroot/enlightenment/e17/proto/etk/data/themes/default/images/images.edc,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- images.edc 26 Dec 2005 15:11:49 - 1.16 +++ images.edc 8 Feb 2006 12:49:38 - 1.17 @@ -41,6 +41,10 @@ image: scrollbar_vdrag2.png COMP; image: scrollbar_hdrag_thumb.png COMP; image: scrollbar_vdrag_thumb.png COMP; + image: spinner_button_up1.png COMP; + image: spinner_button_up2.png COMP; + image: spinner_button_down1.png COMP; + image: spinner_button_down2.png COMP; image: tree.png COMP; image: tree_header_inactive.png COMP; image: tree_header_active.png COMP; --- 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://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
Makefile.am etk_button_test.c etk_test.c etk_test.h
Added Files:
etk_spin_button_test.c etk_xdnd_test.c
Log Message:
- add skeleton for spin button widget (doesnt work yet!)
- add xdnd drop support per widget - see test.
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Makefile.am 19 Jan 2006 13:56:10 - 1.8
+++ Makefile.am 8 Feb 2006 12:49:38 - 1.9
@@ -33,7 +33,9 @@
etk_menu_test.c \
etk_filechooser_test.c \
etk_notebook_test.c \
-etk_progress_bar_test.c
+etk_progress_bar_test.c \
+etk_spin_button_test.c \
+etk_xdnd_test.c
etk_test_LDADD = $(top_builddir)/src/lib/libetk.la \
@ecore_libs@ @evas_libs@ @edje_libs@
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_button_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_button_test.c 15 Jan 2006 11:07:16 - 1.6
+++ etk_button_test.c 8 Feb 2006 12:49:38 - 1.7
@@ -2,6 +2,22 @@
#include config.h
/* Creates the window for the button test */
+
+static void _etk_test_button_drag_drop_cb(Etk_Object *object, void *data)
+{
+ int num_files, i;
+ char **files;
+
+ files = etk_widget_xdnd_files_get(ETK_WIDGET(object), num_files);
+ printf(Our test widget got a drop with %d files\n, num_files);
+
+ for (i = 0; i num_files; i++)
+ {
+ printf(Widget got: file: %s\n, files[i]);
+ }
+}
+
+
void etk_test_button_window_create(void *data)
{
static Etk_Widget *win = NULL;
@@ -50,6 +66,8 @@
etk_box_pack_start(ETK_BOX(vbox), button_radio, ETK_FALSE, ETK_FALSE, 0);
button_toggle = etk_toggle_button_new_with_label(_(Toggle button));
+ etk_widget_xdnd_set(button_toggle, ETK_TRUE);
+ etk_signal_connect(drag_drop, ETK_OBJECT(button_toggle),
ETK_CALLBACK(_etk_test_button_drag_drop_cb), button_toggle);
etk_box_pack_start(ETK_BOX(vbox), button_toggle, ETK_FALSE, ETK_FALSE, 0);
button_toggle = etk_toggle_button_new();
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_test.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_test.c 19 Jan 2006 13:56:10 - 1.12
+++ etk_test.c 8 Feb 2006 12:49:38 - 1.13
@@ -60,6 +60,14 @@
{
Progress Bar,
etk_test_progress_bar_window_create
+ },
+ {
+ Spin Button,
+ etk_test_spin_button_window_create
+ },
+ {
+ X Drag / Drop,
+ etk_test_xdnd_window_create
}
};
static int num_tests = sizeof(tests) / sizeof (tests[0]);
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_test.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_test.h 19 Jan 2006 13:56:10 - 1.9
+++ etk_test.h 8 Feb 2006 12:49:38 - 1.10
@@ -24,5 +24,7 @@
void etk_test_filechooser_window_create(void *data);
void etk_test_notebook_window_create(void *data);
void etk_test_progress_bar_window_create(void *data);
+void etk_test_spin_button_window_create(void *data);
+void etk_test_xdnd_window_create(void *data);
#endif
---
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://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk
Modified Files:
configure.in
Log Message:
- add skeleton for spin button widget (doesnt work yet!)
- add xdnd drop support per widget - see test.
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- configure.in15 Jan 2006 11:07:11 - 1.6
+++ configure.in8 Feb 2006 12:49:37 - 1.7
@@ -180,6 +180,23 @@
fi
#
+## Ecore_X
+AC_CHECK_HEADER(Ecore_X.h, [ ecore_x_includes=yes ])
+AC_CHECK_LIB(ecore_x, ecore_x_init, ecore_x_libs=yes, ecore_x_libs=no)
+if test x{ecore_x_includes} != xno -a x${ecore_x_includes} != x; then
+ if test x{ecore_x_libs} != xno -a x${ecore_x_libs} != x; then
+have_ecore_x=yes
+AC_DEFINE(HAVE_ECORE_X, 1, [Define to 1 if you have the Ecore_X headers
and libraries])
+ else
+have_ecore_x=no
+AC_DEFINE(HAVE_ECORE_X, 0, [Define to 1 if you have the Ecore_X headers
and libraries])
+ fi
+else
+ have_ecore_x=no
+ AC_DEFINE(HAVE_ECORE_X, 0, [Define to 1 if you have the Ecore_X headers and
libraries])
+fi
+
+#
## Gettext
ALL_LINGUAS=fr
AC_SUBST(ALL_LINGUAS)
@@ -251,6 +268,13 @@
echo $PACKAGE $VERSION
echo
echo
+echo
+echo Configuration Options Summary:
+echo
+echo Ecore_X support..: $have_ecore_x
+echo
+echo Installation Path.: $prefix
+echo
echo Now type 'make' ('gmake' on some systems) to compile $PACKAGE,
echo and then afterwards as root (or the user who will install this), type
echo 'make install'. Change users with 'su' or 'sudo' appropriately.
---
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://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default Modified Files: default.edc Log Message: - add skeleton for spin button widget (doesnt work yet!) - add xdnd drop support per widget - see test. === RCS file: /cvsroot/enlightenment/e17/proto/etk/data/themes/default/default.edc,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- default.edc 19 Jan 2006 13:56:09 - 1.12 +++ default.edc 8 Feb 2006 12:49:37 - 1.13 @@ -22,5 +22,6 @@ #include widgets/menu.edc #include widgets/statusbar.edc #include widgets/notebook.edc - #include widgets/progress_bar.edc + #include widgets/progress_bar.edc + #include widgets/spinner.edc } --- 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://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_gadcon.c e_gadcon.h e_main.c
Log Message:
more work on gadcon - u can drag items around and they reshuffle kind of ok -
not perfectly tho.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_gadcon.c 6 Feb 2006 10:44:54 - 1.4
+++ e_gadcon.c 8 Feb 2006 15:06:25 - 1.5
@@ -6,6 +6,29 @@
static void _e_gadcon_free(E_Gadcon *gc);
static void _e_gadcon_client_free(E_Gadcon_Client *gcc);
+static void _e_gadcon_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj,
void *event_info);
+static void _e_gadcon_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj,
void *event_info);
+static void _e_gadcon_cb_mouse_in(void *data, Evas *evas, Evas_Object *obj,
void *event_info);
+static void _e_gadcon_cb_mouse_out(void *data, Evas *evas, Evas_Object *obj,
void *event_info);
+static void _e_gadcon_cb_move(void *data, Evas *evas, Evas_Object *obj, void
*event_info);
+static void _e_gadcon_cb_resize(void *data, Evas *evas, Evas_Object *obj, void
*event_info);
+
+static void _e_gadcon_cb_signal_move_start(void *data, Evas_Object *obj, const
char *emission, const char *source);
+static void _e_gadcon_cb_signal_move_stop(void *data, Evas_Object *obj, const
char *emission, const char *source);
+static void _e_gadcon_cb_signal_move_go(void *data, Evas_Object *obj, const
char *emission, const char *source);
+static void _e_gadcon_cb_signal_resize_left_start(void *data, Evas_Object
*obj, const char *emission, const char *source);
+static void _e_gadcon_cb_signal_resize_left_stop(void *data, Evas_Object *obj,
const char *emission, const char *source);
+static void _e_gadcon_cb_signal_resize_left_go(void *data, Evas_Object *obj,
const char *emission, const char *source);
+static void _e_gadcon_cb_signal_resize_right_start(void *data, Evas_Object
*obj, const char *emission, const char *source);
+static void _e_gadcon_cb_signal_resize_right_stop(void *data, Evas_Object
*obj, const char *emission, const char *source);
+static void _e_gadcon_cb_signal_resize_right_go(void *data, Evas_Object *obj,
const char *emission, const char *source);
+static void _e_gadcon_cb_signal_resize_up_start(void *data, Evas_Object *obj,
const char *emission, const char *source);
+static void _e_gadcon_cb_signal_resize_up_stop(void *data, Evas_Object *obj,
const char *emission, const char *source);
+static void _e_gadcon_cb_signal_resize_up_go(void *data, Evas_Object *obj,
const char *emission, const char *source);
+static void _e_gadcon_cb_signal_resize_down_start(void *data, Evas_Object
*obj, const char *emission, const char *source);
+static void _e_gadcon_cb_signal_resize_down_stop(void *data, Evas_Object *obj,
const char *emission, const char *source);
+static void _e_gadcon_cb_signal_resize_down_go(void *data, Evas_Object *obj,
const char *emission, const char *source);
+
static Evas_Object *e_gadcon_layout_add(Evas *evas);
static void e_gadcon_layout_orientation_set(Evas_Object *obj, int horizontal);
static void e_gadcon_layout_min_size_get(Evas_Object *obj, Evas_Coord *w,
Evas_Coord *h);
@@ -215,6 +238,22 @@
}
}
+EAPI void
+e_gadcon_edit_begin(E_Gadcon *gc)
+{
+ Evas_List *l;
+
+ E_OBJECT_CHECK(gc);
+ E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
+ for (l = gc-clients; l; l = l-next)
+ {
+ E_Gadcon_Client *gcc;
+
+ gcc = l-data;
+ e_gadcon_client_edit_begin(gcc);
+ }
+}
+
EAPI E_Gadcon_Client *
e_gadcon_client_new(E_Gadcon *gc, char *name, char *id, Evas_Object *base_obj)
{
@@ -235,6 +274,76 @@
}
EAPI void
+e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
+{
+ Evas_Coord x, y, w, h;
+
+ E_OBJECT_CHECK(gcc);
+ E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
+
+ gcc-o_control = edje_object_add(gcc-gadcon-evas);
+ evas_object_layer_set(gcc-o_control, 100);
+ evas_object_geometry_get(gcc-o_base, x, y, w, h);
+ evas_object_move(gcc-o_control, x, y);
+ evas_object_resize(gcc-o_control, w, h);
+ e_theme_edje_object_set(gcc-o_control, base/theme/gadman,
+ gadman/control);
+
+ edje_object_signal_emit(gcc-o_control, hsize, off);
+ edje_object_signal_emit(gcc-o_control, vsize, off);
+ edje_object_signal_emit(gcc-o_control, move, on);
+
+ gcc-o_event = evas_object_rectangle_add(gcc-gadcon-evas);
+ evas_object_color_set(gcc-o_event, 0, 0, 0, 0);
+ evas_object_repeat_events_set(gcc-o_event, 1);
+ evas_object_layer_set(gcc-o_event, 100);
+ evas_object_move(gcc-o_event, x, y);
+ evas_object_resize(gcc-o_event, w, h);
+
+ edje_object_signal_callback_add(gcc-o_control, move_start, ,
+ _e_gadcon_cb_signal_move_start, gcc);
+
E CVS: e kwo
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/src Modified Files: timestamp.h Log Message: Wed Feb 8 19:24:21 CET 2006 (Kim) --- 0.16.8 --- Use default pager background in pagers for desk without background. Fix menu rendering after changing theme trans to 0. Add some missing localizable strings. Japanese translation update (Yasufumi Haga). Get rid of tooltips when closing window. Correct window position when dragging window through area/desk switch. Fix focus when dragging window through area/desk switch. Fix focus when entering desk where nothing should be focused. Freeze keyboard while switching area/desk. Fix focus stack after area/desk switch when using (sloppy) pointer focus. Remove support for ancient gettext versions. Quit pager zoom when leaving screen. === RCS file: /cvsroot/enlightenment/e16/e/src/timestamp.h,v retrieving revision 1.656 retrieving revision 1.657 diff -u -3 -r1.656 -r1.657 --- timestamp.h 24 Jan 2006 19:35:31 - 1.656 +++ timestamp.h 8 Feb 2006 18:44:42 - 1.657 @@ -1 +1 @@ -#define E_CHECKOUT_DATE $Date: 2006/01/24 19:35:31 $ +#define E_CHECKOUT_DATE $Date: 2006/02/08 18:44:42 $ --- 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://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e
Modified Files:
configure.in e.spec ChangeLog
Log Message:
Wed Feb 8 19:24:21 CET 2006
(Kim)
--- 0.16.8 ---
Use default pager background in pagers for desk without background.
Fix menu rendering after changing theme trans to 0.
Add some missing localizable strings.
Japanese translation update (Yasufumi Haga).
Get rid of tooltips when closing window.
Correct window position when dragging window through area/desk switch.
Fix focus when dragging window through area/desk switch.
Fix focus when entering desk where nothing should be focused.
Freeze keyboard while switching area/desk.
Fix focus stack after area/desk switch when using (sloppy) pointer focus.
Remove support for ancient gettext versions.
Quit pager zoom when leaving screen.
===
RCS file: /cvsroot/enlightenment/e16/e/configure.in,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -3 -r1.136 -r1.137
--- configure.in4 Feb 2006 14:20:12 - 1.136
+++ configure.in8 Feb 2006 18:44:42 - 1.137
@@ -5,7 +5,7 @@
ENLIGHTENMENT_MICRO=8
ENLIGHTENMENT_VERSION=$ENLIGHTENMENT_MAJOR.$ENLIGHTENMENT_MINOR.$ENLIGHTENMENT_MICRO
-AM_INIT_AUTOMAKE(e16, $ENLIGHTENMENT_VERSION-pre3)
+AM_INIT_AUTOMAKE(e16, $ENLIGHTENMENT_VERSION)
AM_MAINTAINER_MODE
dnl reasonable guesses for where stuff is installed
===
RCS file: /cvsroot/enlightenment/e16/e/e.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -3 -r1.207 -r1.208
--- e.spec 24 Jan 2006 19:35:31 - 1.207
+++ e.spec 8 Feb 2006 18:44:42 - 1.208
@@ -1,5 +1,5 @@
-%define revision 0.99.3
-%define rev_name -pre3
+%define revision 1
+%define rev_name %{nil}
Summary: The Enlightenment window manager.
Name: e16
===
RCS file: /cvsroot/enlightenment/e16/e/ChangeLog,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -3 -r1.197 -r1.198
--- ChangeLog 24 Jan 2006 19:35:31 - 1.197
+++ ChangeLog 8 Feb 2006 18:44:42 - 1.198
@@ -3737,3 +3737,23 @@
kde(?) systray apps when not using the e16 systray. Thanks to Peter Hyman
for going on about this :)
+
+---
+
+Wed Feb 8 19:24:21 CET 2006
+(Kim)
+
+--- 0.16.8 ---
+Use default pager background in pagers for desk without background.
+Fix menu rendering after changing theme trans to 0.
+Add some missing localizable strings.
+Japanese translation update (Yasufumi Haga).
+Get rid of tooltips when closing window.
+Correct window position when dragging window through area/desk switch.
+Fix focus when dragging window through area/desk switch.
+Fix focus when entering desk where nothing should be focused.
+Freeze keyboard while switching area/desk.
+Fix focus stack after area/desk switch when using (sloppy) pointer focus.
+Remove support for ancient gettext versions.
+Quit pager zoom when leaving screen.
+
---
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://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/engrave rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Added Files: engrave_style.c engrave_style.h Log Message: oops forgot to commit these (part of Leviathan's updates) --- 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://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e jlzapata
Enlightenment CVS committal
Author : jlzapata
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c e_icon_canvas.c e_icon_canvas.h
Log Message:
efm work, dnd working, save/load working
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -3 -r1.123 -r1.124
--- e_fileman_smart.c 7 Feb 2006 14:30:21 - 1.123
+++ e_fileman_smart.c 8 Feb 2006 23:06:12 - 1.124
@@ -25,7 +25,7 @@
* - is the offset code working properly? i have a feeling we're displayin
* more icons that the visible space can take and they are being hidden.
*
- * - allow for icon movement inside the canvas
+ * + allow for icon movement inside the canvas
*
* - double check dir monitoring. note: when we are in a dir that is constantly
* changing, we cant keep calling redraw_new as it will kill us.
@@ -1419,6 +1419,14 @@
if (!(dir2 = opendir(dir))) return;
+ /* save the old meta */
+ if(sd-meta)
+ {
+ _e_fm_dir_meta_save(sd);
+ _e_fm_dir_meta_free(sd-meta);
+ sd-meta = NULL;
+ }
+
type = E_FM_FILE_TYPE_NORMAL;
list = NULL;
while((dp = readdir(dir2)))
@@ -1445,16 +1453,12 @@
if (sd-dir) free (sd-dir);
sd-dir = strdup(dir);
- if(sd-meta)
- {
- _e_fm_dir_meta_free(sd-meta);
- sd-meta = NULL;
- }
-
+
_e_fm_dir_meta_load(sd);
if(sd-meta)
{
+ /* FIXME whats the purpose of this */
Evas_List *l;
for(l = sd-meta-files; l; l = l-next)
@@ -1501,6 +1505,7 @@
icon-sd = sd;
e_fm_icon_file_set(icon-icon_obj, icon-file);
sd-files = evas_list_prepend(sd-files, icon);
+
e_icon_canvas_pack(sd-layout, icon-icon_obj, e_fm_icon_create,
e_fm_icon_destroy, icon);
evas_object_event_callback_add(icon-icon_obj,
EVAS_CALLBACK_MOUSE_DOWN, _e_fm_icon_mouse_down_cb, icon);
evas_object_event_callback_add(icon-icon_obj,
EVAS_CALLBACK_MOUSE_UP, _e_fm_icon_mouse_up_cb, icon);
@@ -1528,6 +1533,7 @@
e_icon_canvas_freeze(sd-layout);
+ /* add two files per each timer call */
while (i 2)
{
char *f;
@@ -1604,8 +1610,6 @@
if(!sd-files_raw) {
sd-timer = NULL;
- if(sd-meta)
- _e_fm_dir_meta_save(sd);
return 0;
}
@@ -2439,11 +2443,11 @@
ecore_evas_geometry_get(sd-win-ecore_evas, cx, cy, NULL,
NULL);
evas_object_geometry_get(icon-icon_obj, x, y, w, h);
- sd-drag.dx = cx;
- sd-drag.dy = cy;
+ sd-drag.dx = cx + 5;
+ sd-drag.dy = cy + 5;
if(!sd-drag.ecore_evas)
- sd-drag.ecore_evas = ecore_evas_software_x11_new(NULL, 0,
cx + x, cx + y, w, h);
+ sd-drag.ecore_evas = ecore_evas_software_x11_new(NULL, 0,
cx + x, cy + y, w, h);
sd-drag.evas = ecore_evas_get(sd-drag.ecore_evas);
sd-drag.win =
ecore_evas_software_x11_window_get(sd-drag.ecore_evas);
@@ -3210,6 +3214,7 @@
ev = event;
sd = data;
+
if (ev-win != sd-win-evas_win) return 1;
return 1;
@@ -3267,11 +3272,39 @@
{
Ecore_X_Event_Xdnd_Drop *ev;
E_Fm_Smart_Data *sd;
+ int ax, ay, x, y;
ev = event;
sd = data;
+
if (ev-win != sd-win-evas_win) return 1;
+ ecore_evas_geometry_get(sd-win-ecore_evas, ax, ay, NULL, NULL);
+
+ x = ev-position.x - ax - 5; /* 5 because we already shift 5 pixels
creating the window */
+ y = ev-position.y - ay - 5;
+ e_icon_canvas_child_move(sd-drag.icon_obj-icon_obj,x,y);
+
+
+ /* update the metadata for the new coords */
+ if(sd-meta)
+ {
+ Evas_List *l;
+ for(l = sd-meta-files; l; l = l-next)
+ {
+E_Fm_Icon_Metadata *m;
+
+m = l-data;
+if(!strcmp(m-name, sd-drag.icon_obj-file-name))
+ {
+ m-x = x;
+ m-y = y;
+ break;
+ }
+ }
+ }
+
+
ecore_x_selection_xdnd_request(sd-win-evas_win, text/uri-list);
return 1;
@@ -3414,11 +3447,6 @@
char buf[PATH_MAX];
char *hash;
- /***
-* DISABLE FOR NOW
-***/
- return 0;
-
if (!sd-dir) return 0;
hash = _e_fm_dir_meta_dir_id(sd-dir);
@@ -3436,6 +3464,7 @@
E_Fm_Icon_Metadata *im;
im = l-data;
+printf(Loading meta: %d %d for file %s\n, im-x, im-y,
im-name);
m-files_hash = evas_hash_add(m-files_hash, im-name, im);
}
}
@@ -3507,7 +3536,7 @@
E_Fm_Icon_Metadata *m;
m = l-data;
-//printf(Saving meta: %d %d\n, m-x, m-y);
+printf(Saving meta:
E CVS: apps/e jlzapata
Enlightenment CVS committal
Author : jlzapata
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_icon_canvas.c
Log Message:
at_location enabled again
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_icon_canvas.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_icon_canvas.c 8 Feb 2006 23:06:12 - 1.11
+++ e_icon_canvas.c 8 Feb 2006 23:12:09 - 1.12
@@ -190,7 +190,6 @@
EAPI void
e_icon_canvas_pack_at_location(Evas_Object *obj, Evas_Object *child,
Evas_Object *(*create)(void *data), void (*destroy)(Evas_Object *obj, void
*data), void *data, Evas_Coord x, Evas_Coord y)
{
-#if 0
E_Smart_Data *sd;
E_Icon_Canvas_Item *li;
@@ -212,10 +211,6 @@
sd-vh = li-y + li-h;
_e_icon_canvas_pack(sd, li);
-#endif
-
- e_icon_canvas_pack(obj, child, create, destroy, data);
-
}
EAPI void
---
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://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/e17genmenu/src/bin
Modified Files:
dumb_list.c dumb_list.h main.c xmlame.c xmlame.h
Log Message:
David 'onefang' Seikel is proud to present -
The World's Lamest XML Parser!
Enjoy.
===
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/dumb_list.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- dumb_list.c 8 Feb 2006 04:35:56 - 1.2
+++ dumb_list.c 8 Feb 2006 23:13:29 - 1.3
@@ -148,14 +148,12 @@
{
int i;
- E_FREE(list-elements);
-
for (i = 0; i list-size; i++)
{
int j;
for (j = 0; j level; j++)
- printf( );
+ printf(.);
switch (list-elements[i].type)
{
case DUMB_LIST_ELEMENT_TYPE_STRING :
@@ -166,6 +164,7 @@
case DUMB_LIST_ELEMENT_TYPE_LIST :
{
+printf(LIST ELEMENT TYPE\n);
dumb_list_dump((Dumb_List *) list-elements[i].element,
level + 1);
}
break;
@@ -184,7 +183,6 @@
{
int i;
-
for (i = list-size - 1; i = 0; i--)
{
if (list-elements[i].type == DUMB_LIST_ELEMENT_TYPE_LIST)
===
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/dumb_list.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- dumb_list.h 8 Feb 2006 04:35:56 - 1.2
+++ dumb_list.h 8 Feb 2006 23:13:30 - 1.3
@@ -41,6 +41,7 @@
Dumb_List *dumb_list_new(char *buffer);
Dumb_List *dumb_list_add(Dumb_List *list, char *element);
Dumb_List *dumb_list_extend(Dumb_List *list, char *element);
+ Dumb_List *dumb_list_add_child(Dumb_List *list, Dumb_List *element);
int dumb_list_exist(Dumb_List *list, char *element);
void dumb_list_dump(Dumb_List *list, int level);
void dumb_list_del(Dumb_List *list);
===
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/main.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- main.c 8 Feb 2006 04:35:56 - 1.14
+++ main.c 8 Feb 2006 23:13:30 - 1.15
@@ -53,15 +53,16 @@
char *directory = Applications.directory;
char *desktop = xterm.desktop;
char *icon = tux.png;
-Dumb_List *menus = NULL;
+Dumb_List *menu_xml = NULL;
printf(Path to %s is %s\n, menu, path);
- menus = xmlame_new(NULL);
-if (menus)
+ menu_xml = xmlame_get(path);;
+if (menu_xml)
{
- xmlame_fill(path);
- dumb_list_dump(menus, 0);
+ dumb_list_dump(menu_xml, 0);
printf(\n\n);
+ /* convert the xml into a menu */
+ /* create the .eap and order files from the menu */
}
free(path);
===
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/xmlame.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- xmlame.c8 Feb 2006 04:35:56 - 1.2
+++ xmlame.c8 Feb 2006 23:13:30 - 1.3
@@ -1,3 +1,13 @@
+#include fcntl.h
+#include ctype.h
+#include stdlib.h
+#include string.h
+#include sys/types.h
+#include sys/stat.h
+#include unistd.h
+
+#include Ecore_File.h
+
#include xmlame.h
/** xmlame.c Extensively Mocked Language Approximately Mangled for
Enlightenment.
@@ -13,8 +23,13 @@
* and there is no XML parser in it's current dependencies. The fdo XML menu
files
* look to be simple enough to parse that this sort of fake, brain dead, XML
parser
* may get away with it. Much testing on lots of systems is highly
recommended.
+ *
+ * The final '' of a tag is replaced with a '\0', but it's existance can be
implied.
*/
+static char *_xmlame_parse(Dumb_List *list, char *buffer);
+
+
Dumb_List *
xmlame_new(char *buffer)
{
@@ -24,7 +39,93 @@
return list;
}
-void
-xmlame_fill(char *file)
+Dumb_List *
+xmlame_get(char *file)
{
+ int size;
+ char *buffer;
+ Dumb_List *list = NULL;
+
+ size = ecore_file_size(file);
+ buffer = (char *) malloc(size + 1);
+ if (buffer)
+ {
+ int fd;
+
+ buffer[0] = '\0';
+fd = open(file, O_RDONLY);
+if (fd != -1)
+ {
+ if (read(fd, buffer, size) == size)
+buffer[size] = '\0';
+ }
+ list = xmlame_new(buffer);
+if (list)
+ _xmlame_parse(list, buffer);
+ }
+ return list;
+}
+
+static char *
+_xmlame_parse(Dumb_List *list, char *buffer)
+{
+ do
+ {
+
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_container.c ewl_container.h
Log Message:
- add calls to the container to get children and indexes taking internal
widgets into account
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_container.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ewl_container.c 8 Feb 2006 05:02:25 - 1.32
+++ ewl_container.c 8 Feb 2006 23:30:00 - 1.33
@@ -428,13 +428,9 @@
DRETURN_INT(count, DLEVEL_STABLE);
}
-/**
- * @param parent: The container to get the child from
- * @param index: The child index to return
- * @return Returns the widget at the given index, or NULL if not found
- */
-Ewl_Widget *
-ewl_container_child_get(Ewl_Container *parent, int index)
+static Ewl_Widget *
+ewl_container_child_helper_get(Ewl_Container *parent, int index,
+ unsigned int skip)
{
Ewl_Container *container = NULL;
Ewl_Widget *child;
@@ -450,7 +446,7 @@
ecore_list_goto_first(container-children);
while ((child = ecore_list_next(container-children))) {
- if (ewl_widget_internal_is(child)) continue;
+ if (skip ewl_widget_internal_is(child)) continue;
if (count == index) break;
count ++;
}
@@ -459,12 +455,47 @@
}
/**
- * @param parent: The container to search
- * @param w: The child to search for
- * @return Returns the index of the child in the parent
+ * @param parent: The container to get the child from
+ * @param index: The child index to return
+ * @return Returns the widget at the given index, or NULL if not found
*/
-unsigned int
-ewl_container_child_index_get(Ewl_Container *parent, Ewl_Widget *w)
+Ewl_Widget *
+ewl_container_child_get(Ewl_Container *parent, int index)
+{
+ Ewl_Widget *w;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR_RET(parent, parent, NULL);
+ DCHECK_TYPE_RET(parent, parent, EWL_CONTAINER_TYPE, NULL);
+
+ w = ewl_container_child_helper_get(parent, index, TRUE);
+
+ DRETURN_PTR(w, DLEVEL_STABLE);
+}
+
+/**
+ * @param parent: The container to get the child from
+ * @param index: The child index to return
+ * @return Returns the widget at the given index including internal widgets,
+ * or NULL if not found
+ */
+Ewl_Widget *
+ewl_container_child_internal_get(Ewl_Container *parent, int index)
+{
+ Ewl_Widget *w;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR_RET(parent, parent, NULL);
+ DCHECK_TYPE_RET(parent, parent, EWL_CONTAINER_TYPE, NULL);
+
+ w = ewl_container_child_helper_get(parent, index, FALSE);
+
+ DRETURN_PTR(w, DLEVEL_STABLE);
+}
+
+static unsigned int
+ewl_container_child_index_helper_get(Ewl_Container *parent, Ewl_Widget *w,
+ unsigned int skip)
{
unsigned int idx = 0;
Ewl_Container *container;
@@ -481,7 +512,7 @@
ecore_list_goto_first(container-children);
while ((child = ecore_list_next(container-children))) {
- if (ewl_widget_internal_is(child)) continue;
+ if (skip ewl_widget_internal_is(child)) continue;
if (child == w) break;
idx ++;
}
@@ -490,6 +521,49 @@
}
/**
+ * @param parent: The container to search
+ * @param w: The child to search for
+ * @return Returns the index of the child in the parent
+ */
+unsigned int
+ewl_container_child_index_get(Ewl_Container *parent, Ewl_Widget *w)
+{
+ unsigned int idx = 0;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR_RET(parent, parent, idx);
+ DCHECK_PARAM_PTR_RET(w, w, idx);
+ DCHECK_TYPE_RET(parent, parent, EWL_CONTAINER_TYPE, idx);
+ DCHECK_TYPE_RET(w, w, EWL_WIDGET_TYPE, idx);
+
+ idx = ewl_container_child_index_helper_get(parent, w, TRUE);
+
+ DRETURN_INT(idx, DLEVEL_STABLE);
+}
+
+/**
+ * @param parent: The container to search
+ * @param w: The child to search for
+ * @return Returns the index of the child in the parent including internal
+ * widgets
+ */
+unsigned int
+ewl_container_child_index_internal_get(Ewl_Container *parent, Ewl_Widget *w)
+{
+ unsigned int idx = 0;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR_RET(parent, parent, idx);
+ DCHECK_PARAM_PTR_RET(w, w, idx);
+ DCHECK_TYPE_RET(parent, parent, EWL_CONTAINER_TYPE, idx);
+ DCHECK_TYPE_RET(w, w, EWL_WIDGET_TYPE, idx);
+
+ idx = ewl_container_child_index_helper_get(parent, w, FALSE);
+
+ DRETURN_INT(idx, DLEVEL_STABLE);
+}
+
+/**
* @param w: the child widget that has had it's preferred size changed
* @param size: the amount of
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_main.c etk_widget.c etk_widget.h
Log Message:
- per widget drag_motion events
- per widget drag_leave events
- make dnd widget search faster
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_main.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_main.c 8 Feb 2006 12:49:38 - 1.11
+++ etk_main.c 9 Feb 2006 01:52:19 - 1.12
@@ -33,13 +33,15 @@
static int _etk_xdnd_drop_handler(void *data, int type, void *event);
static int _etk_xdnd_leave_handler(void *data, int type, void *event);
static int _etk_xdnd_selection_handler(void *data, int type, void *event);
+
+static Etk_Widget *_etk_dnd_widget = NULL;
+Evas_List *_etk_dnd_widgets = NULL;
#endif
static Evas_List *_etk_main_toplevel_widgets = NULL;
static Etk_Bool _etk_main_running = ETK_FALSE;
static Etk_Bool _etk_main_initialized = ETK_FALSE;
static Ecore_Job *_etk_main_iterate_job = NULL;
-static Etk_Widget *_etk_dnd_widget = NULL;
/**
*
@@ -247,49 +249,42 @@
#if HAVE_ECORE_X
#define E_INSIDE(x, y, xx, yy, ww, hh) (((x) ((xx) + (ww))) ((y) ((yy)
+ (hh))) ((x) = (xx)) ((y) = (yy)))
-static int _etk_xdnd_enter_handler(void *data, int type, void *event)
-{
- Ecore_X_Event_Xdnd_Enter *ev;
- int i;
-
- /* printf(enter\n); */
- ev = event;
- /*
-for (i = 0; i ev-num_types; i++)
- printf(type: %s\n, ev-types[i]);
-*/
- return 1;
-}
/* Search the container recursively for the widget that accepts xdnd */
-static void _etk_xdnd_container_get_widgets_at(Etk_Container *cont, int x, int
y, int offx, int offy, Evas_List **list)
+static void _etk_xdnd_container_get_widgets_at(Etk_Toplevel_Widget *top, int
x, int y, int offx, int offy, Evas_List **list)
{
- Evas_List *child;
+ Evas_List *l;
- for(child = etk_container_children_get(cont); child; child = child-next)
+ for(l = _etk_dnd_widgets; l; l = l-next)
{
Etk_Widget *widget;
- if(!(widget = ETK_WIDGET(child-data)))
+ if(!(widget = ETK_WIDGET(l-data)))
continue;
if(E_INSIDE(x, y,
widget-inner_geometry.x + offx,
widget-inner_geometry.y + offy,
widget-inner_geometry.w,
- widget-inner_geometry.h))
- {
-if(widget-accepts_xdnd)
- {
- *list = evas_list_append(*list, widget);
- }
-
-if(ETK_IS_CONTAINER(widget))
- _etk_xdnd_container_get_widgets_at(ETK_CONTAINER(widget), x, y,
offx, offy, list);
- }
+ widget-inner_geometry.h))
+ *list = evas_list_append(*list, widget);
}
}
+static int _etk_xdnd_enter_handler(void *data, int type, void *event)
+{
+ Ecore_X_Event_Xdnd_Enter *ev;
+ int i;
+
+ ev = event;
+
+// printf(enter window!\n);
+// for (i = 0; i ev-num_types; i++)
+// printf(type: %s\n, ev-types[i]);
+
+ return 1;
+}
+
static int _etk_xdnd_position_handler(void *data, int type, void *event)
{
Ecore_X_Event_Xdnd_Position *ev;
@@ -297,13 +292,13 @@
Evas_List *l;
Evas_List *children = NULL;
Etk_Widget *widget;
+ int x = 0, y = 0;
+
ev = event;
/* loop top level widgets (windows) */
for(l = _etk_main_toplevel_widgets; l; l = l-next)
- {
- int x, y;
-
+ {
if (!(window = ETK_WINDOW(l-data)))
continue;
@@ -312,15 +307,30 @@
continue;
ecore_evas_geometry_get(window-ecore_evas, x, y, NULL, NULL);
-
+
/* find the widget we want to drop on */
- _etk_xdnd_container_get_widgets_at(ETK_CONTAINER(window),
ev-position.x, ev-position.y, x, y, children);
- }
+ _etk_xdnd_container_get_widgets_at(ETK_TOPLEVEL_WIDGET(window),
ev-position.x, ev-position.y, x, y, children);
+
+ /* check if we're leaving a widget */
+ if(_etk_dnd_widget)
+ {
+if(!E_INSIDE(ev-position.x, ev-position.y,
+ _etk_dnd_widget-geometry.x + x,
_etk_dnd_widget-geometry.y + y,
+ _etk_dnd_widget-geometry.w,
_etk_dnd_widget-geometry.h))
+ {
+ etk_widget_drag_leave(_etk_dnd_widget);
+ _etk_dnd_widget = NULL;
+ }
+ }
+
+ break;
+ }
/* if we found a widget, emit signals */
if(children != NULL)
- {
+ {
Ecore_X_Rectangle rect;
+
widget = (evas_list_last(children))-data;
_etk_dnd_widget = widget;
/* TODO: filter types according to what widget wants */
@@ -329,6 +339,8 @@
E CVS: apps/e jlzapata
Enlightenment CVS committal
Author : jlzapata
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c
Log Message:
efm: correct icon movement
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -3 -r1.124 -r1.125
--- e_fileman_smart.c 8 Feb 2006 23:06:12 - 1.124
+++ e_fileman_smart.c 9 Feb 2006 04:04:53 - 1.125
@@ -128,7 +128,7 @@
static void_e_fm_icon_mouse_out_cb (void *data, Evas *e,
Evas_Object *obj, void *event_info);
static void_e_fm_icon_mouse_move_cb (void *data, Evas *e,
Evas_Object *obj, void *event_info);
static int _e_fm_win_mouse_up_cb(void *data, int type,
void *event);
-static int _e_fm_win_mouse_move_cb(void *data, int type,
void *event);
+static int _e_fm_win_mouse_move_cb (void *data, int type,
void *event);
static void_e_fm_string_replace(const char *src, const char
*key, const char *replacement, char *result, size_t resultsize);
@@ -2430,6 +2430,7 @@
{
Evas_Object *o = NULL;
Evas_Coord x, y, w, h;
+ int rx,ry,rw,rh;
int cx, cy;
char *data;
char **drop_types;
@@ -2443,20 +2444,19 @@
ecore_evas_geometry_get(sd-win-ecore_evas, cx, cy, NULL,
NULL);
evas_object_geometry_get(icon-icon_obj, x, y, w, h);
- sd-drag.dx = cx + 5;
- sd-drag.dy = cy + 5;
-
+
if(!sd-drag.ecore_evas)
sd-drag.ecore_evas = ecore_evas_software_x11_new(NULL, 0,
cx + x, cy + y, w, h);
-
+ sd-drag.dx = ev-cur.canvas.x;
+ sd-drag.dy = ev-cur.canvas.y;
sd-drag.evas = ecore_evas_get(sd-drag.ecore_evas);
sd-drag.win =
ecore_evas_software_x11_window_get(sd-drag.ecore_evas);
- ecore_x_dnd_aware_set(sd-drag.win, 1);
ecore_evas_shaped_set(sd-drag.ecore_evas, 1);
ecore_evas_borderless_set(sd-drag.ecore_evas, 1);
ecore_evas_name_class_set(sd-drag.ecore_evas, E,
_e_drag_window);
ecore_evas_title_set(sd-drag.ecore_evas, E Drag);
+ ecore_evas_ignore_events_set(sd-drag.ecore_evas, 1);
sd-drag.image_object = e_fm_icon_add(sd-drag.evas);
e_fm_icon_file_set(sd-drag.image_object, icon-file);
@@ -2470,16 +2470,20 @@
evas_object_move(sd-drag.image_object, 0, 0);
evas_object_show(sd-drag.image_object);
- ecore_x_dnd_types_set(sd-drag.win, drop_types, 1);
- ecore_x_dnd_begin(sd-drag.win, data, PATH_MAX *
sizeof(char));
+
evas_event_feed_mouse_up(sd-evas, 1, EVAS_BUTTON_NONE,
ev-timestamp, NULL);
e_fm_mouse_move_handler =
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE,
_e_fm_win_mouse_move_cb, sd);
-
+
e_fm_mouse_up_handler =
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP,
_e_fm_win_mouse_up_cb, sd);
+
+ ecore_x_dnd_aware_set(sd-drag.win, 1);
+ ecore_x_dnd_types_set(sd-drag.win, drop_types, 1);
+ ecore_x_dnd_begin(sd-drag.win, data, PATH_MAX *
sizeof(char));
+
sd-drag.start = 0;
}
}
@@ -2491,11 +2495,16 @@
{
Ecore_X_Event_Mouse_Move *ev;
E_Fm_Smart_Data *sd;
+ int cx,cy,x,y;
sd = data;
ev = event;
- ecore_evas_move(sd-drag.ecore_evas, ev-x + sd-drag.dx, ev-y +
sd-drag.dy);
+
+ ecore_evas_geometry_get(sd-win-ecore_evas, cx, cy, NULL, NULL);
+ evas_object_geometry_get(sd-drag.icon_obj-icon_obj, x, y, NULL, NULL);
+
+ ecore_evas_move(sd-drag.ecore_evas, cx + x + ev-x - sd-drag.dx, cy + y +
ev-y - sd-drag.dy);
if(!ecore_evas_visibility_get(sd-drag.ecore_evas))
ecore_evas_show(sd-drag.ecore_evas);
@@ -2509,18 +2518,20 @@
E_Fm_Smart_Data *sd;
sd = data;
-
+
ecore_x_dnd_drop();
-
+
ecore_event_handler_del(e_fm_mouse_up_handler);
e_fm_mouse_up_handler = NULL;
ecore_event_handler_del(e_fm_mouse_move_handler);
e_fm_mouse_move_handler = NULL;
+ ecore_evas_free(sd-drag.ecore_evas);
+ sd-drag.ecore_evas = NULL;
+
sd-drag.start = 0;
-
E CVS: screenshot devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : screenshot
Dir : e_modules/screenshot
Modified Files:
e_mod_main.c
Log Message:
Fix bug in screenshot where if filename was empty, the shots ended up being
saved as .png
===
RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_main.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_mod_main.c1 Feb 2006 13:32:28 - 1.23
+++ e_mod_main.c9 Feb 2006 05:42:53 - 1.24
@@ -475,9 +475,12 @@
}
opt = get_options(opts);
f = get_filename(ef-screen-conf);
-
- snprintf(buff, sizeof(buff), import %s %s, opt, f);
- if (ef-screen-conf-delay_time 0)
+if (!f)
+ snprintf(buff, sizeof(buff), import %s, opt);
+else
+ snprintf(buff, sizeof(buff), import %s %s, opt, f);
+
+if (ef-screen-conf-delay_time 0)
{
msg = malloc(sizeof(Edje_Message_Int_Set) + 1 * sizeof(int));
msg-count = 1;
@@ -506,7 +509,11 @@
}
opt = get_options(opts);
f = get_filename(ef-screen-conf);
- snprintf(buff, sizeof(buff), scrot %s %s, opt, f);
+if (!f)
+ snprintf(buff, sizeof(buff), scrot %s, opt);
+else
+ snprintf(buff, sizeof(buff), scrot %s %s, opt, f);
+
if (ef-screen-conf-delay_time 0)
{
msg = malloc(sizeof(Edje_Message_Int_Set) + 1 * sizeof(int));
---
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://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion Modified Files: configure.in Log Message: its not an error until BOTH gstreamer and xine are not found. === RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- configure.in4 Feb 2006 13:43:13 - 1.30 +++ configure.in9 Feb 2006 06:12:39 - 1.31 @@ -146,7 +146,7 @@ fi fi if test $enable_xine$HAVE_XINE = yesno ; then - AC_MSG_ERROR(xine not found) + AC_MSG_RESULT(xine not found) fi AC_ARG_ENABLE(gstreamer, @@ -177,9 +177,9 @@ [HAVE_GSTFFMPEG=no]) fi if test $enable_gstreamer$HAVE_GSTREAMER = yesno ; then - AC_MSG_ERROR(gstreamer not found) + AC_MSG_RESULT(gstreamer not found) fi -if test $HAVE_GSTPLUG = no -o test $HAVE_GSTFFMPEG = no; then +if test $HAVE_GSTPLUG = no; then if test $HAVE_GSTREAMER = no ; then GSTPLUG_MSG=no else @@ -187,10 +187,17 @@ GSTPLUG_MSG=no (you should install gst-plugins and gst-ffmpeg) fi else - requirements=$requirements gstreamer - GSTPLUG_MSG=yes + if test $HAVE_GSTFFMPEG = no; then + if test $HAVE_GSTREAMER = no ; then + GSTPLUG_MSG=no + else + AC_MSG_WARN([You should install gstreamer plugins and gst-ffmpeg to properly decode your video and audio files]) + GSTPLUG_MSG=no (you should install gst-plugins and gst-ffmpeg) + fi + requirements=$requirements gstreamer + GSTPLUG_MSG=yes + fi fi - if test $HAVE_XINE$HAVE_GSTREAMER = nono ; then AC_MSG_ERROR([Xine or Gstreamer must be installed to build emotion]) fi --- 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://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
