Merge branch 'master' of https://github.com/redox-os/redox

README.md

@@ -40,14 +40,6 @@ The ecosystem and software Redox OS provides is listed below.
 
 | Name (lexicographic order)                                                  | Maintainer
 |-----------------------------------------------------------------------------|---------------------------
-| [Ion (shell)](https://github.com/redox-os/ion)                              | [**@skylerberg**](https://github.com/skylerberg) & [**@jackpot51**](https://github.com/jackpot51)
-| [RANSID](https://github.com/redox-os/ransid)                                | [**@jackpot51**](https://github.com/jackpot51)
-| [Sodium (editor)](https://github.com/redox-os/sodium)                       | [**@ticki**](https://github.com/ticki)
-| [Standard library](https://github.com/redox-os/libstd)                      | [**@jackpot51**](https://github.com/jackpot51)
-| [TFS (filesystem)](https://github.com/ticki/tfs)                            | [**@ticki**](https://github.com/ticki)
-| [The Redox book](https://github.com/redox-os/book)                          | [**@ticki**](https://github.com/ticki)
-| [The old kernel](https://github.com/redox-os/old)                           | abandoned
-| [ZFS](https://github.com/redox-os/zfs)                                      | abandoned, superseded by TFS
 | [acid tests](https://github.com/redox-os/acid)                              | [**@jackpot51**](https://github.com/jackpot51) (co.: [**@ticki**](https://github.com/ticki), [**@nilset](https://github.com/nilset))
 | [binutils](https://github.com/redox-os/binutils)                            | [**@ticki**](https://github.com/ticki)
 | [bots (other internal bots)](https://github.com/redox-os/bots)              | [**@ticki**](https://github.com/ticki)
@@ -55,6 +47,7 @@ The ecosystem and software Redox OS provides is listed below.
 | [coreutils](https://github.com/redox-os/coreutils)                          | [**@ticki**](https://github.com/ticki) (co.: [**@stratact**](https://github.com/stratact))
 | [extrautils](https://github.com/redox-os/extrautils)                        | [**@ticki**](https://github.com/ticki)
 | [games](https://github.com/redox-os/games)                                  | [**@ticki**](https://github.com/ticki)
+| [Ion (shell)](https://github.com/redox-os/ion)                              | [**@skylerberg**](https://github.com/skylerberg) & [**@jackpot51**](https://github.com/jackpot51)
 | [kernel](https://github.com/redox-os/kernel)                                | [**@jackpot51**](https://github.com/jackpot51)
 | [libextra](https://github.com/redox-os/libextra)                            | [**@ticki**](https://github.com/ticki)
 | [libpager](https://github.com/redox-os/libpager)                            | [**@ticki**](https://github.com/ticki)
@@ -68,9 +61,16 @@ The ecosystem and software Redox OS provides is listed below.
 | [pkgutils (current package manager)](https://github.com/redox-os/pkgutils)  | [**@jackpot51**](https://github.com/jackpot51)
 | [playbot (internal REPL bot)](https://github.com/redox-os/playbot)          | [**@ticki**](https://github.com/ticki)
 | [ralloc](https://github.com/redox-os/ralloc)                                | [**@ticki**](https://github.com/ticki)
+| [RANSID](https://github.com/redox-os/ransid)                                | [**@jackpot51**](https://github.com/jackpot51)
 | [redoxfs (old filesystem)](https://github.com/redox-os/redoxfs)             | [**@jackpot51**](https://github.com/jackpot51)
 | [syscall](https://github.com/redox-os/syscall)                              | [**@jackpot51**](https://github.com/jackpot51)
+| [Sodium (editor)](https://github.com/redox-os/sodium)                       | [**@ticki**](https://github.com/ticki)
+| [Standard library](https://github.com/redox-os/libstd)                      | [**@jackpot51**](https://github.com/jackpot51)
 | [userutils](https://github.com/redox-os/userutils)                          | [**@jackpot51**](https://github.com/jackpot51)
+| [TFS (filesystem)](https://github.com/ticki/tfs)                            | [**@ticki**](https://github.com/ticki)
+| [The Redox book](https://github.com/redox-os/book)                          | [**@ticki**](https://github.com/ticki)
+| [The old kernel](https://github.com/redox-os/old)                           | **abandoned**
+| [ZFS](https://github.com/redox-os/zfs)                                      | **abandoned, superseded by TFS**
 
 ## <a name="compile-help"> Help! Redox won't compile! </a>
 

drivers/vesad/src/display.rs

@@ -136,7 +136,7 @@ impl Display {
                 for row in 0..16 {
                     let row_data = FONT[font_i + row];
                     for col in 0..8 {
-                        if (row_data >> (8 - col)) & 1 == 1 {
+                        if (row_data >> (7 - col)) & 1 == 1 {
                             unsafe { *((dst + col * 4) as *mut u32)  = color; }
                         }
                     }

res/fonts/unifont.rs

@@ -0,0 +1,26 @@
+use std::fs::File;
+use std::io::{BufRead, BufReader, Read, Write};
+
+fn main() {
+   let mut input = File::open("unifont.hex").unwrap();
+   let mut output = File::create("unifont.font").unwrap();
+   let mut count = 0;
+   for line_res in BufReader::new(input).lines() {
+       let line = line_res.unwrap();
+
+       let mut parts = line.split(":");
+       let num = u32::from_str_radix(parts.next().unwrap(), 16).unwrap();
+       assert_eq!(num, count);
+
+       let mut data = [0; 16];
+       let data_part = parts.next().unwrap();
+       for i in 0..data.len() {
+           data[i] = u8::from_str_radix(&data_part[i * 2 .. i * 2 + 2], 16).unwrap();
+       }
+       println!("{:>04X}:{:?}", num, data);
+
+       output.write(&data).unwrap();
+
+       count += 1;
+   }
+}