X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=ui%2Foswald-ui.c;fp=ui%2Foswald-ui.c;h=37da1c092fdf12633cfde9a7b917cefa96d1e4b3;hb=e9b651b4a531d38826d7952475b5ad0d3d8118e9;hp=a89523b3ad27c9734ca4347c8333f0c3f7b1cf16;hpb=8e3cbad72c8e3abb97f2081527f91af98d8558be;p=oswald.git

diff --git a/ui/oswald-ui.c b/ui/oswald-ui.c
index a89523b..37da1c0 100644
--- a/ui/oswald-ui.c
+++ b/ui/oswald-ui.c
@@ -155,6 +155,45 @@ gboolean button_F_pr (GtkWidget *widget, GdkEvent *event, gpointer user_data)
 	return FALSE;
 }
 
+void ambientlight_value_changed (GtkRange *range, gpointer  user_data)
+{
+	oswald_ui *ui = (oswald_ui *)user_data;
+	double val;
+
+	val = gtk_range_get_value(range);
+	oswald_handle_ambientlight_event((u8t) val);
+}
+
+void accelX_value_changed (GtkRange *range, gpointer  user_data)
+{
+	oswald_ui *ui = (oswald_ui *)user_data;
+	double val;
+
+	val = gtk_range_get_value(range);
+	ui->accel_x = (u8t)val;
+	oswald_handle_accel_event(ui->accel_x, ui->accel_y, ui->accel_z);
+}
+
+void accelY_value_changed (GtkRange *range, gpointer  user_data)
+{
+	oswald_ui *ui = (oswald_ui *)user_data;
+	double val;
+
+	val = gtk_range_get_value(range);
+	ui->accel_y = (u8t)val;
+	oswald_handle_accel_event(ui->accel_x, ui->accel_y, ui->accel_z);
+}
+
+void accelZ_value_changed (GtkRange *range, gpointer  user_data)
+{
+	oswald_ui *ui = (oswald_ui *)user_data;
+	double val;
+
+	val = gtk_range_get_value(range);
+	ui->accel_z = (u8t)val;
+	oswald_handle_accel_event(ui->accel_x, ui->accel_y, ui->accel_z);
+}
+
 static void create_mainwin(oswald_ui *ui)
 {
 	GtkWidget *mvb, *hb, *vb, *btn, *sc, *l;
@@ -218,8 +257,10 @@ static void create_mainwin(oswald_ui *ui)
 	gtk_box_pack_start (GTK_BOX(vb), btn, FALSE, FALSE, 10);
 	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_C_clicked), ui);
 
+	// ambient light sensor
 	sc = gtk_vscale_new_with_range (0, 255, 1);
 	gtk_box_pack_start (GTK_BOX(hb), sc, FALSE, FALSE, 5);
+	g_signal_connect(G_OBJECT(sc), "value-changed", G_CALLBACK(ambientlight_value_changed), ui);
 
 	hb = gtk_hbox_new(FALSE, 0);
 	gtk_box_pack_start (GTK_BOX(mvb), hb, FALSE, FALSE, 5);
@@ -228,21 +269,24 @@ static void create_mainwin(oswald_ui *ui)
 	gtk_box_pack_start (GTK_BOX(hb), l, FALSE, FALSE, 5);
 	sc = gtk_hscale_new_with_range (0, 255, 1);
 	gtk_box_pack_start (GTK_BOX(hb), sc, TRUE, TRUE, 5);
+	g_signal_connect(G_OBJECT(sc), "value-changed", G_CALLBACK(accelX_value_changed), ui);
 
 	l = gtk_label_new("Y:");
 	gtk_box_pack_start (GTK_BOX(hb), l, FALSE, FALSE, 5);
 	sc = gtk_hscale_new_with_range (0, 255, 1);
 	gtk_box_pack_start (GTK_BOX(hb), sc, TRUE, TRUE, 5);
+	g_signal_connect(G_OBJECT(sc), "value-changed", G_CALLBACK(accelY_value_changed), ui);
 
 	l = gtk_label_new("Z:");
 	gtk_box_pack_start (GTK_BOX(hb), l, FALSE, FALSE, 5);
 	sc = gtk_hscale_new_with_range (0, 255, 1);
 	gtk_box_pack_start (GTK_BOX(hb), sc, TRUE, TRUE, 5);
+	g_signal_connect(G_OBJECT(sc), "value-changed", G_CALLBACK(accelZ_value_changed), ui);
 
 	gtk_widget_show_all(ui->mainwin);
 }
 
-gboolean one_second_tmo_handler (gpointer userdata)
+static gboolean one_second_tmo_handler (gpointer userdata)
 {
 	oswald_ui *ui = (oswald_ui *)userdata;
 
@@ -251,7 +295,7 @@ gboolean one_second_tmo_handler (gpointer userdata)
 	return TRUE;
 }
 
-gboolean app_idle_handler (gpointer user_data)
+static gboolean app_idle_handler (gpointer user_data)
 {
 	g_print("i");
 	if (OswaldState.pending_idle) {
@@ -261,6 +305,52 @@ gboolean app_idle_handler (gpointer user_data)
 	return FALSE;
 }
 
+static gboolean centisecond_tmo_handler (gpointer userdata)
+{
+	oswald_ui *ui = (oswald_ui *)userdata;
+
+	if (ui->centisecond_active)
+		oswald_centisecond_tick();
+	else
+		return FALSE;
+
+	return TRUE;
+}
+
+void enable_centisecond_timer(void)
+{
+	ui_g->centisecond_active = TRUE;
+	g_timeout_add(10, centisecond_tmo_handler, ui_g);
+}
+
+void disable_centisecond_timer(void)
+{
+	ui_g->centisecond_active = FALSE;
+}
+
+static gboolean halfsecond_tmo_handler (gpointer userdata)
+{
+	oswald_ui *ui = (oswald_ui *)userdata;
+
+	if (ui->halfsecond_active)
+		oswald_halfsecond_tick();
+	else
+		return FALSE;
+
+	return TRUE;
+}
+
+void enable_halfsecond_timer(void)
+{
+	ui_g->halfsecond_active = TRUE;
+	g_timeout_add(500, halfsecond_tmo_handler, ui_g);
+}
+
+void disable_halfsecond_timer(void)
+{
+	ui_g->halfsecond_active = FALSE;
+}
+
 int main(int argc , char ** argv)
 {
 	oswald_ui ui;
@@ -269,6 +359,12 @@ int main(int argc , char ** argv)
 
 	ui_g = &ui;
 
+	ui.accel_x = 0;
+	ui.accel_y = 0;
+	ui.accel_z = 0;
+	ui.halfsecond_active = FALSE;
+	ui.centisecond_active = FALSE;
+
 	mt = time(NULL);
 	localtime_r(&mt, &mtime);
 
@@ -277,7 +373,8 @@ int main(int argc , char ** argv)
 	create_mainwin(&ui);
 	gtk_widget_realize(ui.mainwin);
 
-	oswald_set_time(mtime.tm_hour, mtime.tm_min, mtime.tm_sec);
+	oswald_set_time(mtime.tm_hour, mtime.tm_min, mtime.tm_sec, TRUE);
+	oswald_set_date(mtime.tm_mday, (mtime.tm_mon + 1), (mtime.tm_year + 1900), TRUE);
 	oswald_init();
 
 	g_timeout_add_seconds(1, one_second_tmo_handler, &ui);