Skip to content

multiple timezones and locales for "tclock" plugin #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rpaciorek wants to merge 1 commit into
base: master
Choose a base branch
from
Open

multiple timezones and locales for "tclock" plugin #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions data/config/default.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,16 @@ Plugin {
HoursView = 24
TooltipFmt = %A %x
#Action = xmessage Please define some command &
ShowCalendar = true
# clock support multiple timezones/locale setting - switch via mouse sroll
# set number of config sets
ZoneNum = 2
# set first config set
TimeZone0 = Europe/Warsaw
Locale0 = pl_PL.UTF-8
# set next config set
TimeZone1 = UTC
Locale1 = C.UTF-8
}
}

Expand Down
80 changes: 78 additions & 2 deletions plugins/tclock/tclock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <locale.h>


#include "panel.h"
Expand Down Expand Up @@ -34,10 +35,23 @@ typedef struct {
int timer;
int show_calendar;
int show_tooltip;
int numb_of_zones;
int curr_zone;
char **timezones;
char **locales;
} tclock_priv;

static void tclock_calendar_cleanup (GtkDialog *dialog, gint code, tclock_priv *dc) {
ENTER2;

gtk_widget_destroy(dc->calendar_window);
dc->calendar_window = NULL;

RET();
}

static GtkWidget *
tclock_create_calendar(void)
tclock_create_calendar(tclock_priv *dc)
{
GtkWidget *calendar, *win;

Expand All @@ -52,13 +66,24 @@ tclock_create_calendar(void)
gtk_window_set_title(GTK_WINDOW(win), "calendar");
gtk_window_stick(GTK_WINDOW(win));

if (dc->numb_of_zones > 0) {
if (dc->timezones[dc->curr_zone])
setenv("TZ", dc->timezones[dc->curr_zone], 1);
if (dc->locales[dc->curr_zone])
setlocale (LC_ALL, dc->locales[dc->curr_zone]);
}

calendar = gtk_calendar_new();
gtk_calendar_display_options(
GTK_CALENDAR(calendar),
GTK_CALENDAR_SHOW_WEEK_NUMBERS | GTK_CALENDAR_SHOW_DAY_NAMES
| GTK_CALENDAR_SHOW_HEADING);
gtk_container_add(GTK_CONTAINER(win), GTK_WIDGET(calendar));

g_signal_connect (win, "delete-event",
G_CALLBACK (tclock_calendar_cleanup), dc);
// for set "dc->calendar_window == NULL" when user close via Alt+F4

return win;
}

Expand All @@ -76,6 +101,13 @@ clock_update(gpointer data)
g_assert(data != NULL);
dc = (tclock_priv *)data;

if (dc->numb_of_zones > 0) {
if (dc->timezones[dc->curr_zone])
setenv("TZ", dc->timezones[dc->curr_zone], 1);
if (dc->locales[dc->curr_zone])
setlocale (LC_ALL, dc->locales[dc->curr_zone]);
}

time(&now);
detail = localtime(&now);
rc = strftime(output, sizeof(output), dc->cfmt, detail) ;
Expand Down Expand Up @@ -113,7 +145,7 @@ clicked(GtkWidget *widget, GdkEventButton *event, tclock_priv *dc)
} else if (dc->show_calendar) {
if (dc->calendar_window == NULL)
{
dc->calendar_window = tclock_create_calendar();
dc->calendar_window = tclock_create_calendar(dc);
gtk_widget_show_all(dc->calendar_window);
}
else
Expand All @@ -127,10 +159,25 @@ clicked(GtkWidget *widget, GdkEventButton *event, tclock_priv *dc)
RET(TRUE);
}

static gboolean
testev(GtkWidget *widget, GdkEventButton *event, tclock_priv *dc)
{
ENTER;
dc->curr_zone++;
if (dc->curr_zone >= dc->numb_of_zones)
dc->curr_zone=0;
dc->lastDay = -1; // for refresh tooltip
clock_update(dc);
RET(TRUE);
}


static int
tclock_constructor(plugin_instance *p)
{
tclock_priv *dc;
int i;
char buf[32];

ENTER;
dc = (tclock_priv *) p;
Expand All @@ -139,18 +186,42 @@ tclock_constructor(plugin_instance *p)
dc->action = NULL;
dc->show_calendar = TRUE;
dc->show_tooltip = TRUE;
dc->numb_of_zones = 0;
dc->curr_zone = 0;
dc->timezones = NULL;
dc->locales = NULL;
XCG(p->xc, "TooltipFmt", &dc->tfmt, str);
XCG(p->xc, "ClockFmt", &dc->cfmt, str);
XCG(p->xc, "Action", &dc->action, str);
XCG(p->xc, "ShowCalendar", &dc->show_calendar, enum, bool_enum);
XCG(p->xc, "ShowTooltip", &dc->show_tooltip, enum, bool_enum);

XCG(p->xc, "ZoneNum", &dc->numb_of_zones, int);
if (dc->numb_of_zones > 0) {
dc->timezones = calloc(dc->numb_of_zones, sizeof(char*));
dc->locales = calloc(dc->numb_of_zones, sizeof(char*));

for (i = 0; i < dc->numb_of_zones; i++) {
dc->timezones[i] = NULL;
sprintf(buf, "TimeZone%d", i);
XCG(p->xc, buf, &(dc->timezones[i]), str);

dc->locales[i] = NULL;
sprintf(buf, "Locale%d", i);
XCG(p->xc, buf, &(dc->locales[i]), str);
}
}

dc->main = gtk_event_box_new();
gtk_event_box_set_visible_window(GTK_EVENT_BOX(dc->main), FALSE);
if (dc->action || dc->show_calendar)
g_signal_connect (G_OBJECT (dc->main), "button_press_event",
G_CALLBACK (clicked), (gpointer) dc);

if (dc->numb_of_zones > 1)
g_signal_connect_after(G_OBJECT(dc->main), "scroll-event",
G_CALLBACK(testev), (gpointer) dc);

dc->clockw = gtk_label_new(NULL);

clock_update(dc);
Expand All @@ -171,6 +242,11 @@ tclock_destructor( plugin_instance *p )
tclock_priv *dc = (tclock_priv *) p;

ENTER;
if (dc->timezones)
free(dc->timezones);
if (dc->locales)
free(dc->locales);

if (dc->timer)
g_source_remove(dc->timer);
gtk_widget_destroy(dc->main);
Expand Down