summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2014-10-25 13:15:46 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2014-10-25 13:28:08 -0700
commitcb2b3214a0593b0970cd8738d34d0ac3e1268b38 (patch)
treee323f6f8838d8649737272dc8828569b4f9c5580
parent5134d3eaaeb25a49622d827af7c783b980a10919 (diff)
Remove #if 0 code
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--XFontName.c68
-rw-r--r--draw.c9
-rw-r--r--font.c14
-rw-r--r--lex.c4
4 files changed, 0 insertions, 95 deletions
diff --git a/XFontName.c b/XFontName.c
index c9ce253..6994dd3 100644
--- a/XFontName.c
+++ b/XFontName.c
@@ -189,71 +189,3 @@ XFormatFontName (XFontName *fontName, unsigned int fontNameAttributes,
strcpy (fontNameString, tmp);
return True;
}
-
-#if 0
-Bool
-XCompareFontName (
- XFontName *name1,
- XFontName *name2,
- unsigned int fontNameAttributes)
-{
-#define CompareString(field,bit) \
- if (fontNameAttributes & bit) \
- if (strcmp (name1->field, name2->field)) \
- return False;
-
-#define CompareUnsigned(field,bit) \
- if (fontNameAttributes & bit) \
- if (name1->field != name2->field) \
- return False;
-
- CompareString (Registry, FontNameRegistry)
- CompareString (Foundry, FontNameFoundry)
- CompareString (FamilyName, FontNameFamilyName)
- CompareString (WeightName, FontNameWeightName)
- CompareString (Slant, FontNameSlant)
- CompareString (SetwidthName, FontNameSetwidthName)
- CompareString (AddStyleName, FontNameAddStyleName)
- CompareUnsigned (PixelSize, FontNamePixelSize)
- CompareUnsigned (PointSize, FontNamePointSize)
- CompareUnsigned (ResolutionX, FontNameResolutionX)
- CompareUnsigned (ResolutionY, FontNameResolutionY)
- CompareString (Spacing, FontNameSpacing)
- CompareUnsigned (AverageWidth, FontNameAverageWidth)
- CompareString (CharSetRegistry, FontNameCharSetRegistry)
- CompareString (CharSetEncoding, FontNameCharSetEncoding)
- return True;
-}
-
-Bool
-XCopyFontName (
- const XFontName *name1,
- XFontName *name2,
- unsigned int fontNameAttributes)
-{
-#define CopyString(field,bit) \
- if (fontNameAttributes & bit) \
- strcpy (name2->field, name1->field);
-
-#define CopyUnsigned(field,bit) \
- if (fontNameAttributes & bit) \
- name2->field = name1->field;
-
- CopyString (Registry, FontNameRegistry)
- CopyString (Foundry, FontNameFoundry)
- CopyString (FamilyName, FontNameFamilyName)
- CopyString (WeightName, FontNameWeightName)
- CopyString (Slant, FontNameSlant)
- CopyString (SetwidthName, FontNameSetwidthName)
- CopyString (AddStyleName, FontNameAddStyleName)
- CopyUnsigned (PixelSize, FontNamePixelSize)
- CopyUnsigned (PointSize, FontNamePointSize)
- CopyUnsigned (ResolutionX, FontNameResolutionX)
- CopyUnsigned (ResolutionY, FontNameResolutionY)
- CopyString (Spacing, FontNameSpacing)
- CopyUnsigned (AverageWidth, FontNameAverageWidth)
- CopyString (CharSetRegistry, FontNameCharSetRegistry)
- CopyString (CharSetEncoding, FontNameCharSetEncoding)
- return True;
-}
-#endif
diff --git a/draw.c b/draw.c
index f18a137..653d840 100644
--- a/draw.c
+++ b/draw.c
@@ -153,15 +153,6 @@ FlushCharCache (DviWidget dw)
dw->dvi.cache.start_y = dw->dvi.cache.y = yx;
}
-#if 0
-void
-ClearPage (DviWidget dw)
-{
- if (dw->dvi.display_enable)
- XClearWindow (XtDisplay (dw), XtWindow (dw));
-}
-#endif
-
void
SetGCForDraw (DviWidget dw)
{
diff --git a/font.c b/font.c
index 014451f..f4a658f 100644
--- a/font.c
+++ b/font.c
@@ -440,17 +440,3 @@ DviCharIsLigature (DviCharNameMap *map, const char *name)
}
return NULL;
}
-
-#if 0
-LoadFont (DviWidget dw, int position, int size)
-{
- XFontStruct *font;
-
- font = QueryFont (dw, position, size);
- dw->dvi.font_number = position;
- dw->dvi.font_size = size;
- dw->dvi.font = font;
- XSetFont (XtDisplay (dw), dw->dvi.normal_GC, font->fid);
- return;
-}
-#endif
diff --git a/lex.c b/lex.c
index 2a1ef0c..29b65c6 100644
--- a/lex.c
+++ b/lex.c
@@ -34,10 +34,6 @@ GetLine(DviWidget dw, char *Buffer, int Length)
while ((!p || i < Length) && DviGetC (dw, &c) != EOF && c != '\n')
if (p)
*p++ = c;
-#if 0
- if (c == '\n' && p) /* Retain the newline like fgets */
- *p++ = c;
-#endif
if (c == '\n')
DviUngetC(dw, c);
if (p)