parent
a8dea14e7f
commit
c727545bb2
|
@ -79,7 +79,6 @@ struct _E_Comp
|
|||
|
||||
E_Pixmap_Type comp_type; //for determining X/Wayland/
|
||||
|
||||
unsigned int num;
|
||||
Eina_Stringshare *name;
|
||||
struct {
|
||||
Ecore_Window win;
|
||||
|
|
|
@ -4739,7 +4739,7 @@ _e_comp_x_del(E_Comp *c)
|
|||
e_alert_composite_win(c->root, 0);
|
||||
|
||||
ecore_x_window_free(c->cm_selection);
|
||||
ecore_x_screen_is_composited_set(c->num, 0);
|
||||
ecore_x_screen_is_composited_set(0, 0);
|
||||
|
||||
eina_list_free(c->x_comp_data->retry_clients);
|
||||
ecore_timer_del(c->x_comp_data->retry_timer);
|
||||
|
@ -4998,7 +4998,7 @@ _e_comp_x_setup(Ecore_X_Window root, int w, int h)
|
|||
Eina_Bool res;
|
||||
unsigned int i;
|
||||
|
||||
res = ecore_x_screen_is_composited(e_comp->num);
|
||||
res = ecore_x_screen_is_composited(0);
|
||||
if (res)
|
||||
{
|
||||
ERR(_("Another compositor is already running on your display server."));
|
||||
|
@ -5015,7 +5015,7 @@ _e_comp_x_setup(Ecore_X_Window root, int w, int h)
|
|||
e_comp_ignore_win_add(E_PIXMAP_TYPE_X, e_comp->cm_selection);
|
||||
e_hints_init(root, e_comp->cm_selection);
|
||||
ecore_x_window_background_color_set(root, 0, 0, 0);
|
||||
ecore_x_screen_is_composited_set(e_comp->num, e_comp->cm_selection);
|
||||
ecore_x_screen_is_composited_set(0, e_comp->cm_selection);
|
||||
|
||||
e_comp->win = ecore_x_composite_render_window_enable(root);
|
||||
if (!e_comp->win)
|
||||
|
@ -5043,7 +5043,7 @@ _e_comp_x_setup(Ecore_X_Window root, int w, int h)
|
|||
}
|
||||
e_comp->depth = att.depth;
|
||||
|
||||
if (!e_comp->num) e_alert_composite_win(root, e_comp->win);
|
||||
e_alert_composite_win(root, e_comp->win);
|
||||
|
||||
if (e_comp_gl_get() && (e_comp_config_get()->engine == E_COMP_ENGINE_GL))
|
||||
{
|
||||
|
|
|
@ -432,12 +432,9 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
|
|||
const char *p1, *p2;
|
||||
char buf2[32];
|
||||
char *buf3 = NULL;
|
||||
int head;
|
||||
int head_length;
|
||||
int penv_display_length;
|
||||
|
||||
head = e_comp->num;
|
||||
|
||||
penv_display_length = strlen(penv_display);
|
||||
/* Check for insane length for DISPLAY env */
|
||||
if (penv_display_length + 32 > 4096)
|
||||
|
@ -448,7 +445,7 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
|
|||
|
||||
/* buf2 = '.%i' */
|
||||
*buf2 = '.';
|
||||
head_length = eina_convert_itoa(head, buf2 + 1) + 2;
|
||||
head_length = eina_convert_itoa(0, buf2 + 1) + 2;
|
||||
|
||||
/* set env vars */
|
||||
p1 = strrchr(penv_display, ':');
|
||||
|
|
|
@ -1629,7 +1629,7 @@ _e_main_desk_save(void)
|
|||
|
||||
EINA_LIST_FOREACH(e_comp->zones, l, zone)
|
||||
{
|
||||
snprintf(name, sizeof(name), "DESK_%d_%d", e_comp->num, zone->num);
|
||||
snprintf(name, sizeof(name), "DESK_%d_%d", 0, zone->num);
|
||||
snprintf(env, sizeof(env), "%d,%d", zone->desk_x_current, zone->desk_y_current);
|
||||
e_util_env_set(name, env);
|
||||
}
|
||||
|
@ -1648,7 +1648,7 @@ _e_main_desk_restore(void)
|
|||
E_Desk *desk;
|
||||
int desk_x, desk_y;
|
||||
|
||||
snprintf(name, sizeof(name), "DESK_%d_%d", e_comp->num, zone->num);
|
||||
snprintf(name, sizeof(name), "DESK_%d_%d", 0, zone->num);
|
||||
env = getenv(name);
|
||||
if (!env) continue;
|
||||
if (!sscanf(env, "%d,%d", &desk_x, &desk_y)) continue;
|
||||
|
|
|
@ -451,7 +451,6 @@ _e_remember_update(E_Client *ec, E_Remember *rem)
|
|||
if (rem->apply & E_REMEMBER_APPLY_ZONE)
|
||||
{
|
||||
rem->prop.zone = ec->zone->num;
|
||||
rem->prop.head = e_comp->num;
|
||||
}
|
||||
if (rem->apply & E_REMEMBER_APPLY_SKIP_WINLIST)
|
||||
rem->prop.skip_winlist = ec->user_skip_winlist;
|
||||
|
|
|
@ -340,7 +340,7 @@ e_mod_fileman_path_find(E_Zone *zone)
|
|||
Fileman_Path *path;
|
||||
|
||||
EINA_LIST_FOREACH(fileman_config->paths, l, path)
|
||||
if (path->zone == e_comp->num + zone->num) break;
|
||||
if (path->zone == zone->num) break;
|
||||
if (l && fileman_config->view.desktop_navigation) return path;
|
||||
if (l)
|
||||
{
|
||||
|
@ -350,14 +350,14 @@ e_mod_fileman_path_find(E_Zone *zone)
|
|||
else
|
||||
{
|
||||
path = E_NEW(Fileman_Path, 1);
|
||||
path->zone = e_comp->num + zone->num;
|
||||
path->zone = zone->num;
|
||||
path->dev = eina_stringshare_add("desktop");
|
||||
fileman_config->paths = eina_list_append(fileman_config->paths, path);
|
||||
path->desktop_mode = E_FM2_VIEW_MODE_CUSTOM_ICONS;
|
||||
}
|
||||
if ((e_comp->num == 0) && (zone->num == 0))
|
||||
if (zone->num == 0)
|
||||
path->path = eina_stringshare_add("/");
|
||||
else
|
||||
path->path = eina_stringshare_printf("%d", (e_comp->num + zone->num));
|
||||
path->path = eina_stringshare_printf("%d", zone->num);
|
||||
return path;
|
||||
}
|
||||
|
|
|
@ -2203,8 +2203,8 @@ _ibar_cb_sort(IBar *b1, IBar *b2)
|
|||
{
|
||||
int id1, id2;
|
||||
|
||||
id1 = z1->id + (e_comp->num * 100) + (e_comp->num * 10000);
|
||||
id2 = z2->id + (e_comp->num * 100) + (e_comp->num * 10000);
|
||||
id1 = z1->id;
|
||||
id2 = z2->id;
|
||||
return id2 - id1;
|
||||
}
|
||||
return 0;
|
||||
|
|
|
@ -17,7 +17,6 @@ _pol_conf_desk_add(Config *conf, E_Desk *desk)
|
|||
Config_Desk *d;
|
||||
|
||||
d = E_NEW(Config_Desk, 1);
|
||||
d->comp_num = e_comp->num;
|
||||
d->zone_num = desk->zone->num;
|
||||
d->x = desk->x;
|
||||
d->y = desk->y;
|
||||
|
@ -41,8 +40,7 @@ _pol_conf_desk_get(Config *conf, Config_Desk *d)
|
|||
|
||||
EINA_LIST_FOREACH(conf->desks, l, d2)
|
||||
{
|
||||
if ((d2->comp_num == d->comp_num) &&
|
||||
(d2->zone_num == d->zone_num) &&
|
||||
if ((d2->zone_num == d->zone_num) &&
|
||||
(d2->x == d->x) && (d2->y == d->y))
|
||||
{
|
||||
return d2;
|
||||
|
@ -189,7 +187,6 @@ _pol_cfd_desk_list_update(E_Config_Dialog_Data *cfdata, E_Zone *zone)
|
|||
desk = zone->desks[i];
|
||||
|
||||
d = E_NEW(Config_Desk, 1);
|
||||
d->comp_num = e_comp->num;
|
||||
d->zone_num = zone->num;
|
||||
d->x = desk->x;
|
||||
d->y = desk->y;
|
||||
|
@ -280,7 +277,6 @@ e_mod_pol_conf_init(Mod *mod)
|
|||
#undef D
|
||||
#define T Config_Desk
|
||||
#define D mod->conf_desk_edd
|
||||
E_CONFIG_VAL(D, T, comp_num, INT);
|
||||
E_CONFIG_VAL(D, T, zone_num, UINT);
|
||||
E_CONFIG_VAL(D, T, x, INT);
|
||||
E_CONFIG_VAL(D, T, y, INT);
|
||||
|
@ -337,15 +333,14 @@ e_mod_pol_conf_shutdown(Mod *mod)
|
|||
}
|
||||
|
||||
Config_Desk *
|
||||
e_mod_pol_conf_desk_get_by_nums(Config *conf, unsigned int comp_num, unsigned int zone_num, int x, int y)
|
||||
e_mod_pol_conf_desk_get_by_nums(Config *conf, unsigned int zone_num, int x, int y)
|
||||
{
|
||||
Eina_List *l;
|
||||
Config_Desk *d2;
|
||||
|
||||
EINA_LIST_FOREACH(conf->desks, l, d2)
|
||||
{
|
||||
if ((d2->comp_num == comp_num) &&
|
||||
(d2->zone_num == zone_num) &&
|
||||
if ((d2->zone_num == zone_num) &&
|
||||
(d2->x == x) && (d2->y == y))
|
||||
{
|
||||
return d2;
|
||||
|
|
|
@ -278,7 +278,6 @@ _pol_cb_zone_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
|
|||
for (i = 0; i < n; i++)
|
||||
{
|
||||
d = e_mod_pol_conf_desk_get_by_nums(_pol_mod->conf,
|
||||
e_comp->num,
|
||||
zone->num,
|
||||
zone->desks[i]->x,
|
||||
zone->desks[i]->y);
|
||||
|
@ -373,7 +372,6 @@ _pol_cb_zone_desk_count_set(void *data EINA_UNUSED, int type EINA_UNUSED, void *
|
|||
for (i = 0; i < n; i++)
|
||||
{
|
||||
d = e_mod_pol_conf_desk_get_by_nums(_pol_mod->conf,
|
||||
e_comp->num,
|
||||
zone->num,
|
||||
zone->desks[i]->x,
|
||||
zone->desks[i]->y);
|
||||
|
@ -563,7 +561,6 @@ e_modapi_init(E_Module *m)
|
|||
for (i = 0; i < n; i++)
|
||||
{
|
||||
d = e_mod_pol_conf_desk_get_by_nums(_pol_mod->conf,
|
||||
e_comp->num,
|
||||
zone->num,
|
||||
zone->desks[i]->x,
|
||||
zone->desks[i]->y);
|
||||
|
|
|
@ -54,7 +54,6 @@ struct _Config_Match
|
|||
|
||||
struct _Config_Desk
|
||||
{
|
||||
unsigned int comp_num;
|
||||
unsigned int zone_num;
|
||||
int x, y;
|
||||
int enable;
|
||||
|
@ -92,7 +91,7 @@ extern Eina_Hash *hash_pol_clients;
|
|||
|
||||
EINTERN void e_mod_pol_conf_init(Mod *mod);
|
||||
EINTERN void e_mod_pol_conf_shutdown(Mod *mod);
|
||||
EINTERN Config_Desk *e_mod_pol_conf_desk_get_by_nums(Config *conf, unsigned int comp_num, unsigned int zone_num, int x, int y);
|
||||
EINTERN Config_Desk *e_mod_pol_conf_desk_get_by_nums(Config *conf, unsigned int zone_num, int x, int y);
|
||||
EINTERN E_Config_Dialog *e_int_config_pol_mobile(Evas_Object *parent, const char *params EINA_UNUSED);
|
||||
EINTERN void e_mod_pol_desk_add(E_Desk *desk);
|
||||
EINTERN void e_mod_pol_desk_del(Pol_Desk *pd);
|
||||
|
|
|
@ -500,13 +500,6 @@ systray_edje_box_remove(const Instance *inst, Evas_Object *child)
|
|||
edje_object_part_box_remove(inst->ui.gadget, "box", child);
|
||||
}
|
||||
|
||||
int
|
||||
systray_manager_number_get(const Instance *inst)
|
||||
{
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(inst, 0);
|
||||
return inst->comp->num;
|
||||
}
|
||||
|
||||
Ecore_X_Window
|
||||
systray_root_get(const Instance *inst)
|
||||
{
|
||||
|
|
|
@ -54,7 +54,6 @@ void systray_edje_box_append(const Instance *inst, Evas_Object *child);
|
|||
void systray_edje_box_remove(const Instance *inst, Evas_Object *child);
|
||||
void systray_edje_box_prepend(const Instance *inst, Evas_Object *child);
|
||||
|
||||
int systray_manager_number_get(const Instance *inst);
|
||||
Ecore_X_Window systray_root_get(const Instance *inst);
|
||||
|
||||
Instance_Notifier_Host *systray_notifier_host_new(Instance *inst, E_Gadcon *gadcon);
|
||||
|
|
Loading…
Reference in New Issue