Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_dnd.c ewl_dnd.h ewl_widget.c ewl_widget.h
Log Message:
* Naming changes
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_dnd.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_dnd.c 22 Dec 2005 04:29:44 -0000 1.4
+++ ewl_dnd.c 22 Dec 2005 20:18:47 -0000 1.5
@@ -5,7 +5,7 @@
#include <Ecore_Evas.h>
#include <Ecore_X.h>
-#define WINDOW_ROOT 0
+#define EWL_DND_WINDOW_ROOT 0
static int ewl_dragging_current = 0;
static int ewl_dnd_move_count = 0;
static Ecore_Evas* _ewl_dnd_drag_canvas;
@@ -28,7 +28,7 @@
char *data[] = { "file:///home/chaos/wlan-key2" };
-void ewl_dnd_init() {
+void ewl_dnd_init(void) {
ewl_dnd_position_hash = ecore_hash_new(ecore_direct_hash,
ecore_direct_compare);
ewl_dragging_current = 0;
_ewl_dnd_status = 1;
@@ -92,8 +92,6 @@
static int
_ewl_dnd_event_mouse_up(void *data, int type, void *event)
{
- printf("mouse up..\n");
-
if (_ewl_dnd_drag_canvas && ewl_dragging_current) {
Ecore_List* pos;
void* val;
@@ -141,7 +139,6 @@
if (!_ewl_dnd_status) return;
if (ewl_dragging_current) {
- printf("ERR: ewl already dragging\n");
return;
}
@@ -153,7 +150,7 @@
_ewl_dnd_mouse_up_handler =
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP,_ewl_dnd_event_mouse_up,
NULL);
_ewl_dnd_mouse_move_handler =
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE, _ewl_dnd_event_dnd_move,
NULL);
- _ewl_dnd_drag_canvas = ecore_evas_software_x11_new(NULL, WINDOW_ROOT,
64,64,64,64);
+ _ewl_dnd_drag_canvas = ecore_evas_software_x11_new(NULL,
EWL_DND_WINDOW_ROOT, 64,64,64,64);
_ewl_dnd_drag_evas = ecore_evas_get(_ewl_dnd_drag_canvas);
ecore_evas_shaped_set(_ewl_dnd_drag_canvas, 1);
@@ -180,8 +177,8 @@
/*Setup the dnd event capture window*/
- ecore_x_window_geometry_get(WINDOW_ROOT, NULL, NULL, &width, &height);
- _ewl_dnd_drag_win = ecore_x_window_input_new(WINDOW_ROOT,
+ ecore_x_window_geometry_get(EWL_DND_WINDOW_ROOT, NULL, NULL, &width,
&height);
+ _ewl_dnd_drag_win = ecore_x_window_input_new(EWL_DND_WINDOW_ROOT,
0, 0,
width,height);
@@ -205,22 +202,22 @@
}
-void ewl_dnd_disable() {
+void ewl_dnd_disable(void) {
_ewl_dnd_status=0;
}
-void ewl_dnd_enable() {
+void ewl_dnd_enable(void) {
_ewl_dnd_status=1;
}
-int ewl_dnd_status_get() {
+int ewl_dnd_status_get(void) {
return _ewl_dnd_status;
}
-Ewl_Widget* ewl_dnd_drag_widget_get() {
+Ewl_Widget* ewl_dnd_drag_widget_get(void) {
return _ewl_dnd_widget;
}
-void ewl_dnd_drag_widget_clear() {
+void ewl_dnd_drag_widget_clear(void) {
_ewl_dnd_widget = NULL;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_dnd.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_dnd.h 22 Dec 2005 12:17:44 -0000 1.7
+++ ewl_dnd.h 22 Dec 2005 20:18:47 -0000 1.8
@@ -4,11 +4,11 @@
Ewl_Dnd_Types *ewl_dnd_types_for_widget_get(Ewl_Widget *widget);
void ewl_drag_start(Ewl_Widget* w);
void ewl_dnd_position_windows_set(Ewl_Widget* w);
-void ewl_dnd_init();
-Ewl_Widget* ewl_dnd_drag_widget_get();
-int ewl_dnd_status_get();
-void ewl_dnd_drag_widget_clear();
-void ewl_dnd_disable();
-void ewl_dnd_enable();
+void ewl_dnd_init(void);
+Ewl_Widget* ewl_dnd_drag_widget_get(void);
+int ewl_dnd_status_get(void);
+void ewl_dnd_drag_widget_clear(void);
+void ewl_dnd_disable(void);
+void ewl_dnd_enable(void);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- ewl_widget.c 22 Dec 2005 11:54:03 -0000 1.53
+++ ewl_widget.c 22 Dec 2005 20:18:47 -0000 1.54
@@ -2544,7 +2544,7 @@
* @brief Accessor function for the current drag candidate widget
*
*/
-Ewl_Widget* ewl_widget_drag_candidate_get() {
+Ewl_Widget* ewl_widget_drag_candidate_get(void) {
return _ewl_drag_widget;
}
@@ -2553,7 +2553,7 @@
* @brief Cancel any active dnd_wait state widgets
*
*/
-void ewl_widget_dnd_reset() {
+void ewl_widget_dnd_reset(void) {
_ewl_dnd_drag_move_count=0;
_ewl_drag_widget = NULL;
printf("Drag reset..\n");
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_widget.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- ewl_widget.h 22 Dec 2005 11:54:03 -0000 1.29
+++ ewl_widget.h 22 Dec 2005 20:18:47 -0000 1.30
@@ -173,8 +173,8 @@
void ewl_widget_draggable_set(Ewl_Widget* w, unsigned int val, void*
(*cb) );
-Ewl_Widget* ewl_widget_drag_candidate_get();
-void ewl_widget_dnd_reset();
+Ewl_Widget* ewl_widget_drag_candidate_get(void);
+void ewl_widget_dnd_reset(void);
/**
* @def LAYER(w)
-------------------------------------------------------
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
