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.312 by root, Fri Jun 23 23:54:30 2006 UTC vs.
Revision 1.357 by root, Fri Dec 8 13:49:57 2006 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8	use Event;	8	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
…		…
79	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	82	if $FOCUS;
82	}	83	}
83		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
84	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	99	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
87		101
88	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
90		106
91	$GRAB = $widget;	107	$GRAB = $widget;
92	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
93		109
94	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
95	}	111	}
96		112
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
98		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
100	if $GRAB;	116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
		122	}
101	}	123	}
102		124
103	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	126	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		127
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		129
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		131
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
112	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		134
114	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	137	$grab->update if $grab;
117	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
118		139
		140	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	141	$TOOLTIP_WATCHER->cb->();
120	}	142	}
121	}	143	}
122		144
123	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
124	my ($ev) = @_;	146	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
126		148
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		150
129	if ($widget != $HOVER) {	151	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		152
132	$hover->update if $hover && $hover->{can_hover};	153	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	154	if $HOVER;
140	}	155	}
141		156
142	# convert position array to integers	157	# convert position array to integers
143	sub harmonize {	158	sub harmonize {
…		…
193	reconfigure_widgets;	208	reconfigure_widgets;
194	}	209	}
195		210
196	#############################################################################	211	#############################################################################
197		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
198	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
199		222
200	use strict;	223	use strict;
201		224
202	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
203		226
204	sub new {	227	sub new {
205	my $class = shift;	228	my $class = shift;
206		229
207	my $self = bless {	230	my $self = bless {
…		…
212	h => undef,	235	h => undef,
213	can_events => 1,	236	can_events => 1,
214	@_	237	@_
215	}, $class;	238	}, $class;
216		239
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		241
219	for (keys %$self) {	242	for (keys %$self) {
220	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
222	}	245	}
223	}	246	}
224		247
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		253
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		256
234	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
247	sub show {	270	sub show {
248	my ($self) = @_;	271	my ($self) = @_;
249		272
250	return if $self->{parent};	273	return if $self->{parent};
251		274
252	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
253	}	276	}
254		277
255	sub set_visible {	278	sub set_visible {
256	my ($self) = @_;	279	my ($self) = @_;
257		280
…		…
278	delete $self->{root};	301	delete $self->{root};
279		302
280	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
282		305
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
285		308
286	$self->emit ("focus_out");	309	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
288	}	311	}
…		…
345	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
346		369
347	if ($self->{aspect}) {	370	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
349		372
350	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		375
353	# use alignment to adjust x, y	376	# use alignment to adjust x, y
354		377
355	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
397		420
398	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
399		422
400	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
401		424
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	428	}
406	}	429	}
407		430
408	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
409	sub coord2local {	432	sub coord2local {
410	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
411		434
		435	Carp::confess unless $self->{parent};#d#
		436
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	438	}
414		439
415	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
416	sub coord2global {	441	sub coord2global {
417	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
418		443
		444	Carp::confess unless $self->{parent};#d#
		445
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	447	}
421		448
422	sub invoke_focus_in {	449	sub invoke_focus_in {
423	my ($self) = @_;	450	my ($self) = @_;
424		451
425	return if $FOCUS == $self;	452	return if $FOCUS == $self;
426	return unless $self->{can_focus};	453	return unless $self->{can_focus};
427		454
428	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
429		456
430	$focus->update if $focus;	457	$self->update;
431	$FOCUS->update;
432		458
433	0	459	0
434	}	460	}
435		461
436	sub invoke_focus_out {	462	sub invoke_focus_out {
437	my ($self) = @_;	463	my ($self) = @_;
438		464
439	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
440		466
441	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
442		468
443	$focus->update if $focus; #?	469	$self->update;
444		470
445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	471	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	472	unless $FOCUS;
447		473
448	0	474	0
449	}	475	}
450		476
451	sub grab_focus {	477	sub grab_focus {
452	my ($self) = @_;	478	my ($self) = @_;
453		479
		480	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	481	$self->emit ("focus_in");
455	}	482	}
456		483
457	sub invoke_mouse_motion { 1 }	484	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	485	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	486	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
461		489
462	sub invoke_button_down {	490	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
464		492
465	$self->grab_focus;	493	$self->grab_focus;
466		494
467	1	495	0
468	}	496	}
469		497
470	sub connect {	498	sub connect {
471	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
472		500
473	push @{ $self->{signal_cb}{$signal} }, $cb;	501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
474	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
475		515
476	sub emit {	516	sub emit {
477	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
478		518
		519	# I do not really like this solution, but I do not like duplication
		520	# and needlessly verbose code, either.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
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	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
		905
		906	$self->_render;
846	}	907	}
847
848	$self->_render;
849	};	908	};
850	}	909	}
851		910
852	sub _draw {	911	sub _draw {
853	my ($self) = @_;	912	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		913
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 => 0,
		1144	text => $arg{label},
		1145	fontsize => ($arg{border} || 0.8) * 0.75;
		1146	}
		1147
		1148	my $self = $class->SUPER::new (
		1149	# label => "",
		1150	fg => [0.6, 0.3, 0.1],
		1151	border => 0.8,
		1152	style => 'single',
		1153	%arg,
		1154	);
		1155
		1156	$self
		1157	}
		1158
		1159	sub add {
		1160	my ($self, @widgets) = @_;
		1161
		1162	$self->SUPER::add (@widgets);
		1163	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1164	}
		1165
		1166	sub border {
		1167	int $_[0]{border} * $::FONTSIZE
		1168	}
		1169
		1170	sub size_request {
		1171	my ($self) = @_;
		1172
		1173	($self->{label_w}, undef) = $self->{label}->size_request
		1174	if $self->{label};
		1175
		1176	my ($w, $h) = $self->SUPER::size_request;
		1177
		1178	(
		1179	$w + $self->border * 2,
		1180	$h + $self->border * 2,
		1181	)
		1182	}
		1183
		1184	sub invoke_size_allocate {
		1185	my ($self, $w, $h) = @_;
		1186
		1187	my $border = $self->border;
		1188
		1189	$w -= List::Util::max 0, $border * 2;
		1190	$h -= List::Util::max 0, $border * 2;
		1191
		1192	if (my $label = $self->{label}) {
		1193	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1194	$label->{h} = List::Util::min $h, $border;
		1195	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1196	}
		1197
		1198	$self->child->configure ($border, $border, $w, $h);
		1199
		1200	1
		1201	}
		1202
		1203	sub _draw {
		1204	my ($self) = @_;
		1205
		1206	my $child = $self->{children}[0];
		1207
		1208	my $border = $self->border;
		1209	my ($w, $h) = ($self->{w}, $self->{h});
		1210
		1211	$child->draw;
		1212
		1213	glColor @{$self->{fg}};
		1214	glBegin GL_LINE_STRIP;
		1215	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1216	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1217	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1218	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1219	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1220	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1221	glEnd;
		1222
		1223	if ($self->{label}) {
		1224	glTranslate $border * 2, 0;
		1225	$self->{label}->_draw;
		1226	}
		1227	}
		1228
		1229	#############################################################################
		1230
		1231	package CFPlus::UI::Toplevel;
		1232
		1233	our @ISA = CFPlus::UI::Bin::;
		1234
		1235	use CFPlus::OpenGL;
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;
		1971	} elsif ($uni == 21) { # ctrl-u
		1972	$text = "";
		1973	$self->{cursor} = 0;
1799	} elsif ($uni == 27) {	1974	} elsif ($uni == 27) {
1800	$self->emit ('escape');	1975	$self->emit ('escape');
1801	} elsif ($uni) {	1976	} elsif ($uni >= 0x20) {
1802	substr $text, $self->{cursor}++, 0, chr $uni;	1977	substr $text, $self->{cursor}++, 0, chr $uni;
1803	} else {	1978	} else {
1804	return 0;	1979	return 0;
1805	}	1980	}
1806		1981
…		…
1826		2001
1827	my $idx = $self->{layout}->xy_to_index ($x, $y);	2002	my $idx = $self->{layout}->xy_to_index ($x, $y);
1828		2003
1829	# byte-index to char-index	2004	# byte-index to char-index
1830	my $text = $self->{text};	2005	my $text = $self->{text};
1831	utf8::encode $text;	2006	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832	$self->{cursor} = length substr $text, 0, $idx;	2007	$self->{cursor} = length $text;
1833		2008
1834	$self->_set_text ($self->{text});	2009	$self->_set_text ($self->{text});
1835	$self->update;	2010	$self->update;
1836		2011
1837	1	2012	1
…		…
1876	utf8::encode $text;	2051	utf8::encode $text;
1877		2052
1878	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2053	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879	}	2054	}
1880		2055
1881	glColor @{$self->{fg}};
1882	glBegin GL_LINES;	2056	glBegin GL_LINES;
1883	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2057	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};	2058	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885	glEnd;	2059	glEnd;
1886	}	2060	}
1887	}	2061	}
1888		2062
1889	package CFClient::UI::Entry;	2063	package CFPlus::UI::Entry;
1890		2064
1891	our @ISA = CFClient::UI::EntryBase::;	2065	our @ISA = CFPlus::UI::EntryBase::;
1892		2066
1893	use CFClient::OpenGL;	2067	use CFPlus::OpenGL;
1894		2068
1895	sub invoke_key_down {	2069	sub invoke_key_down {
1896	my ($self, $ev) = @_;	2070	my ($self, $ev) = @_;
1897		2071
1898	my $sym = $ev->{sym};	2072	my $sym = $ev->{sym};
…		…
1904	$self->{history_pointer} = -1;	2078	$self->{history_pointer} = -1;
1905	$self->{history_saveback} = '';	2079	$self->{history_saveback} = '';
1906	$self->emit (activate => $txt);	2080	$self->emit (activate => $txt);
1907	$self->update;	2081	$self->update;
1908		2082
1909	} elsif ($sym == CFClient::SDLK_UP) {	2083	} elsif ($sym == CFPlus::SDLK_UP) {
1910	if ($self->{history_pointer} < 0) {	2084	if ($self->{history_pointer} < 0) {
1911	$self->{history_saveback} = $self->get_text;	2085	$self->{history_saveback} = $self->get_text;
1912	}	2086	}
1913	if (@{$self->{history} || []} > 0) {	2087	if (@{$self->{history} || []} > 0) {
1914	$self->{history_pointer}++;	2088	$self->{history_pointer}++;
…		…
1916	$self->{history_pointer} = @{$self->{history} || []} - 1;	2090	$self->{history_pointer} = @{$self->{history} || []} - 1;
1917	}	2091	}
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2092	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1919	}	2093	}
1920		2094
1921	} elsif ($sym == CFClient::SDLK_DOWN) {	2095	} elsif ($sym == CFPlus::SDLK_DOWN) {
1922	$self->{history_pointer}--;	2096	$self->{history_pointer}--;
1923	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2097	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924		2098
1925	if ($self->{history_pointer} >= 0) {	2099	if ($self->{history_pointer} >= 0) {
1926	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2100	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1935	1	2109	1
1936	}	2110	}
1937		2111
1938	#############################################################################	2112	#############################################################################
1939		2113
1940	package CFClient::UI::Button;	2114	package CFPlus::UI::Button;
1941		2115
1942	our @ISA = CFClient::UI::Label::;	2116	our @ISA = CFPlus::UI::Label::;
1943		2117
1944	use CFClient::OpenGL;	2118	use CFPlus::OpenGL;
1945		2119
1946	my @tex =	2120	my @tex =
1947	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2121	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948	qw(b1_button_active.png);	2122	qw(b1_button_active.png);
1949		2123
1950	sub new {	2124	sub new {
1951	my $class = shift;	2125	my $class = shift;
1952		2126
…		…
1989	$self->SUPER::_draw;	2163	$self->SUPER::_draw;
1990	}	2164	}
1991		2165
1992	#############################################################################	2166	#############################################################################
1993		2167
		2168	package CFPlus::UI::CheckBox;
		2169
		2170	our @ISA = CFPlus::UI::DrawBG::;
		2171
		2172	my @tex =
		2173	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2174	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2175
		2176	use CFPlus::OpenGL;
		2177
		2178	sub new {
		2179	my $class = shift;
		2180
		2181	$class->SUPER::new (
		2182	padding_x => 2,
		2183	padding_y => 2,
		2184	fg => [1, 1, 1],
		2185	active_fg => [1, 1, 0],
		2186	bg => [0, 0, 0, 0.2],
		2187	active_bg => [1, 1, 1, 0.5],
		2188	state => 0,
		2189	can_hover => 1,
		2190	@_
		2191	)
		2192	}
		2193
		2194	sub size_request {
		2195	my ($self) = @_;
		2196
		2197	(6) x 2
		2198	}
		2199
		2200	sub toggle {
		2201	my ($self) = @_;
		2202
		2203	$self->{state} = !$self->{state};
		2204	$self->emit (changed => $self->{state});
		2205	$self->update;
		2206	}
		2207
		2208	sub invoke_button_down {
		2209	my ($self, $ev, $x, $y) = @_;
		2210
		2211	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2212	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2213	$self->toggle;
		2214	} else {
		2215	return 0
		2216	}
		2217
		2218	1
		2219	}
		2220
		2221	sub _draw {
		2222	my ($self) = @_;
		2223
		2224	$self->SUPER::_draw;
		2225
		2226	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2227
		2228	my ($w, $h) = @$self{qw(w h)};
		2229
		2230	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2231
		2232	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2233
		2234	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2235
		2236	glEnable GL_TEXTURE_2D;
		2237	$tex->draw_quad_alpha (0, 0, $s, $s);
		2238	glDisable GL_TEXTURE_2D;
		2239	}
		2240
		2241	#############################################################################
		2242
		2243	package CFPlus::UI::Image;
		2244
		2245	our @ISA = CFPlus::UI::Base::;
		2246
		2247	use CFPlus::OpenGL;
		2248
		2249	our %texture_cache;
		2250
		2251	sub new {
		2252	my $class = shift;
		2253
		2254	my $self = $class->SUPER::new (
		2255	can_events => 0,
		2256	@_,
		2257	);
		2258
		2259	$self->{path} || $self->{tex}
		2260	or Carp::croak "'path' or 'tex' attributes required";
		2261
		2262	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2263	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2264
		2265	Scalar::Util::weaken $texture_cache{$self->{path}};
		2266
		2267	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2268
		2269	$self
		2270	}
		2271
		2272	sub STORABLE_freeze {
		2273	my ($self, $cloning) = @_;
		2274
		2275	$self->{path}
		2276	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2277
		2278	$self->{path}
		2279	}
		2280
		2281	sub STORABLE_attach {
		2282	my ($self, $cloning, $path) = @_;
		2283
		2284	$self->new (path => $path)
		2285	}
		2286
		2287	sub size_request {
		2288	my ($self) = @_;
		2289
		2290	($self->{tex}{w}, $self->{tex}{h})
		2291	}
		2292
		2293	sub _draw {
		2294	my ($self) = @_;
		2295
		2296	my $tex = $self->{tex};
		2297
		2298	my ($w, $h) = ($self->{w}, $self->{h});
		2299
		2300	if ($self->{rot90}) {
		2301	glRotate 90, 0, 0, 1;
		2302	glTranslate 0, -$self->{w}, 0;
		2303
		2304	($w, $h) = ($h, $w);
		2305	}
		2306
		2307	glEnable GL_TEXTURE_2D;
		2308	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2309
		2310	$tex->draw_quad (0, 0, $w, $h);
		2311
		2312	glDisable GL_TEXTURE_2D;
		2313	}
		2314
		2315	#############################################################################
		2316
1994	package CFClient::UI::ImageButton;	2317	package CFPlus::UI::ImageButton;
1995		2318
1996	our @ISA = CFClient::UI::Image::;	2319	our @ISA = CFPlus::UI::Image::;
1997		2320
1998	use CFClient::OpenGL;	2321	use CFPlus::OpenGL;
1999		2322
2000	my %textures;	2323	my %textures;
2001		2324
2002	sub new {	2325	sub new {
2003	my $class = shift;	2326	my $class = shift;
…		…
2025	1	2348	1
2026	}	2349	}
2027		2350
2028	#############################################################################	2351	#############################################################################
2029		2352
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;	2353	package CFPlus::UI::VGauge;
2099		2354
2100	our @ISA = CFClient::UI::Base::;	2355	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		2356
2161	use List::Util qw(min max);	2357	use List::Util qw(min max);
2162		2358
2163	use CFClient::OpenGL;	2359	use CFPlus::OpenGL;
2164		2360
2165	my %tex = (	2361	my %tex = (
2166	food => [	2362	food => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2363	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2364	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169	],	2365	],
2170	grace => [	2366	grace => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2367	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/	2368	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173	],	2369	],
2174	hp => [	2370	hp => [
2175	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2371	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2372	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177	],	2373	],
2178	mana => [	2374	mana => [
2179	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2375	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/	2376	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181	],	2377	],
2182	);	2378	);
2183		2379
2184	# eg. VGauge->new (gauge => 'food'), default gauge: food	2380	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2244	my $ycut1 = max 0, min 1, $ycut;	2440	my $ycut1 = max 0, min 1, $ycut;
2245	my $ycut2 = max 0, min 1, $ycut - 1;	2441	my $ycut2 = max 0, min 1, $ycut - 1;
2246		2442
2247	my $h1 = $self->{h} * (1 - $ycut1);	2443	my $h1 = $self->{h} * (1 - $ycut1);
2248	my $h2 = $self->{h} * (1 - $ycut2);	2444	my $h2 = $self->{h} * (1 - $ycut2);
		2445	my $h3 = $self->{h};
		2446
		2447	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249		2448
2250	glEnable GL_BLEND;	2449	glEnable GL_BLEND;
2251	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2450	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2451	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253	glEnable GL_TEXTURE_2D;	2452	glEnable GL_TEXTURE_2D;
…		…
2272		2471
2273	if ($t3) {	2472	if ($t3) {
2274	glBindTexture GL_TEXTURE_2D, $t3->{name};	2473	glBindTexture GL_TEXTURE_2D, $t3->{name};
2275	glBegin GL_QUADS;	2474	glBegin GL_QUADS;
2276	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2475	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2476	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2477	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2478	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280	glEnd;	2479	glEnd;
2281	}	2480	}
2282		2481
2283	glDisable GL_BLEND;	2482	glDisable GL_BLEND;
2284	glDisable GL_TEXTURE_2D;	2483	glDisable GL_TEXTURE_2D;
2285	}	2484	}
2286		2485
2287	#############################################################################	2486	#############################################################################
2288		2487
2289	package CFClient::UI::Gauge;	2488	package CFPlus::UI::Gauge;
2290		2489
2291	our @ISA = CFClient::UI::VBox::;	2490	our @ISA = CFPlus::UI::VBox::;
2292		2491
2293	sub new {	2492	sub new {
2294	my ($class, %arg) = @_;	2493	my ($class, %arg) = @_;
2295		2494
2296	my $self = $class->SUPER::new (	2495	my $self = $class->SUPER::new (
…		…
2298	can_hover => 1,	2497	can_hover => 1,
2299	can_events => 1,	2498	can_events => 1,
2300	%arg,	2499	%arg,
2301	);	2500	);
2302		2501
2303	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2502	$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);	2503	$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");	2504	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306		2505
2307	$self	2506	$self
2308	}	2507	}
2309		2508
2310	sub set_fontsize {	2509	sub set_fontsize {
…		…
2331	$self->{value}->set_text ($val);	2530	$self->{value}->set_text ($val);
2332	}	2531	}
2333		2532
2334	#############################################################################	2533	#############################################################################
2335		2534
2336	package CFClient::UI::Slider;	2535	package CFPlus::UI::Slider;
2337		2536
2338	use strict;	2537	use strict;
2339		2538
2340	use CFClient::OpenGL;	2539	use CFPlus::OpenGL;
2341		2540
2342	our @ISA = CFClient::UI::DrawBG::;	2541	our @ISA = CFPlus::UI::DrawBG::;
2343		2542
2344	my @tex =	2543	my @tex =
2345	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2544	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346	qw(s1_slider.png s1_slider_bg.png);	2545	qw(s1_slider.png s1_slider_bg.png);
2347		2546
2348	sub new {	2547	sub new {
2349	my $class = shift;	2548	my $class = shift;
2350		2549
…		…
2439	}	2638	}
2440		2639
2441	1	2640	1
2442	}	2641	}
2443		2642
		2643	sub invoke_mouse_wheel {
		2644	my ($self, $ev) = @_;
		2645
		2646	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2647
		2648	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2649
		2650	! ! $delta
		2651	}
		2652
2444	sub update {	2653	sub update {
2445	my ($self) = @_;	2654	my ($self) = @_;
2446		2655
2447	delete $self->{knob_w};	2656	delete $self->{knob_w};
2448	$self->SUPER::update;	2657	$self->SUPER::update;
…		…
2495	glDisable GL_TEXTURE_2D;	2704	glDisable GL_TEXTURE_2D;
2496	}	2705	}
2497		2706
2498	#############################################################################	2707	#############################################################################
2499		2708
2500	package CFClient::UI::ValSlider;	2709	package CFPlus::UI::ValSlider;
2501		2710
2502	our @ISA = CFClient::UI::HBox::;	2711	our @ISA = CFPlus::UI::HBox::;
2503		2712
2504	sub new {	2713	sub new {
2505	my ($class, %arg) = @_;	2714	my ($class, %arg) = @_;
2506		2715
2507	my $range = delete $arg{range};	2716	my $range = delete $arg{range};
2508		2717
2509	my $self = $class->SUPER::new (	2718	my $self = $class->SUPER::new (
2510	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2719	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2720	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512	to_value => sub { shift },	2721	to_value => sub { shift },
2513	from_value => sub { shift },	2722	from_value => sub { shift },
2514	%arg,	2723	%arg,
2515	);	2724	);
2516		2725
…		…
2536	sub set_range { shift->{slider}->set_range (@_) }	2745	sub set_range { shift->{slider}->set_range (@_) }
2537	sub set_value { shift->{slider}->set_value (@_) }	2746	sub set_value { shift->{slider}->set_value (@_) }
2538		2747
2539	#############################################################################	2748	#############################################################################
2540		2749
2541	package CFClient::UI::TextScroller;	2750	package CFPlus::UI::TextScroller;
2542		2751
2543	our @ISA = CFClient::UI::HBox::;	2752	our @ISA = CFPlus::UI::HBox::;
2544		2753
2545	use CFClient::OpenGL;	2754	use CFPlus::OpenGL;
2546		2755
2547	sub new {	2756	sub new {
2548	my $class = shift;	2757	my $class = shift;
2549		2758
2550	my $self = $class->SUPER::new (	2759	my $self = $class->SUPER::new (
2551	fontsize => 1,	2760	fontsize => 1,
2552	can_events => 0,	2761	can_events => 1,
2553	indent => 0,	2762	indent => 0,
2554	#font => default_font	2763	#font => default_font
2555	@_,	2764	@_,
2556		2765
2557	layout => (new CFClient::Layout 1),	2766	layout => (new CFPlus::Layout),
2558	par => [],	2767	par => [],
2559	height => 0,	2768	height => 0,
2560	children => [	2769	children => [
2561	(new CFClient::UI::Empty expand => 1),	2770	(new CFPlus::UI::Empty expand => 1),
2562	(new CFClient::UI::Slider vertical => 1),	2771	(new CFPlus::UI::Slider vertical => 1),
2563	],	2772	],
2564	);	2773	);
2565		2774
2566	$self->{children}[1]->connect (changed => sub { $self->update });	2775	$self->{children}[1]->connect (changed => sub { $self->update });
2567		2776
…		…
2597		2806
2598	$self->reflow;	2807	$self->reflow;
2599		2808
2600	local $self->{children} = [$empty, $slider];	2809	local $self->{children} = [$empty, $slider];
2601	$self->SUPER::invoke_size_allocate ($w, $h)	2810	$self->SUPER::invoke_size_allocate ($w, $h)
		2811	}
		2812
		2813	sub invoke_mouse_wheel {
		2814	my ($self, $ev) = @_;
		2815
		2816	return 0 unless $ev->{dy}; # only vertical movements
		2817
		2818	$self->{children}[1]->emit (mouse_wheel => $ev);
		2819
		2820	1
2602	}	2821	}
2603		2822
2604	sub get_layout {	2823	sub get_layout {
2605	my ($self, $para) = @_;	2824	my ($self, $para) = @_;
2606		2825
…		…
2634		2853
2635	# todo: base offset on lines or so, not on pixels	2854	# todo: base offset on lines or so, not on pixels
2636	$self->{children}[1]->set_value ($offset);	2855	$self->{children}[1]->set_value ($offset);
2637	}	2856	}
2638		2857
		2858	sub current_paragraph {
		2859	my ($self) = @_;
		2860
		2861	$self->{top_paragraph} - 1
		2862	}
		2863
		2864	sub scroll_to {
		2865	my ($self, $para) = @_;
		2866
		2867	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2868
		2869	$self->{scroll_to} = $para;
		2870	$self->update;
		2871	}
		2872
2639	sub clear {	2873	sub clear {
2640	my ($self) = @_;	2874	my ($self) = @_;
2641		2875
2642	my (undef, undef, @other) = @{ $self->{children} };	2876	my (undef, undef, @other) = @{ $self->{children} };
2643	$self->remove ($_) for @other;	2877	$self->remove ($_) for @other;
…		…
2646	$self->{height} = 0;	2880	$self->{height} = 0;
2647	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2881	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648	}	2882	}
2649		2883
2650	sub add_paragraph {	2884	sub add_paragraph {
2651	my ($self, $color, $para, $indent) = @_;	2885	my $self = shift;
2652		2886
2653	my ($text, @w) = ref $para ? @$para : $para;	2887	for my $para (@_) {
2654
2655	$para = {	2888	$para = {
		2889	fg => [1, 1, 1, 1],
		2890	indent => 0,
		2891	markup => "",
		2892	widget => [],
		2893	ref $para ? %$para : (markup => $para),
2656	w => 1e10,	2894	w => 1e10,
2657	wrapped => 1,	2895	wrapped => 1,
2658	fg => $color,
2659	indent => $indent,
2660	markup => $text,
2661	widget => \@w,
2662	};	2896	};
2663		2897
2664	$self->add (@w) if @w;	2898	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665	push @{$self->{par}}, $para;	2899	push @{$self->{par}}, $para;
		2900	}
2666		2901
2667	$self->{need_reflow}++;	2902	$self->{need_reflow}++;
2668	$self->update;	2903	$self->update;
2669	}	2904	}
2670		2905
2671	sub scroll_to_bottom {	2906	sub scroll_to_bottom {
2672	my ($self) = @_;	2907	my ($self) = @_;
2673		2908
2674	$self->{scroll_to_bottom} = 1;	2909	$self->{scroll_to} = $#{$self->{par}};
2675	$self->update;	2910	$self->update;
2676	}	2911	}
2677		2912
		2913	sub force_uptodate {
		2914	my ($self) = @_;
		2915
		2916	if (delete $self->{need_reflow}) {
		2917	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2918
		2919	my $height = 0;
		2920
		2921	for my $para (@{$self->{par}}) {
		2922	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2923	my $layout = $self->get_layout ($para);
		2924	my ($w, $h) = $layout->size;
		2925
		2926	$para->{w} = $w + $para->{indent};
		2927	$para->{h} = $h;
		2928	$para->{wrapped} = $layout->has_wrapped;
		2929	}
		2930
		2931	$para->{y} = $height;
		2932	$height += $para->{h};
		2933	}
		2934
		2935	$self->{height} = $height;
		2936	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2937
		2938	delete $self->{texture};
		2939	}
		2940
		2941	if (my $paridx = delete $self->{scroll_to}) {
		2942	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2943	}
		2944	}
		2945
2678	sub update {	2946	sub update {
2679	my ($self) = @_;	2947	my ($self) = @_;
2680		2948
2681	$self->SUPER::update;	2949	$self->SUPER::update;
2682		2950
2683	return unless $self->{h} > 0;	2951	return unless $self->{h} > 0;
2684		2952
2685	delete $self->{texture};	2953	delete $self->{texture};
2686		2954
2687	$ROOT->on_post_alloc ($self => sub {	2955	$ROOT->on_post_alloc ($self => sub {
		2956	$self->force_uptodate;
		2957
2688	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2958	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689		2959
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 {	2960	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718	glClearColor 0, 0, 0, 0;	2961	glClearColor 0, 0, 0, 0;
2719	glClear GL_COLOR_BUFFER_BIT;	2962	glClear GL_COLOR_BUFFER_BIT;
2720		2963
		2964	package CFPlus::UI::Base;
		2965	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		2966	(0, 0, $self->{w}, $self->{h});
		2967
		2968	my $top = int $self->{children}[1]{range}[0];
		2969
		2970	my $paridx = 0;
		2971	my $top_paragraph;
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	for (@w) {	2989	for (@w) {
…		…
2753	$_->draw;	2995	$_->draw;
2754	}	2996	}
2755	}	2997	}
2756	}	2998	}
2757		2999
2758	$y += $h;	3000	$paridx++;
		3001	$top_paragraph ||= $paridx if $y >= $top;
2759	}	3002	}
2760		3003
2761	glDisable GL_BLEND;	3004	$self->{top_paragraph} = $top_paragraph;
2762	};	3005	};
2763	});	3006	});
2764	}	3007	}
2765		3008
2766	sub reconfigure {	3009	sub reconfigure {
…		…
2784	$self->{children}[1]->draw;	3027	$self->{children}[1]->draw;
2785	}	3028	}
2786		3029
2787	#############################################################################	3030	#############################################################################
2788		3031
2789	package CFClient::UI::Animator;	3032	package CFPlus::UI::Animator;
2790		3033
2791	use CFClient::OpenGL;	3034	use CFPlus::OpenGL;
2792		3035
2793	our @ISA = CFClient::UI::Bin::;	3036	our @ISA = CFPlus::UI::Bin::;
2794		3037
2795	sub moveto {	3038	sub moveto {
2796	my ($self, $x, $y) = @_;	3039	my ($self, $x, $y) = @_;
2797		3040
2798	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3041	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2826	glPopMatrix;	3069	glPopMatrix;
2827	}	3070	}
2828		3071
2829	#############################################################################	3072	#############################################################################
2830		3073
2831	package CFClient::UI::Flopper;	3074	package CFPlus::UI::Flopper;
2832		3075
2833	our @ISA = CFClient::UI::Button::;	3076	our @ISA = CFPlus::UI::Button::;
2834		3077
2835	sub new {	3078	sub new {
2836	my $class = shift;	3079	my $class = shift;
2837		3080
2838	my $self = $class->SUPER::new (	3081	my $self = $class->SUPER::new (
…		…
2850	$self->{other}->toggle_visibility;	3093	$self->{other}->toggle_visibility;
2851	}	3094	}
2852		3095
2853	#############################################################################	3096	#############################################################################
2854		3097
2855	package CFClient::UI::Tooltip;	3098	package CFPlus::UI::Tooltip;
2856		3099
2857	our @ISA = CFClient::UI::Bin::;	3100	our @ISA = CFPlus::UI::Bin::;
2858		3101
2859	use CFClient::OpenGL;	3102	use CFPlus::OpenGL;
2860		3103
2861	sub new {	3104	sub new {
2862	my $class = shift;	3105	my $class = shift;
2863		3106
2864	$class->SUPER::new (	3107	$class->SUPER::new (
…		…
2867	)	3110	)
2868	}	3111	}
2869		3112
2870	sub set_tooltip_from {	3113	sub set_tooltip_from {
2871	my ($self, $widget) = @_;	3114	my ($self, $widget) = @_;
		3115
		3116	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3117	if $widget->{tooltip} =~ /^#(.*)$/;
2872		3118
2873	my $tooltip = $widget->{tooltip};	3119	my $tooltip = $widget->{tooltip};
2874		3120
2875	if ($ENV{CFPLUS_DEBUG} & 2) {	3121	if ($ENV{CFPLUS_DEBUG} & 2) {
2876	$tooltip .= "\n\n" . (ref $widget) . "\n"	3122	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2880	}	3126	}
2881		3127
2882	$tooltip =~ s/^\n+//;	3128	$tooltip =~ s/^\n+//;
2883	$tooltip =~ s/\n+$//;	3129	$tooltip =~ s/\n+$//;
2884		3130
2885	$self->add (new CFClient::UI::Label	3131	$self->add (new CFPlus::UI::Label
2886	markup => $tooltip,	3132	markup => $tooltip,
2887	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3133	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888	fontsize => 0.8,	3134	fontsize => 0.8,
2889	fg => [0, 0, 0, 1],	3135	style => 1, # FLAG_INVERSE
2890	ellipsise => 0,	3136	ellipsise => 0,
2891	font => ($widget->{tooltip_font} || $::FONT_PROP),	3137	font => ($widget->{tooltip_font} || $::FONT_PROP),
2892	);	3138	);
2893	}	3139	}
2894		3140
…		…
2913		3159
2914	$self->{root}->on_post_alloc ("move_$self" => sub {	3160	$self->{root}->on_post_alloc ("move_$self" => sub {
2915	my $widget = $self->{owner}	3161	my $widget = $self->{owner}
2916	or return;	3162	or return;
2917		3163
		3164	if ($widget->{visible}) {
2918	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3165	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919		3166
2920	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3167	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921	if $x + $self->{w} > $self->{root}{w};	3168	if $x + $self->{w} > $self->{root}{w};
2922		3169
2923	$self->move_abs ($x, $y);	3170	$self->move_abs ($x, $y);
		3171	} else {
		3172	$self->hide;
		3173	}
2924	});	3174	});
2925	}	3175	}
2926		3176
2927	sub _draw {	3177	sub _draw {
2928	my ($self) = @_;	3178	my ($self) = @_;
…		…
2952	$self->SUPER::_draw;	3202	$self->SUPER::_draw;
2953	}	3203	}
2954		3204
2955	#############################################################################	3205	#############################################################################
2956		3206
2957	package CFClient::UI::Face;	3207	package CFPlus::UI::Face;
2958		3208
2959	our @ISA = CFClient::UI::Base::;	3209	our @ISA = CFPlus::UI::DrawBG::;
2960		3210
2961	use CFClient::OpenGL;	3211	use CFPlus::OpenGL;
2962		3212
2963	sub new {	3213	sub new {
2964	my $class = shift;	3214	my $class = shift;
2965		3215
2966	my $self = $class->SUPER::new (	3216	my $self = $class->SUPER::new (
…		…
3001	sub _draw {	3251	sub _draw {
3002	my ($self) = @_;	3252	my ($self) = @_;
3003		3253
3004	return unless $::CONN;	3254	return unless $::CONN;
3005		3255
		3256	$self->SUPER::_draw;
		3257
3006	my $face;	3258	my $face;
3007		3259
3008	if ($self->{frame}) {	3260	if ($self->{frame}) {
3009	my $anim = $::CONN->{anim}[$self->{anim}];	3261	my $anim = $::CONN->{anim}[$self->{anim}];
3010		3262
…		…
3032	$self->SUPER::destroy;	3284	$self->SUPER::destroy;
3033	}	3285	}
3034		3286
3035	#############################################################################	3287	#############################################################################
3036		3288
3037	package CFClient::UI::Buttonbar;	3289	package CFPlus::UI::Buttonbar;
3038		3290
3039	our @ISA = CFClient::UI::HBox::;	3291	our @ISA = CFPlus::UI::HBox::;
3040		3292
3041	# TODO: should actualyl wrap buttons and other goodies.	3293	# TODO: should actually wrap buttons and other goodies.
3042		3294
3043	#############################################################################	3295	#############################################################################
3044		3296
3045	package CFClient::UI::Menu;	3297	package CFPlus::UI::Menu;
3046		3298
3047	our @ISA = CFClient::UI::FancyFrame::;	3299	our @ISA = CFPlus::UI::Toplevel::;
3048		3300
3049	use CFClient::OpenGL;	3301	use CFPlus::OpenGL;
3050		3302
3051	sub new {	3303	sub new {
3052	my $class = shift;	3304	my $class = shift;
3053		3305
3054	my $self = $class->SUPER::new (	3306	my $self = $class->SUPER::new (
3055	items => [],	3307	items => [],
3056	z => 100,	3308	z => 100,
3057	@_,	3309	@_,
3058	);	3310	);
3059		3311
3060	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3312	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061		3313
3062	for my $item (@{ $self->{items} }) {	3314	for my $item (@{ $self->{items} }) {
3063	my ($widget, $cb, $tooltip) = @$item;	3315	my ($widget, $cb, $tooltip) = @$item;
3064		3316
3065	# handle various types of items, only text for now	3317	# handle various types of items, only text for now
3066	if (!ref $widget) {	3318	if (!ref $widget) {
		3319	if ($widget =~ /\t/) {
		3320	my ($left, $right) = split /\t/, $widget, 2;
		3321
3067	$widget = new CFClient::UI::Label	3322	$widget = new CFPlus::UI::HBox
3068	can_hover => 1,	3323	can_hover => 1,
3069	can_events => 1,	3324	can_events => 1,
		3325	tooltip => $tooltip,
		3326	children => [
		3327	(new CFPlus::UI::Label markup => $left, expand => 1),
		3328	(new CFPlus::UI::Label markup => $right, align => +1),
		3329	],
		3330	;
		3331
		3332	} else {
		3333	$widget = new CFPlus::UI::Label
		3334	can_hover => 1,
		3335	can_events => 1,
3070	markup => $widget,	3336	markup => $widget,
3071	tooltip => $tooltip	3337	tooltip => $tooltip;
		3338	}
3072	}	3339	}
3073		3340
3074	$self->{item}{$widget} = $item;	3341	$self->{item}{$widget} = $item;
3075		3342
3076	$self->{vbox}->add ($widget);	3343	$self->{vbox}->add ($widget);
…		…
3119	1	3386	1
3120	}	3387	}
3121		3388
3122	#############################################################################	3389	#############################################################################
3123		3390
3124	package CFClient::UI::Multiplexer;	3391	package CFPlus::UI::Multiplexer;
3125		3392
3126	our @ISA = CFClient::UI::Container::;	3393	our @ISA = CFPlus::UI::Container::;
3127		3394
3128	sub new {	3395	sub new {
3129	my $class = shift;	3396	my $class = shift;
3130		3397
3131	my $self = $class->SUPER::new (	3398	my $self = $class->SUPER::new (
…		…
3145		3412
3146	$self->{current} = $self->{children}[0]	3413	$self->{current} = $self->{children}[0]
3147	if @{ $self->{children} };	3414	if @{ $self->{children} };
3148	}	3415	}
3149		3416
		3417	sub get_current_page {
		3418	my ($self) = @_;
		3419
		3420	$self->{current}
		3421	}
		3422
3150	sub set_current_page {	3423	sub set_current_page {
3151	my ($self, $page_or_widget) = @_;	3424	my ($self, $page_or_widget) = @_;
3152		3425
3153	my $widget = ref $page_or_widget	3426	my $widget = ref $page_or_widget
3154	? $page_or_widget	3427	? $page_or_widget
…		…
3186	$self->{current}->draw;	3459	$self->{current}->draw;
3187	}	3460	}
3188		3461
3189	#############################################################################	3462	#############################################################################
3190		3463
3191	package CFClient::UI::Notebook;	3464	package CFPlus::UI::Notebook;
3192		3465
3193	our @ISA = CFClient::UI::VBox::;	3466	our @ISA = CFPlus::UI::VBox::;
3194		3467
3195	sub new {	3468	sub new {
3196	my $class = shift;	3469	my $class = shift;
3197		3470
3198	my $self = $class->SUPER::new (	3471	my $self = $class->SUPER::new (
3199	buttonbar => (new CFClient::UI::Buttonbar),	3472	buttonbar => (new CFPlus::UI::Buttonbar),
3200	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3473	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3201	# filter => # will be put between multiplexer and $self	3474	# filter => # will be put between multiplexer and $self
3202	@_,	3475	@_,
3203	);	3476	);
3204		3477
3205	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3478	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3211	sub add {	3484	sub add {
3212	my ($self, $title, $widget, $tooltip) = @_;	3485	my ($self, $title, $widget, $tooltip) = @_;
3213		3486
3214	Scalar::Util::weaken $self;	3487	Scalar::Util::weaken $self;
3215		3488
3216	$self->{buttonbar}->add (new CFClient::UI::Button	3489	$self->{buttonbar}->add (new CFPlus::UI::Button
3217	markup => $title,	3490	markup => $title,
3218	tooltip => $tooltip,	3491	tooltip => $tooltip,
3219	on_activate => sub { $self->set_current_page ($widget) },	3492	on_activate => sub { $self->set_current_page ($widget) },
3220	);	3493	);
3221		3494
3222	$self->{multiplexer}->add ($widget);	3495	$self->{multiplexer}->add ($widget);
3223	}	3496	}
3224		3497
		3498	sub get_current_page {
		3499	my ($self) = @_;
		3500
		3501	$self->{multiplexer}->get_current_page
		3502	}
		3503
3225	sub set_current_page {	3504	sub set_current_page {
3226	my ($self, $page) = @_;	3505	my ($self, $page) = @_;
3227		3506
3228	$self->{multiplexer}->set_current_page ($page);	3507	$self->{multiplexer}->set_current_page ($page);
3229	$self->emit (page_changed => $self->{multiplexer}{current});	3508	$self->emit (page_changed => $self->{multiplexer}{current});
3230	}	3509	}
3231		3510
3232	#############################################################################	3511	#############################################################################
3233		3512
3234	package CFClient::UI::Combobox;	3513	package CFPlus::UI::Selector;
3235		3514
3236	use utf8;	3515	use utf8;
3237		3516
3238	our @ISA = CFClient::UI::Button::;	3517	our @ISA = CFPlus::UI::Button::;
3239		3518
3240	sub new {	3519	sub new {
3241	my $class = shift;	3520	my $class = shift;
3242		3521
3243	my $self = $class->SUPER::new (	3522	my $self = $class->SUPER::new (
…		…
3260	my ($value, $title, $tooltip) = @$_;	3539	my ($value, $title, $tooltip) = @$_;
3261		3540
3262	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3541	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263	}	3542	}
3264		3543
3265	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3544	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266	}	3545	}
3267		3546
3268	sub _set_value {	3547	sub _set_value {
3269	my ($self, $value) = @_;	3548	my ($self, $value) = @_;
3270		3549
…		…
3285	$self->emit (changed => $value);	3564	$self->emit (changed => $value);
3286	}	3565	}
3287		3566
3288	#############################################################################	3567	#############################################################################
3289		3568
3290	package CFClient::UI::Statusbox;	3569	package CFPlus::UI::Statusbox;
3291		3570
3292	our @ISA = CFClient::UI::VBox::;	3571	our @ISA = CFPlus::UI::VBox::;
3293		3572
3294	sub new {	3573	sub new {
3295	my $class = shift;	3574	my $class = shift;
3296		3575
3297	my $self = $class->SUPER::new (	3576	my $self = $class->SUPER::new (
…		…
3309	sub reorder {	3588	sub reorder {
3310	my ($self) = @_;	3589	my ($self) = @_;
3311	my $NOW = Time::HiRes::time;	3590	my $NOW = Time::HiRes::time;
3312		3591
3313	# freeze display when hovering over any label	3592	# freeze display when hovering over any label
3314	return if $CFClient::UI::TOOLTIP->{owner}	3593	return if $CFPlus::UI::TOOLTIP->{owner}
3315	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3594	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3316	values %{ $self->{item} };	3595	values %{ $self->{item} };
3317		3596
3318	while (my ($k, $v) = each %{ $self->{item} }) {	3597	while (my ($k, $v) = each %{ $self->{item} }) {
3319	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3598	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320	}	3599	}
…		…
3341	for ($short) {	3620	for ($short) {
3342	s/^\s+//;	3621	s/^\s+//;
3343	s/\s+/ /g;	3622	s/\s+/ /g;
3344	}	3623	}
3345		3624
3346	new CFClient::UI::Label	3625	new CFPlus::UI::Label
3347	markup => $short,	3626	markup => $short,
3348	tooltip => $item->{tooltip},	3627	tooltip => $item->{tooltip},
3349	tooltip_font => $::FONT_PROP,	3628	tooltip_font => $::FONT_PROP,
3350	tooltip_width => 0.67,	3629	tooltip_width => 0.67,
3351	fontsize => $item->{fontsize} || $self->{fontsize},	3630	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3405	count => 1,	3684	count => 1,
3406	%arg,	3685	%arg,
3407	};	3686	};
3408	}	3687	}
3409		3688
		3689	$ROOT->on_refresh (reorder => sub {
3410	$self->reorder;	3690	$self->reorder;
		3691	});
3411	}	3692	}
3412		3693
3413	sub reconfigure {	3694	sub reconfigure {
3414	my ($self) = @_;	3695	my ($self) = @_;
3415		3696
…		…
3428	$self->SUPER::destroy;	3709	$self->SUPER::destroy;
3429	}	3710	}
3430		3711
3431	#############################################################################	3712	#############################################################################
3432		3713
3433	package CFClient::UI::Inventory;	3714	package CFPlus::UI::Inventory;
3434		3715
3435	our @ISA = CFClient::UI::ScrolledWindow::;	3716	our @ISA = CFPlus::UI::Table::;
3436		3717
3437	sub new {	3718	sub new {
3438	my $class = shift;	3719	my $class = shift;
3439		3720
3440	my $self = $class->SUPER::new (	3721	my $self = $class->SUPER::new (
3441	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3722	col_expand => [0, 1, 0],
		3723	items => [],
3442	@_,	3724	@_,
3443	);	3725	);
3444		3726
		3727	$self->set_sort_order (undef);
		3728
3445	$self	3729	$self
		3730	}
		3731
		3732	sub update_items {
		3733	my ($self) = @_;
		3734
		3735	$self->clear;
		3736
		3737	my @item = $self->{sort}->(@{ $self->{items} });
		3738
		3739	my @adds;
		3740	my $row = 0;
		3741	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3742	CFPlus::Item::update_widgets $item;
		3743
		3744	push @adds, 0, $row, $item->{face_widget};
		3745	push @adds, 1, $row, $item->{desc_widget};
		3746	push @adds, 2, $row, $item->{weight_widget};
		3747
		3748	$row++;
		3749	}
		3750
		3751	$self->add (@adds);
		3752	}
		3753
		3754	sub set_sort_order {
		3755	my ($self, $order) = @_;
		3756
		3757	$self->{sort} = $order ||= sub {
		3758	sort {
		3759	$a->{type} <=> $b->{type}
		3760	or $a->{name} cmp $b->{name}
		3761	} @_
		3762	};
		3763
		3764	$self->update_items;
3446	}	3765	}
3447		3766
3448	sub set_items {	3767	sub set_items {
3449	my ($self, $items) = @_;	3768	my ($self, $items) = @_;
3450		3769
3451	$self->{child}->clear;	3770	$self->{items} = [$items ? values %$items : ()];
3452	return unless $items;	3771	$self->update_items;
3453
3454	my @items = sort {
3455	($a->{type} <=> $b->{type})
3456	or ($a->{name} cmp $b->{name})
3457	} @$items;
3458
3459	$self->{real_items} = \@items;
3460
3461	my $row = 0;
3462	for my $item (@items) {
3463	CFClient::Item::update_widgets $item;
3464
3465	$self->{child}->add (0, $row, $item->{face_widget});
3466	$self->{child}->add (1, $row, $item->{desc_widget});
3467	$self->{child}->add (2, $row, $item->{weight_widget});
3468
3469	$row++;
3470	}
3471	}	3772	}
3472		3773
3473	#############################################################################	3774	#############################################################################
3474		3775
3475	package CFClient::UI::BindEditor;
3476
3477	our @ISA = CFClient::UI::FancyFrame::;
3478
3479	sub new {
3480	my $class = shift;
3481
3482	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484	$self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488	text => "start recording",
3489	tooltip => "Start/Stops recording of actions."
3490	."All subsequent actions after the recording started will be captured."
3491	."The actions are displayed after the record was stopped."
3492	."To bind the action you have to click on the 'Bind' button",
3493	on_activate => sub {
3494	unless ($self->{recording}) {
3495	$self->start;
3496	} else {
3497	$self->stop;
3498	}
3499	});
3500
3501	$vb->add (new CFClient::UI::Label text => "Actions:");
3502	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3505	$vb->add (my $hb = new CFClient::UI::HBox);
3506	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507	$hb->add (new CFClient::UI::Button
3508	text => "bind",
3509	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510	on_activate => sub {
3511	$self->ask_for_bind;
3512	});
3513
3514	$vb->add (my $hb = new CFClient::UI::HBox);
3515	$hb->add (new CFClient::UI::Button
3516	text => "ok",
3517	expand => 1,
3518	tooltip => "This closes the binding editor and saves the binding",
3519	on_activate => sub {
3520	$self->hide;
3521	$self->commit;
3522	});
3523
3524	$hb->add (new CFClient::UI::Button
3525	text => "cancel",
3526	expand => 1,
3527	tooltip => "This closes the binding editor without saving",
3528	on_activate => sub {
3529	$self->hide;
3530	$self->{binding_cancel}->()
3531	if $self->{binding_cancel};
3532	});
3533
3534	$self->update_binding_widgets;
3535
3536	$self
3537	}
3538
3539	sub cfg_bind {
3540	my ($self, $mod, $sym, $cmds) = @_;
3541	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542	::update_bindings ();
3543	}
3544
3545	sub cfg_unbind {
3546	my ($self, $mod, $sym, $cmds) = @_;
3547	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548	::update_bindings ();
3549	}
3550
3551	sub commit {
3552	my ($self) = @_;
3553	my ($mod, $sym, $cmds) = $self->get_binding;
3554	if ($sym != 0 && @$cmds > 0) {
3555	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556	."'. Don't forget 'Save Config'!");
3557	$self->{binding_change}->($mod, $sym, $cmds)
3558	if $self->{binding_change};
3559	} else {
3560	$::STATUSBOX->add ("No action bound, no key or action specified!");
3561	$self->{binding_cancel}->()
3562	if $self->{binding_cancel};
3563	}
3564	}
3565
3566	sub start {
3567	my ($self) = @_;
3568
3569	$self->{rec_btn}->set_text ("stop recording");
3570	$self->{recording} = 1;
3571	$self->clear_command_list;
3572	$::CONN->start_record if $::CONN;
3573	}
3574
3575	sub stop {
3576	my ($self) = @_;
3577
3578	$self->{rec_btn}->set_text ("start recording");
3579	$self->{recording} = 0;
3580
3581	my $rec;
3582	$rec = $::CONN->stop_record if $::CONN;
3583	return unless ref $rec eq 'ARRAY';
3584	$self->set_command_list ($rec);
3585	}
3586
3587
3588	sub ask_for_bind_and_commit {
3589	my ($self) = @_;
3590	$self->ask_for_bind (1);
3591	}
3592
3593	sub ask_for_bind {
3594	my ($self, $commit, $end_cb) = @_;
3595
3596	CFClient::Binder::open_binding_dialog (sub {
3597	my ($mod, $sym) = @_;
3598	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599	$self->update_binding_widgets;
3600	$self->commit if $commit;
3601	$end_cb->() if $end_cb;
3602	});
3603	}
3604
3605	# $mod and $sym are the modifiers and key symbol
3606	# $cmds is a array ref of strings (the commands)
3607	# $cb is the callback that is executed on OK
3608	# $ccb is the callback that is executed on CANCEL and
3609	# when the binding was unsuccessful on OK
3610	sub set_binding {
3611	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613	$self->clear_command_list;
3614	$self->{recording} = 0;
3615	$self->{rec_btn}->set_text ("start recording");
3616
3617	$self->{binding} = [$mod, $sym];
3618	$self->{commands} = $cmds;
3619
3620	$self->{binding_change} = $cb;
3621	$self->{binding_cancel} = $ccb;
3622
3623	$self->update_binding_widgets;
3624	}
3625
3626	# this is a shortcut method that asks for a binding
3627	# and then just binds it.
3628	sub do_quick_binding {
3629	my ($self, $cmds, $end_cb) = @_;
3630	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631	$self->ask_for_bind (1, $end_cb);
3632	}
3633
3634	sub update_binding_widgets {
3635	my ($self) = @_;
3636	my ($mod, $sym, $cmds) = $self->get_binding;
3637	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638	$self->set_command_list ($cmds);
3639	}
3640
3641	sub get_binding {
3642	my ($self) = @_;
3643	return (
3644	$self->{binding}->[0],
3645	$self->{binding}->[1],
3646	[ grep { defined $_ } @{$self->{commands}} ]
3647	);
3648	}
3649
3650	sub clear_command_list {
3651	my ($self) = @_;
3652	$self->{cmdbox}->clear ();
3653	}
3654
3655	sub set_command_list {
3656	my ($self, $cmds) = @_;
3657
3658	$self->{cmdbox}->clear ();
3659	$self->{commands} = $cmds;
3660
3661	my $idx = 0;
3662
3663	for (@$cmds) {
3664	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666	my $i = $idx;
3667	$hb->add (new CFClient::UI::Label text => $_);
3668	$hb->add (new CFClient::UI::Button
3669	text => "delete",
3670	tooltip => "Deletes the action from the record",
3671	on_activate => sub {
3672	$self->{cmdbox}->remove ($hb);
3673	$cmds->[$i] = undef;
3674	});
3675
3676
3677	$idx++
3678	}
3679	}
3680
3681	#############################################################################
3682
3683	package CFClient::UI::SpellList;	3776	package CFPlus::UI::SpellList;
3684		3777
3685	our @ISA = CFClient::UI::Table::;	3778	our @ISA = CFPlus::UI::Table::;
3686		3779
3687	sub new {	3780	sub new {
3688	my $class = shift;	3781	my $class = shift;
3689		3782
3690	my $self = $class->SUPER::new (	3783	my $self = $class->SUPER::new (
…		…
3708	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3801	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709		3802
3710	sub rebuild_spell_list {	3803	sub rebuild_spell_list {
3711	my ($self) = @_;	3804	my ($self) = @_;
3712		3805
3713	$CFClient::UI::ROOT->on_refresh ($self => sub {	3806	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3714	$self->clear;	3807	$self->clear;
3715		3808
3716	return unless $::CONN;	3809	return unless $::CONN;
3717		3810
3718	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3811	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3812	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3813	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3814	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3815	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723		3816
3724	my $row = 0;	3817	my $row = 0;
3725		3818
3726	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3819	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727	my $spell = $self->{spell}{$_};	3820	my $spell = $self->{spell}{$_};
…		…
3734	if ($ev->{button} == 1) {	3827	if ($ev->{button} == 1) {
3735	$::CONN->user_send ("cast $spell->{name}");	3828	$::CONN->user_send ("cast $spell->{name}");
3736	} elsif ($ev->{button} == 2) {	3829	} elsif ($ev->{button} == 2) {
3737	$::CONN->user_send ("invoke $spell->{name}");	3830	$::CONN->user_send ("invoke $spell->{name}");
3738	} elsif ($ev->{button} == 3) {	3831	} elsif ($ev->{button} == 3) {
		3832	my $shortname = CFPlus::shorten $spell->{name}, 14;
3739	(new CFClient::UI::Menu	3833	(new CFPlus::UI::Menu
3740	items => [	3834	items => [
3741	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3835	["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3836	["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743	],	3837	],
3744	)->popup ($ev);	3838	)->popup ($ev);
3745	} else {	3839	} else {
3746	return 0;	3840	return 0;
3747	}	3841	}
3748		3842
3749	1	3843	1
3750	};	3844	};
3751		3845
3752	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3846	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3753		3847
3754	#TODO: add path info to tooltip	3848	#TODO: add path info to tooltip
3755	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3849	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3756		3850
3757	$self->add (0, $row, new CFClient::UI::Face	3851	$self->add (0, $row, new CFPlus::UI::Face
3758	face => $spell->{face},	3852	face => $spell->{face},
3759	can_hover => 1,	3853	can_hover => 1,
3760	can_events => 1,	3854	can_events => 1,
3761	tooltip => $tooltip,	3855	tooltip => $tooltip,
3762	on_button_down => $spell_cb,	3856	on_button_down => $spell_cb,
3763	);	3857	);
3764		3858
3765	$self->add (1, $row, new CFClient::UI::Label	3859	$self->add (1, $row, new CFPlus::UI::Label
3766	expand => 1,	3860	expand => 1,
3767	text => $spell->{name},	3861	text => $spell->{name},
3768	can_hover => 1,	3862	can_hover => 1,
3769	can_events => 1,	3863	can_events => 1,
3770	tooltip => $tooltip,	3864	tooltip => $tooltip,
3771	on_button_down => $spell_cb,	3865	on_button_down => $spell_cb,
3772	);	3866	);
3773		3867
3774	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3868	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3869	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3870	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3871	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778	}	3872	}
3779	});	3873	});
3780	}	3874	}
3781		3875
3782	sub add_spell {	3876	sub add_spell {
…		…
3800	$self->rebuild_spell_list;	3894	$self->rebuild_spell_list;
3801	}	3895	}
3802		3896
3803	#############################################################################	3897	#############################################################################
3804		3898
3805	package CFClient::UI::Root;	3899	package CFPlus::UI::Root;
3806		3900
3807	our @ISA = CFClient::UI::Container::;	3901	our @ISA = CFPlus::UI::Container::;
3808		3902
3809	use List::Util qw(min max);	3903	use List::Util qw(min max);
3810		3904
3811	use CFClient::OpenGL;	3905	use CFPlus::OpenGL;
3812		3906
3813	sub new {	3907	sub new {
3814	my $class = shift;	3908	my $class = shift;
3815		3909
3816	my $self = $class->SUPER::new (	3910	my $self = $class->SUPER::new (
…		…
3992	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4086	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993		4087
3994	$w = 0 if $w < 0;	4088	$w = 0 if $w < 0;
3995	$h = 0 if $h < 0;	4089	$h = 0 if $h < 0;
3996		4090
		4091	$w = max $widget->{min_w}, $w;
		4092	$h = max $widget->{min_h}, $h;
		4093
		4094	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4095	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4096
		4097	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4098	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4099
3997	$w = int $w + 0.5;	4100	$w = int $w + 0.5;
3998	$h = int $h + 0.5;	4101	$h = int $h + 0.5;
3999		4102
4000	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4103	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001	$widget->{old_w} = $widget->{w};	4104	$widget->{old_w} = $widget->{w};
…		…
4024	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4127	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4025	glMatrixMode GL_MODELVIEW;	4128	glMatrixMode GL_MODELVIEW;
4026	glLoadIdentity;	4129	glLoadIdentity;
4027		4130
4028	{	4131	{
4029	package CFClient::UI::Base;	4132	package CFPlus::UI::Base;
4030		4133
4031	($draw_x, $draw_y, $draw_w, $draw_h) =	4134	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4032	(0, 0, $self->{w}, $self->{h});	4135	(0, 0, $self->{w}, $self->{h});
4033	}
4034		4136
4035	$self->_draw;	4137	$self->_draw;
		4138	}
4036	}	4139	}
4037		4140
4038	#############################################################################	4141	#############################################################################
4039		4142
4040	package CFClient::UI;	4143	package CFPlus::UI;
4041		4144
4042	$ROOT = new CFClient::UI::Root;	4145	$ROOT = new CFPlus::UI::Root;
4043	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4146	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4044		4147
4045	1	4148	1
4046		4149

Diff Legend

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