X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fxsublim.c;h=0bb91cb469a71efccd5ef6f2702ad09ea9e779cf;hp=9f93758a14ca6acba21aa1cea45ab325d3f7af1f;hb=96a411663168b0ba5432b407a83be55f3df0c802;hpb=0ed85ca0e4b0eae40a4f50a51d63f2f41e45373a diff --git a/hacks/xsublim.c b/hacks/xsublim.c index 9f93758a..0bb91cb4 100644 --- a/hacks/xsublim.c +++ b/hacks/xsublim.c @@ -1,8 +1,8 @@ -/***************************************************************************** +/**************************************************************************** * * * xsublim -- Submit. Conform. Obey. * * * - * Copyright (c) 1999 Greg Knauss (greg@eod.com) * + * Copyright (c) 1999 - 2000 Greg Knauss (greg@eod.com) * * * * Thanks to Jamie Zawinski, whose suggestions and advice made what was a * * boring little program into a less boring (and a _lot_ less little) * @@ -28,18 +28,11 @@ */ -/* Changelog ****************************************************************** - - 1.0.1 19990716 Assume that XGetImage()/XDestroyImage() don't leak, - which they apparently don't. I have no idea how I - convinced myself that they did. Huh. (greg@eod.com) - 1.0.0 19990716 Initial release -*/ - - /* Arguments ****************************************************************** -font font Font to use + -file filename New-line delimited phrase file + -program executable New-line delimited phrase-producing executable -delayShow ms Microsecs for display of each word -delayWord ms Microsecs for blank between words -delayPhraseMin ms Microsecs for min blank between phrases @@ -55,17 +48,30 @@ */ +/* Changelog ****************************************************************** + + 1.1.1 20000407 Added -program + 1.1.0 19991221 Added -file + 1.0.1 19990716 Assume that XGetImage()/XDestroyImage() don't leak, + which they apparently don't. I have no idea how I + convinced myself that they did. Huh. (greg@eod.com) + 1.0.0 19990716 Initial release +*/ + + /* Defines *******************************************************************/ #define XSUBLIM_NAME "XSublim" #define XSUBLIM_TEXT_COUNT 1000 #define XSUBLIM_TEXT_LENGTH 128 #define XSUBLIM_TEXT_OUTLINE 1 +#define XSUBLIM_PROGRAM_SIZE 1024*10 #define XSUBLIM_ARG_DELAYSHOW "delayShow" #define XSUBLIM_ARG_DELAYWORD "delayWord" #define XSUBLIM_ARG_DELAYPHRASEMIN "delayPhraseMin" #define XSUBLIM_ARG_DELAYPHRASEMAX "delayPhraseMax" #define XSUBLIM_ARG_RANDOM "random" #define XSUBLIM_ARG_FILE "file" +#define XSUBLIM_ARG_PROGRAM "program" #define XSUBLIM_ARG_SCREENSAVER "screensaver" #define XSUBLIM_ARG_OUTLINE "outline" #define XSUBLIM_ARG_CENTER "center" @@ -82,6 +88,7 @@ #include #include #include +#include #include #include #include @@ -97,9 +104,10 @@ #include #endif -#include "yarandom.h" #include "usleep.h" +#include "yarandom.h" #include "resources.h" +#include "vroot.h" /* Globals *******************************************************************/ @@ -107,6 +115,13 @@ char* progname; XtAppContext app; XrmDatabase db; char* progclass = XSUBLIM_NAME; + +# ifdef __GNUC__ + __extension__ /* don't warn about "string length is greater than the + length ISO C89 compilers are required to support" + in the following string constant... */ +# endif + char* defaults[] = { ".background: #000000", @@ -183,6 +198,10 @@ XrmOptionDescRec options[] = XrmoptionNoArg,"false"}, {"-" XSUBLIM_ARG_FILE, "." XSUBLIM_ARG_FILE, XrmoptionSepArg,0 }, +#if !defined(VMS) + {"-" XSUBLIM_ARG_PROGRAM, "." XSUBLIM_ARG_PROGRAM, + XrmoptionSepArg,0 }, +#endif {"-" XSUBLIM_ARG_SCREENSAVER, "." XSUBLIM_ARG_SCREENSAVER, XrmoptionNoArg,"true"}, {"-no-" XSUBLIM_ARG_SCREENSAVER,"." XSUBLIM_ARG_SCREENSAVER, @@ -212,120 +231,16 @@ void xsublim_Sig_Catch(int sig_Number) Xsublim_Sig_Last = sig_Number; } -/* Get the screensaver's window ============================================ */ -static XErrorHandler Xsublim_Ss_Handler = NULL; -static int Xsublim_Ss_Status; - /* This was all basically swiped from driver/remote.c and util/vroot.h */ -static int xsublim_Ss_Handler(Display* handle_Display, - XErrorEvent* handle_Error) -{ - if (handle_Error->error_code == BadWindow) - { - Xsublim_Ss_Status = BadWindow; - return 0; - } - if (Xsublim_Ss_Handler == NULL) - { - fprintf(stderr,"%x: ",progname); - abort(); - } - return (*Xsublim_Ss_Handler)(handle_Display,handle_Error); -} static Window xsublim_Ss_GetWindow(Display* ss_Display) { - Window win_Root; - Window win_RootReturn; - Window win_Parent; - Window* win_Child; - Window win_Win; - int child_Count; - int child_Index; - Atom prop_Type; - int prop_Format; - unsigned long prop_Count; - unsigned long prop_Bytes; - char* prop_Value; - int prop_Status; - static Atom XA_SCREENSAVER_VERSION = -1; - static Atom __SWM_VROOT; - - /* Assume bad things */ - win_Win = 0; - win_Child = NULL; - - /* Find the atoms */ - if (XA_SCREENSAVER_VERSION == -1) - { - XA_SCREENSAVER_VERSION = XInternAtom(ss_Display, - "_SCREENSAVER_VERSION",FALSE); - __SWM_VROOT = XInternAtom(ss_Display,"__SWM_VROOT",FALSE); - } - - /* Find a screensaver window */ - win_Root = RootWindowOfScreen(DefaultScreenOfDisplay(ss_Display)); - if (XQueryTree(ss_Display,win_Root,&win_RootReturn,&win_Parent, - &win_Child,&child_Count) != FALSE) - { - if ( - (win_Root == win_RootReturn) && - (win_Parent == 0) && - (win_Child != NULL) && - (child_Count > 0)) - { - for (child_Index = 0;child_Index < child_Count; - child_Index++) - { - XSync(ss_Display,FALSE); - Xsublim_Ss_Status = 0; - Xsublim_Ss_Handler = - XSetErrorHandler(xsublim_Ss_Handler); - prop_Value = NULL; - prop_Status = XGetWindowProperty(ss_Display, - win_Child[child_Index],XA_SCREENSAVER_VERSION, - 0,200,FALSE,XA_STRING,&prop_Type,&prop_Format, - &prop_Count,&prop_Bytes, - (unsigned char**)&prop_Value); - XSync(ss_Display,FALSE); - XSetErrorHandler(Xsublim_Ss_Handler); - if (prop_Value != NULL) - { - XFree(prop_Value); - } - if (Xsublim_Ss_Status == BadWindow) - { - prop_Status = BadWindow; - } - if ((prop_Status == Success) && - (prop_Type != None)) - { - /* See if it's a virtual root */ - prop_Value = NULL; - prop_Status = - XGetWindowProperty(ss_Display, - win_Child[child_Index],__SWM_VROOT,0, - 1,FALSE,XA_WINDOW,&prop_Type, - &prop_Format,&prop_Count,&prop_Bytes, - (unsigned char**)&prop_Value); - if (prop_Value != NULL) - { - XFree(prop_Value); - } - if ((prop_Status == Success) && - (prop_Type != None)) - { - win_Win = - win_Child[child_Index]; - } - } - } - } - } - if (win_Child != NULL) - { - XFree(win_Child); - } - return win_Win; + Screen *s = DefaultScreenOfDisplay (ss_Display); + Window root = XRootWindowOfScreen (s); + Window vroot = VirtualRootWindowOfScreen (s); + if (root == vroot) + return 0; + else + return vroot; } /* Main ==================================================================== */ @@ -357,7 +272,9 @@ int main(int argc,char* argv[]) SIGQUIT, SIGILL, SIGTRAP, +#if defined(SIGIOT) SIGIOT, +#endif SIGABRT, #if defined(SIGEMT) SIGEMT, @@ -397,7 +314,6 @@ int main(int argc,char* argv[]) "-*-times-*-r-*-*-*-600-*-*-p-*-*-*", "-*-*-*-r-*-sans-*-600-*-*-p-*-*-*", "-*-*-*-r-*-*-*-600-*-*-m-*-*-*", - "-*-helvetica-*-r-*-*-*-240-*-*-p-*-*-*", "-*-lucida-*-r-*-*-*-240-*-*-p-*-*-*", "-*-times-*-r-*-*-*-240-*-*-p-*-*-*", @@ -448,6 +364,7 @@ int main(int argc,char* argv[]) int arg_DelayPhraseMin; int arg_DelayPhraseMax; char* arg_Text; + char* arg_Source; /* Set-up ---------------------------------------------------------- */ @@ -461,7 +378,7 @@ int main(int argc,char* argv[]) /* Randomize -- only need to do this here because this program doesn't use the `screenhack.h' or `lockmore.h' APIs. */ # undef ya_rand_init - ya_rand_init ((int) time ((time_t *) 0)); + ya_rand_init (0); /* Handle all the X nonsense */ #if defined(__sgi) @@ -530,10 +447,99 @@ int main(int argc,char* argv[]) text_Item = 0; text_Count = 0; memset(text_Used,0,sizeof(text_Used)); - arg_Text = get_string_resource(XSUBLIM_ARG_PHRASES,"Phrases"); + arg_Source = get_string_resource(XSUBLIM_ARG_FILE,"Filename"); + if (arg_Source != NULL) + { + FILE* file_Fs; + struct stat file_Stat; + + file_Fs = fopen(arg_Source,"rb"); + if (file_Fs == NULL) + { + fprintf(stderr,"%s: Could not open '%s'\n",progname, + arg_Source); + exit(-1); + } + if (fstat(fileno(file_Fs),&file_Stat) != 0) + { + fprintf(stderr,"%s: Could not stat '%s'\n",progname, + arg_Source); + exit(-1); + } + arg_Text = calloc(1,file_Stat.st_size+1); + if (arg_Text != NULL) + { + if (fread(arg_Text,file_Stat.st_size,1,file_Fs) != 1) + { + fprintf(stderr,"%s: Could not read '%s'\n", + progname,arg_Source); + exit(-1); + } + } + fclose(file_Fs); + } + else + { + arg_Source = get_string_resource(XSUBLIM_ARG_PROGRAM, + "Executable"); + if (arg_Source != NULL) + { + char* exe_Command = calloc(1,strlen(arg_Source)+10); + FILE* exe_Fs; + + if (exe_Command == NULL) + { + fprintf(stderr, + "%s: Could not allocate space for '%s'\n", + progname,arg_Source); + exit(-1); + } + sprintf(exe_Command,"( %s ) 2>&1",arg_Source); + + exe_Fs = popen(exe_Command,"r"); + if (exe_Fs == NULL) + { + fprintf(stderr,"%s: Could not run '%s'\n", + progname,arg_Source); + exit(-1); + } + arg_Text = calloc(1,XSUBLIM_PROGRAM_SIZE); + if (arg_Text != NULL) + { + if (fread(arg_Text,1,XSUBLIM_PROGRAM_SIZE, + exe_Fs) <= 0) + { + fprintf(stderr, + "%s: Could not read output of '%s'\n", + progname,arg_Source); + exit(-1); + } + if ( + strstr(arg_Text,": not found") || + strstr(arg_Text,": Not found") || + strstr(arg_Text,": command not found") || + strstr(arg_Text,": Command not found")) + { + fprintf(stderr, + "%s: Could not find '%s'\n", + progname,arg_Source); + exit(-1); + } + } + fclose(exe_Fs); + } + else + { + arg_Text = + get_string_resource(XSUBLIM_ARG_PHRASES,"Phrases"); + if (arg_Text != NULL) + { + arg_Text = strdup(arg_Text); + } + } + } if (arg_Text != NULL) { - arg_Text = strdup(arg_Text); while (((text_Phrase = strtok(arg_Text,"\n")) != NULL) && (text_Count < XSUBLIM_TEXT_COUNT)) { @@ -541,8 +547,8 @@ int main(int argc,char* argv[]) text_List[text_Count] = text_Phrase; text_Count++; } + text_List[text_Count] = NULL; } - text_List[text_Count] = NULL; if (text_Count == 0) { fprintf(stderr,"%s: No text to display\n",progname); @@ -758,10 +764,10 @@ int main(int argc,char* argv[]) } /* Restore the error handler, ungrab the server */ - XSync(disp_Display, FALSE); + XSync(disp_Display,FALSE); XSetErrorHandler(Xsublim_Sh_Handler); XUngrabServer(disp_Display); - XSync(disp_Display, FALSE); + XSync(disp_Display,FALSE); /* Pause between words */ if (Xsublim_Sig_Last == -1)