ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.311 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 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 ();
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	if (!$BUTTON_STATE) {	101	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		102
		103	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
90		105
91	$GRAB = $widget;	106	$GRAB = $widget;
92	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
93		108
94	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->cb->();
95	}	110	}
96		111
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	112	if ($GRAB) {
98		113	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	114	# mousewheel
100	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	}
101	}	122	}
102		123
103	sub feed_sdl_button_up_event {	124	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	125	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		126
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	127	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		128
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	129	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		130
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	131	$GRAB->emit (button_up => $ev)
112	if $GRAB;	132	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		133
114	if (!$BUTTON_STATE) {	134	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	135	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	136	$grab->update if $grab;
117	$GRAB->update if $GRAB;	137	$GRAB->update if $GRAB;
118		138
		139	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	140	$TOOLTIP_WATCHER->cb->();
120	}	141	}
121	}	142	}
122		143
123	sub feed_sdl_motion_event {	144	sub feed_sdl_motion_event {
124	my ($ev) = @_;	145	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	146	my ($x, $y) = ($ev->{x}, $ev->{y});
126		147
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	148	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		149
129	if ($widget != $HOVER) {	150	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		151
132	$hover->update if $hover && $hover->{can_hover};	152	$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;	153	if $HOVER;
140	}	154	}
141		155
142	# convert position array to integers	156	# convert position array to integers
143	sub harmonize {	157	sub harmonize {
…		…
193	reconfigure_widgets;	207	reconfigure_widgets;
194	}	208	}
195		209
196	#############################################################################	210	#############################################################################
197		211
		212	package CFPlus::UI::Event;
		213
		214	sub xy {
		215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		216	}
		217
		218	#############################################################################
		219
198	package CFClient::UI::Base;	220	package CFPlus::UI::Base;
199		221
200	use strict;	222	use strict;
201		223
202	use CFClient::OpenGL;	224	use CFPlus::OpenGL;
203		225
204	sub new {	226	sub new {
205	my $class = shift;	227	my $class = shift;
206		228
207	my $self = bless {	229	my $self = bless {
…		…
212	h => undef,	234	h => undef,
213	can_events => 1,	235	can_events => 1,
214	@_	236	@_
215	}, $class;	237	}, $class;
216		238
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	239	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		240
219	for (keys %$self) {	241	for (keys %$self) {
220	if (/^on_(.*)$/) {	242	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	243	$self->connect ($1 => delete $self->{$_});
222	}	244	}
223	}	245	}
224		246
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	247	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$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};
227	$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};
228	$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};
229	$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};
230		252
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		255
234	$self->show if $layout->{show};	256	$self->show if $layout->{show};
…		…
239		261
240	sub destroy {	262	sub destroy {
241	my ($self) = @_;	263	my ($self) = @_;
242		264
243	$self->hide;	265	$self->hide;
		266	$self->emit ("destroy");
244	%$self = ();	267	%$self = ();
245	}	268	}
246		269
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	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	);
475		521
476	sub emit {	522	sub emit {
477	my ($self, $signal, @args) = @_;	523	my ($self, $signal, @args) = @_;
478		524
479	#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
480	(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
481	|| ($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
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	542	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	543	}
484		544
485	sub find_widget {	545	sub find_widget {
486	my ($self, $x, $y) = @_;	546	my ($self, $x, $y) = @_;
487		547
…		…
495	}	555	}
496		556
497	sub set_parent {	557	sub set_parent {
498	my ($self, $parent) = @_;	558	my ($self, $parent) = @_;
499		559
500	Scalar::Util::weaken ($self->{parent} = $parent);	560	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	561	$self->set_visible if $parent->{visible};
502	}	562	}
503		563
504	sub realloc {	564	sub realloc {
505	my ($self) = @_;	565	my ($self) = @_;
…		…
539	return unless $self->{h} && $self->{w};	599	return unless $self->{h} && $self->{w};
540		600
541	# update screen rectangle	601	# update screen rectangle
542	local $draw_x = $draw_x + $self->{x};	602	local $draw_x = $draw_x + $self->{x};
543	local $draw_y = $draw_y + $self->{y};	603	local $draw_y = $draw_y + $self->{y};
544	local $draw_w = $draw_x + $self->{w};
545	local $draw_h = $draw_y + $self->{h};
546		604
547	# skip widgets that are entirely outside the drawing area	605	# skip widgets that are entirely outside the drawing area
548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	606	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	607	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550		608
…		…
573	glVertex $self->{w} - 1, 0;	631	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;	632	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;	633	glVertex 0 , $self->{h} - 1;
576	glEnd;	634	glEnd;
577	glPopMatrix;	635	glPopMatrix;
578	#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;
579	}	637	}
580		638
581	$self->_draw;	639	$self->_draw;
582	glPopMatrix;	640	glPopMatrix;
583	}	641	}
…		…
586	my ($self) = @_;	644	my ($self) = @_;
587		645
588	warn "no draw defined for $self\n";	646	warn "no draw defined for $self\n";
589	}	647	}
590		648
		649	my $cntx;#d#
591	sub DESTROY {	650	sub DESTROY {
592	my ($self) = @_;	651	my ($self) = @_;
593		652
594	delete $WIDGET{$self+0};	653	return if CFPlus::in_destruct;
595		654
596	eval { $self->destroy };	655	eval { $self->destroy };
597	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};
598	}	659	}
599		660
600	#############################################################################	661	#############################################################################
601		662
602	package CFClient::UI::DrawBG;	663	package CFPlus::UI::DrawBG;
603		664
604	our @ISA = CFClient::UI::Base::;	665	our @ISA = CFPlus::UI::Base::;
605		666
606	use strict;	667	use strict;
607	use CFClient::OpenGL;	668	use CFPlus::OpenGL;
608		669
609	sub new {	670	sub new {
610	my $class = shift;	671	my $class = shift;
611		672
612	# range [value, low, high, page]	673	# range [value, low, high, page]
…		…
643	}	704	}
644	}	705	}
645		706
646	#############################################################################	707	#############################################################################
647		708
648	package CFClient::UI::Empty;	709	package CFPlus::UI::Empty;
649		710
650	our @ISA = CFClient::UI::Base::;	711	our @ISA = CFPlus::UI::Base::;
651		712
652	sub new {	713	sub new {
653	my ($class, %arg) = @_;	714	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	715	$class->SUPER::new (can_events => 0, %arg);
655	}	716	}
…		…
662		723
663	sub draw { }	724	sub draw { }
664		725
665	#############################################################################	726	#############################################################################
666		727
667	package CFClient::UI::Container;	728	package CFPlus::UI::Container;
668		729
669	our @ISA = CFClient::UI::Base::;	730	our @ISA = CFPlus::UI::Base::;
670		731
671	sub new {	732	sub new {
672	my ($class, %arg) = @_;	733	my ($class, %arg) = @_;
673		734
674	my $children = delete $arg{children};	735	my $children = delete $arg{children};
…		…
683	if $children;	744	if $children;
684		745
685	$self	746	$self
686	}	747	}
687		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
688	sub add {	757	sub add {
689	my ($self, @widgets) = @_;	758	my ($self, @widgets) = @_;
690		759
691	$_->set_parent ($self)	760	$_->set_parent ($self)
692	for @widgets;	761	for @widgets;
…		…
752	$_->draw for @{$self->{children}};	821	$_->draw for @{$self->{children}};
753	}	822	}
754		823
755	#############################################################################	824	#############################################################################
756		825
757	package CFClient::UI::Bin;	826	package CFPlus::UI::Bin;
758		827
759	our @ISA = CFClient::UI::Container::;	828	our @ISA = CFPlus::UI::Container::;
760		829
761	sub new {	830	sub new {
762	my ($class, %arg) = @_;	831	my ($class, %arg) = @_;
763		832
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	833	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		834
766	$class->SUPER::new (children => [$child], %arg)	835	$class->SUPER::new (children => [$child], %arg)
767	}	836	}
768		837
769	sub add {	838	sub add {
…		…
776	sub remove {	845	sub remove {
777	my ($self, $widget) = @_;	846	my ($self, $widget) = @_;
778		847
779	$self->SUPER::remove ($widget);	848	$self->SUPER::remove ($widget);
780		849
781	$self->{children} = [new CFClient::UI::Empty]	850	$self->{children} = [new CFPlus::UI::Empty]
782	unless @{$self->{children}};	851	unless @{$self->{children}};
783	}	852	}
784		853
785	sub child { $_[0]->{children}[0] }	854	sub child { $_[0]->{children}[0] }
786		855
…		…
798		867
799	#############################################################################	868	#############################################################################
800		869
801	# back-buffered drawing area	870	# back-buffered drawing area
802		871
803	package CFClient::UI::Window;	872	package CFPlus::UI::Window;
804		873
805	our @ISA = CFClient::UI::Bin::;	874	our @ISA = CFPlus::UI::Bin::;
806		875
807	use CFClient::OpenGL;	876	use CFPlus::OpenGL;
808		877
809	sub new {	878	sub new {
810	my ($class, %arg) = @_;	879	my ($class, %arg) = @_;
811		880
812	my $self = $class->SUPER::new (%arg);	881	my $self = $class->SUPER::new (%arg);
…		…
834	}	903	}
835		904
836	sub render_child {	905	sub render_child {
837	my ($self) = @_;	906	my ($self) = @_;
838		907
839	$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 {
840	glClearColor 0, 0, 0, 0;	909	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	910	glClear GL_COLOR_BUFFER_BIT;
842		911
843	{	912	{
844	package CFClient::UI::Base;	913	package CFPlus::UI::Base;
845		914
846	($draw_x, $draw_y, $draw_w, $draw_h) =	915	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	916	(0, 0, $self->{w}, $self->{h});
		917
		918	$self->_render;
848	}	919	}
849
850	$self->_render;
851	};	920	};
852	}	921	}
853		922
854	sub _draw {	923	sub _draw {
855	my ($self) = @_;	924	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		925
859	my $tex = $self->{texture}	926	my $tex = $self->{texture}
860	or return;	927	or return;
861		928
862	glEnable GL_TEXTURE_2D;	929	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	930	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	931	glColor 0, 0, 0, 1;
865		932
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	933	$tex->draw_quad_alpha_premultiplied (0, 0);
867		934
868	glDisable GL_TEXTURE_2D;	935	glDisable GL_TEXTURE_2D;
869	}	936	}
870		937
871	#############################################################################	938	#############################################################################
872		939
873	package CFClient::UI::ViewPort;	940	package CFPlus::UI::ViewPort;
874		941
875	our @ISA = CFClient::UI::Window::;	942	our @ISA = CFPlus::UI::Window::;
876		943
877	sub new {	944	sub new {
878	my $class = shift;	945	my $class = shift;
879		946
880	$class->SUPER::new (	947	$class->SUPER::new (
…		…
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1007	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1008	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	1009	) {
943	$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})
944	} else {	1011	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	1012	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	1013	}
947	}	1014	}
948		1015
949	sub _render {	1016	sub _render {
950	my ($self) = @_;	1017	my ($self) = @_;
951		1018
952	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};
953	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};
954		1021
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1022	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1023
957	$self->SUPER::_render;	1024	$self->SUPER::_render;
958	}	1025	}
959		1026
960	#############################################################################	1027	#############################################################################
961		1028
962	package CFClient::UI::ScrolledWindow;	1029	package CFPlus::UI::ScrolledWindow;
963		1030
964	our @ISA = CFClient::UI::HBox::;	1031	our @ISA = CFPlus::UI::HBox::;
965		1032
966	sub new {	1033	sub new {
967	my ($class, %arg) = @_;	1034	my ($class, %arg) = @_;
968		1035
969	my $child = delete $arg{child};	1036	my $child = delete $arg{child};
970		1037
971	my $self;	1038	my $self;
972		1039
973	my $slider = new CFClient::UI::Slider	1040	my $slider = new CFPlus::UI::Slider
974	vertical => 1,	1041	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1042	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1043	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1044	$self->{vp}->set_offset (0, $_[1]);
978	},	1045	},
979	;	1046	;
980		1047
981	$self = $class->SUPER::new (	1048	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1049	vp => (new CFPlus::UI::ViewPort expand => 1),
		1050	can_events => 1,
983	slider => $slider,	1051	slider => $slider,
984	%arg,	1052	%arg,
985	);	1053	);
986		1054
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1055	$self->SUPER::add ($self->{vp}, $self->{slider});
988	$self->add ($child) if $child;	1056	$self->add ($child) if $child;
989		1057
990	$self	1058	$self
991	}	1059	}
992		1060
		1061	#TODO# update range on size_allocate depending on child
		1062
993	sub add {	1063	sub add {
994	my ($self, $widget) = @_;	1064	my ($self, $widget) = @_;
995		1065
996	$self->{vp}->add ($self->{child} = $widget);	1066	$self->{vp}->add ($self->{child} = $widget);
997	}	1067	}
998		1068
		1069	sub invoke_mouse_wheel {
		1070	my ($self, $ev) = @_;
		1071
		1072	return 0 unless $ev->{dy}; # only vertical movements
		1073
		1074	$self->{slider}->emit (mouse_wheel => $ev);
		1075
		1076	1
		1077	}
		1078
		1079	sub update_slider {
		1080	my ($self) = @_;
		1081
		1082	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1083	}
		1084
999	sub update {	1085	sub update {
1000	my ($self) = @_;	1086	my ($self) = @_;
1001		1087
1002	$self->SUPER::update;	1088	$self->SUPER::update;
1003		1089
1004	# todo: overwrite size_allocate of child	1090	$self->update_slider;
1005	my $child = $self->{vp}->child;
1006	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1007	}	1091	}
1008		1092
1009	sub invoke_size_allocate {	1093	sub invoke_size_allocate {
1010	my ($self, $w, $h) = @_;	1094	my ($self, $w, $h) = @_;
1011		1095
1012	my $child = $self->{vp}->child;	1096	$self->update_slider;
1013	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014		1097
1015	$self->SUPER::invoke_size_allocate ($w, $h)	1098	$self->SUPER::invoke_size_allocate ($w, $h)
1016	}	1099	}
1017		1100
1018	#TODO# update range on size_allocate depending on child
1019	# update viewport offset on scroll
1020
1021	#############################################################################	1101	#############################################################################
1022		1102
1023	package CFClient::UI::Frame;	1103	package CFPlus::UI::Frame;
1024		1104
1025	our @ISA = CFClient::UI::Bin::;	1105	our @ISA = CFPlus::UI::Bin::;
1026		1106
1027	use CFClient::OpenGL;	1107	use CFPlus::OpenGL;
1028		1108
1029	sub new {	1109	sub new {
1030	my $class = shift;	1110	my $class = shift;
1031		1111
1032	$class->SUPER::new (	1112	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1138	$self->SUPER::_draw;
1059	}	1139	}
1060		1140
1061	#############################################################################	1141	#############################################################################
1062		1142
1063	package CFClient::UI::FancyFrame;	1143	package CFPlus::UI::FancyFrame;
1064		1144
1065	our @ISA = CFClient::UI::Bin::;	1145	our @ISA = CFPlus::UI::Bin::;
1066		1146
1067	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;
1068		1248
1069	my $bg =	1249	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1250	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1251	mipmap => 1, wrap => 1;
1072		1252
1073	my @border =	1253	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1254	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);	1255	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1256
1077	sub new {	1257	sub new {
1078	my ($class, %arg) = @_;	1258	my ($class, %arg) = @_;
1079		1259
1080	my $self = $class->SUPER::new (	1260	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1261	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1262	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1263	border => 0.6,
1084	can_events => 1,	1264	can_events => 1,
1085	min_w => 16,	1265	min_w => 64,
1086	min_h => 16,	1266	min_h => 32,
1087	%arg,	1267	%arg,
1088	);	1268	);
1089		1269
1090	$self->{title_widget} = new CFClient::UI::Label	1270	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1271	align => 0,
1092	valign => 1,	1272	valign => 1,
1093	text => $self->{title},	1273	text => $self->{title},
1094	fontsize => $self->{border},	1274	fontsize => $self->{border},
1095	if exists $self->{title};	1275	if exists $self->{title};
1096		1276
1097	if ($self->{has_close_button}) {	1277	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1278	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1279	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1280	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1281	on_activate => sub { $self->emit ("delete") };
1102		1282
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1283	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1284	}
1105		1285
1106	$self	1286	$self
1107	}	1287	}
1108		1288
1109	sub add {	1289	sub add {
1110	my ($self, @widgets) = @_;	1290	my ($self, @widgets) = @_;
1111		1291
1112	$self->SUPER::add (@widgets);	1292	$self->SUPER::add (@widgets);
1113	$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};
1114	$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};
1115	}	1295	}
1116		1296
1117	sub border {	1297	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1298	int $_[0]{border} * $::FONTSIZE
1119	}	1299	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1332	$self->child->configure ($border, $border, $w, $h);
1153		1333
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1334	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1335	if $self->{close_button};
1156		1336
		1337	1
		1338	}
		1339
		1340	sub invoke_delete {
		1341	my ($self) = @_;
		1342
		1343	$self->hide;
		1344
1157	1	1345	1
1158	}	1346	}
1159		1347
1160	sub invoke_button_down {	1348	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1349	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1407	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1408
1221	! ! $self->{motion}	1409	! ! $self->{motion}
1222	}	1410	}
1223		1411
		1412	sub invoke_visibility_change {
		1413	my ($self, $visible) = @_;
		1414
		1415	delete $self->{motion} unless $visible;
		1416
		1417	0
		1418	}
		1419
1224	sub _draw {	1420	sub _draw {
1225	my ($self) = @_;	1421	my ($self) = @_;
1226		1422
1227	my $child = $self->{children}[0];	1423	my $child = $self->{children}[0];
1228		1424
…		…
1265	if $self->{close_button};	1461	if $self->{close_button};
1266	}	1462	}
1267		1463
1268	#############################################################################	1464	#############################################################################
1269		1465
1270	package CFClient::UI::Table;	1466	package CFPlus::UI::Table;
1271		1467
1272	our @ISA = CFClient::UI::Base::;	1468	our @ISA = CFPlus::UI::Base::;
1273		1469
1274	use List::Util qw(max sum);	1470	use List::Util qw(max sum);
1275		1471
1276	use CFClient::OpenGL;	1472	use CFPlus::OpenGL;
1277		1473
1278	sub new {	1474	sub new {
1279	my $class = shift;	1475	my $class = shift;
1280		1476
1281	$class->SUPER::new (	1477	$class->SUPER::new (
…		…
1287	sub children {	1483	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1484	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}	1485	}
1290		1486
1291	sub add {	1487	sub add {
1292	my ($self, $x, $y, $child) = @_;	1488	my ($self) = shift;
1293		1489
		1490	while (@_) {
		1491	my ($x, $y, $child) = splice @_, 0, 3, ();
1294	$child->set_parent ($self);	1492	$child->set_parent ($self);
1295	$self->{children}[$y][$x] = $child;	1493	$self->{children}[$y][$x] = $child;
		1494	}
1296		1495
		1496	$self->{force_realloc} = 1;
		1497	$self->{force_size_alloc} = 1;
1297	$self->realloc;	1498	$self->realloc;
1298	}	1499	}
1299		1500
1300	sub remove {	1501	sub remove {
1301	my ($self, $child) = @_;	1502	my ($self, $child) = @_;
…		…
1366		1567
1367	# linearly scale sizes	1568	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1569	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1570	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1571
1371	CFClient::UI::harmonize $ws;	1572	CFPlus::UI::harmonize $ws;
1372	CFClient::UI::harmonize $hs;	1573	CFPlus::UI::harmonize $hs;
1373		1574
1374	my $y;	1575	my $y;
1375		1576
1376	for my $r (0 .. $#{$self->{children}}) {	1577	for my $r (0 .. $#{$self->{children}}) {
1377	my $row = $self->{children}[$r]	1578	my $row = $self->{children}[$r]
…		…
1420	}	1621	}
1421	}	1622	}
1422		1623
1423	#############################################################################	1624	#############################################################################
1424		1625
1425	package CFClient::UI::Box;	1626	package CFPlus::UI::Box;
1426		1627
1427	our @ISA = CFClient::UI::Container::;	1628	our @ISA = CFPlus::UI::Container::;
1428		1629
1429	sub size_request {	1630	sub size_request {
1430	my ($self) = @_;	1631	my ($self) = @_;
1431		1632
1432	$self->{vertical}	1633	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1666	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1667	for 0 .. $#children;
1467	}	1668	}
1468	}	1669	}
1469		1670
1470	CFClient::UI::harmonize \@req;	1671	CFPlus::UI::harmonize \@req;
1471		1672
1472	my $pos = 0;	1673	my $pos = 0;
1473	for (0 .. $#children) {	1674	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1675	my $alloc = $req[$_];
1475	$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));
…		…
1480	1	1681	1
1481	}	1682	}
1482		1683
1483	#############################################################################	1684	#############################################################################
1484		1685
1485	package CFClient::UI::HBox;	1686	package CFPlus::UI::HBox;
1486		1687
1487	our @ISA = CFClient::UI::Box::;	1688	our @ISA = CFPlus::UI::Box::;
1488		1689
1489	sub new {	1690	sub new {
1490	my $class = shift;	1691	my $class = shift;
1491		1692
1492	$class->SUPER::new (	1693	$class->SUPER::new (
…		…
1495	)	1696	)
1496	}	1697	}
1497		1698
1498	#############################################################################	1699	#############################################################################
1499		1700
1500	package CFClient::UI::VBox;	1701	package CFPlus::UI::VBox;
1501		1702
1502	our @ISA = CFClient::UI::Box::;	1703	our @ISA = CFPlus::UI::Box::;
1503		1704
1504	sub new {	1705	sub new {
1505	my $class = shift;	1706	my $class = shift;
1506		1707
1507	$class->SUPER::new (	1708	$class->SUPER::new (
…		…
1510	)	1711	)
1511	}	1712	}
1512		1713
1513	#############################################################################	1714	#############################################################################
1514		1715
1515	package CFClient::UI::Label;	1716	package CFPlus::UI::Label;
1516		1717
1517	our @ISA = CFClient::UI::DrawBG::;	1718	our @ISA = CFPlus::UI::DrawBG::;
1518		1719
1519	use CFClient::OpenGL;	1720	use CFPlus::OpenGL;
1520		1721
1521	sub new {	1722	sub new {
1522	my ($class, %arg) = @_;	1723	my ($class, %arg) = @_;
1523		1724
1524	my $self = $class->SUPER::new (	1725	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1728	#active_bg => none
1528	#font => default_font	1729	#font => default_font
1529	#text => initial text	1730	#text => initial text
1530	#markup => initial narkup	1731	#markup => initial narkup
1531	#max_w => maximum pixel width	1732	#max_w => maximum pixel width
		1733	#style => 0, # render flags
1532	ellipsise => 3, # end	1734	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1735	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1736	fontsize => 1,
1535	align => -1,	1737	align => -1,
1536	valign => -1,	1738	valign => -1,
1537	padding_x => 2,	1739	padding_x => 2,
1538	padding_y => 2,	1740	padding_y => 2,
1539	can_events => 0,	1741	can_events => 0,
1540	%arg	1742	%arg
1541	);	1743	);
1542		1744
1543	if (exists $self->{template}) {	1745	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1746	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1747	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1748	$self->{template} = $layout;
1547	}	1749	}
1548		1750
1549	if (exists $self->{markup}) {	1751	if (exists $self->{markup}) {
…		…
1553	}	1755	}
1554		1756
1555	$self	1757	$self
1556	}	1758	}
1557		1759
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 {	1760	sub update {
1569	my ($self) = @_;	1761	my ($self) = @_;
1570		1762
1571	delete $self->{texture};	1763	delete $self->{texture};
1572	$self->SUPER::update;	1764	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1775	my ($self, $text) = @_;
1584		1776
1585	return if $self->{text} eq "T$text";	1777	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1778	$self->{text} = "T$text";
1587		1779
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1780	$self->{layout}->set_text ($text);
1590		1781
1591	delete $self->{size_req};	1782	delete $self->{size_req};
1592	$self->realloc;	1783	$self->realloc;
1593	$self->update;	1784	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1790	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1791	$self->{text} = "M$markup";
1601		1792
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1793	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1794
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1795	$self->{layout}->set_markup ($markup);
1606		1796
1607	delete $self->{size_req};	1797	delete $self->{size_req};
1608	$self->realloc;	1798	$self->realloc;
1609	$self->update;	1799	$self->update;
…		…
1621		1811
1622	my ($w, $h) = $self->{layout}->size;	1812	my ($w, $h) = $self->{layout}->size;
1623		1813
1624	if (exists $self->{template}) {	1814	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	1815	$self->{template}->set_font ($self->{font}) if $self->{font};
		1816	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1817	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		1818
1628	my ($w2, $h2) = $self->{template}->size;	1819	my ($w2, $h2) = $self->{template}->size;
1629		1820
1630	$w = List::Util::max $w, $w2;	1821	$w = List::Util::max $w, $w2;
…		…
1654		1845
1655	sub set_fontsize {	1846	sub set_fontsize {
1656	my ($self, $fontsize) = @_;	1847	my ($self, $fontsize) = @_;
1657		1848
1658	$self->{fontsize} = $fontsize;	1849	$self->{fontsize} = $fontsize;
		1850	delete $self->{size_req};
1659	delete $self->{texture};	1851	delete $self->{texture};
1660		1852
1661	$self->realloc;	1853	$self->realloc;
1662	}	1854	}
1663		1855
1664	sub reconfigure {	1856	sub reconfigure {
1665	my ($self) = @_;	1857	my ($self) = @_;
1666		1858
1667	delete $self->{size_req};	1859	delete $self->{size_req};
		1860	delete $self->{texture};
1668		1861
1669	$self->SUPER::reconfigure;	1862	$self->SUPER::reconfigure;
1670	}	1863	}
1671		1864
1672	sub _draw {	1865	sub _draw {
1673	my ($self) = @_;	1866	my ($self) = @_;
1674		1867
1675	$self->SUPER::_draw; # draw background, if applicable	1868	$self->SUPER::_draw; # draw background, if applicable
1676		1869
1677	my $tex = $self->{texture} ||= do {	1870	my $size = $self->{texture} ||= do {
1678	$self->{layout}->set_foreground (@{$self->{fg}});	1871	$self->{layout}->set_foreground (@{$self->{fg}});
1679	$self->{layout}->set_font ($self->{font}) if $self->{font};	1872	$self->{layout}->set_font ($self->{font}) if $self->{font};
1680	$self->{layout}->set_width ($self->{w});	1873	$self->{layout}->set_width ($self->{w});
1681	$self->{layout}->set_ellipsise ($self->{ellipsise});	1874	$self->{layout}->set_ellipsise ($self->{ellipsise});
1682	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1875	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1876	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684		1877
1685	new_from_layout CFClient::Texture $self->{layout}	1878	[$self->{layout}->size]
1686	};	1879	};
1687		1880
1688	unless (exists $self->{ox}) {	1881	unless (exists $self->{ox}) {
1689	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1882	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1883	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691	: ($self->{w} - $tex->{w}) * 0.5);	1884	: ($self->{w} - $size->[0]) * 0.5);
1692		1885
1693	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1886	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1887	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695	: ($self->{h} - $tex->{h}) * 0.5);	1888	: ($self->{h} - $size->[1]) * 0.5);
1696	};	1889	};
1697		1890
1698	glEnable GL_TEXTURE_2D;
1699
1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1891	my $w = List::Util::min $self->{w} + 4, $size->[0];
1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1892	my $h = List::Util::min $self->{h} + 2, $size->[1];
1702		1893
1703	if ($tex->{format} == GL_ALPHA) {	1894	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1704	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705	glColor @{$self->{fg}};
1706	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707	} else {
1708	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710	}
1711
1712	glDisable GL_TEXTURE_2D;
1713	}	1895	}
1714		1896
1715	#############################################################################	1897	#############################################################################
1716		1898
1717	package CFClient::UI::EntryBase;	1899	package CFPlus::UI::EntryBase;
1718		1900
1719	our @ISA = CFClient::UI::Label::;	1901	our @ISA = CFPlus::UI::Label::;
1720		1902
1721	use CFClient::OpenGL;	1903	use CFPlus::OpenGL;
1722		1904
1723	sub new {	1905	sub new {
1724	my $class = shift;	1906	my $class = shift;
1725		1907
1726	$class->SUPER::new (	1908	$class->SUPER::new (
…		…
1730	active_fg => [0, 0, 0],	1912	active_fg => [0, 0, 0],
1731	can_hover => 1,	1913	can_hover => 1,
1732	can_focus => 1,	1914	can_focus => 1,
1733	valign => 0,	1915	valign => 0,
1734	can_events => 1,	1916	can_events => 1,
		1917	ellipsise => 0,
1735	#text => ...	1918	#text => ...
1736	#hidden => "*",	1919	#hidden => "*",
1737	@_	1920	@_
1738	)	1921	)
1739	}	1922	}
…		…
1788		1971
1789	if ($uni == 8) {	1972	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	1974	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	1975	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	1976	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	1977	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	1979	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	1980	} elsif ($sym == CFPlus::SDLK_HOME) {
1798	$self->{cursor} = 0;	1981	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {	1982	} elsif ($sym == CFPlus::SDLK_END) {
1800	$self->{cursor} = length $text;	1983	$self->{cursor} = length $text;
		1984	} elsif ($uni == 21) { # ctrl-u
		1985	$text = "";
		1986	$self->{cursor} = 0;
1801	} elsif ($uni == 27) {	1987	} elsif ($uni == 27) {
1802	$self->emit ('escape');	1988	$self->emit ('escape');
1803	} elsif ($uni) {	1989	} elsif ($uni >= 0x20 || $uni == 0x0d) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	1990	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	1991	} else {
1806	return 0;	1992	return 0;
1807	}	1993	}
1808		1994
1809	$self->_set_text ($text);	1995	$self->_set_text ($text);
1810		1996
1811	$self->realloc;	1997	$self->realloc;
		1998	$self->update;
1812		1999
1813	1	2000	1
1814	}	2001	}
1815		2002
1816	sub invoke_focus_in {	2003	sub invoke_focus_in {
…		…
1828		2015
1829	my $idx = $self->{layout}->xy_to_index ($x, $y);	2016	my $idx = $self->{layout}->xy_to_index ($x, $y);
1830		2017
1831	# byte-index to char-index	2018	# byte-index to char-index
1832	my $text = $self->{text};	2019	my $text = $self->{text};
1833	utf8::encode $text;	2020	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834	$self->{cursor} = length substr $text, 0, $idx;	2021	$self->{cursor} = length $text;
1835		2022
1836	$self->_set_text ($self->{text});	2023	$self->_set_text ($self->{text});
1837	$self->update;	2024	$self->update;
1838		2025
1839	1	2026	1
…		…
1878	utf8::encode $text;	2065	utf8::encode $text;
1879		2066
1880	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2067	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881	}	2068	}
1882		2069
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2070	glBegin GL_LINES;
1885	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2071	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2072	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	2073	glEnd;
1888	}	2074	}
1889	}	2075	}
1890		2076
		2077	#############################################################################
		2078
1891	package CFClient::UI::Entry;	2079	package CFPlus::UI::Entry;
1892		2080
1893	our @ISA = CFClient::UI::EntryBase::;	2081	our @ISA = CFPlus::UI::EntryBase::;
1894		2082
1895	use CFClient::OpenGL;	2083	use CFPlus::OpenGL;
1896		2084
1897	sub invoke_key_down {	2085	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2086	my ($self, $ev) = @_;
1899		2087
1900	my $sym = $ev->{sym};	2088	my $sym = $ev->{sym};
1901		2089
1902	if ($sym == 13) {	2090	if ($ev->{uni} == 0x0d || $sym == 13) {
1903	unshift @{$self->{history}},	2091	unshift @{$self->{history}},
1904	my $txt = $self->get_text;	2092	my $txt = $self->get_text;
1905		2093
1906	$self->{history_pointer} = -1;	2094	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2095	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2096	$self->emit (activate => $txt);
1909	$self->update;	2097	$self->update;
1910		2098
1911	} elsif ($sym == CFClient::SDLK_UP) {	2099	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2100	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2101	$self->{history_saveback} = $self->get_text;
1914	}	2102	}
1915	if (@{$self->{history} || []} > 0) {	2103	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2104	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2106	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2107	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2108	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2109	}
1922		2110
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2111	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2112	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2113	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2114
1927	if ($self->{history_pointer} >= 0) {	2115	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2116	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2125	1
1938	}	2126	}
1939		2127
1940	#############################################################################	2128	#############################################################################
1941		2129
		2130	package CFPlus::UI::TextEdit;
		2131
		2132	our @ISA = CFPlus::UI::EntryBase::;
		2133
		2134	use CFPlus::OpenGL;
		2135
		2136	sub move_cursor_ver {
		2137	my ($self, $dy) = @_;
		2138
		2139	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2140
		2141	$y += $dy;
		2142
		2143	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2144	$self->{cursor} = $index;
		2145	delete $self->{cur_h};
		2146	$self->update;
		2147	return;
		2148	}
		2149	}
		2150
		2151	sub invoke_key_down {
		2152	my ($self, $ev) = @_;
		2153
		2154	my $sym = $ev->{sym};
		2155
		2156	if ($sym == CFPlus::SDLK_UP) {
		2157	$self->move_cursor_ver (-1);
		2158	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2159	$self->move_cursor_ver (+1);
		2160	} else {
		2161	return $self->SUPER::invoke_key_down ($ev)
		2162	}
		2163
		2164	1
		2165	}
		2166
		2167	#############################################################################
		2168
1942	package CFClient::UI::Button;	2169	package CFPlus::UI::Button;
1943		2170
1944	our @ISA = CFClient::UI::Label::;	2171	our @ISA = CFPlus::UI::Label::;
1945		2172
1946	use CFClient::OpenGL;	2173	use CFPlus::OpenGL;
1947		2174
1948	my @tex =	2175	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2176	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2177	qw(b1_button_active.png);
1951		2178
1952	sub new {	2179	sub new {
1953	my $class = shift;	2180	my $class = shift;
1954		2181
…		…
1991	$self->SUPER::_draw;	2218	$self->SUPER::_draw;
1992	}	2219	}
1993		2220
1994	#############################################################################	2221	#############################################################################
1995		2222
		2223	package CFPlus::UI::CheckBox;
		2224
		2225	our @ISA = CFPlus::UI::DrawBG::;
		2226
		2227	my @tex =
		2228	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2229	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2230
		2231	use CFPlus::OpenGL;
		2232
		2233	sub new {
		2234	my $class = shift;
		2235
		2236	$class->SUPER::new (
		2237	padding_x => 2,
		2238	padding_y => 2,
		2239	fg => [1, 1, 1],
		2240	active_fg => [1, 1, 0],
		2241	bg => [0, 0, 0, 0.2],
		2242	active_bg => [1, 1, 1, 0.5],
		2243	state => 0,
		2244	can_hover => 1,
		2245	@_
		2246	)
		2247	}
		2248
		2249	sub size_request {
		2250	my ($self) = @_;
		2251
		2252	(6) x 2
		2253	}
		2254
		2255	sub toggle {
		2256	my ($self) = @_;
		2257
		2258	$self->{state} = !$self->{state};
		2259	$self->emit (changed => $self->{state});
		2260	$self->update;
		2261	}
		2262
		2263	sub invoke_button_down {
		2264	my ($self, $ev, $x, $y) = @_;
		2265
		2266	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2267	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2268	$self->toggle;
		2269	} else {
		2270	return 0
		2271	}
		2272
		2273	1
		2274	}
		2275
		2276	sub _draw {
		2277	my ($self) = @_;
		2278
		2279	$self->SUPER::_draw;
		2280
		2281	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2282
		2283	my ($w, $h) = @$self{qw(w h)};
		2284
		2285	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2286
		2287	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2288
		2289	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2290
		2291	glEnable GL_TEXTURE_2D;
		2292	$tex->draw_quad_alpha (0, 0, $s, $s);
		2293	glDisable GL_TEXTURE_2D;
		2294	}
		2295
		2296	#############################################################################
		2297
		2298	package CFPlus::UI::Image;
		2299
		2300	our @ISA = CFPlus::UI::Base::;
		2301
		2302	use CFPlus::OpenGL;
		2303
		2304	our %texture_cache;
		2305
		2306	sub new {
		2307	my $class = shift;
		2308
		2309	my $self = $class->SUPER::new (
		2310	can_events => 0,
		2311	@_,
		2312	);
		2313
		2314	$self->{path} || $self->{tex}
		2315	or Carp::croak "'path' or 'tex' attributes required";
		2316
		2317	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2318	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2319
		2320	CFPlus::weaken $texture_cache{$self->{path}};
		2321
		2322	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2323
		2324	$self
		2325	}
		2326
		2327	sub STORABLE_freeze {
		2328	my ($self, $cloning) = @_;
		2329
		2330	$self->{path}
		2331	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2332
		2333	$self->{path}
		2334	}
		2335
		2336	sub STORABLE_attach {
		2337	my ($self, $cloning, $path) = @_;
		2338
		2339	$self->new (path => $path)
		2340	}
		2341
		2342	sub size_request {
		2343	my ($self) = @_;
		2344
		2345	($self->{tex}{w}, $self->{tex}{h})
		2346	}
		2347
		2348	sub _draw {
		2349	my ($self) = @_;
		2350
		2351	my $tex = $self->{tex};
		2352
		2353	my ($w, $h) = ($self->{w}, $self->{h});
		2354
		2355	if ($self->{rot90}) {
		2356	glRotate 90, 0, 0, 1;
		2357	glTranslate 0, -$self->{w}, 0;
		2358
		2359	($w, $h) = ($h, $w);
		2360	}
		2361
		2362	glEnable GL_TEXTURE_2D;
		2363	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2364
		2365	$tex->draw_quad (0, 0, $w, $h);
		2366
		2367	glDisable GL_TEXTURE_2D;
		2368	}
		2369
		2370	#############################################################################
		2371
1996	package CFClient::UI::ImageButton;	2372	package CFPlus::UI::ImageButton;
1997		2373
1998	our @ISA = CFClient::UI::Image::;	2374	our @ISA = CFPlus::UI::Image::;
1999		2375
2000	use CFClient::OpenGL;	2376	use CFPlus::OpenGL;
2001		2377
2002	my %textures;	2378	my %textures;
2003		2379
2004	sub new {	2380	sub new {
2005	my $class = shift;	2381	my $class = shift;
…		…
2027	1	2403	1
2028	}	2404	}
2029		2405
2030	#############################################################################	2406	#############################################################################
2031		2407
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;	2408	package CFPlus::UI::VGauge;
2101		2409
2102	our @ISA = CFClient::UI::Base::;	2410	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		2411
2163	use List::Util qw(min max);	2412	use List::Util qw(min max);
2164		2413
2165	use CFClient::OpenGL;	2414	use CFPlus::OpenGL;
2166		2415
2167	my %tex = (	2416	my %tex = (
2168	food => [	2417	food => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2418	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2419	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171	],	2420	],
2172	grace => [	2421	grace => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2422	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/	2423	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175	],	2424	],
2176	hp => [	2425	hp => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2426	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2427	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179	],	2428	],
2180	mana => [	2429	mana => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2430	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/	2431	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183	],	2432	],
2184	);	2433	);
2185		2434
2186	# eg. VGauge->new (gauge => 'food'), default gauge: food	2435	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2246	my $ycut1 = max 0, min 1, $ycut;	2495	my $ycut1 = max 0, min 1, $ycut;
2247	my $ycut2 = max 0, min 1, $ycut - 1;	2496	my $ycut2 = max 0, min 1, $ycut - 1;
2248		2497
2249	my $h1 = $self->{h} * (1 - $ycut1);	2498	my $h1 = $self->{h} * (1 - $ycut1);
2250	my $h2 = $self->{h} * (1 - $ycut2);	2499	my $h2 = $self->{h} * (1 - $ycut2);
		2500	my $h3 = $self->{h};
		2501
		2502	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251		2503
2252	glEnable GL_BLEND;	2504	glEnable GL_BLEND;
2253	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2505	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2506	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255	glEnable GL_TEXTURE_2D;	2507	glEnable GL_TEXTURE_2D;
…		…
2274		2526
2275	if ($t3) {	2527	if ($t3) {
2276	glBindTexture GL_TEXTURE_2D, $t3->{name};	2528	glBindTexture GL_TEXTURE_2D, $t3->{name};
2277	glBegin GL_QUADS;	2529	glBegin GL_QUADS;
2278	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2530	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2531	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2532	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2533	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282	glEnd;	2534	glEnd;
2283	}	2535	}
2284		2536
2285	glDisable GL_BLEND;	2537	glDisable GL_BLEND;
2286	glDisable GL_TEXTURE_2D;	2538	glDisable GL_TEXTURE_2D;
2287	}	2539	}
2288		2540
2289	#############################################################################	2541	#############################################################################
2290		2542
2291	package CFClient::UI::Gauge;	2543	package CFPlus::UI::Gauge;
2292		2544
2293	our @ISA = CFClient::UI::VBox::;	2545	our @ISA = CFPlus::UI::VBox::;
2294		2546
2295	sub new {	2547	sub new {
2296	my ($class, %arg) = @_;	2548	my ($class, %arg) = @_;
2297		2549
2298	my $self = $class->SUPER::new (	2550	my $self = $class->SUPER::new (
…		…
2300	can_hover => 1,	2552	can_hover => 1,
2301	can_events => 1,	2553	can_events => 1,
2302	%arg,	2554	%arg,
2303	);	2555	);
2304		2556
2305	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2557	$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);	2558	$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");	2559	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308		2560
2309	$self	2561	$self
2310	}	2562	}
2311		2563
2312	sub set_fontsize {	2564	sub set_fontsize {
…		…
2333	$self->{value}->set_text ($val);	2585	$self->{value}->set_text ($val);
2334	}	2586	}
2335		2587
2336	#############################################################################	2588	#############################################################################
2337		2589
2338	package CFClient::UI::Slider;	2590	package CFPlus::UI::Slider;
2339		2591
2340	use strict;	2592	use strict;
2341		2593
2342	use CFClient::OpenGL;	2594	use CFPlus::OpenGL;
2343		2595
2344	our @ISA = CFClient::UI::DrawBG::;	2596	our @ISA = CFPlus::UI::DrawBG::;
2345		2597
2346	my @tex =	2598	my @tex =
2347	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2599	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348	qw(s1_slider.png s1_slider_bg.png);	2600	qw(s1_slider.png s1_slider_bg.png);
2349		2601
2350	sub new {	2602	sub new {
2351	my $class = shift;	2603	my $class = shift;
2352		2604
…		…
2441	}	2693	}
2442		2694
2443	1	2695	1
2444	}	2696	}
2445		2697
		2698	sub invoke_mouse_wheel {
		2699	my ($self, $ev) = @_;
		2700
		2701	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2702
		2703	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2704
		2705	! ! $delta
		2706	}
		2707
2446	sub update {	2708	sub update {
2447	my ($self) = @_;	2709	my ($self) = @_;
2448		2710
2449	delete $self->{knob_w};	2711	delete $self->{knob_w};
2450	$self->SUPER::update;	2712	$self->SUPER::update;
…		…
2497	glDisable GL_TEXTURE_2D;	2759	glDisable GL_TEXTURE_2D;
2498	}	2760	}
2499		2761
2500	#############################################################################	2762	#############################################################################
2501		2763
2502	package CFClient::UI::ValSlider;	2764	package CFPlus::UI::ValSlider;
2503		2765
2504	our @ISA = CFClient::UI::HBox::;	2766	our @ISA = CFPlus::UI::HBox::;
2505		2767
2506	sub new {	2768	sub new {
2507	my ($class, %arg) = @_;	2769	my ($class, %arg) = @_;
2508		2770
2509	my $range = delete $arg{range};	2771	my $range = delete $arg{range};
2510		2772
2511	my $self = $class->SUPER::new (	2773	my $self = $class->SUPER::new (
2512	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2774	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2775	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514	to_value => sub { shift },	2776	to_value => sub { shift },
2515	from_value => sub { shift },	2777	from_value => sub { shift },
2516	%arg,	2778	%arg,
2517	);	2779	);
2518		2780
…		…
2538	sub set_range { shift->{slider}->set_range (@_) }	2800	sub set_range { shift->{slider}->set_range (@_) }
2539	sub set_value { shift->{slider}->set_value (@_) }	2801	sub set_value { shift->{slider}->set_value (@_) }
2540		2802
2541	#############################################################################	2803	#############################################################################
2542		2804
2543	package CFClient::UI::TextScroller;	2805	package CFPlus::UI::TextScroller;
2544		2806
2545	our @ISA = CFClient::UI::HBox::;	2807	our @ISA = CFPlus::UI::HBox::;
2546		2808
2547	use CFClient::OpenGL;	2809	use CFPlus::OpenGL;
2548		2810
2549	sub new {	2811	sub new {
2550	my $class = shift;	2812	my $class = shift;
2551		2813
2552	my $self = $class->SUPER::new (	2814	my $self = $class->SUPER::new (
2553	fontsize => 1,	2815	fontsize => 1,
2554	can_events => 0,	2816	can_events => 1,
2555	indent => 0,	2817	indent => 0,
2556	#font => default_font	2818	#font => default_font
2557	@_,	2819	@_,
2558		2820
2559	layout => (new CFClient::Layout 1),	2821	layout => (new CFPlus::Layout),
2560	par => [],	2822	par => [],
2561	height => 0,	2823	height => 0,
2562	children => [	2824	children => [
2563	(new CFClient::UI::Empty expand => 1),	2825	(new CFPlus::UI::Empty expand => 1),
2564	(new CFClient::UI::Slider vertical => 1),	2826	(new CFPlus::UI::Slider vertical => 1),
2565	],	2827	],
2566	);	2828	);
2567		2829
2568	$self->{children}[1]->connect (changed => sub { $self->update });	2830	$self->{children}[1]->connect (changed => sub { $self->update });
2569		2831
…		…
2575		2837
2576	$self->{fontsize} = $fontsize;	2838	$self->{fontsize} = $fontsize;
2577	$self->reflow;	2839	$self->reflow;
2578	}	2840	}
2579		2841
2580	sub visible_children {	2842	sub size_request {
2581	my ($self) = @_;	2843	my ($self) = @_;
2582		2844
2583	@{$self->{children}}[0,1]	2845	my ($empty, $slider) = @{ $self->{children} };
		2846
		2847	local $self->{children} = [$empty, $slider];
		2848	$self->SUPER::size_request
2584	}	2849	}
2585		2850
2586	sub invoke_size_allocate {	2851	sub invoke_size_allocate {
2587	my ($self, $w, $h) = @_;	2852	my ($self, $w, $h) = @_;
2588		2853
…		…
2594	$self->{layout}->set_width ($empty->{w});	2859	$self->{layout}->set_width ($empty->{w});
2595	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2860	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596		2861
2597	$self->reflow;	2862	$self->reflow;
2598		2863
		2864	local $self->{children} = [$empty, $slider];
2599	$self->SUPER::invoke_size_allocate ($w, $h)	2865	$self->SUPER::invoke_size_allocate ($w, $h)
		2866	}
		2867
		2868	sub invoke_mouse_wheel {
		2869	my ($self, $ev) = @_;
		2870
		2871	return 0 unless $ev->{dy}; # only vertical movements
		2872
		2873	$self->{children}[1]->emit (mouse_wheel => $ev);
		2874
		2875	1
2600	}	2876	}
2601		2877
2602	sub get_layout {	2878	sub get_layout {
2603	my ($self, $para) = @_;	2879	my ($self, $para) = @_;
2604		2880
…		…
2632		2908
2633	# todo: base offset on lines or so, not on pixels	2909	# todo: base offset on lines or so, not on pixels
2634	$self->{children}[1]->set_value ($offset);	2910	$self->{children}[1]->set_value ($offset);
2635	}	2911	}
2636		2912
		2913	sub current_paragraph {
		2914	my ($self) = @_;
		2915
		2916	$self->{top_paragraph} - 1
		2917	}
		2918
		2919	sub scroll_to {
		2920	my ($self, $para) = @_;
		2921
		2922	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2923
		2924	$self->{scroll_to} = $para;
		2925	$self->update;
		2926	}
		2927
2637	sub clear {	2928	sub clear {
2638	my ($self) = @_;	2929	my ($self) = @_;
2639		2930
2640	my (undef, undef, @other) = @{ $self->{children} };	2931	my (undef, undef, @other) = @{ $self->{children} };
2641	$self->remove ($_) for @other;	2932	$self->remove ($_) for @other;
…		…
2644	$self->{height} = 0;	2935	$self->{height} = 0;
2645	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2936	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646	}	2937	}
2647		2938
2648	sub add_paragraph {	2939	sub add_paragraph {
2649	my ($self, $color, $para, $indent) = @_;	2940	my $self = shift;
2650		2941
2651	my ($text, @w) = ref $para ? @$para : $para;	2942	for my $para (@_) {
2652
2653	$para = {	2943	$para = {
		2944	fg => [1, 1, 1, 1],
		2945	indent => 0,
		2946	markup => "",
		2947	widget => [],
		2948	ref $para ? %$para : (markup => $para),
2654	w => 1e10,	2949	w => 1e10,
2655	wrapped => 1,	2950	wrapped => 1,
2656	fg => $color,
2657	indent => $indent,
2658	markup => $text,
2659	widget => \@w,
2660	};	2951	};
2661		2952
2662	$self->add (@w) if @w;	2953	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663	push @{$self->{par}}, $para;	2954	push @{$self->{par}}, $para;
		2955	}
2664		2956
2665	$self->{need_reflow}++;	2957	$self->{need_reflow}++;
2666	$self->update;	2958	$self->update;
2667	}	2959	}
2668		2960
2669	sub scroll_to_bottom {	2961	sub scroll_to_bottom {
2670	my ($self) = @_;	2962	my ($self) = @_;
2671		2963
2672	$self->{scroll_to_bottom} = 1;	2964	$self->{scroll_to} = $#{$self->{par}};
2673	$self->update;	2965	$self->update;
2674	}	2966	}
2675		2967
		2968	sub force_uptodate {
		2969	my ($self) = @_;
		2970
		2971	if (delete $self->{need_reflow}) {
		2972	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2973
		2974	my $height = 0;
		2975
		2976	for my $para (@{$self->{par}}) {
		2977	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2978	my $layout = $self->get_layout ($para);
		2979	my ($w, $h) = $layout->size;
		2980
		2981	$para->{w} = $w + $para->{indent};
		2982	$para->{h} = $h;
		2983	$para->{wrapped} = $layout->has_wrapped;
		2984	}
		2985
		2986	$para->{y} = $height;
		2987	$height += $para->{h};
		2988	}
		2989
		2990	$self->{height} = $height;
		2991	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2992
		2993	delete $self->{texture};
		2994	}
		2995
		2996	if (my $paridx = delete $self->{scroll_to}) {
		2997	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2998	}
		2999	}
		3000
2676	sub update {	3001	sub update {
2677	my ($self) = @_;	3002	my ($self) = @_;
2678		3003
2679	$self->SUPER::update;	3004	$self->SUPER::update;
2680		3005
2681	return unless $self->{h} > 0;	3006	return unless $self->{h} > 0;
2682		3007
2683	delete $self->{texture};	3008	delete $self->{texture};
2684		3009
2685	$ROOT->on_post_alloc ($self => sub {	3010	$ROOT->on_post_alloc ($self => sub {
		3011	$self->force_uptodate;
		3012
2686	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3013	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687		3014
2688	if (delete $self->{need_reflow}) {
2689	my $height = 0;
2690
2691	for my $para (@{$self->{par}}) {
2692	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2693	my $layout = $self->get_layout ($para);
2694	my ($w, $h) = $layout->size;
2695
2696	$para->{w} = $w + $para->{indent};
2697	$para->{h} = $h;
2698	$para->{wrapped} = $layout->has_wrapped;
2699	}
2700
2701	$height += $para->{h};
2702	}
2703
2704	$self->{height} = $height;
2705
2706	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2707
2708	delete $self->{texture};
2709	}
2710
2711	if (delete $self->{scroll_to_bottom}) {
2712	$self->{children}[1]->set_value (1e10);
2713	}
2714
2715	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3015	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716	glClearColor 0, 0, 0, 0;	3016	glClearColor 0, 0, 0, 0;
2717	glClear GL_COLOR_BUFFER_BIT;	3017	glClear GL_COLOR_BUFFER_BIT;
2718		3018
		3019	package CFPlus::UI::Base;
		3020	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3021	(0, 0, $self->{w}, $self->{h});
		3022
		3023	my $top = int $self->{children}[1]{range}[0];
		3024
		3025	my $paridx = 0;
		3026	my $top_paragraph;
2719	my $top = int $self->{children}[1]{range}[0];	3027	my $top = int $self->{children}[1]{range}[0];
2720		3028
2721	my $y0 = $top;	3029	my $y0 = $top;
2722	my $y1 = $top + $H;	3030	my $y1 = $top + $H;
2723		3031
2724	my $y = 0;
2725
2726	glEnable GL_BLEND;
2727	#TODO# not correct in windows where rgba is forced off
2728	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2729
2730	for my $para (@{$self->{par}}) {	3032	for my $para (@{$self->{par}}) {
2731	my $h = $para->{h};	3033	my $h = $para->{h};
		3034	my $y = $para->{y};
2732		3035
2733	if ($y0 < $y + $h && $y < $y1) {	3036	if ($y0 < $y + $h && $y < $y1) {
2734
2735	my $layout = $self->get_layout ($para);	3037	my $layout = $self->get_layout ($para);
2736		3038
2737	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739	glRasterPos $para->{indent}, $y - $y0;	3039	$layout->render ($para->{indent}, $y - $y0);
2740	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741		3040
2742	if (my @w = @{ $para->{widget} }) {	3041	if (my @w = @{ $para->{widget} }) {
2743	my @s = $layout->get_shapes;	3042	my @s = $layout->get_shapes;
2744		3043
2745	for (@w) {	3044	for (@w) {
…		…
2751	$_->draw;	3050	$_->draw;
2752	}	3051	}
2753	}	3052	}
2754	}	3053	}
2755		3054
2756	$y += $h;	3055	$paridx++;
		3056	$top_paragraph ||= $paridx if $y >= $top;
2757	}	3057	}
2758		3058
2759	glDisable GL_BLEND;	3059	$self->{top_paragraph} = $top_paragraph;
2760	};	3060	};
2761	});	3061	});
2762	}	3062	}
2763		3063
2764	sub reconfigure {	3064	sub reconfigure {
…		…
2782	$self->{children}[1]->draw;	3082	$self->{children}[1]->draw;
2783	}	3083	}
2784		3084
2785	#############################################################################	3085	#############################################################################
2786		3086
2787	package CFClient::UI::Animator;	3087	package CFPlus::UI::Animator;
2788		3088
2789	use CFClient::OpenGL;	3089	use CFPlus::OpenGL;
2790		3090
2791	our @ISA = CFClient::UI::Bin::;	3091	our @ISA = CFPlus::UI::Bin::;
2792		3092
2793	sub moveto {	3093	sub moveto {
2794	my ($self, $x, $y) = @_;	3094	my ($self, $x, $y) = @_;
2795		3095
2796	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3096	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2824	glPopMatrix;	3124	glPopMatrix;
2825	}	3125	}
2826		3126
2827	#############################################################################	3127	#############################################################################
2828		3128
2829	package CFClient::UI::Flopper;	3129	package CFPlus::UI::Flopper;
2830		3130
2831	our @ISA = CFClient::UI::Button::;	3131	our @ISA = CFPlus::UI::Button::;
2832		3132
2833	sub new {	3133	sub new {
2834	my $class = shift;	3134	my $class = shift;
2835		3135
2836	my $self = $class->SUPER::new (	3136	my $self = $class->SUPER::new (
…		…
2848	$self->{other}->toggle_visibility;	3148	$self->{other}->toggle_visibility;
2849	}	3149	}
2850		3150
2851	#############################################################################	3151	#############################################################################
2852		3152
2853	package CFClient::UI::Tooltip;	3153	package CFPlus::UI::Tooltip;
2854		3154
2855	our @ISA = CFClient::UI::Bin::;	3155	our @ISA = CFPlus::UI::Bin::;
2856		3156
2857	use CFClient::OpenGL;	3157	use CFPlus::OpenGL;
2858		3158
2859	sub new {	3159	sub new {
2860	my $class = shift;	3160	my $class = shift;
2861		3161
2862	$class->SUPER::new (	3162	$class->SUPER::new (
…		…
2865	)	3165	)
2866	}	3166	}
2867		3167
2868	sub set_tooltip_from {	3168	sub set_tooltip_from {
2869	my ($self, $widget) = @_;	3169	my ($self, $widget) = @_;
		3170
		3171	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3172	if $widget->{tooltip} =~ /^#(.*)$/;
2870		3173
2871	my $tooltip = $widget->{tooltip};	3174	my $tooltip = $widget->{tooltip};
2872		3175
2873	if ($ENV{CFPLUS_DEBUG} & 2) {	3176	if ($ENV{CFPLUS_DEBUG} & 2) {
2874	$tooltip .= "\n\n" . (ref $widget) . "\n"	3177	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2878	}	3181	}
2879		3182
2880	$tooltip =~ s/^\n+//;	3183	$tooltip =~ s/^\n+//;
2881	$tooltip =~ s/\n+$//;	3184	$tooltip =~ s/\n+$//;
2882		3185
2883	$self->add (new CFClient::UI::Label	3186	$self->add (new CFPlus::UI::Label
2884	markup => $tooltip,	3187	markup => $tooltip,
2885	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3188	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886	fontsize => 0.8,	3189	fontsize => 0.8,
2887	fg => [0, 0, 0, 1],	3190	style => 1, # FLAG_INVERSE
2888	ellipsise => 0,	3191	ellipsise => 0,
2889	font => ($widget->{tooltip_font} || $::FONT_PROP),	3192	font => ($widget->{tooltip_font} || $::FONT_PROP),
2890	);	3193	);
2891	}	3194	}
2892		3195
…		…
2911		3214
2912	$self->{root}->on_post_alloc ("move_$self" => sub {	3215	$self->{root}->on_post_alloc ("move_$self" => sub {
2913	my $widget = $self->{owner}	3216	my $widget = $self->{owner}
2914	or return;	3217	or return;
2915		3218
		3219	if ($widget->{visible}) {
2916	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3220	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917		3221
2918	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3222	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919	if $x + $self->{w} > $self->{root}{w};	3223	if $x + $self->{w} > $self->{root}{w};
2920		3224
2921	$self->move_abs ($x, $y);	3225	$self->move_abs ($x, $y);
		3226	} else {
		3227	$self->hide;
		3228	}
2922	});	3229	});
2923	}	3230	}
2924		3231
2925	sub _draw {	3232	sub _draw {
2926	my ($self) = @_;	3233	my ($self) = @_;
…		…
2950	$self->SUPER::_draw;	3257	$self->SUPER::_draw;
2951	}	3258	}
2952		3259
2953	#############################################################################	3260	#############################################################################
2954		3261
2955	package CFClient::UI::Face;	3262	package CFPlus::UI::Face;
2956		3263
2957	our @ISA = CFClient::UI::Base::;	3264	our @ISA = CFPlus::UI::DrawBG::;
2958		3265
2959	use CFClient::OpenGL;	3266	use CFPlus::OpenGL;
2960		3267
2961	sub new {	3268	sub new {
2962	my $class = shift;	3269	my $class = shift;
2963		3270
2964	my $self = $class->SUPER::new (	3271	my $self = $class->SUPER::new (
…		…
2966	can_events => 0,	3273	can_events => 0,
2967	@_,	3274	@_,
2968	);	3275	);
2969		3276
2970	if ($self->{anim} && $self->{animspeed}) {	3277	if ($self->{anim} && $self->{animspeed}) {
2971	Scalar::Util::weaken (my $widget = $self);	3278	CFPlus::weaken (my $widget = $self);
2972		3279
2973	$self->{timer} = Event->timer (	3280	$self->{timer} = Event->timer (
2974	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3281	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975	hard => 1,	3282	hard => 1,
2976	interval => $self->{animspeed},	3283	interval => $self->{animspeed},
…		…
2999	sub _draw {	3306	sub _draw {
3000	my ($self) = @_;	3307	my ($self) = @_;
3001		3308
3002	return unless $::CONN;	3309	return unless $::CONN;
3003		3310
		3311	$self->SUPER::_draw;
		3312
3004	my $face;	3313	my $face;
3005		3314
3006	if ($self->{frame}) {	3315	if ($self->{frame}) {
3007	my $anim = $::CONN->{anim}[$self->{anim}];	3316	my $anim = $::CONN->{anim}[$self->{anim}];
3008		3317
…		…
3030	$self->SUPER::destroy;	3339	$self->SUPER::destroy;
3031	}	3340	}
3032		3341
3033	#############################################################################	3342	#############################################################################
3034		3343
3035	package CFClient::UI::Buttonbar;	3344	package CFPlus::UI::Buttonbar;
3036		3345
3037	our @ISA = CFClient::UI::HBox::;	3346	our @ISA = CFPlus::UI::HBox::;
3038		3347
3039	# TODO: should actualyl wrap buttons and other goodies.	3348	# TODO: should actually wrap buttons and other goodies.
3040		3349
3041	#############################################################################	3350	#############################################################################
3042		3351
3043	package CFClient::UI::Menu;	3352	package CFPlus::UI::Menu;
3044		3353
3045	our @ISA = CFClient::UI::FancyFrame::;	3354	our @ISA = CFPlus::UI::Toplevel::;
3046		3355
3047	use CFClient::OpenGL;	3356	use CFPlus::OpenGL;
3048		3357
3049	sub new {	3358	sub new {
3050	my $class = shift;	3359	my $class = shift;
3051		3360
3052	my $self = $class->SUPER::new (	3361	my $self = $class->SUPER::new (
3053	items => [],	3362	items => [],
3054	z => 100,	3363	z => 100,
3055	@_,	3364	@_,
3056	);	3365	);
3057		3366
3058	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3367	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059		3368
3060	for my $item (@{ $self->{items} }) {	3369	for my $item (@{ $self->{items} }) {
3061	my ($widget, $cb, $tooltip) = @$item;	3370	my ($widget, $cb, $tooltip) = @$item;
3062		3371
3063	# handle various types of items, only text for now	3372	# handle various types of items, only text for now
3064	if (!ref $widget) {	3373	if (!ref $widget) {
		3374	if ($widget =~ /\t/) {
		3375	my ($left, $right) = split /\t/, $widget, 2;
		3376
3065	$widget = new CFClient::UI::Label	3377	$widget = new CFPlus::UI::HBox
3066	can_hover => 1,	3378	can_hover => 1,
3067	can_events => 1,	3379	can_events => 1,
		3380	tooltip => $tooltip,
		3381	children => [
		3382	(new CFPlus::UI::Label markup => $left, expand => 1),
		3383	(new CFPlus::UI::Label markup => $right, align => +1),
		3384	],
		3385	;
		3386
		3387	} else {
		3388	$widget = new CFPlus::UI::Label
		3389	can_hover => 1,
		3390	can_events => 1,
3068	markup => $widget,	3391	markup => $widget,
3069	tooltip => $tooltip	3392	tooltip => $tooltip;
		3393	}
3070	}	3394	}
3071		3395
3072	$self->{item}{$widget} = $item;	3396	$self->{item}{$widget} = $item;
3073		3397
3074	$self->{vbox}->add ($widget);	3398	$self->{vbox}->add ($widget);
…		…
3117	1	3441	1
3118	}	3442	}
3119		3443
3120	#############################################################################	3444	#############################################################################
3121		3445
3122	package CFClient::UI::Multiplexer;	3446	package CFPlus::UI::Multiplexer;
3123		3447
3124	our @ISA = CFClient::UI::Container::;	3448	our @ISA = CFPlus::UI::Container::;
3125		3449
3126	sub new {	3450	sub new {
3127	my $class = shift;	3451	my $class = shift;
3128		3452
3129	my $self = $class->SUPER::new (	3453	my $self = $class->SUPER::new (
…		…
3143		3467
3144	$self->{current} = $self->{children}[0]	3468	$self->{current} = $self->{children}[0]
3145	if @{ $self->{children} };	3469	if @{ $self->{children} };
3146	}	3470	}
3147		3471
		3472	sub get_current_page {
		3473	my ($self) = @_;
		3474
		3475	$self->{current}
		3476	}
		3477
3148	sub set_current_page {	3478	sub set_current_page {
3149	my ($self, $page_or_widget) = @_;	3479	my ($self, $page_or_widget) = @_;
3150		3480
3151	my $widget = ref $page_or_widget	3481	my $widget = ref $page_or_widget
3152	? $page_or_widget	3482	? $page_or_widget
…		…
3184	$self->{current}->draw;	3514	$self->{current}->draw;
3185	}	3515	}
3186		3516
3187	#############################################################################	3517	#############################################################################
3188		3518
3189	package CFClient::UI::Notebook;	3519	package CFPlus::UI::Notebook;
3190		3520
3191	our @ISA = CFClient::UI::VBox::;	3521	our @ISA = CFPlus::UI::VBox::;
3192		3522
3193	sub new {	3523	sub new {
3194	my $class = shift;	3524	my $class = shift;
3195		3525
3196	my $self = $class->SUPER::new (	3526	my $self = $class->SUPER::new (
3197	buttonbar => (new CFClient::UI::Buttonbar),	3527	buttonbar => (new CFPlus::UI::Buttonbar),
3198	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3528	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199	# filter => # will be put between multiplexer and $self	3529	# filter => # will be put between multiplexer and $self
3200	@_,	3530	@_,
3201	);	3531	);
3202		3532
3203	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3533	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3207	}	3537	}
3208		3538
3209	sub add {	3539	sub add {
3210	my ($self, $title, $widget, $tooltip) = @_;	3540	my ($self, $title, $widget, $tooltip) = @_;
3211		3541
3212	Scalar::Util::weaken $self;	3542	CFPlus::weaken $self;
3213		3543
3214	$self->{buttonbar}->add (new CFClient::UI::Button	3544	$self->{buttonbar}->add (new CFPlus::UI::Button
3215	markup => $title,	3545	markup => $title,
3216	tooltip => $tooltip,	3546	tooltip => $tooltip,
3217	on_activate => sub { $self->set_current_page ($widget) },	3547	on_activate => sub { $self->set_current_page ($widget) },
3218	);	3548	);
3219		3549
3220	$self->{multiplexer}->add ($widget);	3550	$self->{multiplexer}->add ($widget);
3221	}	3551	}
3222		3552
		3553	sub get_current_page {
		3554	my ($self) = @_;
		3555
		3556	$self->{multiplexer}->get_current_page
		3557	}
		3558
3223	sub set_current_page {	3559	sub set_current_page {
3224	my ($self, $page) = @_;	3560	my ($self, $page) = @_;
3225		3561
3226	$self->{multiplexer}->set_current_page ($page);	3562	$self->{multiplexer}->set_current_page ($page);
3227	$self->emit (page_changed => $self->{multiplexer}{current});	3563	$self->emit (page_changed => $self->{multiplexer}{current});
3228	}	3564	}
3229		3565
3230	#############################################################################	3566	#############################################################################
3231		3567
3232	package CFClient::UI::Combobox;	3568	package CFPlus::UI::Selector;
3233		3569
3234	use utf8;	3570	use utf8;
3235		3571
3236	our @ISA = CFClient::UI::Button::;	3572	our @ISA = CFPlus::UI::Button::;
3237		3573
3238	sub new {	3574	sub new {
3239	my $class = shift;	3575	my $class = shift;
3240		3576
3241	my $self = $class->SUPER::new (	3577	my $self = $class->SUPER::new (
…		…
3258	my ($value, $title, $tooltip) = @$_;	3594	my ($value, $title, $tooltip) = @$_;
3259		3595
3260	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3596	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261	}	3597	}
3262		3598
3263	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3599	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264	}	3600	}
3265		3601
3266	sub _set_value {	3602	sub _set_value {
3267	my ($self, $value) = @_;	3603	my ($self, $value) = @_;
3268		3604
…		…
3283	$self->emit (changed => $value);	3619	$self->emit (changed => $value);
3284	}	3620	}
3285		3621
3286	#############################################################################	3622	#############################################################################
3287		3623
3288	package CFClient::UI::Statusbox;	3624	package CFPlus::UI::Statusbox;
3289		3625
3290	our @ISA = CFClient::UI::VBox::;	3626	our @ISA = CFPlus::UI::VBox::;
3291		3627
3292	sub new {	3628	sub new {
3293	my $class = shift;	3629	my $class = shift;
3294		3630
3295	my $self = $class->SUPER::new (	3631	my $self = $class->SUPER::new (
3296	fontsize => 0.8,	3632	fontsize => 0.8,
3297	@_,	3633	@_,
3298	);	3634	);
3299		3635
3300	Scalar::Util::weaken (my $this = $self);	3636	CFPlus::weaken (my $this = $self);
3301		3637
3302	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3638	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303		3639
3304	$self	3640	$self
3305	}	3641	}
…		…
3307	sub reorder {	3643	sub reorder {
3308	my ($self) = @_;	3644	my ($self) = @_;
3309	my $NOW = Time::HiRes::time;	3645	my $NOW = Time::HiRes::time;
3310		3646
3311	# freeze display when hovering over any label	3647	# freeze display when hovering over any label
3312	return if $CFClient::UI::TOOLTIP->{owner}	3648	return if $CFPlus::UI::TOOLTIP->{owner}
3313	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3649	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314	values %{ $self->{item} };	3650	values %{ $self->{item} };
3315		3651
3316	while (my ($k, $v) = each %{ $self->{item} }) {	3652	while (my ($k, $v) = each %{ $self->{item} }) {
3317	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3653	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318	}	3654	}
…		…
3339	for ($short) {	3675	for ($short) {
3340	s/^\s+//;	3676	s/^\s+//;
3341	s/\s+/ /g;	3677	s/\s+/ /g;
3342	}	3678	}
3343		3679
3344	new CFClient::UI::Label	3680	new CFPlus::UI::Label
3345	markup => $short,	3681	markup => $short,
3346	tooltip => $item->{tooltip},	3682	tooltip => $item->{tooltip},
3347	tooltip_font => $::FONT_PROP,	3683	tooltip_font => $::FONT_PROP,
3348	tooltip_width => 0.67,	3684	tooltip_width => 0.67,
3349	fontsize => $item->{fontsize} || $self->{fontsize},	3685	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3403	count => 1,	3739	count => 1,
3404	%arg,	3740	%arg,
3405	};	3741	};
3406	}	3742	}
3407		3743
		3744	$ROOT->on_refresh (reorder => sub {
3408	$self->reorder;	3745	$self->reorder;
		3746	});
3409	}	3747	}
3410		3748
3411	sub reconfigure {	3749	sub reconfigure {
3412	my ($self) = @_;	3750	my ($self) = @_;
3413		3751
…		…
3426	$self->SUPER::destroy;	3764	$self->SUPER::destroy;
3427	}	3765	}
3428		3766
3429	#############################################################################	3767	#############################################################################
3430		3768
3431	package CFClient::UI::Inventory;
3432
3433	our @ISA = CFClient::UI::ScrolledWindow::;
3434
3435	sub new {
3436	my $class = shift;
3437
3438	my $self = $class->SUPER::new (
3439	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3440	@_,
3441	);
3442
3443	$self
3444	}
3445
3446	sub set_items {
3447	my ($self, $items) = @_;
3448
3449	$self->{child}->clear;
3450	return unless $items;
3451
3452	my @items = sort {
3453	($a->{type} <=> $b->{type})
3454	or ($a->{name} cmp $b->{name})
3455	} @$items;
3456
3457	$self->{real_items} = \@items;
3458
3459	my $row = 0;
3460	for my $item (@items) {
3461	CFClient::Item::update_widgets $item;
3462
3463	$self->{child}->add (0, $row, $item->{face_widget});
3464	$self->{child}->add (1, $row, $item->{desc_widget});
3465	$self->{child}->add (2, $row, $item->{weight_widget});
3466
3467	$row++;
3468	}
3469	}
3470
3471	#############################################################################
3472
3473	package CFClient::UI::BindEditor;
3474
3475	our @ISA = CFClient::UI::FancyFrame::;
3476
3477	sub new {
3478	my $class = shift;
3479
3480	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482	$self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486	text => "start recording",
3487	tooltip => "Start/Stops recording of actions."
3488	."All subsequent actions after the recording started will be captured."
3489	."The actions are displayed after the record was stopped."
3490	."To bind the action you have to click on the 'Bind' button",
3491	on_activate => sub {
3492	unless ($self->{recording}) {
3493	$self->start;
3494	} else {
3495	$self->stop;
3496	}
3497	});
3498
3499	$vb->add (new CFClient::UI::Label text => "Actions:");
3500	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3503	$vb->add (my $hb = new CFClient::UI::HBox);
3504	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505	$hb->add (new CFClient::UI::Button
3506	text => "bind",
3507	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508	on_activate => sub {
3509	$self->ask_for_bind;
3510	});
3511
3512	$vb->add (my $hb = new CFClient::UI::HBox);
3513	$hb->add (new CFClient::UI::Button
3514	text => "ok",
3515	expand => 1,
3516	tooltip => "This closes the binding editor and saves the binding",
3517	on_activate => sub {
3518	$self->hide;
3519	$self->commit;
3520	});
3521
3522	$hb->add (new CFClient::UI::Button
3523	text => "cancel",
3524	expand => 1,
3525	tooltip => "This closes the binding editor without saving",
3526	on_activate => sub {
3527	$self->hide;
3528	$self->{binding_cancel}->()
3529	if $self->{binding_cancel};
3530	});
3531
3532	$self->update_binding_widgets;
3533
3534	$self
3535	}
3536
3537	sub cfg_bind {
3538	my ($self, $mod, $sym, $cmds) = @_;
3539	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540	::update_bindings ();
3541	}
3542
3543	sub cfg_unbind {
3544	my ($self, $mod, $sym, $cmds) = @_;
3545	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546	::update_bindings ();
3547	}
3548
3549	sub commit {
3550	my ($self) = @_;
3551	my ($mod, $sym, $cmds) = $self->get_binding;
3552	if ($sym != 0 && @$cmds > 0) {
3553	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554	."'. Don't forget 'Save Config'!");
3555	$self->{binding_change}->($mod, $sym, $cmds)
3556	if $self->{binding_change};
3557	} else {
3558	$::STATUSBOX->add ("No action bound, no key or action specified!");
3559	$self->{binding_cancel}->()
3560	if $self->{binding_cancel};
3561	}
3562	}
3563
3564	sub start {
3565	my ($self) = @_;
3566
3567	$self->{rec_btn}->set_text ("stop recording");
3568	$self->{recording} = 1;
3569	$self->clear_command_list;
3570	$::CONN->start_record if $::CONN;
3571	}
3572
3573	sub stop {
3574	my ($self) = @_;
3575
3576	$self->{rec_btn}->set_text ("start recording");
3577	$self->{recording} = 0;
3578
3579	my $rec;
3580	$rec = $::CONN->stop_record if $::CONN;
3581	return unless ref $rec eq 'ARRAY';
3582	$self->set_command_list ($rec);
3583	}
3584
3585
3586	sub ask_for_bind_and_commit {
3587	my ($self) = @_;
3588	$self->ask_for_bind (1);
3589	}
3590
3591	sub ask_for_bind {
3592	my ($self, $commit, $end_cb) = @_;
3593
3594	CFClient::Binder::open_binding_dialog (sub {
3595	my ($mod, $sym) = @_;
3596	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597	$self->update_binding_widgets;
3598	$self->commit if $commit;
3599	$end_cb->() if $end_cb;
3600	});
3601	}
3602
3603	# $mod and $sym are the modifiers and key symbol
3604	# $cmds is a array ref of strings (the commands)
3605	# $cb is the callback that is executed on OK
3606	# $ccb is the callback that is executed on CANCEL and
3607	# when the binding was unsuccessful on OK
3608	sub set_binding {
3609	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611	$self->clear_command_list;
3612	$self->{recording} = 0;
3613	$self->{rec_btn}->set_text ("start recording");
3614
3615	$self->{binding} = [$mod, $sym];
3616	$self->{commands} = $cmds;
3617
3618	$self->{binding_change} = $cb;
3619	$self->{binding_cancel} = $ccb;
3620
3621	$self->update_binding_widgets;
3622	}
3623
3624	# this is a shortcut method that asks for a binding
3625	# and then just binds it.
3626	sub do_quick_binding {
3627	my ($self, $cmds, $end_cb) = @_;
3628	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629	$self->ask_for_bind (1, $end_cb);
3630	}
3631
3632	sub update_binding_widgets {
3633	my ($self) = @_;
3634	my ($mod, $sym, $cmds) = $self->get_binding;
3635	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636	$self->set_command_list ($cmds);
3637	}
3638
3639	sub get_binding {
3640	my ($self) = @_;
3641	return (
3642	$self->{binding}->[0],
3643	$self->{binding}->[1],
3644	[ grep { defined $_ } @{$self->{commands}} ]
3645	);
3646	}
3647
3648	sub clear_command_list {
3649	my ($self) = @_;
3650	$self->{cmdbox}->clear ();
3651	}
3652
3653	sub set_command_list {
3654	my ($self, $cmds) = @_;
3655
3656	$self->{cmdbox}->clear ();
3657	$self->{commands} = $cmds;
3658
3659	my $idx = 0;
3660
3661	for (@$cmds) {
3662	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664	my $i = $idx;
3665	$hb->add (new CFClient::UI::Label text => $_);
3666	$hb->add (new CFClient::UI::Button
3667	text => "delete",
3668	tooltip => "Deletes the action from the record",
3669	on_activate => sub {
3670	$self->{cmdbox}->remove ($hb);
3671	$cmds->[$i] = undef;
3672	});
3673
3674
3675	$idx++
3676	}
3677	}
3678
3679	#############################################################################
3680
3681	package CFClient::UI::SpellList;
3682
3683	our @ISA = CFClient::UI::Table::;
3684
3685	sub new {
3686	my $class = shift;
3687
3688	my $self = $class->SUPER::new (
3689	binding => [],
3690	commands => [],
3691	@_,
3692	)
3693	}
3694
3695	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707
3708	sub rebuild_spell_list {
3709	my ($self) = @_;
3710
3711	$CFClient::UI::ROOT->on_refresh ($self => sub {
3712	$self->clear;
3713
3714	return unless $::CONN;
3715
3716	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722	my $row = 0;
3723
3724	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725	my $spell = $self->{spell}{$_};
3726
3727	$row++;
3728
3729	my $spell_cb = sub {
3730	my ($widget, $ev) = @_;
3731
3732	if ($ev->{button} == 1) {
3733	$::CONN->user_send ("cast $spell->{name}");
3734	} elsif ($ev->{button} == 2) {
3735	$::CONN->user_send ("invoke $spell->{name}");
3736	} elsif ($ev->{button} == 3) {
3737	(new CFClient::UI::Menu
3738	items => [
3739	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741	],
3742	)->popup ($ev);
3743	} else {
3744	return 0;
3745	}
3746
3747	1
3748	};
3749
3750	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752	#TODO: add path info to tooltip
3753	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755	$self->add (0, $row, new CFClient::UI::Face
3756	face => $spell->{face},
3757	can_hover => 1,
3758	can_events => 1,
3759	tooltip => $tooltip,
3760	on_button_down => $spell_cb,
3761	);
3762
3763	$self->add (1, $row, new CFClient::UI::Label
3764	expand => 1,
3765	text => $spell->{name},
3766	can_hover => 1,
3767	can_events => 1,
3768	tooltip => $tooltip,
3769	on_button_down => $spell_cb,
3770	);
3771
3772	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776	}
3777	});
3778	}
3779
3780	sub add_spell {
3781	my ($self, $spell) = @_;
3782
3783	$self->{spell}->{$spell->{name}} = $spell;
3784	$self->rebuild_spell_list;
3785	}
3786
3787	sub remove_spell {
3788	my ($self, $spell) = @_;
3789
3790	delete $self->{spell}->{$spell->{name}};
3791	$self->rebuild_spell_list;
3792	}
3793
3794	sub clear_spells {
3795	my ($self) = @_;
3796
3797	$self->{spell} = {};
3798	$self->rebuild_spell_list;
3799	}
3800
3801	#############################################################################
3802
3803	package CFClient::UI::Root;	3769	package CFPlus::UI::Root;
3804		3770
3805	our @ISA = CFClient::UI::Container::;	3771	our @ISA = CFPlus::UI::Container::;
3806		3772
3807	use List::Util qw(min max);	3773	use List::Util qw(min max);
3808		3774
3809	use CFClient::OpenGL;	3775	use CFPlus::OpenGL;
3810		3776
3811	sub new {	3777	sub new {
3812	my $class = shift;	3778	my $class = shift;
3813		3779
3814	my $self = $class->SUPER::new (	3780	my $self = $class->SUPER::new (
3815	visible => 1,	3781	visible => 1,
3816	@_,	3782	@_,
3817	);	3783	);
3818		3784
3819	Scalar::Util::weaken ($self->{root} = $self);	3785	CFPlus::weaken ($self->{root} = $self);
3820		3786
3821	$self	3787	$self
3822	}	3788	}
3823		3789
3824	sub size_request {	3790	sub size_request {
…		…
3990	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3956	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991		3957
3992	$w = 0 if $w < 0;	3958	$w = 0 if $w < 0;
3993	$h = 0 if $h < 0;	3959	$h = 0 if $h < 0;
3994		3960
		3961	$w = max $widget->{min_w}, $w;
		3962	$h = max $widget->{min_h}, $h;
		3963
		3964	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3965	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3966
		3967	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3968	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3969
3995	$w = int $w + 0.5;	3970	$w = int $w + 0.5;
3996	$h = int $h + 0.5;	3971	$h = int $h + 0.5;
3997		3972
3998	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3973	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999	$widget->{old_w} = $widget->{w};	3974	$widget->{old_w} = $widget->{w};
…		…
4022	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3997	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023	glMatrixMode GL_MODELVIEW;	3998	glMatrixMode GL_MODELVIEW;
4024	glLoadIdentity;	3999	glLoadIdentity;
4025		4000
4026	{	4001	{
4027	package CFClient::UI::Base;	4002	package CFPlus::UI::Base;
4028		4003
4029	($draw_x, $draw_y, $draw_w, $draw_h) =	4004	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030	(0, 0, $self->{w}, $self->{h});	4005	(0, 0, $self->{w}, $self->{h});
4031	}
4032		4006
4033	$self->_draw;	4007	$self->_draw;
		4008	}
4034	}	4009	}
4035		4010
4036	#############################################################################	4011	#############################################################################
4037		4012
4038	package CFClient::UI;	4013	package CFPlus::UI;
4039		4014
4040	$ROOT = new CFClient::UI::Root;	4015	$ROOT = new CFPlus::UI::Root;
4041	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4016	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042		4017
4043	1	4018	1
4044		4019

Diff Legend

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