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

diff --git a/ui/oswald-ui.c b/ui/oswald-ui.c
index e7eb9f2..a89523b 100644
--- a/ui/oswald-ui.c
+++ b/ui/oswald-ui.c
@@ -13,6 +13,7 @@
 #include <gtk/gtk.h>
 
 #include "Fonts.h" // the MetaWatch fonts
+#include "oswald.h"
 #include "oswald_main.h"
 
 #include "oswald-ui.h"
@@ -86,52 +87,77 @@ expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
 	return FALSE;
 }
 
-void button_A_pressed (GtkButton *button, gpointer user_data)
+void button_A_clicked (GtkButton *button, gpointer user_data)
 {
 	oswald_ui *ui = (oswald_ui *)user_data;
 
-	g_print("Button-A pressed\n");
+	// g_print("Button-A clicked\n");
 	oswald_handle_button_press(BUTTON_A);
 }
 
-void button_B_pressed (GtkButton *button, gpointer user_data)
+void button_B_clicked (GtkButton *button, gpointer user_data)
 {
 	oswald_ui *ui = (oswald_ui *)user_data;
 
-	g_print("Button-B pressed\n");
+	// g_print("Button-B clicked\n");
+	oswald_handle_button_press(BUTTON_B);
 }
 
-void button_C_pressed (GtkButton *button, gpointer user_data)
+void button_C_clicked (GtkButton *button, gpointer user_data)
 {
 	oswald_ui *ui = (oswald_ui *)user_data;
 
-	g_print("Button-C pressed\n");
+	// g_print("Button-C clicked\n");
+	oswald_handle_button_press(BUTTON_C);
 }
 
-void button_D_pressed (GtkButton *button, gpointer user_data)
+void button_D_clicked (GtkButton *button, gpointer user_data)
 {
 	oswald_ui *ui = (oswald_ui *)user_data;
 
-	g_print("Button-D pressed\n");
+	// g_print("Button-D clicked\n");
+	oswald_handle_button_press(BUTTON_D);
 }
 
-void button_E_pressed (GtkButton *button, gpointer user_data)
+void button_E_clicked (GtkButton *button, gpointer user_data)
 {
 	oswald_ui *ui = (oswald_ui *)user_data;
 
-	g_print("Button-E pressed\n");
+	// g_print("Button-E clicked\n");
+	oswald_handle_button_press(BUTTON_E);
 }
 
-void button_F_pressed (GtkButton *button, gpointer user_data)
+void button_F_clicked (GtkButton *button, gpointer user_data)
 {
 	oswald_ui *ui = (oswald_ui *)user_data;
 
-	g_print("Button-F pressed\n");
+	// g_print("Button-F clicked\n");
+	oswald_handle_button_press(BUTTON_F);
+}
+
+gboolean button_F_pr (GtkWidget *widget, GdkEvent *event, gpointer user_data)
+{
+	oswald_ui *ui = (oswald_ui *)user_data;
+	static gint32 press_time;
+
+	GdkEventButton *bev = (GdkEventButton *)event;
+	if (bev->type == GDK_BUTTON_PRESS) {
+		press_time = bev->time;
+		return FALSE;
+	};
+	if (bev->type == GDK_BUTTON_RELEASE) {
+		if (bev->time > (press_time+1000)) {
+			g_print("Button-F long press\n");
+			return TRUE;
+		};
+	};
+
+	return FALSE;
 }
 
 static void create_mainwin(oswald_ui *ui)
 {
-	GtkWidget *hb, *vb, *btn;
+	GtkWidget *mvb, *hb, *vb, *btn, *sc, *l;
 
 	ui->pixmap = NULL;
 
@@ -139,24 +165,28 @@ static void create_mainwin(oswald_ui *ui)
 	// gtk_window_set_default_size (GTK_WINDOW (ui->mainwin), 440, 240);
 	g_signal_connect(G_OBJECT(ui->mainwin), "destroy", gtk_main_quit, NULL);
 
+	mvb = gtk_vbox_new(FALSE, 5);
+	gtk_container_add(GTK_CONTAINER(ui->mainwin), mvb);
+
 	hb = gtk_hbox_new(FALSE, 5);
-	gtk_container_add(GTK_CONTAINER(ui->mainwin), hb);
+	gtk_box_pack_start (GTK_BOX(mvb), hb, FALSE, FALSE, 5);
 
 	vb = gtk_vbox_new(FALSE, 5);
 	gtk_box_pack_start (GTK_BOX(hb), vb, FALSE, FALSE, 5);
 
 	btn = gtk_button_new_with_label(" D ");
 	gtk_box_pack_start (GTK_BOX(vb), btn, FALSE, FALSE, 10);
-	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_D_pressed), ui);
+	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_D_clicked), ui);
 
 	btn = gtk_button_new_with_label(" E ");
 	gtk_box_pack_start (GTK_BOX(vb), btn, FALSE, FALSE, 10);
-	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_D_pressed), ui);
+	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_E_clicked), ui);
 
 	btn = gtk_button_new_with_label(" F ");
 	gtk_box_pack_start (GTK_BOX(vb), btn, FALSE, FALSE, 10);
-	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_F_pressed), ui);
-
+	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_F_clicked), ui);
+	g_signal_connect(G_OBJECT(btn), "button-press-event", G_CALLBACK(button_F_pr), ui);
+	g_signal_connect(G_OBJECT(btn), "button-release-event", G_CALLBACK(button_F_pr), ui);
 
 	ui->darea = gtk_drawing_area_new ();
 	gtk_box_pack_start (GTK_BOX(hb), GTK_WIDGET(ui->darea), FALSE, FALSE, 5);
@@ -178,15 +208,36 @@ static void create_mainwin(oswald_ui *ui)
 
 	btn = gtk_button_new_with_label(" A ");
 	gtk_box_pack_start (GTK_BOX(vb), btn, FALSE, FALSE, 10);
-	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_A_pressed), ui);
+	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_A_clicked), ui);
 
 	btn = gtk_button_new_with_label(" B ");
 	gtk_box_pack_start (GTK_BOX(vb), btn, FALSE, FALSE, 10);
-	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_B_pressed), ui);
+	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_B_clicked), ui);
 
 	btn = gtk_button_new_with_label(" C ");
 	gtk_box_pack_start (GTK_BOX(vb), btn, FALSE, FALSE, 10);
-	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_C_pressed), ui);
+	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_C_clicked), ui);
+
+	sc = gtk_vscale_new_with_range (0, 255, 1);
+	gtk_box_pack_start (GTK_BOX(hb), sc, FALSE, FALSE, 5);
+
+	hb = gtk_hbox_new(FALSE, 0);
+	gtk_box_pack_start (GTK_BOX(mvb), hb, FALSE, FALSE, 5);
+
+	l = gtk_label_new("X:");
+	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);
+
+	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);
+
+	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);
 
 	gtk_widget_show_all(ui->mainwin);
 }
@@ -203,7 +254,11 @@ gboolean one_second_tmo_handler (gpointer userdata)
 gboolean app_idle_handler (gpointer user_data)
 {
 	g_print("i");
-	return TRUE;
+	if (OswaldState.pending_idle) {
+		// call Oswald's idle function
+		return TRUE;
+	};
+	return FALSE;
 }
 
 int main(int argc , char ** argv)
@@ -220,9 +275,10 @@ int main(int argc , char ** argv)
 	gtk_init (&argc, &argv);
 
 	create_mainwin(&ui);
+	gtk_widget_realize(ui.mainwin);
 
-	oswald_init();
 	oswald_set_time(mtime.tm_hour, mtime.tm_min, mtime.tm_sec);
+	oswald_init();
 
 	g_timeout_add_seconds(1, one_second_tmo_handler, &ui);
 	// g_idle_add(app_idle_handler, &ui);