Re: rc file patch

[Scott Moynes]

I borked that patch. Here's a, hopefully, useable one.


-- 
Copyleft (c) 2001, Scott Moynes
Only in bbkeys-0.8.3/redhat: Makefile
Only in bbkeys-0.8.3/redhat: bbkeys.spec
diff -rucb bbkeys-0.8.3/src/bbkeys.cc bbkeys-0.8.3-rc/src/bbkeys.cc
*** bbkeys-0.8.3/src/bbkeys.cc  Fri Sep 14 17:33:46 2001
--- bbkeys-0.8.3-rc/src/bbkeys.cc       Tue Nov 13 18:06:27 2001
***************
*** 793,802 ****
        timer->setTimeout(100);
        timer->fireOnce(True);
  
        char *homedir = getenv("HOME");
        bbkeys_rcfile = new char[strlen(homedir) + 32];
        sprintf(bbkeys_rcfile, "%s/.bbkeysrc", homedir);
! 
        XrmInitialize();
  
        InitializeModifiers();
--- 793,805 ----
        timer->setTimeout(100);
        timer->fireOnce(True);
  
+       if (!(options->bbkeysrc)){
          char *homedir = getenv("HOME");
          bbkeys_rcfile = new char[strlen(homedir) + 32];
          sprintf(bbkeys_rcfile, "%s/.bbkeysrc", homedir);
!       }else{
!         bbkeys_rcfile = options->bbkeysrc;
!       }
        XrmInitialize();
  
        InitializeModifiers();
diff -rucb bbkeys-0.8.3/src/main.cc bbkeys-0.8.3-rc/src/main.cc
*** bbkeys-0.8.3/src/main.cc    Wed Aug  1 23:50:16 2001
--- bbkeys-0.8.3-rc/src/main.cc Tue Nov 13 18:06:41 2001
***************
*** 53,58 ****
--- 53,60 ----
            "but smaller.\n");
      fprintf(stderr,
            "-t[inyMe]                   All you can see is his keyhole *sniff*.\n\n");
+       fprintf(stderr,
+               "-r[cfile]                   Your bbkeys config file. Default: 
+$HOME/.bbkeysrc\n");
  }
  
  
***************
*** 71,77 ****
      options.noQt = False;
      options.miniMe = False;
      options.tinyMe = False;
! 
  
      for (i = 1; i < argc; i++) {
        if ((!strcmp(argv[i], "-display"))) {
--- 73,79 ----
      options.noQt = False;
      options.miniMe = False;
      options.tinyMe = False;
!       options.bbkeysrc = NULL;
  
      for (i = 1; i < argc; i++) {
        if ((!strcmp(argv[i], "-display"))) {
***************
*** 88,93 ****
--- 90,102 ----
                exit(2);
            };
            options.config_file = argv[i];
+       }else if((!strcmp(argv[1], "-rcfile"))||
+                         (!strcmp(argv[i], "-r"))){
+         if(++i == argc){
+               Usage();
+               exit(2);
+         };
+         options.bbkeysrc=argv[i];
        } else if ((!strcmp(argv[i], "-nobb")) | (!strcmp(argv[i], "-n"))) {
            options.nobb_config = True;
        } else if ((!strcmp(argv[i], "-v"))
diff -rucb bbkeys-0.8.3/src/main.hh bbkeys-0.8.3-rc/src/main.hh
*** bbkeys-0.8.3/src/main.hh    Tue Sep 18 22:59:23 2001
--- bbkeys-0.8.3-rc/src/main.hh Tue Nov 13 17:56:41 2001
***************
*** 33,38 ****
--- 33,39 ----
    bool noQt;
    bool miniMe;
    bool tinyMe;
+   char *bbkeysrc;
  };
  
  #endif // __MAIN_H

msg03794/pgp00000.pgp
Description: PGP signature