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

Diff Legend

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