ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.306 by root, Sun Jun 18 17:39:36 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 2006 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8	use Event;	8	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
…		…
79	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	82	if $FOCUS;
82	}	83	}
83		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
84	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	99	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
87		101
88	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
90		106
91	$GRAB = $widget;	107	$GRAB = $widget;
92	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
93		109
94	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
95	}	111	}
96		112
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
98		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
100	if $GRAB;	116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
		122	}
101	}	123	}
102		124
103	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	126	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		127
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		129
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		131
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
112	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		134
114	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	137	$grab->update if $grab;
117	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
118		139
		140	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	141	$TOOLTIP_WATCHER->cb->();
120	}	142	}
121	}	143	}
122		144
123	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
124	my ($ev) = @_;	146	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
126		148
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		150
129	if ($widget != $HOVER) {	151	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		152
132	$hover->update if $hover && $hover->{can_hover};	153	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	154	if $HOVER;
140	}	155	}
141		156
142	# convert position array to integers	157	# convert position array to integers
143	sub harmonize {	158	sub harmonize {
…		…
193	reconfigure_widgets;	208	reconfigure_widgets;
194	}	209	}
195		210
196	#############################################################################	211	#############################################################################
197		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
198	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
199		222
200	use strict;	223	use strict;
201		224
202	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
203		226
204	sub new {	227	sub new {
205	my $class = shift;	228	my $class = shift;
206		229
207	my $self = bless {	230	my $self = bless {
…		…
212	h => undef,	235	h => undef,
213	can_events => 1,	236	can_events => 1,
214	@_	237	@_
215	}, $class;	238	}, $class;
216		239
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		241
219	for (keys %$self) {	242	for (keys %$self) {
220	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
222	}	245	}
223	}	246	}
224		247
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		253
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		256
234	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
247	sub show {	270	sub show {
248	my ($self) = @_;	271	my ($self) = @_;
249		272
250	return if $self->{parent};	273	return if $self->{parent};
251		274
252	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
253	}	276	}
254		277
255	sub set_visible {	278	sub set_visible {
256	my ($self) = @_;	279	my ($self) = @_;
257		280
…		…
278	delete $self->{root};	301	delete $self->{root};
279		302
280	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
282		305
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
285		308
286	$self->emit ("focus_out");	309	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
288	}	311	}
…		…
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 do not like duplication
		520	# and needlessly verbose code, either.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
		528	if ($self->{tooltip} =~ /Apply.*audio/) {
		529	warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
		530	warn "3 $self->{parent}\n";#d#
		531	}
		532
		533	#d##TODO# stop propagating at first true, do not use sum
		534	my $res =
475	(List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before	535	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
476	($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure	536	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
477	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	537	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
		538	;
		539	if ($self->{tooltip} =~ /Apply.*audio/) {
		540	warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
		541	warn "5 $self->{parent}\n";#d#
		542	}
		543
		544	$res
478	}	545	}
479		546
480	sub find_widget {	547	sub find_widget {
481	my ($self, $x, $y) = @_;	548	my ($self, $x, $y) = @_;
482		549
…		…
534	return unless $self->{h} && $self->{w};	601	return unless $self->{h} && $self->{w};
535		602
536	# update screen rectangle	603	# update screen rectangle
537	local $draw_x = $draw_x + $self->{x};	604	local $draw_x = $draw_x + $self->{x};
538	local $draw_y = $draw_y + $self->{y};	605	local $draw_y = $draw_y + $self->{y};
539	local $draw_w = $draw_x + $self->{w};
540	local $draw_h = $draw_y + $self->{h};
541		606
542	# skip widgets that are entirely outside the drawing area	607	# skip widgets that are entirely outside the drawing area
543	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545		610
…		…
568	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
569	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
570	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
571	glEnd;	636	glEnd;
572	glPopMatrix;	637	glPopMatrix;
573	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
574	}	639	}
575		640
576	$self->_draw;	641	$self->_draw;
577	glPopMatrix;	642	glPopMatrix;
578	}	643	}
…		…
584	}	649	}
585		650
586	sub DESTROY {	651	sub DESTROY {
587	my ($self) = @_;	652	my ($self) = @_;
588		653
		654	return if CFPlus::in_destruct;
		655
589	delete $WIDGET{$self+0};	656	delete $WIDGET{$self+0};
590		657
591	eval { $self->destroy };	658	eval { $self->destroy };
592	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
593	}	660	}
594		661
595	#############################################################################	662	#############################################################################
596		663
597	package CFClient::UI::DrawBG;	664	package CFPlus::UI::DrawBG;
598		665
599	our @ISA = CFClient::UI::Base::;	666	our @ISA = CFPlus::UI::Base::;
600		667
601	use strict;	668	use strict;
602	use CFClient::OpenGL;	669	use CFPlus::OpenGL;
603		670
604	sub new {	671	sub new {
605	my $class = shift;	672	my $class = shift;
606		673
607	# range [value, low, high, page]	674	# range [value, low, high, page]
…		…
638	}	705	}
639	}	706	}
640		707
641	#############################################################################	708	#############################################################################
642		709
643	package CFClient::UI::Empty;	710	package CFPlus::UI::Empty;
644		711
645	our @ISA = CFClient::UI::Base::;	712	our @ISA = CFPlus::UI::Base::;
646		713
647	sub new {	714	sub new {
648	my ($class, %arg) = @_;	715	my ($class, %arg) = @_;
649	$class->SUPER::new (can_events => 0, %arg);	716	$class->SUPER::new (can_events => 0, %arg);
650	}	717	}
…		…
657		724
658	sub draw { }	725	sub draw { }
659		726
660	#############################################################################	727	#############################################################################
661		728
662	package CFClient::UI::Container;	729	package CFPlus::UI::Container;
663		730
664	our @ISA = CFClient::UI::Base::;	731	our @ISA = CFPlus::UI::Base::;
665		732
666	sub new {	733	sub new {
667	my ($class, %arg) = @_;	734	my ($class, %arg) = @_;
668		735
669	my $children = delete $arg{children};	736	my $children = delete $arg{children};
…		…
678	if $children;	745	if $children;
679		746
680	$self	747	$self
681	}	748	}
682		749
		750	sub realloc {
		751	my ($self) = @_;
		752
		753	$self->{force_realloc} = 1;
		754	$self->{force_size_alloc} = 1;
		755	$self->SUPER::realloc;
		756	}
		757
683	sub add {	758	sub add {
684	my ($self, @widgets) = @_;	759	my ($self, @widgets) = @_;
685		760
686	$_->set_parent ($self)	761	$_->set_parent ($self)
687	for @widgets;	762	for @widgets;
…		…
747	$_->draw for @{$self->{children}};	822	$_->draw for @{$self->{children}};
748	}	823	}
749		824
750	#############################################################################	825	#############################################################################
751		826
752	package CFClient::UI::Bin;	827	package CFPlus::UI::Bin;
753		828
754	our @ISA = CFClient::UI::Container::;	829	our @ISA = CFPlus::UI::Container::;
755		830
756	sub new {	831	sub new {
757	my ($class, %arg) = @_;	832	my ($class, %arg) = @_;
758		833
759	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	834	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
760		835
761	$class->SUPER::new (children => [$child], %arg)	836	$class->SUPER::new (children => [$child], %arg)
762	}	837	}
763		838
764	sub add {	839	sub add {
…		…
771	sub remove {	846	sub remove {
772	my ($self, $widget) = @_;	847	my ($self, $widget) = @_;
773		848
774	$self->SUPER::remove ($widget);	849	$self->SUPER::remove ($widget);
775		850
776	$self->{children} = [new CFClient::UI::Empty]	851	$self->{children} = [new CFPlus::UI::Empty]
777	unless @{$self->{children}};	852	unless @{$self->{children}};
778	}	853	}
779		854
780	sub child { $_[0]->{children}[0] }	855	sub child { $_[0]->{children}[0] }
781		856
…		…
793		868
794	#############################################################################	869	#############################################################################
795		870
796	# back-buffered drawing area	871	# back-buffered drawing area
797		872
798	package CFClient::UI::Window;	873	package CFPlus::UI::Window;
799		874
800	our @ISA = CFClient::UI::Bin::;	875	our @ISA = CFPlus::UI::Bin::;
801		876
802	use CFClient::OpenGL;	877	use CFPlus::OpenGL;
803		878
804	sub new {	879	sub new {
805	my ($class, %arg) = @_;	880	my ($class, %arg) = @_;
806		881
807	my $self = $class->SUPER::new (%arg);	882	my $self = $class->SUPER::new (%arg);
…		…
829	}	904	}
830		905
831	sub render_child {	906	sub render_child {
832	my ($self) = @_;	907	my ($self) = @_;
833		908
834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	909	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
835	glClearColor 0, 0, 0, 0;	910	glClearColor 0, 0, 0, 0;
836	glClear GL_COLOR_BUFFER_BIT;	911	glClear GL_COLOR_BUFFER_BIT;
837		912
838	{	913	{
839	package CFClient::UI::Base;	914	package CFPlus::UI::Base;
840		915
841	($draw_x, $draw_y, $draw_w, $draw_h) =	916	local ($draw_x, $draw_y, $draw_w, $draw_h) =
842	(0, 0, $self->{w}, $self->{h});	917	(0, 0, $self->{w}, $self->{h});
		918
		919	$self->_render;
843	}	920	}
844
845	$self->_render;
846	};	921	};
847	}	922	}
848		923
849	sub _draw {	924	sub _draw {
850	my ($self) = @_;	925	my ($self) = @_;
851
852	my ($w, $h) = @$self{qw(w h)};
853		926
854	my $tex = $self->{texture}	927	my $tex = $self->{texture}
855	or return;	928	or return;
856		929
857	glEnable GL_TEXTURE_2D;	930	glEnable GL_TEXTURE_2D;
858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	931	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859	glColor 0, 0, 0, 1;	932	glColor 0, 0, 0, 1;
860		933
861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	934	$tex->draw_quad_alpha_premultiplied (0, 0);
862		935
863	glDisable GL_TEXTURE_2D;	936	glDisable GL_TEXTURE_2D;
864	}	937	}
865		938
866	#############################################################################	939	#############################################################################
867		940
868	package CFClient::UI::ViewPort;	941	package CFPlus::UI::ViewPort;
869		942
870	our @ISA = CFClient::UI::Window::;	943	our @ISA = CFPlus::UI::Window::;
871		944
872	sub new {	945	sub new {
873	my $class = shift;	946	my $class = shift;
874		947
875	$class->SUPER::new (	948	$class->SUPER::new (
…		…
935	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1008	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1009	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
937	) {	1010	) {
938	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1011	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
939	} else {	1012	} else {
940	$self->CFClient::UI::Base::find_widget ($x, $y)	1013	$self->CFPlus::UI::Base::find_widget ($x, $y)
941	}	1014	}
942	}	1015	}
943		1016
944	sub _render {	1017	sub _render {
945	my ($self) = @_;	1018	my ($self) = @_;
946		1019
947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1020	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1021	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
949		1022
950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1023	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951		1024
952	$self->SUPER::_render;	1025	$self->SUPER::_render;
953	}	1026	}
954		1027
955	#############################################################################	1028	#############################################################################
956		1029
957	package CFClient::UI::ScrolledWindow;	1030	package CFPlus::UI::ScrolledWindow;
958		1031
959	our @ISA = CFClient::UI::HBox::;	1032	our @ISA = CFPlus::UI::HBox::;
960		1033
961	sub new {	1034	sub new {
962	my ($class, %arg) = @_;	1035	my ($class, %arg) = @_;
963		1036
964	my $child = delete $arg{child};	1037	my $child = delete $arg{child};
965		1038
966	my $self;	1039	my $self;
967		1040
968	my $slider = new CFClient::UI::Slider	1041	my $slider = new CFPlus::UI::Slider
969	vertical => 1,	1042	vertical => 1,
970	range => [0, 0, 1, 0.01], # HACK fix	1043	range => [0, 0, 1, 0.01], # HACK fix
971	on_changed => sub {	1044	on_changed => sub {
972	$self->{vp}->set_offset (0, $_[1]);	1045	$self->{vp}->set_offset (0, $_[1]);
973	},	1046	},
974	;	1047	;
975		1048
976	$self = $class->SUPER::new (	1049	$self = $class->SUPER::new (
977	vp => (new CFClient::UI::ViewPort expand => 1),	1050	vp => (new CFPlus::UI::ViewPort expand => 1),
		1051	can_events => 1,
978	slider => $slider,	1052	slider => $slider,
979	%arg,	1053	%arg,
980	);	1054	);
981		1055
982	$self->SUPER::add ($self->{vp}, $self->{slider});	1056	$self->SUPER::add ($self->{vp}, $self->{slider});
983	$self->add ($child) if $child;	1057	$self->add ($child) if $child;
984		1058
985	$self	1059	$self
986	}	1060	}
987		1061
		1062	#TODO# update range on size_allocate depending on child
		1063
988	sub add {	1064	sub add {
989	my ($self, $widget) = @_;	1065	my ($self, $widget) = @_;
990		1066
991	$self->{vp}->add ($self->{child} = $widget);	1067	$self->{vp}->add ($self->{child} = $widget);
992	}	1068	}
993		1069
		1070	sub invoke_mouse_wheel {
		1071	my ($self, $ev) = @_;
		1072
		1073	return 0 unless $ev->{dy}; # only vertical movements
		1074
		1075	$self->{slider}->emit (mouse_wheel => $ev);
		1076
		1077	1
		1078	}
		1079
		1080	sub update_slider {
		1081	my ($self) = @_;
		1082
		1083	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1084	}
		1085
994	sub update {	1086	sub update {
995	my ($self) = @_;	1087	my ($self) = @_;
996		1088
997	$self->SUPER::update;	1089	$self->SUPER::update;
998		1090
999	# todo: overwrite size_allocate of child	1091	$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	}	1092	}
1003		1093
1004	sub invoke_size_allocate {	1094	sub invoke_size_allocate {
1005	my ($self, $w, $h) = @_;	1095	my ($self, $w, $h) = @_;
1006		1096
1007	my $child = $self->{vp}->child;	1097	$self->update_slider;
1008	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009		1098
1010	$self->SUPER::invoke_size_allocate ($w, $h)	1099	$self->SUPER::invoke_size_allocate ($w, $h)
1011	}	1100	}
1012		1101
1013	#TODO# update range on size_allocate depending on child
1014	# update viewport offset on scroll
1015
1016	#############################################################################	1102	#############################################################################
1017		1103
1018	package CFClient::UI::Frame;	1104	package CFPlus::UI::Frame;
1019		1105
1020	our @ISA = CFClient::UI::Bin::;	1106	our @ISA = CFPlus::UI::Bin::;
1021		1107
1022	use CFClient::OpenGL;	1108	use CFPlus::OpenGL;
1023		1109
1024	sub new {	1110	sub new {
1025	my $class = shift;	1111	my $class = shift;
1026		1112
1027	$class->SUPER::new (	1113	$class->SUPER::new (
…		…
1053	$self->SUPER::_draw;	1139	$self->SUPER::_draw;
1054	}	1140	}
1055		1141
1056	#############################################################################	1142	#############################################################################
1057		1143
1058	package CFClient::UI::FancyFrame;	1144	package CFPlus::UI::FancyFrame;
1059		1145
1060	our @ISA = CFClient::UI::Bin::;	1146	our @ISA = CFPlus::UI::Bin::;
1061		1147
1062	use CFClient::OpenGL;	1148	use CFPlus::OpenGL;
		1149
		1150	sub new {
		1151	my ($class, %arg) = @_;
		1152
		1153	if ((exists $arg{label}) && !ref $arg{label}) {
		1154	$arg{label} = new CFPlus::UI::Label
		1155	align => 1,
		1156	valign => 0,
		1157	text => $arg{label},
		1158	fontsize => ($arg{border} || 0.8) * 0.75;
		1159	}
		1160
		1161	my $self = $class->SUPER::new (
		1162	# label => "",
		1163	fg => [0.6, 0.3, 0.1],
		1164	border => 0.8,
		1165	style => 'single',
		1166	%arg,
		1167	);
		1168
		1169	$self
		1170	}
		1171
		1172	sub add {
		1173	my ($self, @widgets) = @_;
		1174
		1175	$self->SUPER::add (@widgets);
		1176	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1177	}
		1178
		1179	sub border {
		1180	int $_[0]{border} * $::FONTSIZE
		1181	}
		1182
		1183	sub size_request {
		1184	my ($self) = @_;
		1185
		1186	($self->{label_w}, undef) = $self->{label}->size_request
		1187	if $self->{label};
		1188
		1189	my ($w, $h) = $self->SUPER::size_request;
		1190
		1191	(
		1192	$w + $self->border * 2,
		1193	$h + $self->border * 2,
		1194	)
		1195	}
		1196
		1197	sub invoke_size_allocate {
		1198	my ($self, $w, $h) = @_;
		1199
		1200	my $border = $self->border;
		1201
		1202	$w -= List::Util::max 0, $border * 2;
		1203	$h -= List::Util::max 0, $border * 2;
		1204
		1205	if (my $label = $self->{label}) {
		1206	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1207	$label->{h} = List::Util::min $h, $border;
		1208	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1209	}
		1210
		1211	$self->child->configure ($border, $border, $w, $h);
		1212
		1213	1
		1214	}
		1215
		1216	sub _draw {
		1217	my ($self) = @_;
		1218
		1219	my $child = $self->{children}[0];
		1220
		1221	my $border = $self->border;
		1222	my ($w, $h) = ($self->{w}, $self->{h});
		1223
		1224	$child->draw;
		1225
		1226	glColor @{$self->{fg}};
		1227	glBegin GL_LINE_STRIP;
		1228	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1229	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1230	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1231	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1232	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1233	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1234	glEnd;
		1235
		1236	if ($self->{label}) {
		1237	glTranslate $border * 2, 0;
		1238	$self->{label}->_draw;
		1239	}
		1240	}
		1241
		1242	#############################################################################
		1243
		1244	package CFPlus::UI::Toplevel;
		1245
		1246	our @ISA = CFPlus::UI::Bin::;
		1247
		1248	use CFPlus::OpenGL;
1063		1249
1064	my $bg =	1250	my $bg =
1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1251	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066	mipmap => 1, wrap => 1;	1252	mipmap => 1, wrap => 1;
1067		1253
1068	my @border =	1254	my @border =
1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1255	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);	1256	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071		1257
1072	sub new {	1258	sub new {
1073	my ($class, %arg) = @_;	1259	my ($class, %arg) = @_;
1074		1260
1075	my $self = $class->SUPER::new (	1261	my $self = $class->SUPER::new (
1076	bg => [1, 1, 1, 1],	1262	bg => [1, 1, 1, 1],
1077	border_bg => [1, 1, 1, 1],	1263	border_bg => [1, 1, 1, 1],
1078	border => 0.6,	1264	border => 0.6,
1079	can_events => 1,	1265	can_events => 1,
1080	min_w => 16,	1266	min_w => 64,
1081	min_h => 16,	1267	min_h => 32,
1082	%arg,	1268	%arg,
1083	);	1269	);
1084		1270
1085	$self->{title_widget} = new CFClient::UI::Label	1271	$self->{title_widget} = new CFPlus::UI::Label
1086	align => 0,	1272	align => 0,
1087	valign => 1,	1273	valign => 1,
1088	text => $self->{title},	1274	text => $self->{title},
1089	fontsize => $self->{border},	1275	fontsize => $self->{border},
1090	if exists $self->{title};	1276	if exists $self->{title};
1091		1277
1092	if ($self->{has_close_button}) {	1278	if ($self->{has_close_button}) {
1093	$self->{close_button} =	1279	$self->{close_button} =
1094	new CFClient::UI::ImageButton	1280	new CFPlus::UI::ImageButton
1095	image => 'x1_close.png',	1281	path => 'x1_close.png',
1096	on_activate => sub { $self->hide };	1282	on_activate => sub { $self->emit ("delete") };
1097		1283
1098	$self->CFClient::UI::Container::add ($self->{close_button});	1284	$self->CFPlus::UI::Container::add ($self->{close_button});
1099	}	1285	}
1100		1286
1101	$self	1287	$self
1102	}	1288	}
1103		1289
1104	sub add {	1290	sub add {
1105	my ($self, @widgets) = @_;	1291	my ($self, @widgets) = @_;
1106		1292
1107	$self->SUPER::add (@widgets);	1293	$self->SUPER::add (@widgets);
1108	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1294	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1295	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1110	}	1296	}
1111		1297
1112	sub border {	1298	sub border {
1113	int $_[0]{border} * $::FONTSIZE	1299	int $_[0]{border} * $::FONTSIZE
1114	}	1300	}
…		…
1147	$self->child->configure ($border, $border, $w, $h);	1333	$self->child->configure ($border, $border, $w, $h);
1148		1334
1149	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1335	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150	if $self->{close_button};	1336	if $self->{close_button};
1151		1337
		1338	1
		1339	}
		1340
		1341	sub invoke_delete {
		1342	my ($self) = @_;
		1343
		1344	$self->hide;
		1345
1152	1	1346	1
1153	}	1347	}
1154		1348
1155	sub invoke_button_down {	1349	sub invoke_button_down {
1156	my ($self, $ev, $x, $y) = @_;	1350	my ($self, $ev, $x, $y) = @_;
…		…
1214	$self->{motion}->($ev, $x, $y) if $self->{motion};	1408	$self->{motion}->($ev, $x, $y) if $self->{motion};
1215		1409
1216	! ! $self->{motion}	1410	! ! $self->{motion}
1217	}	1411	}
1218		1412
		1413	sub invoke_visibility_change {
		1414	my ($self, $visible) = @_;
		1415
		1416	delete $self->{motion} unless $visible;
		1417
		1418	0
		1419	}
		1420
1219	sub _draw {	1421	sub _draw {
1220	my ($self) = @_;	1422	my ($self) = @_;
1221		1423
1222	my $child = $self->{children}[0];	1424	my $child = $self->{children}[0];
1223		1425
…		…
1260	if $self->{close_button};	1462	if $self->{close_button};
1261	}	1463	}
1262		1464
1263	#############################################################################	1465	#############################################################################
1264		1466
1265	package CFClient::UI::Table;	1467	package CFPlus::UI::Table;
1266		1468
1267	our @ISA = CFClient::UI::Base::;	1469	our @ISA = CFPlus::UI::Base::;
1268		1470
1269	use List::Util qw(max sum);	1471	use List::Util qw(max sum);
1270		1472
1271	use CFClient::OpenGL;	1473	use CFPlus::OpenGL;
1272		1474
1273	sub new {	1475	sub new {
1274	my $class = shift;	1476	my $class = shift;
1275		1477
1276	$class->SUPER::new (	1478	$class->SUPER::new (
…		…
1282	sub children {	1484	sub children {
1283	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1485	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284	}	1486	}
1285		1487
1286	sub add {	1488	sub add {
1287	my ($self, $x, $y, $child) = @_;	1489	my ($self) = shift;
1288		1490
		1491	while (@_) {
		1492	my ($x, $y, $child) = splice @_, 0, 3, ();
1289	$child->set_parent ($self);	1493	$child->set_parent ($self);
1290	$self->{children}[$y][$x] = $child;	1494	$self->{children}[$y][$x] = $child;
		1495	}
1291		1496
		1497	$self->{force_realloc} = 1;
		1498	$self->{force_size_alloc} = 1;
1292	$self->realloc;	1499	$self->realloc;
1293	}	1500	}
1294		1501
1295	sub remove {	1502	sub remove {
1296	my ($self, $child) = @_;	1503	my ($self, $child) = @_;
…		…
1361		1568
1362	# linearly scale sizes	1569	# linearly scale sizes
1363	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1570	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1571	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365		1572
1366	CFClient::UI::harmonize $ws;	1573	CFPlus::UI::harmonize $ws;
1367	CFClient::UI::harmonize $hs;	1574	CFPlus::UI::harmonize $hs;
1368		1575
1369	my $y;	1576	my $y;
1370		1577
1371	for my $r (0 .. $#{$self->{children}}) {	1578	for my $r (0 .. $#{$self->{children}}) {
1372	my $row = $self->{children}[$r]	1579	my $row = $self->{children}[$r]
…		…
1415	}	1622	}
1416	}	1623	}
1417		1624
1418	#############################################################################	1625	#############################################################################
1419		1626
1420	package CFClient::UI::Box;	1627	package CFPlus::UI::Box;
1421		1628
1422	our @ISA = CFClient::UI::Container::;	1629	our @ISA = CFPlus::UI::Container::;
1423		1630
1424	sub size_request {	1631	sub size_request {
1425	my ($self) = @_;	1632	my ($self) = @_;
1426		1633
1427	$self->{vertical}	1634	$self->{vertical}
…		…
1437		1644
1438	sub invoke_size_allocate {	1645	sub invoke_size_allocate {
1439	my ($self, $w, $h) = @_;	1646	my ($self, $w, $h) = @_;
1440		1647
1441	my $space = $self->{vertical} ? $h : $w;	1648	my $space = $self->{vertical} ? $h : $w;
1442	my $children = $self->{children};	1649	my @children = $self->visible_children;
1443		1650
1444	my @req;	1651	my @req;
1445		1652
1446	if ($self->{homogeneous}) {	1653	if ($self->{homogeneous}) {
1447	@req = ($space / (@$children || 1)) x @$children;	1654	@req = ($space / (@children || 1)) x @children;
1448	} else {	1655	} else {
1449	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1656	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450	my $req = List::Util::sum @req;	1657	my $req = List::Util::sum @req;
1451		1658
1452	if ($req > $space) {	1659	if ($req > $space) {
1453	# ah well, not enough space	1660	# ah well, not enough space
1454	$_ *= $space / $req for @req;	1661	$_ *= $space / $req for @req;
1455	} else {	1662	} else {
1456	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1663	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457		1664
1458	$space = ($space - $req) / $expand; # remaining space to give away	1665	$space = ($space - $req) / $expand; # remaining space to give away
1459		1666
1460	$req[$_] += $space * $children->[$_]{expand}	1667	$req[$_] += $space * $children[$_]{expand}
1461	for 0 .. $#$children;	1668	for 0 .. $#children;
1462	}	1669	}
1463	}	1670	}
1464		1671
1465	CFClient::UI::harmonize \@req;	1672	CFPlus::UI::harmonize \@req;
1466		1673
1467	my $pos = 0;	1674	my $pos = 0;
1468	for (0 .. $#$children) {	1675	for (0 .. $#children) {
1469	my $alloc = $req[$_];	1676	my $alloc = $req[$_];
1470	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1677	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471		1678
1472	$pos += $alloc;	1679	$pos += $alloc;
1473	}	1680	}
1474		1681
1475	1	1682	1
1476	}	1683	}
1477		1684
1478	#############################################################################	1685	#############################################################################
1479		1686
1480	package CFClient::UI::HBox;	1687	package CFPlus::UI::HBox;
1481		1688
1482	our @ISA = CFClient::UI::Box::;	1689	our @ISA = CFPlus::UI::Box::;
1483		1690
1484	sub new {	1691	sub new {
1485	my $class = shift;	1692	my $class = shift;
1486		1693
1487	$class->SUPER::new (	1694	$class->SUPER::new (
…		…
1490	)	1697	)
1491	}	1698	}
1492		1699
1493	#############################################################################	1700	#############################################################################
1494		1701
1495	package CFClient::UI::VBox;	1702	package CFPlus::UI::VBox;
1496		1703
1497	our @ISA = CFClient::UI::Box::;	1704	our @ISA = CFPlus::UI::Box::;
1498		1705
1499	sub new {	1706	sub new {
1500	my $class = shift;	1707	my $class = shift;
1501		1708
1502	$class->SUPER::new (	1709	$class->SUPER::new (
…		…
1505	)	1712	)
1506	}	1713	}
1507		1714
1508	#############################################################################	1715	#############################################################################
1509		1716
1510	package CFClient::UI::Label;	1717	package CFPlus::UI::Label;
1511		1718
1512	our @ISA = CFClient::UI::DrawBG::;	1719	our @ISA = CFPlus::UI::DrawBG::;
1513		1720
1514	use CFClient::OpenGL;	1721	use CFPlus::OpenGL;
1515		1722
1516	sub new {	1723	sub new {
1517	my ($class, %arg) = @_;	1724	my ($class, %arg) = @_;
1518		1725
1519	my $self = $class->SUPER::new (	1726	my $self = $class->SUPER::new (
…		…
1522	#active_bg => none	1729	#active_bg => none
1523	#font => default_font	1730	#font => default_font
1524	#text => initial text	1731	#text => initial text
1525	#markup => initial narkup	1732	#markup => initial narkup
1526	#max_w => maximum pixel width	1733	#max_w => maximum pixel width
		1734	#style => 0, # render flags
1527	ellipsise => 3, # end	1735	ellipsise => 3, # end
1528	layout => (new CFClient::Layout),	1736	layout => (new CFPlus::Layout),
1529	fontsize => 1,	1737	fontsize => 1,
1530	align => -1,	1738	align => -1,
1531	valign => -1,	1739	valign => -1,
1532	padding_x => 2,	1740	padding_x => 2,
1533	padding_y => 2,	1741	padding_y => 2,
1534	can_events => 0,	1742	can_events => 0,
1535	%arg	1743	%arg
1536	);	1744	);
1537		1745
1538	if (exists $self->{template}) {	1746	if (exists $self->{template}) {
1539	my $layout = new CFClient::Layout;	1747	my $layout = new CFPlus::Layout;
1540	$layout->set_text (delete $self->{template});	1748	$layout->set_text (delete $self->{template});
1541	$self->{template} = $layout;	1749	$self->{template} = $layout;
1542	}	1750	}
1543		1751
1544	if (exists $self->{markup}) {	1752	if (exists $self->{markup}) {
…		…
1548	}	1756	}
1549		1757
1550	$self	1758	$self
1551	}	1759	}
1552		1760
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 {	1761	sub update {
1564	my ($self) = @_;	1762	my ($self) = @_;
1565		1763
1566	delete $self->{texture};	1764	delete $self->{texture};
1567	$self->SUPER::update;	1765	$self->SUPER::update;
…		…
1578	my ($self, $text) = @_;	1776	my ($self, $text) = @_;
1579		1777
1580	return if $self->{text} eq "T$text";	1778	return if $self->{text} eq "T$text";
1581	$self->{text} = "T$text";	1779	$self->{text} = "T$text";
1582		1780
1583	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584	$self->{layout}->set_text ($text);	1781	$self->{layout}->set_text ($text);
1585		1782
1586	delete $self->{size_req};	1783	delete $self->{size_req};
1587	$self->realloc;	1784	$self->realloc;
1588	$self->update;	1785	$self->update;
…		…
1594	return if $self->{text} eq "M$markup";	1791	return if $self->{text} eq "M$markup";
1595	$self->{text} = "M$markup";	1792	$self->{text} = "M$markup";
1596		1793
1597	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1794	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598		1795
1599	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600	$self->{layout}->set_markup ($markup);	1796	$self->{layout}->set_markup ($markup);
1601		1797
1602	delete $self->{size_req};	1798	delete $self->{size_req};
1603	$self->realloc;	1799	$self->realloc;
1604	$self->update;	1800	$self->update;
…		…
1616		1812
1617	my ($w, $h) = $self->{layout}->size;	1813	my ($w, $h) = $self->{layout}->size;
1618		1814
1619	if (exists $self->{template}) {	1815	if (exists $self->{template}) {
1620	$self->{template}->set_font ($self->{font}) if $self->{font};	1816	$self->{template}->set_font ($self->{font}) if $self->{font};
		1817	$self->{template}->set_width ($self->{max_w} || -1);
1621	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1818	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622		1819
1623	my ($w2, $h2) = $self->{template}->size;	1820	my ($w2, $h2) = $self->{template}->size;
1624		1821
1625	$w = List::Util::max $w, $w2;	1822	$w = List::Util::max $w, $w2;
…		…
1630	};	1827	};
1631		1828
1632	@{ $self->{size_req} }	1829	@{ $self->{size_req} }
1633	}	1830	}
1634		1831
		1832	sub baseline_shift {
		1833	$_[0]{layout}->descent
		1834	}
		1835
1635	sub invoke_size_allocate {	1836	sub invoke_size_allocate {
1636	my ($self, $w, $h) = @_;	1837	my ($self, $w, $h) = @_;
1637		1838
1638	delete $self->{ox};	1839	delete $self->{ox};
1639		1840
…		…
1645		1846
1646	sub set_fontsize {	1847	sub set_fontsize {
1647	my ($self, $fontsize) = @_;	1848	my ($self, $fontsize) = @_;
1648		1849
1649	$self->{fontsize} = $fontsize;	1850	$self->{fontsize} = $fontsize;
		1851	delete $self->{size_req};
1650	delete $self->{texture};	1852	delete $self->{texture};
1651		1853
1652	$self->realloc;	1854	$self->realloc;
1653	}	1855	}
1654		1856
1655	sub reconfigure {	1857	sub reconfigure {
1656	my ($self) = @_;	1858	my ($self) = @_;
1657		1859
1658	delete $self->{size_req};	1860	delete $self->{size_req};
		1861	delete $self->{texture};
1659		1862
1660	$self->SUPER::reconfigure;	1863	$self->SUPER::reconfigure;
1661	}	1864	}
1662		1865
1663	sub _draw {	1866	sub _draw {
1664	my ($self) = @_;	1867	my ($self) = @_;
1665		1868
1666	$self->SUPER::_draw; # draw background, if applicable	1869	$self->SUPER::_draw; # draw background, if applicable
1667		1870
1668	my $tex = $self->{texture} ||= do {	1871	my $size = $self->{texture} ||= do {
1669	$self->{layout}->set_foreground (@{$self->{fg}});	1872	$self->{layout}->set_foreground (@{$self->{fg}});
1670	$self->{layout}->set_font ($self->{font}) if $self->{font};	1873	$self->{layout}->set_font ($self->{font}) if $self->{font};
1671	$self->{layout}->set_width ($self->{w});	1874	$self->{layout}->set_width ($self->{w});
1672	$self->{layout}->set_ellipsise ($self->{ellipsise});	1875	$self->{layout}->set_ellipsise ($self->{ellipsise});
1673	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1876	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1877	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675		1878
1676	new_from_layout CFClient::Texture $self->{layout}	1879	[$self->{layout}->size]
1677	};	1880	};
1678		1881
1679	unless (exists $self->{ox}) {	1882	unless (exists $self->{ox}) {
1680	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1883	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1884	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682	: ($self->{w} - $tex->{w}) * 0.5);	1885	: ($self->{w} - $size->[0]) * 0.5);
1683		1886
1684	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1887	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1888	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686	: ($self->{h} - $tex->{h}) * 0.5);	1889	: ($self->{h} - $size->[1]) * 0.5);
1687	};	1890	};
1688		1891
1689	glEnable GL_TEXTURE_2D;
1690
1691	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1892	my $w = List::Util::min $self->{w} + 4, $size->[0];
1692	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1893	my $h = List::Util::min $self->{h} + 2, $size->[1];
1693		1894
1694	if ($tex->{format} == GL_ALPHA) {	1895	$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	}	1896	}
1705		1897
1706	#############################################################################	1898	#############################################################################
1707		1899
1708	package CFClient::UI::EntryBase;	1900	package CFPlus::UI::EntryBase;
1709		1901
1710	our @ISA = CFClient::UI::Label::;	1902	our @ISA = CFPlus::UI::Label::;
1711		1903
1712	use CFClient::OpenGL;	1904	use CFPlus::OpenGL;
1713		1905
1714	sub new {	1906	sub new {
1715	my $class = shift;	1907	my $class = shift;
1716		1908
1717	$class->SUPER::new (	1909	$class->SUPER::new (
…		…
1779		1971
1780	if ($uni == 8) {	1972	if ($uni == 8) {
1781	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782	} elsif ($uni == 127) {	1974	} elsif ($uni == 127) {
1783	substr $text, $self->{cursor}, 1, "";	1975	substr $text, $self->{cursor}, 1, "";
1784	} elsif ($sym == CFClient::SDLK_LEFT) {	1976	} elsif ($sym == CFPlus::SDLK_LEFT) {
1785	--$self->{cursor} if $self->{cursor};	1977	--$self->{cursor} if $self->{cursor};
1786	} elsif ($sym == CFClient::SDLK_RIGHT) {	1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1787	++$self->{cursor} if $self->{cursor} < length $self->{text};	1979	++$self->{cursor} if $self->{cursor} < length $self->{text};
1788	} elsif ($sym == CFClient::SDLK_HOME) {	1980	} elsif ($sym == CFPlus::SDLK_HOME) {
1789	$self->{cursor} = 0;	1981	$self->{cursor} = 0;
1790	} elsif ($sym == CFClient::SDLK_END) {	1982	} elsif ($sym == CFPlus::SDLK_END) {
1791	$self->{cursor} = length $text;	1983	$self->{cursor} = length $text;
		1984	} elsif ($uni == 21) { # ctrl-u
		1985	$text = "";
		1986	$self->{cursor} = 0;
1792	} elsif ($uni == 27) {	1987	} elsif ($uni == 27) {
1793	$self->emit ('escape');	1988	$self->emit ('escape');
1794	} elsif ($uni) {	1989	} elsif ($uni) {
1795	substr $text, $self->{cursor}++, 0, chr $uni;	1990	substr $text, $self->{cursor}++, 0, chr $uni;
1796	} else {	1991	} else {
…		…
1819		2014
1820	my $idx = $self->{layout}->xy_to_index ($x, $y);	2015	my $idx = $self->{layout}->xy_to_index ($x, $y);
1821		2016
1822	# byte-index to char-index	2017	# byte-index to char-index
1823	my $text = $self->{text};	2018	my $text = $self->{text};
1824	utf8::encode $text;	2019	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825	$self->{cursor} = length substr $text, 0, $idx;	2020	$self->{cursor} = length $text;
1826		2021
1827	$self->_set_text ($self->{text});	2022	$self->_set_text ($self->{text});
1828	$self->update;	2023	$self->update;
1829		2024
1830	1	2025	1
…		…
1869	utf8::encode $text;	2064	utf8::encode $text;
1870		2065
1871	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2066	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1872	}	2067	}
1873		2068
1874	glColor @{$self->{fg}};
1875	glBegin GL_LINES;	2069	glBegin GL_LINES;
1876	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2070	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2071	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878	glEnd;	2072	glEnd;
1879	}	2073	}
1880	}	2074	}
1881		2075
1882	package CFClient::UI::Entry;	2076	package CFPlus::UI::Entry;
1883		2077
1884	our @ISA = CFClient::UI::EntryBase::;	2078	our @ISA = CFPlus::UI::EntryBase::;
1885		2079
1886	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1887		2081
1888	sub invoke_key_down {	2082	sub invoke_key_down {
1889	my ($self, $ev) = @_;	2083	my ($self, $ev) = @_;
1890		2084
1891	my $sym = $ev->{sym};	2085	my $sym = $ev->{sym};
…		…
1897	$self->{history_pointer} = -1;	2091	$self->{history_pointer} = -1;
1898	$self->{history_saveback} = '';	2092	$self->{history_saveback} = '';
1899	$self->emit (activate => $txt);	2093	$self->emit (activate => $txt);
1900	$self->update;	2094	$self->update;
1901		2095
1902	} elsif ($sym == CFClient::SDLK_UP) {	2096	} elsif ($sym == CFPlus::SDLK_UP) {
1903	if ($self->{history_pointer} < 0) {	2097	if ($self->{history_pointer} < 0) {
1904	$self->{history_saveback} = $self->get_text;	2098	$self->{history_saveback} = $self->get_text;
1905	}	2099	}
1906	if (@{$self->{history} || []} > 0) {	2100	if (@{$self->{history} || []} > 0) {
1907	$self->{history_pointer}++;	2101	$self->{history_pointer}++;
…		…
1909	$self->{history_pointer} = @{$self->{history} || []} - 1;	2103	$self->{history_pointer} = @{$self->{history} || []} - 1;
1910	}	2104	}
1911	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2105	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1912	}	2106	}
1913		2107
1914	} elsif ($sym == CFClient::SDLK_DOWN) {	2108	} elsif ($sym == CFPlus::SDLK_DOWN) {
1915	$self->{history_pointer}--;	2109	$self->{history_pointer}--;
1916	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2110	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917		2111
1918	if ($self->{history_pointer} >= 0) {	2112	if ($self->{history_pointer} >= 0) {
1919	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2113	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1928	1	2122	1
1929	}	2123	}
1930		2124
1931	#############################################################################	2125	#############################################################################
1932		2126
1933	package CFClient::UI::Button;	2127	package CFPlus::UI::Button;
1934		2128
1935	our @ISA = CFClient::UI::Label::;	2129	our @ISA = CFPlus::UI::Label::;
1936		2130
1937	use CFClient::OpenGL;	2131	use CFPlus::OpenGL;
1938		2132
1939	my @tex =	2133	my @tex =
1940	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2134	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941	qw(b1_button_active.png);	2135	qw(b1_button_active.png);
1942		2136
1943	sub new {	2137	sub new {
1944	my $class = shift;	2138	my $class = shift;
1945		2139
…		…
1982	$self->SUPER::_draw;	2176	$self->SUPER::_draw;
1983	}	2177	}
1984		2178
1985	#############################################################################	2179	#############################################################################
1986		2180
		2181	package CFPlus::UI::CheckBox;
		2182
		2183	our @ISA = CFPlus::UI::DrawBG::;
		2184
		2185	my @tex =
		2186	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2187	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2188
		2189	use CFPlus::OpenGL;
		2190
		2191	sub new {
		2192	my $class = shift;
		2193
		2194	$class->SUPER::new (
		2195	padding_x => 2,
		2196	padding_y => 2,
		2197	fg => [1, 1, 1],
		2198	active_fg => [1, 1, 0],
		2199	bg => [0, 0, 0, 0.2],
		2200	active_bg => [1, 1, 1, 0.5],
		2201	state => 0,
		2202	can_hover => 1,
		2203	@_
		2204	)
		2205	}
		2206
		2207	sub size_request {
		2208	my ($self) = @_;
		2209
		2210	(6) x 2
		2211	}
		2212
		2213	sub toggle {
		2214	my ($self) = @_;
		2215
		2216	$self->{state} = !$self->{state};
		2217	$self->emit (changed => $self->{state});
		2218	$self->update;
		2219	}
		2220
		2221	sub invoke_button_down {
		2222	my ($self, $ev, $x, $y) = @_;
		2223
		2224	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2225	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2226	$self->toggle;
		2227	} else {
		2228	return 0
		2229	}
		2230
		2231	1
		2232	}
		2233
		2234	sub _draw {
		2235	my ($self) = @_;
		2236
		2237	$self->SUPER::_draw;
		2238
		2239	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2240
		2241	my ($w, $h) = @$self{qw(w h)};
		2242
		2243	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2244
		2245	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2246
		2247	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2248
		2249	glEnable GL_TEXTURE_2D;
		2250	$tex->draw_quad_alpha (0, 0, $s, $s);
		2251	glDisable GL_TEXTURE_2D;
		2252	}
		2253
		2254	#############################################################################
		2255
		2256	package CFPlus::UI::Image;
		2257
		2258	our @ISA = CFPlus::UI::Base::;
		2259
		2260	use CFPlus::OpenGL;
		2261
		2262	our %texture_cache;
		2263
		2264	sub new {
		2265	my $class = shift;
		2266
		2267	my $self = $class->SUPER::new (
		2268	can_events => 0,
		2269	@_,
		2270	);
		2271
		2272	$self->{path} || $self->{tex}
		2273	or Carp::croak "'path' or 'tex' attributes required";
		2274
		2275	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2276	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2277
		2278	Scalar::Util::weaken $texture_cache{$self->{path}};
		2279
		2280	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2281
		2282	$self
		2283	}
		2284
		2285	sub STORABLE_freeze {
		2286	my ($self, $cloning) = @_;
		2287
		2288	$self->{path}
		2289	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2290
		2291	$self->{path}
		2292	}
		2293
		2294	sub STORABLE_attach {
		2295	my ($self, $cloning, $path) = @_;
		2296
		2297	$self->new (path => $path)
		2298	}
		2299
		2300	sub size_request {
		2301	my ($self) = @_;
		2302
		2303	($self->{tex}{w}, $self->{tex}{h})
		2304	}
		2305
		2306	sub _draw {
		2307	my ($self) = @_;
		2308
		2309	my $tex = $self->{tex};
		2310
		2311	my ($w, $h) = ($self->{w}, $self->{h});
		2312
		2313	if ($self->{rot90}) {
		2314	glRotate 90, 0, 0, 1;
		2315	glTranslate 0, -$self->{w}, 0;
		2316
		2317	($w, $h) = ($h, $w);
		2318	}
		2319
		2320	glEnable GL_TEXTURE_2D;
		2321	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2322
		2323	$tex->draw_quad (0, 0, $w, $h);
		2324
		2325	glDisable GL_TEXTURE_2D;
		2326	}
		2327
		2328	#############################################################################
		2329
1987	package CFClient::UI::ImageButton;	2330	package CFPlus::UI::ImageButton;
1988		2331
1989	our @ISA = CFClient::UI::Image::;	2332	our @ISA = CFPlus::UI::Image::;
1990		2333
1991	use CFClient::OpenGL;	2334	use CFPlus::OpenGL;
1992		2335
1993	my %textures;	2336	my %textures;
1994		2337
1995	sub new {	2338	sub new {
1996	my $class = shift;	2339	my $class = shift;
…		…
2018	1	2361	1
2019	}	2362	}
2020		2363
2021	#############################################################################	2364	#############################################################################
2022		2365
2023	package CFClient::UI::CheckBox;
2024
2025	our @ISA = CFClient::UI::DrawBG::;
2026
2027	my @tex =
2028	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2029	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2030
2031	use CFClient::OpenGL;
2032
2033	sub new {
2034	my $class = shift;
2035
2036	$class->SUPER::new (
2037	padding_x => 2,
2038	padding_y => 2,
2039	fg => [1, 1, 1],
2040	active_fg => [1, 1, 0],
2041	bg => [0, 0, 0, 0.2],
2042	active_bg => [1, 1, 1, 0.5],
2043	state => 0,
2044	can_hover => 1,
2045	@_
2046	)
2047	}
2048
2049	sub size_request {
2050	my ($self) = @_;
2051
2052	(6) x 2
2053	}
2054
2055	sub invoke_button_down {
2056	my ($self, $ev, $x, $y) = @_;
2057
2058	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2059	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2060	$self->{state} = !$self->{state};
2061	$self->emit (changed => $self->{state});
2062	} else {
2063	return 0
2064	}
2065
2066	1
2067	}
2068
2069	sub _draw {
2070	my ($self) = @_;
2071
2072	$self->SUPER::_draw;
2073
2074	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2075
2076	my ($w, $h) = @$self{qw(w h)};
2077
2078	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2079
2080	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2081
2082	my $tex = $self->{state} ? $tex[1] : $tex[0];
2083
2084	glEnable GL_TEXTURE_2D;
2085	$tex->draw_quad_alpha (0, 0, $s, $s);
2086	glDisable GL_TEXTURE_2D;
2087	}
2088
2089	#############################################################################
2090
2091	package CFClient::UI::Image;	2366	package CFPlus::UI::VGauge;
2092		2367
2093	our @ISA = CFClient::UI::Base::;	2368	our @ISA = CFPlus::UI::Base::;
2094
2095	use CFClient::OpenGL;
2096	use Carp qw/confess/;
2097
2098	our %loaded_images;
2099
2100	sub new {
2101	my $class = shift;
2102
2103	my $self = $class->SUPER::new (can_events => 0, @_);
2104
2105	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2106
2107	$loaded_images{$self->{image}} ||=
2108	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2109
2110	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2111
2112	Scalar::Util::weaken $loaded_images{$self->{image}};
2113
2114	$self->{aspect} = $tex->{w} / $tex->{h};
2115
2116	$self
2117	}
2118
2119	sub size_request {
2120	my ($self) = @_;
2121
2122	($self->{tex}->{w}, $self->{tex}->{h})
2123	}
2124
2125	sub _draw {
2126	my ($self) = @_;
2127
2128	my $tex = $self->{tex};
2129
2130	my ($w, $h) = ($self->{w}, $self->{h});
2131
2132	if ($self->{rot90}) {
2133	glRotate 90, 0, 0, 1;
2134	glTranslate 0, -$self->{w}, 0;
2135
2136	($w, $h) = ($h, $w);
2137	}
2138
2139	glEnable GL_TEXTURE_2D;
2140	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2141
2142	$tex->draw_quad_alpha (0, 0, $w, $h);
2143
2144	glDisable GL_TEXTURE_2D;
2145	}
2146
2147	#############################################################################
2148
2149	package CFClient::UI::VGauge;
2150
2151	our @ISA = CFClient::UI::Base::;
2152		2369
2153	use List::Util qw(min max);	2370	use List::Util qw(min max);
2154		2371
2155	use CFClient::OpenGL;	2372	use CFPlus::OpenGL;
2156		2373
2157	my %tex = (	2374	my %tex = (
2158	food => [	2375	food => [
2159	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2376	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2160	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2377	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2161	],	2378	],
2162	grace => [	2379	grace => [
2163	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2380	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2164	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2381	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2165	],	2382	],
2166	hp => [	2383	hp => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2384	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2385	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2169	],	2386	],
2170	mana => [	2387	mana => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2388	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2389	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2173	],	2390	],
2174	);	2391	);
2175		2392
2176	# eg. VGauge->new (gauge => 'food'), default gauge: food	2393	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2236	my $ycut1 = max 0, min 1, $ycut;	2453	my $ycut1 = max 0, min 1, $ycut;
2237	my $ycut2 = max 0, min 1, $ycut - 1;	2454	my $ycut2 = max 0, min 1, $ycut - 1;
2238		2455
2239	my $h1 = $self->{h} * (1 - $ycut1);	2456	my $h1 = $self->{h} * (1 - $ycut1);
2240	my $h2 = $self->{h} * (1 - $ycut2);	2457	my $h2 = $self->{h} * (1 - $ycut2);
		2458	my $h3 = $self->{h};
		2459
		2460	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2241		2461
2242	glEnable GL_BLEND;	2462	glEnable GL_BLEND;
2243	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2463	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2464	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2245	glEnable GL_TEXTURE_2D;	2465	glEnable GL_TEXTURE_2D;
…		…
2264		2484
2265	if ($t3) {	2485	if ($t3) {
2266	glBindTexture GL_TEXTURE_2D, $t3->{name};	2486	glBindTexture GL_TEXTURE_2D, $t3->{name};
2267	glBegin GL_QUADS;	2487	glBegin GL_QUADS;
2268	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2488	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2269	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2489	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2270	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2490	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2271	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2491	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2272	glEnd;	2492	glEnd;
2273	}	2493	}
2274		2494
2275	glDisable GL_BLEND;	2495	glDisable GL_BLEND;
2276	glDisable GL_TEXTURE_2D;	2496	glDisable GL_TEXTURE_2D;
2277	}	2497	}
2278		2498
2279	#############################################################################	2499	#############################################################################
2280		2500
2281	package CFClient::UI::Gauge;	2501	package CFPlus::UI::Gauge;
2282		2502
2283	our @ISA = CFClient::UI::VBox::;	2503	our @ISA = CFPlus::UI::VBox::;
2284		2504
2285	sub new {	2505	sub new {
2286	my ($class, %arg) = @_;	2506	my ($class, %arg) = @_;
2287		2507
2288	my $self = $class->SUPER::new (	2508	my $self = $class->SUPER::new (
…		…
2290	can_hover => 1,	2510	can_hover => 1,
2291	can_events => 1,	2511	can_events => 1,
2292	%arg,	2512	%arg,
2293	);	2513	);
2294		2514
2295	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2515	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2296	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2516	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2297	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2517	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2298		2518
2299	$self	2519	$self
2300	}	2520	}
2301		2521
2302	sub set_fontsize {	2522	sub set_fontsize {
…		…
2323	$self->{value}->set_text ($val);	2543	$self->{value}->set_text ($val);
2324	}	2544	}
2325		2545
2326	#############################################################################	2546	#############################################################################
2327		2547
2328	package CFClient::UI::Slider;	2548	package CFPlus::UI::Slider;
2329		2549
2330	use strict;	2550	use strict;
2331		2551
2332	use CFClient::OpenGL;	2552	use CFPlus::OpenGL;
2333		2553
2334	our @ISA = CFClient::UI::DrawBG::;	2554	our @ISA = CFPlus::UI::DrawBG::;
2335		2555
2336	my @tex =	2556	my @tex =
2337	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2557	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2338	qw(s1_slider.png s1_slider_bg.png);	2558	qw(s1_slider.png s1_slider_bg.png);
2339		2559
2340	sub new {	2560	sub new {
2341	my $class = shift;	2561	my $class = shift;
2342		2562
…		…
2410		2630
2411	$self->SUPER::invoke_button_down ($ev, $x, $y);	2631	$self->SUPER::invoke_button_down ($ev, $x, $y);
2412		2632
2413	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2633	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2414		2634
2415	$self->mouse_motion ($ev, $x, $y)	2635	$self->invoke_mouse_motion ($ev, $x, $y)
2416	}	2636	}
2417		2637
2418	sub invoke_mouse_motion {	2638	sub invoke_mouse_motion {
2419	my ($self, $ev, $x, $y) = @_;	2639	my ($self, $ev, $x, $y) = @_;
2420		2640
…		…
2429	} else {	2649	} else {
2430	return 0;	2650	return 0;
2431	}	2651	}
2432		2652
2433	1	2653	1
		2654	}
		2655
		2656	sub invoke_mouse_wheel {
		2657	my ($self, $ev) = @_;
		2658
		2659	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2660
		2661	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2662
		2663	! ! $delta
2434	}	2664	}
2435		2665
2436	sub update {	2666	sub update {
2437	my ($self) = @_;	2667	my ($self) = @_;
2438		2668
…		…
2487	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2488	}	2718	}
2489		2719
2490	#############################################################################	2720	#############################################################################
2491		2721
2492	package CFClient::UI::ValSlider;	2722	package CFPlus::UI::ValSlider;
2493		2723
2494	our @ISA = CFClient::UI::HBox::;	2724	our @ISA = CFPlus::UI::HBox::;
2495		2725
2496	sub new {	2726	sub new {
2497	my ($class, %arg) = @_;	2727	my ($class, %arg) = @_;
2498		2728
2499	my $range = delete $arg{range};	2729	my $range = delete $arg{range};
2500		2730
2501	my $self = $class->SUPER::new (	2731	my $self = $class->SUPER::new (
2502	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2732	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2503	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2733	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2504	to_value => sub { shift },	2734	to_value => sub { shift },
2505	from_value => sub { shift },	2735	from_value => sub { shift },
2506	%arg,	2736	%arg,
2507	);	2737	);
2508		2738
…		…
2528	sub set_range { shift->{slider}->set_range (@_) }	2758	sub set_range { shift->{slider}->set_range (@_) }
2529	sub set_value { shift->{slider}->set_value (@_) }	2759	sub set_value { shift->{slider}->set_value (@_) }
2530		2760
2531	#############################################################################	2761	#############################################################################
2532		2762
2533	package CFClient::UI::TextScroller;	2763	package CFPlus::UI::TextScroller;
2534		2764
2535	our @ISA = CFClient::UI::HBox::;	2765	our @ISA = CFPlus::UI::HBox::;
2536		2766
2537	use CFClient::OpenGL;	2767	use CFPlus::OpenGL;
2538		2768
2539	sub new {	2769	sub new {
2540	my $class = shift;	2770	my $class = shift;
2541		2771
2542	my $self = $class->SUPER::new (	2772	my $self = $class->SUPER::new (
2543	fontsize => 1,	2773	fontsize => 1,
2544	can_events => 0,	2774	can_events => 1,
2545	indent => 0,	2775	indent => 0,
2546	#font => default_font	2776	#font => default_font
2547	@_,	2777	@_,
2548		2778
2549	layout => (new CFClient::Layout 1),	2779	layout => (new CFPlus::Layout),
2550	par => [],	2780	par => [],
2551	height => 0,	2781	height => 0,
2552	children => [	2782	children => [
2553	(new CFClient::UI::Empty expand => 1),	2783	(new CFPlus::UI::Empty expand => 1),
2554	(new CFClient::UI::Slider vertical => 1),	2784	(new CFPlus::UI::Slider vertical => 1),
2555	],	2785	],
2556	);	2786	);
2557		2787
2558	$self->{children}[1]->connect (changed => sub { $self->update });	2788	$self->{children}[1]->connect (changed => sub { $self->update });
2559		2789
…		…
2565		2795
2566	$self->{fontsize} = $fontsize;	2796	$self->{fontsize} = $fontsize;
2567	$self->reflow;	2797	$self->reflow;
2568	}	2798	}
2569		2799
		2800	sub size_request {
		2801	my ($self) = @_;
		2802
		2803	my ($empty, $slider) = @{ $self->{children} };
		2804
		2805	local $self->{children} = [$empty, $slider];
		2806	$self->SUPER::size_request
		2807	}
		2808
2570	sub invoke_size_allocate {	2809	sub invoke_size_allocate {
2571	my ($self, $w, $h) = @_;	2810	my ($self, $w, $h) = @_;
2572		2811
		2812	my ($empty, $slider, @other) = @{ $self->{children} };
		2813	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		2814
2573	$self->{layout}->set_font ($self->{font}) if $self->{font};	2815	$self->{layout}->set_font ($self->{font}) if $self->{font};
2574	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2816	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2575	$self->{layout}->set_width ($self->{children}[0]{w});	2817	$self->{layout}->set_width ($empty->{w});
2576	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2818	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2577		2819
2578	$self->reflow;	2820	$self->reflow;
2579		2821
		2822	local $self->{children} = [$empty, $slider];
2580	$self->SUPER::invoke_size_allocate ($w, $h)	2823	$self->SUPER::invoke_size_allocate ($w, $h)
2581	}	2824	}
2582		2825
2583	sub text_size {	2826	sub invoke_mouse_wheel {
2584	my ($self, $text, $indent) = @_;	2827	my ($self, $ev) = @_;
		2828
		2829	return 0 unless $ev->{dy}; # only vertical movements
		2830
		2831	$self->{children}[1]->emit (mouse_wheel => $ev);
		2832
		2833	1
		2834	}
		2835
		2836	sub get_layout {
		2837	my ($self, $para) = @_;
2585		2838
2586	my $layout = $self->{layout};	2839	my $layout = $self->{layout};
2587		2840
		2841	$layout->set_font ($self->{font}) if $self->{font};
		2842	$layout->set_foreground (@{$para->{fg}});
2588	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2843	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2589	$layout->set_width ($self->{children}[0]{w} - $indent);	2844	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2590	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2845	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2591	$layout->set_markup ($text);	2846	$layout->set_markup ($para->{markup});
		2847
		2848	$layout->set_shapes (
		2849	map
		2850	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2851	@{$para->{widget}}
2592		2852	);
		2853
2593	$layout->size	2854	$layout
2594	}	2855	}
2595		2856
2596	sub reflow {	2857	sub reflow {
2597	my ($self) = @_;	2858	my ($self) = @_;
2598		2859
…		…
2605		2866
2606	# todo: base offset on lines or so, not on pixels	2867	# todo: base offset on lines or so, not on pixels
2607	$self->{children}[1]->set_value ($offset);	2868	$self->{children}[1]->set_value ($offset);
2608	}	2869	}
2609		2870
		2871	sub current_paragraph {
		2872	my ($self) = @_;
		2873
		2874	$self->{top_paragraph} - 1
		2875	}
		2876
		2877	sub scroll_to {
		2878	my ($self, $para) = @_;
		2879
		2880	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2881
		2882	$self->{scroll_to} = $para;
		2883	$self->update;
		2884	}
		2885
2610	sub clear {	2886	sub clear {
2611	my ($self) = @_;	2887	my ($self) = @_;
		2888
		2889	my (undef, undef, @other) = @{ $self->{children} };
		2890	$self->remove ($_) for @other;
2612		2891
2613	$self->{par} = [];	2892	$self->{par} = [];
2614	$self->{height} = 0;	2893	$self->{height} = 0;
2615	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2894	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2616	}	2895	}
2617		2896
2618	sub add_paragraph {	2897	sub add_paragraph {
2619	my ($self, $color, $text, $indent) = @_;	2898	my $self = shift;
2620		2899
2621	for my $line (split /\n/, $text) {	2900	for my $para (@_) {
2622	my ($w, $h) = $self->text_size ($line);	2901	$para = {
		2902	fg => [1, 1, 1, 1],
		2903	indent => 0,
		2904	markup => "",
		2905	widget => [],
		2906	ref $para ? %$para : (markup => $para),
		2907	w => 1e10,
		2908	wrapped => 1,
		2909	};
		2910
		2911	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2912	push @{$self->{par}}, $para;
		2913	}
		2914
		2915	$self->{need_reflow}++;
		2916	$self->update;
		2917	}
		2918
		2919	sub scroll_to_bottom {
		2920	my ($self) = @_;
		2921
		2922	$self->{scroll_to} = $#{$self->{par}};
		2923	$self->update;
		2924	}
		2925
		2926	sub force_uptodate {
		2927	my ($self) = @_;
		2928
		2929	if (delete $self->{need_reflow}) {
		2930	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2931
		2932	my $height = 0;
		2933
		2934	for my $para (@{$self->{par}}) {
		2935	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2936	my $layout = $self->get_layout ($para);
		2937	my ($w, $h) = $layout->size;
		2938
		2939	$para->{w} = $w + $para->{indent};
		2940	$para->{h} = $h;
		2941	$para->{wrapped} = $layout->has_wrapped;
		2942	}
		2943
		2944	$para->{y} = $height;
		2945	$height += $para->{h};
		2946	}
		2947
2623	$self->{height} += $h;	2948	$self->{height} = $height;
2624	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2949	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2625	}
2626		2950
2627	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2951	delete $self->{texture};
		2952	}
		2953
		2954	if (my $paridx = delete $self->{scroll_to}) {
		2955	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2956	}
2628	}	2957	}
2629		2958
2630	sub update {	2959	sub update {
2631	my ($self) = @_;	2960	my ($self) = @_;
2632		2961
…		…
2635	return unless $self->{h} > 0;	2964	return unless $self->{h} > 0;
2636		2965
2637	delete $self->{texture};	2966	delete $self->{texture};
2638		2967
2639	$ROOT->on_post_alloc ($self => sub {	2968	$ROOT->on_post_alloc ($self => sub {
		2969	$self->force_uptodate;
		2970
2640	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2971	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2641		2972
2642	if (delete $self->{need_reflow}) {
2643	my $height = 0;
2644
2645	my $layout = $self->{layout};
2646
2647	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2648
2649	for (@{$self->{par}}) {
2650	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2651	$layout->set_width ($W - $_->[3]);
2652	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2653	$layout->set_markup ($_->[4]);
2654	my ($w, $h) = $layout->size;
2655	$_->[0] = $w + $_->[3];
2656	$_->[1] = $h;
2657	}
2658
2659	$height += $_->[1];
2660	}
2661
2662	$self->{height} = $height;
2663
2664	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2665
2666	delete $self->{texture};
2667	}
2668
2669	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2973	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2670	glClearColor 0, 0, 0, 0;	2974	glClearColor 0, 0, 0, 0;
2671	glClear GL_COLOR_BUFFER_BIT;	2975	glClear GL_COLOR_BUFFER_BIT;
2672		2976
		2977	package CFPlus::UI::Base;
		2978	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		2979	(0, 0, $self->{w}, $self->{h});
		2980
		2981	my $top = int $self->{children}[1]{range}[0];
		2982
		2983	my $paridx = 0;
		2984	my $top_paragraph;
2673	my $top = int $self->{children}[1]{range}[0];	2985	my $top = int $self->{children}[1]{range}[0];
2674		2986
2675	my $y0 = $top;	2987	my $y0 = $top;
2676	my $y1 = $top + $H;	2988	my $y1 = $top + $H;
2677		2989
2678	my $y = 0;
2679
2680	my $layout = $self->{layout};
2681
2682	$layout->set_font ($self->{font}) if $self->{font};
2683
2684	glEnable GL_BLEND;
2685	#TODO# not correct in windows where rgba is forced off
2686	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2687
2688	for my $par (@{$self->{par}}) {	2990	for my $para (@{$self->{par}}) {
2689	my $h = $par->[1];	2991	my $h = $para->{h};
		2992	my $y = $para->{y};
2690		2993
2691	if ($y0 < $y + $h && $y < $y1) {	2994	if ($y0 < $y + $h && $y < $y1) {
2692	$layout->set_foreground (@{ $par->[2] });	2995	my $layout = $self->get_layout ($para);
2693	$layout->set_width ($W - $par->[3]);
2694	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2695	$layout->set_markup ($par->[4]);
2696		2996
2697	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2997	$layout->render ($para->{indent}, $y - $y0);
2698		2998
2699	glRasterPos $par->[3], $y - $y0;	2999	if (my @w = @{ $para->{widget} }) {
2700	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3000	my @s = $layout->get_shapes;
		3001
		3002	for (@w) {
		3003	my ($dx, $dy) = splice @s, 0, 2, ();
		3004
		3005	$_->{x} = $dx + $para->{indent};
		3006	$_->{y} = $dy + $y - $y0;
		3007
		3008	$_->draw;
		3009	}
		3010	}
2701	}	3011	}
2702		3012
2703	$y += $h;	3013	$paridx++;
		3014	$top_paragraph ||= $paridx if $y >= $top;
2704	}	3015	}
2705		3016
2706	glDisable GL_BLEND;	3017	$self->{top_paragraph} = $top_paragraph;
2707	};	3018	};
2708	});	3019	});
		3020	}
		3021
		3022	sub reconfigure {
		3023	my ($self) = @_;
		3024
		3025	$self->SUPER::reconfigure;
		3026
		3027	$_->{w} = 1e10 for @{ $self->{par} };
		3028	$self->reflow;
2709	}	3029	}
2710		3030
2711	sub _draw {	3031	sub _draw {
2712	my ($self) = @_;	3032	my ($self) = @_;
2713		3033
…		…
2716	glColor 0, 0, 0, 1;	3036	glColor 0, 0, 0, 1;
2717	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3037	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2718	glDisable GL_TEXTURE_2D;	3038	glDisable GL_TEXTURE_2D;
2719		3039
2720	$self->{children}[1]->draw;	3040	$self->{children}[1]->draw;
2721
2722	}	3041	}
2723		3042
2724	#############################################################################	3043	#############################################################################
2725		3044
2726	package CFClient::UI::Animator;	3045	package CFPlus::UI::Animator;
2727		3046
2728	use CFClient::OpenGL;	3047	use CFPlus::OpenGL;
2729		3048
2730	our @ISA = CFClient::UI::Bin::;	3049	our @ISA = CFPlus::UI::Bin::;
2731		3050
2732	sub moveto {	3051	sub moveto {
2733	my ($self, $x, $y) = @_;	3052	my ($self, $x, $y) = @_;
2734		3053
2735	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3054	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2763	glPopMatrix;	3082	glPopMatrix;
2764	}	3083	}
2765		3084
2766	#############################################################################	3085	#############################################################################
2767		3086
2768	package CFClient::UI::Flopper;	3087	package CFPlus::UI::Flopper;
2769		3088
2770	our @ISA = CFClient::UI::Button::;	3089	our @ISA = CFPlus::UI::Button::;
2771		3090
2772	sub new {	3091	sub new {
2773	my $class = shift;	3092	my $class = shift;
2774		3093
2775	my $self = $class->SUPER::new (	3094	my $self = $class->SUPER::new (
…		…
2787	$self->{other}->toggle_visibility;	3106	$self->{other}->toggle_visibility;
2788	}	3107	}
2789		3108
2790	#############################################################################	3109	#############################################################################
2791		3110
2792	package CFClient::UI::Tooltip;	3111	package CFPlus::UI::Tooltip;
2793		3112
2794	our @ISA = CFClient::UI::Bin::;	3113	our @ISA = CFPlus::UI::Bin::;
2795		3114
2796	use CFClient::OpenGL;	3115	use CFPlus::OpenGL;
2797		3116
2798	sub new {	3117	sub new {
2799	my $class = shift;	3118	my $class = shift;
2800		3119
2801	$class->SUPER::new (	3120	$class->SUPER::new (
…		…
2804	)	3123	)
2805	}	3124	}
2806		3125
2807	sub set_tooltip_from {	3126	sub set_tooltip_from {
2808	my ($self, $widget) = @_;	3127	my ($self, $widget) = @_;
		3128
		3129	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3130	if $widget->{tooltip} =~ /^#(.*)$/;
2809		3131
2810	my $tooltip = $widget->{tooltip};	3132	my $tooltip = $widget->{tooltip};
2811		3133
2812	if ($ENV{CFPLUS_DEBUG} & 2) {	3134	if ($ENV{CFPLUS_DEBUG} & 2) {
2813	$tooltip .= "\n\n" . (ref $widget) . "\n"	3135	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2817	}	3139	}
2818		3140
2819	$tooltip =~ s/^\n+//;	3141	$tooltip =~ s/^\n+//;
2820	$tooltip =~ s/\n+$//;	3142	$tooltip =~ s/\n+$//;
2821		3143
2822	$self->add (new CFClient::UI::Label	3144	$self->add (new CFPlus::UI::Label
2823	markup => $tooltip,	3145	markup => $tooltip,
2824	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3146	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2825	fontsize => 0.8,	3147	fontsize => 0.8,
2826	fg => [0, 0, 0, 1],	3148	style => 1, # FLAG_INVERSE
2827	ellipsise => 0,	3149	ellipsise => 0,
2828	font => ($widget->{tooltip_font} || $::FONT_PROP),	3150	font => ($widget->{tooltip_font} || $::FONT_PROP),
2829	);	3151	);
2830	}	3152	}
2831		3153
…		…
2850		3172
2851	$self->{root}->on_post_alloc ("move_$self" => sub {	3173	$self->{root}->on_post_alloc ("move_$self" => sub {
2852	my $widget = $self->{owner}	3174	my $widget = $self->{owner}
2853	or return;	3175	or return;
2854		3176
		3177	if ($widget->{visible}) {
2855	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3178	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2856		3179
2857	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3180	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2858	if $x + $self->{w} > $self->{root}{w};	3181	if $x + $self->{w} > $self->{root}{w};
2859		3182
2860	$self->move_abs ($x, $y);	3183	$self->move_abs ($x, $y);
		3184	} else {
		3185	$self->hide;
		3186	}
2861	});	3187	});
2862	}	3188	}
2863		3189
2864	sub _draw {	3190	sub _draw {
2865	my ($self) = @_;	3191	my ($self) = @_;
…		…
2889	$self->SUPER::_draw;	3215	$self->SUPER::_draw;
2890	}	3216	}
2891		3217
2892	#############################################################################	3218	#############################################################################
2893		3219
2894	package CFClient::UI::Face;	3220	package CFPlus::UI::Face;
2895		3221
2896	our @ISA = CFClient::UI::Base::;	3222	our @ISA = CFPlus::UI::DrawBG::;
2897		3223
2898	use CFClient::OpenGL;	3224	use CFPlus::OpenGL;
2899		3225
2900	sub new {	3226	sub new {
2901	my $class = shift;	3227	my $class = shift;
2902		3228
2903	my $self = $class->SUPER::new (	3229	my $self = $class->SUPER::new (
…		…
2938	sub _draw {	3264	sub _draw {
2939	my ($self) = @_;	3265	my ($self) = @_;
2940		3266
2941	return unless $::CONN;	3267	return unless $::CONN;
2942		3268
		3269	$self->SUPER::_draw;
		3270
2943	my $face;	3271	my $face;
2944		3272
2945	if ($self->{frame}) {	3273	if ($self->{frame}) {
2946	my $anim = $::CONN->{anim}[$self->{anim}];	3274	my $anim = $::CONN->{anim}[$self->{anim}];
2947		3275
…		…
2969	$self->SUPER::destroy;	3297	$self->SUPER::destroy;
2970	}	3298	}
2971		3299
2972	#############################################################################	3300	#############################################################################
2973		3301
2974	package CFClient::UI::Buttonbar;	3302	package CFPlus::UI::Buttonbar;
2975		3303
2976	our @ISA = CFClient::UI::HBox::;	3304	our @ISA = CFPlus::UI::HBox::;
2977		3305
2978	# TODO: should actualyl wrap buttons and other goodies.	3306	# TODO: should actually wrap buttons and other goodies.
2979		3307
2980	#############################################################################	3308	#############################################################################
2981		3309
2982	package CFClient::UI::Menu;	3310	package CFPlus::UI::Menu;
2983		3311
2984	our @ISA = CFClient::UI::FancyFrame::;	3312	our @ISA = CFPlus::UI::Toplevel::;
2985		3313
2986	use CFClient::OpenGL;	3314	use CFPlus::OpenGL;
2987		3315
2988	sub new {	3316	sub new {
2989	my $class = shift;	3317	my $class = shift;
2990		3318
2991	my $self = $class->SUPER::new (	3319	my $self = $class->SUPER::new (
2992	items => [],	3320	items => [],
2993	z => 100,	3321	z => 100,
2994	@_,	3322	@_,
2995	);	3323	);
2996		3324
2997	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3325	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2998		3326
2999	for my $item (@{ $self->{items} }) {	3327	for my $item (@{ $self->{items} }) {
3000	my ($widget, $cb, $tooltip) = @$item;	3328	my ($widget, $cb, $tooltip) = @$item;
3001		3329
3002	# handle various types of items, only text for now	3330	# handle various types of items, only text for now
3003	if (!ref $widget) {	3331	if (!ref $widget) {
		3332	if ($widget =~ /\t/) {
		3333	my ($left, $right) = split /\t/, $widget, 2;
		3334
3004	$widget = new CFClient::UI::Label	3335	$widget = new CFPlus::UI::HBox
3005	can_hover => 1,	3336	can_hover => 1,
3006	can_events => 1,	3337	can_events => 1,
		3338	tooltip => $tooltip,
		3339	children => [
		3340	(new CFPlus::UI::Label markup => $left, expand => 1),
		3341	(new CFPlus::UI::Label markup => $right, align => +1),
		3342	],
		3343	;
		3344
		3345	} else {
		3346	$widget = new CFPlus::UI::Label
		3347	can_hover => 1,
		3348	can_events => 1,
3007	markup => $widget,	3349	markup => $widget,
3008	tooltip => $tooltip	3350	tooltip => $tooltip;
		3351	}
3009	}	3352	}
3010		3353
3011	$self->{item}{$widget} = $item;	3354	$self->{item}{$widget} = $item;
3012		3355
3013	$self->{vbox}->add ($widget);	3356	$self->{vbox}->add ($widget);
…		…
3056	1	3399	1
3057	}	3400	}
3058		3401
3059	#############################################################################	3402	#############################################################################
3060		3403
3061	package CFClient::UI::Multiplexer;	3404	package CFPlus::UI::Multiplexer;
3062		3405
3063	our @ISA = CFClient::UI::Container::;	3406	our @ISA = CFPlus::UI::Container::;
3064		3407
3065	sub new {	3408	sub new {
3066	my $class = shift;	3409	my $class = shift;
3067		3410
3068	my $self = $class->SUPER::new (	3411	my $self = $class->SUPER::new (
…		…
3082		3425
3083	$self->{current} = $self->{children}[0]	3426	$self->{current} = $self->{children}[0]
3084	if @{ $self->{children} };	3427	if @{ $self->{children} };
3085	}	3428	}
3086		3429
		3430	sub get_current_page {
		3431	my ($self) = @_;
		3432
		3433	$self->{current}
		3434	}
		3435
3087	sub set_current_page {	3436	sub set_current_page {
3088	my ($self, $page_or_widget) = @_;	3437	my ($self, $page_or_widget) = @_;
3089		3438
3090	my $widget = ref $page_or_widget	3439	my $widget = ref $page_or_widget
3091	? $page_or_widget	3440	? $page_or_widget
…		…
3123	$self->{current}->draw;	3472	$self->{current}->draw;
3124	}	3473	}
3125		3474
3126	#############################################################################	3475	#############################################################################
3127		3476
3128	package CFClient::UI::Notebook;	3477	package CFPlus::UI::Notebook;
3129		3478
3130	our @ISA = CFClient::UI::VBox::;	3479	our @ISA = CFPlus::UI::VBox::;
3131		3480
3132	sub new {	3481	sub new {
3133	my $class = shift;	3482	my $class = shift;
3134		3483
3135	my $self = $class->SUPER::new (	3484	my $self = $class->SUPER::new (
3136	buttonbar => (new CFClient::UI::Buttonbar),	3485	buttonbar => (new CFPlus::UI::Buttonbar),
3137	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3486	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3138	# filter => # will be put between multiplexer and $self	3487	# filter => # will be put between multiplexer and $self
3139	@_,	3488	@_,
3140	);	3489	);
3141		3490
3142	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3491	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3148	sub add {	3497	sub add {
3149	my ($self, $title, $widget, $tooltip) = @_;	3498	my ($self, $title, $widget, $tooltip) = @_;
3150		3499
3151	Scalar::Util::weaken $self;	3500	Scalar::Util::weaken $self;
3152		3501
3153	$self->{buttonbar}->add (new CFClient::UI::Button	3502	$self->{buttonbar}->add (new CFPlus::UI::Button
3154	markup => $title,	3503	markup => $title,
3155	tooltip => $tooltip,	3504	tooltip => $tooltip,
3156	on_activate => sub { $self->set_current_page ($widget) },	3505	on_activate => sub { $self->set_current_page ($widget) },
3157	);	3506	);
3158		3507
3159	$self->{multiplexer}->add ($widget);	3508	$self->{multiplexer}->add ($widget);
3160	}	3509	}
3161		3510
		3511	sub get_current_page {
		3512	my ($self) = @_;
		3513
		3514	$self->{multiplexer}->get_current_page
		3515	}
		3516
3162	sub set_current_page {	3517	sub set_current_page {
3163	my ($self, $page) = @_;	3518	my ($self, $page) = @_;
3164		3519
3165	$self->{multiplexer}->set_current_page ($page);	3520	$self->{multiplexer}->set_current_page ($page);
3166	$self->emit (page_changed => $self->{multiplexer}{current});	3521	$self->emit (page_changed => $self->{multiplexer}{current});
3167	}	3522	}
3168		3523
3169	#############################################################################	3524	#############################################################################
3170		3525
3171	package CFClient::UI::Combobox;	3526	package CFPlus::UI::Selector;
3172		3527
3173	use utf8;	3528	use utf8;
3174		3529
3175	our @ISA = CFClient::UI::Button::;	3530	our @ISA = CFPlus::UI::Button::;
3176		3531
3177	sub new {	3532	sub new {
3178	my $class = shift;	3533	my $class = shift;
3179		3534
3180	my $self = $class->SUPER::new (	3535	my $self = $class->SUPER::new (
…		…
3197	my ($value, $title, $tooltip) = @$_;	3552	my ($value, $title, $tooltip) = @$_;
3198		3553
3199	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3554	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200	}	3555	}
3201		3556
3202	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3557	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203	}	3558	}
3204		3559
3205	sub _set_value {	3560	sub _set_value {
3206	my ($self, $value) = @_;	3561	my ($self, $value) = @_;
3207		3562
…		…
3222	$self->emit (changed => $value);	3577	$self->emit (changed => $value);
3223	}	3578	}
3224		3579
3225	#############################################################################	3580	#############################################################################
3226		3581
3227	package CFClient::UI::Statusbox;	3582	package CFPlus::UI::Statusbox;
3228		3583
3229	our @ISA = CFClient::UI::VBox::;	3584	our @ISA = CFPlus::UI::VBox::;
3230		3585
3231	sub new {	3586	sub new {
3232	my $class = shift;	3587	my $class = shift;
3233		3588
3234	my $self = $class->SUPER::new (	3589	my $self = $class->SUPER::new (
…		…
3246	sub reorder {	3601	sub reorder {
3247	my ($self) = @_;	3602	my ($self) = @_;
3248	my $NOW = Time::HiRes::time;	3603	my $NOW = Time::HiRes::time;
3249		3604
3250	# freeze display when hovering over any label	3605	# freeze display when hovering over any label
3251	return if $CFClient::UI::TOOLTIP->{owner}	3606	return if $CFPlus::UI::TOOLTIP->{owner}
3252	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3607	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3253	values %{ $self->{item} };	3608	values %{ $self->{item} };
3254		3609
3255	while (my ($k, $v) = each %{ $self->{item} }) {	3610	while (my ($k, $v) = each %{ $self->{item} }) {
3256	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3611	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3257	}	3612	}
…		…
3278	for ($short) {	3633	for ($short) {
3279	s/^\s+//;	3634	s/^\s+//;
3280	s/\s+/ /g;	3635	s/\s+/ /g;
3281	}	3636	}
3282		3637
3283	new CFClient::UI::Label	3638	new CFPlus::UI::Label
3284	markup => $short,	3639	markup => $short,
3285	tooltip => $item->{tooltip},	3640	tooltip => $item->{tooltip},
3286	tooltip_font => $::FONT_PROP,	3641	tooltip_font => $::FONT_PROP,
3287	tooltip_width => 0.67,	3642	tooltip_width => 0.67,
3288	fontsize => $item->{fontsize} || $self->{fontsize},	3643	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3342	count => 1,	3697	count => 1,
3343	%arg,	3698	%arg,
3344	};	3699	};
3345	}	3700	}
3346		3701
		3702	$ROOT->on_refresh (reorder => sub {
3347	$self->reorder;	3703	$self->reorder;
		3704	});
3348	}	3705	}
3349		3706
3350	sub reconfigure {	3707	sub reconfigure {
3351	my ($self) = @_;	3708	my ($self) = @_;
3352		3709
…		…
3365	$self->SUPER::destroy;	3722	$self->SUPER::destroy;
3366	}	3723	}
3367		3724
3368	#############################################################################	3725	#############################################################################
3369		3726
3370	package CFClient::UI::Inventory;	3727	package CFPlus::UI::Inventory;
3371		3728
3372	our @ISA = CFClient::UI::ScrolledWindow::;	3729	our @ISA = CFPlus::UI::Table::;
3373		3730
3374	sub new {	3731	sub new {
3375	my $class = shift;	3732	my $class = shift;
3376		3733
3377	my $self = $class->SUPER::new (	3734	my $self = $class->SUPER::new (
3378	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3735	col_expand => [0, 1, 0],
		3736	items => [],
3379	@_,	3737	@_,
3380	);	3738	);
3381		3739
		3740	$self->set_sort_order (undef);
		3741
3382	$self	3742	$self
		3743	}
		3744
		3745	sub update_items {
		3746	my ($self) = @_;
		3747
		3748	$self->clear;
		3749
		3750	my @item = $self->{sort}->(@{ $self->{items} });
		3751
		3752	my @adds;
		3753	my $row = 0;
		3754	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3755	CFPlus::Item::update_widgets $item;
		3756
		3757	push @adds, 0, $row, $item->{face_widget};
		3758	push @adds, 1, $row, $item->{desc_widget};
		3759	push @adds, 2, $row, $item->{weight_widget};
		3760
		3761	$row++;
		3762	}
		3763
		3764	$self->add (@adds);
		3765	}
		3766
		3767	sub set_sort_order {
		3768	my ($self, $order) = @_;
		3769
		3770	$self->{sort} = $order ||= sub {
		3771	sort {
		3772	$a->{type} <=> $b->{type}
		3773	or $a->{name} cmp $b->{name}
		3774	} @_
		3775	};
		3776
		3777	$self->update_items;
3383	}	3778	}
3384		3779
3385	sub set_items {	3780	sub set_items {
3386	my ($self, $items) = @_;	3781	my ($self, $items) = @_;
3387		3782
3388	$self->{child}->clear;	3783	$self->{items} = [$items ? values %$items : ()];
3389	return unless $items;	3784	$self->update_items;
3390
3391	my @items = sort {
3392	($a->{type} <=> $b->{type})
3393	or ($a->{name} cmp $b->{name})
3394	} @$items;
3395
3396	$self->{real_items} = \@items;
3397
3398	my $row = 0;
3399	for my $item (@items) {
3400	CFClient::Item::update_widgets $item;
3401
3402	$self->{child}->add (0, $row, $item->{face_widget});
3403	$self->{child}->add (1, $row, $item->{desc_widget});
3404	$self->{child}->add (2, $row, $item->{weight_widget});
3405
3406	$row++;
3407	}
3408	}	3785	}
3409		3786
3410	#############################################################################	3787	#############################################################################
3411		3788
3412	package CFClient::UI::BindEditor;
3413
3414	our @ISA = CFClient::UI::FancyFrame::;
3415
3416	sub new {
3417	my $class = shift;
3418
3419	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3420
3421	$self->add (my $vb = new CFClient::UI::VBox);
3422
3423
3424	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3425	text => "start recording",
3426	tooltip => "Start/Stops recording of actions."
3427	."All subsequent actions after the recording started will be captured."
3428	."The actions are displayed after the record was stopped."
3429	."To bind the action you have to click on the 'Bind' button",
3430	on_activate => sub {
3431	unless ($self->{recording}) {
3432	$self->start;
3433	} else {
3434	$self->stop;
3435	}
3436	});
3437
3438	$vb->add (new CFClient::UI::Label text => "Actions:");
3439	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3440
3441	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3442	$vb->add (my $hb = new CFClient::UI::HBox);
3443	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3444	$hb->add (new CFClient::UI::Button
3445	text => "bind",
3446	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3447	on_activate => sub {
3448	$self->ask_for_bind;
3449	});
3450
3451	$vb->add (my $hb = new CFClient::UI::HBox);
3452	$hb->add (new CFClient::UI::Button
3453	text => "ok",
3454	expand => 1,
3455	tooltip => "This closes the binding editor and saves the binding",
3456	on_activate => sub {
3457	$self->hide;
3458	$self->commit;
3459	});
3460
3461	$hb->add (new CFClient::UI::Button
3462	text => "cancel",
3463	expand => 1,
3464	tooltip => "This closes the binding editor without saving",
3465	on_activate => sub {
3466	$self->hide;
3467	$self->{binding_cancel}->()
3468	if $self->{binding_cancel};
3469	});
3470
3471	$self->update_binding_widgets;
3472
3473	$self
3474	}
3475
3476	sub commit {
3477	my ($self) = @_;
3478	my ($mod, $sym, $cmds) = $self->get_binding;
3479	if ($sym != 0 && @$cmds > 0) {
3480	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3481	."'. Don't forget 'Save Config'!");
3482	$self->{binding_change}->($mod, $sym, $cmds)
3483	if $self->{binding_change};
3484	} else {
3485	$::STATUSBOX->add ("No action bound, no key or action specified!");
3486	$self->{binding_cancel}->()
3487	if $self->{binding_cancel};
3488	}
3489	}
3490
3491	sub start {
3492	my ($self) = @_;
3493
3494	$self->{rec_btn}->set_text ("stop recording");
3495	$self->{recording} = 1;
3496	$self->clear_command_list;
3497	$::CONN->start_record if $::CONN;
3498	}
3499
3500	sub stop {
3501	my ($self) = @_;
3502
3503	$self->{rec_btn}->set_text ("start recording");
3504	$self->{recording} = 0;
3505
3506	my $rec;
3507	$rec = $::CONN->stop_record if $::CONN;
3508	return unless ref $rec eq 'ARRAY';
3509	$self->set_command_list ($rec);
3510	}
3511
3512
3513	sub ask_for_bind_and_commit {
3514	my ($self) = @_;
3515	$self->ask_for_bind (1);
3516	}
3517
3518	sub ask_for_bind {
3519	my ($self, $commit, $end_cb) = @_;
3520
3521	CFClient::Binder::open_binding_dialog (sub {
3522	my ($mod, $sym) = @_;
3523	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3524	$self->update_binding_widgets;
3525	$self->commit if $commit;
3526	$end_cb->() if $end_cb;
3527	});
3528	}
3529
3530	# $mod and $sym are the modifiers and key symbol
3531	# $cmds is a array ref of strings (the commands)
3532	# $cb is the callback that is executed on OK
3533	# $ccb is the callback that is executed on CANCEL and
3534	# when the binding was unsuccessful on OK
3535	sub set_binding {
3536	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3537
3538	$self->clear_command_list;
3539	$self->{recording} = 0;
3540	$self->{rec_btn}->set_text ("start recording");
3541
3542	$self->{binding} = [$mod, $sym];
3543	$self->{commands} = $cmds;
3544
3545	$self->{binding_change} = $cb;
3546	$self->{binding_cancel} = $ccb;
3547
3548	$self->update_binding_widgets;
3549	}
3550
3551	# this is a shortcut method that asks for a binding
3552	# and then just binds it.
3553	sub do_quick_binding {
3554	my ($self, $cmds, $end_cb) = @_;
3555	$self->set_binding (undef, undef, $cmds, sub {
3556	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3557	});
3558	$self->ask_for_bind (1, $end_cb);
3559	}
3560
3561	sub update_binding_widgets {
3562	my ($self) = @_;
3563	my ($mod, $sym, $cmds) = $self->get_binding;
3564	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3565	$self->set_command_list ($cmds);
3566	}
3567
3568	sub get_binding {
3569	my ($self) = @_;
3570	return (
3571	$self->{binding}->[0],
3572	$self->{binding}->[1],
3573	[ grep { defined $_ } @{$self->{commands}} ]
3574	);
3575	}
3576
3577	sub clear_command_list {
3578	my ($self) = @_;
3579	$self->{cmdbox}->clear ();
3580	}
3581
3582	sub set_command_list {
3583	my ($self, $cmds) = @_;
3584
3585	$self->{cmdbox}->clear ();
3586	$self->{commands} = $cmds;
3587
3588	my $idx = 0;
3589
3590	for (@$cmds) {
3591	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3592
3593	my $i = $idx;
3594	$hb->add (new CFClient::UI::Label text => $_);
3595	$hb->add (new CFClient::UI::Button
3596	text => "delete",
3597	tooltip => "Deletes the action from the record",
3598	on_activate => sub {
3599	$self->{cmdbox}->remove ($hb);
3600	$cmds->[$i] = undef;
3601	});
3602
3603
3604	$idx++
3605	}
3606	}
3607
3608	#############################################################################
3609
3610	package CFClient::UI::SpellList;	3789	package CFPlus::UI::SpellList;
3611		3790
3612	our @ISA = CFClient::UI::Table::;	3791	our @ISA = CFPlus::UI::Table::;
3613		3792
3614	sub new {	3793	sub new {
3615	my $class = shift;	3794	my $class = shift;
3616		3795
3617	my $self = $class->SUPER::new (	3796	my $self = $class->SUPER::new (
…		…
3635	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3814	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3636		3815
3637	sub rebuild_spell_list {	3816	sub rebuild_spell_list {
3638	my ($self) = @_;	3817	my ($self) = @_;
3639		3818
3640	$CFClient::UI::ROOT->on_refresh ($self => sub {	3819	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3641	$self->clear;	3820	$self->clear;
3642		3821
3643	return unless $::CONN;	3822	return unless $::CONN;
3644		3823
3645	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3824	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3646	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3825	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3647	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3826	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3648	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3827	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3649	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3828	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3650		3829
3651	my $row = 0;	3830	my $row = 0;
3652		3831
3653	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3832	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3654	my $spell = $self->{spell}{$_};	3833	my $spell = $self->{spell}{$_};
…		…
3661	if ($ev->{button} == 1) {	3840	if ($ev->{button} == 1) {
3662	$::CONN->user_send ("cast $spell->{name}");	3841	$::CONN->user_send ("cast $spell->{name}");
3663	} elsif ($ev->{button} == 2) {	3842	} elsif ($ev->{button} == 2) {
3664	$::CONN->user_send ("invoke $spell->{name}");	3843	$::CONN->user_send ("invoke $spell->{name}");
3665	} elsif ($ev->{button} == 3) {	3844	} elsif ($ev->{button} == 3) {
3666	(new CFClient::UI::Menu	3845	(new CFPlus::UI::Menu
3667	items => [	3846	items => [
3668	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3847	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3669	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3848	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670	],	3849	],
3671	)->popup ($ev);	3850	)->popup ($ev);
3672	} else {	3851	} else {
3673	return 0;	3852	return 0;
3674	}	3853	}
3675		3854
3676	1	3855	1
3677	};	3856	};
3678		3857
3679	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3858	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3680		3859
3681	#TODO: add path info to tooltip	3860	#TODO: add path info to tooltip
3682	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3861	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3683		3862
3684	$self->add (0, $row, new CFClient::UI::Face	3863	$self->add (0, $row, new CFPlus::UI::Face
3685	face => $spell->{face},	3864	face => $spell->{face},
3686	can_hover => 1,	3865	can_hover => 1,
3687	can_events => 1,	3866	can_events => 1,
3688	tooltip => $tooltip,	3867	tooltip => $tooltip,
3689	on_button_down => $spell_cb,	3868	on_button_down => $spell_cb,
3690	);	3869	);
3691		3870
3692	$self->add (1, $row, new CFClient::UI::Label	3871	$self->add (1, $row, new CFPlus::UI::Label
3693	expand => 1,	3872	expand => 1,
3694	text => $spell->{name},	3873	text => $spell->{name},
3695	can_hover => 1,	3874	can_hover => 1,
3696	can_events => 1,	3875	can_events => 1,
3697	tooltip => $tooltip,	3876	tooltip => $tooltip,
3698	on_button_down => $spell_cb,	3877	on_button_down => $spell_cb,
3699	);	3878	);
3700		3879
3701	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3880	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3702	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3881	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3703	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3882	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3704	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3883	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3705	}	3884	}
3706	});	3885	});
3707	}	3886	}
3708		3887
3709	sub add_spell {	3888	sub add_spell {
…		…
3727	$self->rebuild_spell_list;	3906	$self->rebuild_spell_list;
3728	}	3907	}
3729		3908
3730	#############################################################################	3909	#############################################################################
3731		3910
3732	package CFClient::UI::Root;	3911	package CFPlus::UI::Root;
3733		3912
3734	our @ISA = CFClient::UI::Container::;	3913	our @ISA = CFPlus::UI::Container::;
3735		3914
3736	use List::Util qw(min max);	3915	use List::Util qw(min max);
3737		3916
3738	use CFClient::OpenGL;	3917	use CFPlus::OpenGL;
3739		3918
3740	sub new {	3919	sub new {
3741	my $class = shift;	3920	my $class = shift;
3742		3921
3743	my $self = $class->SUPER::new (	3922	my $self = $class->SUPER::new (
…		…
3919	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4098	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3920		4099
3921	$w = 0 if $w < 0;	4100	$w = 0 if $w < 0;
3922	$h = 0 if $h < 0;	4101	$h = 0 if $h < 0;
3923		4102
		4103	$w = max $widget->{min_w}, $w;
		4104	$h = max $widget->{min_h}, $h;
		4105
		4106	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4107	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4108
		4109	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4110	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4111
3924	$w = int $w + 0.5;	4112	$w = int $w + 0.5;
3925	$h = int $h + 0.5;	4113	$h = int $h + 0.5;
3926		4114
3927	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4115	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3928	$widget->{old_w} = $widget->{w};	4116	$widget->{old_w} = $widget->{w};
…		…
3951	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4139	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3952	glMatrixMode GL_MODELVIEW;	4140	glMatrixMode GL_MODELVIEW;
3953	glLoadIdentity;	4141	glLoadIdentity;
3954		4142
3955	{	4143	{
3956	package CFClient::UI::Base;	4144	package CFPlus::UI::Base;
3957		4145
3958	($draw_x, $draw_y, $draw_w, $draw_h) =	4146	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3959	(0, 0, $self->{w}, $self->{h});	4147	(0, 0, $self->{w}, $self->{h});
3960	}
3961		4148
3962	$self->_draw;	4149	$self->_draw;
		4150	}
3963	}	4151	}
3964		4152
3965	#############################################################################	4153	#############################################################################
3966		4154
3967	package CFClient::UI;	4155	package CFPlus::UI;
3968		4156
3969	$ROOT = new CFClient::UI::Root;	4157	$ROOT = new CFPlus::UI::Root;
3970	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4158	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3971		4159
3972	1	4160	1
3973		4161

Diff Legend

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