← Back to branch summary

~ubuntu-branches/ubuntu/lucid/xpdf/lucid-updates

« back to all changes in this revision

Viewing changes to xpdf/xpdf.cc

  • Committer: Bazaar Package Importer
  • Author(s): Andy Price
  • Date: 2007-05-17 22:04:33 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20070517220433-gzcx2lrvllkbl7mr
Tags: 3.02-1ubuntu1
https://launchpad.net/bugs/113365
* Merge from Debian unstable (LP: #113365), remaining changes:
  - Added back 09_xpdfrc_manpage.dpatch (LP #71753)
  - Set Ubuntu maintainer

Show diffs side-by-side

added added

removed removed

Lines of Context:
xpdf/xpdf.cc
25
25
static char enableT1libStr[16] = "";
26
26
static char enableFreeTypeStr[16] = "";
27
27
static char antialiasStr[16] = "";
 
28
static char vectorAntialiasStr[16] = "";
28
29
static char psFileArg[256];
29
30
static char paperSize[15] = "";
30
31
static int paperWidth = 0;
36
37
static char userPassword[33] = "\001";
37
38
static GBool fullScreen = gFalse;
38
39
static char remoteName[100] = "xpdf_";
 
40
static char remoteCmd[512] = "";
39
41
static GBool doRemoteReload = gFalse;
40
42
static GBool doRemoteRaise = gFalse;
41
43
static GBool doRemoteQuit = gFalse;
74
76
#endif
75
77
  {"-aa",         argString,      antialiasStr,   sizeof(antialiasStr),
76
78
   "enable font anti-aliasing: yes, no"},
 
79
  {"-aaVector",   argString,      vectorAntialiasStr, sizeof(vectorAntialiasStr),
 
80
   "enable vector anti-aliasing: yes, no"},
77
81
  {"-ps",         argString,      psFileArg,      sizeof(psFileArg),
78
82
   "default PostScript file name or command"},
79
83
  {"-paper",      argString,      paperSize,      sizeof(paperSize),
96
100
   "run in full-screen (presentation) mode"},
97
101
  {"-remote",     argString,      remoteName + 5, sizeof(remoteName) - 5,
98
102
   "start/contact xpdf remote server with specified name"},
 
103
  {"-exec",       argString,      remoteCmd,      sizeof(remoteCmd),
 
104
   "execute command on xpdf remote server (with -remote only)"},
99
105
  {"-reload",     argFlag,        &doRemoteReload, 0,
100
106
   "reload xpdf remove server window (with -remote only)"},
101
107
  {"-raise",      argFlag,        &doRemoteRaise, 0,
194
200
      fprintf(stderr, "Bad '-aa' value on command line\n");
195
201
    }
196
202
  }
 
203
  if (vectorAntialiasStr[0]) {
 
204
    if (!globalParams->setVectorAntialias(vectorAntialiasStr)) {
 
205
      fprintf(stderr, "Bad '-aaVector' value on command line\n");
 
206
    }
 
207
  }
197
208
  if (printCommands) {
198
209
    globalParams->setPrintCommands(printCommands);
199
210
  }
212
223
 
213
224
  // check command line
214
225
  ok = ok && argc >= 1 && argc <= 3;
 
226
  if (remoteCmd[0]) {
 
227
    ok = ok && remoteName[5] && !doRemoteReload && !doRemoteRaise &&
 
228
         !doRemoteQuit && argc == 1;
 
229
  }
215
230
  if (doRemoteReload) {
216
231
    ok = ok && remoteName[5] && !doRemoteQuit && argc == 1;
217
232
  }
260
275
        } else {
261
276
          app->remoteOpen(fileName, pg, doRemoteRaise);
262
277
        }
 
278
      } else if (remoteCmd[0]) {
 
279
        app->remoteExec(remoteCmd);
263
280
      } else if (doRemoteReload) {
264
281
        app->remoteReload(doRemoteRaise);
265
282
      } else if (doRemoteRaise) {