Remove remnants of unimplemented textclass mode attribute.
SVN revision: 49480
This commit is contained in:
parent
8e9f98ea29
commit
1567896698
|
@ -85,7 +85,6 @@
|
||||||
|
|
||||||
#define __NAME 100
|
#define __NAME 100
|
||||||
|
|
||||||
#define __FONT 203
|
|
||||||
#define __ORIENTATION 200
|
#define __ORIENTATION 200
|
||||||
#define __JUSTIFICATION 201
|
#define __JUSTIFICATION 201
|
||||||
#define __DRAWING_EFFECT 204
|
#define __DRAWING_EFFECT 204
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
|
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
|
||||||
* Copyright (C) 2004-2009 Kim Woelders
|
* Copyright (C) 2004-2010 Kim Woelders
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
* of this software and associated documentation files (the "Software"), to
|
* of this software and associated documentation files (the "Software"), to
|
||||||
|
@ -48,8 +48,6 @@
|
||||||
|
|
||||||
#define TEXT_ORIENTATION 200
|
#define TEXT_ORIENTATION 200
|
||||||
#define TEXT_JUSTIFICATION 201
|
#define TEXT_JUSTIFICATION 201
|
||||||
#define TEXT_MODE 202
|
|
||||||
#define TEXT_FONTNAME 203
|
|
||||||
#define TEXT_EFFECT 204
|
#define TEXT_EFFECT 204
|
||||||
#define TEXT_FG_COL 205
|
#define TEXT_FG_COL 205
|
||||||
#define TEXT_BG_COL 206
|
#define TEXT_BG_COL 206
|
||||||
|
|
|
@ -58,14 +58,10 @@ TextstateCreate(const char *font)
|
||||||
if (!ts)
|
if (!ts)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
ts->style.mode = MODE_WRAP_CHAR;
|
|
||||||
ts->style.orientation = FONT_TO_RIGHT;
|
ts->style.orientation = FONT_TO_RIGHT;
|
||||||
|
|
||||||
if (font)
|
if (font)
|
||||||
{
|
|
||||||
ts->fontname = TextstateFontLookup(font);
|
ts->fontname = TextstateFontLookup(font);
|
||||||
ts->style.mode = MODE_VERBATIM;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ts;
|
return ts;
|
||||||
}
|
}
|
||||||
|
@ -332,9 +328,6 @@ TextclassConfigLoad(FILE * fs)
|
||||||
case TEXT_ORIENTATION:
|
case TEXT_ORIENTATION:
|
||||||
ts->style.orientation = atoi(s2);
|
ts->style.orientation = atoi(s2);
|
||||||
continue;
|
continue;
|
||||||
case TEXT_MODE:
|
|
||||||
ts->style.mode = atoi(s2);
|
|
||||||
continue;
|
|
||||||
case TEXT_EFFECT:
|
case TEXT_EFFECT:
|
||||||
ts->style.effect = atoi(s2);
|
ts->style.effect = atoi(s2);
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
|
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
|
||||||
* Copyright (C) 2004-2009 Kim Woelders
|
* Copyright (C) 2004-2010 Kim Woelders
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
* of this software and associated documentation files (the "Software"), to
|
* of this software and associated documentation files (the "Software"), to
|
||||||
|
@ -28,16 +28,11 @@
|
||||||
#include "etypes.h"
|
#include "etypes.h"
|
||||||
#include "xwin.h"
|
#include "xwin.h"
|
||||||
|
|
||||||
#define MODE_VERBATIM 0
|
|
||||||
#define MODE_WRAP_CHAR 1
|
|
||||||
#define MODE_WRAP_WORD 2
|
|
||||||
|
|
||||||
#define FONT_TO_RIGHT 0
|
#define FONT_TO_RIGHT 0
|
||||||
#define FONT_TO_DOWN 1
|
#define FONT_TO_DOWN 1
|
||||||
#define FONT_TO_UP 2
|
#define FONT_TO_UP 2
|
||||||
#define FONT_TO_LEFT 3
|
#define FONT_TO_LEFT 3
|
||||||
|
|
||||||
#define FONT_TYPE_UNKNOWN 0
|
|
||||||
#define FONT_TYPE_XFONT 0 /* XFontStruct */
|
#define FONT_TYPE_XFONT 0 /* XFontStruct */
|
||||||
#define FONT_TYPE_XFS 2 /* XFontSet */
|
#define FONT_TYPE_XFS 2 /* XFontSet */
|
||||||
#define FONT_TYPE_IFT 3 /* Imlib2/FreeType */
|
#define FONT_TYPE_IFT 3 /* Imlib2/FreeType */
|
||||||
|
|
Loading…
Reference in New Issue