is a PDF viewer for X.
| GlobalParams.cc (xpdf-4.03) | : | GlobalParams.cc (xpdf-4.04) |
|---|
| | |
| skipping to change at line 215 | | skipping to change at line 215 |
|---|
| // skip | | // skip |
| } else if (*p >= 'a' && *p <= 'z') { | | } else if (*p >= 'a' && *p <= 'z') { |
| out->append((char)(*p & 0xdf)); | | out->append((char)(*p & 0xdf)); |
| } else { | | } else { |
| out->append(*p); | | out->append(*p); |
| } | | } |
| } | | } |
| return out; | | return out; |
| } | | } |
| | |
|
| // Remove trailing "Identity-H"/"Identity-V" from the name. | | // Remove trailing encoding tags from the name. |
| // Split the name into tokens at space/comma/dash/underscore. | | // Split the name into tokens at space/comma/dash/underscore. |
| // Remove trailing "MT" or "BT" from tokens. | | // Remove trailing "MT" or "BT" from tokens. |
| // Remove trailing "PS" and "WGL4" from tokens. | | // Remove trailing "PS" and "WGL4" from tokens. |
| // Uppercase each token. | | // Uppercase each token. |
| // Concatenate tokens (dropping the space/comma/dash chars). | | // Concatenate tokens (dropping the space/comma/dash chars). |
| GString *SysFontInfo::mungeName2(GString *in) { | | GString *SysFontInfo::mungeName2(GString *in) { |
| GString *out = new GString(); | | GString *out = new GString(); |
| char *p0 = in->getCString(); | | char *p0 = in->getCString(); |
| while (*p0) { | | while (*p0) { |
|
| if (!strcmp(p0, "Identity-H") || !strcmp(p0, "Identity-V")) { | | if (!strcmp(p0, "Identity-H") || !strcmp(p0, "Identity-V") || |
| | !strcmp(p0, "GB2312") || |
| | !strcmp(p0, "UniGB-UCS2-H") || !strcmp(p0, "UniGB-UCS2-V")) { |
| break; | | break; |
| } | | } |
| char *p1; | | char *p1; |
| for (p1 = p0 + 1; | | for (p1 = p0 + 1; |
| *p1 && *p1 != ' ' && *p1 != ',' && *p1 != '-' && *p1 != '_'; | | *p1 && *p1 != ' ' && *p1 != ',' && *p1 != '-' && *p1 != '_'; |
| ++p1) ; | | ++p1) ; |
| char *p2 = p1; | | char *p2 = p1; |
| if (p2 - p0 >= 2 && (p2[-2] == 'B' || p2[-2] == 'M') && p2[-1] == 'T') { | | if (p2 - p0 >= 2 && (p2[-2] == 'B' || p2[-2] == 'M') && p2[-1] == 'T') { |
| p2 -= 2; | | p2 -= 2; |
| } | | } |
| | |
| skipping to change at line 725 | | skipping to change at line 727 |
|---|
| initialSidebarWidth = 0; | | initialSidebarWidth = 0; |
| initialSelectMode = new GString("linear"); | | initialSelectMode = new GString("linear"); |
| maxTileWidth = 1500; | | maxTileWidth = 1500; |
| maxTileHeight = 1500; | | maxTileHeight = 1500; |
| tileCacheSize = 10; | | tileCacheSize = 10; |
| workerThreads = 1; | | workerThreads = 1; |
| enableFreeType = gTrue; | | enableFreeType = gTrue; |
| disableFreeTypeHinting = gFalse; | | disableFreeTypeHinting = gFalse; |
| antialias = gTrue; | | antialias = gTrue; |
| vectorAntialias = gTrue; | | vectorAntialias = gTrue; |
|
| | imageMaskAntialias = gTrue; |
| antialiasPrinting = gFalse; | | antialiasPrinting = gFalse; |
| strokeAdjust = strokeAdjustNormal; | | strokeAdjust = strokeAdjustNormal; |
| screenType = screenUnset; | | screenType = screenUnset; |
| screenSize = -1; | | screenSize = -1; |
| screenDotRadius = -1; | | screenDotRadius = -1; |
| screenGamma = 1.0; | | screenGamma = 1.0; |
| screenBlackThreshold = 0.0; | | screenBlackThreshold = 0.0; |
| screenWhiteThreshold = 1.0; | | screenWhiteThreshold = 1.0; |
| minLineWidth = 0.0; | | minLineWidth = 0.0; |
| enablePathSimplification = gFalse; | | enablePathSimplification = gFalse; |
| drawAnnotations = gTrue; | | drawAnnotations = gTrue; |
| drawFormFields = gTrue; | | drawFormFields = gTrue; |
|
| | enableXFA = gTrue; |
| overprintPreview = gFalse; | | overprintPreview = gFalse; |
| paperColor = new GString("#ffffff"); | | paperColor = new GString("#ffffff"); |
| matteColor = new GString("#808080"); | | matteColor = new GString("#808080"); |
| fullScreenMatteColor = new GString("#000000"); | | fullScreenMatteColor = new GString("#000000"); |
| selectionColor = new GString("#8080ff"); | | selectionColor = new GString("#8080ff"); |
| reverseVideoInvertImages = gFalse; | | reverseVideoInvertImages = gFalse; |
| launchCommand = NULL; | | launchCommand = NULL; |
| movieCommand = NULL; | | movieCommand = NULL; |
| defaultPrinter = NULL; | | defaultPrinter = NULL; |
| mapNumericCharNames = gTrue; | | mapNumericCharNames = gTrue; |
| mapUnknownCharNames = gFalse; | | mapUnknownCharNames = gFalse; |
| mapExtTrueTypeFontsViaUnicode = gTrue; | | mapExtTrueTypeFontsViaUnicode = gTrue; |
|
| | useTrueTypeUnicodeMapping = gFalse; |
| droppedFonts = new GHash(gTrue); | | droppedFonts = new GHash(gTrue); |
| createDefaultKeyBindings(); | | createDefaultKeyBindings(); |
| popupMenuCmds = new GList(); | | popupMenuCmds = new GList(); |
| tabStateFile = appendToPath(getHomeDir(), ".xpdf.tab-state"); | | tabStateFile = appendToPath(getHomeDir(), ".xpdf.tab-state"); |
|
| | savePageNumbers = gTrue; |
| printCommands = gFalse; | | printCommands = gFalse; |
|
| | printStatusInfo = gFalse; |
| errQuiet = gFalse; | | errQuiet = gFalse; |
| debugLogFile = NULL; | | debugLogFile = NULL; |
| | |
| cidToUnicodeCache = new CharCodeToUnicodeCache(cidToUnicodeCacheSize); | | cidToUnicodeCache = new CharCodeToUnicodeCache(cidToUnicodeCacheSize); |
| unicodeToUnicodeCache = | | unicodeToUnicodeCache = |
| new CharCodeToUnicodeCache(unicodeToUnicodeCacheSize); | | new CharCodeToUnicodeCache(unicodeToUnicodeCacheSize); |
| unicodeMapCache = new UnicodeMapCache(); | | unicodeMapCache = new UnicodeMapCache(); |
| cMapCache = new CMapCache(); | | cMapCache = new CMapCache(); |
| | |
| // set up the initial nameToUnicode table | | // set up the initial nameToUnicode table |
| | |
| skipping to change at line 1180 | | skipping to change at line 1187 |
|---|
| } else if (!cmd->cmp("enableFreeType")) { | | } else if (!cmd->cmp("enableFreeType")) { |
| parseYesNo("enableFreeType", &enableFreeType, tokens, fileName, line); | | parseYesNo("enableFreeType", &enableFreeType, tokens, fileName, line); |
| } else if (!cmd->cmp("disableFreeTypeHinting")) { | | } else if (!cmd->cmp("disableFreeTypeHinting")) { |
| parseYesNo("disableFreeTypeHinting", &disableFreeTypeHinting, | | parseYesNo("disableFreeTypeHinting", &disableFreeTypeHinting, |
| tokens, fileName, line); | | tokens, fileName, line); |
| } else if (!cmd->cmp("antialias")) { | | } else if (!cmd->cmp("antialias")) { |
| parseYesNo("antialias", &antialias, tokens, fileName, line); | | parseYesNo("antialias", &antialias, tokens, fileName, line); |
| } else if (!cmd->cmp("vectorAntialias")) { | | } else if (!cmd->cmp("vectorAntialias")) { |
| parseYesNo("vectorAntialias", &vectorAntialias, | | parseYesNo("vectorAntialias", &vectorAntialias, |
| tokens, fileName, line); | | tokens, fileName, line); |
|
| | } else if (!cmd->cmp("imageMaskAntialias")) { |
| | parseYesNo("imageMaskAntialias", &imageMaskAntialias, |
| | tokens, fileName, line); |
| } else if (!cmd->cmp("antialiasPrinting")) { | | } else if (!cmd->cmp("antialiasPrinting")) { |
| parseYesNo("antialiasPrinting", &antialiasPrinting, | | parseYesNo("antialiasPrinting", &antialiasPrinting, |
| tokens, fileName, line); | | tokens, fileName, line); |
| } else if (!cmd->cmp("strokeAdjust")) { | | } else if (!cmd->cmp("strokeAdjust")) { |
| parseStrokeAdjust(tokens, fileName, line); | | parseStrokeAdjust(tokens, fileName, line); |
| } else if (!cmd->cmp("screenType")) { | | } else if (!cmd->cmp("screenType")) { |
| parseScreenType(tokens, fileName, line); | | parseScreenType(tokens, fileName, line); |
| } else if (!cmd->cmp("screenSize")) { | | } else if (!cmd->cmp("screenSize")) { |
| parseInteger("screenSize", &screenSize, tokens, fileName, line); | | parseInteger("screenSize", &screenSize, tokens, fileName, line); |
| } else if (!cmd->cmp("screenDotRadius")) { | | } else if (!cmd->cmp("screenDotRadius")) { |
| | |
| skipping to change at line 1213 | | skipping to change at line 1223 |
|---|
| tokens, fileName, line); | | tokens, fileName, line); |
| } else if (!cmd->cmp("enablePathSimplification")) { | | } else if (!cmd->cmp("enablePathSimplification")) { |
| parseYesNo("enablePathSimplification", &enablePathSimplification, | | parseYesNo("enablePathSimplification", &enablePathSimplification, |
| tokens, fileName, line); | | tokens, fileName, line); |
| } else if (!cmd->cmp("drawAnnotations")) { | | } else if (!cmd->cmp("drawAnnotations")) { |
| parseYesNo("drawAnnotations", &drawAnnotations, | | parseYesNo("drawAnnotations", &drawAnnotations, |
| tokens, fileName, line); | | tokens, fileName, line); |
| } else if (!cmd->cmp("drawFormFields")) { | | } else if (!cmd->cmp("drawFormFields")) { |
| parseYesNo("drawFormFields", &drawFormFields, | | parseYesNo("drawFormFields", &drawFormFields, |
| tokens, fileName, line); | | tokens, fileName, line); |
|
| | } else if (!cmd->cmp("enableXFA")) { |
| | parseYesNo("enableXFA", &enableXFA, |
| | tokens, fileName, line); |
| } else if (!cmd->cmp("overprintPreview")) { | | } else if (!cmd->cmp("overprintPreview")) { |
| parseYesNo("overprintPreview", &overprintPreview, | | parseYesNo("overprintPreview", &overprintPreview, |
| tokens, fileName, line); | | tokens, fileName, line); |
| } else if (!cmd->cmp("paperColor")) { | | } else if (!cmd->cmp("paperColor")) { |
| parseString("paperColor", &paperColor, tokens, fileName, line); | | parseString("paperColor", &paperColor, tokens, fileName, line); |
| } else if (!cmd->cmp("matteColor")) { | | } else if (!cmd->cmp("matteColor")) { |
| parseString("matteColor", &matteColor, tokens, fileName, line); | | parseString("matteColor", &matteColor, tokens, fileName, line); |
| } else if (!cmd->cmp("fullScreenMatteColor")) { | | } else if (!cmd->cmp("fullScreenMatteColor")) { |
| parseString("fullScreenMatteColor", &fullScreenMatteColor, | | parseString("fullScreenMatteColor", &fullScreenMatteColor, |
| tokens, fileName, line); | | tokens, fileName, line); |
| | |
| skipping to change at line 1244 | | skipping to change at line 1257 |
|---|
| } else if (!cmd->cmp("mapNumericCharNames")) { | | } else if (!cmd->cmp("mapNumericCharNames")) { |
| parseYesNo("mapNumericCharNames", &mapNumericCharNames, | | parseYesNo("mapNumericCharNames", &mapNumericCharNames, |
| tokens, fileName, line); | | tokens, fileName, line); |
| } else if (!cmd->cmp("mapUnknownCharNames")) { | | } else if (!cmd->cmp("mapUnknownCharNames")) { |
| parseYesNo("mapUnknownCharNames", &mapUnknownCharNames, | | parseYesNo("mapUnknownCharNames", &mapUnknownCharNames, |
| tokens, fileName, line); | | tokens, fileName, line); |
| } else if (!cmd->cmp("mapExtTrueTypeFontsViaUnicode")) { | | } else if (!cmd->cmp("mapExtTrueTypeFontsViaUnicode")) { |
| parseYesNo("mapExtTrueTypeFontsViaUnicode", | | parseYesNo("mapExtTrueTypeFontsViaUnicode", |
| &mapExtTrueTypeFontsViaUnicode, | | &mapExtTrueTypeFontsViaUnicode, |
| tokens, fileName, line); | | tokens, fileName, line); |
|
| | } else if (!cmd->cmp("useTrueTypeUnicodeMapping")) { |
| | parseYesNo("useTrueTypeUnicodeMapping", |
| | &useTrueTypeUnicodeMapping, |
| | tokens, fileName, line); |
| } else if (!cmd->cmp("dropFont")) { | | } else if (!cmd->cmp("dropFont")) { |
| parseDropFont(tokens, fileName, line); | | parseDropFont(tokens, fileName, line); |
| } else if (!cmd->cmp("bind")) { | | } else if (!cmd->cmp("bind")) { |
| parseBind(tokens, fileName, line); | | parseBind(tokens, fileName, line); |
| } else if (!cmd->cmp("unbind")) { | | } else if (!cmd->cmp("unbind")) { |
| parseUnbind(tokens, fileName, line); | | parseUnbind(tokens, fileName, line); |
| } else if (!cmd->cmp("popupMenuCmd")) { | | } else if (!cmd->cmp("popupMenuCmd")) { |
| parsePopupMenuCmd(tokens, fileName, line); | | parsePopupMenuCmd(tokens, fileName, line); |
| } else if (!cmd->cmp("tabStateFile")) { | | } else if (!cmd->cmp("tabStateFile")) { |
| parseString("tabStateFile", &tabStateFile, tokens, fileName, line); | | parseString("tabStateFile", &tabStateFile, tokens, fileName, line); |
|
| | } else if (!cmd->cmp("savePageNumbers")) { |
| | parseYesNo("savePageNumbers", &savePageNumbers, tokens, fileName, line); |
| } else if (!cmd->cmp("printCommands")) { | | } else if (!cmd->cmp("printCommands")) { |
| parseYesNo("printCommands", &printCommands, tokens, fileName, line); | | parseYesNo("printCommands", &printCommands, tokens, fileName, line); |
|
| | } else if (!cmd->cmp("printStatusInfo")) { |
| | parseYesNo("printStatusInfo", &printStatusInfo, tokens, fileName, line); |
| } else if (!cmd->cmp("errQuiet")) { | | } else if (!cmd->cmp("errQuiet")) { |
| parseYesNo("errQuiet", &errQuiet, tokens, fileName, line); | | parseYesNo("errQuiet", &errQuiet, tokens, fileName, line); |
| } else if (!cmd->cmp("debugLogFile")) { | | } else if (!cmd->cmp("debugLogFile")) { |
| parseString("debugLogFile", &debugLogFile, tokens, fileName, line); | | parseString("debugLogFile", &debugLogFile, tokens, fileName, line); |
| } else { | | } else { |
| error(errConfig, -1, "Unknown config file command '{0:t}' ({1:t}:{2:d})", | | error(errConfig, -1, "Unknown config file command '{0:t}' ({1:t}:{2:d})", |
| cmd, fileName, line); | | cmd, fileName, line); |
| if (!cmd->cmp("displayFontX") || | | if (!cmd->cmp("displayFontX") || |
| !cmd->cmp("displayNamedCIDFontX") || | | !cmd->cmp("displayNamedCIDFontX") || |
| !cmd->cmp("displayCIDFontX")) { | | !cmd->cmp("displayCIDFontX")) { |
| error(errConfig, -1, "Xpdf no longer supports X fonts"); | | error(errConfig, -1, "Xpdf no longer supports X fonts"); |
| } else if (!cmd->cmp("enableT1lib")) { | | } else if (!cmd->cmp("enableT1lib")) { |
| error(errConfig, -1, "Xpdf no longer uses t1lib"); | | error(errConfig, -1, "Xpdf no longer uses t1lib"); |
| } else if (!cmd->cmp("t1libControl") || !cmd->cmp("freetypeControl")) { | | } else if (!cmd->cmp("t1libControl") || !cmd->cmp("freetypeControl")) { |
| error(errConfig, -1, | | error(errConfig, -1, |
| "The t1libControl and freetypeControl options have been replaced by
the enableT1lib, enableFreeType, and antialias options"); | | "The t1libControl and freetypeControl options have been replaced by
the enableT1lib, enableFreeType, and antialias options"); |
| } else if (!cmd->cmp("fontpath") || !cmd->cmp("fontmap")) { | | } else if (!cmd->cmp("fontpath") || !cmd->cmp("fontmap")) { |
| error(errConfig, -1, | | error(errConfig, -1, |
| "The config file format has changed since Xpdf 0.9x"); | | "The config file format has changed since Xpdf 0.9x"); |
|
| } else if (!cmd->cmp("enableXFA")) { | | |
| error(errConfig, -1, "The enableXFA option is no longer used"); | | |
| } | | } |
| } | | } |
| } | | } |
| | |
| deleteGList(tokens, GString); | | deleteGList(tokens, GString); |
| } | | } |
| | |
| // Split a line into a sequence of tokens. Tokens are separated by | | // Split a line into a sequence of tokens. Tokens are separated by |
| // whitespace. Each token is one of: | | // whitespace. Each token is one of: |
| // - unquoted string, which can contain any char other than | | // - unquoted string, which can contain any char other than |
| | |
| skipping to change at line 2109 | | skipping to change at line 2128 |
|---|
| if (movieCommand) { | | if (movieCommand) { |
| delete movieCommand; | | delete movieCommand; |
| } | | } |
| if (defaultPrinter) { | | if (defaultPrinter) { |
| delete defaultPrinter; | | delete defaultPrinter; |
| } | | } |
| delete droppedFonts; | | delete droppedFonts; |
| deleteGList(keyBindings, KeyBinding); | | deleteGList(keyBindings, KeyBinding); |
| deleteGList(popupMenuCmds, PopupMenuCmd); | | deleteGList(popupMenuCmds, PopupMenuCmd); |
| delete tabStateFile; | | delete tabStateFile; |
|
| | delete debugLogFile; |
| | |
| cMapDirs->startIter(&iter); | | cMapDirs->startIter(&iter); |
| while (cMapDirs->getNext(&iter, &key, (void **)&list)) { | | while (cMapDirs->getNext(&iter, &key, (void **)&list)) { |
| deleteGList(list, GString); | | deleteGList(list, GString); |
| } | | } |
| delete cMapDirs; | | delete cMapDirs; |
| | |
| delete cidToUnicodeCache; | | delete cidToUnicodeCache; |
| delete unicodeToUnicodeCache; | | delete unicodeToUnicodeCache; |
| delete unicodeMapCache; | | delete unicodeMapCache; |
| | |
| skipping to change at line 3050 | | skipping to change at line 3070 |
|---|
| | |
| GBool GlobalParams::getVectorAntialias() { | | GBool GlobalParams::getVectorAntialias() { |
| GBool f; | | GBool f; |
| | |
| lockGlobalParams; | | lockGlobalParams; |
| f = vectorAntialias; | | f = vectorAntialias; |
| unlockGlobalParams; | | unlockGlobalParams; |
| return f; | | return f; |
| } | | } |
| | |
|
| | GBool GlobalParams::getImageMaskAntialias() { |
| | GBool f; |
| | |
| | lockGlobalParams; |
| | f = imageMaskAntialias; |
| | unlockGlobalParams; |
| | return f; |
| | } |
| | |
| GBool GlobalParams::getAntialiasPrinting() { | | GBool GlobalParams::getAntialiasPrinting() { |
| GBool f; | | GBool f; |
| | |
| lockGlobalParams; | | lockGlobalParams; |
| f = antialiasPrinting; | | f = antialiasPrinting; |
| unlockGlobalParams; | | unlockGlobalParams; |
| return f; | | return f; |
| } | | } |
| | |
| StrokeAdjustMode GlobalParams::getStrokeAdjust() { | | StrokeAdjustMode GlobalParams::getStrokeAdjust() { |
| | |
| skipping to change at line 3158 | | skipping to change at line 3187 |
|---|
| | |
| GBool GlobalParams::getDrawFormFields() { | | GBool GlobalParams::getDrawFormFields() { |
| GBool draw; | | GBool draw; |
| | |
| lockGlobalParams; | | lockGlobalParams; |
| draw = drawFormFields; | | draw = drawFormFields; |
| unlockGlobalParams; | | unlockGlobalParams; |
| return draw; | | return draw; |
| } | | } |
| | |
|
| | GBool GlobalParams::getEnableXFA() { |
| | GBool xfa; |
| | |
| | lockGlobalParams; |
| | xfa = enableXFA; |
| | unlockGlobalParams; |
| | return xfa; |
| | } |
| | |
| GString *GlobalParams::getPaperColor() { | | GString *GlobalParams::getPaperColor() { |
| GString *s; | | GString *s; |
| | |
| lockGlobalParams; | | lockGlobalParams; |
| s = paperColor->copy(); | | s = paperColor->copy(); |
| unlockGlobalParams; | | unlockGlobalParams; |
| return s; | | return s; |
| } | | } |
| | |
| GString *GlobalParams::getMatteColor() { | | GString *GlobalParams::getMatteColor() { |
| | |
| skipping to change at line 3239 | | skipping to change at line 3277 |
|---|
| | |
| GBool GlobalParams::getMapExtTrueTypeFontsViaUnicode() { | | GBool GlobalParams::getMapExtTrueTypeFontsViaUnicode() { |
| GBool map; | | GBool map; |
| | |
| lockGlobalParams; | | lockGlobalParams; |
| map = mapExtTrueTypeFontsViaUnicode; | | map = mapExtTrueTypeFontsViaUnicode; |
| unlockGlobalParams; | | unlockGlobalParams; |
| return map; | | return map; |
| } | | } |
| | |
|
| | GBool GlobalParams::getUseTrueTypeUnicodeMapping() { |
| | GBool use; |
| | |
| | lockGlobalParams; |
| | use = useTrueTypeUnicodeMapping; |
| | unlockGlobalParams; |
| | return use; |
| | } |
| | |
| GBool GlobalParams::isDroppedFont(const char *fontName) { | | GBool GlobalParams::isDroppedFont(const char *fontName) { |
| GBool isDropped; | | GBool isDropped; |
| | |
| lockGlobalParams; | | lockGlobalParams; |
| isDropped = droppedFonts->lookupInt(fontName) != 0; | | isDropped = droppedFonts->lookupInt(fontName) != 0; |
| unlockGlobalParams; | | unlockGlobalParams; |
| return isDropped; | | return isDropped; |
| } | | } |
| | |
| GList *GlobalParams::getKeyBinding(int code, int mods, int context) { | | GList *GlobalParams::getKeyBinding(int code, int mods, int context) { |
| | |
| skipping to change at line 3309 | | skipping to change at line 3356 |
|---|
| | |
| GString *GlobalParams::getTabStateFile() { | | GString *GlobalParams::getTabStateFile() { |
| GString *s; | | GString *s; |
| | |
| lockGlobalParams; | | lockGlobalParams; |
| s = tabStateFile->copy(); | | s = tabStateFile->copy(); |
| unlockGlobalParams; | | unlockGlobalParams; |
| return s; | | return s; |
| } | | } |
| | |
|
| | GBool GlobalParams::getSavePageNumbers() { |
| | GBool s; |
| | |
| | lockGlobalParams; |
| | s = savePageNumbers; |
| | unlockGlobalParams; |
| | return s; |
| | } |
| | |
| GBool GlobalParams::getPrintCommands() { | | GBool GlobalParams::getPrintCommands() { |
| GBool p; | | GBool p; |
| | |
| lockGlobalParams; | | lockGlobalParams; |
| p = printCommands; | | p = printCommands; |
| unlockGlobalParams; | | unlockGlobalParams; |
| return p; | | return p; |
| } | | } |
| | |
|
| | GBool GlobalParams::getPrintStatusInfo() { |
| | GBool p; |
| | |
| | lockGlobalParams; |
| | p = printStatusInfo; |
| | unlockGlobalParams; |
| | return p; |
| | } |
| | |
| GBool GlobalParams::getErrQuiet() { | | GBool GlobalParams::getErrQuiet() { |
| // no locking -- this function may get called from inside a locked | | // no locking -- this function may get called from inside a locked |
| // section | | // section |
| return errQuiet; | | return errQuiet; |
| } | | } |
| | |
| GString *GlobalParams::getDebugLogFile() { | | GString *GlobalParams::getDebugLogFile() { |
| return debugLogFile; | | return debugLogFile; |
| } | | } |
| | |
| | |
| skipping to change at line 3744 | | skipping to change at line 3809 |
|---|
| tabStateFile = new GString(tabStateFileA); | | tabStateFile = new GString(tabStateFileA); |
| unlockGlobalParams; | | unlockGlobalParams; |
| } | | } |
| | |
| void GlobalParams::setPrintCommands(GBool printCommandsA) { | | void GlobalParams::setPrintCommands(GBool printCommandsA) { |
| lockGlobalParams; | | lockGlobalParams; |
| printCommands = printCommandsA; | | printCommands = printCommandsA; |
| unlockGlobalParams; | | unlockGlobalParams; |
| } | | } |
| | |
|
| | void GlobalParams::setPrintStatusInfo(GBool printStatusInfoA) { |
| | lockGlobalParams; |
| | printStatusInfo = printStatusInfoA; |
| | unlockGlobalParams; |
| | } |
| | |
| void GlobalParams::setErrQuiet(GBool errQuietA) { | | void GlobalParams::setErrQuiet(GBool errQuietA) { |
| lockGlobalParams; | | lockGlobalParams; |
| errQuiet = errQuietA; | | errQuiet = errQuietA; |
| unlockGlobalParams; | | unlockGlobalParams; |
| } | | } |
| | |
| #ifdef _WIN32 | | #ifdef _WIN32 |
| void GlobalParams::setWin32ErrorInfo(const char *func, DWORD code) { | | void GlobalParams::setWin32ErrorInfo(const char *func, DWORD code) { |
| XpdfWin32ErrorInfo *errorInfo; | | XpdfWin32ErrorInfo *errorInfo; |
| | |
| | | |
| End of changes. 20 change blocks. |
|---|
| 4 lines changed or deleted | | 75 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 