From 9293fa026e97830fbb02c91606d076913b1a9db6 Mon Sep 17 00:00:00 2001
From: milkbone57 <milkbone57>
Date: Sun, 7 Sep 2003 03:41:14 +0000
Subject: [PATCH] ""

---
 Milkbone.pm                        |  4 +---
 docs/VERSION.txt                   | 11 ++++++++++-
 docs/WISHBONE.txt                  |  4 +++-
 mos.pl                             | 16 ++++++++--------
 plugins/Tk-BList/Milkbone/BList.pm |  6 +++---
 plugins/Tk-GUI/Tk-GUI.pl           | 14 +++-----------
 plugins/Tk-GUI/Tk/Browser.pm       | 13 +++++++++++--
 7 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/Milkbone.pm b/Milkbone.pm
index dce202f..fedd3b5 100644
--- a/Milkbone.pm
+++ b/Milkbone.pm
@@ -18,9 +18,7 @@ use Milkbone::HookEntry;
 use Milkbone::AllHooks;
 use Benchmark;
 
-our $VERSION = "0.355";
-
-
+our $VERSION = "0.361";
 
 require Exporter;
 
diff --git a/docs/VERSION.txt b/docs/VERSION.txt
index b234d1d..ec9b54b 100644
--- a/docs/VERSION.txt
+++ b/docs/VERSION.txt
@@ -1,4 +1,13 @@
-0.356
+0.361 9-6-2003
+--
+
+* Annoying error message gone in Win32
+* Buddy list lengthened
+* Buddy menu weirdness on Win32 fixed
+* Unrecognized fonts don't look as bad as they did in Linux
+* New fonts in Windows and Linux
+
+0.36 9-2-2003
 --
 
 * Timestamps work again
diff --git a/docs/WISHBONE.txt b/docs/WISHBONE.txt
index c96d28b..edf0ce9 100644
--- a/docs/WISHBONE.txt
+++ b/docs/WISHBONE.txt
@@ -28,4 +28,6 @@ chat rooms
 logon saver
 add buddy groups
 documentation
-file transfer
\ No newline at end of file
+file transfer
+aliases
+aliases for %n
\ No newline at end of file
diff --git a/mos.pl b/mos.pl
index 345f7eb..15f5827 100755
--- a/mos.pl
+++ b/mos.pl
@@ -27,20 +27,20 @@ $| = 1;
 
 sub main
 {
-	Milkbone->init();
+    Milkbone->init();
 
-	hook("load_options");
+    hook("load_options");
 
-	require "plugins/Tk-Splash.pl" unless option("NoSplash");
+    require "plugins/Tk-Splash.pl" unless option("NoSplash");
 
-	hook("load_plugins");
-	hook("pre_mainloop");
+    hook("load_plugins");
+    hook("pre_mainloop");
 
-	hook("create_logon_prompt");
+    hook("create_logon_prompt");
 
-	MOSLoop;
+    MOSLoop;
 
-	hook("post_mainloop");
+    hook("post_mainloop");
 }
 
 # off it goes...
diff --git a/plugins/Tk-BList/Milkbone/BList.pm b/plugins/Tk-BList/Milkbone/BList.pm
index 11b1bba..963f190 100644
--- a/plugins/Tk-BList/Milkbone/BList.pm
+++ b/plugins/Tk-BList/Milkbone/BList.pm
@@ -174,7 +174,7 @@ sub on_rclick
 	return if @temp == 1;
 	$self->select_buddy($self->{tree}->nearest($y));
 	
-	my $offset = ($^O =~ /Win32/) ? 20 : -30;
+	my $offset = ($^O =~ /Win32/) ? 10 : -30;
 
 	$self->{buddy_menu}->Post($self->x + $x, $self->y + $self->height - $self->{tree}->height + $y + $offset);
 }
@@ -247,7 +247,7 @@ sub init
 	# position the list along the right-hand side of the screen
 	$x = $self->screenwidth - $self->width() - 168;
 	$y = 22;
-	$self->geometry("160x450+$x+$y");
+	$self->geometry("160x650+$x+$y");
 
 	$self->{menu} = $self->Menu(-borderwidth => 0, -activeborderwidth => 0);
 
@@ -279,7 +279,7 @@ sub init
 
 	$self->{tree} = $self->Scrolled("MBTree" =>
 		-scrollbars => 'oe',
-		-background => 'white', -font => hook("tk_get_default_font") .  ' 10', -fg => 'black', -selectborderwidth => 0,
+		-background => 'white', -font => hook("tk_get_default_font") .  ' 10 medium', -fg => 'black', -selectborderwidth => 0,
 		-itemtype => 'imagetext', -highlightthickness => 0, -drawbranch => 0, -indicator => 1,
 		-selectbackground => "darkblue", -selectforeground => "white", -ignoreinvoke => 1,
 		-selectmode => 'single', -itemtype => 'imagetext', -indent => 14,
diff --git a/plugins/Tk-GUI/Tk-GUI.pl b/plugins/Tk-GUI/Tk-GUI.pl
index 3e219e8..d41eb5d 100644
--- a/plugins/Tk-GUI/Tk-GUI.pl
+++ b/plugins/Tk-GUI/Tk-GUI.pl
@@ -25,13 +25,11 @@ if(win32())
 }
 else
 {
-    $defaultFont = 'arial';
+    $defaultFont = 'helvetica';
 }
 
-my %fonts;
-map { $fonts{$_} = 1 } $mw->fontFamilies;
-
-$mw->optionAdd("*font", "-*-$defaultFont-norma-r-*-*-*-120-*-*-*-*-*-*");
+$mw->optionAdd("*font", "-*-$defaultFont-norma-r-*-*-*-120-*-*-*-*-*-*") if win32();
+$mw->optionAdd("*font", "-*-helvetica-norma-r-*-*-*-100-*-*-*-*-*-*") if nix();
 $mw->optionAdd("*borderWidth", 1);
 $mw->optionAdd("*highlightThickness", 0);
 
@@ -46,12 +44,6 @@ register_hook("tick", \&tick);
 register_hook("tk_getmain", sub {
     return $mw;
 });
-register_hook("tk_getfont". sub {
-    print "getfont called with" . $ARGS{-font};
-    return $ARGS{-font} if exists($fonts{$ARGS{-font}});
-    print "font doesn't exist - here's the default";
-    return $defaultFont;
-});
 
 register_hook("tk_bindwheel", sub {
     if($^O =~ /win32/i)
diff --git a/plugins/Tk-GUI/Tk/Browser.pm b/plugins/Tk-GUI/Tk/Browser.pm
index ca5bfa0..4f0b695 100644
--- a/plugins/Tk-GUI/Tk/Browser.pm
+++ b/plugins/Tk-GUI/Tk/Browser.pm
@@ -12,6 +12,9 @@ use warnings;
 
 Construct Tk::Widget 'Browser';
 
+my %fonts;
+$fonts{$_} = 1 for hook("tk_getmain")->fontFamilies;
+
 sub insertHTML
 {
 	my ($self, $pos, $html) = @_;
@@ -181,9 +184,15 @@ sub font_begin
 
 	$realsize = int((8, 10, 12, 14, 18, 24, 38) [int($size) + 1]) if $size and $^O !~ /Win32/;
 
-	$font->{-family} = "{" . hook("tk_getfont", -font => $family) . "}"
-          if $family;
 	$font->{-size} = $realsize if $size;
+	if($family) {
+	  if(exists $fonts{$family}) {
+	    $font->{-family} = $family;
+	  }
+	  else {
+	    $font->{-family} = "charter";
+	  }
+	}
 
 	my %opts;
 	$opts{-foreground} = $color if $color;