Solaris uses the gtk unlock dialog program originally written by

Ximian & Wipro, in order to provide a dialog box that works with

the GNOME accessibility framework.   This was done as a fork of

the original xscreensaver because the maintainer would not allow

use of a toolkit in the lock dialog - he has since softened his

stance a bit, but this has not been presented to him to see if it

meets his requirements as spelled out at:

        http://www.jwz.org/xscreensaver/toolkits.html

This patch also contains fixes for:

15134570 SUNBT4782515 user is prompted to enter PIN or password when screen

	 	      is locked

15134983 SUNBT4783832 No date on xscreensaver-lock and warning on screen

15179562 SUNBT4931584 xscreensaver-demo cores with GTK_MODULES=gail:atk-bridge

15209082 SUNBT5039876 "User:" should not look like an input field

15209083 SUNBT5039878 "Password:" field should be focused / have flashing caret

15214348 SUNBT5059445 pam service name, screen kb and screen reader support

15220008 SUNBT5077989 Bug 147580: password input dialogue obscures GOK

15220010 SUNBT5077993 Bug 147639: Gok cant automatically UI grab screensaver

	 	      preferences

15220705 SUNBT5079870 147587: password field should set ATK_ROLE_PASSWORD_TEXT

15221761 SUNBT5083155 Unable to unlock screen when running dual head

	 	      magnification

15231258 SUNBT6176524 passwdTimeoutEnable for disabled user (xscreensaver-lock)

15231818 SUNBT6178584 Xscreensaver needs to use ROLE_PASSWORD_TEXT

15233078 SUNBT6182506 Screensaver dialog isn't magnified properly

15239418 SUNBT6203951 xscreensaver lockscreen translation errors for fr_FR

15252945 SUNBT6237901 Ldap and Gnome xscreensaver authentication failure

15265442 SUNBT6269444 snv_14 xscreensaver prints out gratuitous debug messages

	 	      after authentication

15280862 SUNBT6308859 xscreensaver: password lock dialog is not localized

15295912 SUNBT6346056 xscreensaver should not enable input method

15317555 SUNBT6395649 at-spi-registryd starts when screen is locked even when

	 	      accessible device support is off

15326852 SUNBT6417168 xscreensaver loops while trying to unlock a session for

	 	      a user whose password was expired

15346556 SUNBT6461887 GNOME screen lock does not prevent access to other

	 	      applications via 'alt-tab'

15352585 SUNBT6475285 xscreensaver core dumps in kill_job() after unlocking

	 	      the screen

15354012 SUNBT6478362 When the AT support is enabled, the input focus is

	 	      located at password label

15356879 SUNBT6484604 X should stop linking against -lcmd

15375976 SUNBT6520014 possible mem. leak in xscreensaver's lock.c in s11/nv

15387793 SUNBT6541240 Screen saver will lock user out of the system if they

	 	      have no password set

15405753 SUNBT6573182 after applying patch 120094-11(or later), xscreensaver

	 	      core dump

15427168 SUNBT6611183 xscreensaver needs to put Sun logos in files loaded at

	 	      runtime

15461985 SUNBT6670025 xscreensaver passwd dialog image missing in nv_85

15462355 SUNBT6670659 password dialog window remains on the screen even after

	 	      screen is unlocked

15463666 SUNBT6673036 prepare for Indiana unlock logos

15500787 SUNBT6736157 Security problem when desktop a11y support is turned on

15521700 SUNBT6769901 popup windows appearing through xscreensaver

15553552 SUNBT6825374 xscreensaver issues under Xorg

15561643 SUNBT6839026 Regression in screensaver may cause Performance

	 	      Degradation and make locked screensaver unresponsive

15565807 SUNBT6845751 xscreensaver-lock chews CPU when daemon dies while unlock

	 	      dialog is up

15568147 SUNBT6849124 xscreensaver leaves a dialog that cannot be moved/closed

	 	      after password change warning

15573881 SUNBT6857559 Nevada build was broken because of 6849124

---

 config.h.in           |    3 +

 configure.in          |   23 +-

 driver/Makefile.in    |   59 +++-

 driver/auth.h         |    4 +

 driver/demo-Gtk.c     |   18 +

 driver/dialog-data.h  |  131 ++++++

 driver/lock-Gtk.c     |  955 +++++++++++++++++++++++++++++++++++++++++++

 driver/lock.c         | 1083 ++++++++++++++++++++++++++++++++++++++++++++-----

 driver/passwd-pam.c   |  207 +++++++++-

 driver/passwd.c       |    1 +

 driver/setuid.c       |    5 +-

 driver/subprocs.c     |   35 ++-

 driver/timers.c       |  110 +++++-

 driver/types.h        |   18 +

 driver/windows.c      |   21 +-

 driver/xscreensaver.c |  131 ++++++-

 driver/xscreensaver.h |    6 +

 17 files changed, 2663 insertions(+), 147 deletions(-)

 create mode 100644 driver/dialog-data.h

 create mode 100644 driver/lock-Gtk.c

diff --git a/config.h.in b/config.h.in

--- a/config.h.in

+++ b/config.h.in

@@ -384,6 +384,9 @@

    make use of this if it is available. */

 #undef HAVE_XPM

+/* Define this to build the external lock dialog */

+#undef HAVE_XSCREENSAVER_LOCK

+

 /* Define this if you have the X Shared Memory Extension. */

 #undef HAVE_XSHM_EXTENSION

diff --git a/configure.in b/configure.in

--- a/configure.in

+++ b/configure.in

@@ -2531,6 +2531,8 @@ if test "$with_gtk" = yes; then

   pkg_check_version        libglade-2.0  1.99.0

   pkg_check_version      gdk-pixbuf-2.0  2.0.0

   pkg_check_version gdk-pixbuf-xlib-2.0  2.0.0

+  pkg_check_version           gconf-2.0  2.6.1

+  pkg_check_version  libloginhelper-1.0  1.0

   have_gtk="$ok"

   if test "$have_gtk" = no; then

@@ -2546,6 +2548,9 @@ if test "$with_gtk" = yes; then

   fi

   if test "$have_gtk" = yes; then

+#--- Begin SUNW addition

+    AC_DEFINE(HAVE_XSCREENSAVER_LOCK,[],[Define this to build the external lock dialog])

+#--- End SUNW addition

     AC_CACHE_CHECK([for Gtk includes], ac_cv_gtk_config_cflags,

                    [ac_cv_gtk_config_cflags=`$pkg_config --cflags $pkgs`])

     AC_CACHE_CHECK([for Gtk libs], ac_cv_gtk_config_libs,

@@ -3642,6 +3647,16 @@ if test "$have_gtk" = yes; then

   ALL_DEMO_PROGRAMS="$PREFERRED_DEMO_PROGRAM $ALL_DEMO_PROGRAMS"

 fi

+#--- Begin SUNW addition

+PREFERRED_LOCK_PROGRAM=

+ALL_LOCK_PROGRAMS=

+LOCK_PROGRAM=

+if test "$have_gtk" = yes; then

+  PREFERRED_LOCK_PROGRAM=xscreensaver-lock-Gtk

+  ALL_LOCK_PROGRAMS="$PREFERRED_LOCK_PROGRAM $ALL_LOCK_PROGRAMS"

+  LOCK_PROGRAM=xscreensaver-lock

+fi

+#--- End SUNW addition

 if test "$have_kerberos" = yes; then

   PASSWD_SRCS="$PASSWD_SRCS \$(KERBEROS_SRCS)"

@@ -3781,6 +3796,11 @@ AC_SUBST(INCLUDES)

 AC_SUBST(PREFERRED_DEMO_PROGRAM)

 AC_SUBST(ALL_DEMO_PROGRAMS)

+#--- Begin SUNW addition

+AC_SUBST(PREFERRED_LOCK_PROGRAM)

+AC_SUBST(ALL_LOCK_PROGRAMS)

+AC_SUBST(LOCK_PROGRAM)

+#--- End SUNW addition

 AC_SUBST(SAVER_LIBS)

 AC_SUBST(MOTIF_LIBS)

 AC_SUBST(GTK_LIBS)

@@ -4260,7 +4280,8 @@ HACK_CONF_DIR=`echo "${HACK_CONF_DIR}" | sed 's@/$@@;s@//*@/@g'`

 # Sanity check the hackdir

-for bad_choice in xscreensaver xscreensaver-demo xscreensaver-command ; do

+# SUNW addition: added xscreensaver-lock to list on next line

+for bad_choice in xscreensaver xscreensaver-demo xscreensaver-command xscreensaver-lock ; do

   if test "${HACKDIR}" = "${bindir}/${bad_choice}" ; then

     echo ""

     AC_MSG_ERROR([\"--with-hackdir=${bindir}/${bad_choice}\" won't work.

diff --git a/driver/Makefile.in b/driver/Makefile.in

--- a/driver/Makefile.in

+++ b/driver/Makefile.in

@@ -29,6 +29,7 @@ GTK_APPDIR	= $(GTK_DATADIR)/applications

 GTK_ICONDIR	= $(GTK_DATADIR)/pixmaps

 GTK_GLADEDIR	= $(prefix)/lib/xscreensaver/config

 HACK_CONF_DIR	= @HACK_CONF_DIR@

+LOCK_DIR	= $(libexecdir)

 CC		= @CC@

 OBJCC		= @OBJCC@

@@ -42,6 +43,7 @@ SUBP_DEFS	= $(DEFS) -DHACK_PATH='"@HACKDIR@"' \

 GTK_DEFS	= $(DEFS) -DDEFAULT_ICONDIR='"$(GTK_GLADEDIR)"' \

 			-DBINDIR='"$(bindir)"'

 CONF_DEFS	= -DHACK_CONFIGURATION_PATH='"$(HACK_CONF_DIR)"'

+LOCK_DEFS	= $(DEFS) -DLOCKDIR=\"$(LOCK_DIR)\"

 LIBS		= @LIBS@

 INTL_LIBS	= @INTLLIBS@

@@ -100,6 +102,8 @@ GTK_SRCS	= demo-Gtk.c demo-Gtk-conf.c \

 		  demo-Gtk-widgets.c demo-Gtk-support.c

 GTK_EXTRA_OBJS  = demo-Gtk-widgets.o demo-Gtk-support.o

 GTK_OBJS	= demo-Gtk.o demo-Gtk-conf.o @GTK_EXTRA_OBJS@

+GTK_LOCK_SRCS	= lock-Gtk.c atoms.c remote.c

+GTK_LOCK_OBJS	= lock-Gtk.o atoms.o remote.o

 PWENT_SRCS	= passwd-pwent.c

 PWENT_OBJS	= passwd-pwent.o

@@ -219,8 +223,8 @@ GETIMG_LIBS	= $(LIBS) $(X_LIBS) $(XPM_LIBS) $(JPEG_LIBS) \

 		  $(X_PRE_LIBS) -lXt -lX11 $(XMU_LIBS) -lXext $(X_EXTRA_LIBS)

 EXES		= xscreensaver xscreensaver-command xscreensaver-demo \

-		  xscreensaver-getimage @EXES_OSX@

-EXES2		= @ALL_DEMO_PROGRAMS@

+		  xscreensaver-getimage @EXES_OSX@ @LOCK_PROGRAM@

+EXES2		= @ALL_DEMO_PROGRAMS@ @ALL_LOCK_PROGRAMS@

 EXES_OSX	= pdf2jpeg

 SCRIPTS_1	= xscreensaver-getimage-file xscreensaver-getimage-video \

@@ -250,7 +254,7 @@ VMSFILES	= compile_axp.com compile_decc.com link_axp.com link_decc.com \

 		  vms-getpwnam.c vms-pwd.h vms-hpwd.c vms-validate.c \

 		  vms_axp.opt vms_axp_12.opt vms_decc.opt vms_decc_12.opt

-TARFILES	= $(EXTRAS) $(VMSFILES) $(SAVER_SRCS_1) \

+TARFILES	= $(EXTRAS) $(VMSFILES) $(SAVER_SRCS_1) $(GTK_LOCK_SRCS) \

 		  $(MOTIF_SRCS) $(GTK_SRCS) $(PWENT_SRCS) $(PWHELPER_SRCS) \

 		  $(KERBEROS_SRCS) $(PAM_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) \

 		  $(CMD_SRCS) $(GETIMG_SRCS_1) $(PDF2JPEG_SRCS) $(HDRS) \

@@ -263,7 +267,7 @@ all: $(EXES) $(EXES2)

 tests: $(TEST_EXES)

 install:   install-program   install-ad    install-scripts \

-	   install-gnome     install-man   install-xml install-pam

+	   install-gnome     install-man   install-xml

 uninstall: uninstall-program uninstall-ad  \

 	   uninstall-gnome   uninstall-man uninstall-xml  

@@ -275,6 +279,9 @@ install-program: $(EXES)

 	@if [ ! -d $(install_prefix)$(bindir) ]; then			\

 	  $(INSTALL_DIRS) $(install_prefix)$(bindir) ;			\

 	 fi

+	@if [ -n "@LOCK_PROGRAM@" -a ! -d $(install_prefix)$(LOCK_DIR) ]; then \

+	  $(INSTALL_DIRS) $(install_prefix)$(LOCK_DIR) ; 		\

+	 fi

 	@inst="$(INSTALL_PROGRAM)" ;					\

 	if [ @NEED_SETUID@ = yes ]; then				\

 	   me=`PATH="$$PATH:/usr/ucb" whoami` ;				\

@@ -303,6 +310,12 @@ install-program: $(EXES)

 	  echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \

 	       $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \

 	 done

+	@if [ -n "@LOCK_PROGRAM@" ]; then				     \

+	  echo $(INSTALL_PROGRAM) xscreensaver-lock \

+	    $(install_prefix)$(LOCK_DIR)/xscreensaver-lock ; \

+	   $(INSTALL_PROGRAM) xscreensaver-lock \

+	    $(install_prefix)$(LOCK_DIR)/xscreensaver-lock ; \

+	fi

 install-ad: XScreenSaver.ad

 	@if [ ! -d $(install_prefix)$(AD_DIR) ]; then			      \

@@ -738,7 +751,7 @@ $(SAVER_UTIL_OBJS):

 # How we build object files in this directory.

 .c.o:

-	$(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $<

+	$(CC) -c $(INCLUDES) $(DEFS) $(INTL_DEFS) $(CFLAGS) $(X_CFLAGS) $<

 .m.o:

 	$(OBJCC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $<

@@ -764,6 +777,16 @@ demo-Gtk-conf.o: demo-Gtk-conf.c

 	$(CC) -c $(INCLUDES) $(CONF_DEFS) $(GTK_DEFS) $(CFLAGS) $(X_CFLAGS) \

 	  $(srcdir)/demo-Gtk-conf.c

+# lock takes an extra -D option.

+lock.o:

+	$(CC) -c $(INCLUDES) $(LOCK_DEFS) $(CFLAGS) $(X_CFLAGS) \

+	  $(srcdir)/lock.c

+

+# lock-Gtk takes extra -D and -I options.

+lock-Gtk.o: lock-Gtk.c

+	$(CC) -c $(INCLUDES) -I$(ICON_SRC) $(GTK_DEFS) \

+	  $(CFLAGS) $(X_CFLAGS) $(INTL_DEFS) \

+	  $(srcdir)/lock-Gtk.c

 # How we build the default app-defaults file into the program.

 #

@@ -778,7 +801,8 @@ XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad

 # The executables linked in this directory.

 #

 xscreensaver: $(SAVER_OBJS)

-	$(CC) $(LDFLAGS) -o $@ $(SAVER_OBJS) $(SAVER_LIBS)

+	$(CC) $(LDFLAGS) -o $@ $(SAVER_OBJS) $(SAVER_LIBS) \

+	-lgconf-2 -lgobject-2.0

 xscreensaver-command: $(CMD_OBJS)

 	$(CC) $(LDFLAGS) -o $@ $(CMD_OBJS) $(CMD_LIBS)

@@ -794,6 +818,15 @@ xscreensaver-demo: @PREFERRED_DEMO_PROGRAM@

 	       cp -p @PREFERRED_DEMO_PROGRAM@@EXEEXT@ $@@EXEEXT@      ;	\

 	fi

+xscreensaver-lock: @PREFERRED_LOCK_PROGRAM@

+	$(INSTALL_PROGRAM) @PREFERRED_LOCK_PROGRAM@ $@

+

+xscreensaver-lock-Gtk: $(GTK_LOCK_OBJS)

+	$(CC) $(LDFLAGS) -o $@ $(GTK_LOCK_OBJS) $(LIBS) $(X_LIBS) \

+	$(GTK_LIBS) $(XML_LIBS) $(X_PRE_LIBS) -lXt -lX11 \

+	$(XDPMS_LIBS) -lXext \

+	$(X_EXTRA_LIBS)

+

 xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS)

 	$(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(MOTIF_OBJS) $(LIBS) $(X_LIBS) \

 	$(MOTIF_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) -lXt -lX11 \

@@ -817,7 +850,7 @@ pdf2jpeg: $(PDF2JPEG_OBJS)

 TEST_PASSWD_OBJS = test-passwd.o $(LOCK_OBJS_1) $(PASSWD_OBJS) \

-	 subprocs.o setuid.o splash.o prefs.o mlstring.o exec.o \

+	 subprocs.o setuid.o splash.o prefs.o mlstring.o \

 	$(SAVER_UTIL_OBJS)

 test-passwd.o: XScreenSaver_ad.h

@@ -907,8 +940,14 @@ dpms.o: $(srcdir)/types.h

 dpms.o: $(srcdir)/xscreensaver.h

 exec.o: ../config.h

 exec.o: $(srcdir)/exec.h

+lock-Gtk.o: $(srcdir)/atoms.h

+lock-Gtk.o: ../config.h

+lock-Gtk.o: $(srcdir)/remote.h

+lock-Gtk.o: $(UTILS_SRC)/xscreensaver-intl.h

 lock.o: $(srcdir)/auth.h

 lock.o: ../config.h

+lock.o: $(srcdir)/dialog-data.h

+lock.o: $(srcdir)/exec.h

 lock.o: $(srcdir)/mlstring.h

 lock.o: $(srcdir)/prefs.h

 lock.o: $(srcdir)/types.h

@@ -917,6 +956,8 @@ lock.o: $(srcdir)/xscreensaver.h

 mlstring.o: $(srcdir)/mlstring.h

 passwd.o: $(srcdir)/auth.h

 passwd.o: ../config.h

+passwd.o: $(srcdir)/dialog-data.h

+passwd.o: $(srcdir)/mlstring.h

 passwd.o: $(srcdir)/prefs.h

 passwd.o: $(srcdir)/types.h

 passwd.o: $(srcdir)/xscreensaver.h

@@ -984,6 +1025,8 @@ test-vp.o: ../config.h

 test-xdpms.o: ../config.h

 test-xinerama.o: ../config.h

 timers.o: ../config.h

+timers.o: $(srcdir)/dialog-data.h

+timers.o: $(srcdir)/mlstring.h

 timers.o: $(srcdir)/prefs.h

 timers.o: $(srcdir)/types.h

 timers.o: $(srcdir)/xscreensaver.h

@@ -1011,6 +1054,8 @@ xscreensaver-getimage.o: $(UTILS_SRC)/yarandom.h

 xscreensaver.o: XScreenSaver_ad.h

 xscreensaver.o: $(srcdir)/auth.h

 xscreensaver.o: ../config.h

+xscreensaver.o: $(srcdir)/dialog-data.h

+xscreensaver.o: $(srcdir)/mlstring.h

 xscreensaver.o: $(srcdir)/prefs.h

 xscreensaver.o: $(srcdir)/types.h

 xscreensaver.o: $(UTILS_SRC)/resources.h

diff --git a/driver/auth.h b/driver/auth.h

--- a/driver/auth.h

+++ b/driver/auth.h

@@ -51,4 +51,8 @@ xss_authenticate(saver_info *si, Bool verbose_p);

 void

 auth_finished_cb (saver_info *si);

+#ifdef HAVE_XSCREENSAVER_LOCK

+extern int write_to_child (saver_info* si, const char* cmd, const char *msg);

+#endif

+

 #endif

diff --git a/driver/demo-Gtk.c b/driver/demo-Gtk.c

--- a/driver/demo-Gtk.c

+++ b/driver/demo-Gtk.c

@@ -98,6 +98,8 @@

 # define G_MODULE_EXPORT /**/

 #endif /* !HAVE_GTK2 */

+#include <gconf/gconf-client.h>

+

 #if defined(DEFAULT_ICONDIR) && !defined(GLADE_DIR)

 # define GLADE_DIR DEFAULT_ICONDIR

 #endif

@@ -5024,6 +5026,22 @@ main (int argc, char **argv)

   load_init_file (dpy, p);

   initialize_sort_map (s);

+  /* Bug 147639: Gok cant automatically UI grab screensaver preferences */

+  {

+    GConfClient *client = gconf_client_get_default ();

+

+#define KEY "/desktop/gnome/interface/accessibility"

+

+    /* check if accessibilty mode is enabled */

+    if (gconf_client_get_bool (client, KEY, NULL))

+      {

+	/* GTK Accessibility Module initialized */

+	const char *modulesptr = g_getenv ("GTK_MODULES");

+	if (!modulesptr || (modulesptr [0] == '\0'))

+	  putenv ("GTK_MODULES=gail:atk-bridge");

+      }

+  }

+

   /* Now that Xt has been initialized, and the resources have been read,

      we can set our `progname' variable to something more in line with

      reality.

diff --git a/driver/dialog-data.h b/driver/dialog-data.h

new file mode 100644

--- /dev/null

+++ b/driver/dialog-data.h

@@ -0,0 +1,131 @@

+/* xscreensaver, Copyright (c) 1993-2008 Jamie Zawinski <[email protected]>

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, provided that

+ * the above copyright notice appear in all copies and that both that

+ * copyright notice and this permission notice appear in supporting

+ * documentation.  No representations are made about the suitability of this

+ * software for any purpose.  It is provided "as is" without express or

+ * implied warranty.

+ */

+

+#ifndef __DIALOG_DATA_H__

+#define __DIALOG_DATA_H__

+

+#include <stdio.h>

+#include "types.h"

+#include "mlstring.h"

+

+#define MAX_BYTES_PER_CHAR 8	/* UTF-8 uses no more than 3, I think */

+#define MAX_PASSWD_CHARS   128	/* Longest possible passphrase */

+

+struct passwd_dialog_data {

+

+  saver_screen_info *prompt_screen;

+  int previous_mouse_x, previous_mouse_y;

+

+  /* "Characters" in the password may be a variable number of bytes long.

+     typed_passwd contains the raw bytes.

+     typed_passwd_char_size indicates the size in bytes of each character,

+     so that we can make backspace work.

+   */

+  char typed_passwd [MAX_PASSWD_CHARS * MAX_BYTES_PER_CHAR];

+  char typed_passwd_char_size [MAX_PASSWD_CHARS];

+  

+  XtIntervalId timer;

+  int i_beam;

+

+  float ratio;

+  Position x, y;

+  Dimension width;

+  Dimension height;

+  Dimension border_width;

+

+  Bool echo_input;

+  Bool show_stars_p; /* "I regret that I have but one asterisk for my country."

+                        -- Nathan Hale, 1776. */

+

+  char *heading_label;

+  char *body_label;

+  char *user_label;

+  mlstring *info_label;

+  /* The entry field shall only be displayed if prompt_label is not NULL */

+  mlstring *prompt_label;

+  char *date_label;

+  char *passwd_string;

+  Bool passwd_changed_p; /* Whether the user entry field needs redrawing */

+  Bool caps_p;           /* Whether we saw a keypress with caps-lock on */

+  char *unlock_label;

+  char *login_label;

+  char *uname_label;

+

+  Bool show_uname_p;

+

+#ifndef HAVE_XSCREENSAVER_LOCK

+  XFontStruct *heading_font;

+  XFontStruct *body_font;

+  XFontStruct *label_font;

+  XFontStruct *passwd_font;

+  XFontStruct *date_font;

+  XFontStruct *button_font;

+  XFontStruct *uname_font;

+

+  Pixel foreground;

+  Pixel background;

+  Pixel border;

+  Pixel passwd_foreground;

+  Pixel passwd_background;

+  Pixel thermo_foreground;

+  Pixel thermo_background;

+  Pixel shadow_top;

+  Pixel shadow_bottom;

+  Pixel button_foreground;

+  Pixel button_background;

+

+  Dimension preferred_logo_width, logo_width;

+  Dimension preferred_logo_height, logo_height;

+  Dimension thermo_width;

+  Dimension internal_border;

+  Dimension shadow_width;

+

+  Dimension passwd_field_x, passwd_field_y;

+  Dimension passwd_field_width, passwd_field_height;

+

+  Dimension unlock_button_x, unlock_button_y;

+  Dimension unlock_button_width, unlock_button_height;

+

+  Dimension login_button_x, login_button_y;

+  Dimension login_button_width, login_button_height;

+

+  Dimension thermo_field_x, thermo_field_y;

+  Dimension thermo_field_height;

+

+  Pixmap logo_pixmap;

+  Pixmap logo_clipmask;

+  int logo_npixels;

+  unsigned long *logo_pixels;

+#endif /* ! HAVE_XSCREENSAVER_LOCK */

+

+  Cursor passwd_cursor;

+  Bool unlock_button_down_p;

+  Bool login_button_down_p;

+  Bool login_button_p;

+  Bool login_button_enabled_p;

+  Bool button_state_changed_p; /* Refers to both buttons */

+

+  Pixmap save_under;

+  Pixmap user_entry_pixmap;

+

+#ifdef HAVE_XSCREENSAVER_LOCK

+  /* extern passwd dialog stuff */

+  XtInputId stdout_input_id;

+  int       stdin_fd;    /* child's stdin - parent writes to this */

+  int       stdout_fd;   /* child's stdout - parent reads from this */

+  FILE     *stdin_file;  /* child's stdin - parent writes to this */

+  FILE     *stdout_file; /* child's stdout - parent reads from this */

+  Bool      got_windowid;

+  Bool      got_passwd;

+#endif

+};

+

+#endif /* __DIALOG_DATA_H__ */

diff --git a/driver/lock-Gtk.c b/driver/lock-Gtk.c

new file mode 100644