]> git.karo-electronics.de Git - oswald.git/blobdiff - ui/oswald-ui.c
Too much to note...
[oswald.git] / ui / oswald-ui.c
index 6ce61efb4f5f0a97c335a3e3145b9244380faf35..e7eb9f299866fd968b08f1a32d62fff34afab179 100644 (file)
 
 #include <gtk/gtk.h>
 
-#include "oswald-ui.h"
 #include "Fonts.h" // the MetaWatch fonts
+#include "oswald_main.h"
+
+#include "oswald-ui.h"
 
 #define BITMAP_WIDTH   192
 #define BITMAP_HEIGHT  192
 
-void set_pixel(oswald_ui *ui, gint x, gint y, gboolean state)
+static oswald_ui *ui_g;
+
+void lcd_set_pixel(gint x, gint y, gboolean state)
 {
-       GdkRectangle update_rect;
        gint ix, iy;
 
        ix = x*2;
        iy = y*2;
 
-       update_rect.x = ix - 5;
-       update_rect.y = iy - 5;
-       update_rect.width = 10;
-       update_rect.height = 10;
-
-       gdk_draw_point(GDK_DRAWABLE(ui->pixmap), state ? ui->darea->style->black_gc : ui->darea->style->white_gc, ix, iy);
-       gdk_draw_point(GDK_DRAWABLE(ui->pixmap), state ? ui->darea->style->black_gc : ui->darea->style->white_gc, ix+1, iy);
-       gdk_draw_point(GDK_DRAWABLE(ui->pixmap), state ? ui->darea->style->black_gc : ui->darea->style->white_gc, ix, iy+1);
-       gdk_draw_point(GDK_DRAWABLE(ui->pixmap), state ? ui->darea->style->black_gc : ui->darea->style->white_gc, ix+1, iy+1);
+       gdk_draw_point(GDK_DRAWABLE(ui_g->pixmap), state ? ui_g->darea->style->black_gc : ui_g->darea->style->white_gc, ix, iy);
+       gdk_draw_point(GDK_DRAWABLE(ui_g->pixmap), state ? ui_g->darea->style->black_gc : ui_g->darea->style->white_gc, ix+1, iy);
+       gdk_draw_point(GDK_DRAWABLE(ui_g->pixmap), state ? ui_g->darea->style->black_gc : ui_g->darea->style->white_gc, ix, iy+1);
+       gdk_draw_point(GDK_DRAWABLE(ui_g->pixmap), state ? ui_g->darea->style->black_gc : ui_g->darea->style->white_gc, ix+1, iy+1);
 
-       gtk_widget_draw (GTK_WIDGET(ui->darea), &update_rect);
+       gtk_widget_queue_draw(ui_g->darea);
 }
 
-void clear_display(oswald_ui *ui)
+void lcd_clear_display(void)
 {
-       GdkRectangle update_rect;
-
-       update_rect.x = 0;
-       update_rect.y = 0;
-       update_rect.width = BITMAP_WIDTH;
-       update_rect.height = BITMAP_HEIGHT;
-
-       gdk_draw_rectangle (ui->pixmap,
-               ui->darea->style->white_gc,
+       gdk_draw_rectangle (ui_g->pixmap,
+               ui_g->darea->style->white_gc,
                TRUE,
                0, 0,
-               ui->darea->allocation.width,
-               ui->darea->allocation.height);
+               ui_g->darea->allocation.width,
+               ui_g->darea->allocation.height);
 
-       gtk_widget_draw (GTK_WIDGET(ui->darea), &update_rect);
+       gtk_widget_queue_draw(ui_g->darea);
 }
 
 static gint
@@ -95,6 +86,49 @@ expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
        return FALSE;
 }
 
+void button_A_pressed (GtkButton *button, gpointer user_data)
+{
+       oswald_ui *ui = (oswald_ui *)user_data;
+
+       g_print("Button-A pressed\n");
+       oswald_handle_button_press(BUTTON_A);
+}
+
+void button_B_pressed (GtkButton *button, gpointer user_data)
+{
+       oswald_ui *ui = (oswald_ui *)user_data;
+
+       g_print("Button-B pressed\n");
+}
+
+void button_C_pressed (GtkButton *button, gpointer user_data)
+{
+       oswald_ui *ui = (oswald_ui *)user_data;
+
+       g_print("Button-C pressed\n");
+}
+
+void button_D_pressed (GtkButton *button, gpointer user_data)
+{
+       oswald_ui *ui = (oswald_ui *)user_data;
+
+       g_print("Button-D pressed\n");
+}
+
+void button_E_pressed (GtkButton *button, gpointer user_data)
+{
+       oswald_ui *ui = (oswald_ui *)user_data;
+
+       g_print("Button-E pressed\n");
+}
+
+void button_F_pressed (GtkButton *button, gpointer user_data)
+{
+       oswald_ui *ui = (oswald_ui *)user_data;
+
+       g_print("Button-F pressed\n");
+}
+
 static void create_mainwin(oswald_ui *ui)
 {
        GtkWidget *hb, *vb, *btn;
@@ -113,12 +147,16 @@ static void create_mainwin(oswald_ui *ui)
 
        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);
 
        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);
 
        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);
+
 
        ui->darea = gtk_drawing_area_new ();
        gtk_box_pack_start (GTK_BOX(hb), GTK_WIDGET(ui->darea), FALSE, FALSE, 5);
@@ -140,47 +178,54 @@ 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);
 
        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);
 
        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);
 
        gtk_widget_show_all(ui->mainwin);
 }
 
-gboolean app_tmo_handler (gpointer userdata)
+gboolean one_second_tmo_handler (gpointer userdata)
 {
        oswald_ui *ui = (oswald_ui *)userdata;
 
-       // fprintf(stderr, "tmo...\n");
+       oswald_one_second_tick();
 
-       if (ui->OnIdleScreen) {
-               update_idle_time_date(ui);
-#if 0
-       } else {
-               // go back to idle screen after IDLE_TIMEOUT seconds
-               if ((time(NULL) - ui->idle_tmo) > ui->conf.idle_tmo /*IDLE_TIMEOUT*/)
-                       create_main_screen(ui);
-#endif
-       }
+       return TRUE;
+}
 
+gboolean app_idle_handler (gpointer user_data)
+{
+       g_print("i");
        return TRUE;
 }
 
 int main(int argc , char ** argv)
 {
        oswald_ui ui;
+       time_t mt;
+       struct tm mtime;
+
+       ui_g = &ui;
+
+       mt = time(NULL);
+       localtime_r(&mt, &mtime);
 
        gtk_init (&argc, &argv);
 
        create_mainwin(&ui);
 
-       //set_pixel(&ui, 48, 48, TRUE);
-       // demo_time(&ui);
-       ui.OnIdleScreen = TRUE;
-       g_timeout_add_seconds(1, app_tmo_handler, &ui);
+       oswald_init();
+       oswald_set_time(mtime.tm_hour, mtime.tm_min, mtime.tm_sec);
+
+       g_timeout_add_seconds(1, one_second_tmo_handler, &ui);
+       // g_idle_add(app_idle_handler, &ui);
 
        gtk_main ();
        return 0;