gdm r6048 - in trunk: . gui/user-switch-applet po utils

[mccann svn gnome org]

Author: mccann
Date: Wed Mar 19 20:23:59 2008
New Revision: 6048
URL: http://svn.gnome.org/viewvc/gdm?rev=6048&view=rev

Log:
2008-03-19  William Jon McCann  <jmccann redhat com>

	* gui/user-switch-applet/applet.c: (sort_menu):
	* utils/Makefile.am:
	* utils/gdm-screenshot.c: (screenshot_grab_lock),
	(screenshot_release_lock), (screenshot_get_pixbuf),
	(screenshot_save), (prepare_screenshot), (main):
	Add screenshot tool.



Added:
   trunk/utils/gdm-screenshot.c
Modified:
   trunk/ChangeLog
   trunk/gui/user-switch-applet/applet.c
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
   trunk/utils/Makefile.am

Modified: trunk/gui/user-switch-applet/applet.c
==============================================================================
--- trunk/gui/user-switch-applet/applet.c	(original)
+++ trunk/gui/user-switch-applet/applet.c	Wed Mar 19 20:23:59 2008
@@ -580,8 +580,9 @@
         n_items = 0;
         items = adata->items;
         while (items) {
-                if (GTK_WIDGET_VISIBLE (items->data))
+                if (GTK_WIDGET_VISIBLE (items->data)) {
                         n_items++;
+                }
 
                 items = items->next;
         }
@@ -595,10 +596,14 @@
         column = 0;
         count = 0;
         items = adata->items;
-        while (items) {
+        while (items != NULL) {
                 if (GTK_WIDGET_VISIBLE (items->data)) {
-                        gtk_menu_attach (GTK_MENU (adata->menu), items->data,
-                                         column, column + 1, row, row + 1);
+                        gtk_menu_attach (GTK_MENU (adata->menu),
+                                         items->data,
+                                         column,
+                                         column + 1,
+                                         row,
+                                         row + 1);
                         row++;
                         if (row > n_rows) {
                                 row = 0;
@@ -610,7 +615,8 @@
                          * have to set that explicitly.
                          */
                         gtk_menu_reorder_child (GTK_MENU (adata->menu),
-                                                items->data, count++);
+                                                items->data,
+                                                count++);
                 }
 
                 items = items->next;

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Wed Mar 19 20:23:59 2008
@@ -79,3 +79,5 @@
 gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
 gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
 utils/gdmflexiserver.c
+utils/gdm-screenshot.c
+

Modified: trunk/utils/Makefile.am
==============================================================================
--- trunk/utils/Makefile.am	(original)
+++ trunk/utils/Makefile.am	Wed Mar 19 20:23:59 2008
@@ -24,6 +24,7 @@
 
 bin_PROGRAMS = \
 	gdmflexiserver		\
+	gdm-screenshot		\
 	$(NULL)
 
 sbin_SCRIPTS = 			\
@@ -41,6 +42,15 @@
 	$(COMMON_LIBS)		\
 	$(NULL)
 
+gdm_screenshot_SOURCES =	\
+	gdm-screenshot.c	\
+	$(NULL)
+
+gdm_screenshot_LDADD =		\
+	$(GTK_LIBS)		\
+	$(COMMON_LIBS)		\
+	$(NULL)
+
 EXTRA_DIST = 			\
 	gdm-stop.in		\
 	gdm-restart.in		\

Added: trunk/utils/gdm-screenshot.c
==============================================================================
--- (empty file)
+++ trunk/utils/gdm-screenshot.c	Wed Mar 19 20:23:59 2008
@@ -0,0 +1,235 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2008 William Jon McCann <jmccann redhat com>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#include <X11/Xatom.h>
+#include <gdk/gdkx.h>
+
+#define SELECTION_NAME "_GDM_SCREENSHOT"
+static GtkWidget *selection_window;
+
+static gboolean debug_in;
+
+/* Keep all config options for compatibility even if they are noops */
+GOptionEntry options [] = {
+        { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug_in, N_("Debugging output"), NULL },
+        { NULL }
+};
+
+/* To make sure there is only one screenshot taken at a time,
+ * (Imagine key repeat for the print screen key) we hold a selection
+ * until we are done taking the screenshot
+ */
+/*  * Copyright (C) 2001-2006  Jonathan Blandford <jrb alum mit edu> */
+static gboolean
+screenshot_grab_lock (void)
+{
+        Atom       selection_atom;
+        GdkCursor *cursor;
+        gboolean   result = FALSE;
+
+        selection_atom = gdk_x11_get_xatom_by_name (SELECTION_NAME);
+        XGrabServer (GDK_DISPLAY ());
+        if (XGetSelectionOwner (GDK_DISPLAY(), selection_atom) != None) {
+                goto out;
+        }
+
+        selection_window = gtk_invisible_new ();
+        gtk_widget_show (selection_window);
+
+        if (!gtk_selection_owner_set (selection_window,
+                                      gdk_atom_intern (SELECTION_NAME, FALSE),
+                                      GDK_CURRENT_TIME)) {
+                gtk_widget_destroy (selection_window);
+                selection_window = NULL;
+                goto out;
+        }
+
+        cursor = gdk_cursor_new (GDK_WATCH);
+        gdk_pointer_grab (selection_window->window, FALSE, 0, NULL,
+                          cursor, GDK_CURRENT_TIME);
+        gdk_cursor_unref (cursor);
+
+        result = TRUE;
+
+ out:
+        XUngrabServer (GDK_DISPLAY ());
+        gdk_flush ();
+
+        return result;
+}
+
+/*  * Copyright (C) 2001-2006  Jonathan Blandford <jrb alum mit edu> */
+static void
+screenshot_release_lock (void)
+{
+        if (selection_window != NULL) {
+                gtk_widget_destroy (selection_window);
+                selection_window = NULL;
+        }
+        gdk_flush ();
+}
+
+/*  * Copyright (C) 2001-2006  Jonathan Blandford <jrb alum mit edu> */
+static GdkPixbuf *
+screenshot_get_pixbuf (Window w)
+{
+        GdkWindow *window;
+        GdkWindow *root;
+        GdkPixbuf *screenshot;
+        int        x_real_orig;
+        int        y_real_orig;
+        int        x_orig;
+        int        y_orig;
+        int        real_width;
+        int        real_height;
+        int        width;
+        int        height;
+
+        window = gdk_window_foreign_new (w);
+        if (window == NULL) {
+                return NULL;
+        }
+
+        root = gdk_window_foreign_new (GDK_ROOT_WINDOW ());
+        gdk_drawable_get_size (window, &real_width, &real_height);
+        gdk_window_get_origin (window, &x_real_orig, &y_real_orig);
+
+        x_orig = x_real_orig;
+        y_orig = y_real_orig;
+        width = real_width;
+        height = real_height;
+
+        if (x_orig < 0) {
+                width = width + x_orig;
+                x_orig = 0;
+        }
+        if (y_orig < 0) {
+                height = height + y_orig;
+                y_orig = 0;
+        }
+
+        if (x_orig + width > gdk_screen_width ()) {
+                width = gdk_screen_width () - x_orig;
+        }
+        if (y_orig + height > gdk_screen_height ()) {
+                height = gdk_screen_height () - y_orig;
+        }
+
+        screenshot = gdk_pixbuf_get_from_drawable (NULL,
+                                                   root,
+                                                   NULL,
+                                                   x_orig,
+                                                   y_orig,
+                                                   0,
+                                                   0,
+                                                   width,
+                                                   height);
+
+        return screenshot;
+}
+
+static char *
+screenshot_save (GdkPixbuf *pixbuf)
+{
+        char    *filename;
+        gboolean res;
+        GError  *error;
+
+        filename = g_build_filename (g_get_tmp_dir (),
+                                     "GDM-Screenshot.png",
+                                     NULL);
+
+        error = NULL;
+        res = gdk_pixbuf_save (pixbuf,
+                               filename,
+                               "png",
+                               &error,
+                               "tEXt::CREATOR", "gdm-screenshot",
+                               NULL);
+        if (! res) {
+                g_warning ("Unable to save screenshot: %s", error->message);
+                g_error_free (error);
+                g_free (filename);
+                filename = NULL;
+        }
+
+        return filename;
+}
+
+static void
+prepare_screenshot (void)
+{
+        Window     win;
+        GdkPixbuf *screenshot;
+        char      *filename;
+
+        if (!screenshot_grab_lock ()) {
+                exit (0);
+        }
+
+        win = GDK_ROOT_WINDOW ();
+
+        screenshot = screenshot_get_pixbuf (win);
+
+        screenshot_release_lock ();
+
+        if (screenshot == NULL) {
+                /* FIXME: dialog? */
+                exit (1);
+        }
+
+        filename = screenshot_save (screenshot);
+        g_print ("Wrote %s\n", filename);
+        /* FIXME: show a dialog or something */
+
+        g_free (filename);
+}
+
+int
+main (int argc, char *argv[])
+{
+        GOptionContext *ctx;
+
+        bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+        textdomain (GETTEXT_PACKAGE);
+
+        /* Option parsing */
+        ctx = g_option_context_new ("- New GDM login");
+        g_option_context_add_main_entries (ctx, options, _("Main Options"));
+        g_option_context_parse (ctx, &argc, &argv, NULL);
+        g_option_context_free (ctx);
+
+        gtk_init (&argc, &argv);
+
+        prepare_screenshot ();
+
+        return 1;
+}