X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Flock.c;h=169880b1b6a993f7ead31e3206406a7150241d00;hb=3f438031d610c7e15fd33876a879b97e290e05fb;hp=47c1b4ee515b3ed3082dc6a9aa814b59bbb5aa81;hpb=40eacb5812ef7c0e3374fb139afbb4f5bc8bbfb5;p=xscreensaver diff --git a/driver/lock.c b/driver/lock.c index 47c1b4ee..169880b1 100644 --- a/driver/lock.c +++ b/driver/lock.c @@ -1,5 +1,5 @@ /* lock.c --- handling the password dialog for locking-mode. - * xscreensaver, Copyright (c) 1993-2002 Jamie Zawinski + * xscreensaver, Copyright (c) 1993-2005 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -18,6 +18,7 @@ #endif #include +#include #include /* for time() */ #include #include @@ -96,6 +97,9 @@ struct passwd_dialog_data { Dimension height; Dimension border_width; + 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; @@ -103,12 +107,14 @@ struct passwd_dialog_data { char *date_label; char *user_string; char *passwd_string; + char *login_label; XFontStruct *heading_font; XFontStruct *body_font; XFontStruct *label_font; XFontStruct *passwd_font; XFontStruct *date_font; + XFontStruct *button_font; Pixel foreground; Pixel background; @@ -118,6 +124,8 @@ struct passwd_dialog_data { Pixel thermo_background; Pixel shadow_top; Pixel shadow_bottom; + Pixel button_foreground; + Pixel button_background; Dimension logo_width; Dimension logo_height; @@ -128,6 +136,9 @@ struct passwd_dialog_data { Dimension passwd_field_x, passwd_field_y; Dimension passwd_field_width, passwd_field_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; @@ -135,6 +146,11 @@ struct passwd_dialog_data { int logo_npixels; unsigned long *logo_pixels; + Cursor passwd_cursor; + Bool login_button_down_p; + Bool login_button_p; + Bool login_button_enabled_p; + Pixmap save_under; }; @@ -143,6 +159,7 @@ static void update_passwd_window (saver_info *si, const char *printed_passwd, float ratio); static void destroy_passwd_window (saver_info *si); static void undo_vp_motion (saver_info *si); +static void handle_passwd_button (saver_info *si, XEvent *event); static void @@ -157,6 +174,16 @@ make_passwd_window (saver_info *si) char *f; saver_screen_info *ssi = &si->screens [mouse_screen (si)]; + /* Display the button only if the "newLoginCommand" pref is non-null. + */ + pw->login_button_p = (si->prefs.new_login_command && + *si->prefs.new_login_command); + + if (pw->login_button_p) + pw->passwd_cursor = XCreateFontCursor (si->dpy, XC_top_left_arrow); + else + pw->passwd_cursor = 0; + pw->prompt_screen = ssi; if (si->prefs.verbose_p) fprintf (stderr, "%s: %d: creating password dialog.\n", @@ -167,6 +194,8 @@ make_passwd_window (saver_info *si) pw->ratio = 1.0; + pw->show_stars_p = get_boolean_resource("passwd.asterisks", "Boolean"); + pw->heading_label = get_string_resource ("passwd.heading.label", "Dialog.Label.Label"); pw->body_label = get_string_resource ("passwd.body.label", @@ -175,15 +204,19 @@ make_passwd_window (saver_info *si) "Dialog.Label.Label"); pw->passwd_label = get_string_resource ("passwd.passwd.label", "Dialog.Label.Label"); + pw->login_label = get_string_resource ("passwd.login.label", + "Dialog.Button.Label"); + pw->date_label = get_string_resource ("dateFormat", "DateFormat"); if (!pw->heading_label) - pw->heading_label = strdup("ERROR: REESOURCES NOT INSTALLED CORRECTLY"); + pw->heading_label = strdup("ERROR: RESOURCES NOT INSTALLED CORRECTLY"); if (!pw->body_label) - pw->body_label = strdup("ERROR: REESOURCES NOT INSTALLED CORRECTLY"); + pw->body_label = strdup("ERROR: RESOURCES NOT INSTALLED CORRECTLY"); if (!pw->user_label) pw->user_label = strdup("ERROR"); if (!pw->passwd_label) pw->passwd_label = strdup("ERROR"); if (!pw->date_label) pw->date_label = strdup("ERROR"); + if (!pw->login_label) pw->login_label = strdup ("ERROR (LOGIN)") ; /* Put the version number in the label. */ { @@ -201,6 +234,11 @@ make_passwd_window (saver_info *si) if (!pw->heading_font) pw->heading_font = XLoadQueryFont (si->dpy, "fixed"); if (f) free (f); + f = get_string_resource ("passwd.buttonFont", "Dialog.Font"); + pw->button_font = XLoadQueryFont (si->dpy, (f ? f : "fixed")); + if (!pw->button_font) pw->button_font = XLoadQueryFont (si->dpy, "fixed"); + if (f) free (f); + f = get_string_resource("passwd.bodyFont", "Dialog.Font"); pw->body_font = XLoadQueryFont (si->dpy, (f ? f : "fixed")); if (!pw->body_font) pw->body_font = XLoadQueryFont (si->dpy, "fixed"); @@ -241,6 +279,12 @@ make_passwd_window (saver_info *si) pw->passwd_background = get_pixel_resource ("passwd.text.background", "Dialog.Text.Background", si->dpy, cmap); + pw->button_foreground = get_pixel_resource ("splash.Button.foreground", + "Dialog.Button.Foreground", + si->dpy, cmap); + pw->button_background = get_pixel_resource ("splash.Button.background", + "Dialog.Button.Background", + si->dpy, cmap); pw->thermo_foreground = get_pixel_resource ("passwd.thermometer.foreground", "Dialog.Thermometer.Foreground", si->dpy, cmap); @@ -293,8 +337,8 @@ make_passwd_window (saver_info *si) pw->height += ascent + descent; { - Dimension w2 = 0, w3 = 0; - Dimension h2 = 0, h3 = 0; + Dimension w2 = 0, w3 = 0, button_w = 0; + Dimension h2 = 0, h3 = 0, button_h = 0; const char *passwd_string = "MMMMMMMMMMMM"; /* Measure the user_label. */ @@ -332,6 +376,33 @@ make_passwd_window (saver_info *si) w2 = w2 + w3 + (pw->shadow_width * 2); h2 = MAX (h2, h3); + pw->login_button_width = 0; + pw->login_button_height = 0; + + if (pw->login_button_p) + { + pw->login_button_enabled_p = True; + + /* Measure the "New Login" button */ + XTextExtents (pw->button_font, pw->login_label, + strlen (pw->login_label), + &direction, &ascent, &descent, &overall); + button_w = overall.width; + button_h = ascent + descent; + + /* Add some horizontal padding inside the buttons. */ + button_w += ascent; + + button_w += ((ascent + descent) / 2) + (pw->shadow_width * 2); + button_h += ((ascent + descent) / 2) + (pw->shadow_width * 2); + + pw->login_button_width = button_w; + pw->login_button_height = button_h; + + w2 = MAX (w2, button_w); + h2 += button_h * 1.5; + } + if (w2 > pw->width) pw->width = w2; pw->height += h2; } @@ -352,7 +423,10 @@ make_passwd_window (saver_info *si) } attrmask |= CWOverrideRedirect; attrs.override_redirect = True; - attrmask |= CWEventMask; attrs.event_mask = ExposureMask|KeyPressMask; + + attrmask |= CWEventMask; + attrs.event_mask = (ExposureMask | KeyPressMask | + ButtonPressMask | ButtonReleaseMask); /* We need to remember the mouse position and restore it afterward, or sometimes (perhaps only with Xinerama?) the mouse gets warped to @@ -407,7 +481,11 @@ make_passwd_window (saver_info *si) attrmask, &attrs); XSetWindowBackground (si->dpy, si->passwd_dialog, pw->background); - pw->logo_pixmap = xscreensaver_logo (ssi->screen, ssi->current_visual, + /* We use the default visual, not ssi->visual, so that the logo pixmap's + visual matches that of the si->passwd_dialog window. */ + pw->logo_pixmap = xscreensaver_logo (ssi->screen, + /* ssi->current_visual, */ + DefaultVisualOfScreen(screen), si->passwd_dialog, cmap, pw->background, &pw->logo_pixels, &pw->logo_npixels, @@ -441,7 +519,9 @@ make_passwd_window (saver_info *si) XSync (si->dpy, False); move_mouse_grab (si, si->passwd_dialog, - pw->prompt_screen->cursor, + (pw->passwd_cursor + ? pw->passwd_cursor + : pw->prompt_screen->cursor), pw->prompt_screen->number); undo_vp_motion (si); @@ -466,14 +546,21 @@ draw_passwd_window (saver_info *si) int tb_height; height = (pw->heading_font->ascent + pw->heading_font->descent + - pw->body_font->ascent + pw->body_font->descent + - (2 * MAX ((pw->label_font->ascent + pw->label_font->descent), - (pw->passwd_font->ascent + pw->passwd_font->descent + - (pw->shadow_width * 4)))) + - pw->date_font->ascent + pw->date_font->descent - ); - spacing = ((pw->height - (2 * pw->shadow_width) - - pw->internal_border - height)) / 8; + pw->body_font->ascent + pw->body_font->descent + + (2 * MAX ((pw->label_font->ascent + pw->label_font->descent), + (pw->passwd_font->ascent + pw->passwd_font->descent + + (pw->shadow_width * 4)))) + + pw->date_font->ascent + pw->date_font->descent); + + if (pw->login_button_p) + height += ((pw->button_font->ascent + pw->button_font->descent) * 2 + + 2 * pw->shadow_width); + + spacing = (((pw->height + - ((pw->login_button_p ? 4 : 2) * pw->shadow_width) + - pw->internal_border - height)) + / 8); + if (spacing < 0) spacing = 0; gcv.foreground = pw->foreground; @@ -517,7 +604,7 @@ draw_passwd_window (saver_info *si) string_width (pw->label_font, pw->passwd_label))); XDrawString (si->dpy, si->passwd_dialog, gc1, x2 - string_width (pw->label_font, pw->user_label), - y1, + y1 - pw->passwd_font->descent, pw->user_label, strlen(pw->user_label)); /* the "Password:" prompt @@ -525,7 +612,7 @@ draw_passwd_window (saver_info *si) y1 += (spacing + tb_height); XDrawString (si->dpy, si->passwd_dialog, gc1, x2 - string_width (pw->label_font, pw->passwd_label), - y1, + y1 - pw->passwd_font->descent, pw->passwd_label, strlen(pw->passwd_label)); @@ -548,7 +635,9 @@ draw_passwd_window (saver_info *si) x2 - pw->shadow_width, y1 - (pw->passwd_font->ascent + pw->passwd_font->descent), pw->passwd_field_width, pw->passwd_field_height); - XDrawString (si->dpy, si->passwd_dialog, gc1, x2, y1, + XDrawString (si->dpy, si->passwd_dialog, gc1, + x2, + y1 - pw->passwd_font->descent, pw->user_string, strlen(pw->user_string)); /* the "password" text field @@ -598,6 +687,37 @@ draw_passwd_window (saver_info *si) XDrawString (si->dpy, si->passwd_dialog, gc1, x2, y1, buf, strlen(buf)); } + /* The "New Login" button + */ + if (pw->login_button_p) + { + XSetForeground (si->dpy, gc1, pw->button_foreground); + XSetForeground (si->dpy, gc2, pw->button_background); + XSetFont (si->dpy, gc1, pw->button_font->fid); + + sw = string_width (pw->button_font, pw->login_label); + + x2 = pw->width - pw->internal_border - (pw->shadow_width * 2); + + /* right aligned button */ + /* x1 = x2 - pw->login_button_width; */ + + /* centered button */ + x1 = (pw->logo_width + pw->thermo_width + (pw->shadow_width * 3) + + pw->internal_border); + x1 = x1 + (x2 - x1 - pw->login_button_width) / 2; + + y1 = (pw->height - pw->internal_border - pw->login_button_height + + spacing); + y2 = (y1 + + ((pw->login_button_height - + (pw->button_font->ascent + pw->button_font->descent)) + / 2) + + pw->button_font->ascent); + + pw->login_button_x = x1; + pw->login_button_y = y1; + } /* The logo */ @@ -720,8 +840,7 @@ update_passwd_window (saver_info *si, const char *printed_passwd, float ratio) XDrawString (si->dpy, si->passwd_dialog, gc1, rects[0].x + pw->shadow_width, - rects[0].y + (pw->passwd_font->ascent + - pw->passwd_font->descent), + rects[0].y + pw->passwd_font->ascent, pw->passwd_string, strlen(pw->passwd_string)); XSetClipMask (si->dpy, gc1, None); @@ -737,7 +856,8 @@ update_passwd_window (saver_info *si, const char *printed_passwd, float ratio) if (x > rects[0].x + rects[0].width - 1) x = rects[0].x + rects[0].width - 1; XDrawLine (si->dpy, si->passwd_dialog, gc1, - x, y, x, y + pw->passwd_font->ascent); + x, y, + x, y + pw->passwd_font->ascent + pw->passwd_font->descent-1); } pw->i_beam = (pw->i_beam + 1) % 4; @@ -761,6 +881,45 @@ update_passwd_window (saver_info *si, const char *printed_passwd, float ratio) MAX (0, pw->thermo_field_height - y - 2)); } + /* The "New Login" button + */ + if (pw->login_button_p) + { + int x2, y2, sw; + XSetFont (si->dpy, gc1, pw->button_font->fid); + XSetForeground (si->dpy, gc1, + (pw->login_button_enabled_p + ? pw->passwd_foreground + : pw->shadow_bottom)); + XSetForeground (si->dpy, gc2, pw->button_background); + + XFillRectangle (si->dpy, si->passwd_dialog, gc2, + pw->login_button_x, pw->login_button_y, + pw->login_button_width, pw->login_button_height); + + sw = string_width (pw->button_font, pw->login_label); + x2 = pw->login_button_x + ((pw->login_button_width - sw) / 2); + y2 = (pw->login_button_y + + ((pw->login_button_height - + (pw->button_font->ascent + pw->button_font->descent)) + / 2) + + pw->button_font->ascent); + + XDrawString (si->dpy, si->passwd_dialog, gc1, x2, y2, + pw->login_label, strlen(pw->login_label)); + + draw_shaded_rectangle (si->dpy, si->passwd_dialog, + pw->login_button_x, pw->login_button_y, + pw->login_button_width, pw->login_button_height, + pw->shadow_width, + (pw->login_button_down_p + ? pw->shadow_bottom + : pw->shadow_top), + (pw->login_button_down_p + ? pw->shadow_top + : pw->shadow_bottom)); + } + XFreeGC (si->dpy, gc1); XFreeGC (si->dpy, gc2); XSync (si->dpy, False); @@ -787,6 +946,9 @@ destroy_passwd_window (saver_info *si) move_mouse_grab (si, RootWindowOfScreen (ssi->screen), ssi->cursor, ssi->number); + if (pw->passwd_cursor) + XFreeCursor (si->dpy, pw->passwd_cursor); + if (p->verbose_p) fprintf (stderr, "%s: %d: moving mouse back to %d,%d.\n", blurb(), ssi->number, @@ -829,6 +991,7 @@ destroy_passwd_window (saver_info *si) if (pw->user_label) free (pw->user_label); if (pw->passwd_label) free (pw->passwd_label); if (pw->date_label) free (pw->date_label); + if (pw->login_label) free (pw->login_label); if (pw->user_string) free (pw->user_string); if (pw->passwd_string) free (pw->passwd_string); @@ -837,11 +1000,16 @@ destroy_passwd_window (saver_info *si) if (pw->label_font) XFreeFont (si->dpy, pw->label_font); if (pw->passwd_font) XFreeFont (si->dpy, pw->passwd_font); if (pw->date_font) XFreeFont (si->dpy, pw->date_font); + if (pw->button_font) XFreeFont (si->dpy, pw->button_font); if (pw->foreground != black && pw->foreground != white) XFreeColors (si->dpy, cmap, &pw->foreground, 1, 0L); if (pw->background != black && pw->background != white) XFreeColors (si->dpy, cmap, &pw->background, 1, 0L); + if (!(pw->button_foreground == black || pw->button_foreground == white)) + XFreeColors (si->dpy, cmap, &pw->button_foreground, 1, 0L); + if (!(pw->button_background == black || pw->button_background == white)) + XFreeColors (si->dpy, cmap, &pw->button_background, 1, 0L); if (pw->passwd_foreground != black && pw->passwd_foreground != white) XFreeColors (si->dpy, cmap, &pw->passwd_foreground, 1, 0L); if (pw->passwd_background != black && pw->passwd_background != white) @@ -878,6 +1046,16 @@ destroy_passwd_window (saver_info *si) } +static Bool error_handler_hit_p = False; + +static int +ignore_all_errors_ehandler (Display *dpy, XErrorEvent *error) +{ + error_handler_hit_p = True; + return 0; +} + + #ifdef HAVE_XHPDISABLERESET /* This function enables and disables the C-Sh-Reset hot-key, which normally resets the X server (logging out the logged-in user.) @@ -923,15 +1101,32 @@ static void xfree_lock_grab_smasher (saver_info *si, Bool lock_p) { saver_preferences *p = &si->prefs; - int status = XF86MiscSetGrabKeysState (si->dpy, !lock_p); + int status; + + XErrorHandler old_handler; + XSync (si->dpy, False); + error_handler_hit_p = False; + old_handler = XSetErrorHandler (ignore_all_errors_ehandler); + XSync (si->dpy, False); + status = XF86MiscSetGrabKeysState (si->dpy, !lock_p); + XSync (si->dpy, False); + if (error_handler_hit_p) status = 666; + + if (!lock_p && status == MiscExtGrabStateAlready) + status = MiscExtGrabStateSuccess; /* shut up, consider this success */ if (p->verbose_p && status != MiscExtGrabStateSuccess) - fprintf (stderr, "%s: error: XF86MiscSetGrabKeysState returned %s\n", - blurb(), + fprintf (stderr, "%s: error: XF86MiscSetGrabKeysState(%d) returned %s\n", + blurb(), !lock_p, (status == MiscExtGrabStateSuccess ? "MiscExtGrabStateSuccess" : status == MiscExtGrabStateLocked ? "MiscExtGrabStateLocked" : status == MiscExtGrabStateAlready ? "MiscExtGrabStateAlready" : + status == 666 ? "an X error" : "unknown value")); + + XSync (si->dpy, False); + XSetErrorHandler (old_handler); + XSync (si->dpy, False); } #endif /* HAVE_XF86MISCSETGRABKEYSSTATE */ @@ -1007,9 +1202,6 @@ linux_lock_vt_switch (saver_info *si, Bool lock_p) */ #ifdef HAVE_XF86VMODE -static int ignore_all_errors_ehandler (Display *dpy, XErrorEvent *error); -static Bool vp_got_error = False; - static void xfree_lock_mode_switch (saver_info *si, Bool lock_p) { @@ -1025,14 +1217,15 @@ xfree_lock_mode_switch (saver_info *si, Bool lock_p) if (!XF86VidModeQueryExtension (si->dpy, &event, &error)) return; - for (screen = 0; screen < si->nscreens; screen++) + for (screen = 0; screen < (si->xinerama_p ? 1 : si->nscreens); screen++) { XSync (si->dpy, False); old_handler = XSetErrorHandler (ignore_all_errors_ehandler); + error_handler_hit_p = False; status = XF86VidModeLockModeSwitch (si->dpy, screen, lock_p); XSync (si->dpy, False); XSetErrorHandler (old_handler); - if (vp_got_error) status = False; + if (error_handler_hit_p) status = False; if (status) any_mode_locked_p = lock_p; @@ -1048,14 +1241,6 @@ xfree_lock_mode_switch (saver_info *si, Bool lock_p) blurb(), screen, (lock_p ? "locked" : "unlocked")); } } - -static int -ignore_all_errors_ehandler (Display *dpy, XErrorEvent *error) -{ - vp_got_error = True; - return 0; -} - #endif /* HAVE_XF86VMODE */ @@ -1142,12 +1327,52 @@ passwd_animate_timer (XtPointer closure, XtIntervalId *id) else pw->timer = 0; - idle_timer ((XtPointer) si, id); + idle_timer ((XtPointer) si, 0); } static XComposeStatus *compose_status; +static void +handle_passwd_button (saver_info *si, XEvent *event) +{ + saver_preferences *p = &si->prefs; + Bool mouse_in_box = False; + Bool hit_p = False; + passwd_dialog_data *pw = si->pw_data; + saver_screen_info *ssi = pw->prompt_screen; + + if (! pw->login_button_enabled_p) + return; + + mouse_in_box = + (event->xbutton.x >= pw->login_button_x && + event->xbutton.x <= pw->login_button_x + pw->login_button_width && + event->xbutton.y >= pw->login_button_y && + event->xbutton.y <= pw->login_button_y + pw->login_button_height); + + if (ButtonRelease == event->xany.type && + pw->login_button_down_p && + mouse_in_box) + { + /* Only allow them to press the button once: don't want to + accidentally launch a dozen gdm choosers if the machine + is being slow. + */ + hit_p = True; + pw->login_button_enabled_p = False; + } + + pw->login_button_down_p = (mouse_in_box && + ButtonRelease != event->xany.type); + + update_passwd_window (si, 0, pw->ratio); + + if (hit_p) + fork_and_exec (ssi, p->new_login_command); +} + + static void handle_passwd_key (saver_info *si, XKeyEvent *event) { @@ -1164,6 +1389,10 @@ handle_passwd_key (saver_info *si, XKeyEvent *event) s[1] = 0; + /* Add 10% to the time remaining every time a key is pressed. */ + pw->ratio += 0.1; + if (pw->ratio > 1) pw->ratio = 1; + switch (*s) { case '\010': case '\177': /* Backspace */ @@ -1206,12 +1435,19 @@ handle_passwd_key (saver_info *si, XKeyEvent *event) break; } - i = strlen(typed_passwd); - stars = (char *) malloc(i+1); - memset (stars, '*', i); - stars[i] = 0; - update_passwd_window (si, stars, pw->ratio); - free (stars); + if (pw->show_stars_p) + { + i = strlen(typed_passwd); + stars = (char *) malloc(i+1); + memset (stars, '*', i); + stars[i] = 0; + update_passwd_window (si, stars, pw->ratio); + free (stars); + } + else + { + update_passwd_window (si, "", pw->ratio); + } } @@ -1221,6 +1457,8 @@ passwd_event_loop (saver_info *si) saver_preferences *p = &si->prefs; char *msg = 0; XEvent event; + unsigned int caps_p = 0; + passwd_animate_timer ((XtPointer) si, 0); while (si->pw_data && si->pw_data->state == pw_read) @@ -1229,7 +1467,14 @@ passwd_event_loop (saver_info *si) if (event.xany.window == si->passwd_dialog && event.xany.type == Expose) draw_passwd_window (si); else if (event.xany.type == KeyPress) - handle_passwd_key (si, &event.xkey); + { + handle_passwd_key (si, &event.xkey); + caps_p = (event.xkey.state & LockMask); + } + else if ((event.xany.type == ButtonPress || + event.xany.type == ButtonRelease) && + si->pw_data->login_button_p) + handle_passwd_button (si, &event); else XtDispatchEvent (&event); } @@ -1239,7 +1484,7 @@ passwd_event_loop (saver_info *si) case pw_ok: msg = 0; break; case pw_null: msg = ""; break; case pw_time: msg = "Timed out!"; break; - default: msg = "Sorry!"; break; + default: msg = (caps_p ? "CapsLock?" : "Sorry!"); break; } if (si->pw_data->state == pw_fail) @@ -1251,7 +1496,9 @@ passwd_event_loop (saver_info *si) case pw_ok: fprintf (stderr, "%s: password correct.\n", blurb()); break; case pw_fail: - fprintf (stderr, "%s: password incorrect!\n", blurb()); break; + fprintf (stderr, "%s: password incorrect!%s\n", blurb(), + (caps_p ? " (CapsLock)" : "")); + break; case pw_null: case pw_cancel: fprintf (stderr, "%s: password entry cancelled.\n", blurb()); break;