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

Diff Legend

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