parent
3b095fa6ec
commit
bda24a1f0d
|
@ -4056,12 +4056,11 @@ _e_border_cb_window_hide(void *data, int ev_type, void *ev)
|
||||||
static int
|
static int
|
||||||
_e_border_cb_window_reparent(void *data, int ev_type, void *ev)
|
_e_border_cb_window_reparent(void *data, int ev_type, void *ev)
|
||||||
{
|
{
|
||||||
|
#if 0
|
||||||
E_Border *bd;
|
E_Border *bd;
|
||||||
Ecore_X_Event_Window_Reparent *e;
|
Ecore_X_Event_Window_Reparent *e;
|
||||||
|
|
||||||
bd = data;
|
|
||||||
e = ev;
|
e = ev;
|
||||||
return 1;
|
|
||||||
bd = e_border_find_by_client_window(e->win);
|
bd = e_border_find_by_client_window(e->win);
|
||||||
if (!bd) return 1;
|
if (!bd) return 1;
|
||||||
if (e->parent == bd->client.shell_win) return 1;
|
if (e->parent == bd->client.shell_win) return 1;
|
||||||
|
@ -4071,6 +4070,7 @@ _e_border_cb_window_reparent(void *data, int ev_type, void *ev)
|
||||||
}
|
}
|
||||||
e_border_hide(bd, 0);
|
e_border_hide(bd, 0);
|
||||||
e_object_del(E_OBJECT(bd));
|
e_object_del(E_OBJECT(bd));
|
||||||
|
#endif
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4080,7 +4080,6 @@ _e_border_cb_window_configure_request(void *data, int ev_type, void *ev)
|
||||||
E_Border *bd;
|
E_Border *bd;
|
||||||
Ecore_X_Event_Window_Configure_Request *e;
|
Ecore_X_Event_Window_Configure_Request *e;
|
||||||
|
|
||||||
bd = data;
|
|
||||||
e = ev;
|
e = ev;
|
||||||
bd = e_border_find_by_client_window(e->win);
|
bd = e_border_find_by_client_window(e->win);
|
||||||
if (!bd)
|
if (!bd)
|
||||||
|
@ -4300,8 +4299,6 @@ _e_border_cb_window_resize_request(void *data, int ev_type, void *ev)
|
||||||
{
|
{
|
||||||
int w, h;
|
int w, h;
|
||||||
|
|
||||||
h = bd->h;
|
|
||||||
w = bd->w;
|
|
||||||
w = e->w + bd->client_inset.l + bd->client_inset.r;
|
w = e->w + bd->client_inset.l + bd->client_inset.r;
|
||||||
h = e->h + bd->client_inset.t + bd->client_inset.b;
|
h = e->h + bd->client_inset.t + bd->client_inset.b;
|
||||||
if ((bd->shaded) || (bd->shading))
|
if ((bd->shaded) || (bd->shading))
|
||||||
|
|
|
@ -59,7 +59,6 @@ EAPI E_Container *
|
||||||
e_container_new(E_Manager *man)
|
e_container_new(E_Manager *man)
|
||||||
{
|
{
|
||||||
E_Container *con;
|
E_Container *con;
|
||||||
E_Zone *zone;
|
|
||||||
Evas_Object *o;
|
Evas_Object *o;
|
||||||
char name[40];
|
char name[40];
|
||||||
Eina_List *l, *screens;
|
Eina_List *l, *screens;
|
||||||
|
@ -158,11 +157,11 @@ e_container_new(E_Manager *man)
|
||||||
E_Screen *scr;
|
E_Screen *scr;
|
||||||
EINA_LIST_FOREACH(screens, l, scr)
|
EINA_LIST_FOREACH(screens, l, scr)
|
||||||
{
|
{
|
||||||
zone = e_zone_new(con, scr->screen, scr->escreen, scr->x, scr->y, scr->w, scr->h);
|
e_zone_new(con, scr->screen, scr->escreen, scr->x, scr->y, scr->w, scr->h);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
zone = e_zone_new(con, 0, 0, 0, 0, con->w, con->h);
|
e_zone_new(con, 0, 0, 0, 0, con->w, con->h);
|
||||||
return con;
|
return con;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1204,7 +1203,7 @@ _e_container_resize_handle(E_Container *con)
|
||||||
e_border_res_change_geometry_restore(bd);
|
e_border_res_change_geometry_restore(bd);
|
||||||
}
|
}
|
||||||
|
|
||||||
tmp = eina_list_free(tmp);
|
eina_list_free(tmp);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -995,7 +995,6 @@ _e_drag_xdnd_end(Ecore_X_Window win, int x, int y)
|
||||||
if (ev.data)
|
if (ev.data)
|
||||||
{
|
{
|
||||||
E_Drop_Handler *h;
|
E_Drop_Handler *h;
|
||||||
int dropped = 0;
|
|
||||||
|
|
||||||
EINA_LIST_FOREACH(_drop_handlers, l, h)
|
EINA_LIST_FOREACH(_drop_handlers, l, h)
|
||||||
{
|
{
|
||||||
|
@ -1007,7 +1006,6 @@ _e_drag_xdnd_end(Ecore_X_Window win, int x, int y)
|
||||||
&& E_INSIDE(x, y, dx, dy, dw, dh))
|
&& E_INSIDE(x, y, dx, dy, dw, dh))
|
||||||
{
|
{
|
||||||
h->cb.drop(h->cb.data, h->active_type, &ev);
|
h->cb.drop(h->cb.data, h->active_type, &ev);
|
||||||
dropped = 1;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1844,11 +1844,9 @@ _e_cb_file_monitor(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, c
|
||||||
{
|
{
|
||||||
E_Dir *ed;
|
E_Dir *ed;
|
||||||
char *dir, *rp, *drp;
|
char *dir, *rp, *drp;
|
||||||
const char *file;
|
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
|
|
||||||
dir = ecore_file_dir_get(path);
|
dir = ecore_file_dir_get(path);
|
||||||
file = ecore_file_file_get(path);
|
|
||||||
/* FIXME: get no create events if dir is empty */
|
/* FIXME: get no create events if dir is empty */
|
||||||
if ((event == ECORE_FILE_EVENT_CREATED_FILE) ||
|
if ((event == ECORE_FILE_EVENT_CREATED_FILE) ||
|
||||||
(event == ECORE_FILE_EVENT_CREATED_DIRECTORY))
|
(event == ECORE_FILE_EVENT_CREATED_DIRECTORY))
|
||||||
|
@ -2337,7 +2335,7 @@ _e_prepare_command(E_Fm_Op_Type type, const char *args)
|
||||||
|
|
||||||
length = 256 + strlen(getenv("E_LIB_DIR")) + strlen(args);
|
length = 256 + strlen(getenv("E_LIB_DIR")) + strlen(args);
|
||||||
buffer = malloc(length);
|
buffer = malloc(length);
|
||||||
length = snprintf(buffer, length,
|
snprintf(buffer, length,
|
||||||
"%s/enlightenment/utils/enlightenment_fm_op %s %s",
|
"%s/enlightenment/utils/enlightenment_fm_op %s %s",
|
||||||
getenv("E_LIB_DIR"), command, args);
|
getenv("E_LIB_DIR"), command, args);
|
||||||
|
|
||||||
|
|
|
@ -1984,6 +1984,8 @@ _e_gadcon_client_move_start(E_Gadcon_Client *gcc)
|
||||||
evas_object_geometry_get(gcc->o_frame, &x, &y, NULL, NULL);
|
evas_object_geometry_get(gcc->o_frame, &x, &y, NULL, NULL);
|
||||||
else if (gcc->o_base)
|
else if (gcc->o_base)
|
||||||
evas_object_geometry_get(gcc->o_base, &x, &y, NULL, NULL);
|
evas_object_geometry_get(gcc->o_base, &x, &y, NULL, NULL);
|
||||||
|
else
|
||||||
|
return;
|
||||||
|
|
||||||
/* using drag pos to calc offset between pointer and gcc pos */
|
/* using drag pos to calc offset between pointer and gcc pos */
|
||||||
gcc->drag.x = (x - gcc->dx);
|
gcc->drag.x = (x - gcc->dx);
|
||||||
|
@ -2038,7 +2040,8 @@ _e_gadcon_client_move_go(E_Gadcon_Client *gcc)
|
||||||
evas_object_geometry_get(gcc->o_frame, NULL, NULL, &w, &h);
|
evas_object_geometry_get(gcc->o_frame, NULL, NULL, &w, &h);
|
||||||
else if (gcc->o_base)
|
else if (gcc->o_base)
|
||||||
evas_object_geometry_get(gcc->o_base, NULL, NULL, &w, &h);
|
evas_object_geometry_get(gcc->o_base, NULL, NULL, &w, &h);
|
||||||
else return; /* make clang happy */
|
else
|
||||||
|
return; /* make clang happy */
|
||||||
|
|
||||||
if (e_gadcon_layout_orientation_get(gcc->gadcon->o_container))
|
if (e_gadcon_layout_orientation_get(gcc->gadcon->o_container))
|
||||||
{
|
{
|
||||||
|
|
|
@ -313,17 +313,11 @@ _e_layout_smart_item_del_hook(void *data, Evas *e, Evas_Object *obj, void *event
|
||||||
static void
|
static void
|
||||||
_e_layout_smart_reconfigure(E_Smart_Data *sd)
|
_e_layout_smart_reconfigure(E_Smart_Data *sd)
|
||||||
{
|
{
|
||||||
Evas_Coord x, y, w, h;
|
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
Evas_Object *obj;
|
Evas_Object *obj;
|
||||||
|
|
||||||
if (!sd->changed) return;
|
if (!sd->changed) return;
|
||||||
|
|
||||||
x = sd->x;
|
|
||||||
y = sd->y;
|
|
||||||
w = sd->w;
|
|
||||||
h = sd->h;
|
|
||||||
|
|
||||||
EINA_LIST_FOREACH(sd->items, l, obj)
|
EINA_LIST_FOREACH(sd->items, l, obj)
|
||||||
{
|
{
|
||||||
E_Layout_Item *li;
|
E_Layout_Item *li;
|
||||||
|
|
|
@ -802,10 +802,9 @@ static int
|
||||||
_e_smart_scrollbar_bar_h_visibility_adjust(E_Smart_Data *sd)
|
_e_smart_scrollbar_bar_h_visibility_adjust(E_Smart_Data *sd)
|
||||||
{
|
{
|
||||||
int scroll_h_vis_change = 0;
|
int scroll_h_vis_change = 0;
|
||||||
Evas_Coord w, h, vw;
|
Evas_Coord w, vw;
|
||||||
|
|
||||||
w = sd->child.w;
|
w = sd->child.w;
|
||||||
h = sd->child.h;
|
|
||||||
edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content",
|
edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content",
|
||||||
NULL, NULL, &vw, NULL);
|
NULL, NULL, &vw, NULL);
|
||||||
if (sd->hbar_visible)
|
if (sd->hbar_visible)
|
||||||
|
|
|
@ -34,6 +34,7 @@ e_sha1_sum(unsigned char *data, int size, unsigned char *dst)
|
||||||
digest[3] = 0x10325476;
|
digest[3] = 0x10325476;
|
||||||
digest[4] = 0xc3d2e1f0;
|
digest[4] = 0xc3d2e1f0;
|
||||||
|
|
||||||
|
memset(buf, 0, sizeof(buf));
|
||||||
for (left = size, d = data; left > 0; left--, d++)
|
for (left = size, d = data; left > 0; left--, d++)
|
||||||
{
|
{
|
||||||
if ((index == 0) && (left < 64))
|
if ((index == 0) && (left < 64))
|
||||||
|
|
|
@ -1319,7 +1319,6 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_inf
|
||||||
E_Shelf *es;
|
E_Shelf *es;
|
||||||
E_Menu *mn;
|
E_Menu *mn;
|
||||||
int cx, cy;
|
int cx, cy;
|
||||||
E_Zone *zone;
|
|
||||||
|
|
||||||
es = data;
|
es = data;
|
||||||
ev = event_info;
|
ev = event_info;
|
||||||
|
@ -1335,8 +1334,6 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_inf
|
||||||
|
|
||||||
_e_shelf_menu_append(es, mn);
|
_e_shelf_menu_append(es, mn);
|
||||||
|
|
||||||
zone = es->gadcon->zone;
|
|
||||||
if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
|
|
||||||
e_gadcon_canvas_zone_geometry_get(es->gadcon, &cx, &cy, NULL, NULL);
|
e_gadcon_canvas_zone_geometry_get(es->gadcon, &cx, &cy, NULL, NULL);
|
||||||
e_menu_activate_mouse(mn,
|
e_menu_activate_mouse(mn,
|
||||||
e_util_zone_current_get(e_manager_current_get()),
|
e_util_zone_current_get(e_manager_current_get()),
|
||||||
|
@ -1509,7 +1506,7 @@ static int
|
||||||
_e_shelf_cb_hide_animator(void *data)
|
_e_shelf_cb_hide_animator(void *data)
|
||||||
{
|
{
|
||||||
E_Shelf *es;
|
E_Shelf *es;
|
||||||
int step, hide_max;
|
int step, hide_max = 0;
|
||||||
|
|
||||||
es = data;
|
es = data;
|
||||||
switch (es->gadcon->orient)
|
switch (es->gadcon->orient)
|
||||||
|
|
|
@ -193,12 +193,12 @@ _e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_inf
|
||||||
static void
|
static void
|
||||||
_e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
_e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
Evas_Event_Key_Down *ev;
|
Evas_Event_Key_Down *ev;
|
||||||
E_Smart_Data *sd;
|
E_Smart_Data *sd;
|
||||||
|
|
||||||
sd = data;
|
sd = data;
|
||||||
ev = event_info;
|
ev = event_info;
|
||||||
/*
|
|
||||||
if (!strcmp(ev->keyname, "Left"))
|
if (!strcmp(ev->keyname, "Left"))
|
||||||
x -= sd->step.x;
|
x -= sd->step.x;
|
||||||
else if (!strcmp(ev->keyname, "Right"))
|
else if (!strcmp(ev->keyname, "Right"))
|
||||||
|
|
|
@ -254,7 +254,8 @@ _e_spectrum_2d_color_at(E_Spectrum *sp, int x, int y, int *r, int *g, int *b)
|
||||||
evas_color_hsv_to_rgb(h, s, v, &rr, &gg, &bb);
|
evas_color_hsv_to_rgb(h, s, v, &rr, &gg, &bb);
|
||||||
break;
|
break;
|
||||||
case E_COLOR_COMPONENT_MAX:
|
case E_COLOR_COMPONENT_MAX:
|
||||||
break;
|
default:
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (r) *r = rr;
|
if (r) *r = rr;
|
||||||
|
|
|
@ -140,9 +140,6 @@ _e_ipc_cb_server_add(void *data, int type, void *event)
|
||||||
static int
|
static int
|
||||||
_e_ipc_cb_server_del(void *data, int type, void *event)
|
_e_ipc_cb_server_del(void *data, int type, void *event)
|
||||||
{
|
{
|
||||||
Ecore_Ipc_Event_Server_Del *e;
|
|
||||||
|
|
||||||
e = event;
|
|
||||||
/* quit now */
|
/* quit now */
|
||||||
ecore_main_loop_quit();
|
ecore_main_loop_quit();
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -245,13 +242,6 @@ struct _Color
|
||||||
unsigned char r, g, b;
|
unsigned char r, g, b;
|
||||||
};
|
};
|
||||||
|
|
||||||
static int
|
|
||||||
_sort_col(const void *d1, const void *d2)
|
|
||||||
{
|
|
||||||
Color *c1 = (Color *)d1, *c2 = (Color *)d2;
|
|
||||||
return c2->use - c1->use;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_e_thumb_generate(E_Thumb *eth)
|
_e_thumb_generate(E_Thumb *eth)
|
||||||
{
|
{
|
||||||
|
|
|
@ -60,6 +60,8 @@ e_user_homedir_snprintf(char *dst, size_t size, const char *fmt, ...)
|
||||||
|
|
||||||
if (!_e_user_homedir)
|
if (!_e_user_homedir)
|
||||||
e_user_homedir_get();
|
e_user_homedir_get();
|
||||||
|
if (!_e_user_homedir)
|
||||||
|
return 0;
|
||||||
|
|
||||||
va_start(ap, fmt);
|
va_start(ap, fmt);
|
||||||
|
|
||||||
|
@ -162,6 +164,8 @@ e_user_dir_snprintf(char *dst, size_t size, const char *fmt, ...)
|
||||||
|
|
||||||
if (!_e_user_dir)
|
if (!_e_user_dir)
|
||||||
e_user_dir_get();
|
e_user_dir_get();
|
||||||
|
if (!_e_user_dir)
|
||||||
|
return 0;
|
||||||
|
|
||||||
va_start(ap, fmt);
|
va_start(ap, fmt);
|
||||||
|
|
||||||
|
|
|
@ -168,7 +168,8 @@ e_util_head_exec(int head, const char *cmd)
|
||||||
Ecore_Exe *exe;
|
Ecore_Exe *exe;
|
||||||
|
|
||||||
penv_display = getenv("DISPLAY");
|
penv_display = getenv("DISPLAY");
|
||||||
if (penv_display) penv_display = strdup(penv_display);
|
if (!penv_display) return 0;
|
||||||
|
penv_display = strdup(penv_display);
|
||||||
/* set env vars */
|
/* set env vars */
|
||||||
p1 = strrchr(penv_display, ':');
|
p1 = strrchr(penv_display, ':');
|
||||||
p2 = strrchr(penv_display, '.');
|
p2 = strrchr(penv_display, '.');
|
||||||
|
|
|
@ -1016,9 +1016,7 @@ static void
|
||||||
_e_zone_cb_bg_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
|
_e_zone_cb_bg_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
|
||||||
{
|
{
|
||||||
E_Zone *zone;
|
E_Zone *zone;
|
||||||
Evas_Event_Mouse_Down *ev;
|
|
||||||
|
|
||||||
ev = (Evas_Event_Mouse_Down *)event_info;
|
|
||||||
zone = data;
|
zone = data;
|
||||||
if (e_menu_grab_window_get()) return;
|
if (e_menu_grab_window_get()) return;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue