ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.319 by root, Sun Jul 2 21:07:26 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) = @_;
418		442
		443	Carp::confess unless $self->{parent};#d#
		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 {
423	my ($self) = @_;	449	my ($self) = @_;
…		…
452		478
453	$FOCUS->emit ("focus_out") if $FOCUS;	479	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	480	$self->emit ("focus_in");
455	}	481	}
456		482
457	sub invoke_mouse_motion { 1 }	483	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	484	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	485	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	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;
466		493
467	1	494	0
468	}	495	}
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
		525	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		526
479	#d##TODO# stop propagating at first true, do not use sum	527	#d##TODO# stop propagating at first true, do not use sum
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	529	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483	}	531	}
484		532
485	sub find_widget {	533	sub find_widget {
486	my ($self, $x, $y) = @_;	534	my ($self, $x, $y) = @_;
487		535
…		…
571	glVertex $self->{w} - 1, 0;	619	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	620	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	621	glVertex 0 , $self->{h} - 1;
574	glEnd;	622	glEnd;
575	glPopMatrix;	623	glPopMatrix;
576	#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;
577	}	625	}
578		626
579	$self->_draw;	627	$self->_draw;
580	glPopMatrix;	628	glPopMatrix;
581	}	629	}
…		…
587	}	635	}
588		636
589	sub DESTROY {	637	sub DESTROY {
590	my ($self) = @_;	638	my ($self) = @_;
591		639
		640	return if CFPlus::in_destruct;
		641
592	delete $WIDGET{$self+0};	642	delete $WIDGET{$self+0};
593		643
594	eval { $self->destroy };	644	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596	}	646	}
597		647
598	#############################################################################	648	#############################################################################
599		649
600	package CFClient::UI::DrawBG;	650	package CFPlus::UI::DrawBG;
601		651
602	our @ISA = CFClient::UI::Base::;	652	our @ISA = CFPlus::UI::Base::;
603		653
604	use strict;	654	use strict;
605	use CFClient::OpenGL;	655	use CFPlus::OpenGL;
606		656
607	sub new {	657	sub new {
608	my $class = shift;	658	my $class = shift;
609		659
610	# range [value, low, high, page]	660	# range [value, low, high, page]
…		…
641	}	691	}
642	}	692	}
643		693
644	#############################################################################	694	#############################################################################
645		695
646	package CFClient::UI::Empty;	696	package CFPlus::UI::Empty;
647		697
648	our @ISA = CFClient::UI::Base::;	698	our @ISA = CFPlus::UI::Base::;
649		699
650	sub new {	700	sub new {
651	my ($class, %arg) = @_;	701	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	702	$class->SUPER::new (can_events => 0, %arg);
653	}	703	}
…		…
660		710
661	sub draw { }	711	sub draw { }
662		712
663	#############################################################################	713	#############################################################################
664		714
665	package CFClient::UI::Container;	715	package CFPlus::UI::Container;
666		716
667	our @ISA = CFClient::UI::Base::;	717	our @ISA = CFPlus::UI::Base::;
668		718
669	sub new {	719	sub new {
670	my ($class, %arg) = @_;	720	my ($class, %arg) = @_;
671		721
672	my $children = delete $arg{children};	722	my $children = delete $arg{children};
…		…
681	if $children;	731	if $children;
682		732
683	$self	733	$self
684	}	734	}
685		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
686	sub add {	744	sub add {
687	my ($self, @widgets) = @_;	745	my ($self, @widgets) = @_;
688		746
689	$_->set_parent ($self)	747	$_->set_parent ($self)
690	for @widgets;	748	for @widgets;
…		…
750	$_->draw for @{$self->{children}};	808	$_->draw for @{$self->{children}};
751	}	809	}
752		810
753	#############################################################################	811	#############################################################################
754		812
755	package CFClient::UI::Bin;	813	package CFPlus::UI::Bin;
756		814
757	our @ISA = CFClient::UI::Container::;	815	our @ISA = CFPlus::UI::Container::;
758		816
759	sub new {	817	sub new {
760	my ($class, %arg) = @_;	818	my ($class, %arg) = @_;
761		819
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	820	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		821
764	$class->SUPER::new (children => [$child], %arg)	822	$class->SUPER::new (children => [$child], %arg)
765	}	823	}
766		824
767	sub add {	825	sub add {
…		…
774	sub remove {	832	sub remove {
775	my ($self, $widget) = @_;	833	my ($self, $widget) = @_;
776		834
777	$self->SUPER::remove ($widget);	835	$self->SUPER::remove ($widget);
778		836
779	$self->{children} = [new CFClient::UI::Empty]	837	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	838	unless @{$self->{children}};
781	}	839	}
782		840
783	sub child { $_[0]->{children}[0] }	841	sub child { $_[0]->{children}[0] }
784		842
…		…
796		854
797	#############################################################################	855	#############################################################################
798		856
799	# back-buffered drawing area	857	# back-buffered drawing area
800		858
801	package CFClient::UI::Window;	859	package CFPlus::UI::Window;
802		860
803	our @ISA = CFClient::UI::Bin::;	861	our @ISA = CFPlus::UI::Bin::;
804		862
805	use CFClient::OpenGL;	863	use CFPlus::OpenGL;
806		864
807	sub new {	865	sub new {
808	my ($class, %arg) = @_;	866	my ($class, %arg) = @_;
809		867
810	my $self = $class->SUPER::new (%arg);	868	my $self = $class->SUPER::new (%arg);
…		…
832	}	890	}
833		891
834	sub render_child {	892	sub render_child {
835	my ($self) = @_;	893	my ($self) = @_;
836		894
837	$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 {
838	glClearColor 0, 0, 0, 0;	896	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	897	glClear GL_COLOR_BUFFER_BIT;
840		898
841	{	899	{
842	package CFClient::UI::Base;	900	package CFPlus::UI::Base;
843		901
844	($draw_x, $draw_y, $draw_w, $draw_h) =	902	($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	903	(0, 0, $self->{w}, $self->{h});
846	}	904	}
847		905
…		…
866	glDisable GL_TEXTURE_2D;	924	glDisable GL_TEXTURE_2D;
867	}	925	}
868		926
869	#############################################################################	927	#############################################################################
870		928
871	package CFClient::UI::ViewPort;	929	package CFPlus::UI::ViewPort;
872		930
873	our @ISA = CFClient::UI::Window::;	931	our @ISA = CFPlus::UI::Window::;
874		932
875	sub new {	933	sub new {
876	my $class = shift;	934	my $class = shift;
877		935
878	$class->SUPER::new (	936	$class->SUPER::new (
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	998	) {
941	$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})
942	} else {	1000	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1001	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1002	}
945	}	1003	}
946		1004
947	sub _render {	1005	sub _render {
948	my ($self) = @_;	1006	my ($self) = @_;
949		1007
950	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};
951	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};
952		1010
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1011	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1012
955	$self->SUPER::_render;	1013	$self->SUPER::_render;
956	}	1014	}
957		1015
958	#############################################################################	1016	#############################################################################
959		1017
960	package CFClient::UI::ScrolledWindow;	1018	package CFPlus::UI::ScrolledWindow;
961		1019
962	our @ISA = CFClient::UI::HBox::;	1020	our @ISA = CFPlus::UI::HBox::;
963		1021
964	sub new {	1022	sub new {
965	my ($class, %arg) = @_;	1023	my ($class, %arg) = @_;
966		1024
967	my $child = delete $arg{child};	1025	my $child = delete $arg{child};
968		1026
969	my $self;	1027	my $self;
970		1028
971	my $slider = new CFClient::UI::Slider	1029	my $slider = new CFPlus::UI::Slider
972	vertical => 1,	1030	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1031	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1032	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1033	$self->{vp}->set_offset (0, $_[1]);
976	},	1034	},
977	;	1035	;
978		1036
979	$self = $class->SUPER::new (	1037	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1038	vp => (new CFPlus::UI::ViewPort expand => 1),
		1039	can_events => 1,
981	slider => $slider,	1040	slider => $slider,
982	%arg,	1041	%arg,
983	);	1042	);
984		1043
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1044	$self->SUPER::add ($self->{vp}, $self->{slider});
986	$self->add ($child) if $child;	1045	$self->add ($child) if $child;
…		…
994	my ($self, $widget) = @_;	1053	my ($self, $widget) = @_;
995		1054
996	$self->{vp}->add ($self->{child} = $widget);	1055	$self->{vp}->add ($self->{child} = $widget);
997	}	1056	}
998		1057
		1058	sub invoke_mouse_wheel {
		1059	my ($self, $ev) = @_;
		1060
		1061	return 0 unless $ev->{dy}; # only vertical movements
		1062
		1063	$self->{slider}->emit (mouse_wheel => $ev);
		1064
		1065	1
		1066	}
		1067
999	sub update_slider {	1068	sub update_slider {
1000	my ($self) = @_;	1069	my ($self) = @_;
1001		1070
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003	}	1072	}
…		…
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1087	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1088	}
1020		1089
1021	#############################################################################	1090	#############################################################################
1022		1091
1023	package CFClient::UI::Frame;	1092	package CFPlus::UI::Frame;
1024		1093
1025	our @ISA = CFClient::UI::Bin::;	1094	our @ISA = CFPlus::UI::Bin::;
1026		1095
1027	use CFClient::OpenGL;	1096	use CFPlus::OpenGL;
1028		1097
1029	sub new {	1098	sub new {
1030	my $class = shift;	1099	my $class = shift;
1031		1100
1032	$class->SUPER::new (	1101	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1127	$self->SUPER::_draw;
1059	}	1128	}
1060		1129
1061	#############################################################################	1130	#############################################################################
1062		1131
1063	package CFClient::UI::FancyFrame;	1132	package CFPlus::UI::FancyFrame;
1064		1133
1065	our @ISA = CFClient::UI::Bin::;	1134	our @ISA = CFPlus::UI::Bin::;
1066		1135
1067	use CFClient::OpenGL;	1136	use CFPlus::OpenGL;
1068		1137
1069	my $bg =	1138	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1139	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1140	mipmap => 1, wrap => 1;
1072		1141
1073	my @border =	1142	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1143	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	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);
1076		1145
1077	sub new {	1146	sub new {
1078	my ($class, %arg) = @_;	1147	my ($class, %arg) = @_;
1079		1148
1080	my $self = $class->SUPER::new (	1149	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1150	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1151	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1152	border => 0.6,
1084	can_events => 1,	1153	can_events => 1,
1085	min_w => 16,	1154	min_w => 64,
1086	min_h => 16,	1155	min_h => 32,
1087	%arg,	1156	%arg,
1088	);	1157	);
1089		1158
1090	$self->{title_widget} = new CFClient::UI::Label	1159	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1160	align => 0,
1092	valign => 1,	1161	valign => 1,
1093	text => $self->{title},	1162	text => $self->{title},
1094	fontsize => $self->{border},	1163	fontsize => $self->{border},
1095	if exists $self->{title};	1164	if exists $self->{title};
1096		1165
1097	if ($self->{has_close_button}) {	1166	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1167	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1168	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1169	path => 'x1_close.png',
1101	on_activate => sub { $self->emit ("delete") };	1170	on_activate => sub { $self->emit ("delete") };
1102		1171
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1172	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1173	}
1105		1174
1106	$self	1175	$self
1107	}	1176	}
1108		1177
1109	sub add {	1178	sub add {
1110	my ($self, @widgets) = @_;	1179	my ($self, @widgets) = @_;
1111		1180
1112	$self->SUPER::add (@widgets);	1181	$self->SUPER::add (@widgets);
1113	$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};
1114	$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};
1115	}	1184	}
1116		1185
1117	sub border {	1186	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1187	int $_[0]{border} * $::FONTSIZE
1119	}	1188	}
…		…
1227	$self->{motion}->($ev, $x, $y) if $self->{motion};	1296	$self->{motion}->($ev, $x, $y) if $self->{motion};
1228		1297
1229	! ! $self->{motion}	1298	! ! $self->{motion}
1230	}	1299	}
1231		1300
		1301	sub invoke_visibility_change {
		1302	my ($self, $visible) = @_;
		1303
		1304	delete $self->{motion} unless $visible;
		1305
		1306	0
		1307	}
		1308
1232	sub _draw {	1309	sub _draw {
1233	my ($self) = @_;	1310	my ($self) = @_;
1234		1311
1235	my $child = $self->{children}[0];	1312	my $child = $self->{children}[0];
1236		1313
…		…
1273	if $self->{close_button};	1350	if $self->{close_button};
1274	}	1351	}
1275		1352
1276	#############################################################################	1353	#############################################################################
1277		1354
1278	package CFClient::UI::Table;	1355	package CFPlus::UI::Table;
1279		1356
1280	our @ISA = CFClient::UI::Base::;	1357	our @ISA = CFPlus::UI::Base::;
1281		1358
1282	use List::Util qw(max sum);	1359	use List::Util qw(max sum);
1283		1360
1284	use CFClient::OpenGL;	1361	use CFPlus::OpenGL;
1285		1362
1286	sub new {	1363	sub new {
1287	my $class = shift;	1364	my $class = shift;
1288		1365
1289	$class->SUPER::new (	1366	$class->SUPER::new (
…		…
1295	sub children {	1372	sub children {
1296	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1373	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297	}	1374	}
1298		1375
1299	sub add {	1376	sub add {
1300	my ($self, $x, $y, $child) = @_;	1377	my ($self) = shift;
1301		1378
		1379	while (@_) {
		1380	my ($x, $y, $child) = splice @_, 0, 3, ();
1302	$child->set_parent ($self);	1381	$child->set_parent ($self);
1303	$self->{children}[$y][$x] = $child;	1382	$self->{children}[$y][$x] = $child;
		1383	}
1304		1384
		1385	$self->{force_realloc} = 1;
		1386	$self->{force_size_alloc} = 1;
1305	$self->realloc;	1387	$self->realloc;
1306	}	1388	}
1307		1389
1308	sub remove {	1390	sub remove {
1309	my ($self, $child) = @_;	1391	my ($self, $child) = @_;
…		…
1374		1456
1375	# linearly scale sizes	1457	# linearly scale sizes
1376	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1458	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1459	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378		1460
1379	CFClient::UI::harmonize $ws;	1461	CFPlus::UI::harmonize $ws;
1380	CFClient::UI::harmonize $hs;	1462	CFPlus::UI::harmonize $hs;
1381		1463
1382	my $y;	1464	my $y;
1383		1465
1384	for my $r (0 .. $#{$self->{children}}) {	1466	for my $r (0 .. $#{$self->{children}}) {
1385	my $row = $self->{children}[$r]	1467	my $row = $self->{children}[$r]
…		…
1428	}	1510	}
1429	}	1511	}
1430		1512
1431	#############################################################################	1513	#############################################################################
1432		1514
1433	package CFClient::UI::Box;	1515	package CFPlus::UI::Box;
1434		1516
1435	our @ISA = CFClient::UI::Container::;	1517	our @ISA = CFPlus::UI::Container::;
1436		1518
1437	sub size_request {	1519	sub size_request {
1438	my ($self) = @_;	1520	my ($self) = @_;
1439		1521
1440	$self->{vertical}	1522	$self->{vertical}
…		…
1473	$req[$_] += $space * $children[$_]{expand}	1555	$req[$_] += $space * $children[$_]{expand}
1474	for 0 .. $#children;	1556	for 0 .. $#children;
1475	}	1557	}
1476	}	1558	}
1477		1559
1478	CFClient::UI::harmonize \@req;	1560	CFPlus::UI::harmonize \@req;
1479		1561
1480	my $pos = 0;	1562	my $pos = 0;
1481	for (0 .. $#children) {	1563	for (0 .. $#children) {
1482	my $alloc = $req[$_];	1564	my $alloc = $req[$_];
1483	$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));
…		…
1488	1	1570	1
1489	}	1571	}
1490		1572
1491	#############################################################################	1573	#############################################################################
1492		1574
1493	package CFClient::UI::HBox;	1575	package CFPlus::UI::HBox;
1494		1576
1495	our @ISA = CFClient::UI::Box::;	1577	our @ISA = CFPlus::UI::Box::;
1496		1578
1497	sub new {	1579	sub new {
1498	my $class = shift;	1580	my $class = shift;
1499		1581
1500	$class->SUPER::new (	1582	$class->SUPER::new (
…		…
1503	)	1585	)
1504	}	1586	}
1505		1587
1506	#############################################################################	1588	#############################################################################
1507		1589
1508	package CFClient::UI::VBox;	1590	package CFPlus::UI::VBox;
1509		1591
1510	our @ISA = CFClient::UI::Box::;	1592	our @ISA = CFPlus::UI::Box::;
1511		1593
1512	sub new {	1594	sub new {
1513	my $class = shift;	1595	my $class = shift;
1514		1596
1515	$class->SUPER::new (	1597	$class->SUPER::new (
…		…
1518	)	1600	)
1519	}	1601	}
1520		1602
1521	#############################################################################	1603	#############################################################################
1522		1604
1523	package CFClient::UI::Label;	1605	package CFPlus::UI::Label;
1524		1606
1525	our @ISA = CFClient::UI::DrawBG::;	1607	our @ISA = CFPlus::UI::DrawBG::;
1526		1608
1527	use CFClient::OpenGL;	1609	use CFPlus::OpenGL;
1528		1610
1529	sub new {	1611	sub new {
1530	my ($class, %arg) = @_;	1612	my ($class, %arg) = @_;
1531		1613
1532	my $self = $class->SUPER::new (	1614	my $self = $class->SUPER::new (
…		…
1536	#font => default_font	1618	#font => default_font
1537	#text => initial text	1619	#text => initial text
1538	#markup => initial narkup	1620	#markup => initial narkup
1539	#max_w => maximum pixel width	1621	#max_w => maximum pixel width
1540	ellipsise => 3, # end	1622	ellipsise => 3, # end
1541	layout => (new CFClient::Layout),	1623	layout => (new CFPlus::Layout),
1542	fontsize => 1,	1624	fontsize => 1,
1543	align => -1,	1625	align => -1,
1544	valign => -1,	1626	valign => -1,
1545	padding_x => 2,	1627	padding_x => 2,
1546	padding_y => 2,	1628	padding_y => 2,
1547	can_events => 0,	1629	can_events => 0,
1548	%arg	1630	%arg
1549	);	1631	);
1550		1632
1551	if (exists $self->{template}) {	1633	if (exists $self->{template}) {
1552	my $layout = new CFClient::Layout;	1634	my $layout = new CFPlus::Layout;
1553	$layout->set_text (delete $self->{template});	1635	$layout->set_text (delete $self->{template});
1554	$self->{template} = $layout;	1636	$self->{template} = $layout;
1555	}	1637	}
1556		1638
1557	if (exists $self->{markup}) {	1639	if (exists $self->{markup}) {
…		…
1561	}	1643	}
1562		1644
1563	$self	1645	$self
1564	}	1646	}
1565		1647
1566	sub escape($) {
1567	local $_ = $_[0];
1568
1569	s/&/&amp;/g;
1570	s/>/&gt;/g;
1571	s/</&lt;/g;
1572
1573	$_
1574	}
1575
1576	sub update {	1648	sub update {
1577	my ($self) = @_;	1649	my ($self) = @_;
1578		1650
1579	delete $self->{texture};	1651	delete $self->{texture};
1580	$self->SUPER::update;	1652	$self->SUPER::update;
…		…
1591	my ($self, $text) = @_;	1663	my ($self, $text) = @_;
1592		1664
1593	return if $self->{text} eq "T$text";	1665	return if $self->{text} eq "T$text";
1594	$self->{text} = "T$text";	1666	$self->{text} = "T$text";
1595		1667
1596	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597	$self->{layout}->set_text ($text);	1668	$self->{layout}->set_text ($text);
1598		1669
1599	delete $self->{size_req};	1670	delete $self->{size_req};
1600	$self->realloc;	1671	$self->realloc;
1601	$self->update;	1672	$self->update;
…		…
1607	return if $self->{text} eq "M$markup";	1678	return if $self->{text} eq "M$markup";
1608	$self->{text} = "M$markup";	1679	$self->{text} = "M$markup";
1609		1680
1610	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1681	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611		1682
1612	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613	$self->{layout}->set_markup ($markup);	1683	$self->{layout}->set_markup ($markup);
1614		1684
1615	delete $self->{size_req};	1685	delete $self->{size_req};
1616	$self->realloc;	1686	$self->realloc;
1617	$self->update;	1687	$self->update;
…		…
1629		1699
1630	my ($w, $h) = $self->{layout}->size;	1700	my ($w, $h) = $self->{layout}->size;
1631		1701
1632	if (exists $self->{template}) {	1702	if (exists $self->{template}) {
1633	$self->{template}->set_font ($self->{font}) if $self->{font};	1703	$self->{template}->set_font ($self->{font}) if $self->{font};
		1704	$self->{template}->set_width ($self->{max_w} || -1);
1634	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1705	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635		1706
1636	my ($w2, $h2) = $self->{template}->size;	1707	my ($w2, $h2) = $self->{template}->size;
1637		1708
1638	$w = List::Util::max $w, $w2;	1709	$w = List::Util::max $w, $w2;
…		…
1672		1743
1673	sub reconfigure {	1744	sub reconfigure {
1674	my ($self) = @_;	1745	my ($self) = @_;
1675		1746
1676	delete $self->{size_req};	1747	delete $self->{size_req};
		1748	delete $self->{texture};
1677		1749
1678	$self->SUPER::reconfigure;	1750	$self->SUPER::reconfigure;
1679	}	1751	}
1680		1752
1681	sub _draw {	1753	sub _draw {
1682	my ($self) = @_;	1754	my ($self) = @_;
1683		1755
1684	$self->SUPER::_draw; # draw background, if applicable	1756	$self->SUPER::_draw; # draw background, if applicable
1685		1757
1686	my $tex = $self->{texture} ||= do {	1758	my $size = $self->{texture} ||= do {
1687	$self->{layout}->set_foreground (@{$self->{fg}});	1759	$self->{layout}->set_foreground (@{$self->{fg}});
1688	$self->{layout}->set_font ($self->{font}) if $self->{font};	1760	$self->{layout}->set_font ($self->{font}) if $self->{font};
1689	$self->{layout}->set_width ($self->{w});	1761	$self->{layout}->set_width ($self->{w});
1690	$self->{layout}->set_ellipsise ($self->{ellipsise});	1762	$self->{layout}->set_ellipsise ($self->{ellipsise});
1691	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1763	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1764	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693		1765
1694	new_from_layout CFClient::Texture $self->{layout}	1766	[$self->{layout}->size]
1695	};	1767	};
1696		1768
1697	unless (exists $self->{ox}) {	1769	unless (exists $self->{ox}) {
1698	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1770	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1771	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700	: ($self->{w} - $tex->{w}) * 0.5);	1772	: ($self->{w} - $size->[0]) * 0.5);
1701		1773
1702	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1774	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1775	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704	: ($self->{h} - $tex->{h}) * 0.5);	1776	: ($self->{h} - $size->[1]) * 0.5);
1705	};	1777	};
1706		1778
1707	glEnable GL_TEXTURE_2D;
1708
1709	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1779	my $w = List::Util::min $self->{w} + 4, $size->[0];
1710	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1780	my $h = List::Util::min $self->{h} + 2, $size->[1];
1711		1781
1712	if ($tex->{format} == GL_ALPHA) {	1782	$self->{layout}->render ($self->{ox}, $self->{oy});
1713	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714	glColor @{$self->{fg}};
1715	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716	} else {
1717	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1718	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719	}
1720
1721	glDisable GL_TEXTURE_2D;
1722	}	1783	}
1723		1784
1724	#############################################################################	1785	#############################################################################
1725		1786
1726	package CFClient::UI::EntryBase;	1787	package CFPlus::UI::EntryBase;
1727		1788
1728	our @ISA = CFClient::UI::Label::;	1789	our @ISA = CFPlus::UI::Label::;
1729		1790
1730	use CFClient::OpenGL;	1791	use CFPlus::OpenGL;
1731		1792
1732	sub new {	1793	sub new {
1733	my $class = shift;	1794	my $class = shift;
1734		1795
1735	$class->SUPER::new (	1796	$class->SUPER::new (
…		…
1797		1858
1798	if ($uni == 8) {	1859	if ($uni == 8) {
1799	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1800	} elsif ($uni == 127) {	1861	} elsif ($uni == 127) {
1801	substr $text, $self->{cursor}, 1, "";	1862	substr $text, $self->{cursor}, 1, "";
1802	} elsif ($sym == CFClient::SDLK_LEFT) {	1863	} elsif ($sym == CFPlus::SDLK_LEFT) {
1803	--$self->{cursor} if $self->{cursor};	1864	--$self->{cursor} if $self->{cursor};
1804	} elsif ($sym == CFClient::SDLK_RIGHT) {	1865	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1805	++$self->{cursor} if $self->{cursor} < length $self->{text};	1866	++$self->{cursor} if $self->{cursor} < length $self->{text};
1806	} elsif ($sym == CFClient::SDLK_HOME) {	1867	} elsif ($sym == CFPlus::SDLK_HOME) {
1807	$self->{cursor} = 0;	1868	$self->{cursor} = 0;
1808	} elsif ($sym == CFClient::SDLK_END) {	1869	} elsif ($sym == CFPlus::SDLK_END) {
1809	$self->{cursor} = length $text;	1870	$self->{cursor} = length $text;
1810	} elsif ($uni == 27) {	1871	} elsif ($uni == 27) {
1811	$self->emit ('escape');	1872	$self->emit ('escape');
1812	} elsif ($uni) {	1873	} elsif ($uni) {
1813	substr $text, $self->{cursor}++, 0, chr $uni;	1874	substr $text, $self->{cursor}++, 0, chr $uni;
…		…
1837		1898
1838	my $idx = $self->{layout}->xy_to_index ($x, $y);	1899	my $idx = $self->{layout}->xy_to_index ($x, $y);
1839		1900
1840	# byte-index to char-index	1901	# byte-index to char-index
1841	my $text = $self->{text};	1902	my $text = $self->{text};
1842	utf8::encode $text;	1903	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843	$self->{cursor} = length substr $text, 0, $idx;	1904	$self->{cursor} = length $text;
1844		1905
1845	$self->_set_text ($self->{text});	1906	$self->_set_text ($self->{text});
1846	$self->update;	1907	$self->update;
1847		1908
1848	1	1909	1
…		…
1895	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};
1896	glEnd;	1957	glEnd;
1897	}	1958	}
1898	}	1959	}
1899		1960
1900	package CFClient::UI::Entry;	1961	package CFPlus::UI::Entry;
1901		1962
1902	our @ISA = CFClient::UI::EntryBase::;	1963	our @ISA = CFPlus::UI::EntryBase::;
1903		1964
1904	use CFClient::OpenGL;	1965	use CFPlus::OpenGL;
1905		1966
1906	sub invoke_key_down {	1967	sub invoke_key_down {
1907	my ($self, $ev) = @_;	1968	my ($self, $ev) = @_;
1908		1969
1909	my $sym = $ev->{sym};	1970	my $sym = $ev->{sym};
…		…
1915	$self->{history_pointer} = -1;	1976	$self->{history_pointer} = -1;
1916	$self->{history_saveback} = '';	1977	$self->{history_saveback} = '';
1917	$self->emit (activate => $txt);	1978	$self->emit (activate => $txt);
1918	$self->update;	1979	$self->update;
1919		1980
1920	} elsif ($sym == CFClient::SDLK_UP) {	1981	} elsif ($sym == CFPlus::SDLK_UP) {
1921	if ($self->{history_pointer} < 0) {	1982	if ($self->{history_pointer} < 0) {
1922	$self->{history_saveback} = $self->get_text;	1983	$self->{history_saveback} = $self->get_text;
1923	}	1984	}
1924	if (@{$self->{history} || []} > 0) {	1985	if (@{$self->{history} || []} > 0) {
1925	$self->{history_pointer}++;	1986	$self->{history_pointer}++;
…		…
1927	$self->{history_pointer} = @{$self->{history} || []} - 1;	1988	$self->{history_pointer} = @{$self->{history} || []} - 1;
1928	}	1989	}
1929	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1930	}	1991	}
1931		1992
1932	} elsif ($sym == CFClient::SDLK_DOWN) {	1993	} elsif ($sym == CFPlus::SDLK_DOWN) {
1933	$self->{history_pointer}--;	1994	$self->{history_pointer}--;
1934	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1995	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1935		1996
1936	if ($self->{history_pointer} >= 0) {	1997	if ($self->{history_pointer} >= 0) {
1937	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1998	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1946	1	2007	1
1947	}	2008	}
1948		2009
1949	#############################################################################	2010	#############################################################################
1950		2011
1951	package CFClient::UI::Button;	2012	package CFPlus::UI::Button;
1952		2013
1953	our @ISA = CFClient::UI::Label::;	2014	our @ISA = CFPlus::UI::Label::;
1954		2015
1955	use CFClient::OpenGL;	2016	use CFPlus::OpenGL;
1956		2017
1957	my @tex =	2018	my @tex =
1958	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2019	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1959	qw(b1_button_active.png);	2020	qw(b1_button_active.png);
1960		2021
1961	sub new {	2022	sub new {
1962	my $class = shift;	2023	my $class = shift;
1963		2024
…		…
2000	$self->SUPER::_draw;	2061	$self->SUPER::_draw;
2001	}	2062	}
2002		2063
2003	#############################################################################	2064	#############################################################################
2004		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
2005	package CFClient::UI::ImageButton;	2215	package CFPlus::UI::ImageButton;
2006		2216
2007	our @ISA = CFClient::UI::Image::;	2217	our @ISA = CFPlus::UI::Image::;
2008		2218
2009	use CFClient::OpenGL;	2219	use CFPlus::OpenGL;
2010		2220
2011	my %textures;	2221	my %textures;
2012		2222
2013	sub new {	2223	sub new {
2014	my $class = shift;	2224	my $class = shift;
…		…
2036	1	2246	1
2037	}	2247	}
2038		2248
2039	#############################################################################	2249	#############################################################################
2040		2250
2041	package CFClient::UI::CheckBox;
2042
2043	our @ISA = CFClient::UI::DrawBG::;
2044
2045	my @tex =
2046	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2047	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2048
2049	use CFClient::OpenGL;
2050
2051	sub new {
2052	my $class = shift;
2053
2054	$class->SUPER::new (
2055	padding_x => 2,
2056	padding_y => 2,
2057	fg => [1, 1, 1],
2058	active_fg => [1, 1, 0],
2059	bg => [0, 0, 0, 0.2],
2060	active_bg => [1, 1, 1, 0.5],
2061	state => 0,
2062	can_hover => 1,
2063	@_
2064	)
2065	}
2066
2067	sub size_request {
2068	my ($self) = @_;
2069
2070	(6) x 2
2071	}
2072
2073	sub toggle {
2074	my ($self) = @_;
2075
2076	$self->{state} = !$self->{state};
2077	$self->emit (changed => $self->{state});
2078	$self->update;
2079	}
2080
2081	sub invoke_button_down {
2082	my ($self, $ev, $x, $y) = @_;
2083
2084	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2085	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2086	$self->toggle;
2087	} else {
2088	return 0
2089	}
2090
2091	1
2092	}
2093
2094	sub _draw {
2095	my ($self) = @_;
2096
2097	$self->SUPER::_draw;
2098
2099	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2100
2101	my ($w, $h) = @$self{qw(w h)};
2102
2103	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2104
2105	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2106
2107	my $tex = $self->{state} ? $tex[1] : $tex[0];
2108
2109	glEnable GL_TEXTURE_2D;
2110	$tex->draw_quad_alpha (0, 0, $s, $s);
2111	glDisable GL_TEXTURE_2D;
2112	}
2113
2114	#############################################################################
2115
2116	package CFClient::UI::Image;	2251	package CFPlus::UI::VGauge;
2117		2252
2118	our @ISA = CFClient::UI::Base::;	2253	our @ISA = CFPlus::UI::Base::;
2119
2120	use CFClient::OpenGL;
2121
2122	our %texture_cache;
2123
2124	sub new {
2125	my $class = shift;
2126
2127	my $self = $class->SUPER::new (
2128	can_events => 0,
2129	@_,
2130	);
2131
2132	$self->{path}
2133	or Carp::croak "required attribute 'path' not set";
2134
2135	$self->{tex} = $texture_cache{$self->{path}} ||=
2136	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2137
2138	Scalar::Util::weaken $texture_cache{$self->{path}};
2139
2140	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2141
2142	$self
2143	}
2144
2145	sub size_request {
2146	my ($self) = @_;
2147
2148	($self->{tex}{w}, $self->{tex}{h})
2149	}
2150
2151	sub _draw {
2152	my ($self) = @_;
2153
2154	my $tex = $self->{tex};
2155
2156	my ($w, $h) = ($self->{w}, $self->{h});
2157
2158	if ($self->{rot90}) {
2159	glRotate 90, 0, 0, 1;
2160	glTranslate 0, -$self->{w}, 0;
2161
2162	($w, $h) = ($h, $w);
2163	}
2164
2165	glEnable GL_TEXTURE_2D;
2166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2167
2168	$tex->draw_quad_alpha (0, 0, $w, $h);
2169
2170	glDisable GL_TEXTURE_2D;
2171	}
2172
2173	#############################################################################
2174
2175	package CFClient::UI::VGauge;
2176
2177	our @ISA = CFClient::UI::Base::;
2178		2254
2179	use List::Util qw(min max);	2255	use List::Util qw(min max);
2180		2256
2181	use CFClient::OpenGL;	2257	use CFPlus::OpenGL;
2182		2258
2183	my %tex = (	2259	my %tex = (
2184	food => [	2260	food => [
2185	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2261	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2186	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2262	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2187	],	2263	],
2188	grace => [	2264	grace => [
2189	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2265	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2190	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/
2191	],	2267	],
2192	hp => [	2268	hp => [
2193	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2269	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2194	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2270	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2195	],	2271	],
2196	mana => [	2272	mana => [
2197	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2273	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2198	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/
2199	],	2275	],
2200	);	2276	);
2201		2277
2202	# eg. VGauge->new (gauge => 'food'), default gauge: food	2278	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2305	glDisable GL_TEXTURE_2D;	2381	glDisable GL_TEXTURE_2D;
2306	}	2382	}
2307		2383
2308	#############################################################################	2384	#############################################################################
2309		2385
2310	package CFClient::UI::Gauge;	2386	package CFPlus::UI::Gauge;
2311		2387
2312	our @ISA = CFClient::UI::VBox::;	2388	our @ISA = CFPlus::UI::VBox::;
2313		2389
2314	sub new {	2390	sub new {
2315	my ($class, %arg) = @_;	2391	my ($class, %arg) = @_;
2316		2392
2317	my $self = $class->SUPER::new (	2393	my $self = $class->SUPER::new (
…		…
2319	can_hover => 1,	2395	can_hover => 1,
2320	can_events => 1,	2396	can_events => 1,
2321	%arg,	2397	%arg,
2322	);	2398	);
2323		2399
2324	$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");
2325	$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);
2326	$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");
2327		2403
2328	$self	2404	$self
2329	}	2405	}
2330		2406
2331	sub set_fontsize {	2407	sub set_fontsize {
…		…
2352	$self->{value}->set_text ($val);	2428	$self->{value}->set_text ($val);
2353	}	2429	}
2354		2430
2355	#############################################################################	2431	#############################################################################
2356		2432
2357	package CFClient::UI::Slider;	2433	package CFPlus::UI::Slider;
2358		2434
2359	use strict;	2435	use strict;
2360		2436
2361	use CFClient::OpenGL;	2437	use CFPlus::OpenGL;
2362		2438
2363	our @ISA = CFClient::UI::DrawBG::;	2439	our @ISA = CFPlus::UI::DrawBG::;
2364		2440
2365	my @tex =	2441	my @tex =
2366	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2442	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2367	qw(s1_slider.png s1_slider_bg.png);	2443	qw(s1_slider.png s1_slider_bg.png);
2368		2444
2369	sub new {	2445	sub new {
2370	my $class = shift;	2446	my $class = shift;
2371		2447
…		…
2460	}	2536	}
2461		2537
2462	1	2538	1
2463	}	2539	}
2464		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
2465	sub update {	2551	sub update {
2466	my ($self) = @_;	2552	my ($self) = @_;
2467		2553
2468	delete $self->{knob_w};	2554	delete $self->{knob_w};
2469	$self->SUPER::update;	2555	$self->SUPER::update;
…		…
2516	glDisable GL_TEXTURE_2D;	2602	glDisable GL_TEXTURE_2D;
2517	}	2603	}
2518		2604
2519	#############################################################################	2605	#############################################################################
2520		2606
2521	package CFClient::UI::ValSlider;	2607	package CFPlus::UI::ValSlider;
2522		2608
2523	our @ISA = CFClient::UI::HBox::;	2609	our @ISA = CFPlus::UI::HBox::;
2524		2610
2525	sub new {	2611	sub new {
2526	my ($class, %arg) = @_;	2612	my ($class, %arg) = @_;
2527		2613
2528	my $range = delete $arg{range};	2614	my $range = delete $arg{range};
2529		2615
2530	my $self = $class->SUPER::new (	2616	my $self = $class->SUPER::new (
2531	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2617	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2532	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2618	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2533	to_value => sub { shift },	2619	to_value => sub { shift },
2534	from_value => sub { shift },	2620	from_value => sub { shift },
2535	%arg,	2621	%arg,
2536	);	2622	);
2537		2623
…		…
2557	sub set_range { shift->{slider}->set_range (@_) }	2643	sub set_range { shift->{slider}->set_range (@_) }
2558	sub set_value { shift->{slider}->set_value (@_) }	2644	sub set_value { shift->{slider}->set_value (@_) }
2559		2645
2560	#############################################################################	2646	#############################################################################
2561		2647
2562	package CFClient::UI::TextScroller;	2648	package CFPlus::UI::TextScroller;
2563		2649
2564	our @ISA = CFClient::UI::HBox::;	2650	our @ISA = CFPlus::UI::HBox::;
2565		2651
2566	use CFClient::OpenGL;	2652	use CFPlus::OpenGL;
2567		2653
2568	sub new {	2654	sub new {
2569	my $class = shift;	2655	my $class = shift;
2570		2656
2571	my $self = $class->SUPER::new (	2657	my $self = $class->SUPER::new (
2572	fontsize => 1,	2658	fontsize => 1,
2573	can_events => 0,	2659	can_events => 1,
2574	indent => 0,	2660	indent => 0,
2575	#font => default_font	2661	#font => default_font
2576	@_,	2662	@_,
2577		2663
2578	layout => (new CFClient::Layout 1),	2664	layout => (new CFPlus::Layout),
2579	par => [],	2665	par => [],
2580	height => 0,	2666	height => 0,
2581	children => [	2667	children => [
2582	(new CFClient::UI::Empty expand => 1),	2668	(new CFPlus::UI::Empty expand => 1),
2583	(new CFClient::UI::Slider vertical => 1),	2669	(new CFPlus::UI::Slider vertical => 1),
2584	],	2670	],
2585	);	2671	);
2586		2672
2587	$self->{children}[1]->connect (changed => sub { $self->update });	2673	$self->{children}[1]->connect (changed => sub { $self->update });
2588		2674
…		…
2618		2704
2619	$self->reflow;	2705	$self->reflow;
2620		2706
2621	local $self->{children} = [$empty, $slider];	2707	local $self->{children} = [$empty, $slider];
2622	$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
2623	}	2719	}
2624		2720
2625	sub get_layout {	2721	sub get_layout {
2626	my ($self, $para) = @_;	2722	my ($self, $para) = @_;
2627		2723
…		…
2667	$self->{height} = 0;	2763	$self->{height} = 0;
2668	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2764	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2669	}	2765	}
2670		2766
2671	sub add_paragraph {	2767	sub add_paragraph {
2672	my ($self, $color, $para, $indent) = @_;	2768	my $self = shift;
2673		2769
2674	my ($text, @w) = ref $para ? @$para : $para;	2770	for my $para (@_) {
2675
2676	$para = {	2771	$para = {
		2772	fg => [1, 1, 1, 1],
		2773	indent => 0,
		2774	markup => "",
		2775	widget => [],
		2776	ref $para ? %$para : (markup => $para),
2677	w => 1e10,	2777	w => 1e10,
2678	wrapped => 1,	2778	wrapped => 1,
2679	fg => $color,
2680	indent => $indent,
2681	markup => $text,
2682	widget => \@w,
2683	};	2779	};
2684		2780
2685	$self->add (@w) if @w;	2781	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2686	push @{$self->{par}}, $para;	2782	push @{$self->{par}}, $para;
		2783	}
2687		2784
2688	$self->{need_reflow}++;	2785	$self->{need_reflow}++;
2689	$self->update;	2786	$self->update;
2690	}	2787	}
2691		2788
…		…
2733		2830
2734	if (delete $self->{scroll_to_bottom}) {	2831	if (delete $self->{scroll_to_bottom}) {
2735	$self->{children}[1]->set_value (1e10);	2832	$self->{children}[1]->set_value (1e10);
2736	}	2833	}
2737		2834
2738	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2835	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2739	glClearColor 0, 0, 0, 0;	2836	glClearColor 0, 0, 0, 0;
2740	glClear GL_COLOR_BUFFER_BIT;	2837	glClear GL_COLOR_BUFFER_BIT;
2741		2838
2742	my $top = int $self->{children}[1]{range}[0];	2839	my $top = int $self->{children}[1]{range}[0];
2743		2840
2744	my $y0 = $top;	2841	my $y0 = $top;
2745	my $y1 = $top + $H;	2842	my $y1 = $top + $H;
2746		2843
2747	my $y = 0;	2844	my $y = 0;
2748		2845
2749	glEnable GL_BLEND;
2750	#TODO# not correct in windows where rgba is forced off
2751	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2752
2753	for my $para (@{$self->{par}}) {	2846	for my $para (@{$self->{par}}) {
2754	my $h = $para->{h};	2847	my $h = $para->{h};
2755		2848
2756	if ($y0 < $y + $h && $y < $y1) {	2849	if ($y0 < $y + $h && $y < $y1) {
2757		2850
2758	my $layout = $self->get_layout ($para);	2851	my $layout = $self->get_layout ($para);
2759		2852
2760	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2761
2762	glRasterPos $para->{indent}, $y - $y0;	2853	$layout->render ($para->{indent}, $y - $y0);
2763	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764		2854
2765	if (my @w = @{ $para->{widget} }) {	2855	if (my @w = @{ $para->{widget} }) {
2766	my @s = $layout->get_shapes;	2856	my @s = $layout->get_shapes;
2767		2857
2768	glDisable GL_BLEND;
2769	for (@w) {	2858	for (@w) {
2770	my ($dx, $dy) = splice @s, 0, 2, ();	2859	my ($dx, $dy) = splice @s, 0, 2, ();
2771		2860
2772	$_->{x} = $dx + $para->{indent};	2861	$_->{x} = $dx + $para->{indent};
2773	$_->{y} = $dy + $y - $y0;	2862	$_->{y} = $dy + $y - $y0;
2774		2863
2775	$_->draw;	2864	$_->draw;
2776	}	2865	}
2777	glEnable GL_BLEND;
2778	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779	}	2866	}
2780	}	2867	}
2781		2868
2782	$y += $h;	2869	$y += $h;
2783	}	2870	}
2784
2785	glDisable GL_BLEND;
2786	};	2871	};
2787	});	2872	});
2788	}	2873	}
2789		2874
2790	sub reconfigure {	2875	sub reconfigure {
…		…
2808	$self->{children}[1]->draw;	2893	$self->{children}[1]->draw;
2809	}	2894	}
2810		2895
2811	#############################################################################	2896	#############################################################################
2812		2897
2813	package CFClient::UI::Animator;	2898	package CFPlus::UI::Animator;
2814		2899
2815	use CFClient::OpenGL;	2900	use CFPlus::OpenGL;
2816		2901
2817	our @ISA = CFClient::UI::Bin::;	2902	our @ISA = CFPlus::UI::Bin::;
2818		2903
2819	sub moveto {	2904	sub moveto {
2820	my ($self, $x, $y) = @_;	2905	my ($self, $x, $y) = @_;
2821		2906
2822	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2907	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2850	glPopMatrix;	2935	glPopMatrix;
2851	}	2936	}
2852		2937
2853	#############################################################################	2938	#############################################################################
2854		2939
2855	package CFClient::UI::Flopper;	2940	package CFPlus::UI::Flopper;
2856		2941
2857	our @ISA = CFClient::UI::Button::;	2942	our @ISA = CFPlus::UI::Button::;
2858		2943
2859	sub new {	2944	sub new {
2860	my $class = shift;	2945	my $class = shift;
2861		2946
2862	my $self = $class->SUPER::new (	2947	my $self = $class->SUPER::new (
…		…
2874	$self->{other}->toggle_visibility;	2959	$self->{other}->toggle_visibility;
2875	}	2960	}
2876		2961
2877	#############################################################################	2962	#############################################################################
2878		2963
2879	package CFClient::UI::Tooltip;	2964	package CFPlus::UI::Tooltip;
2880		2965
2881	our @ISA = CFClient::UI::Bin::;	2966	our @ISA = CFPlus::UI::Bin::;
2882		2967
2883	use CFClient::OpenGL;	2968	use CFPlus::OpenGL;
2884		2969
2885	sub new {	2970	sub new {
2886	my $class = shift;	2971	my $class = shift;
2887		2972
2888	$class->SUPER::new (	2973	$class->SUPER::new (
…		…
2904	}	2989	}
2905		2990
2906	$tooltip =~ s/^\n+//;	2991	$tooltip =~ s/^\n+//;
2907	$tooltip =~ s/\n+$//;	2992	$tooltip =~ s/\n+$//;
2908		2993
2909	$self->add (new CFClient::UI::Label	2994	$self->add (new CFPlus::UI::Label
2910	markup => $tooltip,	2995	markup => $tooltip,
2911	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2996	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2912	fontsize => 0.8,	2997	fontsize => 0.8,
2913	fg => [0, 0, 0, 1],	2998	fg => [0, 0, 0, 1],
2914	ellipsise => 0,	2999	ellipsise => 0,
…		…
2937		3022
2938	$self->{root}->on_post_alloc ("move_$self" => sub {	3023	$self->{root}->on_post_alloc ("move_$self" => sub {
2939	my $widget = $self->{owner}	3024	my $widget = $self->{owner}
2940	or return;	3025	or return;
2941		3026
		3027	if ($widget->{visible}) {
2942	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3028	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2943		3029
2944	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3030	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2945	if $x + $self->{w} > $self->{root}{w};	3031	if $x + $self->{w} > $self->{root}{w};
2946		3032
2947	$self->move_abs ($x, $y);	3033	$self->move_abs ($x, $y);
		3034	} else {
		3035	$self->hide;
		3036	}
2948	});	3037	});
2949	}	3038	}
2950		3039
2951	sub _draw {	3040	sub _draw {
2952	my ($self) = @_;	3041	my ($self) = @_;
…		…
2976	$self->SUPER::_draw;	3065	$self->SUPER::_draw;
2977	}	3066	}
2978		3067
2979	#############################################################################	3068	#############################################################################
2980		3069
2981	package CFClient::UI::Face;	3070	package CFPlus::UI::Face;
2982		3071
2983	our @ISA = CFClient::UI::Base::;	3072	our @ISA = CFPlus::UI::DrawBG::;
2984		3073
2985	use CFClient::OpenGL;	3074	use CFPlus::OpenGL;
2986		3075
2987	sub new {	3076	sub new {
2988	my $class = shift;	3077	my $class = shift;
2989		3078
2990	my $self = $class->SUPER::new (	3079	my $self = $class->SUPER::new (
…		…
3025	sub _draw {	3114	sub _draw {
3026	my ($self) = @_;	3115	my ($self) = @_;
3027		3116
3028	return unless $::CONN;	3117	return unless $::CONN;
3029		3118
		3119	$self->SUPER::_draw;
		3120
3030	my $face;	3121	my $face;
3031		3122
3032	if ($self->{frame}) {	3123	if ($self->{frame}) {
3033	my $anim = $::CONN->{anim}[$self->{anim}];	3124	my $anim = $::CONN->{anim}[$self->{anim}];
3034		3125
…		…
3056	$self->SUPER::destroy;	3147	$self->SUPER::destroy;
3057	}	3148	}
3058		3149
3059	#############################################################################	3150	#############################################################################
3060		3151
3061	package CFClient::UI::Buttonbar;	3152	package CFPlus::UI::Buttonbar;
3062		3153
3063	our @ISA = CFClient::UI::HBox::;	3154	our @ISA = CFPlus::UI::HBox::;
3064		3155
3065	# TODO: should actualyl wrap buttons and other goodies.	3156	# TODO: should actualyl wrap buttons and other goodies.
3066		3157
3067	#############################################################################	3158	#############################################################################
3068		3159
3069	package CFClient::UI::Menu;	3160	package CFPlus::UI::Menu;
3070		3161
3071	our @ISA = CFClient::UI::FancyFrame::;	3162	our @ISA = CFPlus::UI::FancyFrame::;
3072		3163
3073	use CFClient::OpenGL;	3164	use CFPlus::OpenGL;
3074		3165
3075	sub new {	3166	sub new {
3076	my $class = shift;	3167	my $class = shift;
3077		3168
3078	my $self = $class->SUPER::new (	3169	my $self = $class->SUPER::new (
3079	items => [],	3170	items => [],
3080	z => 100,	3171	z => 100,
3081	@_,	3172	@_,
3082	);	3173	);
3083		3174
3084	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3175	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3085		3176
3086	for my $item (@{ $self->{items} }) {	3177	for my $item (@{ $self->{items} }) {
3087	my ($widget, $cb, $tooltip) = @$item;	3178	my ($widget, $cb, $tooltip) = @$item;
3088		3179
3089	# handle various types of items, only text for now	3180	# handle various types of items, only text for now
3090	if (!ref $widget) {	3181	if (!ref $widget) {
		3182	if ($widget =~ /\t/) {
		3183	my ($left, $right) = split /\t/, $widget, 2;
		3184
3091	$widget = new CFClient::UI::Label	3185	$widget = new CFPlus::UI::HBox
3092	can_hover => 1,	3186	can_hover => 1,
3093	can_events => 1,	3187	can_events => 1,
		3188	tooltip => $tooltip,
		3189	children => [
		3190	(new CFPlus::UI::Label markup => $left, expand => 1),
		3191	(new CFPlus::UI::Label markup => $right, align => +1),
		3192	],
		3193	;
		3194
		3195	} else {
		3196	$widget = new CFPlus::UI::Label
		3197	can_hover => 1,
		3198	can_events => 1,
3094	markup => $widget,	3199	markup => $widget,
3095	tooltip => $tooltip	3200	tooltip => $tooltip;
		3201	}
3096	}	3202	}
3097		3203
3098	$self->{item}{$widget} = $item;	3204	$self->{item}{$widget} = $item;
3099		3205
3100	$self->{vbox}->add ($widget);	3206	$self->{vbox}->add ($widget);
…		…
3143	1	3249	1
3144	}	3250	}
3145		3251
3146	#############################################################################	3252	#############################################################################
3147		3253
3148	package CFClient::UI::Multiplexer;	3254	package CFPlus::UI::Multiplexer;
3149		3255
3150	our @ISA = CFClient::UI::Container::;	3256	our @ISA = CFPlus::UI::Container::;
3151		3257
3152	sub new {	3258	sub new {
3153	my $class = shift;	3259	my $class = shift;
3154		3260
3155	my $self = $class->SUPER::new (	3261	my $self = $class->SUPER::new (
…		…
3216	$self->{current}->draw;	3322	$self->{current}->draw;
3217	}	3323	}
3218		3324
3219	#############################################################################	3325	#############################################################################
3220		3326
3221	package CFClient::UI::Notebook;	3327	package CFPlus::UI::Notebook;
3222		3328
3223	our @ISA = CFClient::UI::VBox::;	3329	our @ISA = CFPlus::UI::VBox::;
3224		3330
3225	sub new {	3331	sub new {
3226	my $class = shift;	3332	my $class = shift;
3227		3333
3228	my $self = $class->SUPER::new (	3334	my $self = $class->SUPER::new (
3229	buttonbar => (new CFClient::UI::Buttonbar),	3335	buttonbar => (new CFPlus::UI::Buttonbar),
3230	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3336	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3231	# filter => # will be put between multiplexer and $self	3337	# filter => # will be put between multiplexer and $self
3232	@_,	3338	@_,
3233	);	3339	);
3234		3340
3235	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3341	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3241	sub add {	3347	sub add {
3242	my ($self, $title, $widget, $tooltip) = @_;	3348	my ($self, $title, $widget, $tooltip) = @_;
3243		3349
3244	Scalar::Util::weaken $self;	3350	Scalar::Util::weaken $self;
3245		3351
3246	$self->{buttonbar}->add (new CFClient::UI::Button	3352	$self->{buttonbar}->add (new CFPlus::UI::Button
3247	markup => $title,	3353	markup => $title,
3248	tooltip => $tooltip,	3354	tooltip => $tooltip,
3249	on_activate => sub { $self->set_current_page ($widget) },	3355	on_activate => sub { $self->set_current_page ($widget) },
3250	);	3356	);
3251		3357
…		…
3265	$self->emit (page_changed => $self->{multiplexer}{current});	3371	$self->emit (page_changed => $self->{multiplexer}{current});
3266	}	3372	}
3267		3373
3268	#############################################################################	3374	#############################################################################
3269		3375
3270	package CFClient::UI::Combobox;	3376	package CFPlus::UI::Selector;
3271		3377
3272	use utf8;	3378	use utf8;
3273		3379
3274	our @ISA = CFClient::UI::Button::;	3380	our @ISA = CFPlus::UI::Button::;
3275		3381
3276	sub new {	3382	sub new {
3277	my $class = shift;	3383	my $class = shift;
3278		3384
3279	my $self = $class->SUPER::new (	3385	my $self = $class->SUPER::new (
…		…
3296	my ($value, $title, $tooltip) = @$_;	3402	my ($value, $title, $tooltip) = @$_;
3297		3403
3298	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3404	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299	}	3405	}
3300		3406
3301	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3407	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302	}	3408	}
3303		3409
3304	sub _set_value {	3410	sub _set_value {
3305	my ($self, $value) = @_;	3411	my ($self, $value) = @_;
3306		3412
…		…
3321	$self->emit (changed => $value);	3427	$self->emit (changed => $value);
3322	}	3428	}
3323		3429
3324	#############################################################################	3430	#############################################################################
3325		3431
3326	package CFClient::UI::Statusbox;	3432	package CFPlus::UI::Statusbox;
3327		3433
3328	our @ISA = CFClient::UI::VBox::;	3434	our @ISA = CFPlus::UI::VBox::;
3329		3435
3330	sub new {	3436	sub new {
3331	my $class = shift;	3437	my $class = shift;
3332		3438
3333	my $self = $class->SUPER::new (	3439	my $self = $class->SUPER::new (
…		…
3345	sub reorder {	3451	sub reorder {
3346	my ($self) = @_;	3452	my ($self) = @_;
3347	my $NOW = Time::HiRes::time;	3453	my $NOW = Time::HiRes::time;
3348		3454
3349	# freeze display when hovering over any label	3455	# freeze display when hovering over any label
3350	return if $CFClient::UI::TOOLTIP->{owner}	3456	return if $CFPlus::UI::TOOLTIP->{owner}
3351	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3457	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3352	values %{ $self->{item} };	3458	values %{ $self->{item} };
3353		3459
3354	while (my ($k, $v) = each %{ $self->{item} }) {	3460	while (my ($k, $v) = each %{ $self->{item} }) {
3355	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3461	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3356	}	3462	}
…		…
3377	for ($short) {	3483	for ($short) {
3378	s/^\s+//;	3484	s/^\s+//;
3379	s/\s+/ /g;	3485	s/\s+/ /g;
3380	}	3486	}
3381		3487
3382	new CFClient::UI::Label	3488	new CFPlus::UI::Label
3383	markup => $short,	3489	markup => $short,
3384	tooltip => $item->{tooltip},	3490	tooltip => $item->{tooltip},
3385	tooltip_font => $::FONT_PROP,	3491	tooltip_font => $::FONT_PROP,
3386	tooltip_width => 0.67,	3492	tooltip_width => 0.67,
3387	fontsize => $item->{fontsize} || $self->{fontsize},	3493	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3466	$self->SUPER::destroy;	3572	$self->SUPER::destroy;
3467	}	3573	}
3468		3574
3469	#############################################################################	3575	#############################################################################
3470		3576
3471	package CFClient::UI::Inventory;	3577	package CFPlus::UI::Inventory;
3472		3578
3473	our @ISA = CFClient::UI::Table::;	3579	our @ISA = CFPlus::UI::Table::;
3474		3580
3475	sub new {	3581	sub new {
3476	my $class = shift;	3582	my $class = shift;
3477		3583
3478	my $self = $class->SUPER::new (	3584	my $self = $class->SUPER::new (
3479	col_expand => [0, 1, 0],	3585	col_expand => [0, 1, 0],
		3586	items => [],
3480	@_,	3587	@_,
3481	);	3588	);
3482		3589
		3590	$self->set_sort_order (undef);
		3591
3483	$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;
3484	}	3628	}
3485		3629
3486	sub set_items {	3630	sub set_items {
3487	my ($self, $items) = @_;	3631	my ($self, $items) = @_;
3488		3632
3489	$self->clear;	3633	$self->{items} = [$items ? values %$items : ()];
3490	return unless $items;	3634	$self->update_items;
3491
3492	my @items = sort {
3493	($a->{type} <=> $b->{type})
3494	or ($a->{name} cmp $b->{name})
3495	} values %$items;
3496
3497	$self->{real_items} = \@items;
3498
3499	my $row = 0;
3500	for my $item (@items) {
3501	CFClient::Item::update_widgets $item;
3502
3503	$self->add (0, $row, $item->{face_widget});
3504	$self->add (1, $row, $item->{desc_widget});
3505	$self->add (2, $row, $item->{weight_widget});
3506
3507	$row++;
3508	}
3509	}	3635	}
3510		3636
3511	#############################################################################	3637	#############################################################################
3512		3638
3513	package CFClient::UI::SpellList;	3639	package CFPlus::UI::SpellList;
3514		3640
3515	our @ISA = CFClient::UI::Table::;	3641	our @ISA = CFPlus::UI::Table::;
3516		3642
3517	sub new {	3643	sub new {
3518	my $class = shift;	3644	my $class = shift;
3519		3645
3520	my $self = $class->SUPER::new (	3646	my $self = $class->SUPER::new (
…		…
3538	"<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");
3539		3665
3540	sub rebuild_spell_list {	3666	sub rebuild_spell_list {
3541	my ($self) = @_;	3667	my ($self) = @_;
3542		3668
3543	$CFClient::UI::ROOT->on_refresh ($self => sub {	3669	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3544	$self->clear;	3670	$self->clear;
3545		3671
3546	return unless $::CONN;	3672	return unless $::CONN;
3547		3673
3548	$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);
3549	$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);
3550	$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);
3551	$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);
3552	$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);
3553		3679
3554	my $row = 0;	3680	my $row = 0;
3555		3681
3556	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3682	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557	my $spell = $self->{spell}{$_};	3683	my $spell = $self->{spell}{$_};
…		…
3564	if ($ev->{button} == 1) {	3690	if ($ev->{button} == 1) {
3565	$::CONN->user_send ("cast $spell->{name}");	3691	$::CONN->user_send ("cast $spell->{name}");
3566	} elsif ($ev->{button} == 2) {	3692	} elsif ($ev->{button} == 2) {
3567	$::CONN->user_send ("invoke $spell->{name}");	3693	$::CONN->user_send ("invoke $spell->{name}");
3568	} elsif ($ev->{button} == 3) {	3694	} elsif ($ev->{button} == 3) {
3569	(new CFClient::UI::Menu	3695	(new CFPlus::UI::Menu
3570	items => [	3696	items => [
3571	["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}"]) }],
3572	["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}"]) }],
3573	],	3699	],
3574	)->popup ($ev);	3700	)->popup ($ev);
…		…
3580	};	3706	};
3581		3707
3582	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3708	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583		3709
3584	#TODO: add path info to tooltip	3710	#TODO: add path info to tooltip
3585	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3711	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3586		3712
3587	$self->add (0, $row, new CFClient::UI::Face	3713	$self->add (0, $row, new CFPlus::UI::Face
3588	face => $spell->{face},	3714	face => $spell->{face},
3589	can_hover => 1,	3715	can_hover => 1,
3590	can_events => 1,	3716	can_events => 1,
3591	tooltip => $tooltip,	3717	tooltip => $tooltip,
3592	on_button_down => $spell_cb,	3718	on_button_down => $spell_cb,
3593	);	3719	);
3594		3720
3595	$self->add (1, $row, new CFClient::UI::Label	3721	$self->add (1, $row, new CFPlus::UI::Label
3596	expand => 1,	3722	expand => 1,
3597	text => $spell->{name},	3723	text => $spell->{name},
3598	can_hover => 1,	3724	can_hover => 1,
3599	can_events => 1,	3725	can_events => 1,
3600	tooltip => $tooltip,	3726	tooltip => $tooltip,
3601	on_button_down => $spell_cb,	3727	on_button_down => $spell_cb,
3602	);	3728	);
3603		3729
3604	$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);
3605	$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);
3606	$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);
3607	$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);
3608	}	3734	}
3609	});	3735	});
3610	}	3736	}
3611		3737
3612	sub add_spell {	3738	sub add_spell {
…		…
3630	$self->rebuild_spell_list;	3756	$self->rebuild_spell_list;
3631	}	3757	}
3632		3758
3633	#############################################################################	3759	#############################################################################
3634		3760
3635	package CFClient::UI::Root;	3761	package CFPlus::UI::Root;
3636		3762
3637	our @ISA = CFClient::UI::Container::;	3763	our @ISA = CFPlus::UI::Container::;
3638		3764
3639	use List::Util qw(min max);	3765	use List::Util qw(min max);
3640		3766
3641	use CFClient::OpenGL;	3767	use CFPlus::OpenGL;
3642		3768
3643	sub new {	3769	sub new {
3644	my $class = shift;	3770	my $class = shift;
3645		3771
3646	my $self = $class->SUPER::new (	3772	my $self = $class->SUPER::new (
…		…
3822	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3948	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3823		3949
3824	$w = 0 if $w < 0;	3950	$w = 0 if $w < 0;
3825	$h = 0 if $h < 0;	3951	$h = 0 if $h < 0;
3826		3952
		3953	$w = max $widget->{min_w}, $w;
		3954	$h = max $widget->{min_h}, $h;
		3955
		3956	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3957	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3958
		3959	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3960	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3961
3827	$w = int $w + 0.5;	3962	$w = int $w + 0.5;
3828	$h = int $h + 0.5;	3963	$h = int $h + 0.5;
3829		3964
3830	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3965	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831	$widget->{old_w} = $widget->{w};	3966	$widget->{old_w} = $widget->{w};
…		…
3854	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3989	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3855	glMatrixMode GL_MODELVIEW;	3990	glMatrixMode GL_MODELVIEW;
3856	glLoadIdentity;	3991	glLoadIdentity;
3857		3992
3858	{	3993	{
3859	package CFClient::UI::Base;	3994	package CFPlus::UI::Base;
3860		3995
3861	($draw_x, $draw_y, $draw_w, $draw_h) =	3996	($draw_x, $draw_y, $draw_w, $draw_h) =
3862	(0, 0, $self->{w}, $self->{h});	3997	(0, 0, $self->{w}, $self->{h});
3863	}	3998	}
3864		3999
3865	$self->_draw;	4000	$self->_draw;
3866	}	4001	}
3867		4002
3868	#############################################################################	4003	#############################################################################
3869		4004
3870	package CFClient::UI;	4005	package CFPlus::UI;
3871		4006
3872	$ROOT = new CFClient::UI::Root;	4007	$ROOT = new CFPlus::UI::Root;
3873	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4008	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3874		4009
3875	1	4010	1
3876		4011

Diff Legend

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