ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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