diff options
author | ache <ache@FreeBSD.org> | 1995-11-30 03:29:31 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 1995-11-30 03:29:31 +0000 |
commit | a07d8148d32dda7df207c76375ce723933ae20c8 (patch) | |
tree | ec50883708b2418c979835e16f7300d4b050cb74 | |
parent | 00d235c0ea6b0a8052bf02d093ccf03633da529e (diff) | |
download | FreeBSD-src-a07d8148d32dda7df207c76375ce723933ae20c8.zip FreeBSD-src-a07d8148d32dda7df207c76375ce723933ae20c8.tar.gz |
Fix my color/attr separation patch.
Swap foreground/background logic to allow DIM REVERSE
-rw-r--r-- | sys/dev/syscons/syscons.c | 6 | ||||
-rw-r--r-- | sys/i386/isa/syscons.c | 6 | ||||
-rw-r--r-- | sys/isa/syscons.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 5a40045..f8b2d8c 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.130 1995/11/24 14:56:00 bde Exp $ + * $Id: syscons.c,v 1.131 1995/11/28 00:17:30 ache Exp $ */ #include "sc.h" @@ -169,10 +169,10 @@ mask2attr(struct term_stat *term) int attr, mask = term->attr_mask; if (mask & REVERSE_ATTR) { - attr = ((mask & BACKGROUND_CHANGED) ? + attr = ((mask & FOREGROUND_CHANGED) ? ((term->cur_color & 0xF000) >> 4) : (term->rev_color & 0x0F00)) | - ((mask & FOREGROUND_CHANGED) ? + ((mask & BACKGROUND_CHANGED) ? ((term->cur_color & 0x0F00) << 4) : (term->rev_color & 0xF000)); } else diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index 5a40045..f8b2d8c 100644 --- a/sys/i386/isa/syscons.c +++ b/sys/i386/isa/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.130 1995/11/24 14:56:00 bde Exp $ + * $Id: syscons.c,v 1.131 1995/11/28 00:17:30 ache Exp $ */ #include "sc.h" @@ -169,10 +169,10 @@ mask2attr(struct term_stat *term) int attr, mask = term->attr_mask; if (mask & REVERSE_ATTR) { - attr = ((mask & BACKGROUND_CHANGED) ? + attr = ((mask & FOREGROUND_CHANGED) ? ((term->cur_color & 0xF000) >> 4) : (term->rev_color & 0x0F00)) | - ((mask & FOREGROUND_CHANGED) ? + ((mask & BACKGROUND_CHANGED) ? ((term->cur_color & 0x0F00) << 4) : (term->rev_color & 0xF000)); } else diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c index 5a40045..f8b2d8c 100644 --- a/sys/isa/syscons.c +++ b/sys/isa/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.130 1995/11/24 14:56:00 bde Exp $ + * $Id: syscons.c,v 1.131 1995/11/28 00:17:30 ache Exp $ */ #include "sc.h" @@ -169,10 +169,10 @@ mask2attr(struct term_stat *term) int attr, mask = term->attr_mask; if (mask & REVERSE_ATTR) { - attr = ((mask & BACKGROUND_CHANGED) ? + attr = ((mask & FOREGROUND_CHANGED) ? ((term->cur_color & 0xF000) >> 4) : (term->rev_color & 0x0F00)) | - ((mask & FOREGROUND_CHANGED) ? + ((mask & BACKGROUND_CHANGED) ? ((term->cur_color & 0x0F00) << 4) : (term->rev_color & 0xF000)); } else |