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

moved initial values in function default_xxx

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@423 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77
2010-04-18 12:07:36 +00:00
parent a94d75d393
commit c298a39d00
21 changed files with 243 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/clock/clock.c
View File

@@ -35,22 +35,53 @@
#include "timer.h"
char *time1_format=0;
char *time1_timezone=0;
char *time2_format=0;
char *time2_timezone=0;
char *time_tooltip_format=0;
char *time_tooltip_timezone=0;
char *clock_lclick_command=0;
char *clock_rclick_command=0;
char *time1_format;
char *time1_timezone;
char *time2_format;
char *time2_timezone;
char *time_tooltip_format;
char *time_tooltip_timezone;
char *clock_lclick_command;
char *clock_rclick_command;
struct timeval time_clock;
PangoFontDescription *time1_font_desc=0;
PangoFontDescription *time2_font_desc=0;
PangoFontDescription *time1_font_desc;
PangoFontDescription *time2_font_desc;
static char buf_time[40];
static char buf_date[40];
static char buf_tooltip[40];
int clock_enabled;
static timeout* clock_timeout=0;
static timeout* clock_timeout;
void default_clock()
{
clock_enabled = 0;
clock_timeout = 0;
time1_format = 0;
time1_timezone = 0;
time2_format = 0;
time2_timezone = 0;
time_tooltip_format = 0;
time_tooltip_timezone = 0;
clock_lclick_command = 0;
clock_rclick_command = 0;
time1_font_desc = 0;
time2_font_desc = 0;
}
void cleanup_clock()
{
if (time1_font_desc) pango_font_description_free(time1_font_desc);
if (time2_font_desc) pango_font_description_free(time2_font_desc);
if (time1_format) g_free(time1_format);
if (time2_format) g_free(time2_format);
if (time_tooltip_format) g_free(time_tooltip_format);
if (time1_timezone) g_free(time1_timezone);
if (time2_timezone) g_free(time2_timezone);
if (time_tooltip_timezone) g_free(time_tooltip_timezone);
if (clock_lclick_command) g_free(clock_lclick_command);
if (clock_rclick_command) g_free(clock_rclick_command);
}
void update_clocks_sec(void* arg)
@@ -160,52 +191,6 @@ void init_clock_panel(void *p)
}
void cleanup_clock()
{
clock_enabled = 0;
if (time1_font_desc) {
pango_font_description_free(time1_font_desc);
time1_font_desc = 0;
}
if (time2_font_desc) {
pango_font_description_free(time2_font_desc);
time2_font_desc = 0;
}
if (time1_format) {
g_free(time1_format);
time1_format = 0;
}
if (time2_format) {
g_free(time2_format);
time2_format = 0;
}
if (time_tooltip_format) {
g_free(time_tooltip_format);
time_tooltip_format = 0;
}
if (time1_timezone) {
g_free(time1_timezone);
time1_timezone = 0;
}
if (time2_timezone) {
g_free(time2_timezone);
time2_timezone = 0;
}
if (time_tooltip_timezone) {
g_free(time_tooltip_timezone);
time_tooltip_timezone = 0;
}
if (clock_lclick_command) {
g_free(clock_lclick_command);
clock_lclick_command = 0;
}
if (clock_rclick_command) {
g_free(clock_rclick_command);
clock_rclick_command = 0;
}
}
void draw_clock (void *obj, cairo_t *c)
{
Clock *clock = obj;

8
src/clock/clock.h
View File

@@ -37,13 +37,15 @@ extern char *clock_rclick_command;
extern int clock_enabled;
// default values
void default_clock();
// freed memory
void cleanup_clock();
// initialize clock : y position, precision, ...
void init_clock();
void init_clock_panel(void *panel);
// freed memory and set default values
void cleanup_clock();
void draw_clock (void *obj, cairo_t *c);
void resize_clock (void *obj);