ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.311 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.356 by root, Wed Dec 6 00:15:12 2006 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8	use Event;	8	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
…		…
79	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	82	if $FOCUS;
82	}	83	}
83		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
84	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	99	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
87		101
88	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
90		106
91	$GRAB = $widget;	107	$GRAB = $widget;
92	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
93		109
94	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
95	}	111	}
96		112
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
98		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
100	if $GRAB;	116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
		122	}
101	}	123	}
102		124
103	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	126	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		127
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		129
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		131
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
112	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		134
114	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	137	$grab->update if $grab;
117	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
118		139
		140	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	141	$TOOLTIP_WATCHER->cb->();
120	}	142	}
121	}	143	}
122		144
123	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
124	my ($ev) = @_;	146	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
126		148
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		150
129	if ($widget != $HOVER) {	151	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		152
132	$hover->update if $hover && $hover->{can_hover};	153	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	154	if $HOVER;
140	}	155	}
141		156
142	# convert position array to integers	157	# convert position array to integers
143	sub harmonize {	158	sub harmonize {
…		…
193	reconfigure_widgets;	208	reconfigure_widgets;
194	}	209	}
195		210
196	#############################################################################	211	#############################################################################
197		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
198	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
199		222
200	use strict;	223	use strict;
201		224
202	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
203		226
204	sub new {	227	sub new {
205	my $class = shift;	228	my $class = shift;
206		229
207	my $self = bless {	230	my $self = bless {
…		…
212	h => undef,	235	h => undef,
213	can_events => 1,	236	can_events => 1,
214	@_	237	@_
215	}, $class;	238	}, $class;
216		239
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		241
219	for (keys %$self) {	242	for (keys %$self) {
220	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
222	}	245	}
223	}	246	}
224		247
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		253
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		256
234	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
247	sub show {	270	sub show {
248	my ($self) = @_;	271	my ($self) = @_;
249		272
250	return if $self->{parent};	273	return if $self->{parent};
251		274
252	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
253	}	276	}
254		277
255	sub set_visible {	278	sub set_visible {
256	my ($self) = @_;	279	my ($self) = @_;
257		280
…		…
278	delete $self->{root};	301	delete $self->{root};
279		302
280	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
282		305
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
285		308
286	$self->emit ("focus_out");	309	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
288	}	311	}
…		…
345	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
346		369
347	if ($self->{aspect}) {	370	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
349		372
350	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		375
353	# use alignment to adjust x, y	376	# use alignment to adjust x, y
354		377
355	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
397		420
398	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
399		422
400	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
401		424
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	428	}
406	}	429	}
407		430
408	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
409	sub coord2local {	432	sub coord2local {
410	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
411		434
		435	Carp::confess unless $self->{parent};#d#
		436
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	438	}
414		439
415	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
416	sub coord2global {	441	sub coord2global {
417	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
418		443
		444	Carp::confess unless $self->{parent};#d#
		445
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	447	}
421		448
422	sub invoke_focus_in {	449	sub invoke_focus_in {
423	my ($self) = @_;	450	my ($self) = @_;
424		451
425	return if $FOCUS == $self;	452	return if $FOCUS == $self;
426	return unless $self->{can_focus};	453	return unless $self->{can_focus};
427		454
428	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
429		456
430	$focus->update if $focus;	457	$self->update;
431	$FOCUS->update;
432		458
433	0	459	0
434	}	460	}
435		461
436	sub invoke_focus_out {	462	sub invoke_focus_out {
437	my ($self) = @_;	463	my ($self) = @_;
438		464
439	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
440		466
441	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
442		468
443	$focus->update if $focus; #?	469	$self->update;
444		470
445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	471	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	472	unless $FOCUS;
447		473
448	0	474	0
449	}	475	}
450		476
451	sub grab_focus {	477	sub grab_focus {
452	my ($self) = @_;	478	my ($self) = @_;
453		479
		480	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	481	$self->emit ("focus_in");
455	}	482	}
456		483
457	sub invoke_mouse_motion { 1 }	484	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	485	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	486	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
461		489
462	sub invoke_button_down {	490	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
464		492
465	$self->grab_focus;	493	$self->grab_focus;
466		494
467	1	495	0
468	}	496	}
469		497
470	sub connect {	498	sub connect {
471	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
472		500
473	push @{ $self->{signal_cb}{$signal} }, $cb;	501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
474	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
475		515
476	sub emit {	516	sub emit {
477	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
478		518
		519	# I do not really like this solution, but I do not like duplication
		520	# and needlessly verbose code, either.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
479	#d##TODO# stop propagating at first true, do not use sum	528	#d##TODO# stop propagating at first true, do not use sum
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483	}	532	}
484		533
485	sub find_widget {	534	sub find_widget {
486	my ($self, $x, $y) = @_;	535	my ($self, $x, $y) = @_;
487		536
…		…
539	return unless $self->{h} && $self->{w};	588	return unless $self->{h} && $self->{w};
540		589
541	# update screen rectangle	590	# update screen rectangle
542	local $draw_x = $draw_x + $self->{x};	591	local $draw_x = $draw_x + $self->{x};
543	local $draw_y = $draw_y + $self->{y};	592	local $draw_y = $draw_y + $self->{y};
544	local $draw_w = $draw_x + $self->{w};
545	local $draw_h = $draw_y + $self->{h};
546		593
547	# skip widgets that are entirely outside the drawing area	594	# skip widgets that are entirely outside the drawing area
548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	595	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	596	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550		597
…		…
573	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
576	glEnd;	623	glEnd;
577	glPopMatrix;	624	glPopMatrix;
578	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579	}	626	}
580		627
581	$self->_draw;	628	$self->_draw;
582	glPopMatrix;	629	glPopMatrix;
583	}	630	}
…		…
589	}	636	}
590		637
591	sub DESTROY {	638	sub DESTROY {
592	my ($self) = @_;	639	my ($self) = @_;
593		640
		641	return if CFPlus::in_destruct;
		642
594	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
595		644
596	eval { $self->destroy };	645	eval { $self->destroy };
597	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598	}	647	}
599		648
600	#############################################################################	649	#############################################################################
601		650
602	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
603		652
604	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
605		654
606	use strict;	655	use strict;
607	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
608		657
609	sub new {	658	sub new {
610	my $class = shift;	659	my $class = shift;
611		660
612	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
643	}	692	}
644	}	693	}
645		694
646	#############################################################################	695	#############################################################################
647		696
648	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
649		698
650	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
651		700
652	sub new {	701	sub new {
653	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
655	}	704	}
…		…
662		711
663	sub draw { }	712	sub draw { }
664		713
665	#############################################################################	714	#############################################################################
666		715
667	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
668		717
669	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
670		719
671	sub new {	720	sub new {
672	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
673		722
674	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
683	if $children;	732	if $children;
684		733
685	$self	734	$self
686	}	735	}
687		736
		737	sub realloc {
		738	my ($self) = @_;
		739
		740	$self->{force_realloc} = 1;
		741	$self->{force_size_alloc} = 1;
		742	$self->SUPER::realloc;
		743	}
		744
688	sub add {	745	sub add {
689	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
690		747
691	$_->set_parent ($self)	748	$_->set_parent ($self)
692	for @widgets;	749	for @widgets;
…		…
752	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
753	}	810	}
754		811
755	#############################################################################	812	#############################################################################
756		813
757	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
758		815
759	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
760		817
761	sub new {	818	sub new {
762	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
763		820
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		822
766	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
767	}	824	}
768		825
769	sub add {	826	sub add {
…		…
776	sub remove {	833	sub remove {
777	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
778		835
779	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
780		837
781	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
782	unless @{$self->{children}};	839	unless @{$self->{children}};
783	}	840	}
784		841
785	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
786		843
…		…
798		855
799	#############################################################################	856	#############################################################################
800		857
801	# back-buffered drawing area	858	# back-buffered drawing area
802		859
803	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
804		861
805	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
806		863
807	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
808		865
809	sub new {	866	sub new {
810	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
811		868
812	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
834	}	891	}
835		892
836	sub render_child {	893	sub render_child {
837	my ($self) = @_;	894	my ($self) = @_;
838		895
839	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	896	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
842		899
843	{	900	{
844	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
845		902
846	($draw_x, $draw_y, $draw_w, $draw_h) =	903	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
		905
		906	$self->_render;
848	}	907	}
849
850	$self->_render;
851	};	908	};
852	}	909	}
853		910
854	sub _draw {	911	sub _draw {
855	my ($self) = @_;	912	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		913
859	my $tex = $self->{texture}	914	my $tex = $self->{texture}
860	or return;	915	or return;
861		916
862	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
865		920
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
867		922
868	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
869	}	924	}
870		925
871	#############################################################################	926	#############################################################################
872		927
873	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
874		929
875	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
876		931
877	sub new {	932	sub new {
878	my $class = shift;	933	my $class = shift;
879		934
880	$class->SUPER::new (	935	$class->SUPER::new (
…		…
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	997	) {
943	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944	} else {	999	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	1001	}
947	}	1002	}
948		1003
949	sub _render {	1004	sub _render {
950	my ($self) = @_;	1005	my ($self) = @_;
951		1006
952	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1007	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
953	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1008	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954		1009
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1011
957	$self->SUPER::_render;	1012	$self->SUPER::_render;
958	}	1013	}
959		1014
960	#############################################################################	1015	#############################################################################
961		1016
962	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
963		1018
964	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
965		1020
966	sub new {	1021	sub new {
967	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
968		1023
969	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
970		1025
971	my $self;	1026	my $self;
972		1027
973	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
974	vertical => 1,	1029	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1031	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
978	},	1033	},
979	;	1034	;
980		1035
981	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
		1038	can_events => 1,
983	slider => $slider,	1039	slider => $slider,
984	%arg,	1040	%arg,
985	);	1041	);
986		1042
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1043	$self->SUPER::add ($self->{vp}, $self->{slider});
988	$self->add ($child) if $child;	1044	$self->add ($child) if $child;
989		1045
990	$self	1046	$self
991	}	1047	}
992		1048
		1049	#TODO# update range on size_allocate depending on child
		1050
993	sub add {	1051	sub add {
994	my ($self, $widget) = @_;	1052	my ($self, $widget) = @_;
995		1053
996	$self->{vp}->add ($self->{child} = $widget);	1054	$self->{vp}->add ($self->{child} = $widget);
997	}	1055	}
998		1056
		1057	sub invoke_mouse_wheel {
		1058	my ($self, $ev) = @_;
		1059
		1060	return 0 unless $ev->{dy}; # only vertical movements
		1061
		1062	$self->{slider}->emit (mouse_wheel => $ev);
		1063
		1064	1
		1065	}
		1066
		1067	sub update_slider {
		1068	my ($self) = @_;
		1069
		1070	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1071	}
		1072
999	sub update {	1073	sub update {
1000	my ($self) = @_;	1074	my ($self) = @_;
1001		1075
1002	$self->SUPER::update;	1076	$self->SUPER::update;
1003		1077
1004	# todo: overwrite size_allocate of child	1078	$self->update_slider;
1005	my $child = $self->{vp}->child;
1006	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1007	}	1079	}
1008		1080
1009	sub invoke_size_allocate {	1081	sub invoke_size_allocate {
1010	my ($self, $w, $h) = @_;	1082	my ($self, $w, $h) = @_;
1011		1083
1012	my $child = $self->{vp}->child;	1084	$self->update_slider;
1013	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014		1085
1015	$self->SUPER::invoke_size_allocate ($w, $h)	1086	$self->SUPER::invoke_size_allocate ($w, $h)
1016	}	1087	}
1017		1088
1018	#TODO# update range on size_allocate depending on child
1019	# update viewport offset on scroll
1020
1021	#############################################################################	1089	#############################################################################
1022		1090
1023	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
1024		1092
1025	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
1026		1094
1027	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
1028		1096
1029	sub new {	1097	sub new {
1030	my $class = shift;	1098	my $class = shift;
1031		1099
1032	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
1059	}	1127	}
1060		1128
1061	#############################################################################	1129	#############################################################################
1062		1130
1063	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
1064		1132
1065	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
1066		1134
1067	use CFClient::OpenGL;	1135	use CFPlus::OpenGL;
		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;
1068		1236
1069	my $bg =	1237	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1238	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1239	mipmap => 1, wrap => 1;
1072		1240
1073	my @border =	1241	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1242	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1243	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1244
1077	sub new {	1245	sub new {
1078	my ($class, %arg) = @_;	1246	my ($class, %arg) = @_;
1079		1247
1080	my $self = $class->SUPER::new (	1248	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1249	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1250	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1251	border => 0.6,
1084	can_events => 1,	1252	can_events => 1,
1085	min_w => 16,	1253	min_w => 64,
1086	min_h => 16,	1254	min_h => 32,
1087	%arg,	1255	%arg,
1088	);	1256	);
1089		1257
1090	$self->{title_widget} = new CFClient::UI::Label	1258	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1259	align => 0,
1092	valign => 1,	1260	valign => 1,
1093	text => $self->{title},	1261	text => $self->{title},
1094	fontsize => $self->{border},	1262	fontsize => $self->{border},
1095	if exists $self->{title};	1263	if exists $self->{title};
1096		1264
1097	if ($self->{has_close_button}) {	1265	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1266	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1267	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1268	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1269	on_activate => sub { $self->emit ("delete") };
1102		1270
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1271	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1272	}
1105		1273
1106	$self	1274	$self
1107	}	1275	}
1108		1276
1109	sub add {	1277	sub add {
1110	my ($self, @widgets) = @_;	1278	my ($self, @widgets) = @_;
1111		1279
1112	$self->SUPER::add (@widgets);	1280	$self->SUPER::add (@widgets);
1113	$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};
1114	$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};
1115	}	1283	}
1116		1284
1117	sub border {	1285	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1286	int $_[0]{border} * $::FONTSIZE
1119	}	1287	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1320	$self->child->configure ($border, $border, $w, $h);
1153		1321
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1322	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1323	if $self->{close_button};
1156		1324
		1325	1
		1326	}
		1327
		1328	sub invoke_delete {
		1329	my ($self) = @_;
		1330
		1331	$self->hide;
		1332
1157	1	1333	1
1158	}	1334	}
1159		1335
1160	sub invoke_button_down {	1336	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1337	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1395	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1396
1221	! ! $self->{motion}	1397	! ! $self->{motion}
1222	}	1398	}
1223		1399
		1400	sub invoke_visibility_change {
		1401	my ($self, $visible) = @_;
		1402
		1403	delete $self->{motion} unless $visible;
		1404
		1405	0
		1406	}
		1407
1224	sub _draw {	1408	sub _draw {
1225	my ($self) = @_;	1409	my ($self) = @_;
1226		1410
1227	my $child = $self->{children}[0];	1411	my $child = $self->{children}[0];
1228		1412
…		…
1265	if $self->{close_button};	1449	if $self->{close_button};
1266	}	1450	}
1267		1451
1268	#############################################################################	1452	#############################################################################
1269		1453
1270	package CFClient::UI::Table;	1454	package CFPlus::UI::Table;
1271		1455
1272	our @ISA = CFClient::UI::Base::;	1456	our @ISA = CFPlus::UI::Base::;
1273		1457
1274	use List::Util qw(max sum);	1458	use List::Util qw(max sum);
1275		1459
1276	use CFClient::OpenGL;	1460	use CFPlus::OpenGL;
1277		1461
1278	sub new {	1462	sub new {
1279	my $class = shift;	1463	my $class = shift;
1280		1464
1281	$class->SUPER::new (	1465	$class->SUPER::new (
…		…
1287	sub children {	1471	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}	1473	}
1290		1474
1291	sub add {	1475	sub add {
1292	my ($self, $x, $y, $child) = @_;	1476	my ($self) = shift;
1293		1477
		1478	while (@_) {
		1479	my ($x, $y, $child) = splice @_, 0, 3, ();
1294	$child->set_parent ($self);	1480	$child->set_parent ($self);
1295	$self->{children}[$y][$x] = $child;	1481	$self->{children}[$y][$x] = $child;
		1482	}
1296		1483
		1484	$self->{force_realloc} = 1;
		1485	$self->{force_size_alloc} = 1;
1297	$self->realloc;	1486	$self->realloc;
1298	}	1487	}
1299		1488
1300	sub remove {	1489	sub remove {
1301	my ($self, $child) = @_;	1490	my ($self, $child) = @_;
…		…
1366		1555
1367	# linearly scale sizes	1556	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1559
1371	CFClient::UI::harmonize $ws;	1560	CFPlus::UI::harmonize $ws;
1372	CFClient::UI::harmonize $hs;	1561	CFPlus::UI::harmonize $hs;
1373		1562
1374	my $y;	1563	my $y;
1375		1564
1376	for my $r (0 .. $#{$self->{children}}) {	1565	for my $r (0 .. $#{$self->{children}}) {
1377	my $row = $self->{children}[$r]	1566	my $row = $self->{children}[$r]
…		…
1420	}	1609	}
1421	}	1610	}
1422		1611
1423	#############################################################################	1612	#############################################################################
1424		1613
1425	package CFClient::UI::Box;	1614	package CFPlus::UI::Box;
1426		1615
1427	our @ISA = CFClient::UI::Container::;	1616	our @ISA = CFPlus::UI::Container::;
1428		1617
1429	sub size_request {	1618	sub size_request {
1430	my ($self) = @_;	1619	my ($self) = @_;
1431		1620
1432	$self->{vertical}	1621	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1654	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1655	for 0 .. $#children;
1467	}	1656	}
1468	}	1657	}
1469		1658
1470	CFClient::UI::harmonize \@req;	1659	CFPlus::UI::harmonize \@req;
1471		1660
1472	my $pos = 0;	1661	my $pos = 0;
1473	for (0 .. $#children) {	1662	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1663	my $alloc = $req[$_];
1475	$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));
…		…
1480	1	1669	1
1481	}	1670	}
1482		1671
1483	#############################################################################	1672	#############################################################################
1484		1673
1485	package CFClient::UI::HBox;	1674	package CFPlus::UI::HBox;
1486		1675
1487	our @ISA = CFClient::UI::Box::;	1676	our @ISA = CFPlus::UI::Box::;
1488		1677
1489	sub new {	1678	sub new {
1490	my $class = shift;	1679	my $class = shift;
1491		1680
1492	$class->SUPER::new (	1681	$class->SUPER::new (
…		…
1495	)	1684	)
1496	}	1685	}
1497		1686
1498	#############################################################################	1687	#############################################################################
1499		1688
1500	package CFClient::UI::VBox;	1689	package CFPlus::UI::VBox;
1501		1690
1502	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1503		1692
1504	sub new {	1693	sub new {
1505	my $class = shift;	1694	my $class = shift;
1506		1695
1507	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1510	)	1699	)
1511	}	1700	}
1512		1701
1513	#############################################################################	1702	#############################################################################
1514		1703
1515	package CFClient::UI::Label;	1704	package CFPlus::UI::Label;
1516		1705
1517	our @ISA = CFClient::UI::DrawBG::;	1706	our @ISA = CFPlus::UI::DrawBG::;
1518		1707
1519	use CFClient::OpenGL;	1708	use CFPlus::OpenGL;
1520		1709
1521	sub new {	1710	sub new {
1522	my ($class, %arg) = @_;	1711	my ($class, %arg) = @_;
1523		1712
1524	my $self = $class->SUPER::new (	1713	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1716	#active_bg => none
1528	#font => default_font	1717	#font => default_font
1529	#text => initial text	1718	#text => initial text
1530	#markup => initial narkup	1719	#markup => initial narkup
1531	#max_w => maximum pixel width	1720	#max_w => maximum pixel width
		1721	#style => 0, # render flags
1532	ellipsise => 3, # end	1722	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1723	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1724	fontsize => 1,
1535	align => -1,	1725	align => -1,
1536	valign => -1,	1726	valign => -1,
1537	padding_x => 2,	1727	padding_x => 2,
1538	padding_y => 2,	1728	padding_y => 2,
1539	can_events => 0,	1729	can_events => 0,
1540	%arg	1730	%arg
1541	);	1731	);
1542		1732
1543	if (exists $self->{template}) {	1733	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1734	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1735	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1736	$self->{template} = $layout;
1547	}	1737	}
1548		1738
1549	if (exists $self->{markup}) {	1739	if (exists $self->{markup}) {
…		…
1553	}	1743	}
1554		1744
1555	$self	1745	$self
1556	}	1746	}
1557		1747
1558	sub escape($) {
1559	local $_ = $_[0];
1560
1561	s/&/&amp;/g;
1562	s/>/&gt;/g;
1563	s/</&lt;/g;
1564
1565	$_
1566	}
1567
1568	sub update {	1748	sub update {
1569	my ($self) = @_;	1749	my ($self) = @_;
1570		1750
1571	delete $self->{texture};	1751	delete $self->{texture};
1572	$self->SUPER::update;	1752	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1763	my ($self, $text) = @_;
1584		1764
1585	return if $self->{text} eq "T$text";	1765	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1766	$self->{text} = "T$text";
1587		1767
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1768	$self->{layout}->set_text ($text);
1590		1769
1591	delete $self->{size_req};	1770	delete $self->{size_req};
1592	$self->realloc;	1771	$self->realloc;
1593	$self->update;	1772	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1778	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1779	$self->{text} = "M$markup";
1601		1780
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1781	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1782
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1783	$self->{layout}->set_markup ($markup);
1606		1784
1607	delete $self->{size_req};	1785	delete $self->{size_req};
1608	$self->realloc;	1786	$self->realloc;
1609	$self->update;	1787	$self->update;
…		…
1621		1799
1622	my ($w, $h) = $self->{layout}->size;	1800	my ($w, $h) = $self->{layout}->size;
1623		1801
1624	if (exists $self->{template}) {	1802	if (exists $self->{template}) {
1625	$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);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1805	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		1806
1628	my ($w2, $h2) = $self->{template}->size;	1807	my ($w2, $h2) = $self->{template}->size;
1629		1808
1630	$w = List::Util::max $w, $w2;	1809	$w = List::Util::max $w, $w2;
…		…
1654		1833
1655	sub set_fontsize {	1834	sub set_fontsize {
1656	my ($self, $fontsize) = @_;	1835	my ($self, $fontsize) = @_;
1657		1836
1658	$self->{fontsize} = $fontsize;	1837	$self->{fontsize} = $fontsize;
		1838	delete $self->{size_req};
1659	delete $self->{texture};	1839	delete $self->{texture};
1660		1840
1661	$self->realloc;	1841	$self->realloc;
1662	}	1842	}
1663		1843
1664	sub reconfigure {	1844	sub reconfigure {
1665	my ($self) = @_;	1845	my ($self) = @_;
1666		1846
1667	delete $self->{size_req};	1847	delete $self->{size_req};
		1848	delete $self->{texture};
1668		1849
1669	$self->SUPER::reconfigure;	1850	$self->SUPER::reconfigure;
1670	}	1851	}
1671		1852
1672	sub _draw {	1853	sub _draw {
1673	my ($self) = @_;	1854	my ($self) = @_;
1674		1855
1675	$self->SUPER::_draw; # draw background, if applicable	1856	$self->SUPER::_draw; # draw background, if applicable
1676		1857
1677	my $tex = $self->{texture} ||= do {	1858	my $size = $self->{texture} ||= do {
1678	$self->{layout}->set_foreground (@{$self->{fg}});	1859	$self->{layout}->set_foreground (@{$self->{fg}});
1679	$self->{layout}->set_font ($self->{font}) if $self->{font};	1860	$self->{layout}->set_font ($self->{font}) if $self->{font};
1680	$self->{layout}->set_width ($self->{w});	1861	$self->{layout}->set_width ($self->{w});
1681	$self->{layout}->set_ellipsise ($self->{ellipsise});	1862	$self->{layout}->set_ellipsise ($self->{ellipsise});
1682	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1863	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1864	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684		1865
1685	new_from_layout CFClient::Texture $self->{layout}	1866	[$self->{layout}->size]
1686	};	1867	};
1687		1868
1688	unless (exists $self->{ox}) {	1869	unless (exists $self->{ox}) {
1689	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1870	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1871	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691	: ($self->{w} - $tex->{w}) * 0.5);	1872	: ($self->{w} - $size->[0]) * 0.5);
1692		1873
1693	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1874	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1875	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695	: ($self->{h} - $tex->{h}) * 0.5);	1876	: ($self->{h} - $size->[1]) * 0.5);
1696	};	1877	};
1697		1878
1698	glEnable GL_TEXTURE_2D;
1699
1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1879	my $w = List::Util::min $self->{w} + 4, $size->[0];
1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1880	my $h = List::Util::min $self->{h} + 2, $size->[1];
1702		1881
1703	if ($tex->{format} == GL_ALPHA) {	1882	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1704	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705	glColor @{$self->{fg}};
1706	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707	} else {
1708	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710	}
1711
1712	glDisable GL_TEXTURE_2D;
1713	}	1883	}
1714		1884
1715	#############################################################################	1885	#############################################################################
1716		1886
1717	package CFClient::UI::EntryBase;	1887	package CFPlus::UI::EntryBase;
1718		1888
1719	our @ISA = CFClient::UI::Label::;	1889	our @ISA = CFPlus::UI::Label::;
1720		1890
1721	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1722		1892
1723	sub new {	1893	sub new {
1724	my $class = shift;	1894	my $class = shift;
1725		1895
1726	$class->SUPER::new (	1896	$class->SUPER::new (
…		…
1788		1958
1789	if ($uni == 8) {	1959	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1960	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	1961	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	1962	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	1963	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	1964	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	1965	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	1966	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	1967	} elsif ($sym == CFPlus::SDLK_HOME) {
1798	$self->{cursor} = 0;	1968	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {	1969	} elsif ($sym == CFPlus::SDLK_END) {
1800	$self->{cursor} = length $text;	1970	$self->{cursor} = length $text;
		1971	} elsif ($uni == 21) { # ctrl-u
		1972	$text = "";
		1973	$self->{cursor} = 0;
1801	} elsif ($uni == 27) {	1974	} elsif ($uni == 27) {
1802	$self->emit ('escape');	1975	$self->emit ('escape');
1803	} elsif ($uni) {	1976	} elsif ($uni) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	1977	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	1978	} else {
…		…
1828		2001
1829	my $idx = $self->{layout}->xy_to_index ($x, $y);	2002	my $idx = $self->{layout}->xy_to_index ($x, $y);
1830		2003
1831	# byte-index to char-index	2004	# byte-index to char-index
1832	my $text = $self->{text};	2005	my $text = $self->{text};
1833	utf8::encode $text;	2006	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834	$self->{cursor} = length substr $text, 0, $idx;	2007	$self->{cursor} = length $text;
1835		2008
1836	$self->_set_text ($self->{text});	2009	$self->_set_text ($self->{text});
1837	$self->update;	2010	$self->update;
1838		2011
1839	1	2012	1
…		…
1878	utf8::encode $text;	2051	utf8::encode $text;
1879		2052
1880	@$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)
1881	}	2054	}
1882		2055
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2056	glBegin GL_LINES;
1885	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};
1886	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};
1887	glEnd;	2059	glEnd;
1888	}	2060	}
1889	}	2061	}
1890		2062
1891	package CFClient::UI::Entry;	2063	package CFPlus::UI::Entry;
1892		2064
1893	our @ISA = CFClient::UI::EntryBase::;	2065	our @ISA = CFPlus::UI::EntryBase::;
1894		2066
1895	use CFClient::OpenGL;	2067	use CFPlus::OpenGL;
1896		2068
1897	sub invoke_key_down {	2069	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2070	my ($self, $ev) = @_;
1899		2071
1900	my $sym = $ev->{sym};	2072	my $sym = $ev->{sym};
…		…
1906	$self->{history_pointer} = -1;	2078	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2079	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2080	$self->emit (activate => $txt);
1909	$self->update;	2081	$self->update;
1910		2082
1911	} elsif ($sym == CFClient::SDLK_UP) {	2083	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2084	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2085	$self->{history_saveback} = $self->get_text;
1914	}	2086	}
1915	if (@{$self->{history} || []} > 0) {	2087	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2088	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2090	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2091	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2092	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2093	}
1922		2094
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2095	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2096	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2097	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2098
1927	if ($self->{history_pointer} >= 0) {	2099	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2100	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2109	1
1938	}	2110	}
1939		2111
1940	#############################################################################	2112	#############################################################################
1941		2113
1942	package CFClient::UI::Button;	2114	package CFPlus::UI::Button;
1943		2115
1944	our @ISA = CFClient::UI::Label::;	2116	our @ISA = CFPlus::UI::Label::;
1945		2117
1946	use CFClient::OpenGL;	2118	use CFPlus::OpenGL;
1947		2119
1948	my @tex =	2120	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2121	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2122	qw(b1_button_active.png);
1951		2123
1952	sub new {	2124	sub new {
1953	my $class = shift;	2125	my $class = shift;
1954		2126
…		…
1991	$self->SUPER::_draw;	2163	$self->SUPER::_draw;
1992	}	2164	}
1993		2165
1994	#############################################################################	2166	#############################################################################
1995		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
1996	package CFClient::UI::ImageButton;	2317	package CFPlus::UI::ImageButton;
1997		2318
1998	our @ISA = CFClient::UI::Image::;	2319	our @ISA = CFPlus::UI::Image::;
1999		2320
2000	use CFClient::OpenGL;	2321	use CFPlus::OpenGL;
2001		2322
2002	my %textures;	2323	my %textures;
2003		2324
2004	sub new {	2325	sub new {
2005	my $class = shift;	2326	my $class = shift;
…		…
2027	1	2348	1
2028	}	2349	}
2029		2350
2030	#############################################################################	2351	#############################################################################
2031		2352
2032	package CFClient::UI::CheckBox;
2033
2034	our @ISA = CFClient::UI::DrawBG::;
2035
2036	my @tex =
2037	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040	use CFClient::OpenGL;
2041
2042	sub new {
2043	my $class = shift;
2044
2045	$class->SUPER::new (
2046	padding_x => 2,
2047	padding_y => 2,
2048	fg => [1, 1, 1],
2049	active_fg => [1, 1, 0],
2050	bg => [0, 0, 0, 0.2],
2051	active_bg => [1, 1, 1, 0.5],
2052	state => 0,
2053	can_hover => 1,
2054	@_
2055	)
2056	}
2057
2058	sub size_request {
2059	my ($self) = @_;
2060
2061	(6) x 2
2062	}
2063
2064	sub invoke_button_down {
2065	my ($self, $ev, $x, $y) = @_;
2066
2067	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069	$self->{state} = !$self->{state};
2070	$self->emit (changed => $self->{state});
2071	} else {
2072	return 0
2073	}
2074
2075	1
2076	}
2077
2078	sub _draw {
2079	my ($self) = @_;
2080
2081	$self->SUPER::_draw;
2082
2083	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085	my ($w, $h) = @$self{qw(w h)};
2086
2087	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091	my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093	glEnable GL_TEXTURE_2D;
2094	$tex->draw_quad_alpha (0, 0, $s, $s);
2095	glDisable GL_TEXTURE_2D;
2096	}
2097
2098	#############################################################################
2099
2100	package CFClient::UI::Image;	2353	package CFPlus::UI::VGauge;
2101		2354
2102	our @ISA = CFClient::UI::Base::;	2355	our @ISA = CFPlus::UI::Base::;
2103
2104	use CFClient::OpenGL;
2105
2106	our %texture_cache;
2107
2108	sub new {
2109	my $class = shift;
2110
2111	my $self = $class->SUPER::new (
2112	can_events => 0,
2113	@_,
2114	);
2115
2116	$self->{path}
2117	or Carp::croak "required attribute 'path' not set";
2118
2119	$self->{tex} = $texture_cache{$self->{path}} ||=
2120	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122	Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126	$self
2127	}
2128
2129	sub size_request {
2130	my ($self) = @_;
2131
2132	($self->{tex}{w}, $self->{tex}{h})
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	my $tex = $self->{tex};
2139
2140	my ($w, $h) = ($self->{w}, $self->{h});
2141
2142	if ($self->{rot90}) {
2143	glRotate 90, 0, 0, 1;
2144	glTranslate 0, -$self->{w}, 0;
2145
2146	($w, $h) = ($h, $w);
2147	}
2148
2149	glEnable GL_TEXTURE_2D;
2150	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152	$tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154	glDisable GL_TEXTURE_2D;
2155	}
2156
2157	#############################################################################
2158
2159	package CFClient::UI::VGauge;
2160
2161	our @ISA = CFClient::UI::Base::;
2162		2356
2163	use List::Util qw(min max);	2357	use List::Util qw(min max);
2164		2358
2165	use CFClient::OpenGL;	2359	use CFPlus::OpenGL;
2166		2360
2167	my %tex = (	2361	my %tex = (
2168	food => [	2362	food => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2363	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2364	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171	],	2365	],
2172	grace => [	2366	grace => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2367	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2368	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175	],	2369	],
2176	hp => [	2370	hp => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2371	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2372	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179	],	2373	],
2180	mana => [	2374	mana => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2375	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2376	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183	],	2377	],
2184	);	2378	);
2185		2379
2186	# eg. VGauge->new (gauge => 'food'), default gauge: food	2380	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2246	my $ycut1 = max 0, min 1, $ycut;	2440	my $ycut1 = max 0, min 1, $ycut;
2247	my $ycut2 = max 0, min 1, $ycut - 1;	2441	my $ycut2 = max 0, min 1, $ycut - 1;
2248		2442
2249	my $h1 = $self->{h} * (1 - $ycut1);	2443	my $h1 = $self->{h} * (1 - $ycut1);
2250	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);
2251		2448
2252	glEnable GL_BLEND;	2449	glEnable GL_BLEND;
2253	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2450	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2451	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255	glEnable GL_TEXTURE_2D;	2452	glEnable GL_TEXTURE_2D;
…		…
2274		2471
2275	if ($t3) {	2472	if ($t3) {
2276	glBindTexture GL_TEXTURE_2D, $t3->{name};	2473	glBindTexture GL_TEXTURE_2D, $t3->{name};
2277	glBegin GL_QUADS;	2474	glBegin GL_QUADS;
2278	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2475	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2476	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2477	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2478	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282	glEnd;	2479	glEnd;
2283	}	2480	}
2284		2481
2285	glDisable GL_BLEND;	2482	glDisable GL_BLEND;
2286	glDisable GL_TEXTURE_2D;	2483	glDisable GL_TEXTURE_2D;
2287	}	2484	}
2288		2485
2289	#############################################################################	2486	#############################################################################
2290		2487
2291	package CFClient::UI::Gauge;	2488	package CFPlus::UI::Gauge;
2292		2489
2293	our @ISA = CFClient::UI::VBox::;	2490	our @ISA = CFPlus::UI::VBox::;
2294		2491
2295	sub new {	2492	sub new {
2296	my ($class, %arg) = @_;	2493	my ($class, %arg) = @_;
2297		2494
2298	my $self = $class->SUPER::new (	2495	my $self = $class->SUPER::new (
…		…
2300	can_hover => 1,	2497	can_hover => 1,
2301	can_events => 1,	2498	can_events => 1,
2302	%arg,	2499	%arg,
2303	);	2500	);
2304		2501
2305	$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");
2306	$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);
2307	$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");
2308		2505
2309	$self	2506	$self
2310	}	2507	}
2311		2508
2312	sub set_fontsize {	2509	sub set_fontsize {
…		…
2333	$self->{value}->set_text ($val);	2530	$self->{value}->set_text ($val);
2334	}	2531	}
2335		2532
2336	#############################################################################	2533	#############################################################################
2337		2534
2338	package CFClient::UI::Slider;	2535	package CFPlus::UI::Slider;
2339		2536
2340	use strict;	2537	use strict;
2341		2538
2342	use CFClient::OpenGL;	2539	use CFPlus::OpenGL;
2343		2540
2344	our @ISA = CFClient::UI::DrawBG::;	2541	our @ISA = CFPlus::UI::DrawBG::;
2345		2542
2346	my @tex =	2543	my @tex =
2347	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2544	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348	qw(s1_slider.png s1_slider_bg.png);	2545	qw(s1_slider.png s1_slider_bg.png);
2349		2546
2350	sub new {	2547	sub new {
2351	my $class = shift;	2548	my $class = shift;
2352		2549
…		…
2441	}	2638	}
2442		2639
2443	1	2640	1
2444	}	2641	}
2445		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
2446	sub update {	2653	sub update {
2447	my ($self) = @_;	2654	my ($self) = @_;
2448		2655
2449	delete $self->{knob_w};	2656	delete $self->{knob_w};
2450	$self->SUPER::update;	2657	$self->SUPER::update;
…		…
2497	glDisable GL_TEXTURE_2D;	2704	glDisable GL_TEXTURE_2D;
2498	}	2705	}
2499		2706
2500	#############################################################################	2707	#############################################################################
2501		2708
2502	package CFClient::UI::ValSlider;	2709	package CFPlus::UI::ValSlider;
2503		2710
2504	our @ISA = CFClient::UI::HBox::;	2711	our @ISA = CFPlus::UI::HBox::;
2505		2712
2506	sub new {	2713	sub new {
2507	my ($class, %arg) = @_;	2714	my ($class, %arg) = @_;
2508		2715
2509	my $range = delete $arg{range};	2716	my $range = delete $arg{range};
2510		2717
2511	my $self = $class->SUPER::new (	2718	my $self = $class->SUPER::new (
2512	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2719	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2720	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514	to_value => sub { shift },	2721	to_value => sub { shift },
2515	from_value => sub { shift },	2722	from_value => sub { shift },
2516	%arg,	2723	%arg,
2517	);	2724	);
2518		2725
…		…
2538	sub set_range { shift->{slider}->set_range (@_) }	2745	sub set_range { shift->{slider}->set_range (@_) }
2539	sub set_value { shift->{slider}->set_value (@_) }	2746	sub set_value { shift->{slider}->set_value (@_) }
2540		2747
2541	#############################################################################	2748	#############################################################################
2542		2749
2543	package CFClient::UI::TextScroller;	2750	package CFPlus::UI::TextScroller;
2544		2751
2545	our @ISA = CFClient::UI::HBox::;	2752	our @ISA = CFPlus::UI::HBox::;
2546		2753
2547	use CFClient::OpenGL;	2754	use CFPlus::OpenGL;
2548		2755
2549	sub new {	2756	sub new {
2550	my $class = shift;	2757	my $class = shift;
2551		2758
2552	my $self = $class->SUPER::new (	2759	my $self = $class->SUPER::new (
2553	fontsize => 1,	2760	fontsize => 1,
2554	can_events => 0,	2761	can_events => 1,
2555	indent => 0,	2762	indent => 0,
2556	#font => default_font	2763	#font => default_font
2557	@_,	2764	@_,
2558		2765
2559	layout => (new CFClient::Layout 1),	2766	layout => (new CFPlus::Layout),
2560	par => [],	2767	par => [],
2561	height => 0,	2768	height => 0,
2562	children => [	2769	children => [
2563	(new CFClient::UI::Empty expand => 1),	2770	(new CFPlus::UI::Empty expand => 1),
2564	(new CFClient::UI::Slider vertical => 1),	2771	(new CFPlus::UI::Slider vertical => 1),
2565	],	2772	],
2566	);	2773	);
2567		2774
2568	$self->{children}[1]->connect (changed => sub { $self->update });	2775	$self->{children}[1]->connect (changed => sub { $self->update });
2569		2776
…		…
2575		2782
2576	$self->{fontsize} = $fontsize;	2783	$self->{fontsize} = $fontsize;
2577	$self->reflow;	2784	$self->reflow;
2578	}	2785	}
2579		2786
2580	sub visible_children {	2787	sub size_request {
2581	my ($self) = @_;	2788	my ($self) = @_;
2582		2789
2583	@{$self->{children}}[0,1]	2790	my ($empty, $slider) = @{ $self->{children} };
		2791
		2792	local $self->{children} = [$empty, $slider];
		2793	$self->SUPER::size_request
2584	}	2794	}
2585		2795
2586	sub invoke_size_allocate {	2796	sub invoke_size_allocate {
2587	my ($self, $w, $h) = @_;	2797	my ($self, $w, $h) = @_;
2588		2798
…		…
2594	$self->{layout}->set_width ($empty->{w});	2804	$self->{layout}->set_width ($empty->{w});
2595	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2805	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596		2806
2597	$self->reflow;	2807	$self->reflow;
2598		2808
		2809	local $self->{children} = [$empty, $slider];
2599	$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
2600	}	2821	}
2601		2822
2602	sub get_layout {	2823	sub get_layout {
2603	my ($self, $para) = @_;	2824	my ($self, $para) = @_;
2604		2825
…		…
2632		2853
2633	# todo: base offset on lines or so, not on pixels	2854	# todo: base offset on lines or so, not on pixels
2634	$self->{children}[1]->set_value ($offset);	2855	$self->{children}[1]->set_value ($offset);
2635	}	2856	}
2636		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;
		2871	}
		2872
2637	sub clear {	2873	sub clear {
2638	my ($self) = @_;	2874	my ($self) = @_;
2639		2875
2640	my (undef, undef, @other) = @{ $self->{children} };	2876	my (undef, undef, @other) = @{ $self->{children} };
2641	$self->remove ($_) for @other;	2877	$self->remove ($_) for @other;
…		…
2644	$self->{height} = 0;	2880	$self->{height} = 0;
2645	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2881	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646	}	2882	}
2647		2883
2648	sub add_paragraph {	2884	sub add_paragraph {
2649	my ($self, $color, $para, $indent) = @_;	2885	my $self = shift;
2650		2886
2651	my ($text, @w) = ref $para ? @$para : $para;	2887	for my $para (@_) {
2652
2653	$para = {	2888	$para = {
		2889	fg => [1, 1, 1, 1],
		2890	indent => 0,
		2891	markup => "",
		2892	widget => [],
		2893	ref $para ? %$para : (markup => $para),
2654	w => 1e10,	2894	w => 1e10,
2655	wrapped => 1,	2895	wrapped => 1,
2656	fg => $color,
2657	indent => $indent,
2658	markup => $text,
2659	widget => \@w,
2660	};	2896	};
2661		2897
2662	$self->add (@w) if @w;	2898	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663	push @{$self->{par}}, $para;	2899	push @{$self->{par}}, $para;
		2900	}
2664		2901
2665	$self->{need_reflow}++;	2902	$self->{need_reflow}++;
2666	$self->update;	2903	$self->update;
2667	}	2904	}
2668		2905
2669	sub scroll_to_bottom {	2906	sub scroll_to_bottom {
2670	my ($self) = @_;	2907	my ($self) = @_;
2671		2908
2672	$self->{scroll_to_bottom} = 1;	2909	$self->{scroll_to} = $#{$self->{par}};
2673	$self->update;	2910	$self->update;
2674	}	2911	}
2675		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
2676	sub update {	2946	sub update {
2677	my ($self) = @_;	2947	my ($self) = @_;
2678		2948
2679	$self->SUPER::update;	2949	$self->SUPER::update;
2680		2950
2681	return unless $self->{h} > 0;	2951	return unless $self->{h} > 0;
2682		2952
2683	delete $self->{texture};	2953	delete $self->{texture};
2684		2954
2685	$ROOT->on_post_alloc ($self => sub {	2955	$ROOT->on_post_alloc ($self => sub {
		2956	$self->force_uptodate;
		2957
2686	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2958	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687		2959
2688	if (delete $self->{need_reflow}) {
2689	my $height = 0;
2690
2691	for my $para (@{$self->{par}}) {
2692	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2693	my $layout = $self->get_layout ($para);
2694	my ($w, $h) = $layout->size;
2695
2696	$para->{w} = $w + $para->{indent};
2697	$para->{h} = $h;
2698	$para->{wrapped} = $layout->has_wrapped;
2699	}
2700
2701	$height += $para->{h};
2702	}
2703
2704	$self->{height} = $height;
2705
2706	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2707
2708	delete $self->{texture};
2709	}
2710
2711	if (delete $self->{scroll_to_bottom}) {
2712	$self->{children}[1]->set_value (1e10);
2713	}
2714
2715	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2960	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716	glClearColor 0, 0, 0, 0;	2961	glClearColor 0, 0, 0, 0;
2717	glClear GL_COLOR_BUFFER_BIT;	2962	glClear GL_COLOR_BUFFER_BIT;
2718		2963
		2964	package CFPlus::UI::Base;
		2965	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		2966	(0, 0, $self->{w}, $self->{h});
		2967
		2968	my $top = int $self->{children}[1]{range}[0];
		2969
		2970	my $paridx = 0;
		2971	my $top_paragraph;
2719	my $top = int $self->{children}[1]{range}[0];	2972	my $top = int $self->{children}[1]{range}[0];
2720		2973
2721	my $y0 = $top;	2974	my $y0 = $top;
2722	my $y1 = $top + $H;	2975	my $y1 = $top + $H;
2723		2976
2724	my $y = 0;
2725
2726	glEnable GL_BLEND;
2727	#TODO# not correct in windows where rgba is forced off
2728	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2729
2730	for my $para (@{$self->{par}}) {	2977	for my $para (@{$self->{par}}) {
2731	my $h = $para->{h};	2978	my $h = $para->{h};
		2979	my $y = $para->{y};
2732		2980
2733	if ($y0 < $y + $h && $y < $y1) {	2981	if ($y0 < $y + $h && $y < $y1) {
2734
2735	my $layout = $self->get_layout ($para);	2982	my $layout = $self->get_layout ($para);
2736		2983
2737	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739	glRasterPos $para->{indent}, $y - $y0;	2984	$layout->render ($para->{indent}, $y - $y0);
2740	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741		2985
2742	if (my @w = @{ $para->{widget} }) {	2986	if (my @w = @{ $para->{widget} }) {
2743	my @s = $layout->get_shapes;	2987	my @s = $layout->get_shapes;
2744		2988
2745	for (@w) {	2989	for (@w) {
…		…
2751	$_->draw;	2995	$_->draw;
2752	}	2996	}
2753	}	2997	}
2754	}	2998	}
2755		2999
2756	$y += $h;	3000	$paridx++;
		3001	$top_paragraph ||= $paridx if $y >= $top;
2757	}	3002	}
2758		3003
2759	glDisable GL_BLEND;	3004	$self->{top_paragraph} = $top_paragraph;
2760	};	3005	};
2761	});	3006	});
2762	}	3007	}
2763		3008
2764	sub reconfigure {	3009	sub reconfigure {
…		…
2782	$self->{children}[1]->draw;	3027	$self->{children}[1]->draw;
2783	}	3028	}
2784		3029
2785	#############################################################################	3030	#############################################################################
2786		3031
2787	package CFClient::UI::Animator;	3032	package CFPlus::UI::Animator;
2788		3033
2789	use CFClient::OpenGL;	3034	use CFPlus::OpenGL;
2790		3035
2791	our @ISA = CFClient::UI::Bin::;	3036	our @ISA = CFPlus::UI::Bin::;
2792		3037
2793	sub moveto {	3038	sub moveto {
2794	my ($self, $x, $y) = @_;	3039	my ($self, $x, $y) = @_;
2795		3040
2796	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3041	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2824	glPopMatrix;	3069	glPopMatrix;
2825	}	3070	}
2826		3071
2827	#############################################################################	3072	#############################################################################
2828		3073
2829	package CFClient::UI::Flopper;	3074	package CFPlus::UI::Flopper;
2830		3075
2831	our @ISA = CFClient::UI::Button::;	3076	our @ISA = CFPlus::UI::Button::;
2832		3077
2833	sub new {	3078	sub new {
2834	my $class = shift;	3079	my $class = shift;
2835		3080
2836	my $self = $class->SUPER::new (	3081	my $self = $class->SUPER::new (
…		…
2848	$self->{other}->toggle_visibility;	3093	$self->{other}->toggle_visibility;
2849	}	3094	}
2850		3095
2851	#############################################################################	3096	#############################################################################
2852		3097
2853	package CFClient::UI::Tooltip;	3098	package CFPlus::UI::Tooltip;
2854		3099
2855	our @ISA = CFClient::UI::Bin::;	3100	our @ISA = CFPlus::UI::Bin::;
2856		3101
2857	use CFClient::OpenGL;	3102	use CFPlus::OpenGL;
2858		3103
2859	sub new {	3104	sub new {
2860	my $class = shift;	3105	my $class = shift;
2861		3106
2862	$class->SUPER::new (	3107	$class->SUPER::new (
…		…
2865	)	3110	)
2866	}	3111	}
2867		3112
2868	sub set_tooltip_from {	3113	sub set_tooltip_from {
2869	my ($self, $widget) = @_;	3114	my ($self, $widget) = @_;
		3115
		3116	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3117	if $widget->{tooltip} =~ /^#(.*)$/;
2870		3118
2871	my $tooltip = $widget->{tooltip};	3119	my $tooltip = $widget->{tooltip};
2872		3120
2873	if ($ENV{CFPLUS_DEBUG} & 2) {	3121	if ($ENV{CFPLUS_DEBUG} & 2) {
2874	$tooltip .= "\n\n" . (ref $widget) . "\n"	3122	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2878	}	3126	}
2879		3127
2880	$tooltip =~ s/^\n+//;	3128	$tooltip =~ s/^\n+//;
2881	$tooltip =~ s/\n+$//;	3129	$tooltip =~ s/\n+$//;
2882		3130
2883	$self->add (new CFClient::UI::Label	3131	$self->add (new CFPlus::UI::Label
2884	markup => $tooltip,	3132	markup => $tooltip,
2885	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3133	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886	fontsize => 0.8,	3134	fontsize => 0.8,
2887	fg => [0, 0, 0, 1],	3135	style => 1, # FLAG_INVERSE
2888	ellipsise => 0,	3136	ellipsise => 0,
2889	font => ($widget->{tooltip_font} || $::FONT_PROP),	3137	font => ($widget->{tooltip_font} || $::FONT_PROP),
2890	);	3138	);
2891	}	3139	}
2892		3140
…		…
2911		3159
2912	$self->{root}->on_post_alloc ("move_$self" => sub {	3160	$self->{root}->on_post_alloc ("move_$self" => sub {
2913	my $widget = $self->{owner}	3161	my $widget = $self->{owner}
2914	or return;	3162	or return;
2915		3163
		3164	if ($widget->{visible}) {
2916	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3165	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917		3166
2918	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3167	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919	if $x + $self->{w} > $self->{root}{w};	3168	if $x + $self->{w} > $self->{root}{w};
2920		3169
2921	$self->move_abs ($x, $y);	3170	$self->move_abs ($x, $y);
		3171	} else {
		3172	$self->hide;
		3173	}
2922	});	3174	});
2923	}	3175	}
2924		3176
2925	sub _draw {	3177	sub _draw {
2926	my ($self) = @_;	3178	my ($self) = @_;
…		…
2950	$self->SUPER::_draw;	3202	$self->SUPER::_draw;
2951	}	3203	}
2952		3204
2953	#############################################################################	3205	#############################################################################
2954		3206
2955	package CFClient::UI::Face;	3207	package CFPlus::UI::Face;
2956		3208
2957	our @ISA = CFClient::UI::Base::;	3209	our @ISA = CFPlus::UI::DrawBG::;
2958		3210
2959	use CFClient::OpenGL;	3211	use CFPlus::OpenGL;
2960		3212
2961	sub new {	3213	sub new {
2962	my $class = shift;	3214	my $class = shift;
2963		3215
2964	my $self = $class->SUPER::new (	3216	my $self = $class->SUPER::new (
…		…
2999	sub _draw {	3251	sub _draw {
3000	my ($self) = @_;	3252	my ($self) = @_;
3001		3253
3002	return unless $::CONN;	3254	return unless $::CONN;
3003		3255
		3256	$self->SUPER::_draw;
		3257
3004	my $face;	3258	my $face;
3005		3259
3006	if ($self->{frame}) {	3260	if ($self->{frame}) {
3007	my $anim = $::CONN->{anim}[$self->{anim}];	3261	my $anim = $::CONN->{anim}[$self->{anim}];
3008		3262
…		…
3030	$self->SUPER::destroy;	3284	$self->SUPER::destroy;
3031	}	3285	}
3032		3286
3033	#############################################################################	3287	#############################################################################
3034		3288
3035	package CFClient::UI::Buttonbar;	3289	package CFPlus::UI::Buttonbar;
3036		3290
3037	our @ISA = CFClient::UI::HBox::;	3291	our @ISA = CFPlus::UI::HBox::;
3038		3292
3039	# TODO: should actualyl wrap buttons and other goodies.	3293	# TODO: should actually wrap buttons and other goodies.
3040		3294
3041	#############################################################################	3295	#############################################################################
3042		3296
3043	package CFClient::UI::Menu;	3297	package CFPlus::UI::Menu;
3044		3298
3045	our @ISA = CFClient::UI::FancyFrame::;	3299	our @ISA = CFPlus::UI::Toplevel::;
3046		3300
3047	use CFClient::OpenGL;	3301	use CFPlus::OpenGL;
3048		3302
3049	sub new {	3303	sub new {
3050	my $class = shift;	3304	my $class = shift;
3051		3305
3052	my $self = $class->SUPER::new (	3306	my $self = $class->SUPER::new (
3053	items => [],	3307	items => [],
3054	z => 100,	3308	z => 100,
3055	@_,	3309	@_,
3056	);	3310	);
3057		3311
3058	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3312	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059		3313
3060	for my $item (@{ $self->{items} }) {	3314	for my $item (@{ $self->{items} }) {
3061	my ($widget, $cb, $tooltip) = @$item;	3315	my ($widget, $cb, $tooltip) = @$item;
3062		3316
3063	# handle various types of items, only text for now	3317	# handle various types of items, only text for now
3064	if (!ref $widget) {	3318	if (!ref $widget) {
		3319	if ($widget =~ /\t/) {
		3320	my ($left, $right) = split /\t/, $widget, 2;
		3321
3065	$widget = new CFClient::UI::Label	3322	$widget = new CFPlus::UI::HBox
3066	can_hover => 1,	3323	can_hover => 1,
3067	can_events => 1,	3324	can_events => 1,
		3325	tooltip => $tooltip,
		3326	children => [
		3327	(new CFPlus::UI::Label markup => $left, expand => 1),
		3328	(new CFPlus::UI::Label markup => $right, align => +1),
		3329	],
		3330	;
		3331
		3332	} else {
		3333	$widget = new CFPlus::UI::Label
		3334	can_hover => 1,
		3335	can_events => 1,
3068	markup => $widget,	3336	markup => $widget,
3069	tooltip => $tooltip	3337	tooltip => $tooltip;
		3338	}
3070	}	3339	}
3071		3340
3072	$self->{item}{$widget} = $item;	3341	$self->{item}{$widget} = $item;
3073		3342
3074	$self->{vbox}->add ($widget);	3343	$self->{vbox}->add ($widget);
…		…
3117	1	3386	1
3118	}	3387	}
3119		3388
3120	#############################################################################	3389	#############################################################################
3121		3390
3122	package CFClient::UI::Multiplexer;	3391	package CFPlus::UI::Multiplexer;
3123		3392
3124	our @ISA = CFClient::UI::Container::;	3393	our @ISA = CFPlus::UI::Container::;
3125		3394
3126	sub new {	3395	sub new {
3127	my $class = shift;	3396	my $class = shift;
3128		3397
3129	my $self = $class->SUPER::new (	3398	my $self = $class->SUPER::new (
…		…
3143		3412
3144	$self->{current} = $self->{children}[0]	3413	$self->{current} = $self->{children}[0]
3145	if @{ $self->{children} };	3414	if @{ $self->{children} };
3146	}	3415	}
3147		3416
		3417	sub get_current_page {
		3418	my ($self) = @_;
		3419
		3420	$self->{current}
		3421	}
		3422
3148	sub set_current_page {	3423	sub set_current_page {
3149	my ($self, $page_or_widget) = @_;	3424	my ($self, $page_or_widget) = @_;
3150		3425
3151	my $widget = ref $page_or_widget	3426	my $widget = ref $page_or_widget
3152	? $page_or_widget	3427	? $page_or_widget
…		…
3184	$self->{current}->draw;	3459	$self->{current}->draw;
3185	}	3460	}
3186		3461
3187	#############################################################################	3462	#############################################################################
3188		3463
3189	package CFClient::UI::Notebook;	3464	package CFPlus::UI::Notebook;
3190		3465
3191	our @ISA = CFClient::UI::VBox::;	3466	our @ISA = CFPlus::UI::VBox::;
3192		3467
3193	sub new {	3468	sub new {
3194	my $class = shift;	3469	my $class = shift;
3195		3470
3196	my $self = $class->SUPER::new (	3471	my $self = $class->SUPER::new (
3197	buttonbar => (new CFClient::UI::Buttonbar),	3472	buttonbar => (new CFPlus::UI::Buttonbar),
3198	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3473	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199	# filter => # will be put between multiplexer and $self	3474	# filter => # will be put between multiplexer and $self
3200	@_,	3475	@_,
3201	);	3476	);
3202		3477
3203	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3478	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3209	sub add {	3484	sub add {
3210	my ($self, $title, $widget, $tooltip) = @_;	3485	my ($self, $title, $widget, $tooltip) = @_;
3211		3486
3212	Scalar::Util::weaken $self;	3487	Scalar::Util::weaken $self;
3213		3488
3214	$self->{buttonbar}->add (new CFClient::UI::Button	3489	$self->{buttonbar}->add (new CFPlus::UI::Button
3215	markup => $title,	3490	markup => $title,
3216	tooltip => $tooltip,	3491	tooltip => $tooltip,
3217	on_activate => sub { $self->set_current_page ($widget) },	3492	on_activate => sub { $self->set_current_page ($widget) },
3218	);	3493	);
3219		3494
3220	$self->{multiplexer}->add ($widget);	3495	$self->{multiplexer}->add ($widget);
3221	}	3496	}
3222		3497
		3498	sub get_current_page {
		3499	my ($self) = @_;
		3500
		3501	$self->{multiplexer}->get_current_page
		3502	}
		3503
3223	sub set_current_page {	3504	sub set_current_page {
3224	my ($self, $page) = @_;	3505	my ($self, $page) = @_;
3225		3506
3226	$self->{multiplexer}->set_current_page ($page);	3507	$self->{multiplexer}->set_current_page ($page);
3227	$self->emit (page_changed => $self->{multiplexer}{current});	3508	$self->emit (page_changed => $self->{multiplexer}{current});
3228	}	3509	}
3229		3510
3230	#############################################################################	3511	#############################################################################
3231		3512
3232	package CFClient::UI::Combobox;	3513	package CFPlus::UI::Selector;
3233		3514
3234	use utf8;	3515	use utf8;
3235		3516
3236	our @ISA = CFClient::UI::Button::;	3517	our @ISA = CFPlus::UI::Button::;
3237		3518
3238	sub new {	3519	sub new {
3239	my $class = shift;	3520	my $class = shift;
3240		3521
3241	my $self = $class->SUPER::new (	3522	my $self = $class->SUPER::new (
…		…
3258	my ($value, $title, $tooltip) = @$_;	3539	my ($value, $title, $tooltip) = @$_;
3259		3540
3260	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3541	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261	}	3542	}
3262		3543
3263	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3544	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264	}	3545	}
3265		3546
3266	sub _set_value {	3547	sub _set_value {
3267	my ($self, $value) = @_;	3548	my ($self, $value) = @_;
3268		3549
…		…
3283	$self->emit (changed => $value);	3564	$self->emit (changed => $value);
3284	}	3565	}
3285		3566
3286	#############################################################################	3567	#############################################################################
3287		3568
3288	package CFClient::UI::Statusbox;	3569	package CFPlus::UI::Statusbox;
3289		3570
3290	our @ISA = CFClient::UI::VBox::;	3571	our @ISA = CFPlus::UI::VBox::;
3291		3572
3292	sub new {	3573	sub new {
3293	my $class = shift;	3574	my $class = shift;
3294		3575
3295	my $self = $class->SUPER::new (	3576	my $self = $class->SUPER::new (
…		…
3307	sub reorder {	3588	sub reorder {
3308	my ($self) = @_;	3589	my ($self) = @_;
3309	my $NOW = Time::HiRes::time;	3590	my $NOW = Time::HiRes::time;
3310		3591
3311	# freeze display when hovering over any label	3592	# freeze display when hovering over any label
3312	return if $CFClient::UI::TOOLTIP->{owner}	3593	return if $CFPlus::UI::TOOLTIP->{owner}
3313	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3594	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314	values %{ $self->{item} };	3595	values %{ $self->{item} };
3315		3596
3316	while (my ($k, $v) = each %{ $self->{item} }) {	3597	while (my ($k, $v) = each %{ $self->{item} }) {
3317	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3598	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318	}	3599	}
…		…
3339	for ($short) {	3620	for ($short) {
3340	s/^\s+//;	3621	s/^\s+//;
3341	s/\s+/ /g;	3622	s/\s+/ /g;
3342	}	3623	}
3343		3624
3344	new CFClient::UI::Label	3625	new CFPlus::UI::Label
3345	markup => $short,	3626	markup => $short,
3346	tooltip => $item->{tooltip},	3627	tooltip => $item->{tooltip},
3347	tooltip_font => $::FONT_PROP,	3628	tooltip_font => $::FONT_PROP,
3348	tooltip_width => 0.67,	3629	tooltip_width => 0.67,
3349	fontsize => $item->{fontsize} || $self->{fontsize},	3630	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3403	count => 1,	3684	count => 1,
3404	%arg,	3685	%arg,
3405	};	3686	};
3406	}	3687	}
3407		3688
		3689	$ROOT->on_refresh (reorder => sub {
3408	$self->reorder;	3690	$self->reorder;
		3691	});
3409	}	3692	}
3410		3693
3411	sub reconfigure {	3694	sub reconfigure {
3412	my ($self) = @_;	3695	my ($self) = @_;
3413		3696
…		…
3426	$self->SUPER::destroy;	3709	$self->SUPER::destroy;
3427	}	3710	}
3428		3711
3429	#############################################################################	3712	#############################################################################
3430		3713
3431	package CFClient::UI::Inventory;	3714	package CFPlus::UI::Inventory;
3432		3715
3433	our @ISA = CFClient::UI::ScrolledWindow::;	3716	our @ISA = CFPlus::UI::Table::;
3434		3717
3435	sub new {	3718	sub new {
3436	my $class = shift;	3719	my $class = shift;
3437		3720
3438	my $self = $class->SUPER::new (	3721	my $self = $class->SUPER::new (
3439	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3722	col_expand => [0, 1, 0],
		3723	items => [],
3440	@_,	3724	@_,
3441	);	3725	);
3442		3726
		3727	$self->set_sort_order (undef);
		3728
3443	$self	3729	$self
		3730	}
		3731
		3732	sub update_items {
		3733	my ($self) = @_;
		3734
		3735	$self->clear;
		3736
		3737	my @item = $self->{sort}->(@{ $self->{items} });
		3738
		3739	my @adds;
		3740	my $row = 0;
		3741	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3742	CFPlus::Item::update_widgets $item;
		3743
		3744	push @adds, 0, $row, $item->{face_widget};
		3745	push @adds, 1, $row, $item->{desc_widget};
		3746	push @adds, 2, $row, $item->{weight_widget};
		3747
		3748	$row++;
		3749	}
		3750
		3751	$self->add (@adds);
		3752	}
		3753
		3754	sub set_sort_order {
		3755	my ($self, $order) = @_;
		3756
		3757	$self->{sort} = $order ||= sub {
		3758	sort {
		3759	$a->{type} <=> $b->{type}
		3760	or $a->{name} cmp $b->{name}
		3761	} @_
		3762	};
		3763
		3764	$self->update_items;
3444	}	3765	}
3445		3766
3446	sub set_items {	3767	sub set_items {
3447	my ($self, $items) = @_;	3768	my ($self, $items) = @_;
3448		3769
3449	$self->{child}->clear;	3770	$self->{items} = [$items ? values %$items : ()];
3450	return unless $items;	3771	$self->update_items;
3451
3452	my @items = sort {
3453	($a->{type} <=> $b->{type})
3454	or ($a->{name} cmp $b->{name})
3455	} @$items;
3456
3457	$self->{real_items} = \@items;
3458
3459	my $row = 0;
3460	for my $item (@items) {
3461	CFClient::Item::update_widgets $item;
3462
3463	$self->{child}->add (0, $row, $item->{face_widget});
3464	$self->{child}->add (1, $row, $item->{desc_widget});
3465	$self->{child}->add (2, $row, $item->{weight_widget});
3466
3467	$row++;
3468	}
3469	}	3772	}
3470		3773
3471	#############################################################################	3774	#############################################################################
3472		3775
3473	package CFClient::UI::BindEditor;
3474
3475	our @ISA = CFClient::UI::FancyFrame::;
3476
3477	sub new {
3478	my $class = shift;
3479
3480	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482	$self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486	text => "start recording",
3487	tooltip => "Start/Stops recording of actions."
3488	."All subsequent actions after the recording started will be captured."
3489	."The actions are displayed after the record was stopped."
3490	."To bind the action you have to click on the 'Bind' button",
3491	on_activate => sub {
3492	unless ($self->{recording}) {
3493	$self->start;
3494	} else {
3495	$self->stop;
3496	}
3497	});
3498
3499	$vb->add (new CFClient::UI::Label text => "Actions:");
3500	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3503	$vb->add (my $hb = new CFClient::UI::HBox);
3504	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505	$hb->add (new CFClient::UI::Button
3506	text => "bind",
3507	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508	on_activate => sub {
3509	$self->ask_for_bind;
3510	});
3511
3512	$vb->add (my $hb = new CFClient::UI::HBox);
3513	$hb->add (new CFClient::UI::Button
3514	text => "ok",
3515	expand => 1,
3516	tooltip => "This closes the binding editor and saves the binding",
3517	on_activate => sub {
3518	$self->hide;
3519	$self->commit;
3520	});
3521
3522	$hb->add (new CFClient::UI::Button
3523	text => "cancel",
3524	expand => 1,
3525	tooltip => "This closes the binding editor without saving",
3526	on_activate => sub {
3527	$self->hide;
3528	$self->{binding_cancel}->()
3529	if $self->{binding_cancel};
3530	});
3531
3532	$self->update_binding_widgets;
3533
3534	$self
3535	}
3536
3537	sub cfg_bind {
3538	my ($self, $mod, $sym, $cmds) = @_;
3539	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540	::update_bindings ();
3541	}
3542
3543	sub cfg_unbind {
3544	my ($self, $mod, $sym, $cmds) = @_;
3545	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546	::update_bindings ();
3547	}
3548
3549	sub commit {
3550	my ($self) = @_;
3551	my ($mod, $sym, $cmds) = $self->get_binding;
3552	if ($sym != 0 && @$cmds > 0) {
3553	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554	."'. Don't forget 'Save Config'!");
3555	$self->{binding_change}->($mod, $sym, $cmds)
3556	if $self->{binding_change};
3557	} else {
3558	$::STATUSBOX->add ("No action bound, no key or action specified!");
3559	$self->{binding_cancel}->()
3560	if $self->{binding_cancel};
3561	}
3562	}
3563
3564	sub start {
3565	my ($self) = @_;
3566
3567	$self->{rec_btn}->set_text ("stop recording");
3568	$self->{recording} = 1;
3569	$self->clear_command_list;
3570	$::CONN->start_record if $::CONN;
3571	}
3572
3573	sub stop {
3574	my ($self) = @_;
3575
3576	$self->{rec_btn}->set_text ("start recording");
3577	$self->{recording} = 0;
3578
3579	my $rec;
3580	$rec = $::CONN->stop_record if $::CONN;
3581	return unless ref $rec eq 'ARRAY';
3582	$self->set_command_list ($rec);
3583	}
3584
3585
3586	sub ask_for_bind_and_commit {
3587	my ($self) = @_;
3588	$self->ask_for_bind (1);
3589	}
3590
3591	sub ask_for_bind {
3592	my ($self, $commit, $end_cb) = @_;
3593
3594	CFClient::Binder::open_binding_dialog (sub {
3595	my ($mod, $sym) = @_;
3596	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597	$self->update_binding_widgets;
3598	$self->commit if $commit;
3599	$end_cb->() if $end_cb;
3600	});
3601	}
3602
3603	# $mod and $sym are the modifiers and key symbol
3604	# $cmds is a array ref of strings (the commands)
3605	# $cb is the callback that is executed on OK
3606	# $ccb is the callback that is executed on CANCEL and
3607	# when the binding was unsuccessful on OK
3608	sub set_binding {
3609	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611	$self->clear_command_list;
3612	$self->{recording} = 0;
3613	$self->{rec_btn}->set_text ("start recording");
3614
3615	$self->{binding} = [$mod, $sym];
3616	$self->{commands} = $cmds;
3617
3618	$self->{binding_change} = $cb;
3619	$self->{binding_cancel} = $ccb;
3620
3621	$self->update_binding_widgets;
3622	}
3623
3624	# this is a shortcut method that asks for a binding
3625	# and then just binds it.
3626	sub do_quick_binding {
3627	my ($self, $cmds, $end_cb) = @_;
3628	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629	$self->ask_for_bind (1, $end_cb);
3630	}
3631
3632	sub update_binding_widgets {
3633	my ($self) = @_;
3634	my ($mod, $sym, $cmds) = $self->get_binding;
3635	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636	$self->set_command_list ($cmds);
3637	}
3638
3639	sub get_binding {
3640	my ($self) = @_;
3641	return (
3642	$self->{binding}->[0],
3643	$self->{binding}->[1],
3644	[ grep { defined $_ } @{$self->{commands}} ]
3645	);
3646	}
3647
3648	sub clear_command_list {
3649	my ($self) = @_;
3650	$self->{cmdbox}->clear ();
3651	}
3652
3653	sub set_command_list {
3654	my ($self, $cmds) = @_;
3655
3656	$self->{cmdbox}->clear ();
3657	$self->{commands} = $cmds;
3658
3659	my $idx = 0;
3660
3661	for (@$cmds) {
3662	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664	my $i = $idx;
3665	$hb->add (new CFClient::UI::Label text => $_);
3666	$hb->add (new CFClient::UI::Button
3667	text => "delete",
3668	tooltip => "Deletes the action from the record",
3669	on_activate => sub {
3670	$self->{cmdbox}->remove ($hb);
3671	$cmds->[$i] = undef;
3672	});
3673
3674
3675	$idx++
3676	}
3677	}
3678
3679	#############################################################################
3680
3681	package CFClient::UI::SpellList;	3776	package CFPlus::UI::SpellList;
3682		3777
3683	our @ISA = CFClient::UI::Table::;	3778	our @ISA = CFPlus::UI::Table::;
3684		3779
3685	sub new {	3780	sub new {
3686	my $class = shift;	3781	my $class = shift;
3687		3782
3688	my $self = $class->SUPER::new (	3783	my $self = $class->SUPER::new (
…		…
3706	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3801	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707		3802
3708	sub rebuild_spell_list {	3803	sub rebuild_spell_list {
3709	my ($self) = @_;	3804	my ($self) = @_;
3710		3805
3711	$CFClient::UI::ROOT->on_refresh ($self => sub {	3806	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3712	$self->clear;	3807	$self->clear;
3713		3808
3714	return unless $::CONN;	3809	return unless $::CONN;
3715		3810
3716	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3811	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3812	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3813	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3814	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3815	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721		3816
3722	my $row = 0;	3817	my $row = 0;
3723		3818
3724	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3819	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725	my $spell = $self->{spell}{$_};	3820	my $spell = $self->{spell}{$_};
…		…
3732	if ($ev->{button} == 1) {	3827	if ($ev->{button} == 1) {
3733	$::CONN->user_send ("cast $spell->{name}");	3828	$::CONN->user_send ("cast $spell->{name}");
3734	} elsif ($ev->{button} == 2) {	3829	} elsif ($ev->{button} == 2) {
3735	$::CONN->user_send ("invoke $spell->{name}");	3830	$::CONN->user_send ("invoke $spell->{name}");
3736	} elsif ($ev->{button} == 3) {	3831	} elsif ($ev->{button} == 3) {
		3832	my $shortname = CFPlus::shorten $spell->{name}, 14;
3737	(new CFClient::UI::Menu	3833	(new CFPlus::UI::Menu
3738	items => [	3834	items => [
3739	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3835	["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3836	["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741	],	3837	],
3742	)->popup ($ev);	3838	)->popup ($ev);
3743	} else {	3839	} else {
3744	return 0;	3840	return 0;
3745	}	3841	}
3746		3842
3747	1	3843	1
3748	};	3844	};
3749		3845
3750	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3846	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3751		3847
3752	#TODO: add path info to tooltip	3848	#TODO: add path info to tooltip
3753	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3849	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3754		3850
3755	$self->add (0, $row, new CFClient::UI::Face	3851	$self->add (0, $row, new CFPlus::UI::Face
3756	face => $spell->{face},	3852	face => $spell->{face},
3757	can_hover => 1,	3853	can_hover => 1,
3758	can_events => 1,	3854	can_events => 1,
3759	tooltip => $tooltip,	3855	tooltip => $tooltip,
3760	on_button_down => $spell_cb,	3856	on_button_down => $spell_cb,
3761	);	3857	);
3762		3858
3763	$self->add (1, $row, new CFClient::UI::Label	3859	$self->add (1, $row, new CFPlus::UI::Label
3764	expand => 1,	3860	expand => 1,
3765	text => $spell->{name},	3861	text => $spell->{name},
3766	can_hover => 1,	3862	can_hover => 1,
3767	can_events => 1,	3863	can_events => 1,
3768	tooltip => $tooltip,	3864	tooltip => $tooltip,
3769	on_button_down => $spell_cb,	3865	on_button_down => $spell_cb,
3770	);	3866	);
3771		3867
3772	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3868	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3869	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3870	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3871	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776	}	3872	}
3777	});	3873	});
3778	}	3874	}
3779		3875
3780	sub add_spell {	3876	sub add_spell {
…		…
3798	$self->rebuild_spell_list;	3894	$self->rebuild_spell_list;
3799	}	3895	}
3800		3896
3801	#############################################################################	3897	#############################################################################
3802		3898
3803	package CFClient::UI::Root;	3899	package CFPlus::UI::Root;
3804		3900
3805	our @ISA = CFClient::UI::Container::;	3901	our @ISA = CFPlus::UI::Container::;
3806		3902
3807	use List::Util qw(min max);	3903	use List::Util qw(min max);
3808		3904
3809	use CFClient::OpenGL;	3905	use CFPlus::OpenGL;
3810		3906
3811	sub new {	3907	sub new {
3812	my $class = shift;	3908	my $class = shift;
3813		3909
3814	my $self = $class->SUPER::new (	3910	my $self = $class->SUPER::new (
…		…
3990	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4086	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991		4087
3992	$w = 0 if $w < 0;	4088	$w = 0 if $w < 0;
3993	$h = 0 if $h < 0;	4089	$h = 0 if $h < 0;
3994		4090
		4091	$w = max $widget->{min_w}, $w;
		4092	$h = max $widget->{min_h}, $h;
		4093
		4094	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4095	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4096
		4097	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4098	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4099
3995	$w = int $w + 0.5;	4100	$w = int $w + 0.5;
3996	$h = int $h + 0.5;	4101	$h = int $h + 0.5;
3997		4102
3998	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4103	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999	$widget->{old_w} = $widget->{w};	4104	$widget->{old_w} = $widget->{w};
…		…
4022	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4127	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023	glMatrixMode GL_MODELVIEW;	4128	glMatrixMode GL_MODELVIEW;
4024	glLoadIdentity;	4129	glLoadIdentity;
4025		4130
4026	{	4131	{
4027	package CFClient::UI::Base;	4132	package CFPlus::UI::Base;
4028		4133
4029	($draw_x, $draw_y, $draw_w, $draw_h) =	4134	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030	(0, 0, $self->{w}, $self->{h});	4135	(0, 0, $self->{w}, $self->{h});
4031	}
4032		4136
4033	$self->_draw;	4137	$self->_draw;
		4138	}
4034	}	4139	}
4035		4140
4036	#############################################################################	4141	#############################################################################
4037		4142
4038	package CFClient::UI;	4143	package CFPlus::UI;
4039		4144
4040	$ROOT = new CFClient::UI::Root;	4145	$ROOT = new CFPlus::UI::Root;
4041	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4146	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042		4147
4043	1	4148	1
4044		4149

Diff Legend

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