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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.343 by root, Sun Aug 13 15:14:17 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	}
…		…
335	sub size_request {	358	sub size_request {
336	require Carp;	359	require Carp;
337	Carp::confess "size_request is abstract";	360	Carp::confess "size_request is abstract";
338	}	361	}
339		362
		363	sub baseline_shift {
		364	0
		365	}
		366
340	sub configure {	367	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
342		369
343	if ($self->{aspect}) {	370	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
345		372
346	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		375
349	# use alignment to adjust x, y	376	# use alignment to adjust x, y
350		377
351	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
393		420
394	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
395		422
396	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
397		424
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	428	}
402	}	429	}
403		430
404	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
405	sub coord2local {	432	sub coord2local {
406	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
407		434
		435	Carp::confess unless $self->{parent};#d#
		436
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	438	}
410		439
411	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
412	sub coord2global {	441	sub coord2global {
413	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
414		443
		444	Carp::confess unless $self->{parent};#d#
		445
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	447	}
417		448
418	sub invoke_focus_in {	449	sub invoke_focus_in {
419	my ($self) = @_;	450	my ($self) = @_;
420		451
421	return if $FOCUS == $self;	452	return if $FOCUS == $self;
422	return unless $self->{can_focus};	453	return unless $self->{can_focus};
423		454
424	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
425		456
426	$focus->update if $focus;	457	$self->update;
427	$FOCUS->update;
428		458
429	0	459	0
430	}	460	}
431		461
432	sub invoke_focus_out {	462	sub invoke_focus_out {
433	my ($self) = @_;	463	my ($self) = @_;
434		464
435	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
436		466
437	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
438		468
439	$focus->update if $focus; #?	469	$self->update;
440		470
441	$::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
442	unless $FOCUS;	472	unless $FOCUS;
443		473
444	0	474	0
445	}	475	}
446		476
447	sub grab_focus {	477	sub grab_focus {
448	my ($self) = @_;	478	my ($self) = @_;
449		479
		480	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	481	$self->emit ("focus_in");
451	}	482	}
452		483
453	sub invoke_mouse_motion { 1 }	484	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	485	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	486	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
457		489
458	sub invoke_button_down {	490	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
460		492
461	$self->grab_focus;	493	$self->grab_focus;
462		494
463	1	495	0
464	}	496	}
465		497
466	sub connect {	498	sub connect {
467	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
468		500
469	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	}
470	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
471		515
472	sub emit {	516	sub emit {
473	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
474		518
		519	# I do not really like this solution, but I dislike duplication
		520	# and needlessly verbose code, too.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
475	#d##TODO# stop propagating at first true, do not use sum	528	#d##TODO# stop propagating at first true, do not use sum
476	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
477	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
478	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
479	}	532	}
480		533
481	sub find_widget {	534	sub find_widget {
482	my ($self, $x, $y) = @_;	535	my ($self, $x, $y) = @_;
483		536
…		…
535	return unless $self->{h} && $self->{w};	588	return unless $self->{h} && $self->{w};
536		589
537	# update screen rectangle	590	# update screen rectangle
538	local $draw_x = $draw_x + $self->{x};	591	local $draw_x = $draw_x + $self->{x};
539	local $draw_y = $draw_y + $self->{y};	592	local $draw_y = $draw_y + $self->{y};
540	local $draw_w = $draw_x + $self->{w};
541	local $draw_h = $draw_y + $self->{h};
542		593
543	# skip widgets that are entirely outside the drawing area	594	# skip widgets that are entirely outside the drawing area
544	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	595	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	596	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546		597
…		…
569	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
570	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
571	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
572	glEnd;	623	glEnd;
573	glPopMatrix;	624	glPopMatrix;
574	#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;
575	}	626	}
576		627
577	$self->_draw;	628	$self->_draw;
578	glPopMatrix;	629	glPopMatrix;
579	}	630	}
…		…
585	}	636	}
586		637
587	sub DESTROY {	638	sub DESTROY {
588	my ($self) = @_;	639	my ($self) = @_;
589		640
		641	return if CFPlus::in_destruct;
		642
590	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
591		644
592	eval { $self->destroy };	645	eval { $self->destroy };
593	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
594	}	647	}
595		648
596	#############################################################################	649	#############################################################################
597		650
598	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
599		652
600	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
601		654
602	use strict;	655	use strict;
603	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
604		657
605	sub new {	658	sub new {
606	my $class = shift;	659	my $class = shift;
607		660
608	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
639	}	692	}
640	}	693	}
641		694
642	#############################################################################	695	#############################################################################
643		696
644	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
645		698
646	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
647		700
648	sub new {	701	sub new {
649	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
650	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
651	}	704	}
…		…
658		711
659	sub draw { }	712	sub draw { }
660		713
661	#############################################################################	714	#############################################################################
662		715
663	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
664		717
665	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
666		719
667	sub new {	720	sub new {
668	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
669		722
670	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
679	if $children;	732	if $children;
680		733
681	$self	734	$self
682	}	735	}
683		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
684	sub add {	745	sub add {
685	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
686		747
687	$_->set_parent ($self)	748	$_->set_parent ($self)
688	for @widgets;	749	for @widgets;
…		…
748	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
749	}	810	}
750		811
751	#############################################################################	812	#############################################################################
752		813
753	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
754		815
755	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
756		817
757	sub new {	818	sub new {
758	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
759		820
760	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
761		822
762	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
763	}	824	}
764		825
765	sub add {	826	sub add {
…		…
772	sub remove {	833	sub remove {
773	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
774		835
775	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
776		837
777	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
778	unless @{$self->{children}};	839	unless @{$self->{children}};
779	}	840	}
780		841
781	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
782		843
…		…
794		855
795	#############################################################################	856	#############################################################################
796		857
797	# back-buffered drawing area	858	# back-buffered drawing area
798		859
799	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
800		861
801	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
802		863
803	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
804		865
805	sub new {	866	sub new {
806	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
807		868
808	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
830	}	891	}
831		892
832	sub render_child {	893	sub render_child {
833	my ($self) = @_;	894	my ($self) = @_;
834		895
835	$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 {
836	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
837	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
838		899
839	{	900	{
840	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
841		902
842	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
843	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
844	}	905	}
845		906
…		…
864	glDisable GL_TEXTURE_2D;	925	glDisable GL_TEXTURE_2D;
865	}	926	}
866		927
867	#############################################################################	928	#############################################################################
868		929
869	package CFClient::UI::ViewPort;	930	package CFPlus::UI::ViewPort;
870		931
871	our @ISA = CFClient::UI::Window::;	932	our @ISA = CFPlus::UI::Window::;
872		933
873	sub new {	934	sub new {
874	my $class = shift;	935	my $class = shift;
875		936
876	$class->SUPER::new (	937	$class->SUPER::new (
…		…
936	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	997	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	998	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
938	) {	999	) {
939	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1000	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940	} else {	1001	} else {
941	$self->CFClient::UI::Base::find_widget ($x, $y)	1002	$self->CFPlus::UI::Base::find_widget ($x, $y)
942	}	1003	}
943	}	1004	}
944		1005
945	sub _render {	1006	sub _render {
946	my ($self) = @_;	1007	my ($self) = @_;
947		1008
948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1009	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1010	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950		1011
951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1012	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952		1013
953	$self->SUPER::_render;	1014	$self->SUPER::_render;
954	}	1015	}
955		1016
956	#############################################################################	1017	#############################################################################
957		1018
958	package CFClient::UI::ScrolledWindow;	1019	package CFPlus::UI::ScrolledWindow;
959		1020
960	our @ISA = CFClient::UI::HBox::;	1021	our @ISA = CFPlus::UI::HBox::;
961		1022
962	sub new {	1023	sub new {
963	my ($class, %arg) = @_;	1024	my ($class, %arg) = @_;
964		1025
965	my $child = delete $arg{child};	1026	my $child = delete $arg{child};
966		1027
967	my $self;	1028	my $self;
968		1029
969	my $slider = new CFClient::UI::Slider	1030	my $slider = new CFPlus::UI::Slider
970	vertical => 1,	1031	vertical => 1,
971	range => [0, 0, 1, 0.01], # HACK fix	1032	range => [0, 0, 1, 0.01], # HACK fix
972	on_changed => sub {	1033	on_changed => sub {
973	$self->{vp}->set_offset (0, $_[1]);	1034	$self->{vp}->set_offset (0, $_[1]);
974	},	1035	},
975	;	1036	;
976		1037
977	$self = $class->SUPER::new (	1038	$self = $class->SUPER::new (
978	vp => (new CFClient::UI::ViewPort expand => 1),	1039	vp => (new CFPlus::UI::ViewPort expand => 1),
		1040	can_events => 1,
979	slider => $slider,	1041	slider => $slider,
980	%arg,	1042	%arg,
981	);	1043	);
982		1044
983	$self->SUPER::add ($self->{vp}, $self->{slider});	1045	$self->SUPER::add ($self->{vp}, $self->{slider});
984	$self->add ($child) if $child;	1046	$self->add ($child) if $child;
985		1047
986	$self	1048	$self
987	}	1049	}
988		1050
		1051	#TODO# update range on size_allocate depending on child
		1052
989	sub add {	1053	sub add {
990	my ($self, $widget) = @_;	1054	my ($self, $widget) = @_;
991		1055
992	$self->{vp}->add ($self->{child} = $widget);	1056	$self->{vp}->add ($self->{child} = $widget);
993	}	1057	}
994		1058
		1059	sub invoke_mouse_wheel {
		1060	my ($self, $ev) = @_;
		1061
		1062	return 0 unless $ev->{dy}; # only vertical movements
		1063
		1064	$self->{slider}->emit (mouse_wheel => $ev);
		1065
		1066	1
		1067	}
		1068
		1069	sub update_slider {
		1070	my ($self) = @_;
		1071
		1072	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1073	}
		1074
995	sub update {	1075	sub update {
996	my ($self) = @_;	1076	my ($self) = @_;
997		1077
998	$self->SUPER::update;	1078	$self->SUPER::update;
999		1079
1000	# todo: overwrite size_allocate of child	1080	$self->update_slider;
1001	my $child = $self->{vp}->child;
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003	}	1081	}
1004		1082
1005	sub invoke_size_allocate {	1083	sub invoke_size_allocate {
1006	my ($self, $w, $h) = @_;	1084	my ($self, $w, $h) = @_;
1007		1085
1008	my $child = $self->{vp}->child;	1086	$self->update_slider;
1009	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010		1087
1011	$self->SUPER::invoke_size_allocate ($w, $h)	1088	$self->SUPER::invoke_size_allocate ($w, $h)
1012	}	1089	}
1013		1090
1014	#TODO# update range on size_allocate depending on child
1015	# update viewport offset on scroll
1016
1017	#############################################################################	1091	#############################################################################
1018		1092
1019	package CFClient::UI::Frame;	1093	package CFPlus::UI::Frame;
1020		1094
1021	our @ISA = CFClient::UI::Bin::;	1095	our @ISA = CFPlus::UI::Bin::;
1022		1096
1023	use CFClient::OpenGL;	1097	use CFPlus::OpenGL;
1024		1098
1025	sub new {	1099	sub new {
1026	my $class = shift;	1100	my $class = shift;
1027		1101
1028	$class->SUPER::new (	1102	$class->SUPER::new (
…		…
1054	$self->SUPER::_draw;	1128	$self->SUPER::_draw;
1055	}	1129	}
1056		1130
1057	#############################################################################	1131	#############################################################################
1058		1132
1059	package CFClient::UI::FancyFrame;	1133	package CFPlus::UI::FancyFrame;
1060		1134
1061	our @ISA = CFClient::UI::Bin::;	1135	our @ISA = CFPlus::UI::Bin::;
1062		1136
1063	use CFClient::OpenGL;	1137	use CFPlus::OpenGL;
1064		1138
1065	my $bg =	1139	my $bg =
1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1140	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067	mipmap => 1, wrap => 1;	1141	mipmap => 1, wrap => 1;
1068		1142
1069	my @border =	1143	my @border =
1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1144	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1145	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072		1146
1073	sub new {	1147	sub new {
1074	my ($class, %arg) = @_;	1148	my ($class, %arg) = @_;
1075		1149
1076	my $self = $class->SUPER::new (	1150	my $self = $class->SUPER::new (
1077	bg => [1, 1, 1, 1],	1151	bg => [1, 1, 1, 1],
1078	border_bg => [1, 1, 1, 1],	1152	border_bg => [1, 1, 1, 1],
1079	border => 0.6,	1153	border => 0.6,
1080	can_events => 1,	1154	can_events => 1,
1081	min_w => 16,	1155	min_w => 64,
1082	min_h => 16,	1156	min_h => 32,
1083	%arg,	1157	%arg,
1084	);	1158	);
1085		1159
1086	$self->{title_widget} = new CFClient::UI::Label	1160	$self->{title_widget} = new CFPlus::UI::Label
1087	align => 0,	1161	align => 0,
1088	valign => 1,	1162	valign => 1,
1089	text => $self->{title},	1163	text => $self->{title},
1090	fontsize => $self->{border},	1164	fontsize => $self->{border},
1091	if exists $self->{title};	1165	if exists $self->{title};
1092		1166
1093	if ($self->{has_close_button}) {	1167	if ($self->{has_close_button}) {
1094	$self->{close_button} =	1168	$self->{close_button} =
1095	new CFClient::UI::ImageButton	1169	new CFPlus::UI::ImageButton
1096	image => 'x1_close.png',	1170	path => 'x1_close.png',
1097	on_activate => sub { $self->hide };	1171	on_activate => sub { $self->emit ("delete") };
1098		1172
1099	$self->CFClient::UI::Container::add ($self->{close_button});	1173	$self->CFPlus::UI::Container::add ($self->{close_button});
1100	}	1174	}
1101		1175
1102	$self	1176	$self
1103	}	1177	}
1104		1178
1105	sub add {	1179	sub add {
1106	my ($self, @widgets) = @_;	1180	my ($self, @widgets) = @_;
1107		1181
1108	$self->SUPER::add (@widgets);	1182	$self->SUPER::add (@widgets);
1109	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1183	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1184	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111	}	1185	}
1112		1186
1113	sub border {	1187	sub border {
1114	int $_[0]{border} * $::FONTSIZE	1188	int $_[0]{border} * $::FONTSIZE
1115	}	1189	}
…		…
1148	$self->child->configure ($border, $border, $w, $h);	1222	$self->child->configure ($border, $border, $w, $h);
1149		1223
1150	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1224	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151	if $self->{close_button};	1225	if $self->{close_button};
1152		1226
		1227	1
		1228	}
		1229
		1230	sub invoke_delete {
		1231	my ($self) = @_;
		1232
		1233	$self->hide;
		1234
1153	1	1235	1
1154	}	1236	}
1155		1237
1156	sub invoke_button_down {	1238	sub invoke_button_down {
1157	my ($self, $ev, $x, $y) = @_;	1239	my ($self, $ev, $x, $y) = @_;
…		…
1215	$self->{motion}->($ev, $x, $y) if $self->{motion};	1297	$self->{motion}->($ev, $x, $y) if $self->{motion};
1216		1298
1217	! ! $self->{motion}	1299	! ! $self->{motion}
1218	}	1300	}
1219		1301
		1302	sub invoke_visibility_change {
		1303	my ($self, $visible) = @_;
		1304
		1305	delete $self->{motion} unless $visible;
		1306
		1307	0
		1308	}
		1309
1220	sub _draw {	1310	sub _draw {
1221	my ($self) = @_;	1311	my ($self) = @_;
1222		1312
1223	my $child = $self->{children}[0];	1313	my $child = $self->{children}[0];
1224		1314
…		…
1261	if $self->{close_button};	1351	if $self->{close_button};
1262	}	1352	}
1263		1353
1264	#############################################################################	1354	#############################################################################
1265		1355
1266	package CFClient::UI::Table;	1356	package CFPlus::UI::Table;
1267		1357
1268	our @ISA = CFClient::UI::Base::;	1358	our @ISA = CFPlus::UI::Base::;
1269		1359
1270	use List::Util qw(max sum);	1360	use List::Util qw(max sum);
1271		1361
1272	use CFClient::OpenGL;	1362	use CFPlus::OpenGL;
1273		1363
1274	sub new {	1364	sub new {
1275	my $class = shift;	1365	my $class = shift;
1276		1366
1277	$class->SUPER::new (	1367	$class->SUPER::new (
…		…
1283	sub children {	1373	sub children {
1284	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1374	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285	}	1375	}
1286		1376
1287	sub add {	1377	sub add {
1288	my ($self, $x, $y, $child) = @_;	1378	my ($self) = shift;
1289		1379
		1380	while (@_) {
		1381	my ($x, $y, $child) = splice @_, 0, 3, ();
1290	$child->set_parent ($self);	1382	$child->set_parent ($self);
1291	$self->{children}[$y][$x] = $child;	1383	$self->{children}[$y][$x] = $child;
		1384	}
1292		1385
		1386	$self->{force_realloc} = 1;
		1387	$self->{force_size_alloc} = 1;
1293	$self->realloc;	1388	$self->realloc;
1294	}	1389	}
1295		1390
1296	sub remove {	1391	sub remove {
1297	my ($self, $child) = @_;	1392	my ($self, $child) = @_;
…		…
1362		1457
1363	# linearly scale sizes	1458	# linearly scale sizes
1364	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1459	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1460	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366		1461
1367	CFClient::UI::harmonize $ws;	1462	CFPlus::UI::harmonize $ws;
1368	CFClient::UI::harmonize $hs;	1463	CFPlus::UI::harmonize $hs;
1369		1464
1370	my $y;	1465	my $y;
1371		1466
1372	for my $r (0 .. $#{$self->{children}}) {	1467	for my $r (0 .. $#{$self->{children}}) {
1373	my $row = $self->{children}[$r]	1468	my $row = $self->{children}[$r]
…		…
1416	}	1511	}
1417	}	1512	}
1418		1513
1419	#############################################################################	1514	#############################################################################
1420		1515
1421	package CFClient::UI::Box;	1516	package CFPlus::UI::Box;
1422		1517
1423	our @ISA = CFClient::UI::Container::;	1518	our @ISA = CFPlus::UI::Container::;
1424		1519
1425	sub size_request {	1520	sub size_request {
1426	my ($self) = @_;	1521	my ($self) = @_;
1427		1522
1428	$self->{vertical}	1523	$self->{vertical}
…		…
1438		1533
1439	sub invoke_size_allocate {	1534	sub invoke_size_allocate {
1440	my ($self, $w, $h) = @_;	1535	my ($self, $w, $h) = @_;
1441		1536
1442	my $space = $self->{vertical} ? $h : $w;	1537	my $space = $self->{vertical} ? $h : $w;
1443	my $children = $self->{children};	1538	my @children = $self->visible_children;
1444		1539
1445	my @req;	1540	my @req;
1446		1541
1447	if ($self->{homogeneous}) {	1542	if ($self->{homogeneous}) {
1448	@req = ($space / (@$children || 1)) x @$children;	1543	@req = ($space / (@children || 1)) x @children;
1449	} else {	1544	} else {
1450	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1545	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451	my $req = List::Util::sum @req;	1546	my $req = List::Util::sum @req;
1452		1547
1453	if ($req > $space) {	1548	if ($req > $space) {
1454	# ah well, not enough space	1549	# ah well, not enough space
1455	$_ *= $space / $req for @req;	1550	$_ *= $space / $req for @req;
1456	} else {	1551	} else {
1457	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1552	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458		1553
1459	$space = ($space - $req) / $expand; # remaining space to give away	1554	$space = ($space - $req) / $expand; # remaining space to give away
1460		1555
1461	$req[$_] += $space * $children->[$_]{expand}	1556	$req[$_] += $space * $children[$_]{expand}
1462	for 0 .. $#$children;	1557	for 0 .. $#children;
1463	}	1558	}
1464	}	1559	}
1465		1560
1466	CFClient::UI::harmonize \@req;	1561	CFPlus::UI::harmonize \@req;
1467		1562
1468	my $pos = 0;	1563	my $pos = 0;
1469	for (0 .. $#$children) {	1564	for (0 .. $#children) {
1470	my $alloc = $req[$_];	1565	my $alloc = $req[$_];
1471	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1566	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472		1567
1473	$pos += $alloc;	1568	$pos += $alloc;
1474	}	1569	}
1475		1570
1476	1	1571	1
1477	}	1572	}
1478		1573
1479	#############################################################################	1574	#############################################################################
1480		1575
1481	package CFClient::UI::HBox;	1576	package CFPlus::UI::HBox;
1482		1577
1483	our @ISA = CFClient::UI::Box::;	1578	our @ISA = CFPlus::UI::Box::;
1484		1579
1485	sub new {	1580	sub new {
1486	my $class = shift;	1581	my $class = shift;
1487		1582
1488	$class->SUPER::new (	1583	$class->SUPER::new (
…		…
1491	)	1586	)
1492	}	1587	}
1493		1588
1494	#############################################################################	1589	#############################################################################
1495		1590
1496	package CFClient::UI::VBox;	1591	package CFPlus::UI::VBox;
1497		1592
1498	our @ISA = CFClient::UI::Box::;	1593	our @ISA = CFPlus::UI::Box::;
1499		1594
1500	sub new {	1595	sub new {
1501	my $class = shift;	1596	my $class = shift;
1502		1597
1503	$class->SUPER::new (	1598	$class->SUPER::new (
…		…
1506	)	1601	)
1507	}	1602	}
1508		1603
1509	#############################################################################	1604	#############################################################################
1510		1605
1511	package CFClient::UI::Label;	1606	package CFPlus::UI::Label;
1512		1607
1513	our @ISA = CFClient::UI::DrawBG::;	1608	our @ISA = CFPlus::UI::DrawBG::;
1514		1609
1515	use CFClient::OpenGL;	1610	use CFPlus::OpenGL;
1516		1611
1517	sub new {	1612	sub new {
1518	my ($class, %arg) = @_;	1613	my ($class, %arg) = @_;
1519		1614
1520	my $self = $class->SUPER::new (	1615	my $self = $class->SUPER::new (
…		…
1523	#active_bg => none	1618	#active_bg => none
1524	#font => default_font	1619	#font => default_font
1525	#text => initial text	1620	#text => initial text
1526	#markup => initial narkup	1621	#markup => initial narkup
1527	#max_w => maximum pixel width	1622	#max_w => maximum pixel width
		1623	#style => 0, # render flags
1528	ellipsise => 3, # end	1624	ellipsise => 3, # end
1529	layout => (new CFClient::Layout),	1625	layout => (new CFPlus::Layout),
1530	fontsize => 1,	1626	fontsize => 1,
1531	align => -1,	1627	align => -1,
1532	valign => -1,	1628	valign => -1,
1533	padding_x => 2,	1629	padding_x => 2,
1534	padding_y => 2,	1630	padding_y => 2,
1535	can_events => 0,	1631	can_events => 0,
1536	%arg	1632	%arg
1537	);	1633	);
1538		1634
1539	if (exists $self->{template}) {	1635	if (exists $self->{template}) {
1540	my $layout = new CFClient::Layout;	1636	my $layout = new CFPlus::Layout;
1541	$layout->set_text (delete $self->{template});	1637	$layout->set_text (delete $self->{template});
1542	$self->{template} = $layout;	1638	$self->{template} = $layout;
1543	}	1639	}
1544		1640
1545	if (exists $self->{markup}) {	1641	if (exists $self->{markup}) {
…		…
1549	}	1645	}
1550		1646
1551	$self	1647	$self
1552	}	1648	}
1553		1649
1554	sub escape($) {
1555	local $_ = $_[0];
1556
1557	s/&/&amp;/g;
1558	s/>/&gt;/g;
1559	s/</&lt;/g;
1560
1561	$_
1562	}
1563
1564	sub update {	1650	sub update {
1565	my ($self) = @_;	1651	my ($self) = @_;
1566		1652
1567	delete $self->{texture};	1653	delete $self->{texture};
1568	$self->SUPER::update;	1654	$self->SUPER::update;
…		…
1579	my ($self, $text) = @_;	1665	my ($self, $text) = @_;
1580		1666
1581	return if $self->{text} eq "T$text";	1667	return if $self->{text} eq "T$text";
1582	$self->{text} = "T$text";	1668	$self->{text} = "T$text";
1583		1669
1584	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585	$self->{layout}->set_text ($text);	1670	$self->{layout}->set_text ($text);
1586		1671
1587	delete $self->{size_req};	1672	delete $self->{size_req};
1588	$self->realloc;	1673	$self->realloc;
1589	$self->update;	1674	$self->update;
…		…
1595	return if $self->{text} eq "M$markup";	1680	return if $self->{text} eq "M$markup";
1596	$self->{text} = "M$markup";	1681	$self->{text} = "M$markup";
1597		1682
1598	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1683	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599		1684
1600	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601	$self->{layout}->set_markup ($markup);	1685	$self->{layout}->set_markup ($markup);
1602		1686
1603	delete $self->{size_req};	1687	delete $self->{size_req};
1604	$self->realloc;	1688	$self->realloc;
1605	$self->update;	1689	$self->update;
…		…
1617		1701
1618	my ($w, $h) = $self->{layout}->size;	1702	my ($w, $h) = $self->{layout}->size;
1619		1703
1620	if (exists $self->{template}) {	1704	if (exists $self->{template}) {
1621	$self->{template}->set_font ($self->{font}) if $self->{font};	1705	$self->{template}->set_font ($self->{font}) if $self->{font};
		1706	$self->{template}->set_width ($self->{max_w} || -1);
1622	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1707	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623		1708
1624	my ($w2, $h2) = $self->{template}->size;	1709	my ($w2, $h2) = $self->{template}->size;
1625		1710
1626	$w = List::Util::max $w, $w2;	1711	$w = List::Util::max $w, $w2;
…		…
1631	};	1716	};
1632		1717
1633	@{ $self->{size_req} }	1718	@{ $self->{size_req} }
1634	}	1719	}
1635		1720
		1721	sub baseline_shift {
		1722	$_[0]{layout}->descent
		1723	}
		1724
1636	sub invoke_size_allocate {	1725	sub invoke_size_allocate {
1637	my ($self, $w, $h) = @_;	1726	my ($self, $w, $h) = @_;
1638		1727
1639	delete $self->{ox};	1728	delete $self->{ox};
1640		1729
…		…
1646		1735
1647	sub set_fontsize {	1736	sub set_fontsize {
1648	my ($self, $fontsize) = @_;	1737	my ($self, $fontsize) = @_;
1649		1738
1650	$self->{fontsize} = $fontsize;	1739	$self->{fontsize} = $fontsize;
		1740	delete $self->{size_req};
1651	delete $self->{texture};	1741	delete $self->{texture};
1652		1742
1653	$self->realloc;	1743	$self->realloc;
1654	}	1744	}
1655		1745
1656	sub reconfigure {	1746	sub reconfigure {
1657	my ($self) = @_;	1747	my ($self) = @_;
1658		1748
1659	delete $self->{size_req};	1749	delete $self->{size_req};
		1750	delete $self->{texture};
1660		1751
1661	$self->SUPER::reconfigure;	1752	$self->SUPER::reconfigure;
1662	}	1753	}
1663		1754
1664	sub _draw {	1755	sub _draw {
1665	my ($self) = @_;	1756	my ($self) = @_;
1666		1757
1667	$self->SUPER::_draw; # draw background, if applicable	1758	$self->SUPER::_draw; # draw background, if applicable
1668		1759
1669	my $tex = $self->{texture} ||= do {	1760	my $size = $self->{texture} ||= do {
1670	$self->{layout}->set_foreground (@{$self->{fg}});	1761	$self->{layout}->set_foreground (@{$self->{fg}});
1671	$self->{layout}->set_font ($self->{font}) if $self->{font};	1762	$self->{layout}->set_font ($self->{font}) if $self->{font};
1672	$self->{layout}->set_width ($self->{w});	1763	$self->{layout}->set_width ($self->{w});
1673	$self->{layout}->set_ellipsise ($self->{ellipsise});	1764	$self->{layout}->set_ellipsise ($self->{ellipsise});
1674	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1765	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1766	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676		1767
1677	new_from_layout CFClient::Texture $self->{layout}	1768	[$self->{layout}->size]
1678	};	1769	};
1679		1770
1680	unless (exists $self->{ox}) {	1771	unless (exists $self->{ox}) {
1681	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1772	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1773	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683	: ($self->{w} - $tex->{w}) * 0.5);	1774	: ($self->{w} - $size->[0]) * 0.5);
1684		1775
1685	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1776	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1777	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687	: ($self->{h} - $tex->{h}) * 0.5);	1778	: ($self->{h} - $size->[1]) * 0.5);
1688	};	1779	};
1689		1780
1690	glEnable GL_TEXTURE_2D;
1691
1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1781	my $w = List::Util::min $self->{w} + 4, $size->[0];
1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1782	my $h = List::Util::min $self->{h} + 2, $size->[1];
1694		1783
1695	if ($tex->{format} == GL_ALPHA) {	1784	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697	glColor @{$self->{fg}};
1698	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699	} else {
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702	}
1703
1704	glDisable GL_TEXTURE_2D;
1705	}	1785	}
1706		1786
1707	#############################################################################	1787	#############################################################################
1708		1788
1709	package CFClient::UI::EntryBase;	1789	package CFPlus::UI::EntryBase;
1710		1790
1711	our @ISA = CFClient::UI::Label::;	1791	our @ISA = CFPlus::UI::Label::;
1712		1792
1713	use CFClient::OpenGL;	1793	use CFPlus::OpenGL;
1714		1794
1715	sub new {	1795	sub new {
1716	my $class = shift;	1796	my $class = shift;
1717		1797
1718	$class->SUPER::new (	1798	$class->SUPER::new (
…		…
1780		1860
1781	if ($uni == 8) {	1861	if ($uni == 8) {
1782	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1862	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783	} elsif ($uni == 127) {	1863	} elsif ($uni == 127) {
1784	substr $text, $self->{cursor}, 1, "";	1864	substr $text, $self->{cursor}, 1, "";
1785	} elsif ($sym == CFClient::SDLK_LEFT) {	1865	} elsif ($sym == CFPlus::SDLK_LEFT) {
1786	--$self->{cursor} if $self->{cursor};	1866	--$self->{cursor} if $self->{cursor};
1787	} elsif ($sym == CFClient::SDLK_RIGHT) {	1867	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1788	++$self->{cursor} if $self->{cursor} < length $self->{text};	1868	++$self->{cursor} if $self->{cursor} < length $self->{text};
1789	} elsif ($sym == CFClient::SDLK_HOME) {	1869	} elsif ($sym == CFPlus::SDLK_HOME) {
1790	$self->{cursor} = 0;	1870	$self->{cursor} = 0;
1791	} elsif ($sym == CFClient::SDLK_END) {	1871	} elsif ($sym == CFPlus::SDLK_END) {
1792	$self->{cursor} = length $text;	1872	$self->{cursor} = length $text;
1793	} elsif ($uni == 27) {	1873	} elsif ($uni == 27) {
1794	$self->emit ('escape');	1874	$self->emit ('escape');
1795	} elsif ($uni) {	1875	} elsif ($uni) {
1796	substr $text, $self->{cursor}++, 0, chr $uni;	1876	substr $text, $self->{cursor}++, 0, chr $uni;
…		…
1820		1900
1821	my $idx = $self->{layout}->xy_to_index ($x, $y);	1901	my $idx = $self->{layout}->xy_to_index ($x, $y);
1822		1902
1823	# byte-index to char-index	1903	# byte-index to char-index
1824	my $text = $self->{text};	1904	my $text = $self->{text};
1825	utf8::encode $text;	1905	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826	$self->{cursor} = length substr $text, 0, $idx;	1906	$self->{cursor} = length $text;
1827		1907
1828	$self->_set_text ($self->{text});	1908	$self->_set_text ($self->{text});
1829	$self->update;	1909	$self->update;
1830		1910
1831	1	1911	1
…		…
1878	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	1958	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879	glEnd;	1959	glEnd;
1880	}	1960	}
1881	}	1961	}
1882		1962
1883	package CFClient::UI::Entry;	1963	package CFPlus::UI::Entry;
1884		1964
1885	our @ISA = CFClient::UI::EntryBase::;	1965	our @ISA = CFPlus::UI::EntryBase::;
1886		1966
1887	use CFClient::OpenGL;	1967	use CFPlus::OpenGL;
1888		1968
1889	sub invoke_key_down {	1969	sub invoke_key_down {
1890	my ($self, $ev) = @_;	1970	my ($self, $ev) = @_;
1891		1971
1892	my $sym = $ev->{sym};	1972	my $sym = $ev->{sym};
…		…
1898	$self->{history_pointer} = -1;	1978	$self->{history_pointer} = -1;
1899	$self->{history_saveback} = '';	1979	$self->{history_saveback} = '';
1900	$self->emit (activate => $txt);	1980	$self->emit (activate => $txt);
1901	$self->update;	1981	$self->update;
1902		1982
1903	} elsif ($sym == CFClient::SDLK_UP) {	1983	} elsif ($sym == CFPlus::SDLK_UP) {
1904	if ($self->{history_pointer} < 0) {	1984	if ($self->{history_pointer} < 0) {
1905	$self->{history_saveback} = $self->get_text;	1985	$self->{history_saveback} = $self->get_text;
1906	}	1986	}
1907	if (@{$self->{history} || []} > 0) {	1987	if (@{$self->{history} || []} > 0) {
1908	$self->{history_pointer}++;	1988	$self->{history_pointer}++;
…		…
1910	$self->{history_pointer} = @{$self->{history} || []} - 1;	1990	$self->{history_pointer} = @{$self->{history} || []} - 1;
1911	}	1991	}
1912	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1992	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1913	}	1993	}
1914		1994
1915	} elsif ($sym == CFClient::SDLK_DOWN) {	1995	} elsif ($sym == CFPlus::SDLK_DOWN) {
1916	$self->{history_pointer}--;	1996	$self->{history_pointer}--;
1917	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1997	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918		1998
1919	if ($self->{history_pointer} >= 0) {	1999	if ($self->{history_pointer} >= 0) {
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2000	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1929	1	2009	1
1930	}	2010	}
1931		2011
1932	#############################################################################	2012	#############################################################################
1933		2013
1934	package CFClient::UI::Button;	2014	package CFPlus::UI::Button;
1935		2015
1936	our @ISA = CFClient::UI::Label::;	2016	our @ISA = CFPlus::UI::Label::;
1937		2017
1938	use CFClient::OpenGL;	2018	use CFPlus::OpenGL;
1939		2019
1940	my @tex =	2020	my @tex =
1941	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2021	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942	qw(b1_button_active.png);	2022	qw(b1_button_active.png);
1943		2023
1944	sub new {	2024	sub new {
1945	my $class = shift;	2025	my $class = shift;
1946		2026
…		…
1983	$self->SUPER::_draw;	2063	$self->SUPER::_draw;
1984	}	2064	}
1985		2065
1986	#############################################################################	2066	#############################################################################
1987		2067
		2068	package CFPlus::UI::CheckBox;
		2069
		2070	our @ISA = CFPlus::UI::DrawBG::;
		2071
		2072	my @tex =
		2073	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2074	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2075
		2076	use CFPlus::OpenGL;
		2077
		2078	sub new {
		2079	my $class = shift;
		2080
		2081	$class->SUPER::new (
		2082	padding_x => 2,
		2083	padding_y => 2,
		2084	fg => [1, 1, 1],
		2085	active_fg => [1, 1, 0],
		2086	bg => [0, 0, 0, 0.2],
		2087	active_bg => [1, 1, 1, 0.5],
		2088	state => 0,
		2089	can_hover => 1,
		2090	@_
		2091	)
		2092	}
		2093
		2094	sub size_request {
		2095	my ($self) = @_;
		2096
		2097	(6) x 2
		2098	}
		2099
		2100	sub toggle {
		2101	my ($self) = @_;
		2102
		2103	$self->{state} = !$self->{state};
		2104	$self->emit (changed => $self->{state});
		2105	$self->update;
		2106	}
		2107
		2108	sub invoke_button_down {
		2109	my ($self, $ev, $x, $y) = @_;
		2110
		2111	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2112	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2113	$self->toggle;
		2114	} else {
		2115	return 0
		2116	}
		2117
		2118	1
		2119	}
		2120
		2121	sub _draw {
		2122	my ($self) = @_;
		2123
		2124	$self->SUPER::_draw;
		2125
		2126	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2127
		2128	my ($w, $h) = @$self{qw(w h)};
		2129
		2130	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2131
		2132	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2133
		2134	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2135
		2136	glEnable GL_TEXTURE_2D;
		2137	$tex->draw_quad_alpha (0, 0, $s, $s);
		2138	glDisable GL_TEXTURE_2D;
		2139	}
		2140
		2141	#############################################################################
		2142
		2143	package CFPlus::UI::Image;
		2144
		2145	our @ISA = CFPlus::UI::Base::;
		2146
		2147	use CFPlus::OpenGL;
		2148
		2149	our %texture_cache;
		2150
		2151	sub new {
		2152	my $class = shift;
		2153
		2154	my $self = $class->SUPER::new (
		2155	can_events => 0,
		2156	@_,
		2157	);
		2158
		2159	$self->{path} || $self->{tex}
		2160	or Carp::croak "'path' or 'tex' attributes required";
		2161
		2162	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2163	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2164
		2165	Scalar::Util::weaken $texture_cache{$self->{path}};
		2166
		2167	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2168
		2169	$self
		2170	}
		2171
		2172	sub STORABLE_freeze {
		2173	my ($self, $cloning) = @_;
		2174
		2175	$self->{path}
		2176	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2177
		2178	$self->{path}
		2179	}
		2180
		2181	sub STORABLE_attach {
		2182	my ($self, $cloning, $path) = @_;
		2183
		2184	$self->new (path => $path)
		2185	}
		2186
		2187	sub size_request {
		2188	my ($self) = @_;
		2189
		2190	($self->{tex}{w}, $self->{tex}{h})
		2191	}
		2192
		2193	sub _draw {
		2194	my ($self) = @_;
		2195
		2196	my $tex = $self->{tex};
		2197
		2198	my ($w, $h) = ($self->{w}, $self->{h});
		2199
		2200	if ($self->{rot90}) {
		2201	glRotate 90, 0, 0, 1;
		2202	glTranslate 0, -$self->{w}, 0;
		2203
		2204	($w, $h) = ($h, $w);
		2205	}
		2206
		2207	glEnable GL_TEXTURE_2D;
		2208	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2209
		2210	$tex->draw_quad (0, 0, $w, $h);
		2211
		2212	glDisable GL_TEXTURE_2D;
		2213	}
		2214
		2215	#############################################################################
		2216
1988	package CFClient::UI::ImageButton;	2217	package CFPlus::UI::ImageButton;
1989		2218
1990	our @ISA = CFClient::UI::Image::;	2219	our @ISA = CFPlus::UI::Image::;
1991		2220
1992	use CFClient::OpenGL;	2221	use CFPlus::OpenGL;
1993		2222
1994	my %textures;	2223	my %textures;
1995		2224
1996	sub new {	2225	sub new {
1997	my $class = shift;	2226	my $class = shift;
…		…
2019	1	2248	1
2020	}	2249	}
2021		2250
2022	#############################################################################	2251	#############################################################################
2023		2252
2024	package CFClient::UI::CheckBox;
2025
2026	our @ISA = CFClient::UI::DrawBG::;
2027
2028	my @tex =
2029	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2030	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2031
2032	use CFClient::OpenGL;
2033
2034	sub new {
2035	my $class = shift;
2036
2037	$class->SUPER::new (
2038	padding_x => 2,
2039	padding_y => 2,
2040	fg => [1, 1, 1],
2041	active_fg => [1, 1, 0],
2042	bg => [0, 0, 0, 0.2],
2043	active_bg => [1, 1, 1, 0.5],
2044	state => 0,
2045	can_hover => 1,
2046	@_
2047	)
2048	}
2049
2050	sub size_request {
2051	my ($self) = @_;
2052
2053	(6) x 2
2054	}
2055
2056	sub invoke_button_down {
2057	my ($self, $ev, $x, $y) = @_;
2058
2059	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061	$self->{state} = !$self->{state};
2062	$self->emit (changed => $self->{state});
2063	} else {
2064	return 0
2065	}
2066
2067	1
2068	}
2069
2070	sub _draw {
2071	my ($self) = @_;
2072
2073	$self->SUPER::_draw;
2074
2075	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2076
2077	my ($w, $h) = @$self{qw(w h)};
2078
2079	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2080
2081	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2082
2083	my $tex = $self->{state} ? $tex[1] : $tex[0];
2084
2085	glEnable GL_TEXTURE_2D;
2086	$tex->draw_quad_alpha (0, 0, $s, $s);
2087	glDisable GL_TEXTURE_2D;
2088	}
2089
2090	#############################################################################
2091
2092	package CFClient::UI::Image;	2253	package CFPlus::UI::VGauge;
2093		2254
2094	our @ISA = CFClient::UI::Base::;	2255	our @ISA = CFPlus::UI::Base::;
2095
2096	use CFClient::OpenGL;
2097	use Carp qw/confess/;
2098
2099	our %loaded_images;
2100
2101	sub new {
2102	my $class = shift;
2103
2104	my $self = $class->SUPER::new (can_events => 0, @_);
2105
2106	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2107
2108	$loaded_images{$self->{image}} ||=
2109	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2110
2111	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2112
2113	Scalar::Util::weaken $loaded_images{$self->{image}};
2114
2115	$self->{aspect} = $tex->{w} / $tex->{h};
2116
2117	$self
2118	}
2119
2120	sub size_request {
2121	my ($self) = @_;
2122
2123	($self->{tex}->{w}, $self->{tex}->{h})
2124	}
2125
2126	sub _draw {
2127	my ($self) = @_;
2128
2129	my $tex = $self->{tex};
2130
2131	my ($w, $h) = ($self->{w}, $self->{h});
2132
2133	if ($self->{rot90}) {
2134	glRotate 90, 0, 0, 1;
2135	glTranslate 0, -$self->{w}, 0;
2136
2137	($w, $h) = ($h, $w);
2138	}
2139
2140	glEnable GL_TEXTURE_2D;
2141	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2142
2143	$tex->draw_quad_alpha (0, 0, $w, $h);
2144
2145	glDisable GL_TEXTURE_2D;
2146	}
2147
2148	#############################################################################
2149
2150	package CFClient::UI::VGauge;
2151
2152	our @ISA = CFClient::UI::Base::;
2153		2256
2154	use List::Util qw(min max);	2257	use List::Util qw(min max);
2155		2258
2156	use CFClient::OpenGL;	2259	use CFPlus::OpenGL;
2157		2260
2158	my %tex = (	2261	my %tex = (
2159	food => [	2262	food => [
2160	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2263	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2161	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2264	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2162	],	2265	],
2163	grace => [	2266	grace => [
2164	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2267	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2268	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2166	],	2269	],
2167	hp => [	2270	hp => [
2168	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2271	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2169	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2272	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2170	],	2273	],
2171	mana => [	2274	mana => [
2172	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2275	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2173	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2276	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2174	],	2277	],
2175	);	2278	);
2176		2279
2177	# eg. VGauge->new (gauge => 'food'), default gauge: food	2280	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2237	my $ycut1 = max 0, min 1, $ycut;	2340	my $ycut1 = max 0, min 1, $ycut;
2238	my $ycut2 = max 0, min 1, $ycut - 1;	2341	my $ycut2 = max 0, min 1, $ycut - 1;
2239		2342
2240	my $h1 = $self->{h} * (1 - $ycut1);	2343	my $h1 = $self->{h} * (1 - $ycut1);
2241	my $h2 = $self->{h} * (1 - $ycut2);	2344	my $h2 = $self->{h} * (1 - $ycut2);
		2345	my $h3 = $self->{h};
		2346
		2347	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2242		2348
2243	glEnable GL_BLEND;	2349	glEnable GL_BLEND;
2244	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2350	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2351	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246	glEnable GL_TEXTURE_2D;	2352	glEnable GL_TEXTURE_2D;
…		…
2265		2371
2266	if ($t3) {	2372	if ($t3) {
2267	glBindTexture GL_TEXTURE_2D, $t3->{name};	2373	glBindTexture GL_TEXTURE_2D, $t3->{name};
2268	glBegin GL_QUADS;	2374	glBegin GL_QUADS;
2269	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2375	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2376	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2377	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2378	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273	glEnd;	2379	glEnd;
2274	}	2380	}
2275		2381
2276	glDisable GL_BLEND;	2382	glDisable GL_BLEND;
2277	glDisable GL_TEXTURE_2D;	2383	glDisable GL_TEXTURE_2D;
2278	}	2384	}
2279		2385
2280	#############################################################################	2386	#############################################################################
2281		2387
2282	package CFClient::UI::Gauge;	2388	package CFPlus::UI::Gauge;
2283		2389
2284	our @ISA = CFClient::UI::VBox::;	2390	our @ISA = CFPlus::UI::VBox::;
2285		2391
2286	sub new {	2392	sub new {
2287	my ($class, %arg) = @_;	2393	my ($class, %arg) = @_;
2288		2394
2289	my $self = $class->SUPER::new (	2395	my $self = $class->SUPER::new (
…		…
2291	can_hover => 1,	2397	can_hover => 1,
2292	can_events => 1,	2398	can_events => 1,
2293	%arg,	2399	%arg,
2294	);	2400	);
2295		2401
2296	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2402	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2297	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2403	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2298	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2404	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2299		2405
2300	$self	2406	$self
2301	}	2407	}
2302		2408
2303	sub set_fontsize {	2409	sub set_fontsize {
…		…
2324	$self->{value}->set_text ($val);	2430	$self->{value}->set_text ($val);
2325	}	2431	}
2326		2432
2327	#############################################################################	2433	#############################################################################
2328		2434
2329	package CFClient::UI::Slider;	2435	package CFPlus::UI::Slider;
2330		2436
2331	use strict;	2437	use strict;
2332		2438
2333	use CFClient::OpenGL;	2439	use CFPlus::OpenGL;
2334		2440
2335	our @ISA = CFClient::UI::DrawBG::;	2441	our @ISA = CFPlus::UI::DrawBG::;
2336		2442
2337	my @tex =	2443	my @tex =
2338	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2444	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2339	qw(s1_slider.png s1_slider_bg.png);	2445	qw(s1_slider.png s1_slider_bg.png);
2340		2446
2341	sub new {	2447	sub new {
2342	my $class = shift;	2448	my $class = shift;
2343		2449
…		…
2432	}	2538	}
2433		2539
2434	1	2540	1
2435	}	2541	}
2436		2542
		2543	sub invoke_mouse_wheel {
		2544	my ($self, $ev) = @_;
		2545
		2546	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2547
		2548	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2549
		2550	! ! $delta
		2551	}
		2552
2437	sub update {	2553	sub update {
2438	my ($self) = @_;	2554	my ($self) = @_;
2439		2555
2440	delete $self->{knob_w};	2556	delete $self->{knob_w};
2441	$self->SUPER::update;	2557	$self->SUPER::update;
…		…
2488	glDisable GL_TEXTURE_2D;	2604	glDisable GL_TEXTURE_2D;
2489	}	2605	}
2490		2606
2491	#############################################################################	2607	#############################################################################
2492		2608
2493	package CFClient::UI::ValSlider;	2609	package CFPlus::UI::ValSlider;
2494		2610
2495	our @ISA = CFClient::UI::HBox::;	2611	our @ISA = CFPlus::UI::HBox::;
2496		2612
2497	sub new {	2613	sub new {
2498	my ($class, %arg) = @_;	2614	my ($class, %arg) = @_;
2499		2615
2500	my $range = delete $arg{range};	2616	my $range = delete $arg{range};
2501		2617
2502	my $self = $class->SUPER::new (	2618	my $self = $class->SUPER::new (
2503	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2619	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2504	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2620	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2505	to_value => sub { shift },	2621	to_value => sub { shift },
2506	from_value => sub { shift },	2622	from_value => sub { shift },
2507	%arg,	2623	%arg,
2508	);	2624	);
2509		2625
…		…
2529	sub set_range { shift->{slider}->set_range (@_) }	2645	sub set_range { shift->{slider}->set_range (@_) }
2530	sub set_value { shift->{slider}->set_value (@_) }	2646	sub set_value { shift->{slider}->set_value (@_) }
2531		2647
2532	#############################################################################	2648	#############################################################################
2533		2649
2534	package CFClient::UI::TextScroller;	2650	package CFPlus::UI::TextScroller;
2535		2651
2536	our @ISA = CFClient::UI::HBox::;	2652	our @ISA = CFPlus::UI::HBox::;
2537		2653
2538	use CFClient::OpenGL;	2654	use CFPlus::OpenGL;
2539		2655
2540	sub new {	2656	sub new {
2541	my $class = shift;	2657	my $class = shift;
2542		2658
2543	my $self = $class->SUPER::new (	2659	my $self = $class->SUPER::new (
2544	fontsize => 1,	2660	fontsize => 1,
2545	can_events => 0,	2661	can_events => 1,
2546	indent => 0,	2662	indent => 0,
2547	#font => default_font	2663	#font => default_font
2548	@_,	2664	@_,
2549		2665
2550	layout => (new CFClient::Layout 1),	2666	layout => (new CFPlus::Layout),
2551	par => [],	2667	par => [],
2552	height => 0,	2668	height => 0,
2553	children => [	2669	children => [
2554	(new CFClient::UI::Empty expand => 1),	2670	(new CFPlus::UI::Empty expand => 1),
2555	(new CFClient::UI::Slider vertical => 1),	2671	(new CFPlus::UI::Slider vertical => 1),
2556	],	2672	],
2557	);	2673	);
2558		2674
2559	$self->{children}[1]->connect (changed => sub { $self->update });	2675	$self->{children}[1]->connect (changed => sub { $self->update });
2560		2676
…		…
2566		2682
2567	$self->{fontsize} = $fontsize;	2683	$self->{fontsize} = $fontsize;
2568	$self->reflow;	2684	$self->reflow;
2569	}	2685	}
2570		2686
		2687	sub size_request {
		2688	my ($self) = @_;
		2689
		2690	my ($empty, $slider) = @{ $self->{children} };
		2691
		2692	local $self->{children} = [$empty, $slider];
		2693	$self->SUPER::size_request
		2694	}
		2695
2571	sub invoke_size_allocate {	2696	sub invoke_size_allocate {
2572	my ($self, $w, $h) = @_;	2697	my ($self, $w, $h) = @_;
2573		2698
		2699	my ($empty, $slider, @other) = @{ $self->{children} };
		2700	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		2701
2574	$self->{layout}->set_font ($self->{font}) if $self->{font};	2702	$self->{layout}->set_font ($self->{font}) if $self->{font};
2575	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2703	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576	$self->{layout}->set_width ($self->{children}[0]{w});	2704	$self->{layout}->set_width ($empty->{w});
2577	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2705	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578		2706
2579	$self->reflow;	2707	$self->reflow;
2580		2708
		2709	local $self->{children} = [$empty, $slider];
2581	$self->SUPER::invoke_size_allocate ($w, $h)	2710	$self->SUPER::invoke_size_allocate ($w, $h)
2582	}	2711	}
2583		2712
2584	sub text_size {	2713	sub invoke_mouse_wheel {
2585	my ($self, $text, $indent) = @_;	2714	my ($self, $ev) = @_;
		2715
		2716	return 0 unless $ev->{dy}; # only vertical movements
		2717
		2718	$self->{children}[1]->emit (mouse_wheel => $ev);
		2719
		2720	1
		2721	}
		2722
		2723	sub get_layout {
		2724	my ($self, $para) = @_;
2586		2725
2587	my $layout = $self->{layout};	2726	my $layout = $self->{layout};
2588		2727
		2728	$layout->set_font ($self->{font}) if $self->{font};
		2729	$layout->set_foreground (@{$para->{fg}});
2589	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2730	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590	$layout->set_width ($self->{children}[0]{w} - $indent);	2731	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2732	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592	$layout->set_markup ($text);	2733	$layout->set_markup ($para->{markup});
		2734
		2735	$layout->set_shapes (
		2736	map
		2737	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2738	@{$para->{widget}}
2593		2739	);
		2740
2594	$layout->size	2741	$layout
2595	}	2742	}
2596		2743
2597	sub reflow {	2744	sub reflow {
2598	my ($self) = @_;	2745	my ($self) = @_;
2599		2746
…		…
2608	$self->{children}[1]->set_value ($offset);	2755	$self->{children}[1]->set_value ($offset);
2609	}	2756	}
2610		2757
2611	sub clear {	2758	sub clear {
2612	my ($self) = @_;	2759	my ($self) = @_;
		2760
		2761	my (undef, undef, @other) = @{ $self->{children} };
		2762	$self->remove ($_) for @other;
2613		2763
2614	$self->{par} = [];	2764	$self->{par} = [];
2615	$self->{height} = 0;	2765	$self->{height} = 0;
2616	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2766	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617	}	2767	}
2618		2768
2619	sub add_paragraph {	2769	sub add_paragraph {
2620	my ($self, $color, $text, $indent) = @_;	2770	my $self = shift;
2621		2771
2622	for my $line (split /\n/, $text) {	2772	for my $para (@_) {
2623	my ($w, $h) = $self->text_size ($line);	2773	$para = {
2624	$self->{height} += $h;	2774	fg => [1, 1, 1, 1],
2625	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2775	indent => 0,
2626	}	2776	markup => "",
		2777	widget => [],
		2778	ref $para ? %$para : (markup => $para),
		2779	w => 1e10,
		2780	wrapped => 1,
		2781	};
2627		2782
2628	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2783	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2784	push @{$self->{par}}, $para;
		2785	}
		2786
		2787	$self->{need_reflow}++;
		2788	$self->update;
		2789	}
		2790
		2791	sub scroll_to_bottom {
		2792	my ($self) = @_;
		2793
		2794	$self->{scroll_to_bottom} = 1;
		2795	$self->update;
2629	}	2796	}
2630		2797
2631	sub update {	2798	sub update {
2632	my ($self) = @_;	2799	my ($self) = @_;
2633		2800
…		…
2641	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2808	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642		2809
2643	if (delete $self->{need_reflow}) {	2810	if (delete $self->{need_reflow}) {
2644	my $height = 0;	2811	my $height = 0;
2645		2812
2646	my $layout = $self->{layout};
2647
2648	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650	for (@{$self->{par}}) {	2813	for my $para (@{$self->{par}}) {
2651	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2814	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2652	$layout->set_width ($W - $_->[3]);	2815	my $layout = $self->get_layout ($para);
2653	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2654	$layout->set_markup ($_->[4]);
2655	my ($w, $h) = $layout->size;	2816	my ($w, $h) = $layout->size;
2656	$_->[0] = $w + $_->[3];	2817
2657	$_->[1] = $h;	2818	$para->{w} = $w + $para->{indent};
		2819	$para->{h} = $h;
		2820	$para->{wrapped} = $layout->has_wrapped;
2658	}	2821	}
2659		2822
2660	$height += $_->[1];	2823	$height += $para->{h};
2661	}	2824	}
2662		2825
2663	$self->{height} = $height;	2826	$self->{height} = $height;
2664		2827
2665	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2828	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2666		2829
2667	delete $self->{texture};	2830	delete $self->{texture};
2668	}	2831	}
2669		2832
		2833	if (delete $self->{scroll_to_bottom}) {
		2834	$self->{children}[1]->set_value (1e10);
		2835	}
		2836
2670	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2837	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2671	glClearColor 0, 0, 0, 0;	2838	glClearColor 0, 0, 0, 0;
2672	glClear GL_COLOR_BUFFER_BIT;	2839	glClear GL_COLOR_BUFFER_BIT;
2673		2840
2674	my $top = int $self->{children}[1]{range}[0];	2841	my $top = int $self->{children}[1]{range}[0];
2675		2842
2676	my $y0 = $top;	2843	my $y0 = $top;
2677	my $y1 = $top + $H;	2844	my $y1 = $top + $H;
2678		2845
2679	my $y = 0;	2846	my $y = 0;
2680		2847
2681	my $layout = $self->{layout};
2682
2683	$layout->set_font ($self->{font}) if $self->{font};
2684
2685	glEnable GL_BLEND;
2686	#TODO# not correct in windows where rgba is forced off
2687	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2688
2689	for my $par (@{$self->{par}}) {	2848	for my $para (@{$self->{par}}) {
2690	my $h = $par->[1];	2849	my $h = $para->{h};
2691		2850
2692	if ($y0 < $y + $h && $y < $y1) {	2851	if ($y0 < $y + $h && $y < $y1) {
2693	$layout->set_foreground (@{ $par->[2] });
2694	$layout->set_width ($W - $par->[3]);
2695	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2696	$layout->set_markup ($par->[4]);
2697		2852
2698	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2853	my $layout = $self->get_layout ($para);
2699		2854
2700	glRasterPos $par->[3], $y - $y0;	2855	$layout->render ($para->{indent}, $y - $y0);
2701	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2856
		2857	if (my @w = @{ $para->{widget} }) {
		2858	my @s = $layout->get_shapes;
		2859
		2860	for (@w) {
		2861	my ($dx, $dy) = splice @s, 0, 2, ();
		2862
		2863	$_->{x} = $dx + $para->{indent};
		2864	$_->{y} = $dy + $y - $y0;
		2865
		2866	$_->draw;
		2867	}
		2868	}
2702	}	2869	}
2703		2870
2704	$y += $h;	2871	$y += $h;
2705	}	2872	}
2706
2707	glDisable GL_BLEND;
2708	};	2873	};
2709	});	2874	});
		2875	}
		2876
		2877	sub reconfigure {
		2878	my ($self) = @_;
		2879
		2880	$self->SUPER::reconfigure;
		2881
		2882	$_->{w} = 1e10 for @{ $self->{par} };
		2883	$self->reflow;
2710	}	2884	}
2711		2885
2712	sub _draw {	2886	sub _draw {
2713	my ($self) = @_;	2887	my ($self) = @_;
2714		2888
…		…
2717	glColor 0, 0, 0, 1;	2891	glColor 0, 0, 0, 1;
2718	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2892	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719	glDisable GL_TEXTURE_2D;	2893	glDisable GL_TEXTURE_2D;
2720		2894
2721	$self->{children}[1]->draw;	2895	$self->{children}[1]->draw;
2722
2723	}	2896	}
2724		2897
2725	#############################################################################	2898	#############################################################################
2726		2899
2727	package CFClient::UI::Animator;	2900	package CFPlus::UI::Animator;
2728		2901
2729	use CFClient::OpenGL;	2902	use CFPlus::OpenGL;
2730		2903
2731	our @ISA = CFClient::UI::Bin::;	2904	our @ISA = CFPlus::UI::Bin::;
2732		2905
2733	sub moveto {	2906	sub moveto {
2734	my ($self, $x, $y) = @_;	2907	my ($self, $x, $y) = @_;
2735		2908
2736	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2909	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2764	glPopMatrix;	2937	glPopMatrix;
2765	}	2938	}
2766		2939
2767	#############################################################################	2940	#############################################################################
2768		2941
2769	package CFClient::UI::Flopper;	2942	package CFPlus::UI::Flopper;
2770		2943
2771	our @ISA = CFClient::UI::Button::;	2944	our @ISA = CFPlus::UI::Button::;
2772		2945
2773	sub new {	2946	sub new {
2774	my $class = shift;	2947	my $class = shift;
2775		2948
2776	my $self = $class->SUPER::new (	2949	my $self = $class->SUPER::new (
…		…
2788	$self->{other}->toggle_visibility;	2961	$self->{other}->toggle_visibility;
2789	}	2962	}
2790		2963
2791	#############################################################################	2964	#############################################################################
2792		2965
2793	package CFClient::UI::Tooltip;	2966	package CFPlus::UI::Tooltip;
2794		2967
2795	our @ISA = CFClient::UI::Bin::;	2968	our @ISA = CFPlus::UI::Bin::;
2796		2969
2797	use CFClient::OpenGL;	2970	use CFPlus::OpenGL;
2798		2971
2799	sub new {	2972	sub new {
2800	my $class = shift;	2973	my $class = shift;
2801		2974
2802	$class->SUPER::new (	2975	$class->SUPER::new (
…		…
2805	)	2978	)
2806	}	2979	}
2807		2980
2808	sub set_tooltip_from {	2981	sub set_tooltip_from {
2809	my ($self, $widget) = @_;	2982	my ($self, $widget) = @_;
		2983
		2984	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		2985	if $widget->{tooltip} =~ /^#(.*)$/;
2810		2986
2811	my $tooltip = $widget->{tooltip};	2987	my $tooltip = $widget->{tooltip};
2812		2988
2813	if ($ENV{CFPLUS_DEBUG} & 2) {	2989	if ($ENV{CFPLUS_DEBUG} & 2) {
2814	$tooltip .= "\n\n" . (ref $widget) . "\n"	2990	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2818	}	2994	}
2819		2995
2820	$tooltip =~ s/^\n+//;	2996	$tooltip =~ s/^\n+//;
2821	$tooltip =~ s/\n+$//;	2997	$tooltip =~ s/\n+$//;
2822		2998
2823	$self->add (new CFClient::UI::Label	2999	$self->add (new CFPlus::UI::Label
2824	markup => $tooltip,	3000	markup => $tooltip,
2825	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3001	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2826	fontsize => 0.8,	3002	fontsize => 0.8,
2827	fg => [0, 0, 0, 1],	3003	style => 1, # FLAG_INVERSE
2828	ellipsise => 0,	3004	ellipsise => 0,
2829	font => ($widget->{tooltip_font} || $::FONT_PROP),	3005	font => ($widget->{tooltip_font} || $::FONT_PROP),
2830	);	3006	);
2831	}	3007	}
2832		3008
…		…
2851		3027
2852	$self->{root}->on_post_alloc ("move_$self" => sub {	3028	$self->{root}->on_post_alloc ("move_$self" => sub {
2853	my $widget = $self->{owner}	3029	my $widget = $self->{owner}
2854	or return;	3030	or return;
2855		3031
		3032	if ($widget->{visible}) {
2856	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3033	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857		3034
2858	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3035	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859	if $x + $self->{w} > $self->{root}{w};	3036	if $x + $self->{w} > $self->{root}{w};
2860		3037
2861	$self->move_abs ($x, $y);	3038	$self->move_abs ($x, $y);
		3039	} else {
		3040	$self->hide;
		3041	}
2862	});	3042	});
2863	}	3043	}
2864		3044
2865	sub _draw {	3045	sub _draw {
2866	my ($self) = @_;	3046	my ($self) = @_;
…		…
2890	$self->SUPER::_draw;	3070	$self->SUPER::_draw;
2891	}	3071	}
2892		3072
2893	#############################################################################	3073	#############################################################################
2894		3074
2895	package CFClient::UI::Face;	3075	package CFPlus::UI::Face;
2896		3076
2897	our @ISA = CFClient::UI::Base::;	3077	our @ISA = CFPlus::UI::DrawBG::;
2898		3078
2899	use CFClient::OpenGL;	3079	use CFPlus::OpenGL;
2900		3080
2901	sub new {	3081	sub new {
2902	my $class = shift;	3082	my $class = shift;
2903		3083
2904	my $self = $class->SUPER::new (	3084	my $self = $class->SUPER::new (
…		…
2939	sub _draw {	3119	sub _draw {
2940	my ($self) = @_;	3120	my ($self) = @_;
2941		3121
2942	return unless $::CONN;	3122	return unless $::CONN;
2943		3123
		3124	$self->SUPER::_draw;
		3125
2944	my $face;	3126	my $face;
2945		3127
2946	if ($self->{frame}) {	3128	if ($self->{frame}) {
2947	my $anim = $::CONN->{anim}[$self->{anim}];	3129	my $anim = $::CONN->{anim}[$self->{anim}];
2948		3130
…		…
2970	$self->SUPER::destroy;	3152	$self->SUPER::destroy;
2971	}	3153	}
2972		3154
2973	#############################################################################	3155	#############################################################################
2974		3156
2975	package CFClient::UI::Buttonbar;	3157	package CFPlus::UI::Buttonbar;
2976		3158
2977	our @ISA = CFClient::UI::HBox::;	3159	our @ISA = CFPlus::UI::HBox::;
2978		3160
2979	# TODO: should actualyl wrap buttons and other goodies.	3161	# TODO: should actualyl wrap buttons and other goodies.
2980		3162
2981	#############################################################################	3163	#############################################################################
2982		3164
2983	package CFClient::UI::Menu;	3165	package CFPlus::UI::Menu;
2984		3166
2985	our @ISA = CFClient::UI::FancyFrame::;	3167	our @ISA = CFPlus::UI::FancyFrame::;
2986		3168
2987	use CFClient::OpenGL;	3169	use CFPlus::OpenGL;
2988		3170
2989	sub new {	3171	sub new {
2990	my $class = shift;	3172	my $class = shift;
2991		3173
2992	my $self = $class->SUPER::new (	3174	my $self = $class->SUPER::new (
2993	items => [],	3175	items => [],
2994	z => 100,	3176	z => 100,
2995	@_,	3177	@_,
2996	);	3178	);
2997		3179
2998	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3180	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2999		3181
3000	for my $item (@{ $self->{items} }) {	3182	for my $item (@{ $self->{items} }) {
3001	my ($widget, $cb, $tooltip) = @$item;	3183	my ($widget, $cb, $tooltip) = @$item;
3002		3184
3003	# handle various types of items, only text for now	3185	# handle various types of items, only text for now
3004	if (!ref $widget) {	3186	if (!ref $widget) {
		3187	if ($widget =~ /\t/) {
		3188	my ($left, $right) = split /\t/, $widget, 2;
		3189
3005	$widget = new CFClient::UI::Label	3190	$widget = new CFPlus::UI::HBox
3006	can_hover => 1,	3191	can_hover => 1,
3007	can_events => 1,	3192	can_events => 1,
		3193	tooltip => $tooltip,
		3194	children => [
		3195	(new CFPlus::UI::Label markup => $left, expand => 1),
		3196	(new CFPlus::UI::Label markup => $right, align => +1),
		3197	],
		3198	;
		3199
		3200	} else {
		3201	$widget = new CFPlus::UI::Label
		3202	can_hover => 1,
		3203	can_events => 1,
3008	markup => $widget,	3204	markup => $widget,
3009	tooltip => $tooltip	3205	tooltip => $tooltip;
		3206	}
3010	}	3207	}
3011		3208
3012	$self->{item}{$widget} = $item;	3209	$self->{item}{$widget} = $item;
3013		3210
3014	$self->{vbox}->add ($widget);	3211	$self->{vbox}->add ($widget);
…		…
3057	1	3254	1
3058	}	3255	}
3059		3256
3060	#############################################################################	3257	#############################################################################
3061		3258
3062	package CFClient::UI::Multiplexer;	3259	package CFPlus::UI::Multiplexer;
3063		3260
3064	our @ISA = CFClient::UI::Container::;	3261	our @ISA = CFPlus::UI::Container::;
3065		3262
3066	sub new {	3263	sub new {
3067	my $class = shift;	3264	my $class = shift;
3068		3265
3069	my $self = $class->SUPER::new (	3266	my $self = $class->SUPER::new (
…		…
3083		3280
3084	$self->{current} = $self->{children}[0]	3281	$self->{current} = $self->{children}[0]
3085	if @{ $self->{children} };	3282	if @{ $self->{children} };
3086	}	3283	}
3087		3284
		3285	sub get_current_page {
		3286	my ($self) = @_;
		3287
		3288	$self->{current}
		3289	}
		3290
3088	sub set_current_page {	3291	sub set_current_page {
3089	my ($self, $page_or_widget) = @_;	3292	my ($self, $page_or_widget) = @_;
3090		3293
3091	my $widget = ref $page_or_widget	3294	my $widget = ref $page_or_widget
3092	? $page_or_widget	3295	? $page_or_widget
…		…
3124	$self->{current}->draw;	3327	$self->{current}->draw;
3125	}	3328	}
3126		3329
3127	#############################################################################	3330	#############################################################################
3128		3331
3129	package CFClient::UI::Notebook;	3332	package CFPlus::UI::Notebook;
3130		3333
3131	our @ISA = CFClient::UI::VBox::;	3334	our @ISA = CFPlus::UI::VBox::;
3132		3335
3133	sub new {	3336	sub new {
3134	my $class = shift;	3337	my $class = shift;
3135		3338
3136	my $self = $class->SUPER::new (	3339	my $self = $class->SUPER::new (
3137	buttonbar => (new CFClient::UI::Buttonbar),	3340	buttonbar => (new CFPlus::UI::Buttonbar),
3138	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3341	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3139	# filter => # will be put between multiplexer and $self	3342	# filter => # will be put between multiplexer and $self
3140	@_,	3343	@_,
3141	);	3344	);
3142		3345
3143	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3346	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3149	sub add {	3352	sub add {
3150	my ($self, $title, $widget, $tooltip) = @_;	3353	my ($self, $title, $widget, $tooltip) = @_;
3151		3354
3152	Scalar::Util::weaken $self;	3355	Scalar::Util::weaken $self;
3153		3356
3154	$self->{buttonbar}->add (new CFClient::UI::Button	3357	$self->{buttonbar}->add (new CFPlus::UI::Button
3155	markup => $title,	3358	markup => $title,
3156	tooltip => $tooltip,	3359	tooltip => $tooltip,
3157	on_activate => sub { $self->set_current_page ($widget) },	3360	on_activate => sub { $self->set_current_page ($widget) },
3158	);	3361	);
3159		3362
3160	$self->{multiplexer}->add ($widget);	3363	$self->{multiplexer}->add ($widget);
3161	}	3364	}
3162		3365
		3366	sub get_current_page {
		3367	my ($self) = @_;
		3368
		3369	$self->{multiplexer}->get_current_page
		3370	}
		3371
3163	sub set_current_page {	3372	sub set_current_page {
3164	my ($self, $page) = @_;	3373	my ($self, $page) = @_;
3165		3374
3166	$self->{multiplexer}->set_current_page ($page);	3375	$self->{multiplexer}->set_current_page ($page);
3167	$self->emit (page_changed => $self->{multiplexer}{current});	3376	$self->emit (page_changed => $self->{multiplexer}{current});
3168	}	3377	}
3169		3378
3170	#############################################################################	3379	#############################################################################
3171		3380
3172	package CFClient::UI::Combobox;	3381	package CFPlus::UI::Selector;
3173		3382
3174	use utf8;	3383	use utf8;
3175		3384
3176	our @ISA = CFClient::UI::Button::;	3385	our @ISA = CFPlus::UI::Button::;
3177		3386
3178	sub new {	3387	sub new {
3179	my $class = shift;	3388	my $class = shift;
3180		3389
3181	my $self = $class->SUPER::new (	3390	my $self = $class->SUPER::new (
…		…
3198	my ($value, $title, $tooltip) = @$_;	3407	my ($value, $title, $tooltip) = @$_;
3199		3408
3200	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3409	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201	}	3410	}
3202		3411
3203	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3412	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204	}	3413	}
3205		3414
3206	sub _set_value {	3415	sub _set_value {
3207	my ($self, $value) = @_;	3416	my ($self, $value) = @_;
3208		3417
…		…
3223	$self->emit (changed => $value);	3432	$self->emit (changed => $value);
3224	}	3433	}
3225		3434
3226	#############################################################################	3435	#############################################################################
3227		3436
3228	package CFClient::UI::Statusbox;	3437	package CFPlus::UI::Statusbox;
3229		3438
3230	our @ISA = CFClient::UI::VBox::;	3439	our @ISA = CFPlus::UI::VBox::;
3231		3440
3232	sub new {	3441	sub new {
3233	my $class = shift;	3442	my $class = shift;
3234		3443
3235	my $self = $class->SUPER::new (	3444	my $self = $class->SUPER::new (
…		…
3247	sub reorder {	3456	sub reorder {
3248	my ($self) = @_;	3457	my ($self) = @_;
3249	my $NOW = Time::HiRes::time;	3458	my $NOW = Time::HiRes::time;
3250		3459
3251	# freeze display when hovering over any label	3460	# freeze display when hovering over any label
3252	return if $CFClient::UI::TOOLTIP->{owner}	3461	return if $CFPlus::UI::TOOLTIP->{owner}
3253	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3462	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3254	values %{ $self->{item} };	3463	values %{ $self->{item} };
3255		3464
3256	while (my ($k, $v) = each %{ $self->{item} }) {	3465	while (my ($k, $v) = each %{ $self->{item} }) {
3257	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3466	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3258	}	3467	}
…		…
3279	for ($short) {	3488	for ($short) {
3280	s/^\s+//;	3489	s/^\s+//;
3281	s/\s+/ /g;	3490	s/\s+/ /g;
3282	}	3491	}
3283		3492
3284	new CFClient::UI::Label	3493	new CFPlus::UI::Label
3285	markup => $short,	3494	markup => $short,
3286	tooltip => $item->{tooltip},	3495	tooltip => $item->{tooltip},
3287	tooltip_font => $::FONT_PROP,	3496	tooltip_font => $::FONT_PROP,
3288	tooltip_width => 0.67,	3497	tooltip_width => 0.67,
3289	fontsize => $item->{fontsize} || $self->{fontsize},	3498	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3343	count => 1,	3552	count => 1,
3344	%arg,	3553	%arg,
3345	};	3554	};
3346	}	3555	}
3347		3556
		3557	$ROOT->on_refresh (reorder => sub {
3348	$self->reorder;	3558	$self->reorder;
		3559	});
3349	}	3560	}
3350		3561
3351	sub reconfigure {	3562	sub reconfigure {
3352	my ($self) = @_;	3563	my ($self) = @_;
3353		3564
…		…
3366	$self->SUPER::destroy;	3577	$self->SUPER::destroy;
3367	}	3578	}
3368		3579
3369	#############################################################################	3580	#############################################################################
3370		3581
3371	package CFClient::UI::Inventory;	3582	package CFPlus::UI::Inventory;
3372		3583
3373	our @ISA = CFClient::UI::ScrolledWindow::;	3584	our @ISA = CFPlus::UI::Table::;
3374		3585
3375	sub new {	3586	sub new {
3376	my $class = shift;	3587	my $class = shift;
3377		3588
3378	my $self = $class->SUPER::new (	3589	my $self = $class->SUPER::new (
3379	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3590	col_expand => [0, 1, 0],
		3591	items => [],
3380	@_,	3592	@_,
3381	);	3593	);
3382		3594
		3595	$self->set_sort_order (undef);
		3596
3383	$self	3597	$self
		3598	}
		3599
		3600	sub update_items {
		3601	my ($self) = @_;
		3602
		3603	$self->clear;
		3604
		3605	my @item = $self->{sort}->(@{ $self->{items} });
		3606
		3607	my @adds;
		3608	my $row = 0;
		3609	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3610	CFPlus::Item::update_widgets $item;
		3611
		3612	push @adds, 0, $row, $item->{face_widget};
		3613	push @adds, 1, $row, $item->{desc_widget};
		3614	push @adds, 2, $row, $item->{weight_widget};
		3615
		3616	$row++;
		3617	}
		3618
		3619	$self->add (@adds);
		3620	}
		3621
		3622	sub set_sort_order {
		3623	my ($self, $order) = @_;
		3624
		3625	$self->{sort} = $order ||= sub {
		3626	sort {
		3627	$a->{type} <=> $b->{type}
		3628	or $a->{name} cmp $b->{name}
		3629	} @_
		3630	};
		3631
		3632	$self->update_items;
3384	}	3633	}
3385		3634
3386	sub set_items {	3635	sub set_items {
3387	my ($self, $items) = @_;	3636	my ($self, $items) = @_;
3388		3637
3389	$self->{child}->clear;	3638	$self->{items} = [$items ? values %$items : ()];
3390	return unless $items;	3639	$self->update_items;
3391
3392	my @items = sort {
3393	($a->{type} <=> $b->{type})
3394	or ($a->{name} cmp $b->{name})
3395	} @$items;
3396
3397	$self->{real_items} = \@items;
3398
3399	my $row = 0;
3400	for my $item (@items) {
3401	CFClient::Item::update_widgets $item;
3402
3403	$self->{child}->add (0, $row, $item->{face_widget});
3404	$self->{child}->add (1, $row, $item->{desc_widget});
3405	$self->{child}->add (2, $row, $item->{weight_widget});
3406
3407	$row++;
3408	}
3409	}	3640	}
3410		3641
3411	#############################################################################	3642	#############################################################################
3412		3643
3413	package CFClient::UI::BindEditor;
3414
3415	our @ISA = CFClient::UI::FancyFrame::;
3416
3417	sub new {
3418	my $class = shift;
3419
3420	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422	$self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426	text => "start recording",
3427	tooltip => "Start/Stops recording of actions."
3428	."All subsequent actions after the recording started will be captured."
3429	."The actions are displayed after the record was stopped."
3430	."To bind the action you have to click on the 'Bind' button",
3431	on_activate => sub {
3432	unless ($self->{recording}) {
3433	$self->start;
3434	} else {
3435	$self->stop;
3436	}
3437	});
3438
3439	$vb->add (new CFClient::UI::Label text => "Actions:");
3440	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3443	$vb->add (my $hb = new CFClient::UI::HBox);
3444	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445	$hb->add (new CFClient::UI::Button
3446	text => "bind",
3447	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448	on_activate => sub {
3449	$self->ask_for_bind;
3450	});
3451
3452	$vb->add (my $hb = new CFClient::UI::HBox);
3453	$hb->add (new CFClient::UI::Button
3454	text => "ok",
3455	expand => 1,
3456	tooltip => "This closes the binding editor and saves the binding",
3457	on_activate => sub {
3458	$self->hide;
3459	$self->commit;
3460	});
3461
3462	$hb->add (new CFClient::UI::Button
3463	text => "cancel",
3464	expand => 1,
3465	tooltip => "This closes the binding editor without saving",
3466	on_activate => sub {
3467	$self->hide;
3468	$self->{binding_cancel}->()
3469	if $self->{binding_cancel};
3470	});
3471
3472	$self->update_binding_widgets;
3473
3474	$self
3475	}
3476
3477	sub commit {
3478	my ($self) = @_;
3479	my ($mod, $sym, $cmds) = $self->get_binding;
3480	if ($sym != 0 && @$cmds > 0) {
3481	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3482	."'. Don't forget 'Save Config'!");
3483	$self->{binding_change}->($mod, $sym, $cmds)
3484	if $self->{binding_change};
3485	} else {
3486	$::STATUSBOX->add ("No action bound, no key or action specified!");
3487	$self->{binding_cancel}->()
3488	if $self->{binding_cancel};
3489	}
3490	}
3491
3492	sub start {
3493	my ($self) = @_;
3494
3495	$self->{rec_btn}->set_text ("stop recording");
3496	$self->{recording} = 1;
3497	$self->clear_command_list;
3498	$::CONN->start_record if $::CONN;
3499	}
3500
3501	sub stop {
3502	my ($self) = @_;
3503
3504	$self->{rec_btn}->set_text ("start recording");
3505	$self->{recording} = 0;
3506
3507	my $rec;
3508	$rec = $::CONN->stop_record if $::CONN;
3509	return unless ref $rec eq 'ARRAY';
3510	$self->set_command_list ($rec);
3511	}
3512
3513
3514	sub ask_for_bind_and_commit {
3515	my ($self) = @_;
3516	$self->ask_for_bind (1);
3517	}
3518
3519	sub ask_for_bind {
3520	my ($self, $commit, $end_cb) = @_;
3521
3522	CFClient::Binder::open_binding_dialog (sub {
3523	my ($mod, $sym) = @_;
3524	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3525	$self->update_binding_widgets;
3526	$self->commit if $commit;
3527	$end_cb->() if $end_cb;
3528	});
3529	}
3530
3531	# $mod and $sym are the modifiers and key symbol
3532	# $cmds is a array ref of strings (the commands)
3533	# $cb is the callback that is executed on OK
3534	# $ccb is the callback that is executed on CANCEL and
3535	# when the binding was unsuccessful on OK
3536	sub set_binding {
3537	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3538
3539	$self->clear_command_list;
3540	$self->{recording} = 0;
3541	$self->{rec_btn}->set_text ("start recording");
3542
3543	$self->{binding} = [$mod, $sym];
3544	$self->{commands} = $cmds;
3545
3546	$self->{binding_change} = $cb;
3547	$self->{binding_cancel} = $ccb;
3548
3549	$self->update_binding_widgets;
3550	}
3551
3552	# this is a shortcut method that asks for a binding
3553	# and then just binds it.
3554	sub do_quick_binding {
3555	my ($self, $cmds, $end_cb) = @_;
3556	$self->set_binding (undef, undef, $cmds, sub {
3557	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3558	});
3559	$self->ask_for_bind (1, $end_cb);
3560	}
3561
3562	sub update_binding_widgets {
3563	my ($self) = @_;
3564	my ($mod, $sym, $cmds) = $self->get_binding;
3565	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3566	$self->set_command_list ($cmds);
3567	}
3568
3569	sub get_binding {
3570	my ($self) = @_;
3571	return (
3572	$self->{binding}->[0],
3573	$self->{binding}->[1],
3574	[ grep { defined $_ } @{$self->{commands}} ]
3575	);
3576	}
3577
3578	sub clear_command_list {
3579	my ($self) = @_;
3580	$self->{cmdbox}->clear ();
3581	}
3582
3583	sub set_command_list {
3584	my ($self, $cmds) = @_;
3585
3586	$self->{cmdbox}->clear ();
3587	$self->{commands} = $cmds;
3588
3589	my $idx = 0;
3590
3591	for (@$cmds) {
3592	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3593
3594	my $i = $idx;
3595	$hb->add (new CFClient::UI::Label text => $_);
3596	$hb->add (new CFClient::UI::Button
3597	text => "delete",
3598	tooltip => "Deletes the action from the record",
3599	on_activate => sub {
3600	$self->{cmdbox}->remove ($hb);
3601	$cmds->[$i] = undef;
3602	});
3603
3604
3605	$idx++
3606	}
3607	}
3608
3609	#############################################################################
3610
3611	package CFClient::UI::SpellList;	3644	package CFPlus::UI::SpellList;
3612		3645
3613	our @ISA = CFClient::UI::Table::;	3646	our @ISA = CFPlus::UI::Table::;
3614		3647
3615	sub new {	3648	sub new {
3616	my $class = shift;	3649	my $class = shift;
3617		3650
3618	my $self = $class->SUPER::new (	3651	my $self = $class->SUPER::new (
…		…
3636	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3669	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3637		3670
3638	sub rebuild_spell_list {	3671	sub rebuild_spell_list {
3639	my ($self) = @_;	3672	my ($self) = @_;
3640		3673
3641	$CFClient::UI::ROOT->on_refresh ($self => sub {	3674	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3642	$self->clear;	3675	$self->clear;
3643		3676
3644	return unless $::CONN;	3677	return unless $::CONN;
3645		3678
3646	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3679	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3647	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3680	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3648	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3681	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3649	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3682	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3650	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3683	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3651		3684
3652	my $row = 0;	3685	my $row = 0;
3653		3686
3654	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3687	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3655	my $spell = $self->{spell}{$_};	3688	my $spell = $self->{spell}{$_};
…		…
3662	if ($ev->{button} == 1) {	3695	if ($ev->{button} == 1) {
3663	$::CONN->user_send ("cast $spell->{name}");	3696	$::CONN->user_send ("cast $spell->{name}");
3664	} elsif ($ev->{button} == 2) {	3697	} elsif ($ev->{button} == 2) {
3665	$::CONN->user_send ("invoke $spell->{name}");	3698	$::CONN->user_send ("invoke $spell->{name}");
3666	} elsif ($ev->{button} == 3) {	3699	} elsif ($ev->{button} == 3) {
3667	(new CFClient::UI::Menu	3700	(new CFPlus::UI::Menu
3668	items => [	3701	items => [
3669	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3702	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3703	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671	],	3704	],
3672	)->popup ($ev);	3705	)->popup ($ev);
3673	} else {	3706	} else {
3674	return 0;	3707	return 0;
…		…
3678	};	3711	};
3679		3712
3680	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3713	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3681		3714
3682	#TODO: add path info to tooltip	3715	#TODO: add path info to tooltip
3683	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3716	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3684		3717
3685	$self->add (0, $row, new CFClient::UI::Face	3718	$self->add (0, $row, new CFPlus::UI::Face
3686	face => $spell->{face},	3719	face => $spell->{face},
3687	can_hover => 1,	3720	can_hover => 1,
3688	can_events => 1,	3721	can_events => 1,
3689	tooltip => $tooltip,	3722	tooltip => $tooltip,
3690	on_button_down => $spell_cb,	3723	on_button_down => $spell_cb,
3691	);	3724	);
3692		3725
3693	$self->add (1, $row, new CFClient::UI::Label	3726	$self->add (1, $row, new CFPlus::UI::Label
3694	expand => 1,	3727	expand => 1,
3695	text => $spell->{name},	3728	text => $spell->{name},
3696	can_hover => 1,	3729	can_hover => 1,
3697	can_events => 1,	3730	can_events => 1,
3698	tooltip => $tooltip,	3731	tooltip => $tooltip,
3699	on_button_down => $spell_cb,	3732	on_button_down => $spell_cb,
3700	);	3733	);
3701		3734
3702	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3735	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3703	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3736	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3704	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3737	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3705	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3738	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3706	}	3739	}
3707	});	3740	});
3708	}	3741	}
3709		3742
3710	sub add_spell {	3743	sub add_spell {
…		…
3728	$self->rebuild_spell_list;	3761	$self->rebuild_spell_list;
3729	}	3762	}
3730		3763
3731	#############################################################################	3764	#############################################################################
3732		3765
3733	package CFClient::UI::Root;	3766	package CFPlus::UI::Root;
3734		3767
3735	our @ISA = CFClient::UI::Container::;	3768	our @ISA = CFPlus::UI::Container::;
3736		3769
3737	use List::Util qw(min max);	3770	use List::Util qw(min max);
3738		3771
3739	use CFClient::OpenGL;	3772	use CFPlus::OpenGL;
3740		3773
3741	sub new {	3774	sub new {
3742	my $class = shift;	3775	my $class = shift;
3743		3776
3744	my $self = $class->SUPER::new (	3777	my $self = $class->SUPER::new (
…		…
3920	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3953	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921		3954
3922	$w = 0 if $w < 0;	3955	$w = 0 if $w < 0;
3923	$h = 0 if $h < 0;	3956	$h = 0 if $h < 0;
3924		3957
		3958	$w = max $widget->{min_w}, $w;
		3959	$h = max $widget->{min_h}, $h;
		3960
		3961	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3962	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3963
		3964	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3965	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3966
3925	$w = int $w + 0.5;	3967	$w = int $w + 0.5;
3926	$h = int $h + 0.5;	3968	$h = int $h + 0.5;
3927		3969
3928	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3970	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929	$widget->{old_w} = $widget->{w};	3971	$widget->{old_w} = $widget->{w};
…		…
3952	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3994	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3953	glMatrixMode GL_MODELVIEW;	3995	glMatrixMode GL_MODELVIEW;
3954	glLoadIdentity;	3996	glLoadIdentity;
3955		3997
3956	{	3998	{
3957	package CFClient::UI::Base;	3999	package CFPlus::UI::Base;
3958		4000
3959	($draw_x, $draw_y, $draw_w, $draw_h) =	4001	($draw_x, $draw_y, $draw_w, $draw_h) =
3960	(0, 0, $self->{w}, $self->{h});	4002	(0, 0, $self->{w}, $self->{h});
3961	}	4003	}
3962		4004
3963	$self->_draw;	4005	$self->_draw;
3964	}	4006	}
3965		4007
3966	#############################################################################	4008	#############################################################################
3967		4009
3968	package CFClient::UI;	4010	package CFPlus::UI;
3969		4011
3970	$ROOT = new CFClient::UI::Root;	4012	$ROOT = new CFPlus::UI::Root;
3971	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4013	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3972		4014
3973	1	4015	1
3974		4016

Diff Legend

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