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.343 by root, Sun Aug 13 15:14:17 2006 UTC

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

Diff Legend

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