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.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.346 by root, Mon Aug 14 01:21:02 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;
		1136
		1137	sub new {
		1138	my ($class, %arg) = @_;
		1139
		1140	if ((exists $arg{label}) && !ref $arg{label}) {
		1141	$arg{label} = new CFPlus::UI::Label
		1142	align => 1,
		1143	valign => 1,
		1144	text => $arg{label},
		1145	fontsize => ($arg{border} || 0.8) * 0.75;
		1146	}
		1147
		1148	my $self = $class->SUPER::new (
		1149	# label => "",
		1150	fg => [0.6, 0.3, 0.1],
		1151	border => 0.8,
		1152	style => 'single',
		1153	%arg,
		1154	);
		1155
		1156	$self
		1157	}
		1158
		1159	sub add {
		1160	my ($self, @widgets) = @_;
		1161
		1162	$self->SUPER::add (@widgets);
		1163	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1164	}
		1165
		1166	sub border {
		1167	int $_[0]{border} * $::FONTSIZE
		1168	}
		1169
		1170	sub size_request {
		1171	my ($self) = @_;
		1172
		1173	($self->{label_w}, undef) = $self->{label}->size_request
		1174	if $self->{label};
		1175
		1176	my ($w, $h) = $self->SUPER::size_request;
		1177
		1178	(
		1179	$w + $self->border * 2,
		1180	$h + $self->border * 2,
		1181	)
		1182	}
		1183
		1184	sub invoke_size_allocate {
		1185	my ($self, $w, $h) = @_;
		1186
		1187	my $border = $self->border;
		1188
		1189	$w -= List::Util::max 0, $border * 2;
		1190	$h -= List::Util::max 0, $border * 2;
		1191
		1192	if (my $label = $self->{label}) {
		1193	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1194	$label->{h} = List::Util::min $h, $border;
		1195	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1196	}
		1197
		1198	$self->child->configure ($border, $border, $w, $h);
		1199
		1200	1
		1201	}
		1202
		1203	sub _draw {
		1204	my ($self) = @_;
		1205
		1206	my $child = $self->{children}[0];
		1207
		1208	my $border = $self->border;
		1209	my ($w, $h) = ($self->{w}, $self->{h});
		1210
		1211	$child->draw;
		1212
		1213	glColor @{$self->{fg}};
		1214	glBegin GL_LINE_STRIP;
		1215	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1216	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1217	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1218	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1219	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1220	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1221	glEnd;
		1222
		1223	if ($self->{label}) {
		1224	glTranslate $border * 2, 0;
		1225	$self->{label}->_draw;
		1226	}
		1227	}
		1228
		1229	#############################################################################
		1230
		1231	package CFPlus::UI::Toplevel;
		1232
		1233	our @ISA = CFPlus::UI::Bin::;
		1234
		1235	use CFPlus::OpenGL;
1066		1236
1067	my $bg =	1237	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1238	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1239	mipmap => 1, wrap => 1;
1070		1240
1071	my @border =	1241	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1242	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);	1243	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074		1244
1075	sub new {	1245	sub new {
1076	my ($class, %arg) = @_;	1246	my ($class, %arg) = @_;
1077		1247
1078	my $self = $class->SUPER::new (	1248	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1249	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1250	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1251	border => 0.6,
1082	can_events => 1,	1252	can_events => 1,
1083	min_w => 16,	1253	min_w => 64,
1084	min_h => 16,	1254	min_h => 32,
1085	%arg,	1255	%arg,
1086	);	1256	);
1087		1257
1088	$self->{title_widget} = new CFClient::UI::Label	1258	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1259	align => 0,
1090	valign => 1,	1260	valign => 1,
1091	text => $self->{title},	1261	text => $self->{title},
1092	fontsize => $self->{border},	1262	fontsize => $self->{border},
1093	if exists $self->{title};	1263	if exists $self->{title};
1094		1264
		1265	if ($self->{has_close_button}) {
		1266	$self->{close_button} =
		1267	new CFPlus::UI::ImageButton
		1268	path => 'x1_close.png',
		1269	on_activate => sub { $self->emit ("delete") };
		1270
		1271	$self->CFPlus::UI::Container::add ($self->{close_button});
		1272	}
		1273
1095	$self	1274	$self
1096	}	1275	}
1097		1276
1098	sub add {	1277	sub add {
1099	my ($self, @widgets) = @_;	1278	my ($self, @widgets) = @_;
1100		1279
1101	$self->SUPER::add (@widgets);	1280	$self->SUPER::add (@widgets);
		1281	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1282	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103	}	1283	}
1104		1284
1105	sub border {	1285	sub border {
1106	int $_[0]{border} * $::FONTSIZE	1286	int $_[0]{border} * $::FONTSIZE
1107	}	1287	}
…		…
1109	sub size_request {	1289	sub size_request {
1110	my ($self) = @_;	1290	my ($self) = @_;
1111		1291
1112	$self->{title_widget}->size_request	1292	$self->{title_widget}->size_request
1113	if $self->{title_widget};	1293	if $self->{title_widget};
		1294
		1295	$self->{close_button}->size_request
		1296	if $self->{close_button};
1114		1297
1115	my ($w, $h) = $self->SUPER::size_request;	1298	my ($w, $h) = $self->SUPER::size_request;
1116		1299
1117	(	1300	(
1118	$w + $self->border * 2,	1301	$w + $self->border * 2,
1119	$h + $self->border * 2,	1302	$h + $self->border * 2,
1120	)	1303	)
1121	}	1304	}
1122		1305
1123	sub size_allocate {	1306	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1307	my ($self, $w, $h) = @_;
1125		1308
1126	if ($self->{title_widget}) {	1309	if ($self->{title_widget}) {
1127	$self->{title_widget}{w} = $w;	1310	$self->{title_widget}{w} = $w;
1128	$self->{title_widget}{h} = $h;	1311	$self->{title_widget}{h} = $h;
1129	$self->{title_widget}->size_allocate ($w, $h);	1312	$self->{title_widget}->invoke_size_allocate ($w, $h);
1130	}	1313	}
1131		1314
1132	my $border = $self->border;	1315	my $border = $self->border;
1133		1316
1134	$h -= List::Util::max 0, $border * 2;	1317	$h -= List::Util::max 0, $border * 2;
1135	$w -= List::Util::max 0, $border * 2;	1318	$w -= List::Util::max 0, $border * 2;
		1319
		1320	$self->child->configure ($border, $border, $w, $h);
		1321
		1322	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1323	if $self->{close_button};
		1324
		1325	1
		1326	}
		1327
		1328	sub invoke_delete {
		1329	my ($self) = @_;
		1330
		1331	$self->hide;
1136		1332
1137	$self->child->configure ($border, $border, $w, $h);	1333	1
1138	}	1334	}
1139		1335
1140	sub button_down {	1336	sub invoke_button_down {
1141	my ($self, $ev, $x, $y) = @_;	1337	my ($self, $ev, $x, $y) = @_;
1142		1338
1143	my ($w, $h) = @$self{qw(w h)};	1339	my ($w, $h) = @$self{qw(w h)};
1144	my $border = $self->border;	1340	my $border = $self->border;
1145		1341
…		…
1176		1372
1177	($x, $y) = ($ev->{x}, $ev->{y});	1373	($x, $y) = ($ev->{x}, $ev->{y});
1178		1374
1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1375	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180	# HACK: the next line is required to enforce placement	1376	# HACK: the next line is required to enforce placement
1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1377	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182	};	1378	};
1183	} else {	1379	} else {
1184	return 0;	1380	return 0;
1185	}	1381	}
1186		1382
1187	1	1383	1
1188	}	1384	}
1189		1385
1190	sub button_up {	1386	sub invoke_button_up {
1191	my ($self, $ev, $x, $y) = @_;	1387	my ($self, $ev, $x, $y) = @_;
1192		1388
1193	!!delete $self->{motion}	1389	! ! delete $self->{motion}
1194	}	1390	}
1195		1391
1196	sub mouse_motion {	1392	sub invoke_mouse_motion {
1197	my ($self, $ev, $x, $y) = @_;	1393	my ($self, $ev, $x, $y) = @_;
1198		1394
1199	$self->{motion}->($ev, $x, $y) if $self->{motion};	1395	$self->{motion}->($ev, $x, $y) if $self->{motion};
1200		1396
1201	!!$self->{motion}	1397	! ! $self->{motion}
		1398	}
		1399
		1400	sub invoke_visibility_change {
		1401	my ($self, $visible) = @_;
		1402
		1403	delete $self->{motion} unless $visible;
		1404
		1405	0
1202	}	1406	}
1203		1407
1204	sub _draw {	1408	sub _draw {
1205	my ($self) = @_;	1409	my ($self) = @_;
1206		1410
…		…
1235	$child->draw;	1439	$child->draw;
1236		1440
1237	if ($self->{title_widget}) {	1441	if ($self->{title_widget}) {
1238	glTranslate 0, $border - $self->{h};	1442	glTranslate 0, $border - $self->{h};
1239	$self->{title_widget}->_draw;	1443	$self->{title_widget}->_draw;
		1444
		1445	glTranslate 0, - ($border - $self->{h});
1240	}	1446	}
		1447
		1448	$self->{close_button}->draw
		1449	if $self->{close_button};
1241	}	1450	}
1242		1451
1243	#############################################################################	1452	#############################################################################
1244		1453
1245	package CFClient::UI::Table;	1454	package CFPlus::UI::Table;
1246		1455
1247	our @ISA = CFClient::UI::Base::;	1456	our @ISA = CFPlus::UI::Base::;
1248		1457
1249	use List::Util qw(max sum);	1458	use List::Util qw(max sum);
1250		1459
1251	use CFClient::OpenGL;	1460	use CFPlus::OpenGL;
1252		1461
1253	sub new {	1462	sub new {
1254	my $class = shift;	1463	my $class = shift;
1255		1464
1256	$class->SUPER::new (	1465	$class->SUPER::new (
…		…
1262	sub children {	1471	sub children {
1263	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264	}	1473	}
1265		1474
1266	sub add {	1475	sub add {
1267	my ($self, $x, $y, $child) = @_;	1476	my ($self) = shift;
1268		1477
		1478	while (@_) {
		1479	my ($x, $y, $child) = splice @_, 0, 3, ();
1269	$child->set_parent ($self);	1480	$child->set_parent ($self);
1270	$self->{children}[$y][$x] = $child;	1481	$self->{children}[$y][$x] = $child;
		1482	}
1271		1483
		1484	$self->{force_realloc} = 1;
		1485	$self->{force_size_alloc} = 1;
1272	$self->realloc;	1486	$self->realloc;
1273	}	1487	}
1274		1488
1275	sub remove {	1489	sub remove {
1276	my ($self, $child) = @_;	1490	my ($self, $child) = @_;
…		…
1324	(sum @$ws),	1538	(sum @$ws),
1325	(sum @$hs),	1539	(sum @$hs),
1326	)	1540	)
1327	}	1541	}
1328		1542
1329	sub size_allocate {	1543	sub invoke_size_allocate {
1330	my ($self, $w, $h) = @_;	1544	my ($self, $w, $h) = @_;
1331		1545
1332	my ($ws, $hs) = $self->get_wh;	1546	my ($ws, $hs) = $self->get_wh;
1333		1547
1334	my $req_w = (sum @$ws) || 1;	1548	my $req_w = (sum @$ws) || 1;
…		…
1341		1555
1342	# linearly scale sizes	1556	# linearly scale sizes
1343	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345		1559
1346	CFClient::UI::harmonize $ws;	1560	CFPlus::UI::harmonize $ws;
1347	CFClient::UI::harmonize $hs;	1561	CFPlus::UI::harmonize $hs;
1348		1562
1349	my $y;	1563	my $y;
1350		1564
1351	for my $r (0 .. $#{$self->{children}}) {	1565	for my $r (0 .. $#{$self->{children}}) {
1352	my $row = $self->{children}[$r]	1566	my $row = $self->{children}[$r]
…		…
1366	}	1580	}
1367		1581
1368	$y += $row_h;	1582	$y += $row_h;
1369	}	1583	}
1370		1584
		1585	1
1371	}	1586	}
1372		1587
1373	sub find_widget {	1588	sub find_widget {
1374	my ($self, $x, $y) = @_;	1589	my ($self, $x, $y) = @_;
1375		1590
…		…
1394	}	1609	}
1395	}	1610	}
1396		1611
1397	#############################################################################	1612	#############################################################################
1398		1613
1399	package CFClient::UI::Box;	1614	package CFPlus::UI::Box;
1400		1615
1401	our @ISA = CFClient::UI::Container::;	1616	our @ISA = CFPlus::UI::Container::;
1402		1617
1403	sub size_request {	1618	sub size_request {
1404	my ($self) = @_;	1619	my ($self) = @_;
1405		1620
1406	$self->{vertical}	1621	$self->{vertical}
…		…
1412	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1627	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1628	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1414	)	1629	)
1415	}	1630	}
1416		1631
1417	sub size_allocate {	1632	sub invoke_size_allocate {
1418	my ($self, $w, $h) = @_;	1633	my ($self, $w, $h) = @_;
1419		1634
1420	my $space = $self->{vertical} ? $h : $w;	1635	my $space = $self->{vertical} ? $h : $w;
1421	my $children = $self->{children};	1636	my @children = $self->visible_children;
1422		1637
1423	my @req;	1638	my @req;
1424		1639
1425	if ($self->{homogeneous}) {	1640	if ($self->{homogeneous}) {
1426	@req = ($space / (@$children || 1)) x @$children;	1641	@req = ($space / (@children || 1)) x @children;
1427	} else {	1642	} else {
1428	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1643	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429	my $req = List::Util::sum @req;	1644	my $req = List::Util::sum @req;
1430		1645
1431	if ($req > $space) {	1646	if ($req > $space) {
1432	# ah well, not enough space	1647	# ah well, not enough space
1433	$_ *= $space / $req for @req;	1648	$_ *= $space / $req for @req;
1434	} else {	1649	} else {
1435	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1650	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436		1651
1437	$space = ($space - $req) / $expand; # remaining space to give away	1652	$space = ($space - $req) / $expand; # remaining space to give away
1438		1653
1439	$req[$_] += $space * $children->[$_]{expand}	1654	$req[$_] += $space * $children[$_]{expand}
1440	for 0 .. $#$children;	1655	for 0 .. $#children;
1441	}	1656	}
1442	}	1657	}
1443		1658
1444	CFClient::UI::harmonize \@req;	1659	CFPlus::UI::harmonize \@req;
1445		1660
1446	my $pos = 0;	1661	my $pos = 0;
1447	for (0 .. $#$children) {	1662	for (0 .. $#children) {
1448	my $alloc = $req[$_];	1663	my $alloc = $req[$_];
1449	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1664	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450		1665
1451	$pos += $alloc;	1666	$pos += $alloc;
1452	}	1667	}
1453		1668
1454	1	1669	1
1455	}	1670	}
1456		1671
1457	#############################################################################	1672	#############################################################################
1458		1673
1459	package CFClient::UI::HBox;	1674	package CFPlus::UI::HBox;
1460		1675
1461	our @ISA = CFClient::UI::Box::;	1676	our @ISA = CFPlus::UI::Box::;
1462		1677
1463	sub new {	1678	sub new {
1464	my $class = shift;	1679	my $class = shift;
1465		1680
1466	$class->SUPER::new (	1681	$class->SUPER::new (
…		…
1469	)	1684	)
1470	}	1685	}
1471		1686
1472	#############################################################################	1687	#############################################################################
1473		1688
1474	package CFClient::UI::VBox;	1689	package CFPlus::UI::VBox;
1475		1690
1476	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1477		1692
1478	sub new {	1693	sub new {
1479	my $class = shift;	1694	my $class = shift;
1480		1695
1481	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1484	)	1699	)
1485	}	1700	}
1486		1701
1487	#############################################################################	1702	#############################################################################
1488		1703
1489	package CFClient::UI::Label;	1704	package CFPlus::UI::Label;
1490		1705
1491	our @ISA = CFClient::UI::DrawBG::;	1706	our @ISA = CFPlus::UI::DrawBG::;
1492		1707
1493	use CFClient::OpenGL;	1708	use CFPlus::OpenGL;
1494		1709
1495	sub new {	1710	sub new {
1496	my ($class, %arg) = @_;	1711	my ($class, %arg) = @_;
1497		1712
1498	my $self = $class->SUPER::new (	1713	my $self = $class->SUPER::new (
…		…
1501	#active_bg => none	1716	#active_bg => none
1502	#font => default_font	1717	#font => default_font
1503	#text => initial text	1718	#text => initial text
1504	#markup => initial narkup	1719	#markup => initial narkup
1505	#max_w => maximum pixel width	1720	#max_w => maximum pixel width
		1721	#style => 0, # render flags
1506	ellipsise => 3, # end	1722	ellipsise => 3, # end
1507	layout => (new CFClient::Layout),	1723	layout => (new CFPlus::Layout),
1508	fontsize => 1,	1724	fontsize => 1,
1509	align => -1,	1725	align => -1,
1510	valign => -1,	1726	valign => -1,
1511	padding_x => 2,	1727	padding_x => 2,
1512	padding_y => 2,	1728	padding_y => 2,
1513	can_events => 0,	1729	can_events => 0,
1514	%arg	1730	%arg
1515	);	1731	);
1516		1732
1517	if (exists $self->{template}) {	1733	if (exists $self->{template}) {
1518	my $layout = new CFClient::Layout;	1734	my $layout = new CFPlus::Layout;
1519	$layout->set_text (delete $self->{template});	1735	$layout->set_text (delete $self->{template});
1520	$self->{template} = $layout;	1736	$self->{template} = $layout;
1521	}	1737	}
1522		1738
1523	if (exists $self->{markup}) {	1739	if (exists $self->{markup}) {
…		…
1527	}	1743	}
1528		1744
1529	$self	1745	$self
1530	}	1746	}
1531		1747
1532	sub escape($) {
1533	local $_ = $_[0];
1534
1535	s/&/&amp;/g;
1536	s/>/&gt;/g;
1537	s/</&lt;/g;
1538
1539	$_
1540	}
1541
1542	sub update {	1748	sub update {
1543	my ($self) = @_;	1749	my ($self) = @_;
1544		1750
1545	delete $self->{texture};	1751	delete $self->{texture};
1546	$self->SUPER::update;	1752	$self->SUPER::update;
…		…
1557	my ($self, $text) = @_;	1763	my ($self, $text) = @_;
1558		1764
1559	return if $self->{text} eq "T$text";	1765	return if $self->{text} eq "T$text";
1560	$self->{text} = "T$text";	1766	$self->{text} = "T$text";
1561		1767
1562	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563	$self->{layout}->set_text ($text);	1768	$self->{layout}->set_text ($text);
1564		1769
1565	delete $self->{size_req};	1770	delete $self->{size_req};
1566	$self->realloc;	1771	$self->realloc;
1567	$self->update;	1772	$self->update;
…		…
1573	return if $self->{text} eq "M$markup";	1778	return if $self->{text} eq "M$markup";
1574	$self->{text} = "M$markup";	1779	$self->{text} = "M$markup";
1575		1780
1576	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1781	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577		1782
1578	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579	$self->{layout}->set_markup ($markup);	1783	$self->{layout}->set_markup ($markup);
1580		1784
1581	delete $self->{size_req};	1785	delete $self->{size_req};
1582	$self->realloc;	1786	$self->realloc;
1583	$self->update;	1787	$self->update;
…		…
1595		1799
1596	my ($w, $h) = $self->{layout}->size;	1800	my ($w, $h) = $self->{layout}->size;
1597		1801
1598	if (exists $self->{template}) {	1802	if (exists $self->{template}) {
1599	$self->{template}->set_font ($self->{font}) if $self->{font};	1803	$self->{template}->set_font ($self->{font}) if $self->{font};
		1804	$self->{template}->set_width ($self->{max_w} || -1);
1600	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1805	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601		1806
1602	my ($w2, $h2) = $self->{template}->size;	1807	my ($w2, $h2) = $self->{template}->size;
1603		1808
1604	$w = List::Util::max $w, $w2;	1809	$w = List::Util::max $w, $w2;
…		…
1609	};	1814	};
1610		1815
1611	@{ $self->{size_req} }	1816	@{ $self->{size_req} }
1612	}	1817	}
1613		1818
		1819	sub baseline_shift {
		1820	$_[0]{layout}->descent
		1821	}
		1822
1614	sub size_allocate {	1823	sub invoke_size_allocate {
1615	my ($self, $w, $h) = @_;	1824	my ($self, $w, $h) = @_;
1616		1825
1617	delete $self->{ox};	1826	delete $self->{ox};
1618		1827
1619	delete $self->{texture}	1828	delete $self->{texture}
1620	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1829	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1830
		1831	1
1621	}	1832	}
1622		1833
1623	sub set_fontsize {	1834	sub set_fontsize {
1624	my ($self, $fontsize) = @_;	1835	my ($self, $fontsize) = @_;
1625		1836
1626	$self->{fontsize} = $fontsize;	1837	$self->{fontsize} = $fontsize;
		1838	delete $self->{size_req};
1627	delete $self->{texture};	1839	delete $self->{texture};
1628		1840
1629	$self->realloc;	1841	$self->realloc;
1630	}	1842	}
1631		1843
1632	sub reconfigure {	1844	sub reconfigure {
1633	my ($self) = @_;	1845	my ($self) = @_;
1634		1846
1635	delete $self->{size_req};	1847	delete $self->{size_req};
		1848	delete $self->{texture};
1636		1849
1637	$self->SUPER::reconfigure;	1850	$self->SUPER::reconfigure;
1638	}	1851	}
1639		1852
1640	sub _draw {	1853	sub _draw {
1641	my ($self) = @_;	1854	my ($self) = @_;
1642		1855
1643	$self->SUPER::_draw; # draw background, if applicable	1856	$self->SUPER::_draw; # draw background, if applicable
1644		1857
1645	my $tex = $self->{texture} ||= do {	1858	my $size = $self->{texture} ||= do {
1646	$self->{layout}->set_foreground (@{$self->{fg}});	1859	$self->{layout}->set_foreground (@{$self->{fg}});
1647	$self->{layout}->set_font ($self->{font}) if $self->{font};	1860	$self->{layout}->set_font ($self->{font}) if $self->{font};
1648	$self->{layout}->set_width ($self->{w});	1861	$self->{layout}->set_width ($self->{w});
1649	$self->{layout}->set_ellipsise ($self->{ellipsise});	1862	$self->{layout}->set_ellipsise ($self->{ellipsise});
1650	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1863	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1864	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652		1865
1653	new_from_layout CFClient::Texture $self->{layout}	1866	[$self->{layout}->size]
1654	};	1867	};
1655		1868
1656	unless (exists $self->{ox}) {	1869	unless (exists $self->{ox}) {
1657	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1870	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1871	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659	: ($self->{w} - $tex->{w}) * 0.5);	1872	: ($self->{w} - $size->[0]) * 0.5);
1660		1873
1661	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1874	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1875	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663	: ($self->{h} - $tex->{h}) * 0.5);	1876	: ($self->{h} - $size->[1]) * 0.5);
1664	};	1877	};
1665		1878
1666	glEnable GL_TEXTURE_2D;
1667
1668	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1879	my $w = List::Util::min $self->{w} + 4, $size->[0];
1669	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1880	my $h = List::Util::min $self->{h} + 2, $size->[1];
1670		1881
1671	if ($tex->{format} == GL_ALPHA) {	1882	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673	glColor @{$self->{fg}};
1674	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675	} else {
1676	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678	}
1679
1680	glDisable GL_TEXTURE_2D;
1681	}	1883	}
1682		1884
1683	#############################################################################	1885	#############################################################################
1684		1886
1685	package CFClient::UI::EntryBase;	1887	package CFPlus::UI::EntryBase;
1686		1888
1687	our @ISA = CFClient::UI::Label::;	1889	our @ISA = CFPlus::UI::Label::;
1688		1890
1689	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1690		1892
1691	sub new {	1893	sub new {
1692	my $class = shift;	1894	my $class = shift;
1693		1895
1694	$class->SUPER::new (	1896	$class->SUPER::new (
…		…
1718		1920
1719	$text =~ s/./*/g if $self->{hidden};	1921	$text =~ s/./*/g if $self->{hidden};
1720	$self->{layout}->set_text ("$text ");	1922	$self->{layout}->set_text ("$text ");
1721	delete $self->{size_req};	1923	delete $self->{size_req};
1722		1924
1723	$self->_emit (changed => $self->{text});	1925	$self->emit (changed => $self->{text});
1724		1926
1725	$self->realloc;	1927	$self->realloc;
1726	$self->update;	1928	$self->update;
1727	}	1929	}
1728		1930
…		…
1743	my ($w, $h) = $self->SUPER::size_request;	1945	my ($w, $h) = $self->SUPER::size_request;
1744		1946
1745	($w + 1, $h) # add 1 for cursor	1947	($w + 1, $h) # add 1 for cursor
1746	}	1948	}
1747		1949
1748	sub key_down {	1950	sub invoke_key_down {
1749	my ($self, $ev) = @_;	1951	my ($self, $ev) = @_;
1750		1952
1751	my $mod = $ev->{mod};	1953	my $mod = $ev->{mod};
1752	my $sym = $ev->{sym};	1954	my $sym = $ev->{sym};
1753	my $uni = $ev->{unicode};	1955	my $uni = $ev->{unicode};
…		…
1756		1958
1757	if ($uni == 8) {	1959	if ($uni == 8) {
1758	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1960	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759	} elsif ($uni == 127) {	1961	} elsif ($uni == 127) {
1760	substr $text, $self->{cursor}, 1, "";	1962	substr $text, $self->{cursor}, 1, "";
1761	} elsif ($sym == CFClient::SDLK_LEFT) {	1963	} elsif ($sym == CFPlus::SDLK_LEFT) {
1762	--$self->{cursor} if $self->{cursor};	1964	--$self->{cursor} if $self->{cursor};
1763	} elsif ($sym == CFClient::SDLK_RIGHT) {	1965	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1764	++$self->{cursor} if $self->{cursor} < length $self->{text};	1966	++$self->{cursor} if $self->{cursor} < length $self->{text};
1765	} elsif ($sym == CFClient::SDLK_HOME) {	1967	} elsif ($sym == CFPlus::SDLK_HOME) {
1766	$self->{cursor} = 0;	1968	$self->{cursor} = 0;
1767	} elsif ($sym == CFClient::SDLK_END) {	1969	} elsif ($sym == CFPlus::SDLK_END) {
1768	$self->{cursor} = length $text;	1970	$self->{cursor} = length $text;
1769	} elsif ($uni == 27) {	1971	} elsif ($uni == 27) {
1770	$self->_emit ('escape');	1972	$self->emit ('escape');
1771	} elsif ($uni) {	1973	} elsif ($uni) {
1772	substr $text, $self->{cursor}++, 0, chr $uni;	1974	substr $text, $self->{cursor}++, 0, chr $uni;
1773	} else {	1975	} else {
1774	return 0;	1976	return 0;
1775	}	1977	}
…		…
1779	$self->realloc;	1981	$self->realloc;
1780		1982
1781	1	1983	1
1782	}	1984	}
1783		1985
1784	sub focus_in {	1986	sub invoke_focus_in {
1785	my ($self) = @_;	1987	my ($self) = @_;
1786		1988
1787	$self->{last_activity} = $::NOW;	1989	$self->{last_activity} = $::NOW;
1788		1990
1789	$self->SUPER::focus_in;	1991	$self->SUPER::invoke_focus_in
1790	}	1992	}
1791		1993
1792	sub button_down {	1994	sub invoke_button_down {
1793	my ($self, $ev, $x, $y) = @_;	1995	my ($self, $ev, $x, $y) = @_;
1794		1996
1795	$self->SUPER::button_down ($ev, $x, $y);	1997	$self->SUPER::invoke_button_down ($ev, $x, $y);
1796		1998
1797	my $idx = $self->{layout}->xy_to_index ($x, $y);	1999	my $idx = $self->{layout}->xy_to_index ($x, $y);
1798		2000
1799	# byte-index to char-index	2001	# byte-index to char-index
1800	my $text = $self->{text};	2002	my $text = $self->{text};
1801	utf8::encode $text;	2003	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802	$self->{cursor} = length substr $text, 0, $idx;	2004	$self->{cursor} = length $text;
1803		2005
1804	$self->_set_text ($self->{text});	2006	$self->_set_text ($self->{text});
1805	$self->update;	2007	$self->update;
1806		2008
1807	1	2009	1
1808	}	2010	}
1809		2011
1810	sub mouse_motion {	2012	sub invoke_mouse_motion {
1811	my ($self, $ev, $x, $y) = @_;	2013	my ($self, $ev, $x, $y) = @_;
1812	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2014	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813		2015
1814	0	2016	1
1815	}	2017	}
1816		2018
1817	sub _draw {	2019	sub _draw {
1818	my ($self) = @_;	2020	my ($self) = @_;
1819		2021
…		…
1846	utf8::encode $text;	2048	utf8::encode $text;
1847		2049
1848	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2050	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1849	}	2051	}
1850		2052
1851	glColor @{$self->{fg}};
1852	glBegin GL_LINES;	2053	glBegin GL_LINES;
1853	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2054	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1854	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2055	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1855	glEnd;	2056	glEnd;
1856	}	2057	}
1857	}	2058	}
1858		2059
1859	package CFClient::UI::Entry;	2060	package CFPlus::UI::Entry;
1860		2061
1861	our @ISA = CFClient::UI::EntryBase::;	2062	our @ISA = CFPlus::UI::EntryBase::;
1862		2063
1863	use CFClient::OpenGL;	2064	use CFPlus::OpenGL;
1864		2065
1865	sub key_down {	2066	sub invoke_key_down {
1866	my ($self, $ev) = @_;	2067	my ($self, $ev) = @_;
1867		2068
1868	my $sym = $ev->{sym};	2069	my $sym = $ev->{sym};
1869		2070
1870	if ($sym == 13) {	2071	if ($sym == 13) {
1871	unshift @{$self->{history}},	2072	unshift @{$self->{history}},
1872	my $txt = $self->get_text;	2073	my $txt = $self->get_text;
		2074
1873	$self->{history_pointer} = -1;	2075	$self->{history_pointer} = -1;
1874	$self->{history_saveback} = '';	2076	$self->{history_saveback} = '';
1875	$self->_emit (activate => $txt);	2077	$self->emit (activate => $txt);
1876	$self->update;	2078	$self->update;
1877		2079
1878	} elsif ($sym == CFClient::SDLK_UP) {	2080	} elsif ($sym == CFPlus::SDLK_UP) {
1879	if ($self->{history_pointer} < 0) {	2081	if ($self->{history_pointer} < 0) {
1880	$self->{history_saveback} = $self->get_text;	2082	$self->{history_saveback} = $self->get_text;
1881	}	2083	}
1882	if (@{$self->{history} || []} > 0) {	2084	if (@{$self->{history} || []} > 0) {
1883	$self->{history_pointer}++;	2085	$self->{history_pointer}++;
…		…
1885	$self->{history_pointer} = @{$self->{history} || []} - 1;	2087	$self->{history_pointer} = @{$self->{history} || []} - 1;
1886	}	2088	}
1887	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2089	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1888	}	2090	}
1889		2091
1890	} elsif ($sym == CFClient::SDLK_DOWN) {	2092	} elsif ($sym == CFPlus::SDLK_DOWN) {
1891	$self->{history_pointer}--;	2093	$self->{history_pointer}--;
1892	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2094	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893		2095
1894	if ($self->{history_pointer} >= 0) {	2096	if ($self->{history_pointer} >= 0) {
1895	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2097	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1896	} else {	2098	} else {
1897	$self->set_text ($self->{history_saveback});	2099	$self->set_text ($self->{history_saveback});
1898	}	2100	}
1899		2101
1900	} else {	2102	} else {
1901	return $self->SUPER::key_down ($ev)	2103	return $self->SUPER::invoke_key_down ($ev)
1902	}	2104	}
1903		2105
1904	1	2106	1
1905	}	2107	}
1906		2108
1907	#############################################################################	2109	#############################################################################
1908		2110
1909	package CFClient::UI::Button;	2111	package CFPlus::UI::Button;
1910		2112
1911	our @ISA = CFClient::UI::Label::;	2113	our @ISA = CFPlus::UI::Label::;
1912		2114
1913	use CFClient::OpenGL;	2115	use CFPlus::OpenGL;
1914		2116
1915	my @tex =	2117	my @tex =
1916	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2118	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917	qw(b1_button_active.png);	2119	qw(b1_button_active.png);
1918		2120
1919	sub new {	2121	sub new {
1920	my $class = shift;	2122	my $class = shift;
1921		2123
…		…
1930	can_events => 1,	2132	can_events => 1,
1931	@_	2133	@_
1932	)	2134	)
1933	}	2135	}
1934		2136
1935	sub activate { }
1936
1937	sub button_up {	2137	sub invoke_button_up {
1938	my ($self, $ev, $x, $y) = @_;	2138	my ($self, $ev, $x, $y) = @_;
1939		2139
1940	$self->emit ("activate")	2140	$self->emit ("activate")
1941	if $x >= 0 && $x < $self->{w}	2141	if $x >= 0 && $x < $self->{w}
1942	&& $y >= 0 && $y < $self->{h};	2142	&& $y >= 0 && $y < $self->{h};
…		…
1960	$self->SUPER::_draw;	2160	$self->SUPER::_draw;
1961	}	2161	}
1962		2162
1963	#############################################################################	2163	#############################################################################
1964		2164
1965	package CFClient::UI::CheckBox;	2165	package CFPlus::UI::CheckBox;
1966		2166
1967	our @ISA = CFClient::UI::DrawBG::;	2167	our @ISA = CFPlus::UI::DrawBG::;
1968		2168
1969	my @tex =	2169	my @tex =
1970	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2170	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2171	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972		2172
1973	use CFClient::OpenGL;	2173	use CFPlus::OpenGL;
1974		2174
1975	sub new {	2175	sub new {
1976	my $class = shift;	2176	my $class = shift;
1977		2177
1978	$class->SUPER::new (	2178	$class->SUPER::new (
…		…
1992	my ($self) = @_;	2192	my ($self) = @_;
1993		2193
1994	(6) x 2	2194	(6) x 2
1995	}	2195	}
1996		2196
		2197	sub toggle {
		2198	my ($self) = @_;
		2199
		2200	$self->{state} = !$self->{state};
		2201	$self->emit (changed => $self->{state});
		2202	$self->update;
		2203	}
		2204
1997	sub button_down {	2205	sub invoke_button_down {
1998	my ($self, $ev, $x, $y) = @_;	2206	my ($self, $ev, $x, $y) = @_;
1999		2207
2000	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2208	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2209	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002	$self->{state} = !$self->{state};	2210	$self->toggle;
2003	$self->_emit (changed => $self->{state});
2004	} else {	2211	} else {
2005	return 0	2212	return 0
2006	}	2213	}
2007		2214
2008	1	2215	1
…		…
2028	glDisable GL_TEXTURE_2D;	2235	glDisable GL_TEXTURE_2D;
2029	}	2236	}
2030		2237
2031	#############################################################################	2238	#############################################################################
2032		2239
2033	package CFClient::UI::Image;	2240	package CFPlus::UI::Image;
2034		2241
2035	our @ISA = CFClient::UI::Base::;	2242	our @ISA = CFPlus::UI::Base::;
2036		2243
2037	use CFClient::OpenGL;	2244	use CFPlus::OpenGL;
2038	use Carp qw/confess/;
2039		2245
2040	our %loaded_images;	2246	our %texture_cache;
2041		2247
2042	sub new {	2248	sub new {
2043	my $class = shift;	2249	my $class = shift;
2044		2250
2045	my $self = $class->SUPER::new (can_events => 0, @_);	2251	my $self = $class->SUPER::new (
		2252	can_events => 0,
		2253	@_,
		2254	);
2046		2255
2047	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2256	$self->{path} || $self->{tex}
		2257	or Carp::croak "'path' or 'tex' attributes required";
2048		2258
2049	$loaded_images{$self->{image}} ||=	2259	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2050	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2260	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051		2261
2052	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2262	Scalar::Util::weaken $texture_cache{$self->{path}};
2053		2263
2054	Scalar::Util::weaken $loaded_images{$self->{image}};	2264	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056	$self->{aspect} = $tex->{w} / $tex->{h};
2057		2265
2058	$self	2266	$self
2059	}	2267	}
2060		2268
		2269	sub STORABLE_freeze {
		2270	my ($self, $cloning) = @_;
		2271
		2272	$self->{path}
		2273	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2274
		2275	$self->{path}
		2276	}
		2277
		2278	sub STORABLE_attach {
		2279	my ($self, $cloning, $path) = @_;
		2280
		2281	$self->new (path => $path)
		2282	}
		2283
2061	sub size_request {	2284	sub size_request {
2062	my ($self) = @_;	2285	my ($self) = @_;
2063		2286
2064	($self->{tex}->{w}, $self->{tex}->{h})	2287	($self->{tex}{w}, $self->{tex}{h})
2065	}	2288	}
2066		2289
2067	sub _draw {	2290	sub _draw {
2068	my ($self) = @_;	2291	my ($self) = @_;
2069		2292
…		…
2079	}	2302	}
2080		2303
2081	glEnable GL_TEXTURE_2D;	2304	glEnable GL_TEXTURE_2D;
2082	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2305	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083		2306
2084	$tex->draw_quad_alpha (0, 0, $w, $h);	2307	$tex->draw_quad (0, 0, $w, $h);
2085		2308
2086	glDisable GL_TEXTURE_2D;	2309	glDisable GL_TEXTURE_2D;
2087	}	2310	}
2088		2311
2089	#############################################################################	2312	#############################################################################
2090		2313
		2314	package CFPlus::UI::ImageButton;
		2315
		2316	our @ISA = CFPlus::UI::Image::;
		2317
		2318	use CFPlus::OpenGL;
		2319
		2320	my %textures;
		2321
		2322	sub new {
		2323	my $class = shift;
		2324
		2325	my $self = $class->SUPER::new (
		2326	padding_x => 4,
		2327	padding_y => 4,
		2328	fg => [1, 1, 1],
		2329	active_fg => [0, 0, 1],
		2330	can_hover => 1,
		2331	align => 0,
		2332	valign => 0,
		2333	can_events => 1,
		2334	@_
		2335	);
		2336	}
		2337
		2338	sub invoke_button_up {
		2339	my ($self, $ev, $x, $y) = @_;
		2340
		2341	$self->emit ("activate")
		2342	if $x >= 0 && $x < $self->{w}
		2343	&& $y >= 0 && $y < $self->{h};
		2344
		2345	1
		2346	}
		2347
		2348	#############################################################################
		2349
2091	package CFClient::UI::VGauge;	2350	package CFPlus::UI::VGauge;
2092		2351
2093	our @ISA = CFClient::UI::Base::;	2352	our @ISA = CFPlus::UI::Base::;
2094		2353
2095	use List::Util qw(min max);	2354	use List::Util qw(min max);
2096		2355
2097	use CFClient::OpenGL;	2356	use CFPlus::OpenGL;
2098		2357
2099	my %tex = (	2358	my %tex = (
2100	food => [	2359	food => [
2101	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2360	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2361	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103	],	2362	],
2104	grace => [	2363	grace => [
2105	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2364	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2365	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2107	],	2366	],
2108	hp => [	2367	hp => [
2109	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2368	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2369	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111	],	2370	],
2112	mana => [	2371	mana => [
2113	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2372	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2373	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2115	],	2374	],
2116	);	2375	);
2117		2376
2118	# eg. VGauge->new (gauge => 'food'), default gauge: food	2377	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2178	my $ycut1 = max 0, min 1, $ycut;	2437	my $ycut1 = max 0, min 1, $ycut;
2179	my $ycut2 = max 0, min 1, $ycut - 1;	2438	my $ycut2 = max 0, min 1, $ycut - 1;
2180		2439
2181	my $h1 = $self->{h} * (1 - $ycut1);	2440	my $h1 = $self->{h} * (1 - $ycut1);
2182	my $h2 = $self->{h} * (1 - $ycut2);	2441	my $h2 = $self->{h} * (1 - $ycut2);
		2442	my $h3 = $self->{h};
		2443
		2444	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183		2445
2184	glEnable GL_BLEND;	2446	glEnable GL_BLEND;
2185	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2447	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2448	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187	glEnable GL_TEXTURE_2D;	2449	glEnable GL_TEXTURE_2D;
…		…
2206		2468
2207	if ($t3) {	2469	if ($t3) {
2208	glBindTexture GL_TEXTURE_2D, $t3->{name};	2470	glBindTexture GL_TEXTURE_2D, $t3->{name};
2209	glBegin GL_QUADS;	2471	glBegin GL_QUADS;
2210	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2472	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2473	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2474	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2475	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214	glEnd;	2476	glEnd;
2215	}	2477	}
2216		2478
2217	glDisable GL_BLEND;	2479	glDisable GL_BLEND;
2218	glDisable GL_TEXTURE_2D;	2480	glDisable GL_TEXTURE_2D;
2219	}	2481	}
2220		2482
2221	#############################################################################	2483	#############################################################################
2222		2484
2223	package CFClient::UI::Gauge;	2485	package CFPlus::UI::Gauge;
2224		2486
2225	our @ISA = CFClient::UI::VBox::;	2487	our @ISA = CFPlus::UI::VBox::;
2226		2488
2227	sub new {	2489	sub new {
2228	my ($class, %arg) = @_;	2490	my ($class, %arg) = @_;
2229		2491
2230	my $self = $class->SUPER::new (	2492	my $self = $class->SUPER::new (
…		…
2232	can_hover => 1,	2494	can_hover => 1,
2233	can_events => 1,	2495	can_events => 1,
2234	%arg,	2496	%arg,
2235	);	2497	);
2236		2498
2237	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2499	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2238	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2500	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2239	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2501	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2240		2502
2241	$self	2503	$self
2242	}	2504	}
2243		2505
2244	sub set_fontsize {	2506	sub set_fontsize {
…		…
2265	$self->{value}->set_text ($val);	2527	$self->{value}->set_text ($val);
2266	}	2528	}
2267		2529
2268	#############################################################################	2530	#############################################################################
2269		2531
2270	package CFClient::UI::Slider;	2532	package CFPlus::UI::Slider;
2271		2533
2272	use strict;	2534	use strict;
2273		2535
2274	use CFClient::OpenGL;	2536	use CFPlus::OpenGL;
2275		2537
2276	our @ISA = CFClient::UI::DrawBG::;	2538	our @ISA = CFPlus::UI::DrawBG::;
2277		2539
2278	my @tex =	2540	my @tex =
2279	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2541	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280	qw(s1_slider.png s1_slider_bg.png);	2542	qw(s1_slider.png s1_slider_bg.png);
2281		2543
2282	sub new {	2544	sub new {
2283	my $class = shift;	2545	my $class = shift;
2284		2546
…		…
2305	$self->update;	2567	$self->update;
2306		2568
2307	$self	2569	$self
2308	}	2570	}
2309		2571
2310	sub changed { }
2311
2312	sub set_range {	2572	sub set_range {
2313	my ($self, $range) = @_;	2573	my ($self, $range) = @_;
2314		2574
2315	($range, $self->{range}) = ($self->{range}, $range);	2575	($range, $self->{range}) = ($self->{range}, $range);
2316		2576
…		…
2336	if $unit;	2596	if $unit;
2337		2597
2338	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2598	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339		2599
2340	if ($value != $old_value) {	2600	if ($value != $old_value) {
2341	$self->_emit (changed => $value);	2601	$self->emit (changed => $value);
2342	$self->update;	2602	$self->update;
2343	}	2603	}
2344	}	2604	}
2345		2605
2346	sub size_request {	2606	sub size_request {
2347	my ($self) = @_;	2607	my ($self) = @_;
2348		2608
2349	($self->{req_w}, $self->{req_h})	2609	($self->{req_w}, $self->{req_h})
2350	}	2610	}
2351		2611
2352	sub button_down {	2612	sub invoke_button_down {
2353	my ($self, $ev, $x, $y) = @_;	2613	my ($self, $ev, $x, $y) = @_;
2354		2614
2355	$self->SUPER::button_down ($ev, $x, $y);	2615	$self->SUPER::invoke_button_down ($ev, $x, $y);
2356		2616
2357	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2617	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358		2618
2359	$self->mouse_motion ($ev, $x, $y)	2619	$self->invoke_mouse_motion ($ev, $x, $y)
2360	}	2620	}
2361		2621
2362	sub mouse_motion {	2622	sub invoke_mouse_motion {
2363	my ($self, $ev, $x, $y) = @_;	2623	my ($self, $ev, $x, $y) = @_;
2364		2624
2365	if ($GRAB == $self) {	2625	if ($GRAB == $self) {
2366	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2626	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367		2627
…		…
2373	} else {	2633	} else {
2374	return 0;	2634	return 0;
2375	}	2635	}
2376		2636
2377	1	2637	1
		2638	}
		2639
		2640	sub invoke_mouse_wheel {
		2641	my ($self, $ev) = @_;
		2642
		2643	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2644
		2645	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2646
		2647	! ! $delta
2378	}	2648	}
2379		2649
2380	sub update {	2650	sub update {
2381	my ($self) = @_;	2651	my ($self) = @_;
2382		2652
…		…
2431	glDisable GL_TEXTURE_2D;	2701	glDisable GL_TEXTURE_2D;
2432	}	2702	}
2433		2703
2434	#############################################################################	2704	#############################################################################
2435		2705
2436	package CFClient::UI::ValSlider;	2706	package CFPlus::UI::ValSlider;
2437		2707
2438	our @ISA = CFClient::UI::HBox::;	2708	our @ISA = CFPlus::UI::HBox::;
2439		2709
2440	sub new {	2710	sub new {
2441	my ($class, %arg) = @_;	2711	my ($class, %arg) = @_;
2442		2712
2443	my $range = delete $arg{range};	2713	my $range = delete $arg{range};
2444		2714
2445	my $self = $class->SUPER::new (	2715	my $self = $class->SUPER::new (
2446	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2716	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2717	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448	to_value => sub { shift },	2718	to_value => sub { shift },
2449	from_value => sub { shift },	2719	from_value => sub { shift },
2450	%arg,	2720	%arg,
2451	);	2721	);
2452		2722
…		…
2472	sub set_range { shift->{slider}->set_range (@_) }	2742	sub set_range { shift->{slider}->set_range (@_) }
2473	sub set_value { shift->{slider}->set_value (@_) }	2743	sub set_value { shift->{slider}->set_value (@_) }
2474		2744
2475	#############################################################################	2745	#############################################################################
2476		2746
2477	package CFClient::UI::TextScroller;	2747	package CFPlus::UI::TextScroller;
2478		2748
2479	our @ISA = CFClient::UI::HBox::;	2749	our @ISA = CFPlus::UI::HBox::;
2480		2750
2481	use CFClient::OpenGL;	2751	use CFPlus::OpenGL;
2482		2752
2483	sub new {	2753	sub new {
2484	my $class = shift;	2754	my $class = shift;
2485		2755
2486	my $self = $class->SUPER::new (	2756	my $self = $class->SUPER::new (
2487	fontsize => 1,	2757	fontsize => 1,
2488	can_events => 0,	2758	can_events => 1,
2489	indent => 0,	2759	indent => 0,
2490	#font => default_font	2760	#font => default_font
2491	@_,	2761	@_,
2492		2762
2493	layout => (new CFClient::Layout 1),	2763	layout => (new CFPlus::Layout),
2494	par => [],	2764	par => [],
2495	height => 0,	2765	height => 0,
2496	children => [	2766	children => [
2497	(new CFClient::UI::Empty expand => 1),	2767	(new CFPlus::UI::Empty expand => 1),
2498	(new CFClient::UI::Slider vertical => 1),	2768	(new CFPlus::UI::Slider vertical => 1),
2499	],	2769	],
2500	);	2770	);
2501		2771
2502	$self->{children}[1]->connect (changed => sub { $self->update });	2772	$self->{children}[1]->connect (changed => sub { $self->update });
2503		2773
…		…
2509		2779
2510	$self->{fontsize} = $fontsize;	2780	$self->{fontsize} = $fontsize;
2511	$self->reflow;	2781	$self->reflow;
2512	}	2782	}
2513		2783
		2784	sub size_request {
		2785	my ($self) = @_;
		2786
		2787	my ($empty, $slider) = @{ $self->{children} };
		2788
		2789	local $self->{children} = [$empty, $slider];
		2790	$self->SUPER::size_request
		2791	}
		2792
2514	sub size_allocate {	2793	sub invoke_size_allocate {
2515	my ($self, $w, $h) = @_;	2794	my ($self, $w, $h) = @_;
2516		2795
2517	$self->SUPER::size_allocate ($w, $h);	2796	my ($empty, $slider, @other) = @{ $self->{children} };
		2797	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518		2798
2519	$self->{layout}->set_font ($self->{font}) if $self->{font};	2799	$self->{layout}->set_font ($self->{font}) if $self->{font};
2520	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2800	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521	$self->{layout}->set_width ($self->{children}[0]{w});	2801	$self->{layout}->set_width ($empty->{w});
2522	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2802	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523		2803
2524	$self->reflow;	2804	$self->reflow;
2525	}
2526		2805
2527	sub text_size {	2806	local $self->{children} = [$empty, $slider];
		2807	$self->SUPER::invoke_size_allocate ($w, $h)
		2808	}
		2809
		2810	sub invoke_mouse_wheel {
2528	my ($self, $text, $indent) = @_;	2811	my ($self, $ev) = @_;
		2812
		2813	return 0 unless $ev->{dy}; # only vertical movements
		2814
		2815	$self->{children}[1]->emit (mouse_wheel => $ev);
		2816
		2817	1
		2818	}
		2819
		2820	sub get_layout {
		2821	my ($self, $para) = @_;
2529		2822
2530	my $layout = $self->{layout};	2823	my $layout = $self->{layout};
2531		2824
		2825	$layout->set_font ($self->{font}) if $self->{font};
		2826	$layout->set_foreground (@{$para->{fg}});
2532	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2827	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533	$layout->set_width ($self->{children}[0]{w} - $indent);	2828	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2829	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535	$layout->set_markup ($text);	2830	$layout->set_markup ($para->{markup});
		2831
		2832	$layout->set_shapes (
		2833	map
		2834	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2835	@{$para->{widget}}
2536		2836	);
		2837
2537	$layout->size	2838	$layout
2538	}	2839	}
2539		2840
2540	sub reflow {	2841	sub reflow {
2541	my ($self) = @_;	2842	my ($self) = @_;
2542		2843
…		…
2549		2850
2550	# todo: base offset on lines or so, not on pixels	2851	# todo: base offset on lines or so, not on pixels
2551	$self->{children}[1]->set_value ($offset);	2852	$self->{children}[1]->set_value ($offset);
2552	}	2853	}
2553		2854
		2855	sub current_paragraph {
		2856	my ($self) = @_;
		2857
		2858	$self->force_uptodate;
		2859	$self->{top_paragraph} - 1
		2860	}
		2861
		2862	sub scroll_to {
		2863	my ($self, $para) = @_;
		2864
		2865	$self->force_uptodate;
		2866
		2867	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2868
		2869	$self->{children}[1]->set_value ($self->{par}[$para]{y});
		2870	}
		2871
2554	sub clear {	2872	sub clear {
2555	my ($self) = @_;	2873	my ($self) = @_;
		2874
		2875	my (undef, undef, @other) = @{ $self->{children} };
		2876	$self->remove ($_) for @other;
2556		2877
2557	$self->{par} = [];	2878	$self->{par} = [];
2558	$self->{height} = 0;	2879	$self->{height} = 0;
2559	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2880	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560	}	2881	}
2561		2882
2562	sub add_paragraph {	2883	sub add_paragraph {
2563	my ($self, $color, $text, $indent) = @_;	2884	my $self = shift;
2564		2885
2565	for my $line (split /\n/, $text) {	2886	for my $para (@_) {
2566	my ($w, $h) = $self->text_size ($line);	2887	$para = {
		2888	fg => [1, 1, 1, 1],
		2889	indent => 0,
		2890	markup => "",
		2891	widget => [],
		2892	ref $para ? %$para : (markup => $para),
		2893	w => 1e10,
		2894	wrapped => 1,
		2895	};
		2896
		2897	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2898	push @{$self->{par}}, $para;
		2899	}
		2900
		2901	$self->{need_reflow}++;
		2902	$self->update;
		2903	}
		2904
		2905	sub scroll_to_bottom {
		2906	my ($self) = @_;
		2907
		2908	$self->{scroll_to_bottom} = 1;
		2909	$self->update;
		2910	}
		2911
		2912	sub force_uptodate {
		2913	my ($self) = @_;
		2914
		2915	if (delete $self->{need_reflow}) {
		2916	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2917
		2918	my $height = 0;
		2919	my $paridx;
		2920	my $top_paragraph;
		2921	my $top = int $self->{children}[1]{range}[0];
		2922
		2923	for my $para (@{$self->{par}}) {
		2924	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2925	my $layout = $self->get_layout ($para);
		2926	my ($w, $h) = $layout->size;
		2927
		2928	$para->{w} = $w + $para->{indent};
		2929	$para->{h} = $h;
		2930	$para->{wrapped} = $layout->has_wrapped;
		2931	}
		2932
		2933	$para->{y} = $height;
		2934
		2935	$paridx++;
		2936	$top_paragraph ||= $paridx if $height >= $top;
		2937
		2938	$height += $para->{h};
		2939	}
		2940
		2941	$self->{top_paragraph} = $top_paragraph;
2567	$self->{height} += $h;	2942	$self->{height} = $height;
2568	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2569	}
2570		2943
2571	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2944	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2945
		2946	delete $self->{texture};
		2947	}
		2948
		2949	if (delete $self->{scroll_to_bottom}) {
		2950	$self->{children}[1]->set_value (1e10);
		2951	}
2572	}	2952	}
2573		2953
2574	sub update {	2954	sub update {
2575	my ($self) = @_;	2955	my ($self) = @_;
2576		2956
…		…
2579	return unless $self->{h} > 0;	2959	return unless $self->{h} > 0;
2580		2960
2581	delete $self->{texture};	2961	delete $self->{texture};
2582		2962
2583	$ROOT->on_post_alloc ($self => sub {	2963	$ROOT->on_post_alloc ($self => sub {
		2964	$self->force_uptodate;
		2965
2584	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2966	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585		2967
2586	if (delete $self->{need_reflow}) {
2587	my $height = 0;
2588
2589	my $layout = $self->{layout};
2590
2591	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593	for (@{$self->{par}}) {
2594	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595	$layout->set_width ($W - $_->[3]);
2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597	$layout->set_markup ($_->[4]);
2598	my ($w, $h) = $layout->size;
2599	$_->[0] = $w + $_->[3];
2600	$_->[1] = $h;
2601	}
2602
2603	$height += $_->[1];
2604	}
2605
2606	$self->{height} = $height;
2607
2608	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2609
2610	delete $self->{texture};
2611	}
2612
2613	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2968	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614	glClearColor 0, 0, 0, 0;	2969	glClearColor 0, 0, 0, 0;
2615	glClear GL_COLOR_BUFFER_BIT;	2970	glClear GL_COLOR_BUFFER_BIT;
2616		2971
2617	my $top = int $self->{children}[1]{range}[0];	2972	my $top = int $self->{children}[1]{range}[0];
2618		2973
2619	my $y0 = $top;	2974	my $y0 = $top;
2620	my $y1 = $top + $H;	2975	my $y1 = $top + $H;
2621		2976
2622	my $y = 0;
2623
2624	my $layout = $self->{layout};
2625
2626	$layout->set_font ($self->{font}) if $self->{font};
2627
2628	glEnable GL_BLEND;
2629	#TODO# not correct in windows where rgba is forced off
2630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632	for my $par (@{$self->{par}}) {	2977	for my $para (@{$self->{par}}) {
2633	my $h = $par->[1];	2978	my $h = $para->{h};
		2979	my $y = $para->{y};
2634		2980
2635	if ($y0 < $y + $h && $y < $y1) {	2981	if ($y0 < $y + $h && $y < $y1) {
2636	$layout->set_foreground (@{ $par->[2] });	2982	my $layout = $self->get_layout ($para);
2637	$layout->set_width ($W - $par->[3]);
2638	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639	$layout->set_markup ($par->[4]);
2640		2983
2641	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2984	$layout->render ($para->{indent}, $y - $y0);
2642		2985
2643	glRasterPos $par->[3], $y - $y0;	2986	if (my @w = @{ $para->{widget} }) {
2644	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2987	my @s = $layout->get_shapes;
		2988
		2989	for (@w) {
		2990	my ($dx, $dy) = splice @s, 0, 2, ();
		2991
		2992	$_->{x} = $dx + $para->{indent};
		2993	$_->{y} = $dy + $y - $y0;
		2994
		2995	$_->draw;
		2996	}
		2997	}
2645	}	2998	}
2646
2647	$y += $h;
2648	}	2999	}
2649
2650	glDisable GL_BLEND;
2651	};	3000	};
2652	});	3001	});
		3002	}
		3003
		3004	sub reconfigure {
		3005	my ($self) = @_;
		3006
		3007	$self->SUPER::reconfigure;
		3008
		3009	$_->{w} = 1e10 for @{ $self->{par} };
		3010	$self->reflow;
2653	}	3011	}
2654		3012
2655	sub _draw {	3013	sub _draw {
2656	my ($self) = @_;	3014	my ($self) = @_;
2657		3015
…		…
2660	glColor 0, 0, 0, 1;	3018	glColor 0, 0, 0, 1;
2661	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3019	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662	glDisable GL_TEXTURE_2D;	3020	glDisable GL_TEXTURE_2D;
2663		3021
2664	$self->{children}[1]->draw;	3022	$self->{children}[1]->draw;
2665
2666	}	3023	}
2667		3024
2668	#############################################################################	3025	#############################################################################
2669		3026
2670	package CFClient::UI::Animator;	3027	package CFPlus::UI::Animator;
2671		3028
2672	use CFClient::OpenGL;	3029	use CFPlus::OpenGL;
2673		3030
2674	our @ISA = CFClient::UI::Bin::;	3031	our @ISA = CFPlus::UI::Bin::;
2675		3032
2676	sub moveto {	3033	sub moveto {
2677	my ($self, $x, $y) = @_;	3034	my ($self, $x, $y) = @_;
2678		3035
2679	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3036	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2707	glPopMatrix;	3064	glPopMatrix;
2708	}	3065	}
2709		3066
2710	#############################################################################	3067	#############################################################################
2711		3068
2712	package CFClient::UI::Flopper;	3069	package CFPlus::UI::Flopper;
2713		3070
2714	our @ISA = CFClient::UI::Button::;	3071	our @ISA = CFPlus::UI::Button::;
2715		3072
2716	sub new {	3073	sub new {
2717	my $class = shift;	3074	my $class = shift;
2718		3075
2719	my $self = $class->SUPER::new (	3076	my $self = $class->SUPER::new (
…		…
2731	$self->{other}->toggle_visibility;	3088	$self->{other}->toggle_visibility;
2732	}	3089	}
2733		3090
2734	#############################################################################	3091	#############################################################################
2735		3092
2736	package CFClient::UI::Tooltip;	3093	package CFPlus::UI::Tooltip;
2737		3094
2738	our @ISA = CFClient::UI::Bin::;	3095	our @ISA = CFPlus::UI::Bin::;
2739		3096
2740	use CFClient::OpenGL;	3097	use CFPlus::OpenGL;
2741		3098
2742	sub new {	3099	sub new {
2743	my $class = shift;	3100	my $class = shift;
2744		3101
2745	$class->SUPER::new (	3102	$class->SUPER::new (
…		…
2748	)	3105	)
2749	}	3106	}
2750		3107
2751	sub set_tooltip_from {	3108	sub set_tooltip_from {
2752	my ($self, $widget) = @_;	3109	my ($self, $widget) = @_;
		3110
		3111	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3112	if $widget->{tooltip} =~ /^#(.*)$/;
2753		3113
2754	my $tooltip = $widget->{tooltip};	3114	my $tooltip = $widget->{tooltip};
2755		3115
2756	if ($ENV{CFPLUS_DEBUG} & 2) {	3116	if ($ENV{CFPLUS_DEBUG} & 2) {
2757	$tooltip .= "\n\n" . (ref $widget) . "\n"	3117	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2761	}	3121	}
2762		3122
2763	$tooltip =~ s/^\n+//;	3123	$tooltip =~ s/^\n+//;
2764	$tooltip =~ s/\n+$//;	3124	$tooltip =~ s/\n+$//;
2765		3125
2766	$self->add (new CFClient::UI::Label	3126	$self->add (new CFPlus::UI::Label
2767	markup => $tooltip,	3127	markup => $tooltip,
2768	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3128	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769	fontsize => 0.8,	3129	fontsize => 0.8,
2770	fg => [0, 0, 0, 1],	3130	style => 1, # FLAG_INVERSE
2771	ellipsise => 0,	3131	ellipsise => 0,
2772	font => ($widget->{tooltip_font} || $::FONT_PROP),	3132	font => ($widget->{tooltip_font} || $::FONT_PROP),
2773	);	3133	);
2774	}	3134	}
2775		3135
…		…
2779	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3139	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780		3140
2781	($w + 4, $h + 4)	3141	($w + 4, $h + 4)
2782	}	3142	}
2783		3143
2784	sub size_allocate {	3144	sub invoke_size_allocate {
2785	my ($self, $w, $h) = @_;	3145	my ($self, $w, $h) = @_;
2786		3146
2787	$self->SUPER::size_allocate ($w - 4, $h - 4);	3147	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788	}	3148	}
2789		3149
2790	sub visibility_change {	3150	sub invoke_visibility_change {
2791	my ($self, $visible) = @_;	3151	my ($self, $visible) = @_;
2792		3152
2793	return unless $visible;	3153	return unless $visible;
2794		3154
2795	$self->{root}->on_post_alloc ("move_$self" => sub {	3155	$self->{root}->on_post_alloc ("move_$self" => sub {
2796	my $widget = $self->{owner}	3156	my $widget = $self->{owner}
2797	or return;	3157	or return;
2798		3158
		3159	if ($widget->{visible}) {
2799	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3160	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800		3161
2801	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3162	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802	if $x + $self->{w} > $self->{root}{w};	3163	if $x + $self->{w} > $self->{root}{w};
2803		3164
2804	$self->move_abs ($x, $y);	3165	$self->move_abs ($x, $y);
		3166	} else {
		3167	$self->hide;
		3168	}
2805	});	3169	});
2806	}	3170	}
2807		3171
2808	sub _draw {	3172	sub _draw {
2809	my ($self) = @_;	3173	my ($self) = @_;
…		…
2833	$self->SUPER::_draw;	3197	$self->SUPER::_draw;
2834	}	3198	}
2835		3199
2836	#############################################################################	3200	#############################################################################
2837		3201
2838	package CFClient::UI::Face;	3202	package CFPlus::UI::Face;
2839		3203
2840	our @ISA = CFClient::UI::Base::;	3204	our @ISA = CFPlus::UI::DrawBG::;
2841		3205
2842	use CFClient::OpenGL;	3206	use CFPlus::OpenGL;
2843		3207
2844	sub new {	3208	sub new {
2845	my $class = shift;	3209	my $class = shift;
2846		3210
2847	my $self = $class->SUPER::new (	3211	my $self = $class->SUPER::new (
…		…
2882	sub _draw {	3246	sub _draw {
2883	my ($self) = @_;	3247	my ($self) = @_;
2884		3248
2885	return unless $::CONN;	3249	return unless $::CONN;
2886		3250
		3251	$self->SUPER::_draw;
		3252
2887	my $face;	3253	my $face;
2888		3254
2889	if ($self->{frame}) {	3255	if ($self->{frame}) {
2890	my $anim = $::CONN->{anim}[$self->{anim}];	3256	my $anim = $::CONN->{anim}[$self->{anim}];
2891		3257
…		…
2913	$self->SUPER::destroy;	3279	$self->SUPER::destroy;
2914	}	3280	}
2915		3281
2916	#############################################################################	3282	#############################################################################
2917		3283
2918	package CFClient::UI::Buttonbar;	3284	package CFPlus::UI::Buttonbar;
2919		3285
2920	our @ISA = CFClient::UI::HBox::;	3286	our @ISA = CFPlus::UI::HBox::;
2921		3287
2922	# TODO: should actualyl wrap buttons and other goodies.	3288	# TODO: should actualyl wrap buttons and other goodies.
2923		3289
2924	#############################################################################	3290	#############################################################################
2925		3291
2926	package CFClient::UI::Menu;	3292	package CFPlus::UI::Menu;
2927		3293
2928	our @ISA = CFClient::UI::FancyFrame::;	3294	our @ISA = CFPlus::UI::Toplevel::;
2929		3295
2930	use CFClient::OpenGL;	3296	use CFPlus::OpenGL;
2931		3297
2932	sub new {	3298	sub new {
2933	my $class = shift;	3299	my $class = shift;
2934		3300
2935	my $self = $class->SUPER::new (	3301	my $self = $class->SUPER::new (
2936	items => [],	3302	items => [],
2937	z => 100,	3303	z => 100,
2938	@_,	3304	@_,
2939	);	3305	);
2940		3306
2941	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3307	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942		3308
2943	for my $item (@{ $self->{items} }) {	3309	for my $item (@{ $self->{items} }) {
2944	my ($widget, $cb, $tooltip) = @$item;	3310	my ($widget, $cb, $tooltip) = @$item;
2945		3311
2946	# handle various types of items, only text for now	3312	# handle various types of items, only text for now
2947	if (!ref $widget) {	3313	if (!ref $widget) {
		3314	if ($widget =~ /\t/) {
		3315	my ($left, $right) = split /\t/, $widget, 2;
		3316
2948	$widget = new CFClient::UI::Label	3317	$widget = new CFPlus::UI::HBox
2949	can_hover => 1,	3318	can_hover => 1,
2950	can_events => 1,	3319	can_events => 1,
		3320	tooltip => $tooltip,
		3321	children => [
		3322	(new CFPlus::UI::Label markup => $left, expand => 1),
		3323	(new CFPlus::UI::Label markup => $right, align => +1),
		3324	],
		3325	;
		3326
		3327	} else {
		3328	$widget = new CFPlus::UI::Label
		3329	can_hover => 1,
		3330	can_events => 1,
2951	markup => $widget,	3331	markup => $widget,
2952	tooltip => $tooltip	3332	tooltip => $tooltip;
		3333	}
2953	}	3334	}
2954		3335
2955	$self->{item}{$widget} = $item;	3336	$self->{item}{$widget} = $item;
2956		3337
2957	$self->{vbox}->add ($widget);	3338	$self->{vbox}->add ($widget);
…		…
2962		3343
2963	# popup given the event (must be a mouse button down event currently)	3344	# popup given the event (must be a mouse button down event currently)
2964	sub popup {	3345	sub popup {
2965	my ($self, $ev) = @_;	3346	my ($self, $ev) = @_;
2966		3347
2967	$self->_emit ("popdown");	3348	$self->emit ("popdown");
2968		3349
2969	# maybe save $GRAB? must be careful about events...	3350	# maybe save $GRAB? must be careful about events...
2970	$GRAB = $self;	3351	$GRAB = $self;
2971	$self->{button} = $ev->{button};	3352	$self->{button} = $ev->{button};
2972		3353
2973	$self->show;	3354	$self->show;
2974	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3355	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975	}	3356	}
2976		3357
2977	sub mouse_motion {	3358	sub invoke_mouse_motion {
2978	my ($self, $ev, $x, $y) = @_;	3359	my ($self, $ev, $x, $y) = @_;
2979		3360
2980	# TODO: should use vbox->find_widget or so	3361	# TODO: should use vbox->find_widget or so
2981	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3362	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982	$self->{hover} = $self->{item}{$HOVER};	3363	$self->{hover} = $self->{item}{$HOVER};
2983		3364
2984	0	3365	0
2985	}	3366	}
2986		3367
2987	sub button_up {	3368	sub invoke_button_up {
2988	my ($self, $ev, $x, $y) = @_;	3369	my ($self, $ev, $x, $y) = @_;
2989		3370
2990	if ($ev->{button} == $self->{button}) {	3371	if ($ev->{button} == $self->{button}) {
2991	undef $GRAB;	3372	undef $GRAB;
2992	$self->hide;	3373	$self->hide;
2993		3374
2994	$self->_emit ("popdown");	3375	$self->emit ("popdown");
2995	$self->{hover}[1]->() if $self->{hover};	3376	$self->{hover}[1]->() if $self->{hover};
2996	} else {	3377	} else {
2997	return 0	3378	return 0
2998	}	3379	}
2999		3380
3000	1	3381	1
3001	}	3382	}
3002		3383
3003	#############################################################################	3384	#############################################################################
3004		3385
3005	package CFClient::UI::Multiplexer;	3386	package CFPlus::UI::Multiplexer;
3006		3387
3007	our @ISA = CFClient::UI::Container::;	3388	our @ISA = CFPlus::UI::Container::;
3008		3389
3009	sub new {	3390	sub new {
3010	my $class = shift;	3391	my $class = shift;
3011		3392
3012	my $self = $class->SUPER::new (	3393	my $self = $class->SUPER::new (
…		…
3026		3407
3027	$self->{current} = $self->{children}[0]	3408	$self->{current} = $self->{children}[0]
3028	if @{ $self->{children} };	3409	if @{ $self->{children} };
3029	}	3410	}
3030		3411
		3412	sub get_current_page {
		3413	my ($self) = @_;
		3414
		3415	$self->{current}
		3416	}
		3417
3031	sub set_current_page {	3418	sub set_current_page {
3032	my ($self, $page_or_widget) = @_;	3419	my ($self, $page_or_widget) = @_;
3033		3420
3034	my $widget = ref $page_or_widget	3421	my $widget = ref $page_or_widget
3035	? $page_or_widget	3422	? $page_or_widget
3036	: $self->{children}[$page_or_widget];	3423	: $self->{children}[$page_or_widget];
3037		3424
3038	$self->{current} = $widget;	3425	$self->{current} = $widget;
3039	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3426	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040		3427
3041	$self->_emit (page_changed => $self->{current});	3428	$self->emit (page_changed => $self->{current});
3042		3429
3043	$self->realloc;	3430	$self->realloc;
3044	}	3431	}
3045		3432
3046	sub visible_children {	3433	sub visible_children {
…		…
3051	my ($self) = @_;	3438	my ($self) = @_;
3052		3439
3053	$self->{current}->size_request	3440	$self->{current}->size_request
3054	}	3441	}
3055		3442
3056	sub size_allocate {	3443	sub invoke_size_allocate {
3057	my ($self, $w, $h) = @_;	3444	my ($self, $w, $h) = @_;
3058		3445
3059	$self->{current}->configure (0, 0, $w, $h);	3446	$self->{current}->configure (0, 0, $w, $h);
		3447
		3448	1
3060	}	3449	}
3061		3450
3062	sub _draw {	3451	sub _draw {
3063	my ($self) = @_;	3452	my ($self) = @_;
3064		3453
3065	$self->{current}->draw;	3454	$self->{current}->draw;
3066	}	3455	}
3067		3456
3068	#############################################################################	3457	#############################################################################
3069		3458
3070	package CFClient::UI::Notebook;	3459	package CFPlus::UI::Notebook;
3071		3460
3072	our @ISA = CFClient::UI::VBox::;	3461	our @ISA = CFPlus::UI::VBox::;
3073		3462
3074	sub new {	3463	sub new {
3075	my $class = shift;	3464	my $class = shift;
3076		3465
3077	my $self = $class->SUPER::new (	3466	my $self = $class->SUPER::new (
3078	buttonbar => (new CFClient::UI::Buttonbar),	3467	buttonbar => (new CFPlus::UI::Buttonbar),
3079	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3468	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080	# filter => # will be put between multiplexer and $self	3469	# filter => # will be put between multiplexer and $self
3081	@_,	3470	@_,
3082	);	3471	);
3083		3472
3084	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3473	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3090	sub add {	3479	sub add {
3091	my ($self, $title, $widget, $tooltip) = @_;	3480	my ($self, $title, $widget, $tooltip) = @_;
3092		3481
3093	Scalar::Util::weaken $self;	3482	Scalar::Util::weaken $self;
3094		3483
3095	$self->{buttonbar}->add (new CFClient::UI::Button	3484	$self->{buttonbar}->add (new CFPlus::UI::Button
3096	markup => $title,	3485	markup => $title,
3097	tooltip => $tooltip,	3486	tooltip => $tooltip,
3098	on_activate => sub { $self->set_current_page ($widget) },	3487	on_activate => sub { $self->set_current_page ($widget) },
3099	);	3488	);
3100		3489
3101	$self->{multiplexer}->add ($widget);	3490	$self->{multiplexer}->add ($widget);
3102	}	3491	}
3103		3492
		3493	sub get_current_page {
		3494	my ($self) = @_;
		3495
		3496	$self->{multiplexer}->get_current_page
		3497	}
		3498
3104	sub set_current_page {	3499	sub set_current_page {
3105	my ($self, $page) = @_;	3500	my ($self, $page) = @_;
3106		3501
3107	$self->{multiplexer}->set_current_page ($page);	3502	$self->{multiplexer}->set_current_page ($page);
3108	$self->_emit (page_changed => $self->{multiplexer}{current});	3503	$self->emit (page_changed => $self->{multiplexer}{current});
3109	}	3504	}
3110		3505
3111	#############################################################################	3506	#############################################################################
3112		3507
3113	package CFClient::UI::Combobox;	3508	package CFPlus::UI::Selector;
3114		3509
3115	use utf8;	3510	use utf8;
3116		3511
3117	our @ISA = CFClient::UI::Button::;	3512	our @ISA = CFPlus::UI::Button::;
3118		3513
3119	sub new {	3514	sub new {
3120	my $class = shift;	3515	my $class = shift;
3121		3516
3122	my $self = $class->SUPER::new (	3517	my $self = $class->SUPER::new (
…		…
3128	$self->_set_value ($self->{value});	3523	$self->_set_value ($self->{value});
3129		3524
3130	$self	3525	$self
3131	}	3526	}
3132		3527
3133	sub button_down {	3528	sub invoke_button_down {
3134	my ($self, $ev) = @_;	3529	my ($self, $ev) = @_;
3135		3530
3136	my @menu_items;	3531	my @menu_items;
3137		3532
3138	for (@{ $self->{options} }) {	3533	for (@{ $self->{options} }) {
3139	my ($value, $title, $tooltip) = @$_;	3534	my ($value, $title, $tooltip) = @$_;
3140		3535
3141	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3536	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142	}	3537	}
3143		3538
3144	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3539	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145	}	3540	}
3146		3541
3147	sub _set_value {	3542	sub _set_value {
3148	my ($self, $value) = @_;	3543	my ($self, $value) = @_;
3149		3544
…		…
3159	my ($self, $value) = @_;	3554	my ($self, $value) = @_;
3160		3555
3161	return unless $self->{value} ne $value;	3556	return unless $self->{value} ne $value;
3162		3557
3163	$self->_set_value ($value);	3558	$self->_set_value ($value);
3164	$self->_emit (changed => $value);	3559	$self->emit (changed => $value);
3165	}	3560	}
3166		3561
3167	#############################################################################	3562	#############################################################################
3168		3563
3169	package CFClient::UI::Statusbox;	3564	package CFPlus::UI::Statusbox;
3170		3565
3171	our @ISA = CFClient::UI::VBox::;	3566	our @ISA = CFPlus::UI::VBox::;
3172		3567
3173	sub new {	3568	sub new {
3174	my $class = shift;	3569	my $class = shift;
3175		3570
3176	my $self = $class->SUPER::new (	3571	my $self = $class->SUPER::new (
…		…
3188	sub reorder {	3583	sub reorder {
3189	my ($self) = @_;	3584	my ($self) = @_;
3190	my $NOW = Time::HiRes::time;	3585	my $NOW = Time::HiRes::time;
3191		3586
3192	# freeze display when hovering over any label	3587	# freeze display when hovering over any label
3193	return if $CFClient::UI::TOOLTIP->{owner}	3588	return if $CFPlus::UI::TOOLTIP->{owner}
3194	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3589	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195	values %{ $self->{item} };	3590	values %{ $self->{item} };
3196		3591
3197	while (my ($k, $v) = each %{ $self->{item} }) {	3592	while (my ($k, $v) = each %{ $self->{item} }) {
3198	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3593	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199	}	3594	}
…		…
3220	for ($short) {	3615	for ($short) {
3221	s/^\s+//;	3616	s/^\s+//;
3222	s/\s+/ /g;	3617	s/\s+/ /g;
3223	}	3618	}
3224		3619
3225	new CFClient::UI::Label	3620	new CFPlus::UI::Label
3226	markup => $short,	3621	markup => $short,
3227	tooltip => $item->{tooltip},	3622	tooltip => $item->{tooltip},
3228	tooltip_font => $::FONT_PROP,	3623	tooltip_font => $::FONT_PROP,
3229	tooltip_width => 0.67,	3624	tooltip_width => 0.67,
3230	fontsize => $item->{fontsize} || $self->{fontsize},	3625	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3284	count => 1,	3679	count => 1,
3285	%arg,	3680	%arg,
3286	};	3681	};
3287	}	3682	}
3288		3683
		3684	$ROOT->on_refresh (reorder => sub {
3289	$self->reorder;	3685	$self->reorder;
		3686	});
3290	}	3687	}
3291		3688
3292	sub reconfigure {	3689	sub reconfigure {
3293	my ($self) = @_;	3690	my ($self) = @_;
3294		3691
…		…
3307	$self->SUPER::destroy;	3704	$self->SUPER::destroy;
3308	}	3705	}
3309		3706
3310	#############################################################################	3707	#############################################################################
3311		3708
3312	package CFClient::UI::Inventory;	3709	package CFPlus::UI::Inventory;
3313		3710
3314	our @ISA = CFClient::UI::ScrolledWindow::;	3711	our @ISA = CFPlus::UI::Table::;
3315		3712
3316	sub new {	3713	sub new {
3317	my $class = shift;	3714	my $class = shift;
3318		3715
3319	my $self = $class->SUPER::new (	3716	my $self = $class->SUPER::new (
3320	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3717	col_expand => [0, 1, 0],
		3718	items => [],
3321	@_,	3719	@_,
3322	);	3720	);
3323		3721
		3722	$self->set_sort_order (undef);
		3723
3324	$self	3724	$self
		3725	}
		3726
		3727	sub update_items {
		3728	my ($self) = @_;
		3729
		3730	$self->clear;
		3731
		3732	my @item = $self->{sort}->(@{ $self->{items} });
		3733
		3734	my @adds;
		3735	my $row = 0;
		3736	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3737	CFPlus::Item::update_widgets $item;
		3738
		3739	push @adds, 0, $row, $item->{face_widget};
		3740	push @adds, 1, $row, $item->{desc_widget};
		3741	push @adds, 2, $row, $item->{weight_widget};
		3742
		3743	$row++;
		3744	}
		3745
		3746	$self->add (@adds);
		3747	}
		3748
		3749	sub set_sort_order {
		3750	my ($self, $order) = @_;
		3751
		3752	$self->{sort} = $order ||= sub {
		3753	sort {
		3754	$a->{type} <=> $b->{type}
		3755	or $a->{name} cmp $b->{name}
		3756	} @_
		3757	};
		3758
		3759	$self->update_items;
3325	}	3760	}
3326		3761
3327	sub set_items {	3762	sub set_items {
3328	my ($self, $items) = @_;	3763	my ($self, $items) = @_;
3329		3764
3330	$self->{child}->clear;	3765	$self->{items} = [$items ? values %$items : ()];
3331	return unless $items;	3766	$self->update_items;
3332
3333	my @items = sort {
3334	($a->{type} <=> $b->{type})
3335	or ($a->{name} cmp $b->{name})
3336	} @$items;
3337
3338	$self->{real_items} = \@items;
3339
3340	my $row = 0;
3341	for my $item (@items) {
3342	CFClient::Item::update_widgets $item;
3343
3344	$self->{child}->add (0, $row, $item->{face_widget});
3345	$self->{child}->add (1, $row, $item->{desc_widget});
3346	$self->{child}->add (2, $row, $item->{weight_widget});
3347
3348	$row++;
3349	}
3350	}	3767	}
3351		3768
3352	#############################################################################	3769	#############################################################################
3353		3770
3354	package CFClient::UI::BindEditor;
3355
3356	our @ISA = CFClient::UI::FancyFrame::;
3357
3358	sub new {
3359	my $class = shift;
3360
3361	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363	$self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367	text => "start recording",
3368	tooltip => "Start/Stops recording of actions."
3369	."All subsequent actions after the recording started will be captured."
3370	."The actions are displayed after the record was stopped."
3371	."To bind the action you have to click on the 'Bind' button",
3372	on_activate => sub {
3373	unless ($self->{recording}) {
3374	$self->start;
3375	} else {
3376	$self->stop;
3377	}
3378	});
3379
3380	$vb->add (new CFClient::UI::Label text => "Actions:");
3381	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3384	$vb->add (my $hb = new CFClient::UI::HBox);
3385	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386	$hb->add (new CFClient::UI::Button
3387	text => "bind",
3388	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389	on_activate => sub {
3390	$self->ask_for_bind;
3391	});
3392
3393	$vb->add (my $hb = new CFClient::UI::HBox);
3394	$hb->add (new CFClient::UI::Button
3395	text => "ok",
3396	expand => 1,
3397	tooltip => "This closes the binding editor and saves the binding",
3398	on_activate => sub {
3399	$self->hide;
3400	$self->commit;
3401	});
3402
3403	$hb->add (new CFClient::UI::Button
3404	text => "cancel",
3405	expand => 1,
3406	tooltip => "This closes the binding editor without saving",
3407	on_activate => sub {
3408	$self->hide;
3409	$self->{binding_cancel}->()
3410	if $self->{binding_cancel};
3411	});
3412
3413	$self->update_binding_widgets;
3414
3415	$self
3416	}
3417
3418	sub commit {
3419	my ($self) = @_;
3420	my ($mod, $sym, $cmds) = $self->get_binding;
3421	if ($sym != 0 && @$cmds > 0) {
3422	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423	."'. Don't forget 'Save Config'!");
3424	$self->{binding_change}->($mod, $sym, $cmds)
3425	if $self->{binding_change};
3426	} else {
3427	$::STATUSBOX->add ("No action bound, no key or action specified!");
3428	$self->{binding_cancel}->()
3429	if $self->{binding_cancel};
3430	}
3431	}
3432
3433	sub start {
3434	my ($self) = @_;
3435
3436	$self->{rec_btn}->set_text ("stop recording");
3437	$self->{recording} = 1;
3438	$self->clear_command_list;
3439	$::CONN->start_record if $::CONN;
3440	}
3441
3442	sub stop {
3443	my ($self) = @_;
3444
3445	$self->{rec_btn}->set_text ("start recording");
3446	$self->{recording} = 0;
3447
3448	my $rec;
3449	$rec = $::CONN->stop_record if $::CONN;
3450	return unless ref $rec eq 'ARRAY';
3451	$self->set_command_list ($rec);
3452	}
3453
3454
3455	sub ask_for_bind_and_commit {
3456	my ($self) = @_;
3457	$self->ask_for_bind (1);
3458	}
3459
3460	sub ask_for_bind {
3461	my ($self, $commit) = @_;
3462
3463	CFClient::Binder::open_binding_dialog (sub {
3464	my ($mod, $sym) = @_;
3465	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466	$self->update_binding_widgets;
3467	$self->commit if $commit;
3468	});
3469	}
3470
3471	# $mod and $sym are the modifiers and key symbol
3472	# $cmds is a array ref of strings (the commands)
3473	# $cb is the callback that is executed on OK
3474	# $ccb is the callback that is executed on CANCEL and
3475	# when the binding was unsuccessful on OK
3476	sub set_binding {
3477	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479	$self->clear_command_list;
3480	$self->{recording} = 0;
3481	$self->{rec_btn}->set_text ("start recording");
3482
3483	$self->{binding} = [$mod, $sym];
3484	$self->{commands} = $cmds;
3485
3486	$self->{binding_change} = $cb;
3487	$self->{binding_cancel} = $ccb;
3488
3489	$self->update_binding_widgets;
3490	}
3491
3492	# this is a shortcut method that asks for a binding
3493	# and then just binds it.
3494	sub do_quick_binding {
3495	my ($self, $cmds) = @_;
3496	$self->set_binding (undef, undef, $cmds, sub {
3497	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498	});
3499	$self->ask_for_bind (1);
3500	}
3501
3502	sub update_binding_widgets {
3503	my ($self) = @_;
3504	my ($mod, $sym, $cmds) = $self->get_binding;
3505	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506	$self->set_command_list ($cmds);
3507	}
3508
3509	sub get_binding {
3510	my ($self) = @_;
3511	return (
3512	$self->{binding}->[0],
3513	$self->{binding}->[1],
3514	[ grep { defined $_ } @{$self->{commands}} ]
3515	);
3516	}
3517
3518	sub clear_command_list {
3519	my ($self) = @_;
3520	$self->{cmdbox}->clear ();
3521	}
3522
3523	sub set_command_list {
3524	my ($self, $cmds) = @_;
3525
3526	$self->{cmdbox}->clear ();
3527	$self->{commands} = $cmds;
3528
3529	my $idx = 0;
3530
3531	for (@$cmds) {
3532	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534	my $i = $idx;
3535	$hb->add (new CFClient::UI::Label text => $_);
3536	$hb->add (new CFClient::UI::Button
3537	text => "delete",
3538	tooltip => "Deletes the action from the record",
3539	on_activate => sub {
3540	$self->{cmdbox}->remove ($hb);
3541	$cmds->[$i] = undef;
3542	});
3543
3544
3545	$idx++
3546	}
3547	}
3548
3549	#############################################################################
3550
3551	package CFClient::UI::SpellList;	3771	package CFPlus::UI::SpellList;
3552		3772
3553	our @ISA = CFClient::UI::Table::;	3773	our @ISA = CFPlus::UI::Table::;
3554		3774
3555	sub new {	3775	sub new {
3556	my $class = shift;	3776	my $class = shift;
3557		3777
3558	my $self = $class->SUPER::new (	3778	my $self = $class->SUPER::new (
…		…
3576	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3796	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577		3797
3578	sub rebuild_spell_list {	3798	sub rebuild_spell_list {
3579	my ($self) = @_;	3799	my ($self) = @_;
3580		3800
3581	$CFClient::UI::ROOT->on_refresh ($self => sub {	3801	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3582	$self->clear;	3802	$self->clear;
3583		3803
3584	return unless $::CONN;	3804	return unless $::CONN;
3585		3805
3586	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3806	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3807	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3808	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3809	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3810	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591		3811
3592	my $row = 0;	3812	my $row = 0;
3593		3813
3594	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3814	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595	my $spell = $self->{spell}{$_};	3815	my $spell = $self->{spell}{$_};
…		…
3602	if ($ev->{button} == 1) {	3822	if ($ev->{button} == 1) {
3603	$::CONN->user_send ("cast $spell->{name}");	3823	$::CONN->user_send ("cast $spell->{name}");
3604	} elsif ($ev->{button} == 2) {	3824	} elsif ($ev->{button} == 2) {
3605	$::CONN->user_send ("invoke $spell->{name}");	3825	$::CONN->user_send ("invoke $spell->{name}");
3606	} elsif ($ev->{button} == 3) {	3826	} elsif ($ev->{button} == 3) {
3607	(new CFClient::UI::Menu	3827	(new CFPlus::UI::Menu
3608	items => [	3828	items => [
3609	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3829	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3830	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611	],	3831	],
3612	)->popup ($ev);	3832	)->popup ($ev);
3613	} else {	3833	} else {
3614	return 0;	3834	return 0;
…		…
3618	};	3838	};
3619		3839
3620	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3840	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621		3841
3622	#TODO: add path info to tooltip	3842	#TODO: add path info to tooltip
3623	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3843	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3624		3844
3625	$self->add (0, $row, new CFClient::UI::Face	3845	$self->add (0, $row, new CFPlus::UI::Face
3626	face => $spell->{face},	3846	face => $spell->{face},
3627	can_hover => 1,	3847	can_hover => 1,
3628	can_events => 1,	3848	can_events => 1,
3629	tooltip => $tooltip,	3849	tooltip => $tooltip,
3630	on_button_down => $spell_cb,	3850	on_button_down => $spell_cb,
3631	);	3851	);
3632		3852
3633	$self->add (1, $row, new CFClient::UI::Label	3853	$self->add (1, $row, new CFPlus::UI::Label
3634	expand => 1,	3854	expand => 1,
3635	text => $spell->{name},	3855	text => $spell->{name},
3636	can_hover => 1,	3856	can_hover => 1,
3637	can_events => 1,	3857	can_events => 1,
3638	tooltip => $tooltip,	3858	tooltip => $tooltip,
3639	on_button_down => $spell_cb,	3859	on_button_down => $spell_cb,
3640	);	3860	);
3641		3861
3642	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3862	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3863	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3864	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3865	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646	}	3866	}
3647	});	3867	});
3648	}	3868	}
3649		3869
3650	sub add_spell {	3870	sub add_spell {
…		…
3668	$self->rebuild_spell_list;	3888	$self->rebuild_spell_list;
3669	}	3889	}
3670		3890
3671	#############################################################################	3891	#############################################################################
3672		3892
3673	package CFClient::UI::Root;	3893	package CFPlus::UI::Root;
3674		3894
3675	our @ISA = CFClient::UI::Container::;	3895	our @ISA = CFPlus::UI::Container::;
3676		3896
3677	use List::Util qw(min max);	3897	use List::Util qw(min max);
3678		3898
3679	use CFClient::OpenGL;	3899	use CFPlus::OpenGL;
3680		3900
3681	sub new {	3901	sub new {
3682	my $class = shift;	3902	my $class = shift;
3683		3903
3684	my $self = $class->SUPER::new (	3904	my $self = $class->SUPER::new (
…		…
3709	$coord = $max - $size if $coord > $max - $size;	3929	$coord = $max - $size if $coord > $max - $size;
3710		3930
3711	int $coord + 0.5	3931	int $coord + 0.5
3712	}	3932	}
3713		3933
3714	sub size_allocate {	3934	sub invoke_size_allocate {
3715	my ($self, $w, $h) = @_;	3935	my ($self, $w, $h) = @_;
3716		3936
3717	for my $child ($self->children) {	3937	for my $child ($self->children) {
3718	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3938	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719		3939
…		…
3723	$X = _to_pixel $X, $W, $self->{w};	3943	$X = _to_pixel $X, $W, $self->{w};
3724	$Y = _to_pixel $Y, $H, $self->{h};	3944	$Y = _to_pixel $Y, $H, $self->{h};
3725		3945
3726	$child->configure ($X, $Y, $W, $H);	3946	$child->configure ($X, $Y, $W, $H);
3727	}	3947	}
		3948
		3949	1
3728	}	3950	}
3729		3951
3730	sub coord2local {	3952	sub coord2local {
3731	my ($self, $x, $y) = @_;	3953	my ($self, $x, $y) = @_;
3732		3954
…		…
3858	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4080	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859		4081
3860	$w = 0 if $w < 0;	4082	$w = 0 if $w < 0;
3861	$h = 0 if $h < 0;	4083	$h = 0 if $h < 0;
3862		4084
		4085	$w = max $widget->{min_w}, $w;
		4086	$h = max $widget->{min_h}, $h;
		4087
		4088	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4089	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4090
		4091	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4092	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4093
3863	$w = int $w + 0.5;	4094	$w = int $w + 0.5;
3864	$h = int $h + 0.5;	4095	$h = int $h + 0.5;
3865		4096
3866	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4097	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867	$widget->{old_w} = $widget->{w};	4098	$widget->{old_w} = $widget->{w};
…		…
3890	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4121	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891	glMatrixMode GL_MODELVIEW;	4122	glMatrixMode GL_MODELVIEW;
3892	glLoadIdentity;	4123	glLoadIdentity;
3893		4124
3894	{	4125	{
3895	package CFClient::UI::Base;	4126	package CFPlus::UI::Base;
3896		4127
3897	($draw_x, $draw_y, $draw_w, $draw_h) =	4128	($draw_x, $draw_y, $draw_w, $draw_h) =
3898	(0, 0, $self->{w}, $self->{h});	4129	(0, 0, $self->{w}, $self->{h});
3899	}	4130	}
3900		4131
3901	$self->_draw;	4132	$self->_draw;
3902	}	4133	}
3903		4134
3904	#############################################################################	4135	#############################################################################
3905		4136
3906	package CFClient::UI;	4137	package CFPlus::UI;
3907		4138
3908	$ROOT = new CFClient::UI::Root;	4139	$ROOT = new CFPlus::UI::Root;
3909	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4140	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910		4141
3911	1	4142	1
3912		4143

Diff Legend

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