|
|
@@ -3,11 +3,11 @@ Index: CHANGES.RSE
|
|
|
RCS file: CHANGES.RSE
|
|
|
diff -N CHANGES.RSE
|
|
|
--- /dev/null 1 Jan 1970 00:00:00 -0000
|
|
|
-+++ CHANGES.RSE 28 Mar 2003 08:24:58 -0000 1.5
|
|
|
++++ CHANGES.RSE 29 Mar 2003 10:43:45 -0000 1.6
|
|
|
@@ -0,0 +1,19 @@
|
|
|
+
|
|
|
+ The following changes were made by Ralf S. Engelschall <rse@engelschall.com>
|
|
|
-+ to the excellent Curses::UI 0.72 by Maurice Makaay <maurice@gitaar.net>.
|
|
|
++ to the excellent Curses::UI by Maurice Makaay <maurice@gitaar.net>.
|
|
|
+
|
|
|
+ o Make sure that Curses::UI::Listbox draws the selected values in bold
|
|
|
+ also under "multi" and "radio" options to be consistent in look &
|
|
|
@@ -27,11 +27,11 @@ diff -N CHANGES.RSE
|
|
|
Index: lib/Curses/UI.pm
|
|
|
===================================================================
|
|
|
RCS file: /u/rse/wrk/cui/cvs/cui/lib/Curses/UI.pm,v
|
|
|
-retrieving revision 1.1.1.2
|
|
|
-retrieving revision 1.4
|
|
|
-diff -u -d -u -d -r1.1.1.2 -r1.4
|
|
|
---- lib/Curses/UI.pm 28 Mar 2003 08:22:34 -0000 1.1.1.2
|
|
|
-+++ lib/Curses/UI.pm 28 Mar 2003 08:24:58 -0000 1.4
|
|
|
+retrieving revision 1.1.1.3
|
|
|
+retrieving revision 1.5
|
|
|
+diff -u -d -u -d -r1.1.1.3 -r1.5
|
|
|
+--- lib/Curses/UI.pm 29 Mar 2003 10:41:56 -0000 1.1.1.3
|
|
|
++++ lib/Curses/UI.pm 29 Mar 2003 10:42:44 -0000 1.5
|
|
|
@@ -67,6 +67,8 @@
|
|
|
-debug => undef, # Turn on debugging mode?
|
|
|
-language => undef, # Which language to use?
|
|
|
@@ -39,9 +39,9 @@ diff -u -d -u -d -r1.1.1.2 -r1.4
|
|
|
+ -overlapping => 1, # Whether overlapping widgets are supported
|
|
|
+ -colors => 0, # Whether colors are used
|
|
|
|
|
|
- %userargs,
|
|
|
-
|
|
|
-@@ -123,6 +125,8 @@
|
|
|
+ #user data
|
|
|
+ -userdata => undef, #user internal data
|
|
|
+@@ -126,6 +128,8 @@
|
|
|
sub clear_on_exit(;$) { shift()->accessor('-clear_on_exit', shift()) }
|
|
|
sub cursor_mode(;$) { shift()->accessor('-cursor_mode', shift()) }
|
|
|
sub lang(;$) { shift()->accessor('-language_object', shift()) }
|
|
|
@@ -50,7 +50,7 @@ diff -u -d -u -d -r1.1.1.2 -r1.4
|
|
|
|
|
|
# TODO: document
|
|
|
sub debug(;$)
|
|
|
-@@ -133,6 +137,61 @@
|
|
|
+@@ -136,6 +140,61 @@
|
|
|
}
|
|
|
|
|
|
# ----------------------------------------------------------------------
|
|
|
@@ -112,7 +112,7 @@ diff -u -d -u -d -r1.1.1.2 -r1.4
|
|
|
# Window resizing support
|
|
|
# ----------------------------------------------------------------------
|
|
|
|
|
|
-@@ -148,6 +207,23 @@
|
|
|
+@@ -151,6 +210,23 @@
|
|
|
initscr();
|
|
|
noecho();
|
|
|
raw();
|
|
|
@@ -171,12 +171,12 @@ diff -u -d -u -d -r1.1.1.2 -r1.3
|
|
|
Index: lib/Curses/UI/Listbox.pm
|
|
|
===================================================================
|
|
|
RCS file: /u/rse/wrk/cui/cvs/cui/lib/Curses/UI/Listbox.pm,v
|
|
|
-retrieving revision 1.1.1.2
|
|
|
-retrieving revision 1.3
|
|
|
-diff -u -d -u -d -r1.1.1.2 -r1.3
|
|
|
---- lib/Curses/UI/Listbox.pm 28 Mar 2003 08:22:35 -0000 1.1.1.2
|
|
|
-+++ lib/Curses/UI/Listbox.pm 28 Mar 2003 08:24:58 -0000 1.3
|
|
|
-@@ -306,10 +306,12 @@
|
|
|
+retrieving revision 1.1.1.3
|
|
|
+retrieving revision 1.4
|
|
|
+diff -u -d -u -d -r1.1.1.3 -r1.4
|
|
|
+--- lib/Curses/UI/Listbox.pm 29 Mar 2003 10:41:56 -0000 1.1.1.3
|
|
|
++++ lib/Curses/UI/Listbox.pm 29 Mar 2003 10:42:44 -0000 1.4
|
|
|
+@@ -304,10 +304,12 @@
|
|
|
}
|
|
|
|
|
|
# Show selected element bold.
|
|
|
@@ -196,11 +196,11 @@ diff -u -d -u -d -r1.1.1.2 -r1.3
|
|
|
Index: lib/Curses/UI/TextEditor.pm
|
|
|
===================================================================
|
|
|
RCS file: /u/rse/wrk/cui/cvs/cui/lib/Curses/UI/TextEditor.pm,v
|
|
|
-retrieving revision 1.1.1.2
|
|
|
-retrieving revision 1.3
|
|
|
-diff -u -d -u -d -r1.1.1.2 -r1.3
|
|
|
---- lib/Curses/UI/TextEditor.pm 28 Mar 2003 08:22:36 -0000 1.1.1.2
|
|
|
-+++ lib/Curses/UI/TextEditor.pm 28 Mar 2003 08:24:58 -0000 1.3
|
|
|
+retrieving revision 1.1.1.3
|
|
|
+retrieving revision 1.4
|
|
|
+diff -u -d -u -d -r1.1.1.3 -r1.4
|
|
|
+--- lib/Curses/UI/TextEditor.pm 29 Mar 2003 10:41:57 -0000 1.1.1.3
|
|
|
++++ lib/Curses/UI/TextEditor.pm 29 Mar 2003 10:42:44 -0000 1.4
|
|
|
@@ -151,6 +151,7 @@
|
|
|
-vscrollbar => 0, # show vertical scrollbar
|
|
|
-hscrollbar => 0, # show horizontal scrollbar
|
|
|
@@ -247,12 +247,12 @@ diff -u -d -u -d -r1.1.1.2 -r1.3
|
|
|
Index: lib/Curses/UI/Widget.pm
|
|
|
===================================================================
|
|
|
RCS file: /u/rse/wrk/cui/cvs/cui/lib/Curses/UI/Widget.pm,v
|
|
|
-retrieving revision 1.1.1.2
|
|
|
-retrieving revision 1.3
|
|
|
-diff -u -d -u -d -r1.1.1.2 -r1.3
|
|
|
---- lib/Curses/UI/Widget.pm 28 Mar 2003 08:22:35 -0000 1.1.1.2
|
|
|
-+++ lib/Curses/UI/Widget.pm 28 Mar 2003 08:24:58 -0000 1.3
|
|
|
-@@ -461,7 +461,7 @@
|
|
|
+retrieving revision 1.1.1.3
|
|
|
+retrieving revision 1.4
|
|
|
+diff -u -d -u -d -r1.1.1.3 -r1.4
|
|
|
+--- lib/Curses/UI/Widget.pm 29 Mar 2003 10:41:57 -0000 1.1.1.3
|
|
|
++++ lib/Curses/UI/Widget.pm 29 Mar 2003 10:42:44 -0000 1.4
|
|
|
+@@ -472,7 +472,7 @@
|
|
|
my $parent = $this->parent;
|
|
|
$parent->focus($this) if defined $parent;
|
|
|
|
|
|
@@ -261,7 +261,7 @@ diff -u -d -u -d -r1.1.1.2 -r1.3
|
|
|
return $this;
|
|
|
}
|
|
|
|
|
|
-@@ -513,6 +513,7 @@
|
|
|
+@@ -523,6 +523,7 @@
|
|
|
if ($this->{-sbborder}) # Square bracket ([,]) border
|
|
|
{
|
|
|
$this->{-borderscr}->attron(A_BOLD) if $this->{-focus};
|
|
|
@@ -269,7 +269,7 @@ diff -u -d -u -d -r1.1.1.2 -r1.3
|
|
|
my $offset = 1;
|
|
|
$offset++ if $this->{-vscrollbar};
|
|
|
for my $y (0 .. $this->{-sh}-1)
|
|
|
-@@ -522,10 +523,12 @@
|
|
|
+@@ -532,10 +533,12 @@
|
|
|
$this->{-borderscr}->addstr($rel_y, $this->{-bw}-$offset, ']');
|
|
|
}
|
|
|
$this->{-borderscr}->attroff(A_BOLD) if $this->{-focus};
|
|
|
@@ -282,7 +282,7 @@ diff -u -d -u -d -r1.1.1.2 -r1.3
|
|
|
if ($this->root->compat) {
|
|
|
$this->{-borderscr}->border(
|
|
|
'|','|','-','-',
|
|
|
-@@ -535,6 +538,7 @@
|
|
|
+@@ -545,6 +548,7 @@
|
|
|
$this->{-borderscr}->box(ACS_VLINE, ACS_HLINE);
|
|
|
}
|
|
|
$this->{-borderscr}->attroff(A_BOLD) if $this->{-focus};
|
|
|
@@ -290,7 +290,7 @@ diff -u -d -u -d -r1.1.1.2 -r1.3
|
|
|
|
|
|
# Draw a title if needed.
|
|
|
if (defined $this->{-title})
|
|
|
-@@ -614,6 +618,7 @@
|
|
|
+@@ -628,6 +632,7 @@
|
|
|
# Draw the base of the scrollbar, in case
|
|
|
# there is no border.
|
|
|
$this->{-borderscr}->attron(A_BOLD) if $this->{-focus};
|
|
|
@@ -298,7 +298,7 @@ diff -u -d -u -d -r1.1.1.2 -r1.3
|
|
|
$this->{-borderscr}->move($ypos_min, $xpos);
|
|
|
$this->{-borderscr}->vline(ACS_VLINE,$scrlen);
|
|
|
if ($this->root->compat) {
|
|
|
-@@ -622,6 +627,7 @@
|
|
|
+@@ -636,6 +641,7 @@
|
|
|
$this->{-borderscr}->vline(ACS_VLINE,$scrlen);
|
|
|
}
|
|
|
$this->{-borderscr}->attroff(A_BOLD) if $this->{-focus};
|
|
|
@@ -306,7 +306,7 @@ diff -u -d -u -d -r1.1.1.2 -r1.3
|
|
|
|
|
|
# Should an active region be drawn?
|
|
|
my $scroll_active = ($this->{-vscrolllen} > $scrlen);
|
|
|
-@@ -679,6 +685,7 @@
|
|
|
+@@ -693,6 +699,7 @@
|
|
|
# Draw the base of the scrollbar, in case
|
|
|
# there is no border.
|
|
|
$this->{-borderscr}->attron(A_BOLD) if $this->{-focus};
|
|
|
@@ -314,7 +314,7 @@ diff -u -d -u -d -r1.1.1.2 -r1.3
|
|
|
$this->{-borderscr}->move($ypos, $xpos_min);
|
|
|
if ($this->root->compat) {
|
|
|
$this->{-borderscr}->hline('-',$scrlen);
|
|
|
-@@ -686,6 +693,7 @@
|
|
|
+@@ -700,6 +707,7 @@
|
|
|
$this->{-borderscr}->hline(ACS_HLINE,$scrlen);
|
|
|
}
|
|
|
$this->{-borderscr}->attroff(A_BOLD) if $this->{-focus};
|
|
|
@@ -322,7 +322,7 @@ diff -u -d -u -d -r1.1.1.2 -r1.3
|
|
|
|
|
|
# Should an active region be drawn?
|
|
|
my $scroll_active = ($this->{-hscrolllen} > $scrlen);
|
|
|
-@@ -945,6 +953,8 @@
|
|
|
+@@ -959,6 +967,8 @@
|
|
|
my $show_cursor = $this->{-nocursor} ? 0 : 1;
|
|
|
$this->root->cursor_mode($show_cursor);
|
|
|
|
|
|
@@ -331,7 +331,7 @@ diff -u -d -u -d -r1.1.1.2 -r1.3
|
|
|
return $this;
|
|
|
}
|
|
|
|
|
|
-@@ -953,6 +963,7 @@
|
|
|
+@@ -967,6 +977,7 @@
|
|
|
my $this = shift;
|
|
|
$this->{-focus} = 0;
|
|
|
$this->run_event('-onblur');
|
|
|
@@ -342,15 +342,16 @@ diff -u -d -u -d -r1.1.1.2 -r1.3
|
|
|
Index: examples/demo-widgets
|
|
|
===================================================================
|
|
|
RCS file: /u/rse/wrk/cui/cvs/cui/examples/demo-widgets,v
|
|
|
-retrieving revision 1.1.1.1
|
|
|
-retrieving revision 1.4
|
|
|
-diff -u -d -u -d -r1.1.1.1 -r1.4
|
|
|
---- examples/demo-widgets 20 Nov 2002 15:00:36 -0000 1.1.1.1
|
|
|
-+++ examples/demo-widgets 21 Nov 2002 20:14:59 -0000 1.4
|
|
|
-@@ -1,5 +1,10 @@
|
|
|
+retrieving revision 1.1.1.2
|
|
|
+retrieving revision 1.5
|
|
|
+diff -u -d -u -d -r1.1.1.2 -r1.5
|
|
|
+--- examples/demo-widgets 29 Mar 2003 10:41:58 -0000 1.1.1.2
|
|
|
++++ examples/demo-widgets 29 Mar 2003 10:42:44 -0000 1.5
|
|
|
+@@ -1,6 +1,11 @@
|
|
|
-#!/usr/bin/perl -w
|
|
|
+#!/usr/lpkg/bin/perl -w
|
|
|
use strict;
|
|
|
+ use File::Temp qw( :POSIX );
|
|
|
+use lib "../lib";
|
|
|
+
|
|
|
+# make KEY_BTAB (shift-tab) working in XTerm
|
|
|
@@ -359,7 +360,7 @@ diff -u -d -u -d -r1.1.1.1 -r1.4
|
|
|
|
|
|
my $debug = 0;
|
|
|
if (@ARGV and $ARGV[0] eq '-d') {
|
|
|
-@@ -19,7 +24,10 @@
|
|
|
+@@ -22,7 +27,10 @@
|
|
|
my $cui = new Curses::UI (
|
|
|
-clear_on_exit => 1,
|
|
|
-debug => $debug,
|
|
|
@@ -370,7 +371,7 @@ diff -u -d -u -d -r1.1.1.1 -r1.4
|
|
|
|
|
|
# Demo index
|
|
|
my $current_demo = 1;
|
|
|
-@@ -147,9 +155,10 @@
|
|
|
+@@ -150,9 +158,10 @@
|
|
|
|
|
|
$w{1}->add(undef,'Label',-text=>"dim font",-y=>5,-dim=>1 );
|
|
|
$w{1}->add(undef,'Label',-text=>"bold font",-y=>7,-bold=>1 );
|