Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed indentation inconsistency by dmitry

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@193 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
lorthiois@bbsoft.fr
2009-09-20 20:48:00 +00:00
parent a4ccce2cd3
commit a3177fadd9
8 changed files with 111 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/battery/battery.h
View File

@@ -18,12 +18,12 @@
#include "area.h" #include "area.h"
typedef struct Battery { typedef struct Battery {
// always start with area // always start with area
Area area; Area area;
config_color font; config_color font;
int bat1_posy; int bat1_posy;
int bat2_posy; int bat2_posy;
} Battery; } Battery;
enum chargestate { enum chargestate {

10
src/clock/clock.h
View File

@@ -15,12 +15,12 @@
typedef struct Clock { typedef struct Clock {
// always start with area // always start with area
Area area; Area area;
config_color font; config_color font;
int time1_posy; int time1_posy;
int time2_posy; int time2_posy;
} Clock; } Clock;

46
src/panel.h
View File

@@ -58,39 +58,39 @@ extern Imlib_Image default_icon;
typedef struct { typedef struct {
// always start with area // always start with area
// area.list own all objects of the panel according to config file // area.list own all objects of the panel according to config file
Area area; Area area;
// -------------------------------------------------- // --------------------------------------------------
// panel // panel
Window main_win; Window main_win;
Pixmap temp_pmap; Pixmap temp_pmap;
// position relative to root window // position relative to root window
int posx, posy; int posx, posy;
int marginx, marginy; int marginx, marginy;
float initial_width, initial_height; float initial_width, initial_height;
int pourcentx, pourcenty; int pourcentx, pourcenty;
// location of the panel (monitor number) // location of the panel (monitor number)
int monitor; int monitor;
// -------------------------------------------------- // --------------------------------------------------
// task and taskbar parameter per panel // task and taskbar parameter per panel
Area g_taskbar; Area g_taskbar;
Global_task g_task; Global_task g_task;
// -------------------------------------------------- // --------------------------------------------------
// taskbar point to the first taskbar in panel.area.list. // taskbar point to the first taskbar in panel.area.list.
// number of tasbar == nb_desktop // number of tasbar == nb_desktop
// taskbar[i] is used to loop over taskbar, // taskbar[i] is used to loop over taskbar,
// while panel->area.list is used to loop over all panel's objects // while panel->area.list is used to loop over all panel's objects
Taskbar *taskbar; Taskbar *taskbar;
int nb_desktop; int nb_desktop;
// -------------------------------------------------- // --------------------------------------------------
// clock // clock
Clock clock; Clock clock;
// -------------------------------------------------- // --------------------------------------------------
// battery // battery

10
src/systray/systraybar.h
View File

@@ -20,8 +20,8 @@
typedef struct { typedef struct {
// always start with area // always start with area
Area area; Area area;
GSList *list_icons; GSList *list_icons;
int sort; int sort;
@@ -30,9 +30,9 @@ typedef struct {
typedef struct typedef struct
{ {
Window id; Window id;
int x, y; int x, y;
int width, height; int width, height;
int hide; int hide;
} TrayWindow; } TrayWindow;

14
src/taskbar/taskbar.h
View File

@@ -12,15 +12,15 @@
typedef struct { typedef struct {
// always start with area // always start with area
Area area; Area area;
int desktop; int desktop;
// task parameters // task parameters
int task_width; int task_width;
int task_modulo; int task_modulo;
int text_width; int text_width;
} Taskbar; } Taskbar;

56
src/tint2conf/main.c
View File

@@ -69,34 +69,34 @@ static void loadDir();
// define menubar and toolbar // define menubar and toolbar
static const char *fallback_ui_file = static const char *fallback_ui_file =
"<ui>" "<ui>"
" <menubar name='MenuBar'>" " <menubar name='MenuBar'>"
" <menu action='ThemeMenu'>" " <menu action='ThemeMenu'>"
" <menuitem action='ThemeAdd'/>" " <menuitem action='ThemeAdd'/>"
" <menuitem action='ThemeSaveAs'/>" " <menuitem action='ThemeSaveAs'/>"
" <separator/>" " <separator/>"
" <menuitem action='ThemeProperties'/>" " <menuitem action='ThemeProperties'/>"
" <menuitem action='ThemeRename'/>" " <menuitem action='ThemeRename'/>"
" <separator/>" " <separator/>"
" <menuitem action='ThemeDelete'/>" " <menuitem action='ThemeDelete'/>"
" <separator/>" " <separator/>"
" <menuitem action='ThemeQuit'/>" " <menuitem action='ThemeQuit'/>"
" </menu>" " </menu>"
" <menu action='ViewMenu'>" " <menu action='ViewMenu'>"
" <menuitem action='ViewRefresh'/>" " <menuitem action='ViewRefresh'/>"
" <menuitem action='ViewRefreshAll'/>" " <menuitem action='ViewRefreshAll'/>"
" </menu>" " </menu>"
" <menu action='HelpMenu'>" " <menu action='HelpMenu'>"
" <menuitem action='HelpAbout'/>" " <menuitem action='HelpAbout'/>"
" </menu>" " </menu>"
" </menubar>" " </menubar>"
" <toolbar name='ToolBar'>" " <toolbar name='ToolBar'>"
" <toolitem action='ViewRefreshAll'/>" " <toolitem action='ViewRefreshAll'/>"
" <separator/>" " <separator/>"
" <toolitem action='ThemeProperties'/>" " <toolitem action='ThemeProperties'/>"
" <toolitem action='ViewApply'/>" " <toolitem action='ViewApply'/>"
" </toolbar>" " </toolbar>"
"</ui>"; "</ui>";
// define menubar and toolbar action // define menubar and toolbar action
static GtkActionEntry entries[] = { static GtkActionEntry entries[] = {

64
src/util/area.h
View File

@@ -27,58 +27,58 @@
typedef struct typedef struct
{ {
double color[3]; double color[3];
double alpha; double alpha;
int width; int width;
int rounded; int rounded;
} Border; } Border;
typedef struct typedef struct
{ {
double color[3]; double color[3];
double alpha; double alpha;
} Color; } Color;
typedef struct typedef struct
{ {
Pixmap pmap; Pixmap pmap;
Color back; Color back;
Border border; Border border;
} Pmap; } Pmap;
typedef struct { typedef struct {
// absolute coordinate in panel // absolute coordinate in panel
int posx, posy; int posx, posy;
// width and height including border // width and height including border
int width, height; int width, height;
Pmap pix; Pmap pix;
Pmap pix_active; Pmap pix_active;
// list of child : Area object // list of child : Area object
GSList *list; GSList *list;
int on_screen; int on_screen;
// need compute position and width // need compute position and width
int resize; int resize;
// need redraw Pixmap // need redraw Pixmap
int redraw; int redraw;
int use_active, is_active; int use_active, is_active;
// paddingxlr = horizontal padding left/right // paddingxlr = horizontal padding left/right
// paddingx = horizontal padding between childs // paddingx = horizontal padding between childs
int paddingxlr, paddingx, paddingy; int paddingxlr, paddingx, paddingy;
// parent Area // parent Area
void *parent; void *parent;
// panel // panel
void *panel; void *panel;
// each object can overwrite following function // each object can overwrite following function
void (*_draw_foreground)(void *obj, cairo_t *c, int active); void (*_draw_foreground)(void *obj, cairo_t *c, int active);
void (*_resize)(void *obj); void (*_resize)(void *obj);
void (*_add_child)(void *obj); void (*_add_child)(void *obj);
int (*_remove_child)(void *obj); int (*_remove_child)(void *obj);
} Area; } Area;

12
src/util/common.h
View File

@@ -36,17 +36,17 @@ enum { NONE=0, CLOSE, TOGGLE, ICONIFY, SHADE, TOGGLE_ICONIFY, MAXIMIZE_RESTORE,
typedef struct config_border typedef struct config_border
{ {
double color[3]; double color[3];
double alpha; double alpha;
int width; int width;
int rounded; int rounded;
} config_border; } config_border;
typedef struct config_color typedef struct config_color
{ {
double color[3]; double color[3];
double alpha; double alpha;
} config_color; } config_color;