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.314 by root, Mon Jun 26 21:59:04 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;
…		…
1654		1734
1655	sub set_fontsize {	1735	sub set_fontsize {
1656	my ($self, $fontsize) = @_;	1736	my ($self, $fontsize) = @_;
1657		1737
1658	$self->{fontsize} = $fontsize;	1738	$self->{fontsize} = $fontsize;
		1739	delete $self->{size_req};
1659	delete $self->{texture};	1740	delete $self->{texture};
1660		1741
1661	$self->realloc;	1742	$self->realloc;
1662	}	1743	}
1663		1744
1664	sub reconfigure {	1745	sub reconfigure {
1665	my ($self) = @_;	1746	my ($self) = @_;
1666		1747
1667	delete $self->{size_req};	1748	delete $self->{size_req};
		1749	delete $self->{texture};
1668		1750
1669	$self->SUPER::reconfigure;	1751	$self->SUPER::reconfigure;
1670	}	1752	}
1671		1753
1672	sub _draw {	1754	sub _draw {
1673	my ($self) = @_;	1755	my ($self) = @_;
1674		1756
1675	$self->SUPER::_draw; # draw background, if applicable	1757	$self->SUPER::_draw; # draw background, if applicable
1676		1758
1677	my $tex = $self->{texture} ||= do {	1759	my $size = $self->{texture} ||= do {
1678	$self->{layout}->set_foreground (@{$self->{fg}});	1760	$self->{layout}->set_foreground (@{$self->{fg}});
1679	$self->{layout}->set_font ($self->{font}) if $self->{font};	1761	$self->{layout}->set_font ($self->{font}) if $self->{font};
1680	$self->{layout}->set_width ($self->{w});	1762	$self->{layout}->set_width ($self->{w});
1681	$self->{layout}->set_ellipsise ($self->{ellipsise});	1763	$self->{layout}->set_ellipsise ($self->{ellipsise});
1682	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1764	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1765	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684		1766
1685	new_from_layout CFClient::Texture $self->{layout}	1767	[$self->{layout}->size]
1686	};	1768	};
1687		1769
1688	unless (exists $self->{ox}) {	1770	unless (exists $self->{ox}) {
1689	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1771	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1772	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691	: ($self->{w} - $tex->{w}) * 0.5);	1773	: ($self->{w} - $size->[0]) * 0.5);
1692		1774
1693	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1775	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1776	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695	: ($self->{h} - $tex->{h}) * 0.5);	1777	: ($self->{h} - $size->[1]) * 0.5);
1696	};	1778	};
1697		1779
1698	glEnable GL_TEXTURE_2D;
1699
1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1780	my $w = List::Util::min $self->{w} + 4, $size->[0];
1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1781	my $h = List::Util::min $self->{h} + 2, $size->[1];
1702		1782
1703	if ($tex->{format} == GL_ALPHA) {	1783	$self->{layout}->render ($self->{ox}, $self->{oy});
1704	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705	glColor @{$self->{fg}};
1706	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707	} else {
1708	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710	}
1711
1712	glDisable GL_TEXTURE_2D;
1713	}	1784	}
1714		1785
1715	#############################################################################	1786	#############################################################################
1716		1787
1717	package CFClient::UI::EntryBase;	1788	package CFPlus::UI::EntryBase;
1718		1789
1719	our @ISA = CFClient::UI::Label::;	1790	our @ISA = CFPlus::UI::Label::;
1720		1791
1721	use CFClient::OpenGL;	1792	use CFPlus::OpenGL;
1722		1793
1723	sub new {	1794	sub new {
1724	my $class = shift;	1795	my $class = shift;
1725		1796
1726	$class->SUPER::new (	1797	$class->SUPER::new (
…		…
1788		1859
1789	if ($uni == 8) {	1860	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1861	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	1862	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	1863	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	1864	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	1865	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	1866	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	1867	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	1868	} elsif ($sym == CFPlus::SDLK_HOME) {
1798	$self->{cursor} = 0;	1869	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {	1870	} elsif ($sym == CFPlus::SDLK_END) {
1800	$self->{cursor} = length $text;	1871	$self->{cursor} = length $text;
1801	} elsif ($uni == 27) {	1872	} elsif ($uni == 27) {
1802	$self->emit ('escape');	1873	$self->emit ('escape');
1803	} elsif ($uni) {	1874	} elsif ($uni) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	1875	substr $text, $self->{cursor}++, 0, chr $uni;
…		…
1828		1899
1829	my $idx = $self->{layout}->xy_to_index ($x, $y);	1900	my $idx = $self->{layout}->xy_to_index ($x, $y);
1830		1901
1831	# byte-index to char-index	1902	# byte-index to char-index
1832	my $text = $self->{text};	1903	my $text = $self->{text};
1833	utf8::encode $text;	1904	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834	$self->{cursor} = length substr $text, 0, $idx;	1905	$self->{cursor} = length $text;
1835		1906
1836	$self->_set_text ($self->{text});	1907	$self->_set_text ($self->{text});
1837	$self->update;	1908	$self->update;
1838		1909
1839	1	1910	1
…		…
1886	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};
1887	glEnd;	1958	glEnd;
1888	}	1959	}
1889	}	1960	}
1890		1961
1891	package CFClient::UI::Entry;	1962	package CFPlus::UI::Entry;
1892		1963
1893	our @ISA = CFClient::UI::EntryBase::;	1964	our @ISA = CFPlus::UI::EntryBase::;
1894		1965
1895	use CFClient::OpenGL;	1966	use CFPlus::OpenGL;
1896		1967
1897	sub invoke_key_down {	1968	sub invoke_key_down {
1898	my ($self, $ev) = @_;	1969	my ($self, $ev) = @_;
1899		1970
1900	my $sym = $ev->{sym};	1971	my $sym = $ev->{sym};
…		…
1906	$self->{history_pointer} = -1;	1977	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	1978	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	1979	$self->emit (activate => $txt);
1909	$self->update;	1980	$self->update;
1910		1981
1911	} elsif ($sym == CFClient::SDLK_UP) {	1982	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	1983	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	1984	$self->{history_saveback} = $self->get_text;
1914	}	1985	}
1915	if (@{$self->{history} || []} > 0) {	1986	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	1987	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	1989	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	1990	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1991	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	1992	}
1922		1993
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	1994	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	1995	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1996	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		1997
1927	if ($self->{history_pointer} >= 0) {	1998	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1999	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2008	1
1938	}	2009	}
1939		2010
1940	#############################################################################	2011	#############################################################################
1941		2012
1942	package CFClient::UI::Button;	2013	package CFPlus::UI::Button;
1943		2014
1944	our @ISA = CFClient::UI::Label::;	2015	our @ISA = CFPlus::UI::Label::;
1945		2016
1946	use CFClient::OpenGL;	2017	use CFPlus::OpenGL;
1947		2018
1948	my @tex =	2019	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2020	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2021	qw(b1_button_active.png);
1951		2022
1952	sub new {	2023	sub new {
1953	my $class = shift;	2024	my $class = shift;
1954		2025
…		…
1991	$self->SUPER::_draw;	2062	$self->SUPER::_draw;
1992	}	2063	}
1993		2064
1994	#############################################################################	2065	#############################################################################
1995		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
1996	package CFClient::UI::ImageButton;	2216	package CFPlus::UI::ImageButton;
1997		2217
1998	our @ISA = CFClient::UI::Image::;	2218	our @ISA = CFPlus::UI::Image::;
1999		2219
2000	use CFClient::OpenGL;	2220	use CFPlus::OpenGL;
2001		2221
2002	my %textures;	2222	my %textures;
2003		2223
2004	sub new {	2224	sub new {
2005	my $class = shift;	2225	my $class = shift;
…		…
2027	1	2247	1
2028	}	2248	}
2029		2249
2030	#############################################################################	2250	#############################################################################
2031		2251
2032	package CFClient::UI::CheckBox;
2033
2034	our @ISA = CFClient::UI::DrawBG::;
2035
2036	my @tex =
2037	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040	use CFClient::OpenGL;
2041
2042	sub new {
2043	my $class = shift;
2044
2045	$class->SUPER::new (
2046	padding_x => 2,
2047	padding_y => 2,
2048	fg => [1, 1, 1],
2049	active_fg => [1, 1, 0],
2050	bg => [0, 0, 0, 0.2],
2051	active_bg => [1, 1, 1, 0.5],
2052	state => 0,
2053	can_hover => 1,
2054	@_
2055	)
2056	}
2057
2058	sub size_request {
2059	my ($self) = @_;
2060
2061	(6) x 2
2062	}
2063
2064	sub invoke_button_down {
2065	my ($self, $ev, $x, $y) = @_;
2066
2067	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069	$self->{state} = !$self->{state};
2070	$self->emit (changed => $self->{state});
2071	} else {
2072	return 0
2073	}
2074
2075	1
2076	}
2077
2078	sub _draw {
2079	my ($self) = @_;
2080
2081	$self->SUPER::_draw;
2082
2083	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085	my ($w, $h) = @$self{qw(w h)};
2086
2087	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091	my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093	glEnable GL_TEXTURE_2D;
2094	$tex->draw_quad_alpha (0, 0, $s, $s);
2095	glDisable GL_TEXTURE_2D;
2096	}
2097
2098	#############################################################################
2099
2100	package CFClient::UI::Image;	2252	package CFPlus::UI::VGauge;
2101		2253
2102	our @ISA = CFClient::UI::Base::;	2254	our @ISA = CFPlus::UI::Base::;
2103
2104	use CFClient::OpenGL;
2105
2106	our %texture_cache;
2107
2108	sub new {
2109	my $class = shift;
2110
2111	my $self = $class->SUPER::new (
2112	can_events => 0,
2113	@_,
2114	);
2115
2116	$self->{path}
2117	or Carp::croak "required attribute 'path' not set";
2118
2119	$self->{tex} = $texture_cache{$self->{path}} ||=
2120	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122	Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126	$self
2127	}
2128
2129	sub size_request {
2130	my ($self) = @_;
2131
2132	($self->{tex}{w}, $self->{tex}{h})
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	my $tex = $self->{tex};
2139
2140	my ($w, $h) = ($self->{w}, $self->{h});
2141
2142	if ($self->{rot90}) {
2143	glRotate 90, 0, 0, 1;
2144	glTranslate 0, -$self->{w}, 0;
2145
2146	($w, $h) = ($h, $w);
2147	}
2148
2149	glEnable GL_TEXTURE_2D;
2150	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152	$tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154	glDisable GL_TEXTURE_2D;
2155	}
2156
2157	#############################################################################
2158
2159	package CFClient::UI::VGauge;
2160
2161	our @ISA = CFClient::UI::Base::;
2162		2255
2163	use List::Util qw(min max);	2256	use List::Util qw(min max);
2164		2257
2165	use CFClient::OpenGL;	2258	use CFPlus::OpenGL;
2166		2259
2167	my %tex = (	2260	my %tex = (
2168	food => [	2261	food => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2262	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2263	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171	],	2264	],
2172	grace => [	2265	grace => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2266	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2267	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175	],	2268	],
2176	hp => [	2269	hp => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2270	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2271	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179	],	2272	],
2180	mana => [	2273	mana => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2274	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2275	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183	],	2276	],
2184	);	2277	);
2185		2278
2186	# eg. VGauge->new (gauge => 'food'), default gauge: food	2279	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2246	my $ycut1 = max 0, min 1, $ycut;	2339	my $ycut1 = max 0, min 1, $ycut;
2247	my $ycut2 = max 0, min 1, $ycut - 1;	2340	my $ycut2 = max 0, min 1, $ycut - 1;
2248		2341
2249	my $h1 = $self->{h} * (1 - $ycut1);	2342	my $h1 = $self->{h} * (1 - $ycut1);
2250	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);
2251		2347
2252	glEnable GL_BLEND;	2348	glEnable GL_BLEND;
2253	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2349	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2350	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255	glEnable GL_TEXTURE_2D;	2351	glEnable GL_TEXTURE_2D;
…		…
2274		2370
2275	if ($t3) {	2371	if ($t3) {
2276	glBindTexture GL_TEXTURE_2D, $t3->{name};	2372	glBindTexture GL_TEXTURE_2D, $t3->{name};
2277	glBegin GL_QUADS;	2373	glBegin GL_QUADS;
2278	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2374	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2375	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2376	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2377	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282	glEnd;	2378	glEnd;
2283	}	2379	}
2284		2380
2285	glDisable GL_BLEND;	2381	glDisable GL_BLEND;
2286	glDisable GL_TEXTURE_2D;	2382	glDisable GL_TEXTURE_2D;
2287	}	2383	}
2288		2384
2289	#############################################################################	2385	#############################################################################
2290		2386
2291	package CFClient::UI::Gauge;	2387	package CFPlus::UI::Gauge;
2292		2388
2293	our @ISA = CFClient::UI::VBox::;	2389	our @ISA = CFPlus::UI::VBox::;
2294		2390
2295	sub new {	2391	sub new {
2296	my ($class, %arg) = @_;	2392	my ($class, %arg) = @_;
2297		2393
2298	my $self = $class->SUPER::new (	2394	my $self = $class->SUPER::new (
…		…
2300	can_hover => 1,	2396	can_hover => 1,
2301	can_events => 1,	2397	can_events => 1,
2302	%arg,	2398	%arg,
2303	);	2399	);
2304		2400
2305	$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");
2306	$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);
2307	$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");
2308		2404
2309	$self	2405	$self
2310	}	2406	}
2311		2407
2312	sub set_fontsize {	2408	sub set_fontsize {
…		…
2333	$self->{value}->set_text ($val);	2429	$self->{value}->set_text ($val);
2334	}	2430	}
2335		2431
2336	#############################################################################	2432	#############################################################################
2337		2433
2338	package CFClient::UI::Slider;	2434	package CFPlus::UI::Slider;
2339		2435
2340	use strict;	2436	use strict;
2341		2437
2342	use CFClient::OpenGL;	2438	use CFPlus::OpenGL;
2343		2439
2344	our @ISA = CFClient::UI::DrawBG::;	2440	our @ISA = CFPlus::UI::DrawBG::;
2345		2441
2346	my @tex =	2442	my @tex =
2347	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2443	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348	qw(s1_slider.png s1_slider_bg.png);	2444	qw(s1_slider.png s1_slider_bg.png);
2349		2445
2350	sub new {	2446	sub new {
2351	my $class = shift;	2447	my $class = shift;
2352		2448
…		…
2441	}	2537	}
2442		2538
2443	1	2539	1
2444	}	2540	}
2445		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
2446	sub update {	2552	sub update {
2447	my ($self) = @_;	2553	my ($self) = @_;
2448		2554
2449	delete $self->{knob_w};	2555	delete $self->{knob_w};
2450	$self->SUPER::update;	2556	$self->SUPER::update;
…		…
2497	glDisable GL_TEXTURE_2D;	2603	glDisable GL_TEXTURE_2D;
2498	}	2604	}
2499		2605
2500	#############################################################################	2606	#############################################################################
2501		2607
2502	package CFClient::UI::ValSlider;	2608	package CFPlus::UI::ValSlider;
2503		2609
2504	our @ISA = CFClient::UI::HBox::;	2610	our @ISA = CFPlus::UI::HBox::;
2505		2611
2506	sub new {	2612	sub new {
2507	my ($class, %arg) = @_;	2613	my ($class, %arg) = @_;
2508		2614
2509	my $range = delete $arg{range};	2615	my $range = delete $arg{range};
2510		2616
2511	my $self = $class->SUPER::new (	2617	my $self = $class->SUPER::new (
2512	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2618	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2619	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514	to_value => sub { shift },	2620	to_value => sub { shift },
2515	from_value => sub { shift },	2621	from_value => sub { shift },
2516	%arg,	2622	%arg,
2517	);	2623	);
2518		2624
…		…
2538	sub set_range { shift->{slider}->set_range (@_) }	2644	sub set_range { shift->{slider}->set_range (@_) }
2539	sub set_value { shift->{slider}->set_value (@_) }	2645	sub set_value { shift->{slider}->set_value (@_) }
2540		2646
2541	#############################################################################	2647	#############################################################################
2542		2648
2543	package CFClient::UI::TextScroller;	2649	package CFPlus::UI::TextScroller;
2544		2650
2545	our @ISA = CFClient::UI::HBox::;	2651	our @ISA = CFPlus::UI::HBox::;
2546		2652
2547	use CFClient::OpenGL;	2653	use CFPlus::OpenGL;
2548		2654
2549	sub new {	2655	sub new {
2550	my $class = shift;	2656	my $class = shift;
2551		2657
2552	my $self = $class->SUPER::new (	2658	my $self = $class->SUPER::new (
2553	fontsize => 1,	2659	fontsize => 1,
2554	can_events => 0,	2660	can_events => 1,
2555	indent => 0,	2661	indent => 0,
2556	#font => default_font	2662	#font => default_font
2557	@_,	2663	@_,
2558		2664
2559	layout => (new CFClient::Layout 1),	2665	layout => (new CFPlus::Layout),
2560	par => [],	2666	par => [],
2561	height => 0,	2667	height => 0,
2562	children => [	2668	children => [
2563	(new CFClient::UI::Empty expand => 1),	2669	(new CFPlus::UI::Empty expand => 1),
2564	(new CFClient::UI::Slider vertical => 1),	2670	(new CFPlus::UI::Slider vertical => 1),
2565	],	2671	],
2566	);	2672	);
2567		2673
2568	$self->{children}[1]->connect (changed => sub { $self->update });	2674	$self->{children}[1]->connect (changed => sub { $self->update });
2569		2675
…		…
2599		2705
2600	$self->reflow;	2706	$self->reflow;
2601		2707
2602	local $self->{children} = [$empty, $slider];	2708	local $self->{children} = [$empty, $slider];
2603	$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
2604	}	2720	}
2605		2721
2606	sub get_layout {	2722	sub get_layout {
2607	my ($self, $para) = @_;	2723	my ($self, $para) = @_;
2608		2724
…		…
2648	$self->{height} = 0;	2764	$self->{height} = 0;
2649	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2765	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2650	}	2766	}
2651		2767
2652	sub add_paragraph {	2768	sub add_paragraph {
2653	my ($self, $color, $para, $indent) = @_;	2769	my $self = shift;
2654		2770
2655	my ($text, @w) = ref $para ? @$para : $para;	2771	for my $para (@_) {
2656
2657	$para = {	2772	$para = {
		2773	fg => [1, 1, 1, 1],
		2774	indent => 0,
		2775	markup => "",
		2776	widget => [],
		2777	ref $para ? %$para : (markup => $para),
2658	w => 1e10,	2778	w => 1e10,
2659	wrapped => 1,	2779	wrapped => 1,
2660	fg => $color,
2661	indent => $indent,
2662	markup => $text,
2663	widget => \@w,
2664	};	2780	};
2665		2781
2666	$self->add (@w) if @w;	2782	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2667	push @{$self->{par}}, $para;	2783	push @{$self->{par}}, $para;
		2784	}
2668		2785
2669	$self->{need_reflow}++;	2786	$self->{need_reflow}++;
2670	$self->update;	2787	$self->update;
2671	}	2788	}
2672		2789
…		…
2714		2831
2715	if (delete $self->{scroll_to_bottom}) {	2832	if (delete $self->{scroll_to_bottom}) {
2716	$self->{children}[1]->set_value (1e10);	2833	$self->{children}[1]->set_value (1e10);
2717	}	2834	}
2718		2835
2719	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2836	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2720	glClearColor 0, 0, 0, 0;	2837	glClearColor 0, 0, 0, 0;
2721	glClear GL_COLOR_BUFFER_BIT;	2838	glClear GL_COLOR_BUFFER_BIT;
2722		2839
2723	my $top = int $self->{children}[1]{range}[0];	2840	my $top = int $self->{children}[1]{range}[0];
2724		2841
2725	my $y0 = $top;	2842	my $y0 = $top;
2726	my $y1 = $top + $H;	2843	my $y1 = $top + $H;
2727		2844
2728	my $y = 0;	2845	my $y = 0;
2729		2846
2730	glEnable GL_BLEND;
2731	#TODO# not correct in windows where rgba is forced off
2732	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2733
2734	for my $para (@{$self->{par}}) {	2847	for my $para (@{$self->{par}}) {
2735	my $h = $para->{h};	2848	my $h = $para->{h};
2736		2849
2737	if ($y0 < $y + $h && $y < $y1) {	2850	if ($y0 < $y + $h && $y < $y1) {
2738		2851
2739	my $layout = $self->get_layout ($para);	2852	my $layout = $self->get_layout ($para);
2740		2853
2741	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743	glRasterPos $para->{indent}, $y - $y0;	2854	$layout->render ($para->{indent}, $y - $y0);
2744	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745		2855
2746	if (my @w = @{ $para->{widget} }) {	2856	if (my @w = @{ $para->{widget} }) {
2747	my @s = $layout->get_shapes;	2857	my @s = $layout->get_shapes;
2748		2858
2749	glDisable GL_BLEND;
2750	for (@w) {	2859	for (@w) {
2751	my ($dx, $dy) = splice @s, 0, 2, ();	2860	my ($dx, $dy) = splice @s, 0, 2, ();
2752		2861
2753	$_->{x} = $dx + $para->{indent};	2862	$_->{x} = $dx + $para->{indent};
2754	$_->{y} = $dy + $y - $y0;	2863	$_->{y} = $dy + $y - $y0;
2755		2864
2756	$_->draw;	2865	$_->draw;
2757	}	2866	}
2758	glEnable GL_BLEND;
2759	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760	}	2867	}
2761	}	2868	}
2762		2869
2763	$y += $h;	2870	$y += $h;
2764	}	2871	}
2765
2766	glDisable GL_BLEND;
2767	};	2872	};
2768	});	2873	});
2769	}	2874	}
2770		2875
2771	sub reconfigure {	2876	sub reconfigure {
…		…
2789	$self->{children}[1]->draw;	2894	$self->{children}[1]->draw;
2790	}	2895	}
2791		2896
2792	#############################################################################	2897	#############################################################################
2793		2898
2794	package CFClient::UI::Animator;	2899	package CFPlus::UI::Animator;
2795		2900
2796	use CFClient::OpenGL;	2901	use CFPlus::OpenGL;
2797		2902
2798	our @ISA = CFClient::UI::Bin::;	2903	our @ISA = CFPlus::UI::Bin::;
2799		2904
2800	sub moveto {	2905	sub moveto {
2801	my ($self, $x, $y) = @_;	2906	my ($self, $x, $y) = @_;
2802		2907
2803	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2908	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2831	glPopMatrix;	2936	glPopMatrix;
2832	}	2937	}
2833		2938
2834	#############################################################################	2939	#############################################################################
2835		2940
2836	package CFClient::UI::Flopper;	2941	package CFPlus::UI::Flopper;
2837		2942
2838	our @ISA = CFClient::UI::Button::;	2943	our @ISA = CFPlus::UI::Button::;
2839		2944
2840	sub new {	2945	sub new {
2841	my $class = shift;	2946	my $class = shift;
2842		2947
2843	my $self = $class->SUPER::new (	2948	my $self = $class->SUPER::new (
…		…
2855	$self->{other}->toggle_visibility;	2960	$self->{other}->toggle_visibility;
2856	}	2961	}
2857		2962
2858	#############################################################################	2963	#############################################################################
2859		2964
2860	package CFClient::UI::Tooltip;	2965	package CFPlus::UI::Tooltip;
2861		2966
2862	our @ISA = CFClient::UI::Bin::;	2967	our @ISA = CFPlus::UI::Bin::;
2863		2968
2864	use CFClient::OpenGL;	2969	use CFPlus::OpenGL;
2865		2970
2866	sub new {	2971	sub new {
2867	my $class = shift;	2972	my $class = shift;
2868		2973
2869	$class->SUPER::new (	2974	$class->SUPER::new (
…		…
2872	)	2977	)
2873	}	2978	}
2874		2979
2875	sub set_tooltip_from {	2980	sub set_tooltip_from {
2876	my ($self, $widget) = @_;	2981	my ($self, $widget) = @_;
		2982
		2983	$widget->{tooltip} = CFPlus::Pod::as_label CFPlus::Pod::section tooltip => $1
		2984	if $widget->{tooltip} =~ /^#(.*)$/;
2877		2985
2878	my $tooltip = $widget->{tooltip};	2986	my $tooltip = $widget->{tooltip};
2879		2987
2880	if ($ENV{CFPLUS_DEBUG} & 2) {	2988	if ($ENV{CFPLUS_DEBUG} & 2) {
2881	$tooltip .= "\n\n" . (ref $widget) . "\n"	2989	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2885	}	2993	}
2886		2994
2887	$tooltip =~ s/^\n+//;	2995	$tooltip =~ s/^\n+//;
2888	$tooltip =~ s/\n+$//;	2996	$tooltip =~ s/\n+$//;
2889		2997
2890	$self->add (new CFClient::UI::Label	2998	$self->add (new CFPlus::UI::Label
2891	markup => $tooltip,	2999	markup => $tooltip,
2892	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3000	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2893	fontsize => 0.8,	3001	fontsize => 0.8,
2894	fg => [0, 0, 0, 1],	3002	fg => [0, 0, 0, 1],
2895	ellipsise => 0,	3003	ellipsise => 0,
…		…
2918		3026
2919	$self->{root}->on_post_alloc ("move_$self" => sub {	3027	$self->{root}->on_post_alloc ("move_$self" => sub {
2920	my $widget = $self->{owner}	3028	my $widget = $self->{owner}
2921	or return;	3029	or return;
2922		3030
		3031	if ($widget->{visible}) {
2923	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3032	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2924		3033
2925	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3034	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2926	if $x + $self->{w} > $self->{root}{w};	3035	if $x + $self->{w} > $self->{root}{w};
2927		3036
2928	$self->move_abs ($x, $y);	3037	$self->move_abs ($x, $y);
		3038	} else {
		3039	$self->hide;
		3040	}
2929	});	3041	});
2930	}	3042	}
2931		3043
2932	sub _draw {	3044	sub _draw {
2933	my ($self) = @_;	3045	my ($self) = @_;
…		…
2957	$self->SUPER::_draw;	3069	$self->SUPER::_draw;
2958	}	3070	}
2959		3071
2960	#############################################################################	3072	#############################################################################
2961		3073
2962	package CFClient::UI::Face;	3074	package CFPlus::UI::Face;
2963		3075
2964	our @ISA = CFClient::UI::Base::;	3076	our @ISA = CFPlus::UI::DrawBG::;
2965		3077
2966	use CFClient::OpenGL;	3078	use CFPlus::OpenGL;
2967		3079
2968	sub new {	3080	sub new {
2969	my $class = shift;	3081	my $class = shift;
2970		3082
2971	my $self = $class->SUPER::new (	3083	my $self = $class->SUPER::new (
…		…
3006	sub _draw {	3118	sub _draw {
3007	my ($self) = @_;	3119	my ($self) = @_;
3008		3120
3009	return unless $::CONN;	3121	return unless $::CONN;
3010		3122
		3123	$self->SUPER::_draw;
		3124
3011	my $face;	3125	my $face;
3012		3126
3013	if ($self->{frame}) {	3127	if ($self->{frame}) {
3014	my $anim = $::CONN->{anim}[$self->{anim}];	3128	my $anim = $::CONN->{anim}[$self->{anim}];
3015		3129
…		…
3037	$self->SUPER::destroy;	3151	$self->SUPER::destroy;
3038	}	3152	}
3039		3153
3040	#############################################################################	3154	#############################################################################
3041		3155
3042	package CFClient::UI::Buttonbar;	3156	package CFPlus::UI::Buttonbar;
3043		3157
3044	our @ISA = CFClient::UI::HBox::;	3158	our @ISA = CFPlus::UI::HBox::;
3045		3159
3046	# TODO: should actualyl wrap buttons and other goodies.	3160	# TODO: should actualyl wrap buttons and other goodies.
3047		3161
3048	#############################################################################	3162	#############################################################################
3049		3163
3050	package CFClient::UI::Menu;	3164	package CFPlus::UI::Menu;
3051		3165
3052	our @ISA = CFClient::UI::FancyFrame::;	3166	our @ISA = CFPlus::UI::FancyFrame::;
3053		3167
3054	use CFClient::OpenGL;	3168	use CFPlus::OpenGL;
3055		3169
3056	sub new {	3170	sub new {
3057	my $class = shift;	3171	my $class = shift;
3058		3172
3059	my $self = $class->SUPER::new (	3173	my $self = $class->SUPER::new (
3060	items => [],	3174	items => [],
3061	z => 100,	3175	z => 100,
3062	@_,	3176	@_,
3063	);	3177	);
3064		3178
3065	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3179	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3066		3180
3067	for my $item (@{ $self->{items} }) {	3181	for my $item (@{ $self->{items} }) {
3068	my ($widget, $cb, $tooltip) = @$item;	3182	my ($widget, $cb, $tooltip) = @$item;
3069		3183
3070	# handle various types of items, only text for now	3184	# handle various types of items, only text for now
3071	if (!ref $widget) {	3185	if (!ref $widget) {
		3186	if ($widget =~ /\t/) {
		3187	my ($left, $right) = split /\t/, $widget, 2;
		3188
3072	$widget = new CFClient::UI::Label	3189	$widget = new CFPlus::UI::HBox
3073	can_hover => 1,	3190	can_hover => 1,
3074	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,
3075	markup => $widget,	3203	markup => $widget,
3076	tooltip => $tooltip	3204	tooltip => $tooltip;
		3205	}
3077	}	3206	}
3078		3207
3079	$self->{item}{$widget} = $item;	3208	$self->{item}{$widget} = $item;
3080		3209
3081	$self->{vbox}->add ($widget);	3210	$self->{vbox}->add ($widget);
…		…
3124	1	3253	1
3125	}	3254	}
3126		3255
3127	#############################################################################	3256	#############################################################################
3128		3257
3129	package CFClient::UI::Multiplexer;	3258	package CFPlus::UI::Multiplexer;
3130		3259
3131	our @ISA = CFClient::UI::Container::;	3260	our @ISA = CFPlus::UI::Container::;
3132		3261
3133	sub new {	3262	sub new {
3134	my $class = shift;	3263	my $class = shift;
3135		3264
3136	my $self = $class->SUPER::new (	3265	my $self = $class->SUPER::new (
…		…
3150		3279
3151	$self->{current} = $self->{children}[0]	3280	$self->{current} = $self->{children}[0]
3152	if @{ $self->{children} };	3281	if @{ $self->{children} };
3153	}	3282	}
3154		3283
		3284	sub get_current_page {
		3285	my ($self) = @_;
		3286
		3287	$self->{current}
		3288	}
		3289
3155	sub set_current_page {	3290	sub set_current_page {
3156	my ($self, $page_or_widget) = @_;	3291	my ($self, $page_or_widget) = @_;
3157		3292
3158	my $widget = ref $page_or_widget	3293	my $widget = ref $page_or_widget
3159	? $page_or_widget	3294	? $page_or_widget
…		…
3191	$self->{current}->draw;	3326	$self->{current}->draw;
3192	}	3327	}
3193		3328
3194	#############################################################################	3329	#############################################################################
3195		3330
3196	package CFClient::UI::Notebook;	3331	package CFPlus::UI::Notebook;
3197		3332
3198	our @ISA = CFClient::UI::VBox::;	3333	our @ISA = CFPlus::UI::VBox::;
3199		3334
3200	sub new {	3335	sub new {
3201	my $class = shift;	3336	my $class = shift;
3202		3337
3203	my $self = $class->SUPER::new (	3338	my $self = $class->SUPER::new (
3204	buttonbar => (new CFClient::UI::Buttonbar),	3339	buttonbar => (new CFPlus::UI::Buttonbar),
3205	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3340	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3206	# filter => # will be put between multiplexer and $self	3341	# filter => # will be put between multiplexer and $self
3207	@_,	3342	@_,
3208	);	3343	);
3209		3344
3210	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3345	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3216	sub add {	3351	sub add {
3217	my ($self, $title, $widget, $tooltip) = @_;	3352	my ($self, $title, $widget, $tooltip) = @_;
3218		3353
3219	Scalar::Util::weaken $self;	3354	Scalar::Util::weaken $self;
3220		3355
3221	$self->{buttonbar}->add (new CFClient::UI::Button	3356	$self->{buttonbar}->add (new CFPlus::UI::Button
3222	markup => $title,	3357	markup => $title,
3223	tooltip => $tooltip,	3358	tooltip => $tooltip,
3224	on_activate => sub { $self->set_current_page ($widget) },	3359	on_activate => sub { $self->set_current_page ($widget) },
3225	);	3360	);
3226		3361
3227	$self->{multiplexer}->add ($widget);	3362	$self->{multiplexer}->add ($widget);
3228	}	3363	}
3229		3364
		3365	sub get_current_page {
		3366	my ($self) = @_;
		3367
		3368	$self->{multiplexer}->get_current_page
		3369	}
		3370
3230	sub set_current_page {	3371	sub set_current_page {
3231	my ($self, $page) = @_;	3372	my ($self, $page) = @_;
3232		3373
3233	$self->{multiplexer}->set_current_page ($page);	3374	$self->{multiplexer}->set_current_page ($page);
3234	$self->emit (page_changed => $self->{multiplexer}{current});	3375	$self->emit (page_changed => $self->{multiplexer}{current});
3235	}	3376	}
3236		3377
3237	#############################################################################	3378	#############################################################################
3238		3379
3239	package CFClient::UI::Combobox;	3380	package CFPlus::UI::Selector;
3240		3381
3241	use utf8;	3382	use utf8;
3242		3383
3243	our @ISA = CFClient::UI::Button::;	3384	our @ISA = CFPlus::UI::Button::;
3244		3385
3245	sub new {	3386	sub new {
3246	my $class = shift;	3387	my $class = shift;
3247		3388
3248	my $self = $class->SUPER::new (	3389	my $self = $class->SUPER::new (
…		…
3265	my ($value, $title, $tooltip) = @$_;	3406	my ($value, $title, $tooltip) = @$_;
3266		3407
3267	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3408	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268	}	3409	}
3269		3410
3270	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3411	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271	}	3412	}
3272		3413
3273	sub _set_value {	3414	sub _set_value {
3274	my ($self, $value) = @_;	3415	my ($self, $value) = @_;
3275		3416
…		…
3290	$self->emit (changed => $value);	3431	$self->emit (changed => $value);
3291	}	3432	}
3292		3433
3293	#############################################################################	3434	#############################################################################
3294		3435
3295	package CFClient::UI::Statusbox;	3436	package CFPlus::UI::Statusbox;
3296		3437
3297	our @ISA = CFClient::UI::VBox::;	3438	our @ISA = CFPlus::UI::VBox::;
3298		3439
3299	sub new {	3440	sub new {
3300	my $class = shift;	3441	my $class = shift;
3301		3442
3302	my $self = $class->SUPER::new (	3443	my $self = $class->SUPER::new (
…		…
3314	sub reorder {	3455	sub reorder {
3315	my ($self) = @_;	3456	my ($self) = @_;
3316	my $NOW = Time::HiRes::time;	3457	my $NOW = Time::HiRes::time;
3317		3458
3318	# freeze display when hovering over any label	3459	# freeze display when hovering over any label
3319	return if $CFClient::UI::TOOLTIP->{owner}	3460	return if $CFPlus::UI::TOOLTIP->{owner}
3320	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3461	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3321	values %{ $self->{item} };	3462	values %{ $self->{item} };
3322		3463
3323	while (my ($k, $v) = each %{ $self->{item} }) {	3464	while (my ($k, $v) = each %{ $self->{item} }) {
3324	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3465	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3325	}	3466	}
…		…
3346	for ($short) {	3487	for ($short) {
3347	s/^\s+//;	3488	s/^\s+//;
3348	s/\s+/ /g;	3489	s/\s+/ /g;
3349	}	3490	}
3350		3491
3351	new CFClient::UI::Label	3492	new CFPlus::UI::Label
3352	markup => $short,	3493	markup => $short,
3353	tooltip => $item->{tooltip},	3494	tooltip => $item->{tooltip},
3354	tooltip_font => $::FONT_PROP,	3495	tooltip_font => $::FONT_PROP,
3355	tooltip_width => 0.67,	3496	tooltip_width => 0.67,
3356	fontsize => $item->{fontsize} || $self->{fontsize},	3497	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3410	count => 1,	3551	count => 1,
3411	%arg,	3552	%arg,
3412	};	3553	};
3413	}	3554	}
3414		3555
		3556	$ROOT->on_refresh (reorder => sub {
3415	$self->reorder;	3557	$self->reorder;
		3558	});
3416	}	3559	}
3417		3560
3418	sub reconfigure {	3561	sub reconfigure {
3419	my ($self) = @_;	3562	my ($self) = @_;
3420		3563
…		…
3433	$self->SUPER::destroy;	3576	$self->SUPER::destroy;
3434	}	3577	}
3435		3578
3436	#############################################################################	3579	#############################################################################
3437		3580
3438	package CFClient::UI::Inventory;	3581	package CFPlus::UI::Inventory;
3439		3582
3440	our @ISA = CFClient::UI::ScrolledWindow::;	3583	our @ISA = CFPlus::UI::Table::;
3441		3584
3442	sub new {	3585	sub new {
3443	my $class = shift;	3586	my $class = shift;
3444		3587
3445	my $self = $class->SUPER::new (	3588	my $self = $class->SUPER::new (
3446	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3589	col_expand => [0, 1, 0],
		3590	items => [],
3447	@_,	3591	@_,
3448	);	3592	);
3449		3593
		3594	$self->set_sort_order (undef);
		3595
3450	$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;
3451	}	3632	}
3452		3633
3453	sub set_items {	3634	sub set_items {
3454	my ($self, $items) = @_;	3635	my ($self, $items) = @_;
3455		3636
3456	$self->{child}->clear;	3637	$self->{items} = [$items ? values %$items : ()];
3457	return unless $items;	3638	$self->update_items;
3458
3459	my @items = sort {
3460	($a->{type} <=> $b->{type})
3461	or ($a->{name} cmp $b->{name})
3462	} @$items;
3463
3464	$self->{real_items} = \@items;
3465
3466	my $row = 0;
3467	for my $item (@items) {
3468	CFClient::Item::update_widgets $item;
3469
3470	$self->{child}->add (0, $row, $item->{face_widget});
3471	$self->{child}->add (1, $row, $item->{desc_widget});
3472	$self->{child}->add (2, $row, $item->{weight_widget});
3473
3474	$row++;
3475	}
3476	}	3639	}
3477		3640
3478	#############################################################################	3641	#############################################################################
3479		3642
3480	package CFClient::UI::SpellList;	3643	package CFPlus::UI::SpellList;
3481		3644
3482	our @ISA = CFClient::UI::Table::;	3645	our @ISA = CFPlus::UI::Table::;
3483		3646
3484	sub new {	3647	sub new {
3485	my $class = shift;	3648	my $class = shift;
3486		3649
3487	my $self = $class->SUPER::new (	3650	my $self = $class->SUPER::new (
…		…
3505	"<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");
3506		3669
3507	sub rebuild_spell_list {	3670	sub rebuild_spell_list {
3508	my ($self) = @_;	3671	my ($self) = @_;
3509		3672
3510	$CFClient::UI::ROOT->on_refresh ($self => sub {	3673	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3511	$self->clear;	3674	$self->clear;
3512		3675
3513	return unless $::CONN;	3676	return unless $::CONN;
3514		3677
3515	$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);
3516	$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);
3517	$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);
3518	$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);
3519	$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);
3520		3683
3521	my $row = 0;	3684	my $row = 0;
3522		3685
3523	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3686	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3524	my $spell = $self->{spell}{$_};	3687	my $spell = $self->{spell}{$_};
…		…
3531	if ($ev->{button} == 1) {	3694	if ($ev->{button} == 1) {
3532	$::CONN->user_send ("cast $spell->{name}");	3695	$::CONN->user_send ("cast $spell->{name}");
3533	} elsif ($ev->{button} == 2) {	3696	} elsif ($ev->{button} == 2) {
3534	$::CONN->user_send ("invoke $spell->{name}");	3697	$::CONN->user_send ("invoke $spell->{name}");
3535	} elsif ($ev->{button} == 3) {	3698	} elsif ($ev->{button} == 3) {
3536	(new CFClient::UI::Menu	3699	(new CFPlus::UI::Menu
3537	items => [	3700	items => [
3538	["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}"]) }],
3539	["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}"]) }],
3540	],	3703	],
3541	)->popup ($ev);	3704	)->popup ($ev);
…		…
3547	};	3710	};
3548		3711
3549	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3712	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3550		3713
3551	#TODO: add path info to tooltip	3714	#TODO: add path info to tooltip
3552	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3715	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3553		3716
3554	$self->add (0, $row, new CFClient::UI::Face	3717	$self->add (0, $row, new CFPlus::UI::Face
3555	face => $spell->{face},	3718	face => $spell->{face},
3556	can_hover => 1,	3719	can_hover => 1,
3557	can_events => 1,	3720	can_events => 1,
3558	tooltip => $tooltip,	3721	tooltip => $tooltip,
3559	on_button_down => $spell_cb,	3722	on_button_down => $spell_cb,
3560	);	3723	);
3561		3724
3562	$self->add (1, $row, new CFClient::UI::Label	3725	$self->add (1, $row, new CFPlus::UI::Label
3563	expand => 1,	3726	expand => 1,
3564	text => $spell->{name},	3727	text => $spell->{name},
3565	can_hover => 1,	3728	can_hover => 1,
3566	can_events => 1,	3729	can_events => 1,
3567	tooltip => $tooltip,	3730	tooltip => $tooltip,
3568	on_button_down => $spell_cb,	3731	on_button_down => $spell_cb,
3569	);	3732	);
3570		3733
3571	$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);
3572	$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);
3573	$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);
3574	$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);
3575	}	3738	}
3576	});	3739	});
3577	}	3740	}
3578		3741
3579	sub add_spell {	3742	sub add_spell {
…		…
3597	$self->rebuild_spell_list;	3760	$self->rebuild_spell_list;
3598	}	3761	}
3599		3762
3600	#############################################################################	3763	#############################################################################
3601		3764
3602	package CFClient::UI::Root;	3765	package CFPlus::UI::Root;
3603		3766
3604	our @ISA = CFClient::UI::Container::;	3767	our @ISA = CFPlus::UI::Container::;
3605		3768
3606	use List::Util qw(min max);	3769	use List::Util qw(min max);
3607		3770
3608	use CFClient::OpenGL;	3771	use CFPlus::OpenGL;
3609		3772
3610	sub new {	3773	sub new {
3611	my $class = shift;	3774	my $class = shift;
3612		3775
3613	my $self = $class->SUPER::new (	3776	my $self = $class->SUPER::new (
…		…
3789	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3952	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3790		3953
3791	$w = 0 if $w < 0;	3954	$w = 0 if $w < 0;
3792	$h = 0 if $h < 0;	3955	$h = 0 if $h < 0;
3793		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
3794	$w = int $w + 0.5;	3966	$w = int $w + 0.5;
3795	$h = int $h + 0.5;	3967	$h = int $h + 0.5;
3796		3968
3797	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}) {
3798	$widget->{old_w} = $widget->{w};	3970	$widget->{old_w} = $widget->{w};
…		…
3821	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3993	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3822	glMatrixMode GL_MODELVIEW;	3994	glMatrixMode GL_MODELVIEW;
3823	glLoadIdentity;	3995	glLoadIdentity;
3824		3996
3825	{	3997	{
3826	package CFClient::UI::Base;	3998	package CFPlus::UI::Base;
3827		3999
3828	($draw_x, $draw_y, $draw_w, $draw_h) =	4000	($draw_x, $draw_y, $draw_w, $draw_h) =
3829	(0, 0, $self->{w}, $self->{h});	4001	(0, 0, $self->{w}, $self->{h});
3830	}	4002	}
3831		4003
3832	$self->_draw;	4004	$self->_draw;
3833	}	4005	}
3834		4006
3835	#############################################################################	4007	#############################################################################
3836		4008
3837	package CFClient::UI;	4009	package CFPlus::UI;
3838		4010
3839	$ROOT = new CFClient::UI::Root;	4011	$ROOT = new CFPlus::UI::Root;
3840	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4012	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3841		4013
3842	1	4014	1
3843		4015

Diff Legend

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