ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.346 by root, Mon Aug 14 01:21:02 2006 UTC

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

Diff Legend

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