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.311 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.345 by root, Sun Aug 13 21:46:10 2006 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8	use Event;	8	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
…		…
79	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	82	if $FOCUS;
82	}	83	}
83		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
84	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	99	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
87		101
88	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
90		106
91	$GRAB = $widget;	107	$GRAB = $widget;
92	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
93		109
94	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
95	}	111	}
96		112
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
98		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
100	if $GRAB;	116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
		122	}
101	}	123	}
102		124
103	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	126	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		127
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		129
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		131
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
112	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		134
114	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	137	$grab->update if $grab;
117	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
118		139
		140	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	141	$TOOLTIP_WATCHER->cb->();
120	}	142	}
121	}	143	}
122		144
123	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
124	my ($ev) = @_;	146	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
126		148
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		150
129	if ($widget != $HOVER) {	151	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		152
132	$hover->update if $hover && $hover->{can_hover};	153	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	154	if $HOVER;
140	}	155	}
141		156
142	# convert position array to integers	157	# convert position array to integers
143	sub harmonize {	158	sub harmonize {
…		…
193	reconfigure_widgets;	208	reconfigure_widgets;
194	}	209	}
195		210
196	#############################################################################	211	#############################################################################
197		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
198	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
199		222
200	use strict;	223	use strict;
201		224
202	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
203		226
204	sub new {	227	sub new {
205	my $class = shift;	228	my $class = shift;
206		229
207	my $self = bless {	230	my $self = bless {
…		…
212	h => undef,	235	h => undef,
213	can_events => 1,	236	can_events => 1,
214	@_	237	@_
215	}, $class;	238	}, $class;
216		239
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		241
219	for (keys %$self) {	242	for (keys %$self) {
220	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
222	}	245	}
223	}	246	}
224		247
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		253
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		256
234	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
247	sub show {	270	sub show {
248	my ($self) = @_;	271	my ($self) = @_;
249		272
250	return if $self->{parent};	273	return if $self->{parent};
251		274
252	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
253	}	276	}
254		277
255	sub set_visible {	278	sub set_visible {
256	my ($self) = @_;	279	my ($self) = @_;
257		280
…		…
278	delete $self->{root};	301	delete $self->{root};
279		302
280	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
282		305
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
285		308
286	$self->emit ("focus_out");	309	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
288	}	311	}
…		…
345	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
346		369
347	if ($self->{aspect}) {	370	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
349		372
350	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		375
353	# use alignment to adjust x, y	376	# use alignment to adjust x, y
354		377
355	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
397		420
398	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
399		422
400	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
401		424
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	428	}
406	}	429	}
407		430
408	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
409	sub coord2local {	432	sub coord2local {
410	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
411		434
		435	Carp::confess unless $self->{parent};#d#
		436
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	438	}
414		439
415	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
416	sub coord2global {	441	sub coord2global {
417	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
418		443
		444	Carp::confess unless $self->{parent};#d#
		445
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	447	}
421		448
422	sub invoke_focus_in {	449	sub invoke_focus_in {
423	my ($self) = @_;	450	my ($self) = @_;
424		451
425	return if $FOCUS == $self;	452	return if $FOCUS == $self;
426	return unless $self->{can_focus};	453	return unless $self->{can_focus};
427		454
428	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
429		456
430	$focus->update if $focus;	457	$self->update;
431	$FOCUS->update;
432		458
433	0	459	0
434	}	460	}
435		461
436	sub invoke_focus_out {	462	sub invoke_focus_out {
437	my ($self) = @_;	463	my ($self) = @_;
438		464
439	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
440		466
441	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
442		468
443	$focus->update if $focus; #?	469	$self->update;
444		470
445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	471	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	472	unless $FOCUS;
447		473
448	0	474	0
449	}	475	}
450		476
451	sub grab_focus {	477	sub grab_focus {
452	my ($self) = @_;	478	my ($self) = @_;
453		479
		480	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	481	$self->emit ("focus_in");
455	}	482	}
456		483
457	sub invoke_mouse_motion { 1 }	484	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	485	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	486	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
461		489
462	sub invoke_button_down {	490	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
464		492
465	$self->grab_focus;	493	$self->grab_focus;
466		494
467	1	495	0
468	}	496	}
469		497
470	sub connect {	498	sub connect {
471	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
472		500
473	push @{ $self->{signal_cb}{$signal} }, $cb;	501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
474	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
475		515
476	sub emit {	516	sub emit {
477	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
478		518
		519	# I do not really like this solution, but I dislike duplication
		520	# and needlessly verbose code, too.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
479	#d##TODO# stop propagating at first true, do not use sum	528	#d##TODO# stop propagating at first true, do not use sum
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483	}	532	}
484		533
485	sub find_widget {	534	sub find_widget {
486	my ($self, $x, $y) = @_;	535	my ($self, $x, $y) = @_;
487		536
…		…
539	return unless $self->{h} && $self->{w};	588	return unless $self->{h} && $self->{w};
540		589
541	# update screen rectangle	590	# update screen rectangle
542	local $draw_x = $draw_x + $self->{x};	591	local $draw_x = $draw_x + $self->{x};
543	local $draw_y = $draw_y + $self->{y};	592	local $draw_y = $draw_y + $self->{y};
544	local $draw_w = $draw_x + $self->{w};
545	local $draw_h = $draw_y + $self->{h};
546		593
547	# skip widgets that are entirely outside the drawing area	594	# skip widgets that are entirely outside the drawing area
548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	595	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	596	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550		597
…		…
573	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
576	glEnd;	623	glEnd;
577	glPopMatrix;	624	glPopMatrix;
578	#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;
579	}	626	}
580		627
581	$self->_draw;	628	$self->_draw;
582	glPopMatrix;	629	glPopMatrix;
583	}	630	}
…		…
589	}	636	}
590		637
591	sub DESTROY {	638	sub DESTROY {
592	my ($self) = @_;	639	my ($self) = @_;
593		640
		641	return if CFPlus::in_destruct;
		642
594	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
595		644
596	eval { $self->destroy };	645	eval { $self->destroy };
597	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598	}	647	}
599		648
600	#############################################################################	649	#############################################################################
601		650
602	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
603		652
604	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
605		654
606	use strict;	655	use strict;
607	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
608		657
609	sub new {	658	sub new {
610	my $class = shift;	659	my $class = shift;
611		660
612	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
643	}	692	}
644	}	693	}
645		694
646	#############################################################################	695	#############################################################################
647		696
648	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
649		698
650	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
651		700
652	sub new {	701	sub new {
653	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
655	}	704	}
…		…
662		711
663	sub draw { }	712	sub draw { }
664		713
665	#############################################################################	714	#############################################################################
666		715
667	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
668		717
669	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
670		719
671	sub new {	720	sub new {
672	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
673		722
674	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
683	if $children;	732	if $children;
684		733
685	$self	734	$self
686	}	735	}
687		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
688	sub add {	745	sub add {
689	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
690		747
691	$_->set_parent ($self)	748	$_->set_parent ($self)
692	for @widgets;	749	for @widgets;
…		…
752	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
753	}	810	}
754		811
755	#############################################################################	812	#############################################################################
756		813
757	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
758		815
759	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
760		817
761	sub new {	818	sub new {
762	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
763		820
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		822
766	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
767	}	824	}
768		825
769	sub add {	826	sub add {
…		…
776	sub remove {	833	sub remove {
777	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
778		835
779	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
780		837
781	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
782	unless @{$self->{children}};	839	unless @{$self->{children}};
783	}	840	}
784		841
785	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
786		843
…		…
798		855
799	#############################################################################	856	#############################################################################
800		857
801	# back-buffered drawing area	858	# back-buffered drawing area
802		859
803	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
804		861
805	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
806		863
807	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
808		865
809	sub new {	866	sub new {
810	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
811		868
812	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
834	}	891	}
835		892
836	sub render_child {	893	sub render_child {
837	my ($self) = @_;	894	my ($self) = @_;
838		895
839	$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 {
840	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
842		899
843	{	900	{
844	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
845		902
846	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
848	}	905	}
849		906
…		…
852	}	909	}
853		910
854	sub _draw {	911	sub _draw {
855	my ($self) = @_;	912	my ($self) = @_;
856		913
857	my ($w, $h) = @$self{qw(w h)};
858
859	my $tex = $self->{texture}	914	my $tex = $self->{texture}
860	or return;	915	or return;
861		916
862	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
865		920
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
867		922
868	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
869	}	924	}
870		925
871	#############################################################################	926	#############################################################################
872		927
873	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
874		929
875	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
876		931
877	sub new {	932	sub new {
878	my $class = shift;	933	my $class = shift;
879		934
880	$class->SUPER::new (	935	$class->SUPER::new (
…		…
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	997	) {
943	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944	} else {	999	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	1001	}
947	}	1002	}
948		1003
949	sub _render {	1004	sub _render {
950	my ($self) = @_;	1005	my ($self) = @_;
951		1006
952	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1007	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
953	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1008	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954		1009
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1011
957	$self->SUPER::_render;	1012	$self->SUPER::_render;
958	}	1013	}
959		1014
960	#############################################################################	1015	#############################################################################
961		1016
962	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
963		1018
964	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
965		1020
966	sub new {	1021	sub new {
967	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
968		1023
969	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
970		1025
971	my $self;	1026	my $self;
972		1027
973	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
974	vertical => 1,	1029	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1031	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
978	},	1033	},
979	;	1034	;
980		1035
981	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
		1038	can_events => 1,
983	slider => $slider,	1039	slider => $slider,
984	%arg,	1040	%arg,
985	);	1041	);
986		1042
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1043	$self->SUPER::add ($self->{vp}, $self->{slider});
988	$self->add ($child) if $child;	1044	$self->add ($child) if $child;
989		1045
990	$self	1046	$self
991	}	1047	}
992		1048
		1049	#TODO# update range on size_allocate depending on child
		1050
993	sub add {	1051	sub add {
994	my ($self, $widget) = @_;	1052	my ($self, $widget) = @_;
995		1053
996	$self->{vp}->add ($self->{child} = $widget);	1054	$self->{vp}->add ($self->{child} = $widget);
997	}	1055	}
998		1056
		1057	sub invoke_mouse_wheel {
		1058	my ($self, $ev) = @_;
		1059
		1060	return 0 unless $ev->{dy}; # only vertical movements
		1061
		1062	$self->{slider}->emit (mouse_wheel => $ev);
		1063
		1064	1
		1065	}
		1066
		1067	sub update_slider {
		1068	my ($self) = @_;
		1069
		1070	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1071	}
		1072
999	sub update {	1073	sub update {
1000	my ($self) = @_;	1074	my ($self) = @_;
1001		1075
1002	$self->SUPER::update;	1076	$self->SUPER::update;
1003		1077
1004	# todo: overwrite size_allocate of child	1078	$self->update_slider;
1005	my $child = $self->{vp}->child;
1006	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1007	}	1079	}
1008		1080
1009	sub invoke_size_allocate {	1081	sub invoke_size_allocate {
1010	my ($self, $w, $h) = @_;	1082	my ($self, $w, $h) = @_;
1011		1083
1012	my $child = $self->{vp}->child;	1084	$self->update_slider;
1013	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014		1085
1015	$self->SUPER::invoke_size_allocate ($w, $h)	1086	$self->SUPER::invoke_size_allocate ($w, $h)
1016	}	1087	}
1017		1088
1018	#TODO# update range on size_allocate depending on child
1019	# update viewport offset on scroll
1020
1021	#############################################################################	1089	#############################################################################
1022		1090
1023	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
1024		1092
1025	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
1026		1094
1027	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
1028		1096
1029	sub new {	1097	sub new {
1030	my $class = shift;	1098	my $class = shift;
1031		1099
1032	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
1059	}	1127	}
1060		1128
1061	#############################################################################	1129	#############################################################################
1062		1130
1063	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
1064		1132
1065	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
1066		1134
1067	use CFClient::OpenGL;	1135	use CFPlus::OpenGL;
1068		1136
1069	my $bg =	1137	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1138	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1139	mipmap => 1, wrap => 1;
1072		1140
1073	my @border =	1141	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1142	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1143	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1144
1077	sub new {	1145	sub new {
1078	my ($class, %arg) = @_;	1146	my ($class, %arg) = @_;
1079		1147
1080	my $self = $class->SUPER::new (	1148	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1149	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1150	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1151	border => 0.6,
1084	can_events => 1,	1152	can_events => 1,
1085	min_w => 16,	1153	min_w => 64,
1086	min_h => 16,	1154	min_h => 32,
1087	%arg,	1155	%arg,
1088	);	1156	);
1089		1157
1090	$self->{title_widget} = new CFClient::UI::Label	1158	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1159	align => 0,
1092	valign => 1,	1160	valign => 1,
1093	text => $self->{title},	1161	text => $self->{title},
1094	fontsize => $self->{border},	1162	fontsize => $self->{border},
1095	if exists $self->{title};	1163	if exists $self->{title};
1096		1164
1097	if ($self->{has_close_button}) {	1165	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1166	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1167	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1168	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1169	on_activate => sub { $self->emit ("delete") };
1102		1170
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1171	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1172	}
1105		1173
1106	$self	1174	$self
1107	}	1175	}
1108		1176
1109	sub add {	1177	sub add {
1110	my ($self, @widgets) = @_;	1178	my ($self, @widgets) = @_;
1111		1179
1112	$self->SUPER::add (@widgets);	1180	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1181	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1182	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1183	}
1116		1184
1117	sub border {	1185	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1186	int $_[0]{border} * $::FONTSIZE
1119	}	1187	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1220	$self->child->configure ($border, $border, $w, $h);
1153		1221
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1222	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1223	if $self->{close_button};
1156		1224
		1225	1
		1226	}
		1227
		1228	sub invoke_delete {
		1229	my ($self) = @_;
		1230
		1231	$self->hide;
		1232
1157	1	1233	1
1158	}	1234	}
1159		1235
1160	sub invoke_button_down {	1236	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1237	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1295	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1296
1221	! ! $self->{motion}	1297	! ! $self->{motion}
1222	}	1298	}
1223		1299
		1300	sub invoke_visibility_change {
		1301	my ($self, $visible) = @_;
		1302
		1303	delete $self->{motion} unless $visible;
		1304
		1305	0
		1306	}
		1307
1224	sub _draw {	1308	sub _draw {
1225	my ($self) = @_;	1309	my ($self) = @_;
1226		1310
1227	my $child = $self->{children}[0];	1311	my $child = $self->{children}[0];
1228		1312
…		…
1265	if $self->{close_button};	1349	if $self->{close_button};
1266	}	1350	}
1267		1351
1268	#############################################################################	1352	#############################################################################
1269		1353
1270	package CFClient::UI::Table;	1354	package CFPlus::UI::Table;
1271		1355
1272	our @ISA = CFClient::UI::Base::;	1356	our @ISA = CFPlus::UI::Base::;
1273		1357
1274	use List::Util qw(max sum);	1358	use List::Util qw(max sum);
1275		1359
1276	use CFClient::OpenGL;	1360	use CFPlus::OpenGL;
1277		1361
1278	sub new {	1362	sub new {
1279	my $class = shift;	1363	my $class = shift;
1280		1364
1281	$class->SUPER::new (	1365	$class->SUPER::new (
…		…
1287	sub children {	1371	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1372	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}	1373	}
1290		1374
1291	sub add {	1375	sub add {
1292	my ($self, $x, $y, $child) = @_;	1376	my ($self) = shift;
1293		1377
		1378	while (@_) {
		1379	my ($x, $y, $child) = splice @_, 0, 3, ();
1294	$child->set_parent ($self);	1380	$child->set_parent ($self);
1295	$self->{children}[$y][$x] = $child;	1381	$self->{children}[$y][$x] = $child;
		1382	}
1296		1383
		1384	$self->{force_realloc} = 1;
		1385	$self->{force_size_alloc} = 1;
1297	$self->realloc;	1386	$self->realloc;
1298	}	1387	}
1299		1388
1300	sub remove {	1389	sub remove {
1301	my ($self, $child) = @_;	1390	my ($self, $child) = @_;
…		…
1366		1455
1367	# linearly scale sizes	1456	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1457	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1458	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1459
1371	CFClient::UI::harmonize $ws;	1460	CFPlus::UI::harmonize $ws;
1372	CFClient::UI::harmonize $hs;	1461	CFPlus::UI::harmonize $hs;
1373		1462
1374	my $y;	1463	my $y;
1375		1464
1376	for my $r (0 .. $#{$self->{children}}) {	1465	for my $r (0 .. $#{$self->{children}}) {
1377	my $row = $self->{children}[$r]	1466	my $row = $self->{children}[$r]
…		…
1420	}	1509	}
1421	}	1510	}
1422		1511
1423	#############################################################################	1512	#############################################################################
1424		1513
1425	package CFClient::UI::Box;	1514	package CFPlus::UI::Box;
1426		1515
1427	our @ISA = CFClient::UI::Container::;	1516	our @ISA = CFPlus::UI::Container::;
1428		1517
1429	sub size_request {	1518	sub size_request {
1430	my ($self) = @_;	1519	my ($self) = @_;
1431		1520
1432	$self->{vertical}	1521	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1554	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1555	for 0 .. $#children;
1467	}	1556	}
1468	}	1557	}
1469		1558
1470	CFClient::UI::harmonize \@req;	1559	CFPlus::UI::harmonize \@req;
1471		1560
1472	my $pos = 0;	1561	my $pos = 0;
1473	for (0 .. $#children) {	1562	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1563	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1564	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1569	1
1481	}	1570	}
1482		1571
1483	#############################################################################	1572	#############################################################################
1484		1573
1485	package CFClient::UI::HBox;	1574	package CFPlus::UI::HBox;
1486		1575
1487	our @ISA = CFClient::UI::Box::;	1576	our @ISA = CFPlus::UI::Box::;
1488		1577
1489	sub new {	1578	sub new {
1490	my $class = shift;	1579	my $class = shift;
1491		1580
1492	$class->SUPER::new (	1581	$class->SUPER::new (
…		…
1495	)	1584	)
1496	}	1585	}
1497		1586
1498	#############################################################################	1587	#############################################################################
1499		1588
1500	package CFClient::UI::VBox;	1589	package CFPlus::UI::VBox;
1501		1590
1502	our @ISA = CFClient::UI::Box::;	1591	our @ISA = CFPlus::UI::Box::;
1503		1592
1504	sub new {	1593	sub new {
1505	my $class = shift;	1594	my $class = shift;
1506		1595
1507	$class->SUPER::new (	1596	$class->SUPER::new (
…		…
1510	)	1599	)
1511	}	1600	}
1512		1601
1513	#############################################################################	1602	#############################################################################
1514		1603
1515	package CFClient::UI::Label;	1604	package CFPlus::UI::Label;
1516		1605
1517	our @ISA = CFClient::UI::DrawBG::;	1606	our @ISA = CFPlus::UI::DrawBG::;
1518		1607
1519	use CFClient::OpenGL;	1608	use CFPlus::OpenGL;
1520		1609
1521	sub new {	1610	sub new {
1522	my ($class, %arg) = @_;	1611	my ($class, %arg) = @_;
1523		1612
1524	my $self = $class->SUPER::new (	1613	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1616	#active_bg => none
1528	#font => default_font	1617	#font => default_font
1529	#text => initial text	1618	#text => initial text
1530	#markup => initial narkup	1619	#markup => initial narkup
1531	#max_w => maximum pixel width	1620	#max_w => maximum pixel width
		1621	#style => 0, # render flags
1532	ellipsise => 3, # end	1622	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1623	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1624	fontsize => 1,
1535	align => -1,	1625	align => -1,
1536	valign => -1,	1626	valign => -1,
1537	padding_x => 2,	1627	padding_x => 2,
1538	padding_y => 2,	1628	padding_y => 2,
1539	can_events => 0,	1629	can_events => 0,
1540	%arg	1630	%arg
1541	);	1631	);
1542		1632
1543	if (exists $self->{template}) {	1633	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1634	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1635	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1636	$self->{template} = $layout;
1547	}	1637	}
1548		1638
1549	if (exists $self->{markup}) {	1639	if (exists $self->{markup}) {
…		…
1553	}	1643	}
1554		1644
1555	$self	1645	$self
1556	}	1646	}
1557		1647
1558	sub escape($) {
1559	local $_ = $_[0];
1560
1561	s/&/&amp;/g;
1562	s/>/&gt;/g;
1563	s/</&lt;/g;
1564
1565	$_
1566	}
1567
1568	sub update {	1648	sub update {
1569	my ($self) = @_;	1649	my ($self) = @_;
1570		1650
1571	delete $self->{texture};	1651	delete $self->{texture};
1572	$self->SUPER::update;	1652	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1663	my ($self, $text) = @_;
1584		1664
1585	return if $self->{text} eq "T$text";	1665	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1666	$self->{text} = "T$text";
1587		1667
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1668	$self->{layout}->set_text ($text);
1590		1669
1591	delete $self->{size_req};	1670	delete $self->{size_req};
1592	$self->realloc;	1671	$self->realloc;
1593	$self->update;	1672	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1678	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1679	$self->{text} = "M$markup";
1601		1680
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1681	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1682
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1683	$self->{layout}->set_markup ($markup);
1606		1684
1607	delete $self->{size_req};	1685	delete $self->{size_req};
1608	$self->realloc;	1686	$self->realloc;
1609	$self->update;	1687	$self->update;
…		…
1621		1699
1622	my ($w, $h) = $self->{layout}->size;	1700	my ($w, $h) = $self->{layout}->size;
1623		1701
1624	if (exists $self->{template}) {	1702	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	1703	$self->{template}->set_font ($self->{font}) if $self->{font};
		1704	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1705	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		1706
1628	my ($w2, $h2) = $self->{template}->size;	1707	my ($w2, $h2) = $self->{template}->size;
1629		1708
1630	$w = List::Util::max $w, $w2;	1709	$w = List::Util::max $w, $w2;
…		…
1654		1733
1655	sub set_fontsize {	1734	sub set_fontsize {
1656	my ($self, $fontsize) = @_;	1735	my ($self, $fontsize) = @_;
1657		1736
1658	$self->{fontsize} = $fontsize;	1737	$self->{fontsize} = $fontsize;
		1738	delete $self->{size_req};
1659	delete $self->{texture};	1739	delete $self->{texture};
1660		1740
1661	$self->realloc;	1741	$self->realloc;
1662	}	1742	}
1663		1743
1664	sub reconfigure {	1744	sub reconfigure {
1665	my ($self) = @_;	1745	my ($self) = @_;
1666		1746
1667	delete $self->{size_req};	1747	delete $self->{size_req};
		1748	delete $self->{texture};
1668		1749
1669	$self->SUPER::reconfigure;	1750	$self->SUPER::reconfigure;
1670	}	1751	}
1671		1752
1672	sub _draw {	1753	sub _draw {
1673	my ($self) = @_;	1754	my ($self) = @_;
1674		1755
1675	$self->SUPER::_draw; # draw background, if applicable	1756	$self->SUPER::_draw; # draw background, if applicable
1676		1757
1677	my $tex = $self->{texture} ||= do {	1758	my $size = $self->{texture} ||= do {
1678	$self->{layout}->set_foreground (@{$self->{fg}});	1759	$self->{layout}->set_foreground (@{$self->{fg}});
1679	$self->{layout}->set_font ($self->{font}) if $self->{font};	1760	$self->{layout}->set_font ($self->{font}) if $self->{font};
1680	$self->{layout}->set_width ($self->{w});	1761	$self->{layout}->set_width ($self->{w});
1681	$self->{layout}->set_ellipsise ($self->{ellipsise});	1762	$self->{layout}->set_ellipsise ($self->{ellipsise});
1682	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1763	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1764	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684		1765
1685	new_from_layout CFClient::Texture $self->{layout}	1766	[$self->{layout}->size]
1686	};	1767	};
1687		1768
1688	unless (exists $self->{ox}) {	1769	unless (exists $self->{ox}) {
1689	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1770	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1771	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691	: ($self->{w} - $tex->{w}) * 0.5);	1772	: ($self->{w} - $size->[0]) * 0.5);
1692		1773
1693	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1774	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1775	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695	: ($self->{h} - $tex->{h}) * 0.5);	1776	: ($self->{h} - $size->[1]) * 0.5);
1696	};	1777	};
1697		1778
1698	glEnable GL_TEXTURE_2D;
1699
1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1779	my $w = List::Util::min $self->{w} + 4, $size->[0];
1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1780	my $h = List::Util::min $self->{h} + 2, $size->[1];
1702		1781
1703	if ($tex->{format} == GL_ALPHA) {	1782	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1704	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705	glColor @{$self->{fg}};
1706	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707	} else {
1708	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710	}
1711
1712	glDisable GL_TEXTURE_2D;
1713	}	1783	}
1714		1784
1715	#############################################################################	1785	#############################################################################
1716		1786
1717	package CFClient::UI::EntryBase;	1787	package CFPlus::UI::EntryBase;
1718		1788
1719	our @ISA = CFClient::UI::Label::;	1789	our @ISA = CFPlus::UI::Label::;
1720		1790
1721	use CFClient::OpenGL;	1791	use CFPlus::OpenGL;
1722		1792
1723	sub new {	1793	sub new {
1724	my $class = shift;	1794	my $class = shift;
1725		1795
1726	$class->SUPER::new (	1796	$class->SUPER::new (
…		…
1788		1858
1789	if ($uni == 8) {	1859	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	1861	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	1862	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	1863	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	1864	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	1865	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	1866	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	1867	} elsif ($sym == CFPlus::SDLK_HOME) {
1798	$self->{cursor} = 0;	1868	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {	1869	} elsif ($sym == CFPlus::SDLK_END) {
1800	$self->{cursor} = length $text;	1870	$self->{cursor} = length $text;
1801	} elsif ($uni == 27) {	1871	} elsif ($uni == 27) {
1802	$self->emit ('escape');	1872	$self->emit ('escape');
1803	} elsif ($uni) {	1873	} elsif ($uni) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	1874	substr $text, $self->{cursor}++, 0, chr $uni;
…		…
1828		1898
1829	my $idx = $self->{layout}->xy_to_index ($x, $y);	1899	my $idx = $self->{layout}->xy_to_index ($x, $y);
1830		1900
1831	# byte-index to char-index	1901	# byte-index to char-index
1832	my $text = $self->{text};	1902	my $text = $self->{text};
1833	utf8::encode $text;	1903	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834	$self->{cursor} = length substr $text, 0, $idx;	1904	$self->{cursor} = length $text;
1835		1905
1836	$self->_set_text ($self->{text});	1906	$self->_set_text ($self->{text});
1837	$self->update;	1907	$self->update;
1838		1908
1839	1	1909	1
…		…
1878	utf8::encode $text;	1948	utf8::encode $text;
1879		1949
1880	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	1950	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881	}	1951	}
1882		1952
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	1953	glBegin GL_LINES;
1885	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	1954	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	1955	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	1956	glEnd;
1888	}	1957	}
1889	}	1958	}
1890		1959
1891	package CFClient::UI::Entry;	1960	package CFPlus::UI::Entry;
1892		1961
1893	our @ISA = CFClient::UI::EntryBase::;	1962	our @ISA = CFPlus::UI::EntryBase::;
1894		1963
1895	use CFClient::OpenGL;	1964	use CFPlus::OpenGL;
1896		1965
1897	sub invoke_key_down {	1966	sub invoke_key_down {
1898	my ($self, $ev) = @_;	1967	my ($self, $ev) = @_;
1899		1968
1900	my $sym = $ev->{sym};	1969	my $sym = $ev->{sym};
…		…
1906	$self->{history_pointer} = -1;	1975	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	1976	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	1977	$self->emit (activate => $txt);
1909	$self->update;	1978	$self->update;
1910		1979
1911	} elsif ($sym == CFClient::SDLK_UP) {	1980	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	1981	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	1982	$self->{history_saveback} = $self->get_text;
1914	}	1983	}
1915	if (@{$self->{history} || []} > 0) {	1984	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	1985	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	1987	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	1988	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1989	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	1990	}
1922		1991
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	1992	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	1993	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1994	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		1995
1927	if ($self->{history_pointer} >= 0) {	1996	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1997	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2006	1
1938	}	2007	}
1939		2008
1940	#############################################################################	2009	#############################################################################
1941		2010
1942	package CFClient::UI::Button;	2011	package CFPlus::UI::Button;
1943		2012
1944	our @ISA = CFClient::UI::Label::;	2013	our @ISA = CFPlus::UI::Label::;
1945		2014
1946	use CFClient::OpenGL;	2015	use CFPlus::OpenGL;
1947		2016
1948	my @tex =	2017	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2018	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2019	qw(b1_button_active.png);
1951		2020
1952	sub new {	2021	sub new {
1953	my $class = shift;	2022	my $class = shift;
1954		2023
…		…
1991	$self->SUPER::_draw;	2060	$self->SUPER::_draw;
1992	}	2061	}
1993		2062
1994	#############################################################################	2063	#############################################################################
1995		2064
		2065	package CFPlus::UI::CheckBox;
		2066
		2067	our @ISA = CFPlus::UI::DrawBG::;
		2068
		2069	my @tex =
		2070	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2071	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2072
		2073	use CFPlus::OpenGL;
		2074
		2075	sub new {
		2076	my $class = shift;
		2077
		2078	$class->SUPER::new (
		2079	padding_x => 2,
		2080	padding_y => 2,
		2081	fg => [1, 1, 1],
		2082	active_fg => [1, 1, 0],
		2083	bg => [0, 0, 0, 0.2],
		2084	active_bg => [1, 1, 1, 0.5],
		2085	state => 0,
		2086	can_hover => 1,
		2087	@_
		2088	)
		2089	}
		2090
		2091	sub size_request {
		2092	my ($self) = @_;
		2093
		2094	(6) x 2
		2095	}
		2096
		2097	sub toggle {
		2098	my ($self) = @_;
		2099
		2100	$self->{state} = !$self->{state};
		2101	$self->emit (changed => $self->{state});
		2102	$self->update;
		2103	}
		2104
		2105	sub invoke_button_down {
		2106	my ($self, $ev, $x, $y) = @_;
		2107
		2108	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2109	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2110	$self->toggle;
		2111	} else {
		2112	return 0
		2113	}
		2114
		2115	1
		2116	}
		2117
		2118	sub _draw {
		2119	my ($self) = @_;
		2120
		2121	$self->SUPER::_draw;
		2122
		2123	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2124
		2125	my ($w, $h) = @$self{qw(w h)};
		2126
		2127	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2128
		2129	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2130
		2131	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2132
		2133	glEnable GL_TEXTURE_2D;
		2134	$tex->draw_quad_alpha (0, 0, $s, $s);
		2135	glDisable GL_TEXTURE_2D;
		2136	}
		2137
		2138	#############################################################################
		2139
		2140	package CFPlus::UI::Image;
		2141
		2142	our @ISA = CFPlus::UI::Base::;
		2143
		2144	use CFPlus::OpenGL;
		2145
		2146	our %texture_cache;
		2147
		2148	sub new {
		2149	my $class = shift;
		2150
		2151	my $self = $class->SUPER::new (
		2152	can_events => 0,
		2153	@_,
		2154	);
		2155
		2156	$self->{path} || $self->{tex}
		2157	or Carp::croak "'path' or 'tex' attributes required";
		2158
		2159	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2160	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2161
		2162	Scalar::Util::weaken $texture_cache{$self->{path}};
		2163
		2164	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2165
		2166	$self
		2167	}
		2168
		2169	sub STORABLE_freeze {
		2170	my ($self, $cloning) = @_;
		2171
		2172	$self->{path}
		2173	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2174
		2175	$self->{path}
		2176	}
		2177
		2178	sub STORABLE_attach {
		2179	my ($self, $cloning, $path) = @_;
		2180
		2181	$self->new (path => $path)
		2182	}
		2183
		2184	sub size_request {
		2185	my ($self) = @_;
		2186
		2187	($self->{tex}{w}, $self->{tex}{h})
		2188	}
		2189
		2190	sub _draw {
		2191	my ($self) = @_;
		2192
		2193	my $tex = $self->{tex};
		2194
		2195	my ($w, $h) = ($self->{w}, $self->{h});
		2196
		2197	if ($self->{rot90}) {
		2198	glRotate 90, 0, 0, 1;
		2199	glTranslate 0, -$self->{w}, 0;
		2200
		2201	($w, $h) = ($h, $w);
		2202	}
		2203
		2204	glEnable GL_TEXTURE_2D;
		2205	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2206
		2207	$tex->draw_quad (0, 0, $w, $h);
		2208
		2209	glDisable GL_TEXTURE_2D;
		2210	}
		2211
		2212	#############################################################################
		2213
1996	package CFClient::UI::ImageButton;	2214	package CFPlus::UI::ImageButton;
1997		2215
1998	our @ISA = CFClient::UI::Image::;	2216	our @ISA = CFPlus::UI::Image::;
1999		2217
2000	use CFClient::OpenGL;	2218	use CFPlus::OpenGL;
2001		2219
2002	my %textures;	2220	my %textures;
2003		2221
2004	sub new {	2222	sub new {
2005	my $class = shift;	2223	my $class = shift;
…		…
2027	1	2245	1
2028	}	2246	}
2029		2247
2030	#############################################################################	2248	#############################################################################
2031		2249
2032	package CFClient::UI::CheckBox;
2033
2034	our @ISA = CFClient::UI::DrawBG::;
2035
2036	my @tex =
2037	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040	use CFClient::OpenGL;
2041
2042	sub new {
2043	my $class = shift;
2044
2045	$class->SUPER::new (
2046	padding_x => 2,
2047	padding_y => 2,
2048	fg => [1, 1, 1],
2049	active_fg => [1, 1, 0],
2050	bg => [0, 0, 0, 0.2],
2051	active_bg => [1, 1, 1, 0.5],
2052	state => 0,
2053	can_hover => 1,
2054	@_
2055	)
2056	}
2057
2058	sub size_request {
2059	my ($self) = @_;
2060
2061	(6) x 2
2062	}
2063
2064	sub invoke_button_down {
2065	my ($self, $ev, $x, $y) = @_;
2066
2067	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069	$self->{state} = !$self->{state};
2070	$self->emit (changed => $self->{state});
2071	} else {
2072	return 0
2073	}
2074
2075	1
2076	}
2077
2078	sub _draw {
2079	my ($self) = @_;
2080
2081	$self->SUPER::_draw;
2082
2083	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085	my ($w, $h) = @$self{qw(w h)};
2086
2087	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091	my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093	glEnable GL_TEXTURE_2D;
2094	$tex->draw_quad_alpha (0, 0, $s, $s);
2095	glDisable GL_TEXTURE_2D;
2096	}
2097
2098	#############################################################################
2099
2100	package CFClient::UI::Image;	2250	package CFPlus::UI::VGauge;
2101		2251
2102	our @ISA = CFClient::UI::Base::;	2252	our @ISA = CFPlus::UI::Base::;
2103
2104	use CFClient::OpenGL;
2105
2106	our %texture_cache;
2107
2108	sub new {
2109	my $class = shift;
2110
2111	my $self = $class->SUPER::new (
2112	can_events => 0,
2113	@_,
2114	);
2115
2116	$self->{path}
2117	or Carp::croak "required attribute 'path' not set";
2118
2119	$self->{tex} = $texture_cache{$self->{path}} ||=
2120	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122	Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126	$self
2127	}
2128
2129	sub size_request {
2130	my ($self) = @_;
2131
2132	($self->{tex}{w}, $self->{tex}{h})
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	my $tex = $self->{tex};
2139
2140	my ($w, $h) = ($self->{w}, $self->{h});
2141
2142	if ($self->{rot90}) {
2143	glRotate 90, 0, 0, 1;
2144	glTranslate 0, -$self->{w}, 0;
2145
2146	($w, $h) = ($h, $w);
2147	}
2148
2149	glEnable GL_TEXTURE_2D;
2150	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152	$tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154	glDisable GL_TEXTURE_2D;
2155	}
2156
2157	#############################################################################
2158
2159	package CFClient::UI::VGauge;
2160
2161	our @ISA = CFClient::UI::Base::;
2162		2253
2163	use List::Util qw(min max);	2254	use List::Util qw(min max);
2164		2255
2165	use CFClient::OpenGL;	2256	use CFPlus::OpenGL;
2166		2257
2167	my %tex = (	2258	my %tex = (
2168	food => [	2259	food => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2260	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2261	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171	],	2262	],
2172	grace => [	2263	grace => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2264	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2265	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175	],	2266	],
2176	hp => [	2267	hp => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2268	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2269	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179	],	2270	],
2180	mana => [	2271	mana => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2272	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2273	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183	],	2274	],
2184	);	2275	);
2185		2276
2186	# eg. VGauge->new (gauge => 'food'), default gauge: food	2277	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2246	my $ycut1 = max 0, min 1, $ycut;	2337	my $ycut1 = max 0, min 1, $ycut;
2247	my $ycut2 = max 0, min 1, $ycut - 1;	2338	my $ycut2 = max 0, min 1, $ycut - 1;
2248		2339
2249	my $h1 = $self->{h} * (1 - $ycut1);	2340	my $h1 = $self->{h} * (1 - $ycut1);
2250	my $h2 = $self->{h} * (1 - $ycut2);	2341	my $h2 = $self->{h} * (1 - $ycut2);
		2342	my $h3 = $self->{h};
		2343
		2344	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251		2345
2252	glEnable GL_BLEND;	2346	glEnable GL_BLEND;
2253	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2347	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2348	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255	glEnable GL_TEXTURE_2D;	2349	glEnable GL_TEXTURE_2D;
…		…
2274		2368
2275	if ($t3) {	2369	if ($t3) {
2276	glBindTexture GL_TEXTURE_2D, $t3->{name};	2370	glBindTexture GL_TEXTURE_2D, $t3->{name};
2277	glBegin GL_QUADS;	2371	glBegin GL_QUADS;
2278	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2372	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2373	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2374	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2375	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282	glEnd;	2376	glEnd;
2283	}	2377	}
2284		2378
2285	glDisable GL_BLEND;	2379	glDisable GL_BLEND;
2286	glDisable GL_TEXTURE_2D;	2380	glDisable GL_TEXTURE_2D;
2287	}	2381	}
2288		2382
2289	#############################################################################	2383	#############################################################################
2290		2384
2291	package CFClient::UI::Gauge;	2385	package CFPlus::UI::Gauge;
2292		2386
2293	our @ISA = CFClient::UI::VBox::;	2387	our @ISA = CFPlus::UI::VBox::;
2294		2388
2295	sub new {	2389	sub new {
2296	my ($class, %arg) = @_;	2390	my ($class, %arg) = @_;
2297		2391
2298	my $self = $class->SUPER::new (	2392	my $self = $class->SUPER::new (
…		…
2300	can_hover => 1,	2394	can_hover => 1,
2301	can_events => 1,	2395	can_events => 1,
2302	%arg,	2396	%arg,
2303	);	2397	);
2304		2398
2305	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2399	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2306	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2400	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2307	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2401	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308		2402
2309	$self	2403	$self
2310	}	2404	}
2311		2405
2312	sub set_fontsize {	2406	sub set_fontsize {
…		…
2333	$self->{value}->set_text ($val);	2427	$self->{value}->set_text ($val);
2334	}	2428	}
2335		2429
2336	#############################################################################	2430	#############################################################################
2337		2431
2338	package CFClient::UI::Slider;	2432	package CFPlus::UI::Slider;
2339		2433
2340	use strict;	2434	use strict;
2341		2435
2342	use CFClient::OpenGL;	2436	use CFPlus::OpenGL;
2343		2437
2344	our @ISA = CFClient::UI::DrawBG::;	2438	our @ISA = CFPlus::UI::DrawBG::;
2345		2439
2346	my @tex =	2440	my @tex =
2347	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2441	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348	qw(s1_slider.png s1_slider_bg.png);	2442	qw(s1_slider.png s1_slider_bg.png);
2349		2443
2350	sub new {	2444	sub new {
2351	my $class = shift;	2445	my $class = shift;
2352		2446
…		…
2441	}	2535	}
2442		2536
2443	1	2537	1
2444	}	2538	}
2445		2539
		2540	sub invoke_mouse_wheel {
		2541	my ($self, $ev) = @_;
		2542
		2543	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2544
		2545	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2546
		2547	! ! $delta
		2548	}
		2549
2446	sub update {	2550	sub update {
2447	my ($self) = @_;	2551	my ($self) = @_;
2448		2552
2449	delete $self->{knob_w};	2553	delete $self->{knob_w};
2450	$self->SUPER::update;	2554	$self->SUPER::update;
…		…
2497	glDisable GL_TEXTURE_2D;	2601	glDisable GL_TEXTURE_2D;
2498	}	2602	}
2499		2603
2500	#############################################################################	2604	#############################################################################
2501		2605
2502	package CFClient::UI::ValSlider;	2606	package CFPlus::UI::ValSlider;
2503		2607
2504	our @ISA = CFClient::UI::HBox::;	2608	our @ISA = CFPlus::UI::HBox::;
2505		2609
2506	sub new {	2610	sub new {
2507	my ($class, %arg) = @_;	2611	my ($class, %arg) = @_;
2508		2612
2509	my $range = delete $arg{range};	2613	my $range = delete $arg{range};
2510		2614
2511	my $self = $class->SUPER::new (	2615	my $self = $class->SUPER::new (
2512	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2616	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2617	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514	to_value => sub { shift },	2618	to_value => sub { shift },
2515	from_value => sub { shift },	2619	from_value => sub { shift },
2516	%arg,	2620	%arg,
2517	);	2621	);
2518		2622
…		…
2538	sub set_range { shift->{slider}->set_range (@_) }	2642	sub set_range { shift->{slider}->set_range (@_) }
2539	sub set_value { shift->{slider}->set_value (@_) }	2643	sub set_value { shift->{slider}->set_value (@_) }
2540		2644
2541	#############################################################################	2645	#############################################################################
2542		2646
2543	package CFClient::UI::TextScroller;	2647	package CFPlus::UI::TextScroller;
2544		2648
2545	our @ISA = CFClient::UI::HBox::;	2649	our @ISA = CFPlus::UI::HBox::;
2546		2650
2547	use CFClient::OpenGL;	2651	use CFPlus::OpenGL;
2548		2652
2549	sub new {	2653	sub new {
2550	my $class = shift;	2654	my $class = shift;
2551		2655
2552	my $self = $class->SUPER::new (	2656	my $self = $class->SUPER::new (
2553	fontsize => 1,	2657	fontsize => 1,
2554	can_events => 0,	2658	can_events => 1,
2555	indent => 0,	2659	indent => 0,
2556	#font => default_font	2660	#font => default_font
2557	@_,	2661	@_,
2558		2662
2559	layout => (new CFClient::Layout 1),	2663	layout => (new CFPlus::Layout),
2560	par => [],	2664	par => [],
2561	height => 0,	2665	height => 0,
2562	children => [	2666	children => [
2563	(new CFClient::UI::Empty expand => 1),	2667	(new CFPlus::UI::Empty expand => 1),
2564	(new CFClient::UI::Slider vertical => 1),	2668	(new CFPlus::UI::Slider vertical => 1),
2565	],	2669	],
2566	);	2670	);
2567		2671
2568	$self->{children}[1]->connect (changed => sub { $self->update });	2672	$self->{children}[1]->connect (changed => sub { $self->update });
2569		2673
…		…
2575		2679
2576	$self->{fontsize} = $fontsize;	2680	$self->{fontsize} = $fontsize;
2577	$self->reflow;	2681	$self->reflow;
2578	}	2682	}
2579		2683
2580	sub visible_children {	2684	sub size_request {
2581	my ($self) = @_;	2685	my ($self) = @_;
2582		2686
2583	@{$self->{children}}[0,1]	2687	my ($empty, $slider) = @{ $self->{children} };
		2688
		2689	local $self->{children} = [$empty, $slider];
		2690	$self->SUPER::size_request
2584	}	2691	}
2585		2692
2586	sub invoke_size_allocate {	2693	sub invoke_size_allocate {
2587	my ($self, $w, $h) = @_;	2694	my ($self, $w, $h) = @_;
2588		2695
…		…
2594	$self->{layout}->set_width ($empty->{w});	2701	$self->{layout}->set_width ($empty->{w});
2595	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2702	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596		2703
2597	$self->reflow;	2704	$self->reflow;
2598		2705
		2706	local $self->{children} = [$empty, $slider];
2599	$self->SUPER::invoke_size_allocate ($w, $h)	2707	$self->SUPER::invoke_size_allocate ($w, $h)
		2708	}
		2709
		2710	sub invoke_mouse_wheel {
		2711	my ($self, $ev) = @_;
		2712
		2713	return 0 unless $ev->{dy}; # only vertical movements
		2714
		2715	$self->{children}[1]->emit (mouse_wheel => $ev);
		2716
		2717	1
2600	}	2718	}
2601		2719
2602	sub get_layout {	2720	sub get_layout {
2603	my ($self, $para) = @_;	2721	my ($self, $para) = @_;
2604		2722
…		…
2632		2750
2633	# todo: base offset on lines or so, not on pixels	2751	# todo: base offset on lines or so, not on pixels
2634	$self->{children}[1]->set_value ($offset);	2752	$self->{children}[1]->set_value ($offset);
2635	}	2753	}
2636		2754
		2755	sub current_paragraph {
		2756	my ($self) = @_;
		2757
		2758	$self->force_uptodate;
		2759	$self->{top_paragraph} - 1
		2760	}
		2761
		2762	sub scroll_to {
		2763	my ($self, $para) = @_;
		2764
		2765	$self->force_uptodate;
		2766
		2767	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2768
		2769	$self->{children}[1]->set_value ($self->{par}[$para]{y});
		2770	}
		2771
2637	sub clear {	2772	sub clear {
2638	my ($self) = @_;	2773	my ($self) = @_;
2639		2774
2640	my (undef, undef, @other) = @{ $self->{children} };	2775	my (undef, undef, @other) = @{ $self->{children} };
2641	$self->remove ($_) for @other;	2776	$self->remove ($_) for @other;
…		…
2644	$self->{height} = 0;	2779	$self->{height} = 0;
2645	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2780	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646	}	2781	}
2647		2782
2648	sub add_paragraph {	2783	sub add_paragraph {
2649	my ($self, $color, $para, $indent) = @_;	2784	my $self = shift;
2650		2785
2651	my ($text, @w) = ref $para ? @$para : $para;	2786	for my $para (@_) {
2652
2653	$para = {	2787	$para = {
		2788	fg => [1, 1, 1, 1],
		2789	indent => 0,
		2790	markup => "",
		2791	widget => [],
		2792	ref $para ? %$para : (markup => $para),
2654	w => 1e10,	2793	w => 1e10,
2655	wrapped => 1,	2794	wrapped => 1,
2656	fg => $color,
2657	indent => $indent,
2658	markup => $text,
2659	widget => \@w,
2660	};	2795	};
2661		2796
2662	$self->add (@w) if @w;	2797	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663	push @{$self->{par}}, $para;	2798	push @{$self->{par}}, $para;
		2799	}
2664		2800
2665	$self->{need_reflow}++;	2801	$self->{need_reflow}++;
2666	$self->update;	2802	$self->update;
2667	}	2803	}
2668		2804
…		…
2671		2807
2672	$self->{scroll_to_bottom} = 1;	2808	$self->{scroll_to_bottom} = 1;
2673	$self->update;	2809	$self->update;
2674	}	2810	}
2675		2811
		2812	sub force_uptodate {
		2813	my ($self) = @_;
		2814
		2815	if (delete $self->{need_reflow}) {
		2816	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2817
		2818	my $height = 0;
		2819	my $paridx;
		2820	my $top_paragraph;
		2821	my $top = int $self->{children}[1]{range}[0];
		2822
		2823	for my $para (@{$self->{par}}) {
		2824	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2825	my $layout = $self->get_layout ($para);
		2826	my ($w, $h) = $layout->size;
		2827
		2828	$para->{w} = $w + $para->{indent};
		2829	$para->{h} = $h;
		2830	$para->{wrapped} = $layout->has_wrapped;
		2831	}
		2832
		2833	$para->{y} = $height;
		2834
		2835	$paridx++;
		2836	$top_paragraph ||= $paridx if $height >= $top;
		2837
		2838	$height += $para->{h};
		2839	}
		2840
		2841	$self->{top_paragraph} = $top_paragraph;
		2842	$self->{height} = $height;
		2843
		2844	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2845
		2846	delete $self->{texture};
		2847	}
		2848
		2849	if (delete $self->{scroll_to_bottom}) {
		2850	$self->{children}[1]->set_value (1e10);
		2851	}
		2852	}
		2853
2676	sub update {	2854	sub update {
2677	my ($self) = @_;	2855	my ($self) = @_;
2678		2856
2679	$self->SUPER::update;	2857	$self->SUPER::update;
2680		2858
2681	return unless $self->{h} > 0;	2859	return unless $self->{h} > 0;
2682		2860
2683	delete $self->{texture};	2861	delete $self->{texture};
2684		2862
2685	$ROOT->on_post_alloc ($self => sub {	2863	$ROOT->on_post_alloc ($self => sub {
		2864	$self->force_uptodate;
		2865
2686	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2866	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687		2867
2688	if (delete $self->{need_reflow}) {
2689	my $height = 0;
2690
2691	for my $para (@{$self->{par}}) {
2692	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2693	my $layout = $self->get_layout ($para);
2694	my ($w, $h) = $layout->size;
2695
2696	$para->{w} = $w + $para->{indent};
2697	$para->{h} = $h;
2698	$para->{wrapped} = $layout->has_wrapped;
2699	}
2700
2701	$height += $para->{h};
2702	}
2703
2704	$self->{height} = $height;
2705
2706	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2707
2708	delete $self->{texture};
2709	}
2710
2711	if (delete $self->{scroll_to_bottom}) {
2712	$self->{children}[1]->set_value (1e10);
2713	}
2714
2715	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2868	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716	glClearColor 0, 0, 0, 0;	2869	glClearColor 0, 0, 0, 0;
2717	glClear GL_COLOR_BUFFER_BIT;	2870	glClear GL_COLOR_BUFFER_BIT;
2718		2871
2719	my $top = int $self->{children}[1]{range}[0];	2872	my $top = int $self->{children}[1]{range}[0];
2720		2873
2721	my $y0 = $top;	2874	my $y0 = $top;
2722	my $y1 = $top + $H;	2875	my $y1 = $top + $H;
2723		2876
2724	my $y = 0;
2725
2726	glEnable GL_BLEND;
2727	#TODO# not correct in windows where rgba is forced off
2728	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2729
2730	for my $para (@{$self->{par}}) {	2877	for my $para (@{$self->{par}}) {
2731	my $h = $para->{h};	2878	my $h = $para->{h};
		2879	my $y = $para->{y};
2732		2880
2733	if ($y0 < $y + $h && $y < $y1) {	2881	if ($y0 < $y + $h && $y < $y1) {
2734
2735	my $layout = $self->get_layout ($para);	2882	my $layout = $self->get_layout ($para);
2736		2883
2737	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739	glRasterPos $para->{indent}, $y - $y0;	2884	$layout->render ($para->{indent}, $y - $y0);
2740	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741		2885
2742	if (my @w = @{ $para->{widget} }) {	2886	if (my @w = @{ $para->{widget} }) {
2743	my @s = $layout->get_shapes;	2887	my @s = $layout->get_shapes;
2744		2888
2745	for (@w) {	2889	for (@w) {
…		…
2750		2894
2751	$_->draw;	2895	$_->draw;
2752	}	2896	}
2753	}	2897	}
2754	}	2898	}
2755
2756	$y += $h;
2757	}	2899	}
2758
2759	glDisable GL_BLEND;
2760	};	2900	};
2761	});	2901	});
2762	}	2902	}
2763		2903
2764	sub reconfigure {	2904	sub reconfigure {
…		…
2782	$self->{children}[1]->draw;	2922	$self->{children}[1]->draw;
2783	}	2923	}
2784		2924
2785	#############################################################################	2925	#############################################################################
2786		2926
2787	package CFClient::UI::Animator;	2927	package CFPlus::UI::Animator;
2788		2928
2789	use CFClient::OpenGL;	2929	use CFPlus::OpenGL;
2790		2930
2791	our @ISA = CFClient::UI::Bin::;	2931	our @ISA = CFPlus::UI::Bin::;
2792		2932
2793	sub moveto {	2933	sub moveto {
2794	my ($self, $x, $y) = @_;	2934	my ($self, $x, $y) = @_;
2795		2935
2796	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2936	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2824	glPopMatrix;	2964	glPopMatrix;
2825	}	2965	}
2826		2966
2827	#############################################################################	2967	#############################################################################
2828		2968
2829	package CFClient::UI::Flopper;	2969	package CFPlus::UI::Flopper;
2830		2970
2831	our @ISA = CFClient::UI::Button::;	2971	our @ISA = CFPlus::UI::Button::;
2832		2972
2833	sub new {	2973	sub new {
2834	my $class = shift;	2974	my $class = shift;
2835		2975
2836	my $self = $class->SUPER::new (	2976	my $self = $class->SUPER::new (
…		…
2848	$self->{other}->toggle_visibility;	2988	$self->{other}->toggle_visibility;
2849	}	2989	}
2850		2990
2851	#############################################################################	2991	#############################################################################
2852		2992
2853	package CFClient::UI::Tooltip;	2993	package CFPlus::UI::Tooltip;
2854		2994
2855	our @ISA = CFClient::UI::Bin::;	2995	our @ISA = CFPlus::UI::Bin::;
2856		2996
2857	use CFClient::OpenGL;	2997	use CFPlus::OpenGL;
2858		2998
2859	sub new {	2999	sub new {
2860	my $class = shift;	3000	my $class = shift;
2861		3001
2862	$class->SUPER::new (	3002	$class->SUPER::new (
…		…
2865	)	3005	)
2866	}	3006	}
2867		3007
2868	sub set_tooltip_from {	3008	sub set_tooltip_from {
2869	my ($self, $widget) = @_;	3009	my ($self, $widget) = @_;
		3010
		3011	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3012	if $widget->{tooltip} =~ /^#(.*)$/;
2870		3013
2871	my $tooltip = $widget->{tooltip};	3014	my $tooltip = $widget->{tooltip};
2872		3015
2873	if ($ENV{CFPLUS_DEBUG} & 2) {	3016	if ($ENV{CFPLUS_DEBUG} & 2) {
2874	$tooltip .= "\n\n" . (ref $widget) . "\n"	3017	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2878	}	3021	}
2879		3022
2880	$tooltip =~ s/^\n+//;	3023	$tooltip =~ s/^\n+//;
2881	$tooltip =~ s/\n+$//;	3024	$tooltip =~ s/\n+$//;
2882		3025
2883	$self->add (new CFClient::UI::Label	3026	$self->add (new CFPlus::UI::Label
2884	markup => $tooltip,	3027	markup => $tooltip,
2885	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3028	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886	fontsize => 0.8,	3029	fontsize => 0.8,
2887	fg => [0, 0, 0, 1],	3030	style => 1, # FLAG_INVERSE
2888	ellipsise => 0,	3031	ellipsise => 0,
2889	font => ($widget->{tooltip_font} || $::FONT_PROP),	3032	font => ($widget->{tooltip_font} || $::FONT_PROP),
2890	);	3033	);
2891	}	3034	}
2892		3035
…		…
2911		3054
2912	$self->{root}->on_post_alloc ("move_$self" => sub {	3055	$self->{root}->on_post_alloc ("move_$self" => sub {
2913	my $widget = $self->{owner}	3056	my $widget = $self->{owner}
2914	or return;	3057	or return;
2915		3058
		3059	if ($widget->{visible}) {
2916	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3060	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917		3061
2918	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3062	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919	if $x + $self->{w} > $self->{root}{w};	3063	if $x + $self->{w} > $self->{root}{w};
2920		3064
2921	$self->move_abs ($x, $y);	3065	$self->move_abs ($x, $y);
		3066	} else {
		3067	$self->hide;
		3068	}
2922	});	3069	});
2923	}	3070	}
2924		3071
2925	sub _draw {	3072	sub _draw {
2926	my ($self) = @_;	3073	my ($self) = @_;
…		…
2950	$self->SUPER::_draw;	3097	$self->SUPER::_draw;
2951	}	3098	}
2952		3099
2953	#############################################################################	3100	#############################################################################
2954		3101
2955	package CFClient::UI::Face;	3102	package CFPlus::UI::Face;
2956		3103
2957	our @ISA = CFClient::UI::Base::;	3104	our @ISA = CFPlus::UI::DrawBG::;
2958		3105
2959	use CFClient::OpenGL;	3106	use CFPlus::OpenGL;
2960		3107
2961	sub new {	3108	sub new {
2962	my $class = shift;	3109	my $class = shift;
2963		3110
2964	my $self = $class->SUPER::new (	3111	my $self = $class->SUPER::new (
…		…
2999	sub _draw {	3146	sub _draw {
3000	my ($self) = @_;	3147	my ($self) = @_;
3001		3148
3002	return unless $::CONN;	3149	return unless $::CONN;
3003		3150
		3151	$self->SUPER::_draw;
		3152
3004	my $face;	3153	my $face;
3005		3154
3006	if ($self->{frame}) {	3155	if ($self->{frame}) {
3007	my $anim = $::CONN->{anim}[$self->{anim}];	3156	my $anim = $::CONN->{anim}[$self->{anim}];
3008		3157
…		…
3030	$self->SUPER::destroy;	3179	$self->SUPER::destroy;
3031	}	3180	}
3032		3181
3033	#############################################################################	3182	#############################################################################
3034		3183
3035	package CFClient::UI::Buttonbar;	3184	package CFPlus::UI::Buttonbar;
3036		3185
3037	our @ISA = CFClient::UI::HBox::;	3186	our @ISA = CFPlus::UI::HBox::;
3038		3187
3039	# TODO: should actualyl wrap buttons and other goodies.	3188	# TODO: should actualyl wrap buttons and other goodies.
3040		3189
3041	#############################################################################	3190	#############################################################################
3042		3191
3043	package CFClient::UI::Menu;	3192	package CFPlus::UI::Menu;
3044		3193
3045	our @ISA = CFClient::UI::FancyFrame::;	3194	our @ISA = CFPlus::UI::FancyFrame::;
3046		3195
3047	use CFClient::OpenGL;	3196	use CFPlus::OpenGL;
3048		3197
3049	sub new {	3198	sub new {
3050	my $class = shift;	3199	my $class = shift;
3051		3200
3052	my $self = $class->SUPER::new (	3201	my $self = $class->SUPER::new (
3053	items => [],	3202	items => [],
3054	z => 100,	3203	z => 100,
3055	@_,	3204	@_,
3056	);	3205	);
3057		3206
3058	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3207	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059		3208
3060	for my $item (@{ $self->{items} }) {	3209	for my $item (@{ $self->{items} }) {
3061	my ($widget, $cb, $tooltip) = @$item;	3210	my ($widget, $cb, $tooltip) = @$item;
3062		3211
3063	# handle various types of items, only text for now	3212	# handle various types of items, only text for now
3064	if (!ref $widget) {	3213	if (!ref $widget) {
		3214	if ($widget =~ /\t/) {
		3215	my ($left, $right) = split /\t/, $widget, 2;
		3216
3065	$widget = new CFClient::UI::Label	3217	$widget = new CFPlus::UI::HBox
3066	can_hover => 1,	3218	can_hover => 1,
3067	can_events => 1,	3219	can_events => 1,
		3220	tooltip => $tooltip,
		3221	children => [
		3222	(new CFPlus::UI::Label markup => $left, expand => 1),
		3223	(new CFPlus::UI::Label markup => $right, align => +1),
		3224	],
		3225	;
		3226
		3227	} else {
		3228	$widget = new CFPlus::UI::Label
		3229	can_hover => 1,
		3230	can_events => 1,
3068	markup => $widget,	3231	markup => $widget,
3069	tooltip => $tooltip	3232	tooltip => $tooltip;
		3233	}
3070	}	3234	}
3071		3235
3072	$self->{item}{$widget} = $item;	3236	$self->{item}{$widget} = $item;
3073		3237
3074	$self->{vbox}->add ($widget);	3238	$self->{vbox}->add ($widget);
…		…
3117	1	3281	1
3118	}	3282	}
3119		3283
3120	#############################################################################	3284	#############################################################################
3121		3285
3122	package CFClient::UI::Multiplexer;	3286	package CFPlus::UI::Multiplexer;
3123		3287
3124	our @ISA = CFClient::UI::Container::;	3288	our @ISA = CFPlus::UI::Container::;
3125		3289
3126	sub new {	3290	sub new {
3127	my $class = shift;	3291	my $class = shift;
3128		3292
3129	my $self = $class->SUPER::new (	3293	my $self = $class->SUPER::new (
…		…
3143		3307
3144	$self->{current} = $self->{children}[0]	3308	$self->{current} = $self->{children}[0]
3145	if @{ $self->{children} };	3309	if @{ $self->{children} };
3146	}	3310	}
3147		3311
		3312	sub get_current_page {
		3313	my ($self) = @_;
		3314
		3315	$self->{current}
		3316	}
		3317
3148	sub set_current_page {	3318	sub set_current_page {
3149	my ($self, $page_or_widget) = @_;	3319	my ($self, $page_or_widget) = @_;
3150		3320
3151	my $widget = ref $page_or_widget	3321	my $widget = ref $page_or_widget
3152	? $page_or_widget	3322	? $page_or_widget
…		…
3184	$self->{current}->draw;	3354	$self->{current}->draw;
3185	}	3355	}
3186		3356
3187	#############################################################################	3357	#############################################################################
3188		3358
3189	package CFClient::UI::Notebook;	3359	package CFPlus::UI::Notebook;
3190		3360
3191	our @ISA = CFClient::UI::VBox::;	3361	our @ISA = CFPlus::UI::VBox::;
3192		3362
3193	sub new {	3363	sub new {
3194	my $class = shift;	3364	my $class = shift;
3195		3365
3196	my $self = $class->SUPER::new (	3366	my $self = $class->SUPER::new (
3197	buttonbar => (new CFClient::UI::Buttonbar),	3367	buttonbar => (new CFPlus::UI::Buttonbar),
3198	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3368	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199	# filter => # will be put between multiplexer and $self	3369	# filter => # will be put between multiplexer and $self
3200	@_,	3370	@_,
3201	);	3371	);
3202		3372
3203	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3373	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3209	sub add {	3379	sub add {
3210	my ($self, $title, $widget, $tooltip) = @_;	3380	my ($self, $title, $widget, $tooltip) = @_;
3211		3381
3212	Scalar::Util::weaken $self;	3382	Scalar::Util::weaken $self;
3213		3383
3214	$self->{buttonbar}->add (new CFClient::UI::Button	3384	$self->{buttonbar}->add (new CFPlus::UI::Button
3215	markup => $title,	3385	markup => $title,
3216	tooltip => $tooltip,	3386	tooltip => $tooltip,
3217	on_activate => sub { $self->set_current_page ($widget) },	3387	on_activate => sub { $self->set_current_page ($widget) },
3218	);	3388	);
3219		3389
3220	$self->{multiplexer}->add ($widget);	3390	$self->{multiplexer}->add ($widget);
3221	}	3391	}
3222		3392
		3393	sub get_current_page {
		3394	my ($self) = @_;
		3395
		3396	$self->{multiplexer}->get_current_page
		3397	}
		3398
3223	sub set_current_page {	3399	sub set_current_page {
3224	my ($self, $page) = @_;	3400	my ($self, $page) = @_;
3225		3401
3226	$self->{multiplexer}->set_current_page ($page);	3402	$self->{multiplexer}->set_current_page ($page);
3227	$self->emit (page_changed => $self->{multiplexer}{current});	3403	$self->emit (page_changed => $self->{multiplexer}{current});
3228	}	3404	}
3229		3405
3230	#############################################################################	3406	#############################################################################
3231		3407
3232	package CFClient::UI::Combobox;	3408	package CFPlus::UI::Selector;
3233		3409
3234	use utf8;	3410	use utf8;
3235		3411
3236	our @ISA = CFClient::UI::Button::;	3412	our @ISA = CFPlus::UI::Button::;
3237		3413
3238	sub new {	3414	sub new {
3239	my $class = shift;	3415	my $class = shift;
3240		3416
3241	my $self = $class->SUPER::new (	3417	my $self = $class->SUPER::new (
…		…
3258	my ($value, $title, $tooltip) = @$_;	3434	my ($value, $title, $tooltip) = @$_;
3259		3435
3260	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3436	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261	}	3437	}
3262		3438
3263	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3439	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264	}	3440	}
3265		3441
3266	sub _set_value {	3442	sub _set_value {
3267	my ($self, $value) = @_;	3443	my ($self, $value) = @_;
3268		3444
…		…
3283	$self->emit (changed => $value);	3459	$self->emit (changed => $value);
3284	}	3460	}
3285		3461
3286	#############################################################################	3462	#############################################################################
3287		3463
3288	package CFClient::UI::Statusbox;	3464	package CFPlus::UI::Statusbox;
3289		3465
3290	our @ISA = CFClient::UI::VBox::;	3466	our @ISA = CFPlus::UI::VBox::;
3291		3467
3292	sub new {	3468	sub new {
3293	my $class = shift;	3469	my $class = shift;
3294		3470
3295	my $self = $class->SUPER::new (	3471	my $self = $class->SUPER::new (
…		…
3307	sub reorder {	3483	sub reorder {
3308	my ($self) = @_;	3484	my ($self) = @_;
3309	my $NOW = Time::HiRes::time;	3485	my $NOW = Time::HiRes::time;
3310		3486
3311	# freeze display when hovering over any label	3487	# freeze display when hovering over any label
3312	return if $CFClient::UI::TOOLTIP->{owner}	3488	return if $CFPlus::UI::TOOLTIP->{owner}
3313	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3489	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314	values %{ $self->{item} };	3490	values %{ $self->{item} };
3315		3491
3316	while (my ($k, $v) = each %{ $self->{item} }) {	3492	while (my ($k, $v) = each %{ $self->{item} }) {
3317	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3493	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318	}	3494	}
…		…
3339	for ($short) {	3515	for ($short) {
3340	s/^\s+//;	3516	s/^\s+//;
3341	s/\s+/ /g;	3517	s/\s+/ /g;
3342	}	3518	}
3343		3519
3344	new CFClient::UI::Label	3520	new CFPlus::UI::Label
3345	markup => $short,	3521	markup => $short,
3346	tooltip => $item->{tooltip},	3522	tooltip => $item->{tooltip},
3347	tooltip_font => $::FONT_PROP,	3523	tooltip_font => $::FONT_PROP,
3348	tooltip_width => 0.67,	3524	tooltip_width => 0.67,
3349	fontsize => $item->{fontsize} || $self->{fontsize},	3525	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3403	count => 1,	3579	count => 1,
3404	%arg,	3580	%arg,
3405	};	3581	};
3406	}	3582	}
3407		3583
		3584	$ROOT->on_refresh (reorder => sub {
3408	$self->reorder;	3585	$self->reorder;
		3586	});
3409	}	3587	}
3410		3588
3411	sub reconfigure {	3589	sub reconfigure {
3412	my ($self) = @_;	3590	my ($self) = @_;
3413		3591
…		…
3426	$self->SUPER::destroy;	3604	$self->SUPER::destroy;
3427	}	3605	}
3428		3606
3429	#############################################################################	3607	#############################################################################
3430		3608
3431	package CFClient::UI::Inventory;	3609	package CFPlus::UI::Inventory;
3432		3610
3433	our @ISA = CFClient::UI::ScrolledWindow::;	3611	our @ISA = CFPlus::UI::Table::;
3434		3612
3435	sub new {	3613	sub new {
3436	my $class = shift;	3614	my $class = shift;
3437		3615
3438	my $self = $class->SUPER::new (	3616	my $self = $class->SUPER::new (
3439	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3617	col_expand => [0, 1, 0],
		3618	items => [],
3440	@_,	3619	@_,
3441	);	3620	);
3442		3621
		3622	$self->set_sort_order (undef);
		3623
3443	$self	3624	$self
		3625	}
		3626
		3627	sub update_items {
		3628	my ($self) = @_;
		3629
		3630	$self->clear;
		3631
		3632	my @item = $self->{sort}->(@{ $self->{items} });
		3633
		3634	my @adds;
		3635	my $row = 0;
		3636	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3637	CFPlus::Item::update_widgets $item;
		3638
		3639	push @adds, 0, $row, $item->{face_widget};
		3640	push @adds, 1, $row, $item->{desc_widget};
		3641	push @adds, 2, $row, $item->{weight_widget};
		3642
		3643	$row++;
		3644	}
		3645
		3646	$self->add (@adds);
		3647	}
		3648
		3649	sub set_sort_order {
		3650	my ($self, $order) = @_;
		3651
		3652	$self->{sort} = $order ||= sub {
		3653	sort {
		3654	$a->{type} <=> $b->{type}
		3655	or $a->{name} cmp $b->{name}
		3656	} @_
		3657	};
		3658
		3659	$self->update_items;
3444	}	3660	}
3445		3661
3446	sub set_items {	3662	sub set_items {
3447	my ($self, $items) = @_;	3663	my ($self, $items) = @_;
3448		3664
3449	$self->{child}->clear;	3665	$self->{items} = [$items ? values %$items : ()];
3450	return unless $items;	3666	$self->update_items;
3451
3452	my @items = sort {
3453	($a->{type} <=> $b->{type})
3454	or ($a->{name} cmp $b->{name})
3455	} @$items;
3456
3457	$self->{real_items} = \@items;
3458
3459	my $row = 0;
3460	for my $item (@items) {
3461	CFClient::Item::update_widgets $item;
3462
3463	$self->{child}->add (0, $row, $item->{face_widget});
3464	$self->{child}->add (1, $row, $item->{desc_widget});
3465	$self->{child}->add (2, $row, $item->{weight_widget});
3466
3467	$row++;
3468	}
3469	}	3667	}
3470		3668
3471	#############################################################################	3669	#############################################################################
3472		3670
3473	package CFClient::UI::BindEditor;
3474
3475	our @ISA = CFClient::UI::FancyFrame::;
3476
3477	sub new {
3478	my $class = shift;
3479
3480	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482	$self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486	text => "start recording",
3487	tooltip => "Start/Stops recording of actions."
3488	."All subsequent actions after the recording started will be captured."
3489	."The actions are displayed after the record was stopped."
3490	."To bind the action you have to click on the 'Bind' button",
3491	on_activate => sub {
3492	unless ($self->{recording}) {
3493	$self->start;
3494	} else {
3495	$self->stop;
3496	}
3497	});
3498
3499	$vb->add (new CFClient::UI::Label text => "Actions:");
3500	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3503	$vb->add (my $hb = new CFClient::UI::HBox);
3504	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505	$hb->add (new CFClient::UI::Button
3506	text => "bind",
3507	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508	on_activate => sub {
3509	$self->ask_for_bind;
3510	});
3511
3512	$vb->add (my $hb = new CFClient::UI::HBox);
3513	$hb->add (new CFClient::UI::Button
3514	text => "ok",
3515	expand => 1,
3516	tooltip => "This closes the binding editor and saves the binding",
3517	on_activate => sub {
3518	$self->hide;
3519	$self->commit;
3520	});
3521
3522	$hb->add (new CFClient::UI::Button
3523	text => "cancel",
3524	expand => 1,
3525	tooltip => "This closes the binding editor without saving",
3526	on_activate => sub {
3527	$self->hide;
3528	$self->{binding_cancel}->()
3529	if $self->{binding_cancel};
3530	});
3531
3532	$self->update_binding_widgets;
3533
3534	$self
3535	}
3536
3537	sub cfg_bind {
3538	my ($self, $mod, $sym, $cmds) = @_;
3539	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540	::update_bindings ();
3541	}
3542
3543	sub cfg_unbind {
3544	my ($self, $mod, $sym, $cmds) = @_;
3545	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546	::update_bindings ();
3547	}
3548
3549	sub commit {
3550	my ($self) = @_;
3551	my ($mod, $sym, $cmds) = $self->get_binding;
3552	if ($sym != 0 && @$cmds > 0) {
3553	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554	."'. Don't forget 'Save Config'!");
3555	$self->{binding_change}->($mod, $sym, $cmds)
3556	if $self->{binding_change};
3557	} else {
3558	$::STATUSBOX->add ("No action bound, no key or action specified!");
3559	$self->{binding_cancel}->()
3560	if $self->{binding_cancel};
3561	}
3562	}
3563
3564	sub start {
3565	my ($self) = @_;
3566
3567	$self->{rec_btn}->set_text ("stop recording");
3568	$self->{recording} = 1;
3569	$self->clear_command_list;
3570	$::CONN->start_record if $::CONN;
3571	}
3572
3573	sub stop {
3574	my ($self) = @_;
3575
3576	$self->{rec_btn}->set_text ("start recording");
3577	$self->{recording} = 0;
3578
3579	my $rec;
3580	$rec = $::CONN->stop_record if $::CONN;
3581	return unless ref $rec eq 'ARRAY';
3582	$self->set_command_list ($rec);
3583	}
3584
3585
3586	sub ask_for_bind_and_commit {
3587	my ($self) = @_;
3588	$self->ask_for_bind (1);
3589	}
3590
3591	sub ask_for_bind {
3592	my ($self, $commit, $end_cb) = @_;
3593
3594	CFClient::Binder::open_binding_dialog (sub {
3595	my ($mod, $sym) = @_;
3596	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597	$self->update_binding_widgets;
3598	$self->commit if $commit;
3599	$end_cb->() if $end_cb;
3600	});
3601	}
3602
3603	# $mod and $sym are the modifiers and key symbol
3604	# $cmds is a array ref of strings (the commands)
3605	# $cb is the callback that is executed on OK
3606	# $ccb is the callback that is executed on CANCEL and
3607	# when the binding was unsuccessful on OK
3608	sub set_binding {
3609	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611	$self->clear_command_list;
3612	$self->{recording} = 0;
3613	$self->{rec_btn}->set_text ("start recording");
3614
3615	$self->{binding} = [$mod, $sym];
3616	$self->{commands} = $cmds;
3617
3618	$self->{binding_change} = $cb;
3619	$self->{binding_cancel} = $ccb;
3620
3621	$self->update_binding_widgets;
3622	}
3623
3624	# this is a shortcut method that asks for a binding
3625	# and then just binds it.
3626	sub do_quick_binding {
3627	my ($self, $cmds, $end_cb) = @_;
3628	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629	$self->ask_for_bind (1, $end_cb);
3630	}
3631
3632	sub update_binding_widgets {
3633	my ($self) = @_;
3634	my ($mod, $sym, $cmds) = $self->get_binding;
3635	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636	$self->set_command_list ($cmds);
3637	}
3638
3639	sub get_binding {
3640	my ($self) = @_;
3641	return (
3642	$self->{binding}->[0],
3643	$self->{binding}->[1],
3644	[ grep { defined $_ } @{$self->{commands}} ]
3645	);
3646	}
3647
3648	sub clear_command_list {
3649	my ($self) = @_;
3650	$self->{cmdbox}->clear ();
3651	}
3652
3653	sub set_command_list {
3654	my ($self, $cmds) = @_;
3655
3656	$self->{cmdbox}->clear ();
3657	$self->{commands} = $cmds;
3658
3659	my $idx = 0;
3660
3661	for (@$cmds) {
3662	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664	my $i = $idx;
3665	$hb->add (new CFClient::UI::Label text => $_);
3666	$hb->add (new CFClient::UI::Button
3667	text => "delete",
3668	tooltip => "Deletes the action from the record",
3669	on_activate => sub {
3670	$self->{cmdbox}->remove ($hb);
3671	$cmds->[$i] = undef;
3672	});
3673
3674
3675	$idx++
3676	}
3677	}
3678
3679	#############################################################################
3680
3681	package CFClient::UI::SpellList;	3671	package CFPlus::UI::SpellList;
3682		3672
3683	our @ISA = CFClient::UI::Table::;	3673	our @ISA = CFPlus::UI::Table::;
3684		3674
3685	sub new {	3675	sub new {
3686	my $class = shift;	3676	my $class = shift;
3687		3677
3688	my $self = $class->SUPER::new (	3678	my $self = $class->SUPER::new (
…		…
3706	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3696	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707		3697
3708	sub rebuild_spell_list {	3698	sub rebuild_spell_list {
3709	my ($self) = @_;	3699	my ($self) = @_;
3710		3700
3711	$CFClient::UI::ROOT->on_refresh ($self => sub {	3701	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3712	$self->clear;	3702	$self->clear;
3713		3703
3714	return unless $::CONN;	3704	return unless $::CONN;
3715		3705
3716	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3706	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3707	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3708	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3709	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3710	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721		3711
3722	my $row = 0;	3712	my $row = 0;
3723		3713
3724	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3714	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725	my $spell = $self->{spell}{$_};	3715	my $spell = $self->{spell}{$_};
…		…
3732	if ($ev->{button} == 1) {	3722	if ($ev->{button} == 1) {
3733	$::CONN->user_send ("cast $spell->{name}");	3723	$::CONN->user_send ("cast $spell->{name}");
3734	} elsif ($ev->{button} == 2) {	3724	} elsif ($ev->{button} == 2) {
3735	$::CONN->user_send ("invoke $spell->{name}");	3725	$::CONN->user_send ("invoke $spell->{name}");
3736	} elsif ($ev->{button} == 3) {	3726	} elsif ($ev->{button} == 3) {
3737	(new CFClient::UI::Menu	3727	(new CFPlus::UI::Menu
3738	items => [	3728	items => [
3739	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3729	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3730	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741	],	3731	],
3742	)->popup ($ev);	3732	)->popup ($ev);
3743	} else {	3733	} else {
3744	return 0;	3734	return 0;
…		…
3748	};	3738	};
3749		3739
3750	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3740	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751		3741
3752	#TODO: add path info to tooltip	3742	#TODO: add path info to tooltip
3753	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3743	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3754		3744
3755	$self->add (0, $row, new CFClient::UI::Face	3745	$self->add (0, $row, new CFPlus::UI::Face
3756	face => $spell->{face},	3746	face => $spell->{face},
3757	can_hover => 1,	3747	can_hover => 1,
3758	can_events => 1,	3748	can_events => 1,
3759	tooltip => $tooltip,	3749	tooltip => $tooltip,
3760	on_button_down => $spell_cb,	3750	on_button_down => $spell_cb,
3761	);	3751	);
3762		3752
3763	$self->add (1, $row, new CFClient::UI::Label	3753	$self->add (1, $row, new CFPlus::UI::Label
3764	expand => 1,	3754	expand => 1,
3765	text => $spell->{name},	3755	text => $spell->{name},
3766	can_hover => 1,	3756	can_hover => 1,
3767	can_events => 1,	3757	can_events => 1,
3768	tooltip => $tooltip,	3758	tooltip => $tooltip,
3769	on_button_down => $spell_cb,	3759	on_button_down => $spell_cb,
3770	);	3760	);
3771		3761
3772	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3762	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3763	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3764	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3765	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776	}	3766	}
3777	});	3767	});
3778	}	3768	}
3779		3769
3780	sub add_spell {	3770	sub add_spell {
…		…
3798	$self->rebuild_spell_list;	3788	$self->rebuild_spell_list;
3799	}	3789	}
3800		3790
3801	#############################################################################	3791	#############################################################################
3802		3792
3803	package CFClient::UI::Root;	3793	package CFPlus::UI::Root;
3804		3794
3805	our @ISA = CFClient::UI::Container::;	3795	our @ISA = CFPlus::UI::Container::;
3806		3796
3807	use List::Util qw(min max);	3797	use List::Util qw(min max);
3808		3798
3809	use CFClient::OpenGL;	3799	use CFPlus::OpenGL;
3810		3800
3811	sub new {	3801	sub new {
3812	my $class = shift;	3802	my $class = shift;
3813		3803
3814	my $self = $class->SUPER::new (	3804	my $self = $class->SUPER::new (
…		…
3990	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3980	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991		3981
3992	$w = 0 if $w < 0;	3982	$w = 0 if $w < 0;
3993	$h = 0 if $h < 0;	3983	$h = 0 if $h < 0;
3994		3984
		3985	$w = max $widget->{min_w}, $w;
		3986	$h = max $widget->{min_h}, $h;
		3987
		3988	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3989	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3990
		3991	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3992	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3993
3995	$w = int $w + 0.5;	3994	$w = int $w + 0.5;
3996	$h = int $h + 0.5;	3995	$h = int $h + 0.5;
3997		3996
3998	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3997	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999	$widget->{old_w} = $widget->{w};	3998	$widget->{old_w} = $widget->{w};
…		…
4022	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4021	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023	glMatrixMode GL_MODELVIEW;	4022	glMatrixMode GL_MODELVIEW;
4024	glLoadIdentity;	4023	glLoadIdentity;
4025		4024
4026	{	4025	{
4027	package CFClient::UI::Base;	4026	package CFPlus::UI::Base;
4028		4027
4029	($draw_x, $draw_y, $draw_w, $draw_h) =	4028	($draw_x, $draw_y, $draw_w, $draw_h) =
4030	(0, 0, $self->{w}, $self->{h});	4029	(0, 0, $self->{w}, $self->{h});
4031	}	4030	}
4032		4031
4033	$self->_draw;	4032	$self->_draw;
4034	}	4033	}
4035		4034
4036	#############################################################################	4035	#############################################################################
4037		4036
4038	package CFClient::UI;	4037	package CFPlus::UI;
4039		4038
4040	$ROOT = new CFClient::UI::Root;	4039	$ROOT = new CFPlus::UI::Root;
4041	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4040	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042		4041
4043	1	4042	1
4044		4043

Diff Legend

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