Document "Only show entry from start on when nothing is provided" in changelog
[darcs-mirror-screen-message.debian.git] / sm.c
diff --git a/sm.c b/sm.c
index fb8042c..ba325f6 100644 (file)
--- a/sm.c
+++ b/sm.c
 
 #define min(x,y) ((x) < (y) ? (x) : (y))
 
+#define AUTOHIDE_TIMEOUT 5
+
 static gboolean quality = TRUE;
 static gboolean need_resize = TRUE;
 
+static int timeout_id=0;
+
 static GtkWidget* window;
-static GdkScreen *screen;
-static GtkWidget* draw;
 static GdkCursor *cursor;
 static GtkWidget* quit;
 static GtkWidget* tv;
+static GtkWidget* entry_widget;
 static GtkSettings* settings;
 static GtkTextBuffer* tb;
 static PangoFontDescription *font;
@@ -51,15 +54,33 @@ static char *background = NULL;
 static char *fontdesc = NULL;
 static rotation = 0; // 0 = normal, 1 = left, 2 = inverted, 3 = right
 
+gboolean hide_entry(gpointer *user_data) {
+       gtk_widget_hide(entry_widget);
+       gtk_widget_grab_focus(tv);
+       return FALSE;
+}
+
+static void show_entry() {
+       if (timeout_id) {
+               g_source_remove(timeout_id);
+               timeout_id = 0;
+       }
+       gtk_widget_show(entry_widget);
+
+       timeout_id = g_timeout_add_seconds (AUTOHIDE_TIMEOUT, (GSourceFunc)hide_entry, NULL);
+}
+
 static void realize(GtkWindow *window, GdkScreen *screen, gpointer data) {
-       gdk_window_set_cursor(draw->window, cursor);
+       gdk_window_set_cursor(GTK_WIDGET(window)->window, cursor);
 }
 
 static void clear_text(GtkAccelGroup *accel, GObject *window, guint keyval,  GdkModifierType modifier) {
-       if( gtk_text_buffer_get_char_count(tb) )
+       if( gtk_text_buffer_get_char_count(tb) ) {
                gtk_text_buffer_set_text(tb,"",-1);
-       else
+               show_entry();
+       } else {
                gtk_main_quit();
+       }
 }
 
 static char *get_text() {
@@ -77,7 +98,7 @@ static void hq(gboolean q, gboolean force){
                        gtk_settings_set_long_property(settings,"gtk-xft-antialias",0,"Hier halt");
        else
                if (force)
-                       gtk_widget_queue_draw(draw);
+                       gtk_widget_queue_draw(window);
 
        quality = q;
 }
@@ -85,12 +106,12 @@ static void hq(gboolean q, gboolean force){
 static void redraw() {
        const char *text = pango_layout_get_text(layout);
        if (strlen(text) > 0) {
-               GdkGC *gc = gtk_widget_get_style(draw)->fg_gc[GTK_STATE_NORMAL];
+               GdkGC *gc = gtk_widget_get_style(window)->fg_gc[GTK_STATE_NORMAL];
                int w1, h1;
                pango_layout_get_pixel_size(layout, &w1, &h1);
                if (w1>0 && h1>0) {
-                       int w2 = draw->allocation.width;
-                       int h2 = draw->allocation.height;
+                       int w2 = window->allocation.width;
+                       int h2 = window->allocation.height;
 
                        int rw1, rh1;
                        if (rotation == 0 || rotation == 2) {
@@ -119,7 +140,7 @@ static void redraw() {
                        pango_context_set_matrix (context, &matrix);
                        pango_layout_context_changed (layout);
 
-                       gdk_draw_layout(draw->window, gc,
+                       gdk_draw_layout(window->window, gc,
                                (w2-(s*rw1))/2, (h2-(s*rh1))/2,layout);
                        hq(TRUE, FALSE);
                }
@@ -127,6 +148,7 @@ static void redraw() {
 }
 
 static gboolean text_clicked(GtkWidget *widget, GdkEventButton *event, gpointer *user_data) {
+       show_entry();
        if (event->type == GDK_BUTTON_PRESS && event->button == 2) {
                GtkClipboard *cb = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
 
@@ -141,6 +163,7 @@ static gboolean text_clicked(GtkWidget *widget, GdkEventButton *event, gpointer
 }
 
 static void newtext(char *text) {
+       show_entry();
        pango_layout_set_text(layout, get_text(), -1);
        hq(FALSE, TRUE);
 }
@@ -167,6 +190,7 @@ static void version() {
 int main(int argc, char **argv) {
        GString *input;
        int c;
+       int input_provided = 0;
 
        while ((c = getopt_long (argc, argv, "hVf:b:n:r:", long_options, (int *) 0)) != EOF) {
                switch (c) {
@@ -210,7 +234,7 @@ int main(int argc, char **argv) {
        gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
        gtk_window_set_icon_name (GTK_WINDOW (window), "sm");
 
-       screen = gtk_window_get_screen(GTK_WINDOW(window));
+       GdkScreen *screen = gtk_window_get_screen(GTK_WINDOW(window));
        gtk_widget_set_size_request(window, gdk_screen_get_width(screen),
                                            gdk_screen_get_height(screen));
        gtk_window_fullscreen(GTK_WINDOW(window));
@@ -234,13 +258,9 @@ int main(int argc, char **argv) {
        gtk_widget_modify_bg(window, GTK_STATE_NORMAL, &white);
        gtk_widget_modify_fg(window, GTK_STATE_NORMAL, &black);
 
-       draw = gtk_drawing_area_new();
-       gtk_widget_set_events(draw, GDK_BUTTON_PRESS_MASK);
-       gtk_widget_set_size_request(draw,400,400);
-       gtk_widget_modify_bg(draw, GTK_STATE_NORMAL, &white);
-       gtk_widget_modify_fg(draw, GTK_STATE_NORMAL, &black);
-       g_signal_connect(G_OBJECT(draw), "realize", G_CALLBACK(realize), NULL);
-       g_signal_connect(G_OBJECT(draw), "button-press-event", G_CALLBACK(text_clicked), NULL);
+       gtk_widget_set_events(window, GDK_BUTTON_PRESS_MASK);
+       g_signal_connect(G_OBJECT(window), "realize", G_CALLBACK(realize), NULL);
+       g_signal_connect(G_OBJECT(window), "button-press-event", G_CALLBACK(text_clicked), NULL);
 
        GdkPixmap *pixmap = gdk_pixmap_new(NULL, 1, 1, 1);
        GdkColor color;
@@ -262,6 +282,12 @@ int main(int argc, char **argv) {
                        while ((num = fread (buf, 1, sizeof(buf), stdin)) > 0) {
                                g_string_append_len(input, buf, num);
                        }
+
+                       // remove trailing newline, if any
+                       if ((input->len > 0) && (input->str[input->len - 1] == '\n')) {
+                               g_string_truncate(input, input->len - 1);
+                       }
+                       input_provided++;
                } else {
                        int i;
 
@@ -274,6 +300,7 @@ int main(int argc, char **argv) {
                                        g_string_append(input, " ");
                                }
                        }
+                       input_provided++;
                }
        else
                input = g_string_new(":-)");
@@ -288,13 +315,16 @@ int main(int argc, char **argv) {
        gtk_widget_modify_bg(quit, GTK_STATE_NORMAL, &white);
        gtk_widget_modify_fg(quit, GTK_STATE_NORMAL, &black);
 
+       GtkWidget *vbox_button = gtk_vbox_new(FALSE, 0);
+       gtk_box_pack_end(GTK_BOX(vbox_button), quit, FALSE, FALSE, 0);
+
        GtkWidget *hbox = gtk_hbox_new(FALSE,0);
+       entry_widget = hbox;
        gtk_box_pack_start(GTK_BOX(hbox), tv,   TRUE,  TRUE,  0);
-       gtk_box_pack_start(GTK_BOX(hbox), quit, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), vbox_button, FALSE, FALSE, 0);
 
        GtkWidget *vbox = gtk_vbox_new(FALSE,0);
-       gtk_box_pack_start(GTK_BOX(vbox), draw, TRUE,  TRUE,  0);
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+       gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
        gtk_container_add(GTK_CONTAINER(window), vbox);
 
@@ -306,7 +336,7 @@ int main(int argc, char **argv) {
        }
        pango_font_description_set_size(font, 200*PANGO_SCALE);
 
-       layout=  gtk_widget_create_pango_layout(draw,get_text());
+       layout = gtk_widget_create_pango_layout(window,get_text());
        pango_layout_set_font_description(layout, font);
        pango_layout_set_alignment(layout,PANGO_ALIGN_CENTER);
 
@@ -320,9 +350,14 @@ int main(int argc, char **argv) {
        gtk_window_add_accel_group(GTK_WINDOW(window), accel);
        gtk_widget_show_all(window);
 
-       g_signal_connect(G_OBJECT(draw), "expose-event", G_CALLBACK(redraw), NULL);
+       g_signal_connect_after(G_OBJECT(window), "expose-event", G_CALLBACK(redraw), NULL);
        g_signal_connect(G_OBJECT(tb), "changed", G_CALLBACK(newtext), NULL);
 
+       if (!input_provided)
+               show_entry();
+       else
+               hide_entry(NULL);
+
        gtk_main();
 
        return 0;