Formatting.

SVN revision: 43954
This commit is contained in:
Christopher Michael 2009-11-24 19:00:52 +00:00
parent 860630dd31
commit 9c4e3ae13e
1 changed files with 60 additions and 59 deletions

View File

@ -44,10 +44,10 @@ typedef enum _E_Gadcon_Site
#define E_GADCON_CLIENT_STYLE_PLAIN "plain" #define E_GADCON_CLIENT_STYLE_PLAIN "plain"
#define E_GADCON_CLIENT_STYLE_INSET "inset" #define E_GADCON_CLIENT_STYLE_INSET "inset"
typedef struct _E_Gadcon E_Gadcon; typedef struct _E_Gadcon E_Gadcon;
typedef struct _E_Gadcon_Client E_Gadcon_Client; typedef struct _E_Gadcon_Client E_Gadcon_Client;
typedef struct _E_Gadcon_Client_Class E_Gadcon_Client_Class; typedef struct _E_Gadcon_Client_Class E_Gadcon_Client_Class;
typedef struct _E_Gadcon_Location E_Gadcon_Location; typedef struct _E_Gadcon_Location E_Gadcon_Location;
#else #else
#ifndef E_GADCON_H #ifndef E_GADCON_H
@ -58,26 +58,26 @@ typedef struct _E_Gadcon_Location E_Gadcon_Location;
struct _E_Gadcon struct _E_Gadcon
{ {
E_Object e_obj_inherit; E_Object e_obj_inherit;
const char *name; const char *name;
int id; int id;
E_Gadcon_Layout_Policy layout_policy; E_Gadcon_Layout_Policy layout_policy;
struct struct
{ {
Evas_Object *o_parent; Evas_Object *o_parent;
const char *swallow_name; const char *swallow_name;
} edje; } edje;
Ecore_Evas *ecore_evas; Ecore_Evas *ecore_evas;
E_Zone *zone; E_Zone *zone;
E_Gadcon_Orient orient; E_Gadcon_Orient orient;
Evas *evas; Evas *evas;
Evas_Object *o_container; Evas_Object *o_container;
Eina_List *clients; Eina_List *clients;
struct struct
{ {
@ -110,19 +110,18 @@ struct _E_Gadcon
void *data; void *data;
} urgent_show; } urgent_show;
E_Config_Dialog *config_dialog; E_Config_Dialog *config_dialog;
unsigned char editing : 1; unsigned char editing : 1;
Ecore_X_Window dnd_win; Ecore_X_Window dnd_win, xdnd_win;
Ecore_X_Window xdnd_win; E_Shelf *shelf;
E_Shelf *shelf; E_Toolbar *toolbar;
E_Toolbar *toolbar; E_Gadcon_Location *location;
E_Gadcon_Location *location;
E_Drop_Handler *drop_handler; E_Drop_Handler *drop_handler;
E_Config_Gadcon *cf; E_Config_Gadcon *cf;
unsigned char instant_edit : 1; unsigned char instant_edit : 1;
}; };
#define GADCON_CLIENT_CLASS_VERSION 3 #define GADCON_CLIENT_CLASS_VERSION 3
@ -153,21 +152,22 @@ struct _E_Gadcon_Client_Class
struct _E_Gadcon_Client struct _E_Gadcon_Client
{ {
E_Object e_obj_inherit; E_Object e_obj_inherit;
E_Gadcon *gadcon; E_Gadcon *gadcon;
const char *name; const char *name;
int id; int id;
Evas_Object *o_base; Evas_Object *o_base;
Evas_Object *o_box; Evas_Object *o_box;
Evas_Object *o_frame; Evas_Object *o_frame;
Evas_Object *o_control; Evas_Object *o_control;
Evas_Object *o_event; Evas_Object *o_event;
const E_Gadcon_Client_Class *client_class; const E_Gadcon_Client_Class *client_class;
void *data; void *data;
struct struct
{ {
int pos, size, res; //gadcon int pos, size, res; //gadcon
double pos_x, pos_y, size_w, size_h; //gadman double pos_x, pos_y, size_w, size_h; //gadman
} config; } config;
struct struct
@ -180,34 +180,35 @@ struct _E_Gadcon_Client
struct struct
{ {
Evas_Coord w, h; Evas_Coord w, h;
} pad, min, aspect; } pad, min, aspect;
Ecore_Timer *scroll_timer;
Ecore_Timer *instant_edit_timer; Ecore_Timer *scroll_timer;
Ecore_Animator *scroll_animator; Ecore_Timer *instant_edit_timer;
double scroll_pos; Ecore_Animator *scroll_animator;
double scroll_wanted; double scroll_pos, scroll_wanted;
struct struct
{ {
void *data; void *data;
void (*func) (void *data); void (*func) (void *data);
} scroll_cb; } scroll_cb;
E_Menu *menu; E_Menu *menu;
const char *style; const char *style;
unsigned char autoscroll : 1; unsigned char autoscroll : 1;
unsigned char resizable : 1; unsigned char resizable : 1;
unsigned char moving : 1; unsigned char moving : 1;
unsigned char resizing : 1; unsigned char resizing : 1;
Evas_Coord dx, dy; Evas_Coord dx, dy;
struct struct
{ {
int x, y; int x, y;
} drag; } drag;
unsigned char hidden : 1; unsigned char hidden : 1;
E_Config_Gadcon_Client *cf; E_Config_Gadcon_Client *cf;
}; };
@ -295,8 +296,8 @@ EAPI void e_gadcon_urgent_show(E_Gadcon *gc);
/* site helpers */ /* site helpers */
EAPI Eina_Bool e_gadcon_site_is_shelf (E_Gadcon_Site site); EAPI Eina_Bool e_gadcon_site_is_shelf(E_Gadcon_Site site);
EAPI Eina_Bool e_gadcon_site_is_desktop (E_Gadcon_Site site); EAPI Eina_Bool e_gadcon_site_is_desktop(E_Gadcon_Site site);
EAPI Eina_Bool e_gadcon_site_is_efm_toolbar(E_Gadcon_Site site); EAPI Eina_Bool e_gadcon_site_is_efm_toolbar(E_Gadcon_Site site);
EAPI Eina_Bool e_gadcon_site_is_any_toolbar(E_Gadcon_Site site); // all toolbar sities EAPI Eina_Bool e_gadcon_site_is_any_toolbar(E_Gadcon_Site site); // all toolbar sities
@ -307,12 +308,12 @@ EAPI Eina_Bool e_gadcon_site_is_not_toolbar(E_Gadcon_Site site); // all n
EAPI E_Gadcon_Location * EAPI E_Gadcon_Location *
e_gadcon_location_new(const char * name, E_Gadcon_Site site, e_gadcon_location_new(const char * name, E_Gadcon_Site site,
int (*add_func) (void *data, const E_Gadcon_Client_Class *cc), int (*add_func) (void *data, const E_Gadcon_Client_Class *cc),
void * add_data, void *add_data,
void (*remove_func) (void *data, E_Gadcon_Client *cc), void (*remove_func) (void *data, E_Gadcon_Client *cc),
void * remove_data); void *remove_data);
EAPI void e_gadcon_location_free(E_Gadcon_Location *loc); EAPI void e_gadcon_location_free(E_Gadcon_Location *loc);
EAPI void e_gadcon_location_register (E_Gadcon_Location * loc); EAPI void e_gadcon_location_register (E_Gadcon_Location *loc);
EAPI void e_gadcon_location_unregister (E_Gadcon_Location * loc); EAPI void e_gadcon_location_unregister (E_Gadcon_Location *loc);
EAPI void e_gadcon_location_set_icon_name(E_Gadcon_Location *loc, const char *name); EAPI void e_gadcon_location_set_icon_name(E_Gadcon_Location *loc, const char *name);
EAPI void e_gadcon_client_add_location_menu(E_Gadcon_Client *gcc, E_Menu *menu); EAPI void e_gadcon_client_add_location_menu(E_Gadcon_Client *gcc, E_Menu *menu);