changeset 629:ce8d8608d05b

[gaim-migrate @ 639] background colors. <BODY BGCOLOR=""> and <FONT BACK="">. committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Mon, 07 Aug 2000 04:37:19 +0000
parents a46a68d46d2b
children 3d2f14064083
files ChangeLog TODO src/conversation.c src/gtkhtml.c
diffstat 4 files changed, 21 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Aug 07 02:48:58 2000 +0000
+++ b/ChangeLog	Mon Aug 07 04:37:19 2000 +0000
@@ -6,9 +6,10 @@
 	* Smiley dialog
 	* Fixed 0-byte file segfault.
 	* Borderless buttons (for that cool pop-up look)
-	* Fixed resizing bugs
+	* Fixed some resizing bugs
 	* Added Ctrl+{B/I/U/S} hotkeys to conversation windows.
 	* Support for %n, %d, and %t in away messages.  Thanks bmiller!
+	* Background colors
 	
 version 0.9.20 (07/14/2000):
 	* More plugin events, more plugin features
--- a/TODO	Mon Aug 07 02:48:58 2000 +0000
+++ b/TODO	Mon Aug 07 04:37:19 2000 +0000
@@ -2,6 +2,6 @@
 	Ability to merge gaim, toc, aim2, aim4 buddylists
 	Third sound option for people without soundcards who still want
 		sound events.  Make a PC Speaker Beep (^G / Char 7)
-	Save Buddy Pounces (how did I forget this) 		
+	Save Buddy Pounces (how did I forget this)
 	Save Buddy Chats
-	Support Background Colors
\ No newline at end of file
+	Default colors in prefs
--- a/src/conversation.c	Mon Aug 07 02:48:58 2000 +0000
+++ b/src/conversation.c	Mon Aug 07 04:37:19 2000 +0000
@@ -1006,6 +1006,9 @@
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, &window->style->base[GTK_STATE_NORMAL], sad_xpm);
 	} else if (!strncmp(m, ";)", 2)) {
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, &window->style->base[GTK_STATE_NORMAL], wink_xpm);
+	} else if (!strncmp(m, ":p", 2) ||
+		   !strncmp(m, ":P", 2)) {
+		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, &window->style->base[GTK_STATE_NORMAL], tongue_xpm);
 	}
 
 	if (face || strlen(m) < 3) return face;
--- a/src/gtkhtml.c	Mon Aug 07 02:48:58 2000 +0000
+++ b/src/gtkhtml.c	Mon Aug 07 04:37:19 2000 +0000
@@ -2059,6 +2059,19 @@
 			/*end my stuff*/
 
 
+			{
+			int wid = gdk_string_width(hb->font, hb->text),
+			    hei = gdk_text_height(hb->font, "C", 1);
+			if (hb->back != NULL)
+				gdk_gc_set_foreground(gc, hb->back);
+			else
+				gdk_gc_set_foreground(gc, &widget->style->base[selected_state]);
+
+			gdk_draw_rectangle(html->html_area, gc, TRUE /* filled */, shift + hb->x,
+							hb->y - html->yoffset - hei - 2,
+							wid, hei + hei/2);
+			}
+
 			if (hb->fore != NULL)
 				gdk_gc_set_foreground(gc, hb->fore);
 			else
@@ -2631,6 +2644,7 @@
 	html->gc = gdk_gc_new(html->html_area);
 	gdk_gc_set_exposures(html->gc, TRUE);
 	gdk_gc_set_foreground(html->gc, &widget->style->text[GTK_STATE_NORMAL]);
+	gdk_gc_set_background(html->gc, &widget->style->base[GTK_STATE_NORMAL]);
 
 	gdk_window_show(html->html_area);