Oh boy... lots of changes, too many to describe

[oswald.git] / ui / oswald-ui.c

diff --git a/ui/oswald-ui.c b/ui/oswald-ui.c
index ff88ff927396839d972d035ec1cbb60be32ea998..e86f0e1593bc9a930d3bf8aa1be13e3009f01685 100644 (file)
--- a/ui/oswald-ui.c
+++ b/ui/oswald-ui.c
@@ -23,7 +23,7 @@
 
 static oswald_ui *ui_g;
 
-void lcd_set_pixel(gint x, gint y, gboolean state)
+void hal_lcd_set_pixel(gint x, gint y, gboolean state)
 {
        gint ix, iy;
 
@@ -39,12 +39,12 @@ void lcd_set_pixel(gint x, gint y, gboolean state)
 }
 
 /* updates the actual LCD so that drawing becomes visible */
-void lcd_update_display(void)
+void hal_lcd_update_display(void)
 {
        gtk_widget_queue_draw(ui_g->darea);
 }
 
-void lcd_clear_display(void)
+void hal_lcd_clear_display(void)
 {
        gdk_draw_rectangle (ui_g->pixmap,
                ui_g->darea->style->white_gc,
@@ -219,19 +219,19 @@ static void create_mainwin(oswald_ui *ui)
        vb = gtk_vbox_new(FALSE, 5);
        gtk_box_pack_start (GTK_BOX(hb), vb, FALSE, FALSE, 5);
 
-       btn = gtk_button_new_with_label(" D ");
+       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_D_clicked), 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);
 
        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 ");
+       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_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);
+       g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_D_clicked), ui);
 
        ui->darea = gtk_drawing_area_new ();
        gtk_box_pack_start (GTK_BOX(hb), GTK_WIDGET(ui->darea), FALSE, FALSE, 5);
@@ -323,13 +323,13 @@ static gboolean centisecond_tmo_handler (gpointer userdata)
        return TRUE;
 }
 
-void enable_centisecond_timer(void)
+void hal_enable_centisecond_timer(void)
 {
        ui_g->centisecond_active = TRUE;
        g_timeout_add(10, centisecond_tmo_handler, ui_g);
 }
 
-void disable_centisecond_timer(void)
+void hal_disable_centisecond_timer(void)
 {
        ui_g->centisecond_active = FALSE;
 }
@@ -346,17 +346,67 @@ static gboolean halfsecond_tmo_handler (gpointer userdata)
        return TRUE;
 }
 
-void enable_halfsecond_timer(void)
+void hal_enable_halfsecond_timer(void)
 {
        ui_g->halfsecond_active = TRUE;
        g_timeout_add(500, halfsecond_tmo_handler, ui_g);
 }
 
-void disable_halfsecond_timer(void)
+void hal_disable_halfsecond_timer(void)
 {
        ui_g->halfsecond_active = FALSE;
 }
 
+void hal_get_rtc(clock_state *rtc)
+{
+       time_t mt;
+       struct tm mtime;
+
+       mt = time(NULL);
+       localtime_r(&mt, &mtime);
+
+       rtc->hour = mtime.tm_hour;
+       rtc->minute = mtime.tm_min;
+       rtc->second = mtime.tm_sec;
+       rtc->day = mtime.tm_mday;
+       rtc->month = (mtime.tm_mon + 1);
+       rtc->year = (mtime.tm_year + 1900);
+}
+
+void hal_set_rtc(const clock_state *rtc, boolean set_set)
+{
+}
+
+void hal_get_power_state(power_state *pwr)
+{
+}
+
+static boolean BacklightState = FALSE;
+
+/* sets the backlight on/off, on=TRUE, off=FALSE */
+void hal_lcd_set_backlight(boolean state)
+{
+       g_print("turn LCD backlight %s\n", state ? "on" : "off");
+       BacklightState = state;
+}
+
+boolean hal_lcd_get_backlight(void)
+{
+       return BacklightState;
+}
+
+
+/* sets the vibration motor on/off, on=TRUE, off=FALSE */
+void hal_vibration_set_state(boolean state)
+{
+}
+
+boolean hal_vibration_get_state(void)
+{
+       return FALSE;
+}
+
+
 int main(int argc , char ** argv)
 {
        oswald_ui ui;