X-Git-Url: https://git.karo-electronics.de/?p=oswald.git;a=blobdiff_plain;f=ui%2Foswald-ui.c;h=a89523b3ad27c9734ca4347c8333f0c3f7b1cf16;hp=6ce61efb4f5f0a97c335a3e3145b9244380faf35;hb=8e3cbad72c8e3abb97f2081527f91af98d8558be;hpb=95bcec668def747ed77c38fe17f893c0d029bbbc diff --git a/ui/oswald-ui.c b/ui/oswald-ui.c index 6ce61ef..a89523b 100644 --- a/ui/oswald-ui.c +++ b/ui/oswald-ui.c @@ -12,50 +12,42 @@ #include -#include "oswald-ui.h" #include "Fonts.h" // the MetaWatch fonts +#include "oswald.h" +#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_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); - 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); - - 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,9 +87,77 @@ expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) return FALSE; } +void button_A_clicked (GtkButton *button, gpointer user_data) +{ + oswald_ui *ui = (oswald_ui *)user_data; + + // g_print("Button-A clicked\n"); + oswald_handle_button_press(BUTTON_A); +} + +void button_B_clicked (GtkButton *button, gpointer user_data) +{ + oswald_ui *ui = (oswald_ui *)user_data; + + // g_print("Button-B clicked\n"); + oswald_handle_button_press(BUTTON_B); +} + +void button_C_clicked (GtkButton *button, gpointer user_data) +{ + oswald_ui *ui = (oswald_ui *)user_data; + + // g_print("Button-C clicked\n"); + oswald_handle_button_press(BUTTON_C); +} + +void button_D_clicked (GtkButton *button, gpointer user_data) +{ + oswald_ui *ui = (oswald_ui *)user_data; + + // g_print("Button-D clicked\n"); + oswald_handle_button_press(BUTTON_D); +} + +void button_E_clicked (GtkButton *button, gpointer user_data) +{ + oswald_ui *ui = (oswald_ui *)user_data; + + // g_print("Button-E clicked\n"); + oswald_handle_button_press(BUTTON_E); +} + +void button_F_clicked (GtkButton *button, gpointer user_data) +{ + oswald_ui *ui = (oswald_ui *)user_data; + + // 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; @@ -105,20 +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_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_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_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); @@ -140,47 +208,80 @@ 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_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_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_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); } -gboolean app_tmo_handler (gpointer userdata) +gboolean one_second_tmo_handler (gpointer userdata) { oswald_ui *ui = (oswald_ui *)userdata; - // fprintf(stderr, "tmo...\n"); - - 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 - } + oswald_one_second_tick(); return TRUE; } +gboolean app_idle_handler (gpointer user_data) +{ + g_print("i"); + if (OswaldState.pending_idle) { + // call Oswald's idle function + return TRUE; + }; + return FALSE; +} + 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); + gtk_widget_realize(ui.mainwin); + + oswald_set_time(mtime.tm_hour, mtime.tm_min, mtime.tm_sec); + oswald_init(); - //set_pixel(&ui, 48, 48, TRUE); - // demo_time(&ui); - ui.OnIdleScreen = TRUE; - g_timeout_add_seconds(1, app_tmo_handler, &ui); + g_timeout_add_seconds(1, one_second_tmo_handler, &ui); + // g_idle_add(app_idle_handler, &ui); gtk_main (); return 0;