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.307 by root, Sun Jun 18 19:13:20 2006 UTC vs.
Revision 1.343 by root, Sun Aug 13 15:14:17 2006 UTC

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

Diff Legend

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