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.319 by root, Sun Jul 2 21:07:26 2006 UTC vs.
Revision 1.401 by root, Sat Jul 21 20:05:37 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	on_size_allocate => sub {
		1100	my ($vp, $w, $h) = @_;
		1101	$vp->{parent}->update_slider;
		1102	0
		1103	},
		1104	;
		1105
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1106	$self->SUPER::add ($self->{vp});
		1107
986	$self->add ($child) if $child;	1108	$self->add ($child) if $child;
987		1109
988	$self	1110	$self
989	}	1111	}
990
991	#TODO# update range on size_allocate depending on child
992		1112
993	sub add {	1113	sub add {
994	my ($self, $widget) = @_;	1114	my ($self, $widget) = @_;
995		1115
996	$self->{vp}->add ($self->{child} = $widget);	1116	$self->{vp}->add ($self->{child} = $widget);
997	}	1117	}
998		1118
999	sub update_slider {	1119	sub update_slider {
1000	my ($self) = @_;	1120	my ($self) = @_;
1001		1121
		1122	my $child = ($self->{vp} or return)->child;
		1123
		1124	if ($self->{scroll_x}) {
		1125	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1126	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1003	}
1004		1127
1005	sub update {	1128	my $visible = $w1 > $w2;
		1129	if ($visible != $self->{hslider_visible}) {
		1130	$self->{hslider_visible} = $visible;
		1131	$visible ? $self->SUPER::add ($self->{hslider})
		1132	: $self->SUPER::remove ($self->{hslider});
		1133	}
		1134	}
		1135
		1136	if ($self->{scroll_y}) {
		1137	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1138	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1139
		1140	my $visible = $h1 > $h2;
		1141	if ($visible != $self->{vslider_visible}) {
		1142	$self->{vslider_visible} = $visible;
		1143	$visible ? $self->SUPER::add ($self->{vslider})
		1144	: $self->SUPER::remove ($self->{vslider});
		1145	}
		1146	}
		1147	}
		1148
		1149	sub start_dragging {
1006	my ($self) = @_;	1150	my ($self, $ev) = @_;
1007		1151
1008	$self->SUPER::update;	1152	$self->grab_focus;
1009		1153
1010	$self->update_slider;	1154	my $ox = $self->{vp}{view_x};
		1155	my $oy = $self->{vp}{view_y};
		1156
		1157	$self->{motion} = sub {
		1158	my ($ev, $x, $y) = @_;
		1159
		1160	$ox -= $ev->{xrel};
		1161	$oy -= $ev->{yrel};
		1162
		1163	$self->{vp}->set_offset ($ox, $oy);
		1164	};
		1165	}
		1166
		1167	sub invoke_mouse_wheel {
		1168	my ($self, $ev) = @_;
		1169
		1170	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1171	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1172
		1173	1
		1174	}
		1175
		1176	sub invoke_button_down {
		1177	my ($self, $ev, $x, $y) = @_;
		1178
		1179	if ($ev->{button} == 2) {
		1180	$self->start_dragging ($ev);
		1181	return 1;
		1182	}
		1183
		1184	0
		1185	}
		1186
		1187	sub invoke_button_up {
		1188	my ($self, $ev, $x, $y) = @_;
		1189
		1190	if (delete $self->{motion}) {
		1191	return 1;
		1192	}
		1193
		1194	0
		1195	}
		1196
		1197	sub invoke_mouse_motion {
		1198	my ($self, $ev, $x, $y) = @_;
		1199
		1200	if ($self->{motion}) {
		1201	$self->{motion}->($ev, $x, $y);
		1202	return 1;
		1203	}
		1204
		1205	0
1011	}	1206	}
1012		1207
1013	sub invoke_size_allocate {	1208	sub invoke_size_allocate {
1014	my ($self, $w, $h) = @_;	1209	my ($self, $w, $h) = @_;
1015		1210
1016	$self->update_slider;	1211	$self->update_slider;
1017
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1212	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1213	}
1020		1214
1021	#############################################################################	1215	#############################################################################
1022		1216
1023	package CFClient::UI::Frame;	1217	package CFPlus::UI::Frame;
1024		1218
1025	our @ISA = CFClient::UI::Bin::;	1219	our @ISA = CFPlus::UI::Bin::;
1026		1220
1027	use CFClient::OpenGL;	1221	use CFPlus::OpenGL;
1028		1222
1029	sub new {	1223	sub new {
1030	my $class = shift;	1224	my $class = shift;
1031		1225
1032	$class->SUPER::new (	1226	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1252	$self->SUPER::_draw;
1059	}	1253	}
1060		1254
1061	#############################################################################	1255	#############################################################################
1062		1256
1063	package CFClient::UI::FancyFrame;	1257	package CFPlus::UI::FancyFrame;
1064		1258
1065	our @ISA = CFClient::UI::Bin::;	1259	our @ISA = CFPlus::UI::Bin::;
1066		1260
1067	use CFClient::OpenGL;	1261	use CFPlus::OpenGL;
		1262
		1263	sub new {
		1264	my ($class, %arg) = @_;
		1265
		1266	if ((exists $arg{label}) && !ref $arg{label}) {
		1267	$arg{label} = new CFPlus::UI::Label
		1268	align => 1,
		1269	valign => 0,
		1270	text => $arg{label},
		1271	fontsize => ($arg{border} || 0.8) * 0.75;
		1272	}
		1273
		1274	my $self = $class->SUPER::new (
		1275	# label => "",
		1276	fg => [0.6, 0.3, 0.1],
		1277	border => 0.8,
		1278	style => 'single',
		1279	%arg,
		1280	);
		1281
		1282	$self
		1283	}
		1284
		1285	sub add {
		1286	my ($self, @widgets) = @_;
		1287
		1288	$self->SUPER::add (@widgets);
		1289	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1290	}
		1291
		1292	sub border {
		1293	int $_[0]{border} * $::FONTSIZE
		1294	}
		1295
		1296	sub size_request {
		1297	my ($self) = @_;
		1298
		1299	($self->{label_w}, undef) = $self->{label}->size_request
		1300	if $self->{label};
		1301
		1302	my ($w, $h) = $self->SUPER::size_request;
		1303
		1304	(
		1305	$w + $self->border * 2,
		1306	$h + $self->border * 2,
		1307	)
		1308	}
		1309
		1310	sub invoke_size_allocate {
		1311	my ($self, $w, $h) = @_;
		1312
		1313	my $border = $self->border;
		1314
		1315	$w -= List::Util::max 0, $border * 2;
		1316	$h -= List::Util::max 0, $border * 2;
		1317
		1318	if (my $label = $self->{label}) {
		1319	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1320	$label->{h} = List::Util::min $h, $border;
		1321	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1322	}
		1323
		1324	$self->child->configure ($border, $border, $w, $h);
		1325
		1326	1
		1327	}
		1328
		1329	sub _draw {
		1330	my ($self) = @_;
		1331
		1332	my $child = $self->{children}[0];
		1333
		1334	my $border = $self->border;
		1335	my ($w, $h) = ($self->{w}, $self->{h});
		1336
		1337	$child->draw;
		1338
		1339	glColor @{$self->{fg}};
		1340	glBegin GL_LINE_STRIP;
		1341	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1342	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1343	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1344	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1345	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1346	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1347	glEnd;
		1348
		1349	if ($self->{label}) {
		1350	glTranslate $border * 2, 0;
		1351	$self->{label}->_draw;
		1352	}
		1353	}
		1354
		1355	#############################################################################
		1356
		1357	package CFPlus::UI::Toplevel;
		1358
		1359	our @ISA = CFPlus::UI::Bin::;
		1360
		1361	use CFPlus::OpenGL;
1068		1362
1069	my $bg =	1363	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1364	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1365	mipmap => 1, wrap => 1;
1072		1366
1073	my @border =	1367	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1368	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);	1369	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1370
		1371	my @icon =
		1372	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1373	qw(x1_move.png x1_resize.png);
1076		1374
1077	sub new {	1375	sub new {
1078	my ($class, %arg) = @_;	1376	my ($class, %arg) = @_;
1079		1377
1080	my $self = $class->SUPER::new (	1378	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1379	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1380	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1381	border => 0.6,
1084	can_events => 1,	1382	can_events => 1,
1085	min_w => 16,	1383	min_w => 64,
1086	min_h => 16,	1384	min_h => 32,
1087	%arg,	1385	%arg,
1088	);	1386	);
1089		1387
1090	$self->{title_widget} = new CFClient::UI::Label	1388	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1389	align => 0,
1092	valign => 1,	1390	valign => 1,
1093	text => $self->{title},	1391	text => $self->{title},
1094	fontsize => $self->{border},	1392	fontsize => $self->{border},
1095	if exists $self->{title};	1393	if exists $self->{title};
1096		1394
1097	if ($self->{has_close_button}) {	1395	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1396	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1397	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1398	path => 'x1_close.png',
1101	on_activate => sub { $self->emit ("delete") };	1399	on_activate => sub { $self->emit ("delete") };
1102		1400
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1401	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1402	}
1105		1403
1106	$self	1404	$self
1107	}	1405	}
1108		1406
1109	sub add {	1407	sub add {
1110	my ($self, @widgets) = @_;	1408	my ($self, @widgets) = @_;
1111		1409
1112	$self->SUPER::add (@widgets);	1410	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1411	$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};	1412	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1413	}
1116		1414
1117	sub border {	1415	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1416	int $_[0]{border} * $::FONTSIZE
1119	}	1417	}
…		…
1227	$self->{motion}->($ev, $x, $y) if $self->{motion};	1525	$self->{motion}->($ev, $x, $y) if $self->{motion};
1228		1526
1229	! ! $self->{motion}	1527	! ! $self->{motion}
1230	}	1528	}
1231		1529
		1530	sub invoke_visibility_change {
		1531	my ($self, $visible) = @_;
		1532
		1533	delete $self->{motion} unless $visible;
		1534
		1535	0
		1536	}
		1537
1232	sub _draw {	1538	sub _draw {
1233	my ($self) = @_;	1539	my ($self) = @_;
1234		1540
1235	my $child = $self->{children}[0];	1541	my $child = $self->{children}[0];
1236		1542
…		…
1241	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1242		1548
1243	my $border = $self->border;	1549	my $border = $self->border;
1244		1550
1245	glColor @{ $self->{border_bg} };	1551	glColor @{ $self->{border_bg} };
1246	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1552	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1247	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1553	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1248	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1554	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1249	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1555	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1556
		1557	# move
		1558	my $w2 = ($w - $border) * .5;
		1559	my $h2 = ($h - $border) * .5;
		1560	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1561	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1562	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1563
		1564	# resize
		1565	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1566	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1567	unless $self->{has_close_button};
		1568	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1569	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1250		1570
1251	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1571	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1252	glColor @{ $self->{bg} };	1572	glColor @{ $self->{bg} };
1253		1573
1254	# TODO: repeat texture not scale	1574	# TODO: repeat texture not scale
…		…
1273	if $self->{close_button};	1593	if $self->{close_button};
1274	}	1594	}
1275		1595
1276	#############################################################################	1596	#############################################################################
1277		1597
1278	package CFClient::UI::Table;	1598	package CFPlus::UI::Table;
1279		1599
1280	our @ISA = CFClient::UI::Base::;	1600	our @ISA = CFPlus::UI::Container::;
1281		1601
1282	use List::Util qw(max sum);	1602	use List::Util qw(max sum);
1283		1603
1284	use CFClient::OpenGL;	1604	use CFPlus::OpenGL;
1285		1605
1286	sub new {	1606	sub new {
1287	my $class = shift;	1607	my $class = shift;
1288		1608
1289	$class->SUPER::new (	1609	$class->SUPER::new (
1290	col_expand => [],	1610	col_expand => [],
		1611	row_expand => [],
1291	@_,	1612	@_,
1292	)	1613	)
1293	}	1614	}
1294		1615
1295	sub children {
1296	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297	}
1298
1299	sub add {	1616	sub add {
1300	my ($self, $x, $y, $child) = @_;	1617	my ($self, @widgets) = @_;
1301		1618
1302	$child->set_parent ($self);	1619	for my $child (@widgets) {
1303	$self->{children}[$y][$x] = $child;	1620	$child->{rowspan} ||= 1;
		1621	$child->{colspan} ||= 1;
		1622	}
1304		1623
1305	$self->realloc;	1624	$self->SUPER::add (@widgets);
1306	}	1625	}
1307		1626
1308	sub remove {	1627	sub add_at {
		1628	my $self = shift;
		1629
		1630	my @widgets;
		1631
		1632	while (@_) {
		1633	my ($col, $row, $child) = splice @_, 0, 3, ();
		1634
		1635	$child->{row} = $row;
		1636	$child->{col} = $col;
		1637
		1638	push @widgets, $child;
		1639	}
		1640
		1641	$self->add (@widgets);
		1642	}
		1643
		1644	sub get_wh {
1309	my ($self, $child) = @_;	1645	my ($self) = @_;
1310		1646
1311	# TODO: not yet implemented	1647	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		1648
1318	my @children = $self->children;	1649	my @children = $self->children;
1319	delete $self->{children};	1650
		1651	# first pass, columns
		1652	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1653	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1654
		1655	my $sw = sum @w[$c .. $c + $cs - 1];
		1656
		1657	if ($w > $sw) {
		1658	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1659	}
1320		1660	}
1321	for (@children) {
1322	delete $_->{parent};
1323	$_->hide;
1324	}
1325		1661
1326	$self->realloc;	1662	# second pass, rows
1327	}	1663	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)};	1664	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1342		1665
1343	$w[$x] = max $w[$x], $w;	1666	my $sh = sum @h[$r .. $r + $rs - 1];
1344	$h[$y] = max $h[$y], $h;	1667
		1668	if ($h > $sh) {
		1669	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1345	}	1670	}
1346	}	1671	}
1347		1672
1348	(\@w, \@h)	1673	(\@w, \@h)
1349	}	1674	}
…		…
1365	my ($ws, $hs) = $self->get_wh;	1690	my ($ws, $hs) = $self->get_wh;
1366		1691
1367	my $req_w = (sum @$ws) || 1;	1692	my $req_w = (sum @$ws) || 1;
1368	my $req_h = (sum @$hs) || 1;	1693	my $req_h = (sum @$hs) || 1;
1369		1694
1370	# TODO: nicer code && do row_expand	1695	# now linearly scale the rows/columns to the allocated size
1371	my @col_expand = @{$self->{col_expand}};	1696	my @col_expand = @{$self->{col_expand}};
1372	@col_expand = (1) x @$ws unless @col_expand;	1697	@col_expand = (1) x @$ws unless @col_expand;
1373	my $col_expand = (sum @col_expand) || 1;	1698	my $col_expand = (sum @col_expand) || 1;
1374		1699
1375	# linearly scale sizes
1376	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1700	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378		1701
1379	CFClient::UI::harmonize $ws;	1702	CFPlus::UI::harmonize $ws;
		1703
		1704	my @row_expand = @{$self->{row_expand}};
		1705	@row_expand = (1) x @$ws unless @row_expand;
		1706	my $row_expand = (sum @row_expand) || 1;
		1707
		1708	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1709
1380	CFClient::UI::harmonize $hs;	1710	CFPlus::UI::harmonize $hs;
1381		1711
1382	my $y;	1712	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1713	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1383		1714
1384	for my $r (0 .. $#{$self->{children}}) {	1715	for my $widget ($self->children) {
1385	my $row = $self->{children}[$r]	1716	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1386	or next;
1387		1717
1388	my $x = 0;	1718	$widget->configure (
1389	my $row_h = $hs->[$r];	1719	$x[$c], $y[$r],
		1720	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1390		1721	);
1391	for my $c (0 .. $#$row) {	1722	}
1392	my $col_w = $ws->[$c];
1393		1723
1394	if (my $widget = $row->[$c]) {	1724	1
1395	$widget->configure ($x, $y, $col_w, $row_h);	1725	}
1396	}
1397		1726
1398	$x += $col_w;	1727	#############################################################################
		1728
		1729	package CFPlus::UI::Fixed;
		1730
		1731	use List::Util qw(min max);
		1732
		1733	our @ISA = CFPlus::UI::Container::;
		1734
		1735	sub add_fixed {
		1736	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1737
		1738	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1739	$self->SUPER::add ($child);
		1740	}
		1741
		1742	sub _scale($$$) {
		1743	my ($mode, $val, $max) = @_;
		1744
		1745	$mode eq "abs" ? $val
		1746	: $mode eq "rel" ? $val * $max
		1747	: 0
		1748	}
		1749
		1750	sub size_request {
		1751	my ($self) = @_;
		1752
		1753	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1754
		1755	# determine overall size by querying abs widgets
		1756	for my $child ($self->visible_children) {
		1757	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1758
		1759	if ($pos eq "abs") {
		1760	$w = _scale $size, $w, $child->{req_w};
		1761	$h = _scale $size, $h, $child->{req_h};
		1762
		1763	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1764	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1399	}	1765	}
		1766	}
1400		1767
1401	$y += $row_h;	1768	my $W = $x2 - $x1;
		1769	my $H = $y2 - $y1;
		1770
		1771	# now layout remaining widgets
		1772	for my $child ($self->visible_children) {
		1773	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1774
		1775	if ($pos ne "abs") {
		1776	$x = _scale $pos, $x, $W;
		1777	$y = _scale $pos, $x, $H;
		1778	$w = _scale $size, $w, $child->{req_w};
		1779	$h = _scale $size, $h, $child->{req_h};
		1780
		1781	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1782	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1783	}
		1784	}
		1785
		1786	my $W = $x2 - $x1;
		1787	my $H = $y2 - $y1;
		1788
		1789	($W, $H)
		1790	}
		1791
		1792	sub invoke_size_allocate {
		1793	my ($self, $W, $H) = @_;
		1794
		1795	for my $child ($self->visible_children) {
		1796	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1797
		1798	$x = _scale $pos, $x, $W;
		1799	$y = _scale $pos, $x, $H;
		1800	$w = _scale $size, $w, $child->{req_w};
		1801	$h = _scale $size, $h, $child->{req_h};
		1802
		1803	$child->configure ($x, $y, $w, $h);
1402	}	1804	}
1403		1805
1404	1	1806	1
1405	}	1807	}
1406		1808
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	#############################################################################	1809	#############################################################################
1432		1810
1433	package CFClient::UI::Box;	1811	package CFPlus::UI::Box;
1434		1812
1435	our @ISA = CFClient::UI::Container::;	1813	our @ISA = CFPlus::UI::Container::;
1436		1814
1437	sub size_request {	1815	sub size_request {
1438	my ($self) = @_;	1816	my ($self) = @_;
1439		1817
1440	$self->{vertical}	1818	$self->{vertical}
…		…
1473	$req[$_] += $space * $children[$_]{expand}	1851	$req[$_] += $space * $children[$_]{expand}
1474	for 0 .. $#children;	1852	for 0 .. $#children;
1475	}	1853	}
1476	}	1854	}
1477		1855
1478	CFClient::UI::harmonize \@req;	1856	CFPlus::UI::harmonize \@req;
1479		1857
1480	my $pos = 0;	1858	my $pos = 0;
1481	for (0 .. $#children) {	1859	for (0 .. $#children) {
1482	my $alloc = $req[$_];	1860	my $alloc = $req[$_];
1483	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1861	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1488	1	1866	1
1489	}	1867	}
1490		1868
1491	#############################################################################	1869	#############################################################################
1492		1870
1493	package CFClient::UI::HBox;	1871	package CFPlus::UI::HBox;
1494		1872
1495	our @ISA = CFClient::UI::Box::;	1873	our @ISA = CFPlus::UI::Box::;
1496		1874
1497	sub new {	1875	sub new {
1498	my $class = shift;	1876	my $class = shift;
1499		1877
1500	$class->SUPER::new (	1878	$class->SUPER::new (
…		…
1503	)	1881	)
1504	}	1882	}
1505		1883
1506	#############################################################################	1884	#############################################################################
1507		1885
1508	package CFClient::UI::VBox;	1886	package CFPlus::UI::VBox;
1509		1887
1510	our @ISA = CFClient::UI::Box::;	1888	our @ISA = CFPlus::UI::Box::;
1511		1889
1512	sub new {	1890	sub new {
1513	my $class = shift;	1891	my $class = shift;
1514		1892
1515	$class->SUPER::new (	1893	$class->SUPER::new (
…		…
1518	)	1896	)
1519	}	1897	}
1520		1898
1521	#############################################################################	1899	#############################################################################
1522		1900
1523	package CFClient::UI::Label;	1901	package CFPlus::UI::Label;
1524		1902
1525	our @ISA = CFClient::UI::DrawBG::;	1903	our @ISA = CFPlus::UI::DrawBG::;
1526		1904
1527	use CFClient::OpenGL;	1905	use CFPlus::OpenGL;
1528		1906
1529	sub new {	1907	sub new {
1530	my ($class, %arg) = @_;	1908	my ($class, %arg) = @_;
1531		1909
1532	my $self = $class->SUPER::new (	1910	my $self = $class->SUPER::new (
…		…
1535	#active_bg => none	1913	#active_bg => none
1536	#font => default_font	1914	#font => default_font
1537	#text => initial text	1915	#text => initial text
1538	#markup => initial narkup	1916	#markup => initial narkup
1539	#max_w => maximum pixel width	1917	#max_w => maximum pixel width
		1918	#style => 0, # render flags
1540	ellipsise => 3, # end	1919	ellipsise => 3, # end
1541	layout => (new CFClient::Layout),	1920	layout => (new CFPlus::Layout),
1542	fontsize => 1,	1921	fontsize => 1,
1543	align => -1,	1922	align => -1,
1544	valign => -1,	1923	valign => -1,
1545	padding_x => 2,	1924	padding_x => 2,
1546	padding_y => 2,	1925	padding_y => 2,
1547	can_events => 0,	1926	can_events => 0,
1548	%arg	1927	%arg
1549	);	1928	);
1550		1929
1551	if (exists $self->{template}) {	1930	if (exists $self->{template}) {
1552	my $layout = new CFClient::Layout;	1931	my $layout = new CFPlus::Layout;
1553	$layout->set_text (delete $self->{template});	1932	$layout->set_text (delete $self->{template});
1554	$self->{template} = $layout;	1933	$self->{template} = $layout;
1555	}	1934	}
1556		1935
1557	if (exists $self->{markup}) {	1936	if (exists $self->{markup}) {
…		…
1561	}	1940	}
1562		1941
1563	$self	1942	$self
1564	}	1943	}
1565		1944
1566	sub escape($) {
1567	local $_ = $_[0];
1568
1569	s/&/&amp;/g;
1570	s/>/&gt;/g;
1571	s/</&lt;/g;
1572
1573	$_
1574	}
1575
1576	sub update {	1945	sub update {
1577	my ($self) = @_;	1946	my ($self) = @_;
1578		1947
1579	delete $self->{texture};	1948	delete $self->{texture};
1580	$self->SUPER::update;	1949	$self->SUPER::update;
…		…
1591	my ($self, $text) = @_;	1960	my ($self, $text) = @_;
1592		1961
1593	return if $self->{text} eq "T$text";	1962	return if $self->{text} eq "T$text";
1594	$self->{text} = "T$text";	1963	$self->{text} = "T$text";
1595		1964
1596	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597	$self->{layout}->set_text ($text);	1965	$self->{layout}->set_text ($text);
1598		1966
1599	delete $self->{size_req};	1967	delete $self->{size_req};
1600	$self->realloc;	1968	$self->realloc;
1601	$self->update;	1969	$self->update;
…		…
1607	return if $self->{text} eq "M$markup";	1975	return if $self->{text} eq "M$markup";
1608	$self->{text} = "M$markup";	1976	$self->{text} = "M$markup";
1609		1977
1610	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1978	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611		1979
1612	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613	$self->{layout}->set_markup ($markup);	1980	$self->{layout}->set_markup ($markup);
1614		1981
1615	delete $self->{size_req};	1982	delete $self->{size_req};
1616	$self->realloc;	1983	$self->realloc;
1617	$self->update;	1984	$self->update;
…		…
1629		1996
1630	my ($w, $h) = $self->{layout}->size;	1997	my ($w, $h) = $self->{layout}->size;
1631		1998
1632	if (exists $self->{template}) {	1999	if (exists $self->{template}) {
1633	$self->{template}->set_font ($self->{font}) if $self->{font};	2000	$self->{template}->set_font ($self->{font}) if $self->{font};
		2001	$self->{template}->set_width ($self->{max_w} || -1);
1634	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2002	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635		2003
1636	my ($w2, $h2) = $self->{template}->size;	2004	my ($w2, $h2) = $self->{template}->size;
1637		2005
1638	$w = List::Util::max $w, $w2;	2006	$w = List::Util::max $w, $w2;
…		…
1672		2040
1673	sub reconfigure {	2041	sub reconfigure {
1674	my ($self) = @_;	2042	my ($self) = @_;
1675		2043
1676	delete $self->{size_req};	2044	delete $self->{size_req};
		2045	delete $self->{texture};
1677		2046
1678	$self->SUPER::reconfigure;	2047	$self->SUPER::reconfigure;
1679	}	2048	}
1680		2049
1681	sub _draw {	2050	sub _draw {
1682	my ($self) = @_;	2051	my ($self) = @_;
1683		2052
1684	$self->SUPER::_draw; # draw background, if applicable	2053	$self->SUPER::_draw; # draw background, if applicable
1685		2054
1686	my $tex = $self->{texture} ||= do {	2055	my $size = $self->{texture} ||= do {
1687	$self->{layout}->set_foreground (@{$self->{fg}});	2056	$self->{layout}->set_foreground (@{$self->{fg}});
1688	$self->{layout}->set_font ($self->{font}) if $self->{font};	2057	$self->{layout}->set_font ($self->{font}) if $self->{font};
1689	$self->{layout}->set_width ($self->{w});	2058	$self->{layout}->set_width ($self->{w});
1690	$self->{layout}->set_ellipsise ($self->{ellipsise});	2059	$self->{layout}->set_ellipsise ($self->{ellipsise});
1691	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2060	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2061	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693		2062
1694	new_from_layout CFClient::Texture $self->{layout}	2063	[$self->{layout}->size]
1695	};	2064	};
1696		2065
1697	unless (exists $self->{ox}) {	2066	unless (exists $self->{ox}) {
1698	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2067	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2068	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700	: ($self->{w} - $tex->{w}) * 0.5);	2069	: ($self->{w} - $size->[0]) * 0.5);
1701		2070
1702	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2071	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2072	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704	: ($self->{h} - $tex->{h}) * 0.5);	2073	: ($self->{h} - $size->[1]) * 0.5);
1705	};	2074	};
1706		2075
1707	glEnable GL_TEXTURE_2D;
1708
1709	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2076	my $w = List::Util::min $self->{w} + 4, $size->[0];
1710	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2077	my $h = List::Util::min $self->{h} + 2, $size->[1];
1711		2078
1712	if ($tex->{format} == GL_ALPHA) {	2079	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714	glColor @{$self->{fg}};
1715	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716	} else {
1717	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1718	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719	}
1720
1721	glDisable GL_TEXTURE_2D;
1722	}	2080	}
1723		2081
1724	#############################################################################	2082	#############################################################################
1725		2083
1726	package CFClient::UI::EntryBase;	2084	package CFPlus::UI::EntryBase;
1727		2085
1728	our @ISA = CFClient::UI::Label::;	2086	our @ISA = CFPlus::UI::Label::;
1729		2087
1730	use CFClient::OpenGL;	2088	use CFPlus::OpenGL;
1731		2089
1732	sub new {	2090	sub new {
1733	my $class = shift;	2091	my $class = shift;
1734		2092
1735	$class->SUPER::new (	2093	$class->SUPER::new (
…		…
1739	active_fg => [0, 0, 0],	2097	active_fg => [0, 0, 0],
1740	can_hover => 1,	2098	can_hover => 1,
1741	can_focus => 1,	2099	can_focus => 1,
1742	valign => 0,	2100	valign => 0,
1743	can_events => 1,	2101	can_events => 1,
		2102	ellipsise => 0,
1744	#text => ...	2103	#text => ...
1745	#hidden => "*",	2104	#hidden => "*",
1746	@_	2105	@_
1747	)	2106	)
1748	}	2107	}
…		…
1793	my $sym = $ev->{sym};	2152	my $sym = $ev->{sym};
1794	my $uni = $ev->{unicode};	2153	my $uni = $ev->{unicode};
1795		2154
1796	my $text = $self->get_text;	2155	my $text = $self->get_text;
1797		2156
		2157	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2158
1798	if ($uni == 8) {	2159	if ($uni == 8) {
1799	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2160	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1800	} elsif ($uni == 127) {	2161	} elsif ($uni == 127) {
1801	substr $text, $self->{cursor}, 1, "";	2162	substr $text, $self->{cursor}, 1, "";
1802	} elsif ($sym == CFClient::SDLK_LEFT) {	2163	} elsif ($sym == CFPlus::SDLK_LEFT) {
1803	--$self->{cursor} if $self->{cursor};	2164	--$self->{cursor} if $self->{cursor};
1804	} elsif ($sym == CFClient::SDLK_RIGHT) {	2165	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1805	++$self->{cursor} if $self->{cursor} < length $self->{text};	2166	++$self->{cursor} if $self->{cursor} < length $self->{text};
1806	} elsif ($sym == CFClient::SDLK_HOME) {	2167	} elsif ($sym == CFPlus::SDLK_HOME) {
		2168	# what a hack
		2169	$self->{cursor} =
		2170	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2171	? length $1
		2172	: 0;
		2173	} elsif ($sym == CFPlus::SDLK_END) {
		2174	# uh, again
		2175	$self->{cursor} =
		2176	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2177	? $self->{cursor} + length $1
		2178	: length $self->{text};
		2179	} elsif ($uni == 21) { # ctrl-u
		2180	$text = "";
1807	$self->{cursor} = 0;	2181	$self->{cursor} = 0;
1808	} elsif ($sym == CFClient::SDLK_END) {
1809	$self->{cursor} = length $text;
1810	} elsif ($uni == 27) {	2182	} elsif ($uni == 27) {
1811	$self->emit ('escape');	2183	$self->emit ('escape');
1812	} elsif ($uni) {	2184	} elsif ($uni == 0x0d) {
		2185	substr $text, $self->{cursor}++, 0, "\012";
		2186	} elsif ($uni >= 0x20) {
1813	substr $text, $self->{cursor}++, 0, chr $uni;	2187	substr $text, $self->{cursor}++, 0, chr $uni;
1814	} else {	2188	} else {
1815	return 0;	2189	return 0;
1816	}	2190	}
1817		2191
1818	$self->_set_text ($text);	2192	$self->_set_text ($text);
1819		2193
1820	$self->realloc;	2194	$self->realloc;
		2195	$self->update;
1821		2196
1822	1	2197	1
1823	}	2198	}
1824		2199
1825	sub invoke_focus_in {	2200	sub invoke_focus_in {
…		…
1837		2212
1838	my $idx = $self->{layout}->xy_to_index ($x, $y);	2213	my $idx = $self->{layout}->xy_to_index ($x, $y);
1839		2214
1840	# byte-index to char-index	2215	# byte-index to char-index
1841	my $text = $self->{text};	2216	my $text = $self->{text};
1842	utf8::encode $text;	2217	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843	$self->{cursor} = length substr $text, 0, $idx;	2218	$self->{cursor} = length $text;
1844		2219
1845	$self->_set_text ($self->{text});	2220	$self->_set_text ($self->{text});
1846	$self->update;	2221	$self->update;
1847		2222
1848	1	2223	1
…		…
1887	utf8::encode $text;	2262	utf8::encode $text;
1888		2263
1889	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2264	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1890	}	2265	}
1891		2266
1892	glColor @{$self->{fg}};
1893	glBegin GL_LINES;	2267	glBegin GL_LINES;
1894	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2268	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1895	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2269	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1896	glEnd;	2270	glEnd;
1897	}	2271	}
1898	}	2272	}
1899		2273
		2274	#############################################################################
		2275
1900	package CFClient::UI::Entry;	2276	package CFPlus::UI::Entry;
1901		2277
1902	our @ISA = CFClient::UI::EntryBase::;	2278	our @ISA = CFPlus::UI::EntryBase::;
1903		2279
1904	use CFClient::OpenGL;	2280	use CFPlus::OpenGL;
1905		2281
1906	sub invoke_key_down {	2282	sub invoke_key_down {
1907	my ($self, $ev) = @_;	2283	my ($self, $ev) = @_;
1908		2284
1909	my $sym = $ev->{sym};	2285	my $sym = $ev->{sym};
1910		2286
1911	if ($sym == 13) {	2287	if ($ev->{uni} == 0x0d || $sym == 13) {
1912	unshift @{$self->{history}},	2288	unshift @{$self->{history}},
1913	my $txt = $self->get_text;	2289	my $txt = $self->get_text;
1914		2290
1915	$self->{history_pointer} = -1;	2291	$self->{history_pointer} = -1;
1916	$self->{history_saveback} = '';	2292	$self->{history_saveback} = '';
1917	$self->emit (activate => $txt);	2293	$self->emit (activate => $txt);
1918	$self->update;	2294	$self->update;
1919		2295
1920	} elsif ($sym == CFClient::SDLK_UP) {	2296	} elsif ($sym == CFPlus::SDLK_UP) {
1921	if ($self->{history_pointer} < 0) {	2297	if ($self->{history_pointer} < 0) {
1922	$self->{history_saveback} = $self->get_text;	2298	$self->{history_saveback} = $self->get_text;
1923	}	2299	}
1924	if (@{$self->{history} || []} > 0) {	2300	if (@{$self->{history} || []} > 0) {
1925	$self->{history_pointer}++;	2301	$self->{history_pointer}++;
…		…
1927	$self->{history_pointer} = @{$self->{history} || []} - 1;	2303	$self->{history_pointer} = @{$self->{history} || []} - 1;
1928	}	2304	}
1929	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2305	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1930	}	2306	}
1931		2307
1932	} elsif ($sym == CFClient::SDLK_DOWN) {	2308	} elsif ($sym == CFPlus::SDLK_DOWN) {
1933	$self->{history_pointer}--;	2309	$self->{history_pointer}--;
1934	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2310	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1935		2311
1936	if ($self->{history_pointer} >= 0) {	2312	if ($self->{history_pointer} >= 0) {
1937	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2313	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1946	1	2322	1
1947	}	2323	}
1948		2324
1949	#############################################################################	2325	#############################################################################
1950		2326
		2327	package CFPlus::UI::TextEdit;
		2328
		2329	our @ISA = CFPlus::UI::EntryBase::;
		2330
		2331	use CFPlus::OpenGL;
		2332
		2333	sub move_cursor_ver {
		2334	my ($self, $dy) = @_;
		2335
		2336	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2337
		2338	$y += $dy;
		2339
		2340	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2341	$self->{cursor} = $index;
		2342	delete $self->{cur_h};
		2343	$self->update;
		2344	return;
		2345	}
		2346	}
		2347
		2348	sub invoke_key_down {
		2349	my ($self, $ev) = @_;
		2350
		2351	my $sym = $ev->{sym};
		2352
		2353	if ($sym == CFPlus::SDLK_UP) {
		2354	$self->move_cursor_ver (-1);
		2355	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2356	$self->move_cursor_ver (+1);
		2357	} else {
		2358	return $self->SUPER::invoke_key_down ($ev)
		2359	}
		2360
		2361	1
		2362	}
		2363
		2364	#############################################################################
		2365
1951	package CFClient::UI::Button;	2366	package CFPlus::UI::Button;
1952		2367
1953	our @ISA = CFClient::UI::Label::;	2368	our @ISA = CFPlus::UI::Label::;
1954		2369
1955	use CFClient::OpenGL;	2370	use CFPlus::OpenGL;
1956		2371
1957	my @tex =	2372	my @tex =
1958	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2373	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1959	qw(b1_button_active.png);	2374	qw(b1_button_inactive.png b1_button_active.png);
1960		2375
1961	sub new {	2376	sub new {
1962	my $class = shift;	2377	my $class = shift;
1963		2378
1964	$class->SUPER::new (	2379	$class->SUPER::new (
1965	padding_x => 4,	2380	padding_x => 4,
1966	padding_y => 4,	2381	padding_y => 4,
1967	fg => [1, 1, 1],	2382	fg => [1.0, 1.0, 1.0],
1968	active_fg => [0, 0, 1],	2383	active_fg => [0.8, 0.8, 0.8],
1969	can_hover => 1,	2384	can_hover => 1,
1970	align => 0,	2385	align => 0,
1971	valign => 0,	2386	valign => 0,
1972	can_events => 1,	2387	can_events => 1,
1973	@_	2388	@_
…		…
1991		2406
1992	glEnable GL_TEXTURE_2D;	2407	glEnable GL_TEXTURE_2D;
1993	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1994	glColor 0, 0, 0, 1;	2409	glColor 0, 0, 0, 1;
1995		2410
		2411	my $tex = $tex[$GRAB == $self];
1996	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2412	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1997		2413
1998	glDisable GL_TEXTURE_2D;	2414	glDisable GL_TEXTURE_2D;
1999		2415
2000	$self->SUPER::_draw;	2416	$self->SUPER::_draw;
2001	}	2417	}
2002		2418
2003	#############################################################################	2419	#############################################################################
2004		2420
		2421	package CFPlus::UI::CheckBox;
		2422
		2423	our @ISA = CFPlus::UI::DrawBG::;
		2424
		2425	my @tex =
		2426	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2427	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2428
		2429	use CFPlus::OpenGL;
		2430
		2431	sub new {
		2432	my $class = shift;
		2433
		2434	$class->SUPER::new (
		2435	padding_x => 2,
		2436	padding_y => 2,
		2437	fg => [1, 1, 1],
		2438	active_fg => [1, 1, 0],
		2439	bg => [0, 0, 0, 0.2],
		2440	active_bg => [1, 1, 1, 0.5],
		2441	state => 0,
		2442	can_hover => 1,
		2443	@_
		2444	)
		2445	}
		2446
		2447	sub size_request {
		2448	my ($self) = @_;
		2449
		2450	(6) x 2
		2451	}
		2452
		2453	sub toggle {
		2454	my ($self) = @_;
		2455
		2456	$self->{state} = !$self->{state};
		2457	$self->emit (changed => $self->{state});
		2458	$self->update;
		2459	}
		2460
		2461	sub invoke_button_down {
		2462	my ($self, $ev, $x, $y) = @_;
		2463
		2464	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2465	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2466	$self->toggle;
		2467	} else {
		2468	return 0
		2469	}
		2470
		2471	1
		2472	}
		2473
		2474	sub _draw {
		2475	my ($self) = @_;
		2476
		2477	$self->SUPER::_draw;
		2478
		2479	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2480
		2481	my ($w, $h) = @$self{qw(w h)};
		2482
		2483	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2484
		2485	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2486
		2487	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2488
		2489	glEnable GL_TEXTURE_2D;
		2490	$tex->draw_quad_alpha (0, 0, $s, $s);
		2491	glDisable GL_TEXTURE_2D;
		2492	}
		2493
		2494	#############################################################################
		2495
		2496	package CFPlus::UI::Image;
		2497
		2498	our @ISA = CFPlus::UI::Base::;
		2499
		2500	use CFPlus::OpenGL;
		2501
		2502	our %texture_cache;
		2503
		2504	sub new {
		2505	my $class = shift;
		2506
		2507	my $self = $class->SUPER::new (
		2508	can_events => 0,
		2509	@_,
		2510	);
		2511
		2512	$self->{path} || $self->{tex}
		2513	or Carp::croak "'path' or 'tex' attributes required";
		2514
		2515	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2516	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2517
		2518	CFPlus::weaken $texture_cache{$self->{path}};
		2519
		2520	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2521
		2522	$self
		2523	}
		2524
		2525	sub STORABLE_freeze {
		2526	my ($self, $cloning) = @_;
		2527
		2528	$self->{path}
		2529	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2530
		2531	$self->{path}
		2532	}
		2533
		2534	sub STORABLE_attach {
		2535	my ($self, $cloning, $path) = @_;
		2536
		2537	$self->new (path => $path)
		2538	}
		2539
		2540	sub size_request {
		2541	my ($self) = @_;
		2542
		2543	($self->{tex}{w}, $self->{tex}{h})
		2544	}
		2545
		2546	sub _draw {
		2547	my ($self) = @_;
		2548
		2549	my $tex = $self->{tex};
		2550
		2551	my ($w, $h) = ($self->{w}, $self->{h});
		2552
		2553	if ($self->{rot90}) {
		2554	glRotate 90, 0, 0, 1;
		2555	glTranslate 0, -$self->{w}, 0;
		2556
		2557	($w, $h) = ($h, $w);
		2558	}
		2559
		2560	glEnable GL_TEXTURE_2D;
		2561	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2562
		2563	$tex->draw_quad (0, 0, $w, $h);
		2564
		2565	glDisable GL_TEXTURE_2D;
		2566	}
		2567
		2568	#############################################################################
		2569
2005	package CFClient::UI::ImageButton;	2570	package CFPlus::UI::ImageButton;
2006		2571
2007	our @ISA = CFClient::UI::Image::;	2572	our @ISA = CFPlus::UI::Image::;
2008		2573
2009	use CFClient::OpenGL;	2574	use CFPlus::OpenGL;
2010		2575
2011	my %textures;	2576	my %textures;
2012		2577
2013	sub new {	2578	sub new {
2014	my $class = shift;	2579	my $class = shift;
…		…
2036	1	2601	1
2037	}	2602	}
2038		2603
2039	#############################################################################	2604	#############################################################################
2040		2605
2041	package CFClient::UI::CheckBox;
2042
2043	our @ISA = CFClient::UI::DrawBG::;
2044
2045	my @tex =
2046	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2047	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2048
2049	use CFClient::OpenGL;
2050
2051	sub new {
2052	my $class = shift;
2053
2054	$class->SUPER::new (
2055	padding_x => 2,
2056	padding_y => 2,
2057	fg => [1, 1, 1],
2058	active_fg => [1, 1, 0],
2059	bg => [0, 0, 0, 0.2],
2060	active_bg => [1, 1, 1, 0.5],
2061	state => 0,
2062	can_hover => 1,
2063	@_
2064	)
2065	}
2066
2067	sub size_request {
2068	my ($self) = @_;
2069
2070	(6) x 2
2071	}
2072
2073	sub toggle {
2074	my ($self) = @_;
2075
2076	$self->{state} = !$self->{state};
2077	$self->emit (changed => $self->{state});
2078	$self->update;
2079	}
2080
2081	sub invoke_button_down {
2082	my ($self, $ev, $x, $y) = @_;
2083
2084	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2085	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2086	$self->toggle;
2087	} else {
2088	return 0
2089	}
2090
2091	1
2092	}
2093
2094	sub _draw {
2095	my ($self) = @_;
2096
2097	$self->SUPER::_draw;
2098
2099	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2100
2101	my ($w, $h) = @$self{qw(w h)};
2102
2103	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2104
2105	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2106
2107	my $tex = $self->{state} ? $tex[1] : $tex[0];
2108
2109	glEnable GL_TEXTURE_2D;
2110	$tex->draw_quad_alpha (0, 0, $s, $s);
2111	glDisable GL_TEXTURE_2D;
2112	}
2113
2114	#############################################################################
2115
2116	package CFClient::UI::Image;	2606	package CFPlus::UI::VGauge;
2117		2607
2118	our @ISA = CFClient::UI::Base::;	2608	our @ISA = CFPlus::UI::Base::;
2119
2120	use CFClient::OpenGL;
2121
2122	our %texture_cache;
2123
2124	sub new {
2125	my $class = shift;
2126
2127	my $self = $class->SUPER::new (
2128	can_events => 0,
2129	@_,
2130	);
2131
2132	$self->{path}
2133	or Carp::croak "required attribute 'path' not set";
2134
2135	$self->{tex} = $texture_cache{$self->{path}} ||=
2136	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2137
2138	Scalar::Util::weaken $texture_cache{$self->{path}};
2139
2140	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2141
2142	$self
2143	}
2144
2145	sub size_request {
2146	my ($self) = @_;
2147
2148	($self->{tex}{w}, $self->{tex}{h})
2149	}
2150
2151	sub _draw {
2152	my ($self) = @_;
2153
2154	my $tex = $self->{tex};
2155
2156	my ($w, $h) = ($self->{w}, $self->{h});
2157
2158	if ($self->{rot90}) {
2159	glRotate 90, 0, 0, 1;
2160	glTranslate 0, -$self->{w}, 0;
2161
2162	($w, $h) = ($h, $w);
2163	}
2164
2165	glEnable GL_TEXTURE_2D;
2166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2167
2168	$tex->draw_quad_alpha (0, 0, $w, $h);
2169
2170	glDisable GL_TEXTURE_2D;
2171	}
2172
2173	#############################################################################
2174
2175	package CFClient::UI::VGauge;
2176
2177	our @ISA = CFClient::UI::Base::;
2178		2609
2179	use List::Util qw(min max);	2610	use List::Util qw(min max);
2180		2611
2181	use CFClient::OpenGL;	2612	use CFPlus::OpenGL;
2182		2613
2183	my %tex = (	2614	my %tex = (
2184	food => [	2615	food => [
2185	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2616	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2186	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2617	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2187	],	2618	],
2188	grace => [	2619	grace => [
2189	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2620	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2190	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2621	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2191	],	2622	],
2192	hp => [	2623	hp => [
2193	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2624	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2194	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2625	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2195	],	2626	],
2196	mana => [	2627	mana => [
2197	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2628	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2198	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2629	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2199	],	2630	],
2200	);	2631	);
2201		2632
2202	# eg. VGauge->new (gauge => 'food'), default gauge: food	2633	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2305	glDisable GL_TEXTURE_2D;	2736	glDisable GL_TEXTURE_2D;
2306	}	2737	}
2307		2738
2308	#############################################################################	2739	#############################################################################
2309		2740
2310	package CFClient::UI::Gauge;	2741	package CFPlus::UI::Gauge;
2311		2742
2312	our @ISA = CFClient::UI::VBox::;	2743	our @ISA = CFPlus::UI::VBox::;
2313		2744
2314	sub new {	2745	sub new {
2315	my ($class, %arg) = @_;	2746	my ($class, %arg) = @_;
2316		2747
2317	my $self = $class->SUPER::new (	2748	my $self = $class->SUPER::new (
…		…
2319	can_hover => 1,	2750	can_hover => 1,
2320	can_events => 1,	2751	can_events => 1,
2321	%arg,	2752	%arg,
2322	);	2753	);
2323		2754
2324	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2755	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2325	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2756	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2326	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2757	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2327		2758
2328	$self	2759	$self
2329	}	2760	}
2330		2761
2331	sub set_fontsize {	2762	sub set_fontsize {
…		…
2352	$self->{value}->set_text ($val);	2783	$self->{value}->set_text ($val);
2353	}	2784	}
2354		2785
2355	#############################################################################	2786	#############################################################################
2356		2787
2357	package CFClient::UI::Slider;	2788	package CFPlus::UI::Slider;
2358		2789
2359	use strict;	2790	use strict;
2360		2791
2361	use CFClient::OpenGL;	2792	use CFPlus::OpenGL;
2362		2793
2363	our @ISA = CFClient::UI::DrawBG::;	2794	our @ISA = CFPlus::UI::DrawBG::;
2364		2795
2365	my @tex =	2796	my @tex =
2366	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2797	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2367	qw(s1_slider.png s1_slider_bg.png);	2798	qw(s1_slider.png s1_slider_bg.png);
2368		2799
2369	sub new {	2800	sub new {
2370	my $class = shift;	2801	my $class = shift;
2371		2802
…		…
2460	}	2891	}
2461		2892
2462	1	2893	1
2463	}	2894	}
2464		2895
		2896	sub invoke_mouse_wheel {
		2897	my ($self, $ev) = @_;
		2898
		2899	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2900
		2901	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2902
		2903	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2904
		2905	! ! $delta
		2906	}
		2907
2465	sub update {	2908	sub update {
2466	my ($self) = @_;	2909	my ($self) = @_;
2467		2910
2468	delete $self->{knob_w};	2911	delete $self->{knob_w};
2469	$self->SUPER::update;	2912	$self->SUPER::update;
…		…
2516	glDisable GL_TEXTURE_2D;	2959	glDisable GL_TEXTURE_2D;
2517	}	2960	}
2518		2961
2519	#############################################################################	2962	#############################################################################
2520		2963
2521	package CFClient::UI::ValSlider;	2964	package CFPlus::UI::ValSlider;
2522		2965
2523	our @ISA = CFClient::UI::HBox::;	2966	our @ISA = CFPlus::UI::HBox::;
2524		2967
2525	sub new {	2968	sub new {
2526	my ($class, %arg) = @_;	2969	my ($class, %arg) = @_;
2527		2970
2528	my $range = delete $arg{range};	2971	my $range = delete $arg{range};
2529		2972
2530	my $self = $class->SUPER::new (	2973	my $self = $class->SUPER::new (
2531	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2974	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2532	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2975	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2533	to_value => sub { shift },	2976	to_value => sub { shift },
2534	from_value => sub { shift },	2977	from_value => sub { shift },
2535	%arg,	2978	%arg,
2536	);	2979	);
2537		2980
…		…
2557	sub set_range { shift->{slider}->set_range (@_) }	3000	sub set_range { shift->{slider}->set_range (@_) }
2558	sub set_value { shift->{slider}->set_value (@_) }	3001	sub set_value { shift->{slider}->set_value (@_) }
2559		3002
2560	#############################################################################	3003	#############################################################################
2561		3004
2562	package CFClient::UI::TextScroller;	3005	package CFPlus::UI::TextScroller;
2563		3006
2564	our @ISA = CFClient::UI::HBox::;	3007	our @ISA = CFPlus::UI::HBox::;
2565		3008
2566	use CFClient::OpenGL;	3009	use CFPlus::OpenGL;
2567		3010
2568	sub new {	3011	sub new {
2569	my $class = shift;	3012	my $class = shift;
2570		3013
2571	my $self = $class->SUPER::new (	3014	my $self = $class->SUPER::new (
2572	fontsize => 1,	3015	fontsize => 1,
2573	can_events => 0,	3016	can_events => 1,
2574	indent => 0,	3017	indent => 0,
2575	#font => default_font	3018	#font => default_font
2576	@_,	3019	@_,
2577		3020
2578	layout => (new CFClient::Layout 1),	3021	layout => (new CFPlus::Layout),
2579	par => [],	3022	par => [],
		3023	max_par => 0,
2580	height => 0,	3024	height => 0,
2581	children => [	3025	children => [
2582	(new CFClient::UI::Empty expand => 1),	3026	(new CFPlus::UI::Empty expand => 1),
2583	(new CFClient::UI::Slider vertical => 1),	3027	(new CFPlus::UI::Slider vertical => 1),
2584	],	3028	],
2585	);	3029	);
2586		3030
2587	$self->{children}[1]->connect (changed => sub { $self->update });	3031	$self->{children}[1]->connect (changed => sub { $self->update });
2588		3032
…		…
2618		3062
2619	$self->reflow;	3063	$self->reflow;
2620		3064
2621	local $self->{children} = [$empty, $slider];	3065	local $self->{children} = [$empty, $slider];
2622	$self->SUPER::invoke_size_allocate ($w, $h)	3066	$self->SUPER::invoke_size_allocate ($w, $h)
		3067	}
		3068
		3069	sub invoke_mouse_wheel {
		3070	my ($self, $ev) = @_;
		3071
		3072	return 0 unless $ev->{dy}; # only vertical movements
		3073
		3074	$self->{children}[1]->emit (mouse_wheel => $ev);
		3075
		3076	1
2623	}	3077	}
2624		3078
2625	sub get_layout {	3079	sub get_layout {
2626	my ($self, $para) = @_;	3080	my ($self, $para) = @_;
2627		3081
…		…
2655		3109
2656	# todo: base offset on lines or so, not on pixels	3110	# todo: base offset on lines or so, not on pixels
2657	$self->{children}[1]->set_value ($offset);	3111	$self->{children}[1]->set_value ($offset);
2658	}	3112	}
2659		3113
		3114	sub current_paragraph {
		3115	my ($self) = @_;
		3116
		3117	$self->{top_paragraph} - 1
		3118	}
		3119
		3120	sub scroll_to {
		3121	my ($self, $para) = @_;
		3122
		3123	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3124
		3125	$self->{scroll_to} = $para;
		3126	$self->update;
		3127	}
		3128
2660	sub clear {	3129	sub clear {
2661	my ($self) = @_;	3130	my ($self) = @_;
2662		3131
2663	my (undef, undef, @other) = @{ $self->{children} };	3132	my (undef, undef, @other) = @{ $self->{children} };
2664	$self->remove ($_) for @other;	3133	$self->remove ($_) for @other;
…		…
2667	$self->{height} = 0;	3136	$self->{height} = 0;
2668	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3137	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2669	}	3138	}
2670		3139
2671	sub add_paragraph {	3140	sub add_paragraph {
2672	my ($self, $color, $para, $indent) = @_;	3141	my $self = shift;
2673		3142
2674	my ($text, @w) = ref $para ? @$para : $para;	3143	for my $para (@_) {
2675
2676	$para = {	3144	$para = {
		3145	fg => [1, 1, 1, 1],
		3146	indent => 0,
		3147	markup => "",
		3148	widget => [],
		3149	ref $para ? %$para : (markup => $para),
2677	w => 1e10,	3150	w => 1e10,
2678	wrapped => 1,	3151	wrapped => 1,
2679	fg => $color,
2680	indent => $indent,
2681	markup => $text,
2682	widget => \@w,
2683	};	3152	};
2684		3153
2685	$self->add (@w) if @w;	3154	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2686	push @{$self->{par}}, $para;	3155	push @{$self->{par}}, $para;
		3156	}
		3157
		3158	if (my $max = $self->{max_par}) {
		3159	shift @{$self->{par}} while @{$self->{par}} > $max;
		3160	}
2687		3161
2688	$self->{need_reflow}++;	3162	$self->{need_reflow}++;
2689	$self->update;	3163	$self->update;
2690	}	3164	}
2691		3165
2692	sub scroll_to_bottom {	3166	sub scroll_to_bottom {
2693	my ($self) = @_;	3167	my ($self) = @_;
2694		3168
2695	$self->{scroll_to_bottom} = 1;	3169	$self->{scroll_to} = $#{$self->{par}};
2696	$self->update;	3170	$self->update;
2697	}	3171	}
2698		3172
		3173	sub force_uptodate {
		3174	my ($self) = @_;
		3175
		3176	if (delete $self->{need_reflow}) {
		3177	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3178
		3179	my $height = 0;
		3180
		3181	for my $para (@{$self->{par}}) {
		3182	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3183	my $layout = $self->get_layout ($para);
		3184	my ($w, $h) = $layout->size;
		3185
		3186	$para->{w} = $w + $para->{indent};
		3187	$para->{h} = $h;
		3188	$para->{wrapped} = $layout->has_wrapped;
		3189	}
		3190
		3191	$para->{y} = $height;
		3192	$height += $para->{h};
		3193	}
		3194
		3195	$self->{height} = $height;
		3196	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3197
		3198	delete $self->{texture};
		3199	}
		3200
		3201	if (my $paridx = delete $self->{scroll_to}) {
		3202	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3203	}
		3204	}
		3205
2699	sub update {	3206	sub update {
2700	my ($self) = @_;	3207	my ($self) = @_;
2701		3208
2702	$self->SUPER::update;	3209	$self->SUPER::update;
2703		3210
2704	return unless $self->{h} > 0;	3211	return unless $self->{h} > 0;
2705		3212
2706	delete $self->{texture};	3213	delete $self->{texture};
2707		3214
2708	$ROOT->on_post_alloc ($self => sub {	3215	$ROOT->on_post_alloc ($self => sub {
		3216	$self->force_uptodate;
		3217
2709	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3218	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2710		3219
2711	if (delete $self->{need_reflow}) {
2712	my $height = 0;
2713
2714	for my $para (@{$self->{par}}) {
2715	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2716	my $layout = $self->get_layout ($para);
2717	my ($w, $h) = $layout->size;
2718
2719	$para->{w} = $w + $para->{indent};
2720	$para->{h} = $h;
2721	$para->{wrapped} = $layout->has_wrapped;
2722	}
2723
2724	$height += $para->{h};
2725	}
2726
2727	$self->{height} = $height;
2728
2729	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2730
2731	delete $self->{texture};
2732	}
2733
2734	if (delete $self->{scroll_to_bottom}) {
2735	$self->{children}[1]->set_value (1e10);
2736	}
2737
2738	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3220	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2739	glClearColor 0, 0, 0, 0;	3221	glClearColor 0, 0, 0, 0;
2740	glClear GL_COLOR_BUFFER_BIT;	3222	glClear GL_COLOR_BUFFER_BIT;
2741		3223
		3224	package CFPlus::UI::Base;
		3225	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3226	(0, 0, $self->{w}, $self->{h});
		3227
		3228	my $top = int $self->{children}[1]{range}[0];
		3229
		3230	my $paridx = 0;
		3231	my $top_paragraph;
2742	my $top = int $self->{children}[1]{range}[0];	3232	my $top = int $self->{children}[1]{range}[0];
2743		3233
2744	my $y0 = $top;	3234	my $y0 = $top;
2745	my $y1 = $top + $H;	3235	my $y1 = $top + $H;
2746		3236
2747	my $y = 0;
2748
2749	glEnable GL_BLEND;
2750	#TODO# not correct in windows where rgba is forced off
2751	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2752
2753	for my $para (@{$self->{par}}) {	3237	for my $para (@{$self->{par}}) {
2754	my $h = $para->{h};	3238	my $h = $para->{h};
		3239	my $y = $para->{y};
2755		3240
2756	if ($y0 < $y + $h && $y < $y1) {	3241	if ($y0 < $y + $h && $y < $y1) {
2757
2758	my $layout = $self->get_layout ($para);	3242	my $layout = $self->get_layout ($para);
2759		3243
2760	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2761
2762	glRasterPos $para->{indent}, $y - $y0;	3244	$layout->render ($para->{indent}, $y - $y0);
2763	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764		3245
2765	if (my @w = @{ $para->{widget} }) {	3246	if (my @w = @{ $para->{widget} }) {
2766	my @s = $layout->get_shapes;	3247	my @s = $layout->get_shapes;
2767		3248
2768	glDisable GL_BLEND;
2769	for (@w) {	3249	for (@w) {
2770	my ($dx, $dy) = splice @s, 0, 2, ();	3250	my ($dx, $dy) = splice @s, 0, 2, ();
2771		3251
2772	$_->{x} = $dx + $para->{indent};	3252	$_->{x} = $dx + $para->{indent};
2773	$_->{y} = $dy + $y - $y0;	3253	$_->{y} = $dy + $y - $y0;
2774		3254
2775	$_->draw;	3255	$_->draw;
2776	}	3256	}
2777	glEnable GL_BLEND;
2778	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779	}	3257	}
2780	}	3258	}
2781		3259
2782	$y += $h;	3260	$paridx++;
		3261	$top_paragraph ||= $paridx if $y >= $top;
2783	}	3262	}
2784		3263
2785	glDisable GL_BLEND;	3264	$self->{top_paragraph} = $top_paragraph;
2786	};	3265	};
2787	});	3266	});
2788	}	3267	}
2789		3268
2790	sub reconfigure {	3269	sub reconfigure {
…		…
2808	$self->{children}[1]->draw;	3287	$self->{children}[1]->draw;
2809	}	3288	}
2810		3289
2811	#############################################################################	3290	#############################################################################
2812		3291
2813	package CFClient::UI::Animator;	3292	package CFPlus::UI::Animator;
2814		3293
2815	use CFClient::OpenGL;	3294	use CFPlus::OpenGL;
2816		3295
2817	our @ISA = CFClient::UI::Bin::;	3296	our @ISA = CFPlus::UI::Bin::;
2818		3297
2819	sub moveto {	3298	sub moveto {
2820	my ($self, $x, $y) = @_;	3299	my ($self, $x, $y) = @_;
2821		3300
2822	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3301	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2850	glPopMatrix;	3329	glPopMatrix;
2851	}	3330	}
2852		3331
2853	#############################################################################	3332	#############################################################################
2854		3333
2855	package CFClient::UI::Flopper;	3334	package CFPlus::UI::Flopper;
2856		3335
2857	our @ISA = CFClient::UI::Button::;	3336	our @ISA = CFPlus::UI::Button::;
2858		3337
2859	sub new {	3338	sub new {
2860	my $class = shift;	3339	my $class = shift;
2861		3340
2862	my $self = $class->SUPER::new (	3341	my $self = $class->SUPER::new (
…		…
2874	$self->{other}->toggle_visibility;	3353	$self->{other}->toggle_visibility;
2875	}	3354	}
2876		3355
2877	#############################################################################	3356	#############################################################################
2878		3357
2879	package CFClient::UI::Tooltip;	3358	package CFPlus::UI::Tooltip;
2880		3359
2881	our @ISA = CFClient::UI::Bin::;	3360	our @ISA = CFPlus::UI::Bin::;
2882		3361
2883	use CFClient::OpenGL;	3362	use CFPlus::OpenGL;
2884		3363
2885	sub new {	3364	sub new {
2886	my $class = shift;	3365	my $class = shift;
2887		3366
2888	$class->SUPER::new (	3367	$class->SUPER::new (
…		…
2891	)	3370	)
2892	}	3371	}
2893		3372
2894	sub set_tooltip_from {	3373	sub set_tooltip_from {
2895	my ($self, $widget) = @_;	3374	my ($self, $widget) = @_;
		3375
		3376	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3377	if $widget->{tooltip} =~ /^#(.*)$/;
2896		3378
2897	my $tooltip = $widget->{tooltip};	3379	my $tooltip = $widget->{tooltip};
2898		3380
2899	if ($ENV{CFPLUS_DEBUG} & 2) {	3381	if ($ENV{CFPLUS_DEBUG} & 2) {
2900	$tooltip .= "\n\n" . (ref $widget) . "\n"	3382	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2904	}	3386	}
2905		3387
2906	$tooltip =~ s/^\n+//;	3388	$tooltip =~ s/^\n+//;
2907	$tooltip =~ s/\n+$//;	3389	$tooltip =~ s/\n+$//;
2908		3390
2909	$self->add (new CFClient::UI::Label	3391	$self->add (new CFPlus::UI::Label
2910	markup => $tooltip,	3392	markup => $tooltip,
2911	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3393	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2912	fontsize => 0.8,	3394	fontsize => 0.8,
2913	fg => [0, 0, 0, 1],	3395	style => 1, # FLAG_INVERSE
2914	ellipsise => 0,	3396	ellipsise => 0,
2915	font => ($widget->{tooltip_font} || $::FONT_PROP),	3397	font => ($widget->{tooltip_font} || $::FONT_PROP),
2916	);	3398	);
2917	}	3399	}
2918		3400
…		…
2937		3419
2938	$self->{root}->on_post_alloc ("move_$self" => sub {	3420	$self->{root}->on_post_alloc ("move_$self" => sub {
2939	my $widget = $self->{owner}	3421	my $widget = $self->{owner}
2940	or return;	3422	or return;
2941		3423
		3424	if ($widget->{visible}) {
2942	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3425	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2943		3426
2944	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3427	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2945	if $x + $self->{w} > $self->{root}{w};	3428	if $x + $self->{w} > $self->{root}{w};
2946		3429
2947	$self->move_abs ($x, $y);	3430	$self->move_abs ($x, $y);
		3431	} else {
		3432	$self->hide;
		3433	}
2948	});	3434	});
2949	}	3435	}
2950		3436
2951	sub _draw {	3437	sub _draw {
2952	my ($self) = @_;	3438	my ($self) = @_;
…		…
2976	$self->SUPER::_draw;	3462	$self->SUPER::_draw;
2977	}	3463	}
2978		3464
2979	#############################################################################	3465	#############################################################################
2980		3466
2981	package CFClient::UI::Face;	3467	package CFPlus::UI::Face;
2982		3468
2983	our @ISA = CFClient::UI::Base::;	3469	our @ISA = CFPlus::UI::DrawBG::;
2984		3470
2985	use CFClient::OpenGL;	3471	use CFPlus::OpenGL;
2986		3472
2987	sub new {	3473	sub new {
2988	my $class = shift;	3474	my $class = shift;
2989		3475
2990	my $self = $class->SUPER::new (	3476	my $self = $class->SUPER::new (
		3477	size_w => 32,
		3478	size_h => 8,
2991	aspect => 1,	3479	aspect => 1,
2992	can_events => 0,	3480	can_events => 0,
2993	@_,	3481	@_,
2994	);	3482	);
2995		3483
2996	if ($self->{anim} && $self->{animspeed}) {	3484	if ($self->{anim} && $self->{animspeed}) {
2997	Scalar::Util::weaken (my $widget = $self);	3485	CFPlus::weaken (my $widget = $self);
2998		3486
		3487	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3488	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2999	$self->{timer} = Event->timer (	3489	$self->{timer} = Event->timer (
3000	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3001	hard => 1,	3490	parked => 1,
3002	interval => $self->{animspeed},
3003	cb => sub {	3491	cb => sub {
		3492	return unless $::CONN && $widget;
		3493
3004	++$widget->{frame};	3494	++$widget->{frame};
		3495	$widget->update_face;
3005	$widget->update;	3496	$widget->update;
		3497
		3498	$widget->update_timer;
3006	},	3499	},
3007	);	3500	);
		3501
		3502	$self->update_face;
		3503	$self->update_timer;
3008	}	3504	}
3009		3505
3010	$self	3506	$self
3011	}	3507	}
3012		3508
		3509	sub update_timer {
		3510	my ($self) = @_;
		3511
		3512	return unless $self->{timer};
		3513
		3514	if ($self->{visible}) {
		3515	$self->{timer}->at (
		3516	$self->{anim_start}
		3517	+ $self->{animspeed}
		3518	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3519	);
		3520	$self->{timer}->start;
		3521	} else {
		3522	$self->{timer}->stop;
		3523	}
		3524	}
		3525
		3526	sub update_face {
		3527	my ($self) = @_;
		3528
		3529	return unless $::CONN;
		3530
		3531	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3532	if ($anim && @$anim) {
		3533	delete $self->{wait_face};
		3534	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3535	}
		3536	}
		3537	}
		3538
3013	sub size_request {	3539	sub size_request {
3014	(32, 8)	3540	my ($self) = @_;
		3541
		3542	if ($::CONN) {
		3543	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3544	if (my $tex = $::CONN->{texture}[$faceid]) {
		3545	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3546	} else {
		3547	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3548	$self->realloc;
		3549	});
		3550	}
		3551	}
		3552	}
		3553
		3554	($self->{size_w} || 8, $self->{size_h} || 8)
3015	}	3555	}
3016		3556
3017	sub update {	3557	sub update {
3018	my ($self) = @_;	3558	my ($self) = @_;
3019		3559
3020	return unless $self->{visible};	3560	return unless $self->{visible};
3021		3561
3022	$self->SUPER::update;	3562	$self->SUPER::update;
3023	}	3563	}
3024		3564
		3565	sub invoke_visibility_change {
		3566	my ($self) = @_;
		3567
		3568	$self->update_timer;
		3569
		3570	0
		3571	}
		3572
3025	sub _draw {	3573	sub _draw {
3026	my ($self) = @_;	3574	my ($self) = @_;
3027		3575
3028	return unless $::CONN;	3576	return unless $::CONN;
3029		3577
3030	my $face;	3578	$self->SUPER::_draw;
3031		3579
3032	if ($self->{frame}) {
3033	my $anim = $::CONN->{anim}[$self->{anim}];	3580	my $faceid = $::CONN->{faceid}[$self->{face}]
3034		3581	or return;
3035	$face = $anim->[ $self->{frame} % @$anim ]
3036	if $anim && @$anim;
3037	}
3038		3582
3039	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3583	my $tex = $::CONN->{texture}[$faceid];
3040		3584
3041	if ($tex) {	3585	if ($tex) {
3042	glEnable GL_TEXTURE_2D;	3586	glEnable GL_TEXTURE_2D;
3043	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3587	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3044	glColor 0, 0, 0, 1;	3588	glColor 0, 0, 0, 1;
…		…
3048	}	3592	}
3049		3593
3050	sub destroy {	3594	sub destroy {
3051	my ($self) = @_;	3595	my ($self) = @_;
3052		3596
3053	$self->{timer}->cancel	3597	(delete $self->{timer})->cancel
3054	if $self->{timer};	3598	if $self->{timer};
3055		3599
3056	$self->SUPER::destroy;	3600	$self->SUPER::destroy;
3057	}	3601	}
3058		3602
3059	#############################################################################	3603	#############################################################################
3060		3604
3061	package CFClient::UI::Buttonbar;	3605	package CFPlus::UI::Buttonbar;
3062		3606
3063	our @ISA = CFClient::UI::HBox::;	3607	our @ISA = CFPlus::UI::HBox::;
3064		3608
3065	# TODO: should actualyl wrap buttons and other goodies.	3609	# TODO: should actually wrap buttons and other goodies.
3066		3610
3067	#############################################################################	3611	#############################################################################
3068		3612
3069	package CFClient::UI::Menu;	3613	package CFPlus::UI::Menu;
3070		3614
3071	our @ISA = CFClient::UI::FancyFrame::;	3615	our @ISA = CFPlus::UI::Toplevel::;
3072		3616
3073	use CFClient::OpenGL;	3617	use CFPlus::OpenGL;
3074		3618
3075	sub new {	3619	sub new {
3076	my $class = shift;	3620	my $class = shift;
3077		3621
3078	my $self = $class->SUPER::new (	3622	my $self = $class->SUPER::new (
3079	items => [],	3623	items => [],
3080	z => 100,	3624	z => 100,
3081	@_,	3625	@_,
3082	);	3626	);
3083		3627
3084	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3628	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3085		3629
3086	for my $item (@{ $self->{items} }) {	3630	for my $item (@{ $self->{items} }) {
3087	my ($widget, $cb, $tooltip) = @$item;	3631	my ($widget, $cb, $tooltip) = @$item;
3088		3632
3089	# handle various types of items, only text for now	3633	# handle various types of items, only text for now
3090	if (!ref $widget) {	3634	if (!ref $widget) {
		3635	if ($widget =~ /\t/) {
		3636	my ($left, $right) = split /\t/, $widget, 2;
		3637
3091	$widget = new CFClient::UI::Label	3638	$widget = new CFPlus::UI::HBox
3092	can_hover => 1,	3639	can_hover => 1,
3093	can_events => 1,	3640	can_events => 1,
		3641	tooltip => $tooltip,
		3642	children => [
		3643	(new CFPlus::UI::Label markup => $left, expand => 1),
		3644	(new CFPlus::UI::Label markup => $right, align => +1),
		3645	],
		3646	;
		3647
		3648	} else {
		3649	$widget = new CFPlus::UI::Label
		3650	can_hover => 1,
		3651	can_events => 1,
3094	markup => $widget,	3652	markup => $widget,
3095	tooltip => $tooltip	3653	tooltip => $tooltip;
		3654	}
3096	}	3655	}
3097		3656
3098	$self->{item}{$widget} = $item;	3657	$self->{item}{$widget} = $item;
3099		3658
3100	$self->{vbox}->add ($widget);	3659	$self->{vbox}->add ($widget);
…		…
3143	1	3702	1
3144	}	3703	}
3145		3704
3146	#############################################################################	3705	#############################################################################
3147		3706
3148	package CFClient::UI::Multiplexer;	3707	package CFPlus::UI::Multiplexer;
3149		3708
3150	our @ISA = CFClient::UI::Container::;	3709	our @ISA = CFPlus::UI::Container::;
3151		3710
3152	sub new {	3711	sub new {
3153	my $class = shift;	3712	my $class = shift;
3154		3713
3155	my $self = $class->SUPER::new (	3714	my $self = $class->SUPER::new (
…		…
3216	$self->{current}->draw;	3775	$self->{current}->draw;
3217	}	3776	}
3218		3777
3219	#############################################################################	3778	#############################################################################
3220		3779
3221	package CFClient::UI::Notebook;	3780	package CFPlus::UI::Notebook;
3222		3781
3223	our @ISA = CFClient::UI::VBox::;	3782	our @ISA = CFPlus::UI::VBox::;
3224		3783
3225	sub new {	3784	sub new {
3226	my $class = shift;	3785	my $class = shift;
3227		3786
3228	my $self = $class->SUPER::new (	3787	my $self = $class->SUPER::new (
3229	buttonbar => (new CFClient::UI::Buttonbar),	3788	buttonbar => (new CFPlus::UI::Buttonbar),
3230	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3789	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3231	# filter => # will be put between multiplexer and $self	3790	# filter => # will be put between multiplexer and $self
3232	@_,	3791	@_,
3233	);	3792	);
3234		3793
3235	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3794	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3239	}	3798	}
3240		3799
3241	sub add {	3800	sub add {
3242	my ($self, $title, $widget, $tooltip) = @_;	3801	my ($self, $title, $widget, $tooltip) = @_;
3243		3802
3244	Scalar::Util::weaken $self;	3803	CFPlus::weaken $self;
3245		3804
3246	$self->{buttonbar}->add (new CFClient::UI::Button	3805	$self->{buttonbar}->add (new CFPlus::UI::Button
3247	markup => $title,	3806	markup => $title,
3248	tooltip => $tooltip,	3807	tooltip => $tooltip,
3249	on_activate => sub { $self->set_current_page ($widget) },	3808	on_activate => sub { $self->set_current_page ($widget) },
3250	);	3809	);
3251		3810
…		…
3265	$self->emit (page_changed => $self->{multiplexer}{current});	3824	$self->emit (page_changed => $self->{multiplexer}{current});
3266	}	3825	}
3267		3826
3268	#############################################################################	3827	#############################################################################
3269		3828
3270	package CFClient::UI::Combobox;	3829	package CFPlus::UI::Selector;
3271		3830
3272	use utf8;	3831	use utf8;
3273		3832
3274	our @ISA = CFClient::UI::Button::;	3833	our @ISA = CFPlus::UI::Button::;
3275		3834
3276	sub new {	3835	sub new {
3277	my $class = shift;	3836	my $class = shift;
3278		3837
3279	my $self = $class->SUPER::new (	3838	my $self = $class->SUPER::new (
…		…
3296	my ($value, $title, $tooltip) = @$_;	3855	my ($value, $title, $tooltip) = @$_;
3297		3856
3298	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3857	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299	}	3858	}
3300		3859
3301	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3860	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302	}	3861	}
3303		3862
3304	sub _set_value {	3863	sub _set_value {
3305	my ($self, $value) = @_;	3864	my ($self, $value) = @_;
3306		3865
…		…
3321	$self->emit (changed => $value);	3880	$self->emit (changed => $value);
3322	}	3881	}
3323		3882
3324	#############################################################################	3883	#############################################################################
3325		3884
3326	package CFClient::UI::Statusbox;	3885	package CFPlus::UI::Statusbox;
3327		3886
3328	our @ISA = CFClient::UI::VBox::;	3887	our @ISA = CFPlus::UI::VBox::;
3329		3888
3330	sub new {	3889	sub new {
3331	my $class = shift;	3890	my $class = shift;
3332		3891
3333	my $self = $class->SUPER::new (	3892	my $self = $class->SUPER::new (
3334	fontsize => 0.8,	3893	fontsize => 0.8,
3335	@_,	3894	@_,
3336	);	3895	);
3337		3896
3338	Scalar::Util::weaken (my $this = $self);	3897	CFPlus::weaken (my $this = $self);
3339		3898
3340	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3899	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3341		3900
3342	$self	3901	$self
3343	}	3902	}
…		…
3345	sub reorder {	3904	sub reorder {
3346	my ($self) = @_;	3905	my ($self) = @_;
3347	my $NOW = Time::HiRes::time;	3906	my $NOW = Time::HiRes::time;
3348		3907
3349	# freeze display when hovering over any label	3908	# freeze display when hovering over any label
3350	return if $CFClient::UI::TOOLTIP->{owner}	3909	return if $CFPlus::UI::TOOLTIP->{owner}
3351	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3910	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3352	values %{ $self->{item} };	3911	values %{ $self->{item} };
3353		3912
3354	while (my ($k, $v) = each %{ $self->{item} }) {	3913	while (my ($k, $v) = each %{ $self->{item} }) {
3355	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3914	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3356	}	3915	}
…		…
3377	for ($short) {	3936	for ($short) {
3378	s/^\s+//;	3937	s/^\s+//;
3379	s/\s+/ /g;	3938	s/\s+/ /g;
3380	}	3939	}
3381		3940
3382	new CFClient::UI::Label	3941	new CFPlus::UI::Label
3383	markup => $short,	3942	markup => $short,
3384	tooltip => $item->{tooltip},	3943	tooltip => $item->{tooltip},
3385	tooltip_font => $::FONT_PROP,	3944	tooltip_font => $::FONT_PROP,
3386	tooltip_width => 0.67,	3945	tooltip_width => 0.67,
3387	fontsize => $item->{fontsize} || $self->{fontsize},	3946	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3466	$self->SUPER::destroy;	4025	$self->SUPER::destroy;
3467	}	4026	}
3468		4027
3469	#############################################################################	4028	#############################################################################
3470		4029
3471	package CFClient::UI::Inventory;
3472
3473	our @ISA = CFClient::UI::Table::;
3474
3475	sub new {
3476	my $class = shift;
3477
3478	my $self = $class->SUPER::new (
3479	col_expand => [0, 1, 0],
3480	@_,
3481	);
3482
3483	$self
3484	}
3485
3486	sub set_items {
3487	my ($self, $items) = @_;
3488
3489	$self->clear;
3490	return unless $items;
3491
3492	my @items = sort {
3493	($a->{type} <=> $b->{type})
3494	or ($a->{name} cmp $b->{name})
3495	} values %$items;
3496
3497	$self->{real_items} = \@items;
3498
3499	my $row = 0;
3500	for my $item (@items) {
3501	CFClient::Item::update_widgets $item;
3502
3503	$self->add (0, $row, $item->{face_widget});
3504	$self->add (1, $row, $item->{desc_widget});
3505	$self->add (2, $row, $item->{weight_widget});
3506
3507	$row++;
3508	}
3509	}
3510
3511	#############################################################################
3512
3513	package CFClient::UI::SpellList;
3514
3515	our @ISA = CFClient::UI::Table::;
3516
3517	sub new {
3518	my $class = shift;
3519
3520	my $self = $class->SUPER::new (
3521	binding => [],
3522	commands => [],
3523	@_,
3524	)
3525	}
3526
3527	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3528
3529	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3530	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3531	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3533	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3534	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3535	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3536	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3537	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3539
3540	sub rebuild_spell_list {
3541	my ($self) = @_;
3542
3543	$CFClient::UI::ROOT->on_refresh ($self => sub {
3544	$self->clear;
3545
3546	return unless $::CONN;
3547
3548	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553
3554	my $row = 0;
3555
3556	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557	my $spell = $self->{spell}{$_};
3558
3559	$row++;
3560
3561	my $spell_cb = sub {
3562	my ($widget, $ev) = @_;
3563
3564	if ($ev->{button} == 1) {
3565	$::CONN->user_send ("cast $spell->{name}");
3566	} elsif ($ev->{button} == 2) {
3567	$::CONN->user_send ("invoke $spell->{name}");
3568	} elsif ($ev->{button} == 3) {
3569	(new CFClient::UI::Menu
3570	items => [
3571	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573	],
3574	)->popup ($ev);
3575	} else {
3576	return 0;
3577	}
3578
3579	1
3580	};
3581
3582	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584	#TODO: add path info to tooltip
3585	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3586
3587	$self->add (0, $row, new CFClient::UI::Face
3588	face => $spell->{face},
3589	can_hover => 1,
3590	can_events => 1,
3591	tooltip => $tooltip,
3592	on_button_down => $spell_cb,
3593	);
3594
3595	$self->add (1, $row, new CFClient::UI::Label
3596	expand => 1,
3597	text => $spell->{name},
3598	can_hover => 1,
3599	can_events => 1,
3600	tooltip => $tooltip,
3601	on_button_down => $spell_cb,
3602	);
3603
3604	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3608	}
3609	});
3610	}
3611
3612	sub add_spell {
3613	my ($self, $spell) = @_;
3614
3615	$self->{spell}->{$spell->{name}} = $spell;
3616	$self->rebuild_spell_list;
3617	}
3618
3619	sub remove_spell {
3620	my ($self, $spell) = @_;
3621
3622	delete $self->{spell}->{$spell->{name}};
3623	$self->rebuild_spell_list;
3624	}
3625
3626	sub clear_spells {
3627	my ($self) = @_;
3628
3629	$self->{spell} = {};
3630	$self->rebuild_spell_list;
3631	}
3632
3633	#############################################################################
3634
3635	package CFClient::UI::Root;	4030	package CFPlus::UI::Root;
3636		4031
3637	our @ISA = CFClient::UI::Container::;	4032	our @ISA = CFPlus::UI::Container::;
3638		4033
3639	use List::Util qw(min max);	4034	use List::Util qw(min max);
3640		4035
3641	use CFClient::OpenGL;	4036	use CFPlus::OpenGL;
3642		4037
3643	sub new {	4038	sub new {
3644	my $class = shift;	4039	my $class = shift;
3645		4040
3646	my $self = $class->SUPER::new (	4041	my $self = $class->SUPER::new (
3647	visible => 1,	4042	visible => 1,
3648	@_,	4043	@_,
3649	);	4044	);
3650		4045
3651	Scalar::Util::weaken ($self->{root} = $self);	4046	CFPlus::weaken ($self->{root} = $self);
3652		4047
3653	$self	4048	$self
3654	}	4049	}
3655		4050
3656	sub size_request {	4051	sub size_request {
…		…
3751	while ($self->{refresh_hook}) {	4146	while ($self->{refresh_hook}) {
3752	$_->()	4147	$_->()
3753	for values %{delete $self->{refresh_hook}};	4148	for values %{delete $self->{refresh_hook}};
3754	}	4149	}
3755		4150
3756	if ($self->{realloc}) {	4151	while ($self->{realloc}) {
3757	my %queue;	4152	my %queue;
3758	my @queue;	4153	my @queue;
3759	my $widget;	4154	my $widget;
3760		4155
3761	outer:	4156	outer:
…		…
3808	}	4203	}
3809	}	4204	}
3810		4205
3811	delete $self->{realloc}{$widget+0};	4206	delete $self->{realloc}{$widget+0};
3812	}	4207	}
3813	}
3814		4208
3815	while (my $size_alloc = delete $self->{size_alloc}) {	4209	while (my $size_alloc = delete $self->{size_alloc}) {
3816	my @queue = sort { $b->{visible} <=> $a->{visible} }	4210	my @queue = sort { $a->{visible} <=> $b->{visible} }
3817	values %$size_alloc;	4211	values %$size_alloc;
3818		4212
3819	while () {	4213	while () {
3820	my $widget = pop @queue || last;	4214	my $widget = pop @queue || last;
3821		4215
3822	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4216	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3823		4217
3824	$w = 0 if $w < 0;	4218	$w = max $widget->{min_w}, $w;
3825	$h = 0 if $h < 0;	4219	$h = max $widget->{min_h}, $h;
3826		4220
		4221	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4222	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4223
		4224	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4225	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4226
3827	$w = int $w + 0.5;	4227	$w = int $w + 0.5;
3828	$h = int $h + 0.5;	4228	$h = int $h + 0.5;
3829		4229
3830	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4230	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831	$widget->{old_w} = $widget->{w};	4231	$widget->{old_w} = $widget->{w};
3832	$widget->{old_h} = $widget->{h};	4232	$widget->{old_h} = $widget->{h};
3833		4233
3834	$widget->{w} = $w;	4234	$widget->{w} = $w;
3835	$widget->{h} = $h;	4235	$widget->{h} = $h;
3836		4236
3837	$widget->emit (size_allocate => $w, $h);	4237	$widget->emit (size_allocate => $w, $h);
		4238	}
3838	}	4239	}
3839	}	4240	}
3840	}	4241	}
3841		4242
3842	while ($self->{post_alloc_hook}) {	4243	while ($self->{post_alloc_hook}) {
3843	$_->()	4244	$_->()
3844	for values %{delete $self->{post_alloc_hook}};	4245	for values %{delete $self->{post_alloc_hook}};
3845	}	4246	}
3846
3847		4247
3848	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4248	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3849	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4249	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3850	glClear GL_COLOR_BUFFER_BIT;	4250	glClear GL_COLOR_BUFFER_BIT;
3851		4251
…		…
3854	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4254	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3855	glMatrixMode GL_MODELVIEW;	4255	glMatrixMode GL_MODELVIEW;
3856	glLoadIdentity;	4256	glLoadIdentity;
3857		4257
3858	{	4258	{
3859	package CFClient::UI::Base;	4259	package CFPlus::UI::Base;
3860		4260
3861	($draw_x, $draw_y, $draw_w, $draw_h) =	4261	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3862	(0, 0, $self->{w}, $self->{h});	4262	(0, 0, $self->{w}, $self->{h});
3863	}
3864		4263
3865	$self->_draw;	4264	$self->_draw;
		4265	}
3866	}	4266	}
3867		4267
3868	#############################################################################	4268	#############################################################################
3869		4269
3870	package CFClient::UI;	4270	package CFPlus::UI;
3871		4271
3872	$ROOT = new CFClient::UI::Root;	4272	$ROOT = new CFPlus::UI::Root;
3873	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4273	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3874		4274
3875	1	4275	1
3876		4276

Diff Legend

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