enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

Copy ibar code to ibox, doesn't work yet. 

SVN revision: 14765
This commit is contained in:
sebastid 2005-05-13 21:19:04 +00:00 committed by sebastid
parent 138ecfaca9
commit cfaf7ea3ba
8 changed files with 418 additions and 828 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@ -214,6 +214,7 @@ src/modules/pager/Makefile
src/modules/battery/Makefile src/modules/battery/Makefile
src/modules/temperature/Makefile src/modules/temperature/Makefile
src/modules/cpufreq/Makefile src/modules/cpufreq/Makefile
src/modules/ibox/Makefile
data/Makefile data/Makefile
data/fonts/Makefile data/fonts/Makefile
data/images/Makefile data/images/Makefile

3
data/themes/Makefile.am
View File

@ -26,7 +26,8 @@ default_resize.edc \
default_move.edc \ default_move.edc \
default_temperature.edc \ default_temperature.edc \
default_error.edc \ default_error.edc \
default_cpufreq.edc default_cpufreq.edc \
default_ibox.edc
default.edj: Makefile $(EXTRA_DIST) default.edj: Makefile $(EXTRA_DIST)
$(EDJE_CC) $(EDJE_FLAGS) \ $(EDJE_CC) $(EDJE_FLAGS) \

1
data/themes/default.edc
View File

@ -36,5 +36,6 @@ collections {
#include "default_temperature.edc" #include "default_temperature.edc"
#include "default_error.edc" #include "default_error.edc"
#include "default_cpufreq.edc" #include "default_cpufreq.edc"
#include "default_ibox.edc"
} }

2
src/bin/e_border.h
View File

@ -190,7 +190,7 @@ struct _E_Border
unsigned char need_shape_export : 1; unsigned char need_shape_export : 1;
unsigned char fullscreen : 1; unsigned char fullscreen : 1;
unsigned char already_unparented : 1; unsigned char already_unparented : 1;
unsigned char changed : 1; unsigned char changed : 1;
unsigned char ignore_first_unmap; unsigned char ignore_first_unmap;

3
src/modules/Makefile.am
View File

@ -7,4 +7,5 @@ clock \
pager \ pager \
battery \ battery \
temperature \ temperature \
cpufreq cpufreq \
ibox

2
src/modules/ibar/Makefile.am
View File

@ -1,5 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
MODULE = ibar MODULE = ibox
# data files for the module # data files for the module
filesdir = $(libdir)/enlightenment/modules/$(MODULE) filesdir = $(libdir)/enlightenment/modules/$(MODULE)

1185
src/modules/ibar/e_mod_main.c
View File

File diff suppressed because it is too large Load Diff

49
src/modules/ibar/e_mod_main.h
View File

@ -5,33 +5,31 @@
#define E_MOD_MAIN_H #define E_MOD_MAIN_H
typedef struct _Config Config; typedef struct _Config Config;
typedef struct _Config_Bar Config_Bar; typedef struct _Config_Box Config_Box;
typedef struct _IBar IBar; typedef struct _IBox IBox;
typedef struct _IBar_Bar IBar_Bar; typedef struct _IBox_Box IBox_Box;
typedef struct _IBar_Icon IBar_Icon; typedef struct _IBox_Icon IBox_Icon;
#define IBAR_WIDTH_AUTO -1 #define IBOX_WIDTH_AUTO -1
#define IBAR_WIDTH_FIXED -2 #define IBOX_WIDTH_FIXED -2
struct _Config struct _Config
{ {
char *appdir;
double follow_speed; double follow_speed;
double autoscroll_speed; double autoscroll_speed;
int iconsize; int iconsize;
int width; int width;
Evas_List *bars; Evas_List *boxes;
}; };
struct _Config_Bar struct _Config_Box
{ {
unsigned char enabled; unsigned char enabled;
}; };
struct _IBar struct _IBox
{ {
E_App *apps; Evas_List *boxes;
Evas_List *bars;
E_Menu *config_menu; E_Menu *config_menu;
E_Menu *config_menu_options; E_Menu *config_menu_options;
E_Menu *config_menu_size; E_Menu *config_menu_size;
@ -39,20 +37,22 @@ struct _IBar
Config *conf; Config *conf;
}; };
struct _IBar_Bar struct _IBox_Box
{ {
IBar *ibar; IBox *ibox;
E_Container *con; E_Container *con;
Evas *evas; Evas *evas;
E_Menu *menu; E_Menu *menu;
Evas_Object *bar_object;
Evas_Object *overlay_object;
Evas_Object *box_object; Evas_Object *box_object;
Evas_Object *overlay_object;
Evas_Object *item_object;
Evas_Object *event_object; Evas_Object *event_object;
Evas_Object *drag_object;
Evas_List *icons; Evas_List *icons;
Ecore_Event_Handler *ev_handler_border_iconify;
Ecore_Event_Handler *ev_handler_border_uniconify;
double align, align_req; double align, align_req;
double follow, follow_req; double follow, follow_req;
@ -63,24 +63,21 @@ struct _IBar_Bar
struct { struct {
Evas_Coord l, r, t, b; Evas_Coord l, r, t, b;
} inset; } inset;
E_Gadman_Client *gmc; E_Gadman_Client *gmc;
Config_Bar *conf; Config_Box *conf;
E_Drop_Handler *drop_handler;
}; };
struct _IBar_Icon struct _IBox_Icon
{ {
IBar_Bar *ibb; IBox_Box *ibb;
E_App *app; E_Border *border;
Evas_Object *bg_object; Evas_Object *bg_object;
Evas_Object *overlay_object; Evas_Object *overlay_object;
Evas_Object *icon_object; Evas_Object *icon_object;
Evas_Object *event_object; Evas_Object *event_object;
Evas_List *extra_icons;
unsigned char raise_on_hilight : 1; unsigned char raise_on_hilight : 1;
}; };