Enlightenment CVS committal
Author : kwo
Project : misc
Module : engage
Dir : misc/engage/src
Modified Files:
e_intl.c e_intl.h e_utils.c window.c wm.c
Log Message:
Unbreak things here and there.
Fix some warnings by deactivating unused stuff.
This place could *really* use a major cleanup.
===================================================================
RCS file: /cvs/e/misc/engage/src/e_intl.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_intl.c 25 Jul 2007 17:05:16 -0000 1.4
+++ e_intl.c 24 Aug 2007 19:48:47 -0000 1.5
@@ -21,9 +21,13 @@
static char *_e_intl_orig_xmodifiers = NULL;
static char *_e_intl_orig_qt_im_module = NULL;
static char *_e_intl_orig_gtk_im_module = NULL;
+#if 0
static char *_e_intl_input_method = NULL;
+#endif
+#if 0
static Eet_Data_Descriptor *_e_intl_input_method_config_edd = NULL;
+#endif
static int loc_mask;
#define E_EXE_STOP(EXE) if (EXE != NULL) { ecore_exe_terminate(EXE);
ecore_exe_free(EXE); EXE = NULL; }
@@ -53,9 +57,11 @@
/* Input Method Configuration and Management */
static int _e_intl_cb_exit(void *data, int type, void *event);
-/*static Evas_List *_e_intl_imc_path_scan(E_Path *path);
-static Evas_List *_e_intl_imc_dir_scan(const char *dir);*/
+#if 0
+static Evas_List *_e_intl_imc_path_scan(E_Path *path);
+static Evas_List *_e_intl_imc_dir_scan(const char *dir);
static E_Input_Method_Config *_e_intl_imc_find(Evas_List *imc_list, char
*name);
+#endif
EAPI int
@@ -947,7 +953,8 @@
}
return search_list;
}
-/*
+
+#if 0
static Evas_List *
_e_intl_imc_path_scan(E_Path *path)
{
@@ -1030,7 +1037,7 @@
}
return imcs;
}
-*/
+
static E_Input_Method_Config *
_e_intl_imc_find(Evas_List *imc_list, char *name)
{
@@ -1049,3 +1056,4 @@
return NULL;
}
+#endif
===================================================================
RCS file: /cvs/e/misc/engage/src/e_intl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_intl.h 1 Sep 2006 16:03:58 -0000 1.1
+++ e_intl.h 24 Aug 2007 19:48:47 -0000 1.2
@@ -3,6 +3,8 @@
*/
#ifdef E_TYPEDEFS
+#if 0 /* This is wrong. etk_utils.h should not define _ */
+
#define _(str) gettext(str)
#define d_(str, dom) dgettext(PACKAGE dom, str)
@@ -10,9 +12,12 @@
* for string lists which are not dynamically allocated
*/
#define N_(str) (str)
+#endif
+#if 0 /* Not used */
typedef struct _E_Input_Method_Config E_Input_Method_Config;
typedef struct _E_Language_Pack E_Language_Pack;
+#endif
#else
#ifndef E_INTL_H
===================================================================
RCS file: /cvs/e/misc/engage/src/e_utils.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_utils.c 3 Sep 2006 15:14:51 -0000 1.2
+++ e_utils.c 24 Aug 2007 19:48:47 -0000 1.3
@@ -27,7 +27,9 @@
};
*/
/* local subsystem functions */
+#if 0
static void _e_util_container_fake_mouse_up_cb(void *data);
+#endif
static int _e_util_wakeup_cb(void *data);
/* local subsystem globals */
===================================================================
RCS file: /cvs/e/misc/engage/src/window.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- window.c 12 Sep 2006 08:01:45 -0000 1.36
+++ window.c 24 Aug 2007 19:48:47 -0000 1.37
@@ -28,8 +28,10 @@
static void handle_mouse_in(Ecore_Evas * _ee);
static void handle_mouse_out(Ecore_Evas * _ee);
static void handle_focus_out(Ecore_Evas * _ee);
+#if 0
static void handle_mouse_down(void *data, Evas * e, Evas_Object * obj,
void *event);
+#endif
static void handle_mouse_move(void *data, Evas * e, Evas_Object * obj,
void *event);
static void handle_menu_draw(void *data, Evas * e, Evas_Object * obj,
@@ -154,10 +156,8 @@
ecore_evas_geometry_get(ee, &x, &y, &w, &h);
-#ifdef HAVE_TRANS_BG
if ((o = evas_object_name_find(ecore_evas_get(ee), "trans")))
esmart_trans_x11_freshen(o, x, y, w, h);
-#endif
}
void
@@ -168,12 +168,11 @@
ecore_evas_geometry_get(ee, &x, &y, &w, &h);
-#ifdef HAVE_TRANS_BG
if ((o = evas_object_name_find(ecore_evas_get(ee), "trans"))) {
evas_object_resize(o, w, h);
esmart_trans_x11_freshen(o, x, y, w, h);
}
-#endif
+
options.width = w;
options.height = h;
ecore_config_int_set("engage.options.width", w);
@@ -254,13 +253,9 @@
#ifdef ShapeInput
if(options.use_composite)
- {
- ecore_evas_override_set(ee, 1);
ecore_evas_alpha_set(ee, 1);
- }
- else
#endif
- ecore_evas_borderless_set(ee, 1);
+ ecore_evas_borderless_set(ee, 1);
if(options.use_composite)
{
@@ -363,7 +358,6 @@
ecore_evas_callback_resize_set(ee, od_window_resize);
if (options.mode == OM_BELOW && !options.use_composite) {
-#ifdef HAVE_TRANS_BG
o = esmart_trans_x11_new(evas);
evas_object_layer_set(o, 0);
evas_object_move(o, 0, 0);
@@ -374,15 +368,6 @@
(int) (res_y - options.height),
options.width, options.height);
evas_object_show(o);
-#else
- o = evas_object_rectangle_add(evas);
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_layer_set(o, 0);
- evas_object_move(o, 0, 0);
- evas_object_resize(o, options.width, options.height);
- evas_object_name_set(o, "trans");
- evas_object_show(o);
-#endif
}
od_dock_redraw(ee);
@@ -392,6 +377,7 @@
od_window_hide();
}
+#if 0
static void
handle_mouse_down(void *data, Evas * e, Evas_Object * obj, void *event)
{
@@ -445,6 +431,7 @@
}
}
}
+#endif
static void
handle_mouse_move(void *data, Evas * e, Evas_Object * obj, void *event)
===================================================================
RCS file: /cvs/e/misc/engage/src/wm.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- wm.c 2 Sep 2006 17:40:52 -0000 1.28
+++ wm.c 24 Aug 2007 19:48:47 -0000 1.29
@@ -445,7 +445,7 @@
ecore_x_netwm_window_state_get(win, &state, &num);
counter = 0;
- for (tmp = state; counter < num; tmp++ && counter++)
+ for (tmp = state; counter < num; tmp++, counter++)
if (*tmp == ECORE_X_WINDOW_STATE_SKIP_TASKBAR)
result = true;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
