forked from enlightenment/enlightenment
remove/comment out printfs and remove fixme (to be removed) fake mouse up funcs
SVN revision: 36229
This commit is contained in:
parent
9c73f46d0f
commit
b370f8315f
Binary file not shown.
Binary file not shown.
|
@ -1468,7 +1468,6 @@ ACT_FN_GO_MOUSE(menu_show)
|
||||||
e_menu_post_deactivate_callback_set(m, _e_actions_cb_menu_end, NULL);
|
e_menu_post_deactivate_callback_set(m, _e_actions_cb_menu_end, NULL);
|
||||||
e_menu_activate_mouse(m, zone, x, y, 1, 1,
|
e_menu_activate_mouse(m, zone, x, y, 1, 1,
|
||||||
E_MENU_POP_DIRECTION_DOWN, ev->time);
|
E_MENU_POP_DIRECTION_DOWN, ev->time);
|
||||||
e_util_container_fake_mouse_up_all_later(zone->container);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,7 +59,6 @@ e_bindings_init(void)
|
||||||
{
|
{
|
||||||
char params[32];
|
char params[32];
|
||||||
snprintf(params, sizeof(params), "resize_%s", eb->params);
|
snprintf(params, sizeof(params), "resize_%s", eb->params);
|
||||||
printf("########## ADD mouse,in + mouse,out\n");
|
|
||||||
e_bindings_signal_add(eb->context, "mouse,in", eb->source, eb->modifiers,
|
e_bindings_signal_add(eb->context, "mouse,in", eb->source, eb->modifiers,
|
||||||
eb->any_mod, "pointer_resize_push", params);
|
eb->any_mod, "pointer_resize_push", params);
|
||||||
e_bindings_signal_add(eb->context, "mouse,out", eb->source, eb->modifiers,
|
e_bindings_signal_add(eb->context, "mouse,out", eb->source, eb->modifiers,
|
||||||
|
|
|
@ -5314,7 +5314,6 @@ _e_border_cb_mouse_move(void *data, int type, void *event)
|
||||||
|
|
||||||
e_drag_resize(drag, w, h);
|
e_drag_resize(drag, w, h);
|
||||||
e_drag_start(drag, bd->drag.x, bd->drag.y);
|
e_drag_start(drag, bd->drag.x, bd->drag.y);
|
||||||
e_util_evas_fake_mouse_up_later(bd->bg_evas, 1);
|
|
||||||
}
|
}
|
||||||
bd->drag.start = 0;
|
bd->drag.start = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -545,7 +545,6 @@ _e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
e_menu_activate_mouse(sd->popup, e_util_zone_current_get(man),
|
e_menu_activate_mouse(sd->popup, e_util_zone_current_get(man),
|
||||||
x, y, 1, 1,
|
x, y, 1, 1,
|
||||||
E_MENU_POP_DIRECTION_DOWN, event->timestamp);
|
E_MENU_POP_DIRECTION_DOWN, event->timestamp);
|
||||||
e_util_evas_fake_mouse_up_later(e, event->button);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_ECORE_IMF
|
#ifdef HAVE_ECORE_IMF
|
||||||
|
|
|
@ -291,7 +291,7 @@ _e_exec_cb_exit(void *data, int type, void *event)
|
||||||
|
|
||||||
ev = event;
|
ev = event;
|
||||||
if (!ev->exe) return 1;
|
if (!ev->exe) return 1;
|
||||||
if (ecore_exe_tag_get(ev->exe)) printf(" tag %s\n", ecore_exe_tag_get(ev->exe));
|
// if (ecore_exe_tag_get(ev->exe)) printf(" tag %s\n", ecore_exe_tag_get(ev->exe));
|
||||||
if (!(ecore_exe_tag_get(ev->exe) &&
|
if (!(ecore_exe_tag_get(ev->exe) &&
|
||||||
(!strcmp(ecore_exe_tag_get(ev->exe), "E/exec")))) return 1;
|
(!strcmp(ecore_exe_tag_get(ev->exe), "E/exec")))) return 1;
|
||||||
inst = ecore_exe_data_get(ev->exe);
|
inst = ecore_exe_data_get(ev->exe);
|
||||||
|
|
|
@ -5177,8 +5177,6 @@ _e_fm2_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf
|
||||||
{
|
{
|
||||||
if (!ic->selected) _e_fm2_mouse_1_handler(ic, 0, ev->modifiers);
|
if (!ic->selected) _e_fm2_mouse_1_handler(ic, 0, ev->modifiers);
|
||||||
_e_fm2_icon_menu(ic, ic->sd->obj, ev->timestamp);
|
_e_fm2_icon_menu(ic, ic->sd->obj, ev->timestamp);
|
||||||
e_util_evas_fake_mouse_up_later(evas_object_evas_get(ic->sd->obj),
|
|
||||||
ev->button);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5432,8 +5430,6 @@ _e_fm2_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_inf
|
||||||
e_drag_xdnd_start(d,
|
e_drag_xdnd_start(d,
|
||||||
ic->drag.x + ic->x + ic->sd->x - ic->sd->pos.x,
|
ic->drag.x + ic->x + ic->sd->x - ic->sd->pos.x,
|
||||||
ic->drag.y + ic->y + ic->sd->y - ic->sd->pos.y);
|
ic->drag.y + ic->y + ic->sd->y - ic->sd->pos.y);
|
||||||
e_util_evas_fake_mouse_up_later(evas_object_evas_get(ic->sd->obj),
|
|
||||||
1);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5708,8 +5704,6 @@ _e_fm2_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
else if (ev->button == 3)
|
else if (ev->button == 3)
|
||||||
{
|
{
|
||||||
_e_fm2_menu(sd->obj, ev->timestamp);
|
_e_fm2_menu(sd->obj, ev->timestamp);
|
||||||
e_util_evas_fake_mouse_up_later(evas_object_evas_get(sd->obj),
|
|
||||||
ev->button);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@ e_fm2_hal_storage_add(E_Storage *s)
|
||||||
|
|
||||||
s->validated = 1;
|
s->validated = 1;
|
||||||
_e_stores = evas_list_append(_e_stores, s);
|
_e_stores = evas_list_append(_e_stores, s);
|
||||||
|
/*
|
||||||
printf("STO+\n"
|
printf("STO+\n"
|
||||||
" udi: %s\n"
|
" udi: %s\n"
|
||||||
" bus: %s\n"
|
" bus: %s\n"
|
||||||
|
@ -52,7 +53,7 @@ e_fm2_hal_storage_add(E_Storage *s)
|
||||||
s->media_check_enabled,
|
s->media_check_enabled,
|
||||||
s->icon.drive,
|
s->icon.drive,
|
||||||
s->icon.volume);
|
s->icon.volume);
|
||||||
|
*/
|
||||||
if ((s->removable == 0) &&
|
if ((s->removable == 0) &&
|
||||||
(s->media_available == 0) &&
|
(s->media_available == 0) &&
|
||||||
(s->media_size == 0) &&
|
(s->media_size == 0) &&
|
||||||
|
@ -60,7 +61,7 @@ e_fm2_hal_storage_add(E_Storage *s)
|
||||||
(s->hotpluggable == 0) &&
|
(s->hotpluggable == 0) &&
|
||||||
(s->media_check_enabled == 0))
|
(s->media_check_enabled == 0))
|
||||||
{
|
{
|
||||||
printf(" Ignore this storage\n");
|
// printf(" Ignore this storage\n");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -71,7 +72,7 @@ e_fm2_hal_storage_add(E_Storage *s)
|
||||||
EAPI void
|
EAPI void
|
||||||
e_fm2_hal_storage_del(E_Storage *s)
|
e_fm2_hal_storage_del(E_Storage *s)
|
||||||
{
|
{
|
||||||
printf("STO- %s\n", s->udi);
|
// printf("STO- %s\n", s->udi);
|
||||||
_e_stores = evas_list_remove(_e_stores, s);
|
_e_stores = evas_list_remove(_e_stores, s);
|
||||||
_e_storage_free(s);
|
_e_storage_free(s);
|
||||||
}
|
}
|
||||||
|
@ -102,6 +103,7 @@ e_fm2_hal_volume_add(E_Volume *v)
|
||||||
|
|
||||||
v->validated = 1;
|
v->validated = 1;
|
||||||
_e_vols = evas_list_append(_e_vols, v);
|
_e_vols = evas_list_append(_e_vols, v);
|
||||||
|
/*
|
||||||
printf("VOL+\n"
|
printf("VOL+\n"
|
||||||
" udi: %s\n"
|
" udi: %s\n"
|
||||||
" uuid: %s\n"
|
" uuid: %s\n"
|
||||||
|
@ -126,7 +128,7 @@ e_fm2_hal_volume_add(E_Volume *v)
|
||||||
v->mounted,
|
v->mounted,
|
||||||
v->mount_point,
|
v->mount_point,
|
||||||
v->parent);
|
v->parent);
|
||||||
|
*/
|
||||||
if ((!v->mount_point) || (v->mount_point[0] == 0))
|
if ((!v->mount_point) || (v->mount_point[0] == 0))
|
||||||
{
|
{
|
||||||
if (v->mount_point) free(v->mount_point);
|
if (v->mount_point) free(v->mount_point);
|
||||||
|
@ -172,7 +174,7 @@ e_fm2_hal_volume_add(E_Volume *v)
|
||||||
EAPI void
|
EAPI void
|
||||||
e_fm2_hal_volume_del(E_Volume *v)
|
e_fm2_hal_volume_del(E_Volume *v)
|
||||||
{
|
{
|
||||||
printf("VOL- %s\n", v->udi);
|
// printf("VOL- %s\n", v->udi);
|
||||||
if (v->storage)
|
if (v->storage)
|
||||||
v->storage->volumes = evas_list_remove(v->storage->volumes, v);
|
v->storage->volumes = evas_list_remove(v->storage->volumes, v);
|
||||||
_e_vols = evas_list_remove(_e_vols, v);
|
_e_vols = evas_list_remove(_e_vols, v);
|
||||||
|
@ -195,7 +197,7 @@ _e_fm2_volume_write(E_Volume *v)
|
||||||
|
|
||||||
if (!v->storage) return;
|
if (!v->storage) return;
|
||||||
id = ecore_file_file_get(v->storage->udi);
|
id = ecore_file_file_get(v->storage->udi);
|
||||||
printf("vol write %s\n", id);
|
// printf("vol write %s\n", id);
|
||||||
snprintf(buf, sizeof(buf) - 1, "%s/.e/e/fileman/favorites/|%s_%d.desktop",
|
snprintf(buf, sizeof(buf) - 1, "%s/.e/e/fileman/favorites/|%s_%d.desktop",
|
||||||
e_user_homedir_get(), id, v->partition_number);
|
e_user_homedir_get(), id, v->partition_number);
|
||||||
|
|
||||||
|
@ -358,7 +360,7 @@ e_fm2_hal_volume_mountpoint_get(E_Volume *v)
|
||||||
if (!v) return NULL;
|
if (!v) return NULL;
|
||||||
if (v->mount_point)
|
if (v->mount_point)
|
||||||
{
|
{
|
||||||
printf("GET MOUNTPOINT = %s\n", v->mount_point);
|
// printf("GET MOUNTPOINT = %s\n", v->mount_point);
|
||||||
return strdup(v->mount_point);
|
return strdup(v->mount_point);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -373,7 +375,7 @@ e_fm2_hal_volume_mountpoint_get(E_Volume *v)
|
||||||
static int mount_count = 1;
|
static int mount_count = 1;
|
||||||
snprintf(buf, sizeof(buf) - 1, "/media/unknown-%i", mount_count++);
|
snprintf(buf, sizeof(buf) - 1, "/media/unknown-%i", mount_count++);
|
||||||
}
|
}
|
||||||
printf("GET MOUNTPOINT = %s\n", buf);
|
// printf("GET MOUNTPOINT = %s\n", buf);
|
||||||
return strdup(buf);
|
return strdup(buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -388,7 +390,7 @@ e_fm2_hal_mount_add(E_Volume *v, const char *mountpoint)
|
||||||
for (l = v->mounts; l; l = l->next)
|
for (l = v->mounts; l; l = l->next)
|
||||||
_e_fm2_hal_mount_ok(l->data);
|
_e_fm2_hal_mount_ok(l->data);
|
||||||
|
|
||||||
printf("MOUNT %s %s\n", v->udi, v->mount_point);
|
// printf("MOUNT %s %s\n", v->udi, v->mount_point);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
|
@ -448,7 +450,7 @@ e_fm2_hal_mount(E_Volume *v,
|
||||||
|
|
||||||
v->mounts = evas_list_prepend(v->mounts, m);
|
v->mounts = evas_list_prepend(v->mounts, m);
|
||||||
|
|
||||||
printf("BEGIN MOUNT %p '%s'\n", m, v->mount_point);
|
// printf("BEGIN MOUNT %p '%s'\n", m, v->mount_point);
|
||||||
|
|
||||||
if (!v->mounted)
|
if (!v->mounted)
|
||||||
{
|
{
|
||||||
|
@ -485,7 +487,7 @@ _e_fm2_hal_mount_ok(E_Fm2_Mount *m)
|
||||||
m->timeout = NULL;
|
m->timeout = NULL;
|
||||||
}
|
}
|
||||||
if (m->mount_ok) m->mount_ok(m->data);
|
if (m->mount_ok) m->mount_ok(m->data);
|
||||||
printf("MOUNT OK '%s'\n", m->mount_point);
|
// printf("MOUNT OK '%s'\n", m->mount_point);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
|
|
@ -345,7 +345,7 @@ _e_dbus_cb_dev_all(void *user_data, void *reply_data, DBusError *error)
|
||||||
ecore_list_first_goto(ret->strings);
|
ecore_list_first_goto(ret->strings);
|
||||||
while ((device = ecore_list_next(ret->strings)))
|
while ((device = ecore_list_next(ret->strings)))
|
||||||
{
|
{
|
||||||
printf("DB INIT DEV+: %s\n", device);
|
// printf("DB INIT DEV+: %s\n", device);
|
||||||
char *udi;
|
char *udi;
|
||||||
|
|
||||||
udi = device;
|
udi = device;
|
||||||
|
@ -373,7 +373,7 @@ _e_dbus_cb_dev_store(void *user_data, void *reply_data, DBusError *error)
|
||||||
ecore_list_first_goto(ret->strings);
|
ecore_list_first_goto(ret->strings);
|
||||||
while ((device = ecore_list_next(ret->strings)))
|
while ((device = ecore_list_next(ret->strings)))
|
||||||
{
|
{
|
||||||
printf("DB STORE+: %s\n", device);
|
// printf("DB STORE+: %s\n", device);
|
||||||
e_storage_add(device);
|
e_storage_add(device);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -395,7 +395,7 @@ _e_dbus_cb_dev_vol(void *user_data, void *reply_data, DBusError *error)
|
||||||
ecore_list_first_goto(ret->strings);
|
ecore_list_first_goto(ret->strings);
|
||||||
while ((device = ecore_list_next(ret->strings)))
|
while ((device = ecore_list_next(ret->strings)))
|
||||||
{
|
{
|
||||||
printf("DB VOL+: %s\n", device);
|
// printf("DB VOL+: %s\n", device);
|
||||||
e_volume_add(device);
|
e_volume_add(device);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -414,7 +414,7 @@ _e_dbus_cb_store_is(void *user_data, void *reply_data, DBusError *error)
|
||||||
|
|
||||||
if (ret && ret->boolean)
|
if (ret && ret->boolean)
|
||||||
{
|
{
|
||||||
printf("DB STORE IS+: %s\n", udi);
|
// printf("DB STORE IS+: %s\n", udi);
|
||||||
e_storage_add(udi);
|
e_storage_add(udi);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -436,7 +436,7 @@ _e_dbus_cb_vol_is(void *user_data, void *reply_data, DBusError *error)
|
||||||
|
|
||||||
if (ret && ret->boolean)
|
if (ret && ret->boolean)
|
||||||
{
|
{
|
||||||
printf("DB VOL IS+: %s\n", udi);
|
// printf("DB VOL IS+: %s\n", udi);
|
||||||
e_volume_add(udi);
|
e_volume_add(udi);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -454,7 +454,7 @@ _e_dbus_cb_dev_add(void *data, DBusMessage *msg)
|
||||||
dbus_error_init(&err);
|
dbus_error_init(&err);
|
||||||
dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &udi, DBUS_TYPE_INVALID);
|
dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &udi, DBUS_TYPE_INVALID);
|
||||||
udi = strdup(udi);
|
udi = strdup(udi);
|
||||||
printf("DB DEV+: %s\n", udi);
|
// printf("DB DEV+: %s\n", udi);
|
||||||
ret = e_hal_device_query_capability(_e_dbus_conn, udi, "storage",
|
ret = e_hal_device_query_capability(_e_dbus_conn, udi, "storage",
|
||||||
_e_dbus_cb_store_is, strdup(udi));
|
_e_dbus_cb_store_is, strdup(udi));
|
||||||
e_hal_device_query_capability(_e_dbus_conn, udi, "volume",
|
e_hal_device_query_capability(_e_dbus_conn, udi, "volume",
|
||||||
|
@ -472,7 +472,7 @@ _e_dbus_cb_dev_del(void *data, DBusMessage *msg)
|
||||||
dbus_message_get_args(msg,
|
dbus_message_get_args(msg,
|
||||||
&err, DBUS_TYPE_STRING,
|
&err, DBUS_TYPE_STRING,
|
||||||
&udi, DBUS_TYPE_INVALID);
|
&udi, DBUS_TYPE_INVALID);
|
||||||
printf("DB DEV-: %s\n", udi);
|
// printf("DB DEV-: %s\n", udi);
|
||||||
e_storage_del(udi);
|
e_storage_del(udi);
|
||||||
e_volume_del(udi);
|
e_volume_del(udi);
|
||||||
}
|
}
|
||||||
|
@ -491,7 +491,7 @@ _e_dbus_cb_cap_add(void *data, DBusMessage *msg)
|
||||||
&capability, DBUS_TYPE_INVALID);
|
&capability, DBUS_TYPE_INVALID);
|
||||||
if (!strcmp(capability, "storage"))
|
if (!strcmp(capability, "storage"))
|
||||||
{
|
{
|
||||||
printf("DB STORE CAP+: %s\n", udi);
|
// printf("DB STORE CAP+: %s\n", udi);
|
||||||
e_storage_add(udi);
|
e_storage_add(udi);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -570,7 +570,6 @@ _e_dbus_cb_store_prop(void *data, void *reply_data, DBusError *error)
|
||||||
s->serial = e_hal_property_string_get(ret, "storage.serial", &err);
|
s->serial = e_hal_property_string_get(ret, "storage.serial", &err);
|
||||||
// if (err) goto error;
|
// if (err) goto error;
|
||||||
if (err) printf("Error getting serial for %s\n", s->udi);
|
if (err) printf("Error getting serial for %s\n", s->udi);
|
||||||
printf("S6\n");
|
|
||||||
|
|
||||||
s->removable = e_hal_property_bool_get(ret, "storage.removable", &err);
|
s->removable = e_hal_property_bool_get(ret, "storage.removable", &err);
|
||||||
|
|
||||||
|
@ -587,7 +586,7 @@ _e_dbus_cb_store_prop(void *data, void *reply_data, DBusError *error)
|
||||||
s->icon.drive = e_hal_property_string_get(ret, "storage.icon.drive", &err);
|
s->icon.drive = e_hal_property_string_get(ret, "storage.icon.drive", &err);
|
||||||
s->icon.volume = e_hal_property_string_get(ret, "storage.icon.volume", &err);
|
s->icon.volume = e_hal_property_string_get(ret, "storage.icon.volume", &err);
|
||||||
|
|
||||||
printf("++STO:\n udi: %s\n bus: %s\n drive_type: %s\n model: %s\n vendor: %s\n serial: %s\n icon.drive: %s\n icon.volume: %s\n\n", s->udi, s->bus, s->drive_type, s->model, s->vendor, s->serial, s->icon.drive, s->icon.volume);
|
// printf("++STO:\n udi: %s\n bus: %s\n drive_type: %s\n model: %s\n vendor: %s\n serial: %s\n icon.drive: %s\n icon.volume: %s\n\n", s->udi, s->bus, s->drive_type, s->model, s->vendor, s->serial, s->icon.drive, s->icon.volume);
|
||||||
s->validated = 1;
|
s->validated = 1;
|
||||||
{
|
{
|
||||||
void *msg_data;
|
void *msg_data;
|
||||||
|
@ -606,7 +605,7 @@ _e_dbus_cb_store_prop(void *data, void *reply_data, DBusError *error)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
error:
|
error:
|
||||||
printf("ERR %s\n", s->udi);
|
// printf("ERR %s\n", s->udi);
|
||||||
e_storage_del(s->udi);
|
e_storage_del(s->udi);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -637,7 +636,7 @@ e_storage_del(const char *udi)
|
||||||
if (!s) return;
|
if (!s) return;
|
||||||
if (s->validated)
|
if (s->validated)
|
||||||
{
|
{
|
||||||
printf("--STO %s\n", s->udi);
|
// printf("--STO %s\n", s->udi);
|
||||||
ecore_ipc_server_send(_e_ipc_server,
|
ecore_ipc_server_send(_e_ipc_server,
|
||||||
6/*E_IPC_DOMAIN_FM*/,
|
6/*E_IPC_DOMAIN_FM*/,
|
||||||
E_FM_OP_STORAGE_DEL,
|
E_FM_OP_STORAGE_DEL,
|
||||||
|
@ -726,9 +725,9 @@ _e_dbus_cb_vol_prop(void *data, void *reply_data, DBusError *error)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("++VOL:\n udi: %s\n uuid: %s\n fstype: %s\n size: %llu\n label: %s\n partition: %d\n partition_number: %d\n partition_label: %s\n mounted: %d\n mount_point: %s\n", v->udi, v->uuid, v->fstype, v->size, v->label, v->partition, v->partition_number, v->partition ? v->partition_label : "(not a partition)", v->mounted, v->mount_point);
|
// printf("++VOL:\n udi: %s\n uuid: %s\n fstype: %s\n size: %llu\n label: %s\n partition: %d\n partition_number: %d\n partition_label: %s\n mounted: %d\n mount_point: %s\n", v->udi, v->uuid, v->fstype, v->size, v->label, v->partition, v->partition_number, v->partition ? v->partition_label : "(not a partition)", v->mounted, v->mount_point);
|
||||||
if (s) printf(" for storage: %s\n", s->udi);
|
// if (s) printf(" for storage: %s\n", s->udi);
|
||||||
else printf(" storage unknown\n");
|
// else printf(" storage unknown\n");
|
||||||
v->validated = 1;
|
v->validated = 1;
|
||||||
{
|
{
|
||||||
void *msg_data;
|
void *msg_data;
|
||||||
|
@ -772,7 +771,7 @@ _e_dbus_cb_vol_prop_mount_modified(void *data, void *reply_data, DBusError *erro
|
||||||
v->mount_point = e_hal_property_string_get(ret, "volume.mount_point", &err);
|
v->mount_point = e_hal_property_string_get(ret, "volume.mount_point", &err);
|
||||||
if (err) printf("HAL Error : can't get volume.is_mount_point property");
|
if (err) printf("HAL Error : can't get volume.is_mount_point property");
|
||||||
|
|
||||||
printf("**VOL udi: %s mount_point: %s mounted: %d\n", v->udi, v->mount_point, v->mounted);
|
// printf("**VOL udi: %s mount_point: %s mounted: %d\n", v->udi, v->mount_point, v->mounted);
|
||||||
{
|
{
|
||||||
char *buf;
|
char *buf;
|
||||||
int size;
|
int size;
|
||||||
|
@ -806,7 +805,7 @@ e_volume_add(const char *udi)
|
||||||
if (e_volume_find(udi)) return NULL;
|
if (e_volume_find(udi)) return NULL;
|
||||||
v = calloc(1, sizeof(E_Volume));
|
v = calloc(1, sizeof(E_Volume));
|
||||||
if (!v) return NULL;
|
if (!v) return NULL;
|
||||||
printf("VOL+ %s\n", udi);
|
// printf("VOL+ %s\n", udi);
|
||||||
v->udi = strdup(udi);
|
v->udi = strdup(udi);
|
||||||
_e_vols = evas_list_append(_e_vols, v);
|
_e_vols = evas_list_append(_e_vols, v);
|
||||||
e_hal_device_get_all_properties(_e_dbus_conn, v->udi,
|
e_hal_device_get_all_properties(_e_dbus_conn, v->udi,
|
||||||
|
@ -829,7 +828,7 @@ e_volume_del(const char *udi)
|
||||||
if (v->prop_handler) e_dbus_signal_handler_del(_e_dbus_conn, v->prop_handler);
|
if (v->prop_handler) e_dbus_signal_handler_del(_e_dbus_conn, v->prop_handler);
|
||||||
if (v->validated)
|
if (v->validated)
|
||||||
{
|
{
|
||||||
printf("--VOL %s\n", v->udi);
|
// printf("--VOL %s\n", v->udi);
|
||||||
/* FIXME: send event of storage volume (disk) removed */
|
/* FIXME: send event of storage volume (disk) removed */
|
||||||
ecore_ipc_server_send(_e_ipc_server,
|
ecore_ipc_server_send(_e_ipc_server,
|
||||||
6/*E_IPC_DOMAIN_FM*/,
|
6/*E_IPC_DOMAIN_FM*/,
|
||||||
|
@ -868,7 +867,7 @@ _e_dbus_cb_vol_mounted(void *user_data, void *method_return, DBusError *error)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
v->mounted = 1;
|
v->mounted = 1;
|
||||||
printf("MOUNT: %s from %s\n", v->udi, v->mount_point);
|
// printf("MOUNT: %s from %s\n", v->udi, v->mount_point);
|
||||||
size = strlen(v->udi) + 1 + strlen(v->mount_point) + 1;
|
size = strlen(v->udi) + 1 + strlen(v->mount_point) + 1;
|
||||||
buf = alloca(size);
|
buf = alloca(size);
|
||||||
strcpy(buf, v->udi);
|
strcpy(buf, v->udi);
|
||||||
|
@ -890,7 +889,7 @@ e_volume_mount(E_Volume *v)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
mount_point = v->mount_point + 7;
|
mount_point = v->mount_point + 7;
|
||||||
printf("mount %s %s [fs type = %s]\n", v->udi, v->mount_point, v->fstype);
|
// printf("mount %s %s [fs type = %s]\n", v->udi, v->mount_point, v->fstype);
|
||||||
|
|
||||||
if ((!strcmp(v->fstype, "vfat")) || (!strcmp(v->fstype, "ntfs"))
|
if ((!strcmp(v->fstype, "vfat")) || (!strcmp(v->fstype, "ntfs"))
|
||||||
// || (!strcmp(v->fstype, "iso9660")) || (!strcmp(v->fstype, "udf"))
|
// || (!strcmp(v->fstype, "iso9660")) || (!strcmp(v->fstype, "udf"))
|
||||||
|
@ -918,7 +917,7 @@ _e_dbus_cb_vol_unmounted(void *user_data, void *method_return, DBusError *error)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
v->mounted = 0;
|
v->mounted = 0;
|
||||||
printf("UNMOUNT: %s from %s\n", v->udi, v->mount_point);
|
// printf("UNMOUNT: %s from %s\n", v->udi, v->mount_point);
|
||||||
size = strlen(v->udi) + 1 + strlen(v->mount_point) + 1;
|
size = strlen(v->udi) + 1 + strlen(v->mount_point) + 1;
|
||||||
buf = alloca(size);
|
buf = alloca(size);
|
||||||
strcpy(buf, v->udi);
|
strcpy(buf, v->udi);
|
||||||
|
@ -932,7 +931,7 @@ _e_dbus_cb_vol_unmounted(void *user_data, void *method_return, DBusError *error)
|
||||||
EAPI void
|
EAPI void
|
||||||
e_volume_unmount(E_Volume *v)
|
e_volume_unmount(E_Volume *v)
|
||||||
{
|
{
|
||||||
printf("unmount %s %s\n", v->udi, v->mount_point);
|
// printf("unmount %s %s\n", v->udi, v->mount_point);
|
||||||
e_hal_device_volume_unmount(_e_dbus_conn, v->udi, NULL,
|
e_hal_device_volume_unmount(_e_dbus_conn, v->udi, NULL,
|
||||||
_e_dbus_cb_vol_unmounted, v);
|
_e_dbus_cb_vol_unmounted, v);
|
||||||
}
|
}
|
||||||
|
@ -1337,7 +1336,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
|
||||||
break;
|
break;
|
||||||
case E_FM_OP_MONITOR_END: /* monitor dir end */
|
case E_FM_OP_MONITOR_END: /* monitor dir end */
|
||||||
{
|
{
|
||||||
printf("End listing directory: %s\n", e->data);
|
// printf("End listing directory: %s\n", e->data);
|
||||||
_e_fm_monitor_end(e->ref, e->data);
|
_e_fm_monitor_end(e->ref, e->data);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -1400,7 +1399,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
|
||||||
if (v->mount_point) free(v->mount_point);
|
if (v->mount_point) free(v->mount_point);
|
||||||
v->mount_point = strdup(mountpoint);
|
v->mount_point = strdup(mountpoint);
|
||||||
}
|
}
|
||||||
printf("REQ M\n");
|
// printf("REQ M\n");
|
||||||
e_volume_mount(v);
|
e_volume_mount(v);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1416,7 +1415,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
|
||||||
v = e_volume_find(udi);
|
v = e_volume_find(udi);
|
||||||
if (v)
|
if (v)
|
||||||
{
|
{
|
||||||
printf("REQ UM\n");
|
// printf("REQ UM\n");
|
||||||
e_volume_unmount(v);
|
e_volume_unmount(v);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1543,7 +1542,7 @@ static int _e_fm_slave_run(E_Fm_Op_Type type, const char *args, int id)
|
||||||
|
|
||||||
slave->id = id;
|
slave->id = id;
|
||||||
slave->exe = ecore_exe_pipe_run(command, ECORE_EXE_PIPE_WRITE | ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_ERROR, slave );
|
slave->exe = ecore_exe_pipe_run(command, ECORE_EXE_PIPE_WRITE | ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_ERROR, slave );
|
||||||
printf("EFM command: %s\n", command);
|
// printf("EFM command: %s\n", command);
|
||||||
|
|
||||||
evas_stringshare_del(command);
|
evas_stringshare_del(command);
|
||||||
|
|
||||||
|
@ -2089,7 +2088,7 @@ _e_fm_reorder(const char *file, const char *dst, const char *relative, int after
|
||||||
|
|
||||||
if(!file || !dst || !relative) return;
|
if(!file || !dst || !relative) return;
|
||||||
if(after != 0 && after != 1 && after != 2) return;
|
if(after != 0 && after != 1 && after != 2) return;
|
||||||
printf("%s:%s(%d) Reorder:\n\tfile = %s\n\tdst = %s\n\trelative = %s\n\tafter = %d\n", __FILE__, __FUNCTION__, __LINE__, file, dst, relative, after);
|
// printf("%s:%s(%d) Reorder:\n\tfile = %s\n\tdst = %s\n\trelative = %s\n\tafter = %d\n", __FILE__, __FUNCTION__, __LINE__, file, dst, relative, after);
|
||||||
|
|
||||||
snprintf(order, sizeof(order), "%s/.order", dst);
|
snprintf(order, sizeof(order), "%s/.order", dst);
|
||||||
if(ecore_file_exists(order))
|
if(ecore_file_exists(order))
|
||||||
|
|
|
@ -1538,7 +1538,6 @@ _e_gadcon_client_drag_begin(E_Gadcon_Client *gcc, int x, int y)
|
||||||
e_drag_start(drag, gcc->drag.x, gcc->drag.y);
|
e_drag_start(drag, gcc->drag.x, gcc->drag.y);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
e_util_evas_fake_mouse_up_later(gcc->gadcon->evas, 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -1695,7 +1694,6 @@ _e_gadcon_cb_client_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *e
|
||||||
}
|
}
|
||||||
e_menu_activate_mouse(mn, zone, cx, cy, 1, 1,
|
e_menu_activate_mouse(mn, zone, cx, cy, 1, 1,
|
||||||
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
|
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
|
||||||
e_util_evas_fake_mouse_up_later(gcc->gadcon->evas, ev->button);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2305,8 +2303,6 @@ _e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *even
|
||||||
e_util_zone_current_get(e_manager_current_get()),
|
e_util_zone_current_get(e_manager_current_get()),
|
||||||
cx + ev->output.x, cy + ev->output.y, 1, 1,
|
cx + ev->output.x, cy + ev->output.y, 1, 1,
|
||||||
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
|
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
|
||||||
e_util_evas_fake_mouse_up_later(gcc->gadcon->evas,
|
|
||||||
ev->button);
|
|
||||||
}
|
}
|
||||||
else if (ev->button == 1)
|
else if (ev->button == 1)
|
||||||
{
|
{
|
||||||
|
|
|
@ -117,13 +117,13 @@ EAPI void
|
||||||
e_init_status_set(const char *str)
|
e_init_status_set(const char *str)
|
||||||
{
|
{
|
||||||
if (!init_exe) return;
|
if (!init_exe) return;
|
||||||
printf("---STAT %p %s\n", client, str);
|
// printf("---STAT %p %s\n", client, str);
|
||||||
if (!client)
|
if (!client)
|
||||||
{
|
{
|
||||||
stats = evas_list_append(stats, evas_stringshare_add(str));
|
stats = evas_list_append(stats, evas_stringshare_add(str));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
printf("---SEND\n");
|
// printf("---SEND\n");
|
||||||
ecore_ipc_client_send(client, E_IPC_DOMAIN_INIT, 1, 0, 0, 0, (void *)str,
|
ecore_ipc_client_send(client, E_IPC_DOMAIN_INIT, 1, 0, 0, 0, (void *)str,
|
||||||
strlen(str) + 1);
|
strlen(str) + 1);
|
||||||
ecore_ipc_client_flush(client);
|
ecore_ipc_client_flush(client);
|
||||||
|
@ -135,7 +135,7 @@ e_init_done(void)
|
||||||
undone--;
|
undone--;
|
||||||
if (undone > 0) return;
|
if (undone > 0) return;
|
||||||
done = 1;
|
done = 1;
|
||||||
printf("---DONE %p\n", client);
|
// printf("---DONE %p\n", client);
|
||||||
if (!client) return;
|
if (!client) return;
|
||||||
ecore_ipc_client_send(client, E_IPC_DOMAIN_INIT, 2, 0, 0, 0, NULL, 0);
|
ecore_ipc_client_send(client, E_IPC_DOMAIN_INIT, 2, 0, 0, 0, NULL, 0);
|
||||||
ecore_ipc_client_flush(client);
|
ecore_ipc_client_flush(client);
|
||||||
|
@ -151,7 +151,7 @@ e_init_undone(void)
|
||||||
EAPI void
|
EAPI void
|
||||||
e_init_client_data(Ecore_Ipc_Event_Client_Data *e)
|
e_init_client_data(Ecore_Ipc_Event_Client_Data *e)
|
||||||
{
|
{
|
||||||
printf("---new init client\n");
|
// printf("---new init client\n");
|
||||||
if (!client) client = e->client;
|
if (!client) client = e->client;
|
||||||
if (e->minor == 1)
|
if (e->minor == 1)
|
||||||
{
|
{
|
||||||
|
@ -185,7 +185,7 @@ e_init_client_data(Ecore_Ipc_Event_Client_Data *e)
|
||||||
|
|
||||||
s = stats->data;
|
s = stats->data;
|
||||||
stats = evas_list_remove_list(stats, stats);
|
stats = evas_list_remove_list(stats, stats);
|
||||||
printf("---SPOOL %s\n", s);
|
// printf("---SPOOL %s\n", s);
|
||||||
e_init_status_set(s);
|
e_init_status_set(s);
|
||||||
evas_stringshare_del(s);
|
evas_stringshare_del(s);
|
||||||
}
|
}
|
||||||
|
@ -201,7 +201,7 @@ e_init_client_data(Ecore_Ipc_Event_Client_Data *e)
|
||||||
EAPI void
|
EAPI void
|
||||||
e_init_client_del(Ecore_Ipc_Event_Client_Del *e)
|
e_init_client_del(Ecore_Ipc_Event_Client_Del *e)
|
||||||
{
|
{
|
||||||
printf("---del init client\n");
|
// printf("---del init client\n");
|
||||||
if (e->client == client)
|
if (e->client == client)
|
||||||
{
|
{
|
||||||
Evas_List *l;
|
Evas_List *l;
|
||||||
|
|
|
@ -309,7 +309,6 @@ _e_pointer_cb_move(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event
|
||||||
if (!p->e_cursor) return;
|
if (!p->e_cursor) return;
|
||||||
edje_object_part_geometry_get(p->pointer_object, "e.swallow.hotspot",
|
edje_object_part_geometry_get(p->pointer_object, "e.swallow.hotspot",
|
||||||
&x, &y, NULL, NULL);
|
&x, &y, NULL, NULL);
|
||||||
printf("@@@@@@@@@@@@@@@@@@@@@@ HOT CHANGE -> %i %i\n", x, y);
|
|
||||||
if ((p->hot.x != x) || (p->hot.y != y))
|
if ((p->hot.x != x) || (p->hot.y != y))
|
||||||
{
|
{
|
||||||
p->hot.x = x;
|
p->hot.x = x;
|
||||||
|
@ -381,7 +380,6 @@ _e_pointer_type_set(E_Pointer *p, const char *type)
|
||||||
edje_object_part_swallow(p->pointer_object, "e.swallow.hotspot", p->hot_object);
|
edje_object_part_swallow(p->pointer_object, "e.swallow.hotspot", p->hot_object);
|
||||||
edje_object_part_geometry_get(p->pointer_object, "e.swallow.hotspot",
|
edje_object_part_geometry_get(p->pointer_object, "e.swallow.hotspot",
|
||||||
&x, &y, NULL, NULL);
|
&x, &y, NULL, NULL);
|
||||||
printf("@@@@@@@@@@@@@@@@@@@@@@ HOT @ -> %i %i\n", x, y);
|
|
||||||
if ((p->hot.x != x) || (p->hot.y != y))
|
if ((p->hot.x != x) || (p->hot.y != y))
|
||||||
{
|
{
|
||||||
p->hot.x = x;
|
p->hot.x = x;
|
||||||
|
|
|
@ -1233,7 +1233,6 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_inf
|
||||||
e_util_zone_current_get(e_manager_current_get()),
|
e_util_zone_current_get(e_manager_current_get()),
|
||||||
cx + ev->output.x, cy + ev->output.y, 1, 1,
|
cx + ev->output.x, cy + ev->output.y, 1, 1,
|
||||||
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
|
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
|
||||||
e_util_evas_fake_mouse_up_later(es->gadcon->evas, ev->button);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,6 @@ e_startup(E_Startup_Mode mode)
|
||||||
else if (mode == E_STARTUP_RESTART)
|
else if (mode == E_STARTUP_RESTART)
|
||||||
snprintf(buf, sizeof(buf), "%s/.e/e/applications/restart/.order", homedir);
|
snprintf(buf, sizeof(buf), "%s/.e/e/applications/restart/.order", homedir);
|
||||||
startup_apps = e_order_new(buf);
|
startup_apps = e_order_new(buf);
|
||||||
printf("startup_apps = %p\n", startup_apps);
|
|
||||||
if (!startup_apps) return;
|
if (!startup_apps) return;
|
||||||
start_app_pos = 0;
|
start_app_pos = 0;
|
||||||
e_init_undone();
|
e_init_undone();
|
||||||
|
|
|
@ -290,7 +290,6 @@ _e_toolbar_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_i
|
||||||
ecore_x_pointer_xy_get(zone->container->win, &x, &y);
|
ecore_x_pointer_xy_get(zone->container->win, &x, &y);
|
||||||
e_menu_activate_mouse(mn, zone, x, y, 1, 1,
|
e_menu_activate_mouse(mn, zone, x, y, 1, 1,
|
||||||
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
|
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
|
||||||
e_util_evas_fake_mouse_up_later(tbar->gadcon->evas, ev->button);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -35,43 +35,6 @@ static int _e_util_wakeup_cb(void *data);
|
||||||
static Ecore_Timer *_e_util_dummy_timer = NULL;
|
static Ecore_Timer *_e_util_dummy_timer = NULL;
|
||||||
|
|
||||||
/* externally accessible functions */
|
/* externally accessible functions */
|
||||||
EAPI void
|
|
||||||
e_util_container_fake_mouse_up_later(E_Container *con, int button)
|
|
||||||
{
|
|
||||||
E_OBJECT_CHECK(con);
|
|
||||||
E_OBJECT_TYPE_CHECK(con, E_CONTAINER_TYPE);
|
|
||||||
|
|
||||||
printf("FIXME: NO MORE CONTAINER FAKE UP! MUST REMOVE CODE\n");
|
|
||||||
e_util_evas_fake_mouse_up_later(con->bg_evas, button);
|
|
||||||
}
|
|
||||||
|
|
||||||
EAPI void
|
|
||||||
e_util_container_fake_mouse_up_all_later(E_Container *con)
|
|
||||||
{
|
|
||||||
E_OBJECT_CHECK(con);
|
|
||||||
E_OBJECT_TYPE_CHECK(con, E_CONTAINER_TYPE);
|
|
||||||
|
|
||||||
e_util_container_fake_mouse_up_later(con, 1);
|
|
||||||
e_util_container_fake_mouse_up_later(con, 2);
|
|
||||||
e_util_container_fake_mouse_up_later(con, 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
EAPI void
|
|
||||||
e_util_evas_fake_mouse_up_later(Evas *e, int button)
|
|
||||||
{
|
|
||||||
E_Util_Fake_Mouse_Up_Info *info;
|
|
||||||
|
|
||||||
printf("FIXME: NO MORE FAKE UP! MUST REMOVE CODE\n");
|
|
||||||
return;
|
|
||||||
info = calloc(1, sizeof(E_Util_Fake_Mouse_Up_Info));
|
|
||||||
if (info)
|
|
||||||
{
|
|
||||||
info->evas = e;
|
|
||||||
info->button = button;
|
|
||||||
ecore_job_add(_e_util_container_fake_mouse_up_cb, info);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
e_util_wakeup(void)
|
e_util_wakeup(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -15,9 +15,6 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
EAPI void e_util_container_fake_mouse_up_later(E_Container *con, int button);
|
|
||||||
EAPI void e_util_container_fake_mouse_up_all_later(E_Container *con);
|
|
||||||
EAPI void e_util_evas_fake_mouse_up_later(Evas *e, int button);
|
|
||||||
EAPI void e_util_wakeup(void);
|
EAPI void e_util_wakeup(void);
|
||||||
EAPI void e_util_env_set(const char *var, const char *val);
|
EAPI void e_util_env_set(const char *var, const char *val);
|
||||||
EAPI E_Zone *e_util_zone_current_get(E_Manager *man);
|
EAPI E_Zone *e_util_zone_current_get(E_Manager *man);
|
||||||
|
|
Loading…
Reference in New Issue