home *** CD-ROM | disk | FTP | other *** search
/ PC-Online 1996 May / PCOnline_05_1996.bin / linux / source / ap / ghostscr / gs.c / gs.c.diff
Text File  |  1995-05-02  |  4KB  |  156 lines
  1. *** gs.c.org    Sun Oct 24 18:47:50 1993
  2. --- gs.c    Sun Oct 24 18:48:00 1993
  3. ***************
  4. *** 25,30 ****
  5. --- 25,31 ----
  6.   #include "string_.h"
  7.   /* Capture stdin/out/err before gs.h redefines them. */
  8.   #include <stdio.h>
  9. + #include <stdlib.h>
  10.   static FILE *real_stdin, *real_stdout, *real_stderr;
  11.   static void
  12.   get_real(void)
  13. ***************
  14. *** 108,116 ****
  15. --- 109,127 ----
  16.   private int quiet;
  17.   private int batch;
  18.   
  19. + /* Icky kludgy global flags */
  20. + char svgalib_detected = 0;
  21. + char video_resolution[25];
  22. + float size_multiplier = 1.0;
  23. + float adjust_xo = 0.0;
  24. + float adjust_yo = 0.0;
  25. + char xo_units = 'i';
  26. + char yo_units = 'i';
  27. + 
  28.   main(int argc, const char *argv[])
  29.   {    int argi;
  30.       char cstr[128];
  31. +     strcpy(video_resolution,"1024x768x256");
  32.       get_real();
  33.       gs_init0(real_stdin, real_stdout, real_stderr, argc);
  34.          {    char *lib = getenv(GS_LIB);
  35. ***************
  36. *** 204,209 ****
  37. --- 215,221 ----
  38.   private int
  39.   swproc(const char *arg)
  40.   {    char sw = arg[1];
  41. +         char optionbuf[20], *ptr;
  42.       arg += 2;        /* skip - and letter */
  43.       switch ( sw )
  44.          {
  45. ***************
  46. *** 296,301 ****
  47. --- 308,358 ----
  48.                  }
  49.              }
  50.           /* Enter the name in systemdict. */
  51. +         if (!strncmp(arg,"DEVICE=linux",12)) svgalib_detected = 1;
  52. +         if (svgalib_detected == 1) { 
  53. +             if (!strncmp(arg,"MAGSTEP=",8)) {
  54. +                 strcpy(optionbuf,arg);
  55. +                 ptr = optionbuf;
  56. +                         ptr += 8;
  57. +                         size_multiplier=atof(ptr);
  58. +                     }
  59. +             if (!strncmp(arg,"XO=",3)) {
  60. +                 strcpy(optionbuf,arg);
  61. +                 ptr = optionbuf;
  62. +                         ptr += 3;
  63. +                         adjust_xo=atof(ptr);
  64. +             ptr++;
  65. +             while (*ptr != 0) {
  66. +                 ptr++;
  67. +              }
  68. +             ptr--;
  69. +             if (*ptr == 'n') {
  70. +                   xo_units = 'i';
  71. +                 } else if (*ptr == 'm') {
  72. +                     xo_units = 'c';
  73. +             } else if (*ptr == '%') {
  74. +                 xo_units = '%';
  75. +             }
  76. +               }
  77. +             if (!strncmp(arg,"YO=",3)) {
  78. +                 strcpy(optionbuf,arg);
  79. +                 ptr = optionbuf;
  80. +                         ptr += 3;
  81. +                         adjust_yo=atof(ptr);
  82. +             ptr++;
  83. +             while (*ptr != 0) {
  84. +                 ptr++;
  85. +              }
  86. +             ptr--;
  87. +             if (*ptr == 'n') {
  88. +                   yo_units = 'i';
  89. +                 } else if (*ptr == 'm') {
  90. +                     yo_units = 'c';
  91. +             } else if (*ptr == '%') {
  92. +                 yo_units = '%';
  93. +             }
  94. +             }
  95. +         } 
  96.           initial_enter_string(arg, nlen, &value);
  97.           break;
  98.          }
  99. ***************
  100. *** 324,347 ****
  101.          }
  102.           break;
  103.       case 'r':            /* define device resolution */
  104. !        {    float xres, yres;
  105. !         ref value;
  106. !         gs_init1();
  107. !         switch ( sscanf((char *)arg, "%fx%f", &xres, &yres) )
  108. !            {
  109. !         default:
  110. !             puts("-r must be followed by <res> or <xres>x<yres>");
  111. !             gs_exit(1);
  112. !         case 1:            /* -r<res> */
  113. !             yres = xres;
  114. !         case 2:            /* -r<xres>x<yres> */
  115. !             make_real(&value, xres);
  116. !             initial_enter_name("DEVICEXRESOLUTION", &value);
  117. !             make_real(&value, yres);
  118. !             initial_enter_name("DEVICEYRESOLUTION", &value);
  119. !            }
  120.           break;
  121. !        }
  122.       case 'v':            /* print revision */
  123.           print_revision();
  124.           gs_exit(0);
  125. --- 381,410 ----
  126.          }
  127.           break;
  128.       case 'r':            /* define device resolution */
  129. !            if (svgalib_detected == 0) {
  130. !         {    float xres, yres;
  131. !             ref value;
  132. !             gs_init1();
  133. !             switch ( sscanf((char *)arg, "%fx%f", &xres, &yres) )
  134. !                {
  135. !             default:
  136. !                 puts("-r must be followed by <res> or <xres>x<yres>");
  137. !                 gs_exit(1);
  138. !             case 1:            /* -r<res> */
  139. !                 yres = xres;
  140. !             case 2:            /* -r<xres>x<yres> */
  141. !                 make_real(&value, xres);
  142. !                 initial_enter_name("DEVICEXRESOLUTION", &value);
  143. !                 make_real(&value, yres);
  144. !                 initial_enter_name("DEVICEYRESOLUTION", &value);
  145. !                }
  146. !                  break;
  147. !         }
  148. !            } else {
  149. !         strcpy(video_resolution,arg);
  150. !                 video_resolution[24] = 0;
  151.           break;
  152. !            }
  153.       case 'v':            /* print revision */
  154.           print_revision();
  155.           gs_exit(0);
  156.