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.353 by root, Thu Nov 16 19:42:45 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	local ($draw_x, $draw_y, $draw_w, $draw_h) =
842	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
		905
		906	$self->_render;
843	}	907	}
844
845	$self->_render;
846	};	908	};
847	}	909	}
848		910
849	sub _draw {	911	sub _draw {
850	my ($self) = @_;	912	my ($self) = @_;
851
852	my ($w, $h) = @$self{qw(w h)};
853		913
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;
		1136
		1137	sub new {
		1138	my ($class, %arg) = @_;
		1139
		1140	if ((exists $arg{label}) && !ref $arg{label}) {
		1141	$arg{label} = new CFPlus::UI::Label
		1142	align => 1,
		1143	valign => 0,
		1144	text => $arg{label},
		1145	fontsize => ($arg{border} || 0.8) * 0.75;
		1146	}
		1147
		1148	my $self = $class->SUPER::new (
		1149	# label => "",
		1150	fg => [0.6, 0.3, 0.1],
		1151	border => 0.8,
		1152	style => 'single',
		1153	%arg,
		1154	);
		1155
		1156	$self
		1157	}
		1158
		1159	sub add {
		1160	my ($self, @widgets) = @_;
		1161
		1162	$self->SUPER::add (@widgets);
		1163	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1164	}
		1165
		1166	sub border {
		1167	int $_[0]{border} * $::FONTSIZE
		1168	}
		1169
		1170	sub size_request {
		1171	my ($self) = @_;
		1172
		1173	($self->{label_w}, undef) = $self->{label}->size_request
		1174	if $self->{label};
		1175
		1176	my ($w, $h) = $self->SUPER::size_request;
		1177
		1178	(
		1179	$w + $self->border * 2,
		1180	$h + $self->border * 2,
		1181	)
		1182	}
		1183
		1184	sub invoke_size_allocate {
		1185	my ($self, $w, $h) = @_;
		1186
		1187	my $border = $self->border;
		1188
		1189	$w -= List::Util::max 0, $border * 2;
		1190	$h -= List::Util::max 0, $border * 2;
		1191
		1192	if (my $label = $self->{label}) {
		1193	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1194	$label->{h} = List::Util::min $h, $border;
		1195	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1196	}
		1197
		1198	$self->child->configure ($border, $border, $w, $h);
		1199
		1200	1
		1201	}
		1202
		1203	sub _draw {
		1204	my ($self) = @_;
		1205
		1206	my $child = $self->{children}[0];
		1207
		1208	my $border = $self->border;
		1209	my ($w, $h) = ($self->{w}, $self->{h});
		1210
		1211	$child->draw;
		1212
		1213	glColor @{$self->{fg}};
		1214	glBegin GL_LINE_STRIP;
		1215	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1216	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1217	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1218	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1219	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1220	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1221	glEnd;
		1222
		1223	if ($self->{label}) {
		1224	glTranslate $border * 2, 0;
		1225	$self->{label}->_draw;
		1226	}
		1227	}
		1228
		1229	#############################################################################
		1230
		1231	package CFPlus::UI::Toplevel;
		1232
		1233	our @ISA = CFPlus::UI::Bin::;
		1234
		1235	use CFPlus::OpenGL;
1063		1236
1064	my $bg =	1237	my $bg =
1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1238	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066	mipmap => 1, wrap => 1;	1239	mipmap => 1, wrap => 1;
1067		1240
1068	my @border =	1241	my @border =
1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1242	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);	1243	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071		1244
1072	sub new {	1245	sub new {
1073	my ($class, %arg) = @_;	1246	my ($class, %arg) = @_;
1074		1247
1075	my $self = $class->SUPER::new (	1248	my $self = $class->SUPER::new (
1076	bg => [1, 1, 1, 1],	1249	bg => [1, 1, 1, 1],
1077	border_bg => [1, 1, 1, 1],	1250	border_bg => [1, 1, 1, 1],
1078	border => 0.6,	1251	border => 0.6,
1079	can_events => 1,	1252	can_events => 1,
1080	min_w => 16,	1253	min_w => 64,
1081	min_h => 16,	1254	min_h => 32,
1082	%arg,	1255	%arg,
1083	);	1256	);
1084		1257
1085	$self->{title_widget} = new CFClient::UI::Label	1258	$self->{title_widget} = new CFPlus::UI::Label
1086	align => 0,	1259	align => 0,
1087	valign => 1,	1260	valign => 1,
1088	text => $self->{title},	1261	text => $self->{title},
1089	fontsize => $self->{border},	1262	fontsize => $self->{border},
1090	if exists $self->{title};	1263	if exists $self->{title};
1091		1264
1092	if ($self->{has_close_button}) {	1265	if ($self->{has_close_button}) {
1093	$self->{close_button} =	1266	$self->{close_button} =
1094	new CFClient::UI::ImageButton	1267	new CFPlus::UI::ImageButton
1095	image => 'x1_close.png',	1268	path => 'x1_close.png',
1096	on_activate => sub { $self->hide };	1269	on_activate => sub { $self->emit ("delete") };
1097		1270
1098	$self->CFClient::UI::Container::add ($self->{close_button});	1271	$self->CFPlus::UI::Container::add ($self->{close_button});
1099	}	1272	}
1100		1273
1101	$self	1274	$self
1102	}	1275	}
1103		1276
1104	sub add {	1277	sub add {
1105	my ($self, @widgets) = @_;	1278	my ($self, @widgets) = @_;
1106		1279
1107	$self->SUPER::add (@widgets);	1280	$self->SUPER::add (@widgets);
1108	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1281	$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};	1282	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1110	}	1283	}
1111		1284
1112	sub border {	1285	sub border {
1113	int $_[0]{border} * $::FONTSIZE	1286	int $_[0]{border} * $::FONTSIZE
1114	}	1287	}
…		…
1147	$self->child->configure ($border, $border, $w, $h);	1320	$self->child->configure ($border, $border, $w, $h);
1148		1321
1149	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1322	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150	if $self->{close_button};	1323	if $self->{close_button};
1151		1324
		1325	1
		1326	}
		1327
		1328	sub invoke_delete {
		1329	my ($self) = @_;
		1330
		1331	$self->hide;
		1332
1152	1	1333	1
1153	}	1334	}
1154		1335
1155	sub invoke_button_down {	1336	sub invoke_button_down {
1156	my ($self, $ev, $x, $y) = @_;	1337	my ($self, $ev, $x, $y) = @_;
…		…
1214	$self->{motion}->($ev, $x, $y) if $self->{motion};	1395	$self->{motion}->($ev, $x, $y) if $self->{motion};
1215		1396
1216	! ! $self->{motion}	1397	! ! $self->{motion}
1217	}	1398	}
1218		1399
		1400	sub invoke_visibility_change {
		1401	my ($self, $visible) = @_;
		1402
		1403	delete $self->{motion} unless $visible;
		1404
		1405	0
		1406	}
		1407
1219	sub _draw {	1408	sub _draw {
1220	my ($self) = @_;	1409	my ($self) = @_;
1221		1410
1222	my $child = $self->{children}[0];	1411	my $child = $self->{children}[0];
1223		1412
…		…
1260	if $self->{close_button};	1449	if $self->{close_button};
1261	}	1450	}
1262		1451
1263	#############################################################################	1452	#############################################################################
1264		1453
1265	package CFClient::UI::Table;	1454	package CFPlus::UI::Table;
1266		1455
1267	our @ISA = CFClient::UI::Base::;	1456	our @ISA = CFPlus::UI::Base::;
1268		1457
1269	use List::Util qw(max sum);	1458	use List::Util qw(max sum);
1270		1459
1271	use CFClient::OpenGL;	1460	use CFPlus::OpenGL;
1272		1461
1273	sub new {	1462	sub new {
1274	my $class = shift;	1463	my $class = shift;
1275		1464
1276	$class->SUPER::new (	1465	$class->SUPER::new (
…		…
1282	sub children {	1471	sub children {
1283	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284	}	1473	}
1285		1474
1286	sub add {	1475	sub add {
1287	my ($self, $x, $y, $child) = @_;	1476	my ($self) = shift;
1288		1477
		1478	while (@_) {
		1479	my ($x, $y, $child) = splice @_, 0, 3, ();
1289	$child->set_parent ($self);	1480	$child->set_parent ($self);
1290	$self->{children}[$y][$x] = $child;	1481	$self->{children}[$y][$x] = $child;
		1482	}
1291		1483
		1484	$self->{force_realloc} = 1;
		1485	$self->{force_size_alloc} = 1;
1292	$self->realloc;	1486	$self->realloc;
1293	}	1487	}
1294		1488
1295	sub remove {	1489	sub remove {
1296	my ($self, $child) = @_;	1490	my ($self, $child) = @_;
…		…
1361		1555
1362	# linearly scale sizes	1556	# linearly scale sizes
1363	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365		1559
1366	CFClient::UI::harmonize $ws;	1560	CFPlus::UI::harmonize $ws;
1367	CFClient::UI::harmonize $hs;	1561	CFPlus::UI::harmonize $hs;
1368		1562
1369	my $y;	1563	my $y;
1370		1564
1371	for my $r (0 .. $#{$self->{children}}) {	1565	for my $r (0 .. $#{$self->{children}}) {
1372	my $row = $self->{children}[$r]	1566	my $row = $self->{children}[$r]
…		…
1415	}	1609	}
1416	}	1610	}
1417		1611
1418	#############################################################################	1612	#############################################################################
1419		1613
1420	package CFClient::UI::Box;	1614	package CFPlus::UI::Box;
1421		1615
1422	our @ISA = CFClient::UI::Container::;	1616	our @ISA = CFPlus::UI::Container::;
1423		1617
1424	sub size_request {	1618	sub size_request {
1425	my ($self) = @_;	1619	my ($self) = @_;
1426		1620
1427	$self->{vertical}	1621	$self->{vertical}
…		…
1437		1631
1438	sub invoke_size_allocate {	1632	sub invoke_size_allocate {
1439	my ($self, $w, $h) = @_;	1633	my ($self, $w, $h) = @_;
1440		1634
1441	my $space = $self->{vertical} ? $h : $w;	1635	my $space = $self->{vertical} ? $h : $w;
1442	my $children = $self->{children};	1636	my @children = $self->visible_children;
1443		1637
1444	my @req;	1638	my @req;
1445		1639
1446	if ($self->{homogeneous}) {	1640	if ($self->{homogeneous}) {
1447	@req = ($space / (@$children || 1)) x @$children;	1641	@req = ($space / (@children || 1)) x @children;
1448	} else {	1642	} else {
1449	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1643	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450	my $req = List::Util::sum @req;	1644	my $req = List::Util::sum @req;
1451		1645
1452	if ($req > $space) {	1646	if ($req > $space) {
1453	# ah well, not enough space	1647	# ah well, not enough space
1454	$_ *= $space / $req for @req;	1648	$_ *= $space / $req for @req;
1455	} else {	1649	} else {
1456	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1650	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457		1651
1458	$space = ($space - $req) / $expand; # remaining space to give away	1652	$space = ($space - $req) / $expand; # remaining space to give away
1459		1653
1460	$req[$_] += $space * $children->[$_]{expand}	1654	$req[$_] += $space * $children[$_]{expand}
1461	for 0 .. $#$children;	1655	for 0 .. $#children;
1462	}	1656	}
1463	}	1657	}
1464		1658
1465	CFClient::UI::harmonize \@req;	1659	CFPlus::UI::harmonize \@req;
1466		1660
1467	my $pos = 0;	1661	my $pos = 0;
1468	for (0 .. $#$children) {	1662	for (0 .. $#children) {
1469	my $alloc = $req[$_];	1663	my $alloc = $req[$_];
1470	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1664	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471		1665
1472	$pos += $alloc;	1666	$pos += $alloc;
1473	}	1667	}
1474		1668
1475	1	1669	1
1476	}	1670	}
1477		1671
1478	#############################################################################	1672	#############################################################################
1479		1673
1480	package CFClient::UI::HBox;	1674	package CFPlus::UI::HBox;
1481		1675
1482	our @ISA = CFClient::UI::Box::;	1676	our @ISA = CFPlus::UI::Box::;
1483		1677
1484	sub new {	1678	sub new {
1485	my $class = shift;	1679	my $class = shift;
1486		1680
1487	$class->SUPER::new (	1681	$class->SUPER::new (
…		…
1490	)	1684	)
1491	}	1685	}
1492		1686
1493	#############################################################################	1687	#############################################################################
1494		1688
1495	package CFClient::UI::VBox;	1689	package CFPlus::UI::VBox;
1496		1690
1497	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1498		1692
1499	sub new {	1693	sub new {
1500	my $class = shift;	1694	my $class = shift;
1501		1695
1502	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1505	)	1699	)
1506	}	1700	}
1507		1701
1508	#############################################################################	1702	#############################################################################
1509		1703
1510	package CFClient::UI::Label;	1704	package CFPlus::UI::Label;
1511		1705
1512	our @ISA = CFClient::UI::DrawBG::;	1706	our @ISA = CFPlus::UI::DrawBG::;
1513		1707
1514	use CFClient::OpenGL;	1708	use CFPlus::OpenGL;
1515		1709
1516	sub new {	1710	sub new {
1517	my ($class, %arg) = @_;	1711	my ($class, %arg) = @_;
1518		1712
1519	my $self = $class->SUPER::new (	1713	my $self = $class->SUPER::new (
…		…
1522	#active_bg => none	1716	#active_bg => none
1523	#font => default_font	1717	#font => default_font
1524	#text => initial text	1718	#text => initial text
1525	#markup => initial narkup	1719	#markup => initial narkup
1526	#max_w => maximum pixel width	1720	#max_w => maximum pixel width
		1721	#style => 0, # render flags
1527	ellipsise => 3, # end	1722	ellipsise => 3, # end
1528	layout => (new CFClient::Layout),	1723	layout => (new CFPlus::Layout),
1529	fontsize => 1,	1724	fontsize => 1,
1530	align => -1,	1725	align => -1,
1531	valign => -1,	1726	valign => -1,
1532	padding_x => 2,	1727	padding_x => 2,
1533	padding_y => 2,	1728	padding_y => 2,
1534	can_events => 0,	1729	can_events => 0,
1535	%arg	1730	%arg
1536	);	1731	);
1537		1732
1538	if (exists $self->{template}) {	1733	if (exists $self->{template}) {
1539	my $layout = new CFClient::Layout;	1734	my $layout = new CFPlus::Layout;
1540	$layout->set_text (delete $self->{template});	1735	$layout->set_text (delete $self->{template});
1541	$self->{template} = $layout;	1736	$self->{template} = $layout;
1542	}	1737	}
1543		1738
1544	if (exists $self->{markup}) {	1739	if (exists $self->{markup}) {
…		…
1548	}	1743	}
1549		1744
1550	$self	1745	$self
1551	}	1746	}
1552		1747
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 {	1748	sub update {
1564	my ($self) = @_;	1749	my ($self) = @_;
1565		1750
1566	delete $self->{texture};	1751	delete $self->{texture};
1567	$self->SUPER::update;	1752	$self->SUPER::update;
…		…
1578	my ($self, $text) = @_;	1763	my ($self, $text) = @_;
1579		1764
1580	return if $self->{text} eq "T$text";	1765	return if $self->{text} eq "T$text";
1581	$self->{text} = "T$text";	1766	$self->{text} = "T$text";
1582		1767
1583	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584	$self->{layout}->set_text ($text);	1768	$self->{layout}->set_text ($text);
1585		1769
1586	delete $self->{size_req};	1770	delete $self->{size_req};
1587	$self->realloc;	1771	$self->realloc;
1588	$self->update;	1772	$self->update;
…		…
1594	return if $self->{text} eq "M$markup";	1778	return if $self->{text} eq "M$markup";
1595	$self->{text} = "M$markup";	1779	$self->{text} = "M$markup";
1596		1780
1597	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1781	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598		1782
1599	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600	$self->{layout}->set_markup ($markup);	1783	$self->{layout}->set_markup ($markup);
1601		1784
1602	delete $self->{size_req};	1785	delete $self->{size_req};
1603	$self->realloc;	1786	$self->realloc;
1604	$self->update;	1787	$self->update;
…		…
1616		1799
1617	my ($w, $h) = $self->{layout}->size;	1800	my ($w, $h) = $self->{layout}->size;
1618		1801
1619	if (exists $self->{template}) {	1802	if (exists $self->{template}) {
1620	$self->{template}->set_font ($self->{font}) if $self->{font};	1803	$self->{template}->set_font ($self->{font}) if $self->{font};
		1804	$self->{template}->set_width ($self->{max_w} || -1);
1621	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1805	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622		1806
1623	my ($w2, $h2) = $self->{template}->size;	1807	my ($w2, $h2) = $self->{template}->size;
1624		1808
1625	$w = List::Util::max $w, $w2;	1809	$w = List::Util::max $w, $w2;
…		…
1630	};	1814	};
1631		1815
1632	@{ $self->{size_req} }	1816	@{ $self->{size_req} }
1633	}	1817	}
1634		1818
		1819	sub baseline_shift {
		1820	$_[0]{layout}->descent
		1821	}
		1822
1635	sub invoke_size_allocate {	1823	sub invoke_size_allocate {
1636	my ($self, $w, $h) = @_;	1824	my ($self, $w, $h) = @_;
1637		1825
1638	delete $self->{ox};	1826	delete $self->{ox};
1639		1827
…		…
1645		1833
1646	sub set_fontsize {	1834	sub set_fontsize {
1647	my ($self, $fontsize) = @_;	1835	my ($self, $fontsize) = @_;
1648		1836
1649	$self->{fontsize} = $fontsize;	1837	$self->{fontsize} = $fontsize;
		1838	delete $self->{size_req};
1650	delete $self->{texture};	1839	delete $self->{texture};
1651		1840
1652	$self->realloc;	1841	$self->realloc;
1653	}	1842	}
1654		1843
1655	sub reconfigure {	1844	sub reconfigure {
1656	my ($self) = @_;	1845	my ($self) = @_;
1657		1846
1658	delete $self->{size_req};	1847	delete $self->{size_req};
		1848	delete $self->{texture};
1659		1849
1660	$self->SUPER::reconfigure;	1850	$self->SUPER::reconfigure;
1661	}	1851	}
1662		1852
1663	sub _draw {	1853	sub _draw {
1664	my ($self) = @_;	1854	my ($self) = @_;
1665		1855
1666	$self->SUPER::_draw; # draw background, if applicable	1856	$self->SUPER::_draw; # draw background, if applicable
1667		1857
1668	my $tex = $self->{texture} ||= do {	1858	my $size = $self->{texture} ||= do {
1669	$self->{layout}->set_foreground (@{$self->{fg}});	1859	$self->{layout}->set_foreground (@{$self->{fg}});
1670	$self->{layout}->set_font ($self->{font}) if $self->{font};	1860	$self->{layout}->set_font ($self->{font}) if $self->{font};
1671	$self->{layout}->set_width ($self->{w});	1861	$self->{layout}->set_width ($self->{w});
1672	$self->{layout}->set_ellipsise ($self->{ellipsise});	1862	$self->{layout}->set_ellipsise ($self->{ellipsise});
1673	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1863	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1864	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675		1865
1676	new_from_layout CFClient::Texture $self->{layout}	1866	[$self->{layout}->size]
1677	};	1867	};
1678		1868
1679	unless (exists $self->{ox}) {	1869	unless (exists $self->{ox}) {
1680	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1870	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1871	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682	: ($self->{w} - $tex->{w}) * 0.5);	1872	: ($self->{w} - $size->[0]) * 0.5);
1683		1873
1684	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1874	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1875	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686	: ($self->{h} - $tex->{h}) * 0.5);	1876	: ($self->{h} - $size->[1]) * 0.5);
1687	};	1877	};
1688		1878
1689	glEnable GL_TEXTURE_2D;
1690
1691	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1879	my $w = List::Util::min $self->{w} + 4, $size->[0];
1692	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1880	my $h = List::Util::min $self->{h} + 2, $size->[1];
1693		1881
1694	if ($tex->{format} == GL_ALPHA) {	1882	$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	}	1883	}
1705		1884
1706	#############################################################################	1885	#############################################################################
1707		1886
1708	package CFClient::UI::EntryBase;	1887	package CFPlus::UI::EntryBase;
1709		1888
1710	our @ISA = CFClient::UI::Label::;	1889	our @ISA = CFPlus::UI::Label::;
1711		1890
1712	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1713		1892
1714	sub new {	1893	sub new {
1715	my $class = shift;	1894	my $class = shift;
1716		1895
1717	$class->SUPER::new (	1896	$class->SUPER::new (
…		…
1779		1958
1780	if ($uni == 8) {	1959	if ($uni == 8) {
1781	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1960	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782	} elsif ($uni == 127) {	1961	} elsif ($uni == 127) {
1783	substr $text, $self->{cursor}, 1, "";	1962	substr $text, $self->{cursor}, 1, "";
1784	} elsif ($sym == CFClient::SDLK_LEFT) {	1963	} elsif ($sym == CFPlus::SDLK_LEFT) {
1785	--$self->{cursor} if $self->{cursor};	1964	--$self->{cursor} if $self->{cursor};
1786	} elsif ($sym == CFClient::SDLK_RIGHT) {	1965	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1787	++$self->{cursor} if $self->{cursor} < length $self->{text};	1966	++$self->{cursor} if $self->{cursor} < length $self->{text};
1788	} elsif ($sym == CFClient::SDLK_HOME) {	1967	} elsif ($sym == CFPlus::SDLK_HOME) {
1789	$self->{cursor} = 0;	1968	$self->{cursor} = 0;
1790	} elsif ($sym == CFClient::SDLK_END) {	1969	} elsif ($sym == CFPlus::SDLK_END) {
1791	$self->{cursor} = length $text;	1970	$self->{cursor} = length $text;
		1971	} elsif ($uni == 21) { # ctrl-u
		1972	$text = "";
		1973	$self->{cursor} = 0;
1792	} elsif ($uni == 27) {	1974	} elsif ($uni == 27) {
1793	$self->emit ('escape');	1975	$self->emit ('escape');
1794	} elsif ($uni) {	1976	} elsif ($uni) {
1795	substr $text, $self->{cursor}++, 0, chr $uni;	1977	substr $text, $self->{cursor}++, 0, chr $uni;
1796	} else {	1978	} else {
…		…
1819		2001
1820	my $idx = $self->{layout}->xy_to_index ($x, $y);	2002	my $idx = $self->{layout}->xy_to_index ($x, $y);
1821		2003
1822	# byte-index to char-index	2004	# byte-index to char-index
1823	my $text = $self->{text};	2005	my $text = $self->{text};
1824	utf8::encode $text;	2006	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825	$self->{cursor} = length substr $text, 0, $idx;	2007	$self->{cursor} = length $text;
1826		2008
1827	$self->_set_text ($self->{text});	2009	$self->_set_text ($self->{text});
1828	$self->update;	2010	$self->update;
1829		2011
1830	1	2012	1
…		…
1869	utf8::encode $text;	2051	utf8::encode $text;
1870		2052
1871	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2053	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1872	}	2054	}
1873		2055
1874	glColor @{$self->{fg}};
1875	glBegin GL_LINES;	2056	glBegin GL_LINES;
1876	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2057	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};	2058	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878	glEnd;	2059	glEnd;
1879	}	2060	}
1880	}	2061	}
1881		2062
1882	package CFClient::UI::Entry;	2063	package CFPlus::UI::Entry;
1883		2064
1884	our @ISA = CFClient::UI::EntryBase::;	2065	our @ISA = CFPlus::UI::EntryBase::;
1885		2066
1886	use CFClient::OpenGL;	2067	use CFPlus::OpenGL;
1887		2068
1888	sub invoke_key_down {	2069	sub invoke_key_down {
1889	my ($self, $ev) = @_;	2070	my ($self, $ev) = @_;
1890		2071
1891	my $sym = $ev->{sym};	2072	my $sym = $ev->{sym};
…		…
1897	$self->{history_pointer} = -1;	2078	$self->{history_pointer} = -1;
1898	$self->{history_saveback} = '';	2079	$self->{history_saveback} = '';
1899	$self->emit (activate => $txt);	2080	$self->emit (activate => $txt);
1900	$self->update;	2081	$self->update;
1901		2082
1902	} elsif ($sym == CFClient::SDLK_UP) {	2083	} elsif ($sym == CFPlus::SDLK_UP) {
1903	if ($self->{history_pointer} < 0) {	2084	if ($self->{history_pointer} < 0) {
1904	$self->{history_saveback} = $self->get_text;	2085	$self->{history_saveback} = $self->get_text;
1905	}	2086	}
1906	if (@{$self->{history} || []} > 0) {	2087	if (@{$self->{history} || []} > 0) {
1907	$self->{history_pointer}++;	2088	$self->{history_pointer}++;
…		…
1909	$self->{history_pointer} = @{$self->{history} || []} - 1;	2090	$self->{history_pointer} = @{$self->{history} || []} - 1;
1910	}	2091	}
1911	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2092	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1912	}	2093	}
1913		2094
1914	} elsif ($sym == CFClient::SDLK_DOWN) {	2095	} elsif ($sym == CFPlus::SDLK_DOWN) {
1915	$self->{history_pointer}--;	2096	$self->{history_pointer}--;
1916	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2097	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917		2098
1918	if ($self->{history_pointer} >= 0) {	2099	if ($self->{history_pointer} >= 0) {
1919	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2100	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1928	1	2109	1
1929	}	2110	}
1930		2111
1931	#############################################################################	2112	#############################################################################
1932		2113
1933	package CFClient::UI::Button;	2114	package CFPlus::UI::Button;
1934		2115
1935	our @ISA = CFClient::UI::Label::;	2116	our @ISA = CFPlus::UI::Label::;
1936		2117
1937	use CFClient::OpenGL;	2118	use CFPlus::OpenGL;
1938		2119
1939	my @tex =	2120	my @tex =
1940	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2121	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941	qw(b1_button_active.png);	2122	qw(b1_button_active.png);
1942		2123
1943	sub new {	2124	sub new {
1944	my $class = shift;	2125	my $class = shift;
1945		2126
…		…
1982	$self->SUPER::_draw;	2163	$self->SUPER::_draw;
1983	}	2164	}
1984		2165
1985	#############################################################################	2166	#############################################################################
1986		2167
		2168	package CFPlus::UI::CheckBox;
		2169
		2170	our @ISA = CFPlus::UI::DrawBG::;
		2171
		2172	my @tex =
		2173	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2174	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2175
		2176	use CFPlus::OpenGL;
		2177
		2178	sub new {
		2179	my $class = shift;
		2180
		2181	$class->SUPER::new (
		2182	padding_x => 2,
		2183	padding_y => 2,
		2184	fg => [1, 1, 1],
		2185	active_fg => [1, 1, 0],
		2186	bg => [0, 0, 0, 0.2],
		2187	active_bg => [1, 1, 1, 0.5],
		2188	state => 0,
		2189	can_hover => 1,
		2190	@_
		2191	)
		2192	}
		2193
		2194	sub size_request {
		2195	my ($self) = @_;
		2196
		2197	(6) x 2
		2198	}
		2199
		2200	sub toggle {
		2201	my ($self) = @_;
		2202
		2203	$self->{state} = !$self->{state};
		2204	$self->emit (changed => $self->{state});
		2205	$self->update;
		2206	}
		2207
		2208	sub invoke_button_down {
		2209	my ($self, $ev, $x, $y) = @_;
		2210
		2211	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2212	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2213	$self->toggle;
		2214	} else {
		2215	return 0
		2216	}
		2217
		2218	1
		2219	}
		2220
		2221	sub _draw {
		2222	my ($self) = @_;
		2223
		2224	$self->SUPER::_draw;
		2225
		2226	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2227
		2228	my ($w, $h) = @$self{qw(w h)};
		2229
		2230	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2231
		2232	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2233
		2234	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2235
		2236	glEnable GL_TEXTURE_2D;
		2237	$tex->draw_quad_alpha (0, 0, $s, $s);
		2238	glDisable GL_TEXTURE_2D;
		2239	}
		2240
		2241	#############################################################################
		2242
		2243	package CFPlus::UI::Image;
		2244
		2245	our @ISA = CFPlus::UI::Base::;
		2246
		2247	use CFPlus::OpenGL;
		2248
		2249	our %texture_cache;
		2250
		2251	sub new {
		2252	my $class = shift;
		2253
		2254	my $self = $class->SUPER::new (
		2255	can_events => 0,
		2256	@_,
		2257	);
		2258
		2259	$self->{path} || $self->{tex}
		2260	or Carp::croak "'path' or 'tex' attributes required";
		2261
		2262	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2263	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2264
		2265	Scalar::Util::weaken $texture_cache{$self->{path}};
		2266
		2267	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2268
		2269	$self
		2270	}
		2271
		2272	sub STORABLE_freeze {
		2273	my ($self, $cloning) = @_;
		2274
		2275	$self->{path}
		2276	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2277
		2278	$self->{path}
		2279	}
		2280
		2281	sub STORABLE_attach {
		2282	my ($self, $cloning, $path) = @_;
		2283
		2284	$self->new (path => $path)
		2285	}
		2286
		2287	sub size_request {
		2288	my ($self) = @_;
		2289
		2290	($self->{tex}{w}, $self->{tex}{h})
		2291	}
		2292
		2293	sub _draw {
		2294	my ($self) = @_;
		2295
		2296	my $tex = $self->{tex};
		2297
		2298	my ($w, $h) = ($self->{w}, $self->{h});
		2299
		2300	if ($self->{rot90}) {
		2301	glRotate 90, 0, 0, 1;
		2302	glTranslate 0, -$self->{w}, 0;
		2303
		2304	($w, $h) = ($h, $w);
		2305	}
		2306
		2307	glEnable GL_TEXTURE_2D;
		2308	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2309
		2310	$tex->draw_quad (0, 0, $w, $h);
		2311
		2312	glDisable GL_TEXTURE_2D;
		2313	}
		2314
		2315	#############################################################################
		2316
1987	package CFClient::UI::ImageButton;	2317	package CFPlus::UI::ImageButton;
1988		2318
1989	our @ISA = CFClient::UI::Image::;	2319	our @ISA = CFPlus::UI::Image::;
1990		2320
1991	use CFClient::OpenGL;	2321	use CFPlus::OpenGL;
1992		2322
1993	my %textures;	2323	my %textures;
1994		2324
1995	sub new {	2325	sub new {
1996	my $class = shift;	2326	my $class = shift;
…		…
2018	1	2348	1
2019	}	2349	}
2020		2350
2021	#############################################################################	2351	#############################################################################
2022		2352
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;	2353	package CFPlus::UI::VGauge;
2092		2354
2093	our @ISA = CFClient::UI::Base::;	2355	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		2356
2153	use List::Util qw(min max);	2357	use List::Util qw(min max);
2154		2358
2155	use CFClient::OpenGL;	2359	use CFPlus::OpenGL;
2156		2360
2157	my %tex = (	2361	my %tex = (
2158	food => [	2362	food => [
2159	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2363	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2160	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2364	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2161	],	2365	],
2162	grace => [	2366	grace => [
2163	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2367	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/	2368	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2165	],	2369	],
2166	hp => [	2370	hp => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2371	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2372	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2169	],	2373	],
2170	mana => [	2374	mana => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2375	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/	2376	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2173	],	2377	],
2174	);	2378	);
2175		2379
2176	# eg. VGauge->new (gauge => 'food'), default gauge: food	2380	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2236	my $ycut1 = max 0, min 1, $ycut;	2440	my $ycut1 = max 0, min 1, $ycut;
2237	my $ycut2 = max 0, min 1, $ycut - 1;	2441	my $ycut2 = max 0, min 1, $ycut - 1;
2238		2442
2239	my $h1 = $self->{h} * (1 - $ycut1);	2443	my $h1 = $self->{h} * (1 - $ycut1);
2240	my $h2 = $self->{h} * (1 - $ycut2);	2444	my $h2 = $self->{h} * (1 - $ycut2);
		2445	my $h3 = $self->{h};
		2446
		2447	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2241		2448
2242	glEnable GL_BLEND;	2449	glEnable GL_BLEND;
2243	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2450	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2451	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2245	glEnable GL_TEXTURE_2D;	2452	glEnable GL_TEXTURE_2D;
…		…
2264		2471
2265	if ($t3) {	2472	if ($t3) {
2266	glBindTexture GL_TEXTURE_2D, $t3->{name};	2473	glBindTexture GL_TEXTURE_2D, $t3->{name};
2267	glBegin GL_QUADS;	2474	glBegin GL_QUADS;
2268	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2475	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2269	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2476	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2270	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2477	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2271	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2478	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2272	glEnd;	2479	glEnd;
2273	}	2480	}
2274		2481
2275	glDisable GL_BLEND;	2482	glDisable GL_BLEND;
2276	glDisable GL_TEXTURE_2D;	2483	glDisable GL_TEXTURE_2D;
2277	}	2484	}
2278		2485
2279	#############################################################################	2486	#############################################################################
2280		2487
2281	package CFClient::UI::Gauge;	2488	package CFPlus::UI::Gauge;
2282		2489
2283	our @ISA = CFClient::UI::VBox::;	2490	our @ISA = CFPlus::UI::VBox::;
2284		2491
2285	sub new {	2492	sub new {
2286	my ($class, %arg) = @_;	2493	my ($class, %arg) = @_;
2287		2494
2288	my $self = $class->SUPER::new (	2495	my $self = $class->SUPER::new (
…		…
2290	can_hover => 1,	2497	can_hover => 1,
2291	can_events => 1,	2498	can_events => 1,
2292	%arg,	2499	%arg,
2293	);	2500	);
2294		2501
2295	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2502	$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);	2503	$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");	2504	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2298		2505
2299	$self	2506	$self
2300	}	2507	}
2301		2508
2302	sub set_fontsize {	2509	sub set_fontsize {
…		…
2323	$self->{value}->set_text ($val);	2530	$self->{value}->set_text ($val);
2324	}	2531	}
2325		2532
2326	#############################################################################	2533	#############################################################################
2327		2534
2328	package CFClient::UI::Slider;	2535	package CFPlus::UI::Slider;
2329		2536
2330	use strict;	2537	use strict;
2331		2538
2332	use CFClient::OpenGL;	2539	use CFPlus::OpenGL;
2333		2540
2334	our @ISA = CFClient::UI::DrawBG::;	2541	our @ISA = CFPlus::UI::DrawBG::;
2335		2542
2336	my @tex =	2543	my @tex =
2337	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2544	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2338	qw(s1_slider.png s1_slider_bg.png);	2545	qw(s1_slider.png s1_slider_bg.png);
2339		2546
2340	sub new {	2547	sub new {
2341	my $class = shift;	2548	my $class = shift;
2342		2549
…		…
2410		2617
2411	$self->SUPER::invoke_button_down ($ev, $x, $y);	2618	$self->SUPER::invoke_button_down ($ev, $x, $y);
2412		2619
2413	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2620	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2414		2621
2415	$self->mouse_motion ($ev, $x, $y)	2622	$self->invoke_mouse_motion ($ev, $x, $y)
2416	}	2623	}
2417		2624
2418	sub invoke_mouse_motion {	2625	sub invoke_mouse_motion {
2419	my ($self, $ev, $x, $y) = @_;	2626	my ($self, $ev, $x, $y) = @_;
2420		2627
…		…
2429	} else {	2636	} else {
2430	return 0;	2637	return 0;
2431	}	2638	}
2432		2639
2433	1	2640	1
		2641	}
		2642
		2643	sub invoke_mouse_wheel {
		2644	my ($self, $ev) = @_;
		2645
		2646	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2647
		2648	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2649
		2650	! ! $delta
2434	}	2651	}
2435		2652
2436	sub update {	2653	sub update {
2437	my ($self) = @_;	2654	my ($self) = @_;
2438		2655
…		…
2487	glDisable GL_TEXTURE_2D;	2704	glDisable GL_TEXTURE_2D;
2488	}	2705	}
2489		2706
2490	#############################################################################	2707	#############################################################################
2491		2708
2492	package CFClient::UI::ValSlider;	2709	package CFPlus::UI::ValSlider;
2493		2710
2494	our @ISA = CFClient::UI::HBox::;	2711	our @ISA = CFPlus::UI::HBox::;
2495		2712
2496	sub new {	2713	sub new {
2497	my ($class, %arg) = @_;	2714	my ($class, %arg) = @_;
2498		2715
2499	my $range = delete $arg{range};	2716	my $range = delete $arg{range};
2500		2717
2501	my $self = $class->SUPER::new (	2718	my $self = $class->SUPER::new (
2502	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2719	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2503	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2720	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2504	to_value => sub { shift },	2721	to_value => sub { shift },
2505	from_value => sub { shift },	2722	from_value => sub { shift },
2506	%arg,	2723	%arg,
2507	);	2724	);
2508		2725
…		…
2528	sub set_range { shift->{slider}->set_range (@_) }	2745	sub set_range { shift->{slider}->set_range (@_) }
2529	sub set_value { shift->{slider}->set_value (@_) }	2746	sub set_value { shift->{slider}->set_value (@_) }
2530		2747
2531	#############################################################################	2748	#############################################################################
2532		2749
2533	package CFClient::UI::TextScroller;	2750	package CFPlus::UI::TextScroller;
2534		2751
2535	our @ISA = CFClient::UI::HBox::;	2752	our @ISA = CFPlus::UI::HBox::;
2536		2753
2537	use CFClient::OpenGL;	2754	use CFPlus::OpenGL;
2538		2755
2539	sub new {	2756	sub new {
2540	my $class = shift;	2757	my $class = shift;
2541		2758
2542	my $self = $class->SUPER::new (	2759	my $self = $class->SUPER::new (
2543	fontsize => 1,	2760	fontsize => 1,
2544	can_events => 0,	2761	can_events => 1,
2545	indent => 0,	2762	indent => 0,
2546	#font => default_font	2763	#font => default_font
2547	@_,	2764	@_,
2548		2765
2549	layout => (new CFClient::Layout 1),	2766	layout => (new CFPlus::Layout),
2550	par => [],	2767	par => [],
2551	height => 0,	2768	height => 0,
2552	children => [	2769	children => [
2553	(new CFClient::UI::Empty expand => 1),	2770	(new CFPlus::UI::Empty expand => 1),
2554	(new CFClient::UI::Slider vertical => 1),	2771	(new CFPlus::UI::Slider vertical => 1),
2555	],	2772	],
2556	);	2773	);
2557		2774
2558	$self->{children}[1]->connect (changed => sub { $self->update });	2775	$self->{children}[1]->connect (changed => sub { $self->update });
2559		2776
…		…
2565		2782
2566	$self->{fontsize} = $fontsize;	2783	$self->{fontsize} = $fontsize;
2567	$self->reflow;	2784	$self->reflow;
2568	}	2785	}
2569		2786
		2787	sub size_request {
		2788	my ($self) = @_;
		2789
		2790	my ($empty, $slider) = @{ $self->{children} };
		2791
		2792	local $self->{children} = [$empty, $slider];
		2793	$self->SUPER::size_request
		2794	}
		2795
2570	sub invoke_size_allocate {	2796	sub invoke_size_allocate {
2571	my ($self, $w, $h) = @_;	2797	my ($self, $w, $h) = @_;
2572		2798
		2799	my ($empty, $slider, @other) = @{ $self->{children} };
		2800	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		2801
2573	$self->{layout}->set_font ($self->{font}) if $self->{font};	2802	$self->{layout}->set_font ($self->{font}) if $self->{font};
2574	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2803	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2575	$self->{layout}->set_width ($self->{children}[0]{w});	2804	$self->{layout}->set_width ($empty->{w});
2576	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2805	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2577		2806
2578	$self->reflow;	2807	$self->reflow;
2579		2808
		2809	local $self->{children} = [$empty, $slider];
2580	$self->SUPER::invoke_size_allocate ($w, $h)	2810	$self->SUPER::invoke_size_allocate ($w, $h)
2581	}	2811	}
2582		2812
2583	sub text_size {	2813	sub invoke_mouse_wheel {
2584	my ($self, $text, $indent) = @_;	2814	my ($self, $ev) = @_;
		2815
		2816	return 0 unless $ev->{dy}; # only vertical movements
		2817
		2818	$self->{children}[1]->emit (mouse_wheel => $ev);
		2819
		2820	1
		2821	}
		2822
		2823	sub get_layout {
		2824	my ($self, $para) = @_;
2585		2825
2586	my $layout = $self->{layout};	2826	my $layout = $self->{layout};
2587		2827
		2828	$layout->set_font ($self->{font}) if $self->{font};
		2829	$layout->set_foreground (@{$para->{fg}});
2588	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2830	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2589	$layout->set_width ($self->{children}[0]{w} - $indent);	2831	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2590	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2832	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2591	$layout->set_markup ($text);	2833	$layout->set_markup ($para->{markup});
		2834
		2835	$layout->set_shapes (
		2836	map
		2837	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2838	@{$para->{widget}}
2592		2839	);
		2840
2593	$layout->size	2841	$layout
2594	}	2842	}
2595		2843
2596	sub reflow {	2844	sub reflow {
2597	my ($self) = @_;	2845	my ($self) = @_;
2598		2846
…		…
2605		2853
2606	# todo: base offset on lines or so, not on pixels	2854	# todo: base offset on lines or so, not on pixels
2607	$self->{children}[1]->set_value ($offset);	2855	$self->{children}[1]->set_value ($offset);
2608	}	2856	}
2609		2857
		2858	sub current_paragraph {
		2859	my ($self) = @_;
		2860
		2861	$self->{top_paragraph} - 1
		2862	}
		2863
		2864	sub scroll_to {
		2865	my ($self, $para) = @_;
		2866
		2867	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2868
		2869	$self->{scroll_to} = $para;
		2870	$self->update;
		2871	}
		2872
2610	sub clear {	2873	sub clear {
2611	my ($self) = @_;	2874	my ($self) = @_;
		2875
		2876	my (undef, undef, @other) = @{ $self->{children} };
		2877	$self->remove ($_) for @other;
2612		2878
2613	$self->{par} = [];	2879	$self->{par} = [];
2614	$self->{height} = 0;	2880	$self->{height} = 0;
2615	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2881	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2616	}	2882	}
2617		2883
2618	sub add_paragraph {	2884	sub add_paragraph {
2619	my ($self, $color, $text, $indent) = @_;	2885	my $self = shift;
2620		2886
2621	for my $line (split /\n/, $text) {	2887	for my $para (@_) {
2622	my ($w, $h) = $self->text_size ($line);	2888	$para = {
		2889	fg => [1, 1, 1, 1],
		2890	indent => 0,
		2891	markup => "",
		2892	widget => [],
		2893	ref $para ? %$para : (markup => $para),
		2894	w => 1e10,
		2895	wrapped => 1,
		2896	};
		2897
		2898	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2899	push @{$self->{par}}, $para;
		2900	}
		2901
		2902	$self->{need_reflow}++;
		2903	$self->update;
		2904	}
		2905
		2906	sub scroll_to_bottom {
		2907	my ($self) = @_;
		2908
		2909	$self->{scroll_to} = $#{$self->{par}};
		2910	$self->update;
		2911	}
		2912
		2913	sub force_uptodate {
		2914	my ($self) = @_;
		2915
		2916	if (delete $self->{need_reflow}) {
		2917	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2918
		2919	my $height = 0;
		2920
		2921	for my $para (@{$self->{par}}) {
		2922	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2923	my $layout = $self->get_layout ($para);
		2924	my ($w, $h) = $layout->size;
		2925
		2926	$para->{w} = $w + $para->{indent};
		2927	$para->{h} = $h;
		2928	$para->{wrapped} = $layout->has_wrapped;
		2929	}
		2930
		2931	$para->{y} = $height;
		2932	$height += $para->{h};
		2933	}
		2934
2623	$self->{height} += $h;	2935	$self->{height} = $height;
2624	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2936	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2625	}
2626		2937
2627	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2938	delete $self->{texture};
		2939	}
		2940
		2941	if (my $paridx = delete $self->{scroll_to}) {
		2942	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2943	}
2628	}	2944	}
2629		2945
2630	sub update {	2946	sub update {
2631	my ($self) = @_;	2947	my ($self) = @_;
2632		2948
…		…
2635	return unless $self->{h} > 0;	2951	return unless $self->{h} > 0;
2636		2952
2637	delete $self->{texture};	2953	delete $self->{texture};
2638		2954
2639	$ROOT->on_post_alloc ($self => sub {	2955	$ROOT->on_post_alloc ($self => sub {
		2956	$self->force_uptodate;
		2957
2640	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2958	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2641		2959
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 {	2960	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2670	glClearColor 0, 0, 0, 0;	2961	glClearColor 0, 0, 0, 0;
2671	glClear GL_COLOR_BUFFER_BIT;	2962	glClear GL_COLOR_BUFFER_BIT;
2672		2963
		2964	package CFPlus::UI::Base;
		2965	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		2966	(0, 0, $self->{w}, $self->{h});
		2967
		2968	my $top = int $self->{children}[1]{range}[0];
		2969
		2970	my $paridx = 0;
		2971	my $top_paragraph;
2673	my $top = int $self->{children}[1]{range}[0];	2972	my $top = int $self->{children}[1]{range}[0];
2674		2973
2675	my $y0 = $top;	2974	my $y0 = $top;
2676	my $y1 = $top + $H;	2975	my $y1 = $top + $H;
2677		2976
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}}) {	2977	for my $para (@{$self->{par}}) {
2689	my $h = $par->[1];	2978	my $h = $para->{h};
		2979	my $y = $para->{y};
2690		2980
2691	if ($y0 < $y + $h && $y < $y1) {	2981	if ($y0 < $y + $h && $y < $y1) {
2692	$layout->set_foreground (@{ $par->[2] });	2982	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		2983
2697	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2984	$layout->render ($para->{indent}, $y - $y0);
2698		2985
2699	glRasterPos $par->[3], $y - $y0;	2986	if (my @w = @{ $para->{widget} }) {
2700	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2987	my @s = $layout->get_shapes;
		2988
		2989	for (@w) {
		2990	my ($dx, $dy) = splice @s, 0, 2, ();
		2991
		2992	$_->{x} = $dx + $para->{indent};
		2993	$_->{y} = $dy + $y - $y0;
		2994
		2995	$_->draw;
		2996	}
		2997	}
2701	}	2998	}
2702		2999
2703	$y += $h;	3000	$paridx++;
		3001	$top_paragraph ||= $paridx if $y >= $top;
2704	}	3002	}
2705		3003
2706	glDisable GL_BLEND;	3004	$self->{top_paragraph} = $top_paragraph;
2707	};	3005	};
2708	});	3006	});
		3007	}
		3008
		3009	sub reconfigure {
		3010	my ($self) = @_;
		3011
		3012	$self->SUPER::reconfigure;
		3013
		3014	$_->{w} = 1e10 for @{ $self->{par} };
		3015	$self->reflow;
2709	}	3016	}
2710		3017
2711	sub _draw {	3018	sub _draw {
2712	my ($self) = @_;	3019	my ($self) = @_;
2713		3020
…		…
2716	glColor 0, 0, 0, 1;	3023	glColor 0, 0, 0, 1;
2717	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3024	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2718	glDisable GL_TEXTURE_2D;	3025	glDisable GL_TEXTURE_2D;
2719		3026
2720	$self->{children}[1]->draw;	3027	$self->{children}[1]->draw;
2721
2722	}	3028	}
2723		3029
2724	#############################################################################	3030	#############################################################################
2725		3031
2726	package CFClient::UI::Animator;	3032	package CFPlus::UI::Animator;
2727		3033
2728	use CFClient::OpenGL;	3034	use CFPlus::OpenGL;
2729		3035
2730	our @ISA = CFClient::UI::Bin::;	3036	our @ISA = CFPlus::UI::Bin::;
2731		3037
2732	sub moveto {	3038	sub moveto {
2733	my ($self, $x, $y) = @_;	3039	my ($self, $x, $y) = @_;
2734		3040
2735	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3041	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2763	glPopMatrix;	3069	glPopMatrix;
2764	}	3070	}
2765		3071
2766	#############################################################################	3072	#############################################################################
2767		3073
2768	package CFClient::UI::Flopper;	3074	package CFPlus::UI::Flopper;
2769		3075
2770	our @ISA = CFClient::UI::Button::;	3076	our @ISA = CFPlus::UI::Button::;
2771		3077
2772	sub new {	3078	sub new {
2773	my $class = shift;	3079	my $class = shift;
2774		3080
2775	my $self = $class->SUPER::new (	3081	my $self = $class->SUPER::new (
…		…
2787	$self->{other}->toggle_visibility;	3093	$self->{other}->toggle_visibility;
2788	}	3094	}
2789		3095
2790	#############################################################################	3096	#############################################################################
2791		3097
2792	package CFClient::UI::Tooltip;	3098	package CFPlus::UI::Tooltip;
2793		3099
2794	our @ISA = CFClient::UI::Bin::;	3100	our @ISA = CFPlus::UI::Bin::;
2795		3101
2796	use CFClient::OpenGL;	3102	use CFPlus::OpenGL;
2797		3103
2798	sub new {	3104	sub new {
2799	my $class = shift;	3105	my $class = shift;
2800		3106
2801	$class->SUPER::new (	3107	$class->SUPER::new (
…		…
2804	)	3110	)
2805	}	3111	}
2806		3112
2807	sub set_tooltip_from {	3113	sub set_tooltip_from {
2808	my ($self, $widget) = @_;	3114	my ($self, $widget) = @_;
		3115
		3116	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3117	if $widget->{tooltip} =~ /^#(.*)$/;
2809		3118
2810	my $tooltip = $widget->{tooltip};	3119	my $tooltip = $widget->{tooltip};
2811		3120
2812	if ($ENV{CFPLUS_DEBUG} & 2) {	3121	if ($ENV{CFPLUS_DEBUG} & 2) {
2813	$tooltip .= "\n\n" . (ref $widget) . "\n"	3122	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2817	}	3126	}
2818		3127
2819	$tooltip =~ s/^\n+//;	3128	$tooltip =~ s/^\n+//;
2820	$tooltip =~ s/\n+$//;	3129	$tooltip =~ s/\n+$//;
2821		3130
2822	$self->add (new CFClient::UI::Label	3131	$self->add (new CFPlus::UI::Label
2823	markup => $tooltip,	3132	markup => $tooltip,
2824	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3133	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2825	fontsize => 0.8,	3134	fontsize => 0.8,
2826	fg => [0, 0, 0, 1],	3135	style => 1, # FLAG_INVERSE
2827	ellipsise => 0,	3136	ellipsise => 0,
2828	font => ($widget->{tooltip_font} || $::FONT_PROP),	3137	font => ($widget->{tooltip_font} || $::FONT_PROP),
2829	);	3138	);
2830	}	3139	}
2831		3140
…		…
2850		3159
2851	$self->{root}->on_post_alloc ("move_$self" => sub {	3160	$self->{root}->on_post_alloc ("move_$self" => sub {
2852	my $widget = $self->{owner}	3161	my $widget = $self->{owner}
2853	or return;	3162	or return;
2854		3163
		3164	if ($widget->{visible}) {
2855	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3165	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2856		3166
2857	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3167	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2858	if $x + $self->{w} > $self->{root}{w};	3168	if $x + $self->{w} > $self->{root}{w};
2859		3169
2860	$self->move_abs ($x, $y);	3170	$self->move_abs ($x, $y);
		3171	} else {
		3172	$self->hide;
		3173	}
2861	});	3174	});
2862	}	3175	}
2863		3176
2864	sub _draw {	3177	sub _draw {
2865	my ($self) = @_;	3178	my ($self) = @_;
…		…
2889	$self->SUPER::_draw;	3202	$self->SUPER::_draw;
2890	}	3203	}
2891		3204
2892	#############################################################################	3205	#############################################################################
2893		3206
2894	package CFClient::UI::Face;	3207	package CFPlus::UI::Face;
2895		3208
2896	our @ISA = CFClient::UI::Base::;	3209	our @ISA = CFPlus::UI::DrawBG::;
2897		3210
2898	use CFClient::OpenGL;	3211	use CFPlus::OpenGL;
2899		3212
2900	sub new {	3213	sub new {
2901	my $class = shift;	3214	my $class = shift;
2902		3215
2903	my $self = $class->SUPER::new (	3216	my $self = $class->SUPER::new (
…		…
2938	sub _draw {	3251	sub _draw {
2939	my ($self) = @_;	3252	my ($self) = @_;
2940		3253
2941	return unless $::CONN;	3254	return unless $::CONN;
2942		3255
		3256	$self->SUPER::_draw;
		3257
2943	my $face;	3258	my $face;
2944		3259
2945	if ($self->{frame}) {	3260	if ($self->{frame}) {
2946	my $anim = $::CONN->{anim}[$self->{anim}];	3261	my $anim = $::CONN->{anim}[$self->{anim}];
2947		3262
…		…
2969	$self->SUPER::destroy;	3284	$self->SUPER::destroy;
2970	}	3285	}
2971		3286
2972	#############################################################################	3287	#############################################################################
2973		3288
2974	package CFClient::UI::Buttonbar;	3289	package CFPlus::UI::Buttonbar;
2975		3290
2976	our @ISA = CFClient::UI::HBox::;	3291	our @ISA = CFPlus::UI::HBox::;
2977		3292
2978	# TODO: should actualyl wrap buttons and other goodies.	3293	# TODO: should actually wrap buttons and other goodies.
2979		3294
2980	#############################################################################	3295	#############################################################################
2981		3296
2982	package CFClient::UI::Menu;	3297	package CFPlus::UI::Menu;
2983		3298
2984	our @ISA = CFClient::UI::FancyFrame::;	3299	our @ISA = CFPlus::UI::Toplevel::;
2985		3300
2986	use CFClient::OpenGL;	3301	use CFPlus::OpenGL;
2987		3302
2988	sub new {	3303	sub new {
2989	my $class = shift;	3304	my $class = shift;
2990		3305
2991	my $self = $class->SUPER::new (	3306	my $self = $class->SUPER::new (
2992	items => [],	3307	items => [],
2993	z => 100,	3308	z => 100,
2994	@_,	3309	@_,
2995	);	3310	);
2996		3311
2997	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3312	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2998		3313
2999	for my $item (@{ $self->{items} }) {	3314	for my $item (@{ $self->{items} }) {
3000	my ($widget, $cb, $tooltip) = @$item;	3315	my ($widget, $cb, $tooltip) = @$item;
3001		3316
3002	# handle various types of items, only text for now	3317	# handle various types of items, only text for now
3003	if (!ref $widget) {	3318	if (!ref $widget) {
		3319	if ($widget =~ /\t/) {
		3320	my ($left, $right) = split /\t/, $widget, 2;
		3321
3004	$widget = new CFClient::UI::Label	3322	$widget = new CFPlus::UI::HBox
3005	can_hover => 1,	3323	can_hover => 1,
3006	can_events => 1,	3324	can_events => 1,
		3325	tooltip => $tooltip,
		3326	children => [
		3327	(new CFPlus::UI::Label markup => $left, expand => 1),
		3328	(new CFPlus::UI::Label markup => $right, align => +1),
		3329	],
		3330	;
		3331
		3332	} else {
		3333	$widget = new CFPlus::UI::Label
		3334	can_hover => 1,
		3335	can_events => 1,
3007	markup => $widget,	3336	markup => $widget,
3008	tooltip => $tooltip	3337	tooltip => $tooltip;
		3338	}
3009	}	3339	}
3010		3340
3011	$self->{item}{$widget} = $item;	3341	$self->{item}{$widget} = $item;
3012		3342
3013	$self->{vbox}->add ($widget);	3343	$self->{vbox}->add ($widget);
…		…
3056	1	3386	1
3057	}	3387	}
3058		3388
3059	#############################################################################	3389	#############################################################################
3060		3390
3061	package CFClient::UI::Multiplexer;	3391	package CFPlus::UI::Multiplexer;
3062		3392
3063	our @ISA = CFClient::UI::Container::;	3393	our @ISA = CFPlus::UI::Container::;
3064		3394
3065	sub new {	3395	sub new {
3066	my $class = shift;	3396	my $class = shift;
3067		3397
3068	my $self = $class->SUPER::new (	3398	my $self = $class->SUPER::new (
…		…
3082		3412
3083	$self->{current} = $self->{children}[0]	3413	$self->{current} = $self->{children}[0]
3084	if @{ $self->{children} };	3414	if @{ $self->{children} };
3085	}	3415	}
3086		3416
		3417	sub get_current_page {
		3418	my ($self) = @_;
		3419
		3420	$self->{current}
		3421	}
		3422
3087	sub set_current_page {	3423	sub set_current_page {
3088	my ($self, $page_or_widget) = @_;	3424	my ($self, $page_or_widget) = @_;
3089		3425
3090	my $widget = ref $page_or_widget	3426	my $widget = ref $page_or_widget
3091	? $page_or_widget	3427	? $page_or_widget
…		…
3123	$self->{current}->draw;	3459	$self->{current}->draw;
3124	}	3460	}
3125		3461
3126	#############################################################################	3462	#############################################################################
3127		3463
3128	package CFClient::UI::Notebook;	3464	package CFPlus::UI::Notebook;
3129		3465
3130	our @ISA = CFClient::UI::VBox::;	3466	our @ISA = CFPlus::UI::VBox::;
3131		3467
3132	sub new {	3468	sub new {
3133	my $class = shift;	3469	my $class = shift;
3134		3470
3135	my $self = $class->SUPER::new (	3471	my $self = $class->SUPER::new (
3136	buttonbar => (new CFClient::UI::Buttonbar),	3472	buttonbar => (new CFPlus::UI::Buttonbar),
3137	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3473	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3138	# filter => # will be put between multiplexer and $self	3474	# filter => # will be put between multiplexer and $self
3139	@_,	3475	@_,
3140	);	3476	);
3141		3477
3142	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3478	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3148	sub add {	3484	sub add {
3149	my ($self, $title, $widget, $tooltip) = @_;	3485	my ($self, $title, $widget, $tooltip) = @_;
3150		3486
3151	Scalar::Util::weaken $self;	3487	Scalar::Util::weaken $self;
3152		3488
3153	$self->{buttonbar}->add (new CFClient::UI::Button	3489	$self->{buttonbar}->add (new CFPlus::UI::Button
3154	markup => $title,	3490	markup => $title,
3155	tooltip => $tooltip,	3491	tooltip => $tooltip,
3156	on_activate => sub { $self->set_current_page ($widget) },	3492	on_activate => sub { $self->set_current_page ($widget) },
3157	);	3493	);
3158		3494
3159	$self->{multiplexer}->add ($widget);	3495	$self->{multiplexer}->add ($widget);
3160	}	3496	}
3161		3497
		3498	sub get_current_page {
		3499	my ($self) = @_;
		3500
		3501	$self->{multiplexer}->get_current_page
		3502	}
		3503
3162	sub set_current_page {	3504	sub set_current_page {
3163	my ($self, $page) = @_;	3505	my ($self, $page) = @_;
3164		3506
3165	$self->{multiplexer}->set_current_page ($page);	3507	$self->{multiplexer}->set_current_page ($page);
3166	$self->emit (page_changed => $self->{multiplexer}{current});	3508	$self->emit (page_changed => $self->{multiplexer}{current});
3167	}	3509	}
3168		3510
3169	#############################################################################	3511	#############################################################################
3170		3512
3171	package CFClient::UI::Combobox;	3513	package CFPlus::UI::Selector;
3172		3514
3173	use utf8;	3515	use utf8;
3174		3516
3175	our @ISA = CFClient::UI::Button::;	3517	our @ISA = CFPlus::UI::Button::;
3176		3518
3177	sub new {	3519	sub new {
3178	my $class = shift;	3520	my $class = shift;
3179		3521
3180	my $self = $class->SUPER::new (	3522	my $self = $class->SUPER::new (
…		…
3197	my ($value, $title, $tooltip) = @$_;	3539	my ($value, $title, $tooltip) = @$_;
3198		3540
3199	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3541	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200	}	3542	}
3201		3543
3202	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3544	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203	}	3545	}
3204		3546
3205	sub _set_value {	3547	sub _set_value {
3206	my ($self, $value) = @_;	3548	my ($self, $value) = @_;
3207		3549
…		…
3222	$self->emit (changed => $value);	3564	$self->emit (changed => $value);
3223	}	3565	}
3224		3566
3225	#############################################################################	3567	#############################################################################
3226		3568
3227	package CFClient::UI::Statusbox;	3569	package CFPlus::UI::Statusbox;
3228		3570
3229	our @ISA = CFClient::UI::VBox::;	3571	our @ISA = CFPlus::UI::VBox::;
3230		3572
3231	sub new {	3573	sub new {
3232	my $class = shift;	3574	my $class = shift;
3233		3575
3234	my $self = $class->SUPER::new (	3576	my $self = $class->SUPER::new (
…		…
3246	sub reorder {	3588	sub reorder {
3247	my ($self) = @_;	3589	my ($self) = @_;
3248	my $NOW = Time::HiRes::time;	3590	my $NOW = Time::HiRes::time;
3249		3591
3250	# freeze display when hovering over any label	3592	# freeze display when hovering over any label
3251	return if $CFClient::UI::TOOLTIP->{owner}	3593	return if $CFPlus::UI::TOOLTIP->{owner}
3252	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3594	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3253	values %{ $self->{item} };	3595	values %{ $self->{item} };
3254		3596
3255	while (my ($k, $v) = each %{ $self->{item} }) {	3597	while (my ($k, $v) = each %{ $self->{item} }) {
3256	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3598	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3257	}	3599	}
…		…
3278	for ($short) {	3620	for ($short) {
3279	s/^\s+//;	3621	s/^\s+//;
3280	s/\s+/ /g;	3622	s/\s+/ /g;
3281	}	3623	}
3282		3624
3283	new CFClient::UI::Label	3625	new CFPlus::UI::Label
3284	markup => $short,	3626	markup => $short,
3285	tooltip => $item->{tooltip},	3627	tooltip => $item->{tooltip},
3286	tooltip_font => $::FONT_PROP,	3628	tooltip_font => $::FONT_PROP,
3287	tooltip_width => 0.67,	3629	tooltip_width => 0.67,
3288	fontsize => $item->{fontsize} || $self->{fontsize},	3630	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3342	count => 1,	3684	count => 1,
3343	%arg,	3685	%arg,
3344	};	3686	};
3345	}	3687	}
3346		3688
		3689	$ROOT->on_refresh (reorder => sub {
3347	$self->reorder;	3690	$self->reorder;
		3691	});
3348	}	3692	}
3349		3693
3350	sub reconfigure {	3694	sub reconfigure {
3351	my ($self) = @_;	3695	my ($self) = @_;
3352		3696
…		…
3365	$self->SUPER::destroy;	3709	$self->SUPER::destroy;
3366	}	3710	}
3367		3711
3368	#############################################################################	3712	#############################################################################
3369		3713
3370	package CFClient::UI::Inventory;	3714	package CFPlus::UI::Inventory;
3371		3715
3372	our @ISA = CFClient::UI::ScrolledWindow::;	3716	our @ISA = CFPlus::UI::Table::;
3373		3717
3374	sub new {	3718	sub new {
3375	my $class = shift;	3719	my $class = shift;
3376		3720
3377	my $self = $class->SUPER::new (	3721	my $self = $class->SUPER::new (
3378	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3722	col_expand => [0, 1, 0],
		3723	items => [],
3379	@_,	3724	@_,
3380	);	3725	);
3381		3726
		3727	$self->set_sort_order (undef);
		3728
3382	$self	3729	$self
		3730	}
		3731
		3732	sub update_items {
		3733	my ($self) = @_;
		3734
		3735	$self->clear;
		3736
		3737	my @item = $self->{sort}->(@{ $self->{items} });
		3738
		3739	my @adds;
		3740	my $row = 0;
		3741	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3742	CFPlus::Item::update_widgets $item;
		3743
		3744	push @adds, 0, $row, $item->{face_widget};
		3745	push @adds, 1, $row, $item->{desc_widget};
		3746	push @adds, 2, $row, $item->{weight_widget};
		3747
		3748	$row++;
		3749	}
		3750
		3751	$self->add (@adds);
		3752	}
		3753
		3754	sub set_sort_order {
		3755	my ($self, $order) = @_;
		3756
		3757	$self->{sort} = $order ||= sub {
		3758	sort {
		3759	$a->{type} <=> $b->{type}
		3760	or $a->{name} cmp $b->{name}
		3761	} @_
		3762	};
		3763
		3764	$self->update_items;
3383	}	3765	}
3384		3766
3385	sub set_items {	3767	sub set_items {
3386	my ($self, $items) = @_;	3768	my ($self, $items) = @_;
3387		3769
3388	$self->{child}->clear;	3770	$self->{items} = [$items ? values %$items : ()];
3389	return unless $items;	3771	$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	}	3772	}
3409		3773
3410	#############################################################################	3774	#############################################################################
3411		3775
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;	3776	package CFPlus::UI::SpellList;
3611		3777
3612	our @ISA = CFClient::UI::Table::;	3778	our @ISA = CFPlus::UI::Table::;
3613		3779
3614	sub new {	3780	sub new {
3615	my $class = shift;	3781	my $class = shift;
3616		3782
3617	my $self = $class->SUPER::new (	3783	my $self = $class->SUPER::new (
…		…
3635	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3801	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3636		3802
3637	sub rebuild_spell_list {	3803	sub rebuild_spell_list {
3638	my ($self) = @_;	3804	my ($self) = @_;
3639		3805
3640	$CFClient::UI::ROOT->on_refresh ($self => sub {	3806	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3641	$self->clear;	3807	$self->clear;
3642		3808
3643	return unless $::CONN;	3809	return unless $::CONN;
3644		3810
3645	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3811	$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);	3812	$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);	3813	$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);	3814	$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);	3815	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3650		3816
3651	my $row = 0;	3817	my $row = 0;
3652		3818
3653	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3819	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3654	my $spell = $self->{spell}{$_};	3820	my $spell = $self->{spell}{$_};
…		…
3661	if ($ev->{button} == 1) {	3827	if ($ev->{button} == 1) {
3662	$::CONN->user_send ("cast $spell->{name}");	3828	$::CONN->user_send ("cast $spell->{name}");
3663	} elsif ($ev->{button} == 2) {	3829	} elsif ($ev->{button} == 2) {
3664	$::CONN->user_send ("invoke $spell->{name}");	3830	$::CONN->user_send ("invoke $spell->{name}");
3665	} elsif ($ev->{button} == 3) {	3831	} elsif ($ev->{button} == 3) {
3666	(new CFClient::UI::Menu	3832	(new CFPlus::UI::Menu
3667	items => [	3833	items => [
3668	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3834	["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}"]) }],	3835	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670	],	3836	],
3671	)->popup ($ev);	3837	)->popup ($ev);
3672	} else {	3838	} else {
3673	return 0;	3839	return 0;
3674	}	3840	}
3675		3841
3676	1	3842	1
3677	};	3843	};
3678		3844
3679	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3845	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3680		3846
3681	#TODO: add path info to tooltip	3847	#TODO: add path info to tooltip
3682	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3848	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3683		3849
3684	$self->add (0, $row, new CFClient::UI::Face	3850	$self->add (0, $row, new CFPlus::UI::Face
3685	face => $spell->{face},	3851	face => $spell->{face},
3686	can_hover => 1,	3852	can_hover => 1,
3687	can_events => 1,	3853	can_events => 1,
3688	tooltip => $tooltip,	3854	tooltip => $tooltip,
3689	on_button_down => $spell_cb,	3855	on_button_down => $spell_cb,
3690	);	3856	);
3691		3857
3692	$self->add (1, $row, new CFClient::UI::Label	3858	$self->add (1, $row, new CFPlus::UI::Label
3693	expand => 1,	3859	expand => 1,
3694	text => $spell->{name},	3860	text => $spell->{name},
3695	can_hover => 1,	3861	can_hover => 1,
3696	can_events => 1,	3862	can_events => 1,
3697	tooltip => $tooltip,	3863	tooltip => $tooltip,
3698	on_button_down => $spell_cb,	3864	on_button_down => $spell_cb,
3699	);	3865	);
3700		3866
3701	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3867	$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);	3868	$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);	3869	$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);	3870	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3705	}	3871	}
3706	});	3872	});
3707	}	3873	}
3708		3874
3709	sub add_spell {	3875	sub add_spell {
…		…
3727	$self->rebuild_spell_list;	3893	$self->rebuild_spell_list;
3728	}	3894	}
3729		3895
3730	#############################################################################	3896	#############################################################################
3731		3897
3732	package CFClient::UI::Root;	3898	package CFPlus::UI::Root;
3733		3899
3734	our @ISA = CFClient::UI::Container::;	3900	our @ISA = CFPlus::UI::Container::;
3735		3901
3736	use List::Util qw(min max);	3902	use List::Util qw(min max);
3737		3903
3738	use CFClient::OpenGL;	3904	use CFPlus::OpenGL;
3739		3905
3740	sub new {	3906	sub new {
3741	my $class = shift;	3907	my $class = shift;
3742		3908
3743	my $self = $class->SUPER::new (	3909	my $self = $class->SUPER::new (
…		…
3919	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4085	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3920		4086
3921	$w = 0 if $w < 0;	4087	$w = 0 if $w < 0;
3922	$h = 0 if $h < 0;	4088	$h = 0 if $h < 0;
3923		4089
		4090	$w = max $widget->{min_w}, $w;
		4091	$h = max $widget->{min_h}, $h;
		4092
		4093	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4094	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4095
		4096	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4097	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4098
3924	$w = int $w + 0.5;	4099	$w = int $w + 0.5;
3925	$h = int $h + 0.5;	4100	$h = int $h + 0.5;
3926		4101
3927	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4102	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3928	$widget->{old_w} = $widget->{w};	4103	$widget->{old_w} = $widget->{w};
…		…
3951	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4126	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3952	glMatrixMode GL_MODELVIEW;	4127	glMatrixMode GL_MODELVIEW;
3953	glLoadIdentity;	4128	glLoadIdentity;
3954		4129
3955	{	4130	{
3956	package CFClient::UI::Base;	4131	package CFPlus::UI::Base;
3957		4132
3958	($draw_x, $draw_y, $draw_w, $draw_h) =	4133	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3959	(0, 0, $self->{w}, $self->{h});	4134	(0, 0, $self->{w}, $self->{h});
3960	}
3961		4135
3962	$self->_draw;	4136	$self->_draw;
		4137	}
3963	}	4138	}
3964		4139
3965	#############################################################################	4140	#############################################################################
3966		4141
3967	package CFClient::UI;	4142	package CFPlus::UI;
3968		4143
3969	$ROOT = new CFClient::UI::Root;	4144	$ROOT = new CFPlus::UI::Root;
3970	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4145	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3971		4146
3972	1	4147	1
3973		4148

Diff Legend

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