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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.328 by root, Sat Jul 22 13:43:05 2006 UTC vs.
Revision 1.341 by root, Sun Aug 13 03:20:56 2006 UTC

…		…
1	package CFClient::UI;	1	package CFPlus::UI;
2		2
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	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
79	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	82	if $FOCUS;
82	}	83	}
83		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
84	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	99	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
87		101
88	warn "button down $ev->{button}\n";#d#	102	$BUTTON_STATE \|= 1 << ($ev->{button} - 1);
89		103
90	if (!$BUTTON_STATE) {	104	unless ($GRAB) {
91	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
92		106
93	$GRAB = $widget;	107	$GRAB = $widget;
94	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
95		109
96	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
97	}	111	}
98		112
99	$BUTTON_STATE \|= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
100		114	if ($ev->{button} == 4 \|\| $ev->{button} == 5) {
101	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
102	if $GRAB;	116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
		122	}
103	}	123	}
104		124
105	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
106	my ($ev) = @_;	126	my ($ev) = @_;
107	my ($x, $y) = ($ev->{x}, $ev->{y});
108		127
109	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB \|\| $ROOT->find_widget ($ev->{x}, $ev->{y});
110		129
111	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
112		131
113	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
114	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
115		134
116	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
117	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
118	$grab->update if $grab;	137	$grab->update if $grab;
119	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
120		139
		140	check_hover $widget;
121	$TOOLTIP_WATCHER->cb->();	141	$TOOLTIP_WATCHER->cb->();
122	}	142	}
123	}	143	}
124		144
125	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
126	my ($ev) = @_;	146	my ($ev) = @_;
127	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
128		148
129	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
130		150
131	if ($widget != $HOVER) {	151	check_hover $widget;
132	my $hover = $HOVER; $HOVER = $widget;
133		152
134	$hover->update if $hover && $hover->{can_hover};	153	$HOVER->emit (mouse_motion => $ev)
135	$HOVER->update if $HOVER && $HOVER->{can_hover};
136
137	$TOOLTIP_WATCHER->start;
138	}
139
140	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
141	if $HOVER;	154	if $HOVER;
142	}	155	}
143		156
144	# convert position array to integers	157	# convert position array to integers
145	sub harmonize {	158	sub harmonize {
…		…
195	reconfigure_widgets;	208	reconfigure_widgets;
196	}	209	}
197		210
198	#############################################################################	211	#############################################################################
199		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
200	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
201		222
202	use strict;	223	use strict;
203		224
204	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
205		226
206	sub new {	227	sub new {
207	my $class = shift;	228	my $class = shift;
208		229
209	my $self = bless {	230	my $self = bless {
…		…
214	h => undef,	235	h => undef,
215	can_events => 1,	236	can_events => 1,
216	@_	237	@_
217	}, $class;	238	}, $class;
218		239
219	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
220		241
221	for (keys %$self) {	242	for (keys %$self) {
222	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
223	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
224	}	245	}
225	}	246	}
226		247
227	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
228	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
229	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
230	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
231	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
232		253
233	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
234	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
235		256
236	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
249	sub show {	270	sub show {
250	my ($self) = @_;	271	my ($self) = @_;
251		272
252	return if $self->{parent};	273	return if $self->{parent};
253		274
254	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
255	}	276	}
256		277
257	sub set_visible {	278	sub set_visible {
258	my ($self) = @_;	279	my ($self) = @_;
259		280
…		…
280	delete $self->{root};	301	delete $self->{root};
281		302
282	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
283	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
284		305
285	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
286	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
287		308
288	$self->emit ("focus_out");	309	$self->emit ("focus_out");
289	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
290	}	311	}
…		…
347	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
348		369
349	if ($self->{aspect}) {	370	if ($self->{aspect}) {
350	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
351		372
352	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
353	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
354		375
355	# use alignment to adjust x, y	376	# use alignment to adjust x, y
356		377
357	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
358	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
399		420
400	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
401		422
402	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
403		424
404	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
405	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
406	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
407	}	428	}
408	}	429	}
409		430
410	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
411	sub coord2local {	432	sub coord2local {
412	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
413		434
		435	Carp::confess unless $self->{parent};#d#
		436
414	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
415	}	438	}
416		439
417	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
418	sub coord2global {	441	sub coord2global {
419	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
		443
		444	Carp::confess unless $self->{parent};#d#
420		445
421	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
422	}	447	}
423		448
424	sub invoke_focus_in {	449	sub invoke_focus_in {
…		…
458		483
459	sub invoke_mouse_motion { 0 }	484	sub invoke_mouse_motion { 0 }
460	sub invoke_button_up { 0 }	485	sub invoke_button_up { 0 }
461	sub invoke_key_down { 0 }	486	sub invoke_key_down { 0 }
462	sub invoke_key_up { 0 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
463		489
464	sub invoke_button_down {	490	sub invoke_button_down {
465	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
466		492
467	$self->grab_focus;	493	$self->grab_focus;
468		494
469	warn "button down $ev->{button} $x $y\n";#d#
470
471	0	495	0
472	}	496	}
473		497
474	sub connect {	498	sub connect {
475	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
476		500
477	push @{ $self->{signal_cb}{$signal} }, $cb;	501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
478	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
479		515
480	sub emit {	516	sub emit {
481	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
482		518
		519	# I do not really like this solution, but I dislike duplication
		520	# and needlessly verbose code, too.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
483	#d##TODO# stop propagating at first true, do not use sum	528	#d##TODO# stop propagating at first true, do not use sum
484	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} \|\| []}) # before	529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} \|\| []}) # before
485	\|\| ($self->can ("invoke_$signal") \|\| sub { 1 })->($self, @args) # closure	530	\|\| ($self->can ("invoke_$signal") \|\| sub { 1 })->($self, @args, @append) # closure
486	\|\| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	531	\|\| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
487	}	532	}
488		533
489	sub find_widget {	534	sub find_widget {
490	my ($self, $x, $y) = @_;	535	my ($self, $x, $y) = @_;
491		536
…		…
575	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
576	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
577	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
578	glEnd;	623	glEnd;
579	glPopMatrix;	624	glPopMatrix;
580	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
581	}	626	}
582		627
583	$self->_draw;	628	$self->_draw;
584	glPopMatrix;	629	glPopMatrix;
585	}	630	}
…		…
591	}	636	}
592		637
593	sub DESTROY {	638	sub DESTROY {
594	my ($self) = @_;	639	my ($self) = @_;
595		640
596	return if CFClient::in_destruct;	641	return if CFPlus::in_destruct;
597		642
598	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
599		644
600	eval { $self->destroy };	645	eval { $self->destroy };
601	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
602	}	647	}
603		648
604	#############################################################################	649	#############################################################################
605		650
606	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
607		652
608	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
609		654
610	use strict;	655	use strict;
611	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
612		657
613	sub new {	658	sub new {
614	my $class = shift;	659	my $class = shift;
615		660
616	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
647	}	692	}
648	}	693	}
649		694
650	#############################################################################	695	#############################################################################
651		696
652	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
653		698
654	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
655		700
656	sub new {	701	sub new {
657	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
658	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
659	}	704	}
…		…
666		711
667	sub draw { }	712	sub draw { }
668		713
669	#############################################################################	714	#############################################################################
670		715
671	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
672		717
673	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
674		719
675	sub new {	720	sub new {
676	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
677		722
678	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
687	if $children;	732	if $children;
688		733
689	$self	734	$self
690	}	735	}
691		736
		737	sub realloc {
		738	my ($self) = @_;
		739
		740	$self->{force_realloc} = 1;
		741	$self->{force_size_alloc} = 1;
		742	$self->SUPER::realloc;
		743	}
		744
692	sub add {	745	sub add {
693	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
694		747
695	$_->set_parent ($self)	748	$_->set_parent ($self)
696	for @widgets;	749	for @widgets;
…		…
756	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
757	}	810	}
758		811
759	#############################################################################	812	#############################################################################
760		813
761	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
762		815
763	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
764		817
765	sub new {	818	sub new {
766	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
767		820
768	my $child = (delete $arg{child}) \|\| new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) \|\| new CFPlus::UI::Empty::;
769		822
770	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
771	}	824	}
772		825
773	sub add {	826	sub add {
…		…
780	sub remove {	833	sub remove {
781	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
782		835
783	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
784		837
785	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
786	unless @{$self->{children}};	839	unless @{$self->{children}};
787	}	840	}
788		841
789	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
790		843
…		…
802		855
803	#############################################################################	856	#############################################################################
804		857
805	# back-buffered drawing area	858	# back-buffered drawing area
806		859
807	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
808		861
809	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
810		863
811	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
812		865
813	sub new {	866	sub new {
814	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
815		868
816	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
838	}	891	}
839		892
840	sub render_child {	893	sub render_child {
841	my ($self) = @_;	894	my ($self) = @_;
842		895
843	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	896	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
844	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
845	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
846		899
847	{	900	{
848	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
849		902
850	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
851	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
852	}	905	}
853		906
…		…
872	glDisable GL_TEXTURE_2D;	925	glDisable GL_TEXTURE_2D;
873	}	926	}
874		927
875	#############################################################################	928	#############################################################################
876		929
877	package CFClient::UI::ViewPort;	930	package CFPlus::UI::ViewPort;
878		931
879	our @ISA = CFClient::UI::Window::;	932	our @ISA = CFPlus::UI::Window::;
880		933
881	sub new {	934	sub new {
882	my $class = shift;	935	my $class = shift;
883		936
884	$class->SUPER::new (	937	$class->SUPER::new (
…		…
944	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	997	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
945	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	998	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
946	) {	999	) {
947	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1000	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
948	} else {	1001	} else {
949	$self->CFClient::UI::Base::find_widget ($x, $y)	1002	$self->CFPlus::UI::Base::find_widget ($x, $y)
950	}	1003	}
951	}	1004	}
952		1005
953	sub _render {	1006	sub _render {
954	my ($self) = @_;	1007	my ($self) = @_;
955		1008
956	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1009	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
957	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1010	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
958		1011
959	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1012	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
960		1013
961	$self->SUPER::_render;	1014	$self->SUPER::_render;
962	}	1015	}
963		1016
964	#############################################################################	1017	#############################################################################
965		1018
966	package CFClient::UI::ScrolledWindow;	1019	package CFPlus::UI::ScrolledWindow;
967		1020
968	our @ISA = CFClient::UI::HBox::;	1021	our @ISA = CFPlus::UI::HBox::;
969		1022
970	sub new {	1023	sub new {
971	my ($class, %arg) = @_;	1024	my ($class, %arg) = @_;
972		1025
973	my $child = delete $arg{child};	1026	my $child = delete $arg{child};
974		1027
975	my $self;	1028	my $self;
976		1029
977	my $slider = new CFClient::UI::Slider	1030	my $slider = new CFPlus::UI::Slider
978	vertical => 1,	1031	vertical => 1,
979	range => [0, 0, 1, 0.01], # HACK fix	1032	range => [0, 0, 1, 0.01], # HACK fix
980	on_changed => sub {	1033	on_changed => sub {
981	$self->{vp}->set_offset (0, $_[1]);	1034	$self->{vp}->set_offset (0, $_[1]);
982	},	1035	},
983	;	1036	;
984		1037
985	$self = $class->SUPER::new (	1038	$self = $class->SUPER::new (
986	vp => (new CFClient::UI::ViewPort expand => 1),	1039	vp => (new CFPlus::UI::ViewPort expand => 1),
		1040	can_events => 1,
987	slider => $slider,	1041	slider => $slider,
988	%arg,	1042	%arg,
989	);	1043	);
990		1044
991	$self->SUPER::add ($self->{vp}, $self->{slider});	1045	$self->SUPER::add ($self->{vp}, $self->{slider});
992	$self->add ($child) if $child;	1046	$self->add ($child) if $child;
…		…
1000	my ($self, $widget) = @_;	1054	my ($self, $widget) = @_;
1001		1055
1002	$self->{vp}->add ($self->{child} = $widget);	1056	$self->{vp}->add ($self->{child} = $widget);
1003	}	1057	}
1004		1058
1005	sub invoke_button_down {	1059	sub invoke_mouse_wheel {
1006	my ($self, $ev) = @_;	1060	my ($self, $ev) = @_;
1007		1061
1008	warn "button down $ev->{button}\n";#d#	1062	return 0 unless $ev->{dy}; # only vertical movements
		1063
		1064	$self->{slider}->emit (mouse_wheel => $ev);
		1065
1009		1066	1
1010	0
1011	}	1067	}
1012		1068
1013	sub update_slider {	1069	sub update_slider {
1014	my ($self) = @_;	1070	my ($self) = @_;
1015		1071
…		…
1032	$self->SUPER::invoke_size_allocate ($w, $h)	1088	$self->SUPER::invoke_size_allocate ($w, $h)
1033	}	1089	}
1034		1090
1035	#############################################################################	1091	#############################################################################
1036		1092
1037	package CFClient::UI::Frame;	1093	package CFPlus::UI::Frame;
1038		1094
1039	our @ISA = CFClient::UI::Bin::;	1095	our @ISA = CFPlus::UI::Bin::;
1040		1096
1041	use CFClient::OpenGL;	1097	use CFPlus::OpenGL;
1042		1098
1043	sub new {	1099	sub new {
1044	my $class = shift;	1100	my $class = shift;
1045		1101
1046	$class->SUPER::new (	1102	$class->SUPER::new (
…		…
1072	$self->SUPER::_draw;	1128	$self->SUPER::_draw;
1073	}	1129	}
1074		1130
1075	#############################################################################	1131	#############################################################################
1076		1132
1077	package CFClient::UI::FancyFrame;	1133	package CFPlus::UI::FancyFrame;
1078		1134
1079	our @ISA = CFClient::UI::Bin::;	1135	our @ISA = CFPlus::UI::Bin::;
1080		1136
1081	use CFClient::OpenGL;	1137	use CFPlus::OpenGL;
1082		1138
1083	my $bg =	1139	my $bg =
1084	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1140	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1085	mipmap => 1, wrap => 1;	1141	mipmap => 1, wrap => 1;
1086		1142
1087	my @border =	1143	my @border =
1088	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1144	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1089	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1145	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1090		1146
1091	sub new {	1147	sub new {
1092	my ($class, %arg) = @_;	1148	my ($class, %arg) = @_;
1093		1149
…		…
1099	min_w => 64,	1155	min_w => 64,
1100	min_h => 32,	1156	min_h => 32,
1101	%arg,	1157	%arg,
1102	);	1158	);
1103		1159
1104	$self->{title_widget} = new CFClient::UI::Label	1160	$self->{title_widget} = new CFPlus::UI::Label
1105	align => 0,	1161	align => 0,
1106	valign => 1,	1162	valign => 1,
1107	text => $self->{title},	1163	text => $self->{title},
1108	fontsize => $self->{border},	1164	fontsize => $self->{border},
1109	if exists $self->{title};	1165	if exists $self->{title};
1110		1166
1111	if ($self->{has_close_button}) {	1167	if ($self->{has_close_button}) {
1112	$self->{close_button} =	1168	$self->{close_button} =
1113	new CFClient::UI::ImageButton	1169	new CFPlus::UI::ImageButton
1114	path => 'x1_close.png',	1170	path => 'x1_close.png',
1115	on_activate => sub { $self->emit ("delete") };	1171	on_activate => sub { $self->emit ("delete") };
1116		1172
1117	$self->CFClient::UI::Container::add ($self->{close_button});	1173	$self->CFPlus::UI::Container::add ($self->{close_button});
1118	}	1174	}
1119		1175
1120	$self	1176	$self
1121	}	1177	}
1122		1178
1123	sub add {	1179	sub add {
1124	my ($self, @widgets) = @_;	1180	my ($self, @widgets) = @_;
1125		1181
1126	$self->SUPER::add (@widgets);	1182	$self->SUPER::add (@widgets);
1127	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1183	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1128	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1184	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1129	}	1185	}
1130		1186
1131	sub border {	1187	sub border {
1132	int $_[0]{border} * $::FONTSIZE	1188	int $_[0]{border} * $::FONTSIZE
1133	}	1189	}
…		…
1241	$self->{motion}->($ev, $x, $y) if $self->{motion};	1297	$self->{motion}->($ev, $x, $y) if $self->{motion};
1242		1298
1243	! ! $self->{motion}	1299	! ! $self->{motion}
1244	}	1300	}
1245		1301
		1302	sub invoke_visibility_change {
		1303	my ($self, $visible) = @_;
		1304
		1305	delete $self->{motion} unless $visible;
		1306
		1307	0
		1308	}
		1309
1246	sub _draw {	1310	sub _draw {
1247	my ($self) = @_;	1311	my ($self) = @_;
1248		1312
1249	my $child = $self->{children}[0];	1313	my $child = $self->{children}[0];
1250		1314
…		…
1287	if $self->{close_button};	1351	if $self->{close_button};
1288	}	1352	}
1289		1353
1290	#############################################################################	1354	#############################################################################
1291		1355
1292	package CFClient::UI::Table;	1356	package CFPlus::UI::Table;
1293		1357
1294	our @ISA = CFClient::UI::Base::;	1358	our @ISA = CFPlus::UI::Base::;
1295		1359
1296	use List::Util qw(max sum);	1360	use List::Util qw(max sum);
1297		1361
1298	use CFClient::OpenGL;	1362	use CFPlus::OpenGL;
1299		1363
1300	sub new {	1364	sub new {
1301	my $class = shift;	1365	my $class = shift;
1302		1366
1303	$class->SUPER::new (	1367	$class->SUPER::new (
…		…
1309	sub children {	1373	sub children {
1310	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1374	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1311	}	1375	}
1312		1376
1313	sub add {	1377	sub add {
1314	my ($self, $x, $y, $child) = @_;	1378	my ($self) = shift;
1315		1379
		1380	while (@_) {
		1381	my ($x, $y, $child) = splice @_, 0, 3, ();
1316	$child->set_parent ($self);	1382	$child->set_parent ($self);
1317	$self->{children}[$y][$x] = $child;	1383	$self->{children}[$y][$x] = $child;
		1384	}
1318		1385
		1386	$self->{force_realloc} = 1;
		1387	$self->{force_size_alloc} = 1;
1319	$self->realloc;	1388	$self->realloc;
1320	}	1389	}
1321		1390
1322	sub remove {	1391	sub remove {
1323	my ($self, $child) = @_;	1392	my ($self, $child) = @_;
…		…
1388		1457
1389	# linearly scale sizes	1458	# linearly scale sizes
1390	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1459	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1391	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	1460	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
1392		1461
1393	CFClient::UI::harmonize $ws;	1462	CFPlus::UI::harmonize $ws;
1394	CFClient::UI::harmonize $hs;	1463	CFPlus::UI::harmonize $hs;
1395		1464
1396	my $y;	1465	my $y;
1397		1466
1398	for my $r (0 .. $#{$self->{children}}) {	1467	for my $r (0 .. $#{$self->{children}}) {
1399	my $row = $self->{children}[$r]	1468	my $row = $self->{children}[$r]
…		…
1442	}	1511	}
1443	}	1512	}
1444		1513
1445	#############################################################################	1514	#############################################################################
1446		1515
1447	package CFClient::UI::Box;	1516	package CFPlus::UI::Box;
1448		1517
1449	our @ISA = CFClient::UI::Container::;	1518	our @ISA = CFPlus::UI::Container::;
1450		1519
1451	sub size_request {	1520	sub size_request {
1452	my ($self) = @_;	1521	my ($self) = @_;
1453		1522
1454	$self->{vertical}	1523	$self->{vertical}
…		…
1487	$req[$_] += $space * $children[$_]{expand}	1556	$req[$_] += $space * $children[$_]{expand}
1488	for 0 .. $#children;	1557	for 0 .. $#children;
1489	}	1558	}
1490	}	1559	}
1491		1560
1492	CFClient::UI::harmonize \@req;	1561	CFPlus::UI::harmonize \@req;
1493		1562
1494	my $pos = 0;	1563	my $pos = 0;
1495	for (0 .. $#children) {	1564	for (0 .. $#children) {
1496	my $alloc = $req[$_];	1565	my $alloc = $req[$_];
1497	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1566	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1502	1	1571	1
1503	}	1572	}
1504		1573
1505	#############################################################################	1574	#############################################################################
1506		1575
1507	package CFClient::UI::HBox;	1576	package CFPlus::UI::HBox;
1508		1577
1509	our @ISA = CFClient::UI::Box::;	1578	our @ISA = CFPlus::UI::Box::;
1510		1579
1511	sub new {	1580	sub new {
1512	my $class = shift;	1581	my $class = shift;
1513		1582
1514	$class->SUPER::new (	1583	$class->SUPER::new (
…		…
1517	)	1586	)
1518	}	1587	}
1519		1588
1520	#############################################################################	1589	#############################################################################
1521		1590
1522	package CFClient::UI::VBox;	1591	package CFPlus::UI::VBox;
1523		1592
1524	our @ISA = CFClient::UI::Box::;	1593	our @ISA = CFPlus::UI::Box::;
1525		1594
1526	sub new {	1595	sub new {
1527	my $class = shift;	1596	my $class = shift;
1528		1597
1529	$class->SUPER::new (	1598	$class->SUPER::new (
…		…
1532	)	1601	)
1533	}	1602	}
1534		1603
1535	#############################################################################	1604	#############################################################################
1536		1605
1537	package CFClient::UI::Label;	1606	package CFPlus::UI::Label;
1538		1607
1539	our @ISA = CFClient::UI::DrawBG::;	1608	our @ISA = CFPlus::UI::DrawBG::;
1540		1609
1541	use CFClient::OpenGL;	1610	use CFPlus::OpenGL;
1542		1611
1543	sub new {	1612	sub new {
1544	my ($class, %arg) = @_;	1613	my ($class, %arg) = @_;
1545		1614
1546	my $self = $class->SUPER::new (	1615	my $self = $class->SUPER::new (
…		…
1550	#font => default_font	1619	#font => default_font
1551	#text => initial text	1620	#text => initial text
1552	#markup => initial narkup	1621	#markup => initial narkup
1553	#max_w => maximum pixel width	1622	#max_w => maximum pixel width
1554	ellipsise => 3, # end	1623	ellipsise => 3, # end
1555	layout => (new CFClient::Layout),	1624	layout => (new CFPlus::Layout),
1556	fontsize => 1,	1625	fontsize => 1,
1557	align => -1,	1626	align => -1,
1558	valign => -1,	1627	valign => -1,
1559	padding_x => 2,	1628	padding_x => 2,
1560	padding_y => 2,	1629	padding_y => 2,
1561	can_events => 0,	1630	can_events => 0,
1562	%arg	1631	%arg
1563	);	1632	);
1564		1633
1565	if (exists $self->{template}) {	1634	if (exists $self->{template}) {
1566	my $layout = new CFClient::Layout;	1635	my $layout = new CFPlus::Layout;
1567	$layout->set_text (delete $self->{template});	1636	$layout->set_text (delete $self->{template});
1568	$self->{template} = $layout;	1637	$self->{template} = $layout;
1569	}	1638	}
1570		1639
1571	if (exists $self->{markup}) {	1640	if (exists $self->{markup}) {
…		…
1573	} else {	1642	} else {
1574	$self->set_text (delete $self->{text});	1643	$self->set_text (delete $self->{text});
1575	}	1644	}
1576		1645
1577	$self	1646	$self
1578	}
1579
1580	sub escape($) {
1581	local $_ = $_[0];
1582
1583	s/&/&/g;
1584	s/>/>/g;
1585	s/</</g;
1586
1587	$_
1588	}	1647	}
1589		1648
1590	sub update {	1649	sub update {
1591	my ($self) = @_;	1650	my ($self) = @_;
1592		1651
…		…
1724	$self->{layout}->render ($self->{ox}, $self->{oy});	1783	$self->{layout}->render ($self->{ox}, $self->{oy});
1725	}	1784	}
1726		1785
1727	#############################################################################	1786	#############################################################################
1728		1787
1729	package CFClient::UI::EntryBase;	1788	package CFPlus::UI::EntryBase;
1730		1789
1731	our @ISA = CFClient::UI::Label::;	1790	our @ISA = CFPlus::UI::Label::;
1732		1791
1733	use CFClient::OpenGL;	1792	use CFPlus::OpenGL;
1734		1793
1735	sub new {	1794	sub new {
1736	my $class = shift;	1795	my $class = shift;
1737		1796
1738	$class->SUPER::new (	1797	$class->SUPER::new (
…		…
1800		1859
1801	if ($uni == 8) {	1860	if ($uni == 8) {
1802	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1861	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1803	} elsif ($uni == 127) {	1862	} elsif ($uni == 127) {
1804	substr $text, $self->{cursor}, 1, "";	1863	substr $text, $self->{cursor}, 1, "";
1805	} elsif ($sym == CFClient::SDLK_LEFT) {	1864	} elsif ($sym == CFPlus::SDLK_LEFT) {
1806	--$self->{cursor} if $self->{cursor};	1865	--$self->{cursor} if $self->{cursor};
1807	} elsif ($sym == CFClient::SDLK_RIGHT) {	1866	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1808	++$self->{cursor} if $self->{cursor} < length $self->{text};	1867	++$self->{cursor} if $self->{cursor} < length $self->{text};
1809	} elsif ($sym == CFClient::SDLK_HOME) {	1868	} elsif ($sym == CFPlus::SDLK_HOME) {
1810	$self->{cursor} = 0;	1869	$self->{cursor} = 0;
1811	} elsif ($sym == CFClient::SDLK_END) {	1870	} elsif ($sym == CFPlus::SDLK_END) {
1812	$self->{cursor} = length $text;	1871	$self->{cursor} = length $text;
1813	} elsif ($uni == 27) {	1872	} elsif ($uni == 27) {
1814	$self->emit ('escape');	1873	$self->emit ('escape');
1815	} elsif ($uni) {	1874	} elsif ($uni) {
1816	substr $text, $self->{cursor}++, 0, chr $uni;	1875	substr $text, $self->{cursor}++, 0, chr $uni;
…		…
1898	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	1957	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1899	glEnd;	1958	glEnd;
1900	}	1959	}
1901	}	1960	}
1902		1961
1903	package CFClient::UI::Entry;	1962	package CFPlus::UI::Entry;
1904		1963
1905	our @ISA = CFClient::UI::EntryBase::;	1964	our @ISA = CFPlus::UI::EntryBase::;
1906		1965
1907	use CFClient::OpenGL;	1966	use CFPlus::OpenGL;
1908		1967
1909	sub invoke_key_down {	1968	sub invoke_key_down {
1910	my ($self, $ev) = @_;	1969	my ($self, $ev) = @_;
1911		1970
1912	my $sym = $ev->{sym};	1971	my $sym = $ev->{sym};
…		…
1918	$self->{history_pointer} = -1;	1977	$self->{history_pointer} = -1;
1919	$self->{history_saveback} = '';	1978	$self->{history_saveback} = '';
1920	$self->emit (activate => $txt);	1979	$self->emit (activate => $txt);
1921	$self->update;	1980	$self->update;
1922		1981
1923	} elsif ($sym == CFClient::SDLK_UP) {	1982	} elsif ($sym == CFPlus::SDLK_UP) {
1924	if ($self->{history_pointer} < 0) {	1983	if ($self->{history_pointer} < 0) {
1925	$self->{history_saveback} = $self->get_text;	1984	$self->{history_saveback} = $self->get_text;
1926	}	1985	}
1927	if (@{$self->{history} \|\| []} > 0) {	1986	if (@{$self->{history} \|\| []} > 0) {
1928	$self->{history_pointer}++;	1987	$self->{history_pointer}++;
…		…
1930	$self->{history_pointer} = @{$self->{history} \|\| []} - 1;	1989	$self->{history_pointer} = @{$self->{history} \|\| []} - 1;
1931	}	1990	}
1932	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1991	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1933	}	1992	}
1934		1993
1935	} elsif ($sym == CFClient::SDLK_DOWN) {	1994	} elsif ($sym == CFPlus::SDLK_DOWN) {
1936	$self->{history_pointer}--;	1995	$self->{history_pointer}--;
1937	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1996	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1938		1997
1939	if ($self->{history_pointer} >= 0) {	1998	if ($self->{history_pointer} >= 0) {
1940	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1999	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1949	1	2008	1
1950	}	2009	}
1951		2010
1952	#############################################################################	2011	#############################################################################
1953		2012
1954	package CFClient::UI::Button;	2013	package CFPlus::UI::Button;
1955		2014
1956	our @ISA = CFClient::UI::Label::;	2015	our @ISA = CFPlus::UI::Label::;
1957		2016
1958	use CFClient::OpenGL;	2017	use CFPlus::OpenGL;
1959		2018
1960	my @tex =	2019	my @tex =
1961	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2020	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1962	qw(b1_button_active.png);	2021	qw(b1_button_active.png);
1963		2022
1964	sub new {	2023	sub new {
1965	my $class = shift;	2024	my $class = shift;
1966		2025
…		…
2003	$self->SUPER::_draw;	2062	$self->SUPER::_draw;
2004	}	2063	}
2005		2064
2006	#############################################################################	2065	#############################################################################
2007		2066
		2067	package CFPlus::UI::CheckBox;
		2068
		2069	our @ISA = CFPlus::UI::DrawBG::;
		2070
		2071	my @tex =
		2072	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2073	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2074
		2075	use CFPlus::OpenGL;
		2076
		2077	sub new {
		2078	my $class = shift;
		2079
		2080	$class->SUPER::new (
		2081	padding_x => 2,
		2082	padding_y => 2,
		2083	fg => [1, 1, 1],
		2084	active_fg => [1, 1, 0],
		2085	bg => [0, 0, 0, 0.2],
		2086	active_bg => [1, 1, 1, 0.5],
		2087	state => 0,
		2088	can_hover => 1,
		2089	@_
		2090	)
		2091	}
		2092
		2093	sub size_request {
		2094	my ($self) = @_;
		2095
		2096	(6) x 2
		2097	}
		2098
		2099	sub toggle {
		2100	my ($self) = @_;
		2101
		2102	$self->{state} = !$self->{state};
		2103	$self->emit (changed => $self->{state});
		2104	$self->update;
		2105	}
		2106
		2107	sub invoke_button_down {
		2108	my ($self, $ev, $x, $y) = @_;
		2109
		2110	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2111	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2112	$self->toggle;
		2113	} else {
		2114	return 0
		2115	}
		2116
		2117	1
		2118	}
		2119
		2120	sub _draw {
		2121	my ($self) = @_;
		2122
		2123	$self->SUPER::_draw;
		2124
		2125	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2126
		2127	my ($w, $h) = @$self{qw(w h)};
		2128
		2129	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2130
		2131	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2132
		2133	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2134
		2135	glEnable GL_TEXTURE_2D;
		2136	$tex->draw_quad_alpha (0, 0, $s, $s);
		2137	glDisable GL_TEXTURE_2D;
		2138	}
		2139
		2140	#############################################################################
		2141
		2142	package CFPlus::UI::Image;
		2143
		2144	our @ISA = CFPlus::UI::Base::;
		2145
		2146	use CFPlus::OpenGL;
		2147
		2148	our %texture_cache;
		2149
		2150	sub new {
		2151	my $class = shift;
		2152
		2153	my $self = $class->SUPER::new (
		2154	can_events => 0,
		2155	@_,
		2156	);
		2157
		2158	$self->{path} \|\| $self->{tex}
		2159	or Carp::croak "'path' or 'tex' attributes required";
		2160
		2161	$self->{tex} \|\|= $texture_cache{$self->{path}} \|\|=
		2162	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2163
		2164	Scalar::Util::weaken $texture_cache{$self->{path}};
		2165
		2166	$self->{aspect} \|\|= $self->{tex}{w} / $self->{tex}{h};
		2167
		2168	$self
		2169	}
		2170
		2171	sub STORABLE_freeze {
		2172	my ($self, $cloning) = @_;
		2173
		2174	$self->{path}
		2175	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2176
		2177	$self->{path}
		2178	}
		2179
		2180	sub STORABLE_attach {
		2181	my ($self, $cloning, $path) = @_;
		2182
		2183	$self->new (path => $path)
		2184	}
		2185
		2186	sub size_request {
		2187	my ($self) = @_;
		2188
		2189	($self->{tex}{w}, $self->{tex}{h})
		2190	}
		2191
		2192	sub _draw {
		2193	my ($self) = @_;
		2194
		2195	my $tex = $self->{tex};
		2196
		2197	my ($w, $h) = ($self->{w}, $self->{h});
		2198
		2199	if ($self->{rot90}) {
		2200	glRotate 90, 0, 0, 1;
		2201	glTranslate 0, -$self->{w}, 0;
		2202
		2203	($w, $h) = ($h, $w);
		2204	}
		2205
		2206	glEnable GL_TEXTURE_2D;
		2207	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2208
		2209	$tex->draw_quad (0, 0, $w, $h);
		2210
		2211	glDisable GL_TEXTURE_2D;
		2212	}
		2213
		2214	#############################################################################
		2215
2008	package CFClient::UI::ImageButton;	2216	package CFPlus::UI::ImageButton;
2009		2217
2010	our @ISA = CFClient::UI::Image::;	2218	our @ISA = CFPlus::UI::Image::;
2011		2219
2012	use CFClient::OpenGL;	2220	use CFPlus::OpenGL;
2013		2221
2014	my %textures;	2222	my %textures;
2015		2223
2016	sub new {	2224	sub new {
2017	my $class = shift;	2225	my $class = shift;
…		…
2039	1	2247	1
2040	}	2248	}
2041		2249
2042	#############################################################################	2250	#############################################################################
2043		2251
2044	package CFClient::UI::CheckBox;
2045
2046	our @ISA = CFClient::UI::DrawBG::;
2047
2048	my @tex =
2049	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2050	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2051
2052	use CFClient::OpenGL;
2053
2054	sub new {
2055	my $class = shift;
2056
2057	$class->SUPER::new (
2058	padding_x => 2,
2059	padding_y => 2,
2060	fg => [1, 1, 1],
2061	active_fg => [1, 1, 0],
2062	bg => [0, 0, 0, 0.2],
2063	active_bg => [1, 1, 1, 0.5],
2064	state => 0,
2065	can_hover => 1,
2066	@_
2067	)
2068	}
2069
2070	sub size_request {
2071	my ($self) = @_;
2072
2073	(6) x 2
2074	}
2075
2076	sub toggle {
2077	my ($self) = @_;
2078
2079	$self->{state} = !$self->{state};
2080	$self->emit (changed => $self->{state});
2081	$self->update;
2082	}
2083
2084	sub invoke_button_down {
2085	my ($self, $ev, $x, $y) = @_;
2086
2087	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2088	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2089	$self->toggle;
2090	} else {
2091	return 0
2092	}
2093
2094	1
2095	}
2096
2097	sub _draw {
2098	my ($self) = @_;
2099
2100	$self->SUPER::_draw;
2101
2102	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2103
2104	my ($w, $h) = @$self{qw(w h)};
2105
2106	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2107
2108	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2109
2110	my $tex = $self->{state} ? $tex[1] : $tex[0];
2111
2112	glEnable GL_TEXTURE_2D;
2113	$tex->draw_quad_alpha (0, 0, $s, $s);
2114	glDisable GL_TEXTURE_2D;
2115	}
2116
2117	#############################################################################
2118
2119	package CFClient::UI::Image;	2252	package CFPlus::UI::VGauge;
2120		2253
2121	our @ISA = CFClient::UI::Base::;	2254	our @ISA = CFPlus::UI::Base::;
2122
2123	use CFClient::OpenGL;
2124
2125	our %texture_cache;
2126
2127	sub new {
2128	my $class = shift;
2129
2130	my $self = $class->SUPER::new (
2131	can_events => 0,
2132	@_,
2133	);
2134
2135	$self->{path} \|\| $self->{tex}
2136	or Carp::croak "'path' or 'tex' attributes required";
2137
2138	$self->{tex} \|\|= $texture_cache{$self->{path}} \|\|=
2139	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2140
2141	Scalar::Util::weaken $texture_cache{$self->{path}};
2142
2143	$self->{aspect} \|\|= $self->{tex}{w} / $self->{tex}{h};
2144
2145	$self
2146	}
2147
2148	sub size_request {
2149	my ($self) = @_;
2150
2151	($self->{tex}{w}, $self->{tex}{h})
2152	}
2153
2154	sub _draw {
2155	my ($self) = @_;
2156
2157	my $tex = $self->{tex};
2158
2159	my ($w, $h) = ($self->{w}, $self->{h});
2160
2161	if ($self->{rot90}) {
2162	glRotate 90, 0, 0, 1;
2163	glTranslate 0, -$self->{w}, 0;
2164
2165	($w, $h) = ($h, $w);
2166	}
2167
2168	glEnable GL_TEXTURE_2D;
2169	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170
2171	$tex->draw_quad_alpha (0, 0, $w, $h);
2172
2173	glDisable GL_TEXTURE_2D;
2174	}
2175
2176	#############################################################################
2177
2178	package CFClient::UI::VGauge;
2179
2180	our @ISA = CFClient::UI::Base::;
2181		2255
2182	use List::Util qw(min max);	2256	use List::Util qw(min max);
2183		2257
2184	use CFClient::OpenGL;	2258	use CFPlus::OpenGL;
2185		2259
2186	my %tex = (	2260	my %tex = (
2187	food => [	2261	food => [
2188	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2262	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2263	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2190	],	2264	],
2191	grace => [	2265	grace => [
2192	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2266	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2193	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2267	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2194	],	2268	],
2195	hp => [	2269	hp => [
2196	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2270	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2197	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2271	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2198	],	2272	],
2199	mana => [	2273	mana => [
2200	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2274	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2201	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2275	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2202	],	2276	],
2203	);	2277	);
2204		2278
2205	# eg. VGauge->new (gauge => 'food'), default gauge: food	2279	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2308	glDisable GL_TEXTURE_2D;	2382	glDisable GL_TEXTURE_2D;
2309	}	2383	}
2310		2384
2311	#############################################################################	2385	#############################################################################
2312		2386
2313	package CFClient::UI::Gauge;	2387	package CFPlus::UI::Gauge;
2314		2388
2315	our @ISA = CFClient::UI::VBox::;	2389	our @ISA = CFPlus::UI::VBox::;
2316		2390
2317	sub new {	2391	sub new {
2318	my ($class, %arg) = @_;	2392	my ($class, %arg) = @_;
2319		2393
2320	my $self = $class->SUPER::new (	2394	my $self = $class->SUPER::new (
…		…
2322	can_hover => 1,	2396	can_hover => 1,
2323	can_events => 1,	2397	can_events => 1,
2324	%arg,	2398	%arg,
2325	);	2399	);
2326		2400
2327	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2401	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2328	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2402	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2329	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2403	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2330		2404
2331	$self	2405	$self
2332	}	2406	}
2333		2407
2334	sub set_fontsize {	2408	sub set_fontsize {
…		…
2355	$self->{value}->set_text ($val);	2429	$self->{value}->set_text ($val);
2356	}	2430	}
2357		2431
2358	#############################################################################	2432	#############################################################################
2359		2433
2360	package CFClient::UI::Slider;	2434	package CFPlus::UI::Slider;
2361		2435
2362	use strict;	2436	use strict;
2363		2437
2364	use CFClient::OpenGL;	2438	use CFPlus::OpenGL;
2365		2439
2366	our @ISA = CFClient::UI::DrawBG::;	2440	our @ISA = CFPlus::UI::DrawBG::;
2367		2441
2368	my @tex =	2442	my @tex =
2369	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2443	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2370	qw(s1_slider.png s1_slider_bg.png);	2444	qw(s1_slider.png s1_slider_bg.png);
2371		2445
2372	sub new {	2446	sub new {
2373	my $class = shift;	2447	my $class = shift;
2374		2448
…		…
2463	}	2537	}
2464		2538
2465	1	2539	1
2466	}	2540	}
2467		2541
		2542	sub invoke_mouse_wheel {
		2543	my ($self, $ev) = @_;
		2544
		2545	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2546
		2547	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2548
		2549	! ! $delta
		2550	}
		2551
2468	sub update {	2552	sub update {
2469	my ($self) = @_;	2553	my ($self) = @_;
2470		2554
2471	delete $self->{knob_w};	2555	delete $self->{knob_w};
2472	$self->SUPER::update;	2556	$self->SUPER::update;
…		…
2519	glDisable GL_TEXTURE_2D;	2603	glDisable GL_TEXTURE_2D;
2520	}	2604	}
2521		2605
2522	#############################################################################	2606	#############################################################################
2523		2607
2524	package CFClient::UI::ValSlider;	2608	package CFPlus::UI::ValSlider;
2525		2609
2526	our @ISA = CFClient::UI::HBox::;	2610	our @ISA = CFPlus::UI::HBox::;
2527		2611
2528	sub new {	2612	sub new {
2529	my ($class, %arg) = @_;	2613	my ($class, %arg) = @_;
2530		2614
2531	my $range = delete $arg{range};	2615	my $range = delete $arg{range};
2532		2616
2533	my $self = $class->SUPER::new (	2617	my $self = $class->SUPER::new (
2534	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2618	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2535	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2619	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2536	to_value => sub { shift },	2620	to_value => sub { shift },
2537	from_value => sub { shift },	2621	from_value => sub { shift },
2538	%arg,	2622	%arg,
2539	);	2623	);
2540		2624
…		…
2560	sub set_range { shift->{slider}->set_range (@_) }	2644	sub set_range { shift->{slider}->set_range (@_) }
2561	sub set_value { shift->{slider}->set_value (@_) }	2645	sub set_value { shift->{slider}->set_value (@_) }
2562		2646
2563	#############################################################################	2647	#############################################################################
2564		2648
2565	package CFClient::UI::TextScroller;	2649	package CFPlus::UI::TextScroller;
2566		2650
2567	our @ISA = CFClient::UI::HBox::;	2651	our @ISA = CFPlus::UI::HBox::;
2568		2652
2569	use CFClient::OpenGL;	2653	use CFPlus::OpenGL;
2570		2654
2571	sub new {	2655	sub new {
2572	my $class = shift;	2656	my $class = shift;
2573		2657
2574	my $self = $class->SUPER::new (	2658	my $self = $class->SUPER::new (
2575	fontsize => 1,	2659	fontsize => 1,
2576	can_events => 0,	2660	can_events => 1,
2577	indent => 0,	2661	indent => 0,
2578	#font => default_font	2662	#font => default_font
2579	@_,	2663	@_,
2580		2664
2581	layout => (new CFClient::Layout),	2665	layout => (new CFPlus::Layout),
2582	par => [],	2666	par => [],
2583	height => 0,	2667	height => 0,
2584	children => [	2668	children => [
2585	(new CFClient::UI::Empty expand => 1),	2669	(new CFPlus::UI::Empty expand => 1),
2586	(new CFClient::UI::Slider vertical => 1),	2670	(new CFPlus::UI::Slider vertical => 1),
2587	],	2671	],
2588	);	2672	);
2589		2673
2590	$self->{children}[1]->connect (changed => sub { $self->update });	2674	$self->{children}[1]->connect (changed => sub { $self->update });
2591		2675
…		…
2621		2705
2622	$self->reflow;	2706	$self->reflow;
2623		2707
2624	local $self->{children} = [$empty, $slider];	2708	local $self->{children} = [$empty, $slider];
2625	$self->SUPER::invoke_size_allocate ($w, $h)	2709	$self->SUPER::invoke_size_allocate ($w, $h)
		2710	}
		2711
		2712	sub invoke_mouse_wheel {
		2713	my ($self, $ev) = @_;
		2714
		2715	return 0 unless $ev->{dy}; # only vertical movements
		2716
		2717	$self->{children}[1]->emit (mouse_wheel => $ev);
		2718
		2719	1
2626	}	2720	}
2627		2721
2628	sub get_layout {	2722	sub get_layout {
2629	my ($self, $para) = @_;	2723	my ($self, $para) = @_;
2630		2724
…		…
2670	$self->{height} = 0;	2764	$self->{height} = 0;
2671	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2765	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2672	}	2766	}
2673		2767
2674	sub add_paragraph {	2768	sub add_paragraph {
2675	my ($self, $color, $para, $indent) = @_;	2769	my $self = shift;
2676		2770
2677	my ($text, @w) = ref $para ? @$para : $para;	2771	for my $para (@_) {
2678
2679	$para = {	2772	$para = {
		2773	fg => [1, 1, 1, 1],
		2774	indent => 0,
		2775	markup => "",
		2776	widget => [],
		2777	ref $para ? %$para : (markup => $para),
2680	w => 1e10,	2778	w => 1e10,
2681	wrapped => 1,	2779	wrapped => 1,
2682	fg => $color,
2683	indent => $indent,
2684	markup => $text,
2685	widget => \@w,
2686	};	2780	};
2687		2781
2688	$self->add (@w) if @w;	2782	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2689	push @{$self->{par}}, $para;	2783	push @{$self->{par}}, $para;
		2784	}
2690		2785
2691	$self->{need_reflow}++;	2786	$self->{need_reflow}++;
2692	$self->update;	2787	$self->update;
2693	}	2788	}
2694		2789
…		…
2736		2831
2737	if (delete $self->{scroll_to_bottom}) {	2832	if (delete $self->{scroll_to_bottom}) {
2738	$self->{children}[1]->set_value (1e10);	2833	$self->{children}[1]->set_value (1e10);
2739	}	2834	}
2740		2835
2741	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2836	$self->{texture} \|\|= new_from_opengl CFPlus::Texture $W, $H, sub {
2742	glClearColor 0, 0, 0, 0;	2837	glClearColor 0, 0, 0, 0;
2743	glClear GL_COLOR_BUFFER_BIT;	2838	glClear GL_COLOR_BUFFER_BIT;
2744		2839
2745	my $top = int $self->{children}[1]{range}[0];	2840	my $top = int $self->{children}[1]{range}[0];
2746		2841
…		…
2799	$self->{children}[1]->draw;	2894	$self->{children}[1]->draw;
2800	}	2895	}
2801		2896
2802	#############################################################################	2897	#############################################################################
2803		2898
2804	package CFClient::UI::Animator;	2899	package CFPlus::UI::Animator;
2805		2900
2806	use CFClient::OpenGL;	2901	use CFPlus::OpenGL;
2807		2902
2808	our @ISA = CFClient::UI::Bin::;	2903	our @ISA = CFPlus::UI::Bin::;
2809		2904
2810	sub moveto {	2905	sub moveto {
2811	my ($self, $x, $y) = @_;	2906	my ($self, $x, $y) = @_;
2812		2907
2813	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2908	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2841	glPopMatrix;	2936	glPopMatrix;
2842	}	2937	}
2843		2938
2844	#############################################################################	2939	#############################################################################
2845		2940
2846	package CFClient::UI::Flopper;	2941	package CFPlus::UI::Flopper;
2847		2942
2848	our @ISA = CFClient::UI::Button::;	2943	our @ISA = CFPlus::UI::Button::;
2849		2944
2850	sub new {	2945	sub new {
2851	my $class = shift;	2946	my $class = shift;
2852		2947
2853	my $self = $class->SUPER::new (	2948	my $self = $class->SUPER::new (
…		…
2865	$self->{other}->toggle_visibility;	2960	$self->{other}->toggle_visibility;
2866	}	2961	}
2867		2962
2868	#############################################################################	2963	#############################################################################
2869		2964
2870	package CFClient::UI::Tooltip;	2965	package CFPlus::UI::Tooltip;
2871		2966
2872	our @ISA = CFClient::UI::Bin::;	2967	our @ISA = CFPlus::UI::Bin::;
2873		2968
2874	use CFClient::OpenGL;	2969	use CFPlus::OpenGL;
2875		2970
2876	sub new {	2971	sub new {
2877	my $class = shift;	2972	my $class = shift;
2878		2973
2879	$class->SUPER::new (	2974	$class->SUPER::new (
…		…
2882	)	2977	)
2883	}	2978	}
2884		2979
2885	sub set_tooltip_from {	2980	sub set_tooltip_from {
2886	my ($self, $widget) = @_;	2981	my ($self, $widget) = @_;
		2982
		2983	$widget->{tooltip} = CFPlus::Pod::as_label CFPlus::Pod::section tooltip => $1
		2984	if $widget->{tooltip} =~ /^#(.*)$/;
2887		2985
2888	my $tooltip = $widget->{tooltip};	2986	my $tooltip = $widget->{tooltip};
2889		2987
2890	if ($ENV{CFPLUS_DEBUG} & 2) {	2988	if ($ENV{CFPLUS_DEBUG} & 2) {
2891	$tooltip .= "\n\n" . (ref $widget) . "\n"	2989	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2895	}	2993	}
2896		2994
2897	$tooltip =~ s/^\n+//;	2995	$tooltip =~ s/^\n+//;
2898	$tooltip =~ s/\n+$//;	2996	$tooltip =~ s/\n+$//;
2899		2997
2900	$self->add (new CFClient::UI::Label	2998	$self->add (new CFPlus::UI::Label
2901	markup => $tooltip,	2999	markup => $tooltip,
2902	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	3000	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
2903	fontsize => 0.8,	3001	fontsize => 0.8,
2904	fg => [0, 0, 0, 1],	3002	fg => [0, 0, 0, 1],
2905	ellipsise => 0,	3003	ellipsise => 0,
…		…
2928		3026
2929	$self->{root}->on_post_alloc ("move_$self" => sub {	3027	$self->{root}->on_post_alloc ("move_$self" => sub {
2930	my $widget = $self->{owner}	3028	my $widget = $self->{owner}
2931	or return;	3029	or return;
2932		3030
		3031	if ($widget->{visible}) {
2933	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3032	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2934		3033
2935	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3034	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2936	if $x + $self->{w} > $self->{root}{w};	3035	if $x + $self->{w} > $self->{root}{w};
2937		3036
2938	$self->move_abs ($x, $y);	3037	$self->move_abs ($x, $y);
		3038	} else {
		3039	$self->hide;
		3040	}
2939	});	3041	});
2940	}	3042	}
2941		3043
2942	sub _draw {	3044	sub _draw {
2943	my ($self) = @_;	3045	my ($self) = @_;
…		…
2967	$self->SUPER::_draw;	3069	$self->SUPER::_draw;
2968	}	3070	}
2969		3071
2970	#############################################################################	3072	#############################################################################
2971		3073
2972	package CFClient::UI::Face;	3074	package CFPlus::UI::Face;
2973		3075
2974	our @ISA = CFClient::UI::Base::;	3076	our @ISA = CFPlus::UI::DrawBG::;
2975		3077
2976	use CFClient::OpenGL;	3078	use CFPlus::OpenGL;
2977		3079
2978	sub new {	3080	sub new {
2979	my $class = shift;	3081	my $class = shift;
2980		3082
2981	my $self = $class->SUPER::new (	3083	my $self = $class->SUPER::new (
…		…
3016	sub _draw {	3118	sub _draw {
3017	my ($self) = @_;	3119	my ($self) = @_;
3018		3120
3019	return unless $::CONN;	3121	return unless $::CONN;
3020		3122
		3123	$self->SUPER::_draw;
		3124
3021	my $face;	3125	my $face;
3022		3126
3023	if ($self->{frame}) {	3127	if ($self->{frame}) {
3024	my $anim = $::CONN->{anim}[$self->{anim}];	3128	my $anim = $::CONN->{anim}[$self->{anim}];
3025		3129
…		…
3047	$self->SUPER::destroy;	3151	$self->SUPER::destroy;
3048	}	3152	}
3049		3153
3050	#############################################################################	3154	#############################################################################
3051		3155
3052	package CFClient::UI::Buttonbar;	3156	package CFPlus::UI::Buttonbar;
3053		3157
3054	our @ISA = CFClient::UI::HBox::;	3158	our @ISA = CFPlus::UI::HBox::;
3055		3159
3056	# TODO: should actualyl wrap buttons and other goodies.	3160	# TODO: should actualyl wrap buttons and other goodies.
3057		3161
3058	#############################################################################	3162	#############################################################################
3059		3163
3060	package CFClient::UI::Menu;	3164	package CFPlus::UI::Menu;
3061		3165
3062	our @ISA = CFClient::UI::FancyFrame::;	3166	our @ISA = CFPlus::UI::FancyFrame::;
3063		3167
3064	use CFClient::OpenGL;	3168	use CFPlus::OpenGL;
3065		3169
3066	sub new {	3170	sub new {
3067	my $class = shift;	3171	my $class = shift;
3068		3172
3069	my $self = $class->SUPER::new (	3173	my $self = $class->SUPER::new (
3070	items => [],	3174	items => [],
3071	z => 100,	3175	z => 100,
3072	@_,	3176	@_,
3073	);	3177	);
3074		3178
3075	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3179	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3076		3180
3077	for my $item (@{ $self->{items} }) {	3181	for my $item (@{ $self->{items} }) {
3078	my ($widget, $cb, $tooltip) = @$item;	3182	my ($widget, $cb, $tooltip) = @$item;
3079		3183
3080	# handle various types of items, only text for now	3184	# handle various types of items, only text for now
3081	if (!ref $widget) {	3185	if (!ref $widget) {
3082	if ($widget =~ /\t/) {	3186	if ($widget =~ /\t/) {
3083	my ($left, $right) = split /\t/, $widget, 2;	3187	my ($left, $right) = split /\t/, $widget, 2;
3084		3188
3085	$widget = new CFClient::UI::HBox	3189	$widget = new CFPlus::UI::HBox
3086	can_hover => 1,	3190	can_hover => 1,
3087	can_events => 1,	3191	can_events => 1,
3088	tooltip => $tooltip,	3192	tooltip => $tooltip,
3089	children => [	3193	children => [
3090	(new CFClient::UI::Label markup => $left, expand => 1),	3194	(new CFPlus::UI::Label markup => $left, expand => 1),
3091	(new CFClient::UI::Label markup => $right, align => +1),	3195	(new CFPlus::UI::Label markup => $right, align => +1),
3092	],	3196	],
3093	;	3197	;
3094		3198
3095	} else {	3199	} else {
3096	$widget = new CFClient::UI::Label	3200	$widget = new CFPlus::UI::Label
3097	can_hover => 1,	3201	can_hover => 1,
3098	can_events => 1,	3202	can_events => 1,
3099	markup => $widget,	3203	markup => $widget,
3100	tooltip => $tooltip;	3204	tooltip => $tooltip;
3101	}	3205	}
…		…
3149	1	3253	1
3150	}	3254	}
3151		3255
3152	#############################################################################	3256	#############################################################################
3153		3257
3154	package CFClient::UI::Multiplexer;	3258	package CFPlus::UI::Multiplexer;
3155		3259
3156	our @ISA = CFClient::UI::Container::;	3260	our @ISA = CFPlus::UI::Container::;
3157		3261
3158	sub new {	3262	sub new {
3159	my $class = shift;	3263	my $class = shift;
3160		3264
3161	my $self = $class->SUPER::new (	3265	my $self = $class->SUPER::new (
…		…
3222	$self->{current}->draw;	3326	$self->{current}->draw;
3223	}	3327	}
3224		3328
3225	#############################################################################	3329	#############################################################################
3226		3330
3227	package CFClient::UI::Notebook;	3331	package CFPlus::UI::Notebook;
3228		3332
3229	our @ISA = CFClient::UI::VBox::;	3333	our @ISA = CFPlus::UI::VBox::;
3230		3334
3231	sub new {	3335	sub new {
3232	my $class = shift;	3336	my $class = shift;
3233		3337
3234	my $self = $class->SUPER::new (	3338	my $self = $class->SUPER::new (
3235	buttonbar => (new CFClient::UI::Buttonbar),	3339	buttonbar => (new CFPlus::UI::Buttonbar),
3236	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3340	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3237	# filter => # will be put between multiplexer and $self	3341	# filter => # will be put between multiplexer and $self
3238	@_,	3342	@_,
3239	);	3343	);
3240		3344
3241	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3345	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3247	sub add {	3351	sub add {
3248	my ($self, $title, $widget, $tooltip) = @_;	3352	my ($self, $title, $widget, $tooltip) = @_;
3249		3353
3250	Scalar::Util::weaken $self;	3354	Scalar::Util::weaken $self;
3251		3355
3252	$self->{buttonbar}->add (new CFClient::UI::Button	3356	$self->{buttonbar}->add (new CFPlus::UI::Button
3253	markup => $title,	3357	markup => $title,
3254	tooltip => $tooltip,	3358	tooltip => $tooltip,
3255	on_activate => sub { $self->set_current_page ($widget) },	3359	on_activate => sub { $self->set_current_page ($widget) },
3256	);	3360	);
3257		3361
…		…
3271	$self->emit (page_changed => $self->{multiplexer}{current});	3375	$self->emit (page_changed => $self->{multiplexer}{current});
3272	}	3376	}
3273		3377
3274	#############################################################################	3378	#############################################################################
3275		3379
3276	package CFClient::UI::Combobox;	3380	package CFPlus::UI::Selector;
3277		3381
3278	use utf8;	3382	use utf8;
3279		3383
3280	our @ISA = CFClient::UI::Button::;	3384	our @ISA = CFPlus::UI::Button::;
3281		3385
3282	sub new {	3386	sub new {
3283	my $class = shift;	3387	my $class = shift;
3284		3388
3285	my $self = $class->SUPER::new (	3389	my $self = $class->SUPER::new (
…		…
3302	my ($value, $title, $tooltip) = @$_;	3406	my ($value, $title, $tooltip) = @$_;
3303		3407
3304	push @menu_items, [$tooltip \|\| $title, sub { $self->set_value ($value) }];	3408	push @menu_items, [$tooltip \|\| $title, sub { $self->set_value ($value) }];
3305	}	3409	}
3306		3410
3307	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3411	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308	}	3412	}
3309		3413
3310	sub _set_value {	3414	sub _set_value {
3311	my ($self, $value) = @_;	3415	my ($self, $value) = @_;
3312		3416
…		…
3327	$self->emit (changed => $value);	3431	$self->emit (changed => $value);
3328	}	3432	}
3329		3433
3330	#############################################################################	3434	#############################################################################
3331		3435
3332	package CFClient::UI::Statusbox;	3436	package CFPlus::UI::Statusbox;
3333		3437
3334	our @ISA = CFClient::UI::VBox::;	3438	our @ISA = CFPlus::UI::VBox::;
3335		3439
3336	sub new {	3440	sub new {
3337	my $class = shift;	3441	my $class = shift;
3338		3442
3339	my $self = $class->SUPER::new (	3443	my $self = $class->SUPER::new (
…		…
3351	sub reorder {	3455	sub reorder {
3352	my ($self) = @_;	3456	my ($self) = @_;
3353	my $NOW = Time::HiRes::time;	3457	my $NOW = Time::HiRes::time;
3354		3458
3355	# freeze display when hovering over any label	3459	# freeze display when hovering over any label
3356	return if $CFClient::UI::TOOLTIP->{owner}	3460	return if $CFPlus::UI::TOOLTIP->{owner}
3357	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3461	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3358	values %{ $self->{item} };	3462	values %{ $self->{item} };
3359		3463
3360	while (my ($k, $v) = each %{ $self->{item} }) {	3464	while (my ($k, $v) = each %{ $self->{item} }) {
3361	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3465	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3362	}	3466	}
…		…
3383	for ($short) {	3487	for ($short) {
3384	s/^\s+//;	3488	s/^\s+//;
3385	s/\s+/ /g;	3489	s/\s+/ /g;
3386	}	3490	}
3387		3491
3388	new CFClient::UI::Label	3492	new CFPlus::UI::Label
3389	markup => $short,	3493	markup => $short,
3390	tooltip => $item->{tooltip},	3494	tooltip => $item->{tooltip},
3391	tooltip_font => $::FONT_PROP,	3495	tooltip_font => $::FONT_PROP,
3392	tooltip_width => 0.67,	3496	tooltip_width => 0.67,
3393	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3497	fontsize => $item->{fontsize} \|\| $self->{fontsize},
…		…
3472	$self->SUPER::destroy;	3576	$self->SUPER::destroy;
3473	}	3577	}
3474		3578
3475	#############################################################################	3579	#############################################################################
3476		3580
3477	package CFClient::UI::Inventory;	3581	package CFPlus::UI::Inventory;
3478		3582
3479	our @ISA = CFClient::UI::Table::;	3583	our @ISA = CFPlus::UI::Table::;
3480		3584
3481	sub new {	3585	sub new {
3482	my $class = shift;	3586	my $class = shift;
3483		3587
3484	my $self = $class->SUPER::new (	3588	my $self = $class->SUPER::new (
3485	col_expand => [0, 1, 0],	3589	col_expand => [0, 1, 0],
		3590	items => [],
3486	@_,	3591	@_,
3487	);	3592	);
3488		3593
		3594	$self->set_sort_order (undef);
		3595
3489	$self	3596	$self
		3597	}
		3598
		3599	sub update_items {
		3600	my ($self) = @_;
		3601
		3602	$self->clear;
		3603
		3604	my @item = $self->{sort}->(@{ $self->{items} });
		3605
		3606	my @adds;
		3607	my $row = 0;
		3608	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3609	CFPlus::Item::update_widgets $item;
		3610
		3611	push @adds, 0, $row, $item->{face_widget};
		3612	push @adds, 1, $row, $item->{desc_widget};
		3613	push @adds, 2, $row, $item->{weight_widget};
		3614
		3615	$row++;
		3616	}
		3617
		3618	$self->add (@adds);
		3619	}
		3620
		3621	sub set_sort_order {
		3622	my ($self, $order) = @_;
		3623
		3624	$self->{sort} = $order \|\|= sub {
		3625	sort {
		3626	$a->{type} <=> $b->{type}
		3627	or $a->{name} cmp $b->{name}
		3628	} @_
		3629	};
		3630
		3631	$self->update_items;
3490	}	3632	}
3491		3633
3492	sub set_items {	3634	sub set_items {
3493	my ($self, $items) = @_;	3635	my ($self, $items) = @_;
3494		3636
3495	$self->clear;	3637	$self->{items} = [$items ? values %$items : ()];
3496	return unless $items;	3638	$self->update_items;
3497
3498	my @items = sort {
3499	($a->{type} <=> $b->{type})
3500	or ($a->{name} cmp $b->{name})
3501	} values %$items;
3502
3503	$self->{real_items} = \@items;
3504
3505	my $row = 0;
3506	for my $item (@items) {
3507	CFClient::Item::update_widgets $item;
3508
3509	$self->add (0, $row, $item->{face_widget});
3510	$self->add (1, $row, $item->{desc_widget});
3511	$self->add (2, $row, $item->{weight_widget});
3512
3513	$row++;
3514	}
3515	}	3639	}
3516		3640
3517	#############################################################################	3641	#############################################################################
3518		3642
3519	package CFClient::UI::SpellList;	3643	package CFPlus::UI::SpellList;
3520		3644
3521	our @ISA = CFClient::UI::Table::;	3645	our @ISA = CFPlus::UI::Table::;
3522		3646
3523	sub new {	3647	sub new {
3524	my $class = shift;	3648	my $class = shift;
3525		3649
3526	my $self = $class->SUPER::new (	3650	my $self = $class->SUPER::new (
…		…
3544	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3668	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3545		3669
3546	sub rebuild_spell_list {	3670	sub rebuild_spell_list {
3547	my ($self) = @_;	3671	my ($self) = @_;
3548		3672
3549	$CFClient::UI::ROOT->on_refresh ($self => sub {	3673	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3550	$self->clear;	3674	$self->clear;
3551		3675
3552	return unless $::CONN;	3676	return unless $::CONN;
3553		3677
3554	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3678	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3555	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3679	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3556	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3680	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3557	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3681	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3558	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3682	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3559		3683
3560	my $row = 0;	3684	my $row = 0;
3561		3685
3562	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3686	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3563	my $spell = $self->{spell}{$_};	3687	my $spell = $self->{spell}{$_};
…		…
3570	if ($ev->{button} == 1) {	3694	if ($ev->{button} == 1) {
3571	$::CONN->user_send ("cast $spell->{name}");	3695	$::CONN->user_send ("cast $spell->{name}");
3572	} elsif ($ev->{button} == 2) {	3696	} elsif ($ev->{button} == 2) {
3573	$::CONN->user_send ("invoke $spell->{name}");	3697	$::CONN->user_send ("invoke $spell->{name}");
3574	} elsif ($ev->{button} == 3) {	3698	} elsif ($ev->{button} == 3) {
3575	(new CFClient::UI::Menu	3699	(new CFPlus::UI::Menu
3576	items => [	3700	items => [
3577	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3701	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3578	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3702	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3579	],	3703	],
3580	)->popup ($ev);	3704	)->popup ($ev);
…		…
3586	};	3710	};
3587		3711
3588	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3712	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3589		3713
3590	#TODO: add path info to tooltip	3714	#TODO: add path info to tooltip
3591	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3715	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3592		3716
3593	$self->add (0, $row, new CFClient::UI::Face	3717	$self->add (0, $row, new CFPlus::UI::Face
3594	face => $spell->{face},	3718	face => $spell->{face},
3595	can_hover => 1,	3719	can_hover => 1,
3596	can_events => 1,	3720	can_events => 1,
3597	tooltip => $tooltip,	3721	tooltip => $tooltip,
3598	on_button_down => $spell_cb,	3722	on_button_down => $spell_cb,
3599	);	3723	);
3600		3724
3601	$self->add (1, $row, new CFClient::UI::Label	3725	$self->add (1, $row, new CFPlus::UI::Label
3602	expand => 1,	3726	expand => 1,
3603	text => $spell->{name},	3727	text => $spell->{name},
3604	can_hover => 1,	3728	can_hover => 1,
3605	can_events => 1,	3729	can_events => 1,
3606	tooltip => $tooltip,	3730	tooltip => $tooltip,
3607	on_button_down => $spell_cb,	3731	on_button_down => $spell_cb,
3608	);	3732	);
3609		3733
3610	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3734	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3611	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3735	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3612	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} \|\| $spell->{grace}, @TOOLTIP_SP);	3736	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} \|\| $spell->{grace}, @TOOLTIP_SP);
3613	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3737	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3614	}	3738	}
3615	});	3739	});
3616	}	3740	}
3617		3741
3618	sub add_spell {	3742	sub add_spell {
…		…
3636	$self->rebuild_spell_list;	3760	$self->rebuild_spell_list;
3637	}	3761	}
3638		3762
3639	#############################################################################	3763	#############################################################################
3640		3764
3641	package CFClient::UI::Root;	3765	package CFPlus::UI::Root;
3642		3766
3643	our @ISA = CFClient::UI::Container::;	3767	our @ISA = CFPlus::UI::Container::;
3644		3768
3645	use List::Util qw(min max);	3769	use List::Util qw(min max);
3646		3770
3647	use CFClient::OpenGL;	3771	use CFPlus::OpenGL;
3648		3772
3649	sub new {	3773	sub new {
3650	my $class = shift;	3774	my $class = shift;
3651		3775
3652	my $self = $class->SUPER::new (	3776	my $self = $class->SUPER::new (
…		…
3831	$h = 0 if $h < 0;	3955	$h = 0 if $h < 0;
3832		3956
3833	$w = max $widget->{min_w}, $w;	3957	$w = max $widget->{min_w}, $w;
3834	$h = max $widget->{min_h}, $h;	3958	$h = max $widget->{min_h}, $h;
3835		3959
		3960	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3961	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3962
3836	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	3963	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	3964	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838		3965
3839	$w = int $w + 0.5;	3966	$w = int $w + 0.5;
3840	$h = int $h + 0.5;	3967	$h = int $h + 0.5;
…		…
3866	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3993	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3867	glMatrixMode GL_MODELVIEW;	3994	glMatrixMode GL_MODELVIEW;
3868	glLoadIdentity;	3995	glLoadIdentity;
3869		3996
3870	{	3997	{
3871	package CFClient::UI::Base;	3998	package CFPlus::UI::Base;
3872		3999
3873	($draw_x, $draw_y, $draw_w, $draw_h) =	4000	($draw_x, $draw_y, $draw_w, $draw_h) =
3874	(0, 0, $self->{w}, $self->{h});	4001	(0, 0, $self->{w}, $self->{h});
3875	}	4002	}
3876		4003
3877	$self->_draw;	4004	$self->_draw;
3878	}	4005	}
3879		4006
3880	#############################################################################	4007	#############################################################################
3881		4008
3882	package CFClient::UI;	4009	package CFPlus::UI;
3883		4010
3884	$ROOT = new CFClient::UI::Root;	4011	$ROOT = new CFPlus::UI::Root;
3885	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4012	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3886		4013
3887	1	4014	1
3888		4015

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.328 by root, Sat Jul 22 13:43:05 2006 UTC vs. Revision 1.341 by root, Sun Aug 13 03:20:56 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.328 by root, Sat Jul 22 13:43:05 2006 UTC vs.
Revision 1.341 by root, Sun Aug 13 03:20:56 2006 UTC