@@ -2,6 +2,7 @@
#include <stdlib.h>
#include <signal.h>
#include <dirent.h>
+#include <locale.h>
#include "gui.h"
#include "config-parser.h"
#include "xdg.h"
@@ -278,6 +279,7 @@ static void parse_bmpanel2_args(int argc, char **argv)
int main(int argc, char **argv)
{
+ setlocale(LC_TIME, "");
g_thread_init(0);
if (!g_thread_supported())
XDIE("bmpanel2 requires glib with thread support enabled");
bmpanel.c
@@ -48,40 +48,50 @@ static void free_clock_theme(struct clock_theme *ct)
Clock interface
**************************************************************************/
-static int create_widget_private(struct widget *w, struct config_format_entry *e,
- struct config_format_tree *tree)
+static void fill_buftime(char *buf, size_t size, struct clock_theme *ct)
{
- struct clock_widget *cw = xmallocz(sizeof(struct clock_widget));
- if (parse_clock_theme(&cw->theme, e, tree)) {
- xfree(cw);
- XWARNING("Failed to parse clock theme");
- return -1;
- }
+ time_t current_time;
+ current_time = time(0);
+ strftime(buf, size, ct->time_format, localtime(¤t_time));
+}
- /* get widget width */
+static int get_clock_width(struct widget *w, const char *bufover)
+{
+ struct clock_widget *cw = (struct clock_widget*)w->private;
int text_width = 0;
int pics_width = 0;
char buftime[128];
- struct tm tm;
- CLEAR_STRUCT(&tm);
- strftime(buftime, sizeof(buftime), cw->theme.time_format, &tm);
-
+ if (!bufover) {
+ fill_buftime(buftime, sizeof(buftime), &cw->theme);
+ bufover = buftime;
+ }
text_extents(w->panel->layout, cw->theme.font.pfd,
- buftime, &text_width, 0);
-
- /* background is drawn only if the center is here */
+ bufover, &text_width, 0);
if (cw->theme.background.center) {
pics_width += image_width(cw->theme.background.left);
pics_width += image_width(cw->theme.background.right);
}
+ return text_width + pics_width;
+}
+
+static int create_widget_private(struct widget *w, struct config_format_entry *e,
+ struct config_format_tree *tree)
+{
+ struct clock_widget *cw = xmallocz(sizeof(struct clock_widget));
+ if (parse_clock_theme(&cw->theme, e, tree)) {
+ xfree(cw);
+ XWARNING("Failed to parse clock theme");
+ return -1;
+ }
+
cw->clock_prog = parse_string_or_null("clock_prog",
&g_settings.root);
cw->mouse_button = parse_int("clock_mouse_button",
&g_settings.root, 1);
- w->width = text_width + pics_width;
w->private = cw;
+ w->width = get_clock_width(w, 0);
return 0;
}
@@ -100,10 +110,7 @@ static void draw(struct widget *w)
/* time */
char buftime[128];
- time_t current_time;
- current_time = time(0);
- strftime(buftime, sizeof(buftime), cw->theme.time_format,
- localtime(¤t_time));
+ fill_buftime(buftime, sizeof(buftime), &cw->theme);
/* drawing */
cairo_t *cr = w->panel->cr;
@@ -155,6 +162,13 @@ static void clock_tick(struct widget *w)
return;
strcpy(buflasttime, buftime);
+ int nw = get_clock_width(w, buftime);
+ if (nw != w->width) {
+ w->width = nw;
+ recalculate_widgets_sizes(w->panel);
+ return;
+ }
+
w->needs_expose = 1;
}
widget-clock.c
b08c4376df161d9b4f71b4dc69df9cd07bd3b270
nsf
no.smile.face@gmail.com
http://github.com/nsf/bmpanel2/commit/b417d0725e19f9260a9420fd4c2c9938b770ca7a
b417d0725e19f9260a9420fd4c2c9938b770ca7a
2009-11-13T05:13:56-08:00
2009-11-13T05:13:56-08:00
Enable locale and fix bug.
http://code.google.com/p/bmpanel2/issues/detail?id=13
e34a655d16cd2650f58f654f31ff1c1b49c87c09
nsf
no.smile.face@gmail.com