Commit d1c00c85 authored by Adam Jackson's avatar Adam Jackson 🎧 Committed by Adam Jackson
Browse files

xfree86: Remove -flippixels



No supported driver supports 1bpp anymore, nor has in a very long time.
This option only worked with vgahw anyway.

Signed-off-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
parent 2bd63181
Pipeline #4948 passed with stage
in 3 minutes and 19 seconds
......@@ -79,14 +79,6 @@ extern _X_EXPORT Bool xf86DRI2Enabled(void);
#define XF86SCRNINFO(p) xf86ScreenToScrn(p)
#define XF86FLIP_PIXELS() \
do { \
if (xf86GetFlipPixels()) { \
pScreen->whitePixel = (pScreen->whitePixel) ? 0 : 1; \
pScreen->blackPixel = (pScreen->blackPixel) ? 0 : 1; \
} \
while (0)
#define BOOLTOSTRING(b) ((b) ? "TRUE" : "FALSE")
/* Compatibility functions for pre-input-thread drivers */
......@@ -286,8 +278,6 @@ xf86GetWeight(void);
extern _X_EXPORT Gamma
xf86GetGamma(void);
extern _X_EXPORT Bool
xf86GetFlipPixels(void);
extern _X_EXPORT Bool
xf86ServerIsExiting(void);
extern _X_EXPORT Bool
xf86ServerIsResetting(void);
......
......@@ -187,7 +187,6 @@ int xf86FbBpp = -1;
int xf86Depth = -1;
rgb xf86Weight = { 0, 0, 0 };
Bool xf86FlipPixels = FALSE;
Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
Bool xf86AllowMouseOpenFail = FALSE;
......
......@@ -950,14 +950,8 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
void
xf86SetBlackWhitePixels(ScreenPtr pScreen)
{
if (xf86FlipPixels) {
pScreen->whitePixel = 0;
pScreen->blackPixel = 1;
}
else {
pScreen->whitePixel = 1;
pScreen->blackPixel = 0;
}
pScreen->whitePixel = 1;
pScreen->blackPixel = 0;
}
/*
......@@ -1398,12 +1392,6 @@ xf86GetGamma(void)
return xf86Gamma;
}
Bool
xf86GetFlipPixels(void)
{
return xf86FlipPixels;
}
Bool
xf86ServerIsExiting(void)
{
......
......@@ -978,10 +978,6 @@ ddxProcessArgument(int argc, char **argv, int i)
xf86ConfigDir = argv[i + 1];
return 2;
}
if (!strcmp(argv[i], "-flipPixels")) {
xf86FlipPixels = TRUE;
return 1;
}
#ifdef XF86VIDMODE
if (!strcmp(argv[i], "-disableVidMode")) {
xf86VidModeDisabled = TRUE;
......@@ -1257,7 +1253,6 @@ ddxUseMsg(void)
ErrorF
("-pointer name specify the core pointer InputDevice name\n");
ErrorF("-nosilk disable Silken Mouse\n");
ErrorF("-flipPixels swap default black/white Pixel values\n");
#ifdef XF86VIDMODE
ErrorF("-disableVidMode disable mode adjustments with xvidtune\n");
ErrorF
......
......@@ -68,7 +68,6 @@ extern _X_EXPORT char *xf86KeyboardName;
extern _X_EXPORT int xf86FbBpp;
extern _X_EXPORT int xf86Depth;
extern _X_EXPORT rgb xf86Weight;
extern _X_EXPORT Bool xf86FlipPixels;
extern _X_EXPORT Gamma xf86Gamma;
/* Other parameters */
......
......@@ -640,7 +640,6 @@ typedef struct _ScrnInfoRec {
int videoRam; /* amount of video ram (kb) */
unsigned long memPhysBase; /* Physical address of FB */
unsigned long fbOffset; /* Offset of FB in the above */
Bool flipPixels; /* swap default black/white */
void *options;
/* Allow screens to be enabled/disabled individually */
......
......@@ -1833,7 +1833,6 @@ Some of them are:
xf86Depth -depth from the command line
xf86Weight -weight from the command line
xf86Gamma -{r,g,b,}gamma from the command line
xf86FlipPixels -flippixels from the command line
xf86ProbeOnly -probeonly from the command line
defaultColorVisualClass -cc from the command line
</literallayout>
......@@ -1894,17 +1893,6 @@ functions:
</para></blockquote>
<blockquote><para>
<programlisting>
Bool xf86GetFlipPixels();
</programlisting>
<blockquote><para>
Returns <constant>TRUE</constant> if <option>-flippixels</option> is
present on the command line, and <constant>FALSE</constant> otherwise.
</para></blockquote>
</para></blockquote>
</sect2>
<sect2>
......@@ -6014,19 +6002,6 @@ strongly encouraged to improve the consistency of driver behaviour.
</blockquote></para></blockquote>
<blockquote><para>
<programlisting>
void xf86SetBlackWhitePixels(ScrnInfoPtr pScrn);
</programlisting>
<blockquote><para>
This functions sets the <structfield>blackPixel</structfield> and
<structfield>whitePixel</structfield> fields of the <structname>ScrnInfoRec</structname>
according to whether or not the <option>-flipPixels</option> command
line options is present.
</para>
</blockquote></para></blockquote>
<blockquote><para>
<programlisting>
const char *xf86GetVisualName(int visual);
......
......@@ -171,9 +171,6 @@ bpp framebuffer rather than the (possibly default) 32 bpp framebuffer
(or vice versa). Legal values are 1, 8, 16, 24, 32. Not all drivers
support all values.
.TP 8
.B \-flipPixels
Swap the default values for the black and white pixels.
.TP 8
.BI \-gamma " value"
Set the gamma correction.
.I value
......
......@@ -1314,10 +1314,8 @@ vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode)
if (depth == 1) {
/* Initialise the Mono map according to which bit-plane gets used */
Bool flipPixels = xf86GetFlipPixels();
for (i = 0; i < 16; i++)
if (((i & (1 << BIT_PLANE)) != 0) != flipPixels)
if ((i & (1 << BIT_PLANE)) != 0)
regp->Attribute[i] = WHITE_VALUE;
else
regp->Attribute[i] = BLACK_VALUE;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment