hurd/console-client ChangeLog vga-dynafont.c vg...

[Marcus Brinkmann]

CVSROOT:        /cvsroot/hurd
Module name:    hurd
Changes by:     Marcus Brinkmann <address@hidden>       02/09/30 13:13:14

Modified files:
        console-client : ChangeLog vga-dynafont.c vga-support.c 
                         vga-support.h 

Log message:
        2002-09-30  Marcus Brinkmann  <address@hidden>
        
        * vga-support.c (vga_get_font_width): New function.
        * vga-support.h: Add prototype for vga_get_font_width.
        * vga-dynafont.c (create_system_font): Call vga_get_font_width to
        determine real font width.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd/console-client/ChangeLog.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd/console-client/vga-dynafont.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd/console-client/vga-support.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd/console-client/vga-support.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: hurd/console-client/ChangeLog
diff -u hurd/console-client/ChangeLog:1.5 hurd/console-client/ChangeLog:1.6
--- hurd/console-client/ChangeLog:1.5   Sat Sep 21 22:13:55 2002
+++ hurd/console-client/ChangeLog       Mon Sep 30 13:13:14 2002
@@ -1,3 +1,10 @@
+2002-09-30  Marcus Brinkmann  <address@hidden>
+
+       * vga-support.c (vga_get_font_width): New function.
+       * vga-support.h: Add prototype for vga_get_font_width.
+       * vga-dynafont.c (create_system_font): Call vga_get_font_width to
+       determine real font width.
+
 2002-09-22  Marcus Brinkmann  <address@hidden>
 
        * pc-kbd.c (sc_to_kc): Implement Meta-Backspace combinations.
Index: hurd/console-client/vga-dynafont.c
diff -u hurd/console-client/vga-dynafont.c:1.1 
hurd/console-client/vga-dynafont.c:1.2
--- hurd/console-client/vga-dynafont.c:1.1      Tue Sep 17 08:26:10 2002
+++ hurd/console-client/vga-dynafont.c  Mon Sep 30 13:13:14 2002
@@ -309,7 +309,7 @@
   bdf_error_t bdferr;
   bdf_font_t font;
   unsigned char bitmap[VGA_FONT_SIZE][VGA_FONT_HEIGHT];        /* 8kB on 
stack.  */
-  int width = 9;       /* XXX Find out if we are in 8 or 9 pixel mode.  */
+  int width = vga_get_font_width ();
   int i;
 
   /* Add the glyph at position POS to the font for character
Index: hurd/console-client/vga-support.c
diff -u hurd/console-client/vga-support.c:1.2 
hurd/console-client/vga-support.c:1.3
--- hurd/console-client/vga-support.c:1.2       Wed Sep 18 16:48:36 2002
+++ hurd/console-client/vga-support.c   Mon Sep 30 13:13:14 2002
@@ -322,6 +322,14 @@
 }
 
 
+/* Get the font height in pixel.  Can be 8 or 9.  */
+int
+vga_get_font_width (void)
+{
+  outb (VGA_SEQ_CLOCK_MODE_ADDR, VGA_SEQ_ADDR_REG);
+  return (inb (VGA_SEQ_DATA_REG) & VGA_SEQ_CLOCK_MODE_8) ? 8 : 9;
+}
+
 /* Set the font height in pixel.  WIDTH can be 8 or 9.  */
 void
 vga_set_font_width (int width)
Index: hurd/console-client/vga-support.h
diff -u hurd/console-client/vga-support.h:1.1 
hurd/console-client/vga-support.h:1.2
--- hurd/console-client/vga-support.h:1.1       Tue Sep 17 08:26:10 2002
+++ hurd/console-client/vga-support.h   Mon Sep 30 13:13:14 2002
@@ -57,6 +57,9 @@
 /* Set the font height in pixel.  */
 void vga_set_font_height (int height);
 
+/* Get the font height in pixel.  Can be 8 or 9.  */
+int vga_get_font_width (void);
+
 /* Set the font height in pixel.  WIDTH can be 8 or 9.  */
 void vga_set_font_width (int width);