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.305 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.348 by root, Thu Aug 17 01:27:28 2006 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8	use Event;	8	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
…		…
79	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	82	if $FOCUS;
82	}	83	}
83		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
84	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	99	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
87		101
88	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
90		106
91	$GRAB = $widget;	107	$GRAB = $widget;
92	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
93		109
94	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
95	}	111	}
96		112
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
98		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
100	if $GRAB;	116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
		122	}
101	}	123	}
102		124
103	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	126	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		127
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		129
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		131
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
112	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		134
114	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	137	$grab->update if $grab;
117	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
118		139
		140	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	141	$TOOLTIP_WATCHER->cb->();
120	}	142	}
121	}	143	}
122		144
123	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
124	my ($ev) = @_;	146	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
126		148
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		150
129	if ($widget != $HOVER) {	151	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		152
132	$hover->update if $hover && $hover->{can_hover};	153	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	154	if $HOVER;
140	}	155	}
141		156
142	# convert position array to integers	157	# convert position array to integers
143	sub harmonize {	158	sub harmonize {
…		…
193	reconfigure_widgets;	208	reconfigure_widgets;
194	}	209	}
195		210
196	#############################################################################	211	#############################################################################
197		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
198	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
199		222
200	use strict;	223	use strict;
201		224
202	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
203		226
204	sub new {	227	sub new {
205	my $class = shift;	228	my $class = shift;
206		229
207	my $self = bless {	230	my $self = bless {
…		…
212	h => undef,	235	h => undef,
213	can_events => 1,	236	can_events => 1,
214	@_	237	@_
215	}, $class;	238	}, $class;
216		239
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		241
219	for (keys %$self) {	242	for (keys %$self) {
220	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
222	}	245	}
223	}	246	}
224		247
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		253
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		256
234	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
247	sub show {	270	sub show {
248	my ($self) = @_;	271	my ($self) = @_;
249		272
250	return if $self->{parent};	273	return if $self->{parent};
251		274
252	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
253	}	276	}
254		277
255	sub set_visible {	278	sub set_visible {
256	my ($self) = @_;	279	my ($self) = @_;
257		280
…		…
278	delete $self->{root};	301	delete $self->{root};
279		302
280	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
282		305
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
285		308
286	$self->emit ("focus_out");	309	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
288	}	311	}
…		…
335	sub size_request {	358	sub size_request {
336	require Carp;	359	require Carp;
337	Carp::confess "size_request is abstract";	360	Carp::confess "size_request is abstract";
338	}	361	}
339		362
		363	sub baseline_shift {
		364	0
		365	}
		366
340	sub configure {	367	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
342		369
343	if ($self->{aspect}) {	370	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
345		372
346	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		375
349	# use alignment to adjust x, y	376	# use alignment to adjust x, y
350		377
351	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
393		420
394	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
395		422
396	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
397		424
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	428	}
402	}	429	}
403		430
404	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
405	sub coord2local {	432	sub coord2local {
406	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
407		434
		435	Carp::confess unless $self->{parent};#d#
		436
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	438	}
410		439
411	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
412	sub coord2global {	441	sub coord2global {
413	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
414		443
		444	Carp::confess unless $self->{parent};#d#
		445
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	447	}
417		448
418	sub invoke_focus_in {	449	sub invoke_focus_in {
419	my ($self) = @_;	450	my ($self) = @_;
420		451
421	return if $FOCUS == $self;	452	return if $FOCUS == $self;
422	return unless $self->{can_focus};	453	return unless $self->{can_focus};
423		454
424	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
425		456
426	$focus->update if $focus;	457	$self->update;
427	$FOCUS->update;
428		458
429	0	459	0
430	}	460	}
431		461
432	sub invoke_focus_out {	462	sub invoke_focus_out {
433	my ($self) = @_;	463	my ($self) = @_;
434		464
435	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
436		466
437	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
438		468
439	$focus->update if $focus; #?	469	$self->update;
440		470
441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	471	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442	unless $FOCUS;	472	unless $FOCUS;
443		473
444	0	474	0
445	}	475	}
446		476
447	sub grab_focus {	477	sub grab_focus {
448	my ($self) = @_;	478	my ($self) = @_;
449		479
		480	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	481	$self->emit ("focus_in");
451	}	482	}
452		483
453	sub invoke_mouse_motion { 1 }	484	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	485	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	486	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
457		489
458	sub invoke_button_down {	490	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
460		492
461	$self->grab_focus;	493	$self->grab_focus;
462		494
463	1	495	0
464	}	496	}
465		497
466	sub connect {	498	sub connect {
467	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
468		500
469	push @{ $self->{signal_cb}{$signal} }, $cb;	501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
470	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
471		515
472	sub emit {	516	sub emit {
473	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
474		518
		519	# I do not really like this solution, but I dislike duplication
		520	# and needlessly verbose code, too.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
		528	#d##TODO# stop propagating at first true, do not use sum
475	(List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before	529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
476	($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure	530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
477	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478	}	532	}
479		533
480	sub find_widget {	534	sub find_widget {
481	my ($self, $x, $y) = @_;	535	my ($self, $x, $y) = @_;
482		536
…		…
534	return unless $self->{h} && $self->{w};	588	return unless $self->{h} && $self->{w};
535		589
536	# update screen rectangle	590	# update screen rectangle
537	local $draw_x = $draw_x + $self->{x};	591	local $draw_x = $draw_x + $self->{x};
538	local $draw_y = $draw_y + $self->{y};	592	local $draw_y = $draw_y + $self->{y};
539	local $draw_w = $draw_x + $self->{w};
540	local $draw_h = $draw_y + $self->{h};
541		593
542	# skip widgets that are entirely outside the drawing area	594	# skip widgets that are entirely outside the drawing area
543	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	595	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	596	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545		597
…		…
568	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
569	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
570	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
571	glEnd;	623	glEnd;
572	glPopMatrix;	624	glPopMatrix;
573	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
574	}	626	}
575		627
576	$self->_draw;	628	$self->_draw;
577	glPopMatrix;	629	glPopMatrix;
578	}	630	}
…		…
584	}	636	}
585		637
586	sub DESTROY {	638	sub DESTROY {
587	my ($self) = @_;	639	my ($self) = @_;
588		640
		641	return if CFPlus::in_destruct;
		642
589	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
590		644
591	eval { $self->destroy };	645	eval { $self->destroy };
592	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
593	}	647	}
594		648
595	#############################################################################	649	#############################################################################
596		650
597	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
598		652
599	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
600		654
601	use strict;	655	use strict;
602	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
603		657
604	sub new {	658	sub new {
605	my $class = shift;	659	my $class = shift;
606		660
607	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
638	}	692	}
639	}	693	}
640		694
641	#############################################################################	695	#############################################################################
642		696
643	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
644		698
645	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
646		700
647	sub new {	701	sub new {
648	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
649	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
650	}	704	}
…		…
657		711
658	sub draw { }	712	sub draw { }
659		713
660	#############################################################################	714	#############################################################################
661		715
662	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
663		717
664	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
665		719
666	sub new {	720	sub new {
667	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
668		722
669	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
678	if $children;	732	if $children;
679		733
680	$self	734	$self
681	}	735	}
682		736
		737	sub realloc {
		738	my ($self) = @_;
		739
		740	$self->{force_realloc} = 1;
		741	$self->{force_size_alloc} = 1;
		742	$self->SUPER::realloc;
		743	}
		744
683	sub add {	745	sub add {
684	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
685		747
686	$_->set_parent ($self)	748	$_->set_parent ($self)
687	for @widgets;	749	for @widgets;
…		…
747	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
748	}	810	}
749		811
750	#############################################################################	812	#############################################################################
751		813
752	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
753		815
754	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
755		817
756	sub new {	818	sub new {
757	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
758		820
759	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
760		822
761	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
762	}	824	}
763		825
764	sub add {	826	sub add {
…		…
771	sub remove {	833	sub remove {
772	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
773		835
774	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
775		837
776	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
777	unless @{$self->{children}};	839	unless @{$self->{children}};
778	}	840	}
779		841
780	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
781		843
…		…
793		855
794	#############################################################################	856	#############################################################################
795		857
796	# back-buffered drawing area	858	# back-buffered drawing area
797		859
798	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
799		861
800	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
801		863
802	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
803		865
804	sub new {	866	sub new {
805	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
806		868
807	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
829	}	891	}
830		892
831	sub render_child {	893	sub render_child {
832	my ($self) = @_;	894	my ($self) = @_;
833		895
834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	896	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
835	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
836	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
837		899
838	{	900	{
839	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
840		902
841	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
842	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
843	}	905	}
844		906
…		…
847	}	909	}
848		910
849	sub _draw {	911	sub _draw {
850	my ($self) = @_;	912	my ($self) = @_;
851		913
852	my ($w, $h) = @$self{qw(w h)};
853
854	my $tex = $self->{texture}	914	my $tex = $self->{texture}
855	or return;	915	or return;
856		916
857	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
860		920
861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
862		922
863	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
864	}	924	}
865		925
866	#############################################################################	926	#############################################################################
867		927
868	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
869		929
870	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
871		931
872	sub new {	932	sub new {
873	my $class = shift;	933	my $class = shift;
874		934
875	$class->SUPER::new (	935	$class->SUPER::new (
…		…
935	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
937	) {	997	) {
938	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
939	} else {	999	} else {
940	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
941	}	1001	}
942	}	1002	}
943		1003
944	sub _render {	1004	sub _render {
945	my ($self) = @_;	1005	my ($self) = @_;
946		1006
947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1007	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1008	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
949		1009
950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951		1011
952	$self->SUPER::_render;	1012	$self->SUPER::_render;
953	}	1013	}
954		1014
955	#############################################################################	1015	#############################################################################
956		1016
957	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
958		1018
959	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
960		1020
961	sub new {	1021	sub new {
962	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
963		1023
964	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
965		1025
966	my $self;	1026	my $self;
967		1027
968	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
969	vertical => 1,	1029	vertical => 1,
970	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
971	on_changed => sub {	1031	on_changed => sub {
972	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
973	},	1033	},
974	;	1034	;
975		1035
976	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
977	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
		1038	can_events => 1,
978	slider => $slider,	1039	slider => $slider,
979	%arg,	1040	%arg,
980	);	1041	);
981		1042
982	$self->SUPER::add ($self->{vp}, $self->{slider});	1043	$self->SUPER::add ($self->{vp}, $self->{slider});
983	$self->add ($child) if $child;	1044	$self->add ($child) if $child;
984		1045
985	$self	1046	$self
986	}	1047	}
987		1048
		1049	#TODO# update range on size_allocate depending on child
		1050
988	sub add {	1051	sub add {
989	my ($self, $widget) = @_;	1052	my ($self, $widget) = @_;
990		1053
991	$self->{vp}->add ($self->{child} = $widget);	1054	$self->{vp}->add ($self->{child} = $widget);
992	}	1055	}
993		1056
		1057	sub invoke_mouse_wheel {
		1058	my ($self, $ev) = @_;
		1059
		1060	return 0 unless $ev->{dy}; # only vertical movements
		1061
		1062	$self->{slider}->emit (mouse_wheel => $ev);
		1063
		1064	1
		1065	}
		1066
		1067	sub update_slider {
		1068	my ($self) = @_;
		1069
		1070	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1071	}
		1072
994	sub update {	1073	sub update {
995	my ($self) = @_;	1074	my ($self) = @_;
996		1075
997	$self->SUPER::update;	1076	$self->SUPER::update;
998		1077
999	# todo: overwrite size_allocate of child	1078	$self->update_slider;
1000	my $child = $self->{vp}->child;
1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002	}	1079	}
1003		1080
1004	sub invoke_size_allocate {	1081	sub invoke_size_allocate {
1005	my ($self, $w, $h) = @_;	1082	my ($self, $w, $h) = @_;
1006		1083
1007	my $child = $self->{vp}->child;	1084	$self->update_slider;
1008	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009		1085
1010	$self->SUPER::invoke_size_allocate ($w, $h)	1086	$self->SUPER::invoke_size_allocate ($w, $h)
1011	}	1087	}
1012		1088
1013	#TODO# update range on size_allocate depending on child
1014	# update viewport offset on scroll
1015
1016	#############################################################################	1089	#############################################################################
1017		1090
1018	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
1019		1092
1020	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
1021		1094
1022	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
1023		1096
1024	sub new {	1097	sub new {
1025	my $class = shift;	1098	my $class = shift;
1026		1099
1027	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
1053	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
1054	}	1127	}
1055		1128
1056	#############################################################################	1129	#############################################################################
1057		1130
1058	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
1059		1132
1060	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
1061		1134
1062	use CFClient::OpenGL;	1135	use CFPlus::OpenGL;
		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 = "";
1792	} elsif ($uni == 27) {	1973	} elsif ($uni == 27) {
1793	$self->emit ('escape');	1974	$self->emit ('escape');
1794	} elsif ($uni) {	1975	} elsif ($uni) {
1795	substr $text, $self->{cursor}++, 0, chr $uni;	1976	substr $text, $self->{cursor}++, 0, chr $uni;
1796	} else {	1977	} else {
…		…
1819		2000
1820	my $idx = $self->{layout}->xy_to_index ($x, $y);	2001	my $idx = $self->{layout}->xy_to_index ($x, $y);
1821		2002
1822	# byte-index to char-index	2003	# byte-index to char-index
1823	my $text = $self->{text};	2004	my $text = $self->{text};
1824	utf8::encode $text;	2005	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825	$self->{cursor} = length substr $text, 0, $idx;	2006	$self->{cursor} = length $text;
1826		2007
1827	$self->_set_text ($self->{text});	2008	$self->_set_text ($self->{text});
1828	$self->update;	2009	$self->update;
1829		2010
1830	1	2011	1
…		…
1869	utf8::encode $text;	2050	utf8::encode $text;
1870		2051
1871	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2052	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1872	}	2053	}
1873		2054
1874	glColor @{$self->{fg}};
1875	glBegin GL_LINES;	2055	glBegin GL_LINES;
1876	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2056	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};	2057	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878	glEnd;	2058	glEnd;
1879	}	2059	}
1880	}	2060	}
1881		2061
1882	package CFClient::UI::Entry;	2062	package CFPlus::UI::Entry;
1883		2063
1884	our @ISA = CFClient::UI::EntryBase::;	2064	our @ISA = CFPlus::UI::EntryBase::;
1885		2065
1886	use CFClient::OpenGL;	2066	use CFPlus::OpenGL;
1887		2067
1888	sub invoke_key_down {	2068	sub invoke_key_down {
1889	my ($self, $ev) = @_;	2069	my ($self, $ev) = @_;
1890		2070
1891	my $sym = $ev->{sym};	2071	my $sym = $ev->{sym};
1892		2072
1893	if ($sym == 13) {	2073	if ($sym == 13) {
1894	unshift @{$self->{history}},	2074	unshift @{$self->{history}},
1895	my $txt = $self->get_text;	2075	my $txt = $self->get_text;
		2076
1896	$self->{history_pointer} = -1;	2077	$self->{history_pointer} = -1;
1897	$self->{history_saveback} = '';	2078	$self->{history_saveback} = '';
1898	$self->emit (activate => $txt);	2079	$self->emit (activate => $txt);
1899	$self->update;	2080	$self->update;
1900		2081
1901	} elsif ($sym == CFClient::SDLK_UP) {	2082	} elsif ($sym == CFPlus::SDLK_UP) {
1902	if ($self->{history_pointer} < 0) {	2083	if ($self->{history_pointer} < 0) {
1903	$self->{history_saveback} = $self->get_text;	2084	$self->{history_saveback} = $self->get_text;
1904	}	2085	}
1905	if (@{$self->{history} || []} > 0) {	2086	if (@{$self->{history} || []} > 0) {
1906	$self->{history_pointer}++;	2087	$self->{history_pointer}++;
…		…
1908	$self->{history_pointer} = @{$self->{history} || []} - 1;	2089	$self->{history_pointer} = @{$self->{history} || []} - 1;
1909	}	2090	}
1910	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2091	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1911	}	2092	}
1912		2093
1913	} elsif ($sym == CFClient::SDLK_DOWN) {	2094	} elsif ($sym == CFPlus::SDLK_DOWN) {
1914	$self->{history_pointer}--;	2095	$self->{history_pointer}--;
1915	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2096	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1916		2097
1917	if ($self->{history_pointer} >= 0) {	2098	if ($self->{history_pointer} >= 0) {
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2099	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1927	1	2108	1
1928	}	2109	}
1929		2110
1930	#############################################################################	2111	#############################################################################
1931		2112
1932	package CFClient::UI::Button;	2113	package CFPlus::UI::Button;
1933		2114
1934	our @ISA = CFClient::UI::Label::;	2115	our @ISA = CFPlus::UI::Label::;
1935		2116
1936	use CFClient::OpenGL;	2117	use CFPlus::OpenGL;
1937		2118
1938	my @tex =	2119	my @tex =
1939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2120	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1940	qw(b1_button_active.png);	2121	qw(b1_button_active.png);
1941		2122
1942	sub new {	2123	sub new {
1943	my $class = shift;	2124	my $class = shift;
1944		2125
…		…
1981	$self->SUPER::_draw;	2162	$self->SUPER::_draw;
1982	}	2163	}
1983		2164
1984	#############################################################################	2165	#############################################################################
1985		2166
		2167	package CFPlus::UI::CheckBox;
		2168
		2169	our @ISA = CFPlus::UI::DrawBG::;
		2170
		2171	my @tex =
		2172	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2173	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2174
		2175	use CFPlus::OpenGL;
		2176
		2177	sub new {
		2178	my $class = shift;
		2179
		2180	$class->SUPER::new (
		2181	padding_x => 2,
		2182	padding_y => 2,
		2183	fg => [1, 1, 1],
		2184	active_fg => [1, 1, 0],
		2185	bg => [0, 0, 0, 0.2],
		2186	active_bg => [1, 1, 1, 0.5],
		2187	state => 0,
		2188	can_hover => 1,
		2189	@_
		2190	)
		2191	}
		2192
		2193	sub size_request {
		2194	my ($self) = @_;
		2195
		2196	(6) x 2
		2197	}
		2198
		2199	sub toggle {
		2200	my ($self) = @_;
		2201
		2202	$self->{state} = !$self->{state};
		2203	$self->emit (changed => $self->{state});
		2204	$self->update;
		2205	}
		2206
		2207	sub invoke_button_down {
		2208	my ($self, $ev, $x, $y) = @_;
		2209
		2210	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2211	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2212	$self->toggle;
		2213	} else {
		2214	return 0
		2215	}
		2216
		2217	1
		2218	}
		2219
		2220	sub _draw {
		2221	my ($self) = @_;
		2222
		2223	$self->SUPER::_draw;
		2224
		2225	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2226
		2227	my ($w, $h) = @$self{qw(w h)};
		2228
		2229	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2230
		2231	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2232
		2233	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2234
		2235	glEnable GL_TEXTURE_2D;
		2236	$tex->draw_quad_alpha (0, 0, $s, $s);
		2237	glDisable GL_TEXTURE_2D;
		2238	}
		2239
		2240	#############################################################################
		2241
		2242	package CFPlus::UI::Image;
		2243
		2244	our @ISA = CFPlus::UI::Base::;
		2245
		2246	use CFPlus::OpenGL;
		2247
		2248	our %texture_cache;
		2249
		2250	sub new {
		2251	my $class = shift;
		2252
		2253	my $self = $class->SUPER::new (
		2254	can_events => 0,
		2255	@_,
		2256	);
		2257
		2258	$self->{path} || $self->{tex}
		2259	or Carp::croak "'path' or 'tex' attributes required";
		2260
		2261	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2262	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2263
		2264	Scalar::Util::weaken $texture_cache{$self->{path}};
		2265
		2266	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2267
		2268	$self
		2269	}
		2270
		2271	sub STORABLE_freeze {
		2272	my ($self, $cloning) = @_;
		2273
		2274	$self->{path}
		2275	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2276
		2277	$self->{path}
		2278	}
		2279
		2280	sub STORABLE_attach {
		2281	my ($self, $cloning, $path) = @_;
		2282
		2283	$self->new (path => $path)
		2284	}
		2285
		2286	sub size_request {
		2287	my ($self) = @_;
		2288
		2289	($self->{tex}{w}, $self->{tex}{h})
		2290	}
		2291
		2292	sub _draw {
		2293	my ($self) = @_;
		2294
		2295	my $tex = $self->{tex};
		2296
		2297	my ($w, $h) = ($self->{w}, $self->{h});
		2298
		2299	if ($self->{rot90}) {
		2300	glRotate 90, 0, 0, 1;
		2301	glTranslate 0, -$self->{w}, 0;
		2302
		2303	($w, $h) = ($h, $w);
		2304	}
		2305
		2306	glEnable GL_TEXTURE_2D;
		2307	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2308
		2309	$tex->draw_quad (0, 0, $w, $h);
		2310
		2311	glDisable GL_TEXTURE_2D;
		2312	}
		2313
		2314	#############################################################################
		2315
1986	package CFClient::UI::ImageButton;	2316	package CFPlus::UI::ImageButton;
1987		2317
1988	our @ISA = CFClient::UI::Image::;	2318	our @ISA = CFPlus::UI::Image::;
1989		2319
1990	use CFClient::OpenGL;	2320	use CFPlus::OpenGL;
1991		2321
1992	my %textures;	2322	my %textures;
1993		2323
1994	sub new {	2324	sub new {
1995	my $class = shift;	2325	my $class = shift;
…		…
2017	1	2347	1
2018	}	2348	}
2019		2349
2020	#############################################################################	2350	#############################################################################
2021		2351
2022	package CFClient::UI::CheckBox;
2023
2024	our @ISA = CFClient::UI::DrawBG::;
2025
2026	my @tex =
2027	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2028	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2029
2030	use CFClient::OpenGL;
2031
2032	sub new {
2033	my $class = shift;
2034
2035	$class->SUPER::new (
2036	padding_x => 2,
2037	padding_y => 2,
2038	fg => [1, 1, 1],
2039	active_fg => [1, 1, 0],
2040	bg => [0, 0, 0, 0.2],
2041	active_bg => [1, 1, 1, 0.5],
2042	state => 0,
2043	can_hover => 1,
2044	@_
2045	)
2046	}
2047
2048	sub size_request {
2049	my ($self) = @_;
2050
2051	(6) x 2
2052	}
2053
2054	sub invoke_button_down {
2055	my ($self, $ev, $x, $y) = @_;
2056
2057	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2058	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2059	$self->{state} = !$self->{state};
2060	$self->emit (changed => $self->{state});
2061	} else {
2062	return 0
2063	}
2064
2065	1
2066	}
2067
2068	sub _draw {
2069	my ($self) = @_;
2070
2071	$self->SUPER::_draw;
2072
2073	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2074
2075	my ($w, $h) = @$self{qw(w h)};
2076
2077	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2078
2079	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2080
2081	my $tex = $self->{state} ? $tex[1] : $tex[0];
2082
2083	glEnable GL_TEXTURE_2D;
2084	$tex->draw_quad_alpha (0, 0, $s, $s);
2085	glDisable GL_TEXTURE_2D;
2086	}
2087
2088	#############################################################################
2089
2090	package CFClient::UI::Image;	2352	package CFPlus::UI::VGauge;
2091		2353
2092	our @ISA = CFClient::UI::Base::;	2354	our @ISA = CFPlus::UI::Base::;
2093
2094	use CFClient::OpenGL;
2095	use Carp qw/confess/;
2096
2097	our %loaded_images;
2098
2099	sub new {
2100	my $class = shift;
2101
2102	my $self = $class->SUPER::new (can_events => 0, @_);
2103
2104	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2105
2106	$loaded_images{$self->{image}} ||=
2107	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2108
2109	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2110
2111	Scalar::Util::weaken $loaded_images{$self->{image}};
2112
2113	$self->{aspect} = $tex->{w} / $tex->{h};
2114
2115	$self
2116	}
2117
2118	sub size_request {
2119	my ($self) = @_;
2120
2121	($self->{tex}->{w}, $self->{tex}->{h})
2122	}
2123
2124	sub _draw {
2125	my ($self) = @_;
2126
2127	my $tex = $self->{tex};
2128
2129	my ($w, $h) = ($self->{w}, $self->{h});
2130
2131	if ($self->{rot90}) {
2132	glRotate 90, 0, 0, 1;
2133	glTranslate 0, -$self->{w}, 0;
2134
2135	($w, $h) = ($h, $w);
2136	}
2137
2138	glEnable GL_TEXTURE_2D;
2139	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2140
2141	$tex->draw_quad_alpha (0, 0, $w, $h);
2142
2143	glDisable GL_TEXTURE_2D;
2144	}
2145
2146	#############################################################################
2147
2148	package CFClient::UI::VGauge;
2149
2150	our @ISA = CFClient::UI::Base::;
2151		2355
2152	use List::Util qw(min max);	2356	use List::Util qw(min max);
2153		2357
2154	use CFClient::OpenGL;	2358	use CFPlus::OpenGL;
2155		2359
2156	my %tex = (	2360	my %tex = (
2157	food => [	2361	food => [
2158	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2159	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2363	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2160	],	2364	],
2161	grace => [	2365	grace => [
2162	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2366	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2163	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2367	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2164	],	2368	],
2165	hp => [	2369	hp => [
2166	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2370	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2167	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2371	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2168	],	2372	],
2169	mana => [	2373	mana => [
2170	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2374	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2375	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2172	],	2376	],
2173	);	2377	);
2174		2378
2175	# eg. VGauge->new (gauge => 'food'), default gauge: food	2379	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2235	my $ycut1 = max 0, min 1, $ycut;	2439	my $ycut1 = max 0, min 1, $ycut;
2236	my $ycut2 = max 0, min 1, $ycut - 1;	2440	my $ycut2 = max 0, min 1, $ycut - 1;
2237		2441
2238	my $h1 = $self->{h} * (1 - $ycut1);	2442	my $h1 = $self->{h} * (1 - $ycut1);
2239	my $h2 = $self->{h} * (1 - $ycut2);	2443	my $h2 = $self->{h} * (1 - $ycut2);
		2444	my $h3 = $self->{h};
		2445
		2446	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2240		2447
2241	glEnable GL_BLEND;	2448	glEnable GL_BLEND;
2242	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2449	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2450	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244	glEnable GL_TEXTURE_2D;	2451	glEnable GL_TEXTURE_2D;
…		…
2263		2470
2264	if ($t3) {	2471	if ($t3) {
2265	glBindTexture GL_TEXTURE_2D, $t3->{name};	2472	glBindTexture GL_TEXTURE_2D, $t3->{name};
2266	glBegin GL_QUADS;	2473	glBegin GL_QUADS;
2267	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2474	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2268	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2475	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2269	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2476	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2270	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2477	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2271	glEnd;	2478	glEnd;
2272	}	2479	}
2273		2480
2274	glDisable GL_BLEND;	2481	glDisable GL_BLEND;
2275	glDisable GL_TEXTURE_2D;	2482	glDisable GL_TEXTURE_2D;
2276	}	2483	}
2277		2484
2278	#############################################################################	2485	#############################################################################
2279		2486
2280	package CFClient::UI::Gauge;	2487	package CFPlus::UI::Gauge;
2281		2488
2282	our @ISA = CFClient::UI::VBox::;	2489	our @ISA = CFPlus::UI::VBox::;
2283		2490
2284	sub new {	2491	sub new {
2285	my ($class, %arg) = @_;	2492	my ($class, %arg) = @_;
2286		2493
2287	my $self = $class->SUPER::new (	2494	my $self = $class->SUPER::new (
…		…
2289	can_hover => 1,	2496	can_hover => 1,
2290	can_events => 1,	2497	can_events => 1,
2291	%arg,	2498	%arg,
2292	);	2499	);
2293		2500
2294	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2501	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2295	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2502	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2296	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2503	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2297		2504
2298	$self	2505	$self
2299	}	2506	}
2300		2507
2301	sub set_fontsize {	2508	sub set_fontsize {
…		…
2322	$self->{value}->set_text ($val);	2529	$self->{value}->set_text ($val);
2323	}	2530	}
2324		2531
2325	#############################################################################	2532	#############################################################################
2326		2533
2327	package CFClient::UI::Slider;	2534	package CFPlus::UI::Slider;
2328		2535
2329	use strict;	2536	use strict;
2330		2537
2331	use CFClient::OpenGL;	2538	use CFPlus::OpenGL;
2332		2539
2333	our @ISA = CFClient::UI::DrawBG::;	2540	our @ISA = CFPlus::UI::DrawBG::;
2334		2541
2335	my @tex =	2542	my @tex =
2336	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2543	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2337	qw(s1_slider.png s1_slider_bg.png);	2544	qw(s1_slider.png s1_slider_bg.png);
2338		2545
2339	sub new {	2546	sub new {
2340	my $class = shift;	2547	my $class = shift;
2341		2548
…		…
2409		2616
2410	$self->SUPER::invoke_button_down ($ev, $x, $y);	2617	$self->SUPER::invoke_button_down ($ev, $x, $y);
2411		2618
2412	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2619	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413		2620
2414	$self->mouse_motion ($ev, $x, $y)	2621	$self->invoke_mouse_motion ($ev, $x, $y)
2415	}	2622	}
2416		2623
2417	sub invoke_mouse_motion {	2624	sub invoke_mouse_motion {
2418	my ($self, $ev, $x, $y) = @_;	2625	my ($self, $ev, $x, $y) = @_;
2419		2626
…		…
2428	} else {	2635	} else {
2429	return 0;	2636	return 0;
2430	}	2637	}
2431		2638
2432	1	2639	1
		2640	}
		2641
		2642	sub invoke_mouse_wheel {
		2643	my ($self, $ev) = @_;
		2644
		2645	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2646
		2647	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2648
		2649	! ! $delta
2433	}	2650	}
2434		2651
2435	sub update {	2652	sub update {
2436	my ($self) = @_;	2653	my ($self) = @_;
2437		2654
…		…
2486	glDisable GL_TEXTURE_2D;	2703	glDisable GL_TEXTURE_2D;
2487	}	2704	}
2488		2705
2489	#############################################################################	2706	#############################################################################
2490		2707
2491	package CFClient::UI::ValSlider;	2708	package CFPlus::UI::ValSlider;
2492		2709
2493	our @ISA = CFClient::UI::HBox::;	2710	our @ISA = CFPlus::UI::HBox::;
2494		2711
2495	sub new {	2712	sub new {
2496	my ($class, %arg) = @_;	2713	my ($class, %arg) = @_;
2497		2714
2498	my $range = delete $arg{range};	2715	my $range = delete $arg{range};
2499		2716
2500	my $self = $class->SUPER::new (	2717	my $self = $class->SUPER::new (
2501	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2718	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2502	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2719	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2503	to_value => sub { shift },	2720	to_value => sub { shift },
2504	from_value => sub { shift },	2721	from_value => sub { shift },
2505	%arg,	2722	%arg,
2506	);	2723	);
2507		2724
…		…
2527	sub set_range { shift->{slider}->set_range (@_) }	2744	sub set_range { shift->{slider}->set_range (@_) }
2528	sub set_value { shift->{slider}->set_value (@_) }	2745	sub set_value { shift->{slider}->set_value (@_) }
2529		2746
2530	#############################################################################	2747	#############################################################################
2531		2748
2532	package CFClient::UI::TextScroller;	2749	package CFPlus::UI::TextScroller;
2533		2750
2534	our @ISA = CFClient::UI::HBox::;	2751	our @ISA = CFPlus::UI::HBox::;
2535		2752
2536	use CFClient::OpenGL;	2753	use CFPlus::OpenGL;
2537		2754
2538	sub new {	2755	sub new {
2539	my $class = shift;	2756	my $class = shift;
2540		2757
2541	my $self = $class->SUPER::new (	2758	my $self = $class->SUPER::new (
2542	fontsize => 1,	2759	fontsize => 1,
2543	can_events => 0,	2760	can_events => 1,
2544	indent => 0,	2761	indent => 0,
2545	#font => default_font	2762	#font => default_font
2546	@_,	2763	@_,
2547		2764
2548	layout => (new CFClient::Layout 1),	2765	layout => (new CFPlus::Layout),
2549	par => [],	2766	par => [],
2550	height => 0,	2767	height => 0,
2551	children => [	2768	children => [
2552	(new CFClient::UI::Empty expand => 1),	2769	(new CFPlus::UI::Empty expand => 1),
2553	(new CFClient::UI::Slider vertical => 1),	2770	(new CFPlus::UI::Slider vertical => 1),
2554	],	2771	],
2555	);	2772	);
2556		2773
2557	$self->{children}[1]->connect (changed => sub { $self->update });	2774	$self->{children}[1]->connect (changed => sub { $self->update });
2558		2775
…		…
2564		2781
2565	$self->{fontsize} = $fontsize;	2782	$self->{fontsize} = $fontsize;
2566	$self->reflow;	2783	$self->reflow;
2567	}	2784	}
2568		2785
		2786	sub size_request {
		2787	my ($self) = @_;
		2788
		2789	my ($empty, $slider) = @{ $self->{children} };
		2790
		2791	local $self->{children} = [$empty, $slider];
		2792	$self->SUPER::size_request
		2793	}
		2794
2569	sub invoke_size_allocate {	2795	sub invoke_size_allocate {
2570	my ($self, $w, $h) = @_;	2796	my ($self, $w, $h) = @_;
2571		2797
		2798	my ($empty, $slider, @other) = @{ $self->{children} };
		2799	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		2800
2572	$self->{layout}->set_font ($self->{font}) if $self->{font};	2801	$self->{layout}->set_font ($self->{font}) if $self->{font};
2573	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2802	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2574	$self->{layout}->set_width ($self->{children}[0]{w});	2803	$self->{layout}->set_width ($empty->{w});
2575	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2804	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2576		2805
2577	$self->reflow;	2806	$self->reflow;
2578		2807
		2808	local $self->{children} = [$empty, $slider];
2579	$self->SUPER::invoke_size_allocate ($w, $h)	2809	$self->SUPER::invoke_size_allocate ($w, $h)
2580	}	2810	}
2581		2811
2582	sub text_size {	2812	sub invoke_mouse_wheel {
2583	my ($self, $text, $indent) = @_;	2813	my ($self, $ev) = @_;
		2814
		2815	return 0 unless $ev->{dy}; # only vertical movements
		2816
		2817	$self->{children}[1]->emit (mouse_wheel => $ev);
		2818
		2819	1
		2820	}
		2821
		2822	sub get_layout {
		2823	my ($self, $para) = @_;
2584		2824
2585	my $layout = $self->{layout};	2825	my $layout = $self->{layout};
2586		2826
		2827	$layout->set_font ($self->{font}) if $self->{font};
		2828	$layout->set_foreground (@{$para->{fg}});
2587	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2829	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588	$layout->set_width ($self->{children}[0]{w} - $indent);	2830	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2589	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2831	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590	$layout->set_markup ($text);	2832	$layout->set_markup ($para->{markup});
		2833
		2834	$layout->set_shapes (
		2835	map
		2836	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2837	@{$para->{widget}}
2591		2838	);
		2839
2592	$layout->size	2840	$layout
2593	}	2841	}
2594		2842
2595	sub reflow {	2843	sub reflow {
2596	my ($self) = @_;	2844	my ($self) = @_;
2597		2845
…		…
2604		2852
2605	# todo: base offset on lines or so, not on pixels	2853	# todo: base offset on lines or so, not on pixels
2606	$self->{children}[1]->set_value ($offset);	2854	$self->{children}[1]->set_value ($offset);
2607	}	2855	}
2608		2856
		2857	sub current_paragraph {
		2858	my ($self) = @_;
		2859
		2860	$self->{top_paragraph} - 1
		2861	}
		2862
		2863	sub scroll_to {
		2864	my ($self, $para) = @_;
		2865
		2866	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2867
		2868	$self->{scroll_to} = $para;
		2869	$self->update;
		2870	}
		2871
2609	sub clear {	2872	sub clear {
2610	my ($self) = @_;	2873	my ($self) = @_;
		2874
		2875	my (undef, undef, @other) = @{ $self->{children} };
		2876	$self->remove ($_) for @other;
2611		2877
2612	$self->{par} = [];	2878	$self->{par} = [];
2613	$self->{height} = 0;	2879	$self->{height} = 0;
2614	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2880	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2615	}	2881	}
2616		2882
2617	sub add_paragraph {	2883	sub add_paragraph {
2618	my ($self, $color, $text, $indent) = @_;	2884	my $self = shift;
2619		2885
2620	for my $line (split /\n/, $text) {	2886	for my $para (@_) {
2621	my ($w, $h) = $self->text_size ($line);	2887	$para = {
		2888	fg => [1, 1, 1, 1],
		2889	indent => 0,
		2890	markup => "",
		2891	widget => [],
		2892	ref $para ? %$para : (markup => $para),
		2893	w => 1e10,
		2894	wrapped => 1,
		2895	};
		2896
		2897	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2898	push @{$self->{par}}, $para;
		2899	}
		2900
		2901	$self->{need_reflow}++;
		2902	$self->update;
		2903	}
		2904
		2905	sub scroll_to_bottom {
		2906	my ($self) = @_;
		2907
		2908	$self->{scroll_to} = $#{$self->{par}};
		2909	$self->update;
		2910	}
		2911
		2912	sub force_uptodate {
		2913	my ($self) = @_;
		2914
		2915	if (delete $self->{need_reflow}) {
		2916	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2917
		2918	my $height = 0;
		2919
		2920	for my $para (@{$self->{par}}) {
		2921	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2922	my $layout = $self->get_layout ($para);
		2923	my ($w, $h) = $layout->size;
		2924
		2925	$para->{w} = $w + $para->{indent};
		2926	$para->{h} = $h;
		2927	$para->{wrapped} = $layout->has_wrapped;
		2928	}
		2929
		2930	$para->{y} = $height;
		2931	$height += $para->{h};
		2932	}
		2933
2622	$self->{height} += $h;	2934	$self->{height} = $height;
2623	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2935	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2624	}
2625		2936
2626	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2937	delete $self->{texture};
		2938	}
		2939
		2940	if (my $paridx = delete $self->{scroll_to}) {
		2941	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2942	}
2627	}	2943	}
2628		2944
2629	sub update {	2945	sub update {
2630	my ($self) = @_;	2946	my ($self) = @_;
2631		2947
…		…
2634	return unless $self->{h} > 0;	2950	return unless $self->{h} > 0;
2635		2951
2636	delete $self->{texture};	2952	delete $self->{texture};
2637		2953
2638	$ROOT->on_post_alloc ($self => sub {	2954	$ROOT->on_post_alloc ($self => sub {
		2955	$self->force_uptodate;
		2956
2639	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2957	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640		2958
2641	if (delete $self->{need_reflow}) {
2642	my $height = 0;
2643
2644	my $layout = $self->{layout};
2645
2646	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2647
2648	for (@{$self->{par}}) {
2649	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2650	$layout->set_width ($W - $_->[3]);
2651	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2652	$layout->set_markup ($_->[4]);
2653	my ($w, $h) = $layout->size;
2654	$_->[0] = $w + $_->[3];
2655	$_->[1] = $h;
2656	}
2657
2658	$height += $_->[1];
2659	}
2660
2661	$self->{height} = $height;
2662
2663	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2664
2665	delete $self->{texture};
2666	}
2667
2668	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2959	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2669	glClearColor 0, 0, 0, 0;	2960	glClearColor 0, 0, 0, 0;
2670	glClear GL_COLOR_BUFFER_BIT;	2961	glClear GL_COLOR_BUFFER_BIT;
2671		2962
2672	my $top = int $self->{children}[1]{range}[0];	2963	my $top = int $self->{children}[1]{range}[0];
2673		2964
		2965	my $paridx = 0;
		2966	my $top_paragraph;
		2967	my $top = int $self->{children}[1]{range}[0];
		2968
2674	my $y0 = $top;	2969	my $y0 = $top;
2675	my $y1 = $top + $H;	2970	my $y1 = $top + $H;
2676		2971
2677	my $y = 0;
2678
2679	my $layout = $self->{layout};
2680
2681	$layout->set_font ($self->{font}) if $self->{font};
2682
2683	glEnable GL_BLEND;
2684	#TODO# not correct in windows where rgba is forced off
2685	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2686
2687	for my $par (@{$self->{par}}) {	2972	for my $para (@{$self->{par}}) {
2688	my $h = $par->[1];	2973	my $h = $para->{h};
		2974	my $y = $para->{y};
2689		2975
2690	if ($y0 < $y + $h && $y < $y1) {	2976	if ($y0 < $y + $h && $y < $y1) {
2691	$layout->set_foreground (@{ $par->[2] });	2977	my $layout = $self->get_layout ($para);
2692	$layout->set_width ($W - $par->[3]);
2693	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2694	$layout->set_markup ($par->[4]);
2695		2978
2696	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2979	$layout->render ($para->{indent}, $y - $y0);
2697		2980
2698	glRasterPos $par->[3], $y - $y0;	2981	if (my @w = @{ $para->{widget} }) {
2699	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2982	my @s = $layout->get_shapes;
		2983
		2984	for (@w) {
		2985	my ($dx, $dy) = splice @s, 0, 2, ();
		2986
		2987	$_->{x} = $dx + $para->{indent};
		2988	$_->{y} = $dy + $y - $y0;
		2989
		2990	$_->draw;
		2991	}
		2992	}
2700	}	2993	}
2701		2994
2702	$y += $h;	2995	$paridx++;
		2996	$top_paragraph ||= $paridx if $y >= $top;
2703	}	2997	}
2704		2998
2705	glDisable GL_BLEND;	2999	$self->{top_paragraph} = $top_paragraph;
2706	};	3000	};
2707	});	3001	});
		3002	}
		3003
		3004	sub reconfigure {
		3005	my ($self) = @_;
		3006
		3007	$self->SUPER::reconfigure;
		3008
		3009	$_->{w} = 1e10 for @{ $self->{par} };
		3010	$self->reflow;
2708	}	3011	}
2709		3012
2710	sub _draw {	3013	sub _draw {
2711	my ($self) = @_;	3014	my ($self) = @_;
2712		3015
…		…
2715	glColor 0, 0, 0, 1;	3018	glColor 0, 0, 0, 1;
2716	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3019	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2717	glDisable GL_TEXTURE_2D;	3020	glDisable GL_TEXTURE_2D;
2718		3021
2719	$self->{children}[1]->draw;	3022	$self->{children}[1]->draw;
2720
2721	}	3023	}
2722		3024
2723	#############################################################################	3025	#############################################################################
2724		3026
2725	package CFClient::UI::Animator;	3027	package CFPlus::UI::Animator;
2726		3028
2727	use CFClient::OpenGL;	3029	use CFPlus::OpenGL;
2728		3030
2729	our @ISA = CFClient::UI::Bin::;	3031	our @ISA = CFPlus::UI::Bin::;
2730		3032
2731	sub moveto {	3033	sub moveto {
2732	my ($self, $x, $y) = @_;	3034	my ($self, $x, $y) = @_;
2733		3035
2734	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3036	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2762	glPopMatrix;	3064	glPopMatrix;
2763	}	3065	}
2764		3066
2765	#############################################################################	3067	#############################################################################
2766		3068
2767	package CFClient::UI::Flopper;	3069	package CFPlus::UI::Flopper;
2768		3070
2769	our @ISA = CFClient::UI::Button::;	3071	our @ISA = CFPlus::UI::Button::;
2770		3072
2771	sub new {	3073	sub new {
2772	my $class = shift;	3074	my $class = shift;
2773		3075
2774	my $self = $class->SUPER::new (	3076	my $self = $class->SUPER::new (
…		…
2786	$self->{other}->toggle_visibility;	3088	$self->{other}->toggle_visibility;
2787	}	3089	}
2788		3090
2789	#############################################################################	3091	#############################################################################
2790		3092
2791	package CFClient::UI::Tooltip;	3093	package CFPlus::UI::Tooltip;
2792		3094
2793	our @ISA = CFClient::UI::Bin::;	3095	our @ISA = CFPlus::UI::Bin::;
2794		3096
2795	use CFClient::OpenGL;	3097	use CFPlus::OpenGL;
2796		3098
2797	sub new {	3099	sub new {
2798	my $class = shift;	3100	my $class = shift;
2799		3101
2800	$class->SUPER::new (	3102	$class->SUPER::new (
…		…
2803	)	3105	)
2804	}	3106	}
2805		3107
2806	sub set_tooltip_from {	3108	sub set_tooltip_from {
2807	my ($self, $widget) = @_;	3109	my ($self, $widget) = @_;
		3110
		3111	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3112	if $widget->{tooltip} =~ /^#(.*)$/;
2808		3113
2809	my $tooltip = $widget->{tooltip};	3114	my $tooltip = $widget->{tooltip};
2810		3115
2811	if ($ENV{CFPLUS_DEBUG} & 2) {	3116	if ($ENV{CFPLUS_DEBUG} & 2) {
2812	$tooltip .= "\n\n" . (ref $widget) . "\n"	3117	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2816	}	3121	}
2817		3122
2818	$tooltip =~ s/^\n+//;	3123	$tooltip =~ s/^\n+//;
2819	$tooltip =~ s/\n+$//;	3124	$tooltip =~ s/\n+$//;
2820		3125
2821	$self->add (new CFClient::UI::Label	3126	$self->add (new CFPlus::UI::Label
2822	markup => $tooltip,	3127	markup => $tooltip,
2823	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3128	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2824	fontsize => 0.8,	3129	fontsize => 0.8,
2825	fg => [0, 0, 0, 1],	3130	style => 1, # FLAG_INVERSE
2826	ellipsise => 0,	3131	ellipsise => 0,
2827	font => ($widget->{tooltip_font} || $::FONT_PROP),	3132	font => ($widget->{tooltip_font} || $::FONT_PROP),
2828	);	3133	);
2829	}	3134	}
2830		3135
…		…
2849		3154
2850	$self->{root}->on_post_alloc ("move_$self" => sub {	3155	$self->{root}->on_post_alloc ("move_$self" => sub {
2851	my $widget = $self->{owner}	3156	my $widget = $self->{owner}
2852	or return;	3157	or return;
2853		3158
		3159	if ($widget->{visible}) {
2854	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3160	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2855		3161
2856	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3162	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2857	if $x + $self->{w} > $self->{root}{w};	3163	if $x + $self->{w} > $self->{root}{w};
2858		3164
2859	$self->move_abs ($x, $y);	3165	$self->move_abs ($x, $y);
		3166	} else {
		3167	$self->hide;
		3168	}
2860	});	3169	});
2861	}	3170	}
2862		3171
2863	sub _draw {	3172	sub _draw {
2864	my ($self) = @_;	3173	my ($self) = @_;
…		…
2888	$self->SUPER::_draw;	3197	$self->SUPER::_draw;
2889	}	3198	}
2890		3199
2891	#############################################################################	3200	#############################################################################
2892		3201
2893	package CFClient::UI::Face;	3202	package CFPlus::UI::Face;
2894		3203
2895	our @ISA = CFClient::UI::Base::;	3204	our @ISA = CFPlus::UI::DrawBG::;
2896		3205
2897	use CFClient::OpenGL;	3206	use CFPlus::OpenGL;
2898		3207
2899	sub new {	3208	sub new {
2900	my $class = shift;	3209	my $class = shift;
2901		3210
2902	my $self = $class->SUPER::new (	3211	my $self = $class->SUPER::new (
…		…
2937	sub _draw {	3246	sub _draw {
2938	my ($self) = @_;	3247	my ($self) = @_;
2939		3248
2940	return unless $::CONN;	3249	return unless $::CONN;
2941		3250
		3251	$self->SUPER::_draw;
		3252
2942	my $face;	3253	my $face;
2943		3254
2944	if ($self->{frame}) {	3255	if ($self->{frame}) {
2945	my $anim = $::CONN->{anim}[$self->{anim}];	3256	my $anim = $::CONN->{anim}[$self->{anim}];
2946		3257
…		…
2968	$self->SUPER::destroy;	3279	$self->SUPER::destroy;
2969	}	3280	}
2970		3281
2971	#############################################################################	3282	#############################################################################
2972		3283
2973	package CFClient::UI::Buttonbar;	3284	package CFPlus::UI::Buttonbar;
2974		3285
2975	our @ISA = CFClient::UI::HBox::;	3286	our @ISA = CFPlus::UI::HBox::;
2976		3287
2977	# TODO: should actualyl wrap buttons and other goodies.	3288	# TODO: should actualyl wrap buttons and other goodies.
2978		3289
2979	#############################################################################	3290	#############################################################################
2980		3291
2981	package CFClient::UI::Menu;	3292	package CFPlus::UI::Menu;
2982		3293
2983	our @ISA = CFClient::UI::FancyFrame::;	3294	our @ISA = CFPlus::UI::Toplevel::;
2984		3295
2985	use CFClient::OpenGL;	3296	use CFPlus::OpenGL;
2986		3297
2987	sub new {	3298	sub new {
2988	my $class = shift;	3299	my $class = shift;
2989		3300
2990	my $self = $class->SUPER::new (	3301	my $self = $class->SUPER::new (
2991	items => [],	3302	items => [],
2992	z => 100,	3303	z => 100,
2993	@_,	3304	@_,
2994	);	3305	);
2995		3306
2996	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3307	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2997		3308
2998	for my $item (@{ $self->{items} }) {	3309	for my $item (@{ $self->{items} }) {
2999	my ($widget, $cb, $tooltip) = @$item;	3310	my ($widget, $cb, $tooltip) = @$item;
3000		3311
3001	# handle various types of items, only text for now	3312	# handle various types of items, only text for now
3002	if (!ref $widget) {	3313	if (!ref $widget) {
		3314	if ($widget =~ /\t/) {
		3315	my ($left, $right) = split /\t/, $widget, 2;
		3316
3003	$widget = new CFClient::UI::Label	3317	$widget = new CFPlus::UI::HBox
3004	can_hover => 1,	3318	can_hover => 1,
3005	can_events => 1,	3319	can_events => 1,
		3320	tooltip => $tooltip,
		3321	children => [
		3322	(new CFPlus::UI::Label markup => $left, expand => 1),
		3323	(new CFPlus::UI::Label markup => $right, align => +1),
		3324	],
		3325	;
		3326
		3327	} else {
		3328	$widget = new CFPlus::UI::Label
		3329	can_hover => 1,
		3330	can_events => 1,
3006	markup => $widget,	3331	markup => $widget,
3007	tooltip => $tooltip	3332	tooltip => $tooltip;
		3333	}
3008	}	3334	}
3009		3335
3010	$self->{item}{$widget} = $item;	3336	$self->{item}{$widget} = $item;
3011		3337
3012	$self->{vbox}->add ($widget);	3338	$self->{vbox}->add ($widget);
…		…
3055	1	3381	1
3056	}	3382	}
3057		3383
3058	#############################################################################	3384	#############################################################################
3059		3385
3060	package CFClient::UI::Multiplexer;	3386	package CFPlus::UI::Multiplexer;
3061		3387
3062	our @ISA = CFClient::UI::Container::;	3388	our @ISA = CFPlus::UI::Container::;
3063		3389
3064	sub new {	3390	sub new {
3065	my $class = shift;	3391	my $class = shift;
3066		3392
3067	my $self = $class->SUPER::new (	3393	my $self = $class->SUPER::new (
…		…
3081		3407
3082	$self->{current} = $self->{children}[0]	3408	$self->{current} = $self->{children}[0]
3083	if @{ $self->{children} };	3409	if @{ $self->{children} };
3084	}	3410	}
3085		3411
		3412	sub get_current_page {
		3413	my ($self) = @_;
		3414
		3415	$self->{current}
		3416	}
		3417
3086	sub set_current_page {	3418	sub set_current_page {
3087	my ($self, $page_or_widget) = @_;	3419	my ($self, $page_or_widget) = @_;
3088		3420
3089	my $widget = ref $page_or_widget	3421	my $widget = ref $page_or_widget
3090	? $page_or_widget	3422	? $page_or_widget
…		…
3122	$self->{current}->draw;	3454	$self->{current}->draw;
3123	}	3455	}
3124		3456
3125	#############################################################################	3457	#############################################################################
3126		3458
3127	package CFClient::UI::Notebook;	3459	package CFPlus::UI::Notebook;
3128		3460
3129	our @ISA = CFClient::UI::VBox::;	3461	our @ISA = CFPlus::UI::VBox::;
3130		3462
3131	sub new {	3463	sub new {
3132	my $class = shift;	3464	my $class = shift;
3133		3465
3134	my $self = $class->SUPER::new (	3466	my $self = $class->SUPER::new (
3135	buttonbar => (new CFClient::UI::Buttonbar),	3467	buttonbar => (new CFPlus::UI::Buttonbar),
3136	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3468	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3137	# filter => # will be put between multiplexer and $self	3469	# filter => # will be put between multiplexer and $self
3138	@_,	3470	@_,
3139	);	3471	);
3140		3472
3141	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3473	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3147	sub add {	3479	sub add {
3148	my ($self, $title, $widget, $tooltip) = @_;	3480	my ($self, $title, $widget, $tooltip) = @_;
3149		3481
3150	Scalar::Util::weaken $self;	3482	Scalar::Util::weaken $self;
3151		3483
3152	$self->{buttonbar}->add (new CFClient::UI::Button	3484	$self->{buttonbar}->add (new CFPlus::UI::Button
3153	markup => $title,	3485	markup => $title,
3154	tooltip => $tooltip,	3486	tooltip => $tooltip,
3155	on_activate => sub { $self->set_current_page ($widget) },	3487	on_activate => sub { $self->set_current_page ($widget) },
3156	);	3488	);
3157		3489
3158	$self->{multiplexer}->add ($widget);	3490	$self->{multiplexer}->add ($widget);
3159	}	3491	}
3160		3492
		3493	sub get_current_page {
		3494	my ($self) = @_;
		3495
		3496	$self->{multiplexer}->get_current_page
		3497	}
		3498
3161	sub set_current_page {	3499	sub set_current_page {
3162	my ($self, $page) = @_;	3500	my ($self, $page) = @_;
3163		3501
3164	$self->{multiplexer}->set_current_page ($page);	3502	$self->{multiplexer}->set_current_page ($page);
3165	$self->emit (page_changed => $self->{multiplexer}{current});	3503	$self->emit (page_changed => $self->{multiplexer}{current});
3166	}	3504	}
3167		3505
3168	#############################################################################	3506	#############################################################################
3169		3507
3170	package CFClient::UI::Combobox;	3508	package CFPlus::UI::Selector;
3171		3509
3172	use utf8;	3510	use utf8;
3173		3511
3174	our @ISA = CFClient::UI::Button::;	3512	our @ISA = CFPlus::UI::Button::;
3175		3513
3176	sub new {	3514	sub new {
3177	my $class = shift;	3515	my $class = shift;
3178		3516
3179	my $self = $class->SUPER::new (	3517	my $self = $class->SUPER::new (
…		…
3196	my ($value, $title, $tooltip) = @$_;	3534	my ($value, $title, $tooltip) = @$_;
3197		3535
3198	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3536	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3199	}	3537	}
3200		3538
3201	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3539	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3202	}	3540	}
3203		3541
3204	sub _set_value {	3542	sub _set_value {
3205	my ($self, $value) = @_;	3543	my ($self, $value) = @_;
3206		3544
…		…
3221	$self->emit (changed => $value);	3559	$self->emit (changed => $value);
3222	}	3560	}
3223		3561
3224	#############################################################################	3562	#############################################################################
3225		3563
3226	package CFClient::UI::Statusbox;	3564	package CFPlus::UI::Statusbox;
3227		3565
3228	our @ISA = CFClient::UI::VBox::;	3566	our @ISA = CFPlus::UI::VBox::;
3229		3567
3230	sub new {	3568	sub new {
3231	my $class = shift;	3569	my $class = shift;
3232		3570
3233	my $self = $class->SUPER::new (	3571	my $self = $class->SUPER::new (
…		…
3245	sub reorder {	3583	sub reorder {
3246	my ($self) = @_;	3584	my ($self) = @_;
3247	my $NOW = Time::HiRes::time;	3585	my $NOW = Time::HiRes::time;
3248		3586
3249	# freeze display when hovering over any label	3587	# freeze display when hovering over any label
3250	return if $CFClient::UI::TOOLTIP->{owner}	3588	return if $CFPlus::UI::TOOLTIP->{owner}
3251	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3589	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3252	values %{ $self->{item} };	3590	values %{ $self->{item} };
3253		3591
3254	while (my ($k, $v) = each %{ $self->{item} }) {	3592	while (my ($k, $v) = each %{ $self->{item} }) {
3255	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3593	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3256	}	3594	}
…		…
3277	for ($short) {	3615	for ($short) {
3278	s/^\s+//;	3616	s/^\s+//;
3279	s/\s+/ /g;	3617	s/\s+/ /g;
3280	}	3618	}
3281		3619
3282	new CFClient::UI::Label	3620	new CFPlus::UI::Label
3283	markup => $short,	3621	markup => $short,
3284	tooltip => $item->{tooltip},	3622	tooltip => $item->{tooltip},
3285	tooltip_font => $::FONT_PROP,	3623	tooltip_font => $::FONT_PROP,
3286	tooltip_width => 0.67,	3624	tooltip_width => 0.67,
3287	fontsize => $item->{fontsize} || $self->{fontsize},	3625	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3341	count => 1,	3679	count => 1,
3342	%arg,	3680	%arg,
3343	};	3681	};
3344	}	3682	}
3345		3683
		3684	$ROOT->on_refresh (reorder => sub {
3346	$self->reorder;	3685	$self->reorder;
		3686	});
3347	}	3687	}
3348		3688
3349	sub reconfigure {	3689	sub reconfigure {
3350	my ($self) = @_;	3690	my ($self) = @_;
3351		3691
…		…
3364	$self->SUPER::destroy;	3704	$self->SUPER::destroy;
3365	}	3705	}
3366		3706
3367	#############################################################################	3707	#############################################################################
3368		3708
3369	package CFClient::UI::Inventory;	3709	package CFPlus::UI::Inventory;
3370		3710
3371	our @ISA = CFClient::UI::ScrolledWindow::;	3711	our @ISA = CFPlus::UI::Table::;
3372		3712
3373	sub new {	3713	sub new {
3374	my $class = shift;	3714	my $class = shift;
3375		3715
3376	my $self = $class->SUPER::new (	3716	my $self = $class->SUPER::new (
3377	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3717	col_expand => [0, 1, 0],
		3718	items => [],
3378	@_,	3719	@_,
3379	);	3720	);
3380		3721
		3722	$self->set_sort_order (undef);
		3723
3381	$self	3724	$self
		3725	}
		3726
		3727	sub update_items {
		3728	my ($self) = @_;
		3729
		3730	$self->clear;
		3731
		3732	my @item = $self->{sort}->(@{ $self->{items} });
		3733
		3734	my @adds;
		3735	my $row = 0;
		3736	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3737	CFPlus::Item::update_widgets $item;
		3738
		3739	push @adds, 0, $row, $item->{face_widget};
		3740	push @adds, 1, $row, $item->{desc_widget};
		3741	push @adds, 2, $row, $item->{weight_widget};
		3742
		3743	$row++;
		3744	}
		3745
		3746	$self->add (@adds);
		3747	}
		3748
		3749	sub set_sort_order {
		3750	my ($self, $order) = @_;
		3751
		3752	$self->{sort} = $order ||= sub {
		3753	sort {
		3754	$a->{type} <=> $b->{type}
		3755	or $a->{name} cmp $b->{name}
		3756	} @_
		3757	};
		3758
		3759	$self->update_items;
3382	}	3760	}
3383		3761
3384	sub set_items {	3762	sub set_items {
3385	my ($self, $items) = @_;	3763	my ($self, $items) = @_;
3386		3764
3387	$self->{child}->clear;	3765	$self->{items} = [$items ? values %$items : ()];
3388	return unless $items;	3766	$self->update_items;
3389
3390	my @items = sort {
3391	($a->{type} <=> $b->{type})
3392	or ($a->{name} cmp $b->{name})
3393	} @$items;
3394
3395	$self->{real_items} = \@items;
3396
3397	my $row = 0;
3398	for my $item (@items) {
3399	CFClient::Item::update_widgets $item;
3400
3401	$self->{child}->add (0, $row, $item->{face_widget});
3402	$self->{child}->add (1, $row, $item->{desc_widget});
3403	$self->{child}->add (2, $row, $item->{weight_widget});
3404
3405	$row++;
3406	}
3407	}	3767	}
3408		3768
3409	#############################################################################	3769	#############################################################################
3410		3770
3411	package CFClient::UI::BindEditor;
3412
3413	our @ISA = CFClient::UI::FancyFrame::;
3414
3415	sub new {
3416	my $class = shift;
3417
3418	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3419
3420	$self->add (my $vb = new CFClient::UI::VBox);
3421
3422
3423	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3424	text => "start recording",
3425	tooltip => "Start/Stops recording of actions."
3426	."All subsequent actions after the recording started will be captured."
3427	."The actions are displayed after the record was stopped."
3428	."To bind the action you have to click on the 'Bind' button",
3429	on_activate => sub {
3430	unless ($self->{recording}) {
3431	$self->start;
3432	} else {
3433	$self->stop;
3434	}
3435	});
3436
3437	$vb->add (new CFClient::UI::Label text => "Actions:");
3438	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3439
3440	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3441	$vb->add (my $hb = new CFClient::UI::HBox);
3442	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3443	$hb->add (new CFClient::UI::Button
3444	text => "bind",
3445	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3446	on_activate => sub {
3447	$self->ask_for_bind;
3448	});
3449
3450	$vb->add (my $hb = new CFClient::UI::HBox);
3451	$hb->add (new CFClient::UI::Button
3452	text => "ok",
3453	expand => 1,
3454	tooltip => "This closes the binding editor and saves the binding",
3455	on_activate => sub {
3456	$self->hide;
3457	$self->commit;
3458	});
3459
3460	$hb->add (new CFClient::UI::Button
3461	text => "cancel",
3462	expand => 1,
3463	tooltip => "This closes the binding editor without saving",
3464	on_activate => sub {
3465	$self->hide;
3466	$self->{binding_cancel}->()
3467	if $self->{binding_cancel};
3468	});
3469
3470	$self->update_binding_widgets;
3471
3472	$self
3473	}
3474
3475	sub commit {
3476	my ($self) = @_;
3477	my ($mod, $sym, $cmds) = $self->get_binding;
3478	if ($sym != 0 && @$cmds > 0) {
3479	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3480	."'. Don't forget 'Save Config'!");
3481	$self->{binding_change}->($mod, $sym, $cmds)
3482	if $self->{binding_change};
3483	} else {
3484	$::STATUSBOX->add ("No action bound, no key or action specified!");
3485	$self->{binding_cancel}->()
3486	if $self->{binding_cancel};
3487	}
3488	}
3489
3490	sub start {
3491	my ($self) = @_;
3492
3493	$self->{rec_btn}->set_text ("stop recording");
3494	$self->{recording} = 1;
3495	$self->clear_command_list;
3496	$::CONN->start_record if $::CONN;
3497	}
3498
3499	sub stop {
3500	my ($self) = @_;
3501
3502	$self->{rec_btn}->set_text ("start recording");
3503	$self->{recording} = 0;
3504
3505	my $rec;
3506	$rec = $::CONN->stop_record if $::CONN;
3507	return unless ref $rec eq 'ARRAY';
3508	$self->set_command_list ($rec);
3509	}
3510
3511
3512	sub ask_for_bind_and_commit {
3513	my ($self) = @_;
3514	$self->ask_for_bind (1);
3515	}
3516
3517	sub ask_for_bind {
3518	my ($self, $commit, $end_cb) = @_;
3519
3520	CFClient::Binder::open_binding_dialog (sub {
3521	my ($mod, $sym) = @_;
3522	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3523	$self->update_binding_widgets;
3524	$self->commit if $commit;
3525	$end_cb->() if $end_cb;
3526	});
3527	}
3528
3529	# $mod and $sym are the modifiers and key symbol
3530	# $cmds is a array ref of strings (the commands)
3531	# $cb is the callback that is executed on OK
3532	# $ccb is the callback that is executed on CANCEL and
3533	# when the binding was unsuccessful on OK
3534	sub set_binding {
3535	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3536
3537	$self->clear_command_list;
3538	$self->{recording} = 0;
3539	$self->{rec_btn}->set_text ("start recording");
3540
3541	$self->{binding} = [$mod, $sym];
3542	$self->{commands} = $cmds;
3543
3544	$self->{binding_change} = $cb;
3545	$self->{binding_cancel} = $ccb;
3546
3547	$self->update_binding_widgets;
3548	}
3549
3550	# this is a shortcut method that asks for a binding
3551	# and then just binds it.
3552	sub do_quick_binding {
3553	my ($self, $cmds, $end_cb) = @_;
3554	$self->set_binding (undef, undef, $cmds, sub {
3555	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3556	});
3557	$self->ask_for_bind (1, $end_cb);
3558	}
3559
3560	sub update_binding_widgets {
3561	my ($self) = @_;
3562	my ($mod, $sym, $cmds) = $self->get_binding;
3563	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3564	$self->set_command_list ($cmds);
3565	}
3566
3567	sub get_binding {
3568	my ($self) = @_;
3569	return (
3570	$self->{binding}->[0],
3571	$self->{binding}->[1],
3572	[ grep { defined $_ } @{$self->{commands}} ]
3573	);
3574	}
3575
3576	sub clear_command_list {
3577	my ($self) = @_;
3578	$self->{cmdbox}->clear ();
3579	}
3580
3581	sub set_command_list {
3582	my ($self, $cmds) = @_;
3583
3584	$self->{cmdbox}->clear ();
3585	$self->{commands} = $cmds;
3586
3587	my $idx = 0;
3588
3589	for (@$cmds) {
3590	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3591
3592	my $i = $idx;
3593	$hb->add (new CFClient::UI::Label text => $_);
3594	$hb->add (new CFClient::UI::Button
3595	text => "delete",
3596	tooltip => "Deletes the action from the record",
3597	on_activate => sub {
3598	$self->{cmdbox}->remove ($hb);
3599	$cmds->[$i] = undef;
3600	});
3601
3602
3603	$idx++
3604	}
3605	}
3606
3607	#############################################################################
3608
3609	package CFClient::UI::SpellList;	3771	package CFPlus::UI::SpellList;
3610		3772
3611	our @ISA = CFClient::UI::Table::;	3773	our @ISA = CFPlus::UI::Table::;
3612		3774
3613	sub new {	3775	sub new {
3614	my $class = shift;	3776	my $class = shift;
3615		3777
3616	my $self = $class->SUPER::new (	3778	my $self = $class->SUPER::new (
…		…
3634	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3796	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3635		3797
3636	sub rebuild_spell_list {	3798	sub rebuild_spell_list {
3637	my ($self) = @_;	3799	my ($self) = @_;
3638		3800
3639	$CFClient::UI::ROOT->on_refresh ($self => sub {	3801	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3640	$self->clear;	3802	$self->clear;
3641		3803
3642	return unless $::CONN;	3804	return unless $::CONN;
3643		3805
3644	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3806	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3645	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3807	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3646	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3808	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3647	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3809	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3648	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3810	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3649		3811
3650	my $row = 0;	3812	my $row = 0;
3651		3813
3652	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3814	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3653	my $spell = $self->{spell}{$_};	3815	my $spell = $self->{spell}{$_};
…		…
3660	if ($ev->{button} == 1) {	3822	if ($ev->{button} == 1) {
3661	$::CONN->user_send ("cast $spell->{name}");	3823	$::CONN->user_send ("cast $spell->{name}");
3662	} elsif ($ev->{button} == 2) {	3824	} elsif ($ev->{button} == 2) {
3663	$::CONN->user_send ("invoke $spell->{name}");	3825	$::CONN->user_send ("invoke $spell->{name}");
3664	} elsif ($ev->{button} == 3) {	3826	} elsif ($ev->{button} == 3) {
3665	(new CFClient::UI::Menu	3827	(new CFPlus::UI::Menu
3666	items => [	3828	items => [
3667	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3829	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3668	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3830	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3669	],	3831	],
3670	)->popup ($ev);	3832	)->popup ($ev);
3671	} else {	3833	} else {
3672	return 0;	3834	return 0;
…		…
3676	};	3838	};
3677		3839
3678	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3840	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3679		3841
3680	#TODO: add path info to tooltip	3842	#TODO: add path info to tooltip
3681	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3843	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3682		3844
3683	$self->add (0, $row, new CFClient::UI::Face	3845	$self->add (0, $row, new CFPlus::UI::Face
3684	face => $spell->{face},	3846	face => $spell->{face},
3685	can_hover => 1,	3847	can_hover => 1,
3686	can_events => 1,	3848	can_events => 1,
3687	tooltip => $tooltip,	3849	tooltip => $tooltip,
3688	on_button_down => $spell_cb,	3850	on_button_down => $spell_cb,
3689	);	3851	);
3690		3852
3691	$self->add (1, $row, new CFClient::UI::Label	3853	$self->add (1, $row, new CFPlus::UI::Label
3692	expand => 1,	3854	expand => 1,
3693	text => $spell->{name},	3855	text => $spell->{name},
3694	can_hover => 1,	3856	can_hover => 1,
3695	can_events => 1,	3857	can_events => 1,
3696	tooltip => $tooltip,	3858	tooltip => $tooltip,
3697	on_button_down => $spell_cb,	3859	on_button_down => $spell_cb,
3698	);	3860	);
3699		3861
3700	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3862	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3701	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3863	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3702	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3864	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3703	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3865	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3704	}	3866	}
3705	});	3867	});
3706	}	3868	}
3707		3869
3708	sub add_spell {	3870	sub add_spell {
…		…
3726	$self->rebuild_spell_list;	3888	$self->rebuild_spell_list;
3727	}	3889	}
3728		3890
3729	#############################################################################	3891	#############################################################################
3730		3892
3731	package CFClient::UI::Root;	3893	package CFPlus::UI::Root;
3732		3894
3733	our @ISA = CFClient::UI::Container::;	3895	our @ISA = CFPlus::UI::Container::;
3734		3896
3735	use List::Util qw(min max);	3897	use List::Util qw(min max);
3736		3898
3737	use CFClient::OpenGL;	3899	use CFPlus::OpenGL;
3738		3900
3739	sub new {	3901	sub new {
3740	my $class = shift;	3902	my $class = shift;
3741		3903
3742	my $self = $class->SUPER::new (	3904	my $self = $class->SUPER::new (
…		…
3918	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4080	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3919		4081
3920	$w = 0 if $w < 0;	4082	$w = 0 if $w < 0;
3921	$h = 0 if $h < 0;	4083	$h = 0 if $h < 0;
3922		4084
		4085	$w = max $widget->{min_w}, $w;
		4086	$h = max $widget->{min_h}, $h;
		4087
		4088	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4089	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4090
		4091	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4092	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4093
3923	$w = int $w + 0.5;	4094	$w = int $w + 0.5;
3924	$h = int $h + 0.5;	4095	$h = int $h + 0.5;
3925		4096
3926	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4097	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3927	$widget->{old_w} = $widget->{w};	4098	$widget->{old_w} = $widget->{w};
…		…
3950	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4121	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3951	glMatrixMode GL_MODELVIEW;	4122	glMatrixMode GL_MODELVIEW;
3952	glLoadIdentity;	4123	glLoadIdentity;
3953		4124
3954	{	4125	{
3955	package CFClient::UI::Base;	4126	package CFPlus::UI::Base;
3956		4127
3957	($draw_x, $draw_y, $draw_w, $draw_h) =	4128	($draw_x, $draw_y, $draw_w, $draw_h) =
3958	(0, 0, $self->{w}, $self->{h});	4129	(0, 0, $self->{w}, $self->{h});
3959	}	4130	}
3960		4131
3961	$self->_draw;	4132	$self->_draw;
3962	}	4133	}
3963		4134
3964	#############################################################################	4135	#############################################################################
3965		4136
3966	package CFClient::UI;	4137	package CFPlus::UI;
3967		4138
3968	$ROOT = new CFClient::UI::Root;	4139	$ROOT = new CFPlus::UI::Root;
3969	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4140	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3970		4141
3971	1	4142	1
3972		4143

Diff Legend

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