*
* Tint2 : clock
*
-* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
+* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2
struct timeval time_clock;
PangoFontDescription *time1_font_desc;
PangoFontDescription *time2_font_desc;
-static char buf_time[40];
-static char buf_date[40];
-static char buf_tooltip[40];
+static char buf_time[256];
+static char buf_date[256];
+static char buf_tooltip[512];
int clock_enabled;
static timeout* clock_timeout;
void init_clock()
{
- if(time1_format && clock_timeout==0) {
- if (strchr(time1_format, 'S') || strchr(time1_format, 'T') || strchr(time1_format, 'r'))
+ if((time1_format || time2_format) && clock_timeout==0) {
+ if (strchr(time1_format, 'S') || strchr(time1_format, 'T') || strchr(time1_format, 'r') ||
+ strchr(time2_format, 'S') || strchr(time2_format, 'T') || strchr(time2_format, 'r'))
clock_timeout = add_timeout(10, 1000, update_clocks_sec, 0);
else
clock_timeout = add_timeout(10, 1000, update_clocks_min, 0);
{
Panel *panel =(Panel*)p;
Clock *clock = &panel->clock;
-
+
+ if (clock->area.bg == 0)
+ clock->area.bg = &g_array_index(backgrounds, Background, 0);
clock->area.parent = p;
clock->area.panel = p;
clock->area._draw_foreground = draw_clock;
clock->area.width = new_size + 1;
clock->time1_posy = (clock->area.height - time_height) / 2;
if (time2_format) {
- clock->time1_posy -= ((date_height_ink + 2) / 2);
- clock->time2_posy = clock->time1_posy + time_height + 2 - (time_height - time_height_ink)/2 - (date_height - date_height_ink)/2;
+ clock->time1_posy -= (date_height)/2;
+ clock->time2_posy = clock->time1_posy + time_height;
}
ret = 1;
}
clock->area.height = new_size;
clock->time1_posy = (clock->area.height - time_height) / 2;
if (time2_format) {
- clock->time1_posy -= ((date_height_ink + 2) / 2);
- clock->time2_posy = clock->time1_posy + time_height + 2 - (time_height - time_height_ink)/2 - (date_height - date_height_ink)/2;
+ clock->time1_posy -= (date_height)/2;
+ clock->time2_posy = clock->time1_posy + time_height;
}
ret = 1;
}