[PATCH] xfree86: Remove ISC references from the man page.

[Jesse Adkins]

On Fri, Dec 10, 2010 at 8:38 PM, Jesse Adkins <jesserayadkins at gmail.com> wrote:
> ISC support was pulled a few years ago from libtrans.
>
> Signed-off-by: Jesse Adkins <jesserayadkins at gmail.com>
> ---
>  hw/xfree86/doc/man/Xorg.man.pre |    7 +++----
>  hw/xfree86/modes/xf86Modes.c    |   33 ++++++++++++++++++++++++++-------
>  2 files changed, 29 insertions(+), 11 deletions(-)
>
> diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
> index 86e89a9..74de4fb 100644
> --- a/hw/xfree86/doc/man/Xorg.man.pre
> +++ b/hw/xfree86/doc/man/Xorg.man.pre
> @@ -80,20 +80,19 @@ more of the following:
>  NAMED
>  PTS
>  SCO
> -ISC
>  .fi
>  .RE
>  .PP
>  which represent SVR4 Named Streams pipe, Old-style USL Streams pipe,
> -SCO XSight Streams pipe, and ISC Streams pipe, respectively.  You can
> -select a single mechanism (e.g.
> +and SCO XSight Streams pipe, respectively.  You can select a single
> +mechanism (e.g.
>  .IR XLOCAL=NAMED ),
>  or an ordered list (e.g. \fIXLOCAL="NAMED:PTS:SCO"\fP).
>  his variable overrides the compiled-in defaults.  For SVR4 it is
>  recommended that
>  .I NAMED
>  be the first preference connection.  The default setting is
> -.IR PTS:NAMED:ISC:SCO .
> +.IR PTS:NAMED:SCO .
>  .PP
>  To globally override the compiled-in defaults, you should define (and
>  export if using
> diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c
> index 51eb4c9..eff13f1 100644
> --- a/hw/xfree86/modes/xf86Modes.c
> +++ b/hw/xfree86/modes/xf86Modes.c
> @@ -283,10 +283,29 @@ add(char **p, char *new)
>  * Print out a modeline.
>  */
>  void
> -xf86PrintModeline(int scrnIndex,DisplayModePtr mode)
> +xf86PrintModeline(int scrnIndex, DisplayModePtr mode)
>  {
>     char tmp[256];
>     char *flags = xnfcalloc(1, 1);
> +#define TBITS 6
> +    const char tchar[TBITS+1] = "UezdPb";
> +    int tbit[TBITS] = {
> +       M_T_USERPREF, M_T_DRIVER, M_T_USERDEF,
> +       M_T_DEFAULT, M_T_PREFERRED, M_T_BUILTIN
> +    };
> +    char type[TBITS+2];   /* +1 for leading space */
> +#undef TBITS
> +    int tlen = 0;
> +
> +    if (mode->type) {
> +       int i;
> +
> +       type[tlen++] = ' ';
> +       for (i = 0; tchar[i]; i++)
> +           if (mode->type & tbit[i])
> +               type[tlen++] = tchar[i];
> +    }
> +    type[tlen] = '\0';
>
>     if (mode->HSkew) {
>        snprintf(tmp, 256, "hskew %i", mode->HSkew);
> @@ -310,12 +329,12 @@ xf86PrintModeline(int scrnIndex,DisplayModePtr mode)
>     if (mode->Flags & V_CLKDIV2) add(&flags, "vclk/2");
>  #endif
>     xf86DrvMsg(scrnIndex, X_INFO,
> -                  "Modeline \"%s\"x%.01f  %6.2f  %i %i %i %i  %i %i %i %i%s "
> -                  "(%.01f kHz)\n",
> -                  mode->name, mode->VRefresh, mode->Clock/1000., mode->HDisplay,
> -                  mode->HSyncStart, mode->HSyncEnd, mode->HTotal,
> -                  mode->VDisplay, mode->VSyncStart, mode->VSyncEnd,
> -                  mode->VTotal, flags, xf86ModeHSync(mode));
> +              "Modeline \"%s\"x%.01f  %6.2f  %i %i %i %i  %i %i %i %i%s"
> +              " (%.01f kHz%s)\n",
> +              mode->name, mode->VRefresh, mode->Clock/1000.,
> +              mode->HDisplay, mode->HSyncStart, mode->HSyncEnd, mode->HTotal,
> +              mode->VDisplay, mode->VSyncStart, mode->VSyncEnd, mode->VTotal,
> +              flags, xf86ModeHSync(mode), type);
>     free(flags);
>  }
>
> --
> 1.7.1
>
>

This is your brain on tab completion. Apologies for the wrong CC and
for this junk patch.