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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.329 by root, Sun Jul 23 02:44:06 2006 UTC vs. Revision 1.340 by root, Sun Jul 30 13:16:44 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.340 by root, Sun Jul 30 13:16:44 2006 UTC