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.306 by root, Sun Jun 18 17:39:36 2006 UTC vs.
Revision 1.345 by root, Sun Aug 13 21:46:10 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	}
…		…
335	sub size_request {	358	sub size_request {
336	require Carp;	359	require Carp;
337	Carp::confess "size_request is abstract";	360	Carp::confess "size_request is abstract";
338	}	361	}
339		362
		363	sub baseline_shift {
		364	0
		365	}
		366
340	sub configure {	367	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
342		369
343	if ($self->{aspect}) {	370	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
345		372
346	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		375
349	# use alignment to adjust x, y	376	# use alignment to adjust x, y
350		377
351	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
393		420
394	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
395		422
396	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
397		424
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	428	}
402	}	429	}
403		430
404	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
405	sub coord2local {	432	sub coord2local {
406	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
407		434
		435	Carp::confess unless $self->{parent};#d#
		436
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	438	}
410		439
411	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
412	sub coord2global {	441	sub coord2global {
413	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
414		443
		444	Carp::confess unless $self->{parent};#d#
		445
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	447	}
417		448
418	sub invoke_focus_in {	449	sub invoke_focus_in {
419	my ($self) = @_;	450	my ($self) = @_;
420		451
421	return if $FOCUS == $self;	452	return if $FOCUS == $self;
422	return unless $self->{can_focus};	453	return unless $self->{can_focus};
423		454
424	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
425		456
426	$focus->update if $focus;	457	$self->update;
427	$FOCUS->update;
428		458
429	0	459	0
430	}	460	}
431		461
432	sub invoke_focus_out {	462	sub invoke_focus_out {
433	my ($self) = @_;	463	my ($self) = @_;
434		464
435	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
436		466
437	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
438		468
439	$focus->update if $focus; #?	469	$self->update;
440		470
441	$::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
442	unless $FOCUS;	472	unless $FOCUS;
443		473
444	0	474	0
445	}	475	}
446		476
447	sub grab_focus {	477	sub grab_focus {
448	my ($self) = @_;	478	my ($self) = @_;
449		479
		480	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	481	$self->emit ("focus_in");
451	}	482	}
452		483
453	sub invoke_mouse_motion { 1 }	484	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	485	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	486	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
457		489
458	sub invoke_button_down {	490	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
460		492
461	$self->grab_focus;	493	$self->grab_focus;
462		494
463	1	495	0
464	}	496	}
465		497
466	sub connect {	498	sub connect {
467	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
468		500
469	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	}
470	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
471		515
472	sub emit {	516	sub emit {
473	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
474		518
		519	# I do not really like this solution, but I dislike duplication
		520	# and needlessly verbose code, too.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
		528	#d##TODO# stop propagating at first true, do not use sum
475	(List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before	529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
476	($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure	530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
477	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478	}	532	}
479		533
480	sub find_widget {	534	sub find_widget {
481	my ($self, $x, $y) = @_;	535	my ($self, $x, $y) = @_;
482		536
…		…
534	return unless $self->{h} && $self->{w};	588	return unless $self->{h} && $self->{w};
535		589
536	# update screen rectangle	590	# update screen rectangle
537	local $draw_x = $draw_x + $self->{x};	591	local $draw_x = $draw_x + $self->{x};
538	local $draw_y = $draw_y + $self->{y};	592	local $draw_y = $draw_y + $self->{y};
539	local $draw_w = $draw_x + $self->{w};
540	local $draw_h = $draw_y + $self->{h};
541		593
542	# skip widgets that are entirely outside the drawing area	594	# skip widgets that are entirely outside the drawing area
543	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	595	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	596	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545		597
…		…
568	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
569	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
570	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
571	glEnd;	623	glEnd;
572	glPopMatrix;	624	glPopMatrix;
573	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
574	}	626	}
575		627
576	$self->_draw;	628	$self->_draw;
577	glPopMatrix;	629	glPopMatrix;
578	}	630	}
…		…
584	}	636	}
585		637
586	sub DESTROY {	638	sub DESTROY {
587	my ($self) = @_;	639	my ($self) = @_;
588		640
		641	return if CFPlus::in_destruct;
		642
589	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
590		644
591	eval { $self->destroy };	645	eval { $self->destroy };
592	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
593	}	647	}
594		648
595	#############################################################################	649	#############################################################################
596		650
597	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
598		652
599	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
600		654
601	use strict;	655	use strict;
602	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
603		657
604	sub new {	658	sub new {
605	my $class = shift;	659	my $class = shift;
606		660
607	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
638	}	692	}
639	}	693	}
640		694
641	#############################################################################	695	#############################################################################
642		696
643	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
644		698
645	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
646		700
647	sub new {	701	sub new {
648	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
649	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
650	}	704	}
…		…
657		711
658	sub draw { }	712	sub draw { }
659		713
660	#############################################################################	714	#############################################################################
661		715
662	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
663		717
664	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
665		719
666	sub new {	720	sub new {
667	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
668		722
669	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
678	if $children;	732	if $children;
679		733
680	$self	734	$self
681	}	735	}
682		736
		737	sub realloc {
		738	my ($self) = @_;
		739
		740	$self->{force_realloc} = 1;
		741	$self->{force_size_alloc} = 1;
		742	$self->SUPER::realloc;
		743	}
		744
683	sub add {	745	sub add {
684	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
685		747
686	$_->set_parent ($self)	748	$_->set_parent ($self)
687	for @widgets;	749	for @widgets;
…		…
747	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
748	}	810	}
749		811
750	#############################################################################	812	#############################################################################
751		813
752	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
753		815
754	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
755		817
756	sub new {	818	sub new {
757	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
758		820
759	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
760		822
761	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
762	}	824	}
763		825
764	sub add {	826	sub add {
…		…
771	sub remove {	833	sub remove {
772	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
773		835
774	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
775		837
776	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
777	unless @{$self->{children}};	839	unless @{$self->{children}};
778	}	840	}
779		841
780	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
781		843
…		…
793		855
794	#############################################################################	856	#############################################################################
795		857
796	# back-buffered drawing area	858	# back-buffered drawing area
797		859
798	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
799		861
800	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
801		863
802	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
803		865
804	sub new {	866	sub new {
805	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
806		868
807	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
829	}	891	}
830		892
831	sub render_child {	893	sub render_child {
832	my ($self) = @_;	894	my ($self) = @_;
833		895
834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	896	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
835	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
836	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
837		899
838	{	900	{
839	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
840		902
841	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
842	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
843	}	905	}
844		906
…		…
847	}	909	}
848		910
849	sub _draw {	911	sub _draw {
850	my ($self) = @_;	912	my ($self) = @_;
851		913
852	my ($w, $h) = @$self{qw(w h)};
853
854	my $tex = $self->{texture}	914	my $tex = $self->{texture}
855	or return;	915	or return;
856		916
857	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
860		920
861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
862		922
863	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
864	}	924	}
865		925
866	#############################################################################	926	#############################################################################
867		927
868	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
869		929
870	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
871		931
872	sub new {	932	sub new {
873	my $class = shift;	933	my $class = shift;
874		934
875	$class->SUPER::new (	935	$class->SUPER::new (
…		…
935	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
937	) {	997	) {
938	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
939	} else {	999	} else {
940	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
941	}	1001	}
942	}	1002	}
943		1003
944	sub _render {	1004	sub _render {
945	my ($self) = @_;	1005	my ($self) = @_;
946		1006
947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1007	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1008	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
949		1009
950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951		1011
952	$self->SUPER::_render;	1012	$self->SUPER::_render;
953	}	1013	}
954		1014
955	#############################################################################	1015	#############################################################################
956		1016
957	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
958		1018
959	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
960		1020
961	sub new {	1021	sub new {
962	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
963		1023
964	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
965		1025
966	my $self;	1026	my $self;
967		1027
968	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
969	vertical => 1,	1029	vertical => 1,
970	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
971	on_changed => sub {	1031	on_changed => sub {
972	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
973	},	1033	},
974	;	1034	;
975		1035
976	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
977	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
		1038	can_events => 1,
978	slider => $slider,	1039	slider => $slider,
979	%arg,	1040	%arg,
980	);	1041	);
981		1042
982	$self->SUPER::add ($self->{vp}, $self->{slider});	1043	$self->SUPER::add ($self->{vp}, $self->{slider});
983	$self->add ($child) if $child;	1044	$self->add ($child) if $child;
984		1045
985	$self	1046	$self
986	}	1047	}
987		1048
		1049	#TODO# update range on size_allocate depending on child
		1050
988	sub add {	1051	sub add {
989	my ($self, $widget) = @_;	1052	my ($self, $widget) = @_;
990		1053
991	$self->{vp}->add ($self->{child} = $widget);	1054	$self->{vp}->add ($self->{child} = $widget);
992	}	1055	}
993		1056
		1057	sub invoke_mouse_wheel {
		1058	my ($self, $ev) = @_;
		1059
		1060	return 0 unless $ev->{dy}; # only vertical movements
		1061
		1062	$self->{slider}->emit (mouse_wheel => $ev);
		1063
		1064	1
		1065	}
		1066
		1067	sub update_slider {
		1068	my ($self) = @_;
		1069
		1070	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1071	}
		1072
994	sub update {	1073	sub update {
995	my ($self) = @_;	1074	my ($self) = @_;
996		1075
997	$self->SUPER::update;	1076	$self->SUPER::update;
998		1077
999	# todo: overwrite size_allocate of child	1078	$self->update_slider;
1000	my $child = $self->{vp}->child;
1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002	}	1079	}
1003		1080
1004	sub invoke_size_allocate {	1081	sub invoke_size_allocate {
1005	my ($self, $w, $h) = @_;	1082	my ($self, $w, $h) = @_;
1006		1083
1007	my $child = $self->{vp}->child;	1084	$self->update_slider;
1008	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009		1085
1010	$self->SUPER::invoke_size_allocate ($w, $h)	1086	$self->SUPER::invoke_size_allocate ($w, $h)
1011	}	1087	}
1012		1088
1013	#TODO# update range on size_allocate depending on child
1014	# update viewport offset on scroll
1015
1016	#############################################################################	1089	#############################################################################
1017		1090
1018	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
1019		1092
1020	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
1021		1094
1022	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
1023		1096
1024	sub new {	1097	sub new {
1025	my $class = shift;	1098	my $class = shift;
1026		1099
1027	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
1053	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
1054	}	1127	}
1055		1128
1056	#############################################################################	1129	#############################################################################
1057		1130
1058	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
1059		1132
1060	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
1061		1134
1062	use CFClient::OpenGL;	1135	use CFPlus::OpenGL;
1063		1136
1064	my $bg =	1137	my $bg =
1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1138	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066	mipmap => 1, wrap => 1;	1139	mipmap => 1, wrap => 1;
1067		1140
1068	my @border =	1141	my @border =
1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1142	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1143	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071		1144
1072	sub new {	1145	sub new {
1073	my ($class, %arg) = @_;	1146	my ($class, %arg) = @_;
1074		1147
1075	my $self = $class->SUPER::new (	1148	my $self = $class->SUPER::new (
1076	bg => [1, 1, 1, 1],	1149	bg => [1, 1, 1, 1],
1077	border_bg => [1, 1, 1, 1],	1150	border_bg => [1, 1, 1, 1],
1078	border => 0.6,	1151	border => 0.6,
1079	can_events => 1,	1152	can_events => 1,
1080	min_w => 16,	1153	min_w => 64,
1081	min_h => 16,	1154	min_h => 32,
1082	%arg,	1155	%arg,
1083	);	1156	);
1084		1157
1085	$self->{title_widget} = new CFClient::UI::Label	1158	$self->{title_widget} = new CFPlus::UI::Label
1086	align => 0,	1159	align => 0,
1087	valign => 1,	1160	valign => 1,
1088	text => $self->{title},	1161	text => $self->{title},
1089	fontsize => $self->{border},	1162	fontsize => $self->{border},
1090	if exists $self->{title};	1163	if exists $self->{title};
1091		1164
1092	if ($self->{has_close_button}) {	1165	if ($self->{has_close_button}) {
1093	$self->{close_button} =	1166	$self->{close_button} =
1094	new CFClient::UI::ImageButton	1167	new CFPlus::UI::ImageButton
1095	image => 'x1_close.png',	1168	path => 'x1_close.png',
1096	on_activate => sub { $self->hide };	1169	on_activate => sub { $self->emit ("delete") };
1097		1170
1098	$self->CFClient::UI::Container::add ($self->{close_button});	1171	$self->CFPlus::UI::Container::add ($self->{close_button});
1099	}	1172	}
1100		1173
1101	$self	1174	$self
1102	}	1175	}
1103		1176
1104	sub add {	1177	sub add {
1105	my ($self, @widgets) = @_;	1178	my ($self, @widgets) = @_;
1106		1179
1107	$self->SUPER::add (@widgets);	1180	$self->SUPER::add (@widgets);
1108	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1181	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1182	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1110	}	1183	}
1111		1184
1112	sub border {	1185	sub border {
1113	int $_[0]{border} * $::FONTSIZE	1186	int $_[0]{border} * $::FONTSIZE
1114	}	1187	}
…		…
1147	$self->child->configure ($border, $border, $w, $h);	1220	$self->child->configure ($border, $border, $w, $h);
1148		1221
1149	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1222	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150	if $self->{close_button};	1223	if $self->{close_button};
1151		1224
		1225	1
		1226	}
		1227
		1228	sub invoke_delete {
		1229	my ($self) = @_;
		1230
		1231	$self->hide;
		1232
1152	1	1233	1
1153	}	1234	}
1154		1235
1155	sub invoke_button_down {	1236	sub invoke_button_down {
1156	my ($self, $ev, $x, $y) = @_;	1237	my ($self, $ev, $x, $y) = @_;
…		…
1214	$self->{motion}->($ev, $x, $y) if $self->{motion};	1295	$self->{motion}->($ev, $x, $y) if $self->{motion};
1215		1296
1216	! ! $self->{motion}	1297	! ! $self->{motion}
1217	}	1298	}
1218		1299
		1300	sub invoke_visibility_change {
		1301	my ($self, $visible) = @_;
		1302
		1303	delete $self->{motion} unless $visible;
		1304
		1305	0
		1306	}
		1307
1219	sub _draw {	1308	sub _draw {
1220	my ($self) = @_;	1309	my ($self) = @_;
1221		1310
1222	my $child = $self->{children}[0];	1311	my $child = $self->{children}[0];
1223		1312
…		…
1260	if $self->{close_button};	1349	if $self->{close_button};
1261	}	1350	}
1262		1351
1263	#############################################################################	1352	#############################################################################
1264		1353
1265	package CFClient::UI::Table;	1354	package CFPlus::UI::Table;
1266		1355
1267	our @ISA = CFClient::UI::Base::;	1356	our @ISA = CFPlus::UI::Base::;
1268		1357
1269	use List::Util qw(max sum);	1358	use List::Util qw(max sum);
1270		1359
1271	use CFClient::OpenGL;	1360	use CFPlus::OpenGL;
1272		1361
1273	sub new {	1362	sub new {
1274	my $class = shift;	1363	my $class = shift;
1275		1364
1276	$class->SUPER::new (	1365	$class->SUPER::new (
…		…
1282	sub children {	1371	sub children {
1283	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1372	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284	}	1373	}
1285		1374
1286	sub add {	1375	sub add {
1287	my ($self, $x, $y, $child) = @_;	1376	my ($self) = shift;
1288		1377
		1378	while (@_) {
		1379	my ($x, $y, $child) = splice @_, 0, 3, ();
1289	$child->set_parent ($self);	1380	$child->set_parent ($self);
1290	$self->{children}[$y][$x] = $child;	1381	$self->{children}[$y][$x] = $child;
		1382	}
1291		1383
		1384	$self->{force_realloc} = 1;
		1385	$self->{force_size_alloc} = 1;
1292	$self->realloc;	1386	$self->realloc;
1293	}	1387	}
1294		1388
1295	sub remove {	1389	sub remove {
1296	my ($self, $child) = @_;	1390	my ($self, $child) = @_;
…		…
1361		1455
1362	# linearly scale sizes	1456	# linearly scale sizes
1363	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1457	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1458	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365		1459
1366	CFClient::UI::harmonize $ws;	1460	CFPlus::UI::harmonize $ws;
1367	CFClient::UI::harmonize $hs;	1461	CFPlus::UI::harmonize $hs;
1368		1462
1369	my $y;	1463	my $y;
1370		1464
1371	for my $r (0 .. $#{$self->{children}}) {	1465	for my $r (0 .. $#{$self->{children}}) {
1372	my $row = $self->{children}[$r]	1466	my $row = $self->{children}[$r]
…		…
1415	}	1509	}
1416	}	1510	}
1417		1511
1418	#############################################################################	1512	#############################################################################
1419		1513
1420	package CFClient::UI::Box;	1514	package CFPlus::UI::Box;
1421		1515
1422	our @ISA = CFClient::UI::Container::;	1516	our @ISA = CFPlus::UI::Container::;
1423		1517
1424	sub size_request {	1518	sub size_request {
1425	my ($self) = @_;	1519	my ($self) = @_;
1426		1520
1427	$self->{vertical}	1521	$self->{vertical}
…		…
1437		1531
1438	sub invoke_size_allocate {	1532	sub invoke_size_allocate {
1439	my ($self, $w, $h) = @_;	1533	my ($self, $w, $h) = @_;
1440		1534
1441	my $space = $self->{vertical} ? $h : $w;	1535	my $space = $self->{vertical} ? $h : $w;
1442	my $children = $self->{children};	1536	my @children = $self->visible_children;
1443		1537
1444	my @req;	1538	my @req;
1445		1539
1446	if ($self->{homogeneous}) {	1540	if ($self->{homogeneous}) {
1447	@req = ($space / (@$children || 1)) x @$children;	1541	@req = ($space / (@children || 1)) x @children;
1448	} else {	1542	} else {
1449	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1543	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450	my $req = List::Util::sum @req;	1544	my $req = List::Util::sum @req;
1451		1545
1452	if ($req > $space) {	1546	if ($req > $space) {
1453	# ah well, not enough space	1547	# ah well, not enough space
1454	$_ *= $space / $req for @req;	1548	$_ *= $space / $req for @req;
1455	} else {	1549	} else {
1456	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1550	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457		1551
1458	$space = ($space - $req) / $expand; # remaining space to give away	1552	$space = ($space - $req) / $expand; # remaining space to give away
1459		1553
1460	$req[$_] += $space * $children->[$_]{expand}	1554	$req[$_] += $space * $children[$_]{expand}
1461	for 0 .. $#$children;	1555	for 0 .. $#children;
1462	}	1556	}
1463	}	1557	}
1464		1558
1465	CFClient::UI::harmonize \@req;	1559	CFPlus::UI::harmonize \@req;
1466		1560
1467	my $pos = 0;	1561	my $pos = 0;
1468	for (0 .. $#$children) {	1562	for (0 .. $#children) {
1469	my $alloc = $req[$_];	1563	my $alloc = $req[$_];
1470	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1564	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471		1565
1472	$pos += $alloc;	1566	$pos += $alloc;
1473	}	1567	}
1474		1568
1475	1	1569	1
1476	}	1570	}
1477		1571
1478	#############################################################################	1572	#############################################################################
1479		1573
1480	package CFClient::UI::HBox;	1574	package CFPlus::UI::HBox;
1481		1575
1482	our @ISA = CFClient::UI::Box::;	1576	our @ISA = CFPlus::UI::Box::;
1483		1577
1484	sub new {	1578	sub new {
1485	my $class = shift;	1579	my $class = shift;
1486		1580
1487	$class->SUPER::new (	1581	$class->SUPER::new (
…		…
1490	)	1584	)
1491	}	1585	}
1492		1586
1493	#############################################################################	1587	#############################################################################
1494		1588
1495	package CFClient::UI::VBox;	1589	package CFPlus::UI::VBox;
1496		1590
1497	our @ISA = CFClient::UI::Box::;	1591	our @ISA = CFPlus::UI::Box::;
1498		1592
1499	sub new {	1593	sub new {
1500	my $class = shift;	1594	my $class = shift;
1501		1595
1502	$class->SUPER::new (	1596	$class->SUPER::new (
…		…
1505	)	1599	)
1506	}	1600	}
1507		1601
1508	#############################################################################	1602	#############################################################################
1509		1603
1510	package CFClient::UI::Label;	1604	package CFPlus::UI::Label;
1511		1605
1512	our @ISA = CFClient::UI::DrawBG::;	1606	our @ISA = CFPlus::UI::DrawBG::;
1513		1607
1514	use CFClient::OpenGL;	1608	use CFPlus::OpenGL;
1515		1609
1516	sub new {	1610	sub new {
1517	my ($class, %arg) = @_;	1611	my ($class, %arg) = @_;
1518		1612
1519	my $self = $class->SUPER::new (	1613	my $self = $class->SUPER::new (
…		…
1522	#active_bg => none	1616	#active_bg => none
1523	#font => default_font	1617	#font => default_font
1524	#text => initial text	1618	#text => initial text
1525	#markup => initial narkup	1619	#markup => initial narkup
1526	#max_w => maximum pixel width	1620	#max_w => maximum pixel width
		1621	#style => 0, # render flags
1527	ellipsise => 3, # end	1622	ellipsise => 3, # end
1528	layout => (new CFClient::Layout),	1623	layout => (new CFPlus::Layout),
1529	fontsize => 1,	1624	fontsize => 1,
1530	align => -1,	1625	align => -1,
1531	valign => -1,	1626	valign => -1,
1532	padding_x => 2,	1627	padding_x => 2,
1533	padding_y => 2,	1628	padding_y => 2,
1534	can_events => 0,	1629	can_events => 0,
1535	%arg	1630	%arg
1536	);	1631	);
1537		1632
1538	if (exists $self->{template}) {	1633	if (exists $self->{template}) {
1539	my $layout = new CFClient::Layout;	1634	my $layout = new CFPlus::Layout;
1540	$layout->set_text (delete $self->{template});	1635	$layout->set_text (delete $self->{template});
1541	$self->{template} = $layout;	1636	$self->{template} = $layout;
1542	}	1637	}
1543		1638
1544	if (exists $self->{markup}) {	1639	if (exists $self->{markup}) {
…		…
1548	}	1643	}
1549		1644
1550	$self	1645	$self
1551	}	1646	}
1552		1647
1553	sub escape($) {
1554	local $_ = $_[0];
1555
1556	s/&/&amp;/g;
1557	s/>/&gt;/g;
1558	s/</&lt;/g;
1559
1560	$_
1561	}
1562
1563	sub update {	1648	sub update {
1564	my ($self) = @_;	1649	my ($self) = @_;
1565		1650
1566	delete $self->{texture};	1651	delete $self->{texture};
1567	$self->SUPER::update;	1652	$self->SUPER::update;
…		…
1578	my ($self, $text) = @_;	1663	my ($self, $text) = @_;
1579		1664
1580	return if $self->{text} eq "T$text";	1665	return if $self->{text} eq "T$text";
1581	$self->{text} = "T$text";	1666	$self->{text} = "T$text";
1582		1667
1583	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584	$self->{layout}->set_text ($text);	1668	$self->{layout}->set_text ($text);
1585		1669
1586	delete $self->{size_req};	1670	delete $self->{size_req};
1587	$self->realloc;	1671	$self->realloc;
1588	$self->update;	1672	$self->update;
…		…
1594	return if $self->{text} eq "M$markup";	1678	return if $self->{text} eq "M$markup";
1595	$self->{text} = "M$markup";	1679	$self->{text} = "M$markup";
1596		1680
1597	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1681	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598		1682
1599	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600	$self->{layout}->set_markup ($markup);	1683	$self->{layout}->set_markup ($markup);
1601		1684
1602	delete $self->{size_req};	1685	delete $self->{size_req};
1603	$self->realloc;	1686	$self->realloc;
1604	$self->update;	1687	$self->update;
…		…
1616		1699
1617	my ($w, $h) = $self->{layout}->size;	1700	my ($w, $h) = $self->{layout}->size;
1618		1701
1619	if (exists $self->{template}) {	1702	if (exists $self->{template}) {
1620	$self->{template}->set_font ($self->{font}) if $self->{font};	1703	$self->{template}->set_font ($self->{font}) if $self->{font};
		1704	$self->{template}->set_width ($self->{max_w} || -1);
1621	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1705	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622		1706
1623	my ($w2, $h2) = $self->{template}->size;	1707	my ($w2, $h2) = $self->{template}->size;
1624		1708
1625	$w = List::Util::max $w, $w2;	1709	$w = List::Util::max $w, $w2;
…		…
1630	};	1714	};
1631		1715
1632	@{ $self->{size_req} }	1716	@{ $self->{size_req} }
1633	}	1717	}
1634		1718
		1719	sub baseline_shift {
		1720	$_[0]{layout}->descent
		1721	}
		1722
1635	sub invoke_size_allocate {	1723	sub invoke_size_allocate {
1636	my ($self, $w, $h) = @_;	1724	my ($self, $w, $h) = @_;
1637		1725
1638	delete $self->{ox};	1726	delete $self->{ox};
1639		1727
…		…
1645		1733
1646	sub set_fontsize {	1734	sub set_fontsize {
1647	my ($self, $fontsize) = @_;	1735	my ($self, $fontsize) = @_;
1648		1736
1649	$self->{fontsize} = $fontsize;	1737	$self->{fontsize} = $fontsize;
		1738	delete $self->{size_req};
1650	delete $self->{texture};	1739	delete $self->{texture};
1651		1740
1652	$self->realloc;	1741	$self->realloc;
1653	}	1742	}
1654		1743
1655	sub reconfigure {	1744	sub reconfigure {
1656	my ($self) = @_;	1745	my ($self) = @_;
1657		1746
1658	delete $self->{size_req};	1747	delete $self->{size_req};
		1748	delete $self->{texture};
1659		1749
1660	$self->SUPER::reconfigure;	1750	$self->SUPER::reconfigure;
1661	}	1751	}
1662		1752
1663	sub _draw {	1753	sub _draw {
1664	my ($self) = @_;	1754	my ($self) = @_;
1665		1755
1666	$self->SUPER::_draw; # draw background, if applicable	1756	$self->SUPER::_draw; # draw background, if applicable
1667		1757
1668	my $tex = $self->{texture} ||= do {	1758	my $size = $self->{texture} ||= do {
1669	$self->{layout}->set_foreground (@{$self->{fg}});	1759	$self->{layout}->set_foreground (@{$self->{fg}});
1670	$self->{layout}->set_font ($self->{font}) if $self->{font};	1760	$self->{layout}->set_font ($self->{font}) if $self->{font};
1671	$self->{layout}->set_width ($self->{w});	1761	$self->{layout}->set_width ($self->{w});
1672	$self->{layout}->set_ellipsise ($self->{ellipsise});	1762	$self->{layout}->set_ellipsise ($self->{ellipsise});
1673	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1763	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1764	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675		1765
1676	new_from_layout CFClient::Texture $self->{layout}	1766	[$self->{layout}->size]
1677	};	1767	};
1678		1768
1679	unless (exists $self->{ox}) {	1769	unless (exists $self->{ox}) {
1680	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1770	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1771	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682	: ($self->{w} - $tex->{w}) * 0.5);	1772	: ($self->{w} - $size->[0]) * 0.5);
1683		1773
1684	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1774	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1775	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686	: ($self->{h} - $tex->{h}) * 0.5);	1776	: ($self->{h} - $size->[1]) * 0.5);
1687	};	1777	};
1688		1778
1689	glEnable GL_TEXTURE_2D;
1690
1691	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1779	my $w = List::Util::min $self->{w} + 4, $size->[0];
1692	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1780	my $h = List::Util::min $self->{h} + 2, $size->[1];
1693		1781
1694	if ($tex->{format} == GL_ALPHA) {	1782	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1696	glColor @{$self->{fg}};
1697	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1698	} else {
1699	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1700	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1701	}
1702
1703	glDisable GL_TEXTURE_2D;
1704	}	1783	}
1705		1784
1706	#############################################################################	1785	#############################################################################
1707		1786
1708	package CFClient::UI::EntryBase;	1787	package CFPlus::UI::EntryBase;
1709		1788
1710	our @ISA = CFClient::UI::Label::;	1789	our @ISA = CFPlus::UI::Label::;
1711		1790
1712	use CFClient::OpenGL;	1791	use CFPlus::OpenGL;
1713		1792
1714	sub new {	1793	sub new {
1715	my $class = shift;	1794	my $class = shift;
1716		1795
1717	$class->SUPER::new (	1796	$class->SUPER::new (
…		…
1779		1858
1780	if ($uni == 8) {	1859	if ($uni == 8) {
1781	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782	} elsif ($uni == 127) {	1861	} elsif ($uni == 127) {
1783	substr $text, $self->{cursor}, 1, "";	1862	substr $text, $self->{cursor}, 1, "";
1784	} elsif ($sym == CFClient::SDLK_LEFT) {	1863	} elsif ($sym == CFPlus::SDLK_LEFT) {
1785	--$self->{cursor} if $self->{cursor};	1864	--$self->{cursor} if $self->{cursor};
1786	} elsif ($sym == CFClient::SDLK_RIGHT) {	1865	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1787	++$self->{cursor} if $self->{cursor} < length $self->{text};	1866	++$self->{cursor} if $self->{cursor} < length $self->{text};
1788	} elsif ($sym == CFClient::SDLK_HOME) {	1867	} elsif ($sym == CFPlus::SDLK_HOME) {
1789	$self->{cursor} = 0;	1868	$self->{cursor} = 0;
1790	} elsif ($sym == CFClient::SDLK_END) {	1869	} elsif ($sym == CFPlus::SDLK_END) {
1791	$self->{cursor} = length $text;	1870	$self->{cursor} = length $text;
1792	} elsif ($uni == 27) {	1871	} elsif ($uni == 27) {
1793	$self->emit ('escape');	1872	$self->emit ('escape');
1794	} elsif ($uni) {	1873	} elsif ($uni) {
1795	substr $text, $self->{cursor}++, 0, chr $uni;	1874	substr $text, $self->{cursor}++, 0, chr $uni;
…		…
1819		1898
1820	my $idx = $self->{layout}->xy_to_index ($x, $y);	1899	my $idx = $self->{layout}->xy_to_index ($x, $y);
1821		1900
1822	# byte-index to char-index	1901	# byte-index to char-index
1823	my $text = $self->{text};	1902	my $text = $self->{text};
1824	utf8::encode $text;	1903	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825	$self->{cursor} = length substr $text, 0, $idx;	1904	$self->{cursor} = length $text;
1826		1905
1827	$self->_set_text ($self->{text});	1906	$self->_set_text ($self->{text});
1828	$self->update;	1907	$self->update;
1829		1908
1830	1	1909	1
…		…
1869	utf8::encode $text;	1948	utf8::encode $text;
1870		1949
1871	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	1950	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1872	}	1951	}
1873		1952
1874	glColor @{$self->{fg}};
1875	glBegin GL_LINES;	1953	glBegin GL_LINES;
1876	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	1954	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	1955	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878	glEnd;	1956	glEnd;
1879	}	1957	}
1880	}	1958	}
1881		1959
1882	package CFClient::UI::Entry;	1960	package CFPlus::UI::Entry;
1883		1961
1884	our @ISA = CFClient::UI::EntryBase::;	1962	our @ISA = CFPlus::UI::EntryBase::;
1885		1963
1886	use CFClient::OpenGL;	1964	use CFPlus::OpenGL;
1887		1965
1888	sub invoke_key_down {	1966	sub invoke_key_down {
1889	my ($self, $ev) = @_;	1967	my ($self, $ev) = @_;
1890		1968
1891	my $sym = $ev->{sym};	1969	my $sym = $ev->{sym};
…		…
1897	$self->{history_pointer} = -1;	1975	$self->{history_pointer} = -1;
1898	$self->{history_saveback} = '';	1976	$self->{history_saveback} = '';
1899	$self->emit (activate => $txt);	1977	$self->emit (activate => $txt);
1900	$self->update;	1978	$self->update;
1901		1979
1902	} elsif ($sym == CFClient::SDLK_UP) {	1980	} elsif ($sym == CFPlus::SDLK_UP) {
1903	if ($self->{history_pointer} < 0) {	1981	if ($self->{history_pointer} < 0) {
1904	$self->{history_saveback} = $self->get_text;	1982	$self->{history_saveback} = $self->get_text;
1905	}	1983	}
1906	if (@{$self->{history} || []} > 0) {	1984	if (@{$self->{history} || []} > 0) {
1907	$self->{history_pointer}++;	1985	$self->{history_pointer}++;
…		…
1909	$self->{history_pointer} = @{$self->{history} || []} - 1;	1987	$self->{history_pointer} = @{$self->{history} || []} - 1;
1910	}	1988	}
1911	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1989	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1912	}	1990	}
1913		1991
1914	} elsif ($sym == CFClient::SDLK_DOWN) {	1992	} elsif ($sym == CFPlus::SDLK_DOWN) {
1915	$self->{history_pointer}--;	1993	$self->{history_pointer}--;
1916	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1994	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917		1995
1918	if ($self->{history_pointer} >= 0) {	1996	if ($self->{history_pointer} >= 0) {
1919	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1997	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1928	1	2006	1
1929	}	2007	}
1930		2008
1931	#############################################################################	2009	#############################################################################
1932		2010
1933	package CFClient::UI::Button;	2011	package CFPlus::UI::Button;
1934		2012
1935	our @ISA = CFClient::UI::Label::;	2013	our @ISA = CFPlus::UI::Label::;
1936		2014
1937	use CFClient::OpenGL;	2015	use CFPlus::OpenGL;
1938		2016
1939	my @tex =	2017	my @tex =
1940	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2018	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941	qw(b1_button_active.png);	2019	qw(b1_button_active.png);
1942		2020
1943	sub new {	2021	sub new {
1944	my $class = shift;	2022	my $class = shift;
1945		2023
…		…
1982	$self->SUPER::_draw;	2060	$self->SUPER::_draw;
1983	}	2061	}
1984		2062
1985	#############################################################################	2063	#############################################################################
1986		2064
		2065	package CFPlus::UI::CheckBox;
		2066
		2067	our @ISA = CFPlus::UI::DrawBG::;
		2068
		2069	my @tex =
		2070	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2071	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2072
		2073	use CFPlus::OpenGL;
		2074
		2075	sub new {
		2076	my $class = shift;
		2077
		2078	$class->SUPER::new (
		2079	padding_x => 2,
		2080	padding_y => 2,
		2081	fg => [1, 1, 1],
		2082	active_fg => [1, 1, 0],
		2083	bg => [0, 0, 0, 0.2],
		2084	active_bg => [1, 1, 1, 0.5],
		2085	state => 0,
		2086	can_hover => 1,
		2087	@_
		2088	)
		2089	}
		2090
		2091	sub size_request {
		2092	my ($self) = @_;
		2093
		2094	(6) x 2
		2095	}
		2096
		2097	sub toggle {
		2098	my ($self) = @_;
		2099
		2100	$self->{state} = !$self->{state};
		2101	$self->emit (changed => $self->{state});
		2102	$self->update;
		2103	}
		2104
		2105	sub invoke_button_down {
		2106	my ($self, $ev, $x, $y) = @_;
		2107
		2108	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2109	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2110	$self->toggle;
		2111	} else {
		2112	return 0
		2113	}
		2114
		2115	1
		2116	}
		2117
		2118	sub _draw {
		2119	my ($self) = @_;
		2120
		2121	$self->SUPER::_draw;
		2122
		2123	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2124
		2125	my ($w, $h) = @$self{qw(w h)};
		2126
		2127	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2128
		2129	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2130
		2131	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2132
		2133	glEnable GL_TEXTURE_2D;
		2134	$tex->draw_quad_alpha (0, 0, $s, $s);
		2135	glDisable GL_TEXTURE_2D;
		2136	}
		2137
		2138	#############################################################################
		2139
		2140	package CFPlus::UI::Image;
		2141
		2142	our @ISA = CFPlus::UI::Base::;
		2143
		2144	use CFPlus::OpenGL;
		2145
		2146	our %texture_cache;
		2147
		2148	sub new {
		2149	my $class = shift;
		2150
		2151	my $self = $class->SUPER::new (
		2152	can_events => 0,
		2153	@_,
		2154	);
		2155
		2156	$self->{path} || $self->{tex}
		2157	or Carp::croak "'path' or 'tex' attributes required";
		2158
		2159	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2160	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2161
		2162	Scalar::Util::weaken $texture_cache{$self->{path}};
		2163
		2164	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2165
		2166	$self
		2167	}
		2168
		2169	sub STORABLE_freeze {
		2170	my ($self, $cloning) = @_;
		2171
		2172	$self->{path}
		2173	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2174
		2175	$self->{path}
		2176	}
		2177
		2178	sub STORABLE_attach {
		2179	my ($self, $cloning, $path) = @_;
		2180
		2181	$self->new (path => $path)
		2182	}
		2183
		2184	sub size_request {
		2185	my ($self) = @_;
		2186
		2187	($self->{tex}{w}, $self->{tex}{h})
		2188	}
		2189
		2190	sub _draw {
		2191	my ($self) = @_;
		2192
		2193	my $tex = $self->{tex};
		2194
		2195	my ($w, $h) = ($self->{w}, $self->{h});
		2196
		2197	if ($self->{rot90}) {
		2198	glRotate 90, 0, 0, 1;
		2199	glTranslate 0, -$self->{w}, 0;
		2200
		2201	($w, $h) = ($h, $w);
		2202	}
		2203
		2204	glEnable GL_TEXTURE_2D;
		2205	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2206
		2207	$tex->draw_quad (0, 0, $w, $h);
		2208
		2209	glDisable GL_TEXTURE_2D;
		2210	}
		2211
		2212	#############################################################################
		2213
1987	package CFClient::UI::ImageButton;	2214	package CFPlus::UI::ImageButton;
1988		2215
1989	our @ISA = CFClient::UI::Image::;	2216	our @ISA = CFPlus::UI::Image::;
1990		2217
1991	use CFClient::OpenGL;	2218	use CFPlus::OpenGL;
1992		2219
1993	my %textures;	2220	my %textures;
1994		2221
1995	sub new {	2222	sub new {
1996	my $class = shift;	2223	my $class = shift;
…		…
2018	1	2245	1
2019	}	2246	}
2020		2247
2021	#############################################################################	2248	#############################################################################
2022		2249
2023	package CFClient::UI::CheckBox;
2024
2025	our @ISA = CFClient::UI::DrawBG::;
2026
2027	my @tex =
2028	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2029	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2030
2031	use CFClient::OpenGL;
2032
2033	sub new {
2034	my $class = shift;
2035
2036	$class->SUPER::new (
2037	padding_x => 2,
2038	padding_y => 2,
2039	fg => [1, 1, 1],
2040	active_fg => [1, 1, 0],
2041	bg => [0, 0, 0, 0.2],
2042	active_bg => [1, 1, 1, 0.5],
2043	state => 0,
2044	can_hover => 1,
2045	@_
2046	)
2047	}
2048
2049	sub size_request {
2050	my ($self) = @_;
2051
2052	(6) x 2
2053	}
2054
2055	sub invoke_button_down {
2056	my ($self, $ev, $x, $y) = @_;
2057
2058	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2059	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2060	$self->{state} = !$self->{state};
2061	$self->emit (changed => $self->{state});
2062	} else {
2063	return 0
2064	}
2065
2066	1
2067	}
2068
2069	sub _draw {
2070	my ($self) = @_;
2071
2072	$self->SUPER::_draw;
2073
2074	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2075
2076	my ($w, $h) = @$self{qw(w h)};
2077
2078	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2079
2080	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2081
2082	my $tex = $self->{state} ? $tex[1] : $tex[0];
2083
2084	glEnable GL_TEXTURE_2D;
2085	$tex->draw_quad_alpha (0, 0, $s, $s);
2086	glDisable GL_TEXTURE_2D;
2087	}
2088
2089	#############################################################################
2090
2091	package CFClient::UI::Image;	2250	package CFPlus::UI::VGauge;
2092		2251
2093	our @ISA = CFClient::UI::Base::;	2252	our @ISA = CFPlus::UI::Base::;
2094
2095	use CFClient::OpenGL;
2096	use Carp qw/confess/;
2097
2098	our %loaded_images;
2099
2100	sub new {
2101	my $class = shift;
2102
2103	my $self = $class->SUPER::new (can_events => 0, @_);
2104
2105	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2106
2107	$loaded_images{$self->{image}} ||=
2108	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2109
2110	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2111
2112	Scalar::Util::weaken $loaded_images{$self->{image}};
2113
2114	$self->{aspect} = $tex->{w} / $tex->{h};
2115
2116	$self
2117	}
2118
2119	sub size_request {
2120	my ($self) = @_;
2121
2122	($self->{tex}->{w}, $self->{tex}->{h})
2123	}
2124
2125	sub _draw {
2126	my ($self) = @_;
2127
2128	my $tex = $self->{tex};
2129
2130	my ($w, $h) = ($self->{w}, $self->{h});
2131
2132	if ($self->{rot90}) {
2133	glRotate 90, 0, 0, 1;
2134	glTranslate 0, -$self->{w}, 0;
2135
2136	($w, $h) = ($h, $w);
2137	}
2138
2139	glEnable GL_TEXTURE_2D;
2140	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2141
2142	$tex->draw_quad_alpha (0, 0, $w, $h);
2143
2144	glDisable GL_TEXTURE_2D;
2145	}
2146
2147	#############################################################################
2148
2149	package CFClient::UI::VGauge;
2150
2151	our @ISA = CFClient::UI::Base::;
2152		2253
2153	use List::Util qw(min max);	2254	use List::Util qw(min max);
2154		2255
2155	use CFClient::OpenGL;	2256	use CFPlus::OpenGL;
2156		2257
2157	my %tex = (	2258	my %tex = (
2158	food => [	2259	food => [
2159	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2260	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2160	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2261	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2161	],	2262	],
2162	grace => [	2263	grace => [
2163	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2264	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2164	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2265	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2165	],	2266	],
2166	hp => [	2267	hp => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2268	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2269	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2169	],	2270	],
2170	mana => [	2271	mana => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2272	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2273	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2173	],	2274	],
2174	);	2275	);
2175		2276
2176	# eg. VGauge->new (gauge => 'food'), default gauge: food	2277	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2236	my $ycut1 = max 0, min 1, $ycut;	2337	my $ycut1 = max 0, min 1, $ycut;
2237	my $ycut2 = max 0, min 1, $ycut - 1;	2338	my $ycut2 = max 0, min 1, $ycut - 1;
2238		2339
2239	my $h1 = $self->{h} * (1 - $ycut1);	2340	my $h1 = $self->{h} * (1 - $ycut1);
2240	my $h2 = $self->{h} * (1 - $ycut2);	2341	my $h2 = $self->{h} * (1 - $ycut2);
		2342	my $h3 = $self->{h};
		2343
		2344	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2241		2345
2242	glEnable GL_BLEND;	2346	glEnable GL_BLEND;
2243	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2347	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2348	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2245	glEnable GL_TEXTURE_2D;	2349	glEnable GL_TEXTURE_2D;
…		…
2264		2368
2265	if ($t3) {	2369	if ($t3) {
2266	glBindTexture GL_TEXTURE_2D, $t3->{name};	2370	glBindTexture GL_TEXTURE_2D, $t3->{name};
2267	glBegin GL_QUADS;	2371	glBegin GL_QUADS;
2268	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2372	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2269	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2373	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2270	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2374	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2271	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2375	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2272	glEnd;	2376	glEnd;
2273	}	2377	}
2274		2378
2275	glDisable GL_BLEND;	2379	glDisable GL_BLEND;
2276	glDisable GL_TEXTURE_2D;	2380	glDisable GL_TEXTURE_2D;
2277	}	2381	}
2278		2382
2279	#############################################################################	2383	#############################################################################
2280		2384
2281	package CFClient::UI::Gauge;	2385	package CFPlus::UI::Gauge;
2282		2386
2283	our @ISA = CFClient::UI::VBox::;	2387	our @ISA = CFPlus::UI::VBox::;
2284		2388
2285	sub new {	2389	sub new {
2286	my ($class, %arg) = @_;	2390	my ($class, %arg) = @_;
2287		2391
2288	my $self = $class->SUPER::new (	2392	my $self = $class->SUPER::new (
…		…
2290	can_hover => 1,	2394	can_hover => 1,
2291	can_events => 1,	2395	can_events => 1,
2292	%arg,	2396	%arg,
2293	);	2397	);
2294		2398
2295	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2399	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2296	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2400	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2297	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2401	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2298		2402
2299	$self	2403	$self
2300	}	2404	}
2301		2405
2302	sub set_fontsize {	2406	sub set_fontsize {
…		…
2323	$self->{value}->set_text ($val);	2427	$self->{value}->set_text ($val);
2324	}	2428	}
2325		2429
2326	#############################################################################	2430	#############################################################################
2327		2431
2328	package CFClient::UI::Slider;	2432	package CFPlus::UI::Slider;
2329		2433
2330	use strict;	2434	use strict;
2331		2435
2332	use CFClient::OpenGL;	2436	use CFPlus::OpenGL;
2333		2437
2334	our @ISA = CFClient::UI::DrawBG::;	2438	our @ISA = CFPlus::UI::DrawBG::;
2335		2439
2336	my @tex =	2440	my @tex =
2337	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2441	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2338	qw(s1_slider.png s1_slider_bg.png);	2442	qw(s1_slider.png s1_slider_bg.png);
2339		2443
2340	sub new {	2444	sub new {
2341	my $class = shift;	2445	my $class = shift;
2342		2446
…		…
2410		2514
2411	$self->SUPER::invoke_button_down ($ev, $x, $y);	2515	$self->SUPER::invoke_button_down ($ev, $x, $y);
2412		2516
2413	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2517	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2414		2518
2415	$self->mouse_motion ($ev, $x, $y)	2519	$self->invoke_mouse_motion ($ev, $x, $y)
2416	}	2520	}
2417		2521
2418	sub invoke_mouse_motion {	2522	sub invoke_mouse_motion {
2419	my ($self, $ev, $x, $y) = @_;	2523	my ($self, $ev, $x, $y) = @_;
2420		2524
…		…
2429	} else {	2533	} else {
2430	return 0;	2534	return 0;
2431	}	2535	}
2432		2536
2433	1	2537	1
		2538	}
		2539
		2540	sub invoke_mouse_wheel {
		2541	my ($self, $ev) = @_;
		2542
		2543	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2544
		2545	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2546
		2547	! ! $delta
2434	}	2548	}
2435		2549
2436	sub update {	2550	sub update {
2437	my ($self) = @_;	2551	my ($self) = @_;
2438		2552
…		…
2487	glDisable GL_TEXTURE_2D;	2601	glDisable GL_TEXTURE_2D;
2488	}	2602	}
2489		2603
2490	#############################################################################	2604	#############################################################################
2491		2605
2492	package CFClient::UI::ValSlider;	2606	package CFPlus::UI::ValSlider;
2493		2607
2494	our @ISA = CFClient::UI::HBox::;	2608	our @ISA = CFPlus::UI::HBox::;
2495		2609
2496	sub new {	2610	sub new {
2497	my ($class, %arg) = @_;	2611	my ($class, %arg) = @_;
2498		2612
2499	my $range = delete $arg{range};	2613	my $range = delete $arg{range};
2500		2614
2501	my $self = $class->SUPER::new (	2615	my $self = $class->SUPER::new (
2502	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2616	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2503	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2617	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2504	to_value => sub { shift },	2618	to_value => sub { shift },
2505	from_value => sub { shift },	2619	from_value => sub { shift },
2506	%arg,	2620	%arg,
2507	);	2621	);
2508		2622
…		…
2528	sub set_range { shift->{slider}->set_range (@_) }	2642	sub set_range { shift->{slider}->set_range (@_) }
2529	sub set_value { shift->{slider}->set_value (@_) }	2643	sub set_value { shift->{slider}->set_value (@_) }
2530		2644
2531	#############################################################################	2645	#############################################################################
2532		2646
2533	package CFClient::UI::TextScroller;	2647	package CFPlus::UI::TextScroller;
2534		2648
2535	our @ISA = CFClient::UI::HBox::;	2649	our @ISA = CFPlus::UI::HBox::;
2536		2650
2537	use CFClient::OpenGL;	2651	use CFPlus::OpenGL;
2538		2652
2539	sub new {	2653	sub new {
2540	my $class = shift;	2654	my $class = shift;
2541		2655
2542	my $self = $class->SUPER::new (	2656	my $self = $class->SUPER::new (
2543	fontsize => 1,	2657	fontsize => 1,
2544	can_events => 0,	2658	can_events => 1,
2545	indent => 0,	2659	indent => 0,
2546	#font => default_font	2660	#font => default_font
2547	@_,	2661	@_,
2548		2662
2549	layout => (new CFClient::Layout 1),	2663	layout => (new CFPlus::Layout),
2550	par => [],	2664	par => [],
2551	height => 0,	2665	height => 0,
2552	children => [	2666	children => [
2553	(new CFClient::UI::Empty expand => 1),	2667	(new CFPlus::UI::Empty expand => 1),
2554	(new CFClient::UI::Slider vertical => 1),	2668	(new CFPlus::UI::Slider vertical => 1),
2555	],	2669	],
2556	);	2670	);
2557		2671
2558	$self->{children}[1]->connect (changed => sub { $self->update });	2672	$self->{children}[1]->connect (changed => sub { $self->update });
2559		2673
…		…
2565		2679
2566	$self->{fontsize} = $fontsize;	2680	$self->{fontsize} = $fontsize;
2567	$self->reflow;	2681	$self->reflow;
2568	}	2682	}
2569		2683
		2684	sub size_request {
		2685	my ($self) = @_;
		2686
		2687	my ($empty, $slider) = @{ $self->{children} };
		2688
		2689	local $self->{children} = [$empty, $slider];
		2690	$self->SUPER::size_request
		2691	}
		2692
2570	sub invoke_size_allocate {	2693	sub invoke_size_allocate {
2571	my ($self, $w, $h) = @_;	2694	my ($self, $w, $h) = @_;
2572		2695
		2696	my ($empty, $slider, @other) = @{ $self->{children} };
		2697	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		2698
2573	$self->{layout}->set_font ($self->{font}) if $self->{font};	2699	$self->{layout}->set_font ($self->{font}) if $self->{font};
2574	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2700	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2575	$self->{layout}->set_width ($self->{children}[0]{w});	2701	$self->{layout}->set_width ($empty->{w});
2576	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2702	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2577		2703
2578	$self->reflow;	2704	$self->reflow;
2579		2705
		2706	local $self->{children} = [$empty, $slider];
2580	$self->SUPER::invoke_size_allocate ($w, $h)	2707	$self->SUPER::invoke_size_allocate ($w, $h)
2581	}	2708	}
2582		2709
2583	sub text_size {	2710	sub invoke_mouse_wheel {
2584	my ($self, $text, $indent) = @_;	2711	my ($self, $ev) = @_;
		2712
		2713	return 0 unless $ev->{dy}; # only vertical movements
		2714
		2715	$self->{children}[1]->emit (mouse_wheel => $ev);
		2716
		2717	1
		2718	}
		2719
		2720	sub get_layout {
		2721	my ($self, $para) = @_;
2585		2722
2586	my $layout = $self->{layout};	2723	my $layout = $self->{layout};
2587		2724
		2725	$layout->set_font ($self->{font}) if $self->{font};
		2726	$layout->set_foreground (@{$para->{fg}});
2588	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2727	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2589	$layout->set_width ($self->{children}[0]{w} - $indent);	2728	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2590	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2729	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2591	$layout->set_markup ($text);	2730	$layout->set_markup ($para->{markup});
		2731
		2732	$layout->set_shapes (
		2733	map
		2734	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2735	@{$para->{widget}}
2592		2736	);
		2737
2593	$layout->size	2738	$layout
2594	}	2739	}
2595		2740
2596	sub reflow {	2741	sub reflow {
2597	my ($self) = @_;	2742	my ($self) = @_;
2598		2743
…		…
2605		2750
2606	# todo: base offset on lines or so, not on pixels	2751	# todo: base offset on lines or so, not on pixels
2607	$self->{children}[1]->set_value ($offset);	2752	$self->{children}[1]->set_value ($offset);
2608	}	2753	}
2609		2754
		2755	sub current_paragraph {
		2756	my ($self) = @_;
		2757
		2758	$self->force_uptodate;
		2759	$self->{top_paragraph} - 1
		2760	}
		2761
		2762	sub scroll_to {
		2763	my ($self, $para) = @_;
		2764
		2765	$self->force_uptodate;
		2766
		2767	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2768
		2769	$self->{children}[1]->set_value ($self->{par}[$para]{y});
		2770	}
		2771
2610	sub clear {	2772	sub clear {
2611	my ($self) = @_;	2773	my ($self) = @_;
		2774
		2775	my (undef, undef, @other) = @{ $self->{children} };
		2776	$self->remove ($_) for @other;
2612		2777
2613	$self->{par} = [];	2778	$self->{par} = [];
2614	$self->{height} = 0;	2779	$self->{height} = 0;
2615	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2780	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2616	}	2781	}
2617		2782
2618	sub add_paragraph {	2783	sub add_paragraph {
2619	my ($self, $color, $text, $indent) = @_;	2784	my $self = shift;
2620		2785
2621	for my $line (split /\n/, $text) {	2786	for my $para (@_) {
2622	my ($w, $h) = $self->text_size ($line);	2787	$para = {
		2788	fg => [1, 1, 1, 1],
		2789	indent => 0,
		2790	markup => "",
		2791	widget => [],
		2792	ref $para ? %$para : (markup => $para),
		2793	w => 1e10,
		2794	wrapped => 1,
		2795	};
		2796
		2797	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2798	push @{$self->{par}}, $para;
		2799	}
		2800
		2801	$self->{need_reflow}++;
		2802	$self->update;
		2803	}
		2804
		2805	sub scroll_to_bottom {
		2806	my ($self) = @_;
		2807
		2808	$self->{scroll_to_bottom} = 1;
		2809	$self->update;
		2810	}
		2811
		2812	sub force_uptodate {
		2813	my ($self) = @_;
		2814
		2815	if (delete $self->{need_reflow}) {
		2816	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2817
		2818	my $height = 0;
		2819	my $paridx;
		2820	my $top_paragraph;
		2821	my $top = int $self->{children}[1]{range}[0];
		2822
		2823	for my $para (@{$self->{par}}) {
		2824	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2825	my $layout = $self->get_layout ($para);
		2826	my ($w, $h) = $layout->size;
		2827
		2828	$para->{w} = $w + $para->{indent};
		2829	$para->{h} = $h;
		2830	$para->{wrapped} = $layout->has_wrapped;
		2831	}
		2832
		2833	$para->{y} = $height;
		2834
		2835	$paridx++;
		2836	$top_paragraph ||= $paridx if $height >= $top;
		2837
		2838	$height += $para->{h};
		2839	}
		2840
		2841	$self->{top_paragraph} = $top_paragraph;
2623	$self->{height} += $h;	2842	$self->{height} = $height;
2624	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2625	}
2626		2843
2627	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2844	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2845
		2846	delete $self->{texture};
		2847	}
		2848
		2849	if (delete $self->{scroll_to_bottom}) {
		2850	$self->{children}[1]->set_value (1e10);
		2851	}
2628	}	2852	}
2629		2853
2630	sub update {	2854	sub update {
2631	my ($self) = @_;	2855	my ($self) = @_;
2632		2856
…		…
2635	return unless $self->{h} > 0;	2859	return unless $self->{h} > 0;
2636		2860
2637	delete $self->{texture};	2861	delete $self->{texture};
2638		2862
2639	$ROOT->on_post_alloc ($self => sub {	2863	$ROOT->on_post_alloc ($self => sub {
		2864	$self->force_uptodate;
		2865
2640	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2866	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2641		2867
2642	if (delete $self->{need_reflow}) {
2643	my $height = 0;
2644
2645	my $layout = $self->{layout};
2646
2647	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2648
2649	for (@{$self->{par}}) {
2650	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2651	$layout->set_width ($W - $_->[3]);
2652	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2653	$layout->set_markup ($_->[4]);
2654	my ($w, $h) = $layout->size;
2655	$_->[0] = $w + $_->[3];
2656	$_->[1] = $h;
2657	}
2658
2659	$height += $_->[1];
2660	}
2661
2662	$self->{height} = $height;
2663
2664	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2665
2666	delete $self->{texture};
2667	}
2668
2669	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2868	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2670	glClearColor 0, 0, 0, 0;	2869	glClearColor 0, 0, 0, 0;
2671	glClear GL_COLOR_BUFFER_BIT;	2870	glClear GL_COLOR_BUFFER_BIT;
2672		2871
2673	my $top = int $self->{children}[1]{range}[0];	2872	my $top = int $self->{children}[1]{range}[0];
2674		2873
2675	my $y0 = $top;	2874	my $y0 = $top;
2676	my $y1 = $top + $H;	2875	my $y1 = $top + $H;
2677		2876
2678	my $y = 0;
2679
2680	my $layout = $self->{layout};
2681
2682	$layout->set_font ($self->{font}) if $self->{font};
2683
2684	glEnable GL_BLEND;
2685	#TODO# not correct in windows where rgba is forced off
2686	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2687
2688	for my $par (@{$self->{par}}) {	2877	for my $para (@{$self->{par}}) {
2689	my $h = $par->[1];	2878	my $h = $para->{h};
		2879	my $y = $para->{y};
2690		2880
2691	if ($y0 < $y + $h && $y < $y1) {	2881	if ($y0 < $y + $h && $y < $y1) {
2692	$layout->set_foreground (@{ $par->[2] });	2882	my $layout = $self->get_layout ($para);
2693	$layout->set_width ($W - $par->[3]);
2694	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2695	$layout->set_markup ($par->[4]);
2696		2883
2697	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2884	$layout->render ($para->{indent}, $y - $y0);
2698		2885
2699	glRasterPos $par->[3], $y - $y0;	2886	if (my @w = @{ $para->{widget} }) {
2700	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2887	my @s = $layout->get_shapes;
		2888
		2889	for (@w) {
		2890	my ($dx, $dy) = splice @s, 0, 2, ();
		2891
		2892	$_->{x} = $dx + $para->{indent};
		2893	$_->{y} = $dy + $y - $y0;
		2894
		2895	$_->draw;
		2896	}
		2897	}
2701	}	2898	}
2702
2703	$y += $h;
2704	}	2899	}
2705
2706	glDisable GL_BLEND;
2707	};	2900	};
2708	});	2901	});
		2902	}
		2903
		2904	sub reconfigure {
		2905	my ($self) = @_;
		2906
		2907	$self->SUPER::reconfigure;
		2908
		2909	$_->{w} = 1e10 for @{ $self->{par} };
		2910	$self->reflow;
2709	}	2911	}
2710		2912
2711	sub _draw {	2913	sub _draw {
2712	my ($self) = @_;	2914	my ($self) = @_;
2713		2915
…		…
2716	glColor 0, 0, 0, 1;	2918	glColor 0, 0, 0, 1;
2717	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2919	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2718	glDisable GL_TEXTURE_2D;	2920	glDisable GL_TEXTURE_2D;
2719		2921
2720	$self->{children}[1]->draw;	2922	$self->{children}[1]->draw;
2721
2722	}	2923	}
2723		2924
2724	#############################################################################	2925	#############################################################################
2725		2926
2726	package CFClient::UI::Animator;	2927	package CFPlus::UI::Animator;
2727		2928
2728	use CFClient::OpenGL;	2929	use CFPlus::OpenGL;
2729		2930
2730	our @ISA = CFClient::UI::Bin::;	2931	our @ISA = CFPlus::UI::Bin::;
2731		2932
2732	sub moveto {	2933	sub moveto {
2733	my ($self, $x, $y) = @_;	2934	my ($self, $x, $y) = @_;
2734		2935
2735	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2936	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2763	glPopMatrix;	2964	glPopMatrix;
2764	}	2965	}
2765		2966
2766	#############################################################################	2967	#############################################################################
2767		2968
2768	package CFClient::UI::Flopper;	2969	package CFPlus::UI::Flopper;
2769		2970
2770	our @ISA = CFClient::UI::Button::;	2971	our @ISA = CFPlus::UI::Button::;
2771		2972
2772	sub new {	2973	sub new {
2773	my $class = shift;	2974	my $class = shift;
2774		2975
2775	my $self = $class->SUPER::new (	2976	my $self = $class->SUPER::new (
…		…
2787	$self->{other}->toggle_visibility;	2988	$self->{other}->toggle_visibility;
2788	}	2989	}
2789		2990
2790	#############################################################################	2991	#############################################################################
2791		2992
2792	package CFClient::UI::Tooltip;	2993	package CFPlus::UI::Tooltip;
2793		2994
2794	our @ISA = CFClient::UI::Bin::;	2995	our @ISA = CFPlus::UI::Bin::;
2795		2996
2796	use CFClient::OpenGL;	2997	use CFPlus::OpenGL;
2797		2998
2798	sub new {	2999	sub new {
2799	my $class = shift;	3000	my $class = shift;
2800		3001
2801	$class->SUPER::new (	3002	$class->SUPER::new (
…		…
2804	)	3005	)
2805	}	3006	}
2806		3007
2807	sub set_tooltip_from {	3008	sub set_tooltip_from {
2808	my ($self, $widget) = @_;	3009	my ($self, $widget) = @_;
		3010
		3011	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3012	if $widget->{tooltip} =~ /^#(.*)$/;
2809		3013
2810	my $tooltip = $widget->{tooltip};	3014	my $tooltip = $widget->{tooltip};
2811		3015
2812	if ($ENV{CFPLUS_DEBUG} & 2) {	3016	if ($ENV{CFPLUS_DEBUG} & 2) {
2813	$tooltip .= "\n\n" . (ref $widget) . "\n"	3017	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2817	}	3021	}
2818		3022
2819	$tooltip =~ s/^\n+//;	3023	$tooltip =~ s/^\n+//;
2820	$tooltip =~ s/\n+$//;	3024	$tooltip =~ s/\n+$//;
2821		3025
2822	$self->add (new CFClient::UI::Label	3026	$self->add (new CFPlus::UI::Label
2823	markup => $tooltip,	3027	markup => $tooltip,
2824	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3028	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2825	fontsize => 0.8,	3029	fontsize => 0.8,
2826	fg => [0, 0, 0, 1],	3030	style => 1, # FLAG_INVERSE
2827	ellipsise => 0,	3031	ellipsise => 0,
2828	font => ($widget->{tooltip_font} || $::FONT_PROP),	3032	font => ($widget->{tooltip_font} || $::FONT_PROP),
2829	);	3033	);
2830	}	3034	}
2831		3035
…		…
2850		3054
2851	$self->{root}->on_post_alloc ("move_$self" => sub {	3055	$self->{root}->on_post_alloc ("move_$self" => sub {
2852	my $widget = $self->{owner}	3056	my $widget = $self->{owner}
2853	or return;	3057	or return;
2854		3058
		3059	if ($widget->{visible}) {
2855	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3060	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2856		3061
2857	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3062	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2858	if $x + $self->{w} > $self->{root}{w};	3063	if $x + $self->{w} > $self->{root}{w};
2859		3064
2860	$self->move_abs ($x, $y);	3065	$self->move_abs ($x, $y);
		3066	} else {
		3067	$self->hide;
		3068	}
2861	});	3069	});
2862	}	3070	}
2863		3071
2864	sub _draw {	3072	sub _draw {
2865	my ($self) = @_;	3073	my ($self) = @_;
…		…
2889	$self->SUPER::_draw;	3097	$self->SUPER::_draw;
2890	}	3098	}
2891		3099
2892	#############################################################################	3100	#############################################################################
2893		3101
2894	package CFClient::UI::Face;	3102	package CFPlus::UI::Face;
2895		3103
2896	our @ISA = CFClient::UI::Base::;	3104	our @ISA = CFPlus::UI::DrawBG::;
2897		3105
2898	use CFClient::OpenGL;	3106	use CFPlus::OpenGL;
2899		3107
2900	sub new {	3108	sub new {
2901	my $class = shift;	3109	my $class = shift;
2902		3110
2903	my $self = $class->SUPER::new (	3111	my $self = $class->SUPER::new (
…		…
2938	sub _draw {	3146	sub _draw {
2939	my ($self) = @_;	3147	my ($self) = @_;
2940		3148
2941	return unless $::CONN;	3149	return unless $::CONN;
2942		3150
		3151	$self->SUPER::_draw;
		3152
2943	my $face;	3153	my $face;
2944		3154
2945	if ($self->{frame}) {	3155	if ($self->{frame}) {
2946	my $anim = $::CONN->{anim}[$self->{anim}];	3156	my $anim = $::CONN->{anim}[$self->{anim}];
2947		3157
…		…
2969	$self->SUPER::destroy;	3179	$self->SUPER::destroy;
2970	}	3180	}
2971		3181
2972	#############################################################################	3182	#############################################################################
2973		3183
2974	package CFClient::UI::Buttonbar;	3184	package CFPlus::UI::Buttonbar;
2975		3185
2976	our @ISA = CFClient::UI::HBox::;	3186	our @ISA = CFPlus::UI::HBox::;
2977		3187
2978	# TODO: should actualyl wrap buttons and other goodies.	3188	# TODO: should actualyl wrap buttons and other goodies.
2979		3189
2980	#############################################################################	3190	#############################################################################
2981		3191
2982	package CFClient::UI::Menu;	3192	package CFPlus::UI::Menu;
2983		3193
2984	our @ISA = CFClient::UI::FancyFrame::;	3194	our @ISA = CFPlus::UI::FancyFrame::;
2985		3195
2986	use CFClient::OpenGL;	3196	use CFPlus::OpenGL;
2987		3197
2988	sub new {	3198	sub new {
2989	my $class = shift;	3199	my $class = shift;
2990		3200
2991	my $self = $class->SUPER::new (	3201	my $self = $class->SUPER::new (
2992	items => [],	3202	items => [],
2993	z => 100,	3203	z => 100,
2994	@_,	3204	@_,
2995	);	3205	);
2996		3206
2997	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3207	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2998		3208
2999	for my $item (@{ $self->{items} }) {	3209	for my $item (@{ $self->{items} }) {
3000	my ($widget, $cb, $tooltip) = @$item;	3210	my ($widget, $cb, $tooltip) = @$item;
3001		3211
3002	# handle various types of items, only text for now	3212	# handle various types of items, only text for now
3003	if (!ref $widget) {	3213	if (!ref $widget) {
		3214	if ($widget =~ /\t/) {
		3215	my ($left, $right) = split /\t/, $widget, 2;
		3216
3004	$widget = new CFClient::UI::Label	3217	$widget = new CFPlus::UI::HBox
3005	can_hover => 1,	3218	can_hover => 1,
3006	can_events => 1,	3219	can_events => 1,
		3220	tooltip => $tooltip,
		3221	children => [
		3222	(new CFPlus::UI::Label markup => $left, expand => 1),
		3223	(new CFPlus::UI::Label markup => $right, align => +1),
		3224	],
		3225	;
		3226
		3227	} else {
		3228	$widget = new CFPlus::UI::Label
		3229	can_hover => 1,
		3230	can_events => 1,
3007	markup => $widget,	3231	markup => $widget,
3008	tooltip => $tooltip	3232	tooltip => $tooltip;
		3233	}
3009	}	3234	}
3010		3235
3011	$self->{item}{$widget} = $item;	3236	$self->{item}{$widget} = $item;
3012		3237
3013	$self->{vbox}->add ($widget);	3238	$self->{vbox}->add ($widget);
…		…
3056	1	3281	1
3057	}	3282	}
3058		3283
3059	#############################################################################	3284	#############################################################################
3060		3285
3061	package CFClient::UI::Multiplexer;	3286	package CFPlus::UI::Multiplexer;
3062		3287
3063	our @ISA = CFClient::UI::Container::;	3288	our @ISA = CFPlus::UI::Container::;
3064		3289
3065	sub new {	3290	sub new {
3066	my $class = shift;	3291	my $class = shift;
3067		3292
3068	my $self = $class->SUPER::new (	3293	my $self = $class->SUPER::new (
…		…
3082		3307
3083	$self->{current} = $self->{children}[0]	3308	$self->{current} = $self->{children}[0]
3084	if @{ $self->{children} };	3309	if @{ $self->{children} };
3085	}	3310	}
3086		3311
		3312	sub get_current_page {
		3313	my ($self) = @_;
		3314
		3315	$self->{current}
		3316	}
		3317
3087	sub set_current_page {	3318	sub set_current_page {
3088	my ($self, $page_or_widget) = @_;	3319	my ($self, $page_or_widget) = @_;
3089		3320
3090	my $widget = ref $page_or_widget	3321	my $widget = ref $page_or_widget
3091	? $page_or_widget	3322	? $page_or_widget
…		…
3123	$self->{current}->draw;	3354	$self->{current}->draw;
3124	}	3355	}
3125		3356
3126	#############################################################################	3357	#############################################################################
3127		3358
3128	package CFClient::UI::Notebook;	3359	package CFPlus::UI::Notebook;
3129		3360
3130	our @ISA = CFClient::UI::VBox::;	3361	our @ISA = CFPlus::UI::VBox::;
3131		3362
3132	sub new {	3363	sub new {
3133	my $class = shift;	3364	my $class = shift;
3134		3365
3135	my $self = $class->SUPER::new (	3366	my $self = $class->SUPER::new (
3136	buttonbar => (new CFClient::UI::Buttonbar),	3367	buttonbar => (new CFPlus::UI::Buttonbar),
3137	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3368	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3138	# filter => # will be put between multiplexer and $self	3369	# filter => # will be put between multiplexer and $self
3139	@_,	3370	@_,
3140	);	3371	);
3141		3372
3142	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3373	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3148	sub add {	3379	sub add {
3149	my ($self, $title, $widget, $tooltip) = @_;	3380	my ($self, $title, $widget, $tooltip) = @_;
3150		3381
3151	Scalar::Util::weaken $self;	3382	Scalar::Util::weaken $self;
3152		3383
3153	$self->{buttonbar}->add (new CFClient::UI::Button	3384	$self->{buttonbar}->add (new CFPlus::UI::Button
3154	markup => $title,	3385	markup => $title,
3155	tooltip => $tooltip,	3386	tooltip => $tooltip,
3156	on_activate => sub { $self->set_current_page ($widget) },	3387	on_activate => sub { $self->set_current_page ($widget) },
3157	);	3388	);
3158		3389
3159	$self->{multiplexer}->add ($widget);	3390	$self->{multiplexer}->add ($widget);
3160	}	3391	}
3161		3392
		3393	sub get_current_page {
		3394	my ($self) = @_;
		3395
		3396	$self->{multiplexer}->get_current_page
		3397	}
		3398
3162	sub set_current_page {	3399	sub set_current_page {
3163	my ($self, $page) = @_;	3400	my ($self, $page) = @_;
3164		3401
3165	$self->{multiplexer}->set_current_page ($page);	3402	$self->{multiplexer}->set_current_page ($page);
3166	$self->emit (page_changed => $self->{multiplexer}{current});	3403	$self->emit (page_changed => $self->{multiplexer}{current});
3167	}	3404	}
3168		3405
3169	#############################################################################	3406	#############################################################################
3170		3407
3171	package CFClient::UI::Combobox;	3408	package CFPlus::UI::Selector;
3172		3409
3173	use utf8;	3410	use utf8;
3174		3411
3175	our @ISA = CFClient::UI::Button::;	3412	our @ISA = CFPlus::UI::Button::;
3176		3413
3177	sub new {	3414	sub new {
3178	my $class = shift;	3415	my $class = shift;
3179		3416
3180	my $self = $class->SUPER::new (	3417	my $self = $class->SUPER::new (
…		…
3197	my ($value, $title, $tooltip) = @$_;	3434	my ($value, $title, $tooltip) = @$_;
3198		3435
3199	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3436	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200	}	3437	}
3201		3438
3202	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3439	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203	}	3440	}
3204		3441
3205	sub _set_value {	3442	sub _set_value {
3206	my ($self, $value) = @_;	3443	my ($self, $value) = @_;
3207		3444
…		…
3222	$self->emit (changed => $value);	3459	$self->emit (changed => $value);
3223	}	3460	}
3224		3461
3225	#############################################################################	3462	#############################################################################
3226		3463
3227	package CFClient::UI::Statusbox;	3464	package CFPlus::UI::Statusbox;
3228		3465
3229	our @ISA = CFClient::UI::VBox::;	3466	our @ISA = CFPlus::UI::VBox::;
3230		3467
3231	sub new {	3468	sub new {
3232	my $class = shift;	3469	my $class = shift;
3233		3470
3234	my $self = $class->SUPER::new (	3471	my $self = $class->SUPER::new (
…		…
3246	sub reorder {	3483	sub reorder {
3247	my ($self) = @_;	3484	my ($self) = @_;
3248	my $NOW = Time::HiRes::time;	3485	my $NOW = Time::HiRes::time;
3249		3486
3250	# freeze display when hovering over any label	3487	# freeze display when hovering over any label
3251	return if $CFClient::UI::TOOLTIP->{owner}	3488	return if $CFPlus::UI::TOOLTIP->{owner}
3252	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3489	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3253	values %{ $self->{item} };	3490	values %{ $self->{item} };
3254		3491
3255	while (my ($k, $v) = each %{ $self->{item} }) {	3492	while (my ($k, $v) = each %{ $self->{item} }) {
3256	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3493	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3257	}	3494	}
…		…
3278	for ($short) {	3515	for ($short) {
3279	s/^\s+//;	3516	s/^\s+//;
3280	s/\s+/ /g;	3517	s/\s+/ /g;
3281	}	3518	}
3282		3519
3283	new CFClient::UI::Label	3520	new CFPlus::UI::Label
3284	markup => $short,	3521	markup => $short,
3285	tooltip => $item->{tooltip},	3522	tooltip => $item->{tooltip},
3286	tooltip_font => $::FONT_PROP,	3523	tooltip_font => $::FONT_PROP,
3287	tooltip_width => 0.67,	3524	tooltip_width => 0.67,
3288	fontsize => $item->{fontsize} || $self->{fontsize},	3525	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3342	count => 1,	3579	count => 1,
3343	%arg,	3580	%arg,
3344	};	3581	};
3345	}	3582	}
3346		3583
		3584	$ROOT->on_refresh (reorder => sub {
3347	$self->reorder;	3585	$self->reorder;
		3586	});
3348	}	3587	}
3349		3588
3350	sub reconfigure {	3589	sub reconfigure {
3351	my ($self) = @_;	3590	my ($self) = @_;
3352		3591
…		…
3365	$self->SUPER::destroy;	3604	$self->SUPER::destroy;
3366	}	3605	}
3367		3606
3368	#############################################################################	3607	#############################################################################
3369		3608
3370	package CFClient::UI::Inventory;	3609	package CFPlus::UI::Inventory;
3371		3610
3372	our @ISA = CFClient::UI::ScrolledWindow::;	3611	our @ISA = CFPlus::UI::Table::;
3373		3612
3374	sub new {	3613	sub new {
3375	my $class = shift;	3614	my $class = shift;
3376		3615
3377	my $self = $class->SUPER::new (	3616	my $self = $class->SUPER::new (
3378	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3617	col_expand => [0, 1, 0],
		3618	items => [],
3379	@_,	3619	@_,
3380	);	3620	);
3381		3621
		3622	$self->set_sort_order (undef);
		3623
3382	$self	3624	$self
		3625	}
		3626
		3627	sub update_items {
		3628	my ($self) = @_;
		3629
		3630	$self->clear;
		3631
		3632	my @item = $self->{sort}->(@{ $self->{items} });
		3633
		3634	my @adds;
		3635	my $row = 0;
		3636	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3637	CFPlus::Item::update_widgets $item;
		3638
		3639	push @adds, 0, $row, $item->{face_widget};
		3640	push @adds, 1, $row, $item->{desc_widget};
		3641	push @adds, 2, $row, $item->{weight_widget};
		3642
		3643	$row++;
		3644	}
		3645
		3646	$self->add (@adds);
		3647	}
		3648
		3649	sub set_sort_order {
		3650	my ($self, $order) = @_;
		3651
		3652	$self->{sort} = $order ||= sub {
		3653	sort {
		3654	$a->{type} <=> $b->{type}
		3655	or $a->{name} cmp $b->{name}
		3656	} @_
		3657	};
		3658
		3659	$self->update_items;
3383	}	3660	}
3384		3661
3385	sub set_items {	3662	sub set_items {
3386	my ($self, $items) = @_;	3663	my ($self, $items) = @_;
3387		3664
3388	$self->{child}->clear;	3665	$self->{items} = [$items ? values %$items : ()];
3389	return unless $items;	3666	$self->update_items;
3390
3391	my @items = sort {
3392	($a->{type} <=> $b->{type})
3393	or ($a->{name} cmp $b->{name})
3394	} @$items;
3395
3396	$self->{real_items} = \@items;
3397
3398	my $row = 0;
3399	for my $item (@items) {
3400	CFClient::Item::update_widgets $item;
3401
3402	$self->{child}->add (0, $row, $item->{face_widget});
3403	$self->{child}->add (1, $row, $item->{desc_widget});
3404	$self->{child}->add (2, $row, $item->{weight_widget});
3405
3406	$row++;
3407	}
3408	}	3667	}
3409		3668
3410	#############################################################################	3669	#############################################################################
3411		3670
3412	package CFClient::UI::BindEditor;
3413
3414	our @ISA = CFClient::UI::FancyFrame::;
3415
3416	sub new {
3417	my $class = shift;
3418
3419	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3420
3421	$self->add (my $vb = new CFClient::UI::VBox);
3422
3423
3424	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3425	text => "start recording",
3426	tooltip => "Start/Stops recording of actions."
3427	."All subsequent actions after the recording started will be captured."
3428	."The actions are displayed after the record was stopped."
3429	."To bind the action you have to click on the 'Bind' button",
3430	on_activate => sub {
3431	unless ($self->{recording}) {
3432	$self->start;
3433	} else {
3434	$self->stop;
3435	}
3436	});
3437
3438	$vb->add (new CFClient::UI::Label text => "Actions:");
3439	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3440
3441	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3442	$vb->add (my $hb = new CFClient::UI::HBox);
3443	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3444	$hb->add (new CFClient::UI::Button
3445	text => "bind",
3446	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3447	on_activate => sub {
3448	$self->ask_for_bind;
3449	});
3450
3451	$vb->add (my $hb = new CFClient::UI::HBox);
3452	$hb->add (new CFClient::UI::Button
3453	text => "ok",
3454	expand => 1,
3455	tooltip => "This closes the binding editor and saves the binding",
3456	on_activate => sub {
3457	$self->hide;
3458	$self->commit;
3459	});
3460
3461	$hb->add (new CFClient::UI::Button
3462	text => "cancel",
3463	expand => 1,
3464	tooltip => "This closes the binding editor without saving",
3465	on_activate => sub {
3466	$self->hide;
3467	$self->{binding_cancel}->()
3468	if $self->{binding_cancel};
3469	});
3470
3471	$self->update_binding_widgets;
3472
3473	$self
3474	}
3475
3476	sub commit {
3477	my ($self) = @_;
3478	my ($mod, $sym, $cmds) = $self->get_binding;
3479	if ($sym != 0 && @$cmds > 0) {
3480	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3481	."'. Don't forget 'Save Config'!");
3482	$self->{binding_change}->($mod, $sym, $cmds)
3483	if $self->{binding_change};
3484	} else {
3485	$::STATUSBOX->add ("No action bound, no key or action specified!");
3486	$self->{binding_cancel}->()
3487	if $self->{binding_cancel};
3488	}
3489	}
3490
3491	sub start {
3492	my ($self) = @_;
3493
3494	$self->{rec_btn}->set_text ("stop recording");
3495	$self->{recording} = 1;
3496	$self->clear_command_list;
3497	$::CONN->start_record if $::CONN;
3498	}
3499
3500	sub stop {
3501	my ($self) = @_;
3502
3503	$self->{rec_btn}->set_text ("start recording");
3504	$self->{recording} = 0;
3505
3506	my $rec;
3507	$rec = $::CONN->stop_record if $::CONN;
3508	return unless ref $rec eq 'ARRAY';
3509	$self->set_command_list ($rec);
3510	}
3511
3512
3513	sub ask_for_bind_and_commit {
3514	my ($self) = @_;
3515	$self->ask_for_bind (1);
3516	}
3517
3518	sub ask_for_bind {
3519	my ($self, $commit, $end_cb) = @_;
3520
3521	CFClient::Binder::open_binding_dialog (sub {
3522	my ($mod, $sym) = @_;
3523	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3524	$self->update_binding_widgets;
3525	$self->commit if $commit;
3526	$end_cb->() if $end_cb;
3527	});
3528	}
3529
3530	# $mod and $sym are the modifiers and key symbol
3531	# $cmds is a array ref of strings (the commands)
3532	# $cb is the callback that is executed on OK
3533	# $ccb is the callback that is executed on CANCEL and
3534	# when the binding was unsuccessful on OK
3535	sub set_binding {
3536	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3537
3538	$self->clear_command_list;
3539	$self->{recording} = 0;
3540	$self->{rec_btn}->set_text ("start recording");
3541
3542	$self->{binding} = [$mod, $sym];
3543	$self->{commands} = $cmds;
3544
3545	$self->{binding_change} = $cb;
3546	$self->{binding_cancel} = $ccb;
3547
3548	$self->update_binding_widgets;
3549	}
3550
3551	# this is a shortcut method that asks for a binding
3552	# and then just binds it.
3553	sub do_quick_binding {
3554	my ($self, $cmds, $end_cb) = @_;
3555	$self->set_binding (undef, undef, $cmds, sub {
3556	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3557	});
3558	$self->ask_for_bind (1, $end_cb);
3559	}
3560
3561	sub update_binding_widgets {
3562	my ($self) = @_;
3563	my ($mod, $sym, $cmds) = $self->get_binding;
3564	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3565	$self->set_command_list ($cmds);
3566	}
3567
3568	sub get_binding {
3569	my ($self) = @_;
3570	return (
3571	$self->{binding}->[0],
3572	$self->{binding}->[1],
3573	[ grep { defined $_ } @{$self->{commands}} ]
3574	);
3575	}
3576
3577	sub clear_command_list {
3578	my ($self) = @_;
3579	$self->{cmdbox}->clear ();
3580	}
3581
3582	sub set_command_list {
3583	my ($self, $cmds) = @_;
3584
3585	$self->{cmdbox}->clear ();
3586	$self->{commands} = $cmds;
3587
3588	my $idx = 0;
3589
3590	for (@$cmds) {
3591	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3592
3593	my $i = $idx;
3594	$hb->add (new CFClient::UI::Label text => $_);
3595	$hb->add (new CFClient::UI::Button
3596	text => "delete",
3597	tooltip => "Deletes the action from the record",
3598	on_activate => sub {
3599	$self->{cmdbox}->remove ($hb);
3600	$cmds->[$i] = undef;
3601	});
3602
3603
3604	$idx++
3605	}
3606	}
3607
3608	#############################################################################
3609
3610	package CFClient::UI::SpellList;	3671	package CFPlus::UI::SpellList;
3611		3672
3612	our @ISA = CFClient::UI::Table::;	3673	our @ISA = CFPlus::UI::Table::;
3613		3674
3614	sub new {	3675	sub new {
3615	my $class = shift;	3676	my $class = shift;
3616		3677
3617	my $self = $class->SUPER::new (	3678	my $self = $class->SUPER::new (
…		…
3635	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3696	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3636		3697
3637	sub rebuild_spell_list {	3698	sub rebuild_spell_list {
3638	my ($self) = @_;	3699	my ($self) = @_;
3639		3700
3640	$CFClient::UI::ROOT->on_refresh ($self => sub {	3701	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3641	$self->clear;	3702	$self->clear;
3642		3703
3643	return unless $::CONN;	3704	return unless $::CONN;
3644		3705
3645	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3706	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3646	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3707	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3647	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3708	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3648	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3709	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3649	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3710	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3650		3711
3651	my $row = 0;	3712	my $row = 0;
3652		3713
3653	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3714	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3654	my $spell = $self->{spell}{$_};	3715	my $spell = $self->{spell}{$_};
…		…
3661	if ($ev->{button} == 1) {	3722	if ($ev->{button} == 1) {
3662	$::CONN->user_send ("cast $spell->{name}");	3723	$::CONN->user_send ("cast $spell->{name}");
3663	} elsif ($ev->{button} == 2) {	3724	} elsif ($ev->{button} == 2) {
3664	$::CONN->user_send ("invoke $spell->{name}");	3725	$::CONN->user_send ("invoke $spell->{name}");
3665	} elsif ($ev->{button} == 3) {	3726	} elsif ($ev->{button} == 3) {
3666	(new CFClient::UI::Menu	3727	(new CFPlus::UI::Menu
3667	items => [	3728	items => [
3668	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3729	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3669	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3730	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670	],	3731	],
3671	)->popup ($ev);	3732	)->popup ($ev);
3672	} else {	3733	} else {
3673	return 0;	3734	return 0;
…		…
3677	};	3738	};
3678		3739
3679	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3740	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3680		3741
3681	#TODO: add path info to tooltip	3742	#TODO: add path info to tooltip
3682	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3743	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3683		3744
3684	$self->add (0, $row, new CFClient::UI::Face	3745	$self->add (0, $row, new CFPlus::UI::Face
3685	face => $spell->{face},	3746	face => $spell->{face},
3686	can_hover => 1,	3747	can_hover => 1,
3687	can_events => 1,	3748	can_events => 1,
3688	tooltip => $tooltip,	3749	tooltip => $tooltip,
3689	on_button_down => $spell_cb,	3750	on_button_down => $spell_cb,
3690	);	3751	);
3691		3752
3692	$self->add (1, $row, new CFClient::UI::Label	3753	$self->add (1, $row, new CFPlus::UI::Label
3693	expand => 1,	3754	expand => 1,
3694	text => $spell->{name},	3755	text => $spell->{name},
3695	can_hover => 1,	3756	can_hover => 1,
3696	can_events => 1,	3757	can_events => 1,
3697	tooltip => $tooltip,	3758	tooltip => $tooltip,
3698	on_button_down => $spell_cb,	3759	on_button_down => $spell_cb,
3699	);	3760	);
3700		3761
3701	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3762	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3702	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3763	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3703	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3764	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3704	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3765	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3705	}	3766	}
3706	});	3767	});
3707	}	3768	}
3708		3769
3709	sub add_spell {	3770	sub add_spell {
…		…
3727	$self->rebuild_spell_list;	3788	$self->rebuild_spell_list;
3728	}	3789	}
3729		3790
3730	#############################################################################	3791	#############################################################################
3731		3792
3732	package CFClient::UI::Root;	3793	package CFPlus::UI::Root;
3733		3794
3734	our @ISA = CFClient::UI::Container::;	3795	our @ISA = CFPlus::UI::Container::;
3735		3796
3736	use List::Util qw(min max);	3797	use List::Util qw(min max);
3737		3798
3738	use CFClient::OpenGL;	3799	use CFPlus::OpenGL;
3739		3800
3740	sub new {	3801	sub new {
3741	my $class = shift;	3802	my $class = shift;
3742		3803
3743	my $self = $class->SUPER::new (	3804	my $self = $class->SUPER::new (
…		…
3919	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3980	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3920		3981
3921	$w = 0 if $w < 0;	3982	$w = 0 if $w < 0;
3922	$h = 0 if $h < 0;	3983	$h = 0 if $h < 0;
3923		3984
		3985	$w = max $widget->{min_w}, $w;
		3986	$h = max $widget->{min_h}, $h;
		3987
		3988	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3989	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3990
		3991	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3992	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3993
3924	$w = int $w + 0.5;	3994	$w = int $w + 0.5;
3925	$h = int $h + 0.5;	3995	$h = int $h + 0.5;
3926		3996
3927	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3997	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3928	$widget->{old_w} = $widget->{w};	3998	$widget->{old_w} = $widget->{w};
…		…
3951	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4021	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3952	glMatrixMode GL_MODELVIEW;	4022	glMatrixMode GL_MODELVIEW;
3953	glLoadIdentity;	4023	glLoadIdentity;
3954		4024
3955	{	4025	{
3956	package CFClient::UI::Base;	4026	package CFPlus::UI::Base;
3957		4027
3958	($draw_x, $draw_y, $draw_w, $draw_h) =	4028	($draw_x, $draw_y, $draw_w, $draw_h) =
3959	(0, 0, $self->{w}, $self->{h});	4029	(0, 0, $self->{w}, $self->{h});
3960	}	4030	}
3961		4031
3962	$self->_draw;	4032	$self->_draw;
3963	}	4033	}
3964		4034
3965	#############################################################################	4035	#############################################################################
3966		4036
3967	package CFClient::UI;	4037	package CFPlus::UI;
3968		4038
3969	$ROOT = new CFClient::UI::Root;	4039	$ROOT = new CFPlus::UI::Root;
3970	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4040	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3971		4041
3972	1	4042	1
3973		4043

Diff Legend

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