# HG changeset patch
# User devi
# Date 1140726398 -7200
# Node ID d9a700d48bef0f18ced40302ba33ba92f5cd112b
# Parent  d28dda8ea18faa7b2d0f9e400b0af223f1a003a4
Рисунки сделанные с помощью l3-shot отображаются в журнале.
Всплывающая подсказка с информацией о команде
появляется при подведении курсора мыши к первому знаку приглашения

diff -r d28dda8ea18f -r d9a700d48bef TODO
--- a/TODO	Mon Feb 20 17:52:40 2006 +0200
+++ b/TODO	Thu Feb 23 22:26:38 2006 +0200
@@ -1,3 +1,11 @@
+
+FIX:
+
+
+    Теряется информация о tty
+
+
+
 TODO LIST
 
 lm-report:
diff -r d28dda8ea18f -r d9a700d48bef l3-agent
--- a/l3-agent	Mon Feb 20 17:52:40 2006 +0200
+++ b/l3-agent	Thu Feb 23 22:26:38 2006 +0200
@@ -228,9 +228,10 @@
     my $cline_re2_v2 = qr/$cline_re_v2_base$/sx;
 
     my $vt = Term::VT102->new ( 'cols' => $Config{"terminal_width"}, 
-                    'rows' => $Config{"terminal_height"});
-    my $cline_vt = Term::VT102->new ('cols' => $Config{"terminal_width"}, 
-                    'rows' => $Config{"terminal_height"});
+                                'rows' => $Config{"terminal_height"});
+    my $cline_vt = Term::VT102->new (
+                                'cols' => $Config{"terminal_width"}, 
+                                'rows' => $Config{"terminal_height"});
 
     my $converter = Text::Iconv->new($Config{"encoding"}, "utf-8")
         if ($Config{"encoding"} && $Config{"encoding"} !~ /^utf-8$/i);
@@ -484,7 +485,7 @@
 
 
                 if ($Config{verbose} =~ /y/i) {
-                    print "|   " if $commandlines_loaded % 15 == 1;
+                    print "\n|   " if $commandlines_loaded % 15 == 1;
                     print " ",$cl{"last_command"};
                 }
 
@@ -578,11 +579,12 @@
     }
 
     @Command_Lines_Index = sort {
-        $Command_Lines[$index[$a]]->{"time"} <=> $Command_Lines[$index[$b]]->{"time"} ||
-        $Command_Lines[$index[$a]]->{"day"} cmp $Command_Lines[$index[$b]]->{"day"} ||
-        $Command_Lines[$index[$a]]->{"hour"} <=> $Command_Lines[$index[$b]]->{"hour"} ||
-        $Command_Lines[$index[$a]]->{"min"} <=> $Command_Lines[$index[$b]]->{"min"} ||
-        $Command_Lines[$index[$a]]->{"sec"} <=> $Command_Lines[$index[$b]]->{"sec"}
+        defined($Command_Lines[$index[$a]]->{"time"}) 
+        ?  $Command_Lines[$index[$a]]->{"time"} <=> $Command_Lines[$index[$b]]->{"time"} 
+        :  $Command_Lines[$index[$a]]->{"day"} cmp $Command_Lines[$index[$b]]->{"day"} 
+        || $Command_Lines[$index[$a]]->{"hour"} <=> $Command_Lines[$index[$b]]->{"hour"}
+        || $Command_Lines[$index[$a]]->{"min"} <=> $Command_Lines[$index[$b]]->{"min"} 
+        || $Command_Lines[$index[$a]]->{"sec"} <=> $Command_Lines[$index[$b]]->{"sec"}
     } @index;
 
     print "finished\n" if $Config{"verbose"} =~ /y/;
diff -r d28dda8ea18f -r d9a700d48bef l3-frontend
--- a/l3-frontend	Mon Feb 20 17:52:40 2006 +0200
+++ b/l3-frontend	Thu Feb 23 22:26:38 2006 +0200
@@ -231,7 +231,7 @@
     my $datafile = $_[0];
 
     open (CLASS, $datafile)
-        or die "Can't open file of the class ",$datafile,"\n";
+        or die "Can't open file with xml lablog ",$datafile,"\n";
     local $/;
     $data = <CLASS>;
     close(CLASS);
@@ -250,7 +250,7 @@
     my $datafile = $_[0];
 
     open (CLASS, $datafile)
-        or die "Can't open file of the class ",$datafile,"\n";
+        or die "Can't open file with xml lablog ",$datafile,"\n";
     local $/;
     my $data = <CLASS>;
     close(CLASS);
@@ -323,6 +323,12 @@
 #  Если несколько пометок (notes) идут подряд, 
 #  они все объединяются
 
+        if ($$cl->{cline} =~ /l3shot/) {
+                if ($$cl->{output} =~ m@Screenshot is written to.*/(.*)\.xwd@) {
+                    $$cl->{screenshot}="$1";
+                }
+        }
+
         if ($$cl->{cline}=~ m@cat[^#]*#([\^=v])\s*(.*)@) {
 
             my $note_operator = $1;
@@ -598,7 +604,7 @@
         }
         elsif ($seconds_since_last_command > 7200) {
             my $hours_passed =  int($seconds_since_last_command/3600);
-            my $passed_word  = $minutes_passed % 10 == 1 ? "прошла"
+            my $passed_word  = $hours_passed % 10 == 1 ? "прошла"
                                                          : "прошло";
             my $hours_word   = $hours_passed % 10 == 1 ?   "часа":
                                                            "часов";
@@ -639,7 +645,7 @@
                         
 
 # CONSOLE CHANGE
-        if ( $last_tty ne $cl->{"tty"} && 0) {
+        if ($cl->{"tty"} && $last_tty ne $cl->{"tty"} && 0) {
             my $tty = $cl->{"tty"};
             $this_day_result .= "<div class='ttychange'>"
                                 . $tty
@@ -682,7 +688,8 @@
         my $hint = make_comment($cl->{"cline"});
 
         my $cline;
-        $cline = $cl->{"prompt"}.$cl->{"cline"};
+        $prompt_hint = join ("&#10;", map("$_=$cl->{$_}", grep (!/^output$/, sort(keys(%{$cl})))));
+        $cline = "<span title='$prompt_hint'>".$cl->{"prompt"}."</prompt>".$cl->{"cline"};
         $cline =~ s/\n//;
 
         $cline = "<span title='$hint' class='with_hint'>$cline</span>" if $hint;
@@ -708,6 +715,14 @@
 # DIFF
         $this_day_result .= "<pre class='diff'>".$cl->{"diff"}."</pre>"
             if ( $Config{"show_diffs"} =~ /^y/i && $cl->{"diff"});
+# SHOT
+        $this_day_result .= "<img src='"
+                .$Config{l3shot_path}
+                .$cl->{"screenshot"}
+                .$Config{l3shot_suffix}
+                ."' alt ='screenshot id ".$cl->{"screenshot"}
+                ."'/>"
+            if ( $Config{"show_screenshots"} =~ /^y/i && $cl->{"screenshot"});
 
 #NOTES
         if ( $Config{"show_notes"} =~ /^y/i && $cl->{"note"}) {
diff -r d28dda8ea18f -r d9a700d48bef l3config.pm
--- a/l3config.pm	Mon Feb 20 17:52:40 2006 +0200
+++ b/l3config.pm	Thu Feb 23 22:26:38 2006 +0200
@@ -29,16 +29,17 @@
     "suppress_terminal" => "yes",
 
     "terminal_width"    => 400,
-    "terminal_height"   => 100,
+    "terminal_height"   => 300,
     "verbose"           => "yes",
 
     "head_lines"        => 5,
     "tail_lines"        => 5,
-    "cache_head_lines"  => 50,
-    "cache_tail_lines"  => 50,
+    "cache_head_lines"  => 150,
+    "cache_tail_lines"  => 150,
     "skip_text"         => "...",
     "show_time"         => "yes",
     "show_diffs"        => "yes",
+    "show_screenshots"  => "yes",
     "show_comments"     => "yes",
     "show_notes"        => "yes",
 
@@ -54,6 +55,8 @@
     "output_mask"       => "INDEX",
     "output_format"     => "html",
     "frontend_css"      => "/l3/l3.css",
+    "l3shot_path"       => "/l3shot/",
+    "l3shot_suffix"       => ".png",
     "frontend_google_ico"   => "/l3/google.ico",
     "frontend_linux_ico"    => "/l3/linux.ico",
     "frontend_freebsd_ico"  => "/l3/freebsd.ico",