ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 2006 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8	use Event;	8	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
…		…
79	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	82	if $FOCUS;
82	}	83	}
83		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
84	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	99	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
87		101
88	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
90		106
91	$GRAB = $widget;	107	$GRAB = $widget;
92	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
93		109
94	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
95	}	111	}
96		112
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
98		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
100	if $GRAB;	116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
		122	}
101	}	123	}
102		124
103	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	126	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		127
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		129
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		131
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
112	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		134
114	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	137	$grab->update if $grab;
117	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
118		139
		140	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	141	$TOOLTIP_WATCHER->cb->();
120	}	142	}
121	}	143	}
122		144
123	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
124	my ($ev) = @_;	146	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
126		148
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		150
129	if ($widget != $HOVER) {	151	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		152
132	$hover->update if $hover && $hover->{can_hover};	153	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	154	if $HOVER;
140	}	155	}
141		156
142	# convert position array to integers	157	# convert position array to integers
143	sub harmonize {	158	sub harmonize {
…		…
193	reconfigure_widgets;	208	reconfigure_widgets;
194	}	209	}
195		210
196	#############################################################################	211	#############################################################################
197		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
198	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
199		222
200	use strict;	223	use strict;
201		224
202	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
203		226
204	sub new {	227	sub new {
205	my $class = shift;	228	my $class = shift;
206		229
207	my $self = bless {	230	my $self = bless {
…		…
212	h => undef,	235	h => undef,
213	can_events => 1,	236	can_events => 1,
214	@_	237	@_
215	}, $class;	238	}, $class;
216		239
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		241
219	for (keys %$self) {	242	for (keys %$self) {
220	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
222	}	245	}
223	}	246	}
224		247
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		253
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		256
234	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
247	sub show {	270	sub show {
248	my ($self) = @_;	271	my ($self) = @_;
249		272
250	return if $self->{parent};	273	return if $self->{parent};
251		274
252	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
253	}	276	}
254		277
255	sub set_visible {	278	sub set_visible {
256	my ($self) = @_;	279	my ($self) = @_;
257		280
…		…
278	delete $self->{root};	301	delete $self->{root};
279		302
280	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
282		305
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
285		308
286	$self->emit ("focus_out");	309	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
288	}	311	}
…		…
345	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
346		369
347	if ($self->{aspect}) {	370	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
349		372
350	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		375
353	# use alignment to adjust x, y	376	# use alignment to adjust x, y
354		377
355	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
397		420
398	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
399		422
400	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
401		424
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	428	}
406	}	429	}
407		430
408	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
409	sub coord2local {	432	sub coord2local {
410	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
411		434
		435	Carp::confess unless $self->{parent};#d#
		436
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	438	}
414		439
415	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
416	sub coord2global {	441	sub coord2global {
417	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
		443
		444	Carp::confess unless $self->{parent};#d#
418		445
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	447	}
421		448
422	sub invoke_focus_in {	449	sub invoke_focus_in {
…		…
456		483
457	sub invoke_mouse_motion { 0 }	484	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 0 }	485	sub invoke_button_up { 0 }
459	sub invoke_key_down { 0 }	486	sub invoke_key_down { 0 }
460	sub invoke_key_up { 0 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
461		489
462	sub invoke_button_down {	490	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
464		492
465	$self->grab_focus;	493	$self->grab_focus;
…		…
469		497
470	sub connect {	498	sub connect {
471	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
472		500
473	push @{ $self->{signal_cb}{$signal} }, $cb;	501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
474	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
475		515
476	sub emit {	516	sub emit {
477	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
478		518
		519	# I do not really like this solution, but I do not like duplication
		520	# and needlessly verbose code, either.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
479	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480		527
		528	if ($self->{tooltip} =~ /Apply.*audio/) {
		529	warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
		530	warn "3 $self->{parent}\n";#d#
		531	}
		532
481	#d##TODO# stop propagating at first true, do not use sum	533	#d##TODO# stop propagating at first true, do not use sum
		534	my $res =
482	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	535	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
483	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	536	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
484	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	537	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
		538	;
		539	if ($self->{tooltip} =~ /Apply.*audio/) {
		540	warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
		541	warn "5 $self->{parent}\n";#d#
		542	}
		543
		544	$res
485	}	545	}
486		546
487	sub find_widget {	547	sub find_widget {
488	my ($self, $x, $y) = @_;	548	my ($self, $x, $y) = @_;
489		549
…		…
573	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
576	glEnd;	636	glEnd;
577	glPopMatrix;	637	glPopMatrix;
578	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579	}	639	}
580		640
581	$self->_draw;	641	$self->_draw;
582	glPopMatrix;	642	glPopMatrix;
583	}	643	}
…		…
589	}	649	}
590		650
591	sub DESTROY {	651	sub DESTROY {
592	my ($self) = @_;	652	my ($self) = @_;
593		653
594	return if CFClient::in_destruct;	654	return if CFPlus::in_destruct;
595		655
596	delete $WIDGET{$self+0};	656	delete $WIDGET{$self+0};
597		657
598	eval { $self->destroy };	658	eval { $self->destroy };
599	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
600	}	660	}
601		661
602	#############################################################################	662	#############################################################################
603		663
604	package CFClient::UI::DrawBG;	664	package CFPlus::UI::DrawBG;
605		665
606	our @ISA = CFClient::UI::Base::;	666	our @ISA = CFPlus::UI::Base::;
607		667
608	use strict;	668	use strict;
609	use CFClient::OpenGL;	669	use CFPlus::OpenGL;
610		670
611	sub new {	671	sub new {
612	my $class = shift;	672	my $class = shift;
613		673
614	# range [value, low, high, page]	674	# range [value, low, high, page]
…		…
645	}	705	}
646	}	706	}
647		707
648	#############################################################################	708	#############################################################################
649		709
650	package CFClient::UI::Empty;	710	package CFPlus::UI::Empty;
651		711
652	our @ISA = CFClient::UI::Base::;	712	our @ISA = CFPlus::UI::Base::;
653		713
654	sub new {	714	sub new {
655	my ($class, %arg) = @_;	715	my ($class, %arg) = @_;
656	$class->SUPER::new (can_events => 0, %arg);	716	$class->SUPER::new (can_events => 0, %arg);
657	}	717	}
…		…
664		724
665	sub draw { }	725	sub draw { }
666		726
667	#############################################################################	727	#############################################################################
668		728
669	package CFClient::UI::Container;	729	package CFPlus::UI::Container;
670		730
671	our @ISA = CFClient::UI::Base::;	731	our @ISA = CFPlus::UI::Base::;
672		732
673	sub new {	733	sub new {
674	my ($class, %arg) = @_;	734	my ($class, %arg) = @_;
675		735
676	my $children = delete $arg{children};	736	my $children = delete $arg{children};
…		…
685	if $children;	745	if $children;
686		746
687	$self	747	$self
688	}	748	}
689		749
		750	sub realloc {
		751	my ($self) = @_;
		752
		753	$self->{force_realloc} = 1;
		754	$self->{force_size_alloc} = 1;
		755	$self->SUPER::realloc;
		756	}
		757
690	sub add {	758	sub add {
691	my ($self, @widgets) = @_;	759	my ($self, @widgets) = @_;
692		760
693	$_->set_parent ($self)	761	$_->set_parent ($self)
694	for @widgets;	762	for @widgets;
…		…
754	$_->draw for @{$self->{children}};	822	$_->draw for @{$self->{children}};
755	}	823	}
756		824
757	#############################################################################	825	#############################################################################
758		826
759	package CFClient::UI::Bin;	827	package CFPlus::UI::Bin;
760		828
761	our @ISA = CFClient::UI::Container::;	829	our @ISA = CFPlus::UI::Container::;
762		830
763	sub new {	831	sub new {
764	my ($class, %arg) = @_;	832	my ($class, %arg) = @_;
765		833
766	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	834	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
767		835
768	$class->SUPER::new (children => [$child], %arg)	836	$class->SUPER::new (children => [$child], %arg)
769	}	837	}
770		838
771	sub add {	839	sub add {
…		…
778	sub remove {	846	sub remove {
779	my ($self, $widget) = @_;	847	my ($self, $widget) = @_;
780		848
781	$self->SUPER::remove ($widget);	849	$self->SUPER::remove ($widget);
782		850
783	$self->{children} = [new CFClient::UI::Empty]	851	$self->{children} = [new CFPlus::UI::Empty]
784	unless @{$self->{children}};	852	unless @{$self->{children}};
785	}	853	}
786		854
787	sub child { $_[0]->{children}[0] }	855	sub child { $_[0]->{children}[0] }
788		856
…		…
800		868
801	#############################################################################	869	#############################################################################
802		870
803	# back-buffered drawing area	871	# back-buffered drawing area
804		872
805	package CFClient::UI::Window;	873	package CFPlus::UI::Window;
806		874
807	our @ISA = CFClient::UI::Bin::;	875	our @ISA = CFPlus::UI::Bin::;
808		876
809	use CFClient::OpenGL;	877	use CFPlus::OpenGL;
810		878
811	sub new {	879	sub new {
812	my ($class, %arg) = @_;	880	my ($class, %arg) = @_;
813		881
814	my $self = $class->SUPER::new (%arg);	882	my $self = $class->SUPER::new (%arg);
…		…
836	}	904	}
837		905
838	sub render_child {	906	sub render_child {
839	my ($self) = @_;	907	my ($self) = @_;
840		908
841	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	909	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
842	glClearColor 0, 0, 0, 0;	910	glClearColor 0, 0, 0, 0;
843	glClear GL_COLOR_BUFFER_BIT;	911	glClear GL_COLOR_BUFFER_BIT;
844		912
845	{	913	{
846	package CFClient::UI::Base;	914	package CFPlus::UI::Base;
847		915
848	($draw_x, $draw_y, $draw_w, $draw_h) =	916	local ($draw_x, $draw_y, $draw_w, $draw_h) =
849	(0, 0, $self->{w}, $self->{h});	917	(0, 0, $self->{w}, $self->{h});
		918
		919	$self->_render;
850	}	920	}
851
852	$self->_render;
853	};	921	};
854	}	922	}
855		923
856	sub _draw {	924	sub _draw {
857	my ($self) = @_;	925	my ($self) = @_;
858
859	my ($w, $h) = @$self{qw(w h)};
860		926
861	my $tex = $self->{texture}	927	my $tex = $self->{texture}
862	or return;	928	or return;
863		929
864	glEnable GL_TEXTURE_2D;	930	glEnable GL_TEXTURE_2D;
865	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	931	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
866	glColor 0, 0, 0, 1;	932	glColor 0, 0, 0, 1;
867		933
868	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	934	$tex->draw_quad_alpha_premultiplied (0, 0);
869		935
870	glDisable GL_TEXTURE_2D;	936	glDisable GL_TEXTURE_2D;
871	}	937	}
872		938
873	#############################################################################	939	#############################################################################
874		940
875	package CFClient::UI::ViewPort;	941	package CFPlus::UI::ViewPort;
876		942
877	our @ISA = CFClient::UI::Window::;	943	our @ISA = CFPlus::UI::Window::;
878		944
879	sub new {	945	sub new {
880	my $class = shift;	946	my $class = shift;
881		947
882	$class->SUPER::new (	948	$class->SUPER::new (
…		…
942	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1008	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
943	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1009	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
944	) {	1010	) {
945	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1011	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
946	} else {	1012	} else {
947	$self->CFClient::UI::Base::find_widget ($x, $y)	1013	$self->CFPlus::UI::Base::find_widget ($x, $y)
948	}	1014	}
949	}	1015	}
950		1016
951	sub _render {	1017	sub _render {
952	my ($self) = @_;	1018	my ($self) = @_;
953		1019
954	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1020	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
955	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1021	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
956		1022
957	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1023	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
958		1024
959	$self->SUPER::_render;	1025	$self->SUPER::_render;
960	}	1026	}
961		1027
962	#############################################################################	1028	#############################################################################
963		1029
964	package CFClient::UI::ScrolledWindow;	1030	package CFPlus::UI::ScrolledWindow;
965		1031
966	our @ISA = CFClient::UI::HBox::;	1032	our @ISA = CFPlus::UI::HBox::;
967		1033
968	sub new {	1034	sub new {
969	my ($class, %arg) = @_;	1035	my ($class, %arg) = @_;
970		1036
971	my $child = delete $arg{child};	1037	my $child = delete $arg{child};
972		1038
973	my $self;	1039	my $self;
974		1040
975	my $slider = new CFClient::UI::Slider	1041	my $slider = new CFPlus::UI::Slider
976	vertical => 1,	1042	vertical => 1,
977	range => [0, 0, 1, 0.01], # HACK fix	1043	range => [0, 0, 1, 0.01], # HACK fix
978	on_changed => sub {	1044	on_changed => sub {
979	$self->{vp}->set_offset (0, $_[1]);	1045	$self->{vp}->set_offset (0, $_[1]);
980	},	1046	},
981	;	1047	;
982		1048
983	$self = $class->SUPER::new (	1049	$self = $class->SUPER::new (
984	vp => (new CFClient::UI::ViewPort expand => 1),	1050	vp => (new CFPlus::UI::ViewPort expand => 1),
		1051	can_events => 1,
985	slider => $slider,	1052	slider => $slider,
986	%arg,	1053	%arg,
987	);	1054	);
988		1055
989	$self->SUPER::add ($self->{vp}, $self->{slider});	1056	$self->SUPER::add ($self->{vp}, $self->{slider});
990	$self->add ($child) if $child;	1057	$self->add ($child) if $child;
…		…
998	my ($self, $widget) = @_;	1065	my ($self, $widget) = @_;
999		1066
1000	$self->{vp}->add ($self->{child} = $widget);	1067	$self->{vp}->add ($self->{child} = $widget);
1001	}	1068	}
1002		1069
1003	sub invoke_button_up {	1070	sub invoke_mouse_wheel {
1004	my ($self, $ev) = @_;	1071	my ($self, $ev) = @_;
1005		1072
1006	warn "button up $ev->{button}\n";#d#	1073	return 0 unless $ev->{dy}; # only vertical movements
		1074
		1075	$self->{slider}->emit (mouse_wheel => $ev);
		1076
1007		1077	1
1008	0
1009	}	1078	}
1010		1079
1011	sub update_slider {	1080	sub update_slider {
1012	my ($self) = @_;	1081	my ($self) = @_;
1013		1082
…		…
1030	$self->SUPER::invoke_size_allocate ($w, $h)	1099	$self->SUPER::invoke_size_allocate ($w, $h)
1031	}	1100	}
1032		1101
1033	#############################################################################	1102	#############################################################################
1034		1103
1035	package CFClient::UI::Frame;	1104	package CFPlus::UI::Frame;
1036		1105
1037	our @ISA = CFClient::UI::Bin::;	1106	our @ISA = CFPlus::UI::Bin::;
1038		1107
1039	use CFClient::OpenGL;	1108	use CFPlus::OpenGL;
1040		1109
1041	sub new {	1110	sub new {
1042	my $class = shift;	1111	my $class = shift;
1043		1112
1044	$class->SUPER::new (	1113	$class->SUPER::new (
…		…
1070	$self->SUPER::_draw;	1139	$self->SUPER::_draw;
1071	}	1140	}
1072		1141
1073	#############################################################################	1142	#############################################################################
1074		1143
1075	package CFClient::UI::FancyFrame;	1144	package CFPlus::UI::FancyFrame;
1076		1145
1077	our @ISA = CFClient::UI::Bin::;	1146	our @ISA = CFPlus::UI::Bin::;
1078		1147
1079	use CFClient::OpenGL;	1148	use CFPlus::OpenGL;
		1149
		1150	sub new {
		1151	my ($class, %arg) = @_;
		1152
		1153	if ((exists $arg{label}) && !ref $arg{label}) {
		1154	$arg{label} = new CFPlus::UI::Label
		1155	align => 1,
		1156	valign => 0,
		1157	text => $arg{label},
		1158	fontsize => ($arg{border} || 0.8) * 0.75;
		1159	}
		1160
		1161	my $self = $class->SUPER::new (
		1162	# label => "",
		1163	fg => [0.6, 0.3, 0.1],
		1164	border => 0.8,
		1165	style => 'single',
		1166	%arg,
		1167	);
		1168
		1169	$self
		1170	}
		1171
		1172	sub add {
		1173	my ($self, @widgets) = @_;
		1174
		1175	$self->SUPER::add (@widgets);
		1176	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1177	}
		1178
		1179	sub border {
		1180	int $_[0]{border} * $::FONTSIZE
		1181	}
		1182
		1183	sub size_request {
		1184	my ($self) = @_;
		1185
		1186	($self->{label_w}, undef) = $self->{label}->size_request
		1187	if $self->{label};
		1188
		1189	my ($w, $h) = $self->SUPER::size_request;
		1190
		1191	(
		1192	$w + $self->border * 2,
		1193	$h + $self->border * 2,
		1194	)
		1195	}
		1196
		1197	sub invoke_size_allocate {
		1198	my ($self, $w, $h) = @_;
		1199
		1200	my $border = $self->border;
		1201
		1202	$w -= List::Util::max 0, $border * 2;
		1203	$h -= List::Util::max 0, $border * 2;
		1204
		1205	if (my $label = $self->{label}) {
		1206	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1207	$label->{h} = List::Util::min $h, $border;
		1208	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1209	}
		1210
		1211	$self->child->configure ($border, $border, $w, $h);
		1212
		1213	1
		1214	}
		1215
		1216	sub _draw {
		1217	my ($self) = @_;
		1218
		1219	my $child = $self->{children}[0];
		1220
		1221	my $border = $self->border;
		1222	my ($w, $h) = ($self->{w}, $self->{h});
		1223
		1224	$child->draw;
		1225
		1226	glColor @{$self->{fg}};
		1227	glBegin GL_LINE_STRIP;
		1228	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1229	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1230	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1231	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1232	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1233	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1234	glEnd;
		1235
		1236	if ($self->{label}) {
		1237	glTranslate $border * 2, 0;
		1238	$self->{label}->_draw;
		1239	}
		1240	}
		1241
		1242	#############################################################################
		1243
		1244	package CFPlus::UI::Toplevel;
		1245
		1246	our @ISA = CFPlus::UI::Bin::;
		1247
		1248	use CFPlus::OpenGL;
1080		1249
1081	my $bg =	1250	my $bg =
1082	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1251	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1083	mipmap => 1, wrap => 1;	1252	mipmap => 1, wrap => 1;
1084		1253
1085	my @border =	1254	my @border =
1086	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1255	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1087	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1256	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1088		1257
1089	sub new {	1258	sub new {
1090	my ($class, %arg) = @_;	1259	my ($class, %arg) = @_;
1091		1260
…		…
1097	min_w => 64,	1266	min_w => 64,
1098	min_h => 32,	1267	min_h => 32,
1099	%arg,	1268	%arg,
1100	);	1269	);
1101		1270
1102	$self->{title_widget} = new CFClient::UI::Label	1271	$self->{title_widget} = new CFPlus::UI::Label
1103	align => 0,	1272	align => 0,
1104	valign => 1,	1273	valign => 1,
1105	text => $self->{title},	1274	text => $self->{title},
1106	fontsize => $self->{border},	1275	fontsize => $self->{border},
1107	if exists $self->{title};	1276	if exists $self->{title};
1108		1277
1109	if ($self->{has_close_button}) {	1278	if ($self->{has_close_button}) {
1110	$self->{close_button} =	1279	$self->{close_button} =
1111	new CFClient::UI::ImageButton	1280	new CFPlus::UI::ImageButton
1112	path => 'x1_close.png',	1281	path => 'x1_close.png',
1113	on_activate => sub { $self->emit ("delete") };	1282	on_activate => sub { $self->emit ("delete") };
1114		1283
1115	$self->CFClient::UI::Container::add ($self->{close_button});	1284	$self->CFPlus::UI::Container::add ($self->{close_button});
1116	}	1285	}
1117		1286
1118	$self	1287	$self
1119	}	1288	}
1120		1289
1121	sub add {	1290	sub add {
1122	my ($self, @widgets) = @_;	1291	my ($self, @widgets) = @_;
1123		1292
1124	$self->SUPER::add (@widgets);	1293	$self->SUPER::add (@widgets);
1125	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1294	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1126	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1295	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1127	}	1296	}
1128		1297
1129	sub border {	1298	sub border {
1130	int $_[0]{border} * $::FONTSIZE	1299	int $_[0]{border} * $::FONTSIZE
1131	}	1300	}
…		…
1239	$self->{motion}->($ev, $x, $y) if $self->{motion};	1408	$self->{motion}->($ev, $x, $y) if $self->{motion};
1240		1409
1241	! ! $self->{motion}	1410	! ! $self->{motion}
1242	}	1411	}
1243		1412
		1413	sub invoke_visibility_change {
		1414	my ($self, $visible) = @_;
		1415
		1416	delete $self->{motion} unless $visible;
		1417
		1418	0
		1419	}
		1420
1244	sub _draw {	1421	sub _draw {
1245	my ($self) = @_;	1422	my ($self) = @_;
1246		1423
1247	my $child = $self->{children}[0];	1424	my $child = $self->{children}[0];
1248		1425
…		…
1285	if $self->{close_button};	1462	if $self->{close_button};
1286	}	1463	}
1287		1464
1288	#############################################################################	1465	#############################################################################
1289		1466
1290	package CFClient::UI::Table;	1467	package CFPlus::UI::Table;
1291		1468
1292	our @ISA = CFClient::UI::Base::;	1469	our @ISA = CFPlus::UI::Base::;
1293		1470
1294	use List::Util qw(max sum);	1471	use List::Util qw(max sum);
1295		1472
1296	use CFClient::OpenGL;	1473	use CFPlus::OpenGL;
1297		1474
1298	sub new {	1475	sub new {
1299	my $class = shift;	1476	my $class = shift;
1300		1477
1301	$class->SUPER::new (	1478	$class->SUPER::new (
…		…
1307	sub children {	1484	sub children {
1308	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1485	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1309	}	1486	}
1310		1487
1311	sub add {	1488	sub add {
1312	my ($self, $x, $y, $child) = @_;	1489	my ($self) = shift;
1313		1490
		1491	while (@_) {
		1492	my ($x, $y, $child) = splice @_, 0, 3, ();
1314	$child->set_parent ($self);	1493	$child->set_parent ($self);
1315	$self->{children}[$y][$x] = $child;	1494	$self->{children}[$y][$x] = $child;
		1495	}
1316		1496
		1497	$self->{force_realloc} = 1;
		1498	$self->{force_size_alloc} = 1;
1317	$self->realloc;	1499	$self->realloc;
1318	}	1500	}
1319		1501
1320	sub remove {	1502	sub remove {
1321	my ($self, $child) = @_;	1503	my ($self, $child) = @_;
…		…
1386		1568
1387	# linearly scale sizes	1569	# linearly scale sizes
1388	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1570	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1389	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1571	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1390		1572
1391	CFClient::UI::harmonize $ws;	1573	CFPlus::UI::harmonize $ws;
1392	CFClient::UI::harmonize $hs;	1574	CFPlus::UI::harmonize $hs;
1393		1575
1394	my $y;	1576	my $y;
1395		1577
1396	for my $r (0 .. $#{$self->{children}}) {	1578	for my $r (0 .. $#{$self->{children}}) {
1397	my $row = $self->{children}[$r]	1579	my $row = $self->{children}[$r]
…		…
1440	}	1622	}
1441	}	1623	}
1442		1624
1443	#############################################################################	1625	#############################################################################
1444		1626
1445	package CFClient::UI::Box;	1627	package CFPlus::UI::Box;
1446		1628
1447	our @ISA = CFClient::UI::Container::;	1629	our @ISA = CFPlus::UI::Container::;
1448		1630
1449	sub size_request {	1631	sub size_request {
1450	my ($self) = @_;	1632	my ($self) = @_;
1451		1633
1452	$self->{vertical}	1634	$self->{vertical}
…		…
1485	$req[$_] += $space * $children[$_]{expand}	1667	$req[$_] += $space * $children[$_]{expand}
1486	for 0 .. $#children;	1668	for 0 .. $#children;
1487	}	1669	}
1488	}	1670	}
1489		1671
1490	CFClient::UI::harmonize \@req;	1672	CFPlus::UI::harmonize \@req;
1491		1673
1492	my $pos = 0;	1674	my $pos = 0;
1493	for (0 .. $#children) {	1675	for (0 .. $#children) {
1494	my $alloc = $req[$_];	1676	my $alloc = $req[$_];
1495	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1677	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1500	1	1682	1
1501	}	1683	}
1502		1684
1503	#############################################################################	1685	#############################################################################
1504		1686
1505	package CFClient::UI::HBox;	1687	package CFPlus::UI::HBox;
1506		1688
1507	our @ISA = CFClient::UI::Box::;	1689	our @ISA = CFPlus::UI::Box::;
1508		1690
1509	sub new {	1691	sub new {
1510	my $class = shift;	1692	my $class = shift;
1511		1693
1512	$class->SUPER::new (	1694	$class->SUPER::new (
…		…
1515	)	1697	)
1516	}	1698	}
1517		1699
1518	#############################################################################	1700	#############################################################################
1519		1701
1520	package CFClient::UI::VBox;	1702	package CFPlus::UI::VBox;
1521		1703
1522	our @ISA = CFClient::UI::Box::;	1704	our @ISA = CFPlus::UI::Box::;
1523		1705
1524	sub new {	1706	sub new {
1525	my $class = shift;	1707	my $class = shift;
1526		1708
1527	$class->SUPER::new (	1709	$class->SUPER::new (
…		…
1530	)	1712	)
1531	}	1713	}
1532		1714
1533	#############################################################################	1715	#############################################################################
1534		1716
1535	package CFClient::UI::Label;	1717	package CFPlus::UI::Label;
1536		1718
1537	our @ISA = CFClient::UI::DrawBG::;	1719	our @ISA = CFPlus::UI::DrawBG::;
1538		1720
1539	use CFClient::OpenGL;	1721	use CFPlus::OpenGL;
1540		1722
1541	sub new {	1723	sub new {
1542	my ($class, %arg) = @_;	1724	my ($class, %arg) = @_;
1543		1725
1544	my $self = $class->SUPER::new (	1726	my $self = $class->SUPER::new (
…		…
1547	#active_bg => none	1729	#active_bg => none
1548	#font => default_font	1730	#font => default_font
1549	#text => initial text	1731	#text => initial text
1550	#markup => initial narkup	1732	#markup => initial narkup
1551	#max_w => maximum pixel width	1733	#max_w => maximum pixel width
		1734	#style => 0, # render flags
1552	ellipsise => 3, # end	1735	ellipsise => 3, # end
1553	layout => (new CFClient::Layout),	1736	layout => (new CFPlus::Layout),
1554	fontsize => 1,	1737	fontsize => 1,
1555	align => -1,	1738	align => -1,
1556	valign => -1,	1739	valign => -1,
1557	padding_x => 2,	1740	padding_x => 2,
1558	padding_y => 2,	1741	padding_y => 2,
1559	can_events => 0,	1742	can_events => 0,
1560	%arg	1743	%arg
1561	);	1744	);
1562		1745
1563	if (exists $self->{template}) {	1746	if (exists $self->{template}) {
1564	my $layout = new CFClient::Layout;	1747	my $layout = new CFPlus::Layout;
1565	$layout->set_text (delete $self->{template});	1748	$layout->set_text (delete $self->{template});
1566	$self->{template} = $layout;	1749	$self->{template} = $layout;
1567	}	1750	}
1568		1751
1569	if (exists $self->{markup}) {	1752	if (exists $self->{markup}) {
…		…
1571	} else {	1754	} else {
1572	$self->set_text (delete $self->{text});	1755	$self->set_text (delete $self->{text});
1573	}	1756	}
1574		1757
1575	$self	1758	$self
1576	}
1577
1578	sub escape($) {
1579	local $_ = $_[0];
1580
1581	s/&/&amp;/g;
1582	s/>/&gt;/g;
1583	s/</&lt;/g;
1584
1585	$_
1586	}	1759	}
1587		1760
1588	sub update {	1761	sub update {
1589	my ($self) = @_;	1762	my ($self) = @_;
1590		1763
…		…
1717	};	1890	};
1718		1891
1719	my $w = List::Util::min $self->{w} + 4, $size->[0];	1892	my $w = List::Util::min $self->{w} + 4, $size->[0];
1720	my $h = List::Util::min $self->{h} + 2, $size->[1];	1893	my $h = List::Util::min $self->{h} + 2, $size->[1];
1721		1894
1722	$self->{layout}->render ($self->{ox}, $self->{oy});	1895	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1723	}	1896	}
1724		1897
1725	#############################################################################	1898	#############################################################################
1726		1899
1727	package CFClient::UI::EntryBase;	1900	package CFPlus::UI::EntryBase;
1728		1901
1729	our @ISA = CFClient::UI::Label::;	1902	our @ISA = CFPlus::UI::Label::;
1730		1903
1731	use CFClient::OpenGL;	1904	use CFPlus::OpenGL;
1732		1905
1733	sub new {	1906	sub new {
1734	my $class = shift;	1907	my $class = shift;
1735		1908
1736	$class->SUPER::new (	1909	$class->SUPER::new (
…		…
1798		1971
1799	if ($uni == 8) {	1972	if ($uni == 8) {
1800	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1801	} elsif ($uni == 127) {	1974	} elsif ($uni == 127) {
1802	substr $text, $self->{cursor}, 1, "";	1975	substr $text, $self->{cursor}, 1, "";
1803	} elsif ($sym == CFClient::SDLK_LEFT) {	1976	} elsif ($sym == CFPlus::SDLK_LEFT) {
1804	--$self->{cursor} if $self->{cursor};	1977	--$self->{cursor} if $self->{cursor};
1805	} elsif ($sym == CFClient::SDLK_RIGHT) {	1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1806	++$self->{cursor} if $self->{cursor} < length $self->{text};	1979	++$self->{cursor} if $self->{cursor} < length $self->{text};
1807	} elsif ($sym == CFClient::SDLK_HOME) {	1980	} elsif ($sym == CFPlus::SDLK_HOME) {
1808	$self->{cursor} = 0;	1981	$self->{cursor} = 0;
1809	} elsif ($sym == CFClient::SDLK_END) {	1982	} elsif ($sym == CFPlus::SDLK_END) {
1810	$self->{cursor} = length $text;	1983	$self->{cursor} = length $text;
		1984	} elsif ($uni == 21) { # ctrl-u
		1985	$text = "";
		1986	$self->{cursor} = 0;
1811	} elsif ($uni == 27) {	1987	} elsif ($uni == 27) {
1812	$self->emit ('escape');	1988	$self->emit ('escape');
1813	} elsif ($uni) {	1989	} elsif ($uni) {
1814	substr $text, $self->{cursor}++, 0, chr $uni;	1990	substr $text, $self->{cursor}++, 0, chr $uni;
1815	} else {	1991	} else {
…		…
1888	utf8::encode $text;	2064	utf8::encode $text;
1889		2065
1890	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2066	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1891	}	2067	}
1892		2068
1893	glColor @{$self->{fg}};
1894	glBegin GL_LINES;	2069	glBegin GL_LINES;
1895	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2070	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1896	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2071	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1897	glEnd;	2072	glEnd;
1898	}	2073	}
1899	}	2074	}
1900		2075
1901	package CFClient::UI::Entry;	2076	package CFPlus::UI::Entry;
1902		2077
1903	our @ISA = CFClient::UI::EntryBase::;	2078	our @ISA = CFPlus::UI::EntryBase::;
1904		2079
1905	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1906		2081
1907	sub invoke_key_down {	2082	sub invoke_key_down {
1908	my ($self, $ev) = @_;	2083	my ($self, $ev) = @_;
1909		2084
1910	my $sym = $ev->{sym};	2085	my $sym = $ev->{sym};
…		…
1916	$self->{history_pointer} = -1;	2091	$self->{history_pointer} = -1;
1917	$self->{history_saveback} = '';	2092	$self->{history_saveback} = '';
1918	$self->emit (activate => $txt);	2093	$self->emit (activate => $txt);
1919	$self->update;	2094	$self->update;
1920		2095
1921	} elsif ($sym == CFClient::SDLK_UP) {	2096	} elsif ($sym == CFPlus::SDLK_UP) {
1922	if ($self->{history_pointer} < 0) {	2097	if ($self->{history_pointer} < 0) {
1923	$self->{history_saveback} = $self->get_text;	2098	$self->{history_saveback} = $self->get_text;
1924	}	2099	}
1925	if (@{$self->{history} || []} > 0) {	2100	if (@{$self->{history} || []} > 0) {
1926	$self->{history_pointer}++;	2101	$self->{history_pointer}++;
…		…
1928	$self->{history_pointer} = @{$self->{history} || []} - 1;	2103	$self->{history_pointer} = @{$self->{history} || []} - 1;
1929	}	2104	}
1930	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2105	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1931	}	2106	}
1932		2107
1933	} elsif ($sym == CFClient::SDLK_DOWN) {	2108	} elsif ($sym == CFPlus::SDLK_DOWN) {
1934	$self->{history_pointer}--;	2109	$self->{history_pointer}--;
1935	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2110	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1936		2111
1937	if ($self->{history_pointer} >= 0) {	2112	if ($self->{history_pointer} >= 0) {
1938	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2113	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1947	1	2122	1
1948	}	2123	}
1949		2124
1950	#############################################################################	2125	#############################################################################
1951		2126
1952	package CFClient::UI::Button;	2127	package CFPlus::UI::Button;
1953		2128
1954	our @ISA = CFClient::UI::Label::;	2129	our @ISA = CFPlus::UI::Label::;
1955		2130
1956	use CFClient::OpenGL;	2131	use CFPlus::OpenGL;
1957		2132
1958	my @tex =	2133	my @tex =
1959	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2134	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1960	qw(b1_button_active.png);	2135	qw(b1_button_active.png);
1961		2136
1962	sub new {	2137	sub new {
1963	my $class = shift;	2138	my $class = shift;
1964		2139
…		…
2001	$self->SUPER::_draw;	2176	$self->SUPER::_draw;
2002	}	2177	}
2003		2178
2004	#############################################################################	2179	#############################################################################
2005		2180
		2181	package CFPlus::UI::CheckBox;
		2182
		2183	our @ISA = CFPlus::UI::DrawBG::;
		2184
		2185	my @tex =
		2186	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2187	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2188
		2189	use CFPlus::OpenGL;
		2190
		2191	sub new {
		2192	my $class = shift;
		2193
		2194	$class->SUPER::new (
		2195	padding_x => 2,
		2196	padding_y => 2,
		2197	fg => [1, 1, 1],
		2198	active_fg => [1, 1, 0],
		2199	bg => [0, 0, 0, 0.2],
		2200	active_bg => [1, 1, 1, 0.5],
		2201	state => 0,
		2202	can_hover => 1,
		2203	@_
		2204	)
		2205	}
		2206
		2207	sub size_request {
		2208	my ($self) = @_;
		2209
		2210	(6) x 2
		2211	}
		2212
		2213	sub toggle {
		2214	my ($self) = @_;
		2215
		2216	$self->{state} = !$self->{state};
		2217	$self->emit (changed => $self->{state});
		2218	$self->update;
		2219	}
		2220
		2221	sub invoke_button_down {
		2222	my ($self, $ev, $x, $y) = @_;
		2223
		2224	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2225	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2226	$self->toggle;
		2227	} else {
		2228	return 0
		2229	}
		2230
		2231	1
		2232	}
		2233
		2234	sub _draw {
		2235	my ($self) = @_;
		2236
		2237	$self->SUPER::_draw;
		2238
		2239	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2240
		2241	my ($w, $h) = @$self{qw(w h)};
		2242
		2243	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2244
		2245	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2246
		2247	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2248
		2249	glEnable GL_TEXTURE_2D;
		2250	$tex->draw_quad_alpha (0, 0, $s, $s);
		2251	glDisable GL_TEXTURE_2D;
		2252	}
		2253
		2254	#############################################################################
		2255
		2256	package CFPlus::UI::Image;
		2257
		2258	our @ISA = CFPlus::UI::Base::;
		2259
		2260	use CFPlus::OpenGL;
		2261
		2262	our %texture_cache;
		2263
		2264	sub new {
		2265	my $class = shift;
		2266
		2267	my $self = $class->SUPER::new (
		2268	can_events => 0,
		2269	@_,
		2270	);
		2271
		2272	$self->{path} || $self->{tex}
		2273	or Carp::croak "'path' or 'tex' attributes required";
		2274
		2275	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2276	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2277
		2278	Scalar::Util::weaken $texture_cache{$self->{path}};
		2279
		2280	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2281
		2282	$self
		2283	}
		2284
		2285	sub STORABLE_freeze {
		2286	my ($self, $cloning) = @_;
		2287
		2288	$self->{path}
		2289	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2290
		2291	$self->{path}
		2292	}
		2293
		2294	sub STORABLE_attach {
		2295	my ($self, $cloning, $path) = @_;
		2296
		2297	$self->new (path => $path)
		2298	}
		2299
		2300	sub size_request {
		2301	my ($self) = @_;
		2302
		2303	($self->{tex}{w}, $self->{tex}{h})
		2304	}
		2305
		2306	sub _draw {
		2307	my ($self) = @_;
		2308
		2309	my $tex = $self->{tex};
		2310
		2311	my ($w, $h) = ($self->{w}, $self->{h});
		2312
		2313	if ($self->{rot90}) {
		2314	glRotate 90, 0, 0, 1;
		2315	glTranslate 0, -$self->{w}, 0;
		2316
		2317	($w, $h) = ($h, $w);
		2318	}
		2319
		2320	glEnable GL_TEXTURE_2D;
		2321	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2322
		2323	$tex->draw_quad (0, 0, $w, $h);
		2324
		2325	glDisable GL_TEXTURE_2D;
		2326	}
		2327
		2328	#############################################################################
		2329
2006	package CFClient::UI::ImageButton;	2330	package CFPlus::UI::ImageButton;
2007		2331
2008	our @ISA = CFClient::UI::Image::;	2332	our @ISA = CFPlus::UI::Image::;
2009		2333
2010	use CFClient::OpenGL;	2334	use CFPlus::OpenGL;
2011		2335
2012	my %textures;	2336	my %textures;
2013		2337
2014	sub new {	2338	sub new {
2015	my $class = shift;	2339	my $class = shift;
…		…
2037	1	2361	1
2038	}	2362	}
2039		2363
2040	#############################################################################	2364	#############################################################################
2041		2365
2042	package CFClient::UI::CheckBox;
2043
2044	our @ISA = CFClient::UI::DrawBG::;
2045
2046	my @tex =
2047	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2048	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2049
2050	use CFClient::OpenGL;
2051
2052	sub new {
2053	my $class = shift;
2054
2055	$class->SUPER::new (
2056	padding_x => 2,
2057	padding_y => 2,
2058	fg => [1, 1, 1],
2059	active_fg => [1, 1, 0],
2060	bg => [0, 0, 0, 0.2],
2061	active_bg => [1, 1, 1, 0.5],
2062	state => 0,
2063	can_hover => 1,
2064	@_
2065	)
2066	}
2067
2068	sub size_request {
2069	my ($self) = @_;
2070
2071	(6) x 2
2072	}
2073
2074	sub toggle {
2075	my ($self) = @_;
2076
2077	$self->{state} = !$self->{state};
2078	$self->emit (changed => $self->{state});
2079	$self->update;
2080	}
2081
2082	sub invoke_button_down {
2083	my ($self, $ev, $x, $y) = @_;
2084
2085	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2086	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2087	$self->toggle;
2088	} else {
2089	return 0
2090	}
2091
2092	1
2093	}
2094
2095	sub _draw {
2096	my ($self) = @_;
2097
2098	$self->SUPER::_draw;
2099
2100	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2101
2102	my ($w, $h) = @$self{qw(w h)};
2103
2104	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2105
2106	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2107
2108	my $tex = $self->{state} ? $tex[1] : $tex[0];
2109
2110	glEnable GL_TEXTURE_2D;
2111	$tex->draw_quad_alpha (0, 0, $s, $s);
2112	glDisable GL_TEXTURE_2D;
2113	}
2114
2115	#############################################################################
2116
2117	package CFClient::UI::Image;	2366	package CFPlus::UI::VGauge;
2118		2367
2119	our @ISA = CFClient::UI::Base::;	2368	our @ISA = CFPlus::UI::Base::;
2120
2121	use CFClient::OpenGL;
2122
2123	our %texture_cache;
2124
2125	sub new {
2126	my $class = shift;
2127
2128	my $self = $class->SUPER::new (
2129	can_events => 0,
2130	@_,
2131	);
2132
2133	$self->{path} || $self->{tex}
2134	or Carp::croak "'path' or 'tex' attributes required";
2135
2136	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2137	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2138
2139	Scalar::Util::weaken $texture_cache{$self->{path}};
2140
2141	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2142
2143	$self
2144	}
2145
2146	sub size_request {
2147	my ($self) = @_;
2148
2149	($self->{tex}{w}, $self->{tex}{h})
2150	}
2151
2152	sub _draw {
2153	my ($self) = @_;
2154
2155	my $tex = $self->{tex};
2156
2157	my ($w, $h) = ($self->{w}, $self->{h});
2158
2159	if ($self->{rot90}) {
2160	glRotate 90, 0, 0, 1;
2161	glTranslate 0, -$self->{w}, 0;
2162
2163	($w, $h) = ($h, $w);
2164	}
2165
2166	glEnable GL_TEXTURE_2D;
2167	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2168
2169	$tex->draw_quad_alpha (0, 0, $w, $h);
2170
2171	glDisable GL_TEXTURE_2D;
2172	}
2173
2174	#############################################################################
2175
2176	package CFClient::UI::VGauge;
2177
2178	our @ISA = CFClient::UI::Base::;
2179		2369
2180	use List::Util qw(min max);	2370	use List::Util qw(min max);
2181		2371
2182	use CFClient::OpenGL;	2372	use CFPlus::OpenGL;
2183		2373
2184	my %tex = (	2374	my %tex = (
2185	food => [	2375	food => [
2186	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2376	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2377	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2188	],	2378	],
2189	grace => [	2379	grace => [
2190	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2380	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2191	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2381	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2192	],	2382	],
2193	hp => [	2383	hp => [
2194	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2384	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2195	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2385	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2196	],	2386	],
2197	mana => [	2387	mana => [
2198	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2388	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2199	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2389	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2200	],	2390	],
2201	);	2391	);
2202		2392
2203	# eg. VGauge->new (gauge => 'food'), default gauge: food	2393	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2306	glDisable GL_TEXTURE_2D;	2496	glDisable GL_TEXTURE_2D;
2307	}	2497	}
2308		2498
2309	#############################################################################	2499	#############################################################################
2310		2500
2311	package CFClient::UI::Gauge;	2501	package CFPlus::UI::Gauge;
2312		2502
2313	our @ISA = CFClient::UI::VBox::;	2503	our @ISA = CFPlus::UI::VBox::;
2314		2504
2315	sub new {	2505	sub new {
2316	my ($class, %arg) = @_;	2506	my ($class, %arg) = @_;
2317		2507
2318	my $self = $class->SUPER::new (	2508	my $self = $class->SUPER::new (
…		…
2320	can_hover => 1,	2510	can_hover => 1,
2321	can_events => 1,	2511	can_events => 1,
2322	%arg,	2512	%arg,
2323	);	2513	);
2324		2514
2325	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2515	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2326	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2516	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2327	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2517	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2328		2518
2329	$self	2519	$self
2330	}	2520	}
2331		2521
2332	sub set_fontsize {	2522	sub set_fontsize {
…		…
2353	$self->{value}->set_text ($val);	2543	$self->{value}->set_text ($val);
2354	}	2544	}
2355		2545
2356	#############################################################################	2546	#############################################################################
2357		2547
2358	package CFClient::UI::Slider;	2548	package CFPlus::UI::Slider;
2359		2549
2360	use strict;	2550	use strict;
2361		2551
2362	use CFClient::OpenGL;	2552	use CFPlus::OpenGL;
2363		2553
2364	our @ISA = CFClient::UI::DrawBG::;	2554	our @ISA = CFPlus::UI::DrawBG::;
2365		2555
2366	my @tex =	2556	my @tex =
2367	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2557	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2368	qw(s1_slider.png s1_slider_bg.png);	2558	qw(s1_slider.png s1_slider_bg.png);
2369		2559
2370	sub new {	2560	sub new {
2371	my $class = shift;	2561	my $class = shift;
2372		2562
…		…
2461	}	2651	}
2462		2652
2463	1	2653	1
2464	}	2654	}
2465		2655
		2656	sub invoke_mouse_wheel {
		2657	my ($self, $ev) = @_;
		2658
		2659	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2660
		2661	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2662
		2663	! ! $delta
		2664	}
		2665
2466	sub update {	2666	sub update {
2467	my ($self) = @_;	2667	my ($self) = @_;
2468		2668
2469	delete $self->{knob_w};	2669	delete $self->{knob_w};
2470	$self->SUPER::update;	2670	$self->SUPER::update;
…		…
2517	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2518	}	2718	}
2519		2719
2520	#############################################################################	2720	#############################################################################
2521		2721
2522	package CFClient::UI::ValSlider;	2722	package CFPlus::UI::ValSlider;
2523		2723
2524	our @ISA = CFClient::UI::HBox::;	2724	our @ISA = CFPlus::UI::HBox::;
2525		2725
2526	sub new {	2726	sub new {
2527	my ($class, %arg) = @_;	2727	my ($class, %arg) = @_;
2528		2728
2529	my $range = delete $arg{range};	2729	my $range = delete $arg{range};
2530		2730
2531	my $self = $class->SUPER::new (	2731	my $self = $class->SUPER::new (
2532	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2732	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2533	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2733	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2534	to_value => sub { shift },	2734	to_value => sub { shift },
2535	from_value => sub { shift },	2735	from_value => sub { shift },
2536	%arg,	2736	%arg,
2537	);	2737	);
2538		2738
…		…
2558	sub set_range { shift->{slider}->set_range (@_) }	2758	sub set_range { shift->{slider}->set_range (@_) }
2559	sub set_value { shift->{slider}->set_value (@_) }	2759	sub set_value { shift->{slider}->set_value (@_) }
2560		2760
2561	#############################################################################	2761	#############################################################################
2562		2762
2563	package CFClient::UI::TextScroller;	2763	package CFPlus::UI::TextScroller;
2564		2764
2565	our @ISA = CFClient::UI::HBox::;	2765	our @ISA = CFPlus::UI::HBox::;
2566		2766
2567	use CFClient::OpenGL;	2767	use CFPlus::OpenGL;
2568		2768
2569	sub new {	2769	sub new {
2570	my $class = shift;	2770	my $class = shift;
2571		2771
2572	my $self = $class->SUPER::new (	2772	my $self = $class->SUPER::new (
2573	fontsize => 1,	2773	fontsize => 1,
2574	can_events => 0,	2774	can_events => 1,
2575	indent => 0,	2775	indent => 0,
2576	#font => default_font	2776	#font => default_font
2577	@_,	2777	@_,
2578		2778
2579	layout => (new CFClient::Layout),	2779	layout => (new CFPlus::Layout),
2580	par => [],	2780	par => [],
2581	height => 0,	2781	height => 0,
2582	children => [	2782	children => [
2583	(new CFClient::UI::Empty expand => 1),	2783	(new CFPlus::UI::Empty expand => 1),
2584	(new CFClient::UI::Slider vertical => 1),	2784	(new CFPlus::UI::Slider vertical => 1),
2585	],	2785	],
2586	);	2786	);
2587		2787
2588	$self->{children}[1]->connect (changed => sub { $self->update });	2788	$self->{children}[1]->connect (changed => sub { $self->update });
2589		2789
…		…
2619		2819
2620	$self->reflow;	2820	$self->reflow;
2621		2821
2622	local $self->{children} = [$empty, $slider];	2822	local $self->{children} = [$empty, $slider];
2623	$self->SUPER::invoke_size_allocate ($w, $h)	2823	$self->SUPER::invoke_size_allocate ($w, $h)
		2824	}
		2825
		2826	sub invoke_mouse_wheel {
		2827	my ($self, $ev) = @_;
		2828
		2829	return 0 unless $ev->{dy}; # only vertical movements
		2830
		2831	$self->{children}[1]->emit (mouse_wheel => $ev);
		2832
		2833	1
2624	}	2834	}
2625		2835
2626	sub get_layout {	2836	sub get_layout {
2627	my ($self, $para) = @_;	2837	my ($self, $para) = @_;
2628		2838
…		…
2656		2866
2657	# todo: base offset on lines or so, not on pixels	2867	# todo: base offset on lines or so, not on pixels
2658	$self->{children}[1]->set_value ($offset);	2868	$self->{children}[1]->set_value ($offset);
2659	}	2869	}
2660		2870
		2871	sub current_paragraph {
		2872	my ($self) = @_;
		2873
		2874	$self->{top_paragraph} - 1
		2875	}
		2876
		2877	sub scroll_to {
		2878	my ($self, $para) = @_;
		2879
		2880	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2881
		2882	$self->{scroll_to} = $para;
		2883	$self->update;
		2884	}
		2885
2661	sub clear {	2886	sub clear {
2662	my ($self) = @_;	2887	my ($self) = @_;
2663		2888
2664	my (undef, undef, @other) = @{ $self->{children} };	2889	my (undef, undef, @other) = @{ $self->{children} };
2665	$self->remove ($_) for @other;	2890	$self->remove ($_) for @other;
…		…
2668	$self->{height} = 0;	2893	$self->{height} = 0;
2669	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2894	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2670	}	2895	}
2671		2896
2672	sub add_paragraph {	2897	sub add_paragraph {
2673	my ($self, $color, $para, $indent) = @_;	2898	my $self = shift;
2674		2899
2675	my ($text, @w) = ref $para ? @$para : $para;	2900	for my $para (@_) {
2676
2677	$para = {	2901	$para = {
		2902	fg => [1, 1, 1, 1],
		2903	indent => 0,
		2904	markup => "",
		2905	widget => [],
		2906	ref $para ? %$para : (markup => $para),
2678	w => 1e10,	2907	w => 1e10,
2679	wrapped => 1,	2908	wrapped => 1,
2680	fg => $color,
2681	indent => $indent,
2682	markup => $text,
2683	widget => \@w,
2684	};	2909	};
2685		2910
2686	$self->add (@w) if @w;	2911	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2687	push @{$self->{par}}, $para;	2912	push @{$self->{par}}, $para;
		2913	}
2688		2914
2689	$self->{need_reflow}++;	2915	$self->{need_reflow}++;
2690	$self->update;	2916	$self->update;
2691	}	2917	}
2692		2918
2693	sub scroll_to_bottom {	2919	sub scroll_to_bottom {
2694	my ($self) = @_;	2920	my ($self) = @_;
2695		2921
2696	$self->{scroll_to_bottom} = 1;	2922	$self->{scroll_to} = $#{$self->{par}};
2697	$self->update;	2923	$self->update;
2698	}	2924	}
2699		2925
		2926	sub force_uptodate {
		2927	my ($self) = @_;
		2928
		2929	if (delete $self->{need_reflow}) {
		2930	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2931
		2932	my $height = 0;
		2933
		2934	for my $para (@{$self->{par}}) {
		2935	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2936	my $layout = $self->get_layout ($para);
		2937	my ($w, $h) = $layout->size;
		2938
		2939	$para->{w} = $w + $para->{indent};
		2940	$para->{h} = $h;
		2941	$para->{wrapped} = $layout->has_wrapped;
		2942	}
		2943
		2944	$para->{y} = $height;
		2945	$height += $para->{h};
		2946	}
		2947
		2948	$self->{height} = $height;
		2949	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2950
		2951	delete $self->{texture};
		2952	}
		2953
		2954	if (my $paridx = delete $self->{scroll_to}) {
		2955	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2956	}
		2957	}
		2958
2700	sub update {	2959	sub update {
2701	my ($self) = @_;	2960	my ($self) = @_;
2702		2961
2703	$self->SUPER::update;	2962	$self->SUPER::update;
2704		2963
2705	return unless $self->{h} > 0;	2964	return unless $self->{h} > 0;
2706		2965
2707	delete $self->{texture};	2966	delete $self->{texture};
2708		2967
2709	$ROOT->on_post_alloc ($self => sub {	2968	$ROOT->on_post_alloc ($self => sub {
		2969	$self->force_uptodate;
		2970
2710	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2971	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2711		2972
2712	if (delete $self->{need_reflow}) {
2713	my $height = 0;
2714
2715	for my $para (@{$self->{par}}) {
2716	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2717	my $layout = $self->get_layout ($para);
2718	my ($w, $h) = $layout->size;
2719
2720	$para->{w} = $w + $para->{indent};
2721	$para->{h} = $h;
2722	$para->{wrapped} = $layout->has_wrapped;
2723	}
2724
2725	$height += $para->{h};
2726	}
2727
2728	$self->{height} = $height;
2729
2730	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2731
2732	delete $self->{texture};
2733	}
2734
2735	if (delete $self->{scroll_to_bottom}) {
2736	$self->{children}[1]->set_value (1e10);
2737	}
2738
2739	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2973	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2740	glClearColor 0, 0, 0, 0;	2974	glClearColor 0, 0, 0, 0;
2741	glClear GL_COLOR_BUFFER_BIT;	2975	glClear GL_COLOR_BUFFER_BIT;
2742		2976
		2977	package CFPlus::UI::Base;
		2978	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		2979	(0, 0, $self->{w}, $self->{h});
		2980
		2981	my $top = int $self->{children}[1]{range}[0];
		2982
		2983	my $paridx = 0;
		2984	my $top_paragraph;
2743	my $top = int $self->{children}[1]{range}[0];	2985	my $top = int $self->{children}[1]{range}[0];
2744		2986
2745	my $y0 = $top;	2987	my $y0 = $top;
2746	my $y1 = $top + $H;	2988	my $y1 = $top + $H;
2747		2989
2748	my $y = 0;
2749
2750	for my $para (@{$self->{par}}) {	2990	for my $para (@{$self->{par}}) {
2751	my $h = $para->{h};	2991	my $h = $para->{h};
		2992	my $y = $para->{y};
2752		2993
2753	if ($y0 < $y + $h && $y < $y1) {	2994	if ($y0 < $y + $h && $y < $y1) {
2754
2755	my $layout = $self->get_layout ($para);	2995	my $layout = $self->get_layout ($para);
2756		2996
2757	$layout->render ($para->{indent}, $y - $y0);	2997	$layout->render ($para->{indent}, $y - $y0);
2758		2998
2759	if (my @w = @{ $para->{widget} }) {	2999	if (my @w = @{ $para->{widget} }) {
…		…
2768	$_->draw;	3008	$_->draw;
2769	}	3009	}
2770	}	3010	}
2771	}	3011	}
2772		3012
2773	$y += $h;	3013	$paridx++;
		3014	$top_paragraph ||= $paridx if $y >= $top;
2774	}	3015	}
		3016
		3017	$self->{top_paragraph} = $top_paragraph;
2775	};	3018	};
2776	});	3019	});
2777	}	3020	}
2778		3021
2779	sub reconfigure {	3022	sub reconfigure {
…		…
2797	$self->{children}[1]->draw;	3040	$self->{children}[1]->draw;
2798	}	3041	}
2799		3042
2800	#############################################################################	3043	#############################################################################
2801		3044
2802	package CFClient::UI::Animator;	3045	package CFPlus::UI::Animator;
2803		3046
2804	use CFClient::OpenGL;	3047	use CFPlus::OpenGL;
2805		3048
2806	our @ISA = CFClient::UI::Bin::;	3049	our @ISA = CFPlus::UI::Bin::;
2807		3050
2808	sub moveto {	3051	sub moveto {
2809	my ($self, $x, $y) = @_;	3052	my ($self, $x, $y) = @_;
2810		3053
2811	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3054	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2839	glPopMatrix;	3082	glPopMatrix;
2840	}	3083	}
2841		3084
2842	#############################################################################	3085	#############################################################################
2843		3086
2844	package CFClient::UI::Flopper;	3087	package CFPlus::UI::Flopper;
2845		3088
2846	our @ISA = CFClient::UI::Button::;	3089	our @ISA = CFPlus::UI::Button::;
2847		3090
2848	sub new {	3091	sub new {
2849	my $class = shift;	3092	my $class = shift;
2850		3093
2851	my $self = $class->SUPER::new (	3094	my $self = $class->SUPER::new (
…		…
2863	$self->{other}->toggle_visibility;	3106	$self->{other}->toggle_visibility;
2864	}	3107	}
2865		3108
2866	#############################################################################	3109	#############################################################################
2867		3110
2868	package CFClient::UI::Tooltip;	3111	package CFPlus::UI::Tooltip;
2869		3112
2870	our @ISA = CFClient::UI::Bin::;	3113	our @ISA = CFPlus::UI::Bin::;
2871		3114
2872	use CFClient::OpenGL;	3115	use CFPlus::OpenGL;
2873		3116
2874	sub new {	3117	sub new {
2875	my $class = shift;	3118	my $class = shift;
2876		3119
2877	$class->SUPER::new (	3120	$class->SUPER::new (
…		…
2880	)	3123	)
2881	}	3124	}
2882		3125
2883	sub set_tooltip_from {	3126	sub set_tooltip_from {
2884	my ($self, $widget) = @_;	3127	my ($self, $widget) = @_;
		3128
		3129	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3130	if $widget->{tooltip} =~ /^#(.*)$/;
2885		3131
2886	my $tooltip = $widget->{tooltip};	3132	my $tooltip = $widget->{tooltip};
2887		3133
2888	if ($ENV{CFPLUS_DEBUG} & 2) {	3134	if ($ENV{CFPLUS_DEBUG} & 2) {
2889	$tooltip .= "\n\n" . (ref $widget) . "\n"	3135	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2893	}	3139	}
2894		3140
2895	$tooltip =~ s/^\n+//;	3141	$tooltip =~ s/^\n+//;
2896	$tooltip =~ s/\n+$//;	3142	$tooltip =~ s/\n+$//;
2897		3143
2898	$self->add (new CFClient::UI::Label	3144	$self->add (new CFPlus::UI::Label
2899	markup => $tooltip,	3145	markup => $tooltip,
2900	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3146	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2901	fontsize => 0.8,	3147	fontsize => 0.8,
2902	fg => [0, 0, 0, 1],	3148	style => 1, # FLAG_INVERSE
2903	ellipsise => 0,	3149	ellipsise => 0,
2904	font => ($widget->{tooltip_font} || $::FONT_PROP),	3150	font => ($widget->{tooltip_font} || $::FONT_PROP),
2905	);	3151	);
2906	}	3152	}
2907		3153
…		…
2926		3172
2927	$self->{root}->on_post_alloc ("move_$self" => sub {	3173	$self->{root}->on_post_alloc ("move_$self" => sub {
2928	my $widget = $self->{owner}	3174	my $widget = $self->{owner}
2929	or return;	3175	or return;
2930		3176
		3177	if ($widget->{visible}) {
2931	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3178	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2932		3179
2933	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3180	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2934	if $x + $self->{w} > $self->{root}{w};	3181	if $x + $self->{w} > $self->{root}{w};
2935		3182
2936	$self->move_abs ($x, $y);	3183	$self->move_abs ($x, $y);
		3184	} else {
		3185	$self->hide;
		3186	}
2937	});	3187	});
2938	}	3188	}
2939		3189
2940	sub _draw {	3190	sub _draw {
2941	my ($self) = @_;	3191	my ($self) = @_;
…		…
2965	$self->SUPER::_draw;	3215	$self->SUPER::_draw;
2966	}	3216	}
2967		3217
2968	#############################################################################	3218	#############################################################################
2969		3219
2970	package CFClient::UI::Face;	3220	package CFPlus::UI::Face;
2971		3221
2972	our @ISA = CFClient::UI::Base::;	3222	our @ISA = CFPlus::UI::DrawBG::;
2973		3223
2974	use CFClient::OpenGL;	3224	use CFPlus::OpenGL;
2975		3225
2976	sub new {	3226	sub new {
2977	my $class = shift;	3227	my $class = shift;
2978		3228
2979	my $self = $class->SUPER::new (	3229	my $self = $class->SUPER::new (
…		…
3014	sub _draw {	3264	sub _draw {
3015	my ($self) = @_;	3265	my ($self) = @_;
3016		3266
3017	return unless $::CONN;	3267	return unless $::CONN;
3018		3268
		3269	$self->SUPER::_draw;
		3270
3019	my $face;	3271	my $face;
3020		3272
3021	if ($self->{frame}) {	3273	if ($self->{frame}) {
3022	my $anim = $::CONN->{anim}[$self->{anim}];	3274	my $anim = $::CONN->{anim}[$self->{anim}];
3023		3275
…		…
3045	$self->SUPER::destroy;	3297	$self->SUPER::destroy;
3046	}	3298	}
3047		3299
3048	#############################################################################	3300	#############################################################################
3049		3301
3050	package CFClient::UI::Buttonbar;	3302	package CFPlus::UI::Buttonbar;
3051		3303
3052	our @ISA = CFClient::UI::HBox::;	3304	our @ISA = CFPlus::UI::HBox::;
3053		3305
3054	# TODO: should actualyl wrap buttons and other goodies.	3306	# TODO: should actually wrap buttons and other goodies.
3055		3307
3056	#############################################################################	3308	#############################################################################
3057		3309
3058	package CFClient::UI::Menu;	3310	package CFPlus::UI::Menu;
3059		3311
3060	our @ISA = CFClient::UI::FancyFrame::;	3312	our @ISA = CFPlus::UI::Toplevel::;
3061		3313
3062	use CFClient::OpenGL;	3314	use CFPlus::OpenGL;
3063		3315
3064	sub new {	3316	sub new {
3065	my $class = shift;	3317	my $class = shift;
3066		3318
3067	my $self = $class->SUPER::new (	3319	my $self = $class->SUPER::new (
3068	items => [],	3320	items => [],
3069	z => 100,	3321	z => 100,
3070	@_,	3322	@_,
3071	);	3323	);
3072		3324
3073	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3325	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3074		3326
3075	for my $item (@{ $self->{items} }) {	3327	for my $item (@{ $self->{items} }) {
3076	my ($widget, $cb, $tooltip) = @$item;	3328	my ($widget, $cb, $tooltip) = @$item;
3077		3329
3078	# handle various types of items, only text for now	3330	# handle various types of items, only text for now
3079	if (!ref $widget) {	3331	if (!ref $widget) {
3080	if ($widget =~ /\t/) {	3332	if ($widget =~ /\t/) {
3081	my ($left, $right) = split /\t/, $widget, 2;	3333	my ($left, $right) = split /\t/, $widget, 2;
3082		3334
3083	$widget = new CFClient::UI::HBox	3335	$widget = new CFPlus::UI::HBox
3084	can_hover => 1,	3336	can_hover => 1,
3085	can_events => 1,	3337	can_events => 1,
3086	tooltip => $tooltip,	3338	tooltip => $tooltip,
3087	children => [	3339	children => [
3088	(new CFClient::UI::Label markup => $left, expand => 1),	3340	(new CFPlus::UI::Label markup => $left, expand => 1),
3089	(new CFClient::UI::Label markup => $right, align => +1),	3341	(new CFPlus::UI::Label markup => $right, align => +1),
3090	],	3342	],
3091	;	3343	;
3092		3344
3093	} else {	3345	} else {
3094	$widget = new CFClient::UI::Label	3346	$widget = new CFPlus::UI::Label
3095	can_hover => 1,	3347	can_hover => 1,
3096	can_events => 1,	3348	can_events => 1,
3097	markup => $widget,	3349	markup => $widget,
3098	tooltip => $tooltip;	3350	tooltip => $tooltip;
3099	}	3351	}
…		…
3147	1	3399	1
3148	}	3400	}
3149		3401
3150	#############################################################################	3402	#############################################################################
3151		3403
3152	package CFClient::UI::Multiplexer;	3404	package CFPlus::UI::Multiplexer;
3153		3405
3154	our @ISA = CFClient::UI::Container::;	3406	our @ISA = CFPlus::UI::Container::;
3155		3407
3156	sub new {	3408	sub new {
3157	my $class = shift;	3409	my $class = shift;
3158		3410
3159	my $self = $class->SUPER::new (	3411	my $self = $class->SUPER::new (
…		…
3220	$self->{current}->draw;	3472	$self->{current}->draw;
3221	}	3473	}
3222		3474
3223	#############################################################################	3475	#############################################################################
3224		3476
3225	package CFClient::UI::Notebook;	3477	package CFPlus::UI::Notebook;
3226		3478
3227	our @ISA = CFClient::UI::VBox::;	3479	our @ISA = CFPlus::UI::VBox::;
3228		3480
3229	sub new {	3481	sub new {
3230	my $class = shift;	3482	my $class = shift;
3231		3483
3232	my $self = $class->SUPER::new (	3484	my $self = $class->SUPER::new (
3233	buttonbar => (new CFClient::UI::Buttonbar),	3485	buttonbar => (new CFPlus::UI::Buttonbar),
3234	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3486	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3235	# filter => # will be put between multiplexer and $self	3487	# filter => # will be put between multiplexer and $self
3236	@_,	3488	@_,
3237	);	3489	);
3238		3490
3239	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3491	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3245	sub add {	3497	sub add {
3246	my ($self, $title, $widget, $tooltip) = @_;	3498	my ($self, $title, $widget, $tooltip) = @_;
3247		3499
3248	Scalar::Util::weaken $self;	3500	Scalar::Util::weaken $self;
3249		3501
3250	$self->{buttonbar}->add (new CFClient::UI::Button	3502	$self->{buttonbar}->add (new CFPlus::UI::Button
3251	markup => $title,	3503	markup => $title,
3252	tooltip => $tooltip,	3504	tooltip => $tooltip,
3253	on_activate => sub { $self->set_current_page ($widget) },	3505	on_activate => sub { $self->set_current_page ($widget) },
3254	);	3506	);
3255		3507
…		…
3269	$self->emit (page_changed => $self->{multiplexer}{current});	3521	$self->emit (page_changed => $self->{multiplexer}{current});
3270	}	3522	}
3271		3523
3272	#############################################################################	3524	#############################################################################
3273		3525
3274	package CFClient::UI::Combobox;	3526	package CFPlus::UI::Selector;
3275		3527
3276	use utf8;	3528	use utf8;
3277		3529
3278	our @ISA = CFClient::UI::Button::;	3530	our @ISA = CFPlus::UI::Button::;
3279		3531
3280	sub new {	3532	sub new {
3281	my $class = shift;	3533	my $class = shift;
3282		3534
3283	my $self = $class->SUPER::new (	3535	my $self = $class->SUPER::new (
…		…
3300	my ($value, $title, $tooltip) = @$_;	3552	my ($value, $title, $tooltip) = @$_;
3301		3553
3302	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3554	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303	}	3555	}
3304		3556
3305	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3557	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306	}	3558	}
3307		3559
3308	sub _set_value {	3560	sub _set_value {
3309	my ($self, $value) = @_;	3561	my ($self, $value) = @_;
3310		3562
…		…
3325	$self->emit (changed => $value);	3577	$self->emit (changed => $value);
3326	}	3578	}
3327		3579
3328	#############################################################################	3580	#############################################################################
3329		3581
3330	package CFClient::UI::Statusbox;	3582	package CFPlus::UI::Statusbox;
3331		3583
3332	our @ISA = CFClient::UI::VBox::;	3584	our @ISA = CFPlus::UI::VBox::;
3333		3585
3334	sub new {	3586	sub new {
3335	my $class = shift;	3587	my $class = shift;
3336		3588
3337	my $self = $class->SUPER::new (	3589	my $self = $class->SUPER::new (
…		…
3349	sub reorder {	3601	sub reorder {
3350	my ($self) = @_;	3602	my ($self) = @_;
3351	my $NOW = Time::HiRes::time;	3603	my $NOW = Time::HiRes::time;
3352		3604
3353	# freeze display when hovering over any label	3605	# freeze display when hovering over any label
3354	return if $CFClient::UI::TOOLTIP->{owner}	3606	return if $CFPlus::UI::TOOLTIP->{owner}
3355	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3607	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3356	values %{ $self->{item} };	3608	values %{ $self->{item} };
3357		3609
3358	while (my ($k, $v) = each %{ $self->{item} }) {	3610	while (my ($k, $v) = each %{ $self->{item} }) {
3359	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3611	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3360	}	3612	}
…		…
3381	for ($short) {	3633	for ($short) {
3382	s/^\s+//;	3634	s/^\s+//;
3383	s/\s+/ /g;	3635	s/\s+/ /g;
3384	}	3636	}
3385		3637
3386	new CFClient::UI::Label	3638	new CFPlus::UI::Label
3387	markup => $short,	3639	markup => $short,
3388	tooltip => $item->{tooltip},	3640	tooltip => $item->{tooltip},
3389	tooltip_font => $::FONT_PROP,	3641	tooltip_font => $::FONT_PROP,
3390	tooltip_width => 0.67,	3642	tooltip_width => 0.67,
3391	fontsize => $item->{fontsize} || $self->{fontsize},	3643	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3470	$self->SUPER::destroy;	3722	$self->SUPER::destroy;
3471	}	3723	}
3472		3724
3473	#############################################################################	3725	#############################################################################
3474		3726
3475	package CFClient::UI::Inventory;	3727	package CFPlus::UI::Inventory;
3476		3728
3477	our @ISA = CFClient::UI::Table::;	3729	our @ISA = CFPlus::UI::Table::;
3478		3730
3479	sub new {	3731	sub new {
3480	my $class = shift;	3732	my $class = shift;
3481		3733
3482	my $self = $class->SUPER::new (	3734	my $self = $class->SUPER::new (
3483	col_expand => [0, 1, 0],	3735	col_expand => [0, 1, 0],
		3736	items => [],
3484	@_,	3737	@_,
3485	);	3738	);
3486		3739
		3740	$self->set_sort_order (undef);
		3741
3487	$self	3742	$self
		3743	}
		3744
		3745	sub update_items {
		3746	my ($self) = @_;
		3747
		3748	$self->clear;
		3749
		3750	my @item = $self->{sort}->(@{ $self->{items} });
		3751
		3752	my @adds;
		3753	my $row = 0;
		3754	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3755	CFPlus::Item::update_widgets $item;
		3756
		3757	push @adds, 0, $row, $item->{face_widget};
		3758	push @adds, 1, $row, $item->{desc_widget};
		3759	push @adds, 2, $row, $item->{weight_widget};
		3760
		3761	$row++;
		3762	}
		3763
		3764	$self->add (@adds);
		3765	}
		3766
		3767	sub set_sort_order {
		3768	my ($self, $order) = @_;
		3769
		3770	$self->{sort} = $order ||= sub {
		3771	sort {
		3772	$a->{type} <=> $b->{type}
		3773	or $a->{name} cmp $b->{name}
		3774	} @_
		3775	};
		3776
		3777	$self->update_items;
3488	}	3778	}
3489		3779
3490	sub set_items {	3780	sub set_items {
3491	my ($self, $items) = @_;	3781	my ($self, $items) = @_;
3492		3782
3493	$self->clear;	3783	$self->{items} = [$items ? values %$items : ()];
3494	return unless $items;	3784	$self->update_items;
3495
3496	my @items = sort {
3497	($a->{type} <=> $b->{type})
3498	or ($a->{name} cmp $b->{name})
3499	} values %$items;
3500
3501	$self->{real_items} = \@items;
3502
3503	my $row = 0;
3504	for my $item (@items) {
3505	CFClient::Item::update_widgets $item;
3506
3507	$self->add (0, $row, $item->{face_widget});
3508	$self->add (1, $row, $item->{desc_widget});
3509	$self->add (2, $row, $item->{weight_widget});
3510
3511	$row++;
3512	}
3513	}	3785	}
3514		3786
3515	#############################################################################	3787	#############################################################################
3516		3788
3517	package CFClient::UI::SpellList;	3789	package CFPlus::UI::SpellList;
3518		3790
3519	our @ISA = CFClient::UI::Table::;	3791	our @ISA = CFPlus::UI::Table::;
3520		3792
3521	sub new {	3793	sub new {
3522	my $class = shift;	3794	my $class = shift;
3523		3795
3524	my $self = $class->SUPER::new (	3796	my $self = $class->SUPER::new (
…		…
3542	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3814	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543		3815
3544	sub rebuild_spell_list {	3816	sub rebuild_spell_list {
3545	my ($self) = @_;	3817	my ($self) = @_;
3546		3818
3547	$CFClient::UI::ROOT->on_refresh ($self => sub {	3819	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3548	$self->clear;	3820	$self->clear;
3549		3821
3550	return unless $::CONN;	3822	return unless $::CONN;
3551		3823
3552	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3824	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3825	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3826	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3827	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3828	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557		3829
3558	my $row = 0;	3830	my $row = 0;
3559		3831
3560	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3832	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561	my $spell = $self->{spell}{$_};	3833	my $spell = $self->{spell}{$_};
…		…
3568	if ($ev->{button} == 1) {	3840	if ($ev->{button} == 1) {
3569	$::CONN->user_send ("cast $spell->{name}");	3841	$::CONN->user_send ("cast $spell->{name}");
3570	} elsif ($ev->{button} == 2) {	3842	} elsif ($ev->{button} == 2) {
3571	$::CONN->user_send ("invoke $spell->{name}");	3843	$::CONN->user_send ("invoke $spell->{name}");
3572	} elsif ($ev->{button} == 3) {	3844	} elsif ($ev->{button} == 3) {
3573	(new CFClient::UI::Menu	3845	(new CFPlus::UI::Menu
3574	items => [	3846	items => [
3575	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3847	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3848	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577	],	3849	],
3578	)->popup ($ev);	3850	)->popup ($ev);
…		…
3581	}	3853	}
3582		3854
3583	1	3855	1
3584	};	3856	};
3585		3857
3586	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3858	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3587		3859
3588	#TODO: add path info to tooltip	3860	#TODO: add path info to tooltip
3589	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3861	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3590		3862
3591	$self->add (0, $row, new CFClient::UI::Face	3863	$self->add (0, $row, new CFPlus::UI::Face
3592	face => $spell->{face},	3864	face => $spell->{face},
3593	can_hover => 1,	3865	can_hover => 1,
3594	can_events => 1,	3866	can_events => 1,
3595	tooltip => $tooltip,	3867	tooltip => $tooltip,
3596	on_button_down => $spell_cb,	3868	on_button_down => $spell_cb,
3597	);	3869	);
3598		3870
3599	$self->add (1, $row, new CFClient::UI::Label	3871	$self->add (1, $row, new CFPlus::UI::Label
3600	expand => 1,	3872	expand => 1,
3601	text => $spell->{name},	3873	text => $spell->{name},
3602	can_hover => 1,	3874	can_hover => 1,
3603	can_events => 1,	3875	can_events => 1,
3604	tooltip => $tooltip,	3876	tooltip => $tooltip,
3605	on_button_down => $spell_cb,	3877	on_button_down => $spell_cb,
3606	);	3878	);
3607		3879
3608	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3880	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3881	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3882	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3883	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612	}	3884	}
3613	});	3885	});
3614	}	3886	}
3615		3887
3616	sub add_spell {	3888	sub add_spell {
…		…
3634	$self->rebuild_spell_list;	3906	$self->rebuild_spell_list;
3635	}	3907	}
3636		3908
3637	#############################################################################	3909	#############################################################################
3638		3910
3639	package CFClient::UI::Root;	3911	package CFPlus::UI::Root;
3640		3912
3641	our @ISA = CFClient::UI::Container::;	3913	our @ISA = CFPlus::UI::Container::;
3642		3914
3643	use List::Util qw(min max);	3915	use List::Util qw(min max);
3644		3916
3645	use CFClient::OpenGL;	3917	use CFPlus::OpenGL;
3646		3918
3647	sub new {	3919	sub new {
3648	my $class = shift;	3920	my $class = shift;
3649		3921
3650	my $self = $class->SUPER::new (	3922	my $self = $class->SUPER::new (
…		…
3829	$h = 0 if $h < 0;	4101	$h = 0 if $h < 0;
3830		4102
3831	$w = max $widget->{min_w}, $w;	4103	$w = max $widget->{min_w}, $w;
3832	$h = max $widget->{min_h}, $h;	4104	$h = max $widget->{min_h}, $h;
3833		4105
		4106	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4107	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4108
3834	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4109	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4110	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836		4111
3837	$w = int $w + 0.5;	4112	$w = int $w + 0.5;
3838	$h = int $h + 0.5;	4113	$h = int $h + 0.5;
…		…
3864	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4139	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3865	glMatrixMode GL_MODELVIEW;	4140	glMatrixMode GL_MODELVIEW;
3866	glLoadIdentity;	4141	glLoadIdentity;
3867		4142
3868	{	4143	{
3869	package CFClient::UI::Base;	4144	package CFPlus::UI::Base;
3870		4145
3871	($draw_x, $draw_y, $draw_w, $draw_h) =	4146	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3872	(0, 0, $self->{w}, $self->{h});	4147	(0, 0, $self->{w}, $self->{h});
3873	}
3874		4148
3875	$self->_draw;	4149	$self->_draw;
		4150	}
3876	}	4151	}
3877		4152
3878	#############################################################################	4153	#############################################################################
3879		4154
3880	package CFClient::UI;	4155	package CFPlus::UI;
3881		4156
3882	$ROOT = new CFClient::UI::Root;	4157	$ROOT = new CFPlus::UI::Root;
3883	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4158	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3884		4159
3885	1	4160	1
3886		4161

Diff Legend

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