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.323 by root, Wed Jul 5 03:01:01 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 2007 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 ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
		117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		120
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	121	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
		128	}
101	}	129	}
102		130
103	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	132	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		133
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		135
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		137
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	138	$GRAB->emit (button_up => $ev)
112	if $GRAB;	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		140
114	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	143	$grab->update if $grab;
117	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
118		145
		146	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	147	$TOOLTIP_WATCHER->cb->();
120	}	148	}
121	}	149	}
122		150
123	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
124	my ($ev) = @_;	152	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
126		154
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		156
129	if ($widget != $HOVER) {	157	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		158
132	$hover->update if $hover && $hover->{can_hover};	159	$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;	160	if $HOVER;
140	}	161	}
141		162
142	# convert position array to integers	163	# convert position array to integers
143	sub harmonize {	164	sub harmonize {
…		…
193	reconfigure_widgets;	214	reconfigure_widgets;
194	}	215	}
195		216
196	#############################################################################	217	#############################################################################
197		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
198	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
199		228
200	use strict;	229	use strict;
201		230
202	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
203		232
204	sub new {	233	sub new {
205	my $class = shift;	234	my $class = shift;
206		235
207	my $self = bless {	236	my $self = bless {
…		…
212	h => undef,	241	h => undef,
213	can_events => 1,	242	can_events => 1,
214	@_	243	@_
215	}, $class;	244	}, $class;
216		245
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		247
219	for (keys %$self) {	248	for (keys %$self) {
220	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
222	}	251	}
223	}	252	}
224		253
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$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};	256	$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};	257	$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};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		259
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		262
234	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
239		268
240	sub destroy {	269	sub destroy {
241	my ($self) = @_;	270	my ($self) = @_;
242		271
243	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
244	%$self = ();	274	%$self = ();
245	}	275	}
246		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
247	sub show {	281	sub show {
248	my ($self) = @_;	282	my ($self) = @_;
249		283
250	return if $self->{parent};	284	return if $self->{parent};
251		285
252	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
253	}	287	}
254		288
255	sub set_visible {	289	sub set_visible {
256	my ($self) = @_;	290	my ($self) = @_;
257		291
…		…
278	delete $self->{root};	312	delete $self->{root};
279		313
280	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
282		316
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
285		319
286	$self->emit ("focus_out");	320	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
288	}	322	}
…		…
290	sub set_visibility {	324	sub set_visibility {
291	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
292		326
293	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
294		328
295	$visible ? $self->hide	329	$visible ? $self->show
296	: $self->show;	330	: $self->hide;
297	}	331	}
298		332
299	sub toggle_visibility {	333	sub toggle_visibility {
300	my ($self) = @_;	334	my ($self) = @_;
301		335
…		…
345	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
346		380
347	if ($self->{aspect}) {	381	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
349		383
350	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		386
353	# use alignment to adjust x, y	387	# use alignment to adjust x, y
354		388
355	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
397		431
398	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
399		433
400	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
401		435
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	439	}
406	}	440	}
407		441
408	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
409	sub coord2local {	443	sub coord2local {
410	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
411		445
		446	Carp::confess unless $self->{parent};#d#
		447
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	449	}
414		450
415	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
416	sub coord2global {	452	sub coord2global {
417	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
418		454
		455	Carp::confess unless $self->{parent};#d#
		456
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	458	}
421		459
422	sub invoke_focus_in {	460	sub invoke_focus_in {
423	my ($self) = @_;	461	my ($self) = @_;
…		…
452		490
453	$FOCUS->emit ("focus_out") if $FOCUS;	491	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	492	$self->emit ("focus_in");
455	}	493	}
456		494
457	sub invoke_mouse_motion { 1 }	495	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	496	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	497	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
461		500
462	sub invoke_button_down {	501	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
464		503
465	$self->grab_focus;	504	$self->grab_focus;
466		505
467	1	506	0
468	}	507	}
469		508
470	sub connect {	509	sub connect {
471	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
472		511
473	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
474	}	518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
475		532
476	sub emit {	533	sub emit {
477	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
478		535
479	#d##TODO# stop propagating at first true, do not use sum	536	# I do not really like this solution, but I do not like duplication
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	554	}
484		555
485	sub find_widget {	556	#sub find_widget {
486	my ($self, $x, $y) = @_;	557	# in .xs
487
488	return () unless $self->{can_events};
489
490	return $self
491	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494	()
495	}
496		558
497	sub set_parent {	559	sub set_parent {
498	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
499		561
500	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
502	}	564	}
503		565
504	sub realloc {	566	sub realloc {
505	my ($self) = @_;	567	my ($self) = @_;
…		…
571	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
574	glEnd;	636	glEnd;
575	glPopMatrix;	637	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}	639	}
578		640
579	$self->_draw;	641	$self->_draw;
580	glPopMatrix;	642	glPopMatrix;
581	}	643	}
…		…
587	}	649	}
588		650
589	sub DESTROY {	651	sub DESTROY {
590	my ($self) = @_;	652	my ($self) = @_;
591		653
592	delete $WIDGET{$self+0};	654	return if CFPlus::in_destruct;
593		655
594	eval { $self->destroy };	656	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	657	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		658
		659	delete $WIDGET{$self+0};
596	}	660	}
597		661
598	#############################################################################	662	#############################################################################
599		663
600	package CFClient::UI::DrawBG;	664	package CFPlus::UI::DrawBG;
601		665
602	our @ISA = CFClient::UI::Base::;	666	our @ISA = CFPlus::UI::Base::;
603		667
604	use strict;	668	use strict;
605	use CFClient::OpenGL;	669	use CFPlus::OpenGL;
606		670
607	sub new {	671	sub new {
608	my $class = shift;	672	my $class = shift;
609		673
610	# range [value, low, high, page]	674	# range [value, low, high, page]
…		…
641	}	705	}
642	}	706	}
643		707
644	#############################################################################	708	#############################################################################
645		709
646	package CFClient::UI::Empty;	710	package CFPlus::UI::Empty;
647		711
648	our @ISA = CFClient::UI::Base::;	712	our @ISA = CFPlus::UI::Base::;
649		713
650	sub new {	714	sub new {
651	my ($class, %arg) = @_;	715	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	716	$class->SUPER::new (can_events => 0, %arg);
653	}	717	}
…		…
660		724
661	sub draw { }	725	sub draw { }
662		726
663	#############################################################################	727	#############################################################################
664		728
665	package CFClient::UI::Container;	729	package CFPlus::UI::Container;
666		730
667	our @ISA = CFClient::UI::Base::;	731	our @ISA = CFPlus::UI::Base::;
668		732
669	sub new {	733	sub new {
670	my ($class, %arg) = @_;	734	my ($class, %arg) = @_;
671		735
672	my $children = delete $arg{children};	736	my $children = delete $arg{children};
…		…
676	can_events => 0,	740	can_events => 0,
677	%arg,	741	%arg,
678	);	742	);
679		743
680	$self->add (@$children)	744	$self->add (@$children)
681	if $children;	745	if $children && @$children;
682		746
683	$self	747	$self
		748	}
		749
		750	sub realloc {
		751	my ($self) = @_;
		752
		753	$self->{force_realloc} = 1;
		754	$self->{force_size_alloc} = 1;
		755	$self->SUPER::realloc;
684	}	756	}
685		757
686	sub add {	758	sub add {
687	my ($self, @widgets) = @_;	759	my ($self, @widgets) = @_;
688		760
689	$_->set_parent ($self)	761	$_->set_parent ($self)
690	for @widgets;	762	for @widgets;
691		763
		764	# TODO: only do this in widgets that need it, e.g. root, fixed
692	use sort 'stable';	765	use sort 'stable';
693		766
694	$self->{children} = [	767	$self->{children} = [
695	sort { $a->{z} <=> $b->{z} }	768	sort { $a->{z} <=> $b->{z} }
696	@{$self->{children}}, @widgets	769	@{$self->{children}}, @widgets
697	];	770	];
698		771
699	$self->realloc;	772	$self->realloc;
		773
		774	map $_+0, @widgets
700	}	775	}
701		776
702	sub children {	777	sub children {
703	@{ $_[0]{children} }	778	@{ $_[0]{children} }
704	}	779	}
…		…
715	}	790	}
716		791
717	sub clear {	792	sub clear {
718	my ($self) = @_;	793	my ($self) = @_;
719		794
720	my $children = delete $self->{children};	795	my $children = $self->{children};
721	$self->{children} = [];	796	$self->{children} = [];
722		797
723	for (@$children) {	798	for (@$children) {
724	delete $_->{parent};	799	delete $_->{parent};
725	$_->hide;	800	$_->hide;
…		…
750	$_->draw for @{$self->{children}};	825	$_->draw for @{$self->{children}};
751	}	826	}
752		827
753	#############################################################################	828	#############################################################################
754		829
755	package CFClient::UI::Bin;	830	package CFPlus::UI::Bin;
756		831
757	our @ISA = CFClient::UI::Container::;	832	our @ISA = CFPlus::UI::Container::;
758		833
759	sub new {	834	sub new {
760	my ($class, %arg) = @_;	835	my ($class, %arg) = @_;
761		836
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	837	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		838
764	$class->SUPER::new (children => [$child], %arg)	839	$class->SUPER::new (children => [$child], %arg)
765	}	840	}
766		841
767	sub add {	842	sub add {
…		…
774	sub remove {	849	sub remove {
775	my ($self, $widget) = @_;	850	my ($self, $widget) = @_;
776		851
777	$self->SUPER::remove ($widget);	852	$self->SUPER::remove ($widget);
778		853
779	$self->{children} = [new CFClient::UI::Empty]	854	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	855	unless @{$self->{children}};
781	}	856	}
782		857
783	sub child { $_[0]->{children}[0] }	858	sub child { $_[0]->{children}[0] }
784		859
…		…
796		871
797	#############################################################################	872	#############################################################################
798		873
799	# back-buffered drawing area	874	# back-buffered drawing area
800		875
801	package CFClient::UI::Window;	876	package CFPlus::UI::Window;
802		877
803	our @ISA = CFClient::UI::Bin::;	878	our @ISA = CFPlus::UI::Bin::;
804		879
805	use CFClient::OpenGL;	880	use CFPlus::OpenGL;
806		881
807	sub new {	882	sub new {
808	my ($class, %arg) = @_;	883	my ($class, %arg) = @_;
809		884
810	my $self = $class->SUPER::new (%arg);	885	my $self = $class->SUPER::new (%arg);
…		…
832	}	907	}
833		908
834	sub render_child {	909	sub render_child {
835	my ($self) = @_;	910	my ($self) = @_;
836		911
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	912	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	913	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	914	glClear GL_COLOR_BUFFER_BIT;
840		915
841	{	916	{
842	package CFClient::UI::Base;	917	package CFPlus::UI::Base;
843		918
844	($draw_x, $draw_y, $draw_w, $draw_h) =	919	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	920	(0, 0, $self->{w}, $self->{h});
		921
		922	$self->_render;
846	}	923	}
847
848	$self->_render;
849	};	924	};
850	}	925	}
851		926
852	sub _draw {	927	sub _draw {
853	my ($self) = @_;	928	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		929
857	my $tex = $self->{texture}	930	my $tex = $self->{texture}
858	or return;	931	or return;
859		932
860	glEnable GL_TEXTURE_2D;	933	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	934	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	935	glColor 0, 0, 0, 1;
863		936
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	937	$tex->draw_quad_alpha_premultiplied (0, 0);
865		938
866	glDisable GL_TEXTURE_2D;	939	glDisable GL_TEXTURE_2D;
867	}	940	}
868		941
869	#############################################################################	942	#############################################################################
870		943
871	package CFClient::UI::ViewPort;	944	package CFPlus::UI::ViewPort;
872		945
		946	use List::Util qw(min max);
		947
873	our @ISA = CFClient::UI::Window::;	948	our @ISA = CFPlus::UI::Window::;
874		949
875	sub new {	950	sub new {
876	my $class = shift;	951	my $class = shift;
877		952
878	$class->SUPER::new (	953	$class->SUPER::new (
…		…
885	sub size_request {	960	sub size_request {
886	my ($self) = @_;	961	my ($self) = @_;
887		962
888	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	963	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889		964
890	$w = 10 if $self->{scroll_x};	965	$w = 1 if $self->{scroll_x};
891	$h = 10 if $self->{scroll_y};	966	$h = 1 if $self->{scroll_y};
892		967
893	($w, $h)	968	($w, $h)
894	}	969	}
895		970
896	sub invoke_size_allocate {	971	sub invoke_size_allocate {
…		…
908	}	983	}
909		984
910	sub set_offset {	985	sub set_offset {
911	my ($self, $x, $y) = @_;	986	my ($self, $x, $y) = @_;
912		987
		988	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		989	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		990
		991	if ($x != $self->{view_x} or $y != $self->{view_y}) {
913	$self->{view_x} = int $x;	992	$self->{view_x} = $x;
914	$self->{view_y} = int $y;	993	$self->{view_y} = $y;
915		994
		995	$self->emit (changed => $x, $y);
916	$self->update;	996	$self->update;
		997	}
917	}	998	}
918		999
919	# hmm, this does not work for topleft of $self... but we should not ask for that	1000	# hmm, this does not work for topleft of $self... but we should not ask for that
920	sub coord2local {	1001	sub coord2local {
921	my ($self, $x, $y) = @_;	1002	my ($self, $x, $y) = @_;
…		…
936	my ($self, $x, $y) = @_;	1017	my ($self, $x, $y) = @_;
937		1018
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1019	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1020	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1021	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1022	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1023	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1024	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1025	}
945	}	1026	}
946		1027
947	sub _render {	1028	sub _render {
948	my ($self) = @_;	1029	my ($self) = @_;
949		1030
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1031	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};	1032	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1033
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1034	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1035
955	$self->SUPER::_render;	1036	$self->SUPER::_render;
956	}	1037	}
957		1038
958	#############################################################################	1039	#############################################################################
959		1040
960	package CFClient::UI::ScrolledWindow;	1041	package CFPlus::UI::ScrolledWindow;
961		1042
962	our @ISA = CFClient::UI::HBox::;	1043	our @ISA = CFPlus::UI::Table::;
963		1044
964	sub new {	1045	sub new {
965	my ($class, %arg) = @_;	1046	my ($class, %arg) = @_;
966		1047
967	my $child = delete $arg{child};	1048	my $child = delete $arg{child};
968		1049
969	my $self;	1050	my $self;
970		1051
971	my $slider = new CFClient::UI::Slider	1052	my $hslider = new CFPlus::UI::Slider
		1053	col => 0,
		1054	row => 1,
		1055	vertical => 0,
		1056	range => [0, 0, 1, 0.01], # HACK fix
		1057	on_changed => sub {
		1058	$self->{hpos} = $_[1];
		1059	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1060	},
		1061	;
		1062
		1063	my $vslider = new CFPlus::UI::Slider
		1064	col => 1,
		1065	row => 0,
972	vertical => 1,	1066	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1067	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1068	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1069	$self->{vpos} = $_[1];
		1070	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1071	},
977	;	1072	;
978		1073
979	$self = $class->SUPER::new (	1074	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1075	scroll_x => 0,
		1076	scroll_y => 1,
		1077	can_events => 1,
981	slider => $slider,	1078	hslider => $hslider,
		1079	vslider => $vslider,
		1080	col_expand => [1, 0],
		1081	row_expand => [1, 0],
982	%arg,	1082	%arg,
983	);	1083	);
984		1084
		1085	$self->{vp} = new CFPlus::UI::ViewPort
		1086	col => 0,
		1087	row => 0,
		1088	expand => 1,
		1089	scroll_x => $self->{scroll_x},
		1090	scroll_y => $self->{scroll_y},
		1091	on_changed => sub {
		1092	my ($vp, $x, $y) = @_;
		1093
		1094	$vp->{parent}{hslider}->set_value ($x);
		1095	$vp->{parent}{vslider}->set_value ($y);
		1096
		1097	0
		1098	},
		1099	;
		1100
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1101	$self->SUPER::add ($self->{vp});
		1102
986	$self->add ($child) if $child;	1103	$self->add ($child) if $child;
987		1104
988	$self	1105	$self
989	}	1106	}
990
991	#TODO# update range on size_allocate depending on child
992		1107
993	sub add {	1108	sub add {
994	my ($self, $widget) = @_;	1109	my ($self, $widget) = @_;
995		1110
996	$self->{vp}->add ($self->{child} = $widget);	1111	$self->{vp}->add ($self->{child} = $widget);
997	}	1112	}
998		1113
999	sub update_slider {	1114	sub update_slider {
1000	my ($self) = @_;	1115	my ($self) = @_;
1001		1116
		1117	my $child = ($self->{vp} or return)->child;
		1118
		1119	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1120	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1003	}
1004		1121
1005	sub update {	1122	my $visible = $w1 > $w2;
		1123	if ($visible != $self->{hslider_visible}) {
		1124	$self->{hslider_visible} = $visible;
		1125	$visible ? $self->SUPER::add ($self->{hslider})
		1126	: $self->SUPER::remove ($self->{hslider});
		1127	}
		1128
		1129	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1130	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1131
		1132	my $visible = $h1 > $h2;
		1133	if ($visible != $self->{vslider_visible}) {
		1134	$self->{vslider_visible} = $visible;
		1135	$visible ? $self->SUPER::add ($self->{vslider})
		1136	: $self->SUPER::remove ($self->{vslider});
		1137	}
		1138	}
		1139
		1140	sub start_dragging {
1006	my ($self) = @_;	1141	my ($self, $ev) = @_;
1007		1142
1008	$self->SUPER::update;	1143	$self->grab_focus;
1009		1144
1010	$self->update_slider;	1145	my $ox = $self->{vp}{view_x};
		1146	my $oy = $self->{vp}{view_y};
		1147
		1148	$self->{motion} = sub {
		1149	my ($ev, $x, $y) = @_;
		1150
		1151	$ox -= $ev->{xrel};
		1152	$oy -= $ev->{yrel};
		1153
		1154	$self->{vp}->set_offset ($ox, $oy);
		1155	};
		1156	}
		1157
		1158	sub invoke_mouse_wheel {
		1159	my ($self, $ev) = @_;
		1160
		1161	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1162	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1163
		1164	1
		1165	}
		1166
		1167	sub invoke_button_down {
		1168	my ($self, $ev, $x, $y) = @_;
		1169
		1170	if ($ev->{button} == 2) {
		1171	$self->start_dragging ($ev);
		1172	return 1;
		1173	}
		1174
		1175	0
		1176	}
		1177
		1178	sub invoke_button_up {
		1179	my ($self, $ev, $x, $y) = @_;
		1180
		1181	if (delete $self->{motion}) {
		1182	return 1;
		1183	}
		1184
		1185	0
		1186	}
		1187
		1188	sub invoke_mouse_motion {
		1189	my ($self, $ev, $x, $y) = @_;
		1190
		1191	if ($self->{motion}) {
		1192	$self->{motion}->($ev, $x, $y);
		1193	return 1;
		1194	}
		1195
		1196	0
1011	}	1197	}
1012		1198
1013	sub invoke_size_allocate {	1199	sub invoke_size_allocate {
1014	my ($self, $w, $h) = @_;	1200	my ($self, $w, $h) = @_;
1015		1201
1016	$self->update_slider;	1202	$self->update_slider;
1017
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1203	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1204	}
1020		1205
1021	#############################################################################	1206	#############################################################################
1022		1207
1023	package CFClient::UI::Frame;	1208	package CFPlus::UI::Frame;
1024		1209
1025	our @ISA = CFClient::UI::Bin::;	1210	our @ISA = CFPlus::UI::Bin::;
1026		1211
1027	use CFClient::OpenGL;	1212	use CFPlus::OpenGL;
1028		1213
1029	sub new {	1214	sub new {
1030	my $class = shift;	1215	my $class = shift;
1031		1216
1032	$class->SUPER::new (	1217	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1243	$self->SUPER::_draw;
1059	}	1244	}
1060		1245
1061	#############################################################################	1246	#############################################################################
1062		1247
1063	package CFClient::UI::FancyFrame;	1248	package CFPlus::UI::FancyFrame;
1064		1249
1065	our @ISA = CFClient::UI::Bin::;	1250	our @ISA = CFPlus::UI::Bin::;
1066		1251
1067	use CFClient::OpenGL;	1252	use CFPlus::OpenGL;
		1253
		1254	sub new {
		1255	my ($class, %arg) = @_;
		1256
		1257	if ((exists $arg{label}) && !ref $arg{label}) {
		1258	$arg{label} = new CFPlus::UI::Label
		1259	align => 1,
		1260	valign => 0,
		1261	text => $arg{label},
		1262	fontsize => ($arg{border} || 0.8) * 0.75;
		1263	}
		1264
		1265	my $self = $class->SUPER::new (
		1266	# label => "",
		1267	fg => [0.6, 0.3, 0.1],
		1268	border => 0.8,
		1269	style => 'single',
		1270	%arg,
		1271	);
		1272
		1273	$self
		1274	}
		1275
		1276	sub add {
		1277	my ($self, @widgets) = @_;
		1278
		1279	$self->SUPER::add (@widgets);
		1280	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1281	}
		1282
		1283	sub border {
		1284	int $_[0]{border} * $::FONTSIZE
		1285	}
		1286
		1287	sub size_request {
		1288	my ($self) = @_;
		1289
		1290	($self->{label_w}, undef) = $self->{label}->size_request
		1291	if $self->{label};
		1292
		1293	my ($w, $h) = $self->SUPER::size_request;
		1294
		1295	(
		1296	$w + $self->border * 2,
		1297	$h + $self->border * 2,
		1298	)
		1299	}
		1300
		1301	sub invoke_size_allocate {
		1302	my ($self, $w, $h) = @_;
		1303
		1304	my $border = $self->border;
		1305
		1306	$w -= List::Util::max 0, $border * 2;
		1307	$h -= List::Util::max 0, $border * 2;
		1308
		1309	if (my $label = $self->{label}) {
		1310	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1311	$label->{h} = List::Util::min $h, $border;
		1312	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1313	}
		1314
		1315	$self->child->configure ($border, $border, $w, $h);
		1316
		1317	1
		1318	}
		1319
		1320	sub _draw {
		1321	my ($self) = @_;
		1322
		1323	my $child = $self->{children}[0];
		1324
		1325	my $border = $self->border;
		1326	my ($w, $h) = ($self->{w}, $self->{h});
		1327
		1328	$child->draw;
		1329
		1330	glColor @{$self->{fg}};
		1331	glBegin GL_LINE_STRIP;
		1332	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1333	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1334	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1335	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1336	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1337	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1338	glEnd;
		1339
		1340	if ($self->{label}) {
		1341	glTranslate $border * 2, 0;
		1342	$self->{label}->_draw;
		1343	}
		1344	}
		1345
		1346	#############################################################################
		1347
		1348	package CFPlus::UI::Toplevel;
		1349
		1350	our @ISA = CFPlus::UI::Bin::;
		1351
		1352	use CFPlus::OpenGL;
1068		1353
1069	my $bg =	1354	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1355	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1356	mipmap => 1, wrap => 1;
1072		1357
1073	my @border =	1358	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1359	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1360	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1361
		1362	my @icon =
		1363	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1364	qw(x1_move.png x1_resize.png);
1076		1365
1077	sub new {	1366	sub new {
1078	my ($class, %arg) = @_;	1367	my ($class, %arg) = @_;
1079		1368
1080	my $self = $class->SUPER::new (	1369	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1370	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1371	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1372	border => 0.6,
1084	can_events => 1,	1373	can_events => 1,
1085	min_w => 16,	1374	min_w => 64,
1086	min_h => 16,	1375	min_h => 32,
1087	%arg,	1376	%arg,
1088	);	1377	);
1089		1378
1090	$self->{title_widget} = new CFClient::UI::Label	1379	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1380	align => 0,
1092	valign => 1,	1381	valign => 1,
1093	text => $self->{title},	1382	text => $self->{title},
1094	fontsize => $self->{border},	1383	fontsize => $self->{border},
1095	if exists $self->{title};	1384	if exists $self->{title};
1096		1385
1097	if ($self->{has_close_button}) {	1386	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1387	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1388	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1389	path => 'x1_close.png',
1101	on_activate => sub { $self->emit ("delete") };	1390	on_activate => sub { $self->emit ("delete") };
1102		1391
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1392	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1393	}
1105		1394
1106	$self	1395	$self
1107	}	1396	}
1108		1397
1109	sub add {	1398	sub add {
1110	my ($self, @widgets) = @_;	1399	my ($self, @widgets) = @_;
1111		1400
1112	$self->SUPER::add (@widgets);	1401	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1402	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1403	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1404	}
1116		1405
1117	sub border {	1406	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1407	int $_[0]{border} * $::FONTSIZE
1119	}	1408	}
…		…
1227	$self->{motion}->($ev, $x, $y) if $self->{motion};	1516	$self->{motion}->($ev, $x, $y) if $self->{motion};
1228		1517
1229	! ! $self->{motion}	1518	! ! $self->{motion}
1230	}	1519	}
1231		1520
		1521	sub invoke_visibility_change {
		1522	my ($self, $visible) = @_;
		1523
		1524	delete $self->{motion} unless $visible;
		1525
		1526	0
		1527	}
		1528
1232	sub _draw {	1529	sub _draw {
1233	my ($self) = @_;	1530	my ($self) = @_;
1234		1531
1235	my $child = $self->{children}[0];	1532	my $child = $self->{children}[0];
1236		1533
…		…
1241	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1538	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1242		1539
1243	my $border = $self->border;	1540	my $border = $self->border;
1244		1541
1245	glColor @{ $self->{border_bg} };	1542	glColor @{ $self->{border_bg} };
1246	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1543	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1247	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1544	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1248	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1545	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1249	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1546	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1547
		1548	# move
		1549	my $w2 = ($w - $border) * .5;
		1550	my $h2 = ($h - $border) * .5;
		1551	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1552	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1553	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1554
		1555	# resize
		1556	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1557	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1558	unless $self->{has_close_button};
		1559	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1560	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1250		1561
1251	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1562	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1252	glColor @{ $self->{bg} };	1563	glColor @{ $self->{bg} };
1253		1564
1254	# TODO: repeat texture not scale	1565	# TODO: repeat texture not scale
…		…
1273	if $self->{close_button};	1584	if $self->{close_button};
1274	}	1585	}
1275		1586
1276	#############################################################################	1587	#############################################################################
1277		1588
1278	package CFClient::UI::Table;	1589	package CFPlus::UI::Table;
1279		1590
1280	our @ISA = CFClient::UI::Base::;	1591	our @ISA = CFPlus::UI::Container::;
1281		1592
1282	use List::Util qw(max sum);	1593	use List::Util qw(max sum);
1283		1594
1284	use CFClient::OpenGL;	1595	use CFPlus::OpenGL;
1285		1596
1286	sub new {	1597	sub new {
1287	my $class = shift;	1598	my $class = shift;
1288		1599
1289	$class->SUPER::new (	1600	$class->SUPER::new (
1290	col_expand => [],	1601	col_expand => [],
		1602	row_expand => [],
1291	@_,	1603	@_,
1292	)	1604	)
1293	}	1605	}
1294		1606
1295	sub children {
1296	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297	}
1298
1299	sub add {	1607	sub add {
1300	my ($self, $x, $y, $child) = @_;	1608	my ($self, @widgets) = @_;
1301		1609
1302	$child->set_parent ($self);	1610	for my $child (@widgets) {
1303	$self->{children}[$y][$x] = $child;	1611	$child->{rowspan} ||= 1;
		1612	$child->{colspan} ||= 1;
		1613	}
1304		1614
1305	$self->realloc;	1615	$self->SUPER::add (@widgets);
1306	}	1616	}
1307		1617
1308	sub remove {	1618	sub add_at {
		1619	my $self = shift;
		1620
		1621	my @widgets;
		1622
		1623	while (@_) {
		1624	my ($col, $row, $child) = splice @_, 0, 3, ();
		1625
		1626	$child->{row} = $row;
		1627	$child->{col} = $col;
		1628
		1629	push @widgets, $child;
		1630	}
		1631
		1632	$self->add (@widgets);
		1633	}
		1634
		1635	sub get_wh {
1309	my ($self, $child) = @_;	1636	my ($self) = @_;
1310		1637
1311	# TODO: not yet implemented	1638	my (@w, @h);
1312	}
1313
1314	# TODO: move to container class maybe? send children a signal on removal?
1315	sub clear {
1316	my ($self) = @_;
1317		1639
1318	my @children = $self->children;	1640	my @children = $self->children;
1319	delete $self->{children};	1641
		1642	# first pass, columns
		1643	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1644	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1645
		1646	my $sw = sum @w[$c .. $c + $cs - 1];
		1647
		1648	if ($w > $sw) {
		1649	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1650	}
1320		1651	}
1321	for (@children) {
1322	delete $_->{parent};
1323	$_->hide;
1324	}
1325		1652
1326	$self->realloc;	1653	# second pass, rows
1327	}	1654	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1328
1329	sub get_wh {
1330	my ($self) = @_;
1331
1332	my (@w, @h);
1333
1334	for my $y (0 .. $#{$self->{children}}) {
1335	my $row = $self->{children}[$y]
1336	or next;
1337
1338	for my $x (0 .. $#$row) {
1339	my $widget = $row->[$x]
1340	or next;
1341	my ($w, $h) = @$widget{qw(req_w req_h)};	1655	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1342		1656
1343	$w[$x] = max $w[$x], $w;	1657	my $sh = sum @h[$r .. $r + $rs - 1];
1344	$h[$y] = max $h[$y], $h;	1658
		1659	if ($h > $sh) {
		1660	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1345	}	1661	}
1346	}	1662	}
1347		1663
1348	(\@w, \@h)	1664	(\@w, \@h)
1349	}	1665	}
…		…
1365	my ($ws, $hs) = $self->get_wh;	1681	my ($ws, $hs) = $self->get_wh;
1366		1682
1367	my $req_w = (sum @$ws) || 1;	1683	my $req_w = (sum @$ws) || 1;
1368	my $req_h = (sum @$hs) || 1;	1684	my $req_h = (sum @$hs) || 1;
1369		1685
1370	# TODO: nicer code && do row_expand	1686	# now linearly scale the rows/columns to the allocated size
1371	my @col_expand = @{$self->{col_expand}};	1687	my @col_expand = @{$self->{col_expand}};
1372	@col_expand = (1) x @$ws unless @col_expand;	1688	@col_expand = (1) x @$ws unless @col_expand;
1373	my $col_expand = (sum @col_expand) || 1;	1689	my $col_expand = (sum @col_expand) || 1;
1374		1690
1375	# linearly scale sizes
1376	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1691	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378		1692
1379	CFClient::UI::harmonize $ws;	1693	CFPlus::UI::harmonize $ws;
		1694
		1695	my @row_expand = @{$self->{row_expand}};
		1696	@row_expand = (1) x @$ws unless @row_expand;
		1697	my $row_expand = (sum @row_expand) || 1;
		1698
		1699	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1700
1380	CFClient::UI::harmonize $hs;	1701	CFPlus::UI::harmonize $hs;
1381		1702
1382	my $y;	1703	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1704	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1383		1705
1384	for my $r (0 .. $#{$self->{children}}) {	1706	for my $widget ($self->children) {
1385	my $row = $self->{children}[$r]	1707	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1386	or next;
1387		1708
1388	my $x = 0;	1709	$widget->configure (
1389	my $row_h = $hs->[$r];	1710	$x[$c], $y[$r],
		1711	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1390		1712	);
1391	for my $c (0 .. $#$row) {	1713	}
1392	my $col_w = $ws->[$c];
1393		1714
1394	if (my $widget = $row->[$c]) {	1715	1
1395	$widget->configure ($x, $y, $col_w, $row_h);	1716	}
1396	}
1397		1717
1398	$x += $col_w;	1718	#############################################################################
		1719
		1720	package CFPlus::UI::Fixed;
		1721
		1722	use List::Util qw(min max);
		1723
		1724	our @ISA = CFPlus::UI::Container::;
		1725
		1726	sub add {
		1727	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1728
		1729	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1730	$self->SUPER::add ($child);
		1731	}
		1732
		1733	sub _scale($$$) {
		1734	my ($mode, $val, $max) = @_;
		1735
		1736	$mode eq "abs" ? $val
		1737	: $mode eq "rel" ? $val * $max
		1738	: 0
		1739	}
		1740
		1741	sub size_request {
		1742	my ($self) = @_;
		1743
		1744	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1745
		1746	# determine overall size by querying abs widgets
		1747	for my $child ($self->visible_children) {
		1748	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1749
		1750	if ($pos eq "abs") {
		1751	$w = _scale $size, $w, $child->{req_w};
		1752	$h = _scale $size, $h, $child->{req_h};
		1753
		1754	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1755	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1399	}	1756	}
		1757	}
1400		1758
1401	$y += $row_h;	1759	my $W = $x2 - $x1;
		1760	my $H = $y2 - $y1;
		1761
		1762	# now layout remaining widgets
		1763	for my $child ($self->visible_children) {
		1764	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1765
		1766	if ($pos ne "abs") {
		1767	$x = _scale $pos, $x, $W;
		1768	$y = _scale $pos, $x, $H;
		1769	$w = _scale $size, $w, $child->{req_w};
		1770	$h = _scale $size, $h, $child->{req_h};
		1771
		1772	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1773	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1774	}
		1775	}
		1776
		1777	my $W = $x2 - $x1;
		1778	my $H = $y2 - $y1;
		1779
		1780	($W, $H)
		1781	}
		1782
		1783	sub invoke_size_allocate {
		1784	my ($self, $W, $H) = @_;
		1785
		1786	for my $child ($self->visible_children) {
		1787	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1788
		1789	$x = _scale $pos, $x, $W;
		1790	$y = _scale $pos, $x, $H;
		1791	$w = _scale $size, $w, $child->{req_w};
		1792	$h = _scale $size, $h, $child->{req_h};
		1793
		1794	$child->configure ($x, $y, $w, $h);
1402	}	1795	}
1403		1796
1404	1	1797	1
1405	}	1798	}
1406		1799
1407	sub find_widget {
1408	my ($self, $x, $y) = @_;
1409
1410	$x -= $self->{x};
1411	$y -= $self->{y};
1412
1413	my $res;
1414
1415	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1416	$res = $_->find_widget ($x, $y)
1417	and return $res;
1418	}
1419
1420	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1421	}
1422
1423	sub _draw {
1424	my ($self) = @_;
1425
1426	for (grep $_, @{$self->{children}}) {
1427	$_->draw for grep $_, @$_;
1428	}
1429	}
1430
1431	#############################################################################	1800	#############################################################################
1432		1801
1433	package CFClient::UI::Box;	1802	package CFPlus::UI::Box;
1434		1803
1435	our @ISA = CFClient::UI::Container::;	1804	our @ISA = CFPlus::UI::Container::;
1436		1805
1437	sub size_request {	1806	sub size_request {
1438	my ($self) = @_;	1807	my ($self) = @_;
1439		1808
1440	$self->{vertical}	1809	$self->{vertical}
…		…
1473	$req[$_] += $space * $children[$_]{expand}	1842	$req[$_] += $space * $children[$_]{expand}
1474	for 0 .. $#children;	1843	for 0 .. $#children;
1475	}	1844	}
1476	}	1845	}
1477		1846
1478	CFClient::UI::harmonize \@req;	1847	CFPlus::UI::harmonize \@req;
1479		1848
1480	my $pos = 0;	1849	my $pos = 0;
1481	for (0 .. $#children) {	1850	for (0 .. $#children) {
1482	my $alloc = $req[$_];	1851	my $alloc = $req[$_];
1483	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1852	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1488	1	1857	1
1489	}	1858	}
1490		1859
1491	#############################################################################	1860	#############################################################################
1492		1861
1493	package CFClient::UI::HBox;	1862	package CFPlus::UI::HBox;
1494		1863
1495	our @ISA = CFClient::UI::Box::;	1864	our @ISA = CFPlus::UI::Box::;
1496		1865
1497	sub new {	1866	sub new {
1498	my $class = shift;	1867	my $class = shift;
1499		1868
1500	$class->SUPER::new (	1869	$class->SUPER::new (
…		…
1503	)	1872	)
1504	}	1873	}
1505		1874
1506	#############################################################################	1875	#############################################################################
1507		1876
1508	package CFClient::UI::VBox;	1877	package CFPlus::UI::VBox;
1509		1878
1510	our @ISA = CFClient::UI::Box::;	1879	our @ISA = CFPlus::UI::Box::;
1511		1880
1512	sub new {	1881	sub new {
1513	my $class = shift;	1882	my $class = shift;
1514		1883
1515	$class->SUPER::new (	1884	$class->SUPER::new (
…		…
1518	)	1887	)
1519	}	1888	}
1520		1889
1521	#############################################################################	1890	#############################################################################
1522		1891
1523	package CFClient::UI::Label;	1892	package CFPlus::UI::Label;
1524		1893
1525	our @ISA = CFClient::UI::DrawBG::;	1894	our @ISA = CFPlus::UI::DrawBG::;
1526		1895
1527	use CFClient::OpenGL;	1896	use CFPlus::OpenGL;
1528		1897
1529	sub new {	1898	sub new {
1530	my ($class, %arg) = @_;	1899	my ($class, %arg) = @_;
1531		1900
1532	my $self = $class->SUPER::new (	1901	my $self = $class->SUPER::new (
…		…
1535	#active_bg => none	1904	#active_bg => none
1536	#font => default_font	1905	#font => default_font
1537	#text => initial text	1906	#text => initial text
1538	#markup => initial narkup	1907	#markup => initial narkup
1539	#max_w => maximum pixel width	1908	#max_w => maximum pixel width
		1909	#style => 0, # render flags
1540	ellipsise => 3, # end	1910	ellipsise => 3, # end
1541	layout => (new CFClient::Layout),	1911	layout => (new CFPlus::Layout),
1542	fontsize => 1,	1912	fontsize => 1,
1543	align => -1,	1913	align => -1,
1544	valign => -1,	1914	valign => -1,
1545	padding_x => 2,	1915	padding_x => 2,
1546	padding_y => 2,	1916	padding_y => 2,
1547	can_events => 0,	1917	can_events => 0,
1548	%arg	1918	%arg
1549	);	1919	);
1550		1920
1551	if (exists $self->{template}) {	1921	if (exists $self->{template}) {
1552	my $layout = new CFClient::Layout;	1922	my $layout = new CFPlus::Layout;
1553	$layout->set_text (delete $self->{template});	1923	$layout->set_text (delete $self->{template});
1554	$self->{template} = $layout;	1924	$self->{template} = $layout;
1555	}	1925	}
1556		1926
1557	if (exists $self->{markup}) {	1927	if (exists $self->{markup}) {
…		…
1559	} else {	1929	} else {
1560	$self->set_text (delete $self->{text});	1930	$self->set_text (delete $self->{text});
1561	}	1931	}
1562		1932
1563	$self	1933	$self
1564	}
1565
1566	sub escape($) {
1567	local $_ = $_[0];
1568
1569	s/&/&amp;/g;
1570	s/>/&gt;/g;
1571	s/</&lt;/g;
1572
1573	$_
1574	}	1934	}
1575		1935
1576	sub update {	1936	sub update {
1577	my ($self) = @_;	1937	my ($self) = @_;
1578		1938
…		…
1705	};	2065	};
1706		2066
1707	my $w = List::Util::min $self->{w} + 4, $size->[0];	2067	my $w = List::Util::min $self->{w} + 4, $size->[0];
1708	my $h = List::Util::min $self->{h} + 2, $size->[1];	2068	my $h = List::Util::min $self->{h} + 2, $size->[1];
1709		2069
1710	$self->{layout}->render ($self->{ox}, $self->{oy});	2070	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1711	}	2071	}
1712		2072
1713	#############################################################################	2073	#############################################################################
1714		2074
1715	package CFClient::UI::EntryBase;	2075	package CFPlus::UI::EntryBase;
1716		2076
1717	our @ISA = CFClient::UI::Label::;	2077	our @ISA = CFPlus::UI::Label::;
1718		2078
1719	use CFClient::OpenGL;	2079	use CFPlus::OpenGL;
1720		2080
1721	sub new {	2081	sub new {
1722	my $class = shift;	2082	my $class = shift;
1723		2083
1724	$class->SUPER::new (	2084	$class->SUPER::new (
…		…
1728	active_fg => [0, 0, 0],	2088	active_fg => [0, 0, 0],
1729	can_hover => 1,	2089	can_hover => 1,
1730	can_focus => 1,	2090	can_focus => 1,
1731	valign => 0,	2091	valign => 0,
1732	can_events => 1,	2092	can_events => 1,
		2093	ellipsise => 0,
1733	#text => ...	2094	#text => ...
1734	#hidden => "*",	2095	#hidden => "*",
1735	@_	2096	@_
1736	)	2097	)
1737	}	2098	}
…		…
1782	my $sym = $ev->{sym};	2143	my $sym = $ev->{sym};
1783	my $uni = $ev->{unicode};	2144	my $uni = $ev->{unicode};
1784		2145
1785	my $text = $self->get_text;	2146	my $text = $self->get_text;
1786		2147
		2148	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2149
1787	if ($uni == 8) {	2150	if ($uni == 8) {
1788	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2151	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789	} elsif ($uni == 127) {	2152	} elsif ($uni == 127) {
1790	substr $text, $self->{cursor}, 1, "";	2153	substr $text, $self->{cursor}, 1, "";
1791	} elsif ($sym == CFClient::SDLK_LEFT) {	2154	} elsif ($sym == CFPlus::SDLK_LEFT) {
1792	--$self->{cursor} if $self->{cursor};	2155	--$self->{cursor} if $self->{cursor};
1793	} elsif ($sym == CFClient::SDLK_RIGHT) {	2156	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1794	++$self->{cursor} if $self->{cursor} < length $self->{text};	2157	++$self->{cursor} if $self->{cursor} < length $self->{text};
1795	} elsif ($sym == CFClient::SDLK_HOME) {	2158	} elsif ($sym == CFPlus::SDLK_HOME) {
		2159	# what a hack
		2160	$self->{cursor} =
		2161	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2162	? length $1
		2163	: 0;
		2164	} elsif ($sym == CFPlus::SDLK_END) {
		2165	# uh, again
		2166	$self->{cursor} =
		2167	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2168	? $self->{cursor} + length $1
		2169	: length $self->{text};
		2170	} elsif ($uni == 21) { # ctrl-u
		2171	$text = "";
1796	$self->{cursor} = 0;	2172	$self->{cursor} = 0;
1797	} elsif ($sym == CFClient::SDLK_END) {
1798	$self->{cursor} = length $text;
1799	} elsif ($uni == 27) {	2173	} elsif ($uni == 27) {
1800	$self->emit ('escape');	2174	$self->emit ('escape');
1801	} elsif ($uni) {	2175	} elsif ($uni == 0x0d) {
		2176	substr $text, $self->{cursor}++, 0, "\012";
		2177	} elsif ($uni >= 0x20) {
1802	substr $text, $self->{cursor}++, 0, chr $uni;	2178	substr $text, $self->{cursor}++, 0, chr $uni;
1803	} else {	2179	} else {
1804	return 0;	2180	return 0;
1805	}	2181	}
1806		2182
1807	$self->_set_text ($text);	2183	$self->_set_text ($text);
1808		2184
1809	$self->realloc;	2185	$self->realloc;
		2186	$self->update;
1810		2187
1811	1	2188	1
1812	}	2189	}
1813		2190
1814	sub invoke_focus_in {	2191	sub invoke_focus_in {
…		…
1826		2203
1827	my $idx = $self->{layout}->xy_to_index ($x, $y);	2204	my $idx = $self->{layout}->xy_to_index ($x, $y);
1828		2205
1829	# byte-index to char-index	2206	# byte-index to char-index
1830	my $text = $self->{text};	2207	my $text = $self->{text};
1831	utf8::encode $text;	2208	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832	$self->{cursor} = length substr $text, 0, $idx;	2209	$self->{cursor} = length $text;
1833		2210
1834	$self->_set_text ($self->{text});	2211	$self->_set_text ($self->{text});
1835	$self->update;	2212	$self->update;
1836		2213
1837	1	2214	1
…		…
1876	utf8::encode $text;	2253	utf8::encode $text;
1877		2254
1878	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2255	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879	}	2256	}
1880		2257
1881	glColor @{$self->{fg}};
1882	glBegin GL_LINES;	2258	glBegin GL_LINES;
1883	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2259	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1884	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2260	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885	glEnd;	2261	glEnd;
1886	}	2262	}
1887	}	2263	}
1888		2264
		2265	#############################################################################
		2266
1889	package CFClient::UI::Entry;	2267	package CFPlus::UI::Entry;
1890		2268
1891	our @ISA = CFClient::UI::EntryBase::;	2269	our @ISA = CFPlus::UI::EntryBase::;
1892		2270
1893	use CFClient::OpenGL;	2271	use CFPlus::OpenGL;
1894		2272
1895	sub invoke_key_down {	2273	sub invoke_key_down {
1896	my ($self, $ev) = @_;	2274	my ($self, $ev) = @_;
1897		2275
1898	my $sym = $ev->{sym};	2276	my $sym = $ev->{sym};
1899		2277
1900	if ($sym == 13) {	2278	if ($ev->{uni} == 0x0d || $sym == 13) {
1901	unshift @{$self->{history}},	2279	unshift @{$self->{history}},
1902	my $txt = $self->get_text;	2280	my $txt = $self->get_text;
1903		2281
1904	$self->{history_pointer} = -1;	2282	$self->{history_pointer} = -1;
1905	$self->{history_saveback} = '';	2283	$self->{history_saveback} = '';
1906	$self->emit (activate => $txt);	2284	$self->emit (activate => $txt);
1907	$self->update;	2285	$self->update;
1908		2286
1909	} elsif ($sym == CFClient::SDLK_UP) {	2287	} elsif ($sym == CFPlus::SDLK_UP) {
1910	if ($self->{history_pointer} < 0) {	2288	if ($self->{history_pointer} < 0) {
1911	$self->{history_saveback} = $self->get_text;	2289	$self->{history_saveback} = $self->get_text;
1912	}	2290	}
1913	if (@{$self->{history} || []} > 0) {	2291	if (@{$self->{history} || []} > 0) {
1914	$self->{history_pointer}++;	2292	$self->{history_pointer}++;
…		…
1916	$self->{history_pointer} = @{$self->{history} || []} - 1;	2294	$self->{history_pointer} = @{$self->{history} || []} - 1;
1917	}	2295	}
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2296	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1919	}	2297	}
1920		2298
1921	} elsif ($sym == CFClient::SDLK_DOWN) {	2299	} elsif ($sym == CFPlus::SDLK_DOWN) {
1922	$self->{history_pointer}--;	2300	$self->{history_pointer}--;
1923	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2301	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924		2302
1925	if ($self->{history_pointer} >= 0) {	2303	if ($self->{history_pointer} >= 0) {
1926	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2304	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1935	1	2313	1
1936	}	2314	}
1937		2315
1938	#############################################################################	2316	#############################################################################
1939		2317
		2318	package CFPlus::UI::TextEdit;
		2319
		2320	our @ISA = CFPlus::UI::EntryBase::;
		2321
		2322	use CFPlus::OpenGL;
		2323
		2324	sub move_cursor_ver {
		2325	my ($self, $dy) = @_;
		2326
		2327	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2328
		2329	$y += $dy;
		2330
		2331	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2332	$self->{cursor} = $index;
		2333	delete $self->{cur_h};
		2334	$self->update;
		2335	return;
		2336	}
		2337	}
		2338
		2339	sub invoke_key_down {
		2340	my ($self, $ev) = @_;
		2341
		2342	my $sym = $ev->{sym};
		2343
		2344	if ($sym == CFPlus::SDLK_UP) {
		2345	$self->move_cursor_ver (-1);
		2346	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2347	$self->move_cursor_ver (+1);
		2348	} else {
		2349	return $self->SUPER::invoke_key_down ($ev)
		2350	}
		2351
		2352	1
		2353	}
		2354
		2355	#############################################################################
		2356
1940	package CFClient::UI::Button;	2357	package CFPlus::UI::Button;
1941		2358
1942	our @ISA = CFClient::UI::Label::;	2359	our @ISA = CFPlus::UI::Label::;
1943		2360
1944	use CFClient::OpenGL;	2361	use CFPlus::OpenGL;
1945		2362
1946	my @tex =	2363	my @tex =
1947	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2364	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948	qw(b1_button_active.png);	2365	qw(b1_button_inactive.png b1_button_active.png);
1949		2366
1950	sub new {	2367	sub new {
1951	my $class = shift;	2368	my $class = shift;
1952		2369
1953	$class->SUPER::new (	2370	$class->SUPER::new (
1954	padding_x => 4,	2371	padding_x => 4,
1955	padding_y => 4,	2372	padding_y => 4,
1956	fg => [1, 1, 1],	2373	fg => [1.0, 1.0, 1.0],
1957	active_fg => [0, 0, 1],	2374	active_fg => [0.8, 0.8, 0.8],
1958	can_hover => 1,	2375	can_hover => 1,
1959	align => 0,	2376	align => 0,
1960	valign => 0,	2377	valign => 0,
1961	can_events => 1,	2378	can_events => 1,
1962	@_	2379	@_
…		…
1980		2397
1981	glEnable GL_TEXTURE_2D;	2398	glEnable GL_TEXTURE_2D;
1982	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2399	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983	glColor 0, 0, 0, 1;	2400	glColor 0, 0, 0, 1;
1984		2401
		2402	my $tex = $tex[$GRAB == $self];
1985	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2403	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1986		2404
1987	glDisable GL_TEXTURE_2D;	2405	glDisable GL_TEXTURE_2D;
1988		2406
1989	$self->SUPER::_draw;	2407	$self->SUPER::_draw;
1990	}	2408	}
1991		2409
1992	#############################################################################	2410	#############################################################################
1993		2411
		2412	package CFPlus::UI::CheckBox;
		2413
		2414	our @ISA = CFPlus::UI::DrawBG::;
		2415
		2416	my @tex =
		2417	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2418	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2419
		2420	use CFPlus::OpenGL;
		2421
		2422	sub new {
		2423	my $class = shift;
		2424
		2425	$class->SUPER::new (
		2426	padding_x => 2,
		2427	padding_y => 2,
		2428	fg => [1, 1, 1],
		2429	active_fg => [1, 1, 0],
		2430	bg => [0, 0, 0, 0.2],
		2431	active_bg => [1, 1, 1, 0.5],
		2432	state => 0,
		2433	can_hover => 1,
		2434	@_
		2435	)
		2436	}
		2437
		2438	sub size_request {
		2439	my ($self) = @_;
		2440
		2441	(6) x 2
		2442	}
		2443
		2444	sub toggle {
		2445	my ($self) = @_;
		2446
		2447	$self->{state} = !$self->{state};
		2448	$self->emit (changed => $self->{state});
		2449	$self->update;
		2450	}
		2451
		2452	sub invoke_button_down {
		2453	my ($self, $ev, $x, $y) = @_;
		2454
		2455	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2456	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2457	$self->toggle;
		2458	} else {
		2459	return 0
		2460	}
		2461
		2462	1
		2463	}
		2464
		2465	sub _draw {
		2466	my ($self) = @_;
		2467
		2468	$self->SUPER::_draw;
		2469
		2470	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2471
		2472	my ($w, $h) = @$self{qw(w h)};
		2473
		2474	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2475
		2476	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2477
		2478	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2479
		2480	glEnable GL_TEXTURE_2D;
		2481	$tex->draw_quad_alpha (0, 0, $s, $s);
		2482	glDisable GL_TEXTURE_2D;
		2483	}
		2484
		2485	#############################################################################
		2486
		2487	package CFPlus::UI::Image;
		2488
		2489	our @ISA = CFPlus::UI::Base::;
		2490
		2491	use CFPlus::OpenGL;
		2492
		2493	our %texture_cache;
		2494
		2495	sub new {
		2496	my $class = shift;
		2497
		2498	my $self = $class->SUPER::new (
		2499	can_events => 0,
		2500	@_,
		2501	);
		2502
		2503	$self->{path} || $self->{tex}
		2504	or Carp::croak "'path' or 'tex' attributes required";
		2505
		2506	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2507	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2508
		2509	CFPlus::weaken $texture_cache{$self->{path}};
		2510
		2511	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2512
		2513	$self
		2514	}
		2515
		2516	sub STORABLE_freeze {
		2517	my ($self, $cloning) = @_;
		2518
		2519	$self->{path}
		2520	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2521
		2522	$self->{path}
		2523	}
		2524
		2525	sub STORABLE_attach {
		2526	my ($self, $cloning, $path) = @_;
		2527
		2528	$self->new (path => $path)
		2529	}
		2530
		2531	sub size_request {
		2532	my ($self) = @_;
		2533
		2534	($self->{tex}{w}, $self->{tex}{h})
		2535	}
		2536
		2537	sub _draw {
		2538	my ($self) = @_;
		2539
		2540	my $tex = $self->{tex};
		2541
		2542	my ($w, $h) = ($self->{w}, $self->{h});
		2543
		2544	if ($self->{rot90}) {
		2545	glRotate 90, 0, 0, 1;
		2546	glTranslate 0, -$self->{w}, 0;
		2547
		2548	($w, $h) = ($h, $w);
		2549	}
		2550
		2551	glEnable GL_TEXTURE_2D;
		2552	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2553
		2554	$tex->draw_quad (0, 0, $w, $h);
		2555
		2556	glDisable GL_TEXTURE_2D;
		2557	}
		2558
		2559	#############################################################################
		2560
1994	package CFClient::UI::ImageButton;	2561	package CFPlus::UI::ImageButton;
1995		2562
1996	our @ISA = CFClient::UI::Image::;	2563	our @ISA = CFPlus::UI::Image::;
1997		2564
1998	use CFClient::OpenGL;	2565	use CFPlus::OpenGL;
1999		2566
2000	my %textures;	2567	my %textures;
2001		2568
2002	sub new {	2569	sub new {
2003	my $class = shift;	2570	my $class = shift;
…		…
2025	1	2592	1
2026	}	2593	}
2027		2594
2028	#############################################################################	2595	#############################################################################
2029		2596
2030	package CFClient::UI::CheckBox;
2031
2032	our @ISA = CFClient::UI::DrawBG::;
2033
2034	my @tex =
2035	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038	use CFClient::OpenGL;
2039
2040	sub new {
2041	my $class = shift;
2042
2043	$class->SUPER::new (
2044	padding_x => 2,
2045	padding_y => 2,
2046	fg => [1, 1, 1],
2047	active_fg => [1, 1, 0],
2048	bg => [0, 0, 0, 0.2],
2049	active_bg => [1, 1, 1, 0.5],
2050	state => 0,
2051	can_hover => 1,
2052	@_
2053	)
2054	}
2055
2056	sub size_request {
2057	my ($self) = @_;
2058
2059	(6) x 2
2060	}
2061
2062	sub toggle {
2063	my ($self) = @_;
2064
2065	$self->{state} = !$self->{state};
2066	$self->emit (changed => $self->{state});
2067	$self->update;
2068	}
2069
2070	sub invoke_button_down {
2071	my ($self, $ev, $x, $y) = @_;
2072
2073	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2074	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2075	$self->toggle;
2076	} else {
2077	return 0
2078	}
2079
2080	1
2081	}
2082
2083	sub _draw {
2084	my ($self) = @_;
2085
2086	$self->SUPER::_draw;
2087
2088	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2089
2090	my ($w, $h) = @$self{qw(w h)};
2091
2092	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2093
2094	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2095
2096	my $tex = $self->{state} ? $tex[1] : $tex[0];
2097
2098	glEnable GL_TEXTURE_2D;
2099	$tex->draw_quad_alpha (0, 0, $s, $s);
2100	glDisable GL_TEXTURE_2D;
2101	}
2102
2103	#############################################################################
2104
2105	package CFClient::UI::Image;	2597	package CFPlus::UI::VGauge;
2106		2598
2107	our @ISA = CFClient::UI::Base::;	2599	our @ISA = CFPlus::UI::Base::;
2108
2109	use CFClient::OpenGL;
2110
2111	our %texture_cache;
2112
2113	sub new {
2114	my $class = shift;
2115
2116	my $self = $class->SUPER::new (
2117	can_events => 0,
2118	@_,
2119	);
2120
2121	$self->{path}
2122	or Carp::croak "required attribute 'path' not set";
2123
2124	$self->{tex} = $texture_cache{$self->{path}} ||=
2125	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2126
2127	Scalar::Util::weaken $texture_cache{$self->{path}};
2128
2129	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2130
2131	$self
2132	}
2133
2134	sub size_request {
2135	my ($self) = @_;
2136
2137	($self->{tex}{w}, $self->{tex}{h})
2138	}
2139
2140	sub _draw {
2141	my ($self) = @_;
2142
2143	my $tex = $self->{tex};
2144
2145	my ($w, $h) = ($self->{w}, $self->{h});
2146
2147	if ($self->{rot90}) {
2148	glRotate 90, 0, 0, 1;
2149	glTranslate 0, -$self->{w}, 0;
2150
2151	($w, $h) = ($h, $w);
2152	}
2153
2154	glEnable GL_TEXTURE_2D;
2155	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156
2157	$tex->draw_quad_alpha (0, 0, $w, $h);
2158
2159	glDisable GL_TEXTURE_2D;
2160	}
2161
2162	#############################################################################
2163
2164	package CFClient::UI::VGauge;
2165
2166	our @ISA = CFClient::UI::Base::;
2167		2600
2168	use List::Util qw(min max);	2601	use List::Util qw(min max);
2169		2602
2170	use CFClient::OpenGL;	2603	use CFPlus::OpenGL;
2171		2604
2172	my %tex = (	2605	my %tex = (
2173	food => [	2606	food => [
2174	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2607	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2175	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2608	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2176	],	2609	],
2177	grace => [	2610	grace => [
2178	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2611	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2612	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2180	],	2613	],
2181	hp => [	2614	hp => [
2182	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2615	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2616	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2184	],	2617	],
2185	mana => [	2618	mana => [
2186	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2619	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2620	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2188	],	2621	],
2189	);	2622	);
2190		2623
2191	# eg. VGauge->new (gauge => 'food'), default gauge: food	2624	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2294	glDisable GL_TEXTURE_2D;	2727	glDisable GL_TEXTURE_2D;
2295	}	2728	}
2296		2729
2297	#############################################################################	2730	#############################################################################
2298		2731
2299	package CFClient::UI::Gauge;	2732	package CFPlus::UI::Gauge;
2300		2733
2301	our @ISA = CFClient::UI::VBox::;	2734	our @ISA = CFPlus::UI::VBox::;
2302		2735
2303	sub new {	2736	sub new {
2304	my ($class, %arg) = @_;	2737	my ($class, %arg) = @_;
2305		2738
2306	my $self = $class->SUPER::new (	2739	my $self = $class->SUPER::new (
…		…
2308	can_hover => 1,	2741	can_hover => 1,
2309	can_events => 1,	2742	can_events => 1,
2310	%arg,	2743	%arg,
2311	);	2744	);
2312		2745
2313	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2746	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2314	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2747	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2315	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2748	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2316		2749
2317	$self	2750	$self
2318	}	2751	}
2319		2752
2320	sub set_fontsize {	2753	sub set_fontsize {
…		…
2341	$self->{value}->set_text ($val);	2774	$self->{value}->set_text ($val);
2342	}	2775	}
2343		2776
2344	#############################################################################	2777	#############################################################################
2345		2778
2346	package CFClient::UI::Slider;	2779	package CFPlus::UI::Slider;
2347		2780
2348	use strict;	2781	use strict;
2349		2782
2350	use CFClient::OpenGL;	2783	use CFPlus::OpenGL;
2351		2784
2352	our @ISA = CFClient::UI::DrawBG::;	2785	our @ISA = CFPlus::UI::DrawBG::;
2353		2786
2354	my @tex =	2787	my @tex =
2355	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2788	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2356	qw(s1_slider.png s1_slider_bg.png);	2789	qw(s1_slider.png s1_slider_bg.png);
2357		2790
2358	sub new {	2791	sub new {
2359	my $class = shift;	2792	my $class = shift;
2360		2793
…		…
2449	}	2882	}
2450		2883
2451	1	2884	1
2452	}	2885	}
2453		2886
		2887	sub invoke_mouse_wheel {
		2888	my ($self, $ev) = @_;
		2889
		2890	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2891
		2892	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2893
		2894	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2895
		2896	! ! $delta
		2897	}
		2898
2454	sub update {	2899	sub update {
2455	my ($self) = @_;	2900	my ($self) = @_;
2456		2901
2457	delete $self->{knob_w};	2902	delete $self->{knob_w};
2458	$self->SUPER::update;	2903	$self->SUPER::update;
…		…
2505	glDisable GL_TEXTURE_2D;	2950	glDisable GL_TEXTURE_2D;
2506	}	2951	}
2507		2952
2508	#############################################################################	2953	#############################################################################
2509		2954
2510	package CFClient::UI::ValSlider;	2955	package CFPlus::UI::ValSlider;
2511		2956
2512	our @ISA = CFClient::UI::HBox::;	2957	our @ISA = CFPlus::UI::HBox::;
2513		2958
2514	sub new {	2959	sub new {
2515	my ($class, %arg) = @_;	2960	my ($class, %arg) = @_;
2516		2961
2517	my $range = delete $arg{range};	2962	my $range = delete $arg{range};
2518		2963
2519	my $self = $class->SUPER::new (	2964	my $self = $class->SUPER::new (
2520	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2965	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2521	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2966	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2522	to_value => sub { shift },	2967	to_value => sub { shift },
2523	from_value => sub { shift },	2968	from_value => sub { shift },
2524	%arg,	2969	%arg,
2525	);	2970	);
2526		2971
…		…
2546	sub set_range { shift->{slider}->set_range (@_) }	2991	sub set_range { shift->{slider}->set_range (@_) }
2547	sub set_value { shift->{slider}->set_value (@_) }	2992	sub set_value { shift->{slider}->set_value (@_) }
2548		2993
2549	#############################################################################	2994	#############################################################################
2550		2995
2551	package CFClient::UI::TextScroller;	2996	package CFPlus::UI::TextScroller;
2552		2997
2553	our @ISA = CFClient::UI::HBox::;	2998	our @ISA = CFPlus::UI::HBox::;
2554		2999
2555	use CFClient::OpenGL;	3000	use CFPlus::OpenGL;
2556		3001
2557	sub new {	3002	sub new {
2558	my $class = shift;	3003	my $class = shift;
2559		3004
2560	my $self = $class->SUPER::new (	3005	my $self = $class->SUPER::new (
2561	fontsize => 1,	3006	fontsize => 1,
2562	can_events => 0,	3007	can_events => 1,
2563	indent => 0,	3008	indent => 0,
2564	#font => default_font	3009	#font => default_font
2565	@_,	3010	@_,
2566		3011
2567	layout => (new CFClient::Layout),	3012	layout => (new CFPlus::Layout),
2568	par => [],	3013	par => [],
		3014	max_par => 0,
2569	height => 0,	3015	height => 0,
2570	children => [	3016	children => [
2571	(new CFClient::UI::Empty expand => 1),	3017	(new CFPlus::UI::Empty expand => 1),
2572	(new CFClient::UI::Slider vertical => 1),	3018	(new CFPlus::UI::Slider vertical => 1),
2573	],	3019	],
2574	);	3020	);
2575		3021
2576	$self->{children}[1]->connect (changed => sub { $self->update });	3022	$self->{children}[1]->connect (changed => sub { $self->update });
2577		3023
…		…
2607		3053
2608	$self->reflow;	3054	$self->reflow;
2609		3055
2610	local $self->{children} = [$empty, $slider];	3056	local $self->{children} = [$empty, $slider];
2611	$self->SUPER::invoke_size_allocate ($w, $h)	3057	$self->SUPER::invoke_size_allocate ($w, $h)
		3058	}
		3059
		3060	sub invoke_mouse_wheel {
		3061	my ($self, $ev) = @_;
		3062
		3063	return 0 unless $ev->{dy}; # only vertical movements
		3064
		3065	$self->{children}[1]->emit (mouse_wheel => $ev);
		3066
		3067	1
2612	}	3068	}
2613		3069
2614	sub get_layout {	3070	sub get_layout {
2615	my ($self, $para) = @_;	3071	my ($self, $para) = @_;
2616		3072
…		…
2644		3100
2645	# todo: base offset on lines or so, not on pixels	3101	# todo: base offset on lines or so, not on pixels
2646	$self->{children}[1]->set_value ($offset);	3102	$self->{children}[1]->set_value ($offset);
2647	}	3103	}
2648		3104
		3105	sub current_paragraph {
		3106	my ($self) = @_;
		3107
		3108	$self->{top_paragraph} - 1
		3109	}
		3110
		3111	sub scroll_to {
		3112	my ($self, $para) = @_;
		3113
		3114	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3115
		3116	$self->{scroll_to} = $para;
		3117	$self->update;
		3118	}
		3119
2649	sub clear {	3120	sub clear {
2650	my ($self) = @_;	3121	my ($self) = @_;
2651		3122
2652	my (undef, undef, @other) = @{ $self->{children} };	3123	my (undef, undef, @other) = @{ $self->{children} };
2653	$self->remove ($_) for @other;	3124	$self->remove ($_) for @other;
…		…
2656	$self->{height} = 0;	3127	$self->{height} = 0;
2657	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3128	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2658	}	3129	}
2659		3130
2660	sub add_paragraph {	3131	sub add_paragraph {
2661	my ($self, $color, $para, $indent) = @_;	3132	my $self = shift;
2662		3133
2663	my ($text, @w) = ref $para ? @$para : $para;	3134	for my $para (@_) {
2664
2665	$para = {	3135	$para = {
		3136	fg => [1, 1, 1, 1],
		3137	indent => 0,
		3138	markup => "",
		3139	widget => [],
		3140	ref $para ? %$para : (markup => $para),
2666	w => 1e10,	3141	w => 1e10,
2667	wrapped => 1,	3142	wrapped => 1,
2668	fg => $color,
2669	indent => $indent,
2670	markup => $text,
2671	widget => \@w,
2672	};	3143	};
2673		3144
2674	$self->add (@w) if @w;	3145	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2675	push @{$self->{par}}, $para;	3146	push @{$self->{par}}, $para;
		3147	}
		3148
		3149	if (my $max = $self->{max_par}) {
		3150	shift @{$self->{par}} while @{$self->{par}} > $max;
		3151	}
2676		3152
2677	$self->{need_reflow}++;	3153	$self->{need_reflow}++;
2678	$self->update;	3154	$self->update;
2679	}	3155	}
2680		3156
2681	sub scroll_to_bottom {	3157	sub scroll_to_bottom {
2682	my ($self) = @_;	3158	my ($self) = @_;
2683		3159
2684	$self->{scroll_to_bottom} = 1;	3160	$self->{scroll_to} = $#{$self->{par}};
2685	$self->update;	3161	$self->update;
2686	}	3162	}
2687		3163
		3164	sub force_uptodate {
		3165	my ($self) = @_;
		3166
		3167	if (delete $self->{need_reflow}) {
		3168	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3169
		3170	my $height = 0;
		3171
		3172	for my $para (@{$self->{par}}) {
		3173	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3174	my $layout = $self->get_layout ($para);
		3175	my ($w, $h) = $layout->size;
		3176
		3177	$para->{w} = $w + $para->{indent};
		3178	$para->{h} = $h;
		3179	$para->{wrapped} = $layout->has_wrapped;
		3180	}
		3181
		3182	$para->{y} = $height;
		3183	$height += $para->{h};
		3184	}
		3185
		3186	$self->{height} = $height;
		3187	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3188
		3189	delete $self->{texture};
		3190	}
		3191
		3192	if (my $paridx = delete $self->{scroll_to}) {
		3193	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3194	}
		3195	}
		3196
2688	sub update {	3197	sub update {
2689	my ($self) = @_;	3198	my ($self) = @_;
2690		3199
2691	$self->SUPER::update;	3200	$self->SUPER::update;
2692		3201
2693	return unless $self->{h} > 0;	3202	return unless $self->{h} > 0;
2694		3203
2695	delete $self->{texture};	3204	delete $self->{texture};
2696		3205
2697	$ROOT->on_post_alloc ($self => sub {	3206	$ROOT->on_post_alloc ($self => sub {
		3207	$self->force_uptodate;
		3208
2698	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3209	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2699		3210
2700	if (delete $self->{need_reflow}) {
2701	my $height = 0;
2702
2703	for my $para (@{$self->{par}}) {
2704	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2705	my $layout = $self->get_layout ($para);
2706	my ($w, $h) = $layout->size;
2707
2708	$para->{w} = $w + $para->{indent};
2709	$para->{h} = $h;
2710	$para->{wrapped} = $layout->has_wrapped;
2711	}
2712
2713	$height += $para->{h};
2714	}
2715
2716	$self->{height} = $height;
2717
2718	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2719
2720	delete $self->{texture};
2721	}
2722
2723	if (delete $self->{scroll_to_bottom}) {
2724	$self->{children}[1]->set_value (1e10);
2725	}
2726
2727	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3211	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2728	glClearColor 0, 0, 0, 0;	3212	glClearColor 0, 0, 0, 0;
2729	glClear GL_COLOR_BUFFER_BIT;	3213	glClear GL_COLOR_BUFFER_BIT;
2730		3214
		3215	package CFPlus::UI::Base;
		3216	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3217	(0, 0, $self->{w}, $self->{h});
		3218
		3219	my $top = int $self->{children}[1]{range}[0];
		3220
		3221	my $paridx = 0;
		3222	my $top_paragraph;
2731	my $top = int $self->{children}[1]{range}[0];	3223	my $top = int $self->{children}[1]{range}[0];
2732		3224
2733	my $y0 = $top;	3225	my $y0 = $top;
2734	my $y1 = $top + $H;	3226	my $y1 = $top + $H;
2735		3227
2736	my $y = 0;
2737
2738	for my $para (@{$self->{par}}) {	3228	for my $para (@{$self->{par}}) {
2739	my $h = $para->{h};	3229	my $h = $para->{h};
		3230	my $y = $para->{y};
2740		3231
2741	if ($y0 < $y + $h && $y < $y1) {	3232	if ($y0 < $y + $h && $y < $y1) {
2742
2743	my $layout = $self->get_layout ($para);	3233	my $layout = $self->get_layout ($para);
2744		3234
2745	$layout->render ($para->{indent}, $y - $y0);	3235	$layout->render ($para->{indent}, $y - $y0);
2746		3236
2747	if (my @w = @{ $para->{widget} }) {	3237	if (my @w = @{ $para->{widget} }) {
…		…
2756	$_->draw;	3246	$_->draw;
2757	}	3247	}
2758	}	3248	}
2759	}	3249	}
2760		3250
2761	$y += $h;	3251	$paridx++;
		3252	$top_paragraph ||= $paridx if $y >= $top;
2762	}	3253	}
		3254
		3255	$self->{top_paragraph} = $top_paragraph;
2763	};	3256	};
2764	});	3257	});
2765	}	3258	}
2766		3259
2767	sub reconfigure {	3260	sub reconfigure {
…		…
2785	$self->{children}[1]->draw;	3278	$self->{children}[1]->draw;
2786	}	3279	}
2787		3280
2788	#############################################################################	3281	#############################################################################
2789		3282
2790	package CFClient::UI::Animator;	3283	package CFPlus::UI::Animator;
2791		3284
2792	use CFClient::OpenGL;	3285	use CFPlus::OpenGL;
2793		3286
2794	our @ISA = CFClient::UI::Bin::;	3287	our @ISA = CFPlus::UI::Bin::;
2795		3288
2796	sub moveto {	3289	sub moveto {
2797	my ($self, $x, $y) = @_;	3290	my ($self, $x, $y) = @_;
2798		3291
2799	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3292	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2827	glPopMatrix;	3320	glPopMatrix;
2828	}	3321	}
2829		3322
2830	#############################################################################	3323	#############################################################################
2831		3324
2832	package CFClient::UI::Flopper;	3325	package CFPlus::UI::Flopper;
2833		3326
2834	our @ISA = CFClient::UI::Button::;	3327	our @ISA = CFPlus::UI::Button::;
2835		3328
2836	sub new {	3329	sub new {
2837	my $class = shift;	3330	my $class = shift;
2838		3331
2839	my $self = $class->SUPER::new (	3332	my $self = $class->SUPER::new (
…		…
2851	$self->{other}->toggle_visibility;	3344	$self->{other}->toggle_visibility;
2852	}	3345	}
2853		3346
2854	#############################################################################	3347	#############################################################################
2855		3348
2856	package CFClient::UI::Tooltip;	3349	package CFPlus::UI::Tooltip;
2857		3350
2858	our @ISA = CFClient::UI::Bin::;	3351	our @ISA = CFPlus::UI::Bin::;
2859		3352
2860	use CFClient::OpenGL;	3353	use CFPlus::OpenGL;
2861		3354
2862	sub new {	3355	sub new {
2863	my $class = shift;	3356	my $class = shift;
2864		3357
2865	$class->SUPER::new (	3358	$class->SUPER::new (
…		…
2868	)	3361	)
2869	}	3362	}
2870		3363
2871	sub set_tooltip_from {	3364	sub set_tooltip_from {
2872	my ($self, $widget) = @_;	3365	my ($self, $widget) = @_;
		3366
		3367	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3368	if $widget->{tooltip} =~ /^#(.*)$/;
2873		3369
2874	my $tooltip = $widget->{tooltip};	3370	my $tooltip = $widget->{tooltip};
2875		3371
2876	if ($ENV{CFPLUS_DEBUG} & 2) {	3372	if ($ENV{CFPLUS_DEBUG} & 2) {
2877	$tooltip .= "\n\n" . (ref $widget) . "\n"	3373	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2881	}	3377	}
2882		3378
2883	$tooltip =~ s/^\n+//;	3379	$tooltip =~ s/^\n+//;
2884	$tooltip =~ s/\n+$//;	3380	$tooltip =~ s/\n+$//;
2885		3381
2886	$self->add (new CFClient::UI::Label	3382	$self->add (new CFPlus::UI::Label
2887	markup => $tooltip,	3383	markup => $tooltip,
2888	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3384	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2889	fontsize => 0.8,	3385	fontsize => 0.8,
2890	fg => [0, 0, 0, 1],	3386	style => 1, # FLAG_INVERSE
2891	ellipsise => 0,	3387	ellipsise => 0,
2892	font => ($widget->{tooltip_font} || $::FONT_PROP),	3388	font => ($widget->{tooltip_font} || $::FONT_PROP),
2893	);	3389	);
2894	}	3390	}
2895		3391
…		…
2914		3410
2915	$self->{root}->on_post_alloc ("move_$self" => sub {	3411	$self->{root}->on_post_alloc ("move_$self" => sub {
2916	my $widget = $self->{owner}	3412	my $widget = $self->{owner}
2917	or return;	3413	or return;
2918		3414
		3415	if ($widget->{visible}) {
2919	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3416	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2920		3417
2921	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3418	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2922	if $x + $self->{w} > $self->{root}{w};	3419	if $x + $self->{w} > $self->{root}{w};
2923		3420
2924	$self->move_abs ($x, $y);	3421	$self->move_abs ($x, $y);
		3422	} else {
		3423	$self->hide;
		3424	}
2925	});	3425	});
2926	}	3426	}
2927		3427
2928	sub _draw {	3428	sub _draw {
2929	my ($self) = @_;	3429	my ($self) = @_;
…		…
2953	$self->SUPER::_draw;	3453	$self->SUPER::_draw;
2954	}	3454	}
2955		3455
2956	#############################################################################	3456	#############################################################################
2957		3457
2958	package CFClient::UI::Face;	3458	package CFPlus::UI::Face;
2959		3459
2960	our @ISA = CFClient::UI::Base::;	3460	our @ISA = CFPlus::UI::DrawBG::;
2961		3461
2962	use CFClient::OpenGL;	3462	use CFPlus::OpenGL;
2963		3463
2964	sub new {	3464	sub new {
2965	my $class = shift;	3465	my $class = shift;
2966		3466
2967	my $self = $class->SUPER::new (	3467	my $self = $class->SUPER::new (
		3468	size_w => 32,
		3469	size_h => 8,
2968	aspect => 1,	3470	aspect => 1,
2969	can_events => 0,	3471	can_events => 0,
2970	@_,	3472	@_,
2971	);	3473	);
2972		3474
2973	if ($self->{anim} && $self->{animspeed}) {	3475	if ($self->{anim} && $self->{animspeed}) {
2974	Scalar::Util::weaken (my $widget = $self);	3476	CFPlus::weaken (my $widget = $self);
2975		3477
		3478	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3479	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2976	$self->{timer} = Event->timer (	3480	$self->{timer} = Event->timer (
2977	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2978	hard => 1,	3481	parked => 1,
2979	interval => $self->{animspeed},
2980	cb => sub {	3482	cb => sub {
		3483	return unless $::CONN && $widget;
		3484
2981	++$widget->{frame};	3485	++$widget->{frame};
		3486	$widget->update_face;
2982	$widget->update;	3487	$widget->update;
		3488
		3489	$widget->update_timer;
2983	},	3490	},
2984	);	3491	);
		3492
		3493	$self->update_face;
		3494	$self->update_timer;
2985	}	3495	}
2986		3496
2987	$self	3497	$self
2988	}	3498	}
2989		3499
		3500	sub update_timer {
		3501	my ($self) = @_;
		3502
		3503	return unless $self->{timer};
		3504
		3505	if ($self->{visible}) {
		3506	$self->{timer}->at (
		3507	$self->{anim_start}
		3508	+ $self->{animspeed}
		3509	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3510	);
		3511	$self->{timer}->start;
		3512	} else {
		3513	$self->{timer}->stop;
		3514	}
		3515	}
		3516
		3517	sub update_face {
		3518	my ($self) = @_;
		3519
		3520	return unless $::CONN;
		3521
		3522	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3523	if ($anim && @$anim) {
		3524	delete $self->{wait_face};
		3525	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3526	}
		3527	}
		3528	}
		3529
2990	sub size_request {	3530	sub size_request {
2991	(32, 8)	3531	my ($self) = @_;
		3532
		3533	if ($::CONN) {
		3534	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3535	if (my $tex = $::CONN->{texture}[$faceid]) {
		3536	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3537	} else {
		3538	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3539	$self->realloc;
		3540	});
		3541	}
		3542	}
		3543	}
		3544
		3545	($self->{size_w} || 8, $self->{size_h} || 8)
2992	}	3546	}
2993		3547
2994	sub update {	3548	sub update {
2995	my ($self) = @_;	3549	my ($self) = @_;
2996		3550
2997	return unless $self->{visible};	3551	return unless $self->{visible};
2998		3552
2999	$self->SUPER::update;	3553	$self->SUPER::update;
3000	}	3554	}
3001		3555
		3556	sub invoke_visibility_change {
		3557	my ($self) = @_;
		3558
		3559	$self->update_timer;
		3560
		3561	0
		3562	}
		3563
3002	sub _draw {	3564	sub _draw {
3003	my ($self) = @_;	3565	my ($self) = @_;
3004		3566
3005	return unless $::CONN;	3567	return unless $::CONN;
3006		3568
3007	my $face;	3569	$self->SUPER::_draw;
3008		3570
3009	if ($self->{frame}) {
3010	my $anim = $::CONN->{anim}[$self->{anim}];	3571	my $faceid = $::CONN->{faceid}[$self->{face}]
3011		3572	or return;
3012	$face = $anim->[ $self->{frame} % @$anim ]
3013	if $anim && @$anim;
3014	}
3015		3573
3016	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3574	my $tex = $::CONN->{texture}[$faceid];
3017		3575
3018	if ($tex) {	3576	if ($tex) {
3019	glEnable GL_TEXTURE_2D;	3577	glEnable GL_TEXTURE_2D;
3020	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3578	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3021	glColor 0, 0, 0, 1;	3579	glColor 0, 0, 0, 1;
…		…
3025	}	3583	}
3026		3584
3027	sub destroy {	3585	sub destroy {
3028	my ($self) = @_;	3586	my ($self) = @_;
3029		3587
3030	$self->{timer}->cancel	3588	(delete $self->{timer})->cancel
3031	if $self->{timer};	3589	if $self->{timer};
3032		3590
3033	$self->SUPER::destroy;	3591	$self->SUPER::destroy;
3034	}	3592	}
3035		3593
3036	#############################################################################	3594	#############################################################################
3037		3595
3038	package CFClient::UI::Buttonbar;	3596	package CFPlus::UI::Buttonbar;
3039		3597
3040	our @ISA = CFClient::UI::HBox::;	3598	our @ISA = CFPlus::UI::HBox::;
3041		3599
3042	# TODO: should actualyl wrap buttons and other goodies.	3600	# TODO: should actually wrap buttons and other goodies.
3043		3601
3044	#############################################################################	3602	#############################################################################
3045		3603
3046	package CFClient::UI::Menu;	3604	package CFPlus::UI::Menu;
3047		3605
3048	our @ISA = CFClient::UI::FancyFrame::;	3606	our @ISA = CFPlus::UI::Toplevel::;
3049		3607
3050	use CFClient::OpenGL;	3608	use CFPlus::OpenGL;
3051		3609
3052	sub new {	3610	sub new {
3053	my $class = shift;	3611	my $class = shift;
3054		3612
3055	my $self = $class->SUPER::new (	3613	my $self = $class->SUPER::new (
3056	items => [],	3614	items => [],
3057	z => 100,	3615	z => 100,
3058	@_,	3616	@_,
3059	);	3617	);
3060		3618
3061	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3619	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3062		3620
3063	for my $item (@{ $self->{items} }) {	3621	for my $item (@{ $self->{items} }) {
3064	my ($widget, $cb, $tooltip) = @$item;	3622	my ($widget, $cb, $tooltip) = @$item;
3065		3623
3066	# handle various types of items, only text for now	3624	# handle various types of items, only text for now
3067	if (!ref $widget) {	3625	if (!ref $widget) {
3068	if ($widget =~ /\t/) {	3626	if ($widget =~ /\t/) {
3069	my ($left, $right) = split /\t/, $widget, 2;	3627	my ($left, $right) = split /\t/, $widget, 2;
3070		3628
3071	$widget = new CFClient::UI::HBox	3629	$widget = new CFPlus::UI::HBox
3072	can_hover => 1,	3630	can_hover => 1,
3073	can_events => 1,	3631	can_events => 1,
3074	tooltip => $tooltip,	3632	tooltip => $tooltip,
3075	children => [	3633	children => [
3076	(new CFClient::UI::Label markup => $left, expand => 1),	3634	(new CFPlus::UI::Label markup => $left, expand => 1),
3077	(new CFClient::UI::Label markup => $right, align => +1),	3635	(new CFPlus::UI::Label markup => $right, align => +1),
3078	],	3636	],
3079	;	3637	;
3080		3638
3081	} else {	3639	} else {
3082	$widget = new CFClient::UI::Label	3640	$widget = new CFPlus::UI::Label
3083	can_hover => 1,	3641	can_hover => 1,
3084	can_events => 1,	3642	can_events => 1,
3085	markup => $widget,	3643	markup => $widget,
3086	tooltip => $tooltip;	3644	tooltip => $tooltip;
3087	}	3645	}
…		…
3135	1	3693	1
3136	}	3694	}
3137		3695
3138	#############################################################################	3696	#############################################################################
3139		3697
3140	package CFClient::UI::Multiplexer;	3698	package CFPlus::UI::Multiplexer;
3141		3699
3142	our @ISA = CFClient::UI::Container::;	3700	our @ISA = CFPlus::UI::Container::;
3143		3701
3144	sub new {	3702	sub new {
3145	my $class = shift;	3703	my $class = shift;
3146		3704
3147	my $self = $class->SUPER::new (	3705	my $self = $class->SUPER::new (
…		…
3208	$self->{current}->draw;	3766	$self->{current}->draw;
3209	}	3767	}
3210		3768
3211	#############################################################################	3769	#############################################################################
3212		3770
3213	package CFClient::UI::Notebook;	3771	package CFPlus::UI::Notebook;
3214		3772
3215	our @ISA = CFClient::UI::VBox::;	3773	our @ISA = CFPlus::UI::VBox::;
3216		3774
3217	sub new {	3775	sub new {
3218	my $class = shift;	3776	my $class = shift;
3219		3777
3220	my $self = $class->SUPER::new (	3778	my $self = $class->SUPER::new (
3221	buttonbar => (new CFClient::UI::Buttonbar),	3779	buttonbar => (new CFPlus::UI::Buttonbar),
3222	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3780	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3223	# filter => # will be put between multiplexer and $self	3781	# filter => # will be put between multiplexer and $self
3224	@_,	3782	@_,
3225	);	3783	);
3226		3784
3227	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3785	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3231	}	3789	}
3232		3790
3233	sub add {	3791	sub add {
3234	my ($self, $title, $widget, $tooltip) = @_;	3792	my ($self, $title, $widget, $tooltip) = @_;
3235		3793
3236	Scalar::Util::weaken $self;	3794	CFPlus::weaken $self;
3237		3795
3238	$self->{buttonbar}->add (new CFClient::UI::Button	3796	$self->{buttonbar}->add (new CFPlus::UI::Button
3239	markup => $title,	3797	markup => $title,
3240	tooltip => $tooltip,	3798	tooltip => $tooltip,
3241	on_activate => sub { $self->set_current_page ($widget) },	3799	on_activate => sub { $self->set_current_page ($widget) },
3242	);	3800	);
3243		3801
…		…
3257	$self->emit (page_changed => $self->{multiplexer}{current});	3815	$self->emit (page_changed => $self->{multiplexer}{current});
3258	}	3816	}
3259		3817
3260	#############################################################################	3818	#############################################################################
3261		3819
3262	package CFClient::UI::Combobox;	3820	package CFPlus::UI::Selector;
3263		3821
3264	use utf8;	3822	use utf8;
3265		3823
3266	our @ISA = CFClient::UI::Button::;	3824	our @ISA = CFPlus::UI::Button::;
3267		3825
3268	sub new {	3826	sub new {
3269	my $class = shift;	3827	my $class = shift;
3270		3828
3271	my $self = $class->SUPER::new (	3829	my $self = $class->SUPER::new (
…		…
3288	my ($value, $title, $tooltip) = @$_;	3846	my ($value, $title, $tooltip) = @$_;
3289		3847
3290	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3848	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3291	}	3849	}
3292		3850
3293	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3851	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3294	}	3852	}
3295		3853
3296	sub _set_value {	3854	sub _set_value {
3297	my ($self, $value) = @_;	3855	my ($self, $value) = @_;
3298		3856
…		…
3313	$self->emit (changed => $value);	3871	$self->emit (changed => $value);
3314	}	3872	}
3315		3873
3316	#############################################################################	3874	#############################################################################
3317		3875
3318	package CFClient::UI::Statusbox;	3876	package CFPlus::UI::Statusbox;
3319		3877
3320	our @ISA = CFClient::UI::VBox::;	3878	our @ISA = CFPlus::UI::VBox::;
3321		3879
3322	sub new {	3880	sub new {
3323	my $class = shift;	3881	my $class = shift;
3324		3882
3325	my $self = $class->SUPER::new (	3883	my $self = $class->SUPER::new (
3326	fontsize => 0.8,	3884	fontsize => 0.8,
3327	@_,	3885	@_,
3328	);	3886	);
3329		3887
3330	Scalar::Util::weaken (my $this = $self);	3888	CFPlus::weaken (my $this = $self);
3331		3889
3332	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3890	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3333		3891
3334	$self	3892	$self
3335	}	3893	}
…		…
3337	sub reorder {	3895	sub reorder {
3338	my ($self) = @_;	3896	my ($self) = @_;
3339	my $NOW = Time::HiRes::time;	3897	my $NOW = Time::HiRes::time;
3340		3898
3341	# freeze display when hovering over any label	3899	# freeze display when hovering over any label
3342	return if $CFClient::UI::TOOLTIP->{owner}	3900	return if $CFPlus::UI::TOOLTIP->{owner}
3343	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3901	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3344	values %{ $self->{item} };	3902	values %{ $self->{item} };
3345		3903
3346	while (my ($k, $v) = each %{ $self->{item} }) {	3904	while (my ($k, $v) = each %{ $self->{item} }) {
3347	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3905	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3348	}	3906	}
…		…
3369	for ($short) {	3927	for ($short) {
3370	s/^\s+//;	3928	s/^\s+//;
3371	s/\s+/ /g;	3929	s/\s+/ /g;
3372	}	3930	}
3373		3931
3374	new CFClient::UI::Label	3932	new CFPlus::UI::Label
3375	markup => $short,	3933	markup => $short,
3376	tooltip => $item->{tooltip},	3934	tooltip => $item->{tooltip},
3377	tooltip_font => $::FONT_PROP,	3935	tooltip_font => $::FONT_PROP,
3378	tooltip_width => 0.67,	3936	tooltip_width => 0.67,
3379	fontsize => $item->{fontsize} || $self->{fontsize},	3937	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3458	$self->SUPER::destroy;	4016	$self->SUPER::destroy;
3459	}	4017	}
3460		4018
3461	#############################################################################	4019	#############################################################################
3462		4020
3463	package CFClient::UI::Inventory;
3464
3465	our @ISA = CFClient::UI::Table::;
3466
3467	sub new {
3468	my $class = shift;
3469
3470	my $self = $class->SUPER::new (
3471	col_expand => [0, 1, 0],
3472	@_,
3473	);
3474
3475	$self
3476	}
3477
3478	sub set_items {
3479	my ($self, $items) = @_;
3480
3481	$self->clear;
3482	return unless $items;
3483
3484	my @items = sort {
3485	($a->{type} <=> $b->{type})
3486	or ($a->{name} cmp $b->{name})
3487	} values %$items;
3488
3489	$self->{real_items} = \@items;
3490
3491	my $row = 0;
3492	for my $item (@items) {
3493	CFClient::Item::update_widgets $item;
3494
3495	$self->add (0, $row, $item->{face_widget});
3496	$self->add (1, $row, $item->{desc_widget});
3497	$self->add (2, $row, $item->{weight_widget});
3498
3499	$row++;
3500	}
3501	}
3502
3503	#############################################################################
3504
3505	package CFClient::UI::SpellList;
3506
3507	our @ISA = CFClient::UI::Table::;
3508
3509	sub new {
3510	my $class = shift;
3511
3512	my $self = $class->SUPER::new (
3513	binding => [],
3514	commands => [],
3515	@_,
3516	)
3517	}
3518
3519	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3520
3521	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3522	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3523	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3525	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3526	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3527	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3529	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3531
3532	sub rebuild_spell_list {
3533	my ($self) = @_;
3534
3535	$CFClient::UI::ROOT->on_refresh ($self => sub {
3536	$self->clear;
3537
3538	return unless $::CONN;
3539
3540	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3541	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3542	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3543	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3544	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3545
3546	my $row = 0;
3547
3548	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3549	my $spell = $self->{spell}{$_};
3550
3551	$row++;
3552
3553	my $spell_cb = sub {
3554	my ($widget, $ev) = @_;
3555
3556	if ($ev->{button} == 1) {
3557	$::CONN->user_send ("cast $spell->{name}");
3558	} elsif ($ev->{button} == 2) {
3559	$::CONN->user_send ("invoke $spell->{name}");
3560	} elsif ($ev->{button} == 3) {
3561	(new CFClient::UI::Menu
3562	items => [
3563	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3564	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3565	],
3566	)->popup ($ev);
3567	} else {
3568	return 0;
3569	}
3570
3571	1
3572	};
3573
3574	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3575
3576	#TODO: add path info to tooltip
3577	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3578
3579	$self->add (0, $row, new CFClient::UI::Face
3580	face => $spell->{face},
3581	can_hover => 1,
3582	can_events => 1,
3583	tooltip => $tooltip,
3584	on_button_down => $spell_cb,
3585	);
3586
3587	$self->add (1, $row, new CFClient::UI::Label
3588	expand => 1,
3589	text => $spell->{name},
3590	can_hover => 1,
3591	can_events => 1,
3592	tooltip => $tooltip,
3593	on_button_down => $spell_cb,
3594	);
3595
3596	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3597	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600	}
3601	});
3602	}
3603
3604	sub add_spell {
3605	my ($self, $spell) = @_;
3606
3607	$self->{spell}->{$spell->{name}} = $spell;
3608	$self->rebuild_spell_list;
3609	}
3610
3611	sub remove_spell {
3612	my ($self, $spell) = @_;
3613
3614	delete $self->{spell}->{$spell->{name}};
3615	$self->rebuild_spell_list;
3616	}
3617
3618	sub clear_spells {
3619	my ($self) = @_;
3620
3621	$self->{spell} = {};
3622	$self->rebuild_spell_list;
3623	}
3624
3625	#############################################################################
3626
3627	package CFClient::UI::Root;	4021	package CFPlus::UI::Root;
3628		4022
3629	our @ISA = CFClient::UI::Container::;	4023	our @ISA = CFPlus::UI::Container::;
3630		4024
3631	use List::Util qw(min max);	4025	use List::Util qw(min max);
3632		4026
3633	use CFClient::OpenGL;	4027	use CFPlus::OpenGL;
3634		4028
3635	sub new {	4029	sub new {
3636	my $class = shift;	4030	my $class = shift;
3637		4031
3638	my $self = $class->SUPER::new (	4032	my $self = $class->SUPER::new (
3639	visible => 1,	4033	visible => 1,
3640	@_,	4034	@_,
3641	);	4035	);
3642		4036
3643	Scalar::Util::weaken ($self->{root} = $self);	4037	CFPlus::weaken ($self->{root} = $self);
3644		4038
3645	$self	4039	$self
3646	}	4040	}
3647		4041
3648	sub size_request {	4042	sub size_request {
…		…
3814	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4208	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3815		4209
3816	$w = 0 if $w < 0;	4210	$w = 0 if $w < 0;
3817	$h = 0 if $h < 0;	4211	$h = 0 if $h < 0;
3818		4212
		4213	$w = max $widget->{min_w}, $w;
		4214	$h = max $widget->{min_h}, $h;
		4215
		4216	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4217	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4218
		4219	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4220	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4221
3819	$w = int $w + 0.5;	4222	$w = int $w + 0.5;
3820	$h = int $h + 0.5;	4223	$h = int $h + 0.5;
3821		4224
3822	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4225	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3823	$widget->{old_w} = $widget->{w};	4226	$widget->{old_w} = $widget->{w};
…		…
3833		4236
3834	while ($self->{post_alloc_hook}) {	4237	while ($self->{post_alloc_hook}) {
3835	$_->()	4238	$_->()
3836	for values %{delete $self->{post_alloc_hook}};	4239	for values %{delete $self->{post_alloc_hook}};
3837	}	4240	}
3838
3839		4241
3840	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4242	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3841	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4243	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3842	glClear GL_COLOR_BUFFER_BIT;	4244	glClear GL_COLOR_BUFFER_BIT;
3843		4245
…		…
3846	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4248	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3847	glMatrixMode GL_MODELVIEW;	4249	glMatrixMode GL_MODELVIEW;
3848	glLoadIdentity;	4250	glLoadIdentity;
3849		4251
3850	{	4252	{
3851	package CFClient::UI::Base;	4253	package CFPlus::UI::Base;
3852		4254
3853	($draw_x, $draw_y, $draw_w, $draw_h) =	4255	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3854	(0, 0, $self->{w}, $self->{h});	4256	(0, 0, $self->{w}, $self->{h});
3855	}
3856		4257
3857	$self->_draw;	4258	$self->_draw;
		4259	}
3858	}	4260	}
3859		4261
3860	#############################################################################	4262	#############################################################################
3861		4263
3862	package CFClient::UI;	4264	package CFPlus::UI;
3863		4265
3864	$ROOT = new CFClient::UI::Root;	4266	$ROOT = new CFPlus::UI::Root;
3865	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4267	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3866		4268
3867	1	4269	1
3868		4270

Diff Legend

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