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.313 by root, Sat Jun 24 00:24:09 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) = @_;
418		443
		444	Carp::confess unless $self->{parent};#d#
		445
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	447	}
421		448
422	sub invoke_focus_in {	449	sub invoke_focus_in {
423	my ($self) = @_;	450	my ($self) = @_;
424		451
425	return if $FOCUS == $self;	452	return if $FOCUS == $self;
426	return unless $self->{can_focus};	453	return unless $self->{can_focus};
427		454
428	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
429		456
430	$focus->update if $focus;	457	$self->update;
431	$FOCUS->update;
432		458
433	0	459	0
434	}	460	}
435		461
436	sub invoke_focus_out {	462	sub invoke_focus_out {
437	my ($self) = @_;	463	my ($self) = @_;
438		464
439	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
440		466
441	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
442		468
443	$focus->update if $focus; #?	469	$self->update;
444		470
445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	471	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	472	unless $FOCUS;
447		473
448	0	474	0
449	}	475	}
450		476
451	sub grab_focus {	477	sub grab_focus {
452	my ($self) = @_;	478	my ($self) = @_;
453		479
		480	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	481	$self->emit ("focus_in");
455	}	482	}
456		483
457	sub invoke_mouse_motion { 1 }	484	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	485	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	486	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
461		489
462	sub invoke_button_down {	490	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
464		492
465	$self->grab_focus;	493	$self->grab_focus;
466		494
467	1	495	0
468	}	496	}
469		497
470	sub connect {	498	sub connect {
471	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
472		500
473	push @{ $self->{signal_cb}{$signal} }, $cb;	501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
474	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
475		515
476	sub emit {	516	sub emit {
477	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
478		518
		519	# I do not really like this solution, but I 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
479	#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 =
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	535	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	536	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482	|| ($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
483	}	545	}
484		546
485	sub find_widget {	547	sub find_widget {
486	my ($self, $x, $y) = @_;	548	my ($self, $x, $y) = @_;
487		549
…		…
571	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
574	glEnd;	636	glEnd;
575	glPopMatrix;	637	glPopMatrix;
576	#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;
577	}	639	}
578		640
579	$self->_draw;	641	$self->_draw;
580	glPopMatrix;	642	glPopMatrix;
581	}	643	}
…		…
587	}	649	}
588		650
589	sub DESTROY {	651	sub DESTROY {
590	my ($self) = @_;	652	my ($self) = @_;
591		653
		654	return if CFPlus::in_destruct;
		655
592	delete $WIDGET{$self+0};	656	delete $WIDGET{$self+0};
593		657
594	eval { $self->destroy };	658	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596	}	660	}
597		661
598	#############################################################################	662	#############################################################################
599		663
600	package CFClient::UI::DrawBG;	664	package CFPlus::UI::DrawBG;
601		665
602	our @ISA = CFClient::UI::Base::;	666	our @ISA = CFPlus::UI::Base::;
603		667
604	use strict;	668	use strict;
605	use CFClient::OpenGL;	669	use CFPlus::OpenGL;
606		670
607	sub new {	671	sub new {
608	my $class = shift;	672	my $class = shift;
609		673
610	# range [value, low, high, page]	674	# range [value, low, high, page]
…		…
641	}	705	}
642	}	706	}
643		707
644	#############################################################################	708	#############################################################################
645		709
646	package CFClient::UI::Empty;	710	package CFPlus::UI::Empty;
647		711
648	our @ISA = CFClient::UI::Base::;	712	our @ISA = CFPlus::UI::Base::;
649		713
650	sub new {	714	sub new {
651	my ($class, %arg) = @_;	715	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	716	$class->SUPER::new (can_events => 0, %arg);
653	}	717	}
…		…
660		724
661	sub draw { }	725	sub draw { }
662		726
663	#############################################################################	727	#############################################################################
664		728
665	package CFClient::UI::Container;	729	package CFPlus::UI::Container;
666		730
667	our @ISA = CFClient::UI::Base::;	731	our @ISA = CFPlus::UI::Base::;
668		732
669	sub new {	733	sub new {
670	my ($class, %arg) = @_;	734	my ($class, %arg) = @_;
671		735
672	my $children = delete $arg{children};	736	my $children = delete $arg{children};
…		…
681	if $children;	745	if $children;
682		746
683	$self	747	$self
684	}	748	}
685		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
686	sub add {	758	sub add {
687	my ($self, @widgets) = @_;	759	my ($self, @widgets) = @_;
688		760
689	$_->set_parent ($self)	761	$_->set_parent ($self)
690	for @widgets;	762	for @widgets;
…		…
750	$_->draw for @{$self->{children}};	822	$_->draw for @{$self->{children}};
751	}	823	}
752		824
753	#############################################################################	825	#############################################################################
754		826
755	package CFClient::UI::Bin;	827	package CFPlus::UI::Bin;
756		828
757	our @ISA = CFClient::UI::Container::;	829	our @ISA = CFPlus::UI::Container::;
758		830
759	sub new {	831	sub new {
760	my ($class, %arg) = @_;	832	my ($class, %arg) = @_;
761		833
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	834	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		835
764	$class->SUPER::new (children => [$child], %arg)	836	$class->SUPER::new (children => [$child], %arg)
765	}	837	}
766		838
767	sub add {	839	sub add {
…		…
774	sub remove {	846	sub remove {
775	my ($self, $widget) = @_;	847	my ($self, $widget) = @_;
776		848
777	$self->SUPER::remove ($widget);	849	$self->SUPER::remove ($widget);
778		850
779	$self->{children} = [new CFClient::UI::Empty]	851	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	852	unless @{$self->{children}};
781	}	853	}
782		854
783	sub child { $_[0]->{children}[0] }	855	sub child { $_[0]->{children}[0] }
784		856
…		…
796		868
797	#############################################################################	869	#############################################################################
798		870
799	# back-buffered drawing area	871	# back-buffered drawing area
800		872
801	package CFClient::UI::Window;	873	package CFPlus::UI::Window;
802		874
803	our @ISA = CFClient::UI::Bin::;	875	our @ISA = CFPlus::UI::Bin::;
804		876
805	use CFClient::OpenGL;	877	use CFPlus::OpenGL;
806		878
807	sub new {	879	sub new {
808	my ($class, %arg) = @_;	880	my ($class, %arg) = @_;
809		881
810	my $self = $class->SUPER::new (%arg);	882	my $self = $class->SUPER::new (%arg);
…		…
832	}	904	}
833		905
834	sub render_child {	906	sub render_child {
835	my ($self) = @_;	907	my ($self) = @_;
836		908
837	$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 {
838	glClearColor 0, 0, 0, 0;	910	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	911	glClear GL_COLOR_BUFFER_BIT;
840		912
841	{	913	{
842	package CFClient::UI::Base;	914	package CFPlus::UI::Base;
843		915
844	($draw_x, $draw_y, $draw_w, $draw_h) =	916	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	917	(0, 0, $self->{w}, $self->{h});
		918
		919	$self->_render;
846	}	920	}
847
848	$self->_render;
849	};	921	};
850	}	922	}
851		923
852	sub _draw {	924	sub _draw {
853	my ($self) = @_;	925	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		926
857	my $tex = $self->{texture}	927	my $tex = $self->{texture}
858	or return;	928	or return;
859		929
860	glEnable GL_TEXTURE_2D;	930	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	931	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	932	glColor 0, 0, 0, 1;
863		933
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	934	$tex->draw_quad_alpha_premultiplied (0, 0);
865		935
866	glDisable GL_TEXTURE_2D;	936	glDisable GL_TEXTURE_2D;
867	}	937	}
868		938
869	#############################################################################	939	#############################################################################
870		940
871	package CFClient::UI::ViewPort;	941	package CFPlus::UI::ViewPort;
872		942
873	our @ISA = CFClient::UI::Window::;	943	our @ISA = CFPlus::UI::Window::;
874		944
875	sub new {	945	sub new {
876	my $class = shift;	946	my $class = shift;
877		947
878	$class->SUPER::new (	948	$class->SUPER::new (
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1008	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1009	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1010	) {
941	$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})
942	} else {	1012	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1013	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1014	}
945	}	1015	}
946		1016
947	sub _render {	1017	sub _render {
948	my ($self) = @_;	1018	my ($self) = @_;
949		1019
950	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};
951	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};
952		1022
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1023	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1024
955	$self->SUPER::_render;	1025	$self->SUPER::_render;
956	}	1026	}
957		1027
958	#############################################################################	1028	#############################################################################
959		1029
960	package CFClient::UI::ScrolledWindow;	1030	package CFPlus::UI::ScrolledWindow;
961		1031
962	our @ISA = CFClient::UI::HBox::;	1032	our @ISA = CFPlus::UI::HBox::;
963		1033
964	sub new {	1034	sub new {
965	my ($class, %arg) = @_;	1035	my ($class, %arg) = @_;
966		1036
967	my $child = delete $arg{child};	1037	my $child = delete $arg{child};
968		1038
969	my $self;	1039	my $self;
970		1040
971	my $slider = new CFClient::UI::Slider	1041	my $slider = new CFPlus::UI::Slider
972	vertical => 1,	1042	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1043	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1044	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1045	$self->{vp}->set_offset (0, $_[1]);
976	},	1046	},
977	;	1047	;
978		1048
979	$self = $class->SUPER::new (	1049	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1050	vp => (new CFPlus::UI::ViewPort expand => 1),
		1051	can_events => 1,
981	slider => $slider,	1052	slider => $slider,
982	%arg,	1053	%arg,
983	);	1054	);
984		1055
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1056	$self->SUPER::add ($self->{vp}, $self->{slider});
986	$self->add ($child) if $child;	1057	$self->add ($child) if $child;
987		1058
988	$self	1059	$self
989	}	1060	}
990		1061
		1062	#TODO# update range on size_allocate depending on child
		1063
991	sub add {	1064	sub add {
992	my ($self, $widget) = @_;	1065	my ($self, $widget) = @_;
993		1066
994	$self->{vp}->add ($self->{child} = $widget);	1067	$self->{vp}->add ($self->{child} = $widget);
995	}	1068	}
996		1069
		1070	sub invoke_mouse_wheel {
		1071	my ($self, $ev) = @_;
		1072
		1073	return 0 unless $ev->{dy}; # only vertical movements
		1074
		1075	$self->{slider}->emit (mouse_wheel => $ev);
		1076
		1077	1
		1078	}
		1079
		1080	sub update_slider {
		1081	my ($self) = @_;
		1082
		1083	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1084	}
		1085
997	sub update {	1086	sub update {
998	my ($self) = @_;	1087	my ($self) = @_;
999		1088
1000	$self->SUPER::update;	1089	$self->SUPER::update;
1001		1090
1002	# todo: overwrite size_allocate of child	1091	$self->update_slider;
1003	my $child = $self->{vp}->child;
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005	}	1092	}
1006		1093
1007	sub invoke_size_allocate {	1094	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1095	my ($self, $w, $h) = @_;
1009		1096
1010	my $child = $self->{vp}->child;	1097	$self->update_slider;
1011	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012		1098
1013	$self->SUPER::invoke_size_allocate ($w, $h)	1099	$self->SUPER::invoke_size_allocate ($w, $h)
1014	}	1100	}
1015		1101
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018
1019	#############################################################################	1102	#############################################################################
1020		1103
1021	package CFClient::UI::Frame;	1104	package CFPlus::UI::Frame;
1022		1105
1023	our @ISA = CFClient::UI::Bin::;	1106	our @ISA = CFPlus::UI::Bin::;
1024		1107
1025	use CFClient::OpenGL;	1108	use CFPlus::OpenGL;
1026		1109
1027	sub new {	1110	sub new {
1028	my $class = shift;	1111	my $class = shift;
1029		1112
1030	$class->SUPER::new (	1113	$class->SUPER::new (
…		…
1056	$self->SUPER::_draw;	1139	$self->SUPER::_draw;
1057	}	1140	}
1058		1141
1059	#############################################################################	1142	#############################################################################
1060		1143
1061	package CFClient::UI::FancyFrame;	1144	package CFPlus::UI::FancyFrame;
1062		1145
1063	our @ISA = CFClient::UI::Bin::;	1146	our @ISA = CFPlus::UI::Bin::;
1064		1147
1065	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;
1066		1249
1067	my $bg =	1250	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1251	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1252	mipmap => 1, wrap => 1;
1070		1253
1071	my @border =	1254	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1255	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073	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);
1074		1257
1075	sub new {	1258	sub new {
1076	my ($class, %arg) = @_;	1259	my ($class, %arg) = @_;
1077		1260
1078	my $self = $class->SUPER::new (	1261	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1262	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1263	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1264	border => 0.6,
1082	can_events => 1,	1265	can_events => 1,
1083	min_w => 16,	1266	min_w => 64,
1084	min_h => 16,	1267	min_h => 32,
1085	%arg,	1268	%arg,
1086	);	1269	);
1087		1270
1088	$self->{title_widget} = new CFClient::UI::Label	1271	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1272	align => 0,
1090	valign => 1,	1273	valign => 1,
1091	text => $self->{title},	1274	text => $self->{title},
1092	fontsize => $self->{border},	1275	fontsize => $self->{border},
1093	if exists $self->{title};	1276	if exists $self->{title};
1094		1277
1095	if ($self->{has_close_button}) {	1278	if ($self->{has_close_button}) {
1096	$self->{close_button} =	1279	$self->{close_button} =
1097	new CFClient::UI::ImageButton	1280	new CFPlus::UI::ImageButton
1098	path => 'x1_close.png',	1281	path => 'x1_close.png',
1099	on_activate => sub { $self->hide };	1282	on_activate => sub { $self->emit ("delete") };
1100		1283
1101	$self->CFClient::UI::Container::add ($self->{close_button});	1284	$self->CFPlus::UI::Container::add ($self->{close_button});
1102	}	1285	}
1103		1286
1104	$self	1287	$self
1105	}	1288	}
1106		1289
1107	sub add {	1290	sub add {
1108	my ($self, @widgets) = @_;	1291	my ($self, @widgets) = @_;
1109		1292
1110	$self->SUPER::add (@widgets);	1293	$self->SUPER::add (@widgets);
1111	$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};
1112	$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};
1113	}	1296	}
1114		1297
1115	sub border {	1298	sub border {
1116	int $_[0]{border} * $::FONTSIZE	1299	int $_[0]{border} * $::FONTSIZE
1117	}	1300	}
…		…
1150	$self->child->configure ($border, $border, $w, $h);	1333	$self->child->configure ($border, $border, $w, $h);
1151		1334
1152	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1335	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153	if $self->{close_button};	1336	if $self->{close_button};
1154		1337
		1338	1
		1339	}
		1340
		1341	sub invoke_delete {
		1342	my ($self) = @_;
		1343
		1344	$self->hide;
		1345
1155	1	1346	1
1156	}	1347	}
1157		1348
1158	sub invoke_button_down {	1349	sub invoke_button_down {
1159	my ($self, $ev, $x, $y) = @_;	1350	my ($self, $ev, $x, $y) = @_;
…		…
1217	$self->{motion}->($ev, $x, $y) if $self->{motion};	1408	$self->{motion}->($ev, $x, $y) if $self->{motion};
1218		1409
1219	! ! $self->{motion}	1410	! ! $self->{motion}
1220	}	1411	}
1221		1412
		1413	sub invoke_visibility_change {
		1414	my ($self, $visible) = @_;
		1415
		1416	delete $self->{motion} unless $visible;
		1417
		1418	0
		1419	}
		1420
1222	sub _draw {	1421	sub _draw {
1223	my ($self) = @_;	1422	my ($self) = @_;
1224		1423
1225	my $child = $self->{children}[0];	1424	my $child = $self->{children}[0];
1226		1425
…		…
1263	if $self->{close_button};	1462	if $self->{close_button};
1264	}	1463	}
1265		1464
1266	#############################################################################	1465	#############################################################################
1267		1466
1268	package CFClient::UI::Table;	1467	package CFPlus::UI::Table;
1269		1468
1270	our @ISA = CFClient::UI::Base::;	1469	our @ISA = CFPlus::UI::Base::;
1271		1470
1272	use List::Util qw(max sum);	1471	use List::Util qw(max sum);
1273		1472
1274	use CFClient::OpenGL;	1473	use CFPlus::OpenGL;
1275		1474
1276	sub new {	1475	sub new {
1277	my $class = shift;	1476	my $class = shift;
1278		1477
1279	$class->SUPER::new (	1478	$class->SUPER::new (
…		…
1285	sub children {	1484	sub children {
1286	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1485	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287	}	1486	}
1288		1487
1289	sub add {	1488	sub add {
1290	my ($self, $x, $y, $child) = @_;	1489	my ($self) = shift;
1291		1490
		1491	while (@_) {
		1492	my ($x, $y, $child) = splice @_, 0, 3, ();
1292	$child->set_parent ($self);	1493	$child->set_parent ($self);
1293	$self->{children}[$y][$x] = $child;	1494	$self->{children}[$y][$x] = $child;
		1495	}
1294		1496
		1497	$self->{force_realloc} = 1;
		1498	$self->{force_size_alloc} = 1;
1295	$self->realloc;	1499	$self->realloc;
1296	}	1500	}
1297		1501
1298	sub remove {	1502	sub remove {
1299	my ($self, $child) = @_;	1503	my ($self, $child) = @_;
…		…
1364		1568
1365	# linearly scale sizes	1569	# linearly scale sizes
1366	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1570	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1571	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368		1572
1369	CFClient::UI::harmonize $ws;	1573	CFPlus::UI::harmonize $ws;
1370	CFClient::UI::harmonize $hs;	1574	CFPlus::UI::harmonize $hs;
1371		1575
1372	my $y;	1576	my $y;
1373		1577
1374	for my $r (0 .. $#{$self->{children}}) {	1578	for my $r (0 .. $#{$self->{children}}) {
1375	my $row = $self->{children}[$r]	1579	my $row = $self->{children}[$r]
…		…
1418	}	1622	}
1419	}	1623	}
1420		1624
1421	#############################################################################	1625	#############################################################################
1422		1626
1423	package CFClient::UI::Box;	1627	package CFPlus::UI::Box;
1424		1628
1425	our @ISA = CFClient::UI::Container::;	1629	our @ISA = CFPlus::UI::Container::;
1426		1630
1427	sub size_request {	1631	sub size_request {
1428	my ($self) = @_;	1632	my ($self) = @_;
1429		1633
1430	$self->{vertical}	1634	$self->{vertical}
…		…
1463	$req[$_] += $space * $children[$_]{expand}	1667	$req[$_] += $space * $children[$_]{expand}
1464	for 0 .. $#children;	1668	for 0 .. $#children;
1465	}	1669	}
1466	}	1670	}
1467		1671
1468	CFClient::UI::harmonize \@req;	1672	CFPlus::UI::harmonize \@req;
1469		1673
1470	my $pos = 0;	1674	my $pos = 0;
1471	for (0 .. $#children) {	1675	for (0 .. $#children) {
1472	my $alloc = $req[$_];	1676	my $alloc = $req[$_];
1473	$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));
…		…
1478	1	1682	1
1479	}	1683	}
1480		1684
1481	#############################################################################	1685	#############################################################################
1482		1686
1483	package CFClient::UI::HBox;	1687	package CFPlus::UI::HBox;
1484		1688
1485	our @ISA = CFClient::UI::Box::;	1689	our @ISA = CFPlus::UI::Box::;
1486		1690
1487	sub new {	1691	sub new {
1488	my $class = shift;	1692	my $class = shift;
1489		1693
1490	$class->SUPER::new (	1694	$class->SUPER::new (
…		…
1493	)	1697	)
1494	}	1698	}
1495		1699
1496	#############################################################################	1700	#############################################################################
1497		1701
1498	package CFClient::UI::VBox;	1702	package CFPlus::UI::VBox;
1499		1703
1500	our @ISA = CFClient::UI::Box::;	1704	our @ISA = CFPlus::UI::Box::;
1501		1705
1502	sub new {	1706	sub new {
1503	my $class = shift;	1707	my $class = shift;
1504		1708
1505	$class->SUPER::new (	1709	$class->SUPER::new (
…		…
1508	)	1712	)
1509	}	1713	}
1510		1714
1511	#############################################################################	1715	#############################################################################
1512		1716
1513	package CFClient::UI::Label;	1717	package CFPlus::UI::Label;
1514		1718
1515	our @ISA = CFClient::UI::DrawBG::;	1719	our @ISA = CFPlus::UI::DrawBG::;
1516		1720
1517	use CFClient::OpenGL;	1721	use CFPlus::OpenGL;
1518		1722
1519	sub new {	1723	sub new {
1520	my ($class, %arg) = @_;	1724	my ($class, %arg) = @_;
1521		1725
1522	my $self = $class->SUPER::new (	1726	my $self = $class->SUPER::new (
…		…
1525	#active_bg => none	1729	#active_bg => none
1526	#font => default_font	1730	#font => default_font
1527	#text => initial text	1731	#text => initial text
1528	#markup => initial narkup	1732	#markup => initial narkup
1529	#max_w => maximum pixel width	1733	#max_w => maximum pixel width
		1734	#style => 0, # render flags
1530	ellipsise => 3, # end	1735	ellipsise => 3, # end
1531	layout => (new CFClient::Layout),	1736	layout => (new CFPlus::Layout),
1532	fontsize => 1,	1737	fontsize => 1,
1533	align => -1,	1738	align => -1,
1534	valign => -1,	1739	valign => -1,
1535	padding_x => 2,	1740	padding_x => 2,
1536	padding_y => 2,	1741	padding_y => 2,
1537	can_events => 0,	1742	can_events => 0,
1538	%arg	1743	%arg
1539	);	1744	);
1540		1745
1541	if (exists $self->{template}) {	1746	if (exists $self->{template}) {
1542	my $layout = new CFClient::Layout;	1747	my $layout = new CFPlus::Layout;
1543	$layout->set_text (delete $self->{template});	1748	$layout->set_text (delete $self->{template});
1544	$self->{template} = $layout;	1749	$self->{template} = $layout;
1545	}	1750	}
1546		1751
1547	if (exists $self->{markup}) {	1752	if (exists $self->{markup}) {
…		…
1551	}	1756	}
1552		1757
1553	$self	1758	$self
1554	}	1759	}
1555		1760
1556	sub escape($) {
1557	local $_ = $_[0];
1558
1559	s/&/&amp;/g;
1560	s/>/&gt;/g;
1561	s/</&lt;/g;
1562
1563	$_
1564	}
1565
1566	sub update {	1761	sub update {
1567	my ($self) = @_;	1762	my ($self) = @_;
1568		1763
1569	delete $self->{texture};	1764	delete $self->{texture};
1570	$self->SUPER::update;	1765	$self->SUPER::update;
…		…
1581	my ($self, $text) = @_;	1776	my ($self, $text) = @_;
1582		1777
1583	return if $self->{text} eq "T$text";	1778	return if $self->{text} eq "T$text";
1584	$self->{text} = "T$text";	1779	$self->{text} = "T$text";
1585		1780
1586	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587	$self->{layout}->set_text ($text);	1781	$self->{layout}->set_text ($text);
1588		1782
1589	delete $self->{size_req};	1783	delete $self->{size_req};
1590	$self->realloc;	1784	$self->realloc;
1591	$self->update;	1785	$self->update;
…		…
1597	return if $self->{text} eq "M$markup";	1791	return if $self->{text} eq "M$markup";
1598	$self->{text} = "M$markup";	1792	$self->{text} = "M$markup";
1599		1793
1600	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1794	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601		1795
1602	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603	$self->{layout}->set_markup ($markup);	1796	$self->{layout}->set_markup ($markup);
1604		1797
1605	delete $self->{size_req};	1798	delete $self->{size_req};
1606	$self->realloc;	1799	$self->realloc;
1607	$self->update;	1800	$self->update;
…		…
1619		1812
1620	my ($w, $h) = $self->{layout}->size;	1813	my ($w, $h) = $self->{layout}->size;
1621		1814
1622	if (exists $self->{template}) {	1815	if (exists $self->{template}) {
1623	$self->{template}->set_font ($self->{font}) if $self->{font};	1816	$self->{template}->set_font ($self->{font}) if $self->{font};
		1817	$self->{template}->set_width ($self->{max_w} || -1);
1624	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1818	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625		1819
1626	my ($w2, $h2) = $self->{template}->size;	1820	my ($w2, $h2) = $self->{template}->size;
1627		1821
1628	$w = List::Util::max $w, $w2;	1822	$w = List::Util::max $w, $w2;
…		…
1652		1846
1653	sub set_fontsize {	1847	sub set_fontsize {
1654	my ($self, $fontsize) = @_;	1848	my ($self, $fontsize) = @_;
1655		1849
1656	$self->{fontsize} = $fontsize;	1850	$self->{fontsize} = $fontsize;
		1851	delete $self->{size_req};
1657	delete $self->{texture};	1852	delete $self->{texture};
1658		1853
1659	$self->realloc;	1854	$self->realloc;
1660	}	1855	}
1661		1856
1662	sub reconfigure {	1857	sub reconfigure {
1663	my ($self) = @_;	1858	my ($self) = @_;
1664		1859
1665	delete $self->{size_req};	1860	delete $self->{size_req};
		1861	delete $self->{texture};
1666		1862
1667	$self->SUPER::reconfigure;	1863	$self->SUPER::reconfigure;
1668	}	1864	}
1669		1865
1670	sub _draw {	1866	sub _draw {
1671	my ($self) = @_;	1867	my ($self) = @_;
1672		1868
1673	$self->SUPER::_draw; # draw background, if applicable	1869	$self->SUPER::_draw; # draw background, if applicable
1674		1870
1675	my $tex = $self->{texture} ||= do {	1871	my $size = $self->{texture} ||= do {
1676	$self->{layout}->set_foreground (@{$self->{fg}});	1872	$self->{layout}->set_foreground (@{$self->{fg}});
1677	$self->{layout}->set_font ($self->{font}) if $self->{font};	1873	$self->{layout}->set_font ($self->{font}) if $self->{font};
1678	$self->{layout}->set_width ($self->{w});	1874	$self->{layout}->set_width ($self->{w});
1679	$self->{layout}->set_ellipsise ($self->{ellipsise});	1875	$self->{layout}->set_ellipsise ($self->{ellipsise});
1680	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1876	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1877	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682		1878
1683	new_from_layout CFClient::Texture $self->{layout}	1879	[$self->{layout}->size]
1684	};	1880	};
1685		1881
1686	unless (exists $self->{ox}) {	1882	unless (exists $self->{ox}) {
1687	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1883	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1884	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689	: ($self->{w} - $tex->{w}) * 0.5);	1885	: ($self->{w} - $size->[0]) * 0.5);
1690		1886
1691	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1887	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1888	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693	: ($self->{h} - $tex->{h}) * 0.5);	1889	: ($self->{h} - $size->[1]) * 0.5);
1694	};	1890	};
1695		1891
1696	glEnable GL_TEXTURE_2D;
1697
1698	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1892	my $w = List::Util::min $self->{w} + 4, $size->[0];
1699	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1893	my $h = List::Util::min $self->{h} + 2, $size->[1];
1700		1894
1701	if ($tex->{format} == GL_ALPHA) {	1895	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1702	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703	glColor @{$self->{fg}};
1704	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705	} else {
1706	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1707	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1708	}
1709
1710	glDisable GL_TEXTURE_2D;
1711	}	1896	}
1712		1897
1713	#############################################################################	1898	#############################################################################
1714		1899
1715	package CFClient::UI::EntryBase;	1900	package CFPlus::UI::EntryBase;
1716		1901
1717	our @ISA = CFClient::UI::Label::;	1902	our @ISA = CFPlus::UI::Label::;
1718		1903
1719	use CFClient::OpenGL;	1904	use CFPlus::OpenGL;
1720		1905
1721	sub new {	1906	sub new {
1722	my $class = shift;	1907	my $class = shift;
1723		1908
1724	$class->SUPER::new (	1909	$class->SUPER::new (
…		…
1786		1971
1787	if ($uni == 8) {	1972	if ($uni == 8) {
1788	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789	} elsif ($uni == 127) {	1974	} elsif ($uni == 127) {
1790	substr $text, $self->{cursor}, 1, "";	1975	substr $text, $self->{cursor}, 1, "";
1791	} elsif ($sym == CFClient::SDLK_LEFT) {	1976	} elsif ($sym == CFPlus::SDLK_LEFT) {
1792	--$self->{cursor} if $self->{cursor};	1977	--$self->{cursor} if $self->{cursor};
1793	} elsif ($sym == CFClient::SDLK_RIGHT) {	1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1794	++$self->{cursor} if $self->{cursor} < length $self->{text};	1979	++$self->{cursor} if $self->{cursor} < length $self->{text};
1795	} elsif ($sym == CFClient::SDLK_HOME) {	1980	} elsif ($sym == CFPlus::SDLK_HOME) {
1796	$self->{cursor} = 0;	1981	$self->{cursor} = 0;
1797	} elsif ($sym == CFClient::SDLK_END) {	1982	} elsif ($sym == CFPlus::SDLK_END) {
1798	$self->{cursor} = length $text;	1983	$self->{cursor} = length $text;
		1984	} elsif ($uni == 21) { # ctrl-u
		1985	$text = "";
		1986	$self->{cursor} = 0;
1799	} elsif ($uni == 27) {	1987	} elsif ($uni == 27) {
1800	$self->emit ('escape');	1988	$self->emit ('escape');
1801	} elsif ($uni) {	1989	} elsif ($uni) {
1802	substr $text, $self->{cursor}++, 0, chr $uni;	1990	substr $text, $self->{cursor}++, 0, chr $uni;
1803	} else {	1991	} else {
…		…
1826		2014
1827	my $idx = $self->{layout}->xy_to_index ($x, $y);	2015	my $idx = $self->{layout}->xy_to_index ($x, $y);
1828		2016
1829	# byte-index to char-index	2017	# byte-index to char-index
1830	my $text = $self->{text};	2018	my $text = $self->{text};
1831	utf8::encode $text;	2019	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832	$self->{cursor} = length substr $text, 0, $idx;	2020	$self->{cursor} = length $text;
1833		2021
1834	$self->_set_text ($self->{text});	2022	$self->_set_text ($self->{text});
1835	$self->update;	2023	$self->update;
1836		2024
1837	1	2025	1
…		…
1876	utf8::encode $text;	2064	utf8::encode $text;
1877		2065
1878	@$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)
1879	}	2067	}
1880		2068
1881	glColor @{$self->{fg}};
1882	glBegin GL_LINES;	2069	glBegin GL_LINES;
1883	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};
1884	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};
1885	glEnd;	2072	glEnd;
1886	}	2073	}
1887	}	2074	}
1888		2075
1889	package CFClient::UI::Entry;	2076	package CFPlus::UI::Entry;
1890		2077
1891	our @ISA = CFClient::UI::EntryBase::;	2078	our @ISA = CFPlus::UI::EntryBase::;
1892		2079
1893	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1894		2081
1895	sub invoke_key_down {	2082	sub invoke_key_down {
1896	my ($self, $ev) = @_;	2083	my ($self, $ev) = @_;
1897		2084
1898	my $sym = $ev->{sym};	2085	my $sym = $ev->{sym};
…		…
1904	$self->{history_pointer} = -1;	2091	$self->{history_pointer} = -1;
1905	$self->{history_saveback} = '';	2092	$self->{history_saveback} = '';
1906	$self->emit (activate => $txt);	2093	$self->emit (activate => $txt);
1907	$self->update;	2094	$self->update;
1908		2095
1909	} elsif ($sym == CFClient::SDLK_UP) {	2096	} elsif ($sym == CFPlus::SDLK_UP) {
1910	if ($self->{history_pointer} < 0) {	2097	if ($self->{history_pointer} < 0) {
1911	$self->{history_saveback} = $self->get_text;	2098	$self->{history_saveback} = $self->get_text;
1912	}	2099	}
1913	if (@{$self->{history} || []} > 0) {	2100	if (@{$self->{history} || []} > 0) {
1914	$self->{history_pointer}++;	2101	$self->{history_pointer}++;
…		…
1916	$self->{history_pointer} = @{$self->{history} || []} - 1;	2103	$self->{history_pointer} = @{$self->{history} || []} - 1;
1917	}	2104	}
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2105	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1919	}	2106	}
1920		2107
1921	} elsif ($sym == CFClient::SDLK_DOWN) {	2108	} elsif ($sym == CFPlus::SDLK_DOWN) {
1922	$self->{history_pointer}--;	2109	$self->{history_pointer}--;
1923	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2110	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924		2111
1925	if ($self->{history_pointer} >= 0) {	2112	if ($self->{history_pointer} >= 0) {
1926	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2113	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1935	1	2122	1
1936	}	2123	}
1937		2124
1938	#############################################################################	2125	#############################################################################
1939		2126
1940	package CFClient::UI::Button;	2127	package CFPlus::UI::Button;
1941		2128
1942	our @ISA = CFClient::UI::Label::;	2129	our @ISA = CFPlus::UI::Label::;
1943		2130
1944	use CFClient::OpenGL;	2131	use CFPlus::OpenGL;
1945		2132
1946	my @tex =	2133	my @tex =
1947	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2134	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948	qw(b1_button_active.png);	2135	qw(b1_button_active.png);
1949		2136
1950	sub new {	2137	sub new {
1951	my $class = shift;	2138	my $class = shift;
1952		2139
…		…
1989	$self->SUPER::_draw;	2176	$self->SUPER::_draw;
1990	}	2177	}
1991		2178
1992	#############################################################################	2179	#############################################################################
1993		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
1994	package CFClient::UI::ImageButton;	2330	package CFPlus::UI::ImageButton;
1995		2331
1996	our @ISA = CFClient::UI::Image::;	2332	our @ISA = CFPlus::UI::Image::;
1997		2333
1998	use CFClient::OpenGL;	2334	use CFPlus::OpenGL;
1999		2335
2000	my %textures;	2336	my %textures;
2001		2337
2002	sub new {	2338	sub new {
2003	my $class = shift;	2339	my $class = shift;
…		…
2025	1	2361	1
2026	}	2362	}
2027		2363
2028	#############################################################################	2364	#############################################################################
2029		2365
2030	package CFClient::UI::CheckBox;
2031
2032	our @ISA = CFClient::UI::DrawBG::;
2033
2034	my @tex =
2035	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038	use CFClient::OpenGL;
2039
2040	sub new {
2041	my $class = shift;
2042
2043	$class->SUPER::new (
2044	padding_x => 2,
2045	padding_y => 2,
2046	fg => [1, 1, 1],
2047	active_fg => [1, 1, 0],
2048	bg => [0, 0, 0, 0.2],
2049	active_bg => [1, 1, 1, 0.5],
2050	state => 0,
2051	can_hover => 1,
2052	@_
2053	)
2054	}
2055
2056	sub size_request {
2057	my ($self) = @_;
2058
2059	(6) x 2
2060	}
2061
2062	sub invoke_button_down {
2063	my ($self, $ev, $x, $y) = @_;
2064
2065	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067	$self->{state} = !$self->{state};
2068	$self->emit (changed => $self->{state});
2069	} else {
2070	return 0
2071	}
2072
2073	1
2074	}
2075
2076	sub _draw {
2077	my ($self) = @_;
2078
2079	$self->SUPER::_draw;
2080
2081	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2082
2083	my ($w, $h) = @$self{qw(w h)};
2084
2085	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2086
2087	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2088
2089	my $tex = $self->{state} ? $tex[1] : $tex[0];
2090
2091	glEnable GL_TEXTURE_2D;
2092	$tex->draw_quad_alpha (0, 0, $s, $s);
2093	glDisable GL_TEXTURE_2D;
2094	}
2095
2096	#############################################################################
2097
2098	package CFClient::UI::Image;	2366	package CFPlus::UI::VGauge;
2099		2367
2100	our @ISA = CFClient::UI::Base::;	2368	our @ISA = CFPlus::UI::Base::;
2101
2102	use CFClient::OpenGL;
2103
2104	our %texture_cache;
2105
2106	sub new {
2107	my $class = shift;
2108
2109	my $self = $class->SUPER::new (
2110	can_events => 0,
2111	@_,
2112	);
2113
2114	$self->{path}
2115	or Carp::croak "required attribute 'path' not set";
2116
2117	$self->{tex} = $texture_cache{$self->{path}} ||=
2118	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2119
2120	Scalar::Util::weaken $texture_cache{$self->{path}};
2121
2122	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2123
2124	$self
2125	}
2126
2127	sub size_request {
2128	my ($self) = @_;
2129
2130	($self->{tex}{w}, $self->{tex}{h})
2131	}
2132
2133	sub _draw {
2134	my ($self) = @_;
2135
2136	my $tex = $self->{tex};
2137
2138	my ($w, $h) = ($self->{w}, $self->{h});
2139
2140	if ($self->{rot90}) {
2141	glRotate 90, 0, 0, 1;
2142	glTranslate 0, -$self->{w}, 0;
2143
2144	($w, $h) = ($h, $w);
2145	}
2146
2147	glEnable GL_TEXTURE_2D;
2148	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2149
2150	$tex->draw_quad_alpha (0, 0, $w, $h);
2151
2152	glDisable GL_TEXTURE_2D;
2153	}
2154
2155	#############################################################################
2156
2157	package CFClient::UI::VGauge;
2158
2159	our @ISA = CFClient::UI::Base::;
2160		2369
2161	use List::Util qw(min max);	2370	use List::Util qw(min max);
2162		2371
2163	use CFClient::OpenGL;	2372	use CFPlus::OpenGL;
2164		2373
2165	my %tex = (	2374	my %tex = (
2166	food => [	2375	food => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2376	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2377	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169	],	2378	],
2170	grace => [	2379	grace => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2380	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172	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/
2173	],	2382	],
2174	hp => [	2383	hp => [
2175	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2384	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2385	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177	],	2386	],
2178	mana => [	2387	mana => [
2179	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2388	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2180	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/
2181	],	2390	],
2182	);	2391	);
2183		2392
2184	# eg. VGauge->new (gauge => 'food'), default gauge: food	2393	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2244	my $ycut1 = max 0, min 1, $ycut;	2453	my $ycut1 = max 0, min 1, $ycut;
2245	my $ycut2 = max 0, min 1, $ycut - 1;	2454	my $ycut2 = max 0, min 1, $ycut - 1;
2246		2455
2247	my $h1 = $self->{h} * (1 - $ycut1);	2456	my $h1 = $self->{h} * (1 - $ycut1);
2248	my $h2 = $self->{h} * (1 - $ycut2);	2457	my $h2 = $self->{h} * (1 - $ycut2);
		2458	my $h3 = $self->{h};
		2459
		2460	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249		2461
2250	glEnable GL_BLEND;	2462	glEnable GL_BLEND;
2251	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2463	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2464	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253	glEnable GL_TEXTURE_2D;	2465	glEnable GL_TEXTURE_2D;
…		…
2272		2484
2273	if ($t3) {	2485	if ($t3) {
2274	glBindTexture GL_TEXTURE_2D, $t3->{name};	2486	glBindTexture GL_TEXTURE_2D, $t3->{name};
2275	glBegin GL_QUADS;	2487	glBegin GL_QUADS;
2276	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2488	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2489	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2490	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2491	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280	glEnd;	2492	glEnd;
2281	}	2493	}
2282		2494
2283	glDisable GL_BLEND;	2495	glDisable GL_BLEND;
2284	glDisable GL_TEXTURE_2D;	2496	glDisable GL_TEXTURE_2D;
2285	}	2497	}
2286		2498
2287	#############################################################################	2499	#############################################################################
2288		2500
2289	package CFClient::UI::Gauge;	2501	package CFPlus::UI::Gauge;
2290		2502
2291	our @ISA = CFClient::UI::VBox::;	2503	our @ISA = CFPlus::UI::VBox::;
2292		2504
2293	sub new {	2505	sub new {
2294	my ($class, %arg) = @_;	2506	my ($class, %arg) = @_;
2295		2507
2296	my $self = $class->SUPER::new (	2508	my $self = $class->SUPER::new (
…		…
2298	can_hover => 1,	2510	can_hover => 1,
2299	can_events => 1,	2511	can_events => 1,
2300	%arg,	2512	%arg,
2301	);	2513	);
2302		2514
2303	$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");
2304	$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);
2305	$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");
2306		2518
2307	$self	2519	$self
2308	}	2520	}
2309		2521
2310	sub set_fontsize {	2522	sub set_fontsize {
…		…
2331	$self->{value}->set_text ($val);	2543	$self->{value}->set_text ($val);
2332	}	2544	}
2333		2545
2334	#############################################################################	2546	#############################################################################
2335		2547
2336	package CFClient::UI::Slider;	2548	package CFPlus::UI::Slider;
2337		2549
2338	use strict;	2550	use strict;
2339		2551
2340	use CFClient::OpenGL;	2552	use CFPlus::OpenGL;
2341		2553
2342	our @ISA = CFClient::UI::DrawBG::;	2554	our @ISA = CFPlus::UI::DrawBG::;
2343		2555
2344	my @tex =	2556	my @tex =
2345	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2557	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346	qw(s1_slider.png s1_slider_bg.png);	2558	qw(s1_slider.png s1_slider_bg.png);
2347		2559
2348	sub new {	2560	sub new {
2349	my $class = shift;	2561	my $class = shift;
2350		2562
…		…
2439	}	2651	}
2440		2652
2441	1	2653	1
2442	}	2654	}
2443		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
2444	sub update {	2666	sub update {
2445	my ($self) = @_;	2667	my ($self) = @_;
2446		2668
2447	delete $self->{knob_w};	2669	delete $self->{knob_w};
2448	$self->SUPER::update;	2670	$self->SUPER::update;
…		…
2495	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2496	}	2718	}
2497		2719
2498	#############################################################################	2720	#############################################################################
2499		2721
2500	package CFClient::UI::ValSlider;	2722	package CFPlus::UI::ValSlider;
2501		2723
2502	our @ISA = CFClient::UI::HBox::;	2724	our @ISA = CFPlus::UI::HBox::;
2503		2725
2504	sub new {	2726	sub new {
2505	my ($class, %arg) = @_;	2727	my ($class, %arg) = @_;
2506		2728
2507	my $range = delete $arg{range};	2729	my $range = delete $arg{range};
2508		2730
2509	my $self = $class->SUPER::new (	2731	my $self = $class->SUPER::new (
2510	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2732	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2733	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512	to_value => sub { shift },	2734	to_value => sub { shift },
2513	from_value => sub { shift },	2735	from_value => sub { shift },
2514	%arg,	2736	%arg,
2515	);	2737	);
2516		2738
…		…
2536	sub set_range { shift->{slider}->set_range (@_) }	2758	sub set_range { shift->{slider}->set_range (@_) }
2537	sub set_value { shift->{slider}->set_value (@_) }	2759	sub set_value { shift->{slider}->set_value (@_) }
2538		2760
2539	#############################################################################	2761	#############################################################################
2540		2762
2541	package CFClient::UI::TextScroller;	2763	package CFPlus::UI::TextScroller;
2542		2764
2543	our @ISA = CFClient::UI::HBox::;	2765	our @ISA = CFPlus::UI::HBox::;
2544		2766
2545	use CFClient::OpenGL;	2767	use CFPlus::OpenGL;
2546		2768
2547	sub new {	2769	sub new {
2548	my $class = shift;	2770	my $class = shift;
2549		2771
2550	my $self = $class->SUPER::new (	2772	my $self = $class->SUPER::new (
2551	fontsize => 1,	2773	fontsize => 1,
2552	can_events => 0,	2774	can_events => 1,
2553	indent => 0,	2775	indent => 0,
2554	#font => default_font	2776	#font => default_font
2555	@_,	2777	@_,
2556		2778
2557	layout => (new CFClient::Layout 1),	2779	layout => (new CFPlus::Layout),
2558	par => [],	2780	par => [],
2559	height => 0,	2781	height => 0,
2560	children => [	2782	children => [
2561	(new CFClient::UI::Empty expand => 1),	2783	(new CFPlus::UI::Empty expand => 1),
2562	(new CFClient::UI::Slider vertical => 1),	2784	(new CFPlus::UI::Slider vertical => 1),
2563	],	2785	],
2564	);	2786	);
2565		2787
2566	$self->{children}[1]->connect (changed => sub { $self->update });	2788	$self->{children}[1]->connect (changed => sub { $self->update });
2567		2789
…		…
2597		2819
2598	$self->reflow;	2820	$self->reflow;
2599		2821
2600	local $self->{children} = [$empty, $slider];	2822	local $self->{children} = [$empty, $slider];
2601	$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
2602	}	2834	}
2603		2835
2604	sub get_layout {	2836	sub get_layout {
2605	my ($self, $para) = @_;	2837	my ($self, $para) = @_;
2606		2838
…		…
2634		2866
2635	# todo: base offset on lines or so, not on pixels	2867	# todo: base offset on lines or so, not on pixels
2636	$self->{children}[1]->set_value ($offset);	2868	$self->{children}[1]->set_value ($offset);
2637	}	2869	}
2638		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
2639	sub clear {	2886	sub clear {
2640	my ($self) = @_;	2887	my ($self) = @_;
2641		2888
2642	my (undef, undef, @other) = @{ $self->{children} };	2889	my (undef, undef, @other) = @{ $self->{children} };
2643	$self->remove ($_) for @other;	2890	$self->remove ($_) for @other;
…		…
2646	$self->{height} = 0;	2893	$self->{height} = 0;
2647	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2894	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648	}	2895	}
2649		2896
2650	sub add_paragraph {	2897	sub add_paragraph {
2651	my ($self, $color, $para, $indent) = @_;	2898	my $self = shift;
2652		2899
2653	my ($text, @w) = ref $para ? @$para : $para;	2900	for my $para (@_) {
2654
2655	$para = {	2901	$para = {
		2902	fg => [1, 1, 1, 1],
		2903	indent => 0,
		2904	markup => "",
		2905	widget => [],
		2906	ref $para ? %$para : (markup => $para),
2656	w => 1e10,	2907	w => 1e10,
2657	wrapped => 1,	2908	wrapped => 1,
2658	fg => $color,
2659	indent => $indent,
2660	markup => $text,
2661	widget => \@w,
2662	};	2909	};
2663		2910
2664	$self->add (@w) if @w;	2911	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665	push @{$self->{par}}, $para;	2912	push @{$self->{par}}, $para;
		2913	}
2666		2914
2667	$self->{need_reflow}++;	2915	$self->{need_reflow}++;
2668	$self->update;	2916	$self->update;
2669	}	2917	}
2670		2918
2671	sub scroll_to_bottom {	2919	sub scroll_to_bottom {
2672	my ($self) = @_;	2920	my ($self) = @_;
2673		2921
2674	$self->{scroll_to_bottom} = 1;	2922	$self->{scroll_to} = $#{$self->{par}};
2675	$self->update;	2923	$self->update;
2676	}	2924	}
2677		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
2678	sub update {	2959	sub update {
2679	my ($self) = @_;	2960	my ($self) = @_;
2680		2961
2681	$self->SUPER::update;	2962	$self->SUPER::update;
2682		2963
2683	return unless $self->{h} > 0;	2964	return unless $self->{h} > 0;
2684		2965
2685	delete $self->{texture};	2966	delete $self->{texture};
2686		2967
2687	$ROOT->on_post_alloc ($self => sub {	2968	$ROOT->on_post_alloc ($self => sub {
		2969	$self->force_uptodate;
		2970
2688	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2971	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689		2972
2690	if (delete $self->{need_reflow}) {
2691	my $height = 0;
2692
2693	for my $para (@{$self->{par}}) {
2694	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2695	my $layout = $self->get_layout ($para);
2696	my ($w, $h) = $layout->size;
2697
2698	$para->{w} = $w + $para->{indent};
2699	$para->{h} = $h;
2700	$para->{wrapped} = $layout->has_wrapped;
2701	}
2702
2703	$height += $para->{h};
2704	}
2705
2706	$self->{height} = $height;
2707
2708	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2709
2710	delete $self->{texture};
2711	}
2712
2713	if (delete $self->{scroll_to_bottom}) {
2714	$self->{children}[1]->set_value (1e10);
2715	}
2716
2717	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2973	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718	glClearColor 0, 0, 0, 0;	2974	glClearColor 0, 0, 0, 0;
2719	glClear GL_COLOR_BUFFER_BIT;	2975	glClear GL_COLOR_BUFFER_BIT;
2720		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;
2721	my $top = int $self->{children}[1]{range}[0];	2985	my $top = int $self->{children}[1]{range}[0];
2722		2986
2723	my $y0 = $top;	2987	my $y0 = $top;
2724	my $y1 = $top + $H;	2988	my $y1 = $top + $H;
2725		2989
2726	my $y = 0;
2727
2728	glEnable GL_BLEND;
2729	#TODO# not correct in windows where rgba is forced off
2730	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2731
2732	for my $para (@{$self->{par}}) {	2990	for my $para (@{$self->{par}}) {
2733	my $h = $para->{h};	2991	my $h = $para->{h};
		2992	my $y = $para->{y};
2734		2993
2735	if ($y0 < $y + $h && $y < $y1) {	2994	if ($y0 < $y + $h && $y < $y1) {
2736
2737	my $layout = $self->get_layout ($para);	2995	my $layout = $self->get_layout ($para);
2738		2996
2739	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741	glRasterPos $para->{indent}, $y - $y0;	2997	$layout->render ($para->{indent}, $y - $y0);
2742	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743		2998
2744	if (my @w = @{ $para->{widget} }) {	2999	if (my @w = @{ $para->{widget} }) {
2745	my @s = $layout->get_shapes;	3000	my @s = $layout->get_shapes;
2746		3001
2747	glDisable GL_BLEND;
2748	for (@w) {	3002	for (@w) {
2749	my ($dx, $dy) = splice @s, 0, 2, ();	3003	my ($dx, $dy) = splice @s, 0, 2, ();
2750		3004
2751	$_->{x} = $dx + $para->{indent};	3005	$_->{x} = $dx + $para->{indent};
2752	$_->{y} = $dy + $y - $y0;	3006	$_->{y} = $dy + $y - $y0;
2753		3007
2754	$_->draw;	3008	$_->draw;
2755	}	3009	}
2756	glEnable GL_BLEND;
2757	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2758	}	3010	}
2759	}	3011	}
2760		3012
2761	$y += $h;	3013	$paridx++;
		3014	$top_paragraph ||= $paridx if $y >= $top;
2762	}	3015	}
2763		3016
2764	glDisable GL_BLEND;	3017	$self->{top_paragraph} = $top_paragraph;
2765	};	3018	};
2766	});	3019	});
2767	}	3020	}
2768		3021
2769	sub reconfigure {	3022	sub reconfigure {
…		…
2787	$self->{children}[1]->draw;	3040	$self->{children}[1]->draw;
2788	}	3041	}
2789		3042
2790	#############################################################################	3043	#############################################################################
2791		3044
2792	package CFClient::UI::Animator;	3045	package CFPlus::UI::Animator;
2793		3046
2794	use CFClient::OpenGL;	3047	use CFPlus::OpenGL;
2795		3048
2796	our @ISA = CFClient::UI::Bin::;	3049	our @ISA = CFPlus::UI::Bin::;
2797		3050
2798	sub moveto {	3051	sub moveto {
2799	my ($self, $x, $y) = @_;	3052	my ($self, $x, $y) = @_;
2800		3053
2801	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3054	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2829	glPopMatrix;	3082	glPopMatrix;
2830	}	3083	}
2831		3084
2832	#############################################################################	3085	#############################################################################
2833		3086
2834	package CFClient::UI::Flopper;	3087	package CFPlus::UI::Flopper;
2835		3088
2836	our @ISA = CFClient::UI::Button::;	3089	our @ISA = CFPlus::UI::Button::;
2837		3090
2838	sub new {	3091	sub new {
2839	my $class = shift;	3092	my $class = shift;
2840		3093
2841	my $self = $class->SUPER::new (	3094	my $self = $class->SUPER::new (
…		…
2853	$self->{other}->toggle_visibility;	3106	$self->{other}->toggle_visibility;
2854	}	3107	}
2855		3108
2856	#############################################################################	3109	#############################################################################
2857		3110
2858	package CFClient::UI::Tooltip;	3111	package CFPlus::UI::Tooltip;
2859		3112
2860	our @ISA = CFClient::UI::Bin::;	3113	our @ISA = CFPlus::UI::Bin::;
2861		3114
2862	use CFClient::OpenGL;	3115	use CFPlus::OpenGL;
2863		3116
2864	sub new {	3117	sub new {
2865	my $class = shift;	3118	my $class = shift;
2866		3119
2867	$class->SUPER::new (	3120	$class->SUPER::new (
…		…
2870	)	3123	)
2871	}	3124	}
2872		3125
2873	sub set_tooltip_from {	3126	sub set_tooltip_from {
2874	my ($self, $widget) = @_;	3127	my ($self, $widget) = @_;
		3128
		3129	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3130	if $widget->{tooltip} =~ /^#(.*)$/;
2875		3131
2876	my $tooltip = $widget->{tooltip};	3132	my $tooltip = $widget->{tooltip};
2877		3133
2878	if ($ENV{CFPLUS_DEBUG} & 2) {	3134	if ($ENV{CFPLUS_DEBUG} & 2) {
2879	$tooltip .= "\n\n" . (ref $widget) . "\n"	3135	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2883	}	3139	}
2884		3140
2885	$tooltip =~ s/^\n+//;	3141	$tooltip =~ s/^\n+//;
2886	$tooltip =~ s/\n+$//;	3142	$tooltip =~ s/\n+$//;
2887		3143
2888	$self->add (new CFClient::UI::Label	3144	$self->add (new CFPlus::UI::Label
2889	markup => $tooltip,	3145	markup => $tooltip,
2890	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3146	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891	fontsize => 0.8,	3147	fontsize => 0.8,
2892	fg => [0, 0, 0, 1],	3148	style => 1, # FLAG_INVERSE
2893	ellipsise => 0,	3149	ellipsise => 0,
2894	font => ($widget->{tooltip_font} || $::FONT_PROP),	3150	font => ($widget->{tooltip_font} || $::FONT_PROP),
2895	);	3151	);
2896	}	3152	}
2897		3153
…		…
2916		3172
2917	$self->{root}->on_post_alloc ("move_$self" => sub {	3173	$self->{root}->on_post_alloc ("move_$self" => sub {
2918	my $widget = $self->{owner}	3174	my $widget = $self->{owner}
2919	or return;	3175	or return;
2920		3176
		3177	if ($widget->{visible}) {
2921	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3178	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922		3179
2923	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3180	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924	if $x + $self->{w} > $self->{root}{w};	3181	if $x + $self->{w} > $self->{root}{w};
2925		3182
2926	$self->move_abs ($x, $y);	3183	$self->move_abs ($x, $y);
		3184	} else {
		3185	$self->hide;
		3186	}
2927	});	3187	});
2928	}	3188	}
2929		3189
2930	sub _draw {	3190	sub _draw {
2931	my ($self) = @_;	3191	my ($self) = @_;
…		…
2955	$self->SUPER::_draw;	3215	$self->SUPER::_draw;
2956	}	3216	}
2957		3217
2958	#############################################################################	3218	#############################################################################
2959		3219
2960	package CFClient::UI::Face;	3220	package CFPlus::UI::Face;
2961		3221
2962	our @ISA = CFClient::UI::Base::;	3222	our @ISA = CFPlus::UI::DrawBG::;
2963		3223
2964	use CFClient::OpenGL;	3224	use CFPlus::OpenGL;
2965		3225
2966	sub new {	3226	sub new {
2967	my $class = shift;	3227	my $class = shift;
2968		3228
2969	my $self = $class->SUPER::new (	3229	my $self = $class->SUPER::new (
…		…
3004	sub _draw {	3264	sub _draw {
3005	my ($self) = @_;	3265	my ($self) = @_;
3006		3266
3007	return unless $::CONN;	3267	return unless $::CONN;
3008		3268
		3269	$self->SUPER::_draw;
		3270
3009	my $face;	3271	my $face;
3010		3272
3011	if ($self->{frame}) {	3273	if ($self->{frame}) {
3012	my $anim = $::CONN->{anim}[$self->{anim}];	3274	my $anim = $::CONN->{anim}[$self->{anim}];
3013		3275
…		…
3035	$self->SUPER::destroy;	3297	$self->SUPER::destroy;
3036	}	3298	}
3037		3299
3038	#############################################################################	3300	#############################################################################
3039		3301
3040	package CFClient::UI::Buttonbar;	3302	package CFPlus::UI::Buttonbar;
3041		3303
3042	our @ISA = CFClient::UI::HBox::;	3304	our @ISA = CFPlus::UI::HBox::;
3043		3305
3044	# TODO: should actualyl wrap buttons and other goodies.	3306	# TODO: should actually wrap buttons and other goodies.
3045		3307
3046	#############################################################################	3308	#############################################################################
3047		3309
3048	package CFClient::UI::Menu;	3310	package CFPlus::UI::Menu;
3049		3311
3050	our @ISA = CFClient::UI::FancyFrame::;	3312	our @ISA = CFPlus::UI::Toplevel::;
3051		3313
3052	use CFClient::OpenGL;	3314	use CFPlus::OpenGL;
3053		3315
3054	sub new {	3316	sub new {
3055	my $class = shift;	3317	my $class = shift;
3056		3318
3057	my $self = $class->SUPER::new (	3319	my $self = $class->SUPER::new (
3058	items => [],	3320	items => [],
3059	z => 100,	3321	z => 100,
3060	@_,	3322	@_,
3061	);	3323	);
3062		3324
3063	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3325	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064		3326
3065	for my $item (@{ $self->{items} }) {	3327	for my $item (@{ $self->{items} }) {
3066	my ($widget, $cb, $tooltip) = @$item;	3328	my ($widget, $cb, $tooltip) = @$item;
3067		3329
3068	# handle various types of items, only text for now	3330	# handle various types of items, only text for now
3069	if (!ref $widget) {	3331	if (!ref $widget) {
		3332	if ($widget =~ /\t/) {
		3333	my ($left, $right) = split /\t/, $widget, 2;
		3334
3070	$widget = new CFClient::UI::Label	3335	$widget = new CFPlus::UI::HBox
3071	can_hover => 1,	3336	can_hover => 1,
3072	can_events => 1,	3337	can_events => 1,
		3338	tooltip => $tooltip,
		3339	children => [
		3340	(new CFPlus::UI::Label markup => $left, expand => 1),
		3341	(new CFPlus::UI::Label markup => $right, align => +1),
		3342	],
		3343	;
		3344
		3345	} else {
		3346	$widget = new CFPlus::UI::Label
		3347	can_hover => 1,
		3348	can_events => 1,
3073	markup => $widget,	3349	markup => $widget,
3074	tooltip => $tooltip	3350	tooltip => $tooltip;
		3351	}
3075	}	3352	}
3076		3353
3077	$self->{item}{$widget} = $item;	3354	$self->{item}{$widget} = $item;
3078		3355
3079	$self->{vbox}->add ($widget);	3356	$self->{vbox}->add ($widget);
…		…
3122	1	3399	1
3123	}	3400	}
3124		3401
3125	#############################################################################	3402	#############################################################################
3126		3403
3127	package CFClient::UI::Multiplexer;	3404	package CFPlus::UI::Multiplexer;
3128		3405
3129	our @ISA = CFClient::UI::Container::;	3406	our @ISA = CFPlus::UI::Container::;
3130		3407
3131	sub new {	3408	sub new {
3132	my $class = shift;	3409	my $class = shift;
3133		3410
3134	my $self = $class->SUPER::new (	3411	my $self = $class->SUPER::new (
…		…
3148		3425
3149	$self->{current} = $self->{children}[0]	3426	$self->{current} = $self->{children}[0]
3150	if @{ $self->{children} };	3427	if @{ $self->{children} };
3151	}	3428	}
3152		3429
		3430	sub get_current_page {
		3431	my ($self) = @_;
		3432
		3433	$self->{current}
		3434	}
		3435
3153	sub set_current_page {	3436	sub set_current_page {
3154	my ($self, $page_or_widget) = @_;	3437	my ($self, $page_or_widget) = @_;
3155		3438
3156	my $widget = ref $page_or_widget	3439	my $widget = ref $page_or_widget
3157	? $page_or_widget	3440	? $page_or_widget
…		…
3189	$self->{current}->draw;	3472	$self->{current}->draw;
3190	}	3473	}
3191		3474
3192	#############################################################################	3475	#############################################################################
3193		3476
3194	package CFClient::UI::Notebook;	3477	package CFPlus::UI::Notebook;
3195		3478
3196	our @ISA = CFClient::UI::VBox::;	3479	our @ISA = CFPlus::UI::VBox::;
3197		3480
3198	sub new {	3481	sub new {
3199	my $class = shift;	3482	my $class = shift;
3200		3483
3201	my $self = $class->SUPER::new (	3484	my $self = $class->SUPER::new (
3202	buttonbar => (new CFClient::UI::Buttonbar),	3485	buttonbar => (new CFPlus::UI::Buttonbar),
3203	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3486	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3204	# filter => # will be put between multiplexer and $self	3487	# filter => # will be put between multiplexer and $self
3205	@_,	3488	@_,
3206	);	3489	);
3207		3490
3208	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3491	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3214	sub add {	3497	sub add {
3215	my ($self, $title, $widget, $tooltip) = @_;	3498	my ($self, $title, $widget, $tooltip) = @_;
3216		3499
3217	Scalar::Util::weaken $self;	3500	Scalar::Util::weaken $self;
3218		3501
3219	$self->{buttonbar}->add (new CFClient::UI::Button	3502	$self->{buttonbar}->add (new CFPlus::UI::Button
3220	markup => $title,	3503	markup => $title,
3221	tooltip => $tooltip,	3504	tooltip => $tooltip,
3222	on_activate => sub { $self->set_current_page ($widget) },	3505	on_activate => sub { $self->set_current_page ($widget) },
3223	);	3506	);
3224		3507
3225	$self->{multiplexer}->add ($widget);	3508	$self->{multiplexer}->add ($widget);
3226	}	3509	}
3227		3510
		3511	sub get_current_page {
		3512	my ($self) = @_;
		3513
		3514	$self->{multiplexer}->get_current_page
		3515	}
		3516
3228	sub set_current_page {	3517	sub set_current_page {
3229	my ($self, $page) = @_;	3518	my ($self, $page) = @_;
3230		3519
3231	$self->{multiplexer}->set_current_page ($page);	3520	$self->{multiplexer}->set_current_page ($page);
3232	$self->emit (page_changed => $self->{multiplexer}{current});	3521	$self->emit (page_changed => $self->{multiplexer}{current});
3233	}	3522	}
3234		3523
3235	#############################################################################	3524	#############################################################################
3236		3525
3237	package CFClient::UI::Combobox;	3526	package CFPlus::UI::Selector;
3238		3527
3239	use utf8;	3528	use utf8;
3240		3529
3241	our @ISA = CFClient::UI::Button::;	3530	our @ISA = CFPlus::UI::Button::;
3242		3531
3243	sub new {	3532	sub new {
3244	my $class = shift;	3533	my $class = shift;
3245		3534
3246	my $self = $class->SUPER::new (	3535	my $self = $class->SUPER::new (
…		…
3263	my ($value, $title, $tooltip) = @$_;	3552	my ($value, $title, $tooltip) = @$_;
3264		3553
3265	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3554	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3266	}	3555	}
3267		3556
3268	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3557	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3269	}	3558	}
3270		3559
3271	sub _set_value {	3560	sub _set_value {
3272	my ($self, $value) = @_;	3561	my ($self, $value) = @_;
3273		3562
…		…
3288	$self->emit (changed => $value);	3577	$self->emit (changed => $value);
3289	}	3578	}
3290		3579
3291	#############################################################################	3580	#############################################################################
3292		3581
3293	package CFClient::UI::Statusbox;	3582	package CFPlus::UI::Statusbox;
3294		3583
3295	our @ISA = CFClient::UI::VBox::;	3584	our @ISA = CFPlus::UI::VBox::;
3296		3585
3297	sub new {	3586	sub new {
3298	my $class = shift;	3587	my $class = shift;
3299		3588
3300	my $self = $class->SUPER::new (	3589	my $self = $class->SUPER::new (
…		…
3312	sub reorder {	3601	sub reorder {
3313	my ($self) = @_;	3602	my ($self) = @_;
3314	my $NOW = Time::HiRes::time;	3603	my $NOW = Time::HiRes::time;
3315		3604
3316	# freeze display when hovering over any label	3605	# freeze display when hovering over any label
3317	return if $CFClient::UI::TOOLTIP->{owner}	3606	return if $CFPlus::UI::TOOLTIP->{owner}
3318	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3607	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3319	values %{ $self->{item} };	3608	values %{ $self->{item} };
3320		3609
3321	while (my ($k, $v) = each %{ $self->{item} }) {	3610	while (my ($k, $v) = each %{ $self->{item} }) {
3322	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3611	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3323	}	3612	}
…		…
3344	for ($short) {	3633	for ($short) {
3345	s/^\s+//;	3634	s/^\s+//;
3346	s/\s+/ /g;	3635	s/\s+/ /g;
3347	}	3636	}
3348		3637
3349	new CFClient::UI::Label	3638	new CFPlus::UI::Label
3350	markup => $short,	3639	markup => $short,
3351	tooltip => $item->{tooltip},	3640	tooltip => $item->{tooltip},
3352	tooltip_font => $::FONT_PROP,	3641	tooltip_font => $::FONT_PROP,
3353	tooltip_width => 0.67,	3642	tooltip_width => 0.67,
3354	fontsize => $item->{fontsize} || $self->{fontsize},	3643	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3408	count => 1,	3697	count => 1,
3409	%arg,	3698	%arg,
3410	};	3699	};
3411	}	3700	}
3412		3701
		3702	$ROOT->on_refresh (reorder => sub {
3413	$self->reorder;	3703	$self->reorder;
		3704	});
3414	}	3705	}
3415		3706
3416	sub reconfigure {	3707	sub reconfigure {
3417	my ($self) = @_;	3708	my ($self) = @_;
3418		3709
…		…
3431	$self->SUPER::destroy;	3722	$self->SUPER::destroy;
3432	}	3723	}
3433		3724
3434	#############################################################################	3725	#############################################################################
3435		3726
3436	package CFClient::UI::Inventory;	3727	package CFPlus::UI::Inventory;
3437		3728
3438	our @ISA = CFClient::UI::ScrolledWindow::;	3729	our @ISA = CFPlus::UI::Table::;
3439		3730
3440	sub new {	3731	sub new {
3441	my $class = shift;	3732	my $class = shift;
3442		3733
3443	my $self = $class->SUPER::new (	3734	my $self = $class->SUPER::new (
3444	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3735	col_expand => [0, 1, 0],
		3736	items => [],
3445	@_,	3737	@_,
3446	);	3738	);
3447		3739
		3740	$self->set_sort_order (undef);
		3741
3448	$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;
3449	}	3778	}
3450		3779
3451	sub set_items {	3780	sub set_items {
3452	my ($self, $items) = @_;	3781	my ($self, $items) = @_;
3453		3782
3454	$self->{child}->clear;	3783	$self->{items} = [$items ? values %$items : ()];
3455	return unless $items;	3784	$self->update_items;
3456
3457	my @items = sort {
3458	($a->{type} <=> $b->{type})
3459	or ($a->{name} cmp $b->{name})
3460	} @$items;
3461
3462	$self->{real_items} = \@items;
3463
3464	my $row = 0;
3465	for my $item (@items) {
3466	CFClient::Item::update_widgets $item;
3467
3468	$self->{child}->add (0, $row, $item->{face_widget});
3469	$self->{child}->add (1, $row, $item->{desc_widget});
3470	$self->{child}->add (2, $row, $item->{weight_widget});
3471
3472	$row++;
3473	}
3474	}	3785	}
3475		3786
3476	#############################################################################	3787	#############################################################################
3477		3788
3478	package CFClient::UI::BindEditor;
3479
3480	our @ISA = CFClient::UI::FancyFrame::;
3481
3482	sub new {
3483	my $class = shift;
3484
3485	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3486
3487	$self->add (my $vb = new CFClient::UI::VBox);
3488
3489
3490	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3491	text => "start recording",
3492	tooltip => "Start/Stops recording of actions."
3493	."All subsequent actions after the recording started will be captured."
3494	."The actions are displayed after the record was stopped."
3495	."To bind the action you have to click on the 'Bind' button",
3496	on_activate => sub {
3497	unless ($self->{recording}) {
3498	$self->start;
3499	} else {
3500	$self->stop;
3501	}
3502	});
3503
3504	$vb->add (new CFClient::UI::Label text => "Actions:");
3505	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3506
3507	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3508	$vb->add (my $hb = new CFClient::UI::HBox);
3509	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3510	$hb->add (new CFClient::UI::Button
3511	text => "bind",
3512	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3513	on_activate => sub {
3514	$self->ask_for_bind;
3515	});
3516
3517	$vb->add (my $hb = new CFClient::UI::HBox);
3518	$hb->add (new CFClient::UI::Button
3519	text => "ok",
3520	expand => 1,
3521	tooltip => "This closes the binding editor and saves the binding",
3522	on_activate => sub {
3523	$self->hide;
3524	$self->commit;
3525	});
3526
3527	$hb->add (new CFClient::UI::Button
3528	text => "cancel",
3529	expand => 1,
3530	tooltip => "This closes the binding editor without saving",
3531	on_activate => sub {
3532	$self->hide;
3533	$self->{binding_cancel}->()
3534	if $self->{binding_cancel};
3535	});
3536
3537	$self->update_binding_widgets;
3538
3539	$self
3540	}
3541
3542	sub cfg_bind {
3543	my ($self, $mod, $sym, $cmds) = @_;
3544	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3545	::update_bindings ();
3546	}
3547
3548	sub cfg_unbind {
3549	my ($self, $mod, $sym, $cmds) = @_;
3550	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3551	::update_bindings ();
3552	}
3553
3554	sub commit {
3555	my ($self) = @_;
3556	my ($mod, $sym, $cmds) = $self->get_binding;
3557	if ($sym != 0 && @$cmds > 0) {
3558	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3559	."'. Don't forget 'Save Config'!");
3560	$self->{binding_change}->($mod, $sym, $cmds)
3561	if $self->{binding_change};
3562	} else {
3563	$::STATUSBOX->add ("No action bound, no key or action specified!");
3564	$self->{binding_cancel}->()
3565	if $self->{binding_cancel};
3566	}
3567	}
3568
3569	sub start {
3570	my ($self) = @_;
3571
3572	$self->{rec_btn}->set_text ("stop recording");
3573	$self->{recording} = 1;
3574	$self->clear_command_list;
3575	$::CONN->start_record if $::CONN;
3576	}
3577
3578	sub stop {
3579	my ($self) = @_;
3580
3581	$self->{rec_btn}->set_text ("start recording");
3582	$self->{recording} = 0;
3583
3584	my $rec;
3585	$rec = $::CONN->stop_record if $::CONN;
3586	return unless ref $rec eq 'ARRAY';
3587	$self->set_command_list ($rec);
3588	}
3589
3590
3591	sub ask_for_bind_and_commit {
3592	my ($self) = @_;
3593	$self->ask_for_bind (1);
3594	}
3595
3596	sub ask_for_bind {
3597	my ($self, $commit, $end_cb) = @_;
3598
3599	CFClient::Binder::open_binding_dialog (sub {
3600	my ($mod, $sym) = @_;
3601	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3602	$self->update_binding_widgets;
3603	$self->commit if $commit;
3604	$end_cb->() if $end_cb;
3605	});
3606	}
3607
3608	# $mod and $sym are the modifiers and key symbol
3609	# $cmds is a array ref of strings (the commands)
3610	# $cb is the callback that is executed on OK
3611	# $ccb is the callback that is executed on CANCEL and
3612	# when the binding was unsuccessful on OK
3613	sub set_binding {
3614	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3615
3616	$self->clear_command_list;
3617	$self->{recording} = 0;
3618	$self->{rec_btn}->set_text ("start recording");
3619
3620	$self->{binding} = [$mod, $sym];
3621	$self->{commands} = $cmds;
3622
3623	$self->{binding_change} = $cb;
3624	$self->{binding_cancel} = $ccb;
3625
3626	$self->update_binding_widgets;
3627	}
3628
3629	# this is a shortcut method that asks for a binding
3630	# and then just binds it.
3631	sub do_quick_binding {
3632	my ($self, $cmds, $end_cb) = @_;
3633	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3634	$self->ask_for_bind (1, $end_cb);
3635	}
3636
3637	sub update_binding_widgets {
3638	my ($self) = @_;
3639	my ($mod, $sym, $cmds) = $self->get_binding;
3640	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3641	$self->set_command_list ($cmds);
3642	}
3643
3644	sub get_binding {
3645	my ($self) = @_;
3646	return (
3647	$self->{binding}->[0],
3648	$self->{binding}->[1],
3649	[ grep { defined $_ } @{$self->{commands}} ]
3650	);
3651	}
3652
3653	sub clear_command_list {
3654	my ($self) = @_;
3655	$self->{cmdbox}->clear ();
3656	}
3657
3658	sub set_command_list {
3659	my ($self, $cmds) = @_;
3660
3661	$self->{cmdbox}->clear ();
3662	$self->{commands} = $cmds;
3663
3664	my $idx = 0;
3665
3666	for (@$cmds) {
3667	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3668
3669	my $i = $idx;
3670	$hb->add (new CFClient::UI::Label text => $_);
3671	$hb->add (new CFClient::UI::Button
3672	text => "delete",
3673	tooltip => "Deletes the action from the record",
3674	on_activate => sub {
3675	$self->{cmdbox}->remove ($hb);
3676	$cmds->[$i] = undef;
3677	});
3678
3679
3680	$idx++
3681	}
3682	}
3683
3684	#############################################################################
3685
3686	package CFClient::UI::SpellList;	3789	package CFPlus::UI::SpellList;
3687		3790
3688	our @ISA = CFClient::UI::Table::;	3791	our @ISA = CFPlus::UI::Table::;
3689		3792
3690	sub new {	3793	sub new {
3691	my $class = shift;	3794	my $class = shift;
3692		3795
3693	my $self = $class->SUPER::new (	3796	my $self = $class->SUPER::new (
…		…
3711	"<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");
3712		3815
3713	sub rebuild_spell_list {	3816	sub rebuild_spell_list {
3714	my ($self) = @_;	3817	my ($self) = @_;
3715		3818
3716	$CFClient::UI::ROOT->on_refresh ($self => sub {	3819	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3717	$self->clear;	3820	$self->clear;
3718		3821
3719	return unless $::CONN;	3822	return unless $::CONN;
3720		3823
3721	$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);
3722	$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);
3723	$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);
3724	$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);
3725	$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);
3726		3829
3727	my $row = 0;	3830	my $row = 0;
3728		3831
3729	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3832	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3730	my $spell = $self->{spell}{$_};	3833	my $spell = $self->{spell}{$_};
…		…
3737	if ($ev->{button} == 1) {	3840	if ($ev->{button} == 1) {
3738	$::CONN->user_send ("cast $spell->{name}");	3841	$::CONN->user_send ("cast $spell->{name}");
3739	} elsif ($ev->{button} == 2) {	3842	} elsif ($ev->{button} == 2) {
3740	$::CONN->user_send ("invoke $spell->{name}");	3843	$::CONN->user_send ("invoke $spell->{name}");
3741	} elsif ($ev->{button} == 3) {	3844	} elsif ($ev->{button} == 3) {
3742	(new CFClient::UI::Menu	3845	(new CFPlus::UI::Menu
3743	items => [	3846	items => [
3744	["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}"]) }],
3745	["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}"]) }],
3746	],	3849	],
3747	)->popup ($ev);	3850	)->popup ($ev);
3748	} else {	3851	} else {
3749	return 0;	3852	return 0;
3750	}	3853	}
3751		3854
3752	1	3855	1
3753	};	3856	};
3754		3857
3755	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3858	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3756		3859
3757	#TODO: add path info to tooltip	3860	#TODO: add path info to tooltip
3758	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3861	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3759		3862
3760	$self->add (0, $row, new CFClient::UI::Face	3863	$self->add (0, $row, new CFPlus::UI::Face
3761	face => $spell->{face},	3864	face => $spell->{face},
3762	can_hover => 1,	3865	can_hover => 1,
3763	can_events => 1,	3866	can_events => 1,
3764	tooltip => $tooltip,	3867	tooltip => $tooltip,
3765	on_button_down => $spell_cb,	3868	on_button_down => $spell_cb,
3766	);	3869	);
3767		3870
3768	$self->add (1, $row, new CFClient::UI::Label	3871	$self->add (1, $row, new CFPlus::UI::Label
3769	expand => 1,	3872	expand => 1,
3770	text => $spell->{name},	3873	text => $spell->{name},
3771	can_hover => 1,	3874	can_hover => 1,
3772	can_events => 1,	3875	can_events => 1,
3773	tooltip => $tooltip,	3876	tooltip => $tooltip,
3774	on_button_down => $spell_cb,	3877	on_button_down => $spell_cb,
3775	);	3878	);
3776		3879
3777	$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);
3778	$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);
3779	$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);
3780	$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);
3781	}	3884	}
3782	});	3885	});
3783	}	3886	}
3784		3887
3785	sub add_spell {	3888	sub add_spell {
…		…
3803	$self->rebuild_spell_list;	3906	$self->rebuild_spell_list;
3804	}	3907	}
3805		3908
3806	#############################################################################	3909	#############################################################################
3807		3910
3808	package CFClient::UI::Root;	3911	package CFPlus::UI::Root;
3809		3912
3810	our @ISA = CFClient::UI::Container::;	3913	our @ISA = CFPlus::UI::Container::;
3811		3914
3812	use List::Util qw(min max);	3915	use List::Util qw(min max);
3813		3916
3814	use CFClient::OpenGL;	3917	use CFPlus::OpenGL;
3815		3918
3816	sub new {	3919	sub new {
3817	my $class = shift;	3920	my $class = shift;
3818		3921
3819	my $self = $class->SUPER::new (	3922	my $self = $class->SUPER::new (
…		…
3995	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4098	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3996		4099
3997	$w = 0 if $w < 0;	4100	$w = 0 if $w < 0;
3998	$h = 0 if $h < 0;	4101	$h = 0 if $h < 0;
3999		4102
		4103	$w = max $widget->{min_w}, $w;
		4104	$h = max $widget->{min_h}, $h;
		4105
		4106	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4107	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4108
		4109	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4110	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4111
4000	$w = int $w + 0.5;	4112	$w = int $w + 0.5;
4001	$h = int $h + 0.5;	4113	$h = int $h + 0.5;
4002		4114
4003	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4115	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4004	$widget->{old_w} = $widget->{w};	4116	$widget->{old_w} = $widget->{w};
…		…
4027	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4139	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4028	glMatrixMode GL_MODELVIEW;	4140	glMatrixMode GL_MODELVIEW;
4029	glLoadIdentity;	4141	glLoadIdentity;
4030		4142
4031	{	4143	{
4032	package CFClient::UI::Base;	4144	package CFPlus::UI::Base;
4033		4145
4034	($draw_x, $draw_y, $draw_w, $draw_h) =	4146	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4035	(0, 0, $self->{w}, $self->{h});	4147	(0, 0, $self->{w}, $self->{h});
4036	}
4037		4148
4038	$self->_draw;	4149	$self->_draw;
		4150	}
4039	}	4151	}
4040		4152
4041	#############################################################################	4153	#############################################################################
4042		4154
4043	package CFClient::UI;	4155	package CFPlus::UI;
4044		4156
4045	$ROOT = new CFClient::UI::Root;	4157	$ROOT = new CFPlus::UI::Root;
4046	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4158	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4047		4159
4048	1	4160	1
4049		4161

Diff Legend

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