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.316 by root, Sun Jul 2 13:57:58 2006 UTC vs.
Revision 1.341 by root, Sun Aug 13 03:20:56 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;
…		…
994	my ($self, $widget) = @_;	1054	my ($self, $widget) = @_;
995		1055
996	$self->{vp}->add ($self->{child} = $widget);	1056	$self->{vp}->add ($self->{child} = $widget);
997	}	1057	}
998		1058
		1059	sub invoke_mouse_wheel {
		1060	my ($self, $ev) = @_;
		1061
		1062	return 0 unless $ev->{dy}; # only vertical movements
		1063
		1064	$self->{slider}->emit (mouse_wheel => $ev);
		1065
		1066	1
		1067	}
		1068
999	sub update_slider {	1069	sub update_slider {
1000	my ($self) = @_;	1070	my ($self) = @_;
1001		1071
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1072	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003	}	1073	}
…		…
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1088	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1089	}
1020		1090
1021	#############################################################################	1091	#############################################################################
1022		1092
1023	package CFClient::UI::Frame;	1093	package CFPlus::UI::Frame;
1024		1094
1025	our @ISA = CFClient::UI::Bin::;	1095	our @ISA = CFPlus::UI::Bin::;
1026		1096
1027	use CFClient::OpenGL;	1097	use CFPlus::OpenGL;
1028		1098
1029	sub new {	1099	sub new {
1030	my $class = shift;	1100	my $class = shift;
1031		1101
1032	$class->SUPER::new (	1102	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1128	$self->SUPER::_draw;
1059	}	1129	}
1060		1130
1061	#############################################################################	1131	#############################################################################
1062		1132
1063	package CFClient::UI::FancyFrame;	1133	package CFPlus::UI::FancyFrame;
1064		1134
1065	our @ISA = CFClient::UI::Bin::;	1135	our @ISA = CFPlus::UI::Bin::;
1066		1136
1067	use CFClient::OpenGL;	1137	use CFPlus::OpenGL;
1068		1138
1069	my $bg =	1139	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1140	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1141	mipmap => 1, wrap => 1;
1072		1142
1073	my @border =	1143	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1144	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1145	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1146
1077	sub new {	1147	sub new {
1078	my ($class, %arg) = @_;	1148	my ($class, %arg) = @_;
1079		1149
1080	my $self = $class->SUPER::new (	1150	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1151	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1152	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1153	border => 0.6,
1084	can_events => 1,	1154	can_events => 1,
1085	min_w => 16,	1155	min_w => 64,
1086	min_h => 16,	1156	min_h => 32,
1087	%arg,	1157	%arg,
1088	);	1158	);
1089		1159
1090	$self->{title_widget} = new CFClient::UI::Label	1160	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1161	align => 0,
1092	valign => 1,	1162	valign => 1,
1093	text => $self->{title},	1163	text => $self->{title},
1094	fontsize => $self->{border},	1164	fontsize => $self->{border},
1095	if exists $self->{title};	1165	if exists $self->{title};
1096		1166
1097	if ($self->{has_close_button}) {	1167	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1168	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1169	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1170	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1171	on_activate => sub { $self->emit ("delete") };
1102		1172
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1173	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1174	}
1105		1175
1106	$self	1176	$self
1107	}	1177	}
1108		1178
1109	sub add {	1179	sub add {
1110	my ($self, @widgets) = @_;	1180	my ($self, @widgets) = @_;
1111		1181
1112	$self->SUPER::add (@widgets);	1182	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1183	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1184	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1185	}
1116		1186
1117	sub border {	1187	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1188	int $_[0]{border} * $::FONTSIZE
1119	}	1189	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1222	$self->child->configure ($border, $border, $w, $h);
1153		1223
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1224	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1225	if $self->{close_button};
1156		1226
		1227	1
		1228	}
		1229
		1230	sub invoke_delete {
		1231	my ($self) = @_;
		1232
		1233	$self->hide;
		1234
1157	1	1235	1
1158	}	1236	}
1159		1237
1160	sub invoke_button_down {	1238	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1239	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1297	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1298
1221	! ! $self->{motion}	1299	! ! $self->{motion}
1222	}	1300	}
1223		1301
		1302	sub invoke_visibility_change {
		1303	my ($self, $visible) = @_;
		1304
		1305	delete $self->{motion} unless $visible;
		1306
		1307	0
		1308	}
		1309
1224	sub _draw {	1310	sub _draw {
1225	my ($self) = @_;	1311	my ($self) = @_;
1226		1312
1227	my $child = $self->{children}[0];	1313	my $child = $self->{children}[0];
1228		1314
…		…
1265	if $self->{close_button};	1351	if $self->{close_button};
1266	}	1352	}
1267		1353
1268	#############################################################################	1354	#############################################################################
1269		1355
1270	package CFClient::UI::Table;	1356	package CFPlus::UI::Table;
1271		1357
1272	our @ISA = CFClient::UI::Base::;	1358	our @ISA = CFPlus::UI::Base::;
1273		1359
1274	use List::Util qw(max sum);	1360	use List::Util qw(max sum);
1275		1361
1276	use CFClient::OpenGL;	1362	use CFPlus::OpenGL;
1277		1363
1278	sub new {	1364	sub new {
1279	my $class = shift;	1365	my $class = shift;
1280		1366
1281	$class->SUPER::new (	1367	$class->SUPER::new (
…		…
1287	sub children {	1373	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1374	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}	1375	}
1290		1376
1291	sub add {	1377	sub add {
1292	my ($self, $x, $y, $child) = @_;	1378	my ($self) = shift;
1293		1379
		1380	while (@_) {
		1381	my ($x, $y, $child) = splice @_, 0, 3, ();
1294	$child->set_parent ($self);	1382	$child->set_parent ($self);
1295	$self->{children}[$y][$x] = $child;	1383	$self->{children}[$y][$x] = $child;
		1384	}
1296		1385
		1386	$self->{force_realloc} = 1;
		1387	$self->{force_size_alloc} = 1;
1297	$self->realloc;	1388	$self->realloc;
1298	}	1389	}
1299		1390
1300	sub remove {	1391	sub remove {
1301	my ($self, $child) = @_;	1392	my ($self, $child) = @_;
…		…
1366		1457
1367	# linearly scale sizes	1458	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1459	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1460	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1461
1371	CFClient::UI::harmonize $ws;	1462	CFPlus::UI::harmonize $ws;
1372	CFClient::UI::harmonize $hs;	1463	CFPlus::UI::harmonize $hs;
1373		1464
1374	my $y;	1465	my $y;
1375		1466
1376	for my $r (0 .. $#{$self->{children}}) {	1467	for my $r (0 .. $#{$self->{children}}) {
1377	my $row = $self->{children}[$r]	1468	my $row = $self->{children}[$r]
…		…
1420	}	1511	}
1421	}	1512	}
1422		1513
1423	#############################################################################	1514	#############################################################################
1424		1515
1425	package CFClient::UI::Box;	1516	package CFPlus::UI::Box;
1426		1517
1427	our @ISA = CFClient::UI::Container::;	1518	our @ISA = CFPlus::UI::Container::;
1428		1519
1429	sub size_request {	1520	sub size_request {
1430	my ($self) = @_;	1521	my ($self) = @_;
1431		1522
1432	$self->{vertical}	1523	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1556	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1557	for 0 .. $#children;
1467	}	1558	}
1468	}	1559	}
1469		1560
1470	CFClient::UI::harmonize \@req;	1561	CFPlus::UI::harmonize \@req;
1471		1562
1472	my $pos = 0;	1563	my $pos = 0;
1473	for (0 .. $#children) {	1564	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1565	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1566	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1571	1
1481	}	1572	}
1482		1573
1483	#############################################################################	1574	#############################################################################
1484		1575
1485	package CFClient::UI::HBox;	1576	package CFPlus::UI::HBox;
1486		1577
1487	our @ISA = CFClient::UI::Box::;	1578	our @ISA = CFPlus::UI::Box::;
1488		1579
1489	sub new {	1580	sub new {
1490	my $class = shift;	1581	my $class = shift;
1491		1582
1492	$class->SUPER::new (	1583	$class->SUPER::new (
…		…
1495	)	1586	)
1496	}	1587	}
1497		1588
1498	#############################################################################	1589	#############################################################################
1499		1590
1500	package CFClient::UI::VBox;	1591	package CFPlus::UI::VBox;
1501		1592
1502	our @ISA = CFClient::UI::Box::;	1593	our @ISA = CFPlus::UI::Box::;
1503		1594
1504	sub new {	1595	sub new {
1505	my $class = shift;	1596	my $class = shift;
1506		1597
1507	$class->SUPER::new (	1598	$class->SUPER::new (
…		…
1510	)	1601	)
1511	}	1602	}
1512		1603
1513	#############################################################################	1604	#############################################################################
1514		1605
1515	package CFClient::UI::Label;	1606	package CFPlus::UI::Label;
1516		1607
1517	our @ISA = CFClient::UI::DrawBG::;	1608	our @ISA = CFPlus::UI::DrawBG::;
1518		1609
1519	use CFClient::OpenGL;	1610	use CFPlus::OpenGL;
1520		1611
1521	sub new {	1612	sub new {
1522	my ($class, %arg) = @_;	1613	my ($class, %arg) = @_;
1523		1614
1524	my $self = $class->SUPER::new (	1615	my $self = $class->SUPER::new (
…		…
1528	#font => default_font	1619	#font => default_font
1529	#text => initial text	1620	#text => initial text
1530	#markup => initial narkup	1621	#markup => initial narkup
1531	#max_w => maximum pixel width	1622	#max_w => maximum pixel width
1532	ellipsise => 3, # end	1623	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1624	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1625	fontsize => 1,
1535	align => -1,	1626	align => -1,
1536	valign => -1,	1627	valign => -1,
1537	padding_x => 2,	1628	padding_x => 2,
1538	padding_y => 2,	1629	padding_y => 2,
1539	can_events => 0,	1630	can_events => 0,
1540	%arg	1631	%arg
1541	);	1632	);
1542		1633
1543	if (exists $self->{template}) {	1634	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1635	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1636	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1637	$self->{template} = $layout;
1547	}	1638	}
1548		1639
1549	if (exists $self->{markup}) {	1640	if (exists $self->{markup}) {
…		…
1553	}	1644	}
1554		1645
1555	$self	1646	$self
1556	}	1647	}
1557		1648
1558	sub escape($) {
1559	local $_ = $_[0];
1560
1561	s/&/&amp;/g;
1562	s/>/&gt;/g;
1563	s/</&lt;/g;
1564
1565	$_
1566	}
1567
1568	sub update {	1649	sub update {
1569	my ($self) = @_;	1650	my ($self) = @_;
1570		1651
1571	delete $self->{texture};	1652	delete $self->{texture};
1572	$self->SUPER::update;	1653	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1664	my ($self, $text) = @_;
1584		1665
1585	return if $self->{text} eq "T$text";	1666	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1667	$self->{text} = "T$text";
1587		1668
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1669	$self->{layout}->set_text ($text);
1590		1670
1591	delete $self->{size_req};	1671	delete $self->{size_req};
1592	$self->realloc;	1672	$self->realloc;
1593	$self->update;	1673	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1679	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1680	$self->{text} = "M$markup";
1601		1681
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1682	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1683
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1684	$self->{layout}->set_markup ($markup);
1606		1685
1607	delete $self->{size_req};	1686	delete $self->{size_req};
1608	$self->realloc;	1687	$self->realloc;
1609	$self->update;	1688	$self->update;
…		…
1621		1700
1622	my ($w, $h) = $self->{layout}->size;	1701	my ($w, $h) = $self->{layout}->size;
1623		1702
1624	if (exists $self->{template}) {	1703	if (exists $self->{template}) {
1625	$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);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1706	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		1707
1628	my ($w2, $h2) = $self->{template}->size;	1708	my ($w2, $h2) = $self->{template}->size;
1629		1709
1630	$w = List::Util::max $w, $w2;	1710	$w = List::Util::max $w, $w2;
…		…
1664		1744
1665	sub reconfigure {	1745	sub reconfigure {
1666	my ($self) = @_;	1746	my ($self) = @_;
1667		1747
1668	delete $self->{size_req};	1748	delete $self->{size_req};
		1749	delete $self->{texture};
1669		1750
1670	$self->SUPER::reconfigure;	1751	$self->SUPER::reconfigure;
1671	}	1752	}
1672		1753
1673	sub _draw {	1754	sub _draw {
1674	my ($self) = @_;	1755	my ($self) = @_;
1675		1756
1676	$self->SUPER::_draw; # draw background, if applicable	1757	$self->SUPER::_draw; # draw background, if applicable
1677		1758
1678	my $tex = $self->{texture} ||= do {	1759	my $size = $self->{texture} ||= do {
1679	$self->{layout}->set_foreground (@{$self->{fg}});	1760	$self->{layout}->set_foreground (@{$self->{fg}});
1680	$self->{layout}->set_font ($self->{font}) if $self->{font};	1761	$self->{layout}->set_font ($self->{font}) if $self->{font};
1681	$self->{layout}->set_width ($self->{w});	1762	$self->{layout}->set_width ($self->{w});
1682	$self->{layout}->set_ellipsise ($self->{ellipsise});	1763	$self->{layout}->set_ellipsise ($self->{ellipsise});
1683	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1764	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1765	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685		1766
1686	new_from_layout CFClient::Texture $self->{layout}	1767	[$self->{layout}->size]
1687	};	1768	};
1688		1769
1689	unless (exists $self->{ox}) {	1770	unless (exists $self->{ox}) {
1690	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1771	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1691	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1772	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1692	: ($self->{w} - $tex->{w}) * 0.5);	1773	: ($self->{w} - $size->[0]) * 0.5);
1693		1774
1694	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1775	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1695	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1776	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1696	: ($self->{h} - $tex->{h}) * 0.5);	1777	: ($self->{h} - $size->[1]) * 0.5);
1697	};	1778	};
1698		1779
1699	glEnable GL_TEXTURE_2D;
1700
1701	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1780	my $w = List::Util::min $self->{w} + 4, $size->[0];
1702	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1781	my $h = List::Util::min $self->{h} + 2, $size->[1];
1703		1782
1704	if ($tex->{format} == GL_ALPHA) {	1783	$self->{layout}->render ($self->{ox}, $self->{oy});
1705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706	glColor @{$self->{fg}};
1707	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708	} else {
1709	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1710	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711	}
1712
1713	glDisable GL_TEXTURE_2D;
1714	}	1784	}
1715		1785
1716	#############################################################################	1786	#############################################################################
1717		1787
1718	package CFClient::UI::EntryBase;	1788	package CFPlus::UI::EntryBase;
1719		1789
1720	our @ISA = CFClient::UI::Label::;	1790	our @ISA = CFPlus::UI::Label::;
1721		1791
1722	use CFClient::OpenGL;	1792	use CFPlus::OpenGL;
1723		1793
1724	sub new {	1794	sub new {
1725	my $class = shift;	1795	my $class = shift;
1726		1796
1727	$class->SUPER::new (	1797	$class->SUPER::new (
…		…
1789		1859
1790	if ($uni == 8) {	1860	if ($uni == 8) {
1791	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1861	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1792	} elsif ($uni == 127) {	1862	} elsif ($uni == 127) {
1793	substr $text, $self->{cursor}, 1, "";	1863	substr $text, $self->{cursor}, 1, "";
1794	} elsif ($sym == CFClient::SDLK_LEFT) {	1864	} elsif ($sym == CFPlus::SDLK_LEFT) {
1795	--$self->{cursor} if $self->{cursor};	1865	--$self->{cursor} if $self->{cursor};
1796	} elsif ($sym == CFClient::SDLK_RIGHT) {	1866	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1797	++$self->{cursor} if $self->{cursor} < length $self->{text};	1867	++$self->{cursor} if $self->{cursor} < length $self->{text};
1798	} elsif ($sym == CFClient::SDLK_HOME) {	1868	} elsif ($sym == CFPlus::SDLK_HOME) {
1799	$self->{cursor} = 0;	1869	$self->{cursor} = 0;
1800	} elsif ($sym == CFClient::SDLK_END) {	1870	} elsif ($sym == CFPlus::SDLK_END) {
1801	$self->{cursor} = length $text;	1871	$self->{cursor} = length $text;
1802	} elsif ($uni == 27) {	1872	} elsif ($uni == 27) {
1803	$self->emit ('escape');	1873	$self->emit ('escape');
1804	} elsif ($uni) {	1874	} elsif ($uni) {
1805	substr $text, $self->{cursor}++, 0, chr $uni;	1875	substr $text, $self->{cursor}++, 0, chr $uni;
…		…
1829		1899
1830	my $idx = $self->{layout}->xy_to_index ($x, $y);	1900	my $idx = $self->{layout}->xy_to_index ($x, $y);
1831		1901
1832	# byte-index to char-index	1902	# byte-index to char-index
1833	my $text = $self->{text};	1903	my $text = $self->{text};
1834	utf8::encode $text;	1904	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1835	$self->{cursor} = length substr $text, 0, $idx;	1905	$self->{cursor} = length $text;
1836		1906
1837	$self->_set_text ($self->{text});	1907	$self->_set_text ($self->{text});
1838	$self->update;	1908	$self->update;
1839		1909
1840	1	1910	1
…		…
1887	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};
1888	glEnd;	1958	glEnd;
1889	}	1959	}
1890	}	1960	}
1891		1961
1892	package CFClient::UI::Entry;	1962	package CFPlus::UI::Entry;
1893		1963
1894	our @ISA = CFClient::UI::EntryBase::;	1964	our @ISA = CFPlus::UI::EntryBase::;
1895		1965
1896	use CFClient::OpenGL;	1966	use CFPlus::OpenGL;
1897		1967
1898	sub invoke_key_down {	1968	sub invoke_key_down {
1899	my ($self, $ev) = @_;	1969	my ($self, $ev) = @_;
1900		1970
1901	my $sym = $ev->{sym};	1971	my $sym = $ev->{sym};
…		…
1907	$self->{history_pointer} = -1;	1977	$self->{history_pointer} = -1;
1908	$self->{history_saveback} = '';	1978	$self->{history_saveback} = '';
1909	$self->emit (activate => $txt);	1979	$self->emit (activate => $txt);
1910	$self->update;	1980	$self->update;
1911		1981
1912	} elsif ($sym == CFClient::SDLK_UP) {	1982	} elsif ($sym == CFPlus::SDLK_UP) {
1913	if ($self->{history_pointer} < 0) {	1983	if ($self->{history_pointer} < 0) {
1914	$self->{history_saveback} = $self->get_text;	1984	$self->{history_saveback} = $self->get_text;
1915	}	1985	}
1916	if (@{$self->{history} || []} > 0) {	1986	if (@{$self->{history} || []} > 0) {
1917	$self->{history_pointer}++;	1987	$self->{history_pointer}++;
…		…
1919	$self->{history_pointer} = @{$self->{history} || []} - 1;	1989	$self->{history_pointer} = @{$self->{history} || []} - 1;
1920	}	1990	}
1921	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1991	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1922	}	1992	}
1923		1993
1924	} elsif ($sym == CFClient::SDLK_DOWN) {	1994	} elsif ($sym == CFPlus::SDLK_DOWN) {
1925	$self->{history_pointer}--;	1995	$self->{history_pointer}--;
1926	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1996	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1927		1997
1928	if ($self->{history_pointer} >= 0) {	1998	if ($self->{history_pointer} >= 0) {
1929	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1999	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1938	1	2008	1
1939	}	2009	}
1940		2010
1941	#############################################################################	2011	#############################################################################
1942		2012
1943	package CFClient::UI::Button;	2013	package CFPlus::UI::Button;
1944		2014
1945	our @ISA = CFClient::UI::Label::;	2015	our @ISA = CFPlus::UI::Label::;
1946		2016
1947	use CFClient::OpenGL;	2017	use CFPlus::OpenGL;
1948		2018
1949	my @tex =	2019	my @tex =
1950	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2020	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951	qw(b1_button_active.png);	2021	qw(b1_button_active.png);
1952		2022
1953	sub new {	2023	sub new {
1954	my $class = shift;	2024	my $class = shift;
1955		2025
…		…
1992	$self->SUPER::_draw;	2062	$self->SUPER::_draw;
1993	}	2063	}
1994		2064
1995	#############################################################################	2065	#############################################################################
1996		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
1997	package CFClient::UI::ImageButton;	2216	package CFPlus::UI::ImageButton;
1998		2217
1999	our @ISA = CFClient::UI::Image::;	2218	our @ISA = CFPlus::UI::Image::;
2000		2219
2001	use CFClient::OpenGL;	2220	use CFPlus::OpenGL;
2002		2221
2003	my %textures;	2222	my %textures;
2004		2223
2005	sub new {	2224	sub new {
2006	my $class = shift;	2225	my $class = shift;
…		…
2028	1	2247	1
2029	}	2248	}
2030		2249
2031	#############################################################################	2250	#############################################################################
2032		2251
2033	package CFClient::UI::CheckBox;
2034
2035	our @ISA = CFClient::UI::DrawBG::;
2036
2037	my @tex =
2038	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2039	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2040
2041	use CFClient::OpenGL;
2042
2043	sub new {
2044	my $class = shift;
2045
2046	$class->SUPER::new (
2047	padding_x => 2,
2048	padding_y => 2,
2049	fg => [1, 1, 1],
2050	active_fg => [1, 1, 0],
2051	bg => [0, 0, 0, 0.2],
2052	active_bg => [1, 1, 1, 0.5],
2053	state => 0,
2054	can_hover => 1,
2055	@_
2056	)
2057	}
2058
2059	sub size_request {
2060	my ($self) = @_;
2061
2062	(6) x 2
2063	}
2064
2065	sub invoke_button_down {
2066	my ($self, $ev, $x, $y) = @_;
2067
2068	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2069	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2070	$self->{state} = !$self->{state};
2071	$self->emit (changed => $self->{state});
2072	} else {
2073	return 0
2074	}
2075
2076	1
2077	}
2078
2079	sub _draw {
2080	my ($self) = @_;
2081
2082	$self->SUPER::_draw;
2083
2084	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2085
2086	my ($w, $h) = @$self{qw(w h)};
2087
2088	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2089
2090	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2091
2092	my $tex = $self->{state} ? $tex[1] : $tex[0];
2093
2094	glEnable GL_TEXTURE_2D;
2095	$tex->draw_quad_alpha (0, 0, $s, $s);
2096	glDisable GL_TEXTURE_2D;
2097	}
2098
2099	#############################################################################
2100
2101	package CFClient::UI::Image;	2252	package CFPlus::UI::VGauge;
2102		2253
2103	our @ISA = CFClient::UI::Base::;	2254	our @ISA = CFPlus::UI::Base::;
2104
2105	use CFClient::OpenGL;
2106
2107	our %texture_cache;
2108
2109	sub new {
2110	my $class = shift;
2111
2112	my $self = $class->SUPER::new (
2113	can_events => 0,
2114	@_,
2115	);
2116
2117	$self->{path}
2118	or Carp::croak "required attribute 'path' not set";
2119
2120	$self->{tex} = $texture_cache{$self->{path}} ||=
2121	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2122
2123	Scalar::Util::weaken $texture_cache{$self->{path}};
2124
2125	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2126
2127	$self
2128	}
2129
2130	sub size_request {
2131	my ($self) = @_;
2132
2133	($self->{tex}{w}, $self->{tex}{h})
2134	}
2135
2136	sub _draw {
2137	my ($self) = @_;
2138
2139	my $tex = $self->{tex};
2140
2141	my ($w, $h) = ($self->{w}, $self->{h});
2142
2143	if ($self->{rot90}) {
2144	glRotate 90, 0, 0, 1;
2145	glTranslate 0, -$self->{w}, 0;
2146
2147	($w, $h) = ($h, $w);
2148	}
2149
2150	glEnable GL_TEXTURE_2D;
2151	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2152
2153	$tex->draw_quad_alpha (0, 0, $w, $h);
2154
2155	glDisable GL_TEXTURE_2D;
2156	}
2157
2158	#############################################################################
2159
2160	package CFClient::UI::VGauge;
2161
2162	our @ISA = CFClient::UI::Base::;
2163		2255
2164	use List::Util qw(min max);	2256	use List::Util qw(min max);
2165		2257
2166	use CFClient::OpenGL;	2258	use CFPlus::OpenGL;
2167		2259
2168	my %tex = (	2260	my %tex = (
2169	food => [	2261	food => [
2170	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2262	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2263	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2172	],	2264	],
2173	grace => [	2265	grace => [
2174	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2266	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2175	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/
2176	],	2268	],
2177	hp => [	2269	hp => [
2178	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2270	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2271	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2180	],	2272	],
2181	mana => [	2273	mana => [
2182	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2274	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183	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/
2184	],	2276	],
2185	);	2277	);
2186		2278
2187	# eg. VGauge->new (gauge => 'food'), default gauge: food	2279	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2247	my $ycut1 = max 0, min 1, $ycut;	2339	my $ycut1 = max 0, min 1, $ycut;
2248	my $ycut2 = max 0, min 1, $ycut - 1;	2340	my $ycut2 = max 0, min 1, $ycut - 1;
2249		2341
2250	my $h1 = $self->{h} * (1 - $ycut1);	2342	my $h1 = $self->{h} * (1 - $ycut1);
2251	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);
2252		2347
2253	glEnable GL_BLEND;	2348	glEnable GL_BLEND;
2254	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2349	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2350	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256	glEnable GL_TEXTURE_2D;	2351	glEnable GL_TEXTURE_2D;
…		…
2275		2370
2276	if ($t3) {	2371	if ($t3) {
2277	glBindTexture GL_TEXTURE_2D, $t3->{name};	2372	glBindTexture GL_TEXTURE_2D, $t3->{name};
2278	glBegin GL_QUADS;	2373	glBegin GL_QUADS;
2279	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2374	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2375	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2376	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2377	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283	glEnd;	2378	glEnd;
2284	}	2379	}
2285		2380
2286	glDisable GL_BLEND;	2381	glDisable GL_BLEND;
2287	glDisable GL_TEXTURE_2D;	2382	glDisable GL_TEXTURE_2D;
2288	}	2383	}
2289		2384
2290	#############################################################################	2385	#############################################################################
2291		2386
2292	package CFClient::UI::Gauge;	2387	package CFPlus::UI::Gauge;
2293		2388
2294	our @ISA = CFClient::UI::VBox::;	2389	our @ISA = CFPlus::UI::VBox::;
2295		2390
2296	sub new {	2391	sub new {
2297	my ($class, %arg) = @_;	2392	my ($class, %arg) = @_;
2298		2393
2299	my $self = $class->SUPER::new (	2394	my $self = $class->SUPER::new (
…		…
2301	can_hover => 1,	2396	can_hover => 1,
2302	can_events => 1,	2397	can_events => 1,
2303	%arg,	2398	%arg,
2304	);	2399	);
2305		2400
2306	$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");
2307	$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);
2308	$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");
2309		2404
2310	$self	2405	$self
2311	}	2406	}
2312		2407
2313	sub set_fontsize {	2408	sub set_fontsize {
…		…
2334	$self->{value}->set_text ($val);	2429	$self->{value}->set_text ($val);
2335	}	2430	}
2336		2431
2337	#############################################################################	2432	#############################################################################
2338		2433
2339	package CFClient::UI::Slider;	2434	package CFPlus::UI::Slider;
2340		2435
2341	use strict;	2436	use strict;
2342		2437
2343	use CFClient::OpenGL;	2438	use CFPlus::OpenGL;
2344		2439
2345	our @ISA = CFClient::UI::DrawBG::;	2440	our @ISA = CFPlus::UI::DrawBG::;
2346		2441
2347	my @tex =	2442	my @tex =
2348	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2443	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2349	qw(s1_slider.png s1_slider_bg.png);	2444	qw(s1_slider.png s1_slider_bg.png);
2350		2445
2351	sub new {	2446	sub new {
2352	my $class = shift;	2447	my $class = shift;
2353		2448
…		…
2442	}	2537	}
2443		2538
2444	1	2539	1
2445	}	2540	}
2446		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
2447	sub update {	2552	sub update {
2448	my ($self) = @_;	2553	my ($self) = @_;
2449		2554
2450	delete $self->{knob_w};	2555	delete $self->{knob_w};
2451	$self->SUPER::update;	2556	$self->SUPER::update;
…		…
2498	glDisable GL_TEXTURE_2D;	2603	glDisable GL_TEXTURE_2D;
2499	}	2604	}
2500		2605
2501	#############################################################################	2606	#############################################################################
2502		2607
2503	package CFClient::UI::ValSlider;	2608	package CFPlus::UI::ValSlider;
2504		2609
2505	our @ISA = CFClient::UI::HBox::;	2610	our @ISA = CFPlus::UI::HBox::;
2506		2611
2507	sub new {	2612	sub new {
2508	my ($class, %arg) = @_;	2613	my ($class, %arg) = @_;
2509		2614
2510	my $range = delete $arg{range};	2615	my $range = delete $arg{range};
2511		2616
2512	my $self = $class->SUPER::new (	2617	my $self = $class->SUPER::new (
2513	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2618	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2514	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2619	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2515	to_value => sub { shift },	2620	to_value => sub { shift },
2516	from_value => sub { shift },	2621	from_value => sub { shift },
2517	%arg,	2622	%arg,
2518	);	2623	);
2519		2624
…		…
2539	sub set_range { shift->{slider}->set_range (@_) }	2644	sub set_range { shift->{slider}->set_range (@_) }
2540	sub set_value { shift->{slider}->set_value (@_) }	2645	sub set_value { shift->{slider}->set_value (@_) }
2541		2646
2542	#############################################################################	2647	#############################################################################
2543		2648
2544	package CFClient::UI::TextScroller;	2649	package CFPlus::UI::TextScroller;
2545		2650
2546	our @ISA = CFClient::UI::HBox::;	2651	our @ISA = CFPlus::UI::HBox::;
2547		2652
2548	use CFClient::OpenGL;	2653	use CFPlus::OpenGL;
2549		2654
2550	sub new {	2655	sub new {
2551	my $class = shift;	2656	my $class = shift;
2552		2657
2553	my $self = $class->SUPER::new (	2658	my $self = $class->SUPER::new (
2554	fontsize => 1,	2659	fontsize => 1,
2555	can_events => 0,	2660	can_events => 1,
2556	indent => 0,	2661	indent => 0,
2557	#font => default_font	2662	#font => default_font
2558	@_,	2663	@_,
2559		2664
2560	layout => (new CFClient::Layout 1),	2665	layout => (new CFPlus::Layout),
2561	par => [],	2666	par => [],
2562	height => 0,	2667	height => 0,
2563	children => [	2668	children => [
2564	(new CFClient::UI::Empty expand => 1),	2669	(new CFPlus::UI::Empty expand => 1),
2565	(new CFClient::UI::Slider vertical => 1),	2670	(new CFPlus::UI::Slider vertical => 1),
2566	],	2671	],
2567	);	2672	);
2568		2673
2569	$self->{children}[1]->connect (changed => sub { $self->update });	2674	$self->{children}[1]->connect (changed => sub { $self->update });
2570		2675
…		…
2600		2705
2601	$self->reflow;	2706	$self->reflow;
2602		2707
2603	local $self->{children} = [$empty, $slider];	2708	local $self->{children} = [$empty, $slider];
2604	$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
2605	}	2720	}
2606		2721
2607	sub get_layout {	2722	sub get_layout {
2608	my ($self, $para) = @_;	2723	my ($self, $para) = @_;
2609		2724
…		…
2649	$self->{height} = 0;	2764	$self->{height} = 0;
2650	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2765	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2651	}	2766	}
2652		2767
2653	sub add_paragraph {	2768	sub add_paragraph {
2654	my ($self, $color, $para, $indent) = @_;	2769	my $self = shift;
2655		2770
2656	my ($text, @w) = ref $para ? @$para : $para;	2771	for my $para (@_) {
2657
2658	$para = {	2772	$para = {
		2773	fg => [1, 1, 1, 1],
		2774	indent => 0,
		2775	markup => "",
		2776	widget => [],
		2777	ref $para ? %$para : (markup => $para),
2659	w => 1e10,	2778	w => 1e10,
2660	wrapped => 1,	2779	wrapped => 1,
2661	fg => $color,
2662	indent => $indent,
2663	markup => $text,
2664	widget => \@w,
2665	};	2780	};
2666		2781
2667	$self->add (@w) if @w;	2782	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2668	push @{$self->{par}}, $para;	2783	push @{$self->{par}}, $para;
		2784	}
2669		2785
2670	$self->{need_reflow}++;	2786	$self->{need_reflow}++;
2671	$self->update;	2787	$self->update;
2672	}	2788	}
2673		2789
…		…
2715		2831
2716	if (delete $self->{scroll_to_bottom}) {	2832	if (delete $self->{scroll_to_bottom}) {
2717	$self->{children}[1]->set_value (1e10);	2833	$self->{children}[1]->set_value (1e10);
2718	}	2834	}
2719		2835
2720	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2836	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2721	glClearColor 0, 0, 0, 0;	2837	glClearColor 0, 0, 0, 0;
2722	glClear GL_COLOR_BUFFER_BIT;	2838	glClear GL_COLOR_BUFFER_BIT;
2723		2839
2724	my $top = int $self->{children}[1]{range}[0];	2840	my $top = int $self->{children}[1]{range}[0];
2725		2841
2726	my $y0 = $top;	2842	my $y0 = $top;
2727	my $y1 = $top + $H;	2843	my $y1 = $top + $H;
2728		2844
2729	my $y = 0;	2845	my $y = 0;
2730		2846
2731	glEnable GL_BLEND;
2732	#TODO# not correct in windows where rgba is forced off
2733	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2734
2735	for my $para (@{$self->{par}}) {	2847	for my $para (@{$self->{par}}) {
2736	my $h = $para->{h};	2848	my $h = $para->{h};
2737		2849
2738	if ($y0 < $y + $h && $y < $y1) {	2850	if ($y0 < $y + $h && $y < $y1) {
2739		2851
2740	my $layout = $self->get_layout ($para);	2852	my $layout = $self->get_layout ($para);
2741		2853
2742	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744	glRasterPos $para->{indent}, $y - $y0;	2854	$layout->render ($para->{indent}, $y - $y0);
2745	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746		2855
2747	if (my @w = @{ $para->{widget} }) {	2856	if (my @w = @{ $para->{widget} }) {
2748	my @s = $layout->get_shapes;	2857	my @s = $layout->get_shapes;
2749		2858
2750	glDisable GL_BLEND;
2751	for (@w) {	2859	for (@w) {
2752	my ($dx, $dy) = splice @s, 0, 2, ();	2860	my ($dx, $dy) = splice @s, 0, 2, ();
2753		2861
2754	$_->{x} = $dx + $para->{indent};	2862	$_->{x} = $dx + $para->{indent};
2755	$_->{y} = $dy + $y - $y0;	2863	$_->{y} = $dy + $y - $y0;
2756		2864
2757	$_->draw;	2865	$_->draw;
2758	}	2866	}
2759	glEnable GL_BLEND;
2760	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761	}	2867	}
2762	}	2868	}
2763		2869
2764	$y += $h;	2870	$y += $h;
2765	}	2871	}
2766
2767	glDisable GL_BLEND;
2768	};	2872	};
2769	});	2873	});
2770	}	2874	}
2771		2875
2772	sub reconfigure {	2876	sub reconfigure {
…		…
2790	$self->{children}[1]->draw;	2894	$self->{children}[1]->draw;
2791	}	2895	}
2792		2896
2793	#############################################################################	2897	#############################################################################
2794		2898
2795	package CFClient::UI::Animator;	2899	package CFPlus::UI::Animator;
2796		2900
2797	use CFClient::OpenGL;	2901	use CFPlus::OpenGL;
2798		2902
2799	our @ISA = CFClient::UI::Bin::;	2903	our @ISA = CFPlus::UI::Bin::;
2800		2904
2801	sub moveto {	2905	sub moveto {
2802	my ($self, $x, $y) = @_;	2906	my ($self, $x, $y) = @_;
2803		2907
2804	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2908	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2832	glPopMatrix;	2936	glPopMatrix;
2833	}	2937	}
2834		2938
2835	#############################################################################	2939	#############################################################################
2836		2940
2837	package CFClient::UI::Flopper;	2941	package CFPlus::UI::Flopper;
2838		2942
2839	our @ISA = CFClient::UI::Button::;	2943	our @ISA = CFPlus::UI::Button::;
2840		2944
2841	sub new {	2945	sub new {
2842	my $class = shift;	2946	my $class = shift;
2843		2947
2844	my $self = $class->SUPER::new (	2948	my $self = $class->SUPER::new (
…		…
2856	$self->{other}->toggle_visibility;	2960	$self->{other}->toggle_visibility;
2857	}	2961	}
2858		2962
2859	#############################################################################	2963	#############################################################################
2860		2964
2861	package CFClient::UI::Tooltip;	2965	package CFPlus::UI::Tooltip;
2862		2966
2863	our @ISA = CFClient::UI::Bin::;	2967	our @ISA = CFPlus::UI::Bin::;
2864		2968
2865	use CFClient::OpenGL;	2969	use CFPlus::OpenGL;
2866		2970
2867	sub new {	2971	sub new {
2868	my $class = shift;	2972	my $class = shift;
2869		2973
2870	$class->SUPER::new (	2974	$class->SUPER::new (
…		…
2873	)	2977	)
2874	}	2978	}
2875		2979
2876	sub set_tooltip_from {	2980	sub set_tooltip_from {
2877	my ($self, $widget) = @_;	2981	my ($self, $widget) = @_;
		2982
		2983	$widget->{tooltip} = CFPlus::Pod::as_label CFPlus::Pod::section tooltip => $1
		2984	if $widget->{tooltip} =~ /^#(.*)$/;
2878		2985
2879	my $tooltip = $widget->{tooltip};	2986	my $tooltip = $widget->{tooltip};
2880		2987
2881	if ($ENV{CFPLUS_DEBUG} & 2) {	2988	if ($ENV{CFPLUS_DEBUG} & 2) {
2882	$tooltip .= "\n\n" . (ref $widget) . "\n"	2989	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2886	}	2993	}
2887		2994
2888	$tooltip =~ s/^\n+//;	2995	$tooltip =~ s/^\n+//;
2889	$tooltip =~ s/\n+$//;	2996	$tooltip =~ s/\n+$//;
2890		2997
2891	$self->add (new CFClient::UI::Label	2998	$self->add (new CFPlus::UI::Label
2892	markup => $tooltip,	2999	markup => $tooltip,
2893	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3000	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2894	fontsize => 0.8,	3001	fontsize => 0.8,
2895	fg => [0, 0, 0, 1],	3002	fg => [0, 0, 0, 1],
2896	ellipsise => 0,	3003	ellipsise => 0,
…		…
2919		3026
2920	$self->{root}->on_post_alloc ("move_$self" => sub {	3027	$self->{root}->on_post_alloc ("move_$self" => sub {
2921	my $widget = $self->{owner}	3028	my $widget = $self->{owner}
2922	or return;	3029	or return;
2923		3030
		3031	if ($widget->{visible}) {
2924	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3032	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2925		3033
2926	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3034	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2927	if $x + $self->{w} > $self->{root}{w};	3035	if $x + $self->{w} > $self->{root}{w};
2928		3036
2929	$self->move_abs ($x, $y);	3037	$self->move_abs ($x, $y);
		3038	} else {
		3039	$self->hide;
		3040	}
2930	});	3041	});
2931	}	3042	}
2932		3043
2933	sub _draw {	3044	sub _draw {
2934	my ($self) = @_;	3045	my ($self) = @_;
…		…
2958	$self->SUPER::_draw;	3069	$self->SUPER::_draw;
2959	}	3070	}
2960		3071
2961	#############################################################################	3072	#############################################################################
2962		3073
2963	package CFClient::UI::Face;	3074	package CFPlus::UI::Face;
2964		3075
2965	our @ISA = CFClient::UI::Base::;	3076	our @ISA = CFPlus::UI::DrawBG::;
2966		3077
2967	use CFClient::OpenGL;	3078	use CFPlus::OpenGL;
2968		3079
2969	sub new {	3080	sub new {
2970	my $class = shift;	3081	my $class = shift;
2971		3082
2972	my $self = $class->SUPER::new (	3083	my $self = $class->SUPER::new (
…		…
3007	sub _draw {	3118	sub _draw {
3008	my ($self) = @_;	3119	my ($self) = @_;
3009		3120
3010	return unless $::CONN;	3121	return unless $::CONN;
3011		3122
		3123	$self->SUPER::_draw;
		3124
3012	my $face;	3125	my $face;
3013		3126
3014	if ($self->{frame}) {	3127	if ($self->{frame}) {
3015	my $anim = $::CONN->{anim}[$self->{anim}];	3128	my $anim = $::CONN->{anim}[$self->{anim}];
3016		3129
…		…
3038	$self->SUPER::destroy;	3151	$self->SUPER::destroy;
3039	}	3152	}
3040		3153
3041	#############################################################################	3154	#############################################################################
3042		3155
3043	package CFClient::UI::Buttonbar;	3156	package CFPlus::UI::Buttonbar;
3044		3157
3045	our @ISA = CFClient::UI::HBox::;	3158	our @ISA = CFPlus::UI::HBox::;
3046		3159
3047	# TODO: should actualyl wrap buttons and other goodies.	3160	# TODO: should actualyl wrap buttons and other goodies.
3048		3161
3049	#############################################################################	3162	#############################################################################
3050		3163
3051	package CFClient::UI::Menu;	3164	package CFPlus::UI::Menu;
3052		3165
3053	our @ISA = CFClient::UI::FancyFrame::;	3166	our @ISA = CFPlus::UI::FancyFrame::;
3054		3167
3055	use CFClient::OpenGL;	3168	use CFPlus::OpenGL;
3056		3169
3057	sub new {	3170	sub new {
3058	my $class = shift;	3171	my $class = shift;
3059		3172
3060	my $self = $class->SUPER::new (	3173	my $self = $class->SUPER::new (
3061	items => [],	3174	items => [],
3062	z => 100,	3175	z => 100,
3063	@_,	3176	@_,
3064	);	3177	);
3065		3178
3066	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3179	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3067		3180
3068	for my $item (@{ $self->{items} }) {	3181	for my $item (@{ $self->{items} }) {
3069	my ($widget, $cb, $tooltip) = @$item;	3182	my ($widget, $cb, $tooltip) = @$item;
3070		3183
3071	# handle various types of items, only text for now	3184	# handle various types of items, only text for now
3072	if (!ref $widget) {	3185	if (!ref $widget) {
		3186	if ($widget =~ /\t/) {
		3187	my ($left, $right) = split /\t/, $widget, 2;
		3188
3073	$widget = new CFClient::UI::Label	3189	$widget = new CFPlus::UI::HBox
3074	can_hover => 1,	3190	can_hover => 1,
3075	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,
3076	markup => $widget,	3203	markup => $widget,
3077	tooltip => $tooltip	3204	tooltip => $tooltip;
		3205	}
3078	}	3206	}
3079		3207
3080	$self->{item}{$widget} = $item;	3208	$self->{item}{$widget} = $item;
3081		3209
3082	$self->{vbox}->add ($widget);	3210	$self->{vbox}->add ($widget);
…		…
3125	1	3253	1
3126	}	3254	}
3127		3255
3128	#############################################################################	3256	#############################################################################
3129		3257
3130	package CFClient::UI::Multiplexer;	3258	package CFPlus::UI::Multiplexer;
3131		3259
3132	our @ISA = CFClient::UI::Container::;	3260	our @ISA = CFPlus::UI::Container::;
3133		3261
3134	sub new {	3262	sub new {
3135	my $class = shift;	3263	my $class = shift;
3136		3264
3137	my $self = $class->SUPER::new (	3265	my $self = $class->SUPER::new (
…		…
3151		3279
3152	$self->{current} = $self->{children}[0]	3280	$self->{current} = $self->{children}[0]
3153	if @{ $self->{children} };	3281	if @{ $self->{children} };
3154	}	3282	}
3155		3283
		3284	sub get_current_page {
		3285	my ($self) = @_;
		3286
		3287	$self->{current}
		3288	}
		3289
3156	sub set_current_page {	3290	sub set_current_page {
3157	my ($self, $page_or_widget) = @_;	3291	my ($self, $page_or_widget) = @_;
3158		3292
3159	my $widget = ref $page_or_widget	3293	my $widget = ref $page_or_widget
3160	? $page_or_widget	3294	? $page_or_widget
…		…
3192	$self->{current}->draw;	3326	$self->{current}->draw;
3193	}	3327	}
3194		3328
3195	#############################################################################	3329	#############################################################################
3196		3330
3197	package CFClient::UI::Notebook;	3331	package CFPlus::UI::Notebook;
3198		3332
3199	our @ISA = CFClient::UI::VBox::;	3333	our @ISA = CFPlus::UI::VBox::;
3200		3334
3201	sub new {	3335	sub new {
3202	my $class = shift;	3336	my $class = shift;
3203		3337
3204	my $self = $class->SUPER::new (	3338	my $self = $class->SUPER::new (
3205	buttonbar => (new CFClient::UI::Buttonbar),	3339	buttonbar => (new CFPlus::UI::Buttonbar),
3206	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3340	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3207	# filter => # will be put between multiplexer and $self	3341	# filter => # will be put between multiplexer and $self
3208	@_,	3342	@_,
3209	);	3343	);
3210		3344
3211	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3345	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3217	sub add {	3351	sub add {
3218	my ($self, $title, $widget, $tooltip) = @_;	3352	my ($self, $title, $widget, $tooltip) = @_;
3219		3353
3220	Scalar::Util::weaken $self;	3354	Scalar::Util::weaken $self;
3221		3355
3222	$self->{buttonbar}->add (new CFClient::UI::Button	3356	$self->{buttonbar}->add (new CFPlus::UI::Button
3223	markup => $title,	3357	markup => $title,
3224	tooltip => $tooltip,	3358	tooltip => $tooltip,
3225	on_activate => sub { $self->set_current_page ($widget) },	3359	on_activate => sub { $self->set_current_page ($widget) },
3226	);	3360	);
3227		3361
3228	$self->{multiplexer}->add ($widget);	3362	$self->{multiplexer}->add ($widget);
3229	}	3363	}
3230		3364
		3365	sub get_current_page {
		3366	my ($self) = @_;
		3367
		3368	$self->{multiplexer}->get_current_page
		3369	}
		3370
3231	sub set_current_page {	3371	sub set_current_page {
3232	my ($self, $page) = @_;	3372	my ($self, $page) = @_;
3233		3373
3234	$self->{multiplexer}->set_current_page ($page);	3374	$self->{multiplexer}->set_current_page ($page);
3235	$self->emit (page_changed => $self->{multiplexer}{current});	3375	$self->emit (page_changed => $self->{multiplexer}{current});
3236	}	3376	}
3237		3377
3238	#############################################################################	3378	#############################################################################
3239		3379
3240	package CFClient::UI::Combobox;	3380	package CFPlus::UI::Selector;
3241		3381
3242	use utf8;	3382	use utf8;
3243		3383
3244	our @ISA = CFClient::UI::Button::;	3384	our @ISA = CFPlus::UI::Button::;
3245		3385
3246	sub new {	3386	sub new {
3247	my $class = shift;	3387	my $class = shift;
3248		3388
3249	my $self = $class->SUPER::new (	3389	my $self = $class->SUPER::new (
…		…
3266	my ($value, $title, $tooltip) = @$_;	3406	my ($value, $title, $tooltip) = @$_;
3267		3407
3268	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3408	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269	}	3409	}
3270		3410
3271	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3411	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272	}	3412	}
3273		3413
3274	sub _set_value {	3414	sub _set_value {
3275	my ($self, $value) = @_;	3415	my ($self, $value) = @_;
3276		3416
…		…
3291	$self->emit (changed => $value);	3431	$self->emit (changed => $value);
3292	}	3432	}
3293		3433
3294	#############################################################################	3434	#############################################################################
3295		3435
3296	package CFClient::UI::Statusbox;	3436	package CFPlus::UI::Statusbox;
3297		3437
3298	our @ISA = CFClient::UI::VBox::;	3438	our @ISA = CFPlus::UI::VBox::;
3299		3439
3300	sub new {	3440	sub new {
3301	my $class = shift;	3441	my $class = shift;
3302		3442
3303	my $self = $class->SUPER::new (	3443	my $self = $class->SUPER::new (
…		…
3315	sub reorder {	3455	sub reorder {
3316	my ($self) = @_;	3456	my ($self) = @_;
3317	my $NOW = Time::HiRes::time;	3457	my $NOW = Time::HiRes::time;
3318		3458
3319	# freeze display when hovering over any label	3459	# freeze display when hovering over any label
3320	return if $CFClient::UI::TOOLTIP->{owner}	3460	return if $CFPlus::UI::TOOLTIP->{owner}
3321	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3461	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3322	values %{ $self->{item} };	3462	values %{ $self->{item} };
3323		3463
3324	while (my ($k, $v) = each %{ $self->{item} }) {	3464	while (my ($k, $v) = each %{ $self->{item} }) {
3325	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3465	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3326	}	3466	}
…		…
3347	for ($short) {	3487	for ($short) {
3348	s/^\s+//;	3488	s/^\s+//;
3349	s/\s+/ /g;	3489	s/\s+/ /g;
3350	}	3490	}
3351		3491
3352	new CFClient::UI::Label	3492	new CFPlus::UI::Label
3353	markup => $short,	3493	markup => $short,
3354	tooltip => $item->{tooltip},	3494	tooltip => $item->{tooltip},
3355	tooltip_font => $::FONT_PROP,	3495	tooltip_font => $::FONT_PROP,
3356	tooltip_width => 0.67,	3496	tooltip_width => 0.67,
3357	fontsize => $item->{fontsize} || $self->{fontsize},	3497	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3436	$self->SUPER::destroy;	3576	$self->SUPER::destroy;
3437	}	3577	}
3438		3578
3439	#############################################################################	3579	#############################################################################
3440		3580
3441	package CFClient::UI::Inventory;	3581	package CFPlus::UI::Inventory;
3442		3582
3443	our @ISA = CFClient::UI::ScrolledWindow::;	3583	our @ISA = CFPlus::UI::Table::;
3444		3584
3445	sub new {	3585	sub new {
3446	my $class = shift;	3586	my $class = shift;
3447		3587
3448	my $self = $class->SUPER::new (	3588	my $self = $class->SUPER::new (
3449	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3589	col_expand => [0, 1, 0],
		3590	items => [],
3450	@_,	3591	@_,
3451	);	3592	);
3452		3593
		3594	$self->set_sort_order (undef);
		3595
3453	$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;
3454	}	3632	}
3455		3633
3456	sub set_items {	3634	sub set_items {
3457	my ($self, $items) = @_;	3635	my ($self, $items) = @_;
3458		3636
3459	$self->{child}->clear;	3637	$self->{items} = [$items ? values %$items : ()];
3460	return unless $items;	3638	$self->update_items;
3461
3462	my @items = sort {
3463	($a->{type} <=> $b->{type})
3464	or ($a->{name} cmp $b->{name})
3465	} values %$items;
3466
3467	$self->{real_items} = \@items;
3468
3469	my $row = 0;
3470	for my $item (@items) {
3471	CFClient::Item::update_widgets $item;
3472
3473	$self->{child}->add (0, $row, $item->{face_widget});
3474	$self->{child}->add (1, $row, $item->{desc_widget});
3475	$self->{child}->add (2, $row, $item->{weight_widget});
3476
3477	$row++;
3478	}
3479	}	3639	}
3480		3640
3481	#############################################################################	3641	#############################################################################
3482		3642
3483	package CFClient::UI::SpellList;	3643	package CFPlus::UI::SpellList;
3484		3644
3485	our @ISA = CFClient::UI::Table::;	3645	our @ISA = CFPlus::UI::Table::;
3486		3646
3487	sub new {	3647	sub new {
3488	my $class = shift;	3648	my $class = shift;
3489		3649
3490	my $self = $class->SUPER::new (	3650	my $self = $class->SUPER::new (
…		…
3508	"<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");
3509		3669
3510	sub rebuild_spell_list {	3670	sub rebuild_spell_list {
3511	my ($self) = @_;	3671	my ($self) = @_;
3512		3672
3513	$CFClient::UI::ROOT->on_refresh ($self => sub {	3673	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3514	$self->clear;	3674	$self->clear;
3515		3675
3516	return unless $::CONN;	3676	return unless $::CONN;
3517		3677
3518	$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);
3519	$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);
3520	$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);
3521	$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);
3522	$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);
3523		3683
3524	my $row = 0;	3684	my $row = 0;
3525		3685
3526	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3686	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527	my $spell = $self->{spell}{$_};	3687	my $spell = $self->{spell}{$_};
…		…
3534	if ($ev->{button} == 1) {	3694	if ($ev->{button} == 1) {
3535	$::CONN->user_send ("cast $spell->{name}");	3695	$::CONN->user_send ("cast $spell->{name}");
3536	} elsif ($ev->{button} == 2) {	3696	} elsif ($ev->{button} == 2) {
3537	$::CONN->user_send ("invoke $spell->{name}");	3697	$::CONN->user_send ("invoke $spell->{name}");
3538	} elsif ($ev->{button} == 3) {	3698	} elsif ($ev->{button} == 3) {
3539	(new CFClient::UI::Menu	3699	(new CFPlus::UI::Menu
3540	items => [	3700	items => [
3541	["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}"]) }],
3542	["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}"]) }],
3543	],	3703	],
3544	)->popup ($ev);	3704	)->popup ($ev);
…		…
3550	};	3710	};
3551		3711
3552	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3712	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553		3713
3554	#TODO: add path info to tooltip	3714	#TODO: add path info to tooltip
3555	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3715	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3556		3716
3557	$self->add (0, $row, new CFClient::UI::Face	3717	$self->add (0, $row, new CFPlus::UI::Face
3558	face => $spell->{face},	3718	face => $spell->{face},
3559	can_hover => 1,	3719	can_hover => 1,
3560	can_events => 1,	3720	can_events => 1,
3561	tooltip => $tooltip,	3721	tooltip => $tooltip,
3562	on_button_down => $spell_cb,	3722	on_button_down => $spell_cb,
3563	);	3723	);
3564		3724
3565	$self->add (1, $row, new CFClient::UI::Label	3725	$self->add (1, $row, new CFPlus::UI::Label
3566	expand => 1,	3726	expand => 1,
3567	text => $spell->{name},	3727	text => $spell->{name},
3568	can_hover => 1,	3728	can_hover => 1,
3569	can_events => 1,	3729	can_events => 1,
3570	tooltip => $tooltip,	3730	tooltip => $tooltip,
3571	on_button_down => $spell_cb,	3731	on_button_down => $spell_cb,
3572	);	3732	);
3573		3733
3574	$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);
3575	$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);
3576	$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);
3577	$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);
3578	}	3738	}
3579	});	3739	});
3580	}	3740	}
3581		3741
3582	sub add_spell {	3742	sub add_spell {
…		…
3600	$self->rebuild_spell_list;	3760	$self->rebuild_spell_list;
3601	}	3761	}
3602		3762
3603	#############################################################################	3763	#############################################################################
3604		3764
3605	package CFClient::UI::Root;	3765	package CFPlus::UI::Root;
3606		3766
3607	our @ISA = CFClient::UI::Container::;	3767	our @ISA = CFPlus::UI::Container::;
3608		3768
3609	use List::Util qw(min max);	3769	use List::Util qw(min max);
3610		3770
3611	use CFClient::OpenGL;	3771	use CFPlus::OpenGL;
3612		3772
3613	sub new {	3773	sub new {
3614	my $class = shift;	3774	my $class = shift;
3615		3775
3616	my $self = $class->SUPER::new (	3776	my $self = $class->SUPER::new (
…		…
3792	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3952	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3793		3953
3794	$w = 0 if $w < 0;	3954	$w = 0 if $w < 0;
3795	$h = 0 if $h < 0;	3955	$h = 0 if $h < 0;
3796		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
3797	$w = int $w + 0.5;	3966	$w = int $w + 0.5;
3798	$h = int $h + 0.5;	3967	$h = int $h + 0.5;
3799		3968
3800	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}) {
3801	$widget->{old_w} = $widget->{w};	3970	$widget->{old_w} = $widget->{w};
…		…
3824	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3993	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3825	glMatrixMode GL_MODELVIEW;	3994	glMatrixMode GL_MODELVIEW;
3826	glLoadIdentity;	3995	glLoadIdentity;
3827		3996
3828	{	3997	{
3829	package CFClient::UI::Base;	3998	package CFPlus::UI::Base;
3830		3999
3831	($draw_x, $draw_y, $draw_w, $draw_h) =	4000	($draw_x, $draw_y, $draw_w, $draw_h) =
3832	(0, 0, $self->{w}, $self->{h});	4001	(0, 0, $self->{w}, $self->{h});
3833	}	4002	}
3834		4003
3835	$self->_draw;	4004	$self->_draw;
3836	}	4005	}
3837		4006
3838	#############################################################################	4007	#############################################################################
3839		4008
3840	package CFClient::UI;	4009	package CFPlus::UI;
3841		4010
3842	$ROOT = new CFClient::UI::Root;	4011	$ROOT = new CFPlus::UI::Root;
3843	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4012	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3844		4013
3845	1	4014	1
3846		4015

Diff Legend

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