hurd/console-client ChangeLog vga.c

[Jeff Bailey]

CVSROOT:        /cvsroot/hurd
Module name:    hurd
Branch:         
Changes by:     Jeff Bailey <address@hidden>    03/07/28 18:40:54

Modified files:
        console-client : ChangeLog vga.c 

Log message:
        2003-07-14  Marco Gerards  <address@hidden>
        
        * vga.c: New global variable vga_display_max_glyphs.
        (parse_startup_args): New macro PARSE_FONT_OPT_NOARGS.
        (parse_startup_args): Parse --max-colors and --max-glyphs.
        (vga_display_init): Set disp->df_size to match the color setting.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd/console-client/ChangeLog.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd/console-client/vga.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: hurd/console-client/ChangeLog
diff -u hurd/console-client/ChangeLog:1.10 hurd/console-client/ChangeLog:1.11
--- hurd/console-client/ChangeLog:1.10  Mon May  5 17:39:22 2003
+++ hurd/console-client/ChangeLog       Mon Jul 28 18:40:54 2003
@@ -1,3 +1,10 @@
+2003-07-14  Marco Gerards  <address@hidden>
+
+       * vga.c: New global variable vga_display_max_glyphs.
+       (parse_startup_args): New macro PARSE_FONT_OPT_NOARGS.
+       (parse_startup_args): Parse "--max-colors" and "--max-glyphs".
+       (vga_display_init): Set disp->df_size to match the color setting.
+
 2003-02-24  Marco Gerards <address@hidden>
 
        * pc-kbd.c (sc_set1_to_set2): Map the set2 scancodes for F11 and
Index: hurd/console-client/vga.c
diff -u hurd/console-client/vga.c:1.1 hurd/console-client/vga.c:1.2
--- hurd/console-client/vga.c:1.1       Tue Sep 17 08:26:10 2002
+++ hurd/console-client/vga.c   Mon Jul 28 18:40:54 2003
@@ -1,5 +1,5 @@
 /* vga.c - The VGA device display driver.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
    Written by Marcus Brinkmann.
 
    This file is part of the GNU Hurd.
@@ -62,6 +62,9 @@
        "/lib/hurd/fonts/vga-system-bold-italic.bdf"
 static char *vga_display_font_bold_italic;
 
+/* If false use all colors, else use double font slots.  */
+static int vga_display_max_glyphs;
+
 /* The timer used for flashing the screen.  */
 static struct timer_list vga_display_timer;
 
@@ -171,12 +174,24 @@
        }                                               \
       } while (0)
 
+#define PARSE_FONT_OPT_NOARGS(x,y,z)           \
+  {                                            \
+    if (!strcmp (argv[*next], x))              \
+      {                                        \
+       (*next)++;                              \
+       vga_display_##y = z;                    \
+      }                                        \
+  }
+
   while (*next < argc)
     {
       PARSE_FONT_OPT ("--font", font);
       PARSE_FONT_OPT ("--font-italic", font_italic);
       PARSE_FONT_OPT ("--font-bold", font_bold);
       PARSE_FONT_OPT ("--font-bold-italic", font_bold_italic);
+      PARSE_FONT_OPT_NOARGS ("--max-colors", max_glyphs, 1);
+      PARSE_FONT_OPT_NOARGS ("--max-glyphs", max_glyphs, 0);
+
 
       break;
     }
@@ -206,8 +221,7 @@
   if (!disp)
     return ENOMEM;
 
-  /* Set this to 256 for full color support.  */
-  disp->df_size = 512;
+  disp->df_size = vga_display_max_glyphs ? 512 : 256;
   disp->width = VGA_DISP_WIDTH;
   disp->height = VGA_DISP_HEIGHT;