Fix comments.
SVN revision: 29159
#include "config.h"
#define USE_IPC
-//#define OBJECT_PARANOIA_CHECK
-//#define OBJECT_CHECK
+#if 0
+#define OBJECT_PARANOIA_CHECK
+#define OBJECT_CHECK
+#endif
#include <stdio.h>
#include <stdlib.h>
#else
# ifdef __GNUC__
# if __GNUC__ >= 4
-// BROKEN in gcc 4 on amd64
-//# pragma GCC visibility push(hidden)
+/* BROKEN in gcc 4 on amd64 */
+#if 0
+# pragma GCC visibility push(hidden)
+#endif
# define EAPI __attribute__ ((visibility("default")))
# else
# define EAPI
if (sscanf(params, "%c%i %c%i", &cx, &x, &cy, &y) == 4)
{
- // Nothing, both x and y is updated.
+ /* Nothing, both x and y is updated. */
}
else if (sscanf(params, "* %c%i", &cy, &y) == 2)
{
- // Updated y, reset x.
+ /* Updated y, reset x. */
x = bd->x;
}
else if (sscanf(params, "%c%i *", &cx, &x) == 2)
{
- // Updated x, reset y.
+ /* Updated x, reset y. */
y = bd->y;
}
x = bd->zone->w - bd->w;
else if (dir == E_DIRECTION_UP)
y = 0;
- else // dir == E_DIRECTION_DOWN
+ else /* dir == E_DIRECTION_DOWN */
y = bd->zone->h - bd->h;
bd_list = e_container_border_list_first(bd->zone->container);
to_y = dy + y;
while ((desk = e_desk_at_xy_get(bd->zone, to_x, to_y )) == NULL)
{
- // here we are out of our desktop range
+ /* here we are out of our desktop range */
while (to_x >= bd->zone->desk_x_count)
{
to_x -= bd->zone->desk_x_count;
if (desk)
{
- // switch desktop. Quite usefull from the interface point of view.
+ /* switch desktop. Quite usefull from the interface point of view. */
e_zone_desk_flip_by(bd->zone, to_x - dx, to_y - dy);
- // send the border to the required desktop.
+ /* send the border to the required desktop. */
e_border_desk_set(bd, desk);
e_border_focus_set(bd, 1, 1);
}
evas_object_move(zone->bg_object, zone->x, zone->y);
evas_object_resize(zone->bg_object, zone->w, zone->h);
evas_object_layer_set(zone->bg_object, -1);
-/// printf("CLIP...\n");
evas_object_clip_set(zone->bg_object, zone->bg_clip_object);
- {
- Evas_Coord x, y, w, h;
-
- evas_object_geometry_get(zone->bg_clip_object, &x, &y, &w, &h);
-/// printf("END: clip %p to %p [%ix%i+%i+%i]\n",
-/// zone->bg_object,
-/// zone->bg_clip_object,
-/// w, h, x, y);
- }
evas_object_show(zone->bg_object);
}
}
else if (e_config->font_hinting == 2)
evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE);
-
-// evas_image_cache_flush(e);
-// evas_image_cache_reload(e);
}
EAPI void
#ifndef E_COLOR_HEADER
#define E_COLOR_HEADER
-// used so that a single color struct can be shared by all elements of the color dialog
+/* used so that a single color struct can be shared by all elements of the color dialog */
struct _E_Color
{
int r, g, b;
CFG_MODULE("temperature", 1);
CFG_MODULE("pager", 1);
}
+#if 0
{
-// E_Font_Fallback* eff;
+ E_Font_Fallback* eff;
#define CFG_FONTFALLBACK(_name) \
eff = E_NEW(E_Font_Fallback, 1); \
eff->name = evas_stringshare_add(_name); \
e_config->font_fallbacks = evas_list_append(e_config->font_fallbacks, eff)
-// CFG_FONTFALLBACK("New-Sung");
-// CFG_FONTFALLBACK("Kochi-Gothic");
-// CFG_FONTFALLBACK("Baekmuk-Dotum");
+ CFG_FONTFALLBACK("New-Sung");
+ CFG_FONTFALLBACK("Kochi-Gothic");
+ CFG_FONTFALLBACK("Baekmuk-Dotum");
}
+#endif
{
E_Font_Default* efd;
eb->params = _params == NULL ? NULL : evas_stringshare_add(_params); \
e_config->mouse_bindings = evas_list_append(e_config->mouse_bindings, eb)
- //FIXME: If new mouse binding are added/changed/modified, then do not
- //forget to reflect those changes in e_int_config_mousebinding.c in
- //_restore_defaults_cb function
+ /*
+ * FIXME:
+ * If new mouse binding are added/changed/modified, then do not
+ * forget to reflect those changes in e_int_config_mousebinding.c in
+ * _restore_defaults_cb function
+ */
CFG_MOUSEBIND(E_BINDING_CONTEXT_BORDER, 1,
E_BINDING_MODIFIER_ALT, 0, "window_move", NULL);
eb->params = _params == NULL ? NULL : evas_stringshare_add(_params); \
e_config->key_bindings = evas_list_append(e_config->key_bindings, eb)
- //FIXME: If new key binding are added/changed/modified, then do not
- //forget to reflect those changes in e_int_config_keybinding.c in
- //_restore_key_binding_defaults_cb function
+ /*
+ * FIXME:
+ * If new key binding are added/changed/modified, then do not
+ * forget to reflect those changes in e_int_config_keybinding.c in
+ * _restore_key_binding_defaults_cb function
+ */
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Left",
E_BINDING_MODIFIER_SHIFT | E_BINDING_MODIFIER_ALT, 0,
eb->params = _params == NULL ? NULL : evas_stringshare_add(_params); \
e_config->wheel_bindings = evas_list_append(e_config->wheel_bindings, eb)
- //FIXME: If new wheel binding are added/changed/modified, then do not
- //forget to reflect those changes in e_int_config_mousebinding.c in
- //_restore_defaults_cb function
+ /*
+ * FIXME:
+ * If new wheel binding are added/changed/modified, then do not
+ * forget to reflect those changes in e_int_config_mousebinding.c in
+ * _restore_defaults_cb function
+ */
CFG_WHEELBIND(E_BINDING_CONTEXT_CONTAINER, 0, -1,
E_BINDING_MODIFIER_ALT, 0,
CFG_MIME_ICON("image/tiff", "THUMB");
CFG_MIME_ICON("application/x-desktop", "DESKTOP");
-
-// CFG_MIME_ICON("image/*", "e/icons/fileman/mime/image");
}
IFCFGEND;
{
Evas_List *l = NULL;
l = evas_list_append(l, strdup("SOFTWARE"));
-// DISABLE GL as an accessible engine - it does have problems, ESPECIALLY with
-// shaped windows (it can't do them), and multiple gl windows and shared
-// contexts, so for now just disable it. xrender is much more complete in
-// this regard.
-// l = evas_list_append(l, strdup("GL"));
+ /*
+ * DISABLE GL as an accessible engine - it does have problems, ESPECIALLY with
+ * shaped windows (it can't do them), and multiple gl windows and shared
+ * contexts, so for now just disable it. xrender is much more complete in
+ * this regard.
+ */
+#if 0
+ l = evas_list_append(l, strdup("GL"));
+#endif
l = evas_list_append(l, strdup("XRENDER"));
return l;
}
struct _E_Config
{
int config_version; // INTERNAL
- int show_splash; //GUI
+ int show_splash; // GUI
const char *init_default_theme; // GUI
const char *desktop_default_background; // GUI
Evas_List *desktop_backgrounds; // GUI
int border_shade_animate; // GUI
int border_shade_transition; // GUI
double border_shade_speed; // GUI
- double framerate; //GUI
- int image_cache; //GUI
- int font_cache; //GUI
- int edje_cache; //GUI
- int edje_collection_cache; //GUI
- double cache_flush_interval; //GUI
+ double framerate; // GUI
+ int image_cache; // GUI
+ int font_cache; // GUI
+ int edje_cache; // GUI
+ int edje_collection_cache; // GUI
+ double cache_flush_interval; // GUI
int zone_desks_x_count; // GUI
int zone_desks_y_count; // GUI
int use_virtual_roots; // NO GUI - maybe remove?
int focus_last_focused_per_desktop; // GUI
int focus_revert_on_hide_or_close; // GUI
int use_e_cursor; // GUI
- int cursor_size; //GUI
+ int cursor_size; // GUI
int menu_autoscroll_margin; // GUI
int menu_autoscroll_cursor_margin; // GUI
const char *input_method; // GUI
int desklock_autolock_screensaver; // GUI
int desklock_autolock_idle; // GUI
double desklock_autolock_idle_timeout; // GUI
- int desklock_use_custom_desklock; //GUI
+ int desklock_use_custom_desklock; // GUI
const char *desklock_custom_desklock_cmd; // GUI
- int screensaver_enable; //GUI
- int screensaver_timeout; //GUI
- int screensaver_interval; //GUI
- int screensaver_blanking; //GUI
- int screensaver_expose; //GUI
+ int screensaver_enable; // GUI
+ int screensaver_timeout; // GUI
+ int screensaver_interval; // GUI
+ int screensaver_blanking; // GUI
+ int screensaver_expose; // GUI
- int dpms_enable; //GUI
- int dpms_standby_enable; //GUI
- int dpms_standby_timeout; //GUI
- int dpms_suspend_enable; //GUI
- int dpms_suspend_timeout; //GUI
- int dpms_off_enable; //GUI
- int dpms_off_timeout; //GUI
-
- int clientlist_group_by; //GUI
- int clientlist_include_all_zones; //GUI
- int clientlist_separate_with; //GUI
- int clientlist_sort_by; //GUI
- int clientlist_separate_iconified_apps; //GUI
- int clientlist_warp_to_iconified_desktop; //GUI
-
- int mouse_accel_numerator; //GUI
- int mouse_accel_denominator; //GUI
- int mouse_accel_threshold; //GUI
+ int dpms_enable; // GUI
+ int dpms_standby_enable; // GUI
+ int dpms_standby_timeout; // GUI
+ int dpms_suspend_enable; // GUI
+ int dpms_suspend_timeout; // GUI
+ int dpms_off_enable; // GUI
+ int dpms_off_timeout; // GUI
+
+ int clientlist_group_by; // GUI
+ int clientlist_include_all_zones; // GUI
+ int clientlist_separate_with; // GUI
+ int clientlist_sort_by; // GUI
+ int clientlist_separate_iconified_apps; // GUI
+ int clientlist_warp_to_iconified_desktop; // GUI
+
+ int mouse_accel_numerator; // GUI
+ int mouse_accel_denominator; // GUI
+ int mouse_accel_threshold; // GUI
int display_res_restore; // GUI
int display_res_width; // GUI
e_bindings_mouse_down_event_handle(E_BINDING_CONTEXT_CONTAINER,
E_OBJECT(con), ev);
-// if (!e_bindings_mouse_down_event_handle(E_BINDING_CONTEXT_CONTAINER,
-// E_OBJECT(con), ev))
- {
- if (ev->double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK;
- if (ev->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK;
- evas_event_feed_mouse_down(con->bg_evas, ev->button, flags, ev->time, NULL);
- }
+ if (ev->double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK;
+ if (ev->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK;
+ evas_event_feed_mouse_down(con->bg_evas, ev->button, flags, ev->time, NULL);
}
return 1;
}
{
bd = l->data;
if ((!bd->iconic) && (bd->visible) &&
- (((bd->desk == desk)
-// Don't focus sticky windows as last focused win
-// || ((bd->sticky) && (bd->zone == desk->zone))
- )))
+ (bd->desk == desk))
{
/* this was the window last focused in this desktop */
e_border_focus_set(bd, 1, 1);
dt = (t - bd->fx.start.t) / spd;
if (dt > 1.0) dt = 1.0;
dt = 1.0 - dt;
- dt *= dt; // decelerate - could be a better hack
+ dt *= dt; /* decelerate - could be a better hack */
e_border_fx_offset(bd,
((double)bd->fx.start.x * dt),
((double)bd->fx.start.y * dt));
{
dt = (t - bd->fx.start.t) / spd;
if (dt > 1.0) dt = 1.0;
-// dt = 1.0 - dt;
- dt *= dt; // decelerate - could be a better hack
-// dt = 1.0 - dt;
+ dt *= dt; /* decelerate - could be a better hack */
e_border_fx_offset(bd,
((double)bd->fx.start.x * dt),
((double)bd->fx.start.y * dt));
_e_desklock_delete();
else
{
- // here we have to grab a password
+ /* here we have to grab a password */
if (ev->key_compose)
{
if ((strlen(edd->passwd) < (PASSWD_LEN - strlen(ev->key_compose))))
evas_object_key_grab(o, "Return", mask, ~mask, 0);
mask = 0;
evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
-// mask = 0;
-// evas_object_key_grab(o, "space", mask, ~mask, 0);
-
+
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, _e_dialog_cb_key_down, dia);
return dia;
_e_eap_editor_icon_show(cfdata);
-// when flipping from advanced to basic - this will already be destroyed.
-// if (editor->img_widget) evas_object_del(editor->img_widget);
editor->img_widget = e_widget_button_add(evas, "", NULL,
_e_eap_editor_cb_icon_select, cfdata, editor);
if (editor->img)
*/
#ifdef E_TYPEDEFS
-//#define print0(x, args...) x ,print1(## args)
#define e_error_message_show(args...) \
{ \
char __tmpbuf[4096]; \
_e_exebuf_update();
if (!update_timer)
update_timer = ecore_timer_add(MATCH_LAG, _e_exebuf_update_timer, NULL);
-// _e_exebuf_matches_update();
}
static void
_e_exebuf_update();
if (!update_timer)
update_timer = ecore_timer_add(MATCH_LAG, _e_exebuf_update_timer, NULL);
-// _e_exebuf_matches_update();
}
}
}
_e_exebuf_update();
if (!update_timer)
update_timer = ecore_timer_add(MATCH_LAG, _e_exebuf_update_timer, NULL);
-// _e_exebuf_matches_update();
}
}
}
if (!sd->changed) return;
- // local variables
+ /* local variables */
x = sd->x;
y = sd->y;
w = sd->w;
h = sd->h;
- // Calculate extents
+ /* Calculate extents */
_e_flowlayout_smart_extents_calcuate(sd);
minw = sd->min.w;
minh = sd->min.h;
count = evas_list_count(sd->items);
expand = 0;
- // Too small? move a little
+ /* Too small? move a little */
if (w < minw)
{
x = x + ((w - minw) * (1.0 - sd->align.x));
h = minh;
}
- // Some odd expanding counter
+ /* Some odd expanding counter */
for (l = sd->items; l; l = l->next)
{
E_Flowlayout_Item *bi;
}
}
- // If no expansion, w is minw, h is minh
+ /* If no expansion, w is minw, h is minh */
if (expand == 0)
{
if (sd->horizontal)
}
}
- // Some calculations
+ /* Some calculations */
wdif = w - minw;
hdif = h - minh;
if (sd->flowright)
cr = 0;
cc = 0;
- // Now for the real deal
+ /* Now for the real deal */
for (l = sd->items; l; l = l->next)
{
E_Flowlayout_Item *bi;
bi = evas_object_data_get(obj, "e_flowlayout_data");
if (bi)
{
- // Horiziontal
+ /* Horiziontal */
if (sd->horizontal)
{
- // Homogenous
+ /* Homogenous */
if (sd->homogenous)
{
Evas_Coord ww, hh, ow, oh;
{
}
}
- // Vertical
+ /* Vertical */
else
{
if (sd->homogenous)
EAPI void e_flowlayout_max_size_get (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
EAPI void e_flowlayout_align_get (Evas_Object *obj, double *ax, double *ay);
EAPI void e_flowlayout_align_set (Evas_Object *obj, double ax, double ay);
-// This function only works if homogenous is set
+/* This function only works if homogenous is set */
EAPI int e_flowlayout_max_children (Evas_Object *obj);
#endif
static void
_e_file_add(int id, const char *path, int listing)
{
-// printf("+++FADD %s\n", path);
_e_file_add_mod(id, path, 3, listing);/*file add*/
}
static void
_e_file_del(int id, const char *path)
{
-// printf("+++FDEL %s\n", path);
ecore_ipc_server_send(_e_ipc_server,
6/*E_IPC_DOMAIN_FM*/,
4/*file del*/,
static void
_e_file_mod(int id, const char *path)
{
-// printf("+++FMOD %s\n", path);
_e_file_add_mod(id, path, 5, 0);/*file change*/
}
_e_file_add(ed->id, buf, 2);
else
_e_file_add(ed->id, buf, 1);
-// printf("+++ FLIST %s\n", buf);
}
free(file);
ed->fq = evas_list_remove_list(ed->fq, ed->fq);
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
e_util_evas_fake_mouse_up_later(gcc->gadcon->evas,
ev->button);
-// evas_event_feed_mouse_up(gcc->gadcon->evas, ev->button,
-// EVAS_BUTTON_NONE, ev->timestamp, NULL);
}
}
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
e_util_evas_fake_mouse_up_later(gcc->gadcon->evas,
ev->button);
-// evas_event_feed_mouse_up(gcc->gadcon->evas, ev->button,
-// EVAS_BUTTON_NONE, ev->timestamp, NULL);
}
}
else
e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos + x, w);
- //gcc->config.pos will be set in smart_recofigure
- //gcc->config.size will be set in smart_reconfigure
- //original: gcc->config.pos = gcc->sx + x;
gcc->config.size = w;
evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
gcc->config.res = w;
else
e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos + y, h);
- //gcc->config.pos will be set in smart_recofigure
- //gcc->config.size will be set in smart_reconfigure
- //original: gcc->config.pos = gcc->sy + y;
gcc->config.size = h;
evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
gcc->config.res = h;
e_gadcon_layout_pack_request_set(gcc->o_frame, gcc->config.pos + x, w - x);
else
e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos + x, w - x);
- //gcc->config.pos will be set in smart_reconfigure
- //gcc->config.size will be set in smart_reconfigure
- //original: gcc->config.pos = gcc->sx + x;
- //original: gcc->config.size = gcc->sw - x;
evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
gcc->config.res = w;
}
e_gadcon_layout_pack_request_set(gcc->o_frame, gcc->config.pos + y, h - y);
else
e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos + y, h - y);
- //gcc->config.pos will be set in smart_reconfigure
- //gcc->config.size will be set in smart_reconfigure
- //original: gcc->config.pos = gcc->sy + y;
- //original: gcc->config.size = gcc->sh - y;
evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
gcc->config.res = h;
e_gadcon_layout_pack_request_set(gcc->o_frame, gcc->config.pos, w + x);
else
e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos, w + x);
- //gcc->config.pos is set inside smart_reconfigure
- //gcc->config.size is set inside smart_reconfigure
- //original: gcc->config.pos = gcc->sx;
- //original: gcc->config.size = gcc->sw + x;
evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
gcc->config.res = w;
}
e_gadcon_layout_pack_request_set(gcc->o_frame, gcc->config.pos, h + y);
else
e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos, h + y);
- //gcc->config.pos is set inside smart_reconfigure
- //gcc->config.size is set inside smart_reconfigure
- //original: gcc->config.pos = gcc->sy;
- //original: gcc->config.size = gcc->sh + y;
evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
gcc->config.res = h;
}
static void
e_gadcon_layout_pack_size_set(Evas_Object *obj, int size)
{
- //FIXME: simplify this function until the
- //is redone _e_gadcon_layout_smart_gadcons_asked_position_set(E_Smart_Data *sd)
- //
+ /*
+ * FIXME:
+ * simplify this function until the is redone
+ * _e_gadcon_layout_smart_gadcons_asked_position_set(E_Smart_Data *sd)
+ */
E_Gadcon_Layout_Item *bi;
int xx;
return;
}
- //x = sd->x; y = sd->y; w = sd->w; h = sd->h;
min = mino = cur = 0;
_e_gadcon_layout_smart_min_cur_size_calc(sd, &min, &mino, &cur);
- // update sd info about minw req etc
- // here request for gadcon size !!
if (sd->horizontal)
{
if ((sd->minw != min) || (sd->minh != mino))
E_Gadcon_Layout_Item *bi;
Evas_List *l;
- // how much space all the gadgets takes in the shelf
for (l = sd->items; l; l = l->next)
{
bi = evas_object_data_get(l->data, "e_gadcon_layout_data");
{
*min += bi->min.w;
if (bi->min.h > *mino) *mino = bi->min.h;
- //if (bi->min.w > *mino) *mino = bi->min.w;
if (bi->ask.size < bi->min.w)
*cur += bi->min.w;
else
else
{
*min += bi->min.h;
- //if (bi->min.h > *mino) *mino = bi->min.h;
if (bi->min.w > *mino) *mino = bi->min.w;
if (bi->ask.size < bi->min.h)
*cur += bi->min.h;
LC_FREE(lc_back);
}
- //set lc_moving->items->data->gcc->config.pos;
if (sd->horizontal)
{
bi_moving->gcc->config.pos = bi_moving->ask.pos = bi_moving->x;
bi->y = bi2->y + bi2->h;
}
- //bi->gcc->state_info.flags &= ~E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
-
t = bi->gcc->state_info.seq;
bi->gcc->state_info.seq = bi2->gcc->state_info.seq;
bi2->gcc->state_info.seq = t;
} config;
struct {
- int seq, flags; // goes to save
+ int seq, flags; /* goes to save */
int state, resist;
int prev_pos, prev_size;
int want_save : 1;
{
if (bd->client.netwm.desktop == 0xffffffff)
{
-// printf("CLIENT asks for all desks!\n");
e_border_stick(bd);
}
else if (bd->client.netwm.desktop < (bd->zone->desk_x_count * bd->zone->desk_y_count))
i = evas_list_count(sd->items);
if (n >= i) n = i - 1;
else if (n < 0) n = 0;
-// if (sd->selected == n) return;
for (l = sd->items; l; l = l->next)
{
API_ENTRY return;
if (!sd->items) return;
-// if (sd->multi_select) return;
if (sd->selected < 0) return;
si = evas_list_nth(sd->items, sd->selected);
if (!si) return;
*/
#include "e.h"
-//extern int errno;
static void _e_help(void);
/* externally accessible functions */
int size;
int stacking;
int iconify;
- int desk; // unused atm
+ int desk; /* unused atm */
int sticky;
int shade;
int maximize;
} user, client;
int border;
int close;
- int focus_in; // unused atm
- int focus_out; // unised atm
+ int focus_in; /* unused atm */
+ int focus_out; /* unused atm */
int life;
int remember;
cfdata->editor = NULL;
e_object_del_attach_func_set(obj, NULL);
e_object_data_set(obj, NULL);
-// e_fm2_refresh(cfdata->gui.o_fm);
-// e_fm2_refresh(cfdata->gui.o_fm_all);
}
#endif
realpath = e_fm2_real_path_get(cfdata->gui.o_fm_all);
-// if (info->pseudo_link)
-// snprintf(buf, sizeof(buf), "%s/%s", info->link, info->file);
-// else
- snprintf(buf, sizeof(buf), "%s/%s", realpath, info->file);
+ snprintf(buf, sizeof(buf), "%s/%s", realpath, info->file);
if (ecore_file_is_dir(buf)) return;
a = e_app_new(buf, 0);
{
if (!cfdata->gui.o_fm) return;
-// a = e_app_new(buf, 0);
realpath = e_fm2_real_path_get(cfdata->gui.o_fm);
-// parent = e_app_new(realpath, 0);
-// if (parent) e_app_subdir_scan(parent, 0);
-// e_app_append(a, parent);
_append_to_order(realpath, ecore_file_get_file(buf));
}
-// FIXME: When fm is fixed to create the .order files for us, then we can remove this.
+ /* FIXME: When fm is fixed to create the .order files for us, then we can remove this. */
e_fm2_refresh(cfdata->gui.o_fm);
}
o = e_widget_list_add(evas, 0, 0);
-// of = e_widget_framelist_add(evas, _("General Settings"), 0);
-// ob = e_widget_check_add(evas, _("Auto-Apply Configuration Changes"), &(cfdata->auto_apply));
-// e_widget_framelist_object_append(of, ob);
-// e_widget_list_object_append(o, of, 1, 1, 0.5);
-
of = e_widget_framelist_add(evas, _("Default Dialog Mode"), 0);
rg = e_widget_radio_group_new(&(cfdata->default_mode));
o = e_widget_list_add(evas, 0, 0);
-// of = e_widget_framelist_add(evas, _("General Settings"), 0);
-// ob = e_widget_check_add(evas, _("Auto-Apply Configuration Changes"), &(cfdata->auto_apply));
-// e_widget_framelist_object_append(of, ob);
-// e_widget_list_object_append(o, of, 1, 1, 0.5);
-
of = e_widget_framelist_add(evas, _("Default Dialog Mode"), 0);
rg = e_widget_radio_group_new(&(cfdata->default_mode));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Include windows from other screens"), &(cfdata->include_all_zones));
e_widget_framelist_object_append(of, ob);
- //e_widget_list_object_append(o, of, 1, 1, 0.5);
e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
of = e_widget_framelist_add(evas, _("Separate Groups By"), 0);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Using menus"), E_CLIENTLIST_GROUP_SEP_MENU, rg);
e_widget_framelist_object_append(of, ob);
- //e_widget_list_object_append(o, of, 1, 1, 0.5);
e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
of = e_widget_framelist_add(evas, _("Client Sort Order"), 0);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Most recently used"), E_CLIENTLIST_SORT_MOST_RECENT, rg);
e_widget_framelist_object_append(of, ob);
- //e_widget_list_object_append(o, of, 1, 1, 0.5);
e_widget_table_object_append(ot, of, 0, 1, 1, 1, 1, 1, 1, 1);
of = e_widget_framelist_add(evas, _("Iconified Windows"), 0);
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Warp to owning desktop"), &(cfdata->warp_to_iconified_desktop));
e_widget_framelist_object_append(of, ob);
- //e_widget_list_object_append(o, of, 1, 1, 0.5);
e_widget_table_object_append(ot, of, 1, 1, 1, 1, 1, 1, 1, 1);
e_widget_list_object_append(o, ot, 1, 1, 0.5);
cfdata->flip = cfdata->flip | ECORE_X_RANDR_FLIP_Y;
rot = ecore_x_randr_screen_rotation_get(man->root);
-// FIXME: a bug in x where it returns that the current rotation is still
-// normal (none) when it isn't. so just blindly ask for a new rot anyway.
-// if (rot != (cfdata->rotation | cfdata->flip))
- ecore_x_randr_screen_rotation_set(man->root,
- cfdata->rotation | cfdata->flip);
+ ecore_x_randr_screen_rotation_set(man->root,
+ cfdata->rotation | cfdata->flip);
e_config->display_res_rotation = cfdata->rotation | cfdata->flip;
}
else
char *f;
f = fonts->data;
-// if (strstr(f, ":")) continue;
l = evas_list_append(l, strdup(f));
}
if (l)
e_fm2_icon_menu_flags_set(o, E_FM2_MENU_NO_SHOW_HIDDEN);
evas_object_smart_callback_add(mt, "dir_changed",
_cb_files_changed, cfdata);
-// e_fm2_path_set(cfdata->gui.o_fm, "/opt/kde3/share/icons/crystalsvg", "/");
ob = e_widget_scrollframe_pan_add(evas, mt,
e_fm2_pan_set,
mask = 0;
evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
mask = 0;
-// evas_object_key_grab(o, "space", mask, ~mask, 0);
-// mask = 0;
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
_imc_import_cb_key_down, import);
of = e_widget_frametable_add(evas, _("Language Selector"), 1);
/* Language List */
- //ob = e_widget_label_add(evas, _("Language"));
- //e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
-
ob = e_widget_ilist_add(evas, 16, 16, &(cfdata->cur_lang));
cfdata->gui.lang_list = ob;
/* Region List */
- //ob = e_widget_label_add(evas, _("Region"));
- //e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
-
ob = e_widget_ilist_add(evas, 0, 0, &(cfdata->cur_reg));
cfdata->gui.reg_list = ob;
e_widget_ilist_selected_set(ob, e_widget_ilist_selected_get(ob));
/* Codeset List */
- //ob = e_widget_label_add(evas, _("Codeset"));
- //e_widget_frametable_object_append(of, ob, 2, 0, 1, 1, 1, 1, 1, 1);
-
ob = e_widget_ilist_add(evas, 0, 0, &(cfdata->cur_cs));
cfdata->gui.cs_list = ob;
e_widget_frametable_object_append(of, ob, 2, 0, 1, 4, 1, 1, 1, 1);
/* Modified List */
- //ob = e_widget_label_add(evas, _("Modifier"));
- //e_widget_frametable_object_append(of, ob, 3, 0, 1, 1, 1, 1, 1, 1);
-
ob = e_widget_ilist_add(evas, 0, 0, &(cfdata->cur_mod));
cfdata->gui.mod_list = ob;
cfdata = data;
- //FIXME: need confirmation dialog
+ /* FIXME: need confirmation dialog */
while (cfdata->binding.key)
{
n = cfdata->locals.binding;
l = evas_list_nth_list(cfdata->binding.key, atoi(++n));
- //FIXME: need confirmation dialog
+ /* FIXME: need confirmation dialog */
if (l)
{
bi = l->data;
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
e_config->mouse_accel_numerator = cfdata->numerator;
- // Force denominator to 1 for simplicity.
- e_config->mouse_accel_denominator = 1; //cfdata->denominator;
+ /* Force denominator to 1 for simplicity. */
+ e_config->mouse_accel_denominator = 1;
e_config->mouse_accel_threshold = cfdata->threshold;
- // Apply the above settings
+ /* Apply the above settings */
e_mouse_init();
e_config_save_queue();
int context;
char *cur;
- int add; //just to distinguesh among two buttons add/modify
+ int add; /*just to distinguesh among two buttons add/modify */
E_Dialog *dia;
Ecore_X_Window bind_win;
cfdata = data;
- //FIXME: need confirmation dialog
+ /* FIXME: need confirmation dialog */
while (cfdata->binding.mouse)
{
E_Config_Binding_Wheel *bw;
E_Binding_Context ctxt;
- // disable all the radios.
+ /* disable all the radios. */
e_widget_radio_toggle_set(cfdata->gui.context.o_any, 1);
e_widget_disabled_set(cfdata->gui.context.o_any, 1);
e_widget_disabled_set(cfdata->gui.context.o_border, 1);
evas_event_thaw(evas_object_evas_get(pcd->cfdata->gui.default_list));
_ilist_update(pcd->cfdata->gui.user_list,
- pcd->cfdata->cur_pcd, //Path data to save
- pcd); //New Path to show
+ pcd->cfdata->cur_pcd, /* Path data to save */
+ pcd); /* New Path to show */
pcd->cfdata->cur_pcd = pcd;
}
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
- //e_widget_disabled_set(ob, !ecore_x_screensaver_event_available_get());
if (e_config_dialog_find("E", "_config_screensaver_dialog")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
mask = 0;
evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
mask = 0;
-// evas_object_key_grab(o, "space", mask, ~mask, 0);
-// mask = 0;
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
_theme_import_cb_key_down, import);
mask = 0;
evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
mask = 0;
-// evas_object_key_grab(o, "space", mask, ~mask, 0);
-// mask = 0;
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, _import_cb_key_down, import);
o = e_widget_list_add(evas, 0, 0);
bd = borders->data;
borders = evas_list_remove_list(borders, borders);
-// e_object_breadcrumb_del(E_OBJECT(bd), "clients_menu");
e_object_unref(E_OBJECT(bd));
}
}
e_menu_item_label_set(mi, _("No name!!"));
/* ref the border as we implicitly unref it in the callback */
e_object_ref(E_OBJECT(bd));
-// e_object_breadcrumb_add(E_OBJECT(bd), "lost_clients_menu");
e_menu_item_callback_set(mi, _e_int_menus_lost_clients_item_cb, bd);
if (bd->desktop) e_util_desktop_menu_item_icon_add(bd->desktop, "24x24", mi);
}
bd = borders->data;
borders = evas_list_remove_list(borders, borders);
-// e_object_breadcrumb_del(E_OBJECT(bd), "lost_clients_menu");
e_object_unref(E_OBJECT(bd));
}
}
of = e_widget_framelist_add(evas, _("Size"), 0);
ob = e_widget_check_add(evas, _("Shrink to Content Size"), &(cfdata->fit_along));
e_widget_framelist_object_append(of, ob);
-// ob = e_widget_check_add(evas, _("Expand width to fit contents"), &(cfdata->fit_size));
-// e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, _("Shelf Size"));
e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%3.0f pixels"), 4, 120, 4, 0, NULL, &(cfdata->size), 100);
START_INT(value, HDL);
e_config->menu_autoscroll_cursor_margin = value;
E_CONFIG_LIMIT(e_config->menu_autoscroll_cursor_margin, 0, 50);
- // e_zone_update_flip_all();
SAVE;
END_INT;
#elif (TYPE == E_REMOTE_IN)
e_test();
/* FIXME: for testing only */
-//
TS("shelf config init");
e_shelf_config_init();
{
e_error_message_show("Lost X connection.");
ecore_main_loop_quit();
-// _e_main_shutdown(-1);
}
static int
man = data;
e = ev;
-// printf("KD %s [win=%x event_win=%x]\n", e->keyname, e->win, e->event_win);
if (e->event_win != man->root) return 1;
if (e_bindings_key_down_event_handle(E_BINDING_CONTEXT_MANAGER, E_OBJECT(man), ev))
return 0;
man = data;
e = ev;
-// printf("KU %s [win=%x event_win=%x]\n", e->keyname, e->win, e->event_win);
return 1;
}
m->cur.y = y;
if ((m->cur.y + m->cur.h) > (m->zone->y + m->zone->h))
m->cur.y = y + h - m->cur.h;
-// _e_menu_activate_first();
break;
case E_MENU_POP_DIRECTION_RIGHT:
m->cur.x = x + w;
m->cur.y = y;
-// _e_menu_activate_first();
break;
case E_MENU_POP_DIRECTION_UP:
_e_menu_realize(m);
if ((m->cur.x + m->cur.w) > (m->zone->x + m->zone->w))
m->cur.x = x + w - m->cur.w;
m->cur.y = y - m->cur.h;
-// _e_menu_activate_last();
break;
case E_MENU_POP_DIRECTION_DOWN:
_e_menu_realize(m);
m->cur.y = y + h;
if ((m->cur.y + m->cur.h) > (m->zone->y + m->zone->h))
m->cur.y = y + h - m->cur.h;
-// _e_menu_activate_first();
break;
case E_MENU_POP_DIRECTION_AUTO:
_e_menu_auto_place(m, x, y, w, h);
m->prev.h = m->cur.h;
ecore_evas_resize(m->ecore_evas, m->cur.w, m->cur.h);
e_container_shape_resize(m->shape, m->cur.w, m->cur.h);
-// evas_obscured_clear(m->evas);
-// evas_obscured_rectangle_add(m->evas, 0, 0, m->cur.w, m->cur.h);
}
if (((m->cur.x) != (m->prev.x)) ||
((m->cur.y) != (m->prev.y)))
dt = dt * dt;
if ((dt > 0.0) && ((d / dt) >= (fast_move_threshold * fast_move_threshold)))
is_fast = 1;
-// printf("d=%i dt=%3.9f fast_move_threshold=%3.3f ---> FAST=%i\n",
-// d, dt, fast_move_threshold, is_fast);
for (l = _e_active_menus; l; l = l->next)
{
(!m->func.about) ||
(!m->api) ||
- // this is to more forcibly catch old/bad modules. will go - eventually,
- // but for now is a good check to have
+ /*
+ * this is to more forcibly catch old/bad modules. will go - eventually,
+ * but for now is a good check to have
+ */
(dlsym(m->handle, "e_modapi_info"))
-
)
{
snprintf(body, sizeof(body), _("There was an error loading module named: %s<br>"
e_popup_edje_bg_object_set(_disp_pop, _obj);
}
-// e_move_update(x, y);
-
if (e_config->move_info_visible)
{
e_popup_move_resize(_disp_pop,
(obj_y - _disp_pop->zone->y) +
((obj_h - eh) / 2),
ew, eh);
-// e_popup_show(_disp_pop);
}
-
-// visible = 1;
}
EAPI void
e_object_free(E_Object *obj)
{
E_OBJECT_CHECK(obj);
-/*
- if (obj->crumbs)
- {
- printf("EEEK obj type %x has crumbs still! ->\n", obj->type);
- e_object_breadcrumb_debug(obj);
- }
- */
if (obj->free_att_func) obj->free_att_func(obj);
-// FIXME: although this is good - if during cleanup the cleanup func calls
-// other generic funcs to do cleanups on the same object... we get bitching.
-// disable for now (the final free of the struct should probably happen after
-// the cleanup func and be done byt he object system - set the magic after
-// cleanup :)
-// obj->magic = E_OBJECT_MAGIC_FREED;
+ /*
+ * FIXME:
+ * although this is good - if during cleanup the cleanup func calls
+ * other generic funcs to do cleanups on the same object... we get bitching.
+ * disable for now (the final free of the struct should probably happen after
+ * the cleanup func and be done byt he object system - set the magic after
+ * cleanup :)
+ */
+#if 0
+ obj->magic = E_OBJECT_MAGIC_FREED;
+#endif
obj->cleanup_func(obj);
}
}
/* display actual error message */
e_error_message_show("%s", buf);
-// abort();
return 1;
#else
return 0;
void (*del_att_func) (void *obj);
void *data;
unsigned char deleted : 1;
-// Evas_List *crumbs;
};
EAPI void *e_object_alloc (int size, int type, E_Object_Cleanup_Func cleanup_func);
# else
# ifdef __GNUC__
# if __GNUC__ >= 4
-// BROKEN in gcc 4 on amd64
-//# pragma GCC visibility push(hidden)
+/* BROKEN in gcc 4 on amd64 */
+#if 0
+# pragma GCC visibility push(hidden)
+#endif
# define EAPI __attribute__ ((visibility("default")))
# else
# define EAPI
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
e_util_evas_fake_mouse_up_later(es->gadcon->evas,
ev->button);
-// evas_event_feed_mouse_up(es->gadcon->evas, ev->button,
-// EVAS_BUTTON_NONE, ev->timestamp, NULL);
}
}
for (j = 0; j < sp->iw; j++)
{
vx = (float)j / sp->iw;
- //_e_spectrum_2d_color_at(sp, j, i, &r, &g, &b);
_e_spectrum_color_calc(sp, vx, vy, vz, &r, &g, &b);
data[(i * sp->iw) + j] =
(sp->cv->a << 24) |
else if (mode == E_STARTUP_RESTART)
snprintf(buf, sizeof(buf), "%s/.e/e/applications/restart/.order", homedir);
startup_apps = e_order_new(buf);
- if (!startup_apps)
- {
-// e_init_hide();
- return;
- }
+ if (!startup_apps) return;
start_app_pos = 0;
_e_startup();
}
E_Color_Dialog *dia;
E_Color *color;
- E_Container *con; // container to pop a color dialog up on
+ E_Container *con; /* container to pop a color dialog up on */
int show_color_dialog;
};
wd->changing = 1;
- // entry changed
+ /* entry changed */
for(l = wd->entries, i = 0; l; l = l->next, i++)
{
if (o == l->data)
e_widget_cslider_update(wd->vert);
- // update the sliders
+ /* update the sliders */
for (l = wd->sliders, i = 0; l; l = l->next, i++)
{
Evas_Object *so = l->data;
}
}
- // update the spectrum
+ /* update the spectrum */
if (o != wd->spectrum && changed != -1)
{
if (wd->mode == changed ||
e_widget_color_well_update(wd->well);
- // now update the text fields to show current values
+ /* now update the text fields to show current values */
for(l = wd->entries, i = 0; l; l = l->next, i++)
{
char buf[10];
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_wid_focus_steal, obj);
e_widget_resize_object_set(obj, o);
- // add gradient obj
+ /* add gradient obj */
o = evas_object_gradient_add(evas);
e_widget_sub_object_add(obj, o);
if (toggle)
{
Evas_List *l;
- //int toggled = 0;
for (l = wd->group->radios; l; l = l->next)
{
- //wd = e_widget_data_get(l->data);
if (l->data != obj)
{
wd = e_widget_data_get(l->data);
if (wd->valnum == *(wd->group->valptr))
{
edje_object_signal_emit(wd->o_radio, "e,state,off", "e");
- //toggled = 1;
break;
}
}
}
- //if (!toggled) return;
wd = e_widget_data_get(obj);
*(wd->group->valptr) = wd->valnum;
edje_object_signal_emit(wd->o_radio, "e,state,on", "e");
double vx, vy;
wd = e_widget_data_get(obj);
- // redraw spectrum
+ /* redraw spectrum */
if (redraw)
e_spectrum_update(wd->o_spectrum);
e_theme_edje_object_set(o, "base/theme/winlist",
"e/widgets/winlist/item");
edje_object_part_text_set(o, "e.text.label", e_border_name_get(ww->border));
-// if (!e_config->winlist_warp_while_selecting)
-// evas_object_event_callback_add(ww->bg_object, EVAS_CALLBACK_MOUSE_IN,
-// _e_winlist_cb_item_mouse_in, ww);
evas_object_show(o);
if (edje_object_part_exists(ww->bg_object, "e.swallow.icon"))
{
ev = event;
if (!winlist) return 1;
-// if (ev->win != input_window) return 1;
if (hold_mod)
{
if ((hold_mod & ECORE_X_MODIFIER_SHIFT) && (!strcmp(ev->keysymbol, "Shift_L"))) hold_count--;
projects / platform / upstream / enlightenment.git / commitdiff