TAG 0.24
[darcs-mirror-screen-message.debian.git] / sm.c
diff --git a/sm.c b/sm.c
index e4c9d1a..0adc28f 100644 (file)
--- a/sm.c
+++ b/sm.c
@@ -1,11 +1,6 @@
 /*
 #     sm.c
-#     Copyright (C) 2006 - 2012 Joachim Breitner
-#
-#     The Code for making a window fullscreen was taken from src/fullscreen.c in
-#     the geeqie package:
-#     Copyright (C) 2004 John Ellis
-#                   2008 - 2010 The Geeqie Team
+#     Copyright (C) 2006 - 2014 Joachim Breitner
 #
 #     This program is free software; you can redistribute it and/or modify
 #     it under the terms of the GNU General Public License as published by
@@ -25,6 +20,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <pango/pango.h>
+#include <cairo.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -41,8 +37,6 @@
 
 #define AUTOHIDE_TIMEOUT 3
 
-static gboolean quality = TRUE;
-
 static int timeout_id=0;
 
 static GtkWidget* window;
@@ -51,19 +45,19 @@ static GdkCursor *cursor;
 static GtkWidget* quit;
 static GtkWidget* tv;
 static GtkWidget* entry_widget;
-static GtkSettings* settings;
 static GtkTextBuffer* tb;
 static PangoFontDescription *font;
 static char *foreground = NULL;
 static char *background = NULL;
+static GdkRGBA  white, black;
 static char *fontdesc = NULL;
 static int rotation = 0; // 0 = normal, 1 = left, 2 = inverted, 3 = right
 static int alignment = 0; // 0 = centered, 1 = left-aligned, 2 = right-aligned
 static GString *partial_input;
-static gulong quality_high_handler = 0;
 static gulong text_change_handler;
 
 gboolean hide_entry(gpointer *user_data) {
+       timeout_id = 0;
        gtk_widget_hide(entry_widget);
        gtk_widget_grab_focus(draw);
        gtk_widget_queue_draw(draw);
@@ -99,29 +93,14 @@ static char *get_text() {
        return gtk_text_buffer_get_text(tb, &start, &end, FALSE);
 }
 
-static void hq(gboolean q, gboolean force){
-       if (q != quality) {
-               if (q)
-                       gtk_settings_set_long_property(settings,"gtk-xft-antialias",1,"Hier halt");
-               else
-                       gtk_settings_set_long_property(settings,"gtk-xft-antialias",0,"Hier halt");
-       }
-       else
-               if (force)
-                       gtk_widget_queue_draw(draw);
-
-       quality = q;
-}
-
-static gboolean quality_high (gpointer data) {
-       hq(TRUE, FALSE);
-       return FALSE;
-}
 
 static void redraw(GtkWidget *draw, cairo_t *cr, gpointer data) {
        int q;
-       const char *text = get_text();
 
+       gdk_cairo_set_source_rgba(cr, &white);
+       cairo_paint(cr);
+
+       const char *text = get_text();
        if (strlen(text) > 0) {
                int w1, h1;
                static PangoLayout* layout;
@@ -145,6 +124,7 @@ static void redraw(GtkWidget *draw, cairo_t *cr, gpointer data) {
                                pango_layout_set_alignment(layout,PANGO_ALIGN_CENTER);
                }
 
+
                pango_layout_get_pixel_size(layout, &w1, &h1);
                if (w1>0 && h1>0) {
                        int w2 = gtk_widget_get_allocated_width(draw);
@@ -161,25 +141,18 @@ static void redraw(GtkWidget *draw, cairo_t *cr, gpointer data) {
 
                        double s = min ((double)w2/rw1, (double)h2/rh1);
 
-                       cairo_save(cr);
-
-                       GdkRGBA color;
-                       gtk_style_context_get_color (gtk_widget_get_style_context(draw),
-                               GTK_STATE_NORMAL, &color);
-                       gdk_cairo_set_source_rgba(cr, &color);
-
-
-                       cairo_translate(cr, w2/2, h2/2);
+                       if (alignment == 1) { // left align
+                               cairo_translate(cr, (s * rw1)/2, h2/2);
+                       } else if (alignment == 2) { // right align
+                               cairo_translate(cr, w2 - (s * rw1)/2, h2/2);
+                       } else {
+                               cairo_translate(cr, w2/2, h2/2);
+                       }
                        cairo_rotate(cr, rotation * M_PI_2);
                        cairo_scale(cr, s, s);
                        cairo_translate(cr, -w1/2, -h1/2);
+                       gdk_cairo_set_source_rgba(cr, &black);
                        pango_cairo_show_layout (cr, layout);
-
-                       cairo_restore(cr);
-
-                       if (quality_high_handler) 
-                               g_source_remove(quality_high_handler);
-                       quality_high_handler = g_timeout_add(0, quality_high, NULL);
                }
                g_object_unref(layout);
        }
@@ -270,11 +243,7 @@ static gboolean read_chan(GIOChannel *chan, GIOCondition condition, gpointer dat
 }
 
 static void newtext() {
-       if (quality_high_handler) {
-               g_source_remove(quality_high_handler);
-               quality_high_handler = 0;
-       }
-       hq(FALSE, TRUE);
+       gtk_widget_queue_draw(draw);
 }
 
 static void newtext_show_input() {
@@ -305,6 +274,13 @@ static void version() {
        printf("%s\n", PACKAGE_STRING);
 }
 
+gboolean my_gdk_rgba_parse (GdkRGBA *rgba, const gchar *spec) {
+       gboolean ret = gdk_rgba_parse(rgba, spec);
+       if (!ret)  {
+           fprintf (stderr, "Failed to parse color specification %s\n", spec);
+       }
+}
+
 int main(int argc, char **argv) {
        GString *input;
        int c;
@@ -351,52 +327,25 @@ int main(int argc, char **argv) {
        gtk_init(&argc, &argv);
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_window_set_decorated(GTK_WINDOW(window), FALSE);
-       gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
        gtk_window_set_icon_name (GTK_WINDOW (window), "sm");
-
-       GdkScreen *screen = gtk_window_get_screen(GTK_WINDOW(window));
-       int w = gdk_screen_get_width(screen);
-       int h = gdk_screen_get_height(screen);
-
-       GdkGeometry geometry;
-       geometry.min_width = w;
-       geometry.min_height = h;
-       geometry.max_width = w;
-       geometry.max_height = h;
-       geometry.base_width = w;
-       geometry.base_height = h;
-       geometry.win_gravity = GDK_GRAVITY_STATIC;
-       gtk_window_set_geometry_hints(GTK_WINDOW(window), window, &geometry,
-                                     GDK_HINT_MIN_SIZE |
-                                     GDK_HINT_MAX_SIZE |
-                                     GDK_HINT_BASE_SIZE |
-                                     GDK_HINT_WIN_GRAVITY |
-                                     GDK_HINT_USER_POS);
-       gtk_window_set_default_size(GTK_WINDOW(window), w, h);
-       gtk_window_move(GTK_WINDOW(window), 0, 0);
-
+       gtk_window_fullscreen(GTK_WINDOW(window));
 
        g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
 
-       settings = gtk_settings_get_default();
-       GdkRGBA  white, black;
        if (foreground != NULL) {
-               gdk_rgba_parse(&black, foreground);
+               my_gdk_rgba_parse(&black, foreground);
        } else {
-               gdk_rgba_parse(&black, "black");
+               my_gdk_rgba_parse(&black, "black");
        }
        if (background != NULL) {
-               gdk_rgba_parse(&white, background);
+               my_gdk_rgba_parse(&white, background);
        } else {
-               gdk_rgba_parse(&white, "white");
+               my_gdk_rgba_parse(&white, "white");
        }
 
        draw = gtk_drawing_area_new();
        gtk_widget_set_events(draw, GDK_BUTTON_PRESS_MASK|GDK_KEY_PRESS_MASK);
        gtk_widget_set_size_request(draw,400,400);
-       gtk_widget_override_background_color(draw, GTK_STATE_NORMAL, &white);
-       gtk_widget_override_color(draw, GTK_STATE_NORMAL, &black);
        g_signal_connect(G_OBJECT(draw), "button-press-event", G_CALLBACK(text_clicked), NULL);
        g_signal_connect(G_OBJECT(draw), "key-press-event", G_CALLBACK(text_keypress), NULL);
        gtk_widget_set_can_focus(draw, TRUE);
@@ -440,7 +389,7 @@ int main(int argc, char **argv) {
        gtk_text_buffer_get_bounds(tb, &start, &end);
        gtk_text_buffer_select_range(tb, &start, &end);
 
-       quit = gtk_button_new_from_stock(GTK_STOCK_QUIT);
+       quit = gtk_button_new_from_icon_name("application-exit", GTK_ICON_SIZE_BUTTON);
        g_signal_connect(G_OBJECT(quit), "clicked", G_CALLBACK(gtk_main_quit), NULL);
 
        GtkWidget *vbox_button = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
@@ -480,10 +429,10 @@ int main(int argc, char **argv) {
        g_signal_connect(G_OBJECT(tb), "changed", G_CALLBACK(newtext), NULL);
        g_signal_connect(G_OBJECT(tv), "move-cursor", G_CALLBACK(move_cursor), NULL);
 
-       if (!input_provided)
-               show_entry();
-       else
+       if (input_provided)
                hide_entry(NULL);
+       else
+               show_entry();
 
        gtk_main();