Cleanup indentation with clang-format and changed a few variable names
This commit is contained in:
o9000
152
src/panel.h
152
src/panel.h
@@ -26,72 +26,78 @@
|
||||
#include "battery.h"
|
||||
#endif
|
||||
|
||||
|
||||
extern int signal_pending;
|
||||
// --------------------------------------------------
|
||||
// mouse events
|
||||
extern int mouse_left;
|
||||
extern int mouse_middle;
|
||||
extern int mouse_right;
|
||||
extern int mouse_scroll_up;
|
||||
extern int mouse_scroll_down;
|
||||
extern int mouse_tilt_left;
|
||||
extern int mouse_tilt_right;
|
||||
extern MouseAction mouse_left;
|
||||
extern MouseAction mouse_middle;
|
||||
extern MouseAction mouse_right;
|
||||
extern MouseAction mouse_scroll_up;
|
||||
extern MouseAction mouse_scroll_down;
|
||||
extern MouseAction mouse_tilt_left;
|
||||
extern MouseAction mouse_tilt_right;
|
||||
|
||||
//panel mode
|
||||
enum { SINGLE_DESKTOP=0, MULTI_DESKTOP };
|
||||
enum { BOTTOM_LAYER, NORMAL_LAYER, TOP_LAYER };
|
||||
extern int panel_mode;
|
||||
extern int wm_menu;
|
||||
extern int panel_dock;
|
||||
extern int panel_layer;
|
||||
// panel mode
|
||||
typedef enum TaskbarMode {
|
||||
SINGLE_DESKTOP = 0,
|
||||
MULTI_DESKTOP,
|
||||
} TaskbarMode;
|
||||
|
||||
typedef enum Layer {
|
||||
BOTTOM_LAYER,
|
||||
NORMAL_LAYER,
|
||||
TOP_LAYER,
|
||||
} Layer;
|
||||
|
||||
// panel position
|
||||
typedef enum PanelPosition {
|
||||
LEFT = 0x01,
|
||||
RIGHT = 0x02,
|
||||
CENTER = 0X04,
|
||||
TOP = 0X08,
|
||||
BOTTOM = 0x10,
|
||||
} PanelPosition;
|
||||
|
||||
typedef enum Strut {
|
||||
STRUT_MINIMUM,
|
||||
STRUT_FOLLOW_SIZE,
|
||||
STRUT_NONE,
|
||||
} Strut;
|
||||
|
||||
extern TaskbarMode taskbar_mode;
|
||||
extern gboolean wm_menu;
|
||||
extern gboolean panel_dock;
|
||||
extern Layer panel_layer;
|
||||
extern char *panel_window_name;
|
||||
|
||||
//panel position
|
||||
enum { LEFT=0x01, RIGHT=0x02, CENTER=0X04, TOP=0X08, BOTTOM=0x10 };
|
||||
extern int panel_position;
|
||||
extern int panel_horizontal;
|
||||
|
||||
extern int panel_refresh;
|
||||
extern int task_dragged;
|
||||
|
||||
//panel autohide
|
||||
enum { STRUT_MINIMUM, STRUT_FOLLOW_SIZE, STRUT_NONE };
|
||||
extern int panel_autohide;
|
||||
extern PanelPosition panel_position;
|
||||
extern gboolean panel_horizontal;
|
||||
extern gboolean panel_refresh;
|
||||
extern gboolean task_dragged;
|
||||
extern gboolean panel_autohide;
|
||||
extern int panel_autohide_show_timeout;
|
||||
extern int panel_autohide_hide_timeout;
|
||||
extern int panel_autohide_height; // for vertical panels this is of course the width
|
||||
extern int panel_strut_policy;
|
||||
extern int panel_autohide_height; // for vertical panels this is of course the width
|
||||
extern Strut panel_strut_policy;
|
||||
extern char *panel_items_order;
|
||||
|
||||
extern int max_tick_urgent;
|
||||
|
||||
extern GArray* backgrounds;
|
||||
|
||||
extern int max_tick_urgent;
|
||||
extern GArray *backgrounds;
|
||||
extern Imlib_Image default_icon;
|
||||
// TODO maybe this should be a config option
|
||||
#define DEFAULT_FONT "sans 10"
|
||||
|
||||
|
||||
// tint2 use one panel per monitor and one taskbar per desktop.
|
||||
typedef struct {
|
||||
// always start with area
|
||||
// area.list own all objects of the panel according to config file
|
||||
typedef struct Panel {
|
||||
Area area;
|
||||
|
||||
// --------------------------------------------------
|
||||
// panel
|
||||
Window main_win;
|
||||
Pixmap temp_pmap;
|
||||
|
||||
// position relative to root window
|
||||
int posx, posy;
|
||||
int marginx, marginy;
|
||||
int pourcentx, pourcenty;
|
||||
// location of the panel (monitor number)
|
||||
int fractional_width, fractional_height;
|
||||
int monitor;
|
||||
int font_shadow;
|
||||
int mouse_effects;
|
||||
gboolean mouse_effects;
|
||||
// Mouse effects for icons
|
||||
int mouse_over_alpha;
|
||||
int mouse_over_saturation;
|
||||
@@ -100,46 +106,34 @@ typedef struct {
|
||||
int mouse_pressed_saturation;
|
||||
int mouse_pressed_brightness;
|
||||
|
||||
// --------------------------------------------------
|
||||
// task and taskbar parameter per panel
|
||||
Global_taskbar g_taskbar;
|
||||
Global_task g_task;
|
||||
// Per-panel parameters and states for Taskbar and Task
|
||||
GlobalTaskbar g_taskbar;
|
||||
GlobalTask g_task;
|
||||
|
||||
// --------------------------------------------------
|
||||
// taskbar point to the first taskbar in panel.area.list.
|
||||
// number of tasbar == nb_desktop. taskbar[i] is for desktop(i).
|
||||
// taskbar[i] is used to loop over taskbar,
|
||||
// while panel->area.list is used to loop over all panel's objects
|
||||
// Array of Taskbar, with num_desktops items
|
||||
Taskbar *taskbar;
|
||||
int nb_desktop;
|
||||
int num_desktops;
|
||||
PangoFontDescription *taskbarname_font_desc;
|
||||
|
||||
// --------------------------------------------------
|
||||
// clock
|
||||
Clock clock;
|
||||
|
||||
// --------------------------------------------------
|
||||
// battery
|
||||
#ifdef ENABLE_BATTERY
|
||||
Battery battery;
|
||||
#endif
|
||||
|
||||
Launcher launcher;
|
||||
|
||||
FreeSpace freespace;
|
||||
|
||||
// autohide
|
||||
int is_hidden;
|
||||
// Autohide
|
||||
gboolean is_hidden;
|
||||
int hidden_width, hidden_height;
|
||||
Pixmap hidden_pixmap;
|
||||
timeout* autohide_timeout;
|
||||
timeout *autohide_timeout;
|
||||
} Panel;
|
||||
|
||||
|
||||
extern Panel panel_config;
|
||||
extern Panel *panel1;
|
||||
extern int nb_panel;
|
||||
|
||||
extern Panel *panels;
|
||||
extern int num_panels;
|
||||
|
||||
// default global data
|
||||
void default_panel();
|
||||
@@ -152,7 +146,7 @@ void cleanup_panel();
|
||||
void init_panel();
|
||||
|
||||
void init_panel_size_and_position(Panel *panel);
|
||||
int resize_panel(void *obj);
|
||||
gboolean resize_panel(void *obj);
|
||||
void render_panel(Panel *panel);
|
||||
|
||||
void set_panel_items_order(Panel *p);
|
||||
@@ -164,22 +158,22 @@ void set_panel_background(Panel *p);
|
||||
// detect witch panel
|
||||
Panel *get_panel(Window win);
|
||||
|
||||
Taskbar *click_taskbar (Panel *panel, int x, int y);
|
||||
Task *click_task (Panel *panel, int x, int y);
|
||||
Launcher *click_launcher (Panel *panel, int x, int y);
|
||||
LauncherIcon *click_launcher_icon (Panel *panel, int x, int y);
|
||||
int click_padding(Panel *panel, int x, int y);
|
||||
int click_clock(Panel *panel, int x, int y);
|
||||
Taskbar *click_taskbar(Panel *panel, int x, int y);
|
||||
Task *click_task(Panel *panel, int x, int y);
|
||||
Launcher *click_launcher(Panel *panel, int x, int y);
|
||||
LauncherIcon *click_launcher_icon(Panel *panel, int x, int y);
|
||||
gboolean click_padding(Panel *panel, int x, int y);
|
||||
gboolean click_clock(Panel *panel, int x, int y);
|
||||
|
||||
#ifdef ENABLE_BATTERY
|
||||
int click_battery(Panel *panel, int x, int y);
|
||||
gboolean click_battery(Panel *panel, int x, int y);
|
||||
#endif
|
||||
|
||||
Area* click_area(Panel *panel, int x, int y);
|
||||
Area *click_area(Panel *panel, int x, int y);
|
||||
|
||||
void autohide_show(void* p);
|
||||
void autohide_hide(void* p);
|
||||
void autohide_trigger_show(Panel* p);
|
||||
void autohide_trigger_hide(Panel* p);
|
||||
void autohide_show(void *p);
|
||||
void autohide_hide(void *p);
|
||||
void autohide_trigger_show(Panel *p);
|
||||
void autohide_trigger_hide(Panel *p);
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user