Add illume quickpanel zone fetch to border structure.

SVN revision: 46293
devs/princeamd/enlightenment-0.17-elive
Christopher Michael 13 years ago
parent d3680c97e7
commit 4461057e7a
  1. 20
      src/bin/e_border.c
  2. 2
      src/bin/e_border.h
  3. 10
      src/bin/e_fm.h
  4. 16
      src/bin/e_zone.c

@ -471,6 +471,8 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
bd->client.illume.quickpanel.fetch.priority.major = 1;
else if (atoms[i] == ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MINOR)
bd->client.illume.quickpanel.fetch.priority.minor = 1;
else if (atoms[i] == ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ZONE)
bd->client.illume.quickpanel.fetch.zone = 1;
else if (atoms[i] == ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED)
bd->client.illume.drag.fetch.locked = 1;
else if (atoms[i] == ECORE_X_ATOM_E_ILLUME_DRAG)
@ -4526,6 +4528,11 @@ _e_border_cb_window_property(void *data, int ev_type, void *ev)
bd->client.illume.quickpanel.fetch.priority.minor = 1;
bd->changed = 1;
}
else if (e->atom == ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ZONE)
{
bd->client.illume.quickpanel.fetch.zone = 1;
bd->changed = 1;
}
else if (e->atom == ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED)
{
bd->client.illume.drag.fetch.locked = 1;
@ -6011,49 +6018,48 @@ _e_border_eval0(E_Border *bd)
bd->client.illume.conformant.conformant =
ecore_x_e_illume_conformant_get(bd->client.win);
bd->client.illume.conformant.fetch.conformant = 0;
rem_change = 1;
}
if (bd->client.illume.quickpanel.fetch.state)
{
bd->client.illume.quickpanel.state =
ecore_x_e_illume_quickpanel_state_get(bd->client.win);
bd->client.illume.quickpanel.fetch.state = 0;
rem_change = 1;
}
if (bd->client.illume.quickpanel.fetch.quickpanel)
{
bd->client.illume.quickpanel.quickpanel =
ecore_x_e_illume_quickpanel_get(bd->client.win);
bd->client.illume.quickpanel.fetch.quickpanel = 0;
rem_change = 1;
}
if (bd->client.illume.quickpanel.fetch.priority.major)
{
bd->client.illume.quickpanel.priority.major =
ecore_x_e_illume_quickpanel_priority_major_get(bd->client.win);
bd->client.illume.quickpanel.fetch.priority.major = 0;
rem_change = 1;
}
if (bd->client.illume.quickpanel.fetch.priority.minor)
{
bd->client.illume.quickpanel.priority.minor =
ecore_x_e_illume_quickpanel_priority_minor_get(bd->client.win);
bd->client.illume.quickpanel.fetch.priority.minor = 0;
rem_change = 1;
}
if (bd->client.illume.quickpanel.fetch.zone)
{
bd->client.illume.quickpanel.zone =
ecore_x_e_illume_quickpanel_zone_get(bd->client.win);
bd->client.illume.quickpanel.fetch.zone = 0;
}
if (bd->client.illume.drag.fetch.drag)
{
bd->client.illume.drag.drag =
ecore_x_e_illume_drag_get(bd->client.win);
bd->client.illume.drag.fetch.drag = 0;
rem_change = 1;
}
if (bd->client.illume.drag.fetch.locked)
{
bd->client.illume.drag.locked =
ecore_x_e_illume_drag_locked_get(bd->client.win);
bd->client.illume.drag.fetch.locked = 0;
rem_change = 1;
}
if (bd->changes.shape)
{

@ -386,6 +386,7 @@ struct _E_Border
unsigned int minor : 1;
} priority;
unsigned char quickpanel : 1;
unsigned char zone : 1;
} fetch;
Ecore_X_Illume_Quickpanel_State state;
struct
@ -394,6 +395,7 @@ struct _E_Border
unsigned int minor : 1;
} priority;
unsigned char quickpanel : 1;
int zone;
} quickpanel;
struct
{

@ -71,7 +71,7 @@ struct _E_Fm2_Config
unsigned char always_order;
unsigned char link_drop;
unsigned char fit_custom_pos;
unsigned int single_click_delay;
unsigned int single_click_delay;
} view;
/* display of icons */
struct {
@ -89,7 +89,7 @@ struct _E_Fm2_Config
/* how to sort files */
struct {
struct {
unsigned char no_case;
unsigned char no_case;
struct {
unsigned char first;
unsigned char last;
@ -98,13 +98,13 @@ struct _E_Fm2_Config
} list;
/* control how you can select files */
struct {
unsigned char single, windows_modifiers;
unsigned char single, windows_modifiers;
} selection;
/* the background - if any, and how to handle it */
/* FIXME: not implemented yet */
struct {
const char *background, *frame, *icons;
unsigned char fixed;
const char *background, *frame, *icons;
unsigned char fixed;
} theme;
};

@ -11,13 +11,13 @@ static void _e_zone_free(E_Zone *zone);
static void _e_zone_cb_bg_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
static void _e_zone_cb_bg_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info);
static void _e_zone_event_zone_desk_count_set_free(void *data, void *ev);
static int _e_zone_cb_mouse_in(void *data, int type, void *event);
static int _e_zone_cb_mouse_out(void *data, int type, void *event);
static int _e_zone_cb_mouse_down(void *data, int type, void *event);
static int _e_zone_cb_mouse_up(void *data, int type, void *event);
static int _e_zone_cb_mouse_move(void *data, int type, void *event);
static int _e_zone_cb_desk_after_show(void *data, int type, void *event);
static int _e_zone_cb_edge_timer(void *data);
static int _e_zone_cb_mouse_in(void *data, int type, void *event);
static int _e_zone_cb_mouse_out(void *data, int type, void *event);
static int _e_zone_cb_mouse_down(void *data, int type, void *event);
static int _e_zone_cb_mouse_up(void *data, int type, void *event);
static int _e_zone_cb_mouse_move(void *data, int type, void *event);
static int _e_zone_cb_desk_after_show(void *data, int type, void *event);
static int _e_zone_cb_edge_timer(void *data);
static void _e_zone_event_move_resize_free(void *data, void *ev);
static void _e_zone_event_add_free(void *data, void *ev);
static void _e_zone_event_del_free(void *data, void *ev);
@ -128,7 +128,7 @@ e_zone_new(E_Container *con, int num, int id, int x, int y, int w, int h)
evas_object_repeat_events_set(o, 1);
evas_object_show(o);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_zone_cb_bg_mouse_down, zone);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _e_zone_cb_bg_mouse_up, zone);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _e_zone_cb_bg_mouse_up, zone);
/* TODO: config the ecore_evas type. */
zone->black_ecore_evas =

Loading…
Cancel
Save