X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fdemo-Xm.c;h=c0f72e3a772c74990417e9c96ba8c7fbccb0624b;hb=6a1da724858673ac40aa13a9612340d8bed8c7b9;hp=9d4c31d53b65f63db0dfc0643482b73f952fa212;hpb=06e9a7886a77cad92f9ddbc169d6d199a4d8b76d;p=xscreensaver diff --git a/driver/demo-Xm.c b/driver/demo-Xm.c index 9d4c31d5..c0f72e3a 100644 --- a/driver/demo-Xm.c +++ b/driver/demo-Xm.c @@ -1,5 +1,5 @@ /* demo-Xm.c --- implements the interactive demo-mode and options dialogs. - * xscreensaver, Copyright (c) 1993-1999 Jamie Zawinski + * xscreensaver, Copyright (c) 1993-2003 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 @@ -72,6 +72,9 @@ # ifndef XmNtextField /* Lesstif 0.89.4 bug */ # undef HAVE_XMCOMBOBOX # endif +# if (XmVersion < 2001) /* Lesstif has two personalities these days */ +# undef HAVE_XMCOMBOBOX +# endif #endif /* HAVE_XMCOMBOBOX */ #include "version.h" @@ -118,6 +121,7 @@ static void populate_demo_window (Widget toplevel, static void populate_prefs_page (Widget top, prefs_pair *pair); static int apply_changes_and_save (Widget widget); static int maybe_reload_init_file (Widget widget, prefs_pair *pair); +static void await_xscreensaver (Widget widget); /* Some random utility functions @@ -153,7 +157,7 @@ ensure_selected_item_visible (Widget list) XtVaGetValues (list, XmNtopItemPosition, &top, XmNvisibleItemCount, &visible, - 0); + NULL); if (pos_list[0] >= top + visible) { int pos = pos_list[0] - visible + 1; @@ -350,8 +354,13 @@ about_menu_cb (Widget button, XtPointer client_data, XtPointer ignored) *s2 = 0; s2 += 2; - sprintf (buf, "%s\n%s\n\n" - "For updates, check http://www.jwz.org/xscreensaver/", + sprintf (buf, "%s\n%s\n" + "\n" + "This is the Motif version of \"xscreensaver-demo\". The Motif\n" + "version is no longer maintained. Please use the GTK version\n" + "instead, which has many more features.\n" + "\n" + "For xscreensaver updates, check http://www.jwz.org/xscreensaver/", s, s2); free (s); @@ -419,6 +428,71 @@ restart_menu_cb (Widget button, XtPointer client_data, XtPointer ignored) sleep (1); system ("xscreensaver -nosplash &"); #endif + + await_xscreensaver (button); +} + +static void +await_xscreensaver (Widget widget) +{ + int countdown = 5; + + Display *dpy = XtDisplay (widget); + char *rversion = 0; + + while (!rversion && (--countdown > 0)) + { + /* Check for the version of the running xscreensaver... */ + server_xscreensaver_version (dpy, &rversion, 0, 0); + + /* If it's not there yet, wait a second... */ + sleep (1); + } + + if (rversion) + { + /* Got it. */ + free (rversion); + } + else + { + /* Timed out, no screensaver running. */ + + char buf [1024]; + Bool root_p = (geteuid () == 0); + + strcpy (buf, + "Error:\n\n" + "The xscreensaver daemon did not start up properly.\n" + "\n"); + + if (root_p) +# ifdef __GNUC__ + __extension__ /* don't warn about "string length is greater than + the length ISO C89 compilers are required to + support" in the following expression... */ +# endif + strcat (buf, + "You are running as root. This usually means that xscreensaver\n" + "was unable to contact your X server because access control is\n" + "turned on. Try running this command:\n" + "\n" + " xhost +localhost\n" + "\n" + "and then selecting `File / Restart Daemon'.\n" + "\n" + "Note that turning off access control will allow anyone logged\n" + "on to this machine to access your screen, which might be\n" + "considered a security problem. Please read the xscreensaver\n" + "manual and FAQ for more information.\n" + "\n" + "You shouldn't run X as root. Instead, you should log in as a\n" + "normal user, and `su' as necessary."); + else + strcat (buf, "Please check your $PATH and permissions."); + + warning_dialog (XtParent (widget), buf, 1); + } } @@ -485,16 +559,16 @@ apply_changes_and_save (Widget widget) if (which < 0) return -1; # ifdef HAVE_XMCOMBOBOX - XtVaGetValues (vis, XmNtextField, &text, 0); + XtVaGetValues (vis, XmNtextField, &text, NULL); if (!text) /* If we can't get at the text field of this combo box, we're screwed. */ abort(); - XtVaGetValues (text, XmNvalue, &visual, 0); + XtVaGetValues (text, XmNvalue, &visual, NULL); # else /* !HAVE_XMCOMBOBOX */ - XtVaGetValues (vis, XmNsubMenuId, &menu, 0); - XtVaGetValues (menu, XmNnumChildren, &nkids, XmNchildren, &kids, 0); - XtVaGetValues (menu, XmNmenuHistory, &selected_item, 0); + XtVaGetValues (vis, XmNsubMenuId, &menu, NULL); + XtVaGetValues (menu, XmNnumChildren, &nkids, XmNchildren, &kids, NULL); + XtVaGetValues (menu, XmNmenuHistory, &selected_item, NULL); if (selected_item) for (i = 0; i < nkids; i++) if (kids[i] == selected_item) @@ -503,8 +577,8 @@ apply_changes_and_save (Widget widget) visual = visual_menu[i]; # endif /* !HAVE_XMCOMBOBOX */ - XtVaGetValues (enabled, XmNset, &enabled_p, 0); - XtVaGetValues (cmd, XtNvalue, &command, 0); + XtVaGetValues (enabled, XmNset, &enabled_p, NULL); + XtVaGetValues (cmd, XtNvalue, &command, NULL); if (maybe_reload_init_file (widget, pair) != 0) return 1; @@ -530,7 +604,7 @@ apply_changes_and_save (Widget widget) else if (!strcasecmp (visual, "greyscale")) visual = "GrayScale"; else if (!strcasecmp (visual, "pseudocolor")) visual = "PseudoColor"; else if (!strcasecmp (visual, "directcolor")) visual = "DirectColor"; - else if (1 == sscanf (visual, " %ld %c", &id, &c)) ; + else if (1 == sscanf (visual, " %lu %c", &id, &c)) ; else if (1 == sscanf (visual, " 0x%lx %c", &id, &c)) ; else { @@ -720,18 +794,18 @@ prefs_ok_cb (Widget button, XtPointer client_data, XtPointer ignored) # define SECONDS(field, name) \ v = 0; \ - XtVaGetValues (name_to_widget (button, (name)), XtNvalue, &v, 0); \ + XtVaGetValues (name_to_widget (button, (name)), XtNvalue, &v, NULL); \ hack_time_text (button, v, (field), True) # define MINUTES(field, name) \ v = 0; \ - XtVaGetValues (name_to_widget (button, (name)), XtNvalue, &v, 0); \ + XtVaGetValues (name_to_widget (button, (name)), XtNvalue, &v, NULL); \ hack_time_text (button, v, (field), False) # define INTEGER(field, name) do { \ unsigned int value; \ char c; \ - XtVaGetValues (name_to_widget (button, (name)), XtNvalue, &v, 0); \ + XtVaGetValues (name_to_widget (button, (name)), XtNvalue, &v, NULL); \ if (! *v) \ ; \ else if (sscanf (v, "%u%c", &value, &c) != 1) \ @@ -745,7 +819,7 @@ prefs_ok_cb (Widget button, XtPointer client_data, XtPointer ignored) } while(0) # define CHECKBOX(field, name) \ - XtVaGetValues (name_to_widget (button, (name)), XmNset, &field, 0) + XtVaGetValues (name_to_widget (button, (name)), XmNset, &field, NULL) MINUTES (&p2->timeout, "timeoutText"); MINUTES (&p2->cycle, "cycleText"); @@ -839,48 +913,6 @@ format_time (char *buf, Time time) } -static char * -make_pretty_name (const char *shell_command) -{ - char *s = strdup (shell_command); - char *s2; - char res_name[255]; - - for (s2 = s; *s2; s2++) /* truncate at first whitespace */ - if (isspace (*s2)) - { - *s2 = 0; - break; - } - - s2 = strrchr (s, '/'); /* if pathname, take last component */ - if (s2) - { - s2 = strdup (s2+1); - free (s); - s = s2; - } - - if (strlen (s) > 50) /* 51 is hereby defined as "unreasonable" */ - s[50] = 0; - - sprintf (res_name, "hacks.%s.name", s); /* resource? */ - s2 = get_string_resource (res_name, res_name); - if (s2) - return s2; - - for (s2 = s; *s2; s2++) /* if it has any capitals, return it */ - if (*s2 >= 'A' && *s2 <= 'Z') - return s; - - if (s[0] >= 'a' && s[0] <= 'z') /* else cap it */ - s[0] -= 'a'-'A'; - if (s[0] == 'X' && s[1] >= 'a' && s[1] <= 'z') /* (magic leading X) */ - s[1] -= 'a'-'A'; - return s; -} - - /* Finds the number of the last hack to run, and makes that item be selected by default. */ @@ -935,7 +967,7 @@ populate_hack_list (Widget toplevel, prefs_pair *pair) { char *pretty_name = (h[0]->name ? strdup (h[0]->name) - : make_pretty_name (h[0]->command)); + : make_hack_name (h[0]->command)); XmString xmstr = XmStringCreate (pretty_name, XmSTRING_DEFAULT_CHARSET); XmListAddItem (list, xmstr, 0); @@ -954,28 +986,28 @@ populate_prefs_page (Widget top, prefs_pair *pair) char s[100]; format_time (s, p->timeout); - XtVaSetValues (name_to_widget (top, "timeoutText"), XmNvalue, s, 0); + XtVaSetValues (name_to_widget (top, "timeoutText"), XmNvalue, s, NULL); format_time (s, p->cycle); - XtVaSetValues (name_to_widget (top, "cycleText"), XmNvalue, s, 0); + XtVaSetValues (name_to_widget (top, "cycleText"), XmNvalue, s, NULL); format_time (s, p->lock_timeout); - XtVaSetValues (name_to_widget (top, "lockText"), XmNvalue, s, 0); + XtVaSetValues (name_to_widget (top, "lockText"), XmNvalue, s, NULL); format_time (s, p->passwd_timeout); - XtVaSetValues (name_to_widget (top, "passwdText"), XmNvalue, s, 0); + XtVaSetValues (name_to_widget (top, "passwdText"), XmNvalue, s, NULL); format_time (s, p->fade_seconds); - XtVaSetValues (name_to_widget (top, "fadeSecondsText"), XmNvalue, s, 0); + XtVaSetValues (name_to_widget (top, "fadeSecondsText"), XmNvalue, s, NULL); sprintf (s, "%u", p->fade_ticks); - XtVaSetValues (name_to_widget (top, "fadeTicksText"), XmNvalue, s, 0); + XtVaSetValues (name_to_widget (top, "fadeTicksText"), XmNvalue, s, NULL); XtVaSetValues (name_to_widget (top, "verboseToggle"), - XmNset, p->verbose_p, 0); + XmNset, p->verbose_p, NULL); XtVaSetValues (name_to_widget (top, "cmapToggle"), - XmNset, p->install_cmap_p, 0); + XmNset, p->install_cmap_p, NULL); XtVaSetValues (name_to_widget (top, "fadeToggle"), - XmNset, p->fade_p, 0); + XmNset, p->fade_p, NULL); XtVaSetValues (name_to_widget (top, "unfadeToggle"), - XmNset, p->unfade_p, 0); + XmNset, p->unfade_p, NULL); XtVaSetValues (name_to_widget (top, "lockToggle"), - XmNset, p->lock_p, 0); + XmNset, p->lock_p, NULL); { @@ -993,20 +1025,24 @@ populate_prefs_page (Widget top, prefs_pair *pair) } } +#ifdef HAVE_XF86VMODE_GAMMA + found_any_writable_cells = True; /* if we can gamma fade, go for it */ +#endif + XtVaSetValues (name_to_widget (top, "fadeSecondsLabel"), XtNsensitive, - found_any_writable_cells, 0); + found_any_writable_cells, NULL); XtVaSetValues (name_to_widget (top, "fadeTicksLabel"), XtNsensitive, - found_any_writable_cells, 0); + found_any_writable_cells, NULL); XtVaSetValues (name_to_widget (top, "fadeSecondsText"), XtNsensitive, - found_any_writable_cells, 0); + found_any_writable_cells, NULL); XtVaSetValues (name_to_widget (top, "fadeTicksText"), XtNsensitive, - found_any_writable_cells, 0); + found_any_writable_cells, NULL); XtVaSetValues (name_to_widget (top, "cmapToggle"), XtNsensitive, - found_any_writable_cells, 0); + found_any_writable_cells, NULL); XtVaSetValues (name_to_widget (top, "fadeToggle"), XtNsensitive, - found_any_writable_cells, 0); + found_any_writable_cells, NULL); XtVaSetValues (name_to_widget (top, "unfadeToggle"), XtNsensitive, - found_any_writable_cells, 0); + found_any_writable_cells, NULL); } } @@ -1020,7 +1056,7 @@ sensitize_demo_widgets (Widget toplevel, Bool sensitive_p) for (i = 0; i < sizeof(names)/countof(*names); i++) { Widget w = name_to_widget (toplevel, names[i]); - XtVaSetValues (w, XtNsensitive, sensitive_p, 0); + XtVaSetValues (w, XtNsensitive, sensitive_p, NULL); } /* I don't know how to handle these yet... */ @@ -1029,7 +1065,7 @@ sensitize_demo_widgets (Widget toplevel, Bool sensitive_p) for (i = 0; i < sizeof(names2)/countof(*names2); i++) { Widget w = name_to_widget (toplevel, names2[i]); - XtVaSetValues (w, XtNsensitive, FALSE, 0); + XtVaSetValues (w, XtNsensitive, FALSE, NULL); } } } @@ -1119,7 +1155,7 @@ pixmapify_buttons (Widget toplevel) symbols[0].name = "background"; symbols[0].pixel = 0; symbols[1].name = 0; - XtVaGetValues (up, XmNbackground, &xc, 0); + XtVaGetValues (up, XmNbackground, &xc, NULL); XQueryColor (dpy, xgwa.colormap, &xc); sprintf (color, "#%04X%04X%04X", xc.red, xc.green, xc.blue); symbols[0].value = color; @@ -1163,8 +1199,8 @@ pixmapify_buttons (Widget toplevel) return; } - XtVaSetValues (up, XmNlabelType, XmPIXMAP, XmNlabelPixmap, up_pixmap, 0); - XtVaSetValues (dn, XmNlabelType, XmPIXMAP, XmNlabelPixmap, down_pixmap, 0); + XtVaSetValues (up, XmNlabelType, XmPIXMAP, XmNlabelPixmap, up_pixmap, NULL); + XtVaSetValues (dn, XmNlabelType, XmPIXMAP, XmNlabelPixmap, down_pixmap,NULL); #endif /* HAVE_XPM */ } @@ -1178,7 +1214,7 @@ get_hack_blurb (screenhack *hack) char *prog_name = strdup (hack->command); char *pretty_name = (hack->name ? strdup (hack->name) - : make_pretty_name (hack->command)); + : make_hack_name (hack->command)); char doc_name[255], doc_class[255]; char *s, *s2; @@ -1240,6 +1276,7 @@ get_hack_blurb (screenhack *hack) } else { +# if 0 static int doc_installed = 0; if (doc_installed == 0) { @@ -1260,7 +1297,16 @@ get_hack_blurb (screenhack *hack) "To fix this problem, delete that file, or " "install a current version (either will work.)"); else - doc_string = strdup (""); +# endif /* 0 */ + doc_string = strdup ( + "\n" + "This is the Motif version of \"xscreensaver-demo\". The Motif " + "version is no longer maintained. Please use the GTK version " + "instead, which has many more features." + "\n\n" + "If you were running the GTK version, there would be a preview " + "of this screen saver mode displayed here, along with graphical " + "configuration options."); } return doc_string; @@ -1282,20 +1328,20 @@ populate_demo_window (Widget toplevel, int which, prefs_pair *pair) char *pretty_name = (hack ? (hack->name ? strdup (hack->name) - : make_pretty_name (hack->command)) + : make_hack_name (hack->command)) : 0); char *doc_string = hack ? get_hack_blurb (hack) : 0; XmString xmstr; xmstr = XmStringCreate (pretty_name, XmSTRING_DEFAULT_CHARSET); - XtVaSetValues (frameL, XmNlabelString, xmstr, 0); + XtVaSetValues (frameL, XmNlabelString, xmstr, NULL); XmStringFree (xmstr); - XtVaSetValues (doc, XmNvalue, doc_string, 0); - XtVaSetValues (cmd, XmNvalue, (hack ? hack->command : ""), 0); + XtVaSetValues (doc, XmNvalue, doc_string, NULL); + XtVaSetValues (cmd, XmNvalue, (hack ? hack->command : ""), NULL); - XtVaSetValues (enabled, XmNset, (hack ? hack->enabled_p : False), 0); + XtVaSetValues (enabled, XmNset, (hack ? hack->enabled_p : False), NULL); i = 0; if (hack && hack->visual && *hack->visual) @@ -1307,21 +1353,21 @@ populate_demo_window (Widget toplevel, int which, prefs_pair *pair) { # ifdef HAVE_XMCOMBOBOX Widget text = 0; - XtVaGetValues (vis, XmNtextField, &text, 0); - XtVaSetValues (vis, XmNselectedPosition, i, 0); + XtVaGetValues (vis, XmNtextField, &text, NULL); + XtVaSetValues (vis, XmNselectedPosition, i, NULL); if (i < 0) - XtVaSetValues (text, XmNvalue, hack->visual, 0); + XtVaSetValues (text, XmNvalue, hack->visual, NULL); # else /* !HAVE_XMCOMBOBOX */ Cardinal nkids; Widget *kids; Widget menu; - XtVaGetValues (vis, XmNsubMenuId, &menu, 0); + XtVaGetValues (vis, XmNsubMenuId, &menu, NULL); if (!menu) abort (); - XtVaGetValues (menu, XmNnumChildren, &nkids, XmNchildren, &kids, 0); + XtVaGetValues (menu, XmNnumChildren, &nkids, XmNchildren, &kids, NULL); if (!kids) abort(); if (i < nkids) - XtVaSetValues (vis, XmNmenuHistory, kids[i], 0); + XtVaSetValues (vis, XmNmenuHistory, kids[i], NULL); # endif /* !HAVE_XMCOMBOBOX */ } @@ -1366,7 +1412,7 @@ maybe_reload_init_file (Widget widget, prefs_pair *pair) which = selected_hack_number (widget); list = name_to_widget (widget, "list"); - XtVaSetValues (list, XmNitemCount, 0, 0); + XtVaSetValues (list, XmNitemCount, 0, NULL); populate_hack_list (widget, pair); @@ -1437,12 +1483,12 @@ sanity_check_resources (Widget toplevel) const char *name = XtName(w); XmString xm = 0; char *label = 0; - XtVaGetValues (w, XmNlabelString, &xm, 0); + XtVaGetValues (w, XmNlabelString, &xm, NULL); if (xm) XmStringGetLtoR (xm, XmSTRING_DEFAULT_CHARSET, &label); if (w && (!label || !strcmp (name, label))) { xm = XmStringCreate ("ERROR", XmSTRING_DEFAULT_CHARSET); - XtVaSetValues (w, XmNlabelString, xm, 0); + XtVaSetValues (w, XmNlabelString, xm, NULL); } } } @@ -1460,17 +1506,17 @@ hack_button_sizes (Widget toplevel) Widget down = name_to_widget (toplevel, "down"); Dimension w1, w2; - XtVaGetValues (demo, XmNwidth, &w1, 0); - XtVaGetValues (man, XmNwidth, &w2, 0); - XtVaSetValues ((w1 > w2 ? man : demo), XmNwidth, (w1 > w2 ? w1 : w2), 0); + XtVaGetValues (demo, XmNwidth, &w1, NULL); + XtVaGetValues (man, XmNwidth, &w2, NULL); + XtVaSetValues ((w1 > w2 ? man : demo), XmNwidth, (w1 > w2 ? w1 : w2), NULL); - XtVaGetValues (ok, XmNwidth, &w1, 0); - XtVaGetValues (can, XmNwidth, &w2, 0); - XtVaSetValues ((w1 > w2 ? can : ok), XmNwidth, (w1 > w2 ? w1 : w2), 0); + XtVaGetValues (ok, XmNwidth, &w1, NULL); + XtVaGetValues (can, XmNwidth, &w2, NULL); + XtVaSetValues ((w1 > w2 ? can : ok), XmNwidth, (w1 > w2 ? w1 : w2), NULL); - XtVaGetValues (up, XmNwidth, &w1, 0); - XtVaGetValues (down, XmNwidth, &w2, 0); - XtVaSetValues ((w1 > w2 ? down : up), XmNwidth, (w1 > w2 ? w1 : w2), 0); + XtVaGetValues (up, XmNwidth, &w1, NULL); + XtVaGetValues (down, XmNwidth, &w2, NULL); + XtVaSetValues ((w1 > w2 ? down : up), XmNwidth, (w1 > w2 ? w1 : w2), NULL); } @@ -1629,15 +1675,19 @@ static int demo_ehandler (Display *dpy, XErrorEvent *error) { fprintf (stderr, "\nX error in %s:\n", progname); - if (XmuPrintDefaultErrorMessage (dpy, error, stderr)) - exit (-1); - else - fprintf (stderr, " (nonfatal.)\n"); + XmuPrintDefaultErrorMessage (dpy, error, stderr); + exit (-1); return 0; } +#ifdef __GNUC__ + __extension__ /* shut up about "string length is greater than the length + ISO C89 compilers are required to support" when including + the .ad file... */ +#endif + static char *defaults[] = { #include "XScreenSaver_ad.h" 0 @@ -1769,7 +1819,7 @@ main (int argc, char **argv) *s2 = 0; *s4 = 0; sprintf (title, "%.50s %.50s, %.50s", progclass, s1, s3); - XtVaSetValues (toplevel_shell, XtNtitle, title, 0); + XtVaSetValues (toplevel_shell, XtNtitle, title, NULL); free (v); } @@ -1789,7 +1839,7 @@ main (int argc, char **argv) ensure_selected_item_visible (name_to_widget (toplevel_shell, "list")); XSync (dpy, False); - XtVaSetValues (toplevel_shell, XmNallowShellResize, False, 0); + XtVaSetValues (toplevel_shell, XmNallowShellResize, False, NULL); /* Handle the -prefs command-line argument. */ @@ -1802,7 +1852,7 @@ main (int argc, char **argv) Cardinal nkids = 0; if (!tabber) abort(); - XtVaGetValues (tabber, XmNnumChildren, &nkids, XmNchildren, &kids, 0); + XtVaGetValues (tabber, XmNnumChildren, &nkids, XmNchildren, &kids, NULL); if (!kids) abort(); if (nkids > 0) XtUnmanageChildren (kids, nkids);