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.328 by root, Sat Jul 22 13:43:05 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 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 ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
79	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	80	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	81	if $FOCUS;
82	}	82	}
83		83
		84	sub check_hover {
		85	my ($widget) = @_;
		86
		87	if ($widget != $HOVER) {
		88	my $hover = $HOVER; $HOVER = $widget;
		89
		90	$hover->update if $hover && $hover->{can_hover};
		91	$HOVER->update if $HOVER && $HOVER->{can_hover};
		92
		93	$TOOLTIP_WATCHER->start;
		94	}
		95	}
		96
84	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	98	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	99	my ($x, $y) = ($ev->{x}, $ev->{y});
87		100
88	warn "button down $ev->{button}\n";#d#	101	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
89		102
90	if (!$BUTTON_STATE) {	103	unless ($GRAB) {
91	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
92		105
93	$GRAB = $widget;	106	$GRAB = $widget;
94	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
95		108
96	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->cb->();
97	}	110	}
98		111
99	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	112	if ($GRAB) {
100		113	if ($ev->{button} == 4 || $ev->{button} == 5) {
101	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	114	# mousewheel
102	if $GRAB;	115	$ev->{dx} = 0;
		116	$ev->{dy} = $ev->{button} * 2 - 9;
		117	$GRAB->emit (mouse_wheel => $ev);
		118	} else {
		119	$GRAB->emit (button_down => $ev)
		120	}
		121	}
103	}	122	}
104		123
105	sub feed_sdl_button_up_event {	124	sub feed_sdl_button_up_event {
106	my ($ev) = @_;	125	my ($ev) = @_;
107	my ($x, $y) = ($ev->{x}, $ev->{y});
108		126
109	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	127	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
110		128
111	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	129	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
112		130
113	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	131	$GRAB->emit (button_up => $ev)
114	if $GRAB;	132	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
115		133
116	if (!$BUTTON_STATE) {	134	unless ($BUTTON_STATE) {
117	my $grab = $GRAB; undef $GRAB;	135	my $grab = $GRAB; undef $GRAB;
118	$grab->update if $grab;	136	$grab->update if $grab;
119	$GRAB->update if $GRAB;	137	$GRAB->update if $GRAB;
120		138
		139	check_hover $widget;
121	$TOOLTIP_WATCHER->cb->();	140	$TOOLTIP_WATCHER->cb->();
122	}	141	}
123	}	142	}
124		143
125	sub feed_sdl_motion_event {	144	sub feed_sdl_motion_event {
126	my ($ev) = @_;	145	my ($ev) = @_;
127	my ($x, $y) = ($ev->{x}, $ev->{y});	146	my ($x, $y) = ($ev->{x}, $ev->{y});
128		147
129	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	148	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
130		149
131	if ($widget != $HOVER) {	150	check_hover $widget;
132	my $hover = $HOVER; $HOVER = $widget;
133		151
134	$hover->update if $hover && $hover->{can_hover};	152	$HOVER->emit (mouse_motion => $ev)
135	$HOVER->update if $HOVER && $HOVER->{can_hover};
136
137	$TOOLTIP_WATCHER->start;
138	}
139
140	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
141	if $HOVER;	153	if $HOVER;
142	}	154	}
143		155
144	# convert position array to integers	156	# convert position array to integers
145	sub harmonize {	157	sub harmonize {
…		…
195	reconfigure_widgets;	207	reconfigure_widgets;
196	}	208	}
197		209
198	#############################################################################	210	#############################################################################
199		211
		212	package CFPlus::UI::Event;
		213
		214	sub xy {
		215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		216	}
		217
		218	#############################################################################
		219
200	package CFClient::UI::Base;	220	package CFPlus::UI::Base;
201		221
202	use strict;	222	use strict;
203		223
204	use CFClient::OpenGL;	224	use CFPlus::OpenGL;
205		225
206	sub new {	226	sub new {
207	my $class = shift;	227	my $class = shift;
208		228
209	my $self = bless {	229	my $self = bless {
…		…
214	h => undef,	234	h => undef,
215	can_events => 1,	235	can_events => 1,
216	@_	236	@_
217	}, $class;	237	}, $class;
218		238
219	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	239	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
220		240
221	for (keys %$self) {	241	for (keys %$self) {
222	if (/^on_(.*)$/) {	242	if (/^on_(.*)$/) {
223	$self->connect ($1 => delete $self->{$_});	243	$self->connect ($1 => delete $self->{$_});
224	}	244	}
225	}	245	}
226		246
227	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	247	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
228	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	248	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
229	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	249	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
230	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	250	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
231	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	251	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
232		252
233	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
234	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
235		255
236	$self->show if $layout->{show};	256	$self->show if $layout->{show};
…		…
241		261
242	sub destroy {	262	sub destroy {
243	my ($self) = @_;	263	my ($self) = @_;
244		264
245	$self->hide;	265	$self->hide;
		266	$self->emit ("destroy");
246	%$self = ();	267	%$self = ();
247	}	268	}
248		269
249	sub show {	270	sub show {
250	my ($self) = @_;	271	my ($self) = @_;
251		272
252	return if $self->{parent};	273	return if $self->{parent};
253		274
254	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
255	}	276	}
256		277
257	sub set_visible {	278	sub set_visible {
258	my ($self) = @_;	279	my ($self) = @_;
259		280
…		…
280	delete $self->{root};	301	delete $self->{root};
281		302
282	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
283	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
284		305
285	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
286	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
287		308
288	$self->emit ("focus_out");	309	$self->emit ("focus_out");
289	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
290	}	311	}
…		…
347	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
348		369
349	if ($self->{aspect}) {	370	if ($self->{aspect}) {
350	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
351		372
352	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
353	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
354		375
355	# use alignment to adjust x, y	376	# use alignment to adjust x, y
356		377
357	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
358	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
399		420
400	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
401		422
402	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
403		424
404	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
405	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
406	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
407	}	428	}
408	}	429	}
409		430
410	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
411	sub coord2local {	432	sub coord2local {
412	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
413		434
		435	Carp::confess unless $self->{parent};#d#
		436
414	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
415	}	438	}
416		439
417	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
418	sub coord2global {	441	sub coord2global {
419	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
		443
		444	Carp::confess unless $self->{parent};#d#
420		445
421	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
422	}	447	}
423		448
424	sub invoke_focus_in {	449	sub invoke_focus_in {
…		…
458		483
459	sub invoke_mouse_motion { 0 }	484	sub invoke_mouse_motion { 0 }
460	sub invoke_button_up { 0 }	485	sub invoke_button_up { 0 }
461	sub invoke_key_down { 0 }	486	sub invoke_key_down { 0 }
462	sub invoke_key_up { 0 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
463		489
464	sub invoke_button_down {	490	sub invoke_button_down {
465	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
466		492
467	$self->grab_focus;	493	$self->grab_focus;
468		494
469	warn "button down $ev->{button} $x $y\n";#d#
470
471	0	495	0
472	}	496	}
473		497
474	sub connect {	498	sub connect {
475	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
476		500
477	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	}
478	}	507	}
		508
		509	sub disconnect_all {
		510	my ($self, $signal) = @_;
		511
		512	delete $self->{signal_cb}{$signal};
		513	}
		514
		515	my %has_coords = (
		516	button_down => 1,
		517	button_up => 1,
		518	mouse_motion => 1,
		519	mouse_wheel => 1,
		520	);
479		521
480	sub emit {	522	sub emit {
481	my ($self, $signal, @args) = @_;	523	my ($self, $signal, @args) = @_;
482		524
483	#d##TODO# stop propagating at first true, do not use sum	525	# I do not really like this solution, but I do not like duplication
484	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	526	# and needlessly verbose code, either.
		527	my @append
		528	= $has_coords{$signal}
		529	? $args[0]->xy ($self)
		530	: ();
		531
		532	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		533
		534	for my $cb (
		535	@{$self->{signal_cb}{$signal} || []}, # before
485	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	536	($self->can ("invoke_$signal") || sub { 1 }), # closure
		537	) {
		538	return $cb->($self, @args, @append) || next;
		539	}
		540
		541	# parent
486	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	542	$self->{parent} && $self->{parent}->emit ($signal, @args)
487	}	543	}
488		544
489	sub find_widget {	545	sub find_widget {
490	my ($self, $x, $y) = @_;	546	my ($self, $x, $y) = @_;
491		547
…		…
499	}	555	}
500		556
501	sub set_parent {	557	sub set_parent {
502	my ($self, $parent) = @_;	558	my ($self, $parent) = @_;
503		559
504	Scalar::Util::weaken ($self->{parent} = $parent);	560	CFPlus::weaken ($self->{parent} = $parent);
505	$self->set_visible if $parent->{visible};	561	$self->set_visible if $parent->{visible};
506	}	562	}
507		563
508	sub realloc {	564	sub realloc {
509	my ($self) = @_;	565	my ($self) = @_;
…		…
575	glVertex $self->{w} - 1, 0;	631	glVertex $self->{w} - 1, 0;
576	glVertex $self->{w} - 1, $self->{h} - 1;	632	glVertex $self->{w} - 1, $self->{h} - 1;
577	glVertex 0 , $self->{h} - 1;	633	glVertex 0 , $self->{h} - 1;
578	glEnd;	634	glEnd;
579	glPopMatrix;	635	glPopMatrix;
580	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	636	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
581	}	637	}
582		638
583	$self->_draw;	639	$self->_draw;
584	glPopMatrix;	640	glPopMatrix;
585	}	641	}
…		…
588	my ($self) = @_;	644	my ($self) = @_;
589		645
590	warn "no draw defined for $self\n";	646	warn "no draw defined for $self\n";
591	}	647	}
592		648
		649	my $cntx;#d#
593	sub DESTROY {	650	sub DESTROY {
594	my ($self) = @_;	651	my ($self) = @_;
595		652
596	return if CFClient::in_destruct;	653	return if CFPlus::in_destruct;
597
598	delete $WIDGET{$self+0};
599		654
600	eval { $self->destroy };	655	eval { $self->destroy };
601	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	656	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		657
		658	delete $WIDGET{$self+0};
602	}	659	}
603		660
604	#############################################################################	661	#############################################################################
605		662
606	package CFClient::UI::DrawBG;	663	package CFPlus::UI::DrawBG;
607		664
608	our @ISA = CFClient::UI::Base::;	665	our @ISA = CFPlus::UI::Base::;
609		666
610	use strict;	667	use strict;
611	use CFClient::OpenGL;	668	use CFPlus::OpenGL;
612		669
613	sub new {	670	sub new {
614	my $class = shift;	671	my $class = shift;
615		672
616	# range [value, low, high, page]	673	# range [value, low, high, page]
…		…
647	}	704	}
648	}	705	}
649		706
650	#############################################################################	707	#############################################################################
651		708
652	package CFClient::UI::Empty;	709	package CFPlus::UI::Empty;
653		710
654	our @ISA = CFClient::UI::Base::;	711	our @ISA = CFPlus::UI::Base::;
655		712
656	sub new {	713	sub new {
657	my ($class, %arg) = @_;	714	my ($class, %arg) = @_;
658	$class->SUPER::new (can_events => 0, %arg);	715	$class->SUPER::new (can_events => 0, %arg);
659	}	716	}
…		…
666		723
667	sub draw { }	724	sub draw { }
668		725
669	#############################################################################	726	#############################################################################
670		727
671	package CFClient::UI::Container;	728	package CFPlus::UI::Container;
672		729
673	our @ISA = CFClient::UI::Base::;	730	our @ISA = CFPlus::UI::Base::;
674		731
675	sub new {	732	sub new {
676	my ($class, %arg) = @_;	733	my ($class, %arg) = @_;
677		734
678	my $children = delete $arg{children};	735	my $children = delete $arg{children};
…		…
687	if $children;	744	if $children;
688		745
689	$self	746	$self
690	}	747	}
691		748
		749	sub realloc {
		750	my ($self) = @_;
		751
		752	$self->{force_realloc} = 1;
		753	$self->{force_size_alloc} = 1;
		754	$self->SUPER::realloc;
		755	}
		756
692	sub add {	757	sub add {
693	my ($self, @widgets) = @_;	758	my ($self, @widgets) = @_;
694		759
695	$_->set_parent ($self)	760	$_->set_parent ($self)
696	for @widgets;	761	for @widgets;
…		…
756	$_->draw for @{$self->{children}};	821	$_->draw for @{$self->{children}};
757	}	822	}
758		823
759	#############################################################################	824	#############################################################################
760		825
761	package CFClient::UI::Bin;	826	package CFPlus::UI::Bin;
762		827
763	our @ISA = CFClient::UI::Container::;	828	our @ISA = CFPlus::UI::Container::;
764		829
765	sub new {	830	sub new {
766	my ($class, %arg) = @_;	831	my ($class, %arg) = @_;
767		832
768	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	833	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
769		834
770	$class->SUPER::new (children => [$child], %arg)	835	$class->SUPER::new (children => [$child], %arg)
771	}	836	}
772		837
773	sub add {	838	sub add {
…		…
780	sub remove {	845	sub remove {
781	my ($self, $widget) = @_;	846	my ($self, $widget) = @_;
782		847
783	$self->SUPER::remove ($widget);	848	$self->SUPER::remove ($widget);
784		849
785	$self->{children} = [new CFClient::UI::Empty]	850	$self->{children} = [new CFPlus::UI::Empty]
786	unless @{$self->{children}};	851	unless @{$self->{children}};
787	}	852	}
788		853
789	sub child { $_[0]->{children}[0] }	854	sub child { $_[0]->{children}[0] }
790		855
…		…
802		867
803	#############################################################################	868	#############################################################################
804		869
805	# back-buffered drawing area	870	# back-buffered drawing area
806		871
807	package CFClient::UI::Window;	872	package CFPlus::UI::Window;
808		873
809	our @ISA = CFClient::UI::Bin::;	874	our @ISA = CFPlus::UI::Bin::;
810		875
811	use CFClient::OpenGL;	876	use CFPlus::OpenGL;
812		877
813	sub new {	878	sub new {
814	my ($class, %arg) = @_;	879	my ($class, %arg) = @_;
815		880
816	my $self = $class->SUPER::new (%arg);	881	my $self = $class->SUPER::new (%arg);
…		…
838	}	903	}
839		904
840	sub render_child {	905	sub render_child {
841	my ($self) = @_;	906	my ($self) = @_;
842		907
843	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	908	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
844	glClearColor 0, 0, 0, 0;	909	glClearColor 0, 0, 0, 0;
845	glClear GL_COLOR_BUFFER_BIT;	910	glClear GL_COLOR_BUFFER_BIT;
846		911
847	{	912	{
848	package CFClient::UI::Base;	913	package CFPlus::UI::Base;
849		914
850	($draw_x, $draw_y, $draw_w, $draw_h) =	915	local ($draw_x, $draw_y, $draw_w, $draw_h) =
851	(0, 0, $self->{w}, $self->{h});	916	(0, 0, $self->{w}, $self->{h});
		917
		918	$self->_render;
852	}	919	}
853
854	$self->_render;
855	};	920	};
856	}	921	}
857		922
858	sub _draw {	923	sub _draw {
859	my ($self) = @_;	924	my ($self) = @_;
860
861	my ($w, $h) = @$self{qw(w h)};
862		925
863	my $tex = $self->{texture}	926	my $tex = $self->{texture}
864	or return;	927	or return;
865		928
866	glEnable GL_TEXTURE_2D;	929	glEnable GL_TEXTURE_2D;
867	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	930	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
868	glColor 0, 0, 0, 1;	931	glColor 0, 0, 0, 1;
869		932
870	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	933	$tex->draw_quad_alpha_premultiplied (0, 0);
871		934
872	glDisable GL_TEXTURE_2D;	935	glDisable GL_TEXTURE_2D;
873	}	936	}
874		937
875	#############################################################################	938	#############################################################################
876		939
877	package CFClient::UI::ViewPort;	940	package CFPlus::UI::ViewPort;
878		941
879	our @ISA = CFClient::UI::Window::;	942	our @ISA = CFPlus::UI::Window::;
880		943
881	sub new {	944	sub new {
882	my $class = shift;	945	my $class = shift;
883		946
884	$class->SUPER::new (	947	$class->SUPER::new (
…		…
944	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1007	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
945	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1008	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
946	) {	1009	) {
947	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1010	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
948	} else {	1011	} else {
949	$self->CFClient::UI::Base::find_widget ($x, $y)	1012	$self->CFPlus::UI::Base::find_widget ($x, $y)
950	}	1013	}
951	}	1014	}
952		1015
953	sub _render {	1016	sub _render {
954	my ($self) = @_;	1017	my ($self) = @_;
955		1018
956	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1019	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
957	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1020	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
958		1021
959	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1022	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
960		1023
961	$self->SUPER::_render;	1024	$self->SUPER::_render;
962	}	1025	}
963		1026
964	#############################################################################	1027	#############################################################################
965		1028
966	package CFClient::UI::ScrolledWindow;	1029	package CFPlus::UI::ScrolledWindow;
967		1030
968	our @ISA = CFClient::UI::HBox::;	1031	our @ISA = CFPlus::UI::HBox::;
969		1032
970	sub new {	1033	sub new {
971	my ($class, %arg) = @_;	1034	my ($class, %arg) = @_;
972		1035
973	my $child = delete $arg{child};	1036	my $child = delete $arg{child};
974		1037
975	my $self;	1038	my $self;
976		1039
977	my $slider = new CFClient::UI::Slider	1040	my $slider = new CFPlus::UI::Slider
978	vertical => 1,	1041	vertical => 1,
979	range => [0, 0, 1, 0.01], # HACK fix	1042	range => [0, 0, 1, 0.01], # HACK fix
980	on_changed => sub {	1043	on_changed => sub {
981	$self->{vp}->set_offset (0, $_[1]);	1044	$self->{vp}->set_offset (0, $_[1]);
982	},	1045	},
983	;	1046	;
984		1047
985	$self = $class->SUPER::new (	1048	$self = $class->SUPER::new (
986	vp => (new CFClient::UI::ViewPort expand => 1),	1049	vp => (new CFPlus::UI::ViewPort expand => 1),
		1050	can_events => 1,
987	slider => $slider,	1051	slider => $slider,
988	%arg,	1052	%arg,
989	);	1053	);
990		1054
991	$self->SUPER::add ($self->{vp}, $self->{slider});	1055	$self->SUPER::add ($self->{vp}, $self->{slider});
992	$self->add ($child) if $child;	1056	$self->add ($child) if $child;
…		…
1000	my ($self, $widget) = @_;	1064	my ($self, $widget) = @_;
1001		1065
1002	$self->{vp}->add ($self->{child} = $widget);	1066	$self->{vp}->add ($self->{child} = $widget);
1003	}	1067	}
1004		1068
1005	sub invoke_button_down {	1069	sub invoke_mouse_wheel {
1006	my ($self, $ev) = @_;	1070	my ($self, $ev) = @_;
1007		1071
1008	warn "button down $ev->{button}\n";#d#	1072	return 0 unless $ev->{dy}; # only vertical movements
		1073
		1074	$self->{slider}->emit (mouse_wheel => $ev);
		1075
1009		1076	1
1010	0
1011	}	1077	}
1012		1078
1013	sub update_slider {	1079	sub update_slider {
1014	my ($self) = @_;	1080	my ($self) = @_;
1015		1081
…		…
1032	$self->SUPER::invoke_size_allocate ($w, $h)	1098	$self->SUPER::invoke_size_allocate ($w, $h)
1033	}	1099	}
1034		1100
1035	#############################################################################	1101	#############################################################################
1036		1102
1037	package CFClient::UI::Frame;	1103	package CFPlus::UI::Frame;
1038		1104
1039	our @ISA = CFClient::UI::Bin::;	1105	our @ISA = CFPlus::UI::Bin::;
1040		1106
1041	use CFClient::OpenGL;	1107	use CFPlus::OpenGL;
1042		1108
1043	sub new {	1109	sub new {
1044	my $class = shift;	1110	my $class = shift;
1045		1111
1046	$class->SUPER::new (	1112	$class->SUPER::new (
…		…
1072	$self->SUPER::_draw;	1138	$self->SUPER::_draw;
1073	}	1139	}
1074		1140
1075	#############################################################################	1141	#############################################################################
1076		1142
1077	package CFClient::UI::FancyFrame;	1143	package CFPlus::UI::FancyFrame;
1078		1144
1079	our @ISA = CFClient::UI::Bin::;	1145	our @ISA = CFPlus::UI::Bin::;
1080		1146
1081	use CFClient::OpenGL;	1147	use CFPlus::OpenGL;
		1148
		1149	sub new {
		1150	my ($class, %arg) = @_;
		1151
		1152	if ((exists $arg{label}) && !ref $arg{label}) {
		1153	$arg{label} = new CFPlus::UI::Label
		1154	align => 1,
		1155	valign => 0,
		1156	text => $arg{label},
		1157	fontsize => ($arg{border} || 0.8) * 0.75;
		1158	}
		1159
		1160	my $self = $class->SUPER::new (
		1161	# label => "",
		1162	fg => [0.6, 0.3, 0.1],
		1163	border => 0.8,
		1164	style => 'single',
		1165	%arg,
		1166	);
		1167
		1168	$self
		1169	}
		1170
		1171	sub add {
		1172	my ($self, @widgets) = @_;
		1173
		1174	$self->SUPER::add (@widgets);
		1175	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1176	}
		1177
		1178	sub border {
		1179	int $_[0]{border} * $::FONTSIZE
		1180	}
		1181
		1182	sub size_request {
		1183	my ($self) = @_;
		1184
		1185	($self->{label_w}, undef) = $self->{label}->size_request
		1186	if $self->{label};
		1187
		1188	my ($w, $h) = $self->SUPER::size_request;
		1189
		1190	(
		1191	$w + $self->border * 2,
		1192	$h + $self->border * 2,
		1193	)
		1194	}
		1195
		1196	sub invoke_size_allocate {
		1197	my ($self, $w, $h) = @_;
		1198
		1199	my $border = $self->border;
		1200
		1201	$w -= List::Util::max 0, $border * 2;
		1202	$h -= List::Util::max 0, $border * 2;
		1203
		1204	if (my $label = $self->{label}) {
		1205	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1206	$label->{h} = List::Util::min $h, $border;
		1207	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1208	}
		1209
		1210	$self->child->configure ($border, $border, $w, $h);
		1211
		1212	1
		1213	}
		1214
		1215	sub _draw {
		1216	my ($self) = @_;
		1217
		1218	my $child = $self->{children}[0];
		1219
		1220	my $border = $self->border;
		1221	my ($w, $h) = ($self->{w}, $self->{h});
		1222
		1223	$child->draw;
		1224
		1225	glColor @{$self->{fg}};
		1226	glBegin GL_LINE_STRIP;
		1227	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1228	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1229	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1230	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1231	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1232	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1233	glEnd;
		1234
		1235	if ($self->{label}) {
		1236	glTranslate $border * 2, 0;
		1237	$self->{label}->_draw;
		1238	}
		1239	}
		1240
		1241	#############################################################################
		1242
		1243	package CFPlus::UI::Toplevel;
		1244
		1245	our @ISA = CFPlus::UI::Bin::;
		1246
		1247	use CFPlus::OpenGL;
1082		1248
1083	my $bg =	1249	my $bg =
1084	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1250	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1085	mipmap => 1, wrap => 1;	1251	mipmap => 1, wrap => 1;
1086		1252
1087	my @border =	1253	my @border =
1088	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1254	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1089	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1255	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1090		1256
1091	sub new {	1257	sub new {
1092	my ($class, %arg) = @_;	1258	my ($class, %arg) = @_;
1093		1259
…		…
1099	min_w => 64,	1265	min_w => 64,
1100	min_h => 32,	1266	min_h => 32,
1101	%arg,	1267	%arg,
1102	);	1268	);
1103		1269
1104	$self->{title_widget} = new CFClient::UI::Label	1270	$self->{title_widget} = new CFPlus::UI::Label
1105	align => 0,	1271	align => 0,
1106	valign => 1,	1272	valign => 1,
1107	text => $self->{title},	1273	text => $self->{title},
1108	fontsize => $self->{border},	1274	fontsize => $self->{border},
1109	if exists $self->{title};	1275	if exists $self->{title};
1110		1276
1111	if ($self->{has_close_button}) {	1277	if ($self->{has_close_button}) {
1112	$self->{close_button} =	1278	$self->{close_button} =
1113	new CFClient::UI::ImageButton	1279	new CFPlus::UI::ImageButton
1114	path => 'x1_close.png',	1280	path => 'x1_close.png',
1115	on_activate => sub { $self->emit ("delete") };	1281	on_activate => sub { $self->emit ("delete") };
1116		1282
1117	$self->CFClient::UI::Container::add ($self->{close_button});	1283	$self->CFPlus::UI::Container::add ($self->{close_button});
1118	}	1284	}
1119		1285
1120	$self	1286	$self
1121	}	1287	}
1122		1288
1123	sub add {	1289	sub add {
1124	my ($self, @widgets) = @_;	1290	my ($self, @widgets) = @_;
1125		1291
1126	$self->SUPER::add (@widgets);	1292	$self->SUPER::add (@widgets);
1127	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1293	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1128	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1294	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1129	}	1295	}
1130		1296
1131	sub border {	1297	sub border {
1132	int $_[0]{border} * $::FONTSIZE	1298	int $_[0]{border} * $::FONTSIZE
1133	}	1299	}
…		…
1241	$self->{motion}->($ev, $x, $y) if $self->{motion};	1407	$self->{motion}->($ev, $x, $y) if $self->{motion};
1242		1408
1243	! ! $self->{motion}	1409	! ! $self->{motion}
1244	}	1410	}
1245		1411
		1412	sub invoke_visibility_change {
		1413	my ($self, $visible) = @_;
		1414
		1415	delete $self->{motion} unless $visible;
		1416
		1417	0
		1418	}
		1419
1246	sub _draw {	1420	sub _draw {
1247	my ($self) = @_;	1421	my ($self) = @_;
1248		1422
1249	my $child = $self->{children}[0];	1423	my $child = $self->{children}[0];
1250		1424
…		…
1287	if $self->{close_button};	1461	if $self->{close_button};
1288	}	1462	}
1289		1463
1290	#############################################################################	1464	#############################################################################
1291		1465
1292	package CFClient::UI::Table;	1466	package CFPlus::UI::Table;
1293		1467
1294	our @ISA = CFClient::UI::Base::;	1468	our @ISA = CFPlus::UI::Base::;
1295		1469
1296	use List::Util qw(max sum);	1470	use List::Util qw(max sum);
1297		1471
1298	use CFClient::OpenGL;	1472	use CFPlus::OpenGL;
1299		1473
1300	sub new {	1474	sub new {
1301	my $class = shift;	1475	my $class = shift;
1302		1476
1303	$class->SUPER::new (	1477	$class->SUPER::new (
…		…
1309	sub children {	1483	sub children {
1310	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1484	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1311	}	1485	}
1312		1486
1313	sub add {	1487	sub add {
1314	my ($self, $x, $y, $child) = @_;	1488	my ($self) = shift;
1315		1489
		1490	while (@_) {
		1491	my ($x, $y, $child) = splice @_, 0, 3, ();
1316	$child->set_parent ($self);	1492	$child->set_parent ($self);
1317	$self->{children}[$y][$x] = $child;	1493	$self->{children}[$y][$x] = $child;
		1494	}
1318		1495
		1496	$self->{force_realloc} = 1;
		1497	$self->{force_size_alloc} = 1;
1319	$self->realloc;	1498	$self->realloc;
1320	}	1499	}
1321		1500
1322	sub remove {	1501	sub remove {
1323	my ($self, $child) = @_;	1502	my ($self, $child) = @_;
…		…
1388		1567
1389	# linearly scale sizes	1568	# linearly scale sizes
1390	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1569	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1391	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1570	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1392		1571
1393	CFClient::UI::harmonize $ws;	1572	CFPlus::UI::harmonize $ws;
1394	CFClient::UI::harmonize $hs;	1573	CFPlus::UI::harmonize $hs;
1395		1574
1396	my $y;	1575	my $y;
1397		1576
1398	for my $r (0 .. $#{$self->{children}}) {	1577	for my $r (0 .. $#{$self->{children}}) {
1399	my $row = $self->{children}[$r]	1578	my $row = $self->{children}[$r]
…		…
1442	}	1621	}
1443	}	1622	}
1444		1623
1445	#############################################################################	1624	#############################################################################
1446		1625
1447	package CFClient::UI::Box;	1626	package CFPlus::UI::Box;
1448		1627
1449	our @ISA = CFClient::UI::Container::;	1628	our @ISA = CFPlus::UI::Container::;
1450		1629
1451	sub size_request {	1630	sub size_request {
1452	my ($self) = @_;	1631	my ($self) = @_;
1453		1632
1454	$self->{vertical}	1633	$self->{vertical}
…		…
1487	$req[$_] += $space * $children[$_]{expand}	1666	$req[$_] += $space * $children[$_]{expand}
1488	for 0 .. $#children;	1667	for 0 .. $#children;
1489	}	1668	}
1490	}	1669	}
1491		1670
1492	CFClient::UI::harmonize \@req;	1671	CFPlus::UI::harmonize \@req;
1493		1672
1494	my $pos = 0;	1673	my $pos = 0;
1495	for (0 .. $#children) {	1674	for (0 .. $#children) {
1496	my $alloc = $req[$_];	1675	my $alloc = $req[$_];
1497	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1676	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1502	1	1681	1
1503	}	1682	}
1504		1683
1505	#############################################################################	1684	#############################################################################
1506		1685
1507	package CFClient::UI::HBox;	1686	package CFPlus::UI::HBox;
1508		1687
1509	our @ISA = CFClient::UI::Box::;	1688	our @ISA = CFPlus::UI::Box::;
1510		1689
1511	sub new {	1690	sub new {
1512	my $class = shift;	1691	my $class = shift;
1513		1692
1514	$class->SUPER::new (	1693	$class->SUPER::new (
…		…
1517	)	1696	)
1518	}	1697	}
1519		1698
1520	#############################################################################	1699	#############################################################################
1521		1700
1522	package CFClient::UI::VBox;	1701	package CFPlus::UI::VBox;
1523		1702
1524	our @ISA = CFClient::UI::Box::;	1703	our @ISA = CFPlus::UI::Box::;
1525		1704
1526	sub new {	1705	sub new {
1527	my $class = shift;	1706	my $class = shift;
1528		1707
1529	$class->SUPER::new (	1708	$class->SUPER::new (
…		…
1532	)	1711	)
1533	}	1712	}
1534		1713
1535	#############################################################################	1714	#############################################################################
1536		1715
1537	package CFClient::UI::Label;	1716	package CFPlus::UI::Label;
1538		1717
1539	our @ISA = CFClient::UI::DrawBG::;	1718	our @ISA = CFPlus::UI::DrawBG::;
1540		1719
1541	use CFClient::OpenGL;	1720	use CFPlus::OpenGL;
1542		1721
1543	sub new {	1722	sub new {
1544	my ($class, %arg) = @_;	1723	my ($class, %arg) = @_;
1545		1724
1546	my $self = $class->SUPER::new (	1725	my $self = $class->SUPER::new (
…		…
1549	#active_bg => none	1728	#active_bg => none
1550	#font => default_font	1729	#font => default_font
1551	#text => initial text	1730	#text => initial text
1552	#markup => initial narkup	1731	#markup => initial narkup
1553	#max_w => maximum pixel width	1732	#max_w => maximum pixel width
		1733	#style => 0, # render flags
1554	ellipsise => 3, # end	1734	ellipsise => 3, # end
1555	layout => (new CFClient::Layout),	1735	layout => (new CFPlus::Layout),
1556	fontsize => 1,	1736	fontsize => 1,
1557	align => -1,	1737	align => -1,
1558	valign => -1,	1738	valign => -1,
1559	padding_x => 2,	1739	padding_x => 2,
1560	padding_y => 2,	1740	padding_y => 2,
1561	can_events => 0,	1741	can_events => 0,
1562	%arg	1742	%arg
1563	);	1743	);
1564		1744
1565	if (exists $self->{template}) {	1745	if (exists $self->{template}) {
1566	my $layout = new CFClient::Layout;	1746	my $layout = new CFPlus::Layout;
1567	$layout->set_text (delete $self->{template});	1747	$layout->set_text (delete $self->{template});
1568	$self->{template} = $layout;	1748	$self->{template} = $layout;
1569	}	1749	}
1570		1750
1571	if (exists $self->{markup}) {	1751	if (exists $self->{markup}) {
…		…
1573	} else {	1753	} else {
1574	$self->set_text (delete $self->{text});	1754	$self->set_text (delete $self->{text});
1575	}	1755	}
1576		1756
1577	$self	1757	$self
1578	}
1579
1580	sub escape($) {
1581	local $_ = $_[0];
1582
1583	s/&/&amp;/g;
1584	s/>/&gt;/g;
1585	s/</&lt;/g;
1586
1587	$_
1588	}	1758	}
1589		1759
1590	sub update {	1760	sub update {
1591	my ($self) = @_;	1761	my ($self) = @_;
1592		1762
…		…
1719	};	1889	};
1720		1890
1721	my $w = List::Util::min $self->{w} + 4, $size->[0];	1891	my $w = List::Util::min $self->{w} + 4, $size->[0];
1722	my $h = List::Util::min $self->{h} + 2, $size->[1];	1892	my $h = List::Util::min $self->{h} + 2, $size->[1];
1723		1893
1724	$self->{layout}->render ($self->{ox}, $self->{oy});	1894	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1725	}	1895	}
1726		1896
1727	#############################################################################	1897	#############################################################################
1728		1898
1729	package CFClient::UI::EntryBase;	1899	package CFPlus::UI::EntryBase;
1730		1900
1731	our @ISA = CFClient::UI::Label::;	1901	our @ISA = CFPlus::UI::Label::;
1732		1902
1733	use CFClient::OpenGL;	1903	use CFPlus::OpenGL;
1734		1904
1735	sub new {	1905	sub new {
1736	my $class = shift;	1906	my $class = shift;
1737		1907
1738	$class->SUPER::new (	1908	$class->SUPER::new (
…		…
1742	active_fg => [0, 0, 0],	1912	active_fg => [0, 0, 0],
1743	can_hover => 1,	1913	can_hover => 1,
1744	can_focus => 1,	1914	can_focus => 1,
1745	valign => 0,	1915	valign => 0,
1746	can_events => 1,	1916	can_events => 1,
		1917	ellipsise => 0,
1747	#text => ...	1918	#text => ...
1748	#hidden => "*",	1919	#hidden => "*",
1749	@_	1920	@_
1750	)	1921	)
1751	}	1922	}
…		…
1800		1971
1801	if ($uni == 8) {	1972	if ($uni == 8) {
1802	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1803	} elsif ($uni == 127) {	1974	} elsif ($uni == 127) {
1804	substr $text, $self->{cursor}, 1, "";	1975	substr $text, $self->{cursor}, 1, "";
1805	} elsif ($sym == CFClient::SDLK_LEFT) {	1976	} elsif ($sym == CFPlus::SDLK_LEFT) {
1806	--$self->{cursor} if $self->{cursor};	1977	--$self->{cursor} if $self->{cursor};
1807	} elsif ($sym == CFClient::SDLK_RIGHT) {	1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1808	++$self->{cursor} if $self->{cursor} < length $self->{text};	1979	++$self->{cursor} if $self->{cursor} < length $self->{text};
1809	} elsif ($sym == CFClient::SDLK_HOME) {	1980	} elsif ($sym == CFPlus::SDLK_HOME) {
		1981	# what a hack
		1982	$self->{cursor} =
		1983	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		1984	? length $1
		1985	: 0;
		1986	} elsif ($sym == CFPlus::SDLK_END) {
		1987	# uh, again
		1988	$self->{cursor} =
		1989	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		1990	? $self->{cursor} + length $1
		1991	: length $self->{text};
		1992	} elsif ($uni == 21) { # ctrl-u
		1993	$text = "";
1810	$self->{cursor} = 0;	1994	$self->{cursor} = 0;
1811	} elsif ($sym == CFClient::SDLK_END) {
1812	$self->{cursor} = length $text;
1813	} elsif ($uni == 27) {	1995	} elsif ($uni == 27) {
1814	$self->emit ('escape');	1996	$self->emit ('escape');
1815	} elsif ($uni) {	1997	} elsif ($uni == 0x0d) {
		1998	substr $text, $self->{cursor}++, 0, "\012";
		1999	} elsif ($uni >= 0x20) {
1816	substr $text, $self->{cursor}++, 0, chr $uni;	2000	substr $text, $self->{cursor}++, 0, chr $uni;
1817	} else {	2001	} else {
1818	return 0;	2002	return 0;
1819	}	2003	}
1820		2004
1821	$self->_set_text ($text);	2005	$self->_set_text ($text);
1822		2006
1823	$self->realloc;	2007	$self->realloc;
		2008	$self->update;
1824		2009
1825	1	2010	1
1826	}	2011	}
1827		2012
1828	sub invoke_focus_in {	2013	sub invoke_focus_in {
…		…
1890	utf8::encode $text;	2075	utf8::encode $text;
1891		2076
1892	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2077	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1893	}	2078	}
1894		2079
1895	glColor @{$self->{fg}};
1896	glBegin GL_LINES;	2080	glBegin GL_LINES;
1897	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2081	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1898	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2082	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1899	glEnd;	2083	glEnd;
1900	}	2084	}
1901	}	2085	}
1902		2086
		2087	#############################################################################
		2088
1903	package CFClient::UI::Entry;	2089	package CFPlus::UI::Entry;
1904		2090
1905	our @ISA = CFClient::UI::EntryBase::;	2091	our @ISA = CFPlus::UI::EntryBase::;
1906		2092
1907	use CFClient::OpenGL;	2093	use CFPlus::OpenGL;
1908		2094
1909	sub invoke_key_down {	2095	sub invoke_key_down {
1910	my ($self, $ev) = @_;	2096	my ($self, $ev) = @_;
1911		2097
1912	my $sym = $ev->{sym};	2098	my $sym = $ev->{sym};
1913		2099
1914	if ($sym == 13) {	2100	if ($ev->{uni} == 0x0d || $sym == 13) {
1915	unshift @{$self->{history}},	2101	unshift @{$self->{history}},
1916	my $txt = $self->get_text;	2102	my $txt = $self->get_text;
1917		2103
1918	$self->{history_pointer} = -1;	2104	$self->{history_pointer} = -1;
1919	$self->{history_saveback} = '';	2105	$self->{history_saveback} = '';
1920	$self->emit (activate => $txt);	2106	$self->emit (activate => $txt);
1921	$self->update;	2107	$self->update;
1922		2108
1923	} elsif ($sym == CFClient::SDLK_UP) {	2109	} elsif ($sym == CFPlus::SDLK_UP) {
1924	if ($self->{history_pointer} < 0) {	2110	if ($self->{history_pointer} < 0) {
1925	$self->{history_saveback} = $self->get_text;	2111	$self->{history_saveback} = $self->get_text;
1926	}	2112	}
1927	if (@{$self->{history} || []} > 0) {	2113	if (@{$self->{history} || []} > 0) {
1928	$self->{history_pointer}++;	2114	$self->{history_pointer}++;
…		…
1930	$self->{history_pointer} = @{$self->{history} || []} - 1;	2116	$self->{history_pointer} = @{$self->{history} || []} - 1;
1931	}	2117	}
1932	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2118	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1933	}	2119	}
1934		2120
1935	} elsif ($sym == CFClient::SDLK_DOWN) {	2121	} elsif ($sym == CFPlus::SDLK_DOWN) {
1936	$self->{history_pointer}--;	2122	$self->{history_pointer}--;
1937	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2123	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1938		2124
1939	if ($self->{history_pointer} >= 0) {	2125	if ($self->{history_pointer} >= 0) {
1940	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2126	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1949	1	2135	1
1950	}	2136	}
1951		2137
1952	#############################################################################	2138	#############################################################################
1953		2139
		2140	package CFPlus::UI::TextEdit;
		2141
		2142	our @ISA = CFPlus::UI::EntryBase::;
		2143
		2144	use CFPlus::OpenGL;
		2145
		2146	sub move_cursor_ver {
		2147	my ($self, $dy) = @_;
		2148
		2149	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2150
		2151	$y += $dy;
		2152
		2153	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2154	$self->{cursor} = $index;
		2155	delete $self->{cur_h};
		2156	$self->update;
		2157	return;
		2158	}
		2159	}
		2160
		2161	sub invoke_key_down {
		2162	my ($self, $ev) = @_;
		2163
		2164	my $sym = $ev->{sym};
		2165
		2166	if ($sym == CFPlus::SDLK_UP) {
		2167	$self->move_cursor_ver (-1);
		2168	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2169	$self->move_cursor_ver (+1);
		2170	} else {
		2171	return $self->SUPER::invoke_key_down ($ev)
		2172	}
		2173
		2174	1
		2175	}
		2176
		2177	#############################################################################
		2178
1954	package CFClient::UI::Button;	2179	package CFPlus::UI::Button;
1955		2180
1956	our @ISA = CFClient::UI::Label::;	2181	our @ISA = CFPlus::UI::Label::;
1957		2182
1958	use CFClient::OpenGL;	2183	use CFPlus::OpenGL;
1959		2184
1960	my @tex =	2185	my @tex =
1961	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2186	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1962	qw(b1_button_active.png);	2187	qw(b1_button_active.png);
1963		2188
1964	sub new {	2189	sub new {
1965	my $class = shift;	2190	my $class = shift;
1966		2191
…		…
2003	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
2004	}	2229	}
2005		2230
2006	#############################################################################	2231	#############################################################################
2007		2232
		2233	package CFPlus::UI::CheckBox;
		2234
		2235	our @ISA = CFPlus::UI::DrawBG::;
		2236
		2237	my @tex =
		2238	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2239	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2240
		2241	use CFPlus::OpenGL;
		2242
		2243	sub new {
		2244	my $class = shift;
		2245
		2246	$class->SUPER::new (
		2247	padding_x => 2,
		2248	padding_y => 2,
		2249	fg => [1, 1, 1],
		2250	active_fg => [1, 1, 0],
		2251	bg => [0, 0, 0, 0.2],
		2252	active_bg => [1, 1, 1, 0.5],
		2253	state => 0,
		2254	can_hover => 1,
		2255	@_
		2256	)
		2257	}
		2258
		2259	sub size_request {
		2260	my ($self) = @_;
		2261
		2262	(6) x 2
		2263	}
		2264
		2265	sub toggle {
		2266	my ($self) = @_;
		2267
		2268	$self->{state} = !$self->{state};
		2269	$self->emit (changed => $self->{state});
		2270	$self->update;
		2271	}
		2272
		2273	sub invoke_button_down {
		2274	my ($self, $ev, $x, $y) = @_;
		2275
		2276	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2277	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2278	$self->toggle;
		2279	} else {
		2280	return 0
		2281	}
		2282
		2283	1
		2284	}
		2285
		2286	sub _draw {
		2287	my ($self) = @_;
		2288
		2289	$self->SUPER::_draw;
		2290
		2291	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2292
		2293	my ($w, $h) = @$self{qw(w h)};
		2294
		2295	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2296
		2297	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2298
		2299	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2300
		2301	glEnable GL_TEXTURE_2D;
		2302	$tex->draw_quad_alpha (0, 0, $s, $s);
		2303	glDisable GL_TEXTURE_2D;
		2304	}
		2305
		2306	#############################################################################
		2307
		2308	package CFPlus::UI::Image;
		2309
		2310	our @ISA = CFPlus::UI::Base::;
		2311
		2312	use CFPlus::OpenGL;
		2313
		2314	our %texture_cache;
		2315
		2316	sub new {
		2317	my $class = shift;
		2318
		2319	my $self = $class->SUPER::new (
		2320	can_events => 0,
		2321	@_,
		2322	);
		2323
		2324	$self->{path} || $self->{tex}
		2325	or Carp::croak "'path' or 'tex' attributes required";
		2326
		2327	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2328	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2329
		2330	CFPlus::weaken $texture_cache{$self->{path}};
		2331
		2332	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2333
		2334	$self
		2335	}
		2336
		2337	sub STORABLE_freeze {
		2338	my ($self, $cloning) = @_;
		2339
		2340	$self->{path}
		2341	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2342
		2343	$self->{path}
		2344	}
		2345
		2346	sub STORABLE_attach {
		2347	my ($self, $cloning, $path) = @_;
		2348
		2349	$self->new (path => $path)
		2350	}
		2351
		2352	sub size_request {
		2353	my ($self) = @_;
		2354
		2355	($self->{tex}{w}, $self->{tex}{h})
		2356	}
		2357
		2358	sub _draw {
		2359	my ($self) = @_;
		2360
		2361	my $tex = $self->{tex};
		2362
		2363	my ($w, $h) = ($self->{w}, $self->{h});
		2364
		2365	if ($self->{rot90}) {
		2366	glRotate 90, 0, 0, 1;
		2367	glTranslate 0, -$self->{w}, 0;
		2368
		2369	($w, $h) = ($h, $w);
		2370	}
		2371
		2372	glEnable GL_TEXTURE_2D;
		2373	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2374
		2375	$tex->draw_quad (0, 0, $w, $h);
		2376
		2377	glDisable GL_TEXTURE_2D;
		2378	}
		2379
		2380	#############################################################################
		2381
2008	package CFClient::UI::ImageButton;	2382	package CFPlus::UI::ImageButton;
2009		2383
2010	our @ISA = CFClient::UI::Image::;	2384	our @ISA = CFPlus::UI::Image::;
2011		2385
2012	use CFClient::OpenGL;	2386	use CFPlus::OpenGL;
2013		2387
2014	my %textures;	2388	my %textures;
2015		2389
2016	sub new {	2390	sub new {
2017	my $class = shift;	2391	my $class = shift;
…		…
2039	1	2413	1
2040	}	2414	}
2041		2415
2042	#############################################################################	2416	#############################################################################
2043		2417
2044	package CFClient::UI::CheckBox;
2045
2046	our @ISA = CFClient::UI::DrawBG::;
2047
2048	my @tex =
2049	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2050	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2051
2052	use CFClient::OpenGL;
2053
2054	sub new {
2055	my $class = shift;
2056
2057	$class->SUPER::new (
2058	padding_x => 2,
2059	padding_y => 2,
2060	fg => [1, 1, 1],
2061	active_fg => [1, 1, 0],
2062	bg => [0, 0, 0, 0.2],
2063	active_bg => [1, 1, 1, 0.5],
2064	state => 0,
2065	can_hover => 1,
2066	@_
2067	)
2068	}
2069
2070	sub size_request {
2071	my ($self) = @_;
2072
2073	(6) x 2
2074	}
2075
2076	sub toggle {
2077	my ($self) = @_;
2078
2079	$self->{state} = !$self->{state};
2080	$self->emit (changed => $self->{state});
2081	$self->update;
2082	}
2083
2084	sub invoke_button_down {
2085	my ($self, $ev, $x, $y) = @_;
2086
2087	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2088	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2089	$self->toggle;
2090	} else {
2091	return 0
2092	}
2093
2094	1
2095	}
2096
2097	sub _draw {
2098	my ($self) = @_;
2099
2100	$self->SUPER::_draw;
2101
2102	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2103
2104	my ($w, $h) = @$self{qw(w h)};
2105
2106	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2107
2108	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2109
2110	my $tex = $self->{state} ? $tex[1] : $tex[0];
2111
2112	glEnable GL_TEXTURE_2D;
2113	$tex->draw_quad_alpha (0, 0, $s, $s);
2114	glDisable GL_TEXTURE_2D;
2115	}
2116
2117	#############################################################################
2118
2119	package CFClient::UI::Image;	2418	package CFPlus::UI::VGauge;
2120		2419
2121	our @ISA = CFClient::UI::Base::;	2420	our @ISA = CFPlus::UI::Base::;
2122
2123	use CFClient::OpenGL;
2124
2125	our %texture_cache;
2126
2127	sub new {
2128	my $class = shift;
2129
2130	my $self = $class->SUPER::new (
2131	can_events => 0,
2132	@_,
2133	);
2134
2135	$self->{path} || $self->{tex}
2136	or Carp::croak "'path' or 'tex' attributes required";
2137
2138	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2139	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2140
2141	Scalar::Util::weaken $texture_cache{$self->{path}};
2142
2143	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2144
2145	$self
2146	}
2147
2148	sub size_request {
2149	my ($self) = @_;
2150
2151	($self->{tex}{w}, $self->{tex}{h})
2152	}
2153
2154	sub _draw {
2155	my ($self) = @_;
2156
2157	my $tex = $self->{tex};
2158
2159	my ($w, $h) = ($self->{w}, $self->{h});
2160
2161	if ($self->{rot90}) {
2162	glRotate 90, 0, 0, 1;
2163	glTranslate 0, -$self->{w}, 0;
2164
2165	($w, $h) = ($h, $w);
2166	}
2167
2168	glEnable GL_TEXTURE_2D;
2169	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170
2171	$tex->draw_quad_alpha (0, 0, $w, $h);
2172
2173	glDisable GL_TEXTURE_2D;
2174	}
2175
2176	#############################################################################
2177
2178	package CFClient::UI::VGauge;
2179
2180	our @ISA = CFClient::UI::Base::;
2181		2421
2182	use List::Util qw(min max);	2422	use List::Util qw(min max);
2183		2423
2184	use CFClient::OpenGL;	2424	use CFPlus::OpenGL;
2185		2425
2186	my %tex = (	2426	my %tex = (
2187	food => [	2427	food => [
2188	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2428	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2429	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2190	],	2430	],
2191	grace => [	2431	grace => [
2192	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2432	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2193	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2433	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2194	],	2434	],
2195	hp => [	2435	hp => [
2196	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2436	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2197	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2437	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2198	],	2438	],
2199	mana => [	2439	mana => [
2200	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2440	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2201	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2441	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2202	],	2442	],
2203	);	2443	);
2204		2444
2205	# eg. VGauge->new (gauge => 'food'), default gauge: food	2445	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2308	glDisable GL_TEXTURE_2D;	2548	glDisable GL_TEXTURE_2D;
2309	}	2549	}
2310		2550
2311	#############################################################################	2551	#############################################################################
2312		2552
2313	package CFClient::UI::Gauge;	2553	package CFPlus::UI::Gauge;
2314		2554
2315	our @ISA = CFClient::UI::VBox::;	2555	our @ISA = CFPlus::UI::VBox::;
2316		2556
2317	sub new {	2557	sub new {
2318	my ($class, %arg) = @_;	2558	my ($class, %arg) = @_;
2319		2559
2320	my $self = $class->SUPER::new (	2560	my $self = $class->SUPER::new (
…		…
2322	can_hover => 1,	2562	can_hover => 1,
2323	can_events => 1,	2563	can_events => 1,
2324	%arg,	2564	%arg,
2325	);	2565	);
2326		2566
2327	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2567	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2328	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2568	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2329	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2569	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2330		2570
2331	$self	2571	$self
2332	}	2572	}
2333		2573
2334	sub set_fontsize {	2574	sub set_fontsize {
…		…
2355	$self->{value}->set_text ($val);	2595	$self->{value}->set_text ($val);
2356	}	2596	}
2357		2597
2358	#############################################################################	2598	#############################################################################
2359		2599
2360	package CFClient::UI::Slider;	2600	package CFPlus::UI::Slider;
2361		2601
2362	use strict;	2602	use strict;
2363		2603
2364	use CFClient::OpenGL;	2604	use CFPlus::OpenGL;
2365		2605
2366	our @ISA = CFClient::UI::DrawBG::;	2606	our @ISA = CFPlus::UI::DrawBG::;
2367		2607
2368	my @tex =	2608	my @tex =
2369	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2609	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2370	qw(s1_slider.png s1_slider_bg.png);	2610	qw(s1_slider.png s1_slider_bg.png);
2371		2611
2372	sub new {	2612	sub new {
2373	my $class = shift;	2613	my $class = shift;
2374		2614
…		…
2463	}	2703	}
2464		2704
2465	1	2705	1
2466	}	2706	}
2467		2707
		2708	sub invoke_mouse_wheel {
		2709	my ($self, $ev) = @_;
		2710
		2711	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2712
		2713	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2714
		2715	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2716
		2717	! ! $delta
		2718	}
		2719
2468	sub update {	2720	sub update {
2469	my ($self) = @_;	2721	my ($self) = @_;
2470		2722
2471	delete $self->{knob_w};	2723	delete $self->{knob_w};
2472	$self->SUPER::update;	2724	$self->SUPER::update;
…		…
2519	glDisable GL_TEXTURE_2D;	2771	glDisable GL_TEXTURE_2D;
2520	}	2772	}
2521		2773
2522	#############################################################################	2774	#############################################################################
2523		2775
2524	package CFClient::UI::ValSlider;	2776	package CFPlus::UI::ValSlider;
2525		2777
2526	our @ISA = CFClient::UI::HBox::;	2778	our @ISA = CFPlus::UI::HBox::;
2527		2779
2528	sub new {	2780	sub new {
2529	my ($class, %arg) = @_;	2781	my ($class, %arg) = @_;
2530		2782
2531	my $range = delete $arg{range};	2783	my $range = delete $arg{range};
2532		2784
2533	my $self = $class->SUPER::new (	2785	my $self = $class->SUPER::new (
2534	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2786	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2535	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2787	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2536	to_value => sub { shift },	2788	to_value => sub { shift },
2537	from_value => sub { shift },	2789	from_value => sub { shift },
2538	%arg,	2790	%arg,
2539	);	2791	);
2540		2792
…		…
2560	sub set_range { shift->{slider}->set_range (@_) }	2812	sub set_range { shift->{slider}->set_range (@_) }
2561	sub set_value { shift->{slider}->set_value (@_) }	2813	sub set_value { shift->{slider}->set_value (@_) }
2562		2814
2563	#############################################################################	2815	#############################################################################
2564		2816
2565	package CFClient::UI::TextScroller;	2817	package CFPlus::UI::TextScroller;
2566		2818
2567	our @ISA = CFClient::UI::HBox::;	2819	our @ISA = CFPlus::UI::HBox::;
2568		2820
2569	use CFClient::OpenGL;	2821	use CFPlus::OpenGL;
2570		2822
2571	sub new {	2823	sub new {
2572	my $class = shift;	2824	my $class = shift;
2573		2825
2574	my $self = $class->SUPER::new (	2826	my $self = $class->SUPER::new (
2575	fontsize => 1,	2827	fontsize => 1,
2576	can_events => 0,	2828	can_events => 1,
2577	indent => 0,	2829	indent => 0,
2578	#font => default_font	2830	#font => default_font
2579	@_,	2831	@_,
2580		2832
2581	layout => (new CFClient::Layout),	2833	layout => (new CFPlus::Layout),
2582	par => [],	2834	par => [],
		2835	max_par => 0,
2583	height => 0,	2836	height => 0,
2584	children => [	2837	children => [
2585	(new CFClient::UI::Empty expand => 1),	2838	(new CFPlus::UI::Empty expand => 1),
2586	(new CFClient::UI::Slider vertical => 1),	2839	(new CFPlus::UI::Slider vertical => 1),
2587	],	2840	],
2588	);	2841	);
2589		2842
2590	$self->{children}[1]->connect (changed => sub { $self->update });	2843	$self->{children}[1]->connect (changed => sub { $self->update });
2591		2844
…		…
2621		2874
2622	$self->reflow;	2875	$self->reflow;
2623		2876
2624	local $self->{children} = [$empty, $slider];	2877	local $self->{children} = [$empty, $slider];
2625	$self->SUPER::invoke_size_allocate ($w, $h)	2878	$self->SUPER::invoke_size_allocate ($w, $h)
		2879	}
		2880
		2881	sub invoke_mouse_wheel {
		2882	my ($self, $ev) = @_;
		2883
		2884	return 0 unless $ev->{dy}; # only vertical movements
		2885
		2886	$self->{children}[1]->emit (mouse_wheel => $ev);
		2887
		2888	1
2626	}	2889	}
2627		2890
2628	sub get_layout {	2891	sub get_layout {
2629	my ($self, $para) = @_;	2892	my ($self, $para) = @_;
2630		2893
…		…
2658		2921
2659	# todo: base offset on lines or so, not on pixels	2922	# todo: base offset on lines or so, not on pixels
2660	$self->{children}[1]->set_value ($offset);	2923	$self->{children}[1]->set_value ($offset);
2661	}	2924	}
2662		2925
		2926	sub current_paragraph {
		2927	my ($self) = @_;
		2928
		2929	$self->{top_paragraph} - 1
		2930	}
		2931
		2932	sub scroll_to {
		2933	my ($self, $para) = @_;
		2934
		2935	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2936
		2937	$self->{scroll_to} = $para;
		2938	$self->update;
		2939	}
		2940
2663	sub clear {	2941	sub clear {
2664	my ($self) = @_;	2942	my ($self) = @_;
2665		2943
2666	my (undef, undef, @other) = @{ $self->{children} };	2944	my (undef, undef, @other) = @{ $self->{children} };
2667	$self->remove ($_) for @other;	2945	$self->remove ($_) for @other;
…		…
2670	$self->{height} = 0;	2948	$self->{height} = 0;
2671	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2949	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2672	}	2950	}
2673		2951
2674	sub add_paragraph {	2952	sub add_paragraph {
2675	my ($self, $color, $para, $indent) = @_;	2953	my $self = shift;
2676		2954
2677	my ($text, @w) = ref $para ? @$para : $para;	2955	for my $para (@_) {
2678
2679	$para = {	2956	$para = {
		2957	fg => [1, 1, 1, 1],
		2958	indent => 0,
		2959	markup => "",
		2960	widget => [],
		2961	ref $para ? %$para : (markup => $para),
2680	w => 1e10,	2962	w => 1e10,
2681	wrapped => 1,	2963	wrapped => 1,
2682	fg => $color,
2683	indent => $indent,
2684	markup => $text,
2685	widget => \@w,
2686	};	2964	};
2687		2965
2688	$self->add (@w) if @w;	2966	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2689	push @{$self->{par}}, $para;	2967	push @{$self->{par}}, $para;
		2968	}
		2969
		2970	if (my $max = $self->{max_par}) {
		2971	shift @{$self->{par}} while @{$self->{par}} > $max;
		2972	}
2690		2973
2691	$self->{need_reflow}++;	2974	$self->{need_reflow}++;
2692	$self->update;	2975	$self->update;
2693	}	2976	}
2694		2977
2695	sub scroll_to_bottom {	2978	sub scroll_to_bottom {
2696	my ($self) = @_;	2979	my ($self) = @_;
2697		2980
2698	$self->{scroll_to_bottom} = 1;	2981	$self->{scroll_to} = $#{$self->{par}};
2699	$self->update;	2982	$self->update;
2700	}	2983	}
2701		2984
		2985	sub force_uptodate {
		2986	my ($self) = @_;
		2987
		2988	if (delete $self->{need_reflow}) {
		2989	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2990
		2991	my $height = 0;
		2992
		2993	for my $para (@{$self->{par}}) {
		2994	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2995	my $layout = $self->get_layout ($para);
		2996	my ($w, $h) = $layout->size;
		2997
		2998	$para->{w} = $w + $para->{indent};
		2999	$para->{h} = $h;
		3000	$para->{wrapped} = $layout->has_wrapped;
		3001	}
		3002
		3003	$para->{y} = $height;
		3004	$height += $para->{h};
		3005	}
		3006
		3007	$self->{height} = $height;
		3008	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3009
		3010	delete $self->{texture};
		3011	}
		3012
		3013	if (my $paridx = delete $self->{scroll_to}) {
		3014	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3015	}
		3016	}
		3017
2702	sub update {	3018	sub update {
2703	my ($self) = @_;	3019	my ($self) = @_;
2704		3020
2705	$self->SUPER::update;	3021	$self->SUPER::update;
2706		3022
2707	return unless $self->{h} > 0;	3023	return unless $self->{h} > 0;
2708		3024
2709	delete $self->{texture};	3025	delete $self->{texture};
2710		3026
2711	$ROOT->on_post_alloc ($self => sub {	3027	$ROOT->on_post_alloc ($self => sub {
		3028	$self->force_uptodate;
		3029
2712	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3030	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2713		3031
2714	if (delete $self->{need_reflow}) {
2715	my $height = 0;
2716
2717	for my $para (@{$self->{par}}) {
2718	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2719	my $layout = $self->get_layout ($para);
2720	my ($w, $h) = $layout->size;
2721
2722	$para->{w} = $w + $para->{indent};
2723	$para->{h} = $h;
2724	$para->{wrapped} = $layout->has_wrapped;
2725	}
2726
2727	$height += $para->{h};
2728	}
2729
2730	$self->{height} = $height;
2731
2732	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2733
2734	delete $self->{texture};
2735	}
2736
2737	if (delete $self->{scroll_to_bottom}) {
2738	$self->{children}[1]->set_value (1e10);
2739	}
2740
2741	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3032	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2742	glClearColor 0, 0, 0, 0;	3033	glClearColor 0, 0, 0, 0;
2743	glClear GL_COLOR_BUFFER_BIT;	3034	glClear GL_COLOR_BUFFER_BIT;
2744		3035
		3036	package CFPlus::UI::Base;
		3037	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3038	(0, 0, $self->{w}, $self->{h});
		3039
		3040	my $top = int $self->{children}[1]{range}[0];
		3041
		3042	my $paridx = 0;
		3043	my $top_paragraph;
2745	my $top = int $self->{children}[1]{range}[0];	3044	my $top = int $self->{children}[1]{range}[0];
2746		3045
2747	my $y0 = $top;	3046	my $y0 = $top;
2748	my $y1 = $top + $H;	3047	my $y1 = $top + $H;
2749		3048
2750	my $y = 0;
2751
2752	for my $para (@{$self->{par}}) {	3049	for my $para (@{$self->{par}}) {
2753	my $h = $para->{h};	3050	my $h = $para->{h};
		3051	my $y = $para->{y};
2754		3052
2755	if ($y0 < $y + $h && $y < $y1) {	3053	if ($y0 < $y + $h && $y < $y1) {
2756
2757	my $layout = $self->get_layout ($para);	3054	my $layout = $self->get_layout ($para);
2758		3055
2759	$layout->render ($para->{indent}, $y - $y0);	3056	$layout->render ($para->{indent}, $y - $y0);
2760		3057
2761	if (my @w = @{ $para->{widget} }) {	3058	if (my @w = @{ $para->{widget} }) {
…		…
2770	$_->draw;	3067	$_->draw;
2771	}	3068	}
2772	}	3069	}
2773	}	3070	}
2774		3071
2775	$y += $h;	3072	$paridx++;
		3073	$top_paragraph ||= $paridx if $y >= $top;
2776	}	3074	}
		3075
		3076	$self->{top_paragraph} = $top_paragraph;
2777	};	3077	};
2778	});	3078	});
2779	}	3079	}
2780		3080
2781	sub reconfigure {	3081	sub reconfigure {
…		…
2799	$self->{children}[1]->draw;	3099	$self->{children}[1]->draw;
2800	}	3100	}
2801		3101
2802	#############################################################################	3102	#############################################################################
2803		3103
2804	package CFClient::UI::Animator;	3104	package CFPlus::UI::Animator;
2805		3105
2806	use CFClient::OpenGL;	3106	use CFPlus::OpenGL;
2807		3107
2808	our @ISA = CFClient::UI::Bin::;	3108	our @ISA = CFPlus::UI::Bin::;
2809		3109
2810	sub moveto {	3110	sub moveto {
2811	my ($self, $x, $y) = @_;	3111	my ($self, $x, $y) = @_;
2812		3112
2813	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3113	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2841	glPopMatrix;	3141	glPopMatrix;
2842	}	3142	}
2843		3143
2844	#############################################################################	3144	#############################################################################
2845		3145
2846	package CFClient::UI::Flopper;	3146	package CFPlus::UI::Flopper;
2847		3147
2848	our @ISA = CFClient::UI::Button::;	3148	our @ISA = CFPlus::UI::Button::;
2849		3149
2850	sub new {	3150	sub new {
2851	my $class = shift;	3151	my $class = shift;
2852		3152
2853	my $self = $class->SUPER::new (	3153	my $self = $class->SUPER::new (
…		…
2865	$self->{other}->toggle_visibility;	3165	$self->{other}->toggle_visibility;
2866	}	3166	}
2867		3167
2868	#############################################################################	3168	#############################################################################
2869		3169
2870	package CFClient::UI::Tooltip;	3170	package CFPlus::UI::Tooltip;
2871		3171
2872	our @ISA = CFClient::UI::Bin::;	3172	our @ISA = CFPlus::UI::Bin::;
2873		3173
2874	use CFClient::OpenGL;	3174	use CFPlus::OpenGL;
2875		3175
2876	sub new {	3176	sub new {
2877	my $class = shift;	3177	my $class = shift;
2878		3178
2879	$class->SUPER::new (	3179	$class->SUPER::new (
…		…
2882	)	3182	)
2883	}	3183	}
2884		3184
2885	sub set_tooltip_from {	3185	sub set_tooltip_from {
2886	my ($self, $widget) = @_;	3186	my ($self, $widget) = @_;
		3187
		3188	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3189	if $widget->{tooltip} =~ /^#(.*)$/;
2887		3190
2888	my $tooltip = $widget->{tooltip};	3191	my $tooltip = $widget->{tooltip};
2889		3192
2890	if ($ENV{CFPLUS_DEBUG} & 2) {	3193	if ($ENV{CFPLUS_DEBUG} & 2) {
2891	$tooltip .= "\n\n" . (ref $widget) . "\n"	3194	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2895	}	3198	}
2896		3199
2897	$tooltip =~ s/^\n+//;	3200	$tooltip =~ s/^\n+//;
2898	$tooltip =~ s/\n+$//;	3201	$tooltip =~ s/\n+$//;
2899		3202
2900	$self->add (new CFClient::UI::Label	3203	$self->add (new CFPlus::UI::Label
2901	markup => $tooltip,	3204	markup => $tooltip,
2902	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3205	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2903	fontsize => 0.8,	3206	fontsize => 0.8,
2904	fg => [0, 0, 0, 1],	3207	style => 1, # FLAG_INVERSE
2905	ellipsise => 0,	3208	ellipsise => 0,
2906	font => ($widget->{tooltip_font} || $::FONT_PROP),	3209	font => ($widget->{tooltip_font} || $::FONT_PROP),
2907	);	3210	);
2908	}	3211	}
2909		3212
…		…
2928		3231
2929	$self->{root}->on_post_alloc ("move_$self" => sub {	3232	$self->{root}->on_post_alloc ("move_$self" => sub {
2930	my $widget = $self->{owner}	3233	my $widget = $self->{owner}
2931	or return;	3234	or return;
2932		3235
		3236	if ($widget->{visible}) {
2933	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3237	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2934		3238
2935	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3239	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2936	if $x + $self->{w} > $self->{root}{w};	3240	if $x + $self->{w} > $self->{root}{w};
2937		3241
2938	$self->move_abs ($x, $y);	3242	$self->move_abs ($x, $y);
		3243	} else {
		3244	$self->hide;
		3245	}
2939	});	3246	});
2940	}	3247	}
2941		3248
2942	sub _draw {	3249	sub _draw {
2943	my ($self) = @_;	3250	my ($self) = @_;
…		…
2967	$self->SUPER::_draw;	3274	$self->SUPER::_draw;
2968	}	3275	}
2969		3276
2970	#############################################################################	3277	#############################################################################
2971		3278
2972	package CFClient::UI::Face;	3279	package CFPlus::UI::Face;
2973		3280
2974	our @ISA = CFClient::UI::Base::;	3281	our @ISA = CFPlus::UI::DrawBG::;
2975		3282
2976	use CFClient::OpenGL;	3283	use CFPlus::OpenGL;
2977		3284
2978	sub new {	3285	sub new {
2979	my $class = shift;	3286	my $class = shift;
2980		3287
2981	my $self = $class->SUPER::new (	3288	my $self = $class->SUPER::new (
…		…
2983	can_events => 0,	3290	can_events => 0,
2984	@_,	3291	@_,
2985	);	3292	);
2986		3293
2987	if ($self->{anim} && $self->{animspeed}) {	3294	if ($self->{anim} && $self->{animspeed}) {
2988	Scalar::Util::weaken (my $widget = $self);	3295	CFPlus::weaken (my $widget = $self);
2989		3296
2990	$self->{timer} = Event->timer (	3297	$self->{timer} = Event->timer (
2991	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3298	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2992	hard => 1,	3299	hard => 1,
2993	interval => $self->{animspeed},	3300	interval => $self->{animspeed},
…		…
3016	sub _draw {	3323	sub _draw {
3017	my ($self) = @_;	3324	my ($self) = @_;
3018		3325
3019	return unless $::CONN;	3326	return unless $::CONN;
3020		3327
		3328	$self->SUPER::_draw;
		3329
3021	my $face;	3330	my $face;
3022		3331
3023	if ($self->{frame}) {	3332	if ($self->{frame}) {
3024	my $anim = $::CONN->{anim}[$self->{anim}];	3333	my $anim = $::CONN->{anim}[$self->{anim}];
3025		3334
…		…
3047	$self->SUPER::destroy;	3356	$self->SUPER::destroy;
3048	}	3357	}
3049		3358
3050	#############################################################################	3359	#############################################################################
3051		3360
3052	package CFClient::UI::Buttonbar;	3361	package CFPlus::UI::Buttonbar;
3053		3362
3054	our @ISA = CFClient::UI::HBox::;	3363	our @ISA = CFPlus::UI::HBox::;
3055		3364
3056	# TODO: should actualyl wrap buttons and other goodies.	3365	# TODO: should actually wrap buttons and other goodies.
3057		3366
3058	#############################################################################	3367	#############################################################################
3059		3368
3060	package CFClient::UI::Menu;	3369	package CFPlus::UI::Menu;
3061		3370
3062	our @ISA = CFClient::UI::FancyFrame::;	3371	our @ISA = CFPlus::UI::Toplevel::;
3063		3372
3064	use CFClient::OpenGL;	3373	use CFPlus::OpenGL;
3065		3374
3066	sub new {	3375	sub new {
3067	my $class = shift;	3376	my $class = shift;
3068		3377
3069	my $self = $class->SUPER::new (	3378	my $self = $class->SUPER::new (
3070	items => [],	3379	items => [],
3071	z => 100,	3380	z => 100,
3072	@_,	3381	@_,
3073	);	3382	);
3074		3383
3075	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3384	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3076		3385
3077	for my $item (@{ $self->{items} }) {	3386	for my $item (@{ $self->{items} }) {
3078	my ($widget, $cb, $tooltip) = @$item;	3387	my ($widget, $cb, $tooltip) = @$item;
3079		3388
3080	# handle various types of items, only text for now	3389	# handle various types of items, only text for now
3081	if (!ref $widget) {	3390	if (!ref $widget) {
3082	if ($widget =~ /\t/) {	3391	if ($widget =~ /\t/) {
3083	my ($left, $right) = split /\t/, $widget, 2;	3392	my ($left, $right) = split /\t/, $widget, 2;
3084		3393
3085	$widget = new CFClient::UI::HBox	3394	$widget = new CFPlus::UI::HBox
3086	can_hover => 1,	3395	can_hover => 1,
3087	can_events => 1,	3396	can_events => 1,
3088	tooltip => $tooltip,	3397	tooltip => $tooltip,
3089	children => [	3398	children => [
3090	(new CFClient::UI::Label markup => $left, expand => 1),	3399	(new CFPlus::UI::Label markup => $left, expand => 1),
3091	(new CFClient::UI::Label markup => $right, align => +1),	3400	(new CFPlus::UI::Label markup => $right, align => +1),
3092	],	3401	],
3093	;	3402	;
3094		3403
3095	} else {	3404	} else {
3096	$widget = new CFClient::UI::Label	3405	$widget = new CFPlus::UI::Label
3097	can_hover => 1,	3406	can_hover => 1,
3098	can_events => 1,	3407	can_events => 1,
3099	markup => $widget,	3408	markup => $widget,
3100	tooltip => $tooltip;	3409	tooltip => $tooltip;
3101	}	3410	}
…		…
3149	1	3458	1
3150	}	3459	}
3151		3460
3152	#############################################################################	3461	#############################################################################
3153		3462
3154	package CFClient::UI::Multiplexer;	3463	package CFPlus::UI::Multiplexer;
3155		3464
3156	our @ISA = CFClient::UI::Container::;	3465	our @ISA = CFPlus::UI::Container::;
3157		3466
3158	sub new {	3467	sub new {
3159	my $class = shift;	3468	my $class = shift;
3160		3469
3161	my $self = $class->SUPER::new (	3470	my $self = $class->SUPER::new (
…		…
3222	$self->{current}->draw;	3531	$self->{current}->draw;
3223	}	3532	}
3224		3533
3225	#############################################################################	3534	#############################################################################
3226		3535
3227	package CFClient::UI::Notebook;	3536	package CFPlus::UI::Notebook;
3228		3537
3229	our @ISA = CFClient::UI::VBox::;	3538	our @ISA = CFPlus::UI::VBox::;
3230		3539
3231	sub new {	3540	sub new {
3232	my $class = shift;	3541	my $class = shift;
3233		3542
3234	my $self = $class->SUPER::new (	3543	my $self = $class->SUPER::new (
3235	buttonbar => (new CFClient::UI::Buttonbar),	3544	buttonbar => (new CFPlus::UI::Buttonbar),
3236	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3545	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3237	# filter => # will be put between multiplexer and $self	3546	# filter => # will be put between multiplexer and $self
3238	@_,	3547	@_,
3239	);	3548	);
3240		3549
3241	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3550	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3245	}	3554	}
3246		3555
3247	sub add {	3556	sub add {
3248	my ($self, $title, $widget, $tooltip) = @_;	3557	my ($self, $title, $widget, $tooltip) = @_;
3249		3558
3250	Scalar::Util::weaken $self;	3559	CFPlus::weaken $self;
3251		3560
3252	$self->{buttonbar}->add (new CFClient::UI::Button	3561	$self->{buttonbar}->add (new CFPlus::UI::Button
3253	markup => $title,	3562	markup => $title,
3254	tooltip => $tooltip,	3563	tooltip => $tooltip,
3255	on_activate => sub { $self->set_current_page ($widget) },	3564	on_activate => sub { $self->set_current_page ($widget) },
3256	);	3565	);
3257		3566
…		…
3271	$self->emit (page_changed => $self->{multiplexer}{current});	3580	$self->emit (page_changed => $self->{multiplexer}{current});
3272	}	3581	}
3273		3582
3274	#############################################################################	3583	#############################################################################
3275		3584
3276	package CFClient::UI::Combobox;	3585	package CFPlus::UI::Selector;
3277		3586
3278	use utf8;	3587	use utf8;
3279		3588
3280	our @ISA = CFClient::UI::Button::;	3589	our @ISA = CFPlus::UI::Button::;
3281		3590
3282	sub new {	3591	sub new {
3283	my $class = shift;	3592	my $class = shift;
3284		3593
3285	my $self = $class->SUPER::new (	3594	my $self = $class->SUPER::new (
…		…
3302	my ($value, $title, $tooltip) = @$_;	3611	my ($value, $title, $tooltip) = @$_;
3303		3612
3304	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3613	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3305	}	3614	}
3306		3615
3307	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3616	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308	}	3617	}
3309		3618
3310	sub _set_value {	3619	sub _set_value {
3311	my ($self, $value) = @_;	3620	my ($self, $value) = @_;
3312		3621
…		…
3327	$self->emit (changed => $value);	3636	$self->emit (changed => $value);
3328	}	3637	}
3329		3638
3330	#############################################################################	3639	#############################################################################
3331		3640
3332	package CFClient::UI::Statusbox;	3641	package CFPlus::UI::Statusbox;
3333		3642
3334	our @ISA = CFClient::UI::VBox::;	3643	our @ISA = CFPlus::UI::VBox::;
3335		3644
3336	sub new {	3645	sub new {
3337	my $class = shift;	3646	my $class = shift;
3338		3647
3339	my $self = $class->SUPER::new (	3648	my $self = $class->SUPER::new (
3340	fontsize => 0.8,	3649	fontsize => 0.8,
3341	@_,	3650	@_,
3342	);	3651	);
3343		3652
3344	Scalar::Util::weaken (my $this = $self);	3653	CFPlus::weaken (my $this = $self);
3345		3654
3346	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3655	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3347		3656
3348	$self	3657	$self
3349	}	3658	}
…		…
3351	sub reorder {	3660	sub reorder {
3352	my ($self) = @_;	3661	my ($self) = @_;
3353	my $NOW = Time::HiRes::time;	3662	my $NOW = Time::HiRes::time;
3354		3663
3355	# freeze display when hovering over any label	3664	# freeze display when hovering over any label
3356	return if $CFClient::UI::TOOLTIP->{owner}	3665	return if $CFPlus::UI::TOOLTIP->{owner}
3357	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3666	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3358	values %{ $self->{item} };	3667	values %{ $self->{item} };
3359		3668
3360	while (my ($k, $v) = each %{ $self->{item} }) {	3669	while (my ($k, $v) = each %{ $self->{item} }) {
3361	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3670	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3362	}	3671	}
…		…
3383	for ($short) {	3692	for ($short) {
3384	s/^\s+//;	3693	s/^\s+//;
3385	s/\s+/ /g;	3694	s/\s+/ /g;
3386	}	3695	}
3387		3696
3388	new CFClient::UI::Label	3697	new CFPlus::UI::Label
3389	markup => $short,	3698	markup => $short,
3390	tooltip => $item->{tooltip},	3699	tooltip => $item->{tooltip},
3391	tooltip_font => $::FONT_PROP,	3700	tooltip_font => $::FONT_PROP,
3392	tooltip_width => 0.67,	3701	tooltip_width => 0.67,
3393	fontsize => $item->{fontsize} || $self->{fontsize},	3702	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3472	$self->SUPER::destroy;	3781	$self->SUPER::destroy;
3473	}	3782	}
3474		3783
3475	#############################################################################	3784	#############################################################################
3476		3785
3477	package CFClient::UI::Inventory;
3478
3479	our @ISA = CFClient::UI::Table::;
3480
3481	sub new {
3482	my $class = shift;
3483
3484	my $self = $class->SUPER::new (
3485	col_expand => [0, 1, 0],
3486	@_,
3487	);
3488
3489	$self
3490	}
3491
3492	sub set_items {
3493	my ($self, $items) = @_;
3494
3495	$self->clear;
3496	return unless $items;
3497
3498	my @items = sort {
3499	($a->{type} <=> $b->{type})
3500	or ($a->{name} cmp $b->{name})
3501	} values %$items;
3502
3503	$self->{real_items} = \@items;
3504
3505	my $row = 0;
3506	for my $item (@items) {
3507	CFClient::Item::update_widgets $item;
3508
3509	$self->add (0, $row, $item->{face_widget});
3510	$self->add (1, $row, $item->{desc_widget});
3511	$self->add (2, $row, $item->{weight_widget});
3512
3513	$row++;
3514	}
3515	}
3516
3517	#############################################################################
3518
3519	package CFClient::UI::SpellList;
3520
3521	our @ISA = CFClient::UI::Table::;
3522
3523	sub new {
3524	my $class = shift;
3525
3526	my $self = $class->SUPER::new (
3527	binding => [],
3528	commands => [],
3529	@_,
3530	)
3531	}
3532
3533	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3534
3535	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3537	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3538	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3539	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3541	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3543	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3544	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3545
3546	sub rebuild_spell_list {
3547	my ($self) = @_;
3548
3549	$CFClient::UI::ROOT->on_refresh ($self => sub {
3550	$self->clear;
3551
3552	return unless $::CONN;
3553
3554	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3555	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3556	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3557	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3558	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3559
3560	my $row = 0;
3561
3562	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3563	my $spell = $self->{spell}{$_};
3564
3565	$row++;
3566
3567	my $spell_cb = sub {
3568	my ($widget, $ev) = @_;
3569
3570	if ($ev->{button} == 1) {
3571	$::CONN->user_send ("cast $spell->{name}");
3572	} elsif ($ev->{button} == 2) {
3573	$::CONN->user_send ("invoke $spell->{name}");
3574	} elsif ($ev->{button} == 3) {
3575	(new CFClient::UI::Menu
3576	items => [
3577	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3578	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3579	],
3580	)->popup ($ev);
3581	} else {
3582	return 0;
3583	}
3584
3585	1
3586	};
3587
3588	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3589
3590	#TODO: add path info to tooltip
3591	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3592
3593	$self->add (0, $row, new CFClient::UI::Face
3594	face => $spell->{face},
3595	can_hover => 1,
3596	can_events => 1,
3597	tooltip => $tooltip,
3598	on_button_down => $spell_cb,
3599	);
3600
3601	$self->add (1, $row, new CFClient::UI::Label
3602	expand => 1,
3603	text => $spell->{name},
3604	can_hover => 1,
3605	can_events => 1,
3606	tooltip => $tooltip,
3607	on_button_down => $spell_cb,
3608	);
3609
3610	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3611	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3612	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3613	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3614	}
3615	});
3616	}
3617
3618	sub add_spell {
3619	my ($self, $spell) = @_;
3620
3621	$self->{spell}->{$spell->{name}} = $spell;
3622	$self->rebuild_spell_list;
3623	}
3624
3625	sub remove_spell {
3626	my ($self, $spell) = @_;
3627
3628	delete $self->{spell}->{$spell->{name}};
3629	$self->rebuild_spell_list;
3630	}
3631
3632	sub clear_spells {
3633	my ($self) = @_;
3634
3635	$self->{spell} = {};
3636	$self->rebuild_spell_list;
3637	}
3638
3639	#############################################################################
3640
3641	package CFClient::UI::Root;	3786	package CFPlus::UI::Root;
3642		3787
3643	our @ISA = CFClient::UI::Container::;	3788	our @ISA = CFPlus::UI::Container::;
3644		3789
3645	use List::Util qw(min max);	3790	use List::Util qw(min max);
3646		3791
3647	use CFClient::OpenGL;	3792	use CFPlus::OpenGL;
3648		3793
3649	sub new {	3794	sub new {
3650	my $class = shift;	3795	my $class = shift;
3651		3796
3652	my $self = $class->SUPER::new (	3797	my $self = $class->SUPER::new (
3653	visible => 1,	3798	visible => 1,
3654	@_,	3799	@_,
3655	);	3800	);
3656		3801
3657	Scalar::Util::weaken ($self->{root} = $self);	3802	CFPlus::weaken ($self->{root} = $self);
3658		3803
3659	$self	3804	$self
3660	}	3805	}
3661		3806
3662	sub size_request {	3807	sub size_request {
…		…
3831	$h = 0 if $h < 0;	3976	$h = 0 if $h < 0;
3832		3977
3833	$w = max $widget->{min_w}, $w;	3978	$w = max $widget->{min_w}, $w;
3834	$h = max $widget->{min_h}, $h;	3979	$h = max $widget->{min_h}, $h;
3835		3980
		3981	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3982	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3983
3836	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	3984	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	3985	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838		3986
3839	$w = int $w + 0.5;	3987	$w = int $w + 0.5;
3840	$h = int $h + 0.5;	3988	$h = int $h + 0.5;
…		…
3866	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4014	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3867	glMatrixMode GL_MODELVIEW;	4015	glMatrixMode GL_MODELVIEW;
3868	glLoadIdentity;	4016	glLoadIdentity;
3869		4017
3870	{	4018	{
3871	package CFClient::UI::Base;	4019	package CFPlus::UI::Base;
3872		4020
3873	($draw_x, $draw_y, $draw_w, $draw_h) =	4021	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3874	(0, 0, $self->{w}, $self->{h});	4022	(0, 0, $self->{w}, $self->{h});
3875	}
3876		4023
3877	$self->_draw;	4024	$self->_draw;
		4025	}
3878	}	4026	}
3879		4027
3880	#############################################################################	4028	#############################################################################
3881		4029
3882	package CFClient::UI;	4030	package CFPlus::UI;
3883		4031
3884	$ROOT = new CFClient::UI::Root;	4032	$ROOT = new CFPlus::UI::Root;
3885	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4033	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3886		4034
3887	1	4035	1
3888		4036

Diff Legend

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