Skip to content

Commit

Permalink
Cleanup indentation with clang-format and changed a few variable names
Browse files Browse the repository at this point in the history
  • Loading branch information
@o9000
o9000 committed Nov 20, 2015
1 parent c0e62e2 commit 4a69378
Show file tree
Hide file tree
Showing 51 changed files with 4,161 additions and 3,805 deletions.
66 changes: 66 additions & 0 deletions .clang-format
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# works with clang-format-3.7
#
# Most controversial fields are UseTab, IndentWidth, ContinuationIndentWidth, ColumnLimit, BreakBeforeBraces

#BasedOnStyle: Google
AccessModifierOffset: 0
AlignAfterOpenBracket: true
AlignConsecutiveAssignments: false
#AlignConsecutiveDeclarations: false
AlignEscapedNewlinesLeft: true
AlignOperands: true
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: false
BinPackArguments: false
BinPackParameters: false
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Linux
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
ColumnLimit: 120
CommentPragmas: ''
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 0
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DerivePointerAlignment: false
DerivePointerBinding: false
DisableFormat: false
ForEachMacros: ['foreach']
IndentCaseLabels: false
IndentFunctionDeclarationAfterType: false
IndentWidth: 4
IndentWrappedFunctionNames: false
Language: Cpp
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
PenaltyBreakBeforeFirstCallParameter: 1000
PenaltyBreakComment: 100
PenaltyBreakFirstLessLess: 0
PenaltyBreakString: 100
PenaltyExcessCharacter: 100
PenaltyReturnTypeOnItsOwnLine: 2000
PointerAlignment: Right
SpaceAfterCStyleCast: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
TabWidth: 4
UseTab: ForIndentation
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
build
*.user
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ endif( RT_LIBRARY )
target_link_libraries( tint2 m )

add_dependencies( tint2 version )
set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -fno-strict-aliasing -pthread ${ASAN_C_FLAGS}" )
set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -Wshadow -Wpointer-arith -fno-strict-aliasing -pthread ${ASAN_C_FLAGS}" )
set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasing ${ASAN_L_FLAGS}" )

install( TARGETS tint2 DESTINATION bin )
Expand Down
136 changes: 69 additions & 67 deletions src/battery/battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
PangoFontDescription *bat1_font_desc;
PangoFontDescription *bat2_font_desc;
struct batstate battery_state;
int battery_enabled;
int battery_tooltip_enabled;
gboolean battery_enabled;
gboolean battery_tooltip_enabled;
int percentage_hide;
static timeout* battery_timeout;
static timeout *battery_timeout;

static char buf_bat_percentage[10];
static char buf_bat_time[20];
Expand All @@ -54,7 +54,7 @@ char *battery_uwheel_command;
char *battery_dwheel_command;
int battery_found;

void update_battery_tick(void* arg)
void update_battery_tick(void *arg)
{
if (!battery_enabled)
return;
Expand All @@ -64,7 +64,7 @@ void update_battery_tick(void* arg)
gboolean old_ac_connected = battery_state.ac_connected;
int16_t old_hours = battery_state.time.hours;
int8_t old_minutes = battery_state.time.minutes;

if (!battery_found) {
init_battery();
old_ac_connected = battery_state.ac_connected;
Expand All @@ -81,48 +81,44 @@ void update_battery_tick(void* arg)
tint_exec(ac_disconnected_cmd);
}

if (old_found == battery_found &&
old_percentage == battery_state.percentage &&
old_hours == battery_state.time.hours &&
old_minutes == battery_state.time.minutes) {
if (old_found == battery_found && old_percentage == battery_state.percentage &&
old_hours == battery_state.time.hours && old_minutes == battery_state.time.minutes) {
return;
}

if (battery_state.percentage < battery_low_status &&
battery_state.state == BATTERY_DISCHARGING &&
if (battery_state.percentage < battery_low_status && battery_state.state == BATTERY_DISCHARGING &&
!battery_low_cmd_sent) {
tint_exec(battery_low_cmd);
battery_low_cmd_sent = 1;
}
if (battery_state.percentage > battery_low_status &&
battery_state.state == BATTERY_CHARGING &&
if (battery_state.percentage > battery_low_status && battery_state.state == BATTERY_CHARGING &&
battery_low_cmd_sent) {
battery_low_cmd_sent = 0;
}

int i;
for (i = 0; i < nb_panel; i++) {
for (i = 0; i < num_panels; i++) {
if (!battery_found) {
if (panel1[i].battery.area.on_screen == 1) {
hide(&panel1[i].battery.area);
panel_refresh = 1;
if (panels[i].battery.area.on_screen) {
hide(&panels[i].battery.area);
panel_refresh = TRUE;
}
} else {
if (battery_state.percentage >= percentage_hide) {
if (panel1[i].battery.area.on_screen == 1) {
hide(&panel1[i].battery.area);
panel_refresh = 1;
if (panels[i].battery.area.on_screen) {
hide(&panels[i].battery.area);
panel_refresh = TRUE;
}
} else {
if (panel1[i].battery.area.on_screen == 0) {
show(&panel1[i].battery.area);
panel_refresh = 1;
if (panels[i].battery.area.on_screen == 0) {
show(&panels[i].battery.area);
panel_refresh = TRUE;
}
}
}
if (panel1[i].battery.area.on_screen == 1) {
panel1[i].battery.area.resize_needed = 1;
panel_refresh = 1;
if (panels[i].battery.area.on_screen) {
panels[i].battery.area.resize_needed = 1;
panel_refresh = TRUE;
}
}
}
Expand Down Expand Up @@ -200,13 +196,14 @@ void init_battery()
update_battery();
}

char* battery_get_tooltip(void* obj) {
char *battery_get_tooltip(void *obj)
{
return battery_os_tooltip();
}

void init_battery_panel(void *p)
{
Panel *panel = (Panel*)p;
Panel *panel = (Panel *)p;
Battery *battery = &panel->battery;

if (!battery_enabled)
Expand All @@ -217,28 +214,25 @@ void init_battery_panel(void *p)
if (!bat2_font_desc)
bat2_font_desc = pango_font_description_from_string(DEFAULT_FONT);

if (battery->area.bg == 0)
if (!battery->area.bg)
battery->area.bg = &g_array_index(backgrounds, Background, 0);

battery->area.parent = p;
battery->area.panel = p;
battery->area._draw_foreground = draw_battery;
battery->area.size_mode = LAYOUT_FIXED;
battery->area._resize = resize_battery;
battery->area.on_screen = 1;
battery->area.resize_needed = 1;
battery->area.has_mouse_over_effect = battery_lclick_command ||
battery_mclick_command ||
battery_rclick_command ||
battery_uwheel_command ||
battery_dwheel_command;
battery->area.has_mouse_press_effect = battery->area.has_mouse_over_effect;
battery->area.size_mode = LAYOUT_FIXED;
battery->area._resize = resize_battery;
battery->area.on_screen = TRUE;
battery->area.resize_needed = 1;
battery->area.has_mouse_over_effect = battery_lclick_command || battery_mclick_command || battery_rclick_command ||
battery_uwheel_command || battery_dwheel_command;
battery->area.has_mouse_press_effect = battery->area.has_mouse_over_effect;
if (battery_tooltip_enabled)
battery->area._get_tooltip_text = battery_get_tooltip;
}


int update_battery() {
int update_battery()
{
int err;

/* reset */
Expand All @@ -257,13 +251,12 @@ int update_battery() {
return err;
}


void draw_battery (void *obj, cairo_t *c)
void draw_battery(void *obj, cairo_t *c)
{
Battery *battery = obj;
PangoLayout *layout;

layout = pango_cairo_create_layout (c);
layout = pango_cairo_create_layout(c);

// draw layout
pango_layout_set_font_description(layout, bat1_font_desc);
Expand All @@ -273,10 +266,10 @@ void draw_battery (void *obj, cairo_t *c)
pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
pango_layout_set_text(layout, buf_bat_percentage, strlen(buf_bat_percentage));

cairo_set_source_rgba(c, battery->font.rgb[0], battery->font.rgb[1], battery->font.rgb[2], battery->font.alpha);
cairo_set_source_rgba(c, battery->font.rgb[0], battery->font.rgb[1], battery->font.rgb[2], battery->font.alpha);

pango_cairo_update_layout(c, layout);
draw_text(layout, c, 0, battery->bat1_posy, &battery->font, ((Panel*)battery->area.panel)->font_shadow);
draw_text(layout, c, 0, battery->bat1_posy, &battery->font, ((Panel *)battery->area.panel)->font_shadow);

pango_layout_set_font_description(layout, bat2_font_desc);
pango_layout_set_indent(layout, 0);
Expand All @@ -286,55 +279,64 @@ void draw_battery (void *obj, cairo_t *c)
pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);

pango_cairo_update_layout(c, layout);
draw_text(layout, c, 0, battery->bat2_posy, &battery->font, ((Panel*)battery->area.panel)->font_shadow);
draw_text(layout, c, 0, battery->bat2_posy, &battery->font, ((Panel *)battery->area.panel)->font_shadow);
pango_cairo_show_layout(c, layout);

g_object_unref(layout);
}


int resize_battery(void *obj)
gboolean resize_battery(void *obj)
{
Battery *battery = obj;
Panel *panel = battery->area.panel;
int bat_percentage_height, bat_percentage_width, bat_percentage_height_ink;
int bat_time_height, bat_time_width, bat_time_height_ink;
int ret = 0;

battery->area.redraw_needed = 1;
battery->area.redraw_needed = TRUE;

snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
if (battery_state.state == BATTERY_FULL) {
strcpy(buf_bat_time, "Full");
} else {
snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
}
get_text_size2(bat1_font_desc, &bat_percentage_height_ink, &bat_percentage_height, &bat_percentage_width,
panel->area.height, panel->area.width, buf_bat_percentage, strlen(buf_bat_percentage),
get_text_size2(bat1_font_desc,
&bat_percentage_height_ink,
&bat_percentage_height,
&bat_percentage_width,
panel->area.height,
panel->area.width,
buf_bat_percentage,
strlen(buf_bat_percentage),
PANGO_WRAP_WORD_CHAR,
PANGO_ELLIPSIZE_NONE);
get_text_size2(bat2_font_desc, &bat_time_height_ink, &bat_time_height, &bat_time_width,
panel->area.height, panel->area.width, buf_bat_time, strlen(buf_bat_time),
get_text_size2(bat2_font_desc,
&bat_time_height_ink,
&bat_time_height,
&bat_time_width,
panel->area.height,
panel->area.width,
buf_bat_time,
strlen(buf_bat_time),
PANGO_WRAP_WORD_CHAR,
PANGO_ELLIPSIZE_NONE);

if (panel_horizontal) {
int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
new_size += 2 * battery->area.paddingxlr + 2 * battery->area.bg->border.width;
if (new_size > battery->area.width ||
new_size < battery->area.width - 2) {
if (new_size > battery->area.width || new_size < battery->area.width - 2) {
// we try to limit the number of resize
battery->area.width = new_size;
battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height) / 2;
battery->bat2_posy = battery->bat1_posy + bat_percentage_height;
ret = 1;
}
} else {
int new_size = bat_percentage_height + bat_time_height +
(2 * (battery->area.paddingxlr + battery->area.bg->border.width));
if (new_size > battery->area.height ||
new_size < battery->area.height - 2) {
battery->area.height = new_size;
int new_size =
bat_percentage_height + bat_time_height + (2 * (battery->area.paddingxlr + battery->area.bg->border.width));
if (new_size > battery->area.height || new_size < battery->area.height - 2) {
battery->area.height = new_size;
battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height - 2) / 2;
battery->bat2_posy = battery->bat1_posy + bat_percentage_height + 2;
ret = 1;
Expand All @@ -347,19 +349,19 @@ void battery_action(int button)
{
char *command = 0;
switch (button) {
case 1:
case 1:
command = battery_lclick_command;
break;
case 2:
case 2:
command = battery_mclick_command;
break;
case 3:
case 3:
command = battery_rclick_command;
break;
case 4:
case 4:
command = battery_uwheel_command;
break;
case 5:
case 5:
command = battery_dwheel_command;
break;
}
Expand Down
Loading

0 comments on commit 4a69378

Please sign in to comment.