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

Diff Legend

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