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

Diff Legend

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