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.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.348 by root, Thu Aug 17 01:27:28 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) = @_;
		443
		444	Carp::confess unless $self->{parent};#d#
418		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 {
…		…
456		483
457	sub invoke_mouse_motion { 0 }	484	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 0 }	485	sub invoke_button_up { 0 }
459	sub invoke_key_down { 0 }	486	sub invoke_key_down { 0 }
460	sub invoke_key_up { 0 }	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;
…		…
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
479	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480		527
481	#d##TODO# stop propagating at first true, do not use sum	528	#d##TODO# stop propagating at first true, do not use sum
482	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
483	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
484	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
485	}	532	}
486		533
487	sub find_widget {	534	sub find_widget {
488	my ($self, $x, $y) = @_;	535	my ($self, $x, $y) = @_;
489		536
…		…
573	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
576	glEnd;	623	glEnd;
577	glPopMatrix;	624	glPopMatrix;
578	#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;
579	}	626	}
580		627
581	$self->_draw;	628	$self->_draw;
582	glPopMatrix;	629	glPopMatrix;
583	}	630	}
…		…
589	}	636	}
590		637
591	sub DESTROY {	638	sub DESTROY {
592	my ($self) = @_;	639	my ($self) = @_;
593		640
594	return if CFClient::in_destruct;	641	return if CFPlus::in_destruct;
595		642
596	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
597		644
598	eval { $self->destroy };	645	eval { $self->destroy };
599	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
600	}	647	}
601		648
602	#############################################################################	649	#############################################################################
603		650
604	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
605		652
606	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
607		654
608	use strict;	655	use strict;
609	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
610		657
611	sub new {	658	sub new {
612	my $class = shift;	659	my $class = shift;
613		660
614	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
645	}	692	}
646	}	693	}
647		694
648	#############################################################################	695	#############################################################################
649		696
650	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
651		698
652	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
653		700
654	sub new {	701	sub new {
655	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
656	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
657	}	704	}
…		…
664		711
665	sub draw { }	712	sub draw { }
666		713
667	#############################################################################	714	#############################################################################
668		715
669	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
670		717
671	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
672		719
673	sub new {	720	sub new {
674	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
675		722
676	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
685	if $children;	732	if $children;
686		733
687	$self	734	$self
688	}	735	}
689		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
690	sub add {	745	sub add {
691	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
692		747
693	$_->set_parent ($self)	748	$_->set_parent ($self)
694	for @widgets;	749	for @widgets;
…		…
754	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
755	}	810	}
756		811
757	#############################################################################	812	#############################################################################
758		813
759	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
760		815
761	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
762		817
763	sub new {	818	sub new {
764	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
765		820
766	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
767		822
768	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
769	}	824	}
770		825
771	sub add {	826	sub add {
…		…
778	sub remove {	833	sub remove {
779	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
780		835
781	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
782		837
783	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
784	unless @{$self->{children}};	839	unless @{$self->{children}};
785	}	840	}
786		841
787	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
788		843
…		…
800		855
801	#############################################################################	856	#############################################################################
802		857
803	# back-buffered drawing area	858	# back-buffered drawing area
804		859
805	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
806		861
807	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
808		863
809	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
810		865
811	sub new {	866	sub new {
812	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
813		868
814	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
836	}	891	}
837		892
838	sub render_child {	893	sub render_child {
839	my ($self) = @_;	894	my ($self) = @_;
840		895
841	$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 {
842	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
843	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
844		899
845	{	900	{
846	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
847		902
848	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
849	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
850	}	905	}
851		906
…		…
854	}	909	}
855		910
856	sub _draw {	911	sub _draw {
857	my ($self) = @_;	912	my ($self) = @_;
858		913
859	my ($w, $h) = @$self{qw(w h)};
860
861	my $tex = $self->{texture}	914	my $tex = $self->{texture}
862	or return;	915	or return;
863		916
864	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
865	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
866	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
867		920
868	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
869		922
870	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
871	}	924	}
872		925
873	#############################################################################	926	#############################################################################
874		927
875	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
876		929
877	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
878		931
879	sub new {	932	sub new {
880	my $class = shift;	933	my $class = shift;
881		934
882	$class->SUPER::new (	935	$class->SUPER::new (
…		…
942	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
943	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
944	) {	997	) {
945	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
946	} else {	999	} else {
947	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
948	}	1001	}
949	}	1002	}
950		1003
951	sub _render {	1004	sub _render {
952	my ($self) = @_;	1005	my ($self) = @_;
953		1006
954	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1007	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
955	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1008	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
956		1009
957	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
958		1011
959	$self->SUPER::_render;	1012	$self->SUPER::_render;
960	}	1013	}
961		1014
962	#############################################################################	1015	#############################################################################
963		1016
964	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
965		1018
966	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
967		1020
968	sub new {	1021	sub new {
969	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
970		1023
971	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
972		1025
973	my $self;	1026	my $self;
974		1027
975	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
976	vertical => 1,	1029	vertical => 1,
977	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
978	on_changed => sub {	1031	on_changed => sub {
979	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
980	},	1033	},
981	;	1034	;
982		1035
983	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
984	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
		1038	can_events => 1,
985	slider => $slider,	1039	slider => $slider,
986	%arg,	1040	%arg,
987	);	1041	);
988		1042
989	$self->SUPER::add ($self->{vp}, $self->{slider});	1043	$self->SUPER::add ($self->{vp}, $self->{slider});
990	$self->add ($child) if $child;	1044	$self->add ($child) if $child;
…		…
998	my ($self, $widget) = @_;	1052	my ($self, $widget) = @_;
999		1053
1000	$self->{vp}->add ($self->{child} = $widget);	1054	$self->{vp}->add ($self->{child} = $widget);
1001	}	1055	}
1002		1056
1003	sub invoke_button_up {	1057	sub invoke_mouse_wheel {
1004	my ($self, $ev) = @_;	1058	my ($self, $ev) = @_;
1005		1059
1006	warn "button up $ev->{button}\n";#d#	1060	return 0 unless $ev->{dy}; # only vertical movements
		1061
		1062	$self->{slider}->emit (mouse_wheel => $ev);
		1063
1007		1064	1
1008	0
1009	}	1065	}
1010		1066
1011	sub update_slider {	1067	sub update_slider {
1012	my ($self) = @_;	1068	my ($self) = @_;
1013		1069
…		…
1030	$self->SUPER::invoke_size_allocate ($w, $h)	1086	$self->SUPER::invoke_size_allocate ($w, $h)
1031	}	1087	}
1032		1088
1033	#############################################################################	1089	#############################################################################
1034		1090
1035	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
1036		1092
1037	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
1038		1094
1039	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
1040		1096
1041	sub new {	1097	sub new {
1042	my $class = shift;	1098	my $class = shift;
1043		1099
1044	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
1070	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
1071	}	1127	}
1072		1128
1073	#############################################################################	1129	#############################################################################
1074		1130
1075	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
1076		1132
1077	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
1078		1134
1079	use CFClient::OpenGL;	1135	use CFPlus::OpenGL;
		1136
		1137	sub new {
		1138	my ($class, %arg) = @_;
		1139
		1140	if ((exists $arg{label}) && !ref $arg{label}) {
		1141	$arg{label} = new CFPlus::UI::Label
		1142	align => 1,
		1143	valign => 0,
		1144	text => $arg{label},
		1145	fontsize => ($arg{border} || 0.8) * 0.75;
		1146	}
		1147
		1148	my $self = $class->SUPER::new (
		1149	# label => "",
		1150	fg => [0.6, 0.3, 0.1],
		1151	border => 0.8,
		1152	style => 'single',
		1153	%arg,
		1154	);
		1155
		1156	$self
		1157	}
		1158
		1159	sub add {
		1160	my ($self, @widgets) = @_;
		1161
		1162	$self->SUPER::add (@widgets);
		1163	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1164	}
		1165
		1166	sub border {
		1167	int $_[0]{border} * $::FONTSIZE
		1168	}
		1169
		1170	sub size_request {
		1171	my ($self) = @_;
		1172
		1173	($self->{label_w}, undef) = $self->{label}->size_request
		1174	if $self->{label};
		1175
		1176	my ($w, $h) = $self->SUPER::size_request;
		1177
		1178	(
		1179	$w + $self->border * 2,
		1180	$h + $self->border * 2,
		1181	)
		1182	}
		1183
		1184	sub invoke_size_allocate {
		1185	my ($self, $w, $h) = @_;
		1186
		1187	my $border = $self->border;
		1188
		1189	$w -= List::Util::max 0, $border * 2;
		1190	$h -= List::Util::max 0, $border * 2;
		1191
		1192	if (my $label = $self->{label}) {
		1193	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1194	$label->{h} = List::Util::min $h, $border;
		1195	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1196	}
		1197
		1198	$self->child->configure ($border, $border, $w, $h);
		1199
		1200	1
		1201	}
		1202
		1203	sub _draw {
		1204	my ($self) = @_;
		1205
		1206	my $child = $self->{children}[0];
		1207
		1208	my $border = $self->border;
		1209	my ($w, $h) = ($self->{w}, $self->{h});
		1210
		1211	$child->draw;
		1212
		1213	glColor @{$self->{fg}};
		1214	glBegin GL_LINE_STRIP;
		1215	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1216	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1217	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1218	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1219	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1220	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1221	glEnd;
		1222
		1223	if ($self->{label}) {
		1224	glTranslate $border * 2, 0;
		1225	$self->{label}->_draw;
		1226	}
		1227	}
		1228
		1229	#############################################################################
		1230
		1231	package CFPlus::UI::Toplevel;
		1232
		1233	our @ISA = CFPlus::UI::Bin::;
		1234
		1235	use CFPlus::OpenGL;
1080		1236
1081	my $bg =	1237	my $bg =
1082	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1238	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1083	mipmap => 1, wrap => 1;	1239	mipmap => 1, wrap => 1;
1084		1240
1085	my @border =	1241	my @border =
1086	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1242	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1087	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1243	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1088		1244
1089	sub new {	1245	sub new {
1090	my ($class, %arg) = @_;	1246	my ($class, %arg) = @_;
1091		1247
…		…
1097	min_w => 64,	1253	min_w => 64,
1098	min_h => 32,	1254	min_h => 32,
1099	%arg,	1255	%arg,
1100	);	1256	);
1101		1257
1102	$self->{title_widget} = new CFClient::UI::Label	1258	$self->{title_widget} = new CFPlus::UI::Label
1103	align => 0,	1259	align => 0,
1104	valign => 1,	1260	valign => 1,
1105	text => $self->{title},	1261	text => $self->{title},
1106	fontsize => $self->{border},	1262	fontsize => $self->{border},
1107	if exists $self->{title};	1263	if exists $self->{title};
1108		1264
1109	if ($self->{has_close_button}) {	1265	if ($self->{has_close_button}) {
1110	$self->{close_button} =	1266	$self->{close_button} =
1111	new CFClient::UI::ImageButton	1267	new CFPlus::UI::ImageButton
1112	path => 'x1_close.png',	1268	path => 'x1_close.png',
1113	on_activate => sub { $self->emit ("delete") };	1269	on_activate => sub { $self->emit ("delete") };
1114		1270
1115	$self->CFClient::UI::Container::add ($self->{close_button});	1271	$self->CFPlus::UI::Container::add ($self->{close_button});
1116	}	1272	}
1117		1273
1118	$self	1274	$self
1119	}	1275	}
1120		1276
1121	sub add {	1277	sub add {
1122	my ($self, @widgets) = @_;	1278	my ($self, @widgets) = @_;
1123		1279
1124	$self->SUPER::add (@widgets);	1280	$self->SUPER::add (@widgets);
1125	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1281	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1126	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1282	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1127	}	1283	}
1128		1284
1129	sub border {	1285	sub border {
1130	int $_[0]{border} * $::FONTSIZE	1286	int $_[0]{border} * $::FONTSIZE
1131	}	1287	}
…		…
1239	$self->{motion}->($ev, $x, $y) if $self->{motion};	1395	$self->{motion}->($ev, $x, $y) if $self->{motion};
1240		1396
1241	! ! $self->{motion}	1397	! ! $self->{motion}
1242	}	1398	}
1243		1399
		1400	sub invoke_visibility_change {
		1401	my ($self, $visible) = @_;
		1402
		1403	delete $self->{motion} unless $visible;
		1404
		1405	0
		1406	}
		1407
1244	sub _draw {	1408	sub _draw {
1245	my ($self) = @_;	1409	my ($self) = @_;
1246		1410
1247	my $child = $self->{children}[0];	1411	my $child = $self->{children}[0];
1248		1412
…		…
1285	if $self->{close_button};	1449	if $self->{close_button};
1286	}	1450	}
1287		1451
1288	#############################################################################	1452	#############################################################################
1289		1453
1290	package CFClient::UI::Table;	1454	package CFPlus::UI::Table;
1291		1455
1292	our @ISA = CFClient::UI::Base::;	1456	our @ISA = CFPlus::UI::Base::;
1293		1457
1294	use List::Util qw(max sum);	1458	use List::Util qw(max sum);
1295		1459
1296	use CFClient::OpenGL;	1460	use CFPlus::OpenGL;
1297		1461
1298	sub new {	1462	sub new {
1299	my $class = shift;	1463	my $class = shift;
1300		1464
1301	$class->SUPER::new (	1465	$class->SUPER::new (
…		…
1307	sub children {	1471	sub children {
1308	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1309	}	1473	}
1310		1474
1311	sub add {	1475	sub add {
1312	my ($self, $x, $y, $child) = @_;	1476	my ($self) = shift;
1313		1477
		1478	while (@_) {
		1479	my ($x, $y, $child) = splice @_, 0, 3, ();
1314	$child->set_parent ($self);	1480	$child->set_parent ($self);
1315	$self->{children}[$y][$x] = $child;	1481	$self->{children}[$y][$x] = $child;
		1482	}
1316		1483
		1484	$self->{force_realloc} = 1;
		1485	$self->{force_size_alloc} = 1;
1317	$self->realloc;	1486	$self->realloc;
1318	}	1487	}
1319		1488
1320	sub remove {	1489	sub remove {
1321	my ($self, $child) = @_;	1490	my ($self, $child) = @_;
…		…
1386		1555
1387	# linearly scale sizes	1556	# linearly scale sizes
1388	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1389	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1390		1559
1391	CFClient::UI::harmonize $ws;	1560	CFPlus::UI::harmonize $ws;
1392	CFClient::UI::harmonize $hs;	1561	CFPlus::UI::harmonize $hs;
1393		1562
1394	my $y;	1563	my $y;
1395		1564
1396	for my $r (0 .. $#{$self->{children}}) {	1565	for my $r (0 .. $#{$self->{children}}) {
1397	my $row = $self->{children}[$r]	1566	my $row = $self->{children}[$r]
…		…
1440	}	1609	}
1441	}	1610	}
1442		1611
1443	#############################################################################	1612	#############################################################################
1444		1613
1445	package CFClient::UI::Box;	1614	package CFPlus::UI::Box;
1446		1615
1447	our @ISA = CFClient::UI::Container::;	1616	our @ISA = CFPlus::UI::Container::;
1448		1617
1449	sub size_request {	1618	sub size_request {
1450	my ($self) = @_;	1619	my ($self) = @_;
1451		1620
1452	$self->{vertical}	1621	$self->{vertical}
…		…
1485	$req[$_] += $space * $children[$_]{expand}	1654	$req[$_] += $space * $children[$_]{expand}
1486	for 0 .. $#children;	1655	for 0 .. $#children;
1487	}	1656	}
1488	}	1657	}
1489		1658
1490	CFClient::UI::harmonize \@req;	1659	CFPlus::UI::harmonize \@req;
1491		1660
1492	my $pos = 0;	1661	my $pos = 0;
1493	for (0 .. $#children) {	1662	for (0 .. $#children) {
1494	my $alloc = $req[$_];	1663	my $alloc = $req[$_];
1495	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1664	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1500	1	1669	1
1501	}	1670	}
1502		1671
1503	#############################################################################	1672	#############################################################################
1504		1673
1505	package CFClient::UI::HBox;	1674	package CFPlus::UI::HBox;
1506		1675
1507	our @ISA = CFClient::UI::Box::;	1676	our @ISA = CFPlus::UI::Box::;
1508		1677
1509	sub new {	1678	sub new {
1510	my $class = shift;	1679	my $class = shift;
1511		1680
1512	$class->SUPER::new (	1681	$class->SUPER::new (
…		…
1515	)	1684	)
1516	}	1685	}
1517		1686
1518	#############################################################################	1687	#############################################################################
1519		1688
1520	package CFClient::UI::VBox;	1689	package CFPlus::UI::VBox;
1521		1690
1522	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1523		1692
1524	sub new {	1693	sub new {
1525	my $class = shift;	1694	my $class = shift;
1526		1695
1527	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1530	)	1699	)
1531	}	1700	}
1532		1701
1533	#############################################################################	1702	#############################################################################
1534		1703
1535	package CFClient::UI::Label;	1704	package CFPlus::UI::Label;
1536		1705
1537	our @ISA = CFClient::UI::DrawBG::;	1706	our @ISA = CFPlus::UI::DrawBG::;
1538		1707
1539	use CFClient::OpenGL;	1708	use CFPlus::OpenGL;
1540		1709
1541	sub new {	1710	sub new {
1542	my ($class, %arg) = @_;	1711	my ($class, %arg) = @_;
1543		1712
1544	my $self = $class->SUPER::new (	1713	my $self = $class->SUPER::new (
…		…
1547	#active_bg => none	1716	#active_bg => none
1548	#font => default_font	1717	#font => default_font
1549	#text => initial text	1718	#text => initial text
1550	#markup => initial narkup	1719	#markup => initial narkup
1551	#max_w => maximum pixel width	1720	#max_w => maximum pixel width
		1721	#style => 0, # render flags
1552	ellipsise => 3, # end	1722	ellipsise => 3, # end
1553	layout => (new CFClient::Layout),	1723	layout => (new CFPlus::Layout),
1554	fontsize => 1,	1724	fontsize => 1,
1555	align => -1,	1725	align => -1,
1556	valign => -1,	1726	valign => -1,
1557	padding_x => 2,	1727	padding_x => 2,
1558	padding_y => 2,	1728	padding_y => 2,
1559	can_events => 0,	1729	can_events => 0,
1560	%arg	1730	%arg
1561	);	1731	);
1562		1732
1563	if (exists $self->{template}) {	1733	if (exists $self->{template}) {
1564	my $layout = new CFClient::Layout;	1734	my $layout = new CFPlus::Layout;
1565	$layout->set_text (delete $self->{template});	1735	$layout->set_text (delete $self->{template});
1566	$self->{template} = $layout;	1736	$self->{template} = $layout;
1567	}	1737	}
1568		1738
1569	if (exists $self->{markup}) {	1739	if (exists $self->{markup}) {
…		…
1571	} else {	1741	} else {
1572	$self->set_text (delete $self->{text});	1742	$self->set_text (delete $self->{text});
1573	}	1743	}
1574		1744
1575	$self	1745	$self
1576	}
1577
1578	sub escape($) {
1579	local $_ = $_[0];
1580
1581	s/&/&amp;/g;
1582	s/>/&gt;/g;
1583	s/</&lt;/g;
1584
1585	$_
1586	}	1746	}
1587		1747
1588	sub update {	1748	sub update {
1589	my ($self) = @_;	1749	my ($self) = @_;
1590		1750
…		…
1717	};	1877	};
1718		1878
1719	my $w = List::Util::min $self->{w} + 4, $size->[0];	1879	my $w = List::Util::min $self->{w} + 4, $size->[0];
1720	my $h = List::Util::min $self->{h} + 2, $size->[1];	1880	my $h = List::Util::min $self->{h} + 2, $size->[1];
1721		1881
1722	$self->{layout}->render ($self->{ox}, $self->{oy});	1882	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1723	}	1883	}
1724		1884
1725	#############################################################################	1885	#############################################################################
1726		1886
1727	package CFClient::UI::EntryBase;	1887	package CFPlus::UI::EntryBase;
1728		1888
1729	our @ISA = CFClient::UI::Label::;	1889	our @ISA = CFPlus::UI::Label::;
1730		1890
1731	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1732		1892
1733	sub new {	1893	sub new {
1734	my $class = shift;	1894	my $class = shift;
1735		1895
1736	$class->SUPER::new (	1896	$class->SUPER::new (
…		…
1798		1958
1799	if ($uni == 8) {	1959	if ($uni == 8) {
1800	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1960	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1801	} elsif ($uni == 127) {	1961	} elsif ($uni == 127) {
1802	substr $text, $self->{cursor}, 1, "";	1962	substr $text, $self->{cursor}, 1, "";
1803	} elsif ($sym == CFClient::SDLK_LEFT) {	1963	} elsif ($sym == CFPlus::SDLK_LEFT) {
1804	--$self->{cursor} if $self->{cursor};	1964	--$self->{cursor} if $self->{cursor};
1805	} elsif ($sym == CFClient::SDLK_RIGHT) {	1965	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1806	++$self->{cursor} if $self->{cursor} < length $self->{text};	1966	++$self->{cursor} if $self->{cursor} < length $self->{text};
1807	} elsif ($sym == CFClient::SDLK_HOME) {	1967	} elsif ($sym == CFPlus::SDLK_HOME) {
1808	$self->{cursor} = 0;	1968	$self->{cursor} = 0;
1809	} elsif ($sym == CFClient::SDLK_END) {	1969	} elsif ($sym == CFPlus::SDLK_END) {
1810	$self->{cursor} = length $text;	1970	$self->{cursor} = length $text;
		1971	} elsif ($uni == 21) { # ctrl-u
		1972	$text = "";
1811	} elsif ($uni == 27) {	1973	} elsif ($uni == 27) {
1812	$self->emit ('escape');	1974	$self->emit ('escape');
1813	} elsif ($uni) {	1975	} elsif ($uni) {
1814	substr $text, $self->{cursor}++, 0, chr $uni;	1976	substr $text, $self->{cursor}++, 0, chr $uni;
1815	} else {	1977	} else {
…		…
1888	utf8::encode $text;	2050	utf8::encode $text;
1889		2051
1890	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2052	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1891	}	2053	}
1892		2054
1893	glColor @{$self->{fg}};
1894	glBegin GL_LINES;	2055	glBegin GL_LINES;
1895	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2056	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1896	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2057	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1897	glEnd;	2058	glEnd;
1898	}	2059	}
1899	}	2060	}
1900		2061
1901	package CFClient::UI::Entry;	2062	package CFPlus::UI::Entry;
1902		2063
1903	our @ISA = CFClient::UI::EntryBase::;	2064	our @ISA = CFPlus::UI::EntryBase::;
1904		2065
1905	use CFClient::OpenGL;	2066	use CFPlus::OpenGL;
1906		2067
1907	sub invoke_key_down {	2068	sub invoke_key_down {
1908	my ($self, $ev) = @_;	2069	my ($self, $ev) = @_;
1909		2070
1910	my $sym = $ev->{sym};	2071	my $sym = $ev->{sym};
…		…
1916	$self->{history_pointer} = -1;	2077	$self->{history_pointer} = -1;
1917	$self->{history_saveback} = '';	2078	$self->{history_saveback} = '';
1918	$self->emit (activate => $txt);	2079	$self->emit (activate => $txt);
1919	$self->update;	2080	$self->update;
1920		2081
1921	} elsif ($sym == CFClient::SDLK_UP) {	2082	} elsif ($sym == CFPlus::SDLK_UP) {
1922	if ($self->{history_pointer} < 0) {	2083	if ($self->{history_pointer} < 0) {
1923	$self->{history_saveback} = $self->get_text;	2084	$self->{history_saveback} = $self->get_text;
1924	}	2085	}
1925	if (@{$self->{history} || []} > 0) {	2086	if (@{$self->{history} || []} > 0) {
1926	$self->{history_pointer}++;	2087	$self->{history_pointer}++;
…		…
1928	$self->{history_pointer} = @{$self->{history} || []} - 1;	2089	$self->{history_pointer} = @{$self->{history} || []} - 1;
1929	}	2090	}
1930	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2091	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1931	}	2092	}
1932		2093
1933	} elsif ($sym == CFClient::SDLK_DOWN) {	2094	} elsif ($sym == CFPlus::SDLK_DOWN) {
1934	$self->{history_pointer}--;	2095	$self->{history_pointer}--;
1935	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2096	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1936		2097
1937	if ($self->{history_pointer} >= 0) {	2098	if ($self->{history_pointer} >= 0) {
1938	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2099	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1947	1	2108	1
1948	}	2109	}
1949		2110
1950	#############################################################################	2111	#############################################################################
1951		2112
1952	package CFClient::UI::Button;	2113	package CFPlus::UI::Button;
1953		2114
1954	our @ISA = CFClient::UI::Label::;	2115	our @ISA = CFPlus::UI::Label::;
1955		2116
1956	use CFClient::OpenGL;	2117	use CFPlus::OpenGL;
1957		2118
1958	my @tex =	2119	my @tex =
1959	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2120	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1960	qw(b1_button_active.png);	2121	qw(b1_button_active.png);
1961		2122
1962	sub new {	2123	sub new {
1963	my $class = shift;	2124	my $class = shift;
1964		2125
…		…
2001	$self->SUPER::_draw;	2162	$self->SUPER::_draw;
2002	}	2163	}
2003		2164
2004	#############################################################################	2165	#############################################################################
2005		2166
		2167	package CFPlus::UI::CheckBox;
		2168
		2169	our @ISA = CFPlus::UI::DrawBG::;
		2170
		2171	my @tex =
		2172	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2173	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2174
		2175	use CFPlus::OpenGL;
		2176
		2177	sub new {
		2178	my $class = shift;
		2179
		2180	$class->SUPER::new (
		2181	padding_x => 2,
		2182	padding_y => 2,
		2183	fg => [1, 1, 1],
		2184	active_fg => [1, 1, 0],
		2185	bg => [0, 0, 0, 0.2],
		2186	active_bg => [1, 1, 1, 0.5],
		2187	state => 0,
		2188	can_hover => 1,
		2189	@_
		2190	)
		2191	}
		2192
		2193	sub size_request {
		2194	my ($self) = @_;
		2195
		2196	(6) x 2
		2197	}
		2198
		2199	sub toggle {
		2200	my ($self) = @_;
		2201
		2202	$self->{state} = !$self->{state};
		2203	$self->emit (changed => $self->{state});
		2204	$self->update;
		2205	}
		2206
		2207	sub invoke_button_down {
		2208	my ($self, $ev, $x, $y) = @_;
		2209
		2210	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2211	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2212	$self->toggle;
		2213	} else {
		2214	return 0
		2215	}
		2216
		2217	1
		2218	}
		2219
		2220	sub _draw {
		2221	my ($self) = @_;
		2222
		2223	$self->SUPER::_draw;
		2224
		2225	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2226
		2227	my ($w, $h) = @$self{qw(w h)};
		2228
		2229	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2230
		2231	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2232
		2233	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2234
		2235	glEnable GL_TEXTURE_2D;
		2236	$tex->draw_quad_alpha (0, 0, $s, $s);
		2237	glDisable GL_TEXTURE_2D;
		2238	}
		2239
		2240	#############################################################################
		2241
		2242	package CFPlus::UI::Image;
		2243
		2244	our @ISA = CFPlus::UI::Base::;
		2245
		2246	use CFPlus::OpenGL;
		2247
		2248	our %texture_cache;
		2249
		2250	sub new {
		2251	my $class = shift;
		2252
		2253	my $self = $class->SUPER::new (
		2254	can_events => 0,
		2255	@_,
		2256	);
		2257
		2258	$self->{path} || $self->{tex}
		2259	or Carp::croak "'path' or 'tex' attributes required";
		2260
		2261	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2262	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2263
		2264	Scalar::Util::weaken $texture_cache{$self->{path}};
		2265
		2266	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2267
		2268	$self
		2269	}
		2270
		2271	sub STORABLE_freeze {
		2272	my ($self, $cloning) = @_;
		2273
		2274	$self->{path}
		2275	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2276
		2277	$self->{path}
		2278	}
		2279
		2280	sub STORABLE_attach {
		2281	my ($self, $cloning, $path) = @_;
		2282
		2283	$self->new (path => $path)
		2284	}
		2285
		2286	sub size_request {
		2287	my ($self) = @_;
		2288
		2289	($self->{tex}{w}, $self->{tex}{h})
		2290	}
		2291
		2292	sub _draw {
		2293	my ($self) = @_;
		2294
		2295	my $tex = $self->{tex};
		2296
		2297	my ($w, $h) = ($self->{w}, $self->{h});
		2298
		2299	if ($self->{rot90}) {
		2300	glRotate 90, 0, 0, 1;
		2301	glTranslate 0, -$self->{w}, 0;
		2302
		2303	($w, $h) = ($h, $w);
		2304	}
		2305
		2306	glEnable GL_TEXTURE_2D;
		2307	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2308
		2309	$tex->draw_quad (0, 0, $w, $h);
		2310
		2311	glDisable GL_TEXTURE_2D;
		2312	}
		2313
		2314	#############################################################################
		2315
2006	package CFClient::UI::ImageButton;	2316	package CFPlus::UI::ImageButton;
2007		2317
2008	our @ISA = CFClient::UI::Image::;	2318	our @ISA = CFPlus::UI::Image::;
2009		2319
2010	use CFClient::OpenGL;	2320	use CFPlus::OpenGL;
2011		2321
2012	my %textures;	2322	my %textures;
2013		2323
2014	sub new {	2324	sub new {
2015	my $class = shift;	2325	my $class = shift;
…		…
2037	1	2347	1
2038	}	2348	}
2039		2349
2040	#############################################################################	2350	#############################################################################
2041		2351
2042	package CFClient::UI::CheckBox;
2043
2044	our @ISA = CFClient::UI::DrawBG::;
2045
2046	my @tex =
2047	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2048	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2049
2050	use CFClient::OpenGL;
2051
2052	sub new {
2053	my $class = shift;
2054
2055	$class->SUPER::new (
2056	padding_x => 2,
2057	padding_y => 2,
2058	fg => [1, 1, 1],
2059	active_fg => [1, 1, 0],
2060	bg => [0, 0, 0, 0.2],
2061	active_bg => [1, 1, 1, 0.5],
2062	state => 0,
2063	can_hover => 1,
2064	@_
2065	)
2066	}
2067
2068	sub size_request {
2069	my ($self) = @_;
2070
2071	(6) x 2
2072	}
2073
2074	sub toggle {
2075	my ($self) = @_;
2076
2077	$self->{state} = !$self->{state};
2078	$self->emit (changed => $self->{state});
2079	$self->update;
2080	}
2081
2082	sub invoke_button_down {
2083	my ($self, $ev, $x, $y) = @_;
2084
2085	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2086	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2087	$self->toggle;
2088	} else {
2089	return 0
2090	}
2091
2092	1
2093	}
2094
2095	sub _draw {
2096	my ($self) = @_;
2097
2098	$self->SUPER::_draw;
2099
2100	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2101
2102	my ($w, $h) = @$self{qw(w h)};
2103
2104	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2105
2106	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2107
2108	my $tex = $self->{state} ? $tex[1] : $tex[0];
2109
2110	glEnable GL_TEXTURE_2D;
2111	$tex->draw_quad_alpha (0, 0, $s, $s);
2112	glDisable GL_TEXTURE_2D;
2113	}
2114
2115	#############################################################################
2116
2117	package CFClient::UI::Image;	2352	package CFPlus::UI::VGauge;
2118		2353
2119	our @ISA = CFClient::UI::Base::;	2354	our @ISA = CFPlus::UI::Base::;
2120
2121	use CFClient::OpenGL;
2122
2123	our %texture_cache;
2124
2125	sub new {
2126	my $class = shift;
2127
2128	my $self = $class->SUPER::new (
2129	can_events => 0,
2130	@_,
2131	);
2132
2133	$self->{path} || $self->{tex}
2134	or Carp::croak "'path' or 'tex' attributes required";
2135
2136	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2137	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2138
2139	Scalar::Util::weaken $texture_cache{$self->{path}};
2140
2141	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2142
2143	$self
2144	}
2145
2146	sub size_request {
2147	my ($self) = @_;
2148
2149	($self->{tex}{w}, $self->{tex}{h})
2150	}
2151
2152	sub _draw {
2153	my ($self) = @_;
2154
2155	my $tex = $self->{tex};
2156
2157	my ($w, $h) = ($self->{w}, $self->{h});
2158
2159	if ($self->{rot90}) {
2160	glRotate 90, 0, 0, 1;
2161	glTranslate 0, -$self->{w}, 0;
2162
2163	($w, $h) = ($h, $w);
2164	}
2165
2166	glEnable GL_TEXTURE_2D;
2167	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2168
2169	$tex->draw_quad_alpha (0, 0, $w, $h);
2170
2171	glDisable GL_TEXTURE_2D;
2172	}
2173
2174	#############################################################################
2175
2176	package CFClient::UI::VGauge;
2177
2178	our @ISA = CFClient::UI::Base::;
2179		2355
2180	use List::Util qw(min max);	2356	use List::Util qw(min max);
2181		2357
2182	use CFClient::OpenGL;	2358	use CFPlus::OpenGL;
2183		2359
2184	my %tex = (	2360	my %tex = (
2185	food => [	2361	food => [
2186	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2363	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2188	],	2364	],
2189	grace => [	2365	grace => [
2190	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2366	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2191	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2367	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2192	],	2368	],
2193	hp => [	2369	hp => [
2194	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2370	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2195	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2371	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2196	],	2372	],
2197	mana => [	2373	mana => [
2198	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2374	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2199	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2375	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2200	],	2376	],
2201	);	2377	);
2202		2378
2203	# eg. VGauge->new (gauge => 'food'), default gauge: food	2379	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2306	glDisable GL_TEXTURE_2D;	2482	glDisable GL_TEXTURE_2D;
2307	}	2483	}
2308		2484
2309	#############################################################################	2485	#############################################################################
2310		2486
2311	package CFClient::UI::Gauge;	2487	package CFPlus::UI::Gauge;
2312		2488
2313	our @ISA = CFClient::UI::VBox::;	2489	our @ISA = CFPlus::UI::VBox::;
2314		2490
2315	sub new {	2491	sub new {
2316	my ($class, %arg) = @_;	2492	my ($class, %arg) = @_;
2317		2493
2318	my $self = $class->SUPER::new (	2494	my $self = $class->SUPER::new (
…		…
2320	can_hover => 1,	2496	can_hover => 1,
2321	can_events => 1,	2497	can_events => 1,
2322	%arg,	2498	%arg,
2323	);	2499	);
2324		2500
2325	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2501	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2326	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2502	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2327	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2503	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2328		2504
2329	$self	2505	$self
2330	}	2506	}
2331		2507
2332	sub set_fontsize {	2508	sub set_fontsize {
…		…
2353	$self->{value}->set_text ($val);	2529	$self->{value}->set_text ($val);
2354	}	2530	}
2355		2531
2356	#############################################################################	2532	#############################################################################
2357		2533
2358	package CFClient::UI::Slider;	2534	package CFPlus::UI::Slider;
2359		2535
2360	use strict;	2536	use strict;
2361		2537
2362	use CFClient::OpenGL;	2538	use CFPlus::OpenGL;
2363		2539
2364	our @ISA = CFClient::UI::DrawBG::;	2540	our @ISA = CFPlus::UI::DrawBG::;
2365		2541
2366	my @tex =	2542	my @tex =
2367	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2543	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2368	qw(s1_slider.png s1_slider_bg.png);	2544	qw(s1_slider.png s1_slider_bg.png);
2369		2545
2370	sub new {	2546	sub new {
2371	my $class = shift;	2547	my $class = shift;
2372		2548
…		…
2461	}	2637	}
2462		2638
2463	1	2639	1
2464	}	2640	}
2465		2641
		2642	sub invoke_mouse_wheel {
		2643	my ($self, $ev) = @_;
		2644
		2645	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2646
		2647	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2648
		2649	! ! $delta
		2650	}
		2651
2466	sub update {	2652	sub update {
2467	my ($self) = @_;	2653	my ($self) = @_;
2468		2654
2469	delete $self->{knob_w};	2655	delete $self->{knob_w};
2470	$self->SUPER::update;	2656	$self->SUPER::update;
…		…
2517	glDisable GL_TEXTURE_2D;	2703	glDisable GL_TEXTURE_2D;
2518	}	2704	}
2519		2705
2520	#############################################################################	2706	#############################################################################
2521		2707
2522	package CFClient::UI::ValSlider;	2708	package CFPlus::UI::ValSlider;
2523		2709
2524	our @ISA = CFClient::UI::HBox::;	2710	our @ISA = CFPlus::UI::HBox::;
2525		2711
2526	sub new {	2712	sub new {
2527	my ($class, %arg) = @_;	2713	my ($class, %arg) = @_;
2528		2714
2529	my $range = delete $arg{range};	2715	my $range = delete $arg{range};
2530		2716
2531	my $self = $class->SUPER::new (	2717	my $self = $class->SUPER::new (
2532	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2718	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2533	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2719	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2534	to_value => sub { shift },	2720	to_value => sub { shift },
2535	from_value => sub { shift },	2721	from_value => sub { shift },
2536	%arg,	2722	%arg,
2537	);	2723	);
2538		2724
…		…
2558	sub set_range { shift->{slider}->set_range (@_) }	2744	sub set_range { shift->{slider}->set_range (@_) }
2559	sub set_value { shift->{slider}->set_value (@_) }	2745	sub set_value { shift->{slider}->set_value (@_) }
2560		2746
2561	#############################################################################	2747	#############################################################################
2562		2748
2563	package CFClient::UI::TextScroller;	2749	package CFPlus::UI::TextScroller;
2564		2750
2565	our @ISA = CFClient::UI::HBox::;	2751	our @ISA = CFPlus::UI::HBox::;
2566		2752
2567	use CFClient::OpenGL;	2753	use CFPlus::OpenGL;
2568		2754
2569	sub new {	2755	sub new {
2570	my $class = shift;	2756	my $class = shift;
2571		2757
2572	my $self = $class->SUPER::new (	2758	my $self = $class->SUPER::new (
2573	fontsize => 1,	2759	fontsize => 1,
2574	can_events => 0,	2760	can_events => 1,
2575	indent => 0,	2761	indent => 0,
2576	#font => default_font	2762	#font => default_font
2577	@_,	2763	@_,
2578		2764
2579	layout => (new CFClient::Layout),	2765	layout => (new CFPlus::Layout),
2580	par => [],	2766	par => [],
2581	height => 0,	2767	height => 0,
2582	children => [	2768	children => [
2583	(new CFClient::UI::Empty expand => 1),	2769	(new CFPlus::UI::Empty expand => 1),
2584	(new CFClient::UI::Slider vertical => 1),	2770	(new CFPlus::UI::Slider vertical => 1),
2585	],	2771	],
2586	);	2772	);
2587		2773
2588	$self->{children}[1]->connect (changed => sub { $self->update });	2774	$self->{children}[1]->connect (changed => sub { $self->update });
2589		2775
…		…
2619		2805
2620	$self->reflow;	2806	$self->reflow;
2621		2807
2622	local $self->{children} = [$empty, $slider];	2808	local $self->{children} = [$empty, $slider];
2623	$self->SUPER::invoke_size_allocate ($w, $h)	2809	$self->SUPER::invoke_size_allocate ($w, $h)
		2810	}
		2811
		2812	sub invoke_mouse_wheel {
		2813	my ($self, $ev) = @_;
		2814
		2815	return 0 unless $ev->{dy}; # only vertical movements
		2816
		2817	$self->{children}[1]->emit (mouse_wheel => $ev);
		2818
		2819	1
2624	}	2820	}
2625		2821
2626	sub get_layout {	2822	sub get_layout {
2627	my ($self, $para) = @_;	2823	my ($self, $para) = @_;
2628		2824
…		…
2656		2852
2657	# todo: base offset on lines or so, not on pixels	2853	# todo: base offset on lines or so, not on pixels
2658	$self->{children}[1]->set_value ($offset);	2854	$self->{children}[1]->set_value ($offset);
2659	}	2855	}
2660		2856
		2857	sub current_paragraph {
		2858	my ($self) = @_;
		2859
		2860	$self->{top_paragraph} - 1
		2861	}
		2862
		2863	sub scroll_to {
		2864	my ($self, $para) = @_;
		2865
		2866	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2867
		2868	$self->{scroll_to} = $para;
		2869	$self->update;
		2870	}
		2871
2661	sub clear {	2872	sub clear {
2662	my ($self) = @_;	2873	my ($self) = @_;
2663		2874
2664	my (undef, undef, @other) = @{ $self->{children} };	2875	my (undef, undef, @other) = @{ $self->{children} };
2665	$self->remove ($_) for @other;	2876	$self->remove ($_) for @other;
…		…
2668	$self->{height} = 0;	2879	$self->{height} = 0;
2669	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2880	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2670	}	2881	}
2671		2882
2672	sub add_paragraph {	2883	sub add_paragraph {
2673	my ($self, $color, $para, $indent) = @_;	2884	my $self = shift;
2674		2885
2675	my ($text, @w) = ref $para ? @$para : $para;	2886	for my $para (@_) {
2676
2677	$para = {	2887	$para = {
		2888	fg => [1, 1, 1, 1],
		2889	indent => 0,
		2890	markup => "",
		2891	widget => [],
		2892	ref $para ? %$para : (markup => $para),
2678	w => 1e10,	2893	w => 1e10,
2679	wrapped => 1,	2894	wrapped => 1,
2680	fg => $color,
2681	indent => $indent,
2682	markup => $text,
2683	widget => \@w,
2684	};	2895	};
2685		2896
2686	$self->add (@w) if @w;	2897	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2687	push @{$self->{par}}, $para;	2898	push @{$self->{par}}, $para;
		2899	}
2688		2900
2689	$self->{need_reflow}++;	2901	$self->{need_reflow}++;
2690	$self->update;	2902	$self->update;
2691	}	2903	}
2692		2904
2693	sub scroll_to_bottom {	2905	sub scroll_to_bottom {
2694	my ($self) = @_;	2906	my ($self) = @_;
2695		2907
2696	$self->{scroll_to_bottom} = 1;	2908	$self->{scroll_to} = $#{$self->{par}};
2697	$self->update;	2909	$self->update;
2698	}	2910	}
2699		2911
		2912	sub force_uptodate {
		2913	my ($self) = @_;
		2914
		2915	if (delete $self->{need_reflow}) {
		2916	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2917
		2918	my $height = 0;
		2919
		2920	for my $para (@{$self->{par}}) {
		2921	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2922	my $layout = $self->get_layout ($para);
		2923	my ($w, $h) = $layout->size;
		2924
		2925	$para->{w} = $w + $para->{indent};
		2926	$para->{h} = $h;
		2927	$para->{wrapped} = $layout->has_wrapped;
		2928	}
		2929
		2930	$para->{y} = $height;
		2931	$height += $para->{h};
		2932	}
		2933
		2934	$self->{height} = $height;
		2935	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2936
		2937	delete $self->{texture};
		2938	}
		2939
		2940	if (my $paridx = delete $self->{scroll_to}) {
		2941	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2942	}
		2943	}
		2944
2700	sub update {	2945	sub update {
2701	my ($self) = @_;	2946	my ($self) = @_;
2702		2947
2703	$self->SUPER::update;	2948	$self->SUPER::update;
2704		2949
2705	return unless $self->{h} > 0;	2950	return unless $self->{h} > 0;
2706		2951
2707	delete $self->{texture};	2952	delete $self->{texture};
2708		2953
2709	$ROOT->on_post_alloc ($self => sub {	2954	$ROOT->on_post_alloc ($self => sub {
		2955	$self->force_uptodate;
		2956
2710	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2957	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2711		2958
2712	if (delete $self->{need_reflow}) {
2713	my $height = 0;
2714
2715	for my $para (@{$self->{par}}) {
2716	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2717	my $layout = $self->get_layout ($para);
2718	my ($w, $h) = $layout->size;
2719
2720	$para->{w} = $w + $para->{indent};
2721	$para->{h} = $h;
2722	$para->{wrapped} = $layout->has_wrapped;
2723	}
2724
2725	$height += $para->{h};
2726	}
2727
2728	$self->{height} = $height;
2729
2730	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2731
2732	delete $self->{texture};
2733	}
2734
2735	if (delete $self->{scroll_to_bottom}) {
2736	$self->{children}[1]->set_value (1e10);
2737	}
2738
2739	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2959	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2740	glClearColor 0, 0, 0, 0;	2960	glClearColor 0, 0, 0, 0;
2741	glClear GL_COLOR_BUFFER_BIT;	2961	glClear GL_COLOR_BUFFER_BIT;
2742		2962
2743	my $top = int $self->{children}[1]{range}[0];	2963	my $top = int $self->{children}[1]{range}[0];
2744		2964
		2965	my $paridx = 0;
		2966	my $top_paragraph;
		2967	my $top = int $self->{children}[1]{range}[0];
		2968
2745	my $y0 = $top;	2969	my $y0 = $top;
2746	my $y1 = $top + $H;	2970	my $y1 = $top + $H;
2747		2971
2748	my $y = 0;
2749
2750	for my $para (@{$self->{par}}) {	2972	for my $para (@{$self->{par}}) {
2751	my $h = $para->{h};	2973	my $h = $para->{h};
		2974	my $y = $para->{y};
2752		2975
2753	if ($y0 < $y + $h && $y < $y1) {	2976	if ($y0 < $y + $h && $y < $y1) {
2754
2755	my $layout = $self->get_layout ($para);	2977	my $layout = $self->get_layout ($para);
2756		2978
2757	$layout->render ($para->{indent}, $y - $y0);	2979	$layout->render ($para->{indent}, $y - $y0);
2758		2980
2759	if (my @w = @{ $para->{widget} }) {	2981	if (my @w = @{ $para->{widget} }) {
…		…
2768	$_->draw;	2990	$_->draw;
2769	}	2991	}
2770	}	2992	}
2771	}	2993	}
2772		2994
2773	$y += $h;	2995	$paridx++;
		2996	$top_paragraph ||= $paridx if $y >= $top;
2774	}	2997	}
		2998
		2999	$self->{top_paragraph} = $top_paragraph;
2775	};	3000	};
2776	});	3001	});
2777	}	3002	}
2778		3003
2779	sub reconfigure {	3004	sub reconfigure {
…		…
2797	$self->{children}[1]->draw;	3022	$self->{children}[1]->draw;
2798	}	3023	}
2799		3024
2800	#############################################################################	3025	#############################################################################
2801		3026
2802	package CFClient::UI::Animator;	3027	package CFPlus::UI::Animator;
2803		3028
2804	use CFClient::OpenGL;	3029	use CFPlus::OpenGL;
2805		3030
2806	our @ISA = CFClient::UI::Bin::;	3031	our @ISA = CFPlus::UI::Bin::;
2807		3032
2808	sub moveto {	3033	sub moveto {
2809	my ($self, $x, $y) = @_;	3034	my ($self, $x, $y) = @_;
2810		3035
2811	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3036	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2839	glPopMatrix;	3064	glPopMatrix;
2840	}	3065	}
2841		3066
2842	#############################################################################	3067	#############################################################################
2843		3068
2844	package CFClient::UI::Flopper;	3069	package CFPlus::UI::Flopper;
2845		3070
2846	our @ISA = CFClient::UI::Button::;	3071	our @ISA = CFPlus::UI::Button::;
2847		3072
2848	sub new {	3073	sub new {
2849	my $class = shift;	3074	my $class = shift;
2850		3075
2851	my $self = $class->SUPER::new (	3076	my $self = $class->SUPER::new (
…		…
2863	$self->{other}->toggle_visibility;	3088	$self->{other}->toggle_visibility;
2864	}	3089	}
2865		3090
2866	#############################################################################	3091	#############################################################################
2867		3092
2868	package CFClient::UI::Tooltip;	3093	package CFPlus::UI::Tooltip;
2869		3094
2870	our @ISA = CFClient::UI::Bin::;	3095	our @ISA = CFPlus::UI::Bin::;
2871		3096
2872	use CFClient::OpenGL;	3097	use CFPlus::OpenGL;
2873		3098
2874	sub new {	3099	sub new {
2875	my $class = shift;	3100	my $class = shift;
2876		3101
2877	$class->SUPER::new (	3102	$class->SUPER::new (
…		…
2880	)	3105	)
2881	}	3106	}
2882		3107
2883	sub set_tooltip_from {	3108	sub set_tooltip_from {
2884	my ($self, $widget) = @_;	3109	my ($self, $widget) = @_;
		3110
		3111	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3112	if $widget->{tooltip} =~ /^#(.*)$/;
2885		3113
2886	my $tooltip = $widget->{tooltip};	3114	my $tooltip = $widget->{tooltip};
2887		3115
2888	if ($ENV{CFPLUS_DEBUG} & 2) {	3116	if ($ENV{CFPLUS_DEBUG} & 2) {
2889	$tooltip .= "\n\n" . (ref $widget) . "\n"	3117	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2893	}	3121	}
2894		3122
2895	$tooltip =~ s/^\n+//;	3123	$tooltip =~ s/^\n+//;
2896	$tooltip =~ s/\n+$//;	3124	$tooltip =~ s/\n+$//;
2897		3125
2898	$self->add (new CFClient::UI::Label	3126	$self->add (new CFPlus::UI::Label
2899	markup => $tooltip,	3127	markup => $tooltip,
2900	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3128	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2901	fontsize => 0.8,	3129	fontsize => 0.8,
2902	fg => [0, 0, 0, 1],	3130	style => 1, # FLAG_INVERSE
2903	ellipsise => 0,	3131	ellipsise => 0,
2904	font => ($widget->{tooltip_font} || $::FONT_PROP),	3132	font => ($widget->{tooltip_font} || $::FONT_PROP),
2905	);	3133	);
2906	}	3134	}
2907		3135
…		…
2926		3154
2927	$self->{root}->on_post_alloc ("move_$self" => sub {	3155	$self->{root}->on_post_alloc ("move_$self" => sub {
2928	my $widget = $self->{owner}	3156	my $widget = $self->{owner}
2929	or return;	3157	or return;
2930		3158
		3159	if ($widget->{visible}) {
2931	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3160	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2932		3161
2933	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3162	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2934	if $x + $self->{w} > $self->{root}{w};	3163	if $x + $self->{w} > $self->{root}{w};
2935		3164
2936	$self->move_abs ($x, $y);	3165	$self->move_abs ($x, $y);
		3166	} else {
		3167	$self->hide;
		3168	}
2937	});	3169	});
2938	}	3170	}
2939		3171
2940	sub _draw {	3172	sub _draw {
2941	my ($self) = @_;	3173	my ($self) = @_;
…		…
2965	$self->SUPER::_draw;	3197	$self->SUPER::_draw;
2966	}	3198	}
2967		3199
2968	#############################################################################	3200	#############################################################################
2969		3201
2970	package CFClient::UI::Face;	3202	package CFPlus::UI::Face;
2971		3203
2972	our @ISA = CFClient::UI::Base::;	3204	our @ISA = CFPlus::UI::DrawBG::;
2973		3205
2974	use CFClient::OpenGL;	3206	use CFPlus::OpenGL;
2975		3207
2976	sub new {	3208	sub new {
2977	my $class = shift;	3209	my $class = shift;
2978		3210
2979	my $self = $class->SUPER::new (	3211	my $self = $class->SUPER::new (
…		…
3014	sub _draw {	3246	sub _draw {
3015	my ($self) = @_;	3247	my ($self) = @_;
3016		3248
3017	return unless $::CONN;	3249	return unless $::CONN;
3018		3250
		3251	$self->SUPER::_draw;
		3252
3019	my $face;	3253	my $face;
3020		3254
3021	if ($self->{frame}) {	3255	if ($self->{frame}) {
3022	my $anim = $::CONN->{anim}[$self->{anim}];	3256	my $anim = $::CONN->{anim}[$self->{anim}];
3023		3257
…		…
3045	$self->SUPER::destroy;	3279	$self->SUPER::destroy;
3046	}	3280	}
3047		3281
3048	#############################################################################	3282	#############################################################################
3049		3283
3050	package CFClient::UI::Buttonbar;	3284	package CFPlus::UI::Buttonbar;
3051		3285
3052	our @ISA = CFClient::UI::HBox::;	3286	our @ISA = CFPlus::UI::HBox::;
3053		3287
3054	# TODO: should actualyl wrap buttons and other goodies.	3288	# TODO: should actualyl wrap buttons and other goodies.
3055		3289
3056	#############################################################################	3290	#############################################################################
3057		3291
3058	package CFClient::UI::Menu;	3292	package CFPlus::UI::Menu;
3059		3293
3060	our @ISA = CFClient::UI::FancyFrame::;	3294	our @ISA = CFPlus::UI::Toplevel::;
3061		3295
3062	use CFClient::OpenGL;	3296	use CFPlus::OpenGL;
3063		3297
3064	sub new {	3298	sub new {
3065	my $class = shift;	3299	my $class = shift;
3066		3300
3067	my $self = $class->SUPER::new (	3301	my $self = $class->SUPER::new (
3068	items => [],	3302	items => [],
3069	z => 100,	3303	z => 100,
3070	@_,	3304	@_,
3071	);	3305	);
3072		3306
3073	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3307	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3074		3308
3075	for my $item (@{ $self->{items} }) {	3309	for my $item (@{ $self->{items} }) {
3076	my ($widget, $cb, $tooltip) = @$item;	3310	my ($widget, $cb, $tooltip) = @$item;
3077		3311
3078	# handle various types of items, only text for now	3312	# handle various types of items, only text for now
3079	if (!ref $widget) {	3313	if (!ref $widget) {
3080	if ($widget =~ /\t/) {	3314	if ($widget =~ /\t/) {
3081	my ($left, $right) = split /\t/, $widget, 2;	3315	my ($left, $right) = split /\t/, $widget, 2;
3082		3316
3083	$widget = new CFClient::UI::HBox	3317	$widget = new CFPlus::UI::HBox
3084	can_hover => 1,	3318	can_hover => 1,
3085	can_events => 1,	3319	can_events => 1,
3086	tooltip => $tooltip,	3320	tooltip => $tooltip,
3087	children => [	3321	children => [
3088	(new CFClient::UI::Label markup => $left, expand => 1),	3322	(new CFPlus::UI::Label markup => $left, expand => 1),
3089	(new CFClient::UI::Label markup => $right, align => +1),	3323	(new CFPlus::UI::Label markup => $right, align => +1),
3090	],	3324	],
3091	;	3325	;
3092		3326
3093	} else {	3327	} else {
3094	$widget = new CFClient::UI::Label	3328	$widget = new CFPlus::UI::Label
3095	can_hover => 1,	3329	can_hover => 1,
3096	can_events => 1,	3330	can_events => 1,
3097	markup => $widget,	3331	markup => $widget,
3098	tooltip => $tooltip;	3332	tooltip => $tooltip;
3099	}	3333	}
…		…
3147	1	3381	1
3148	}	3382	}
3149		3383
3150	#############################################################################	3384	#############################################################################
3151		3385
3152	package CFClient::UI::Multiplexer;	3386	package CFPlus::UI::Multiplexer;
3153		3387
3154	our @ISA = CFClient::UI::Container::;	3388	our @ISA = CFPlus::UI::Container::;
3155		3389
3156	sub new {	3390	sub new {
3157	my $class = shift;	3391	my $class = shift;
3158		3392
3159	my $self = $class->SUPER::new (	3393	my $self = $class->SUPER::new (
…		…
3220	$self->{current}->draw;	3454	$self->{current}->draw;
3221	}	3455	}
3222		3456
3223	#############################################################################	3457	#############################################################################
3224		3458
3225	package CFClient::UI::Notebook;	3459	package CFPlus::UI::Notebook;
3226		3460
3227	our @ISA = CFClient::UI::VBox::;	3461	our @ISA = CFPlus::UI::VBox::;
3228		3462
3229	sub new {	3463	sub new {
3230	my $class = shift;	3464	my $class = shift;
3231		3465
3232	my $self = $class->SUPER::new (	3466	my $self = $class->SUPER::new (
3233	buttonbar => (new CFClient::UI::Buttonbar),	3467	buttonbar => (new CFPlus::UI::Buttonbar),
3234	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3468	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3235	# filter => # will be put between multiplexer and $self	3469	# filter => # will be put between multiplexer and $self
3236	@_,	3470	@_,
3237	);	3471	);
3238		3472
3239	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3473	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3245	sub add {	3479	sub add {
3246	my ($self, $title, $widget, $tooltip) = @_;	3480	my ($self, $title, $widget, $tooltip) = @_;
3247		3481
3248	Scalar::Util::weaken $self;	3482	Scalar::Util::weaken $self;
3249		3483
3250	$self->{buttonbar}->add (new CFClient::UI::Button	3484	$self->{buttonbar}->add (new CFPlus::UI::Button
3251	markup => $title,	3485	markup => $title,
3252	tooltip => $tooltip,	3486	tooltip => $tooltip,
3253	on_activate => sub { $self->set_current_page ($widget) },	3487	on_activate => sub { $self->set_current_page ($widget) },
3254	);	3488	);
3255		3489
…		…
3269	$self->emit (page_changed => $self->{multiplexer}{current});	3503	$self->emit (page_changed => $self->{multiplexer}{current});
3270	}	3504	}
3271		3505
3272	#############################################################################	3506	#############################################################################
3273		3507
3274	package CFClient::UI::Combobox;	3508	package CFPlus::UI::Selector;
3275		3509
3276	use utf8;	3510	use utf8;
3277		3511
3278	our @ISA = CFClient::UI::Button::;	3512	our @ISA = CFPlus::UI::Button::;
3279		3513
3280	sub new {	3514	sub new {
3281	my $class = shift;	3515	my $class = shift;
3282		3516
3283	my $self = $class->SUPER::new (	3517	my $self = $class->SUPER::new (
…		…
3300	my ($value, $title, $tooltip) = @$_;	3534	my ($value, $title, $tooltip) = @$_;
3301		3535
3302	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3536	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303	}	3537	}
3304		3538
3305	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3539	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306	}	3540	}
3307		3541
3308	sub _set_value {	3542	sub _set_value {
3309	my ($self, $value) = @_;	3543	my ($self, $value) = @_;
3310		3544
…		…
3325	$self->emit (changed => $value);	3559	$self->emit (changed => $value);
3326	}	3560	}
3327		3561
3328	#############################################################################	3562	#############################################################################
3329		3563
3330	package CFClient::UI::Statusbox;	3564	package CFPlus::UI::Statusbox;
3331		3565
3332	our @ISA = CFClient::UI::VBox::;	3566	our @ISA = CFPlus::UI::VBox::;
3333		3567
3334	sub new {	3568	sub new {
3335	my $class = shift;	3569	my $class = shift;
3336		3570
3337	my $self = $class->SUPER::new (	3571	my $self = $class->SUPER::new (
…		…
3349	sub reorder {	3583	sub reorder {
3350	my ($self) = @_;	3584	my ($self) = @_;
3351	my $NOW = Time::HiRes::time;	3585	my $NOW = Time::HiRes::time;
3352		3586
3353	# freeze display when hovering over any label	3587	# freeze display when hovering over any label
3354	return if $CFClient::UI::TOOLTIP->{owner}	3588	return if $CFPlus::UI::TOOLTIP->{owner}
3355	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3589	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3356	values %{ $self->{item} };	3590	values %{ $self->{item} };
3357		3591
3358	while (my ($k, $v) = each %{ $self->{item} }) {	3592	while (my ($k, $v) = each %{ $self->{item} }) {
3359	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3593	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3360	}	3594	}
…		…
3381	for ($short) {	3615	for ($short) {
3382	s/^\s+//;	3616	s/^\s+//;
3383	s/\s+/ /g;	3617	s/\s+/ /g;
3384	}	3618	}
3385		3619
3386	new CFClient::UI::Label	3620	new CFPlus::UI::Label
3387	markup => $short,	3621	markup => $short,
3388	tooltip => $item->{tooltip},	3622	tooltip => $item->{tooltip},
3389	tooltip_font => $::FONT_PROP,	3623	tooltip_font => $::FONT_PROP,
3390	tooltip_width => 0.67,	3624	tooltip_width => 0.67,
3391	fontsize => $item->{fontsize} || $self->{fontsize},	3625	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3470	$self->SUPER::destroy;	3704	$self->SUPER::destroy;
3471	}	3705	}
3472		3706
3473	#############################################################################	3707	#############################################################################
3474		3708
3475	package CFClient::UI::Inventory;	3709	package CFPlus::UI::Inventory;
3476		3710
3477	our @ISA = CFClient::UI::Table::;	3711	our @ISA = CFPlus::UI::Table::;
3478		3712
3479	sub new {	3713	sub new {
3480	my $class = shift;	3714	my $class = shift;
3481		3715
3482	my $self = $class->SUPER::new (	3716	my $self = $class->SUPER::new (
3483	col_expand => [0, 1, 0],	3717	col_expand => [0, 1, 0],
		3718	items => [],
3484	@_,	3719	@_,
3485	);	3720	);
3486		3721
		3722	$self->set_sort_order (undef);
		3723
3487	$self	3724	$self
		3725	}
		3726
		3727	sub update_items {
		3728	my ($self) = @_;
		3729
		3730	$self->clear;
		3731
		3732	my @item = $self->{sort}->(@{ $self->{items} });
		3733
		3734	my @adds;
		3735	my $row = 0;
		3736	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3737	CFPlus::Item::update_widgets $item;
		3738
		3739	push @adds, 0, $row, $item->{face_widget};
		3740	push @adds, 1, $row, $item->{desc_widget};
		3741	push @adds, 2, $row, $item->{weight_widget};
		3742
		3743	$row++;
		3744	}
		3745
		3746	$self->add (@adds);
		3747	}
		3748
		3749	sub set_sort_order {
		3750	my ($self, $order) = @_;
		3751
		3752	$self->{sort} = $order ||= sub {
		3753	sort {
		3754	$a->{type} <=> $b->{type}
		3755	or $a->{name} cmp $b->{name}
		3756	} @_
		3757	};
		3758
		3759	$self->update_items;
3488	}	3760	}
3489		3761
3490	sub set_items {	3762	sub set_items {
3491	my ($self, $items) = @_;	3763	my ($self, $items) = @_;
3492		3764
3493	$self->clear;	3765	$self->{items} = [$items ? values %$items : ()];
3494	return unless $items;	3766	$self->update_items;
3495
3496	my @items = sort {
3497	($a->{type} <=> $b->{type})
3498	or ($a->{name} cmp $b->{name})
3499	} values %$items;
3500
3501	$self->{real_items} = \@items;
3502
3503	my $row = 0;
3504	for my $item (@items) {
3505	CFClient::Item::update_widgets $item;
3506
3507	$self->add (0, $row, $item->{face_widget});
3508	$self->add (1, $row, $item->{desc_widget});
3509	$self->add (2, $row, $item->{weight_widget});
3510
3511	$row++;
3512	}
3513	}	3767	}
3514		3768
3515	#############################################################################	3769	#############################################################################
3516		3770
3517	package CFClient::UI::SpellList;	3771	package CFPlus::UI::SpellList;
3518		3772
3519	our @ISA = CFClient::UI::Table::;	3773	our @ISA = CFPlus::UI::Table::;
3520		3774
3521	sub new {	3775	sub new {
3522	my $class = shift;	3776	my $class = shift;
3523		3777
3524	my $self = $class->SUPER::new (	3778	my $self = $class->SUPER::new (
…		…
3542	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3796	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543		3797
3544	sub rebuild_spell_list {	3798	sub rebuild_spell_list {
3545	my ($self) = @_;	3799	my ($self) = @_;
3546		3800
3547	$CFClient::UI::ROOT->on_refresh ($self => sub {	3801	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3548	$self->clear;	3802	$self->clear;
3549		3803
3550	return unless $::CONN;	3804	return unless $::CONN;
3551		3805
3552	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3806	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3807	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3808	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3809	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3810	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557		3811
3558	my $row = 0;	3812	my $row = 0;
3559		3813
3560	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3814	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561	my $spell = $self->{spell}{$_};	3815	my $spell = $self->{spell}{$_};
…		…
3568	if ($ev->{button} == 1) {	3822	if ($ev->{button} == 1) {
3569	$::CONN->user_send ("cast $spell->{name}");	3823	$::CONN->user_send ("cast $spell->{name}");
3570	} elsif ($ev->{button} == 2) {	3824	} elsif ($ev->{button} == 2) {
3571	$::CONN->user_send ("invoke $spell->{name}");	3825	$::CONN->user_send ("invoke $spell->{name}");
3572	} elsif ($ev->{button} == 3) {	3826	} elsif ($ev->{button} == 3) {
3573	(new CFClient::UI::Menu	3827	(new CFPlus::UI::Menu
3574	items => [	3828	items => [
3575	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3829	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3830	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577	],	3831	],
3578	)->popup ($ev);	3832	)->popup ($ev);
…		…
3584	};	3838	};
3585		3839
3586	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3840	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3587		3841
3588	#TODO: add path info to tooltip	3842	#TODO: add path info to tooltip
3589	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3843	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3590		3844
3591	$self->add (0, $row, new CFClient::UI::Face	3845	$self->add (0, $row, new CFPlus::UI::Face
3592	face => $spell->{face},	3846	face => $spell->{face},
3593	can_hover => 1,	3847	can_hover => 1,
3594	can_events => 1,	3848	can_events => 1,
3595	tooltip => $tooltip,	3849	tooltip => $tooltip,
3596	on_button_down => $spell_cb,	3850	on_button_down => $spell_cb,
3597	);	3851	);
3598		3852
3599	$self->add (1, $row, new CFClient::UI::Label	3853	$self->add (1, $row, new CFPlus::UI::Label
3600	expand => 1,	3854	expand => 1,
3601	text => $spell->{name},	3855	text => $spell->{name},
3602	can_hover => 1,	3856	can_hover => 1,
3603	can_events => 1,	3857	can_events => 1,
3604	tooltip => $tooltip,	3858	tooltip => $tooltip,
3605	on_button_down => $spell_cb,	3859	on_button_down => $spell_cb,
3606	);	3860	);
3607		3861
3608	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3862	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3863	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3864	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3865	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612	}	3866	}
3613	});	3867	});
3614	}	3868	}
3615		3869
3616	sub add_spell {	3870	sub add_spell {
…		…
3634	$self->rebuild_spell_list;	3888	$self->rebuild_spell_list;
3635	}	3889	}
3636		3890
3637	#############################################################################	3891	#############################################################################
3638		3892
3639	package CFClient::UI::Root;	3893	package CFPlus::UI::Root;
3640		3894
3641	our @ISA = CFClient::UI::Container::;	3895	our @ISA = CFPlus::UI::Container::;
3642		3896
3643	use List::Util qw(min max);	3897	use List::Util qw(min max);
3644		3898
3645	use CFClient::OpenGL;	3899	use CFPlus::OpenGL;
3646		3900
3647	sub new {	3901	sub new {
3648	my $class = shift;	3902	my $class = shift;
3649		3903
3650	my $self = $class->SUPER::new (	3904	my $self = $class->SUPER::new (
…		…
3829	$h = 0 if $h < 0;	4083	$h = 0 if $h < 0;
3830		4084
3831	$w = max $widget->{min_w}, $w;	4085	$w = max $widget->{min_w}, $w;
3832	$h = max $widget->{min_h}, $h;	4086	$h = max $widget->{min_h}, $h;
3833		4087
		4088	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4089	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4090
3834	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4091	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4092	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836		4093
3837	$w = int $w + 0.5;	4094	$w = int $w + 0.5;
3838	$h = int $h + 0.5;	4095	$h = int $h + 0.5;
…		…
3864	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4121	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3865	glMatrixMode GL_MODELVIEW;	4122	glMatrixMode GL_MODELVIEW;
3866	glLoadIdentity;	4123	glLoadIdentity;
3867		4124
3868	{	4125	{
3869	package CFClient::UI::Base;	4126	package CFPlus::UI::Base;
3870		4127
3871	($draw_x, $draw_y, $draw_w, $draw_h) =	4128	($draw_x, $draw_y, $draw_w, $draw_h) =
3872	(0, 0, $self->{w}, $self->{h});	4129	(0, 0, $self->{w}, $self->{h});
3873	}	4130	}
3874		4131
3875	$self->_draw;	4132	$self->_draw;
3876	}	4133	}
3877		4134
3878	#############################################################################	4135	#############################################################################
3879		4136
3880	package CFClient::UI;	4137	package CFPlus::UI;
3881		4138
3882	$ROOT = new CFClient::UI::Root;	4139	$ROOT = new CFPlus::UI::Root;
3883	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4140	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3884		4141
3885	1	4142	1
3886		4143

Diff Legend

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