X-Git-Url: http://git.nomeata.de/?p=darcs-mirror-screen-message.debian.git;a=blobdiff_plain;f=sm.c;h=0adc28f2d53b7934b3c14a52cd8f775348a13d0e;hp=cb7aa8fa607816cf1a33d35ab87529672ed68f16;hb=1f382d6a9d9e85dec91a85fc825d7755f167ffe8;hpb=6bc9995a3ee269f0c9e4c1a7d95daffc714b0da0

diff --git a/sm.c b/sm.c
index cb7aa8f..0adc28f 100644
--- a/sm.c
+++ b/sm.c
@@ -1,6 +1,6 @@
 /*
-#     vlshow.c
-#     Copyright (C) 2006 Joachim Breitner
+#     sm.c
+#     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
@@ -20,34 +20,70 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <pango/pango.h>
+#include <cairo.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
 
-static int min(int x, int y) {
-	return x < y ? x : y;
-}
+#include "config.h"
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE                             /* for getopt_long */
+#endif
+#include <getopt.h>
 
+#define min(x,y) ((x) < (y) ? (x) : (y))
 
-static gboolean quality = TRUE;
-static gboolean need_resize = TRUE;
-static gboolean need_quick = TRUE;
+#define AUTOHIDE_TIMEOUT 3
+
+static int timeout_id=0;
 
 static GtkWidget* window;
 static GtkWidget* draw;
 static GdkCursor *cursor;
 static GtkWidget* quit;
 static GtkWidget* tv;
-static GtkSettings* settings;
+static GtkWidget* entry_widget;
 static GtkTextBuffer* tb;
 static PangoFontDescription *font;
-static PangoLayout* layout;
+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 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);
+	gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(draw)), cursor);
+	return FALSE;
+}
+
+static void show_entry() {
+	if (timeout_id) {
+		g_source_remove(timeout_id);
+		timeout_id = 0;
+	}
+	gtk_widget_show(entry_widget);
+	gtk_widget_grab_focus(tv);
+	gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(draw)), NULL);
 
-static void realize(GtkWindow *window, GdkScreen *screen, gpointer data) {
-	gdk_window_set_cursor(draw->window, cursor);
+	timeout_id = g_timeout_add_seconds (AUTOHIDE_TIMEOUT, (GSourceFunc)hide_entry, NULL);
 }
 
 static void clear_text(GtkAccelGroup *accel, GObject *window, guint keyval,  GdkModifierType modifier) {
-	gtk_text_buffer_set_text(tb,"",-1);
+	if( gtk_text_buffer_get_char_count(tb) ) {
+		gtk_text_buffer_set_text(tb,"",-1);
+		show_entry();
+	} else {
+		gtk_main_quit();
+	}
 }
 
 static char *get_text() {
@@ -58,35 +94,80 @@ static char *get_text() {
 }
 
 
-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);
+static void redraw(GtkWidget *draw, cairo_t *cr, gpointer data) {
+	int q;
 
-	quality = q;
-}
+	gdk_cairo_set_source_rgba(cr, &white);
+	cairo_paint(cr);
 
-static void redraw() {
-	const char *text = pango_layout_get_text(layout);
+	const char *text = get_text();
 	if (strlen(text) > 0) {
-		GdkGC *gc = gtk_widget_get_style(draw)->fg_gc[GTK_STATE_NORMAL];
 		int w1, h1;
+		static PangoLayout* layout;
+
+		layout = gtk_widget_create_pango_layout(draw, get_text());
+		pango_layout_set_font_description(layout, font);
+
+		switch(alignment){
+			case 0: // center
+				pango_layout_set_alignment(layout,PANGO_ALIGN_CENTER);
+				break;
+			case 1: // left
+				pango_layout_set_alignment(layout,PANGO_ALIGN_LEFT);
+				break;
+			case 2: // left
+				pango_layout_set_alignment(layout,PANGO_ALIGN_RIGHT);
+				break;
+			default:
+				// we propably don't want to annoy the user, so default to
+				// the old default-behaviour:
+				pango_layout_set_alignment(layout,PANGO_ALIGN_CENTER);
+		}
+
+
 		pango_layout_get_pixel_size(layout, &w1, &h1);
 		if (w1>0 && h1>0) {
-			int w2 = draw->allocation.width;
-			int h2 = draw->allocation.height;
-			gdk_draw_layout(draw->window, gc, (w2-w1)/2,(h2-h1)/2,layout);
-			hq(TRUE, FALSE);
+			int w2 = gtk_widget_get_allocated_width(draw);
+			int h2 = gtk_widget_get_allocated_height(draw);
+
+			int rw1, rh1;
+			if (rotation == 0 || rotation == 2) {
+				rw1 = w1;
+				rh1 = h1;
+			} else {
+				rw1 = h1;
+				rh1 = w1;
+			}
+
+			double s = min ((double)w2/rw1, (double)h2/rh1);
+
+			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);
 		}
+		g_object_unref(layout);
 	}
 }
 
+static gboolean text_keypress(GtkWidget *widget, GdkEventButton *event, gpointer *user_data) {
+	// forward signal to the text view
+	gboolean ret;
+	g_signal_emit_by_name(tv, "key-press-event", event, &ret);
+	gtk_widget_grab_focus(tv);
+	return ret;
+}
+
 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);
 
@@ -100,91 +181,238 @@ static gboolean text_clicked(GtkWidget *widget, GdkEventButton *event, gpointer
 	return FALSE;
 }
 
-static void resize() {
-	int w1, h1, w2, h2;
-	pango_layout_get_pixel_size(layout, &w1, &h1);
-	if (w1>0 && h1>0) {
-		w2 = draw->allocation.width;
-		h2 = draw->allocation.height;
-		int s = pango_font_description_get_size(font);
-		s = min ((s*w2/w1), (s*h2/h1));
-		pango_font_description_set_size(font,s);
-		pango_layout_set_font_description(layout, font);
-		need_resize = FALSE;
+static gboolean read_chan(GIOChannel *chan, GIOCondition condition, gpointer data){
+	gchar buf[1024];
+	GString *input;
+	GIOStatus stat = G_IO_STATUS_NORMAL;
+	gsize read;
+	GError *err = NULL;
+
+	while ((stat = g_io_channel_read_chars(chan, buf, sizeof(buf), &read, &err)) == G_IO_STATUS_NORMAL && err == NULL) {
+		g_string_append_len(partial_input, buf, read);
+	}
+
+	if (err != NULL)
+	{
+	    fprintf (stderr, "Unable to read stdin: %s\n", err->message);
+	    g_error_free (err);
+	    return TRUE;
+	}
+
+
+	if (stat == G_IO_STATUS_EOF) {
+		// There is an end of file, so use the whole input
+		input = g_string_new_len(partial_input->str, partial_input->len);
+		g_string_truncate(partial_input, 0);
+	} else {
+		// There is no end of file. Check for form feed characters.
+		// Use from the second-to-last to the last.
+		char *last_ff = strrchr(partial_input->str, '\f');
+		if (last_ff) {
+			*last_ff = '\0';
+			char *snd_last_ff = strrchr(partial_input->str, '\f');
+			if (snd_last_ff == NULL) snd_last_ff = partial_input->str;
+			input = g_string_new_len(snd_last_ff, last_ff - snd_last_ff);
+			g_string_erase(partial_input, 0, last_ff - partial_input->str + 1);
+		} else {
+			return TRUE;
+		}
+	}
+
+	// remove beginning and trailing newlines, if any
+	gssize cnt = 0;
+	while ((input->len > cnt) && (input->str[cnt] == '\n')) {
+		cnt++;
 	}
+	g_string_erase(input, 0, cnt);
+
+	while ((input->len > 0) && (input->str[input->len - 1] == '\n')) {
+		g_string_truncate(input, input->len - 1);
+	}
+
+	g_signal_handler_block (tb, text_change_handler);
+	gtk_text_buffer_set_text (tb, input->str, input->len);
+	g_signal_handler_unblock (tb, text_change_handler);
+
+	g_string_free(input, TRUE);
+
+	if (stat == G_IO_STATUS_AGAIN)
+		return TRUE;
 	else
-		need_resize = TRUE;
+		return FALSE;
+}
+
+static void newtext() {
+	gtk_widget_queue_draw(draw);
+}
+
+static void newtext_show_input() {
+	show_entry();
+}
+
+static void move_cursor(GtkTextView* tv, GtkMovementStep step, gint count, gboolean extend_selection, gpointer user_data) {
+	show_entry();
+}
+
+static struct option const long_options[] =
+{
+	{"help",       no_argument,       NULL, 'h'},
+	{"version",    no_argument,       NULL, 'V'},
+	{"foreground", required_argument, NULL, 'f'},
+	{"background", required_argument, NULL, 'b'},
+	{"font",       required_argument, NULL, 'n'},
+	{"rotate",     required_argument, NULL, 'r'},
+	{"align",      required_argument, NULL, 'a'},
+	{0,0,0,0}
+};
+
+static void usage(char *cmd) {
+	printf("Usage: %s [-h|--help] [-V|--version] [-f|--foreground=colordesc] [-b|--background=colordesc] [-n|--font=fontdesc] [-r|--rotate=0,1,2,3] [-a|--align=0,1,2]\n", cmd);
 }
 
+static void version() {
+	printf("%s\n", PACKAGE_STRING);
+}
 
-static void newtext(char *text) {
-	pango_layout_set_text(layout, get_text(), -1);
-	resize();
-	hq(FALSE, TRUE);
+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;
+	int input_provided = 0;
+
+	while ((c = getopt_long (argc, argv, "hVf:b:n:r:a:", long_options, (int *) 0)) != EOF) {
+		switch (c) {
+			case 'h':
+				usage(argv[0]);
+				return 0;
+				break;
+
+			case 'V':
+				version();
+				return 0;
+				break;
+
+			case 'f':
+				foreground = optarg;
+				break;
+
+			case 'b':
+				background = optarg;
+				break;
+
+			case 'n':
+				fontdesc = optarg;
+				break;
+			case 'r':
+				rotation = atoi(optarg);
+				break;
+			case 'a':
+				alignment = atoi(optarg);
+				break;
+			default:
+				/* unknown switch received - at least
+				 * give usage but continue and use the
+				 * data */
+				usage(argv[0]);
+				break;
+		}
+	}
+
 	gtk_init(&argc, &argv);
 
 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_decorated(GTK_WINDOW(window), FALSE);
+	gtk_window_set_icon_name (GTK_WINDOW (window), "sm");
 	gtk_window_fullscreen(GTK_WINDOW(window));
+
 	g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
 
-	settings = gtk_settings_get_default();
-	GdkColormap *colormap = gtk_widget_get_colormap(GTK_WIDGET(window));
-	GdkColor white, black;
-	gdk_colormap_alloc_color(colormap, &white, TRUE, TRUE);
-	gdk_color_parse("white", &white);
-	gdk_color_parse("black", &black);
-	gtk_widget_modify_bg(window, GTK_STATE_NORMAL, &white);
-	gtk_widget_modify_fg(window, GTK_STATE_NORMAL, &black);
+	if (foreground != NULL) {
+		my_gdk_rgba_parse(&black, foreground);
+	} else {
+		my_gdk_rgba_parse(&black, "black");
+	}
+	if (background != NULL) {
+		my_gdk_rgba_parse(&white, background);
+	} else {
+		my_gdk_rgba_parse(&white, "white");
+	}
 
 	draw = gtk_drawing_area_new();
-	gtk_widget_set_events(draw, GDK_BUTTON_PRESS_MASK);
+	gtk_widget_set_events(draw, GDK_BUTTON_PRESS_MASK|GDK_KEY_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);
+	g_signal_connect(G_OBJECT(draw), "key-press-event", G_CALLBACK(text_keypress), NULL);
+	gtk_widget_set_can_focus(draw, TRUE);
 
-	GdkPixmap *pixmap = gdk_pixmap_new(NULL, 1, 1, 1);
-	GdkColor color;
-	cursor = gdk_cursor_new_from_pixmap(pixmap, pixmap, &color, &color, 0, 0);
+	cursor = gdk_cursor_new_for_display(gtk_widget_get_display(GTK_WIDGET(draw)), GDK_BLANK_CURSOR);
 
 	tv = gtk_text_view_new();
-	gtk_widget_modify_bg(tv, GTK_STATE_NORMAL, &white);
-	gtk_widget_modify_fg(tv, GTK_STATE_NORMAL, &black);
 	tb = gtk_text_view_get_buffer(GTK_TEXT_VIEW(tv));
-	
-	if (argc > 1)
-		//tb.set_text(" ".join(sys.argv[1:]))
-		gtk_text_buffer_set_text(tb, argv[1], -1);
+
+	partial_input = g_string_new("");
+
+	if (argc > optind)
+		if (!strcmp(argv[optind], "-") ) {
+			// read from stdin
+			GIOChannel *chan = g_io_channel_unix_new(0);
+			g_io_channel_set_flags(chan, G_IO_FLAG_NONBLOCK, NULL);
+			g_io_add_watch (chan, G_IO_IN | G_IO_HUP, &read_chan, NULL);
+
+			input = g_string_new("");
+			input_provided++;
+		} else {
+			int i;
+
+			input = g_string_new("");
+
+			for (i = optind; i < argc; i++) {
+				g_string_append(input, argv[i]);
+
+				if (i < argc - 1) {
+					g_string_append(input, " ");
+				}
+			}
+			input_provided++;
+		}
 	else
-		gtk_text_buffer_set_text(tb, ":-)", -1);
+		input = g_string_new(":-)");
 
-	quit = gtk_button_new_from_stock(GTK_STOCK_QUIT);
+	gtk_text_buffer_set_text(tb, input->str, input->len);
+	g_string_free(input, TRUE);
+	GtkTextIter start, end;
+	gtk_text_buffer_get_bounds(tb, &start, &end);
+	gtk_text_buffer_select_range(tb, &start, &end);
+
+	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);
-	gtk_widget_modify_bg(quit, GTK_STATE_NORMAL, &white);
-	gtk_widget_modify_fg(quit, GTK_STATE_NORMAL, &black);
 
-	GtkWidget *hbox = gtk_hbox_new(FALSE,0);
+	GtkWidget *vbox_button = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+	gtk_box_pack_end(GTK_BOX(vbox_button), quit, FALSE, FALSE, 0);
+
+	GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,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);
+	GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL,0);
+	gtk_box_pack_start(GTK_BOX(vbox), draw, TRUE, TRUE, 0);
+	gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	gtk_container_add(GTK_CONTAINER(window), vbox);
 
 	font = pango_font_description_new();
-        pango_font_description_set_family(font, "sans-serif");
-	pango_font_description_set_size(font, 20*PANGO_SCALE);
-
-	layout=  gtk_widget_create_pango_layout(draw,get_text());
-	pango_layout_set_font_description(layout, font);
-	pango_layout_set_alignment(layout,PANGO_ALIGN_CENTER);
+	if (fontdesc != NULL) {
+		pango_font_description_set_family(font, fontdesc);
+	} else {
+		pango_font_description_set_family(font, "sans-serif");
+	}
+	pango_font_description_set_size(font, 200*PANGO_SCALE);
 
 	GtkAccelGroup *accel = gtk_accel_group_new();
 	guint key;
@@ -196,9 +424,17 @@ 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), "configure-event", G_CALLBACK(resize), NULL);
-	g_signal_connect(G_OBJECT(draw), "expose-event", G_CALLBACK(redraw), NULL);
+	g_signal_connect_after(G_OBJECT(draw), "draw", G_CALLBACK(redraw), NULL);
+	text_change_handler = g_signal_connect(G_OBJECT(tb), "changed", G_CALLBACK(newtext_show_input), NULL);
 	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)
+		hide_entry(NULL);
+	else
+		show_entry();
 
 	gtk_main();
+
+	return 0;
 }