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.326 by root, Sun Jul 16 20:04:08 2006 UTC vs.
Revision 1.343 by root, Sun Aug 13 15:14:17 2006 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8	use Event;	8	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
…		…
79	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	82	if $FOCUS;
82	}	83	}
83		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
84	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	99	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
87		101
88	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
90		106
91	$GRAB = $widget;	107	$GRAB = $widget;
92	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
93		109
94	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
95	}	111	}
96		112
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
98		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
100	if $GRAB;	116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
		122	}
101	}	123	}
102		124
103	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	126	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		127
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		129
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		131
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
112	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		134
114	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	137	$grab->update if $grab;
117	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
118		139
		140	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	141	$TOOLTIP_WATCHER->cb->();
120	}	142	}
121	}	143	}
122		144
123	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
124	my ($ev) = @_;	146	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
126		148
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		150
129	if ($widget != $HOVER) {	151	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		152
132	$hover->update if $hover && $hover->{can_hover};	153	$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;	154	if $HOVER;
140	}	155	}
141		156
142	# convert position array to integers	157	# convert position array to integers
143	sub harmonize {	158	sub harmonize {
…		…
193	reconfigure_widgets;	208	reconfigure_widgets;
194	}	209	}
195		210
196	#############################################################################	211	#############################################################################
197		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
198	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
199		222
200	use strict;	223	use strict;
201		224
202	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
203		226
204	sub new {	227	sub new {
205	my $class = shift;	228	my $class = shift;
206		229
207	my $self = bless {	230	my $self = bless {
…		…
212	h => undef,	235	h => undef,
213	can_events => 1,	236	can_events => 1,
214	@_	237	@_
215	}, $class;	238	}, $class;
216		239
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		241
219	for (keys %$self) {	242	for (keys %$self) {
220	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
222	}	245	}
223	}	246	}
224		247
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		253
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		256
234	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
247	sub show {	270	sub show {
248	my ($self) = @_;	271	my ($self) = @_;
249		272
250	return if $self->{parent};	273	return if $self->{parent};
251		274
252	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
253	}	276	}
254		277
255	sub set_visible {	278	sub set_visible {
256	my ($self) = @_;	279	my ($self) = @_;
257		280
…		…
278	delete $self->{root};	301	delete $self->{root};
279		302
280	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
282		305
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
285		308
286	$self->emit ("focus_out");	309	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
288	}	311	}
…		…
345	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
346		369
347	if ($self->{aspect}) {	370	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
349		372
350	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		375
353	# use alignment to adjust x, y	376	# use alignment to adjust x, y
354		377
355	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
397		420
398	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
399		422
400	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
401		424
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	428	}
406	}	429	}
407		430
408	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
409	sub coord2local {	432	sub coord2local {
410	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
411		434
		435	Carp::confess unless $self->{parent};#d#
		436
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	438	}
414		439
415	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
416	sub coord2global {	441	sub coord2global {
417	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
418		443
		444	Carp::confess unless $self->{parent};#d#
		445
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	447	}
421		448
422	sub invoke_focus_in {	449	sub invoke_focus_in {
423	my ($self) = @_;	450	my ($self) = @_;
…		…
452		479
453	$FOCUS->emit ("focus_out") if $FOCUS;	480	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	481	$self->emit ("focus_in");
455	}	482	}
456		483
457	sub invoke_mouse_motion { 1 }	484	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	485	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	486	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
461		489
462	sub invoke_button_down {	490	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
464		492
465	$self->grab_focus;	493	$self->grab_focus;
466		494
467	1	495	0
468	}	496	}
469		497
470	sub connect {	498	sub connect {
471	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
472		500
473	push @{ $self->{signal_cb}{$signal} }, $cb;	501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
474	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
475		515
476	sub emit {	516	sub emit {
477	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
478		518
		519	# I do not really like this solution, but I dislike duplication
		520	# and needlessly verbose code, too.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
479	#d##TODO# stop propagating at first true, do not use sum	528	#d##TODO# stop propagating at first true, do not use sum
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483	}	532	}
484		533
485	sub find_widget {	534	sub find_widget {
486	my ($self, $x, $y) = @_;	535	my ($self, $x, $y) = @_;
487		536
…		…
571	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
574	glEnd;	623	glEnd;
575	glPopMatrix;	624	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}	626	}
578		627
579	$self->_draw;	628	$self->_draw;
580	glPopMatrix;	629	glPopMatrix;
581	}	630	}
…		…
587	}	636	}
588		637
589	sub DESTROY {	638	sub DESTROY {
590	my ($self) = @_;	639	my ($self) = @_;
591		640
592	return if CFClient::in_destruct;	641	return if CFPlus::in_destruct;
593		642
594	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
595		644
596	eval { $self->destroy };	645	eval { $self->destroy };
597	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598	}	647	}
599		648
600	#############################################################################	649	#############################################################################
601		650
602	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
603		652
604	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
605		654
606	use strict;	655	use strict;
607	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
608		657
609	sub new {	658	sub new {
610	my $class = shift;	659	my $class = shift;
611		660
612	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
643	}	692	}
644	}	693	}
645		694
646	#############################################################################	695	#############################################################################
647		696
648	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
649		698
650	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
651		700
652	sub new {	701	sub new {
653	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
655	}	704	}
…		…
662		711
663	sub draw { }	712	sub draw { }
664		713
665	#############################################################################	714	#############################################################################
666		715
667	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
668		717
669	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
670		719
671	sub new {	720	sub new {
672	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
673		722
674	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
683	if $children;	732	if $children;
684		733
685	$self	734	$self
686	}	735	}
687		736
		737	sub realloc {
		738	my ($self) = @_;
		739
		740	$self->{force_realloc} = 1;
		741	$self->{force_size_alloc} = 1;
		742	$self->SUPER::realloc;
		743	}
		744
688	sub add {	745	sub add {
689	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
690		747
691	$_->set_parent ($self)	748	$_->set_parent ($self)
692	for @widgets;	749	for @widgets;
…		…
752	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
753	}	810	}
754		811
755	#############################################################################	812	#############################################################################
756		813
757	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
758		815
759	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
760		817
761	sub new {	818	sub new {
762	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
763		820
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		822
766	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
767	}	824	}
768		825
769	sub add {	826	sub add {
…		…
776	sub remove {	833	sub remove {
777	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
778		835
779	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
780		837
781	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
782	unless @{$self->{children}};	839	unless @{$self->{children}};
783	}	840	}
784		841
785	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
786		843
…		…
798		855
799	#############################################################################	856	#############################################################################
800		857
801	# back-buffered drawing area	858	# back-buffered drawing area
802		859
803	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
804		861
805	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
806		863
807	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
808		865
809	sub new {	866	sub new {
810	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
811		868
812	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
834	}	891	}
835		892
836	sub render_child {	893	sub render_child {
837	my ($self) = @_;	894	my ($self) = @_;
838		895
839	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	896	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
842		899
843	{	900	{
844	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
845		902
846	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
848	}	905	}
849		906
…		…
868	glDisable GL_TEXTURE_2D;	925	glDisable GL_TEXTURE_2D;
869	}	926	}
870		927
871	#############################################################################	928	#############################################################################
872		929
873	package CFClient::UI::ViewPort;	930	package CFPlus::UI::ViewPort;
874		931
875	our @ISA = CFClient::UI::Window::;	932	our @ISA = CFPlus::UI::Window::;
876		933
877	sub new {	934	sub new {
878	my $class = shift;	935	my $class = shift;
879		936
880	$class->SUPER::new (	937	$class->SUPER::new (
…		…
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	997	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	998	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	999	) {
943	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1000	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944	} else {	1001	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	1002	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	1003	}
947	}	1004	}
948		1005
949	sub _render {	1006	sub _render {
950	my ($self) = @_;	1007	my ($self) = @_;
951		1008
952	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1009	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
953	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1010	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954		1011
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1012	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1013
957	$self->SUPER::_render;	1014	$self->SUPER::_render;
958	}	1015	}
959		1016
960	#############################################################################	1017	#############################################################################
961		1018
962	package CFClient::UI::ScrolledWindow;	1019	package CFPlus::UI::ScrolledWindow;
963		1020
964	our @ISA = CFClient::UI::HBox::;	1021	our @ISA = CFPlus::UI::HBox::;
965		1022
966	sub new {	1023	sub new {
967	my ($class, %arg) = @_;	1024	my ($class, %arg) = @_;
968		1025
969	my $child = delete $arg{child};	1026	my $child = delete $arg{child};
970		1027
971	my $self;	1028	my $self;
972		1029
973	my $slider = new CFClient::UI::Slider	1030	my $slider = new CFPlus::UI::Slider
974	vertical => 1,	1031	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1032	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1033	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1034	$self->{vp}->set_offset (0, $_[1]);
978	},	1035	},
979	;	1036	;
980		1037
981	$self = $class->SUPER::new (	1038	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1039	vp => (new CFPlus::UI::ViewPort expand => 1),
		1040	can_events => 1,
983	slider => $slider,	1041	slider => $slider,
984	%arg,	1042	%arg,
985	);	1043	);
986		1044
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1045	$self->SUPER::add ($self->{vp}, $self->{slider});
988	$self->add ($child) if $child;	1046	$self->add ($child) if $child;
…		…
996	my ($self, $widget) = @_;	1054	my ($self, $widget) = @_;
997		1055
998	$self->{vp}->add ($self->{child} = $widget);	1056	$self->{vp}->add ($self->{child} = $widget);
999	}	1057	}
1000		1058
		1059	sub invoke_mouse_wheel {
		1060	my ($self, $ev) = @_;
		1061
		1062	return 0 unless $ev->{dy}; # only vertical movements
		1063
		1064	$self->{slider}->emit (mouse_wheel => $ev);
		1065
		1066	1
		1067	}
		1068
1001	sub update_slider {	1069	sub update_slider {
1002	my ($self) = @_;	1070	my ($self) = @_;
1003		1071
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1072	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1005	}	1073	}
…		…
1020	$self->SUPER::invoke_size_allocate ($w, $h)	1088	$self->SUPER::invoke_size_allocate ($w, $h)
1021	}	1089	}
1022		1090
1023	#############################################################################	1091	#############################################################################
1024		1092
1025	package CFClient::UI::Frame;	1093	package CFPlus::UI::Frame;
1026		1094
1027	our @ISA = CFClient::UI::Bin::;	1095	our @ISA = CFPlus::UI::Bin::;
1028		1096
1029	use CFClient::OpenGL;	1097	use CFPlus::OpenGL;
1030		1098
1031	sub new {	1099	sub new {
1032	my $class = shift;	1100	my $class = shift;
1033		1101
1034	$class->SUPER::new (	1102	$class->SUPER::new (
…		…
1060	$self->SUPER::_draw;	1128	$self->SUPER::_draw;
1061	}	1129	}
1062		1130
1063	#############################################################################	1131	#############################################################################
1064		1132
1065	package CFClient::UI::FancyFrame;	1133	package CFPlus::UI::FancyFrame;
1066		1134
1067	our @ISA = CFClient::UI::Bin::;	1135	our @ISA = CFPlus::UI::Bin::;
1068		1136
1069	use CFClient::OpenGL;	1137	use CFPlus::OpenGL;
1070		1138
1071	my $bg =	1139	my $bg =
1072	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1140	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1073	mipmap => 1, wrap => 1;	1141	mipmap => 1, wrap => 1;
1074		1142
1075	my @border =	1143	my @border =
1076	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1144	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1077	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1145	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1078		1146
1079	sub new {	1147	sub new {
1080	my ($class, %arg) = @_;	1148	my ($class, %arg) = @_;
1081		1149
…		…
1087	min_w => 64,	1155	min_w => 64,
1088	min_h => 32,	1156	min_h => 32,
1089	%arg,	1157	%arg,
1090	);	1158	);
1091		1159
1092	$self->{title_widget} = new CFClient::UI::Label	1160	$self->{title_widget} = new CFPlus::UI::Label
1093	align => 0,	1161	align => 0,
1094	valign => 1,	1162	valign => 1,
1095	text => $self->{title},	1163	text => $self->{title},
1096	fontsize => $self->{border},	1164	fontsize => $self->{border},
1097	if exists $self->{title};	1165	if exists $self->{title};
1098		1166
1099	if ($self->{has_close_button}) {	1167	if ($self->{has_close_button}) {
1100	$self->{close_button} =	1168	$self->{close_button} =
1101	new CFClient::UI::ImageButton	1169	new CFPlus::UI::ImageButton
1102	path => 'x1_close.png',	1170	path => 'x1_close.png',
1103	on_activate => sub { $self->emit ("delete") };	1171	on_activate => sub { $self->emit ("delete") };
1104		1172
1105	$self->CFClient::UI::Container::add ($self->{close_button});	1173	$self->CFPlus::UI::Container::add ($self->{close_button});
1106	}	1174	}
1107		1175
1108	$self	1176	$self
1109	}	1177	}
1110		1178
1111	sub add {	1179	sub add {
1112	my ($self, @widgets) = @_;	1180	my ($self, @widgets) = @_;
1113		1181
1114	$self->SUPER::add (@widgets);	1182	$self->SUPER::add (@widgets);
1115	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1183	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1116	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1184	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1117	}	1185	}
1118		1186
1119	sub border {	1187	sub border {
1120	int $_[0]{border} * $::FONTSIZE	1188	int $_[0]{border} * $::FONTSIZE
1121	}	1189	}
…		…
1229	$self->{motion}->($ev, $x, $y) if $self->{motion};	1297	$self->{motion}->($ev, $x, $y) if $self->{motion};
1230		1298
1231	! ! $self->{motion}	1299	! ! $self->{motion}
1232	}	1300	}
1233		1301
		1302	sub invoke_visibility_change {
		1303	my ($self, $visible) = @_;
		1304
		1305	delete $self->{motion} unless $visible;
		1306
		1307	0
		1308	}
		1309
1234	sub _draw {	1310	sub _draw {
1235	my ($self) = @_;	1311	my ($self) = @_;
1236		1312
1237	my $child = $self->{children}[0];	1313	my $child = $self->{children}[0];
1238		1314
…		…
1275	if $self->{close_button};	1351	if $self->{close_button};
1276	}	1352	}
1277		1353
1278	#############################################################################	1354	#############################################################################
1279		1355
1280	package CFClient::UI::Table;	1356	package CFPlus::UI::Table;
1281		1357
1282	our @ISA = CFClient::UI::Base::;	1358	our @ISA = CFPlus::UI::Base::;
1283		1359
1284	use List::Util qw(max sum);	1360	use List::Util qw(max sum);
1285		1361
1286	use CFClient::OpenGL;	1362	use CFPlus::OpenGL;
1287		1363
1288	sub new {	1364	sub new {
1289	my $class = shift;	1365	my $class = shift;
1290		1366
1291	$class->SUPER::new (	1367	$class->SUPER::new (
…		…
1297	sub children {	1373	sub children {
1298	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1374	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1299	}	1375	}
1300		1376
1301	sub add {	1377	sub add {
1302	my ($self, $x, $y, $child) = @_;	1378	my ($self) = shift;
1303		1379
		1380	while (@_) {
		1381	my ($x, $y, $child) = splice @_, 0, 3, ();
1304	$child->set_parent ($self);	1382	$child->set_parent ($self);
1305	$self->{children}[$y][$x] = $child;	1383	$self->{children}[$y][$x] = $child;
		1384	}
1306		1385
		1386	$self->{force_realloc} = 1;
		1387	$self->{force_size_alloc} = 1;
1307	$self->realloc;	1388	$self->realloc;
1308	}	1389	}
1309		1390
1310	sub remove {	1391	sub remove {
1311	my ($self, $child) = @_;	1392	my ($self, $child) = @_;
…		…
1376		1457
1377	# linearly scale sizes	1458	# linearly scale sizes
1378	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1459	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1379	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1460	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1380		1461
1381	CFClient::UI::harmonize $ws;	1462	CFPlus::UI::harmonize $ws;
1382	CFClient::UI::harmonize $hs;	1463	CFPlus::UI::harmonize $hs;
1383		1464
1384	my $y;	1465	my $y;
1385		1466
1386	for my $r (0 .. $#{$self->{children}}) {	1467	for my $r (0 .. $#{$self->{children}}) {
1387	my $row = $self->{children}[$r]	1468	my $row = $self->{children}[$r]
…		…
1430	}	1511	}
1431	}	1512	}
1432		1513
1433	#############################################################################	1514	#############################################################################
1434		1515
1435	package CFClient::UI::Box;	1516	package CFPlus::UI::Box;
1436		1517
1437	our @ISA = CFClient::UI::Container::;	1518	our @ISA = CFPlus::UI::Container::;
1438		1519
1439	sub size_request {	1520	sub size_request {
1440	my ($self) = @_;	1521	my ($self) = @_;
1441		1522
1442	$self->{vertical}	1523	$self->{vertical}
…		…
1475	$req[$_] += $space * $children[$_]{expand}	1556	$req[$_] += $space * $children[$_]{expand}
1476	for 0 .. $#children;	1557	for 0 .. $#children;
1477	}	1558	}
1478	}	1559	}
1479		1560
1480	CFClient::UI::harmonize \@req;	1561	CFPlus::UI::harmonize \@req;
1481		1562
1482	my $pos = 0;	1563	my $pos = 0;
1483	for (0 .. $#children) {	1564	for (0 .. $#children) {
1484	my $alloc = $req[$_];	1565	my $alloc = $req[$_];
1485	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1566	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1490	1	1571	1
1491	}	1572	}
1492		1573
1493	#############################################################################	1574	#############################################################################
1494		1575
1495	package CFClient::UI::HBox;	1576	package CFPlus::UI::HBox;
1496		1577
1497	our @ISA = CFClient::UI::Box::;	1578	our @ISA = CFPlus::UI::Box::;
1498		1579
1499	sub new {	1580	sub new {
1500	my $class = shift;	1581	my $class = shift;
1501		1582
1502	$class->SUPER::new (	1583	$class->SUPER::new (
…		…
1505	)	1586	)
1506	}	1587	}
1507		1588
1508	#############################################################################	1589	#############################################################################
1509		1590
1510	package CFClient::UI::VBox;	1591	package CFPlus::UI::VBox;
1511		1592
1512	our @ISA = CFClient::UI::Box::;	1593	our @ISA = CFPlus::UI::Box::;
1513		1594
1514	sub new {	1595	sub new {
1515	my $class = shift;	1596	my $class = shift;
1516		1597
1517	$class->SUPER::new (	1598	$class->SUPER::new (
…		…
1520	)	1601	)
1521	}	1602	}
1522		1603
1523	#############################################################################	1604	#############################################################################
1524		1605
1525	package CFClient::UI::Label;	1606	package CFPlus::UI::Label;
1526		1607
1527	our @ISA = CFClient::UI::DrawBG::;	1608	our @ISA = CFPlus::UI::DrawBG::;
1528		1609
1529	use CFClient::OpenGL;	1610	use CFPlus::OpenGL;
1530		1611
1531	sub new {	1612	sub new {
1532	my ($class, %arg) = @_;	1613	my ($class, %arg) = @_;
1533		1614
1534	my $self = $class->SUPER::new (	1615	my $self = $class->SUPER::new (
…		…
1537	#active_bg => none	1618	#active_bg => none
1538	#font => default_font	1619	#font => default_font
1539	#text => initial text	1620	#text => initial text
1540	#markup => initial narkup	1621	#markup => initial narkup
1541	#max_w => maximum pixel width	1622	#max_w => maximum pixel width
		1623	#style => 0, # render flags
1542	ellipsise => 3, # end	1624	ellipsise => 3, # end
1543	layout => (new CFClient::Layout),	1625	layout => (new CFPlus::Layout),
1544	fontsize => 1,	1626	fontsize => 1,
1545	align => -1,	1627	align => -1,
1546	valign => -1,	1628	valign => -1,
1547	padding_x => 2,	1629	padding_x => 2,
1548	padding_y => 2,	1630	padding_y => 2,
1549	can_events => 0,	1631	can_events => 0,
1550	%arg	1632	%arg
1551	);	1633	);
1552		1634
1553	if (exists $self->{template}) {	1635	if (exists $self->{template}) {
1554	my $layout = new CFClient::Layout;	1636	my $layout = new CFPlus::Layout;
1555	$layout->set_text (delete $self->{template});	1637	$layout->set_text (delete $self->{template});
1556	$self->{template} = $layout;	1638	$self->{template} = $layout;
1557	}	1639	}
1558		1640
1559	if (exists $self->{markup}) {	1641	if (exists $self->{markup}) {
…		…
1561	} else {	1643	} else {
1562	$self->set_text (delete $self->{text});	1644	$self->set_text (delete $self->{text});
1563	}	1645	}
1564		1646
1565	$self	1647	$self
1566	}
1567
1568	sub escape($) {
1569	local $_ = $_[0];
1570
1571	s/&/&amp;/g;
1572	s/>/&gt;/g;
1573	s/</&lt;/g;
1574
1575	$_
1576	}	1648	}
1577		1649
1578	sub update {	1650	sub update {
1579	my ($self) = @_;	1651	my ($self) = @_;
1580		1652
…		…
1707	};	1779	};
1708		1780
1709	my $w = List::Util::min $self->{w} + 4, $size->[0];	1781	my $w = List::Util::min $self->{w} + 4, $size->[0];
1710	my $h = List::Util::min $self->{h} + 2, $size->[1];	1782	my $h = List::Util::min $self->{h} + 2, $size->[1];
1711		1783
1712	$self->{layout}->render ($self->{ox}, $self->{oy});	1784	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713	}	1785	}
1714		1786
1715	#############################################################################	1787	#############################################################################
1716		1788
1717	package CFClient::UI::EntryBase;	1789	package CFPlus::UI::EntryBase;
1718		1790
1719	our @ISA = CFClient::UI::Label::;	1791	our @ISA = CFPlus::UI::Label::;
1720		1792
1721	use CFClient::OpenGL;	1793	use CFPlus::OpenGL;
1722		1794
1723	sub new {	1795	sub new {
1724	my $class = shift;	1796	my $class = shift;
1725		1797
1726	$class->SUPER::new (	1798	$class->SUPER::new (
…		…
1788		1860
1789	if ($uni == 8) {	1861	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1862	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	1863	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	1864	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	1865	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	1866	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	1867	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	1868	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	1869	} elsif ($sym == CFPlus::SDLK_HOME) {
1798	$self->{cursor} = 0;	1870	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {	1871	} elsif ($sym == CFPlus::SDLK_END) {
1800	$self->{cursor} = length $text;	1872	$self->{cursor} = length $text;
1801	} elsif ($uni == 27) {	1873	} elsif ($uni == 27) {
1802	$self->emit ('escape');	1874	$self->emit ('escape');
1803	} elsif ($uni) {	1875	} elsif ($uni) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	1876	substr $text, $self->{cursor}++, 0, chr $uni;
…		…
1886	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	1958	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	1959	glEnd;
1888	}	1960	}
1889	}	1961	}
1890		1962
1891	package CFClient::UI::Entry;	1963	package CFPlus::UI::Entry;
1892		1964
1893	our @ISA = CFClient::UI::EntryBase::;	1965	our @ISA = CFPlus::UI::EntryBase::;
1894		1966
1895	use CFClient::OpenGL;	1967	use CFPlus::OpenGL;
1896		1968
1897	sub invoke_key_down {	1969	sub invoke_key_down {
1898	my ($self, $ev) = @_;	1970	my ($self, $ev) = @_;
1899		1971
1900	my $sym = $ev->{sym};	1972	my $sym = $ev->{sym};
…		…
1906	$self->{history_pointer} = -1;	1978	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	1979	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	1980	$self->emit (activate => $txt);
1909	$self->update;	1981	$self->update;
1910		1982
1911	} elsif ($sym == CFClient::SDLK_UP) {	1983	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	1984	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	1985	$self->{history_saveback} = $self->get_text;
1914	}	1986	}
1915	if (@{$self->{history} || []} > 0) {	1987	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	1988	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	1990	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	1991	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1992	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	1993	}
1922		1994
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	1995	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	1996	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1997	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		1998
1927	if ($self->{history_pointer} >= 0) {	1999	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2000	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2009	1
1938	}	2010	}
1939		2011
1940	#############################################################################	2012	#############################################################################
1941		2013
1942	package CFClient::UI::Button;	2014	package CFPlus::UI::Button;
1943		2015
1944	our @ISA = CFClient::UI::Label::;	2016	our @ISA = CFPlus::UI::Label::;
1945		2017
1946	use CFClient::OpenGL;	2018	use CFPlus::OpenGL;
1947		2019
1948	my @tex =	2020	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2021	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2022	qw(b1_button_active.png);
1951		2023
1952	sub new {	2024	sub new {
1953	my $class = shift;	2025	my $class = shift;
1954		2026
…		…
1991	$self->SUPER::_draw;	2063	$self->SUPER::_draw;
1992	}	2064	}
1993		2065
1994	#############################################################################	2066	#############################################################################
1995		2067
		2068	package CFPlus::UI::CheckBox;
		2069
		2070	our @ISA = CFPlus::UI::DrawBG::;
		2071
		2072	my @tex =
		2073	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2074	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2075
		2076	use CFPlus::OpenGL;
		2077
		2078	sub new {
		2079	my $class = shift;
		2080
		2081	$class->SUPER::new (
		2082	padding_x => 2,
		2083	padding_y => 2,
		2084	fg => [1, 1, 1],
		2085	active_fg => [1, 1, 0],
		2086	bg => [0, 0, 0, 0.2],
		2087	active_bg => [1, 1, 1, 0.5],
		2088	state => 0,
		2089	can_hover => 1,
		2090	@_
		2091	)
		2092	}
		2093
		2094	sub size_request {
		2095	my ($self) = @_;
		2096
		2097	(6) x 2
		2098	}
		2099
		2100	sub toggle {
		2101	my ($self) = @_;
		2102
		2103	$self->{state} = !$self->{state};
		2104	$self->emit (changed => $self->{state});
		2105	$self->update;
		2106	}
		2107
		2108	sub invoke_button_down {
		2109	my ($self, $ev, $x, $y) = @_;
		2110
		2111	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2112	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2113	$self->toggle;
		2114	} else {
		2115	return 0
		2116	}
		2117
		2118	1
		2119	}
		2120
		2121	sub _draw {
		2122	my ($self) = @_;
		2123
		2124	$self->SUPER::_draw;
		2125
		2126	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2127
		2128	my ($w, $h) = @$self{qw(w h)};
		2129
		2130	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2131
		2132	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2133
		2134	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2135
		2136	glEnable GL_TEXTURE_2D;
		2137	$tex->draw_quad_alpha (0, 0, $s, $s);
		2138	glDisable GL_TEXTURE_2D;
		2139	}
		2140
		2141	#############################################################################
		2142
		2143	package CFPlus::UI::Image;
		2144
		2145	our @ISA = CFPlus::UI::Base::;
		2146
		2147	use CFPlus::OpenGL;
		2148
		2149	our %texture_cache;
		2150
		2151	sub new {
		2152	my $class = shift;
		2153
		2154	my $self = $class->SUPER::new (
		2155	can_events => 0,
		2156	@_,
		2157	);
		2158
		2159	$self->{path} || $self->{tex}
		2160	or Carp::croak "'path' or 'tex' attributes required";
		2161
		2162	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2163	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2164
		2165	Scalar::Util::weaken $texture_cache{$self->{path}};
		2166
		2167	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2168
		2169	$self
		2170	}
		2171
		2172	sub STORABLE_freeze {
		2173	my ($self, $cloning) = @_;
		2174
		2175	$self->{path}
		2176	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2177
		2178	$self->{path}
		2179	}
		2180
		2181	sub STORABLE_attach {
		2182	my ($self, $cloning, $path) = @_;
		2183
		2184	$self->new (path => $path)
		2185	}
		2186
		2187	sub size_request {
		2188	my ($self) = @_;
		2189
		2190	($self->{tex}{w}, $self->{tex}{h})
		2191	}
		2192
		2193	sub _draw {
		2194	my ($self) = @_;
		2195
		2196	my $tex = $self->{tex};
		2197
		2198	my ($w, $h) = ($self->{w}, $self->{h});
		2199
		2200	if ($self->{rot90}) {
		2201	glRotate 90, 0, 0, 1;
		2202	glTranslate 0, -$self->{w}, 0;
		2203
		2204	($w, $h) = ($h, $w);
		2205	}
		2206
		2207	glEnable GL_TEXTURE_2D;
		2208	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2209
		2210	$tex->draw_quad (0, 0, $w, $h);
		2211
		2212	glDisable GL_TEXTURE_2D;
		2213	}
		2214
		2215	#############################################################################
		2216
1996	package CFClient::UI::ImageButton;	2217	package CFPlus::UI::ImageButton;
1997		2218
1998	our @ISA = CFClient::UI::Image::;	2219	our @ISA = CFPlus::UI::Image::;
1999		2220
2000	use CFClient::OpenGL;	2221	use CFPlus::OpenGL;
2001		2222
2002	my %textures;	2223	my %textures;
2003		2224
2004	sub new {	2225	sub new {
2005	my $class = shift;	2226	my $class = shift;
…		…
2027	1	2248	1
2028	}	2249	}
2029		2250
2030	#############################################################################	2251	#############################################################################
2031		2252
2032	package CFClient::UI::CheckBox;
2033
2034	our @ISA = CFClient::UI::DrawBG::;
2035
2036	my @tex =
2037	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040	use CFClient::OpenGL;
2041
2042	sub new {
2043	my $class = shift;
2044
2045	$class->SUPER::new (
2046	padding_x => 2,
2047	padding_y => 2,
2048	fg => [1, 1, 1],
2049	active_fg => [1, 1, 0],
2050	bg => [0, 0, 0, 0.2],
2051	active_bg => [1, 1, 1, 0.5],
2052	state => 0,
2053	can_hover => 1,
2054	@_
2055	)
2056	}
2057
2058	sub size_request {
2059	my ($self) = @_;
2060
2061	(6) x 2
2062	}
2063
2064	sub toggle {
2065	my ($self) = @_;
2066
2067	$self->{state} = !$self->{state};
2068	$self->emit (changed => $self->{state});
2069	$self->update;
2070	}
2071
2072	sub invoke_button_down {
2073	my ($self, $ev, $x, $y) = @_;
2074
2075	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2076	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2077	$self->toggle;
2078	} else {
2079	return 0
2080	}
2081
2082	1
2083	}
2084
2085	sub _draw {
2086	my ($self) = @_;
2087
2088	$self->SUPER::_draw;
2089
2090	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2091
2092	my ($w, $h) = @$self{qw(w h)};
2093
2094	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2095
2096	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2097
2098	my $tex = $self->{state} ? $tex[1] : $tex[0];
2099
2100	glEnable GL_TEXTURE_2D;
2101	$tex->draw_quad_alpha (0, 0, $s, $s);
2102	glDisable GL_TEXTURE_2D;
2103	}
2104
2105	#############################################################################
2106
2107	package CFClient::UI::Image;	2253	package CFPlus::UI::VGauge;
2108		2254
2109	our @ISA = CFClient::UI::Base::;	2255	our @ISA = CFPlus::UI::Base::;
2110
2111	use CFClient::OpenGL;
2112
2113	our %texture_cache;
2114
2115	sub new {
2116	my $class = shift;
2117
2118	my $self = $class->SUPER::new (
2119	can_events => 0,
2120	@_,
2121	);
2122
2123	$self->{path}
2124	or Carp::croak "required attribute 'path' not set";
2125
2126	$self->{tex} = $texture_cache{$self->{path}} ||=
2127	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2128
2129	Scalar::Util::weaken $texture_cache{$self->{path}};
2130
2131	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2132
2133	$self
2134	}
2135
2136	sub size_request {
2137	my ($self) = @_;
2138
2139	($self->{tex}{w}, $self->{tex}{h})
2140	}
2141
2142	sub _draw {
2143	my ($self) = @_;
2144
2145	my $tex = $self->{tex};
2146
2147	my ($w, $h) = ($self->{w}, $self->{h});
2148
2149	if ($self->{rot90}) {
2150	glRotate 90, 0, 0, 1;
2151	glTranslate 0, -$self->{w}, 0;
2152
2153	($w, $h) = ($h, $w);
2154	}
2155
2156	glEnable GL_TEXTURE_2D;
2157	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158
2159	$tex->draw_quad_alpha (0, 0, $w, $h);
2160
2161	glDisable GL_TEXTURE_2D;
2162	}
2163
2164	#############################################################################
2165
2166	package CFClient::UI::VGauge;
2167
2168	our @ISA = CFClient::UI::Base::;
2169		2256
2170	use List::Util qw(min max);	2257	use List::Util qw(min max);
2171		2258
2172	use CFClient::OpenGL;	2259	use CFPlus::OpenGL;
2173		2260
2174	my %tex = (	2261	my %tex = (
2175	food => [	2262	food => [
2176	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2263	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2177	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2264	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2178	],	2265	],
2179	grace => [	2266	grace => [
2180	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2267	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2181	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2268	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2182	],	2269	],
2183	hp => [	2270	hp => [
2184	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2271	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2185	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2272	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2186	],	2273	],
2187	mana => [	2274	mana => [
2188	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2275	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2276	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2190	],	2277	],
2191	);	2278	);
2192		2279
2193	# eg. VGauge->new (gauge => 'food'), default gauge: food	2280	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2296	glDisable GL_TEXTURE_2D;	2383	glDisable GL_TEXTURE_2D;
2297	}	2384	}
2298		2385
2299	#############################################################################	2386	#############################################################################
2300		2387
2301	package CFClient::UI::Gauge;	2388	package CFPlus::UI::Gauge;
2302		2389
2303	our @ISA = CFClient::UI::VBox::;	2390	our @ISA = CFPlus::UI::VBox::;
2304		2391
2305	sub new {	2392	sub new {
2306	my ($class, %arg) = @_;	2393	my ($class, %arg) = @_;
2307		2394
2308	my $self = $class->SUPER::new (	2395	my $self = $class->SUPER::new (
…		…
2310	can_hover => 1,	2397	can_hover => 1,
2311	can_events => 1,	2398	can_events => 1,
2312	%arg,	2399	%arg,
2313	);	2400	);
2314		2401
2315	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2402	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2316	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2403	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2317	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2404	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2318		2405
2319	$self	2406	$self
2320	}	2407	}
2321		2408
2322	sub set_fontsize {	2409	sub set_fontsize {
…		…
2343	$self->{value}->set_text ($val);	2430	$self->{value}->set_text ($val);
2344	}	2431	}
2345		2432
2346	#############################################################################	2433	#############################################################################
2347		2434
2348	package CFClient::UI::Slider;	2435	package CFPlus::UI::Slider;
2349		2436
2350	use strict;	2437	use strict;
2351		2438
2352	use CFClient::OpenGL;	2439	use CFPlus::OpenGL;
2353		2440
2354	our @ISA = CFClient::UI::DrawBG::;	2441	our @ISA = CFPlus::UI::DrawBG::;
2355		2442
2356	my @tex =	2443	my @tex =
2357	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2444	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2358	qw(s1_slider.png s1_slider_bg.png);	2445	qw(s1_slider.png s1_slider_bg.png);
2359		2446
2360	sub new {	2447	sub new {
2361	my $class = shift;	2448	my $class = shift;
2362		2449
…		…
2451	}	2538	}
2452		2539
2453	1	2540	1
2454	}	2541	}
2455		2542
		2543	sub invoke_mouse_wheel {
		2544	my ($self, $ev) = @_;
		2545
		2546	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2547
		2548	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2549
		2550	! ! $delta
		2551	}
		2552
2456	sub update {	2553	sub update {
2457	my ($self) = @_;	2554	my ($self) = @_;
2458		2555
2459	delete $self->{knob_w};	2556	delete $self->{knob_w};
2460	$self->SUPER::update;	2557	$self->SUPER::update;
…		…
2507	glDisable GL_TEXTURE_2D;	2604	glDisable GL_TEXTURE_2D;
2508	}	2605	}
2509		2606
2510	#############################################################################	2607	#############################################################################
2511		2608
2512	package CFClient::UI::ValSlider;	2609	package CFPlus::UI::ValSlider;
2513		2610
2514	our @ISA = CFClient::UI::HBox::;	2611	our @ISA = CFPlus::UI::HBox::;
2515		2612
2516	sub new {	2613	sub new {
2517	my ($class, %arg) = @_;	2614	my ($class, %arg) = @_;
2518		2615
2519	my $range = delete $arg{range};	2616	my $range = delete $arg{range};
2520		2617
2521	my $self = $class->SUPER::new (	2618	my $self = $class->SUPER::new (
2522	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2619	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2523	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2620	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2524	to_value => sub { shift },	2621	to_value => sub { shift },
2525	from_value => sub { shift },	2622	from_value => sub { shift },
2526	%arg,	2623	%arg,
2527	);	2624	);
2528		2625
…		…
2548	sub set_range { shift->{slider}->set_range (@_) }	2645	sub set_range { shift->{slider}->set_range (@_) }
2549	sub set_value { shift->{slider}->set_value (@_) }	2646	sub set_value { shift->{slider}->set_value (@_) }
2550		2647
2551	#############################################################################	2648	#############################################################################
2552		2649
2553	package CFClient::UI::TextScroller;	2650	package CFPlus::UI::TextScroller;
2554		2651
2555	our @ISA = CFClient::UI::HBox::;	2652	our @ISA = CFPlus::UI::HBox::;
2556		2653
2557	use CFClient::OpenGL;	2654	use CFPlus::OpenGL;
2558		2655
2559	sub new {	2656	sub new {
2560	my $class = shift;	2657	my $class = shift;
2561		2658
2562	my $self = $class->SUPER::new (	2659	my $self = $class->SUPER::new (
2563	fontsize => 1,	2660	fontsize => 1,
2564	can_events => 0,	2661	can_events => 1,
2565	indent => 0,	2662	indent => 0,
2566	#font => default_font	2663	#font => default_font
2567	@_,	2664	@_,
2568		2665
2569	layout => (new CFClient::Layout),	2666	layout => (new CFPlus::Layout),
2570	par => [],	2667	par => [],
2571	height => 0,	2668	height => 0,
2572	children => [	2669	children => [
2573	(new CFClient::UI::Empty expand => 1),	2670	(new CFPlus::UI::Empty expand => 1),
2574	(new CFClient::UI::Slider vertical => 1),	2671	(new CFPlus::UI::Slider vertical => 1),
2575	],	2672	],
2576	);	2673	);
2577		2674
2578	$self->{children}[1]->connect (changed => sub { $self->update });	2675	$self->{children}[1]->connect (changed => sub { $self->update });
2579		2676
…		…
2609		2706
2610	$self->reflow;	2707	$self->reflow;
2611		2708
2612	local $self->{children} = [$empty, $slider];	2709	local $self->{children} = [$empty, $slider];
2613	$self->SUPER::invoke_size_allocate ($w, $h)	2710	$self->SUPER::invoke_size_allocate ($w, $h)
		2711	}
		2712
		2713	sub invoke_mouse_wheel {
		2714	my ($self, $ev) = @_;
		2715
		2716	return 0 unless $ev->{dy}; # only vertical movements
		2717
		2718	$self->{children}[1]->emit (mouse_wheel => $ev);
		2719
		2720	1
2614	}	2721	}
2615		2722
2616	sub get_layout {	2723	sub get_layout {
2617	my ($self, $para) = @_;	2724	my ($self, $para) = @_;
2618		2725
…		…
2658	$self->{height} = 0;	2765	$self->{height} = 0;
2659	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2766	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2660	}	2767	}
2661		2768
2662	sub add_paragraph {	2769	sub add_paragraph {
2663	my ($self, $color, $para, $indent) = @_;	2770	my $self = shift;
2664		2771
2665	my ($text, @w) = ref $para ? @$para : $para;	2772	for my $para (@_) {
2666
2667	$para = {	2773	$para = {
		2774	fg => [1, 1, 1, 1],
		2775	indent => 0,
		2776	markup => "",
		2777	widget => [],
		2778	ref $para ? %$para : (markup => $para),
2668	w => 1e10,	2779	w => 1e10,
2669	wrapped => 1,	2780	wrapped => 1,
2670	fg => $color,
2671	indent => $indent,
2672	markup => $text,
2673	widget => \@w,
2674	};	2781	};
2675		2782
2676	$self->add (@w) if @w;	2783	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2677	push @{$self->{par}}, $para;	2784	push @{$self->{par}}, $para;
		2785	}
2678		2786
2679	$self->{need_reflow}++;	2787	$self->{need_reflow}++;
2680	$self->update;	2788	$self->update;
2681	}	2789	}
2682		2790
…		…
2724		2832
2725	if (delete $self->{scroll_to_bottom}) {	2833	if (delete $self->{scroll_to_bottom}) {
2726	$self->{children}[1]->set_value (1e10);	2834	$self->{children}[1]->set_value (1e10);
2727	}	2835	}
2728		2836
2729	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2837	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2730	glClearColor 0, 0, 0, 0;	2838	glClearColor 0, 0, 0, 0;
2731	glClear GL_COLOR_BUFFER_BIT;	2839	glClear GL_COLOR_BUFFER_BIT;
2732		2840
2733	my $top = int $self->{children}[1]{range}[0];	2841	my $top = int $self->{children}[1]{range}[0];
2734		2842
…		…
2787	$self->{children}[1]->draw;	2895	$self->{children}[1]->draw;
2788	}	2896	}
2789		2897
2790	#############################################################################	2898	#############################################################################
2791		2899
2792	package CFClient::UI::Animator;	2900	package CFPlus::UI::Animator;
2793		2901
2794	use CFClient::OpenGL;	2902	use CFPlus::OpenGL;
2795		2903
2796	our @ISA = CFClient::UI::Bin::;	2904	our @ISA = CFPlus::UI::Bin::;
2797		2905
2798	sub moveto {	2906	sub moveto {
2799	my ($self, $x, $y) = @_;	2907	my ($self, $x, $y) = @_;
2800		2908
2801	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2909	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2829	glPopMatrix;	2937	glPopMatrix;
2830	}	2938	}
2831		2939
2832	#############################################################################	2940	#############################################################################
2833		2941
2834	package CFClient::UI::Flopper;	2942	package CFPlus::UI::Flopper;
2835		2943
2836	our @ISA = CFClient::UI::Button::;	2944	our @ISA = CFPlus::UI::Button::;
2837		2945
2838	sub new {	2946	sub new {
2839	my $class = shift;	2947	my $class = shift;
2840		2948
2841	my $self = $class->SUPER::new (	2949	my $self = $class->SUPER::new (
…		…
2853	$self->{other}->toggle_visibility;	2961	$self->{other}->toggle_visibility;
2854	}	2962	}
2855		2963
2856	#############################################################################	2964	#############################################################################
2857		2965
2858	package CFClient::UI::Tooltip;	2966	package CFPlus::UI::Tooltip;
2859		2967
2860	our @ISA = CFClient::UI::Bin::;	2968	our @ISA = CFPlus::UI::Bin::;
2861		2969
2862	use CFClient::OpenGL;	2970	use CFPlus::OpenGL;
2863		2971
2864	sub new {	2972	sub new {
2865	my $class = shift;	2973	my $class = shift;
2866		2974
2867	$class->SUPER::new (	2975	$class->SUPER::new (
…		…
2870	)	2978	)
2871	}	2979	}
2872		2980
2873	sub set_tooltip_from {	2981	sub set_tooltip_from {
2874	my ($self, $widget) = @_;	2982	my ($self, $widget) = @_;
		2983
		2984	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		2985	if $widget->{tooltip} =~ /^#(.*)$/;
2875		2986
2876	my $tooltip = $widget->{tooltip};	2987	my $tooltip = $widget->{tooltip};
2877		2988
2878	if ($ENV{CFPLUS_DEBUG} & 2) {	2989	if ($ENV{CFPLUS_DEBUG} & 2) {
2879	$tooltip .= "\n\n" . (ref $widget) . "\n"	2990	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2883	}	2994	}
2884		2995
2885	$tooltip =~ s/^\n+//;	2996	$tooltip =~ s/^\n+//;
2886	$tooltip =~ s/\n+$//;	2997	$tooltip =~ s/\n+$//;
2887		2998
2888	$self->add (new CFClient::UI::Label	2999	$self->add (new CFPlus::UI::Label
2889	markup => $tooltip,	3000	markup => $tooltip,
2890	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3001	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891	fontsize => 0.8,	3002	fontsize => 0.8,
2892	fg => [0, 0, 0, 1],	3003	style => 1, # FLAG_INVERSE
2893	ellipsise => 0,	3004	ellipsise => 0,
2894	font => ($widget->{tooltip_font} || $::FONT_PROP),	3005	font => ($widget->{tooltip_font} || $::FONT_PROP),
2895	);	3006	);
2896	}	3007	}
2897		3008
…		…
2916		3027
2917	$self->{root}->on_post_alloc ("move_$self" => sub {	3028	$self->{root}->on_post_alloc ("move_$self" => sub {
2918	my $widget = $self->{owner}	3029	my $widget = $self->{owner}
2919	or return;	3030	or return;
2920		3031
		3032	if ($widget->{visible}) {
2921	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3033	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922		3034
2923	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3035	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924	if $x + $self->{w} > $self->{root}{w};	3036	if $x + $self->{w} > $self->{root}{w};
2925		3037
2926	$self->move_abs ($x, $y);	3038	$self->move_abs ($x, $y);
		3039	} else {
		3040	$self->hide;
		3041	}
2927	});	3042	});
2928	}	3043	}
2929		3044
2930	sub _draw {	3045	sub _draw {
2931	my ($self) = @_;	3046	my ($self) = @_;
…		…
2955	$self->SUPER::_draw;	3070	$self->SUPER::_draw;
2956	}	3071	}
2957		3072
2958	#############################################################################	3073	#############################################################################
2959		3074
2960	package CFClient::UI::Face;	3075	package CFPlus::UI::Face;
2961		3076
2962	our @ISA = CFClient::UI::Base::;	3077	our @ISA = CFPlus::UI::DrawBG::;
2963		3078
2964	use CFClient::OpenGL;	3079	use CFPlus::OpenGL;
2965		3080
2966	sub new {	3081	sub new {
2967	my $class = shift;	3082	my $class = shift;
2968		3083
2969	my $self = $class->SUPER::new (	3084	my $self = $class->SUPER::new (
…		…
3004	sub _draw {	3119	sub _draw {
3005	my ($self) = @_;	3120	my ($self) = @_;
3006		3121
3007	return unless $::CONN;	3122	return unless $::CONN;
3008		3123
		3124	$self->SUPER::_draw;
		3125
3009	my $face;	3126	my $face;
3010		3127
3011	if ($self->{frame}) {	3128	if ($self->{frame}) {
3012	my $anim = $::CONN->{anim}[$self->{anim}];	3129	my $anim = $::CONN->{anim}[$self->{anim}];
3013		3130
…		…
3035	$self->SUPER::destroy;	3152	$self->SUPER::destroy;
3036	}	3153	}
3037		3154
3038	#############################################################################	3155	#############################################################################
3039		3156
3040	package CFClient::UI::Buttonbar;	3157	package CFPlus::UI::Buttonbar;
3041		3158
3042	our @ISA = CFClient::UI::HBox::;	3159	our @ISA = CFPlus::UI::HBox::;
3043		3160
3044	# TODO: should actualyl wrap buttons and other goodies.	3161	# TODO: should actualyl wrap buttons and other goodies.
3045		3162
3046	#############################################################################	3163	#############################################################################
3047		3164
3048	package CFClient::UI::Menu;	3165	package CFPlus::UI::Menu;
3049		3166
3050	our @ISA = CFClient::UI::FancyFrame::;	3167	our @ISA = CFPlus::UI::FancyFrame::;
3051		3168
3052	use CFClient::OpenGL;	3169	use CFPlus::OpenGL;
3053		3170
3054	sub new {	3171	sub new {
3055	my $class = shift;	3172	my $class = shift;
3056		3173
3057	my $self = $class->SUPER::new (	3174	my $self = $class->SUPER::new (
3058	items => [],	3175	items => [],
3059	z => 100,	3176	z => 100,
3060	@_,	3177	@_,
3061	);	3178	);
3062		3179
3063	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3180	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064		3181
3065	for my $item (@{ $self->{items} }) {	3182	for my $item (@{ $self->{items} }) {
3066	my ($widget, $cb, $tooltip) = @$item;	3183	my ($widget, $cb, $tooltip) = @$item;
3067		3184
3068	# handle various types of items, only text for now	3185	# handle various types of items, only text for now
3069	if (!ref $widget) {	3186	if (!ref $widget) {
3070	if ($widget =~ /\t/) {	3187	if ($widget =~ /\t/) {
3071	my ($left, $right) = split /\t/, $widget, 2;	3188	my ($left, $right) = split /\t/, $widget, 2;
3072		3189
3073	$widget = new CFClient::UI::HBox	3190	$widget = new CFPlus::UI::HBox
3074	can_hover => 1,	3191	can_hover => 1,
3075	can_events => 1,	3192	can_events => 1,
3076	tooltip => $tooltip,	3193	tooltip => $tooltip,
3077	children => [	3194	children => [
3078	(new CFClient::UI::Label markup => $left, expand => 1),	3195	(new CFPlus::UI::Label markup => $left, expand => 1),
3079	(new CFClient::UI::Label markup => $right, align => +1),	3196	(new CFPlus::UI::Label markup => $right, align => +1),
3080	],	3197	],
3081	;	3198	;
3082		3199
3083	} else {	3200	} else {
3084	$widget = new CFClient::UI::Label	3201	$widget = new CFPlus::UI::Label
3085	can_hover => 1,	3202	can_hover => 1,
3086	can_events => 1,	3203	can_events => 1,
3087	markup => $widget,	3204	markup => $widget,
3088	tooltip => $tooltip;	3205	tooltip => $tooltip;
3089	}	3206	}
…		…
3137	1	3254	1
3138	}	3255	}
3139		3256
3140	#############################################################################	3257	#############################################################################
3141		3258
3142	package CFClient::UI::Multiplexer;	3259	package CFPlus::UI::Multiplexer;
3143		3260
3144	our @ISA = CFClient::UI::Container::;	3261	our @ISA = CFPlus::UI::Container::;
3145		3262
3146	sub new {	3263	sub new {
3147	my $class = shift;	3264	my $class = shift;
3148		3265
3149	my $self = $class->SUPER::new (	3266	my $self = $class->SUPER::new (
…		…
3210	$self->{current}->draw;	3327	$self->{current}->draw;
3211	}	3328	}
3212		3329
3213	#############################################################################	3330	#############################################################################
3214		3331
3215	package CFClient::UI::Notebook;	3332	package CFPlus::UI::Notebook;
3216		3333
3217	our @ISA = CFClient::UI::VBox::;	3334	our @ISA = CFPlus::UI::VBox::;
3218		3335
3219	sub new {	3336	sub new {
3220	my $class = shift;	3337	my $class = shift;
3221		3338
3222	my $self = $class->SUPER::new (	3339	my $self = $class->SUPER::new (
3223	buttonbar => (new CFClient::UI::Buttonbar),	3340	buttonbar => (new CFPlus::UI::Buttonbar),
3224	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3341	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3225	# filter => # will be put between multiplexer and $self	3342	# filter => # will be put between multiplexer and $self
3226	@_,	3343	@_,
3227	);	3344	);
3228		3345
3229	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3346	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3235	sub add {	3352	sub add {
3236	my ($self, $title, $widget, $tooltip) = @_;	3353	my ($self, $title, $widget, $tooltip) = @_;
3237		3354
3238	Scalar::Util::weaken $self;	3355	Scalar::Util::weaken $self;
3239		3356
3240	$self->{buttonbar}->add (new CFClient::UI::Button	3357	$self->{buttonbar}->add (new CFPlus::UI::Button
3241	markup => $title,	3358	markup => $title,
3242	tooltip => $tooltip,	3359	tooltip => $tooltip,
3243	on_activate => sub { $self->set_current_page ($widget) },	3360	on_activate => sub { $self->set_current_page ($widget) },
3244	);	3361	);
3245		3362
…		…
3259	$self->emit (page_changed => $self->{multiplexer}{current});	3376	$self->emit (page_changed => $self->{multiplexer}{current});
3260	}	3377	}
3261		3378
3262	#############################################################################	3379	#############################################################################
3263		3380
3264	package CFClient::UI::Combobox;	3381	package CFPlus::UI::Selector;
3265		3382
3266	use utf8;	3383	use utf8;
3267		3384
3268	our @ISA = CFClient::UI::Button::;	3385	our @ISA = CFPlus::UI::Button::;
3269		3386
3270	sub new {	3387	sub new {
3271	my $class = shift;	3388	my $class = shift;
3272		3389
3273	my $self = $class->SUPER::new (	3390	my $self = $class->SUPER::new (
…		…
3290	my ($value, $title, $tooltip) = @$_;	3407	my ($value, $title, $tooltip) = @$_;
3291		3408
3292	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3409	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3293	}	3410	}
3294		3411
3295	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3412	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3296	}	3413	}
3297		3414
3298	sub _set_value {	3415	sub _set_value {
3299	my ($self, $value) = @_;	3416	my ($self, $value) = @_;
3300		3417
…		…
3315	$self->emit (changed => $value);	3432	$self->emit (changed => $value);
3316	}	3433	}
3317		3434
3318	#############################################################################	3435	#############################################################################
3319		3436
3320	package CFClient::UI::Statusbox;	3437	package CFPlus::UI::Statusbox;
3321		3438
3322	our @ISA = CFClient::UI::VBox::;	3439	our @ISA = CFPlus::UI::VBox::;
3323		3440
3324	sub new {	3441	sub new {
3325	my $class = shift;	3442	my $class = shift;
3326		3443
3327	my $self = $class->SUPER::new (	3444	my $self = $class->SUPER::new (
…		…
3339	sub reorder {	3456	sub reorder {
3340	my ($self) = @_;	3457	my ($self) = @_;
3341	my $NOW = Time::HiRes::time;	3458	my $NOW = Time::HiRes::time;
3342		3459
3343	# freeze display when hovering over any label	3460	# freeze display when hovering over any label
3344	return if $CFClient::UI::TOOLTIP->{owner}	3461	return if $CFPlus::UI::TOOLTIP->{owner}
3345	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3462	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3346	values %{ $self->{item} };	3463	values %{ $self->{item} };
3347		3464
3348	while (my ($k, $v) = each %{ $self->{item} }) {	3465	while (my ($k, $v) = each %{ $self->{item} }) {
3349	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3466	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3350	}	3467	}
…		…
3371	for ($short) {	3488	for ($short) {
3372	s/^\s+//;	3489	s/^\s+//;
3373	s/\s+/ /g;	3490	s/\s+/ /g;
3374	}	3491	}
3375		3492
3376	new CFClient::UI::Label	3493	new CFPlus::UI::Label
3377	markup => $short,	3494	markup => $short,
3378	tooltip => $item->{tooltip},	3495	tooltip => $item->{tooltip},
3379	tooltip_font => $::FONT_PROP,	3496	tooltip_font => $::FONT_PROP,
3380	tooltip_width => 0.67,	3497	tooltip_width => 0.67,
3381	fontsize => $item->{fontsize} || $self->{fontsize},	3498	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3460	$self->SUPER::destroy;	3577	$self->SUPER::destroy;
3461	}	3578	}
3462		3579
3463	#############################################################################	3580	#############################################################################
3464		3581
3465	package CFClient::UI::Inventory;	3582	package CFPlus::UI::Inventory;
3466		3583
3467	our @ISA = CFClient::UI::Table::;	3584	our @ISA = CFPlus::UI::Table::;
3468		3585
3469	sub new {	3586	sub new {
3470	my $class = shift;	3587	my $class = shift;
3471		3588
3472	my $self = $class->SUPER::new (	3589	my $self = $class->SUPER::new (
3473	col_expand => [0, 1, 0],	3590	col_expand => [0, 1, 0],
		3591	items => [],
3474	@_,	3592	@_,
3475	);	3593	);
3476		3594
		3595	$self->set_sort_order (undef);
		3596
3477	$self	3597	$self
		3598	}
		3599
		3600	sub update_items {
		3601	my ($self) = @_;
		3602
		3603	$self->clear;
		3604
		3605	my @item = $self->{sort}->(@{ $self->{items} });
		3606
		3607	my @adds;
		3608	my $row = 0;
		3609	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3610	CFPlus::Item::update_widgets $item;
		3611
		3612	push @adds, 0, $row, $item->{face_widget};
		3613	push @adds, 1, $row, $item->{desc_widget};
		3614	push @adds, 2, $row, $item->{weight_widget};
		3615
		3616	$row++;
		3617	}
		3618
		3619	$self->add (@adds);
		3620	}
		3621
		3622	sub set_sort_order {
		3623	my ($self, $order) = @_;
		3624
		3625	$self->{sort} = $order ||= sub {
		3626	sort {
		3627	$a->{type} <=> $b->{type}
		3628	or $a->{name} cmp $b->{name}
		3629	} @_
		3630	};
		3631
		3632	$self->update_items;
3478	}	3633	}
3479		3634
3480	sub set_items {	3635	sub set_items {
3481	my ($self, $items) = @_;	3636	my ($self, $items) = @_;
3482		3637
3483	$self->clear;	3638	$self->{items} = [$items ? values %$items : ()];
3484	return unless $items;	3639	$self->update_items;
3485
3486	my @items = sort {
3487	($a->{type} <=> $b->{type})
3488	or ($a->{name} cmp $b->{name})
3489	} values %$items;
3490
3491	$self->{real_items} = \@items;
3492
3493	my $row = 0;
3494	for my $item (@items) {
3495	CFClient::Item::update_widgets $item;
3496
3497	$self->add (0, $row, $item->{face_widget});
3498	$self->add (1, $row, $item->{desc_widget});
3499	$self->add (2, $row, $item->{weight_widget});
3500
3501	$row++;
3502	}
3503	}	3640	}
3504		3641
3505	#############################################################################	3642	#############################################################################
3506		3643
3507	package CFClient::UI::SpellList;	3644	package CFPlus::UI::SpellList;
3508		3645
3509	our @ISA = CFClient::UI::Table::;	3646	our @ISA = CFPlus::UI::Table::;
3510		3647
3511	sub new {	3648	sub new {
3512	my $class = shift;	3649	my $class = shift;
3513		3650
3514	my $self = $class->SUPER::new (	3651	my $self = $class->SUPER::new (
…		…
3532	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3669	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3533		3670
3534	sub rebuild_spell_list {	3671	sub rebuild_spell_list {
3535	my ($self) = @_;	3672	my ($self) = @_;
3536		3673
3537	$CFClient::UI::ROOT->on_refresh ($self => sub {	3674	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3538	$self->clear;	3675	$self->clear;
3539		3676
3540	return unless $::CONN;	3677	return unless $::CONN;
3541		3678
3542	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3679	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3543	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3680	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3544	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3681	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3545	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3682	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3546	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3683	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3547		3684
3548	my $row = 0;	3685	my $row = 0;
3549		3686
3550	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3687	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3551	my $spell = $self->{spell}{$_};	3688	my $spell = $self->{spell}{$_};
…		…
3558	if ($ev->{button} == 1) {	3695	if ($ev->{button} == 1) {
3559	$::CONN->user_send ("cast $spell->{name}");	3696	$::CONN->user_send ("cast $spell->{name}");
3560	} elsif ($ev->{button} == 2) {	3697	} elsif ($ev->{button} == 2) {
3561	$::CONN->user_send ("invoke $spell->{name}");	3698	$::CONN->user_send ("invoke $spell->{name}");
3562	} elsif ($ev->{button} == 3) {	3699	} elsif ($ev->{button} == 3) {
3563	(new CFClient::UI::Menu	3700	(new CFPlus::UI::Menu
3564	items => [	3701	items => [
3565	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3702	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3566	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3703	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3567	],	3704	],
3568	)->popup ($ev);	3705	)->popup ($ev);
…		…
3574	};	3711	};
3575		3712
3576	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3713	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3577		3714
3578	#TODO: add path info to tooltip	3715	#TODO: add path info to tooltip
3579	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3716	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3580		3717
3581	$self->add (0, $row, new CFClient::UI::Face	3718	$self->add (0, $row, new CFPlus::UI::Face
3582	face => $spell->{face},	3719	face => $spell->{face},
3583	can_hover => 1,	3720	can_hover => 1,
3584	can_events => 1,	3721	can_events => 1,
3585	tooltip => $tooltip,	3722	tooltip => $tooltip,
3586	on_button_down => $spell_cb,	3723	on_button_down => $spell_cb,
3587	);	3724	);
3588		3725
3589	$self->add (1, $row, new CFClient::UI::Label	3726	$self->add (1, $row, new CFPlus::UI::Label
3590	expand => 1,	3727	expand => 1,
3591	text => $spell->{name},	3728	text => $spell->{name},
3592	can_hover => 1,	3729	can_hover => 1,
3593	can_events => 1,	3730	can_events => 1,
3594	tooltip => $tooltip,	3731	tooltip => $tooltip,
3595	on_button_down => $spell_cb,	3732	on_button_down => $spell_cb,
3596	);	3733	);
3597		3734
3598	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3735	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3599	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3736	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3600	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3737	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3601	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3738	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3602	}	3739	}
3603	});	3740	});
3604	}	3741	}
3605		3742
3606	sub add_spell {	3743	sub add_spell {
…		…
3624	$self->rebuild_spell_list;	3761	$self->rebuild_spell_list;
3625	}	3762	}
3626		3763
3627	#############################################################################	3764	#############################################################################
3628		3765
3629	package CFClient::UI::Root;	3766	package CFPlus::UI::Root;
3630		3767
3631	our @ISA = CFClient::UI::Container::;	3768	our @ISA = CFPlus::UI::Container::;
3632		3769
3633	use List::Util qw(min max);	3770	use List::Util qw(min max);
3634		3771
3635	use CFClient::OpenGL;	3772	use CFPlus::OpenGL;
3636		3773
3637	sub new {	3774	sub new {
3638	my $class = shift;	3775	my $class = shift;
3639		3776
3640	my $self = $class->SUPER::new (	3777	my $self = $class->SUPER::new (
…		…
3819	$h = 0 if $h < 0;	3956	$h = 0 if $h < 0;
3820		3957
3821	$w = max $widget->{min_w}, $w;	3958	$w = max $widget->{min_w}, $w;
3822	$h = max $widget->{min_h}, $h;	3959	$h = max $widget->{min_h}, $h;
3823		3960
		3961	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3962	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3963
3824	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	3964	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3825	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	3965	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3826		3966
3827	$w = int $w + 0.5;	3967	$w = int $w + 0.5;
3828	$h = int $h + 0.5;	3968	$h = int $h + 0.5;
…		…
3854	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3994	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3855	glMatrixMode GL_MODELVIEW;	3995	glMatrixMode GL_MODELVIEW;
3856	glLoadIdentity;	3996	glLoadIdentity;
3857		3997
3858	{	3998	{
3859	package CFClient::UI::Base;	3999	package CFPlus::UI::Base;
3860		4000
3861	($draw_x, $draw_y, $draw_w, $draw_h) =	4001	($draw_x, $draw_y, $draw_w, $draw_h) =
3862	(0, 0, $self->{w}, $self->{h});	4002	(0, 0, $self->{w}, $self->{h});
3863	}	4003	}
3864		4004
3865	$self->_draw;	4005	$self->_draw;
3866	}	4006	}
3867		4007
3868	#############################################################################	4008	#############################################################################
3869		4009
3870	package CFClient::UI;	4010	package CFPlus::UI;
3871		4011
3872	$ROOT = new CFClient::UI::Root;	4012	$ROOT = new CFPlus::UI::Root;
3873	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4013	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3874		4014
3875	1	4015	1
3876		4016

Diff Legend

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