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.310 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.350 by root, Sat Aug 19 18:39:24 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 => 0,
		1144	text => $arg{label},
		1145	fontsize => ($arg{border} || 0.8) * 0.75;
		1146	}
		1147
		1148	my $self = $class->SUPER::new (
		1149	# label => "",
		1150	fg => [0.6, 0.3, 0.1],
		1151	border => 0.8,
		1152	style => 'single',
		1153	%arg,
		1154	);
		1155
		1156	$self
		1157	}
		1158
		1159	sub add {
		1160	my ($self, @widgets) = @_;
		1161
		1162	$self->SUPER::add (@widgets);
		1163	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1164	}
		1165
		1166	sub border {
		1167	int $_[0]{border} * $::FONTSIZE
		1168	}
		1169
		1170	sub size_request {
		1171	my ($self) = @_;
		1172
		1173	($self->{label_w}, undef) = $self->{label}->size_request
		1174	if $self->{label};
		1175
		1176	my ($w, $h) = $self->SUPER::size_request;
		1177
		1178	(
		1179	$w + $self->border * 2,
		1180	$h + $self->border * 2,
		1181	)
		1182	}
		1183
		1184	sub invoke_size_allocate {
		1185	my ($self, $w, $h) = @_;
		1186
		1187	my $border = $self->border;
		1188
		1189	$w -= List::Util::max 0, $border * 2;
		1190	$h -= List::Util::max 0, $border * 2;
		1191
		1192	if (my $label = $self->{label}) {
		1193	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1194	$label->{h} = List::Util::min $h, $border;
		1195	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1196	}
		1197
		1198	$self->child->configure ($border, $border, $w, $h);
		1199
		1200	1
		1201	}
		1202
		1203	sub _draw {
		1204	my ($self) = @_;
		1205
		1206	my $child = $self->{children}[0];
		1207
		1208	my $border = $self->border;
		1209	my ($w, $h) = ($self->{w}, $self->{h});
		1210
		1211	$child->draw;
		1212
		1213	glColor @{$self->{fg}};
		1214	glBegin GL_LINE_STRIP;
		1215	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1216	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1217	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1218	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1219	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1220	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1221	glEnd;
		1222
		1223	if ($self->{label}) {
		1224	glTranslate $border * 2, 0;
		1225	$self->{label}->_draw;
		1226	}
		1227	}
		1228
		1229	#############################################################################
		1230
		1231	package CFPlus::UI::Toplevel;
		1232
		1233	our @ISA = CFPlus::UI::Bin::;
		1234
		1235	use CFPlus::OpenGL;
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	path => '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}
…		…
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));
…		…
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;
		1971	} elsif ($uni == 21) { # ctrl-u
		1972	$text = "";
		1973	$self->{cursor} = 0;
1793	} elsif ($uni == 27) {	1974	} elsif ($uni == 27) {
1794	$self->emit ('escape');	1975	$self->emit ('escape');
1795	} elsif ($uni) {	1976	} elsif ($uni) {
1796	substr $text, $self->{cursor}++, 0, chr $uni;	1977	substr $text, $self->{cursor}++, 0, chr $uni;
1797	} else {	1978	} else {
…		…
1820		2001
1821	my $idx = $self->{layout}->xy_to_index ($x, $y);	2002	my $idx = $self->{layout}->xy_to_index ($x, $y);
1822		2003
1823	# byte-index to char-index	2004	# byte-index to char-index
1824	my $text = $self->{text};	2005	my $text = $self->{text};
1825	utf8::encode $text;	2006	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826	$self->{cursor} = length substr $text, 0, $idx;	2007	$self->{cursor} = length $text;
1827		2008
1828	$self->_set_text ($self->{text});	2009	$self->_set_text ($self->{text});
1829	$self->update;	2010	$self->update;
1830		2011
1831	1	2012	1
…		…
1870	utf8::encode $text;	2051	utf8::encode $text;
1871		2052
1872	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2053	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873	}	2054	}
1874		2055
1875	glColor @{$self->{fg}};
1876	glBegin GL_LINES;	2056	glBegin GL_LINES;
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2057	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1878	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2058	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879	glEnd;	2059	glEnd;
1880	}	2060	}
1881	}	2061	}
1882		2062
1883	package CFClient::UI::Entry;	2063	package CFPlus::UI::Entry;
1884		2064
1885	our @ISA = CFClient::UI::EntryBase::;	2065	our @ISA = CFPlus::UI::EntryBase::;
1886		2066
1887	use CFClient::OpenGL;	2067	use CFPlus::OpenGL;
1888		2068
1889	sub invoke_key_down {	2069	sub invoke_key_down {
1890	my ($self, $ev) = @_;	2070	my ($self, $ev) = @_;
1891		2071
1892	my $sym = $ev->{sym};	2072	my $sym = $ev->{sym};
…		…
1898	$self->{history_pointer} = -1;	2078	$self->{history_pointer} = -1;
1899	$self->{history_saveback} = '';	2079	$self->{history_saveback} = '';
1900	$self->emit (activate => $txt);	2080	$self->emit (activate => $txt);
1901	$self->update;	2081	$self->update;
1902		2082
1903	} elsif ($sym == CFClient::SDLK_UP) {	2083	} elsif ($sym == CFPlus::SDLK_UP) {
1904	if ($self->{history_pointer} < 0) {	2084	if ($self->{history_pointer} < 0) {
1905	$self->{history_saveback} = $self->get_text;	2085	$self->{history_saveback} = $self->get_text;
1906	}	2086	}
1907	if (@{$self->{history} || []} > 0) {	2087	if (@{$self->{history} || []} > 0) {
1908	$self->{history_pointer}++;	2088	$self->{history_pointer}++;
…		…
1910	$self->{history_pointer} = @{$self->{history} || []} - 1;	2090	$self->{history_pointer} = @{$self->{history} || []} - 1;
1911	}	2091	}
1912	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2092	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1913	}	2093	}
1914		2094
1915	} elsif ($sym == CFClient::SDLK_DOWN) {	2095	} elsif ($sym == CFPlus::SDLK_DOWN) {
1916	$self->{history_pointer}--;	2096	$self->{history_pointer}--;
1917	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2097	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918		2098
1919	if ($self->{history_pointer} >= 0) {	2099	if ($self->{history_pointer} >= 0) {
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2100	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1929	1	2109	1
1930	}	2110	}
1931		2111
1932	#############################################################################	2112	#############################################################################
1933		2113
1934	package CFClient::UI::Button;	2114	package CFPlus::UI::Button;
1935		2115
1936	our @ISA = CFClient::UI::Label::;	2116	our @ISA = CFPlus::UI::Label::;
1937		2117
1938	use CFClient::OpenGL;	2118	use CFPlus::OpenGL;
1939		2119
1940	my @tex =	2120	my @tex =
1941	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2121	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942	qw(b1_button_active.png);	2122	qw(b1_button_active.png);
1943		2123
1944	sub new {	2124	sub new {
1945	my $class = shift;	2125	my $class = shift;
1946		2126
…		…
1983	$self->SUPER::_draw;	2163	$self->SUPER::_draw;
1984	}	2164	}
1985		2165
1986	#############################################################################	2166	#############################################################################
1987		2167
		2168	package CFPlus::UI::CheckBox;
		2169
		2170	our @ISA = CFPlus::UI::DrawBG::;
		2171
		2172	my @tex =
		2173	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2174	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2175
		2176	use CFPlus::OpenGL;
		2177
		2178	sub new {
		2179	my $class = shift;
		2180
		2181	$class->SUPER::new (
		2182	padding_x => 2,
		2183	padding_y => 2,
		2184	fg => [1, 1, 1],
		2185	active_fg => [1, 1, 0],
		2186	bg => [0, 0, 0, 0.2],
		2187	active_bg => [1, 1, 1, 0.5],
		2188	state => 0,
		2189	can_hover => 1,
		2190	@_
		2191	)
		2192	}
		2193
		2194	sub size_request {
		2195	my ($self) = @_;
		2196
		2197	(6) x 2
		2198	}
		2199
		2200	sub toggle {
		2201	my ($self) = @_;
		2202
		2203	$self->{state} = !$self->{state};
		2204	$self->emit (changed => $self->{state});
		2205	$self->update;
		2206	}
		2207
		2208	sub invoke_button_down {
		2209	my ($self, $ev, $x, $y) = @_;
		2210
		2211	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2212	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2213	$self->toggle;
		2214	} else {
		2215	return 0
		2216	}
		2217
		2218	1
		2219	}
		2220
		2221	sub _draw {
		2222	my ($self) = @_;
		2223
		2224	$self->SUPER::_draw;
		2225
		2226	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2227
		2228	my ($w, $h) = @$self{qw(w h)};
		2229
		2230	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2231
		2232	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2233
		2234	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2235
		2236	glEnable GL_TEXTURE_2D;
		2237	$tex->draw_quad_alpha (0, 0, $s, $s);
		2238	glDisable GL_TEXTURE_2D;
		2239	}
		2240
		2241	#############################################################################
		2242
		2243	package CFPlus::UI::Image;
		2244
		2245	our @ISA = CFPlus::UI::Base::;
		2246
		2247	use CFPlus::OpenGL;
		2248
		2249	our %texture_cache;
		2250
		2251	sub new {
		2252	my $class = shift;
		2253
		2254	my $self = $class->SUPER::new (
		2255	can_events => 0,
		2256	@_,
		2257	);
		2258
		2259	$self->{path} || $self->{tex}
		2260	or Carp::croak "'path' or 'tex' attributes required";
		2261
		2262	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2263	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2264
		2265	Scalar::Util::weaken $texture_cache{$self->{path}};
		2266
		2267	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2268
		2269	$self
		2270	}
		2271
		2272	sub STORABLE_freeze {
		2273	my ($self, $cloning) = @_;
		2274
		2275	$self->{path}
		2276	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2277
		2278	$self->{path}
		2279	}
		2280
		2281	sub STORABLE_attach {
		2282	my ($self, $cloning, $path) = @_;
		2283
		2284	$self->new (path => $path)
		2285	}
		2286
		2287	sub size_request {
		2288	my ($self) = @_;
		2289
		2290	($self->{tex}{w}, $self->{tex}{h})
		2291	}
		2292
		2293	sub _draw {
		2294	my ($self) = @_;
		2295
		2296	my $tex = $self->{tex};
		2297
		2298	my ($w, $h) = ($self->{w}, $self->{h});
		2299
		2300	if ($self->{rot90}) {
		2301	glRotate 90, 0, 0, 1;
		2302	glTranslate 0, -$self->{w}, 0;
		2303
		2304	($w, $h) = ($h, $w);
		2305	}
		2306
		2307	glEnable GL_TEXTURE_2D;
		2308	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2309
		2310	$tex->draw_quad (0, 0, $w, $h);
		2311
		2312	glDisable GL_TEXTURE_2D;
		2313	}
		2314
		2315	#############################################################################
		2316
1988	package CFClient::UI::ImageButton;	2317	package CFPlus::UI::ImageButton;
1989		2318
1990	our @ISA = CFClient::UI::Image::;	2319	our @ISA = CFPlus::UI::Image::;
1991		2320
1992	use CFClient::OpenGL;	2321	use CFPlus::OpenGL;
1993		2322
1994	my %textures;	2323	my %textures;
1995		2324
1996	sub new {	2325	sub new {
1997	my $class = shift;	2326	my $class = shift;
…		…
2019	1	2348	1
2020	}	2349	}
2021		2350
2022	#############################################################################	2351	#############################################################################
2023		2352
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;	2353	package CFPlus::UI::VGauge;
2093		2354
2094	our @ISA = CFClient::UI::Base::;	2355	our @ISA = CFPlus::UI::Base::;
2095
2096	use CFClient::OpenGL;
2097
2098	our %texture_cache;
2099
2100	sub new {
2101	my $class = shift;
2102
2103	my $self = $class->SUPER::new (
2104	can_events => 0,
2105	@_,
2106	);
2107
2108	$self->{path}
2109	or Carp::croak "required attribute 'path' not set";
2110
2111	$self->{tex} = $texture_cache{$self->{path}} ||=
2112	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113
2114	Scalar::Util::weaken $texture_cache{$self->{path}};
2115
2116	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118	$self
2119	}
2120
2121	sub size_request {
2122	my ($self) = @_;
2123
2124	($self->{tex}{w}, $self->{tex}{h})
2125	}
2126
2127	sub _draw {
2128	my ($self) = @_;
2129
2130	my $tex = $self->{tex};
2131
2132	my ($w, $h) = ($self->{w}, $self->{h});
2133
2134	if ($self->{rot90}) {
2135	glRotate 90, 0, 0, 1;
2136	glTranslate 0, -$self->{w}, 0;
2137
2138	($w, $h) = ($h, $w);
2139	}
2140
2141	glEnable GL_TEXTURE_2D;
2142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2143
2144	$tex->draw_quad_alpha (0, 0, $w, $h);
2145
2146	glDisable GL_TEXTURE_2D;
2147	}
2148
2149	#############################################################################
2150
2151	package CFClient::UI::VGauge;
2152
2153	our @ISA = CFClient::UI::Base::;
2154		2356
2155	use List::Util qw(min max);	2357	use List::Util qw(min max);
2156		2358
2157	use CFClient::OpenGL;	2359	use CFPlus::OpenGL;
2158		2360
2159	my %tex = (	2361	my %tex = (
2160	food => [	2362	food => [
2161	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2363	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2162	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2364	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2163	],	2365	],
2164	grace => [	2366	grace => [
2165	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2367	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2166	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2368	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2167	],	2369	],
2168	hp => [	2370	hp => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2371	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2372	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2171	],	2373	],
2172	mana => [	2374	mana => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2375	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2376	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2175	],	2377	],
2176	);	2378	);
2177		2379
2178	# eg. VGauge->new (gauge => 'food'), default gauge: food	2380	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2238	my $ycut1 = max 0, min 1, $ycut;	2440	my $ycut1 = max 0, min 1, $ycut;
2239	my $ycut2 = max 0, min 1, $ycut - 1;	2441	my $ycut2 = max 0, min 1, $ycut - 1;
2240		2442
2241	my $h1 = $self->{h} * (1 - $ycut1);	2443	my $h1 = $self->{h} * (1 - $ycut1);
2242	my $h2 = $self->{h} * (1 - $ycut2);	2444	my $h2 = $self->{h} * (1 - $ycut2);
		2445	my $h3 = $self->{h};
		2446
		2447	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2243		2448
2244	glEnable GL_BLEND;	2449	glEnable GL_BLEND;
2245	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2450	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2451	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247	glEnable GL_TEXTURE_2D;	2452	glEnable GL_TEXTURE_2D;
…		…
2266		2471
2267	if ($t3) {	2472	if ($t3) {
2268	glBindTexture GL_TEXTURE_2D, $t3->{name};	2473	glBindTexture GL_TEXTURE_2D, $t3->{name};
2269	glBegin GL_QUADS;	2474	glBegin GL_QUADS;
2270	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2475	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2476	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2477	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2478	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274	glEnd;	2479	glEnd;
2275	}	2480	}
2276		2481
2277	glDisable GL_BLEND;	2482	glDisable GL_BLEND;
2278	glDisable GL_TEXTURE_2D;	2483	glDisable GL_TEXTURE_2D;
2279	}	2484	}
2280		2485
2281	#############################################################################	2486	#############################################################################
2282		2487
2283	package CFClient::UI::Gauge;	2488	package CFPlus::UI::Gauge;
2284		2489
2285	our @ISA = CFClient::UI::VBox::;	2490	our @ISA = CFPlus::UI::VBox::;
2286		2491
2287	sub new {	2492	sub new {
2288	my ($class, %arg) = @_;	2493	my ($class, %arg) = @_;
2289		2494
2290	my $self = $class->SUPER::new (	2495	my $self = $class->SUPER::new (
…		…
2292	can_hover => 1,	2497	can_hover => 1,
2293	can_events => 1,	2498	can_events => 1,
2294	%arg,	2499	%arg,
2295	);	2500	);
2296		2501
2297	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2502	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2298	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2503	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2299	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2504	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2300		2505
2301	$self	2506	$self
2302	}	2507	}
2303		2508
2304	sub set_fontsize {	2509	sub set_fontsize {
…		…
2325	$self->{value}->set_text ($val);	2530	$self->{value}->set_text ($val);
2326	}	2531	}
2327		2532
2328	#############################################################################	2533	#############################################################################
2329		2534
2330	package CFClient::UI::Slider;	2535	package CFPlus::UI::Slider;
2331		2536
2332	use strict;	2537	use strict;
2333		2538
2334	use CFClient::OpenGL;	2539	use CFPlus::OpenGL;
2335		2540
2336	our @ISA = CFClient::UI::DrawBG::;	2541	our @ISA = CFPlus::UI::DrawBG::;
2337		2542
2338	my @tex =	2543	my @tex =
2339	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2544	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2340	qw(s1_slider.png s1_slider_bg.png);	2545	qw(s1_slider.png s1_slider_bg.png);
2341		2546
2342	sub new {	2547	sub new {
2343	my $class = shift;	2548	my $class = shift;
2344		2549
…		…
2433	}	2638	}
2434		2639
2435	1	2640	1
2436	}	2641	}
2437		2642
		2643	sub invoke_mouse_wheel {
		2644	my ($self, $ev) = @_;
		2645
		2646	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2647
		2648	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2649
		2650	! ! $delta
		2651	}
		2652
2438	sub update {	2653	sub update {
2439	my ($self) = @_;	2654	my ($self) = @_;
2440		2655
2441	delete $self->{knob_w};	2656	delete $self->{knob_w};
2442	$self->SUPER::update;	2657	$self->SUPER::update;
…		…
2489	glDisable GL_TEXTURE_2D;	2704	glDisable GL_TEXTURE_2D;
2490	}	2705	}
2491		2706
2492	#############################################################################	2707	#############################################################################
2493		2708
2494	package CFClient::UI::ValSlider;	2709	package CFPlus::UI::ValSlider;
2495		2710
2496	our @ISA = CFClient::UI::HBox::;	2711	our @ISA = CFPlus::UI::HBox::;
2497		2712
2498	sub new {	2713	sub new {
2499	my ($class, %arg) = @_;	2714	my ($class, %arg) = @_;
2500		2715
2501	my $range = delete $arg{range};	2716	my $range = delete $arg{range};
2502		2717
2503	my $self = $class->SUPER::new (	2718	my $self = $class->SUPER::new (
2504	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2719	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2505	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2720	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2506	to_value => sub { shift },	2721	to_value => sub { shift },
2507	from_value => sub { shift },	2722	from_value => sub { shift },
2508	%arg,	2723	%arg,
2509	);	2724	);
2510		2725
…		…
2530	sub set_range { shift->{slider}->set_range (@_) }	2745	sub set_range { shift->{slider}->set_range (@_) }
2531	sub set_value { shift->{slider}->set_value (@_) }	2746	sub set_value { shift->{slider}->set_value (@_) }
2532		2747
2533	#############################################################################	2748	#############################################################################
2534		2749
2535	package CFClient::UI::TextScroller;	2750	package CFPlus::UI::TextScroller;
2536		2751
2537	our @ISA = CFClient::UI::HBox::;	2752	our @ISA = CFPlus::UI::HBox::;
2538		2753
2539	use CFClient::OpenGL;	2754	use CFPlus::OpenGL;
2540		2755
2541	sub new {	2756	sub new {
2542	my $class = shift;	2757	my $class = shift;
2543		2758
2544	my $self = $class->SUPER::new (	2759	my $self = $class->SUPER::new (
2545	fontsize => 1,	2760	fontsize => 1,
2546	can_events => 0,	2761	can_events => 1,
2547	indent => 0,	2762	indent => 0,
2548	#font => default_font	2763	#font => default_font
2549	@_,	2764	@_,
2550		2765
2551	layout => (new CFClient::Layout 1),	2766	layout => (new CFPlus::Layout),
2552	par => [],	2767	par => [],
2553	height => 0,	2768	height => 0,
2554	children => [	2769	children => [
2555	(new CFClient::UI::Empty expand => 1),	2770	(new CFPlus::UI::Empty expand => 1),
2556	(new CFClient::UI::Slider vertical => 1),	2771	(new CFPlus::UI::Slider vertical => 1),
2557	],	2772	],
2558	);	2773	);
2559		2774
2560	$self->{children}[1]->connect (changed => sub { $self->update });	2775	$self->{children}[1]->connect (changed => sub { $self->update });
2561		2776
…		…
2567		2782
2568	$self->{fontsize} = $fontsize;	2783	$self->{fontsize} = $fontsize;
2569	$self->reflow;	2784	$self->reflow;
2570	}	2785	}
2571		2786
2572	sub visible_children {	2787	sub size_request {
2573	my ($self) = @_;	2788	my ($self) = @_;
2574		2789
2575	@{$self->{children}}[0,1]	2790	my ($empty, $slider) = @{ $self->{children} };
		2791
		2792	local $self->{children} = [$empty, $slider];
		2793	$self->SUPER::size_request
2576	}	2794	}
2577		2795
2578	sub invoke_size_allocate {	2796	sub invoke_size_allocate {
2579	my ($self, $w, $h) = @_;	2797	my ($self, $w, $h) = @_;
2580		2798
2581	my (undef, undef, @other) = @{ $self->{children} };	2799	my ($empty, $slider, @other) = @{ $self->{children} };
2582	$_->configure (@$_{qw(x y req_w req_h)}) for @other;	2800	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583		2801
2584	$self->{layout}->set_font ($self->{font}) if $self->{font};	2802	$self->{layout}->set_font ($self->{font}) if $self->{font};
2585	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2803	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586	$self->{layout}->set_width ($self->{children}[0]{w});	2804	$self->{layout}->set_width ($empty->{w});
2587	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2805	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588		2806
2589	$self->reflow;	2807	$self->reflow;
2590		2808
		2809	local $self->{children} = [$empty, $slider];
2591	$self->SUPER::invoke_size_allocate ($w, $h)	2810	$self->SUPER::invoke_size_allocate ($w, $h)
		2811	}
		2812
		2813	sub invoke_mouse_wheel {
		2814	my ($self, $ev) = @_;
		2815
		2816	return 0 unless $ev->{dy}; # only vertical movements
		2817
		2818	$self->{children}[1]->emit (mouse_wheel => $ev);
		2819
		2820	1
2592	}	2821	}
2593		2822
2594	sub get_layout {	2823	sub get_layout {
2595	my ($self, $para) = @_;	2824	my ($self, $para) = @_;
2596		2825
2597	my $layout = $self->{layout};	2826	my $layout = $self->{layout};
2598		2827
2599	$layout->set_font ($self->{font}) if $self->{font};	2828	$layout->set_font ($self->{font}) if $self->{font};
		2829	$layout->set_foreground (@{$para->{fg}});
2600	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2830	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601	$layout->set_width ($self->{children}[0]{w} - $para->{indent});	2831	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2832	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603	$layout->set_markup ($para->{markup});	2833	$layout->set_markup ($para->{markup});
2604	$layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});	2834
		2835	$layout->set_shapes (
		2836	map
		2837	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2838	@{$para->{widget}}
		2839	);
2605		2840
2606	$layout	2841	$layout
2607	}	2842	}
2608		2843
2609	sub reflow {	2844	sub reflow {
…		…
2616	sub set_offset {	2851	sub set_offset {
2617	my ($self, $offset) = @_;	2852	my ($self, $offset) = @_;
2618		2853
2619	# todo: base offset on lines or so, not on pixels	2854	# todo: base offset on lines or so, not on pixels
2620	$self->{children}[1]->set_value ($offset);	2855	$self->{children}[1]->set_value ($offset);
		2856	}
		2857
		2858	sub current_paragraph {
		2859	my ($self) = @_;
		2860
		2861	$self->{top_paragraph} - 1
		2862	}
		2863
		2864	sub scroll_to {
		2865	my ($self, $para) = @_;
		2866
		2867	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2868
		2869	$self->{scroll_to} = $para;
		2870	$self->update;
2621	}	2871	}
2622		2872
2623	sub clear {	2873	sub clear {
2624	my ($self) = @_;	2874	my ($self) = @_;
2625		2875
…		…
2630	$self->{height} = 0;	2880	$self->{height} = 0;
2631	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2881	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2632	}	2882	}
2633		2883
2634	sub add_paragraph {	2884	sub add_paragraph {
2635	my ($self, $color, $para, $indent) = @_;	2885	my $self = shift;
2636		2886
2637	my ($text, @w) = ref $para ? @$para : $para;	2887	for my $para (@_) {
2638
2639	$para = {	2888	$para = {
		2889	fg => [1, 1, 1, 1],
		2890	indent => 0,
		2891	markup => "",
		2892	widget => [],
		2893	ref $para ? %$para : (markup => $para),
2640	w => 1e10,	2894	w => 1e10,
2641	wrapped => 1,	2895	wrapped => 1,
2642	fg => $color,
2643	indent => $indent,
2644	markup => $text,
2645	widget => \@w,
2646	};	2896	};
2647		2897
2648	$self->add (@w) if @w;	2898	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2649	push @{$self->{par}}, $para;	2899	push @{$self->{par}}, $para;
		2900	}
2650		2901
2651	$self->{need_reflow}++;	2902	$self->{need_reflow}++;
2652	$self->update;	2903	$self->update;
2653	}	2904	}
2654		2905
2655	sub scroll_to_bottom {	2906	sub scroll_to_bottom {
2656	my ($self) = @_;	2907	my ($self) = @_;
2657		2908
2658	$self->{scroll_to_bottom} = 1;	2909	$self->{scroll_to} = $#{$self->{par}};
2659	$self->update;	2910	$self->update;
2660	}	2911	}
2661		2912
		2913	sub force_uptodate {
		2914	my ($self) = @_;
		2915
		2916	if (delete $self->{need_reflow}) {
		2917	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2918
		2919	my $height = 0;
		2920
		2921	for my $para (@{$self->{par}}) {
		2922	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2923	my $layout = $self->get_layout ($para);
		2924	my ($w, $h) = $layout->size;
		2925
		2926	$para->{w} = $w + $para->{indent};
		2927	$para->{h} = $h;
		2928	$para->{wrapped} = $layout->has_wrapped;
		2929	}
		2930
		2931	$para->{y} = $height;
		2932	$height += $para->{h};
		2933	}
		2934
		2935	$self->{height} = $height;
		2936	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2937
		2938	delete $self->{texture};
		2939	}
		2940
		2941	if (my $paridx = delete $self->{scroll_to}) {
		2942	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2943	}
		2944	}
		2945
2662	sub update {	2946	sub update {
2663	my ($self) = @_;	2947	my ($self) = @_;
2664		2948
2665	$self->SUPER::update;	2949	$self->SUPER::update;
2666		2950
2667	return unless $self->{h} > 0;	2951	return unless $self->{h} > 0;
2668		2952
2669	delete $self->{texture};	2953	delete $self->{texture};
2670		2954
2671	$ROOT->on_post_alloc ($self => sub {	2955	$ROOT->on_post_alloc ($self => sub {
		2956	$self->force_uptodate;
		2957
2672	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2958	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2673		2959
2674	if (delete $self->{need_reflow}) {
2675	my $height = 0;
2676
2677	for my $para (@{$self->{par}}) {
2678	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2679	my $layout = $self->get_layout ($para);
2680	my ($w, $h) = $layout->size;
2681
2682	$para->{w} = $w + $para->{indent};
2683	$para->{h} = $h;
2684	$para->{wrapped} = $layout->has_wrapped;
2685	}
2686
2687	$height += $para->{h};
2688	}
2689
2690	$self->{height} = $height;
2691
2692	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2693
2694	delete $self->{texture};
2695	}
2696
2697	if (delete $self->{scroll_to_bottom}) {
2698	$self->{children}[1]->set_value (1e10);
2699	}
2700
2701	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2960	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2702	glClearColor 0, 0, 0, 0;	2961	glClearColor 0, 0, 0, 0;
2703	glClear GL_COLOR_BUFFER_BIT;	2962	glClear GL_COLOR_BUFFER_BIT;
2704		2963
2705	my $top = int $self->{children}[1]{range}[0];	2964	my $top = int $self->{children}[1]{range}[0];
2706		2965
		2966	my $paridx = 0;
		2967	my $top_paragraph;
		2968	my $top = int $self->{children}[1]{range}[0];
		2969
2707	my $y0 = $top;	2970	my $y0 = $top;
2708	my $y1 = $top + $H;	2971	my $y1 = $top + $H;
2709		2972
2710	my $y = 0;
2711
2712	glEnable GL_BLEND;
2713	#TODO# not correct in windows where rgba is forced off
2714	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2715
2716	for my $para (@{$self->{par}}) {	2973	for my $para (@{$self->{par}}) {
2717	my $h = $para->{h};	2974	my $h = $para->{h};
		2975	my $y = $para->{y};
2718		2976
2719	if ($y0 < $y + $h && $y < $y1) {	2977	if ($y0 < $y + $h && $y < $y1) {
2720
2721	my $layout = $self->get_layout ($para);	2978	my $layout = $self->get_layout ($para);
2722		2979
2723	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725	glRasterPos $para->{indent}, $y - $y0;	2980	$layout->render ($para->{indent}, $y - $y0);
2726	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727		2981
2728	if (my @w = @{ $para->{widget} }) {	2982	if (my @w = @{ $para->{widget} }) {
2729	my @s = $layout->get_shapes;	2983	my @s = $layout->get_shapes;
2730		2984
2731	for (@w) {	2985	for (@w) {
…		…
2737	$_->draw;	2991	$_->draw;
2738	}	2992	}
2739	}	2993	}
2740	}	2994	}
2741		2995
2742	$y += $h;	2996	$paridx++;
		2997	$top_paragraph ||= $paridx if $y >= $top;
2743	}	2998	}
2744		2999
2745	glDisable GL_BLEND;	3000	$self->{top_paragraph} = $top_paragraph;
2746	};	3001	};
2747	});	3002	});
2748	}	3003	}
2749		3004
2750	sub reconfigure {	3005	sub reconfigure {
…		…
2768	$self->{children}[1]->draw;	3023	$self->{children}[1]->draw;
2769	}	3024	}
2770		3025
2771	#############################################################################	3026	#############################################################################
2772		3027
2773	package CFClient::UI::Animator;	3028	package CFPlus::UI::Animator;
2774		3029
2775	use CFClient::OpenGL;	3030	use CFPlus::OpenGL;
2776		3031
2777	our @ISA = CFClient::UI::Bin::;	3032	our @ISA = CFPlus::UI::Bin::;
2778		3033
2779	sub moveto {	3034	sub moveto {
2780	my ($self, $x, $y) = @_;	3035	my ($self, $x, $y) = @_;
2781		3036
2782	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3037	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2810	glPopMatrix;	3065	glPopMatrix;
2811	}	3066	}
2812		3067
2813	#############################################################################	3068	#############################################################################
2814		3069
2815	package CFClient::UI::Flopper;	3070	package CFPlus::UI::Flopper;
2816		3071
2817	our @ISA = CFClient::UI::Button::;	3072	our @ISA = CFPlus::UI::Button::;
2818		3073
2819	sub new {	3074	sub new {
2820	my $class = shift;	3075	my $class = shift;
2821		3076
2822	my $self = $class->SUPER::new (	3077	my $self = $class->SUPER::new (
…		…
2834	$self->{other}->toggle_visibility;	3089	$self->{other}->toggle_visibility;
2835	}	3090	}
2836		3091
2837	#############################################################################	3092	#############################################################################
2838		3093
2839	package CFClient::UI::Tooltip;	3094	package CFPlus::UI::Tooltip;
2840		3095
2841	our @ISA = CFClient::UI::Bin::;	3096	our @ISA = CFPlus::UI::Bin::;
2842		3097
2843	use CFClient::OpenGL;	3098	use CFPlus::OpenGL;
2844		3099
2845	sub new {	3100	sub new {
2846	my $class = shift;	3101	my $class = shift;
2847		3102
2848	$class->SUPER::new (	3103	$class->SUPER::new (
…		…
2851	)	3106	)
2852	}	3107	}
2853		3108
2854	sub set_tooltip_from {	3109	sub set_tooltip_from {
2855	my ($self, $widget) = @_;	3110	my ($self, $widget) = @_;
		3111
		3112	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3113	if $widget->{tooltip} =~ /^#(.*)$/;
2856		3114
2857	my $tooltip = $widget->{tooltip};	3115	my $tooltip = $widget->{tooltip};
2858		3116
2859	if ($ENV{CFPLUS_DEBUG} & 2) {	3117	if ($ENV{CFPLUS_DEBUG} & 2) {
2860	$tooltip .= "\n\n" . (ref $widget) . "\n"	3118	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2864	}	3122	}
2865		3123
2866	$tooltip =~ s/^\n+//;	3124	$tooltip =~ s/^\n+//;
2867	$tooltip =~ s/\n+$//;	3125	$tooltip =~ s/\n+$//;
2868		3126
2869	$self->add (new CFClient::UI::Label	3127	$self->add (new CFPlus::UI::Label
2870	markup => $tooltip,	3128	markup => $tooltip,
2871	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3129	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2872	fontsize => 0.8,	3130	fontsize => 0.8,
2873	fg => [0, 0, 0, 1],	3131	style => 1, # FLAG_INVERSE
2874	ellipsise => 0,	3132	ellipsise => 0,
2875	font => ($widget->{tooltip_font} || $::FONT_PROP),	3133	font => ($widget->{tooltip_font} || $::FONT_PROP),
2876	);	3134	);
2877	}	3135	}
2878		3136
…		…
2897		3155
2898	$self->{root}->on_post_alloc ("move_$self" => sub {	3156	$self->{root}->on_post_alloc ("move_$self" => sub {
2899	my $widget = $self->{owner}	3157	my $widget = $self->{owner}
2900	or return;	3158	or return;
2901		3159
		3160	if ($widget->{visible}) {
2902	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3161	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2903		3162
2904	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3163	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2905	if $x + $self->{w} > $self->{root}{w};	3164	if $x + $self->{w} > $self->{root}{w};
2906		3165
2907	$self->move_abs ($x, $y);	3166	$self->move_abs ($x, $y);
		3167	} else {
		3168	$self->hide;
		3169	}
2908	});	3170	});
2909	}	3171	}
2910		3172
2911	sub _draw {	3173	sub _draw {
2912	my ($self) = @_;	3174	my ($self) = @_;
…		…
2936	$self->SUPER::_draw;	3198	$self->SUPER::_draw;
2937	}	3199	}
2938		3200
2939	#############################################################################	3201	#############################################################################
2940		3202
2941	package CFClient::UI::Face;	3203	package CFPlus::UI::Face;
2942		3204
2943	our @ISA = CFClient::UI::Base::;	3205	our @ISA = CFPlus::UI::DrawBG::;
2944		3206
2945	use CFClient::OpenGL;	3207	use CFPlus::OpenGL;
2946		3208
2947	sub new {	3209	sub new {
2948	my $class = shift;	3210	my $class = shift;
2949		3211
2950	my $self = $class->SUPER::new (	3212	my $self = $class->SUPER::new (
…		…
2985	sub _draw {	3247	sub _draw {
2986	my ($self) = @_;	3248	my ($self) = @_;
2987		3249
2988	return unless $::CONN;	3250	return unless $::CONN;
2989		3251
		3252	$self->SUPER::_draw;
		3253
2990	my $face;	3254	my $face;
2991		3255
2992	if ($self->{frame}) {	3256	if ($self->{frame}) {
2993	my $anim = $::CONN->{anim}[$self->{anim}];	3257	my $anim = $::CONN->{anim}[$self->{anim}];
2994		3258
…		…
3016	$self->SUPER::destroy;	3280	$self->SUPER::destroy;
3017	}	3281	}
3018		3282
3019	#############################################################################	3283	#############################################################################
3020		3284
3021	package CFClient::UI::Buttonbar;	3285	package CFPlus::UI::Buttonbar;
3022		3286
3023	our @ISA = CFClient::UI::HBox::;	3287	our @ISA = CFPlus::UI::HBox::;
3024		3288
3025	# TODO: should actualyl wrap buttons and other goodies.	3289	# TODO: should actualyl wrap buttons and other goodies.
3026		3290
3027	#############################################################################	3291	#############################################################################
3028		3292
3029	package CFClient::UI::Menu;	3293	package CFPlus::UI::Menu;
3030		3294
3031	our @ISA = CFClient::UI::FancyFrame::;	3295	our @ISA = CFPlus::UI::Toplevel::;
3032		3296
3033	use CFClient::OpenGL;	3297	use CFPlus::OpenGL;
3034		3298
3035	sub new {	3299	sub new {
3036	my $class = shift;	3300	my $class = shift;
3037		3301
3038	my $self = $class->SUPER::new (	3302	my $self = $class->SUPER::new (
3039	items => [],	3303	items => [],
3040	z => 100,	3304	z => 100,
3041	@_,	3305	@_,
3042	);	3306	);
3043		3307
3044	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3308	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3045		3309
3046	for my $item (@{ $self->{items} }) {	3310	for my $item (@{ $self->{items} }) {
3047	my ($widget, $cb, $tooltip) = @$item;	3311	my ($widget, $cb, $tooltip) = @$item;
3048		3312
3049	# handle various types of items, only text for now	3313	# handle various types of items, only text for now
3050	if (!ref $widget) {	3314	if (!ref $widget) {
		3315	if ($widget =~ /\t/) {
		3316	my ($left, $right) = split /\t/, $widget, 2;
		3317
3051	$widget = new CFClient::UI::Label	3318	$widget = new CFPlus::UI::HBox
3052	can_hover => 1,	3319	can_hover => 1,
3053	can_events => 1,	3320	can_events => 1,
		3321	tooltip => $tooltip,
		3322	children => [
		3323	(new CFPlus::UI::Label markup => $left, expand => 1),
		3324	(new CFPlus::UI::Label markup => $right, align => +1),
		3325	],
		3326	;
		3327
		3328	} else {
		3329	$widget = new CFPlus::UI::Label
		3330	can_hover => 1,
		3331	can_events => 1,
3054	markup => $widget,	3332	markup => $widget,
3055	tooltip => $tooltip	3333	tooltip => $tooltip;
		3334	}
3056	}	3335	}
3057		3336
3058	$self->{item}{$widget} = $item;	3337	$self->{item}{$widget} = $item;
3059		3338
3060	$self->{vbox}->add ($widget);	3339	$self->{vbox}->add ($widget);
…		…
3103	1	3382	1
3104	}	3383	}
3105		3384
3106	#############################################################################	3385	#############################################################################
3107		3386
3108	package CFClient::UI::Multiplexer;	3387	package CFPlus::UI::Multiplexer;
3109		3388
3110	our @ISA = CFClient::UI::Container::;	3389	our @ISA = CFPlus::UI::Container::;
3111		3390
3112	sub new {	3391	sub new {
3113	my $class = shift;	3392	my $class = shift;
3114		3393
3115	my $self = $class->SUPER::new (	3394	my $self = $class->SUPER::new (
…		…
3129		3408
3130	$self->{current} = $self->{children}[0]	3409	$self->{current} = $self->{children}[0]
3131	if @{ $self->{children} };	3410	if @{ $self->{children} };
3132	}	3411	}
3133		3412
		3413	sub get_current_page {
		3414	my ($self) = @_;
		3415
		3416	$self->{current}
		3417	}
		3418
3134	sub set_current_page {	3419	sub set_current_page {
3135	my ($self, $page_or_widget) = @_;	3420	my ($self, $page_or_widget) = @_;
3136		3421
3137	my $widget = ref $page_or_widget	3422	my $widget = ref $page_or_widget
3138	? $page_or_widget	3423	? $page_or_widget
…		…
3170	$self->{current}->draw;	3455	$self->{current}->draw;
3171	}	3456	}
3172		3457
3173	#############################################################################	3458	#############################################################################
3174		3459
3175	package CFClient::UI::Notebook;	3460	package CFPlus::UI::Notebook;
3176		3461
3177	our @ISA = CFClient::UI::VBox::;	3462	our @ISA = CFPlus::UI::VBox::;
3178		3463
3179	sub new {	3464	sub new {
3180	my $class = shift;	3465	my $class = shift;
3181		3466
3182	my $self = $class->SUPER::new (	3467	my $self = $class->SUPER::new (
3183	buttonbar => (new CFClient::UI::Buttonbar),	3468	buttonbar => (new CFPlus::UI::Buttonbar),
3184	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3469	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3185	# filter => # will be put between multiplexer and $self	3470	# filter => # will be put between multiplexer and $self
3186	@_,	3471	@_,
3187	);	3472	);
3188		3473
3189	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3474	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3195	sub add {	3480	sub add {
3196	my ($self, $title, $widget, $tooltip) = @_;	3481	my ($self, $title, $widget, $tooltip) = @_;
3197		3482
3198	Scalar::Util::weaken $self;	3483	Scalar::Util::weaken $self;
3199		3484
3200	$self->{buttonbar}->add (new CFClient::UI::Button	3485	$self->{buttonbar}->add (new CFPlus::UI::Button
3201	markup => $title,	3486	markup => $title,
3202	tooltip => $tooltip,	3487	tooltip => $tooltip,
3203	on_activate => sub { $self->set_current_page ($widget) },	3488	on_activate => sub { $self->set_current_page ($widget) },
3204	);	3489	);
3205		3490
3206	$self->{multiplexer}->add ($widget);	3491	$self->{multiplexer}->add ($widget);
3207	}	3492	}
3208		3493
		3494	sub get_current_page {
		3495	my ($self) = @_;
		3496
		3497	$self->{multiplexer}->get_current_page
		3498	}
		3499
3209	sub set_current_page {	3500	sub set_current_page {
3210	my ($self, $page) = @_;	3501	my ($self, $page) = @_;
3211		3502
3212	$self->{multiplexer}->set_current_page ($page);	3503	$self->{multiplexer}->set_current_page ($page);
3213	$self->emit (page_changed => $self->{multiplexer}{current});	3504	$self->emit (page_changed => $self->{multiplexer}{current});
3214	}	3505	}
3215		3506
3216	#############################################################################	3507	#############################################################################
3217		3508
3218	package CFClient::UI::Combobox;	3509	package CFPlus::UI::Selector;
3219		3510
3220	use utf8;	3511	use utf8;
3221		3512
3222	our @ISA = CFClient::UI::Button::;	3513	our @ISA = CFPlus::UI::Button::;
3223		3514
3224	sub new {	3515	sub new {
3225	my $class = shift;	3516	my $class = shift;
3226		3517
3227	my $self = $class->SUPER::new (	3518	my $self = $class->SUPER::new (
…		…
3244	my ($value, $title, $tooltip) = @$_;	3535	my ($value, $title, $tooltip) = @$_;
3245		3536
3246	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3537	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247	}	3538	}
3248		3539
3249	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3540	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250	}	3541	}
3251		3542
3252	sub _set_value {	3543	sub _set_value {
3253	my ($self, $value) = @_;	3544	my ($self, $value) = @_;
3254		3545
…		…
3269	$self->emit (changed => $value);	3560	$self->emit (changed => $value);
3270	}	3561	}
3271		3562
3272	#############################################################################	3563	#############################################################################
3273		3564
3274	package CFClient::UI::Statusbox;	3565	package CFPlus::UI::Statusbox;
3275		3566
3276	our @ISA = CFClient::UI::VBox::;	3567	our @ISA = CFPlus::UI::VBox::;
3277		3568
3278	sub new {	3569	sub new {
3279	my $class = shift;	3570	my $class = shift;
3280		3571
3281	my $self = $class->SUPER::new (	3572	my $self = $class->SUPER::new (
…		…
3293	sub reorder {	3584	sub reorder {
3294	my ($self) = @_;	3585	my ($self) = @_;
3295	my $NOW = Time::HiRes::time;	3586	my $NOW = Time::HiRes::time;
3296		3587
3297	# freeze display when hovering over any label	3588	# freeze display when hovering over any label
3298	return if $CFClient::UI::TOOLTIP->{owner}	3589	return if $CFPlus::UI::TOOLTIP->{owner}
3299	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3590	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3300	values %{ $self->{item} };	3591	values %{ $self->{item} };
3301		3592
3302	while (my ($k, $v) = each %{ $self->{item} }) {	3593	while (my ($k, $v) = each %{ $self->{item} }) {
3303	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3594	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3304	}	3595	}
…		…
3325	for ($short) {	3616	for ($short) {
3326	s/^\s+//;	3617	s/^\s+//;
3327	s/\s+/ /g;	3618	s/\s+/ /g;
3328	}	3619	}
3329		3620
3330	new CFClient::UI::Label	3621	new CFPlus::UI::Label
3331	markup => $short,	3622	markup => $short,
3332	tooltip => $item->{tooltip},	3623	tooltip => $item->{tooltip},
3333	tooltip_font => $::FONT_PROP,	3624	tooltip_font => $::FONT_PROP,
3334	tooltip_width => 0.67,	3625	tooltip_width => 0.67,
3335	fontsize => $item->{fontsize} || $self->{fontsize},	3626	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3389	count => 1,	3680	count => 1,
3390	%arg,	3681	%arg,
3391	};	3682	};
3392	}	3683	}
3393		3684
		3685	$ROOT->on_refresh (reorder => sub {
3394	$self->reorder;	3686	$self->reorder;
		3687	});
3395	}	3688	}
3396		3689
3397	sub reconfigure {	3690	sub reconfigure {
3398	my ($self) = @_;	3691	my ($self) = @_;
3399		3692
…		…
3412	$self->SUPER::destroy;	3705	$self->SUPER::destroy;
3413	}	3706	}
3414		3707
3415	#############################################################################	3708	#############################################################################
3416		3709
3417	package CFClient::UI::Inventory;	3710	package CFPlus::UI::Inventory;
3418		3711
3419	our @ISA = CFClient::UI::ScrolledWindow::;	3712	our @ISA = CFPlus::UI::Table::;
3420		3713
3421	sub new {	3714	sub new {
3422	my $class = shift;	3715	my $class = shift;
3423		3716
3424	my $self = $class->SUPER::new (	3717	my $self = $class->SUPER::new (
3425	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3718	col_expand => [0, 1, 0],
		3719	items => [],
3426	@_,	3720	@_,
3427	);	3721	);
3428		3722
		3723	$self->set_sort_order (undef);
		3724
3429	$self	3725	$self
		3726	}
		3727
		3728	sub update_items {
		3729	my ($self) = @_;
		3730
		3731	$self->clear;
		3732
		3733	my @item = $self->{sort}->(@{ $self->{items} });
		3734
		3735	my @adds;
		3736	my $row = 0;
		3737	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3738	CFPlus::Item::update_widgets $item;
		3739
		3740	push @adds, 0, $row, $item->{face_widget};
		3741	push @adds, 1, $row, $item->{desc_widget};
		3742	push @adds, 2, $row, $item->{weight_widget};
		3743
		3744	$row++;
		3745	}
		3746
		3747	$self->add (@adds);
		3748	}
		3749
		3750	sub set_sort_order {
		3751	my ($self, $order) = @_;
		3752
		3753	$self->{sort} = $order ||= sub {
		3754	sort {
		3755	$a->{type} <=> $b->{type}
		3756	or $a->{name} cmp $b->{name}
		3757	} @_
		3758	};
		3759
		3760	$self->update_items;
3430	}	3761	}
3431		3762
3432	sub set_items {	3763	sub set_items {
3433	my ($self, $items) = @_;	3764	my ($self, $items) = @_;
3434		3765
3435	$self->{child}->clear;	3766	$self->{items} = [$items ? values %$items : ()];
3436	return unless $items;	3767	$self->update_items;
3437
3438	my @items = sort {
3439	($a->{type} <=> $b->{type})
3440	or ($a->{name} cmp $b->{name})
3441	} @$items;
3442
3443	$self->{real_items} = \@items;
3444
3445	my $row = 0;
3446	for my $item (@items) {
3447	CFClient::Item::update_widgets $item;
3448
3449	$self->{child}->add (0, $row, $item->{face_widget});
3450	$self->{child}->add (1, $row, $item->{desc_widget});
3451	$self->{child}->add (2, $row, $item->{weight_widget});
3452
3453	$row++;
3454	}
3455	}	3768	}
3456		3769
3457	#############################################################################	3770	#############################################################################
3458		3771
3459	package CFClient::UI::BindEditor;
3460
3461	our @ISA = CFClient::UI::FancyFrame::;
3462
3463	sub new {
3464	my $class = shift;
3465
3466	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3467
3468	$self->add (my $vb = new CFClient::UI::VBox);
3469
3470
3471	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3472	text => "start recording",
3473	tooltip => "Start/Stops recording of actions."
3474	."All subsequent actions after the recording started will be captured."
3475	."The actions are displayed after the record was stopped."
3476	."To bind the action you have to click on the 'Bind' button",
3477	on_activate => sub {
3478	unless ($self->{recording}) {
3479	$self->start;
3480	} else {
3481	$self->stop;
3482	}
3483	});
3484
3485	$vb->add (new CFClient::UI::Label text => "Actions:");
3486	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3487
3488	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3489	$vb->add (my $hb = new CFClient::UI::HBox);
3490	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3491	$hb->add (new CFClient::UI::Button
3492	text => "bind",
3493	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3494	on_activate => sub {
3495	$self->ask_for_bind;
3496	});
3497
3498	$vb->add (my $hb = new CFClient::UI::HBox);
3499	$hb->add (new CFClient::UI::Button
3500	text => "ok",
3501	expand => 1,
3502	tooltip => "This closes the binding editor and saves the binding",
3503	on_activate => sub {
3504	$self->hide;
3505	$self->commit;
3506	});
3507
3508	$hb->add (new CFClient::UI::Button
3509	text => "cancel",
3510	expand => 1,
3511	tooltip => "This closes the binding editor without saving",
3512	on_activate => sub {
3513	$self->hide;
3514	$self->{binding_cancel}->()
3515	if $self->{binding_cancel};
3516	});
3517
3518	$self->update_binding_widgets;
3519
3520	$self
3521	}
3522
3523	sub cfg_bind {
3524	my ($self, $mod, $sym, $cmds) = @_;
3525	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526	::update_bindings ();
3527	}
3528
3529	sub cfg_unbind {
3530	my ($self, $mod, $sym, $cmds) = @_;
3531	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532	::update_bindings ();
3533	}
3534
3535	sub commit {
3536	my ($self) = @_;
3537	my ($mod, $sym, $cmds) = $self->get_binding;
3538	if ($sym != 0 && @$cmds > 0) {
3539	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3540	."'. Don't forget 'Save Config'!");
3541	$self->{binding_change}->($mod, $sym, $cmds)
3542	if $self->{binding_change};
3543	} else {
3544	$::STATUSBOX->add ("No action bound, no key or action specified!");
3545	$self->{binding_cancel}->()
3546	if $self->{binding_cancel};
3547	}
3548	}
3549
3550	sub start {
3551	my ($self) = @_;
3552
3553	$self->{rec_btn}->set_text ("stop recording");
3554	$self->{recording} = 1;
3555	$self->clear_command_list;
3556	$::CONN->start_record if $::CONN;
3557	}
3558
3559	sub stop {
3560	my ($self) = @_;
3561
3562	$self->{rec_btn}->set_text ("start recording");
3563	$self->{recording} = 0;
3564
3565	my $rec;
3566	$rec = $::CONN->stop_record if $::CONN;
3567	return unless ref $rec eq 'ARRAY';
3568	$self->set_command_list ($rec);
3569	}
3570
3571
3572	sub ask_for_bind_and_commit {
3573	my ($self) = @_;
3574	$self->ask_for_bind (1);
3575	}
3576
3577	sub ask_for_bind {
3578	my ($self, $commit, $end_cb) = @_;
3579
3580	CFClient::Binder::open_binding_dialog (sub {
3581	my ($mod, $sym) = @_;
3582	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3583	$self->update_binding_widgets;
3584	$self->commit if $commit;
3585	$end_cb->() if $end_cb;
3586	});
3587	}
3588
3589	# $mod and $sym are the modifiers and key symbol
3590	# $cmds is a array ref of strings (the commands)
3591	# $cb is the callback that is executed on OK
3592	# $ccb is the callback that is executed on CANCEL and
3593	# when the binding was unsuccessful on OK
3594	sub set_binding {
3595	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3596
3597	$self->clear_command_list;
3598	$self->{recording} = 0;
3599	$self->{rec_btn}->set_text ("start recording");
3600
3601	$self->{binding} = [$mod, $sym];
3602	$self->{commands} = $cmds;
3603
3604	$self->{binding_change} = $cb;
3605	$self->{binding_cancel} = $ccb;
3606
3607	$self->update_binding_widgets;
3608	}
3609
3610	# this is a shortcut method that asks for a binding
3611	# and then just binds it.
3612	sub do_quick_binding {
3613	my ($self, $cmds, $end_cb) = @_;
3614	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3615	$self->ask_for_bind (1, $end_cb);
3616	}
3617
3618	sub update_binding_widgets {
3619	my ($self) = @_;
3620	my ($mod, $sym, $cmds) = $self->get_binding;
3621	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3622	$self->set_command_list ($cmds);
3623	}
3624
3625	sub get_binding {
3626	my ($self) = @_;
3627	return (
3628	$self->{binding}->[0],
3629	$self->{binding}->[1],
3630	[ grep { defined $_ } @{$self->{commands}} ]
3631	);
3632	}
3633
3634	sub clear_command_list {
3635	my ($self) = @_;
3636	$self->{cmdbox}->clear ();
3637	}
3638
3639	sub set_command_list {
3640	my ($self, $cmds) = @_;
3641
3642	$self->{cmdbox}->clear ();
3643	$self->{commands} = $cmds;
3644
3645	my $idx = 0;
3646
3647	for (@$cmds) {
3648	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3649
3650	my $i = $idx;
3651	$hb->add (new CFClient::UI::Label text => $_);
3652	$hb->add (new CFClient::UI::Button
3653	text => "delete",
3654	tooltip => "Deletes the action from the record",
3655	on_activate => sub {
3656	$self->{cmdbox}->remove ($hb);
3657	$cmds->[$i] = undef;
3658	});
3659
3660
3661	$idx++
3662	}
3663	}
3664
3665	#############################################################################
3666
3667	package CFClient::UI::SpellList;	3772	package CFPlus::UI::SpellList;
3668		3773
3669	our @ISA = CFClient::UI::Table::;	3774	our @ISA = CFPlus::UI::Table::;
3670		3775
3671	sub new {	3776	sub new {
3672	my $class = shift;	3777	my $class = shift;
3673		3778
3674	my $self = $class->SUPER::new (	3779	my $self = $class->SUPER::new (
…		…
3692	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3797	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3693		3798
3694	sub rebuild_spell_list {	3799	sub rebuild_spell_list {
3695	my ($self) = @_;	3800	my ($self) = @_;
3696		3801
3697	$CFClient::UI::ROOT->on_refresh ($self => sub {	3802	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3698	$self->clear;	3803	$self->clear;
3699		3804
3700	return unless $::CONN;	3805	return unless $::CONN;
3701		3806
3702	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3807	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3703	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3808	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3704	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3809	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3705	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3810	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3706	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3811	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3707		3812
3708	my $row = 0;	3813	my $row = 0;
3709		3814
3710	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3815	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3711	my $spell = $self->{spell}{$_};	3816	my $spell = $self->{spell}{$_};
…		…
3718	if ($ev->{button} == 1) {	3823	if ($ev->{button} == 1) {
3719	$::CONN->user_send ("cast $spell->{name}");	3824	$::CONN->user_send ("cast $spell->{name}");
3720	} elsif ($ev->{button} == 2) {	3825	} elsif ($ev->{button} == 2) {
3721	$::CONN->user_send ("invoke $spell->{name}");	3826	$::CONN->user_send ("invoke $spell->{name}");
3722	} elsif ($ev->{button} == 3) {	3827	} elsif ($ev->{button} == 3) {
3723	(new CFClient::UI::Menu	3828	(new CFPlus::UI::Menu
3724	items => [	3829	items => [
3725	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3830	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3831	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727	],	3832	],
3728	)->popup ($ev);	3833	)->popup ($ev);
3729	} else {	3834	} else {
3730	return 0;	3835	return 0;
3731	}	3836	}
3732		3837
3733	1	3838	1
3734	};	3839	};
3735		3840
3736	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3841	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3737		3842
3738	#TODO: add path info to tooltip	3843	#TODO: add path info to tooltip
3739	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3844	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3740		3845
3741	$self->add (0, $row, new CFClient::UI::Face	3846	$self->add (0, $row, new CFPlus::UI::Face
3742	face => $spell->{face},	3847	face => $spell->{face},
3743	can_hover => 1,	3848	can_hover => 1,
3744	can_events => 1,	3849	can_events => 1,
3745	tooltip => $tooltip,	3850	tooltip => $tooltip,
3746	on_button_down => $spell_cb,	3851	on_button_down => $spell_cb,
3747	);	3852	);
3748		3853
3749	$self->add (1, $row, new CFClient::UI::Label	3854	$self->add (1, $row, new CFPlus::UI::Label
3750	expand => 1,	3855	expand => 1,
3751	text => $spell->{name},	3856	text => $spell->{name},
3752	can_hover => 1,	3857	can_hover => 1,
3753	can_events => 1,	3858	can_events => 1,
3754	tooltip => $tooltip,	3859	tooltip => $tooltip,
3755	on_button_down => $spell_cb,	3860	on_button_down => $spell_cb,
3756	);	3861	);
3757		3862
3758	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3863	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3759	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3864	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3760	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3865	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3761	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3866	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3762	}	3867	}
3763	});	3868	});
3764	}	3869	}
3765		3870
3766	sub add_spell {	3871	sub add_spell {
…		…
3784	$self->rebuild_spell_list;	3889	$self->rebuild_spell_list;
3785	}	3890	}
3786		3891
3787	#############################################################################	3892	#############################################################################
3788		3893
3789	package CFClient::UI::Root;	3894	package CFPlus::UI::Root;
3790		3895
3791	our @ISA = CFClient::UI::Container::;	3896	our @ISA = CFPlus::UI::Container::;
3792		3897
3793	use List::Util qw(min max);	3898	use List::Util qw(min max);
3794		3899
3795	use CFClient::OpenGL;	3900	use CFPlus::OpenGL;
3796		3901
3797	sub new {	3902	sub new {
3798	my $class = shift;	3903	my $class = shift;
3799		3904
3800	my $self = $class->SUPER::new (	3905	my $self = $class->SUPER::new (
…		…
3976	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4081	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977		4082
3978	$w = 0 if $w < 0;	4083	$w = 0 if $w < 0;
3979	$h = 0 if $h < 0;	4084	$h = 0 if $h < 0;
3980		4085
		4086	$w = max $widget->{min_w}, $w;
		4087	$h = max $widget->{min_h}, $h;
		4088
		4089	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4090	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4091
		4092	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4093	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4094
3981	$w = int $w + 0.5;	4095	$w = int $w + 0.5;
3982	$h = int $h + 0.5;	4096	$h = int $h + 0.5;
3983		4097
3984	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4098	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985	$widget->{old_w} = $widget->{w};	4099	$widget->{old_w} = $widget->{w};
…		…
4008	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4122	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4009	glMatrixMode GL_MODELVIEW;	4123	glMatrixMode GL_MODELVIEW;
4010	glLoadIdentity;	4124	glLoadIdentity;
4011		4125
4012	{	4126	{
4013	package CFClient::UI::Base;	4127	package CFPlus::UI::Base;
4014		4128
4015	($draw_x, $draw_y, $draw_w, $draw_h) =	4129	($draw_x, $draw_y, $draw_w, $draw_h) =
4016	(0, 0, $self->{w}, $self->{h});	4130	(0, 0, $self->{w}, $self->{h});
4017	}	4131	}
4018		4132
4019	$self->_draw;	4133	$self->_draw;
4020	}	4134	}
4021		4135
4022	#############################################################################	4136	#############################################################################
4023		4137
4024	package CFClient::UI;	4138	package CFPlus::UI;
4025		4139
4026	$ROOT = new CFClient::UI::Root;	4140	$ROOT = new CFPlus::UI::Root;
4027	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4141	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4028		4142
4029	1	4143	1
4030		4144

Diff Legend

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