[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.289 by root, Mon Jun 5 21:43:56 2006 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
		8	use Event;
8		9
9	use CFClient;	10	use CFClient;
10	use CFClient::Texture;	11	use CFClient::Texture;
11		12
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
…		…
15	our $ROOT;	16	our $ROOT;
16	our $TOOLTIP;	17	our $TOOLTIP;
17	our $BUTTON_STATE;	18	our $BUTTON_STATE;
18		19
19	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
		21
		22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
		23	if (!$GRAB) {
		24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		25	if (length $widget->{tooltip}) {
		26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->hide;
		28
		29	$TOOLTIP->{owner} = $widget;
		30
		31	return if $ENV{CFPLUS_DEBUG} & 8;
		32
		33	my $tip = $widget->{tooltip};
		34
		35	$tip = $tip->($widget) if CODE:: eq ref $tip;
		36
		37	$TOOLTIP->set_tooltip_from ($widget);
		38	$TOOLTIP->show;
		39	}
		40
		41	return;
		42	}
		43	}
		44	}
		45
		46	$TOOLTIP->hide;
		47	delete $TOOLTIP->{owner};
		48	});
20		49
21	sub get_layout {	50	sub get_layout {
22	my $layout;	51	my $layout;
23		52
24	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
39	my ($layout) = @_;	68	my ($layout) = @_;
40		69
41	$LAYOUT = $layout;	70	$LAYOUT = $layout;
42	}	71	}
43		72
44	sub check_tooltip {
45	return if $ENV{CFPLUS_DEBUG} & 8;
46
47	if (!$GRAB) {
48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49	if (length $widget->{tooltip}) {
50	if ($TOOLTIP->{owner} != $widget) {
51	$TOOLTIP->hide;
52
53	$TOOLTIP->{owner} = $widget;
54
55	my $tip = $widget->{tooltip};
56
57	$tip = $tip->($widget) if CODE:: eq ref $tip;
58
59	$TOOLTIP->set_tooltip_from ($widget);
60	$TOOLTIP->show;
61	}
62
63	return;
64	}
65	}
66	}
67
68	$TOOLTIP->hide;
69	delete $TOOLTIP->{owner};
70	}
71
72	# class methods for events	73	# class methods for events
73	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
74	$FOCUS->emit (key_down => $_[0])	75	$FOCUS->emit (key_down => $_[0])
75	if $FOCUS;	76	if $FOCUS;
76	}	77	}
…		…
88	my $widget = $ROOT->find_widget ($x, $y);	89	my $widget = $ROOT->find_widget ($x, $y);
89		90
90	$GRAB = $widget;	91	$GRAB = $widget;
91	$GRAB->update if $GRAB;	92	$GRAB->update if $GRAB;
92		93
93	check_tooltip;	94	$TOOLTIP_WATCHER->cb->();
94	}	95	}
95		96
96	$BUTTON_STATE \|= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE \|= 1 << ($ev->{button} - 1);
97		98
98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
…		…
113	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
114	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
115	$grab->update if $grab;	116	$grab->update if $grab;
116	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
117		118
118	check_tooltip;	119	$TOOLTIP_WATCHER->cb->();
119	}	120	}
120	}	121	}
121		122
122	sub feed_sdl_motion_event {	123	sub feed_sdl_motion_event {
123	my ($ev) = @_;	124	my ($ev) = @_;
…		…
129	my $hover = $HOVER; $HOVER = $widget;	130	my $hover = $HOVER; $HOVER = $widget;
130		131
131	$hover->update if $hover && $hover->{can_hover};	132	$hover->update if $hover && $hover->{can_hover};
132	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
133		134
134	check_tooltip;	135	$TOOLTIP_WATCHER->start;
135	}	136	}
136		137
137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138	if $HOVER;	139	if $HOVER;
139	}	140	}
…		…
171	sub rescale_widgets {	172	sub rescale_widgets {
172	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
173		174
174	for my $widget (values %WIDGET) {	175	for my $widget (values %WIDGET) {
175	if ($widget->{is_toplevel}) {	176	if ($widget->{is_toplevel}) {
176	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	177	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	178	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178		179
179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;	180	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	181	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};	182	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;	183	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	184	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};	185	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185		186
186	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	187	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	188	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188		189
189	}	190	}
190	}	191	}
191		192
192	reconfigure_widgets;	193	reconfigure_widgets;
…		…
277	delete $self->{visible};	278	delete $self->{visible};
278		279
279	undef $GRAB if $GRAB == $self;	280	undef $GRAB if $GRAB == $self;
280	undef $HOVER if $HOVER == $self;	281	undef $HOVER if $HOVER == $self;
281		282
282	CFClient::UI::check_tooltip	283	$CFClient::UI::TOOLTIP_WATCHER->cb->()
283	if $TOOLTIP->{owner} == $self;	284	if $TOOLTIP->{owner} == $self;
284		285
285	$self->focus_out;	286	$self->focus_out;
286		287
287	$self->emit (visibility_change => 0);	288	$self->emit (visibility_change => 0);
…		…
371	sub size_allocate {	372	sub size_allocate {
372	# nothing to be done	373	# nothing to be done
373	}	374	}
374		375
375	sub children {	376	sub children {
		377	# nop
		378	}
		379
		380	sub visible_children {
		381	$_[0]->children
376	}	382	}
377		383
378	sub set_max_size {	384	sub set_max_size {
379	my ($self, $w, $h) = @_;	385	my ($self, $w, $h) = @_;
380		386
381	delete $self->{max_w}; $self->{max_w} = $w if $w;	387	$self->{max_w} = int $w if defined $w;
382	delete $self->{max_h}; $self->{max_h} = $h if $h;	388	$self->{max_h} = int $h if defined $h;
		389
		390	$self->realloc;
383	}	391	}
384		392
385	sub set_tooltip {	393	sub set_tooltip {
386	my ($self, $tooltip) = @_;	394	my ($self, $tooltip) = @_;
387		395
…		…
392		400
393	$self->{tooltip} = $tooltip;	401	$self->{tooltip} = $tooltip;
394		402
395	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396	delete $CFClient::UI::TOOLTIP->{owner};	404	delete $CFClient::UI::TOOLTIP->{owner};
397	CFClient::UI::check_tooltip;	405	$CFClient::UI::TOOLTIP_WATCHER->cb->();
398	}	406	}
399	}	407	}
400		408
401	# translate global coordinates to local coordinate system	409	# translate global coordinates to local coordinate system
402	sub coord2local {	410	sub coord2local {
…		…
439		447
440	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441	unless $FOCUS;	449	unless $FOCUS;
442	}	450	}
443		451
444	sub mouse_motion { }	452	sub mouse_motion { 0 }
445	sub button_up { }	453	sub button_up { 0 }
446	sub key_down { }	454	sub key_down { 0 }
447	sub key_up { }	455	sub key_up { 0 }
448		456
449	sub button_down {	457	sub button_down {
450	my ($self, $ev, $x, $y) = @_;	458	my ($self, $ev, $x, $y) = @_;
451		459
452	$self->focus_in;	460	$self->focus_in;
453	}
454		461
455	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	462	0
456	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	463	}
457	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
458	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
459	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
460		464
461	sub find_widget {	465	sub find_widget {
462	my ($self, $x, $y) = @_;	466	my ($self, $x, $y) = @_;
463		467
464	return () unless $self->{can_events};	468	return () unless $self->{can_events};
…		…
526		530
527	$self->realloc;	531	$self->realloc;
528	$self->update;	532	$self->update;
529	}	533	}
530		534
		535	# using global variables seems a bit hacky, but passing through all drawing
		536	# functions seems pointless.
		537	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		538
531	sub draw {	539	sub draw {
532	my ($self) = @_;	540	my ($self) = @_;
533		541
534	return unless $self->{h} && $self->{w};	542	return unless $self->{h} && $self->{w};
		543
		544	# update screen rectangle
		545	local $draw_x = $draw_x + $self->{x};
		546	local $draw_y = $draw_y + $self->{y};
		547	local $draw_w = $draw_x + $self->{w};
		548	local $draw_h = $draw_y + $self->{h};
		549
		550	# skip widgets that are entirely outside the drawing area
		551	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
		552	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
535		553
536	glPushMatrix;	554	glPushMatrix;
537	glTranslate $self->{x}, $self->{y}, 0;	555	glTranslate $self->{x}, $self->{y}, 0;
538	$self->_draw;
539	glPopMatrix;
540		556
541	if ($self == $HOVER && $self->{can_hover}) {	557	if ($self == $HOVER && $self->{can_hover}) {
542	my ($x, $y) = @$self{qw(x y)};
543
544	glColor 1, 0.8, 0.5, 0.2;	558	glColor 10.2, 0.80.2, 0.5*0.2, 0.2;
545	glEnable GL_BLEND;	559	glEnable GL_BLEND;
546	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	560	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
547	glBegin GL_QUADS;	561	glBegin GL_QUADS;
548	glVertex $x , $y;	562	glVertex 0 , 0;
549	glVertex $x + $self->{w}, $y;	563	glVertex $self->{w}, 0;
550	glVertex $x + $self->{w}, $y + $self->{h};	564	glVertex $self->{w}, $self->{h};
551	glVertex $x , $y + $self->{h};	565	glVertex 0 , $self->{h};
552	glEnd;	566	glEnd;
553	glDisable GL_BLEND;	567	glDisable GL_BLEND;
554	}	568	}
555		569
556	if ($ENV{CFPLUS_DEBUG} & 1) {	570	if ($ENV{CFPLUS_DEBUG} & 1) {
557	glPushMatrix;	571	glPushMatrix;
558	glColor 1, 1, 0, 1;	572	glColor 1, 1, 0, 1;
559	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	573	glTranslate 0.375, 0.375;
560	glBegin GL_LINE_LOOP;	574	glBegin GL_LINE_LOOP;
561	glVertex 0 , 0;	575	glVertex 0 , 0;
562	glVertex $self->{w} - 1, 0;	576	glVertex $self->{w} - 1, 0;
563	glVertex $self->{w} - 1, $self->{h} - 1;	577	glVertex $self->{w} - 1, $self->{h} - 1;
564	glVertex 0 , $self->{h} - 1;	578	glVertex 0 , $self->{h} - 1;
565	glEnd;	579	glEnd;
566	glPopMatrix;	580	glPopMatrix;
567	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	581	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
568	}	582	}
		583
		584	$self->_draw;
		585	glPopMatrix;
569	}	586	}
570		587
571	sub _draw {	588	sub _draw {
572	my ($self) = @_;	589	my ($self) = @_;
573		590
…		…
611		628
612	if ($color && (@$color < 4 \|\| $color->[3])) {	629	if ($color && (@$color < 4 \|\| $color->[3])) {
613	my ($w, $h) = @$self{qw(w h)};	630	my ($w, $h) = @$self{qw(w h)};
614		631
615	glEnable GL_BLEND;	632	glEnable GL_BLEND;
616	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	633	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
617	glColor @$color;	634	glColor_premultiply @$color;
618		635
619	glBegin GL_QUADS;	636	glBegin GL_QUADS;
620	glVertex 0 , 0;	637	glVertex 0 , 0;
621	glVertex 0 , $h;	638	glVertex 0 , $h;
622	glVertex $w, $h;	639	glVertex $w, $h;
…		…
653	our @ISA = CFClient::UI::Base::;	670	our @ISA = CFClient::UI::Base::;
654		671
655	sub new {	672	sub new {
656	my ($class, %arg) = @_;	673	my ($class, %arg) = @_;
657		674
658	my $children = delete $arg{children} \|\| [];	675	my $children = delete $arg{children};
659		676
660	my $self = $class->SUPER::new (	677	my $self = $class->SUPER::new (
661	children => [],	678	children => [],
662	can_events => 0,	679	can_events => 0,
663	%arg,	680	%arg,
664	);	681	);
		682
665	$self->add ($_) for @$children;	683	$self->add (@$children)
		684	if $children;
666		685
667	$self	686	$self
668	}	687	}
669		688
670	sub add {	689	sub add {
…		…
718	$x -= $self->{x};	737	$x -= $self->{x};
719	$y -= $self->{y};	738	$y -= $self->{y};
720		739
721	my $res;	740	my $res;
722		741
723	for (reverse @{ $self->{children} }) {	742	for (reverse $self->visible_children) {
724	$res = $_->find_widget ($x, $y)	743	$res = $_->find_widget ($x, $y)
725	and return $res;	744	and return $res;
726	}	745	}
727		746
728	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	747	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
777	$self->{children}[0]->configure (0, 0, $w, $h);	796	$self->{children}[0]->configure (0, 0, $w, $h);
778	}	797	}
779		798
780	#############################################################################	799	#############################################################################
781		800
		801	# back-buffered drawing area
		802
782	package CFClient::UI::Window;	803	package CFClient::UI::Window;
783		804
784	our @ISA = CFClient::UI::Bin::;	805	our @ISA = CFClient::UI::Bin::;
785		806
786	use CFClient::OpenGL;	807	use CFClient::OpenGL;
…		…
804	$self->SUPER::size_allocate ($w, $h);	825	$self->SUPER::size_allocate ($w, $h);
805	$self->update;	826	$self->update;
806	}	827	}
807		828
808	sub _render {	829	sub _render {
		830	my ($self) = @_;
		831
809	$_[0]{children}[0]->draw;	832	$self->{children}[0]->draw;
810	}	833	}
811		834
812	sub render_child {	835	sub render_child {
813	my ($self) = @_;	836	my ($self) = @_;
814		837
815	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	838	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
816	glClearColor 0, 0, 0, 0;	839	glClearColor 0, 0, 0, 0;
817	glClear GL_COLOR_BUFFER_BIT;	840	glClear GL_COLOR_BUFFER_BIT;
818		841
		842	{
		843	package CFClient::UI::Base;
		844
		845	($draw_x, $draw_y, $draw_w, $draw_h) =
		846	(0, 0, $self->{w}, $self->{h});
		847	}
		848
819	$self->_render;	849	$self->_render;
820	};	850	};
821	}	851	}
822		852
823	sub _draw {	853	sub _draw {
824	my ($self) = @_;	854	my ($self) = @_;
825		855
826	my ($w, $h) = ($self->w, $self->h);	856	my ($w, $h) = @$self{qw(w h)};
827		857
828	my $tex = $self->{texture}	858	my $tex = $self->{texture}
829	or return;	859	or return;
830		860
831	glEnable GL_TEXTURE_2D;	861	glEnable GL_TEXTURE_2D;
832	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
833	glColor 1, 1, 1, 1;	863	glColor 0, 0, 0, 1;
834		864
835	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
836		866
837	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
838	}	868	}
…		…
914	}	944	}
915		945
916	sub _render {	946	sub _render {
917	my ($self) = @_;	947	my ($self) = @_;
918		948
		949	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		950	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		951
919	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
920		953
921	$self->SUPER::_render;	954	$self->SUPER::_render;
922	}	955	}
923		956
…		…
926	package CFClient::UI::ScrolledWindow;	959	package CFClient::UI::ScrolledWindow;
927		960
928	our @ISA = CFClient::UI::HBox::;	961	our @ISA = CFClient::UI::HBox::;
929		962
930	sub new {	963	sub new {
931	my $class = shift;	964	my ($class, %arg) = @_;
		965
		966	my $child = delete $arg{child};
932		967
933	my $self;	968	my $self;
934		969
935	my $slider = new CFClient::UI::Slider	970	my $slider = new CFClient::UI::Slider
936	vertical => 1,	971	vertical => 1,
…		…
941	;	976	;
942		977
943	$self = $class->SUPER::new (	978	$self = $class->SUPER::new (
944	vp => (new CFClient::UI::ViewPort expand => 1),	979	vp => (new CFClient::UI::ViewPort expand => 1),
945	slider => $slider,	980	slider => $slider,
946	@_,	981	%arg,
947	);	982	);
948		983
949	$self->{vp}->add ($self->{scrolled});
950	$self->add ($self->{vp});
951	$self->add ($self->{slider});	984	$self->SUPER::add ($self->{vp}, $self->{slider});
		985	$self->add ($child) if $child;
952		986
953	$self	987	$self
		988	}
		989
		990	sub add {
		991	my ($self, $widget) = @_;
		992
		993	$self->{vp}->add ($self->{child} = $widget);
954	}	994	}
955		995
956	sub update {	996	sub update {
957	my ($self) = @_;	997	my ($self) = @_;
958		998
…		…
997		1037
998	if ($self->{bg}) {	1038	if ($self->{bg}) {
999	my ($w, $h) = @$self{qw(w h)};	1039	my ($w, $h) = @$self{qw(w h)};
1000		1040
1001	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
1002	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1003	glColor @{ $self->{bg} };	1043	glColor_premultiply @{ $self->{bg} };
1004		1044
1005	glBegin GL_QUADS;	1045	glBegin GL_QUADS;
1006	glVertex 0 , 0;	1046	glVertex 0 , 0;
1007	glVertex 0 , $h;	1047	glVertex 0 , $h;
1008	glVertex $w, $h;	1048	glVertex $w, $h;
…		…
1030	my @border =	1070	my @border =
1031	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1032	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1033		1073
1034	sub new {	1074	sub new {
1035	my $class = shift;	1075	my ($class, %arg) = @_;
		1076
		1077	my $title = delete $arg{title};
1036		1078
1037	my $self = $class->SUPER::new (	1079	my $self = $class->SUPER::new (
1038	bg => [1, 1, 1, 1],	1080	bg => [1, 1, 1, 1],
1039	border_bg => [1, 1, 1, 1],	1081	border_bg => [1, 1, 1, 1],
1040	border => 0.6,	1082	border => 0.6,
1041	can_events => 1,	1083	can_events => 1,
1042	min_w => 16,	1084	min_w => 16,
1043	min_h => 16,	1085	min_h => 16,
1044	@_	1086	%arg,
1045	);	1087	);
1046		1088
1047	$self->{title} &&= new CFClient::UI::Label	1089	$self->{title} = new CFClient::UI::Label
1048	align => 0,	1090	align => 0,
1049	valign => 1,	1091	valign => 1,
1050	text => $self->{title},	1092	text => $title,
1051	fontsize => $self->{border};	1093	fontsize => $self->{border}
		1094	if defined $title;
1052		1095
1053	$self	1096	$self
		1097	}
		1098
		1099	sub add {
		1100	my ($self, @widgets) = @_;
		1101
		1102	$self->SUPER::add (@widgets);
		1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1054	}	1104	}
1055		1105
1056	sub border {	1106	sub border {
1057	int $_[0]{border} * $::FONTSIZE	1107	int $_[0]{border} * $::FONTSIZE
1058	}	1108	}
1059		1109
1060	sub size_request {	1110	sub size_request {
1061	my ($self) = @_;	1111	my ($self) = @_;
		1112
		1113	$self->{title}->size_request
		1114	if $self->{title};
1062		1115
1063	my ($w, $h) = $self->SUPER::size_request;	1116	my ($w, $h) = $self->SUPER::size_request;
1064		1117
1065	(	1118	(
1066	$w + $self->border * 2,	1119	$w + $self->border * 2,
…		…
1069	}	1122	}
1070		1123
1071	sub size_allocate {	1124	sub size_allocate {
1072	my ($self, $w, $h) = @_;	1125	my ($self, $w, $h) = @_;
1073		1126
		1127	if ($self->{title}) {
		1128	$self->{title}{w} = $w;
		1129	$self->{title}{h} = $h;
		1130	$self->{title}->size_allocate ($w, $h);
		1131	}
		1132
		1133	my $border = $self->border;
		1134
1074	$h -= List::Util::max 0, $self->border * 2;	1135	$h -= List::Util::max 0, $border * 2;
1075	$w -= List::Util::max 0, $self->border * 2;	1136	$w -= List::Util::max 0, $border * 2;
1076		1137
1077	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1078	if $self->{title};
1079
1080	$self->child->configure ($self->border, $self->border, $w, $h);	1138	$self->child->configure ($border, $border, $w, $h);
1081	}	1139	}
1082		1140
1083	sub button_down {	1141	sub button_down {
1084	my ($self, $ev, $x, $y) = @_;	1142	my ($self, $ev, $x, $y) = @_;
1085		1143
…		…
1104	my $dy = $ev->{y} - $oy;	1162	my $dy = $ev->{y} - $oy;
1105		1163
1106	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1164	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1107	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1165	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1108		1166
		1167	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1109	$self->realloc;	1168	$self->realloc;
1110	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1111	};	1169	};
1112		1170
1113	} elsif ($lr ^ $td) {	1171	} elsif ($lr ^ $td) {
1114	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1172	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1115	my ($bx, $by) = ($self->{x}, $self->{y});	1173	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1118	my ($ev, $x, $y) = @_;	1176	my ($ev, $x, $y) = @_;
1119		1177
1120	($x, $y) = ($ev->{x}, $ev->{y});	1178	($x, $y) = ($ev->{x}, $ev->{y});
1121		1179
1122	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1181	# HACK: the next line is required to enforce placement
		1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1123	};	1183	};
		1184	} else {
		1185	return 0;
		1186	}
		1187
1124	}	1188	1
1125	}	1189	}
1126		1190
1127	sub button_up {	1191	sub button_up {
1128	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1129		1193
1130	delete $self->{motion};	1194	!!delete $self->{motion}
1131	}	1195	}
1132		1196
1133	sub mouse_motion {	1197	sub mouse_motion {
1134	my ($self, $ev, $x, $y) = @_;	1198	my ($self, $ev, $x, $y) = @_;
1135		1199
1136	$self->{motion}->($ev, $x, $y) if $self->{motion};	1200	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1201
		1202	!!$self->{motion}
1137	}	1203	}
1138		1204
1139	sub _draw {	1205	sub _draw {
1140	my ($self) = @_;	1206	my ($self) = @_;
1141		1207
		1208	my $child = $self->{children}[0];
		1209
1142	my ($w, $h ) = ($self->{w}, $self->{h});	1210	my ($w, $h ) = ($self->{w}, $self->{h});
1143	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1211	my ($cw, $ch) = ($child->{w}, $child->{h});
1144		1212
1145	glEnable GL_TEXTURE_2D;	1213	glEnable GL_TEXTURE_2D;
1146	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1214	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1147		1215
1148	my $border = $self->border;	1216	my $border = $self->border;
…		…
1163	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1231	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1164	}	1232	}
1165		1233
1166	glDisable GL_TEXTURE_2D;	1234	glDisable GL_TEXTURE_2D;
1167		1235
1168	$self->{title}->draw if $self->{title};
1169
1170	$self->child->draw;	1236	$child->draw;
		1237
		1238	if ($self->{title}) {
		1239	glTranslate 0, $border - $self->{h};
		1240	$self->{title}->_draw;
		1241	}
1171	}	1242	}
1172		1243
1173	#############################################################################	1244	#############################################################################
1174		1245
1175	package CFClient::UI::Table;	1246	package CFClient::UI::Table;
…		…
1468		1539
1469	delete $self->{texture};	1540	delete $self->{texture};
1470	$self->SUPER::update;	1541	$self->SUPER::update;
1471	}	1542	}
1472		1543
		1544	sub realloc {
		1545	my ($self) = @_;
		1546
		1547	delete $self->{ox};
		1548	$self->SUPER::realloc;
		1549	}
		1550
1473	sub set_text {	1551	sub set_text {
1474	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1475		1553
1476	return if $self->{text} eq "T$text";	1554	return if $self->{text} eq "T$text";
1477	$self->{text} = "T$text";	1555	$self->{text} = "T$text";
1478		1556
1479	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480	$self->{layout}->set_text ($text);	1558	$self->{layout}->set_text ($text);
1481		1559
		1560	delete $self->{size_req};
1482	$self->realloc;	1561	$self->realloc;
1483	$self->update;	1562	$self->update;
1484	}	1563	}
1485		1564
1486	sub set_markup {	1565	sub set_markup {
…		…
1492	my $rgba = $markup =~ /span.*(?:foreground\|background)/;	1571	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
1493		1572
1494	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1495	$self->{layout}->set_markup ($markup);	1574	$self->{layout}->set_markup ($markup);
1496		1575
		1576	delete $self->{size_req};
1497	$self->realloc;	1577	$self->realloc;
1498	$self->update;	1578	$self->update;
1499	}	1579	}
1500		1580
1501	sub size_request {	1581	sub size_request {
1502	my ($self) = @_;	1582	my ($self) = @_;
1503		1583
		1584	$self->{size_req} \|\|= do {
1504	$self->{layout}->set_font ($self->{font}) if $self->{font};	1585	$self->{layout}->set_font ($self->{font}) if $self->{font};
1505	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1586	$self->{layout}->set_width ($self->{max_w} \|\| -1);
1506	$self->{layout}->set_ellipsise ($self->{ellipsise});	1587	$self->{layout}->set_ellipsise ($self->{ellipsise});
1507	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1508	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1509		1590
1510	my ($w, $h) = $self->{layout}->size;	1591	my ($w, $h) = $self->{layout}->size;
1511		1592
1512	if (exists $self->{template}) {	1593	if (exists $self->{template}) {
1513	$self->{template}->set_font ($self->{font}) if $self->{font};	1594	$self->{template}->set_font ($self->{font}) if $self->{font};
1514	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1515		1596
1516	my ($w2, $h2) = $self->{template}->size;	1597	my ($w2, $h2) = $self->{template}->size;
1517		1598
1518	$w = List::Util::max $w, $w2;	1599	$w = List::Util::max $w, $w2;
1519	$h = List::Util::max $h, $h2;	1600	$h = List::Util::max $h, $h2;
		1601	}
		1602
		1603	[$w, $h]
1520	}	1604	};
1521		1605
1522	($w, $h)	1606	@{ $self->{size_req} }
1523	}	1607	}
1524		1608
1525	sub size_allocate {	1609	sub size_allocate {
1526	my ($self, $w, $h) = @_;	1610	my ($self, $w, $h) = @_;
1527		1611
		1612	delete $self->{ox};
		1613
1528	delete $self->{texture}	1614	delete $self->{texture}
1529	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1530	}	1616	}
1531		1617
1532	sub set_fontsize {	1618	sub set_fontsize {
…		…
1534		1620
1535	$self->{fontsize} = $fontsize;	1621	$self->{fontsize} = $fontsize;
1536	delete $self->{texture};	1622	delete $self->{texture};
1537		1623
1538	$self->realloc;	1624	$self->realloc;
		1625	}
		1626
		1627	sub reconfigure {
		1628	my ($self) = @_;
		1629
		1630	delete $self->{size_req};
		1631
		1632	$self->SUPER::reconfigure;
1539	}	1633	}
1540		1634
1541	sub _draw {	1635	sub _draw {
1542	my ($self) = @_;	1636	my ($self) = @_;
1543		1637
…		…
1549	$self->{layout}->set_width ($self->{w});	1643	$self->{layout}->set_width ($self->{w});
1550	$self->{layout}->set_ellipsise ($self->{ellipsise});	1644	$self->{layout}->set_ellipsise ($self->{ellipsise});
1551	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1645	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1552	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1646	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1553		1647
1554	my $tex = new_from_layout CFClient::Texture $self->{layout};	1648	new_from_layout CFClient::Texture $self->{layout}
		1649	};
1555		1650
		1651	unless (exists $self->{ox}) {
1556	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1652	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1557	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1653	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1558	: ($self->{w} - $tex->{w}) * 0.5);	1654	: ($self->{w} - $tex->{w}) * 0.5);
1559		1655
1560	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1656	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1561	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1562	: ($self->{h} - $tex->{h}) * 0.5);	1658	: ($self->{h} - $tex->{h}) * 0.5);
1563
1564	$tex
1565	};	1659	};
1566		1660
1567	glEnable GL_TEXTURE_2D;	1661	glEnable GL_TEXTURE_2D;
1568	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1569		1662
1570	if ($tex->{format} == GL_ALPHA) {	1663	if ($tex->{format} == GL_ALPHA) {
		1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1571	glColor @{$self->{fg}};	1665	glColor @{$self->{fg}};
1572	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1666	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1573	} else {	1667	} else {
		1668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1574	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1669	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1575	}	1670	}
1576		1671
1577	glDisable GL_TEXTURE_2D;	1672	glDisable GL_TEXTURE_2D;
1578	}	1673	}
…		…
1607		1702
1608	delete $self->{cur_h};	1703	delete $self->{cur_h};
1609		1704
1610	return if $self->{text} eq $text;	1705	return if $self->{text} eq $text;
1611		1706
1612	delete $self->{texture};
1613
1614	$self->{last_activity} = $::NOW;	1707	$self->{last_activity} = $::NOW;
1615	$self->{text} = $text;	1708	$self->{text} = $text;
1616		1709
1617	$text =~ s/./*/g if $self->{hidden};	1710	$text =~ s/./*/g if $self->{hidden};
1618	$self->{layout}->set_text ("$text ");	1711	$self->{layout}->set_text ("$text ");
		1712	delete $self->{size_req};
1619		1713
1620	$self->_emit (changed => $self->{text});	1714	$self->_emit (changed => $self->{text});
		1715
		1716	$self->realloc;
		1717	$self->update;
1621	}	1718	}
1622		1719
1623	sub set_text {	1720	sub set_text {
1624	my ($self, $text) = @_;	1721	my ($self, $text) = @_;
1625		1722
1626	$self->{cursor} = length $text;	1723	$self->{cursor} = length $text;
1627	$self->_set_text ($text);	1724	$self->_set_text ($text);
1628
1629	$self->realloc;
1630	}	1725	}
1631		1726
1632	sub get_text {	1727	sub get_text {
1633	$_[0]{text}	1728	$_[0]{text}
1634	}	1729	}
…		…
1664	$self->{cursor} = length $text;	1759	$self->{cursor} = length $text;
1665	} elsif ($uni == 27) {	1760	} elsif ($uni == 27) {
1666	$self->_emit ('escape');	1761	$self->_emit ('escape');
1667	} elsif ($uni) {	1762	} elsif ($uni) {
1668	substr $text, $self->{cursor}++, 0, chr $uni;	1763	substr $text, $self->{cursor}++, 0, chr $uni;
		1764	} else {
		1765	return 0;
1669	}	1766	}
1670		1767
1671	$self->_set_text ($text);	1768	$self->_set_text ($text);
1672		1769
1673	$self->realloc;	1770	$self->realloc;
		1771
		1772	1
1674	}	1773	}
1675		1774
1676	sub focus_in {	1775	sub focus_in {
1677	my ($self) = @_;	1776	my ($self) = @_;
1678		1777
…		…
1693	utf8::encode $text;	1792	utf8::encode $text;
1694	$self->{cursor} = length substr $text, 0, $idx;	1793	$self->{cursor} = length substr $text, 0, $idx;
1695		1794
1696	$self->_set_text ($self->{text});	1795	$self->_set_text ($self->{text});
1697	$self->update;	1796	$self->update;
		1797
		1798	1
1698	}	1799	}
1699		1800
1700	sub mouse_motion {	1801	sub mouse_motion {
1701	my ($self, $ev, $x, $y) = @_;	1802	my ($self, $ev, $x, $y) = @_;
1702	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1803	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1804
		1805	0
1703	}	1806	}
1704		1807
1705	sub _draw {	1808	sub _draw {
1706	my ($self) = @_;	1809	my ($self) = @_;
1707		1810
1708	local $self->{fg} = $self->{fg};	1811	local $self->{fg} = $self->{fg};
1709		1812
1710	if ($FOCUS == $self) {	1813	if ($FOCUS == $self) {
1711	glColor @{$self->{active_bg}};	1814	glColor_premultiply @{$self->{active_bg}};
1712	$self->{fg} = $self->{active_fg};	1815	$self->{fg} = $self->{active_fg};
1713	} else {	1816	} else {
1714	glColor @{$self->{bg}};	1817	glColor_premultiply @{$self->{bg}};
1715	}	1818	}
1716		1819
1717	glEnable GL_BLEND;	1820	glEnable GL_BLEND;
1718	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1821	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1719	glBegin GL_QUADS;	1822	glBegin GL_QUADS;
1720	glVertex 0 , 0;	1823	glVertex 0 , 0;
1721	glVertex 0 , $self->{h};	1824	glVertex 0 , $self->{h};
1722	glVertex $self->{w}, $self->{h};	1825	glVertex $self->{w}, $self->{h};
1723	glVertex $self->{w}, 0;	1826	glVertex $self->{w}, 0;
…		…
1784	} else {	1887	} else {
1785	$self->set_text ($self->{history_saveback});	1888	$self->set_text ($self->{history_saveback});
1786	}	1889	}
1787		1890
1788	} else {	1891	} else {
1789	$self->SUPER::key_down ($ev);	1892	return $self->SUPER::key_down ($ev)
		1893	}
		1894
1790	}	1895	1
1791
1792	}	1896	}
1793		1897
1794	#############################################################################	1898	#############################################################################
1795		1899
1796	package CFClient::UI::Button;	1900	package CFClient::UI::Button;
…		…
1825	my ($self, $ev, $x, $y) = @_;	1929	my ($self, $ev, $x, $y) = @_;
1826		1930
1827	$self->emit ("activate")	1931	$self->emit ("activate")
1828	if $x >= 0 && $x < $self->{w}	1932	if $x >= 0 && $x < $self->{w}
1829	&& $y >= 0 && $y < $self->{h};	1933	&& $y >= 0 && $y < $self->{h};
		1934
		1935	1
1830	}	1936	}
1831		1937
1832	sub _draw {	1938	sub _draw {
1833	my ($self) = @_;	1939	my ($self) = @_;
1834		1940
1835	local $self->{fg} = $self->{fg};	1941	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1836
1837	if ($GRAB == $self) {
1838	$self->{fg} = $self->{active_fg};
1839	}
1840		1942
1841	glEnable GL_TEXTURE_2D;	1943	glEnable GL_TEXTURE_2D;
1842	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1944	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1843	glColor 0, 0, 0, 1;	1945	glColor 0, 0, 0, 1;
1844		1946
…		…
1888		1990
1889	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1991	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1890	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1992	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1891	$self->{state} = !$self->{state};	1993	$self->{state} = !$self->{state};
1892	$self->_emit (changed => $self->{state});	1994	$self->_emit (changed => $self->{state});
		1995	} else {
		1996	return 0
		1997	}
		1998
1893	}	1999	1
1894	}	2000	}
1895		2001
1896	sub _draw {	2002	sub _draw {
1897	my ($self) = @_;	2003	my ($self) = @_;
1898		2004
…		…
2065		2171
2066	my $h1 = $self->{h} * (1 - $ycut1);	2172	my $h1 = $self->{h} * (1 - $ycut1);
2067	my $h2 = $self->{h} * (1 - $ycut2);	2173	my $h2 = $self->{h} * (1 - $ycut2);
2068		2174
2069	glEnable GL_BLEND;	2175	glEnable GL_BLEND;
2070	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2176	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2177	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2071	glEnable GL_TEXTURE_2D;	2178	glEnable GL_TEXTURE_2D;
2072	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2179	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2073		2180
2074	glBindTexture GL_TEXTURE_2D, $t1->{name};	2181	glBindTexture GL_TEXTURE_2D, $t1->{name};
2075	glBegin GL_QUADS;	2182	glBegin GL_QUADS;
…		…
2236		2343
2237	$self->SUPER::button_down ($ev, $x, $y);	2344	$self->SUPER::button_down ($ev, $x, $y);
2238		2345
2239	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2346	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240		2347
2241	$self->mouse_motion ($ev, $x, $y);	2348	$self->mouse_motion ($ev, $x, $y)
2242	}	2349	}
2243		2350
2244	sub mouse_motion {	2351	sub mouse_motion {
2245	my ($self, $ev, $x, $y) = @_;	2352	my ($self, $ev, $x, $y) = @_;
2246		2353
…		…
2250	my (undef, $lo, $hi, $page) = @{$self->{range}};	2357	my (undef, $lo, $hi, $page) = @{$self->{range}};
2251		2358
2252	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2359	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253		2360
2254	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2361	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2362	} else {
		2363	return 0;
		2364	}
		2365
2255	}	2366	1
2256	}	2367	}
2257		2368
2258	sub update {	2369	sub update {
2259	my ($self) = @_;	2370	my ($self) = @_;
2260		2371
2261	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2372	delete $self->{knob_w};
		2373	$self->SUPER::update;
		2374	}
		2375
		2376	sub _draw {
		2377	my ($self) = @_;
		2378
		2379	unless ($self->{knob_w}) {
2262	$self->set_value ($self->{range}[0]);	2380	$self->set_value ($self->{range}[0]);
2263		2381
2264	my ($value, $lo, $hi, $page) = @{$self->{range}};	2382	my ($value, $lo, $hi, $page) = @{$self->{range}};
2265	my $range = ($hi - $page - $lo) \|\| 1e-100;	2383	my $range = ($hi - $page - $lo) \|\| 1e-100;
2266		2384
…		…
2272	$value = ($value - $lo) / $range;	2390	$value = ($value - $lo) / $range;
2273	$value = $value * $self->{scale} + $self->{offset};	2391	$value = $value * $self->{scale} + $self->{offset};
2274		2392
2275	$self->{knob_x} = $value - $knob_w * 0.5;	2393	$self->{knob_x} = $value - $knob_w * 0.5;
2276	$self->{knob_w} = $knob_w;	2394	$self->{knob_w} = $knob_w;
2277	});	2395	}
2278
2279	$self->SUPER::update;
2280	}
2281
2282	sub _draw {
2283	my ($self) = @_;
2284		2396
2285	$self->SUPER::_draw ();	2397	$self->SUPER::_draw ();
2286		2398
2287	glScale $self->{w}, $self->{h};	2399	glScale $self->{w}, $self->{h};
2288		2400
…		…
2482		2594
2483	delete $self->{texture};	2595	delete $self->{texture};
2484	}	2596	}
2485		2597
2486	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2598	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2487	glClearColor 0.5, 0.5, 0.5, 0;	2599	glClearColor 0, 0, 0, 0;
2488	glClear GL_COLOR_BUFFER_BIT;	2600	glClear GL_COLOR_BUFFER_BIT;
2489		2601
2490	my $top = int $self->{children}[1]{range}[0];	2602	my $top = int $self->{children}[1]{range}[0];
2491		2603
2492	my $y0 = $top;	2604	my $y0 = $top;
…		…
2527	sub _draw {	2639	sub _draw {
2528	my ($self) = @_;	2640	my ($self) = @_;
2529		2641
2530	glEnable GL_TEXTURE_2D;	2642	glEnable GL_TEXTURE_2D;
2531	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2643	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532	glColor 1, 1, 1, 1;	2644	glColor 0, 0, 0, 1;
2533	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2645	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2534	glDisable GL_TEXTURE_2D;	2646	glDisable GL_TEXTURE_2D;
2535		2647
2536	$self->{children}[1]->draw;	2648	$self->{children}[1]->draw;
2537		2649
2538	}	2650	}
…		…
2765	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	2877	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2766		2878
2767	if ($tex) {	2879	if ($tex) {
2768	glEnable GL_TEXTURE_2D;	2880	glEnable GL_TEXTURE_2D;
2769	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2881	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2770	glColor 1, 1, 1, 1;	2882	glColor 0, 0, 0, 1;
2771	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2883	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2772	glDisable GL_TEXTURE_2D;	2884	glDisable GL_TEXTURE_2D;
2773	}	2885	}
2774	}	2886	}
2775		2887
…		…
2779	$self->{timer}->cancel	2891	$self->{timer}->cancel
2780	if $self->{timer};	2892	if $self->{timer};
2781		2893
2782	$self->SUPER::DESTROY;	2894	$self->SUPER::DESTROY;
2783	}	2895	}
		2896
		2897	#############################################################################
		2898
		2899	package CFClient::UI::Buttonbar;
		2900
		2901	our @ISA = CFClient::UI::HBox::;
		2902
		2903	# TODO: should actualyl wrap buttons and other goodies.
2784		2904
2785	#############################################################################	2905	#############################################################################
2786		2906
2787	package CFClient::UI::Menu;	2907	package CFClient::UI::Menu;
2788		2908
…		…
2838	my ($self, $ev, $x, $y) = @_;	2958	my ($self, $ev, $x, $y) = @_;
2839		2959
2840	# TODO: should use vbox->find_widget or so	2960	# TODO: should use vbox->find_widget or so
2841	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2961	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2842	$self->{hover} = $self->{item}{$HOVER};	2962	$self->{hover} = $self->{item}{$HOVER};
		2963
		2964	0
2843	}	2965	}
2844		2966
2845	sub button_up {	2967	sub button_up {
2846	my ($self, $ev, $x, $y) = @_;	2968	my ($self, $ev, $x, $y) = @_;
2847		2969
…		…
2849	undef $GRAB;	2971	undef $GRAB;
2850	$self->hide;	2972	$self->hide;
2851		2973
2852	$self->_emit ("popdown");	2974	$self->_emit ("popdown");
2853	$self->{hover}[1]->() if $self->{hover};	2975	$self->{hover}[1]->() if $self->{hover};
		2976	} else {
		2977	return 0
		2978	}
		2979
2854	}	2980	1
2855	}	2981	}
2856		2982
2857	#############################################################################	2983	#############################################################################
2858		2984
2859	package CFClient::UI::Statusbox;	2985	package CFClient::UI::Multiplexer;
2860		2986
2861	our @ISA = CFClient::UI::VBox::;	2987	our @ISA = CFClient::UI::Container::;
2862		2988
2863	sub new {	2989	sub new {
2864	my $class = shift;	2990	my $class = shift;
2865		2991
2866	$class->SUPER::new (	2992	my $self = $class->SUPER::new (
		2993	@_,
		2994	);
		2995
		2996	$self->{current} = $self->{children}[0]
		2997	if @{ $self->{children} };
		2998
		2999	$self
		3000	}
		3001
		3002	sub add {
		3003	my ($self, @widgets) = @_;
		3004
		3005	$self->SUPER::add (@widgets);
		3006
		3007	$self->{current} = $self->{children}[0]
		3008	if @{ $self->{children} };
		3009	}
		3010
		3011	sub set_current_page {
		3012	my ($self, $page_or_widget) = @_;
		3013
		3014	my $widget = ref $page_or_widget
		3015	? $page_or_widget
		3016	: $self->{children}[$page_or_widget];
		3017
		3018	$self->{current} = $widget;
		3019	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3020
		3021	$self->_emit (page_changed => $self->{current});
		3022
		3023	$self->realloc;
		3024	}
		3025
		3026	sub visible_children {
		3027	$_[0]{current}
		3028	}
		3029
		3030	sub size_request {
		3031	my ($self) = @_;
		3032
		3033	$self->{current}->size_request
		3034	}
		3035
		3036	sub size_allocate {
		3037	my ($self, $w, $h) = @_;
		3038
		3039	$self->{current}->configure (0, 0, $w, $h);
		3040	}
		3041
		3042	sub _draw {
		3043	my ($self) = @_;
		3044
		3045	$self->{current}->draw;
		3046	}
		3047
		3048	#############################################################################
		3049
		3050	package CFClient::UI::Notebook;
		3051
		3052	our @ISA = CFClient::UI::VBox::;
		3053
		3054	sub new {
		3055	my $class = shift;
		3056
		3057	my $self = $class->SUPER::new (
		3058	buttonbar => (new CFClient::UI::Buttonbar),
		3059	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3060	# filter => # will be put between multiplexer and $self
		3061	@_,
		3062	);
		3063
		3064	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3065	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});
		3066
		3067	$self
		3068	}
		3069
		3070	sub add {
		3071	my ($self, $title, $widget, $tooltip) = @_;
		3072
		3073	Scalar::Util::weaken $self;
		3074
		3075	$self->{buttonbar}->add (new CFClient::UI::Button
		3076	markup => $title,
		3077	tooltip => $tooltip,
		3078	on_activate => sub { $self->set_current_page ($widget) },
		3079	);
		3080
		3081	$self->{multiplexer}->add ($widget);
		3082	}
		3083
		3084	sub set_current_page {
		3085	my ($self, $page) = @_;
		3086
		3087	$self->{multiplexer}->set_current_page ($page);
		3088	$self->_emit (page_changed => $self->{multiplexer}{current});
		3089	}
		3090
		3091	#############################################################################
		3092
		3093	package CFClient::UI::Statusbox;
		3094
		3095	our @ISA = CFClient::UI::VBox::;
		3096
		3097	sub new {
		3098	my $class = shift;
		3099
		3100	my $self = $class->SUPER::new (
2867	fontsize => 0.8,	3101	fontsize => 0.8,
2868	@_,	3102	@_,
2869	)	3103	);
		3104
		3105	Scalar::Util::weaken (my $this = $self);
		3106
		3107	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3108
		3109	$self
2870	}	3110	}
2871		3111
2872	sub reorder {	3112	sub reorder {
2873	my ($self) = @_;	3113	my ($self) = @_;
2874	my $NOW = time;	3114	my $NOW = Time::HiRes::time;
		3115
		3116	# freeze display when hovering over any label
		3117	return if $CFClient::UI::TOOLTIP->{owner}
		3118	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3119	values %{ $self->{item} };
2875		3120
2876	while (my ($k, $v) = each %{ $self->{item} }) {	3121	while (my ($k, $v) = each %{ $self->{item} }) {
2877	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3122	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2878	}	3123	}
2879		3124
…		…
2882	my @items = sort {	3127	my @items = sort {
2883	$a->{pri} <=> $b->{pri}	3128	$a->{pri} <=> $b->{pri}
2884	or $b->{id} <=> $a->{id}	3129	or $b->{id} <=> $a->{id}
2885	} values %{ $self->{item} };	3130	} values %{ $self->{item} };
2886		3131
		3132	$self->{timer}->interval (1);
		3133
2887	my $count = 10 + 1;	3134	my $count = 10 + 1;
2888	for my $item (@items) {	3135	for my $item (@items) {
2889	last unless --$count;	3136	last unless --$count;
2890		3137
2891	push @widgets, $item->{label} \|\|= do {	3138	my $label = $item->{label} \|\|= do {
2892	# TODO: doesn't handle markup well (read as: at all)	3139	# TODO: doesn't handle markup well (read as: at all)
2893	my $short = $item->{count} > 1	3140	my $short = $item->{count} > 1
2894	? "<b>$item->{count} ×</b> $item->{text}"	3141	? "<b>$item->{count} ×</b> $item->{text}"
2895	: $item->{text};	3142	: $item->{text};
2896		3143
…		…
2904	tooltip => $item->{tooltip},	3151	tooltip => $item->{tooltip},
2905	tooltip_font => $::FONT_PROP,	3152	tooltip_font => $::FONT_PROP,
2906	tooltip_width => 0.67,	3153	tooltip_width => 0.67,
2907	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3154	fontsize => $item->{fontsize} \|\| $self->{fontsize},
2908	max_w => $::WIDTH * 0.44,	3155	max_w => $::WIDTH * 0.44,
2909	fg => $item->{fg},	3156	fg => [@{ $item->{fg} }],
2910	can_events => 1,	3157	can_events => 1,
2911	can_hover => 1	3158	can_hover => 1
2912	};	3159	};
		3160
		3161	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3162	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;
		3163	$label->update;
		3164	$label->set_max_size (undef, $label->{req_h} * $diff)
		3165	if $diff < 1;
		3166	$self->{timer}->interval (1/30);
		3167	} else {
		3168	$label->{fg}[3] = $item->{fg}[3] \|\| 1;
		3169	}
		3170
		3171	push @widgets, $label;
2913	}	3172	}
2914		3173
2915	$self->clear;	3174	$self->clear;
2916	$self->SUPER::add (reverse @widgets);	3175	$self->SUPER::add (reverse @widgets);
2917	}	3176	}
…		…
2922	$text =~ s/^\s+//;	3181	$text =~ s/^\s+//;
2923	$text =~ s/\s+$//;	3182	$text =~ s/\s+$//;
2924		3183
2925	return unless $text;	3184	return unless $text;
2926		3185
2927	my $timeout = time + ((delete $arg{timeout}) \|\| 60);	3186	my $timeout = (int time) + ((delete $arg{timeout}) \|\| 60);
2928		3187
2929	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3188	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2930		3189
2931	if (my $item = $self->{item}{$group}) {	3190	if (my $item = $self->{item}{$group}) {
2932	if ($item->{text} eq $text) {	3191	if ($item->{text} eq $text) {
…		…
2962		3221
2963	$self->reorder;	3222	$self->reorder;
2964	$self->SUPER::reconfigure;	3223	$self->SUPER::reconfigure;
2965	}	3224	}
2966		3225
		3226	sub DESTROY {
		3227	my ($self) = @_;
		3228
		3229	$self->{timer}->cancel;
		3230
		3231	$self->SUPER::DESTROY;
		3232	}
		3233
2967	#############################################################################	3234	#############################################################################
2968		3235
2969	package CFClient::UI::Inventory;	3236	package CFClient::UI::Inventory;
2970		3237
2971	our @ISA = CFClient::UI::ScrolledWindow::;	3238	our @ISA = CFClient::UI::ScrolledWindow::;
2972		3239
2973	sub new {	3240	sub new {
2974	my $class = shift;	3241	my $class = shift;
2975		3242
2976	my $self = $class->SUPER::new (	3243	my $self = $class->SUPER::new (
2977	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3244	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2978	@_,	3245	@_,
2979	);	3246	);
2980		3247
2981	$self	3248	$self
2982	}	3249	}
2983		3250
2984	sub set_items {	3251	sub set_items {
2985	my ($self, $items) = @_;	3252	my ($self, $items) = @_;
2986		3253
2987	$self->{scrolled}->clear;	3254	$self->{child}->clear;
2988	return unless $items;	3255	return unless $items;
2989		3256
2990	my @items = sort {	3257	my @items = sort {
2991	($a->{type} <=> $b->{type})	3258	($a->{type} <=> $b->{type})
2992	or ($a->{name} cmp $b->{name})	3259	or ($a->{name} cmp $b->{name})
…		…
2996		3263
2997	my $row = 0;	3264	my $row = 0;
2998	for my $item (@items) {	3265	for my $item (@items) {
2999	CFClient::Item::update_widgets $item;	3266	CFClient::Item::update_widgets $item;
3000		3267
3001	$self->{scrolled}->add (0, $row, $item->{face_widget});	3268	$self->{child}->add (0, $row, $item->{face_widget});
3002	$self->{scrolled}->add (1, $row, $item->{desc_widget});	3269	$self->{child}->add (1, $row, $item->{desc_widget});
3003	$self->{scrolled}->add (2, $row, $item->{weight_widget});	3270	$self->{child}->add (2, $row, $item->{weight_widget});
3004		3271
3005	$row++;	3272	$row++;
3006	}	3273	}
3007	}	3274	}
3008		3275
…		…
3106	$rec = $::CONN->stop_record if $::CONN;	3373	$rec = $::CONN->stop_record if $::CONN;
3107	return unless ref $rec eq 'ARRAY';	3374	return unless ref $rec eq 'ARRAY';
3108	$self->set_command_list ($rec);	3375	$self->set_command_list ($rec);
3109	}	3376	}
3110		3377
3111	# if $commit is true, the binding will be set after the user entered a key combo	3378
		3379	sub ask_for_bind_and_commit {
		3380	my ($self) = @_;
		3381	$self->ask_for_bind (1);
		3382	}
		3383
3112	sub ask_for_bind {	3384	sub ask_for_bind {
3113	my ($self, $commit) = @_;	3385	my ($self, $commit) = @_;
3114		3386
3115	CFClient::Binder::open_binding_dialog (sub {	3387	CFClient::Binder::open_binding_dialog (sub {
3116	my ($mod, $sym) = @_;	3388	my ($mod, $sym) = @_;
…		…
3200		3472
3201	#############################################################################	3473	#############################################################################
3202		3474
3203	package CFClient::UI::SpellList;	3475	package CFClient::UI::SpellList;
3204		3476
3205	our @ISA = CFClient::UI::FancyFrame::;	3477	our @ISA = CFClient::UI::Table::;
3206		3478
3207	sub new {	3479	sub new {
3208	my $class = shift;	3480	my $class = shift;
3209		3481
3210	my $self = $class->SUPER::new (binding => [], commands => [], @_);	3482	my $self = $class->SUPER::new (
3211		3483	binding => [],
3212	$self->add (new CFClient::UI::ScrolledWindow	3484	commands => [],
3213	scrolled => $self->{spellbox} = new CFClient::UI::Table);	3485	@_,
3214		3486	)
3215	$self;
3216	}	3487	}
3217		3488
3218	# XXX: Do sorting? Argl...	3489	# XXX: Do sorting? Argl...
3219	sub add_spell {	3490	sub add_spell {
3220	my ($self, $spell) = @_;	3491	my ($self, $spell) = @_;
3221	$self->{spells}->{$spell->{name}} = $spell;	3492	$self->{spells}->{$spell->{name}} = $spell;
3222		3493
3223	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face	3494	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3224	face => $spell->{face},	3495	face => $spell->{face},
3225	can_hover => 1,	3496	can_hover => 1,
3226	can_events => 1,	3497	can_events => 1,
3227	tooltip => $spell->{message});	3498	tooltip => $spell->{message});
3228		3499
3229	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label	3500	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3230	text => $spell->{name},	3501	text => $spell->{name},
3231	can_hover => 1,	3502	can_hover => 1,
3232	can_events => 1,	3503	can_events => 1,
3233	tooltip => $spell->{message},	3504	tooltip => $spell->{message},
3234	expand => 1);	3505	expand => 1);
3235		3506
3236	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label	3507	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3237	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",	3508	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3238	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),	3509	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3239	expand => 1);	3510	expand => 1);
3240		3511
3241	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button	3512	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3242	text => "bind to key",	3513	text => "bind to key",
3243	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });	3514	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3244	}	3515	}
3245		3516
3246	sub rebuild_spell_list {	3517	sub rebuild_spell_list {
…		…
3258	#############################################################################	3529	#############################################################################
3259		3530
3260	package CFClient::UI::Root;	3531	package CFClient::UI::Root;
3261		3532
3262	our @ISA = CFClient::UI::Container::;	3533	our @ISA = CFClient::UI::Container::;
		3534
		3535	use List::Util qw(min max);
3263		3536
3264	use CFClient::OpenGL;	3537	use CFClient::OpenGL;
3265		3538
3266	sub new {	3539	sub new {
3267	my $class = shift;	3540	my $class = shift;
…		…
3402		3675
3403	delete $queue{$widget+0};	3676	delete $queue{$widget+0};
3404		3677
3405	my ($w, $h) = $widget->size_request;	3678	my ($w, $h) = $widget->size_request;
3406		3679
3407	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3680	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3408	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3681	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3682
		3683	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3684	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3409		3685
3410	$w = $widget->{force_w} if exists $widget->{force_w};	3686	$w = $widget->{force_w} if exists $widget->{force_w};
3411	$h = $widget->{force_h} if exists $widget->{force_h};	3687	$h = $widget->{force_h} if exists $widget->{force_h};
3412		3688
3413	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h	3689	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h
…		…
3471	glLoadIdentity;	3747	glLoadIdentity;
3472	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3748	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3473	glMatrixMode GL_MODELVIEW;	3749	glMatrixMode GL_MODELVIEW;
3474	glLoadIdentity;	3750	glLoadIdentity;
3475		3751
		3752	{
		3753	package CFClient::UI::Base;
		3754
		3755	($draw_x, $draw_y, $draw_w, $draw_h) =
		3756	(0, 0, $self->{w}, $self->{h});
		3757	}
		3758
3476	$self->_draw;	3759	$self->_draw;
3477	}	3760	}
3478		3761
3479	#############################################################################	3762	#############################################################################
3480		3763

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC vs. Revision 1.289 by root, Mon Jun 5 21:43:56 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.289 by root, Mon Jun 5 21:43:56 2006 UTC