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.327 by root, Mon Jul 17 01:41:53 2006 UTC vs.
Revision 1.350 by root, Sat Aug 19 18:39:24 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
…		…
852	}	909	}
853		910
854	sub _draw {	911	sub _draw {
855	my ($self) = @_;	912	my ($self) = @_;
856		913
857	my ($w, $h) = @$self{qw(w h)};
858
859	my $tex = $self->{texture}	914	my $tex = $self->{texture}
860	or return;	915	or return;
861		916
862	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
865		920
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
867		922
868	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
869	}	924	}
870		925
871	#############################################################################	926	#############################################################################
872		927
873	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
874		929
875	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
876		931
877	sub new {	932	sub new {
878	my $class = shift;	933	my $class = shift;
879		934
880	$class->SUPER::new (	935	$class->SUPER::new (
…		…
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	997	) {
943	$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})
944	} else {	999	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	1001	}
947	}	1002	}
948		1003
949	sub _render {	1004	sub _render {
950	my ($self) = @_;	1005	my ($self) = @_;
951		1006
952	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};
953	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};
954		1009
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1011
957	$self->SUPER::_render;	1012	$self->SUPER::_render;
958	}	1013	}
959		1014
960	#############################################################################	1015	#############################################################################
961		1016
962	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
963		1018
964	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
965		1020
966	sub new {	1021	sub new {
967	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
968		1023
969	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
970		1025
971	my $self;	1026	my $self;
972		1027
973	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
974	vertical => 1,	1029	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1031	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
978	},	1033	},
979	;	1034	;
980		1035
981	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
		1038	can_events => 1,
983	slider => $slider,	1039	slider => $slider,
984	%arg,	1040	%arg,
985	);	1041	);
986		1042
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1043	$self->SUPER::add ($self->{vp}, $self->{slider});
988	$self->add ($child) if $child;	1044	$self->add ($child) if $child;
…		…
996	my ($self, $widget) = @_;	1052	my ($self, $widget) = @_;
997		1053
998	$self->{vp}->add ($self->{child} = $widget);	1054	$self->{vp}->add ($self->{child} = $widget);
999	}	1055	}
1000		1056
		1057	sub invoke_mouse_wheel {
		1058	my ($self, $ev) = @_;
		1059
		1060	return 0 unless $ev->{dy}; # only vertical movements
		1061
		1062	$self->{slider}->emit (mouse_wheel => $ev);
		1063
		1064	1
		1065	}
		1066
1001	sub update_slider {	1067	sub update_slider {
1002	my ($self) = @_;	1068	my ($self) = @_;
1003		1069
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1070	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1005	}	1071	}
…		…
1020	$self->SUPER::invoke_size_allocate ($w, $h)	1086	$self->SUPER::invoke_size_allocate ($w, $h)
1021	}	1087	}
1022		1088
1023	#############################################################################	1089	#############################################################################
1024		1090
1025	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
1026		1092
1027	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
1028		1094
1029	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
1030		1096
1031	sub new {	1097	sub new {
1032	my $class = shift;	1098	my $class = shift;
1033		1099
1034	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
1060	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
1061	}	1127	}
1062		1128
1063	#############################################################################	1129	#############################################################################
1064		1130
1065	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
1066		1132
1067	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
1068		1134
1069	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;
1070		1236
1071	my $bg =	1237	my $bg =
1072	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1238	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1073	mipmap => 1, wrap => 1;	1239	mipmap => 1, wrap => 1;
1074		1240
1075	my @border =	1241	my @border =
1076	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1242	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);	1243	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1078		1244
1079	sub new {	1245	sub new {
1080	my ($class, %arg) = @_;	1246	my ($class, %arg) = @_;
1081		1247
…		…
1087	min_w => 64,	1253	min_w => 64,
1088	min_h => 32,	1254	min_h => 32,
1089	%arg,	1255	%arg,
1090	);	1256	);
1091		1257
1092	$self->{title_widget} = new CFClient::UI::Label	1258	$self->{title_widget} = new CFPlus::UI::Label
1093	align => 0,	1259	align => 0,
1094	valign => 1,	1260	valign => 1,
1095	text => $self->{title},	1261	text => $self->{title},
1096	fontsize => $self->{border},	1262	fontsize => $self->{border},
1097	if exists $self->{title};	1263	if exists $self->{title};
1098		1264
1099	if ($self->{has_close_button}) {	1265	if ($self->{has_close_button}) {
1100	$self->{close_button} =	1266	$self->{close_button} =
1101	new CFClient::UI::ImageButton	1267	new CFPlus::UI::ImageButton
1102	path => 'x1_close.png',	1268	path => 'x1_close.png',
1103	on_activate => sub { $self->emit ("delete") };	1269	on_activate => sub { $self->emit ("delete") };
1104		1270
1105	$self->CFClient::UI::Container::add ($self->{close_button});	1271	$self->CFPlus::UI::Container::add ($self->{close_button});
1106	}	1272	}
1107		1273
1108	$self	1274	$self
1109	}	1275	}
1110		1276
1111	sub add {	1277	sub add {
1112	my ($self, @widgets) = @_;	1278	my ($self, @widgets) = @_;
1113		1279
1114	$self->SUPER::add (@widgets);	1280	$self->SUPER::add (@widgets);
1115	$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};
1116	$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};
1117	}	1283	}
1118		1284
1119	sub border {	1285	sub border {
1120	int $_[0]{border} * $::FONTSIZE	1286	int $_[0]{border} * $::FONTSIZE
1121	}	1287	}
…		…
1229	$self->{motion}->($ev, $x, $y) if $self->{motion};	1395	$self->{motion}->($ev, $x, $y) if $self->{motion};
1230		1396
1231	! ! $self->{motion}	1397	! ! $self->{motion}
1232	}	1398	}
1233		1399
		1400	sub invoke_visibility_change {
		1401	my ($self, $visible) = @_;
		1402
		1403	delete $self->{motion} unless $visible;
		1404
		1405	0
		1406	}
		1407
1234	sub _draw {	1408	sub _draw {
1235	my ($self) = @_;	1409	my ($self) = @_;
1236		1410
1237	my $child = $self->{children}[0];	1411	my $child = $self->{children}[0];
1238		1412
…		…
1275	if $self->{close_button};	1449	if $self->{close_button};
1276	}	1450	}
1277		1451
1278	#############################################################################	1452	#############################################################################
1279		1453
1280	package CFClient::UI::Table;	1454	package CFPlus::UI::Table;
1281		1455
1282	our @ISA = CFClient::UI::Base::;	1456	our @ISA = CFPlus::UI::Base::;
1283		1457
1284	use List::Util qw(max sum);	1458	use List::Util qw(max sum);
1285		1459
1286	use CFClient::OpenGL;	1460	use CFPlus::OpenGL;
1287		1461
1288	sub new {	1462	sub new {
1289	my $class = shift;	1463	my $class = shift;
1290		1464
1291	$class->SUPER::new (	1465	$class->SUPER::new (
…		…
1297	sub children {	1471	sub children {
1298	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1299	}	1473	}
1300		1474
1301	sub add {	1475	sub add {
1302	my ($self, $x, $y, $child) = @_;	1476	my ($self) = shift;
1303		1477
		1478	while (@_) {
		1479	my ($x, $y, $child) = splice @_, 0, 3, ();
1304	$child->set_parent ($self);	1480	$child->set_parent ($self);
1305	$self->{children}[$y][$x] = $child;	1481	$self->{children}[$y][$x] = $child;
		1482	}
1306		1483
		1484	$self->{force_realloc} = 1;
		1485	$self->{force_size_alloc} = 1;
1307	$self->realloc;	1486	$self->realloc;
1308	}	1487	}
1309		1488
1310	sub remove {	1489	sub remove {
1311	my ($self, $child) = @_;	1490	my ($self, $child) = @_;
…		…
1376		1555
1377	# linearly scale sizes	1556	# linearly scale sizes
1378	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1379	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1380		1559
1381	CFClient::UI::harmonize $ws;	1560	CFPlus::UI::harmonize $ws;
1382	CFClient::UI::harmonize $hs;	1561	CFPlus::UI::harmonize $hs;
1383		1562
1384	my $y;	1563	my $y;
1385		1564
1386	for my $r (0 .. $#{$self->{children}}) {	1565	for my $r (0 .. $#{$self->{children}}) {
1387	my $row = $self->{children}[$r]	1566	my $row = $self->{children}[$r]
…		…
1430	}	1609	}
1431	}	1610	}
1432		1611
1433	#############################################################################	1612	#############################################################################
1434		1613
1435	package CFClient::UI::Box;	1614	package CFPlus::UI::Box;
1436		1615
1437	our @ISA = CFClient::UI::Container::;	1616	our @ISA = CFPlus::UI::Container::;
1438		1617
1439	sub size_request {	1618	sub size_request {
1440	my ($self) = @_;	1619	my ($self) = @_;
1441		1620
1442	$self->{vertical}	1621	$self->{vertical}
…		…
1475	$req[$_] += $space * $children[$_]{expand}	1654	$req[$_] += $space * $children[$_]{expand}
1476	for 0 .. $#children;	1655	for 0 .. $#children;
1477	}	1656	}
1478	}	1657	}
1479		1658
1480	CFClient::UI::harmonize \@req;	1659	CFPlus::UI::harmonize \@req;
1481		1660
1482	my $pos = 0;	1661	my $pos = 0;
1483	for (0 .. $#children) {	1662	for (0 .. $#children) {
1484	my $alloc = $req[$_];	1663	my $alloc = $req[$_];
1485	$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));
…		…
1490	1	1669	1
1491	}	1670	}
1492		1671
1493	#############################################################################	1672	#############################################################################
1494		1673
1495	package CFClient::UI::HBox;	1674	package CFPlus::UI::HBox;
1496		1675
1497	our @ISA = CFClient::UI::Box::;	1676	our @ISA = CFPlus::UI::Box::;
1498		1677
1499	sub new {	1678	sub new {
1500	my $class = shift;	1679	my $class = shift;
1501		1680
1502	$class->SUPER::new (	1681	$class->SUPER::new (
…		…
1505	)	1684	)
1506	}	1685	}
1507		1686
1508	#############################################################################	1687	#############################################################################
1509		1688
1510	package CFClient::UI::VBox;	1689	package CFPlus::UI::VBox;
1511		1690
1512	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1513		1692
1514	sub new {	1693	sub new {
1515	my $class = shift;	1694	my $class = shift;
1516		1695
1517	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1520	)	1699	)
1521	}	1700	}
1522		1701
1523	#############################################################################	1702	#############################################################################
1524		1703
1525	package CFClient::UI::Label;	1704	package CFPlus::UI::Label;
1526		1705
1527	our @ISA = CFClient::UI::DrawBG::;	1706	our @ISA = CFPlus::UI::DrawBG::;
1528		1707
1529	use CFClient::OpenGL;	1708	use CFPlus::OpenGL;
1530		1709
1531	sub new {	1710	sub new {
1532	my ($class, %arg) = @_;	1711	my ($class, %arg) = @_;
1533		1712
1534	my $self = $class->SUPER::new (	1713	my $self = $class->SUPER::new (
…		…
1537	#active_bg => none	1716	#active_bg => none
1538	#font => default_font	1717	#font => default_font
1539	#text => initial text	1718	#text => initial text
1540	#markup => initial narkup	1719	#markup => initial narkup
1541	#max_w => maximum pixel width	1720	#max_w => maximum pixel width
		1721	#style => 0, # render flags
1542	ellipsise => 3, # end	1722	ellipsise => 3, # end
1543	layout => (new CFClient::Layout),	1723	layout => (new CFPlus::Layout),
1544	fontsize => 1,	1724	fontsize => 1,
1545	align => -1,	1725	align => -1,
1546	valign => -1,	1726	valign => -1,
1547	padding_x => 2,	1727	padding_x => 2,
1548	padding_y => 2,	1728	padding_y => 2,
1549	can_events => 0,	1729	can_events => 0,
1550	%arg	1730	%arg
1551	);	1731	);
1552		1732
1553	if (exists $self->{template}) {	1733	if (exists $self->{template}) {
1554	my $layout = new CFClient::Layout;	1734	my $layout = new CFPlus::Layout;
1555	$layout->set_text (delete $self->{template});	1735	$layout->set_text (delete $self->{template});
1556	$self->{template} = $layout;	1736	$self->{template} = $layout;
1557	}	1737	}
1558		1738
1559	if (exists $self->{markup}) {	1739	if (exists $self->{markup}) {
…		…
1561	} else {	1741	} else {
1562	$self->set_text (delete $self->{text});	1742	$self->set_text (delete $self->{text});
1563	}	1743	}
1564		1744
1565	$self	1745	$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	}	1746	}
1577		1747
1578	sub update {	1748	sub update {
1579	my ($self) = @_;	1749	my ($self) = @_;
1580		1750
…		…
1707	};	1877	};
1708		1878
1709	my $w = List::Util::min $self->{w} + 4, $size->[0];	1879	my $w = List::Util::min $self->{w} + 4, $size->[0];
1710	my $h = List::Util::min $self->{h} + 2, $size->[1];	1880	my $h = List::Util::min $self->{h} + 2, $size->[1];
1711		1881
1712	$self->{layout}->render ($self->{ox}, $self->{oy});	1882	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713	}	1883	}
1714		1884
1715	#############################################################################	1885	#############################################################################
1716		1886
1717	package CFClient::UI::EntryBase;	1887	package CFPlus::UI::EntryBase;
1718		1888
1719	our @ISA = CFClient::UI::Label::;	1889	our @ISA = CFPlus::UI::Label::;
1720		1890
1721	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1722		1892
1723	sub new {	1893	sub new {
1724	my $class = shift;	1894	my $class = shift;
1725		1895
1726	$class->SUPER::new (	1896	$class->SUPER::new (
…		…
1788		1958
1789	if ($uni == 8) {	1959	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1960	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	1961	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	1962	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	1963	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	1964	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	1965	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	1966	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	1967	} elsif ($sym == CFPlus::SDLK_HOME) {
1798	$self->{cursor} = 0;	1968	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {	1969	} elsif ($sym == CFPlus::SDLK_END) {
1800	$self->{cursor} = length $text;	1970	$self->{cursor} = length $text;
		1971	} elsif ($uni == 21) { # ctrl-u
		1972	$text = "";
		1973	$self->{cursor} = 0;
1801	} elsif ($uni == 27) {	1974	} elsif ($uni == 27) {
1802	$self->emit ('escape');	1975	$self->emit ('escape');
1803	} elsif ($uni) {	1976	} elsif ($uni) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	1977	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	1978	} else {
…		…
1878	utf8::encode $text;	2051	utf8::encode $text;
1879		2052
1880	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2053	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881	}	2054	}
1882		2055
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2056	glBegin GL_LINES;
1885	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2057	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2058	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	2059	glEnd;
1888	}	2060	}
1889	}	2061	}
1890		2062
1891	package CFClient::UI::Entry;	2063	package CFPlus::UI::Entry;
1892		2064
1893	our @ISA = CFClient::UI::EntryBase::;	2065	our @ISA = CFPlus::UI::EntryBase::;
1894		2066
1895	use CFClient::OpenGL;	2067	use CFPlus::OpenGL;
1896		2068
1897	sub invoke_key_down {	2069	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2070	my ($self, $ev) = @_;
1899		2071
1900	my $sym = $ev->{sym};	2072	my $sym = $ev->{sym};
…		…
1906	$self->{history_pointer} = -1;	2078	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2079	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2080	$self->emit (activate => $txt);
1909	$self->update;	2081	$self->update;
1910		2082
1911	} elsif ($sym == CFClient::SDLK_UP) {	2083	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2084	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2085	$self->{history_saveback} = $self->get_text;
1914	}	2086	}
1915	if (@{$self->{history} || []} > 0) {	2087	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2088	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2090	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2091	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2092	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2093	}
1922		2094
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2095	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2096	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2097	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2098
1927	if ($self->{history_pointer} >= 0) {	2099	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2100	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2109	1
1938	}	2110	}
1939		2111
1940	#############################################################################	2112	#############################################################################
1941		2113
1942	package CFClient::UI::Button;	2114	package CFPlus::UI::Button;
1943		2115
1944	our @ISA = CFClient::UI::Label::;	2116	our @ISA = CFPlus::UI::Label::;
1945		2117
1946	use CFClient::OpenGL;	2118	use CFPlus::OpenGL;
1947		2119
1948	my @tex =	2120	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2121	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2122	qw(b1_button_active.png);
1951		2123
1952	sub new {	2124	sub new {
1953	my $class = shift;	2125	my $class = shift;
1954		2126
…		…
1991	$self->SUPER::_draw;	2163	$self->SUPER::_draw;
1992	}	2164	}
1993		2165
1994	#############################################################################	2166	#############################################################################
1995		2167
		2168	package CFPlus::UI::CheckBox;
		2169
		2170	our @ISA = CFPlus::UI::DrawBG::;
		2171
		2172	my @tex =
		2173	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2174	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2175
		2176	use CFPlus::OpenGL;
		2177
		2178	sub new {
		2179	my $class = shift;
		2180
		2181	$class->SUPER::new (
		2182	padding_x => 2,
		2183	padding_y => 2,
		2184	fg => [1, 1, 1],
		2185	active_fg => [1, 1, 0],
		2186	bg => [0, 0, 0, 0.2],
		2187	active_bg => [1, 1, 1, 0.5],
		2188	state => 0,
		2189	can_hover => 1,
		2190	@_
		2191	)
		2192	}
		2193
		2194	sub size_request {
		2195	my ($self) = @_;
		2196
		2197	(6) x 2
		2198	}
		2199
		2200	sub toggle {
		2201	my ($self) = @_;
		2202
		2203	$self->{state} = !$self->{state};
		2204	$self->emit (changed => $self->{state});
		2205	$self->update;
		2206	}
		2207
		2208	sub invoke_button_down {
		2209	my ($self, $ev, $x, $y) = @_;
		2210
		2211	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2212	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2213	$self->toggle;
		2214	} else {
		2215	return 0
		2216	}
		2217
		2218	1
		2219	}
		2220
		2221	sub _draw {
		2222	my ($self) = @_;
		2223
		2224	$self->SUPER::_draw;
		2225
		2226	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2227
		2228	my ($w, $h) = @$self{qw(w h)};
		2229
		2230	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2231
		2232	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2233
		2234	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2235
		2236	glEnable GL_TEXTURE_2D;
		2237	$tex->draw_quad_alpha (0, 0, $s, $s);
		2238	glDisable GL_TEXTURE_2D;
		2239	}
		2240
		2241	#############################################################################
		2242
		2243	package CFPlus::UI::Image;
		2244
		2245	our @ISA = CFPlus::UI::Base::;
		2246
		2247	use CFPlus::OpenGL;
		2248
		2249	our %texture_cache;
		2250
		2251	sub new {
		2252	my $class = shift;
		2253
		2254	my $self = $class->SUPER::new (
		2255	can_events => 0,
		2256	@_,
		2257	);
		2258
		2259	$self->{path} || $self->{tex}
		2260	or Carp::croak "'path' or 'tex' attributes required";
		2261
		2262	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2263	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2264
		2265	Scalar::Util::weaken $texture_cache{$self->{path}};
		2266
		2267	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2268
		2269	$self
		2270	}
		2271
		2272	sub STORABLE_freeze {
		2273	my ($self, $cloning) = @_;
		2274
		2275	$self->{path}
		2276	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2277
		2278	$self->{path}
		2279	}
		2280
		2281	sub STORABLE_attach {
		2282	my ($self, $cloning, $path) = @_;
		2283
		2284	$self->new (path => $path)
		2285	}
		2286
		2287	sub size_request {
		2288	my ($self) = @_;
		2289
		2290	($self->{tex}{w}, $self->{tex}{h})
		2291	}
		2292
		2293	sub _draw {
		2294	my ($self) = @_;
		2295
		2296	my $tex = $self->{tex};
		2297
		2298	my ($w, $h) = ($self->{w}, $self->{h});
		2299
		2300	if ($self->{rot90}) {
		2301	glRotate 90, 0, 0, 1;
		2302	glTranslate 0, -$self->{w}, 0;
		2303
		2304	($w, $h) = ($h, $w);
		2305	}
		2306
		2307	glEnable GL_TEXTURE_2D;
		2308	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2309
		2310	$tex->draw_quad (0, 0, $w, $h);
		2311
		2312	glDisable GL_TEXTURE_2D;
		2313	}
		2314
		2315	#############################################################################
		2316
1996	package CFClient::UI::ImageButton;	2317	package CFPlus::UI::ImageButton;
1997		2318
1998	our @ISA = CFClient::UI::Image::;	2319	our @ISA = CFPlus::UI::Image::;
1999		2320
2000	use CFClient::OpenGL;	2321	use CFPlus::OpenGL;
2001		2322
2002	my %textures;	2323	my %textures;
2003		2324
2004	sub new {	2325	sub new {
2005	my $class = shift;	2326	my $class = shift;
…		…
2027	1	2348	1
2028	}	2349	}
2029		2350
2030	#############################################################################	2351	#############################################################################
2031		2352
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;	2353	package CFPlus::UI::VGauge;
2108		2354
2109	our @ISA = CFClient::UI::Base::;	2355	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} || $self->{tex}
2124	or Carp::croak "'path' or 'tex' attributes required";
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		2356
2170	use List::Util qw(min max);	2357	use List::Util qw(min max);
2171		2358
2172	use CFClient::OpenGL;	2359	use CFPlus::OpenGL;
2173		2360
2174	my %tex = (	2361	my %tex = (
2175	food => [	2362	food => [
2176	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2363	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2177	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2364	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2178	],	2365	],
2179	grace => [	2366	grace => [
2180	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2367	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/	2368	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2182	],	2369	],
2183	hp => [	2370	hp => [
2184	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2371	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2185	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2372	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2186	],	2373	],
2187	mana => [	2374	mana => [
2188	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2375	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/	2376	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2190	],	2377	],
2191	);	2378	);
2192		2379
2193	# eg. VGauge->new (gauge => 'food'), default gauge: food	2380	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2296	glDisable GL_TEXTURE_2D;	2483	glDisable GL_TEXTURE_2D;
2297	}	2484	}
2298		2485
2299	#############################################################################	2486	#############################################################################
2300		2487
2301	package CFClient::UI::Gauge;	2488	package CFPlus::UI::Gauge;
2302		2489
2303	our @ISA = CFClient::UI::VBox::;	2490	our @ISA = CFPlus::UI::VBox::;
2304		2491
2305	sub new {	2492	sub new {
2306	my ($class, %arg) = @_;	2493	my ($class, %arg) = @_;
2307		2494
2308	my $self = $class->SUPER::new (	2495	my $self = $class->SUPER::new (
…		…
2310	can_hover => 1,	2497	can_hover => 1,
2311	can_events => 1,	2498	can_events => 1,
2312	%arg,	2499	%arg,
2313	);	2500	);
2314		2501
2315	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2502	$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);	2503	$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");	2504	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2318		2505
2319	$self	2506	$self
2320	}	2507	}
2321		2508
2322	sub set_fontsize {	2509	sub set_fontsize {
…		…
2343	$self->{value}->set_text ($val);	2530	$self->{value}->set_text ($val);
2344	}	2531	}
2345		2532
2346	#############################################################################	2533	#############################################################################
2347		2534
2348	package CFClient::UI::Slider;	2535	package CFPlus::UI::Slider;
2349		2536
2350	use strict;	2537	use strict;
2351		2538
2352	use CFClient::OpenGL;	2539	use CFPlus::OpenGL;
2353		2540
2354	our @ISA = CFClient::UI::DrawBG::;	2541	our @ISA = CFPlus::UI::DrawBG::;
2355		2542
2356	my @tex =	2543	my @tex =
2357	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2544	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2358	qw(s1_slider.png s1_slider_bg.png);	2545	qw(s1_slider.png s1_slider_bg.png);
2359		2546
2360	sub new {	2547	sub new {
2361	my $class = shift;	2548	my $class = shift;
2362		2549
…		…
2451	}	2638	}
2452		2639
2453	1	2640	1
2454	}	2641	}
2455		2642
		2643	sub invoke_mouse_wheel {
		2644	my ($self, $ev) = @_;
		2645
		2646	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2647
		2648	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2649
		2650	! ! $delta
		2651	}
		2652
2456	sub update {	2653	sub update {
2457	my ($self) = @_;	2654	my ($self) = @_;
2458		2655
2459	delete $self->{knob_w};	2656	delete $self->{knob_w};
2460	$self->SUPER::update;	2657	$self->SUPER::update;
…		…
2507	glDisable GL_TEXTURE_2D;	2704	glDisable GL_TEXTURE_2D;
2508	}	2705	}
2509		2706
2510	#############################################################################	2707	#############################################################################
2511		2708
2512	package CFClient::UI::ValSlider;	2709	package CFPlus::UI::ValSlider;
2513		2710
2514	our @ISA = CFClient::UI::HBox::;	2711	our @ISA = CFPlus::UI::HBox::;
2515		2712
2516	sub new {	2713	sub new {
2517	my ($class, %arg) = @_;	2714	my ($class, %arg) = @_;
2518		2715
2519	my $range = delete $arg{range};	2716	my $range = delete $arg{range};
2520		2717
2521	my $self = $class->SUPER::new (	2718	my $self = $class->SUPER::new (
2522	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2719	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2523	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2720	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2524	to_value => sub { shift },	2721	to_value => sub { shift },
2525	from_value => sub { shift },	2722	from_value => sub { shift },
2526	%arg,	2723	%arg,
2527	);	2724	);
2528		2725
…		…
2548	sub set_range { shift->{slider}->set_range (@_) }	2745	sub set_range { shift->{slider}->set_range (@_) }
2549	sub set_value { shift->{slider}->set_value (@_) }	2746	sub set_value { shift->{slider}->set_value (@_) }
2550		2747
2551	#############################################################################	2748	#############################################################################
2552		2749
2553	package CFClient::UI::TextScroller;	2750	package CFPlus::UI::TextScroller;
2554		2751
2555	our @ISA = CFClient::UI::HBox::;	2752	our @ISA = CFPlus::UI::HBox::;
2556		2753
2557	use CFClient::OpenGL;	2754	use CFPlus::OpenGL;
2558		2755
2559	sub new {	2756	sub new {
2560	my $class = shift;	2757	my $class = shift;
2561		2758
2562	my $self = $class->SUPER::new (	2759	my $self = $class->SUPER::new (
2563	fontsize => 1,	2760	fontsize => 1,
2564	can_events => 0,	2761	can_events => 1,
2565	indent => 0,	2762	indent => 0,
2566	#font => default_font	2763	#font => default_font
2567	@_,	2764	@_,
2568		2765
2569	layout => (new CFClient::Layout),	2766	layout => (new CFPlus::Layout),
2570	par => [],	2767	par => [],
2571	height => 0,	2768	height => 0,
2572	children => [	2769	children => [
2573	(new CFClient::UI::Empty expand => 1),	2770	(new CFPlus::UI::Empty expand => 1),
2574	(new CFClient::UI::Slider vertical => 1),	2771	(new CFPlus::UI::Slider vertical => 1),
2575	],	2772	],
2576	);	2773	);
2577		2774
2578	$self->{children}[1]->connect (changed => sub { $self->update });	2775	$self->{children}[1]->connect (changed => sub { $self->update });
2579		2776
…		…
2609		2806
2610	$self->reflow;	2807	$self->reflow;
2611		2808
2612	local $self->{children} = [$empty, $slider];	2809	local $self->{children} = [$empty, $slider];
2613	$self->SUPER::invoke_size_allocate ($w, $h)	2810	$self->SUPER::invoke_size_allocate ($w, $h)
		2811	}
		2812
		2813	sub invoke_mouse_wheel {
		2814	my ($self, $ev) = @_;
		2815
		2816	return 0 unless $ev->{dy}; # only vertical movements
		2817
		2818	$self->{children}[1]->emit (mouse_wheel => $ev);
		2819
		2820	1
2614	}	2821	}
2615		2822
2616	sub get_layout {	2823	sub get_layout {
2617	my ($self, $para) = @_;	2824	my ($self, $para) = @_;
2618		2825
…		…
2646		2853
2647	# todo: base offset on lines or so, not on pixels	2854	# todo: base offset on lines or so, not on pixels
2648	$self->{children}[1]->set_value ($offset);	2855	$self->{children}[1]->set_value ($offset);
2649	}	2856	}
2650		2857
		2858	sub current_paragraph {
		2859	my ($self) = @_;
		2860
		2861	$self->{top_paragraph} - 1
		2862	}
		2863
		2864	sub scroll_to {
		2865	my ($self, $para) = @_;
		2866
		2867	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2868
		2869	$self->{scroll_to} = $para;
		2870	$self->update;
		2871	}
		2872
2651	sub clear {	2873	sub clear {
2652	my ($self) = @_;	2874	my ($self) = @_;
2653		2875
2654	my (undef, undef, @other) = @{ $self->{children} };	2876	my (undef, undef, @other) = @{ $self->{children} };
2655	$self->remove ($_) for @other;	2877	$self->remove ($_) for @other;
…		…
2658	$self->{height} = 0;	2880	$self->{height} = 0;
2659	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2881	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2660	}	2882	}
2661		2883
2662	sub add_paragraph {	2884	sub add_paragraph {
2663	my ($self, $color, $para, $indent) = @_;	2885	my $self = shift;
2664		2886
2665	my ($text, @w) = ref $para ? @$para : $para;	2887	for my $para (@_) {
2666
2667	$para = {	2888	$para = {
		2889	fg => [1, 1, 1, 1],
		2890	indent => 0,
		2891	markup => "",
		2892	widget => [],
		2893	ref $para ? %$para : (markup => $para),
2668	w => 1e10,	2894	w => 1e10,
2669	wrapped => 1,	2895	wrapped => 1,
2670	fg => $color,
2671	indent => $indent,
2672	markup => $text,
2673	widget => \@w,
2674	};	2896	};
2675		2897
2676	$self->add (@w) if @w;	2898	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2677	push @{$self->{par}}, $para;	2899	push @{$self->{par}}, $para;
		2900	}
2678		2901
2679	$self->{need_reflow}++;	2902	$self->{need_reflow}++;
2680	$self->update;	2903	$self->update;
2681	}	2904	}
2682		2905
2683	sub scroll_to_bottom {	2906	sub scroll_to_bottom {
2684	my ($self) = @_;	2907	my ($self) = @_;
2685		2908
2686	$self->{scroll_to_bottom} = 1;	2909	$self->{scroll_to} = $#{$self->{par}};
2687	$self->update;	2910	$self->update;
2688	}	2911	}
2689		2912
		2913	sub force_uptodate {
		2914	my ($self) = @_;
		2915
		2916	if (delete $self->{need_reflow}) {
		2917	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2918
		2919	my $height = 0;
		2920
		2921	for my $para (@{$self->{par}}) {
		2922	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2923	my $layout = $self->get_layout ($para);
		2924	my ($w, $h) = $layout->size;
		2925
		2926	$para->{w} = $w + $para->{indent};
		2927	$para->{h} = $h;
		2928	$para->{wrapped} = $layout->has_wrapped;
		2929	}
		2930
		2931	$para->{y} = $height;
		2932	$height += $para->{h};
		2933	}
		2934
		2935	$self->{height} = $height;
		2936	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2937
		2938	delete $self->{texture};
		2939	}
		2940
		2941	if (my $paridx = delete $self->{scroll_to}) {
		2942	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2943	}
		2944	}
		2945
2690	sub update {	2946	sub update {
2691	my ($self) = @_;	2947	my ($self) = @_;
2692		2948
2693	$self->SUPER::update;	2949	$self->SUPER::update;
2694		2950
2695	return unless $self->{h} > 0;	2951	return unless $self->{h} > 0;
2696		2952
2697	delete $self->{texture};	2953	delete $self->{texture};
2698		2954
2699	$ROOT->on_post_alloc ($self => sub {	2955	$ROOT->on_post_alloc ($self => sub {
		2956	$self->force_uptodate;
		2957
2700	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2958	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2701		2959
2702	if (delete $self->{need_reflow}) {
2703	my $height = 0;
2704
2705	for my $para (@{$self->{par}}) {
2706	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2707	my $layout = $self->get_layout ($para);
2708	my ($w, $h) = $layout->size;
2709
2710	$para->{w} = $w + $para->{indent};
2711	$para->{h} = $h;
2712	$para->{wrapped} = $layout->has_wrapped;
2713	}
2714
2715	$height += $para->{h};
2716	}
2717
2718	$self->{height} = $height;
2719
2720	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2721
2722	delete $self->{texture};
2723	}
2724
2725	if (delete $self->{scroll_to_bottom}) {
2726	$self->{children}[1]->set_value (1e10);
2727	}
2728
2729	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2960	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2730	glClearColor 0, 0, 0, 0;	2961	glClearColor 0, 0, 0, 0;
2731	glClear GL_COLOR_BUFFER_BIT;	2962	glClear GL_COLOR_BUFFER_BIT;
2732		2963
2733	my $top = int $self->{children}[1]{range}[0];	2964	my $top = int $self->{children}[1]{range}[0];
2734		2965
		2966	my $paridx = 0;
		2967	my $top_paragraph;
		2968	my $top = int $self->{children}[1]{range}[0];
		2969
2735	my $y0 = $top;	2970	my $y0 = $top;
2736	my $y1 = $top + $H;	2971	my $y1 = $top + $H;
2737		2972
2738	my $y = 0;
2739
2740	for my $para (@{$self->{par}}) {	2973	for my $para (@{$self->{par}}) {
2741	my $h = $para->{h};	2974	my $h = $para->{h};
		2975	my $y = $para->{y};
2742		2976
2743	if ($y0 < $y + $h && $y < $y1) {	2977	if ($y0 < $y + $h && $y < $y1) {
2744
2745	my $layout = $self->get_layout ($para);	2978	my $layout = $self->get_layout ($para);
2746		2979
2747	$layout->render ($para->{indent}, $y - $y0);	2980	$layout->render ($para->{indent}, $y - $y0);
2748		2981
2749	if (my @w = @{ $para->{widget} }) {	2982	if (my @w = @{ $para->{widget} }) {
…		…
2758	$_->draw;	2991	$_->draw;
2759	}	2992	}
2760	}	2993	}
2761	}	2994	}
2762		2995
2763	$y += $h;	2996	$paridx++;
		2997	$top_paragraph ||= $paridx if $y >= $top;
2764	}	2998	}
		2999
		3000	$self->{top_paragraph} = $top_paragraph;
2765	};	3001	};
2766	});	3002	});
2767	}	3003	}
2768		3004
2769	sub reconfigure {	3005	sub reconfigure {
…		…
2787	$self->{children}[1]->draw;	3023	$self->{children}[1]->draw;
2788	}	3024	}
2789		3025
2790	#############################################################################	3026	#############################################################################
2791		3027
2792	package CFClient::UI::Animator;	3028	package CFPlus::UI::Animator;
2793		3029
2794	use CFClient::OpenGL;	3030	use CFPlus::OpenGL;
2795		3031
2796	our @ISA = CFClient::UI::Bin::;	3032	our @ISA = CFPlus::UI::Bin::;
2797		3033
2798	sub moveto {	3034	sub moveto {
2799	my ($self, $x, $y) = @_;	3035	my ($self, $x, $y) = @_;
2800		3036
2801	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3037	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2829	glPopMatrix;	3065	glPopMatrix;
2830	}	3066	}
2831		3067
2832	#############################################################################	3068	#############################################################################
2833		3069
2834	package CFClient::UI::Flopper;	3070	package CFPlus::UI::Flopper;
2835		3071
2836	our @ISA = CFClient::UI::Button::;	3072	our @ISA = CFPlus::UI::Button::;
2837		3073
2838	sub new {	3074	sub new {
2839	my $class = shift;	3075	my $class = shift;
2840		3076
2841	my $self = $class->SUPER::new (	3077	my $self = $class->SUPER::new (
…		…
2853	$self->{other}->toggle_visibility;	3089	$self->{other}->toggle_visibility;
2854	}	3090	}
2855		3091
2856	#############################################################################	3092	#############################################################################
2857		3093
2858	package CFClient::UI::Tooltip;	3094	package CFPlus::UI::Tooltip;
2859		3095
2860	our @ISA = CFClient::UI::Bin::;	3096	our @ISA = CFPlus::UI::Bin::;
2861		3097
2862	use CFClient::OpenGL;	3098	use CFPlus::OpenGL;
2863		3099
2864	sub new {	3100	sub new {
2865	my $class = shift;	3101	my $class = shift;
2866		3102
2867	$class->SUPER::new (	3103	$class->SUPER::new (
…		…
2870	)	3106	)
2871	}	3107	}
2872		3108
2873	sub set_tooltip_from {	3109	sub set_tooltip_from {
2874	my ($self, $widget) = @_;	3110	my ($self, $widget) = @_;
		3111
		3112	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3113	if $widget->{tooltip} =~ /^#(.*)$/;
2875		3114
2876	my $tooltip = $widget->{tooltip};	3115	my $tooltip = $widget->{tooltip};
2877		3116
2878	if ($ENV{CFPLUS_DEBUG} & 2) {	3117	if ($ENV{CFPLUS_DEBUG} & 2) {
2879	$tooltip .= "\n\n" . (ref $widget) . "\n"	3118	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2883	}	3122	}
2884		3123
2885	$tooltip =~ s/^\n+//;	3124	$tooltip =~ s/^\n+//;
2886	$tooltip =~ s/\n+$//;	3125	$tooltip =~ s/\n+$//;
2887		3126
2888	$self->add (new CFClient::UI::Label	3127	$self->add (new CFPlus::UI::Label
2889	markup => $tooltip,	3128	markup => $tooltip,
2890	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3129	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891	fontsize => 0.8,	3130	fontsize => 0.8,
2892	fg => [0, 0, 0, 1],	3131	style => 1, # FLAG_INVERSE
2893	ellipsise => 0,	3132	ellipsise => 0,
2894	font => ($widget->{tooltip_font} || $::FONT_PROP),	3133	font => ($widget->{tooltip_font} || $::FONT_PROP),
2895	);	3134	);
2896	}	3135	}
2897		3136
…		…
2916		3155
2917	$self->{root}->on_post_alloc ("move_$self" => sub {	3156	$self->{root}->on_post_alloc ("move_$self" => sub {
2918	my $widget = $self->{owner}	3157	my $widget = $self->{owner}
2919	or return;	3158	or return;
2920		3159
		3160	if ($widget->{visible}) {
2921	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3161	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922		3162
2923	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3163	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924	if $x + $self->{w} > $self->{root}{w};	3164	if $x + $self->{w} > $self->{root}{w};
2925		3165
2926	$self->move_abs ($x, $y);	3166	$self->move_abs ($x, $y);
		3167	} else {
		3168	$self->hide;
		3169	}
2927	});	3170	});
2928	}	3171	}
2929		3172
2930	sub _draw {	3173	sub _draw {
2931	my ($self) = @_;	3174	my ($self) = @_;
…		…
2955	$self->SUPER::_draw;	3198	$self->SUPER::_draw;
2956	}	3199	}
2957		3200
2958	#############################################################################	3201	#############################################################################
2959		3202
2960	package CFClient::UI::Face;	3203	package CFPlus::UI::Face;
2961		3204
2962	our @ISA = CFClient::UI::Base::;	3205	our @ISA = CFPlus::UI::DrawBG::;
2963		3206
2964	use CFClient::OpenGL;	3207	use CFPlus::OpenGL;
2965		3208
2966	sub new {	3209	sub new {
2967	my $class = shift;	3210	my $class = shift;
2968		3211
2969	my $self = $class->SUPER::new (	3212	my $self = $class->SUPER::new (
…		…
3004	sub _draw {	3247	sub _draw {
3005	my ($self) = @_;	3248	my ($self) = @_;
3006		3249
3007	return unless $::CONN;	3250	return unless $::CONN;
3008		3251
		3252	$self->SUPER::_draw;
		3253
3009	my $face;	3254	my $face;
3010		3255
3011	if ($self->{frame}) {	3256	if ($self->{frame}) {
3012	my $anim = $::CONN->{anim}[$self->{anim}];	3257	my $anim = $::CONN->{anim}[$self->{anim}];
3013		3258
…		…
3035	$self->SUPER::destroy;	3280	$self->SUPER::destroy;
3036	}	3281	}
3037		3282
3038	#############################################################################	3283	#############################################################################
3039		3284
3040	package CFClient::UI::Buttonbar;	3285	package CFPlus::UI::Buttonbar;
3041		3286
3042	our @ISA = CFClient::UI::HBox::;	3287	our @ISA = CFPlus::UI::HBox::;
3043		3288
3044	# TODO: should actualyl wrap buttons and other goodies.	3289	# TODO: should actualyl wrap buttons and other goodies.
3045		3290
3046	#############################################################################	3291	#############################################################################
3047		3292
3048	package CFClient::UI::Menu;	3293	package CFPlus::UI::Menu;
3049		3294
3050	our @ISA = CFClient::UI::FancyFrame::;	3295	our @ISA = CFPlus::UI::Toplevel::;
3051		3296
3052	use CFClient::OpenGL;	3297	use CFPlus::OpenGL;
3053		3298
3054	sub new {	3299	sub new {
3055	my $class = shift;	3300	my $class = shift;
3056		3301
3057	my $self = $class->SUPER::new (	3302	my $self = $class->SUPER::new (
3058	items => [],	3303	items => [],
3059	z => 100,	3304	z => 100,
3060	@_,	3305	@_,
3061	);	3306	);
3062		3307
3063	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3308	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064		3309
3065	for my $item (@{ $self->{items} }) {	3310	for my $item (@{ $self->{items} }) {
3066	my ($widget, $cb, $tooltip) = @$item;	3311	my ($widget, $cb, $tooltip) = @$item;
3067		3312
3068	# handle various types of items, only text for now	3313	# handle various types of items, only text for now
3069	if (!ref $widget) {	3314	if (!ref $widget) {
3070	if ($widget =~ /\t/) {	3315	if ($widget =~ /\t/) {
3071	my ($left, $right) = split /\t/, $widget, 2;	3316	my ($left, $right) = split /\t/, $widget, 2;
3072		3317
3073	$widget = new CFClient::UI::HBox	3318	$widget = new CFPlus::UI::HBox
3074	can_hover => 1,	3319	can_hover => 1,
3075	can_events => 1,	3320	can_events => 1,
3076	tooltip => $tooltip,	3321	tooltip => $tooltip,
3077	children => [	3322	children => [
3078	(new CFClient::UI::Label markup => $left, expand => 1),	3323	(new CFPlus::UI::Label markup => $left, expand => 1),
3079	(new CFClient::UI::Label markup => $right, align => +1),	3324	(new CFPlus::UI::Label markup => $right, align => +1),
3080	],	3325	],
3081	;	3326	;
3082		3327
3083	} else {	3328	} else {
3084	$widget = new CFClient::UI::Label	3329	$widget = new CFPlus::UI::Label
3085	can_hover => 1,	3330	can_hover => 1,
3086	can_events => 1,	3331	can_events => 1,
3087	markup => $widget,	3332	markup => $widget,
3088	tooltip => $tooltip;	3333	tooltip => $tooltip;
3089	}	3334	}
…		…
3137	1	3382	1
3138	}	3383	}
3139		3384
3140	#############################################################################	3385	#############################################################################
3141		3386
3142	package CFClient::UI::Multiplexer;	3387	package CFPlus::UI::Multiplexer;
3143		3388
3144	our @ISA = CFClient::UI::Container::;	3389	our @ISA = CFPlus::UI::Container::;
3145		3390
3146	sub new {	3391	sub new {
3147	my $class = shift;	3392	my $class = shift;
3148		3393
3149	my $self = $class->SUPER::new (	3394	my $self = $class->SUPER::new (
…		…
3210	$self->{current}->draw;	3455	$self->{current}->draw;
3211	}	3456	}
3212		3457
3213	#############################################################################	3458	#############################################################################
3214		3459
3215	package CFClient::UI::Notebook;	3460	package CFPlus::UI::Notebook;
3216		3461
3217	our @ISA = CFClient::UI::VBox::;	3462	our @ISA = CFPlus::UI::VBox::;
3218		3463
3219	sub new {	3464	sub new {
3220	my $class = shift;	3465	my $class = shift;
3221		3466
3222	my $self = $class->SUPER::new (	3467	my $self = $class->SUPER::new (
3223	buttonbar => (new CFClient::UI::Buttonbar),	3468	buttonbar => (new CFPlus::UI::Buttonbar),
3224	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3469	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3225	# filter => # will be put between multiplexer and $self	3470	# filter => # will be put between multiplexer and $self
3226	@_,	3471	@_,
3227	);	3472	);
3228		3473
3229	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3474	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3235	sub add {	3480	sub add {
3236	my ($self, $title, $widget, $tooltip) = @_;	3481	my ($self, $title, $widget, $tooltip) = @_;
3237		3482
3238	Scalar::Util::weaken $self;	3483	Scalar::Util::weaken $self;
3239		3484
3240	$self->{buttonbar}->add (new CFClient::UI::Button	3485	$self->{buttonbar}->add (new CFPlus::UI::Button
3241	markup => $title,	3486	markup => $title,
3242	tooltip => $tooltip,	3487	tooltip => $tooltip,
3243	on_activate => sub { $self->set_current_page ($widget) },	3488	on_activate => sub { $self->set_current_page ($widget) },
3244	);	3489	);
3245		3490
…		…
3259	$self->emit (page_changed => $self->{multiplexer}{current});	3504	$self->emit (page_changed => $self->{multiplexer}{current});
3260	}	3505	}
3261		3506
3262	#############################################################################	3507	#############################################################################
3263		3508
3264	package CFClient::UI::Combobox;	3509	package CFPlus::UI::Selector;
3265		3510
3266	use utf8;	3511	use utf8;
3267		3512
3268	our @ISA = CFClient::UI::Button::;	3513	our @ISA = CFPlus::UI::Button::;
3269		3514
3270	sub new {	3515	sub new {
3271	my $class = shift;	3516	my $class = shift;
3272		3517
3273	my $self = $class->SUPER::new (	3518	my $self = $class->SUPER::new (
…		…
3290	my ($value, $title, $tooltip) = @$_;	3535	my ($value, $title, $tooltip) = @$_;
3291		3536
3292	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3537	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3293	}	3538	}
3294		3539
3295	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3540	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3296	}	3541	}
3297		3542
3298	sub _set_value {	3543	sub _set_value {
3299	my ($self, $value) = @_;	3544	my ($self, $value) = @_;
3300		3545
…		…
3315	$self->emit (changed => $value);	3560	$self->emit (changed => $value);
3316	}	3561	}
3317		3562
3318	#############################################################################	3563	#############################################################################
3319		3564
3320	package CFClient::UI::Statusbox;	3565	package CFPlus::UI::Statusbox;
3321		3566
3322	our @ISA = CFClient::UI::VBox::;	3567	our @ISA = CFPlus::UI::VBox::;
3323		3568
3324	sub new {	3569	sub new {
3325	my $class = shift;	3570	my $class = shift;
3326		3571
3327	my $self = $class->SUPER::new (	3572	my $self = $class->SUPER::new (
…		…
3339	sub reorder {	3584	sub reorder {
3340	my ($self) = @_;	3585	my ($self) = @_;
3341	my $NOW = Time::HiRes::time;	3586	my $NOW = Time::HiRes::time;
3342		3587
3343	# freeze display when hovering over any label	3588	# freeze display when hovering over any label
3344	return if $CFClient::UI::TOOLTIP->{owner}	3589	return if $CFPlus::UI::TOOLTIP->{owner}
3345	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3590	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3346	values %{ $self->{item} };	3591	values %{ $self->{item} };
3347		3592
3348	while (my ($k, $v) = each %{ $self->{item} }) {	3593	while (my ($k, $v) = each %{ $self->{item} }) {
3349	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3594	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3350	}	3595	}
…		…
3371	for ($short) {	3616	for ($short) {
3372	s/^\s+//;	3617	s/^\s+//;
3373	s/\s+/ /g;	3618	s/\s+/ /g;
3374	}	3619	}
3375		3620
3376	new CFClient::UI::Label	3621	new CFPlus::UI::Label
3377	markup => $short,	3622	markup => $short,
3378	tooltip => $item->{tooltip},	3623	tooltip => $item->{tooltip},
3379	tooltip_font => $::FONT_PROP,	3624	tooltip_font => $::FONT_PROP,
3380	tooltip_width => 0.67,	3625	tooltip_width => 0.67,
3381	fontsize => $item->{fontsize} || $self->{fontsize},	3626	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3460	$self->SUPER::destroy;	3705	$self->SUPER::destroy;
3461	}	3706	}
3462		3707
3463	#############################################################################	3708	#############################################################################
3464		3709
3465	package CFClient::UI::Inventory;	3710	package CFPlus::UI::Inventory;
3466		3711
3467	our @ISA = CFClient::UI::Table::;	3712	our @ISA = CFPlus::UI::Table::;
3468		3713
3469	sub new {	3714	sub new {
3470	my $class = shift;	3715	my $class = shift;
3471		3716
3472	my $self = $class->SUPER::new (	3717	my $self = $class->SUPER::new (
3473	col_expand => [0, 1, 0],	3718	col_expand => [0, 1, 0],
		3719	items => [],
3474	@_,	3720	@_,
3475	);	3721	);
3476		3722
		3723	$self->set_sort_order (undef);
		3724
3477	$self	3725	$self
		3726	}
		3727
		3728	sub update_items {
		3729	my ($self) = @_;
		3730
		3731	$self->clear;
		3732
		3733	my @item = $self->{sort}->(@{ $self->{items} });
		3734
		3735	my @adds;
		3736	my $row = 0;
		3737	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3738	CFPlus::Item::update_widgets $item;
		3739
		3740	push @adds, 0, $row, $item->{face_widget};
		3741	push @adds, 1, $row, $item->{desc_widget};
		3742	push @adds, 2, $row, $item->{weight_widget};
		3743
		3744	$row++;
		3745	}
		3746
		3747	$self->add (@adds);
		3748	}
		3749
		3750	sub set_sort_order {
		3751	my ($self, $order) = @_;
		3752
		3753	$self->{sort} = $order ||= sub {
		3754	sort {
		3755	$a->{type} <=> $b->{type}
		3756	or $a->{name} cmp $b->{name}
		3757	} @_
		3758	};
		3759
		3760	$self->update_items;
3478	}	3761	}
3479		3762
3480	sub set_items {	3763	sub set_items {
3481	my ($self, $items) = @_;	3764	my ($self, $items) = @_;
3482		3765
3483	$self->clear;	3766	$self->{items} = [$items ? values %$items : ()];
3484	return unless $items;	3767	$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	}	3768	}
3504		3769
3505	#############################################################################	3770	#############################################################################
3506		3771
3507	package CFClient::UI::SpellList;	3772	package CFPlus::UI::SpellList;
3508		3773
3509	our @ISA = CFClient::UI::Table::;	3774	our @ISA = CFPlus::UI::Table::;
3510		3775
3511	sub new {	3776	sub new {
3512	my $class = shift;	3777	my $class = shift;
3513		3778
3514	my $self = $class->SUPER::new (	3779	my $self = $class->SUPER::new (
…		…
3532	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3797	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3533		3798
3534	sub rebuild_spell_list {	3799	sub rebuild_spell_list {
3535	my ($self) = @_;	3800	my ($self) = @_;
3536		3801
3537	$CFClient::UI::ROOT->on_refresh ($self => sub {	3802	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3538	$self->clear;	3803	$self->clear;
3539		3804
3540	return unless $::CONN;	3805	return unless $::CONN;
3541		3806
3542	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3807	$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);	3808	$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);	3809	$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);	3810	$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);	3811	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3547		3812
3548	my $row = 0;	3813	my $row = 0;
3549		3814
3550	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3815	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3551	my $spell = $self->{spell}{$_};	3816	my $spell = $self->{spell}{$_};
…		…
3558	if ($ev->{button} == 1) {	3823	if ($ev->{button} == 1) {
3559	$::CONN->user_send ("cast $spell->{name}");	3824	$::CONN->user_send ("cast $spell->{name}");
3560	} elsif ($ev->{button} == 2) {	3825	} elsif ($ev->{button} == 2) {
3561	$::CONN->user_send ("invoke $spell->{name}");	3826	$::CONN->user_send ("invoke $spell->{name}");
3562	} elsif ($ev->{button} == 3) {	3827	} elsif ($ev->{button} == 3) {
3563	(new CFClient::UI::Menu	3828	(new CFPlus::UI::Menu
3564	items => [	3829	items => [
3565	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3830	["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}"]) }],	3831	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3567	],	3832	],
3568	)->popup ($ev);	3833	)->popup ($ev);
…		…
3571	}	3836	}
3572		3837
3573	1	3838	1
3574	};	3839	};
3575		3840
3576	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3841	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3577		3842
3578	#TODO: add path info to tooltip	3843	#TODO: add path info to tooltip
3579	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3844	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3580		3845
3581	$self->add (0, $row, new CFClient::UI::Face	3846	$self->add (0, $row, new CFPlus::UI::Face
3582	face => $spell->{face},	3847	face => $spell->{face},
3583	can_hover => 1,	3848	can_hover => 1,
3584	can_events => 1,	3849	can_events => 1,
3585	tooltip => $tooltip,	3850	tooltip => $tooltip,
3586	on_button_down => $spell_cb,	3851	on_button_down => $spell_cb,
3587	);	3852	);
3588		3853
3589	$self->add (1, $row, new CFClient::UI::Label	3854	$self->add (1, $row, new CFPlus::UI::Label
3590	expand => 1,	3855	expand => 1,
3591	text => $spell->{name},	3856	text => $spell->{name},
3592	can_hover => 1,	3857	can_hover => 1,
3593	can_events => 1,	3858	can_events => 1,
3594	tooltip => $tooltip,	3859	tooltip => $tooltip,
3595	on_button_down => $spell_cb,	3860	on_button_down => $spell_cb,
3596	);	3861	);
3597		3862
3598	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3863	$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);	3864	$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);	3865	$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);	3866	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3602	}	3867	}
3603	});	3868	});
3604	}	3869	}
3605		3870
3606	sub add_spell {	3871	sub add_spell {
…		…
3624	$self->rebuild_spell_list;	3889	$self->rebuild_spell_list;
3625	}	3890	}
3626		3891
3627	#############################################################################	3892	#############################################################################
3628		3893
3629	package CFClient::UI::Root;	3894	package CFPlus::UI::Root;
3630		3895
3631	our @ISA = CFClient::UI::Container::;	3896	our @ISA = CFPlus::UI::Container::;
3632		3897
3633	use List::Util qw(min max);	3898	use List::Util qw(min max);
3634		3899
3635	use CFClient::OpenGL;	3900	use CFPlus::OpenGL;
3636		3901
3637	sub new {	3902	sub new {
3638	my $class = shift;	3903	my $class = shift;
3639		3904
3640	my $self = $class->SUPER::new (	3905	my $self = $class->SUPER::new (
…		…
3819	$h = 0 if $h < 0;	4084	$h = 0 if $h < 0;
3820		4085
3821	$w = max $widget->{min_w}, $w;	4086	$w = max $widget->{min_w}, $w;
3822	$h = max $widget->{min_h}, $h;	4087	$h = max $widget->{min_h}, $h;
3823		4088
		4089	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4090	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4091
3824	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4092	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3825	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4093	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3826		4094
3827	$w = int $w + 0.5;	4095	$w = int $w + 0.5;
3828	$h = int $h + 0.5;	4096	$h = int $h + 0.5;
…		…
3854	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4122	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3855	glMatrixMode GL_MODELVIEW;	4123	glMatrixMode GL_MODELVIEW;
3856	glLoadIdentity;	4124	glLoadIdentity;
3857		4125
3858	{	4126	{
3859	package CFClient::UI::Base;	4127	package CFPlus::UI::Base;
3860		4128
3861	($draw_x, $draw_y, $draw_w, $draw_h) =	4129	($draw_x, $draw_y, $draw_w, $draw_h) =
3862	(0, 0, $self->{w}, $self->{h});	4130	(0, 0, $self->{w}, $self->{h});
3863	}	4131	}
3864		4132
3865	$self->_draw;	4133	$self->_draw;
3866	}	4134	}
3867		4135
3868	#############################################################################	4136	#############################################################################
3869		4137
3870	package CFClient::UI;	4138	package CFPlus::UI;
3871		4139
3872	$ROOT = new CFClient::UI::Root;	4140	$ROOT = new CFPlus::UI::Root;
3873	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4141	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3874		4142
3875	1	4143	1
3876		4144

Diff Legend

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