ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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