diff options
| author | Alban Browaeys <prahal@yahoo.com> | 2012-08-13 09:52:17 +0200 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2012-08-13 10:08:48 -0400 |
| commit | afed1301a0593050c879a9535f1893ae2031db05 (patch) | |
| tree | 84d1f4cb5e65dee9746042c0c67452300ce55169 | |
| parent | 468c53a128e69809c727c9c69e166297ed66d3b5 (diff) | |
revert spurious broken changes in master commit 468c53a
https://bugs.freedesktop.org/show_bug.cgi?id=53440
| -rw-r--r-- | src/libply-splash-core/ply-terminal.h | 1 | ||||
| -rw-r--r-- | src/libply-splash-core/ply-text-display.c | 29 |
2 files changed, 1 insertions, 29 deletions
diff --git a/src/libply-splash-core/ply-terminal.h b/src/libply-splash-core/ply-terminal.h index 41b75153..8b4b0177 100644 --- a/src/libply-splash-core/ply-terminal.h +++ b/src/libply-splash-core/ply-terminal.h @@ -45,6 +45,7 @@ typedef enum PLY_TERMINAL_COLOR_MAGENTA, PLY_TERMINAL_COLOR_CYAN, PLY_TERMINAL_COLOR_WHITE, + PLY_TERMINAL_COLOR_DEFAULT = PLY_TERMINAL_COLOR_WHITE + 2 } ply_terminal_color_t; typedef enum diff --git a/src/libply-splash-core/ply-text-display.c b/src/libply-splash-core/ply-text-display.c index 0d84e5be..7cabd98f 100644 --- a/src/libply-splash-core/ply-text-display.c +++ b/src/libply-splash-core/ply-text-display.c @@ -82,18 +82,10 @@ #define FOREGROUND_COLOR_BASE 30 #endif -#ifndef FOREGROUND_DEFAULT_COLOR -#define FOREGROUND_DEFAULT_COLOR 39 -#endif - #ifndef BACKGROUND_COLOR_BASE #define BACKGROUND_COLOR_BASE 40 #endif -#ifndef BACKGROUND_DEFAULT_COLOR -#define BACKGROUND_DEFAULT_COLOR 49 -#endif - #ifndef TEXT_PALETTE_SIZE #define TEXT_PALETTE_SIZE 48 #endif @@ -195,17 +187,6 @@ ply_text_display_set_background_color (ply_text_display_t *display, } void -ply_text_display_reset_background_color (ply_text_display_t *display) -{ - - ply_terminal_write (display->terminal, - COLOR_SEQUENCE_FORMAT, - BACKGROUND_DEFAULT_COLOR); - - display->background_color = color; -} - -void ply_text_display_set_foreground_color (ply_text_display_t *display, ply_terminal_color_t color) { @@ -216,16 +197,6 @@ ply_text_display_set_foreground_color (ply_text_display_t *display, display->foreground_color = color; } -void -ply_text_display_reset_foreground_color (ply_text_display_t *display) -{ - ply_terminal_write (display->terminal, - COLOR_SEQUENCE_FORMAT, - FOREGROUND_DEFAULT_COLOR); - - display->foreground_color = color; -} - ply_terminal_color_t ply_text_display_get_background_color (ply_text_display_t *display) { |