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.346 by root, Mon Aug 14 01:21:02 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 dislike duplication
		520	# and needlessly verbose code, too.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
479	#d##TODO# stop propagating at first true, do not use sum	528	#d##TODO# stop propagating at first true, do not use sum
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483	}	532	}
484		533
485	sub find_widget {	534	sub find_widget {
486	my ($self, $x, $y) = @_;	535	my ($self, $x, $y) = @_;
487		536
…		…
571	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
574	glEnd;	623	glEnd;
575	glPopMatrix;	624	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}	626	}
578		627
579	$self->_draw;	628	$self->_draw;
580	glPopMatrix;	629	glPopMatrix;
581	}	630	}
…		…
587	}	636	}
588		637
589	sub DESTROY {	638	sub DESTROY {
590	my ($self) = @_;	639	my ($self) = @_;
591		640
		641	return if CFPlus::in_destruct;
		642
592	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
593		644
594	eval { $self->destroy };	645	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596	}	647	}
597		648
598	#############################################################################	649	#############################################################################
599		650
600	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
601		652
602	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
603		654
604	use strict;	655	use strict;
605	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
606		657
607	sub new {	658	sub new {
608	my $class = shift;	659	my $class = shift;
609		660
610	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
641	}	692	}
642	}	693	}
643		694
644	#############################################################################	695	#############################################################################
645		696
646	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
647		698
648	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
649		700
650	sub new {	701	sub new {
651	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
653	}	704	}
…		…
660		711
661	sub draw { }	712	sub draw { }
662		713
663	#############################################################################	714	#############################################################################
664		715
665	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
666		717
667	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
668		719
669	sub new {	720	sub new {
670	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
671		722
672	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
681	if $children;	732	if $children;
682		733
683	$self	734	$self
684	}	735	}
685		736
		737	sub realloc {
		738	my ($self) = @_;
		739
		740	$self->{force_realloc} = 1;
		741	$self->{force_size_alloc} = 1;
		742	$self->SUPER::realloc;
		743	}
		744
686	sub add {	745	sub add {
687	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
688		747
689	$_->set_parent ($self)	748	$_->set_parent ($self)
690	for @widgets;	749	for @widgets;
…		…
750	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
751	}	810	}
752		811
753	#############################################################################	812	#############################################################################
754		813
755	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
756		815
757	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
758		817
759	sub new {	818	sub new {
760	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
761		820
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		822
764	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
765	}	824	}
766		825
767	sub add {	826	sub add {
…		…
774	sub remove {	833	sub remove {
775	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
776		835
777	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
778		837
779	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	839	unless @{$self->{children}};
781	}	840	}
782		841
783	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
784		843
…		…
796		855
797	#############################################################################	856	#############################################################################
798		857
799	# back-buffered drawing area	858	# back-buffered drawing area
800		859
801	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
802		861
803	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
804		863
805	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
806		865
807	sub new {	866	sub new {
808	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
809		868
810	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
832	}	891	}
833		892
834	sub render_child {	893	sub render_child {
835	my ($self) = @_;	894	my ($self) = @_;
836		895
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	896	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
840		899
841	{	900	{
842	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
843		902
844	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
846	}	905	}
847		906
…		…
850	}	909	}
851		910
852	sub _draw {	911	sub _draw {
853	my ($self) = @_;	912	my ($self) = @_;
854		913
855	my ($w, $h) = @$self{qw(w h)};
856
857	my $tex = $self->{texture}	914	my $tex = $self->{texture}
858	or return;	915	or return;
859		916
860	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
863		920
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
865		922
866	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
867	}	924	}
868		925
869	#############################################################################	926	#############################################################################
870		927
871	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
872		929
873	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
874		931
875	sub new {	932	sub new {
876	my $class = shift;	933	my $class = shift;
877		934
878	$class->SUPER::new (	935	$class->SUPER::new (
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	997	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	999	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1001	}
945	}	1002	}
946		1003
947	sub _render {	1004	sub _render {
948	my ($self) = @_;	1005	my ($self) = @_;
949		1006
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1007	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1008	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1009
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1011
955	$self->SUPER::_render;	1012	$self->SUPER::_render;
956	}	1013	}
957		1014
958	#############################################################################	1015	#############################################################################
959		1016
960	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
961		1018
962	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
963		1020
964	sub new {	1021	sub new {
965	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
966		1023
967	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
968		1025
969	my $self;	1026	my $self;
970		1027
971	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
972	vertical => 1,	1029	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1031	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
976	},	1033	},
977	;	1034	;
978		1035
979	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
		1038	can_events => 1,
981	slider => $slider,	1039	slider => $slider,
982	%arg,	1040	%arg,
983	);	1041	);
984		1042
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1043	$self->SUPER::add ($self->{vp}, $self->{slider});
986	$self->add ($child) if $child;	1044	$self->add ($child) if $child;
987		1045
988	$self	1046	$self
989	}	1047	}
990		1048
		1049	#TODO# update range on size_allocate depending on child
		1050
991	sub add {	1051	sub add {
992	my ($self, $widget) = @_;	1052	my ($self, $widget) = @_;
993		1053
994	$self->{vp}->add ($self->{child} = $widget);	1054	$self->{vp}->add ($self->{child} = $widget);
995	}	1055	}
996		1056
		1057	sub invoke_mouse_wheel {
		1058	my ($self, $ev) = @_;
		1059
		1060	return 0 unless $ev->{dy}; # only vertical movements
		1061
		1062	$self->{slider}->emit (mouse_wheel => $ev);
		1063
		1064	1
		1065	}
		1066
		1067	sub update_slider {
		1068	my ($self) = @_;
		1069
		1070	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1071	}
		1072
997	sub update {	1073	sub update {
998	my ($self) = @_;	1074	my ($self) = @_;
999		1075
1000	$self->SUPER::update;	1076	$self->SUPER::update;
1001		1077
1002	# todo: overwrite size_allocate of child	1078	$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	}	1079	}
1006		1080
1007	sub invoke_size_allocate {	1081	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1082	my ($self, $w, $h) = @_;
1009		1083
1010	my $child = $self->{vp}->child;	1084	$self->update_slider;
1011	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012		1085
1013	$self->SUPER::invoke_size_allocate ($w, $h)	1086	$self->SUPER::invoke_size_allocate ($w, $h)
1014	}	1087	}
1015		1088
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018
1019	#############################################################################	1089	#############################################################################
1020		1090
1021	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
1022		1092
1023	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
1024		1094
1025	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
1026		1096
1027	sub new {	1097	sub new {
1028	my $class = shift;	1098	my $class = shift;
1029		1099
1030	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
1056	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
1057	}	1127	}
1058		1128
1059	#############################################################################	1129	#############################################################################
1060		1130
1061	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
1062		1132
1063	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
1064		1134
1065	use CFClient::OpenGL;	1135	use CFPlus::OpenGL;
		1136
		1137	sub new {
		1138	my ($class, %arg) = @_;
		1139
		1140	if ((exists $arg{label}) && !ref $arg{label}) {
		1141	$arg{label} = new CFPlus::UI::Label
		1142	align => 1,
		1143	valign => 1,
		1144	text => $arg{label},
		1145	fontsize => ($arg{border} || 0.8) * 0.75;
		1146	}
		1147
		1148	my $self = $class->SUPER::new (
		1149	# label => "",
		1150	fg => [0.6, 0.3, 0.1],
		1151	border => 0.8,
		1152	style => 'single',
		1153	%arg,
		1154	);
		1155
		1156	$self
		1157	}
		1158
		1159	sub add {
		1160	my ($self, @widgets) = @_;
		1161
		1162	$self->SUPER::add (@widgets);
		1163	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1164	}
		1165
		1166	sub border {
		1167	int $_[0]{border} * $::FONTSIZE
		1168	}
		1169
		1170	sub size_request {
		1171	my ($self) = @_;
		1172
		1173	($self->{label_w}, undef) = $self->{label}->size_request
		1174	if $self->{label};
		1175
		1176	my ($w, $h) = $self->SUPER::size_request;
		1177
		1178	(
		1179	$w + $self->border * 2,
		1180	$h + $self->border * 2,
		1181	)
		1182	}
		1183
		1184	sub invoke_size_allocate {
		1185	my ($self, $w, $h) = @_;
		1186
		1187	my $border = $self->border;
		1188
		1189	$w -= List::Util::max 0, $border * 2;
		1190	$h -= List::Util::max 0, $border * 2;
		1191
		1192	if (my $label = $self->{label}) {
		1193	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1194	$label->{h} = List::Util::min $h, $border;
		1195	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1196	}
		1197
		1198	$self->child->configure ($border, $border, $w, $h);
		1199
		1200	1
		1201	}
		1202
		1203	sub _draw {
		1204	my ($self) = @_;
		1205
		1206	my $child = $self->{children}[0];
		1207
		1208	my $border = $self->border;
		1209	my ($w, $h) = ($self->{w}, $self->{h});
		1210
		1211	$child->draw;
		1212
		1213	glColor @{$self->{fg}};
		1214	glBegin GL_LINE_STRIP;
		1215	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1216	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1217	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1218	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1219	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1220	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1221	glEnd;
		1222
		1223	if ($self->{label}) {
		1224	glTranslate $border * 2, 0;
		1225	$self->{label}->_draw;
		1226	}
		1227	}
		1228
		1229	#############################################################################
		1230
		1231	package CFPlus::UI::Toplevel;
		1232
		1233	our @ISA = CFPlus::UI::Bin::;
		1234
		1235	use CFPlus::OpenGL;
1066		1236
1067	my $bg =	1237	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1238	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1239	mipmap => 1, wrap => 1;
1070		1240
1071	my @border =	1241	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1242	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);	1243	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074		1244
1075	sub new {	1245	sub new {
1076	my ($class, %arg) = @_;	1246	my ($class, %arg) = @_;
1077		1247
1078	my $self = $class->SUPER::new (	1248	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1249	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1250	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1251	border => 0.6,
1082	can_events => 1,	1252	can_events => 1,
1083	min_w => 16,	1253	min_w => 64,
1084	min_h => 16,	1254	min_h => 32,
1085	%arg,	1255	%arg,
1086	);	1256	);
1087		1257
1088	$self->{title_widget} = new CFClient::UI::Label	1258	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1259	align => 0,
1090	valign => 1,	1260	valign => 1,
1091	text => $self->{title},	1261	text => $self->{title},
1092	fontsize => $self->{border},	1262	fontsize => $self->{border},
1093	if exists $self->{title};	1263	if exists $self->{title};
1094		1264
1095	if ($self->{has_close_button}) {	1265	if ($self->{has_close_button}) {
1096	$self->{close_button} =	1266	$self->{close_button} =
1097	new CFClient::UI::ImageButton	1267	new CFPlus::UI::ImageButton
1098	path => 'x1_close.png',	1268	path => 'x1_close.png',
1099	on_activate => sub { $self->hide };	1269	on_activate => sub { $self->emit ("delete") };
1100		1270
1101	$self->CFClient::UI::Container::add ($self->{close_button});	1271	$self->CFPlus::UI::Container::add ($self->{close_button});
1102	}	1272	}
1103		1273
1104	$self	1274	$self
1105	}	1275	}
1106		1276
1107	sub add {	1277	sub add {
1108	my ($self, @widgets) = @_;	1278	my ($self, @widgets) = @_;
1109		1279
1110	$self->SUPER::add (@widgets);	1280	$self->SUPER::add (@widgets);
1111	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1281	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1282	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113	}	1283	}
1114		1284
1115	sub border {	1285	sub border {
1116	int $_[0]{border} * $::FONTSIZE	1286	int $_[0]{border} * $::FONTSIZE
1117	}	1287	}
…		…
1150	$self->child->configure ($border, $border, $w, $h);	1320	$self->child->configure ($border, $border, $w, $h);
1151		1321
1152	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1322	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153	if $self->{close_button};	1323	if $self->{close_button};
1154		1324
		1325	1
		1326	}
		1327
		1328	sub invoke_delete {
		1329	my ($self) = @_;
		1330
		1331	$self->hide;
		1332
1155	1	1333	1
1156	}	1334	}
1157		1335
1158	sub invoke_button_down {	1336	sub invoke_button_down {
1159	my ($self, $ev, $x, $y) = @_;	1337	my ($self, $ev, $x, $y) = @_;
…		…
1217	$self->{motion}->($ev, $x, $y) if $self->{motion};	1395	$self->{motion}->($ev, $x, $y) if $self->{motion};
1218		1396
1219	! ! $self->{motion}	1397	! ! $self->{motion}
1220	}	1398	}
1221		1399
		1400	sub invoke_visibility_change {
		1401	my ($self, $visible) = @_;
		1402
		1403	delete $self->{motion} unless $visible;
		1404
		1405	0
		1406	}
		1407
1222	sub _draw {	1408	sub _draw {
1223	my ($self) = @_;	1409	my ($self) = @_;
1224		1410
1225	my $child = $self->{children}[0];	1411	my $child = $self->{children}[0];
1226		1412
…		…
1263	if $self->{close_button};	1449	if $self->{close_button};
1264	}	1450	}
1265		1451
1266	#############################################################################	1452	#############################################################################
1267		1453
1268	package CFClient::UI::Table;	1454	package CFPlus::UI::Table;
1269		1455
1270	our @ISA = CFClient::UI::Base::;	1456	our @ISA = CFPlus::UI::Base::;
1271		1457
1272	use List::Util qw(max sum);	1458	use List::Util qw(max sum);
1273		1459
1274	use CFClient::OpenGL;	1460	use CFPlus::OpenGL;
1275		1461
1276	sub new {	1462	sub new {
1277	my $class = shift;	1463	my $class = shift;
1278		1464
1279	$class->SUPER::new (	1465	$class->SUPER::new (
…		…
1285	sub children {	1471	sub children {
1286	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287	}	1473	}
1288		1474
1289	sub add {	1475	sub add {
1290	my ($self, $x, $y, $child) = @_;	1476	my ($self) = shift;
1291		1477
		1478	while (@_) {
		1479	my ($x, $y, $child) = splice @_, 0, 3, ();
1292	$child->set_parent ($self);	1480	$child->set_parent ($self);
1293	$self->{children}[$y][$x] = $child;	1481	$self->{children}[$y][$x] = $child;
		1482	}
1294		1483
		1484	$self->{force_realloc} = 1;
		1485	$self->{force_size_alloc} = 1;
1295	$self->realloc;	1486	$self->realloc;
1296	}	1487	}
1297		1488
1298	sub remove {	1489	sub remove {
1299	my ($self, $child) = @_;	1490	my ($self, $child) = @_;
…		…
1364		1555
1365	# linearly scale sizes	1556	# linearly scale sizes
1366	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368		1559
1369	CFClient::UI::harmonize $ws;	1560	CFPlus::UI::harmonize $ws;
1370	CFClient::UI::harmonize $hs;	1561	CFPlus::UI::harmonize $hs;
1371		1562
1372	my $y;	1563	my $y;
1373		1564
1374	for my $r (0 .. $#{$self->{children}}) {	1565	for my $r (0 .. $#{$self->{children}}) {
1375	my $row = $self->{children}[$r]	1566	my $row = $self->{children}[$r]
…		…
1418	}	1609	}
1419	}	1610	}
1420		1611
1421	#############################################################################	1612	#############################################################################
1422		1613
1423	package CFClient::UI::Box;	1614	package CFPlus::UI::Box;
1424		1615
1425	our @ISA = CFClient::UI::Container::;	1616	our @ISA = CFPlus::UI::Container::;
1426		1617
1427	sub size_request {	1618	sub size_request {
1428	my ($self) = @_;	1619	my ($self) = @_;
1429		1620
1430	$self->{vertical}	1621	$self->{vertical}
…		…
1463	$req[$_] += $space * $children[$_]{expand}	1654	$req[$_] += $space * $children[$_]{expand}
1464	for 0 .. $#children;	1655	for 0 .. $#children;
1465	}	1656	}
1466	}	1657	}
1467		1658
1468	CFClient::UI::harmonize \@req;	1659	CFPlus::UI::harmonize \@req;
1469		1660
1470	my $pos = 0;	1661	my $pos = 0;
1471	for (0 .. $#children) {	1662	for (0 .. $#children) {
1472	my $alloc = $req[$_];	1663	my $alloc = $req[$_];
1473	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1664	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1478	1	1669	1
1479	}	1670	}
1480		1671
1481	#############################################################################	1672	#############################################################################
1482		1673
1483	package CFClient::UI::HBox;	1674	package CFPlus::UI::HBox;
1484		1675
1485	our @ISA = CFClient::UI::Box::;	1676	our @ISA = CFPlus::UI::Box::;
1486		1677
1487	sub new {	1678	sub new {
1488	my $class = shift;	1679	my $class = shift;
1489		1680
1490	$class->SUPER::new (	1681	$class->SUPER::new (
…		…
1493	)	1684	)
1494	}	1685	}
1495		1686
1496	#############################################################################	1687	#############################################################################
1497		1688
1498	package CFClient::UI::VBox;	1689	package CFPlus::UI::VBox;
1499		1690
1500	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1501		1692
1502	sub new {	1693	sub new {
1503	my $class = shift;	1694	my $class = shift;
1504		1695
1505	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1508	)	1699	)
1509	}	1700	}
1510		1701
1511	#############################################################################	1702	#############################################################################
1512		1703
1513	package CFClient::UI::Label;	1704	package CFPlus::UI::Label;
1514		1705
1515	our @ISA = CFClient::UI::DrawBG::;	1706	our @ISA = CFPlus::UI::DrawBG::;
1516		1707
1517	use CFClient::OpenGL;	1708	use CFPlus::OpenGL;
1518		1709
1519	sub new {	1710	sub new {
1520	my ($class, %arg) = @_;	1711	my ($class, %arg) = @_;
1521		1712
1522	my $self = $class->SUPER::new (	1713	my $self = $class->SUPER::new (
…		…
1525	#active_bg => none	1716	#active_bg => none
1526	#font => default_font	1717	#font => default_font
1527	#text => initial text	1718	#text => initial text
1528	#markup => initial narkup	1719	#markup => initial narkup
1529	#max_w => maximum pixel width	1720	#max_w => maximum pixel width
		1721	#style => 0, # render flags
1530	ellipsise => 3, # end	1722	ellipsise => 3, # end
1531	layout => (new CFClient::Layout),	1723	layout => (new CFPlus::Layout),
1532	fontsize => 1,	1724	fontsize => 1,
1533	align => -1,	1725	align => -1,
1534	valign => -1,	1726	valign => -1,
1535	padding_x => 2,	1727	padding_x => 2,
1536	padding_y => 2,	1728	padding_y => 2,
1537	can_events => 0,	1729	can_events => 0,
1538	%arg	1730	%arg
1539	);	1731	);
1540		1732
1541	if (exists $self->{template}) {	1733	if (exists $self->{template}) {
1542	my $layout = new CFClient::Layout;	1734	my $layout = new CFPlus::Layout;
1543	$layout->set_text (delete $self->{template});	1735	$layout->set_text (delete $self->{template});
1544	$self->{template} = $layout;	1736	$self->{template} = $layout;
1545	}	1737	}
1546		1738
1547	if (exists $self->{markup}) {	1739	if (exists $self->{markup}) {
…		…
1551	}	1743	}
1552		1744
1553	$self	1745	$self
1554	}	1746	}
1555		1747
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 {	1748	sub update {
1567	my ($self) = @_;	1749	my ($self) = @_;
1568		1750
1569	delete $self->{texture};	1751	delete $self->{texture};
1570	$self->SUPER::update;	1752	$self->SUPER::update;
…		…
1581	my ($self, $text) = @_;	1763	my ($self, $text) = @_;
1582		1764
1583	return if $self->{text} eq "T$text";	1765	return if $self->{text} eq "T$text";
1584	$self->{text} = "T$text";	1766	$self->{text} = "T$text";
1585		1767
1586	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587	$self->{layout}->set_text ($text);	1768	$self->{layout}->set_text ($text);
1588		1769
1589	delete $self->{size_req};	1770	delete $self->{size_req};
1590	$self->realloc;	1771	$self->realloc;
1591	$self->update;	1772	$self->update;
…		…
1597	return if $self->{text} eq "M$markup";	1778	return if $self->{text} eq "M$markup";
1598	$self->{text} = "M$markup";	1779	$self->{text} = "M$markup";
1599		1780
1600	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1781	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601		1782
1602	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603	$self->{layout}->set_markup ($markup);	1783	$self->{layout}->set_markup ($markup);
1604		1784
1605	delete $self->{size_req};	1785	delete $self->{size_req};
1606	$self->realloc;	1786	$self->realloc;
1607	$self->update;	1787	$self->update;
…		…
1619		1799
1620	my ($w, $h) = $self->{layout}->size;	1800	my ($w, $h) = $self->{layout}->size;
1621		1801
1622	if (exists $self->{template}) {	1802	if (exists $self->{template}) {
1623	$self->{template}->set_font ($self->{font}) if $self->{font};	1803	$self->{template}->set_font ($self->{font}) if $self->{font};
		1804	$self->{template}->set_width ($self->{max_w} || -1);
1624	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1805	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625		1806
1626	my ($w2, $h2) = $self->{template}->size;	1807	my ($w2, $h2) = $self->{template}->size;
1627		1808
1628	$w = List::Util::max $w, $w2;	1809	$w = List::Util::max $w, $w2;
…		…
1652		1833
1653	sub set_fontsize {	1834	sub set_fontsize {
1654	my ($self, $fontsize) = @_;	1835	my ($self, $fontsize) = @_;
1655		1836
1656	$self->{fontsize} = $fontsize;	1837	$self->{fontsize} = $fontsize;
		1838	delete $self->{size_req};
1657	delete $self->{texture};	1839	delete $self->{texture};
1658		1840
1659	$self->realloc;	1841	$self->realloc;
1660	}	1842	}
1661		1843
1662	sub reconfigure {	1844	sub reconfigure {
1663	my ($self) = @_;	1845	my ($self) = @_;
1664		1846
1665	delete $self->{size_req};	1847	delete $self->{size_req};
		1848	delete $self->{texture};
1666		1849
1667	$self->SUPER::reconfigure;	1850	$self->SUPER::reconfigure;
1668	}	1851	}
1669		1852
1670	sub _draw {	1853	sub _draw {
1671	my ($self) = @_;	1854	my ($self) = @_;
1672		1855
1673	$self->SUPER::_draw; # draw background, if applicable	1856	$self->SUPER::_draw; # draw background, if applicable
1674		1857
1675	my $tex = $self->{texture} ||= do {	1858	my $size = $self->{texture} ||= do {
1676	$self->{layout}->set_foreground (@{$self->{fg}});	1859	$self->{layout}->set_foreground (@{$self->{fg}});
1677	$self->{layout}->set_font ($self->{font}) if $self->{font};	1860	$self->{layout}->set_font ($self->{font}) if $self->{font};
1678	$self->{layout}->set_width ($self->{w});	1861	$self->{layout}->set_width ($self->{w});
1679	$self->{layout}->set_ellipsise ($self->{ellipsise});	1862	$self->{layout}->set_ellipsise ($self->{ellipsise});
1680	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1863	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1864	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682		1865
1683	new_from_layout CFClient::Texture $self->{layout}	1866	[$self->{layout}->size]
1684	};	1867	};
1685		1868
1686	unless (exists $self->{ox}) {	1869	unless (exists $self->{ox}) {
1687	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1870	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1871	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689	: ($self->{w} - $tex->{w}) * 0.5);	1872	: ($self->{w} - $size->[0]) * 0.5);
1690		1873
1691	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1874	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1875	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693	: ($self->{h} - $tex->{h}) * 0.5);	1876	: ($self->{h} - $size->[1]) * 0.5);
1694	};	1877	};
1695		1878
1696	glEnable GL_TEXTURE_2D;
1697
1698	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1879	my $w = List::Util::min $self->{w} + 4, $size->[0];
1699	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1880	my $h = List::Util::min $self->{h} + 2, $size->[1];
1700		1881
1701	if ($tex->{format} == GL_ALPHA) {	1882	$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	}	1883	}
1712		1884
1713	#############################################################################	1885	#############################################################################
1714		1886
1715	package CFClient::UI::EntryBase;	1887	package CFPlus::UI::EntryBase;
1716		1888
1717	our @ISA = CFClient::UI::Label::;	1889	our @ISA = CFPlus::UI::Label::;
1718		1890
1719	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1720		1892
1721	sub new {	1893	sub new {
1722	my $class = shift;	1894	my $class = shift;
1723		1895
1724	$class->SUPER::new (	1896	$class->SUPER::new (
…		…
1786		1958
1787	if ($uni == 8) {	1959	if ($uni == 8) {
1788	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1960	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789	} elsif ($uni == 127) {	1961	} elsif ($uni == 127) {
1790	substr $text, $self->{cursor}, 1, "";	1962	substr $text, $self->{cursor}, 1, "";
1791	} elsif ($sym == CFClient::SDLK_LEFT) {	1963	} elsif ($sym == CFPlus::SDLK_LEFT) {
1792	--$self->{cursor} if $self->{cursor};	1964	--$self->{cursor} if $self->{cursor};
1793	} elsif ($sym == CFClient::SDLK_RIGHT) {	1965	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1794	++$self->{cursor} if $self->{cursor} < length $self->{text};	1966	++$self->{cursor} if $self->{cursor} < length $self->{text};
1795	} elsif ($sym == CFClient::SDLK_HOME) {	1967	} elsif ($sym == CFPlus::SDLK_HOME) {
1796	$self->{cursor} = 0;	1968	$self->{cursor} = 0;
1797	} elsif ($sym == CFClient::SDLK_END) {	1969	} elsif ($sym == CFPlus::SDLK_END) {
1798	$self->{cursor} = length $text;	1970	$self->{cursor} = length $text;
1799	} elsif ($uni == 27) {	1971	} elsif ($uni == 27) {
1800	$self->emit ('escape');	1972	$self->emit ('escape');
1801	} elsif ($uni) {	1973	} elsif ($uni) {
1802	substr $text, $self->{cursor}++, 0, chr $uni;	1974	substr $text, $self->{cursor}++, 0, chr $uni;
…		…
1826		1998
1827	my $idx = $self->{layout}->xy_to_index ($x, $y);	1999	my $idx = $self->{layout}->xy_to_index ($x, $y);
1828		2000
1829	# byte-index to char-index	2001	# byte-index to char-index
1830	my $text = $self->{text};	2002	my $text = $self->{text};
1831	utf8::encode $text;	2003	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832	$self->{cursor} = length substr $text, 0, $idx;	2004	$self->{cursor} = length $text;
1833		2005
1834	$self->_set_text ($self->{text});	2006	$self->_set_text ($self->{text});
1835	$self->update;	2007	$self->update;
1836		2008
1837	1	2009	1
…		…
1876	utf8::encode $text;	2048	utf8::encode $text;
1877		2049
1878	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2050	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879	}	2051	}
1880		2052
1881	glColor @{$self->{fg}};
1882	glBegin GL_LINES;	2053	glBegin GL_LINES;
1883	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2054	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1884	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2055	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885	glEnd;	2056	glEnd;
1886	}	2057	}
1887	}	2058	}
1888		2059
1889	package CFClient::UI::Entry;	2060	package CFPlus::UI::Entry;
1890		2061
1891	our @ISA = CFClient::UI::EntryBase::;	2062	our @ISA = CFPlus::UI::EntryBase::;
1892		2063
1893	use CFClient::OpenGL;	2064	use CFPlus::OpenGL;
1894		2065
1895	sub invoke_key_down {	2066	sub invoke_key_down {
1896	my ($self, $ev) = @_;	2067	my ($self, $ev) = @_;
1897		2068
1898	my $sym = $ev->{sym};	2069	my $sym = $ev->{sym};
…		…
1904	$self->{history_pointer} = -1;	2075	$self->{history_pointer} = -1;
1905	$self->{history_saveback} = '';	2076	$self->{history_saveback} = '';
1906	$self->emit (activate => $txt);	2077	$self->emit (activate => $txt);
1907	$self->update;	2078	$self->update;
1908		2079
1909	} elsif ($sym == CFClient::SDLK_UP) {	2080	} elsif ($sym == CFPlus::SDLK_UP) {
1910	if ($self->{history_pointer} < 0) {	2081	if ($self->{history_pointer} < 0) {
1911	$self->{history_saveback} = $self->get_text;	2082	$self->{history_saveback} = $self->get_text;
1912	}	2083	}
1913	if (@{$self->{history} || []} > 0) {	2084	if (@{$self->{history} || []} > 0) {
1914	$self->{history_pointer}++;	2085	$self->{history_pointer}++;
…		…
1916	$self->{history_pointer} = @{$self->{history} || []} - 1;	2087	$self->{history_pointer} = @{$self->{history} || []} - 1;
1917	}	2088	}
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2089	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1919	}	2090	}
1920		2091
1921	} elsif ($sym == CFClient::SDLK_DOWN) {	2092	} elsif ($sym == CFPlus::SDLK_DOWN) {
1922	$self->{history_pointer}--;	2093	$self->{history_pointer}--;
1923	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2094	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924		2095
1925	if ($self->{history_pointer} >= 0) {	2096	if ($self->{history_pointer} >= 0) {
1926	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2097	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1935	1	2106	1
1936	}	2107	}
1937		2108
1938	#############################################################################	2109	#############################################################################
1939		2110
1940	package CFClient::UI::Button;	2111	package CFPlus::UI::Button;
1941		2112
1942	our @ISA = CFClient::UI::Label::;	2113	our @ISA = CFPlus::UI::Label::;
1943		2114
1944	use CFClient::OpenGL;	2115	use CFPlus::OpenGL;
1945		2116
1946	my @tex =	2117	my @tex =
1947	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2118	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948	qw(b1_button_active.png);	2119	qw(b1_button_active.png);
1949		2120
1950	sub new {	2121	sub new {
1951	my $class = shift;	2122	my $class = shift;
1952		2123
…		…
1989	$self->SUPER::_draw;	2160	$self->SUPER::_draw;
1990	}	2161	}
1991		2162
1992	#############################################################################	2163	#############################################################################
1993		2164
		2165	package CFPlus::UI::CheckBox;
		2166
		2167	our @ISA = CFPlus::UI::DrawBG::;
		2168
		2169	my @tex =
		2170	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2171	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2172
		2173	use CFPlus::OpenGL;
		2174
		2175	sub new {
		2176	my $class = shift;
		2177
		2178	$class->SUPER::new (
		2179	padding_x => 2,
		2180	padding_y => 2,
		2181	fg => [1, 1, 1],
		2182	active_fg => [1, 1, 0],
		2183	bg => [0, 0, 0, 0.2],
		2184	active_bg => [1, 1, 1, 0.5],
		2185	state => 0,
		2186	can_hover => 1,
		2187	@_
		2188	)
		2189	}
		2190
		2191	sub size_request {
		2192	my ($self) = @_;
		2193
		2194	(6) x 2
		2195	}
		2196
		2197	sub toggle {
		2198	my ($self) = @_;
		2199
		2200	$self->{state} = !$self->{state};
		2201	$self->emit (changed => $self->{state});
		2202	$self->update;
		2203	}
		2204
		2205	sub invoke_button_down {
		2206	my ($self, $ev, $x, $y) = @_;
		2207
		2208	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2209	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2210	$self->toggle;
		2211	} else {
		2212	return 0
		2213	}
		2214
		2215	1
		2216	}
		2217
		2218	sub _draw {
		2219	my ($self) = @_;
		2220
		2221	$self->SUPER::_draw;
		2222
		2223	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2224
		2225	my ($w, $h) = @$self{qw(w h)};
		2226
		2227	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2228
		2229	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2230
		2231	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2232
		2233	glEnable GL_TEXTURE_2D;
		2234	$tex->draw_quad_alpha (0, 0, $s, $s);
		2235	glDisable GL_TEXTURE_2D;
		2236	}
		2237
		2238	#############################################################################
		2239
		2240	package CFPlus::UI::Image;
		2241
		2242	our @ISA = CFPlus::UI::Base::;
		2243
		2244	use CFPlus::OpenGL;
		2245
		2246	our %texture_cache;
		2247
		2248	sub new {
		2249	my $class = shift;
		2250
		2251	my $self = $class->SUPER::new (
		2252	can_events => 0,
		2253	@_,
		2254	);
		2255
		2256	$self->{path} || $self->{tex}
		2257	or Carp::croak "'path' or 'tex' attributes required";
		2258
		2259	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2260	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2261
		2262	Scalar::Util::weaken $texture_cache{$self->{path}};
		2263
		2264	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2265
		2266	$self
		2267	}
		2268
		2269	sub STORABLE_freeze {
		2270	my ($self, $cloning) = @_;
		2271
		2272	$self->{path}
		2273	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2274
		2275	$self->{path}
		2276	}
		2277
		2278	sub STORABLE_attach {
		2279	my ($self, $cloning, $path) = @_;
		2280
		2281	$self->new (path => $path)
		2282	}
		2283
		2284	sub size_request {
		2285	my ($self) = @_;
		2286
		2287	($self->{tex}{w}, $self->{tex}{h})
		2288	}
		2289
		2290	sub _draw {
		2291	my ($self) = @_;
		2292
		2293	my $tex = $self->{tex};
		2294
		2295	my ($w, $h) = ($self->{w}, $self->{h});
		2296
		2297	if ($self->{rot90}) {
		2298	glRotate 90, 0, 0, 1;
		2299	glTranslate 0, -$self->{w}, 0;
		2300
		2301	($w, $h) = ($h, $w);
		2302	}
		2303
		2304	glEnable GL_TEXTURE_2D;
		2305	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2306
		2307	$tex->draw_quad (0, 0, $w, $h);
		2308
		2309	glDisable GL_TEXTURE_2D;
		2310	}
		2311
		2312	#############################################################################
		2313
1994	package CFClient::UI::ImageButton;	2314	package CFPlus::UI::ImageButton;
1995		2315
1996	our @ISA = CFClient::UI::Image::;	2316	our @ISA = CFPlus::UI::Image::;
1997		2317
1998	use CFClient::OpenGL;	2318	use CFPlus::OpenGL;
1999		2319
2000	my %textures;	2320	my %textures;
2001		2321
2002	sub new {	2322	sub new {
2003	my $class = shift;	2323	my $class = shift;
…		…
2025	1	2345	1
2026	}	2346	}
2027		2347
2028	#############################################################################	2348	#############################################################################
2029		2349
2030	package CFClient::UI::CheckBox;
2031
2032	our @ISA = CFClient::UI::DrawBG::;
2033
2034	my @tex =
2035	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038	use CFClient::OpenGL;
2039
2040	sub new {
2041	my $class = shift;
2042
2043	$class->SUPER::new (
2044	padding_x => 2,
2045	padding_y => 2,
2046	fg => [1, 1, 1],
2047	active_fg => [1, 1, 0],
2048	bg => [0, 0, 0, 0.2],
2049	active_bg => [1, 1, 1, 0.5],
2050	state => 0,
2051	can_hover => 1,
2052	@_
2053	)
2054	}
2055
2056	sub size_request {
2057	my ($self) = @_;
2058
2059	(6) x 2
2060	}
2061
2062	sub 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;	2350	package CFPlus::UI::VGauge;
2099		2351
2100	our @ISA = CFClient::UI::Base::;	2352	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		2353
2161	use List::Util qw(min max);	2354	use List::Util qw(min max);
2162		2355
2163	use CFClient::OpenGL;	2356	use CFPlus::OpenGL;
2164		2357
2165	my %tex = (	2358	my %tex = (
2166	food => [	2359	food => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2360	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2361	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169	],	2362	],
2170	grace => [	2363	grace => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2364	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/	2365	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173	],	2366	],
2174	hp => [	2367	hp => [
2175	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2368	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2369	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177	],	2370	],
2178	mana => [	2371	mana => [
2179	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2372	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/	2373	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181	],	2374	],
2182	);	2375	);
2183		2376
2184	# eg. VGauge->new (gauge => 'food'), default gauge: food	2377	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2244	my $ycut1 = max 0, min 1, $ycut;	2437	my $ycut1 = max 0, min 1, $ycut;
2245	my $ycut2 = max 0, min 1, $ycut - 1;	2438	my $ycut2 = max 0, min 1, $ycut - 1;
2246		2439
2247	my $h1 = $self->{h} * (1 - $ycut1);	2440	my $h1 = $self->{h} * (1 - $ycut1);
2248	my $h2 = $self->{h} * (1 - $ycut2);	2441	my $h2 = $self->{h} * (1 - $ycut2);
		2442	my $h3 = $self->{h};
		2443
		2444	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249		2445
2250	glEnable GL_BLEND;	2446	glEnable GL_BLEND;
2251	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2447	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2448	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253	glEnable GL_TEXTURE_2D;	2449	glEnable GL_TEXTURE_2D;
…		…
2272		2468
2273	if ($t3) {	2469	if ($t3) {
2274	glBindTexture GL_TEXTURE_2D, $t3->{name};	2470	glBindTexture GL_TEXTURE_2D, $t3->{name};
2275	glBegin GL_QUADS;	2471	glBegin GL_QUADS;
2276	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2472	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2473	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2474	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2475	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280	glEnd;	2476	glEnd;
2281	}	2477	}
2282		2478
2283	glDisable GL_BLEND;	2479	glDisable GL_BLEND;
2284	glDisable GL_TEXTURE_2D;	2480	glDisable GL_TEXTURE_2D;
2285	}	2481	}
2286		2482
2287	#############################################################################	2483	#############################################################################
2288		2484
2289	package CFClient::UI::Gauge;	2485	package CFPlus::UI::Gauge;
2290		2486
2291	our @ISA = CFClient::UI::VBox::;	2487	our @ISA = CFPlus::UI::VBox::;
2292		2488
2293	sub new {	2489	sub new {
2294	my ($class, %arg) = @_;	2490	my ($class, %arg) = @_;
2295		2491
2296	my $self = $class->SUPER::new (	2492	my $self = $class->SUPER::new (
…		…
2298	can_hover => 1,	2494	can_hover => 1,
2299	can_events => 1,	2495	can_events => 1,
2300	%arg,	2496	%arg,
2301	);	2497	);
2302		2498
2303	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2499	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2304	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2500	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2305	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2501	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306		2502
2307	$self	2503	$self
2308	}	2504	}
2309		2505
2310	sub set_fontsize {	2506	sub set_fontsize {
…		…
2331	$self->{value}->set_text ($val);	2527	$self->{value}->set_text ($val);
2332	}	2528	}
2333		2529
2334	#############################################################################	2530	#############################################################################
2335		2531
2336	package CFClient::UI::Slider;	2532	package CFPlus::UI::Slider;
2337		2533
2338	use strict;	2534	use strict;
2339		2535
2340	use CFClient::OpenGL;	2536	use CFPlus::OpenGL;
2341		2537
2342	our @ISA = CFClient::UI::DrawBG::;	2538	our @ISA = CFPlus::UI::DrawBG::;
2343		2539
2344	my @tex =	2540	my @tex =
2345	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2541	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346	qw(s1_slider.png s1_slider_bg.png);	2542	qw(s1_slider.png s1_slider_bg.png);
2347		2543
2348	sub new {	2544	sub new {
2349	my $class = shift;	2545	my $class = shift;
2350		2546
…		…
2439	}	2635	}
2440		2636
2441	1	2637	1
2442	}	2638	}
2443		2639
		2640	sub invoke_mouse_wheel {
		2641	my ($self, $ev) = @_;
		2642
		2643	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2644
		2645	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2646
		2647	! ! $delta
		2648	}
		2649
2444	sub update {	2650	sub update {
2445	my ($self) = @_;	2651	my ($self) = @_;
2446		2652
2447	delete $self->{knob_w};	2653	delete $self->{knob_w};
2448	$self->SUPER::update;	2654	$self->SUPER::update;
…		…
2495	glDisable GL_TEXTURE_2D;	2701	glDisable GL_TEXTURE_2D;
2496	}	2702	}
2497		2703
2498	#############################################################################	2704	#############################################################################
2499		2705
2500	package CFClient::UI::ValSlider;	2706	package CFPlus::UI::ValSlider;
2501		2707
2502	our @ISA = CFClient::UI::HBox::;	2708	our @ISA = CFPlus::UI::HBox::;
2503		2709
2504	sub new {	2710	sub new {
2505	my ($class, %arg) = @_;	2711	my ($class, %arg) = @_;
2506		2712
2507	my $range = delete $arg{range};	2713	my $range = delete $arg{range};
2508		2714
2509	my $self = $class->SUPER::new (	2715	my $self = $class->SUPER::new (
2510	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2716	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2717	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512	to_value => sub { shift },	2718	to_value => sub { shift },
2513	from_value => sub { shift },	2719	from_value => sub { shift },
2514	%arg,	2720	%arg,
2515	);	2721	);
2516		2722
…		…
2536	sub set_range { shift->{slider}->set_range (@_) }	2742	sub set_range { shift->{slider}->set_range (@_) }
2537	sub set_value { shift->{slider}->set_value (@_) }	2743	sub set_value { shift->{slider}->set_value (@_) }
2538		2744
2539	#############################################################################	2745	#############################################################################
2540		2746
2541	package CFClient::UI::TextScroller;	2747	package CFPlus::UI::TextScroller;
2542		2748
2543	our @ISA = CFClient::UI::HBox::;	2749	our @ISA = CFPlus::UI::HBox::;
2544		2750
2545	use CFClient::OpenGL;	2751	use CFPlus::OpenGL;
2546		2752
2547	sub new {	2753	sub new {
2548	my $class = shift;	2754	my $class = shift;
2549		2755
2550	my $self = $class->SUPER::new (	2756	my $self = $class->SUPER::new (
2551	fontsize => 1,	2757	fontsize => 1,
2552	can_events => 0,	2758	can_events => 1,
2553	indent => 0,	2759	indent => 0,
2554	#font => default_font	2760	#font => default_font
2555	@_,	2761	@_,
2556		2762
2557	layout => (new CFClient::Layout 1),	2763	layout => (new CFPlus::Layout),
2558	par => [],	2764	par => [],
2559	height => 0,	2765	height => 0,
2560	children => [	2766	children => [
2561	(new CFClient::UI::Empty expand => 1),	2767	(new CFPlus::UI::Empty expand => 1),
2562	(new CFClient::UI::Slider vertical => 1),	2768	(new CFPlus::UI::Slider vertical => 1),
2563	],	2769	],
2564	);	2770	);
2565		2771
2566	$self->{children}[1]->connect (changed => sub { $self->update });	2772	$self->{children}[1]->connect (changed => sub { $self->update });
2567		2773
…		…
2597		2803
2598	$self->reflow;	2804	$self->reflow;
2599		2805
2600	local $self->{children} = [$empty, $slider];	2806	local $self->{children} = [$empty, $slider];
2601	$self->SUPER::invoke_size_allocate ($w, $h)	2807	$self->SUPER::invoke_size_allocate ($w, $h)
		2808	}
		2809
		2810	sub invoke_mouse_wheel {
		2811	my ($self, $ev) = @_;
		2812
		2813	return 0 unless $ev->{dy}; # only vertical movements
		2814
		2815	$self->{children}[1]->emit (mouse_wheel => $ev);
		2816
		2817	1
2602	}	2818	}
2603		2819
2604	sub get_layout {	2820	sub get_layout {
2605	my ($self, $para) = @_;	2821	my ($self, $para) = @_;
2606		2822
…		…
2634		2850
2635	# todo: base offset on lines or so, not on pixels	2851	# todo: base offset on lines or so, not on pixels
2636	$self->{children}[1]->set_value ($offset);	2852	$self->{children}[1]->set_value ($offset);
2637	}	2853	}
2638		2854
		2855	sub current_paragraph {
		2856	my ($self) = @_;
		2857
		2858	$self->force_uptodate;
		2859	$self->{top_paragraph} - 1
		2860	}
		2861
		2862	sub scroll_to {
		2863	my ($self, $para) = @_;
		2864
		2865	$self->force_uptodate;
		2866
		2867	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2868
		2869	$self->{children}[1]->set_value ($self->{par}[$para]{y});
		2870	}
		2871
2639	sub clear {	2872	sub clear {
2640	my ($self) = @_;	2873	my ($self) = @_;
2641		2874
2642	my (undef, undef, @other) = @{ $self->{children} };	2875	my (undef, undef, @other) = @{ $self->{children} };
2643	$self->remove ($_) for @other;	2876	$self->remove ($_) for @other;
…		…
2646	$self->{height} = 0;	2879	$self->{height} = 0;
2647	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2880	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648	}	2881	}
2649		2882
2650	sub add_paragraph {	2883	sub add_paragraph {
2651	my ($self, $color, $para, $indent) = @_;	2884	my $self = shift;
2652		2885
2653	my ($text, @w) = ref $para ? @$para : $para;	2886	for my $para (@_) {
2654
2655	$para = {	2887	$para = {
		2888	fg => [1, 1, 1, 1],
		2889	indent => 0,
		2890	markup => "",
		2891	widget => [],
		2892	ref $para ? %$para : (markup => $para),
2656	w => 1e10,	2893	w => 1e10,
2657	wrapped => 1,	2894	wrapped => 1,
2658	fg => $color,
2659	indent => $indent,
2660	markup => $text,
2661	widget => \@w,
2662	};	2895	};
2663		2896
2664	$self->add (@w) if @w;	2897	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665	push @{$self->{par}}, $para;	2898	push @{$self->{par}}, $para;
		2899	}
2666		2900
2667	$self->{need_reflow}++;	2901	$self->{need_reflow}++;
2668	$self->update;	2902	$self->update;
2669	}	2903	}
2670		2904
…		…
2673		2907
2674	$self->{scroll_to_bottom} = 1;	2908	$self->{scroll_to_bottom} = 1;
2675	$self->update;	2909	$self->update;
2676	}	2910	}
2677		2911
		2912	sub force_uptodate {
		2913	my ($self) = @_;
		2914
		2915	if (delete $self->{need_reflow}) {
		2916	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2917
		2918	my $height = 0;
		2919	my $paridx;
		2920	my $top_paragraph;
		2921	my $top = int $self->{children}[1]{range}[0];
		2922
		2923	for my $para (@{$self->{par}}) {
		2924	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2925	my $layout = $self->get_layout ($para);
		2926	my ($w, $h) = $layout->size;
		2927
		2928	$para->{w} = $w + $para->{indent};
		2929	$para->{h} = $h;
		2930	$para->{wrapped} = $layout->has_wrapped;
		2931	}
		2932
		2933	$para->{y} = $height;
		2934
		2935	$paridx++;
		2936	$top_paragraph ||= $paridx if $height >= $top;
		2937
		2938	$height += $para->{h};
		2939	}
		2940
		2941	$self->{top_paragraph} = $top_paragraph;
		2942	$self->{height} = $height;
		2943
		2944	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2945
		2946	delete $self->{texture};
		2947	}
		2948
		2949	if (delete $self->{scroll_to_bottom}) {
		2950	$self->{children}[1]->set_value (1e10);
		2951	}
		2952	}
		2953
2678	sub update {	2954	sub update {
2679	my ($self) = @_;	2955	my ($self) = @_;
2680		2956
2681	$self->SUPER::update;	2957	$self->SUPER::update;
2682		2958
2683	return unless $self->{h} > 0;	2959	return unless $self->{h} > 0;
2684		2960
2685	delete $self->{texture};	2961	delete $self->{texture};
2686		2962
2687	$ROOT->on_post_alloc ($self => sub {	2963	$ROOT->on_post_alloc ($self => sub {
		2964	$self->force_uptodate;
		2965
2688	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2966	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689		2967
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 {	2968	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718	glClearColor 0, 0, 0, 0;	2969	glClearColor 0, 0, 0, 0;
2719	glClear GL_COLOR_BUFFER_BIT;	2970	glClear GL_COLOR_BUFFER_BIT;
2720		2971
2721	my $top = int $self->{children}[1]{range}[0];	2972	my $top = int $self->{children}[1]{range}[0];
2722		2973
2723	my $y0 = $top;	2974	my $y0 = $top;
2724	my $y1 = $top + $H;	2975	my $y1 = $top + $H;
2725		2976
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}}) {	2977	for my $para (@{$self->{par}}) {
2733	my $h = $para->{h};	2978	my $h = $para->{h};
		2979	my $y = $para->{y};
2734		2980
2735	if ($y0 < $y + $h && $y < $y1) {	2981	if ($y0 < $y + $h && $y < $y1) {
2736
2737	my $layout = $self->get_layout ($para);	2982	my $layout = $self->get_layout ($para);
2738		2983
2739	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741	glRasterPos $para->{indent}, $y - $y0;	2984	$layout->render ($para->{indent}, $y - $y0);
2742	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743		2985
2744	if (my @w = @{ $para->{widget} }) {	2986	if (my @w = @{ $para->{widget} }) {
2745	my @s = $layout->get_shapes;	2987	my @s = $layout->get_shapes;
2746		2988
2747	glDisable GL_BLEND;
2748	for (@w) {	2989	for (@w) {
2749	my ($dx, $dy) = splice @s, 0, 2, ();	2990	my ($dx, $dy) = splice @s, 0, 2, ();
2750		2991
2751	$_->{x} = $dx + $para->{indent};	2992	$_->{x} = $dx + $para->{indent};
2752	$_->{y} = $dy + $y - $y0;	2993	$_->{y} = $dy + $y - $y0;
2753		2994
2754	$_->draw;	2995	$_->draw;
2755	}	2996	}
2756	glEnable GL_BLEND;
2757	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2758	}	2997	}
2759	}	2998	}
2760
2761	$y += $h;
2762	}	2999	}
2763
2764	glDisable GL_BLEND;
2765	};	3000	};
2766	});	3001	});
2767	}	3002	}
2768		3003
2769	sub reconfigure {	3004	sub reconfigure {
…		…
2787	$self->{children}[1]->draw;	3022	$self->{children}[1]->draw;
2788	}	3023	}
2789		3024
2790	#############################################################################	3025	#############################################################################
2791		3026
2792	package CFClient::UI::Animator;	3027	package CFPlus::UI::Animator;
2793		3028
2794	use CFClient::OpenGL;	3029	use CFPlus::OpenGL;
2795		3030
2796	our @ISA = CFClient::UI::Bin::;	3031	our @ISA = CFPlus::UI::Bin::;
2797		3032
2798	sub moveto {	3033	sub moveto {
2799	my ($self, $x, $y) = @_;	3034	my ($self, $x, $y) = @_;
2800		3035
2801	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3036	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2829	glPopMatrix;	3064	glPopMatrix;
2830	}	3065	}
2831		3066
2832	#############################################################################	3067	#############################################################################
2833		3068
2834	package CFClient::UI::Flopper;	3069	package CFPlus::UI::Flopper;
2835		3070
2836	our @ISA = CFClient::UI::Button::;	3071	our @ISA = CFPlus::UI::Button::;
2837		3072
2838	sub new {	3073	sub new {
2839	my $class = shift;	3074	my $class = shift;
2840		3075
2841	my $self = $class->SUPER::new (	3076	my $self = $class->SUPER::new (
…		…
2853	$self->{other}->toggle_visibility;	3088	$self->{other}->toggle_visibility;
2854	}	3089	}
2855		3090
2856	#############################################################################	3091	#############################################################################
2857		3092
2858	package CFClient::UI::Tooltip;	3093	package CFPlus::UI::Tooltip;
2859		3094
2860	our @ISA = CFClient::UI::Bin::;	3095	our @ISA = CFPlus::UI::Bin::;
2861		3096
2862	use CFClient::OpenGL;	3097	use CFPlus::OpenGL;
2863		3098
2864	sub new {	3099	sub new {
2865	my $class = shift;	3100	my $class = shift;
2866		3101
2867	$class->SUPER::new (	3102	$class->SUPER::new (
…		…
2870	)	3105	)
2871	}	3106	}
2872		3107
2873	sub set_tooltip_from {	3108	sub set_tooltip_from {
2874	my ($self, $widget) = @_;	3109	my ($self, $widget) = @_;
		3110
		3111	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3112	if $widget->{tooltip} =~ /^#(.*)$/;
2875		3113
2876	my $tooltip = $widget->{tooltip};	3114	my $tooltip = $widget->{tooltip};
2877		3115
2878	if ($ENV{CFPLUS_DEBUG} & 2) {	3116	if ($ENV{CFPLUS_DEBUG} & 2) {
2879	$tooltip .= "\n\n" . (ref $widget) . "\n"	3117	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2883	}	3121	}
2884		3122
2885	$tooltip =~ s/^\n+//;	3123	$tooltip =~ s/^\n+//;
2886	$tooltip =~ s/\n+$//;	3124	$tooltip =~ s/\n+$//;
2887		3125
2888	$self->add (new CFClient::UI::Label	3126	$self->add (new CFPlus::UI::Label
2889	markup => $tooltip,	3127	markup => $tooltip,
2890	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3128	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891	fontsize => 0.8,	3129	fontsize => 0.8,
2892	fg => [0, 0, 0, 1],	3130	style => 1, # FLAG_INVERSE
2893	ellipsise => 0,	3131	ellipsise => 0,
2894	font => ($widget->{tooltip_font} || $::FONT_PROP),	3132	font => ($widget->{tooltip_font} || $::FONT_PROP),
2895	);	3133	);
2896	}	3134	}
2897		3135
…		…
2916		3154
2917	$self->{root}->on_post_alloc ("move_$self" => sub {	3155	$self->{root}->on_post_alloc ("move_$self" => sub {
2918	my $widget = $self->{owner}	3156	my $widget = $self->{owner}
2919	or return;	3157	or return;
2920		3158
		3159	if ($widget->{visible}) {
2921	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3160	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922		3161
2923	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3162	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924	if $x + $self->{w} > $self->{root}{w};	3163	if $x + $self->{w} > $self->{root}{w};
2925		3164
2926	$self->move_abs ($x, $y);	3165	$self->move_abs ($x, $y);
		3166	} else {
		3167	$self->hide;
		3168	}
2927	});	3169	});
2928	}	3170	}
2929		3171
2930	sub _draw {	3172	sub _draw {
2931	my ($self) = @_;	3173	my ($self) = @_;
…		…
2955	$self->SUPER::_draw;	3197	$self->SUPER::_draw;
2956	}	3198	}
2957		3199
2958	#############################################################################	3200	#############################################################################
2959		3201
2960	package CFClient::UI::Face;	3202	package CFPlus::UI::Face;
2961		3203
2962	our @ISA = CFClient::UI::Base::;	3204	our @ISA = CFPlus::UI::DrawBG::;
2963		3205
2964	use CFClient::OpenGL;	3206	use CFPlus::OpenGL;
2965		3207
2966	sub new {	3208	sub new {
2967	my $class = shift;	3209	my $class = shift;
2968		3210
2969	my $self = $class->SUPER::new (	3211	my $self = $class->SUPER::new (
…		…
3004	sub _draw {	3246	sub _draw {
3005	my ($self) = @_;	3247	my ($self) = @_;
3006		3248
3007	return unless $::CONN;	3249	return unless $::CONN;
3008		3250
		3251	$self->SUPER::_draw;
		3252
3009	my $face;	3253	my $face;
3010		3254
3011	if ($self->{frame}) {	3255	if ($self->{frame}) {
3012	my $anim = $::CONN->{anim}[$self->{anim}];	3256	my $anim = $::CONN->{anim}[$self->{anim}];
3013		3257
…		…
3035	$self->SUPER::destroy;	3279	$self->SUPER::destroy;
3036	}	3280	}
3037		3281
3038	#############################################################################	3282	#############################################################################
3039		3283
3040	package CFClient::UI::Buttonbar;	3284	package CFPlus::UI::Buttonbar;
3041		3285
3042	our @ISA = CFClient::UI::HBox::;	3286	our @ISA = CFPlus::UI::HBox::;
3043		3287
3044	# TODO: should actualyl wrap buttons and other goodies.	3288	# TODO: should actualyl wrap buttons and other goodies.
3045		3289
3046	#############################################################################	3290	#############################################################################
3047		3291
3048	package CFClient::UI::Menu;	3292	package CFPlus::UI::Menu;
3049		3293
3050	our @ISA = CFClient::UI::FancyFrame::;	3294	our @ISA = CFPlus::UI::Toplevel::;
3051		3295
3052	use CFClient::OpenGL;	3296	use CFPlus::OpenGL;
3053		3297
3054	sub new {	3298	sub new {
3055	my $class = shift;	3299	my $class = shift;
3056		3300
3057	my $self = $class->SUPER::new (	3301	my $self = $class->SUPER::new (
3058	items => [],	3302	items => [],
3059	z => 100,	3303	z => 100,
3060	@_,	3304	@_,
3061	);	3305	);
3062		3306
3063	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3307	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064		3308
3065	for my $item (@{ $self->{items} }) {	3309	for my $item (@{ $self->{items} }) {
3066	my ($widget, $cb, $tooltip) = @$item;	3310	my ($widget, $cb, $tooltip) = @$item;
3067		3311
3068	# handle various types of items, only text for now	3312	# handle various types of items, only text for now
3069	if (!ref $widget) {	3313	if (!ref $widget) {
		3314	if ($widget =~ /\t/) {
		3315	my ($left, $right) = split /\t/, $widget, 2;
		3316
3070	$widget = new CFClient::UI::Label	3317	$widget = new CFPlus::UI::HBox
3071	can_hover => 1,	3318	can_hover => 1,
3072	can_events => 1,	3319	can_events => 1,
		3320	tooltip => $tooltip,
		3321	children => [
		3322	(new CFPlus::UI::Label markup => $left, expand => 1),
		3323	(new CFPlus::UI::Label markup => $right, align => +1),
		3324	],
		3325	;
		3326
		3327	} else {
		3328	$widget = new CFPlus::UI::Label
		3329	can_hover => 1,
		3330	can_events => 1,
3073	markup => $widget,	3331	markup => $widget,
3074	tooltip => $tooltip	3332	tooltip => $tooltip;
		3333	}
3075	}	3334	}
3076		3335
3077	$self->{item}{$widget} = $item;	3336	$self->{item}{$widget} = $item;
3078		3337
3079	$self->{vbox}->add ($widget);	3338	$self->{vbox}->add ($widget);
…		…
3122	1	3381	1
3123	}	3382	}
3124		3383
3125	#############################################################################	3384	#############################################################################
3126		3385
3127	package CFClient::UI::Multiplexer;	3386	package CFPlus::UI::Multiplexer;
3128		3387
3129	our @ISA = CFClient::UI::Container::;	3388	our @ISA = CFPlus::UI::Container::;
3130		3389
3131	sub new {	3390	sub new {
3132	my $class = shift;	3391	my $class = shift;
3133		3392
3134	my $self = $class->SUPER::new (	3393	my $self = $class->SUPER::new (
…		…
3148		3407
3149	$self->{current} = $self->{children}[0]	3408	$self->{current} = $self->{children}[0]
3150	if @{ $self->{children} };	3409	if @{ $self->{children} };
3151	}	3410	}
3152		3411
		3412	sub get_current_page {
		3413	my ($self) = @_;
		3414
		3415	$self->{current}
		3416	}
		3417
3153	sub set_current_page {	3418	sub set_current_page {
3154	my ($self, $page_or_widget) = @_;	3419	my ($self, $page_or_widget) = @_;
3155		3420
3156	my $widget = ref $page_or_widget	3421	my $widget = ref $page_or_widget
3157	? $page_or_widget	3422	? $page_or_widget
…		…
3189	$self->{current}->draw;	3454	$self->{current}->draw;
3190	}	3455	}
3191		3456
3192	#############################################################################	3457	#############################################################################
3193		3458
3194	package CFClient::UI::Notebook;	3459	package CFPlus::UI::Notebook;
3195		3460
3196	our @ISA = CFClient::UI::VBox::;	3461	our @ISA = CFPlus::UI::VBox::;
3197		3462
3198	sub new {	3463	sub new {
3199	my $class = shift;	3464	my $class = shift;
3200		3465
3201	my $self = $class->SUPER::new (	3466	my $self = $class->SUPER::new (
3202	buttonbar => (new CFClient::UI::Buttonbar),	3467	buttonbar => (new CFPlus::UI::Buttonbar),
3203	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3468	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3204	# filter => # will be put between multiplexer and $self	3469	# filter => # will be put between multiplexer and $self
3205	@_,	3470	@_,
3206	);	3471	);
3207		3472
3208	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3473	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3214	sub add {	3479	sub add {
3215	my ($self, $title, $widget, $tooltip) = @_;	3480	my ($self, $title, $widget, $tooltip) = @_;
3216		3481
3217	Scalar::Util::weaken $self;	3482	Scalar::Util::weaken $self;
3218		3483
3219	$self->{buttonbar}->add (new CFClient::UI::Button	3484	$self->{buttonbar}->add (new CFPlus::UI::Button
3220	markup => $title,	3485	markup => $title,
3221	tooltip => $tooltip,	3486	tooltip => $tooltip,
3222	on_activate => sub { $self->set_current_page ($widget) },	3487	on_activate => sub { $self->set_current_page ($widget) },
3223	);	3488	);
3224		3489
3225	$self->{multiplexer}->add ($widget);	3490	$self->{multiplexer}->add ($widget);
3226	}	3491	}
3227		3492
		3493	sub get_current_page {
		3494	my ($self) = @_;
		3495
		3496	$self->{multiplexer}->get_current_page
		3497	}
		3498
3228	sub set_current_page {	3499	sub set_current_page {
3229	my ($self, $page) = @_;	3500	my ($self, $page) = @_;
3230		3501
3231	$self->{multiplexer}->set_current_page ($page);	3502	$self->{multiplexer}->set_current_page ($page);
3232	$self->emit (page_changed => $self->{multiplexer}{current});	3503	$self->emit (page_changed => $self->{multiplexer}{current});
3233	}	3504	}
3234		3505
3235	#############################################################################	3506	#############################################################################
3236		3507
3237	package CFClient::UI::Combobox;	3508	package CFPlus::UI::Selector;
3238		3509
3239	use utf8;	3510	use utf8;
3240		3511
3241	our @ISA = CFClient::UI::Button::;	3512	our @ISA = CFPlus::UI::Button::;
3242		3513
3243	sub new {	3514	sub new {
3244	my $class = shift;	3515	my $class = shift;
3245		3516
3246	my $self = $class->SUPER::new (	3517	my $self = $class->SUPER::new (
…		…
3263	my ($value, $title, $tooltip) = @$_;	3534	my ($value, $title, $tooltip) = @$_;
3264		3535
3265	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3536	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3266	}	3537	}
3267		3538
3268	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3539	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3269	}	3540	}
3270		3541
3271	sub _set_value {	3542	sub _set_value {
3272	my ($self, $value) = @_;	3543	my ($self, $value) = @_;
3273		3544
…		…
3288	$self->emit (changed => $value);	3559	$self->emit (changed => $value);
3289	}	3560	}
3290		3561
3291	#############################################################################	3562	#############################################################################
3292		3563
3293	package CFClient::UI::Statusbox;	3564	package CFPlus::UI::Statusbox;
3294		3565
3295	our @ISA = CFClient::UI::VBox::;	3566	our @ISA = CFPlus::UI::VBox::;
3296		3567
3297	sub new {	3568	sub new {
3298	my $class = shift;	3569	my $class = shift;
3299		3570
3300	my $self = $class->SUPER::new (	3571	my $self = $class->SUPER::new (
…		…
3312	sub reorder {	3583	sub reorder {
3313	my ($self) = @_;	3584	my ($self) = @_;
3314	my $NOW = Time::HiRes::time;	3585	my $NOW = Time::HiRes::time;
3315		3586
3316	# freeze display when hovering over any label	3587	# freeze display when hovering over any label
3317	return if $CFClient::UI::TOOLTIP->{owner}	3588	return if $CFPlus::UI::TOOLTIP->{owner}
3318	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3589	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3319	values %{ $self->{item} };	3590	values %{ $self->{item} };
3320		3591
3321	while (my ($k, $v) = each %{ $self->{item} }) {	3592	while (my ($k, $v) = each %{ $self->{item} }) {
3322	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3593	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3323	}	3594	}
…		…
3344	for ($short) {	3615	for ($short) {
3345	s/^\s+//;	3616	s/^\s+//;
3346	s/\s+/ /g;	3617	s/\s+/ /g;
3347	}	3618	}
3348		3619
3349	new CFClient::UI::Label	3620	new CFPlus::UI::Label
3350	markup => $short,	3621	markup => $short,
3351	tooltip => $item->{tooltip},	3622	tooltip => $item->{tooltip},
3352	tooltip_font => $::FONT_PROP,	3623	tooltip_font => $::FONT_PROP,
3353	tooltip_width => 0.67,	3624	tooltip_width => 0.67,
3354	fontsize => $item->{fontsize} || $self->{fontsize},	3625	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3408	count => 1,	3679	count => 1,
3409	%arg,	3680	%arg,
3410	};	3681	};
3411	}	3682	}
3412		3683
		3684	$ROOT->on_refresh (reorder => sub {
3413	$self->reorder;	3685	$self->reorder;
		3686	});
3414	}	3687	}
3415		3688
3416	sub reconfigure {	3689	sub reconfigure {
3417	my ($self) = @_;	3690	my ($self) = @_;
3418		3691
…		…
3431	$self->SUPER::destroy;	3704	$self->SUPER::destroy;
3432	}	3705	}
3433		3706
3434	#############################################################################	3707	#############################################################################
3435		3708
3436	package CFClient::UI::Inventory;	3709	package CFPlus::UI::Inventory;
3437		3710
3438	our @ISA = CFClient::UI::ScrolledWindow::;	3711	our @ISA = CFPlus::UI::Table::;
3439		3712
3440	sub new {	3713	sub new {
3441	my $class = shift;	3714	my $class = shift;
3442		3715
3443	my $self = $class->SUPER::new (	3716	my $self = $class->SUPER::new (
3444	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3717	col_expand => [0, 1, 0],
		3718	items => [],
3445	@_,	3719	@_,
3446	);	3720	);
3447		3721
		3722	$self->set_sort_order (undef);
		3723
3448	$self	3724	$self
		3725	}
		3726
		3727	sub update_items {
		3728	my ($self) = @_;
		3729
		3730	$self->clear;
		3731
		3732	my @item = $self->{sort}->(@{ $self->{items} });
		3733
		3734	my @adds;
		3735	my $row = 0;
		3736	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3737	CFPlus::Item::update_widgets $item;
		3738
		3739	push @adds, 0, $row, $item->{face_widget};
		3740	push @adds, 1, $row, $item->{desc_widget};
		3741	push @adds, 2, $row, $item->{weight_widget};
		3742
		3743	$row++;
		3744	}
		3745
		3746	$self->add (@adds);
		3747	}
		3748
		3749	sub set_sort_order {
		3750	my ($self, $order) = @_;
		3751
		3752	$self->{sort} = $order ||= sub {
		3753	sort {
		3754	$a->{type} <=> $b->{type}
		3755	or $a->{name} cmp $b->{name}
		3756	} @_
		3757	};
		3758
		3759	$self->update_items;
3449	}	3760	}
3450		3761
3451	sub set_items {	3762	sub set_items {
3452	my ($self, $items) = @_;	3763	my ($self, $items) = @_;
3453		3764
3454	$self->{child}->clear;	3765	$self->{items} = [$items ? values %$items : ()];
3455	return unless $items;	3766	$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	}	3767	}
3475		3768
3476	#############################################################################	3769	#############################################################################
3477		3770
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;	3771	package CFPlus::UI::SpellList;
3687		3772
3688	our @ISA = CFClient::UI::Table::;	3773	our @ISA = CFPlus::UI::Table::;
3689		3774
3690	sub new {	3775	sub new {
3691	my $class = shift;	3776	my $class = shift;
3692		3777
3693	my $self = $class->SUPER::new (	3778	my $self = $class->SUPER::new (
…		…
3711	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3796	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3712		3797
3713	sub rebuild_spell_list {	3798	sub rebuild_spell_list {
3714	my ($self) = @_;	3799	my ($self) = @_;
3715		3800
3716	$CFClient::UI::ROOT->on_refresh ($self => sub {	3801	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3717	$self->clear;	3802	$self->clear;
3718		3803
3719	return unless $::CONN;	3804	return unless $::CONN;
3720		3805
3721	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3806	$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);	3807	$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);	3808	$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);	3809	$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);	3810	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3726		3811
3727	my $row = 0;	3812	my $row = 0;
3728		3813
3729	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3814	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3730	my $spell = $self->{spell}{$_};	3815	my $spell = $self->{spell}{$_};
…		…
3737	if ($ev->{button} == 1) {	3822	if ($ev->{button} == 1) {
3738	$::CONN->user_send ("cast $spell->{name}");	3823	$::CONN->user_send ("cast $spell->{name}");
3739	} elsif ($ev->{button} == 2) {	3824	} elsif ($ev->{button} == 2) {
3740	$::CONN->user_send ("invoke $spell->{name}");	3825	$::CONN->user_send ("invoke $spell->{name}");
3741	} elsif ($ev->{button} == 3) {	3826	} elsif ($ev->{button} == 3) {
3742	(new CFClient::UI::Menu	3827	(new CFPlus::UI::Menu
3743	items => [	3828	items => [
3744	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3829	["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}"]) }],	3830	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3746	],	3831	],
3747	)->popup ($ev);	3832	)->popup ($ev);
3748	} else {	3833	} else {
3749	return 0;	3834	return 0;
…		…
3753	};	3838	};
3754		3839
3755	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3840	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3756		3841
3757	#TODO: add path info to tooltip	3842	#TODO: add path info to tooltip
3758	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3843	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3759		3844
3760	$self->add (0, $row, new CFClient::UI::Face	3845	$self->add (0, $row, new CFPlus::UI::Face
3761	face => $spell->{face},	3846	face => $spell->{face},
3762	can_hover => 1,	3847	can_hover => 1,
3763	can_events => 1,	3848	can_events => 1,
3764	tooltip => $tooltip,	3849	tooltip => $tooltip,
3765	on_button_down => $spell_cb,	3850	on_button_down => $spell_cb,
3766	);	3851	);
3767		3852
3768	$self->add (1, $row, new CFClient::UI::Label	3853	$self->add (1, $row, new CFPlus::UI::Label
3769	expand => 1,	3854	expand => 1,
3770	text => $spell->{name},	3855	text => $spell->{name},
3771	can_hover => 1,	3856	can_hover => 1,
3772	can_events => 1,	3857	can_events => 1,
3773	tooltip => $tooltip,	3858	tooltip => $tooltip,
3774	on_button_down => $spell_cb,	3859	on_button_down => $spell_cb,
3775	);	3860	);
3776		3861
3777	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3862	$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);	3863	$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);	3864	$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);	3865	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3781	}	3866	}
3782	});	3867	});
3783	}	3868	}
3784		3869
3785	sub add_spell {	3870	sub add_spell {
…		…
3803	$self->rebuild_spell_list;	3888	$self->rebuild_spell_list;
3804	}	3889	}
3805		3890
3806	#############################################################################	3891	#############################################################################
3807		3892
3808	package CFClient::UI::Root;	3893	package CFPlus::UI::Root;
3809		3894
3810	our @ISA = CFClient::UI::Container::;	3895	our @ISA = CFPlus::UI::Container::;
3811		3896
3812	use List::Util qw(min max);	3897	use List::Util qw(min max);
3813		3898
3814	use CFClient::OpenGL;	3899	use CFPlus::OpenGL;
3815		3900
3816	sub new {	3901	sub new {
3817	my $class = shift;	3902	my $class = shift;
3818		3903
3819	my $self = $class->SUPER::new (	3904	my $self = $class->SUPER::new (
…		…
3995	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4080	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3996		4081
3997	$w = 0 if $w < 0;	4082	$w = 0 if $w < 0;
3998	$h = 0 if $h < 0;	4083	$h = 0 if $h < 0;
3999		4084
		4085	$w = max $widget->{min_w}, $w;
		4086	$h = max $widget->{min_h}, $h;
		4087
		4088	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4089	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4090
		4091	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4092	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4093
4000	$w = int $w + 0.5;	4094	$w = int $w + 0.5;
4001	$h = int $h + 0.5;	4095	$h = int $h + 0.5;
4002		4096
4003	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4097	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4004	$widget->{old_w} = $widget->{w};	4098	$widget->{old_w} = $widget->{w};
…		…
4027	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4121	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4028	glMatrixMode GL_MODELVIEW;	4122	glMatrixMode GL_MODELVIEW;
4029	glLoadIdentity;	4123	glLoadIdentity;
4030		4124
4031	{	4125	{
4032	package CFClient::UI::Base;	4126	package CFPlus::UI::Base;
4033		4127
4034	($draw_x, $draw_y, $draw_w, $draw_h) =	4128	($draw_x, $draw_y, $draw_w, $draw_h) =
4035	(0, 0, $self->{w}, $self->{h});	4129	(0, 0, $self->{w}, $self->{h});
4036	}	4130	}
4037		4131
4038	$self->_draw;	4132	$self->_draw;
4039	}	4133	}
4040		4134
4041	#############################################################################	4135	#############################################################################
4042		4136
4043	package CFClient::UI;	4137	package CFPlus::UI;
4044		4138
4045	$ROOT = new CFClient::UI::Root;	4139	$ROOT = new CFPlus::UI::Root;
4046	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4140	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4047		4141
4048	1	4142	1
4049		4143

Diff Legend

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