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.354 by root, Sat Nov 18 23:31:23 2006 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8	use Event;	8	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
…		…
79	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	82	if $FOCUS;
82	}	83	}
83		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
84	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	99	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
87		101
88	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
90		106
91	$GRAB = $widget;	107	$GRAB = $widget;
92	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
93		109
94	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
95	}	111	}
96		112
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
98		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
100	if $GRAB;	116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
		122	}
101	}	123	}
102		124
103	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	126	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		127
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		129
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		131
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
112	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		134
114	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	137	$grab->update if $grab;
117	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
118		139
		140	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	141	$TOOLTIP_WATCHER->cb->();
120	}	142	}
121	}	143	}
122		144
123	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
124	my ($ev) = @_;	146	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
126		148
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		150
129	if ($widget != $HOVER) {	151	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		152
132	$hover->update if $hover && $hover->{can_hover};	153	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	154	if $HOVER;
140	}	155	}
141		156
142	# convert position array to integers	157	# convert position array to integers
143	sub harmonize {	158	sub harmonize {
…		…
193	reconfigure_widgets;	208	reconfigure_widgets;
194	}	209	}
195		210
196	#############################################################################	211	#############################################################################
197		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
198	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
199		222
200	use strict;	223	use strict;
201		224
202	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
203		226
204	sub new {	227	sub new {
205	my $class = shift;	228	my $class = shift;
206		229
207	my $self = bless {	230	my $self = bless {
…		…
212	h => undef,	235	h => undef,
213	can_events => 1,	236	can_events => 1,
214	@_	237	@_
215	}, $class;	238	}, $class;
216		239
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		241
219	for (keys %$self) {	242	for (keys %$self) {
220	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
222	}	245	}
223	}	246	}
224		247
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		253
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		256
234	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
247	sub show {	270	sub show {
248	my ($self) = @_;	271	my ($self) = @_;
249		272
250	return if $self->{parent};	273	return if $self->{parent};
251		274
252	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
253	}	276	}
254		277
255	sub set_visible {	278	sub set_visible {
256	my ($self) = @_;	279	my ($self) = @_;
257		280
…		…
278	delete $self->{root};	301	delete $self->{root};
279		302
280	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
282		305
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
285		308
286	$self->emit ("focus_out");	309	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
288	}	311	}
…		…
345	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
346		369
347	if ($self->{aspect}) {	370	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
349		372
350	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		375
353	# use alignment to adjust x, y	376	# use alignment to adjust x, y
354		377
355	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
397		420
398	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
399		422
400	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
401		424
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	428	}
406	}	429	}
407		430
408	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
409	sub coord2local {	432	sub coord2local {
410	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
411		434
		435	Carp::confess unless $self->{parent};#d#
		436
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	438	}
414		439
415	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
416	sub coord2global {	441	sub coord2global {
417	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
418		443
		444	Carp::confess unless $self->{parent};#d#
		445
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	447	}
421		448
422	sub invoke_focus_in {	449	sub invoke_focus_in {
423	my ($self) = @_;	450	my ($self) = @_;
424		451
425	return if $FOCUS == $self;	452	return if $FOCUS == $self;
426	return unless $self->{can_focus};	453	return unless $self->{can_focus};
427		454
428	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
429		456
430	$focus->update if $focus;	457	$self->update;
431	$FOCUS->update;
432		458
433	0	459	0
434	}	460	}
435		461
436	sub invoke_focus_out {	462	sub invoke_focus_out {
437	my ($self) = @_;	463	my ($self) = @_;
438		464
439	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
440		466
441	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
442		468
443	$focus->update if $focus; #?	469	$self->update;
444		470
445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	471	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	472	unless $FOCUS;
447		473
448	0	474	0
449	}	475	}
450		476
451	sub grab_focus {	477	sub grab_focus {
452	my ($self) = @_;	478	my ($self) = @_;
453		479
		480	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	481	$self->emit ("focus_in");
455	}	482	}
456		483
457	sub invoke_mouse_motion { 1 }	484	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	485	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	486	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
461		489
462	sub invoke_button_down {	490	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
464		492
465	$self->grab_focus;	493	$self->grab_focus;
466		494
467	1	495	0
468	}	496	}
469		497
470	sub connect {	498	sub connect {
471	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
472		500
473	push @{ $self->{signal_cb}{$signal} }, $cb;	501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
474	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
475		515
476	sub emit {	516	sub emit {
477	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
478		518
		519	# I do not really like this solution, but I do not like duplication
		520	# and needlessly verbose code, either.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
		528	if ($self->{tooltip} =~ /Apply.*audio/) {
		529	warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
		530	warn "3 $self->{parent}\n";#d#
		531	}
		532
479	#d##TODO# stop propagating at first true, do not use sum	533	#d##TODO# stop propagating at first true, do not use sum
		534	my $res =
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	535	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	536	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	537	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
		538	;
		539	if ($self->{tooltip} =~ /Apply.*audio/) {
		540	warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
		541	warn "5 $self->{parent}\n";#d#
		542	}
		543
		544	$res
483	}	545	}
484		546
485	sub find_widget {	547	sub find_widget {
486	my ($self, $x, $y) = @_;	548	my ($self, $x, $y) = @_;
487		549
…		…
539	return unless $self->{h} && $self->{w};	601	return unless $self->{h} && $self->{w};
540		602
541	# update screen rectangle	603	# update screen rectangle
542	local $draw_x = $draw_x + $self->{x};	604	local $draw_x = $draw_x + $self->{x};
543	local $draw_y = $draw_y + $self->{y};	605	local $draw_y = $draw_y + $self->{y};
544	local $draw_w = $draw_x + $self->{w};
545	local $draw_h = $draw_y + $self->{h};
546		606
547	# skip widgets that are entirely outside the drawing area	607	# skip widgets that are entirely outside the drawing area
548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550		610
…		…
573	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
576	glEnd;	636	glEnd;
577	glPopMatrix;	637	glPopMatrix;
578	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579	}	639	}
580		640
581	$self->_draw;	641	$self->_draw;
582	glPopMatrix;	642	glPopMatrix;
583	}	643	}
…		…
589	}	649	}
590		650
591	sub DESTROY {	651	sub DESTROY {
592	my ($self) = @_;	652	my ($self) = @_;
593		653
		654	return if CFPlus::in_destruct;
		655
594	delete $WIDGET{$self+0};	656	delete $WIDGET{$self+0};
595		657
596	eval { $self->destroy };	658	eval { $self->destroy };
597	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598	}	660	}
599		661
600	#############################################################################	662	#############################################################################
601		663
602	package CFClient::UI::DrawBG;	664	package CFPlus::UI::DrawBG;
603		665
604	our @ISA = CFClient::UI::Base::;	666	our @ISA = CFPlus::UI::Base::;
605		667
606	use strict;	668	use strict;
607	use CFClient::OpenGL;	669	use CFPlus::OpenGL;
608		670
609	sub new {	671	sub new {
610	my $class = shift;	672	my $class = shift;
611		673
612	# range [value, low, high, page]	674	# range [value, low, high, page]
…		…
643	}	705	}
644	}	706	}
645		707
646	#############################################################################	708	#############################################################################
647		709
648	package CFClient::UI::Empty;	710	package CFPlus::UI::Empty;
649		711
650	our @ISA = CFClient::UI::Base::;	712	our @ISA = CFPlus::UI::Base::;
651		713
652	sub new {	714	sub new {
653	my ($class, %arg) = @_;	715	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	716	$class->SUPER::new (can_events => 0, %arg);
655	}	717	}
…		…
662		724
663	sub draw { }	725	sub draw { }
664		726
665	#############################################################################	727	#############################################################################
666		728
667	package CFClient::UI::Container;	729	package CFPlus::UI::Container;
668		730
669	our @ISA = CFClient::UI::Base::;	731	our @ISA = CFPlus::UI::Base::;
670		732
671	sub new {	733	sub new {
672	my ($class, %arg) = @_;	734	my ($class, %arg) = @_;
673		735
674	my $children = delete $arg{children};	736	my $children = delete $arg{children};
…		…
683	if $children;	745	if $children;
684		746
685	$self	747	$self
686	}	748	}
687		749
		750	sub realloc {
		751	my ($self) = @_;
		752
		753	$self->{force_realloc} = 1;
		754	$self->{force_size_alloc} = 1;
		755	$self->SUPER::realloc;
		756	}
		757
688	sub add {	758	sub add {
689	my ($self, @widgets) = @_;	759	my ($self, @widgets) = @_;
690		760
691	$_->set_parent ($self)	761	$_->set_parent ($self)
692	for @widgets;	762	for @widgets;
…		…
752	$_->draw for @{$self->{children}};	822	$_->draw for @{$self->{children}};
753	}	823	}
754		824
755	#############################################################################	825	#############################################################################
756		826
757	package CFClient::UI::Bin;	827	package CFPlus::UI::Bin;
758		828
759	our @ISA = CFClient::UI::Container::;	829	our @ISA = CFPlus::UI::Container::;
760		830
761	sub new {	831	sub new {
762	my ($class, %arg) = @_;	832	my ($class, %arg) = @_;
763		833
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	834	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		835
766	$class->SUPER::new (children => [$child], %arg)	836	$class->SUPER::new (children => [$child], %arg)
767	}	837	}
768		838
769	sub add {	839	sub add {
…		…
776	sub remove {	846	sub remove {
777	my ($self, $widget) = @_;	847	my ($self, $widget) = @_;
778		848
779	$self->SUPER::remove ($widget);	849	$self->SUPER::remove ($widget);
780		850
781	$self->{children} = [new CFClient::UI::Empty]	851	$self->{children} = [new CFPlus::UI::Empty]
782	unless @{$self->{children}};	852	unless @{$self->{children}};
783	}	853	}
784		854
785	sub child { $_[0]->{children}[0] }	855	sub child { $_[0]->{children}[0] }
786		856
…		…
798		868
799	#############################################################################	869	#############################################################################
800		870
801	# back-buffered drawing area	871	# back-buffered drawing area
802		872
803	package CFClient::UI::Window;	873	package CFPlus::UI::Window;
804		874
805	our @ISA = CFClient::UI::Bin::;	875	our @ISA = CFPlus::UI::Bin::;
806		876
807	use CFClient::OpenGL;	877	use CFPlus::OpenGL;
808		878
809	sub new {	879	sub new {
810	my ($class, %arg) = @_;	880	my ($class, %arg) = @_;
811		881
812	my $self = $class->SUPER::new (%arg);	882	my $self = $class->SUPER::new (%arg);
…		…
834	}	904	}
835		905
836	sub render_child {	906	sub render_child {
837	my ($self) = @_;	907	my ($self) = @_;
838		908
839	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	909	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840	glClearColor 0, 0, 0, 0;	910	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	911	glClear GL_COLOR_BUFFER_BIT;
842		912
843	{	913	{
844	package CFClient::UI::Base;	914	package CFPlus::UI::Base;
845		915
846	($draw_x, $draw_y, $draw_w, $draw_h) =	916	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	917	(0, 0, $self->{w}, $self->{h});
		918
		919	$self->_render;
848	}	920	}
849
850	$self->_render;
851	};	921	};
852	}	922	}
853		923
854	sub _draw {	924	sub _draw {
855	my ($self) = @_;	925	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		926
859	my $tex = $self->{texture}	927	my $tex = $self->{texture}
860	or return;	928	or return;
861		929
862	glEnable GL_TEXTURE_2D;	930	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	931	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	932	glColor 0, 0, 0, 1;
865		933
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	934	$tex->draw_quad_alpha_premultiplied (0, 0);
867		935
868	glDisable GL_TEXTURE_2D;	936	glDisable GL_TEXTURE_2D;
869	}	937	}
870		938
871	#############################################################################	939	#############################################################################
872		940
873	package CFClient::UI::ViewPort;	941	package CFPlus::UI::ViewPort;
874		942
875	our @ISA = CFClient::UI::Window::;	943	our @ISA = CFPlus::UI::Window::;
876		944
877	sub new {	945	sub new {
878	my $class = shift;	946	my $class = shift;
879		947
880	$class->SUPER::new (	948	$class->SUPER::new (
…		…
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1008	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1009	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	1010	) {
943	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1011	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944	} else {	1012	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	1013	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	1014	}
947	}	1015	}
948		1016
949	sub _render {	1017	sub _render {
950	my ($self) = @_;	1018	my ($self) = @_;
951		1019
952	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1020	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};	1021	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954		1022
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1023	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1024
957	$self->SUPER::_render;	1025	$self->SUPER::_render;
958	}	1026	}
959		1027
960	#############################################################################	1028	#############################################################################
961		1029
962	package CFClient::UI::ScrolledWindow;	1030	package CFPlus::UI::ScrolledWindow;
963		1031
964	our @ISA = CFClient::UI::HBox::;	1032	our @ISA = CFPlus::UI::HBox::;
965		1033
966	sub new {	1034	sub new {
967	my ($class, %arg) = @_;	1035	my ($class, %arg) = @_;
968		1036
969	my $child = delete $arg{child};	1037	my $child = delete $arg{child};
970		1038
971	my $self;	1039	my $self;
972		1040
973	my $slider = new CFClient::UI::Slider	1041	my $slider = new CFPlus::UI::Slider
974	vertical => 1,	1042	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1043	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1044	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1045	$self->{vp}->set_offset (0, $_[1]);
978	},	1046	},
979	;	1047	;
980		1048
981	$self = $class->SUPER::new (	1049	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1050	vp => (new CFPlus::UI::ViewPort expand => 1),
		1051	can_events => 1,
983	slider => $slider,	1052	slider => $slider,
984	%arg,	1053	%arg,
985	);	1054	);
986		1055
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1056	$self->SUPER::add ($self->{vp}, $self->{slider});
988	$self->add ($child) if $child;	1057	$self->add ($child) if $child;
989		1058
990	$self	1059	$self
991	}	1060	}
992		1061
		1062	#TODO# update range on size_allocate depending on child
		1063
993	sub add {	1064	sub add {
994	my ($self, $widget) = @_;	1065	my ($self, $widget) = @_;
995		1066
996	$self->{vp}->add ($self->{child} = $widget);	1067	$self->{vp}->add ($self->{child} = $widget);
997	}	1068	}
998		1069
		1070	sub invoke_mouse_wheel {
		1071	my ($self, $ev) = @_;
		1072
		1073	return 0 unless $ev->{dy}; # only vertical movements
		1074
		1075	$self->{slider}->emit (mouse_wheel => $ev);
		1076
		1077	1
		1078	}
		1079
		1080	sub update_slider {
		1081	my ($self) = @_;
		1082
		1083	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1084	}
		1085
999	sub update {	1086	sub update {
1000	my ($self) = @_;	1087	my ($self) = @_;
1001		1088
1002	$self->SUPER::update;	1089	$self->SUPER::update;
1003		1090
1004	# todo: overwrite size_allocate of child	1091	$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	}	1092	}
1008		1093
1009	sub invoke_size_allocate {	1094	sub invoke_size_allocate {
1010	my ($self, $w, $h) = @_;	1095	my ($self, $w, $h) = @_;
1011		1096
1012	my $child = $self->{vp}->child;	1097	$self->update_slider;
1013	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014		1098
1015	$self->SUPER::invoke_size_allocate ($w, $h)	1099	$self->SUPER::invoke_size_allocate ($w, $h)
1016	}	1100	}
1017		1101
1018	#TODO# update range on size_allocate depending on child
1019	# update viewport offset on scroll
1020
1021	#############################################################################	1102	#############################################################################
1022		1103
1023	package CFClient::UI::Frame;	1104	package CFPlus::UI::Frame;
1024		1105
1025	our @ISA = CFClient::UI::Bin::;	1106	our @ISA = CFPlus::UI::Bin::;
1026		1107
1027	use CFClient::OpenGL;	1108	use CFPlus::OpenGL;
1028		1109
1029	sub new {	1110	sub new {
1030	my $class = shift;	1111	my $class = shift;
1031		1112
1032	$class->SUPER::new (	1113	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1139	$self->SUPER::_draw;
1059	}	1140	}
1060		1141
1061	#############################################################################	1142	#############################################################################
1062		1143
1063	package CFClient::UI::FancyFrame;	1144	package CFPlus::UI::FancyFrame;
1064		1145
1065	our @ISA = CFClient::UI::Bin::;	1146	our @ISA = CFPlus::UI::Bin::;
1066		1147
1067	use CFClient::OpenGL;	1148	use CFPlus::OpenGL;
		1149
		1150	sub new {
		1151	my ($class, %arg) = @_;
		1152
		1153	if ((exists $arg{label}) && !ref $arg{label}) {
		1154	$arg{label} = new CFPlus::UI::Label
		1155	align => 1,
		1156	valign => 0,
		1157	text => $arg{label},
		1158	fontsize => ($arg{border} || 0.8) * 0.75;
		1159	}
		1160
		1161	my $self = $class->SUPER::new (
		1162	# label => "",
		1163	fg => [0.6, 0.3, 0.1],
		1164	border => 0.8,
		1165	style => 'single',
		1166	%arg,
		1167	);
		1168
		1169	$self
		1170	}
		1171
		1172	sub add {
		1173	my ($self, @widgets) = @_;
		1174
		1175	$self->SUPER::add (@widgets);
		1176	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1177	}
		1178
		1179	sub border {
		1180	int $_[0]{border} * $::FONTSIZE
		1181	}
		1182
		1183	sub size_request {
		1184	my ($self) = @_;
		1185
		1186	($self->{label_w}, undef) = $self->{label}->size_request
		1187	if $self->{label};
		1188
		1189	my ($w, $h) = $self->SUPER::size_request;
		1190
		1191	(
		1192	$w + $self->border * 2,
		1193	$h + $self->border * 2,
		1194	)
		1195	}
		1196
		1197	sub invoke_size_allocate {
		1198	my ($self, $w, $h) = @_;
		1199
		1200	my $border = $self->border;
		1201
		1202	$w -= List::Util::max 0, $border * 2;
		1203	$h -= List::Util::max 0, $border * 2;
		1204
		1205	if (my $label = $self->{label}) {
		1206	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1207	$label->{h} = List::Util::min $h, $border;
		1208	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1209	}
		1210
		1211	$self->child->configure ($border, $border, $w, $h);
		1212
		1213	1
		1214	}
		1215
		1216	sub _draw {
		1217	my ($self) = @_;
		1218
		1219	my $child = $self->{children}[0];
		1220
		1221	my $border = $self->border;
		1222	my ($w, $h) = ($self->{w}, $self->{h});
		1223
		1224	$child->draw;
		1225
		1226	glColor @{$self->{fg}};
		1227	glBegin GL_LINE_STRIP;
		1228	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1229	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1230	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1231	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1232	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1233	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1234	glEnd;
		1235
		1236	if ($self->{label}) {
		1237	glTranslate $border * 2, 0;
		1238	$self->{label}->_draw;
		1239	}
		1240	}
		1241
		1242	#############################################################################
		1243
		1244	package CFPlus::UI::Toplevel;
		1245
		1246	our @ISA = CFPlus::UI::Bin::;
		1247
		1248	use CFPlus::OpenGL;
1068		1249
1069	my $bg =	1250	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1251	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1252	mipmap => 1, wrap => 1;
1072		1253
1073	my @border =	1254	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1255	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);	1256	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1257
1077	sub new {	1258	sub new {
1078	my ($class, %arg) = @_;	1259	my ($class, %arg) = @_;
1079		1260
1080	my $self = $class->SUPER::new (	1261	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1262	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1263	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1264	border => 0.6,
1084	can_events => 1,	1265	can_events => 1,
1085	min_w => 16,	1266	min_w => 64,
1086	min_h => 16,	1267	min_h => 32,
1087	%arg,	1268	%arg,
1088	);	1269	);
1089		1270
1090	$self->{title_widget} = new CFClient::UI::Label	1271	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1272	align => 0,
1092	valign => 1,	1273	valign => 1,
1093	text => $self->{title},	1274	text => $self->{title},
1094	fontsize => $self->{border},	1275	fontsize => $self->{border},
1095	if exists $self->{title};	1276	if exists $self->{title};
1096		1277
1097	if ($self->{has_close_button}) {	1278	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1279	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1280	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1281	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1282	on_activate => sub { $self->emit ("delete") };
1102		1283
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1284	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1285	}
1105		1286
1106	$self	1287	$self
1107	}	1288	}
1108		1289
1109	sub add {	1290	sub add {
1110	my ($self, @widgets) = @_;	1291	my ($self, @widgets) = @_;
1111		1292
1112	$self->SUPER::add (@widgets);	1293	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1294	$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};	1295	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1296	}
1116		1297
1117	sub border {	1298	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1299	int $_[0]{border} * $::FONTSIZE
1119	}	1300	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1333	$self->child->configure ($border, $border, $w, $h);
1153		1334
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1335	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1336	if $self->{close_button};
1156		1337
		1338	1
		1339	}
		1340
		1341	sub invoke_delete {
		1342	my ($self) = @_;
		1343
		1344	$self->hide;
		1345
1157	1	1346	1
1158	}	1347	}
1159		1348
1160	sub invoke_button_down {	1349	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1350	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1408	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1409
1221	! ! $self->{motion}	1410	! ! $self->{motion}
1222	}	1411	}
1223		1412
		1413	sub invoke_visibility_change {
		1414	my ($self, $visible) = @_;
		1415
		1416	delete $self->{motion} unless $visible;
		1417
		1418	0
		1419	}
		1420
1224	sub _draw {	1421	sub _draw {
1225	my ($self) = @_;	1422	my ($self) = @_;
1226		1423
1227	my $child = $self->{children}[0];	1424	my $child = $self->{children}[0];
1228		1425
…		…
1265	if $self->{close_button};	1462	if $self->{close_button};
1266	}	1463	}
1267		1464
1268	#############################################################################	1465	#############################################################################
1269		1466
1270	package CFClient::UI::Table;	1467	package CFPlus::UI::Table;
1271		1468
1272	our @ISA = CFClient::UI::Base::;	1469	our @ISA = CFPlus::UI::Base::;
1273		1470
1274	use List::Util qw(max sum);	1471	use List::Util qw(max sum);
1275		1472
1276	use CFClient::OpenGL;	1473	use CFPlus::OpenGL;
1277		1474
1278	sub new {	1475	sub new {
1279	my $class = shift;	1476	my $class = shift;
1280		1477
1281	$class->SUPER::new (	1478	$class->SUPER::new (
…		…
1287	sub children {	1484	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1485	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}	1486	}
1290		1487
1291	sub add {	1488	sub add {
1292	my ($self, $x, $y, $child) = @_;	1489	my ($self) = shift;
1293		1490
		1491	while (@_) {
		1492	my ($x, $y, $child) = splice @_, 0, 3, ();
1294	$child->set_parent ($self);	1493	$child->set_parent ($self);
1295	$self->{children}[$y][$x] = $child;	1494	$self->{children}[$y][$x] = $child;
		1495	}
1296		1496
		1497	$self->{force_realloc} = 1;
		1498	$self->{force_size_alloc} = 1;
1297	$self->realloc;	1499	$self->realloc;
1298	}	1500	}
1299		1501
1300	sub remove {	1502	sub remove {
1301	my ($self, $child) = @_;	1503	my ($self, $child) = @_;
…		…
1366		1568
1367	# linearly scale sizes	1569	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1570	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1571	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1572
1371	CFClient::UI::harmonize $ws;	1573	CFPlus::UI::harmonize $ws;
1372	CFClient::UI::harmonize $hs;	1574	CFPlus::UI::harmonize $hs;
1373		1575
1374	my $y;	1576	my $y;
1375		1577
1376	for my $r (0 .. $#{$self->{children}}) {	1578	for my $r (0 .. $#{$self->{children}}) {
1377	my $row = $self->{children}[$r]	1579	my $row = $self->{children}[$r]
…		…
1420	}	1622	}
1421	}	1623	}
1422		1624
1423	#############################################################################	1625	#############################################################################
1424		1626
1425	package CFClient::UI::Box;	1627	package CFPlus::UI::Box;
1426		1628
1427	our @ISA = CFClient::UI::Container::;	1629	our @ISA = CFPlus::UI::Container::;
1428		1630
1429	sub size_request {	1631	sub size_request {
1430	my ($self) = @_;	1632	my ($self) = @_;
1431		1633
1432	$self->{vertical}	1634	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1667	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1668	for 0 .. $#children;
1467	}	1669	}
1468	}	1670	}
1469		1671
1470	CFClient::UI::harmonize \@req;	1672	CFPlus::UI::harmonize \@req;
1471		1673
1472	my $pos = 0;	1674	my $pos = 0;
1473	for (0 .. $#children) {	1675	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1676	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1677	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1682	1
1481	}	1683	}
1482		1684
1483	#############################################################################	1685	#############################################################################
1484		1686
1485	package CFClient::UI::HBox;	1687	package CFPlus::UI::HBox;
1486		1688
1487	our @ISA = CFClient::UI::Box::;	1689	our @ISA = CFPlus::UI::Box::;
1488		1690
1489	sub new {	1691	sub new {
1490	my $class = shift;	1692	my $class = shift;
1491		1693
1492	$class->SUPER::new (	1694	$class->SUPER::new (
…		…
1495	)	1697	)
1496	}	1698	}
1497		1699
1498	#############################################################################	1700	#############################################################################
1499		1701
1500	package CFClient::UI::VBox;	1702	package CFPlus::UI::VBox;
1501		1703
1502	our @ISA = CFClient::UI::Box::;	1704	our @ISA = CFPlus::UI::Box::;
1503		1705
1504	sub new {	1706	sub new {
1505	my $class = shift;	1707	my $class = shift;
1506		1708
1507	$class->SUPER::new (	1709	$class->SUPER::new (
…		…
1510	)	1712	)
1511	}	1713	}
1512		1714
1513	#############################################################################	1715	#############################################################################
1514		1716
1515	package CFClient::UI::Label;	1717	package CFPlus::UI::Label;
1516		1718
1517	our @ISA = CFClient::UI::DrawBG::;	1719	our @ISA = CFPlus::UI::DrawBG::;
1518		1720
1519	use CFClient::OpenGL;	1721	use CFPlus::OpenGL;
1520		1722
1521	sub new {	1723	sub new {
1522	my ($class, %arg) = @_;	1724	my ($class, %arg) = @_;
1523		1725
1524	my $self = $class->SUPER::new (	1726	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1729	#active_bg => none
1528	#font => default_font	1730	#font => default_font
1529	#text => initial text	1731	#text => initial text
1530	#markup => initial narkup	1732	#markup => initial narkup
1531	#max_w => maximum pixel width	1733	#max_w => maximum pixel width
		1734	#style => 0, # render flags
1532	ellipsise => 3, # end	1735	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1736	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1737	fontsize => 1,
1535	align => -1,	1738	align => -1,
1536	valign => -1,	1739	valign => -1,
1537	padding_x => 2,	1740	padding_x => 2,
1538	padding_y => 2,	1741	padding_y => 2,
1539	can_events => 0,	1742	can_events => 0,
1540	%arg	1743	%arg
1541	);	1744	);
1542		1745
1543	if (exists $self->{template}) {	1746	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1747	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1748	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1749	$self->{template} = $layout;
1547	}	1750	}
1548		1751
1549	if (exists $self->{markup}) {	1752	if (exists $self->{markup}) {
…		…
1553	}	1756	}
1554		1757
1555	$self	1758	$self
1556	}	1759	}
1557		1760
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 {	1761	sub update {
1569	my ($self) = @_;	1762	my ($self) = @_;
1570		1763
1571	delete $self->{texture};	1764	delete $self->{texture};
1572	$self->SUPER::update;	1765	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1776	my ($self, $text) = @_;
1584		1777
1585	return if $self->{text} eq "T$text";	1778	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1779	$self->{text} = "T$text";
1587		1780
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1781	$self->{layout}->set_text ($text);
1590		1782
1591	delete $self->{size_req};	1783	delete $self->{size_req};
1592	$self->realloc;	1784	$self->realloc;
1593	$self->update;	1785	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1791	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1792	$self->{text} = "M$markup";
1601		1793
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1794	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1795
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1796	$self->{layout}->set_markup ($markup);
1606		1797
1607	delete $self->{size_req};	1798	delete $self->{size_req};
1608	$self->realloc;	1799	$self->realloc;
1609	$self->update;	1800	$self->update;
…		…
1621		1812
1622	my ($w, $h) = $self->{layout}->size;	1813	my ($w, $h) = $self->{layout}->size;
1623		1814
1624	if (exists $self->{template}) {	1815	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	1816	$self->{template}->set_font ($self->{font}) if $self->{font};
		1817	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1818	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		1819
1628	my ($w2, $h2) = $self->{template}->size;	1820	my ($w2, $h2) = $self->{template}->size;
1629		1821
1630	$w = List::Util::max $w, $w2;	1822	$w = List::Util::max $w, $w2;
…		…
1654		1846
1655	sub set_fontsize {	1847	sub set_fontsize {
1656	my ($self, $fontsize) = @_;	1848	my ($self, $fontsize) = @_;
1657		1849
1658	$self->{fontsize} = $fontsize;	1850	$self->{fontsize} = $fontsize;
		1851	delete $self->{size_req};
1659	delete $self->{texture};	1852	delete $self->{texture};
1660		1853
1661	$self->realloc;	1854	$self->realloc;
1662	}	1855	}
1663		1856
1664	sub reconfigure {	1857	sub reconfigure {
1665	my ($self) = @_;	1858	my ($self) = @_;
1666		1859
1667	delete $self->{size_req};	1860	delete $self->{size_req};
		1861	delete $self->{texture};
1668		1862
1669	$self->SUPER::reconfigure;	1863	$self->SUPER::reconfigure;
1670	}	1864	}
1671		1865
1672	sub _draw {	1866	sub _draw {
1673	my ($self) = @_;	1867	my ($self) = @_;
1674		1868
1675	$self->SUPER::_draw; # draw background, if applicable	1869	$self->SUPER::_draw; # draw background, if applicable
1676		1870
1677	my $tex = $self->{texture} ||= do {	1871	my $size = $self->{texture} ||= do {
1678	$self->{layout}->set_foreground (@{$self->{fg}});	1872	$self->{layout}->set_foreground (@{$self->{fg}});
1679	$self->{layout}->set_font ($self->{font}) if $self->{font};	1873	$self->{layout}->set_font ($self->{font}) if $self->{font};
1680	$self->{layout}->set_width ($self->{w});	1874	$self->{layout}->set_width ($self->{w});
1681	$self->{layout}->set_ellipsise ($self->{ellipsise});	1875	$self->{layout}->set_ellipsise ($self->{ellipsise});
1682	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1876	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1877	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684		1878
1685	new_from_layout CFClient::Texture $self->{layout}	1879	[$self->{layout}->size]
1686	};	1880	};
1687		1881
1688	unless (exists $self->{ox}) {	1882	unless (exists $self->{ox}) {
1689	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1883	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1884	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691	: ($self->{w} - $tex->{w}) * 0.5);	1885	: ($self->{w} - $size->[0]) * 0.5);
1692		1886
1693	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1887	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1888	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695	: ($self->{h} - $tex->{h}) * 0.5);	1889	: ($self->{h} - $size->[1]) * 0.5);
1696	};	1890	};
1697		1891
1698	glEnable GL_TEXTURE_2D;
1699
1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1892	my $w = List::Util::min $self->{w} + 4, $size->[0];
1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1893	my $h = List::Util::min $self->{h} + 2, $size->[1];
1702		1894
1703	if ($tex->{format} == GL_ALPHA) {	1895	$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	}	1896	}
1714		1897
1715	#############################################################################	1898	#############################################################################
1716		1899
1717	package CFClient::UI::EntryBase;	1900	package CFPlus::UI::EntryBase;
1718		1901
1719	our @ISA = CFClient::UI::Label::;	1902	our @ISA = CFPlus::UI::Label::;
1720		1903
1721	use CFClient::OpenGL;	1904	use CFPlus::OpenGL;
1722		1905
1723	sub new {	1906	sub new {
1724	my $class = shift;	1907	my $class = shift;
1725		1908
1726	$class->SUPER::new (	1909	$class->SUPER::new (
…		…
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) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	1990	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	1991	} else {
…		…
1828		2014
1829	my $idx = $self->{layout}->xy_to_index ($x, $y);	2015	my $idx = $self->{layout}->xy_to_index ($x, $y);
1830		2016
1831	# byte-index to char-index	2017	# byte-index to char-index
1832	my $text = $self->{text};	2018	my $text = $self->{text};
1833	utf8::encode $text;	2019	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834	$self->{cursor} = length substr $text, 0, $idx;	2020	$self->{cursor} = length $text;
1835		2021
1836	$self->_set_text ($self->{text});	2022	$self->_set_text ($self->{text});
1837	$self->update;	2023	$self->update;
1838		2024
1839	1	2025	1
…		…
1878	utf8::encode $text;	2064	utf8::encode $text;
1879		2065
1880	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2066	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881	}	2067	}
1882		2068
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2069	glBegin GL_LINES;
1885	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2070	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};	2071	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	2072	glEnd;
1888	}	2073	}
1889	}	2074	}
1890		2075
1891	package CFClient::UI::Entry;	2076	package CFPlus::UI::Entry;
1892		2077
1893	our @ISA = CFClient::UI::EntryBase::;	2078	our @ISA = CFPlus::UI::EntryBase::;
1894		2079
1895	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1896		2081
1897	sub invoke_key_down {	2082	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2083	my ($self, $ev) = @_;
1899		2084
1900	my $sym = $ev->{sym};	2085	my $sym = $ev->{sym};
…		…
1906	$self->{history_pointer} = -1;	2091	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2092	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2093	$self->emit (activate => $txt);
1909	$self->update;	2094	$self->update;
1910		2095
1911	} elsif ($sym == CFClient::SDLK_UP) {	2096	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2097	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2098	$self->{history_saveback} = $self->get_text;
1914	}	2099	}
1915	if (@{$self->{history} || []} > 0) {	2100	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2101	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2103	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2104	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2105	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2106	}
1922		2107
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2108	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2109	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2110	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2111
1927	if ($self->{history_pointer} >= 0) {	2112	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2113	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2122	1
1938	}	2123	}
1939		2124
1940	#############################################################################	2125	#############################################################################
1941		2126
1942	package CFClient::UI::Button;	2127	package CFPlus::UI::Button;
1943		2128
1944	our @ISA = CFClient::UI::Label::;	2129	our @ISA = CFPlus::UI::Label::;
1945		2130
1946	use CFClient::OpenGL;	2131	use CFPlus::OpenGL;
1947		2132
1948	my @tex =	2133	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2134	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2135	qw(b1_button_active.png);
1951		2136
1952	sub new {	2137	sub new {
1953	my $class = shift;	2138	my $class = shift;
1954		2139
…		…
1991	$self->SUPER::_draw;	2176	$self->SUPER::_draw;
1992	}	2177	}
1993		2178
1994	#############################################################################	2179	#############################################################################
1995		2180
		2181	package CFPlus::UI::CheckBox;
		2182
		2183	our @ISA = CFPlus::UI::DrawBG::;
		2184
		2185	my @tex =
		2186	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2187	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2188
		2189	use CFPlus::OpenGL;
		2190
		2191	sub new {
		2192	my $class = shift;
		2193
		2194	$class->SUPER::new (
		2195	padding_x => 2,
		2196	padding_y => 2,
		2197	fg => [1, 1, 1],
		2198	active_fg => [1, 1, 0],
		2199	bg => [0, 0, 0, 0.2],
		2200	active_bg => [1, 1, 1, 0.5],
		2201	state => 0,
		2202	can_hover => 1,
		2203	@_
		2204	)
		2205	}
		2206
		2207	sub size_request {
		2208	my ($self) = @_;
		2209
		2210	(6) x 2
		2211	}
		2212
		2213	sub toggle {
		2214	my ($self) = @_;
		2215
		2216	$self->{state} = !$self->{state};
		2217	$self->emit (changed => $self->{state});
		2218	$self->update;
		2219	}
		2220
		2221	sub invoke_button_down {
		2222	my ($self, $ev, $x, $y) = @_;
		2223
		2224	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2225	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2226	$self->toggle;
		2227	} else {
		2228	return 0
		2229	}
		2230
		2231	1
		2232	}
		2233
		2234	sub _draw {
		2235	my ($self) = @_;
		2236
		2237	$self->SUPER::_draw;
		2238
		2239	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2240
		2241	my ($w, $h) = @$self{qw(w h)};
		2242
		2243	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2244
		2245	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2246
		2247	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2248
		2249	glEnable GL_TEXTURE_2D;
		2250	$tex->draw_quad_alpha (0, 0, $s, $s);
		2251	glDisable GL_TEXTURE_2D;
		2252	}
		2253
		2254	#############################################################################
		2255
		2256	package CFPlus::UI::Image;
		2257
		2258	our @ISA = CFPlus::UI::Base::;
		2259
		2260	use CFPlus::OpenGL;
		2261
		2262	our %texture_cache;
		2263
		2264	sub new {
		2265	my $class = shift;
		2266
		2267	my $self = $class->SUPER::new (
		2268	can_events => 0,
		2269	@_,
		2270	);
		2271
		2272	$self->{path} || $self->{tex}
		2273	or Carp::croak "'path' or 'tex' attributes required";
		2274
		2275	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2276	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2277
		2278	Scalar::Util::weaken $texture_cache{$self->{path}};
		2279
		2280	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2281
		2282	$self
		2283	}
		2284
		2285	sub STORABLE_freeze {
		2286	my ($self, $cloning) = @_;
		2287
		2288	$self->{path}
		2289	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2290
		2291	$self->{path}
		2292	}
		2293
		2294	sub STORABLE_attach {
		2295	my ($self, $cloning, $path) = @_;
		2296
		2297	$self->new (path => $path)
		2298	}
		2299
		2300	sub size_request {
		2301	my ($self) = @_;
		2302
		2303	($self->{tex}{w}, $self->{tex}{h})
		2304	}
		2305
		2306	sub _draw {
		2307	my ($self) = @_;
		2308
		2309	my $tex = $self->{tex};
		2310
		2311	my ($w, $h) = ($self->{w}, $self->{h});
		2312
		2313	if ($self->{rot90}) {
		2314	glRotate 90, 0, 0, 1;
		2315	glTranslate 0, -$self->{w}, 0;
		2316
		2317	($w, $h) = ($h, $w);
		2318	}
		2319
		2320	glEnable GL_TEXTURE_2D;
		2321	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2322
		2323	$tex->draw_quad (0, 0, $w, $h);
		2324
		2325	glDisable GL_TEXTURE_2D;
		2326	}
		2327
		2328	#############################################################################
		2329
1996	package CFClient::UI::ImageButton;	2330	package CFPlus::UI::ImageButton;
1997		2331
1998	our @ISA = CFClient::UI::Image::;	2332	our @ISA = CFPlus::UI::Image::;
1999		2333
2000	use CFClient::OpenGL;	2334	use CFPlus::OpenGL;
2001		2335
2002	my %textures;	2336	my %textures;
2003		2337
2004	sub new {	2338	sub new {
2005	my $class = shift;	2339	my $class = shift;
…		…
2027	1	2361	1
2028	}	2362	}
2029		2363
2030	#############################################################################	2364	#############################################################################
2031		2365
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;	2366	package CFPlus::UI::VGauge;
2101		2367
2102	our @ISA = CFClient::UI::Base::;	2368	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		2369
2163	use List::Util qw(min max);	2370	use List::Util qw(min max);
2164		2371
2165	use CFClient::OpenGL;	2372	use CFPlus::OpenGL;
2166		2373
2167	my %tex = (	2374	my %tex = (
2168	food => [	2375	food => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2376	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2377	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171	],	2378	],
2172	grace => [	2379	grace => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2380	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/	2381	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175	],	2382	],
2176	hp => [	2383	hp => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2384	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2385	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179	],	2386	],
2180	mana => [	2387	mana => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2388	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/	2389	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183	],	2390	],
2184	);	2391	);
2185		2392
2186	# eg. VGauge->new (gauge => 'food'), default gauge: food	2393	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2246	my $ycut1 = max 0, min 1, $ycut;	2453	my $ycut1 = max 0, min 1, $ycut;
2247	my $ycut2 = max 0, min 1, $ycut - 1;	2454	my $ycut2 = max 0, min 1, $ycut - 1;
2248		2455
2249	my $h1 = $self->{h} * (1 - $ycut1);	2456	my $h1 = $self->{h} * (1 - $ycut1);
2250	my $h2 = $self->{h} * (1 - $ycut2);	2457	my $h2 = $self->{h} * (1 - $ycut2);
		2458	my $h3 = $self->{h};
		2459
		2460	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251		2461
2252	glEnable GL_BLEND;	2462	glEnable GL_BLEND;
2253	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2463	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2464	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255	glEnable GL_TEXTURE_2D;	2465	glEnable GL_TEXTURE_2D;
…		…
2274		2484
2275	if ($t3) {	2485	if ($t3) {
2276	glBindTexture GL_TEXTURE_2D, $t3->{name};	2486	glBindTexture GL_TEXTURE_2D, $t3->{name};
2277	glBegin GL_QUADS;	2487	glBegin GL_QUADS;
2278	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2488	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2489	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2490	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2491	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282	glEnd;	2492	glEnd;
2283	}	2493	}
2284		2494
2285	glDisable GL_BLEND;	2495	glDisable GL_BLEND;
2286	glDisable GL_TEXTURE_2D;	2496	glDisable GL_TEXTURE_2D;
2287	}	2497	}
2288		2498
2289	#############################################################################	2499	#############################################################################
2290		2500
2291	package CFClient::UI::Gauge;	2501	package CFPlus::UI::Gauge;
2292		2502
2293	our @ISA = CFClient::UI::VBox::;	2503	our @ISA = CFPlus::UI::VBox::;
2294		2504
2295	sub new {	2505	sub new {
2296	my ($class, %arg) = @_;	2506	my ($class, %arg) = @_;
2297		2507
2298	my $self = $class->SUPER::new (	2508	my $self = $class->SUPER::new (
…		…
2300	can_hover => 1,	2510	can_hover => 1,
2301	can_events => 1,	2511	can_events => 1,
2302	%arg,	2512	%arg,
2303	);	2513	);
2304		2514
2305	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2515	$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);	2516	$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");	2517	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308		2518
2309	$self	2519	$self
2310	}	2520	}
2311		2521
2312	sub set_fontsize {	2522	sub set_fontsize {
…		…
2333	$self->{value}->set_text ($val);	2543	$self->{value}->set_text ($val);
2334	}	2544	}
2335		2545
2336	#############################################################################	2546	#############################################################################
2337		2547
2338	package CFClient::UI::Slider;	2548	package CFPlus::UI::Slider;
2339		2549
2340	use strict;	2550	use strict;
2341		2551
2342	use CFClient::OpenGL;	2552	use CFPlus::OpenGL;
2343		2553
2344	our @ISA = CFClient::UI::DrawBG::;	2554	our @ISA = CFPlus::UI::DrawBG::;
2345		2555
2346	my @tex =	2556	my @tex =
2347	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2557	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348	qw(s1_slider.png s1_slider_bg.png);	2558	qw(s1_slider.png s1_slider_bg.png);
2349		2559
2350	sub new {	2560	sub new {
2351	my $class = shift;	2561	my $class = shift;
2352		2562
…		…
2441	}	2651	}
2442		2652
2443	1	2653	1
2444	}	2654	}
2445		2655
		2656	sub invoke_mouse_wheel {
		2657	my ($self, $ev) = @_;
		2658
		2659	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2660
		2661	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2662
		2663	! ! $delta
		2664	}
		2665
2446	sub update {	2666	sub update {
2447	my ($self) = @_;	2667	my ($self) = @_;
2448		2668
2449	delete $self->{knob_w};	2669	delete $self->{knob_w};
2450	$self->SUPER::update;	2670	$self->SUPER::update;
…		…
2497	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2498	}	2718	}
2499		2719
2500	#############################################################################	2720	#############################################################################
2501		2721
2502	package CFClient::UI::ValSlider;	2722	package CFPlus::UI::ValSlider;
2503		2723
2504	our @ISA = CFClient::UI::HBox::;	2724	our @ISA = CFPlus::UI::HBox::;
2505		2725
2506	sub new {	2726	sub new {
2507	my ($class, %arg) = @_;	2727	my ($class, %arg) = @_;
2508		2728
2509	my $range = delete $arg{range};	2729	my $range = delete $arg{range};
2510		2730
2511	my $self = $class->SUPER::new (	2731	my $self = $class->SUPER::new (
2512	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2732	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2733	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514	to_value => sub { shift },	2734	to_value => sub { shift },
2515	from_value => sub { shift },	2735	from_value => sub { shift },
2516	%arg,	2736	%arg,
2517	);	2737	);
2518		2738
…		…
2538	sub set_range { shift->{slider}->set_range (@_) }	2758	sub set_range { shift->{slider}->set_range (@_) }
2539	sub set_value { shift->{slider}->set_value (@_) }	2759	sub set_value { shift->{slider}->set_value (@_) }
2540		2760
2541	#############################################################################	2761	#############################################################################
2542		2762
2543	package CFClient::UI::TextScroller;	2763	package CFPlus::UI::TextScroller;
2544		2764
2545	our @ISA = CFClient::UI::HBox::;	2765	our @ISA = CFPlus::UI::HBox::;
2546		2766
2547	use CFClient::OpenGL;	2767	use CFPlus::OpenGL;
2548		2768
2549	sub new {	2769	sub new {
2550	my $class = shift;	2770	my $class = shift;
2551		2771
2552	my $self = $class->SUPER::new (	2772	my $self = $class->SUPER::new (
2553	fontsize => 1,	2773	fontsize => 1,
2554	can_events => 0,	2774	can_events => 1,
2555	indent => 0,	2775	indent => 0,
2556	#font => default_font	2776	#font => default_font
2557	@_,	2777	@_,
2558		2778
2559	layout => (new CFClient::Layout 1),	2779	layout => (new CFPlus::Layout),
2560	par => [],	2780	par => [],
2561	height => 0,	2781	height => 0,
2562	children => [	2782	children => [
2563	(new CFClient::UI::Empty expand => 1),	2783	(new CFPlus::UI::Empty expand => 1),
2564	(new CFClient::UI::Slider vertical => 1),	2784	(new CFPlus::UI::Slider vertical => 1),
2565	],	2785	],
2566	);	2786	);
2567		2787
2568	$self->{children}[1]->connect (changed => sub { $self->update });	2788	$self->{children}[1]->connect (changed => sub { $self->update });
2569		2789
…		…
2575		2795
2576	$self->{fontsize} = $fontsize;	2796	$self->{fontsize} = $fontsize;
2577	$self->reflow;	2797	$self->reflow;
2578	}	2798	}
2579		2799
2580	sub visible_children {	2800	sub size_request {
2581	my ($self) = @_;	2801	my ($self) = @_;
2582		2802
2583	@{$self->{children}}[0,1]	2803	my ($empty, $slider) = @{ $self->{children} };
		2804
		2805	local $self->{children} = [$empty, $slider];
		2806	$self->SUPER::size_request
2584	}	2807	}
2585		2808
2586	sub invoke_size_allocate {	2809	sub invoke_size_allocate {
2587	my ($self, $w, $h) = @_;	2810	my ($self, $w, $h) = @_;
2588		2811
…		…
2594	$self->{layout}->set_width ($empty->{w});	2817	$self->{layout}->set_width ($empty->{w});
2595	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2818	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596		2819
2597	$self->reflow;	2820	$self->reflow;
2598		2821
		2822	local $self->{children} = [$empty, $slider];
2599	$self->SUPER::invoke_size_allocate ($w, $h)	2823	$self->SUPER::invoke_size_allocate ($w, $h)
		2824	}
		2825
		2826	sub invoke_mouse_wheel {
		2827	my ($self, $ev) = @_;
		2828
		2829	return 0 unless $ev->{dy}; # only vertical movements
		2830
		2831	$self->{children}[1]->emit (mouse_wheel => $ev);
		2832
		2833	1
2600	}	2834	}
2601		2835
2602	sub get_layout {	2836	sub get_layout {
2603	my ($self, $para) = @_;	2837	my ($self, $para) = @_;
2604		2838
…		…
2632		2866
2633	# todo: base offset on lines or so, not on pixels	2867	# todo: base offset on lines or so, not on pixels
2634	$self->{children}[1]->set_value ($offset);	2868	$self->{children}[1]->set_value ($offset);
2635	}	2869	}
2636		2870
		2871	sub current_paragraph {
		2872	my ($self) = @_;
		2873
		2874	$self->{top_paragraph} - 1
		2875	}
		2876
		2877	sub scroll_to {
		2878	my ($self, $para) = @_;
		2879
		2880	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2881
		2882	$self->{scroll_to} = $para;
		2883	$self->update;
		2884	}
		2885
2637	sub clear {	2886	sub clear {
2638	my ($self) = @_;	2887	my ($self) = @_;
2639		2888
2640	my (undef, undef, @other) = @{ $self->{children} };	2889	my (undef, undef, @other) = @{ $self->{children} };
2641	$self->remove ($_) for @other;	2890	$self->remove ($_) for @other;
…		…
2644	$self->{height} = 0;	2893	$self->{height} = 0;
2645	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2894	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646	}	2895	}
2647		2896
2648	sub add_paragraph {	2897	sub add_paragraph {
2649	my ($self, $color, $para, $indent) = @_;	2898	my $self = shift;
2650		2899
2651	my ($text, @w) = ref $para ? @$para : $para;	2900	for my $para (@_) {
2652
2653	$para = {	2901	$para = {
		2902	fg => [1, 1, 1, 1],
		2903	indent => 0,
		2904	markup => "",
		2905	widget => [],
		2906	ref $para ? %$para : (markup => $para),
2654	w => 1e10,	2907	w => 1e10,
2655	wrapped => 1,	2908	wrapped => 1,
2656	fg => $color,
2657	indent => $indent,
2658	markup => $text,
2659	widget => \@w,
2660	};	2909	};
2661		2910
2662	$self->add (@w) if @w;	2911	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663	push @{$self->{par}}, $para;	2912	push @{$self->{par}}, $para;
		2913	}
2664		2914
2665	$self->{need_reflow}++;	2915	$self->{need_reflow}++;
2666	$self->update;	2916	$self->update;
2667	}	2917	}
2668		2918
2669	sub scroll_to_bottom {	2919	sub scroll_to_bottom {
2670	my ($self) = @_;	2920	my ($self) = @_;
2671		2921
2672	$self->{scroll_to_bottom} = 1;	2922	$self->{scroll_to} = $#{$self->{par}};
2673	$self->update;	2923	$self->update;
2674	}	2924	}
2675		2925
		2926	sub force_uptodate {
		2927	my ($self) = @_;
		2928
		2929	if (delete $self->{need_reflow}) {
		2930	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2931
		2932	my $height = 0;
		2933
		2934	for my $para (@{$self->{par}}) {
		2935	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2936	my $layout = $self->get_layout ($para);
		2937	my ($w, $h) = $layout->size;
		2938
		2939	$para->{w} = $w + $para->{indent};
		2940	$para->{h} = $h;
		2941	$para->{wrapped} = $layout->has_wrapped;
		2942	}
		2943
		2944	$para->{y} = $height;
		2945	$height += $para->{h};
		2946	}
		2947
		2948	$self->{height} = $height;
		2949	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2950
		2951	delete $self->{texture};
		2952	}
		2953
		2954	if (my $paridx = delete $self->{scroll_to}) {
		2955	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2956	}
		2957	}
		2958
2676	sub update {	2959	sub update {
2677	my ($self) = @_;	2960	my ($self) = @_;
2678		2961
2679	$self->SUPER::update;	2962	$self->SUPER::update;
2680		2963
2681	return unless $self->{h} > 0;	2964	return unless $self->{h} > 0;
2682		2965
2683	delete $self->{texture};	2966	delete $self->{texture};
2684		2967
2685	$ROOT->on_post_alloc ($self => sub {	2968	$ROOT->on_post_alloc ($self => sub {
		2969	$self->force_uptodate;
		2970
2686	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2971	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687		2972
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 {	2973	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716	glClearColor 0, 0, 0, 0;	2974	glClearColor 0, 0, 0, 0;
2717	glClear GL_COLOR_BUFFER_BIT;	2975	glClear GL_COLOR_BUFFER_BIT;
2718		2976
		2977	package CFPlus::UI::Base;
		2978	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		2979	(0, 0, $self->{w}, $self->{h});
		2980
		2981	my $top = int $self->{children}[1]{range}[0];
		2982
		2983	my $paridx = 0;
		2984	my $top_paragraph;
2719	my $top = int $self->{children}[1]{range}[0];	2985	my $top = int $self->{children}[1]{range}[0];
2720		2986
2721	my $y0 = $top;	2987	my $y0 = $top;
2722	my $y1 = $top + $H;	2988	my $y1 = $top + $H;
2723		2989
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}}) {	2990	for my $para (@{$self->{par}}) {
2731	my $h = $para->{h};	2991	my $h = $para->{h};
		2992	my $y = $para->{y};
2732		2993
2733	if ($y0 < $y + $h && $y < $y1) {	2994	if ($y0 < $y + $h && $y < $y1) {
2734
2735	my $layout = $self->get_layout ($para);	2995	my $layout = $self->get_layout ($para);
2736		2996
2737	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739	glRasterPos $para->{indent}, $y - $y0;	2997	$layout->render ($para->{indent}, $y - $y0);
2740	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741		2998
2742	if (my @w = @{ $para->{widget} }) {	2999	if (my @w = @{ $para->{widget} }) {
2743	my @s = $layout->get_shapes;	3000	my @s = $layout->get_shapes;
2744		3001
2745	for (@w) {	3002	for (@w) {
…		…
2751	$_->draw;	3008	$_->draw;
2752	}	3009	}
2753	}	3010	}
2754	}	3011	}
2755		3012
2756	$y += $h;	3013	$paridx++;
		3014	$top_paragraph ||= $paridx if $y >= $top;
2757	}	3015	}
2758		3016
2759	glDisable GL_BLEND;	3017	$self->{top_paragraph} = $top_paragraph;
2760	};	3018	};
2761	});	3019	});
2762	}	3020	}
2763		3021
2764	sub reconfigure {	3022	sub reconfigure {
…		…
2782	$self->{children}[1]->draw;	3040	$self->{children}[1]->draw;
2783	}	3041	}
2784		3042
2785	#############################################################################	3043	#############################################################################
2786		3044
2787	package CFClient::UI::Animator;	3045	package CFPlus::UI::Animator;
2788		3046
2789	use CFClient::OpenGL;	3047	use CFPlus::OpenGL;
2790		3048
2791	our @ISA = CFClient::UI::Bin::;	3049	our @ISA = CFPlus::UI::Bin::;
2792		3050
2793	sub moveto {	3051	sub moveto {
2794	my ($self, $x, $y) = @_;	3052	my ($self, $x, $y) = @_;
2795		3053
2796	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3054	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2824	glPopMatrix;	3082	glPopMatrix;
2825	}	3083	}
2826		3084
2827	#############################################################################	3085	#############################################################################
2828		3086
2829	package CFClient::UI::Flopper;	3087	package CFPlus::UI::Flopper;
2830		3088
2831	our @ISA = CFClient::UI::Button::;	3089	our @ISA = CFPlus::UI::Button::;
2832		3090
2833	sub new {	3091	sub new {
2834	my $class = shift;	3092	my $class = shift;
2835		3093
2836	my $self = $class->SUPER::new (	3094	my $self = $class->SUPER::new (
…		…
2848	$self->{other}->toggle_visibility;	3106	$self->{other}->toggle_visibility;
2849	}	3107	}
2850		3108
2851	#############################################################################	3109	#############################################################################
2852		3110
2853	package CFClient::UI::Tooltip;	3111	package CFPlus::UI::Tooltip;
2854		3112
2855	our @ISA = CFClient::UI::Bin::;	3113	our @ISA = CFPlus::UI::Bin::;
2856		3114
2857	use CFClient::OpenGL;	3115	use CFPlus::OpenGL;
2858		3116
2859	sub new {	3117	sub new {
2860	my $class = shift;	3118	my $class = shift;
2861		3119
2862	$class->SUPER::new (	3120	$class->SUPER::new (
…		…
2865	)	3123	)
2866	}	3124	}
2867		3125
2868	sub set_tooltip_from {	3126	sub set_tooltip_from {
2869	my ($self, $widget) = @_;	3127	my ($self, $widget) = @_;
		3128
		3129	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3130	if $widget->{tooltip} =~ /^#(.*)$/;
2870		3131
2871	my $tooltip = $widget->{tooltip};	3132	my $tooltip = $widget->{tooltip};
2872		3133
2873	if ($ENV{CFPLUS_DEBUG} & 2) {	3134	if ($ENV{CFPLUS_DEBUG} & 2) {
2874	$tooltip .= "\n\n" . (ref $widget) . "\n"	3135	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2878	}	3139	}
2879		3140
2880	$tooltip =~ s/^\n+//;	3141	$tooltip =~ s/^\n+//;
2881	$tooltip =~ s/\n+$//;	3142	$tooltip =~ s/\n+$//;
2882		3143
2883	$self->add (new CFClient::UI::Label	3144	$self->add (new CFPlus::UI::Label
2884	markup => $tooltip,	3145	markup => $tooltip,
2885	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3146	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886	fontsize => 0.8,	3147	fontsize => 0.8,
2887	fg => [0, 0, 0, 1],	3148	style => 1, # FLAG_INVERSE
2888	ellipsise => 0,	3149	ellipsise => 0,
2889	font => ($widget->{tooltip_font} || $::FONT_PROP),	3150	font => ($widget->{tooltip_font} || $::FONT_PROP),
2890	);	3151	);
2891	}	3152	}
2892		3153
…		…
2911		3172
2912	$self->{root}->on_post_alloc ("move_$self" => sub {	3173	$self->{root}->on_post_alloc ("move_$self" => sub {
2913	my $widget = $self->{owner}	3174	my $widget = $self->{owner}
2914	or return;	3175	or return;
2915		3176
		3177	if ($widget->{visible}) {
2916	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3178	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917		3179
2918	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3180	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919	if $x + $self->{w} > $self->{root}{w};	3181	if $x + $self->{w} > $self->{root}{w};
2920		3182
2921	$self->move_abs ($x, $y);	3183	$self->move_abs ($x, $y);
		3184	} else {
		3185	$self->hide;
		3186	}
2922	});	3187	});
2923	}	3188	}
2924		3189
2925	sub _draw {	3190	sub _draw {
2926	my ($self) = @_;	3191	my ($self) = @_;
…		…
2950	$self->SUPER::_draw;	3215	$self->SUPER::_draw;
2951	}	3216	}
2952		3217
2953	#############################################################################	3218	#############################################################################
2954		3219
2955	package CFClient::UI::Face;	3220	package CFPlus::UI::Face;
2956		3221
2957	our @ISA = CFClient::UI::Base::;	3222	our @ISA = CFPlus::UI::DrawBG::;
2958		3223
2959	use CFClient::OpenGL;	3224	use CFPlus::OpenGL;
2960		3225
2961	sub new {	3226	sub new {
2962	my $class = shift;	3227	my $class = shift;
2963		3228
2964	my $self = $class->SUPER::new (	3229	my $self = $class->SUPER::new (
…		…
2999	sub _draw {	3264	sub _draw {
3000	my ($self) = @_;	3265	my ($self) = @_;
3001		3266
3002	return unless $::CONN;	3267	return unless $::CONN;
3003		3268
		3269	$self->SUPER::_draw;
		3270
3004	my $face;	3271	my $face;
3005		3272
3006	if ($self->{frame}) {	3273	if ($self->{frame}) {
3007	my $anim = $::CONN->{anim}[$self->{anim}];	3274	my $anim = $::CONN->{anim}[$self->{anim}];
3008		3275
…		…
3030	$self->SUPER::destroy;	3297	$self->SUPER::destroy;
3031	}	3298	}
3032		3299
3033	#############################################################################	3300	#############################################################################
3034		3301
3035	package CFClient::UI::Buttonbar;	3302	package CFPlus::UI::Buttonbar;
3036		3303
3037	our @ISA = CFClient::UI::HBox::;	3304	our @ISA = CFPlus::UI::HBox::;
3038		3305
3039	# TODO: should actualyl wrap buttons and other goodies.	3306	# TODO: should actually wrap buttons and other goodies.
3040		3307
3041	#############################################################################	3308	#############################################################################
3042		3309
3043	package CFClient::UI::Menu;	3310	package CFPlus::UI::Menu;
3044		3311
3045	our @ISA = CFClient::UI::FancyFrame::;	3312	our @ISA = CFPlus::UI::Toplevel::;
3046		3313
3047	use CFClient::OpenGL;	3314	use CFPlus::OpenGL;
3048		3315
3049	sub new {	3316	sub new {
3050	my $class = shift;	3317	my $class = shift;
3051		3318
3052	my $self = $class->SUPER::new (	3319	my $self = $class->SUPER::new (
3053	items => [],	3320	items => [],
3054	z => 100,	3321	z => 100,
3055	@_,	3322	@_,
3056	);	3323	);
3057		3324
3058	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3325	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059		3326
3060	for my $item (@{ $self->{items} }) {	3327	for my $item (@{ $self->{items} }) {
3061	my ($widget, $cb, $tooltip) = @$item;	3328	my ($widget, $cb, $tooltip) = @$item;
3062		3329
3063	# handle various types of items, only text for now	3330	# handle various types of items, only text for now
3064	if (!ref $widget) {	3331	if (!ref $widget) {
		3332	if ($widget =~ /\t/) {
		3333	my ($left, $right) = split /\t/, $widget, 2;
		3334
3065	$widget = new CFClient::UI::Label	3335	$widget = new CFPlus::UI::HBox
3066	can_hover => 1,	3336	can_hover => 1,
3067	can_events => 1,	3337	can_events => 1,
		3338	tooltip => $tooltip,
		3339	children => [
		3340	(new CFPlus::UI::Label markup => $left, expand => 1),
		3341	(new CFPlus::UI::Label markup => $right, align => +1),
		3342	],
		3343	;
		3344
		3345	} else {
		3346	$widget = new CFPlus::UI::Label
		3347	can_hover => 1,
		3348	can_events => 1,
3068	markup => $widget,	3349	markup => $widget,
3069	tooltip => $tooltip	3350	tooltip => $tooltip;
		3351	}
3070	}	3352	}
3071		3353
3072	$self->{item}{$widget} = $item;	3354	$self->{item}{$widget} = $item;
3073		3355
3074	$self->{vbox}->add ($widget);	3356	$self->{vbox}->add ($widget);
…		…
3117	1	3399	1
3118	}	3400	}
3119		3401
3120	#############################################################################	3402	#############################################################################
3121		3403
3122	package CFClient::UI::Multiplexer;	3404	package CFPlus::UI::Multiplexer;
3123		3405
3124	our @ISA = CFClient::UI::Container::;	3406	our @ISA = CFPlus::UI::Container::;
3125		3407
3126	sub new {	3408	sub new {
3127	my $class = shift;	3409	my $class = shift;
3128		3410
3129	my $self = $class->SUPER::new (	3411	my $self = $class->SUPER::new (
…		…
3143		3425
3144	$self->{current} = $self->{children}[0]	3426	$self->{current} = $self->{children}[0]
3145	if @{ $self->{children} };	3427	if @{ $self->{children} };
3146	}	3428	}
3147		3429
		3430	sub get_current_page {
		3431	my ($self) = @_;
		3432
		3433	$self->{current}
		3434	}
		3435
3148	sub set_current_page {	3436	sub set_current_page {
3149	my ($self, $page_or_widget) = @_;	3437	my ($self, $page_or_widget) = @_;
3150		3438
3151	my $widget = ref $page_or_widget	3439	my $widget = ref $page_or_widget
3152	? $page_or_widget	3440	? $page_or_widget
…		…
3184	$self->{current}->draw;	3472	$self->{current}->draw;
3185	}	3473	}
3186		3474
3187	#############################################################################	3475	#############################################################################
3188		3476
3189	package CFClient::UI::Notebook;	3477	package CFPlus::UI::Notebook;
3190		3478
3191	our @ISA = CFClient::UI::VBox::;	3479	our @ISA = CFPlus::UI::VBox::;
3192		3480
3193	sub new {	3481	sub new {
3194	my $class = shift;	3482	my $class = shift;
3195		3483
3196	my $self = $class->SUPER::new (	3484	my $self = $class->SUPER::new (
3197	buttonbar => (new CFClient::UI::Buttonbar),	3485	buttonbar => (new CFPlus::UI::Buttonbar),
3198	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3486	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199	# filter => # will be put between multiplexer and $self	3487	# filter => # will be put between multiplexer and $self
3200	@_,	3488	@_,
3201	);	3489	);
3202		3490
3203	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3491	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3209	sub add {	3497	sub add {
3210	my ($self, $title, $widget, $tooltip) = @_;	3498	my ($self, $title, $widget, $tooltip) = @_;
3211		3499
3212	Scalar::Util::weaken $self;	3500	Scalar::Util::weaken $self;
3213		3501
3214	$self->{buttonbar}->add (new CFClient::UI::Button	3502	$self->{buttonbar}->add (new CFPlus::UI::Button
3215	markup => $title,	3503	markup => $title,
3216	tooltip => $tooltip,	3504	tooltip => $tooltip,
3217	on_activate => sub { $self->set_current_page ($widget) },	3505	on_activate => sub { $self->set_current_page ($widget) },
3218	);	3506	);
3219		3507
3220	$self->{multiplexer}->add ($widget);	3508	$self->{multiplexer}->add ($widget);
3221	}	3509	}
3222		3510
		3511	sub get_current_page {
		3512	my ($self) = @_;
		3513
		3514	$self->{multiplexer}->get_current_page
		3515	}
		3516
3223	sub set_current_page {	3517	sub set_current_page {
3224	my ($self, $page) = @_;	3518	my ($self, $page) = @_;
3225		3519
3226	$self->{multiplexer}->set_current_page ($page);	3520	$self->{multiplexer}->set_current_page ($page);
3227	$self->emit (page_changed => $self->{multiplexer}{current});	3521	$self->emit (page_changed => $self->{multiplexer}{current});
3228	}	3522	}
3229		3523
3230	#############################################################################	3524	#############################################################################
3231		3525
3232	package CFClient::UI::Combobox;	3526	package CFPlus::UI::Selector;
3233		3527
3234	use utf8;	3528	use utf8;
3235		3529
3236	our @ISA = CFClient::UI::Button::;	3530	our @ISA = CFPlus::UI::Button::;
3237		3531
3238	sub new {	3532	sub new {
3239	my $class = shift;	3533	my $class = shift;
3240		3534
3241	my $self = $class->SUPER::new (	3535	my $self = $class->SUPER::new (
…		…
3258	my ($value, $title, $tooltip) = @$_;	3552	my ($value, $title, $tooltip) = @$_;
3259		3553
3260	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3554	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261	}	3555	}
3262		3556
3263	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3557	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264	}	3558	}
3265		3559
3266	sub _set_value {	3560	sub _set_value {
3267	my ($self, $value) = @_;	3561	my ($self, $value) = @_;
3268		3562
…		…
3283	$self->emit (changed => $value);	3577	$self->emit (changed => $value);
3284	}	3578	}
3285		3579
3286	#############################################################################	3580	#############################################################################
3287		3581
3288	package CFClient::UI::Statusbox;	3582	package CFPlus::UI::Statusbox;
3289		3583
3290	our @ISA = CFClient::UI::VBox::;	3584	our @ISA = CFPlus::UI::VBox::;
3291		3585
3292	sub new {	3586	sub new {
3293	my $class = shift;	3587	my $class = shift;
3294		3588
3295	my $self = $class->SUPER::new (	3589	my $self = $class->SUPER::new (
…		…
3307	sub reorder {	3601	sub reorder {
3308	my ($self) = @_;	3602	my ($self) = @_;
3309	my $NOW = Time::HiRes::time;	3603	my $NOW = Time::HiRes::time;
3310		3604
3311	# freeze display when hovering over any label	3605	# freeze display when hovering over any label
3312	return if $CFClient::UI::TOOLTIP->{owner}	3606	return if $CFPlus::UI::TOOLTIP->{owner}
3313	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3607	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314	values %{ $self->{item} };	3608	values %{ $self->{item} };
3315		3609
3316	while (my ($k, $v) = each %{ $self->{item} }) {	3610	while (my ($k, $v) = each %{ $self->{item} }) {
3317	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3611	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318	}	3612	}
…		…
3339	for ($short) {	3633	for ($short) {
3340	s/^\s+//;	3634	s/^\s+//;
3341	s/\s+/ /g;	3635	s/\s+/ /g;
3342	}	3636	}
3343		3637
3344	new CFClient::UI::Label	3638	new CFPlus::UI::Label
3345	markup => $short,	3639	markup => $short,
3346	tooltip => $item->{tooltip},	3640	tooltip => $item->{tooltip},
3347	tooltip_font => $::FONT_PROP,	3641	tooltip_font => $::FONT_PROP,
3348	tooltip_width => 0.67,	3642	tooltip_width => 0.67,
3349	fontsize => $item->{fontsize} || $self->{fontsize},	3643	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3403	count => 1,	3697	count => 1,
3404	%arg,	3698	%arg,
3405	};	3699	};
3406	}	3700	}
3407		3701
		3702	$ROOT->on_refresh (reorder => sub {
3408	$self->reorder;	3703	$self->reorder;
		3704	});
3409	}	3705	}
3410		3706
3411	sub reconfigure {	3707	sub reconfigure {
3412	my ($self) = @_;	3708	my ($self) = @_;
3413		3709
…		…
3426	$self->SUPER::destroy;	3722	$self->SUPER::destroy;
3427	}	3723	}
3428		3724
3429	#############################################################################	3725	#############################################################################
3430		3726
3431	package CFClient::UI::Inventory;	3727	package CFPlus::UI::Inventory;
3432		3728
3433	our @ISA = CFClient::UI::ScrolledWindow::;	3729	our @ISA = CFPlus::UI::Table::;
3434		3730
3435	sub new {	3731	sub new {
3436	my $class = shift;	3732	my $class = shift;
3437		3733
3438	my $self = $class->SUPER::new (	3734	my $self = $class->SUPER::new (
3439	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3735	col_expand => [0, 1, 0],
		3736	items => [],
3440	@_,	3737	@_,
3441	);	3738	);
3442		3739
		3740	$self->set_sort_order (undef);
		3741
3443	$self	3742	$self
		3743	}
		3744
		3745	sub update_items {
		3746	my ($self) = @_;
		3747
		3748	$self->clear;
		3749
		3750	my @item = $self->{sort}->(@{ $self->{items} });
		3751
		3752	my @adds;
		3753	my $row = 0;
		3754	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3755	CFPlus::Item::update_widgets $item;
		3756
		3757	push @adds, 0, $row, $item->{face_widget};
		3758	push @adds, 1, $row, $item->{desc_widget};
		3759	push @adds, 2, $row, $item->{weight_widget};
		3760
		3761	$row++;
		3762	}
		3763
		3764	$self->add (@adds);
		3765	}
		3766
		3767	sub set_sort_order {
		3768	my ($self, $order) = @_;
		3769
		3770	$self->{sort} = $order ||= sub {
		3771	sort {
		3772	$a->{type} <=> $b->{type}
		3773	or $a->{name} cmp $b->{name}
		3774	} @_
		3775	};
		3776
		3777	$self->update_items;
3444	}	3778	}
3445		3779
3446	sub set_items {	3780	sub set_items {
3447	my ($self, $items) = @_;	3781	my ($self, $items) = @_;
3448		3782
3449	$self->{child}->clear;	3783	$self->{items} = [$items ? values %$items : ()];
3450	return unless $items;	3784	$self->update_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	}	3785	}
3470		3786
3471	#############################################################################	3787	#############################################################################
3472		3788
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;	3789	package CFPlus::UI::SpellList;
3682		3790
3683	our @ISA = CFClient::UI::Table::;	3791	our @ISA = CFPlus::UI::Table::;
3684		3792
3685	sub new {	3793	sub new {
3686	my $class = shift;	3794	my $class = shift;
3687		3795
3688	my $self = $class->SUPER::new (	3796	my $self = $class->SUPER::new (
…		…
3706	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3814	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707		3815
3708	sub rebuild_spell_list {	3816	sub rebuild_spell_list {
3709	my ($self) = @_;	3817	my ($self) = @_;
3710		3818
3711	$CFClient::UI::ROOT->on_refresh ($self => sub {	3819	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3712	$self->clear;	3820	$self->clear;
3713		3821
3714	return unless $::CONN;	3822	return unless $::CONN;
3715		3823
3716	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3824	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3825	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3826	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3827	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3828	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721		3829
3722	my $row = 0;	3830	my $row = 0;
3723		3831
3724	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3832	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725	my $spell = $self->{spell}{$_};	3833	my $spell = $self->{spell}{$_};
…		…
3732	if ($ev->{button} == 1) {	3840	if ($ev->{button} == 1) {
3733	$::CONN->user_send ("cast $spell->{name}");	3841	$::CONN->user_send ("cast $spell->{name}");
3734	} elsif ($ev->{button} == 2) {	3842	} elsif ($ev->{button} == 2) {
3735	$::CONN->user_send ("invoke $spell->{name}");	3843	$::CONN->user_send ("invoke $spell->{name}");
3736	} elsif ($ev->{button} == 3) {	3844	} elsif ($ev->{button} == 3) {
3737	(new CFClient::UI::Menu	3845	(new CFPlus::UI::Menu
3738	items => [	3846	items => [
3739	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3847	["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}"]) }],	3848	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741	],	3849	],
3742	)->popup ($ev);	3850	)->popup ($ev);
3743	} else {	3851	} else {
3744	return 0;	3852	return 0;
3745	}	3853	}
3746		3854
3747	1	3855	1
3748	};	3856	};
3749		3857
3750	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3858	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3751		3859
3752	#TODO: add path info to tooltip	3860	#TODO: add path info to tooltip
3753	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3861	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3754		3862
3755	$self->add (0, $row, new CFClient::UI::Face	3863	$self->add (0, $row, new CFPlus::UI::Face
3756	face => $spell->{face},	3864	face => $spell->{face},
3757	can_hover => 1,	3865	can_hover => 1,
3758	can_events => 1,	3866	can_events => 1,
3759	tooltip => $tooltip,	3867	tooltip => $tooltip,
3760	on_button_down => $spell_cb,	3868	on_button_down => $spell_cb,
3761	);	3869	);
3762		3870
3763	$self->add (1, $row, new CFClient::UI::Label	3871	$self->add (1, $row, new CFPlus::UI::Label
3764	expand => 1,	3872	expand => 1,
3765	text => $spell->{name},	3873	text => $spell->{name},
3766	can_hover => 1,	3874	can_hover => 1,
3767	can_events => 1,	3875	can_events => 1,
3768	tooltip => $tooltip,	3876	tooltip => $tooltip,
3769	on_button_down => $spell_cb,	3877	on_button_down => $spell_cb,
3770	);	3878	);
3771		3879
3772	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3880	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3881	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3882	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3883	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776	}	3884	}
3777	});	3885	});
3778	}	3886	}
3779		3887
3780	sub add_spell {	3888	sub add_spell {
…		…
3798	$self->rebuild_spell_list;	3906	$self->rebuild_spell_list;
3799	}	3907	}
3800		3908
3801	#############################################################################	3909	#############################################################################
3802		3910
3803	package CFClient::UI::Root;	3911	package CFPlus::UI::Root;
3804		3912
3805	our @ISA = CFClient::UI::Container::;	3913	our @ISA = CFPlus::UI::Container::;
3806		3914
3807	use List::Util qw(min max);	3915	use List::Util qw(min max);
3808		3916
3809	use CFClient::OpenGL;	3917	use CFPlus::OpenGL;
3810		3918
3811	sub new {	3919	sub new {
3812	my $class = shift;	3920	my $class = shift;
3813		3921
3814	my $self = $class->SUPER::new (	3922	my $self = $class->SUPER::new (
…		…
3990	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4098	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991		4099
3992	$w = 0 if $w < 0;	4100	$w = 0 if $w < 0;
3993	$h = 0 if $h < 0;	4101	$h = 0 if $h < 0;
3994		4102
		4103	$w = max $widget->{min_w}, $w;
		4104	$h = max $widget->{min_h}, $h;
		4105
		4106	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4107	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4108
		4109	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4110	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4111
3995	$w = int $w + 0.5;	4112	$w = int $w + 0.5;
3996	$h = int $h + 0.5;	4113	$h = int $h + 0.5;
3997		4114
3998	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4115	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999	$widget->{old_w} = $widget->{w};	4116	$widget->{old_w} = $widget->{w};
…		…
4022	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4139	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023	glMatrixMode GL_MODELVIEW;	4140	glMatrixMode GL_MODELVIEW;
4024	glLoadIdentity;	4141	glLoadIdentity;
4025		4142
4026	{	4143	{
4027	package CFClient::UI::Base;	4144	package CFPlus::UI::Base;
4028		4145
4029	($draw_x, $draw_y, $draw_w, $draw_h) =	4146	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030	(0, 0, $self->{w}, $self->{h});	4147	(0, 0, $self->{w}, $self->{h});
4031	}
4032		4148
4033	$self->_draw;	4149	$self->_draw;
		4150	}
4034	}	4151	}
4035		4152
4036	#############################################################################	4153	#############################################################################
4037		4154
4038	package CFClient::UI;	4155	package CFPlus::UI;
4039		4156
4040	$ROOT = new CFClient::UI::Root;	4157	$ROOT = new CFPlus::UI::Root;
4041	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4158	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042		4159
4043	1	4160	1
4044		4161

Diff Legend

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