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 | |||
45 | PLY_TERMINAL_COLOR_MAGENTA, | 45 | PLY_TERMINAL_COLOR_MAGENTA, |
46 | PLY_TERMINAL_COLOR_CYAN, | 46 | PLY_TERMINAL_COLOR_CYAN, |
47 | PLY_TERMINAL_COLOR_WHITE, | 47 | PLY_TERMINAL_COLOR_WHITE, |
48 | PLY_TERMINAL_COLOR_DEFAULT = PLY_TERMINAL_COLOR_WHITE + 2 | ||
48 | } ply_terminal_color_t; | 49 | } ply_terminal_color_t; |
49 | 50 | ||
50 | typedef enum | 51 | 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 @@ | |||
82 | #define FOREGROUND_COLOR_BASE 30 | 82 | #define FOREGROUND_COLOR_BASE 30 |
83 | #endif | 83 | #endif |
84 | 84 | ||
85 | #ifndef FOREGROUND_DEFAULT_COLOR | ||
86 | #define FOREGROUND_DEFAULT_COLOR 39 | ||
87 | #endif | ||
88 | |||
89 | #ifndef BACKGROUND_COLOR_BASE | 85 | #ifndef BACKGROUND_COLOR_BASE |
90 | #define BACKGROUND_COLOR_BASE 40 | 86 | #define BACKGROUND_COLOR_BASE 40 |
91 | #endif | 87 | #endif |
92 | 88 | ||
93 | #ifndef BACKGROUND_DEFAULT_COLOR | ||
94 | #define BACKGROUND_DEFAULT_COLOR 49 | ||
95 | #endif | ||
96 | |||
97 | #ifndef TEXT_PALETTE_SIZE | 89 | #ifndef TEXT_PALETTE_SIZE |
98 | #define TEXT_PALETTE_SIZE 48 | 90 | #define TEXT_PALETTE_SIZE 48 |
99 | #endif | 91 | #endif |
@@ -195,17 +187,6 @@ ply_text_display_set_background_color (ply_text_display_t *display, | |||
195 | } | 187 | } |
196 | 188 | ||
197 | void | 189 | void |
198 | ply_text_display_reset_background_color (ply_text_display_t *display) | ||
199 | { | ||
200 | |||
201 | ply_terminal_write (display->terminal, | ||
202 | COLOR_SEQUENCE_FORMAT, | ||
203 | BACKGROUND_DEFAULT_COLOR); | ||
204 | |||
205 | display->background_color = color; | ||
206 | } | ||
207 | |||
208 | void | ||
209 | ply_text_display_set_foreground_color (ply_text_display_t *display, | 190 | ply_text_display_set_foreground_color (ply_text_display_t *display, |
210 | ply_terminal_color_t color) | 191 | ply_terminal_color_t color) |
211 | { | 192 | { |
@@ -216,16 +197,6 @@ ply_text_display_set_foreground_color (ply_text_display_t *display, | |||
216 | display->foreground_color = color; | 197 | display->foreground_color = color; |
217 | } | 198 | } |
218 | 199 | ||
219 | void | ||
220 | ply_text_display_reset_foreground_color (ply_text_display_t *display) | ||
221 | { | ||
222 | ply_terminal_write (display->terminal, | ||
223 | COLOR_SEQUENCE_FORMAT, | ||
224 | FOREGROUND_DEFAULT_COLOR); | ||
225 | |||
226 | display->foreground_color = color; | ||
227 | } | ||
228 | |||
229 | ply_terminal_color_t | 200 | ply_terminal_color_t |
230 | ply_text_display_get_background_color (ply_text_display_t *display) | 201 | ply_text_display_get_background_color (ply_text_display_t *display) |
231 | { | 202 | { |